diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index d17347a0ad7..d7463d62172 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -26,8 +26,9 @@ Default **language here is english**. So please prepare your contributions in en
 1. [Fork](https://help.github.com/articles/fork-a-repo) the [GitHub repository](https://github.com/Dolibarr/dolibarr).
 2. Clone your fork.
 3. Choose a branch(See the [Branches](#branches) section below).
-4. Commit and push your changes.
-5. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
+4. Read our developer documentation on the [Dolibarr Wiki](https://wiki.dolibarr.org/index.php?title=Developer_documentation).
+5. Commit and push your changes.
+6. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
 
 <span id="branches" name="branches"></span>
 ### Branches
@@ -116,13 +117,13 @@ a process to follow to optimize the chance to have PRs merged efficiently...
 
 Also, some code changes need a prior approbation:
 
-* if you want to include a new external library (into htdocs/includes directory), please ask before to the core project manager (mention @dolibarr-yoda in your issue) to see if such a library can be accepted.
+* if you want to include a new external library (into htdocs/includes directory), please ask before to the core project manager (mention @dolibarr-jedi in your issue) to see if such a library can be accepted.
 
-* if you add a new table, you must first create a page on https://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Then ask the project manager (@dolibarr-yoda) if the new data model you plan to add is compatible with curent and future works in progress and can be accepted as you suggest.
+* if you add a new tables or fields, you MUST first submit a standalone PR with the data structure changes you plan to add/modify (and only data structure changes). Start development only once this data structure has been accepted.
 
 Once a PR has been submitted, you may need to wait for its integration. It is common that the project leader let the PR open for a long delay to allow every developer discuss about the PR (A label is added in such a case).
 
-If the label of PR start with "Draft" or "WIP" (Work In Progress), it will not be analyzed for merging until you change the label of PR (but it can be analyzed for discussion).
+If the label of PR start with "Draft" or "WIP" (Work In Progress), it will not be analyzed for merging until you change the label of the PR (but it can be analyzed for discussion).
 
 If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration.
 
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 186b20a051d..6b651234788 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -2,4 +2,4 @@
 
 open_collective: dolibarr
 custom: https://wiki.dolibarr.org/index.php/Subscribe
-# github: [eldy]
\ No newline at end of file
+github: [eldy]
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 432f30f2332..00000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: Bug report
-about: Create a report to help us fix something that is broken
-title: ''
-labels: Bug
-assignees: ''
-
----
-
-# Instructions
-*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
-*Please:*
-- *replace the bracket enclosed texts with meaningful information*
-- *remove any unused sub-section*
-
-
-# Bug
-[*Short description*]
-
-## Environment
-- **Version**: [*Affected Dolibarr version(s)*]
-- **OS**: [*Server OS type and version*]
-- **Web server**: [*Webserver type and version*]
-- **PHP**: [*PHP version*]
-- **Database**: [*Database type and version*]
-- **URL(s)**: [*Affected URL(s)*]
-
-## Expected and actual behavior
-[*Verbose description*]
-
-## Steps to reproduce the behavior
-[*Verbose description*]
-
-## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)
-[*Files*]
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000000..d7dc3d584e3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,71 @@
+name: Bug report
+description: Create a report to help us fix something that is broken
+labels: ["Bug"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.
+        
+  - type: textarea
+    id: bug
+    attributes:
+      label: Bug
+      description: Please give a short description of the bug
+    validations:
+      required: true
+
+  - type: input
+    id: environment-version
+    attributes:
+      label: Environment Version
+      description: Affected Dolibarr version(s)
+
+  - type: input
+    id: environment-os
+    attributes:
+      label: Environment OS
+      description: Server OS type and version
+      
+  - type: input
+    id: environment-webserver
+    attributes:
+      label: Environment Web server
+      description: Webserver type and version
+      
+  - type: input
+    id: environment-php
+    attributes:
+      label: Environment PHP
+      description: PHP version
+      
+  - type: input
+    id: environment-database
+    attributes:
+      label: Environment Database
+      description: Database type and version
+
+  - type: input
+    id: environment-urls
+    attributes:
+      label: Environment URL(s)
+      description: Affected URL(s)
+
+  - type: textarea
+    id: expected-behaviour
+    attributes:
+      label: Expected and actual behavior
+      description: Verbose description
+
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce the behavior
+      description: Verbose description
+      
+  - type: textarea
+    id: files
+    attributes:
+      label: Attached files
+      description: Screenshots, screencasts, dolibarr.log, debugging informations
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 32e2deff2c1..00000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-name: Feature request
-about: Suggest a new idea for this project
-title: ''
-labels: Feature request
-assignees: ''
-
----
-
-# Instructions
-*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
-*Please:*
-- *replace the bracket enclosed texts with meaningful information*
-- *remove any unused sub-section*
-
-
-# Feature Request
-[*Short description*]
-
-## Use case
-[*Verbose description*]
-
-## Suggested implementation
-[*Verbose description*]
-
-## Suggested steps
-[*List of tasks to achieve goal*]
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 00000000000..885f3472d18
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,35 @@
+name: Feature request
+description: Suggest a new idea for this project
+labels: ["Feature request"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.
+
+  - type: textarea
+    id: feature-request
+    attributes:
+      label: Feature Request
+      description: Short description
+    validations:
+      required: true
+
+  - type: textarea
+    id: use-case
+    attributes:
+      label: Use case
+      description: Verbose description
+      
+  - type: textarea
+    id: suggested-implementation
+    attributes:
+      label: Suggested implementation
+      description: Verbose description
+
+  - type: textarea
+    id: suggested-steps
+    attributes:
+      label: Suggested steps
+      description: List of tasks to achieve goal
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 035387834bd..13a3e6fa77b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,18 +1,18 @@
 # Instructions
 *This is a template to help you make good pull requests. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
 *Please:*
-- *only keep the "Fix", "Close" or "New" section*
+- *only keep the "FIX", "CLOSE" or "NEW" section* (use uppercase to have the PR appears into the ChangeLog, lowercase will not appears)
 - *follow the project [contributing guidelines](/.github/CONTRIBUTING.md)*
-- *replace the bracket enclosed textswith meaningful informations*
+- *replace the bracket enclosed texts with meaningful information*
 
 
-# Fix #[*issue_number Short description*]
+# FIX|Fix #[*issue_number Short description*]
 [*Long description*]
 
 
-# Close #[*issue_number Short description*]
+# CLOSE|Close #[*issue_number Short description*]
 [*Long description*]
 
 
-# New [*Short description*]
+# NEW|New [*Short description*]
 [*Long description*]
diff --git a/.travis.yml b/.travis.yml
index b48a3667bb0..5d7eb7a1678 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,7 +57,7 @@ jobs:
       php: nightly 
       env: DB=mysql
     - stage: PHP Dev
-      if: type = push AND branch = 14.0
+      if: type = push AND branch = 15.0
       php: nightly 
       env: DB=mysql
 
@@ -411,6 +411,12 @@ script:
   php upgrade.php 13.0.0 14.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade13001400.log
   php upgrade2.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-2.log
   php step5.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-3.log
+  php upgrade.php 14.0.0 15.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade14001500.log
+  php upgrade2.php 14.0.0 15.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-2.log
+  php step5.php 14.0.0 15.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-3.log
+  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
   ls -alrt $TRAVIS_BUILD_DIR/
 
 - |
diff --git a/.tx/config b/.tx/config
index dae10d60866..d4ca5e73180 100644
--- a/.tx/config
+++ b/.tx/config
@@ -170,12 +170,6 @@ source_file = htdocs/langs/en_US/hrm.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.intracommreport]
-file_filter = htdocs/langs/<lang>/intracommreport.lang
-source_file = htdocs/langs/en_US/intracommreport.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.install]
 file_filter = htdocs/langs/<lang>/install.lang
 source_file = htdocs/langs/en_US/install.lang
@@ -188,6 +182,12 @@ source_file = htdocs/langs/en_US/interventions.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.intracommreport]
+file_filter = htdocs/langs/<lang>/intracommreport.lang
+source_file = htdocs/langs/en_US/intracommreport.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.knowledgemanagement]
 file_filter = htdocs/langs/<lang>/knowledgemanagement.lang
 source_file = htdocs/langs/en_US/knowledgemanagement.lang
@@ -392,18 +392,18 @@ source_file = htdocs/langs/en_US/stripe.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.suppliers]
-file_filter = htdocs/langs/<lang>/suppliers.lang
-source_file = htdocs/langs/en_US/suppliers.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.supplier_proposal]
 file_filter = htdocs/langs/<lang>/supplier_proposal.lang
 source_file = htdocs/langs/en_US/supplier_proposal.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.suppliers]
+file_filter = htdocs/langs/<lang>/suppliers.lang
+source_file = htdocs/langs/en_US/suppliers.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.ticket]
 file_filter = htdocs/langs/<lang>/ticket.lang
 source_file = htdocs/langs/en_US/ticket.lang
diff --git a/ChangeLog b/ChangeLog
index a0091c2c42a..a9a42c8d878 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,164 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 
+***** ChangeLog for 15.0.0 compared to 14.0.0 *****
+
+For users:
+---------------
+
+NEW: Online proposal signature
+NEW: Can define some max limit on expense report (per period, per type or expense, ...)
+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.
+NEW: #18403 Add __URL_SHIPMENT__ substitute to get the URL of a shipment
+NEW: #18689 REST API module: add api key generate / modify permission.
+NEW: #18663 Make "L'Annuaire des Entreprises" the default provider for SIREN verification for French thirdparties.
+NEW: #18046 Add tags on ticket/categories
+NEW: #18326 Workflow: Close order on shipment closing.
+NEW: #18770 Can enter the buying price (for Weighted Average Price update) on lines during the reception step
+NEW: #18814 Add legal form for Sweden
+NEW: #18820 Accountancy - Add product account in import/export of thirdparty (level 3)
+NEW: Accountancy - Format FEC/FEC2 - Add column NumFacture
+NEW: Add $dolibarr_main_db_readonly in conf.php for readonly access.
+NEW: add auto creation of agenda event on supplier_order cancellation
+NEW: Add a PDF document template for Manufacturing Orders
+NEW: Add budget field into task #18986
+NEW: add cancel button to `classify reception` form on supplier_orders
+NEW: Added address field into contacts list
+NEW: Added documents page and send mail possibility in payments
+NEW: Add edit option in propal
+NEW: Added linked files page and send mail possibility in payments
+NEW: Add field date from/to in customer and supplier payment list
+NEW: Add filter from date to date into action/evt list
+NEW: Add import / export of MO and BOMLines - Close #18499
+NEW: Adding accounting export model for iSuite Expert
+NEW: add link to an element by ref
+NEW: add missing printFieldListFrom hook call on several lists
+NEW: add MRP into Object Linked Box
+NEW: Add option to hide customer code on PDF documents
+NEW: Add param $nolog to avoid logging into dol_delete_recursive_dir()
+NEW: Add sale representative in order and invoice list
+NEW: add a setting to create PDF in PDF/A - 1b format #18990
+NEW: Add `SOCIETE_SHOW_VAT_IN_LIST` to display VAT number in combo list of thirdparties
+NEW: Add sortorder on units list
+NEW: Adds PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES to hide product label in supplier order lines
+NEW: Add STOCK_MOVEMENT_LIST_HIDE_UNIT_PRICE to hide unit price on some pages
+NEW: add support for zstd compression
+NEW: Allow drag and drop on kits
+NEW: Allow exporting supplier order validation date + validation user
+NEW: Allows product ref generation after the form is validated with PRODUCT_GENERATE_REF_AFTER_FORM
+NEW: autocomplete account group when editing an account card
+NEW: Auto create invoice for payment done on an order with online payment link of order
+NEW: Can edit fields of proposal when proposal is not yet signed
+NEW: Can edit the translation key of an overwrote translation key.
+NEW: can enable/disable external calendar by default
+NEW: Can hide sender name on PDF documents
+NEW: Can select lot from a combo list of existing batch numbers (in MRP consumtion)
+NEW: Can set the default BOM on a product
+NEW: Can set/unset the usual working day of the week (friday, saturday, sunday) 
+NEW: Can show progression of task into combo list of tasks
+NEW: can upload the odt file for the product doc template
+NEW: Contract - Add From/to input on search date
+NEW: Customer Display with TakePOS
+NEW: Split Sale in TakePOS
+NEW: Customer invoice template list - Add input date from/to
+NEW: date filter on project list and task list From->To
+NEW: display shipping method and tracking url on shipment list
+NEW: expense reports: conf to force amounts to be entered only including taxes
+NEW: expense reports: conf to pre-fill start/end dates with bounds of current month
+NEW: expense reports: show link to already existing overlapping expense report
+NEW: expense reports: can make project field mandatory on lines
+NEW: Expose bank account holder, label and number
+NEW: feature #18986
+NEW: field and behavior in product object
+NEW: generate intervention from time spent
+NEW: holiday: handle monthly balance updates with cronjob
+NEW: HRM integration, source code
+NEW: HRM admin - Add tabs
+NEW: HRM - Include more options to manage/custom dashboard
+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: 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)
+NEW: Preview of pdf files of expense report lines
+NEW: print without details
+NEW: project time spent: conf to prevent recording time after X months
+NEW: rewrite bind accountancy code finding on customer and sales invoice
+NEW: Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
+NEW: Survey - Add a clickable link in email send
+NEW: Social Contributions - Add from/to filter on list
+NEW: Supplier order and proposal - Add From/to input on search date
+NEW: Task - Add From/to input on search date
+NEW: Add theme option THEME_ELDY_USEBORDERONTABLE
+NEW: The Anti-CSRF protection MAIN_SECURITY_CSRF_WITH_TOKEN is on to value 1 by default
+NEW: Update SQL : install and migration
+NEW: Use an ajax call for the clicktodial feature instead of href link.
+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
+NEW: Stable module Knowledge Management
+NEW: Experimental module Event Organization Management
+NEW: Experimental module Workstations Management
+NEW: Development of module Partnership Management
+
+
+For developers:
+---------------
+
+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: 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).
+ 
+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 
+  into forms will be broken. The security token field is expected since Dolibarr v9 but a lot of external modules did not implement it).
+* Update hook 'printOriginObjectLine', removed check on product type and special code. Need now reshook.
+* Old deprecated module "SimplePOS" has been completely removed. Use module "TakePOS" is you need a Point Of Sale.
+* The method static ActionComm::getActions($db, ...) is no more static. Use $actioncomm->getActions(...) instead (without $db param). 
+* The 'action=delete&file=...' has been replaced with 'action=deletefile&file=...' to avoid confusion with deletion of object lines.
+* Method getDictvalue has been renamed into getDictionaryValue to match camel case rule.
+* To execute shell or command line command, your code must never use method like exec, shell_exec, popen, .. but must use the built-in 
+  method executeCLI() available into core/class/utils.class.php  
+* Class file expeditionbatch.class.php renamed to expeditionlinebatch.class.php
+* ExpeditionLineBatch::fetchAll is not static anymore and first parameter $db is removed
+* ExtraFields->showOutputField parameter 4 'extrafieldsobjectkey' is now required
+* CommonObject method add_object_linked now sets targettype to 'mymodule_myobject' instead of 'myobject', 
+  you can use hook 'setLinkedObjectSourceTargetType' to set your usual targettype
+
+
 ***** ChangeLog for 14.0.5 compared to 14.0.4 *****
 
 FIX: 13.0: printFieldListWhere called twice on same query
@@ -502,7 +660,7 @@ Following changes may create regressions for some external modules, but were nec
 * The ICS value for direct debit or credit transfer is now stored on each bank account instead of into the global setup.
 * API /setup/shipment_methods has been replaced with API /setup/shipping_methods
 * Field "total" renamed into "total_ht"  for table llx_facture, llx_facture_rec for better field name consistency
-* Field "tva"   renamed into "total_tva" for table llx_propal, llx_supplier_proposal, llx_commande, llx_commande_fournisseur for better field name consistency
+* Field "tva"   renamed into "total_tva" for llx_facture, table llx_propal, llx_supplier_proposal, llx_commande, llx_commande_fournisseur for better field name consistency
 * Field "total" renamed into "total_ttc" for table llx_propal, llx_supplier_proposal for better field name consistency
 * If your database is PostgreSQL, you must use version 9.1.0 or more (Dolibarr need the SQL function CONCAT)
 * If your database is MySQL or MariaDB, you need at least version 5.1
@@ -547,11 +705,11 @@ FIX: wrong users count in multicompany transverse mode
 ***** ChangeLog for 13.0.4 compared to 13.0.3 *****
 
 FIX: Allow disabling of a module (not a dangerous action) even if there is problem with token (due to bugged modules).
-FIX: 13.0 - fatal - missing inclusion of ajax.lib.php for calling `ajax_autocompleter()`
-FIX: #17919 pictures in docs.
+FIX: 13.0 - fatal - missing inclusion of ajax.lib.php for calling 'ajax_autocompleter()'
+FIX: #17919 pictures in docs
 FIX: #18006
 FIX: Accountancy - if we define a date start, automatic binding try to continue to solve old binding
-FIX: Accoutancy Limit date payment not registered on purchases operations
+FIX: Accountancy - Limit date payment not registered on purchases operations
 FIX: Can't edit replacement invoice
 FIX: deposit can create credit note in payment conf
 FIX: division by zero on create
@@ -655,7 +813,7 @@ FIX: File attachment on lots/batches
 FIX: handling $heightforinfotot when he's superior to a page height on Supplier Invoice
 FIX: hourglass and hide button to pay
 FIX: massaction validate invoice do not regenerate PDF
-FIX: missing mp4 video mime
+FIX: #16627 fix missing mp4 video mime
 FIX: picto on shipment to reset qty to 0. Some quantities were not reset.
 FIX: Protection to avoid #16504
 FIX: rounding amount on card updating
diff --git a/README-FR.md b/README-FR.md
index 81fdff13047..a67bf204076 100644
--- a/README-FR.md
+++ b/README-FR.md
@@ -8,12 +8,10 @@ Il est simple d'utilisation et modulaire, vous permettant de n'activez que les f
 
 ![ScreenShot](https://www.dolibarr.org/medias/dolibarr_screenshot1_1920x1080.jpg)
 
-
 ## LICENCE
 
 Dolibarr est distribué sous les termes de la licence GNU General Public License v3+ ou supérieure.
 
-
 ## INSTALLER DOLIBARR
 
 ### Configuration simple
@@ -54,7 +52,6 @@ Vous pouvez aussi utiliser un serveur Web et une base de données prise en charg
 
 - Suivez les instructions de l'installateur
 
-
 ## METTRE A JOUR DOLIBARR
 
 Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
@@ -65,14 +62,12 @@ Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
 - Au prochain accès, Dolibarr proposera la page de "mise à jour" des données (si nécessaire).
   Si un fichier install.lock existe pour verrouiller le processus de mise à jour, il sera demandé de le supprimer manuellement (vous devriez trouver le fichier install.lock dans le répertoire utilisé pour stocker les documents générés ou transférés sur le serveur. Dans la plupart des cas, c'est le répertoire appelé "documents")
 
-*Note: Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
-
+Note: *Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
 
 ## CE QUI EST NOUVEAU
 
 See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
 
-
 ## CE QUE DOLIBARR PEUT FAIRE
 
 ### Modules principaux (tous optionnels)
@@ -122,7 +117,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Peux être multi-société par ajout du module externe multi-société.
 - Plusieurs thèmes visuels.
 - Application simple à utiliser.
-- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur https://wiki.dolibarr.org/index.php/Prérequis).
+- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur [https://wiki.dolibarr.org/index.php/Prérequis](https://wiki.dolibarr.org/index.php/Prérequis)).
 - Compatible avec toutes les offres Cloud du marché respectant les prérequis de base de données et PHP.
 - APIs.
 - Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
@@ -142,7 +137,6 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 Dolibarr peut aussi être étendu à volonté avec l'ajout de module/applications externes développées par des développeus tiers, disponible sur [DoliStore](https://www.dolistore.com).
 
-
 ## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE
 
 Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
@@ -152,18 +146,15 @@ Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
 - Dolibarr n'embarque pas de Webmail intégré nativement.
 - Dolibarr ne fait pas le café (pas encore).
 
-
 ## DOCUMENTATION
 
 La documentation utilisateur, développeur et traducteur est disponible sous forme de ressources de la communauté via le site [Wiki](https://wiki.dolibarr.org).
 
-
 ## CONTRIBUER
 
 Ce projet existe grâce à ses nombreux contributeurs [[Contribuer](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
 
-<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
-
+[![Dolibarr](https://opencollective.com/dolibarr/contributors.svg?width=890&button=false)](https://github.com/Dolibarr/dolibarr/graphs/contributors)
 
 ## CREDITS
 
@@ -171,7 +162,6 @@ Dolibarr est le résultat du travail de nombreux contributeurs depuis des année
 
 Voir le fichier [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT)
 
-
 ## ACTUALITES ET RESEAUX SOCIAUX
 
 Suivez le projet Dolibarr project sur les réseaux francophones
diff --git a/README.md b/README.md
index 5116c7b21ce..4e120a4cb91 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@
 ![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)
 [![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%205.6-8892BF.svg?style=flat-square)](https://php.net/)
 [![GitHub release](https://img.shields.io/github/v/release/Dolibarr/dolibarr)](https://github.com/Dolibarr/dolibarr)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5521/badge)](https://bestpractices.coreinfrastructure.org/projects/5521)
 
 Dolibarr ERP & CRM is a modern software package that helps manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
 
@@ -43,7 +44,7 @@ You can use a web server and a supported database (MariaDB, MySQL or PostgreSQL)
 
 On GNU/Linux, first check if your distribution has already packaged Dolibarr.
 
-#### Generic install steps:
+#### Generic install steps
 
 - Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Releases).
 
@@ -71,86 +72,87 @@ On GNU/Linux, first check if your distribution has already packaged Dolibarr.
 
 - Follow the installer instructions
 
-
 ### Saas/Cloud setup
 
-If you don't have time to install it yourself, you can try some commercial 'ready to use' Cloud offers (See https://saas.dolibarr.org). However, this third solution is not free.
-
+If you don't have time to install it yourself, you can try some commercial 'ready to use' Cloud offers (See [https://saas.dolibarr.org](https://saas.dolibarr.org)). However, this third solution is not free.
 
 ## UPGRADING
 
-Dolibarr supports upgrading usually wihtout the need for any (commercial) support (depending on if you use any commercial extensions) and supports upgrading all the way from any version after 2.8 without breakage. This is unique in the ERP ecosystem and a benefit our users highly appreciate!
- 
-- At first make a backup of your Dolibarr files & than [see](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
+Dolibarr supports upgrading, usually without the need for any (commercial) support (depending on if you use any commercial extensions). It supports upgrading all the way from any version after 2.8 without breakage. This is unique in the ERP ecosystem and a benefit our users highly appreciate!
+
+- At first make a backup of your Dolibarr files & then [see](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
 - Check that your installed PHP version is supported by the new version [see PHP support](./doc/phpmatrix.md).
 - Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
 - At first next access, Dolibarr will redirect you to the "install/" page to follow the upgrade process.
   If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file in the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
 
-
 ## WHAT'S NEW
 
 See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
 
-
 ## FEATURES
 
 ### Main application/modules (all optional)
 
-- Third-Parties Management: Customers, Prospects (Leads) and/or Suppliers + Contacts 
-- Members/Membership/Foundation management 
+- Third-Parties Management: Customers, Prospects (Leads) and/or Suppliers + Contacts
+- Members/Membership/Foundation management
 
- Product Management 
-- Products and/or Services catalog 
-- Stock / Warehouse management + Inventory 
-- Barcodes 
-- Batches / Lots / Serials 
-- Product Variants 
+ Product Management
+
+- Products and/or Services catalog
+- Stock / Warehouse management + Inventory
+- Barcodes
+- Batches / Lots / Serials
+- Product Variants
 - Bill of Materials (BOM)
-- Manufacturing Orders 
+- Manufacturing Orders
 
- Customer/Sales Management 
-- Customers/Prospects + Contacts management 
-- Opportunities or Leads management 
-- Commercial proposals management 
-- Customer Orders management 
-- Contracts/Subscription management 
-- Interventions management 
-- Ticket System 
-- Shipping management 
-- Customer Invoices/Credit notes and payment management 
-- Point of Sale (POS) 
+ Customer/Sales Management
 
- Supplier/Purchase Management 
-- Suppliers/Vendors + Contacts 
-- Supplier (price) requests 
-- Purchase Orders management 
-- Delivery/Receiption 
-- Supplier Invoices/credit notes and payment management 
-- INCOTERMS 
+- Customers/Prospects + Contacts management
+- Opportunities or Leads management
+- Commercial proposals management
+- Customer Orders management
+- Contracts/Subscription management
+- Interventions management
+- Ticket System
+- Shipping management
+- Customer Invoices/Credit notes and payment management
+- Point of Sale (POS)
 
- Finance / Accounting 
-- Invoices / Payments 
-- Bank accounts management 
-- Direct debit orders management (European SEPA) 
-- Accounting management 
-- Donations management 
-- Loan management 
-- Margins 
-- Reports 
+ Supplier/Purchase Management
 
- Collaboration 
-- Shared calendar/agenda (with ical and vcal export for third party tools integration) 
-- Projects & Tasks management 
-- Ticket System 
+- Suppliers/Vendors + Contacts
+- Supplier (price) requests
+- Purchase Orders management
+- Delivery/Receiption
+- Supplier Invoices/credit notes and payment management
+- INCOTERMS
+
+ Finance / Accounting
+
+- Invoices / Payments
+- Bank accounts management
+- Direct debit orders management (European SEPA)
+- Accounting management
+- Donations management
+- Loan management
+- Margins
+- Reports
+
+ Collaboration
+
+- Shared calendar/agenda (with ical and vcal export for third party tools integration)
+- Projects & Tasks management
+- Ticket System
 - Surveys
 
- HR 
-- Employee's leave requests management 
-- Expense reports 
-- Recruitment management 
-- Timesheets 
+ HR
 
+- Employee's leave requests management
+- Expense reports
+- Recruitment management
+- Timesheets
 
 ### Other application/modules
 
@@ -171,7 +173,6 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 (around 100 modules available by default, 1000+ on the addon market place)
 
-
 ### Other general features
 
 - Localization in most major languages
@@ -190,27 +191,24 @@ 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...
-  - Compatible with [European directives] (https://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
+  - Compatible with [European directives](https://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
   - Compatible with European GDPR rules
   - ...
 - Flexible PDF & ODT generation for invoices, proposals, orders...
 - ...
 
-
 ### System Environment / Requirements
 
 - PHP
-- MariaDB, MySQL or PostgreSQL 
+- MariaDB, MySQL or PostgreSQL
 - Compatible with all Cloud solutions that match PHP & MySQL or PostgreSQL prerequisites.
 
 See exact requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite)
 
-
 ### Extending
 
 Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
 
-
 ## WHAT DOLIBARR CAN'T DO YET
 
 These are features that Dolibarr does **not** yet fully support:
@@ -220,21 +218,18 @@ These are features that Dolibarr does **not** yet fully support:
 - No native embedded Webmail, but you can send email to contacts in Dolibarr with e.g. offers, invoices, etc.
 - Dolibarr can't do coffee (yet)
 
-
 ## DOCUMENTATION
 
 Administrator, user, developer and translator's documentations are available along with other community resources in the [Wiki](https://wiki.dolibarr.org).
 
-
 ## CONTRIBUTING
 
-This project exists thanks to all the people who contribute. 
+This project exists thanks to all the people who contribute.
 Please read the instructions how to contribute (report a bug/error, a feature request, send code ...)  [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)]
 
 A view on Contributors:
 
-<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
-
+[![Dolibarr](https://opencollective.com/dolibarr/contributors.svg?width=890&button=false)](https://github.com/Dolibarr/dolibarr/graphs/contributors)
 
 ## CREDITS
 
@@ -242,7 +237,6 @@ Dolibarr is the work of many contributors over the years and uses some fine PHP
 
 See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
 
-
 ## NEWS AND SOCIAL NETWORKS
 
 Follow Dolibarr project on:
@@ -253,8 +247,6 @@ Follow Dolibarr project on:
 - [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
 - [GitHub](https://github.com/Dolibarr/dolibarr)
 
-
 ### Sponsors
 
 Support this project by becoming a sponsor. Your logo will show up here. 🙏 [[Become a sponsor/backer](https://opencollective.com/dolibarr#backer)]
-
diff --git a/SECURITY.md b/SECURITY.md
index 7d65b7e98e4..cadd4a23791 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -4,16 +4,16 @@ This file contains some policies about the security reports on Dolibarr ERP CRM
 
 ## Supported Versions for security reports
 
-| Version   | Supported          |
-| --------- | ------------------ |
-| <= 12.*   | :x:                |
-| >= 13.*   | :white_check_mark: |
-
+| Version    | Supported              |
+| ---------- | ---------------------- |
+| <= 14.0.4  | :x:                    |
+| >= 14.0.5+ | :white_check_mark: except CSRF attacks|
+| >= develop | :white_check_mark:     |
 
 ## Reporting a Vulnerability
 
-To report a vulnerability, please use GitHub security advisory at https://github.com/Dolibarr/dolibarr/security/advisories/new (if you have permissions) or alternatively send an email to security@dolibarr.org (for everybody)
-
+To report a vulnerability, for a private report, please use GitHub security advisory at [https://github.com/Dolibarr/dolibarr/security/advisories/new](https://github.com/Dolibarr/dolibarr/security/advisories/new) (if you have permissions).
+Alternatively send an email to security@dolibarr.org (for everybody)
 
 ## Hunting vulnerabilities on Dolibarr
 
@@ -23,7 +23,7 @@ If you believe you've found a security bug in our service, we are happy to work
 
 Any type of denial of service attacks is strictly forbidden, as well as any interference with network equipment and Dolibarr infrastructure.
 
-We recommand to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: https://www.dolibarr.org/download) to get access on every side of application.
+We recommand to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: [https://www.dolibarr.org/download](https://www.dolibarr.org/download)) to get access on every side of application.
 
 ### User Agent
 
@@ -31,8 +31,7 @@ If you try to find bug on Dolibarr, we recommend to append to your user-agent he
 
 ### Account access
 
-You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put into your own web server virtual host from https://www.dolibarr.org/download
-
+You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put into your own web server virtual host from [https://www.dolibarr.org/download](https://www.dolibarr.org/download)
 
 ## Eligibility and Responsible Disclosure
 
@@ -46,7 +45,6 @@ You must avoid tests that could cause degradation or interruption of our service
 
 You must not leak, manipulate, or destroy any user data of third parties to find your vulnerability.
 
-
 ## Scope for qualified vulnerabilities
 
 ONLY vulnerabilities discovered, when the following setup on test platform is used, are "valid":
@@ -54,23 +52,22 @@ ONLY vulnerabilities discovered, when the following setup on test platform is us
 * $dolibarr_main_prod must be set to 1 into conf.php
 * $dolibarr_nocsrfcheck must be kept to the value 0 into conf.php (this is the default value)
 * $dolibarr_main_force_https must be set to something else than 0.
-* The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 1 into backoffice menu Home - Setup - Other (this protection should be set to 1 soon by default)
+* The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 3 into backoffice menu Home - Setup - Other (this protection should be set to 3 soon by default)
 * 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.
-* CSRF attacks are accepted when using a POST URL, but when using GET URL, they are validated only for creating, updating or deleting data resctricted from pages restricted to admin users.
+* 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.
 
 Scope is the web application (back office) and the APIs.
 
-
 ## Qualifying vulnerabilities for reporting
 
 * Remote code execution (RCE)
 * Local files access and manipulation (LFI, RFI, XXE, SSRF, XSPA)
 * Code injections (HTML, JS, SQL, PHP, ...)
-* Cross-Site Scripting (XSS), except from setup page of module "External web site" (allowing any content here, editable by admin user only, is accepted on purpose or into module "Web site" when permission to edit website content is allowed).
+* Cross-Site Scripting (XSS), except from setup page of module "External web site" (allowing any content here, editable by admin user only, is accepted on purpose) and except into module "Web site" when permission to edit website content is allowed (injecting any data in this case is allowed too).
 * Cross-Site Requests Forgery (CSRF) with real security impact (when using GET URLs, CSRF are qualified only for creating, updating or deleting data from pages restricted to admin users)
 * Open redirect
 * Broken authentication & session management
@@ -81,7 +78,6 @@ Scope is the web application (back office) and the APIs.
 * Software version disclosure (for non admin users only)
 * Stack traces or path disclosure (for non admin users only)
 
-
 ## Non-qualifying vulnerabilities for reporting
 
 * "Self" XSS
@@ -90,9 +86,8 @@ Scope is the web application (back office) and the APIs.
 * Clickjacking/UI redressing
 * Physical or social engineering attempts or issues that require physical access to a victim’s computer/device
 * Presence of autocomplete attribute on web forms
-* Vulnerabilities affecting outdated browsers or platforms
+* Vulnerabilities affecting outdated browsers or platforms, or vulnerabilities inside browsers themself.
 * Logout and other instances of low-severity Cross-Site Request Forgery
-* Missing cookie flags
 * Missing security-related HTTP headers which do not lead directly to a vulnerability
 * Reports from automated web vulnerability scanners (Acunetix, Vega, etc.) that have not been validated
 * Invalid or missing SPF (Sender Policy Framework) records (Incomplete or missing SPF/DKIM/DMARC)
@@ -100,4 +95,3 @@ Scope is the web application (back office) and the APIs.
 * Software version or private IP disclosure when logged user is admin
 * Stack traces or path disclosure when logged user is admin
 * Any vulnerabilities due to a configuration different than the one defined into chapter "Scope for qualified vulnerabilities".
-
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index e39f96b0b27..ead2a8af1c5 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -55,7 +55,6 @@ RUN echo "host mail" >> /etc/msmtprc
 RUN echo "from local@localdomain.com" >> /etc/msmtprc
 RUN echo "domain localhost.localdomain" >> /etc/msmtprc
 RUN echo "sendmail_path=/usr/bin/msmtp -t" >> /usr/local/etc/php/conf.d/php-sendmail.ini
-RUN echo "localhost localhost.localdomain" >> /etc/hosts
 
 EXPOSE 80
 
diff --git a/composer.json b/composer.json
index 130fda34945..8d82f530df8 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
 		"nnnick/chartjs" : "^2.9",
 		"stripe/stripe-php" : "6.43.1",
 		"maximebf/debugbar" : "1.15.1",
-		"symfony/var-dumper" : "3"
+		"symfony/var-dumper" : "3.2"
 	},
 	"require-dev" : {
 		"php-parallel-lint/php-parallel-lint" : "^0",
diff --git a/composer.lock b/composer.lock
index 3e867f8f186..5f761cb63fe 100644
--- a/composer.lock
+++ b/composer.lock
@@ -591,7 +591,7 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.0.0",
+            "version": "v3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
@@ -616,7 +616,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 2f4b62d82ba..d4a9b725524 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -200,6 +200,11 @@ with:
 with
 	} elseif (($key == '/Index') AND ($v[0] == PDF_TYPE_ARRAY AND count($v[1]) >= 2)) {
 
+* Fix php fatal error on php 8.0 on tcpdi.php
+	while (list($k, $v) = each($value[1])) {
+with
+	foreach ($value[1] as $k => $v) {
+
 
 
 JSGANTT:
@@ -230,11 +235,13 @@ JCROP:
 * Remove analytics tag into file index.html
 
 
+
 JQUERYFILETREE:
 ---------------
 * Remove directory htdocs/includes/jquery/plugins/jqueryFileTree/connectors
 
 
+
 RESTLER:
 --------
 
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 933c3b1afa2..37264fb8e4d 100755
--- a/dev/initdemo/initdemopassword.sh
+++ b/dev/initdemo/initdemopassword.sh
@@ -171,7 +171,10 @@ if [ $res -ne 0 ]; then
 fi 
 
 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.
 fi 
 
 
diff --git a/dev/initdemo/mysqldump_dolibarr_14.0.0.sql b/dev/initdemo/mysqldump_dolibarr_15.0.0.sql
similarity index 93%
rename from dev/initdemo/mysqldump_dolibarr_14.0.0.sql
rename to dev/initdemo/mysqldump_dolibarr_15.0.0.sql
index 4061fb9f4cf..8b17c34203f 100644
--- a/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_15.0.0.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.19  Distrib 10.3.29-MariaDB, for debian-linux-gnu (x86_64)
+-- MySQL dump 10.19  Distrib 10.3.31-MariaDB, for debian-linux-gnu (x86_64)
 --
--- Host: localhost    Database: dolibarr_14
+-- Host: localhost    Database: dolibarr_15
 -- ------------------------------------------------------
--- Server version	10.3.29-MariaDB-0ubuntu0.20.04.1
+-- Server version	10.3.31-MariaDB-0ubuntu0.20.04.1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -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=utf8 COLLATE=utf8_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;
 
@@ -453,7 +453,7 @@ CREATE TABLE `llx_actioncomm_resources` (
   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=utf8 COLLATE=utf8_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;
 
@@ -496,7 +496,6 @@ CREATE TABLE `llx_adherent` (
   `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,
@@ -516,14 +515,6 @@ CREATE TABLE `llx_adherent` (
   `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,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_adherent_ref` (`ref`,`entity`),
@@ -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;
 
@@ -872,7 +863,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),(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','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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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','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),(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','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),(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),(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),(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','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),(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','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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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);
 /*!40000 ALTER TABLE `llx_bank` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1075,7 +1066,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=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1084,7 +1075,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;
 
@@ -1152,7 +1143,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=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1161,7 +1152,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;
 
@@ -1215,7 +1206,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=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1224,7 +1215,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;
 
@@ -1281,7 +1272,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;
 
@@ -1342,7 +1333,7 @@ CREATE TABLE `llx_boxes` (
   KEY `idx_boxes_boxid` (`box_id`),
   KEY `idx_boxes_fk_user` (`fk_user`),
   CONSTRAINT `fk_boxes_box_id` FOREIGN KEY (`box_id`) REFERENCES `llx_boxes_def` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=1456 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1459 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1351,7 +1342,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),(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),(1456,1,474,0,'0',0,NULL,NULL),(1457,1,475,0,'0',0,NULL,NULL),(1458,1,476,0,'0',0,NULL,NULL);
 /*!40000 ALTER TABLE `llx_boxes` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1370,7 +1361,7 @@ CREATE TABLE `llx_boxes_def` (
   `note` varchar(130) COLLATE utf8_unicode_ci DEFAULT NULL,
   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=477 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1379,7 +1370,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),(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),(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),(474,'box_boms.php',1,'2022-02-07 13:38:16',NULL),(475,'box_comptes.php',1,'2022-02-07 13:38:16',NULL),(476,'box_mos.php',1,'2022-02-07 13:38:17',NULL);
 /*!40000 ALTER TABLE `llx_boxes_def` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1499,7 +1490,7 @@ CREATE TABLE `llx_c_action_trigger` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_action_trigger_code` (`code`),
   KEY `idx_action_trigger_rang` (`rang`)
-) ENGINE=InnoDB AUTO_INCREMENT=394 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=407 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1508,7 +1499,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);
 /*!40000 ALTER TABLE `llx_c_action_trigger` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1589,7 +1580,7 @@ CREATE TABLE `llx_c_barcode_type` (
   `example` varchar(16) COLLATE utf8_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=71 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1871,7 +1862,7 @@ CREATE TABLE `llx_c_email_templates` (
   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=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1880,7 +1871,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;
 
@@ -2030,7 +2021,7 @@ CREATE TABLE `llx_c_forme_juridique` (
   `position` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_forme_juridique` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=100230 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=100242 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2039,7 +2030,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);
 /*!40000 ALTER TABLE `llx_c_forme_juridique` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2056,7 +2047,7 @@ CREATE TABLE `llx_c_holiday_types` (
   `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   `affect` int(11) NOT NULL,
   `delay` int(11) NOT NULL,
-  `newByMonth` double(8,5) NOT NULL DEFAULT 0.00000,
+  `newbymonth` double(8,5) NOT NULL DEFAULT 0.00000,
   `fk_country` int(11) DEFAULT NULL,
   `active` int(11) DEFAULT 1,
   PRIMARY KEY (`rowid`),
@@ -2296,7 +2287,7 @@ CREATE TABLE `llx_c_paiement` (
   `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=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2305,7 +2296,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;
 
@@ -2352,7 +2343,8 @@ CREATE TABLE `llx_c_partnership_type` (
   `code` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
   `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  PRIMARY KEY (`rowid`)
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_partnership_type` (`entity`,`code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -3194,6 +3186,7 @@ DROP TABLE IF EXISTS `llx_c_units`;
 CREATE TABLE `llx_c_units` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `code` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `sortorder` smallint(6) DEFAULT NULL,
   `label` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `short_label` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
@@ -3210,7 +3203,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;
 
@@ -3819,6 +3812,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 utf8_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=utf8 COLLATE=utf8_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`
 --
@@ -3963,6 +3984,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 utf8_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=utf8 COLLATE=utf8_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`
 --
@@ -4173,7 +4222,7 @@ CREATE TABLE `llx_commande` (
   `fk_incoterms` int(11) DEFAULT NULL,
   `location_incoterms` varchar(255) COLLATE utf8_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 utf8_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,
@@ -4204,7 +4253,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,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,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,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,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,'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,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,'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,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,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,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,'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,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,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,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,'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,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,'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,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,'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,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,'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,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,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,'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,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,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,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,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,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,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,0,'',0,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_commande` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4285,7 +4334,7 @@ CREATE TABLE `llx_commande_fournisseur` (
   `fk_incoterms` int(11) DEFAULT NULL,
   `location_incoterms` varchar(255) COLLATE utf8_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 utf8_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,
@@ -4305,7 +4354,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,'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);
 /*!40000 ALTER TABLE `llx_commande_fournisseur` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4333,6 +4382,7 @@ CREATE TABLE `llx_commande_fournisseur_dispatch` (
   `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;
@@ -4344,7 +4394,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;
 
@@ -4468,7 +4518,7 @@ CREATE TABLE `llx_commande_fournisseurdet` (
   `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 utf8_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,
@@ -4561,7 +4611,7 @@ CREATE TABLE `llx_commandedet` (
   `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 utf8_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,
@@ -4662,7 +4712,7 @@ CREATE TABLE `llx_const` (
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_const` (`name`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=8943 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=9255 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4671,7 +4721,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'),(8943,'MAIN_MODULE_ACCOUNTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:16'),(8944,'MAIN_MODULE_AGENDA',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:16'),(8945,'MAIN_MODULE_BOM',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:16'),(8946,'MAIN_MODULE_BANQUE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:16'),(8947,'MAIN_MODULE_BARCODE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:17'),(8948,'MAIN_MODULE_CRON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:17'),(8949,'MAIN_MODULE_COMMANDE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:17'),(8950,'MAIN_MODULE_DON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:17'),(8951,'MAIN_MODULE_ECM',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:17'),(8952,'MAIN_MODULE_EXPENSEREPORT',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:17'),(8953,'MAIN_MODULE_FACTURE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:17'),(8954,'MAIN_MODULE_FOURNISSEUR',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:17'),(8955,'MAIN_MODULE_HOLIDAY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:17'),(8956,'MAIN_MODULE_MARGIN',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:17'),(8959,'MAIN_MODULE_MRP',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:17'),(8960,'MAIN_MODULE_MRP_TRIGGERS',1,'0','chaine',0,NULL,'2022-02-07 13:38:17'),(8961,'MAIN_MODULE_MRP_LOGIN',1,'0','chaine',0,NULL,'2022-02-07 13:38:17'),(8962,'MAIN_MODULE_MRP_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2022-02-07 13:38:17'),(8963,'MAIN_MODULE_MRP_MENUS',1,'0','chaine',0,NULL,'2022-02-07 13:38:17'),(8964,'MAIN_MODULE_MRP_TPL',1,'0','chaine',0,NULL,'2022-02-07 13:38:17'),(8965,'MAIN_MODULE_MRP_BARCODE',1,'0','chaine',0,NULL,'2022-02-07 13:38:17'),(8966,'MAIN_MODULE_MRP_MODELS',1,'0','chaine',0,NULL,'2022-02-07 13:38:17'),(8967,'MAIN_MODULE_MRP_THEME',1,'0','chaine',0,NULL,'2022-02-07 13:38:17'),(8968,'MAIN_MODULE_MRP_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2022-02-07 13:38:17'),(8969,'MAIN_MODULE_OPENSURVEY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:17'),(8970,'MAIN_MODULE_PRINTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:17'),(8971,'MAIN_MODULE_RECRUITMENT',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:18'),(8972,'MAIN_MODULE_RECRUITMENT_TRIGGERS',1,'0','chaine',0,NULL,'2022-02-07 13:38:18'),(8973,'MAIN_MODULE_RECRUITMENT_LOGIN',1,'0','chaine',0,NULL,'2022-02-07 13:38:18'),(8974,'MAIN_MODULE_RECRUITMENT_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2022-02-07 13:38:18'),(8975,'MAIN_MODULE_RECRUITMENT_MENUS',1,'0','chaine',0,NULL,'2022-02-07 13:38:18'),(8976,'MAIN_MODULE_RECRUITMENT_TPL',1,'0','chaine',0,NULL,'2022-02-07 13:38:18'),(8977,'MAIN_MODULE_RECRUITMENT_BARCODE',1,'0','chaine',0,NULL,'2022-02-07 13:38:18'),(8978,'MAIN_MODULE_RECRUITMENT_MODELS',1,'1','chaine',0,NULL,'2022-02-07 13:38:18'),(8979,'MAIN_MODULE_RECRUITMENT_THEME',1,'0','chaine',0,NULL,'2022-02-07 13:38:18'),(8980,'MAIN_MODULE_RECRUITMENT_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2022-02-07 13:38:18'),(8981,'MAIN_MODULE_RESOURCE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:18'),(8982,'MAIN_MODULE_SALARIES',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:18'),(8983,'MAIN_MODULE_SERVICE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:18'),(8984,'MAIN_MODULE_SYSLOG',0,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:18'),(8985,'MAIN_MODULE_SOCIETE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:18'),(8986,'MAIN_MODULE_STRIPE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:18'),(8987,'MAIN_MODULE_TICKET',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:18'),(8988,'MAIN_MODULE_TICKET_TABS_0',1,'thirdparty:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__','chaine',0,NULL,'2022-02-07 13:38:18'),(8989,'MAIN_MODULE_TICKET_TABS_1',1,'project:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?projectid=__ID__','chaine',0,NULL,'2022-02-07 13:38:18'),(8990,'MAIN_MODULE_TICKET_TRIGGERS',1,'1','chaine',0,NULL,'2022-02-07 13:38:18'),(8991,'TAKEPOS_PRINT_METHOD',1,'browser','chaine',0,'','2022-02-07 13:38:18'),(8992,'MAIN_MODULE_TAKEPOS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:18'),(8993,'MAIN_MODULE_TAKEPOS_TRIGGERS',1,'0','chaine',0,NULL,'2022-02-07 13:38:18'),(8994,'MAIN_MODULE_TAKEPOS_LOGIN',1,'0','chaine',0,NULL,'2022-02-07 13:38:18'),(8995,'MAIN_MODULE_TAKEPOS_SUBSTITUTIONS',1,'1','chaine',0,NULL,'2022-02-07 13:38:18'),(8996,'MAIN_MODULE_TAKEPOS_MENUS',1,'0','chaine',0,NULL,'2022-02-07 13:38:18'),(8997,'MAIN_MODULE_TAKEPOS_THEME',1,'0','chaine',0,NULL,'2022-02-07 13:38:18'),(8998,'MAIN_MODULE_TAKEPOS_TPL',1,'0','chaine',0,NULL,'2022-02-07 13:38:18'),(8999,'MAIN_MODULE_TAKEPOS_BARCODE',1,'0','chaine',0,NULL,'2022-02-07 13:38:18'),(9000,'MAIN_MODULE_TAKEPOS_MODELS',1,'0','chaine',0,NULL,'2022-02-07 13:38:18'),(9001,'MAIN_MODULE_USER',0,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:18'),(9002,'MAIN_MODULE_VARIANTS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:18'),(9003,'MAIN_MODULE_WEBSITE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:38:18'),(9004,'MAIN_VERSION_LAST_UPGRADE',0,'15.0.0','chaine',0,'Dolibarr version for last upgrade','2022-02-07 13:38:20'),(9006,'MAIN_FIRST_PING_OK_DATE',1,'20220207133821','chaine',0,'','2022-02-07 13:38:21'),(9007,'MAIN_FIRST_PING_OK_ID',1,'disabled','chaine',0,'','2022-02-07 13:38:21'),(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');
 /*!40000 ALTER TABLE `llx_const` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4802,7 +4852,7 @@ CREATE TABLE `llx_contratdet` (
   `commentaire` text COLLATE utf8_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 utf8_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,
@@ -4930,7 +4980,7 @@ CREATE TABLE `llx_cronjob` (
   `test` varchar(255) COLLATE utf8_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;
+) ENGINE=InnoDB AUTO_INCREMENT=50 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4939,7 +4989,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),(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),(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);
 /*!40000 ALTER TABLE `llx_cronjob` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5165,7 +5215,7 @@ CREATE TABLE `llx_document_model` (
   `description` text COLLATE utf8_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=418 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5174,7 +5224,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),(410,'einstein',1,'order',NULL,NULL),(411,'html_cerfafr',1,'donation',NULL,NULL),(412,'standard',1,'expensereport',NULL,NULL),(413,'crabe',1,'invoice',NULL,NULL),(414,'muscadet',1,'order_supplier',NULL,NULL),(415,'standard_recruitmentjobposition',1,'recruitmentjobposition',NULL,NULL),(416,'generic_recruitmentjobposition_odt',1,'recruitmentjobposition',NULL,NULL),(417,'TICKET_ADDON_PDF_ODT_PATH',1,'ticket',NULL,NULL);
 /*!40000 ALTER TABLE `llx_document_model` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5362,7 +5412,7 @@ CREATE TABLE `llx_ecm_files` (
   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=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5371,7 +5421,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;
 
@@ -5561,7 +5611,7 @@ 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,
+  `actionparam` text COLLATE utf8_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,
@@ -5650,6 +5700,7 @@ CREATE TABLE `llx_entrepot` (
   `fk_parent` int(11) DEFAULT 0,
   `fax` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
   `phone` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `warehouse_usage` int(11) DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_entrepot_label` (`ref`,`entity`)
 ) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -5661,7 +5712,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),(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),(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),(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),(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),(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),(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),(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),(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),(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);
 /*!40000 ALTER TABLE `llx_entrepot` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5767,7 +5818,7 @@ CREATE TABLE `llx_eventorganization_conferenceorboothattendee` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `ref` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
   `fk_soc` int(11) DEFAULT NULL,
-  `fk_actioncomm` int(11) NOT NULL,
+  `fk_actioncomm` int(11) DEFAULT NULL,
   `email` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
   `date_subscription` datetime DEFAULT NULL,
   `amount` double DEFAULT NULL,
@@ -5781,16 +5832,16 @@ CREATE TABLE `llx_eventorganization_conferenceorboothattendee` (
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `status` smallint(6) NOT NULL,
+  `fk_project` int(11) NOT NULL,
+  `fk_invoice` int(11) 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`)
+  KEY `idx_eventorganization_conferenceorboothattendee_status` (`status`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -6125,7 +6176,7 @@ CREATE TABLE `llx_expensereport` (
   `model_pdf` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
   `last_main_doc` varchar(255) COLLATE utf8_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 utf8_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,
@@ -6151,7 +6202,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;
 
@@ -6190,7 +6241,7 @@ CREATE TABLE `llx_expensereport_det` (
   `rang` int(11) DEFAULT 0,
   `import_key` varchar(14) COLLATE utf8_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 utf8_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,
@@ -6473,7 +6524,7 @@ CREATE TABLE `llx_facture` (
   `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 utf8_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,
@@ -6506,7 +6557,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','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','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;
 
@@ -6586,7 +6637,7 @@ CREATE TABLE `llx_facture_fourn` (
   `location_incoterms` varchar(255) COLLATE utf8_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 utf8_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,
@@ -6616,7 +6667,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),(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','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),(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);
 /*!40000 ALTER TABLE `llx_facture_fourn` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6661,7 +6712,7 @@ CREATE TABLE `llx_facture_fourn_det` (
   `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 utf8_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,
@@ -6683,7 +6734,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;
 
@@ -6782,7 +6833,7 @@ 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 utf8_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,
@@ -6886,7 +6937,7 @@ CREATE TABLE `llx_facturedet` (
   `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 utf8_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,
@@ -6977,7 +7028,7 @@ CREATE TABLE `llx_facturedet_rec` (
   `fk_unit` int(11) DEFAULT NULL,
   `import_key` varchar(14) COLLATE utf8_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 utf8_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,
@@ -7304,6 +7355,8 @@ CREATE TABLE `llx_holiday` (
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
+  `date_approve` datetime DEFAULT NULL,
+  `fk_user_approve` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_holiday_fk_user` (`fk_user`),
   KEY `idx_holiday_date_debut` (`date_debut`),
@@ -7321,7 +7374,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,'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,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),(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);
 /*!40000 ALTER TABLE `llx_holiday` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7348,7 +7401,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;
 
@@ -7433,6 +7486,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 utf8_unicode_ci NOT NULL DEFAULT '(PROV)',
+  `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,
+  `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,
+  `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=utf8 COLLATE=utf8_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 utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_evaluation_fk_object` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_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 utf8_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=utf8 COLLATE=utf8_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 utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_evaluationdet_fk_object` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_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 utf8_unicode_ci NOT NULL,
+  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `deplacement` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8_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=utf8 COLLATE=utf8_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 utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_job_fk_object` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_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 utf8_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 utf8_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8_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=utf8 COLLATE=utf8_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 utf8_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8_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 utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8_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=utf8 COLLATE=utf8_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 utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_skill_fk_object` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_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 utf8_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=utf8 COLLATE=utf8_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 utf8_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=utf8 COLLATE=utf8_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`
 --
@@ -7474,7 +7879,7 @@ 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 utf8_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,
@@ -7558,6 +7963,7 @@ CREATE TABLE `llx_inventorydet` (
   `qty_view` double DEFAULT NULL,
   `qty_stock` double DEFAULT NULL,
   `qty_regulated` double DEFAULT NULL,
+  `fk_movement` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_inventorydet` (`fk_inventory`,`fk_warehouse`,`fk_product`,`batch`),
   KEY `idx_inventorydet_tms` (`tms`),
@@ -7599,8 +8005,10 @@ CREATE TABLE `llx_knowledgemanagement_knowledgerecord` (
   `fk_ticket` int(11) DEFAULT NULL,
   `fk_c_ticket_category` int(11) DEFAULT NULL,
   `status` int(11) NOT NULL,
+  `lang` varchar(6) COLLATE utf8_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=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7609,6 +8017,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;
 
@@ -7933,7 +8342,7 @@ CREATE TABLE `llx_menu` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_menu_uk_menu` (`menu_handler`,`fk_menu`,`position`,`url`,`entity`),
   KEY `idx_menu_menuhandler_type` (`menu_handler`,`type`)
-) ENGINE=InnoDB AUTO_INCREMENT=167134 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=167187 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7942,7 +8351,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'),(167134,'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,'2022-02-07 13:38:16'),(167135,'all',1,'agenda','left','agenda',167134,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-02-07 13:38:16'),(167136,'all',1,'agenda','left','agenda',167135,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-02-07 13:38:16'),(167137,'all',1,'agenda','left','agenda',167135,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-02-07 13:38:16'),(167138,'all',1,'agenda','left','agenda',167137,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-02-07 13:38:16'),(167139,'all',1,'agenda','left','agenda',167137,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-02-07 13:38:16'),(167140,'all',1,'agenda','left','agenda',167137,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-02-07 13:38:16'),(167141,'all',1,'agenda','left','agenda',167137,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-02-07 13:38:16'),(167142,'all',1,'agenda','left','agenda',167135,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-02-07 13:38:16'),(167143,'all',1,'agenda','left','agenda',167142,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-02-07 13:38:16'),(167144,'all',1,'agenda','left','agenda',167142,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-02-07 13:38:16'),(167145,'all',1,'agenda','left','agenda',167142,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-02-07 13:38:16'),(167146,'all',1,'agenda','left','agenda',167142,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-02-07 13:38:16'),(167147,'all',1,'agenda','left','agenda',167135,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-02-07 13:38:16'),(167148,'all',1,'agenda','left','agenda',167135,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-02-07 13:38:16'),(167149,'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-02-07 13:38:17'),(167150,'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-02-07 13:38:17'),(167151,'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-02-07 13:38:17'),(167153,'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-02-07 13:38:17'),(167154,'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-02-07 13:38:17'),(167155,'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-02-07 13:38:17'),(167156,'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-02-07 13:38:17'),(167157,'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-02-07 13:38:17'),(167158,'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-02-07 13:38:17'),(167159,'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-02-07 13:38:17'),(167160,'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-02-07 13:38:17'),(167161,'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-02-07 13:38:17'),(167162,'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-02-07 13:38:18'),(167163,'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-02-07 13:38:18'),(167164,'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-02-07 13:38:18'),(167165,'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-02-07 13:38:18'),(167166,'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-02-07 13:38:18'),(167167,'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,'2022-02-07 13:38:18'),(167168,'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,'2022-02-07 13:38:18'),(167169,'all',1,'resource','left','tools',-1,'resource','tools',102,'/resource/list.php','','List','','resource',NULL,'resource_list','$user->rights->resource->read','1',0,'2022-02-07 13:38:18'),(167170,'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-02-07 13:38:18'),(167171,'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-02-07 13:38:18'),(167172,'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-02-07 13:38:18'),(167173,'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-02-07 13:38:18'),(167174,'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-02-07 13:38:18'),(167175,'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-02-07 13:38:18'),(167176,'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-02-07 13:38:18'),(167177,'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-02-07 13:38:18'),(167178,'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-02-07 13:38:18'),(167179,'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-02-07 13:38:18'),(167180,'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-02-07 13:38:18'),(167181,'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-02-07 13:38:18'),(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'),(167186,'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-02-07 14:32:50');
 /*!40000 ALTER TABLE `llx_menu` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7977,6 +8386,8 @@ 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 utf8_unicode_ci DEFAULT NULL,
+  `mrptype` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`),
   KEY `idx_mrp_mo_ref` (`ref`),
   KEY `idx_mrp_mo_entity` (`entity`),
@@ -7998,7 +8409,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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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);
 /*!40000 ALTER TABLE `llx_mrp_mo` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8575,7 +8986,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','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','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','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','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,6 +9003,8 @@ 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 utf8_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`),
@@ -8607,7 +9020,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;
 
@@ -8696,6 +9109,8 @@ 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 utf8_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`),
@@ -8709,7 +9124,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;
 
@@ -8727,7 +9142,7 @@ CREATE TABLE `llx_partnership` (
   `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,
   `date_creation` datetime NOT NULL,
@@ -8741,6 +9156,7 @@ CREATE TABLE `llx_partnership` (
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `last_check_backlink` datetime DEFAULT NULL,
+  `fk_type` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`rowid`),
   KEY `idx_partnership_rowid` (`rowid`),
   KEY `idx_partnership_ref` (`ref`),
@@ -9373,6 +9789,8 @@ CREATE TABLE `llx_product` (
   `batch_mask` varchar(32) COLLATE utf8_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`),
@@ -9401,7 +9819,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,6 +9836,7 @@ 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`),
@@ -9431,7 +9850,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;
 
@@ -9687,7 +10106,7 @@ CREATE TABLE `llx_product_customer_price` (
   `localtax2_type` varchar(10) COLLATE utf8_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,
+  `ref_customer` varchar(128) COLLATE utf8_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`),
@@ -9791,7 +10210,7 @@ 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,
+  `ref_fourn` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
   `desc_fourn` text COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_availability` int(11) DEFAULT NULL,
   `price` double(24,8) DEFAULT 0.00000000,
@@ -9813,7 +10232,7 @@ CREATE TABLE `llx_product_fournisseur_price` (
   `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 utf8_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',
@@ -9888,7 +10307,7 @@ 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 utf8_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,
@@ -9959,6 +10378,8 @@ CREATE TABLE `llx_product_lot` (
   `eol_date` datetime DEFAULT NULL,
   `manufacturing_date` datetime DEFAULT NULL,
   `scrapping_date` datetime DEFAULT NULL,
+  `barcode` varchar(180) COLLATE utf8_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;
@@ -9970,7 +10391,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;
 
@@ -10064,7 +10485,7 @@ CREATE TABLE `llx_product_price` (
   `import_key` varchar(14) COLLATE utf8_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 utf8_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,
@@ -10109,7 +10530,7 @@ CREATE TABLE `llx_product_price_by_qty` (
   `unitprice` double(24,8) DEFAULT 0.00000000,
   `price_base_type` varchar(3) COLLATE utf8_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 utf8_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,
@@ -10187,6 +10608,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 utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_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`
 --
@@ -10230,6 +10679,7 @@ CREATE TABLE `llx_projet` (
   `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`),
@@ -10243,7 +10693,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;
 
@@ -10299,6 +10749,7 @@ CREATE TABLE `llx_projet_task` (
   `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,
@@ -10324,7 +10775,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),(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),(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),(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),(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),(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),(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),(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),(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);
 /*!40000 ALTER TABLE `llx_projet_task` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10449,12 +10900,14 @@ CREATE TABLE `llx_propal` (
   `fk_incoterms` int(11) DEFAULT NULL,
   `location_incoterms` varchar(255) COLLATE utf8_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 utf8_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,
+  `online_sign_ip` varchar(48) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `online_sign_name` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_propal_ref` (`ref`,`entity`),
   KEY `idx_propal_fk_soc` (`fk_soc`),
@@ -10481,7 +10934,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,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,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,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,'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,NULL,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,NULL,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,NULL,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,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,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,'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,NULL,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,NULL,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,NULL,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,NULL,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,NULL,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,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,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,'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,NULL,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,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,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,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,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,'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,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,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,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,'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,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,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,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,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,'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,NULL,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,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,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,'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,'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,'','','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,'','','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,'','','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,'','','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;
 
@@ -10582,7 +11035,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 utf8_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,
@@ -10989,7 +11442,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,11,0),(11,'Lire les factures','facture',2,'lire',NULL,'a',1,10,0),(12,'Create and update invoices','facture',1,'creer',NULL,'a',0,11,0),(12,'Creer/modifier les factures','facture',2,'creer',NULL,'a',0,10,0),(13,'Devalidate invoices','facture',1,'invoice_advance','unvalidate','a',0,11,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,11,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,11,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,11,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,11,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,11,0),(82,'Creeat/modify sales orders','commande',1,'creer',NULL,'w',0,11,0),(84,'Validate sales orders','commande',1,'order_advance','validate','d',0,11,0),(86,'Send sale orders by email','commande',1,'order_advance','send','d',0,11,0),(87,'Close sale orders','commande',1,'order_advance','close','d',0,11,0),(88,'Cancel sale orders','commande',1,'order_advance','annuler','d',0,11,0),(89,'Delete sales orders','commande',1,'supprimer',NULL,'d',0,11,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,51,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,51,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,51,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,51,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,51,0),(115,'Exporter transactions et releves','banque',2,'export',NULL,'r',0,51,0),(116,'Virements entre comptes','banque',1,'transfer',NULL,'w',0,51,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,51,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,9,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,9,0),(122,'Creer modifier les societes','societe',2,'creer',NULL,'w',0,9,0),(125,'Delete third parties','societe',1,'supprimer',NULL,'d',0,9,0),(125,'Supprimer les societes','societe',2,'supprimer',NULL,'d',0,9,0),(126,'Export third parties','societe',1,'export',NULL,'r',0,9,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,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,'Read information of other users, groups and permissions','user',1,'user','lire','r',0,5,0),(252,'Read permissions of other users','user',1,'user_advance','readperms','r',0,5,0),(253,'Create/modify internal and external users, groups and permissions','user',1,'user','creer','w',0,5,0),(254,'Create/modify external users only','user',1,'user_advance','write','w',0,5,0),(255,'Modify the password of other users','user',1,'user','password','w',0,5,0),(256,'Delete or disable other users','user',1,'user','supprimer','d',0,5,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,9,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,9,0),(281,'Lire les contacts','societe',2,'contact','lire','r',1,9,0),(282,'Create and update contact','societe',1,'contact','creer','w',0,9,0),(282,'Creer modifier les contacts','societe',2,'contact','creer','w',0,9,0),(283,'Delete contacts','societe',1,'contact','supprimer','d',0,9,0),(283,'Supprimer les contacts','societe',2,'contact','supprimer','d',0,9,0),(286,'Export contacts','societe',1,'contact','export','d',0,9,0),(286,'Exporter les contacts','societe',2,'contact','export','d',0,9,0),(301,'Read barcodes','barcode',1,'lire_advance',NULL,'r',1,50,0),(302,'Create/modify barcodes','barcode',1,'creer_advance',NULL,'w',0,50,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,5,0),(342,'Create/modify of its own user','user',1,'self','creer','w',0,5,0),(343,'Modify its own password','user',1,'self','password','w',0,5,0),(344,'Modify its own permissions','user',1,'self_advance','writeperms','w',0,5,0),(351,'Read groups','user',1,'group_advance','read','r',0,5,0),(352,'Read permissions of groups','user',1,'group_advance','readperms','r',0,5,0),(353,'Create/modify groups and permissions','user',1,'group_advance','write','w',0,5,0),(354,'Delete groups','user',1,'group_advance','delete','d',0,5,0),(358,'Export all users','user',1,'user','export','r',0,5,0),(511,'Read employee salaries and payments (yours and your subordinates)','salaries',1,'read',NULL,'r',0,50,0),(512,'Create/modify payments of empoyee salaries','salaries',1,'write',NULL,'w',0,50,0),(514,'Delete payments of employee salary','salaries',1,'delete',NULL,'d',0,50,0),(517,'Read salaries and payments of all employees','salaries',1,'readall',NULL,'r',0,50,0),(519,'Export payments of employee salaries','salaries',1,'export',NULL,'r',0,50,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,29,0),(532,'Create/modify services','service',1,'creer',NULL,'w',0,29,0),(534,'Delete les services','service',1,'supprimer',NULL,'d',0,29,0),(538,'Export services','service',1,'export',NULL,'r',0,29,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,65,0),(652,'Create/Update bom of Bom','bom',1,'write',NULL,'w',0,65,0),(653,'Delete bom of Bom','bom',1,'delete',NULL,'w',0,65,0),(661,'Read Manufacturing Order','mrp',1,'read',NULL,'w',0,66,0),(662,'Create/Update Manufacturing Order','mrp',1,'write',NULL,'w',0,66,0),(663,'Delete Manufacturing Order','mrp',1,'delete',NULL,'w',0,66,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,44,0),(751,'Create/Update job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','write','w',0,44,0),(752,'Delete Job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','delete','w',0,44,0),(771,'Read expense reports (yours and your subordinates)','expensereport',1,'lire',NULL,'r',0,42,0),(772,'Create/modify expense reports','expensereport',1,'creer',NULL,'w',0,42,0),(773,'Delete expense reports','expensereport',1,'supprimer',NULL,'d',0,42,0),(775,'Approve expense reports','expensereport',1,'approve',NULL,'w',0,42,0),(776,'Pay expense reports','expensereport',1,'to_paid',NULL,'w',0,42,0),(777,'Read expense reports of everybody','expensereport',1,'readall',NULL,'r',0,42,0),(778,'Create expense reports for everybody','expensereport',1,'writeall_advance',NULL,'w',0,42,0),(779,'Export expense reports','expensereport',1,'export',NULL,'r',0,42,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,12,0),(1182,'Consulter les commandes fournisseur','fournisseur',1,'commande','lire','r',0,12,0),(1183,'Creer une commande fournisseur','fournisseur',1,'commande','creer','w',0,12,0),(1184,'Valider une commande fournisseur','fournisseur',1,'supplier_order_advance','validate','w',0,12,0),(1185,'Approuver une commande fournisseur','fournisseur',1,'commande','approuver','w',0,12,0),(1186,'Commander une commande fournisseur','fournisseur',1,'commande','commander','w',0,12,0),(1187,'Receptionner une commande fournisseur','fournisseur',1,'commande','receptionner','d',0,12,0),(1188,'Supprimer une commande fournisseur','fournisseur',1,'commande','supprimer','d',0,12,0),(1189,'Check/Uncheck a supplier order reception','fournisseur',1,'commande_advance','check','w',0,12,0),(1191,'Exporter les commande fournisseurs, attributs','fournisseur',1,'commande','export','r',0,12,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,12,0),(1232,'Creer une facture fournisseur','fournisseur',1,'facture','creer','w',0,12,0),(1233,'Valider une facture fournisseur','fournisseur',1,'supplier_invoice_advance','validate','w',0,12,0),(1234,'Supprimer une facture fournisseur','fournisseur',1,'facture','supprimer','d',0,12,0),(1235,'Envoyer les factures par mail','fournisseur',1,'supplier_invoice_advance','send','a',0,12,0),(1236,'Exporter les factures fournisseurs, attributs et reglements','fournisseur',1,'facture','export','r',0,12,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,11,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,11,0),(1421,'Export sales orders and attributes','commande',1,'commande','export','r',0,11,0),(2401,'Read actions/tasks linked to his account','agenda',1,'myactions','read','r',0,15,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,15,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,15,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,15,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,15,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,15,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,15,0),(2501,'Read or download documents','ecm',1,'read',NULL,'r',0,10,0),(2503,'Upload a document','ecm',1,'upload',NULL,'w',0,10,0),(2515,'Administer directories of documents','ecm',1,'setup',NULL,'w',0,10,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,50,0),(10002,'Create/modify website content (html and javascript content)','website',1,'write',NULL,'w',0,50,0),(10003,'Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.','website',1,'writephp',NULL,'w',0,50,0),(10005,'Delete website content','website',1,'delete',NULL,'w',0,50,0),(10008,'Export website content','website',1,'export',NULL,'w',0,50,0),(20001,'Read leave requests (yours and your subordinates)','holiday',1,'read',NULL,'w',0,42,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,42,0),(20003,'Delete leave requests','holiday',1,'delete',NULL,'w',0,42,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,42,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,42,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,42,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,42,0),(23001,'Read cron jobs','cron',1,'read',NULL,'w',0,50,0),(23002,'Create cron Jobs','cron',1,'create',NULL,'w',0,50,0),(23003,'Delete cron Jobs','cron',1,'delete',NULL,'w',0,50,0),(23004,'Execute cron Jobs','cron',1,'execute',NULL,'w',0,50,0),(50151,'Use Point Of Sale (record a sale, add products, record payment)','takepos',1,'run',NULL,'a',0,60,0),(50152,'Can modify added sales lines (prices, discount)','takepos',1,'editlines',NULL,'a',0,60,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,60,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,40,0),(55002,'Create/modify surveys','opensurvey',1,'write',NULL,'w',0,40,0),(56001,'Read ticket','ticket',1,'read',NULL,'r',0,60,0),(56002,'Create les tickets','ticket',1,'write',NULL,'w',0,60,0),(56003,'Delete les tickets','ticket',1,'delete',NULL,'d',0,60,0),(56004,'Manage tickets','ticket',1,'manage',NULL,'w',0,60,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;
 
@@ -11037,6 +11490,32 @@ 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 utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_salary_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_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_session`
 --
@@ -11050,7 +11529,7 @@ 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 utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`session_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -11095,15 +11574,6 @@ CREATE TABLE `llx_societe` (
   `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,
   `fk_effectif` int(11) DEFAULT 0,
   `fk_typent` int(11) DEFAULT NULL,
   `fk_forme_juridique` int(11) DEFAULT 0,
@@ -11163,7 +11633,7 @@ CREATE TABLE `llx_societe` (
   `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `model_pdf` varchar(255) COLLATE utf8_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 utf8_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,
@@ -11185,7 +11655,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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;
 
@@ -11381,6 +11851,8 @@ 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_customer` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `accountancy_code_supplier` varchar(24) 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,
   PRIMARY KEY (`rowid`),
@@ -11637,16 +12109,6 @@ CREATE TABLE `llx_socpeople` (
   `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,
   `priv` smallint(6) NOT NULL DEFAULT 0,
   `fk_prospectcontactlevel` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -11674,7 +12136,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;
 
@@ -11723,7 +12185,7 @@ CREATE TABLE `llx_stock_mouvement` (
   `fk_user_author` int(11) DEFAULT NULL,
   `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_origin` int(11) DEFAULT NULL,
-  `origintype` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `origintype` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
   `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_projet` int(11) NOT NULL DEFAULT 0,
   `inventorycode` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
@@ -11827,7 +12289,7 @@ CREATE TABLE `llx_supplier_proposal` (
   `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
   `extraparams` varchar(255) COLLATE utf8_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 utf8_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,
@@ -11843,7 +12305,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,'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,'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;
 
@@ -11912,7 +12374,7 @@ CREATE TABLE `llx_supplier_proposaldet` (
   `rang` int(11) DEFAULT 0,
   `ref_fourn` varchar(30) COLLATE utf8_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 utf8_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,
@@ -12013,7 +12475,7 @@ CREATE TABLE `llx_ticket` (
   `message` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
   `fk_statut` int(11) DEFAULT NULL,
   `resolution` int(11) DEFAULT NULL,
-  `progress` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `progress` int(11) 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,
@@ -12042,7 +12504,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,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,'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,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,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','2021-11-29 12:55:48',1,'2022-02-07 13:37:54',NULL,NULL);
 /*!40000 ALTER TABLE `llx_ticket` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12416,7 +12878,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=20841 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12425,7 +12887,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),(20696,1,12,11),(20690,1,12,12),(20691,1,12,13),(20692,1,12,14),(20693,1,12,15),(20695,1,12,16),(20697,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),(20660,1,12,81),(20655,1,12,82),(20656,1,12,84),(20657,1,12,86),(20658,1,12,87),(20659,1,12,88),(20661,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),(20642,1,12,111),(20633,1,12,112),(20635,1,12,113),(20637,1,12,114),(20639,1,12,115),(20641,1,12,116),(20643,1,12,117),(20783,1,12,121),(20780,1,12,122),(20782,1,12,125),(20784,1,12,126),(20785,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),(20824,1,12,251),(20805,1,12,252),(20807,1,12,253),(20808,1,12,254),(20810,1,12,255),(20812,1,12,256),(20786,1,12,262),(20792,1,12,281),(20789,1,12,282),(20791,1,12,283),(20793,1,12,286),(19877,1,12,300),(20644,1,12,301),(20645,1,12,302),(16194,1,12,331),(16193,1,12,332),(16195,1,12,333),(20813,1,12,341),(20814,1,12,342),(20815,1,12,343),(20816,1,12,344),(20822,1,12,351),(20819,1,12,352),(20821,1,12,353),(20823,1,12,354),(20825,1,12,358),(19249,1,12,430),(16384,1,12,501),(16378,1,12,502),(13865,1,12,510),(20769,1,12,511),(20764,1,12,512),(20766,1,12,514),(20768,1,12,517),(20770,1,12,519),(15291,1,12,520),(15286,1,12,522),(15288,1,12,524),(15290,1,12,525),(15292,1,12,527),(20776,1,12,531),(20773,1,12,532),(20775,1,12,534),(20777,1,12,538),(20076,1,12,561),(20073,1,12,562),(20075,1,12,563),(20077,1,12,564),(16932,1,12,650),(20629,1,12,651),(20628,1,12,652),(20630,1,12,653),(17124,1,12,660),(20744,1,12,661),(20743,1,12,662),(20745,1,12,663),(13358,1,12,700),(20666,1,12,701),(20665,1,12,702),(20667,1,12,703),(20753,1,12,750),(20752,1,12,751),(20754,1,12,752),(20686,1,12,771),(20675,1,12,772),(20677,1,12,773),(15085,1,12,774),(20679,1,12,775),(20681,1,12,776),(20683,1,12,777),(20685,1,12,778),(20687,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),(20700,1,12,1181),(20714,1,12,1182),(20703,1,12,1183),(20704,1,12,1184),(20706,1,12,1185),(20708,1,12,1186),(20710,1,12,1187),(20713,1,12,1188),(20711,1,12,1189),(20715,1,12,1191),(13827,1,12,1201),(13828,1,12,1202),(20723,1,12,1231),(20718,1,12,1232),(20719,1,12,1233),(20721,1,12,1234),(20722,1,12,1235),(20724,1,12,1236),(16302,1,12,1237),(13829,1,12,1251),(20698,1,12,1321),(20699,1,12,1322),(20662,1,12,1421),(20618,1,12,2401),(20617,1,12,2402),(20619,1,12,2403),(20623,1,12,2411),(20622,1,12,2412),(20624,1,12,2413),(20625,1,12,2414),(20671,1,12,2501),(20670,1,12,2503),(20672,1,12,2515),(20082,1,12,3200),(20840,1,12,3201),(20341,1,12,3301),(15435,1,12,5001),(15436,1,12,5002),(20833,1,12,10001),(20828,1,12,10002),(20830,1,12,10003),(20832,1,12,10005),(20834,1,12,10008),(20736,1,12,20001),(20727,1,12,20002),(20729,1,12,20003),(20733,1,12,20004),(20735,1,12,20005),(20737,1,12,20006),(20731,1,12,20007),(20651,1,12,23001),(20648,1,12,23002),(20650,1,12,23003),(20652,1,12,23004),(19019,1,12,50101),(20801,1,12,50151),(20802,1,12,50152),(20803,1,12,50153),(20603,1,12,50401),(20611,1,12,50411),(20606,1,12,50412),(20608,1,12,50414),(20610,1,12,50415),(20612,1,12,50418),(20613,1,12,50420),(20614,1,12,50430),(20602,1,12,50440),(20747,1,12,55001),(20748,1,12,55002),(20799,1,12,56001),(20796,1,12,56002),(20798,1,12,56003),(20800,1,12,56004),(16742,1,12,56005),(20838,1,12,57001),(20837,1,12,57002),(20839,1,12,57003),(20738,1,12,59001),(20739,1,12,59002),(20740,1,12,59003),(20760,1,12,63001),(20757,1,12,63002),(20759,1,12,63003),(20761,1,12,63004),(20749,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;
 
@@ -12661,7 +13123,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;
 
@@ -12732,6 +13194,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=utf8 COLLATE=utf8_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`
 --
@@ -12773,4 +13260,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-02-07 15:44:10
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/initdemo/sftpget_and_loaddump.php b/dev/initdemo/sftpget_and_loaddump.php
index 7d781fe5b0c..63b5ac65054 100755
--- a/dev/initdemo/sftpget_and_loaddump.php
+++ b/dev/initdemo/sftpget_and_loaddump.php
@@ -4,7 +4,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/dev/initdemo/updatedemo.php b/dev/initdemo/updatedemo.php
index 4dd98451823..4ee2032c7cf 100755
--- a/dev/initdemo/updatedemo.php
+++ b/dev/initdemo/updatedemo.php
@@ -4,7 +4,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/dev/resources/iso-normes/Intracommreport-ManuelDebXml.pdf b/dev/resources/iso-normes/Intracommreport-ManuelDebXml.pdf
deleted file mode 100644
index fef9f48f53e..00000000000
Binary files a/dev/resources/iso-normes/Intracommreport-ManuelDebXml.pdf and /dev/null differ
diff --git a/dev/resources/iso-normes/QR code for invoices.txt b/dev/resources/iso-normes/QR code for invoices.txt
new file mode 100644
index 00000000000..a55c9569297
--- /dev/null
+++ b/dev/resources/iso-normes/QR code for invoices.txt	
@@ -0,0 +1,13 @@
+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/address_format.txt b/dev/resources/iso-normes/address_format.txt
index d87e90e79b5..18069cd89fa 100644
--- a/dev/resources/iso-normes/address_format.txt
+++ b/dev/resources/iso-normes/address_format.txt
@@ -1,3 +1,5 @@
+Address format
+
 https://bitboost.com/ref/international-address-formats.html#Formats
 
 https://www.upu.int/en/Postal-Solutions/Programmes-Services/Addressing-Solutions
diff --git a/dev/resources/facturx-zugferd/README.txt b/dev/resources/iso-normes/facturx-zugferd/README.txt
similarity index 100%
rename from dev/resources/facturx-zugferd/README.txt
rename to dev/resources/iso-normes/facturx-zugferd/README.txt
diff --git a/dev/resources/iso-normes/format PDF - PDF A.pdf b/dev/resources/iso-normes/format PDF - PDF A.pdf
new file mode 100644
index 00000000000..0ceeb5230de
Binary files /dev/null and b/dev/resources/iso-normes/format PDF - PDF A.pdf differ
diff --git a/dev/resources/iso-normes/format_FEC-Lien_outil_de_test_agréé.pdf b/dev/resources/iso-normes/format_FEC - Lien_outil_de_test_agréé.pdf
similarity index 100%
rename from dev/resources/iso-normes/format_FEC-Lien_outil_de_test_agréé.pdf
rename to dev/resources/iso-normes/format_FEC - Lien_outil_de_test_agréé.pdf
diff --git a/dev/resources/iso-normes/sample_FEC_file.txt b/dev/resources/iso-normes/format_FEC - fie example.txt
similarity index 100%
rename from dev/resources/iso-normes/sample_FEC_file.txt
rename to dev/resources/iso-normes/format_FEC - fie example.txt
diff --git a/dev/resources/intracommreport/manuelDebXml1.2.pdf b/dev/resources/iso-normes/intracommreport/Intracommreport-ManuelDebXml.pdf
similarity index 100%
rename from dev/resources/intracommreport/manuelDebXml1.2.pdf
rename to dev/resources/iso-normes/intracommreport/Intracommreport-ManuelDebXml.pdf
diff --git a/dev/resources/iso-normes/Intracommreport-ManuelDesXML.pdf b/dev/resources/iso-normes/intracommreport/Intracommreport-ManuelDesXML.pdf
similarity index 100%
rename from dev/resources/iso-normes/Intracommreport-ManuelDesXML.pdf
rename to dev/resources/iso-normes/intracommreport/Intracommreport-ManuelDesXML.pdf
diff --git a/dev/resources/intracommreport/schema_deb.xsd b/dev/resources/iso-normes/intracommreport/schema_deb.xsd
similarity index 100%
rename from dev/resources/intracommreport/schema_deb.xsd
rename to dev/resources/iso-normes/intracommreport/schema_deb.xsd
diff --git a/dev/resources/iso-normes/locales.txt b/dev/resources/iso-normes/locales.txt
index 67ea5280342..a4459d2a8b1 100644
--- a/dev/resources/iso-normes/locales.txt
+++ b/dev/resources/iso-normes/locales.txt
@@ -1,3 +1,5 @@
+Date and number format
+----------------------
 
 For languages:
 https://icu4c-demos.unicode.org/icu-bin/icudemos - Locale Explorer -> Error 404
diff --git a/dev/resources/sepa/pain.001.001.03.xsd b/dev/resources/iso-normes/sepa/pain.001.001.03.xsd
similarity index 100%
rename from dev/resources/sepa/pain.001.001.03.xsd
rename to dev/resources/iso-normes/sepa/pain.001.001.03.xsd
diff --git a/dev/resources/sepa/pain.008.001.02.xsd b/dev/resources/iso-normes/sepa/pain.008.001.02.xsd
similarity index 100%
rename from dev/resources/sepa/pain.008.001.02.xsd
rename to dev/resources/iso-normes/sepa/pain.008.001.02.xsd
diff --git a/dev/resources/sepa/sample-credit-transfer.xml b/dev/resources/iso-normes/sepa/sample-credit-transfer.xml
similarity index 100%
rename from dev/resources/sepa/sample-credit-transfer.xml
rename to dev/resources/iso-normes/sepa/sample-credit-transfer.xml
diff --git a/dev/resources/sepa/sample-direct-debit.xml b/dev/resources/iso-normes/sepa/sample-direct-debit.xml
similarity index 100%
rename from dev/resources/sepa/sample-direct-debit.xml
rename to dev/resources/iso-normes/sepa/sample-direct-debit.xml
diff --git a/dev/resources/sepa/text.txt b/dev/resources/iso-normes/sepa/text.txt
similarity index 100%
rename from dev/resources/sepa/text.txt
rename to dev/resources/iso-normes/sepa/text.txt
diff --git a/dev/resources/iso-normes/world_tax_rates.txt b/dev/resources/iso-normes/world_tax_rates.txt
index c007474e5fd..508446b618a 100644
--- a/dev/resources/iso-normes/world_tax_rates.txt
+++ b/dev/resources/iso-normes/world_tax_rates.txt
@@ -1,3 +1,6 @@
+VAT Rates
+---------
+
 http://www.taxrates.cc/index.html
 https://en.wikipedia.org/wiki/List_of_countries_by_tax_rates
 
diff --git a/dev/setup/apache/virtualhost b/dev/setup/apache/virtualhost
index c3a2dff3e43..8c7682fe3d9 100644
--- a/dev/setup/apache/virtualhost
+++ b/dev/setup/apache/virtualhost
@@ -1,62 +1,93 @@
 <VirtualHost *:80>
-#php_admin_value sendmail_path "/usr/sbin/sendmail -t -i"
-#php_admin_value mail.force_extra_parameters "-f postmaster@mydomain.com"
-php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f postmaster@mydomain.com"
-php_admin_value open_basedir /tmp/:/home/../htdocs
+	#php_admin_value sendmail_path "/usr/sbin/sendmail -t -i"
+	#php_admin_value mail.force_extra_parameters "-f postmaster@mydomain.com"
+	php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f postmaster@mydomain.com"
+	php_admin_value open_basedir /tmp/:/home/.../htdocs:/home/.../dolibarr_documents:
+	
+	ServerName myvirtualalias
+	ServerAlias myvirtualalias
+	
+	UseCanonicalName On
+	
+	KeepAlive On
+	KeepAliveTimeout 5
+	MaxKeepAliveRequests 20
+	
+	AddDefaultCharset UTF-8
+	
+	DocumentRoot "/home/.../htdocs"
+	
+	<Directory /home/.../htdocs/>
+	   	AllowOverride None
+	   	Options       -Indexes -MultiViews +FollowSymLinks -ExecCGI
+	   	Require all granted
 
-ServerName myvirtualalias
-ServerAlias myvirtualalias
+		# To restrict access by a HTTP basic auth	   
+	   	#AuthType Basic
+       	#AuthName "Authenticate to backoffice"
+       	#AuthUserFile /etc/apache2/.htpasswd
+       	#require valid-user
+	</Directory>
+	
+	# Leaving /public and /api, /dav, .well_known but also wrappers for document and viewimage accessible to everyone
+    <Directory /home/admin/wwwroot/dolibarr/htdocs/public/>
+        AuthType None
+        Require all granted
+        Satisfy any
+    </Directory>
+    <Directory /home/admin/wwwroot/dolibarr/htdocs/api/>
+        AuthType None
+        Require all granted
+        Satisfy any
+    </Directory>
+    <Directory /home/admin/wwwroot/dolibarr/htdocs/dav/>
+        AuthType None
+        Require all granted
+        Satisfy any
+    </Directory>
+    <Directory /home/admin/wwwroot/dolibarr/htdocs/.well-known/>
+        AuthType None
+        Require all granted
+        Satisfy any
+    </Directory>
+    <Files ~ "(document\.php|viewimage\.php|\.js\.php|\.json\.php|\.js|\.css\.php|\.css|\.gif|\.png|\.svg|\.woff2|favicon\.ico)$">
+        AuthType None
+        Require all granted
+        Satisfy any
+    </Files>
 
-UseCanonicalName On
-
-AddDefaultCharset UTF-8
-
-DocumentRoot "/home/.../htdocs"
-
-<Directory /home/.../htdocs/>
-   AllowOverride None
-   Options       -Indexes -MultiViews +FollowSymLinks -ExecCGI
-   Require all granted
-</Directory>
-
-<Directory "/home/../htdocs/cache">
-   Deny from all
-   RemoveHandler .phtml .php .php3 .php4 .php5 .php6 .phps .cgi .exe .pl .asp .aspx .shtml .shtm .fcgi .fpl .jsp .htm .html .wml
-   AddType application/x-httpd-php-source .phtml .php .php3 .php4 .php5 .php6 .phps .cgi .exe .pl .asp .aspx .shtml .shtm .fcgi .fpl .jsp .htm .html .wml
-</Directory>
-
-
-ErrorLog /var/log/apache2/myvirtualalias_error_log
-TransferLog /var/log/apache2/myvirtualalias_access_log
-
-# Compress returned resources of type php pages, text file export, css and javascript
-AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript
-
-AddType text/javascript .jgz
-AddEncoding gzip .jgz
-ExpiresActive On
-ExpiresByType image/x-icon A2592000
-ExpiresByType image/gif A2592000
-ExpiresByType image/png A2592000
-ExpiresByType image/jpeg A2592000
-ExpiresByType text/css A2592000
-ExpiresByType text/javascript A2592000
-ExpiresByType application/x-javascript A2592000
-ExpiresByType application/javascript A2592000
-
-SSLEngine On
-
-#   A self-signed (snakeoil) certificate can be created by installing
-#   the ssl-cert package. See
-#   /usr/share/doc/apache2.2-common/README.Debian.gz for more info.
-#   If both key and certificate are stored in the same file, only the
-#   SSLCertificateFile directive is needed.
-SSLCertificateFile    /etc/letsencrypt/live/www.mydomain.com/cert.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/www.mydomain.com/privkey.pem
-SSLCertificateChainFile /etc/letsencrypt/live/www.mydomain.com/chain.pem
-
-#RewriteEngine   on
-#RewriteCond     %{SERVER_PORT} ^80$
-#RewriteRule     ^(.*)$ https://%{SERVER_NAME}$1 [L,R]
+        
+	ErrorLog /var/log/apache2/myvirtualalias_error_log
+	TransferLog /var/log/apache2/myvirtualalias_access_log
+	
+	# Compress returned resources of type php pages, text file export, css and javascript
+	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript
+	
+	AddType text/javascript .jgz
+	AddEncoding gzip .jgz
+	ExpiresActive On
+	ExpiresByType image/x-icon A2592000
+	ExpiresByType image/gif A2592000
+	ExpiresByType image/png A2592000
+	ExpiresByType image/jpeg A2592000
+	ExpiresByType text/css A2592000
+	ExpiresByType text/javascript A2592000
+	ExpiresByType application/x-javascript A2592000
+	ExpiresByType application/javascript A2592000
+	
+	SSLEngine On
+	
+	#   A self-signed (snakeoil) certificate can be created by installing
+	#   the ssl-cert package. See
+	#   /usr/share/doc/apache2.2-common/README.Debian.gz for more info.
+	#   If both key and certificate are stored in the same file, only the
+	#   SSLCertificateFile directive is needed.
+	SSLCertificateFile    /etc/letsencrypt/live/www.mydomain.com/cert.pem
+	SSLCertificateKeyFile /etc/letsencrypt/live/www.mydomain.com/privkey.pem
+	SSLCertificateChainFile /etc/letsencrypt/live/www.mydomain.com/chain.pem
+	
+	#RewriteEngine   on
+	#RewriteCond     %{SERVER_PORT} ^80$
+	#RewriteRule     ^(.*)$ https://%{SERVER_NAME}$1 [L,R]
 
 </VirtualHost>
diff --git a/dev/tools/fixaltlanguages.sh b/dev/tools/fixaltlanguages.sh
index 955552940a9..5ed9f704df9 100755
--- a/dev/tools/fixaltlanguages.sh
+++ b/dev/tools/fixaltlanguages.sh
@@ -50,6 +50,10 @@ then
         then
         	aaupper="SA"
         fi        
+        if [ $bb = "IQ" ]
+        then
+        	aaupper="SA"
+        fi        
 
     	bblower=`echo $dirshort | nawk -F"_" '{ print tolower($2) }'`
 
@@ -57,23 +61,29 @@ then
     	if [ "$aa" != "$bblower" -a "$dirshort" != "en_US" ]
     	then
     	    reflang="htdocs/langs/"$aa"_"$aaupper
-    	    if [ -d $reflang -a $aa"_"$bb != $aa"_"$aaupper ]
+    	    echo $reflang" "$aa"_"$bb != $aa"_"$aaupper
+    	    
+    	    # If $reflang is a main language to use to sanitize the alternative file 
+    	    if [ -d $reflang ]
     	    then
-		    	echo "***** Search original into "$reflang
-    			echo $dirshort is an alternative language of $reflang
-    			echo ./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
-    			./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
-    			for fic in `ls htdocs/langs/${aa}_${bb}/*.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done 
-    			for fic in `ls htdocs/langs/${aa}_${bb}/*.lang`; 
-    			do f=`cat $fic | wc -l`; 
-    			    #echo $f lines into file $fic; 
-    			    if [ $f = 1 ] 
-    			    then 
-    			        echo Only one line remainging into file $fic, we delete it;
-    			        rm $fic 
-    			    fi;
-    			done
-    		fi
+    	    	if [ $aa"_"$bb != $aa"_"$aaupper ]
+    	    	then
+			    	echo "***** Search original into "$reflang
+	    			echo $dirshort is an alternative language of $reflang
+	    			echo ./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
+	    			./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
+	    			for fic in `ls htdocs/langs/${aa}_${bb}/*.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done 
+	    			for fic in `ls htdocs/langs/${aa}_${bb}/*.lang`; 
+	    			do f=`cat $fic | wc -l`; 
+	    			    #echo $f lines into file $fic; 
+	    			    if [ $f = 1 ] 
+	    			    then 
+	    			        echo Only one line remainging into file $fic, we delete it;
+	    			        rm $fic 
+	    			    fi;
+	    			done
+	    		fi
+	    	fi
     	fi
     done;
 fi
diff --git a/dev/tools/fixdosfiles.sh b/dev/tools/fixdosfiles.sh
index 6fd152127fb..4be867aea98 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 'documents\/website' | grep -v 'documents\/mdedias' | 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 'documents\/website' | grep -v 'documents\/mdedias' | 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 '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
 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 'documents\/website' | grep -v 'documents\/mdedias' | 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 '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 2f8a84c57e7..dd538c5e1aa 100755
--- a/dev/tools/optimize_images.sh
+++ b/dev/tools/optimize_images.sh
@@ -14,7 +14,8 @@ max_output_size=0
 usage()
 {
   cat <<EO
-Usage: $PROGNAME [options]
+Usage:   $PROGNAME (list|fix) [options]
+Example: optimize_images.sh (list|fix) -i dirtoscan
 
 Script to optimize JPG and PNG images in a directory.
 
@@ -183,8 +184,8 @@ ARGS=$(getopt -s bash --options $SHORTOPTS --longoptions $LONGOPTS --name $PROGN
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
-	echo "Usage: optimize_images.sh (list|fix) -i dirtoscan"
-	exit
+	usage
+	exit 0
 fi
 
 eval set -- "$ARGS"
diff --git a/dev/tools/spider.php b/dev/tools/spider.php
new file mode 100644
index 00000000000..954978b24df
--- /dev/null
+++ b/dev/tools/spider.php
@@ -0,0 +1,145 @@
+#!/usr/bin/env php
+<?php
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file 	dev/tools/spider.php
+ * \brief 	Script to spider Dolibarr app.
+ *
+ * To use it:
+ * - Disable module "bookmark"
+ * - Exclude param  optioncss, token, sortfield, sortorder
+ */
+
+$crawledLinks=array();
+const MAX_DEPTH=2;
+
+
+/**
+ * @param string $url	URL
+ * @param string $depth	Depth
+ * @return string		String
+ */
+function followLink($url, $depth = 0)
+{
+	global $crawledLinks;
+	$crawling=array();
+	if ($depth>MAX_DEPTH) {
+		echo "<div style='color:red;'>The Crawler is giving up!</div>";
+		return;
+	}
+	$options=array(
+		'http'=>array(
+			'method'=>"GET",
+			'user-agent'=>"gfgBot/0.1\n"
+		)
+	);
+	$context=stream_context_create($options);
+	$doc=new DomDocument();
+	@$doc->loadHTML(file_get_contents($url, false, $context));
+	$links=$doc->getElementsByTagName('a');
+	$pageTitle=getDocTitle($doc, $url);
+	$metaData=getDocMetaData($doc);
+	foreach ($links as $i) {
+		$link=$i->getAttribute('href');
+		if (ignoreLink($link)) continue;
+		$link=convertLink($url, $link);
+		if (!in_array($link, $crawledLinks)) {
+			$crawledLinks[]=$link;
+			$crawling[]=$link;
+			insertIntoDatabase($link, $pageTitle, $metaData, $depth);
+		}
+	}
+	foreach ($crawling as $crawlURL)
+		followLink($crawlURL, $depth+1);
+}
+
+/**
+ * @param string $site	Site
+ * @param string $path	Path
+ * @return string		String
+ */
+function convertLink($site, $path)
+{
+	if (substr_compare($path, "//", 0, 2)==0)
+		return parse_url($site)['scheme'].$path;
+	elseif (substr_compare($path, "http://", 0, 7)==0 or
+		substr_compare($path, "https://", 0, 8)==0 or
+		substr_compare($path, "www.", 0, 4)==0)
+		return $path;
+	else return $site.'/'.$path;
+}
+
+/**
+ * @param string $url	URL
+ * @return boolean
+ */
+function ignoreLink($url)
+{
+	return $url[0]=="#" or substr($url, 0, 11) == "javascript:";
+}
+
+/**
+ * @param string 	$link		URL
+ * @param string	$title		Title
+ * @param string 	$metaData	Array
+ * @param int 		$depth		Depth
+ * @return void
+ */
+function insertIntoDatabase($link, $title, &$metaData, $depth)
+{
+	//global $crawledLinks;
+
+	echo "Inserting new record {URL= ".$link.", Title = '$title', Description = '".$metaData['description']."', Keywords = ' ".$metaData['keywords']."'}<br/><br/><br/>";
+
+	//²$crawledLinks[]=$link;
+}
+
+/**
+ * @param string 	$doc		Doc
+ * @param string	$url		URL
+ * @return string				URL/Title
+ */
+function getDocTitle(&$doc, $url)
+{
+	$titleNodes=$doc->getElementsByTagName('title');
+	if (count($titleNodes)==0 or !isset($titleNodes[0]->nodeValue))
+		return $url;
+	$title=str_replace('', '\n', $titleNodes[0]->nodeValue);
+	return (strlen($title)<1)?$url:$title;
+}
+
+/**
+ * @param string 	$doc		Doc
+ * @return array				Array
+ */
+function getDocMetaData(&$doc)
+{
+	$metaData=array();
+	$metaNodes=$doc->getElementsByTagName('meta');
+	foreach ($metaNodes as $node)
+		$metaData[$node->getAttribute("name")] = $node->getAttribute("content");
+	if (!isset($metaData['description']))
+		$metaData['description']='No Description Available';
+	if (!isset($metaData['keywords'])) $metaData['keywords']='';
+	return array(
+		'keywords'=>str_replace('', '\n', $metaData['keywords']),
+		'description'=>str_replace('', '\n', $metaData['description'])
+	);
+}
+
+
+followLink("http://localhost/dolibarr_dev/htdocs");
diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php
index 39db0a55764..840f09a0adb 100755
--- a/dev/translation/sanity_check_en_langfiles.php
+++ b/dev/translation/sanity_check_en_langfiles.php
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php
index f3287db6128..f0a0397cd6e 100755
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@@ -5,7 +5,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -177,7 +177,7 @@ foreach ($filesToProcess as $fileToProcess) {
 
 
 	// Start reading and parsing English
-
+	$aEnglish = array();
 	if ($handle = fopen($lEnglishFile, 'r')) {
 		print "Read English File $lEnglishFile:\n";
 		$cnt = 0;
@@ -246,6 +246,9 @@ foreach ($filesToProcess as $fileToProcess) {
 
 		fwrite($oh, "# Dolibarr language file - Source file is en_US - ".(preg_replace('/\.lang$/', '', $fileToProcess))."\n");
 
+		$fileFirstFound = array();
+		$lineFirstFound = array();
+
 		$cnt = 0;
 		while (($line = fgets($handle)) !== false) {
 			$cnt++;
@@ -299,6 +302,7 @@ foreach ($filesToProcess as $fileToProcess) {
 			}
 
 			// String exists in both files and value into alternative language differs from main language but also from english files
+			// so we keep it.
 			if ((! empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key]
 				&& ! empty($aEnglish[$key]) && $aSecondary[$key] != $aEnglish[$key])
 				|| in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/', $key) || preg_match('/^FormatHour/', $key)
diff --git a/doc/images/appicon_128.png b/doc/images/appicon_128.png
index b1f4e0bc9b2..4a93909a3ff 100644
Binary files a/doc/images/appicon_128.png and b/doc/images/appicon_128.png differ
diff --git a/doc/images/appicon_16.png b/doc/images/appicon_16.png
index a199f94a07f..d5a9cda239a 100644
Binary files a/doc/images/appicon_16.png and b/doc/images/appicon_16.png differ
diff --git a/doc/images/appicon_32.png b/doc/images/appicon_32.png
index 2eb74873d8f..7c7cd15c531 100644
Binary files a/doc/images/appicon_32.png and b/doc/images/appicon_32.png differ
diff --git a/doc/images/appicon_64.png b/doc/images/appicon_64.png
index a08d91a0cb7..90b2e52ff06 100644
Binary files a/doc/images/appicon_64.png and b/doc/images/appicon_64.png differ
diff --git a/doc/images/background_dolibarr.jpg b/doc/images/background_dolibarr.jpg
index 6c4cc11460d..ec101a0654c 100644
Binary files a/doc/images/background_dolibarr.jpg and b/doc/images/background_dolibarr.jpg differ
diff --git a/doc/images/dolibarr_256x256_black.png b/doc/images/dolibarr_256x256_black.png
index d89b44bf6ca..1abe4e2c7d5 100644
Binary files a/doc/images/dolibarr_256x256_black.png and b/doc/images/dolibarr_256x256_black.png differ
diff --git a/doc/images/dolibarr_256x256_color.png b/doc/images/dolibarr_256x256_color.png
index 417387d6a27..b2d567d6831 100644
Binary files a/doc/images/dolibarr_256x256_color.png and b/doc/images/dolibarr_256x256_color.png differ
diff --git a/doc/images/dolibarr_256x256_white.png b/doc/images/dolibarr_256x256_white.png
index b8fa1fef076..1f5f7454f2b 100644
Binary files a/doc/images/dolibarr_256x256_white.png and b/doc/images/dolibarr_256x256_white.png differ
diff --git a/doc/images/dolibarr_512x512_color.png b/doc/images/dolibarr_512x512_color.png
index a1766d07fe3..71c2b0cc060 100644
Binary files a/doc/images/dolibarr_512x512_color.png and b/doc/images/dolibarr_512x512_color.png differ
diff --git a/doc/images/dolibarr_logo.png b/doc/images/dolibarr_logo.png
old mode 100755
new mode 100644
index 9a0781ce2ea..63bd8ac3392
Binary files a/doc/images/dolibarr_logo.png and b/doc/images/dolibarr_logo.png differ
diff --git a/doc/images/dolibarr_screenshot11_1024x768.jpg b/doc/images/dolibarr_screenshot11_1024x768.jpg
index 65c246353a7..8e8c013631f 100644
Binary files a/doc/images/dolibarr_screenshot11_1024x768.jpg and b/doc/images/dolibarr_screenshot11_1024x768.jpg differ
diff --git a/doc/images/dolibarr_screenshot12_1920x1080.jpg b/doc/images/dolibarr_screenshot12_1920x1080.jpg
index 72ae74cb00f..c063cca6726 100644
Binary files a/doc/images/dolibarr_screenshot12_1920x1080.jpg and b/doc/images/dolibarr_screenshot12_1920x1080.jpg differ
diff --git a/doc/images/dolibarr_screenshot1_1280x800.jpg b/doc/images/dolibarr_screenshot1_1280x800.jpg
index c732bc43709..ac238d39c1f 100644
Binary files a/doc/images/dolibarr_screenshot1_1280x800.jpg and b/doc/images/dolibarr_screenshot1_1280x800.jpg differ
diff --git a/doc/images/dolibarr_screenshot1_1920x1080.jpg b/doc/images/dolibarr_screenshot1_1920x1080.jpg
index bc46b00a130..19a80907f4b 100644
Binary files a/doc/images/dolibarr_screenshot1_1920x1080.jpg and b/doc/images/dolibarr_screenshot1_1920x1080.jpg differ
diff --git a/doc/images/dolibarr_screenshot2_1280x800.jpg b/doc/images/dolibarr_screenshot2_1280x800.jpg
index 1f3231f82a4..2956a55d36a 100644
Binary files a/doc/images/dolibarr_screenshot2_1280x800.jpg and b/doc/images/dolibarr_screenshot2_1280x800.jpg differ
diff --git a/doc/images/dolibarr_screenshot3_1280x800.png b/doc/images/dolibarr_screenshot3_1280x800.png
index 2940959ae84..00d57fc9fb2 100644
Binary files a/doc/images/dolibarr_screenshot3_1280x800.png and b/doc/images/dolibarr_screenshot3_1280x800.png differ
diff --git a/doc/images/dolibarr_screenshot5_1280x800.jpg b/doc/images/dolibarr_screenshot5_1280x800.jpg
index de0d8151e03..6eea0a2f029 100644
Binary files a/doc/images/dolibarr_screenshot5_1280x800.jpg and b/doc/images/dolibarr_screenshot5_1280x800.jpg differ
diff --git a/doc/images/invoice.png b/doc/images/invoice.png
index 9be03a52ed8..2200fd1e5f8 100644
Binary files a/doc/images/invoice.png and b/doc/images/invoice.png differ
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 6f510ad3706..48d8ab23d96 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -38,6 +38,7 @@ $cancel = GETPOST('cancel', 'alpha');
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
 $massaction = GETPOST('massaction', 'aZ09');
+$optioncss = GETPOST('optioncss', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'accountingaccountlist'; // To manage different context of search
 
 $search_account = GETPOST('search_account', 'alpha');
@@ -51,14 +52,14 @@ $confirm = GETPOST('confirm', 'alpha');
 
 $chartofaccounts = GETPOST('chartofaccounts', 'int');
 
-$permissiontoadd = $user->rights->accounting->chartofaccount;
-$permissiontodelete = $user->rights->accounting->chartofaccount;
+$permissiontoadd = !empty($user->rights->accounting->chartofaccount);
+$permissiontodelete = !empty($user->rights->accounting->chartofaccount);
 
 // Security check
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (!$user->rights->accounting->chartofaccount) {
+if (empty($user->rights->accounting->chartofaccount)) {
 	accessforbidden();
 }
 
@@ -195,7 +196,7 @@ if (empty($reshook)) {
 	} elseif ($action == 'enable' && $permissiontoadd) {
 		if ($accounting->fetch($id)) {
 			$mode = GETPOST('mode', 'int');
-			$result = $accounting->account_activate($id, $mode);
+			$result = $accounting->accountActivate($id, $mode);
 		}
 		$action = 'update';
 		if ($result < 0) {
@@ -362,7 +363,7 @@ if ($resql) {
 
 	$newcardbutton .= dolGetButtonTitle($langs->trans("New"), $langs->trans("Addanaccount"), 'fa fa-plus-circle', './card.php?action=create');
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
-	print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'accounting_account', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	// Box to select active chart of account
 	print $langs->trans("Selectchartofaccounts")." : ";
@@ -392,7 +393,7 @@ if ($resql) {
 	}
 	print "</select>";
 	print ajax_combobox("chartofaccounts");
-	print '<input type="'.(empty($conf->use_javascript_ajax) ? 'submit' : 'button').'" class="button" name="change_chart" id="change_chart" value="'.dol_escape_htmltag($langs->trans("ChangeAndLoad")).'">';
+	print '<input type="'.(empty($conf->use_javascript_ajax) ? 'submit' : 'button').'" class="button button-edit" name="change_chart" id="change_chart" value="'.dol_escape_htmltag($langs->trans("ChangeAndLoad")).'">';
 
 	print '<br>';
 	print '<br>';
@@ -403,6 +404,11 @@ if ($resql) {
 
 	$moreforfilter = '';
 
+	$accountstatic = new AccountingAccount($db);
+	$accountparent = new AccountingAccount($db);
+	$totalarray = array();
+	$totalarray['nbfield'] = 0;
+
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
@@ -438,44 +444,33 @@ if ($resql) {
 	print $searchpicto;
 	print '</td>';
 	print '</tr>';
-	$totalarray = array();
 	print '<tr class="liste_titre">';
 	if (!empty($arrayfields['aa.account_number']['checked'])) {
 		print_liste_field_titre($arrayfields['aa.account_number']['label'], $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['aa.label']['checked'])) {
 		print_liste_field_titre($arrayfields['aa.label']['label'], $_SERVER["PHP_SELF"], "aa.label", "", $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['aa.labelshort']['checked'])) {
 		print_liste_field_titre($arrayfields['aa.labelshort']['label'], $_SERVER["PHP_SELF"], "aa.labelshort", "", $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['aa.account_parent']['checked'])) {
 		print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, '', $sortfield, $sortorder, 'left ');
-		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['aa.pcg_type']['checked'])) {
 		print_liste_field_titre($arrayfields['aa.pcg_type']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_type,aa.account_number', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_type']['help'], 1);
-		$totalarray['nbfield']++;
 	}
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 		if (!empty($arrayfields['aa.reconcilable']['checked'])) {
 			print_liste_field_titre($arrayfields['aa.reconcilable']['label'], $_SERVER["PHP_SELF"], 'aa.reconcilable', '', $param, '', $sortfield, $sortorder);
-			$totalarray['nbfield']++;
 		}
 	}
 	if (!empty($arrayfields['aa.active']['checked'])) {
 		print_liste_field_titre($arrayfields['aa.active']['label'], $_SERVER["PHP_SELF"], 'aa.active', '', $param, '', $sortfield, $sortorder);
-		$totalarray['nbfield']++;
 	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
-	$accountstatic = new AccountingAccount($db);
-	$accountparent = new AccountingAccount($db);
-
 	$i = 0;
 	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
@@ -620,8 +615,13 @@ if ($resql) {
 	}
 
 	if ($num == 0) {
-		$totalarray['nbfield']++;
-		print '<tr><td colspan="'.$totalarray['nbfield'].'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+		$colspan = 1;
+		foreach ($arrayfields as $key => $val) {
+			if (!empty($val['checked'])) {
+				$colspan++;
+			}
+		}
+		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 
 	print "</table>";
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 0f4d538cfac..29c2b7d5510 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -78,7 +78,7 @@ $search_country_id = GETPOST('search_country_id', 'int');
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (!$user->rights->accounting->chartofaccount) {
+if (empty($user->rights->accounting->chartofaccount)) {
 	accessforbidden();
 }
 
@@ -495,7 +495,7 @@ if ($id) {
 			if ($valuetoshow != '') {
 				print '<td class="'.$class.'">';
 				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
-					print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+					print '<a href="'.$tabhelp[$id][$value].'">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
 				} elseif (!empty($tabhelp[$id][$value])) {
 					print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
 				} else {
@@ -535,7 +535,7 @@ if ($id) {
 		}
 
 		print '<td colspan="3" class="right">';
-		print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+		print '<input type="submit" class="button button-add" name="actionadd" value="'.$langs->trans("Add").'">';
 		print '</td>';
 		print "</tr>";
 
@@ -553,16 +553,16 @@ if ($id) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 
-		$param = '&id='.$id;
+		$param = '&id='.urlencode($id);
 		if ($search_country_id > 0) {
-			$param .= '&search_country_id='.$search_country_id;
+			$param .= '&search_country_id='.urlencode($search_country_id);
 		}
 		$paramwithsearch = $param;
 		if ($sortorder) {
-			$paramwithsearch .= '&sortorder='.$sortorder;
+			$paramwithsearch .= '&sortorder='.urlencode($sortorder);
 		}
 		if ($sortfield) {
-			$paramwithsearch .= '&sortfield='.$sortfield;
+			$paramwithsearch .= '&sortfield='.urlencode($sortfield);
 		}
 
 		// There is several pages
@@ -631,7 +631,7 @@ if ($id) {
 						fieldListAccountModel($fieldlist, $obj, $tabname[$id], 'edit');
 					}
 
-					print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+					print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button button-edit" name="actionmodify" value="'.$langs->trans("Modify").'">';
 					print '&nbsp;<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
 				} else {
 					$tmpaction = 'view';
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index b629e45cf0d..91d8257ea7f 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -48,7 +48,7 @@ $label = GETPOST('label', 'alpha');
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (!$user->rights->accounting->chartofaccount) {
+if (empty($user->rights->accounting->chartofaccount)) {
 	accessforbidden();
 }
 
@@ -61,7 +61,7 @@ $object = new AccountingAccount($db);
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$urltogo = $backtopage ? $backtopage : dol_buildpath('/accountancy/admin/account.php', 1);
+	$urltogo = $backtopage ? $backtopage : DOL_URL_ROOT.'/accountancy/admin/account.php';
 	header("Location: ".$urltogo);
 	exit;
 }
@@ -75,7 +75,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 			$action = 'create';
 		} else {
-			$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid='.((int) $conf->global->CHARTOFACCOUNTS);
+			$sql = "SELECT pcg_version FROM " . MAIN_DB_PREFIX . "accounting_system WHERE rowid = ".((int) $conf->global->CHARTOFACCOUNTS);
 
 			dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
 			$result = $db->query($sql);
@@ -121,7 +121,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount) {
 			}
 			if (!$error) {
 				setEventMessages("RecordCreatedSuccessfully", null, 'mesgs');
-				$urltogo = $backtopage ? $backtopage : dol_buildpath('/accountancy/admin/account.php', 1);
+				$urltogo = $backtopage ? $backtopage : DOL_URL_ROOT.'/accountancy/admin/account.php';
 				header("Location: " . $urltogo);
 				exit;
 			}
@@ -138,7 +138,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount) {
 		} else {
 			$result = $object->fetch($id);
 
-			$sql = 'SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid='.((int) $conf->global->CHARTOFACCOUNTS);
+			$sql = "SELECT pcg_version FROM ".MAIN_DB_PREFIX."accounting_system WHERE rowid=".((int) $conf->global->CHARTOFACCOUNTS);
 
 			dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
 			$result2 = $db->query($sql);
@@ -257,7 +257,20 @@ if ($action == 'create') {
 	print $form->textwithpicto($langs->trans("Pcgtype"), $langs->transnoentitiesnoconv("PcgtypeDesc"));
 	print '</td>';
 	print '<td>';
-	print '<input type="text" name="pcg_type" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
+	print '<input type="text" name="pcg_type" list="pcg_type_datalist" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
+	// autosuggest from existing account types if found
+	print '<datalist id="pcg_type_datalist">';
+	$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>';
 	print '</td></tr>';
 
 	// Category
@@ -320,7 +333,20 @@ if ($action == 'create') {
 			print $form->textwithpicto($langs->trans("Pcgtype"), $langs->transnoentitiesnoconv("PcgtypeDesc"));
 			print '</td>';
 			print '<td>';
-			print '<input type="text" name="pcg_type" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
+			print '<input type="text" name="pcg_type" list="pcg_type_datalist" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
+			// autosuggest from existing account types if found
+			print '<datalist id="pcg_type_datalist">';
+			$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>';
 			print '</td></tr>';
 
 			// Category
@@ -335,11 +361,7 @@ if ($action == 'create') {
 
 			print dol_get_fiche_end();
 
-			print '<div class="center">';
-			print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
-			print '</div>';
+			print $form->buttonsSaveCancel();
 
 			print '</form>';
 		} else {
@@ -395,13 +417,13 @@ if ($action == 'create') {
 			print '<div class="tabsAction">';
 
 			if (!empty($user->rights->accounting->chartofaccount)) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=update&token='.newToken().'&id='.$id.'">'.$langs->trans('Modify').'</a>';
+				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)) {
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$id.'">'.$langs->trans('Delete').'</a>';
+				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.php b/htdocs/accountancy/admin/categories.php
index bee481bebd6..39aa21f2d63 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -110,7 +110,7 @@ print '<table class="border centpercent">';
 print '<tr><td class="titlefield">'.$langs->trans("AccountingCategory").'</td>';
 print '<td>';
 $formaccounting->select_accounting_category($cat_id, 'account_category', 1, 0, 0, 1);
-print '<input class="button" type="submit" value="'.$langs->trans("Select").'">';
+print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
 print '</td></tr>';
 
 // Select the accounts
@@ -137,7 +137,7 @@ if (!empty($cat_id)) {
 		print '</select><br>';
 		print ajax_combobox('cpt_bk');
 		*/
-		print '<input class="button" type="submit" id="" class="action-delete" value="'.$langs->trans("Add").'"> ';
+		print '<input type="submit" class="button button-add" id="" class="action-delete" value="'.$langs->trans("Add").'"> ';
 	}
 	print '</td></tr>';
 }
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 4891aae2e3f..bb629577ab6 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -520,7 +520,7 @@ if ($tabname[$id]) {
 		if ($valuetoshow != '') {
 			print '<td class="'.$class.'">';
 			if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
-				print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				print '<a href="'.$tabhelp[$id][$value].'">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
 			} elseif (!empty($tabhelp[$id][$value])) {
 				print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
 			} else {
@@ -561,7 +561,7 @@ if ($tabname[$id]) {
 	}
 
 	print '<td colspan="4" class="right">';
-	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+	print '<input type="submit" class="button button-add" name="actionadd" value="'.$langs->trans("Add").'">';
 	print '</td>';
 	print "</tr>";
 
@@ -583,7 +583,7 @@ if ($resql) {
 
 	$param = '&id='.$id;
 	if ($search_country_id > 0) {
-		$param .= '&search_country_id='.$search_country_id;
+		$param .= '&search_country_id='.urlencode($search_country_id);
 	}
 	$paramwithsearch = $param;
 	if ($sortorder) {
@@ -737,14 +737,14 @@ if ($resql) {
 				print '<td class="center">';
 				print '<input type="hidden" name="page" value="'.$page.'">';
 				print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-				print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+				print '<input type="submit" class="button button-edit" name="actionmodify" value="'.$langs->trans("Modify").'">';
 				print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
 				print '<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 				print '</td>';
 				print '<td></td>';
 			} else {
 				$tmpaction = 'view';
-				$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+				$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
 				$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
 				$error = $hookmanager->error; $errors = $hookmanager->errors;
@@ -814,7 +814,7 @@ if ($resql) {
 
 				// Modify link
 				if ($canbemodified) {
-					print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit">'.img_edit().'</a></td>';
+					print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
 				} else {
 					print '<td>&nbsp;</td>';
 				}
@@ -823,7 +823,7 @@ if ($resql) {
 				if ($iserasable) {
 					print '<td class="center">';
 					if ($user->admin) {
-						print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
+						print '<a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
 					}
 					//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
 					print '</td>';
diff --git a/htdocs/accountancy/admin/closure.php b/htdocs/accountancy/admin/closure.php
index a7873b72b90..437ff1b7116 100644
--- a/htdocs/accountancy/admin/closure.php
+++ b/htdocs/accountancy/admin/closure.php
@@ -109,7 +109,7 @@ foreach ($list_account_main as $key) {
 	print '</td>';
 	// Value
 	print '<td>'; // Do not force class=right, or it align also the content of the select box
-	print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
+	print $formaccounting->select_account(getDolGlobalString($key), $key, 1, '', 1, 1);
 	print '</td>';
 	print '</tr>';
 }
@@ -124,7 +124,7 @@ print '</td></tr>';
 
 print "</table>\n";
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
+print '<div class="center"><input type="submit" class="button button-edit" name="button" value="'.$langs->trans('Modify').'"></div>';
 
 print '</form>';
 
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 79a5c0975b7..c99503f95f6 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -52,6 +52,7 @@ $list_account_main = array(
 );
 
 $list_account = array();
+
 $list_account[] = '---Product---';
 $list_account[] = 'ACCOUNTING_PRODUCT_SOLD_ACCOUNT';
 if ($mysoc->isInEEC()) {
@@ -63,6 +64,7 @@ if ($mysoc->isInEEC()) {
 	$list_account[] = 'ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT';
 }
 $list_account[] = 'ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT';
+
 $list_account[] = '---Service---';
 $list_account[] = 'ACCOUNTING_SERVICE_SOLD_ACCOUNT';
 if ($mysoc->isInEEC()) {
@@ -74,11 +76,11 @@ if ($mysoc->isInEEC()) {
 	$list_account[] = 'ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT';
 }
 $list_account[] = 'ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT';
+
 $list_account[] = '---Others---';
 $list_account[] = 'ACCOUNTING_VAT_BUY_ACCOUNT';
 $list_account[] = 'ACCOUNTING_VAT_SOLD_ACCOUNT';
 $list_account[] = 'ACCOUNTING_VAT_PAY_ACCOUNT';
-$list_account[] = 'ACCOUNTING_ACCOUNT_SUSPENSE';
 if ($conf->banque->enabled) {
 	$list_account[] = 'ACCOUNTING_ACCOUNT_TRANSFER_CASH';
 }
@@ -96,6 +98,7 @@ if ($conf->loan->enabled) {
 if ($conf->societe->enabled) {
 	$list_account[] = 'ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT';
 }
+$list_account[] = 'ACCOUNTING_ACCOUNT_SUSPENSE';
 
 /*
  * Actions
@@ -154,6 +157,7 @@ print '<input type="hidden" name="action" value="update">';
 
 // Define main accounts for thirdparty
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td>'.$langs->trans("ThirdParties").' | '.$langs->trans("Users").'</td><td></td></tr>';
 
@@ -164,17 +168,29 @@ foreach ($list_account_main as $key) {
 	$keydesc = $key.'_Desc';
 
 	$htmltext = $langs->trans($keydesc);
-	print '<td class="fieldrequired" width="50%">';
+	print '<td class="fieldrequired">';
+	if ($key == 'ACCOUNTING_ACCOUNT_CUSTOMER') {
+		print img_picto('', 'company', 'class="pictofixedwidth"');
+	} elseif ($key == 'ACCOUNTING_ACCOUNT_SUPPLIER') {
+		print img_picto('', 'company', 'class="pictofixedwidth"');
+	} else {
+		print img_picto('', 'user', 'class="pictofixedwidth"');
+	}
 	print $form->textwithpicto($label, $htmltext);
 	print '</td>';
 	// Value
-	print '<td>'; // Do not force class=right, or it align also the content of the select box
+	print '<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');
 	print '</td>';
 	print '</tr>';
 }
+print "</table>\n";
+print "</div>\n";
 
 
+print '<div class="div-table-responsive-no-min">';
+print '<table class="noborder centpercent">';
+
 foreach ($list_account as $key) {
 	$reg = array();
 	if (preg_match('/---(.*)---/', $key, $reg)) {
@@ -183,10 +199,33 @@ foreach ($list_account as $key) {
 		print '<tr class="oddeven value">';
 		// Param
 		$label = $langs->trans($key);
-		print '<td width="50%">'.$label.'</td>';
+		print '<td>';
+		if (preg_match('/^ACCOUNTING_PRODUCT/', $key)) {
+			print img_picto('', 'product', 'class="pictofixedwidth"');
+		} elseif (preg_match('/^ACCOUNTING_SERVICE/', $key)) {
+			print img_picto('', 'service', 'class="pictofixedwidth"');
+		} elseif (preg_match('/^ACCOUNTING_VAT_PAY_ACCOUNT/', $key)) {
+			print img_picto('', 'payment_vat', 'class="pictofixedwidth"');
+		} elseif (preg_match('/^ACCOUNTING_VAT/', $key)) {
+			print img_picto('', 'vat', 'class="pictofixedwidth"');
+		} elseif (preg_match('/^ACCOUNTING_ACCOUNT_CUSTOMER/', $key)) {
+			print img_picto('', 'bill', 'class="pictofixedwidth"');
+		} elseif (preg_match('/^LOAN_ACCOUNTING_ACCOUNT/', $key)) {
+			print img_picto('', 'loan', 'class="pictofixedwidth"');
+		} elseif (preg_match('/^DONATION_ACCOUNTING/', $key)) {
+			print img_picto('', 'donation', 'class="pictofixedwidth"');
+		} elseif (preg_match('/^ADHERENT_SUBSCRIPTION/', $key)) {
+			print img_picto('', 'member', 'class="pictofixedwidth"');
+		} elseif (preg_match('/^ACCOUNTING_ACCOUNT_TRANSFER/', $key)) {
+			print img_picto('', 'bank_account', 'class="pictofixedwidth"');
+		} elseif (preg_match('/^ACCOUNTING_ACCOUNT_SUSPENSE/', $key)) {
+			print img_picto('', 'question', 'class="pictofixedwidth"');
+		}
+		print $label;
+		print '</td>';
 		// Value
-		print '<td>'; // Do not force class=right, or it align also the content of the select box
-		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accounts');
+		print '<td class="right">'; // Do not force class=right, or it align also the content of the select box
+		print $formaccounting->select_account(getDolGlobalString($key), $key, 1, '', 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accounts');
 		print '</td>';
 		print '</tr>';
 	}
@@ -194,9 +233,9 @@ foreach ($list_account as $key) {
 
 
 print "</table>\n";
+print "</div>\n";
 
-
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
+print '<div class="center"><input type="submit" class="button button-edit" name="button" value="'.$langs->trans('Modify').'"></div>';
 
 print '</form>';
 
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index 9e393beeacd..8cef3a05cf4 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -142,7 +142,7 @@ $linkback = '';
 print load_fiche_titre($langs->trans('ExportOptions'), $linkback, 'accountancy');
 
 
-print "\n".'<script type="text/javascript" language="javascript">'."\n";
+print "\n".'<script type="text/javascript">'."\n";
 print 'jQuery(document).ready(function () {'."\n";
 print '    function initfields()'."\n";
 print '    {'."\n";
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 4338d7ad803..2eb77815b60 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -52,7 +52,7 @@ $langs->loadLangs(array("admin", "compta"));
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (!$user->rights->accounting->fiscalyear->write) {              // If we can read accounting records, we should be able to see fiscal year.
+if (empty($user->rights->accounting->fiscalyear->write)) {              // If we can read accounting records, we should be able to see fiscal year.
 	accessforbidden();
 }
 
@@ -127,7 +127,6 @@ if ($result) {
 	$title = $langs->trans('AccountingPeriods');
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $addbutton, '', $limit, 1);
 
-	// Load attribute_label
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste centpercent">';
 	print '<tr class="liste_titre">';
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index 16463ec027b..2aa33f21645 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -242,11 +242,7 @@ if ($action == 'create') {
 
 			print '</table>';
 
-			print '<br><div class="center">';
-			print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
-			print '</div>';
+			print $form->buttonsSaveCancel();
 
 			print '</form>';
 
diff --git a/htdocs/accountancy/admin/fiscalyear_info.php b/htdocs/accountancy/admin/fiscalyear_info.php
index d472350fab7..77ec988143a 100644
--- a/htdocs/accountancy/admin/fiscalyear_info.php
+++ b/htdocs/accountancy/admin/fiscalyear_info.php
@@ -33,7 +33,7 @@ $langs->loadLangs(array("admin", "compta"));
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (!$user->rights->accounting->fiscalyear->write) {
+if (empty($user->rights->accounting->fiscalyear->write)) {
 	accessforbidden();
 }
 
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 4f4bff526c8..309dc094e82 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -462,7 +462,7 @@ print '</tr>';
 
 print '</table>';
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
+print '<div class="center"><input type="submit" class="button button-edit" name="button" value="'.$langs->trans('Modify').'"></div>';
 
 print '</form>';
 
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 9ba9d8a6e20..7f000290e1c 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -58,8 +58,8 @@ $listoffset = GETPOST('listoffset', 'alpha');
 $listlimit = GETPOST('listlimit', 'int') > 0 ?GETPOST('listlimit', 'int') : 1000;
 $active = 1;
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -453,7 +453,7 @@ if ($id) {
 			if ($valuetoshow != '') {
 				print '<td class="'.$class.'">';
 				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
-					print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+					print '<a href="'.$tabhelp[$id][$value].'">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
 				} elseif (!empty($tabhelp[$id][$value])) {
 					print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
 				} else {
@@ -494,7 +494,7 @@ if ($id) {
 		}
 
 		print '<td colspan="4" class="right">';
-		print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+		print '<input type="submit" class="button button-add" name="actionadd" value="'.$langs->trans("Add").'">';
 		print '</td>';
 		print "</tr>";
 
@@ -512,7 +512,7 @@ if ($id) {
 
 		$param = '&id='.$id;
 		if ($search_country_id > 0) {
-			$param .= '&search_country_id='.$search_country_id;
+			$param .= '&search_country_id='.urlencode($search_country_id);
 		}
 		$paramwithsearch = $param;
 		if ($sortorder) {
@@ -606,13 +606,13 @@ if ($id) {
 					print '<td class="center" colspan="4">';
 					print '<input type="hidden" name="page" value="'.$page.'">';
 					print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-					print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+					print '<input type="submit" class="button button-edit" name="actionmodify" value="'.$langs->trans("Modify").'">';
 					print '<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 					print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
 					print '</td>';
 				} else {
 					$tmpaction = 'view';
-					$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
 					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
 					$error = $hookmanager->error; $errors = $hookmanager->errors;
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 6056a310be7..847891c949b 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -4,6 +4,7 @@
  * 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
@@ -41,15 +42,18 @@ $langs->loadLangs(array("companies", "compta", "accountancy", "products"));
 if (empty($conf->accounting->enabled)) {
 	accessforbidden();
 }
-if (!$user->rights->accounting->bind->write) {
+if (empty($user->rights->accounting->bind->write)) {
 	accessforbidden();
 }
 
 // search & action GETPOST
 $action = GETPOST('action', 'aZ09');
+$massaction = GETPOST('massaction', 'alpha');
 $codeventil_buy = GETPOST('codeventil_buy', 'array');
 $codeventil_sell = GETPOST('codeventil_sell', 'array');
 $chk_prod = GETPOST('chk_prod', 'array');
+$default_account = GETPOST('default_account', 'int');
+$confirm = GETPOST('confirm', 'alpha');
 $account_number_buy = GETPOST('account_number_buy');
 $account_number_sell = GETPOST('account_number_sell');
 $changeaccount = GETPOST('changeaccount', 'array');
@@ -68,16 +72,16 @@ $search_onsell = GETPOST('search_onsell', 'alpha');
 $search_onpurchase = GETPOST('search_onpurchase', 'alpha');
 
 $accounting_product_mode = GETPOST('accounting_product_mode', 'alpha');
-$btn_changeaccount = GETPOST('changeaccount', 'alpha');
 $btn_changetype = GETPOST('changetype', 'alpha');
+$optioncss = GETPOST('optioncss', 'alpha');
 
 if (empty($accounting_product_mode)) {
 	$accounting_product_mode = 'ACCOUNTANCY_SELL';
 }
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -164,7 +168,7 @@ if ($action == 'update') {
 		}
 	}
 
-	if (!empty($btn_changeaccount)) {
+	if (!empty($chk_prod) && $massaction === 'changeaccount') {
 		//$msg = '<div><span class="accountingprocessing">' . $langs->trans("Processing") . '...</span></div>';
 		if (!empty($chk_prod) && in_array($accounting_product_mode, $accounting_product_modes)) {
 			$accounting = new AccountingAccount($db);
@@ -214,8 +218,10 @@ if ($action == 'update') {
 						$sql .= " WHERE rowid = ".((int) $productid);
 					}
 
+					dol_syslog("/accountancy/admin/productaccount.php", LOG_DEBUG);
+
 					$db->begin();
-					dol_syslog("/accountancy/admin/productaccount.php sql=".$sql, LOG_DEBUG);
+
 					if ($db->query($sql)) {
 						$ok++;
 						$db->commit();
@@ -251,35 +257,35 @@ $form = new FormAccounting($db);
 // so we need to get those the rowid of those default value first
 $accounting = new AccountingAccount($db);
 // TODO: we should need to check if result is already exists accountaccount rowid.....
-$aarowid_servbuy            = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT, 1);
-$aarowid_servbuy_intra      = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT, 1);
-$aarowid_servbuy_export     = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT, 1);
-$aarowid_prodbuy            = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT, 1);
-$aarowid_prodbuy_intra      = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT, 1);
-$aarowid_prodbuy_export     = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT, 1);
-$aarowid_servsell           = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT, 1);
-$aarowid_servsell_intra     = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT, 1);
-$aarowid_servsell_export    = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT, 1);
-$aarowid_prodsell           = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT, 1);
-$aarowid_prodsell_intra     = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT, 1);
-$aarowid_prodsell_export    = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT, 1);
+$aarowid_servbuy            = $accounting->fetch('', getDolGlobalString('ACCOUNTING_SERVICE_BUY_ACCOUNT'), 1);
+$aarowid_servbuy_intra      = $accounting->fetch('', getDolGlobalString('ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT'), 1);
+$aarowid_servbuy_export     = $accounting->fetch('', getDolGlobalString('ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT'), 1);
+$aarowid_prodbuy            = $accounting->fetch('', getDolGlobalString('ACCOUNTING_PRODUCT_BUY_ACCOUNT'), 1);
+$aarowid_prodbuy_intra      = $accounting->fetch('', getDolGlobalString('ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT'), 1);
+$aarowid_prodbuy_export     = $accounting->fetch('', getDolGlobalString('ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT'), 1);
+$aarowid_servsell           = $accounting->fetch('', getDolGlobalString('ACCOUNTING_SERVICE_SOLD_ACCOUNT'), 1);
+$aarowid_servsell_intra     = $accounting->fetch('', getDolGlobalString('ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT'), 1);
+$aarowid_servsell_export    = $accounting->fetch('', getDolGlobalString('ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT'), 1);
+$aarowid_prodsell           = $accounting->fetch('', getDolGlobalString('ACCOUNTING_PRODUCT_SOLD_ACCOUNT'), 1);
+$aarowid_prodsell_intra     = $accounting->fetch('', getDolGlobalString('ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT'), 1);
+$aarowid_prodsell_export    = $accounting->fetch('', getDolGlobalString('ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT'), 1);
 
-$aacompta_servbuy           = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_servbuy_intra     = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_servbuy_export    = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_prodbuy           = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_prodbuy_intra     = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_prodbuy_export    = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_servsell          = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_servsell_intra    = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_servsell_export   = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_prodsell          = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_prodsell_intra    = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
-$aacompta_prodsell_export   = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
+$aacompta_servbuy           = getDolGlobalString('ACCOUNTING_SERVICE_BUY_ACCOUNT', $langs->trans("CodeNotDef"));
+$aacompta_servbuy_intra     = getDolGlobalString('ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT', $langs->trans("CodeNotDef"));
+$aacompta_servbuy_export    = getDolGlobalString('ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT', $langs->trans("CodeNotDef"));
+$aacompta_prodbuy           = getDolGlobalString('ACCOUNTING_PRODUCT_BUY_ACCOUNT', $langs->trans("CodeNotDef"));
+$aacompta_prodbuy_intra     = getDolGlobalString('ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT', $langs->trans("CodeNotDef"));
+$aacompta_prodbuy_export    = getDolGlobalString('ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT', $langs->trans("CodeNotDef"));
+$aacompta_servsell          = getDolGlobalString('ACCOUNTING_SERVICE_SOLD_ACCOUNT', $langs->trans("CodeNotDef"));
+$aacompta_servsell_intra    = getDolGlobalString('ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT', $langs->trans("CodeNotDef"));
+$aacompta_servsell_export   = getDolGlobalString('ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT', $langs->trans("CodeNotDef"));
+$aacompta_prodsell          = getDolGlobalString('ACCOUNTING_PRODUCT_SOLD_ACCOUNT', $langs->trans("CodeNotDef"));
+$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"));
 
-$pcgverid = $conf->global->CHARTOFACCOUNTS;
+$pcgverid = getDolGlobalString('CHARTOFACCOUNTS');
 $pcgvercode = dol_getIdFromCode($db, $pcgverid, 'accounting_system', 'rowid', 'pcg_version');
 if (empty($pcgvercode)) {
 	$pcgvercode = $pcgverid;
@@ -346,7 +352,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 
 $sql .= $db->plimit($limit + 1, $offset);
 
-dol_syslog("/accountancy/admin/productaccount.php:: sql=".$sql, LOG_DEBUG);
+dol_syslog("/accountancy/admin/productaccount.php", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
@@ -433,11 +439,27 @@ if ($result) {
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
+	if ($massaction !== 'set_default_account') {
+		$arrayofmassactions = array(
+			'changeaccount'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Save")
+			,'set_default_account'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("ConfirmPreselectAccount")
+		);
+		$massactionbutton = $form->selectMassAction('', $arrayofmassactions, 1);
+	}
+
 	$buttonsave = '<input type="submit" class="button button-save" id="changeaccount" name="changeaccount" value="'.$langs->trans("Save").'">';
 	//print '<br><div class="center">'.$buttonsave.'</div>';
 
 	$texte = $langs->trans("ListOfProductsServices");
-	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $buttonsave, $num, $nbtotalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+
+	if ($massaction == 'set_default_account') {
+		$formquestion[]=array('type' => 'other',
+			'name' => 'set_default_account',
+			'label' => $langs->trans("AccountancyCode"),
+			'value' => $form->select_account('', 'default_account', 1, array(), 0, 0, 'maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone'));
+		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);
+	}
 
 	print '<div class="div-table-responsive">';
 	print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
@@ -642,7 +664,7 @@ if ($result) {
 			if (!empty($obj->aaid)) {
 				$defaultvalue = ''; // Do not suggest default new value is code is already valid
 			}
-			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
+			print $form->select_account(($default_account > 0 && $confirm === 'yes' && in_array($product_static->id, $chk_prod)) ? $default_account : $defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 			// Accounting account buy intra (In EEC)
@@ -656,7 +678,7 @@ if ($result) {
 			if (!empty($obj->aaid)) {
 				$defaultvalue = ''; // Do not suggest default new value is code is already valid
 			}
-			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
+			print $form->select_account(($default_account > 0 && $confirm === 'yes' && in_array($product_static->id, $chk_prod)) ? $default_account : $defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
 			// Accounting account buy export (Out of EEC)
@@ -670,7 +692,7 @@ if ($result) {
 			if (!empty($obj->aaid)) {
 				$defaultvalue = ''; // Do not suggest default new value is code is already valid
 			}
-			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
+			print $form->select_account(($default_account > 0 && $confirm === 'yes' && in_array($product_static->id, $chk_prod)) ? $default_account : $defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
 			// Accounting account sell
@@ -684,7 +706,7 @@ if ($result) {
 			if (!empty($obj->aaid)) {
 				$defaultvalue = ''; // Do not suggest default new value is code is already valid
 			}
-			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
+			print $form->select_account(($default_account > 0 && $confirm === 'yes' && in_array($product_static->id, $chk_prod)) ? $default_account : $defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
 			// Accounting account sell intra (In EEC)
@@ -698,7 +720,7 @@ if ($result) {
 			if (!empty($obj->aaid)) {
 				$defaultvalue = ''; // Do not suggest default new value is code is already valid
 			}
-			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
+			print $form->select_account(($default_account > 0 && $confirm === 'yes' && in_array($product_static->id, $chk_prod)) ? $default_account : $defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} else {
 			// Accounting account sell export (Out of EEC)
@@ -711,20 +733,27 @@ if ($result) {
 			if (!empty($obj->aaid)) {
 				$defaultvalue = ''; // Do not suggest default new value is code is already valid
 			}
-			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
+			print $form->select_account(($default_account > 0 && $confirm === 'yes' && in_array($product_static->id, $chk_prod)) ? $default_account : $defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		}
 
+		if (!empty($chk_prod)) {
+			$ischecked = 0;
+			if (in_array($product_static->id, $chk_prod)) {
+				$ischecked=true;
+			}
+		}
+
 		// Checkbox select
 		print '<td class="center">';
-		print '<input type="checkbox" class="checkforselect productforselectcodeventil_'.$product_static->id.'" name="chk_prod[]" value="'.$obj->rowid.'"/></td>';
+		print '<input type="checkbox" class="checkforselect productforselectcodeventil_'.$product_static->id.'" name="chk_prod[]" '.($ischecked ? "checked" : "").' value="'.$obj->rowid.'"/></td>';
 		print "</tr>";
 		$i++;
 	}
 	print '</table>';
 	print '</div>';
 
-	print '<script type="text/javascript" language="javascript">
+	print '<script type="text/javascript">
         jQuery(document).ready(function() {
         	function init_savebutton()
         	{
diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php
index ad1804048c3..cc0d4de9f31 100644
--- a/htdocs/accountancy/admin/subaccount.php
+++ b/htdocs/accountancy/admin/subaccount.php
@@ -36,6 +36,7 @@ $cancel = GETPOST('cancel', 'alpha');
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
 $massaction = GETPOST('massaction', 'aZ09');
+$optioncss = GETPOST('optioncss', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'accountingsubaccountlist'; // To manage different context of search
 
 $search_subaccount = GETPOST('search_subaccount', 'alpha');
@@ -46,7 +47,7 @@ $search_type = GETPOST('search_type', 'int');
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (!$user->rights->accounting->chartofaccount) {
+if (empty($user->rights->accounting->chartofaccount)) {
 	accessforbidden();
 }
 
@@ -367,6 +368,7 @@ if ($resql) {
 	print "</tr>\n";
 
 	$totalarray = array();
+	$totalarray['nbfield'] = 0;
 	$i = 0;
 	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
@@ -439,13 +441,13 @@ if ($resql) {
 		$e = '';
 		// Customer
 		if ($obj->type == 1) {
-			$e .= '<a class="editfielda" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/societe/card.php?action=edit&socid='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
+			$e .= '<a class="editfielda" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/societe/card.php?action=edit&token='.newToken().'&socid='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
 		} elseif ($obj->type == 2) {
 			// Supplier
-			$e .= '<a class="editfielda" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/societe/card.php?action=edit&socid='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
+			$e .= '<a class="editfielda" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/societe/card.php?action=edit&token='.newToken().'&socid='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
 		} elseif ($obj->type == 3) {
 			// User
-			$e .= '<a class="editfielda" title="'.$langs->trans("Employee").'" href="'.DOL_URL_ROOT.'/user/card.php?action=edit&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
+			$e .= '<a class="editfielda" title="'.$langs->trans("Employee").'" href="'.DOL_URL_ROOT.'/user/card.php?action=edit&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
 		}
 		print $e;
 		print '</td>'."\n";
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 1d210e74d8a..3c2e8763fe1 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -40,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 $langs->loadLangs(array("accountancy", "compta"));
 
 $action = GETPOST('action', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ09');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -120,19 +121,19 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 $filter = array();
 if (!empty($search_date_start)) {
 	$filter['t.doc_date>='] = $search_date_start;
-	$param .= '&amp;date_startmonth='.GETPOST('date_startmonth', 'int').'&amp;date_startday='.GETPOST('date_startday', 'int').'&amp;date_startyear='.GETPOST('date_startyear', 'int');
+	$param .= '&date_startmonth='.GETPOST('date_startmonth', 'int').'&date_startday='.GETPOST('date_startday', 'int').'&date_startyear='.GETPOST('date_startyear', 'int');
 }
 if (!empty($search_date_end)) {
 	$filter['t.doc_date<='] = $search_date_end;
-	$param .= '&amp;date_endmonth='.GETPOST('date_endmonth', 'int').'&amp;date_endday='.GETPOST('date_endday', 'int').'&amp;date_endyear='.GETPOST('date_endyear', 'int');
+	$param .= '&date_endmonth='.GETPOST('date_endmonth', 'int').'&date_endday='.GETPOST('date_endday', 'int').'&date_endyear='.GETPOST('date_endyear', 'int');
 }
 if (!empty($search_accountancy_code_start)) {
 	$filter['t.numero_compte>='] = $search_accountancy_code_start;
-	$param .= '&amp;search_accountancy_code_start='.$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 .= '&amp;search_accountancy_code_end='.$search_accountancy_code_end;
+	$param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
 }
 if (!empty($search_ledger_code)) {
 	$filter['t.code_journal'] = $search_ledger_code;
@@ -236,11 +237,11 @@ if ($action != 'export_csv') {
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
 	$parameters = array();
-	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('addMoreActionsButtonsList', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) {
 		$button = '<input type="button" id="exportcsvbutton" name="exportcsvbutton" class="butAction" value="'.$langs->trans("Export").' ('.$conf->global->ACCOUNTING_EXPORT_FORMAT.')" />';
 
-		print '<script type="text/javascript" language="javascript">
+		print '<script type="text/javascript">
 		jQuery(document).ready(function() {
 			jQuery("#exportcsvbutton").click(function() {
 				event.preventDefault();
@@ -416,7 +417,7 @@ if ($action != 'export_csv') {
 
 				// Show first line of a break
 				print '<tr class="trforbreak">';
-				print '<td colspan="'.($colspan+1).'" style="font-weight:bold; border-bottom: 1pt solid black;">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
+				print '<td colspan="'.($colspan+1).'" class="tdforbreak">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
 				print '</tr>';
 
 				$displayed_account = $root_account_number;
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index c156a388735..8a66acee0d9 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
@@ -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;
 
@@ -389,11 +396,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" value="'.$langs->trans("Cancel").'" class="button button-cancel" onclick="history.go(-1)" />';
-	print '</div>';
+	print $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 } else {
@@ -437,7 +440,7 @@ if ($action == 'create') {
 		print $langs->trans('Docdate');
 		print '</td>';
 		if ($action != 'editdate') {
-			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;piece_num='.$object->piece_num.'&amp;mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdate&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td colspan="3">';
@@ -450,7 +453,7 @@ if ($action == 'create') {
 			print '<input type="hidden" name="action" value="setdate">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
 			print $form->selectDate($object->doc_date ? $object->doc_date : - 1, 'doc_date', '', '', '', "setdate");
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
 			print $object->doc_date ? dol_print_date($object->doc_date, 'day') : '&nbsp;';
@@ -464,7 +467,7 @@ if ($action == 'create') {
 		print $langs->trans('Codejournal');
 		print '</td>';
 		if ($action != 'editjournal') {
-			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editjournal&amp;piece_num='.$object->piece_num.'&amp;mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editjournal&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
@@ -477,7 +480,7 @@ if ($action == 'create') {
 			print '<input type="hidden" name="action" value="setjournal">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
 			print $formaccounting->select_journal($object->code_journal, 'code_journal', 0, 0, array(), 1, 1);
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
 			print $object->code_journal;
@@ -491,7 +494,7 @@ if ($action == 'create') {
 		print $langs->trans('Piece');
 		print '</td>';
 		if ($action != 'editdocref') {
-			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdocref&amp;piece_num='.$object->piece_num.'&amp;mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdocref&token='.newToken().'&piece_num='.urlencode($object->piece_num).'&mode='.urlencode($mode).'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
@@ -504,7 +507,7 @@ if ($action == 'create') {
 			print '<input type="hidden" name="action" value="setdocref">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
 			print '<input type="text" size="20" name="doc_ref" value="'.dol_escape_htmltag($object->doc_ref).'">';
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
 			print $object->doc_ref;
@@ -516,10 +519,10 @@ if ($action == 'create') {
 
 		print '</div>';
 
-		print '<div class="fichehalfright"><div class="ficheaddleft">';
+		print '<div class="fichehalfright">';
 
 		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border tableforfield" width="100%">';
+		print '<table class="border tableforfield centpercent">';
 
 		// Doc type
 		if (!empty($object->doc_type)) {
@@ -595,7 +598,7 @@ if ($action == 'create') {
 		*/
 		print "</table>\n";
 
-		print '</div></div><!-ee-->';
+		print '</div>';
 
 		print dol_get_fiche_end();
 
@@ -622,9 +625,10 @@ if ($action == 'create') {
 			print '<input type="hidden" name="fk_docdet" value="'.$object->fk_docdet.'">'."\n";
 			print '<input type="hidden" name="mode" value="'.$mode.'">'."\n";
 
-			print '<table class="noborder centpercent">';
-
 			if (count($object->linesmvt) > 0) {
+				print '<div class="div-table-responsive-no-min">';
+				print '<table class="noborder centpercent">';
+
 				$total_debit = 0;
 				$total_credit = 0;
 
@@ -674,8 +678,14 @@ if ($action == 'create') {
 						print '<input type="submit" class="button" name="update" value="'.$langs->trans("Update").'">';
 						print '</td>';
 					} else {
-						$accountingaccount->fetch(null, $line->numero_compte, true);
-						print '<td>'.$accountingaccount->getNomUrl(0, 1, 1, '', 0).'</td>';
+						$resultfetch = $accountingaccount->fetch(null, $line->numero_compte, true);
+						print '<td>';
+						if ($resultfetch > 0) {
+							print $accountingaccount->getNomUrl(0, 1, 1, '', 0);
+						} else {
+							print $line->numero_compte.' <span class="warning">('.$langs->trans("AccountRemovedFromCurrentChartOfAccount").')</span>';
+						}
+						print '</td>';
 						print '<td>'.length_accounta($line->subledger_account);
 						if ($line->subledger_label) {
 							print ' - <span class="opacitymedium">'.$line->subledger_label.'</span>';
@@ -685,11 +695,15 @@ if ($action == 'create') {
 						print '<td class="right nowraponall amount">'.price($line->debit).'</td>';
 						print '<td class="right nowraponall amount">'.price($line->credit).'</td>';
 
-						print '<td class="center">';
+						print '<td class="center nowraponall">';
 						if (empty($line->date_export) && empty($line->date_validation)) {
 							print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
 							print img_edit('', 0, 'class="marginrightonly"');
 							print '</a> &nbsp;';
+						} else {
+							print '<a class="editfielda nohover cursornotallowed reposition disabled" href="#" title="'.dol_escape_htmltag($langs->trans("ForbiddenTransactionAlreadyExported")).'">';
+							print img_edit($langs->trans("ForbiddenTransactionAlreadyExported"), 0, 'class="marginrightonly"');
+							print '</a> &nbsp;';
 						}
 
 						if (empty($line->date_validation)) {
@@ -700,9 +714,13 @@ if ($action == 'create') {
 
 							print '<a href="' . $_SERVER["PHP_SELF"] . '?action=' . $actiontodelete . '&id=' . $line->id . '&piece_num=' . urlencode($line->piece_num) . '&mode=' . urlencode($mode) . '&token=' . urlencode(newToken()) . '">';
 							print img_delete();
+							print '</a>';
+						} else {
+							print '<a class="editfielda nohover cursornotallowed disabled" href="#" title="'.dol_escape_htmltag($langs->trans("ForbiddenTransactionAlreadyExported")).'">';
+							print img_delete($langs->trans("ForbiddenTransactionAlreadyValidated"));
+							print '</a>';
 						}
 
-						print '</a>';
 						print '</td>';
 					}
 					print "</tr>\n";
@@ -737,12 +755,16 @@ if ($action == 'create') {
 						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><input type="submit" class="button" name="save" value="' . $langs->trans("Add") . '"></td>';
+						print '<td>';
+						print '<input type="submit" class="button" name="save" value="' . $langs->trans("Add") . '">';
+						print '</td>';
 						print '</tr>';
 					}
-					print '</table>';
 				}
 
+				print '</table>';
+				print '</div>';
+
 				if ($mode == '_tmp' && $action == '') {
 					print '<br>';
 					print '<div class="center">';
@@ -757,8 +779,9 @@ if ($action == 'create') {
 
 					print "</div>";
 				}
-				print '</form>';
 			}
+
+			print '</form>';
 		}
 	} else {
 		print load_fiche_titre($langs->trans("NoRecords"));
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 52ac288856b..67f521806cb 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -24,6 +24,7 @@
  * \ingroup		Accountancy (Double entries)
  * \brief 		List operation of book keeping
  */
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyexport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
@@ -526,23 +527,25 @@ $sqlwhere = array();
 if (count($filter) > 0) {
 	foreach ($filter as $key => $value) {
 		if ($key == 't.doc_date') {
-			$sqlwhere[] = $key.'=\''.$db->idate($value).'\'';
+			$sqlwhere[] = $key."='".$db->idate($value)."'";
 		} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
-			$sqlwhere[] = $key.'\''.$db->idate($value).'\'';
+			$sqlwhere[] = $key."'".$db->idate($value)."'";
 		} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
-			$sqlwhere[] = $key.'\''.$db->escape($value).'\'';
+			$sqlwhere[] = $key."'".$db->escape($value)."'";
 		} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
-			$sqlwhere[] = $key.'='.$value;
+			$sqlwhere[] = $key.'='.((int) $value);
 		} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
-			$sqlwhere[] = $key.' LIKE \''.$db->escape($value).'%\'';
+			$sqlwhere[] = $key." LIKE '".$db->escape($value)."%'";
+		} elseif ($key == 't.subledger_account') {
+			$sqlwhere[] = natural_search($key, $value, 0, 1);
 		} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
-			$sqlwhere[] = $key.'\''.$db->idate($value).'\'';
+			$sqlwhere[] = $key."'".$db->idate($value)."'";
 		} elseif ($key == 't.tms>=' || $key == 't.tms<=') {
-			$sqlwhere[] = $key.'\''.$db->idate($value).'\'';
+			$sqlwhere[] = $key."'".$db->idate($value)."'";
 		} elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
-			$sqlwhere[] = $key.'\''.$db->idate($value).'\'';
+			$sqlwhere[] = $key."'".$db->idate($value)."'";
 		} elseif ($key == 't.date_validated>=' || $key == 't.date_validated<=') {
-			$sqlwhere[] = $key.'\''.$db->idate($value).'\'';
+			$sqlwhere[] = $key."'".$db->idate($value)."'";
 		} elseif ($key == 't.credit' || $key == 't.debit') {
 			$sqlwhere[] = natural_search($key, $value, 1, 1);
 		} elseif ($key == 't.reconciled_option') {
@@ -606,7 +609,8 @@ if ($action == 'export_fileconfirm' && $user->rights->accounting->mouvements->ex
 					}
 					$sql .= " WHERE rowid = ".((int) $movement->id);
 
-					dol_syslog("/accountancy/bookkeeping/list.php Function export_file Specify movements as exported sql=".$sql, LOG_DEBUG);
+					dol_syslog("/accountancy/bookkeeping/list.php Function export_file Specify movements as exported", LOG_DEBUG);
+
 					$result = $db->query($sql);
 					if (!$result) {
 						$error++;
@@ -689,9 +693,11 @@ if ($action == 'export_file') {
 
 	$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);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?mvt_num='.urlencode(GETPOST('mvt_num')).$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1);
 }
+
 if ($action == 'delbookkeepingyear') {
 	$form_question = array();
 	$delyear = GETPOST('delyear', 'int');
@@ -712,6 +718,7 @@ if ($action == 'delbookkeepingyear') {
 		'type' => 'select',
 		'label' => $langs->trans('DelMonth'),
 		'values' => $month_array,
+		'morecss' => 'minwidth150',
 		'default' => ''
 	);
 	$form_question['delyear'] = array(
@@ -729,7 +736,7 @@ if ($action == 'delbookkeepingyear') {
 			'default' => $deljournal
 	);
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'delbookkeepingyearconfirm', $form_question, '', 1, 320);
 }
 
 // Print form confirm
@@ -762,7 +769,7 @@ if (count($filter)) {
 }
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('addMoreActionsButtonsList', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	// Button re-export
 	if (!empty($conf->global->ACCOUNTING_REEXPORT)) {
@@ -1244,7 +1251,7 @@ while ($i < min($num, $limit)) {
 	}
 	if (empty($line->date_validation)) {
 		if ($user->rights->accounting->mouvements->supprimer) {
-			print '<a class="reposition paddingleft marginrightonly" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
+			print '<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>';
@@ -1268,7 +1275,7 @@ print '</div>';
 // TODO Replace this with mass delete action
 if ($user->rights->accounting->mouvements->supprimer_tous) {
 	print '<div class="tabsAction tabsActionNoBottom">'."\n";
-	print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
+	print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear&token='.newToken().($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
 	print '</div>';
 }
 
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 27f23d36a74..837a372a32d 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -473,7 +473,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$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'));
@@ -711,8 +711,8 @@ while ($i < min($num, $limit)) {
 		}
 
 		// Show the break account
-		print "<tr>";
-		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 10).'" style="font-weight:bold; border-bottom: 1pt solid black;">';
+		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);
 		} else {
@@ -904,7 +904,7 @@ while ($i < min($num, $limit)) {
 	}
 	if (empty($line->date_validation)) {
 		if ($user->rights->accounting->mouvements->supprimer) {
-			print '<a class="reposition paddingleft marginrightonly" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
+			print '<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>';
@@ -957,7 +957,7 @@ print '</div>';
 // TODO Replace this with mass delete action
 if ($user->rights->accounting->mouvements->supprimer_tous) {
 	print '<div class="tabsAction tabsActionNoBottom">'."\n";
-	print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
+	print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear&token='.newToken().($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
 	print '</div>';
 }
 
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index 5e83c729fb1..c6fb95d5ab7 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -473,7 +473,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$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'));
@@ -713,8 +713,8 @@ while ($i < min($num, $limit)) {
 		}
 
 		// Show the break account
-		print "<tr>";
-		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 10).'" style="font-weight:bold; border-bottom: 1pt solid black;">';
+		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 {
@@ -915,7 +915,7 @@ while ($i < min($num, $limit)) {
 	}
 	if (empty($line->date_validation)) {
 		if ($user->rights->accounting->mouvements->supprimer) {
-			print '<a class="reposition paddingleft marginrightonly" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
+			print '<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>';
@@ -968,7 +968,7 @@ print '</div>';
 // TODO Replace this with mass delete action
 if ($user->rights->accounting->mouvements->supprimer_tous) {
 	print '<div class="tabsAction tabsActionNoBottom">'."\n";
-	print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
+	print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear&token='.newToken().($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
 	print '</div>';
 }
 
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
index 29a0171fe08..a563b653ac1 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
@@ -48,8 +48,8 @@ $socid = GETPOSTINT("socid");
 // if ($user->socid) $socid=$user->socid;
 
 $limit = GETPOSTISSET('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == - 1) {
 	$page = 0;
@@ -157,7 +157,7 @@ $sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, ";
 $sql .= " bk.subledger_account, bk.numero_compte , bk.label_compte, bk.debit, ";
 $sql .= " bk.credit, bk.montant, bk.sens, bk.code_journal, bk.piece_num, bk.lettering_code";
 $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as bk";
-$sql .= " WHERE (bk.subledger_account =  '".$db->escape($object->code_compta)."' AND bk.numero_compte = '".$db->escape($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)."' )";
+$sql .= " WHERE (bk.subledger_account = '".$db->escape($object->code_compta)."' AND bk.numero_compte = '".$db->escape($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)."' )";
 
 /*
 if (dol_strlen($search_date_start) || dol_strlen($search_date_end)) {
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
index d62a1e9fc25..5c315bee9fc 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
@@ -48,8 +48,8 @@ $socid = GETPOSTINT("socid");
 
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == - 1) {
 	$page = 0;
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 77d10516daa..7657e997ff6 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -212,7 +212,7 @@ class AccountancyCategory // extends CommonObject
 		$sql .= " ".(!isset($this->position) ? 'NULL' : ((int) $this->position)).",";
 		$sql .= " ".(!isset($this->fk_country) ? 'NULL' : ((int) $this->fk_country)).",";
 		$sql .= " ".(!isset($this->active) ? 'NULL' : ((int) $this->active));
-		$sql .= ", ".$conf->entity;
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ")";
 
 		$this->db->begin();
@@ -433,7 +433,7 @@ class AccountancyCategory // extends CommonObject
 
 		$this->lines_display = array();
 
-		dol_syslog(__METHOD__." sql=".$sql, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -632,7 +632,7 @@ class AccountancyCategory // extends CommonObject
 		$sql .= " WHERE aa.rowid = ".((int) $cpt_id);
 		$this->db->begin();
 
-		dol_syslog(__METHOD__." sql=".$sql, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error++;
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index ec24af642fd..0d0d013a69f 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -59,6 +59,8 @@ class AccountancyExport
 	public static $EXPORT_TYPE_LDCOMPTA10 = 120;
 	public static $EXPORT_TYPE_GESTIMUMV3 = 130;
 	public static $EXPORT_TYPE_GESTIMUMV5 = 135;
+	public static $EXPORT_TYPE_ISUITEEXPERT = 200;
+	// Generic FEC after that
 	public static $EXPORT_TYPE_FEC = 1000;
 	public static $EXPORT_TYPE_FEC2 = 1010;
 
@@ -85,11 +87,11 @@ class AccountancyExport
 	 *
 	 * @param DoliDb $db Database handler
 	 */
-	public function __construct(DoliDB &$db)
+	public function __construct(DoliDB $db)
 	{
 		global $conf;
 
-		$this->db = &$db;
+		$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");
 	}
@@ -123,6 +125,7 @@ class AccountancyExport
 			self::$EXPORT_TYPE_GESTIMUMV5 => $langs->trans('Modelcsv_Gestinumv5'),
 			self::$EXPORT_TYPE_FEC => $langs->trans('Modelcsv_FEC'),
 			self::$EXPORT_TYPE_FEC2 => $langs->trans('Modelcsv_FEC2'),
+			self::$EXPORT_TYPE_ISUITEEXPERT => 'Export iSuite Expert',
 		);
 
 		ksort($listofexporttypes, SORT_NUMERIC);
@@ -158,6 +161,7 @@ class AccountancyExport
 			self::$EXPORT_TYPE_GESTIMUMV5 => 'gestimumv5',
 			self::$EXPORT_TYPE_FEC => 'fec',
 			self::$EXPORT_TYPE_FEC2 => 'fec2',
+			self::$EXPORT_TYPE_ISUITEEXPERT => 'isuiteexpert',
 		);
 
 		return $formatcode[$type];
@@ -243,6 +247,10 @@ class AccountancyExport
 					'label' => $langs->trans('Modelcsv_FEC2'),
 					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
 				),
+				self::$EXPORT_TYPE_ISUITEEXPERT => array(
+					'label' => 'iSuite Expert',
+					'ACCOUNTING_EXPORT_FORMAT' => 'csv',
+				),
 			),
 			'cr'=> array(
 				'1' => $langs->trans("Unix"),
@@ -334,6 +342,9 @@ class AccountancyExport
 			case self::$EXPORT_TYPE_FEC2:
 				$this->exportFEC2($TData);
 				break;
+			case self::$EXPORT_TYPE_ISUITEEXPERT :
+				$this->exportiSuiteExpert($TData);
+				break;
 			default:
 				$this->errors[] = $langs->trans('accountancy_error_modelnotfound');
 				break;
@@ -903,7 +914,8 @@ class AccountancyExport
 		print "ValidDate".$separator;
 		print "Montantdevise".$separator;
 		print "Idevise".$separator;
-		print "DateLimitReglmt";
+		print "DateLimitReglmt".$separator;
+		print "NumFacture";
 		print $end_line;
 
 		foreach ($objectLines as $line) {
@@ -913,9 +925,26 @@ class AccountancyExport
 				$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
 				$date_document = dol_print_date($line->doc_date, '%Y%m%d');
 				$date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');
-				$date_validation = dol_print_date($line->date_validated, '%Y%m%d');
+				$date_validation = dol_print_date($line->date_validation, '%Y%m%d');
 				$date_limit_payment = dol_print_date($line->date_lim_reglement, '%Y%m%d');
 
+				$refInvoice = '';
+				if ($line->doc_type == 'customer_invoice') {
+					// Customer invoice
+					require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+					$invoice = new Facture($this->db);
+					$invoice->fetch($line->fk_doc);
+
+					$refInvoice = $invoice->ref;
+				} elseif ($line->doc_type == 'supplier_invoice') {
+					// Supplier invoice
+					require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+					$invoice = new FactureFournisseur($this->db);
+					$invoice->fetch($line->fk_doc);
+
+					$refInvoice = $invoice->ref_supplier;
+				}
+
 				// FEC:JournalCode
 				print $line->code_journal . $separator;
 
@@ -968,10 +997,13 @@ class AccountancyExport
 				print $line->multicurrency_amount . $separator;
 
 				// FEC:Idevise
-				print $line->multicurrency_code.$separator;
+				print $line->multicurrency_code . $separator;
 
 				// FEC_suppl:DateLimitReglmt
-				print $date_limit_payment;
+				print $date_limit_payment . $separator;
+
+				// FEC_suppl:NumFacture
+				print dol_trunc(self::toAnsi($refInvoice), 17, 'right', 'UTF-8', 1);
 
 				print $end_line;
 			}
@@ -1009,7 +1041,8 @@ class AccountancyExport
 		print "ValidDate".$separator;
 		print "Montantdevise".$separator;
 		print "Idevise".$separator;
-		print "DateLimitReglmt";
+		print "DateLimitReglmt".$separator;
+		print "NumFacture";
 		print $end_line;
 
 		foreach ($objectLines as $line) {
@@ -1019,9 +1052,26 @@ class AccountancyExport
 				$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
 				$date_document = dol_print_date($line->doc_date, '%Y%m%d');
 				$date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');
-				$date_validation = dol_print_date($line->date_validated, '%Y%m%d');
+				$date_validation = dol_print_date($line->date_validation, '%Y%m%d');
 				$date_limit_payment = dol_print_date($line->date_lim_reglement, '%Y%m%d');
 
+				$refInvoice = '';
+				if ($line->doc_type == 'customer_invoice') {
+					// Customer invoice
+					require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+					$invoice = new Facture($this->db);
+					$invoice->fetch($line->fk_doc);
+
+					$refInvoice = $invoice->ref;
+				} elseif ($line->doc_type == 'supplier_invoice') {
+					// Supplier invoice
+					require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+					$invoice = new FactureFournisseur($this->db);
+					$invoice->fetch($line->fk_doc);
+
+					$refInvoice = $invoice->ref_supplier;
+				}
+
 				// FEC:JournalCode
 				print $line->code_journal . $separator;
 
@@ -1077,7 +1127,11 @@ class AccountancyExport
 				print $line->multicurrency_code . $separator;
 
 				// FEC_suppl:DateLimitReglmt
-				print $date_limit_payment;
+				print $date_limit_payment . $separator;
+
+				// FEC_suppl:NumFacture
+				print dol_trunc(self::toAnsi($refInvoice), 17, 'right', 'UTF-8', 1);
+
 
 				print $end_line;
 			}
@@ -1806,6 +1860,62 @@ class AccountancyExport
 		}
 	}
 
+	/**
+	* Export format : iSuite Expert
+	*
+	* by OpenSolus [https://opensolus.fr]
+	*
+	* @param array $objectLines data
+	*
+	* @return void
+	*/
+	public function exportiSuiteExpert($objectLines)
+	{
+		$this->separator = ';';
+		$this->end_line = "\r\n";
+
+
+		foreach ($objectLines as $line) {
+			$tab = array();
+
+			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
+
+			$tab[] = $line->piece_num;
+			$tab[] = $date;
+			$tab[] = substr($date, 6, 4);
+			$tab[] = substr($date, 3, 2);
+			$tab[] = substr($date, 0, 2);
+			$tab[] = $line->doc_ref;
+			//Conversion de chaine UTF8 en Latin9
+			$tab[] = mb_convert_encoding(str_replace(' - Compte auxiliaire', '', $line->label_operation), "Windows-1252", 'UTF-8');
+
+			//Calcul de la longueur des numéros de comptes
+			$taille_numero = strlen(length_accountg($line->numero_compte));
+
+			//Création du numéro de client générique
+			$numero_cpt_client = '411';
+			for ($i = 1; $i <= ($taille_numero - 3); $i++) {
+				$numero_cpt_client .= '0';
+			}
+
+			//Création des comptes auxiliaire des clients
+			if (length_accountg($line->numero_compte) == $numero_cpt_client) {
+				$tab[] = rtrim(length_accounta($line->subledger_account), "0");
+			} else {
+				$tab[] = length_accountg($line->numero_compte);
+			}
+			$nom_client = explode(" - ", $line->label_operation);
+			$tab[] = mb_convert_encoding($nom_client[0], "Windows-1252", 'UTF-8');
+			$tab[] = price($line->debit);
+			$tab[] = price($line->credit);
+			$tab[] = price($line->montant);
+			$tab[] = $line->code_journal;
+
+			$separator = $this->separator;
+			print implode($separator, $tab) . $this->end_line;
+		}
+	}
+
 	/**
 	 * trunc
 	 *
diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php
index 1b481027ac0..a62dddd6a26 100644
--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -105,7 +105,7 @@ class AccountancySystem
 				$sql .= " a.pcg_version = '".$this->db->escape($ref)."'";
 			}
 
-			dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 			$result = $this->db->query($sql);
 			if ($result) {
 				$obj = $this->db->fetch_object($result);
@@ -143,9 +143,9 @@ class AccountancySystem
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_system";
 		$sql .= " (date_creation, fk_user_author, numero, label)";
-		$sql .= " VALUES ('".$this->db->idate($now)."',".$user->id.",'".$this->db->escape($this->numero)."','".$this->db->escape($this->label)."')";
+		$sql .= " VALUES ('".$this->db->idate($now)."',".((int) $user->id).",'".$this->db->escape($this->numero)."','".$this->db->escape($this->label)."')";
 
-		dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_system");
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 99a0dc0dc48..a4dcac8c1ad 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) 2013-2014  Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2020  Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2013-2014  Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2021  Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2021  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) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018       Frédéric France      <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,10 @@
  *  \brief      File of class to manage accounting accounts
  */
 
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
 /**
  * Class to manage accounting accounts
  */
@@ -105,6 +109,11 @@ class AccountingAccount extends CommonObject
 	 */
 	public $account_category;
 
+	/**
+	 * @var int Label category account
+	 */
+	public $account_category_label;
+
 	/**
 	 * @var int Status
 	 */
@@ -140,6 +149,16 @@ class AccountingAccount extends CommonObject
 	 */
 	public $reconcilable;
 
+	/**
+	 * @var array cache array
+	 */
+	private $accountingaccount_codetotid_cache = array();
+
+
+	const STATUS_ENABLED = 1;
+	const STATUS_DISABLED = 0;
+
+
 	/**
 	 * Constructor
 	 *
@@ -150,7 +169,7 @@ class AccountingAccount extends CommonObject
 		global $conf;
 
 		$this->db = $db;
-		$this->next_prev_filter = 'fk_pcg_version IN (SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid='.$conf->global->CHARTOFACCOUNTS.')'; // Used to add a filter in Form::showrefnav method
+		$this->next_prev_filter = "fk_pcg_version IN (SELECT pcg_version FROM ".MAIN_DB_PREFIX."accounting_system WHERE rowid = ".((int) $conf->global->CHARTOFACCOUNTS).")"; // Used to add a filter in Form::showrefnav method
 	}
 
 	/**
@@ -158,7 +177,7 @@ class AccountingAccount extends CommonObject
 	 *
 	 * @param 	int 	       $rowid 				    Id
 	 * @param 	string 	       $account_number 	        Account number
-	 * @param 	int|boolean    $limittocurrentchart     1 or true=Load record only if it is into current active char of account
+	 * @param 	int|boolean    $limittocurrentchart     1 or true=Load record only if it is into current active chart of account
 	 * @param   string         $limittoachartaccount    'ABC'=Load record only if it is into chart account with code 'ABC' (better and faster than previous parameter if you have chart of account code).
 	 * @return 	int                                     <0 if KO, 0 if not found, Id of record if OK and found
 	 */
@@ -179,13 +198,14 @@ class AccountingAccount extends CommonObject
 				$sql .= " AND a.entity = ".$conf->entity;
 			}
 			if (!empty($limittocurrentchart)) {
-				$sql .= ' AND a.fk_pcg_version IN (SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid='.$this->db->escape($conf->global->CHARTOFACCOUNTS).')';
+				$sql .= ' AND a.fk_pcg_version IN (SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid = '.((int) $conf->global->CHARTOFACCOUNTS).')';
 			}
 			if (!empty($limittoachartaccount)) {
 				$sql .= " AND a.fk_pcg_version = '".$this->db->escape($limittoachartaccount)."'";
 			}
 
-			dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::fetch rowid=".$rowid." account_number=".$account_number, LOG_DEBUG);
+
 			$result = $this->db->query($sql);
 			if ($result) {
 				$obj = $this->db->fetch_object($result);
@@ -225,8 +245,8 @@ class AccountingAccount extends CommonObject
 	/**
 	 * Insert new accounting account in chart of accounts
 	 *
-	 * @param  User    $user       User making action
-	 * @param  int     $notrigger  Disable triggers
+	 * @param User $user User making action
+	 * @param int $notrigger Disable triggers
 	 * @return int                 <0 if KO, >0 if OK
 	 */
 	public function create($user, $notrigger = 0)
@@ -259,7 +279,7 @@ class AccountingAccount extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_account(";
+		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_account(";
 		$sql .= "datec";
 		$sql .= ", entity";
 		$sql .= ", fk_pcg_version";
@@ -274,7 +294,7 @@ class AccountingAccount extends CommonObject
 		$sql .= ", reconcilable";
 		$sql .= ") VALUES (";
 		$sql .= " '".$this->db->idate($now)."'";
-		$sql .= ", ".$conf->entity;
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ", ".(empty($this->fk_pcg_version) ? 'NULL' : "'".$this->db->escape($this->fk_pcg_version)."'");
 		$sql .= ", ".(empty($this->pcg_type) ? 'NULL' : "'".$this->db->escape($this->pcg_type)."'");
 		$sql .= ", ".(empty($this->account_number) ? 'NULL' : "'".$this->db->escape($this->account_number)."'");
@@ -282,22 +302,22 @@ class AccountingAccount extends CommonObject
 		$sql .= ", ".(empty($this->label) ? "''" : "'".$this->db->escape($this->label)."'");
 		$sql .= ", ".(empty($this->labelshort) ? "''" : "'".$this->db->escape($this->labelshort)."'");
 		$sql .= ", ".(empty($this->account_category) ? 0 : (int) $this->account_category);
-		$sql .= ", ".$user->id;
+		$sql .= ", ".((int) $user->id);
 		$sql .= ", ".(int) $this->active;
 		$sql .= ", ".(int) $this->reconcilable;
 		$sql .= ")";
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error++;
-			$this->errors[] = "Error ".$this->db->lasterror();
+			$this->errors[] = "Error " . $this->db->lasterror();
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_account");
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "accounting_account");
 
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action to call a trigger.
@@ -313,8 +333,8 @@ class AccountingAccount 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);
+				dol_syslog(get_class($this) . "::create " . $errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
@@ -327,7 +347,7 @@ class AccountingAccount extends CommonObject
 	/**
 	 * Update record
 	 *
-	 * @param  User $user      Use making update
+	 * @param User $user Use making update
 	 * @return int             <0 if KO, >0 if OK
 	 */
 	public function update($user)
@@ -339,20 +359,20 @@ class AccountingAccount extends CommonObject
 
 		$this->db->begin();
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account ";
-		$sql .= " SET fk_pcg_version = ".($this->fk_pcg_version ? "'".$this->db->escape($this->fk_pcg_version)."'" : "null");
-		$sql .= " , pcg_type = ".($this->pcg_type ? "'".$this->db->escape($this->pcg_type)."'" : "null");
-		$sql .= " , account_number = '".$this->db->escape($this->account_number)."'";
-		$sql .= " , account_parent = ".(int) $this->account_parent;
-		$sql .= " , label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "''");
-		$sql .= " , labelshort = ".($this->labelshort ? "'".$this->db->escape($this->labelshort)."'" : "''");
-		$sql .= " , fk_accounting_category = ".(empty($this->account_category) ? 0 : (int) $this->account_category);
-		$sql .= " , fk_user_modif = ".((int) $user->id);
-		$sql .= " , active = ".(int) $this->active;
-		$sql .= " , reconcilable = ".(int) $this->reconcilable;
-		$sql .= " WHERE rowid = ".((int) $this->id);
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account ";
+		$sql .= " SET fk_pcg_version = " . ($this->fk_pcg_version ? "'" . $this->db->escape($this->fk_pcg_version) . "'" : "null");
+		$sql .= " , pcg_type = " . ($this->pcg_type ? "'" . $this->db->escape($this->pcg_type) . "'" : "null");
+		$sql .= " , account_number = '" . $this->db->escape($this->account_number) . "'";
+		$sql .= " , account_parent = " . (int) $this->account_parent;
+		$sql .= " , label = " . ($this->label ? "'" . $this->db->escape($this->label) . "'" : "''");
+		$sql .= " , labelshort = " . ($this->labelshort ? "'" . $this->db->escape($this->labelshort) . "'" : "''");
+		$sql .= " , fk_accounting_category = " . (empty($this->account_category) ? 0 : (int) $this->account_category);
+		$sql .= " , fk_user_modif = " . ((int) $user->id);
+		$sql .= " , active = " . (int) $this->active;
+		$sql .= " , reconcilable = " . (int) $this->reconcilable;
+		$sql .= " WHERE rowid = " . ((int) $this->id);
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			$this->db->commit();
@@ -374,12 +394,12 @@ class AccountingAccount extends CommonObject
 		global $langs;
 
 		$sql = "(SELECT fk_code_ventilation FROM ".MAIN_DB_PREFIX."facturedet";
-		$sql .= " WHERE fk_code_ventilation=".$this->id.")";
+		$sql .= " WHERE fk_code_ventilation=".((int) $this->id).")";
 		$sql .= "UNION";
 		$sql .= " (SELECT fk_code_ventilation FROM ".MAIN_DB_PREFIX."facture_fourn_det";
-		$sql .= " WHERE fk_code_ventilation=".$this->id.")";
+		$sql .= " WHERE fk_code_ventilation=".((int) $this->id).")";
 
-		dol_syslog(get_class($this)."::checkUsage sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::checkUsage", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
@@ -413,22 +433,22 @@ class AccountingAccount extends CommonObject
 			$this->db->begin();
 
 			if (!$error) {
-				$sql = "DELETE FROM ".MAIN_DB_PREFIX."accounting_account";
-				$sql .= " WHERE rowid=".((int) $this->id);
+				$sql = "DELETE FROM " . MAIN_DB_PREFIX . "accounting_account";
+				$sql .= " WHERE rowid=" . ((int) $this->id);
 
-				dol_syslog(get_class($this)."::delete sql=".$sql);
+				dol_syslog(get_class($this) . "::delete sql=" . $sql);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$error++;
-					$this->errors[] = "Error ".$this->db->lasterror();
+					$this->errors[] = "Error " . $this->db->lasterror();
 				}
 			}
 
 			// Commit or rollback
 			if ($error) {
 				foreach ($this->errors as $errmsg) {
-					dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+					dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
+					$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
 				}
 				$this->db->rollback();
 				return -1 * $error;
@@ -444,20 +464,20 @@ class AccountingAccount extends CommonObject
 	/**
 	 * Return clicable name (with picto eventually)
 	 *
-	 * @param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-	 * @param	int		$withlabel					0=No label, 1=Include label of account
-	 * @param	int  	$nourl						1=Disable url
-	 * @param	string  $moretitle					Add more text to title tooltip
-	 * @param	int  	$notooltip					1=Disable tooltip
-	 * @param	int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-	 * @param	int     $withcompletelabel		    0=Short label (field short label), 1=Complete label (field label)
-	 * @param	string	$option						'ledger', 'journals', 'accountcard'
-	 * @return  string	String with URL
+	 * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto
+	 * @param int $withlabel 0=No label, 1=Include label of account
+	 * @param int $nourl 1=Disable url
+	 * @param string $moretitle Add more text to title tooltip
+	 * @param int $notooltip 1=Disable tooltip
+	 * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 * @param int $withcompletelabel 0=Short label (field short label), 1=Complete label (field label)
+	 * @param string $option 'ledger', 'journals', 'accountcard'
+	 * @return  string    String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1, $withcompletelabel = 0, $option = '')
 	{
 		global $langs, $conf;
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
 		if (!empty($conf->dol_no_mouse_hover)) {
 			$notooltip = 1; // Force disable tooltips
@@ -465,15 +485,16 @@ class AccountingAccount extends CommonObject
 
 		$result = '';
 
-		$url = ''; $labelurl = '';
+		$url = '';
+		$labelurl = '';
 		if (empty($option) || $option == 'ledger') {
-			$url = DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start='.urlencode($this->account_number).'&search_accountancy_code_end='.urlencode($this->account_number);
+			$url = DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start=' . urlencode($this->account_number) . '&search_accountancy_code_end=' . urlencode($this->account_number);
 			$labelurl = $langs->trans("ShowAccountingAccountInLedger");
 		} elseif ($option == 'journals') {
-			$url = DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?search_accountancy_code_start='.urlencode($this->account_number).'&search_accountancy_code_end='.urlencode($this->account_number);
+			$url = DOL_URL_ROOT . '/accountancy/bookkeeping/list.php?search_accountancy_code_start=' . urlencode($this->account_number) . '&search_accountancy_code_end=' . urlencode($this->account_number);
 			$labelurl = $langs->trans("ShowAccountingAccountInJournals");
 		} elseif ($option == 'accountcard') {
-			$url = DOL_URL_ROOT.'/accountancy/admin/card.php?id='.urlencode($this->id);
+			$url = DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . urlencode($this->id);
 			$labelurl = $langs->trans("ShowAccountingAccount");
 		}
 
@@ -486,7 +507,7 @@ class AccountingAccount extends CommonObject
 			$url .= '&save_lastsearch_values=1';
 		}
 
-		$picto = 'billr';
+		$picto = 'accounting_account';
 		$label = '';
 
 		if (empty($this->labelshort) || $withcompletelabel == 1) {
@@ -495,29 +516,29 @@ class AccountingAccount extends CommonObject
 			$labeltoshow = $this->labelshort;
 		}
 
-		$label = '<u>'.$labelurl.'</u>';
+		$label = '<u>' . $labelurl . '</u>';
 		if (!empty($this->account_number)) {
-			$label .= '<br><b>'.$langs->trans('AccountAccounting').':</b> '.length_accountg($this->account_number);
+			$label .= '<br><b>' . $langs->trans('AccountAccounting') . ':</b> ' . length_accountg($this->account_number);
 		}
 		if (!empty($labeltoshow)) {
-			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$labeltoshow;
+			$label .= '<br><b>' . $langs->trans('Label') . ':</b> ' . $labeltoshow;
 		}
 		if ($moretitle) {
-			$label .= ' - '.$moretitle;
+			$label .= ' - ' . $moretitle;
 		}
 
 		$linkclose = '';
 		if (empty($notooltip)) {
 			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $labelurl;
-				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+				$linkclose .= ' alt="' . dol_escape_htmltag($label, 1) . '"';
 			}
-			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' title="' . dol_escape_htmltag($label, 1) . '"';
 			$linkclose .= ' class="classfortooltip"';
 		}
 
-		$linkstart = '<a href="'.$url.'"';
-		$linkstart .= $linkclose.'>';
+		$linkstart = '<a href="' . $url . '"';
+		$linkstart .= $linkclose . '>';
 		$linkend = '</a>';
 
 		if ($nourl) {
@@ -528,17 +549,17 @@ class AccountingAccount extends CommonObject
 
 		$label_link = length_accountg($this->account_number);
 		if ($withlabel) {
-			$label_link .= ' - '.($nourl ? '<span class="opacitymedium">' : '').$labeltoshow.($nourl ? '</span>' : '');
+			$label_link .= ' - ' . ($nourl ? '<span class="opacitymedium">' : '') . $labeltoshow . ($nourl ? '</span>' : '');
 		}
 
 		if ($withpicto) {
-			$result .= ($linkstart.img_object(($notooltip ? '' : $label), $picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
+			$result .= ($linkstart . img_object(($notooltip ? '' : $label), $picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1) . $linkend);
 		}
 		if ($withpicto && $withpicto != 2) {
 			$result .= ' ';
 		}
 		if ($withpicto != 2) {
-			$result .= $linkstart.$label_link.$linkend;
+			$result .= $linkstart . $label_link . $linkend;
 		}
 		return $result;
 	}
@@ -546,16 +567,16 @@ class AccountingAccount extends CommonObject
 	/**
 	 * Information on record
 	 *
-	 * @param int $id of record
+	 * @param int 	$id 	ID of record
 	 * @return void
 	 */
 	public function info($id)
 	{
 		$sql = 'SELECT a.rowid, a.datec, a.fk_user_author, a.fk_user_modif, a.tms';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'accounting_account as a';
-		$sql .= ' WHERE a.rowid = '.((int) $id);
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . 'accounting_account as a';
+		$sql .= ' WHERE a.rowid = ' . ((int) $id);
 
-		dol_syslog(get_class($this).'::info sql='.$sql);
+		dol_syslog(get_class($this) . '::info sql=' . $sql);
 		$result = $this->db->query($sql);
 
 		if ($result) {
@@ -584,8 +605,8 @@ class AccountingAccount extends CommonObject
 	/**
 	 * Deactivate an account (for status active or status reconcilable)
 	 *
-	 * @param  int  $id         Id
-	 * @param  int  $mode       0=field active, 1=field reconcilable
+	 * @param int $id Id
+	 * @param int $mode 0=field active, 1=field reconcilable
 	 * @return int              <0 if KO, >0 if OK
 	 */
 	public function accountDeactivate($id, $mode = 0)
@@ -604,7 +625,7 @@ class AccountingAccount extends CommonObject
 			$sql .= "SET ".$fieldtouse." = '0'";
 			$sql .= " WHERE rowid = ".((int) $id);
 
-			dol_syslog(get_class($this)."::accountDeactivate ".$fieldtouse." sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::accountDeactivate ".$fieldtouse, LOG_DEBUG);
 			$result = $this->db->query($sql);
 
 			if ($result) {
@@ -620,15 +641,15 @@ class AccountingAccount extends CommonObject
 		}
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
 	/**
 	 * Account activated
 	 *
-	 * @param  int  $id         Id
-	 * @param  int  $mode       0=field active, 1=field reconcilable
+	 * @param int $id Id
+	 * @param int $mode 0=field active, 1=field reconcilable
 	 * @return int              <0 if KO, >0 if OK
 	 */
-	public function account_activate($id, $mode = 0)
+	public function accountActivate($id, $mode = 0)
 	{
 		// phpcs:enable
 		$this->db->begin();
@@ -642,7 +663,7 @@ class AccountingAccount extends CommonObject
 		$sql .= " SET ".$fieldtouse." = '1'";
 		$sql .= " WHERE rowid = ".((int) $id);
 
-		dol_syslog(get_class($this)."::account_activate ".$fieldtouse." sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::account_activate ".$fieldtouse, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			$this->db->commit();
@@ -654,12 +675,11 @@ class AccountingAccount extends CommonObject
 		}
 	}
 
-
 	/**
 	 *  Retourne le libelle du statut d'un user (actif, inactif)
 	 *
-	 *  @param  int     $mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return string              Label of status
+	 * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return string              Label of status
 	 */
 	public function getLibStatut($mode = 0)
 	{
@@ -670,51 +690,214 @@ class AccountingAccount extends CommonObject
 	/**
 	 *  Renvoi le libelle d'un statut donne
 	 *
-	 *  @param  int     $status     Id 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 $status Id 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
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		global $langs;
-		$langs->loadLangs(array("users"));
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
+			global $langs;
+			$langs->load("users");
+			$this->labelStatus[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatus[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
+		}
 
-		if ($mode == 0) {
-			if ($status == 1) {
-				return $langs->trans('Enabled');
-			} elseif ($status == 0) {
-				return $langs->trans('Disabled');
+		$statusType = 'status4';
+		if ($status == self::STATUS_DISABLED) {
+			$statusType = 'status5';
+		}
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
+
+	/**
+	 * Return Suggest accounting accounts to bind
+	 *
+	 * @param 	Societe 							$buyer 				Object buyer
+	 * @param 	Societe 							$seller 			Object seller
+	 * @param 	Product 							$product 			Product object sell or buy
+	 * @param 	Facture|FactureFournisseur 			$facture 			Facture
+	 * @param 	FactureLigne|SupplierInvoiceLine	$factureDet 		Facture Det
+	 * @param 	array 								$accountingAccount 	Array of Account account
+	 * @param 	string 								$type 				Customer / Supplier
+	 * @return	array       											Accounting accounts suggested
+	 */
+	public function getAccountingCodeToBind(Societe $buyer, Societe $seller, Product $product, $facture, $factureDet, $accountingAccount = array(), $type = '')
+	{
+		global $conf;
+		global $hookmanager;
+
+		// Instantiate hooks for external modules
+		$hookmanager->initHooks(array('accoutancyBindingCalculation'));
+
+		// Execute hook accoutancyBindingCalculation
+		$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
+
+		if (empty($reshook)) {
+			if ($type == 'customer') {
+				$const_name = "SOLD";
+			} elseif ($type == 'supplier') {
+				$const_name = "BUY";
 			}
-		} elseif ($mode == 1) {
-			if ($status == 1) {
-				return $langs->trans('Enabled');
-			} elseif ($status == 0) {
-				return $langs->trans('Disabled');
+
+			require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+			$isBuyerInEEC = isInEEC($buyer);
+			$isSellerInEEC = isInEEC($seller);
+			$code_l = '';	// Default value for generic product/service
+			$code_p = '';	// Value for the product/service in parameter ($product)
+			$code_t = '';	// Default value of product account for the thirdparty
+			$suggestedid = '';
+
+			// Level 1 (define $code_l): Search suggested default account for product/service
+			$suggestedaccountingaccountbydefaultfor = '';
+			if ($factureDet->product_type == 1) {
+				if ($buyer->country_code == $seller->country_code || empty($buyer->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
+					$code_l = (!empty($conf->global->{'ACCOUNTING_SERVICE_' . $const_name . '_ACCOUNT'}) ? $conf->global->{'ACCOUNTING_SERVICE_' . $const_name . '_ACCOUNT'} : '');
+					$suggestedaccountingaccountbydefaultfor = '';
+				} else {
+					if ($isSellerInEEC && $isBuyerInEEC && $factureDet->tva_tx != 0) {    // European intravat sale, but with a VAT
+						$code_l = (!empty($conf->global->{'ACCOUNTING_SERVICE_' . $const_name . '_ACCOUNT'}) ? $conf->global->{'ACCOUNTING_SERVICE_' . $const_name . '_ACCOUNT'} : '');
+						$suggestedaccountingaccountbydefaultfor = 'eecwithvat';
+					} elseif ($isSellerInEEC && $isBuyerInEEC && empty($buyer->tva_intra)) {    // European intravat sale, without VAT intra community number
+						$code_l = (!empty($conf->global->{'ACCOUNTING_SERVICE_' . $const_name . '_ACCOUNT'}) ? $conf->global->{'ACCOUNTING_SERVICE_' . $const_name . '_ACCOUNT'} : '');
+						$suggestedaccountingaccountbydefaultfor = 'eecwithoutvatnumber';
+					} elseif ($isSellerInEEC && $isBuyerInEEC) {    // European intravat sale
+						$code_l = (!empty($conf->global->{'ACCOUNTING_SERVICE_' . $const_name . '_INTRA_ACCOUNT'}) ? $conf->global->{'ACCOUNTING_SERVICE_' . $const_name . '_INTRA_ACCOUNT'} : '');
+						$suggestedaccountingaccountbydefaultfor = 'eec';
+					} else {                                        // Foreign sale
+						$code_l = (!empty($conf->global->{'ACCOUNTING_SERVICE_' . $const_name . '_EXPORT_ACCOUNT'}) ? $conf->global->{'ACCOUNTING_SERVICE_' . $const_name . '_EXPORT_ACCOUNT'} : '');
+						$suggestedaccountingaccountbydefaultfor = 'export';
+					}
+				}
+			} elseif ($factureDet->product_type == 0) {
+				if ($buyer->country_code == $seller->country_code || empty($buyer->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
+					$code_l = (!empty($conf->global->{'ACCOUNTING_PRODUCT_' . $const_name . '_ACCOUNT'}) ? $conf->global->{'ACCOUNTING_PRODUCT_' . $const_name . '_ACCOUNT'} : '');
+					$suggestedaccountingaccountbydefaultfor = '';
+				} else {
+					if ($isSellerInEEC && $isBuyerInEEC && $factureDet->tva_tx != 0) {    // European intravat sale, but with a VAT
+						$code_l = (!empty($conf->global->{'ACCOUNTING_PRODUCT_' . $const_name . '_ACCOUNT'}) ? $conf->global->{'ACCOUNTING_PRODUCT_' . $const_name . '_ACCOUNT'} : '');
+						$suggestedaccountingaccountbydefaultfor = 'eecwithvat';
+					} elseif ($isSellerInEEC && $isBuyerInEEC && empty($buyer->tva_intra)) {    // European intravat sale, without VAT intra community number
+						$code_l = (!empty($conf->global->{'ACCOUNTING_PRODUCT_' . $const_name . '_ACCOUNT'}) ? $conf->global->{'ACCOUNTING_PRODUCT_' . $const_name . '_ACCOUNT'} : '');
+						$suggestedaccountingaccountbydefaultfor = 'eecwithoutvatnumber';
+					} elseif ($isSellerInEEC && $isBuyerInEEC) {    // European intravat sale
+						$code_l = (!empty($conf->global->{'ACCOUNTING_PRODUCT_' . $const_name . '_INTRA_ACCOUNT'}) ? $conf->global->{'ACCOUNTING_PRODUCT_' . $const_name . '_INTRA_ACCOUNT'} : '');
+						$suggestedaccountingaccountbydefaultfor = 'eec';
+					} else {
+						$code_l = (!empty($conf->global->{'ACCOUNTING_PRODUCT_' . $const_name . '_EXPORT_ACCOUNT'}) ? $conf->global->{'ACCOUNTING_PRODUCT_' . $const_name . '_EXPORT_ACCOUNT'} : '');
+						$suggestedaccountingaccountbydefaultfor = 'export';
+					}
+				}
 			}
-		} elseif ($mode == 2) {
-			if ($status == 1) {
-				return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
-			} elseif ($status == 0) {
-				return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
+			if ($code_l == -1) {
+				$code_l = '';
 			}
-		} elseif ($mode == 3) {
-			if ($status == 1) {
-				return img_picto($langs->trans('Enabled'), 'statut4');
-			} elseif ($status == 0) {
-				return img_picto($langs->trans('Disabled'), 'statut5');
+
+			// Level 2 (define $code_p): Search suggested account for product/service (similar code exists in page index.php to make automatic binding)
+			$suggestedaccountingaccountfor = '';
+			if ((($buyer->country_code == $seller->country_code) || empty($buyer->country_code))) {
+				// If buyer in same country than seller (if not defined, we assume it is same country)
+				if ($type=='customer' && !empty($product->accountancy_code_sell)) {
+					$code_p = $product->accountancy_code_sell;
+				} elseif ($type=='supplier' && !empty($product->accountancy_code_buy)) {
+					$code_p = $product->accountancy_code_buy;
+				}
+				$suggestedid = $accountingAccount['dom'];
+				$suggestedaccountingaccountfor = 'prodserv';
+			} else {
+				if ($isSellerInEEC && $isBuyerInEEC && $factureDet->tva_tx != 0) {
+					// European intravat sale, but with VAT
+					if ($type=='customer' && !empty($product->accountancy_code_sell)) {
+						$code_p = $product->accountancy_code_sell;
+					} elseif ($type=='supplier' && !empty($product->accountancy_code_buy)) {
+						$code_p = $product->accountancy_code_buy;
+					}
+					$suggestedid = $accountingAccount['dom'];
+					$suggestedaccountingaccountfor = 'eecwithvat';
+				} elseif ($isSellerInEEC && $isBuyerInEEC && empty($buyer->tva_intra)) {
+					// European intravat sale, without VAT intra community number
+					if ($type=='customer' && !empty($product->accountancy_code_sell)) {
+						$code_p = $product->accountancy_code_sell;
+					} elseif ($type=='supplier' && !empty($product->accountancy_code_buy)) {
+						$code_p = $product->accountancy_code_buy;
+					}
+					$suggestedid = $accountingAccount['dom']; // There is a doubt for this case. Is it an error on vat or we just forgot to fill vat number ?
+					$suggestedaccountingaccountfor = 'eecwithoutvatnumber';
+				} elseif ($isSellerInEEC && $isBuyerInEEC && !empty($product->accountancy_code_sell_intra)) {
+					// European intravat sale
+					if ($type=='customer' && !empty($product->accountancy_code_sell_intra)) {
+						$code_p = $product->accountancy_code_sell_intra;
+					} elseif ($type=='supplier' && !empty($product->accountancy_code_buy_intra)) {
+						$code_p = $product->accountancy_code_buy_intra;
+					}
+					$suggestedid = $accountingAccount['intra'];
+					$suggestedaccountingaccountfor = 'eec';
+				} else {
+					// Foreign sale
+					if ($type=='customer' && !empty($product->accountancy_code_sell_export)) {
+						$code_p = $product->accountancy_code_sell_export;
+					} elseif ($type=='supplier' && !empty($product->accountancy_code_buy_export)) {
+						$code_p = $product->accountancy_code_buy_export;
+					}
+					$suggestedid = $accountingAccount['export'];
+					$suggestedaccountingaccountfor = 'export';
+				}
 			}
-		} elseif ($mode == 4) {
-			if ($status == 1) {
-				return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
-			} elseif ($status == 0) {
-				return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
+
+			// Level 3 (define $code_t): Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
+			if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+				if (!empty($buyer->code_compta_product)) {
+					$code_t = $buyer->code_compta_product;
+					$suggestedid = $accountingAccount['thirdparty'];
+					$suggestedaccountingaccountfor = 'thridparty';
+				}
 			}
-		} elseif ($mode == 5) {
-			if ($status == 1) {
-				return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
-			} elseif ($status == 0) {
-				return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
+
+			// 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 ($result < 0) {
+					return -1;
+				}
+
+				$code_l = $accountdeposittoventilated->ref;
+				$suggestedid = $accountdeposittoventilated->rowid;
+				$suggestedaccountingaccountfor = 'deposit';
+			}
+
+			// If $suggestedid could not be guessed yet, we set it from the generic default accounting code $code_l
+			if (empty($suggestedid) && empty($code_p) && !empty($code_l) && empty($conf->global->ACCOUNTANCY_DO_NOT_AUTOFILL_ACCOUNT_WITH_GENERIC)) {
+				if (empty($this->accountingaccount_codetotid_cache[$code_l])) {
+					$tmpaccount = new self($this->db);
+					$result = $tmpaccount->fetch(0, $code_l, 1);
+					if ($result < 0) {
+						return -1;
+					}
+					if ($tmpaccount->id > 0) {
+						$suggestedid = $tmpaccount->id;
+					}
+					$this->accountingaccount_codetotid_cache[$code_l] = $tmpaccount->id;
+				} else {
+					$suggestedid = $this->accountingaccount_codetotid_cache[$code_l];
+				}
+			}
+			return array(
+				'suggestedaccountingaccountbydefaultfor' => $suggestedaccountingaccountbydefaultfor,
+				'suggestedaccountingaccountfor' => $suggestedaccountingaccountfor,
+				'suggestedid' => $suggestedid,
+				'code_l' => $code_l,
+				'code_p' => $code_p,
+				'code_t' => $code_t,
+			);
+		} else {
+			if (is_array($hookmanager->resArray) && !empty($hookmanager->resArray)) {
+				return $hookmanager->resArray;
 			}
 		}
 	}
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 95a69466658..376178b45ba 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -113,7 +113,7 @@ class AccountingJournal extends CommonObject
 				$sql .= " AND entity  = ".$conf->entity;
 			}
 
-			dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 			$result = $this->db->query($sql);
 			if ($result) {
 				$obj = $this->db->fetch_object($result);
@@ -170,18 +170,18 @@ class AccountingJournal extends CommonObject
 		$sql .= ' WHERE 1 = 1';
 		$sql .= " AND entity IN (".getEntity('accountancy').")";
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
+			$sql .= " AND ".implode(" ".$filtermode." ", $sqlwhere);
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit + 1, $offset);
+			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
 		$this->lines = array();
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 43dcce8c646..e96cf9e0997 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -382,15 +382,15 @@ class BookKeeping extends CommonObject
 				$sql .= ", '".$this->db->escape($this->numero_compte)."'";
 				$sql .= ", ".(!empty($this->label_compte) ? ("'".$this->db->escape($this->label_compte)."'") : "NULL");
 				$sql .= ", '".$this->db->escape($this->label_operation)."'";
-				$sql .= ", ".$this->debit;
-				$sql .= ", ".$this->credit;
-				$sql .= ", ".$this->montant;
+				$sql .= ", ".((float) $this->debit);
+				$sql .= ", ".((float) $this->credit);
+				$sql .= ", ".((float) $this->montant);
 				$sql .= ", ".(!empty($this->sens) ? ("'".$this->db->escape($this->sens)."'") : "NULL");
 				$sql .= ", '".$this->db->escape($this->fk_user_author)."'";
 				$sql .= ", '".$this->db->idate($now)."'";
 				$sql .= ", '".$this->db->escape($this->code_journal)."'";
 				$sql .= ", ".(!empty($this->journal_label) ? ("'".$this->db->escape($this->journal_label)."'") : "NULL");
-				$sql .= ", ".$this->db->escape($this->piece_num);
+				$sql .= ", ".((int) $this->piece_num);
 				$sql .= ", ".(!isset($this->entity) ? $conf->entity : $this->entity);
 				$sql .= ")";
 
@@ -647,7 +647,7 @@ class BookKeeping extends CommonObject
 		$sql .= ' '.(!isset($this->credit) ? 'NULL' : $this->credit).',';
 		$sql .= ' '.(!isset($this->montant) ? 'NULL' : $this->montant).',';
 		$sql .= ' '.(!isset($this->sens) ? 'NULL' : "'".$this->db->escape($this->sens)."'").',';
-		$sql .= ' '.$user->id.',';
+		$sql .= ' '.((int) $user->id).',';
 		$sql .= ' '."'".$this->db->idate($now)."',";
 		$sql .= ' '.(empty($this->code_journal) ? 'NULL' : "'".$this->db->escape($this->code_journal)."'").',';
 		$sql .= ' '.(empty($this->journal_label) ? 'NULL' : "'".$this->db->escape($this->journal_label)."'").',';
@@ -883,21 +883,21 @@ class BookKeeping extends CommonObject
 		$sql .= ' WHERE 1 = 1';
 		$sql .= " AND entity IN (".getEntity('accountancy').")";
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
+			$sql .= " AND ".implode(" ".$filtermode." ", $sqlwhere);
 		}
 		// Affichage par compte comptable
 		if (!empty($option)) {
 			$sql .= ' AND t.subledger_account IS NOT NULL';
-			$sql .= ' ORDER BY t.subledger_account ASC';
+			$sortfield = 't.subledger_account'.($sortfield ? ','.$sortfield : '');
+			$sortorder = 'ASC'.($sortfield ? ','.$sortfield : '');
 		} else {
-			$sql .= ' ORDER BY t.numero_compte ASC';
+			$sortfield = 't.numero_compte'.($sortfield ? ','.$sortfield : '');
+			$sortorder = 'ASC'.($sortorder ? ','.$sortorder : '');
 		}
 
-		if (!empty($sortfield)) {
-			$sql .= ', '.$sortfield.' '.$sortorder;
-		}
+		$sql .= $this->db->order($sortfield, $sortorder);
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit + 1, $offset);
+			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -1013,7 +1013,7 @@ class BookKeeping extends CommonObject
 				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
 					$sqlwhere[] = $key.'\''.$this->db->escape($value).'\'';
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key.'='.((int) $value);
 				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
 					$sqlwhere[] = $key.' LIKE \''.$this->db->escape($value).'%\'';
 				} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
@@ -1042,13 +1042,13 @@ class BookKeeping extends CommonObject
 			$sql .= " AND t.date_export IS NULL";
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
+			$sql .= ' AND '.implode(" ".$filtermode." ", $sqlwhere);
 		}
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit + 1, $offset);
+			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
 		$this->lines = array();
 
@@ -1135,17 +1135,17 @@ class BookKeeping extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.doc_date') {
-					$sqlwhere[] = $key.'=\''.$this->db->idate($value).'\'';
+					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=') {
-					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
+					$sqlwhere[] = $key."'".$this->db->idate($value)."'";
 				} elseif ($key == 't.numero_compte>=' || $key == 't.numero_compte<=' || $key == 't.subledger_account>=' || $key == 't.subledger_account<=') {
-					$sqlwhere[] = $key.'\''.$this->db->escape($value).'\'';
+					$sqlwhere[] = $key."'".$this->db->escape($value)."'";
 				} elseif ($key == 't.fk_doc' || $key == 't.fk_docdet' || $key == 't.piece_num') {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
-					$sqlwhere[] = $key.' LIKE \''.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key." LIKE '".$this->db->escape($value)."%'";
 				} elseif ($key == 't.subledger_label') {
-					$sqlwhere[] = $key.' LIKE \''.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key." LIKE '".$this->db->escape($value)."%'";
 				} elseif ($key == 't.code_journal' && !empty($value)) {
 					if (is_array($value)) {
 						$sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
@@ -1153,13 +1153,13 @@ class BookKeeping extends CommonObject
 						$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
 					}
 				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
 		$sql .= ' WHERE entity IN ('.getEntity('accountancy').')';
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
+			$sql .= " AND ".implode(" ".$filtermode." ", $sqlwhere);
 		}
 
 		$sql .= ' GROUP BY t.numero_compte';
@@ -1168,7 +1168,7 @@ class BookKeeping extends CommonObject
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit + 1, $offset);
+			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -1345,8 +1345,9 @@ class BookKeeping extends CommonObject
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element.$mode;
-		$sql .= ' SET '.$field.'='.(is_numeric($value) ? $value : "'".$this->db->escape($value)."'");
-		$sql .= " WHERE piece_num = '".$this->db->escape($piece_num)."'";
+		$sql .= " SET ".$field." = ".(is_numeric($value) ? ((float) $value) : "'".$this->db->escape($value)."'");
+		$sql .= " WHERE piece_num = ".((int) $piece_num);
+
 		$resql = $this->db->query($sql);
 
 		if (!$resql) {
@@ -1635,7 +1636,7 @@ class BookKeeping extends CommonObject
 			$sql .= ", date_export";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
-		$sql .= " WHERE piece_num = ".$piecenum;
+		$sql .= " WHERE piece_num = ".((int) $piecenum);
 		$sql .= " AND entity IN (".getEntity('accountancy').")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -1676,7 +1677,7 @@ class BookKeeping extends CommonObject
 		$sql = "SELECT MAX(piece_num)+1 as max FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
 		$sql .= " WHERE entity IN (".getEntity('accountancy').")";
 
-		dol_syslog(get_class($this)."getNextNumMvt sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."getNextNumMvt", LOG_DEBUG);
 		$result = $this->db->query($sql);
 
 		if ($result) {
@@ -1716,7 +1717,7 @@ class BookKeeping extends CommonObject
 			$sql .= ", date_export";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
-		$sql .= " WHERE piece_num = ".$piecenum;
+		$sql .= " WHERE piece_num = ".((int) $piecenum);
 		$sql .= " AND entity IN (".getEntity('accountancy').")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -1854,7 +1855,7 @@ class BookKeeping extends CommonObject
 			$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, '.$next_piecenum.", '".$this->db->idate($now)."'";
+			$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) {
@@ -2013,7 +2014,7 @@ class BookKeeping extends CommonObject
 		$sql .= " WHERE aa.account_number = '".$this->db->escape($account)."'";
 		$sql .= " AND aa.entity IN (".getEntity('accountancy').")";
 
-		dol_syslog(get_class($this)."::select_account sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = '';
@@ -2053,7 +2054,7 @@ class BookKeeping extends CommonObject
 		$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').")";
 
-		dol_syslog(get_class($this)."::select_account sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = '';
@@ -2113,15 +2114,26 @@ class BookKeepingLine
 	public $montant;
 
 	/**
-	 * @var float Amount
+	 * @var float 	Amount
 	 */
 	public $amount;
 
+	/**
+	 * @var float 	Multicurrency amount
+	 */
+	public $multicurrency_amount;
+
+	/**
+	 * @var float 	Multicurrency code
+	 */
+	public $multicurrency_code;
+
 	/**
 	 * @var string Sens
 	 */
 	public $sens;
 	public $lettering_code;
+	public $date_lettering;
 
 	/**
 	 * @var int ID
@@ -2152,4 +2164,9 @@ class BookKeepingLine
 	 * @var integer|string $date_validation;
 	 */
 	public $date_validation;
+
+	/**
+	 * @var integer|string $date_lim_reglement;
+	 */
+	public $date_lim_reglement;
 }
diff --git a/htdocs/accountancy/class/lettering.class.php b/htdocs/accountancy/class/lettering.class.php
index b2abf01948e..f722a716b79 100644
--- a/htdocs/accountancy/class/lettering.class.php
+++ b/htdocs/accountancy/class/lettering.class.php
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -279,7 +279,7 @@ class Lettering extends BookKeeping
 			$sql .= "  WHERE rowid IN (".$this->db->sanitize(implode(',', $ids)).") AND date_validated IS NULL ";
 			$this->db->begin();
 
-			dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::update", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$error++;
diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php
index b612762d358..6b578bcab71 100644
--- a/htdocs/accountancy/closure/index.php
+++ b/htdocs/accountancy/closure/index.php
@@ -31,7 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "other", "accountancy"));
 
-$socid = GETPOST('socid', 'int');
+$validatemonth = GETPOST('validatemonth', 'int');
+$validateyear = GETPOST('validateyear', 'int');
 
 $action = GETPOST('action', 'aZ09');
 
@@ -63,57 +64,52 @@ if (empty($conf->accounting->enabled)) {
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (!$user->rights->accounting->fiscalyear->write) {
+if (empty($user->rights->accounting->fiscalyear->write)) {
 	accessforbidden();
 }
 
 
+
 /*
  * Actions
  */
 
+$now = dol_now();
+
 if ($action == 'validate_movements_confirm' && !empty($user->rights->accounting->fiscalyear->write)) {
-	$result = $object->fetchAll();
+	$date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
+	$date_end = dol_mktime(23, 59, 59, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
 
-	if ($result < 0) {
-		setEventMessages($object->error, $object->errors, 'errors');
-	} else {
-		// Specify as export : update field date_validated on selected month/year
-		$error = 0;
-		$db->begin();
+	$error = 0;
 
-		$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'));
+	$db->begin();
 
-		if (is_array($object->lines)) {
-			foreach ($object->lines as $movement) {
-				$now = dol_now();
+	// Specify as export : update field date_validated on selected month/year
+	$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
+	$sql .= " SET date_validated = '".$db->idate($now)."'";
+	$sql .= " WHERE entity = " . ((int) $conf->entity);
+	$sql .= " AND doc_date >= '" . $db->idate($date_start) . "'";
+	$sql .= " AND doc_date <= '" . $db->idate($date_end) . "'";
+	$sql .= " AND date_validated IS NULL";
 
-				$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
-				$sql .= " SET date_validated = '".$db->idate($now)."'";
-				$sql .= " WHERE rowid = ".((int) $movement->id);
-				$sql .= " AND doc_date >= '" . $db->idate($date_start) . "'";
-				$sql .= " AND doc_date <= '" . $db->idate($date_end) . "'";
+	dol_syslog("/accountancy/closure/index.php action=validate_movement_confirm -> Set movements as validated", LOG_DEBUG);
+	$result = $db->query($sql);
+	if (!$result) {
+		$error++;
+	}
 
-				dol_syslog("/accountancy/closure/index.php :: Function validate_movement_confirm Specify movements as validated sql=".$sql, LOG_DEBUG);
-				$result = $db->query($sql);
-				if (!$result) {
-					$error++;
-					break;
-				}
-			}
-		}
+	if (!$error) {
+		$db->commit();
+
+		setEventMessages($langs->trans("AllMovementsWereRecordedAsValidated"), null, 'mesgs');
 
-		if (!$error) {
-			$db->commit();
-			setEventMessages($langs->trans("AllMovementsWereRecordedAsValidated"), null, 'mesgs');
-		} else {
-			$error++;
-			$db->rollback();
-			setEventMessages($langs->trans("NotAllMovementsCouldBeRecordedAsValidated"), null, 'errors');
-		}
 		header("Location: ".$_SERVER['PHP_SELF']."?year=".$year_start);
 		exit;
+	} else {
+		$db->rollback();
+
+		setEventMessages($langs->trans("NotAllMovementsCouldBeRecordedAsValidated"), null, 'errors');
+		$action = '';
 	}
 }
 
@@ -189,7 +185,7 @@ for ($i = 1; $i <= 12; $i++) {
 	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";
@@ -198,7 +194,7 @@ $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 sql='.$sql, LOG_DEBUG);
+dol_syslog('htdocs/accountancy/closure/index.php', LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index b3ce892b235..296d6729301 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -117,7 +117,7 @@ if (!empty($id)) {
 	$sql .= " WHERE f.fk_statut > 0 AND l.rowid = ".((int) $id);
 	$sql .= " AND f.entity IN (".getEntity('invoice', 0).")"; // We don't share object for accountancy
 
-	dol_syslog("/accounting/customer/card.php sql=".$sql, LOG_DEBUG);
+	dol_syslog("/accounting/customer/card.php", LOG_DEBUG);
 	$result = $db->query($sql);
 
 	if ($result) {
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index a88524ec5d4..7ce226f99d8 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -31,10 +31,14 @@ 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.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "other", "accountancy"));
 
+$validatemonth = GETPOST('validatemonth', 'int');
+$validateyear = GETPOST('validateyear', 'int');
+
 // Security check
 if (empty($conf->accounting->enabled)) {
 	accessforbidden();
@@ -42,10 +46,11 @@ if (empty($conf->accounting->enabled)) {
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (!$user->rights->accounting->bind->write) {
+if (empty($user->rights->accounting->bind->write)) {
 	accessforbidden();
 }
 
+$accountingAccount = new AccountingAccount($db);
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) {
@@ -71,13 +76,24 @@ $action = GETPOST('action', 'aZ09');
 
 $chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
 
+// Security check
+if (empty($conf->accounting->enabled)) {
+	accessforbidden();
+}
+if ($user->socid > 0) {
+	accessforbidden();
+}
+if (empty($user->rights->accounting->mouvements->lire)) {
+	accessforbidden();
+}
+
 
 /*
  * Actions
  */
 
-if ($action == 'clean' || $action == 'validatehistory') {
-	// Clean database
+if (($action == 'clean' || $action == 'validatehistory') && $user->rights->accounting->bind->write) {
+	// Clean database by removing binding done on non existing or no more existing accounts
 	$db->begin();
 	$sql1 = "UPDATE ".MAIN_DB_PREFIX."facturedet as fd";
 	$sql1 .= " SET fk_code_ventilation = 0";
@@ -85,8 +101,8 @@ if ($action == 'clean' || $action == 'validatehistory') {
 	$sql1 .= '	(SELECT accnt.rowid ';
 	$sql1 .= '	FROM '.MAIN_DB_PREFIX.'accounting_account as accnt';
 	$sql1 .= '	INNER JOIN '.MAIN_DB_PREFIX.'accounting_system as syst';
-	$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid='.$conf->global->CHARTOFACCOUNTS.' AND accnt.entity = '.$conf->entity.')';
-	$sql1 .= ' AND fd.fk_facture IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'facture WHERE entity = '.$conf->entity.')';
+	$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid='.((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.((int) $conf->entity).')';
+	$sql1 .= ' AND fd.fk_facture IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'facture WHERE entity = '.((int) $conf->entity).')';
 	$sql1 .= ' AND fk_code_ventilation <> 0';
 
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
@@ -103,6 +119,9 @@ if ($action == 'clean' || $action == 'validatehistory') {
 
 if ($action == 'validatehistory') {
 	$error = 0;
+	$nbbinddone = 0;
+	$notpossible = 0;
+
 	$db->begin();
 
 	// Now make the binding. Bind automatically only for product with a dedicated account that exists into chart of account, others need a manual bind
@@ -110,13 +129,13 @@ if ($action == 'validatehistory') {
 		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet";
 		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
 		$sql1 .= " FROM " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accounting_account as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
-		$sql1 .= " WHERE " . MAIN_DB_PREFIX . "facturedet.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . ((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.$conf->entity;
+		$sql1 .= " WHERE " . MAIN_DB_PREFIX . "facturedet.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . ((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.((int) $conf->entity);
 		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_sell=accnt.account_number";
 		$sql1 .= " AND " . MAIN_DB_PREFIX . "facturedet.fk_code_ventilation = 0";
 	} else {
 		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd, " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accounting_account as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
 		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
-		$sql1 .= " WHERE fd.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . ((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.$conf->entity;
+		$sql1 .= " WHERE fd.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . ((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.((int) $conf->entity);
 		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_sell=accnt.account_number";
 		$sql1 .= " AND fd.fk_code_ventilation = 0";
 	}*/
@@ -134,18 +153,17 @@ if ($action == 'validatehistory') {
 	$sql .= " co.code as country_code, co.label as country_label,";
 	$sql .= " s.tva_intra,";
 	if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-		$sql .= " spe.accountancy_code_sell as company_code_sell";
+		$sql .= " spe.accountancy_code_sell as company_code_sell";	// accounting code for product but stored on thirdparty
 	} else {
-		$sql .= " s.accountancy_code_sell as company_code_sell";
+		$sql .= " s.accountancy_code_sell as company_code_sell";	// accounting code for product but stored on thirdparty
 	}
-
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 	if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
 		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
 	}
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
-	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facturedet as l ON f.rowid = l.fk_facture";
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facturedet as l ON f.rowid = l.fk_facture";	// the main table
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
 	if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
@@ -156,13 +174,16 @@ 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";
-	$sql .= " AND l.product_type <= 2";
+	$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0 AND l.product_type <= 2 AND f.entity = ".((int) $conf->entity);
 	if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
 		$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
 	}
+	if ($validatemonth && $validateyear) {
+		$sql .= dolSqlDateFilter('f.datef', 0, $validatemonth, $validateyear);
+	}
 
 	dol_syslog('htdocs/accountancy/customer/index.php');
+
 	$result = $db->query($sql);
 	if (!$result) {
 		$error++;
@@ -174,81 +195,108 @@ if ($action == 'validatehistory') {
 
 		$isSellerInEEC = isInEEC($mysoc);
 
+		$thirdpartystatic = new Societe($db);
+		$facture_static = new Facture($db);
+		$facture_static_det = new FactureLigne($db);
+		$product_static = new Product($db);
+
 		$i = 0;
 		while ($i < min($num_lines, 10000)) {	// No more than 10000 at once
 			$objp = $db->fetch_object($result);
 
-			$isBuyerInEEC = isInEEC($objp);	// This make a database request but there is a cache into $conf->cache['country_code_in_EEC']
+			$thirdpartystatic->id = $objp->socid;
+			$thirdpartystatic->name = $objp->name;
+			$thirdpartystatic->client = $objp->client;
+			$thirdpartystatic->fournisseur = $objp->fournisseur;
+			$thirdpartystatic->code_client = $objp->code_client;
+			$thirdpartystatic->code_compta_client = $objp->code_compta_client;
+			$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+			$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+			$thirdpartystatic->email = $objp->email;
+			$thirdpartystatic->country_code = $objp->country_code;
+			$thirdpartystatic->tva_intra = $objp->tva_intra;
+			$thirdpartystatic->code_compta_product = $objp->company_code_sell;		// The accounting account for product stored on thirdparty object (for level3 suggestion)
 
-			// Level 2: Search suggested account for product/service (similar code exists in page list.php to make manual binding)
-			$suggestedaccountingaccountfor = '';
-			if (($objp->country_code == $mysoc->country_code) || empty($objp->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
-				$objp->code_sell_p = $objp->code_sell;
-				$objp->aarowid_suggest = $objp->aarowid;
-				$suggestedaccountingaccountfor = '';
+			$product_static->ref = $objp->product_ref;
+			$product_static->id = $objp->product_id;
+			$product_static->type = $objp->type;
+			$product_static->label = $objp->product_label;
+			$product_static->status = $objp->status;
+			$product_static->status_buy = $objp->status_buy;
+			$product_static->accountancy_code_sell = $objp->code_sell;
+			$product_static->accountancy_code_sell_intra = $objp->code_sell_intra;
+			$product_static->accountancy_code_sell_export = $objp->code_sell_export;
+			$product_static->accountancy_code_buy = $objp->code_buy;
+			$product_static->accountancy_code_buy_intra = $objp->code_buy_intra;
+			$product_static->accountancy_code_buy_export = $objp->code_buy_export;
+			$product_static->tva_tx = $objp->tva_tx_prod;
+
+			$facture_static->ref = $objp->ref;
+			$facture_static->id = $objp->facid;
+			$facture_static->type = $objp->ftype;
+			$facture_static->date = $objp->datef;
+
+			$facture_static_det->id = $objp->rowid;
+			$facture_static_det->total_ht = $objp->total_ht;
+			$facture_static_det->tva_tx = $objp->tva_tx_line;
+			$facture_static_det->vat_src_code = $objp->vat_src_code;
+			$facture_static_det->product_type = $objp->type_l;
+			$facture_static_det->desc = $objp->description;
+
+			$accountingAccountArray = array(
+				'dom'=>$objp->aarowid,
+				'intra'=>$objp->aarowid_intra,
+				'export'=>$objp->aarowid_export,
+				'thirdparty' =>$objp->aarowid_thirdparty);
+
+			$code_sell_p_notset = '';
+			$code_sell_t_notset = '';
+
+			$suggestedid = 0;
+
+			$return=$accountingAccount->getAccountingCodeToBind($thirdpartystatic, $mysoc, $product_static, $facture_static, $facture_static_det, $accountingAccountArray, 'customer');
+			if (!is_array($return) && $return < 0) {
+				setEventMessage($accountingAccount->error, 'errors');
 			} else {
-				if ($isSellerInEEC && $isBuyerInEEC && $objp->tva_tx_line != 0) {	// European intravat sale, but with VAT
-					$objp->code_sell_p = $objp->code_sell;
-					$objp->aarowid_suggest = $objp->aarowid;
-					$suggestedaccountingaccountfor = 'eecwithvat';
-				} elseif ($isSellerInEEC && $isBuyerInEEC && empty($objp->tva_intra)) {	// European intravat sale, without VAT intra community number
-					$objp->code_sell_p = $objp->code_sell;
-					$objp->aarowid_suggest = 0; // There is a doubt, no automatic binding
-					$suggestedaccountingaccountfor = 'eecwithoutvatnumber';
-				} elseif ($isSellerInEEC && $isBuyerInEEC) {          // European intravat sale
-					$objp->code_sell_p = $objp->code_sell_intra;
-					$objp->aarowid_suggest = $objp->aarowid_intra;
-					$suggestedaccountingaccountfor = 'eec';
-				} else {                                        // Foreign sale
-					$objp->code_sell_p = $objp->code_sell_export;
-					$objp->aarowid_suggest = $objp->aarowid_export;
-					$suggestedaccountingaccountfor = 'export';
+				$suggestedid = $return['suggestedid'];
+				$suggestedaccountingaccountfor = $return['suggestedaccountingaccountfor'];
+
+				if (!empty($suggestedid) && $suggestedaccountingaccountfor != '' && $suggestedaccountingaccountfor != 'eecwithoutvatnumber') {
+					$suggestedid = $return['suggestedid'];
+				} else {
+					$suggestedid = 0;
 				}
 			}
 
-			if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
-				// Level 3: Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
-				if (!empty($objp->company_code_sell)) {
-					$objp->code_sell_t = $objp->company_code_sell;
-					$objp->aarowid_suggest = $objp->aarowid_thirdparty;
-					$suggestedaccountingaccountfor = '';
-				}
-			}
-
-			// Manage Deposit
-			if (!empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT)) {
-				if ($objp->description == "(DEPOSIT)" || $objp->ftype == $facture_static::TYPE_DEPOSIT) {
-					$accountdeposittoventilated = new AccountingAccount($db);
-					$accountdeposittoventilated->fetch('', $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT, 1);
-					$objp->code_sell_l = $accountdeposittoventilated->ref;
-					$objp->code_sell_p = '';
-					$objp->code_sell_t = '';
-					$objp->aarowid_suggest = $accountdeposittoventilated->rowid;
-				}
-			}
-
-			if ($objp->aarowid_suggest > 0) {
+			if ($suggestedid > 0) {
 				$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."facturedet";
-				$sqlupdate .= " SET fk_code_ventilation = ".((int) $objp->aarowid_suggest);
-				$sqlupdate .= " WHERE fk_code_ventilation <= 0 AND product_type <= 2 AND rowid = ".((int) $objp->rowid);
+				$sqlupdate .= " SET fk_code_ventilation = ".((int) $suggestedid);
+				$sqlupdate .= " WHERE fk_code_ventilation <= 0 AND product_type <= 2 AND rowid = ".((int) $facture_static_det->id);
 
 				$resqlupdate = $db->query($sqlupdate);
 				if (!$resqlupdate) {
 					$error++;
 					setEventMessages($db->lasterror(), null, 'errors');
 					break;
+				} else {
+					$nbbinddone++;
 				}
+			} else {
+				$notpossible++;
 			}
 
 			$i++;
 		}
+		if ($num_lines > 10000) {
+			$notpossible += ($num_lines - 10000);
+		}
 	}
 
 	if ($error) {
 		$db->rollback();
 	} else {
 		$db->commit();
-		setEventMessages($langs->trans('AutomaticBindingDone'), null, 'mesgs');
+		setEventMessages($langs->trans('AutomaticBindingDone', 	$nbbinddone, $notpossible), null, 'mesgs');
 	}
 }
 
@@ -272,21 +320,38 @@ print '</span><br>';
 
 $y = $year_current;
 
-$buttonbind = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?year='.$year_current.'&action=validatehistory">'.$langs->trans("ValidateHistory").'</a>';
+$buttonbind = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&token='.newToken().'">'.$langs->trans("ValidateHistory").'</a>';
 
-print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
+print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
 //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="minwidth100">'.$langs->trans("Account").'</td>';
-print '<td class="left">'.$langs->trans("Label").'</td>';
+print '<td>'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
 	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'];
+		print '<a href="'.DOL_URL_ROOT.'/accountancy/customer/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>';
 
@@ -297,7 +362,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= "  SUM(".$db->ifsql('MONTH(f.datef)='.$j, 'fd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+	$sql .= "  SUM(".$db->ifsql("MONTH(f.datef)=".$j, "fd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(fd.total_ht) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
@@ -320,34 +385,49 @@ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 }
 $sql .= " GROUP BY fd.fk_code_ventilation,aa.account_number,aa.label";
 
-dol_syslog('htdocs/accountancy/customer/index.php sql='.$sql, LOG_DEBUG);
+dol_syslog('htdocs/accountancy/customer/index.php', LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
 
 	while ($row = $db->fetch_row($resql)) {
-		print '<tr class="oddeven"><td>';
+		print '<tr class="oddeven">';
+		print '<td>';
 		if ($row[0] == 'tobind') {
 			print '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>';
 		} else {
 			print length_accountg($row[0]);
 		}
 		print '</td>';
-		print '<td class="left">';
+		print '<td>';
 		if ($row[0] == 'tobind') {
-			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
+			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.((int) $y), $langs->transnoentitiesnoconv("ToBind"));
 		} else {
 			print $row[1];
 		}
 		print '</td>';
-		for ($i = 2; $i <= 12; $i++) {
-			print '<td class="right nowraponall amount">'.price($row[$i]).'</td>';
+		for ($i = 2; $i <= 13; $i++) {
+			$cursormonth = (($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) + $i - 2);
+			if ($cursormonth > 12) {
+				$cursormonth -= 12;
+			}
+			$cursoryear = ($cursormonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			$tmp = dol_getdate(dol_get_last_day($cursoryear, $cursormonth, 'gmt'), false, 'gmt');
+
+			print '<td class="right nowraponall amount">';
+			print price($row[$i]);
+			print '</td>';
 		}
-		print '<td class="right nowraponall amount">'.price($row[13]).'</td>';
 		print '<td class="right nowraponall amount"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
+
+	if ($num == 0) {
+		print '<tr class="oddeven"><td colspan="16">';
+		print '<span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span>';
+		print '</td></tr>';
+	}
 } else {
 	print $db->lasterror(); // Show last sql error
 }
@@ -358,19 +438,36 @@ print '</div>';
 print '<br>';
 
 
-print_barre_liste($langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+print_barre_liste(img_picto('', 'link', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
 //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="minwidth100">'.$langs->trans("Account").'</td>';
-print '<td class="left">'.$langs->trans("Label").'</td>';
+print '<td>'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
 	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'];
+		print '<a href="'.DOL_URL_ROOT.'/accountancy/customer/lines.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>';
 
@@ -381,7 +478,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= "  SUM(".$db->ifsql('MONTH(f.datef)='.$j, 'fd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+	$sql .= "  SUM(".$db->ifsql("MONTH(f.datef)=".$j, "fd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(fd.total_ht) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
@@ -410,7 +507,8 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 
 	while ($row = $db->fetch_row($resql)) {
-		print '<tr class="oddeven"><td>';
+		print '<tr class="oddeven">';
+		print '<td>';
 		if ($row[0] == 'tobind') {
 			print $langs->trans("Unknown");
 		} else {
@@ -418,22 +516,36 @@ if ($resql) {
 		}
 		print '</td>';
 
-		print '<td class="left">';
+		print '<td>';
 		if ($row[0] == 'tobind') {
-			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
+			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.((int) $y), $langs->transnoentitiesnoconv("ToBind"));
 		} else {
 			print $row[1];
 		}
 		print '</td>';
 
-		for ($i = 2; $i <= 12; $i++) {
-			print '<td class="right nowraponall amount">'.price($row[$i]).'</td>';
+		for ($i = 2; $i <= 13; $i++) {
+			$cursormonth = (($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) + $i - 2);
+			if ($cursormonth > 12) {
+				$cursormonth -= 12;
+			}
+			$cursoryear = ($cursormonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			$tmp = dol_getdate(dol_get_last_day($cursoryear, $cursormonth, 'gmt'), false, 'gmt');
+
+			print '<td class="right nowraponall amount">';
+			print price($row[$i]);
+			print '</td>';
 		}
-		print '<td class="right nowraponall amount">'.price($row[13]).'</td>';
 		print '<td class="right nowraponall amount"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
+
+	if ($num == 0) {
+		print '<tr class="oddeven"><td colspan="16">';
+		print '<span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span>';
+		print '</td></tr>';
+	}
 } else {
 	print $db->lasterror(); // Show last sql error
 }
@@ -466,7 +578,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
 		if ($j > 12) {
 			$j -= 12;
 		}
-		$sql .= "  SUM(".$db->ifsql('MONTH(f.datef)='.$j, 'fd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+		$sql .= "  SUM(".$db->ifsql("MONTH(f.datef)=".$j, "fd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
 	}
 	$sql .= "  SUM(fd.total_ht) as total";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
@@ -526,16 +638,15 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
 			if ($j > 12) {
 				$j -= 12;
 			}
-			$sql .= '
-			SUM('.$db->ifsql('MONTH(f.datef)='.$j,
-						' ('.
-							$db->ifsql('fd.total_ht < 0',
-							' (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))',
-								'  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))'
-							  ).')',
-						 0).') AS month'.str_pad($j, 2, '0', STR_PAD_LEFT).',';
+			$sql .= " SUM(".$db->ifsql("MONTH(f.datef)=".$j,
+						" (".$db->ifsql("fd.total_ht < 0",
+							" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))",
+							"  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))").")",
+						 0).") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 		}
-		$sql .= "  SUM((fd.total_ht-(fd.qty * fd.buy_price_ht))) as total";
+		$sql .= "  SUM(".$db->ifsql("fd.total_ht < 0",
+							" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))",
+							"  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))").") as total";
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
 		$sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 1e7c38b2607..7f09e111a23 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -191,7 +191,14 @@ print '<script type="text/javascript">
  */
 $sql = "SELECT f.rowid as facid, f.ref as ref, f.type, f.datef, f.ref_client,";
 $sql .= " fd.rowid, fd.description, fd.product_type as line_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.vat_src_code, fd.total_ttc,";
-$sql .= " s.rowid as socid, s.nom as name, s.code_compta, s.code_client,";
+$sql .= " s.rowid as socid, s.nom as name, s.code_client,";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= " spe.accountancy_code_customer as code_compta_client,";
+	$sql .= " spe.accountancy_code_supplier as code_compta_fournisseur,";
+} else {
+	$sql .= " s.code_compta as code_compta_client,";
+	$sql .= " s.code_compta_fournisseur,";
+}
 $sql .= " p.rowid as product_id, p.fk_product_type as product_type, p.ref as product_ref, p.label as product_label,";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 	$sql .= " ppe.accountancy_code_sell, ppe.accountancy_code_sell_intra, ppe.accountancy_code_sell_export,";
@@ -201,7 +208,7 @@ if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 $sql .= " aa.rowid as fk_compte, aa.account_number, aa.label as label_account, aa.labelshort as labelshort_account,";
 $sql .= " fd.situation_percent,";
 $sql .= " co.code as country_code, co.label as country,";
-$sql .= " s.rowid as socid, s.nom as name, s.tva_intra, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur";
+$sql .= " s.rowid as socid, s.nom as name, s.tva_intra, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
@@ -213,6 +220,9 @@ if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " WHERE fd.fk_code_ventilation > 0";
 $sql .= " AND f.entity IN (".getEntity('invoice', 0).")"; // We don't share object for accountancy
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 2be7cd5f4ca..56f904e79ef 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2013-2014	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-2014	Florian Henry		<florian.henry@open-concept.pro>
+ * 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>
  *
@@ -45,6 +45,7 @@ $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
+$optioncss = GETPOST('optioncss', 'alpha');
 
 // Select Box
 $mesCasesCochees = GETPOST('toselect', 'array');
@@ -96,6 +97,7 @@ if (!$sortorder) {
 $hookmanager->initHooks(array('accountancycustomerlist'));
 
 $formaccounting = new FormAccounting($db);
+$accountingAccount = new AccountingAccount($db);
 
 $chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
 
@@ -188,12 +190,12 @@ if ($massaction == 'ventil' && $user->rights->accounting->bind->write) {
 				$accountventilated = new AccountingAccount($db);
 				$accountventilated->fetch($monCompte, '', 1);
 
-				dol_syslog("accountancy/customer/list.php sql=".$sql, LOG_DEBUG);
+				dol_syslog("accountancy/customer/list.php", LOG_DEBUG);
 				if ($db->query($sql)) {
-					$msg .= '<div><span style="color:green">'.$langs->trans("Lineofinvoice", $monId).' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'</span></div>';
+					$msg .= '<div><span style="color:green">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'</span></div>';
 					$ok++;
 				} else {
-					$msg .= '<div><span style="color:red">'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice", $monId).' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'<br> <pre>'.$sql.'</pre></span></div>';
+					$msg .= '<div><span style="color:red">'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'<br> <pre>'.$sql.'</pre></span></div>';
 					$ko++;
 				}
 			}
@@ -238,10 +240,14 @@ if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 $sql .= " p.tosell as status, p.tobuy as status_buy,";
 $sql .= " aa.rowid as aarowid, aa2.rowid as aarowid_intra, aa3.rowid as aarowid_export, aa4.rowid as aarowid_thirdparty,";
 $sql .= " co.code as country_code, co.label as country_label,";
-$sql .= " s.rowid as socid, s.nom as name, s.tva_intra, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,";
+$sql .= " s.rowid as socid, s.nom as name, s.tva_intra, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur,";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= " spe.accountancy_code_customer as code_compta_client,";
+	$sql .= " spe.accountancy_code_supplier as code_compta_fournisseur,";
 	$sql .= " spe.accountancy_code_sell as company_code_sell";
 } else {
+	$sql .= " s.code_compta as code_compta_client,";
+	$sql .= " s.code_compta_fournisseur,";
 	$sql .= " s.accountancy_code_sell as company_code_sell";
 }
 $parameters = array();
@@ -407,6 +413,9 @@ if ($result) {
 	if ($search_ref) {
 		$param .= '&search_ref='.urlencode($search_ref);
 	}
+	if ($search_label) {
+		$param .= '&search_label='.urlencode($search_label);
+	}
 	if ($search_desc) {
 		$param .= '&search_desc='.urlencode($search_desc);
 	}
@@ -469,7 +478,6 @@ if ($result) {
 	print '</div>';
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></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 maxwidth100" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
 	print '<td class="liste_titre right"><input type="text" class="flat maxwidth50 right" name="search_amount" value="'.dol_escape_htmltag($search_amount).'"></td>';
 	print '<td class="liste_titre right"><input type="text" class="flat maxwidth50 right" name="search_vat" placeholder="%" size="1" value="'.dol_escape_htmltag($search_vat).'"></td>';
@@ -485,7 +493,7 @@ if ($result) {
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
-	print '</tr>';
+	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
@@ -510,28 +518,35 @@ if ($result) {
 
 	$thirdpartystatic = new Societe($db);
 	$facture_static = new Facture($db);
+	$facture_static_det = new FactureLigne($db);
 	$product_static = new Product($db);
 
-	$isSellerInEEC = isInEEC($mysoc);
 
 	$accountingaccount_codetotid_cache = array();
 
 	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
 
-		$objp->code_sell_l = '';
-		$objp->code_sell_p = '';
+		// product_type: 0 = service, 1 = product
+		// if product does not exist we use the value of product_type provided in facturedet to define if this is a product or service
+		// issue : if we change product_type value in product DB it should differ from the value stored in facturedet DB !
+		$code_sell_l = '';
+		$code_sell_p = '';
+		$code_sell_t = '';
 
 		$thirdpartystatic->id = $objp->socid;
 		$thirdpartystatic->name = $objp->name;
 		$thirdpartystatic->client = $objp->client;
 		$thirdpartystatic->fournisseur = $objp->fournisseur;
 		$thirdpartystatic->code_client = $objp->code_client;
+		$thirdpartystatic->code_compta = $objp->code_compta_client;		// For backward compatibility
 		$thirdpartystatic->code_compta_client = $objp->code_compta_client;
 		$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
 		$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 		$thirdpartystatic->email = $objp->email;
 		$thirdpartystatic->country_code = $objp->country_code;
+		$thirdpartystatic->tva_intra = $objp->tva_intra;
+		$thirdpartystatic->code_compta_product = $objp->company_code_sell;		// The accounting account for product stored on thirdparty object (for level3 suggestion)
 
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
@@ -545,150 +560,86 @@ if ($result) {
 		$product_static->accountancy_code_buy = $objp->code_buy;
 		$product_static->accountancy_code_buy_intra = $objp->code_buy_intra;
 		$product_static->accountancy_code_buy_export = $objp->code_buy_export;
+		$product_static->tva_tx = $objp->tva_tx_prod;
 
 		$facture_static->ref = $objp->ref;
 		$facture_static->id = $objp->facid;
 		$facture_static->type = $objp->ftype;
+		$facture_static->date = $db->jdate($objp->datef);
+
+		$facture_static_det->id = $objp->rowid;
+		$facture_static_det->total_ht = $objp->total_ht;
+		$facture_static_det->tva_tx = $objp->tva_tx_line;
+		$facture_static_det->vat_src_code = $objp->vat_src_code;
+		$facture_static_det->product_type = $objp->type_l;
+		$facture_static_det->desc = $objp->description;
+
+		$accountingAccountArray = array(
+			'dom'=>$objp->aarowid,
+			'intra'=>$objp->aarowid_intra,
+			'export'=>$objp->aarowid_export,
+			'thirdparty' =>$objp->aarowid_thirdparty);
 
 		$code_sell_p_notset = '';
 		$code_sell_t_notset = '';
-		$objp->aarowid_suggest = ''; // Will be set later
 
-		$isBuyerInEEC = isInEEC($objp);
+		$suggestedid = 0;
 
-		// Level 1: Search suggested default account for product/service
-		$suggestedaccountingaccountbydefaultfor = '';
-		if ($objp->type_l == 1) {
-			if ($objp->country_code == $mysoc->country_code || empty($objp->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
-				$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : '');
-				$suggestedaccountingaccountbydefaultfor = '';
-			} else {
-				if ($isSellerInEEC && $isBuyerInEEC && $objp->tva_tx_line != 0) {    // European intravat sale, but with a VAT
-					$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : '');
-					$suggestedaccountingaccountbydefaultfor = 'eecwithvat';
-				} elseif ($isSellerInEEC && $isBuyerInEEC && empty($objp->tva_intra)) {    // European intravat sale, without VAT intra community number
-					$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : '');
-					$suggestedaccountingaccountbydefaultfor = 'eecwithoutvatnumber';
-				} elseif ($isSellerInEEC && $isBuyerInEEC) {    // European intravat sale
-					$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT : '');
-					$suggestedaccountingaccountbydefaultfor = 'eec';
-				} else {                                        // Foreign sale
-					$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT : '');
-					$suggestedaccountingaccountbydefaultfor = 'export';
-				}
-			}
-		} elseif ($objp->type_l == 0) {
-			if ($objp->country_code == $mysoc->country_code || empty($objp->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
-				$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : '');
-				$suggestedaccountingaccountbydefaultfor = '';
-			} else {
-				if ($isSellerInEEC && $isBuyerInEEC && $objp->tva_tx_line != 0) {	// European intravat sale, but with a VAT
-					$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : '');
-					$suggestedaccountingaccountbydefaultfor = 'eecwithvat';
-				} elseif ($isSellerInEEC && $isBuyerInEEC && empty($objp->tva_intra)) {	// European intravat sale, without VAT intra community number
-					$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : '');
-					$suggestedaccountingaccountbydefaultfor = 'eecwithoutvatnumber';
-				} elseif ($isSellerInEEC && $isBuyerInEEC) {	// European intravat sale
-					$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT : '');
-					$suggestedaccountingaccountbydefaultfor = 'eec';
-				} else {
-					$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT : '');
-					$suggestedaccountingaccountbydefaultfor = 'export';
-				}
-			}
-		}
-		if ($objp->code_sell_l == -1) {
-			$objp->code_sell_l = '';
-		}
-
-		// Level 2: Search suggested account for product/service (similar code exists in page index.php to make automatic binding)
-		$suggestedaccountingaccountfor = '';
-		if (($objp->country_code == $mysoc->country_code) || empty($objp->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
-			$objp->code_sell_p = $objp->code_sell;
-			$objp->aarowid_suggest = $objp->aarowid;
-			$suggestedaccountingaccountfor = '';
+		$return=$accountingAccount->getAccountingCodeToBind($thirdpartystatic, $mysoc, $product_static, $facture_static, $facture_static_det, $accountingAccountArray, 'customer');
+		if (!is_array($return) && $return<0) {
+			setEventMessage($accountingAccount->error, 'errors');
 		} else {
-			if ($isSellerInEEC && $isBuyerInEEC && $objp->tva_tx_line != 0) {	// European intravat sale, but with VAT
-				$objp->code_sell_p = $objp->code_sell;
-				$objp->aarowid_suggest = $objp->aarowid;
-				$suggestedaccountingaccountfor = 'eecwithvat';
-			} elseif ($isSellerInEEC && $isBuyerInEEC && empty($objp->tva_intra)) {	// European intravat sale, without VAT intra community number
-				$objp->code_sell_p = $objp->code_sell;
-				$objp->aarowid_suggest = $objp->aarowid; // There is a doubt for this case. Is it an error on vat or we just forgot to fill vat number ?
-				$suggestedaccountingaccountfor = 'eecwithoutvatnumber';
-			} elseif ($isSellerInEEC && $isBuyerInEEC) {          // European intravat sale
-				$objp->code_sell_p = $objp->code_sell_intra;
-				$objp->aarowid_suggest = $objp->aarowid_intra;
-				$suggestedaccountingaccountfor = 'eec';
-			} else {                                        // Foreign sale
-				$objp->code_sell_p = $objp->code_sell_export;
-				$objp->aarowid_suggest = $objp->aarowid_export;
-				$suggestedaccountingaccountfor = 'export';
-			}
+			$suggestedid=$return['suggestedid'];
+			$suggestedaccountingaccountfor=$return['suggestedaccountingaccountfor'];
+			$suggestedaccountingaccountbydefaultfor=$return['suggestedaccountingaccountbydefaultfor'];
+			$code_sell_l=$return['code_l'];
+			$code_sell_p=$return['code_p'];
+			$code_sell_t=$return['code_t'];
 		}
+		//var_dump($return);
 
-		// Level 3: Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
-		if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
-			if (!empty($objp->company_code_sell)) {
-				$objp->code_sell_t = $objp->company_code_sell;
-				$objp->aarowid_suggest = $objp->aarowid_thirdparty;
-				$suggestedaccountingaccountfor = '';
-			}
-		}
-
-		// Manage Deposit
-		if (!empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT)) {
-			if ($objp->description == "(DEPOSIT)" || $objp->ftype == $facture_static::TYPE_DEPOSIT) {
-				$accountdeposittoventilated = new AccountingAccount($db);
-				$accountdeposittoventilated->fetch('', $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT, 1);
-				$objp->code_sell_l = $accountdeposittoventilated->ref;
-				$objp->code_sell_p = '';
-				$objp->code_sell_t = '';
-				$objp->aarowid_suggest = $accountdeposittoventilated->rowid;
-			}
-		}
-
-		if (!empty($objp->code_sell_p)) {
+		if (!empty($code_sell_p)) {
 			// Value was defined previously
 		} else {
 			$code_sell_p_notset = 'color:orange';
 		}
-		if (empty($objp->code_sell_l) && empty($objp->code_sell_p)) {
+		if (empty($code_sell_l) && empty($code_sell_p)) {
 			$code_sell_p_notset = 'color:red';
 		}
 		if ($suggestedaccountingaccountfor == 'eecwithoutvatnumber' && empty($code_sell_p_notset)) {
 			$code_sell_p_notset = 'color:orange';
 		}
 
-		// $objp->code_sell_l is now default code of product/service
-		// $objp->code_sell_p is now code of product/service
-		// $objp->code_sell_t is now code of thirdparty
+		// $code_sell_l is now default code of product/service
+		// $code_sell_p is now code of product/service
+		// $code_sell_t is now code of thirdparty
+		//var_dump($code_sell_l.' - '.$code_sell_p.' - '.$code_sell_t.' -> '.$suggestedid.' ('.$suggestedaccountingaccountbydefaultfor.' '.$suggestedaccountingaccountfor.')');
 
 		print '<tr class="oddeven">';
 
 		// Line id
-		print '<td>'.$objp->rowid.'</td>';
+		print '<td>'.$facture_static_det->id.'</td>';
 
 		// Ref Invoice
 		print '<td class="nowraponall">'.$facture_static->getNomUrl(1).'</td>';
 
-		print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day').'</td>';
+		print '<td class="center">'.dol_print_date($facture_static->date, 'day').'</td>';
 
 		// Ref Product
 		print '<td class="tdoverflowmax150">';
 		if ($product_static->id > 0) {
 			print $product_static->getNomUrl(1);
 		}
-		if ($objp->product_label) {
-			print '<br><span class="opacitymedium small">'.$objp->product_label.'</span>';
+		if ($product_static->label) {
+			print '<br><span class="opacitymedium small">'.$product_static->label.'</span>';
 		}
 		print '</td>';
 
 		// Description
 		print '<td class="tdoverflowonsmartphone small">';
-		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
+		$text = dolGetFirstLineOfText(dol_string_nohtmltag($facture_static_det->desc));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
-		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
+		print $form->textwithtooltip(dol_trunc($text, $trunclength), $facture_static_det->desc);
 		print '</td>';
 
 		print '<td class="right nowraponall amount">';
@@ -696,11 +647,12 @@ if ($result) {
 		print '</td>';
 
 		// Vat rate
-		if ($objp->vat_tx_l != $objp->vat_tx_p) {
-			$code_vat_differ = 'font-weight:bold; text-decoration:blink; color:red';
+		$code_vat_differ = '';
+		if ($product_static->tva_tx !== $facture_static_det->tva_tx && price2num($product_static->tva_tx) && price2num($facture_static_det->tva_tx)) {	// Note: having a vat rate of 0 is often the normal case when sells is intra b2b or to export
+			$code_vat_differ = 'warning bold';
 		}
-		print '<td style="'.$code_vat_differ.'" class="right">';
-		print vatrate($objp->tva_tx_line.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : ''));
+		print '<td class="right'.($code_vat_differ?' '.$code_vat_differ:'').'">';
+		print vatrate($facture_static_det->tva_tx.($facture_static_det->vat_src_code ? ' ('.$facture_static_det->vat_src_code.')' : ''));
 		print '</td>';
 
 		// Thirdparty
@@ -717,18 +669,18 @@ if ($result) {
 
 		// Found accounts
 		print '<td class="small">';
-		$s = '1. '.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
+		$s = '1. '.(($facture_static_det->product_type == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
 		$shelp = '';
 		if ($suggestedaccountingaccountbydefaultfor == 'eec') {
 			$shelp .= $langs->trans("SaleEEC");
 		} elseif ($suggestedaccountingaccountbydefaultfor == 'export') {
 			$shelp .= $langs->trans("SaleExport");
 		}
-		$s .= ($objp->code_sell_l > 0 ? length_accountg($objp->code_sell_l) : '<span style="'.$code_sell_p_notset.'">'.$langs->trans("NotDefined").'</span>');
+		$s .= ($code_sell_l > 0 ? length_accountg($code_sell_l) : '<span style="'.$code_sell_p_notset.'">'.$langs->trans("NotDefined").'</span>');
 		print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
-		if ($objp->product_id > 0) {
+		if ($product_static->id > 0) {
 			print '<br>';
-			$s = '2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
+			$s = '2. '.(($facture_static_det->product_type == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
 			$shelp = ''; $ttype = 'help';
 			if ($suggestedaccountingaccountfor == 'eec') {
 				$shelp = $langs->trans("SaleEEC");
@@ -740,7 +692,7 @@ if ($result) {
 			} elseif ($suggestedaccountingaccountfor == 'export') {
 				$shelp = $langs->trans("SaleExport");
 			}
-			$s .= (empty($objp->code_sell_p) ? '<span style="'.$code_sell_p_notset.'">'.$langs->trans("NotDefined").'</span>' : length_accountg($objp->code_sell_p));
+			$s .= (empty($code_sell_p) ? '<span style="'.$code_sell_p_notset.'">'.$langs->trans("NotDefined").'</span>' : length_accountg($code_sell_p));
 			print $form->textwithpicto($s, $shelp, 1, $ttype, '', 0, 2, '', 1);
 		} else {
 			print '<br>';
@@ -751,38 +703,25 @@ if ($result) {
 		}
 		if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
 			print '<br>';
-			$s = '3. '.(($objp->type_l == 1) ? $langs->trans("ServiceForThisThirdparty") : $langs->trans("ProductForThisThirdparty")).': ';
+			$s = '3. '.(($facture_static_det->product_type == 1) ? $langs->trans("ServiceForThisThirdparty") : $langs->trans("ProductForThisThirdparty")).': ';
 			$shelp = '';
-			$s .= ($objp->code_sell_t > 0 ? length_accountg($objp->code_sell_t) : '<span style="'.$code_sell_t_notset.'">'.$langs->trans("NotDefined").'</span>');
+			$s .= ($code_sell_t > 0 ? length_accountg($code_sell_t) : '<span style="'.$code_sell_t_notset.'">'.$langs->trans("NotDefined").'</span>');
 			print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
 		}
 		print '</td>';
 
 		// Suggested accounting account
 		print '<td>';
-		$suggestedid = $objp->aarowid_suggest;
-		if (empty($suggestedid) && empty($objp->code_sell_p) && !empty($objp->code_sell_l) && empty($conf->global->ACCOUNTANCY_DO_NOT_AUTOFILL_ACCOUNT_WITH_GENERIC)) {
-			if (empty($accountingaccount_codetotid_cache[$objp->code_sell_l])) {
-				$tmpaccount = new AccountingAccount($db);
-				$tmpaccount->fetch(0, $objp->code_sell_l, 1);
-				if ($tmpaccount->id > 0) {
-					$suggestedid = $tmpaccount->id;
-				}
-				$accountingaccount_codetotid_cache[$objp->code_sell_l] = $tmpaccount->id;
-			} else {
-				$suggestedid = $accountingaccount_codetotid_cache[$objp->code_sell_l];
-			}
-		}
-		print $formaccounting->select_account($suggestedid, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formaccounting->select_account($suggestedid, 'codeventil'.$facture_static_det->id, 1, array(), 0, 0, 'codeventil maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
 
 		// Column with checkbox
 		print '<td class="center">';
-		$ischecked = $objp->aarowid_suggest;
-		if ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') {
-			$ischecked = 0;
+		$ischecked = 0;
+		if (!empty($suggestedid) && $suggestedaccountingaccountfor != '' && $suggestedaccountingaccountfor != 'eecwithoutvatnumber') {
+			$ischecked = 1;
 		}
-		print '<input type="checkbox" class="flat checkforselect checkforselect'.$objp->rowid.'" name="toselect[]" value="'.$objp->rowid."_".$i.'"'.($ischecked ? "checked" : "").'/>';
+		print '<input type="checkbox" class="flat checkforselect checkforselect'.$facture_static_det->id.'" name="toselect[]" value="'.$facture_static_det->id."_".$i.'"'.($ischecked ? " checked" : "").'/>';
 		print '</td>';
 
 		print '</tr>';
@@ -800,7 +739,7 @@ if ($db->type == 'mysqli') {
 }
 
 // Add code to auto check the box when we select an account
-print '<script type="text/javascript" language="javascript">
+print '<script type="text/javascript">
 jQuery(document).ready(function() {
 	jQuery(".codeventil").change(function() {
 		var s=$(this).attr("id").replace("codeventil", "")
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index db270b9d2db..7c2310ccce4 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -110,7 +110,7 @@ if (!empty($id)) {
 	$sql .= " WHERE er.fk_statut > 0 AND erd.rowid = ".((int) $id);
 	$sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
 
-	dol_syslog("/accounting/expensereport/card.php sql=".$sql, LOG_DEBUG);
+	dol_syslog("/accounting/expensereport/card.php", LOG_DEBUG);
 	$result = $db->query($sql);
 
 	if ($result) {
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 0e3bda39521..37abd56a21d 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -32,6 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "other", "accountancy"));
 
+$validatemonth = GETPOST('validatemonth', 'int');
+$validateyear = GETPOST('validateyear', 'int');
+
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) {
 	$year_start = GETPOST("year", 'int');
@@ -79,8 +82,8 @@ if (($action == 'clean' || $action == 'validatehistory') && $user->rights->accou
 	$sql1 .= '	(SELECT accnt.rowid ';
 	$sql1 .= '	FROM '.MAIN_DB_PREFIX.'accounting_account as accnt';
 	$sql1 .= '	INNER JOIN '.MAIN_DB_PREFIX.'accounting_system as syst';
-	$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid='.$conf->global->CHARTOFACCOUNTS.' AND accnt.entity = '.$conf->entity.')';
-	$sql1 .= ' AND erd.fk_expensereport IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'expensereport WHERE entity = '.$conf->entity.')';
+	$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid='.((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.((int) $conf->entity).')';
+	$sql1 .= ' AND erd.fk_expensereport IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'expensereport WHERE entity = '.((int) $conf->entity).')';
 	$sql1 .= ' AND fk_code_ventilation <> 0';
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
 	$resql1 = $db->query($sql1);
@@ -96,34 +99,69 @@ if (($action == 'clean' || $action == 'validatehistory') && $user->rights->accou
 
 if ($action == 'validatehistory') {
 	$error = 0;
+	$nbbinddone = 0;
+	$notpossible = 0;
+
 	$db->begin();
 
 	// Now make the binding
-	if ($db->type == 'pgsql') {
-		$sql1 = "UPDATE ".MAIN_DB_PREFIX."expensereport_det";
-		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
-		$sql1 .= " FROM ".MAIN_DB_PREFIX."c_type_fees as t, ".MAIN_DB_PREFIX."accounting_account as accnt , ".MAIN_DB_PREFIX."accounting_system as syst";
-		$sql1 .= " WHERE ".MAIN_DB_PREFIX."expensereport_det.fk_c_type_fees = t.id  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid = ".((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.$conf->entity;
-		$sql1 .= " AND accnt.active = 1 AND t.accountancy_code = accnt.account_number";
-		$sql1 .= " AND ".MAIN_DB_PREFIX."expensereport_det.fk_code_ventilation = 0";
-	} else {
-		$sql1 = "UPDATE ".MAIN_DB_PREFIX."expensereport_det as erd, ".MAIN_DB_PREFIX."c_type_fees as t, ".MAIN_DB_PREFIX."accounting_account as accnt , ".MAIN_DB_PREFIX."accounting_system as syst";
-		$sql1 .= " SET erd.fk_code_ventilation = accnt.rowid";
-		$sql1 .= " WHERE erd.fk_c_type_fees = t.id AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid = ".((int) $conf->global->CHARTOFACCOUNTS).' AND accnt.entity = '.$conf->entity;
-		$sql1 .= " AND accnt.active = 1 AND t.accountancy_code=accnt.account_number";
-		$sql1 .= " AND erd.fk_code_ventilation = 0";
+	$sql1 = "SELECT erd.rowid, accnt.rowid as suggestedid";
+	$sql1 .= " FROM ".MAIN_DB_PREFIX."expensereport_det as erd";
+	$sql1 .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_fees as t ON erd.fk_c_type_fees = t.id";
+	$sql1 .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as accnt ON t.accountancy_code = accnt.account_number AND accnt.active = 1 AND accnt.entity =".((int) $conf->entity);
+	$sql1 .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_system as syst ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid = ".((int) $conf->global->CHARTOFACCOUNTS).' AND syst.active = 1,';
+	$sql1 .= " ".MAIN_DB_PREFIX."expensereport as er";
+	$sql1 .= " WHERE erd.fk_expensereport = er.rowid AND er.entity = ".((int) $conf->entity);
+	$sql1 .= " AND er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.") AND erd.fk_code_ventilation <= 0";
+	if ($validatemonth && $validateyear) {
+		$sql1 .= dolSqlDateFilter('erd.date', 0, $validatemonth, $validateyear);
 	}
 
 	dol_syslog('htdocs/accountancy/expensereport/index.php');
 
-	$resql1 = $db->query($sql1);
-	if (!$resql1) {
+	$result = $db->query($sql1);
+	if (!$result) {
 		$error++;
-		$db->rollback();
 		setEventMessages($db->lasterror(), null, 'errors');
+	} else {
+		$num_lines = $db->num_rows($result);
+
+		$i = 0;
+		while ($i < min($num_lines, 10000)) {	// No more than 10000 at once
+			$objp = $db->fetch_object($result);
+
+			$lineid = $objp->rowid;
+			$suggestedid = $objp->suggestedid;
+
+			if ($suggestedid > 0) {
+				$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."expensereport_det";
+				$sqlupdate .= " SET fk_code_ventilation = ".((int) $suggestedid);
+				$sqlupdate .= " WHERE fk_code_ventilation <= 0 AND rowid = ".((int) $lineid);
+
+				$resqlupdate = $db->query($sqlupdate);
+				if (!$resqlupdate) {
+					$error++;
+					setEventMessages($db->lasterror(), null, 'errors');
+					break;
+				} else {
+					$nbbinddone++;
+				}
+			} else {
+				$notpossible++;
+			}
+
+			$i++;
+		}
+		if ($num_lines > 10000) {
+			$notpossible += ($num_lines - 10000);
+		}
+	}
+
+	if ($error) {
+		$db->rollback();
 	} else {
 		$db->commit();
-		setEventMessages($langs->trans('AutomaticBindingDone'), null, 'mesgs');
+		setEventMessages($langs->trans('AutomaticBindingDone', $nbbinddone, $notpossible), null, 'mesgs');
 	}
 }
 
@@ -146,16 +184,16 @@ print '</span><br>';
 
 $y = $year_current;
 
-$buttonbind = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?year='.$year_current.'&action=validatehistory">'.$langs->trans("ValidateHistory").'</a>';
+$buttonbind = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&token='.newToken().'&year='.$year_current.'">'.$langs->trans("ValidateHistory").'</a>';
 
 
-print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
+print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
 //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="minwidth100">'.$langs->trans("Account").'</td>';
-print '<td class="left">'.$langs->trans("Label").'</td>';
+print '<td>'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
 	if ($j > 12) {
@@ -166,13 +204,13 @@ for ($i = 1; $i <= 12; $i++) {
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
 $sql = "SELECT ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number')." AS codecomptable,";
-$sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
+$sql .= " ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= "  SUM(".$db->ifsql('MONTH(er.date_debut)='.$j, 'erd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+	$sql .= "  SUM(".$db->ifsql("MONTH(er.date_debut)=".$j, "erd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= " SUM(erd.total_ht) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as erd";
@@ -195,24 +233,26 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 
 	while ($row = $db->fetch_row($resql)) {
-		print '<tr class="oddeven"><td>';
+		print '<tr class="oddeven">';
+		print '<td>';
 		if ($row[0] == 'tobind') {
 			print '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>';
 		} else {
 			print length_accountg($row[0]);
 		}
 		print '</td>';
-		print '<td class="left">';
+		print '<td>';
 		if ($row[0] == 'tobind') {
-			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
+			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.((int) $y), $langs->transnoentitiesnoconv("ToBind"));
 		} else {
 			print $row[1];
 		}
 		print '</td>';
-		for ($i = 2; $i <= 12; $i++) {
-			print '<td class="right nowraponall amount">'.price($row[$i]).'</td>';
+		for ($i = 2; $i <= 13; $i++) {
+			print '<td class="right nowraponall amount">';
+			print price($row[$i]);
+			print '</td>';
 		}
-		print '<td class="right nowraponall amount">'.price($row[13]).'</td>';
 		print '<td class="right nowraponall amount"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
@@ -227,14 +267,14 @@ print '</div>';
 print '<br>';
 
 
-print_barre_liste($langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+print_barre_liste(img_picto('', 'link', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
 //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
 
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="minwidth100">'.$langs->trans("Account").'</td>';
-print '<td class="left">'.$langs->trans("Label").'</td>';
+print '<td>'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
 	if ($j > 12) {
@@ -251,7 +291,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= "  SUM(".$db->ifsql('MONTH(er.date_debut)='.$j, 'erd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+	$sql .= " SUM(".$db->ifsql("MONTH(er.date_debut)=".$j, "erd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= " ROUND(SUM(erd.total_ht),2) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as erd";
@@ -274,7 +314,8 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 
 	while ($row = $db->fetch_row($resql)) {
-		print '<tr class="oddeven"><td>';
+		print '<tr class="oddeven">';
+		print '<td>';
 		if ($row[0] == 'tobind') {
 			print '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>';
 		} else {
@@ -282,17 +323,18 @@ if ($resql) {
 		}
 		print '</td>';
 
-		print '<td class="left">';
+		print '<td>';
 		if ($row[0] == 'tobind') {
-			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
+			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.((int) $y), $langs->transnoentitiesnoconv("ToBind"));
 		} else {
 			print $row[1];
 		}
 		print '</td>';
-		for ($i = 2; $i <= 12; $i++) {
-			print '<td class="right nowraponall amount">'.price($row[$i]).'</td>';
+		for ($i = 2; $i <= 13; $i++) {
+			print '<td class="right nowraponall amount">';
+			print price($row[$i]);
+			print '</td>';
 		}
-		print '<td class="right nowraponall amount">'.price($row[13]).'</td>';
 		print '<td class="right nowraponall amount"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
@@ -330,7 +372,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
 		if ($j > 12) {
 			$j -= 12;
 		}
-		$sql .= " SUM(".$db->ifsql('MONTH(er.date_create)='.$j, 'erd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+		$sql .= " SUM(".$db->ifsql("MONTH(er.date_create)=".$j, "erd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
 	}
 	$sql .= " SUM(erd.total_ht) as total";
 	$sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as erd";
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index b262f85367a..fb3bf1a6e04 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -394,11 +394,12 @@ if ($result) {
 		print '<td class="center">'.vatrate($objp->tva_tx.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : '')).'</td>';
 
 		// Accounting account affected
-		print '<td class="center">';
+		print '<td>';
 		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 d69e78fead2..863001c3bc0 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -159,7 +159,7 @@ if ($massaction == 'ventil' && $user->rights->accounting->bind->write) {
 				$accountventilated = new AccountingAccount($db);
 				$accountventilated->fetch($monCompte, '', 1);
 
-				dol_syslog('accountancy/expensereport/list.php:: sql='.$sql, LOG_DEBUG);
+				dol_syslog('accountancy/expensereport/list.php', 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++;
@@ -470,7 +470,7 @@ if ($result) {
 }
 
 // Add code to auto check the box when we select an account
-print '<script type="text/javascript" language="javascript">
+print '<script type="text/javascript">
 jQuery(document).ready(function() {
 	jQuery(".codeventil").change(function() {
 		var s=$(this).attr("id").replace("codeventil", "")
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 1842c23f418..02c4d210496 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -81,7 +81,12 @@ $help_url = '';
 
 llxHeader('', $langs->trans("AccountancyArea"), $help_url);
 
-if ($conf->accounting->enabled) {
+if (!empty($conf->global->INVOICE_USE_SITUATION) && $conf->global->INVOICE_USE_SITUATION == 1) {
+	print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy');
+
+	print '<span class="opacitymedium">'.$langs->trans("SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices")."</span>\n";
+	print "<br>";
+} elseif ($conf->accounting->enabled) {
 	$step = 0;
 
 	$resultboxes = FormOther::getBoxesArea($user, "27"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
@@ -95,7 +100,7 @@ if ($conf->accounting->enabled) {
 		$showtutorial .= ' '.$langs->trans("ShowTutorial");
 		$showtutorial .= '</a></div>';
 
-		$showtutorial .= '<script type="text/javascript" language="javascript">
+		$showtutorial .= '<script type="text/javascript">
 	    jQuery(document).ready(function() {
 	        jQuery("#show_hide").click(function () {
 	            jQuery( "#idfaq" ).toggle({
@@ -258,7 +263,8 @@ if ($conf->accounting->enabled) {
 } else {
 	print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy');
 
-	print '<span class="opacitymedium">'.$langs->trans("Module10Desc")."</span><br>\n";
+	print '<span class="opacitymedium">'.$langs->trans("Module10Desc")."</span>\n";
+	print "<br>";
 }
 
 // End of page
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index bdda4583d54..49d379802fb 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2011       Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2013       Christophe Battarel     <christophe.battarel@altairis.fr>
- * Copyright (C) 2013-2019  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2021  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2013-2014  Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2014  Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2017-2021  Frédéric France         <frederic.france@netlogic.fr>
@@ -119,7 +119,14 @@ if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))
 
 $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 .= " ba.courant, ba.ref as baref, ba.account_number, ba.fk_accountancy_journal,";
-$sql .= " soc.code_compta, soc.code_compta_fournisseur, soc.rowid as socid, soc.nom as name, soc.email as email, bu1.type as typeop_company,";
+$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)) {
+	$sql .= " spe.accountancy_code_customer as code_compta,";
+	$sql .= " spe.accountancy_code_supplier as code_compta_fournisseur,";
+} else {
+	$sql .= " soc.code_compta,";
+	$sql .= " soc.code_compta_fournisseur,";
+}
 $sql .= " u.accountancy_code, u.rowid as userid, u.lastname as lastname, u.firstname as firstname, u.email as useremail, u.statut as userstatus,";
 $sql .= " bu2.type as typeop_user,";
 $sql .= " bu3.type as typeop_payment, bu4.type as typeop_payment_supplier";
@@ -130,6 +137,9 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu2 ON bu2.fk_bank = b.rowid A
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu3 ON bu3.fk_bank = b.rowid AND bu3.type='payment'";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu4 ON bu4.fk_bank = b.rowid AND bu4.type='payment_supplier'";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc on bu1.url_id=soc.rowid";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = soc.rowid AND spe.entity = " . ((int) $conf->entity);
+}
 $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
@@ -362,12 +372,12 @@ if ($result) {
 
 					// Retrieve the accounting code of the social contribution of the payment from link of payment.
 					// Note: We have the social contribution id, it can be faster to get accounting code from social contribution id.
-					$sqlmid = 'SELECT cchgsoc.accountancy_code';
+					$sqlmid = "SELECT cchgsoc.accountancy_code";
 					$sqlmid .= " FROM ".MAIN_DB_PREFIX."c_chargesociales cchgsoc";
-					$sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."chargesociales as chgsoc ON chgsoc.fk_type=cchgsoc.id";
-					$sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."paiementcharge as paycharg ON paycharg.fk_charge=chgsoc.rowid";
+					$sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."chargesociales as chgsoc ON chgsoc.fk_type = cchgsoc.id";
+					$sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."paiementcharge as paycharg ON paycharg.fk_charge = chgsoc.rowid";
 					$sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."bank_url as bkurl ON bkurl.url_id=paycharg.rowid AND bkurl.type = 'payment_sc'";
-					$sqlmid .= " WHERE bkurl.fk_bank=".$obj->rowid;
+					$sqlmid .= " WHERE bkurl.fk_bank = ".((int) $obj->rowid);
 
 					dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=".$sqlmid, LOG_DEBUG);
 					$resultmid = $db->query($sqlmid);
@@ -1019,7 +1029,7 @@ if (empty($action) || $action == 'view') {
 
 
 	// 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 FROM '.MAIN_DB_PREFIX.'bank_account WHERE entity = '.$conf->entity.' AND fk_accountancy_journal IS NULL AND clos=0';
+	$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."bank_account WHERE entity = ".((int) $conf->entity)." AND fk_accountancy_journal IS NULL AND clos=0";
 	$resql = $db->query($sql);
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 9a65844871d..34ba4ae6337 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -105,7 +105,14 @@ if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))
 
 $sql = "SELECT f.rowid, f.ref as ref, f.type, f.datef as df, f.libelle,f.ref_supplier, f.date_lim_reglement as dlr, f.close_code,";
 $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.tva as total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.vat_src_code,";
-$sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
+$sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur,";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= " spe.accountancy_code_customer as code_compta,";
+	$sql .= " spe.accountancy_code_supplier as code_compta_fournisseur,";
+} else {
+	$sql .= " s.code_compta as code_compta,";
+	$sql .= " s.code_compta_fournisseur,";
+}
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 	$sql .= " ppe.accountancy_code_buy,";
 } else {
@@ -120,6 +127,9 @@ if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = fd.fk_facture_fourn";
 $sql .= " JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+}
 $sql .= " WHERE f.fk_statut > 0";
 $sql .= " AND fd.fk_code_ventilation > 0";
 $sql .= " AND f.entity IN (".getEntity('facture_fourn', 0).")"; // We don't share object for accountancy
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index bd476173427..ad1b7501a91 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -107,7 +107,14 @@ if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))
 
 $sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.ref_client, f.date_lim_reglement as dlr, f.close_code,";
 $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.situation_percent, fd.vat_src_code,";
-$sql .= " s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
+$sql .= " s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur,";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= " spe.accountancy_code_customer as code_compta,";
+	$sql .= " spe.accountancy_code_supplier as code_compta_fournisseur,";
+} else {
+	$sql .= " s.code_compta as code_compta,";
+	$sql .= " s.code_compta_fournisseur,";
+}
 $sql .= " p.rowid as pid, p.ref as pref, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte,";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 	$sql .= " ppe.accountancy_code_sell";
@@ -122,6 +129,9 @@ if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
 $sql .= " JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+}
 $sql .= " WHERE fd.fk_code_ventilation > 0";
 $sql .= " AND f.entity IN (".getEntity('invoice', 0).')'; // We don't share object for accountancy, we use source object sharing
 $sql .= " AND f.fk_statut > 0";
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index 1e7887c1bdc..05d32d0cec5 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -118,7 +118,7 @@ if (!empty($id)) {
 	$sql .= " WHERE f.fk_statut > 0 AND l.rowid = ".((int) $id);
 	$sql .= " AND f.entity IN (".getEntity('facture_fourn', 0).")"; // We don't share object for accountancy
 
-	dol_syslog("/accounting/supplier/card.php sql=".$sql, LOG_DEBUG);
+	dol_syslog("/accounting/supplier/card.php", LOG_DEBUG);
 	$result = $db->query($sql);
 
 	if ($result) {
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 585121f7c36..70434a470f1 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-2014 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2020 Alexandre Spangaro	<aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2021 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>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -29,10 +29,14 @@ 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.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "other", "accountancy"));
 
+$validatemonth = GETPOST('validatemonth', 'int');
+$validateyear = GETPOST('validateyear', 'int');
+
 // Security check
 if (empty($conf->accounting->enabled)) {
 	accessforbidden();
@@ -40,10 +44,11 @@ if (empty($conf->accounting->enabled)) {
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (!$user->rights->accounting->bind->write) {
+if (empty($user->rights->accounting->bind->write)) {
 	accessforbidden();
 }
 
+$accountingAccount = new AccountingAccount($db);
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) {
@@ -97,6 +102,7 @@ if (($action == 'clean' || $action == 'validatehistory') && $user->rights->accou
 	$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid='.$conf->global->CHARTOFACCOUNTS.' AND accnt.entity = '.$conf->entity.')';
 	$sql1 .= ' AND fd.fk_facture_fourn IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'facture_fourn WHERE entity = '.$conf->entity.')';
 	$sql1 .= ' AND fk_code_ventilation <> 0';
+
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
 	$resql1 = $db->query($sql1);
 	if (!$resql1) {
@@ -111,6 +117,9 @@ if (($action == 'clean' || $action == 'validatehistory') && $user->rights->accou
 
 if ($action == 'validatehistory') {
 	$error = 0;
+	$nbbinddone = 0;
+	$notpossible = 0;
+
 	$db->begin();
 
 	// Now make the binding. Bind automatically only for product with a dedicated account that exists into chart of account, others need a manual bind
@@ -146,7 +155,6 @@ if ($action == 'validatehistory') {
 	} else {
 		$sql .= " s.accountancy_code_buy as company_code_buy";
 	}
-
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 	if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
@@ -163,12 +171,14 @@ 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_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 .= " 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);
 	if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
 		$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
 	}
+	if ($validatemonth && $validateyear) {
+		$sql .= dolSqlDateFilter('f.datef', 0, $validatemonth, $validateyear);
+	}
 
 	dol_syslog('htdocs/accountancy/supplier/index.php');
 
@@ -181,61 +191,108 @@ if ($action == 'validatehistory') {
 
 		$isBuyerInEEC = isInEEC($mysoc);
 
+		$thirdpartystatic = new Societe($db);
+		$facture_static = new FactureFournisseur($db);
+		$facture_static_det = new SupplierInvoiceLine($db);
+		$product_static = new Product($db);
+
 		$i = 0;
 		while ($i < min($num_lines, 10000)) {	// No more than 10000 at once
 			$objp = $db->fetch_object($result);
 
-			$isSellerInEEC = isInEEC($objp);
+			$thirdpartystatic->id = $objp->socid;
+			$thirdpartystatic->name = $objp->name;
+			$thirdpartystatic->client = $objp->client;
+			$thirdpartystatic->fournisseur = $objp->fournisseur;
+			$thirdpartystatic->code_client = $objp->code_client;
+			$thirdpartystatic->code_compta_client = $objp->code_compta_client;
+			$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
+			$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
+			$thirdpartystatic->email = $objp->email;
+			$thirdpartystatic->country_code = $objp->country_code;
+			$thirdpartystatic->tva_intra = $objp->tva_intra;
+			$thirdpartystatic->code_compta_product = $objp->company_code_buy;		// The accounting account for product stored on thirdparty object (for level3 suggestion)
 
-			// Level 2: Search suggested account for product/service (similar code exists in page list.php to make manual binding)
-			$suggestedaccountingaccountfor = '';
-			if (($objp->country_code == $mysoc->country_code) || empty($objp->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
-				$objp->code_buy_p = $objp->code_buy;
-				$objp->aarowid_suggest = $objp->aarowid;
-				$suggestedaccountingaccountfor = '';
+			$product_static->ref = $objp->product_ref;
+			$product_static->id = $objp->product_id;
+			$product_static->type = $objp->type;
+			$product_static->label = $objp->product_label;
+			$product_static->status = $objp->status;
+			$product_static->status_buy = $objp->status_buy;
+			$product_static->accountancy_code_sell = $objp->code_sell;
+			$product_static->accountancy_code_sell_intra = $objp->code_sell_intra;
+			$product_static->accountancy_code_sell_export = $objp->code_sell_export;
+			$product_static->accountancy_code_buy = $objp->code_buy;
+			$product_static->accountancy_code_buy_intra = $objp->code_buy_intra;
+			$product_static->accountancy_code_buy_export = $objp->code_buy_export;
+			$product_static->tva_tx = $objp->tva_tx_prod;
+
+			$facture_static->ref = $objp->ref;
+			$facture_static->id = $objp->facid;
+			$facture_static->type = $objp->ftype;
+			$facture_static->date = $objp->datef;
+
+			$facture_static_det->id = $objp->rowid;
+			$facture_static_det->total_ht = $objp->total_ht;
+			$facture_static_det->tva_tx = $objp->tva_tx_line;
+			$facture_static_det->vat_src_code = $objp->vat_src_code;
+			$facture_static_det->product_type = $objp->type_l;
+			$facture_static_det->desc = $objp->description;
+
+			$accountingAccountArray = array(
+				'dom'=>$objp->aarowid,
+				'intra'=>$objp->aarowid_intra,
+				'export'=>$objp->aarowid_export,
+				'thirdparty' =>$objp->aarowid_thirdparty);
+
+			$code_buy_p_notset = '';
+			$code_buy_t_notset = '';
+
+			$suggestedid = 0;
+
+			$return = $accountingAccount->getAccountingCodeToBind($mysoc, $thirdpartystatic, $product_static, $facture_static, $facture_static_det, $accountingAccountArray, 'supplier');
+			if (!is_array($return) && $return<0) {
+				setEventMessage($accountingAccount->error, 'errors');
 			} else {
-				if ($isSellerInEEC && $isBuyerInEEC) {          // European intravat sale
-					$objp->code_buy_p = $objp->code_buy_intra;
-					$objp->aarowid_suggest = $objp->aarowid_intra;
-					$suggestedaccountingaccountfor = 'eec';
-				} else {                                        // Foreign sale
-					$objp->code_buy_p = $objp->code_buy_export;
-					$objp->aarowid_suggest = $objp->aarowid_export;
-					$suggestedaccountingaccountfor = 'export';
+				$suggestedid = $return['suggestedid'];
+				$suggestedaccountingaccountfor = $return['suggestedaccountingaccountfor'];
+
+				if (!empty($suggestedid) && $suggestedaccountingaccountfor != '' && $suggestedaccountingaccountfor != 'eecwithoutvatnumber') {
+					$suggestedid = $return['suggestedid'];
+				} else {
+					$suggestedid = 0;
 				}
 			}
 
-			if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
-				// Level 3: Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
-				if (!empty($objp->company_code_buy)) {
-					$objp->code_buy_t = $objp->company_code_buy;
-					$objp->aarowid_suggest = $objp->aarowid_thirdparty;
-					$suggestedaccountingaccountfor = '';
-				}
-			}
-
-			if ($objp->aarowid_suggest > 0) {
+			if ($suggestedid > 0) {
 				$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
-				$sqlupdate .= " SET fk_code_ventilation = ".((int) $objp->aarowid_suggest);
-				$sqlupdate .= " WHERE fk_code_ventilation <= 0 AND product_type <= 2 AND rowid = ".((int) $objp->rowid);
+				$sqlupdate .= " SET fk_code_ventilation = ".((int) $suggestedid);
+				$sqlupdate .= " WHERE fk_code_ventilation <= 0 AND product_type <= 2 AND rowid = ".((int) $facture_static_det->id);
 
 				$resqlupdate = $db->query($sqlupdate);
 				if (!$resqlupdate) {
 					$error++;
 					setEventMessages($db->lasterror(), null, 'errors');
 					break;
+				} else {
+					$nbbinddone++;
 				}
+			} else {
+				$notpossible++;
 			}
 
 			$i++;
 		}
+		if ($num_lines > 10000) {
+			$notpossible += ($num_lines - 10000);
+		}
 	}
 
 	if ($error) {
 		$db->rollback();
 	} else {
 		$db->commit();
-		setEventMessages($langs->trans('AutomaticBindingDone'), null, 'mesgs');
+		setEventMessages($langs->trans('AutomaticBindingDone', 	$nbbinddone, $notpossible), null, 'mesgs');
 	}
 }
 
@@ -257,22 +314,39 @@ print '</span><br>';
 
 $y = $year_current;
 
-$buttonbind = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?year='.$year_current.'&action=validatehistory">'.$langs->trans("ValidateHistory").'</a>';
+$buttonbind = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&token='.newToken().'">'.$langs->trans("ValidateHistory").'</a>';
 
 
-print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
+print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
 //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="minwidth100">'.$langs->trans("Account").'</td>';
-print '<td class="left">'.$langs->trans("Label").'</td>';
+print '<td>'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
 	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'];
+		print '<a href="'.DOL_URL_ROOT.'/accountancy/supplier/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>';
 
@@ -283,7 +357,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= "  SUM(".$db->ifsql('MONTH(ff.datef)='.$j, 'ffd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+	$sql .= "  SUM(".$db->ifsql("MONTH(ff.datef)=".$j, "ffd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(ffd.total_ht) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as ffd";
@@ -307,28 +381,36 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 
 	while ($row = $db->fetch_row($resql)) {
-		print '<tr class="oddeven"><td>';
+		print '<tr class="oddeven">';
+		print '<td>';
 		if ($row[0] == 'tobind') {
 			print '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>';
 		} else {
 			print length_accountg($row[0]);
 		}
 		print '</td>';
-		print '<td class="left">';
+		print '<td>';
 		if ($row[0] == 'tobind') {
-			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("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 <= 12; $i++) {
-			print '<td class="right nowraponall amount">'.price($row[$i]).'</td>';
+		for ($i = 2; $i <= 13; $i++) {
+			print '<td class="right nowraponall amount">';
+			print price($row[$i]);
+			print '</td>';
 		}
-		print '<td class="right nowraponall amount">'.price($row[13]).'</td>';
 		print '<td class="right nowraponall amount"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
+
+	if ($num == 0) {
+		print '<tr class="oddeven"><td colspan="16">';
+		print '<span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span>';
+		print '</td></tr>';
+	}
 } else {
 	print $db->lasterror(); // Show last sql error
 }
@@ -339,19 +421,36 @@ print '</div>';
 print '<br>';
 
 
-print_barre_liste($langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+print_barre_liste(img_picto('', 'link', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
 //print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="minwidth100">'.$langs->trans("Account").'</td>';
-print '<td class="left">'.$langs->trans("Label").'</td>';
+print '<td>'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
 	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'];
+		print '<a href="'.DOL_URL_ROOT.'/accountancy/supplier/lines.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>';
 
@@ -362,7 +461,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	$sql .= "  SUM(".$db->ifsql('MONTH(ff.datef)='.$j, 'ffd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+	$sql .= "  SUM(".$db->ifsql("MONTH(ff.datef)=".$j, "ffd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(ffd.total_ht) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as ffd";
@@ -386,28 +485,36 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 
 	while ($row = $db->fetch_row($resql)) {
-		print '<tr class="oddeven"><td>';
+		print '<tr class="oddeven">';
+		print '<td>';
 		if ($row[0] == 'tobind') {
 			print $langs->trans("Unknown");
 		} else {
 			print length_accountg($row[0]);
 		}
 		print '</td>';
-		print '<td class="left">';
+		print '<td>';
 		if ($row[0] == 'tobind') {
-			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("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 <= 12; $i++) {
-			print '<td class="right nowraponall amount">'.price($row[$i]).'</td>';
+		for ($i = 2; $i <= 13; $i++) {
+			print '<td class="right nowraponall amount">';
+			print price($row[$i]);
+			print '</td>';
 		}
-		print '<td class="right nowraponall amount">'.price($row[13]).'</td>';
 		print '<td class="right nowraponall amount"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
+
+	if ($num == 0) {
+		print '<tr class="oddeven"><td colspan="16">';
+		print '<span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span>';
+		print '</td></tr>';
+	}
 } else {
 	print $db->lasterror(); // Show last sql error
 }
@@ -425,7 +532,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
 
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="left">'.$langs->trans("Total").'</td>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Total").'</td>';
 	for ($i = 1; $i <= 12; $i++) {
 		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
 		if ($j > 12) {
@@ -441,7 +548,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
 		if ($j > 12) {
 			$j -= 12;
 		}
-		$sql .= "  SUM(".$db->ifsql('MONTH(ff.datef)='.$j, 'ffd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+		$sql .= "  SUM(".$db->ifsql("MONTH(ff.datef)=".$j, "ffd.total_ht", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
 	}
 	$sql .= "  SUM(ffd.total_ht) as total";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as ffd";
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 61e17ab669c..b7d0a0423f3 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -202,7 +202,14 @@ if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 	$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export,";
 }
 $sql .= " co.code as country_code, co.label as country,";
-$sql .= " s.rowid as socid, s.nom as name, s.tva_intra, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur";
+$sql .= " s.rowid as socid, s.nom as name, s.tva_intra, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= ", spe.accountancy_code_customer as code_compta_client";
+	$sql .= ", spe.accountancy_code_supplier as code_compta_fournisseur";
+} else {
+	$sql .= ", s.code_compta as code_compta_client";
+	$sql .= ", s.code_compta_fournisseur";
+}
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
@@ -214,6 +221,9 @@ if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = l.fk_code_ventilation";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = l.fk_facture_fourn";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";
 // Add search filter like
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 90e44617b05..6364ce914c6 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2013-2014	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-2014	Florian Henry			<florian.henry@open-concept.pro>
+ * 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>
  *
@@ -46,6 +46,7 @@ $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
+$optioncss = GETPOST('optioncss', 'alpha');
 
 // Select Box
 $mesCasesCochees = GETPOST('toselect', 'array');
@@ -97,10 +98,7 @@ if (!$sortorder) {
 $hookmanager->initHooks(array('accountancysupplierlist'));
 
 $formaccounting = new FormAccounting($db);
-$accounting = new AccountingAccount($db);
-// TODO: we should need to check if result is a really exist accountaccount rowid.....
-$aarowid_s = $accounting->fetch('', $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT, 1);
-$aarowid_p = $accounting->fetch('', $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT, 1);
+$accountingAccount = new AccountingAccount($db);
 
 $chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
 
@@ -193,7 +191,7 @@ if ($massaction == 'ventil' && $user->rights->accounting->bind->write) {
 				$accountventilated = new AccountingAccount($db);
 				$accountventilated->fetch($monCompte, '', 1);
 
-				dol_syslog('accountancy/supplier/list.php sql='.$sql, LOG_DEBUG);
+				dol_syslog('accountancy/supplier/list.php', LOG_DEBUG);
 				if ($db->query($sql)) {
 					$msg .= '<div><span style="color:green">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'</span></div>';
 					$ok++;
@@ -243,10 +241,14 @@ if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 $sql .= " p.tosell as status, p.tobuy as status_buy,";
 $sql .= " aa.rowid as aarowid, aa2.rowid as aarowid_intra, aa3.rowid as aarowid_export, aa4.rowid as aarowid_thirdparty,";
 $sql .= " co.code as country_code, co.label as country_label,";
-$sql .= " s.rowid as socid, s.nom as name, s.tva_intra, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,";
+$sql .= " s.rowid as socid, s.nom as name, s.tva_intra, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur,";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= " spe.accountancy_code_customer as code_compta_client,";
+	$sql .= " spe.accountancy_code_supplier as code_compta_fournisseur,";
 	$sql .= " spe.accountancy_code_buy as company_code_buy";
 } else {
+	$sql .= " s.code_compta as code_compta_client,";
+	$sql .= " s.code_compta_fournisseur,";
 	$sql .= " s.accountancy_code_buy as company_code_buy";
 }
 $parameters = array();
@@ -289,7 +291,7 @@ if (strlen(trim($search_ref))) {
 	$sql .= natural_search("p.ref", $search_ref);
 }
 if (strlen(trim($search_label))) {
-	$sql .= natural_search("f.libelle", $search_label);
+	$sql .= natural_search(array("p.label", "f.libelle"), $search_label);
 }
 if (strlen(trim($search_desc))) {
 	$sql .= natural_search("l.description", $search_desc);
@@ -518,20 +520,21 @@ if ($result) {
 
 	$thirdpartystatic = new Societe($db);
 	$facturefourn_static = new FactureFournisseur($db);
+	$facturefourn_static_det = new SupplierInvoiceLine($db);
 	$product_static = new Product($db);
 
-	$isBuyerInEEC = isInEEC($mysoc);
 
 	$accountingaccount_codetotid_cache = array();
 
 	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
 
-		// product_type: 0 = service ? 1 = product
+		// product_type: 0 = service, 1 = product
 		// if product does not exist we use the value of product_type provided in facturedet to define if this is a product or service
 		// issue : if we change product_type value in product DB it should differ from the value stored in facturedet DB !
-		$objp->code_buy_l = '';
-		$objp->code_buy_p = '';
+		$code_buy_l = '';
+		$code_buy_p = '';
+		$code_buy_t = '';
 
 		$thirdpartystatic->id = $objp->socid;
 		$thirdpartystatic->name = $objp->name;
@@ -543,6 +546,8 @@ if ($result) {
 		$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 		$thirdpartystatic->email = $objp->email;
 		$thirdpartystatic->country_code = $objp->country_code;
+		$thirdpartystatic->tva_intra = $objp->tva_intra;
+		$thirdpartystatic->code_compta_product = $objp->company_code_buy;		// The accounting account for product stored on thirdparty object (for level3 suggestion)
 
 		$product_static->ref = $objp->product_ref;
 		$product_static->id = $objp->product_id;
@@ -556,95 +561,66 @@ if ($result) {
 		$product_static->accountancy_code_buy = $objp->code_buy;
 		$product_static->accountancy_code_buy_intra = $objp->code_buy_intra;
 		$product_static->accountancy_code_buy_export = $objp->code_buy_export;
+		$product_static->tva_tx = $objp->tva_tx_prod;
 
 		$facturefourn_static->ref = $objp->ref;
 		$facturefourn_static->id = $objp->facid;
 		$facturefourn_static->type = $objp->ftype;
 		$facturefourn_static->label = $objp->invoice_label;
+		$facturefourn_static->date = $db->jdate($objp->datef);
+
+		$facturefourn_static_det->id = $objp->rowid;
+		$facturefourn_static_det->total_ht = $objp->total_ht;
+		$facturefourn_static_det->tva_tx = $objp->tva_tx_line;
+		$facturefourn_static_det->vat_src_code = $objp->vat_src_code;
+		$facturefourn_static_det->product_type = $objp->type_l;
+		$facturefourn_static_det->desc = $objp->description;
+
+		$accountingAccountArray = array(
+			'dom'=>$objp->aarowid,
+			'intra'=>$objp->aarowid_intra,
+			'export'=>$objp->aarowid_export,
+			'thirdparty' =>$objp->aarowid_thirdparty);
 
 		$code_buy_p_notset = '';
 		$code_buy_t_notset = '';
-		$objp->aarowid_suggest = ''; // Will be set later
 
-		$isSellerInEEC = isInEEC($objp);
+		$suggestedid = 0;
 
-		// Level 1: Search suggested default account for product/service
-		$suggestedaccountingaccountbydefaultfor = '';
-		if ($objp->type_l == 1) {
-			if ($objp->country_code == $mysoc->country_code || empty($objp->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
-				$objp->code_buy_l = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : '');
-				$suggestedaccountingaccountbydefaultfor = '';
-			} else {
-				if ($isSellerInEEC && $isBuyerInEEC) {          // European intravat sale
-					$objp->code_buy_l = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT : '');
-					$suggestedaccountingaccountbydefaultfor = 'eec';
-				} else {                                        // Foreign sale
-					$objp->code_buy_l = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT : '');
-					$suggestedaccountingaccountbydefaultfor = 'export';
-				}
-			}
-		} elseif ($objp->type_l == 0) {
-			if ($objp->country_code == $mysoc->country_code || empty($objp->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
-				$objp->code_buy_l = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : '');
-				$suggestedaccountingaccountbydefaultfor = '';
-			} else {
-				if ($isSellerInEEC && $isBuyerInEEC) {          // European intravat sale
-					$objp->code_buy_l = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT : '');
-					$suggestedaccountingaccountbydefaultfor = 'eec';
-				} else {
-					$objp->code_buy_l = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT : '');
-					$suggestedaccountingaccountbydefaultfor = 'export';
-				}
-			}
-		}
-		if ($objp->code_sell_l == -1) {
-			$objp->code_sell_l = '';
-		}
-
-		// Level 2: Search suggested account for product/service (similar code exists in page index.php to make automatic binding)
-		$suggestedaccountingaccountfor = '';
-		if (($objp->country_code == $mysoc->country_code) || empty($objp->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
-			$objp->code_buy_p = $objp->code_buy;
-			$objp->aarowid_suggest = $objp->aarowid;
-			$suggestedaccountingaccountfor = '';
+		$return=$accountingAccount->getAccountingCodeToBind($mysoc, $thirdpartystatic, $product_static, $facturefourn_static, $facturefourn_static_det, $accountingAccountArray, 'supplier');
+		if (!is_array($return) && $return<0) {
+			setEventMessage($accountingAccount->error, 'errors');
 		} else {
-			if ($isSellerInEEC && $isBuyerInEEC) {          // European intravat sale
-				$objp->code_buy_p = $objp->code_buy_intra;
-				$objp->aarowid_suggest = $objp->aarowid_intra;
-				$suggestedaccountingaccountfor = 'eec';
-			} else {                                        // Foreign sale
-				$objp->code_buy_p = $objp->code_buy_export;
-				$objp->aarowid_suggest = $objp->aarowid_export;
-				$suggestedaccountingaccountfor = 'export';
-			}
+			$suggestedid=$return['suggestedid'];
+			$suggestedaccountingaccountfor=$return['suggestedaccountingaccountfor'];
+			$suggestedaccountingaccountbydefaultfor=$return['suggestedaccountingaccountbydefaultfor'];
+			$code_buy_l=$return['code_l'];
+			$code_buy_p=$return['code_p'];
+			$code_buy_t=$return['code_t'];
 		}
+		//var_dump($return);
 
-		// Level 3: Search suggested account for this thirdparty (similar code exists in page index.php to make automatic binding)
-		if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
-			if (!empty($objp->company_code_buy)) {
-				$objp->code_buy_t = $objp->company_code_buy;
-				$objp->aarowid_suggest = $objp->aarowid_thirdparty;
-				$suggestedaccountingaccountfor = '';
-			}
-		}
-
-		if (!empty($objp->code_buy_p)) {
+		if (!empty($code_buy_p)) {
 			// Value was defined previously
 		} else {
 			$code_buy_p_notset = 'color:orange';
 		}
-		if (empty($objp->code_buy_l) && empty($objp->code_buy_p)) {
+		if (empty($code_buy_l) && empty($code_buy_p)) {
 			$code_buy_p_notset = 'color:red';
 		}
+		/*if ($suggestedaccountingaccountfor == 'eecwithoutvatnumber' && empty($code_sell_p_notset)) {
+			$code_sell_p_notset = 'color:orange';
+		}*/
 
-		// $objp->code_buy_l is now default code of product/service
-		// $objp->code_buy_p is now code of product/service
-		// $objp->code_buy_t is now code of thirdparty
+		// $code_buy_l is now default code of product/service
+		// $code_buy_p is now code of product/service
+		// $code_buy_t is now code of thirdparty
+		//var_dump($code_buy_l.' - '.$code_buy_p.' - '.$code_buy_t.' -> '.$suggestedid.' ('.$suggestedaccountingaccountbydefaultfor.' '.$suggestedaccountingaccountfor.')');
 
 		print '<tr class="oddeven">';
 
 		// Line id
-		print '<td>'.$objp->rowid.'</td>';
+		print '<td>'.$facturefourn_static_det->id.'</td>';
 
 		// Ref Invoice
 		print '<td class="nowraponall">'.$facturefourn_static->getNomUrl(1).'</td>';
@@ -654,23 +630,23 @@ if ($result) {
 		print '</td>';
 		*/
 
-		print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day').'</td>';
+		print '<td class="center">'.dol_print_date($facturefourn_static->date, 'day').'</td>';
 
 		// Ref Product
 		print '<td class="tdoverflowmax150">';
 		if ($product_static->id > 0) {
 			print $product_static->getNomUrl(1);
 		}
-		if ($objp->product_label) {
-			print '<br><span class="opacitymedium small">'.$objp->product_label.'</span>';
+		if ($product_static->label) {
+			print '<br><span class="opacitymedium small">'.$product_static->label.'</span>';
 		}
 		print '</td>';
 
 		// Description
 		print '<td class="tdoverflowonsmartphone small">';
-		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
+		$text = dolGetFirstLineOfText(dol_string_nohtmltag($facturefourn_static_det->desc));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
-		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
+		print $form->textwithtooltip(dol_trunc($text, $trunclength), $facturefourn_static_det->desc);
 		print '</td>';
 
 		print '<td class="right nowraponall amount">';
@@ -678,11 +654,12 @@ if ($result) {
 		print '</td>';
 
 		// Vat rate
-		if ($objp->vat_tx_l != $objp->vat_tx_p) {
-			$code_vat_differ = 'font-weight:bold; text-decoration:blink; color:red';
+		$code_vat_differ = '';
+		if ($objp->vat_tx_l != $objp->vat_tx_p && price2num($objp->vat_tx_p) && price2num($objp->vat_tx_l)) {	// Note: having a vat rate of 0 is often the normal case when sells is intra b2b or to export
+			$code_vat_differ = 'warning bold';
 		}
-		print '<td style="'.$code_vat_differ.'" class="right">';
-		print vatrate($objp->tva_tx_line.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : ''));
+		print '<td class="right'.($code_vat_differ?' '.$code_vat_differ:'').'">';
+		print vatrate($facturefourn_static_det->tva_tx.($facturefourn_static_det->vat_src_code ? ' ('.$facturefourn_static_det->vat_src_code.')' : ''));
 		print '</td>';
 
 		// Thirdparty
@@ -699,26 +676,31 @@ if ($result) {
 
 		// Found accounts
 		print '<td class="small">';
-		$s = '1. '.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
+		$s = '1. '.(($facturefourn_static_det->product_type == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
 		$shelp = '';
 		if ($suggestedaccountingaccountbydefaultfor == 'eec') {
 			$shelp .= $langs->trans("SaleEEC");
 		} elseif ($suggestedaccountingaccountbydefaultfor == 'export') {
 			$shelp .= $langs->trans("SaleExport");
 		}
-		$s .= ($objp->code_buy_l > 0 ? length_accountg($objp->code_buy_l) : '<span style="'.$code_buy_p_notset.'">'.$langs->trans("NotDefined").'</span>');
+		$s .= ($code_buy_l > 0 ? length_accountg($code_buy_l) : '<span style="'.$code_buy_p_notset.'">'.$langs->trans("NotDefined").'</span>');
 		print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
-		if ($objp->product_id > 0) {
+		if ($product_static->id > 0) {
 			print '<br>';
-			$s = '2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
-			$shelp = '';
+			$s = '2. '.(($facturefourn_static_det->product_type == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
+			$shelp = ''; $ttype = 'help';
 			if ($suggestedaccountingaccountfor == 'eec') {
 				$shelp = $langs->trans("SaleEEC");
+			} elseif ($suggestedaccountingaccountfor == 'eecwithvat') {
+				$shelp = $langs->trans("SaleEECWithVAT");
+			} elseif ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') {
+				$shelp = $langs->trans("SaleEECWithoutVATNumber");
+				$ttype = 'warning';
 			} elseif ($suggestedaccountingaccountfor == 'export') {
 				$shelp = $langs->trans("SaleExport");
 			}
-			$s .= (empty($objp->code_buy_p) ? '<span style="'.$code_buy_p_notset.'">'.$langs->trans("NotDefined").'</span>' : length_accountg($objp->code_buy_p));
-			print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
+			$s .= (empty($code_buy_p) ? '<span style="'.$code_buy_p_notset.'">'.$langs->trans("NotDefined").'</span>' : length_accountg($code_buy_p));
+			print $form->textwithpicto($s, $shelp, 1, $ttype, '', 0, 2, '', 1);
 		} else {
 			print '<br>';
 			$s = '2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
@@ -728,35 +710,25 @@ if ($result) {
 		}
 		if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
 			print '<br>';
-			$s = '3. '.(($objp->type_l == 1) ? $langs->trans("ServiceForThisThirdparty") : $langs->trans("ProductForThisThirdparty")).': ';
+			$s = '3. '.(($facturefourn_static_det->product_type == 1) ? $langs->trans("ServiceForThisThirdparty") : $langs->trans("ProductForThisThirdparty")).': ';
 			$shelp = '';
-			$s .= ($objp->code_buy_t > 0 ? length_accountg($objp->code_buy_t) : '<span style="'.$code_buy_t_notset.'">'.$langs->trans("NotDefined").'</span>');
+			$s .= ($code_buy_t > 0 ? length_accountg($code_buy_t) : '<span style="'.$code_buy_t_notset.'">'.$langs->trans("NotDefined").'</span>');
 			print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
 		}
 		print '</td>';
 
 		// Suggested accounting account
 		print '<td>';
-		$suggestedid = $objp->aarowid_suggest;
-		if (empty($suggestedid) && empty($objp->code_buy_p) && !empty($objp->code_buy_l) && empty($conf->global->ACCOUNTANCY_DO_NOT_AUTOFILL_ACCOUNT_WITH_GENERIC)) {
-			if (empty($accountingaccount_codetotid_cache[$objp->code_buy_l])) {
-				$tmpaccount = new AccountingAccount($db);
-				$tmpaccount->fetch(0, $objp->code_buy_l, 1);
-				if ($tmpaccount->id > 0) {
-					$suggestedid = $tmpaccount->id;
-				}
-				$accountingaccount_codetotid_cache[$objp->code_buy_l] = $tmpaccount->id;
-			} else {
-				$suggestedid = $accountingaccount_codetotid_cache[$objp->code_buy_l];
-			}
-		}
-		print $formaccounting->select_account($suggestedid, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formaccounting->select_account($suggestedid, 'codeventil'.$facturefourn_static_det->id, 1, array(), 0, 0, 'codeventil maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
 
 		// Column with checkbox
 		print '<td class="center">';
-		$ischecked = $objp->aarowid_suggest;
-		print '<input type="checkbox" class="flat checkforselect checkforselect'.$objp->rowid.'" name="toselect[]" value="'.$objp->rowid."_".$i.'"'.($ischecked ? "checked" : "").'/>';
+		$ischecked = 0;
+		if (!empty($suggestedid) && $suggestedaccountingaccountfor != '' && $suggestedaccountingaccountfor != 'eecwithoutvatnumber') {
+			$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>';
 
 		print '</tr>';
@@ -775,7 +747,7 @@ if ($db->type == 'mysqli') {
 }
 
 // Add code to auto check the box when we select an account
-print '<script type="text/javascript" language="javascript">
+print '<script type="text/javascript">
 jQuery(document).ready(function() {
 	jQuery(".codeventil").change(function() {
 		var s=$(this).attr("id").replace("codeventil", "")
diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
index f9e5388d735..39587521c4d 100644
--- a/htdocs/adherents/admin/member.php
+++ b/htdocs/adherents/admin/member.php
@@ -404,13 +404,13 @@ foreach ($dirmodels as $reldir) {
 								// Active
 								if (in_array($name, $def)) {
 									print '<td class="center">'."\n";
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&amp;token='.newToken().'&amp;value='.$name.'">';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&token='.newToken().'&value='.$name.'">';
 									print img_picto($langs->trans("Enabled"), 'switch_on');
 									print '</a>';
 									print '</td>';
 								} else {
 									print '<td class="center">'."\n";
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<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 "</td>";
 								}
 
@@ -419,7 +419,7 @@ foreach ($dirmodels as $reldir) {
 								if ($conf->global->MEMBER_ADDON_PDF == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<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 '</td>';
 
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index e99e20452cc..ed09c206abf 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -113,7 +113,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print dol_get_fiche_head($head, 'website', $langs->trans("Members"), -1, 'user');
 
 if ($conf->use_javascript_ajax) {
-	print "\n".'<script type="text/javascript" language="javascript">';
+	print "\n".'<script type="text/javascript">';
 	print 'jQuery(document).ready(function () {
                 function initemail()
                 {
@@ -238,7 +238,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	print '</div>';
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 	print '</div>';
 }
 
@@ -265,7 +265,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 
 	print '<div class="urllink">';
 	print '<input type="text" id="publicurlmember" class="quatrevingtpercentminusx" value="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">';
-	print '<a target="_blank" href="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">'.img_picto('', 'globe', 'class="paddingleft"').'</a>';
+	print '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">'.img_picto('', 'globe', 'class="paddingleft"').'</a>';
 	print '</div>';
 	print ajax_autoselect('publicurlmember');
 }
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index 3f7114380f3..cb942ba3176 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -39,8 +39,8 @@ $langs->loadLangs(array("companies", "members"));
 $id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('rowid', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -136,7 +136,11 @@ if ($object->id > 0) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	dol_banner_tab($object, 'rowid', $linkback);
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/adherents/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, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
 	print '<div class="fichecenter">';
 
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index 2c0e1d992cc..265931c0265 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -104,7 +104,7 @@ abstract class ActionsAdherentCardCommon
 
 		if ($action == 'create' || $action == 'edit') {
 			if ($conf->use_javascript_ajax) {
-				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
+				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript">
 				jQuery(document).ready(function () {
 						jQuery("#selectcountry_id").change(function() {
 							document.formsoc.action.value="'.$action.'";
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
index 87b8a6874c4..419b32f3c34 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
@@ -31,8 +31,6 @@ print load_fiche_titre($this->control->tpl['title']);
 
 dol_htmloutput_errors((is_numeric($object->error) ? '' : $object->error), $object->errors);
 
-dol_htmloutput_errors((is_numeric($GLOBALS['error']) ? '' : $GLOBALS['error']), $GLOBALS['errors']);
-
 dol_htmloutput_errors($this->control->tpl['error'], $this->control->tpl['errors']);
 
 echo $this->control->tpl['ajax_selectcountry']; ?>
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
index 16e9dc1886a..696520f79d4 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
@@ -125,15 +125,15 @@ if (empty($user->socid)) {
 	echo '<div class="tabsAction">';
 
 	if ($user->rights->adherent->creer) {
-		echo '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=edit&amp;canvas='.$canvas.'">'.$langs->trans('Modify').'</a>';
+		echo '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&action=edit&token='.newToken().'&canvas='.$canvas.'">'.$langs->trans('Modify').'</a>';
 	}
 
 	if (!$this->control->tpl['user_id'] && $user->rights->user->user->creer) {
-		echo '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=create_user&amp;canvas='.$canvas.'">'.$langs->trans("CreateDolibarrLogin").'</a>';
+		echo '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&action=create_user&token='.newToken().'&canvas='.$canvas.'">'.$langs->trans("CreateDolibarrLogin").'</a>';
 	}
 
 	if ($user->rights->adherent->supprimer) {
-		echo '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas.'">'.$langs->trans('Delete').'</a>';
+		echo '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&action=delete&token='.newToken().'&canvas='.$canvas.'">'.$langs->trans('Delete').'</a>';
 	}
 
 	echo '</div><br>';
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index fd500b34775..a2e3779d52b 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -124,8 +124,23 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/adherents/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.'/adherents/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
 	if ($cancel) {
-		if (!empty($backtopage)) {
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -535,7 +550,7 @@ if (empty($reshook)) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 		}
-		if ($conf->global->ADHERENT_MAIL_REQUIRED && !isValidEMail($email)) {
+		if (!empty($conf->global->ADHERENT_MAIL_REQUIRED) && !isValidEMail($email)) {
 			$error++;
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorBadEMail", $email), null, 'errors');
@@ -903,12 +918,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	// When used in standard mode
 	// -----------------------------------------
 
+	// Create mode
 	if ($action == 'create') {
-		/* ************************************************************************** */
-		/*                                                                            */
-		/* Creation mode                                                              */
-		/*                                                                            */
-		/* ************************************************************************** */
 		$object->canvas = $canvas;
 		$object->state_id = GETPOST('state_id', 'int');
 
@@ -920,8 +931,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$object->country = $tmparray['label'];
 		}
 
+		$soc = new Societe($db);
 		if (!empty($socid)) {
-			$soc = new Societe($db);
 			if ($socid > 0) {
 				$soc->fetch($socid);
 			}
@@ -938,7 +949,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print load_fiche_titre($langs->trans("NewMember"), '', $object->picto);
 
 		if ($conf->use_javascript_ajax) {
-			print "\n".'<script type="text/javascript" language="javascript">';
+			print "\n".'<script type="text/javascript">'."\n";
 			print 'jQuery(document).ready(function () {
 						jQuery("#selectcountry_id").change(function() {
 							document.formsoc.action.value="create";
@@ -997,7 +1008,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if (count($listetype)) {
 			print $form->selectarray("typeid", $listetype, (GETPOST('typeid', 'int') ? GETPOST('typeid', 'int') : $typeid), (count($listetype) > 1 ? 1 : 0), 0, 0, '', 0, 0, 0, '', '', 1);
 		} else {
-			print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>';
+			print '<span class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</span>';
 		}
 		print "</td>\n";
 
@@ -1032,7 +1043,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		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>'.(!empty($conf->global->ADHERENT_MAIL_REQUIRED) ? '<span class="fieldrequired">' : '').$langs->trans("EMail").(!empty($conf->global->ADHERENT_MAIL_REQUIRED) ? '</span>' : '').'</td>';
 		print '<td>'.img_picto('', 'object_email').' <input type="text" name="member_email" class="minwidth300" maxlength="255" value="'.(GETPOSTISSET('member_email') ? GETPOST('member_email', 'alpha') : $soc->email).'"></td></tr>';
 
 		// Website
@@ -1079,15 +1090,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Pro phone
 		print '<tr><td>'.$langs->trans("PhonePro").'</td>';
-		print '<td>'.img_picto('', 'object_phoning').' <input type="text" name="phone" size="20" value="'.(GETPOSTISSET('phone') ? GETPOST('phone', 'alpha') : $soc->phone).'"></td></tr>';
+		print '<td>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').'<input type="text" name="phone" size="20" value="'.(GETPOSTISSET('phone') ? GETPOST('phone', 'alpha') : $soc->phone).'"></td></tr>';
 
 		// Personal phone
 		print '<tr><td>'.$langs->trans("PhonePerso").'</td>';
-		print '<td>'.img_picto('', 'object_phoning').' <input type="text" name="phone_perso" size="20" value="'.(GETPOSTISSET('phone_perso') ? GETPOST('phone_perso', 'alpha') : $object->phone_perso).'"></td></tr>';
+		print '<td>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').'<input type="text" name="phone_perso" size="20" value="'.(GETPOSTISSET('phone_perso') ? GETPOST('phone_perso', 'alpha') : $object->phone_perso).'"></td></tr>';
 
 		// Mobile phone
 		print '<tr><td>'.$langs->trans("PhoneMobile").'</td>';
-		print '<td>'.img_picto('', 'object_phoning_mobile').' <input type="text" name="phone_mobile" size="20" value="'.(GETPOSTISSET('phone_mobile') ? GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td></tr>';
+		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)) {
 			foreach ($socialnetworks as $key => $value) {
@@ -1125,26 +1136,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		print dol_get_fiche_end();
 
-		print '<div class="center">';
-		print '<input type="submit" name="button" class="button" value="'.$langs->trans("AddMember").'">';
-		print '&nbsp;&nbsp;';
-		if (!empty($backtopage)) {
-			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-		} else {
-			print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-		}
-		print '</div>';
+		print $form->buttonsSaveCancel("AddMember");
 
 		print "</form>\n";
 	}
 
+	// Edit mode
 	if ($action == 'edit') {
-		/********************************************
-		*
-		* Edition mode
-		*
-		********************************************/
-
 		$res = $object->fetch($id);
 		if ($res < 0) {
 			dol_print_error($db, $object->error); exit;
@@ -1176,7 +1174,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 
 		if ($conf->use_javascript_ajax) {
-			print "\n".'<script type="text/javascript" language="javascript">';
+			print "\n".'<script type="text/javascript">';
 			print 'jQuery(document).ready(function () {
 				jQuery("#selectcountry_id").change(function() {
 					document.formsoc.action.value="edit";
@@ -1288,11 +1286,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// EMail
 		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED ? '<span class="fieldrequired">' : '').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED ? '</span>' : '').'</td>';
-		print '<td>'.img_picto('', 'object_email').' <input type="text" name="member_email" class="minwidth300" maxlength="255" value="'.(GETPOSTISSET("member_email") ? GETPOST("member_email", '', 2) : $object->email).'"></td></tr>';
+		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
 		print '<tr><td>'.$form->editfieldkey('Web', 'member_url', GETPOST('member_url', 'alpha'), $object, 0).'</td>';
-			print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" name="member_url" id="member_url" class="maxwidth200onsmartphone maxwidth500 widthcentpercentminusx " value="'.(GETPOSTISSET('member_url') ?GETPOST('member_url', 'alpha') : $object->url).'"></td></tr>';
+		print '<td>'.img_picto('', 'globe', 'class="pictofixedwidth"').'<input type="text" name="member_url" id="member_url" class="maxwidth200onsmartphone maxwidth500 widthcentpercentminusx " value="'.(GETPOSTISSET('member_url') ?GETPOST('member_url', 'alpha') : $object->url).'"></td></tr>';
 
 		// Address
 		print '<tr><td>'.$langs->trans("Address").'</td><td>';
@@ -1326,15 +1324,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Pro phone
 		print '<tr><td>'.$langs->trans("PhonePro").'</td>';
-		print '<td>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone" value="'.(GETPOSTISSET("phone") ? GETPOST("phone") : $object->phone).'"></td></tr>';
+		print '<td>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').'<input type="text" name="phone" value="'.(GETPOSTISSET("phone") ? GETPOST("phone") : $object->phone).'"></td></tr>';
 
 		// Personal phone
 		print '<tr><td>'.$langs->trans("PhonePerso").'</td>';
-		print '<td>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone_perso" value="'.(GETPOSTISSET("phone_perso") ? GETPOST("phone_perso") : $object->phone_perso).'"></td></tr>';
+		print '<td>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').'<input type="text" name="phone_perso" value="'.(GETPOSTISSET("phone_perso") ? GETPOST("phone_perso") : $object->phone_perso).'"></td></tr>';
 
 		// Mobile phone
 		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>';
+		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)) {
 			foreach ($socialnetworks as $key => $value) {
@@ -1400,22 +1398,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '</table>';
 		print dol_get_fiche_end();
 
-		print '<div class="center">';
-		print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
+		print $form->buttonsSaveCancel("Save", '');
 
 		print '</form>';
 	}
 
+	// View
 	if ($id > 0 && $action != 'edit') {
-		/* ************************************************************************** */
-		/*                                                                            */
-		/* View mode                                                                  */
-		/*                                                                            */
-		/* ************************************************************************** */
-
 		$res = $object->fetch($id);
 		if ($res < 0) {
 			dol_print_error($db, $object->error); exit;
@@ -1704,7 +1693,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-		dol_banner_tab($object, 'rowid', $linkback);
+		$morehtmlref = '<a href="'.DOL_URL_ROOT.'/adherents/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, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
@@ -1780,18 +1774,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		print '</div>';
 
-		print '<div class="fichehalfright"><div class="ficheaddleft">';
+		print '<div class="fichehalfright">';
 		print '<div class="underbanner clearboth"></div>';
 
-		print '<table class="border tableforfield tableforfield" width="100%">';
+		print '<table class="border tableforfield tableforfield centpercent">';
 
-		// 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>';
-
-		// Categories
+		// Tags / Categories
 		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$langs->trans("Categories").'</td>';
 			print '<td colspan="2">';
@@ -1799,6 +1787,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			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
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
@@ -1818,7 +1812,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr><td>';
 				print $form->select_company($object->socid, 'socid', '', 1);
 				print '</td>';
-				print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+				print '<td class="left"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
 				print '</tr></table></form>';
 			} else {
 				if ($object->socid) {
@@ -1859,17 +1853,20 @@ 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.png', 'class="paddingrightonly"');
+		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></div>\n";
+		print "</div></div>\n";
 		print '<div style="clear:both"></div>';
 
 		print dol_get_fiche_end();
@@ -1908,7 +1905,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 				// Modify
 				if (!empty($user->rights->adherent->creer)) {
-					print '<a class="butAction" href="card.php?rowid='.$id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
+					print '<a class="butAction" href="card.php?rowid='.$id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>'."\n";
 				} else {
 					print '<span class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</span>'."\n";
 				}
@@ -1953,7 +1950,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				if (!empty($conf->societe->enabled) && !$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";;
+							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";
 						} else {
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a>'."\n";
 						}
@@ -1980,10 +1977,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					$isinspip = $mailmanspip->is_in_spip($object);
 
 					if ($isinspip == 1) {
-						print '<a class="butAction" href="card.php?rowid='.$object->id.'&action=del_spip">'.$langs->trans("DeleteIntoSpip").'</a>'."\n";
+						print '<a class="butAction" href="card.php?rowid='.$object->id.'&action=del_spip&token='.newToken().'">'.$langs->trans("DeleteIntoSpip").'</a>'."\n";
 					}
 					if ($isinspip == 0) {
-						print '<a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip").'</a>'."\n";
+						print '<a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip&token='.newToken().'">'.$langs->trans("AddIntoSpip").'</a>'."\n";
 					}
 				}
 
@@ -1998,7 +1995,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '</div>';
 
 		if ($isinspip == -1) {
-			print '<br><br><font class="error">'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'</font>';
+			print '<br><br><span class="error">'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'</span>';
 		}
 
 
@@ -2013,7 +2010,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Generated documents
 			$filename = dol_sanitizeFileName($object->ref);
-			//$filename =  'tmp_cards.php';
 			$filedir = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'member');
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$object->id;
 			$genallowed = $user->rights->adherent->lire;
@@ -2043,20 +2039,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print showOnlinePaymentUrl('membersubscription', $object->ref);
 			}
 
-			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+			print '</div><div class="fichehalfright">';
 
 			$MAX = 10;
 
-			$morehtmlright = '<a href="'.DOL_URL_ROOT.'/adherents/agenda.php?id='.$object->id.'">';
-			$morehtmlright .= $langs->trans("SeeAll");
-			$morehtmlright .= '</a>';
+			$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt 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';
 			$formactions = new FormActions($db);
-			$somethingshown = $formactions->showactions($object, 'member', $socid, 1, 'listactions', $MAX, '', $morehtmlright);
+			$somethingshown = $formactions->showactions($object, $object->element, $socid, 1, 'listactions', $MAX, '', $morehtmlcenter);
 
-			print '</div></div></div>';
+			print '</div></div>';
 		}
 
 		// Presend form
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index 8d9ed70a925..94621195ac9 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -39,6 +39,7 @@ $day = dol_print_date($now, '%d');
 $foruserid = GETPOST('foruserid', 'alphanohtml');
 $foruserlogin = GETPOST('foruserlogin', 'alphanohtml');
 $mode = GETPOST('mode', 'aZ09');
+$modelcard = GETPOST("modelcard", 'aZ09'); // Doc template to use for business cards
 $model = GETPOST("model", 'aZ09'); // Doc template to use for business cards
 $modellabel = GETPOST("modellabel", 'aZ09'); // Doc template to use for address sheet
 $mesg = '';
@@ -73,7 +74,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 	// 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 : '');
 		}
 	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
@@ -84,10 +85,10 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 	$sql .= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1";
 	$sql .= " AND d.entity IN (".getEntity('adherent').")";
 	if (is_numeric($foruserid)) {
-		$sql .= " AND d.rowid=".(int) $foruserid;
+		$sql .= " AND d.rowid = ".(int) $foruserid;
 	}
 	if ($foruserlogin) {
-		$sql .= " AND d.login='".$db->escape($foruserlogin)."'";
+		$sql .= " AND d.login = '".$db->escape($foruserlogin)."'";
 	}
 	$sql .= " ORDER BY d.rowid ASC";
 
@@ -118,7 +119,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 					}
 					//if (!empty($objp->$key))
 					//    $objp->array_options[$tmpkey] = $objp->$key;
-					//$objp->array_options[$tmpkey] = $extrafields->showOutputField($key, $objp->$tmpkey, '', 1); //$objp->$tmpkey;
+					//$objp->array_options[$tmpkey] = $extrafields->showOutputField($key, $objp->$tmpkey, '', $object->table_element); //$objp->$tmpkey;
 				}
 			}
 
@@ -143,7 +144,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 				'__MONTH__'=>$month,
 				'__DAY__'=>$day,
 				'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
-				'__SERVER__'=>"http://".$_SERVER["SERVER_NAME"]."/"
+				'__SERVER__'=>"https://".$_SERVER["SERVER_NAME"]."/"
 			);
 			complete_substitutions_array($substitutionarray, $langs, $adherentstatic);
 
@@ -155,7 +156,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 				$textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 
 				if (is_numeric($foruserid) || $foruserlogin) {
-					$nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY'];
+					$nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY'];	// $_Avery_Labels is defined into an include
 					if ($nb <= 0) {
 						$nb = 1; // Protection to avoid empty page
 					}
@@ -209,7 +210,19 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 		}
 
 		// Build and output PDF
-		if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
+		$outputlangs = $langs;
+
+		if (empty($mode) || $mode == 'card') {
+			if (!count($arrayofmembers)) {
+				$mesg = $langs->trans("ErrorRecordNotFound");
+			}
+			if (empty($modelcard) || $modelcard == '-1') {
+				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_CARD_TYPE"));
+			}
+			if (!$mesg) {
+				$result = members_card_pdf_create($db, $arrayofmembers, $modelcard, $outputlangs, '', 'standard', 'tmp_cards');
+			}
+		} elseif ($mode == 'cardlogin') {
 			if (!count($arrayofmembers)) {
 				$mesg = $langs->trans("ErrorRecordNotFound");
 			}
@@ -217,7 +230,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_CARD_TYPE"));
 			}
 			if (!$mesg) {
-				$result = members_card_pdf_create($db, $arrayofmembers, $model, $outputlangs);
+				$result = members_card_pdf_create($db, $arrayofmembers, $model, $outputlangs, '', 'standard', 'tmp_cards_login');
 			}
 		} elseif ($mode == 'label') {
 			if (!count($arrayofmembers)) {
@@ -262,7 +275,7 @@ dol_htmloutput_errors($mesg);
 
 print '<br>';
 
-print img_picto('', 'puce').' '.$langs->trans("DocForAllMembersCards", (!empty($conf->global->ADHERENT_CARD_TYPE) ? $conf->global->ADHERENT_CARD_TYPE : $langs->transnoentitiesnoconv("None"))).' ';
+print img_picto('', 'card').' '.$langs->trans("DocForAllMembersCards", (!empty($conf->global->ADHERENT_CARD_TYPE) ? $conf->global->ADHERENT_CARD_TYPE : $langs->transnoentitiesnoconv("None"))).' ';
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="foruserid" value="all">';
@@ -275,13 +288,13 @@ foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 }
 asort($arrayoflabels);
-print $form->selectarray('model', $arrayoflabels, (GETPOST('model') ? GETPOST('model') : (empty($conf->global->ADHERENT_CARD_TYPE) ? '' : $conf->global->ADHERENT_CARD_TYPE)), 1, 0, 0, '', 0, 0, 0, '', '', 1);
-print '<br><input class="button" type="submit" value="'.$langs->trans("BuildDoc").'">';
+print $form->selectarray('modelcard', $arrayoflabels, (GETPOST('modelcard') ? GETPOST('modelcard') : (empty($conf->global->ADHERENT_CARD_TYPE) ? '' : $conf->global->ADHERENT_CARD_TYPE)), 1, 0, 0, '', 0, 0, 0, '', '', 1);
+print '<br><input type="submit" class="button small" value="'.$langs->trans("BuildDoc").'">';
 print '</form>';
 
 print '<br><br>';
 
-print img_picto('', 'puce').' '.$langs->trans("DocForOneMemberCards", (!empty($conf->global->ADHERENT_CARD_TYPE) ? $conf->global->ADHERENT_CARD_TYPE : $langs->transnoentitiesnoconv("None"))).' ';
+print img_picto('', 'card').' '.$langs->trans("DocForOneMemberCards", (!empty($conf->global->ADHERENT_CARD_TYPE) ? $conf->global->ADHERENT_CARD_TYPE : $langs->transnoentitiesnoconv("None"))).' ';
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="mode" value="cardlogin">';
@@ -295,12 +308,12 @@ foreach (array_keys($_Avery_Labels) as $codecards) {
 asort($arrayoflabels);
 print $form->selectarray('model', $arrayoflabels, (GETPOST('model') ?GETPOST('model') : (empty($conf->global->ADHERENT_CARD_TYPE) ? '' : $conf->global->ADHERENT_CARD_TYPE)), 1, 0, 0, '', 0, 0, 0, '', '', 1);
 print '<br>'.$langs->trans("Login").': <input size="10" type="text" name="foruserlogin" value="'.GETPOST('foruserlogin').'">';
-print '<br><input class="button" type="submit" value="'.$langs->trans("BuildDoc").'">';
+print '<br><input type="submit" class="button small" value="'.$langs->trans("BuildDoc").'">';
 print '</form>';
 
 print '<br><br>';
 
-print img_picto('', 'puce').' '.$langs->trans("DocForLabels", (empty($conf->global->ADHERENT_ETIQUETTE_TYPE) ? '' : $conf->global->ADHERENT_ETIQUETTE_TYPE)).' ';
+print img_picto('', 'card').' '.$langs->trans("DocForLabels", (empty($conf->global->ADHERENT_ETIQUETTE_TYPE) ? '' : $conf->global->ADHERENT_ETIQUETTE_TYPE)).' ';
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="mode" value="label">';
@@ -313,7 +326,7 @@ foreach (array_keys($_Avery_Labels) as $codecards) {
 }
 asort($arrayoflabels);
 print $form->selectarray('modellabel', $arrayoflabels, (GETPOST('modellabel') ? GETPOST('modellabel') : (empty($conf->global->ADHERENT_ETIQUETTE_TYPE) ? '' : $conf->global->ADHERENT_ETIQUETTE_TYPE)), 1, 0, 0, '', 0, 0, 0, '', '', 1);
-print '<br><input class="button" type="submit" value="'.$langs->trans("BuildDoc").'">';
+print '<br><input type="submit" class="button small" value="'.$langs->trans("BuildDoc").'">';
 print '</form>';
 
 // End of page
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index b7f2810912b..1d12ad16194 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -14,6 +14,7 @@
  * Copyright (C) 2019		Nicolas ZABOURI 		<info@inovea-conseil.com>
  * Copyright (C) 2020		Josep Lluís Amador 		<joseplluis@lliuretic.cat>
  * Copyright (C) 2021		Waël Almoman            <info@almoman.com>
+ * Copyright (C) 2021		Philippe Grand          <philippe.grand@atoo-net.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
@@ -574,7 +575,7 @@ class Adherent extends CommonObject
 		$sql .= ", ".($this->login ? "'".$this->db->escape($this->login)."'" : "null");
 		$sql .= ", ".($user->id > 0 ? $user->id : "null"); // Can be null because member can be created by a guest or a script
 		$sql .= ", null, null, '".$this->db->escape($this->morphy)."'";
-		$sql .= ", ".$this->typeid;
+		$sql .= ", ".((int) $this->typeid);
 		$sql .= ", ".$conf->entity;
 		$sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
 		$sql .= ")";
@@ -774,7 +775,7 @@ class Adherent extends CommonObject
 			// Remove links to user and replace with new one
 			if (!$error) {
 				dol_syslog(get_class($this)."::update update link to user");
-				$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL WHERE fk_member = ".$this->id;
+				$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL WHERE fk_member = ".((int) $this->id);
 				dol_syslog(get_class($this)."::update", LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
@@ -784,7 +785,7 @@ class Adherent extends CommonObject
 				}
 				// If there is a user linked to this member
 				if ($this->user_id > 0) {
-					$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = ".$this->id." WHERE rowid = ".$this->user_id;
+					$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = ".((int) $this->id)." WHERE rowid = ".((int) $this->user_id);
 					dol_syslog(get_class($this)."::update", LOG_DEBUG);
 					$resql = $this->db->query($sql);
 					if (!$resql) {
@@ -926,7 +927,7 @@ class Adherent extends CommonObject
 		// Search for last subscription id and end date
 		$sql = "SELECT rowid, datec as dateop, dateadh as datedeb, datef as datefin";
 		$sql .= " FROM ".MAIN_DB_PREFIX."subscription";
-		$sql .= " WHERE fk_adherent=".$this->id;
+		$sql .= " WHERE fk_adherent = ".((int) $this->id);
 		$sql .= " ORDER by dateadh DESC"; // Sort by start subscription date
 
 		dol_syslog(get_class($this)."::update_end_date", LOG_DEBUG);
@@ -939,7 +940,7 @@ class Adherent extends CommonObject
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
 			$sql .= " datefin=".($datefin != '' ? "'".$this->db->idate($datefin)."'" : "null");
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::update_end_date", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -1100,7 +1101,7 @@ class Adherent extends CommonObject
 		} else {
 			$sql .= ", pass = '".$this->db->escape($password_indatabase)."'";
 		}
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		//dol_syslog("Adherent::Password sql=hidden");
 		dol_syslog(get_class($this)."::setPassword", LOG_DEBUG);
@@ -1223,7 +1224,7 @@ class Adherent extends CommonObject
 
 		// Add link to third party for current member
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET fk_soc = ".($thirdpartyid > 0 ? $thirdpartyid : 'null');
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::setThirdPartyId", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1397,6 +1398,7 @@ class Adherent extends CommonObject
 
 				$this->photo = $obj->photo;
 				$this->statut = $obj->statut;
+				$this->status = $obj->statut;
 				$this->public = $obj->public;
 
 				$this->datec = $this->db->jdate($obj->datec);
@@ -1465,7 +1467,7 @@ class Adherent extends CommonObject
 		$sql .= " c.dateadh as dateh,";
 		$sql .= " c.datef as datef";
 		$sql .= " FROM ".MAIN_DB_PREFIX."subscription as c";
-		$sql .= " WHERE c.fk_adherent = ".$this->id;
+		$sql .= " WHERE c.fk_adherent = ".((int) $this->id);
 		$sql .= " ORDER BY c.dateadh";
 		dol_syslog(get_class($this)."::fetch_subscriptions", LOG_DEBUG);
 
@@ -1520,7 +1522,7 @@ class Adherent extends CommonObject
 	{
 		global $langs;
 
-		require_once DOL_DOCUMENT_ROOT.'/parntership/class/partnership.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
 
 
 		$this->partnerships[] = array();
@@ -1831,8 +1833,8 @@ class Adherent extends CommonObject
 
 				if (!$error && !empty($bank_line_id)) {
 					// Update fk_bank into subscription table
-					$sql = 'UPDATE '.MAIN_DB_PREFIX.'subscription SET fk_bank='.$bank_line_id;
-					$sql .= ' WHERE rowid='.$subscriptionid;
+					$sql = 'UPDATE '.MAIN_DB_PREFIX.'subscription SET fk_bank='.((int) $bank_line_id);
+					$sql .= ' WHERE rowid='.((int) $subscriptionid);
 
 					$result = $this->db->query($sql);
 					if (!$result) {
@@ -1900,7 +1902,7 @@ class Adherent extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
 		$sql .= " statut = ".self::STATUS_VALIDATED;
 		$sql .= ", datevalid = '".$this->db->idate($now)."'";
-		$sql .= ", fk_user_valid=".((int) $user->id);
+		$sql .= ", fk_user_valid = ".((int) $user->id);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::validate", LOG_DEBUG);
@@ -1952,7 +1954,7 @@ class Adherent extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
 		$sql .= " statut = ".self::STATUS_RESILIATED;
 		$sql .= ", fk_user_valid=".$user->id;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -2002,7 +2004,7 @@ class Adherent extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
 		$sql .= " statut = ".self::STATUS_EXCLUDED;
 		$sql .= ", fk_user_valid=".$user->id;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -2174,9 +2176,10 @@ class Adherent extends CommonObject
 		$linkend = '';
 
 		if (!empty($this->photo)) {
-			$label .= '<div class="photointooltip">';
-			$label .= Form::showphoto('memberphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1);
-			$label .= '</div><div style="clear: both;"></div>';
+			$label .= '<div class="photointooltip floatright">';
+			$label .= Form::showphoto('memberphoto', $this, 80, 0, 0, 'photoref photowithmargin photologintooltip', 'small', 0, 1);
+			$label .= '</div>';
+			//$label .= '<div style="clear: both;"></div>';
 		}
 
 		$label .= '<div class="centpercent">';
@@ -2338,12 +2341,12 @@ class Adherent extends CommonObject
 			}
 		} elseif ($status == self::STATUS_RESILIATED) {
 			$statusType = 'status6';
-			$labelStatus = $langs->trans("MemberStatusResiliated");
-			$labelStatusShort = $langs->trans("MemberStatusResiliatedShort");
+			$labelStatus = $langs->transnoentitiesnoconv("MemberStatusResiliated");
+			$labelStatusShort = $langs->transnoentitiesnoconv("MemberStatusResiliatedShort");
 		} elseif ($status == self::STATUS_EXCLUDED) {
 			$statusType = 'status10';
-			$labelStatus = $langs->trans("MemberStatusExcluded");
-			$labelStatusShort = $langs->trans("MemberStatusExcludedShort");
+			$labelStatus = $langs->transnoentitiesnoconv("MemberStatusExcluded");
+			$labelStatusShort = $langs->transnoentitiesnoconv("MemberStatusExcludedShort");
 		}
 
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
@@ -2703,7 +2706,7 @@ class Adherent extends CommonObject
 				$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte
 			}
 			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) {
-				$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4); // Create OpenLDAP MD5 password (TODO add type of encryption)
+				$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 'openldap'); // Create OpenLDAP password (see LDAP_PASSWORD_HASH_TYPE)
 			}
 		} elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') {
 			// Set LDAP password if possible
@@ -2714,7 +2717,7 @@ class Adherent extends CommonObject
 					if ($this->pass_indatabase_crypted && !empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) {
 						// Create OpenLDAP MD5 password from Dolibarr MD5 password
 						// Note: This suppose that "pass_indatabase_crypted" is a md5 (guaranted by the previous test if "(empty($conf->global->MAIN_SECURITY_HASH_ALGO))"
-						$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = '{md5}'.base64_encode(hex2bin($this->pass_indatabase_crypted));
+						$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dolGetLdapPasswordHash($this->pass_indatabase_crypted, 'md5frommd5');
 					}
 				}
 			} elseif (!empty($this->pass_indatabase)) {
@@ -2723,7 +2726,7 @@ class Adherent extends CommonObject
 					$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass_indatabase; // $this->pass_indatabase = mot de passe non crypte
 				}
 				if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) {
-					$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass_indatabase, 4); // md5 for OpenLdap TODO add type of encryption
+					$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass_indatabase, 'openldap'); // Create OpenLDAP password (see LDAP_PASSWORD_HASH_TYPE)
 				}
 			}
 		}
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index ad24b9f1c05..18a91efaacd 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -90,13 +90,19 @@ class AdherentType extends CommonObject
 	public $subscription;
 
 	/**
-	 * @var float amount for subscription
+	 * @var float|string 	Amount for subscription (null or '' means not defined)
 	 */
 	public $amount;
 
-	/** @var string 	Public note */
+	/**
+	 * @var string 	Public note
+	 * @deprecated
+	 */
 	public $note;
 
+	/** @var string 	Public note */
+	public $note_public;
+
 	/** @var integer	Can vote */
 	public $vote;
 
@@ -142,7 +148,7 @@ class AdherentType extends CommonObject
 
 		$sql = "SELECT lang, label, description, email";
 		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
-		$sql .= " WHERE fk_type=".$this->id;
+		$sql .= " WHERE fk_type = ".((int) $this->id);
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -181,21 +187,21 @@ class AdherentType extends CommonObject
 			if ($key == $current_lang) {
 				$sql = "SELECT rowid";
 				$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
-				$sql .= " WHERE fk_type=".$this->id;
+				$sql .= " WHERE fk_type = ".((int) $this->id);
 				$sql .= " AND lang = '".$this->db->escape($key)."'";
 
 				$result = $this->db->query($sql);
 
 				if ($this->db->num_rows($result)) { // if there is already a description line for this language
 					$sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
-					$sql2 .= " SET ";
-					$sql2 .= " label='".$this->db->escape($this->label)."',";
-					$sql2 .= " description='".$this->db->escape($this->description)."'";
-					$sql2 .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($key)."'";
+					$sql2 .= " SET";
+					$sql2 .= " label = '".$this->db->escape($this->label)."',";
+					$sql2 .= " description = '".$this->db->escape($this->description)."'";
+					$sql2 .= " WHERE fk_type = ".((int) $this->id)." AND lang='".$this->db->escape($key)."'";
 				} else {
 					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type_lang (fk_type, lang, label, description";
 					$sql2 .= ")";
-					$sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->label)."',";
+					$sql2 .= " VALUES(".((int) $this->id).",'".$this->db->escape($key)."','".$this->db->escape($this->label)."',";
 					$sql2 .= " '".$this->db->escape($this->description)."'";
 					$sql2 .= ")";
 				}
@@ -207,7 +213,7 @@ class AdherentType extends CommonObject
 			} elseif (isset($this->multilangs[$key])) {
 				$sql = "SELECT rowid";
 				$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
-				$sql .= " WHERE fk_type=".$this->id;
+				$sql .= " WHERE fk_type = ".((int) $this->id);
 				$sql .= " AND lang = '".$this->db->escape($key)."'";
 
 				$result = $this->db->query($sql);
@@ -215,9 +221,9 @@ class AdherentType extends CommonObject
 				if ($this->db->num_rows($result)) { // if there is already a description line for this language
 					$sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
 					$sql2 .= " SET ";
-					$sql2 .= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
-					$sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
-					$sql2 .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($key)."'";
+					$sql2 .= " label = '".$this->db->escape($this->multilangs["$key"]["label"])."',";
+					$sql2 .= " description = '".$this->db->escape($this->multilangs["$key"]["description"])."'";
+					$sql2 .= " WHERE fk_type = ".((int) $this->id)." AND lang='".$this->db->escape($key)."'";
 				} else {
 					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type_lang (fk_type, lang, label, description";
 					$sql2 .= ")";
@@ -259,7 +265,7 @@ class AdherentType extends CommonObject
 	public function delMultiLangs($langtodelete, $user)
 	{
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type_lang";
-		$sql .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($langtodelete)."'";
+		$sql .= " WHERE fk_type = ".((int) $this->id)." AND lang = '".$this->db->escape($langtodelete)."'";
 
 		dol_syslog(get_class($this).'::delMultiLangs', LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -358,6 +364,10 @@ class AdherentType extends CommonObject
 
 		$this->label = trim($this->label);
 
+		if (empty($this->note_public) && !empty($this->note)) {		// For backward compatibility
+			$this->note_public = $this->note;
+		}
+
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent_type ";
@@ -368,14 +378,14 @@ class AdherentType extends CommonObject
 		$sql .= "subscription = '".$this->db->escape($this->subscription)."',";
 		$sql .= "amount = ".((empty($this->amount) && $this->amount == '') ? 'null' : ((float) $this->amount)).",";
 		$sql .= "duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."',";
-		$sql .= "note = '".$this->db->escape($this->note)."',";
+		$sql .= "note = '".$this->db->escape($this->note_public)."',";
 		$sql .= "vote = ".(integer) $this->db->escape($this->vote).",";
 		$sql .= "mail_valid = '".$this->db->escape($this->mail_valid)."'";
 		$sql .= " WHERE rowid =".((int) $this->id);
 
 		$result = $this->db->query($sql);
 		if ($result) {
-			$this->description = $this->db->escape($this->note);
+			$this->description = $this->db->escape($this->note_public);
 
 			// Multilangs
 			if (!empty($conf->global->MAIN_MULTILANGS)) {
@@ -461,7 +471,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, d.vote";
+		$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 .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
 		$sql .= " WHERE d.rowid = ".(int) $rowid;
 
@@ -483,7 +493,8 @@ class AdherentType extends CommonObject
 				$this->subscription   = $obj->subscription;
 				$this->amount         = $obj->amount;
 				$this->mail_valid     = $obj->mail_valid;
-				$this->note           = $obj->note;
+				$this->note           = $obj->note_public;	// deprecated
+				$this->note_public    = $obj->note_public;
 				$this->vote           = $obj->vote;
 
 				// multilangs
@@ -543,14 +554,13 @@ class AdherentType extends CommonObject
 	}
 
 	/**
-	 *  Return list of amount by type id
+	 *  Return the array of all amounts per membership type id
 	 *
 	 *  @param	int		$status			Filter on status of type
-	 *  @return array					List of types of members
+	 *  @return array					Array of membership type
 	 */
 	public function amountByType($status = null)
 	{
-
 		global $conf, $langs;
 
 		$amountbytype = array();
@@ -578,13 +588,14 @@ class AdherentType extends CommonObject
 		} else {
 			print $this->db->error();
 		}
+
 		return $amountbytype;
 	}
 
 	/**
 	 * 	Return array of Member objects for member type this->id (or all if this->id not defined)
 	 *
-	 * 	@param	string	$excludefilter		Filter to exclude
+	 * 	@param	string	$excludefilter		Filter to exclude. This value must not come from a user input.
 	 *  @param	int		$mode				0=Return array of member instance
 	 *  									1=Return array of member instance without extra data
 	 *  									2=Return array of members id only
@@ -737,10 +748,10 @@ class AdherentType extends CommonObject
 		}
 
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
-			$this->labelStatus[0] = $langs->trans("ActivityCeased");
-			$this->labelStatus[1] = $langs->trans("InActivity");
-			$this->labelStatusShort[0] = $langs->trans("ActivityCeased");
-			$this->labelStatusShort[1] = $langs->trans("InActivity");
+			$this->labelStatus[0] = $langs->transnoentitiesnoconv("ActivityCeased");
+			$this->labelStatus[1] = $langs->transnoentitiesnoconv("InActivity");
+			$this->labelStatusShort[0] = $langs->transnoentitiesnoconv("ActivityCeased");
+			$this->labelStatusShort[1] = $langs->transnoentitiesnoconv("InActivity");
 		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
@@ -792,12 +803,16 @@ class AdherentType extends CommonObject
 		// Object classes
 		$info["objectclass"] = explode(',', $conf->global->LDAP_MEMBER_TYPE_OBJECT_CLASS);
 
+		if (empty($this->note_public) && !empty($this->note)) {		// For backward compatibility
+			$this->note_public = $this->note;
+		}
+
 		// Champs
 		if ($this->label && !empty($conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME)) {
 			$info[$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME] = $this->label;
 		}
-		if ($this->note && !empty($conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION)) {
-			$info[$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note, 0, 'UTF-8', 1);
+		if ($this->note_public && !empty($conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION)) {
+			$info[$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_public, 0, 'UTF-8', 1);
 		}
 		if (!empty($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS)) {
 			$valueofldapfield = array();
@@ -829,7 +844,7 @@ class AdherentType extends CommonObject
 		$this->specimen = 1;
 
 		$this->label = 'MEMBERS TYPE SPECIMEN';
-		$this->note = 'This is a note';
+		$this->note_public = 'This is a public note';
 		$this->mail_valid = 'This is welcome email';
 		$this->subscription = 1;
 		$this->vote = 0;
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index e777108c491..9aa2fe2e8ad 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -70,11 +70,11 @@ class AdherentStats extends Stats
 
 		$this->where .= " m.statut != -1";
 		$this->where .= " AND p.fk_adherent = m.rowid AND m.entity IN (".getEntity('adherent').")";
-		//if (!$user->rights->societe->client->voir && !$user->socid) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .((int) $user->id);
+		//if (empty($user->rights->societe->client->voir) && !$user->socid) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .((int) $user->id);
 		if ($this->memberid) {
 			$this->where .= " AND m.rowid = ".((int) $this->memberid);
 		}
-		//if ($this->userid > 0) $this->where.=' AND fk_user_author = '.$this->userid;
+		//if ($this->userid > 0) $this->where .= " AND fk_user_author = ".((int) $this->userid);
 	}
 
 
@@ -91,7 +91,7 @@ class AdherentStats extends Stats
 
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, count(*)";
 		$sql .= " FROM ".$this->from;
-		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		//if (empty($user->rights->societe->client->voir) && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE ".dolSqlDateFilter('p.dateadh', 0, 0, (int) $year, 1);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
@@ -111,7 +111,7 @@ class AdherentStats extends Stats
 
 		$sql = "SELECT date_format(p.dateadh,'%Y') as dm, count(*)";
 		$sql .= " FROM ".$this->from;
-		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		//if (empty($user->rights->societe->client->voir) && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -132,7 +132,7 @@ class AdherentStats extends Stats
 
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, sum(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		//if (empty($user->rights->societe->client->voir) && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE ".dolSqlDateFilter('p.dateadh', 0, 0, (int) $year, 1);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
@@ -153,7 +153,7 @@ class AdherentStats extends Stats
 
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, avg(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		//if (!$user->rights->societe->client->voir && !$this->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		//if (empty($user->rights->societe->client->voir) && !$this->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE ".dolSqlDateFilter('p.dateadh', 0, 0, (int) $year, 1);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
@@ -174,7 +174,7 @@ class AdherentStats extends Stats
 
 		$sql = "SELECT date_format(p.dateadh,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
-		//if (!$user->rights->societe->client->voir && !$this->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		//if (empty($user->rights->societe->client->voir) && !$this->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
 		$sql .= $this->db->order('year', 'DESC');
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index d57a01510d4..6fad266ea36 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -204,7 +204,7 @@ class Members extends DolibarrApi
 	 * @param int       $limit      Limit for list
 	 * @param int       $page       Page number
 	 * @param string    $typeid     ID of the type of member
-	 * @param  int    $category   Use this param to filter list by category
+	 * @param int    	$category   Use this param to filter list by category
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma.
 	 *                              Example: "(t.ref:like:'SO-%') and ((t.date_creation:<:'20160101') or (t.nature:is:NULL))"
 	 * @return array                Array of member objects
@@ -237,8 +237,9 @@ class Members extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index b02a81dc5c9..be8f22f3c45 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -102,8 +102,9 @@ class MembersTypes extends DolibarrApi
 
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index 831be2882f1..55b93df7663 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -100,8 +100,9 @@ class Subscriptions extends DolibarrApi
 		$sql .= ' WHERE 1 = 1';
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index fff9d925cd9..885c8981d93 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -215,7 +215,7 @@ class Subscription extends CommonObject
 		$sql .= " tms,";
 		$sql .= " dateadh as dateh,";
 		$sql .= " datef,";
-		$sql .= " subscription, note, fk_bank";
+		$sql .= " subscription, note as note_public, fk_bank";
 		$sql .= " FROM ".MAIN_DB_PREFIX."subscription";
 		$sql .= "	WHERE rowid=".((int) $rowid);
 
@@ -235,7 +235,8 @@ class Subscription extends CommonObject
 				$this->dateh          = $this->db->jdate($obj->dateh);
 				$this->datef          = $this->db->jdate($obj->datef);
 				$this->amount         = $obj->subscription;
-				$this->note           = $obj->note;
+				$this->note           = $obj->note_public;	// deprecated
+				$this->note_public    = $obj->note_public;
 				$this->fk_bank        = $obj->fk_bank;
 				return 1;
 			} else {
@@ -266,16 +267,20 @@ class Subscription extends CommonObject
 			return -1;
 		}
 
+		if (empty($this->note_public) && !empty($this->note)) {	// For backward compatibility
+			$this->note_public = $this->note;
+		}
+
 		$sql = "UPDATE ".MAIN_DB_PREFIX."subscription SET ";
 		$sql .= " fk_type = ".((int) $this->fk_type).",";
 		$sql .= " fk_adherent = ".((int) $this->fk_adherent).",";
-		$sql .= " note=".($this->note ? "'".$this->db->escape($this->note)."'" : 'null').",";
+		$sql .= " note=".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : 'null').",";
 		$sql .= " subscription = ".price2num($this->amount).",";
 		$sql .= " dateadh='".$this->db->idate($this->dateh)."',";
 		$sql .= " datef='".$this->db->idate($this->datef)."',";
 		$sql .= " datec='".$this->db->idate($this->datec)."',";
 		$sql .= " fk_bank = ".($this->fk_bank ? ((int) $this->fk_bank) : 'null');
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 98c0e026139..3dcab7a9c4c 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -44,8 +44,8 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -138,7 +138,11 @@ if ($id > 0) {
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-		dol_banner_tab($object, 'rowid', $linkback);
+		$morehtmlref = '<a href="'.DOL_URL_ROOT.'/adherents/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, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
 		print '<div class="fichecenter">';
 
@@ -149,7 +153,7 @@ if ($id > 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
@@ -163,7 +167,7 @@ if ($id > 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>';
diff --git a/htdocs/adherents/htpasswd.php b/htdocs/adherents/htpasswd.php
index e1f580a3656..60639193295 100644
--- a/htdocs/adherents/htpasswd.php
+++ b/htdocs/adherents/htpasswd.php
@@ -36,7 +36,7 @@ $sortorder = GETPOST('sortorder', 'aZ09');
 if (empty($conf->adherent->enabled)) {
 	accessforbidden();
 }
-if (!$user->rights->adherent->export) {
+if (empty($user->rights->adherent->export)) {
 	accessforbidden();
 }
 
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 44d5ee5399b..db87e514cb5 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2006		Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2006-2017	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2006-2021	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
@@ -50,14 +50,14 @@ if ($id > 0 || !empty($ref)) {
 	$result = $object->fetch($id, $ref);
 
 	// Define variables to know what current user can do on users
-	$canadduser = ($user->admin || $user->rights->user->user->creer);
+	$canadduser = (!empty($user->admin) || !empty($user->rights->user->user->creer));
 	// Define variables to know what current user can do on properties of user linked to edited member
 	if ($object->user_id) {
 		// $User is the user who edits, $object->user_id is the id of the related user in the edited member
-		$caneditfielduser = ((($user->id == $object->user_id) && $user->rights->user->self->creer)
-			|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
+		$caneditfielduser = ((($user->id == $object->user_id) && !empty($user->rights->user->self->creer))
+			|| (($user->id != $object->user_id) && !empty($user->rights->user->user->creer)));
 		$caneditpassworduser = ((($user->id == $object->user_id) && $user->rights->user->self->password)
-			|| (($user->id != $object->user_id) && $user->rights->user->user->password));
+			|| (($user->id != $object->user_id) && !empty($user->rights->user->user->password)));
 	}
 }
 
@@ -135,17 +135,17 @@ $adht->fetch($object->typeid);
 print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
 
 // LDAP DN
-print '<tr><td>LDAP '.$langs->trans("LDAPMemberDn").'</td><td class="valeur">'.$conf->global->LDAP_MEMBER_DN."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPMemberDn").'</td><td class="valeur">'.getDolGlobalString('LDAP_MEMBER_DN')."</td></tr>\n";
 
 // LDAP Cle
-print '<tr><td>LDAP '.$langs->trans("LDAPNamingAttribute").'</td><td class="valeur">'.$conf->global->LDAP_KEY_MEMBERS."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPNamingAttribute").'</td><td class="valeur">'.getDolGlobalString('LDAP_KEY_MEMBERS')."</td></tr>\n";
 
 // LDAP Server
-print '<tr><td>LDAP '.$langs->trans("Type").'</td><td class="valeur">'.$conf->global->LDAP_SERVER_TYPE."</td></tr>\n";
-print '<tr><td>LDAP '.$langs->trans("Version").'</td><td class="valeur">'.$conf->global->LDAP_SERVER_PROTOCOLVERSION."</td></tr>\n";
-print '<tr><td>LDAP '.$langs->trans("LDAPPrimaryServer").'</td><td class="valeur">'.$conf->global->LDAP_SERVER_HOST."</td></tr>\n";
-print '<tr><td>LDAP '.$langs->trans("LDAPSecondaryServer").'</td><td class="valeur">'.$conf->global->LDAP_SERVER_HOST_SLAVE."</td></tr>\n";
-print '<tr><td>LDAP '.$langs->trans("LDAPServerPort").'</td><td class="valeur">'.$conf->global->LDAP_SERVER_PORT."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("Type").'</td><td class="valeur">'.getDolGlobalString('LDAP_SERVER_TYPE')."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("Version").'</td><td class="valeur">'.getDolGlobalString('LDAP_SERVER_PROTOCOLVERSION')."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPPrimaryServer").'</td><td class="valeur">'.getDolGlobalString('LDAP_SERVER_HOST')."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPSecondaryServer").'</td><td class="valeur">'.getDolGlobalString('LDAP_SERVER_HOST_SLAVE')."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPServerPort").'</td><td class="valeur">'.getDolGlobalString('LDAP_SERVER_PORT')."</td></tr>\n";
 
 print '</table>';
 
@@ -158,13 +158,13 @@ print dol_get_fiche_end();
  */
 print '<div class="tabsAction">';
 
-if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && $conf->global->LDAP_MEMBER_ACTIVE != 'ldap2dolibarr') {
+if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && getDolGlobalString('LDAP_MEMBER_ACTIVE') != Ldap::SYNCHRO_LDAP_TO_DOLIBARR) {
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a></div>';
 }
 
 print "</div>\n";
 
-if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && $conf->global->LDAP_MEMBER_ACTIVE != 'ldap2dolibarr') {
+if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && getDolGlobalString('LDAP_MEMBER_ACTIVE') != Ldap::SYNCHRO_LDAP_TO_DOLIBARR) {
 	print "<br>\n";
 }
 
@@ -190,7 +190,7 @@ if ($result > 0) {
 
 	if (empty($dn)) {
 		$langs->load("errors");
-		print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Member")).'</font></td></tr>';
+		print '<tr class="oddeven"><td colspan="2"><span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Member")).'</span></td></tr>';
 	} else {
 		$records = $ldap->getAttribute($dn, $search);
 
@@ -199,17 +199,16 @@ if ($result > 0) {
 		// Show tree
 		if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
 			if (!is_array($records)) {
-				print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
+				print '<tr class="oddeven"><td colspan="2"><span class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</span></td></tr>';
 			} else {
 				$result = show_ldap_content($records, 0, $records['count'], true);
 			}
 		} else {
-			print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
+			print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.dol_escape_htmltag($dn).' - search='.dol_escape_htmltag($search).')</td></tr>';
 		}
 	}
 
 	$ldap->unbind();
-	$ldap->close();
 } else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index a93e507bac1..322c08bd77c 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -65,6 +65,7 @@ $search_filter = GETPOST("search_filter", 'alpha');
 $search_status = GETPOST("search_status", 'intcomma');
 $catid        = GETPOST("catid", 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
+$socid = GETPOST('socid', 'int');
 
 $filter = GETPOST("filter", 'alpha');
 if ($filter) {
@@ -82,8 +83,8 @@ if ($search_status < -2) {
 }
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -313,7 +314,7 @@ if (!empty($search_categ) || !empty($catid)) {
 }
 $sql .= " d.rowid, d.ref, d.login, d.lastname, d.firstname, d.gender, d.societe as company, d.fk_soc,";
 $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.skype, d.birth, d.public, d.photo,";
+$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 .= " s.nom,";
@@ -323,7 +324,7 @@ $sql .= " state.code_departement as state_code, state.nom as state_name,";
 // 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
@@ -601,7 +602,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 (in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index cc216d794d1..2d98dfe5fbc 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -68,16 +68,21 @@ if ($id) {
 	$caneditfieldmember = $user->rights->adherent->creer;
 }
 
+$hookmanager->initHooks(array('membernote'));
+
 // Security check
 $result = restrictedArea($user, 'adherent', $object->id, '', '', 'socid', 'rowid', 0);
 
-
 /*
  * Actions
  */
-
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
-
+$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
+}
 
 
 /*
@@ -102,7 +107,11 @@ if ($id) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	dol_banner_tab($object, 'id', $linkback);
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/adherents/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', 'ref', $morehtmlref);
 
 	print '<div class="fichecenter">';
 
diff --git a/htdocs/adherents/partnership.php b/htdocs/adherents/partnership.php
index cf0e11d70e0..160a037c187 100644
--- a/htdocs/adherents/partnership.php
+++ b/htdocs/adherents/partnership.php
@@ -22,27 +22,6 @@
  *		\brief      Page to create/edit/view partnership
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 16dfc3ccff6..3490f61d006 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -161,40 +161,40 @@ if ($mode) {
 		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 			if ($mode == 'memberbycountry') {
-				$data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-							'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-							'code'=>$obj->code,
-							'nb'=>$obj->nb,
-							'lastdate'=>$db->jdate($obj->lastdate),
-							'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
+				$data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? img_picto('', DOL_URL_ROOT.'/theme/common/flags/'.strtolower($obj->code).'.png', '', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+					'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+					'code'=>$obj->code,
+					'nb'=>$obj->nb,
+					'lastdate'=>$db->jdate($obj->lastdate),
+					'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
 				);
 			}
 			if ($mode == 'memberbyregion') { //+
 				$data[] = array(
-					'label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-					'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-					'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
+					'label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? img_picto('', DOL_URL_ROOT.'/theme/common/flags/'.strtolower($obj->code).'.png', '', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+					'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label :'<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+					'label2'=>($obj->label2 ? $obj->label2 : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>'),
 					'nb'=>$obj->nb,
 					'lastdate'=>$db->jdate($obj->lastdate),
 					'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
 				);
 			}
 			if ($mode == 'memberbystate') {
-				$data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-							'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-							'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
-							'nb'=>$obj->nb,
-							'lastdate'=>$db->jdate($obj->lastdate),
-							'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
+				$data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? img_picto('', DOL_URL_ROOT.'/theme/common/flags/'.strtolower($obj->code).'.png', '', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+					'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+					'label2'=>($obj->label2 ? $obj->label2 : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>'),
+					'nb'=>$obj->nb,
+					'lastdate'=>$db->jdate($obj->lastdate),
+					'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
 				);
 			}
 			if ($mode == 'memberbytown') {
-				$data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-							'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
-							'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
-							'nb'=>$obj->nb,
-							'lastdate'=>$db->jdate($obj->lastdate),
-							'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
+				$data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? img_picto('', DOL_URL_ROOT.'/theme/common/flags/'.strtolower($obj->code).'.png', '', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+					'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+					'label2'=>($obj->label2 ? $obj->label2 : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>'),
+					'nb'=>$obj->nb,
+					'lastdate'=>$db->jdate($obj->lastdate),
+					'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
 				);
 			}
 
@@ -308,7 +308,7 @@ if ($mode) {
 	print '</tr>';
 
 	foreach ($data as $val) {
-		$year = isset($val['year']) ? $val['year'] : '';;
+		$year = isset($val['year']) ? $val['year'] : '';
 		print '<tr class="oddeven">';
 		print '<td>'.$val['label'].'</td>';
 		if (isset($label2)) {
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index 7bf395e9bcc..0854b94bff2 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -208,7 +208,7 @@ print '</table>';
 print '</div>';
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 // Show graphs
@@ -223,7 +223,7 @@ if ($mesg) {
 print '</td></tr></table>';
 
 
-print '</div></div></div>';
+print '</div></div>';
 print '<div style="clear:both"></div>';
 
 
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index d9ab62336a1..ac2555b4deb 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -209,7 +209,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 	// Subscription informations
 	$datesubscription = 0;
 	$datesubend = 0;
-	$paymentdate = '';	// Do not use 0 here, default value is '' that means not filled where 0 means 1970-01-01
+	$paymentdate = ''; // Do not use 0 here, default value is '' that means not filled where 0 means 1970-01-01
 	if (GETPOST("reyear", "int") && GETPOST("remonth", "int") && GETPOST("reday", "int")) {
 		$datesubscription = dol_mktime(0, 0, 0, GETPOST("remonth", "int"), GETPOST("reday", "int"), GETPOST("reyear", "int"));
 	}
@@ -485,7 +485,11 @@ if ($rowid > 0) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	dol_banner_tab($object, 'rowid', $linkback);
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/adherents/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, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';
@@ -557,10 +561,10 @@ if ($rowid > 0) {
 	print '</table>';
 
 	print '</div>';
-	print '<div class="fichehalfright"><div class="ficheaddleft">';
+	print '<div class="fichehalfright">';
 
 	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border tableforfield" width="100%">';
+	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>';
@@ -587,7 +591,7 @@ if ($rowid > 0) {
 		print $langs->trans("LinkedToDolibarrThirdParty");
 		print '</td>';
 		if ($action != 'editthirdparty' && $user->rights->adherent->creer) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&token='.newToken().'&rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td colspan="2" class="valeur">';
@@ -601,7 +605,7 @@ if ($rowid > 0) {
 			print '<tr><td>';
 			print $form->select_company($object->fk_soc, 'socid', '', 1);
 			print '</td>';
-			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+			print '<td class="left"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
 		} else {
 			if ($object->fk_soc) {
@@ -631,7 +635,7 @@ if ($rowid > 0) {
 	if ($action != 'editlogin' && $user->rights->adherent->creer) {
 		print '<td class="right">';
 		if ($user->rights->user->user->creer) {
-			print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editlogin&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'), 1).'</a>';
+			print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editlogin&token='.newToken().'&rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'), 1).'</a>';
 		}
 		print '</td>';
 	}
@@ -652,7 +656,7 @@ if ($rowid > 0) {
 
 	print "</table>\n";
 
-	print "</div></div></div>\n";
+	print "</div></div>\n";
 	print '<div style="clear:both"></div>';
 
 	print dol_get_fiche_end();
@@ -670,7 +674,7 @@ if ($rowid > 0) {
 			print '<div class="tabsAction">';
 
 			if ($object->statut > 0) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$rowid.'&action=addsubscription">'.$langs->trans("AddSubscription")."</a></div>";
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$rowid.'&action=addsubscription&token='.newToken().'">'.$langs->trans("AddSubscription")."</a></div>";
 			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("AddSubscription").'</a></div>';
 			}
@@ -838,7 +842,7 @@ if ($rowid > 0) {
 
 		if ($conf->use_javascript_ajax) {
 			//var_dump($bankdirect.'-'.$bankviainvoice.'-'.$invoiceonly.'-'.empty($conf->global->ADHERENT_BANK_USE));
-			print "\n".'<script type="text/javascript" language="javascript">';
+			print "\n".'<script type="text/javascript">';
 			print '$(document).ready(function () {
 						$(".bankswitchclass, .bankswitchclass2").'.(($bankdirect || $bankviainvoice) ? 'show()' : 'hide()').';
 						$("#none, #invoiceonly").click(function() {
@@ -1159,9 +1163,13 @@ if ($rowid > 0) {
 		print dol_get_fiche_end();
 
 		print '<div class="center">';
-		print '<input type="submit" class="button" name="add" value="'.$langs->trans("AddSubscription").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action);
+		if (empty($reshook)) {
+			print '<input type="submit" class="button" name="add" value="'.$langs->trans("AddSubscription").'">';
+			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+		}
 		print '</div>';
 
 		print '</form>';
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index 575d6d2301b..5967d670856 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -48,7 +48,7 @@ $note = GETPOST('note', 'alpha');
 $typeid = (int) GETPOST('typeid', 'int');
 $amount = price2num(GETPOST('amount', 'alpha'), 'MT');
 
-if (!$user->rights->adherent->cotisation->lire) {
+if (empty($user->rights->adherent->cotisation->lire)) {
 	 accessforbidden();
 }
 
@@ -59,7 +59,7 @@ $permissiontoedit = $user->rights->adherent->cotisation->creer; // Used by the i
 $hookmanager->initHooks(array('subscriptioncard', 'globalcard'));
 
 // Security check
-$result = restrictedArea($user, 'subscription', 0);		// TODO Check on object id
+$result = restrictedArea($user, 'subscription', 0); // TODO Check on object id
 
 
 /*
@@ -245,11 +245,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" name="submit" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; &nbsp; &nbsp; ';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 	print "\n";
@@ -392,16 +388,16 @@ if ($rowid && $action != 'edit') {
 	if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
 	*/
 
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright">';
 
 	// List of actions on element
 	/*
 	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 	$formactions = new FormActions($db);
-	$somethingshown = $formactions->showactions($object, 'invoice', $socid, 1);
+	$somethingshown = $formactions->showactions($object, $object->element, $socid, 1);
 	*/
 
-	print '</div></div></div>';
+	print '</div></div>';
 }
 
 // End of page
diff --git a/htdocs/adherents/subscription/info.php b/htdocs/adherents/subscription/info.php
index 080e2c0330c..9eb431320cd 100644
--- a/htdocs/adherents/subscription/info.php
+++ b/htdocs/adherents/subscription/info.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "members", "bills", "users"));
 
-if (!$user->rights->adherent->lire) {
+if (empty($user->rights->adherent->lire)) {
 	accessforbidden();
 }
 
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 4c9935b76a8..0b83881e502 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -52,8 +52,8 @@ $sall = '';
 $date_select = GETPOST("date_select", 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index 0414bf20a14..3acb14a4cdb 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 -->\n";
+echo "<!-- BEGIN PHP TEMPLATE adherents/tpl/linkedopjectblock.tpl.php -->\n";
 
 global $user;
 
@@ -35,7 +35,7 @@ $total = 0;
 foreach ($linkedObjectBlock as $key => $objectlink) {
 	echo '<tr class="oddeven">';
 	echo '<td>'.$langs->trans("Subscription").'</td>';
-	echo '<td>'.$objectlink->getNomUrl(1).'</td>';
+	echo '<td class="nowraponall">'.$objectlink->getNomUrl(1).'</td>';
 	echo '<td class="center"></td>';
 	echo '<td class="center">'.dol_print_date($objectlink->dateh, 'day').'</td>';
 	echo '<td class="right">';
@@ -45,7 +45,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	}
 	echo '</td>';
 	echo '<td class="right"></td>';
-	echo '<td class="right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
+	echo '<td class="right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
 	echo '</tr>';
 }
 
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index bdae16901c1..76dd0617cee 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -53,8 +53,8 @@ $status = GETPOST('status', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -172,7 +172,7 @@ if ($action == 'update' && $user->rights->adherent->configurer) {
 	$object->morphy	= trim($morphy);
 	$object->status	= (int) $status;
 	$object->subscription = (int) $subscription;
-	$object->amount = ($amount == '' ? '' : price2num($amount, 'MT'));;
+	$object->amount = ($amount == '' ? '' : price2num($amount, 'MT'));
 	$object->duration_value = $duration_value;
 	$object->duration_unit = $duration_unit;
 	$object->note = trim($comment);
@@ -292,7 +292,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 			$membertype->amount = $objp->amount;
 
 			print '<tr class="oddeven">';
-			print '<td>';
+			print '<td class="nowraponall">';
 			print $membertype->getNomUrl(1);
 			//<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a>
 			print '</td>';
@@ -340,12 +340,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 	}
 }
 
-
-/* ************************************************************************** */
-/*                                                                            */
-/* Creation mode                                                              */
-/*                                                                            */
-/* ************************************************************************** */
+// Creation
 if ($action == 'create') {
 	$object = new AdherentType($db);
 
@@ -394,12 +389,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, $conf->fckeditor->enabled, 15, '90%');
+	$doleditor = new DolEditor('comment', $object->note, '', 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, $conf->fckeditor->enabled, 15, '90%');
+	$doleditor = new DolEditor('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>';
 
@@ -411,20 +406,12 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" name="button" class="button" value="'.$langs->trans("Add").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print "</form>\n";
 }
 
-/* ************************************************************************** */
-/*                                                                            */
-/* View mode                                                                  */
-/*                                                                            */
-/* ************************************************************************** */
+// View
 if ($rowid > 0) {
 	if ($action != 'edit') {
 		$object = new AdherentType($db);
@@ -459,8 +446,9 @@ if ($rowid > 0) {
 		print yn($object->subscription);
 		print '</tr>';
 
+		// Amount
 		print '<tr><td class="titlefield">'.$langs->trans("Amount").'</td><td>';
-		print ((is_null($object->amount) || $object->amount === '') ? '' : price($object->amount));
+		print ((is_null($object->amount) || $object->amount === '') ? '' : '<span class="amount">'.price($object->amount).'</span>');
 		print '</tr>';
 
 		print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';
@@ -498,12 +486,12 @@ if ($rowid > 0) {
 
 		// Edit
 		if ($user->rights->adherent->configurer) {
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;rowid='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&rowid='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
 		}
 
 		// Add
 		if ($user->rights->adherent->configurer && !empty($object->status)) {
-			print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=create&typeid='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.$langs->trans("AddMember").'</a></div>';
+			print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=create&token='.newToken().'&typeid='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.$langs->trans("AddMember").'</a></div>';
 		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoAddMember")).'">'.$langs->trans("AddMember").'</a></div>';
 		}
@@ -745,10 +733,10 @@ if ($rowid > 0) {
 				// Actions
 				print '<td class="center">';
 				if ($user->rights->adherent->creer) {
-					print '<a class="editfielda marginleftonly" href="card.php?rowid='.$objp->rowid.'&action=edit&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.img_edit().'</a>';
+					print '<a class="editfielda marginleftonly" href="card.php?rowid='.$objp->rowid.'&action=edit&token='.newToken().'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.img_edit().'</a>';
 				}
 				if ($user->rights->adherent->supprimer) {
-					print '<a class="marginleftonly" href="card.php?rowid='.$objp->rowid.'&action=resign">'.img_picto($langs->trans("Resiliate"), 'disable.png').'</a>';
+					print '<a class="marginleftonly" href="card.php?rowid='.$objp->rowid.'&action=resign&token='.newToken().'">'.img_picto($langs->trans("Resiliate"), 'disable.png').'</a>';
 				}
 				print "</td>";
 
@@ -827,12 +815,12 @@ if ($rowid > 0) {
 
 		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor = new DolEditor('comment', $object->note, '', 280, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, 15, '90%');
+		$doleditor = new DolEditor('comment', $object->note, '', 280, 'dolibarr_notes', '', false, true, empty($conf->fckeditor->enabled) ? false : $conf->fckeditor->enabled, 15, '90%');
 		$doleditor->Create();
 		print "</td></tr>";
 
 		print '<tr><td class="tdtop">'.$langs->trans("WelcomeEMail").'</td><td>';
-		$doleditor = new DolEditor('mail_valid', $object->mail_valid, '', 280, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, 15, '90%');
+		$doleditor = new DolEditor('mail_valid', $object->mail_valid, '', 280, 'dolibarr_notes', '', false, true, empty($conf->fckeditor->enabled) ? false : $conf->fckeditor->enabled, 15, '90%');
 		$doleditor->Create();
 		print "</td></tr>";
 
@@ -843,11 +831,7 @@ if ($rowid > 0) {
 
 		print dol_get_fiche_end();
 
-		print '<div class="center">';
-		print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
+		print $form->buttonsSaveCancel();
 
 		print "</form>";
 	}
diff --git a/htdocs/adherents/type_ldap.php b/htdocs/adherents/type_ldap.php
index 87a952a68b4..d7650a8de2b 100644
--- a/htdocs/adherents/type_ldap.php
+++ b/htdocs/adherents/type_ldap.php
@@ -124,13 +124,13 @@ print dol_get_fiche_end();
 
 print '<div class="tabsAction">';
 
-if ($conf->global->LDAP_MEMBER_TYPE_ACTIVE == 1) {
+if (getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
 }
 
 print "</div>\n";
 
-if ($conf->global->LDAP_MEMBER_TYPE_ACTIVE == 1) {
+if (getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 	print "<br>\n";
 }
 
@@ -161,16 +161,15 @@ if ($result > 0) {
 	// Show tree
 	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
 		if (!is_array($records)) {
-			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
+			print '<tr class="oddeven"><td colspan="2"><span class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</span></td></tr>';
 		} else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
 		}
 	} else {
-		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
+		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.dol_escape_htmltag($dn).' - search='.dol_escape_htmltag($search).')</td></tr>';
 	}
 
 	$ldap->unbind();
-	$ldap->close();
 } else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 6c8f273ae77..256f29b6b81 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -76,11 +76,11 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->ad
 	if ($forcelangprod == $current_lang) {
 		$object->label		 = GETPOST("libelle", 'alphanohtml');
 		$object->description = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
-		$object->other		 = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
+		//$object->other		 = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
 	} else {
 		$object->multilangs[$forcelangprod]["label"] = GETPOST("libelle", 'alphanohtml');
 		$object->multilangs[$forcelangprod]["description"] = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
-		$object->multilangs[$forcelangprod]["other"] = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
+		//$object->multilangs[$forcelangprod]["other"] = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
 	}
 
 	// backup into database
@@ -185,9 +185,9 @@ print "\n<div class=\"tabsAction\">\n";
 
 if ($action == '') {
 	if ($user->rights->produit->creer || $user->rights->service->creer) {
-		print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=create&rowid='.$object->id.'">'.$langs->trans("Add").'</a>';
+		print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=create&token='.newToken().'&rowid='.$object->id.'">'.$langs->trans("Add").'</a>';
 		if ($cnt_trans > 0) {
-			print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=edit&rowid='.$object->id.'">'.$langs->trans("Update").'</a>';
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=edit&token='.newToken().'&rowid='.$object->id.'">'.$langs->trans("Update").'</a>';
 		}
 	}
 }
@@ -228,13 +228,7 @@ if ($action == 'edit') {
 		}
 	}
 
-	print '<br>';
-
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 } elseif ($action != 'create') {
@@ -297,11 +291,7 @@ if ($action == 'create' && $user->rights->adherent->configurer) {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 
diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 9bed1bb19f3..e0e01cab328 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -85,22 +85,22 @@ 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);
 $formcompany = new FormCompany($db);
 
-$countrynotdefined = '<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>';
+$countrynotdefined = '<span class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</span>';
 
 print '<span class="opacitymedium">'.$langs->trans("AccountantDesc")."</span><br>\n";
-print "<br>\n";
+print "<br><br>\n";
 
 /**
  * Edit parameters
  */
 if (!empty($conf->use_javascript_ajax)) {
-	print "\n".'<script type="text/javascript" language="javascript">';
+	print "\n".'<script type="text/javascript">';
 	print '$(document).ready(function () {
 		  $("#selectcountry_id").change(function() {
 			document.form_index.action.value="updateedit";
@@ -119,7 +119,7 @@ print '<tr class="liste_titre"><th class="titlefieldcreate wordbreak">'.$langs->
 
 // Name
 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" autofocus 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";
 
 // Address
 print '<tr class="oddeven"><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
@@ -157,7 +157,7 @@ print '</td></tr>'."\n";
 
 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="maxwidth150 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="'.(GETPOSTISSET('mail') ? GETPOST('mail', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_MAIL) ? $conf->global->MAIN_INFO_ACCOUNTANT_MAIL : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Web
@@ -177,12 +177,7 @@ print '</td></tr>';
 
 print '</table>';
 
-print '<br><div class="center">';
-print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-//print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-//print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-print '</div>';
-//print '<br>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index a3d725bee93..a730f199213 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -192,6 +192,7 @@ if (!empty($triggers)) {
 			}
 
 			if ($search_event === '' || preg_match('/'.preg_quote($search_event, '/').'/i', $trigger['code'])) {
+				print '<!-- '.$trigger['position'].' -->';
 				print '<tr class="oddeven">';
 				print '<td>'.$trigger['code'].'</td>';
 				print '<td>'.$trigger['label'].'</td>';
@@ -209,9 +210,7 @@ print '</div>';
 
 print dol_get_fiche_end();
 
-print '<div class="center">';
-print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">';
-print "</div>";
+print $form->buttonsSaveCancel("Save", '');
 
 print "</form>\n";
 
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 272da835741..5567e741272 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -41,8 +41,7 @@ if (!$user->admin) {
 $langs->loadLangs(array('agenda', 'admin', 'other'));
 
 $def = array();
-$actiontest = GETPOST('test', 'alpha');
-$actionsave = GETPOST('save', 'alpha');
+$action = GETPOST('action', 'alpha');
 
 if (empty($conf->global->AGENDA_EXT_NB)) {
 	$conf->global->AGENDA_EXT_NB = 5;
@@ -57,14 +56,57 @@ $colorlist = array('BECEDD', 'DDBECE', 'BFDDBE', 'F598B4', 'F68654', 'CBF654', '
  * Actions
  */
 
-if ($actionsave) {
+$error = 0;
+$errors = array();
+
+if (preg_match('/set_(.*)/', $action, $reg)) {
+	$db->begin();
+
+	$code = $reg[1];
+	$value = (GETPOST($code) ? GETPOST($code) : 1);
+
+	$res = dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity);
+	if (!$res > 0) {
+		$error++;
+		$errors[] = $db->lasterror();
+	}
+
+	if ($error) {
+		$db->rollback();
+		setEventMessages('', $errors, 'errors');
+	} else {
+		$db->commit();
+		setEventMessage($langs->trans('SetupSaved'));
+		header('Location: ' . $_SERVER["PHP_SELF"]);
+		exit();
+	}
+} elseif (preg_match('/del_(.*)/', $action, $reg)) {
+	$db->begin();
+
+	$code = $reg[1];
+
+	$res = dolibarr_del_const($db, $code, $conf->entity);
+	if (!$res > 0) {
+		$error++;
+		$errors[] = $db->lasterror();
+	}
+
+	if ($error) {
+		$db->rollback();
+		setEventMessages('', $errors, 'errors');
+	} else {
+		$db->commit();
+		setEventMessage($langs->trans('SetupSaved'));
+		header('Location: ' . $_SERVER["PHP_SELF"]);
+		exit();
+	}
+} elseif ($action == 'save') {
 	$db->begin();
 
 	$disableext = GETPOST('AGENDA_DISABLE_EXT', 'alpha');
 	$res = dolibarr_set_const($db, 'AGENDA_DISABLE_EXT', $disableext, 'chaine', 0, '', $conf->entity);
 
 	$i = 1; $errorsaved = 0;
-	$error = 0;
 
 	// Save agendas
 	while ($i <= $MAXAGENDA) {
@@ -159,6 +201,10 @@ print dol_get_fiche_head($head, 'extsites', $langs->trans("Agenda"), -1, 'action
 print '<span class="opacitymedium">'.$langs->trans("AgendaExtSitesDesc")."</span><br>\n";
 print "<br>\n";
 
+
+$selectedvalue=$conf->global->AGENDA_DISABLE_EXT;
+if ($selectedvalue==1) $selectedvalue=0; else $selectedvalue=1;
+
 print "<table class=\"noborder\" width=\"100%\">";
 
 print "<tr class=\"liste_titre\">";
@@ -203,31 +249,44 @@ print "<td>".$langs->trans("Name")."</td>";
 print "<td>".$langs->trans("ExtSiteUrlAgenda")." (".$langs->trans("Example").': http://yoursite/agenda/agenda.ics)</td>';
 print "<td>".$form->textwithpicto($langs->trans("FixTZ"), $langs->trans("FillFixTZOnlyIfRequired"), 1).'</td>';
 print '<td class="right">'.$langs->trans("Color").'</td>';
+print '<td class="right">'.$langs->trans("ActiveByDefault").'</td>';
 print "</tr>";
 
 $i = 1;
 while ($i <= $MAXAGENDA) {
 	$key = $i;
-	$name = 'AGENDA_EXT_NAME'.$key;
-	$src = 'AGENDA_EXT_SRC'.$key;
-	$offsettz = 'AGENDA_EXT_OFFSETTZ'.$key;
-	$color = 'AGENDA_EXT_COLOR'.$key;
-	$enabled = 'AGENDA_EXT_ENABLED'.$key;
-
+	$name = 'AGENDA_EXT_NAME' . $key;
+	$src = 'AGENDA_EXT_SRC' . $key;
+	$offsettz = 'AGENDA_EXT_OFFSETTZ' . $key;
+	$color = 'AGENDA_EXT_COLOR' . $key;
+	$enabled = 'AGENDA_EXT_ENABLED' . $key;
+	$default = 'AGENDA_EXT_ACTIVEBYDEFAULT' . $key;
 
 	print '<tr class="oddeven">';
 	// Nb
-	print '<td width="180" class="nowrap">'.$langs->trans("AgendaExtNb", $key)."</td>";
+	print '<td width="180" class="nowrap">' . $langs->trans("AgendaExtNb", $key) . "</td>";
 	// Name
-	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_NAME'.$key.'" value="'.(GETPOST('AGENDA_EXT_NAME'.$key) ?GETPOST('AGENDA_EXT_NAME'.$key, 'alpha') : getDolGlobalString($name)).'" size="28"></td>';
+	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_NAME' . $key . '" value="' . (GETPOST('AGENDA_EXT_NAME' . $key) ? GETPOST('AGENDA_EXT_NAME' . $key, 'alpha') : getDolGlobalString($name)) . '" size="28"></td>';
 	// URL
-	print '<td><input type="url" class="flat hideifnotset" name="AGENDA_EXT_SRC'.$key.'" value="'.(GETPOST('AGENDA_EXT_SRC'.$key) ?GETPOST('AGENDA_EXT_SRC'.$key, 'alpha') : getDolGlobalString($src)).'" size="60"></td>';
+	print '<td><input type="url" class="flat hideifnotset" name="AGENDA_EXT_SRC' . $key . '" value="' . (GETPOST('AGENDA_EXT_SRC' . $key) ? GETPOST('AGENDA_EXT_SRC' . $key, 'alpha') : getDolGlobalString($src)) . '" size="60"></td>';
 	// Offset TZ
-	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_OFFSETTZ'.$key.'" value="'.(GETPOST('AGENDA_EXT_OFFSETTZ'.$key) ? GETPOST('AGENDA_EXT_OFFSETTZ'.$key) : getDolGlobalString($offsettz)).'" size="2"></td>';
+	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_OFFSETTZ' . $key . '" value="' . (GETPOST('AGENDA_EXT_OFFSETTZ' . $key) ? GETPOST('AGENDA_EXT_OFFSETTZ' . $key) : getDolGlobalString($offsettz)) . '" size="2"></td>';
 	// Color (Possible colors are limited by Google)
 	print '<td class="nowrap right">';
 	//print $formadmin->selectColor($conf->global->$color, "google_agenda_color".$key, $colorlist);
-	print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR".$key) ?GETPOST("AGENDA_EXT_COLOR".$key) : getDolGlobalString($color)), "AGENDA_EXT_COLOR".$key, 'extsitesconfig', 1, '', 'hideifnotset');
+	print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR" . $key) ? GETPOST("AGENDA_EXT_COLOR" . $key) : getDolGlobalString($color)), "AGENDA_EXT_COLOR" . $key, 'extsitesconfig', 1, '', 'hideifnotset');
+	print '</td>';
+	// Calendar active by default
+	print '<td class="nowrap right">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('AGENDA_EXT_ACTIVEBYDEFAULT' . $key);
+	} else {
+		if (empty($conf->global->{$default})) {
+			print '<a href="' . $_SERVER['PHP_SELF'] . '?action=set_AGENDA_EXT_ACTIVEBYDEFAULT' . $key . '&token='.newToken().'">' . img_picto($langs->trans("Enabled"), 'on') . '</a>';
+		} else {
+			print '<a href="' . $_SERVER['PHP_SELF'] . '?action=del_AGENDA_EXT_ACTIVEBYDEFAULT' . $key . '&token='.newToken().'">' . img_picto($langs->trans("Disabled"), 'off') . '</a>';
+		}
+	}
 	print '</td>';
 	print "</tr>";
 	$i++;
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 54d5158b4ed..1014d40de50 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -41,6 +41,8 @@ $langs->loadLangs(array('admin', 'other', 'agenda', 'users'));
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $param = GETPOST('param', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -83,27 +85,29 @@ if ($action == 'set') {
 	dolibarr_set_const($db, 'AGENDA_DEFAULT_VIEW', GETPOST('AGENDA_DEFAULT_VIEW'), 'chaine', 0, '', $conf->entity);
 
 	$defaultValues = new DefaultValues($db);
-	$result = $defaultValues->fetchAll('', '', 0, 0, array('t.page'=>'comm/action/card.php', 't.param'=>'complete','t.user_id'=>'0', 't.type'=>'createform', 't.entity'=>$conf->entity));
-	if (!is_array($result) && $result<0) {
+	$result = $defaultValues->fetchAll('', '', 0, 0, array('t.page'=>'comm/action/card.php', 't.param'=>'complete', 't.user_id'=>'0', 't.type'=>'createform', 't.entity'=>$conf->entity));
+	if (!is_array($result) && $result < 0) {
 		setEventMessages($defaultValues->error, $defaultValues->errors, 'errors');
-	} elseif (count($result)>0) {
+	} elseif (count($result) > 0) {
 		foreach ($result as $defval) {
-			$defaultValues->id=$defval->id;
+			$defaultValues->id = $defval->id;
 			$resultDel = $defaultValues->delete($user);
-			if ($resultDel<0) {
+			if ($resultDel < 0) {
 				setEventMessages($defaultValues->error, $defaultValues->errors, 'errors');
 			}
 		}
 	}
-	$defaultValues->type='createform';
-	$defaultValues->entity=$conf->entity;
-	$defaultValues->user_id=0;
-	$defaultValues->page='comm/action/card.php';
-	$defaultValues->param='complete';
-	$defaultValues->value=GETPOST('AGENDA_EVENT_DEFAULT_STATUS');
-	$resultCreat=$defaultValues->create($user);
-	if ($resultCreat<0) {
+	$defaultValues->type = 'createform';
+	$defaultValues->entity = $conf->entity;
+	$defaultValues->user_id = 0;
+	$defaultValues->page = 'comm/action/card.php';
+	$defaultValues->param = 'complete';
+	$defaultValues->value = GETPOST('AGENDA_EVENT_DEFAULT_STATUS');
+	$resultCreat = $defaultValues->create($user);
+	if ($resultCreat < 0) {
 		setEventMessages($defaultValues->error, $defaultValues->errors, 'errors');
+	} else {
+		setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 	}
 } elseif ($action == 'specimen') {  // For orders
 	$modele = GETPOST('module', 'alpha');
@@ -260,7 +264,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 						if (in_array($name, $def)) {
 							print '<td class="center">'."\n";
 							if ($conf->global->ACTION_EVENT_ADDON_PDF != "$name") {
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">';
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'&type=action">';
 								print img_picto($langs->trans("Enabled"), 'switch_on');
 								print '</a>';
 							} else {
@@ -269,7 +273,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 							print "</td>";
 						} else {
 							print '<td class="center">'."\n";
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodel&token='.newToken().'&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'&type=action">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							print "</td>";
 						}
 
@@ -278,7 +282,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 						if ($conf->global->ACTION_EVENT_ADDON_PDF == "$name") {
 							print img_picto($langs->trans("Default"), 'on');
 						} else {
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.urlencode($name).'&amp;scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&amp;type=action"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 						}
 						print '</td>';
 
@@ -316,6 +320,16 @@ print '<td class="center">&nbsp;</td>'."\n";
 print '<td class="right">'.$langs->trans("Value").'</td>'."\n";
 print '</tr>'."\n";
 
+// AGENDA_DEFAULT_VIEW
+print '<tr class="oddeven">'."\n";
+$htmltext = $langs->trans("ThisValueCanOverwrittenOnUserLevel", $langs->transnoentitiesnoconv("UserGUISetup"));
+print '<td>'.$form->textwithpicto($langs->trans("AGENDA_DEFAULT_VIEW"), $htmltext).'</td>'."\n";
+print '<td class="center">&nbsp;</td>'."\n";
+print '<td class="right">'."\n";
+$tmplist = array(''=>'&nbsp;', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser"));
+print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_DEFAULT_VIEW);
+print '</td></tr>'."\n";
+
 // Manual or automatic
 
 print '<tr class="oddeven">'."\n";
@@ -324,9 +338,9 @@ print '<td class="center">&nbsp;</td>'."\n";
 print '<td class="right">'."\n";
 //print ajax_constantonoff('AGENDA_USE_EVENT_TYPE');	Do not use ajax here, we need to reload page to change other combo list
 if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_USE_EVENT_TYPE&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+	print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_USE_EVENT_TYPE&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 } else {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_USE_EVENT_TYPE&amp;token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
+	print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_USE_EVENT_TYPE&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 }
 print '</td></tr>'."\n";
 
@@ -340,28 +354,18 @@ if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 	print '</td></tr>'."\n";
 }
 
-// AGENDA_DEFAULT_VIEW
-print '<tr class="oddeven">'."\n";
-$htmltext = $langs->trans("ThisValueCanOverwrittenOnUserLevel", $langs->transnoentitiesnoconv("UserGUISetup"));
-print '<td>'.$form->textwithpicto($langs->trans("AGENDA_DEFAULT_VIEW"), $htmltext).'</td>'."\n";
-print '<td class="center">&nbsp;</td>'."\n";
-print '<td class="right">'."\n";
-$tmplist = array(''=>'&nbsp;', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser"));
-print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_DEFAULT_VIEW);
-print '</td></tr>'."\n";
-
 // AGENDA_EVENT_DEFAULT_STATUS
 print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans("AGENDA_EVENT_DEFAULT_STATUS").'</td>'."\n";
 print '<td class="center">&nbsp;</td>'."\n";
 print '<td class="right nowrap">'."\n";
-$defval='na';
+$defval = 'na';
 $defaultValues = new DefaultValues($db);
-$result = $defaultValues->fetchAll('', '', 0, 0, array('t.page'=>'comm/action/card.php', 't.param'=>'complete','t.user_id'=>'0', 't.type'=>'createform', 't.entity'=>$conf->entity));
-if (!is_array($result) && $result<0) {
+$result = $defaultValues->fetchAll('', '', 0, 0, array('t.page'=>'comm/action/card.php', 't.param'=>'complete', 't.user_id'=>'0', 't.type'=>'createform', 't.entity'=>$conf->entity));
+if (!is_array($result) && $result < 0) {
 	setEventMessages($defaultValues->error, $defaultValues->errors, 'errors');
-} elseif (count($result)>0) {
-	$defval=reset($result)->value;
+} elseif (count($result) > 0) {
+	$defval = reset($result)->value;
 }
 $formactions->form_select_status_action('agenda', $defval, 1, "AGENDA_EVENT_DEFAULT_STATUS", 0, 1, 'maxwidth200');
 print '</td></tr>'."\n";
@@ -392,7 +396,7 @@ print '</table>';
 
 print dol_get_fiche_end();
 
-print '<div class="center"><input class="button button-save" type="submit" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 2b2da673202..79aa081ddef 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -36,6 +36,8 @@ $langs->loadLangs(array("admin", "other", "agenda"));
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $param = GETPOST('param', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $scandir = GETPOST('scandir', 'alpha');
@@ -174,14 +176,14 @@ if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
 		$langs->load("errors");
 		print img_warning($langs->trans("WarningAvailableOnlyForHTTPSServers"), '', 'valignmiddle size15x').' ';
 	}
-	print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER&amp;token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
+	print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER&token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
 	print '</td></tr>'."\n";
 } else {
 	if (!isHTTPS()) {
 		$langs->load("errors");
 		print img_warning($langs->trans("WarningAvailableOnlyForHTTPSServers"), '', 'valignmiddle size15x').' ';
 	}
-	print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
+	print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER&token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
 	print '</td></tr>'."\n";
 
 	print '<tr class="oddeven">'."\n";
@@ -190,9 +192,9 @@ if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
 	print '<td class="right">'."\n";
 
 	if (empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER_SOUND&amp;token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER_SOUND&token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
 	} else {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER_SOUND&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_BROWSER_SOUND&token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
 	}
 
 	print '</td></tr>'."\n";
@@ -221,7 +223,7 @@ if (empty($conf->cron->enabled)) {
 	print '<span class="opacitymedium">'.$langs->trans("WarningModuleNotActive", $langs->transnoentitiesnoconv("Module2300Name")).'</span>';
 } else {
 	if (empty($conf->global->AGENDA_REMINDER_EMAIL)) {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_EMAIL&amp;token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_EMAIL&token='.newToken().'">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
 	} else {
 		// Get the max frequency of reminder
 		if ($job->id > 0) {
@@ -229,7 +231,7 @@ if (empty($conf->cron->enabled)) {
 				$langs->load("cron");
 				print '<span class="opacitymedium warning">'.$langs->trans("JobXMustBeEnabled", $langs->transnoentitiesnoconv("sendEmailsReminder")).'</span>';
 			} else {
-				print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_EMAIL&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_EMAIL&token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
 			}
 		}
 	}
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index f42cb5c842f..0166769660a 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -139,9 +139,7 @@ print '</table>';
 
 print dol_get_fiche_end();
 
-print '<div class="center">';
-print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">';
-print "</div>";
+print $form->buttonsSaveCancel("Save", '');
 
 print "</form>\n";
 
@@ -161,7 +159,7 @@ $getentity = ($conf->entity > 1 ? "&entity=".$conf->entity : "");
 // Show message
 $message = '';
 
-$urlvcal = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">';
+$urlvcal = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank" rel="noopener noreferrer">';
 $urlvcal .= $urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
 $message .= img_picto('', 'globe').' '.str_replace('{url}', $urlvcal, '<span class="opacitymedium">'.$langs->trans("WebCalUrlForVCalExport", 'vcal', '').'</span>');
 $message .= '<div class="urllink">';
@@ -170,7 +168,7 @@ $message .= '</div>';
 $message .= ajax_autoselect('onlinepaymenturl1');
 $message .= '<br>';
 
-$urlical = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">';
+$urlical = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank" rel="noopener noreferrer">';
 $urlical .= $urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
 $message .= img_picto('', 'globe').' '.str_replace('{url}', $urlical, '<span class="opacitymedium">'.$langs->trans("WebCalUrlForVCalExport", 'ical/ics', '').'</span>');
 $message .= '<div class="urllink">';
@@ -179,7 +177,7 @@ $message .= '</div>';
 $message .= ajax_autoselect('onlinepaymenturl2');
 $message .= '<br>';
 
-$urlrss = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">';
+$urlrss = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank" rel="noopener noreferrer">';
 $urlrss .= $urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
 $message .= img_picto('', 'globe').' '.str_replace('{url}', $urlrss, '<span class="opacitymedium">'.$langs->trans("WebCalUrlForVCalExport", 'rss', '').'</span>');
 $message .= '<div class="urllink">';
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 79853c9cda9..e1e468b0cec 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -258,7 +258,7 @@ while ($i < $nbofbank) {
 		print img_picto($langs->trans("Activated"), 'on');
 		print '</td>';
 	} else {
-		print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setbankorder&amp;token='.newToken().'&amp;value='.$i.'">';
+		print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setbankorder&token='.newToken().'&value='.$i.'">';
 		print img_picto($langs->trans("Disabled"), 'off');
 		print '</a></td>';
 	}
@@ -275,8 +275,7 @@ print '<br><br>';
 /*
  * Document templates generators
  */
-//if (! empty($conf->global->MAIN_FEATURES_LEVEL))
-//{
+
 print load_fiche_titre($langs->trans("BankAccountModelModule"), '', '');
 
 // Load array def with activated templates
@@ -354,13 +353,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&amp;token='.newToken().'&amp;value='.$name.'">';
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.$name.'">';
 									print img_picto($langs->trans("Enabled"), 'switch_on');
 									print '</a>';
 									print '</td>';
 								} else {
 									print '<td class="center">'."\n";
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;token='.newToken().'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&token='.newToken().'&can_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 									print "</td>";
 								}
 
@@ -369,7 +368,7 @@ foreach ($dirmodels as $reldir) {
 								if ($conf->global->BANKADDON_PDF == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 								}
 								print '</td>';
 
@@ -428,13 +427,13 @@ print "</td>";
 // Active
 if ($conf->global->BANK_COLORIZE_MOVEMENT) {
 	print '<td class="center">'."\n";
-	print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetbankcolorizemovement&amp;token='.newToken().'">';
+	print '<a 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&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+	print '<a href="'.$_SERVER["PHP_SELF"].'?action=setbankcolorizemovement&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	print "</td>";
 }
 
@@ -466,8 +465,7 @@ print '<br><br>';
 /*
  * Document templates generators
  */
-//if (! empty($conf->global->MAIN_FEATURES_LEVEL))
-//{
+
 print load_fiche_titre($langs->trans("Other"), '', '');
 
 print "<table class=\"noborder\" width=\"100%\">\n";
@@ -499,9 +497,7 @@ print "</tr>\n";
 print '</table>';
 print dol_get_fiche_end();
 
-print '<div class="center">';
-print '<input type="submit" id="save" name="save" class="button hideifnotset button-save" value="'.$langs->trans("Save").'">';
-print '</div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print "</form>\n";
 
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index e6211f0b56f..ee0fcd5d130 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -36,6 +36,7 @@ if (!$user->admin) {
 }
 
 $action = GETPOST('action', 'aZ09');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
 
 /*
@@ -176,6 +177,71 @@ foreach ($dirbarcode as $reldir) {
 	}
 }
 
+
+
+// Select barcode numbering module
+if ($conf->product->enabled) {
+	print load_fiche_titre($langs->trans("BarCodeNumberManager")." (".$langs->trans("Product").")", '', '');
+
+	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_product_.*php$/', $file)) {
+					$file = substr($file, 0, dol_strlen($file) - 4);
+
+					try {
+						dol_include_once($dirroot.$file.'.php');
+					} catch (Exception $e) {
+						dol_syslog($e->getMessage(), LOG_ERR);
+					}
+
+					$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_PRODUCT_ADDON_NUM) && $conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file") {
+						print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproductoff&token='.newToken().'&amp;value='.urlencode($file).'">';
+						print img_picto($langs->trans("Activated"), 'switch_on');
+						print '</a></td>';
+					} else {
+						print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproducton&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
  */
@@ -189,6 +255,7 @@ if (empty($conf->use_javascript_ajax)) {
 	print '<input type="hidden" name="action" value="updateengine">';
 }
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
@@ -211,8 +278,9 @@ if ($resql) {
 	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
 
-		print '<tr class="oddeven"><td width="100">';
-		print $obj->label;
+		print '<tr class="oddeven">';
+		print '<td width="100">';
+		print dol_escape_htmltag($obj->label);
 		print "</td><td>\n";
 		print $langs->trans('BarcodeDesc'.$obj->encoding);
 		//print "L'EAN se compose de 8 caracteres, 7 chiffres plus une cle de controle.<br>";
@@ -270,10 +338,10 @@ if ($resql) {
 	}
 }
 print "</table>\n";
+print '</div>';
 
 if (empty($conf->use_javascript_ajax)) {
-	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'"></div>';
-	print '</form>';
+	print $form->buttonsSaveCancel("Save", '');
 }
 
 print "<br>";
@@ -288,6 +356,7 @@ 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 class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
@@ -303,9 +372,11 @@ if (!isset($_SERVER['WINDIR'])) {
 	print '<input type="text" size="40" name="GENBARCODE_LOCATION" value="'.$conf->global->GENBARCODE_LOCATION.'">';
 	if (!empty($conf->global->GENBARCODE_LOCATION) && !@file_exists($conf->global->GENBARCODE_LOCATION)) {
 		$langs->load("errors");
-		print '<br><font class="error">'.$langs->trans("ErrorFileNotFound", $conf->global->GENBARCODE_LOCATION).'</font>';
+		print '<br><span class="error">'.$langs->trans("ErrorFileNotFound", $conf->global->GENBARCODE_LOCATION).'</span>';
 	}
-	print '</td></tr>';
+	print '</td>';
+	print '<td>&nbsp;</td>';
+	print '</tr>';
 }
 
 // Module products
@@ -314,7 +385,9 @@ if (!empty($conf->product->enabled)) {
 	print '<td>'.$langs->trans("SetDefaultBarcodeTypeProducts").'</td>';
 	print '<td width="60" class="right">';
 	print $formbarcode->selectBarcodeType($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE, "PRODUIT_DEFAULT_BARCODE_TYPE", 1);
-	print '</td></tr>';
+	print '</td>';
+	print '<td>&nbsp;</td>';
+	print '</tr>';
 }
 
 // Module thirdparty
@@ -323,10 +396,14 @@ if (!empty($conf->societe->enabled)) {
 	print '<td>'.$langs->trans("SetDefaultBarcodeTypeThirdParties").'</td>';
 	print '<td width="60" class="right">';
 	print $formbarcode->selectBarcodeType($conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY, "GENBARCODE_BARCODETYPE_THIRDPARTY", 1);
-	print '</td></tr>';
+	print '</td>';
+	print '<td>&nbsp;</td>';
+	print '</tr>';
 }
 
 print "</table>\n";
+print '</div>';
+
 print '<div class="tabsAction">';
 print '<input type="submit" class="button" name="submit_GENBARCODE_BARCODETYPE_THIRDPARTY" value="'.$langs->trans("Modify").'">';
 print "</div>";
@@ -335,71 +412,6 @@ print '</form>';
 print '<br>';
 
 
-
-// Select barcode numbering module
-if ($conf->product->enabled) {
-	print load_fiche_titre($langs->trans("BarCodeNumberManager")." (".$langs->trans("Product").")", '', '');
-
-	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_product_.*php$/', $file)) {
-					$file = substr($file, 0, dol_strlen($file) - 4);
-
-					try {
-						dol_include_once($dirroot.$file.'.php');
-					} catch (Exception $e) {
-						dol_syslog($e->getMessage(), LOG_ERR);
-					}
-
-					$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 ($conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file") {
-						print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproductoff&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
-						print img_picto($langs->trans("Activated"), 'switch_on');
-						print '</a></td>';
-					} else {
-						print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproducton&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
-						print img_picto($langs->trans("Disabled"), 'switch_off');
-						print '</a></td>';
-					}
-					print '<td class="center">';
-					$s = $modBarCode->getToolTip($langs, null, -1);
-					print $form->textwithpicto('', $s, 1);
-					print '</td>';
-					print "</tr>\n";
-				}
-			}
-			closedir($handle);
-		}
-	}
-	print "</table>\n";
-}
-
-//print '</form>';
-
-print "<br>";
-
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index c401c6cabf1..e3adb206d7e 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -36,6 +36,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'bom';
@@ -225,7 +227,7 @@ foreach ($dirmodels as $reldir) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') {
-							print $langs->trans($tmp);
+							print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 						} else {
 							print $tmp;
 						}
@@ -235,7 +237,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->BOM_ADDON == $file) {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -362,13 +364,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&amp;token='.newToken().'&amp;value='.$name.'">';
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.$name.'">';
 									print img_picto($langs->trans("Enabled"), 'switch_on');
 									print '</a>';
 									print '</td>';
 								} else {
 									print '<td class="center">'."\n";
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<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 "</td>";
 								}
 
@@ -377,7 +379,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&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<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 '</td>';
 
@@ -457,7 +459,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 print '</form>';
 
@@ -471,7 +473,7 @@ print $form->textwithpicto($langs->trans("WatermarkOnDraftBOMs"), $htmltext, 1,
 print '</td><td>';
 print '<input class="flat minwidth200" type="text" name="BOM_DRAFT_WATERMARK" value="'.$conf->global->BOM_DRAFT_WATERMARK.'">';
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 print '</form>';
 
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 56971457f76..6c3a6f30646 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -175,9 +175,9 @@ if ($action == 'switch') {
 		$newfirst = $objto->box_order;
 		$newsecond = $objfrom->box_order;
 		if ($newfirst == $newsecond) {
-			 $newsecondchar = preg_replace('/[0-9]+/', '', $newsecond);
-			 $newsecondnum = preg_replace('/[a-zA-Z]+/', '', $newsecond);
-			 $newsecond = sprintf("%s%02d", $newsecondchar ? $newsecondchar : 'A', $newsecondnum + 1);
+			$newsecondchar = preg_replace('/[0-9]+/', '', $newsecond);
+			$newsecondnum = preg_replace('/[a-zA-Z]+/', '', $newsecond);
+			$newsecond = sprintf("%s%02d", $newsecondchar ? $newsecondchar : 'A', $newsecondnum + 1);
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$db->escape($newfirst)."' WHERE rowid=".((int) $objfrom->rowid);
@@ -300,14 +300,13 @@ $boxtoadd = InfoBox::listBoxes($db, 'available', -1, null, $actives);
 // Activated boxes
 $boxactivated = InfoBox::listBoxes($db, 'activated', -1, null);
 
-print "<br>\n";
-print "\n\n".'<!-- Boxes Available -->'."\n";
-print load_fiche_titre($langs->trans("BoxesAvailable"), '', '');
-
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 print '<input type="hidden" name="action" value="add">'."\n";
 
+
+print '<br>';
+
 print '<div class="div-table-responsive-no-min">';
 print '<table class="tagtable liste centpercent">'."\n";
 
@@ -315,9 +314,12 @@ print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Box").'</td>';
 print '<td>'.$langs->trans("Note").'/'.$langs->trans("Parameters").'</td>';
 print '<td></td>';
-print '<td width="160" class="center">'.$langs->trans("ActivatableOn").'</td>';
-print "</tr>\n";
+print '<td class="center" width="160">'.$langs->trans("ActivatableOn").'</td>';
+print '<td class="center" width="60" colspan="2">'.$langs->trans("PositionByDefault").'</td>';
+print '<td class="center" width="80">'.$langs->trans("Disable").'</td>';
+print '</tr>'."\n";
 
+print "\n\n".'<!-- Boxes Available -->'."\n";
 foreach ($boxtoadd as $box) {
 	if (preg_match('/^([^@]+)@([^@]+)$/i', $box->boximg)) {
 		$logo = $box->boximg;
@@ -326,8 +328,8 @@ foreach ($boxtoadd as $box) {
 	}
 
 	print "\n".'<!-- Box '.$box->boxcode.' -->'."\n";
-	print '<tr class="oddeven">'."\n";
-	print '<td>'.img_object("", $logo, 'height="14px"').' '.$langs->transnoentitiesnoconv($box->boxlabel);
+	print '<tr class="oddeven" style="height:3em !important;">'."\n";
+	print '<td class="tdoverflowmax300" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv($box->boxlabel)).'">'.img_object("", $logo, 'class="pictofixedwidth" height="14px"').' '.$langs->transnoentitiesnoconv($box->boxlabel);
 	if (!empty($box->class) && preg_match('/graph_/', $box->class)) {
 		print img_picto('', 'graph', 'class="paddingleft"');
 	}
@@ -339,7 +341,7 @@ foreach ($boxtoadd as $box) {
 		}
 	}
 	print '</td>'."\n";
-	print '<td>';
+	print '<td class="tdoverflowmax300" title="'.dol_escape_htmltag($box->note).'">';
 	if ($box->note == '(WarningUsingThisBoxSlowDown)') {
 		$langs->load("errors");
 		print $langs->trans("WarningUsingThisBoxSlowDown");
@@ -357,36 +359,21 @@ foreach ($boxtoadd as $box) {
 	print '<input type="hidden" name="boxid['.$box->box_id.'][value]" value="'.$box->box_id.'">'."\n";
 	print '</td>';
 
+	print '<td>';
+	print '</td>';
+
+	print '<td>';
+	print '</td>';
+
+	print '<td>';
+	print '<input type="submit" class="button small smallpaddingimp" value="'.$langs->trans("Activate").'">';
+	print '</td>';
+
 	print '</tr>'."\n";
 }
-if (!count($boxtoadd) && count($boxactivated)) {
-	print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("AllWidgetsWereEnabled").'</td></tr>';
-}
-print '</table>'."\n";
-print '</div>';
-
-print '<div class="right">';
-print '<input type="submit" class="button"'.(count($boxtoadd) ? '' : ' disabled').' value="'.$langs->trans("Activate").'">';
-print '</div>'."\n";
-print '</form>';
 print "\n".'<!-- End Boxes Available -->'."\n";
 
 
-//var_dump($boxactivated);
-print "<br>\n\n";
-print load_fiche_titre($langs->trans("BoxesActivated"), '', '');
-
-print '<div class="div-table-responsive-no-min">';
-print '<table class="tagtable liste">'."\n";
-
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Box").'</td>';
-print '<td>'.$langs->trans("Note").'/'.$langs->trans("Parameters").'</td>';
-print '<td class="center" width="160">'.$langs->trans("ActivatableOn").'</td>';
-print '<td class="center" width="60" colspan="2">'.$langs->trans("PositionByDefault").'</td>';
-print '<td class="center" width="80">'.$langs->trans("Disable").'</td>';
-print '</tr>'."\n";
-
 $box_order = 1;
 $foundrupture = 1;
 foreach ($boxactivated as $key => $box) {
@@ -397,8 +384,8 @@ foreach ($boxactivated as $key => $box) {
 	}
 
 	print "\n".'<!-- Box '.$box->boxcode.' -->'."\n";
-	print '<tr class="oddeven">';
-	print '<td>'.img_object("", $logo, 'height="14px"').' '.$langs->transnoentitiesnoconv($box->boxlabel);
+	print '<tr class="oddeven" style="height:3em !important;">';
+	print '<td>'.img_object("", $logo, 'class="pictofixedwidth" height="14px"').' '.$langs->transnoentitiesnoconv($box->boxlabel);
 	if (!empty($box->class) && preg_match('/graph_/', $box->class)) {
 		print img_picto('', 'graph', 'class="paddingleft"');
 	}
@@ -410,21 +397,24 @@ foreach ($boxactivated as $key => $box) {
 		}
 	}
 	print '</td>';
-	print '<td>';
+	$langs->load("errors");
+	print '<td class="tdoverflowmax300" title="'.dol_escape_htmltag($box->note == '(WarningUsingThisBoxSlowDown)' ? $langs->trans("WarningUsingThisBoxSlowDown") : $box->note).'">';
 	if ($box->note == '(WarningUsingThisBoxSlowDown)') {
-		$langs->load("errors");
 		print img_warning('', 0).' '.$langs->trans("WarningUsingThisBoxSlowDown");
 	} else {
 		print ($box->note ? $box->note : '&nbsp;');
 	}
 	print '</td>';
+	print '<td>';
+	print $form->textwithpicto('', $langs->trans("SourceFile").' : '.$box->sourcefile);
+	print '</td>'."\n";
 	print '<td class="center">'.(empty($arrayofhomepages[$box->position]) ? '' : $langs->trans($arrayofhomepages[$box->position])).'</td>';
 	$hasnext = ($key < (count($boxactivated) - 1));
 	$hasprevious = ($key != 0);
 	print '<td class="center">'.($key + 1).'</td>';
 	print '<td class="center nowraponall">';
-	print ($hasnext ? '<a class="reposition" href="boxes.php?action=switch&amp;switchfrom='.$box->rowid.'&amp;switchto='.$boxactivated[$key + 1]->rowid.'">'.img_down().'</a>&nbsp;' : '');
-	print ($hasprevious ? '<a class="reposition" href="boxes.php?action=switch&amp;switchfrom='.$box->rowid.'&amp;switchto='.$boxactivated[$key - 1]->rowid.'">'.img_up().'</a>' : '');
+	print ($hasnext ? '<a class="reposition" href="boxes.php?action=switch&token='.newToken().'&switchfrom='.$box->rowid.'&switchto='.$boxactivated[$key + 1]->rowid.'">'.img_down().'</a>&nbsp;' : '');
+	print ($hasprevious ? '<a class="reposition" href="boxes.php?action=switch&token='.newToken().'&switchfrom='.$box->rowid.'&switchto='.$boxactivated[$key - 1]->rowid.'">'.img_up().'</a>' : '');
 	print '</td>';
 	print '<td class="center">';
 	print '<a class="reposition" href="boxes.php?rowid='.$box->rowid.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
@@ -437,6 +427,8 @@ print '</table>';
 print '</div>';
 print '<br>';
 
+print '</form>';
+
 
 // Other parameters
 
@@ -473,9 +465,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2 || !empty($conf->global->MAIN_ACTIVA
 print '</table>';
 print '</div>';
 
-print '<br>';
-print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'" name="Button"></div>';
-print '<br>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 print "\n".'<!-- End Other Const -->'."\n";
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index cc3377c9762..3ba8c3b854a 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -174,7 +174,7 @@ foreach ($dirmodels as $reldir) {
 								$langs->load("errors");
 								print '<div class="error">'.$langs->trans($tmp).'</div>';
 							} elseif ($tmp == 'NotConfigured') {
-								print $langs->trans($tmp);
+								print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 							} else {
 								print $tmp;
 							}
@@ -268,7 +268,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 print '</table>';
 print "<br>";
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index d6525335ad8..326e7028bbf 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -101,8 +101,8 @@ print '<br>';
 print $langs->trans("ClickToDialUrlDesc").'<br>';
 print '<br>';
 print '<span class="opacitymedium">';
-print $langs->trans("Example").':<br>';
-print 'http://myphoneserver/mypage?login=__LOGIN__&password=__PASS__&caller=__PHONEFROM__&called=__PHONETO__<br>';
+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 '</span>';
 
@@ -117,7 +117,7 @@ print '</td></tr>';
 print '</table>';
 print '</div>';
 
-print '<div class="center"><br><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+print $form->buttonsSaveCancel("Modify", '');
 
 print '</form><br><br>';
 
@@ -149,7 +149,7 @@ if (!empty($conf->global->CLICKTODIAL_URL)) {
 	}
 
 	if ($setupcomplete) {
-		print $langs->trans("LinkToTest", $user->login).': '.dol_print_phone($phonefortest, '', 0, 0, 'AC_TEL', '', 1);
+		print $langs->trans("LinkToTest", $user->login).': &nbsp; '.dol_print_phone($phonefortest, '', 0, 0, 'AC_TEL', '', 'mobile');
 	} else {
 		$langs->load("errors");
 		print '<div class="warning">'.$langs->trans("WarningClickToDialUserSetupNotComplete").'</div>';
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 7407961649c..5c8eb88126c 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -46,6 +46,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'order';
@@ -158,18 +160,6 @@ if ($action == 'updateMask') {
 		$error++;
 	}
 
-	if (!$error) {
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	} else {
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-} elseif ($action == "setshippableiconinlist") {
-	// Activate Set Shippable Icon In List
-	$setshippableiconinlist = GETPOST('value', 'int');
-	$res = dolibarr_set_const($db, "SHIPPABLE_ORDER_ICON_IN_LIST", $setshippableiconinlist, 'yesno', 0, '', $conf->entity);
-	if (!($res > 0)) {
-		$error++;
-	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -289,7 +279,7 @@ foreach ($dirmodels as $reldir) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') {
-							print $langs->trans($tmp);
+							print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 						} else {
 							print $tmp;
 						}
@@ -299,7 +289,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->COMMANDE_ADDON == $file) {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -424,13 +414,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&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&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<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>";
 								}
 
@@ -439,7 +429,7 @@ foreach ($dirmodels as $reldir) {
 								if ($conf->global->COMMANDE_ADDON_PDF == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<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>';
 								}
 								print '</td>';
 
@@ -507,7 +497,7 @@ print '<input type="hidden" name="action" value="setribchq">';
 print $langs->trans("PaymentMode").'</td>';
 print '<td align="right">';
 if (empty($conf->facture->enabled)) {
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 }
 print '</td>';
 print "</tr>\n";
@@ -628,7 +618,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 print '</form>';
 
@@ -642,29 +632,10 @@ print $form->textwithpicto($langs->trans("WatermarkOnDraftOrders"), $htmltext, 1
 print '</td><td>';
 print '<input class="flat minwidth200" type="text" name="COMMANDE_DRAFT_WATERMARK" value="'.$conf->global->COMMANDE_DRAFT_WATERMARK.'">';
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 print '</form>';
 
-// Shippable Icon in List
-/* Kept as hidden feature for the moment, result seems bugged.
-Where is definition of "shippable" according to all different STOCK_CALCULATE_... options ?
-
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("ShippableOrderIconInList").'</td>';
-print '<td>&nbsp;</td>';
-print '<td class="center">';
-if (!empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setshippableiconinlist&amp;token='.newToken().'&amp;value=0">';
-	print img_picto($langs->trans("Activated"),'switch_on');
-} else {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setshippableiconinlist&amp;token='.newToken().'&amp;value=1">';
-	print img_picto($langs->trans("Disabled"),'switch_off');
-}
-print '</a></td>';
-print '</tr>';
-*/
-
 /*
 // Seems to be not so used. So kept hidden for the moment to avoid dangerous options inflation.
 // Ask for payment bank during order
@@ -676,9 +647,9 @@ if ($conf->banque->enabled) {
 		print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_ORDER');
 	} else {
 		if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER)) {
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_ORDER&amp;token='.newToken().'&amp;value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_ORDER&token='.newToken().'&value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
 		} else {
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_ORDER&amp;token='.newToken().'&amp;value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_ORDER&token='.newToken().'&value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
 		}
 	}
 	print '</td></tr>';
@@ -696,9 +667,9 @@ if ($conf->stock->enabled) {
 		print ajax_constantonoff('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER');
 	} else {
 		if (empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER&amp;token='.newToken().'&amp;value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER&token='.newToken().'&value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
 		} else {
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER&amp;token='.newToken().'&amp;value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER&token='.newToken().'&value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
 		}
 	}
 	print '</td></tr>';
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 85d168ac8b3..25495e2de43 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -369,23 +369,22 @@ $form = new Form($db);
 $formother = new FormOther($db);
 $formcompany = new FormCompany($db);
 
-$countrynotdefined = '<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>';
+$countrynotdefined = '<span class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</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>\n";
+print "<br><br>\n";
 
 
-/**
- * Edit parameters
- */
+// Edit parameters
+
 if (!empty($conf->use_javascript_ajax)) {
-	print "\n".'<script type="text/javascript" language="javascript">';
+	print "\n".'<script type="text/javascript">';
 	print '$(document).ready(function () {
 		  $("#selectcountry_id").change(function() {
 			document.form_index.action.value="updateedit";
@@ -418,7 +417,7 @@ print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_TOWN">'.$langs->tra
 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";
 
 // Country
-print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
+print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td>';
 print img_picto('', 'globe-americas', 'class="pictofixedwidth"');
 print $form->select_country($mysoc->country_id, 'country_id', '', 0);
 if ($user->admin) {
@@ -426,14 +425,14 @@ if ($user->admin) {
 }
 print '</td></tr>'."\n";
 
-print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
+print '<tr class="oddeven"><td class="wordbreak"><label for="state_id">'.$langs->trans("State").'</label></td><td>';
 $state_id = 0;
 if (!empty($conf->global->MAIN_INFO_SOCIETE_STATE)) {
 	$tmp = explode(':', $conf->global->MAIN_INFO_SOCIETE_STATE);
 	$state_id = $tmp[0];
 }
 print img_picto('', 'state', 'class="pictofixedwidth"');
-print $formcompany->select_state($state_id, $mysoc->country_code, 'state_id');
+print $formcompany->select_state($state_id, $mysoc->country_code, 'state_id', 'maxwidth200onsmartphone minwidth300');
 print '</td></tr>'."\n";
 
 // Currency
@@ -457,7 +456,7 @@ 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 class="maxwidth150" name="mail" id="email" value="'.dol_escape_htmltag((GETPOSTISSET('mail') ? GETPOST('mail', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? $conf->global->MAIN_INFO_SOCIETE_MAIL : ''))).'"></td></tr>';
+print '<input class="minwidth300 maxwidth500 widthcentpercentminusx" name="mail" id="email" value="'.dol_escape_htmltag((GETPOSTISSET('mail') ? GETPOST('mail', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) ? $conf->global->MAIN_INFO_SOCIETE_MAIL : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Web
@@ -483,7 +482,7 @@ print '</div>';
 if (!empty($mysoc->logo_small)) {
 	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
 		print '<div class="inline-block valignmiddle">';
-		print '<img style="max-height: 80px; max-width: 200px;" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">';
+		print '<img style="max-height: 80px; max-width: 200px;" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">';
 		print '</div>';
 	} elseif (!empty($mysoc->logo)) {
 		if (!file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
@@ -495,14 +494,14 @@ if (!empty($mysoc->logo_small)) {
 		print '</div>';
 	}
 	print '<div class="inline-block valignmiddle marginrightonly">';
-	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a>';
+	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo&token='.newToken().'">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a>';
 	print '</div>';
 } elseif (!empty($mysoc->logo)) {
 	if (file_exists($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
 		print '<div class="inline-block valignmiddle">';
-		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo).'">';
+		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo).'">';
 		print '</div>';
-		print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
+		print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo&token='.newToken().'">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
 	} else {
 		print '<div class="inline-block valignmiddle">';
 		print '<img height="80" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
@@ -520,7 +519,7 @@ print '</div>';
 if (!empty($mysoc->logo_squarred_small)) {
 	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_small)) {
 		print '<div class="inline-block valignmiddle marginrightonly">';
-		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_small).'">';
+		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_small).'">';
 		print '</div>';
 	} elseif (!empty($mysoc->logo_squarred)) {
 		if (!file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
@@ -528,16 +527,16 @@ if (!empty($mysoc->logo_squarred_small)) {
 		}
 		$imgThumbSmall = vignette($conf->mycompany->dir_output.'/logos/'.$mysoc->logo_squarred, $maxwidthmini, $maxheightmini, '_small', $quality);
 		print '<div class="inline-block valignmiddle">';
-		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.basename($imgThumbSmall)).'">';
+		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/thumbs/'.basename($imgThumbSmall)).'">';
 		print '</div>';
 	}
-	print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogosquarred">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
+	print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogosquarred&token='.newToken().'">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
 } elseif (!empty($mysoc->logo_squarred)) {
 	if (file_exists($conf->mycompany->dir_output.'/logos/'.$mysoc->logo_squarred)) {
 		print '<div class="inline-block valignmiddle">';
-		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo_squarred).'">';
+		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo_squarred).'">';
 		print '</div>';
-		print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogosquarred">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
+		print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogosquarred&token='.newToken().'">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
 	} else {
 		print '<div class="inline-block valignmiddle">';
 		print '<img height="80" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
@@ -824,10 +823,7 @@ if ($mysoc->useRevenueStamp()) {
 
 print "</table>";
 
-
-print '<br><div class="center">';
-print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
index eafda362486..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";
@@ -108,9 +108,14 @@ print '<input type="hidden" name="action" value="update">';
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent editmode">';
 print '<tr class="liste_titre">';
-print '<td class="titlefieldcreate">'.$langs->trans("SocialNetworksInformation").'</td><td>'.$langs->trans("Url").'</td><td>'.$langs->trans("SocialNetworkId").'</td><td></td>';
+print '<td class="titlefieldcreate">'.$langs->trans("SocialNetworksInformation").'</td>';
+print '<td>'.$langs->trans("SocialNetworkId").'</td>';
+print '<td>'.$form->textwithpicto($langs->trans("Url"), $langs->trans("KeepEmptyToUseDefault")).'</td>';
+print '<td></td>';
 print "</tr>\n";
 
+$listofnetworks = dol_sort_array($listofnetworks, 'label');
+//var_dump($listofnetworks);
 
 foreach ($listofnetworks as $key => $value) {
 	if (!empty($value['active'])) {
@@ -119,9 +124,9 @@ foreach ($listofnetworks as $key => $value) {
 		$networkconstname = 'MAIN_INFO_SOCIETE_'.strtoupper($key).'_URL';
 		$networkconstid = 'MAIN_INFO_SOCIETE_'.strtoupper($key);
 		print '<td class="nowraponall"><span class="fa paddingright '.($value['icon'] ? $value['icon'] : 'fa-link').'"></span>';
-		print '<input name="'.$key.'url" id="'.$key.'url" class="minwidth300" value="'.(!empty($conf->global->$networkconstname) ? dol_escape_htmltag($conf->global->$networkconstname) : '').'">';
-		print '</td><td>';
 		print '<input name="'.$key.'" id="'.$key.'" class="minwidth300" value="'.(!empty($conf->global->$networkconstid) ? dol_escape_htmltag($conf->global->$networkconstid) : '').'">';
+		print '</td><td>';
+		print '<input name="'.$key.'url" id="'.$key.'url" class="minwidth300" value="'.(!empty($conf->global->$networkconstname) ? dol_escape_htmltag($conf->global->$networkconstname) : '').'">';
 		print '</td>';
 		print '<td class="nowraponall">'.dol_print_socialnetworks((!empty($conf->global->$networkconstid) ? dol_escape_htmltag($conf->global->$networkconstid) : ''), 0, 0, $key, $listofnetworks).'</td>';
 		print '</tr>'."\n";
@@ -131,11 +136,8 @@ foreach ($listofnetworks as $key => $value) {
 print "</table>";
 print '</div>';
 
-print '<br>';
 
-print '<br><div class="center">';
-print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 6aad1c55d04..047b87ff014 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -199,7 +199,7 @@ print '</td></tr>';
 
 print "</table>\n";
 
-print '<br><br><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
+print '<br><br><div style="text-align:center"><input type="submit" class="button button-edit" name="button" value="'.$langs->trans('Modify').'"></div>';
 print '</form>';
 
 // End of page
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 93550ea3254..1426c323c01 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -37,8 +37,6 @@ if (!$user->admin) {
 $rowid = GETPOST('rowid', 'int');
 $entity = GETPOST('entity', 'int');
 $action = GETPOST('action', 'aZ09');
-$update = GETPOST('update', 'alpha');
-$delete = GETPOST('delete', 'none'); // Do not use alpha here
 $debug = GETPOST('debug', 'int');
 $consts = GETPOST('const', 'array');
 $constname = GETPOST('constname', 'alphanohtml');
@@ -222,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" value="'.$langs->trans("Add").'" name="add">';
+print '<input type="submit" class="button button-add" name="add" value="'.$langs->trans("Add").'">';
 print "</td>\n";
 print '</tr>';
 
@@ -259,7 +257,7 @@ if ($result) {
 
 		print "\n";
 
-		print '<tr class="oddeven"><td>'.$obj->name.'</td>'."\n";
+		print '<tr class="oddeven" data-checkbox-id="check_'.$i.'"><td>'.$obj->name.'</td>'."\n";
 
 		// Value
 		print '<td>';
@@ -310,10 +308,10 @@ print '</div>';
 if ($conf->use_javascript_ajax) {
 	print '<br>';
 	print '<div id="updateconst" class="right">';
-	print '<input type="submit" name="update" class="button marginbottomonly" value="'.$langs->trans("Modify").'">';
+	print '<input type="submit" class="button button-edit marginbottomonly" name="update" value="'.$langs->trans("Modify").'">';
 	print '</div>';
 	print '<div id="delconst" class="right">';
-	print '<input type="submit" name="delete" class="button marginbottomonly" value="'.$langs->trans("Delete").'">';
+	print '<input type="submit" class="button button-cancel marginbottomonly" name="delete" value="'.$langs->trans("Delete").'">';
 	print '</div>';
 }
 
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index c10a6ed04b4..0c8aba5ae2d 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -37,6 +37,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'contract';
@@ -220,7 +222,7 @@ foreach ($dirmodels as $reldir) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') {
-							print $langs->trans($tmp);
+							print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 						} else {
 							print $tmp;
 						}
@@ -230,7 +232,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->CONTRACT_ADDON == "$file") {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -353,13 +355,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&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&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<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>";
 								}
 
@@ -368,7 +370,7 @@ foreach ($dirmodels as $reldir) {
 								if ($conf->global->CONTRACT_ADDON_PDF == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.urlencode($name).'&amp;scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 								}
 								print '</td>';
 
@@ -468,9 +470,7 @@ print '</tr>';
 
 print '</table>';
 
-print '<div class="center">';
-print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-print '</div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index df14ef4c1b0..e12848e3de1 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -123,12 +123,12 @@ if ($action == 'edit') {
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	foreach ($arrayofparameters as $key => $val) {
-		print '<tr class="oddeven"><td>';
+		print '<tr class="oddeven"><td class="titlefieldmiddle">';
 		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
 		$label = $langs->trans($key);
 		if ($key == 'DAV_RESTICT_ON_IP') {
 			$label = $langs->trans("RESTRICT_ON_IP");
-			$label .= ' '.$langs->trans("Example").': '.$langs->trans("IPListExample");
+			$label .= ' <span class="opacitymedium">'.$langs->trans("Example").': '.$langs->trans("IPListExample").'</span>';
 		}
 		print $form->textwithpicto($label, $tooltiphelp);
 		print '</td><td>';
@@ -145,7 +145,7 @@ if ($action == 'edit') {
 	print '</table>';
 
 	print '<div class="tabsAction">';
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 	print '</div>';
 }
 
@@ -173,11 +173,11 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
 
 // Show message
 $message = '';
-$url = '<a href="'.$urlwithroot.'/dav/fileserver.php" target="_blank">'.$urlwithroot.'/dav/fileserver.php</a>';
+$url = '<a href="'.$urlwithroot.'/dav/fileserver.php" target="_blank" rel="noopener noreferrer">'.$urlwithroot.'/dav/fileserver.php</a>';
 
 $message .= img_picto('', 'globe').' '.str_replace('{url}', $url, $langs->trans("WebDavServer", 'WebDAV', ''));
 $message .= '<div class="urllink"><input type="text" id="webdavpublicurl" class="quatrevingtpercent" value="'.$urlwithroot.'/dav/fileserver.php">';
-$message .= '<a href="'.$urlwithroot.'/dav/fileserver.php" target="_blank">';
+$message .= '<a href="'.$urlwithroot.'/dav/fileserver.php" target="_blank" rel="noopener noreferrer">';
 $message .= ' '.img_picto('', 'globe');
 $message .= '</a>';
 $message .= '</div>';
@@ -186,11 +186,11 @@ $message .= ajax_autoselect('webdavpublicurl');
 $message .= '<br>';
 if (!empty($conf->global->DAV_ALLOW_PUBLIC_DIR)) {
 	$urlEntity = (!empty($conf->multicompany->enabled) ? '?entity='.$conf->entity : '');
-	$url = '<a href="'.$urlwithroot.'/dav/fileserver.php/public/'.$urlEntity.'" target="_blank">'.$urlwithroot.'/dav/fileserver.php/public/'.$urlEntity.'</a>';
+	$url = '<a href="'.$urlwithroot.'/dav/fileserver.php/public/'.$urlEntity.'" target="_blank" rel="noopener noreferrer">'.$urlwithroot.'/dav/fileserver.php/public/'.$urlEntity.'</a>';
 
 	$message .= img_picto('', 'globe').' '.str_replace('{url}', $url, $langs->trans("WebDavServer", 'WebDAV public', ''));
 	$message .= '<div class="urllink"><input type="text" id="webdavurl" class="quatrevingtpercent" value="'.$urlwithroot.'/dav/fileserver.php/public/'.$urlEntity.'">';
-	$message .= '<a href="'.$urlwithroot.'/dav/fileserver.php/public/'.$urlEntity.'" target="_blank">';
+	$message .= '<a href="'.$urlwithroot.'/dav/fileserver.php/public/'.$urlEntity.'" target="_blank" rel="noopener noreferrer">';
 	$message .= ' '.img_picto('', 'globe');
 	$message .= '</a>';
 	$message .= '</div>';
diff --git a/htdocs/admin/debugbar.php b/htdocs/admin/debugbar.php
index 19a440520b1..3e878b9398b 100644
--- a/htdocs/admin/debugbar.php
+++ b/htdocs/admin/debugbar.php
@@ -90,7 +90,7 @@ 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" '.$option.' value="'.$langs->trans("Modify").'"></td>';
+print '<td class="right"><input type="submit" class="button button-edit" '.$option.' value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
 
 print '<tr class="oddeven"><td>'.$langs->trans("DEBUGBAR_LOGS_LINES_NUMBER").'</td>';
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 038d8d0915c..58a72250d64 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -46,8 +46,8 @@ $optioncss = GETPOST('optionscss', 'alphanohtml');
 $mode = GETPOST('mode', 'aZ09') ? GETPOST('mode', 'aZ09') : 'createform'; // 'createform', 'filters', 'sortorder', 'focus'
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -64,7 +64,7 @@ if (!$sortorder) {
 
 $defaulturl = GETPOST('defaulturl', 'alphanohtml');
 $defaultkey = GETPOST('defaultkey', 'alphanohtml');
-$defaultvalue = GETPOST('defaultvalue', 'none');
+$defaultvalue = GETPOST('defaultvalue', 'restricthtml');
 
 $defaulturl = preg_replace('/^\//', '', $defaulturl);
 
@@ -206,12 +206,12 @@ $param = '&mode='.$mode;
 $enabledisablehtml = $langs->trans("EnableDefaultValues").' ';
 if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) {
 	// Button off, click to enable
-	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;token='.newToken().'&amp;value=1'.$param.'">';
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&token='.newToken().'&value=1'.$param.'">';
 	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
 	$enabledisablehtml .= '</a>';
 } else {
 	// Button on, click to disable
-	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;token='.newToken().'&amp;value=0'.$param.'">';
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&token='.newToken().'&value=0'.$param.'">';
 	$enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
 	$enabledisablehtml .= '</a>';
 }
@@ -350,17 +350,15 @@ if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) {
 	$disabled = ' disabled="disabled"';
 }
 print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add">';
-print "</td>\n";
-print '</tr>';
+print '</td>'."\n";
+print '</tr>'."\n";
 
-$result=$object->fetchAll($sortorder, $sortfield, 0, 0, array('t.type'=>$mode,'t.entity'=>array($user->entity,$conf->entity)));
+$result = $object->fetchAll($sortorder, $sortfield, 0, 0, array('t.type'=>$mode,'t.entity'=>array($user->entity,$conf->entity)));
 
-if (!is_array($result) && $result<0) {
+if (!is_array($result) && $result < 0) {
 	setEventMessages($object->error, $object->errors, 'errors');
-} elseif (count($result)>0) {
-	foreach ($result as $key=>$defaultvalue) {
-		print "\n";
-
+} elseif (is_array($result) && count($result) > 0) {
+	foreach ($result as $key => $defaultvalue) {
 		print '<tr class="oddeven">';
 
 		// Page
@@ -378,11 +376,6 @@ if (!is_array($result) && $result<0) {
 		// Value
 		if ($mode != 'focus' && $mode != 'mandatory') {
 			print '<td>';
-			/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
-			print '<input type="hidden" name="const['.$i.'][lang]" value="'.$obj->lang.'">';
-			print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
-			print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
-			*/
 			if ($action != 'edit' || GETPOST('rowid') != $defaultvalue->id) print dol_escape_htmltag($defaultvalue->value);
 			else print '<input type="text" name="value" value="'.dol_escape_htmltag($defaultvalue->value).'">';
 			print '</td>';
@@ -399,14 +392,12 @@ if (!is_array($result) && $result<0) {
 			print '<input type="hidden" name="page" value="'.$page.'">';
 			print '<input type="hidden" name="rowid" value="'.$id.'">';
 			print '<div name="'.(!empty($defaultvalue->id) ? $defaultvalue->id : 'none').'"></div>';
-			print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+			print '<input type="submit" class="button button-edit" name="actionmodify" value="'.$langs->trans("Modify").'">';
 			print '<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 		}
 		print '</td>';
 
 		print "</tr>\n";
-		print "\n";
-		$i++;
 	}
 }
 
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 4b1e34335e8..229fb3e2291 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -448,11 +448,11 @@ if (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METE
 
 
 if ($action == 'edit') {
-	print '<br><div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
-	print '<br></form>';
+	print $form->buttonsSaveCancel("Save", '');
+	print '</form>';
 } else {
 	print '<br><div class="tabsAction">';
-	print '<a class="butAction" href="delais.php?action=edit">'.$langs->trans("Modify").'</a></div>';
+	print '<a class="butAction" href="delais.php?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a></div>';
 }
 
 // End of page
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index cbbcafcf975..6f0f4c1b415 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $action  = GETPOST('action', 'alpha');
 $value   = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label   = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'delivery';
@@ -225,7 +227,7 @@ foreach ($dirmodels as $reldir) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') {
-							print $langs->trans($tmp);
+							print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 						} else {
 							print $tmp;
 						}
@@ -235,7 +237,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->DELIVERY_ADDON_NUMBER == "$file") {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
 
@@ -357,13 +359,13 @@ foreach ($dirmodels as $reldir) {
 							// Active
 							if (in_array($name, $def)) {
 								print "<td align=\"center\">\n";
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">';
 								print img_picto($langs->trans("Enabled"), 'switch_on');
 								print '</a>';
 								print "</td>";
 							} else {
 								print "<td align=\"center\">\n";
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+								print '<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>";
 							}
 
@@ -372,7 +374,7 @@ foreach ($dirmodels as $reldir) {
 							if ($conf->global->DELIVERY_ADDON_PDF == "$name") {
 								print img_picto($langs->trans("Default"), 'on');
 							} else {
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+								print '<a 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>';
 							}
 							print '</td>';
 
@@ -439,7 +441,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 print '</form>';
 
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index eab0942ee4e..fb28aa3d045 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -3,12 +3,12 @@
  * Copyright (C) 2004-2018	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
  * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2010-2016	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2011-2019	Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2010-2022	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2011-2021	Philippe Grand			<philippe.grand@atoo-net.com>
  * 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-2020	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2011-2021	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>
@@ -77,8 +77,8 @@ $listoffset = GETPOST('listoffset');
 $listlimit = GETPOST('listlimit') > 0 ?GETPOST('listlimit') : 1000; // To avoid too long dictionaries
 $active = 1;
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -202,7 +202,7 @@ $tabsql[3] = "SELECT r.rowid as rowid, r.code_region as state_code, r.nom as lib
 $tabsql[4] = "SELECT c.rowid as rowid, c.code, c.label, c.active, c.favorite 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, a.deductible, 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";
+$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";
 $tabsql[8] = "SELECT t.id	 as rowid, t.code as code, t.libelle, t.fk_country as country_id, c.code as country_code, c.label as country, t.position, t.active FROM ".MAIN_DB_PREFIX."c_typent as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON t.fk_country=c.rowid";
 $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";
@@ -223,7 +223,7 @@ $tabsql[24] = "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFI
 $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.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";
@@ -232,7 +232,7 @@ $tabsql[33] = "SELECT rowid, pos, code, label, active FROM ".MAIN_DB_PREFIX."c_h
 $tabsql[34] = "SELECT rowid, pos, code, label, c_level, active FROM ".MAIN_DB_PREFIX."c_hrm_function";
 $tabsql[35] = "SELECT c.rowid, c.label, c.active, c.entity FROM ".MAIN_DB_PREFIX."c_exp_tax_cat c";
 $tabsql[36] = "SELECT r.rowid, r.fk_c_exp_tax_cat, r.range_ik, r.active, r.entity FROM ".MAIN_DB_PREFIX."c_exp_tax_range r";
-$tabsql[37] = "SELECT r.rowid, r.code, r.label, r.short_label, r.unit_type, r.scale, r.active FROM ".MAIN_DB_PREFIX."c_units r";
+$tabsql[37] = "SELECT r.rowid, r.code, r.sortorder, r.label, r.short_label, r.unit_type, r.scale, r.active FROM ".MAIN_DB_PREFIX."c_units r";
 $tabsql[38] = "SELECT s.rowid, s.entity, s.code, s.label, s.url, s.icon, s.active FROM ".MAIN_DB_PREFIX."c_socialnetworks as s WHERE s.entity = ".getEntity($tabname[38]);
 $tabsql[39] = "SELECT code, label as libelle, sortorder, active FROM ".MAIN_DB_PREFIX."c_prospectcontactlevel";
 $tabsql[40] = "SELECT id      as rowid, code, libelle, picto, active FROM ".MAIN_DB_PREFIX."c_stcommcontact";
@@ -278,7 +278,7 @@ $tabsqlsort[33] = "code ASC";
 $tabsqlsort[34] = "code ASC";
 $tabsqlsort[35] = "c.label ASC";
 $tabsqlsort[36] = "r.fk_c_exp_tax_cat ASC, r.range_ik ASC";
-$tabsqlsort[37] = "r.unit_type ASC, r.scale ASC, r.code ASC";
+$tabsqlsort[37] = "sortorder ASC";
 $tabsqlsort[38] = "rowid, code ASC";
 $tabsqlsort[39] = "sortorder ASC";
 $tabsqlsort[40] = "code ASC";
@@ -294,7 +294,7 @@ $tabfield[3] = "code,libelle,country_id,country";
 $tabfield[4] = "code,label";
 $tabfield[5] = "code,label";
 $tabfield[6] = "code,libelle,type,color,position";
-$tabfield[7] = "code,libelle,country,accountancy_code,deductible";
+$tabfield[7] = "code,libelle,country,accountancy_code";
 $tabfield[8] = "code,libelle,country_id,country".(!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
 $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";
@@ -315,7 +315,7 @@ $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";
 $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";
@@ -324,7 +324,7 @@ $tabfield[33] = "code,label";
 $tabfield[34] = "code,label";
 $tabfield[35] = "label";
 $tabfield[36] = "range_ik,fk_c_exp_tax_cat";
-$tabfield[37] = "code,label,short_label,unit_type,scale";
+$tabfield[37] = "code,label,short_label,unit_type,scale,sortorder";
 $tabfield[38] = "code,label,url,icon,entity";
 $tabfield[39] = "code,libelle,sortorder";
 $tabfield[40] = "code,libelle,picto";
@@ -340,7 +340,7 @@ $tabfieldvalue[3] = "code,libelle,country";
 $tabfieldvalue[4] = "code,label";
 $tabfieldvalue[5] = "code,label";
 $tabfieldvalue[6] = "code,libelle,type,color,position";
-$tabfieldvalue[7] = "code,libelle,country,accountancy_code,deductible";
+$tabfieldvalue[7] = "code,libelle,country,accountancy_code";
 $tabfieldvalue[8] = "code,libelle,country".(!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
 $tabfieldvalue[9] = "code,label,unicode";
 $tabfieldvalue[10] = "country,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
@@ -361,7 +361,7 @@ $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";
 $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";
@@ -370,7 +370,7 @@ $tabfieldvalue[33] = "code,label";
 $tabfieldvalue[34] = "code,label";
 $tabfieldvalue[35] = "label";
 $tabfieldvalue[36] = "range_ik,fk_c_exp_tax_cat";
-$tabfieldvalue[37] = "code,label,short_label,unit_type,scale";
+$tabfieldvalue[37] = "code,label,short_label,unit_type,scale,sortorder";
 $tabfieldvalue[38] = "code,label,url,icon";
 $tabfieldvalue[39] = "code,libelle,sortorder";
 $tabfieldvalue[40] = "code,libelle,picto";
@@ -386,7 +386,7 @@ $tabfieldinsert[3] = "code_region,nom,fk_pays";
 $tabfieldinsert[4] = "code,label";
 $tabfieldinsert[5] = "code,label";
 $tabfieldinsert[6] = "code,libelle,type,color,position";
-$tabfieldinsert[7] = "code,libelle,fk_pays,accountancy_code,deductible";
+$tabfieldinsert[7] = "code,libelle,fk_pays,accountancy_code";
 $tabfieldinsert[8] = "code,libelle,fk_country".(!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ',position' : '');
 $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";
@@ -407,7 +407,7 @@ $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";
 $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";
@@ -417,7 +417,7 @@ $tabfieldinsert[33] = "code,label";
 $tabfieldinsert[34] = "code,label";
 $tabfieldinsert[35] = "label";
 $tabfieldinsert[36] = "range_ik,fk_c_exp_tax_cat";
-$tabfieldinsert[37] = "code,label,short_label,unit_type,scale";
+$tabfieldinsert[37] = "code,label,short_label,unit_type,scale,sortorder";
 $tabfieldinsert[38] = "code,label,url,icon,entity";
 $tabfieldinsert[39] = "code,label,sortorder";
 $tabfieldinsert[40] = "code,libelle,picto";
@@ -509,8 +509,8 @@ $tabcond[30] = !empty($conf->label->enabled);
 $tabcond[32] = (!empty($conf->holiday->enabled) || !empty($conf->hrm->enabled));
 $tabcond[33] = !empty($conf->hrm->enabled);
 $tabcond[34] = !empty($conf->hrm->enabled);
-$tabcond[35] = !empty($conf->expensereport->enabled);
-$tabcond[36] = !empty($conf->expensereport->enabled);
+$tabcond[35] = !empty($conf->expensereport->enabled) && !empty($conf->global->MAIN_USE_EXPENSE_IK);
+$tabcond[36] = !empty($conf->expensereport->enabled) && !empty($conf->global->MAIN_USE_EXPENSE_IK);
 $tabcond[37] = !empty($conf->product->enabled);
 $tabcond[38] = !empty($conf->socialnetworks->enabled);
 $tabcond[39] = (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && !empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES));
@@ -548,7 +548,7 @@ $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[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"));
@@ -695,7 +695,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) {
 	$listfieldmodify = explode(',', $tabfieldinsert[$id]);
 	$listfieldvalue = explode(',', $tabfieldvalue[$id]);
 
-	// Check that all fields are filled
+	// Check that all mandatory fields are filled
 	$ok = 1;
 	foreach ($listfield as $f => $value) {
 		// Discard check of mandatory fields for country for some tables
@@ -1343,6 +1343,9 @@ if ($id) {
 			if ($value == 'short_label') {
 				$valuetoshow = $langs->trans("ShortLabel");
 			}
+			if ($value == 'fk_parent') {
+				$valuetoshow = $langs->trans("ParentID"); $class = 'center';
+			}
 			if ($value == 'range_account') {
 				$valuetoshow = $langs->trans("Range");
 			}
@@ -1391,7 +1394,7 @@ if ($id) {
 			if ($value == 'delay') {
 				$valuetoshow = $langs->trans("NoticePeriod");
 			}
-			if ($value == 'newByMonth') {
+			if ($value == 'newbymonth') {
 				$valuetoshow = $langs->trans("NewByMonth");
 			}
 			if ($value == 'fk_tva') {
@@ -1415,6 +1418,9 @@ if ($id) {
 			if ($value == 'public' && $tablib[$id] == 'TicketDictCategory') {
 				$valuetoshow = $langs->trans('TicketGroupIsPublic'); $class = 'center';
 			}
+			if ($value == 'block_if_negative') {
+				$valuetoshow = $langs->trans('BlockHolidayIfNegative');
+			}
 
 			if ($id == 2) {	// Special case for state page
 				if ($value == 'region_id') {
@@ -1487,7 +1493,7 @@ if ($id) {
 		}
 		print '<td colspan="3" class="center">';
 		if ($action != 'edit') {
-			print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+			print '<input type="submit" class="button button-add" name="actionadd" value="'.$langs->trans("Add").'">';
 		}
 		print '</td>';
 
@@ -1686,6 +1692,9 @@ if ($id) {
 			if ($value == 'short_label') {
 				$valuetoshow = $langs->trans("ShortLabel");
 			}
+			if ($value == 'fk_parent') {
+				$valuetoshow = $langs->trans("ParentID"); $cssprefix = 'center ';
+			}
 			if ($value == 'range_account') {
 				$valuetoshow = $langs->trans("Range");
 			}
@@ -1734,7 +1743,7 @@ if ($id) {
 			if ($value == 'delay') {
 				$valuetoshow = $langs->trans("NoticePeriod");
 			}
-			if ($value == 'newByMonth') {
+			if ($value == 'newbymonth') {
 				$valuetoshow = $langs->trans("NewByMonth");
 			}
 			if ($value == 'fk_tva') {
@@ -1758,6 +1767,9 @@ 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 == 'region_id' || $value == 'country_id') {
 				$showfield = 0;
@@ -1810,7 +1822,7 @@ if ($id) {
 					if (!is_null($withentity)) {
 						print '<input type="hidden" name="entity" value="'.$withentity.'">';
 					}
-					print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+					print '<input type="submit" class="button button-edit" name="actionmodify" value="'.$langs->trans("Modify").'">';
 					print '<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 					print '</td>';
 				} else {
@@ -1828,6 +1840,7 @@ if ($id) {
 							$class = '';
 							$showfield = 1;
 							$valuetoshow = empty($obj->{$value}) ? '' : $obj->{$value};
+							$titletoshow = '';
 
 							if ($value == 'entity') {
 								$withentity = $valuetoshow;
@@ -1959,6 +1972,12 @@ if ($id) {
 							} elseif (in_array($value, array('recuperableonly'))) {
 								$class = "center";
 							} elseif ($value == 'accountancy_code' || $value == 'accountancy_code_sell' || $value == 'accountancy_code_buy') {
+								if (!empty($conf->accounting->enabled)) {
+									require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+									$tmpaccountingaccount = new AccountingAccount($db);
+									$tmpaccountingaccount->fetch(0, $valuetoshow, 1);
+									$titletoshow = $langs->transnoentitiesnoconv("Pcgtype").': '.$tmpaccountingaccount->pcg_type;
+								}
 								$valuetoshow = length_accountg($valuetoshow);
 							} elseif ($value == 'fk_tva') {
 								foreach ($form->cache_vatrates as $key => $Tab) {
@@ -1968,8 +1987,9 @@ if ($id) {
 									}
 								}
 							} elseif ($value == 'fk_c_exp_tax_cat') {
-								$valuetoshow = getDictvalue(MAIN_DB_PREFIX.'c_exp_tax_cat', 'label', $valuetoshow);
-								$valuetoshow = $langs->trans($valuetoshow);
+								$tmpid = $valuetoshow;
+								$valuetoshow = getDictionaryValue(MAIN_DB_PREFIX.'c_exp_tax_cat', 'label', $tmpid);
+								$valuetoshow = $langs->trans($valuetoshow ? $valuetoshow : $tmpid);
 							} elseif ($tabname[$id] == MAIN_DB_PREFIX.'c_exp_tax_cat') {
 								$valuetoshow = $langs->trans($valuetoshow);
 							} elseif ($value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_units') {
@@ -1984,6 +2004,8 @@ if ($id) {
 							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_productbatch_qcstatus') {
 								$langs->load("productbatch");
 								$valuetoshow = $langs->trans($obj->{$value});
+							} elseif ($value == 'block_if_negative') {
+								$valuetoshow = yn($obj->{$value});
 							}
 							$class .= ($class ? ' ' : '').'tddict';
 							if ($value == 'note' && $id == 10) {
@@ -1995,10 +2017,7 @@ if ($id) {
 							if (in_array($value, array('pos', 'position'))) {
 								$class .= ' right';
 							}
-							if ($value == 'localtax1_type') {
-								$class .= ' nowrap';
-							}
-							if ($value == 'localtax2_type') {
+							if (in_array($value, array('localtax1_type', 'localtax2_type'))) {
 								$class .= ' nowrap';
 							}
 							if (in_array($value, array('use_default', 'fk_parent'))) {
@@ -2009,7 +2028,7 @@ if ($id) {
 							}
 							// Show value for field
 							if ($showfield) {
-								print '<!-- '. $value .' --><td class="'.$class.'">'.$valuetoshow.'</td>';
+								print '<!-- '. $value .' --><td class="'.$class.'"'.($titletoshow ? ' title="'.dol_escape_htmltag($titletoshow).'"' : '').'>'.$valuetoshow.'</td>';
 							}
 						}
 					}
@@ -2104,7 +2123,7 @@ if ($id) {
 					if ($iserasable) {
 						print '<td class="center">';
 						if ($user->admin) {
-							print '<a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
+							print '<a class="reposition" href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
 						}
 						//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
 						print '</td>';
@@ -2268,7 +2287,13 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td>';
 			print $form->selectarray('source', $sourceList, (!empty($obj->{$value}) ? $obj->{$value}:''));
 			print '</td>';
+		} elseif (in_array($value, array('public', 'use_default'))) {
+			// Fields 0/1 with a combo select Yes/No
+			print '<td class="center">';
+			print $form->selectyesno($value, (!empty($obj->{$value}) ? $obj->{$value}:''), 1);
+			print '</td>';
 		} elseif ($value == 'private') {
+			// Fields 'no'/'yes' with a combo select Yes/No
 			print '<td>';
 			print $form->selectyesno("private", (!empty($obj->{$value}) ? $obj->{$value}:''));
 			print '</td>';
@@ -2363,8 +2388,12 @@ 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>';
 		} else {
-			$fieldValue = isset($obj->{$value}) ? $obj->{$value}:'';
+			$fieldValue = isset($obj->{$value}) ? $obj->{$value}: '';
 
 			if ($value == 'sortorder') {
 				$fieldlist[$field] = 'position';
@@ -2380,12 +2409,43 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'use_default', 'affect', 'delay', 'public', 'sortorder', 'sens', 'category_type', 'fk_parent'))) {
 				$class = 'maxwidth50 center';
 			}
-			if (in_array($fieldlist[$field], array('use_default', 'public'))) {
+			if (in_array($fieldlist[$field], array('use_default', 'public', 'fk_parent'))) {
 				$classtd = 'center';
 			}
 			if (in_array($fieldlist[$field], array('libelle', 'label', 'tracking'))) {
 				$class = 'quatrevingtpercent';
 			}
+			// Fields that must be suggested as '0' instead of ''
+			if ($fieldlist[$field] == 'fk_parent') {
+				if (empty($fieldValue)) {
+					$fieldValue = '0';
+				}
+			}
+
+			// Labels Length
+			$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':
+						$maxlength = ' maxlength="255"';
+						break;
+					case MAIN_DB_PREFIX . 'c_email_templates':
+						$maxlength = ' maxlength="180"';
+						break;
+					case MAIN_DB_PREFIX . 'c_socialnetworks':
+						$maxlength = ' maxlength="150"';
+						break;
+					default:
+						$maxlength = ' maxlength="128"';
+				}
+			}
+
 			print '<td class="'.$classtd.'">';
 			$transfound = 0;
 			$transkey = '';
@@ -2404,7 +2464,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				}
 			}
 			if (!$transfound) {
-				print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.dol_escape_htmltag($fieldValue).'" name="'.$fieldlist[$field].'">';
+				print '<input type="text" class="flat'.($class ? ' '.$class : '').'"'.($maxlength ? ' '.$maxlength : '').' value="'.dol_escape_htmltag($fieldValue).'" name="'.$fieldlist[$field].'">';
 			} else {
 				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
 			}
diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php
index 546ef1d57a6..e823d6e2d37 100644
--- a/htdocs/admin/dolistore/class/dolistore.class.php
+++ b/htdocs/admin/dolistore/class/dolistore.class.php
@@ -268,7 +268,7 @@ 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" mime="image/png" title="'.dol_escape_htmltag($product->name->language[$this->lang - 1].', '.$langs->trans('Version').' '.$product->module_version).'">';
+				$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>';
 			} else {
 				$images = '<img src="'.DOL_URL_ROOT.'/admin/dolistore/img/NoImageAvailable.png" />';
@@ -280,8 +280,8 @@ class Dolistore
 				$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>';
 			} else {
 				$price         = '<h3>'.$langs->trans('Free').'</h3>';
-				$download_link = '<a target="_blank" 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" 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="'.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>';
 			}
 
 			// Set and check version
@@ -308,7 +308,7 @@ class Dolistore
 				}
 			} else {
 				//need update
-				$version    = '<span class="compatibleafterupdate">'.$langs->trans(
+				$version = '<span class="compatibleafterupdate">'.$langs->trans(
 					'CompatibleAfterUpdate',
 					DOL_VERSION,
 					$product->dolibarr_min,
@@ -317,8 +317,6 @@ class Dolistore
 				$compatible = 'NotCompatible';
 			}
 
-			//.'<br><a class="inline-block valignmiddle" target="_blank" href="'.$this->shop_url.$product->id.'"><span class="details button">'.$langs->trans("SeeInMarkerPlace").'</span></a>
-
 			//output template
 			$html .= '<tr class="app oddeven '.dol_escape_htmltag($compatible).'">';
 			$html .= '<td class="center" width="210"><div class="newAppParent">';
diff --git a/htdocs/admin/dolistore/css/dolistore.css b/htdocs/admin/dolistore/css/dolistore.css
index fb4dc2d5bb1..3d8f163caf2 100644
--- a/htdocs/admin/dolistore/css/dolistore.css
+++ b/htdocs/admin/dolistore/css/dolistore.css
@@ -1,6 +1,5 @@
 
 div.divsearchfield {
-    float: left;
     margin: 4px 12px 4px 2px;
     padding-left: 2px;
 }
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index 52badf366ca..44df7f74189 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -93,9 +93,9 @@ if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('ECM_AUTO_TREE_ENABLED');
 } else {
 	if (empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ECM_AUTO_TREE_ENABLED&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ECM_AUTO_TREE_ENABLED&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	} elseif (!empty($conf->global->USER_MAIL_REQUIRED)) {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ECM_AUTO_TREE_ENABLED&amp;token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ECM_AUTO_TREE_ENABLED&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td></tr>';
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index fdc0b893087..7a4faa989d0 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -276,11 +276,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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 $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 }
@@ -309,9 +305,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	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->buttonsSaveCancel();
 
 	print '</form>';
 }
@@ -362,7 +356,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/admin/emailcollector_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$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">';
 	/*
@@ -380,7 +374,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			{
 				if ($action != 'classify')
 				{
-					$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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.'">';
@@ -496,7 +490,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>'.$form->textwithpicto($langs->trans("Filters"), $langs->trans("EmailCollectorFilterDesc")).'</td><td></td><td></td>';
+	print '<td>'.img_picto('', 'filter', 'class="pictofixedwidth"').$form->textwithpicto($langs->trans("Filters"), $langs->trans("EmailCollectorFilterDesc")).'</td><td></td><td></td>';
 	print '</tr>';
 	// Add filter
 	print '<tr class="oddeven nodrag nodrop">';
@@ -581,7 +575,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<div class="div-table-responsive">';
 	print '<table id="tablelines" class="noborder margintable noshadow">';
 	print '<tr class="liste_titre nodrag nodrop">';
-	print '<td>'.$form->textwithpicto($langs->trans("EmailcollectorOperations"), $langs->trans("EmailcollectorOperationsDesc")).'</td><td></td><td></td><td></td>';
+	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">';
@@ -589,16 +583,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$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) {
 		$arrayoftypes['project'] = 'CreateLeadAndThirdParty';
 	}
+	$arrayoftypesnocondition['project'] = 'CreateLeadAndThirdParty';
 	if ($conf->ticket->enabled) {
 		$arrayoftypes['ticket'] = 'CreateTicketAndThirdParty';
 	}
+	$arrayoftypesnocondition['ticket'] = 'CreateTicketAndThirdParty';
 	if ($conf->recruitment->enabled) {
 		$arrayoftypes['candidature'] = 'CreateCandidature';
 	}
+	$arrayoftypesnocondition['candidature'] = 'CreateCandidature';
 
 	// support hook for add action
 	$parameters = array('arrayoftypes' => $arrayoftypes);
@@ -634,7 +633,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<tr class="drag drop oddeven" id="row-'.$ruleaction['id'].'">';
 		print '<td>';
 		print '<!-- type of action: '.$ruleaction['type'].' -->';
-		print $langs->trans($arrayoftypes[$ruleaction['type']]);
+		if (array_key_exists($ruleaction['type'], $arrayoftypes)) {
+			print $langs->trans($arrayoftypes[$ruleaction['type']]);
+		} else {
+			if (array_key_exists($ruleaction['type'], $arrayoftypesnocondition)) {
+				print '<span class="opacitymedium">'.$langs->trans($arrayoftypesnocondition[$ruleaction['type']]).' - '.$langs->trans("Disabled").'</span>';
+			}
+		}
+
 		if (in_array($ruleaction['type'], array('recordevent'))) {
 			print $form->textwithpicto('', $langs->transnoentitiesnoconv('IfTrackingIDFoundEventWillBeLinked'));
 		} elseif (in_array($ruleaction['type'], array('loadthirdparty', 'loadandcreatethirdparty'))) {
@@ -662,7 +668,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</td>';
 		// Delete
 		print '<td class="right nowraponall">';
-		print '<a class="editfielda marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editoperation&operationid='.$ruleaction['id'].'">'.img_edit().'</a>';
+		print '<a class="editfielda marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editoperation&token='.newToken().'&operationid='.$ruleaction['id'].'">'.img_edit().'</a>';
 		print ' <a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteoperation&token='.newToken().'&operationid='.$ruleaction['id'].'">'.img_delete().'</a>';
 		print '</td>';
 		print '</tr>';
@@ -699,14 +705,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		if (empty($reshook)) {
 			// Edit
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Edit").'</a></div>';
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Edit").'</a></div>';
 
 			// Clone
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a></div>';
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&token='.newToken().'&object=order">'.$langs->trans("ToClone").'</a></div>';
 
 			// Collect now
 			if (count($object->actions) > 0) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=collect">'.$langs->trans("CollectNow").'</a></div>';
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=collect&token='.newToken().'">'.$langs->trans("CollectNow").'</a></div>';
 			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoOperations")).'">'.$langs->trans("CollectNow").'</a></div>';
 			}
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index c57e681be34..af137a1ecdb 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -208,12 +208,12 @@ $title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("EmailCollector")
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
 foreach ($object->fields as $key => $val) {
-	$sql .= 't.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key." as options_".$key.', ' : '');
 	}
 }
 // Add fields from hooks
@@ -259,7 +259,7 @@ $sql .= $hookmanager->resPrint;
 $sql.= " GROUP BY ";
 foreach ($object->fields as $key => $val)
 {
-	$sql.='t.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -530,7 +530,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index de8b6627cf8..904d10bff67 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -16,7 +16,7 @@
  */
 
 /**
- * \file    htdocs/admin/setup.php
+ * \file    htdocs/admin/eventorganization.php
  * \ingroup eventorganization
  * \brief   EventOrganization setup page.
  */
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/eventorganization.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 // Translations
-$langs->loadLangs(array("admin", "eventorganization"));
+$langs->loadLangs(array("admin", "eventorganization", "categories"));
 
 // Parameters
 $action = GETPOST('action', 'aZ09');
@@ -41,6 +41,8 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'myobject';
 
@@ -54,11 +56,11 @@ $arrayofparameters = array(
 	'EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
 	'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
 	'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
-	'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
-	'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
-	'EVENTORGANIZATION_SECUREKEY'=>array('type'=>'securekey', 'enabled'=>1),
+	//'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
+	//'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES'=>array('type'=>'emailtemplate:conferenceorbooth', 'enabled'=>1),
 	'SERVICE_BOOTH_LOCATION'=>array('type'=>'product', 'enabled'=>1),
 	'SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION'=>array('type'=>'product', 'enabled'=>1),
+	'EVENTORGANIZATION_SECUREKEY'=>array('type'=>'securekey', 'enabled'=>1),
 );
 
 $error = 0;
@@ -298,11 +300,7 @@ if ($action == 'edit') {
 	}
 	print '</table>';
 
-	print '<br><div class="center">';
-	print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; ';
-	print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 	print '<br>';
@@ -380,7 +378,7 @@ if ($action == 'edit') {
 		print '</table>';
 
 		print '<div class="tabsAction">';
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 		print '</div>';
 	} else {
 		print '<br>'.$langs->trans("NothingToSetup");
@@ -449,7 +447,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 									$langs->load("errors");
 									print '<div class="error">'.$langs->trans($tmp).'</div>';
 								} elseif ($tmp == 'NotConfigured') {
-									print $langs->trans($tmp);
+									print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 								} else {
 									print $tmp;
 								}
@@ -584,13 +582,13 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Active
 										if (in_array($name, $def)) {
 											print '<td class="center">'."\n";
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.$name.'">';
 											print img_picto($langs->trans("Enabled"), 'switch_on');
 											print '</a>';
 											print '</td>';
 										} else {
 											print '<td class="center">'."\n";
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value='.$name.'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 											print "</td>";
 										}
 
diff --git a/htdocs/admin/eventorganization_confbooth_extrafields.php b/htdocs/admin/eventorganization_confbooth_extrafields.php
index 6e19bde8268..991ed3f824a 100644
--- a/htdocs/admin/eventorganization_confbooth_extrafields.php
+++ b/htdocs/admin/eventorganization_confbooth_extrafields.php
@@ -16,7 +16,7 @@
  */
 
 /**
- *      \file       htdocs/admin/eventorganization_extrafields.php
+ *      \file       htdocs/admin/eventorganization_confbooth_extrafields.php
  *		\ingroup    bom
  *		\brief      Page to setup extra fields of EventOrganization
  */
diff --git a/htdocs/admin/eventorganization_confboothattendee_extrafields.php b/htdocs/admin/eventorganization_confboothattendee_extrafields.php
index 6b201e6b923..0b50c483d69 100644
--- a/htdocs/admin/eventorganization_confboothattendee_extrafields.php
+++ b/htdocs/admin/eventorganization_confboothattendee_extrafields.php
@@ -21,7 +21,7 @@
  */
 
 /**
- *      \file       admin/conferenceorboothattendee_extrafields.php
+ *      \file       htdocs/admin/eventorganization_confboothattendee_extrafields.php
  *		\ingroup    eventorganization
  *		\brief      Page to setup extra fields of conferenceorboothattendee
  */
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 6216820166e..b98f3775aad 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -107,6 +107,8 @@ $head = security_prepare_head();
 
 print dol_get_fiche_head($head, 'audit', '', -1);
 
+print '<br>';
+
 print '<table class="noborder" width="100%">';
 print "<tr class=\"liste_titre\">";
 print getTitleFieldOfList("LogEvents", 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, '')."\n";
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 8916adef471..12e0d0a6d01 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'shipping';
@@ -219,7 +221,7 @@ foreach ($dirmodels as $reldir) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') {
-							print $langs->trans($tmp);
+							print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 						} else {
 							print $tmp;
 						}
@@ -229,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&amp;token='.newToken().'&amp;value='.$file.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+							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 img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -353,13 +355,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&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&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<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>";
 								}
 
@@ -368,7 +370,7 @@ foreach ($dirmodels as $reldir) {
 								if ($conf->global->EXPEDITION_ADDON_PDF == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<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>';
 								}
 								print '</td>';
 
@@ -454,7 +456,7 @@ print "</td></tr>\n";
 
 print '</table>';
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+print $form->buttonsSaveCancel("Modify", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 7ff30242336..fc63940f0b8 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'expensereport';
@@ -145,7 +147,18 @@ if ($action == 'updateMask') {
 	$draft = GETPOST('EXPENSEREPORT_DRAFT_WATERMARK', 'alpha');
 	$res2 = dolibarr_set_const($db, "EXPENSEREPORT_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
 
-	if (!$res1 > 0 || !$res2 > 0) {
+	$res3 = 0;
+	if (!empty($conf->projet->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);
+	}
+
+	$dates = GETPOST('EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH', 'int');
+	$res4 = dolibarr_set_const($db, 'EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH', intval($dates), 'chaine', 0, '', $conf->entity);
+
+	$amounts = GETPOST('EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY', 'int');
+	$res5 = dolibarr_set_const($db, 'EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY', intval($amounts), 'chaine', 0, '', $conf->entity);
+
+	if (!($res1 > 0) || !($res2 > 0) || !($res3 >= 0) || !($res4 >0) || !($res5 >0)) {
 		$error++;
 	}
 
@@ -228,7 +241,7 @@ foreach ($dirmodels as $reldir) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') {
-							print $langs->trans($tmp);
+							print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 						} else {
 							print $tmp;
 						}
@@ -238,7 +251,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->EXPENSEREPORT_ADDON == $file) {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -358,13 +371,13 @@ foreach ($dirmodels as $reldir) {
 							// Active
 							if (in_array($name, $def)) {
 								print '<td class="center">'."\n";
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">';
 								print img_picto($langs->trans("Enabled"), 'switch_on');
 								print '</a>';
 								print "</td>";
 							} else {
 								print '<td class="center">'."\n";
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+								print '<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>";
 							}
 
@@ -373,7 +386,7 @@ foreach ($dirmodels as $reldir) {
 							if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$name") {
 								print img_picto($langs->trans("Default"), 'on');
 							} else {
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 							}
 							print '</td>';
 
@@ -458,11 +471,29 @@ print $form->textwithpicto($langs->trans("WatermarkOnDraftExpenseReports"), $htm
 print '<input class="flat minwidth200" type="text" name="EXPENSEREPORT_DRAFT_WATERMARK" value="'.$conf->global->EXPENSEREPORT_DRAFT_WATERMARK.'">';
 print '</td></tr>'."\n";
 
+if (!empty($conf->projet->enabled)) {
+	print '<tr class="oddeven"><td>';
+	print $langs->trans('ProjectIsRequiredOnExpenseReports');
+	print '</td><td class="right">';
+	print $form->selectyesno('EXPENSEREPORT_PROJECT_IS_REQUIRED', empty($conf->global->EXPENSEREPORT_PROJECT_IS_REQUIRED) ? 0 : 1, 1);
+	print '</td></tr>';
+}
+
+print '<tr class="oddeven"><td>';
+print $langs->trans('PrefillExpenseReportDatesWithCurrentMonth');
+print '</td><td class="right">';
+print $form->selectyesno('EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH', empty($conf->global->EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH) ? 0 : 1, 1);
+print '</td></tr>';
+
+print '<tr class="oddeven"><td>';
+print $langs->trans('ForceExpenseReportsLineAmountsIncludingTaxesOnly');
+print '</td><td class="right">';
+print $form->selectyesno('EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY', empty($conf->global->EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY) ? 0 : 1, 1);
+print '</td></tr>';
+
 print '</table>';
 
-print '<div class="center">';
-print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-print '</div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php
index bdaaa5845f3..900754ef4b4 100644
--- a/htdocs/admin/expensereport_ik.php
+++ b/htdocs/admin/expensereport_ik.php
@@ -5,7 +5,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -33,10 +33,6 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_ik.class.php'
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "trips", "errors", "other", "dict"));
 
-if (!$user->admin) {
-	accessforbidden();
-}
-
 $error = 0;
 
 $action = GETPOST('action', 'aZ09');
@@ -45,10 +41,20 @@ $ikoffset = GETPOST('ikoffset', 'int');
 $coef = GETPOST('coef', 'int');
 
 $fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat');
-$fk_range = GETPOST('fk_range');
+$fk_range = GETPOST('fk_range', 'int');
+
+$expIk = new ExpenseReportIk($db);
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
 
 if ($action == 'updateik') {
-	$expIk = new ExpenseReportIk($db);
 	if ($id > 0) {
 		$result = $expIk->fetch($id);
 		if ($result < 0) {
@@ -61,13 +67,13 @@ if ($action == 'updateik') {
 
 	if ($result > 0) {
 		setEventMessages('SetupSaved', null, 'mesgs');
+
 		header('Location: '.$_SERVER['PHP_SELF']);
 		exit;
 	} else {
 		setEventMessages($expIk->error, $expIk->errors, 'errors');
 	}
 } elseif ($action == 'delete') { // TODO add confirm
-	$expIk = new ExpenseReportIk($db);
 	if ($id > 0) {
 		$result = $expIk->fetch($id);
 		if ($result < 0) {
@@ -77,12 +83,11 @@ if ($action == 'updateik') {
 		$expIk->delete($user);
 	}
 
-
 	header('Location: '.$_SERVER['PHP_SELF']);
 	exit;
 }
 
-$rangesbycateg = ExpenseReportIk::getAllRanges();
+$rangesbycateg = $expIk->getAllRanges();
 
 
 /*
@@ -102,7 +107,8 @@ print dol_get_fiche_head($head, 'expenseik', $langs->trans("ExpenseReportsIk"),
 echo '<span class="opacitymedium">'.$langs->trans('ExpenseReportIkDesc').'</span>';
 print '<br><br>';
 
-echo '<form action="'.$_SERVER['PHP_SELF'].'" method="post">';
+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="'.$id.'" />';
@@ -111,8 +117,6 @@ if ($action == 'edit') {
 	echo '<input type="hidden" name="action" value="updateik" />';
 }
 
-echo '<input type="hidden" name="token" value="'.newToken().'" />';
-
 echo '<table class="noborder centpercent">';
 
 foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab) {
diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index 050c2b9455c..77fb8f24f82 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -54,7 +54,6 @@ $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');
-$restrictive = GETPOST('restrictive');
 
 $object = new ExpenseReportRule($db);
 if (!empty($id)) {
@@ -138,7 +137,7 @@ if ($action == 'save') {
 	exit;
 }
 
-$rules = ExpenseReportRule::getAllRule();
+$rules = $object->getAllRule();
 
 $tab_apply = array(
 	'A' => $langs->trans('All'),
@@ -201,7 +200,7 @@ if ($action != 'edit') {
 	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" value="'.$langs->trans('Add').'" /></td>';
+	echo '<td class="right"><input type="submit" class="button button-add" value="'.$langs->trans('Add').'" /></td>';
 	echo '</tr>';
 
 	echo '</table>';
@@ -258,11 +257,12 @@ foreach ($rules as $rule) {
 		if ($rule->fk_c_type_fees == -1) {
 			echo $langs->trans('AllExpenseReport');
 		} else {
-			$key = getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id');
-			if ($key != $langs->trans($key)) {
+			$key = getDictionaryValue(MAIN_DB_PREFIX.'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id');
+			if ($key && $key != $langs->trans($key)) {
 				echo $langs->trans($key);
 			} else {
-				echo $langs->trans(getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'label', $rule->fk_c_type_fees, false, 'id')); // TODO check to return trans of 'code'
+				$value = getDictionaryValue(MAIN_DB_PREFIX.'c_type_fees', 'label', $rule->fk_c_type_fees, false, 'id');
+				echo $langs->trans($value ? $value : 'Undefined'); // TODO check to return trans of 'code'
 			}
 		}
 	}
@@ -319,7 +319,7 @@ foreach ($rules as $rule) {
 		echo '<a class="editfielda paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$rule->id.'">'.img_edit().'</a>&nbsp;';
 		echo '<a class="paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$rule->id.'">'.img_delete().'</a>';
 	} else {
-		echo '<input type="submit" class="button" value="'.$langs->trans('Update').'" />&nbsp;';
+		echo '<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>';
diff --git a/htdocs/admin/export.php b/htdocs/admin/export.php
index 9b154e88789..0addfcf38f7 100644
--- a/htdocs/admin/export.php
+++ b/htdocs/admin/export.php
@@ -98,7 +98,7 @@ print '</td></tr>';
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ExportCsvSeparator").'</td>';
 print '<td width="60" align="center"><input class="flat width50" maxlength="3" type="text" name="EXPORT_CSV_SEPARATOR_TO_USE" value="'.(empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE) ? ',' : $conf->global->EXPORT_CSV_SEPARATOR_TO_USE).'"></td>';
-print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+print '<td class="right"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
 print '</tr>';
 
 print '</table>';
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 71086096e4f..d0f08783e22 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -180,6 +180,7 @@ if (GETPOST("delete")) {
 /*
  * View
  */
+$form = new Form($db);
 
 llxHeader('', $langs->trans("ExternalRSSSetup"));
 
@@ -209,11 +210,9 @@ print '<td>http://news.google.com/news?ned=us&topic=h&output=rss<br>http://www.d
 print '</tr>';
 print '</table>';
 
-print '<br><div class="center">';
-print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+print $form->buttonsSaveCancel("Add", '');
 print '<input type="hidden" name="action" value="add">';
 print '<input type="hidden" name="norss" value="'.($lastexternalrss + 1).'">';
-print '</div>';
 
 print '</form>';
 
@@ -253,9 +252,8 @@ if ($resql) {
 		print '<tr class="liste_titre">';
 		print "<td>".$langs->trans("RSS")." ".($i + 1)."</td>";
 		print '<td class="right">';
-		print '<input type="submit" class="button buttongen" name="modify" value="'.$langs->trans("Modify").'">';
-		print " &nbsp; ";
-		print '<input type="submit" class="button buttongen" name="delete" value="'.$langs->trans("Delete").'">';
+		print '<input type="submit" class="button buttongen button-save" name="modify" value="'.$langs->trans("Modify").'">';
+		print '<input type="submit" class="button buttongen button-cancel" name="delete" value="'.$langs->trans("Delete").'">';
 		print '<input type="hidden" name="norss" value="'.$idrss.'">';
 		print '</td>';
 		print '</tr>'."\n";
@@ -277,9 +275,9 @@ if ($resql) {
 		print "<td>".$langs->trans("Status")."</td>";
 		print "<td>";
 		if ($result > 0 && empty($rss->error)) {
-			print '<font class="ok">'.$langs->trans("Online").'</div>';
+			print '<span class="ok">'.$langs->trans("Online").'</div>';
 		} else {
-			print '<font class="error">'.$langs->trans("Offline");
+			print '<span class="error">'.$langs->trans("Offline");
 			$langs->load("errors");
 			if ($rssparser->error) {
 				print ' - '.$langs->trans($rssparser->error);
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index bd4b6f5404f..9eec54b03a7 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -42,6 +42,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'invoice';
@@ -312,7 +314,7 @@ foreach ($dirmodels as $reldir) {
 								$langs->load("errors");
 								print '<div class="error">'.$langs->trans($tmp).'</div>';
 							} elseif ($tmp == 'NotConfigured') {
-								print $langs->trans($tmp);
+								print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 							} else {
 								print $tmp;
 							}
@@ -501,13 +503,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&amp;token='.newToken().'&amp;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&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("SetAsDefault"), 'switch_off').'</a>';
+									print '<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("SetAsDefault"), 'switch_off').'</a>';
 									print "</td>";
 								}
 
@@ -516,7 +518,7 @@ foreach ($dirmodels as $reldir) {
 								if ($conf->global->FACTURE_ADDON_PDF == "$name") {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("SetAsDefault"), 'off').'</a>';
+									print '<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("SetAsDefault"), 'off').'</a>';
 								}
 								print '</td>';
 
@@ -579,7 +581,7 @@ if (!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) { // Hidden conf
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Type").'</td>';
 	print '<td>'.$langs->trans("Name").'</td>';
-	print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+	print '<td class="right"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
 	print "</tr>\n";
 
 	$listtype = array(
@@ -623,7 +625,7 @@ print '<tr class="liste_titre">';
 print '<td>';
 print '<input type="hidden" name="action" value="setribchq">';
 print $langs->trans("PaymentMode").'</td>';
-print '<td class="right"><input type="submit" class="button" 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">';
@@ -716,7 +718,7 @@ print $langs->trans("ForceInvoiceDate");
 print '</td><td width="60" class="center">';
 print $form->selectyesno("forcedate", $conf->global->FAC_FORCE_DATE_VALIDATION, 1);
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'" />';
 print "</td></tr>\n";
 print '</form>';
 
@@ -742,7 +744,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'" />';
 print "</td></tr>\n";
 print '</form>';
 
@@ -755,7 +757,7 @@ print $form->textwithpicto($langs->trans("WatermarkOnDraftBill"), $htmltext, 1,
 print '</td>';
 print '<td><input class="flat minwidth200imp" type="text" name="FACTURE_DRAFT_WATERMARK" value="'.$conf->global->FACTURE_DRAFT_WATERMARK.'" />';
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'" />';
 print "</td></tr>\n";
 print '</form>';
 
diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index ffe1680c80f..609a6605d1a 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -28,24 +28,93 @@
  */
 
 require '../main.inc.php';
+
+// Libraries
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'errors', 'other', 'bills'));
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('situationinvoicesetup', 'globalsetup'));
+
+// Access control
 if (!$user->admin) {
 	accessforbidden();
 }
 
 $action = GETPOST('action', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'invoice';
 
+$form = new Form($db);
+$formSetup = new FormSetup($db);
+
+
+// Setup conf MYMODULE_MYPARAM4 : exemple of quick define write style
+$formSetup->newItem('INVOICE_USE_SITUATION')
+	->setAsYesNo()
+	->nameText = $langs->trans('UseSituationInvoices');
+
+$item = $formSetup->newItem('INVOICE_USE_SITUATION_CREDIT_NOTE')
+	->setAsYesNo()
+	->nameText = $langs->trans('UseSituationInvoicesCreditNote');
+
+//$item = $formSetup->newItem('INVOICE_USE_RETAINED_WARRANTY')
+//	->setAsYesNo()
+//	->nameText = $langs->trans('Retainedwarranty');
+
+
+$item = $formSetup->newItem('INVOICE_USE_RETAINED_WARRANTY');
+$item->nameText = $langs->trans('AllowedInvoiceForRetainedWarranty');
+
+$arrayAvailableType = array(
+	Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation"),
+	Facture::TYPE_STANDARD.'+'.Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation").' + '.$langs->trans("InvoiceStandard"),
+);
+
+if ($action == 'edit') {
+	$item->fieldInputOverride = $form->selectarray('INVOICE_USE_RETAINED_WARRANTY', $arrayAvailableType, $conf->global->INVOICE_USE_RETAINED_WARRANTY, 1);
+} else {
+	$item->fieldOutputOverride= isset($arrayAvailableType[$conf->global->INVOICE_USE_RETAINED_WARRANTY])?$arrayAvailableType[$conf->global->INVOICE_USE_RETAINED_WARRANTY]:'';
+}
+
+//$item = $formSetup->newItem('INVOICE_RETAINED_WARRANTY_LIMITED_TO_SITUATION')->setAsYesNo();
+//$item->nameText = $langs->trans('RetainedwarrantyOnlyForSituation');
+
+$formSetup->newItem('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION')
+	->setAsYesNo()
+	->nameText = $langs->trans('RetainedwarrantyOnlyForSituationFinal');
+
+
+$item = $formSetup->newItem('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT');
+$item->nameText = $langs->trans('RetainedwarrantyDefaultPercent');
+$item->fieldAttr = array(
+	'type' => 'number',
+	'step' => '0.01',
+	'min' => 0,
+	'max' => 100
+);
+
+
+// Conditions paiements
+$item = $formSetup->newItem('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID');
+$item->nameText = $langs->trans('PaymentConditionsShortRetainedWarranty');
+$form->load_cache_conditions_paiements();
+if (!empty($conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID) && isset($form->cache_conditions_paiements[$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID]['label'])) {
+	$item->fieldOutputOverride = $form->cache_conditions_paiements[$conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID]['label'];
+}
+$item->fieldInputOverride = $form->getSelectConditionsPaiements($conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID, 'INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID', -1, 1);
+
 
 /*
  * Actions
@@ -67,7 +136,6 @@ llxHeader(
 	'EN:Invoice_Configuration|FR:Configuration_module_facture|ES:ConfiguracionFactura'
 );
 
-$form = new Form($db);
 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
@@ -84,171 +152,25 @@ print '<span class="opacitymedium">'.$langs->trans("InvoiceFirstSituationDesc").
  *  Numbering module
  */
 
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
+if ($action == 'edit') {
+	print $formSetup->generateOutput(true);
+} else {
+	print $formSetup->generateOutput();
+}
 
+if (count($formSetup->items) > 0) {
+	if ($action != 'edit') {
+		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 '<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 align="center" width="60">'.$langs->trans("Value").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-_printOnOff('INVOICE_USE_SITUATION', $langs->trans('UseSituationInvoices'));
-_printOnOff('INVOICE_USE_SITUATION_CREDIT_NOTE', $langs->trans('UseSituationInvoicesCreditNote'));
-//_printOnOff('INVOICE_USE_RETAINED_WARRANTY', $langs->trans('Retainedwarranty'));
-
-$confkey = 'INVOICE_USE_RETAINED_WARRANTY';
-
-$arrayAvailableType = array(
-	Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation"),
-	Facture::TYPE_STANDARD.'+'.Facture::TYPE_SITUATION => $langs->trans("InvoiceSituation").' + '.$langs->trans("InvoiceStandard"),
-);
-$selected = $conf->global->$confkey;
-$curentInput = (empty($inputCount) ? 1 : ($inputCount + 1));
-$formSelectInvoiceType = $form->selectarray('value'.$curentInput, $arrayAvailableType, $selected, 1);
-_printInputFormPart($confkey, $langs->trans('AllowedInvoiceForRetainedWarranty'), '', array(), $formSelectInvoiceType);
-
-//_printOnOff('INVOICE_RETAINED_WARRANTY_LIMITED_TO_SITUATION', $langs->trans('RetainedwarrantyOnlyForSituation'));
-_printOnOff('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION', $langs->trans('RetainedwarrantyOnlyForSituationFinal'));
-
-$metas = array(
-	'type' => 'number',
-	'step' => '0.01',
-	'min' => 0,
-	'max' => 100
-);
-_printInputFormPart('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT', $langs->trans('RetainedwarrantyDefaultPercent'), '', $metas);
-
-// Conditions paiements
-$inputCount = empty($inputCount) ? 1 : ($inputCount + 1);
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans('PaymentConditionsShortRetainedWarranty').'</td>';
-print '<td class="center" width="20">&nbsp;</td>';
-print '<td class="right" width="300">';
-print '<input type="hidden" name="param'.$inputCount.'" value="INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID">';
-$form->select_conditions_paiements($conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID, 'value'.$inputCount, -1, 1);
-print '</td></tr>';
-
-
-print '</table>';
-print '</div>';
-
-print '<br>';
-
-_updateBtn();
-
-print '</form>';
 
 print dol_get_fiche_end();
 
 // End of page
 llxFooter();
 $db->close();
-
-/**
- * Print an update button
- *
- * @return void
- */
-function _updateBtn()
-{
-	global $langs;
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-	print '</div>';
-}
-
-/**
- * Print a On/Off button
- *
- * @param string $confkey the conf key
- * @param bool   $title   Title of conf
- * @param string $desc    Description
- *
- * @return void
- */
-function _printOnOff($confkey, $title = false, $desc = '')
-{
-	global $langs;
-
-	print '<tr class="oddeven">';
-	print '<td>'.($title ? $title : $langs->trans($confkey));
-	if (!empty($desc)) {
-		print '<br><small>'.$langs->trans($desc).'</small>';
-	}
-	print '</td>';
-	print '<td class="center" width="20">&nbsp;</td>';
-	print '<td class="right" width="300">';
-	print ajax_constantonoff($confkey);
-	print '</td></tr>';
-}
-
-
-/**
- * Print a form part
- *
- * @param string $confkey the conf key
- * @param bool   $title   Title of conf
- * @param string $desc    Description of
- * @param array  $metas   html meta
- * @param string $type    type of input textarea or input
- * @param bool   $help    help description
- *
- * @return void
- */
-function _printInputFormPart($confkey, $title = false, $desc = '', $metas = array(), $type = 'input', $help = false)
-{
-	global $langs, $conf, $db, $inputCount;
-
-	$inputCount = empty($inputCount) ? 1 : ($inputCount + 1);
-	$form = new Form($db);
-
-	$defaultMetas = array(
-		'name' => 'value'.$inputCount
-	);
-
-	if ($type != 'textarea') {
-		$defaultMetas['type']   = 'text';
-		$defaultMetas['value']  = $conf->global->{$confkey};
-	}
-
-
-	$metas = array_merge($defaultMetas, $metas);
-	$metascompil = '';
-	foreach ($metas as $key => $values) {
-		$metascompil .= ' '.$key.'="'.$values.'" ';
-	}
-
-	print '<tr class="oddeven">';
-	print '<td>';
-
-	if (!empty($help)) {
-		print $form->textwithtooltip(($title ? $title : $langs->trans($confkey)), $langs->trans($help), 2, 1, img_help(1, ''));
-	} else {
-		print $title ? $title : $langs->trans($confkey);
-	}
-
-	if (!empty($desc)) {
-		print '<br><small>'.$langs->trans($desc).'</small>';
-	}
-
-	print '</td>';
-	print '<td class="center" width="20">&nbsp;</td>';
-	print '<td class="right" width="300">';
-	print '<input type="hidden" name="param'.$inputCount.'" value="'.$confkey.'">';
-
-	print '<input type="hidden" name="action" value="setModuleOptions">';
-	if ($type == 'textarea') {
-		print '<textarea '.$metascompil.'  >'.dol_htmlentities($conf->global->{$confkey}).'</textarea>';
-	} elseif ($type == 'input') {
-		print '<input '.$metascompil.'  />';
-	} else {
-		// custom
-		print $type;
-	}
-	print '</td></tr>';
-}
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index d3c142b8e99..51247ac0b35 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -159,11 +159,12 @@ if (empty($conf->use_javascript_ajax)) {
 			continue;
 		}
 
+		$constante = 'FCKEDITOR_ENABLE_'.$const;
+		print '<!-- constant = '.$constante.' -->'."\n";
 		print '<tr class="oddeven">';
 		print '<td width="16">'.img_object("", $picto[$const]).'</td>';
 		print '<td>'.$langs->trans($desc).'</td>';
 		print '<td class="center" width="100">';
-		$constante = 'FCKEDITOR_ENABLE_'.$const;
 		$value = (isset($conf->global->$constante) ? $conf->global->$constante : 0);
 		if ($value == 0) {
 			print '<a href="'.$_SERVER['PHP_SELF'].'?action=enable_'.strtolower($const).'&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
@@ -192,7 +193,7 @@ if (empty($conf->use_javascript_ajax)) {
 		if ($linkstomode) {
 			$linkstomode .= ' - ';
 		}
-		$linkstomode .= '<a href="'.$_SERVER["PHP_SELF"].'?mode='.$newmode.'">';
+		$linkstomode .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?mode='.$newmode.'">';
 		if ($mode == $newmode) {
 			$linkstomode .= '<strong>';
 		}
@@ -215,14 +216,14 @@ if (empty($conf->use_javascript_ajax)) {
 		print $conf->global->FCKEDITOR_TEST;
 		print '</div>';
 	}
-	print '<br><div class="center"><input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'"></div>'."\n";
+	print $form->buttonsSaveCancel("Save", '');
 	print '<div id="divforlog"></div>';
 	print '</form>'."\n";
 
 	// Add env of ckeditor
 	// This is to show how CKEditor detect browser to understand why editor is disabled or not. To help debug.
 	/*
-		print '<br><script language="javascript">
+		print '<br><script type="text/javascript">
 		function jsdump(obj, id) {
 			var out = \'\';
 			for (var i in obj) {
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index cdfa1f91753..c95f354a189 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'ficheinter';
@@ -284,7 +286,7 @@ foreach ($dirmodels as $reldir) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') {
-							print $langs->trans($tmp);
+							print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 						} else {
 							print $tmp;
 						}
@@ -294,7 +296,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->FICHEINTER_ADDON == $classname) {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.urlencode($classname).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
 
@@ -419,13 +421,13 @@ foreach ($dirmodels as $reldir) {
 							// Active
 							if (in_array($name, $def)) {
 								print "<td align=\"center\">\n";
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">';
 								print img_picto($langs->trans("Enabled"), 'switch_on');
 								print '</a>';
 								print "</td>";
 							} else {
 								print "<td align=\"center\">\n";
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+								print '<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>";
 							}
 
@@ -434,7 +436,7 @@ foreach ($dirmodels as $reldir) {
 							if ($conf->global->FICHEINTER_ADDON_PDF == "$name") {
 								print img_picto($langs->trans("Default"), 'on');
 							} else {
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+								print '<a 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>';
 							}
 							print '</td>';
 
@@ -512,7 +514,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 print '</form>';
 
@@ -525,7 +527,7 @@ print $form->textwithpicto($langs->trans("WatermarkOnDraftInterventionCards"), $
 print '</td><td>';
 print '<input class="flat minwidth200" type="text" name="FICHINTER_DRAFT_WATERMARK" value="'.$conf->global->FICHINTER_DRAFT_WATERMARK.'">';
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 print '</form>';
 // print products on fichinter
@@ -540,7 +542,7 @@ if ($conf->global->FICHINTER_PRINT_PRODUCTS) {
 }
 print '/>';
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 print '</form>';
 // Use services duration
@@ -555,7 +557,7 @@ print '<td class="center">';
 print '<input type="checkbox" name="FICHINTER_USE_SERVICE_DURATION"'.($conf->global->FICHINTER_USE_SERVICE_DURATION ? ' checked' : '').'>';
 print '</td>';
 print '<td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print '</td>';
 print '</tr>';
 print '</form>';
@@ -571,7 +573,7 @@ print '<td class="center">';
 print '<input type="checkbox" name="FICHINTER_WITHOUT_DURATION"'.($conf->global->FICHINTER_WITHOUT_DURATION ? ' checked' : '').'>';
 print '</td>';
 print '<td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print '</td>';
 print '</tr>';
 print '</form>';
@@ -587,7 +589,7 @@ print '<td class="center">';
 print '<input type="checkbox" name="FICHINTER_DATE_WITHOUT_HOUR"'.($conf->global->FICHINTER_DATE_WITHOUT_HOUR ? ' checked' : '').'>';
 print '</td>';
 print '<td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print '</td>';
 print '</tr>';
 print '</form>';
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 40819b697e3..e662c0576a2 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -107,7 +107,7 @@ 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" value="'.$langs->trans("Modify").'"></td>';
+print '<td class="right"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
 
 // Lib version
@@ -144,12 +144,12 @@ print '<br>';
 print $langs->trans("NoteOnPathLocation").'<br>';
 
 $url1 = 'http://www.maxmind.com/en/city?rId=awstats';
-print $langs->trans("YouCanDownloadFreeDatFileTo", '<a href="'.$url1.'" target="_blank">'.$url1.'</a>');
+print $langs->trans("YouCanDownloadFreeDatFileTo", '<a href="'.$url1.'" target="_blank" rel="noopener noreferrer external">'.$url1.'</a>');
 
 print '<br>';
 
 $url2 = 'http://www.maxmind.com/en/city?rId=awstats';
-print $langs->trans("YouCanDownloadAdvancedDatFileTo", '<a href="'.$url2.'" target="_blank">'.$url2.'</a>');
+print $langs->trans("YouCanDownloadAdvancedDatFileTo", '<a href="'.$url2.'" target="_blank" rel="noopener noreferrer external">'.$url2.'</a>');
 
 if ($geoip) {
 	print '<br><br>';
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index f6ac529466e..c1755b17edf 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -39,6 +39,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'contract';
@@ -220,7 +222,7 @@ foreach ($dirmodels as $reldir) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') {
-							print $langs->trans($tmp);
+							print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 						} else {
 							print $tmp;
 						}
@@ -230,7 +232,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->HOLIDAY_ADDON == "$file") {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -274,147 +276,141 @@ print '</div>';
 print '<br>';
 
 
-if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
-	print dol_get_fiche_end();
-	// End of page
-	llxFooter();
-	$db->close();
-	exit;
-}
-
 /*
  *  Documents models for Holidays
  */
 
-print load_fiche_titre($langs->trans("TemplatePDFHolidays"), '', '');
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+	print load_fiche_titre($langs->trans("TemplatePDFHolidays"), '', '');
 
-// Defined model definition table
-$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++;
+	// Defined model definition table
+	$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);
 	}
-} else {
-	dol_print_error($db);
-}
 
 
-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>'.$langs->trans("Description").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
-print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
-print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
-print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
-print "</tr>\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Name").'</td>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td align="center" width="60">'.$langs->trans("Status")."</td>\n";
+	print '<td align="center" width="60">'.$langs->trans("Default")."</td>\n";
+	print '<td align="center" width="80">'.$langs->trans("ShortInfo").'</td>';
+	print '<td align="center" width="80">'.$langs->trans("Preview").'</td>';
+	print "</tr>\n";
 
-clearstatcache();
+	clearstatcache();
 
-foreach ($dirmodels as $reldir) {
-	foreach (array('', '/doc') as $valdir) {
-		$realpath = $reldir."core/modules/holiday".$valdir;
-		$dir = dol_buildpath($realpath);
+	foreach ($dirmodels as $reldir) {
+		foreach (array('', '/doc') as $valdir) {
+			$realpath = $reldir."core/modules/holiday".$valdir;
+			$dir = dol_buildpath($realpath);
 
-		if (is_dir($dir)) {
-			$handle = opendir($dir);
-			if (is_resource($handle)) {
-				while (($file = readdir($handle)) !== false) {
-					$filelist[] = $file;
-				}
-				closedir($handle);
-				arsort($filelist);
+			if (is_dir($dir)) {
+				$handle = opendir($dir);
+				if (is_resource($handle)) {
+					while (($file = readdir($handle)) !== false) {
+						$filelist[] = $file;
+					}
+					closedir($handle);
+					arsort($filelist);
 
-				foreach ($filelist as $file) {
-					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
-						if (file_exists($dir.'/'.$file)) {
-							$name = substr($file, 4, dol_strlen($file) - 16);
-							$classname = substr($file, 0, dol_strlen($file) - 12);
+					foreach ($filelist as $file) {
+						if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
+							if (file_exists($dir.'/'.$file)) {
+								$name = substr($file, 4, dol_strlen($file) - 16);
+								$classname = substr($file, 0, dol_strlen($file) - 12);
 
-							require_once $dir.'/'.$file;
-							$module = new $classname($db);
+								require_once $dir.'/'.$file;
+								$module = new $classname($db);
 
-							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
-								$modulequalified = 0;
-							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
-								$modulequalified = 0;
-							}
-
-							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;
+								$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;
 								}
-								print '</td>';
 
-								// Active
-								if (in_array($name, $def)) {
-									print '<td class="center">'."\n";
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
-									print img_picto($langs->trans("Enabled"), 'switch_on');
-									print '</a>';
+								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>';
-								} else {
-									print '<td class="center">'."\n";
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-									print "</td>";
+
+									// Active
+									if (in_array($name, $def)) {
+										print '<td class="center">'."\n";
+										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='.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">';
+									if ($conf->global->HOLIDAY_ADDON_PDF == $name) {
+										print img_picto($langs->trans("Default"), 'on');
+									} else {
+										print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&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>';
+									}
+									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("PaymentMode").': '.yn($module->option_modereg, 1, 1);
+									$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
+									$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+									$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
+
+
+									print '<td class="center">';
+									print $form->textwithpicto('', $htmltooltip, 1, 0);
+									print '</td>';
+
+									// Preview
+									print '<td class="center">';
+									if ($module->type == 'pdf') {
+										print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+									} else {
+										print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+									}
+									print '</td>';
+
+									print "</tr>\n";
 								}
-
-								// Default
-								print '<td class="center">';
-								if ($conf->global->HOLIDAY_ADDON_PDF == $name) {
-									print img_picto($langs->trans("Default"), 'on');
-								} else {
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-								}
-								print '</td>';
-
-								// Info
-								$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
-								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-								if ($module->type == 'pdf') {
-									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-								}
-								$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
-
-								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-								$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
-								$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
-								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
-								$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
-
-
-								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
-								print '</td>';
-
-								// Preview
-								print '<td class="center">';
-								if ($module->type == 'pdf') {
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
-								} else {
-									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
-								}
-								print '</td>';
-
-								print "</tr>\n";
 							}
 						}
 					}
@@ -422,11 +418,11 @@ foreach ($dirmodels as $reldir) {
 			}
 		}
 	}
-}
 
-print '</table>';
-print '</div>';
-print "<br>";
+	print '</table>';
+	print '</div>';
+	print "<br>";
+}
 
 
 /*
@@ -446,42 +442,123 @@ print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-$substitutionarray = pdf_getSubstitutionArray($langs, array('objectamount'), null, 2);
-$substitutionarray['__(AnyTranslationKey)__'] = $langs->trans("Translation");
-$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
-foreach ($substitutionarray as $key => $val) {
-	$htmltext .= $key.'<br>';
+/*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;
 }
-$htmltext .= '</i>';
+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);
+*/
 
-print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnHolidays"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'tooltiphelp');
-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>';
+// Set working days
+print '<tr class="oddeven">';
+print "<td>".$langs->trans("XIsAUsualNonWorkingDay", $langs->transnoentitiesnoconv("Monday"))."</td>";
+print '<td class="center">';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY', array(), null, 0);
 } else {
-	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
-	print $doleditor->Create();
+	if (!empty($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY)) {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_other&token='.newToken().'&MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY=1">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+	} else {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_other&token='.newToken().'&MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY=0">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+	}
 }
-print '</td></tr>'."\n";
+print "</td>";
+print "</tr>";
 
-//Use draft Watermark
+// Set working days
+print '<tr class="oddeven">';
+print "<td>".$langs->trans("XIsAUsualNonWorkingDay", $langs->transnoentitiesnoconv("Friday"))."</td>";
+print '<td class="center">';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY', array(), null, 0);
+} else {
+	if (!empty($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY)) {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_other&token='.newToken().'&MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY=1">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+	} else {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_other&token='.newToken().'&MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY=0">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+	}
+}
+print "</td>";
+print "</tr>";
 
-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 '</td></tr>'."\n";
+// Set working days
+print '<tr class="oddeven">';
+print "<td>".$langs->trans("XIsAUsualNonWorkingDay", $langs->transnoentitiesnoconv("Saturday"))."</td>";
+print '<td class="center">';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY', array(), null, 0, 0, 0, 2, 0, 1);
+} else {
+	if (!empty($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY)) {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_other&token='.newToken().'&MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY=1">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+	} else {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_other&token='.newToken().'&MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY=0">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+	}
+}
+print "</td>";
+print "</tr>";
+
+// Set working days
+print '<tr class="oddeven">';
+print "<td>".$langs->trans("XIsAUsualNonWorkingDay", $langs->transnoentitiesnoconv("Sunday"))."</td>";
+print '<td class="center">';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY', array(), null, 0, 0, 0, 2, 0, 1);
+} else {
+	if (!empty($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY)) {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_other&token='.newToken().'&MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY=1">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+	} else {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_other&token='.newToken().'&MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY=0">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+	}
+}
+print "</td>";
+print "</tr>";
+
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+	$substitutionarray = pdf_getSubstitutionArray($langs, array('objectamount'), null, 2);
+	$substitutionarray['__(AnyTranslationKey)__'] = $langs->trans("Translation");
+	$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+	foreach ($substitutionarray as $key => $val) {
+		$htmltext .= $key.'<br>';
+	}
+	$htmltext .= '</i>';
+
+	print '<tr class="oddeven"><td colspan="2">';
+	print $form->textwithpicto($langs->trans("FreeLegalTextOnHolidays"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'tooltiphelp');
+	print '<br>';
+	$variablename = 'HOLIDAY_FREE_TEXT';
+	if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
+		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	} else {
+		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+		$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+		print $doleditor->Create();
+	}
+	print '</td></tr>'."\n";
+
+	//Use draft Watermark
+
+	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 '</td></tr>'."\n";
+}
 
 print '</table>';
 print '</div>';
 
-
-print '<div class="center">';
-print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-print '</div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
new file mode 100644
index 00000000000..aea86069f4d
--- /dev/null
+++ b/htdocs/admin/hrm.php
@@ -0,0 +1,663 @@
+<?php
+/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    htdocs/admin/hrm.php
+ * \ingroup hrm
+ * \brief   HrmTest setup page.
+ */
+
+// Load Dolibarr environment
+require '../main.inc.php';
+
+global $langs, $user;
+
+// Libraries
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
+//require_once "../class/myclass.class.php";
+
+// Translations
+$langs->loadLangs(array("admin", "hrm"));
+
+// Access control
+if (!$user->admin) {
+	accessforbidden();
+}
+
+// Parameters
+$action = GETPOST('action', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+$value = GETPOST('value', 'alpha');
+$label = GETPOST('label', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
+$scandir = GETPOST('scan_dir', 'alpha');
+$type = 'myobject';
+
+$arrayofparameters = array(
+	'HRM_MAXRANK'=>array('type'=>'integer','enabled'=>1),
+	'HRM_DEFAULT_SKILL_DESCRIPTION'=>array('type'=>'textarea','enabled'=>1),
+);
+
+$error = 0;
+$setupnotempty = 0;
+
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+
+/*
+ * Actions
+ */
+
+if ((float) DOL_VERSION >= 6) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+}
+
+if ($action == 'update') {
+	$max_rank = GETPOST('HRM_MAXRANK', 'int');
+
+	// We complete skill possible level notation if necessary
+	if (!empty($max_rank)) {
+		$static_skill = new Skill($db);
+		$TAllSkills = $static_skill->fetchAll();
+		if (is_array($TAllSkills)) {
+			foreach ($TAllSkills as &$skill) {
+				if (empty($skill->lines)) $skill->fetchLines();
+				if (count($skill->lines) < $conf->global->HRM_MAXRANK) {
+					$skill->createSkills(count($skill->lines) + 1);
+				}
+			}
+		}
+	}
+} elseif ($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/hrm/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 = 'HRMTEST_'.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 = 'HRMTEST_'.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 = 'HRMTEST_'.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 = 'HRMTEST_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		dolibarr_del_const($db, $constforval, $conf->entity);
+	}
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url = '';
+$page_name = "HRMSetup";
+
+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 = hrmAdminPrepareHead();
+print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "hrm");
+
+$moduledir = 'hrm';
+$myTmpObjects = array();
+$myTmpObjects['evaluation'] = array('includerefgeneration'=>1, '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 = 'HRMTEST_'.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>\n";
+	}
+
+	if ($myTmpObjectArray['includedocgeneration']) {
+		/*
+		 * Document templates generators
+		 */
+		$setupnotempty++;
+		$type = strtolower($myTmpObjectKey);
+
+		print load_fiche_titre($langs->trans("DocumentModules", $myTmpObjectKey), '', '');
+
+		// Load array def with activated templates
+		$def = array();
+		$sql = "SELECT nom";
+		$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+		$sql .= " WHERE type = '".$db->escape($type)."'";
+		$sql .= " AND entity = ".$conf->entity;
+		$resql = $db->query($sql);
+		if ($resql) {
+			$i = 0;
+			$num_rows = $db->num_rows($resql);
+			while ($i < $num_rows) {
+				$array = $db->fetch_array($resql);
+				array_push($def, $array[0]);
+				$i++;
+			}
+		} else {
+			dol_print_error($db);
+		}
+
+		print "<table class=\"noborder\" width=\"100%\">\n";
+		print "<tr class=\"liste_titre\">\n";
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
+		print '<td class="center" width="60">'.$langs->trans("Default")."</td>\n";
+		print '<td class="center" width="38">'.$langs->trans("ShortInfo").'</td>';
+		print '<td class="center" width="38">'.$langs->trans("Preview").'</td>';
+		print "</tr>\n";
+
+		clearstatcache();
+
+		foreach ($dirmodels as $reldir) {
+			foreach (array('', '/doc') as $valdir) {
+				$realpath = $reldir."core/modules/".$moduledir.$valdir;
+				$dir = dol_buildpath($realpath);
+
+				if (is_dir($dir)) {
+					$handle = opendir($dir);
+					if (is_resource($handle)) {
+						while (($file = readdir($handle)) !== false) {
+							$filelist[] = $file;
+						}
+						closedir($handle);
+						arsort($filelist);
+
+						foreach ($filelist as $file) {
+							if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
+								if (file_exists($dir.'/'.$file)) {
+									$name = substr($file, 4, dol_strlen($file) - 16);
+									$classname = substr($file, 0, dol_strlen($file) - 12);
+
+									require_once $dir.'/'.$file;
+									$module = new $classname($db);
+
+									$modulequalified = 1;
+									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+										$modulequalified = 0;
+									}
+									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+										$modulequalified = 0;
+									}
+
+									if ($modulequalified) {
+										print '<tr class="oddeven"><td width="100">';
+										print (empty($module->name) ? $name : $module->name);
+										print "</td><td>\n";
+										if (method_exists($module, 'info')) {
+											print $module->info($langs);
+										} else {
+											print $module->description;
+										}
+										print '</td>';
+
+										// Active
+										if (in_array($name, $def)) {
+											print '<td class="center">'."\n";
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
+											print img_picto($langs->trans("Enabled"), 'switch_on');
+											print '</a>';
+											print '</td>';
+										} else {
+											print '<td class="center">'."\n";
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+											print "</td>";
+										}
+
+										// Default
+										print '<td class="center">';
+										$constforvar = 'HRMTEST_'.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&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>';
+										} else {
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.urlencode($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"), 'pdf').'</a>';
+										} else {
+											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+										}
+										print '</td>';
+
+										print "</tr>\n";
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		print '</table>';
+	}
+}
+
+print load_fiche_titre($langs->trans('OtherOptions'), '', '');
+
+if (empty($conf->global->HRM_MAXRANK)) {
+	$conf->global->HRM_MAXRANK = Skill::DEFAULT_MAX_RANK_PER_SKILL;
+}
+
+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>'.$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']== 'integer') {
+				print '<input  class="flat" name="'.$constname.'" id="'.$constname.'" value="'.$conf->global->$constname.'" type="number" step="1" min="0" max="50" >' . "\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 '<br>';
+} else {
+	if (!empty($arrayofparameters)) {
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre"><td>'.$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');
+					}
+					$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>';
+
+		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");
+	}
+}
+
+
+if (empty($setupnotempty)) {
+	print '<br>'.$langs->trans("NothingToSetup");
+}
+
+// Page end
+print dol_get_fiche_end();
+
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index a4c6f27c4b2..2c997d746d9 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -4,6 +4,8 @@
  * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2016		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2021       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2021       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
@@ -43,12 +45,12 @@ if (!$user->admin) {
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'adminihm'; // To manage different context of search
 
+$mode = GETPOST('mode', 'aZ09') ? GETPOST('mode', 'aZ09') : 'other'; // 'template', 'dashboard', 'login', 'other'
+
 if (!defined("MAIN_MOTD")) {
 	define("MAIN_MOTD", "");
 }
 
-
-
 /*
  * Action
  */
@@ -94,168 +96,195 @@ if ($action == 'removebackgroundlogin' && !empty($conf->global->MAIN_LOGIN_BACKG
 }
 
 if ($action == 'update') {
-	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_MULTILANGS", GETPOST("MAIN_MULTILANGS"), 'chaine', 0, '', $conf->entity);
+	$error = 0;
 
-	dolibarr_set_const($db, "MAIN_THEME", GETPOST("main_theme", 'aZ09'), 'chaine', 0, '', $conf->entity);
+	if ($mode == 'template') {
+		dolibarr_set_const($db, "MAIN_THEME", GETPOST("main_theme", 'aZ09'), 'chaine', 0, '', $conf->entity);
 
-	/*$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=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 == '') {
-		dolibarr_del_const($db, 'THEME_ELDY_BACKBODY', $conf->entity);
-	} else {
-		dolibarr_set_const($db, 'THEME_ELDY_BACKBODY', $val, 'chaine', 0, '', $conf->entity);
+		$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_BACKBODY', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_BACKBODY', $val, 'chaine', 0, '', $conf->entity);
+		}
+
+		$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_TOPMENU_BACK1', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_TOPMENU_BACK1', $val, 'chaine', 0, '', $conf->entity);
+		}
+
+		$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_VERMENU_BACK1'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_VERMENU_BACK1', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_VERMENU_BACK1', $val, 'chaine', 0, '', $conf->entity);
+		}
+
+		$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLENOTAB'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $val, 'chaine', 0, '', $conf->entity);
+		}
+
+		$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_BACKTITLE1', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_BACKTITLE1', $val, 'chaine', 0, '', $conf->entity);
+		}
+
+		$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLE'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLE', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLE', $val, 'chaine', 0, '', $conf->entity);
+		}
+
+		$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLELINK'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLELINK', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLELINK', $val, 'chaine', 0, '', $conf->entity);
+		}
+
+		$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_LINEIMPAIR1'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_LINEIMPAIR1', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_LINEIMPAIR1', $val, 'chaine', 0, '', $conf->entity);
+		}
+		$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_LINEIMPAIR1'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_LINEIMPAIR2', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_LINEIMPAIR2', $val, 'chaine', 0, '', $conf->entity);
+		}
+
+		$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_LINEPAIR1'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_LINEPAIR1', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_LINEPAIR1', $val, 'chaine', 0, '', $conf->entity);
+		}
+		$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_LINEPAIR1'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_LINEPAIR2', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_LINEPAIR2', $val, 'chaine', 0, '', $conf->entity);
+		}
+
+		$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTLINK'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_TEXTLINK', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_TEXTLINK', $val, 'chaine', 0, '', $conf->entity);
+		}
+
+		$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_USE_HOVER'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_USE_HOVER', $conf->entity);
+		} else {
+			dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", $val, 'chaine', 0, '', $conf->entity);
+		}
+
+		$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_USE_CHECKED'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_USE_CHECKED', $conf->entity);
+		} else {
+			dolibarr_set_const($db, "THEME_ELDY_USE_CHECKED", $val, 'chaine', 0, '', $conf->entity);
+		}
+
+		$val=(implode(',', (colorStringToArray(GETPOST('THEME_ELDY_BTNACTION'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_BTNACTION', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_BTNACTION', $val, 'chaine', 0, '', $conf->entity);
+		}
+
+		$val=(implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTBTNACTION'), array()))));
+		if ($val == '') {
+			dolibarr_del_const($db, 'THEME_ELDY_TEXTBTNACTION', $conf->entity);
+		} else {
+			dolibarr_set_const($db, 'THEME_ELDY_TEXTBTNACTION', $val, 'chaine', 0, '', $conf->entity);
+		}
 	}
 
-	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'), array()))));
-	if ($val == '') {
-		dolibarr_del_const($db, 'THEME_ELDY_TOPMENU_BACK1', $conf->entity);
-	} else {
-		dolibarr_set_const($db, 'THEME_ELDY_TOPMENU_BACK1', $val, 'chaine', 0, '', $conf->entity);
+	if ($mode == 'dashboard') {
+		dolibarr_set_const($db, "MAIN_MOTD", dol_htmlcleanlastbr(GETPOST("main_motd", 'restricthtml')), 'chaine', 0, '', $conf->entity);
 	}
 
-	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_VERMENU_BACK1'), array()))));
-	if ($val == '') {
-		dolibarr_del_const($db, 'THEME_ELDY_VERMENU_BACK1', $conf->entity);
-	} else {
-		dolibarr_set_const($db, 'THEME_ELDY_VERMENU_BACK1', $val, 'chaine', 0, '', $conf->entity);
+	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_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);
+
+		//dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", GETPOST("MAIN_DISABLE_JAVASCRIPT", 'aZ09'), 'chaine', 0, '', $conf->entity);
+		//dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", GETPOST("MAIN_BUTTON_HIDE_UNAUTHORIZED", 'aZ09'), 'chaine', 0, '', $conf->entity);
+		//dolibarr_set_const($db, "MAIN_MENU_HIDE_UNAUTHORIZED", GETPOST("MAIN_MENU_HIDE_UNAUTHORIZED", 'aZ09'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_START_WEEK", GETPOST("MAIN_START_WEEK", 'int'), 'chaine', 0, '', $conf->entity);
+
+		dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS", GETPOST("MAIN_DEFAULT_WORKING_DAYS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS", GETPOST("MAIN_DEFAULT_WORKING_HOURS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+
+		dolibarr_set_const($db, "MAIN_BUGTRACK_ENABLELINK", GETPOST("MAIN_BUGTRACK_ENABLELINK", 'alpha'), 'chaine', 0, '', $conf->entity);
+
+		dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION", GETPOST("MAIN_FIRSTNAME_NAME_POSITION", 'aZ09'), 'chaine', 0, '', $conf->entity);
 	}
 
-	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLENOTAB'), array()))));
-	if ($val == '') {
-		dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $conf->entity);
-	} else {
-		dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $val, 'chaine', 0, '', $conf->entity);
-	}
+	if ($mode == 'login') {
+		dolibarr_set_const($db, "MAIN_HOME", dol_htmlcleanlastbr(GETPOST("main_home", 'restricthtml')), 'chaine', 0, '', $conf->entity);
+		//dolibarr_set_const($db, "MAIN_HELP_DISABLELINK", GETPOST("MAIN_HELP_DISABLELINK", 'aZ09'), 'chaine', 0, '', 0); // Param for all entities
 
-	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'), array()))));
-	if ($val == '') {
-		dolibarr_del_const($db, 'THEME_ELDY_BACKTITLE1', $conf->entity);
-	} else {
-		dolibarr_set_const($db, 'THEME_ELDY_BACKTITLE1', $val, 'chaine', 0, '', $conf->entity);
-	}
+		$varforimage = 'imagebackground';
+		$dirforimage = $conf->mycompany->dir_output . '/logos/';
+		if ($_FILES[$varforimage]["tmp_name"]) {
+			$reg = array();
+			if (preg_match('/([^\\/:]+)$/i', $_FILES[$varforimage]["name"], $reg)) {
+				$original_file = $reg[1];
 
-	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLE'), array()))));
-	if ($val == '') {
-		dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLE', $conf->entity);
-	} else {
-		dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLE', $val, 'chaine', 0, '', $conf->entity);
-	}
-
-	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLELINK'), array()))));
-	if ($val == '') {
-		dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLELINK', $conf->entity);
-	} else {
-		dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLELINK', $val, 'chaine', 0, '', $conf->entity);
-	}
-
-	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_LINEIMPAIR1'), array()))));
-	if ($val == '') {
-		dolibarr_del_const($db, 'THEME_ELDY_LINEIMPAIR1', $conf->entity);
-	} else {
-		dolibarr_set_const($db, 'THEME_ELDY_LINEIMPAIR1', $val, 'chaine', 0, '', $conf->entity);
-	}
-	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_LINEIMPAIR1'), array()))));
-	if ($val == '') {
-		dolibarr_del_const($db, 'THEME_ELDY_LINEIMPAIR2', $conf->entity);
-	} else {
-		dolibarr_set_const($db, 'THEME_ELDY_LINEIMPAIR2', $val, 'chaine', 0, '', $conf->entity);
-	}
-
-	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_LINEPAIR1'), array()))));
-	if ($val == '') {
-		dolibarr_del_const($db, 'THEME_ELDY_LINEPAIR1', $conf->entity);
-	} else {
-		dolibarr_set_const($db, 'THEME_ELDY_LINEPAIR1', $val, 'chaine', 0, '', $conf->entity);
-	}
-	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_LINEPAIR1'), array()))));
-	if ($val == '') {
-		dolibarr_del_const($db, 'THEME_ELDY_LINEPAIR2', $conf->entity);
-	} else {
-		dolibarr_set_const($db, 'THEME_ELDY_LINEPAIR2', $val, 'chaine', 0, '', $conf->entity);
-	}
-
-	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTLINK'), array()))));
-	if ($val == '') {
-		dolibarr_del_const($db, 'THEME_ELDY_TEXTLINK', $conf->entity);
-	} else {
-		dolibarr_set_const($db, 'THEME_ELDY_TEXTLINK', $val, 'chaine', 0, '', $conf->entity);
-	}
-
-	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_USE_HOVER'), array()))));
-	if ($val == '') {
-		dolibarr_del_const($db, 'THEME_ELDY_USE_HOVER', $conf->entity);
-	} else {
-		dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", $val, 'chaine', 0, '', $conf->entity);
-	}
-
-	$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_USE_CHECKED'), array()))));
-	if ($val == '') {
-		dolibarr_del_const($db, 'THEME_ELDY_USE_CHECKED', $conf->entity);
-	} else {
-		dolibarr_set_const($db, "THEME_ELDY_USE_CHECKED", $val, '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);
-
-	//dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", GETPOST("MAIN_DISABLE_JAVASCRIPT", 'aZ09'), 'chaine', 0, '', $conf->entity);
-	//dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", GETPOST("MAIN_BUTTON_HIDE_UNAUTHORIZED", 'aZ09'), 'chaine', 0, '', $conf->entity);
-	//dolibarr_set_const($db, "MAIN_MENU_HIDE_UNAUTHORIZED", GETPOST("MAIN_MENU_HIDE_UNAUTHORIZED", 'aZ09'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_START_WEEK", GETPOST("MAIN_START_WEEK", 'int'), 'chaine', 0, '', $conf->entity);
-
-	dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS", GETPOST("MAIN_DEFAULT_WORKING_DAYS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS", GETPOST("MAIN_DEFAULT_WORKING_HOURS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-
-	dolibarr_set_const($db, "MAIN_BUGTRACK_ENABLELINK", GETPOST("MAIN_BUGTRACK_ENABLELINK", 'alpha'), 'chaine', 0, '', $conf->entity);
-
-	dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION", GETPOST("MAIN_FIRSTNAME_NAME_POSITION", 'aZ09'), 'chaine', 0, '', $conf->entity);
-
-	dolibarr_set_const($db, "MAIN_MOTD", dol_htmlcleanlastbr(GETPOST("main_motd", 'restricthtml')), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_HOME", dol_htmlcleanlastbr(GETPOST("main_home", 'restricthtml')), 'chaine', 0, '', $conf->entity);
-	//dolibarr_set_const($db, "MAIN_HELP_DISABLELINK", GETPOST("MAIN_HELP_DISABLELINK", 'aZ09'), 'chaine', 0, '', 0); // Param for all entities
-
-	$varforimage = 'imagebackground'; $dirforimage = $conf->mycompany->dir_output.'/logos/';
-	if ($_FILES[$varforimage]["tmp_name"]) {
-		$reg = array();
-		if (preg_match('/([^\\/:]+)$/i', $_FILES[$varforimage]["name"], $reg)) {
-			$original_file = $reg[1];
-
-			$isimage = image_format_supported($original_file);
-			if ($isimage >= 0) {
-				dol_syslog("Move file ".$_FILES[$varforimage]["tmp_name"]." to ".$dirforimage.$original_file);
-				if (!is_dir($dirforimage)) {
-					dol_mkdir($dirforimage);
-				}
-				$result = dol_move_uploaded_file($_FILES[$varforimage]["tmp_name"], $dirforimage.$original_file, 1, 0, $_FILES[$varforimage]['error']);
-				if ($result > 0) {
-					dolibarr_set_const($db, "MAIN_LOGIN_BACKGROUND", $original_file, 'chaine', 0, '', $conf->entity);
-				} elseif (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result)) {
-					$error++;
-					$langs->load("errors");
-					$tmparray = explode(':', $result);
-					setEventMessages($langs->trans('ErrorFileIsInfectedWithAVirus', $tmparray[1]), null, 'errors');
+				$isimage = image_format_supported($original_file);
+				if ($isimage >= 0) {
+					dol_syslog("Move file " . $_FILES[$varforimage]["tmp_name"] . " to " . $dirforimage . $original_file);
+					if (!is_dir($dirforimage)) {
+						dol_mkdir($dirforimage);
+					}
+					$result = dol_move_uploaded_file($_FILES[$varforimage]["tmp_name"], $dirforimage . $original_file, 1, 0, $_FILES[$varforimage]['error']);
+					if ($result > 0) {
+						dolibarr_set_const($db, "MAIN_LOGIN_BACKGROUND", $original_file, 'chaine', 0, '', $conf->entity);
+					} elseif (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result)) {
+						$error++;
+						$langs->load("errors");
+						$tmparray = explode(':', $result);
+						setEventMessages($langs->trans('ErrorFileIsInfectedWithAVirus', $tmparray[1]), null, 'errors');
+					} else {
+						$error++;
+						setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
+					}
 				} else {
 					$error++;
-					setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
+					$langs->load("errors");
+					setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
 				}
-			} else {
-				$error++;
-				$langs->load("errors");
-				setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
 			}
 		}
 	}
 
+	$_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);
+	}
 
-	$_SESSION["mainmenu"] = ""; // Le gestionnaire de menu a pu changer
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup".(GETPOSTISSET('page_y', 'int') ? '&page_y='.GETPOST('page_y', 'int') : ''));
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup".'&mode='.$mode.(GETPOSTISSET('page_y') ? '&page_y='.GETPOST('page_y', 'int') : ''));
 	exit;
 }
 
@@ -274,6 +303,7 @@ $formadmin = new FormAdmin($db);
 print load_fiche_titre($langs->trans("GUISetup"), '', 'title_setup');
 
 print '<span class="opacitymedium">'.$langs->trans("DisplayDesc")."</span><br>\n";
+print "<br>\n";
 
 //WYSIWYG Editor
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -282,242 +312,349 @@ print '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER["PHP
 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();
+
+print dol_get_fiche_head($head, $mode, '', -1, '');
+
+print '<br>';
 
 clearstatcache();
 
-print '<br>';
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="edit" class="noborder centpercent editmode tableforfield">';
-print '<tr class="liste_titre"><th>'.img_picto('', 'language').' '.$langs->trans("Language").'</th><th></th>';
-print '</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);
-print '</td>';
-print '</tr>';
-
-print '</table>'."\n";
-print '</div>';
-
-print '<br>';
-print '<div class="center">';
-print '<input class="button button-save" type="submit" name="submit" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '<br><br>';
-
-// Themes and themes options
-showSkins(null, 1);
-print '<br>';
-print '<div class="center">';
-print '<input class="button button-save reposition" type="submit" name="submit" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '<br><br>';
-
-// Other
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="otherparameters" class="noborder centpercent editmode tableforfield">';
-print '<tr class="liste_titre"><th class="titlefieldmiddle">'.$langs->trans("Miscellaneous").'</th>';
-print '<th></th>';
-print '<th width="20">&nbsp;</tg>';
-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);
-print ' <span class="opacitymedium"> &nbsp; &nbsp; '.$langs->trans("DisableJavascriptNote").'</span>';
-print '</td>';
-print '<td>';
-print '</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 '<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);
-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);
-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>'.$langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")).'</td><td>';
-print '<input type="text" name="MAIN_BUGTRACK_ENABLELINK" value="'.(empty($conf->global->MAIN_BUGTRACK_ENABLELINK) ? 'github' : $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);
-//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>';
-
-// Message of the day on home page
-$substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'));
-complete_substitutions_array($substitutionarray, $langs);
-
-print '<tr class="oddeven"><td>';
-$texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-foreach ($substitutionarray as $key => $val) {
-	$texthelp .= $key.'<br>';
+if ($mode == 'template') {
+	// Themes and themes options
+	showSkins(null, 1);
 }
-print $form->textwithpicto($langs->trans("MessageOfDay"), $texthelp, 1, 'help', '', 0, 2, 'tooltipmessageofday');
 
-print '</td><td colspan="2">';
+if ($mode == 'dashboard') {
+	print '<div class="div-table-responsive-no-min">';
+	print '<table summary="blockdashboard" class="noborder centpercent editmode tableforfield">';
 
-$doleditor = new DolEditor('main_motd', (isset($conf->global->MAIN_MOTD) ? $conf->global->MAIN_MOTD : ''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
-$doleditor->Create();
+	// Message of the day on home page
+	$substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'));
+	complete_substitutions_array($substitutionarray, $langs);
 
-print '</td></tr>'."\n";
-
-print '</table>'."\n";
-print '</div>';
-
-print '<br>';
-
-print '<div class="center">';
-print '<input class="button button-save reposition" type="submit" name="submit" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '<br><br>';
-
-// Other
-print '<div class="div-table-responsive-no-min">';
-print '<table summary="edit" class="noborder centpercent editmode tableforfield">';
-print '<tr class="liste_titre"><th class="titlefieldmiddle">'.$langs->trans("LoginPage").'</th>';
-print '<th></th>';
-print '<th width="20">&nbsp;</th>';
-print '</tr>';
-
-// Hide helpcenter link on login page
-print '<tr class="oddeven"><td>'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
-print ajax_constantonoff("MAIN_HELPCENTER_DISABLELINK", array(), $conf->entity, 0, 0, 0, 0);
-print '</td>';
-print '<td width="20">&nbsp;</td>';
-print '</tr>';
-
-// Message on login page
-$substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount', 'user'));
-complete_substitutions_array($substitutionarray, $langs);
-print '<tr class="oddeven"><td>';
-$texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-foreach ($substitutionarray as $key => $val) {
-	$texthelp .= $key.'<br>';
-}
-print $form->textwithpicto($langs->trans("MessageLogin"), $texthelp, 1, 'help', '', 0, 2, 'tooltipmessagelogin');
-print '</td><td colspan="2">';
-$doleditor = new DolEditor('main_home', (isset($conf->global->MAIN_HOME) ? $conf->global->MAIN_HOME : ''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
-$doleditor->Create();
-print '</td></tr>'."\n";
-
-// Background
-print '<tr class="oddeven"><td><label for="imagebackground">'.$langs->trans("BackgroundImageLogin").' (png,jpg)</label></td><td colspan="2">';
-print '<div class="centpercent inline-block">';
-$disabled = '';
-if (!empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) {
-	$disabled = ' disabled="disabled"';
-}
-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>';
-	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).'">';
+	print '<tr class="oddeven width25p"><td>';
+	$texthelp = $langs->trans("FollowingConstantsWillBeSubstituted") . '<br>';
+	foreach ($substitutionarray as $key => $val) {
+		$texthelp .= $key . '<br>';
 	}
-} else {
-	print '<img class="paddingleft valignmiddle" width="100" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+	print $form->textwithpicto($langs->trans("MessageOfDay"), $texthelp, 1, 'help', '', 0, 2, 'tooltipmessageofday');
+
+	print '</td><td>';
+
+	$doleditor = new DolEditor('main_motd', (isset($conf->global->MAIN_MOTD) ? $conf->global->MAIN_MOTD : ''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
+	$doleditor->Create();
+
+	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 '</table>';
+	print '</div>';
+
+	print '<br>';
+
+	print '<div class="div-table-responsive-no-min">';
+	print '<table summary="blockdashboard" class="noborder centpercent editmode tableforfield">';
+
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">';
+	print $langs->trans("DashboardDisableBlocks");
+	print '</td><td class="titlefieldmiddle">';
+	print '</td></tr>';
+
+	print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableGlobal') . '</td><td>';
+	print ajax_constantonoff("MAIN_DISABLE_GLOBAL_WORKBOARD", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+	print '</td>';
+	print '</tr>';
+
+	if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
+		// Block meteo
+		print '<tr class="oddeven"><td>' . $langs->trans('MAIN_DISABLE_METEO') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_METEO", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block agenda
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockAgenda') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_AGENDA", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block agenda
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockProject') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_PROJECT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block customer
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockCustomer') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_CUSTOMER", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block supplier
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockSupplier') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_SUPPLIER", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block contract
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockContract') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_CONTRACT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block ticket
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockTicket') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_TICKET", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block bank
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockBank') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_BANK", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block adherent
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockAdherent') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_ADHERENT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block expense report
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockExpenseReport') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_EXPENSEREPORT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+
+		// Block holiday
+		print '<tr class="oddeven"><td>' . $langs->trans('DashboardDisableBlockHoliday') . '</td><td>';
+		print ajax_constantonoff("MAIN_DISABLE_BLOCK_HOLIDAY", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '_red', 'dashboard');
+		print '</td>';
+		print '</tr>';
+	}
+
+	print '</table>' . "\n";
+	print '</div>';
 }
-print '</div>';
-print '</td></tr>';
 
-print '</table>'."\n";
-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
+	print '<div class="div-table-responsive-no-min">';
+	print '<table summary="edit" class="noborder centpercent editmode tableforfield">';
+
+	print '<tr class="liste_titre"><td class="titlefieldmax45">';
+	print $langs->trans("Parameter");
+	print '</td><td>';
+	print $langs->trans("Value");
+	print '</td></tr>';
+
+	// Hide helpcenter link on login page
+	print '<tr class="oddeven"><td>' . $langs->trans("DisableLinkToHelpCenter") . '</td><td>';
+	print ajax_constantonoff("MAIN_HELPCENTER_DISABLELINK", array(), $conf->entity, 0, 0, 0, 0, 0, 0, '', 'login');
+	print '</td>';
+	print '</tr>';
+
+	// Message on login page
+	$substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount', 'user'));
+	complete_substitutions_array($substitutionarray, $langs);
+	print '<tr class="oddeven"><td>';
+	$texthelp = $langs->trans("FollowingConstantsWillBeSubstituted") . '<br>';
+	foreach ($substitutionarray as $key => $val) {
+		$texthelp .= $key . '<br>';
+	}
+	print $form->textwithpicto($langs->trans("MessageLogin"), $texthelp, 1, 'help', '', 0, 2, 'tooltipmessagelogin');
+	print '</td><td>';
+	$doleditor = new DolEditor('main_home', (isset($conf->global->MAIN_HOME) ? $conf->global->MAIN_HOME : ''), '', 142, 'dolibarr_notes', 'In', false, true, true, ROWS_4, '90%');
+	$doleditor->Create();
+	print '</td></tr>' . "\n";
+
+	// Background
+	print '<tr class="oddeven"><td><label for="imagebackground">' . $langs->trans("BackgroundImageLogin") . ' (png,jpg)</label></td><td>';
+	print '<div class="centpercent inline-block">';
+	$disabled = '';
+	if (!empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) {
+		$disabled = ' disabled="disabled"';
+	}
+	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>';
+		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) . '">';
+		}
+	} else {
+		print '<img class="paddingleft valignmiddle" width="100" src="' . DOL_URL_ROOT . '/public/theme/common/nophoto.png">';
+	}
+	print '</div>';
+	print '</td></tr>';
+
+	print '</table>' . "\n";
+	print '</div>';
+}
 
-print '<br>';
 print '<div class="center">';
-print '<input class="button button-save reposition" type="submit" name="submit" value="'.$langs->trans("Save").'">';
+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/import.php b/htdocs/admin/import.php
index 38f8ae7554b..37168baa3d4 100644
--- a/htdocs/admin/import.php
+++ b/htdocs/admin/import.php
@@ -41,6 +41,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 
 /*
  * Actions
@@ -75,6 +77,7 @@ print dol_get_fiche_head($head, 'setup', $langs->trans("ImportArea"), -1, "techn
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="action" value="setModuleOptions">';
 print '<input type="hidden" name="param" value="IMPORT_CSV_SEPARATOR_TO_USE">';
 
@@ -87,7 +90,7 @@ print '<td class="center" width="100"></td>'."\n";
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ImportCsvSeparator").' ('.$langs->trans("ByDefault").')</td>';
 print '<td width="60" align="center">'."<input size=\"3\" class=\"flat\" type=\"text\" name=\"value\" value=\"".(empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE) ? ',' : $conf->global->IMPORT_CSV_SEPARATOR_TO_USE)."\"></td>";
-print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+print '<td class="right"><input type="submit" class="button button-edit reposition" value="'.$langs->trans("Modify").'"></td>';
 print '</td></tr>';
 
 print '</table>';
diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index b28bb4c3e30..787a9d6d820 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -47,10 +47,12 @@ llxHeader('', $langs->trans("Setup"), $wikihelp);
 
 print load_fiche_titre($langs->trans("SetupArea"), '', 'tools');
 
+
 if (!empty($conf->global->MAIN_MOTD_SETUPPAGE)) {
 	$conf->global->MAIN_MOTD_SETUPPAGE = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $conf->global->MAIN_MOTD_SETUPPAGE);
 	if (!empty($conf->global->MAIN_MOTD_SETUPPAGE)) {
 		$i = 0;
+		$reg = array();
 		while (preg_match('/__\(([a-zA-Z|@]+)\)__/i', $conf->global->MAIN_MOTD_SETUPPAGE, $reg) && $i < 100) {
 			$tmp = explode('|', $reg[1]);
 			if (!empty($tmp[1])) {
@@ -75,30 +77,42 @@ print $langs->trans("SetupDescription2", $langs->transnoentities("MenuCompanySet
 print "<br><br>";
 print '</span>';
 
-print '<br><br>';
+print '<br>';
 
 // Show info setup company
 if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) {
 	$setupcompanynotcomplete = 1;
 }
-print img_picto('', 'company', 'class="paddingright"').' '.$langs->trans("SetupDescription3", DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete) ? '' : '&action=edit'), $langs->transnoentities("Setup"), $langs->transnoentities("MenuCompanySetup"));
+
+print '<section class="setupsection">';
+
+print img_picto('', 'company', 'class="paddingright valignmiddle double"').' '.$langs->trans("SetupDescriptionLink", DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete) ? '' : '&action=edit&token='.newToken()), $langs->transnoentities("Setup"), $langs->transnoentities("MenuCompanySetup"));
+print '<br><br>';
+print $langs->trans("SetupDescription3b");
 if (!empty($setupcompanynotcomplete)) {
 	$langs->load("errors");
 	$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"), 'style="padding-right: 6px;"');
 	print '<br><div class="warning"><a href="'.DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete) ? '' : '&action=edit').'">'.$warnpicto.$langs->trans("WarningMandatorySetupNotComplete").'</a></div>';
 }
-print '<br>';
+
+print '</section>';
+
 print '<br>';
 print '<br>';
 
+print '<section class="setupsection">';
+
 // Show info setup module
-print img_picto('', 'cog', 'class="paddingright"').' '.$langs->trans("SetupDescription4", DOL_URL_ROOT.'/admin/modules.php?mainmenu=home', $langs->transnoentities("Setup"), $langs->transnoentities("Modules"));
+print img_picto('', 'cog', 'class="paddingright valignmiddle double"').' '.$langs->trans("SetupDescriptionLink", DOL_URL_ROOT.'/admin/modules.php?mainmenu=home', $langs->transnoentities("Setup"), $langs->transnoentities("Modules"));
+print '<br><br>'.$langs->trans("SetupDescription4b");
 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
 	$langs->load("errors");
 	$warnpicto = img_warning($langs->trans("WarningEnableYourModulesApplications"), 'style="padding-right: 6px;"');
 	print '<br><div class="warning"><a href="'.DOL_URL_ROOT.'/admin/modules.php?mainmenu=home">'.$warnpicto.$langs->trans("WarningEnableYourModulesApplications").'</a></div>';
 }
-print '<br>';
+
+print '</section>';
+
 print '<br>';
 print '<br>';
 print '<br>';
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index b8434773f67..c2440bbb885 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    knowledgemanagement/admin/setup.php
+ * \file    htdocs/admin/knowledgemanagement.php
  * \ingroup knowledgemanagement
  * \brief   KnowledgeManagement setup page.
  */
@@ -37,8 +37,9 @@ $langs->loadLangs(array("admin", "knowledgemanagement"));
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'knowledgemanagement';
@@ -65,9 +66,7 @@ if (!$user->admin) {
  * Actions
  */
 
-if ((float) DOL_VERSION >= 6) {
-	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
-}
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
 	$maskconstorder = GETPOST('maskconstorder', 'alpha');
@@ -258,9 +257,7 @@ if ($action == 'edit') {
 	}
 	print '</table>';
 
-	print '<br><div class="center">';
-	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel("Save", '');
 
 	print '</form>';
 	print '<br>';
@@ -326,7 +323,7 @@ if ($action == 'edit') {
 		print '</table>';
 
 		print '<div class="tabsAction">';
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 		print '</div>';
 	} else {
 		//print '<br>'.$langs->trans("NothingToSetup");
@@ -398,7 +395,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 									$langs->load("errors");
 									print '<div class="error">'.$langs->trans($tmp).'</div>';
 								} elseif ($tmp == 'NotConfigured') {
-									print $langs->trans($tmp);
+									print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 								} else {
 									print $tmp;
 								}
@@ -535,13 +532,13 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Active
 										if (in_array($name, $def)) {
 											print '<td class="center">'."\n";
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
+											print '<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&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+											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>";
 										}
 
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index b606a986ba2..e122bdf5930 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004		Sebastien Di Cintio	<sdicintio@ressource-toi.org>
- * Copyright (C) 2004		Benoit Mortier		<benoit.mortier@opensides.be>
- * Copyright (C) 2005-2017	Regis Houssin		<regis.houssin@inodbox.com>
- * Copyright (C) 2006-2020	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2011-2013	Juanjo Menent		<jmenent@2byte.es>
+/* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004       Sebastien Di Cintio     <sdicintio@ressource-toi.org>
+ * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
+ * Copyright (C) 2005-2021  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2006-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2011-2013  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
@@ -29,10 +29,11 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formldap.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
 
 // Load translation files required by the page
-$langs->load("admin");
+$langs->loadLangs(array("admin", "ldap"));
 
 if (!$user->admin) {
 	accessforbidden();
@@ -99,6 +100,9 @@ if (empty($reshook)) {
 		if (!dolibarr_set_const($db, 'LDAP_MEMBER_TYPE_ACTIVE', GETPOST("activememberstypes", 'aZ09'), 'chaine', 0, '', $conf->entity)) {
 			$error++;
 		}
+		if (!dolibarr_set_const($db, 'LDAP_PASSWORD_HASH_TYPE', GETPOST("LDAP_PASSWORD_HASH_TYPE", 'aZ09'), 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
 
 		if (!$error) {
 			$db->commit();
@@ -129,9 +133,9 @@ if (!function_exists("ldap_connect")) {
 
 
 $form = new Form($db);
+$formldap = new FormLdap($db);
 
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue&token='.newToken().'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print dol_get_fiche_head($head, 'ldap', $langs->trans("LDAPSetup"), -1);
@@ -146,46 +150,31 @@ print "</tr>\n";
 // Synchro utilisateurs/groupes active
 
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnSynchroActive").'</td><td>';
-$arraylist = array();
-$arraylist['0'] = $langs->trans("No");
-$arraylist['ldap2dolibarr'] = $langs->trans("LDAPToDolibarr");
-$arraylist['dolibarr2ldap'] = $langs->trans("DolibarrToLDAP");
-print $form->selectarray('activesynchro', $arraylist, $conf->global->LDAP_SYNCHRO_ACTIVE);
+print $formldap->selectLdapDnSynchroActive(getDolGlobalInt('LDAP_SYNCHRO_ACTIVE'), 'activesynchro');
 print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPDnSynchroActiveExample").'</span>';
-if ($conf->global->LDAP_SYNCHRO_ACTIVE && !$conf->global->LDAP_USER_DN) {
-	print '<br><font class="error">'.$langs->trans("LDAPSetupNotComplete").'</font>';
+if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && empty($conf->global->LDAP_USER_DN)) {
+	print '<br><span class="error">'.$langs->trans("LDAPSetupNotComplete").'</span>';
 }
 print '</td></tr>';
 
 // Synchro contact active
 if (!empty($conf->societe->enabled)) {
 	print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnContactActive").'</td><td>';
-	$arraylist = array();
-	$arraylist['0'] = $langs->trans("No");
-	$arraylist['1'] = $langs->trans("DolibarrToLDAP");
-	print $form->selectarray('activecontact', $arraylist, $conf->global->LDAP_CONTACT_ACTIVE);
+	print $formldap->selectLdapDnSynchroActive(getDolGlobalInt('LDAP_CONTACT_ACTIVE'), 'activecontact', array(Ldap::SYNCHRO_LDAP_TO_DOLIBARR));
 	print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPDnContactActiveExample").'</span></td></tr>';
 }
 
 // Synchro member active
 if (!empty($conf->adherent->enabled)) {
 	print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnMemberActive").'</td><td>';
-	$arraylist = array();
-	$arraylist['0'] = $langs->trans("No");
-	$arraylist['1'] = $langs->trans("DolibarrToLDAP");
-	$arraylist['ldap2dolibarr'] = $langs->trans("LDAPToDolibarr").' ('.$langs->trans("SupportedForLDAPImportScriptOnly").')';
-	print $form->selectarray('activemembers', $arraylist, $conf->global->LDAP_MEMBER_ACTIVE);
+	print $formldap->selectLdapDnSynchroActive(getDolGlobalInt('LDAP_MEMBER_ACTIVE'), 'activemembers', array(), 2);
 	print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPDnMemberActiveExample").'</span></td></tr>';
 }
 
 // Synchro member type active
 if (!empty($conf->adherent->enabled)) {
 	print '<tr class="oddeven"><td>'.$langs->trans("LDAPDnMemberTypeActive").'</td><td>';
-	$arraylist = array();
-	$arraylist['0'] = $langs->trans("No");
-	$arraylist['1'] = $langs->trans("DolibarrToLDAP");
-	$arraylist['ldap2dolibarr'] = $langs->trans("LDAPToDolibarr").' ('.$langs->trans("SupportedForLDAPImportScriptOnly").')';
-	print $form->selectarray('activememberstypes', $arraylist, $conf->global->LDAP_MEMBER_TYPE_ACTIVE);
+	print $formldap->selectLdapDnSynchroActive(getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE'), 'activememberstypes', array(), 2);
 	print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPDnMemberTypeActiveExample").'</span></td></tr>';
 }
 
@@ -202,55 +191,46 @@ print "</tr>\n";
 
 // Type
 print '<tr class="oddeven"><td>'.$langs->trans("Type").'</td><td>';
-$arraylist = array();
-$arraylist['activedirectory'] = 'Active Directory';
-$arraylist['openldap'] = 'OpenLdap';
-$arraylist['egroupware'] = 'Egroupware';
-print $form->selectarray('type', $arraylist, $conf->global->LDAP_SERVER_TYPE);
+print $formldap->selectLdapServerType(getDolGlobalString('LDAP_SERVER_TYPE'), 'type');
 print '</td><td>&nbsp;</td></tr>';
 
 // Version
 print '<tr class="oddeven"><td>'.$langs->trans("Version").'</td><td>';
-$arraylist = array();
-$arraylist['3'] = 'Version 3';
-$arraylist['2'] = 'Version 2';
-print $form->selectarray('LDAP_SERVER_PROTOCOLVERSION', $arraylist, $conf->global->LDAP_SERVER_PROTOCOLVERSION);
+print $formldap->selectLdapServerProtocolVersion(getDolGlobalString('LDAP_SERVER_PROTOCOLVERSION'), 'LDAP_SERVER_PROTOCOLVERSION');
 print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPServerProtocolVersion").'</span></td></tr>';
 
 // Serveur primaire
 print '<tr class="oddeven"><td>';
 print $langs->trans("LDAPPrimaryServer").'</td><td>';
-print '<input class="minwidth200" type="text" name="host" value="'.$conf->global->LDAP_SERVER_HOST.'">';
+print '<input class="minwidth200" type="text" name="host" value="'.getDolGlobalString('LDAP_SERVER_HOST').'">';
 print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPServerExample").'</span></td></tr>';
 
 // Serveur secondaire
 print '<tr class="oddeven"><td>';
 print $langs->trans("LDAPSecondaryServer").'</td><td>';
-print '<input class="minwidth200" type="text" name="slave" value="'.$conf->global->LDAP_SERVER_HOST_SLAVE.'">';
+print '<input class="minwidth200" type="text" name="slave" value="'.getDolGlobalString('LDAP_SERVER_HOST_SLAVE').'">';
 print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPServerExample").'</span></td></tr>';
 
 // Port
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPServerPort").'</td><td>';
-if (!empty($conf->global->LDAP_SERVER_PORT)) {
-	print '<input class="width75" type="text" name="port" value="'.$conf->global->LDAP_SERVER_PORT.'">';
-} else {
-	print '<input class="width75" type="text" name="port" value="389">';
-}
+print '<input class="width75" type="text" name="port" value="'.getDolGlobalString('LDAP_SERVER_PORT', '389').'">';
 print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPServerPortExample").'</span></td></tr>';
 
 // DNserver
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPServerDn").'</td><td>';
-print '<input class="minwidth300" type="text" name="dn" value="'.$conf->global->LDAP_SERVER_DN.'">';
+print '<input class="minwidth300" type="text" name="dn" value="'.getDolGlobalString('LDAP_SERVER_DN').'">';
 print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPServerDnExample").'</span></td></tr>';
 
 // Utiliser TLS
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPServerUseTLS").'</td><td>';
-$arraylist = array();
-$arraylist['0'] = $langs->trans("No");
-$arraylist['1'] = $langs->trans("Yes");
-print $form->selectarray('usetls', $arraylist, $conf->global->LDAP_SERVER_USE_TLS);
+print $form->selectyesno('usetls', getDolGlobalInt('LDAP_SERVER_USE_TLS'), 1);
 print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPServerUseTLSExample").'</span></td></tr>';
 
+// Password hash type
+print '<tr class="oddeven"><td>'.$langs->trans("LDAPPasswordHashType").'</td><td>';
+print $formldap->selectLdapPasswordHashType(getDolGlobalString('LDAP_PASSWORD_HASH_TYPE'), 'LDAP_PASSWORD_HASH_TYPE');
+print '</td><td><span class="opacitymedium">'.$langs->trans("LDAPPasswordHashTypeExample").'</span></td></tr>';
+
 print '<tr class="liste_titre">';
 print '<td colspan="3">'.$langs->trans("ForANonAnonymousAccess").'</td>';
 print "</tr>\n";
@@ -258,24 +238,20 @@ print "</tr>\n";
 // DNAdmin
 print '<!-- LDAP_ADMIN_DN -->';
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPAdminDn").'</td><td>';
-print '<input class="minwidth300" type="text" name="admin" value="'.$conf->global->LDAP_ADMIN_DN.'">';
+print '<input class="minwidth300" type="text" name="admin" value="'.getDolGlobalString('LDAP_ADMIN_DN').'">';
 print '</td><td class="maxwidthhalf"><span class="opacitymedium">'.$langs->trans("LDAPAdminDnExample").'</span></td></tr>';
 
 // Pass
 print '<!-- LDAP_ADMIN_PASS -->';
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPPassword").'</td><td>';
-if (!empty($conf->global->LDAP_ADMIN_PASS)) {
-	print '<input class="minwidth150" type="password" name="pass" value="'.$conf->global->LDAP_ADMIN_PASS.'">'; // je le met en visible pour test
-} else {
-	print '<input class="minwidth150" type="text" name="pass" value="'.$conf->global->LDAP_ADMIN_PASS.'">';
-}
+print '<input class="minwidth150" type="password" name="pass" value="'.$conf->global->LDAP_ADMIN_PASS.'">';
 print '</td><td><span class="opacitymedium">'.$langs->trans('Password').' (ex: secret)</span></td></tr>';
 
 print '</table>';
 
 print dol_get_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+print $form->buttonsSaveCancel("Modify", '');
 
 print '</form>';
 
@@ -290,31 +266,31 @@ if (function_exists("ldap_connect")) {
 		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test">'.$langs->trans("LDAPTestConnect").'</a><br><br>';
 	}
 
-	if ($_GET["action"] == 'test') {
+	if ($action == 'test') {
 		$ldap = new Ldap(); // Les parametres sont passes et recuperes via $conf
 
 		$result = $ldap->connect_bind();
 		if ($result > 0) {
 			// Test ldap connect and bind
 			print img_picto('', 'info').' ';
-			print '<font class="ok">'.$langs->trans("LDAPTCPConnectOK", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT).'</font>';
+			print '<span class="ok">'.$langs->trans("LDAPTCPConnectOK", $ldap->connectedServer, getDolGlobalString('LDAP_SERVER_PORT')).'</span>';
 			print '<br>';
 
-			if ($conf->global->LDAP_ADMIN_DN && !empty($conf->global->LDAP_ADMIN_PASS)) {
+			if (!empty($conf->global->LDAP_ADMIN_DN) && !empty($conf->global->LDAP_ADMIN_PASS)) {
 				if ($result == 2) {
 					print img_picto('', 'info').' ';
-					print '<font class="ok">'.$langs->trans("LDAPBindOK", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT, $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'</font>';
+					print '<span class="ok">'.$langs->trans("LDAPBindOK", $ldap->connectedServer, getDolGlobalString('LDAP_SERVER_PORT'), $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'</span>';
 					print '<br>';
 				} else {
 					print img_picto('', 'error').' ';
-					print '<font class="error">'.$langs->trans("LDAPBindKO", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT, $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'</font>';
+					print '<span class="error">'.$langs->trans("LDAPBindKO", $ldap->connectedServer, getDolGlobalString('LDAP_SERVER_PORT'), $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'</span>';
 					print '<br>';
 					print $langs->trans("Error").' '.$ldap->error;
 					print '<br>';
 				}
 			} else {
 				print img_picto('', 'warning').' ';
-				print '<font class="warning">'.$langs->trans("LDAPNoUserOrPasswordProvidedAccessIsReadOnly").'</font>';
+				print '<span class="warning">'.$langs->trans("LDAPNoUserOrPasswordProvidedAccessIsReadOnly").'</span>';
 				print '<br>';
 			}
 
@@ -322,18 +298,18 @@ if (function_exists("ldap_connect")) {
 			// Test ldap_getversion
 			if (($ldap->getVersion() == 3)) {
 				print img_picto('', 'info').' ';
-				print '<font class="ok">'.$langs->trans("LDAPSetupForVersion3").'</font>';
+				print '<span class="ok">'.$langs->trans("LDAPSetupForVersion3").'</span>';
 				print '<br>';
 			} else {
 				print img_picto('', 'info').' ';
-				print '<font class="ok">'.$langs->trans("LDAPSetupForVersion2").'</font>';
+				print '<span class="ok">'.$langs->trans("LDAPSetupForVersion2").'</span>';
 				print '<br>';
 			}
 
-			$unbind = $ldap->unbind();
+			$ldap->unbind();
 		} else {
 			print img_picto('', 'error').' ';
-			print '<font class="error">'.$langs->trans("LDAPTCPConnectKO", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT).'</font>';
+			print '<span class="error">'.$langs->trans("LDAPTCPConnectKO", $ldap->connectedServer, getDolGlobalString('LDAP_SERVER_PORT')).'</span>';
 			print '<br>';
 			print $langs->trans("Error").' '.$ldap->error;
 			print '<br>';
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 4fb58898a07..fef3882d2ff 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -145,7 +145,7 @@ print dol_get_fiche_head($head, 'contacts', $langs->trans("LDAPSetup"), -1);
 print $langs->trans("LDAPDescContact").'<br>';
 print '<br>';
 
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue&token='.newToken().'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print '<table class="noborder centpercent">';
@@ -284,7 +284,7 @@ print info_admin($langs->trans("LDAPDescValues"));
 
 print dol_get_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+print $form->buttonsSaveCancel("Modify", '');
 
 print '</form>';
 
@@ -321,12 +321,12 @@ if (function_exists("ldap_connect")) {
 
 			if ($result2 > 0) {
 				print img_picto('', 'info').' ';
-				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
+				print '<span class="ok">'.$langs->trans("LDAPSynchroOK").'</span><br>';
 			} else {
 				print img_picto('', 'error').' ';
-				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
+				print '<span class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
-				print '</font><br>';
+				print '</span><br>';
 				print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'<br>';
 			}
 
@@ -336,9 +336,9 @@ if (function_exists("ldap_connect")) {
 			print "\n<br>";
 		} else {
 			print img_picto('', 'error').' ';
-			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
+			print '<span class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
-			print '</font><br>';
+			print '</span><br>';
 			print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'<br>';
 		}
 	}
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 19d24ecd5db..5723183735e 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -120,7 +120,7 @@ print $langs->trans("LDAPDescGroups").'<br>';
 print '<br>';
 
 
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue&token='.newToken().'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print '<table class="noborder centpercent">';
@@ -210,7 +210,7 @@ print info_admin($langs->trans("LDAPDescValues"));
 
 print dol_get_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+print $form->buttonsSaveCancel("Modify", '');
 
 print '</form>';
 
@@ -218,7 +218,7 @@ print '</form>';
 /*
  * Test de la connexion
  */
-if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') {
+if (getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 	$butlabel = $langs->trans("LDAPTestSynchroGroup");
 	$testlabel = 'testgroup';
 	$key = $conf->global->LDAP_KEY_GROUPS;
@@ -226,7 +226,7 @@ if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') {
 	$objectclass = $conf->global->LDAP_GROUP_OBJECT_CLASS;
 
 	show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass);
-} elseif ($conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr') {
+} elseif (getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_LDAP_TO_DOLIBARR) {
 	$butlabel = $langs->trans("LDAPTestSearch");
 	$testlabel = 'testsearchgroup';
 	$key = $conf->global->LDAP_KEY_GROUPS;
@@ -260,12 +260,12 @@ if (function_exists("ldap_connect")) {
 
 			if ($result2 > 0) {
 				print img_picto('', 'info').' ';
-				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
+				print '<span class="ok">'.$langs->trans("LDAPSynchroOK").'</span><br>';
 			} else {
 				print img_picto('', 'error').' ';
-				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
+				print '<span class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
-				print '</font><br>';
+				print '</span><br>';
 				print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'<br>';
 			}
 
@@ -275,9 +275,9 @@ if (function_exists("ldap_connect")) {
 			print "\n<br>";
 		} else {
 			print img_picto('', 'error').' ';
-			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
+			print '<span class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
-			print '</font><br>';
+			print '</span><br>';
 			print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'<br>';
 		}
 	}
@@ -331,9 +331,9 @@ if (function_exists("ldap_connect")) {
 			print "\n<br>";
 		} else {
 			print img_picto('', 'error').' ';
-			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
+			print '<span class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
-			print '</font><br>';
+			print '</span><br>';
 			print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'<br>';
 		}
 	}
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index ab1af5fcf16..876c31d79b1 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -184,7 +184,7 @@ if (!function_exists("ldap_connect")) {
 	setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors');
 }
 
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue&token='.newToken().'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print dol_get_fiche_head($head, 'members', $langs->trans("LDAPSetup"), -1);
@@ -433,7 +433,7 @@ print info_admin($langs->trans("LDAPDescValues"));
 
 print dol_get_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+print $form->buttonsSaveCancel("Modify", '');
 
 print '</form>';
 
@@ -472,12 +472,12 @@ if (function_exists("ldap_connect")) {
 
 			if ($result2 > 0) {
 				print img_picto('', 'info').' ';
-				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
+				print '<span class="ok">'.$langs->trans("LDAPSynchroOK").'</span><br>';
 			} else {
 				print img_picto('', 'error').' ';
-				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
+				print '<span class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
-				print '</font><br>';
+				print '</span><br>';
 				print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'<br>';
 			}
 
@@ -487,9 +487,9 @@ if (function_exists("ldap_connect")) {
 			print "\n<br>";
 		} else {
 			print img_picto('', 'error').' ';
-			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
+			print '<span class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
-			print '</font><br>';
+			print '</span><br>';
 			print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'<br>';
 		}
 	}
diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php
index ae4a1794f35..7933b59d5e0 100644
--- a/htdocs/admin/ldap_members_types.php
+++ b/htdocs/admin/ldap_members_types.php
@@ -112,7 +112,7 @@ print $langs->trans("LDAPDescMembersTypes").'<br>';
 print '<br>';
 
 
-print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?action=setvalue&token='.newToken().'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
 $form = new Form($db);
@@ -180,7 +180,7 @@ print info_admin($langs->trans("LDAPDescValues"));
 
 print dol_get_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+print $form->buttonsSaveCancel("Modify", '');
 
 print '</form>';
 
@@ -188,7 +188,7 @@ print '</form>';
 /*
  * Test de la connexion
  */
-if ($conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1') {
+if (getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 	$butlabel = $langs->trans("LDAPTestSynchroMemberType");
 	$testlabel = 'testmembertype';
 	$key = $conf->global->LDAP_KEY_MEMBERS_TYPES;
@@ -223,12 +223,12 @@ if (function_exists("ldap_connect")) {
 
 			if ($result2 > 0) {
 				print img_picto('', 'info').' ';
-				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
+				print '<span class="ok">'.$langs->trans("LDAPSynchroOK").'</span><br>';
 			} else {
 				print img_picto('', 'error').' ';
-				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
+				print '<span class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
-				print '</font><br>';
+				print '</span><br>';
 				print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'<br>';
 			}
 
@@ -238,9 +238,9 @@ if (function_exists("ldap_connect")) {
 			print "\n<br>";
 		} else {
 			print img_picto('', 'error').' ';
-			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
+			print '<span class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
-			print '</font><br>';
+			print '</span><br>';
 			print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'<br>';
 		}
 	}
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 6e38eb2564e..f395eb88fb4 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -173,7 +173,7 @@ if (!function_exists("ldap_connect")) {
 }
 
 
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue&token='.newToken().'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
 
@@ -192,7 +192,7 @@ print "</tr>\n";
 // DN Pour les utilisateurs
 print '<!-- LDAP_USER_DN -->';
 print '<tr class="oddeven"><td><span class="fieldrequired">'.$langs->trans("LDAPUserDn").'</span></td><td>';
-print '<input size="48" type="text" name="user" value="'.$conf->global->LDAP_USER_DN.'">';
+print '<input size="48" type="text" name="user" value="'.getDolGlobalString('LDAP_USER_DN').'">';
 print '</td><td>'.$langs->trans("LDAPUserDnExample").'</td>';
 print '<td>&nbsp;</td>';
 print '</tr>';
@@ -200,7 +200,7 @@ print '</tr>';
 // List of object class used to define attributes in structure
 print '<!-- LDAP_USER_OBJECT_CLASS -->';
 print '<tr class="oddeven"><td><span class="fieldrequired">'.$langs->trans("LDAPUserObjectClassList").'</span></td><td>';
-print '<input size="48" type="text" name="objectclass" value="'.$conf->global->LDAP_USER_OBJECT_CLASS.'">';
+print '<input size="48" type="text" name="objectclass" value="'.getDolGlobalString('LDAP_USER_OBJECT_CLASS').'">';
 print '</td><td>'.$langs->trans("LDAPUserObjectClassListExample").'</td>';
 print '<td>&nbsp;</td>';
 print '</tr>';
@@ -208,7 +208,7 @@ print '</tr>';
 // Filter, used to filter search
 print '<!-- LDAP_FILTER_CONNECTION -->';
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFilterConnection").'</td><td>';
-print '<input size="48" type="text" name="filterconnection" value="'.$conf->global->LDAP_FILTER_CONNECTION.'">';
+print '<input size="48" type="text" name="filterconnection" value="'.getDolGlobalString('LDAP_FILTER_CONNECTION').'">';
 print '</td><td>'.$langs->trans("LDAPFilterConnectionExample").'</td>';
 print '<td></td>';
 print '</tr>';
@@ -225,168 +225,168 @@ print "</tr>\n";
 
 // Common name
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFullname").'</td><td>';
-print '<input size="25" type="text" name="fieldfullname" value="'.$conf->global->LDAP_FIELD_FULLNAME.'">';
+print '<input size="25" type="text" name="fieldfullname" value="'.getDolGlobalString('LDAP_FIELD_FULLNAME').'">';
 print '</td><td>'.$langs->trans("LDAPFieldFullnameExample").'</td>';
-print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_FULLNAME"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_FULLNAME) ? ' checked' : '')."></td>";
+print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_FULLNAME"'.(getDolGlobalString('LDAP_KEY_USERS') == getDolGlobalString('LDAP_FIELD_FULLNAME') ? ' checked' : '')."></td>";
 print '</tr>';
 
 // Name
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldName").'</td><td>';
-print '<input size="25" type="text" name="fieldname" value="'.$conf->global->LDAP_FIELD_NAME.'">';
+print '<input size="25" type="text" name="fieldname" value="'.getDolGlobalString('LDAP_FIELD_NAME').'">';
 print '</td><td>'.$langs->trans("LDAPFieldNameExample").'</td>';
-print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_NAME"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_NAME) ? ' checked' : '')."></td>";
+print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_NAME"'.(getDolGlobalString('LDAP_KEY_USERS') == getDolGlobalString('LDAP_FIELD_NAME') ? ' checked' : '')."></td>";
 print '</tr>';
 
 // Firstname
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFirstName").'</td><td>';
-print '<input size="25" type="text" name="fieldfirstname" value="'.$conf->global->LDAP_FIELD_FIRSTNAME.'">';
+print '<input size="25" type="text" name="fieldfirstname" value="'.getDolGlobalString('LDAP_FIELD_FIRSTNAME').'">';
 print '</td><td>'.$langs->trans("LDAPFieldFirstNameExample").'</td>';
-print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_FIRSTNAME"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_FIRSTNAME) ? ' checked' : '')."></td>";
+print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_FIRSTNAME"'.(getDolGlobalString('LDAP_KEY_USERS') == getDolGlobalString('LDAP_FIELD_FIRSTNAME') ? ' checked' : '')."></td>";
 print '</tr>';
 
 // Login unix
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldLoginUnix").'</td><td>';
-print '<input size="25" type="text" name="fieldlogin" value="'.$conf->global->LDAP_FIELD_LOGIN.'">';
+print '<input size="25" type="text" name="fieldlogin" value="'.getDolGlobalString('LDAP_FIELD_LOGIN').'">';
 print '</td><td>'.$langs->trans("LDAPFieldLoginExample").'</td>';
-print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_LOGIN"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_LOGIN) ? ' checked' : '')."></td>";
+print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_LOGIN"'.(getDolGlobalString('LDAP_KEY_USERS') == getDolGlobalString('LDAP_FIELD_LOGIN') ? ' checked' : '')."></td>";
 print '</tr>';
 
 // Login samba
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldLoginSamba").'</td><td>';
-print '<input size="25" type="text" name="fieldloginsamba" value="'.$conf->global->LDAP_FIELD_LOGIN_SAMBA.'">';
+print '<input size="25" type="text" name="fieldloginsamba" value="'.getDolGlobalString('LDAP_FIELD_LOGIN_SAMBA').'">';
 print '</td><td>'.$langs->trans("LDAPFieldLoginSambaExample").'</td>';
-print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_LOGIN_SAMBA"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_LOGIN_SAMBA) ? ' checked' : '')."></td>";
+print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_LOGIN_SAMBA"'.(getDolGlobalString('LDAP_KEY_USERS') == getDolGlobalString('LDAP_FIELD_LOGIN_SAMBA') ? ' checked' : '')."></td>";
 print '</tr>';
 
 // Password not crypted
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td><td>';
-print '<input size="25" type="text" name="fieldpassword" value="'.$conf->global->LDAP_FIELD_PASSWORD.'">';
+print '<input size="25" type="text" name="fieldpassword" value="'.getDolGlobalString('LDAP_FIELD_PASSWORD').'">';
 print '</td><td>'.$langs->trans("LDAPFieldPasswordExample").'</td>';
 print '<td class="right">&nbsp;</td>';
 print '</tr>';
 
 // Password crypted
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPasswordCrypted").'</td><td>';
-print '<input size="25" type="text" name="fieldpasswordcrypted" value="'.$conf->global->LDAP_FIELD_PASSWORD_CRYPTED.'">';
+print '<input size="25" type="text" name="fieldpasswordcrypted" value="'.getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED').'">';
 print '</td><td>'.$langs->trans("LDAPFieldPasswordExample").'</td>';
 print '<td class="right">&nbsp;</td>';
 print '</tr>';
 
 // Mail
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldMail").'</td><td>';
-print '<input size="25" type="text" name="fieldmail" value="'.$conf->global->LDAP_FIELD_MAIL.'">';
+print '<input size="25" type="text" name="fieldmail" value="'.getDolGlobalString('LDAP_FIELD_MAIL').'">';
 print '</td><td>'.$langs->trans("LDAPFieldMailExample").'</td>';
-print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_MAIL"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_MAIL) ? ' checked' : '')."></td>";
+print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_MAIL"'.(getDolGlobalString('LDAP_KEY_USERS') == getDolGlobalString('LDAP_FIELD_MAIL') ? ' checked' : '')."></td>";
 print '</tr>';
 
 // Phone
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldPhone").'</td><td>';
-print '<input size="25" type="text" name="fieldphone" value="'.$conf->global->LDAP_FIELD_PHONE.'">';
+print '<input size="25" type="text" name="fieldphone" value="'.getDolGlobalString('LDAP_FIELD_PHONE').'">';
 print '</td><td>'.$langs->trans("LDAPFieldPhoneExample").'</td>';
-print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_PHONE"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_PHONE) ? ' checked' : '')."></td>";
+print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_PHONE"'.(getDolGlobalString('LDAP_KEY_USERS') == getDolGlobalString('LDAP_FIELD_PHONE') ? ' checked' : '')."></td>";
 print '</tr>';
 
 // Mobile
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldMobile").'</td><td>';
-print '<input size="25" type="text" name="fieldmobile" value="'.$conf->global->LDAP_FIELD_MOBILE.'">';
+print '<input size="25" type="text" name="fieldmobile" value="'.getDolGlobalString('LDAP_FIELD_MOBILE').'">';
 print '</td><td>'.$langs->trans("LDAPFieldMobileExample").'</td>';
-print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_MOBILE"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_MOBILE) ? ' checked' : '')."></td>";
+print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_MOBILE"'.(getDolGlobalString('LDAP_KEY_USERS') == getDolGlobalString('LDAP_FIELD_MOBILE') ? ' checked' : '')."></td>";
 print '</tr>';
 
 // Skype
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldSkype").'</td><td>';
-print '<input size="25" type="text" name="fieldskype" value="'.$conf->global->LDAP_FIELD_SKYPE.'">';
+print '<input size="25" type="text" name="fieldskype" value="'.getDolGlobalString('LDAP_FIELD_SKYPE').'">';
 print '</td><td>'.$langs->trans("LDAPFieldSkypeExample").'</td>';
-print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_SKYPE"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_SKYPE) ? ' checked' : '')."></td>";
+print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_SKYPE"'.(getDolGlobalString('LDAP_KEY_USERS') == getDolGlobalString('LDAP_FIELD_SKYPE') ? ' checked' : '')."></td>";
 print '</tr>';
 
 // Fax
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldFax").'</td><td>';
-print '<input size="25" type="text" name="fieldfax" value="'.$conf->global->LDAP_FIELD_FAX.'">';
+print '<input size="25" type="text" name="fieldfax" value="'.getDolGlobalString('LDAP_FIELD_FAX').'">';
 print '</td><td>'.$langs->trans("LDAPFieldFaxExample").'</td>';
-print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_FAX"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_FAX) ? ' checked' : '')."></td>";
+print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_FAX"'.(getDolGlobalString('LDAP_KEY_USERS') == getDolGlobalString('LDAP_FIELD_FAX') ? ' checked' : '')."></td>";
 print '</tr>';
 
 // Company
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldCompany").'</td><td>';
-print '<input size="25" type="text" name="fieldcompany" value="'.$conf->global->LDAP_FIELD_COMPANY.'">';
+print '<input size="25" type="text" name="fieldcompany" value="'.getDolGlobalString('LDAP_FIELD_COMPANY').'">';
 print '</td><td>'.$langs->trans("LDAPFieldCompanyExample").'</td>';
 print '<td class="right">&nbsp;</td>';
 print '</tr>';
 
 // Address
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldAddress").'</td><td>';
-print '<input size="25" type="text" name="fieldaddress" value="'.$conf->global->LDAP_FIELD_ADDRESS.'">';
+print '<input size="25" type="text" name="fieldaddress" value="'.getDolGlobalString('LDAP_FIELD_ADDRESS').'">';
 print '</td><td>'.$langs->trans("LDAPFieldAddressExample").'</td>';
 print '<td class="right">&nbsp;</td>';
 print '</tr>';
 
 // ZIP
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldZip").'</td><td>';
-print '<input size="25" type="text" name="fieldzip" value="'.$conf->global->LDAP_FIELD_ZIP.'">';
+print '<input size="25" type="text" name="fieldzip" value="'.getDolGlobalString('LDAP_FIELD_ZIP').'">';
 print '</td><td>'.$langs->trans("LDAPFieldZipExample").'</td>';
 print '<td class="right">&nbsp;</td>';
 print '</tr>';
 
 // TOWN
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldTown").'</td><td>';
-print '<input size="25" type="text" name="fieldtown" value="'.$conf->global->LDAP_FIELD_TOWN.'">';
+print '<input size="25" type="text" name="fieldtown" value="'.getDolGlobalString('LDAP_FIELD_TOWN').'">';
 print '</td><td>'.$langs->trans("LDAPFieldTownExample").'</td>';
 print '<td class="right">&nbsp;</td>';
 print '</tr>';
 
 // COUNTRY
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldCountry").'</td><td>';
-print '<input size="25" type="text" name="fieldcountry" value="'.$conf->global->LDAP_FIELD_COUNTRY.'">';
+print '<input size="25" type="text" name="fieldcountry" value="'.getDolGlobalString('LDAP_FIELD_COUNTRY').'">';
 print '</td><td>&nbsp;</td>';
 print '<td class="right">&nbsp;</td>';
 print '</tr>';
 
 // Title
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldTitle").'</td><td>';
-print '<input size="25" type="text" name="fieldtitle" value="'.$conf->global->LDAP_FIELD_TITLE.'">';
+print '<input size="25" type="text" name="fieldtitle" value="'.getDolGlobalString('LDAP_FIELD_TITLE').'">';
 print '</td><td>'.$langs->trans("LDAPFieldTitleExample").'</td>';
 print '<td class="right">&nbsp;</td>';
 print '</tr>';
 
 // Note
 print '<tr class="oddeven"><td>'.$langs->trans("Note").'</td><td>';
-print '<input size="25" type="text" name="fielddescription" value="'.$conf->global->LDAP_FIELD_DESCRIPTION.'">';
+print '<input size="25" type="text" name="fielddescription" value="'.getDolGlobalString('LDAP_FIELD_DESCRIPTION').'">';
 print '</td><td>'.$langs->trans("LDAPFieldDescriptionExample").'</td>';
 print '<td class="right">&nbsp;</td>';
 print '</tr>';
 
 // Sid
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldSid").'</td><td>';
-print '<input size="25" type="text" name="fieldsid" value="'.$conf->global->LDAP_FIELD_SID.'">';
+print '<input size="25" type="text" name="fieldsid" value="'.getDolGlobalString('LDAP_FIELD_SID').'">';
 print '</td><td>'.$langs->trans("LDAPFieldSidExample").'</td>';
-print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_SID"'.(($conf->global->LDAP_KEY_USERS && $conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_SID) ? ' checked' : '')."></td>";
+print '<td class="right"><input type="radio" name="key" value="LDAP_FIELD_SID"'.(getDolGlobalString('LDAP_KEY_USERS') == getDolGlobalString('LDAP_FIELD_SID') ? ' checked' : '')."></td>";
 print '</tr>';
 
 // Group id
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldGroupid").'</td><td>';
-print '<input size="25" type="text" name="fieldgroupid" value="'.$conf->global->LDAP_FIELD_GROUPID.'">';
+print '<input size="25" type="text" name="fieldgroupid" value="'.getDolGlobalString('LDAP_FIELD_GROUPID').'">';
 print '</td><td>'.$langs->trans("LDAPFieldGroupidExample").'</td>';
 print '<td class="right">&nbsp;</td>';
 print '</tr>';
 
 // Userid
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldUserid").'</td><td>';
-print '<input size="25" type="text" name="fielduserid" value="'.$conf->global->LDAP_FIELD_USERID.'">';
+print '<input size="25" type="text" name="fielduserid" value="'.getDolGlobalString('LDAP_FIELD_USERID').'">';
 print '</td><td>'.$langs->trans("LDAPFieldUseridExample").'</td>';
 print '<td class="right">&nbsp;</td>';
 print '</tr>';
 
 // Home Directory
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldHomedirectory").'</td><td>';
-print '<input size="25" type="text" name="fieldhomedirectory" value="'.$conf->global->LDAP_FIELD_HOMEDIRECTORY.'">';
+print '<input size="25" type="text" name="fieldhomedirectory" value="'.getDolGlobalString('LDAP_FIELD_HOMEDIRECTORY').'">';
 print '</td><td>'.$langs->trans("LDAPFieldHomedirectoryExample").'</td>';
 print '<td class="right">&nbsp;</td>';
 print '</tr>';
 
 // Home Directory Prefix
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPFieldHomedirectoryprefix").'</td><td>';
-print '<input size="25" type="text" name="fieldhomedirectoryprefix" value="'.$conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX.'">';
+print '<input size="25" type="text" name="fieldhomedirectoryprefix" value="'.getDolGlobalString('LDAP_FIELD_HOMEDIRECTORYPREFIX').'">';
 print '</td><td></td>';
 print '<td class="right">&nbsp;</td>';
 print '</tr>';
@@ -397,7 +397,7 @@ print info_admin($langs->trans("LDAPDescValues"));
 
 print dol_get_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+print $form->buttonsSaveCancel("Modify", '');
 
 print '</form>';
 
@@ -405,20 +405,20 @@ print '</form>';
 /*
  * Test de la connexion
  */
-if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') {
+if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 	$butlabel = $langs->trans("LDAPTestSynchroUser");
 	$testlabel = 'testuser';
-	$key = $conf->global->LDAP_KEY_USERS;
-	$dn = $conf->global->LDAP_USER_DN;
-	$objectclass = $conf->global->LDAP_USER_OBJECT_CLASS;
+	$key = getDolGlobalString('LDAP_KEY_USERS');
+	$dn = getDolGlobalString('LDAP_USER_DN');
+	$objectclass = getDolGlobalString('LDAP_USER_OBJECT_CLASS');
 
 	show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass);
-} elseif ($conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr') {
+} elseif (getDolGlobalString('LDAP_SYNCHRO_ACTIVE') == Ldap::SYNCHRO_LDAP_TO_DOLIBARR) {
 	$butlabel = $langs->trans("LDAPTestSearch");
 	$testlabel = 'testsearchuser';
-	$key = $conf->global->LDAP_KEY_USERS;
-	$dn = $conf->global->LDAP_USER_DN;
-	$objectclass = $conf->global->LDAP_USER_OBJECT_CLASS;
+	$key = getDolGlobalString('LDAP_KEY_USERS');
+	$dn = getDolGlobalString('LDAP_USER_DN');
+	$objectclass = getDolGlobalString('LDAP_USER_OBJECT_CLASS');
 	show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass);
 }
 
@@ -444,12 +444,12 @@ if (function_exists("ldap_connect")) {
 
 			if ($result2 > 0) {
 				print img_picto('', 'info').' ';
-				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
+				print '<span class="ok">'.$langs->trans("LDAPSynchroOK").'</span><br>';
 			} else {
 				print img_picto('', 'error').' ';
-				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
+				print '<span class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
-				print '</font><br>';
+				print '</span><br>';
 				print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'<br>';
 			}
 
@@ -459,9 +459,9 @@ if (function_exists("ldap_connect")) {
 			print "\n<br>";
 		} else {
 			print img_picto('', 'error').' ';
-			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
+			print '<span class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
-			print '</font><br>';
+			print '</span><br>';
 			print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'<br>';
 		}
 	}
@@ -479,29 +479,29 @@ if (function_exists("ldap_connect")) {
 
 		if ($result > 0) {
 			$required_fields = array(
-				$conf->global->LDAP_KEY_USERS,
-				$conf->global->LDAP_FIELD_FULLNAME,
-				$conf->global->LDAP_FIELD_NAME,
-				$conf->global->LDAP_FIELD_FIRSTNAME,
-				$conf->global->LDAP_FIELD_LOGIN,
-				$conf->global->LDAP_FIELD_LOGIN_SAMBA,
-				$conf->global->LDAP_FIELD_PASSWORD,
-				$conf->global->LDAP_FIELD_PASSWORD_CRYPTED,
-				$conf->global->LDAP_FIELD_PHONE,
-				$conf->global->LDAP_FIELD_FAX,
-				$conf->global->LDAP_FIELD_SKYPE,
-				$conf->global->LDAP_FIELD_MOBILE,
-				$conf->global->LDAP_FIELD_MAIL,
-				$conf->global->LDAP_FIELD_TITLE,
-				$conf->global->LDAP_FIELD_DESCRIPTION,
-				$conf->global->LDAP_FIELD_SID
+				getDolGlobalString('LDAP_KEY_USERS'),
+				getDolGlobalString('LDAP_FIELD_FULLNAME'),
+				getDolGlobalString('LDAP_FIELD_NAME'),
+				getDolGlobalString('LDAP_FIELD_FIRSTNAME'),
+				getDolGlobalString('LDAP_FIELD_LOGIN'),
+				getDolGlobalString('LDAP_FIELD_LOGIN_SAMBA'),
+				getDolGlobalString('LDAP_FIELD_PASSWORD'),
+				getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED'),
+				getDolGlobalString('LDAP_FIELD_PHONE'),
+				getDolGlobalString('LDAP_FIELD_FAX'),
+				getDolGlobalString('LDAP_FIELD_SKYPE'),
+				getDolGlobalString('LDAP_FIELD_MOBILE'),
+				getDolGlobalString('LDAP_FIELD_MAIL'),
+				getDolGlobalString('LDAP_FIELD_TITLE'),
+				getDolGlobalString('LDAP_FIELD_DESCRIPTION'),
+				getDolGlobalString('LDAP_FIELD_SID')
 			);
 
 			// Remove from required_fields all entries not configured in LDAP (empty) and duplicated
 			$required_fields = array_unique(array_values(array_filter($required_fields, "dol_validElement")));
 
 			// Get from LDAP database an array of results
-			$ldapusers = $ldap->getRecords('*', $conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, $required_fields, 1);
+			$ldapusers = $ldap->getRecords('*', getDolGlobalString('LDAP_USER_DN'), getDolGlobalString('LDAP_KEY_USERS'), $required_fields, 1);
 			//$ldapusers = $ldap->getRecords('*', $conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, '', 1);
 
 			if (is_array($ldapusers)) {
@@ -523,16 +523,16 @@ if (function_exists("ldap_connect")) {
 			print "<br>\n";
 			print "LDAP search for user:<br>\n";
 			print "search: *<br>\n";
-			print "userDN: ".$conf->global->LDAP_USER_DN."<br>\n";
-			print "useridentifier: ".$conf->global->LDAP_KEY_USERS."<br>\n";
+			print "userDN: ".getDolGlobalString('LDAP_USER_DN')."<br>\n";
+			print "useridentifier: ".getDolGlobalString('LDAP_KEY_USERS')."<br>\n";
 			print "required_fields: ".implode(',', $required_fields)."<br>\n";
 			print "=> ".count($liste)." records<br>\n";
 			print "\n<br>";
 		} else {
 			print img_picto('', 'error').' ';
-			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
+			print '<span class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
-			print '</font><br>';
+			print '</span><br>';
 			print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'<br>';
 		}
 	}
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index a65c1cb5696..1209f41c48e 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -49,7 +49,7 @@ $mainroundingruletot = 'MAIN_ROUNDING_RULE_TOT'.(!empty($currencycode) ? '_'.$cu
 $valmainmaxdecimalsunit = GETPOST($mainmaxdecimalsunit, 'int');
 $valmainmaxdecimalstot = GETPOST($mainmaxdecimalstot, 'int');
 $valmainmaxdecimalsshown = GETPOST($mainmaxdecimalsshown, 'int');
-$valmainroundingruletot = price2num(GETPOST($mainroundingruletot, 'alpha'));
+$valmainroundingruletot = price2num(GETPOST($mainroundingruletot, 'alphanohtml'), '', 2);
 
 if ($action == 'update') {
 	$error = 0;
@@ -108,9 +108,9 @@ $aCurrencies = array($conf->currency); // Default currency always first position
 if (!empty($conf->multicurrency->enabled) && !empty($conf->global->MULTICURRENCY_USE_LIMIT_BY_CURRENCY)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/multicurrency.lib.php';
 
-	$sql = 'SELECT rowid, code FROM '.MAIN_DB_PREFIX.'multicurrency';
-	$sql .= ' WHERE entity = '.$conf->entity;
-	$sql .= ' AND code != "'.$conf->currency.'"'; // Default currency always first position
+	$sql = "SELECT rowid, code FROM ".MAIN_DB_PREFIX."multicurrency";
+	$sql .= " WHERE entity = ".((int) $conf->entity);
+	$sql .= " AND code <> '".$db->escape($conf->currency)."'"; // Default currency always first position
 	$resql = $db->query($sql);
 	if ($resql) {
 		while ($obj = $db->fetch_object($resql)) {
@@ -190,7 +190,7 @@ if ($action == 'edit') {
 	print '</div>';
 
 	print '<div class="tabsAction">';
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit'.(!empty($currencycode) ? '&currencycode='.$currencycode : '').'">'.$langs->trans("Modify").'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().''.(!empty($currencycode) ? '&currencycode='.$currencycode : '').'">'.$langs->trans("Modify").'</a>';
 	print '</div>';
 }
 
@@ -211,7 +211,7 @@ if (empty($mysoc->country_code)) {
 	print '<span class="opacitymedium">'.$langs->trans("Format").':</span> '.price(price2num(1234.56789, 'MT'), 0, $langs, 1, -1, -1, $currencycode)."<br>\n";
 
 	// Always show vat rates with vat 0
-	$s = 2 / 7; $qty = 1; $vat = 0;
+	$s = 2 / 3; $qty = 1; $vat = 0;
 	$tmparray = calcul_price_total(1, $qty * price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);
 	print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
 	print " x ".$langs->trans("Quantity").": ".$qty;
diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index 94b0da08d4f..59b7eb8b463 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -105,7 +105,7 @@ foreach ($list as $key) {
 	// Value
 	print '<td>';
 	if (!empty($conf->accounting->enabled)) {
-		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
+		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.'">';
 	}
@@ -117,7 +117,7 @@ print '</tr>';
 print '</form>';
 print "</table>\n";
 
-print '<br><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
+print '<br><div style="text-align:center"><input type="submit" class="button button-edit" name="button" value="'.$langs->trans('Modify').'"></div>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 7988c0dab7f..37735a43ed3 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -193,8 +193,7 @@ if (!empty($conf->use_javascript_ajax) && $conf->global->MAIN_FEATURES_LEVEL >=
 
 print '</table>';
 
-print '<br>';
-print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+print $form->buttonsSaveCancel("Modify", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index 15dcccdb000..8b003ce2d4e 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -218,7 +218,7 @@ if (!empty($conf->global->ADHERENT_USE_MAILMAN)) {
 	print '<input type="hidden" name="action" value="testsubscribe">';
 
 	print $langs->trans("TestSubscribe").'<br>';
-	print $langs->trans("EMail").' <input type="email" class="flat" name="testsubscribeemail" value="'.GETPOST('testsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
+	print $langs->trans("EMail").' <input type="email" class="flat" name="testsubscribeemail" value="'.GETPOST('testsubscribeemail').'"> <input type="submit" class="button" value="'.$langs->trans("Test").'"><br>';
 
 	print '</form>';
 
@@ -227,7 +227,7 @@ if (!empty($conf->global->ADHERENT_USE_MAILMAN)) {
 	print '<input type="hidden" name="action" value="testunsubscribe">';
 
 	print $langs->trans("TestUnSubscribe").'<br>';
-	print $langs->trans("EMail").' <input type="email" class="flat" name="testunsubscribeemail" value="'.GETPOST('testunsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
+	print $langs->trans("EMail").' <input type="email" class="flat" name="testunsubscribeemail" value="'.GETPOST('testunsubscribeemail').'"> <input type="submit" class="button" value="'.$langs->trans("Test").'"><br>';
 
 	print '</form>';
 }
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 18b2f7d6e3d..41a436b70a8 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -173,7 +173,7 @@ if (version_compare(phpversion(), '7.0', '>=')) {
 
 if ($action == 'edit') {
 	if ($conf->use_javascript_ajax) {
-		print "\n".'<script type="text/javascript" language="javascript">';
+		print "\n".'<script type="text/javascript">';
 		print 'jQuery(document).ready(function () {
                     function initfields()
                     {
@@ -292,7 +292,7 @@ if ($action == 'edit') {
 	print dol_get_fiche_head($head, 'common', '', -1);
 
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
-	print "<br>\n";
+	print "<br><br>\n";
 
 
 	clearstatcache();
@@ -536,18 +536,14 @@ if ($action == 'edit') {
 
 	print dol_get_fiche_end();
 
-	print '<br><div class="center">';
-	print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 } else {
 	print dol_get_fiche_head($head, 'common', '', -1);
 
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
-	print "<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">';
@@ -788,7 +784,7 @@ if ($action == 'edit') {
 	// Actions button
 	print '<div class="tabsAction">';
 
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 
 	if (empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
 		if ($conf->global->MAIN_MAIL_SENDMODE != 'mail' || !$linuxlike) {
@@ -852,8 +848,22 @@ if ($action == 'edit') {
 				$text .= ($text ? '<br><br>' : '').'<!-- MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD -->'.$langs->trans("WarningPHPMailSPF", $conf->global->MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD);
 			}
 		}
-
-
+		$companyemail = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL');
+		$dnsinfo = false;
+		if (!empty($companyemail) && function_exists('dns_get_record')) {
+			$arrayofemailparts = explode('@', $companyemail);
+			if (count($arrayofemailparts) == 2) {
+				$domain = $arrayofemailparts[1];
+				$dnsinfo = dns_get_record($domain, DNS_TXT);
+			}
+		}
+		if (!empty($dnsinfo) && is_array($dnsinfo)) {
+			foreach ($dnsinfo as $info) {
+				if (strpos($info['txt'], 'v=spf') !== false) {
+					$text .= ($text ? '<br><br>' : '').$langs->trans("ActualMailSPFRecordFound", $info['txt']);
+				}
+			}
+		}
 		if ($text) {
 			print info_admin($text);
 		}
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 511f5dde698..6b1aa3334b5 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -143,7 +143,7 @@ if (version_compare(phpversion(), '7.0', '>=')) {
 
 if ($action == 'edit') {
 	if ($conf->use_javascript_ajax) {
-		print "\n".'<script type="text/javascript" language="javascript">';
+		print "\n".'<script type="text/javascript">';
 		print 'jQuery(document).ready(function () {
                     function initfields()
                     {
@@ -243,7 +243,7 @@ if ($action == 'edit') {
 	print dol_get_fiche_head($head, 'common_emailing', '', -1);
 
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
-	print "<br>\n";
+	print "<br><br>\n";
 
 
 	clearstatcache();
@@ -405,18 +405,14 @@ if ($action == 'edit') {
 
 	print dol_get_fiche_end();
 
-	print '<br><div class="center">';
-	print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 } else {
 	print dol_get_fiche_head($head, 'common_emailing', '', -1);
 
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
-	print "<br>\n";
+	print "<br><br>\n";
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
@@ -519,7 +515,7 @@ if ($action == 'edit') {
 
 	print '<div class="tabsAction">';
 
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 
 	if (!empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default') {
 		if ($conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'mail' || !$linuxlike) {
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index d8c827337ad..d3441cf2e21 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -226,12 +226,12 @@ print "<br>\n";
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
 foreach ($object->fields as $key => $val) {
-	$sql .= 't.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key." as options_".$key.', ' : '');
 	}
 }
 // Add fields from hooks
@@ -282,7 +282,7 @@ $sql .= $hookmanager->resPrint;
 $sql.= " GROUP BY "
 foreach($object->fields as $key => $val)
 {
-	$sql.='t.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -395,12 +395,8 @@ if ($action != 'create') {
 		print $form->selectarray('active', $object->fields['active']['arrayofkeyval'], (GETPOSTISSET('active') ? GETPOST('active', 'int') : $object->active), 0, 0, 0, '', 1);
 		print '</td></tr>';
 		print '</table>';
-		print '<br>';
-		print '<div class="center">';
-		print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-		print ' &nbsp; ';
-		print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
+
+		print $form->buttonsSaveCancel();
 	}
 } else {
 	/*print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -428,12 +424,8 @@ if ($action != 'create') {
 	print $form->selectarray('active', $object->fields['active']['arrayofkeyval'], GETPOST('active', 'int'), 0);
 	print '</td></tr>';
 	print '</table>';
-	print '<br>';
-	print '<div class="center">';
-	print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; ';
-	print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+
+	print $form->buttonsSaveCancel();
 	//print '</form>';
 }
 
@@ -605,7 +597,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
@@ -640,7 +632,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	if ($sortorder) {
 		$url .= '&page='.urlencode($sortorder);
 	}
-	print '<a class="editfielda reposition marginrightonly marginleftonly" href="'.$url.'&action=edit&rowid='.$obj->rowid.'">'.img_edit().'</a>';
+	print '<a class="editfielda reposition marginrightonly marginleftonly" href="'.$url.'&action=edit&token='.newToken().'&rowid='.$obj->rowid.'">'.img_edit().'</a>';
 	//print ' &nbsp; ';
 	print '<a class=" marginrightonly marginleftonly" href="'.$url.'&action=delete&token='.newToken().'">'.img_delete().'</a>  &nbsp; ';
 	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 0adc526d69e..fb3a1ccf702 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -80,8 +80,8 @@ $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"')
 $listoffset = GETPOST('listoffset', 'alpha');
 $listlimit = GETPOST('listlimit', 'alpha') > 0 ?GETPOST('listlimit', 'alpha') : 1000;
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -246,11 +246,14 @@ if ($reshook == 0) {
 	}
 }
 
+$permissiontoadd = 1;
+
 //asort($elementList);
 
 $id = 25;
 
 
+
 /*
  * Actions
  */
@@ -338,6 +341,7 @@ if (empty($reshook)) {
 				}
 
 				setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+				$action = 'add';
 			}
 		}
 
@@ -411,6 +415,7 @@ if (empty($reshook)) {
 				} else {
 					dol_print_error($db);
 				}
+				$action = 'add';
 			}
 		}
 
@@ -489,6 +494,7 @@ if (empty($reshook)) {
 				setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
 			} else {
 				setEventMessages($db->error(), null, 'errors');
+				$action = 'edit';
 			}
 		}
 	}
@@ -515,7 +521,7 @@ if (empty($reshook)) {
 	if ($action == $acts[0]) {
 		$rowidcol = "rowid";
 
-		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."=".((int) $rowid);
+		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE rowid = ".((int) $rowid);
 
 		$result = $db->query($sql);
 		if (!$result) {
@@ -527,7 +533,7 @@ if (empty($reshook)) {
 	if ($action == $acts[1]) {
 		$rowidcol = "rowid";
 
-		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."=".((int) $rowid);
+		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE rowid = ".((int) $rowid);
 
 		$result = $db->query($sql);
 		if (!$result) {
@@ -545,18 +551,38 @@ $form = new Form($db);
 $formadmin = new FormAdmin($db);
 
 $help_url = '';
-$title = $langs->trans("EMailsSetup");
+if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
+	$title = $langs->trans("EMailsSetup");
+} else {
+	$title = $langs->trans("EMailsTemplates");
+}
 
 llxHeader('', $title, $help_url);
 
 $linkback = '';
 $titlepicto = 'title_setup';
 
-print load_fiche_titre($title, $linkback, $titlepicto);
 
-$head = email_admin_prepare_head();
+$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, '');
+	}
+}
 
-print dol_get_fiche_head($head, 'templates', '', -1);
 
 // Confirmation de la suppression de la ligne
 if ($action == 'delete') {
@@ -599,7 +625,7 @@ $sql .= $db->plimit($listlimit + 1, $offset);
 
 $fieldlist = explode(',', $tabfield[$id]);
 
-if ($action == 'view') {
+if ($action == 'add') {
 	// Form to add a new line
 	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -657,7 +683,7 @@ if ($action == 'view') {
 		if ($valuetoshow != '') {
 			print '<td class="'.$align.'">';
 			if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
-				print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				print '<a href="'.$tabhelp[$id][$value].'" target="_blank" rel="noopener noreferrer">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
 			} elseif (!empty($tabhelp[$id][$value])) {
 				if (in_array($value, array('topic'))) {
 					print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value); // Tooltip on click
@@ -750,7 +776,8 @@ if ($action == 'view') {
 		if ($tmpfieldlist == 'topic') {
 			print '<td class="center" rowspan="'.(count($fieldsforcontent)).'">';
 			if ($action != 'edit') {
-				print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+				print '<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>';
 		}
@@ -897,7 +924,7 @@ if ($resql) {
 			$valuetoshow = $langs->trans("Content"); $showfield = 0;
 		}
 		if ($fieldlist[$field] == 'content_lines') {
-			$valuetoshow = $langs->trans("ContentLines"); $showfield = 0;
+			$valuetoshow = $langs->trans("ContentForLines"); $showfield = 0;
 		}
 
 		// Show fields
@@ -939,7 +966,7 @@ if ($resql) {
 				print '<td class="center">';
 				print '<input type="hidden" name="page" value="'.$page.'">';
 				print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-				print '<input type="submit" class="button buttongen" name="actionmodify" value="'.$langs->trans("Modify").'">';
+				print '<input type="submit" class="button buttongen button-save" name="actionmodify" value="'.$langs->trans("Modify").'">';
 				print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
 				print '<input type="submit" class="button buttongen button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 				print '</td>';
@@ -976,6 +1003,14 @@ if ($resql) {
 							$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 500, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
 							print $doleditor->Create(1);
 						}
+						if ($tmpfieldlist == 'content_lines') {
+							print $form->textwithpicto($langs->trans("ContentForLines"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>';
+							$okforextended = true;
+							if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
+								$okforextended = false;
+							$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
+							print $doleditor->Create(1);
+						}
 						print '</td>';
 						print '<td></td>';
 						print '<td></td>';
@@ -1117,35 +1152,6 @@ if ($resql) {
 					//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
 				}
 				print '</td>';
-
-				/*
-				$fieldsforcontent = array('content');
-				if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
-				{
-					$fieldsforcontent = array('content', 'content_lines');
-				}
-				foreach ($fieldsforcontent as $tmpfieldlist)
-				{
-					$showfield = 1;
-					$align = "left";
-					$valuetoshow = $obj->{$tmpfieldlist};
-
-					$class = 'tddict';
-					// Show value for field
-					if ($showfield) {
-
-						print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$i.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
-						$okforextended = true;
-						if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
-							$okforextended = false;
-						$doleditor = new DolEditor($tmpfieldlist.'-'.$i, (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%', 1);
-						print $doleditor->Create(1);
-						print '</td>';
-						print '<td></td><td></td><td></td>';
-
-					}
-				}*/
-
 				print "</tr>\n";
 			}
 
@@ -1163,7 +1169,10 @@ print '</div>';
 print '</form>';
 
 
-print dol_get_fiche_end();
+if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
+	print dol_get_fiche_end();
+}
+
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php
index 939273c1da2..79c549c0609 100644
--- a/htdocs/admin/mails_ticket.php
+++ b/htdocs/admin/mails_ticket.php
@@ -142,7 +142,7 @@ if (version_compare(phpversion(), '7.0', '>=')) {
 
 if ($action == 'edit') {
 	if ($conf->use_javascript_ajax) {
-		print "\n".'<script type="text/javascript" language="javascript">';
+		print "\n".'<script type="text/javascript">';
 		print 'jQuery(document).ready(function () {
                     function initfields()
                     {
@@ -232,7 +232,7 @@ if ($action == 'edit') {
 	print dol_get_fiche_head($head, 'common_ticket', '', -1);
 
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
-	print "<br>\n";
+	print "<br><br>\n";
 
 
 	clearstatcache();
@@ -380,18 +380,14 @@ if ($action == 'edit') {
 
 	print dol_get_fiche_end();
 
-	print '<br><div class="center">';
-	print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 } else {
 	print dol_get_fiche_head($head, 'common_ticket', '', -1);
 
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
-	print "<br>\n";
+	print "<br><br>\n";
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
@@ -483,7 +479,7 @@ if ($action == 'edit') {
 
 	print '<div class="tabsAction">';
 
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 
 	if (!empty($conf->global->MAIN_MAIL_SENDMODE_TICKET) && $conf->global->MAIN_MAIL_SENDMODE_TICKET != 'default') {
 		if ($conf->global->MAIN_MAIL_SENDMODE_TICKET != 'mail' || !$linuxlike) {
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 2e84efbfb06..02c46d8ca35 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -255,7 +255,7 @@ llxHeader('', $langs->trans("Menu"));
 
 
 if ($action == 'create') {
-	print '<script type="text/javascript" language="javascript">
+	print '<script type="text/javascript">
     jQuery(document).ready(function() {
     	function init_topleft()
     	{
@@ -281,7 +281,7 @@ if ($action == 'create') {
 
 	print load_fiche_titre($langs->trans("NewMenu"), '', 'title_setup');
 
-	print '<form action="./edit.php?action=add&menuId='.GETPOST('menuId', 'int').'" method="post" name="formmenucreate">';
+	print '<form action="'.DOL_URL_ROOT.'/admin/menus/edit.php?action=add&token='.newToken().'&menuId='.GETPOST('menuId', 'int').'" method="post" name="formmenucreate">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 
 	print dol_get_fiche_head();
@@ -391,11 +391,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 } elseif ($action == 'edit') {
@@ -516,12 +512,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	// Bouton
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index f0211d1b795..716dbc32ca7 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -70,6 +70,9 @@ print '<!-- Force style container -->'."\n".'<style>
 .id-container {
     width: 100%;
 }
+#id-right {
+	padding-left: unset;
+}
 </style>';
 
 $arrayofnatures = array('core'=>$langs->transnoentitiesnoconv("Core"), 'external'=>$langs->transnoentitiesnoconv("External").' - '.$langs->trans("AllPublishers"));
@@ -259,6 +262,11 @@ if ($ip) {
 	$text .= '<br><span class="opacitymedium">'.$langs->trans("LastActivationIP").':</span> ';
 	$text .= $ip;
 }
+$lastactivationversion = $tmp['lastactivationversion'];
+if ($lastactivationversion) {
+	$text .= '<br><span class="opacitymedium">'.$langs->trans("LastActivationVersion").':</span> ';
+	$text .= $lastactivationversion;
+}
 
 $moreinfo = $text;
 
@@ -322,7 +330,15 @@ if ($mode == 'desc') {
 
 	$textexternal = '';
 	if ($objMod->isCoreOrExternalModule() == 'external') {
-		$textexternal .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("ExternalModule").' - '.$langs->trans("InstalledInto", $dirofmodule);
+		$tmpdirofmoduletoshow = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $dirofmodule);
+		$textexternal .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("ExternalModule").' - '.$langs->trans("InstalledInto", $tmpdirofmoduletoshow);
+
+		global $dolibarr_allow_download_external_modules;
+		if (!empty($dolibarr_allow_download_external_modules) && preg_match('/\/custom\//', $dirofmodule)) {
+			// Add a link to download a zip of the module
+			$textexternal .= ' <a href="'.DOL_URL_ROOT.'/admin/tools/export_files.php?export_type=externalmodule&what='.urlencode($moduledir).'&compression=zip&zipfilename_template=module_'.$moduledir.'-'.$version.'.notorig" target="_blank" rel="noopener">'.img_picto('', 'download').'</a>';
+		}
+
 		if ($objMod->editor_name != 'dolibarr') {
 			$textexternal .= '<br><span class="opacitymedium">'.$langs->trans("Publisher").':</span> '.(empty($objMod->editor_name) ? $langs->trans("Unknown") : $objMod->editor_name);
 		}
@@ -331,7 +347,7 @@ if ($mode == 'desc') {
 			$editor_url = 'http://'.$editor_url;
 		}
 		if (!empty($objMod->editor_url) && !preg_match('/dolibarr\.org/i', $objMod->editor_url)) {
-			$textexternal .= ($objMod->editor_name != 'dolibarr' ? ' - ' : '').img_picto('', 'globe').' <a href="'.$editor_url.'" target="_blank">'.$objMod->editor_url.'</a>';
+			$textexternal .= ($objMod->editor_name != 'dolibarr' ? ' - ' : '').img_picto('', 'globe').' <a href="'.$editor_url.'" target="_blank" rel="noopener noreferrer external">'.$objMod->editor_url.'</a>';
 		}
 		$text .= $textexternal;
 		$text .= '<br>';
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 236c8c0b28e..29d2335a0f9 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -303,7 +303,7 @@ llxHeader('', $langs->trans("Setup"), $help_url, '', '', '', $morejs, $morecss,
 // Search modules dirs
 $modulesdir = dolGetModulesDirs();
 
-$arrayofnatures = array('core'=>$langs->transnoentitiesnoconv("Core"), 'external'=>$langs->transnoentitiesnoconv("External").' - ['.$langs->trans("AllPublishers").']');
+$arrayofnatures = array('core'=>$langs->transnoentitiesnoconv("NativeModules"), 'external'=>$langs->transnoentitiesnoconv("External").' - ['.$langs->trans("AllPublishers").']');
 $arrayofwarnings = array(); // Array of warning each module want to show when activated
 $arrayofwarningsext = array(); // Array of warning each module want to show when we activate an external module
 $filename = array();
@@ -535,14 +535,14 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 
 	//$moreforfilter .= '<div class="floatright center marginrightonly hideonsmartphone" style="padding-top: 3px"><span class="paddingright">'.$moreinfo.'</span> '.$moreinfo2.'</div>';
 
-	$moreforfilter .= '<div class="colorbacktimesheet float valignmiddle">';
-	$moreforfilter .= '<div class="divsearchfield paddingtop">';
+	$moreforfilter .= '<div class="divfilteralone colorbacktimesheet float valignmiddle">';
+	$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
 	$moreforfilter .= img_picto($langs->trans("Filter"), 'filter', 'class="paddingright opacityhigh hideonsmartphone"').'<input type="text" id="search_keyword" name="search_keyword" class="maxwidth125" value="'.dol_escape_htmltag($search_keyword).'" placeholder="'.dol_escape_htmltag($langs->trans('Keyword')).'">';
 	$moreforfilter .= '</div>';
-	$moreforfilter .= '<div class="divsearchfield paddingtop">';
-	$moreforfilter .= $form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), $langs->trans('Origin'), 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1);
+	$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
+	$moreforfilter .= $form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), $langs->trans('Origin'), 0, 0, '', 0, 0, 0, '', 'maxwidth250', 1);
 	$moreforfilter .= '</div>';
-	if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+	if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
 		$array_version = array('stable'=>$langs->transnoentitiesnoconv("Stable"));
 		if ($conf->global->MAIN_FEATURES_LEVEL < 0) {
 			$array_version['deprecated'] = $langs->trans("Deprecated");
@@ -553,18 +553,20 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 		if ($conf->global->MAIN_FEATURES_LEVEL > 1) {
 			$array_version['development'] = $langs->trans("Development");
 		}
-		$moreforfilter .= '<div class="divsearchfield paddingtop">';
+		$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
 		$moreforfilter .= $form->selectarray('search_version', $array_version, $search_version, $langs->trans('Version'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
 		$moreforfilter .= '</div>';
 	}
-	$moreforfilter .= '<div class="divsearchfield paddingtop">';
+	$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
 	$moreforfilter .= $form->selectarray('search_status', array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled")), $search_status, $langs->trans('Status'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
 	$moreforfilter .= '</div>';
 	$moreforfilter .= ' ';
-	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= '<input type="submit" name="buttonsubmit" class="button" value="'.dol_escape_htmltag($langs->trans("Refresh")).'">';
-	$moreforfilter .= ' ';
-	$moreforfilter .= '<input type="submit" name="buttonreset" class="butActionDelete noborderbottom" value="'.dol_escape_htmltag($langs->trans("Reset")).'">';
+	$moreforfilter .= '<div class="divsearchfield valignmiddle inline-block">';
+	$moreforfilter .= '<input type="submit" name="buttonsubmit" class="button small" value="'.dol_escape_htmltag($langs->trans("Refresh")).'">';
+	if ($search_keyword || ($search_nature && $search_nature != '-1') || ($search_version && $search_version != '-1') || ($search_status && $search_status != '-1')) {
+		$moreforfilter .= ' ';
+		$moreforfilter .= '<input type="submit" name="buttonreset" class="buttonreset noborderbottom" value="'.dol_escape_htmltag($langs->trans("Reset")).'">';
+	}
 	$moreforfilter .= '</div>';
 	$moreforfilter .= '</div>';
 
@@ -597,6 +599,9 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 	$oldfamily = '';
 	$foundoneexternalmodulewithupdate = 0;
 	$linenum = 0;
+	$atleastonequalified = 0;
+	$atleastoneforfamily = 0;
+
 	foreach ($orders as $key => $value) {
 		$linenum++;
 		$tab = explode('_', $value);
@@ -685,7 +690,9 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			}
 		}
 
-		// Load all lang files of module
+		$atleastonequalified++;
+
+		// Load all language files of the qualified module
 		if (isset($objMod->langfiles) && is_array($objMod->langfiles)) {
 			foreach ($objMod->langfiles as $domain) {
 				$langs->load($domain);
@@ -801,16 +808,16 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			if (!empty($objMod->config_page_url) && !$disableSetup) {
 				$backtourlparam = '';
 				if ($search_keyword != '') {
-					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_keyword='.$search_keyword; // No urlencode here, done later
+					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_keyword='.urlencode($search_keyword); // No urlencode here, done later
 				}
 				if ($search_nature > -1) {
-					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_nature='.$search_nature; // No urlencode here, done later
+					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_nature='.urlencode($search_nature); // No urlencode here, done later
 				}
 				if ($search_version > -1) {
-					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_version='.$search_version; // No urlencode here, done later
+					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_version='.urlencode($search_version); // No urlencode here, done later
 				}
 				if ($search_status > -1) {
-					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_status='.$search_status; // No urlencode here, done later
+					$backtourlparam .= ($backtourlparam ? '&' : '?').'search_status='.urlencode($search_status); // No urlencode here, done later
 				}
 				$backtourl = $_SERVER["PHP_SELF"].$backtourlparam;
 
@@ -878,7 +885,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 					}
 				}
 				$codeenabledisable .= '<!-- Message to show: '.$warningmessage.' -->'."\n";
-				$codeenabledisable .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=set&amp;value='.$modName.'&amp;mode='.$mode.$param.'"';
+				$codeenabledisable .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&token='.newToken().'&module_position='.$module_position.'&action=set&token='.newToken().'&value='.$modName.'&mode='.$mode.$param.'"';
 				if ($warningmessage) {
 					$codeenabledisable .= ' onclick="return confirm(\''.dol_escape_js($warningmessage).'\');"';
 				}
@@ -972,6 +979,10 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 		}
 	}
 
+	if (!$atleastonequalified) {
+		print '<br><span class="opacitymedium">'.$langs->trans("NoDeployedModulesFoundWithThisSearchCriteria").'</span><br><br>';
+	}
+
 	print dol_get_fiche_end();
 
 	print '<br>';
@@ -1000,9 +1011,9 @@ if ($mode == 'marketplace') {
 
 	print '<tr class="oddeven">'."\n";
 	$url = 'https://www.dolistore.com';
-	print '<td class="hideonsmartphone"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
+	print '<td class="hideonsmartphone"><a href="'.$url.'" target="_blank" rel="noopener noreferrer external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
 	print '<td><span class="opacitymedium">'.$langs->trans("DoliStoreDesc").'</span></td>';
-	print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
+	print '<td><a href="'.$url.'" target="_blank" rel="noopener noreferrer external">'.$url.'</a></td>';
 	print '</tr>';
 
 	print "</table>\n";
@@ -1083,7 +1094,7 @@ if ($mode == 'deploy') {
 		$allowonlineinstall = false;
 	}
 
-	$fullurl = '<a href="'.$urldolibarrmodules.'" target="_blank">'.$urldolibarrmodules.'</a>';
+	$fullurl = '<a href="'.$urldolibarrmodules.'" target="_blank" rel="noopener noreferrer">'.$urldolibarrmodules.'</a>';
 	$message = '';
 	if (!empty($allowonlineinstall)) {
 		if (!in_array('/custom', explode(',', $dolibarr_main_url_root_alt))) {
@@ -1128,7 +1139,7 @@ if ($mode == 'deploy') {
 		}
 
 		if ($allowfromweb == 1) {
-			print $langs->trans("UnpackPackageInModulesRoot", $dirins).'<br>';
+			print '<span class="opacitymedium">'.$langs->trans("UnpackPackageInModulesRoot", $dirins).'</span><br>';
 
 			print '<br>';
 
@@ -1275,10 +1286,10 @@ if ($mode == 'develop') {
 	print '<tr class="oddeven" height="80">'."\n";
 	$url = 'https://partners.dolibarr.org';
 	print '<td class="left">';
-	print'<a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner.png"></a>';
+	print'<a href="'.$url.'" target="_blank" rel="noopener noreferrer external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner.png"></a>';
 	print '</td>';
 	print '<td>'.$langs->trans("DoliPartnersDesc").'</td>';
-	print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
+	print '<td><a href="'.$url.'" target="_blank" rel="noopener noreferrer external">'.$url.'</a></td>';
 	print '</tr>';
 
 	print "</table>\n";
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 74263538c71..fac6a3f3d41 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -37,6 +37,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'mrp';
@@ -69,7 +71,7 @@ if ($action == 'updateMask') {
 	$modele = GETPOST('module', 'alpha');
 
 	$mo = new MO($db);
-	$mrp->initAsSpecimen();
+	$mo->initAsSpecimen();
 
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
@@ -88,7 +90,7 @@ if ($action == 'updateMask') {
 
 		$module = new $classname($db);
 
-		if ($module->write_file($mrp, $langs) > 0) {
+		if ($module->write_file($mo, $langs) > 0) {
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=mrp&file=SPECIMEN.pdf");
 			return;
 		} else {
@@ -225,7 +227,7 @@ foreach ($dirmodels as $reldir) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') {
-							print $langs->trans($tmp);
+							print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 						} else {
 							print $tmp;
 						}
@@ -235,7 +237,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->MRP_MO_ADDON == $file) {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -359,13 +361,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&amp;token='.newToken().'&amp;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&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<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>";
 								}
 
@@ -374,7 +376,7 @@ foreach ($dirmodels as $reldir) {
 								if ($conf->global->MRP_MO_ADDON_PDF == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<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>';
 								}
 								print '</td>';
 
@@ -451,7 +453,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 print '</form>';
 
@@ -465,7 +467,7 @@ print $form->textwithpicto($langs->trans("WatermarkOnDraftMOs"), $htmltext, 1, '
 print '</td><td>';
 print '<input class="flat minwidth200" type="text" name="MRP_MO_DRAFT_WATERMARK" value="'.$conf->global->MRP_MO_DRAFT_WATERMARK.'">';
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 print '</form>';
 
diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 373ab0e0f48..b622ef192ce 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -138,7 +138,7 @@ if ($action == 'add_currency') {
 
 
 $TCurrency = array();
-$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE entity = '.$conf->entity;
+$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."multicurrency WHERE entity = ".((int) $conf->entity);
 $resql = $db->query($sql);
 if ($resql) {
 	while ($obj = $db->fetch_object($resql)) {
@@ -169,6 +169,7 @@ $head = multicurrencyAdminPrepareHead();
 print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "multicurrency");
 
 
+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";
@@ -191,7 +192,7 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->transnoentitiesnoconv("multicurrency_useOriginTx").'</td>';
 print '<td class="center">';
 if ($conf->use_javascript_ajax) {
-	print ajax_constantonoff('MULTICURRENCY_USE_ORIGIN_TX');
+	print ajax_constantonoff('MULTICURRENCY_USE_ORIGIN_TX', null, null, 0, 0, 0, 2, 0, 1);
 } else {
 	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
 	print $form->selectarray("MULTICURRENCY_USE_ORIGIN_TX", $arrval, $conf->global->MULTICURRENCY_USE_ORIGIN_TX);
@@ -221,7 +222,7 @@ print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="set_MULTICURRENCY_BUY_PRICE_IN_CURRENCY">';
 print $form->selectyesno("MULTICURRENCY_BUY_PRICE_IN_CURRENCY",$conf->global->MULTICURRENCY_BUY_PRICE_IN_CURRENCY,1);
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print '</form>';
 print '</td></tr>';
 */
@@ -235,13 +236,14 @@ print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="set_MULTICURRENCY_MODIFY_RATE_APPLICATION">';
 print $form->selectarray('MULTICURRENCY_MODIFY_RATE_APPLICATION', array('PU_DOLIBARR' => 'PU_DOLIBARR', 'PU_CURRENCY' => 'PU_CURRENCY'), $conf->global->MULTICURRENCY_MODIFY_RATE_APPLICATION);
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print '</form>';
 print '</td></tr>';
 
 */
 
 print '</table>';
+print '</div>';
 
 print '<br>';
 
@@ -264,7 +266,7 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION)) {
 	print '</td></tr>';
 
 	print '<tr class="oddeven">';
-	print '<td class="fieldrequired"><a target="_blank" href="'.$urlforapilayer.'">'.$langs->transnoentitiesnoconv("multicurrency_appId").'</a></td>';
+	print '<td class="fieldrequired"><a target="_blank" rel="noopener noreferrer external" href="'.$urlforapilayer.'">'.$langs->transnoentitiesnoconv("multicurrency_appId").'</a></td>';
 	print '<td class="right">';
 	print '<input type="text" name="MULTICURRENCY_APP_ID" value="'.$conf->global->MULTICURRENCY_APP_ID.'" size="28" />&nbsp;';
 	print '</td></tr>';
@@ -290,7 +292,7 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION)) {
 }
 
 print '<div class="div-table-responsive-no-min">';
-print '<table class="noborder centpercent">';
+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";
@@ -305,7 +307,7 @@ print '<tr class="oddeven">';
 print '<td>'.$form->selectCurrency('', 'code', 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" value="'.$langs->trans("Add").'">';
+print '<input type="submit" class="button button-add small" value="'.$langs->trans("Add").'">';
 print '</td>';
 print '</tr>';
 
@@ -330,7 +332,7 @@ 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" value="'.$langs->trans("Modify").'">&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 '</form>';
 	print '</td></tr>';
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index 4c1df0fa938..db79a1503c9 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -97,6 +97,10 @@ if ($action == 'setvalue' && $user->admin) {
 		$error++;
 	}
 
+	$result = dolibarr_set_const($db, "NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE", GETPOST("notif_disable", "alphawithlgt"), 'chaine', 0, '', $conf->entity);
+	if ($result < 0) {
+		$error++;
+	}
 
 	if (!$error) {
 		$db->commit();
@@ -199,9 +203,45 @@ if (!empty($conf->global->NOTIFICATION_EMAIL_FROM) && !isValidEmail($conf->globa
 }
 print '</td>';
 print '</tr>';
+
+print '<tr class="oddeven"><td>';
+print $langs->trans("NotificationDisableConfirmMessageContact").'</td>';
+print '<td>';
+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 '</td>';
+print '</tr>';
+
+print '<tr class="oddeven"><td>';
+print $langs->trans("NotificationDisableConfirmMessageUser").'</td>';
+print '<td>';
+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 '</td>';
+print '</tr>';
+
+print '<tr class="oddeven"><td>';
+print $langs->trans("NotificationDisableConfirmMessageFix").'</td>';
+print '<td>';
+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 '</td>';
+print '</tr>';
 print '</table>';
 
-print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 
@@ -214,79 +254,68 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="settemplates">';
 
 // Notification per contacts
-$title = $langs->trans("ListOfNotificationsPerUser");
-if (!empty($conf->societe->enabled)) {
-	$title = $langs->trans("ListOfNotificationsPerUserOrContact");
-}
-print load_fiche_titre($title, '', '');
+$title = $langs->trans("TemplatesForNotifications");
+
+print load_fiche_titre($title, '', 'email');
 
 // Load array of available notifications
 $notificationtrigger = new InterfaceNotification($db);
 $listofnotifiedevents = $notificationtrigger->getListOfManagedEvents();
 
+// Editing global variables not related to a specific theme
+$constantes = array();
+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']));
 
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-	// Editing global variables not related to a specific theme
-	$constantes = array();
-	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']));
-
-		if ($notifiedevent['elementtype'] == 'order_supplier') {
-			$elementLabel = $langs->trans('SupplierOrder');
-		} elseif ($notifiedevent['elementtype'] == 'propal') {
-			$elementLabel = $langs->trans('Proposal');
-		} elseif ($notifiedevent['elementtype'] == 'facture') {
-			$elementLabel = $langs->trans('Bill');
-		} elseif ($notifiedevent['elementtype'] == 'commande') {
-			$elementLabel = $langs->trans('Order');
-		} elseif ($notifiedevent['elementtype'] == 'ficheinter') {
-			$elementLabel = $langs->trans('Intervention');
-		} elseif ($notifiedevent['elementtype'] == 'shipping') {
-			$elementLabel = $langs->trans('Shipping');
-		} elseif ($notifiedevent['elementtype'] == 'expensereport' || $notifiedevent['elementtype'] == 'expense_report') {
-			$elementLabel = $langs->trans('ExpenseReport');
-		}
-
-		if ($notifiedevent['elementtype'] == 'propal') {
-			$model = 'propal_send';
-		} elseif ($notifiedevent['elementtype'] == 'commande') {
-			$model = 'order_send';
-		} elseif ($notifiedevent['elementtype'] == 'facture') {
-			$model = 'facture_send';
-		} elseif ($notifiedevent['elementtype'] == 'shipping') {
-			$model = 'shipping_send';
-		} elseif ($notifiedevent['elementtype'] == 'ficheinter') {
-			$model = 'fichinter_send';
-		} elseif ($notifiedevent['elementtype'] == 'expensereport') {
-			$model = 'expensereport_send';
-		} elseif ($notifiedevent['elementtype'] == 'order_supplier') {
-			$model = 'order_supplier_send';
-			// } elseif ($notifiedevent['elementtype'] == 'invoice_supplier') $model = 'invoice_supplier_send';
-		} elseif ($notifiedevent['elementtype'] == 'member') {
-			$model = 'member';
-		}
-
-		$constantes[$notifiedevent['code'].'_TEMPLATE'] = array('type'=>'emailtemplate:'.$model, 'label'=>$label);
+	if ($notifiedevent['elementtype'] == 'order_supplier') {
+		$elementLabel = $langs->trans('SupplierOrder');
+	} elseif ($notifiedevent['elementtype'] == 'propal') {
+		$elementLabel = $langs->trans('Proposal');
+	} elseif ($notifiedevent['elementtype'] == 'facture') {
+		$elementLabel = $langs->trans('Bill');
+	} elseif ($notifiedevent['elementtype'] == 'commande') {
+		$elementLabel = $langs->trans('Order');
+	} elseif ($notifiedevent['elementtype'] == 'ficheinter') {
+		$elementLabel = $langs->trans('Intervention');
+	} elseif ($notifiedevent['elementtype'] == 'shipping') {
+		$elementLabel = $langs->trans('Shipping');
+	} elseif ($notifiedevent['elementtype'] == 'expensereport' || $notifiedevent['elementtype'] == 'expense_report') {
+		$elementLabel = $langs->trans('ExpenseReport');
 	}
 
-	$helptext = '';
-	form_constantes($constantes, 3, $helptext, 'EmailTemplate');
-
-	print '<div class="opacitymedium">';
-	print '* '.$langs->trans("GoOntoUserCardToAddMore").'<br>';
-	if (!empty($conf->societe->enabled)) {
-		print '** '.$langs->trans("GoOntoContactCardToAddMore").'<br>';
+	if ($notifiedevent['elementtype'] == 'propal') {
+		$model = 'propal_send';
+	} elseif ($notifiedevent['elementtype'] == 'commande') {
+		$model = 'order_send';
+	} elseif ($notifiedevent['elementtype'] == 'facture') {
+		$model = 'facture_send';
+	} elseif ($notifiedevent['elementtype'] == 'shipping') {
+		$model = 'shipping_send';
+	} elseif ($notifiedevent['elementtype'] == 'ficheinter') {
+		$model = 'fichinter_send';
+	} elseif ($notifiedevent['elementtype'] == 'expensereport') {
+		$model = 'expensereport_send';
+	} elseif ($notifiedevent['elementtype'] == 'order_supplier') {
+		$model = 'order_supplier_send';
+		// } elseif ($notifiedevent['elementtype'] == 'invoice_supplier') $model = 'invoice_supplier_send';
+	} elseif ($notifiedevent['elementtype'] == 'member') {
+		$model = 'member';
 	}
-	print '</div>';
 
-	print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
+	$constantes[$notifiedevent['code'].'_TEMPLATE'] = array('type'=>'emailtemplate:'.$model, 'label'=>$label);
+}
+
+$helptext = '';
+form_constantes($constantes, 3, $helptext, 'EmailTemplate');
+
+print $form->buttonsSaveCancel("Save", '');
+
+/*
 } else {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Label").'</td>';
-	/*print '<td>'.$langs->trans("Code").'</td>';
-	print '<td>'.$langs->trans("Label").'</td>';*/
 	//print '<td class="right">'.$langs->trans("NbOfTargetedContacts").'</td>';
 	print "</tr>\n";
 
@@ -332,6 +361,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 	}
 	print '</div>';
 }
+*/
 
 print '</form>';
 
@@ -344,7 +374,15 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="setfixednotif">';
 print '<input type="hidden" name="page_y" value="">';
 
-print load_fiche_titre($langs->trans("ListOfFixedNotifications"), '', '');
+print load_fiche_titre($langs->trans("ListOfFixedNotifications"), '', 'email');
+
+print '<div class="info">';
+print $langs->trans("Note").':<br>';
+print '* '.$langs->trans("GoOntoUserCardToAddMore").'<br>';
+if (!empty($conf->societe->enabled)) {
+	print '** '.$langs->trans("GoOntoContactCardToAddMore").'<br>';
+}
+print '</div>';
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
@@ -461,9 +499,7 @@ foreach ($listofnotifiedevents as $notifiedevent) {
 }
 print '</table>';
 
-print '<br>';
-
-print '<div class="center"><input type="submit" class="button button-save reposition" value="'.$langs->trans("Save").'"></div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index e2f123f627c..a0d82d1d6bd 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -27,6 +27,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php';
 
+// $supportedoauth2array is defined into oauth.lib.php
 
 // Define $urlwithroot
 $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -96,10 +97,12 @@ print '<table class="noborder centpercent">';
 
 $i = 0;
 
-// $list is defined into oauth.lib.php
+// $list is defined into oauth.lib.php to the list of supporter OAuth providers.
 foreach ($list as $key) {
 	$supported = 0;
-	if (in_array($key[0], array_keys($supportedoauth2array))) {
+	$keyforsupportedoauth2array = $key[0];
+
+	if (in_array($keyforsupportedoauth2array, array_keys($supportedoauth2array))) {
 		$supported = 1;
 	}
 	if (!$supported) {
@@ -110,20 +113,23 @@ foreach ($list as $key) {
 
 	print '<tr class="liste_titre'.($i > 1 ? ' liste_titre_add' : '').'">';
 	// Api Name
-	$label = $langs->trans($key[0]);
-	print '<td>'.$label.'</td>';
+	$label = $langs->trans($keyforsupportedoauth2array);
 	print '<td>';
-	if (!empty($key[3])) {
-		print $langs->trans($key[3]);
+	print img_picto('', $supportedoauth2array[$keyforsupportedoauth2array]['picto'], 'class="pictofixedwidth"');
+	print $label;
+	print '</td>';
+	print '<td>';
+	if (!empty($supportedoauth2array[$keyforsupportedoauth2array]['urlforapp'])) {
+		print $langs->trans($supportedoauth2array[$keyforsupportedoauth2array]['urlforapp']);
 	}
 	print '</td>';
 	print '</tr>';
 
 	if ($supported) {
-		$redirect_uri = $urlwithroot.'/core/modules/oauth/'.$supportedoauth2array[$key[0]].'_oauthcallback.php';
+		$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'.$key[0].'" value="'.$redirect_uri.'">';
+		print '<td><input style="width: 80%" type"text" name="uri'.$keyforsupportedoauth2array.'" value="'.$redirect_uri.'">';
 		print '</td></tr>';
 	} else {
 		print '<tr class="oddeven value">';
@@ -150,7 +156,7 @@ print '</div>';
 
 print dol_get_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
+print $form->buttonsSaveCancel("Modify", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index 998b6c39c0f..73a9139f856 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -25,17 +25,13 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // This define $list
+require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // This define $list and $supportedoauth2array
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 use OAuth\Common\Storage\DoliStorage;
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'printing', 'oauth'));
 
-if (!$user->admin) {
-	accessforbidden();
-}
-
 $action = GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha');
 $value = GETPOST('value', 'alpha');
@@ -50,6 +46,10 @@ if (!$mode) {
 	$mode = 'setup';
 }
 
+if (!$user->admin) {
+	accessforbidden();
+}
+
 
 /*
  * Action
@@ -122,7 +122,7 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
 
 $form = new Form($db);
 
-llxHeader('', $langs->trans("PrintingSetup"));
+llxHeader('', $langs->trans("TokenManager"));
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans('ConfigOAuth'), $linkback, 'title_setup');
@@ -140,7 +140,9 @@ if ($mode == 'setup' && $user->admin) {
 
 	foreach ($list as $key) {
 		$supported = 0;
-		if (in_array($key[0], array_keys($supportedoauth2array))) {
+		$keyforsupportedoauth2array = $key[0];
+
+		if (in_array($keyforsupportedoauth2array, array_keys($supportedoauth2array))) {
 			$supported = 1;
 		}
 		if (!$supported) {
@@ -148,34 +150,44 @@ if ($mode == 'setup' && $user->admin) {
 		}
 
 
-		$OAUTH_SERVICENAME = 'Unknown';
-		if ($key[0] == 'OAUTH_GITHUB_NAME') {
-			$OAUTH_SERVICENAME = 'GitHub';
+		$OAUTH_SERVICENAME = empty($supportedoauth2array[$keyforsupportedoauth2array]['name']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['name'];
+
+		// Define $shortscope, $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');
 			$urltodelete = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltocheckperms = 'https://github.com/settings/applications/';
-		} elseif ($key[0] == 'OAUTH_GOOGLE_NAME') {
-			$OAUTH_SERVICENAME = 'Google';
+		} elseif ($keyforsupportedoauth2array == 'OAUTH_GOOGLE_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 = 'userinfo_email,userinfo_profile,cloud_print';
-			if (!empty($conf->global->OAUTH_GSUITE)) {
+			// 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';
 			}
-			//$scope.=',gmail_full';
-			$urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			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');
 			$urltodelete = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltocheckperms = 'https://security.google.com/settings/security/permissions';
-		} elseif ($key[0] == 'OAUTH_STRIPE_TEST_NAME') {
-			$OAUTH_SERVICENAME = 'StripeTest';
+		} elseif ($keyforsupportedoauth2array == 'OAUTH_STRIPE_TEST_NAME') {
 			$urltorenew = $urlwithroot.'/core/modules/oauth/stripetest_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltodelete = '';
 			$urltocheckperms = '';
-		} elseif ($key[0] == 'OAUTH_STRIPE_LIVE_NAME') {
-			$OAUTH_SERVICENAME = 'StripeLive';
+		} elseif ($keyforsupportedoauth2array == 'OAUTH_STRIPE_LIVE_NAME') {
 			$urltorenew = $urlwithroot.'/core/modules/oauth/stripelive_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltodelete = '';
 			$urltocheckperms = '';
@@ -230,11 +242,14 @@ if ($mode == 'setup' && $user->admin) {
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setconst">';
 
-		print '<div class="div-table-responsive">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">'."\n";
 
 		print '<tr class="liste_titre">';
-		print '<th class="titlefieldcreate">'.$langs->trans($key[0]).'</th>';
+		print '<th class="titlefieldcreate">';
+		print img_picto('', $supportedoauth2array[$keyforsupportedoauth2array]['picto'], 'class="pictofixedwidth"');
+		print $langs->trans($keyforsupportedoauth2array);
+		print '</th>';
 		print '<th></th>';
 		print '<th></th>';
 		print "</tr>\n";
@@ -244,7 +259,7 @@ if ($mode == 'setup' && $user->admin) {
 		//var_dump($key);
 		print $langs->trans("OAuthIDSecret").'</td>';
 		print '<td>';
-		print $langs->trans("SeePreviousTab");
+		print '<span class="opacitymedium">'.$langs->trans("SeePreviousTab").'</span>';
 		print '</td>';
 		print '<td>';
 		print '</td>';
@@ -259,7 +274,7 @@ if ($mode == 'setup' && $user->admin) {
 		if (is_object($tokenobj)) {
 			print $langs->trans("HasAccessToken");
 		} else {
-			print $langs->trans("NoAccessToken");
+			print '<span class="opacitymedium">'.$langs->trans("NoAccessToken").'</span>';
 		}
 		print '</td>';
 		print '<td width="50%">';
@@ -334,7 +349,7 @@ if ($mode == 'setup' && $user->admin) {
 
 		if (!empty($driver)) {
 			if ($submit_enabled) {
-				print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'"></div>';
+				print $form->buttonsSaveCancel("Modify", '');
 			}
 		}
 
@@ -346,7 +361,7 @@ if ($mode == 'setup' && $user->admin) {
 if ($mode == 'test' && $user->admin) {
 	print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n";
 
-	print '<div class="div-table-responsive">';
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	if (!empty($driver)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
diff --git a/htdocs/admin/openinghours.php b/htdocs/admin/openinghours.php
index 0696de2a5c6..a0f02fe99ac 100644
--- a/htdocs/admin/openinghours.php
+++ b/htdocs/admin/openinghours.php
@@ -78,10 +78,10 @@ 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>\n";
+print "<br><br>\n";
 
 if (empty($action) || $action == 'edit' || $action == 'updateedit') {
 	/**
@@ -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" autofocus 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 '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Tuesday"), $langs->trans("OpeningHoursFormatDesc"));
@@ -131,10 +131,7 @@ if (empty($action) || $action == 'edit' || $action == 'updateedit') {
 
 	print '</table>';
 
-	print '<br><div class="center">';
-	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-	print '</div>';
-	print '<br>';
+	print $form->buttonsSaveCancel("Save", '');
 
 	print '</form>';
 }
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 9b380b676b4..089ddbafd23 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -178,7 +178,7 @@ foreach ($dirmodels as $reldir) {
 								$langs->load("errors");
 								print '<div class="error">'.$langs->trans($tmp).'</div>';
 							} elseif ($tmp == 'NotConfigured') {
-								print $langs->trans($tmp);
+								print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 							} else {
 								print $tmp;
 							}
@@ -273,11 +273,7 @@ print '</div>';
 
 print dol_get_fiche_end();
 
-print '<br>';
-print '<div class="center">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
-print '</div>';
-print '<br>';
+print $form->buttonsSaveCancel("Modify", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index 43ad8c15929..997c71bb335 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -20,7 +20,7 @@
  */
 
 /**
- *	\file       htdocs/admin/credtitransfer.php
+ *	\file       htdocs/admin/paymentbybanktransfer.php
  *	\ingroup    paymentbybanktransfer
  *	\brief      Page to setup payments by credit transfer
  */
@@ -114,7 +114,7 @@ if ($action == "set") {
 
 if ($action == "addnotif") {
 	$bon = new BonPrelevement($db);
-	$bon->AddNotification($db, GETPOST('user', 'int'), $action);
+	$bon->addNotification($db, GETPOST('user', 'int'), $action);
 
 	header("Location: ".$_SERVER["PHP_SELF"]);
 	exit;
@@ -122,7 +122,7 @@ if ($action == "addnotif") {
 
 if ($action == "deletenotif") {
 	$bon = new BonPrelevement($db);
-	$bon->DeleteNotificationById(GETPOST('notif', 'int'));
+	$bon->deleteNotificationById(GETPOST('notif', 'int'));
 
 	header("Location: ".$_SERVER["PHP_SELF"]);
 	exit;
@@ -144,7 +144,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("CreditTransferSetup"), $linkback, 'title_setup');
 print '<br>';
 
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=set">';
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print '<table class="noborder centpercent">';
@@ -200,9 +200,8 @@ if (!$conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS) {
 print '<input type="text" name="PAYMENTBYBANKTRANSFER_ADDDAYS" value="'.$conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS.'" class="width50"></td>';
 print '</td></tr>';
 print '</table>';
-print '<br>';
 
-print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 
@@ -299,7 +298,7 @@ foreach ($dirmodels as $reldir)
 								if (in_array($name, $def))
 								{
 									print '<td class="center">'."\n";
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&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>';
@@ -307,7 +306,7 @@ foreach ($dirmodels as $reldir)
 								else
 								{
 									print '<td class="center">'."\n";
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+									print '<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>";
 								}
 
@@ -319,7 +318,7 @@ foreach ($dirmodels as $reldir)
 								}
 								else
 								{
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 								}
 								print '</td>';
 
@@ -430,7 +429,7 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
 	}
 
 
-	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=addnotif">';
+	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=addnotif&token='.newToken().'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
@@ -447,7 +446,7 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
 	print $form->selectarray('action',$actions);//  select_dolusers(0,'user',0);
 	print '</td>';
 
-	print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
+	print '<td class="right"><input type="submit" class="button button-add" value="'.$langs->trans("Add").'"></td></tr>';
 
 	// List of current notifications for objet_type='withdraw'
 	$sql = "SELECT u.lastname, u.firstname,";
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 6cf035f26a4..f04bfd78abd 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -4,6 +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>
  *
  * This 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,23 +53,60 @@ if ($cancel) {
 }
 
 if ($action == 'update') {
-	if (GETPOSTISSET('MAIN_PDF_FORMAT')) dolibarr_set_const($db, "MAIN_PDF_FORMAT", GETPOST("MAIN_PDF_FORMAT"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PDF_FORMAT')) {
+		dolibarr_set_const($db, "MAIN_PDF_FORMAT", GETPOST("MAIN_PDF_FORMAT"), 'chaine', 0, '', $conf->entity);
+	}
 
-	if (GETPOSTISSET('MAIN_PDF_MARGIN_LEFT')) dolibarr_set_const($db, "MAIN_PDF_MARGIN_LEFT", GETPOST("MAIN_PDF_MARGIN_LEFT"), 'chaine', 0, '', $conf->entity);
-	if (GETPOSTISSET('MAIN_PDF_MARGIN_RIGHT')) dolibarr_set_const($db, "MAIN_PDF_MARGIN_RIGHT", GETPOST("MAIN_PDF_MARGIN_RIGHT"), 'chaine', 0, '', $conf->entity);
-	if (GETPOSTISSET('MAIN_PDF_MARGIN_TOP')) dolibarr_set_const($db, "MAIN_PDF_MARGIN_TOP", GETPOST("MAIN_PDF_MARGIN_TOP"), 'chaine', 0, '', $conf->entity);
-	if (GETPOSTISSET('MAIN_PDF_MARGIN_BOTTOM')) dolibarr_set_const($db, "MAIN_PDF_MARGIN_BOTTOM", GETPOST("MAIN_PDF_MARGIN_BOTTOM"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PDF_MARGIN_LEFT')) {
+		dolibarr_set_const($db, "MAIN_PDF_MARGIN_LEFT", GETPOST("MAIN_PDF_MARGIN_LEFT"), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_PDF_MARGIN_RIGHT')) {
+		dolibarr_set_const($db, "MAIN_PDF_MARGIN_RIGHT", GETPOST("MAIN_PDF_MARGIN_RIGHT"), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_PDF_MARGIN_TOP')) {
+		dolibarr_set_const($db, "MAIN_PDF_MARGIN_TOP", GETPOST("MAIN_PDF_MARGIN_TOP"), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_PDF_MARGIN_BOTTOM')) {
+		dolibarr_set_const($db, "MAIN_PDF_MARGIN_BOTTOM", GETPOST("MAIN_PDF_MARGIN_BOTTOM"), 'chaine', 0, '', $conf->entity);
+	}
 
-	if (GETPOSTISSET('MAIN_PROFID1_IN_ADDRESS')) dolibarr_set_const($db, "MAIN_PROFID1_IN_ADDRESS", GETPOST("MAIN_PROFID1_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
-	if (GETPOSTISSET('MAIN_PROFID2_IN_ADDRESS')) dolibarr_set_const($db, "MAIN_PROFID2_IN_ADDRESS", GETPOST("MAIN_PROFID2_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
-	if (GETPOSTISSET('MAIN_PROFID3_IN_ADDRESS')) dolibarr_set_const($db, "MAIN_PROFID3_IN_ADDRESS", GETPOST("MAIN_PROFID3_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
-	if (GETPOSTISSET('MAIN_PROFID4_IN_ADDRESS')) dolibarr_set_const($db, "MAIN_PROFID4_IN_ADDRESS", GETPOST("MAIN_PROFID4_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
-	if (GETPOSTISSET('MAIN_PROFID5_IN_ADDRESS')) dolibarr_set_const($db, "MAIN_PROFID5_IN_ADDRESS", GETPOST("MAIN_PROFID5_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
-	if (GETPOSTISSET('MAIN_PROFID6_IN_ADDRESS')) dolibarr_set_const($db, "MAIN_PROFID6_IN_ADDRESS", GETPOST("MAIN_PROFID6_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PROFID1_IN_ADDRESS')) {
+		dolibarr_set_const($db, "MAIN_PROFID1_IN_ADDRESS", GETPOST("MAIN_PROFID1_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_PROFID2_IN_ADDRESS')) {
+		dolibarr_set_const($db, "MAIN_PROFID2_IN_ADDRESS", GETPOST("MAIN_PROFID2_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_PROFID3_IN_ADDRESS')) {
+		dolibarr_set_const($db, "MAIN_PROFID3_IN_ADDRESS", GETPOST("MAIN_PROFID3_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_PROFID4_IN_ADDRESS')) {
+		dolibarr_set_const($db, "MAIN_PROFID4_IN_ADDRESS", GETPOST("MAIN_PROFID4_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_PROFID5_IN_ADDRESS')) {
+		dolibarr_set_const($db, "MAIN_PROFID5_IN_ADDRESS", GETPOST("MAIN_PROFID5_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_PROFID6_IN_ADDRESS')) {
+		dolibarr_set_const($db, "MAIN_PROFID6_IN_ADDRESS", GETPOST("MAIN_PROFID6_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	}
 
-	if (GETPOSTISSET('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT", GETPOST("MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PDF_NO_SENDER_FRAME')) {
+		dolibarr_set_const($db, "MAIN_PDF_NO_SENDER_FRAME", GETPOST("MAIN_PDF_NO_SENDER_FRAME"), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_PDF_NO_RECIPENT_FRAME')) {
+		dolibarr_set_const($db, "MAIN_PDF_NO_RECIPENT_FRAME", GETPOST("MAIN_PDF_NO_RECIPENT_FRAME"), 'chaine', 0, '', $conf->entity);
+	}
 
-	if (GETPOSTISSET('MAIN_TVAINTRA_NOT_IN_ADDRESS')) dolibarr_set_const($db, "MAIN_TVAINTRA_NOT_IN_ADDRESS", GETPOST("MAIN_TVAINTRA_NOT_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
+	/*if (GETPOSTISSET('MAIN_PDF_HIDE_SENDER_NAME')) {
+		dolibarr_set_const($db, "MAIN_PDF_HIDE_SENDER_NAME", GETPOST("MAIN_PDF_HIDE_SENDER_NAME"), 'chaine', 0, '', $conf->entity);
+	}*/
+
+	if (GETPOSTISSET('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) {
+		dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT", GETPOST("MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT"), 'chaine', 0, '', $conf->entity);
+	}
+
+	if (GETPOSTISSET('MAIN_TVAINTRA_NOT_IN_ADDRESS')) {
+		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 (GETPOST('PDF_SHOW_PROJECT_REF_OR_LABEL') == 'no') {
@@ -83,20 +121,61 @@ if ($action == 'update') {
 		}
 	}
 
-	if (GETPOSTISSET('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS')) dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS", GETPOST("MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS"), 'chaine', 0, '', $conf->entity);
-	if (GETPOSTISSET('MAIN_GENERATE_DOCUMENTS_HIDE_DESC')) dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DESC", GETPOST("MAIN_GENERATE_DOCUMENTS_HIDE_DESC"), 'chaine', 0, '', $conf->entity);
-	if (GETPOSTISSET('MAIN_GENERATE_DOCUMENTS_HIDE_REF')) dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_REF", GETPOST("MAIN_GENERATE_DOCUMENTS_HIDE_REF"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS')) {
+		dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS", GETPOST("MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS"), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_GENERATE_DOCUMENTS_HIDE_DESC')) {
+		dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DESC", GETPOST("MAIN_GENERATE_DOCUMENTS_HIDE_DESC"), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_GENERATE_DOCUMENTS_HIDE_REF')) {
+		dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_REF", GETPOST("MAIN_GENERATE_DOCUMENTS_HIDE_REF"), 'chaine', 0, '', $conf->entity);
+	}
 
-	if (GETPOSTISSET('MAIN_DOCUMENTS_LOGO_HEIGHT')) dolibarr_set_const($db, "MAIN_DOCUMENTS_LOGO_HEIGHT", GETPOST("MAIN_DOCUMENTS_LOGO_HEIGHT", 'int'), 'chaine', 0, '', $conf->entity);
-	if (GETPOSTISSET('MAIN_INVERT_SENDER_RECIPIENT')) dolibarr_set_const($db, "MAIN_INVERT_SENDER_RECIPIENT", GETPOST("MAIN_INVERT_SENDER_RECIPIENT"), 'chaine', 0, '', $conf->entity);
-	if (GETPOSTISSET('MAIN_PDF_USE_ISO_LOCATION')) dolibarr_set_const($db, "MAIN_PDF_USE_ISO_LOCATION", GETPOST("MAIN_PDF_USE_ISO_LOCATION"), 'chaine', 0, '', $conf->entity);
-	if (GETPOSTISSET('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS", GETPOST("MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_DOCUMENTS_LOGO_HEIGHT')) {
+		dolibarr_set_const($db, "MAIN_DOCUMENTS_LOGO_HEIGHT", GETPOST("MAIN_DOCUMENTS_LOGO_HEIGHT", 'int'), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_INVERT_SENDER_RECIPIENT')) {
+		dolibarr_set_const($db, "MAIN_INVERT_SENDER_RECIPIENT", GETPOST("MAIN_INVERT_SENDER_RECIPIENT"), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_PDF_USE_ISO_LOCATION')) {
+		dolibarr_set_const($db, "MAIN_PDF_USE_ISO_LOCATION", GETPOST("MAIN_PDF_USE_ISO_LOCATION"), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_PDF_NO_CUSTOMER_CODE')) {
+		dolibarr_set_const($db, "MAIN_PDF_NO_CUSTOMER_CODE", GETPOST("MAIN_PDF_NO_CUSTOMER_CODE"), 'chaine', 0, '', $conf->entity);
+	}
 
-	if (GETPOSTISSET('MAIN_PDF_MAIN_HIDE_SECOND_TAX')) dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_SECOND_TAX", GETPOST("MAIN_PDF_MAIN_HIDE_SECOND_TAX"), 'chaine', 0, '', $conf->entity);
-	if (GETPOSTISSET('MAIN_PDF_MAIN_HIDE_THIRD_TAX')) dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_THIRD_TAX", GETPOST("MAIN_PDF_MAIN_HIDE_THIRD_TAX"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
+		dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS", GETPOST("MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS"), 'chaine', 0, '', $conf->entity);
+	}
 
-	if (GETPOSTISSET('PDF_USE_ALSO_LANGUAGE_CODE')) dolibarr_set_const($db, "PDF_USE_ALSO_LANGUAGE_CODE", GETPOST('PDF_USE_ALSO_LANGUAGE_CODE', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (GETPOSTISSET('SHOW_SUBPRODUCT_REF_IN_PDF')) dolibarr_set_const($db, "SHOW_SUBPRODUCT_REF_IN_PDF", GETPOST('SHOW_SUBPRODUCT_REF_IN_PDF', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('MAIN_PDF_MAIN_HIDE_SECOND_TAX')) {
+		dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_SECOND_TAX", GETPOST("MAIN_PDF_MAIN_HIDE_SECOND_TAX"), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_PDF_MAIN_HIDE_THIRD_TAX')) {
+		dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_THIRD_TAX", GETPOST("MAIN_PDF_MAIN_HIDE_THIRD_TAX"), 'chaine', 0, '', $conf->entity);
+	}
+
+	if (GETPOSTISSET('PDF_USE_ALSO_LANGUAGE_CODE')) {
+		dolibarr_set_const($db, "PDF_USE_ALSO_LANGUAGE_CODE", GETPOST('PDF_USE_ALSO_LANGUAGE_CODE', 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('SHOW_SUBPRODUCT_REF_IN_PDF')) {
+		dolibarr_set_const($db, "SHOW_SUBPRODUCT_REF_IN_PDF", GETPOST('SHOW_SUBPRODUCT_REF_IN_PDF', 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
+
+	if (GETPOSTISSET('PDF_SHOW_LINK_TO_ONLINE_PAYMENT')) {
+		dolibarr_set_const($db, "PDF_SHOW_LINK_TO_ONLINE_PAYMENT", GETPOST('PDF_SHOW_LINK_TO_ONLINE_PAYMENT', 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
+
+	if (GETPOSTISSET('PDF_USE_A')) {
+		dolibarr_set_const($db, "PDF_USE_A", GETPOST('PDF_USE_A', 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
+
+	if (GETPOSTISSET('PDF_BOLD_PRODUCT_LABEL')) {
+		dolibarr_set_const($db, "PDF_BOLD_PRODUCT_LABEL", GETPOST('PDF_BOLD_PRODUCT_LABEL', 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('PDF_BOLD_PRODUCT_REF_AND_PERIOD')) {
+		dolibarr_set_const($db, "PDF_BOLD_PRODUCT_REF_AND_PERIOD", GETPOST('PDF_BOLD_PRODUCT_REF_AND_PERIOD', 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
 
 	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 
@@ -124,6 +203,12 @@ $arraydetailsforpdffoot = array(
 	3 => $langs->transnoentitiesnoconv('DisplayCompanyInfoAndManagers')
 );
 
+$arraylistofpdfformat = array(
+	0 => $langs->transnoentitiesnoconv('PDF 1.7'),
+	1 => $langs->transnoentitiesnoconv('PDF/A-1b'),
+	3 => $langs->transnoentitiesnoconv('PDF/A-3b'),
+);
+
 $s = $langs->trans("LibraryToBuildPDF")."<br>";
 $i = 0;
 $pdf = pdf_getInstance('A4');
@@ -222,6 +307,18 @@ 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>';
 
+// Show sender name
+
+/* Set option as hidden because no need of this for 99.99% of users.
+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');
+} else {
+	print $form->selectyesno('MAIN_PDF_HIDE_SENDER_NAME', (!empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) ? $conf->global->MAIN_PDF_HIDE_SENDER_NAME : 0, 1);
+}
+print '</td></tr>';
+*/
+
 // Hide VAT Intra on address
 
 print '<tr class="oddeven"><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td>';
@@ -240,7 +337,7 @@ for ($i = 1; $i <= 6; $i++) {
 			$pid = false;
 		}
 	} else {
-		$pid = img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+		$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>';
@@ -254,6 +351,45 @@ for ($i = 1; $i <= 6; $i++) {
 	}
 }
 
+// Borders on address frame
+
+print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_NO_SENDER_FRAME").'</td><td>';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_PDF_NO_SENDER_FRAME');
+} else {
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("MAIN_PDF_NO_SENDER_FRAME", $arrval, $conf->global->MAIN_PDF_NO_SENDER_FRAME);
+}
+print '</td></tr>';
+
+print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_NO_RECIPENT_FRAME").'</td><td>';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_PDF_NO_RECIPENT_FRAME');
+} else {
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("MAIN_PDF_NO_RECIPENT_FRAME", $arrval, $conf->global->MAIN_PDF_NO_RECIPENT_FRAME);
+}
+
+//Invert sender and recipient
+
+print '<tr class="oddeven"><td>'.$langs->trans("SwapSenderAndRecipientOnPDF").'</td><td>';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_INVERT_SENDER_RECIPIENT');
+} else {
+	print $form->selectyesno('MAIN_INVERT_SENDER_RECIPIENT', (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) ? $conf->global->MAIN_INVERT_SENDER_RECIPIENT : 0, 1);
+}
+print '</td></tr>';
+
+// Place customer adress to the ISO location
+
+print '<tr class="oddeven"><td>'.$langs->trans("PlaceCustomerAddressToIsoLocation").'</td><td>';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_PDF_USE_ISO_LOCATION');
+} else {
+	print $form->selectyesno('MAIN_PDF_USE_ISO_LOCATION', (!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION)) ? $conf->global->MAIN_PDF_USE_ISO_LOCATION : 0, 1);
+}
+print '</td></tr>';
+
 print '</table>';
 print '</div>';
 
@@ -324,14 +460,24 @@ print '<div class="div-table-responsive-no-min">';
 print '<table summary="more" class="noborder centpercent">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
-// Height of logo
+// Use 2 languages into PDF
 
+print '<tr class="oddeven"><td>'.$langs->trans("PDF_USE_ALSO_LANGUAGE_CODE").'</td><td>';
+//if (! empty($conf->global->MAIN_MULTILANGS))
+	//{
+$selected = GETPOSTISSET('PDF_USE_ALSO_LANGUAGE_CODE') ? GETPOST('PDF_USE_ALSO_LANGUAGE_CODE') : (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) ? $conf->global->PDF_USE_ALSO_LANGUAGE_CODE : 0);
+print $formadmin->select_language($selected, 'PDF_USE_ALSO_LANGUAGE_CODE', 0, null, 1);
+//} else {
+//	print '<span class="opacitymedium">'.$langs->trans("MultiLangNotEnabled").'</span>';
+//}
+print '</td></tr>';
+
+// Height of logo
 print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DOCUMENTS_LOGO_HEIGHT").'</td><td>';
 print '<input type="text" class="maxwidth50" name="MAIN_DOCUMENTS_LOGO_HEIGHT" value="'.(!empty($conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT) ? $conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT : 20).'">';
 print '</td></tr>';
 
 // Show project
-
 if (!empty($conf->projet->enabled)) {
 	print '<tr class="oddeven"><td>'.$langs->trans("PDF_SHOW_PROJECT").'</td><td>';
 	$tmparray = array('no' => 'No', 'showprojectref' => 'RefProject', 'showprojectlabel' => 'ShowProjectLabel');
@@ -340,38 +486,18 @@ if (!empty($conf->projet->enabled)) {
 	print '</td></tr>';
 }
 
-//Invert sender and recipient
+//
 
-print '<tr class="oddeven"><td>'.$langs->trans("SwapSenderAndRecipientOnPDF").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_HIDE_CUSTOMER_CODE");
+print '</td><td>';
 if ($conf->use_javascript_ajax) {
-	print ajax_constantonoff('MAIN_INVERT_SENDER_RECIPIENT');
+	print ajax_constantonoff('MAIN_PDF_HIDE_CUSTOMER_CODE');
 } else {
-	print $form->selectyesno('MAIN_INVERT_SENDER_RECIPIENT', (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) ? $conf->global->MAIN_INVERT_SENDER_RECIPIENT : 0, 1);
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("MAIN_PDF_HIDE_CUSTOMER_CODE", $arrval, $conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE);
 }
 print '</td></tr>';
 
-// Place customer adress to the ISO location
-
-print '<tr class="oddeven"><td>'.$langs->trans("PlaceCustomerAddressToIsoLocation").'</td><td>';
-if ($conf->use_javascript_ajax) {
-	print ajax_constantonoff('MAIN_PDF_USE_ISO_LOCATION');
-} else {
-	print $form->selectyesno('MAIN_PDF_USE_ISO_LOCATION', (!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION)) ? $conf->global->MAIN_PDF_USE_ISO_LOCATION : 0, 1);
-}
-print '</td></tr>';
-
-// Use 2 languages into PDF
-
-print '<tr class="oddeven"><td>'.$langs->trans("PDF_USE_ALSO_LANGUAGE_CODE").'</td><td>';
-//if (! empty($conf->global->MAIN_MULTILANGS))
-//{
-$selected = GETPOSTISSET('PDF_USE_ALSO_LANGUAGE_CODE') ? GETPOST('PDF_USE_ALSO_LANGUAGE_CODE') : (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) ? $conf->global->PDF_USE_ALSO_LANGUAGE_CODE : 0);
-print $formadmin->select_language($selected, 'PDF_USE_ALSO_LANGUAGE_CODE', 0, null, 1);
-//} else {
-//	print '<span class="opacitymedium">'.$langs->trans("MultiLangNotEnabled").'</span>';
-//}
-print '</td></tr>';
-
 // Ref
 
 print '<tr class="oddeven"><td>'.$langs->trans("HideRefOnPDF").'</td><td>';
@@ -402,6 +528,26 @@ if ($conf->use_javascript_ajax) {
 }
 print '</td></tr>';
 
+// Swicth in Bold
+
+print '<tr class="oddeven"><td>'.$langs->trans("BoldLabelOnPDF").'</td><td>';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('PDF_BOLD_PRODUCT_LABEL');
+} else {
+	print $form->selectyesno('PDF_BOLD_PRODUCT_LABEL', (!empty($conf->global->PDF_BOLD_PRODUCT_LABEL)) ? $conf->global->PDF_BOLD_PRODUCT_LABEL : 0, 1);
+}
+print '</td></tr>';
+
+// Swicth in Bold
+
+print '<tr class="oddeven"><td>'.$langs->trans("BoldRefAndPeriodOnPDF").'</td><td>';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('PDF_BOLD_PRODUCT_REF_AND_PERIOD');
+} else {
+	print $form->selectyesno('PDF_BOLD_PRODUCT_REF_AND_PERIOD', (!empty($conf->global->PDF_BOLD_PRODUCT_REF_AND_PERIOD)) ? $conf->global->PDF_BOLD_PRODUCT_REF_AND_PERIOD : 0, 1);
+}
+print '</td></tr>';
+
 // SHOW_SUBPRODUCT_REF_IN_PDF - Option to show the detail of product ref for kits.
 
 print '<tr class="oddeven"><td>'.$langs->trans("SHOW_SUBPRODUCT_REF_IN_PDF", $langs->transnoentitiesnoconv("AssociatedProductsAbility"), $langs->transnoentitiesnoconv("Products")).'</td><td>';
@@ -418,12 +564,24 @@ 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 online payment link on invoices
+
+print '<tr class="oddeven"><td>'.$langs->trans("PDF_SHOW_LINK_TO_ONLINE_PAYMENT").'</td><td>';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('PDF_SHOW_LINK_TO_ONLINE_PAYMENT');
+} else {
+	print $form->selectyesno('PDF_SHOW_LINK_TO_ONLINE_PAYMENT', (!empty($conf->global->PDF_SHOW_LINK_TO_ONLINE_PAYMENT)) ? $conf->global->PDF_SHOW_LINK_TO_ONLINE_PAYMENT : 0, 1);
+}
+print '</td></tr>';
+
+print '<tr class="oddeven"><td>'.$langs->trans("PDF_USE_A").'</td><td>';
+print $form->selectarray('PDF_USE_A', $arraylistofpdfformat, (empty($conf->global->PDF_USE_A) ? 0 : $conf->global->PDF_USE_A));
+print '</td></tr>';
+
 print '</table>';
 print '</div>';
 
-print '<br><div class="center">';
-print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
-print '</div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index f03bfc6a5ec..f42c49a4bfe 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -41,19 +41,25 @@ if (!$user->admin) {
 }
 
 $action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
 
 
 /*
  * Actions
  */
 
-if ($cancel) {
-	$action = '';
-}
-
 if ($action == 'update') {
-	if (GETPOSTISSET('MAIN_GENERATE_PROPOSALS_WITH_PICTURE')) dolibarr_set_const($db, "MAIN_GENERATE_PROPOSALS_WITH_PICTURE", GETPOST("MAIN_GENERATE_PROPOSALS_WITH_PICTURE"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET('PROPOSAL_PDF_HIDE_PAYMENTTERM')) {
+		dolibarr_set_const($db, "PROPOSAL_PDF_HIDE_PAYMENTTERM", GETPOST("PROPOSAL_PDF_HIDE_PAYMENTTERM"), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('PROPOSAL_PDF_HIDE_PAYMENTMODE')) {
+		dolibarr_set_const($db, "PROPOSAL_PDF_HIDE_PAYMENTMODE", GETPOST("PROPOSAL_PDF_HIDE_PAYMENTMODE"), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_GENERATE_PROPOSALS_WITH_PICTURE')) {
+		dolibarr_set_const($db, "MAIN_GENERATE_PROPOSALS_WITH_PICTURE", GETPOST("MAIN_GENERATE_PROPOSALS_WITH_PICTURE"), 'chaine', 0, '', $conf->entity);
+	}
+	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);
+	}
 
 	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 
@@ -84,46 +90,46 @@ $tooltiptext = '';
 print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFOtherDesc"), $tooltiptext)."</span><br>\n";
 print "<br>\n";
 
-print load_fiche_titre($langs->trans("Proposal"), '', '');
+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 '<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 '<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 '</td><td>';
-if ($conf->use_javascript_ajax) {
-	print ajax_constantonoff('MAIN_GENERATE_PROPOSALS_WITH_PICTURE');
-} else {
-	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-	print $form->selectarray("MAIN_GENERATE_PROPOSALS_WITH_PICTURE", $arrval, $conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE);
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_GENERATE_PROPOSALS_WITH_PICTURE");
+	print ' <span class="opacitymedium">('.$langs->trans("RandomlySelectedIfSeveral").')</span>';
+	print '</td><td>';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('MAIN_GENERATE_PROPOSALS_WITH_PICTURE');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("MAIN_GENERATE_PROPOSALS_WITH_PICTURE", $arrval, $conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE);
+	}
+	print '</td></tr>';
+
+	/*
+	  print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING").'</td><td>';
+	  if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING');
+	  } else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING", $arrval, $conf->global->MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING);
+	  }
+	  print '</td></tr>';
+	*/
+
+	print '</table>';
+	print '</div>';
 }
-print '</td></tr>';
 
-/*
-print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING").'</td><td>';
-if ($conf->use_javascript_ajax) {
-	print ajax_constantonoff('MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING');
-} else {
-	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-	print $form->selectarray("MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING", $arrval, $conf->global->MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING);
-}
-print '</td></tr>';
-*/
-
-print '</table>';
-print '</div>';
-
-/*
 print '<br><div class="center">';
 print '<input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'">';
 print '</div>';
-*/
 
 print '</form>';
 
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 8f4c0c6f763..d2f0d79e4f3 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -236,7 +236,7 @@ if ($result) {
 			print '</td>';
 		} else {
 			print '<td class="center">';
-			print '<a class="reposition" href="perms.php?pid='.$obj->id.'&amp;action=add">';
+			print '<a class="reposition" href="perms.php?pid='.$obj->id.'&action=add&token='.newToken().'">';
 			//print img_edit_add();
 			print img_picto('', 'switch_off');
 			print '</a>';
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 01e3b6d4913..88a02e90457 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -102,11 +102,11 @@ if ($action == "set") {
 	}
 
 	$res = dolibarr_set_const($db, "PRELEVEMENT_ADDDAYS", GETPOST("PRELEVEMENT_ADDDAYS"), 'chaine', 0, '', $conf->entity);
-	if (! ($res > 0)) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
-	if (! $error) {
+	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -117,7 +117,7 @@ if ($action == "set") {
 
 if ($action == "addnotif") {
 	$bon = new BonPrelevement($db);
-	$bon->AddNotification($db, GETPOST('user', 'int'), $action);
+	$bon->addNotification($db, GETPOST('user', 'int'), $action);
 
 	header("Location: ".$_SERVER["PHP_SELF"]);
 	exit;
@@ -125,7 +125,7 @@ if ($action == "addnotif") {
 
 if ($action == "deletenotif") {
 	$bon = new BonPrelevement($db);
-	$bon->DeleteNotificationById(GETPOST('notif', 'int'));
+	$bon->deleteNotificationById(GETPOST('notif', 'int'));
 
 	header("Location: ".$_SERVER["PHP_SELF"]);
 	exit;
@@ -214,9 +214,8 @@ print '<input type="text" name="PRELEVEMENT_ADDDAYS" value="'.$conf->global->PRE
 print '</td></tr>';
 
 print '</table>';
-print '<br>';
 
-print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 
@@ -298,7 +297,7 @@ foreach ($dirmodels as $reldir)
 							$module = new $classname($db);
 
 							$modulequalified=1;
-							if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+							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) {
@@ -313,7 +312,7 @@ foreach ($dirmodels as $reldir)
 								if (in_array($name, $def))
 								{
 									print '<td class="center">'."\n";
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&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>';
@@ -321,7 +320,7 @@ foreach ($dirmodels as $reldir)
 								else
 								{
 									print '<td class="center">'."\n";
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+									print '<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>";
 								}
 
@@ -333,7 +332,7 @@ foreach ($dirmodels as $reldir)
 								}
 								else
 								{
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 								}
 								print '</td>';
 
@@ -444,7 +443,7 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
 	}
 
 
-	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=addnotif">';
+	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=addnotif&token='.newToken().'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
@@ -461,7 +460,7 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
 	print $form->selectarray('action',$actions);//  select_dolusers(0,'user',0);
 	print '</td>';
 
-	print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
+	print '<td class="right"><input type="submit" class="button button-add" value="'.$langs->trans("Add").'"></td></tr>';
 
 	// List of current notifications for objet_type='withdraw'
 	$sql = "SELECT u.lastname, u.firstname,";
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index a0d590579ca..6384c561967 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'propal';
@@ -268,7 +270,7 @@ foreach ($dirmodels as $reldir) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') {
-							print $langs->trans($tmp);
+							print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 						} else {
 							print $tmp;
 						}
@@ -278,7 +280,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->PROPALE_ADDON == "$file") {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -402,13 +404,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&amp;token='.newToken().'&amp;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 align=\"center\">\n";
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<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>";
 								}
 
@@ -417,7 +419,7 @@ foreach ($dirmodels as $reldir) {
 								if ($conf->global->PROPALE_ADDON_PDF == "$name") {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 								}
 								print '</td>';
 
@@ -483,7 +485,7 @@ print '<input type="hidden" name="action" value="setribchq">';
 print $langs->trans("PaymentMode").'</td>';
 print '<td align="right">';
 if (empty($conf->facture->enabled)) {
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 }
 print '</td>';
 print "</tr>\n";
@@ -587,7 +589,7 @@ print "<input type=\"hidden\" name=\"action\" value=\"setdefaultduration\">";
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DefaultProposalDurationValidity").'</td>';
 print '<td width="60" align="center">'."<input size=\"3\" class=\"flat\" type=\"text\" name=\"value\" value=\"".$conf->global->PROPALE_VALIDITY_DURATION."\"></td>";
-print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+print '<td class="right"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
 print '</tr>';
 print '</form>';
 
@@ -600,7 +602,7 @@ print $langs->trans("UseCustomerContactAsPropalRecipientIfExist");
 print '</td><td width="60" align="center">';
 print $form->selectyesno("value",$conf->global->PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT,1);
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 print '</form>';
 */
@@ -627,7 +629,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 print '</form>';
 
@@ -640,7 +642,7 @@ print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext,
 print '</td><td>';
 print '<input class="flat minwidth200" type="text" name="PROPALE_DRAFT_WATERMARK" value="'.$conf->global->PROPALE_DRAFT_WATERMARK.'">';
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 print '</form>';
 
@@ -658,11 +660,11 @@ if ($conf->banque->enabled)
 	{
 		if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL))
 		{
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL&amp;token='.newToken().'&amp;value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL&token='.newToken().'&value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
 		}
 		else
 		{
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL&amp;token='.newToken().'&amp;value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL&token='.newToken().'&value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
 		}
 	}
 	print '</td></tr>';
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index af646bb4096..2c3a2629a76 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -95,9 +95,10 @@ $head = security_prepare_head();
 
 print dol_get_fiche_head($head, 'proxy', '', -1);
 
+print '<br>';
 
 if ($conf->use_javascript_ajax) {
-	print "\n".'<script type="text/javascript" language="javascript">';
+	print "\n".'<script type="text/javascript">';
 	print 'jQuery(document).ready(function () {
                 function initfields()
                 {
@@ -197,9 +198,7 @@ print '</table>';
 
 print dol_get_fiche_end();
 
-print '<div class="center">';
-print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
-print '</div>';
+print $form->buttonsSaveCancel("Modify", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 883a6ff6f03..a2758304527 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -341,7 +341,7 @@ if ($mode == 'config' && $user->admin) {
 				print '<td>'.$printer->profileresprint.'</td>';
 				print '<td><input size="60" type="text" name="parameter" value="'.$printer->listprinters[$line]['parameter'].'"></td>';
 				print '<td>';
-				print '<div class="center"><input type="submit" class="button button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
+				print $form->buttonsSaveCancel("Save", '');
 				print '</td>';
 				print '</tr>';
 			} else {
@@ -350,15 +350,15 @@ if ($mode == 'config' && $user->admin) {
 				print '<td>'.$langs->trans($printer->listprinters[$line]['fk_profile_name']).'</td>';
 				print '<td>'.$printer->listprinters[$line]['parameter'].'</td>';
 				// edit icon
-				print '<td class="right"><a class="editfielda marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=editprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'">';
+				print '<td class="right"><a class="editfielda marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&action=editprinter&token='.newToken().'&printerid='.$printer->listprinters[$line]['rowid'].'">';
 				print img_picto($langs->trans("Edit"), 'edit');
 				print '</a>';
 				// delete icon
-				print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=deleteprinter&amp;token='.newToken().'&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
+				print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&action=deleteprinter&token='.newToken().'&printerid='.$printer->listprinters[$line]['rowid'].'&printername='.urlencode($printer->listprinters[$line]['name']).'">';
 				print img_picto($langs->trans("Delete"), 'delete');
 				print '</a>';
 				// test icon
-				print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=testprinter&amp;token='.newToken().'&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
+				print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&action=testprinter&token='.newToken().'&printerid='.$printer->listprinters[$line]['rowid'].'&printername='.urlencode($printer->listprinters[$line]['name']).'">';
 				print img_picto($langs->trans("TestPrinter"), 'printer');
 				print '</a></td>';
 				print '</tr>';
@@ -432,21 +432,21 @@ if ($mode == 'template' && $user->admin) {
 				print '<textarea name="template" wrap="soft" cols="120" rows="12">'.$printer->listprinterstemplates[$line]['template'].'</textarea>';
 				print '</td>';
 				print '<td>';
-				print '<div class="center"><input type="submit" class="button button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
+				print $form->buttonsSaveCancel("Save", '');
 				print '</td>';
 			} else {
 				print '<td>'.$printer->listprinterstemplates[$line]['name'].'</td>';
 				print '<td>'.dol_htmlentitiesbr($printer->listprinterstemplates[$line]['template']).'</td>';
 				// edit icon
-				print '<td><a class="editfielda paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=edittemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'">';
+				print '<td><a class="editfielda paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&action=edittemplate&token='.newToken().'&templateid='.$printer->listprinterstemplates[$line]['rowid'].'">';
 				print img_picto($langs->trans("Edit"), 'edit');
 				print '</a>';
 				// delete icon
-				print '<a class="paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=deletetemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;templatename='.$printer->listprinterstemplates[$line]['name'].'">';
+				print '<a class="paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&action=deletetemplate&token='.newToken().'&templateid='.$printer->listprinterstemplates[$line]['rowid'].'&templatename='.urlencode($printer->listprinterstemplates[$line]['name']).'">';
 				print img_picto($langs->trans("Delete"), 'delete');
 				print '</a>';
 				// test icon
-				print '<a class="paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=testtemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;templatename='.$printer->listprinterstemplates[$line]['name'].'">';
+				print '<a class="paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&action=testtemplate&token='.newToken().'&templateid='.$printer->listprinterstemplates[$line]['rowid'].'&templatename='.urlencode($printer->listprinterstemplates[$line]['name']).'">';
 				print img_picto($langs->trans("TestPrinterTemplate"), 'printer');
 				print '</a></td>';
 			}
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index e9a4a724871..26300ece329 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -36,6 +36,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'reception';
@@ -225,7 +227,7 @@ foreach ($dirmodels as $reldir) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') {
-							print $langs->trans($tmp);
+							print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 						} else {
 							print $tmp;
 						}
@@ -235,7 +237,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->RECEPTION_ADDON_NUMBER == "$file") {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;token='.newToken().'&amp;value='.urlencode($file).'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&token='.newToken().'&value='.urlencode($file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -363,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&amp;token='.newToken().'&amp;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&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<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>";
 								}
 
@@ -378,7 +380,7 @@ foreach ($dirmodels as $reldir) {
 								if ($conf->global->RECEPTION_ADDON_PDF == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<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>';
 
@@ -470,7 +472,7 @@ print "</td></tr>\n";
 */
 print '</table>';
 
-//print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+//print $form->buttonsSaveCancel("Modify", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 064fb5650a4..795a0557f16 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -188,8 +188,9 @@ $head = security_prepare_head();
 
 print dol_get_fiche_head($head, 'passwords', '', -1);
 
+print '<br>';
 
-// Choix du gestionnaire du generateur de mot de passe
+// Select manager to generate passwords
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="update">';
@@ -249,7 +250,7 @@ foreach ($arrayhandler as $key => $module) {
 			$langs->load("errors");
 			print '<div class="error">'.$langs->trans($tmp).'</div>';
 		} elseif ($tmp == 'NotConfigured') {
-			print $langs->trans($tmp);
+			print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 		} else {
 			print '<span class="opacitymedium">'.$tmp.'</span>';
 		}
@@ -260,7 +261,7 @@ foreach ($arrayhandler as $key => $module) {
 			//print img_picto('', 'tick');
 			print img_picto($langs->trans("Enabled"), 'switch_on');
 		} else {
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=setgeneraterule&amp;token='.newToken().'&amp;value='.$key.'">';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=setgeneraterule&token='.newToken().'&value='.$key.'">';
 			//print $langs->trans("Activate");
 			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a>';
@@ -318,7 +319,7 @@ if ($conf->global->USER_PASSWORD_GENERATED == "Perso") {
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("NoAmbiCaracAutoGeneration")."</td>";
-	print '<td><input type="checkbox" id="NoAmbiCaracAutoGeneration" '.($tabConf[5] ? "checked" : "").' min="0"> <span id="textcheckbox">'.($tabConf[5] ? $langs->trans("Activated") : $langs->trans("Disabled")).'</span></td>';
+	print '<td><input type="checkbox" id="NoAmbiCaracAutoGeneration" '.($tabConf[5] ? "checked" : "").' min="0"> <label for="NoAmbiCaracAutoGeneration" id="textcheckbox">'.($tabConf[5] ? $langs->trans("Activated") : $langs->trans("Disabled")).'</label></td>';
 	print '</tr>';
 
 	print '</table>';
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index 12c90cf3c21..82df4bed430 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -63,7 +63,7 @@ if ($action == 'updateform') {
 	if ($res3 && $res4 && $res5 && $res6) {
 		setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 	}
-} elseif ($action == 'delete') {
+} elseif ($action == 'deletefile') {
 	// Delete file
 	$langs->load("other");
 	$file = $conf->admin->dir_temp.'/'.GETPOST('urlfile', 'alpha');
@@ -101,9 +101,9 @@ $head = security_prepare_head();
 
 print dol_get_fiche_head($head, 'file', '', -1);
 
+print '<br>';
 
 // Upload options
-$var = false;
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
@@ -153,8 +153,8 @@ if (ini_get('safe_mode') && !empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) {
 		dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING);
 	}
 }
-print '<input type="text" '.(defined('MAIN_ANTIVIRUS_COMMAND') ? 'disabled ' : '').'name="MAIN_ANTIVIRUS_COMMAND" class="minwidth500imp" value="'.(!empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_COMMAND) : '').'">';
-if (defined('MAIN_ANTIVIRUS_COMMAND')) {
+print '<input type="text" '.((defined('MAIN_ANTIVIRUS_COMMAND') && !defined('MAIN_ANTIVIRUS_BYPASS_COMMAND_AND_PARAM')) ? 'disabled ' : '').'name="MAIN_ANTIVIRUS_COMMAND" class="minwidth500imp" value="'.(!empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_COMMAND) : '').'">';
+if (defined('MAIN_ANTIVIRUS_COMMAND') && !defined('MAIN_ANTIVIRUS_BYPASS_COMMAND_AND_PARAM')) {
 	print '<br><span class="opacitymedium">'.$langs->trans("ValueIsForcedBySystem").'</span>';
 }
 print "</td>";
@@ -179,7 +179,7 @@ print '</div>';
 
 print dol_get_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'"></div>';
+print $form->buttonsSaveCancel("Modify", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 817539ed949..a3d54e2a132 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -94,6 +94,7 @@ $head = security_prepare_head();
 
 print dol_get_fiche_head($head, 'misc', '', -1);
 
+print '<br>';
 
 // Other Options
 print '<table class="noborder centpercent">';
@@ -111,9 +112,9 @@ if (function_exists("imagecreatefrompng")) {
 		print ajax_constantonoff('MAIN_SECURITY_ENABLECAPTCHA');
 	} else {
 		if (empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) {
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MAIN_SECURITY_ENABLECAPTCHA&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MAIN_SECURITY_ENABLECAPTCHA&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		} else {
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MAIN_SECURITY_ENABLECAPTCHA&amp;token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MAIN_SECURITY_ENABLECAPTCHA&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 		}
 	}
 } else {
@@ -130,9 +131,9 @@ if (!empty($conf->use_javascript_ajax)) {
 	print ajax_constantonoff('MAIN_USE_ADVANCED_PERMS');
 } else {
 	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MAIN_USE_ADVANCED_PERMS&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MAIN_USE_ADVANCED_PERMS&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	} else {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MAIN_USE_ADVANCED_PERMS&amp;token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MAIN_USE_ADVANCED_PERMS&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print "</td></tr>";
@@ -184,7 +185,7 @@ print '</table>';
 
 print dol_get_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'"></div>';
+print $form->buttonsSaveCancel("Modify", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index d6b6d6e428a..05abf8c3995 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -183,7 +183,7 @@ if ($action == 'edit') {
 	if (count($listofmethods)) {
 		print $form->selectarray('MAIN_SMS_SENDMODE', $listofmethods, $conf->global->MAIN_SMS_SENDMODE, 1);
 	} else {
-		print '<font class="error">'.$langs->trans("None").'</font>';
+		print '<span class="error">'.$langs->trans("None").'</span>';
 	}
 	print '</td></tr>';
 
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index 8f267e9eb1c..92dba301854 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -149,7 +149,7 @@ if (!empty($conf->global->ADHERENT_USE_SPIP)) {
 } else {
 	print dol_get_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
 
-	$link = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value=1&amp;name=ADHERENT_USE_SPIP">';
+	$link = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value=1&name=ADHERENT_USE_SPIP">';
 	//$link.=$langs->trans("Activate");
 	$link .= img_picto($langs->trans("Disabled"), 'switch_off');
 	$link .= '</a>';
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index e1fc7fc1d3a..e8f59727c07 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -565,13 +565,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&amp;token='.newToken().'&amp;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&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<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>";
 								}
 
@@ -580,7 +580,7 @@ foreach ($dirmodels as $reldir) {
 								if ($conf->global->STOCK_ADDON_PDF == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<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>';
 								}
 								print '</td>';
 
@@ -644,7 +644,7 @@ 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 '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit small" value="'.$langs->trans("Modify").'">';
 print "</td>";
 print "</tr>\n";
 
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index bc587845cda..40fe58f68d6 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -246,7 +246,7 @@ foreach ($dirmodels as $reldir) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') {
-							print $langs->trans($tmp);
+							print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 						} else {
 							print $tmp;
 						}
@@ -256,7 +256,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER == "$file") {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
 
@@ -375,7 +375,7 @@ foreach ($dirmodels as $reldir) {
 						//if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF != "$name")
 						//{
 							// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier">';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&amp;type=invoice_supplier">';
 							print img_picto($langs->trans("Enabled"), 'switch_on');
 							print '</a>';
 						/*}
@@ -386,7 +386,7 @@ foreach ($dirmodels as $reldir) {
 						print "</td>";
 					} else {
 						print '<td class="center">'."\n";
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&amp;type=invoice_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						print "</td>";
 					}
 
@@ -395,9 +395,9 @@ foreach ($dirmodels as $reldir) {
 					if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF == "$name") {
 						//print img_picto($langs->trans("Default"),'on');
 						// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&token='.newToken().'&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'&type=invoice_supplier"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 					} else {
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'&type=invoice_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 					}
 					print '</td>';
 
@@ -464,7 +464,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 
 print '</table><br>';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 7cf64e4800d..0da79845d14 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -43,6 +43,8 @@ if (!$user->admin) {
 
 $type = GETPOST('type', 'alpha');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -132,6 +134,8 @@ if ($action == 'updateMask') {
 	if ($ret > 0) {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
+} elseif ($action == 'unsetdoc') {
+	dolibarr_del_const($db, "COMMANDE_SUPPLIER_ADDON_PDF", $conf->entity);
 } elseif ($action == 'setmod') {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
@@ -259,7 +263,7 @@ foreach ($dirmodels as $reldir) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') {
-							print $langs->trans($tmp);
+							print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 						} else {
 							print $tmp;
 						}
@@ -269,7 +273,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER == "$file") {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.urlencode($file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
 
@@ -381,7 +385,7 @@ foreach ($dirmodels as $reldir) {
 					if (in_array($name, $def)) {
 						print '<td class="center">'."\n";
 						if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF != "$name") {
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&type=order_supplier">';
 							print img_picto($langs->trans("Enabled"), 'switch_on');
 							print '</a>';
 						} else {
@@ -390,16 +394,17 @@ foreach ($dirmodels as $reldir) {
 						print "</td>";
 					} else {
 						print '<td class="center">'."\n";
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value='.urlencode($name).'&amp;scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&type=order_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						print "</td>";
 					}
 
 					// Default
 					print '<td class="center">';
 					if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF == "$name") {
-						print img_picto($langs->trans("Default"), 'on');
+						//                      print img_picto($langs->trans("Default"), 'on');
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 					} else {
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&type=order_supplier" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 					}
 					print '</td>';
 
@@ -453,7 +458,7 @@ print $langs->trans("IfSetToYesDontForgetPermission");
 print '</td><td>';
 print '<input type="text" size="6" name="SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED" value="'.$conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED.'">';
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 
 
@@ -472,11 +477,11 @@ if ($conf->banque->enabled)
 	{
 		if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER))
 		{
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER&amp;token='.newToken().'&amp;value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER&token='.newToken().'&value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
 		}
 		else
 		{
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER&amp;token='.newToken().'&amp;value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER&token='.newToken().'&value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
 		}
 	}
 	print '</td></tr>';
@@ -508,7 +513,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 
 // Option to add a quality/validation step, on products, after reception.
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 3f79b52eff3..a41f9fdf80c 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -37,6 +37,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scandir', 'alpha');
 $type = 'supplier_payment';
@@ -89,6 +91,8 @@ if ($action == 'updateMask') {
 	if ($ret > 0) {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
+} elseif ($action == 'unsetdoc') {
+	dolibarr_del_const($db, "SUPPLIER_PAYMENT_ADDON_PDF", $conf->entity);
 } elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
 
@@ -247,7 +251,7 @@ foreach ($dirmodels as $reldir) {
 								$langs->load("errors");
 								print '<div class="error">'.$langs->trans($tmp).'</div>';
 							} elseif ($tmp == 'NotConfigured') {
-								print $langs->trans($tmp);
+								print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 							} else {
 								print $tmp;
 							}
@@ -372,7 +376,7 @@ foreach ($dirmodels as $reldir) {
 						print "</td>";
 					} else {
 						print '<td class="center">'."\n";
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value='.urlencode($name).'&scandir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&type=SUPPLIER_PAYMENT">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						print "</td>";
 					}
 
@@ -381,9 +385,9 @@ foreach ($dirmodels as $reldir) {
 					if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF == "$name") {
 						//print img_picto($langs->trans("Default"),'on');
 						// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&token='.newToken().'&value='.urlencode($name).'&scandir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 					} else {
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.urlencode($name).'&scandir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 					}
 					print '</td>';
 
@@ -447,7 +451,7 @@ print dol_get_fiche_end();
 
 print '<br>';
 print '<div class="center">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'" />';
 print '</div>';
 print '<br>';
 
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 68066a2aebc..9bd684afb22 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -38,6 +38,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'supplier_proposal';
@@ -247,7 +249,7 @@ foreach ($dirmodels as $reldir) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') {
-							print $langs->trans($tmp);
+							print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 						} else {
 							print $tmp;
 						}
@@ -257,7 +259,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->SUPPLIER_PROPOSAL_ADDON == "$file") {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -380,22 +382,22 @@ foreach ($dirmodels as $reldir) {
 								// Active
 								if (in_array($name, $def)) {
 									print '<td class="center">'."\n";
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
+									print '<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 align=\"center\">\n";
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<td align="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>";
 								}
 
 								// Defaut
-								print "<td align=\"center\">";
+								print '<td align="center">';
 								if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$name") {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<a 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>';
 								}
 								print '</td>';
 
@@ -479,7 +481,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 print '</form>';
 
@@ -492,7 +494,7 @@ print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext,
 print '</td><td>';
 print '<input class="flat minwidth200" type="text" name="SUPPLIER_PROPOSAL_DRAFT_WATERMARK" value="'.$conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK.'">';
 print '</td><td class="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 print '</form>';
 
@@ -503,9 +505,9 @@ if ($conf->banque->enabled) {
 		print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL');
 	} else {
 		if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL)) {
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&amp;token='.newToken().'&amp;value=1">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&token='.newToken().'&value=1">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 		} else {
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&amp;token='.newToken().'&amp;value=0">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&token='.newToken().'&value=0">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 		}
 	}
 	print '</td></tr>';
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 10b3d1bd47b..2f272cd986f 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -187,8 +187,6 @@ if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY) && $user->entity) {
 }
 
 
-//print "conf->global->MAIN_FEATURES_LEVEL = ".$conf->global->MAIN_FEATURES_LEVEL."<br><br>\n";
-
 // Output mode
 print load_fiche_titre($langs->trans("SyslogOutput"), '', '');
 
@@ -207,7 +205,7 @@ foreach ($syslogModules as $moduleName) {
 
 	$moduleactive = (int) $module->isActive();
 	//print $moduleName." = ".$moduleactive." - ".$module->getName()." ".($moduleactive == -1)."<br>\n";
-	if (($moduleactive == -1) && empty($conf->global->MAIN_FEATURES_LEVEL)) {
+	if (($moduleactive == -1) && getDolGlobalInt('MAIN_FEATURES_LEVEL') == 0) {
 		continue; // Some modules are hidden if not activable and not into debug mode (end user must not see them)
 	}
 
diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index f0ecc0fc160..de6f0c146f3 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -72,8 +72,8 @@ print '</li></ul>';
 
 print $langs->trans("Developpers").':';
 print '<ul>';
-print '<li>'.$langs->trans("SourcesRepository").': <a href="https://www.github.com/Dolibarr/dolibarr" target="_blank" rel="external">https://www.github.com/Dolibarr/dolibarr</a></li>';
-print '<li>'.$langs->trans("SeeWikiForAllTeam").': <a href="https://wiki.dolibarr.org/index.php/Dolibarr_Project" target="_blank" rel="external">https://wiki.dolibarr.org/index.php/Dolibarr_Project</a></li>';
+print '<li>'.$langs->trans("SourcesRepository").': <a href="https://www.github.com/Dolibarr/dolibarr" target="_blank" rel="noopener noreferrer external">https://www.github.com/Dolibarr/dolibarr</a></li>';
+print '<li>'.$langs->trans("SeeWikiForAllTeam").': <a href="https://wiki.dolibarr.org/index.php/Dolibarr_Project" target="_blank" rel="noopener noreferrer external">https://wiki.dolibarr.org/index.php/Dolibarr_Project</a></li>';
 print '</ul>';
 
 //print "<br>\n";
@@ -82,56 +82,56 @@ print $langs->trans("OtherInformations").':';
 
 print '<ul>';
 print '<li>';
-print '<a target="_blank" href="https://www.dolibarr.org/" rel="external">'.$langs->trans("OfficialWebSite").'</a>';
+print '<a target="_blank" href="https://www.dolibarr.org/" rel="noopener noreferrer external">'.$langs->trans("OfficialWebSite").'</a>';
 print '</li>';
 // Show local site
 /*
 if (preg_match('/^fr_/i', $langs->getDefaultLang()))
 {
 	print '<li>';
-	print '<a target="_blank" href="https://www.dolibarr.fr/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("France")).'</a>';
+	print '<a target="_blank" href="https://www.dolibarr.fr/" rel="noopener noreferrer external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("France")).'</a>';
 	print '</li>';
 }
 if (preg_match('/^el_/i', $langs->getDefaultLang()))
 {
 	print '<li>';
-	print '<a target="_blank" href="https://www.dolibarr.gr/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Greece")).'</a>';
+	print '<a target="_blank" href="https://www.dolibarr.gr/" rel="noopener noreferrer external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Greece")).'</a>';
 	print '</li>';
 }
 if (preg_match('/^es_/i', $langs->getDefaultLang()))
 {
 	print '<li>';
-	print '<a target="_blank" href="https://www.dolibarr.es/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Spain")).'</a>';
+	print '<a target="_blank" href="https://www.dolibarr.es/" rel="noopener noreferrer external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Spain")).'</a>';
 	print '</li>';
 }
 if (preg_match('/^it_/i', $langs->getDefaultLang()))
 {
 	print '<li>';
-	print '<a target="_blank" href="https://www.dolibarr.it/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Italy")).'</a>';
+	print '<a target="_blank" href="https://www.dolibarr.it/" rel="noopener noreferrer external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Italy")).'</a>';
 	print '</li>';
 }
 if (preg_match('/^de_/i', $langs->getDefaultLang()))
 {
 	print '<li>';
-	print '<a target="_blank" href="https://www.dolibarr.de/" rel="external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Germany")).'</a>';
+	print '<a target="_blank" href="https://www.dolibarr.de/" rel="noopener noreferrer external">'.$langs->trans("OfficialWebSiteLocal", $langs->transnoentitiesnoconv("Germany")).'</a>';
 	print '</li>';
 }*/
 print '<li>';
-print '<a target="_blank" href="https://wiki.dolibarr.org/" rel="external">'.$langs->trans("OfficialWiki").'</a>';
+print '<a target="_blank" href="https://wiki.dolibarr.org/" rel="noopener noreferrer external">'.$langs->trans("OfficialWiki").'</a>';
 print '</li>';
 print '</ul>';
 
 print $langs->trans("Demo").':';
 print '<ul>';
 print '<li>';
-print '<a target="_blank" href="https://www.dolibarr.org/onlinedemo/" rel="external">'.$langs->trans("OfficialDemo").'</a>';
+print '<a target="_blank" href="https://www.dolibarr.org/onlinedemo/" rel="noopener noreferrer external">'.$langs->trans("OfficialDemo").'</a>';
 print '</li>';
 print '</ul>';
 
 print $langs->trans("ModulesMarketPlaces").':';
 print '<ul>';
 print '<li>';
-print '<a target="_blank" href="https://www.dolistore.com" rel="external">'.$langs->trans("OfficialMarketPlace").'</a>';
+print '<a target="_blank" href="https://www.dolistore.com" rel="noopener noreferrer external">'.$langs->trans("OfficialMarketPlace").'</a>';
 print '</li>';
 print '</ul>';
 
@@ -143,7 +143,7 @@ print $langs->trans("HelpCenter").':';
 print '<ul>';
 print '<li>';
 //print $langs->trans("SeeWikiPage",'http://wiki.dolibarr.org/index.php/List_of_OpenSource_Software_companies_and_freelancers');
-print '<a target="_blank" href="'.DOL_URL_ROOT.'/support/index.php" data-ajax="false">'.$langs->trans("HelpCenter").'</a>';
+print '<a target="_blank" rel="noopener noreferrer external" href="'.DOL_URL_ROOT.'/support/index.php" data-ajax="false">'.$langs->trans("HelpCenter").'</a>';
 print '</li>';
 print '</ul>';
 
@@ -158,15 +158,15 @@ if (preg_match('/^fr_/i', $langs->getDefaultLang())) {
 if (preg_match('/^es_/i', $langs->getDefaultLang())) {
 	$url = 'https://wiki.dolibarr.org/index.php/Subscribirse';
 }
-print '<li><a href="'.$url.'" target="_blank" rel="external">'.$langs->trans("SubscribeToFoundation").'</a></li>';
+print '<li><a href="'.$url.'" target="_blank" rel="noopener noreferrer external">'.$langs->trans("SubscribeToFoundation").'</a></li>';
 print '</ul>';
 
 print $langs->trans("SocialNetworks").':';
 
 print '<ul>';
 
-print '<li><a href="https://facebook.com/dolibarr" target="_blank" rel="external">FaceBook</a></li>';
-print '<li><a href="https://twitter.com/dolibarr" target="_blank" rel="external">Twitter</a></li>';
+print '<li><a href="https://facebook.com/dolibarr" target="_blank" rel="noopener noreferrer external">FaceBook</a></li>';
+print '<li><a href="https://twitter.com/dolibarr" target="_blank" rel="noopener noreferrer external">Twitter</a></li>';
 
 print '</ul>';
 
@@ -182,11 +182,11 @@ if (preg_match('/^es_/i', $langs->getDefaultLang())) {
 	$url = 'https://wiki.dolibarr.org/index.php/Soluciones_en_la_Nube';
 }
 print '<li>';
-print '<a target="_blank" href="'.$url.'" rel="external">'.$title.'</a>';
+print '<a target="_blank" rel="noopener noreferrer external" href="'.$url.'">'.$title.'</a>';
 print '</li>';
 $url = 'https://partners.dolibarr.org'; $title = $langs->trans("ReferencedPreferredPartners");
 print '<li>';
-print '<a target="_blank" href="'.$url.'" rel="external">'.$title.'</a>';
+print '<a target="_blank" rel="noopener noreferrer external" href="'.$url.'">'.$title.'</a>';
 print '</li>';
 
 print '</ul>';
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 3d31c516858..72e8db6bb4e 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -149,7 +149,7 @@ if (!$base) {
 				print '<td align="right">'.$obj->Check_time.'</td>';
 				print '<td align="right">'.$obj->Collation;
 				if (isset($obj->Collation) && (in_array($obj->Collation, array("utf8mb4_general_ci", "utf8mb4_unicode_ci", "latin1_swedish_ci")))) {
-					print '<br><a class="reposition" href="database-tables.php?action=convertutf8&table='.urlencode($obj->Name).'&token='.newtoken().'">'.$langs->trans("Convert").' UTF8</a>';
+					print '<br><a class="reposition" href="database-tables.php?action=convertutf8&table='.urlencode($obj->Name).'&token='.newToken().'">'.$langs->trans("Convert").' UTF8</a>';
 				}
 				print '</td>';
 				print '</tr>';
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 75ca036b92f..d10e789f39c 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -93,7 +93,7 @@ $version = DOL_VERSION;
 if (preg_match('/[a-z]+/i', $version)) {
 	$version = 'develop'; // If version contains text, it is not an official tagged version, so we use the full change log.
 }
-print ' &nbsp; <a href="https://raw.githubusercontent.com/Dolibarr/dolibarr/'.$version.'/ChangeLog" target="_blank">'.$langs->trans("SeeChangeLog").'</a>';
+print ' &nbsp; <a href="https://raw.githubusercontent.com/Dolibarr/dolibarr/'.$version.'/ChangeLog" target="_blank" rel="noopener noreferrer external">'.$langs->trans("SeeChangeLog").'</a>';
 
 $newversion = '';
 if (function_exists('curl_init')) {
@@ -120,7 +120,7 @@ if (function_exists('curl_init')) {
 			// Show version
 			print $langs->trans("LastStableVersion").' : <b>'.(($version != '0.0') ? $version : $langs->trans("Unknown")).'</b>';
 			if ($version != '0.0') {
-				print ' &nbsp; <a href="https://raw.githubusercontent.com/Dolibarr/dolibarr/'.$version.'/ChangeLog" target="_blank">'.$langs->trans("SeeChangeLog").'</a>';
+				print ' &nbsp; <a href="https://raw.githubusercontent.com/Dolibarr/dolibarr/'.$version.'/ChangeLog" target="_blank" rel="noopener noreferrer external">'.$langs->trans("SeeChangeLog").'</a>';
 			}
 		} else {
 			print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b>';
@@ -327,6 +327,7 @@ $configfileparameters = array(
 	'dolibarr_main_db_character_set' => $langs->trans("DBStoringCharset"),
 	'dolibarr_main_db_collation' => $langs->trans("DBSortingCollation"),
 	'?dolibarr_main_db_prefix' => $langs->trans("DatabasePrefix"),
+	'dolibarr_main_db_readonly' => $langs->trans("ReadOnlyMode"),
 	'separator2' => '',
 	'dolibarr_main_authentication' => $langs->trans("AuthenticationMode"),
 	'?multicompany_transverse_mode'=>  $langs->trans("MultiCompanyMode"),
@@ -449,6 +450,13 @@ foreach ($configfileparameters as $key => $value) {
 				if (!empty($valuetoshow)) {
 					print img_warning($langs->trans('SwitchThisForABetterSecurity', 0));
 				}
+			} elseif ($newkey == 'dolibarr_main_db_readonly') {
+				print ${$newkey};
+
+				$valuetoshow = ${$newkey};
+				if (!empty($valuetoshow)) {
+					print img_warning($langs->trans('ReadOnlyMode', 1));
+				}
 			} else {
 				print (empty(${$newkey}) ? '' : ${$newkey});
 			}
diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
deleted file mode 100644
index cfb73b0c24e..00000000000
--- a/htdocs/admin/system/index.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *  \file       htdocs/admin/system/index.php
- *  \brief      Home page of system information
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("admin", "user", "install"));
-
-if (!$user->admin) {
-	accessforbidden();
-}
-
-
-/*
- * Actions
- */
-
-// None
-
-
-/*
- * View
- */
-
-llxHeader();
-
-print load_fiche_titre($langs->trans("SummarySystem"), '', 'title_setup');
-
-
-print '<table class="noborder centpercent">';
-print "<tr class=\"liste_titre\"><td colspan=\"2\">Dolibarr</td></tr>\n";
-$dolversion = version_dolibarr();
-print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>".$dolversion."</td></tr>\n";
-print '</table>';
-
-print "<br>\n";
-
-print '<table class="noborder centpercent">';
-print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("OS")."</td></tr>\n";
-$osversion = version_os();
-print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>".$osversion."</td></tr>\n";
-print '</table>';
-
-print "<br>\n";
-
-// Serveur web
-print '<table class="noborder centpercent">';
-print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("WebServer")."</td></tr>\n";
-$apacheversion = version_webserver();
-print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>".$apacheversion."</td></tr>\n";
-print '</table>';
-
-print "<br>\n";
-
-// Php
-print '<table class="noborder centpercent">';
-print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("PHP")."</td></tr>\n";
-$phpversion = version_php();
-print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>".$phpversion."</td></tr>\n";
-print "<tr $bc[1]><td>".$langs->trans("PhpWebLink")."</td><td>".php_sapi_name()."</td></tr>\n";
-print '</table>';
-
-print "<br>\n";
-
-// Database
-print '<table class="noborder centpercent">';
-print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Database")."</td></tr>\n";
-$dblabel = $db::LABEL;
-$dbversion = $db->getVersion();
-print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>".$dblabel." ".$dbversion."</td></tr>\n";
-print '</table>';
-// Add checks on database options
-if ($db->type == 'pgsql') {
-	// Check option standard_conforming_strings is on
-	$paramarray = $db->getServerParametersValues('standard_conforming_strings');
-	//	if ($paramarray['standard_conforming_strings'] != 'on' && $paramarray['standard_conforming_strings'] != 1)
-	//	{
-	//		$langs->load("errors");
-	//	}
-}
-print '<br>';
-
-// Browser
-print '<table class="noborder centpercent">';
-print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Browser")."</td></tr>\n";
-print "<tr $bc[0]><td width=\"280\">".$langs->trans("UserAgent")."</td><td>".$_SERVER["HTTP_USER_AGENT"]."</td></tr>\n";
-print "<tr $bc[1]><td width=\"280\">".$langs->trans("Smartphone")."</td><td>".(($conf->browser->layout != 'phone') ? $langs->trans("No") : $langs->trans("Yes"))."</td></tr>\n";
-print '</table>';
-print '<br>';
-
-
-//print "<br>\n";
-print info_admin($langs->trans("SystemInfoDesc")).'<br>';
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 150ca10a359..9e60ff46bd7 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -40,8 +40,8 @@ $search_id = GETPOST("search_id", 'alpha');
 $search_version = GETPOST("search_version", 'alpha');
 $search_permission = GETPOST("search_permission", 'alpha');
 
-$sortfield			= GETPOST("sortfield", 'alpha');
-$sortorder			= GETPOST("sortorder", 'alpha');
+$sortfield			= GETPOST('sortfield', 'aZ09comma');
+$sortorder			= GETPOST('sortorder', 'aZ09comma');
 
 if (!$sortfield) {
 	$sortfield = "id";
@@ -91,6 +91,7 @@ $modules_files = array();
 $modules_fullpath = array();
 $modulesdir = dolGetModulesDirs();
 $rights_ids = array();
+$arrayofpermissions = array();
 
 foreach ($modulesdir as $dir) {
 	$handle = @opendir(dol_osencode($dir));
@@ -155,7 +156,7 @@ foreach ($modules as $key => $module) {
 			if (empty($rights[0])) {
 				continue;
 			}
-
+			$arrayofpermissions[$rights[0]] = array('label'=> 'user->rights->'.$module->rights_class.'->'.$rights[4].(empty($rights[5]) ? '' : '->'.$rights[5]));
 			$permission[] = $rights[0];
 
 			array_push($rights_ids, $rights[0]);
@@ -336,8 +337,10 @@ foreach ($moduleList as $module) {
 		$idperms = '';
 
 		foreach ($module->permission as $permission) {
-			$idperms .= ($idperms ? ", " : "").$permission;
 			$translationKey = "Permission".$permission;
+			$labelpermission = $langs->trans($translationKey);
+			$labelpermission .= ' : '.$arrayofpermissions[$permission]['label'];
+			$idperms .= ($idperms ? ", " : "").'<span title="'.$labelpermission.'">'.$permission.'</a>';
 
 			if (!empty($conf->global->MAIN_SHOW_PERMISSION)) {
 				if (empty($langs->tab_translate[$translationKey])) {
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index bbfa4b85c41..0bdb442863d 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -165,7 +165,7 @@ if (ini_get('opcache.preload')) {
 print '<br>';
 
 // HTTPCacheStaticResources
-print '<script type="text/javascript" language="javascript">
+print '<script type="text/javascript">
 jQuery(document).ready(function() {
   var getphpurl;
   var cachephpstring;
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 7bc527bf92c..9321fa11c12 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -98,7 +98,7 @@ if (!ini_get('session.cookie_samesite') || ini_get('session.cookie_samesite') ==
 	print ' &nbsp; '.img_warning().' <span class="opacitymedium">'.$langs->trans("WarningPaypalPaymentNotCompatibleWithStrict")."</span>";
 }
 print "<br>\n";
-print "<strong>PHP open_basedir</strong> = ".(ini_get('open_basedir') ? ini_get('open_basedir') : yn(0).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("ARestrictedPath").', '.$langs->transnoentitiesnoconv("Example").' '.$_SERVER["DOCUMENT_ROOT"]).')</span>')."<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 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";
@@ -163,7 +163,7 @@ print '<br>';
 
 // XDebug
 print '<strong>'.$langs->trans("XDebug").'</strong>: ';
-$test = !function_exists('xdebug_is_enabled');
+$test = !function_exists('xdebug_is_enabled') && !extension_loaded('xdebug');
 if ($test) {
 	print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled").' - '.$langs->trans("NotRiskOfLeakWithThis");
 } else {
@@ -258,6 +258,8 @@ print '<br>';
 print '<strong>$dolibarr_nocsrfcheck</strong>: '.(empty($dolibarr_nocsrfcheck) ? '0' : $dolibarr_nocsrfcheck);
 if (!empty($dolibarr_nocsrfcheck)) {
 	print ' &nbsp; '.img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis", 0);
+} else {
+	print ' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 0)</span>';
 }
 print '<br>';
 
@@ -304,7 +306,7 @@ print empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ? '' : img_picto('', 'tick').
 print yn(empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ? 0 : 1);
 if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) {
 	print ' &nbsp; - '.$conf->global->MAIN_ANTIVIRUS_COMMAND;
-	if (defined('MAIN_ANTIVIRUS_COMMAND')) {
+	if (defined('MAIN_ANTIVIRUS_COMMAND') && !defined('MAIN_ANTIVIRUS_BYPASS_COMMAND_AND_PARAM')) {
 		print ' - <span class="opacitymedium">'.$langs->trans("ValueIsForcedBySystem").'</span>';
 	}
 }
@@ -340,69 +342,6 @@ if (empty($out)) {
 }
 
 print '<br>';
-print '<br>';
-print '<br>';
-print '<br>';
-
-
-print load_fiche_titre($langs->trans("OtherSetup").' ('.$langs->trans("Experimental").')', '', 'folder');
-
-
-//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; ";
-if (empty($conf->global->MAIN_SECURITY_HASH_ALGO)) {
-	print '<span class="opacitymedium"> &nbsp; &nbsp; If unset: \'md5\'</span>';
-}
-if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
-	print '<br><strong>MAIN_SECURITY_SALT</strong> = '.(empty($conf->global->MAIN_SECURITY_SALT) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_SALT).'<br>';
-} else {
-	print '<span class="opacitymedium">('.$langs->trans("Recommended").': password_hash)</span>';
-	print '<br>';
-}
-if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
-	print '<div class="info">The recommanded value for MAIN_SECURITY_HASH_ALGO is now \'password_hash\' but setting it now will make ALL existing passwords of all users not valid, so update is not possible.<br>';
-	print 'If you really want to switch, you must:<br>';
-	print '- Go on home - setup - other and add constant MAIN_SECURITY_HASH_ALGO to value \'password_hash\'<br>';
-	print '- In same session, WITHOUT LOGGING OUT, go into your admin user record and set a new password<br>';
-	print '- You can now logout and login with this new password. You must now reset password of all other users.<br>';
-	print '</div><br>';
-}
-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 '<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>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_EXEC_USE_POPEN</strong> = ';
-if (empty($conf->global->MAIN_EXEC_USE_POPEN)) {
-	print '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>';
-} else {
-	print $conf->global->MAIN_EXEC_USE_POPEN;
-}
-if ($execmethod == 1) {
-	print '<span class="opacitymedium">, "exec" PHP method will be used for shell commands';
-	print ' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 1)';
-	print '</span>';
-}
-if ($execmethod == 2) {
-	print '<span class="opacitymedium">, "popen" PHP method will be used for shell commands';
-	print ' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 1)';
-	print '</span>';
-}
-print "<br>";
-print '<br>';
-
 
 
 // Modules/Applications
@@ -454,7 +393,7 @@ if (empty($conf->api->enabled) && empty($conf->webservices->enabled)) {
 		print '<br>';
 	}
 	if (!empty($conf->api->enabled)) {
-		print '<strong>API_ENDPOINT_RULES</strong> = '.(empty($conf->global->API_ENDPOINT_RULES) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Example").': endpoint1:1,endpoint2:1,...)</span>' : $conf->global->API_ENDPOINT_RULES)."<br>\n";
+		print '<strong>API_ENDPOINT_RULES</strong> = '.(empty($conf->global->API_ENDPOINT_RULES) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Example").': login:0,users:0,setup:1,status:1,tickets:1,...)</span>' : $conf->global->API_ENDPOINT_RULES)."<br>\n";
 		print '<br>';
 	}
 }
@@ -462,6 +401,76 @@ if (empty($conf->api->enabled) && empty($conf->webservices->enabled)) {
 
 print '<br><br>';
 
+
+print '<br>';
+
+
+print load_fiche_titre($langs->trans("OtherSetup").' ('.$langs->trans("Experimental").')', '', 'folder');
+
+
+//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; ";
+if (empty($conf->global->MAIN_SECURITY_HASH_ALGO)) {
+	print '<span class="opacitymedium"> &nbsp; &nbsp; If unset: \'md5\'</span>';
+}
+if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
+	print '<br><strong>MAIN_SECURITY_SALT</strong> = '.(empty($conf->global->MAIN_SECURITY_SALT) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_SALT).'<br>';
+} else {
+	print '<span class="opacitymedium">('.$langs->trans("Recommended").': password_hash)</span>';
+	print '<br>';
+}
+if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
+	print '<div class="info">The recommanded value for MAIN_SECURITY_HASH_ALGO is now \'password_hash\' but setting it now will make ALL existing passwords of all users not valid, so update is not possible.<br>';
+	print 'If you really want to switch, you must:<br>';
+	print '- Go on home - setup - other and add constant MAIN_SECURITY_HASH_ALGO to value \'password_hash\'<br>';
+	print '- In same session, WITHOUT LOGGING OUT, go into your admin user record and set a new password<br>';
+	print '- You can now logout and login with this new password. You must now reset password of all other users.<br>';
+	print '</div><br>';
+}
+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 '<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>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 '<strong>MAIN_EXEC_USE_POPEN</strong> = ';
+if (empty($conf->global->MAIN_EXEC_USE_POPEN)) {
+	print '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>';
+} else {
+	print $conf->global->MAIN_EXEC_USE_POPEN;
+}
+if ($execmethod == 1) {
+	print '<span class="opacitymedium">, "exec" PHP method will be used for shell commands';
+	print ' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 1)';
+	print '</span>';
+}
+if ($execmethod == 2) {
+	print '<span class="opacitymedium">, "popen" PHP method will be used for shell commands';
+	print ' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 1)';
+	print '</span>';
+}
+print "<br>";
+print '<br>';
+
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php
index fd10aad05e8..8c3a70ff6ec 100644
--- a/htdocs/admin/system/xdebug.php
+++ b/htdocs/admin/system/xdebug.php
@@ -73,10 +73,10 @@ if (function_exists('socket_create')) {
 	print 'xdebug.profiler_append = '.ini_get('xdebug.profiler_append')."<br>\n";
 	print "<br>\n";
 
-	echo "To run a debug session, add parameter<br>";
-	echo "* XDEBUG_SESSION_START=aname on your URL. To stop, remove cookie XDEBUG_SESSION_START.<br>\n";
-	echo "To run a profiler session (when xdebug.profiler_enable_trigger=1), add parameter<br>\n";
-	echo "* XDEBUG_PROFILE=aname on each URL.<br>";
+	print "To run a debug session, add parameter<br>";
+	print "* XDEBUG_SESSION_START=aname on your URL. To stop, remove cookie XDEBUG_SESSION_START.<br>\n";
+	print "To run a profiler session (when xdebug.profiler_enable_trigger=1), add parameter<br>\n";
+	print "* XDEBUG_PROFILE=aname on each URL.<br>";
 	print "<br>";
 
 	print "<strong>Test debugger server (Eclipse for example):</strong><br>\n";
@@ -89,12 +89,12 @@ if (function_exists('socket_create')) {
 	//$client = socket_accept($sock);
 	$client = socket_connect($socket, $address, $port);
 	if ($client) {
-		echo "Connection established: ".$client." - address=".$address." port=".$port."<br>\n";
-		echo "There is a Remote debug server at this address.<br>\n";
-		echo "<br>\n";
-		echo "To be sure this debugger accepts input from your PHP server and xdebug, be sure to have\n";
-		echo "your php.ini file with this :<br>\n";
-		echo '<textarea cols="80" rows="16">'."xdebug.remote_enable=on
+		print "Connection established: ".$client." - address=".$address." port=".$port."<br>\n";
+		print "There is a Remote debug server at this address.<br>\n";
+		print "<br>\n";
+		print "To be sure this debugger accepts input from your PHP server and xdebug, be sure to have\n";
+		print "your php.ini file with this :<br>\n";
+		print '<textarea cols="80" rows="16">'."xdebug.remote_enable=on
 xdebug.remote_handle=dbgp
 xdebug.remote_host=localhost
 xdebug.remote_port=9000
@@ -110,14 +110,14 @@ xdebug.trace_output_dir=/tmp/trace
 xdebug.auto_trace=0
 </textarea>\n";
 		print "<br><br>\n";
-		echo 'Then check in your debug server (Eclipse), you have setup:<br>
+		print 'Then check in your debug server (Eclipse), you have setup:<br>
 	         XDebug with same port than in php.ini<br>
 	         Allow Remote debug=yes or prompt<br>'."\n";
 		print "<br>\n";
 	} else {
 		print socket_strerror(socket_last_error());
-		echo "Failed to connect to address=".$address." port=".$port."<br>\n";
-		echo "There is no Remote debug server at this address.\n";
+		print " - Failed to connect to address=".$address." port=".$port."<br>\n";
+		print "There is no Remote debug server at this address.\n";
 	}
 	socket_close($socket);
 } else {
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index a3b3a7f1d91..646f4a7be74 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -259,7 +259,7 @@ print "<br>\n";
 
 
 print '<div class="center">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="button">';
+print '<input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'">';
 print '<br><br>';
 print '</div>';
 
@@ -270,7 +270,7 @@ print '</form>';
 echo '<div>';
 echo '<table class="noborder centpercent">';
 echo '<thead>';
-echo '<tr class="liste_titre"><th>' . $langs->trans('Parameter') . '</th><th>' . $langs->trans('Value') . '</th></tr>';
+echo '<tr class="liste_titre"><th>'.$langs->trans('Parameter').'</th><th>'.$langs->trans('Value').'</th></tr>';
 echo '</thead>';
 echo '<tbody>';
 
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 320857de887..f4e5b4f3fad 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -38,6 +38,8 @@ if (!$user->admin) {
 // Parameters
 $value = GETPOST('value', 'alpha');
 $action = GETPOST('action', 'aZ09');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scandir', 'alpha');
 $type = 'ticket';
@@ -266,7 +268,7 @@ foreach ($dirmodels as $reldir) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
 						} elseif ($tmp == 'NotConfigured') {
-							print $langs->trans($tmp);
+							print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 						} else {
 							print $tmp;
 						}
@@ -400,13 +402,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&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&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<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>";
 								}
 
@@ -580,9 +582,7 @@ print '</td></tr>';
 
 print '</table>';
 
-print '<div class="center">';
-print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-print '</div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 98ce554c363..818141e5cde 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -180,10 +180,11 @@ $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_buildpath('/public/ticket/index.php', 1).'" target="_blank" >'.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" target="_blank" rel="noopener noreferrer">'.dol_buildpath('/public/ticket/index.php', 2).'</a>';
 
 print dol_get_fiche_end();
 
+$param = '';
 
 $enabledisablehtml = $langs->trans("TicketsActivatePublicInterface").' ';
 if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
@@ -390,7 +391,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	print '</table>';
 	print '</div>';
 
-	print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
+	print $form->buttonsSaveCancel("Save", '');
 
 	print '</form>';
 }
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 4f6977ffb41..5f9dc97ba44 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2006-2018	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2006-2018	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2006-2021	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
@@ -55,7 +55,7 @@ if (!$user->admin) {
  * Actions
  */
 
-if ($action == 'delete') {
+if ($action == 'deletefile') {
 	if (preg_match('/^backup\//', GETPOST('urlfile', 'alpha'))) {
 		$file = $conf->admin->dir_output.'/backup/'.basename(GETPOST('urlfile', 'alpha'));
 		$ret = dol_delete_file($file, 1);
@@ -145,6 +145,8 @@ print "<!-- Dump of a server -->\n";
 print '<form method="post" action="export.php" name="dump">';
 print '<input type="hidden" name="token" value="'.newToken().'" />';
 print '<input type="hidden" name="export_type" value="server" />';
+print '<input type="hidden" name="page_y" value="" />';
+
 print '<fieldset id="fieldsetexport"><legend class="legendforfieldsetstep" style="font-size: 3em">1</legend>';
 
 print '<span class="opacitymedium">';
@@ -160,14 +162,15 @@ $title = $langs->trans("BackupDumpWizard");
 
 print load_fiche_titre($title);
 
-print '<table class="'.(!empty($useinecm) ? 'nobordernopadding' : 'liste noborderbottom').' nohover centpercent">';
+print '<table class="liste nohover centpercent noborderbottom">';
 print '<tr class="liste_titre">';
 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 '<table class="centpercent">';
+
+print '<table class="centpercent noborderbottom">';
 print '<tr>';
 print '<td class="tdtop">';
 
@@ -398,10 +401,12 @@ print '</tr>';
 print '</table>';
 
 
+
+
 print '<!--<fieldset>';
 print '<legend>'.$langs->trans("Destination").'</legend> -->';
 print '<br>';
-print '<label for="filename_template">'.$langs->trans("FileNameToGenerate").'</label>';
+print '<label for="filename_template" class="line-height-large">'.$langs->trans("FileNameToGenerate").'</label>';
 print '<br>';
 $prefix = 'dump';
 $ext = '.sql';
@@ -437,9 +442,14 @@ if (in_array($type, array('mysql', 'mysqli'))) {
 	//     'label' => $langs->trans("FormatZip")
 	// );
 	$compression['bz'] = array(
-		'function' => 'bzopen',
-		'id' => 'radio_compression_bzip',
-		'label' => $langs->trans("Bzip2")
+	'function' => 'bzopen',
+	'id' => 'radio_compression_bzip',
+	'label' => $langs->trans("Bzip2")
+	);
+	$compression['zstd'] = array(
+		'function' => 'zstd_compress',
+		'id' => 'radio_compression_zstd',
+		'label' => $langs->trans("Zstd")
 	);
 	$compression['none'] = array(
 		'function' => '',
@@ -493,7 +503,6 @@ print "<!--</fieldset>--> <!-- End destination -->\n";
 print '<br>';
 print '<div class="center">';
 print '<input type="submit" class="button reposition" value="'.$langs->trans("GenerateBackup").'" id="buttonGo">';
-print '<input type="hidden" name="page_y" value="'.GETPOST('page_y', 'int').'">';
 print '<br>';
 print '<br>';
 
@@ -513,7 +522,7 @@ if (!empty($_SESSION["commandbackuplastdone"])) {
 	$_SESSION["commandbackupresult"] = '';
 }
 if (!empty($_SESSION["commandbackuptorun"])) {
-	print '<br><font class="warning">'.$langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser", $dolibarr_main_db_user, $dolibarr_main_db_user).':</font><br>'."\n";
+	print '<br><span class="warning">'.$langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser", $dolibarr_main_db_user, $dolibarr_main_db_user).':</span><br>'."\n";
 	print '<textarea id="commandbackuptoruntext" rows="'.ROWS_2.'" class="centpercent">'.$_SESSION["commandbackuptorun"].'</textarea><br>'."\n";
 	print ajax_autoselect("commandbackuptoruntext", 0);
 	print '<br>';
@@ -534,13 +543,11 @@ print "</div> 	<!-- end div fichehalfleft -->\n";
 
 
 print '<div id="backupdatabaseright" class="fichehalfright" style="height:480px; overflow: auto;">';
-print '<div class="ficheaddleft">';
 
 $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"));
 print '<br>';
 
-print '</div>';
 print '</div>';
 print '</form>';
 print '</fieldset>';
@@ -566,7 +573,7 @@ print '<div id="backupfilesleft" class="fichehalfleft">';
 
 print load_fiche_titre($title ? $title : $langs->trans("BackupZipWizard"));
 
-print '<label for="zipfilename_template">'.$langs->trans("FileNameToGenerate").'</label><br>';
+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");
@@ -614,14 +621,12 @@ print '</div>';
 
 print '</div>';
 
-print '<div id="backupdatabaseright" class="fichehalfright" style="height:480px; overflow: auto;">';
-print '<div class="ficheaddleft">';
+print '<div id="backupfileright" class="fichehalfright" style="height:250px; overflow: auto;">';
 
 $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"));
 print '<br>';
 
-print '</div>';
 print '</div>';
 
 print '</fieldset>';
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 0fe8be7d50c..d21622d1f68 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -2,20 +2,21 @@
 /* Copyright (C) 2006-2014  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2011       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2021		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/>.
-*/
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
 
 /**
  *		\file 		htdocs/admin/tools/export.php
@@ -89,7 +90,7 @@ $_SESSION["commandbackuptorun"] = '';
 $_SESSION["commandbackupresult"] = '';
 
 // Increase limit of time. Works only if we are not in safe mode
-$ExecTimeLimit = 600;	// Set it to 0 to not use a forced time limit
+$ExecTimeLimit = 600; // Set it to 0 to not use a forced time limit
 if (!empty($ExecTimeLimit)) {
 	$err = error_reporting();
 	error_reporting(0); // Disable all errors
@@ -215,8 +216,7 @@ if ($errormsg) {
 	}*/
 }
 
+$db->close();
 
 // Redirect to backup page
 header("Location: dolibarr_export.php".(GETPOST('page_y', 'int') ? '?page_y='.GETPOST('page_y', 'int') : ''));
-
-$db->close();
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 384b08e19cf..36be1f273ff 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -2,20 +2,21 @@
 /* Copyright (C) 2006-2014  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2011       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2021		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/>.
-*/
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
 
 /**
  *		\file 		htdocs/admin/tools/export_files.php
@@ -41,7 +42,7 @@ $file = trim(GETPOST('zipfilename_template', 'alpha'));
 $compression = GETPOST('compression', 'aZ09');
 
 $file = dol_sanitizeFileName($file);
-$file = preg_replace('/(\.zip|\.tar|\.tgz|\.gz|\.tar\.gz|\.bz2)$/i', '', $file);
+$file = preg_replace('/(\.zip|\.tar|\.tgz|\.gz|\.tar\.gz|\.bz2|\.zst)$/i', '', $file);
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -97,7 +98,9 @@ if (!empty($ExecTimeLimit)) {
 	@set_time_limit($ExecTimeLimit); // Need more than 240 on Windows 7/64
 	error_reporting($err);
 }
-$MemoryLimit = 0;
+
+/* If value has been forced with a php_admin_value, this has no effect. Example of value: '512M' */
+$MemoryLimit = getDolGlobalString('MAIN_MEMORY_LIMIT_ARCHIVE_DATAROOT');
 if (!empty($MemoryLimit)) {
 	@ini_set('memory_limit', $MemoryLimit);
 }
@@ -124,10 +127,34 @@ $result = dol_mkdir($outputdir);
 
 $utils = new Utils($db);
 
+if ($export_type == 'externalmodule' && ! empty($what)) {
+	$fulldirtocompress = DOL_DOCUMENT_ROOT.'/custom/'.dol_sanitizeFileName($what);
+} else {
+	$fulldirtocompress = DOL_DATA_ROOT;
+}
+$dirtoswitch = dirname($fulldirtocompress);
+$dirtocompress = basename($fulldirtocompress);
+
 if ($compression == 'zip') {
 	$file .= '.zip';
-	$excludefiles = '/(\.back|\.old|\.log|[\/\\\]temp[\/\\\]|documents[\/\\\]admin[\/\\\]documents[\/\\\])/i';
-	$ret = dol_compress_dir(DOL_DATA_ROOT, $outputdir."/".$file, $compression, $excludefiles);
+	$excludefiles = '/(\.back|\.old|\.log|\.pdf_preview-.*\.png|[\/\\\]temp[\/\\\]|documents[\/\\\]admin[\/\\\]documents[\/\\\])/i';
+
+	//var_dump($fulldirtocompress);
+	//var_dump($outputdir."/".$file);exit;
+
+	$rootdirinzip = '';
+	if ($export_type == 'externalmodule' && !empty($what)) {
+		$rootdirinzip = $what;
+
+		global $dolibarr_allow_download_external_modules;
+		if (empty($dolibarr_allow_download_external_modules)) {
+			print 'Download of external modules is not allowed by $dolibarr_allow_download_external_modules in conf.php file';
+			$db->close();
+			exit();
+		}
+	}
+
+	$ret = dol_compress_dir($fulldirtocompress, $outputdir."/".$file, $compression, $excludefiles, $rootdirinzip);
 	if ($ret < 0) {
 		if ($ret == -2) {
 			$langs->load("errors");
@@ -137,16 +164,18 @@ if ($compression == 'zip') {
 			$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputdir);
 		}
 	}
-} elseif (in_array($compression, array('gz', 'bz'))) {
+} elseif (in_array($compression, array('gz', 'bz', 'zstd'))) {
 	$userlogin = ($user->login ? $user->login : 'unknown');
 
 	$outputfile = $conf->admin->dir_temp.'/export_files.'.$userlogin.'.out'; // File used with popen method
 
 	$file .= '.tar';
-	// We also exclude '/temp/' dir and 'documents/admin/documents'
-	$cmd = "tar -cf ".$outputdir."/".$file." --exclude-vcs --exclude 'temp' --exclude 'dolibarr.log' --exclude 'dolibarr_*.log' --exclude 'documents/admin/documents' -C ".dirname(DOL_DATA_ROOT)." ".basename(DOL_DATA_ROOT);
 
-	$result = $utils->executeCLI($cmd, $outputfile);
+	// 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))."'";
+
+	$result = $utils->executeCLI($cmd, $outputfile, 0, null, 1);
 
 	$retval = $result['error'];
 	if ($result['result'] || !empty($retval)) {
@@ -156,9 +185,10 @@ if ($compression == 'zip') {
 	} else {
 		if ($compression == 'gz') {
 			$cmd = "gzip -f ".$outputdir."/".$file;
-		}
-		if ($compression == 'bz') {
+		} elseif ($compression == 'bz') {
 			$cmd = "bzip2 -f ".$outputdir."/".$file;
+		} elseif ($compression == 'zstd') {
+			$cmd = "zstd -z -9 -q --rm ".$outputdir."/".$file;
 		}
 
 		$result = $utils->executeCLI($cmd, $outputfile);
@@ -169,15 +199,37 @@ if ($compression == 'zip') {
 			unlink($outputdir."/".$file);
 		}
 	}
+} else {
+	$errormsg = 'Bad value for compression method';
+	print $errormsg;
 }
 
-if ($errormsg) {
-	setEventMessages($langs->trans("Error")." : ".$errormsg, null, 'errors');
+if ($export_type != 'externalmodule' || empty($what)) {
+	if ($errormsg) {
+		setEventMessages($langs->trans("Error")." : ".$errormsg, null, 'errors');
+	} else {
+		setEventMessages($langs->trans("BackupFileSuccessfullyCreated").'.<br>'.$langs->trans("YouCanDownloadBackupFile"), null, 'mesgs');
+	}
+
+	$db->close();
+
+	// Redirect to calling page
+	$returnto = 'dolibarr_export.php';
+
+	header("Location: ".$returnto);
+	exit();
+} else {
+	$zipname = $outputdir."/".$file;
+
+	// Then download the zipped file.
+	header('Content-Type: application/zip');
+	header('Content-disposition: attachment; filename='.basename($zipname));
+	header('Content-Length: '.filesize($zipname));
+	readfile($zipname);
+
+	dol_delete_file($zipname);
+
+	$db->close();
+
+	exit();
 }
-
-// Redirect t backup page
-header("Location: dolibarr_export.php");
-
-$time_end = time();
-
-$db->close();
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index d09551a5478..1a45466141b 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -73,42 +73,49 @@ $optioncss = GETPOST("optioncss", "aZ"); // Option for the css output (always ''
 $now = dol_now();
 $nowarray = dol_getdate($now);
 
-if (!GETPOSTISSET("date_startmonth")) {
-	$date_start = dol_get_first_day($nowarray['year'], $nowarray['mon'], 'tzuserrel');
-} elseif (GETPOST("date_startmonth") > 0) {
+if (GETPOST("date_startmonth", 'int') > 0) {
 	$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth", 'int'), GETPOST("date_startday", 'int'), GETPOST("date_startyear", 'int'), 'tzuserrel');
 } else {
-	$date_start = -1;
+	$date_start = '';
 }
-if (!GETPOSTISSET("date_endmonth")) {
-	$date_end = dol_get_last_hour(dol_now('gmt'), 'tzuserrel');
-} elseif (GETPOST("date_endmonth") > 0) {
+if (GETPOST("date_endmonth", 'int') > 0) {
 	$date_end = dol_get_last_hour(dol_mktime(23, 59, 59, GETPOST("date_endmonth", 'int'), GETPOST("date_endday", 'int'), GETPOST("date_endyear", 'int'), 'tzuserrel'), 'tzuserrel');
 } else {
-	$date_end = -1;
+	$date_end = '';
 }
 
 // checks:if date_start>date_end  then date_end=date_start + 24 hours
-if ($date_start > 0 && $date_end > 0 && $date_start > $date_end) {
+if ($date_start !== '' && $date_end !== '' && $date_start > $date_end) {
 	$date_end = $date_start + 86400;
 }
 
 
-if (empty($date_start)) { // We define date_start and date_end
-	$date_start = dol_get_first_day($nowarray['year'], $nowarray['mon'], false);
+if (!GETPOSTISSET('pageplusoneold') && !GETPOSTISSET('page') && $date_start === '') { // We define date_start and date_end
+	$date_start = dol_get_first_day($nowarray['year'], $nowarray['mon'], 'tzuserrel');
 }
-if (empty($date_end)) {
-	$date_end = dol_mktime(23, 59, 59, $nowarray['mon'], $nowarray['mday'], $nowarray['year']);
+if (!GETPOSTISSET('pageplusoneold') && !GETPOSTISSET('page') && $date_end === '') {
+	$date_end = dol_get_last_day($nowarray['year'], $nowarray['mon'], 'tzuserrel');
 }
+
 // Set $date_startmonth...
-$tmp = dol_getdate($date_start);
-$date_startday = $tmp['mday'];
-$date_startmonth = $tmp['mon'];
-$date_startyear = $tmp['year'];
-$tmp = dol_getdate($date_end);
-$date_endday = $tmp['mday'];
-$date_endmonth = $tmp['mon'];
-$date_endyear = $tmp['year'];
+$date_startday = '';
+$date_startmonth = '';
+$date_startyear = '';
+$date_endday = '';
+$date_endmonth = '';
+$date_endyear = '';
+if ($date_start !== '') {
+	$tmp = dol_getdate($date_start);
+	$date_startday = $tmp['mday'];
+	$date_startmonth = $tmp['mon'];
+	$date_startyear = $tmp['year'];
+}
+if ($date_end !== '') {
+	$tmp = dol_getdate($date_end);
+	$date_endday = $tmp['mday'];
+	$date_endmonth = $tmp['mon'];
+	$date_endyear = $tmp['year'];
+}
 
 // Add prefix session
 $arrayfields = array(
@@ -120,6 +127,7 @@ $arrayfields = array(
 	)
 );
 
+
 /*
  * Actions
  */
@@ -128,8 +136,14 @@ $now = dol_now();
 
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
-	$date_start = -1;
-	$date_end = -1;
+	$date_start = '';
+	$date_end = '';
+	$date_startday = '';
+	$date_endday = '';
+	$date_startmonth = '';
+	$date_endmonth = '';
+	$date_startyear = '';
+	$date_endyear = '';
 	$search_code = '';
 	$search_ip = '';
 	$search_user = '';
@@ -193,10 +207,10 @@ $sql .= " u.login, u.admin, u.entity, u.firstname, u.lastname, u.statut as statu
 $sql .= " FROM ".MAIN_DB_PREFIX."events as e";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = e.fk_user";
 $sql .= " WHERE e.entity IN (".getEntity('event').")";
-if ($date_start > 0) {
+if ($date_start !== '') {
 	$sql .= " AND e.dateevent >= '".$db->idate($date_start)."'";
 }
-if ($date_end > 0) {
+if ($date_end !== '' ) {
 	$sql .= " AND e.dateevent <= '".$db->idate($date_end)."'";
 }
 if ($search_code) {
@@ -232,8 +246,8 @@ $nbtotalofrecords = '';
 	}
 }*/
 
-$sql .= $db->plimit($conf->liste_limit + 1, $offset);
-//print $sql;
+$sql .= $db->plimit($limit + 1, $offset);
+
 $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
@@ -322,8 +336,8 @@ if ($result) {
 	print '<tr class="liste_titre">';
 
 	print '<td class="liste_titre" width="15%">';
-	print $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzuserrel');
-	print $form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzuserrel');
+	print $form->selectDate($date_start === '' ? -1 : $date_start, 'date_start', 0, 0, 0, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzuserrel');
+	print $form->selectDate($date_end === '' ? -1 : $date_end, 'date_end', 0, 0, 0, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzuserrel');
 	print '</td>';
 
 	print '<td class="liste_titre left">';
@@ -455,9 +469,9 @@ if ($result) {
 
 	if ($num == 0) {
 		if ($usefilter) {
-			print '<tr><td colspan="6">'.$langs->trans("NoEventFoundWithCriteria").'</td></tr>';
+			print '<tr><td colspan="7"><span class="opacitymedium">'.$langs->trans("NoEventFoundWithCriteria").'</span></td></tr>';
 		} else {
-			print '<tr><td colspan="6">'.$langs->trans("NoEventOrNoAuditSetup").'</td></tr>';
+			print '<tr><td colspan="7"><span class="opacitymedium">'.$langs->trans("NoEventOrNoAuditSetup").'</span></td></tr>';
 		}
 	}
 	print "</table>";
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index 10a38fb59a1..cc9aaa356bc 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -47,8 +47,8 @@ if ($user->socid > 0) {
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index eb274163697..f6ce58a40c0 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -121,7 +121,7 @@ print '</td></tr></table>';
 //if ($choice != 'confirm_allfiles')
 //{
 	print '<br>';
-	print '<div class="center"><input class="button" type="submit" value="'.$langs->trans("PurgeRunNow").'"></div>';
+	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("PurgeRunNow").'"></div>';
 //}
 
 print '</form>';
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 8de6e32e8a0..ea9ca86e994 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -116,14 +116,14 @@ print $langs->trans("Upgrade").'<br>';
 print '<hr>';
 print $langs->trans("ThisIsProcessToFollow").'<br>';
 print '<b>'.$langs->trans("StepNb", 1).'</b>: ';
-$fullurl = '<a href="'.$urldolibarr.'" target="_blank">'.$urldolibarr.'</a>';
+$fullurl = '<a href="'.$urldolibarr.'" target="_blank" rel="noopener noreferrer">'.$urldolibarr.'</a>';
 print str_replace('{s}', $fullurl, $langs->trans("DownloadPackageFromWebSite", '{s}')).'<br>';
 print '<b>'.$langs->trans("StepNb", 2).'</b>: ';
 print str_replace('{s}', $dolibarrroot, $langs->trans("UnpackPackageInDolibarrRoot", '{s}')).'<br>';
 print '<b>'.$langs->trans("StepNb", 3).'</b>: ';
 print $langs->trans("RemoveLock", $dolibarrdataroot.'/install.lock').'<br>';
 print '<b>'.$langs->trans("StepNb", 4).'</b>: ';
-$fullurl = '<a href="'.DOL_URL_ROOT.'/install/" target="_blank">'.DOL_URL_ROOT.'/install/</a>';
+$fullurl = '<a href="'.DOL_URL_ROOT.'/install/" target="_blank" rel="noopener noreferrer">'.DOL_URL_ROOT.'/install/</a>';
 print str_replace('{s}', $fullurl, $langs->trans("CallUpdatePage", '{s}')).'<br>';
 print '<b>'.$langs->trans("StepNb", 5).'</b>: ';
 print $langs->trans("RestoreLock", $dolibarrdataroot.'/install.lock').'<br>';
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 7d78297b30d..93f62337746 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -43,11 +43,12 @@ $langcode = GETPOST('langcode', 'alphanohtml');
 $transkey = GETPOST('transkey', 'alphanohtml');
 $transvalue = GETPOST('transvalue', 'restricthtml');
 
+
 $mode = GETPOST('mode', 'aZ09') ? GETPOST('mode', 'aZ09') : 'searchkey';
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -102,6 +103,10 @@ if ($action == 'setMAIN_ENABLE_OVERWRITE_TRANSLATION') {
 }
 
 if ($action == 'update') {
+	if ($transkey == '') {
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Key")), null, 'errors');
+		$error++;
+	}
 	if ($transvalue == '') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NewTranslationStringToShow")), null, 'errors');
 		$error++;
@@ -109,7 +114,7 @@ if ($action == 'update') {
 	if (!$error) {
 		$db->begin();
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."overwrite_trans set transvalue = '".$db->escape($transvalue)."' WHERE rowid = ".GETPOST('rowid', 'int');
+		$sql = "UPDATE ".MAIN_DB_PREFIX."overwrite_trans set transkey = '".$db->escape($transkey)."', transvalue = '".$db->escape($transvalue)."' WHERE rowid = ".((int) GETPOST('rowid', 'int'));
 		$result = $db->query($sql);
 		if ($result > 0) {
 			$db->commit();
@@ -147,7 +152,7 @@ if ($action == 'add') {
 	if (!$error) {
 		$db->begin();
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue, entity) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."', ".$db->escape($conf->entity).")";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue, entity) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."', ".((int) $conf->entity).")";
 		$result = $db->query($sql);
 		if ($result > 0) {
 			$db->commit();
@@ -264,7 +269,7 @@ if ($mode == 'overwrite') {
 	print '<div class="justify"><span class="opacitymedium">';
 	print img_info().' '.$langs->trans("SomeTranslationAreUncomplete");
 	$urlwikitranslatordoc = 'https://wiki.dolibarr.org/index.php/Translator_documentation';
-	print ' ('.str_replace('{s1}', '<a href="'.$urlwikitranslatordoc.'" target="_blank">'.$langs->trans("Here").'</a>', $langs->trans("SeeAlso", '{s1}')).')<br>';
+	print ' ('.str_replace('{s1}', '<a href="'.$urlwikitranslatordoc.'" target="_blank" rel="noopener noreferrer external">'.$langs->trans("Here").'</a>', $langs->trans("SeeAlso", '{s1}')).')<br>';
 	print $langs->trans("TranslationOverwriteDesc", $langs->transnoentitiesnoconv("Language"), $langs->transnoentitiesnoconv("Key"), $langs->transnoentitiesnoconv("NewTranslationStringToShow"))."\n";
 	print ' ('.$langs->trans("TranslationOverwriteDesc2").').'."<br>\n";
 	print '</span></div>';
@@ -325,7 +330,13 @@ if ($mode == 'overwrite') {
 			print '<tr class="oddeven">';
 
 			print '<td>'.$obj->lang.'</td>'."\n";
-			print '<td>'.$obj->transkey.'</td>'."\n";
+			print '<td>';
+			if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int')) {
+				print '<input type="text" class="quatrevingtpercent" name="transkey" value="'.dol_escape_htmltag($obj->transkey).'">';
+			} else {
+				print $obj->transkey;
+			}
+			print '</td>'."\n";
 
 			// Value
 			print '<td class="small">';
@@ -348,7 +359,7 @@ if ($mode == 'overwrite') {
 				print ' &nbsp; ';
 				print '<input type="submit" class="button buttongen button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 			} else {
-				print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.urlencode($mode).'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
+				print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.urlencode($mode).'&action=edit&token='.newToken().''.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
 				print ' &nbsp; ';
 				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.urlencode($mode).'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
 			}
@@ -448,12 +459,14 @@ 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("TranslationKeySearch");
+	$title = $langs->trans("Translation");
 	if ($nbtotalofrecords > 0) {
 		$title .= ' <span class="opacitymedium colorblack paddingleft">('.$nbtotalofrecords.' / '.$nbtotalofrecordswithoutfilters.' - '.$nbtotaloffiles.' '.$langs->trans("Files").')</span>';
 	}
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
+	$massactionbutton = '';
+
 	print '<input type="hidden" id="action" name="action" value="search">';
 	print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
 
@@ -465,9 +478,9 @@ if ($mode == 'searchkey') {
 	print $formadmin->select_language($langcode, 'langcode', 0, null, 0, 0, 0, 'maxwidth250', 1);
 	print '</td>'."\n";
 	print '<td>';
-	print '<input type="text" class="flat maxwidthonsmartphone" name="transkey" value="'.$transkey.'">';
+	print '<input type="text" class="flat maxwidthonsmartphone" name="transkey" value="'.dol_escape_htmltag($transkey).'">';
 	print '</td><td>';
-	print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.$transvalue.'">';
+	print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.dol_escape_htmltag($transvalue).'">';
 	// Limit to superadmin
 	/*if (! empty($conf->multicompany->enabled) && !$user->entity)
 	{
@@ -480,7 +493,7 @@ if ($mode == 'searchkey') {
 	//}
 	print '</td>';
 	// Action column
-	print '<td class="nowraponall">';
+	print '<td class="right nowraponall">';
 	$searchpicto = $form->showFilterAndCheckAddButtons(!empty($massactionbutton) ? 1 : 0, 'checkforselect', 1);
 	print $searchpicto;
 	print '</td>';
@@ -533,9 +546,9 @@ if ($mode == 'searchkey') {
 				if ($result) {
 					$obj = $db->fetch_object($result);
 				}
-				print '<a class="editfielda reposition marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&mode=overwrite&action=edit">'.img_edit().'</a>';
+				print '<a class="editfielda reposition marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&mode=overwrite&action=edit&token='.newToken().'">'.img_edit().'</a>';
 				print ' ';
-				print '<a class="marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&mode='.urlencode($mode).'&action=delete&mode='.urlencode($mode).'&token='.newToken().'">'.img_delete().'</a>';
+				print '<a class="marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&mode='.urlencode($mode).'&action=delete&token='.newToken().'&mode='.urlencode($mode).'">'.img_delete().'</a>';
 				print '&nbsp;&nbsp;';
 				$htmltext = $langs->trans("OriginalValueWas", '<i>'.$newlangfileonly->tab_translate[$key].'</i>');
 				print $form->textwithpicto('', $htmltext, 1, 'info');
@@ -544,7 +557,7 @@ if ($mode == 'searchkey') {
 				print '<a class="reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=overwrite&langcode='.urlencode($langcode).'&transkey='.urlencode($key).'">'.img_edit_add($langs->trans("TranslationOverwriteKey")).'</a>';
 			}
 
-			if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+			if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
 				$transifexlangfile = '$'; // $ means 'All'
 				//$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?key='.$key;
 				$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?q=key%3A'.$key;
@@ -562,9 +575,9 @@ if ($mode == 'searchkey') {
 			if ($result) {
 				$obj = $db->fetch_object($result);
 			}
-			print '<a class="editfielda reposition marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&mode=overwrite&action=edit">'.img_edit().'</a>';
+			print '<a class="editfielda reposition marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&mode=overwrite&action=edit&token='.newToken().'">'.img_edit().'</a>';
 			print ' ';
-			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&mode='.urlencode($mode).'&action=delete&mode='.urlencode($mode).'&token='.newToken().'">'.img_delete().'</a>';
+			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&mode='.urlencode($mode).'&action=delete&token='.newToken().'&mode='.urlencode($mode).'">'.img_delete().'</a>';
 			print '&nbsp;&nbsp;';
 
 			$htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key);
diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php
index 5ea74205c9c..a1f8496ad6d 100644
--- a/htdocs/admin/triggers.php
+++ b/htdocs/admin/triggers.php
@@ -70,10 +70,10 @@ print '</tr>';
 
 foreach ($triggers as $trigger) {
 	print '<tr class="oddeven">';
-	print '<td class="tdtop" width="32">'.$trigger['picto'].'</td>';
-	print '<td class="tdtop">'.$trigger['file'].'</td>';
-	print '<td valign="top" align="center">'.$trigger['status'].'</td>';
-	print '<td class="tdtop">';
+	print '<td class=" width="32">'.$trigger['picto'].'</td>';
+	print '<td>'.$trigger['file'].'</td>';
+	print '<td class="center">'.$trigger['status'].'</td>';
+	print '<td>';
 	$text = $trigger['info'];
 	$text .= "<br>\n<strong>".$langs->trans("File")."</strong>:<br>\n".$trigger['relpath'];
 	//$text.="\n".$langs->trans("ExternalModule",$trigger['isocreorexternal']);
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index da3a1913d64..53de8fe2502 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -43,9 +43,11 @@ $extrafields = new ExtraFields($db);
 
 $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('scandir', 'alpha');
 $type = 'user';
 
@@ -147,9 +149,9 @@ if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('USER_MAIL_REQUIRED');
 } else {
 	if (empty($conf->global->USER_MAIL_REQUIRED)) {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_USER_MAIL_REQUIRED&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_USER_MAIL_REQUIRED&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	} else {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_USER_MAIL_REQUIRED&amp;token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_USER_MAIL_REQUIRED&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td></tr>';
@@ -165,9 +167,9 @@ if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('USER_HIDE_INACTIVE_IN_COMBOBOX');
 } else {
 	if (empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX)) {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_USER_HIDE_INACTIVE_IN_COMBOBOX">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_USER_HIDE_INACTIVE_IN_COMBOBOX&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	} else {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_USER_HIDE_INACTIVE_IN_COMBOBOX">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_USER_HIDE_INACTIVE_IN_COMBOBOX&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td></tr>';
@@ -256,13 +258,13 @@ foreach ($dirmodels as $reldir) {
 								// Active
 								if (in_array($name, $def)) {
 									print '<td class="center">'."\n";
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&amp;token='.newToken().'&amp;value='.$name.'">';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&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_default&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<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 "</td>";
 								}
 
@@ -271,7 +273,7 @@ foreach ($dirmodels as $reldir) {
 								if (getDolGlobalString('USER_ADDON_PDF_ODT') == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<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>';
 								}
 								print '</td>';
 
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index b73d3ce4f22..709b60068f7 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -42,6 +42,8 @@ $extrafields = new ExtraFields($db);
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $type = 'group';
 
 /*
@@ -188,13 +190,13 @@ foreach ($dirmodels as $reldir) {
 								// Active
 								if (in_array($name, $def)) {
 									print '<td class="center">'."\n";
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&amp;token='.newToken().'&amp;value='.$name.'">';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&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_default&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<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 "</td>";
 								}
 
@@ -203,7 +205,7 @@ foreach ($dirmodels as $reldir) {
 								if ($conf->global->USERGROUP_ADDON_PDF == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<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>';
 								}
 								print '</td>';
 
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 864bb39798b..d1a24ff072c 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -460,7 +460,7 @@ if ($id) {
 			if ($valuetoshow != '') {
 				print '<td class="'.$align.'">';
 				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
-					print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+					print '<a href="'.$tabhelp[$id][$value].'" target="_blank" rel="noopener noreferrer">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
 				} elseif (!empty($tabhelp[$id][$value])) {
 					if ($value == 'virtualhost') {
 						print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltipvirtual');
@@ -498,7 +498,7 @@ if ($id) {
 
 		print '<td colspan="3" class="right">';
 		if ($action != 'edit') {
-			print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+			print '<input type="submit" class="button button-add" name="actionadd" value="'.$langs->trans("Add").'">';
 		}
 		print '</td>';
 		print "</tr>";
@@ -580,7 +580,7 @@ if ($id) {
 						fieldListWebsites($fieldlist, $obj, $tabname[$id], 'edit');
 					}
 
-					print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+					print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button button-edit" name="actionmodify" value="'.$langs->trans("Modify").'">';
 					print '&nbsp;<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
 				} else {
 					$tmpaction = 'view';
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index f72235eb8b0..f6c92888384 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -136,7 +136,7 @@ if ($action == 'edit') {
 	print '</table>';
 
 	print '<div class="tabsAction">';
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 	print '</div>';
 }
 
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 09156e08588..a58c3378ecd 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -91,15 +91,21 @@ $workflowcodes = array(
 	),
 
 	// Automatic classification of order
-	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING'=>array(
+	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING'=>array(  // when shipping validated
 		'family'=>'classify_order',
 		'position'=>40,
 		'enabled'=>(!empty($conf->expedition->enabled) && !empty($conf->commande->enabled)),
 		'picto'=>'order'
 	),
-	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array(
+	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED'=>array( // when shipping closed
 		'family'=>'classify_order',
 		'position'=>41,
+		'enabled'=>(!empty($conf->expedition->enabled) && !empty($conf->commande->enabled)),
+		'picto'=>'order'
+	),
+	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array(
+		'family'=>'classify_order',
+		'position'=>42,
 		'enabled'=>(!empty($conf->facture->enabled) && !empty($conf->commande->enabled)),
 		'picto'=>'order',
 		'warning'=>''
@@ -117,9 +123,25 @@ $workflowcodes = array(
 	),
 
 	// Automatic classification supplier order
+	'WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION'=>array(
+		'family'=>'classify_supplier_order',
+		'position'=>63,
+		'enabled'=>(!empty($conf->global->MAIN_FEATURES_LEVEL) && (!empty($conf->reception->enabled)) && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || empty($conf->supplier_order->enabled))),
+		'picto'=>'supplier_order',
+		'warning'=>''
+	),
+
+	'WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED'=>array(
+		'family'=>'classify_supplier_order',
+		'position'=>64,
+		'enabled'=>(!empty($conf->global->MAIN_FEATURES_LEVEL) && (!empty($conf->reception->enabled)) && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || empty($conf->supplier_order->enabled))),
+		'picto'=>'supplier_order',
+		'warning'=>''
+	),
+
 	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER'=>array(
 		'family'=>'classify_supplier_order',
-		'position'=>62,
+		'position'=>65,
 		'enabled'=>((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)),
 		'picto'=>'supplier_order',
 		'warning'=>''
@@ -128,7 +150,7 @@ $workflowcodes = array(
 	// Automatic classification reception
 	'WORKFLOW_BILL_ON_RECEPTION'=>array(
 		'family'=>'classify_reception',
-		'position'=>64,
+		'position'=>80,
 		'enabled'=>(!empty($conf->reception->enabled) && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))),
 		'picto'=>'reception'
 	),
@@ -136,7 +158,7 @@ $workflowcodes = array(
 	// Automatic classification shipping
 	'WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE' => array(
 		'family' => 'classify_shipping',
-		'position' => 66,
+		'position' => 90,
 		'enabled' => ! empty($conf->expedition->enabled) && ! empty($conf->facture->enabled),
 		'picto' => 'shipment'
 	)
@@ -244,11 +266,11 @@ foreach ($workflowcodes as $key => $params) {
 		print ajax_constantonoff($key);
 	} else {
 		if (!empty($conf->global->$key)) {
-			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=del'.$key.'&amp;token='.newToken().'">';
+			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=del'.$key.'&token='.newToken().'">';
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a>';
 		} else {
-			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=set'.$key.'&amp;token='.newToken().'">';
+			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=set'.$key.'&token='.newToken().'">';
 			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a>';
 		}
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
old mode 100755
new mode 100644
index 1157000fd6b..58118827ed4
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -26,8 +26,8 @@
 require "../main.inc.php";
 
 // Libraries
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once DOL_DOCUMENT_ROOT . '/workstation/lib/workstation.lib.php';
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT.'/workstation/lib/workstation.lib.php';
 //require_once "../class/myclass.class.php";
 
 // Translations
@@ -36,6 +36,7 @@ $langs->loadLangs(array("admin", "workstation"));
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
 $value = GETPOST('value', 'alpha');
 
@@ -214,7 +215,7 @@ if ($action == 'edit') {
 		print '</table>';
 
 		print '<div class="tabsAction">';
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 		print '</div>';
 	}/* else {
 		print '<br>'.$langs->trans("NothingToSetup");
@@ -286,7 +287,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 									$langs->load("errors");
 									print '<div class="error">'.$langs->trans($tmp).'</div>';
 								} elseif ($tmp == 'NotConfigured') {
-									print $langs->trans($tmp);
+									print '<span class="opacitymedium">'.$langs->trans($tmp).'</span>';
 								} else {
 									print $tmp;
 								}
@@ -423,13 +424,13 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Active
 										if (in_array($name, $def)) {
 											print '<td class="center">'."\n";
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
+											print '<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&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+											print '<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>";
 										}
 
diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index 1697318c5e8..82486e836bc 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -38,7 +38,7 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 
-//Activate ProfId
+// Activate Production mode
 if ($action == 'setproductionmode') {
 	$status = GETPOST('status', 'alpha');
 
@@ -69,6 +69,18 @@ if ($action == 'setproductionmode') {
 	}
 }
 
+// Disable compression mode
+if ($action == 'setdisablecomprssion') {
+	$status = GETPOST('status', 'alpha');
+
+	if (dolibarr_set_const($db, 'API_DISABLE_COMPRESSION', $status, 'chaine', 0, '', 0) > 0) {
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
+}
+
 if ($action == 'save') {
 	dolibarr_set_const($db, 'API_RESTRICT_ON_IP', GETPOST('API_RESTRICT_ON_IP', 'alpha'));
 }
@@ -116,6 +128,21 @@ if ($production_mode) {
 print '<td>&nbsp;</td>';
 print '</tr>';
 
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("API_DISABLE_COMPRESSION").'</td>';
+$disable_compression = (empty($conf->global->API_DISABLE_COMPRESSION) ?false:true);
+if ($disable_compression) {
+	print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisablecomprssion&token='.newToken().'&value='.($i + 1).'&status=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
+} else {
+	print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisablecomprssion&token='.newToken().'&value='.($i + 1).'&status=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
+}
+print '<td>&nbsp;</td>';
+print '</tr>';
+
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("RESTRICT_ON_IP");
 print ' '.$langs->trans("Example").': '.$langs->trans("IPListExample");
@@ -152,11 +179,11 @@ print '<br>';
 print '<span class="opacitymedium">'.$langs->trans("ApiExporerIs").':</span><br>';
 if (dol_is_dir(DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/explorer')) {
 	$url = DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
-	print '<div class="urllink soixantepercent">'.img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a></div><br>\n";
+	print '<div class="urllink soixantepercent">'.img_picto('', 'globe').' <a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.$url."</a></div><br>\n";
 	print '<div class="opacitymediumxxx"><br><span class="opacitymedium">'.$langs->trans("SwaggerDescriptionFile").':</span><br>';
 	$urlswagger = DOL_MAIN_URL_ROOT.'/api/index.php/explorer/swagger.json?DOLAPIKEY=youruserapikey';
 	//$urlswaggerreal = DOL_MAIN_URL_ROOT.'/api/index.php/explorer/swagger.json?DOLAPIKEY='.$user->api_key;
-	print '<div class="urllink soixantepercent">'.img_picto('', 'globe').' <a href="'.$urlswagger.'" target="_blank">'.$urlswagger."</a></div><br>\n";
+	print '<div class="urllink soixantepercent">'.img_picto('', 'globe').' <a href="'.$urlswagger.'" target="_blank" rel="noopener noreferrer">'.$urlswagger."</a></div><br>\n";
 	print '</div>';
 } else {
 	$langs->load("errors");
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 0a84de7b7c1..2a6b5f33a27 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -110,6 +110,8 @@ class DolibarrApi
 		unset($object->ismultientitymanaged);
 		unset($object->restrictiononfksoc);
 		unset($object->table_rowid);
+		unset($object->pass);
+		unset($object->pass_indatabase);
 
 		// Remove linkedObjects. We should already have linkedObjectsIds that avoid huge responses
 		unset($object->linkedObjects);
@@ -292,73 +294,29 @@ class DolibarrApi
 	/**
 	 * Return if a $sqlfilters parameter is valid
 	 *
-	 * @param  string   $sqlfilters     sqlfilter string
-	 * @return boolean                  True if valid, False if not valid
+	 * @param  	string   		$sqlfilters     sqlfilter string
+	 * @param	string			$error			Error message
+	 * @return 	boolean|string   				True if valid, False if not valid
 	 */
-	protected function _checkFilters($sqlfilters)
+	protected function _checkFilters($sqlfilters, &$error = '')
 	{
 		// phpcs:enable
-		//$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-		//$tmp=preg_replace_all('/'.$regexstring.'/', '', $sqlfilters);
-		$tmp = $sqlfilters;
-		$ok = 0;
-		$i = 0; $nb = strlen($tmp);
-		$counter = 0;
-		while ($i < $nb) {
-			if ($tmp[$i] == '(') {
-				$counter++;
-			}
-			if ($tmp[$i] == ')') {
-				$counter--;
-			}
-			if ($counter < 0) {
-				$error = "Bad sqlfilters=".$sqlfilters;
-				dol_syslog($error, LOG_WARNING);
-				return false;
-			}
-			$i++;
-		}
-		return true;
+
+		return dolCheckFilters($sqlfilters, $error);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
-	 * Function to forge a SQL criteria
+	 * Function to forge a SQL criteria from a Generic filter string
 	 *
 	 * @param  array    $matches    Array of found string by regex search.
-	 * 								Example: "t.ref:like:'SO-%'" or "t.date_creation:<:'20160101'" or "t.date_creation:<:'2016-01-01 12:30:00'" or "t.nature:is:NULL"
+	 * 								Each entry is 1 and only 1 criteria.
+	 * 								Example: "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"
 	 * @return string               Forged criteria. Example: "t.field like 'abc%'"
 	 */
 	protected static function _forge_criteria_callback($matches)
 	{
-		// phpcs:enable
-		global $db;
-
-		//dol_syslog("Convert matches ".$matches[1]);
-		if (empty($matches[1])) {
-			return '';
-		}
-		$tmp = explode(':', $matches[1], 3);
-
-		if (count($tmp) < 3) {
-			return '';
-		}
-
-		$operand = preg_replace('/[^a-z0-9\._]/i', '', trim($tmp[0]));
-
-		$operator = strtoupper(preg_replace('/[^a-z<>=]/i', '', trim($tmp[1])));
-
-		$tmpescaped = trim($tmp[2]);
-		$regbis = array();
-		if ($operator == 'IN') {
-			$tmpescaped = "(".$db->sanitize($tmpescaped, 1).")";
-		} elseif (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis)) {
-			$tmpescaped = "'".$db->escape($regbis[1])."'";
-		} else {
-			$tmpescaped = $db->sanitize($db->escape($tmpescaped));
-		}
-
-		return $db->escape($operand).' '.$db->escape($operator)." ".$tmpescaped;
+		return dolForgeCriteriaCallback($matches);
 	}
 }
diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
index 5a4097b089b..f885677225e 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -152,6 +152,7 @@ class DolibarrApiAccess implements iAuthenticate
 
 			// Set the property $user to the $user of API
 			static::$user = $fuser;
+
 			// Set also the global variable $user to the $user of API
 			$user = $fuser;
 
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 3b6e89c6643..28dbef6887e 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -120,7 +120,7 @@ class Documents extends DolibarrApi
 	 *
 	 * Test sample 1: { "modulepart": "invoice", "original_file": "FA1701-001/FA1701-001.pdf", "doctemplate": "crabe", "langcode": "fr_FR" }.
 	 *
-	 * @param   string  $modulepart    Name of module or area concerned by file download ('invoice', 'order', ...).
+	 * @param   string  $modulepart		Name of module or area concerned by file download ('thirdparty', 'member', 'proposal', 'supplier_proposal', 'order', 'supplier_order', 'invoice', 'supplier_invoice', 'shipment', 'project',  ...)
 	 * @param   string  $original_file  Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf).
 	 * @param	string	$doctemplate	Set here the doc template to use for document generation (If not set, use the default template).
 	 * @param	string	$langcode		Language code like 'en_US', 'fr_FR', 'es_ES', ... (If not set, use the default language).
@@ -325,6 +325,20 @@ class Documents extends DolibarrApi
 				throw new RestException(404, 'Proposal not found');
 			}
 
+			$upload_dir = $conf->propal->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object, 'propal');
+		} elseif ($modulepart == 'supplier_proposal') {
+			require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+
+			if (!DolibarrApiAccess::$user->rights->supplier_proposal->read) {
+				throw new RestException(401);
+			}
+
+			$object = new Propal($this->db);
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
+				throw new RestException(404, 'Supplier proposal not found');
+			}
+
 			$upload_dir = $conf->propal->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object, 'propal');
 		} elseif ($modulepart == 'commande' || $modulepart == 'order') {
 			require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
@@ -340,6 +354,22 @@ class Documents extends DolibarrApi
 			}
 
 			$upload_dir = $conf->commande->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'commande');
+		} elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order') {
+			$modulepart = 'supplier_order';
+
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+
+			if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->lire) && empty(DolibarrApiAccess::$user->rights->supplier_order->lire)) {
+				throw new RestException(401);
+			}
+
+			$object = new CommandeFournisseur($this->db);
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
+				throw new RestException(404, 'Purchase order not found');
+			}
+
+			$upload_dir = $conf->fournisseur->dir_output."/facture/".get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').dol_sanitizeFileName($object->ref);
 		} elseif ($modulepart == 'shipment' || $modulepart == 'expedition') {
 			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
@@ -373,7 +403,7 @@ class Documents extends DolibarrApi
 
 			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 
-			if (!DolibarrApiAccess::$user->rights->fournisseur->facture->lire) {
+			if (empty(DolibarrApiAccess::$user->rights->fournisseur->facture->lire) && empty(DolibarrApiAccess::$user->rights->supplier_invoice->lire)) {
 				throw new RestException(401);
 			}
 
@@ -467,11 +497,11 @@ class Documents extends DolibarrApi
 			throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(!empty($object->ref) ? ' or Ref '.$object->ref : '').' does not return any document.');
 		} else {
 			if (($object->id) > 0 && !empty($modulepart)) {
-				require_once DOL_DOCUMENT_ROOT . '/ecm/class/ecmfiles.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 				$ecmfile = new EcmFiles($this->db);
 				$result = $ecmfile->fetchAll('', '', 0, 0, array('t.src_object_type' => $modulepart, 't.src_object_id' => $object->id));
 				if ($result < 0) {
-					throw new RestException(503, 'Error when retrieve ecm list : ' . $this->db->lasterror());
+					throw new RestException(503, 'Error when retrieve ecm list : '.$this->db->lasterror());
 				} elseif (is_array($ecmfile->lines) && count($ecmfile->lines) > 0) {
 					$filearray['ecmfiles_infos'] = $ecmfile->lines;
 				}
@@ -594,6 +624,9 @@ class Documents extends DolibarrApi
 			} elseif ($modulepart == 'expensereport') {
 				require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 				$object = new ExpenseReport($this->db);
+			} elseif ($modulepart == 'fichinter') {
+				require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+				$object = new Fichinter($this->db);
 			} elseif ($modulepart == 'adherent' || $modulepart == 'member') {
 				$modulepart = 'adherent';
 				require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index f54fd08275a..5282a43dacc 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -44,8 +44,9 @@ class Login
 	 * Login
 	 *
 	 * Request the API token for a couple username / password.
-	 * Using method POST is recommanded for security reasons (method GET is often logged by default by web servers with parameters so with login and pass into server log file).
-	 * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "DOLAPIKEY" into field at the top right of page. Note: The API token (DOLAPIKEY) can be found/set on the user page.
+	 * WARNING: You should NEVER use this API, like you should never use the similare API that uses the POST method. This will expose your password.
+	 * To use the APIs, you should instead set an API token to the user you want to allow to use API (This API token called DOLAPIKEY can be found/set on the user page) and use this token as credential for any API call.
+	 * From the API explorer, you can enter directly the "DOLAPIKEY" into the field at the top right of the page to get access to any allowed APIs.
 	 *
 	 * @param   string  $login			User login
 	 * @param   string  $password		User password
@@ -67,8 +68,9 @@ class Login
 	 * Login
 	 *
 	 * Request the API token for a couple username / password.
-	 * Using method POST is recommanded for security reasons (method GET is often logged by default by web servers with parameters so with login and pass into server log file).
-	 * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "DOLAPIKEY" into field at the top right of page. Note: The API token (DOLAPIKEY) can be found/set on the user page.
+	 * WARNING: You should NEVER use this API, like you should never use the similare API that uses the POST method. This will expose your password.
+	 * To use the APIs, you should instead set an API token to the user you want to allow to use API (This API token called DOLAPIKEY can be found/set on the user page) and use this token as credential for any API call.
+	 * From the API explorer, you can enter directly the "DOLAPIKEY" into the field at the top right of the page to get access to any allowed APIs.
 	 *
 	 * @param   string  $login			User login
 	 * @param   string  $password		User password
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 9856acfacdc..15a29c0e18b 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2017	Regis Houssin	        <regis.houssin@inodbox.com>
  * Copyright (C) 2017	Neil Orley	            <neil.orley@oeris.fr>
  * Copyright (C) 2018-2021   Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2018-2020   Thibault FOUCART        <support@ptibogxiv.net>
+ * Copyright (C) 2018-2022   Thibault FOUCART        <support@ptibogxiv.net>
  *
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@ use Luracast\Restler\RestException;
 require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/cstate.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
-
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php';
 
 /**
  * API class for dictionaries
@@ -76,8 +76,9 @@ class Setup extends DolibarrApi
 		$sql .= " WHERE t.active = ".((int) $active);
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+			$errormessage = '';
+			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -139,8 +140,9 @@ class Setup extends DolibarrApi
 		$sql .= " WHERE t.active = ".((int) $active);
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+			$errormessage = '';
+			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -203,8 +205,9 @@ class Setup extends DolibarrApi
 		$sql .= " AND t.active = ".((int) $active);
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+			$errormessage = '';
+			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -267,8 +270,9 @@ class Setup extends DolibarrApi
 		$sql .= " WHERE 1 = 1";
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -367,8 +371,9 @@ class Setup extends DolibarrApi
 		$sql .= " WHERE 1 = 1";
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -542,10 +547,11 @@ class Setup extends DolibarrApi
 		$sql .= " WHERE t.active = ".((int) $active);
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+			$errormessage = '';
+			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).")";
 		}
 
@@ -657,8 +663,9 @@ class Setup extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -720,8 +727,9 @@ class Setup extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -787,8 +795,9 @@ class Setup extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -849,8 +858,9 @@ class Setup extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -921,8 +931,9 @@ class Setup extends DolibarrApi
 
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -991,8 +1002,9 @@ class Setup extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -1064,8 +1076,9 @@ class Setup extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -1128,8 +1141,9 @@ class Setup extends DolibarrApi
 		$sql .= " AND t.active = ".((int) $active);
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			$errormessage = '';
+			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+				throw new RestException(400, 'error when validating parameter sqlfilters -> '.$errormessage);
 			}
 				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1186,8 +1200,9 @@ class Setup extends DolibarrApi
 		$sql .= " AND t.active = ".((int) $active);
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			$errormessage = '';
+			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+				throw new RestException(400, 'error when validating parameter sqlfilters -> '.$errormessage);
 			}
 				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1239,14 +1254,14 @@ class Setup extends DolibarrApi
 	{
 		$list = array();
 
-		//TODO link with multicurrency module
 		$sql = "SELECT t.rowid, t.code, t.label,t.short_label, t.active, t.scale, t.unit_type";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
 		$sql .= " WHERE t.active = ".((int) $active);
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -1279,6 +1294,128 @@ class Setup extends DolibarrApi
 		return $list;
 	}
 
+	/**
+	 * Get the list of legal form of business.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $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
+	 *
+	 * @url     GET dictionary/legal_form
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfLegalForm($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $country = '', $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT t.rowid, t.code, t.fk_pays, t.libelle, t.isvatexempted, t.active, t.module, t.position";
+		$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)."'";
+		}
+		// 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, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of legal form: '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of staff.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Staff 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 staff
+	 *
+	 * @url     GET dictionary/staff
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfStaff($sortfield = "id", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT t.id, t.code, t.libelle, t.active, t.module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_effectif as t";
+		$sql .= " WHERE t.active = ".((int) $active);
+		// 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, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of staff: '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
 	/**
 	 * Get the list of social networks.
 	 *
@@ -1310,8 +1447,9 @@ class Setup extends DolibarrApi
 		$sql .= " AND t.active = ".((int) $active);
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -1368,8 +1506,9 @@ class Setup extends DolibarrApi
 		$sql .= " WHERE t.active = ".((int) $active);
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -1426,8 +1565,9 @@ class Setup extends DolibarrApi
 		$sql .= " WHERE t.active = ".((int) $active);
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -1486,8 +1626,9 @@ class Setup extends DolibarrApi
 		// if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			$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).")";
@@ -1580,6 +1721,66 @@ class Setup extends DolibarrApi
 		return $this->_cleanObjectDatas($mysoc);
 	}
 
+	/**
+	 * Get the list of establishments.
+	 *
+	 * @return array				List of establishments
+	 *
+	 * @url     GET /establishments
+	 *
+	 * @throws RestException
+	 */
+	public function getEstablishments()
+	{
+		$list = array();
+
+		$limit = 0;
+
+		$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').')';
+		// if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
+		// if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of establishments : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get establishment by ID.
+	 *
+	 * @param int       $id        ID of establishment
+	 * @return array    		   Array of cleaned object properties
+	 *
+	 * @url     GET establishments/{id}
+	 *
+	 * @throws RestException
+	 */
+	public function getEtablishmentByID($id)
+	{
+		$establishment = new Establishment($this->db);
+
+		$result = $establishment->fetch($id);
+		if ($result < 0) {
+			throw new RestException(503, 'Error when retrieving state : '.$establishment->error);
+		} elseif ($result == 0) {
+			throw new RestException(404, 'Establishment not found');
+		}
+
+		return $this->_cleanObjectDatas($establishment);
+	}
 
 	/**
 	 * Get value of a setup variables
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index d19754f9c35..420338f2a9d 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -55,12 +55,28 @@ 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")) {
@@ -304,7 +320,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;
 			}
@@ -343,14 +359,34 @@ if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' &&
 //exit;
 
 // We do not want that restler outputs data if we use native compression (default behaviour) but we want to have it returned into a string.
-Luracast\Restler\Defaults::$returnResponse = (empty($conf->global->API_DISABLE_COMPRESSION) && !empty($_SERVER['HTTP_ACCEPT_ENCODING']));
+// If API_DISABLE_COMPRESSION is set, returnResponse is false => It use default handling so output result directly.
+$usecompression = (empty($conf->global->API_DISABLE_COMPRESSION) && !empty($_SERVER['HTTP_ACCEPT_ENCODING']));
+$foundonealgorithm = 0;
+if ($usecompression) {
+	if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && is_callable('brotli_compress')) {
+		$foundonealgorithm++;
+	}
+	if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && is_callable('bzcompress')) {
+		$foundonealgorithm++;
+	}
+	if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && is_callable('gzencode')) {
+		$foundonealgorithm++;
+	}
+	if (!$foundonealgorithm) {
+		$usecompression = false;
+	}
+}
+
+//dol_syslog('We found some compression algoithm: '.$foundonealgorithm.' -> usecompression='.$usecompression, LOG_DEBUG);
+
+Luracast\Restler\Defaults::$returnResponse = $usecompression;
 
 // Call API (we suppose we found it).
 // The handle will use the file api/temp/routes.php to get data to run the API. If the file exists and the entry for API is not found, it will return 404.
 $result = $api->r->handle();
 
 if (Luracast\Restler\Defaults::$returnResponse) {
-	// We try to compress data
+	// We try to compress the data received data
 	if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && is_callable('brotli_compress')) {
 		header('Content-Encoding: br');
 		$result = brotli_compress($result, 11, BROTLI_TEXT);
@@ -360,6 +396,10 @@ if (Luracast\Restler\Defaults::$returnResponse) {
 	} elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && is_callable('gzencode')) {
 		header('Content-Encoding: gzip');
 		$result = gzencode($result, 9);
+	} else {
+		header('Content-Encoding: text/html');
+		print "No compression method found. Try to disable compression by adding API_DISABLE_COMPRESSION=1";
+		exit(0);
 	}
 
 	// Restler did not output data yet, we return it now
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index c6cd45a0cc5..a90c2b479c4 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -81,9 +81,7 @@ if ($action == 'edit') {
 
 	print '</table>';
 
-	print '<br><div class="center">';
-	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel("Save", '');
 
 	print '</form>';
 	print '<br>';
@@ -100,7 +98,7 @@ if ($action == 'edit') {
 	print '</table>';
 
 	print '<div class="tabsAction">';
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 	print '</div>';
 }
 
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index 3d722bca400..35c0ffcff88 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -81,6 +81,8 @@ $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;
+
 
 /*
  * Actions
@@ -93,12 +95,17 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
-	$error = 0;
+	$backurlforlist = DOL_URL_ROOT.'/asset/list.php';
 
-	$backurlforlist = dol_buildpath('/asset/list.php', 1);
-
-	// Actions cancel, add, update or delete
-	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.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/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
 
 	// 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';
@@ -169,11 +176,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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 $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 
@@ -210,9 +213,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	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->buttonsSaveCancel();
 
 	print '</form>';
 }
@@ -246,7 +247,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/asset/list.php', 1).'?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">';
 	/*
@@ -293,13 +294,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		if (empty($reshook)) {
 			if ($user->rights->asset->write) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
+				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";
 			}
 
 			if ($user->rights->asset->delete) {
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+				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";
 			}
@@ -315,8 +316,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$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
+		$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', $filename, $filedir, $urlsource, 0, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
 
@@ -324,7 +325,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('asset'));
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		$MAXEVENT = 10;
 
@@ -333,9 +334,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, 'asset', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+		$somethingshown = $formactions->showactions($object, $object->element, $socid, 1, '', $MAXEVENT, '', $morehtmlright);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 }
 
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 66cd9bcb4cf..e5ec21bfa6d 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -57,6 +57,7 @@ class Asset extends CommonObject
 
 	const STATUS_DRAFT = 0;
 	const STATUS_VALIDATED = 1;
+	const STATUS_CANCELED = 9;
 
 
 	/**
@@ -95,7 +96,7 @@ class Asset extends CommonObject
 		'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', '-1'=>'Cancel')),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Active', '9'=>'Cancel')),
 	);
 
 	/**
@@ -389,11 +390,11 @@ class Asset extends CommonObject
 
 		$langs->load("contracts");
 		$labelStatus = array();
-		$labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
-		$labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+		$labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
+		$labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
 		$labelStatusShort = array();
-		$labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled');
-		$labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+		$labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
+		$labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
 
 		$statusType = 'status0';
 		if ($status == self::STATUS_VALIDATED) {
diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php
index 335cd63115a..be8643e3f20 100644
--- a/htdocs/asset/class/asset_type.class.php
+++ b/htdocs/asset/class/asset_type.class.php
@@ -126,7 +126,7 @@ class AssetType extends CommonObject
 		$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 .= ", ".$conf->entity;
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ")";
 
 		dol_syslog("Asset_type::create", LOG_DEBUG);
@@ -359,11 +359,7 @@ class AssetType extends CommonObject
 				if (!array_key_exists($obj->rowid, $ret)) {
 					if ($mode < 2) {
 						$assetstatic = new Asset($this->db);
-						if ($mode == 1) {
-							$assetstatic->fetch($obj->rowid, '', '', '', false, false);
-						} else {
-							$assetstatic->fetch($obj->rowid);
-						}
+						$assetstatic->fetch($obj->rowid);
 						$ret[$obj->rowid] = $assetstatic;
 					} else {
 						$ret[$obj->rowid] = $obj->rowid;
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index b4ee3a0a175..9d46e9ae0b6 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -42,8 +42,8 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index 1d994e25177..1abdabd333e 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -197,12 +197,12 @@ $title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Assets"));
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
 foreach ($object->fields as $key => $val) {
-	$sql .= 't.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key." as options_".$key.', ' : '');
 	}
 }
 // Add fields from hooks
@@ -249,7 +249,7 @@ $sql .= $hookmanager->resPrint;
 $sql.= " GROUP BY "
 foreach($object->fields as $key => $val)
 {
-	$sql.='t.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -523,7 +523,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index 752591ade9e..ebd340e393d 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -70,8 +70,13 @@ $permissionnote = 1;
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
-
+$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
@@ -92,7 +97,7 @@ if ($id > 0 || !empty($ref)) {
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/asset/list.php', 1).'?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">';
 	/*
@@ -109,7 +114,7 @@ if ($id > 0 || !empty($ref)) {
 		if ($user->rights->asset->creer)
 		{
 			if ($action != 'classify')
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<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);
diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php
index 4568004b33b..cd802c1c4fd 100644
--- a/htdocs/asset/type.php
+++ b/htdocs/asset/type.php
@@ -47,8 +47,8 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $type = GETPOST('type', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -90,6 +90,7 @@ $hookmanager->initHooks(array('assettypecard', 'globalcard'));
 
 $permissiontoadd = $user->rights->asset->setup_advance;
 
+
 /*
  *	Actions
  */
@@ -297,7 +298,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 			print '</td>';
 
 			if ($user->rights->asset->write) {
-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
+				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
 			} else {
 				print '<td class="right">&nbsp;</td>';
 			}
@@ -396,11 +397,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" name="button" class="button" value="'.$langs->trans("Add").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
-	print '</div>';
+	print $form->buttonsSaveCancel("Add");
 
 	print "</form>\n";
 }
@@ -506,12 +503,12 @@ if ($rowid > 0) {
 
 		// Edit
 		if ($user->rights->asset->write) {
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;rowid='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
+			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='.$object->id.'">'.$langs->trans("DeleteType").'</a></div>';
+			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&rowid='.((int) $object->id).'">'.$langs->trans("DeleteType").'</a></div>';
 		}
 
 		print "</div>";
@@ -600,9 +597,7 @@ if ($rowid > 0) {
 
 		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->buttonsSaveCancel();
 
 		print "</form>";
 	}
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index f35547523c9..ef3c23eff2b 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -214,7 +214,7 @@ if ($conf->societe->enabled) {
 
 	print $langs->trans("CurrentlyNWithoutBarCode", $nbno, $nbtotal, $langs->transnoentitiesnoconv("ThirdParties")).'<br>'."\n";
 
-	print '<br><input class="button" type="submit" id="submitformbarcodethirdpartygen" '.((GETPOST("selectorforbarcode") && GETPOST("selectorforbarcode")) ? '' : 'disabled ').'value="'.$langs->trans("InitEmptyBarCode", $nbno).'"';
+	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 '>';
 	print '<br><br><br><br>';
@@ -224,7 +224,7 @@ if ($conf->societe->enabled) {
 // For products
 if ($conf->product->enabled || $conf->product->service) {
 	// Example 1 : Adding jquery code
-	print '<script type="text/javascript" language="javascript">
+	print '<script type="text/javascript">
 	function confirm_erase() {
 		return confirm("'.dol_escape_js($langs->trans("ConfirmEraseAllCurrentBarCode")).'");
 	}
@@ -274,7 +274,7 @@ if ($conf->product->enabled || $conf->product->service) {
 	} else {
 		$disabled = 1;
 		$titleno = $langs->trans("NoBarcodeNumberingTemplateDefined");
-		print '<font class="warning">'.$langs->trans("NoBarcodeNumberingTemplateDefined").'</font> (<a href="'.DOL_URL_ROOT.'/admin/barcode.php">'.$langs->trans("ToGenerateCodeDefineAutomaticRuleFirst").'</a>)<br>';
+		print '<span class="warning">'.$langs->trans("NoBarcodeNumberingTemplateDefined").'</span> (<a href="'.DOL_URL_ROOT.'/admin/barcode.php">'.$langs->trans("ToGenerateCodeDefineAutomaticRuleFirst").'</a>)<br>';
 	}
 	if (empty($nbno)) {
 		$disabled1 = 1;
@@ -283,10 +283,10 @@ if ($conf->product->enabled || $conf->product->service) {
 	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 class="button" type="submit" name="submitformbarcodeproductgen" id="submitformbarcodeproductgen" value="'.$langs->trans("InitEmptyBarCode", min($maxperinit, $nbno)).'"'.$moretags1.'>';
+	print '<input type="submit" class="button" name="submitformbarcodeproductgen" id="submitformbarcodeproductgen" value="'.$langs->trans("InitEmptyBarCode", min($maxperinit, $nbno)).'"'.$moretags1.'>';
 	$moretags2 = (($nbno == $nbtotal) ? ' disabled' : '');
 	print ' &nbsp; ';
-	print '<input class="button" type="submit" name="eraseallbarcode" id="eraseallbarcode" value="'.$langs->trans("EraseAllCurrentBarCode").'"'.$moretags2.' onClick="return confirm_erase();">';
+	print '<input type="submit" class="button" name="eraseallbarcode" id="eraseallbarcode" value="'.$langs->trans("EraseAllCurrentBarCode").'"'.$moretags2.' onClick="return confirm_erase();">';
 	print '<br><br><br><br>';
 }
 
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index ff57587d1b4..5128cd56164 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -25,7 +25,7 @@
 
 if (!empty($_POST['mode']) && $_POST['mode'] === 'label') {	// Page is called to build a PDF and output, we must ne 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)
+		define('NOTOKENRENEWAL', '1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 	}
 }
 
@@ -277,10 +277,10 @@ dol_htmloutput_errors($mesg);
 //print img_picto('','puce').' '.$langs->trans("PrintsheetForOneBarCode").'<br>';
 //print '<br>';
 
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';		// The target is for brothers that open the file instead of downloading it
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'; // The target is for brothers that open the file instead of downloading it
 print '<input type="hidden" name="mode" value="label">';
 print '<input type="hidden" name="action" value="builddoc">';
-print '<input type="hidden" name="token" value="'.currentToken().'">';	// The page will not renew the token but force download of a file, so we must use here currentToken
+print '<input type="hidden" name="token" value="'.currentToken().'">'; // The page will not renew the token but force download of a file, so we must use here currentToken
 
 print '<div class="tagtable">';
 
@@ -315,7 +315,7 @@ print '<br>';
 
 
 // Add javascript to make choice dynamic
-print '<script type="text/javascript" language="javascript">
+print '<script type="text/javascript">
 jQuery(document).ready(function() {
 	function init_selectors()
 	{
@@ -382,7 +382,7 @@ if (!empty($user->rights->produit->lire) || !empty($user->rights->service->lire)
 	print '<br>';
 	print '<div class="showforproductselector">';
 	$form->select_produits(GETPOST('productid', 'int'), 'productid', '', '', 0, -1, 2, '', 0, array(), 0, '1', 0, 'minwidth400imp', 1);
-	print ' &nbsp; <input type="submit" id="submitproduct" name="submitproduct" class="button" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
+	print ' &nbsp; <input type="submit" class="button" id="submitproduct" name="submitproduct" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
 	print '</div>';
 }
 
@@ -433,7 +433,7 @@ print '<br>';
 
 print '</div>';
 
-print '<br><input class="button" type="submit" id="submitformbarcodegen" '.((GETPOST("selectorforbarcode") && GETPOST("selectorforbarcode")) ? '' : 'disabled ').'value="'.$langs->trans("BuildPageToPrint").'">';
+print '<br><input type="submit" class="button" id="submitformbarcodegen" '.((GETPOST("selectorforbarcode") && GETPOST("selectorforbarcode")) ? '' : 'disabled ').'value="'.$langs->trans("BuildPageToPrint").'">';
 
 print '</form>';
 print '<br>';
diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index 423c40d9e20..8880e6c1e86 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -124,7 +124,7 @@ if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY)) {
 	print '<input type="hidden" name="action" value="set_BLOCKEDLOG_AUTHORITY_URL">';
 	print '<input type="hidden" name="withtab" value="'.$withtab.'">';
 	print '<input type="text" name="BLOCKEDLOG_AUTHORITY_URL" value="'.$conf->global->BLOCKEDLOG_AUTHORITY_URL.'" size="40" />';
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 	print '</form>';
 
 	print '</td></tr>';
@@ -154,7 +154,7 @@ if ($resql) {
 $seledted = empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY) ? array() : explode(',', $conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY);
 
 print $form->multiselectarray('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY', $countryArray, $seledted);
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print '</form>';
 
 print '</td>';
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 385101c7468..4698222bda8 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "other", "blockedlog", "bills"));
 
-if ((!$user->admin && !$user->rights->blockedlog->read) || empty($conf->blockedlog->enabled)) {
+if ((!$user->admin && empty($user->rights->blockedlog->read)) || empty($conf->blockedlog->enabled)) {
 	accessforbidden();
 }
 
@@ -47,11 +47,17 @@ if ($search_showonlyerrors < 0) {
 	$search_showonlyerrors = 0;
 }
 
+$search_startyear = GETPOST('search_startyear', 'int');
+$search_startmonth = GETPOST('search_startmonth', 'int');
+$search_startday = GETPOST('search_startday', 'int');
+$search_endyear = GETPOST('search_endyear', 'int');
+$search_endmonth = GETPOST('search_endmonth', 'int');
+$search_endday = GETPOST('search_endday', 'int');
 $search_id = GETPOST('search_id', 'alpha');
 $search_fk_user = GETPOST('search_fk_user', 'intcomma');
 $search_start = -1;
-if (GETPOST('search_startyear') != '') {
-	$search_start = dol_mktime(0, 0, 0, GETPOST('search_startmonth'), GETPOST('search_startday'), GETPOST('search_startyear'));
+if ($search_startyear != '') {
+	$search_start = dol_mktime(0, 0, 0, $search_startmonth, $search_startday, $search_startyear);
 }
 $search_end = -1;
 if (GETPOST('search_endyear') != '') {
@@ -321,22 +327,22 @@ if ($search_fk_user > 0) {
 	$param .= '&search_fk_user='.urlencode($search_fk_user);
 }
 if ($search_startyear > 0) {
-	$param .= '&search_startyear='.urlencode(GETPOST('search_startyear', 'int'));
+	$param .= '&search_startyear='.urlencode($search_startyear);
 }
 if ($search_startmonth > 0) {
-	$param .= '&search_startmonth='.urlencode(GETPOST('search_startmonth', 'int'));
+	$param .= '&search_startmonth='.urlencode($search_startmonth);
 }
 if ($search_startday > 0) {
-	$param .= '&search_startday='.urlencode(GETPOST('search_startday', 'int'));
+	$param .= '&search_startday='.urlencode($search_startday);
 }
 if ($search_endyear > 0) {
-	$param .= '&search_endyear='.urlencode(GETPOST('search_endyear', 'int'));
+	$param .= '&search_endyear='.urlencode($search_endyear);
 }
 if ($search_endmonth > 0) {
-	$param .= '&search_endmonth='.urlencode(GETPOST('search_endmonth', 'int'));
+	$param .= '&search_endmonth='.urlencode($search_endmonth);
 }
 if ($search_endday > 0) {
-	$param .= '&search_endday='.urlencode(GETPOST('search_endday', 'int'));
+	$param .= '&search_endday='.urlencode($search_endday);
 }
 if ($search_showonlyerrors > 0) {
 	$param .= '&search_showonlyerrors='.urlencode($search_showonlyerrors);
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
index 9fde03e1e5e..eb851af169a 100644
--- a/htdocs/blockedlog/ajax/block-info.php
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 $id = GETPOST('id', 'int');
 $block = new BlockedLog($db);
 
-if ((!$user->admin && !$user->rights->blockedlog->read) || empty($conf->blockedlog->enabled)) {
+if ((!$user->admin && empty($user->rights->blockedlog->read)) || empty($conf->blockedlog->enabled)) {
 	accessforbidden();
 }
 
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index a7be2fb3630..578e1afa497 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -320,12 +320,12 @@ class BlockedLog
 				$this->error++;
 			}
 		} elseif ($this->action == 'MODULE_SET') {
-			return '<i class="opacitymedium">System to track events into unalterable logs were enabled</i>';
+			return '<i class="opacitymedium">'.$langs->trans("BlockedLogEnabled").'</i>';
 		} elseif ($this->action == 'MODULE_RESET') {
 			if ($this->signature == '0000000000') {
-				return '<i class="opacitymedium">System to track events into unalterable logs were disabled after some recording were done. We saved a special Fingerprint to track the chain as broken.</i>';
+				return '<i class="opacitymedium">'.$langs->trans("BlockedLogDisabled").'</i>';
 			} else {
-				return '<i class="opacitymedium">System to track events into unalterable logs were disabled. This is possible because no record were done yet.</i>';
+				return '<i class="opacitymedium">'.$langs->trans("BlockedLogDisabledBis").'</i>';
 			}
 		}
 
@@ -796,7 +796,7 @@ class BlockedLog
 	{
 
 		$res = $this->db->query("UPDATE ".MAIN_DB_PREFIX."blockedlog SET certified=1 WHERE rowid=".((int) $this->id));
-		if ($res === false) {
+		if (!$res) {
 			return false;
 		}
 
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index bf65f40fe13..2b9c6f57bbd 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -52,8 +52,8 @@ if (GETPOST('actioncode', 'array')) {
 $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');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -139,7 +139,7 @@ if ($object->id > 0) {
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/bom/bom_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$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">';
 	/*
@@ -156,7 +156,7 @@ if ($object->id > 0) {
 	 if ($user->rights->bom->creer)
 	 {
 	 if ($action != 'classify')
-		 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		 //$morehtmlref.='<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);
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 4396dd36e92..cbd730e5d23 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -109,7 +109,7 @@ if (empty($reshook)) {
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = dol_buildpath('/bom/bom_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+				$backtopage = DOL_URL_ROOT.'/bom/bom_card.php?id='.($id > 0 ? $id : '__ID__');
 			}
 		}
 	}
@@ -148,7 +148,17 @@ if (empty($reshook)) {
 		$error = 0;
 
 		// Set if we used free entry or predefined product
-		$idprod = (int) GETPOST('idprod', 'int');
+		$bom_child_id = (int) GETPOST('bom_id', 'int');
+		if ($bom_child_id > 0) {
+			$bom_child = new BOM($db);
+			$res = $bom_child->fetch($bom_child_id);
+			if ($res) {
+				$idprod = $bom_child->fk_product;
+			}
+		} else {
+			$idprod = (int) GETPOST('idprod', 'int');
+		}
+
 		$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
 		$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
 		$disable_stock_change = GETPOST('disable_stock_change', 'int');
@@ -172,6 +182,7 @@ if (empty($reshook)) {
 			$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;
@@ -241,6 +252,7 @@ if (empty($reshook)) {
 }
 
 
+
 /*
  * View
  */
@@ -276,11 +288,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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 $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 }
@@ -311,9 +319,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	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->buttonsSaveCancel("Create");
 
 	print '</form>';
 }
@@ -357,8 +363,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formquestion = array();
 		if (!empty($conf->bom->enabled)) {
 			$langs->load("mrp");
-			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-			$formproduct = new FormProduct($db);
 			$forcecombo = 0;
 			if ($conf->browser->name == 'ie') {
 				$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
@@ -387,8 +391,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formquestion = array();
 		if (!empty($conf->bom->enabled)) {
 			$langs->load("mrp");
-			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-			$formproduct = new FormProduct($db);
 			$forcecombo = 0;
 			if ($conf->browser->name == 'ie') {
 				$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
@@ -418,7 +420,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (!empty($conf->bom->enabled)) {
 			$langs->load("mrp");
 			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-			$formproduct = new FormProduct($db);
 			$forcecombo = 0;
 			if ($conf->browser->name == 'ie') {
 				$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
@@ -463,7 +464,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/bom/bom_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$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">';
 	/*
@@ -480,7 +481,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if ($permissiontoadd)
 		{
 			if ($action != 'classify')
-				$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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.'">';
@@ -580,6 +581,47 @@ 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
 	}
 
 
@@ -609,7 +651,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Modify
 			if ($object->status == $object::STATUS_DRAFT) {
 				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit&amp;token='.newToken().'">'.$langs->trans("Modify").'</a>'."\n";
+					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";
 				}
@@ -629,24 +671,24 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Re-open
 			if ($permissiontoadd && $object->status == $object::STATUS_CANCELED) {
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen">'.$langs->trans("ReOpen").'</a>'."\n";
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a>'."\n";
 			}
 
 			// Create MO
 			if ($conf->mrp->enabled) {
 				if ($object->status == $object::STATUS_VALIDATED && !empty($user->rights->mrp->write)) {
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/mrp/mo_card.php?action=create&fk_bom='.$object->id.'&backtopageforcancel='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("CreateMO").'</a>'."\n";
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/mrp/mo_card.php?action=create&fk_bom='.$object->id.'&token='.newToken().'&backtopageforcancel='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("CreateMO").'</a>'."\n";
 				}
 			}
 
 			// Clone
 			if ($permissiontoadd) {
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&object=bom">'.$langs->trans("ToClone").'</a>'."\n";
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&object=bom&token='.newToken().'">'.$langs->trans("ToClone").'</a>'."\n";
 			}
 
 			// Close / Cancel
 			if ($permissiontoadd && $object->status == $object::STATUS_VALIDATED) {
-				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close">'.$langs->trans("Disable").'</a>'."\n";
+				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close&token='.newToken().'">'.$langs->trans("Disable").'</a>'."\n";
 			}
 
 			/*
@@ -664,7 +706,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			*/
 
 			if ($permissiontodelete) {
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+				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";
 			}
@@ -696,20 +738,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		$MAXEVENT = 10;
 
-		$morehtmlright = '<a href="'.dol_buildpath('/bom/bom_agenda.php', 1).'?id='.$object->id.'">';
-		$morehtmlright .= $langs->trans("SeeAll");
-		$morehtmlright .= '</a>';
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt 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';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, 'bom', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+		$somethingshown = $formactions->showactions($object, $object->element, 0, 1, '', $MAXEVENT, '', $morehtmlcenter);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 	//Select mail models is same action as presend
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index dd0227e4305..64f3cdbfac1 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -47,8 +47,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -125,7 +125,7 @@ if ($object->id) {
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/bom/bom_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/bom/bom_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index df21938aec5..3cc0dc1753a 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -297,7 +297,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
@@ -363,7 +363,7 @@ $sql .= $hookmanager->resPrint;
 $sql.= " GROUP BY ";
 foreach($object->fields as $key => $val)
 {
-	$sql.='t.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -655,7 +655,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
diff --git a/htdocs/bom/bom_note.php b/htdocs/bom/bom_note.php
index 539eb654751..8ace40cc900 100644
--- a/htdocs/bom/bom_note.php
+++ b/htdocs/bom/bom_note.php
@@ -70,7 +70,13 @@ restrictedArea($user, 'bom', $object->id, 'bom_bom', '', '', 'rowid', $isdraft);
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$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
+}
 
 
 /*
@@ -94,7 +100,7 @@ if ($id > 0 || !empty($ref)) {
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/bom/bom_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$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">';
 
diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index 0eeefda9b3d..91af888ffd8 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -148,8 +148,9 @@ class Boms extends DolibarrApi
 			$sql .= " AND sc.fk_user = ".((int) $search_sale);
 		}
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 91eb752451b..5f732c47300 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -94,7 +94,7 @@ class BOM extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
+		'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'),
@@ -431,7 +431,7 @@ class BOM extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.' = '.((int) $value);
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
@@ -442,14 +442,14 @@ class BOM extends CommonObject
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -789,6 +789,15 @@ class BOM extends CommonObject
 		if (isset($this->label)) {
 			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
 		}
+		if (!empty($this->fk_product) && $this->fk_product > 0) {
+			include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+			$product = new Product($db);
+			$resultFetch = $product->fetch($this->fk_product);
+			if ($resultFetch > 0) {
+				$label .= "<br><b>".$langs->trans("Product").'</b>: '.$product->ref.' - '.$product->label;
+			}
+		}
+
 
 		$url = DOL_URL_ROOT.'/bom/bom_card.php?id='.$this->id;
 
@@ -1055,26 +1064,40 @@ class BOM extends CommonObject
 				$tmpproduct->cost_price = 0;
 				$tmpproduct->pmp = 0;
 
-				$result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1);	// We discard selling price and language loading
-				if ($result < 0) {
-					$this->error = $tmpproduct->error;
-					return -1;
-				}
-				$line->unit_cost = price2num((!empty($tmpproduct->cost_price)) ? $tmpproduct->cost_price : $tmpproduct->pmp);
-				if (empty($line->unit_cost)) {
-					if ($productFournisseur->find_min_price_product_fournisseur($line->fk_product) > 0) {
-						$line->unit_cost = $productFournisseur->fourn_unitprice;
+				if (empty($line->fk_bom_child)) {
+					$result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1);	// We discard selling price and language loading
+					if ($result < 0) {
+						$this->error = $tmpproduct->error;
+						return -1;
+					}
+					$line->unit_cost = price2num((!empty($tmpproduct->cost_price)) ? $tmpproduct->cost_price : $tmpproduct->pmp);
+					if (empty($line->unit_cost)) {
+						if ($productFournisseur->find_min_price_product_fournisseur($line->fk_product) > 0) {
+							$line->unit_cost = $productFournisseur->fourn_unitprice;
+						}
+					}
+
+					$line->total_cost = price2num($line->qty * $line->unit_cost, 'MT');
+
+					$this->total_cost += $line->total_cost;
+				} else {
+					$bom_child= new BOM($this->db);
+					$res = $bom_child->fetch($line->fk_bom_child);
+					if ($res>0) {
+						$bom_child->calculateCosts();
+						$this->total_cost += $bom_child->total_cost;
+					} else {
+						$this->error = $bom_child->error;
+						return -2;
 					}
 				}
-
-				$line->total_cost = price2num($line->qty * $line->unit_cost, 'MT');
-
-				$this->total_cost += $line->total_cost;
 			}
 
 			$this->total_cost = price2num($this->total_cost, 'MT');
-			if ($this->qty) {
+			if ($this->qty > 0) {
 				$this->unit_cost = price2num($this->total_cost / $this->qty, 'MU');
+			} elseif ($this->qty < 0) {
+				$this->unit_cost = price2num($this->total_cost * $this->qty, 'MU');
 			}
 		}
 	}
@@ -1139,6 +1162,7 @@ class BOMLine extends CommonObjectLine
 		'rowid' => array('type'=>'integer', 'label'=>'LineID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
 		'fk_bom' => array('type'=>'integer:BillOfMaterials:societe/class/bom.class.php', 'label'=>'BillOfMaterials', 'enabled'=>1, 'visible'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1,),
 		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
+		'fk_bom_child' => array('type'=>'integer:BOM:bom/class/bom.class.php', 'label'=>'BillOfMaterials', 'enabled'=>1, 'visible'=>-1, 'position'=>40, 'notnull'=>-1,),
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'notnull'=>-1,),
 		'qty' => array('type'=>'double(24,8)', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'position'=>100, 'notnull'=>1, 'isameasure'=>'1',),
 		'qty_frozen' => array('type'=>'smallint', 'label'=>'QuantityFrozen', 'enabled'=>1, 'visible'=>1, 'default'=>0, 'position'=>105, 'css'=>'maxwidth50imp', 'help'=>'QuantityConsumedInvariable'),
@@ -1163,6 +1187,11 @@ class BOMLine extends CommonObjectLine
 	 */
 	public $fk_product;
 
+	/**
+	 * @var int Id of parent bom
+	 */
+	public $fk_bom_child;
+
 	/**
 	 * @var string description
 	 */
@@ -1295,25 +1324,25 @@ class BOMLine extends CommonObjectLine
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
 				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -1390,7 +1419,7 @@ class BOMLine extends CommonObjectLine
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-		$url = dol_buildpath('/bom/bomline_card.php', 1).'?id='.$this->id;
+		$url = DOL_URL_ROOT.'/bom/bomline_card.php?id='.$this->id;
 
 		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
diff --git a/htdocs/bom/lib/bom.lib.php b/htdocs/bom/lib/bom.lib.php
index edd9bd69ef4..805ba304c1d 100644
--- a/htdocs/bom/lib/bom.lib.php
+++ b/htdocs/bom/lib/bom.lib.php
@@ -56,7 +56,7 @@ function bomAdminPrepareHead()
 	//); // to remove a tab
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'bom@mrp');
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bom@mrp', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'bom@mrp', 'remove');
 
 	return $head;
 }
diff --git a/htdocs/bom/tpl/linkedobjectblock.tpl.php b/htdocs/bom/tpl/linkedobjectblock.tpl.php
index fcba37105d3..2737b425c9c 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 -->\n";
+print "<!-- BEGIN PHP TEMPLATE bom/tpl/linkedopjectblock.tpl.php -->\n";
 
 global $user, $db;
 global $noMoreLinkedObjectBlockAfter;
@@ -54,7 +54,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	echo '</td>';
 	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
 
-	echo '<td class="linkedcol-ref" align="center">';
+	echo '<td class="linkedcol-ref">';
 	$result = $product_static->fetch($objectlink->fk_product);
 	if ($result < 0) {
 		setEventMessage($product_static->error, 'errors');
@@ -62,7 +62,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		$product_static->getNomUrl(1);
 	}
 	print '</td>';
-	echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date_creation, 'day').'</td>';
+	echo '<td class="linkedcol-date">'.dol_print_date($objectlink->date_creation, 'day').'</td>';
 	echo '<td class="linkedcol-amount right">';
 	if ($user->rights->commande->lire) {
 		$total = $total + $objectlink->total_ht;
@@ -73,7 +73,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	echo '<td class="linkedcol-action right">';
 	// For now, shipments must stay linked to order, so link is not deletable
 	if ($object->element != 'shipping') {
-		echo '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a>';
+		echo '<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/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 7cc2873b261..0a3a3b34e7a 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -88,15 +88,14 @@ print '<td class="bordertop nobottom linecoldescription minwidth500imp">';
 
 // Predefined product/service
 if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-	if ($forceall >= 0 && $freelines) {
-		echo '<br>';
+	if (!empty($conf->global->BOM_SUB_BOM)) {
+		print $langs->trans("Product");
 	}
 	echo '<span class="prod_entry_mode_predef">';
-	$filtertype = '';
-	if (!empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
-		$filtertype = '1';
+	$filtertype = 0;
+	if (!empty($object->element) && $object->element == 'contrat' && empty($conf->global->STOCK_SUPPORT_SERVICES)) {
+		$filtertype = -1;
 	}
-
 	$statustoshow = -1;
 	if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
 		// hide products in closed warehouse, but show products for internal transfer
@@ -107,6 +106,13 @@ if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 
 	echo '</span>';
 }
+if (!empty($conf->global->BOM_SUB_BOM)) {
+	print '<br><span class="opacitymedium">'.$langs->trans("or").'</span><br>'.$langs->trans("BOM");
+	// TODO Add component to select a BOM
+	$form->select_bom();
+}
+print '</td>';
+
 
 $coldisplay++;
 print '<td class="bordertop nobottom linecolqty right"><input type="text" size="2" name="qty" id="qty" class="flat right" value="'.(GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : 1).'">';
@@ -128,7 +134,7 @@ print '</td>';
 
 $coldisplay++;
 print '<td class="bordertop nobottom nowrap linecollost right">';
-print '<input type="text" size="1" name="efficiency" id="efficiency" class="flat right" value="'.(GETPOSTISSET("efficiency") ?GETPOST("efficiency", 'alpha') : 1).'">';
+print '<input type="text" size="2" name="efficiency" id="efficiency" class="flat right" value="'.((GETPOSTISSET("efficiency") && $action == 'addline') ?GETPOST("efficiency", 'alpha') : 1).'">';
 print '</td>';
 
 $coldisplay++;
@@ -138,7 +144,7 @@ print '</td>';
 
 $coldisplay += $colspan;
 print '<td class="bordertop nobottom linecoledit center valignmiddle" colspan="'.$colspan.'">';
-print '<input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline" id="addline">';
+print '<input type="submit" class="button button-add" name="addline" id="addline" value="'.$langs->trans('Add').'">';
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 46b57e89243..e5f24fa994f 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -124,7 +124,7 @@ print '</td>';
 
 $coldisplay++;
 print '<td class="nobottom nowrap linecollost right">';
-print '<input type="text" size="1" name="efficiency" id="efficiency" class="flat right" value="'.$line->efficiency.'"></td>';
+print '<input type="text" size="2" name="efficiency" id="efficiency" class="flat right" value="'.$line->efficiency.'"></td>';
 
 $coldisplay++;
 print '<td class="nobottom nowrap linecolcostprice right">';
@@ -133,9 +133,8 @@ print '</td>';
 $coldisplay += $colspan;
 print '<td class="nobottom linecoledit center valignmiddle" colspan="'.$colspan.'">';
 $coldisplay += $colspan;
-print '<input type="submit" class="button buttongen marginbottomonly button-save" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'">';
-print '<br>';
-print '<input type="submit" class="button buttongen marginbottomonly button-cancel" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'">';
+print '<input type="submit" class="button buttongen margintoponly marginbottomonly button-save" id="savelinebutton" name="save" value="'.$langs->trans("Save").'">';
+print '<input type="submit" class="button buttongen margintoponly marginbottomonly button-cancel" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'">';
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index d1b29ee03b0..dff3a38ccd2 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -39,6 +39,8 @@ if (empty($object) || !is_object($object)) {
 	exit;
 }
 print "<!-- BEGIN PHP TEMPLATE objectline_title.tpl.php -->\n";
+
+
 // Title line
 print "<thead>\n";
 
@@ -49,8 +51,13 @@ if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 	print '<td class="linecolnum center">&nbsp;</td>';
 }
 
-// Description
-print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
+// Product or sub-bom
+print '<td class="linecoldescription">'.$langs->trans('Description');
+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="linecolqty right">'.$form->textwithpicto($langs->trans('Qty'), $langs->trans("QtyRequiredIfNoLoss")).'</td>';
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index fff9d077a08..b72ed043581 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -41,7 +41,7 @@ if (empty($object) || !is_object($object)) {
 }
 
 
-global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax;
+global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax, $langs;
 
 if (empty($dateSelector)) {
 	$dateSelector = 0;
@@ -80,9 +80,21 @@ print '<div id="line_'.$line->id.'"></div>';
 $coldisplay++;
 $tmpproduct = new Product($object->db);
 $tmpproduct->fetch($line->fk_product);
-print $tmpproduct->getNomUrl(1);
-print ' - '.$tmpproduct->label;
+$tmpbom = new BOM($object->db);
+$res = $tmpbom->fetch($line->fk_bom_child);
+if ($tmpbom->id > 0) {
+	print $tmpproduct->getNomUrl(1);
+	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 $tmpproduct->getNomUrl(1);
+	print ' - '.$tmpproduct->label;
+}
 print '</td>';
+
 print '<td class="linecolqty nowrap right">';
 $coldisplay++;
 echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price
@@ -111,7 +123,8 @@ $coldisplay++;
 echo $line->efficiency;
 print '</td>';
 
-print '<td class="linecolcost nowrap right">';
+$total_cost = 0;
+print '<td id="costline_'.$line->id.'" class="linecolcost nowrap right">';
 $coldisplay++;
 echo price($line->total_cost);
 print '</td>';
@@ -121,7 +134,7 @@ if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines') {
 	$coldisplay++;
 	if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
 	} else {
-		print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'">'.img_edit().'</a>';
+		print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=editline&token='.newToken().'&lineid='.$line->id.'">'.img_edit().'</a>';
 	}
 	print '</td>';
 
@@ -129,7 +142,7 @@ if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines') {
 	$coldisplay++;
 	if (($line->fk_prev_id == null) && empty($disableremove)) {
 		//La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation
-		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=deleteline&amp;token='.newToken().'&amp;lineid='.$line->id.'">';
+		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=deleteline&token='.newToken().'&lineid='.$line->id.'">';
 		print img_delete();
 		print '</a>';
 	}
@@ -166,6 +179,97 @@ if ($action == 'selectlines') {
 
 print '</tr>';
 
+// 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 = $object->db->query($sql);
+
+if ($resql) {
+	// Loop on all the sub-BOM lines if they exist
+	while ($obj = $object->db->fetch_object($resql)) {
+		$sub_bom_product = new Product($object->db);
+		$sub_bom_product->fetch($obj->fk_product);
+
+		$sub_bom = new BOM($object->db);
+		$sub_bom->fetch($obj->fk_bom_child);
+
+		$sub_bom_line = new BOMLine($object->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>';
+			print '<td class="linecolqtyfrozen nowrap right" id="sub_bom_qty_frozen_'.$sub_bom_line->id.'">'.$langs->trans('Yes').'</td>';
+		} else {
+			print '<td class="linecolqty nowrap right" id="sub_bom_qty_'.$sub_bom_line->id.'">'.price($sub_bom_line->qty * $line->qty, 0, '', 0, 0).'</td>';
+			print '<td class="linecolqtyfrozen nowrap right" id="sub_bom_qty_frozen_'.$sub_bom_line->id.'">&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.'">'.$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>';
+		}
+
+		// 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;
+		} 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;
+		} 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;
+
+				print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'">'.price($line_cost).'</td>';
+				$total_cost+= $line_cost;
+			}
+		}
+
+		print '<td></td>';
+		print '<td></td>';
+		print '<td></td>';
+	}
+}
+
+// Replace of the total_cost value by the sum of all sub-BOM lines total_cost
+if ($total_cost > 0) {
+	$line->total_cost = price($total_cost);
+	?>
+	<script>
+		$('#costline_<?php echo $line->id?>').html("<?php echo "".price($total_cost)?>");
+	</script>
+	<?php
+}
+
+
 //Line extrafield
 if (!empty($extrafields)) {
 	print $line->showOptionals($extrafields, 'view', array('style'=>'class="drag drop oddeven"', 'colspan'=>$coldisplay), '', '', 1, 'line');
diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
index 5f30db5d7f2..3d5c8eb3bc0 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -78,7 +78,7 @@ print '<tr class="oddeven"><td>';
 print $langs->trans("NbOfBoomarkToShow").'</td><td>';
 print '<input size="3" type="text" name="BOOKMARKS_SHOW_IN_MENU" value="'.$conf->global->BOOKMARKS_SHOW_IN_MENU.'">';
 print '</td></tr>';
-print '</table><br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div></form>';
+print '</table><br><div class="center"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></div></form>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index d24ba63ef55..83b5b69283f 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('AddThisPageToBookmarks').'" href="'.DOL_URL_ROOT.'/bookmarks/list.php" >';
+	$listbtn = '<a class="top-menu-dropdown-link" title="'.$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
@@ -90,7 +90,7 @@ function printDropdownBookmarksList()
 			$bookmarkList = '<div id="dropdown-bookmarks-list" >';
 			$i = 0;
 			while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql)) {
-				$bookmarkList .= '<a class="dropdown-item bookmark-item'.(strpos($obj->url, 'http') === 0 ? ' bookmark-item-external' : '').'" id="bookmark-item-'.$obj->rowid.'" data-id="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank"' : '').' href="'.dol_escape_htmltag($obj->url).'" >';
+				$bookmarkList .= '<a class="dropdown-item bookmark-item'.(strpos($obj->url, 'http') === 0 ? ' bookmark-item-external' : '').'" id="bookmark-item-'.$obj->rowid.'" data-id="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank"  rel="noopener noreferrer"' : '').' href="'.dol_escape_htmltag($obj->url).'" >';
 				$bookmarkList .= dol_escape_htmltag($obj->title);
 				$bookmarkList .= '</a>';
 				$i++;
@@ -115,7 +115,7 @@ function printDropdownBookmarksList()
 			}
 			$i = 0;
 			while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql)) {
-				$searchForm .= '<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank"' : '').' rel="'.dol_escape_htmltag($obj->url).'" >';
+				$searchForm .= '<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank" rel="noopener noreferrer"' : '').' rel="'.dol_escape_htmltag($obj->url).'" >';
 				$searchForm .= dol_escape_htmltag($obj->title);
 				$searchForm .= '</option>';
 				$i++;
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index bfad54b361a..8833978e054 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
 $langs->loadLangs(array('bookmarks', 'other'));
 
 // Security check
-if (!$user->rights->bookmark->lire) {
+if (empty($user->rights->bookmark->lire)) {
 	restrictedArea($user, 'bookmarks');
 }
 
@@ -40,7 +40,7 @@ $action = GETPOST("action", "alpha");
 $title = (string) GETPOST("title", "alpha");
 $url = (string) GETPOST("url", "alpha");
 $urlsource = GETPOST("urlsource", "alpha");
-$target = GETPOST("target", "alpha");
+$target = GETPOST("target", "int");
 $userid = GETPOST("userid", "int");
 $position = GETPOST("position", "int");
 $backtopage = GETPOST('backtopage', 'alpha');
@@ -154,9 +154,9 @@ if ($action == 'create') {
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-	print load_fiche_titre($langs->trans("NewBookmark"));
+	print load_fiche_titre($langs->trans("NewBookmark"), '', 'bookmark');
 
-	print dol_get_fiche_head($head, $hselected, $langs->trans("Bookmark"), -1, 'bookmark');
+	print dol_get_fiche_head(null, 'bookmark', '', 0, '');
 
 	print '<table class="border centpercent tableforfieldcreate">';
 
@@ -164,32 +164,33 @@ if ($action == 'create') {
 	dol_set_focus('#titlebookmark');
 
 	// Url
-	print '<tr><td class="fieldrequired">'.$langs->trans("UrlOrLink").'</td><td><input class="flat quatrevingtpercent" name="url" value="'.dol_escape_htmltag($url).'"></td><td class="hideonsmartphone"><span class="opacitymedium">'.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").'</span></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("UrlOrLink").'</td><td><input class="flat quatrevingtpercent minwidth500" name="url" value="'.dol_escape_htmltag($url).'"></td><td class="hideonsmartphone"><span class="opacitymedium">'.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").'</span></td></tr>';
 
 	// Target
 	print '<tr><td>'.$langs->trans("BehaviourOnClick").'</td><td>';
 	$liste = array(0=>$langs->trans("ReplaceWindow"), 1=>$langs->trans("OpenANewWindow"));
-	print $form->selectarray('target', $liste, GETPOSTISSET('target') ? GETPOST('target', 'int') : 1);
+	$defaulttarget = 1;
+	if ($url && !preg_match('/^http/i', $url)) {
+		$defaulttarget = 0;
+	}
+	print $form->selectarray('target', $liste, GETPOSTISSET('target') ? GETPOST('target', 'int') : $defaulttarget, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth300');
 	print '</td><td class="hideonsmartphone"><span class="opacitymedium">'.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'</span></td></tr>';
 
 	// Owner
 	print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
-	print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id, 'userid', 0, '', 0, ($user->admin ? '' : array($user->id)), '', 0, 0, 0, '', ($user->admin) ? 1 : 0, '', 'maxwidth300');
-	print '</td><td class="hideonsmartphone">&nbsp;</td></tr>';
+	print img_picto('', 'user').' '.$form->select_dolusers(GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id, 'userid', 0, '', 0, ($user->admin ? '' : array($user->id)), '', 0, 0, 0, '', ($user->admin) ? 1 : 0, '', 'maxwidth300 widthcentpercentminusx');
+	print '</td><td class="hideonsmartphone"></td></tr>';
 
 	// Position
 	print '<tr><td>'.$langs->trans("Position").'</td><td>';
-	print '<input class="flat" name="position" size="5" value="'.(GETPOSTISSET("position") ? GETPOST("position", 'int') : $object->position).'">';
-	print '</td><td class="hideonsmartphone">&nbsp;</td></tr>';
+	print '<input class="flat width50" name="position" value="'.(GETPOSTISSET("position") ? GETPOST("position", 'int') : $object->position).'">';
+	print '</td><td class="hideonsmartphone"></td></tr>';
 
 	print '</table>';
 
 	print dol_get_fiche_end();
 
-	print '<div align="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("CreateBookmark").'" name="create"> &nbsp; ';
-	print '<input type="submit" class="button button-cancel" value="'.$langs->trans("Cancel").'" name="cancel">';
-	print '</div>';
+	print $form->buttonsSaveCancel("CreateBookmark");
 
 	print '</form>';
 }
@@ -247,7 +248,7 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
 	if ($action == 'edit') {
 		print '<input class="flat minwidth500 quatrevingtpercent" name="url" value="'.(GETPOSTISSET("url") ? GETPOST("url") : $object->url).'">';
 	} else {
-		print '<a href="'.(preg_match('/^http/i', $object->url) ? $object->url : DOL_URL_ROOT.$object->url).'"'.($object->target ? ' target="_blank"' : '').'>';
+		print '<a href="'.(preg_match('/^http/i', $object->url) ? $object->url : DOL_URL_ROOT.$object->url).'"'.($object->target ? ' target="_blank" rel="noopener noreferrer"' : '').'>';
 		print img_picto('', 'globe', 'class="paddingright"');
 		print $object->url;
 		print '</a>';
@@ -301,7 +302,8 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
 	print dol_get_fiche_end();
 
 	if ($action == 'edit') {
-		print '<div align="center"><input class="button button-save" type="submit" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+		print $form->buttonsSaveCancel();
+
 		print '</form>';
 	}
 
@@ -312,12 +314,12 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
 
 	// Edit
 	if ($user->rights->bookmark->creer && $action != 'edit') {
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit&amp;token='.newToken().'">'.$langs->trans("Edit").'</a>'."\n";
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Edit").'</a>'."\n";
 	}
 
 	// Remove
 	if ($user->rights->bookmark->supprimer && $action != 'edit') {
-		print '<a class="butActionDelete" href="list.php?bid='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>'."\n";
+		print '<a class="butActionDelete" href="list.php?bid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>'."\n";
 	}
 
 	print '</div>';
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 17be6be9cef..07ea263eeda 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -35,7 +35,7 @@ $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bookmarklist'; // To manage different context of search
 
 // Security check
-if (!$user->rights->bookmark->lire) {
+if (empty($user->rights->bookmark->lire)) {
 	restrictedArea($user, 'bookmarks');
 }
 $optioncss = GETPOST('optioncss', 'alpha');
@@ -62,9 +62,9 @@ $id = GETPOST("id", 'int');
 
 $object = new Bookmark($db);
 
-$permissiontoread = $user->rights->bookmark->lire;
-$permissiontoadd = $user->rights->bookmark->write;
-$permissiontodelete = $user->rights->bookmark->delete;
+$permissiontoread = !empty($user->rights->bookmark->lire);
+$permissiontoadd = !empty($user->rights->bookmark->creer);
+$permissiontodelete = !empty($user->rights->bookmark->supprimer);
 
 
 /*
@@ -86,7 +86,7 @@ if ($action == 'delete') {
  * View
  */
 
-$userstatic = new User($db);
+$form = new Form($db);
 
 $title = $langs->trans("ListOfBookmarks");
 
@@ -175,7 +175,7 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-print "<tr class=\"liste_titre\">";
+print '<tr class="liste_titre">';
 //print "<td>&nbsp;</td>";
 print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "b.rowid", "", $param, 'align="left"', $sortfield, $sortorder);
 print_liste_field_titre("Title", $_SERVER["PHP_SELF"], "b.title", "", $param, 'align="left"', $sortfield, $sortorder);
@@ -199,7 +199,7 @@ while ($i < min($num, $limit)) {
 	print '<tr class="oddeven">';
 
 	// Id
-	print '<td class="left">';
+	print '<td class="nowraponall">';
 	print $object->getNomUrl(1);
 	print '</td>';
 
@@ -268,14 +268,12 @@ while ($i < min($num, $limit)) {
 	print '<td class="right">'.$obj->position."</td>";
 
 	// Actions
-	print '<td class="nowrap right">';
+	print '<td class="nowraponall right">';
 	if ($canedit) {
-		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/bookmarks/card.php?action=edit&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit()."</a>";
+		print '<a class="editfielda marginleftonly" href="'.DOL_URL_ROOT.'/bookmarks/card.php?action=edit&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit()."</a>";
 	}
 	if ($candelete) {
 		print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$obj->rowid.'">'.img_delete().'</a>';
-	} else {
-		print "&nbsp;";
 	}
 	print "</td>";
 	print "</tr>\n";
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
deleted file mode 100644
index eee5cac755f..00000000000
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2011-2017 Juanjo Menent		<jmenent@2byte.es>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/cashdesk/admin/cashdesk.php
- *	\ingroup    cashdesk
- *	\brief      Setup page for cashdesk module
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-
-// If socid provided by ajax company selector
-if (!empty($_REQUEST['CASHDESK_ID_THIRDPARTY_id'])) {
-	$_GET['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');
-	$_POST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');
-	$_REQUEST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');
-}
-
-// Security check
-if (!$user->admin) {
-	accessforbidden();
-}
-
-// Load translation files required by the page
-$langs->loadLangs(array("admin", "cashdesk"));
-
-
-/*
- * Actions
- */
-
-if (GETPOST('action', 'alpha') == 'set') {
-	$db->begin();
-
-	if (GETPOST('socid', 'int') < 0) {
-		$_POST["socid"] = '';
-	}
-
-	$res = dolibarr_set_const($db, "CASHDESK_ID_THIRDPARTY", (GETPOST('socid', 'int') > 0 ? GETPOST('socid', 'int') : ''), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CASH", (GETPOST('CASHDESK_ID_BANKACCOUNT_CASH', 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CASH', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CHEQUE", (GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE', 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CB", (GETPOST('CASHDESK_ID_BANKACCOUNT_CB', 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CB', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "CASHDESK_ID_WAREHOUSE", (GETPOST('CASHDESK_ID_WAREHOUSE', 'alpha') > 0 ? GETPOST('CASHDESK_ID_WAREHOUSE', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", GETPOST('CASHDESK_NO_DECREASE_STOCK', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "CASHDESK_SERVICES", GETPOST('CASHDESK_SERVICES', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "CASHDESK_DOLIBAR_RECEIPT_PRINTER", GETPOST('CASHDESK_DOLIBAR_RECEIPT_PRINTER', 'alpha'), 'chaine', 0, '', $conf->entity);
-
-	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
-
-	if (!($res > 0)) {
-		$error++;
-	}
-
-	if (!$error) {
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	} else {
-		$db->rollback();
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-}
-
-/*
- * View
- */
-
-$form = new Form($db);
-$formproduct = new FormProduct($db);
-
-llxHeader('', $langs->trans("CashDeskSetup"));
-
-$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("CashDeskSetup").' (SimplePOS)', $linkback, 'title_setup');
-print '<br>';
-
-
-// Mode
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="set">';
-
-if (!empty($conf->service->enabled)) {
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
-	print "</tr>\n";
-
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("CashdeskShowServices");
-	print '<td colspan="2">';
-	print $form->selectyesno("CASHDESK_SERVICES", $conf->global->CASHDESK_SERVICES, 1);
-	print "</td></tr>\n";
-
-	print '</table>';
-
-	print '<br>';
-}
-
-
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Terminal").' 0</td><td>'.$langs->trans("Value").'</td>';
-print "</tr>\n";
-
-print '<tr class="oddeven"><td width=\"50%\">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
-print '<td colspan="2">';
-print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY, 'socid', '(s.client in (1,3) AND s.status = 1)', 1, 0, 0, array(), 0);
-print '</td></tr>';
-if (!empty($conf->banque->enabled)) {
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
-	print '<td colspan="2">';
-	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CASH, 'CASHDESK_ID_BANKACCOUNT_CASH', 0, "courant=2", 1);
-	print '</td></tr>';
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCheque").'</td>';
-	print '<td colspan="2">';
-	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE, 'CASHDESK_ID_BANKACCOUNT_CHEQUE', 0, "courant=1", 1);
-	print '</td></tr>';
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCB").'</td>';
-	print '<td colspan="2">';
-	$form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CB, 'CASHDESK_ID_BANKACCOUNT_CB', 0, "courant=1", 1);
-	print '</td></tr>';
-}
-
-if (!empty($conf->stock->enabled)) {
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>'; // Force warehouse (this is not a default value)
-	print '<td colspan="2">';
-	if (empty($conf->productbatch->enabled)) {
-		print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK', $conf->global->CASHDESK_NO_DECREASE_STOCK, 1);
-	} else {
-		if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
-			$res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
-		}
-		print $langs->trans("Yes").'<br>';
-		print '<span class="opacitymedium">'.$langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch').'</span>';
-	}
-	print '</td></tr>';
-
-	$disabled = $conf->global->CASHDESK_NO_DECREASE_STOCK;
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskIdWareHouse").'</td>'; // Force warehouse (this is not a default value)
-	print '<td colspan="2">';
-	if (!$disabled) {
-		print $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE, 'CASHDESK_ID_WAREHOUSE', '', 1, $disabled);
-		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">('.$langs->trans("Create").')</a>';
-	} else {
-		print '<span class="opacitymedium">'.$langs->trans("StockDecreaseForPointOfSaleDisabled").'</span>';
-	}
-	print '</td></tr>';
-}
-
-// Use Dolibarr Receipt Printer
-if (!empty($conf->receiptprinter->enabled)) {
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("DolibarrReceiptPrinter").' ('.$langs->trans("FeatureNotYetAvailable").')';
-	print '<td colspan="2">';
-	print $form->selectyesno("CASHDESK_DOLIBAR_RECEIPT_PRINTER", $conf->global->CASHDESK_DOLIBAR_RECEIPT_PRINTER, 1);
-	print "</td></tr>\n";
-}
-
-print '</table>';
-print '<br>';
-
-print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
-
-print "</form>\n";
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php
deleted file mode 100644
index d8e31f3b9c9..00000000000
--- a/htdocs/cashdesk/affContenu.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier      <jeremie.o@laposte.net>
- * Copyright (C) 2008-2009 Laurent Destailleur   <eldy@uers.sourceforge.net>
- * Copyright (C) 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/>.
- */
-
-/**
- *	\file       htdocs/cashdesk/affContenu.php
- *	\ingroup    cashdesk
- *	\brief      Include to show main page for cashdesk module
- */
-
-require_once 'class/Facturation.class.php';
-
-// Si nouvelle vente, reinitialisation des donnees (destruction de l'objet et vidage de la table contenant la liste des articles)
-if (GETPOST('id', 'int') == 'NOUV') {
-	unset($_SESSION['serObjFacturation']);
-	unset($_SESSION['poscart']);
-}
-
-// Recuperation, s'il existe, de l'objet contenant les infos de la vente en cours ...
-if (isset($_SESSION['serObjFacturation'])) {
-	$obj_facturation = unserialize($_SESSION['serObjFacturation']);
-	unset($_SESSION['serObjFacturation']);
-} else {
-	// ... sinon, c'est une nouvelle vente
-	$obj_facturation = new Facturation();
-}
-
-if (empty($user->rights->cashdesk->run)) {
-	accessforbidden();
-}
-
-
-/*
- * View
- */
-
-// $obj_facturation contains data for all invoice total + selection of current product
-
-$obj_facturation->calculTotaux(); // Redefine prix_total_ttc, prix_total_ht et montant_tva from $_SESSION['poscart']
-
-$total_ttc = $obj_facturation->amountWithTax();
-
-/*var_dump($obj_facturation);
-var_dump($_SESSION['poscart']);
-var_dump($total_ttc);
-exit;*/
-
-
-// Left area with selected articles (area for article, amount and payments)
-print '<div class="inline-block" style="vertical-align: top">';
-print '<div class="principal">';
-
-$page = GETPOST('menutpl', 'alpha');
-if (empty($page)) {
-	$page = 'facturation';
-}
-
-if (in_array(
-	$page,
-	array(
-			'deconnexion',
-			'index', 'index_verif', 'facturation', 'facturation_verif', 'facturation_dhtml',
-			'validation', 'validation_ok', 'validation_ticket', 'validation_verif',
-		)
-)) {
-	include $page.'.php';
-} else {
-	dol_print_error('', 'menu param '.$page.' is not inside allowed list');
-}
-
-print '</div>';
-print '</div>';
-
-
-
-// Right area with selected articles (shopping cart)
-print '<div class="inline-block" style="vertical-align: top">';
-print '<div class="liste_articles">';
-
-require 'tpl/liste_articles.tpl.php';
-
-print '</div>';
-print '</div>';
-
-$_SESSION['serObjFacturation'] = serialize($obj_facturation);
diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php
deleted file mode 100644
index a352649feb4..00000000000
--- a/htdocs/cashdesk/affIndex.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier      <jeremie.o@laposte.net>
- * Copyright (C) 2008-2010 Laurent Destailleur   <eldy@uers.sourceforge.net>
- * Copyright (C) 2009      Regis Houssin         <regis.houssin@inodbox.com>
- * Copyright (C) 2011      Juanjo Menent         <jmenent@2byte.es>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/cashdesk/affIndex.php
- *	\ingroup    cashdesk
- *	\brief      First page of point of sale module
- */
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
-require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/keypad.php';
-
-$error = GETPOST('error');
-
-// Test if already logged
-if ($_SESSION['uid'] <= 0) {
-	header('Location: index.php');
-	exit;
-}
-
-// Load translation files required by the page
-$langs->loadLangs(array("companies", "compta", "cashdesk"));
-
-if (empty($user->rights->cashdesk->run)) {
-	accessforbidden();
-}
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-
-$arrayofjs = array();
-$arrayofcss = array('/cashdesk/css/style.css');
-
-top_htmlhead($head, $langs->trans("CashDesk"), 0, 0, $arrayofjs, $arrayofcss);
-
-print '<body>'."\n";
-
-if (!empty($error)) {
-	dol_htmloutput_events();
-}
-
-print '<div class="conteneur">'."\n";
-print '<div class="conteneur_img_gauche">'."\n";
-print '<div class="conteneur_img_droite">'."\n";
-
-print '<div class="menu_principal">'."\n";
-include_once 'tpl/menu.tpl.php';
-print '</div>'."\n";
-
-print '<div class="contenu">'."\n";
-include_once 'affContenu.php';
-print '</div>'."\n";
-
-include_once 'affPied.php';
-
-print '</div></div></div>'."\n";
-print '</body></html>'."\n";
diff --git a/htdocs/cashdesk/affPied.php b/htdocs/cashdesk/affPied.php
deleted file mode 100644
index 6481a0c2aff..00000000000
--- a/htdocs/cashdesk/affPied.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.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/cashdesk/affPied.php
- *	\ingroup    cashdesk
- *	\brief      Bottom of main page of point of sale module
- */
-
-if (empty($user->rights->cashdesk->run)) {
-	accessforbidden();
-}
-
-?>
-<!-- affPied.php -->
-<div class="pied">
-<?php
-
-// Wrapper to show tooltips
-if (!empty($conf->use_javascript_ajax) && empty($conf->dol_no_mouse_hover)) {
-	print "\n<!-- JS CODE TO ENABLE Tooltips on all object with class classfortooltip -->\n";
-	print '<script type="text/javascript">
-    	jQuery(document).ready(function () {
-			jQuery(".classfortooltip").tooltip({
-				show: { collision: "flipfit", effect:\'toggle\', delay:50 },
-				hide: { effect:\'toggle\', delay: 50 },
-				tooltipClass: "mytooltip",
-				content: function () {
-					return $(this).prop(\'title\');		/* To force to get title as is */
-				}
-			});
-		});
-	</script>' . "\n";
-}
-
-printCommonFooter('private');
-?>
-</div>
diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php
deleted file mode 100644
index 23fa4d6d0a1..00000000000
--- a/htdocs/cashdesk/class/Auth.class.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier      <jeremie.o@laposte.net>
- * Copyright (C) 2008-2011 Laurent Destailleur   <eldy@uers.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/>.
- */
-
-
-/**
- * Class ot manage authentication for pos module (cashdesk)
- */
-class Auth
-{
-	protected $db;
-
-	private $login;
-	private $passwd;
-
-	private $reponse;
-
-	public $sqlQuery;
-
-	/**
-	 * Enter description here ...
-	 *
-	 * @param	DoliDB	$db			Database handler
-	 * @return	void
-	 */
-	public function __construct($db)
-	{
-		$this->db = $db;
-		$this->reponse(null);
-	}
-
-	/**
-	 * Enter description here ...
-	 *
-	 * @param 	string	$aLogin		Login
-	 * @return	void
-	 */
-	public function login($aLogin)
-	{
-		$this->login = $aLogin;
-	}
-
-	/**
-	 * Enter description here ...
-	 *
-	 * @param 	string	$aPasswd	Password
-	 * @return	void
-	 */
-	public function passwd($aPasswd)
-	{
-		$this->passwd = $aPasswd;
-	}
-
-	/**
-	 * Enter description here ...
-	 *
-	 * @param 	string 	$aReponse	Response
-	 * @return	void
-	 */
-	public function reponse($aReponse)
-	{
-		$this->reponse = $aReponse;
-	}
-
-	/**
-	 * Validate login/pass
-	 *
-	 * @param	string	$aLogin		Login
-	 * @param	string	$aPasswd	Password
-	 * @return	int					0 or 1
-	 */
-	public function verif($aLogin, $aPasswd)
-	{
-		global $conf, $langs;
-		global $dolibarr_main_authentication, $dolibarr_auto_user;
-
-		$ret = -1;
-
-		$login = '';
-
-		$test = true;
-
-		// Authentication mode
-		if (empty($dolibarr_main_authentication)) {
-			$dolibarr_main_authentication = 'http,dolibarr';
-		}
-		// Authentication mode: forceuser
-		if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) {
-			$dolibarr_auto_user = 'auto';
-		}
-		// Set authmode
-		$authmode = explode(',', $dolibarr_main_authentication);
-
-		// No authentication mode
-		if (!count($authmode)) {
-			$langs->load('main');
-			dol_print_error('', $langs->trans("ErrorConfigParameterNotDefined", 'dolibarr_main_authentication'));
-			exit;
-		}
-
-		$usertotest = $aLogin;
-		$passwordtotest = $aPasswd;
-		$entitytotest = $conf->entity;
-
-		// Validation tests user / password
-		// If ok, the variable will be initialized login
-		// If error, we will put error message in session under the name dol_loginmesg
-		$goontestloop = false;
-		if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode)) {
-			$goontestloop = true;
-		}
-		if (isset($aLogin) || GETPOST('openid_mode', 'alpha', 1)) {
-			$goontestloop = true;
-		}
-
-		if ($test && $goontestloop) {
-			include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-			$login = checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode);
-			if ($login) {
-				$this->login($aLogin);
-				$this->passwd($aPasswd);
-				$ret = 0;
-			} else {
-				$ret = -1;
-			}
-		}
-
-		return $ret;
-	}
-}
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
deleted file mode 100644
index 339edce5f03..00000000000
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ /dev/null
@@ -1,558 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
- * Copyright (C) 2008-2010 Laurent Destailleur   <eldy@uers.sourceforge.net>
- * Copyright (C) 2010      Juanjo Menent    <jmenent@2byte.es>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-
-
-/**
- * Class to manage invoices for pos module (cashdesk)
- */
-class Facturation
-{
-	/**
-	 * Attributs "volatiles" : reinitialises apres chaque traitement d'un article
-	 * <p>Attributs "volatiles" : reinitialises apres chaque traitement d'un article</p>
-	 * int $id			=> 'rowid' du produit dans llx_product
-	 * string $ref		=> 'ref' du produit dans llx_product
-	 * int $qte			=> Quantite pour le produit en cours de traitement
-	 * int $stock		=> Stock theorique pour le produit en cours de traitement
-	 * int $remise_percent	=> Remise en pourcent sur le produit en cours
-	 * int $montant_remise	=> Remise en pourcent sur le produit en cours
-	 * int $prix		=> Prix HT du produit en cours
-	 * int $tva			=> 'rowid' du taux de tva dans llx_c_tva
-	 */
-
-	/**
-	 * @var int ID
-	 */
-	public $id;
-
-	protected $ref;
-	protected $qte;
-	protected $stock;
-	protected $remise_percent;
-	protected $montant_remise;
-	protected $prix;
-	protected $tva;
-
-	/**
-	 * Attributs persistants : utilises pour toute la duree de la vente (jusqu'a validation ou annulation)
-	 * string $num_facture	=> Numero de la facture (de la forme FAYYMM-XXXX)
-	 * string $mode_reglement	=> Mode de reglement (ESP, CB ou CHQ)
-	 * int $montant_encaisse	=> Montant encaisse en cas de reglement en especes
-	 * int $montant_rendu	=> Monnaie rendue en cas de reglement en especes
-	 * int $paiement_le		=> Date de paiement en cas de paiement differe
-	 *
-	 * int $prix_total_ht	=> Prix total hors taxes
-	 * int $montant_tva		=> Montant total de la TVA, tous taux confondus
-	 * int $prix_total_ttc	=> Prix total TTC
-	 */
-	protected $num_facture;
-	protected $mode_reglement;
-	protected $montant_encaisse;
-	protected $montant_rendu;
-	protected $paiement_le;
-
-	protected $prix_total_ht;
-	protected $montant_tva;
-	protected $prix_total_ttc;
-
-
-	/**
-	 *	Constructor
-	 */
-	public function __construct()
-	{
-		$this->raz();
-		$this->razPers();
-	}
-
-
-	// Data processing methods
-
-
-	/**
-	 *  Add a product into cart
-	 *
-	 *  @return	void
-	 */
-	public function ajoutArticle()
-	{
-		global $conf, $db, $mysoc;
-
-		$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
-
-		$societe = new Societe($db);
-		$societe->fetch($thirdpartyid);
-
-		$product = new Product($db);
-		$product->fetch($this->id);
-
-
-		$vatrowid = $this->tva();
-
-		$tmp = getTaxesFromId($vatrowid);
-		$txtva = $tmp['rate'].(empty($tmp['code']) ? '' : ' ('.$tmp['code'].')');
-		$vat_npr = $tmp['npr'];
-
-		$localtaxarray = getLocalTaxesFromRate($vatrowid, 0, $societe, $mysoc, 1);
-
-		// Clean vat code
-		$reg = array();
-		$vat_src_code = '';
-		if (preg_match('/\((.*)\)/', $txtva, $reg)) {
-			$vat_src_code = $reg[1];
-			$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
-		}
-
-		// Define part of HT, VAT, TTC
-		$resultarray = calcul_price_total($this->qte, $this->prix(), $this->remisePercent(), $txtva, -1, -1, 0, 'HT', $vat_npr, $product->type, $mysoc, $localtaxarray);
-
-		// Calculation of total HT without discount
-		$total_ht = $resultarray[0];
-		$total_vat = $resultarray[1];
-		$total_ttc = $resultarray[2];
-		$total_localtax1 = $resultarray[9];
-		$total_localtax2 = $resultarray[10];
-
-		// Calculation of the discount amount
-		if ($this->remisePercent()) {
-			$remise_percent = $this->remisePercent();
-		} else {
-			$remise_percent = 0;
-		}
-		$montant_remise_ht = ($resultarray[6] - $resultarray[0]);
-		$this->amountDiscount($montant_remise_ht);
-
-		$newcartarray = $_SESSION['poscart'];
-
-		$i = 0;
-		if (!is_null($newcartarray) && !empty($newcartarray)) {
-			$i = count($newcartarray);
-		}
-
-		$newcartarray[$i]['id'] = $i;
-		$newcartarray[$i]['ref'] = $product->ref;
-		$newcartarray[$i]['label'] = $product->label;
-		$newcartarray[$i]['price'] = $product->price;
-		$newcartarray[$i]['price_ttc'] = $product->price_ttc;
-
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
-			if (isset($product->multiprices[$societe->price_level])) {
-				$newcartarray[$i]['price'] = $product->multiprices[$societe->price_level];
-				$newcartarray[$i]['price_ttc'] = $product->multiprices_ttc[$societe->price_level];
-			}
-		}
-
-		$newcartarray[$i]['fk_article'] = $this->id;
-		$newcartarray[$i]['qte'] = $this->qte();
-		$newcartarray[$i]['fk_tva'] = $this->tva(); // Vat rowid
-		$newcartarray[$i]['remise_percent'] = $remise_percent;
-		$newcartarray[$i]['remise'] = price2num($montant_remise_ht);
-		$newcartarray[$i]['total_ht'] = price2num($total_ht, 'MT');
-		$newcartarray[$i]['total_ttc'] = price2num($total_ttc, 'MT');
-		$newcartarray[$i]['total_vat'] = price2num($total_vat, 'MT');
-		$newcartarray[$i]['total_localtax1'] = price2num($total_localtax1, 'MT');
-		$newcartarray[$i]['total_localtax2'] = price2num($total_localtax2, 'MT');
-		$_SESSION['poscart'] = $newcartarray;
-
-		$this->raz();
-	}
-
-	/**
-	 *  Remove a product from panel
-	 *
-	 *  @param  int		$aArticle	Id of line into cart to remove
-	 *  @return	void
-	 */
-	public function supprArticle($aArticle)
-	{
-		$poscart = $_SESSION['poscart'];
-
-		$j = 0;
-		$newposcart = array();
-		foreach ($poscart as $key => $val) {
-			if ($poscart[$key]['id'] != $aArticle) {
-				$newposcart[$j] = $poscart[$key];
-				$newposcart[$j]['id'] = $j;
-				$j++;
-			}
-		}
-		unset($poscart);
-		//var_dump($poscart);exit;
-		$_SESSION['poscart'] = $newposcart;
-	}
-
-	/**
-	 * Calculation of total HT, total TTC and VAT amounts
-	 *
-	 * @return	int		Total
-	 */
-	public function calculTotaux()
-	{
-		global $db;
-
-		$total_ht = 0;
-		$total_ttc = 0;
-		$total_vat = 0;
-		$total_localtax1 = 0;
-		$total_localtax2 = 0;
-
-		$tab = (!empty($_SESSION['poscart']) ? $_SESSION['poscart'] : array());
-
-		$tab_size = count($tab);
-		for ($i = 0; $i < $tab_size; $i++) {
-			// Total HT
-			$remise = $tab[$i]['remise'];
-			$total_ht += ($tab[$i]['total_ht']);
-			$total_vat += ($tab[$i]['total_vat']);
-			$total_ttc += ($tab[$i]['total_ttc']);
-			$total_localtax1 += ($tab[$i]['total_localtax1']);
-			$total_localtax2 += ($tab[$i]['total_localtax2']);
-		}
-
-		$this->prix_total_ttc = $total_ttc;
-		$this->prix_total_ht = $total_ht;
-		$this->prix_total_vat = $total_vat;
-		$this->prix_total_localtax1 = $total_localtax1;
-		$this->prix_total_localtax2 = $total_localtax2;
-
-		$this->montant_tva = $total_ttc - $total_ht;
-		//print 'total: '.$this->prix_total_ttc; exit;
-	}
-
-	/**
-	 * Reset attributes
-	 *
-	 * @return	void
-	 */
-	public function raz()
-	{
-		$this->id('RESET');
-		$this->ref('RESET');
-		$this->qte('RESET');
-		$this->stock('RESET');
-		$this->remisePercent('RESET');
-		$this->amountDiscount('RESET');
-		$this->prix('RESET');
-		$this->tva('RESET');
-	}
-
-	/**
-	 * Resetting persistent attributes
-	 *
-	 *  @return	void
-	 */
-	private function razPers()
-	{
-		$this->numInvoice('RESET');
-		$this->getSetPaymentMode('RESET');
-		$this->amountCollected('RESET');
-		$this->amountReturned('RESET');
-		$this->paiementLe('RESET');
-
-		$this->amountWithoutTax('RESET');
-		$this->amountVat('RESET');
-		$this->amountWithTax('RESET');
-	}
-
-
-	// Methods for modifying protected attributes
-
-	/**
-	 * Getter for id
-	 *
-	 * @param	int		$aId	Id
-	 * @return  int             Id
-	 */
-	public function id($aId = null)
-	{
-
-		if (!$aId) {
-			return $this->id;
-		} elseif ($aId == 'RESET') {
-			$this->id = null;
-		} else {
-			$this->id = $aId;
-		}
-	}
-
-	/**
-	 * Getter for ref
-	 *
-	 * @param	string	$aRef	Ref
-	 * @return	string			Ref
-	 */
-	public function ref($aRef = null)
-	{
-
-		if (is_null($aRef)) {
-			return $this->ref;
-		} elseif ($aRef == 'RESET') {
-			$this->ref = null;
-		} else {
-			$this->ref = $aRef;
-		}
-	}
-
-	/**
-	 * Getter for qte
-	 *
-	 * @param	int		$aQte		Qty
-	 * @return	int					Qty
-	 */
-	public function qte($aQte = null)
-	{
-		if (is_null($aQte)) {
-			return $this->qte;
-		} elseif ($aQte == 'RESET') {
-			$this->qte = null;
-		} else {
-			$this->qte = $aQte;
-		}
-	}
-
-	/**
-	 * Getter for stock
-	 *
-	 * @param   string	$aStock		Stock
-	 * @return	string				Stock
-	 */
-	public function stock($aStock = null)
-	{
-
-		if (is_null($aStock)) {
-			return $this->stock;
-		} elseif ($aStock == 'RESET') {
-			$this->stock = null;
-		} else {
-			$this->stock = $aStock;
-		}
-	}
-
-	/**
-	 * Getter for remise_percent
-	 *
-	 * @param	string	$aRemisePercent		Discount
-	 * @return	string						Discount
-	 */
-	public function remisePercent($aRemisePercent = null)
-	{
-
-		if (is_null($aRemisePercent)) {
-			return $this->remise_percent;
-		} elseif ($aRemisePercent == 'RESET') {
-			$this->remise_percent = null;
-		} else {
-			$this->remise_percent = $aRemisePercent;
-		}
-	}
-
-	/**
-	 * Getter for montant_remise
-	 *
-	 * @param	int		$aMontantRemise		Amount
-	 * @return	string						Amount
-	 */
-	public function amountDiscount($aMontantRemise = null)
-	{
-
-		if (is_null($aMontantRemise)) {
-			return $this->montant_remise;
-		} elseif ($aMontantRemise == 'RESET') {
-			$this->montant_remise = null;
-		} else {
-			$this->montant_remise = $aMontantRemise;
-		}
-	}
-
-	/**
-	 * Getter for prix
-	 *
-	 * @param	int		$aPrix		Price
-	 * @return	string				Stock
-	 */
-	public function prix($aPrix = null)
-	{
-
-		if (is_null($aPrix)) {
-			return $this->prix;
-		} elseif ($aPrix == 'RESET') {
-			$this->prix = null;
-		} else {
-			$this->prix = $aPrix;
-		}
-	}
-
-	/**
-	 * Getter for tva
-	 *
-	 * @param	int		$aTva		Vat
-	 * @return	int					Vat
-	 */
-	public function tva($aTva = null)
-	{
-		if (is_null($aTva)) {
-			return $this->tva;
-		} elseif ($aTva == 'RESET') {
-			$this->tva = null;
-		} else {
-			$this->tva = $aTva;
-		}
-	}
-
-	/**
-	 * Get num invoice
-	 *
-	 * @param string	$aNumFacture		Invoice ref
-	 * @return	string						Invoice ref
-	 */
-	public function numInvoice($aNumFacture = null)
-	{
-		if (is_null($aNumFacture)) {
-			return $this->num_facture;
-		} elseif ($aNumFacture == 'RESET') {
-			$this->num_facture = null;
-		} else {
-			$this->num_facture = $aNumFacture;
-		}
-	}
-
-	/**
-	 * Get payment mode
-	 *
-	 * @param	int		$aModeReglement		Payment mode
-	 * @return	int							Payment mode
-	 */
-	public function getSetPaymentMode($aModeReglement = null)
-	{
-
-		if (is_null($aModeReglement)) {
-			return $this->mode_reglement;
-		} elseif ($aModeReglement == 'RESET') {
-			$this->mode_reglement = null;
-		} else {
-			$this->mode_reglement = $aModeReglement;
-		}
-	}
-
-	/**
-	 * Get amount
-	 *
-	 * @param	int		$aMontantEncaisse		Amount
-	 * @return	int								Amount
-	 */
-	public function amountCollected($aMontantEncaisse = null)
-	{
-
-		if (is_null($aMontantEncaisse)) {
-			return $this->montant_encaisse;
-		} elseif ($aMontantEncaisse == 'RESET') {
-			$this->montant_encaisse = null;
-		} else {
-			$this->montant_encaisse = $aMontantEncaisse;
-		}
-	}
-
-	/**
-	 * Get amount
-	 *
-	 * @param	int			$aMontantRendu		Amount
-	 * @return	int								Amount
-	 */
-	public function amountReturned($aMontantRendu = null)
-	{
-
-		if (is_null($aMontantRendu)) {
-			return $this->montant_rendu;
-		} elseif ($aMontantRendu == 'RESET') {
-			$this->montant_rendu = null;
-		} else {
-			$this->montant_rendu = $aMontantRendu;
-		}
-	}
-
-	/**
-	 * Get payment date
-	 *
-	 * @param	integer		$aPaiementLe		Date
-	 * @return	integer							Date
-	 */
-	public function paiementLe($aPaiementLe = null)
-	{
-		if (is_null($aPaiementLe)) {
-			return $this->paiement_le;
-		} elseif ($aPaiementLe == 'RESET') {
-			$this->paiement_le = null;
-		} else {
-			$this->paiement_le = $aPaiementLe;
-		}
-	}
-
-	/**
-	 * Get total HT
-	 *
-	 * @param	int		$aTotalHt		Total amount
-	 * @return	int						Total amount
-	 */
-	public function amountWithoutTax($aTotalHt = null)
-	{
-		if (is_null($aTotalHt)) {
-			return $this->prix_total_ht;
-		} elseif ($aTotalHt == 'RESET') {
-			$this->prix_total_ht = null;
-		} else {
-			$this->prix_total_ht = $aTotalHt;
-		}
-	}
-
-	/**
-	 * Get amount vat
-	 *
-	 * @param	int		$aMontantTva	Amount vat
-	 * @return	int						Amount vat
-	 */
-	public function amountVat($aMontantTva = null)
-	{
-		if (is_null($aMontantTva)) {
-			return $this->montant_tva;
-		} elseif ($aMontantTva == 'RESET') {
-			$this->montant_tva = null;
-		} else {
-			$this->montant_tva = $aMontantTva;
-		}
-	}
-
-	/**
-	 * Get total TTC
-	 *
-	 * @param	int		$aTotalTtc		Amount ttc
-	 * @return	int						Amount ttc
-	 */
-	public function amountWithTax($aTotalTtc = null)
-	{
-		if (is_null($aTotalTtc)) {
-			return $this->prix_total_ttc;
-		} elseif ($aTotalTtc == 'RESET') {
-			$this->prix_total_ttc = null;
-		} else {
-			$this->prix_total_ttc = $aTotalTtc;
-		}
-	}
-}
diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css
deleted file mode 100644
index b17a63e548e..00000000000
--- a/htdocs/cashdesk/css/style.css
+++ /dev/null
@@ -1,455 +0,0 @@
-/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.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/>.
- */
-
-body {
-	background: #fff;
-	color: #333;
-	margin: 0;
-	padding: 0;
-}
-
-p {
-	margin: 0;
-}
-
-.conteneur {
-	background: #fff;
-	text-align: left;
-	/*max-width: 770px;*/
-	/*margin: 10px auto;
-	border: 2px solid #000;*/
-}
-
-.conteneur_img_gauche {
-	/* background: url("../img/bg_conteneur_gauche.png") top left repeat-y; */
-}
-
-.conteneur_img_droite {
-	/* background: url("../img/bg_conteneur_droite.png") top right repeat-y; */
-}
-
-.contenu {
-	width: 100%;
-	text-align: center;
-	padding-top: 20px;
-}
-
-.logo {
-    text-align: center;
-}
-.logopos {
-	padding-top: 20px;
-	max-height: 40px;
-}
-
-/* ------------------- Header ------------------- */
-.entete {
-	height: 15px;
-	margin: 0;
-	/* background: url('../img/bg_entete.png') no-repeat left top; */
-}
-
-.entete span {
-	display: none;
-}
-
-.principal_login td.label1 {
-    width: 50%;
-}
-
-/* ------------------- Menu ------------------- */
-.menu_principal {
-    margin: 0;
-    font-size: 14px;
-	height: 84px;
-	background: #CCCCCC;
-	background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%);
-	background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%);
-	background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%);
-	background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%);
-	background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%);
-	background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(40,40,40,.3)) );
-}
-
-.menu_bloc {
-	margin-left: 12px;
-}
-
-.menu {
-	margin: 0;
-    list-style-type: none;
-    padding: 8px 0 0;
-}
-
-.menu li {
-	float: left;
-	padding-right: 10px;
-}
-
-.menu_choix0 {
-	font-size: 10px;
-	text-align: right;
-	font-style: italic;
-	font-weight: normal;
-	display: block;
-	color: #333;
-	text-decoration: none;
-	padding-right: 5px;
-}
-
-/* Force values for small screen 570 */
-@media only screen and (max-width: 570px)
-{
-	.menu_choix0 {
-		max-width: 180px;
-	}
-}
-
-.menu_choix0 a {
-	font-weight: normal;
-	text-decoration: none;
-}
-li.menu_choix0 {
-		float: right;
-}
-
-/* ------------------- Remind of products ------------------- */
-.liste_articles {
-	min-width: 215px;
-	float: right;
-	margin-top: 8px;
-	margin-right: 20px;
-	border: 1px dotted #5ca64d;
-	padding-bottom: 10px;
-	vertical-align: middle;
-}
-
-p.titre {
-    margin: 0 0 20px;
-    text-align: center;
-	font-weight: bold;
-	font-size: 1.4em;
-	color: #5ca64d;
-	border-bottom: 1px dotted;
-}
-
-.cadre_article {
-    width: 180px;
-	text-align: center;
-    margin: 0 auto 10px;
-    padding-bottom: 10px;
-	border-bottom: 1px solid #eee;
-}
-
-.cadre_article p {
-	color: #5ca64d;
-}
-
-.cadre_article p a {
-	color: #333;
-	font-size: 1.1em;
-	text-decoration: none;
-	padding-right: 25px;
-	background: url('../img/basket_delete.png') top right no-repeat;
-}
-
-.cadre_article p a:hover {
-	color: #6d3f6d;
-}
-
-.cadre_aucun_article {
-	text-align: center;
-	font-style: italic;
-}
-
-.cadre_prix_total {
-	text-align: center;
-	font-weight: bold;
-	font-size: 1.4em;
-	color: #6d3f6d;
-	padding-top: 10px;
-	padding-bottom: 10px;
-	margin-left: 20px;
-	margin-right: 20px;
-	border: 1px dotted #6d3f6d;
-}
-
-/* ------------------- Contenu ------------------- */
-.principal_login {
-	margin: 10px;
-	padding: 0;
-	max-width: 800px;
-	text-align: left;
-}
-
-.formulaire_login {
-	text-align: center;
-}
-
-.formulaire_login table {
-    padding-left: 60px;
-    margin: 0 auto 20px;
-    background: url('../img/login.png') bottom left no-repeat;
-}
-
-.formulaire_login table tr {
-	height: 30px;
-}
-
-.texte_login {
-	padding-left: 2px;
-	padding-right: 2px;
-	background: #fff;
-	border: 1px solid #6d3f6d;
-}
-
-.principal {
-	float: left;
-	margin: 0 15px;
-	padding: 0;
-	max-width: 900px;
-}
-
-.blocksellfinished {
-	min-width: 215px;
-	margin-top: 8px;
-}
-.titre1 {
-	font-weight: bold;
-	color: #ff9900;
-	margin: 0;
-	font-size: 1.4em;
-}
-
-.label1 {
-	color: #333;
-	font-size: 1.1em;
-}
-
-.cadre_facturation {
-	border: 2px solid #ddd;
-	margin-bottom: 15px;
-}
-
-.principal p {
-	padding-left: 10px;
-	padding-right: 10px;
-}
-
-.lien1 {
-	color: #333;
-	font-size: 1.1em;
-	text-decoration: underline;
-}
-
-.lien1:hover {
-	color: #6d3f6d;
-}
-
-/* Formulaires */
-.formulaire1 {
-	padding: 0;
-}
-
-
-/* --------------------- Combo lists ------------------- */
-.select_design {
-	overflow: auto;
-}
-
-.select_design select {
-	border: 1px solid #6d3f6d;
-    font: 12px verdana,arial,helvetica;
-	background: #fff;
-}
-
-.select_tva select {
-	width: 60px;
-	border: 1px solid #6d3f6d;
-	background: #fff;
-}
-
-.top_liste {
-	font-style: italic;
-	text-align: center;
-	color: #aaa;
-}
-
-/* --------------- Champs texte ---------------- */
-.texte_ref,.texte1,.texte1_off,.texte2,.texte2_off,.textarea_note {
-	padding-left: 2px;
-	padding-right: 2px;
-}
-
-.texte_ref,.texte1,.texte2,.textarea_note {
-	background: #fff;
-	border: 1px solid #6d3f6d;
-}
-
-.texte1_off,.texte2_off {
-	color: #000;
-	border: 1px solid #eee;
-	background: #eee;
-}
-
-.texte_ref {
-	min-width: 150px;
-}
-
-.texte1,.texte1_off {
-	width: 60px;
-}
-
-.texte2,.texte2_off {
-	width: 140px;
-}
-
-/* ------------------- */
-.textarea_note {
-	width: 100%;
-	height: 50px;
-	padding: 2px 2px;
-}
-
-/* -------------- Buttons for SimplePOS --------------------- */
-.bouton_ajout_article {
-	margin-top: 10px;
-	width: 60%;
-	height: 40px;
-}
-
-.bouton_mode_reglement, .bouton_mode_reglement_disabled {
-	width: 150px;
-	height: 40px;
-}
-
-.bouton_validation { /* 			width: 80px; */
-	margin-left: 10px;
-	margin-top: 20px;
-	margin-bottom: 10px;
-}
-
-.formulaire2 {
-	padding: 0;
-	width: 100%;
-}
-
-.table_resume {
-	width: 100%;
-}
-
-.table_resume tr {
-	background: #eee;
-}
-
-.table_resume td {
-	padding-left: 8px;
-}
-
-.resume_label,.note_label {
-	min-width: 200px;
-	font-weight: bold;
-	font-size: 1.1em;
-}
-
-.note_label {
-	padding-top: 20px;
-}
-
-/* ------------------- Pied de page ------------------- */
-.pied {
-	clear: both;
-	height: 15px;
-	/* background: url('../img/bg_pied.png') no-repeat bottom left; */
-}
-
-/* ------------------- Param�tres communs (messages d'erreur, informations, etc...) ------------------- */
-.msg_err1 {
-	color: #c00;
-}
-
-/* Messages d'erreur */
-.cadre_err1 {
-	margin-right: 10px;
-	margin-bottom: 10px;
-	padding: 10px 10px;
-	border: 1px solid #c00;
-	background: #feffac;
-	color: #c00;
-}
-
-/* Titre */
-.err_titre {
-	font-weight: bold;
-    margin: 0 0 10px;
-    padding: 0;
-}
-
-/* Description */
-.err_desc {
-	margin: 0;
-	padding: 0;
-}
-
-/* Messages d'information */
-.cadre_msg1 {
-	margin-right: 10px;
-	margin-bottom: 10px;
-	padding: 10px 10px;
-	border: 1px solid #070;
-	background: #e8f8da;
-	color: #070;
-}
-
-/* Titre */
-.msg_titre {
-	font-weight: bold;
-    margin: 0 0 10px;
-    padding: 0;
-}
-
-/* Description */
-.msg_desc {
-	margin: 0;
-	padding: 0;
-}
-
-/* Affichage de la liste des resultats */
-.dhtml_bloc {
-	margin: 0;
-	padding: 3px;
-	font-size: 13px;
-	font-family: arial, sans-serif;
-	border: 1px solid #000;
-	z-index: 1;
-	width: 455px;
-	max-height: 500px;
-	overflow: auto;
-	position: absolute;
-	background-color: white;
-}
-
-.dhtml_defaut {
-	list-style-type: none;
-	display: block;
-	height: 16px;
-	overflow: hidden;
-}
-
-.dhtml_selection {
-	background-color: #3366cc;
-	color: white ! important;
-}
diff --git a/htdocs/cashdesk/css/ticket.css b/htdocs/cashdesk/css/ticket.css
deleted file mode 100644
index 248e0f7b9b6..00000000000
--- a/htdocs/cashdesk/css/ticket.css
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * TPV ticket.css
- */
-body {
-    font-size: 1.5em;
-    position: relative;
-}
-
-.entete { /* 		position: relative; */
-
-}
-
-.address { /* 			float: left; */
-    font-size: 12px;
-}
-
-.date_heure {
-    position: absolute;
-    top: 0;
-    right: 0;
-    font-size: 16px;
-}
-
-.infos {
-    position: relative;
-}
-
-.liste_articles {
-    width: 100%;
-    border-bottom: 1px solid #000;
-    text-align: center;
-}
-
-.liste_articles tr.titres th {
-    border-bottom: 1px solid #000;
-}
-
-.liste_articles td.total {
-    text-align: right;
-}
-
-.totaux {
-    margin-top: 20px;
-    width: 30%;
-    float: right;
-    text-align: right;
-}
-
-.lien {
-    position: absolute;
-    top: 0;
-    left: 0;
-    display: none;
-}
-
-@media print {
-    .lien {
-            display: none;
-    }
-}
-
diff --git a/htdocs/cashdesk/deconnexion.php b/htdocs/cashdesk/deconnexion.php
deleted file mode 100644
index f7506902ab5..00000000000
--- a/htdocs/cashdesk/deconnexion.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.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/cashdesk/deconnexion.php
- *	\ingroup    cashdesk
- *	\brief      Manage deconnexion for point of sale module
- */
-
-//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Uncomment creates pb to relogon after a disconnect
-if (!defined('NOREQUIREMENU')) {
-	define('NOREQUIREMENU', '1');
-}
-if (!defined('NOREQUIREHTML')) {
-	define('NOREQUIREHTML', '1');
-}
-if (!defined('NOREQUIREAJAX')) {
-	define('NOREQUIREAJAX', '1');
-}
-if (!defined('NOREQUIRESOC')) {
-	define('NOREQUIRESOC', '1');
-}
-
-require_once '../main.inc.php';
-
-// This destroy tag that say "Point of Sale session is on".
-unset($_SESSION['uid']);
-
-if (empty($user->rights->cashdesk->run)) {
-	accessforbidden();
-}
-
-header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php');
-exit;
diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php
deleted file mode 100644
index edce8acd781..00000000000
--- a/htdocs/cashdesk/facturation.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
- * Copyright (C) 2008-2011 Laurent Destailleur   <eldy@uers.sourceforge.net>
- * Copyright (C) 2011 Juanjo Menent			  	 <jmenent@2byte.es>
- * Copyright (C) 2013 Marcos García					<marcosgdf@gmail.com>
- * Copyright (C) 2013 Adolfo Segura 				<adolfo.segura@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/>.
- */
-
-/**
- *	\file       htdocs/cashdesk/facturation.php
- *	\ingroup    cashdesk
- *	\brief      Include to show main page for cashdesk module
- */
-
-
-if (empty($user->rights->cashdesk->run)) {
-	accessforbidden();
-}
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-
-// Get list of articles (in warehouse '$conf_fkentrepot' if defined and stock module enabled)
-if (GETPOST('filtre', 'alpha')) {
-	// Avec filtre
-	$ret = array(); $i = 0;
-
-	$sql = "SELECT p.rowid, p.ref, p.label, p.tva_tx, p.fk_product_type";
-	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) {
-		$sql .= ", ps.reel";
-	}
-	$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) {
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$db->escape($conf_fkentrepot)."'";
-	}
-	$sql .= " WHERE p.entity IN (".getEntity('product').")";
-	$sql .= " AND p.tosell = 1";
-	if (!$conf->global->CASHDESK_SERVICES) {
-		$sql .= " AND p.fk_product_type = 0";
-	}
-	$sql .= " AND (";
-	$sql .= "p.ref LIKE '%".$db->escape(GETPOST('filtre'))."%' OR p.label LIKE '%".$db->escape(GETPOST('filtre'))."%'";
-	if (!empty($conf->barcode->enabled)) {
-		$filtre = GETPOST('filtre', 'alpha');
-
-		//If the barcode looks like an EAN13 format and the last digit is included in it,
-		//then whe look for the 12-digit too
-		//As the twelve-digit string will also hit the 13-digit code, we only look for this one
-		if (strlen($filtre) == 13) {
-			$crit_12digit = substr($filtre, 0, 12);
-			$sql .= " OR p.barcode LIKE '%".$db->escape($crit_12digit)."%'";
-		} else {
-			$sql .= " OR p.barcode LIKE '%".$db->escape($filtre)."%'";
-		}
-	}
-	$sql .= ")";
-	$sql .= " ORDER BY label";
-
-	dol_syslog("facturation.php", LOG_DEBUG);
-	$resql = $db->query($sql);
-	if ($resql) {
-		$nbr_enreg = $db->num_rows($resql);
-
-		while ($i < $conf_taille_listes && $tab = $db->fetch_array($resql)) {
-			foreach ($tab as $cle => $valeur) {
-				$ret[$i][$cle] = $valeur;
-			}
-			$i++;
-		}
-		$db->free($resql);
-	} else {
-		dol_print_error($db);
-	}
-	$tab_designations = $ret;
-} else {
-	// Sans filtre
-	$ret = array();
-	$i = 0;
-
-	$sql = "SELECT p.rowid, ref, label, tva_tx, p.fk_product_type";
-	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) {
-		$sql .= ", ps.reel";
-	}
-	$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) {
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$db->escape($conf_fkentrepot)."'";
-	}
-	$sql .= " WHERE p.entity IN (".getEntity('product').")";
-	$sql .= " AND p.tosell = 1";
-	if (!$conf->global->CASHDESK_SERVICES) {
-		$sql .= " AND p.fk_product_type = 0";
-	}
-	$sql .= " ORDER BY p.label";
-
-	dol_syslog($sql);
-	$resql = $db->query($sql);
-	if ($resql) {
-		$nbr_enreg = $db->num_rows($resql);
-
-		while ($i < $conf_taille_listes && $tab = $db->fetch_array($resql)) {
-			foreach ($tab as $cle => $valeur) {
-				$ret[$i][$cle] = $valeur;
-			}
-			$i++;
-		}
-		$db->free($resql);
-	} else {
-		dol_print_error($db);
-	}
-	$tab_designations = $ret;
-}
-
-//$nbr_enreg = count($tab_designations);
-
-if ($nbr_enreg > 1) {
-	if ($nbr_enreg > $conf_taille_listes) {
-		$top_liste_produits = '----- '.$conf_taille_listes.' '.$langs->transnoentitiesnoconv("CashDeskProducts").' '.$langs->trans("CashDeskOn").' '.$nbr_enreg.' -----';
-	} else {
-		$top_liste_produits = '----- '.$nbr_enreg.' '.$langs->transnoentitiesnoconv("CashDeskProducts").' '.$langs->trans("CashDeskOn").' '.$nbr_enreg.' -----';
-	}
-} elseif ($nbr_enreg == 1) {
-	$top_liste_produits = '----- 1 '.$langs->transnoentitiesnoconv("ProductFound").' -----';
-} else {
-	$top_liste_produits = '----- '.$langs->transnoentitiesnoconv("NoProductFound").' -----';
-}
-
-
-// Recuperation des taux de tva
-global $mysoc;
-
-$ret = array();
-$i = 0;
-
-// Reinitialisation du mode de paiement, en cas de retour aux achats apres validation
-$obj_facturation->getSetPaymentMode('RESET');
-$obj_facturation->amountCollected('RESET');
-$obj_facturation->amountReturned('RESET');
-$obj_facturation->paiementLe('RESET');
-
-
-// Affichage des templates
-require 'tpl/facturation1.tpl.php';
diff --git a/htdocs/cashdesk/facturation_dhtml.php b/htdocs/cashdesk/facturation_dhtml.php
deleted file mode 100644
index 3d0e9ff84ec..00000000000
--- a/htdocs/cashdesk/facturation_dhtml.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008 	Jeremie Ollivier 	<jeremie.o@laposte.net>
- * Copyright (C) 2008-2009 	Laurent Destailleur <eldy@uers.sourceforge.net>
- * Copyright (C) 2015		Regis Houssin		<regis.houssin@inodbox.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/cashdesk/facturation_dhtml.php
- *	\ingroup    cashdesk
- *	\brief      This page is called each time we press a key in the code search form to show product combo list.
- */
-
-
-if (!defined('NOREQUIRESOC')) {
-	define('NOREQUIRESOC', '1');
-}
-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');
-}
-
-// Change this following line to use the correct relative path (../, ../../, etc)
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
-
-if (empty($user->rights->cashdesk->run)) {
-	accessforbidden();
-}
-
-
-/*
- * View
- */
-
-top_httphead('text/html');
-
-$search = GETPOST("code", "alpha");
-
-// Search from criteria
-if (dol_strlen($search) >= 0) {	// If search criteria is on char length at least
-	$sql = "SELECT p.rowid, p.ref, p.label, p.tva_tx";
-	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) {
-		$sql .= ", ps.reel";
-	}
-	$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) {
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$db->escape($conf_fkentrepot)."'";
-	}
-	$sql .= " WHERE p.entity IN (".getEntity('product').")";
-	$sql .= " AND p.tosell = 1";
-	$sql .= " AND p.fk_product_type = 0";
-	// Add criteria on ref/label
-	if (!empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE)) {
-		$sql .= " AND (p.ref LIKE '".$db->escape($search)."%' OR p.label LIKE '".$db->escape($search)."%'";
-		if (!empty($conf->barcode->enabled)) {
-			$sql .= " OR p.barcode LIKE '".$db->escape($search)."%'";
-		}
-		$sql .= ")";
-	} else {
-		$sql .= " AND (p.ref LIKE '%".$db->escape($search)."%' OR p.label LIKE '%".$db->escape($search)."%'";
-		if (!empty($conf->barcode->enabled)) {
-			$sql .= " OR p.barcode LIKE '%".$db->escape($search)."%'";
-		}
-		$sql .= ")";
-	}
-	$sql .= " ORDER BY label";
-
-	dol_syslog("facturation_dhtml.php", LOG_DEBUG);
-	$result = $db->query($sql);
-
-	if ($result) {
-		if ($nbr = $db->num_rows($result)) {
-			$resultat = '<ul class="dhtml_bloc">';
-
-			$ret = array(); $i = 0;
-			while ($tab = $db->fetch_array($result)) {
-				foreach ($tab as $cle => $valeur) {
-					$ret[$i][$cle] = $valeur;
-				}
-				$i++;
-			}
-			$tab = $ret;
-
-			$tab_size = count($tab);
-			for ($i = 0; $i < $tab_size; $i++) {
-				$resultat .= '
-					<li class="dhtml_defaut" title="'.$tab[$i]['ref'].'"
-						onMouseOver="javascript: this.className = \'dhtml_selection\';"
-						onMouseOut="javascript: this.className = \'dhtml_defaut\';"
-					>'.$tab[$i]['ref'].' - '.$tab[$i]['label'].'</li>
-				';
-			}
-
-			$resultat .= '</ul>';
-
-			print $resultat;
-		} else {
-			$langs->load("cashdesk");
-
-			print '<ul class="dhtml_bloc">';
-			print '<li class="dhtml_defaut">'.$langs->trans("NoResults").'</li>';
-			print '</ul>';
-		}
-	}
-}
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
deleted file mode 100644
index f51cda3e77b..00000000000
--- a/htdocs/cashdesk/facturation_verif.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier    <jeremie.o@laposte.net>
- * Copyright (C) 2008-2010 Laurent Destailleur <eldy@uers.sourceforge.net>
- * Copyright (C) 2018      Juanjo Menent       <jmenent@2byte.es>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/cashdesk/facturation_verif.php
- *	\ingroup    cashdesk
- *	\brief      facturation_verif.php
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
-require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-$action = GETPOST('action', 'aZ09');
-
-$obj_facturation = unserialize($_SESSION['serObjFacturation']);
-unset($_SESSION['serObjFacturation']);
-
-if (empty($user->rights->cashdesk->run)) {
-	accessforbidden();
-}
-
-
-/*
- * View
- */
-
-switch ($action) {
-	default:
-		if (GETPOST('hdnSource') != 'NULL') {
-			$sql = "SELECT p.rowid, p.ref, p.price, p.tva_tx, p.default_vat_code, p.recuperableonly";
-			if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) {
-				$sql .= ", ps.reel";
-			}
-			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-			if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) {
-				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = ".((int) $conf_fkentrepot);
-			}
-			$sql .= " WHERE p.entity IN (".getEntity('product').")";
-
-			// Recuperation des donnees en fonction de la source (liste deroulante ou champ texte) ...
-			if ($_POST['hdnSource'] == 'LISTE') {
-				$sql .= " AND p.rowid = ".((int) GETPOST('selProduit', 'int'));
-			} elseif ($_POST['hdnSource'] == 'REF') {
-				$sql .= " AND p.ref = '".$db->escape(GETPOST('txtRef', 'alpha'))."'";
-			}
-
-			$result = $db->query($sql);
-			if ($result) {
-				// ... et enregistrement dans l'objet
-				if ($db->num_rows($result)) {
-					$ret = array();
-					$tab = $db->fetch_array($result);
-					foreach ($tab as $key => $value) {
-						$ret[$key] = $value;
-					}
-					// Here $ret['tva_tx'] is vat rate of product but we want to not use the one into table but found by function
-
-					$productid = $ret['rowid'];
-					$product = new Product($db);
-					$product->fetch($productid);
-					$prod = $product;
-
-					$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
-					$societe = new Societe($db);
-					$societe->fetch($thirdpartyid);
-
-					// Update if prices fields are defined
-					$tva_tx = get_default_tva($mysoc, $societe, $product->id);
-					$tva_npr = get_default_npr($mysoc, $societe, $product->id);
-					if (empty($tva_tx)) {
-						$tva_npr = 0;
-					}
-
-					$pu_ht = $prod->price;
-					$pu_ttc = $prod->price_ttc;
-					$price_min = $prod->price_min;
-					$price_base_type = $prod->price_base_type;
-
-					// multiprix
-					if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($societe->price_level)) {
-						$pu_ht = $prod->multiprices[$societe->price_level];
-						$pu_ttc = $prod->multiprices_ttc[$societe->price_level];
-						$price_min = $prod->multiprices_min[$societe->price_level];
-						$price_base_type = $prod->multiprices_base_type[$societe->price_level];
-						if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {  // using this option is a bug. kept for backward compatibility
-							if (isset($prod->multiprices_tva_tx[$societe->price_level])) {
-								$tva_tx = $prod->multiprices_tva_tx[$societe->price_level];
-							}
-							if (isset($prod->multiprices_recuperableonly[$societe->price_level])) {
-								$tva_npr = $prod->multiprices_recuperableonly[$societe->price_level];
-							}
-						}
-					} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
-						require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
-
-						$prodcustprice = new Productcustomerprice($db);
-
-						$filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $societe->id);
-
-						$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-						if ($result >= 0) {
-							if (count($prodcustprice->lines) > 0) {
-								$pu_ht = price($prodcustprice->lines[0]->price);
-								$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
-								$price_base_type = $prodcustprice->lines[0]->price_base_type;
-								$tva_tx = $prodcustprice->lines[0]->tva_tx;
-								if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
-									$tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
-								}
-								$tva_npr = $prodcustprice->lines[0]->recuperableonly;
-								if (empty($tva_tx)) {
-									$tva_npr = 0;
-								}
-							}
-						} else {
-							setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-						}
-					}
-
-					$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
-					$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
-
-					// if price ht is forced (ie: calculated by margin rate and cost price). TODO Why this ?
-					if (!empty($price_ht)) {
-						$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');
-						}
-					}
-
-					$obj_facturation->id($ret['rowid']);
-					$obj_facturation->ref($ret['ref']);
-					$obj_facturation->stock($ret['reel']);
-					//$obj_facturation->prix($ret['price']);
-					$obj_facturation->prix($pu_ht);
-
-
-					$vatrate = $tva_tx;
-					$obj_facturation->vatrate = $vatrate; // Save vat rate (full text vat with code)
-
-					// Definition du filtre pour n'afficher que le produit concerne
-					if (GETPOST('hdnSource') == 'LISTE') {
-						$filtre = $ret['ref'];
-					} elseif (GETPOST('hdnSource') == 'REF') {
-						$filtre = GETPOST('txtRef');
-					}
-
-					$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&filtre='.urlencode($filtre);
-				} else {
-					$obj_facturation->raz();
-
-					if (GETPOST('hdnSource') == 'REF') {
-						$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&filtre='.urlencode(GETPOST('txtRef'));
-					} else {
-						$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
-					}
-				}
-			} else {
-				dol_print_error($db);
-			}
-		} else {
-			$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
-		}
-
-		break;
-
-	case 'change_thirdparty':	// We have clicked on button "Modify" a thirdparty
-		$newthirdpartyid = GETPOST('CASHDESK_ID_THIRDPARTY', 'int');
-		if ($newthirdpartyid > 0) {
-			$_SESSION["CASHDESK_ID_THIRDPARTY"] = $newthirdpartyid;
-		}
-
-		$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
-		break;
-
-	case 'ajout_article':
-		if (!empty($obj_facturation->id)) {	// A product was previously selected and stored in session, so we can add it
-			dol_syslog("facturation_verif save vat ".GETPOST('selTva'));
-			$obj_facturation->qte(GETPOST('txtQte'));
-			$obj_facturation->tva(GETPOST('selTva')); // id of vat. Saved so we can use it for next product
-			$obj_facturation->remisePercent(GETPOST('txtRemise'));
-			$obj_facturation->ajoutArticle(); // This add an entry into $_SESSION['poscart']
-			// We update prixTotalTtc
-		}
-
-		$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
-		break;
-
-	case 'suppr_article':
-		$obj_facturation->supprArticle(GETPOST('suppr_id'));
-
-		$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
-		break;
-}
-
-// We saved object obj_facturation
-$_SESSION['serObjFacturation'] = serialize($obj_facturation);
-//var_dump($_SESSION['serObjFacturation']);
-header('Location: '.$redirection);
-exit;
diff --git a/htdocs/cashdesk/img/basket_delete.png b/htdocs/cashdesk/img/basket_delete.png
deleted file mode 100644
index 9419d91d9f1..00000000000
Binary files a/htdocs/cashdesk/img/basket_delete.png and /dev/null differ
diff --git a/htdocs/cashdesk/img/bg_conteneur_droite.png b/htdocs/cashdesk/img/bg_conteneur_droite.png
deleted file mode 100644
index 87d7fcf069a..00000000000
Binary files a/htdocs/cashdesk/img/bg_conteneur_droite.png and /dev/null differ
diff --git a/htdocs/cashdesk/img/bg_conteneur_gauche.png b/htdocs/cashdesk/img/bg_conteneur_gauche.png
deleted file mode 100644
index a6da5629413..00000000000
Binary files a/htdocs/cashdesk/img/bg_conteneur_gauche.png and /dev/null differ
diff --git a/htdocs/cashdesk/img/bg_entete.png b/htdocs/cashdesk/img/bg_entete.png
deleted file mode 100644
index 0c7670509bc..00000000000
Binary files a/htdocs/cashdesk/img/bg_entete.png and /dev/null differ
diff --git a/htdocs/cashdesk/img/bg_pied.png b/htdocs/cashdesk/img/bg_pied.png
deleted file mode 100644
index 36a38a42ced..00000000000
Binary files a/htdocs/cashdesk/img/bg_pied.png and /dev/null differ
diff --git a/htdocs/cashdesk/img/calendrier.png b/htdocs/cashdesk/img/calendrier.png
deleted file mode 100644
index 7ac67ea96b3..00000000000
Binary files a/htdocs/cashdesk/img/calendrier.png and /dev/null differ
diff --git a/htdocs/cashdesk/img/decrypted.png b/htdocs/cashdesk/img/decrypted.png
deleted file mode 100644
index 8d2b4696a2b..00000000000
Binary files a/htdocs/cashdesk/img/decrypted.png and /dev/null differ
diff --git a/htdocs/cashdesk/img/gescom.png b/htdocs/cashdesk/img/gescom.png
deleted file mode 100644
index 0ec1639335e..00000000000
Binary files a/htdocs/cashdesk/img/gescom.png and /dev/null differ
diff --git a/htdocs/cashdesk/img/lock.png b/htdocs/cashdesk/img/lock.png
deleted file mode 100644
index 55258949069..00000000000
Binary files a/htdocs/cashdesk/img/lock.png and /dev/null differ
diff --git a/htdocs/cashdesk/img/login.png b/htdocs/cashdesk/img/login.png
deleted file mode 100644
index 600cb67dd0a..00000000000
Binary files a/htdocs/cashdesk/img/login.png and /dev/null differ
diff --git a/htdocs/cashdesk/img/new.png b/htdocs/cashdesk/img/new.png
deleted file mode 100644
index ed848a86550..00000000000
Binary files a/htdocs/cashdesk/img/new.png and /dev/null differ
diff --git a/htdocs/cashdesk/include/environnement.php b/htdocs/cashdesk/include/environnement.php
deleted file mode 100644
index fc67c65ea4c..00000000000
--- a/htdocs/cashdesk/include/environnement.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier     <jeremie.o@laposte.net>
- * Copyright (C) 2009-2011 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// This file initializes more variables to already initialized variables with main.inc.php
-// So include of this file must be always done after include to main.inc.php
-
-$conf_db_type = $dolibarr_main_db_type;
-
-// Parametres de connexion a la base
-$conf_db_host = $dolibarr_main_db_host;
-$conf_db_user = $dolibarr_main_db_user;
-$conf_db_pass = $dolibarr_main_db_pass;
-$conf_db_base = $dolibarr_main_db_name;
-
-// Identifiant unique correspondant au tiers generique pour la vente
-$conf_fksoc = (!empty($_SESSION["CASHDESK_ID_THIRDPARTY"])) ? $_SESSION["CASHDESK_ID_THIRDPARTY"] : ($conf->global->CASHDESK_ID_THIRDPARTY > 0 ? $conf->global->CASHDESK_ID_THIRDPARTY : 0);
-// Identifiant unique correspondant a l'entrepot a utiliser
-$conf_fkentrepot = (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"])) ? $_SESSION["CASHDESK_ID_WAREHOUSE"] : ($conf->global->CASHDESK_ID_WAREHOUSE > 0 ? $conf->global->CASHDESK_ID_WAREHOUSE : 0);
-if (!empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
-	$conf_fkentrepot = 0; // If option to disable the stock decrease is on, we set warehouse id to 0.
-}
-
-// Identifiant unique correspondant au compte caisse / liquide
-$conf_fkaccount_cash = (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"])) ? $_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"] : ($conf->global->CASHDESK_ID_BANKACCOUNT_CASH > 0 ? $conf->global->CASHDESK_ID_BANKACCOUNT_CASH : 0);
-// Identifiant unique correspondant au compte cheque
-$conf_fkaccount_cheque = (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CHEQUE"])) ? $_SESSION["CASHDESK_ID_BANKACCOUNT_CHEQUE"] : ($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE > 0 ? $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE : 0);
-// Identifiant unique correspondant au compte cb
-$conf_fkaccount_cb = (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CB"])) ? $_SESSION["CASHDESK_ID_BANKACCOUNT_CB"] : ($conf->global->CASHDESK_ID_BANKACCOUNT_CB > 0 ? $conf->global->CASHDESK_ID_BANKACCOUNT_CB : 0);
-//var_dump($_SESSION);
-
-
-// View parameters
-$conf_taille_listes = (empty($conf->global->PRODUIT_LIMIT_SIZE) ? 1000 : $conf->global->PRODUIT_LIMIT_SIZE); // Number max of lines to show in lists
-$conf_nbr_car_listes = 60; // Nombre max de caracteres par ligne dans les listes
diff --git a/htdocs/cashdesk/include/keypad.php b/htdocs/cashdesk/include/keypad.php
deleted file mode 100644
index 6e4c9c874d6..00000000000
--- a/htdocs/cashdesk/include/keypad.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/* Copyright (C) 2014	Charles-FR BENKE		<charles.fr@benke.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- * Return a string to output a keypad
- *
- * @param	string		$keypadname		Key pad name
- * @param 	string		$formname		Form name
- * @return	string						HTML code to show a js keypad.
- */
-function genkeypad($keypadname, $formname)
-{
-	global $conf;
-
-	if (empty($conf->global->CASHDESK_SHOW_KEYPAD)) {
-		return '';
-	}
-
-	// défine the font size of button
-	$btnsize = 32;
-	$sz = '<input type="button" id="closekeypad'.$keypadname.'" value="X" style="display:none;" onclick="closekeypad(\''.$keypadname.'\')"/>'."\n";
-	$sz .= '<input type="button" value="..." id="openkeypad'.$keypadname.'" onclick="openkeypad(\''.$keypadname.'\')"/><br>'."\n";
-	$sz .= '<div id="keypad'.$keypadname.'" style="position:absolute;z-index:90;display:none; background:#AAA; vertical-align:top;">'."\n";
-	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 7 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',7);"/>'."\n";
-	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 8 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',8);"/>'."\n";
-	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 9 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',9);"/><br>'."\n";
-
-	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 4 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',4);"/>'."\n";
-	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 5 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',5);"/>'."\n";
-	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 6 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',6);"/><br>'."\n";
-
-	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 1 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',1);"/>'."\n";
-	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 2 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',2);"/>'."\n";
-	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 3 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',3);"/><br>'."\n";
-
-	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value=" 0 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',0);"/>'."\n";
-	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value="&larr;" ';
-	$sz .= ' onclick="document.getElementById(\''.$keypadname.'\').value=document.getElementById(\''.$keypadname.'\').value.substr(0,document.getElementById(\''.$keypadname.'\').value.length-1);modif();"/>'."\n";
-	$sz .= '<input type="button" style="font-size:'.$btnsize.'px;" value="CE" onclick="document.getElementById(\''.$keypadname.'\').value=0;modif();"/>'."\n";
-	$sz .= '</div>';
-	return $sz;
-}
diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php
deleted file mode 100644
index a4ee6fa415c..00000000000
--- a/htdocs/cashdesk/index.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier    <jeremie.o@laposte.net>
- * Copyright (C) 2011-2017 Juanjo Menent   	   <jmenent@2byte.es>
- * Copyright (C) 2011      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/cashdesk/index.php
- * 	\ingroup	cashdesk
- *  \brief      File to login to point of sales
- */
-
-// Set and init common variables
-// This include will set: config file variable $dolibarr_xxx, $conf, $langs and $mysoc objects
-require_once '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("admin", "cashdesk"));
-
-// Test if user logged
-if ($_SESSION['uid'] > 0) {
-	header('Location: '.DOL_URL_ROOT.'/cashdesk/affIndex.php');
-	exit;
-}
-
-$usertxt = GETPOST('user', '', 1);
-$err = GETPOST("err");
-
-// Instantiate hooks of thirdparty module only if not already define
-$hookmanager->initHooks(array('cashdeskloginpage'));
-
-if (empty($user->rights->cashdesk->run)) {
-	accessforbidden();
-}
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-$formproduct = new FormProduct($db);
-
-$arrayofcss = array('/cashdesk/css/style.css');
-top_htmlhead('', '', 0, 0, '', $arrayofcss);
-
-// Execute hook getLoginPageOptions (for table)
-$parameters = array('entity' => GETPOST('entity', 'int'));
-$reshook = $hookmanager->executeHooks('getLoginPageOptions', $parameters); // Note that $action and $object may have been modified by some hooks.
-if (is_array($hookmanager->resArray) && !empty($hookmanager->resArray)) {
-	$morelogincontent = $hookmanager->resArray; // (deprecated) For compatibility
-} else {
-	$morelogincontent = $hookmanager->resPrint;
-}
-?>
-
-<body>
-<div class="conteneur">
-<div class="conteneur_img_gauche">
-<div class="conteneur_img_droite">
-
-<div class="menu_principal hideonsmartphone">
-<div class="logo">
-<?php
-if (!empty($mysoc->logo_small)) {
-	print '<img class="logopos" alt="Logo company" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">';
-} else {
-	print '<div class="logopos">'.$mysoc->name.'</div>';
-}
-?>
-</div>
-</div>
-
-<div class="contenu">
-<div class="inline-block" style="vertical-align: top">
-<div class="principal_login">
-<?php if ($err) {
-	print dol_escape_htmltag($err)."<br><br>\n";
-} ?>
-<fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Identification"); ?></legend>
-<form id="frmLogin" method="POST" action="index_verif.php">
-	<input type="hidden" name="token" value="<?php echo newToken(); ?>" />
-
-<table>
-
-	<tr>
-		<td class="label1"><?php echo $langs->trans("Login"); ?></td>
-		<td><input name="txtUsername" class="texte_login maxwidth150onsmartphoneimp" type="text" value="<?php echo $usertxt; ?>" /></td>
-	</tr>
-	<tr>
-		<td class="label1"><?php echo $langs->trans("Password"); ?></td>
-		<td><input name="pwdPassword" class="texte_login maxwidth150onsmartphoneimp" type="password" value="" /></td>
-	</tr>
-
-<?php
-if (!empty($morelogincontent)) {
-	if (is_array($morelogincontent)) {
-		foreach ($morelogincontent as $format => $option) {
-			if ($format == 'table') {
-				echo '<!-- Option by hook -->';
-				echo $option;
-			}
-		}
-	} else {
-		echo '<!-- Option by hook -->';
-		echo $morelogincontent;
-	}
-}
-?>
-
-	<tr>
-		<td colspan="2">
-		&nbsp;
-		</td>
-	</tr>
-
-<?php
-print "<tr>";
-print '<td class="label1">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
-print '<td>';
-$disabled = 0;
-$langs->load("companies");
-if (!empty($conf->global->CASHDESK_ID_THIRDPARTY)) {
-	$disabled = 1; // If a particular third party is defined, we disable choice
-}
-print $form->select_company(GETPOST('socid', 'int') ?GETPOST('socid', 'int') : $conf->global->CASHDESK_ID_THIRDPARTY, 'socid', '(s.client IN (1,3) AND s.status = 1)', !$disabled, $disabled, 0, array(), 0, 'maxwidth300');
-//print '<input name="warehouse_id" class="texte_login" type="warehouse_id" value="" />';
-print '</td>';
-print "</tr>\n";
-
-if (!empty($conf->stock->enabled) && empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
-	$langs->load("stocks");
-	print "<tr>";
-	print '<td class="label1">'.$langs->trans("Warehouse").'</td>';
-	print '<td>';
-	$disabled = 0;
-	if ($conf->global->CASHDESK_ID_WAREHOUSE > 0) {
-		$disabled = 1; // If a particular stock is defined, we disable choice
-	}
-	print $formproduct->selectWarehouses((GETPOST('warehouseid') ?GETPOST('warehouseid', 'int') : (empty($conf->global->CASHDESK_ID_WAREHOUSE) ? 'ifone' : $conf->global->CASHDESK_ID_WAREHOUSE)), 'warehouseid', '', !$disabled, $disabled);
-	print '</td>';
-	print "</tr>\n";
-}
-
-print "<tr>";
-print '<td class="label1">'.$langs->trans("CashDeskBankAccountForSell").'</td>';
-print '<td>';
-$defaultknown = 0;
-if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH) && $conf->global->CASHDESK_ID_BANKACCOUNT_CASH > 0) {
-	$defaultknown = 1; // If a particular stock is defined, we disable choice
-}
-$form->select_comptes(((GETPOST('bankid_cash') > 0) ?GETPOST('bankid_cash') : $conf->global->CASHDESK_ID_BANKACCOUNT_CASH), 'CASHDESK_ID_BANKACCOUNT_CASH', 0, "courant=2", ($defaultknown ? 0 : 2));
-print '</td>';
-print "</tr>\n";
-
-print "<tr>";
-print '<td class="label1">'.$langs->trans("CashDeskBankAccountForCheque").'</td>';
-print '<td>';
-$defaultknown = 0;
-if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE) && $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE > 0) {
-	$defaultknown = 1; // If a particular stock is defined, we disable choice
-}
-$form->select_comptes(((GETPOST('bankid_cheque') > 0) ?GETPOST('bankid_cheque') : $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE), 'CASHDESK_ID_BANKACCOUNT_CHEQUE', 0, "courant=1", ($defaultknown ? 0 : 2));
-print '</td>';
-print "</tr>\n";
-
-print "<tr>";
-print '<td class="label1">'.$langs->trans("CashDeskBankAccountForCB").'</td>';
-print '<td>';
-$defaultknown = 0;
-if (!empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB) && $conf->global->CASHDESK_ID_BANKACCOUNT_CB > 0) {
-	$defaultknown = 1; // If a particular stock is defined, we disable choice
-}
-$form->select_comptes(((GETPOST('bankid_cb') > 0) ?GETPOST('bankid_cb') : $conf->global->CASHDESK_ID_BANKACCOUNT_CB), 'CASHDESK_ID_BANKACCOUNT_CB', 0, "courant=1", ($defaultknown ? 0 : 2));
-print '</td>';
-print "</tr>\n";
-
-?>
-
-	<tr>
-		<td colspan="2">
-		&nbsp;
-		</td>
-	</tr>
-
-
-</table>
-<br>
-
-<div align="center"><span class="bouton_login"><input class="button" type="submit" value="<?php echo dol_escape_htmltag($langs->trans("Connection")); ?>" /></span></div>
-
-</form>
-</fieldset>
-
-
-<?php
-if ($_GET['err'] < 0) {
-	echo ('<script type="text/javascript">');
-	echo ('	document.getElementById(\'frmLogin\').pwdPassword.focus();');
-	echo ('</script>');
-} else {
-	echo ('<script type="text/javascript">');
-	echo ('	document.getElementById(\'frmLogin\').txtUsername.focus();');
-	echo ('</script>');
-}
-?>
-
-</div>
-</div>
-</div>
-
-<?php include 'affPied.php'; ?></div>
-</div>
-</div>
-</body>
-
-<?php
-print '</html>';
diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php
deleted file mode 100644
index 94e0e7009cf..00000000000
--- a/htdocs/cashdesk/index_verif.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier    <jeremie.o@laposte.net>
- * Copyright (C) 2008-2010 Laurent Destailleur <eldy@uers.sourceforge.net>
- * Copyright (C) 2011	   Juanjo Menent	   <jmenent@2byte.es>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *
- * This page is called after submission of login page.
- * We set here login choices into session.
- */
-
-/**
- *	\file       htdocs/cashdesk/index_verif.php
- *	\ingroup    cashdesk
- *	\brief      index_verif.php
- */
-
-include '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
-require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Auth.class.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("admin", "cashdesk"));
-
-$username = GETPOST("txtUsername");
-$password = GETPOST("pwdPassword");
-$thirdpartyid = (GETPOST('socid', 'int') > 0) ?GETPOST('socid', 'int') : $conf->global->CASHDESK_ID_THIRDPARTY;
-$warehouseid = (GETPOST("warehouseid") > 0) ?GETPOST("warehouseid", 'int') : $conf->global->CASHDESK_ID_WAREHOUSE;
-$bankid_cash = (GETPOST("CASHDESK_ID_BANKACCOUNT_CASH") > 0) ?GETPOST("CASHDESK_ID_BANKACCOUNT_CASH", 'int') : $conf->global->CASHDESK_ID_BANKACCOUNT_CASH;
-$bankid_cheque = (GETPOST("CASHDESK_ID_BANKACCOUNT_CHEQUE") > 0) ?GETPOST("CASHDESK_ID_BANKACCOUNT_CHEQUE", 'int') : $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE;
-$bankid_cb = (GETPOST("CASHDESK_ID_BANKACCOUNT_CB") > 0) ?GETPOST("CASHDESK_ID_BANKACCOUNT_CB", 'int') : $conf->global->CASHDESK_ID_BANKACCOUNT_CB;
-
-
-if (empty($user->rights->cashdesk->run)) {
-	accessforbidden();
-}
-
-
-// Check username
-if (empty($username)) {
-	$retour = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Login"));
-	header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username.'&socid='.$thirdpartyid.'&warehouseid='.$warehouseid.'&bankid_cash='.$bankid_cash.'&bankid_cheque='.$bankid_cheque.'&bankid_cb='.$bankid_cb);
-	exit;
-}
-// Check third party id
-if (!($thirdpartyid > 0)) {
-	$retour = $langs->trans("ErrorFieldRequired", $langs->transnoentities("CashDeskThirdPartyForSell"));
-	header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username.'&socid='.$thirdpartyid.'&warehouseid='.$warehouseid.'&bankid_cash='.$bankid_cash.'&bankid_cheque='.$bankid_cheque.'&bankid_cb='.$bankid_cb);
-	exit;
-}
-
-// If we setup stock module to ask movement on invoices, we must not allow access if required setup not finished.
-if (!empty($conf->stock->enabled) && empty($conf->global->CASHDESK_NO_DECREASE_STOCK) && !($warehouseid > 0)) {
-	$retour = $langs->trans("CashDeskYouDidNotDisableStockDecease");
-	header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username.'&socid='.$thirdpartyid.'&warehouseid='.$warehouseid.'&bankid_cash='.$bankid_cash.'&bankid_cheque='.$bankid_cheque.'&bankid_cb='.$bankid_cb);
-	exit;
-}
-
-// If stock decrease on bill validation, check user has stock edit permissions
-if (!empty($conf->stock->enabled) && empty($conf->global->CASHDESK_NO_DECREASE_STOCK) && !empty($username)) {
-	$testuser = new User($db);
-	$testuser->fetch(0, $username);
-	$testuser->getrights('stock');
-	if (empty($testuser->rights->stock->creer)) {
-		$retour = $langs->trans("UserNeedPermissionToEditStockToUsePos");
-		header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username.'&socid='.$thirdpartyid.'&warehouseid='.$warehouseid.'&bankid_cash='.$bankid_cash.'&bankid_cheque='.$bankid_cheque.'&bankid_cb='.$bankid_cb);
-		exit;
-	}
-}
-
-
-// Check password
-$auth = new Auth($db);
-$retour = $auth->verif($username, $password);
-
-if ($retour >= 0) {
-	$return = array();
-
-	$sql = "SELECT rowid, lastname, firstname";
-	$sql .= " FROM ".MAIN_DB_PREFIX."user";
-	$sql .= " WHERE login = '".$db->escape($username)."'";
-	$sql .= " AND entity IN (0,".$conf->entity.")";
-
-	$result = $db->query($sql);
-	if ($result) {
-		$tab = $db->fetch_array($res);
-
-		foreach ($tab as $key => $value) {
-			$return[$key] = $value;
-		}
-
-		$_SESSION['uid'] = $tab['rowid'];
-		$_SESSION['uname'] = $username;
-		$_SESSION['lastname'] = $tab['lastname'];
-		$_SESSION['firstname'] = $tab['firstname'];
-		$_SESSION['CASHDESK_ID_THIRDPARTY'] = ($thirdpartyid > 0 ? $thirdpartyid : '');
-		$_SESSION['CASHDESK_ID_WAREHOUSE'] = ($warehouseid > 0 ? $warehouseid : '');
-
-		$_SESSION['CASHDESK_ID_BANKACCOUNT_CASH'] = ($bankid_cash > 0 ? $bankid_cash : '');
-		$_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] = ($bankid_cheque > 0 ? $bankid_cheque : '');
-		$_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] = ($bankid_cb > 0 ? $bankid_cb : '');
-		//var_dump($_SESSION);exit;
-
-		header('Location: '.DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&id=NOUV');
-		exit;
-	} else {
-		dol_print_error($db);
-	}
-} else {
-	// Load translation files required by the page
-	$langs->loadLangs(array("other", "errors"));
-	$retour = $langs->trans("ErrorBadLoginPassword");
-	header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username.'&socid='.$thirdpartyid.'&warehouseid='.$warehouseid);
-	exit;
-}
diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js
deleted file mode 100644
index fd15704b318..00000000000
--- a/htdocs/cashdesk/javascript/dhtml.js
+++ /dev/null
@@ -1,73 +0,0 @@
-
-/* Copyright (C) 2007-2008	Jeremie Ollivier	<jeremie.o@laposte.net>
- * Copyright (C) 2015		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/>.
- */
-
-// Instanciation et initialisation de l'objet xmlhttprequest
-function file(fichier) {
-
-	// Instanciation de l'objet pour Mozilla, Konqueror, Opera, Safari, etc ...
-	if (window.XMLHttpRequest) {
-
-		xhr_object = new XMLHttpRequest ();
-
-	// ... ou pour IE
-	} else if (window.ActiveXObject) {
-
-		xhr_object = new ActiveXObject ("Microsoft.XMLHTTP");
-
-	} else {
-
-		return (false);
-
-	}
-
-	xhr_object.open ("GET", fichier, false);
-	xhr_object.send (null);
-
-	if (xhr_object.readyState == 4) {
-
-		return (xhr_object.responseText);
-
-	} else {
-
-		return (false);
-
-	}
-
-}
-
-
-// aCible : id du bloc de destination; aCode : argument a passer a la page php chargee du traitement et de l'affichage
-function verifResultat(aCible, aCode, iLimit) {
-	if (aCode != '' && aCode.length >= iLimit) {
-
-		if (texte = file('facturation_dhtml.php?code='+escape(aCode))) {
-			document.getElementById(aCible).innerHTML = texte;
-		} else
-			document.getElementById(aCible).innerHTML = '';
-	}
-
-}
-
-
-// Change dynamiquement la classe de l'element ayant l'id aIdElement pour aClasse
-function setStyle(aIdElement, aClasse) {
-
-	aIdElement.className = aClasse;
-
-}
-
diff --git a/htdocs/cashdesk/javascript/facturation1.js b/htdocs/cashdesk/javascript/facturation1.js
deleted file mode 100644
index b25a1473c53..00000000000
--- a/htdocs/cashdesk/javascript/facturation1.js
+++ /dev/null
@@ -1,175 +0,0 @@
-
-/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.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/>.
- */
-
-// Calcul et affichage en temps reel des informations sur le produit en cours
-function modif() {
-
-	var prix_unit = parseFloat ( document.getElementById('frmQte').txtPrixUnit.value );
-	var qte = parseFloat ( document.getElementById('frmQte').txtQte.value );
-	var _index = parseFloat ( document.getElementById('frmQte').selTva.selectedIndex );
-	var tva = parseFloat ( document.getElementById('frmQte').selTva.options[_index].text );
-	var remise = parseInt ( document.getElementById('frmQte').txtRemise.value );
-	var stock = document.getElementById('frmQte').txtStock.value;
-
-// 		// On s'assure que la quantitee tapee ne depasse pas le stock
-// 		if ( qte > stock ) {
-//
-// 			qte = stock;
-// 			document.getElementById('frmQte').txtQte.value = qte;
-//
-// 		}
-//
-// 		if ( qte < 1 ) {
-//
-// 			qte = 1;
-// 			document.getElementById('frmQte').txtQte.value = qte;
-//
-// 		}
-//
-// 		if ( !stock || stock <= 0 ) {
-//
-// 			qte = 0;
-// 			document.getElementById('frmQte').txtQte.value = qte;
-//
-// 		}
-
-	// Calcul du total HT, sans remise
-	var total_ht = Math.round ( (prix_unit * qte) * 100 ) / 100;
-
-	// Calcul du montant de la remise, apres s'etre assure que cette derniere ne soit pas negative
-	if ( remise <= 0 ) {
-
-		document.getElementById('frmQte').txtRemise.value = 0;
-		montant_remise = 0;
-
-	} else {
-
-		var montant_remise = total_ht * remise / 100;
-
-	}
-
-	// Recalcul du montant total, avec la remise
-	var total = Math.round ( (total_ht - montant_remise) *100 ) / 100;
-
-	// Affichage du resultat dans le formulaire
-	document.getElementById('frmQte').txtTotal.value = total.toFixed(2);
-
-}
-
-// Affecte la source de la requete (liste deroulante ou champ texte 'ref') au champ cache
-function setSource(aSrc) {
-
-	document.getElementById('frmFacturation').hdnSource.value = aSrc;
-	document.getElementById('frmFacturation').submit();
-
-}
-
-// Verification de la coherence des informations saisies dans le formulaire de choix du nombre d'articles
-function verifSaisie() {
-
-	if ( document.getElementById('frmQte').txtQte.value ) {
-
-		return true;
-
-	} else {
-
-		document.getElementById('frmQte').txtQte.focus();
-		return false;
-
-	}
-
-}
-
-// Verification de la coherence des informations saisies dans le formulaire de calcul de la difference
-function verifDifference() {
-
-	var du = parseFloat ( document.getElementById('frmDifference').txtDu.value );
-	var encaisse = parseFloat ( document.getElementById('frmDifference').txtEncaisse.value );
-
-	if (encaisse > du) {
-
-		resultat = Math.round ( (encaisse - du) * 100 ) / 100;
-		document.getElementById('frmDifference').txtRendu.value = resultat.toFixed(2);
-
-	} else if (encaisse == du) {
-
-		document.getElementById('frmDifference').txtRendu.value = '0';
-
-	} else {
-
-		document.getElementById('frmDifference').txtRendu.value = '-';
-
-	}
-
-}
-
-// Affecte le moyen de paiement (ESP, CB ou CHQ) au champ cache en fonction du bouton clique
-function verifClic(aChoix) {
-
-	document.getElementById('frmDifference').hdnChoix.value = aChoix;
-
-}
-
-// Determination du moyen de paiement, et validation du formulaire si les donnees sont coherentes
-function verifReglement() {
-
-	var choix = document.getElementById('frmDifference').hdnChoix.value;
-	var du = parseFloat (document.getElementById('frmDifference').txtDu.value);
-	var encaisse = parseFloat (document.getElementById('frmDifference').txtEncaisse.value);
-
-	if ( du > 0 ) {
-
-		if ( choix == 'ESP' ) {
-
-			if ( encaisse != 0 && encaisse >= du ) {
-
-				return true;
-
-			} else {
-
-				document.getElementById('frmDifference').txtEncaisse.select();
-				document.getElementById('frmDifference').txtEncaisse.focus();
-				return false;
-
-			}
-
-		} else if ( choix == 'DIF' ) {
-
-			if ( document.getElementById('frmDifference').txtDatePaiement.value ) {
-
-				return true;
-
-			} else {
-
-				document.getElementById('frmDifference').txtDatePaiement.select();
-				document.getElementById('frmDifference').txtDatePaiement.focus();
-				return false;
-
-			}
-
-		} else {
-
-			return true;
-
-		}
-
-	} else {
-
-		return false;
-
-	}
-}
diff --git a/htdocs/cashdesk/javascript/keypad.js b/htdocs/cashdesk/javascript/keypad.js
deleted file mode 100644
index 48d8491e8bc..00000000000
--- a/htdocs/cashdesk/javascript/keypad.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (C) 2014	Charles-FR BENKE		<charles.fr@benke.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-function closekeypad(keypadname)
-{
-	document.getElementById('keypad'+keypadname).style.display='none';
-	document.getElementById('closekeypad'+keypadname).style.display='none';
-	document.getElementById('openkeypad'+keypadname).style.display='inline-block';
-}
-function openkeypad(keypadname)
-{
-	document.getElementById('keypad'+keypadname).style.display='inline-block';
-	document.getElementById('closekeypad'+keypadname).style.display='inline-block';
-	document.getElementById('openkeypad'+keypadname).style.display='none';
-}
-function addvalue(keypadname, formname, valueToAdd)
-{
-	myform=document.forms[formname];
-	if (myform.elements[keypadname].value=="0")
-		myform.elements[keypadname].value="";
-	myform.elements[keypadname].value+=valueToAdd;
-	modif();
-}
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
deleted file mode 100644
index 41a0f0b757e..00000000000
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008	Jeremie Ollivier	<jeremie.o@laposte.net>
- * Copyright (C) 2011		Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2011		Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2015		Regis Houssin		<regis.houssin@inodbox.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/>.
- *
- */
-
-// Protection to avoid direct call of template
-if (empty($langs) || !is_object($langs)) {
-	print "Error, template page can't be called as URL";
-	exit;
-}
-
-// Load translation files required by the page
-$langs->loadLangs(array("main", "bills", "cashdesk"));
-
-// Object $form must de defined
-
-?>
-
-<script type="text/javascript" src="javascript/facturation1.js"></script>
-<script type="text/javascript" src="javascript/dhtml.js"></script>
-<script type="text/javascript" src="javascript/keypad.js"></script>
-
-<!-- ========================= Cadre "Article" ============================= -->
-<fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Article"); ?></legend>
-	<form id="frmFacturation" class="formulaire1" method="post" action="facturation_verif.php" autocomplete="off">
-		<input type="hidden" name="token" value="<?php echo newToken(); ?>" />
-
-		<input type="hidden" name="hdnSource" value="NULL" />
-
-		<table class="center">
-			<tr><th class="label1"><?php echo $langs->trans("FilterRefOrLabelOrBC"); ?></th><th class="label1"><?php echo $langs->trans("Designation"); ?></th></tr>
-			<tr>
-			<!-- Affichage de la reference et de la designation -->
-			<!-- Suppression de l'attribut onkeyup qui causait un probleme d'emulation avec les douchettes -->
-			<td><input class="texte_ref" type="text" id ="txtRef" name="txtRef" value="<?php echo $obj_facturation->ref() ?>"
-				onchange="javascript: setSource('REF');"
-				onfocus="javascript: this.select();" />
-			</td>
-			<td class="select_design maxwidthonsmartphone">
-				<select id="selProduit" class="maxwidthonsmartphone" name="selProduit" onchange="javascript: setSource('LISTE');">
-<?php
-print '<option value="0">'.$top_liste_produits.'</option>'."\n";
-
-$id = $obj_facturation->id();
-
-// Si trop d'articles ont ete trouves, on n'affiche que les X premiers (defini dans le fichier de configuration) ...
-
-$nbtoshow = $nbr_enreg;
-if (!empty($conf_taille_listes) && $nbtoshow > $conf_taille_listes) {
-	$nbtoshow = $conf_taille_listes;
-}
-
-for ($i = 0; $i < $nbtoshow; $i++) {
-	if ($id == $tab_designations[$i]['rowid']) {
-		$selected = 'selected';
-	} else {
-		$selected = '';
-	}
-
-	$label = $tab_designations[$i]['label'];
-
-	print '<option '.$selected.' value="'.$tab_designations[$i]['rowid'].'">'.dol_trunc($tab_designations[$i]['ref'], 16).' - '.dol_trunc($label, 35, 'middle');
-	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot) && $tab_designations[$i]['fk_product_type'] == 0) {
-		print ' ('.$langs->trans("CashDeskStock").': '.(empty($tab_designations[$i]['reel']) ? 0 : $tab_designations[$i]['reel']).')';
-	}
-	print '</option>'."\n";
-}
-?>
-				</select>
-			</td>
-			</tr>
-		</table>
-	</form>
-
-	<form id="frmQte" class="formulaire1" method="post" action="facturation_verif.php?action=ajout_article" onsubmit ="javascript: return verifSaisie();">
-		<input type="hidden" name="token" value="<?php echo newToken(); ?>" />
-		<table class="center">
-			<tr>
-			<th><?php echo $langs->trans("Qty"); ?></th>
-			<th><?php echo $langs->trans("PriceUHT"); ?></th>
-			<th><?php echo $langs->trans("Discount"); ?> (%)</th>
-			<th><?php echo $langs->trans("VATRate"); ?></th>
-			<th></th>
-			</tr>
-			<tr>
-				<td><input class="texte1 maxwidth50onsmartphone" type="text" id="txtQte" name="txtQte" value="1" onkeyup="javascript: modif();" onfocus="javascript: this.select();" />
-<?php print genkeypad("txtQte", "frmQte"); ?>
-				</td>
-				<!-- Show unit price -->
-				<?php // TODO Remove the disabled and use this value when adding product into cart ?>
-				<td><input class="texte1_off maxwidth50onsmartphone" type="text" name="txtPrixUnit" value="<?php echo price2num($obj_facturation->prix(), 'MU'); ?>" onchange="javascript: modif();" disabled /></td>
-				<!-- Choix de la remise -->
-				<td><input class="texte1 maxwidth50onsmartphone" type="text" id="txtRemise" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/>
-					<?php print genkeypad("txtRemise", "frmQte"); ?>
-				</td>
-				<!-- Choix du taux de TVA -->
-				<td class="select_tva center">
-				<?php
-					$vatrate = $obj_facturation->vatrate; // To get vat rate we just have selected
-
-					$buyer = new Societe($db);
-				if ($_SESSION["CASHDESK_ID_THIRDPARTY"] > 0) {
-					$buyer->fetch($_SESSION["CASHDESK_ID_THIRDPARTY"]);
-				}
-					echo $form->load_tva('selTva', (GETPOSTISSET("selTva") ? GETPOST("selTva", 'alpha', 2) : $vatrate), $mysoc, $buyer, 0, 0, '', false, -1);
-				?>
-				</td>
-				<td></td>
-			</tr>
-			<tr>
-				<!-- Affichage du stock pour l'article courant -->
-			<tr>
-				<td><?php echo $langs->trans("Stock"); ?></td>
-				<td>
-				<input class="texte1_off maxwidth50onsmartphone" type="text" name="txtStock" value="<?php echo $obj_facturation->stock() ?>" disabled />
-				</td>
-				<td><?php echo $langs->trans("TotalHT"); ?></td>
-				<!-- Affichage du total HT -->
-				<td colspan="2"><input class="texte1_off maxwidth50onsmartphone" type="text" name="txtTotal" value="" disabled /></td><td></td>
-			</tr>
-
-		</table>
-
-		<input class="button bouton_ajout_article" type="submit" id="sbmtEnvoyer" value="<?php echo $langs->trans("AddThisArticle"); ?>" />
-	</form>
-</fieldset>
-
-<!-- ========================= Cadre "Amount" ============================= -->
-<form id="frmDifference"  class="formulaire1" method="post" onsubmit="javascript: return verifReglement()" action="validation_verif.php?action=validate_sell">
-	<input type="hidden" name="hdnChoix" value="" />
-	<input type="hidden" name="token" value="<?php echo newToken(); ?>" />
-<fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Amount"); ?></legend>
-		<table class="centpercent">
-			<tr><th class="label1"><?php echo $langs->trans("TotalTicket"); ?></th><th class="label1"><?php echo $langs->trans("Received"); ?></th><th class="label1"><?php echo $langs->trans("Change"); ?></th></tr>
-			<tr>
-			<!-- Affichage du montant du -->
-			<td><input class="texte2_off maxwidth100onsmartphone" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->amountWithTax(), 'MT'); ?>" disabled /></td>
-			<!-- Choix du montant encaisse -->
-			<td><input class="texte2 maxwidth100onsmartphone" type="text" id="txtEncaisse" name="txtEncaisse" value="" onkeyup="javascript: verifDifference();" onfocus="javascript: this.select();" />
-<?php print genkeypad("txtEncaisse", "frmDifference"); ?>
-			</td>
-			<!-- Affichage du montant rendu -->
-			<td><input class="texte2_off maxwidth100onsmartphone" type="text" name="txtRendu" value="0" disabled /></td>
-			</tr>
-			<tr>
-		</table>
-</fieldset>
-
-<fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("PaymentMode"); ?></legend>
-		<div class="inline-block">
-			<?php
-			print '<div class="inline-block" style="margin: 6px;">';
-			if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CASH']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CASH'] < 0) {
-				$langs->load("errors");
-				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cash").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("CashDesk"))).'" />';
-			} else {
-				print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />';
-			}
-			print '</div>';
-			print '<div class="inline-block" style="margin: 6px;">';
-			if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0) {
-				$langs->load("errors");
-				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("CashDesk"))).'" />';
-			} else {
-				print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />';
-			}
-			print '</div>';
-			print '<div class="inline-block" style="margin: 6px;">';
-			if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] < 0) {
-				$langs->load("errors");
-				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete"), $langs->transnoentitiesnoconv("CashDesk")).'" />';
-			} else {
-				print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" onclick="javascript: verifClic(\'CHQ\');" />';
-			}
-			print '</div>';
-			print '<div class="clearboth">';
-			print '<div class="inline-block" style="margin: 6px;">';
-			?>
-				<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("Reported"); ?>" onclick="javascript: verifClic('DIF');" />
-			<?php
-			print $langs->trans("DateDue").' :';
-			print $form->selectDate(-1, 'txtDatePaiement', 0, 0, 0, 'paymentmode', 1, 0);
-			print '</div>';
-			?>
-		</div>
-</fieldset>
-</form>
-
-<script type="text/javascript">
-/*	Calendar.setup ({
-		inputField	: "txtDatePaiement",
-		ifFormat	: "%Y-%m-%d",
-		button		: "btnCalendrier"
-	});
-*/
-	if (document.getElementById('frmFacturation').txtRef.value) {
-
-		modif();
-		document.getElementById('frmQte').txtQte.focus();
-		document.getElementById('frmQte').txtQte.select();
-
-	} else {
-
-		document.getElementById('frmFacturation').txtRef.focus();
-
-	}
-
-</script>
diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php
deleted file mode 100644
index 74be200945f..00000000000
--- a/htdocs/cashdesk/tpl/liste_articles.tpl.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008	Jeremie Ollivier	<jeremie.o@laposte.net>
- * Copyright (C) 2011		Juanjo Menent		<jmenent@2byte.es>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-// Protection to avoid direct call of template
-if (empty($langs) || !is_object($langs)) {
-	print "Error, template page can't be called as URL";
-	exit;
-}
-
-
-require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("main", "bills", "cashdesk"));
-
-?>
-
-<div class="liste_articles_haut">
-<div class="liste_articles_bas">
-
-<p class="titre"><?php echo $langs->trans("ShoppingCart"); ?></p>
-
-<?php
-/** add Ditto for MultiPrix*/
-$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
-$societe = new Societe($db);
-$societe->fetch($thirdpartyid);
-/** end add Ditto */
-
-$tab = (!empty($_SESSION['poscart']) ? $_SESSION['poscart'] : array());
-
-$tab_size = count($tab);
-if ($tab_size <= 0) {
-	print '<div class="center">'.$langs->trans("NoArticle").'</div><br>';
-} else {
-	for ($i = 0; $i < $tab_size; $i++) {
-		echo ('<div class="cadre_article">'."\n");
-		echo ('<p><a href="facturation_verif.php?action=suppr_article&suppr_id='.$tab[$i]['id'].'" title="'.$langs->trans("DeleteArticle").'">'.$tab[$i]['ref'].' - '.$tab[$i]['label'].'</a></p>'."\n");
-
-		if ($tab[$i]['remise_percent'] > 0) {
-			$remise_percent = ' -'.$tab[$i]['remise_percent'].'%';
-		} else {
-			$remise_percent = '';
-		}
-
-		$remise = $tab[$i]['remise'];
-
-		echo ('<p>'.$tab[$i]['qte'].' x '.price2num($tab[$i]['price'], 'MT').$remise_percent.' = '.price(price2num($tab[$i]['total_ht'], 'MT'), 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT").' ('.price(price2num($tab[$i]['total_ttc'], 'MT'), 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC").')</p>'."\n");
-		echo ('</div>'."\n");
-	}
-}
-
-echo ('<p class="cadre_prix_total">'.$langs->trans("Total").' : '.price(price2num($total_ttc, 'MT'), 0, $langs, 0, 0, -1, $conf->currency).'<br></p>'."\n");
-
-?></div>
-</div>
diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php
deleted file mode 100644
index 67891aa67cf..00000000000
--- a/htdocs/cashdesk/tpl/menu.tpl.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier      <jeremie.o@laposte.net>
- * Copyright (C) 2008-2010 Laurent Destailleur   <eldy@uers.sourceforge.net>
- * Copyright (C) 2009      Regis Houssin         <regis.houssin@inodbox.com>
- * Copyright (C) 2017      Juanjo Menent         <jmenent@2byte.es>
- * Copyright (C) 2012      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($langs) || !is_object($langs)) {
-	print "Error, template page can't be called as URL";
-	exit;
-}
-
-
-include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-
-/*if (!empty($_SESSION["CASHDESK_ID_THIRDPARTY"]))
-{
-	$company=new Societe($db);
-	$company->fetch($_SESSION["CASHDESK_ID_THIRDPARTY"]);
-	$companyLink = $company->getNomUrl(1);
-}*/
-if (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"])) {
-	$bankcash = new Account($db);
-	$bankcash->fetch($_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"]);
-	$bankcash->label = $bankcash->ref;
-	$bankcashLink = $bankcash->getNomUrl(1);
-}
-if (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CB"])) {
-	$bankcb = new Account($db);
-	$bankcb->fetch($_SESSION["CASHDESK_ID_BANKACCOUNT_CB"]);
-	$bankcbLink = $bankcb->getNomUrl(1);
-}
-if (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CHEQUE"])) {
-	$bankcheque = new Account($db);
-	$bankcheque->fetch($_SESSION["CASHDESK_ID_BANKACCOUNT_CHEQUE"]);
-	$bankchequeLink = $bankcheque->getNomUrl(1);
-}
-if (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"]) && !empty($conf->stock->enabled)) {
-	$warehouse = new Entrepot($db);
-	$warehouse->fetch($_SESSION["CASHDESK_ID_WAREHOUSE"]);
-	$warehouseLink = $warehouse->getNomUrl(1);
-}
-
-// Load translation files required by the page
-$langs->loadLangs(array("main", "cashdesk"));
-
-print "\n".'<!-- menu.tpl.php -->'."\n";
-print '<div class="menu_bloc">';
-print '<ul class="menu">';
-// Link to new sell
-print '<li class="menu_choix1"><a href="affIndex.php?menutpl=facturation&id=NOUV"><span class="hideonsmartphone">'.$langs->trans("NewSell").'</span></a></li>';
-// Open new tab on backoffice (this is not a disconnect from POS)
-print '<li class="menu_choix2"><a href=".." target="backoffice"><span class="hideonsmartphone">'.$langs->trans("BackOffice").'</span></a></li>';
-// Disconnect
-print '<li class="menu_choix0"><div class="cashdeskloginuser marginbottomonly valignmiddle"><div class="inline-block valignmiddle">'.$langs->trans("User").': '.$_SESSION['firstname'].' '.$_SESSION['lastname'].'</div>';
-print '<div class="inline-block valignmiddle"> <a href="deconnexion.php">'.img_picto($langs->trans('Logout'), 'logout.png').'</a></div></div>';
-print '<form id="frmThirdparty" class="formulaire1 inline-block" method="post" action="facturation_verif.php?action=change_thirdparty">';
-print $langs->trans("CashDeskThirdParty").': ';
-print $form->select_company($_SESSION["CASHDESK_ID_THIRDPARTY"], 'CASHDESK_ID_THIRDPARTY', '(s.client IN (1,3) AND s.status = 1)', '', 0, 0, null, 0, 'valignmiddle inline-block');
-print '<input class="button bouton_change_thirdparty inline-block valignmiddle" type="submit" id="bouton_change_thirdparty" value="'.$langs->trans("Modify").'">';
-//print $companyLink;
-print '<br>';
-print '</form>';
-/*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'<br>';
-print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'<br>';
-print $langs->trans("CashDeskBankCheque").': '.$bankchequeLink.'<br>';*/
-print '<div class="clearboth">';
-if (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"]) && !empty($conf->stock->enabled) && empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
-	print $langs->trans("CashDeskWarehouse").': '.$warehouseLink;
-}
-print '</div></li></ul>';
-print '</div>';
-print "\n".'<!-- menu.tpl.php end -->'."\n";
diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php
deleted file mode 100644
index 9220e3daad4..00000000000
--- a/htdocs/cashdesk/tpl/ticket.tpl.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier    <jeremie.o@laposte.net>
- * Copyright (C) 2011      Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2012      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($langs) || !is_object($langs)) {
-	print "Error, template page can't be called as URL";
-	exit;
-}
-
-
-include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("main", "cashdesk"));
-
-top_httphead('text/html');
-
-$facid = GETPOST('facid', 'int');
-$object = new Facture($db);
-$object->fetch($facid);
-
-?>
-<html>
-	<head>
-	<title><?php echo $langs->trans('PrintTicket') ?></title>
-	<link rel="stylesheet" type="text/css" href="<?php echo DOL_URL_ROOT; ?>/cashdesk/css/ticket.css">
-</head>
-
-<body>
-
-<div class="entete">
-	<div class="logo">
-		<?php print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">'; ?>
-	</div>
-	<div class="infos">
-		<p class="address"><?php echo $mysoc->name; ?><br>
-		<?php print dol_nl2br(dol_format_address($mysoc)); ?><br>
-		</p>
-
-		<p class="date_heure"><?php
-		// Recuperation et affichage de la date et de l'heure
-		$now = dol_now();
-		print dol_print_date($now, 'dayhourtext').'<br>';
-		print $object->ref;
-		?></p>
-	</div>
-</div>
-
-<br>
-
-<table class="liste_articles">
-	<thead>
-	<tr class="titres">
-			<th><?php print $langs->trans("Code"); ?></th>
-			<th><?php print $langs->trans("Label"); ?></th>
-			<th><?php print $langs->trans("Qty"); ?></th>
-			<th><?php print $langs->trans("Discount").' (%)'; ?></th>
-			<th><?php print $langs->trans("TotalHT"); ?></th>
-	</tr>
-	</thead>
-	<tbody>
-	<?php
-
-	$tab = array();
-	$tab = $_SESSION['poscart'];
-
-	$tab_size = count($tab);
-	for ($i = 0; $i < $tab_size; $i++) {
-		$remise = $tab[$i]['remise'];
-		?>
-	<tr>
-		<td><?php echo $tab[$i]['ref']; ?></td>
-		<td><?php echo $tab[$i]['label']; ?></td>
-		<td><?php echo $tab[$i]['qte']; ?></td>
-		<td><?php echo $tab[$i]['remise_percent']; ?></td>
-		<td class="total"><?php echo price(price2num($tab[$i]['total_ht'], 'MT'), 0, $langs, 0, 0, -1, $conf->currency); ?></td>
-	</tr>
-		<?php
-	}
-	?>
-	</tbody>
-</table>
-
-<table class="totaux">
-<tr>
-	<th class="nowrap"><?php echo $langs->trans("TotalHT"); ?></th>
-	<td class="nowrap"><?php echo price(price2num($obj_facturation->amountWithoutTax(), 'MT'), '', $langs, 0, -1, -1, $conf->currency)."\n"; ?></td>
-</tr>
-<tr>
-	<th class="nowrap"><?php echo $langs->trans("TotalVAT").'</th><td class="nowrap">'.price(price2num($obj_facturation->amountVat(), 'MT'), '', $langs, 0, -1, -1, $conf->currency)."\n"; ?></td>
-</tr>
-<tr>
-	<th class="nowrap"><?php echo ''.$langs->trans("TotalTTC").'</th><td class="nowrap">'.price(price2num($obj_facturation->amountWithTax(), 'MT'), '', $langs, 0, -1, -1, $conf->currency)."\n"; ?></td>
-</tr>
-</table>
-
-<script type="text/javascript">
-	window.print();
-</script>
-
-<a class="lien" href="#" onclick="javascript: window.close(); return(false);"><?php echo $langs->trans("Close"); ?></a>
-</body>
-</html>
diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php
deleted file mode 100644
index c2a9124f300..00000000000
--- a/htdocs/cashdesk/tpl/validation1.tpl.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008	Jeremie Ollivier	<jeremie.o@laposte.net>
- * Copyright (C) 2011		Juanjo Menent		<jmenent@2byte.es>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-// Protection to avoid direct call of template
-if (empty($langs) || !is_object($langs)) {
-	print "Error, template page can't be called as URL";
-	exit;
-}
-
-// Load translation files required by the page
-$langs->loadLangs(array("main", "bills", "banks"));
-
-// Object $form must de defined
-
-?>
-
-<fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Summary"); ?></legend>
-
-	<table class="table_resume">
-
-		<tr><td class="resume_label"><?php echo $langs->trans("Invoice"); ?></td><td><?php  echo $obj_facturation->numInvoice(); ?></td></tr>
-		<tr><td class="resume_label"><?php echo $langs->trans("TotalHT"); ?></td><td><?php echo price(price2num($obj_facturation->amountWithoutTax(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency); ?></td></tr>
-<?php
-// Affichage de la tva par taux
-if ($obj_facturation->amountVat()) {
-	echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.price(price2num($obj_facturation->amountVat(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).'</td></tr>');
-} else {
-	echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.$langs->trans("NoVAT").'</td></tr>');
-}
-?>
-		<tr><td class="resume_label"><?php echo $langs->trans("TotalTTC"); ?> </td><td><?php echo price(price2num($obj_facturation->amountWithTax(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency); ?></td></tr>
-		<tr><td class="resume_label"><?php echo $langs->trans("PaymentMode"); ?> </td><td>
-		<?php
-		switch ($obj_facturation->getSetPaymentMode()) {
-			case 'ESP':
-				echo $langs->trans("Cash");
-				$filtre = 'courant=2';
-				if (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"])) {
-					$selected = $_SESSION["CASHDESK_ID_BANKACCOUNT_CASH"];
-				}
-				break;
-			case 'CB':
-				echo $langs->trans("CreditCard");
-				$filtre = 'courant=1';
-				if (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CB"])) {
-					$selected = $_SESSION["CASHDESK_ID_BANKACCOUNT_CB"];
-				}
-				break;
-			case 'CHQ':
-				echo $langs->trans("Cheque");
-				$filtre = 'courant=1';
-				if (!empty($_SESSION["CASHDESK_ID_BANKACCOUNT_CHEQUE"])) {
-					$selected = $_SESSION["CASHDESK_ID_BANKACCOUNT_CHEQUE"];
-				}
-				break;
-			case 'DIF':
-				echo $langs->trans("Reported");
-				$filtre = 'courant=1 OR courant=2';
-				$selected = '';
-				break;
-			default:
-				$filtre = 'courant=1 OR courant=2';
-				$selected = '';
-		}
-
-		?>
-		</td></tr>
-
-<?php
-// Affichage des infos en fonction du mode de paiement
-if ($obj_facturation->getsetPaymentMode() == 'DIF') {
-	echo ('<tr><td class="resume_label">'.$langs->trans("DateDue").'</td><td>'.$obj_facturation->paiementLe().'</td></tr>');
-} else {
-	echo ('<tr><td class="resume_label">'.$langs->trans("Received").'</td><td>'.price(price2num($obj_facturation->amountCollected(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).'</td></tr>');
-}
-
-// Affichage du montant rendu (reglement en especes)
-if ($obj_facturation->amountReturned()) {
-	echo ('<tr><td class="resume_label">'.$langs->trans("Change").'</td><td>'.price(price2num($obj_facturation->amountReturned(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).'</td></tr>');
-}
-
-?>
-
-	</table>
-
-	<form id="frmValidation" class="formulaire2" method="post" action="validation_verif.php?action=validate_invoice">
-		<input type="hidden" name="token" value="<?php echo newToken(); ?>" />
-		<p class="note_label">
-			<?php
-				echo $langs->trans("BankToPay")."<br>";
-				$form->select_comptes($selected, 'cashdeskbank', 0, $filtre);
-			?>
-		</p>
-		<p class="note_label"><?php echo $langs->trans("Notes"); ?><br><textarea class="textarea_note" name="txtaNotes"></textarea></p>
-
-		<div class="center"><input class="button" type="submit" name="btnValider" value="<?php echo $langs->trans("ValidateInvoice"); ?>" /><br>
-		<br><a class="lien1" href="affIndex.php?menutpl=facturation"><?php echo $langs->trans("RestartSelling"); ?></a>
-		</div>
-	</form>
-
-
-
-</fieldset>
diff --git a/htdocs/cashdesk/tpl/validation2.tpl.php b/htdocs/cashdesk/tpl/validation2.tpl.php
deleted file mode 100644
index d89edfdc41a..00000000000
--- a/htdocs/cashdesk/tpl/validation2.tpl.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008	Jeremie Ollivier	<jeremie.o@laposte.net>
- * Copyright (C) 2012       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($langs) || !is_object($langs)) {
-	print "Error, template page can't be called as URL";
-	exit;
-}
-
-// Load translation files required by the page
-$langs->loadLangs(array("main", "bills"));
-
-?>
-
-<div class="blocksellfinished">
-
-<div class="cadre_facturation">
-<h3 class="titre1"><?php echo $langs->trans("SellFinished"); ?></h3><br>
-
-<script type="text/javascript">
-
-	function popupTicket(id,name)
-	{
-		largeur = 600;
-		hauteur = 500;
-		opt = 'width='+largeur+', height='+hauteur+', left='+(screen.width - largeur)/2+', top='+(screen.height-hauteur)/2+'';
-		window.open('validation_ticket.php?facid='+id,name, opt);
-	}
-
-	popupTicket(<?php echo GETPOST('facid', 'int'); ?>,'<?php echo $langs->trans('PrintTicket') ?>');
-
-</script>
-
-<p><a class="lien1" href="<?php echo DOL_URL_ROOT ?>/compta/facture/card.php?action=builddoc&facid=<?php echo GETPOST('facid', 'int'); ?>" target="_blank"><?php echo $langs->trans("ShowInvoice"); ?></a></p>
-<br>
-<p><a class="lien1" href="#" onclick="Javascript: popupTicket(<?php echo GETPOST('facid', 'int'); ?>,'<?php echo $langs->trans('PrintTicket') ?>'); return(false);"><?php echo $langs->trans("PrintTicket"); ?></a></p>
-
-</div>
-</div>
-<br>
-
diff --git a/htdocs/cashdesk/validation_ticket.php b/htdocs/cashdesk/validation_ticket.php
deleted file mode 100644
index 5fcf017ada1..00000000000
--- a/htdocs/cashdesk/validation_ticket.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.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/cashdesk/validation_ticket.php
- *	\ingroup    cashdesk
- *	\brief      validation_ticket.php
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
-require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-
-if (empty($user->rights->cashdesk->run)) {
-	accessforbidden();
-}
-
-
-/*
- * Actions
- */
-
-$obj_facturation = unserialize($_SESSION['serObjFacturation']);
-unset($_SESSION['serObjFacturation']);
-
-$hookmanager->initHooks(array('cashdeskTplTicket'));
-
-$parameters = array();
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $obj_facturation);
-if (empty($reshook)) {
-	require 'tpl/ticket.tpl.php';
-}
-
-
-$_SESSION['serObjFacturation'] = serialize($obj_facturation);
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
deleted file mode 100644
index 0c9758d9a29..00000000000
--- a/htdocs/cashdesk/validation_verif.php
+++ /dev/null
@@ -1,361 +0,0 @@
-<?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier    <jeremie.o@laposte.net>
- * Copyright (C) 2008-2009 Laurent Destailleur <eldy@uers.sourceforge.net>
- * Copyright (C) 2011	   Juanjo Menent	   <jmenent@2byte.es>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/cashdesk/validation_verif.php
- *	\ingroup    cashdesk
- *	\brief      validation_verif.php
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
-require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-
-$obj_facturation = unserialize($_SESSION['serObjFacturation']);
-
-$action = GETPOST('action', 'aZ09');
-$bankaccountid = GETPOST('cashdeskbank');
-
-if (empty($user->rights->cashdesk->run)) {
-	accessforbidden();
-}
-
-
-/*
- * Actions
- */
-
-switch ($action) {
-	default:
-		$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=validation';
-		break;
-
-	case 'validate_sell':
-		$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
-
-		$company = new Societe($db);
-		$company->fetch($thirdpartyid);
-
-		$invoice = new Facture($db);
-		$invoice->date = dol_now();
-		$invoice->type = Facture::TYPE_STANDARD;
-
-		// To use a specific numbering module for POS, reset $conf->global->FACTURE_ADDON and other vars here
-		// and restore values just after
-		$sav_FACTURE_ADDON = '';
-		if (!empty($conf->global->POS_ADDON)) {
-			$sav_FACTURE_ADDON = $conf->global->FACTURE_ADDON;
-			$conf->global->FACTURE_ADDON = $conf->global->POS_ADDON;
-
-			// To force prefix only for POS with terre module
-			if (!empty($conf->global->POS_NUMBERING_TERRE_FORCE_PREFIX)) {
-				$conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX = $conf->global->POS_NUMBERING_TERRE_FORCE_PREFIX;
-			}
-			// To force prefix only for POS with mars module
-			if (!empty($conf->global->POS_NUMBERING_MARS_FORCE_PREFIX)) {
-				$conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX = $conf->global->POS_NUMBERING_MARS_FORCE_PREFIX;
-			}
-			// To force rule only for POS with mercure
-			//...
-		}
-
-		$num = $invoice->getNextNumRef($company);
-
-		// Restore save values
-		if (!empty($sav_FACTURE_ADDON)) {
-			$conf->global->FACTURE_ADDON = $sav_FACTURE_ADDON;
-		}
-
-		$obj_facturation->numInvoice($num);
-
-		$obj_facturation->getSetPaymentMode($_POST['hdnChoix']);
-
-		// Si paiement autre qu'en especes, montant encaisse = prix total
-		$mode_reglement = $obj_facturation->getSetPaymentMode();
-		if ($mode_reglement != 'ESP') {
-			$montant = $obj_facturation->amountWithTax();
-		} else {
-			$montant = $_POST['txtEncaisse'];
-		}
-
-		if ($mode_reglement != 'DIF') {
-			$obj_facturation->amountCollected($montant);
-
-			//Determination de la somme rendue
-			$total = $obj_facturation->amountWithTax();
-			$encaisse = $obj_facturation->amountCollected();
-
-			$obj_facturation->amountReturned($encaisse - $total);
-		} else {
-			//$txtDatePaiement=$_POST['txtDatePaiement'];
-			$datePaiement = dol_mktime(0, 0, 0, $_POST['txtDatePaiementmonth'], $_POST['txtDatePaiementday'], $_POST['txtDatePaiementyear']);
-			$txtDatePaiement = dol_print_date($datePaiement, 'dayrfc');
-			$obj_facturation->paiementLe($txtDatePaiement);
-		}
-
-		$redirection = 'affIndex.php?menutpl=validation';
-		break;
-
-
-	case 'retour':
-		$redirection = 'affIndex.php?menutpl=facturation';
-		break;
-
-
-	case 'validate_invoice':
-		$now = dol_now();
-
-		// Recuperation de la date et de l'heure
-		$date = dol_print_date($now, 'day');
-		$heure = dol_print_date($now, 'hour');
-
-		$note = '';
-		if (!is_object($obj_facturation)) {
-			dol_print_error('', 'Empty context');
-			exit;
-		}
-
-		switch ($obj_facturation->getSetPaymentMode()) {
-			case 'DIF':
-				$mode_reglement_id = 0;
-				//$cond_reglement_id = dol_getIdFromCode($db,'RECEP','cond_reglement','code','rowid')
-				$cond_reglement_id = 0;
-				break;
-			case 'ESP':
-				$mode_reglement_id = dol_getIdFromCode($db, 'LIQ', 'c_paiement', 'code', 'id', 1);
-				$cond_reglement_id = 0;
-				$note .= $langs->trans("Cash")."\n";
-				$note .= $langs->trans("Received").' : '.$obj_facturation->amountCollected()." ".$conf->currency."\n";
-				$note .= $langs->trans("Rendu").' : '.$obj_facturation->amountReturned()." ".$conf->currency."\n";
-				$note .= "\n";
-				$note .= '--------------------------------------'."\n\n";
-				break;
-			case 'CB':
-				$mode_reglement_id = dol_getIdFromCode($db, 'CB', 'c_paiement', 'code', 'id', 1);
-				$cond_reglement_id = 0;
-				break;
-			case 'CHQ':
-				$mode_reglement_id = dol_getIdFromCode($db, 'CHQ', 'c_paiement', 'code', 'id', 1);
-				$cond_reglement_id = 0;
-				break;
-		}
-		if (empty($mode_reglement_id)) {
-			$mode_reglement_id = 0; // If mode_reglement_id not found
-		}
-		if (empty($cond_reglement_id)) {
-			$cond_reglement_id = 0; // If cond_reglement_id not found
-		}
-		$note .= GETPOST('txtaNotes', 'alphanohtml');
-		dol_syslog("obj_facturation->getSetPaymentMode()=".$obj_facturation->getSetPaymentMode()." mode_reglement_id=".$mode_reglement_id." cond_reglement_id=".$cond_reglement_id);
-
-		$error = 0;
-
-
-		$db->begin();
-
-		$user->fetch($_SESSION['uid']);
-		$user->getrights();
-
-		$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
-		$societe = new Societe($db);
-		$societe->fetch($thirdpartyid);
-
-		$invoice = new Facture($db);
-
-		// Get content of cart
-		$tab_liste = $_SESSION['poscart'];
-
-		// Loop on each line into cart
-		$tab_liste_size = count($tab_liste);
-		for ($i = 0; $i < $tab_liste_size; $i++) {
-			$tmp = getTaxesFromId($tab_liste[$i]['fk_tva']);
-			$vat_rate = $tmp['rate'];
-			$vat_npr = $tmp['npr'];
-			$vat_src_code = $tmp['code'];
-
-			$invoiceline = new FactureLigne($db);
-			$invoiceline->fk_product = $tab_liste[$i]['fk_article'];
-			$invoiceline->desc = $tab_liste[$i]['label'];
-			$invoiceline->qty = $tab_liste[$i]['qte'];
-			$invoiceline->remise_percent = $tab_liste[$i]['remise_percent'];
-			$invoiceline->price = $tab_liste[$i]['price'];
-			$invoiceline->subprice = $tab_liste[$i]['price'];
-
-			$invoiceline->tva_tx = empty($vat_rate) ? 0 : $vat_rate; // works even if vat_rate is ''
-			$invoiceline->info_bits = empty($vat_npr) ? 0 : $vat_npr;
-			$invoiceline->vat_src_code = $vat_src_code;
-
-			$invoiceline->total_ht = $tab_liste[$i]['total_ht'];
-			$invoiceline->total_ttc = $tab_liste[$i]['total_ttc'];
-			$invoiceline->total_tva = $tab_liste[$i]['total_vat'];
-			$invoiceline->total_localtax1 = $tab_liste[$i]['total_localtax1'];
-			$invoiceline->total_localtax2 = $tab_liste[$i]['total_localtax2'];
-
-			$invoice->lines[] = $invoiceline;
-		}
-
-		$invoice->socid = $conf_fksoc;
-		$invoice->date_creation = $now;
-		$invoice->date = $now;
-		$invoice->date_lim_reglement = 0;
-		$invoice->total_ht = $obj_facturation->amountWithoutTax();
-		$invoice->total_tva = $obj_facturation->amountVat();
-		$invoice->total_ttc = $obj_facturation->amountWithTax();
-		$invoice->note_private = $note;
-		$invoice->cond_reglement_id = $cond_reglement_id;
-		$invoice->mode_reglement_id = $mode_reglement_id;
-		$invoice->module_source = 'cashdesk';
-		$invoice->pos_source = '0';
-		//print "c=".$invoice->cond_reglement_id." m=".$invoice->mode_reglement_id; exit;
-
-		// Si paiement differe ...
-		if ($obj_facturation->getSetPaymentMode() == 'DIF') {
-			$resultcreate = $invoice->create($user, 0, dol_stringtotime($obj_facturation->paiementLe()));
-			if ($resultcreate > 0) {
-				$warehouseidtodecrease = (isset($_SESSION["CASHDESK_ID_WAREHOUSE"]) ? $_SESSION["CASHDESK_ID_WAREHOUSE"] : 0);
-				if (!empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
-					$warehouseidtodecrease = 0; // If a particular stock is defined, we disable choice
-				}
-
-				$resultvalid = $invoice->validate($user, $obj_facturation->numInvoice(), 0);
-
-				if ($warehouseidtodecrease > 0) {
-					// Decrease
-					require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-					$langs->load("agenda");
-					// Loop on each line
-					$cpt = count($invoice->lines);
-					for ($i = 0; $i < $cpt; $i++) {
-						if ($invoice->lines[$i]->fk_product > 0) {
-							$mouvP = new MouvementStock($db);
-							$mouvP->origin = &$invoice;
-							// We decrease stock for product
-							if ($invoice->type == $invoice::TYPE_CREDIT_NOTE) {
-								$result = $mouvP->reception($user, $invoice->lines[$i]->fk_product, $warehouseidtodecrease, $invoice->lines[$i]->qty, $invoice->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarrFromPos", $invoice->newref));
-							} else {
-								$result = $mouvP->livraison($user, $invoice->lines[$i]->fk_product, $warehouseidtodecrease, $invoice->lines[$i]->qty, $invoice->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarrFromPos", $invoice->newref));
-							}
-							if ($result < 0) {
-								$error++;
-							}
-						}
-					}
-				}
-			} else {
-				setEventMessages($invoice->error, $invoice->errors, 'errors');
-				$error++;
-			}
-
-			$id = $invoice->id;
-		} else {
-			$resultcreate = $invoice->create($user, 0, 0);
-			if ($resultcreate > 0) {
-				$warehouseidtodecrease = (isset($_SESSION["CASHDESK_ID_WAREHOUSE"]) ? $_SESSION["CASHDESK_ID_WAREHOUSE"] : 0);
-				if (!empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
-					$warehouseidtodecrease = 0; // If a particular stock is defined, we disable choice
-				}
-
-				$resultvalid = $invoice->validate($user, $obj_facturation->numInvoice(), 0);
-
-				if ($warehouseidtodecrease > 0) {
-					// Decrease
-					require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-					$langs->load("agenda");
-					// Loop on each line
-					$cpt = count($invoice->lines);
-					for ($i = 0; $i < $cpt; $i++) {
-						if ($invoice->lines[$i]->fk_product > 0) {
-							$mouvP = new MouvementStock($db);
-							$mouvP->origin = &$invoice;
-							// We decrease stock for product
-							if ($invoice->type == $invoice::TYPE_CREDIT_NOTE) {
-								$result = $mouvP->reception($user, $invoice->lines[$i]->fk_product, $warehouseidtodecrease, $invoice->lines[$i]->qty, $invoice->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarrFromPos", $invoice->newref));
-							} else {
-								$result = $mouvP->livraison($user, $invoice->lines[$i]->fk_product, $warehouseidtodecrease, $invoice->lines[$i]->qty, $invoice->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarrFromPos", $invoice->newref));
-							}
-							if ($result < 0) {
-								setEventMessages($mouvP->error, $mouvP->errors, 'errors');
-								$error++;
-							}
-						}
-					}
-				}
-
-				$id = $invoice->id;
-
-				// Add the payment
-				$payment = new Paiement($db);
-				$payment->datepaye = $now;
-				$payment->amounts[$invoice->id] = $obj_facturation->amountWithTax();
-				$payment->note_public = $langs->trans("Payment").' '.$langs->trans("Invoice").' '.$obj_facturation->numInvoice();
-				$payment->paiementid = $invoice->mode_reglement_id;
-				$payment->num_paiement = '';
-				$payment->num_payment = '';
-
-				$paiement_id = $payment->create($user);
-				if ($paiement_id > 0) {
-					if (!$error) {
-						$result = $payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccountid, '', '');
-						if (!$result > 0) {
-							$errmsg = $paiement->error;
-							$error++;
-						}
-					}
-
-					if (!$error) {
-						if ($invoice->total_ttc == $obj_facturation->amountWithTax()
-							&& $obj_facturation->getSetPaymentMode() != 'DIFF') {
-							// We set status to paid
-							$result = $invoice->setPaid($user);
-							//print 'set paid';exit;
-						}
-					}
-				} else {
-					setEventMessages($invoice->error, $invoice->errors, 'errors');
-					$error++;
-				}
-			} else {
-				setEventMessages($invoice->error, $invoice->errors, 'errors');
-				$error++;
-			}
-		}
-
-
-		if (!$error) {
-			$db->commit();
-			$redirection = 'affIndex.php?menutpl=validation_ok&facid='.$id; // Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr
-		} else {
-			$db->rollback();
-			$redirection = 'affIndex.php?facid='.$id.'&error=1&mesg=ErrorFailedToCreateInvoice'; // Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr
-		}
-		break;
-
-		// End of case: validate_invoice
-}
-
-unset($_SESSION['serObjFacturation']);
-
-$_SESSION['serObjFacturation'] = serialize($obj_facturation);
-
-header('Location: '.$redirection);
-exit;
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index bddeb9a771a..02e6892b571 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -101,9 +101,9 @@ if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('CATEGORIE_RECURSIV_ADD');
 } else {
 	if (empty($conf->global->CATEGORIE_RECURSIV_ADD)) {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_CATEGORIE_RECURSIV_ADD">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_CATEGORIE_RECURSIV_ADD&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	} else {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_CATEGORIE_RECURSIV_ADD">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_CATEGORIE_RECURSIV_ADD&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td></tr>';
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index a11d9f843a5..ec3d75dee1a 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -274,7 +274,7 @@ if ($user->rights->categorie->creer) {
 		print dol_get_fiche_end('');
 
 		print '<div class="center">';
-		print '<input type="submit" class="button" value="'.$langs->trans("CreateThisCat").'" name="creation" />';
+		print '<input type="submit" class="button b" value="'.$langs->trans("CreateThisCat").'" name="creation" />';
 		print '&nbsp; &nbsp; &nbsp;';
 		print '<input type="submit" class="button button-cancel" value="'.$langs->trans("Cancel").'" name="cancel" />';
 		print '</div>';
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 84300e76d98..7e3720abad8 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -145,8 +145,9 @@ class Categories extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 8d401ff5794..5ffed2e5e4b 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -34,6 +34,7 @@
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 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';
 
@@ -56,6 +57,8 @@ class Categorie extends CommonObject
 	const TYPE_WAREHOUSE = 'warehouse';
 	const TYPE_ACTIONCOMM = 'actioncomm';
 	const TYPE_WEBSITE_PAGE = 'website_page';
+	const TYPE_TICKET = 'ticket';
+	const TYPE_KNOWLEDGEMANAGEMENT = 'knowledgemanagement';
 
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@@ -78,7 +81,9 @@ class Categorie extends CommonObject
 		'bank_line'    => 8,
 		'warehouse'    => 9,
 		'actioncomm'   => 10,
-		'website_page' => 11
+		'website_page' => 11,
+		'ticket'       => 12,
+		'knowledgemanagement' => 13
 	);
 
 	/**
@@ -98,7 +103,9 @@ class Categorie extends CommonObject
 		8 => 'bank_line',
 		9 => 'warehouse',
 		10 => 'actioncomm',
-		11 => 'website_page'
+		11 => 'website_page',
+		12 => 'ticket',
+		13 => 'knowledgemanagement'
 	);
 
 	/**
@@ -141,7 +148,9 @@ class Categorie extends CommonObject
 		'project'  => 'Project',
 		'warehouse'=> 'Entrepot',
 		'actioncomm' => 'ActionComm',
-		'website_page' => 'WebsitePage'
+		'website_page' => 'WebsitePage',
+		'ticket' => 'Ticket',
+		'knowledgemanagement' => 'KnowledgeRecord'
 	);
 
 	/**
@@ -234,6 +243,7 @@ class Categorie extends CommonObject
 	 * @see Categorie::TYPE_WAREHOUSE
 	 * @see Categorie::TYPE_ACTIONCOMM
 	 * @see Categorie::TYPE_WEBSITE_PAGE
+	 * @see Categorie::TYPE_TICKET
 	 */
 	public $type;
 
@@ -374,8 +384,8 @@ class Categorie extends CommonObject
 			}
 		} else {
 			dol_print_error($this->db);
-			$this->error=$this->db->lasterror;
-			$this->errors[]=$this->db->lasterror;
+			$this->error = $this->db->lasterror;
+			$this->errors[] = $this->db->lasterror;
 			return -1;
 		}
 	}
@@ -448,7 +458,7 @@ class Categorie extends CommonObject
 			$sql .= ($this->socid > 0 ? $this->socid : 'null').", ";
 		}
 		$sql .= "'".$this->db->escape($this->visible)."', ";
-		$sql .= $this->db->escape($type).", ";
+		$sql .= ((int) $type).", ";
 		$sql .= (!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : 'null').", ";
 		$sql .= (!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : 'null').", ";
 		$sql .= (int) $conf->entity.", ";
@@ -606,7 +616,7 @@ class Categorie extends CommonObject
 		if (!$error) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."categorie";
 			$sql .= " SET fk_parent = ".((int) $this->fk_parent);
-			$sql .= " WHERE fk_parent = ".$this->id;
+			$sql .= " WHERE fk_parent = ".((int) $this->id);
 
 			if (!$this->db->query($sql)) {
 				$this->error = $this->db->lasterror();
@@ -615,19 +625,25 @@ class Categorie extends CommonObject
 		}
 
 		$arraydelete = array(
-			'categorie_societe' => 'fk_categorie',
-			'categorie_fournisseur' => 'fk_categorie',
 			'categorie_product' => 'fk_categorie',
+			'categorie_fournisseur' => 'fk_categorie',
+			'categorie_societe' => 'fk_categorie',
 			'categorie_member' => 'fk_categorie',
 			'categorie_contact' => 'fk_categorie',
+			'categorie_user' => 'fk_categorie',
+			'categorie_project' => 'fk_categorie',
 			'categorie_account' => 'fk_categorie',
+			'categorie_website_page' => 'fk_categorie',
+			'categorie_warehouse' => 'fk_categorie',
+			'categorie_actioncomm' => 'fk_categorie',
+			'categorie_ticket' => 'fk_categorie',
 			'bank_class' => 'fk_categ',
 			'categorie_lang' => 'fk_category',
 			'categorie' => 'rowid',
 		);
 		foreach ($arraydelete as $key => $value) {
 			$sql  = "DELETE FROM ".MAIN_DB_PREFIX.$key;
-			$sql .= " WHERE ".$value." = ".$this->id;
+			$sql .= " WHERE ".$value." = ".((int) $this->id);
 			if (!$this->db->query($sql)) {
 				$this->errors[] = $this->db->lasterror();
 				dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
@@ -680,7 +696,7 @@ class Categorie extends CommonObject
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
 		$sql .= " (fk_categorie, fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]).")";
-		$sql .= " VALUES (".$this->id.", ".$obj->id.")";
+		$sql .= " VALUES (".((int) $this->id).", ".((int) $obj->id).")";
 
 		dol_syslog(get_class($this).'::add_type', LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -717,8 +733,6 @@ class Categorie extends CommonObject
 				}
 			}
 
-
-
 			// Call trigger
 			$this->context = array('linkto'=>$obj); // Save object we want to link category to into category instance to provide information to trigger
 			$result = $this->call_trigger('CATEGORY_LINK', $user);
@@ -917,12 +931,11 @@ class Categorie extends CommonObject
 		$idoftype = array_search($type, self::$MAP_ID_TO_CODE);
 
 		$sql = "SELECT s.rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as s";
-		$sql .= " , ".MAIN_DB_PREFIX."categorie_".$sub_type." as sub ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as s, ".MAIN_DB_PREFIX."categorie_".$sub_type." as sub";
 		$sql .= ' WHERE s.entity IN ('.getEntity('category').')';
 		$sql .= ' AND s.type='.((int) $idoftype);
 		$sql .= ' AND s.rowid = sub.fk_categorie';
-		$sql .= ' AND sub.'.$subcol_name.' = '.((int) $id);
+		$sql .= " AND sub.".$subcol_name." = ".((int) $id);
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 
@@ -995,7 +1008,7 @@ class Categorie extends CommonObject
 	{
 		// phpcs:enable
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";
-		$sql .= " WHERE fk_parent = ".$this->id;
+		$sql .= " WHERE fk_parent = ".((int) $this->id);
 		$sql .= " AND entity IN (".getEntity('category').")";
 
 		$res = $this->db->query($sql);
@@ -1342,7 +1355,7 @@ class Categorie extends CommonObject
 	 * @param	string	$addpicto	 Add picto into link
 	 * @return	array
 	 */
-	public function print_all_ways($sep = ' &gt;&gt; ', $url = '', $nocolor = 0, $addpicto = 0)
+	public function print_all_ways($sep = '&gt;&gt;', $url = '', $nocolor = 0, $addpicto = 0)
 	{
 		// phpcs:enable
 		$ways = array();
@@ -1356,8 +1369,8 @@ class Categorie extends CommonObject
 				$i++;
 
 				if (empty($nocolor)) {
-					$forced_color = 'toreplace';
-					if ($i == count($way)) {
+					$forced_color = 'colortoreplace';
+					if ($i == count($way)) {	// Last category in hierarchy
 						// Check contrast with background and correct text color
 						$forced_color = 'categtextwhite';
 						if ($cat->color) {
@@ -1371,16 +1384,16 @@ class Categorie extends CommonObject
 				if ($url == '') {
 					$link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$cat->id.'&type='.$cat->type.'" class="'.$forced_color.'">';
 					$linkend = '</a>';
-					$w[] = $link.($addpicto ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
+					$w[] = $link.(($addpicto && $i == 1) ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
 				} elseif ($url == 'none') {
 					$link = '<span class="'.$forced_color.'">';
 					$linkend = '</span>';
-					$w[] = $link.($addpicto ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
+					$w[] = $link.(($addpicto && $i == 1) ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
 				} else {
 					$w[] = '<a class="'.$forced_color.'" href="'.DOL_URL_ROOT.'/'.$url.'?catid='.$cat->id.'">'.($addpicto ? img_object('', 'category') : '').$cat->label.'</a>';
 				}
 			}
-			$newcategwithpath = preg_replace('/toreplace/', $forced_color, implode($sep, $w));
+			$newcategwithpath = preg_replace('/colortoreplace/', $forced_color, implode('<span class="inline-block valignmiddle paddingleft paddingright '.$forced_color.'">'.$sep.'</span>', $w));
 
 			$ways[] = $newcategwithpath;
 		}
@@ -1401,7 +1414,7 @@ class Categorie extends CommonObject
 		$parents = array();
 
 		$sql = "SELECT fk_parent FROM ".MAIN_DB_PREFIX."categorie";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$res = $this->db->query($sql);
 
@@ -1804,13 +1817,13 @@ class Categorie extends CommonObject
 			if ($key == $current_lang) {
 				if ($this->db->num_rows($result)) { // si aucune ligne dans la base
 					$sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";
-					$sql2 .= " SET label='".$this->db->escape($this->label)."',";
-					$sql2 .= " description='".$this->db->escape($this->description)."'";
-					$sql2 .= " WHERE fk_category=".((int) $this->id)." AND lang='".$this->db->escape($key)."'";
+					$sql2 .= " SET label = '".$this->db->escape($this->label)."',";
+					$sql2 .= " description = '".$this->db->escape($this->description)."'";
+					$sql2 .= " WHERE fk_category = ".((int) $this->id)." AND lang = '".$this->db->escape($key)."'";
 				} else {
 					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
-					$sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->label);
-					$sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
+					$sql2 .= " VALUES(".((int) $this->id).", '".$this->db->escape($key)."', '".$this->db->escape($this->label)."'";
+					$sql2 .= ", '".$this->db->escape($this->multilangs["$key"]["description"])."')";
 				}
 				dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
 				if (!$this->db->query($sql2)) {
@@ -1825,8 +1838,8 @@ class Categorie extends CommonObject
 					$sql2 .= " WHERE fk_category=".((int) $this->id)." AND lang='".$this->db->escape($key)."'";
 				} else {
 					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
-					$sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->multilangs["$key"]["label"]);
-					$sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
+					$sql2 .= " VALUES(".((int) $this->id).", '".$this->db->escape($key)."', '".$this->db->escape($this->multilangs["$key"]["label"])."'";
+					$sql2 .= ",'".$this->db->escape($this->multilangs["$key"]["description"])."')";
 				}
 
 				// on ne sauvegarde pas des champs vides
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 5fb1c85dd40..4e7d5bb8943 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -194,19 +194,19 @@ if ($object->id) {
 
 		if (is_array($listofphoto) && count($listofphoto)) {
 			print '<br>';
-			print '<table width="100%" valign="top" align="center">';
+			print '<table width="100%" valign="top" class="center centpercent">';
 
 			foreach ($listofphoto as $key => $obj) {
 				$nbphoto++;
 
 				if ($nbbyrow && ($nbphoto % $nbbyrow == 1)) {
-					print '<tr align=center valign=middle border=1>';
+					print '<tr class"center valignmiddle" border="1">';
 				}
 				if ($nbbyrow) {
 					print '<td width="'.ceil(100 / $nbbyrow).'%" class="photo">';
 				}
 
-				print '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$obj['photo']).'" alt="Taille origine" target="_blank">';
+				print '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$obj['photo']).'" alt="Original size" target="_blank" rel="noopener noreferrer">';
 
 				// Si fichier vignette disponible, on l'utilise, sinon on utilise photo origine
 				if ($obj['photo_vignette']) {
@@ -231,10 +231,10 @@ if ($object->id) {
 
 				// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
 				if (!$obj['photo_vignette'] && preg_match('/(\.bmp|\.gif|\.jpg|\.jpeg|\.png)$/i', $obj['photo']) && ($object->imgWidth > $maxWidth || $object->imgHeight > $maxHeight)) {
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addthumb&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&token='.newToken().'&action=addthumb&type='.$type.'&file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
 				}
 				if ($user->rights->categorie->creer) {
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'&type='.$type.'&file='.urlencode($pdir.$viewfilename).'">';
 					print img_delete().'</a>';
 				}
 				if ($nbbyrow) {
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index cd5d7ad8214..2bbb4b5f0a8 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -231,9 +231,9 @@ print "\n<div class=\"tabsAction\">\n";
 
 if ($action == '') {
 	if ($user->rights->produit->creer || $user->rights->service->creer) {
-		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&type='.$type.'">'.$langs->trans('Add').'</a>';
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=add&token='.newToken().'&id='.$object->id.'&type='.$type.'">'.$langs->trans('Add').'</a>';
 		if ($cnt_trans > 0) {
-			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$object->id.'&type='.$type.'">'.$langs->trans('Update').'</a>';
+			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$object->id.'&type='.$type.'">'.$langs->trans('Update').'</a>';
 		}
 	}
 }
@@ -274,11 +274,7 @@ if ($action == 'edit') {
 
 	print '<br>';
 
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 } elseif ($action != 'add') {
@@ -334,11 +330,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 	print '</tr>';
 	print '</table>';
 
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index a1f63b997e8..327876f17c2 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -142,6 +142,11 @@ if ($id > 0 && $removeelem > 0) {
 		$tmpobject = new User($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'user';
+	} elseif ($type == Categorie::TYPE_TICKET && $user->rights->ticket->write) {
+		require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
+		$tmpobject = new Ticket($db);
+		$result = $tmpobject->fetch($removeelem);
+		$elementtype = 'ticket';
 	}
 
 	$result = $object->del_type($tmpobject, $elementtype);
@@ -167,7 +172,13 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi
 if ($elemid && $action == 'addintocategory' &&
 	(($type == Categorie::TYPE_PRODUCT && ($user->rights->produit->creer || $user->rights->service->creer)) ||
 	 ($type == Categorie::TYPE_CUSTOMER && $user->rights->societe->creer) ||
-	 ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer)
+	 ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer) ||
+	 ($type == Categorie::TYPE_TICKET && $user->rights->ticket->write) ||
+	 ($type == Categorie::TYPE_PROJECT && $user->rights->projet->creer) ||
+	 ($type == Categorie::TYPE_MEMBER && $user->rights->projet->creer) ||
+	 ($type == Categorie::TYPE_CONTACT && $user->rights->societe->creer) ||
+	 ($type == Categorie::TYPE_USER && $user->rights->user->user->creer) ||
+	 ($type == Categorie::TYPE_ACCOUNT && $user->rights->banque->configurer)
    )) {
 	if ($type == Categorie::TYPE_PRODUCT) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -181,6 +192,30 @@ if ($elemid && $action == 'addintocategory' &&
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 		$newobject = new Societe($db);
 		$elementtype = 'supplier';
+	} elseif ($type == Categorie::TYPE_TICKET) {
+		require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
+		$newobject = new Ticket($db);
+		$elementtype = 'ticket';
+	} elseif ($type == Categorie::TYPE_PROJECT) {
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+		$newobject = new Project($db);
+		$elementtype = 'project';
+	} elseif ($type == Categorie::TYPE_MEMBER) {
+		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+		$newobject = new Adherent($db);
+		$elementtype = 'member';
+	} elseif ($type == Categorie::TYPE_CONTACT) {
+		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+		$newobject = new Contact($db);
+		$elementtype = 'contact';
+	} elseif ($type == Categorie::TYPE_USER) {
+		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+		$newobject = new User($db);
+		$elementtype = 'user';
+	} elseif ($type == Categorie::TYPE_ACCOUNT) {
+		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		$newobject = new User($db);
+		$elementtype = 'bank_account';
 	}
 	$result = $newobject->fetch($elemid);
 
@@ -189,7 +224,7 @@ if ($elemid && $action == 'addintocategory' &&
 	if ($result >= 0) {
 		setEventMessages($langs->trans("WasAddedSuccessfully", $newobject->ref), null, 'mesgs');
 	} else {
-		if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			setEventMessages($langs->trans("ObjectAlreadyLinkedToCategory"), null, 'warnings');
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -528,6 +563,7 @@ if ($type == Categorie::TYPE_PRODUCT) {
 	}
 }
 
+// List of customers
 if ($type == Categorie::TYPE_CUSTOMER) {
 	$permission = $user->rights->societe->creer;
 
@@ -601,7 +637,7 @@ if ($type == Categorie::TYPE_CUSTOMER) {
 	}
 }
 
-
+// List of suppliers
 if ($type == Categorie::TYPE_SUPPLIER) {
 	$permission = $user->rights->societe->creer;
 
@@ -686,6 +722,26 @@ if ($type == Categorie::TYPE_MEMBER) {
 	if ($prods < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	} else {
+		// Form to add record into a category
+		$showclassifyform = 1;
+		if ($showclassifyform) {
+			print '<br>';
+			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+			print '<input type="hidden" name="type" value="'.$typeid.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="action" value="addintocategory">';
+			print '<table class="noborder centpercent">';
+			print '<tr class="liste_titre"><td>';
+			print $langs->trans("AddMemberIntoCategory").' &nbsp;';
+			print $form->selectMembers('', 'elemid');
+			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+			print '</tr>';
+			print '</table>';
+			print '</form>';
+		}
+
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -739,9 +795,28 @@ if ($type == Categorie::TYPE_CONTACT) {
 	$permission = $user->rights->societe->creer;
 
 	$contacts = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($contacts < 0) {
+	if (is_numeric($contacts) && $contacts < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	} else {
+		// Form to add record into a category
+		$showclassifyform = 1;
+		if ($showclassifyform) {
+			print '<br>';
+			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+			print '<input type="hidden" name="type" value="'.$typeid.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="action" value="addintocategory">';
+			print '<table class="noborder centpercent">';
+			print '<tr class="liste_titre"><td>';
+			print $langs->trans("AddContactIntoCategory").' &nbsp;';
+			print $form->selectContacts('', '', 'elemid');
+			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+			print '</tr>';
+			print '</table>';
+			print '</form>';
+		}
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -760,7 +835,7 @@ if ($type == Categorie::TYPE_CONTACT) {
 		print '<table class="noborder centpercent">'."\n";
 		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Ref").'</td></tr>'."\n";
 
-		if (count($contacts) > 0) {
+		if (is_array($contacts) && count($contacts) > 0) {
 			$i = 0;
 			foreach ($contacts as $key => $contact) {
 				$i++;
@@ -807,6 +882,26 @@ if ($type == Categorie::TYPE_ACCOUNT) {
 	if ($accounts < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	} else {
+		// Form to add record into a category
+		$showclassifyform = 1;
+		if ($showclassifyform) {
+			print '<br>';
+			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+			print '<input type="hidden" name="type" value="'.$typeid.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="action" value="addintocategory">';
+			print '<table class="noborder centpercent">';
+			print '<tr class="liste_titre"><td>';
+				print $langs->trans("AddAccountIntoCategory").' &nbsp;';
+			$form->select_comptes('', 'elemid');
+			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+			print '</tr>';
+			print '</table>';
+			print '</form>';
+		}
+
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -864,6 +959,26 @@ if ($type == Categorie::TYPE_PROJECT) {
 	if ($objects < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	} else {
+		// Form to add record into a category
+		$showclassifyform = 1;
+		if ($showclassifyform) {
+			print '<br>';
+			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+			print '<input type="hidden" name="type" value="'.$typeid.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="action" value="addintocategory">';
+			print '<table class="noborder centpercent">';
+			print '<tr class="liste_titre"><td>';
+			print $langs->trans("AddProjectIntoCategory").' &nbsp;';
+			$form->selectProjects('', 'elemid');
+			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+			print '</tr>';
+			print '</table>';
+			print '</form>';
+		}
+
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -920,6 +1035,25 @@ if ($type == Categorie::TYPE_USER) {
 	if ($users < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	} else {
+		// Form to add record into a category
+		$showclassifyform = 1;
+		if ($showclassifyform) {
+			print '<br>';
+			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+			print '<input type="hidden" name="type" value="'.$typeid.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="action" value="addintocategory">';
+			print '<table class="noborder centpercent">';
+			print '<tr class="liste_titre"><td>';
+			print $langs->trans("AddProjectIntoCategory").' &nbsp;';
+			print $form->select_dolusers('', 'elemid');
+			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+			print '</tr>';
+			print '</table>';
+			print '</form>';
+		}
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -1024,6 +1158,78 @@ if ($type == Categorie::TYPE_WAREHOUSE) {
 	}
 }
 
+if ($type == Categorie::TYPE_TICKET) {
+	$permission = ($user->rights->categorie->creer || $user->rights->categorie->creer);
+
+	$tickets = $object->getObjectsInCateg($type, 0, $limit, $offset);
+	if ($tickets < 0) {
+		dol_print_error($db, $object->error, $object->errors);
+	} else {
+		// Form to add record into a category
+		$showclassifyform = 1;
+		if ($showclassifyform) {
+			print '<br>';
+			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+			print '<input type="hidden" name="type" value="'.$typeid.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="action" value="addintocategory">';
+			print '<table class="noborder centpercent">';
+			print '<tr class="liste_titre"><td>';
+			print $langs->trans("AddTicketIntoCategory").' &nbsp;';
+			$form->selectTickets('', 'elemid');
+			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+			print '</tr>';
+			print '</table>';
+			print '</form>';
+		}
+
+		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+		print '<input type="hidden" name="type" value="'.$typeid.'">';
+		print '<input type="hidden" name="id" value="'.$object->id.'">';
+		print '<input type="hidden" name="action" value="list">';
+
+		print '<br>';
+		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($tickets); $nbtotalofrecords = ''; $newcardbutton = '';
+		print_barre_liste($langs->trans("Ticket"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'ticket', 0, $newcardbutton, '', $limit);
+
+
+		print '<table class="noborder centpercent">'."\n";
+		print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Ref").'</td></tr>'."\n";
+
+		if (count($tickets) > 0) {
+			$i = 0;
+			foreach ($tickets as $ticket) {
+				$i++;
+				if ($i > $limit) break;
+
+				print "\t".'<tr class="oddeven">'."\n";
+				print '<td class="nowrap" valign="top">';
+				print $ticket->getNomUrl(1);
+				print "</td>\n";
+				print '<td class="tdtop">'.$ticket->label."</td>\n";
+				// Link to delete from category
+				print '<td class="right">';
+				if ($permission) {
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$ticket->id."'>";
+					print $langs->trans("DeleteFromCat");
+					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
+					print "</a>";
+				}
+				print '</td>';
+				print "</tr>\n";
+			}
+		} else {
+			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
+		}
+		print "</table>\n";
+
+		print '</form>'."\n";
+	}
+}
 
 // End of page
 llxFooter();
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 752868acb87..627c2f0ce51 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -280,11 +280,23 @@ if (empty($reshook) && $action == 'add') {
 	if (!$error) {
 		// Initialisation objet actioncomm
 		$object->priority = GETPOSTISSET("priority") ? GETPOST("priority", "int") : 0;
-		$object->fulldayevent = (!empty($fulldayevent) ? 1 : 0);
+		$object->fulldayevent = ($fulldayevent ? 1 : 0);
 		$object->location = GETPOST("location", 'alphanohtml');
 		$object->label = GETPOST('label', 'alphanohtml');
-		$object->fk_element = GETPOST("fk_element", 'int');
-		$object->elementtype = GETPOST("elementtype", 'alpha');
+
+		if (GETPOST("elementtype", 'alpha')) {
+			$modulecodetouseforpermissioncheck = GETPOST("elementtype", 'alpha');
+
+			$hasPermissionOnLinkedObject = 0;
+			if ($user->hasRight($modulecodetouseforpermissioncheck, 'read')) {
+				$hasPermissionOnLinkedObject = 1;
+			}
+			if ($hasPermissionOnLinkedObject) {
+				$object->fk_element = GETPOST("fk_element", 'int');
+				$object->elementtype = GETPOST("elementtype", 'alpha');
+			}
+		}
+
 		if (!GETPOST('label')) {
 			if (GETPOST('actioncode', 'aZ09') == 'AC_RDV' && $contact->getFullName($langs)) {
 				$object->label = $langs->transnoentitiesnoconv("TaskRDVWith", $contact->getFullName($langs));
@@ -525,8 +537,20 @@ if (empty($reshook) && $action == 'update') {
 		}
 		$object->fk_project  = GETPOST("projectid", 'int');
 		$object->note_private = trim(GETPOST("note", "restricthtml"));
-		$object->fk_element	 = GETPOST("fk_element", "int");
-		$object->elementtype = GETPOST("elementtype", "alphanohtml");
+
+		if (GETPOST("elementtype", 'alpha')) {
+			$modulecodetouseforpermissioncheck = GETPOST("elementtype", 'alpha');
+
+			$hasPermissionOnLinkedObject = 0;
+			if ($user->hasRight($modulecodetouseforpermissioncheck, 'read')) {
+				$hasPermissionOnLinkedObject = 1;
+			}
+			if ($hasPermissionOnLinkedObject) {
+				$object->fk_element = GETPOST("fk_element", 'int');
+				$object->elementtype = GETPOST("elementtype", 'alpha');
+			}
+		}
+
 		if (!$datef && $percentage == 100) {
 			$error++; $donotclearsession = 1;
 			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd")), $object->errors, 'errors');
@@ -600,10 +624,10 @@ if (empty($reshook) && $action == 'update') {
 				$sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
 				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = 'dolresource'";
 				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element)."'";
-				$sql .= " WHERE ac.id != ".$object->id;
+				$sql .= " WHERE ac.id <> ".((int) $object->id);
 				$sql .= " AND er.resource_id IN (";
 				$sql .= " SELECT resource_id FROM ".MAIN_DB_PREFIX."element_resources";
-				$sql .= " WHERE element_id = ".$object->id;
+				$sql .= " WHERE element_id = ".((int) $object->id);
 				$sql .= " AND element_type = '".$db->escape($object->element)."'";
 				$sql .= " AND busy = 1";
 				$sql .= ")";
@@ -779,10 +803,10 @@ if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate') {
 				$sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
 				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = 'dolresource'";
 				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element)."'";
-				$sql .= " WHERE ac.id != ".$object->id;
+				$sql .= " WHERE ac.id <> ".((int) $object->id);
 				$sql .= " AND er.resource_id IN (";
 				$sql .= " SELECT resource_id FROM ".MAIN_DB_PREFIX."element_resources";
-				$sql .= " WHERE element_id = ".$object->id;
+				$sql .= " WHERE element_id = ".((int) $object->id);
 				$sql .= " AND element_type = '".$db->escape($object->element)."'";
 				$sql .= " AND busy = 1";
 				$sql .= ")";
@@ -913,7 +937,7 @@ if ($action == 'create') {
                     $("#selectcomplete").change(function() {
                         if ($("#selectcomplete").val() == 100)
                         {
-                            if ($("#doneby").val() <= 0) $("#doneby").val(\''.$user->id.'\');
+                            if ($("#doneby").val() <= 0) $("#doneby").val(\''.((int) $user->id).'\');
                         }
                         if ($("#selectcomplete").val() == 0)
                         {
@@ -948,7 +972,7 @@ if ($action == 'create') {
 	print '<input type="hidden" name="donotclearsession" value="1">';
 	print '<input type="hidden" name="page_y" value="">';
 	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : htmlentities($_SERVER["HTTP_REFERER"])).'">';
+		print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : dol_htmlentities($_SERVER["HTTP_REFERER"])).'">';
 	}
 	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 		print '<input type="hidden" name="actioncode" value="'.dol_getIdFromCode($db, 'AC_OTH', 'c_actioncomm').'">';
@@ -968,7 +992,8 @@ if ($action == 'create') {
 	if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 		print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
 		$default = (empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT) ? 'AC_RDV' : $conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT);
-		$formactions->select_type_actions(GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default), "actioncode", "systemauto", 0, -1);
+		print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"');
+		print $formactions->select_type_actions(GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default), "actioncode", "systemauto", 0, -1, 0, 1);	// TODO Replace 0 with -2 in onlyautoornot
 		print '</td></tr>';
 	}
 
@@ -976,7 +1001,7 @@ 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>'.$langs->trans("EventOnFullDay").'</td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'></td></tr>';
+	print '<tr><td><label for="fullday">'.$langs->trans("EventOnFullDay").'</label></td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'></td></tr>';
 
 	$datep = ($datep ? $datep : (is_null($object->datep) ? '' : $object->datep));
 	if (GETPOST('datep', 'int', 1)) {
@@ -1051,7 +1076,7 @@ if ($action == 'create') {
 		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" language="javascript">
+		print '<script type="text/javascript">
 				jQuery(document).ready(function() {
 					function init_repeat()
 					{
@@ -1194,9 +1219,9 @@ if ($action == 'create') {
 
 		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 : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
+		print $formproject->select_projects((empty($societe->id) ? '' : $societe->id), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
 
-		print '&nbsp;<a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$societe->id.'&action=create&amp;backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'">';
+		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>';
 		$urloption = '?action=create&donotclearsession=1';
 		$url = dol_buildpath('comm/action/card.php', 2).$urloption;
@@ -1223,11 +1248,9 @@ if ($action == 'create') {
 		if (!empty($projectid)) {
 			$projectsListId = $projectid;
 		}
-		if ($origin=='task') {
-			$tid= GETPOST("originid");
-		} else {
-			$tid = GETPOST("projecttaskid") ? GETPOST("projecttaskid") : '';
-		}
+
+		$tid = GETPOSTISSET("projecttaskid") ? GETPOST("projecttaskid", 'int') : (GETPOSTISSET("taskid") ? GETPOST("taskid", 'int') : '');
+
 		$formproject->selectTasks((!empty($societe->id) ? $societe->id : -1), $tid, 'taskid', 24, 0, '1', 1, 0, 0, 'maxwidth500', $projectsListId);
 		print '</td></tr>';
 	}
@@ -1236,14 +1259,26 @@ if ($action == 'create') {
 	if (!empty($origin) && !empty($originid)) {
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
+		$hasPermissionOnLinkedObject = 0;
+		if ($user->hasRight($origin, 'read')) {
+			$hasPermissionOnLinkedObject = 1;
+		}
+		//var_dump('origin='.$origin.' originid='.$originid.' hasPermissionOnLinkedObject='.$hasPermissionOnLinkedObject);
+
 		if (! in_array($origin, array('societe', 'project', 'task', 'user'))) {
-			// We do not use link for object that already contains a hard coded
+			// We do not use link for object that already contains a hard coded field to make links with agenda events
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("LinkedObject").'</td>';
-			print '<td colspan="3">'.dolGetElementUrl($originid, $origin, 1).'</td></tr>';
-			print '<input type="hidden" name="fk_element" value="'.GETPOST('originid', 'int').'">';
-			print '<input type="hidden" name="elementtype" value="'.GETPOST('origin').'">';
-			print '<input type="hidden" name="originid" value="'.GETPOST('originid', 'int').'">';
-			print '<input type="hidden" name="origin" value="'.GETPOST('origin').'">';
+			print '<td colspan="3">';
+			if ($hasPermissionOnLinkedObject) {
+				print dolGetElementUrl($originid, $origin, 1);
+				print '<input type="hidden" name="fk_element" value="'.$originid.'">';
+				print '<input type="hidden" name="elementtype" value="'.$origin.'">';
+				print '<input type="hidden" name="originid" value="'.$originid.'">';
+				print '<input type="hidden" name="origin" value="'.$origin.'">';
+			} else {
+				print '<!-- no permission on object to link '.$origin.' id '.$originid.' -->';
+			}
+			print '</td></tr>';
 		}
 	}
 
@@ -1277,11 +1312,11 @@ if ($action == 'create') {
 	print '</table>';
 
 
-	if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER) {
+	if (getDolGlobalString('AGENDA_REMINDER_EMAIL') || getDolGlobalString('AGENDA_REMINDER_BROWSER')) {
 		//checkbox create reminder
 		print '<hr>';
 		print '<br>';
-		print '<label for="addreminder">'.$langs->trans("AddReminder").'</label> <input type="checkbox" id="addreminder" name="addreminder"><br><br>';
+		print '<label for="addreminder">'.img_picto('', 'bell', 'class="pictofixedwidth"').$langs->trans("AddReminder").'</label> <input type="checkbox" id="addreminder" name="addreminder"><br><br>';
 
 		print '<div class="reminderparameters" style="display: none;">';
 
@@ -1298,14 +1333,15 @@ if ($action == 'create') {
 
 		//Reminder Type
 		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderType").'</td><td colspan="3">';
-		print $form->selectarray('selectremindertype', $TRemindTypes, '', 0, 0, 0, '', 0, 0, 0, '', 'mimnwidth200', 1);
+		print $form->selectarray('selectremindertype', $TRemindTypes, '', 0, 0, 0, '', 0, 0, 0, '', 'minwidth200 maxwidth500', 1);
 		print '</td></tr>';
 
 		//Mail Model
-		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("EMailTemplates").'</td><td colspan="3">';
-		print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1, 1);
-		print '</td></tr>';
-
+		if (getDolGlobalString('AGENDA_REMINDER_EMAIL')) {
+			print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("EMailTemplates").'</td><td colspan="3">';
+			print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1, 1);
+			print '</td></tr>';
+		}
 
 		print '</table>';
 		print '</div>';
@@ -1313,14 +1349,20 @@ if ($action == 'create') {
 		print "\n".'<script type="text/javascript">';
 		print '$(document).ready(function () {
 	            		$("#addreminder").click(function(){
+							console.log("Click on addreminder");
 	            		    if (this.checked) {
-	            		      $(".reminderparameters").show();
+	            		    	$(".reminderparameters").show();
                             } else {
-                            $(".reminderparameters").hide();
+                            	$(".reminderparameters").hide();
                             }
+							$("#selectremindertype").select2("destroy");
+							$("#selectremindertype").select2();
+							$("#select_offsetunittype_duration").select2("destroy");
+							$("#select_offsetunittype_duration").select2();
 	            		 });
 
 	            		$("#selectremindertype").change(function(){
+							console.log("Change on selectremindertype");
 	            	        var selected_option = $("#selectremindertype option:selected").val();
 	            		    if(selected_option == "email") {
 	            		        $("#select_actioncommsendmodel_mail").closest("tr").show();
@@ -1334,15 +1376,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Add").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	if (empty($backtopage)) {
-		print '<input type="button" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-	} else {
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	}
-	print '</div>';
+	print $form->buttonsSaveCancel("Add");
 
 	print "</form>";
 }
@@ -1450,7 +1484,7 @@ if ($id > 0) {
 		print '<input type="hidden" name="ref_ext" value="'.$object->ref_ext.'">';
 		print '<input type="hidden" name="page_y" value="">';
 		if ($backtopage) {
-			print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : htmlentities($_SERVER["HTTP_REFERER"])).'">';
+			print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : dol_htmlentities($_SERVER["HTTP_REFERER"])).'">';
 		}
 		if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 			print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">';
@@ -1528,7 +1562,7 @@ if ($id > 0) {
 			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" language="javascript">
+			print '<script type="text/javascript">
 				jQuery(document).ready(function() {
 					function init_repeat()
 					{
@@ -1669,7 +1703,7 @@ if ($id > 0) {
 			print img_picto('', 'project', 'class="paddingrightonly"');
 			$numprojet = $formproject->select_projects(($object->socid > 0 ? $object->socid : -1), $object->fk_project, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth500');
 			if ($numprojet == 0) {
-				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$object->socid.'&action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
+				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$object->socid.'&action=create&token='.newToken().'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
 			}
 			print '</td></tr>';
 		}
@@ -1821,11 +1855,7 @@ if ($id > 0) {
 
 		print dol_get_fiche_end();
 
-		print '<div class="center">';
-		print '<input type="submit" class="button button-save" name="edit" value="'.$langs->trans("Save").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
+		print $form->buttonsSaveCancel();
 
 		print '</form>';
 	} else {
@@ -1840,24 +1870,34 @@ if ($id > 0) {
 
 		$linkback = '';
 		// Link to other agenda views
-		$linkback .= img_picto($langs->trans("BackToList"), 'object_list', 'class="hideonsmartphone pictoactionview"');
-		$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&restore_lastsearch_values=1">';
+		$linkback .= img_picto($langs->trans("BackToList"), 'object_list', 'class="pictoactionview pictofixedwidth"');
+		$linkback .= '<span class="hideonsmartphone">'.$langs->trans("BackToList").'</span>';
+		$linkback .= '</a>';
 		$linkback .= '</li>';
 		$linkback .= '<li class="noborder litext">';
-		$linkback .= img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="hideonsmartphone pictoactionview"');
-		$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewCal").'</a>';
+		$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+		$linkback .= img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="pictoactionview pictofixedwidth"');
+		$linkback .= '<span class="hideonsmartphone">'.$langs->trans("ViewCal").'</span>';
+		$linkback .= '</a>';
 		$linkback .= '</li>';
 		$linkback .= '<li class="noborder litext">';
-		$linkback .= img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="hideonsmartphone pictoactionview"');
-		$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_week&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewWeek").'</a>';
+		$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_week&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+		$linkback .= img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="pictoactionview pictofixedwidth"');
+		$linkback .= '<span class="hideonsmartphone">'.$langs->trans("ViewWeek").'</span>';
+		$linkback .= '</a>';
 		$linkback .= '</li>';
 		$linkback .= '<li class="noborder litext">';
-		$linkback .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="hideonsmartphone pictoactionview"');
-		$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewDay").'</a>';
+		$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+		$linkback .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="pictoactionview pictofixedwidth"');
+		$linkback .= '<span class="hideonsmartphone">'.$langs->trans("ViewDay").'</span>';
+		$linkback .= '</a>';
 		$linkback .= '</li>';
 		$linkback .= '<li class="noborder litext">';
-		$linkback .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="hideonsmartphone pictoactionview"');
-		$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewPerUser").'</a>';
+		$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?mode=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+		$linkback .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview pictofixedwidth"');
+		$linkback .= '<span class="hideonsmartphone">'.$langs->trans("ViewPerUser").'</span>';
+		$linkback .= '</a>';
 
 		//$linkback.=$out;
 
@@ -1872,7 +1912,7 @@ if ($id > 0) {
 			if ($user->rights->agenda->allactions->create ||
 				(($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create)) {
 				if ($action != 'classify') {
-					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+					$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);
@@ -1880,7 +1920,7 @@ if ($id > 0) {
 					$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 .= '<input type="submit" class="button button-save 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);
@@ -1889,9 +1929,7 @@ if ($id > 0) {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
 					if ($proj->title) {
 						$morehtmlref .= ' - '.$proj->title;
 					}
@@ -1922,7 +1960,7 @@ if ($id > 0) {
 		}
 
 		// Full day event
-		print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td>'.yn($object->fulldayevent, 3).'</td></tr>';
+		print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td>'.yn($object->fulldayevent ? 1 : 0, 3).'</td></tr>';
 
 		$rowspan = 4;
 		if (empty($conf->global->AGENDA_DISABLE_LOCATION)) {
@@ -1931,7 +1969,7 @@ if ($id > 0) {
 
 		// Date start
 		print '<tr><td>'.$langs->trans("DateActionStart").'</td><td>';
-		if (!$object->fulldayevent) {
+		if (empty($object->fulldayevent)) {
 			print dol_print_date($object->datep, 'dayhour', 'tzuser');
 		} else {
 			print dol_print_date($object->datep, 'day', 'tzuser');
@@ -1944,7 +1982,7 @@ if ($id > 0) {
 
 		// Date end
 		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td>';
-		if (!$object->fulldayevent) {
+		if (empty($object->fulldayevent)) {
 			print dol_print_date($object->datef, 'dayhour', 'tzuser');
 		} else {
 			print dol_print_date($object->datef, 'day', 'tzuser');
@@ -2153,7 +2191,7 @@ if ($id > 0) {
 		if ($action != 'edit') {
 			if ($user->rights->agenda->allactions->create ||
 			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create)) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=edit&id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
+				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
 			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Modify").'</a></div>';
 			}
@@ -2192,12 +2230,12 @@ if ($id > 0) {
 			$delallowed = $user->rights->agenda->myactions->create;
 
 
-			print $formfile->showdocuments('actions', $object->id, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 0, 0, '', '', '', $object->default_lang);
+			print $formfile->showdocuments('actions', $object->id, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 0, 0, '', '', '', $langs->getDefaultLang());
 
-			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+			print '</div><div class="fichehalfright">';
 
 
-			print '</div></div></div>';
+			print '</div></div>';
 		}
 	}
 }
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 769bd9ddd50..19273648827 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -123,16 +123,17 @@ class ActionComm extends CommonObject
 	 */
 	public $label;
 
+	/**
+	 * @var string Agenda event label
+	 * @deprecated Use $label
+	 */
+	public $libelle;
+
 	/**
 	 * @var integer Date creation record (datec)
 	 */
 	public $datec;
 
-	/**
-	 * @var integer Date end record (datef)
-	 */
-	public $datef;
-
 	/**
 	 * @var integer Duration (duree)
 	 */
@@ -172,6 +173,21 @@ class ActionComm extends CommonObject
 	 */
 	public $datep;
 
+	/**
+	 * @var integer Date action end (datef)
+	 */
+	public $datef;
+
+	/**
+	 * @var integer This is date start action (datep) but modified to not be outside calendar view.
+	 */
+	public $date_start_in_calendar;
+
+	/**
+	 * @var integer This is date end action (datef) but modified to not be outside calendar view.
+	 */
+	public $date_end_in_calendar;
+
 	/**
 	 * @var integer Date action end (datep2)
 	 */
@@ -188,6 +204,11 @@ class ActionComm extends CommonObject
 	 */
 	public $fulldayevent = 0;
 
+	/**
+	 * @var int 1=???
+	 */
+	public $ponctuel;
+
 	/**
 	 * @var integer Percentage
 	 */
@@ -219,8 +240,7 @@ class ActionComm extends CommonObject
 	public $userownerid;
 
 	/**
-	 * @var int Id of user done (deprecated)
-	 * @deprecated
+	 * @var int Id of user that has done the event. Used only if AGENDA_ENABLE_DONEBY is set.
 	 */
 	public $userdoneid;
 
@@ -239,20 +259,6 @@ class ActionComm extends CommonObject
 	 */
 	public $reminders = array();
 
-	/**
-	 * @var User Object user of owner
-	 * @deprecated
-	 * @see $userownerid
-	 */
-	public $usertodo;
-
-	/**
-	 * @var User Object user that did action
-	 * @deprecated
-	 * @see $userdoneid
-	 */
-	public $userdone;
-
 	/**
 	 * @var int thirdparty id linked to action
 	 */
@@ -261,7 +267,7 @@ class ActionComm extends CommonObject
 	/**
 	 * @var int socpeople id linked to action
 	 */
-	public $contactid;
+	public $contact_id;
 
 	/**
 	 * @var Societe|null Company linked to action (optional)
@@ -273,7 +279,7 @@ class ActionComm extends CommonObject
 	/**
 	 * @var Contact|null Contact linked to action (optional)
 	 * @deprecated
-	 * @see $contactid
+	 * @see $contact_id
 	 */
 	public $contact;
 
@@ -542,18 +548,22 @@ class ActionComm extends CommonObject
 		$sql .= (isset($this->type_id) ? $this->type_id : "null").",";
 		$sql .= ($code ? ("'".$this->db->escape($code)."'") : "null").", ";
 		$sql .= (!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null").", ";
-		$sql .= ((isset($this->socid) && $this->socid > 0) ? $this->socid : "null").", ";
-		$sql .= ((isset($this->fk_project) && $this->fk_project > 0) ? $this->fk_project : "null").", ";
+		$sql .= ((isset($this->socid) && $this->socid > 0) ? ((int) $this->socid) : "null").", ";
+		$sql .= ((isset($this->fk_project) && $this->fk_project > 0) ? ((int) $this->fk_project) : "null").", ";
 		$sql .= " '".$this->db->escape($this->note_private)."', ";
-		$sql .= ((isset($this->contact_id) && $this->contact_id > 0) ? $this->contact_id : "null").", "; // deprecated, use ->socpeopleassigned
+		$sql .= ((isset($this->contact_id) && $this->contact_id > 0) ? ((int) $this->contact_id) : "null").", "; // deprecated, use ->socpeopleassigned
 		$sql .= (isset($user->id) && $user->id > 0 ? $user->id : "null").", ";
 		$sql .= ($userownerid > 0 ? $userownerid : "null").", ";
 		$sql .= ($userdoneid > 0 ? $userdoneid : "null").", ";
-		$sql .= "'".$this->db->escape($this->label)."','".$this->db->escape($this->percentage)."','".$this->db->escape($this->priority)."','".$this->db->escape($this->fulldayevent)."','".$this->db->escape($this->location)."', ";
+		$sql .= "'".$this->db->escape($this->label)."', ";
+		$sql .= "'".$this->db->escape($this->percentage)."', ";
+		$sql .= "'".$this->db->escape($this->priority)."', ";
+		$sql .= "'".$this->db->escape($this->fulldayevent)."', ";
+		$sql .= "'".$this->db->escape($this->location)."', ";
 		$sql .= "'".$this->db->escape($this->transparency)."', ";
-		$sql .= (!empty($this->fk_element) ? $this->fk_element : "null").", ";
+		$sql .= (!empty($this->fk_element) ? ((int) $this->fk_element) : "null").", ";
 		$sql .= (!empty($this->elementtype) ? "'".$this->db->escape($this->elementtype)."'" : "null").", ";
-		$sql .= $conf->entity.",";
+		$sql .= ((int) $conf->entity).",";
 		$sql .= (!empty($this->extraparams) ? "'".$this->db->escape($this->extraparams)."'" : "null").", ";
 		// Fields emails
 		$sql .= (!empty($this->email_msgid) ? "'".$this->db->escape($this->email_msgid)."'" : "null").", ";
@@ -596,7 +606,7 @@ class ActionComm extends CommonObject
 						}
 
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
-						$sql .= " VALUES(".$this->id.", 'user', ".$val['id'].", ".(empty($val['mandatory']) ? '0' : $val['mandatory']).", ".(empty($val['transparency']) ? '0' : $val['transparency']).", ".(empty($val['answer_status']) ? '0' : $val['answer_status']).")";
+						$sql .= " VALUES(".((int) $this->id).", 'user', ".((int) $val['id']).", ".(empty($val['mandatory']) ? '0' : ((int) $val['mandatory'])).", ".(empty($val['transparency']) ? '0' : ((int) $val['transparency'])).", ".(empty($val['answer_status']) ? '0' : ((int) $val['answer_status'])).")";
 
 						$resql = $this->db->query($sql);
 						if (!$resql) {
@@ -621,7 +631,7 @@ class ActionComm extends CommonObject
 						}
 
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
-						$sql .= " VALUES(".$this->id.", 'socpeople', ".$id.", 0, 0, 0)";
+						$sql .= " VALUES(".((int) $this->id).", 'socpeople', ".((int) $id).", 0, 0, 0)";
 
 						$resql = $this->db->query($sql);
 						if (!$resql) {
@@ -827,18 +837,17 @@ class ActionComm extends CommonObject
 				$this->usermodid = $obj->fk_user_mod;
 
 				if (!is_object($this->author)) {
-					$this->author = new stdClass(); // To avoid warning
+					$this->author = new User($this->db); // To avoid warning
 				}
 				$this->author->id = $obj->fk_user_author; // deprecated
 				$this->author->firstname = $obj->firstname; // deprecated
 				$this->author->lastname = $obj->lastname; // deprecated
 				if (!is_object($this->usermod)) {
-					$this->usermod = new stdClass(); // To avoid warning
+					$this->usermod = new User($this->db); // To avoid warning
 				}
 				$this->usermod->id = $obj->fk_user_mod; // deprecated
 
 				$this->userownerid = $obj->fk_user_action;
-				$this->userdoneid = $obj->fk_user_done;
 				$this->priority				= $obj->priority;
 				$this->fulldayevent			= $obj->fulldayevent;
 				$this->location				= $obj->location;
@@ -985,7 +994,7 @@ class ActionComm extends CommonObject
 		// remove categorie association
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_actioncomm";
-			$sql .= " WHERE fk_actioncomm=".$this->id;
+			$sql .= " WHERE fk_actioncomm=".((int) $this->id);
 
 			$res = $this->db->query($sql);
 			if (!$res) {
@@ -997,7 +1006,7 @@ class ActionComm extends CommonObject
 		// remove actioncomm_resources
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_resources";
-			$sql .= " WHERE fk_actioncomm=".$this->id;
+			$sql .= " WHERE fk_actioncomm=".((int) $this->id);
 
 			$res = $this->db->query($sql);
 			if (!$res) {
@@ -1029,7 +1038,7 @@ class ActionComm extends CommonObject
 		// remove actioncomm
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm";
-			$sql .= " WHERE id=".$this->id;
+			$sql .= " WHERE id=".((int) $this->id);
 
 			$res = $this->db->query($sql);
 			if (!$res) {
@@ -1130,18 +1139,18 @@ class ActionComm extends CommonObject
 		$sql .= ", datep2 = ".(strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : 'null');
 		$sql .= ", durationp = ".(isset($this->durationp) && $this->durationp >= 0 && $this->durationp != '' ? "'".$this->db->escape($this->durationp)."'" : "null"); // deprecated
 		$sql .= ", note = '".$this->db->escape($this->note_private)."'";
-		$sql .= ", fk_project =".($this->fk_project > 0 ? $this->fk_project : "null");
-		$sql .= ", fk_soc =".($socid > 0 ? $socid : "null");
-		$sql .= ", fk_contact =".($contactid > 0 ? $contactid : "null");
+		$sql .= ", fk_project =".($this->fk_project > 0 ? ((int) $this->fk_project) : "null");
+		$sql .= ", fk_soc =".($socid > 0 ? ((int) $socid) : "null");
+		$sql .= ", fk_contact =".($contactid > 0 ? ((int) $contactid) : "null");
 		$sql .= ", priority = '".$this->db->escape($this->priority)."'";
 		$sql .= ", fulldayevent = '".$this->db->escape($this->fulldayevent)."'";
 		$sql .= ", location = ".($this->location ? "'".$this->db->escape($this->location)."'" : "null");
 		$sql .= ", transparency = '".$this->db->escape($this->transparency)."'";
-		$sql .= ", fk_user_mod = ".$user->id;
-		$sql .= ", fk_user_action = ".($userownerid > 0 ? "'".$this->db->escape($userownerid)."'" : "null");
-		$sql .= ", fk_user_done = ".($userdoneid > 0 ? "'".$this->db->escape($userdoneid)."'" : "null");
+		$sql .= ", fk_user_mod = ".((int) $user->id);
+		$sql .= ", fk_user_action = ".($userownerid > 0 ? ((int) $userownerid) : "null");
+		$sql .= ", fk_user_done = ".($userdoneid > 0 ? ((int) $userdoneid) : "null");
 		if (!empty($this->fk_element)) {
-			$sql .= ", fk_element=".($this->fk_element ? $this->db->escape($this->fk_element) : "null");
+			$sql .= ", fk_element=".($this->fk_element ? ((int) $this->fk_element) : "null");
 		}
 		if (!empty($this->elementtype)) {
 			$sql .= ", elementtype=".($this->elementtype ? "'".$this->db->escape($this->elementtype)."'" : "null");
@@ -1182,7 +1191,7 @@ class ActionComm extends CommonObject
 					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(".$this->id.", 'user', ".$val['id'].", ".(empty($val['mandatory']) ? '0' : $val['mandatory']).", ".(empty($val['transparency']) ? '0' : $val['transparency']).", ".(empty($val['answer_status']) ? '0' : $val['answer_status']).")";
+					$sql .= " VALUES(".((int) $this->id).", 'user', ".((int) $val['id']).", ".(empty($val['mandatory']) ? '0' : ((int) $val['mandatory'])).", ".(empty($val['transparency']) ? '0' : ((int) $val['transparency'])).", ".(empty($val['answer_status']) ? '0' : ((int) $val['answer_status'])).")";
 
 					$resql = $this->db->query($sql);
 					if (!$resql) {
@@ -1205,7 +1214,7 @@ class ActionComm extends CommonObject
 						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(".$this->id.", 'socpeople', ".$id.", 0, 0, 0)";
+						$sql .= " VALUES(".((int) $this->id).", 'socpeople', ".((int) $id).", 0, 0, 0)";
 
 						$resql = $this->db->query($sql);
 						if (!$resql) {
@@ -1246,7 +1255,6 @@ class ActionComm extends CommonObject
 	 *  Load all objects with filters.
 	 *  @todo WARNING: This make a fetch on all records instead of making one request with a join.
 	 *
-	 *  @param		DoliDb	$db				Not used
 	 *  @param		int		$socid			Filter by thirdparty
 	 *  @param		int		$fk_element		Id of element action is linked to
 	 *  @param		string	$elementtype	Type of element action is linked to
@@ -1256,7 +1264,7 @@ class ActionComm extends CommonObject
 	 *  @param		string	$limit			Limit number of answers
 	 *  @return		array|string			Error string if KO, array with actions if OK
 	 */
-	public static function getActions($db, $socid = 0, $fk_element = 0, $elementtype = '', $filter = '', $sortfield = 'a.datep', $sortorder = 'DESC', $limit = 0)
+	public function getActions($socid = 0, $fk_element = 0, $elementtype = '', $filter = '', $sortfield = 'a.datep', $sortorder = 'DESC', $limit = 0)
 	{
 		global $conf, $langs;
 
@@ -1278,33 +1286,33 @@ class ActionComm extends CommonObject
 				$sql .= " (SELECT fk_actioncomm FROM ".MAIN_DB_PREFIX."actioncomm_resources WHERE";
 				$sql .= " element_type = 'socpeople' AND fk_element = ".((int) $fk_element).')';
 			} else {
-				$sql .= " AND a.fk_element = ".((int) $fk_element)." AND a.elementtype = '".$db->escape($elementtype)."'";
+				$sql .= " AND a.fk_element = ".((int) $fk_element)." AND a.elementtype = '".$this->db->escape($elementtype)."'";
 			}
 		}
 		if (!empty($filter)) {
 			$sql .= $filter;
 		}
 		if ($sortorder && $sortfield) {
-			$sql .= $db->order($sortfield, $sortorder);
+			$sql .= $this->db->order($sortfield, $sortorder);
 		}
-		$sql .= $db->plimit($limit, 0);
+		$sql .= $this->db->plimit($limit, 0);
 
-		$resql = $db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql) {
-			$num = $db->num_rows($resql);
+			$num = $this->db->num_rows($resql);
 
 			if ($num) {
 				for ($i = 0; $i < $num; $i++) {
-					$obj = $db->fetch_object($resql);
-					$actioncommstatic = new ActionComm($db);
+					$obj = $this->db->fetch_object($resql);
+					$actioncommstatic = new ActionComm($this->db);
 					$actioncommstatic->fetch($obj->id);
 					$resarray[$i] = $actioncommstatic;
 				}
 			}
-			$db->free($resql);
+			$this->db->free($resql);
 			return $resarray;
 		} else {
-			return $db->lasterror();
+			return $this->db->lasterror();
 		}
 	}
 
@@ -1328,10 +1336,10 @@ class ActionComm extends CommonObject
 			$sql = "SELECT count(a.id) as nb";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
 		}
-		if (!$user->rights->agenda->allactions->read) {
+		if (empty($user->rights->agenda->allactions->read)) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."actioncomm_resources AS ar ON a.id = ar.fk_actioncomm AND ar.element_type ='user' AND ar.fk_element = ".((int) $user->id);
 		}
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
@@ -1340,13 +1348,13 @@ class ActionComm extends CommonObject
 			$sql .= " AND a.percent >= 0 AND a.percent < 100";
 		}
 		$sql .= " AND a.entity IN (".getEntity('agenda').")";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".((int) $user->id).")";
 		}
 		if ($user->socid) {
 			$sql .= " AND a.fk_soc = ".((int) $user->socid);
 		}
-		if (!$user->rights->agenda->allactions->read) {
+		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 .= " OR ar.fk_element = ".((int) $user->id);
 			$sql .= ")";
@@ -1360,7 +1368,7 @@ class ActionComm extends CommonObject
 				$response->warning_delay = $conf->agenda->warning_delay / 60 / 60 / 24;
 				$response->label = $langs->trans("ActionsToDo");
 				$response->labelShort = $langs->trans("ActionsToDoShort");
-				$response->url = DOL_URL_ROOT.'/comm/action/list.php?action=show_list&actioncode=0&status=todo&mainmenu=agenda';
+				$response->url = DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&actioncode=0&status=todo&mainmenu=agenda';
 				if ($user->rights->agenda->allactions->read) {
 					$response->url .= '&filtert=-1';
 				}
@@ -1440,9 +1448,9 @@ class ActionComm extends CommonObject
 
 
 	/**
-	 *  Return label of status
+	 *  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
+	 *  @param  int		$mode           0=Long label, 1=Short label, 2=Picto+Short label, 3=Picto, 4=Picto+Short label, 5=Short label+Picto, 6=Picto+Long label, 7=Very short label+Picto
 	 *  @param  int		$hidenastatus   1=Show nothing if status is "Not applicable"
 	 *  @return string          		String with status
 	 */
@@ -1466,18 +1474,18 @@ class ActionComm extends CommonObject
 		// phpcs:enable
 		global $langs;
 
-		$labelStatus = $langs->trans('StatusNotApplicable');
+		$labelStatus = $langs->transnoentitiesnoconv('StatusNotApplicable');
 		if ($percent == -1 && !$hidenastatus) {
-			$labelStatus = $langs->trans('StatusNotApplicable');
+			$labelStatus = $langs->transnoentitiesnoconv('StatusNotApplicable');
 		} elseif ($percent == 0) {
-			$labelStatus = $langs->trans('StatusActionToDo').' (0%)';
+			$labelStatus = $langs->transnoentitiesnoconv('StatusActionToDo').' (0%)';
 		} elseif ($percent > 0 && $percent < 100) {
-			$labelStatus = $langs->trans('StatusActionInProcess').' ('.$percent.'%)';
+			$labelStatus = $langs->transnoentitiesnoconv('StatusActionInProcess').' ('.$percent.'%)';
 		} elseif ($percent >= 100) {
-			$labelStatus = $langs->trans('StatusActionDone').' (100%)';
+			$labelStatus = $langs->transnoentitiesnoconv('StatusActionDone').' (100%)';
 		}
 
-		$labelStatusShort = $langs->trans('StatusNotApplicable');
+		$labelStatusShort = $langs->transnoentitiesnoconv('StatusNotApplicable');
 		if ($percent == -1 && !$hidenastatus) {
 			$labelStatusShort = $langs->trans('NA');
 		} elseif ($percent == 0) {
@@ -1629,36 +1637,34 @@ class ActionComm extends CommonObject
 		}
 
 		if ($withpicto == 2) {
-			$libelle = $label;
 			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
-				$libelle = $labeltype;
+				$label = $labeltype;
 			}
-			$libelleshort = '';
+			$labelshort = '';
 		} else {
-			$libelle = (empty($this->libelle) ? $label : $this->libelle.(($label && $label != $this->libelle) ? ' '.$label : ''));
-			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) {
-				$libelle = $labeltype;
+			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($label)) {
+				$label = $labeltype;
 			}
 			if ($maxlength < 0) {
-				$libelleshort = $this->ref;
+				$labelshort = $this->ref;
 			} else {
-				$libelleshort = dol_trunc($libelle, $maxlength);
+				$labelshort = dol_trunc($label, $maxlength);
 			}
 		}
 
 		if ($withpicto) {
 			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {	// Add code into ()
 				if ($labeltype) {
-					$libelle .= (preg_match('/'.preg_quote($labeltype, '/').'/', $libelle) ? '' : ' ('.$langs->transnoentities("Action".$this->type_code).')');
+					$label .= (preg_match('/'.preg_quote($labeltype, '/').'/', $label) ? '' : ' ('.$langs->transnoentities("Action".$this->type_code).')');
 				}
 			}
 		}
 
 		$result .= $linkstart;
 		if ($withpicto) {
-			$result .= img_object(($notooltip ? '' : $langs->trans("ShowAction").': '.$libelle), ($overwritepicto ? $overwritepicto : 'action'), (($this->type_color && $overwritepicto) ? 'style="color: #'.$this->type_color.' !important;" ' : '').($notooltip ? 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'"' : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+			$result .= img_object(($notooltip ? '' : $langs->trans("ShowAction").': '.$label), ($overwritepicto ? $overwritepicto : 'action'), (($this->type_color && $overwritepicto) ? 'style="color: #'.$this->type_color.' !important;" ' : '').($notooltip ? 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'"' : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
 		}
-		$result .= $libelleshort;
+		$result .= $labelshort;
 		$result .= $linkend;
 
 		global $action;
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index e675c93d472..ff242430b0a 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -205,9 +205,9 @@ class ActionCommReminder extends CommonObject
 	}
 
 	/**
-	 *  Retourne le libelle du status d'un user (actif, inactif)
+	 *  Return label of the status of a reminder
 	 *
-	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @param  int     $mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return	string 			       Label of status
 	 */
 	public function getLibStatut($mode = 0)
@@ -228,18 +228,18 @@ class ActionCommReminder extends CommonObject
 		// phpcs:enable
 		global $langs;
 
-		$labelStatus = $langs->trans('ToDo');
+		$labelStatus = $langs->transnoentitiesnoconv('ToDo');
 		if ($status == 1) {
-			$labelStatus = $langs->trans('Done');
+			$labelStatus = $langs->transnoentitiesnoconv('Done');
 		} elseif ($status == -1) {
-			$labelStatus = $langs->trans('Error');
+			$labelStatus = $langs->transnoentitiesnoconv('Error');
 		}
 
-		$labelStatusShort = $langs->trans('ToDo');
+		$labelStatusShort = $langs->transnoentitiesnoconv('ToDo');
 		if ($status == 1) {
-			$labelStatus = $langs->trans('Done');
+			$labelStatus = $langs->transnoentitiesnoconv('Done');
 		} elseif ($status == -1) {
-			$labelStatus = $langs->trans('Error');
+			$labelStatus = $langs->transnoentitiesnoconv('Error');
 		}
 
 		$statusType = 'status5';
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index fd57dd3c81b..2d868e9bfaa 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -158,8 +158,9 @@ class AgendaEvents extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index a248482ee9d..32c2345a657 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -145,7 +145,7 @@ class CActionComm
 	 *  @param  string|int  $active         1 or 0 to filter on event state active or not ('' by default = no filter)
 	 *  @param  string      $idorcode       'id' or 'code' or 'all'
 	 *  @param  string      $excludetype    Type to exclude ('system' or 'systemauto')
-	 *  @param  int         $onlyautoornot  1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line per calendar (Default, Auto, BoothConf, ...)
+	 *  @param  int         $onlyautoornot  1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1 or -2=Keep details and add a combined line per calendar (Default, Auto, BoothConf, ...)
 	 *  @param  string      $morefilter     Add more SQL filter
 	 *  @param  int         $shortlabel     1=Get short label instead of long label
 	 *  @return mixed                       Array of all event types if OK, <0 if KO. Key of array is id or code depending on parameter $idorcode.
@@ -241,7 +241,7 @@ class CActionComm
 							$transcode = $langs->trans($keyfortrans);
 						}
 						$label = (($transcode != $keyfortrans) ? $transcode : $langs->trans($obj->label));
-						if ($onlyautoornot == -1 && !empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+						if (($onlyautoornot == -1 || $onlyautoornot == -2) && !empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 							if ($typecalendar == 'system') {
 								$label = '&nbsp;&nbsp; '.$label;
 								$repid[-99] = $langs->trans("ActionAC_MANUAL");
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index eb1ac59cfe0..c69d396cf26 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -64,8 +64,8 @@ if ($id > 0) {
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -108,6 +108,8 @@ $help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
 
 llxHeader('', $langs->trans("Agenda"), $help_url);
 
+$now = dol_now();
+$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 
 if ($object->id > 0) {
 	$result1 = $object->fetch($id);
@@ -135,24 +137,21 @@ if ($object->id > 0) {
 
 	$head = actions_prepare_head($object);
 
-	$now = dol_now();
-	$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
-
 	print dol_get_fiche_head($head, 'documents', $langs->trans("Action"), -1, 'action');
 
 	$linkback = img_picto($langs->trans("BackToList"), 'object_list', 'class="hideonsmartphone pictoactionview"');
-	$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list">'.$langs->trans("BackToList").'</a>';
+	$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list">'.$langs->trans("BackToList").'</a>';
 
 	// Link to other agenda views
 	$out = '';
 	$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="hideonsmartphone pictoactionview"');
-	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewPerUser").'</a>';
+	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?mode=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewPerUser").'</a>';
 	$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="hideonsmartphone pictoactionview"');
-	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewCal").'</a>';
+	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewCal").'</a>';
 	$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="hideonsmartphone pictoactionview"');
-	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewWeek").'</a>';
+	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewWeek").'</a>';
 	$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="hideonsmartphone pictoactionview"');
-	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewDay").'</a>';
+	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewDay").'</a>';
 
 	$linkback .= $out;
 
@@ -167,9 +166,7 @@ if ($object->id > 0) {
 		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>';
+			$morehtmlref .= ' : '.$proj->getNomUrl(1);
 			if ($proj->title) {
 				$morehtmlref .= ' - '.$proj->title;
 			}
@@ -197,14 +194,14 @@ if ($object->id > 0) {
 	}
 
 	// Full day event
-	print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent, 3).'</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent ? 1 : 0, 3).'</td></tr>';
 
 	// Date start
 	print '<tr><td>'.$langs->trans("DateActionStart").'</td><td colspan="3">';
-	if (!$object->fulldayevent) {
-		print dol_print_date($object->datep, 'dayhour');
+	if (empty($object->fulldayevent)) {
+		print dol_print_date($object->datep, 'dayhour', 'tzuser');
 	} else {
-		print dol_print_date($object->datep, 'day');
+		print dol_print_date($object->datep, 'day', 'tzuser');
 	}
 	if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) {
 		print img_warning($langs->trans("Late"));
@@ -214,10 +211,10 @@ if ($object->id > 0) {
 
 	// Date end
 	print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
-	if (!$object->fulldayevent) {
-		print dol_print_date($object->datef, 'dayhour');
+	if (empty($object->fulldayevent)) {
+		print dol_print_date($object->datef, 'dayhour', 'tzuser');
 	} else {
-		print dol_print_date($object->datef, 'day');
+		print dol_print_date($object->datef, 'day', '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 722423c0cd9..d3538c6a2c9 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -59,8 +59,10 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
 	$filtert = $user->id;
 }
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$newparam = '';
+
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -84,26 +86,31 @@ if ($socid < 0) {
 }
 
 $canedit = 1;
-if (!$user->rights->agenda->myactions->read) {
+if (empty($user->rights->agenda->myactions->read)) {
 	accessforbidden();
 }
-if (!$user->rights->agenda->allactions->read) {
+if (empty($user->rights->agenda->allactions->read)) {
 	$canedit = 0;
 }
-if (!$user->rights->agenda->allactions->read || $filter == 'mine') {  // If no permission to see all, we show only affected to me
+if (empty($user->rights->agenda->allactions->read) || $filter == 'mine') {  // If no permission to see all, we show only affected to me
 	$filtert = $user->id;
 }
 
 $action = GETPOST('action', 'aZ09');
+
+$mode = GETPOST('mode', 'aZ09');
+if (empty($mode) && preg_match('/show_/', $action)) {
+	$mode = $action;	// For backward compatibility
+}
 $resourceid = GETPOST("search_resourceid", "int");
 $year = GETPOST("year", "int") ?GETPOST("year", "int") : date("Y");
 $month = GETPOST("month", "int") ?GETPOST("month", "int") : date("m");
 $week = GETPOST("week", "int") ?GETPOST("week", "int") : date("W");
 $day = GETPOST("day", "int") ?GETPOST("day", "int") : date("d");
-$pid = GETPOST("search_projectid", "int", 3) ?GETPOST("search_projectid", "int", 3) : GETPOST("projectid", "int", 3);
-$status = GETPOST("search_status", 'aZ09') ?GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09'); // status may be 0, 50, 100, 'todo'
-$type = GETPOST("search_type", 'aZ09') ?GETPOST("search_type", 'aZ09') : GETPOST("type", 'aZ09');
-$maxprint = (isset($_GET["maxprint"]) ?GETPOST("maxprint") : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
+$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');
+$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')
 
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
@@ -132,20 +139,20 @@ if ($status == '' && !GETPOSTISSET('search_status')) {
 
 $defaultview = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
 $defaultview = (empty($user->conf->AGENDA_DEFAULT_VIEW) ? $defaultview : $user->conf->AGENDA_DEFAULT_VIEW);
-if (empty($action) && !GETPOSTISSET('action')) {
-	$action = $defaultview;
+if (empty($mode) && !GETPOSTISSET('mode')) {
+	$mode = $defaultview;
 }
-if ($action == 'default') {	// When action is default, we want a calendar view and not the list
-	$action = (($defaultview != 'show_list') ? $defaultview : 'show_month');
+if ($mode == 'default') {	// When action is default, we want a calendar view and not the list
+	$mode = (($defaultview != 'show_list') ? $defaultview : 'show_month');
 }
-if (GETPOST('viewcal', 'int') && GETPOST('action', 'alpha') != 'show_day' && GETPOST('action', 'alpha') != 'show_week') {
-	$action = 'show_month'; $day = '';
+if (GETPOST('viewcal', 'int') && GETPOST('mode', 'alpha') != 'show_day' && GETPOST('mode', 'alpha') != 'show_week') {
+	$mode = 'show_month'; $day = '';
 } // View by month
-if (GETPOST('viewweek', 'int') || GETPOST('action', 'alpha') == 'show_week') {
-	$action = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
+if (GETPOST('viewweek', 'int') || GETPOST('mode', 'alpha') == 'show_week') {
+	$mode = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
 } // View by week
-if (GETPOST('viewday', 'int') || GETPOST('action', 'alpha') == 'show_day') {
-	$action = 'show_day'; $day = ($day ? $day : date("d"));
+if (GETPOST('viewday', 'int') || GETPOST('mode', 'alpha') == 'show_day') {
+	$mode = 'show_day'; $day = ($day ? $day : date("d"));
 } // View by day
 
 $object = new ActionComm($db);
@@ -166,7 +173,7 @@ if ($user->socid && $socid) {
  * Actions
  */
 
-if (GETPOST("viewlist", 'alpha') || $action == 'show_list') {
+if (GETPOST("viewlist", 'alpha') || $mode == 'show_list') {
 	$param = '';
 	if (is_array($_POST)) {
 		foreach ($_POST as $key => $val) {
@@ -177,14 +184,14 @@ if (GETPOST("viewlist", 'alpha') || $action == 'show_list') {
 		}
 	}
 	if (!preg_match('/action=/', $param)) {
-		$param .= ($param ? '&' : '').'action=show_list';
+		$param .= ($param ? '&' : '').'mode=show_list';
 	}
 	//print $param;
 	header("Location: ".DOL_URL_ROOT.'/comm/action/list.php?'.$param);
 	exit;
 }
 
-if (GETPOST("viewperuser", 'alpha') || $action == 'show_peruser') {
+if (GETPOST("viewperuser", 'alpha') || $mode == 'show_peruser') {
 	$param = '';
 	if (is_array($_POST)) {
 		foreach ($_POST as $key => $val) {
@@ -200,7 +207,7 @@ if (GETPOST("viewperuser", 'alpha') || $action == 'show_peruser') {
 }
 
 /*
-if ($action == 'delete_action') {
+if ($action == 'delete_action' && $user->rights->agenda->delete) {
 	$event = new ActionComm($db);
 	$event->fetch($actionid);
 	$event->fetch_optionals();
@@ -215,6 +222,7 @@ if ($action == 'delete_action') {
 /*
  * View
  */
+
 $parameters = array(
 	'socid' => $socid,
 	'status' => $status,
@@ -263,6 +271,7 @@ if (empty($conf->global->AGENDA_DISABLE_EXT)) {
 		$name = 'AGENDA_EXT_NAME'.$i;
 		$offsettz = 'AGENDA_EXT_OFFSETTZ'.$i;
 		$color = 'AGENDA_EXT_COLOR'.$i;
+		$default = 'AGENDA_EXT_ACTIVEBYDEFAULT'.$i;
 		$buggedfile = 'AGENDA_EXT_BUGGEDFILE'.$i;
 		if (!empty($conf->global->$source) && !empty($conf->global->$name)) {
 			// Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'
@@ -271,6 +280,7 @@ if (empty($conf->global->AGENDA_DISABLE_EXT)) {
 				'name'=>$conf->global->$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)
 			);
 		}
@@ -286,6 +296,7 @@ if (empty($user->conf->AGENDA_DISABLE_EXT)) {
 		$offsettz = 'AGENDA_EXT_OFFSETTZ_'.$user->id.'_'.$i;
 		$color = 'AGENDA_EXT_COLOR_'.$user->id.'_'.$i;
 		$enabled = 'AGENDA_EXT_ENABLED_'.$user->id.'_'.$i;
+		$default = 'AGENDA_EXT_ACTIVEBYDEFAULT_'.$user->id.'_'.$i;
 		$buggedfile = 'AGENDA_EXT_BUGGEDFILE_'.$user->id.'_'.$i;
 		if (!empty($user->conf->$source) && !empty($user->conf->$name)) {
 			// Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'
@@ -294,13 +305,14 @@ if (empty($user->conf->AGENDA_DISABLE_EXT)) {
 				'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)
 			);
 		}
 	}
 }
 
-if (empty($action) || $action == 'show_month') {
+if (empty($mode) || $mode == 'show_month') {
 	$prev = dol_get_prev_month($month, $year);
 	$prev_year  = $prev['year'];
 	$prev_month = $prev['month'];
@@ -324,7 +336,7 @@ if (empty($action) || $action == 'show_month') {
 	}
 	$lastdaytoshow = dol_mktime(0, 0, 0, $next_month, $next_day, $next_year, 'tzuserrel');
 }
-if ($action == 'show_week') {
+if ($mode == 'show_week') {
 	$prev = dol_get_first_day_week($day, $month, $year);
 	$prev_year  = $prev['prev_year'];
 	$prev_month = $prev['prev_month'];
@@ -349,7 +361,7 @@ if ($action == 'show_week') {
 
 	$tmpday = $first_day;
 }
-if ($action == 'show_day') {
+if ($mode == 'show_day') {
 	$prev = dol_get_prev_day($day, $month, $year);
 	$prev_year  = $prev['year'];
 	$prev_month = $prev['month'];
@@ -408,13 +420,13 @@ if ($pid) {
 if ($type) {
 	$param .= "&search_type=".urlencode($type);
 }
-if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month') {
-	$param .= '&action='.urlencode($action);
-}
 $param .= "&maxprint=".urlencode($maxprint);
+if ($mode == 'show_day' || $mode == 'show_week' || $mode == 'show_month') {
+	$param .= '&mode='.urlencode($mode);
+}
 
 // Show navigation bar
-if (empty($action) || $action == 'show_month') {
+if (empty($mode) || $mode == 'show_month') {
 	$nav = "<a href=\"?year=".$prev_year."&month=".$prev_month.$param."\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";
 	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, 1, $year), "%b %Y");
 	$nav .= " </span>\n";
@@ -424,7 +436,7 @@ if (empty($action) || $action == 'show_month') {
 	}
 	$picto = 'calendar';
 }
-if ($action == 'show_week') {
+if ($mode == 'show_week') {
 	$nav = "<a href=\"?year=".$prev_year."&month=".$prev_month."&day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\" title=\"".dol_escape_htmltag($langs->trans("Previous"))."\"></i></a> &nbsp;\n";
 	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("Week")." ".$week;
 	$nav .= " </span>\n";
@@ -434,8 +446,8 @@ if ($action == 'show_week') {
 	}
 	$picto = 'calendarweek';
 }
-if ($action == 'show_day') {
-	$nav = "<a href=\"?year=".$prev_year."&month=".$prev_month."&day=".$prev_day.$param."aaa\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";
+if ($mode == 'show_day') {
+	$nav = "<a href=\"?year=".$prev_year."&month=".$prev_month."&day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";
 	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "daytextshort");
 	$nav .= " </span>\n";
 	$nav .= " &nbsp; <a href=\"?year=".$next_year."&month=".$next_month."&day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\"></i></a>\n";
@@ -446,8 +458,8 @@ if ($action == 'show_day') {
 }
 
 $nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
-//$nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
-$nav .= '<button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
+//$nav .= ' <input type="submit" class="button button-save" name="submitdateselect" value="'.$langs->trans("Refresh").'">';
+$nav .= '<button type="submit" class="liste_titre button_search valignmiddle" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
 
 // Must be after the nav definition
 $paramnodate = $param;
@@ -458,16 +470,16 @@ $param .= '&year='.$year.'&month='.$month.($day ? '&day='.$day : '');
 
 
 /*$tabactive = '';
- if ($action == 'show_month') $tabactive = 'cardmonth';
- if ($action == 'show_week') $tabactive = 'cardweek';
- if ($action == 'show_day')  $tabactive = 'cardday';
- if ($action == 'show_list') $tabactive = 'cardlist';
- if ($action == 'show_pertuser') $tabactive = 'cardperuser';
- if ($action == 'show_pertype') $tabactive = 'cardpertype';
+ if ($mode == 'show_month') $tabactive = 'cardmonth';
+ if ($mode == 'show_week') $tabactive = 'cardweek';
+ if ($mode == 'show_day')  $tabactive = 'cardday';
+ if ($mode == 'show_list') $tabactive = 'cardlist';
+ if ($mode == 'show_pertuser') $tabactive = 'cardperuser';
+ if ($mode == 'show_pertype') $tabactive = 'cardpertype';
  */
 
-$paramnoaction = preg_replace('/action=[a-z_]+/', '', $param);
-$paramnoactionodate = preg_replace('/action=[a-z_]+/', '', $paramnodate);
+$paramnoaction = preg_replace('/mode=[a-z_]+/', '', preg_replace('/action=[a-z_]+/', '', $param));
+$paramnoactionodate = preg_replace('/mode=[a-z_]+/', '', preg_replace('/action=[a-z_]+/', '', $paramnodate));
 
 $head = calendars_prepare_head($paramnoaction);
 
@@ -476,37 +488,38 @@ if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
 print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 //print dol_get_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
 //print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, $listofextcals, $actioncode, $usergroup, '', $resourceid);
 //print dol_get_fiche_end();
 
 $viewmode = '';
-$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&restore_lastsearch_values=1'.$paramnoactionodate.'">';
+$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 .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
 
-$viewmode .= '<a class="btnTitle'.($action == 'show_month' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.(isset($object->datep) ? dol_print_date($object->datep, '%Y') : $year).'&month='.(isset($object->datep) ? dol_print_date($object->datep, '%m') : $month).'&day='.(isset($object->datep) ? dol_print_date($object->datep, '%d') : $day).$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle'.($mode == 'show_month' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_month&year='.(isset($object->datep) ? dol_print_date($object->datep, '%Y') : $year).'&month='.(isset($object->datep) ? dol_print_date($object->datep, '%m') : $month).'&day='.(isset($object->datep) ? dol_print_date($object->datep, '%d') : $day).$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewCal").'</span></a>';
 
-$viewmode .= '<a class="btnTitle'.($action == 'show_week' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_week&year='.(isset($object->datep) ? dol_print_date($object->datep, '%Y') : $year).'&month='.(isset($object->datep) ? dol_print_date($object->datep, '%m') : $month).'&day='.(isset($object->datep) ? dol_print_date($object->datep, '%d') : $day).$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle'.($mode == 'show_week' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_week&year='.(isset($object->datep) ? dol_print_date($object->datep, '%Y') : $year).'&month='.(isset($object->datep) ? dol_print_date($object->datep, '%m') : $month).'&day='.(isset($object->datep) ? dol_print_date($object->datep, '%d') : $day).$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewWeek").'</span></a>';
 
-$viewmode .= '<a class="btnTitle'.($action == 'show_day' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.(isset($object->datep) ? dol_print_date($object->datep, '%Y') : $year).'&month='.(isset($object->datep) ? dol_print_date($object->datep, '%m') : $month).'&day='.(isset($object->datep) ? dol_print_date($object->datep, '%d') : $day).$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle'.($mode == 'show_day' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.(isset($object->datep) ? dol_print_date($object->datep, '%Y') : $year).'&month='.(isset($object->datep) ? dol_print_date($object->datep, '%m') : $month).'&day='.(isset($object->datep) ? dol_print_date($object->datep, '%d') : $day).$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewDay").'</span></a>';
 
-$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.(isset($object->datep) ? dol_print_date($object->datep, '%Y') : $year).'&month='.(isset($object->datep) ? dol_print_date($object->datep, '%m') : $month).'&day='.(isset($object->datep) ? dol_print_date($object->datep, '%d') : $day).$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?mode=show_peruser&year='.(isset($object->datep) ? dol_print_date($object->datep, '%Y') : $year).'&month='.(isset($object->datep) ? dol_print_date($object->datep, '%m') : $month).'&day='.(isset($object->datep) ? dol_print_date($object->datep, '%d') : $day).$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
@@ -525,10 +538,11 @@ $viewmode .= '<span class="marginrightonly"></span>';	// To add a space before t
 
 
 $newcardbutton = '';
+$newparam = '';
 if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {
 	$tmpforcreatebutton = dol_getdate(dol_now(), true);
 
-	$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
+	$newparam .= '&month='.((int) $month).'&year='.((int) $tmpforcreatebutton['year']).'&mode='.urlencode($mode);
 
 	//$param='month='.$monthshown.'&year='.$year;
 	$hourminsec = '100000';
@@ -546,7 +560,7 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 	$s .= 'jQuery(document).ready(function () {'."\n";
 	$s .= 'jQuery(".check_birthday").click(function() { console.log("Toggle birthdays"); jQuery(".family_birthday").toggle(); });'."\n";
 	$s .= 'jQuery(".check_holiday").click(function() { console.log("Toggle holidays"); jQuery(".family_holiday").toggle(); });'."\n";
-	if ($action == "show_week" || $action == "show_month" || empty($action)) {
+	if ($mode == "show_week" || $mode == "show_month" || empty($mode)) {
 		// Code to enable drag and drop
 		$s .= 'jQuery( "div.sortable" ).sortable({connectWith: ".sortable", placeholder: "ui-state-highlight", items: "div.movable", receive: function( event, ui ) {'."\n";
 		// Code to submit form
@@ -556,7 +570,7 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 		$s .= 'console.log("found parent div.dayevent with id = "+newval);'."\n";
 		$s .= 'var frm=jQuery("#searchFormList");'."\n";
 		$s .= 'var newurl = ui.item.find("a.cal_event").attr("href");'."\n";
-		$s .= 'console.log(newurl);'."\n";
+		$s .= 'console.log("Found url on href of a.cal_event"+newurl+", we submit form with actionmove=mupdate");'."\n";
 		$s .= 'frm.attr("action", newurl).children("#newdate").val(newval);frm.submit();}'."\n";
 		$s .= '});'."\n";
 	}
@@ -567,12 +581,21 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 	$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; </div>';
 
 	// Holiday calendar
-	$s .= '<div class="nowrap inline-block"><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" class="check_holiday"><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) {
 		$s .= '<script type="text/javascript">'."\n";
 		$s .= 'jQuery(document).ready(function () {
+				jQuery("div input[name^=\"check_ext\"]").each(function(index, elem) {
+					var name = jQuery(elem).attr("name");
+					if (jQuery(elem).is(":checked")) {
+					    jQuery(".family_ext" + name.replace("check_ext", "")).show();
+					} else {
+					    jQuery(".family_ext" + name.replace("check_ext", "")).hide();
+					}
+				});
+
 				jQuery("div input[name^=\"check_ext\"]").click(function() {
 					var name = $(this).attr("name");
 					jQuery(".family_ext" + name.replace("check_ext", "")).toggle();
@@ -582,12 +605,19 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 
 		foreach ($showextcals as $val) {
 			$htmlname = md5($val['name']);
-			$s .= '<div class="nowrap inline-block"><input type="checkbox" id="check_ext'.$htmlname.'" name="check_ext'.$htmlname.'" checked> <label for="check_ext'.$htmlname.'">'.$val['name'].'</label> &nbsp; </div>';
+
+			if (!empty($val['default'])) {
+				$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>';
 		}
 	}
 
 	// Birthdays
-	$s .= '<div class="nowrap inline-block"><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>';
+	$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;
@@ -599,8 +629,7 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 	}
 
 	$s .= "\n".'<!-- End div to calendars selectors -->'."\n";
-} else // If javascript off
-{
+} else { // If javascript off
 	$newparam = $param; // newparam is for birthday links
 	$newparam = preg_replace('/showbirthday=[0-1]/i', 'showbirthday='.(empty($showbirthday) ? 1 : 0), $newparam);
 	if (!preg_match('/showbirthday=/i', $newparam)) {
@@ -637,7 +666,7 @@ $sql .= ' a.fk_soc, a.fk_contact, a.fk_project,';
 $sql .= ' a.fk_element, a.elementtype,';
 $sql .= ' ca.code as type_code, ca.libelle as type_label, ca.color as type_color, ca.type as type_type, ca.picto as type_picto';
 $sql .= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
 }
 // We must filter on resource table
@@ -688,18 +717,18 @@ if ($resourceid > 0) {
 if ($pid) {
 	$sql .= " AND a.fk_project=".((int) $pid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".((int) $user->id).")";
 }
 if ($socid > 0) {
-	$sql .= ' AND a.fk_soc = '.$socid;
+	$sql .= " AND a.fk_soc = ".((int) $socid);
 }
 // We must filter on assignement table
 if ($filtert > 0 || $usergroup > 0) {
 	$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 }
 //var_dump($day.' '.$month.' '.$year);
-if ($action == 'show_day') {
+if ($mode == 'show_day') {
 	$sql .= " AND (";
 	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year, 'tzuserrel'))."'";
 	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year, 'tzuserrel'))."')";
@@ -808,7 +837,7 @@ if ($resql) {
 
 		$event->fk_project = $obj->fk_project;
 
-		$event->thirdparty_id = $obj->fk_soc;
+		$event->socid = $obj->fk_soc;
 		$event->contact_id = $obj->fk_contact;
 
 		// Defined date_start_in_calendar and date_end_in_calendar property
@@ -819,10 +848,6 @@ if ($resql) {
 		} else {
 			$event->date_end_in_calendar = $event->datep;
 		}
-		// Define ponctual property
-		if ($event->date_start_in_calendar == $event->date_end_in_calendar) {
-			$event->ponctuel = 1;
-		}
 
 		// Check values
 		if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar >= $lastdaytoshow)	{
@@ -875,9 +900,9 @@ if ($showbirthday) {
 	// Add events in array
 	$sql = 'SELECT sp.rowid, sp.lastname, sp.firstname, sp.birthday';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'socpeople as sp';
-	$sql .= ' WHERE (priv=0 OR (priv=1 AND fk_user_creat='.$user->id.'))';
+	$sql .= ' WHERE (priv=0 OR (priv=1 AND fk_user_creat='.((int) $user->id).'))';
 	$sql .= " AND sp.entity IN (".getEntity('socpeople').")";
-	if ($action == 'show_day') {
+	if ($mode == 'show_day') {
 		$sql .= ' AND MONTH(birthday) = '.((int) $month);
 		$sql .= ' AND DAY(birthday) = '.((int) $day);
 	} else {
@@ -916,7 +941,6 @@ if ($showbirthday) {
 
 			$event->date_start_in_calendar = $db->jdate($event->datep);
 			$event->date_end_in_calendar = $db->jdate($event->datef);
-			$event->ponctuel = 0;
 
 			// Add an entry in eventarray for each day
 			$daycursor = $event->datep;
@@ -950,12 +974,12 @@ $sql .= " WHERE u.rowid = x.fk_user";
 $sql .= " AND u.statut = '1'"; // Show only active users  (0 = inactive user, 1 = active user)
 $sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
 
-if ($action == 'show_day') {
+if ($mode == 'show_day') {
 	// Request only leaves for the current selected day
 	$sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin";	// date_debut and date_fin are date without time
-} elseif ($action == 'show_week') {
+} elseif ($mode == 'show_week') {
 	// TODO: Add filter to reduce database request
-} elseif ($action == 'show_month') {
+} elseif ($mode == 'show_month') {
 	// TODO: Add filter to reduce database request
 }
 
@@ -1259,12 +1283,6 @@ if (count($listofextcals)) {
 						$event->date_end_in_calendar = $event->datep;
 					}
 
-					// Define ponctual property
-					if ($event->date_start_in_calendar == $event->date_end_in_calendar) {
-						$event->ponctuel = 1;
-						//print 'x'.$datestart.'-'.$dateend;exit;
-					}
-
 					// Add event into $eventarray if date range are ok.
 					if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar >= $lastdaytoshow) {
 						//print 'x'.$datestart.'-'.$dateend;exit;
@@ -1347,11 +1365,11 @@ print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param,
 print $s;
 
 
-if (empty($action) || $action == 'show_month') {      // View by month
+if (empty($mode) || $mode == 'show_month') {      // View by month
 	$newparam = $param; // newparam is for birthday links
 	$newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done
-	$newparam = preg_replace('/action=show_month&?/i', '', $newparam);
-	$newparam = preg_replace('/action=show_week&?/i', '', $newparam);
+	$newparam = preg_replace('/mode=show_month&?/i', '', $newparam);
+	$newparam = preg_replace('/mode=show_week&?/i', '', $newparam);
 	$newparam = preg_replace('/day=[0-9]+&?/i', '', $newparam);
 	$newparam = preg_replace('/month=[0-9]+&?/i', '', $newparam);
 	$newparam = preg_replace('/year=[0-9]+&?/i', '', $newparam);
@@ -1364,7 +1382,7 @@ if (empty($action) || $action == 'show_month') {      // View by month
 	print '</div>';
 
 	print '<div class="div-table-responsive-no-min sectioncalendarbymonth maxscreenheightless300">';
-	print '<table width="100%" class="noborder nocellnopadd cal_pannel cal_month">';
+	print '<table class="centpercent noborder nocellnopadd cal_pannel cal_month">';
 	print ' <tr class="liste_titre">';
 	// Column title of weeks numbers
 	echo '  <td class="center">#</td>';
@@ -1453,14 +1471,14 @@ if (empty($action) || $action == 'show_month') {      // View by month
 	print '</div>';
 
 	print '<input type="hidden" name="actionmove" value="mupdate">';
-	print '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
+	print '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?mode=show_month&'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
 	print '<input type="hidden" name="newdate" id="newdate">';
-} elseif ($action == 'show_week') {
+} elseif ($mode == 'show_week') {
 	// View by week
 	$newparam = $param; // newparam is for birthday links
 	$newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done
-	$newparam = preg_replace('/action=show_month&?/i', '', $newparam);
-	$newparam = preg_replace('/action=show_week&?/i', '', $newparam);
+	$newparam = preg_replace('/mode=show_month&?/i', '', $newparam);
+	$newparam = preg_replace('/mode=show_week&?/i', '', $newparam);
 	$newparam = preg_replace('/day=[0-9]+&?/i', '', $newparam);
 	$newparam = preg_replace('/month=[0-9]+&?/i', '', $newparam);
 	$newparam = preg_replace('/year=[0-9]+&?/i', '', $newparam);
@@ -1473,7 +1491,7 @@ if (empty($action) || $action == 'show_month') {      // View by month
 	print '</div></div>';
 
 	print '<div class="div-table-responsive-no-min sectioncalendarbyweek maxscreenheightless300">';
-	print '<table width="100%" class="noborder nocellnopadd cal_pannel cal_month">';
+	print '<table class="centpercent noborder nocellnopadd cal_pannel cal_month">';
 	print ' <tr class="liste_titre">';
 	$i = 0;
 	while ($i < 7) {
@@ -1515,13 +1533,12 @@ if (empty($action) || $action == 'show_month') {      // View by month
 	print '</div>';
 
 	echo '<input type="hidden" name="actionmove" value="mupdate">';
-	echo '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
+	echo '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?mode=show_week&'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
 	echo '<input type="hidden" name="newdate" id="newdate">';
-} else // View by day
-{
+} else { // View by day
 	$newparam = $param; // newparam is for birthday links
-	$newparam = preg_replace('/action=show_month&?/i', '', $newparam);
-	$newparam = preg_replace('/action=show_week&?/i', '', $newparam);
+	$newparam = preg_replace('/mode=show_month&?/i', '', $newparam);
+	$newparam = preg_replace('/mode=show_week&?/i', '', $newparam);
 	$newparam = preg_replace('/viewday=[0-9]+&?/i', '', $newparam);
 	$newparam .= '&viewday=1';
 	// Code to show just one day
@@ -1637,7 +1654,7 @@ $db->close();
 function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint = 0, $maxnbofchar = 16, $newparam = '', $showinfo = 0, $minheight = 60, $nonew = 0)
 {
 	global $user, $conf, $langs;
-	global $action, $filter, $filtert, $status, $actioncode, $usergroup; // Filters used into search form
+	global $action, $mode, $filter, $filtert, $status, $actioncode, $usergroup; // Filters used into search form
 	global $theme_datacolor;
 	global $cachethirdparties, $cachecontacts, $cacheusers, $colorindexused;
 
@@ -1652,7 +1669,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 	print "\n";
 
 	$curtime = dol_mktime(0, 0, 0, $month, $day, $year);
-	$urltoshow = DOL_URL_ROOT.'/comm/action/index.php?action=show_day&day='.str_pad($day, 2, "0", STR_PAD_LEFT).'&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year.$newparam;
+	$urltoshow = DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&day='.str_pad($day, 2, "0", STR_PAD_LEFT).'&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year.$newparam;
 	$urltocreate = '';
 	if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {
 		$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
@@ -1805,10 +1822,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 					}
 
 					$h = ''; $nowrapontd = 1;
-					if ($action == 'show_day') {
+					if ($mode == 'show_day') {
 						$h = 'height: 100%; '; $nowrapontd = 0;
 					}
-					if ($action == 'show_week') {
+					if ($mode == 'show_week') {
 						$h = 'height: 100%; '; $nowrapontd = 0;
 					}
 
@@ -1936,7 +1953,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 						if ($event->type_code != 'ICALEVENT') {
 							$savlabel = $event->label ? $event->label : $event->libelle;
 							$event->label = $titletoshow;
-							$event->libelle = $titletoshow;
+							$event->libelle = $titletoshow;		// deprecatd
 							// Note: List of users are inside $event->userassigned. Link may be clickable depending on permissions of user.
 							$titletoshow = (($event->type_picto || $event->type_code) ? $event->getTypePicto() : '');
 							$titletoshow .= $event->getNomUrl(0, $maxnbofchar, 'cal_event cal_event_title', '', 0, 0);
@@ -1968,7 +1985,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 							print '<br>('.dol_trunc($event->icalname, $maxnbofchar).')';
 						}
 
-						$thirdparty_id = ($event->thirdparty_id > 0 ? $event->thirdparty_id : ((is_object($event->societe) && $event->societe->id > 0) ? $event->societe->id : 0));
+						$thirdparty_id = ($event->socid > 0 ? $event->socid : ((is_object($event->societe) && $event->societe->id > 0) ? $event->societe->id : 0));
 						$contact_id = ($event->contact_id > 0 ? $event->contact_id : ((is_object($event->contact) && $event->contact->id > 0) ? $event->contact->id : 0));
 
 						// If action related to company / contact
@@ -2040,11 +2057,11 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 
 					$i++;
 				} else {
-					print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action='.$action.'&maxprint=0&month='.$monthshown.'&year='.$year;
-					print ($status ? '&status='.$status : '').($filter ? '&filter='.$filter : '');
-					print ($filtert ? '&search_filtert='.$filtert : '');
-					print ($usergroup ? '&search_usergroup='.$usergroup : '');
-					print ($actioncode != '' ? '&search_actioncode='.$actioncode : '');
+					print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode='.$mode.'&maxprint=0&month='.((int) $monthshown).'&year='.((int) $year);
+					print ($status ? '&status='.$status : '').($filter ? '&filter='.urlencode($filter) : '');
+					print ($filtert ? '&search_filtert='.urlencode($filtert) : '');
+					print ($usergroup ? '&search_usergroup='.urlencode($usergroup) : '');
+					print ($actioncode != '' ? '&search_actioncode='.urlencode($actioncode) : '');
 					print '">'.img_picto("all", "1downarrow_selected.png").' ...';
 					print ' +'.(count($eventarray[$daykey]) - $maxprint);
 					print '</a>';
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index 071d6409176..225bc8b29fc 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -72,13 +72,13 @@ $linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php">'.$langs->trans("
 // Link to other agenda views
 $out = '';
 $out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="hideonsmartphone pictoactionview"');
-$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewPerUser").'</a>';
+$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?mode=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewPerUser").'</a>';
 $out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="hideonsmartphone pictoactionview"');
-$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewCal").'</a>';
+$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewCal").'</a>';
 $out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="hideonsmartphone pictoactionview"');
-$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewWeek").'</a>';
+$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewWeek").'</a>';
 $out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="hideonsmartphone pictoactionview"');
-$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewDay").'</a>';
+$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewDay").'</a>';
 
 $linkback .= $out;
 
@@ -93,9 +93,7 @@ if (!empty($conf->projet->enabled)) {
 	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>';
+		$morehtmlref .= ' : '.$proj->getNomUrl(1);
 		if ($proj->title) {
 			$morehtmlref .= ' - '.$proj->title;
 		}
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 532b981ffa1..de961b5517e 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2017      Open-DSI             <support@open-dsi.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -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
+
+$mode = GETPOST('mode', 'aZ09');
+if (empty($mode) && preg_match('/show_/', $action)) {
+	$mode = $action;	// For backward compatibility
+}
 $resourceid = GETPOST("search_resourceid", "int") ?GETPOST("search_resourceid", "int") : GETPOST("resourceid", "int");
 $pid = GETPOST("search_projectid", 'int', 3) ?GETPOST("search_projectid", 'int', 3) : GETPOST("projectid", 'int', 3);
 $search_status = (GETPOST("search_status", 'aZ09') != '') ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09');
@@ -73,13 +78,15 @@ $search_title = GETPOST('search_title', 'alpha');
 $search_note = GETPOST('search_note', 'alpha');
 
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'), 'tzuserrel');
-$datestart = dol_mktime(0, 0, 0, GETPOST('datestartmonth', 'int'), GETPOST('datestartday', 'int'), GETPOST('datestartyear', 'int'), 'tzuserrel');
-$dateend = dol_mktime(0, 0, 0, GETPOST('dateendmonth', 'int'), GETPOST('dateendday', 'int'), GETPOST('dateendyear', 'int'), 'tzuserrel');
+$datestart_dtstart = dol_mktime(0, 0, 0, GETPOST('datestart_dtstartmonth', 'int'), GETPOST('datestart_dtstartday', 'int'), GETPOST('datestart_dtstartyear', 'int'), 'tzuserrel');
+$datestart_dtend = dol_mktime(23, 59, 59, GETPOST('datestart_dtendmonth', 'int'), GETPOST('datestart_dtendday', 'int'), GETPOST('datestart_dtendyear', 'int'), 'tzuserrel');
+$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);
 }
-if (empty($action) && !GETPOSTISSET('action')) {
-	$action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+if (empty($mode) && !GETPOSTISSET('mode')) {
+	$mode = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
 }
 
 $filter = GETPOST("search_filter", 'alpha', 3) ?GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
@@ -103,8 +110,8 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
 }
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	// If $page is not defined, or '' or -1 or if we click on clear filters
@@ -134,13 +141,13 @@ if ($socid < 0) {
 }
 
 $canedit = 1;
-if (!$user->rights->agenda->myactions->read) {
+if (empty($user->rights->agenda->myactions->read)) {
 	accessforbidden();
 }
-if (!$user->rights->agenda->allactions->read) {
+if (empty($user->rights->agenda->allactions->read)) {
 	$canedit = 0;
 }
-if (!$user->rights->agenda->allactions->read || $filter == 'mine') {	// If no permission to see all, we show only affected to me
+if (empty($user->rights->agenda->allactions->read) || $filter == 'mine') {	// If no permission to see all, we show only affected to me
 	$filtert = $user->id;
 }
 
@@ -176,7 +183,7 @@ if ($user->socid && $socid) {
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$mode = 'list'; $massaction = '';
 }
 
 if (GETPOST("viewcal") || GETPOST("viewweek") || GETPOST("viewday")) {
@@ -205,8 +212,10 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_id = '';
 	$search_title = '';
 	$search_note = '';
-	$datestart = '';
-	$dateend = '';
+	$datestart_dtstart = '';
+	$datestart_dtend = '';
+	$dateend_dtstart = '';
+	$dateend_dtend = '';
 	$search_status = '';
 	$toselect = '';
 	$search_array_options = array();
@@ -323,23 +332,41 @@ if ($search_title != '') {
 if ($search_note != '') {
 	$param .= '&search_note='.urlencode($search_note);
 }
-if (GETPOST('datestartday', 'int')) {
-	$param .= '&datestartday='.GETPOST('datestartday', 'int');
+if (GETPOST('datestartday_dtstart', 'int')) {
+	$param .= '&datestartday_dtstart='.GETPOST('datestartday_dtstart', 'int');
 }
-if (GETPOST('datestartmonth', 'int')) {
-	$param .= '&datestartmonth='.GETPOST('datestartmonth', 'int');
+if (GETPOST('datestartmonth_dtstart', 'int')) {
+	$param .= '&datestartmonth_dtstart='.GETPOST('datestartmonth_dtstart', 'int');
 }
-if (GETPOST('datestartyear', 'int')) {
-	$param .= '&datestartyear='.GETPOST('datestartyear', 'int');
+if (GETPOST('datestartyear_dtstart', 'int')) {
+	$param .= '&datestartyear_dtstart='.GETPOST('datestartyear_dtstart', 'int');
 }
-if (GETPOST('dateendday', 'int')) {
-	$param .= '&dateendday='.GETPOST('dateendday', 'int');
+if (GETPOST('datestartday_dtend', 'int')) {
+	$param .= '&datestartday_dtend='.GETPOST('datestartday_dtend', 'int');
 }
-if (GETPOST('dateendmonth', 'int')) {
-	$param .= '&dateendmonth='.GETPOST('dateendmonth', 'int');
+if (GETPOST('datestartmonth_dtend', 'int')) {
+	$param .= '&datestartmonth_dtend='.GETPOST('datestartmonth_dtend', 'int');
 }
-if (GETPOST('dateendyear', 'int')) {
-	$param .= '&dateendyear='.GETPOST('dateendyear', 'int');
+if (GETPOST('datestartyear_dtend', 'int')) {
+	$param .= '&datestartyear_dtend='.GETPOST('datestartyear_dtend', 'int');
+}
+if (GETPOST('dateendday_dtstart', 'int')) {
+	$param .= '&dateendday_dtstart='.GETPOST('dateendday_dtstart', 'int');
+}
+if (GETPOST('dateendmonth_dtstart', 'int')) {
+	$param .= '&dateendmonth_dtstart='.GETPOST('dateendmonth_dtstart', 'int');
+}
+if (GETPOST('dateendyear_dtstart', 'int')) {
+	$param .= '&dateendyear_dtstart='.GETPOST('dateendyear_dtstart', 'int');
+}
+if (GETPOST('dateendday_dtend', 'int')) {
+	$param .= '&dateendday_dtend='.GETPOST('dateendday_dtend', 'int');
+}
+if (GETPOST('dateendmonth_dtend', 'int')) {
+	$param .= '&dateendmonth_dtend='.GETPOST('dateendmonth_dtend', 'int');
+}
+if (GETPOST('dateendyear_dtend', 'int')) {
+	$param .= '&dateendyear_dtend='.GETPOST('dateendyear_dtend', 'int');
 }
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
@@ -381,18 +408,18 @@ $sql .= " sp.lastname, sp.firstname, sp.email, sp.phone, sp.address, sp.phone as
 // 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, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
 $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."actioncomm_extrafields as ef ON (a.id = ef.fk_object)";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
@@ -446,7 +473,7 @@ if ($resourceid > 0) {
 if ($pid) {
 	$sql .= " AND a.fk_project=".((int) $pid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".((int) $user->id).")";
 }
 if ($socid > 0) {
@@ -502,11 +529,17 @@ if ($filtert > 0 || $usergroup > 0) {
 if ($dateselect > 0) {
 	$sql .= " AND ((a.datep2 >= '".$db->idate($dateselect)."' AND a.datep <= '".$db->idate($dateselect + 3600 * 24 - 1)."') OR (a.datep2 IS NULL AND a.datep > '".$db->idate($dateselect - 3600)."' AND a.datep <= '".$db->idate($dateselect + 3600 * 24 - 1)."'))";
 }
-if ($datestart > 0) {
-	$sql .= " AND a.datep BETWEEN '".$db->idate($datestart)."' AND '".$db->idate($datestart + 3600 * 24 - 1)."'";
+if ($datestart_dtstart > 0) {
+	$sql .= " AND a.datep >= '".$db->idate($datestart_dtstart)."'";
 }
-if ($dateend > 0) {
-	$sql .= " AND a.datep2 BETWEEN '".$db->idate($dateend)."' AND '".$db->idate($dateend + 3600 * 24 - 1)."'";
+if ($datestart_dtend > 0) {
+	$sql .= " AND a.datep <= '".$db->idate($datestart_dtend)."'";
+}
+if ($dateend_dtstart > 0) {
+	$sql .= " AND a.datep2 >= '".$db->idate($dateend_dtstart)."'";
+}
+if ($dateend_dtend > 0) {
+	$sql .= " AND a.datep2 <= '".$db->idate($dateend_dtend)."'";
 }
 
 // Add where from extra fields
@@ -514,522 +547,537 @@ 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 .= $db->order($sortfield, $sortorder);
-
+// Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	// TODO Set and use an optimized request in $sqlforcount with no fields and no useless join to caluclate nb of records
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
+	/* 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 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);
-//print $sql;
+// Complete request and execute it with limit
+$sql .= $db->order($sortfield, $sortorder);
+if ($limit) {
+	$sql .= $db->plimit($limit + 1, $offset);
+}
 
-dol_syslog("comm/action/list.php", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql) {
-	$actionstatic = new ActionComm($db);
-	$societestatic = new Societe($db);
+if (!$resql) {
+	dol_print_error($db);
+	exit;
+}
 
-	$num = $db->num_rows($resql);
+$num = $db->num_rows($resql);
 
-	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	// Local calendar
-	$newtitle = '<div class="nowrap clear inline-block minheight30 margintoponly">';
-	$newtitle .= '<input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; ';
-	$newtitle .= '</div>';
-	//$newtitle=$langs->trans($title);
+$actionstatic = new ActionComm($db);
+$societestatic = new Societe($db);
 
-	$tabactive = 'cardlist';
+$num = $db->num_rows($resql);
 
-	$head = calendars_prepare_head($param);
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	print '<form method="POST" id="searchFormList" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+// Local calendar
+$newtitle = '<div class="nowrap clear inline-block minheight30 margintoponly">';
+$newtitle .= '<input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; ';
+$newtitle .= '</div>';
+//$newtitle=$langs->trans($title);
 
-	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="type" value="'.$type.'">';
-	$nav = '';
+$tabactive = 'cardlist';
 
-	if ($filter) {
-		$nav .= '<input type="hidden" name="search_filter" value="'.$filter.'">';
-	}
-	if ($showbirthday) {
-		$nav .= '<input type="hidden" name="search_showbirthday" value="1">';
-	}
-	print $nav;
+$head = calendars_prepare_head($param);
 
-	//print dol_get_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
-	//print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid);
-	//print dol_get_fiche_end();
+print '<form method="POST" id="searchFormList" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 
-	// Add link to show birthdays
-	/*
-	$link = '';
-	if (empty($conf->use_javascript_ajax))
-	{
-		$newparam=$param;   // newparam is for birthday links
-		$newparam=preg_replace('/showbirthday=[0-1]/i','showbirthday='.(empty($showbirthday)?1:0),$newparam);
-		if (! preg_match('/showbirthday=/i',$newparam)) $newparam.='&showbirthday=1';
-		$link='<a href="'.$_SERVER['PHP_SELF'];
-		$link.='?'.$newparam;
-		$link.='">';
-		if (empty($showbirthday)) $link.=$langs->trans("AgendaShowBirthdayEvents");
-		else $link.=$langs->trans("AgendaHideBirthdayEvents");
-		$link.='</a>';
-	}
-	*/
+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="type" value="'.$type.'">';
+$nav = '';
 
-	$s = $newtitle;
+if ($filter) {
+	$nav .= '<input type="hidden" name="search_filter" value="'.$filter.'">';
+}
+if ($showbirthday) {
+	$nav .= '<input type="hidden" name="search_showbirthday" value="1">';
+}
+print $nav;
 
-	// Calendars from hooks
-	$parameters = array(); $object = null;
-	$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
-	if (empty($reshook)) {
-		$s .= $hookmanager->resPrint;
-	} elseif ($reshook > 1) {
-		$s = $hookmanager->resPrint;
-	}
+//print dol_get_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
+//print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid);
+//print dol_get_fiche_end();
 
-	$viewmode = '';
-	$viewmode .= '<a class="btnTitle btnTitleSelected reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=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 .= '</span>';
-	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
 
-	$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
-	//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-	$viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="pictoactionview block"');
-	//$viewmode .= '</span>';
-	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewCal").'</span></a>';
+$s = $newtitle;
 
-	$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_week&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
-	//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-	$viewmode .= img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="pictoactionview block"');
-	//$viewmode .= '</span>';
-	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewWeek").'</span></a>';
+// Calendars from hooks
+$parameters = array();
+$object = null;
+$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
+if (empty($reshook)) {
+	$s .= $hookmanager->resPrint;
+} elseif ($reshook > 1) {
+	$s = $hookmanager->resPrint;
+}
+$viewyear = is_object($object) ? dol_print_date($object->datep, '%Y') : '';
+$viewmonth = is_object($object) ? dol_print_date($object->datep, '%m') : '';
+$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 .= '</span>';
+$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
 
-	$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
-	//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-	$viewmode .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="pictoactionview block"');
-	//$viewmode .= '</span>';
-	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewDay").'</span></a>';
+$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_month&year='.$viewyear.'&month='.$viewmonth.'&day='.$viewday.$paramnoactionodate.'">';
+//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
+$viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="pictoactionview block"');
+//$viewmode .= '</span>';
+$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewCal").'</span></a>';
 
-	$viewmode .= '<a class="btnTitle reposition marginrightonly" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
-	//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-	$viewmode .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview block"');
-	//$viewmode .= '</span>';
-	$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewPerUser").'</span></a>';
+$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_week&year='.$viewyear.'&month='.$viewmonth.'&day='.$viewday.$paramnoactionodate.'">';
+//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
+$viewmode .= img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="pictoactionview block"');
+//$viewmode .= '</span>';
+$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewWeek").'</span></a>';
 
-	$viewmode .= '<span class="marginrightonly"></span>';
+$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.$viewyear.'&month='.$viewmonth.'&day='.$viewday.$paramnoactionodate.'">';
+//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
+$viewmode .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="pictoactionview block"');
+//$viewmode .= '</span>';
+$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewDay").'</span></a>';
 
-	// Add more views from hooks
-	$parameters = array(); $object = null;
-	$reshook = $hookmanager->executeHooks('addCalendarView', $parameters, $object, $action);
-	if (empty($reshook)) {
-		$viewmode .= $hookmanager->resPrint;
-	} elseif ($reshook > 1) {
-		$viewmode = $hookmanager->resPrint;
-	}
+$viewmode .= '<a class="btnTitle reposition marginrightonly" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?mode=show_peruser&year='.$viewyear.'&month='.$viewmonth.'&day='.$viewday.$paramnoactionodate.'">';
+//$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
+$viewmode .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview block"');
+//$viewmode .= '</span>';
+$viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewPerUser").'</span></a>';
 
-	$tmpforcreatebutton = dol_getdate(dol_now(), true);
+$viewmode .= '<span class="marginrightonly"></span>';
 
-	$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
+// Add more views from hooks
+$parameters = array();
+$object = null;
+$reshook = $hookmanager->executeHooks('addCalendarView', $parameters, $object, $action);
+if (empty($reshook)) {
+	$viewmode .= $hookmanager->resPrint;
+} elseif ($reshook > 1) {
+	$viewmode = $hookmanager->resPrint;
+}
 
-	//$param='month='.$monthshown.'&year='.$year;
-	$hourminsec = '100000';
+$tmpforcreatebutton = dol_getdate(dol_now(), true);
 
-	$url = DOL_URL_ROOT.'/comm/action/card.php?action=create';
-	$url .= '&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec;
-	$url .= '&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : ''));
+$newparam = '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
 
-	$newcardbutton = dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', $url, '', $user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create);
+//$param='month='.$monthshown.'&year='.$year;
+$hourminsec = '100000';
 
-	$param .= '&action='.$action;
+$url = DOL_URL_ROOT.'/comm/action/card.php?action=create';
+$url .= '&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec;
+$url .= '&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : ''));
 
-	print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, -1 * $nbtotalofrecords, 'object_action', 0, $nav.$newcardbutton, '', $limit, 0, 0, 1, $viewmode);
+$newcardbutton = dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', $url, '', $user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create);
 
-	print $s;
+$param .= '&mode='.$mode;
 
-	$objecttmp = new ActionComm($db);
-	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, -1 * $nbtotalofrecords, 'object_action', 0, $nav.$newcardbutton, '', $limit, 0, 0, 1, $viewmode);
 
-	$moreforfilter = '';
+print $s;
 
-	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-	if ($massactionbutton) {
-		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
-	}
-	$i = 0;
+$objecttmp = new ActionComm($db);
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-	print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid);
+$moreforfilter = '';
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) {
+	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+}
+$i = 0;
+
+print '<div class="liste_titre liste_titre_bydiv centpercent">';
+print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid);
+print '</div>';
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+print '<tr class="liste_titre_filter">';
+if (!empty($arrayfields['a.id']['checked'])) {
+	print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
+}
+if (!empty($arrayfields['owner']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+if (!empty($arrayfields['c.libelle']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+if (!empty($arrayfields['a.label']['checked'])) {
+	print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_title" value="'.$search_title.'"></td>';
+}
+if (!empty($arrayfields['a.note']['checked'])) {
+	print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_note" value="'.$search_note.'"></td>';
+}
+if (!empty($arrayfields['a.datep']['checked'])) {
+	print '<td class="liste_titre nowraponall" align="center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($datestart_dtstart, 'datestart_dtstart', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'), 'tzuserrel');
 	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($datestart_dtend, 'datestart_dtend', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('To'), 'tzuserrel');
+	print '</div>';
+	print '</td>';
+}
+if (!empty($arrayfields['a.datep2']['checked'])) {
+	print '<td class="liste_titre nowraponall" align="center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($dateend_dtstart, 'dateend_dtstart', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'), 'tzuserrel');
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($dateend_dtend, 'dateend_dtend', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('To'), 'tzuserrel');
+	print '</div>';
+	print '</td>';
+}
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+if (!empty($arrayfields['a.fk_contact']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+if (!empty($arrayfields['a.fk_element']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
 
-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
-	print '<tr class="liste_titre_filter">';
-	if (!empty($arrayfields['a.id']['checked'])) {
-		print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
-	}
-	if (!empty($arrayfields['owner']['checked'])) {
-		print '<td class="liste_titre"></td>';
-	}
-	if (!empty($arrayfields['c.libelle']['checked'])) {
-		print '<td class="liste_titre"></td>';
-	}
-	if (!empty($arrayfields['a.label']['checked'])) {
-		print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_title" value="'.$search_title.'"></td>';
-	}
-	if (!empty($arrayfields['a.note']['checked'])) {
-		print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_note" value="'.$search_note.'"></td>';
-	}
-	if (!empty($arrayfields['a.datep']['checked'])) {
-		print '<td class="liste_titre nowraponall" align="center">';
-		print $form->selectDate($datestart, 'datestart', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzuserrel');
-		print '</td>';
-	}
-	if (!empty($arrayfields['a.datep2']['checked'])) {
-		print '<td class="liste_titre nowraponall" align="center">';
-		print $form->selectDate($dateend, 'dateend', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzuserrel');
-		print '</td>';
-	}
-	if (!empty($arrayfields['s.nom']['checked'])) {
-		print '<td class="liste_titre"></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;
+
+if (!empty($arrayfields['a.datec']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+if (!empty($arrayfields['a.tms']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+if (!empty($arrayfields['a.percent']['checked'])) {
+	print '<td class="liste_titre center">';
+	$formactions->form_select_status_action('formaction', $search_status, 1, 'search_status', 1, 2, 'minwidth100imp maxwidth125');
+	print ajax_combobox('selectsearch_status');
+	print '</td>';
+}
+// 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['a.id']['checked'])) {
+	print_liste_field_titre($arrayfields['a.id']['label'], $_SERVER["PHP_SELF"], "a.id", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['owner']['checked'])) {
+	print_liste_field_titre($arrayfields['owner']['label'], $_SERVER["PHP_SELF"], "", $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['a.label']['checked'])) {
+	print_liste_field_titre($arrayfields['a.label']['label'], $_SERVER["PHP_SELF"], "a.label", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['a.note']['checked'])) {
+	print_liste_field_titre($arrayfields['a.note']['label'], $_SERVER["PHP_SELF"], "a.note", $param, "", "", $sortfield, $sortorder);
+}
+//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);
+}
+if (!empty($arrayfields['a.datep2']['checked'])) {
+	print_liste_field_titre($arrayfields['a.datep2']['label'], $_SERVER["PHP_SELF"], "a.datep2", $param, '', 'align="center"', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['a.fk_contact']['checked'])) {
+	print_liste_field_titre($arrayfields['a.fk_contact']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['a.fk_element']['checked'])) {
+	print_liste_field_titre($arrayfields['a.fk_element']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+}
+
+// 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['a.datec']['checked'])) {
+	print_liste_field_titre($arrayfields['a.datec']['label'], $_SERVER["PHP_SELF"], "a.datec,a.id", $param, "", 'align="center"', $sortfield, $sortorder);
+}
+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);
+}
+
+if (!empty($arrayfields['a.percent']['checked'])) {
+	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "a.percent", $param, "", 'align="center"', $sortfield, $sortorder);
+}
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+print "</tr>\n";
+
+$contactstatic = new Contact($db);
+$now = dol_now();
+$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
+
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
+$caction = new CActionComm($db);
+$arraylist = $caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), '', 1);
+$contactListCache = array();
+
+while ($i < min($num, $limit)) {
+	$obj = $db->fetch_object($resql);
+
+	// Discard auto action if option is on
+	if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO') {
+		$i++;
+		continue;
 	}
+
+	$actionstatic->id = $obj->id;
+	$actionstatic->ref = $obj->id;
+	$actionstatic->code = $obj->code;
+	$actionstatic->type_code = $obj->type_code;
+	$actionstatic->type_label = $obj->type_label;
+	$actionstatic->type_picto = $obj->type_picto;
+	$actionstatic->type_color = $obj->type_color;
+	$actionstatic->label = $obj->label;
+	$actionstatic->location = $obj->location;
+	$actionstatic->note_private = dol_htmlentitiesbr($obj->note);
+	$actionstatic->datep = $db->jdate($obj->dp);
+	$actionstatic->percentage = $obj->percent;
+
+	// Initialize $this->userassigned && this->socpeopleassigned array && this->userownerid
+	// but only if we need it
 	if (!empty($arrayfields['a.fk_contact']['checked'])) {
-		print '<td class="liste_titre"></td>';
+		$actionstatic->fetchResources();
 	}
+
+	print '<tr class="oddeven">';
+
+	// Ref
+	if (!empty($arrayfields['a.id']['checked'])) {
+		print '<td class="nowraponall">';
+		print $actionstatic->getNomUrl(1, -1);
+		print '</td>';
+	}
+
+	// User owner
+	if (!empty($arrayfields['owner']['checked'])) {
+		print '<td class="tdoverflowmax150">'; // With edge and chrome the td overflow is not supported correctly when content is not full text.
+		if ($obj->fk_user_action > 0) {
+			$userstatic->fetch($obj->fk_user_action);
+			print $userstatic->getNomUrl(-1);
+		} else {
+			print '&nbsp;';
+		}
+		print '</td>';
+	}
+
+	// Type
+	if (!empty($arrayfields['c.libelle']['checked'])) {
+		print '<td class="nowraponall">';
+		print $actionstatic->getTypePicto();
+		$labeltype = $obj->type_code;
+		if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) {
+			$labeltype = 'AC_OTH';
+		}
+		if ($actionstatic->type_code == 'AC_OTH' && $actionstatic->code == 'TICKET_MSG') {
+			$labeltype = $langs->trans("Message");
+		} else {
+			if (!empty($arraylist[$labeltype])) {
+				$labeltype = $arraylist[$labeltype];
+			}
+			if ($obj->type_code == 'AC_OTH_AUTO' && ($obj->type_code != $obj->code) && $labeltype && !empty($arraylist[$obj->code])) {
+				$labeltype .= ' - '.$arraylist[$obj->code]; // Use code in priority on type_code
+			}
+		}
+		print dol_trunc($labeltype, 28);
+		print '</td>';
+	}
+
+	// Label
+	if (!empty($arrayfields['a.label']['checked'])) {
+		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($actionstatic->label).'">';
+		print $actionstatic->label;
+		print '</td>';
+	}
+
+	// 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);
+		print '</td>';
+	}
+
+	$formatToUse = $obj->fulldayevent ? 'day' : 'dayhour';
+
+	// Start date
+	if (!empty($arrayfields['a.datep']['checked'])) {
+		print '<td class="center nowraponall">';
+		print dol_print_date($db->jdate($obj->dp), $formatToUse, 'tzuser');
+		$late = 0;
+		if ($actionstatic->hasDelay() && $actionstatic->percentage >= 0 && $actionstatic->percentage < 100 ) {
+			$late = 1;
+		}
+		if ($late) {
+			print img_warning($langs->trans("Late")).' ';
+		}
+		print '</td>';
+	}
+
+	// End date
+	if (!empty($arrayfields['a.datep2']['checked'])) {
+		print '<td class="center nowraponall">';
+		print dol_print_date($db->jdate($obj->dp2), $formatToUse, 'tzuser');
+		print '</td>';
+	}
+
+	// Third party
+	if (!empty($arrayfields['s.nom']['checked'])) {
+		print '<td class="tdoverflowmax150">';
+		if ($obj->socid > 0) {
+			$societestatic->id = $obj->socid;
+			$societestatic->client = $obj->client;
+			$societestatic->name = $obj->societe;
+			$societestatic->email = $obj->socemail;
+
+			print $societestatic->getNomUrl(1, '', 28);
+		} else {
+			print '&nbsp;';
+		}
+		print '</td>';
+	}
+
+	// Contact
+	if (!empty($arrayfields['a.fk_contact']['checked'])) {
+		print '<td class="tdoverflowmax100">';
+
+		if (!empty($actionstatic->socpeopleassigned)) {
+			$contactList = array();
+			foreach ($actionstatic->socpeopleassigned as $socpeopleassigned) {
+				if (!isset($contactListCache[$socpeopleassigned['id']])) {
+					// if no cache found we fetch it
+					$contact = new Contact($db);
+					if ($contact->fetch($socpeopleassigned['id']) > 0) {
+						$contactListCache[$socpeopleassigned['id']] = $contact->getNomUrl(1, '', 0);
+						$contactList[] = $contact->getNomUrl(1, '', 0);
+					}
+				} else {
+					// use cache
+					$contactList[] = $contactListCache[$socpeopleassigned['id']];
+				}
+			}
+			if (!empty($contactList)) {
+				print implode(', ', $contactList);
+			}
+		} elseif ($obj->fk_contact > 0) { //keep for retrocompatibility with faraway event
+			$contactstatic->id = $obj->fk_contact;
+			$contactstatic->email = $obj->email;
+			$contactstatic->lastname = $obj->lastname;
+			$contactstatic->firstname = $obj->firstname;
+			$contactstatic->phone_pro = $obj->phone_pro;
+			$contactstatic->phone_mobile = $obj->phone_mobile;
+			$contactstatic->phone_perso = $obj->phone_perso;
+			$contactstatic->country_id = $obj->country_id;
+			print $contactstatic->getNomUrl(1, '', 0);
+		} else {
+			print "&nbsp;";
+		}
+		print '</td>';
+	}
+
+	// Linked object
 	if (!empty($arrayfields['a.fk_element']['checked'])) {
-		print '<td class="liste_titre"></td>';
+		print '<td class="tdoverflowmax150">';
+		//var_dump($obj->fkelement.' '.$obj->elementtype);
+		if ($obj->fk_element > 0 && !empty($obj->elementtype)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			print dolGetElementUrl($obj->fk_element, $obj->elementtype, 1);
+		} else {
+			print "&nbsp;";
+		}
+		print '</td>';
 	}
 
 	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
-
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.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
+	$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['a.datec']['checked'])) {
-		print '<td class="liste_titre"></td>';
+		// Status/Percent
+		print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->datec), 'dayhour', 'tzuser').'</td>';
 	}
+	// Date update
 	if (!empty($arrayfields['a.tms']['checked'])) {
-		print '<td class="liste_titre"></td>';
+		print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->datem), 'dayhour', 'tzuser').'</td>';
 	}
 	if (!empty($arrayfields['a.percent']['checked'])) {
-		print '<td class="liste_titre center">';
-		$formactions->form_select_status_action('formaction', $search_status, 1, 'search_status', 1, 2, 'minwidth100imp maxwidth125');
-		print ajax_combobox('selectsearch_status');
-		print '</td>';
+		// Status/Percent
+		$datep = $db->jdate($obj->dp);
+		print '<td align="center" class="nowrap">'.$actionstatic->LibStatut($obj->percent, 5, 0, $datep).'</td>';
 	}
 	// Action column
-	print '<td class="liste_titre" align="middle">';
-	$searchpicto = $form->showFilterButtons();
-	print $searchpicto;
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		$selected = 0;
+		if (in_array($obj->id, $arrayofselected)) {
+			$selected = 1;
+		}
+		print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
+	}
 	print '</td>';
+
 	print "</tr>\n";
-
-	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);
-	}
-	if (!empty($arrayfields['owner']['checked'])) {
-		print_liste_field_titre($arrayfields['owner']['label'], $_SERVER["PHP_SELF"], "", $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['a.label']['checked'])) {
-		print_liste_field_titre($arrayfields['a.label']['label'], $_SERVER["PHP_SELF"], "a.label", $param, "", "", $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['a.note']['checked'])) {
-		print_liste_field_titre($arrayfields['a.note']['label'], $_SERVER["PHP_SELF"], "a.note", $param, "", "", $sortfield, $sortorder);
-	}
-	//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);
-	}
-	if (!empty($arrayfields['a.datep2']['checked'])) {
-		print_liste_field_titre($arrayfields['a.datep2']['label'], $_SERVER["PHP_SELF"], "a.datep2", $param, '', 'align="center"', $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['s.nom']['checked'])) {
-		print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $param, "", "", $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['a.fk_contact']['checked'])) {
-		print_liste_field_titre($arrayfields['a.fk_contact']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['a.fk_element']['checked'])) {
-		print_liste_field_titre($arrayfields['a.fk_element']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
-	}
-
-	// 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['a.datec']['checked'])) {
-		print_liste_field_titre($arrayfields['a.datec']['label'], $_SERVER["PHP_SELF"], "a.datec,a.id", $param, "", 'align="center"', $sortfield, $sortorder);
-	}
-	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);
-	}
-
-	if (!empty($arrayfields['a.percent']['checked'])) {
-		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "a.percent", $param, "", 'align="center"', $sortfield, $sortorder);
-	}
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
-	print "</tr>\n";
-
-	$contactstatic = new Contact($db);
-	$now = dol_now();
-	$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
-
-	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
-	$caction = new CActionComm($db);
-	$arraylist = $caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), '', 1);
-	$contactListCache = array();
-
-	while ($i < min($num, $limit)) {
-		$obj = $db->fetch_object($resql);
-
-		// Discard auto action if option is on
-		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO') {
-			$i++;
-			continue;
-		}
-
-		$actionstatic->id = $obj->id;
-		$actionstatic->ref = $obj->id;
-		$actionstatic->code = $obj->code;
-		$actionstatic->type_code = $obj->type_code;
-		$actionstatic->type_label = $obj->type_label;
-		$actionstatic->type_picto = $obj->type_picto;
-		$actionstatic->type_color = $obj->type_color;
-		$actionstatic->label = $obj->label;
-		$actionstatic->location = $obj->location;
-		$actionstatic->note_private = dol_htmlentitiesbr($obj->note);
-		$actionstatic->datep = $db->jdate($obj->dp);
-		$actionstatic->percentage = $obj->percent;
-
-		// Initialize $this->userassigned && this->socpeopleassigned array && this->userownerid
-		// but only if we need it
-		if (!empty($arrayfields['a.fk_contact']['checked'])) {
-			$actionstatic->fetchResources();
-		}
-
-		print '<tr class="oddeven">';
-
-		// Ref
-		if (!empty($arrayfields['a.id']['checked'])) {
-			print '<td class="nowraponall">';
-			print $actionstatic->getNomUrl(1, -1);
-			print '</td>';
-		}
-
-		// User owner
-		if (!empty($arrayfields['owner']['checked'])) {
-			print '<td class="tdoverflowmax150">'; // With edge and chrome the td overflow is not supported correctly when content is not full text.
-			if ($obj->fk_user_action > 0) {
-				$userstatic->fetch($obj->fk_user_action);
-				print $userstatic->getNomUrl(-1);
-			} else {
-				print '&nbsp;';
-			}
-			print '</td>';
-		}
-
-		// Type
-		if (!empty($arrayfields['c.libelle']['checked'])) {
-			print '<td class="nowraponall">';
-			print $actionstatic->getTypePicto();
-			$labeltype = $obj->type_code;
-			if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) {
-				$labeltype = 'AC_OTH';
-			}
-			if ($actionstatic->type_code == 'AC_OTH' && $actionstatic->code == 'TICKET_MSG') {
-				$labeltype = $langs->trans("Message");
-			} else {
-				if (!empty($arraylist[$labeltype])) {
-					$labeltype = $arraylist[$labeltype];
-				}
-				if ($obj->type_code == 'AC_OTH_AUTO' && ($obj->type_code != $obj->code) && $labeltype && !empty($arraylist[$obj->code])) {
-					$labeltype .= ' - '.$arraylist[$obj->code]; // Use code in priority on type_code
-				}
-			}
-			print dol_trunc($labeltype, 28);
-			print '</td>';
-		}
-
-		// Label
-		if (!empty($arrayfields['a.label']['checked'])) {
-			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($actionstatic->label).'">';
-			print $actionstatic->label;
-			print '</td>';
-		}
-
-		// 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);
-			print '</td>';
-		}
-
-		$formatToUse = $obj->fulldayevent ? 'day' : 'dayhour';
-
-		// Start date
-		if (!empty($arrayfields['a.datep']['checked'])) {
-			print '<td class="center nowraponall">';
-			print dol_print_date($db->jdate($obj->dp), $formatToUse, 'tzuser');
-			$late = 0;
-			if ($actionstatic->hasDelay() && $actionstatic->percentage >= 0 && $actionstatic->percentage < 100 ) {
-				$late = 1;
-			}
-			if ($late) {
-				print img_warning($langs->trans("Late")).' ';
-			}
-			print '</td>';
-		}
-
-		// End date
-		if (!empty($arrayfields['a.datep2']['checked'])) {
-			print '<td class="center nowraponall">';
-			print dol_print_date($db->jdate($obj->dp2), $formatToUse, 'tzuser');
-			print '</td>';
-		}
-
-		// Third party
-		if (!empty($arrayfields['s.nom']['checked'])) {
-			print '<td class="tdoverflowmax150">';
-			if ($obj->socid > 0) {
-				$societestatic->id = $obj->socid;
-				$societestatic->client = $obj->client;
-				$societestatic->name = $obj->societe;
-				$societestatic->email = $obj->socemail;
-
-				print $societestatic->getNomUrl(1, '', 28);
-			} else {
-				print '&nbsp;';
-			}
-			print '</td>';
-		}
-
-		// Contact
-		if (!empty($arrayfields['a.fk_contact']['checked'])) {
-			print '<td class="tdoverflowmax100">';
-
-			if (!empty($actionstatic->socpeopleassigned)) {
-				$contactList = array();
-				foreach ($actionstatic->socpeopleassigned as $socpeopleassigned) {
-					if (!isset($contactListCache[$socpeopleassigned['id']])) {
-						// if no cache found we fetch it
-						$contact = new Contact($db);
-						if ($contact->fetch($socpeopleassigned['id']) > 0) {
-							$contactListCache[$socpeopleassigned['id']] = $contact->getNomUrl(1, '', 0);
-							$contactList[] = $contact->getNomUrl(1, '', 0);
-						}
-					} else {
-						// use cache
-						$contactList[] = $contactListCache[$socpeopleassigned['id']];
-					}
-				}
-				if (!empty($contactList)) {
-					print implode(', ', $contactList);
-				}
-			} elseif ($obj->fk_contact > 0) { //keep for retrocompatibility with faraway event
-				$contactstatic->id = $obj->fk_contact;
-				$contactstatic->email = $obj->email;
-				$contactstatic->lastname = $obj->lastname;
-				$contactstatic->firstname = $obj->firstname;
-				$contactstatic->phone_pro = $obj->phone_pro;
-				$contactstatic->phone_mobile = $obj->phone_mobile;
-				$contactstatic->phone_perso = $obj->phone_perso;
-				$contactstatic->country_id = $obj->country_id;
-				print $contactstatic->getNomUrl(1, '', 0);
-			} else {
-				print "&nbsp;";
-			}
-			print '</td>';
-		}
-
-		// Linked object
-		if (!empty($arrayfields['a.fk_element']['checked'])) {
-			print '<td class="tdoverflowmax150">';
-			//var_dump($obj->fkelement.' '.$obj->elementtype);
-			if ($obj->fk_element > 0 && !empty($obj->elementtype)) {
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-				print dolGetElementUrl($obj->fk_element, $obj->elementtype, 1);
-			} else {
-				print "&nbsp;";
-			}
-			print '</td>';
-		}
-
-		// 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['a.datec']['checked'])) {
-			// Status/Percent
-			print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->datec), 'dayhour', 'tzuser').'</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>';
-		}
-		if (!empty($arrayfields['a.percent']['checked'])) {
-			// Status/Percent
-			$datep = $db->jdate($obj->dp);
-			print '<td align="center" class="nowrap">'.$actionstatic->LibStatut($obj->percent, 5, 0, $datep).'</td>';
-		}
-		// Action column
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->id, $arrayofselected)) {
-				$selected = 1;
-			}
-			print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
-		}
-		print '</td>';
-
-		print "</tr>\n";
-		$i++;
-	}
-	print "</table>";
-	print '</div>';
-	print '</form>';
-
-	$db->free($resql);
-} else {
-	dol_print_error($db);
+	$i++;
 }
+print "</table>";
+print '</div>';
+print '</form>';
+
+$db->free($resql);
 
 // End of page
 llxFooter();
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 08cef7dd80a..eee8baa2b20 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -43,6 +43,8 @@ if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
 	$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
 }
 
+$action = GETPOST('action', 'aZ09');
+
 $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);
@@ -55,8 +57,8 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
 	$filtert = $user->id;
 }
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -80,18 +82,17 @@ if ($socid < 0) {
 }
 
 $canedit = 1;
-if (!$user->rights->agenda->myactions->read) {
+if (empty($user->rights->agenda->myactions->read)) {
 	accessforbidden();
 }
-if (!$user->rights->agenda->allactions->read) {
+if (empty($user->rights->agenda->allactions->read)) {
 	$canedit = 0;
 }
-if (!$user->rights->agenda->allactions->read || $filter == 'mine') {  // If no permission to see all, we show only affected to me
+if (empty($user->rights->agenda->allactions->read) || $filter == 'mine') {  // If no permission to see all, we show only affected to me
 	$filtert = $user->id;
 }
 
-//$action=GETPOST('action','alpha');
-$action = 'show_pertype';
+$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");
@@ -146,21 +147,21 @@ $end_d = 53;
 if ($status == '' && !GETPOSTISSET('status')) {
 	$status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
 }
-if (empty($action) && !GETPOSTISSET('action')) {
-	$action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+if (empty($mode) && !GETPOSTISSET('mode')) {
+	$mode = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
 }
 
-if (GETPOST('viewcal', 'alpha') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser') {
-	$action = 'show_month'; $day = '';
+if (GETPOST('viewcal', 'alpha') && $mode != 'show_day' && $mode != 'show_week' && $mode != 'show_peruser') {
+	$mode = 'show_month'; $day = '';
 }                                                   // View by month
-if (GETPOST('viewweek', 'alpha') || $action == 'show_week') {
-	$action = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
+if (GETPOST('viewweek', 'alpha') || $mode == 'show_week') {
+	$mode = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
 }  // View by week
-if (GETPOST('viewday', 'alpha') || $action == 'show_day') {
-	$action = 'show_day'; $day = ($day ? $day : date("d"));
+if (GETPOST('viewday', 'alpha') || $mode == 'show_day') {
+	$mode = 'show_day'; $day = ($day ? $day : date("d"));
 }                                  // View by day
-if (GETPOST('viewyear', 'alpha') || $action == 'show_year') {
-	$action = 'show_year';
+if (GETPOST('viewyear', 'alpha') || $mode == 'show_year') {
+	$mode = 'show_year';
 }                                  // View by year
 
 // Load translation files required by the page
@@ -179,7 +180,8 @@ if ($user->socid && $socid) {
  * Actions
  */
 
-if ($action == 'delete_action') {
+/*
+if ($action == 'delete_action' && $user->rights->agenda->delete) {
 	$event = new ActionComm($db);
 	$event->fetch($actionid);
 	$event->fetch_optionals();
@@ -188,7 +190,7 @@ if ($action == 'delete_action') {
 
 	$result = $event->delete();
 }
-
+*/
 
 
 /*
@@ -298,8 +300,8 @@ if ($pid) {
 if ($type) {
 	$param .= "&search_type=".urlencode($type);
 }
-if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser') {
-	$param .= '&action='.urlencode($action);
+if ($mode == 'show_day' || $mode == 'show_week' || $mode == 'show_month' || $mode != 'show_peruser') {
+	$param .= '&mode='.urlencode($mode);
 }
 if ($begin_h != '') {
 	$param .= '&begin_h='.urlencode($begin_h);
@@ -375,9 +377,8 @@ if ($conf->use_javascript_ajax) {
 	$s .= 'jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });'."\n";
 	$s .= 'jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });'."\n";
 	$s .= 'jQuery(".family_birthday").toggle();'."\n";
-	if ($action == "show_week" || $action == "show_month" || empty($action)) {
+	if ($mode == "show_week" || $mode == "show_month" || empty($mode)) {
 		$s .= 'jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
-		$s .= 'var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
 	}
 	$s .= '});'."\n";
 	$s .= '</script>'."\n";
@@ -414,31 +415,31 @@ if ($conf->use_javascript_ajax) {
 $massactionbutton = '';
 
 $viewmode = '';
-$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&restore_lastsearch_values=1'.$paramnoactionodate.'">';
+$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 .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
 
-$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewCal").'</span></a>';
 
-$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_week&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_week&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewWeek").'</span></a>';
 
-$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewDay").'</span></a>';
 
-$viewmode .= '<a class="btnTitle btnTitleSelected reposition marginrightonly" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle btnTitleSelected reposition marginrightonly" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?mode=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
@@ -506,7 +507,7 @@ $sql .= ' a.transparency, a.priority, a.fulldayevent, a.location,';
 $sql .= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype, a.fk_project,';
 $sql .= ' ca.code, ca.libelle as type_label, ca.color, ca.type as type_type, ca.picto as type_picto';
 $sql .= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
 }
 // We must filter on resource table
@@ -557,7 +558,7 @@ if ($resourceid > 0) {
 if ($pid) {
 	$sql .= " AND a.fk_project=".((int) $pid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".((int) $user->id).")";
 }
 if ($socid > 0) {
@@ -567,7 +568,7 @@ if ($socid > 0) {
 if ($filtert > 0 || $usergroup > 0) {
 	$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 }
-if ($action == 'show_day') {
+if ($mode == 'show_day') {
 	$sql .= " AND (";
 	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year, 'tzuserrel'))."'";
 	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
@@ -682,10 +683,6 @@ if ($resql) {
 				$event->date_end_in_calendar = $datep;
 			}
 		}
-		// Define ponctual property
-		if ($event->date_start_in_calendar == $event->date_end_in_calendar) {
-			$event->ponctuel = 1;
-		}
 
 		// Check values
 		if ($event->date_end_in_calendar < $firstdaytoshow ||
@@ -751,8 +748,8 @@ if (!is_array($theme_datacolor)) {
 
 $newparam = $param; // newparam is for birthday links
 $newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done
-$newparam = preg_replace('/action=show_month&?/i', '', $newparam);
-$newparam = preg_replace('/action=show_week&?/i', '', $newparam);
+$newparam = preg_replace('/mode=show_month&?/i', '', $newparam);
+$newparam = preg_replace('/mode=show_week&?/i', '', $newparam);
 $newparam = preg_replace('/day=[0-9]+&?/i', '', $newparam);
 $newparam = preg_replace('/month=[0-9]+&?/i', '', $newparam);
 $newparam = preg_replace('/year=[0-9]+&?/i', '', $newparam);
@@ -883,7 +880,7 @@ print "\n".'</form>';
 print "\n";
 
 // Add js code to manage click on a box
-print '<script type="text/javascript" language="javascript">
+print '<script type="text/javascript">
 jQuery(document).ready(function() {
 	jQuery(".onclickopenref").click(function() {
 		var ref=$(this).attr(\'ref\');
@@ -904,7 +901,7 @@ jQuery(document).ready(function() {
 		else if (ids.indexOf(",") > -1)	/* There is several events */
 		{
 			/* alert(\'several events\'); */
-			url = "'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
+			url = "'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
 			window.location.href = url;
 		}
 		else	/* One event */
@@ -965,8 +962,8 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 	// We are in a particular day for $username, now we scan all events
 	foreach ($eventarray as $daykey => $notused) {
 		$annee = dol_print_date($daykey, '%Y');
-		$mois =  dol_print_date($daykey, '%m');
-		$jour =  dol_print_date($daykey, '%d');
+		$mois = dol_print_date($daykey, '%m');
+		$jour = dol_print_date($daykey, '%d');
 
 		if ($day == $jour && $month == $mois && $year == $annee) {	// Is it the day we are looking for when calling function ?
 			// Scan all event for this date
@@ -1235,9 +1232,9 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 			$color2 = '222222';
 		}
 		print '<table class="nobordernopadding" width="100%">';
-		print '<tr><td '.($color1 ? 'style="background: #'.$color1.';"' : '').'class="'.($style1 ? $style1.' ' : '').'onclickopenref'.($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_00_'.($ids1 ? $ids1 : 'none').'"'.($title1 ? ' title="'.$title1.'"' : '').'>';
+		print '<tr><td '.($color1 ? 'style="background: #'.$color1.';"' : '').'class="'.($style1 ? $style1.' ' : '').'onclickopenref center'.($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_00_'.($ids1 ? $ids1 : 'none').'"'.($title1 ? ' title="'.$title1.'"' : '').'>';
 		print $string1;
-		print '</td><td '.($color2 ? 'style="background: #'.$color2.';"' : '').'class="'.($style2 ? $style2.' ' : '').'onclickopenref'.($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_30_'.($ids2 ? $ids2 : 'none').'"'.($title2 ? ' title="'.$title2.'"' : '').'>';
+		print '</td><td '.($color2 ? 'style="background: #'.$color2.';"' : '').'class="'.($style2 ? $style2.' ' : '').'onclickopenref center'.($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_30_'.($ids2 ? $ids2 : 'none').'"'.($title2 ? ' title="'.$title2.'"' : '').'>';
 		print $string2;
 		print '</td></tr>';
 		print '</table>';
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 0d1567ee274..957ccd6e361 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -43,6 +43,8 @@ if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
 	$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
 }
 
+$action = GETPOST('action', 'aZ09');
+
 $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);
@@ -56,8 +58,8 @@ $showbirthday = 0;
 	$filtert = $user->id;
 }*/
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -80,18 +82,17 @@ if ($socid < 0) {
 }
 
 $canedit = 1;
-if (!$user->rights->agenda->myactions->read) {
+if (empty($user->rights->agenda->myactions->read)) {
 	accessforbidden();
 }
-if (!$user->rights->agenda->allactions->read) {
+if (empty($user->rights->agenda->allactions->read)) {
 	$canedit = 0;
 }
-if (!$user->rights->agenda->allactions->read || $filter == 'mine') {  // If no permission to see all, we show only affected to me
+if (empty($user->rights->agenda->allactions->read) || $filter == 'mine') {  // If no permission to see all, we show only affected to me
 	$filtert = $user->id;
 }
 
-//$action=GETPOST('action','alpha');
-$action = 'show_peruser'; //We use 'show_week' mode
+$mode = 'show_peruser';
 $resourceid = GETPOST("search_resourceid", "int") ?GETPOST("search_resourceid", "int") : GETPOST("resourceid", "int");
 $year = GETPOST("year", "int") ?GETPOST("year", "int") : date("Y");
 $month = GETPOST("month", "int") ?GETPOST("month", "int") : date("m");
@@ -155,19 +156,19 @@ if ($end_d < $begin_d) {
 if ($status == '' && !GETPOSTISSET('status')) {
 	$status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
 }
-if (empty($action) && !GETPOSTISSET('action')) {
-	$action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+if (empty($mode) && !GETPOSTISSET('mode')) {
+	$mode = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
 }
 
-if (GETPOST('viewcal', 'alpha') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser') {
-	$action = 'show_month'; $day = '';
-}                                                   // View by month
-if (GETPOST('viewweek', 'alpha') || $action == 'show_week') {
-	$action = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
-}  // View by week
-if (GETPOST('viewday', 'alpha') || $action == 'show_day') {
-	$action = 'show_day'; $day = ($day ? $day : date("d"));
-}                                  // View by day
+if (GETPOST('viewcal', 'alpha') && $mode != 'show_day' && $mode != 'show_week' && $mode != 'show_peruser') {
+	$mode = 'show_month'; $day = '';
+} // View by month
+if (GETPOST('viewweek', 'alpha') || $mode == 'show_week') {
+	$mode = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
+} // View by week
+if (GETPOST('viewday', 'alpha') || $mode == 'show_day') {
+	$mode = 'show_day'; $day = ($day ? $day : date("d"));
+} // View by day
 
 // Load translation files required by the page
 $langs->loadLangs(array('users', 'agenda', 'other', 'commercial'));
@@ -185,7 +186,8 @@ if ($user->socid && $socid) {
  * Actions
  */
 
-if ($action == 'delete_action') {
+/*
+if ($action == 'delete_action' && $user->rights->agenda->delete) {
 	$event = new ActionComm($db);
 	$event->fetch($actionid);
 	$event->fetch_optionals();
@@ -194,7 +196,7 @@ if ($action == 'delete_action') {
 
 	$result = $event->delete();
 }
-
+*/
 
 
 /*
@@ -304,8 +306,8 @@ if ($pid) {
 if ($type) {
 	$param .= "&search_type=".urlencode($type);
 }
-if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser') {
-	$param .= '&action='.urlencode($action);
+if ($mode != 'show_peruser') {
+	$param .= '&mode='.urlencode($mode);
 }
 if ($begin_h != '') {
 	$param .= '&begin_h='.urlencode($begin_h);
@@ -385,9 +387,8 @@ if ($conf->use_javascript_ajax) {
 	$s .= 'jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });'."\n";
 	$s .= 'jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });'."\n";
 	$s .= 'jQuery(".family_birthday").toggle();'."\n";
-	if ($action == "show_week" || $action == "show_month" || empty($action)) {
+	if ($mode == "show_week" || $mode == "show_month" || empty($mode)) {
 		$s .= 'jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
-		$s .= 'var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
 	}
 	$s .= '});'."\n";
 	$s .= '</script>'."\n";
@@ -424,31 +425,31 @@ if ($conf->use_javascript_ajax) {
 $massactionbutton = '';
 
 $viewmode = '';
-$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&restore_lastsearch_values=1'.$paramnoactionodate.'">';
+$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 .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
 
-$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewCal").'</span></a>';
 
-$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_week&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_week&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewWeek").'</span></a>';
 
-$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewDay").'</span></a>';
 
-$viewmode .= '<a class="btnTitle btnTitleSelected reposition marginrightonly" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle btnTitleSelected reposition marginrightonly" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?mode=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
@@ -466,6 +467,7 @@ if (empty($reshook)) {
 }
 
 
+$newparam = '';
 $newcardbutton = '';
 if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {
 	$tmpforcreatebutton = dol_getdate(dol_now(), true);
@@ -489,6 +491,8 @@ if ($user->rights->agenda->myactions->create || $user->rights->agenda->allaction
 	$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : '')));
 }
 
+$num = '';
+
 print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, -1, 'object_action', 0, $nav.'<span class="marginleftonly"></span>'.$newcardbutton, '', $limit, 1, 0, 1, $viewmode);
 
 $link = '';
@@ -505,6 +509,9 @@ $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>';
 
@@ -527,7 +534,7 @@ $sql .= ' a.transparency, a.priority, a.fulldayevent, a.location,';
 $sql .= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype, a.fk_project,';
 $sql .= ' ca.code, ca.libelle as type_label, ca.color, ca.type as type_type, ca.picto as type_picto';
 $sql .= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
 }
 // We must filter on resource table
@@ -578,7 +585,7 @@ if ($resourceid > 0) {
 if ($pid) {
 	$sql .= " AND a.fk_project = ".((int) $pid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".((int) $user->id).")";
 }
 if ($socid > 0) {
@@ -588,7 +595,7 @@ if ($socid > 0) {
 if ($filtert > 0 || $usergroup > 0) {
 	$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 }
-if ($action == 'show_day') {
+if ($mode == 'show_day') {
 	$sql .= " AND (";
 	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year, 'tzuserrel'))."'";
 	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year, 'tzuserrel'))."')";
@@ -704,10 +711,6 @@ if ($resql) {
 				$event->date_end_in_calendar = $datep;
 			}
 		}
-		// Define ponctual property
-		if ($event->date_start_in_calendar == $event->date_end_in_calendar) {
-			$event->ponctuel = 1;
-		}
 
 		// Check values
 		if ($event->date_end_in_calendar < $firstdaytoshow ||
@@ -774,8 +777,8 @@ if (!is_array($theme_datacolor)) {
 
 $newparam = $param; // newparam is for birthday links
 $newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done
-$newparam = preg_replace('/action=show_month&?/i', '', $newparam);
-$newparam = preg_replace('/action=show_week&?/i', '', $newparam);
+$newparam = preg_replace('/mode=show_month&?/i', '', $newparam);
+$newparam = preg_replace('/mode=show_week&?/i', '', $newparam);
 $newparam = preg_replace('/day=[0-9]+&?/i', '', $newparam);
 $newparam = preg_replace('/month=[0-9]+&?/i', '', $newparam);
 $newparam = preg_replace('/year=[0-9]+&?/i', '', $newparam);
@@ -796,12 +799,12 @@ $currentdaytoshow = $firstdaytoshow;
 echo '<div class="div-table-responsive">';
 
 while ($currentdaytoshow < $lastdaytoshow) {
-	echo '<table width="100%" class="noborder nocellnopadd cal_month">';
+	echo '<table class="centpercent noborder nocellnopadd cal_month">';
 
 	echo '<tr class="liste_titre">';
 	echo '<td class="nopaddingtopimp nopaddingbottomimp nowraponsmartphone">';
 
-	if ($canedit && $action == 'show_peruser') {
+	if ($canedit && $mode == 'show_peruser') {
 		// Filter on hours
 		print img_picto('', 'clock', 'class="fawidth30 inline-block paddingleft"');
 		print '<span class="hideonsmartphone" title="'.$langs->trans("VisibleTimeRange").'">'.$langs->trans("Hours").'</span>';
@@ -823,7 +826,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		// Filter on days
 		print img_picto('', 'clock', 'class="fawidth30 inline-block paddingleft"');
 		print '<span class="hideonsmartphone" title="'.$langs->trans("VisibleDaysRange").'">'.$langs->trans("DaysOfWeek").'</span>';
-		print "\n".'<div class="ui-grid-a  inline-block"><div class="ui-block-a">';
+		print "\n".'<div class="ui-grid-a  inline-block"><div class="ui-block-a nowraponall">';
 		print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7">';
 		if (empty($conf->dol_use_jmobile)) {
 			print ' - ';
@@ -1045,7 +1048,7 @@ print "\n".'</form>';
 print "\n";
 
 // Add js code to manage click on a box
-print '<script type="text/javascript" language="javascript">
+print '<script type="text/javascript">
 jQuery(document).ready(function() {
 	jQuery(".onclickopenref").click(function() {
 		var ref=$(this).attr(\'ref\');
@@ -1066,7 +1069,7 @@ jQuery(document).ready(function() {
 		else if (ids.indexOf(",") > -1)	/* There is several events */
 		{
 			/* alert(\'several events\'); */
-			url = "'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
+			url = "'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
 			window.location.href = url;
 		}
 		else	/* One event */
@@ -1386,10 +1389,10 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 
 		$ids1 = '';
 		$ids2 = '';
-		if (is_array($cases1[$h]) && count($cases1[$h]) && array_keys($cases1[$h])) {
+		if (!empty($cases1[$h]) && is_array($cases1[$h]) && count($cases1[$h]) && array_keys($cases1[$h])) {
 			$ids1 = join(',', array_keys($cases1[$h]));
 		}
-		if (is_array($cases2[$h]) && count($cases2[$h]) && array_keys($cases2[$h])) {
+		if (!empty($cases2[$h]) && is_array($cases2[$h]) && count($cases2[$h]) && array_keys($cases2[$h])) {
 			$ids2 = join(',', array_keys($cases2[$h]));
 		}
 
@@ -1398,7 +1401,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		} else {
 			echo '<td class="'.$style.' cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
 		}
-		if (is_array($cases1[$h]) && count($cases1[$h]) == 1) {	// only 1 event
+		if (!empty($cases1[$h]) && is_array($cases1[$h]) && count($cases1[$h]) == 1) {	// only 1 event
 			$output = array_slice($cases1[$h], 0, 1);
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			if ($output[0]['string']) {
@@ -1407,12 +1410,12 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			if ($output[0]['color']) {
 				$color1 = $output[0]['color'];
 			}
-		} elseif (is_array($cases1[$h]) && count($cases1[$h]) > 1) {
+		} elseif (!empty($cases1[$h]) && is_array($cases1[$h]) && count($cases1[$h]) > 1) {
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			$color1 = '222222';
 		}
 
-		if (is_array($cases2[$h]) && count($cases2[$h]) == 1) {	// only 1 event
+		if (!empty($cases2[$h]) && is_array($cases2[$h]) && count($cases2[$h]) == 1) {	// only 1 event
 			$output = array_slice($cases2[$h], 0, 1);
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			if ($output[0]['string']) {
@@ -1421,7 +1424,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			if ($output[0]['color']) {
 				$color2 = $output[0]['color'];
 			}
-		} elseif (is_array($cases2[$h]) && count($cases2[$h]) > 1) {
+		} elseif (!empty($cases2[$h]) && is_array($cases2[$h]) && count($cases2[$h]) > 1) {
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			$color2 = '222222';
 		}
@@ -1434,7 +1437,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		}
 		print 'class="';
 		print ($style1 ? $style1.' ' : '');
-		print 'onclickopenref'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_00_'.($ids1 ? $ids1 : 'none').'"'.($title1 ? ' title="'.$title1.'"' : '').'>';
+		print 'onclickopenref center'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_00_'.($ids1 ? $ids1 : 'none').'"'.($title1 ? ' title="'.$title1.'"' : '').'>';
 		print $string1;
 		print '</td><td ';
 		if ($style2 == 'peruser_notbusy') {
@@ -1444,7 +1447,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		}
 		print 'class="';
 		print ($style2 ? $style2.' ' : '');
-		print 'onclickopenref'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_30_'.($ids2 ? $ids2 : 'none').'"'.($title2 ? ' title="'.$title2.'"' : '').'>';
+		print 'onclickopenref center'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_30_'.($ids2 ? $ids2 : 'none').'"'.($title2 ? ' title="'.$title2.'"' : '').'>';
 		print $string2;
 		print '</td></tr>';
 		print '</table>';
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 9b6238ca0de..9b3f9a27140 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -40,8 +40,8 @@ $year = GETPOST('year', 'int');
 
 $optioncss = GETPOST('optioncss', 'alpha');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (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
@@ -163,7 +163,7 @@ if ($resql) {
 
 			// Button to build doc
 			print '<td class="center">';
-			print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=builddoc&amp;page='.$page.'&amp;month='.$obj->month.'&amp;year='.$obj->year.'">'.img_picto($langs->trans('BuildDoc'), 'filenew').'</a>';
+			print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=builddoc&token='.newToken().'&page='.((int) $page).'&month='.((int) $obj->month).'&year='.((int) $obj->year).'">'.img_picto($langs->trans('BuildDoc'), 'filenew').'</a>';
 			print '</td>';
 
 			$name = "actions-".$obj->month."-".$obj->year.".pdf";
@@ -185,10 +185,7 @@ if ($resql) {
 				// Show file name with link to download
 				$out .= '<a href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param ? '&'.$param : '').'"';
 				$mime = dol_mimetype($relativepath, '', 0);
-				if (preg_match('/text/', $mime)) {
-					$out .= ' target="_blank"';
-				}
-				$out .= ' target="_blank">';
+				$out .= ' target="_blank" rel="noopener noreferrer">';
 				$out .= img_mime($filearray["name"], $langs->trans("File").': '.$filearray["name"]);
 				$out .= $filearray["name"];
 				$out .= '</a>'."\n";
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 015e06df36a..90d3ed128f7 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -93,8 +93,8 @@ $action = GETPOST('action', 'aZ09');
 $id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -108,7 +108,7 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = "nom";
 }
-$cancelbutton = GETPOST('cancel', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
 
 $object = new Client($db);
 $extrafields = new ExtraFields($db);
@@ -152,7 +152,7 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
-	if ($cancelbutton) {
+	if ($cancel) {
 		$action = "";
 	}
 
@@ -351,7 +351,7 @@ if ($object->id > 0) {
 		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client));
 		$tmpcheck = $object->check_codeclient();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+			print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
 		}
 		print '</td></tr>';
 
@@ -406,7 +406,7 @@ if ($object->id > 0) {
 	print $langs->trans('PaymentConditions');
 	print '<td>';
 	if (($action != 'editconditions') && $user->rights->societe->creer) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td>';
@@ -424,7 +424,7 @@ if ($object->id > 0) {
 	print $langs->trans('PaymentMode');
 	print '<td>';
 	if (($action != 'editmode') && $user->rights->societe->creer) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td>';
@@ -443,7 +443,7 @@ if ($object->id > 0) {
 		print $langs->trans('PaymentBankAccount');
 		print '<td>';
 		if (($action != 'editbankaccount') && $user->rights->societe->creer) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
@@ -465,7 +465,7 @@ if ($object->id > 0) {
 		print $langs->trans("CustomerRelativeDiscountShort");
 		print '<td><td class="right">';
 		if ($user->rights->societe->creer && !$user->socid > 0) {
-			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'&action=create&token='.newToken().'">'.img_edit($langs->trans("Modify")).'</a>';
 		}
 		print '</td></tr></table>';
 		print '</td><td>'.($object->remise_percent ? '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_percent.'%</a>' : '').'</td>';
@@ -478,7 +478,7 @@ if ($object->id > 0) {
 		print $langs->trans("CustomerAbsoluteDiscountShort");
 		print '<td><td class="right">';
 		if ($user->rights->societe->creer && !$user->socid > 0) {
-			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.img_edit($langs->trans("Modify")).'</a>';
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'&action=create&token='.newToken().'">'.img_edit($langs->trans("Modify")).'</a>';
 		}
 		print '</td></tr></table>';
 		print '</td>';
@@ -488,7 +488,7 @@ if ($object->id > 0) {
 			dol_print_error($db, $object->error);
 		}
 		if ($amount_discount > 0) {
-			print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency).'</a>';
+			print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'&action=create&token='.newToken().'">'.price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency).'</a>';
 		}
 		//else print $langs->trans("DiscountNone");
 		print '</td>';
@@ -569,7 +569,7 @@ if ($object->id > 0) {
 		print $langs->trans('SendingMethod');
 		print '<td>';
 		if (($action != 'editshipping') && $user->rights->societe->creer) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
@@ -589,7 +589,7 @@ if ($object->id > 0) {
 		print $langs->trans('IntracommReportTransportMode');
 		print '<td>';
 		if (($action != 'edittransportmode') && $user->rights->societe->creer) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edittransportmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edittransportmode&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
@@ -652,7 +652,7 @@ if ($object->id > 0) {
 		print $langs->trans('ProspectLevel');
 		print '<td>';
 		if ($action != 'editlevel' && $user->rights->societe->creer) {
-			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editlevel&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
@@ -682,7 +682,7 @@ if ($object->id > 0) {
 		print "</table>";
 	}
 
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright">';
 	print '<div class="underbanner clearboth"></div>';
 
 	$boxstat = '';
@@ -1341,7 +1341,7 @@ if ($object->id > 0) {
 		print $hookmanager->resPrint;
 	}
 
-	print '</div></div></div>';
+	print '</div></div>';
 	print '<div style="clear:both"></div>';
 
 	print dol_get_fiche_end();
@@ -1370,7 +1370,7 @@ if ($object->id > 0) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddOrder").'</a></div>';
 		}
 
-		if ($user->rights->contrat->creer && $object->status == 1) {
+		if (!empty($user->rights->contrat->creer) && $object->status == 1) {
 			$langs->load("contracts");
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddContract").'</a></div>';
 		}
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 52f6e675c5f..62f57c008ba 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -82,14 +82,14 @@ if ($type == "f") {
 $sql = "SELECT s.rowid, s.nom as name, st.libelle as stcomm";
 $sql .= ", p.rowid as cidp, p.name, p.firstname, p.email, p.phone";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_stcomm as st,";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
 }
 $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').")";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if ($type == "c") {
@@ -157,10 +157,10 @@ if ($resql) {
 		print '<tr class="oddeven">';
 		print '<td><a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowContact"), "contact");
 		print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.$obj->name.'</a></td>';
-		print "<td>$obj->firstname</TD>";
+		print '<td>'.dol_escape_htmltag($obj->firstname).'</td>';
 
 		print '<td><a href="'.$_SERVER["PHP_SELF"].'?type='.$type.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowCompany"), "company").'</a>&nbsp;';
-		print "<a href=\"".$urlfiche."?socid=".$obj->rowid."\">$obj->name</a></td>\n";
+		print '<a href="'.$urlfiche."?socid=".$obj->rowid.'">'.$obj->name."</a></td>\n";
 
 		print '<td>'.dol_print_phone($obj->email, $obj->cidp, $obj->rowid, 'AC_EMAIL').'</td>';
 
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 18546332ed0..aad02f2bd07 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -129,13 +129,13 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."propal as p,";
 	$sql .= " ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";
 	$sql .= " AND p.fk_soc = s.rowid";
 	$sql .= " AND p.fk_statut = ".Propal::STATUS_DRAFT;
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -226,13 +226,13 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p,";
 	$sql .= " ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE p.entity IN (".getEntity($supplierproposalstatic->element).")";
 	$sql .= " AND p.fk_statut = ".SupplierProposal::STATUS_DRAFT;
 	$sql .= " AND p.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -322,13 +322,13 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c,";
 	$sql .= " ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.entity IN (".getEntity($orderstatic->element).")";
 	$sql .= " AND c.fk_statut = ".Commande::STATUS_DRAFT;
 	$sql .= " AND c.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -419,13 +419,13 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf,";
 	$sql .= " ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE cf.entity IN (".getEntity($supplierorderstatic->element).")";
 	$sql .= " AND cf.fk_statut = ".CommandeFournisseur::STATUS_DRAFT;
 	$sql .= " AND cf.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -503,8 +503,51 @@ 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 .= " FROM ".MAIN_DB_PREFIX."fichinter 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.entity IN (".getEntity('intervention').")";
+	$sql .= " AND f.fk_soc = s.rowid";
+	$sql .= " AND f.fk_statut = 0";
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".((int) $socid);
+	}
+	if (empty($user->rights->societe->client->voir) && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+	}
+
+	$resql = $db->query($sql);
+	if ($resql) {
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="2">'.$langs->trans("DraftFichinter").'</th></tr>';
+		$langs->load("fichinter");
+		$num = $db->num_rows($resql);
+		if ($num) {
+			$i = 0;
+			while ($i < $num) {
+				$obj = $db->fetch_object($resql);
+				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>';
+				$i++;
+			}
+		}
+		print "</table></div>";
+	}
+}
+
 print '</div><div class="fichetwothirdright">';
-print '<div class="ficheaddleft">';
 
 /*
  * Last modified customers or prospects
@@ -517,12 +560,12 @@ if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
 	$sql .= ", s.canvas";
 	$sql .= ", s.datec, s.tms";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE s.entity IN (".getEntity($companystatic->element).")";
 	$sql .= " AND s.client IN (".Societe::CUSTOMER.", ".Societe::PROSPECT.", ".Societe::CUSTOMER_AND_PROSPECT.")";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -613,12 +656,12 @@ if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_S
 	$sql .= ", s.canvas";
 	$sql .= ", s.datec as dc, s.tms as dm";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$user->socid) {
+	if (empty($user->rights->societe->client->voir) && !$user->socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE s.entity IN (".getEntity($companystatic->element).")";
 	$sql .= " AND s.fournisseur = ".Societe::SUPPLIER;
-	if (!$user->rights->societe->client->voir && !$user->socid) {
+	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) {
@@ -718,13 +761,13 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) { // T
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."contrat as c";
 	$sql .= ", ".MAIN_DB_PREFIX."product as p";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.entity IN (".getEntity($staticcontrat->element).")";
 	$sql .= " AND c.fk_soc = s.rowid";
 	$sql .= " AND c.fk_product = p.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -793,13 +836,13 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";
 	$sql .= " AND p.fk_soc = s.rowid";
 	$sql .= " AND p.fk_statut = ".Propal::STATUS_VALIDATED;
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -909,13 +952,13 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.entity IN (".getEntity($orderstatic->element).")";
 	$sql .= " AND c.fk_soc = s.rowid";
 	$sql .= " AND c.fk_statut IN (".Commande::STATUS_VALIDATED.", ".Commande::STATUS_SHIPMENTONPROCESS.")";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -1013,7 +1056,6 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 	}
 }
 
-print '</div>';
 print '</div>';
 print '</div>';
 
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index b91bc866d9a..79faf4b2cd2 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -165,12 +165,13 @@ if (empty($reshook)) {
 					$now = dol_now();
 
 					// Positioning date of start sending
-					$sql = "UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$object->id;
+					$sql = "UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".((int) $object->id);
 					$resql2 = $db->query($sql);
 					if (!$resql2) {
 						dol_print_error($db);
 					}
 
+					$thirdpartystatic = new Societe($db);
 					// Loop on each email and send it
 					$i = 0;
 
@@ -200,6 +201,15 @@ if (empty($reshook)) {
 
 						// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
 						$substitutionarray['__ID__'] = $obj->source_id;
+						if ($obj->source_type == "thirdparty") {
+							$result = $thirdpartystatic->fetch($obj->source_id);
+
+							if ($result > 0) {
+								$substitutionarray['__THIRDPARTY_CUSTOMER_CODE__'] = $thirdpartystatic->code_client;
+							} else {
+								$substitutionarray['__THIRDPARTY_CUSTOMER_CODE__'] = '';
+							}
+						}
 						$substitutionarray['__EMAIL__'] = $obj->email;
 						$substitutionarray['__LASTNAME__'] = $obj->lastname;
 						$substitutionarray['__FIRSTNAME__'] = $obj->firstname;
@@ -211,7 +221,7 @@ if (empty($reshook)) {
 						$substitutionarray['__OTHER5__'] = $other5;
 						$substitutionarray['__USER_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter)
 						$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($obj->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid.'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
-						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid.'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
+						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid.'" target="_blank" rel="noopener noreferrer">'.$langs->trans("MailUnsubcribe").'</a>';
 						$substitutionarray['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid;
 
 						$onlinepaymentenabled = 0;
@@ -248,7 +258,7 @@ if (empty($reshook)) {
 							}
 						}
 						if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
-							$substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = '<a target="_blank" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php'.((!empty($conf->multicompany->enabled)) ? '?entity='.$conf->entity : '').'">'.$langs->trans('BlankSubscriptionForm'). '</a>';
+							$substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = '<a target="_blank" rel="noopener noreferrer" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php'.((!empty($conf->multicompany->enabled)) ? '?entity='.$conf->entity : '').'">'.$langs->trans('BlankSubscriptionForm'). '</a>';
 						}
 						/* For backward compatibility, deprecated */
 						if (!empty($conf->paypal->enabled) && !empty($conf->global->PAYPAL_SECURITY_TOKEN)) {
@@ -368,7 +378,7 @@ if (empty($reshook)) {
 							dol_syslog("comm/mailing/card.php: error for #".$i.($mail->error ? ' - '.$mail->error : ''), LOG_WARNING);
 
 							$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-							$sql .= " SET statut=-1, error_text='".$db->escape($mail->error)."', date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
+							$sql .= " SET statut=-1, error_text='".$db->escape($mail->error)."', date_envoi='".$db->idate($now)."' WHERE rowid=".((int) $obj->rowid);
 							$resql2 = $db->query($sql);
 							if (!$resql2) {
 								dol_print_error($db);
@@ -483,9 +493,9 @@ if (empty($reshook)) {
 	if ($action == 'add') {
 		$mesgs = array();
 
-		$object->email_from     = (string) GETPOST("from", "none"); // Must allow 'name <email>'
-		$object->email_replyto  = (string) GETPOST("replyto", "none"); // Must allow 'name <email>'
-		$object->email_errorsto = (string) GETPOST("errorsto", "none"); // Must allow 'name <email>'
+		$object->email_from     = (string) GETPOST("from", 'alphawithlgt'); // Must allow 'name <email>'
+		$object->email_replyto  = (string) GETPOST("replyto", 'alphawithlgt'); // Must allow 'name <email>'
+		$object->email_errorsto = (string) GETPOST("errorsto", 'alphawithlgt'); // Must allow 'name <email>'
 		$object->title          = (string) GETPOST("title");
 		$object->sujet          = (string) GETPOST("sujet");
 		$object->body           = (string) GETPOST("bodyemail", 'restricthtml');
@@ -521,11 +531,11 @@ if (empty($reshook)) {
 		if ($action == 'settitle') {
 			$object->title = trim(GETPOST('title', 'alpha'));
 		} elseif ($action == 'setemail_from') {
-			$object->email_from = trim(GETPOST('email_from', 'none')); // Must allow 'name <email>'
+			$object->email_from = trim(GETPOST('email_from', 'alphawithlgt')); // Must allow 'name <email>'
 		} elseif ($action == 'setemail_replyto') {
-			$object->email_replyto = trim(GETPOST('email_replyto', 'none')); // Must allow 'name <email>'
+			$object->email_replyto = trim(GETPOST('email_replyto', 'alphawithlgt')); // Must allow 'name <email>'
 		} elseif ($action == 'setemail_errorsto') {
-			$object->email_errorsto = trim(GETPOST('email_errorsto', 'none')); // Must allow 'name <email>'
+			$object->email_errorsto = trim(GETPOST('email_errorsto', 'alphawithlgt')); // Must allow 'name <email>'
 		} elseif ($action == 'settitle' && empty($object->title)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
 		} elseif ($action == 'setfrom' && empty($object->email_from)) {
@@ -749,7 +759,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("CreateMailing").'"></div>';
+	print $form->buttonsSaveCancel("CreateMailing", '');
 
 	print '</form>';
 } else {
@@ -912,7 +922,7 @@ if ($action == 'create') {
 					}
 				}
 				if (empty($nbemail)) {
-					$nbemail .= ' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+					$nbemail .= ' '.img_warning('').' <span class="warning">'.$langs->trans("NoTargetYet").'</span>';
 				}
 				if ($text) {
 					print $form->textwithpicto($nbemail, $text, 1, 'warning');
@@ -952,18 +962,18 @@ if ($action == 'create') {
 				print "\n\n<div class=\"tabsAction\">\n";
 
 				if (($object->statut == 1) && ($user->rights->mailing->valider || $object->fk_user_valid == $user->id)) {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=settodraft&amp;id='.$object->id.'">'.$langs->trans("SetToDraft").'</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=settodraft&token='.newToken().'&id='.$object->id.'">'.$langs->trans("SetToDraft").'</a>';
 				}
 
 				if (($object->statut == 0 || $object->statut == 1 || $object->statut == 2) && $user->rights->mailing->creer) {
 					if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_MAILING)) {
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithEditor").'</a>';
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("EditWithEditor").'</a>';
 					} else {
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithTextEditor").'</a>';
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("EditWithTextEditor").'</a>';
 					}
 
 					if (!empty($conf->use_javascript_ajax)) {
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edithtml&amp;id='.$object->id.'">'.$langs->trans("EditHTMLSource").'</a>';
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edithtml&token='.newToken().'&id='.$object->id.'">'.$langs->trans("EditHTMLSource").'</a>';
 					}
 				}
 
@@ -972,7 +982,7 @@ if ($action == 'create') {
 				if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("TestMailing").'</a>';
 				} else {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=test&amp;id='.$object->id.'">'.$langs->trans("TestMailing").'</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=test&token='.newToken().'&id='.$object->id.'">'.$langs->trans("TestMailing").'</a>';
 				}
 
 				if ($object->statut == 0) {
@@ -1011,7 +1021,7 @@ if ($action == 'create') {
 					if ($object->statut > 0 && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->delete)) {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("DeleteMailing").'</a>';
 					} else {
-						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;token='.newToken().'&amp;id='.$object->id.(!empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
+						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$object->id.(!empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
 					}
 				}
 
@@ -1161,7 +1171,7 @@ if ($action == 'create') {
 					}
 				}
 				if (empty($nbemail)) {
-					$nbemail .= ' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+					$nbemail .= ' '.img_warning('').' <span class="warning">'.$langs->trans("NoTargetYet").'</span>';
 				}
 				if ($text) {
 					print $form->textwithpicto($nbemail, $text, 1, 'warning');
@@ -1221,7 +1231,7 @@ if ($action == 'create') {
 
 			// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
 			$out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
-			$out .= '<script type="text/javascript" language="javascript">';
+			$out .= '<script type="text/javascript">';
 			$out .= 'jQuery(document).ready(function () {';
 			$out .= '    jQuery(".removedfile").click(function() {';
 			$out .= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 556d0cb8c08..9069b63179f 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=".$object->id;
+	$sql .= " WHERE mc.fk_mailing=".((int) $object->id);
 	$sql .= $db->order($sortfield, $sortorder);
 
 	$resql = $db->query($sql);
@@ -284,7 +284,7 @@ if ($object->fetch($id) >= 0) {
 			}
 		}
 		if (empty($nbemail)) {
-			$nbemail .= ' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+			$nbemail .= ' '.img_warning('').' <span class="warning">'.$langs->trans("NoTargetYet").'</span>';
 		}
 		if ($text) {
 			print $form->textwithpicto($nbemail, $text, 1, 'warning');
@@ -310,6 +310,8 @@ if ($object->fetch($id) >= 0) {
 		print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin ?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"), 1) : ''), 'generic');
 
 		//print '<table class="noborder centpercent">';
+
+		print '<div class="div-table-responsive">';
 		print '<div class="tagtable centpercent liste_titre_bydiv borderbottom" id="tablelines">';
 
 		//print '<tr class="liste_titre">';
@@ -323,7 +325,7 @@ if ($object->fetch($id) >= 0) {
 		//print '<td class="liste_titre" align="center">&nbsp;</td>';
 		print '<div class="tagtd">&nbsp;</div>';
 		//print "</tr>\n";
-		print '</div>';
+		print '</div>';	// End tr
 
 		clearstatcache();
 
@@ -378,7 +380,7 @@ if ($object->fetch($id) >= 0) {
 					$var = !$var;
 
 					if ($allowaddtarget) {
-						print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
+						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().'">';
 					} else {
 						print '<div '.$bctag[$var].'>';
@@ -424,9 +426,9 @@ if ($object->fetch($id) >= 0) {
 
 					print '<div class="tagtd right">';
 					if ($allowaddtarget) {
-						print '<input type="submit" class="button" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
+						print '<input type="submit" class="button button-add small" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 					} else {
-						print '<input type="submit" class="button disabled" disabled="disabled" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
+						print '<input type="submit" class="button small disabled" disabled="disabled" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 						//print $langs->trans("MailNoChangePossible");
 						print "&nbsp;";
 					}
@@ -445,6 +447,7 @@ if ($object->fetch($id) >= 0) {
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
+		print '</div>';	// End table
 		print '</div>';
 
 		print '<br><br>';
@@ -454,7 +457,7 @@ if ($object->fetch($id) >= 0) {
 	$sql  = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.statut, mc.date_envoi, mc.tms,";
 	$sql .= " mc.source_url, mc.source_id, mc.source_type, mc.error_text";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
-	$sql .= " WHERE mc.fk_mailing=".$object->id;
+	$sql .= " WHERE mc.fk_mailing=".((int) $object->id);
 	$asearchcriteriahasbeenset = 0;
 	if ($search_lastname) {
 		$sql .= natural_search("mc.lastname", $search_lastname);
@@ -535,7 +538,7 @@ if ($object->fetch($id) >= 0) {
 
 		$morehtmlcenter = '';
 		if ($allowaddtarget) {
-			$morehtmlcenter = '<span class="opacitymedium">'.$langs->trans("ToClearAllRecipientsClickHere").'</span> <a href="'.$_SERVER["PHP_SELF"].'?clearlist=1&id='.$object->id.'" class="button reposition smallpaddingimp">'.$langs->trans("TargetsReset").'</a>';
+			$morehtmlcenter = '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ToClearAllRecipientsClickHere").'</span> <a href="'.$_SERVER["PHP_SELF"].'?clearlist=1&id='.$object->id.'" class="button reposition smallpaddingimp">'.$langs->trans("TargetsReset").'</a>';
 		}
 		$morehtmlcenter .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?exportcsv=1&id='.$object->id.'">'.$langs->trans("Download").'</a>';
 
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index 9051ebfa921..79e25c83385 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -181,7 +181,7 @@ class AdvanceTargetingMailing extends CommonObject
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error++; $this->errors[] = "Error ".$this->db->lasterror();
@@ -230,7 +230,7 @@ class AdvanceTargetingMailing extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."advtargetemailing as t";
 		$sql .= " WHERE t.rowid = ".((int) $id);
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($this->db->num_rows($resql)) {
@@ -289,7 +289,7 @@ class AdvanceTargetingMailing extends CommonObject
 			$sql .= " WHERE t.fk_element = ".((int) $this->fk_element)." AND type_element = 'mailing'";
 		}
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($this->db->num_rows($resql)) {
@@ -352,7 +352,7 @@ class AdvanceTargetingMailing extends CommonObject
 			$sql .= " WHERE t.fk_element = ".((int) $this->fk_element)." AND type_element = '".$this->db->escape($type_element)."'";
 		}
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($this->db->num_rows($resql)) {
@@ -422,7 +422,7 @@ class AdvanceTargetingMailing extends CommonObject
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$this->db->begin();
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error++;
@@ -600,31 +600,31 @@ class AdvanceTargetingMailing extends CommonObject
 					if (($extrafields->attributes[$elementtype]['type'][$key] == 'varchar') ||
 						($extrafields->attributes[$elementtype]['type'][$key] == 'text')) {
 						if (!empty($arrayquery['options_'.$key])) {
-							$sqlwhere[] = " (te.".$key." LIKE '".$this->db->escape($arrayquery['options_'.$key])."')";
+							$sqlwhere[] = " (te.".$key." LIKE '".$this->db->escape($arrayquery["options_".$key])."')";
 						}
 					} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'int') ||
 						($extrafields->attributes[$elementtype]['type'][$key] == 'double')) {
 						if (!empty($arrayquery['options_'.$key.'_max'])) {
-							$sqlwhere[] = " (te.".$key." >= ".$arrayquery['options_'.$key.'_max']." AND te.".$key." <= ".$arrayquery['options_'.$key.'_min'].")";
+							$sqlwhere[] = " (te.".$key." >= ".((float) $arrayquery["options_".$key."_max"])." AND te.".$key." <= ".((float) $arrayquery["options_".$key.'_min']).")";
 						}
 					} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'date') ||
 						($extrafields->attributes[$elementtype]['type'][$key] == 'datetime')) {
 						if (!empty($arrayquery['options_'.$key.'_end_dt'])) {
-							$sqlwhere[] = " (te.".$key." >= '".$this->db->idate($arrayquery['options_'.$key.'_st_dt'])."' AND te.".$key." <= '".$this->db->idate($arrayquery['options_'.$key.'_end_dt'])."')";
+							$sqlwhere[] = " (te.".$key." >= '".$this->db->idate($arrayquery["options_".$key."_st_dt"])."' AND te.".$key." <= '".$this->db->idate($arrayquery["options_".$key."_end_dt"])."')";
 						}
 					} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'boolean') {
 						if ($arrayquery['options_'.$key] != '') {
-							$sqlwhere[] = " (te.".$key." = ".((int) $arrayquery['options_'.$key]).")";
+							$sqlwhere[] = " (te.".$key." = ".((int) $arrayquery["options_".$key]).")";
 						}
 					} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'link') {
 						if ($arrayquery['options_'.$key] > 0) {
-							$sqlwhere[]= " (te.".$key." = ".((int) $arrayquery['options_'.$key]).")";
+							$sqlwhere[]= " (te.".$key." = ".((int) $arrayquery["options_".$key]).")";
 						}
 					} else {
 						if (is_array($arrayquery['options_'.$key])) {
-							$sqlwhere[] = " (te.".$key." IN (".$this->db->sanitize("'".implode("','", $arrayquery['options_'.$key])."'", 1)."))";
+							$sqlwhere[] = " (te.".$key." IN (".$this->db->sanitize("'".implode("','", $arrayquery["options_".$key])."'", 1)."))";
 						} elseif (!empty($arrayquery['options_'.$key])) {
-							$sqlwhere[] = " (te.".$key." LIKE '".$this->db->escape($arrayquery['options_'.$key])."')";
+							$sqlwhere[] = " (te.".$key." LIKE '".$this->db->escape($arrayquery["options_".$key])."')";
 						}
 					}
 				}
@@ -636,7 +636,7 @@ class AdvanceTargetingMailing extends CommonObject
 		}
 
 
-		dol_syslog(get_class($this)."::query_thirdparty sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::query_thirdparty", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$this->thirdparty_lines = array();
@@ -743,31 +743,31 @@ class AdvanceTargetingMailing extends CommonObject
 					if (($extrafields->attributes[$elementtype]['type'][$key] == 'varchar') ||
 					($extrafields->attributes[$elementtype]['type'][$key] == 'text')) {
 						if (!empty($arrayquery['options_'.$key.'_cnct'])) {
-							$sqlwhere[] = " (te.".$key." LIKE '".$this->db->escape($arrayquery['options_'.$key.'_cnct'])."')";
+							$sqlwhere[] = " (te.".$key." LIKE '".$this->db->escape($arrayquery["options_".$key."_cnct"])."')";
 						}
 					} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'int') ||
 						($extrafields->attributes[$elementtype]['type'][$key] == 'double')) {
 						if (!empty($arrayquery['options_'.$key.'_max_cnct'])) {
-							$sqlwhere[] = " (te.".$key." >= ".$arrayquery['options_'.$key.'_max_cnct']." AND te.".$key." <= ".$arrayquery['options_'.$key.'_min_cnct'].")";
+							$sqlwhere[] = " (te.".$key." >= ".((float) $arrayquery["options_".$key."_max_cnct"])." AND te.".$key." <= ".((float) $arrayquery["options_".$key."_min_cnct"]).")";
 						}
 					} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'date') ||
 					($extrafields->attributes[$elementtype]['type'][$key] == 'datetime')) {
 						if (!empty($arrayquery['options_'.$key.'_end_dt_cnct'])) {
-							$sqlwhere[] = " (te.".$key." >= '".$this->db->idate($arrayquery['options_'.$key.'_st_dt_cnct'])."' AND te.".$key." <= '".$this->db->idate($arrayquery['options_'.$key.'_end_dt_cnct'])."')";
+							$sqlwhere[] = " (te.".$key." >= '".$this->db->idate($arrayquery["options_".$key."_st_dt_cnct"])."' AND te.".$key." <= '".$this->db->idate($arrayquery["options_".$key."_end_dt_cnct"])."')";
 						}
 					} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'boolean') {
 						if ($arrayquery['options_'.$key.'_cnct'] != '') {
 							if ($arrayquery['options_'.$key.'_cnct'] == 0) {
-								$sqlwhere[] = " (te.".$key." = ".$arrayquery['options_'.$key.'_cnct']." OR ((te.".$key." IS NULL) AND (te.fk_object IS NOT NULL)))";
+								$sqlwhere[] = " (te.".$key." = ".((int) $arrayquery["options_".$key."_cnct"])." OR ((te.".$key." IS NULL) AND (te.fk_object IS NOT NULL)))";
 							} else {
-								$sqlwhere[] = " (te.".$key." = ".$arrayquery['options_'.$key.'_cnct'].")";
+								$sqlwhere[] = " (te.".$key." = ".((int) $arrayquery["options_".$key."_cnct"]).")";
 							}
 						}
 					} else {
 						if (is_array($arrayquery['options_'.$key.'_cnct'])) {
-							$sqlwhere[] = " (te.".$key." IN (".$this->db->sanitize("'".implode("','", $arrayquery['options_'.$key.'_cnct'])."'", 1)."))";
+							$sqlwhere[] = " (te.".$key." IN (".$this->db->sanitize("'".implode("','", $arrayquery["options_".$key."_cnct"])."'", 1)."))";
 						} elseif (!empty($arrayquery['options_'.$key.'_cnct'])) {
-							$sqlwhere[] = " (te.".$key." LIKE '".$this->db->escape($arrayquery['options_'.$key.'_cnct'])."')";
+							$sqlwhere[] = " (te.".$key." LIKE '".$this->db->escape($arrayquery["options_".$key."_cnct"])."')";
 						}
 					}
 				}
@@ -850,22 +850,22 @@ class AdvanceTargetingMailing extends CommonObject
 							} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'int') ||
 								($extrafields->attributes[$elementtype]['type'][$key] == 'double')) {
 								if (!empty($arrayquery['options_'.$key.'_max'])) {
-									$sqlwhere[] = " (tse.".$key." >= ".$arrayquery['options_'.$key.'_max']." AND tse.".$key." <= ".$arrayquery['options_'.$key.'_min'].")";
+									$sqlwhere[] = " (tse.".$key." >= ".((float) $arrayquery["options_".$key."_max"])." AND tse.".$key." <= ".((float) $arrayquery["options_".$key."_min"]).")";
 								}
 							} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'date') ||
 								($extrafields->attributes[$elementtype]['type'][$key] == 'datetime')) {
 								if (!empty($arrayquery['options_'.$key.'_end_dt'])) {
-									$sqlwhere[] = " (tse.".$key." >= '".$this->db->idate($arrayquery['options_'.$key.'_st_dt'])."' AND tse.".$key." <= '".$this->db->idate($arrayquery['options_'.$key.'_end_dt'])."')";
+									$sqlwhere[] = " (tse.".$key." >= '".$this->db->idate($arrayquery["options_".$key."_st_dt"])."' AND tse.".$key." <= '".$this->db->idate($arrayquery["options_".$key."_end_dt"])."')";
 								}
 							} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'boolean') {
 								if ($arrayquery['options_'.$key] != '') {
-									$sqlwhere[] = " (tse.".$key." = ".$arrayquery['options_'.$key].")";
+									$sqlwhere[] = " (tse.".$key." = ".((int) $arrayquery["options_".$key]).")";
 								}
 							} else {
 								if (is_array($arrayquery['options_'.$key])) {
-									$sqlwhere[] = " (tse.".$key." IN (".$this->db->sanitize("'".implode("','", $arrayquery['options_'.$key])."'", 1)."))";
+									$sqlwhere[] = " (tse.".$key." IN (".$this->db->sanitize("'".implode("','", $arrayquery["options_".$key])."'", 1)."))";
 								} elseif (!empty($arrayquery['options_'.$key])) {
-									$sqlwhere[] = " (tse.".$key." LIKE '".$this->db->escape($arrayquery['options_'.$key])."')";
+									$sqlwhere[] = " (tse.".$key." LIKE '".$this->db->escape($arrayquery["options_".$key])."')";
 								}
 							}
 						}
@@ -877,7 +877,7 @@ class AdvanceTargetingMailing extends CommonObject
 			}
 		}
 
-		dol_syslog(get_class($this)."::query_contact sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::query_contact", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$this->contact_lines = array();
diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
index 12684e5f873..f4295fa6583 100644
--- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
@@ -230,29 +230,29 @@ class FormAdvTargetEmailing extends Form
 			$InfoFieldList = explode(":", $param_list [0]);
 
 			// 0 1 : tableName
-			// 1 2 : label field name Nom du champ contenant le libelle
+			// 1 2 : label field name 	Name of field that contains the label
 			// 2 3 : key fields name (if differ of rowid)
 			// 3 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
 
 			$keyList = 'rowid';
 
 			if (count($InfoFieldList) >= 3) {
-				if (strpos($InfoFieldList [3], 'extra.') !== false) {
-					$keyList = 'main.'.$InfoFieldList [2].' as rowid';
+				if (strpos($InfoFieldList[3], 'extra.') !== false) {
+					$keyList = 'main.'.$InfoFieldList[2].' as rowid';
 				} else {
-					$keyList = $InfoFieldList [2].' as rowid';
+					$keyList = $InfoFieldList[2].' as rowid';
 				}
 			}
 
-			$sql = 'SELECT '.$keyList.', '.$InfoFieldList [1];
-			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList [0];
-			if (!empty($InfoFieldList [3])) {
+			$sql = "SELECT ".$keyList.", ".$InfoFieldList[1];
+			$sql .= " FROM ".MAIN_DB_PREFIX.$InfoFieldList[0];
+			if (!empty($InfoFieldList[3])) {
 				// We have to join on extrafield table
-				if (strpos($InfoFieldList [3], 'extra') !== false) {
-					$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList [0].'_extrafields as extra';
-					$sql .= ' WHERE  extra.fk_object=main.'.$InfoFieldList [2].' AND '.$InfoFieldList [3];
+				if (strpos($InfoFieldList[3], 'extra') !== false) {
+					$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+					$sql .= " WHERE extra.fk_object=main.".$InfoFieldList[2]." AND ".$InfoFieldList[3];
 				} else {
-					$sql .= ' WHERE '.$InfoFieldList [3];
+					$sql .= " WHERE ".$InfoFieldList[3];
 				}
 			}
 			if (!empty($InfoFieldList[1])) {
@@ -267,7 +267,7 @@ class FormAdvTargetEmailing extends Form
 				if ($num) {
 					while ($i < $num) {
 						$obj = $this->db->fetch_object($resql);
-						$labeltoshow = dol_trunc($obj->$InfoFieldList [1], 90);
+						$labeltoshow = dol_trunc($obj->$InfoFieldList[1], 90);
 						$options_array[$obj->rowid] = $labeltoshow;
 						$i++;
 					}
@@ -304,7 +304,7 @@ class FormAdvTargetEmailing extends Form
 			if ($num) {
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
-					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+					// If a translation exists, we use it, else we use the default label
 					$label = ($langs->trans("Civility".$obj->code) != "Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->civilite != '-' ? $obj->civilite : ''));
 
 					$options_array[$obj->code] = $label;
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index d281fcb1a3a..8050b85f180 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -228,7 +228,7 @@ class Mailing extends CommonObject
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing";
 		$sql .= " (date_creat, fk_user_creat, entity)";
-		$sql .= " VALUES ('".$this->db->idate($now)."', ".$user->id.", ".$conf->entity.")";
+		$sql .= " VALUES ('".$this->db->idate($now)."', ".((int) $user->id).", ".((int) $conf->entity).")";
 
 		if (!$this->title) {
 			$this->title = $langs->trans("NoTitle");
@@ -490,7 +490,7 @@ class Mailing extends CommonObject
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing ";
 		$sql .= " SET statut = 1, date_valid = '".$this->db->idate($now)."', fk_user_valid=".$user->id;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog("Mailing::valid", LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -555,7 +555,7 @@ class Mailing extends CommonObject
 	{
 		// phpcs:enable
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles";
-		$sql .= " WHERE fk_mailing = ".$this->id;
+		$sql .= " WHERE fk_mailing = ".((int) $this->id);
 
 		dol_syslog("Mailing::delete_targets", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -582,7 +582,7 @@ class Mailing extends CommonObject
 		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
 		$sql .= " SET statut = 0";
-		$sql .= " WHERE fk_mailing = ".$this->id;
+		$sql .= " WHERE fk_mailing = ".((int) $this->id);
 
 		dol_syslog("Mailing::reset_targets_status", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -604,7 +604,7 @@ class Mailing extends CommonObject
 	public function countNbOfTargets($mode)
 	{
 		$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
-		$sql .= " WHERE fk_mailing = ".$this->id;
+		$sql .= " WHERE fk_mailing = ".((int) $this->id);
 		if ($mode == 'alreadysent') {
 			$sql .= " AND statut <> 0";
 		} elseif ($mode == 'alreadysentok') {
@@ -638,7 +638,7 @@ class Mailing extends CommonObject
 	public function refreshNbOfTargets()
 	{
 		$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
-		$sql .= " WHERE fk_mailing = ".$this->id;
+		$sql .= " WHERE fk_mailing = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -647,7 +647,7 @@ class Mailing extends CommonObject
 				$nbforupdate = $obj->nb;
 
 				$sql = 'UPDATE '.MAIN_DB_PREFIX.'mailing SET nbemail = '.((int) $nbforupdate);
-				$sql .= ' WHERE rowid = '.$this->id;
+				$sql .= ' WHERE rowid = '.((int) $this->id);
 
 				$resqlupdate = $this->db->query($sql);
 				if (! $resqlupdate) {
@@ -754,7 +754,7 @@ class Mailing extends CommonObject
 	/**
 	 *  Return label of status of emailing (draft, validated, ...)
 	 *
-	 *  @param	int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
+	 *  @param  int		$mode           0=Long label, 1=Short label, 2=Picto+Short label, 3=Picto, 4=Picto+Short label, 5=Short label+Picto, 6=Picto+Long label, 7=Very short label+Picto
 	 *  @return string        			Label
 	 */
 	public function getLibStatut($mode = 0)
@@ -764,10 +764,10 @@ class Mailing extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Renvoi le libelle d'un statut donne
+	 *  Return the label of a given status
 	 *
 	 *  @param	int		$status        	Id status
-	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @param  int		$mode           0=Long label, 1=Short label, 2=Picto+Short label, 3=Picto, 4=Picto+Short label, 5=Short label+Picto, 6=Picto+Long label, 7=Very short label+Picto
 	 *  @return string        			Label
 	 */
 	public function LibStatut($status, $mode = 0)
@@ -776,8 +776,8 @@ class Mailing extends CommonObject
 		global $langs;
 		$langs->load("mailing");
 
-		$labelStatus = $langs->trans($this->statuts[$status]);
-		$labelStatusShort = $langs->trans($this->statuts[$status]);
+		$labelStatus = $langs->transnoentitiesnoconv($this->statuts[$status]);
+		$labelStatusShort = $langs->transnoentitiesnoconv($this->statuts[$status]);
 
 		$statusType = 'status'.$status;
 		if ($status == 2) {
@@ -792,11 +792,11 @@ class Mailing extends CommonObject
 
 
 	/**
-	 *  Renvoi le libelle d'un statut donne
+	 *  Return the label of a given status  of a recipient
 	 *  TODO Add class mailin_target.class.php
 	 *
 	 *  @param	int		$status        	Id status
-	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @param  int		$mode           0=Long label, 1=Short label, 2=Picto+Short label, 3=Picto, 4=Picto+Short label, 5=Short label+Picto, 6=Picto+Long label, 7=Very short label+Picto
 	 *  @param	string	$desc			Desc error
 	 *  @return string        			Label
 	 */
@@ -808,16 +808,16 @@ class Mailing extends CommonObject
 		$labelStatus = array();
 		$labelStatusShort = array();
 
-		$labelStatus[-1] = $langs->trans('MailingStatusError');
-		$labelStatus[0] = $langs->trans('MailingStatusNotSent');
-		$labelStatus[1] = $langs->trans('MailingStatusSent');
-		$labelStatus[2] = $langs->trans('MailingStatusRead');
-		$labelStatus[3] = $langs->trans('MailingStatusNotContact');
-		$labelStatusShort[-1] = $langs->trans('MailingStatusError');
-		$labelStatusShort[0] = $langs->trans('MailingStatusNotSent');
-		$labelStatusShort[1] = $langs->trans('MailingStatusSent');
-		$labelStatusShort[2] = $langs->trans('MailingStatusRead');
-		$labelStatusShort[3] = $langs->trans('MailingStatusNotContact');
+		$labelStatus[-1] = $langs->transnoentitiesnoconv('MailingStatusError');
+		$labelStatus[0] = $langs->transnoentitiesnoconv('MailingStatusNotSent');
+		$labelStatus[1] = $langs->transnoentitiesnoconv('MailingStatusSent');
+		$labelStatus[2] = $langs->transnoentitiesnoconv('MailingStatusRead');
+		$labelStatus[3] = $langs->transnoentitiesnoconv('MailingStatusNotContact');
+		$labelStatusShort[-1] = $langs->transnoentitiesnoconv('MailingStatusError');
+		$labelStatusShort[0] = $langs->transnoentitiesnoconv('MailingStatusNotSent');
+		$labelStatusShort[1] = $langs->transnoentitiesnoconv('MailingStatusSent');
+		$labelStatusShort[2] = $langs->transnoentitiesnoconv('MailingStatusRead');
+		$labelStatusShort[3] = $langs->transnoentitiesnoconv('MailingStatusNotContact');
 
 		$statusType = 'status'.$status;
 		if ($status == -1) {
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index 01abc1e5ef1..bd1a83e9959 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -141,8 +141,7 @@ if (is_resource($handle)) {
 print "</table><br>";
 
 
-//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 /*
@@ -184,7 +183,7 @@ if ($result) {
 			$i++;
 		}
 	} else {
-		print '<tr><td class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		print '<tr><td><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 	print "</table></div><br>";
 	$db->free($result);
@@ -193,7 +192,7 @@ if ($result) {
 }
 
 
-print '</div></div></div>';
+print '</div></div>';
 
 
 $parameters = array('user' => $user);
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 94db62d7b19..be458d41fe3 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -28,8 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
 // Load translation files required by the page
 $langs->load("mails");
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $optioncss = GETPOST('optioncss', 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index fb10c6435af..8da9a17ebb2 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -121,7 +121,7 @@ if ($_socid > 0) {
 
 	print dol_get_fiche_end();
 
-	print '<div align="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
+	print $form->buttonsSaveCancel("Save", '');
 
 	print "</form>";
 
@@ -134,7 +134,7 @@ if ($_socid > 0) {
 	 */
 	$sql  = "SELECT rc.rowid,rc.price_level, rc.datec as dc, u.rowid as uid, u.login";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe_prices as rc, ".MAIN_DB_PREFIX."user as u";
-	$sql .= " WHERE rc.fk_soc =".$objsoc->id;
+	$sql .= " WHERE rc.fk_soc = ".((int) $objsoc->id);
 	$sql .= " AND u.rowid = rc.fk_user_author";
 	$sql .= " ORDER BY rc.datec DESC";
 
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index c96f24760c0..746075ab51e 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1,12 +1,12 @@
 <?php
-/* Copyright (C) 2001-2007  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+/* Copyright (C) 2001-2007 Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2014 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>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  * Copyright (C) 2010-2016 Juanjo Menent         <jmenent@2byte.es>
- * Copyright (C) 2010-2018 Philippe Grand        <philippe.grand@atoo-net.com>
+ * 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>
@@ -121,7 +121,7 @@ $usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->
 $usercancreateorder = $user->rights->commande->creer;
 $usercancreateinvoice = $user->rights->facture->creer;
 $usercancreatecontract = $user->rights->contrat->creer;
-$usercancreateintervention = $user->rights->ficheinter->creer;
+$usercancreateintervention = $user->hasRight('ficheinter', 'creer');
 $usercancreatepurchaseorder = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer);
 
 $permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php
@@ -147,8 +147,23 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/comm/propal/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.'/comm/propal/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
 	if ($cancel) {
-		if (!empty($backtopage)) {
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -260,10 +275,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)) {
@@ -384,8 +399,8 @@ if (empty($reshook)) {
 					$object->cond_reglement_id = GETPOST('cond_reglement_id');
 					$object->mode_reglement_id = GETPOST('mode_reglement_id');
 					$object->fk_account = GETPOST('fk_account', 'int');
+					$object->remise_absolue = price2num(GETPOST('remise_absolue'), 'MU', 2);	// deprecated
 					$object->remise_percent = price2num(GETPOST('remise_percent'), '', 2);
-					$object->remise_absolue = price2num(GETPOST('remise_absolue'), 'MU', 2);
 					$object->socid = GETPOST('socid', 'int');
 					$object->contact_id = GETPOST('contactid', 'int');
 					$object->fk_project = GETPOST('projectid', 'int');
@@ -802,7 +817,7 @@ if (empty($reshook)) {
 				}
 			}
 		}
-	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'alpha') && GETPOST('vatforalllines', 'alpha') !== '') {
+	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'alpha') && GETPOST('vatforalllines', 'alpha') !== '' && $usercancreate) {
 		// Define vat_rate
 		$vat_rate = (GETPOST('vatforalllines') ? GETPOST('vatforalllines') : 0);
 		$vat_rate = str_replace('*', '', $vat_rate);
@@ -820,7 +835,7 @@ if (empty($reshook)) {
 		$prod_entry_mode = GETPOST('prod_entry_mode');
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
-			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
+			$tva_tx = (GETPOST('tva_tx') ? price2num(GETPOST('tva_tx')) : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
@@ -1427,7 +1442,7 @@ if (empty($reshook)) {
 	}
 
 	// Actions to build doc
-	$upload_dir = $conf->propal->multidir_output[$object->entity];
+	$upload_dir = !empty($conf->propal->multidir_output[$object->entity])?$conf->propal->multidir_output[$object->entity]:$conf->propal->dir_output;
 	$permissiontoadd = $usercancreate;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
@@ -1507,8 +1522,8 @@ if ($action == 'create') {
 
 			$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
 			$mode_reglement_id 	= (!empty($objectsrc->mode_reglement_id) ? $objectsrc->mode_reglement_id : (!empty($soc->mode_reglement_id) ? $soc->mode_reglement_id : 0));
+			$remise_absolue 	= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));	// deprecated
 			$remise_percent 	= (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_percent) ? $soc->remise_percent : 0));
-			$remise_absolue 	= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
 			$warehouse_id       = (!empty($objectsrc->warehouse_id) ? $objectsrc->warehouse_id : (!empty($soc->warehouse_id) ? $soc->warehouse_id : 0));
 			$dateinvoice = (empty($dateinvoice) ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $dateinvoice);
 
@@ -1544,8 +1559,6 @@ if ($action == 'create') {
 		}
 	}
 
-	$object = new Propal($db);
-
 	print '<form name="addprop" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
@@ -1571,6 +1584,7 @@ if ($action == 'create') {
 	// Third party
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('Customer').'</td>';
+	$shipping_method_id = 0;
 	if ($socid > 0) {
 		print '<td>';
 		print $soc->getNomUrl(1);
@@ -1632,7 +1646,7 @@ if ($action == 'create') {
 	// Terms of payment
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
 	print img_picto('', 'paiment');
-	$form->select_conditions_paiements((GETPOSTISSET('cond_reglement_id') ? 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);
 	print '</td></tr>';
 
 	// Mode of payment
@@ -1687,7 +1701,7 @@ if ($action == 'create') {
 	// Delivery date (or manufacturing)
 	print '<tr><td>'.$langs->trans("DeliveryDate").'</td>';
 	print '<td>';
-	if ($conf->global->DATE_LIVRAISON_WEEK_DELAY != "") {
+	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);
 		$smonth = date("m", $tmpdte);
@@ -1724,7 +1738,7 @@ if ($action == 'create') {
 	print '<td>';
 	print img_picto('', 'pdf').'&ensp;';
 	$liste = ModelePDFPropales::liste_modeles($db);
-	$preselected = ($conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT ? $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT : $conf->global->PROPALE_ADDON_PDF);
+	$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);
 	print "</td></tr>";
 
@@ -1741,7 +1755,7 @@ if ($action == 'create') {
 	print '<tr>';
 	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 	print '<td valign="top">';
-	$note_public = $object->getDefaultCreateValueFor('note_public', (is_object($objectsrc) ? $objectsrc->note_public : null));
+	$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);
 
@@ -1765,7 +1779,7 @@ if ($action == 'create') {
 		// TODO for compatibility
 		if ($origin == 'contrat') {
 			// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
-			$objectsrc->remise_absolue = $remise_absolue;
+			$objectsrc->remise_absolue = $remise_absolue;	// deprecated
 			$objectsrc->remise_percent = $remise_percent;
 			$objectsrc->update_price(1, - 1, 1);
 		}
@@ -1862,11 +1876,8 @@ if ($action == 'create') {
 	print dol_get_fiche_end();
 
 	$langs->load("bills");
-	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-	print '</div>';
+
+	print $form->buttonsSaveCancel("CreateDraft");
 
 	print "</form>";
 
@@ -1962,6 +1973,21 @@ if ($action == 'create') {
 			$text .= $notify->confirmMessage('PROPAL_VALIDATE', $object->socid, $object);
 		}
 
+		// mandatoryPeriod
+		$nbMandated = 0;
+		foreach ($object->lines as $line) {
+			$res = $line->fetch_product();
+			if ($res  > 0  ) {
+				if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end) )) {
+					$nbMandated++;
+					break;
+				}
+			}
+		}
+		if ($nbMandated > 0) {
+			$text .= '<div><span class="clearboth nowraponall warning">'.$langs->trans("mandatoryPeriodNeedTobeSetMsgValidate").'</span></div>';
+		}
+
 		if (!$error) {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateProp'), $text, 'confirm_validate', '', 0, 1);
 		}
@@ -1989,17 +2015,17 @@ if ($action == 'create') {
 	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', null, null, '', 1);
 	// Thirdparty
-	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
+	$morehtmlref .= '<br><span class="hideonsmartphone">'.$langs->trans('ThirdParty').' : </span>'.$object->thirdparty->getNomUrl(1, 'customer');
 	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 		$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)) {
 		$langs->load("projects");
-		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		$morehtmlref .= '<br><span class="paddingrightonly">'.$langs->trans('Project').'</span>';
 		if ($usercancreate) {
 			if ($action != 'classify') {
-				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				$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);
@@ -2016,9 +2042,10 @@ if ($action == 'create') {
 			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>';
+				$morehtmlref .= ': '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
@@ -2052,6 +2079,8 @@ if ($action == 'create') {
 	$absolute_discount = price2num($absolute_discount, 'MT');
 	$absolute_creditnote = price2num($absolute_creditnote, 'MT');
 
+	$caneditfield = ($object->statut != Propal::STATUS_SIGNED && $object->statut != Propal::STATUS_BILLED);
+
 	$thirdparty = $soc;
 	$discount_type = 0;
 	$backtopage = urlencode($_SERVER["PHP_SELF"].'?id='.$object->id);
@@ -2065,17 +2094,17 @@ if ($action == 'create') {
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DatePropal');
 	print '</td>';
-	if ($action != 'editdate' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+	if ($action != 'editdate' && $usercancreate && $caneditfield) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td class="valuefield">';
-	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editdate' && $usercancreate) {
+	if ($action == 'editdate' && $usercancreate && $caneditfield) {
 		print '<form name="editdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setdate">';
 		print $form->selectDate($object->date, 're', '', '', 0, "editdate");
-		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
 		if ($object->date) {
@@ -2092,17 +2121,17 @@ if ($action == 'create') {
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DateEndPropal');
 	print '</td>';
-	if ($action != 'editecheance' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editecheance&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+	if ($action != 'editecheance' && $usercancreate && $caneditfield) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editecheance&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td class="valuefield">';
-	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editecheance' && $usercancreate) {
+	if ($action == 'editecheance' && $usercancreate && $caneditfield) {
 		print '<form name="editecheance" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setecheance">';
 		print $form->selectDate($object->fin_validite, 'ech', '', '', '', "editecheance");
-		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
 		if (!empty($object->fin_validite)) {
@@ -2122,12 +2151,12 @@ if ($action == 'create') {
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentConditionsShort');
 	print '</td>';
-	if ($action != 'editconditions' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'), 1).'</a></td>';
+	if ($action != 'editconditions' && $usercancreate && $caneditfield) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td class="valuefield">';
-	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editconditions' && $usercancreate) {
+	if ($action == 'editconditions' && $usercancreate && $caneditfield) {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
 	} else {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
@@ -2141,12 +2170,12 @@ if ($action == 'create') {
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentMode');
 	print '</td>';
-	if ($action != 'editmode' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'), 1).'</a></td>';
+	if ($action != 'editmode' && $usercancreate && $caneditfield) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td class="valuefieldcreate">';
-	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editmode' && $usercancreate) {
+	if ($action == 'editmode' && $usercancreate && $caneditfield) {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
 	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
@@ -2156,26 +2185,27 @@ if ($action == 'create') {
 	// Delivery date
 	$langs->load('deliveries');
 	print '<tr><td>';
-	print $form->editfieldkey($langs->trans('DeliveryDate'), 'date_livraison', $object->delivery_date, $object, $usercancreate, 'datepicker');
+	print $form->editfieldkey($langs->trans('DeliveryDate'), 'date_livraison', $object->delivery_date, $object, $usercancreate && $caneditfield, 'datepicker');
 	print '</td><td class="valuefield">';
-	print $form->editfieldval($langs->trans('DeliveryDate'), 'date_livraison', $object->delivery_date, $object, $usercancreate, 'datepicker');
+	print $form->editfieldval($langs->trans('DeliveryDate'), 'date_livraison', $object->delivery_date, $object, $usercancreate && $caneditfield, 'datepicker');
 	print '</td>';
 	print '</tr>';
 
 	// Delivery delay
 	print '<tr class="fielddeliverydelay"><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
-	print $langs->trans('AvailabilityPeriod');
 	if (!empty($conf->commande->enabled)) {
-		print ' ('.$langs->trans('AfterOrder').')';
+		print $form->textwithpicto($langs->trans('AvailabilityPeriod'), $langs->trans('AvailabilityPeriod').' ('.$langs->trans('AfterOrder').')');
+	} else {
+		print $langs->trans('AvailabilityPeriod');
 	}
 	print '</td>';
-	if ($action != 'editavailability' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editavailability&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1).'</a></td>';
+	if ($action != 'editavailability' && $usercancreate && $caneditfield) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editavailability&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td class="valuefield">';
-	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editavailability' && $usercancreate) {
+	if ($action == 'editavailability' && $usercancreate && $caneditfield) {
 		$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'availability_id', 1);
 	} else {
 		$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'none', 1);
@@ -2190,12 +2220,12 @@ if ($action == 'create') {
 		print '<table width="100%" class="nobordernopadding"><tr><td>';
 		print $langs->trans('SendingMethod');
 		print '</td>';
-		if ($action != 'editshippingmethod' && $usercancreate) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'), 1).'</a></td>';
+		if ($action != 'editshippingmethod' && $usercancreate && $caneditfield) {
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td class="valuefield">';
-		if ($action == 'editshippingmethod' && $usercancreate) {
+		if ($action == 'editshippingmethod' && $usercancreate && $caneditfield) {
 			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
 		} else {
 			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'none');
@@ -2227,12 +2257,12 @@ if ($action == 'create') {
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('Source');
 	print '</td>';
-	if ($action != 'editdemandreason' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdemandreason&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDemandReason'), 1).'</a></td>';
+	if ($action != 'editdemandreason' && $usercancreate) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdemandreason&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDemandReason'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td class="valuefield">';
-	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editdemandreason' && $usercancreate) {
+	if ($action == 'editdemandreason' && $usercancreate) {
 		$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'demand_reason_id', 1);
 	} else {
 		$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'none');
@@ -2249,7 +2279,7 @@ if ($action == 'create') {
 		print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
 		print '</td>';
 		if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_DRAFT && $usercancreate) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+			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 class="valuefield">';
@@ -2269,7 +2299,7 @@ if ($action == 'create') {
 			print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
 			print '</td>';
 			if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency && $usercancreate) {
-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+				print '<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 class="valuefield">';
@@ -2310,7 +2340,7 @@ if ($action == 'create') {
 		print $langs->trans('BankAccount');
 		print '</td>';
 		if ($action != 'editbankaccount' && $usercancreate) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+			print '<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 class="valuefield">';
@@ -2329,13 +2359,13 @@ if ($action == 'create') {
 	if ($totalWeight) {
 		print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
 		print '<td class="valuefield">';
-		print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
+		print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no', 0);
 		print '</td></tr>';
 	}
 	if ($totalVolume) {
 		print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
 		print '<td class="valuefield">';
-		print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
+		print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no', 0);
 		print '</td></tr>';
 	}
 
@@ -2345,18 +2375,18 @@ if ($action == 'create') {
 		print '<table width="100%" class="nobordernopadding"><tr><td>';
 		print $langs->trans('IncotermLabel');
 		print '<td><td class="right">';
-		if ($usercancreate) {
-			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/propal/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+		if ($action != 'editincoterm' && $usercancreate && $caneditfield) {
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/propal/card.php?id='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
 		} else {
 			print '&nbsp;';
 		}
 		print '</td></tr></table>';
 		print '</td>';
 		print '<td class="valuefield">';
-		if ($action != 'editincoterm') {
-			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-		} else {
+		if ($action == 'editincoterm' && $usercancreate && $caneditfield) {
 			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
+		} else {
+			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 		}
 		print '</td></tr>';
 	}
@@ -2368,7 +2398,6 @@ if ($action == 'create') {
 
 	print '</div>';
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border tableforfield centpercent">';
@@ -2427,7 +2456,6 @@ if ($action == 'create') {
 		$formmargin->displayMarginInfos($object);
 	}
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
@@ -2531,8 +2559,8 @@ if ($action == 'create') {
 				}
 
 				// ReOpen
-				if (($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED) && $usercanclose) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen').'"';
+				if ( (( ! empty($conf->global->PROPAL_REOPEN_UNSIGNED_ONLY) && $object->statut == Propal::STATUS_NOTSIGNED) || (empty($conf->global->PROPAL_REOPEN_UNSIGNED_ONLY) && ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED))) && $usercanclose) {
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen').'"';
 					print '>'.$langs->trans('ReOpen').'</a>';
 				}
 
@@ -2540,7 +2568,7 @@ if ($action == 'create') {
 				if (empty($user->socid)) {
 					if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED || !empty($conf->global->PROPOSAL_SENDBYEMAIL_FOR_ALL_STATUS)) {
 						if ($usercansend) {
-							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
+							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
 						} else {
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('SendMail').'</a>';
 						}
@@ -2581,7 +2609,7 @@ if ($action == 'create') {
 				}
 
 				// Create an invoice and classify billed
-				if ($object->statut == Propal::STATUS_SIGNED) {
+				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>';
 					}
@@ -2589,7 +2617,7 @@ if ($action == 'create') {
 					$arrayofinvoiceforpropal = $object->getInvoiceArrayList();
 					if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || empty($conf->global->WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED)) {
 						if ($usercanclose) {
-							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled&amp;socid='.$object->socid.'">'.$langs->trans("ClassifyBilled").'</a>';
+							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifybilled&token='.newToken().'&socid='.$object->socid.'">'.$langs->trans("ClassifyBilled").'</a>';
 						} else {
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("ClassifyBilled").'</a>';
 						}
@@ -2599,7 +2627,7 @@ if ($action == 'create') {
 				// Close as accepted/refused
 				if ($object->statut == Propal::STATUS_VALIDATED) {
 					if ($usercanclose) {
-						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=closeas'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=closeas&token='.newToken().(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
 						print '>'.$langs->trans('SetAcceptedRefused').'</a>';
 					} else {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'"';
@@ -2609,12 +2637,12 @@ if ($action == 'create') {
 
 				// Clone
 				if ($usercancreate) {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;token='.newToken().'&amp;object='.$object->element.'">'.$langs->trans("ToClone").'</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&token='.newToken().'&object='.$object->element.'">'.$langs->trans("ToClone").'</a>';
 				}
 
 				// Delete
 				if ($usercandelete) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'"';
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'"';
 					print '>'.$langs->trans('Delete').'</a>';
 				}
 			}
@@ -2652,7 +2680,7 @@ if ($action == 'create') {
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);
 
 		// Show online signature link
-		$useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok
+		$useonlinesignature = 1;
 
 		if ($object->statut != Propal::STATUS_DRAFT && $useonlinesignature) {
 			print '<br><!-- Link to sign -->';
@@ -2660,14 +2688,14 @@ if ($action == 'create') {
 			print showOnlineSignatureUrl('proposal', $object->ref).'<br>';
 		}
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
 		$somethingshown = $formactions->showactions($object, 'propal', $socid, 1);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 	// Presend form
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index e4b9a266198..f03d66bae54 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -1,7 +1,9 @@
 <?php
-/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2016   Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2020   Thibault FOUCART   		<support@ptibogxiv.net>
+/* Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2016       Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2020       Thibault FOUCART        <support@ptibogxiv.net>
+ * Copyright (C) 2022       ATM Consulting          <contact@atm-consulting.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
@@ -196,8 +198,9 @@ class Proposals extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -273,14 +276,17 @@ class Proposals extends DolibarrApi
 	/**
 	 * Get lines of a commercial proposal
 	 *
-	 * @param int   $id             Id of commercial proposal
+	 * @param int		$id				Id of commercial proposal
+	 * @param string    $sqlfilters 	Other criteria to filter answers separated by a comma. d is the alias for proposal lines table, p is the alias for product table. "Syntax example "(p.ref:like:'SO-%') and (d.date_start:<:'20220101')"
 	 *
 	 * @url	GET {id}/lines
 	 *
 	 * @return int
 	 */
-	public function getLines($id)
+	public function getLines($id, $sqlfilters = '')
 	{
+		$filters = "";
+
 		if (!DolibarrApiAccess::$user->rights->propal->lire) {
 			throw new RestException(401);
 		}
@@ -293,7 +299,16 @@ class Proposals extends DolibarrApi
 		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-		$this->propal->getLinesArray();
+
+		if (!empty($sqlfilters)) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$filters = " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$this->propal->getLinesArray($filters);
 		$result = array();
 		foreach ($this->propal->lines as $line) {
 			array_push($result, $this->_cleanObjectDatas($line));
@@ -307,7 +322,7 @@ class Proposals extends DolibarrApi
 	 * @param int   $id             Id of commercial proposal to update
 	 * @param array $request_data   Commercial proposal line data
 	 *
-	 * @url	POST {id}/lines
+	 * @url	POST {id}/line
 	 *
 	 * @return int
 	 */
@@ -367,6 +382,84 @@ class Proposals extends DolibarrApi
 		}
 	}
 
+	/**
+	 * Add lines to given commercial proposal
+	 *
+	 * @param int   $id             Id of commercial proposal to update
+	 * @param array $request_data   Commercial proposal line data
+	 *
+	 * @url	POST {id}/lines
+	 *
+	 * @return int
+	 */
+	public function postLines($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->propal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Commercial Proposal not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$errors = [];
+		$this->db->begin();
+
+		foreach ($request_data as $TData) {
+			if (empty($TData[0])) $TData = array($TData);
+
+			foreach ($TData as $lineData) {
+				$line = (object) $lineData;
+
+				$updateRes = $this->propal->addline(
+					$line->desc,
+					$line->subprice,
+					$line->qty,
+					$line->tva_tx,
+					$line->localtax1_tx,
+					$line->localtax2_tx,
+					$line->fk_product,
+					$line->remise_percent,
+					'HT',
+					0,
+					$line->info_bits,
+					$line->product_type,
+					$line->rang,
+					$line->special_code,
+					$line->fk_parent_line,
+					$line->fk_fournprice,
+					$line->pa_ht,
+					$line->label,
+					$line->date_start,
+					$line->date_end,
+					$line->array_options,
+					$line->fk_unit,
+					$line->origin,
+					$line->origin_id,
+					$line->multicurrency_subprice,
+					$line->fk_remise_except
+				);
+
+				if ($updateRes < 0) {
+					$errors['lineLabel'] = $line->label;
+					$errors['msg'] = $this->propal->errors;
+				}
+			}
+		}
+		if (empty($errors)) {
+			$this->db->commit();
+			return count($request_data);
+		} else {
+			$this->db->rollback();
+			throw new RestException(400, implode(", ", $errors));
+		}
+	}
+
 	/**
 	 * Update a line of given commercial proposal
 	 *
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 0142d0c1b7a..1c532e26147 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1,20 +1,22 @@
 <?php
-/* Copyright (C) 2002-2004 Rodolphe Quiedeville		<rodolphe@quiedeville.org>
- * Copyright (C) 2004      Eric Seigne				<eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2011 Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005      Marc Barilley			<marc@ocebo.com>
- * Copyright (C) 2005-2013 Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2006      Andre Cianfarani			<acianfa@free.fr>
- * Copyright (C) 2008      Raphael Bertrand			<raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2020 Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2010-2017 Philippe Grand			<philippe.grand@atoo-net.com>
- * Copyright (C) 2012-2014 Christophe Battarel  	<christophe.battarel@altairis.fr>
- * 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) 2018-2021 Frédéric France          <frederic.france@netlogic.fr>
- * Copyright (C) 2018      Ferran Marcet         	<fmarcet@2byte.es>
+/* Copyright (C) 2002-2004  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
+ * Copyright (C) 2004-2011  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005       Marc Barilley           <marc@ocebo.com>
+ * Copyright (C) 2005-2013  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2006       Andre Cianfarani        <acianfa@free.fr>
+ * Copyright (C) 2008       Raphael Bertrand        <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2010-2020  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2010-2017  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2012-2014  Christophe Battarel     <christophe.battarel@altairis.fr>
+ * 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) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * 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>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -204,9 +206,16 @@ class Propal extends CommonObject
 
 	public $cond_reglement_code;
 	public $mode_reglement_code;
-	public $remise = 0;
-	public $remise_percent = 0;
-	public $remise_absolue = 0;
+	public $remise_percent;
+
+	/**
+	 * @deprecated
+	 */
+	public $remise;
+	/**
+	 * @deprecated
+	 */
+	public $remise_absolue;
 
 	/**
 	 * @var int ID
@@ -299,7 +308,7 @@ class Propal extends CommonObject
 		'fk_user_cloture' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user cloture', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
 		'price' =>array('type'=>'double', 'label'=>'Price', 'enabled'=>1, 'visible'=>-1, 'position'=>105),
 		'remise_percent' =>array('type'=>'double', 'label'=>'RelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
-		'remise_absolue' =>array('type'=>'double', 'label'=>'CustomerRelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
+		//'remise_absolue' =>array('type'=>'double', 'label'=>'CustomerRelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
 		//'remise' =>array('type'=>'double', 'label'=>'Remise', 'enabled'=>1, 'visible'=>-1, 'position'=>120),
 		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'TotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>125, 'isameasure'=>1),
 		'total_tva' =>array('type'=>'double(24,8)', 'label'=>'VAT', 'enabled'=>1, 'visible'=>-1, 'position'=>130, 'isameasure'=>1),
@@ -1099,22 +1108,22 @@ class Propal extends CommonObject
 		$sql .= " VALUES (";
 		$sql .= $this->socid;
 		$sql .= ", 0";
-		$sql .= ", ".$this->remise;
-		$sql .= ", ".($this->remise_percent ? $this->db->escape($this->remise_percent) : 'NULL');
-		$sql .= ", ".($this->remise_absolue ? $this->db->escape($this->remise_absolue) : 'NULL');
+		$sql .= ", ".((float) $this->remise);												// deprecated
+		$sql .= ", ".($this->remise_percent ? ((float) $this->remise_percent) : 'NULL');
+		$sql .= ", ".($this->remise_absolue ? ((float) $this->remise_absolue) : 'NULL');	// deprecated
 		$sql .= ", 0";
 		$sql .= ", 0";
 		$sql .= ", '".$this->db->idate($this->date)."'";
 		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ", '(PROV)'";
-		$sql .= ", ".($user->id > 0 ? "'".$this->db->escape($user->id)."'" : "NULL");
+		$sql .= ", ".($user->id > 0 ? ((int) $user->id) : "NULL");
 		$sql .= ", '".$this->db->escape($this->note_private)."'";
 		$sql .= ", '".$this->db->escape($this->note_public)."'";
 		$sql .= ", '".$this->db->escape($this->model_pdf)."'";
 		$sql .= ", ".($this->fin_validite != '' ? "'".$this->db->idate($this->fin_validite)."'" : "NULL");
-		$sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'NULL');
-		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL');
-		$sql .= ", ".($this->fk_account > 0 ? $this->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 .= ", ".($this->fk_account > 0 ? ((int) $this->fk_account) : 'NULL');
 		$sql .= ", '".$this->db->escape($this->ref_client)."'";
 		$sql .= ", ".(empty($delivery_date) ? "NULL" : "'".$this->db->idate($delivery_date)."'");
 		$sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
@@ -1707,12 +1716,13 @@ class Propal extends CommonObject
 	/**
 	 * Load array lines
 	 *
-	 *	@param		int		$only_product	Return only physical products
-	 *	@param		int		$loadalsotranslation	Return translation for products
+	 *	@param		int			$only_product			Return only physical products
+	 *	@param		int			$loadalsotranslation	Return translation for products
+	 *	@param		string		$filters				Filter on other fields
 	 *
-	 * @return		int						<0 if KO, >0 if OK
+	 *	@return		int									<0 if KO, >0 if OK
 	 */
-	public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
+	public function fetch_lines($only_product = 0, $loadalsotranslation = 0, $filters = '')
 	{
 		global $langs, $conf;
 		// phpcs:enable
@@ -1727,10 +1737,13 @@ class Propal extends CommonObject
 		$sql .= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'propaldet as d';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (d.fk_product = p.rowid)';
-		$sql .= ' WHERE d.fk_propal = '.$this->id;
+		$sql .= ' WHERE d.fk_propal = '.((int) $this->id);
 		if ($only_product) {
 			$sql .= ' AND p.fk_product_type = 0';
 		}
+		if ($filters) {
+			$sql .= $filters;
+		}
 		$sql .= ' ORDER by d.rang';
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
@@ -2284,8 +2297,8 @@ class Propal extends CommonObject
 
 			$this->db->begin();
 
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.'propal SET ref_client = '.(empty($ref_client) ? 'NULL' : '\''.$this->db->escape($ref_client).'\'');
-			$sql .= ' WHERE rowid = '.$this->id;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."propal 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);
@@ -2420,7 +2433,6 @@ class Propal extends CommonObject
 
 			if (!$error) {
 				$this->oldcopy = clone $this;
-				$this->remise_absolue = $remise;
 				$this->update_price(1);
 			}
 
@@ -2632,8 +2644,8 @@ class Propal extends CommonObject
 		$newprivatenote = dol_concatdesc($this->note_private, $note);
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'propal SET fk_statut = '.self::STATUS_BILLED.", ";
-		$sql .= " note_private = '".$this->db->escape($newprivatenote)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id;
-		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_SIGNED;
+		$sql .= " note_private = '".$this->db->escape($newprivatenote)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".((int) $user->id);
+		$sql .= ' WHERE rowid = '.((int) $this->id).' AND fk_statut = '.((int) self::STATUS_SIGNED);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2779,17 +2791,17 @@ class Propal extends CommonObject
 		$sql = "SELECT s.rowid, s.nom as name, s.client,";
 		$sql .= " p.rowid as propalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
 		$sql .= " p.datep as dp, p.fin_validite as datelimite";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", sc.fk_soc, sc.fk_user";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE p.entity IN (".getEntity('propal').")";
 		$sql .= " AND p.fk_soc = s.rowid";
 		$sql .= " AND p.fk_statut = c.id";
-		if (!$user->rights->societe->client->voir && !$socid) { //restriction
+		if (empty($user->rights->societe->client->voir) && !$socid) { //restriction
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($socid) {
@@ -3293,7 +3305,7 @@ class Propal extends CommonObject
 
 		$sql = "SELECT p.rowid, p.ref, p.datec as datec, p.fin_validite as datefin, p.total_ht";
 		$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (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";
@@ -3470,7 +3482,7 @@ class Propal extends CommonObject
 		$sql = "SELECT count(p.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
@@ -3683,12 +3695,13 @@ class Propal extends CommonObject
 
 	/**
 	 * 	Retrieve an array of proposal lines
+	 *	@param  string              $filters        Filter on other fields
 	 *
 	 * 	@return int		>0 if OK, <0 if KO
 	 */
-	public function getLinesArray()
+	public function getLinesArray($filters = '')
 	{
-		return $this->fetch_lines();
+		return $this->fetch_lines(0, 0, $filters);
 	}
 
 	/**
@@ -4090,34 +4103,34 @@ class PropaleLigne extends CommonObjectLine
 		$sql .= " ".($this->fk_product ? "'".$this->db->escape($this->fk_product)."'" : "null").",";
 		$sql .= " '".$this->db->escape($this->product_type)."',";
 		$sql .= " ".($this->fk_remise_except ? "'".$this->db->escape($this->fk_remise_except)."'" : "null").",";
-		$sql .= " ".price2num($this->qty).",";
+		$sql .= " ".price2num($this->qty, 'MS').",";
 		$sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
 		$sql .= " ".price2num($this->tva_tx).",";
 		$sql .= " ".price2num($this->localtax1_tx).",";
 		$sql .= " ".price2num($this->localtax2_tx).",";
 		$sql .= " '".$this->db->escape($this->localtax1_type)."',";
 		$sql .= " '".$this->db->escape($this->localtax2_type)."',";
-		$sql .= " ".(price2num($this->subprice) !== '' ?price2num($this->subprice) : "null").",";
-		$sql .= " ".price2num($this->remise_percent).",";
-		$sql .= " ".(isset($this->info_bits) ? "'".$this->db->escape($this->info_bits)."'" : "null").",";
-		$sql .= " ".price2num($this->total_ht).",";
-		$sql .= " ".price2num($this->total_tva).",";
-		$sql .= " ".price2num($this->total_localtax1).",";
-		$sql .= " ".price2num($this->total_localtax2).",";
-		$sql .= " ".price2num($this->total_ttc).",";
+		$sql .= " ".(price2num($this->subprice) !== '' ? price2num($this->subprice, 'MU') : "null").",";
+		$sql .= " ".price2num($this->remise_percent, 3).",";
+		$sql .= " ".(isset($this->info_bits) ? ((int) $this->info_bits) : "null").",";
+		$sql .= " ".price2num($this->total_ht, 'MT').",";
+		$sql .= " ".price2num($this->total_tva, 'MT').",";
+		$sql .= " ".price2num($this->total_localtax1, 'MT').",";
+		$sql .= " ".price2num($this->total_localtax2, 'MT').",";
+		$sql .= " ".price2num($this->total_ttc, 'MT').",";
 		$sql .= " ".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null").",";
 		$sql .= " ".(isset($this->pa_ht) ? "'".price2num($this->pa_ht)."'" : "null").",";
-		$sql .= ' '.$this->special_code.',';
-		$sql .= ' '.$this->rang.',';
-		$sql .= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit).',';
+		$sql .= ' '.((int) $this->special_code).',';
+		$sql .= ' '.((int) $this->rang).',';
+		$sql .= ' '.(empty($this->fk_unit) ? 'NULL' : ((int) $this->fk_unit)).',';
 		$sql .= " ".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null").',';
 		$sql .= " ".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
-		$sql .= ", ".($this->fk_multicurrency > 0 ? $this->fk_multicurrency : 'null');
+		$sql .= ", ".($this->fk_multicurrency > 0 ? ((int) $this->fk_multicurrency) : 'null');
 		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql .= ", ".$this->multicurrency_subprice;
-		$sql .= ", ".$this->multicurrency_total_ht;
-		$sql .= ", ".$this->multicurrency_total_tva;
-		$sql .= ", ".$this->multicurrency_total_ttc;
+		$sql .= ", ".price2num($this->multicurrency_subprice, 'CU');
+		$sql .= ", ".price2num($this->multicurrency_total_ht, 'CT');
+		$sql .= ", ".price2num($this->multicurrency_total_tva, 'CT');
+		$sql .= ", ".price2num($this->multicurrency_total_ttc, 'CT');
 		$sql .= ')';
 
 		dol_syslog(get_class($this).'::insert', LOG_DEBUG);
diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
index 181e5b545f8..2b8c5d9047d 100644
--- a/htdocs/comm/propal/class/propalestats.class.php
+++ b/htdocs/comm/propal/class/propalestats.class.php
@@ -93,7 +93,7 @@ class PropaleStats extends Stats
 		}
 		//$this->where.= " AND p.fk_soc = s.rowid AND p.entity = ".$conf->entity;
 		$this->where .= ($this->where ? ' AND ' : '')."p.entity IN (".getEntity('propal').")";
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($this->socid) {
@@ -129,7 +129,7 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT date_format(".$this->field_date.",'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -154,7 +154,7 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT date_format(".$this->field_date.",'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -178,7 +178,7 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT date_format(".$this->field_date.",'%m') as dm, SUM(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -203,7 +203,7 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT date_format(".$this->field_date.",'%m') as dm, AVG(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -226,7 +226,7 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT date_format(".$this->field_date.",'%Y') as year, COUNT(*) as nb, SUM(".$this->field.") as total, AVG(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -252,7 +252,7 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT product.ref, COUNT(product.ref) as nb, SUM(tl.".$this->field_line.") as total, AVG(tl.".$this->field_line.") as avg";
 		$sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 61a14ab62d8..fedf6a6233d 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -148,7 +148,7 @@ if ($object->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->propal->creer) {
 			if ($action != 'classify') {
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -166,9 +166,10 @@ if ($object->id > 0) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index a60f892274c..804fedd623b 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -53,8 +53,8 @@ $result = restrictedArea($user, 'propal', $id);
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -141,7 +141,7 @@ if ($object->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->propal->creer) {
 			if ($action != 'classify') {
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -159,9 +159,10 @@ if ($object->id > 0) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index de2e4a1d64c..9f020bc1613 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -81,13 +81,13 @@ if (!empty($conf->propal->enabled)) {
 	$sql .= ", s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.email, s.entity, s.code_compta";
 	$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";
 	$sql .= " AND p.fk_soc = s.rowid";
 	$sql .= " AND p.fk_statut =".Propal::STATUS_DRAFT;
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -100,8 +100,8 @@ if (!empty($conf->propal->enabled)) {
 		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
 		startSimpleTable("DraftPropals", "comm/propal/list.php", "search_status=".Propal::STATUS_DRAFT, 2, $num);
 
+		$total = 0;
 		if ($num) {
-			$total = 0;
 			$i = 0;
 
 			while ($i < $nbofloop) {
@@ -146,7 +146,6 @@ if (!empty($conf->propal->enabled)) {
 print '</div>';
 
 print '<div class="fichetwothirdright">';
-print '<div class="ficheaddleft">';
 
 /*
  * Last modified proposals
@@ -156,7 +155,7 @@ $sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, date_cloture as datec";
 $sql .= ", s.nom as socname, s.rowid as socid, s.canvas, s.client, s.email, s.code_compta";
 $sql .= " FROM ".MAIN_DB_PREFIX."propal as c";
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE c.entity IN (".getEntity($propalstatic->element).")";
@@ -165,7 +164,7 @@ $sql .= " AND c.fk_soc = s.rowid";
 if ($socid) {
 	$sql .= " AND c.fk_soc = ".((int) $socid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " ORDER BY c.tms DESC";
@@ -232,13 +231,13 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
 	$sql .= ", p.rowid as propalid, p.entity, p.total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."propal as p";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE p.fk_soc = s.rowid";
 	$sql .= " AND p.entity IN (".getEntity($propalstatic->element).")";
 	$sql .= " AND p.fk_statut = ".Propal::STATUS_VALIDATED;
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -317,12 +316,12 @@ if (! empty($conf->propal->enabled))
 	$sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as name, s.rowid as socid";
 	$sql.=" FROM ".MAIN_DB_PREFIX."propal as c";
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (empty($user->rights->societe->client->voir) && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE c.fk_soc = s.rowid";
 	$sql.= " AND c.entity = ".$conf->entity;
 	$sql.= " AND c.fk_statut = 1";
 	if ($socid) $sql.= " AND c.fk_soc = ".((int) $socid);
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .((int) $user->id);
+	if (empty($user->rights->societe->client->voir) && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .((int) $user->id);
 	$sql.= " ORDER BY c.rowid DESC";
 
 	$resql=$db->query($sql);
@@ -392,12 +391,12 @@ if (! empty($conf->propal->enabled))
 	$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";
 	$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (empty($user->rights->societe->client->voir) && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE c.fk_soc = s.rowid";
 	$sql.= " AND c.entity = ".$conf->entity;
 	$sql.= " AND c.fk_statut = 2 ";
 	if ($socid) $sql.= " AND c.fk_soc = ".((int) $socid);
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .((int) $user->id);
+	if (empty($user->rights->societe->client->voir) && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .((int) $user->id);
 	$sql.= " ORDER BY c.rowid DESC";
 
 	$resql=$db->query($sql);
@@ -456,7 +455,6 @@ if (! empty($conf->propal->enabled))
 }
 */
 
-print '</div>';
 print '</div>';
 print '</div>';
 
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index 798dc87bcfd..dc43af9ceff 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -88,7 +88,7 @@ if (!empty($conf->projet->enabled)) {
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->propal->creer) {
 		if ($action != 'classify') {
-			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 			$morehtmlref .= ' : ';
 		}
 		if ($action == 'classify') {
@@ -106,9 +106,10 @@ if (!empty($conf->projet->enabled)) {
 		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>';
+			$morehtmlref .= ' : '.$proj->getNomUrl(1);
+			if ($proj->title) {
+				$morehtmlref .= ' - '.$proj->title;
+			}
 		} else {
 			$morehtmlref .= '';
 		}
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 3e467539c88..e4cc6a37c1c 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -42,6 +42,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formpropal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+if (!empty($conf->margin->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.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.'/comm/propal/class/propal.class.php';
@@ -130,8 +133,8 @@ $mesg = (GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
 
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
@@ -223,6 +226,10 @@ $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_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)),
 	'p.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	'p.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
 	'p.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
@@ -238,13 +245,13 @@ $permissiontoread = $user->rights->propal->lire;
 $permissiontoadd = $user->rights->propal->creer;
 $permissiontodelete = $user->rights->propal->supprimer;
 if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-	$permissiontovalidate = $user->rights->propale->propal_advance->validate;
-	$permissiontoclose = $user->rights->propale->propal_advance->close;
-	$permissiontosendbymail = $user->rights->propale->propal_advance->send;
+	$permissiontovalidate = $user->rights->propal->propal_advance->validate;
+	$permissiontoclose = $user->rights->propal->propal_advance->close;
+	$permissiontosendbymail = $user->rights->propal->propal_advance->send;
 } else {
 	$permissiontovalidate = $user->rights->propal->creer;
 	$permissiontoclose = $user->rights->propal->creer;
-	$permissiontosendbymail = $user->rights->propal->creer;
+	$permissiontosendbymail = $user->rights->propal->lire;
 }
 
 
@@ -352,13 +359,14 @@ if ($action == 'validate' && $permissiontovalidate) {
 			if ($tmpproposal->fetch($checked)) {
 				if ($tmpproposal->statut == 0) {
 					if ($tmpproposal->valid($user)) {
-						setEventMessage($tmpproposal->ref." ".$langs->trans('PassedInOpenStatus'), 'mesgs');
+						setEventMessage($langs->trans('hasBeenValidated', $tmpproposal->ref), 'mesgs');
 					} else {
 						setEventMessage($langs->trans('CantBeValidated'), 'errors');
 						$error++;
 					}
 				} else {
-					setEventMessage($tmpproposal->ref." ".$langs->trans('IsNotADraft'), 'errors');
+					$langs->load("errors");
+					setEventMessage($langs->trans('ErrorIsNotADraft', $tmpproposal->ref), 'errors');
 					$error++;
 				}
 			} else {
@@ -382,7 +390,7 @@ if ($action == "sign" && $permissiontoclose) {
 		foreach ($toselect as $checked) {
 			if ($tmpproposal->fetch($checked)) {
 				if ($tmpproposal->statut == $tmpproposal::STATUS_VALIDATED) {
-					$tmpproposal->statut = $tmpproposal::STATUS_SIGNED;;
+					$tmpproposal->statut = $tmpproposal::STATUS_SIGNED;
 					if ($tmpproposal->closeProposal($user, $tmpproposal::STATUS_SIGNED)) {
 						setEventMessage($tmpproposal->ref." ".$langs->trans('Signed'), 'mesgs');
 					} else {
@@ -485,6 +493,10 @@ $form = new Form($db);
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
 $formpropal = new FormPropal($db);
+$formmargin = null;
+if (!empty($conf->margin->enabled)) {
+	$formmargin = new FormMargin($db);
+}
 $companystatic = new Societe($db);
 $projectstatic = new Project($db);
 $formcompany = new FormCompany($db);
@@ -508,7 +520,7 @@ $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 .= " pr.rowid as project_id, pr.ref as project_ref, pr.title as project_label,";
 $sql .= ' u.login, u.lastname, u.firstname, u.email as user_email, u.statut as user_statut, u.entity as user_entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender';
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", sc.fk_soc, sc.fk_user";
 }
 if (!empty($search_categ_cus) && $search_categ_cus != '-1') {
@@ -517,7 +529,7 @@ if (!empty($search_categ_cus) && $search_categ_cus != '-1') {
 // 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
@@ -533,7 +545,7 @@ if (!empty($search_categ_cus) && $search_categ_cus != '-1') {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
 }
 $sql .= ', '.MAIN_DB_PREFIX.'propal as p';
-if (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 (p.rowid = ef.fk_object)";
 }
 if ($sall || $search_product_category > 0) {
@@ -546,7 +558,7 @@ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON p.fk_user_author = u.rowid';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr ON pr.rowid = p.fk_projet";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_availability as ava on (ava.rowid = p.fk_availability)";
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
+if ($search_sale > 0 || (empty($user->rights->societe->client->voir) && !$socid)) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 if ($search_user > 0) {
@@ -561,7 +573,7 @@ $sql .= $hookmanager->resPrint;
 
 $sql .= ' WHERE p.fk_soc = s.rowid';
 $sql .= ' AND p.entity IN ('.getEntity('propal').')';
-if (!$user->rights->societe->client->voir && !$socid) { //restriction
+if (empty($user->rights->societe->client->voir) && !$socid) { //restriction
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 
@@ -617,7 +629,7 @@ if ($search_warehouse != '' && $search_warehouse > 0) {
 	$sql .= natural_search("p.fk_warehouse", $search_warehouse, 1);
 }
 if ($search_multicurrency_code != '') {
-	$sql .= ' AND p.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
+	$sql .= " AND p.multicurrency_code = '".$db->escape($search_multicurrency_code)."'";
 }
 if ($search_multicurrency_tx != '') {
 	$sql .= natural_search('p.multicurrency_tx', $search_multicurrency_tx, 1);
@@ -699,7 +711,7 @@ $sql .= $hookmanager->resPrint;
 // Add HAVING from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListHaving', $parameters, $object); // Note that $action and $object may have been modified by hook
-$sql .= !empty($hookmanager->resPrint) ? (' HAVING 1=1 ' . $hookmanager->resPrint) : '';
+$sql .= empty($hookmanager->resPrint) ? "" : " HAVING 1=1 ".$hookmanager->resPrint;
 
 $sql .= $db->order($sortfield, $sortorder);
 $sql .= ', p.ref DESC';
@@ -991,14 +1003,14 @@ if ($resql) {
 		$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>';
 	}
 	// If the user can view prospects other than his'
 	if ($user->rights->societe->client->voir || $socid) {
 		$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');
+		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view products
@@ -1007,14 +1019,14 @@ if ($resql) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300' : 'maxwidth250'), 1);
+		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300 widthcentpercentminusx' : 'maxwidth250 widthcentpercentminusx'), 1);
 		$moreforfilter .= '</div>';
 	}
 	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
-		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300' : 'maxwidth250'));
+		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300 widthcentpercentminusx' : 'maxwidth250 widthcentpercentminusx'));
 		$moreforfilter .= '</div>';
 	}
 	if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL)) {
@@ -1243,6 +1255,22 @@ if ($resql) {
 	if (!empty($arrayfields['sale_representative']['checked'])) {
 		print '<td class="liste_titre"></td>';
 	}
+	if (!empty($arrayfields['total_pa']['checked'])) {
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['total_margin']['checked'])) {
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['total_margin_rate']['checked'])) {
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['total_mark_rate']['checked'])) {
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
@@ -1391,10 +1419,36 @@ if ($resql) {
 	if (!empty($arrayfields['sale_representative']['checked'])) {
 		print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder);
 	}
+	if (!empty($arrayfields['total_pa']['checked'])) {
+		print_liste_field_titre($arrayfields['total_pa']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['total_margin']['checked'])) {
+		print_liste_field_titre($arrayfields['total_margin']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['total_margin_rate']['checked'])) {
+		print_liste_field_titre($arrayfields['total_margin_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['total_mark_rate']['checked'])) {
+		print_liste_field_titre($arrayfields['total_mark_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	$totalarray = array(
+		'nbfield' => 0,
+		'val' => array(
+			'p.total_ht' => 0,
+			'p.total_tva' => 0,
+			'p.total_ttc' => 0,
+		),
+	);
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
-	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$parameters = array(
+		'arrayfields' => $arrayfields,
+		'param' => $param,
+		'sortfield' => $sortfield,
+		'sortorder' => $sortorder,
+		'totalarray' => &$totalarray,
+	);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (!empty($arrayfields['p.datec']['checked'])) {
@@ -1420,14 +1474,19 @@ if ($resql) {
 
 	$now = dol_now();
 	$i = 0;
-	$totalarray = array();
-	$totalarray['nbfield'] = 0;
-	$totalarray['val'] = array();
-	$totalarray['val']['p.total_ht'] = 0;
-	$totalarray['val']['p.total_tva'] = 0;
-	$totalarray['val']['p.total_ttc'] = 0;
 	$typenArray = null;
 
+	$with_margin_info = false;
+	if (!empty($conf->margin->enabled) && (
+		!empty($arrayfields['total_pa']['checked'])
+		|| !empty($arrayfields['total_margin']['checked'])
+		|| !empty($arrayfields['total_margin_rate']['checked'])
+		|| !empty($arrayfields['total_mark_rate']['checked'])
+		)
+	) {
+		$with_margin_info = true;
+	}
+
 	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
@@ -1478,6 +1537,12 @@ if ($resql) {
 			}
 		}
 
+		$marginInfo = array();
+		if ($with_margin_info === true) {
+			$objectstatic->fetch_lines();
+			$marginInfo = $formmargin->getMarginInfosArray($objectstatic);
+		}
+
 		print '<tr class="oddeven">';
 
 		if (!empty($arrayfields['p.ref']['checked'])) {
@@ -1878,6 +1943,39 @@ if ($resql) {
 			}
 		}
 
+		// Total buying or cost price
+		if (!empty($arrayfields['total_pa']['checked'])) {
+			print '<td class="right nowrap">'.price($marginInfo['pa_total']).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Total margin
+		if (!empty($arrayfields['total_margin']['checked'])) {
+			print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
+			}
+			$totalarray['val']['total_margin'] += $marginInfo['total_margin'];
+		}
+		// Total margin rate
+		if (!empty($arrayfields['total_margin_rate']['checked'])) {
+			print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Total mark rate
+		if (!empty($arrayfields['total_mark_rate']['checked'])) {
+			print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 6dd62a9990d..13fa42edb29 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -52,6 +52,10 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 	$object->id = $user->socid;
 }
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('propalnote'));
+
 restrictedArea($user, 'propal', $object->id, 'propal');
 
 
@@ -61,7 +65,13 @@ restrictedArea($user, 'propal', $object->id, 'propal');
 
 $permissionnote = $user->rights->propale->creer; // Used by the include of actions_setnotes.inc.php
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$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
+}
 
 
 
@@ -102,7 +112,7 @@ if ($object->id > 0) {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->propal->creer) {
 				if ($action != 'classify') {
-					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 					$morehtmlref .= ' : ';
 				}
 				if ($action == 'classify') {
@@ -120,9 +130,10 @@ if ($object->id > 0) {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index c1975e309f5..0a182e6dcbe 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -111,7 +111,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filenamenb = $dir.'/proposalsnbinyear-'.$user->id.'-'.$year.'.png';
 	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
@@ -147,7 +147,7 @@ if (!$mesg) {
 $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, 0);
 // $data = array(array('Lib',val1,val2,val3),...)
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filenameamount = $dir.'/proposalsamountinyear-'.$user->id.'-'.$year.'.png';
 	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$user->id.'-'.$year.'.png';
 } else {
@@ -182,7 +182,7 @@ if (!$mesg) {
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 $fileurl_avg = '';
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
 	if ($mode == 'customer') {
 		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
@@ -297,7 +297,7 @@ if (!in_array($nowyear, $arrayyears)) {
 	$arrayyears[$nowyear] = $nowyear;
 }
 arsort($arrayyears);
-print $form->selectarray('year', $arrayyears, $year, 0);
+print $form->selectarray('year', $arrayyears, $year, 0, 0, 0, '', 0, 0, 0, '', 'width75');
 print '</td></tr>';
 print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
@@ -347,7 +347,7 @@ foreach ($data as $val) {
 print '</table>';
 print '</div>';
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 // Show graphs
@@ -364,7 +364,7 @@ if ($mesg) {
 print '</td></tr></table>';
 
 
-print '</div></div></div>';
+print '</div></div>';
 print '<div style="clear:both"></div>';
 
 
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index 23c1a459c74..adc9de9339e 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 -->\n";
+print "<!-- BEGIN PHP TEMPLATE comm/propal/tpl/linkedopjectblock.tpl.php -->\n";
 
 global $user;
 
@@ -68,7 +68,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	}
 	print '</td>';
 	print '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
-	print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
+	print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
 	print "</tr>\n";
 }
 if (count($linkedObjectBlock) > 1) {
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index d2f60c36212..0bcf2662a44 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -77,16 +77,16 @@ if (!empty($conf->propal->enabled)) {
  *
  */
 
-$sql = "SELECT count(*) as cc, st.libelle, st.picto, st.id";
+$sql = "SELECT count(*) as cc, st.libelle as stcomm, st.picto, st.id";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."c_stcomm as st ";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE s.fk_stcomm = st.id";
 $sql .= " AND s.client IN (2, 3)";
 $sql .= " AND s.entity IN (".getEntity($companystatic->element).")";
-if (!$user->rights->societe->client->voir && !$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 st.id";
@@ -122,13 +122,13 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
 	$sql = "SELECT p.rowid, p.ref, p.price, s.nom as sname";
 	$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE p.fk_statut = 0";
 	$sql .= " AND p.fk_soc = s.rowid";
 	$sql .= " AND p.entity IN (".getEntity('propal').")";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 
@@ -163,8 +163,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
 }
 
 
-//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 /*
@@ -183,14 +182,14 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."propal as p";
 	$sql .= ", ".MAIN_DB_PREFIX."c_propalst as c";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE p.fk_soc = s.rowid";
 	$sql .= " AND p.fk_statut = c.id";
 	$sql .= " AND p.fk_statut = 1";
 	$sql .= " AND p.entity IN (".getEntity('propal').")";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -244,12 +243,12 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
  */
 $sql = "SELECT s.nom as name, s.rowid as socid, s.client, s.canvas";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE s.fk_stcomm = 1";
 $sql .= " AND s.entity IN (".getEntity($companystatic->element).")";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " ORDER BY s.tms ASC";
@@ -280,8 +279,7 @@ if ($resql) {
 }
 
 
-//print '</td></tr></table>';
-print '</div></div></div>';
+print '</div></div>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index bdf9b75998b..cdd8fefc4b0 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2021 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
@@ -38,18 +38,30 @@ if ($user->socid > 0) {
 }
 
 $backtopage = GETPOST('backtopage', 'alpha');
+$cancel = GETPOST('cancel', 'aplha');
+$action = GETPOST('action', 'aZ09');
+
+// Security check
+if ($user->socid > 0) {
+	$id = $user->socid;
+}
+$result = restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid', 0);
 
 
 /*
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
-	 header("Location: ".$backtopage);
-	 exit;
+if ($cancel) {
+	if (!empty($backtopage)) {
+		header("Location: ".$backtopage);
+		exit;
+	} else {
+		$action = '';
+	}
 }
 
-if (GETPOST('action', 'aZ09') == 'setremise') {
+if ($action == 'setremise') {
 	$object = new Societe($db);
 	$object->fetch($id);
 
@@ -74,11 +86,6 @@ if (GETPOST('action', 'aZ09') == 'setremise') {
 	}
 }
 
-// Security check
-if ($user->socid > 0) {
-	$id = $user->socid;
-}
-$result = restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid', 0);
 
 
 /*
@@ -189,13 +196,7 @@ if ($socid > 0) {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-	if (!empty($backtopage)) {
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	}
-	print '</div>';
+	print $form->buttonsSaveCancel("Modify");
 
 	print "</form>";
 
@@ -214,7 +215,7 @@ if ($socid > 0) {
 		$sql = "SELECT rc.rowid, rc.remise_client as remise_percent, rc.note, rc.datec as dc,";
 		$sql .= " u.login, u.rowid as user_id";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise as rc, ".MAIN_DB_PREFIX."user as u";
-		$sql .= " WHERE rc.fk_soc = ".$object->id;
+		$sql .= " WHERE rc.fk_soc = ".((int) $object->id);
 		$sql .= " AND rc.entity IN (".getEntity('discount').")";
 		$sql .= " AND u.rowid = rc.fk_user_author";
 		$sql .= " ORDER BY rc.datec DESC";
@@ -256,7 +257,6 @@ if ($socid > 0) {
 		if ($isCustomer) {
 			print '</div>'; // class="fichehalfleft"
 			print '<div class="fichehalfright">';
-			print '<div class="ficheaddleft">';
 			print load_fiche_titre($langs->trans("SupplierDiscounts"), '', '');
 		}
 
@@ -266,7 +266,7 @@ if ($socid > 0) {
 		$sql = "SELECT rc.rowid, rc.remise_supplier as remise_percent, rc.note, rc.datec as dc,";
 		$sql .= " u.login, u.rowid as user_id";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_supplier as rc, ".MAIN_DB_PREFIX."user as u";
-		$sql .= " WHERE rc.fk_soc = ".$object->id;
+		$sql .= " WHERE rc.fk_soc = ".((int) $object->id);
 		$sql .= " AND rc.entity IN (".getEntity('discount').")";
 		$sql .= " AND u.rowid = rc.fk_user_author";
 		$sql .= " ORDER BY rc.datec DESC";
@@ -304,7 +304,6 @@ if ($socid > 0) {
 		}
 
 		if ($isCustomer) {
-			print '</div>'; // class="ficheaddleft"
 			print '</div>'; // class="fichehalfright"
 			print '</div>'; // class="fichecenter"
 		}
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index f8a4c12fba7..4404f9758a6 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -267,8 +267,8 @@ if ($socid > 0) {
 		$remise_all = $remise_user = 0;
 		$sql = "SELECT SUM(rc.amount_ht) as amount, rc.fk_user";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
-		$sql .= " WHERE rc.fk_soc = ".$object->id;
-		$sql .= " AND rc.entity = ".$conf->entity;
+		$sql .= " WHERE rc.fk_soc = ".((int) $object->id);
+		$sql .= " AND rc.entity = ".((int) $conf->entity);
 		$sql .= " AND discount_type = 0"; // Exclude supplier discounts
 		$sql .= " AND (fk_facture_line IS NULL AND fk_facture IS NULL)";
 		$sql .= " GROUP BY rc.fk_user";
@@ -297,8 +297,8 @@ if ($socid > 0) {
 		$remise_all = $remise_user = 0;
 		$sql = "SELECT SUM(rc.amount_ht) as amount, rc.fk_user";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
-		$sql .= " WHERE rc.fk_soc = ".$object->id;
-		$sql .= " AND rc.entity = ".$conf->entity;
+		$sql .= " WHERE rc.fk_soc = ".((int) $object->id);
+		$sql .= " AND rc.entity = ".((int) $conf->entity);
 		$sql .= " AND discount_type = 1"; // Exclude customer discounts
 		$sql .= " AND (fk_invoice_supplier_line IS NULL AND fk_invoice_supplier IS NULL)";
 		$sql .= " GROUP BY rc.fk_user";
@@ -408,8 +408,8 @@ if ($socid > 0) {
 		$sql .= " fa.ref as ref, fa.type as type";
 		$sql .= " FROM  ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."societe_remise_except as rc";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid";
-		$sql .= " WHERE rc.fk_soc = ".$object->id;
-		$sql .= " AND rc.entity = ".$conf->entity;
+		$sql .= " WHERE rc.fk_soc = ".((int) $object->id);
+		$sql .= " AND rc.entity = ".((int) $conf->entity);
 		$sql .= " AND u.rowid = rc.fk_user";
 		$sql .= " AND rc.discount_type = 0"; // Eliminate supplier discounts
 		$sql .= " AND (rc.fk_facture_line IS NULL AND rc.fk_facture IS NULL)";
@@ -532,7 +532,6 @@ if ($socid > 0) {
 		if ($isCustomer) {
 			print '</div>'; // class="fichehalfleft"
 			print '<div class="fichehalfright fichehalfright-lg">';
-			print '<div class="ficheaddleft">';
 			print load_fiche_titre($langs->trans("SupplierDiscounts"), '', '');
 		}
 
@@ -547,8 +546,8 @@ if ($socid > 0) {
 		$sql .= " fa.ref, fa.type as type";
 		$sql .= " FROM  ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."societe_remise_except as rc";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as fa ON rc.fk_invoice_supplier_source = fa.rowid";
-		$sql .= " WHERE rc.fk_soc = ".$object->id;
-		$sql .= " AND rc.entity = ".$conf->entity;
+		$sql .= " WHERE rc.fk_soc = ".((int) $object->id);
+		$sql .= " AND rc.entity = ".((int) $conf->entity);
 		$sql .= " AND u.rowid = rc.fk_user";
 		$sql .= " AND rc.discount_type = 1"; // Eliminate customer discounts
 		$sql .= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)";
@@ -667,7 +666,6 @@ if ($socid > 0) {
 		}
 
 		if ($isCustomer) {
-			print '</div>'; // class="ficheaddleft"
 			print '</div>'; // class="fichehalfright"
 			print '</div>'; // class="fichecenter"
 		}
@@ -700,7 +698,7 @@ if ($socid > 0) {
 		$sql .= " , ".MAIN_DB_PREFIX."facturedet as fc";
 		$sql .= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid";
-		$sql .= " WHERE rc.fk_soc =".$object->id;
+		$sql .= " WHERE rc.fk_soc = ".((int) $object->id);
 		$sql .= " AND rc.fk_facture_line = fc.rowid";
 		$sql .= " AND fc.fk_facture = f.rowid";
 		$sql .= " AND rc.fk_user = u.rowid";
@@ -718,7 +716,7 @@ if ($socid > 0) {
 		$sql2 .= " , ".MAIN_DB_PREFIX."user as u";
 		$sql2 .= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
 		$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid";
-		$sql2 .= " WHERE rc.fk_soc =".$object->id;
+		$sql2 .= " WHERE rc.fk_soc = ".((int) $object->id);
 		$sql2 .= " AND rc.fk_facture = f.rowid";
 		$sql2 .= " AND rc.fk_user = u.rowid";
 		$sql2 .= " AND rc.discount_type = 0"; // Eliminate supplier discounts
@@ -843,7 +841,6 @@ if ($socid > 0) {
 		if ($isCustomer) {
 			print '</div>'; // class="fichehalfleft"
 			print '<div class="fichehalfright fichehalfright-lg">';
-			print '<div class="ficheaddleft">';
 			print load_fiche_titre($langs->trans("SupplierDiscounts"), '', '');
 		}
 
@@ -860,7 +857,7 @@ if ($socid > 0) {
 		$sql .= " , ".MAIN_DB_PREFIX."facture_fourn_det as fc";
 		$sql .= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as fa ON rc.fk_invoice_supplier_source = fa.rowid";
-		$sql .= " WHERE rc.fk_soc =".$object->id;
+		$sql .= " WHERE rc.fk_soc = ".((int) $object->id);
 		$sql .= " AND rc.fk_invoice_supplier_line = fc.rowid";
 		$sql .= " AND fc.fk_facture_fourn = f.rowid";
 		$sql .= " AND rc.fk_user = u.rowid";
@@ -879,7 +876,7 @@ if ($socid > 0) {
 		$sql2 .= " , ".MAIN_DB_PREFIX."user as u";
 		$sql2 .= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
 		$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as fa ON rc.fk_invoice_supplier_source = fa.rowid";
-		$sql2 .= " WHERE rc.fk_soc =".$object->id;
+		$sql2 .= " WHERE rc.fk_soc = ".((int) $object->id);
 		$sql2 .= " AND rc.fk_invoice_supplier = f.rowid";
 		$sql2 .= " AND rc.fk_user = u.rowid";
 		$sql2 .= " AND rc.discount_type = 1"; // Eliminate customer discounts
@@ -1000,7 +997,6 @@ if ($socid > 0) {
 		}
 
 		if ($isCustomer) {
-			print '</div>'; // class="ficheaddleft"
 			print '</div>'; // class="fichehalfright"
 			print '</div>'; // class="fichecenter"
 		}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index ba96725ddbd..958ff542fed 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -91,6 +91,10 @@ $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($con
 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('ordercard', 'globalcard'));
+
 $result = restrictedArea($user, 'commande', $id);
 
 $object = new Commande($db);
@@ -102,9 +106,6 @@ $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
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('ordercard', 'globalcard'));
-
 $usercanread = $user->rights->commande->lire;
 $usercancreate = $user->rights->commande->creer;
 $usercandelete = $user->rights->commande->supprimer;
@@ -137,8 +138,23 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/commande/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.'/commande/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
 	if ($cancel) {
-		if (!empty($backtopage)) {
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -664,6 +680,10 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
 		}
+		if ($qty < 0) {
+			setEventMessages($langs->trans('FieldCannotBeNegative', $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++;
@@ -988,9 +1008,11 @@ if (empty($reshook)) {
 		$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') : 0);
+		$vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx', 'alpha') : 0);
 		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), '', 2);
 
+		$qty = price2num(GETPOST('qty'), 'MS');
+
 		// Define info_bits
 		$info_bits = 0;
 		if (preg_match('/\*/', $vat_rate)) {
@@ -1042,6 +1064,7 @@ if (empty($reshook)) {
 			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';
 			}
 		} else {
 			$type = GETPOST('type');
@@ -1051,9 +1074,16 @@ if (empty($reshook)) {
 			if (GETPOST('type') < 0) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 				$error++;
+				$action = 'editline';
 			}
 		}
 
+		if ($qty < 0) {
+			setEventMessages($langs->trans('FieldCannotBeNegative', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
+			$error++;
+			$action = 'editline';
+		}
+
 		if (!$error) {
 			if (empty($user->rights->margins->creer)) {
 				foreach ($object->lines as &$line) {
@@ -1064,7 +1094,7 @@ if (empty($reshook)) {
 					}
 				}
 			}
-			$result = $object->updateline(GETPOST('lineid', 'int'), $description, $pu_ht, price2num(GETPOST('qty'), 'MS'), $remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $date_start, $date_end, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $special_code, $array_options, GETPOST('units'), $pu_ht_devise);
+			$result = $object->updateline(GETPOST('lineid', 'int'), $description, $pu_ht, $qty, $remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $date_start, $date_end, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $special_code, $array_options, GETPOST('units'), $pu_ht_devise);
 
 			if ($result >= 0) {
 				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -1116,7 +1146,7 @@ if (empty($reshook)) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans("Cancel")) {
+	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha')) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
 	} elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate) {
@@ -1341,7 +1371,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to build doc
-	$upload_dir = $conf->commande->multidir_output[$object->entity];
+	$upload_dir = !empty($conf->propal->multidir_output[$object->entity])?$conf->propal->multidir_output[$object->entity]:$conf->propal->dir_output;
 	$permissiontoadd = $usercancreate;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
@@ -1480,13 +1510,13 @@ if ($action == 'create' && $usercancreate) {
 			$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
 			$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 : (!empty($soc->availability_id) ? $soc->availability_id : 0));
+			$availability_id = (!empty($objectsrc->availability_id) ? $objectsrc->availability_id : 0);
 			$shipping_method_id = (!empty($objectsrc->shipping_method_id) ? $objectsrc->shipping_method_id : (!empty($soc->shipping_method_id) ? $soc->shipping_method_id : 0));
 			$warehouse_id       = (!empty($objectsrc->warehouse_id) ? $objectsrc->warehouse_id : (!empty($soc->warehouse_id) ? $soc->warehouse_id : 0));
 			$demand_reason_id = (!empty($objectsrc->demand_reason_id) ? $objectsrc->demand_reason_id : (!empty($soc->demand_reason_id) ? $soc->demand_reason_id : 0));
 			$remise_percent		= (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_percent) ? $soc->remise_percent : 0));
 			$remise_absolue		= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
-			$dateorder = empty($conf->global->MAIN_AUTOFILL_DATE_ORDER) ?-1 : '';
+			$dateorder = empty($conf->global->MAIN_AUTOFILL_DATE_ORDER) ? -1 : '';
 
 			$date_delivery = (!empty($objectsrc->delivery_date) ? $objectsrc->delivery_date : '');
 			if (empty($date_delivery)) {
@@ -1512,7 +1542,7 @@ if ($action == 'create' && $usercancreate) {
 		$cond_reglement_id  = $soc->cond_reglement_id;
 		$mode_reglement_id  = $soc->mode_reglement_id;
 		$fk_account         = $soc->fk_account;
-		$availability_id    = $soc->availability_id;
+		$availability_id    = 0;
 		$shipping_method_id = $soc->shipping_method_id;
 		$warehouse_id       = $soc->warehouse_id;
 		$demand_reason_id   = $soc->demand_reason_id;
@@ -1573,7 +1603,7 @@ if ($action == 'create' && $usercancreate) {
 	print '<td class="fieldrequired">'.$langs->trans('Customer').'</td>';
 	if ($socid > 0) {
 		print '<td>';
-		print $soc->getNomUrl(1);
+		print $soc->getNomUrl(1, 'customer');
 		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 		print '</td>';
 	} else {
@@ -1632,13 +1662,19 @@ if ($action == 'create' && $usercancreate) {
 	print "</td>\n";
 	print '</tr>';
 
+	// Delivery delay
+	print '<tr class="fielddeliverydelay"><td>'.$langs->trans('AvailabilityPeriod').'</td><td>';
+	print img_picto('', 'clock', 'class="pictofixedwidth"');
+	$form->selectAvailabilityDelay($availability_id, 'availability_id', '', 1, 'maxwidth200 widthcentpercentminusx');
+	print '</td></tr>';
+
 	// Terms of the settlement
 	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 '</td></tr>';
 
-	// Mode de reglement
+	// Payment mode
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
 	print img_picto('', 'bank', 'class="pictofixedwidth"');
 	$form->select_types_paiements($mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx');
@@ -1651,12 +1687,6 @@ if ($action == 'create' && $usercancreate) {
 		print '</td></tr>';
 	}
 
-	// Delivery delay
-	print '<tr class="fielddeliverydelay"><td>'.$langs->trans('AvailabilityPeriod').'</td><td>';
-	print img_picto('', 'clock', 'class="pictofixedwidth"');
-	$form->selectAvailabilityDelay($availability_id, 'availability_id', '', 1, 'maxwidth200 widthcentpercentminusx');
-	print '</td></tr>';
-
 	// Shipping Method
 	if (!empty($conf->expedition->enabled)) {
 		print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
@@ -1674,7 +1704,7 @@ if ($action == 'create' && $usercancreate) {
 		print '</td></tr>';
 	}
 
-	// Source / Channle - What trigger creation
+	// Source / Channel - What trigger creation
 	print '<tr><td>'.$langs->trans('Channel').'</td><td>';
 	print img_picto('', 'question', 'class="pictofixedwidth"');
 	$form->selectInputReason($demand_reason_id, 'demand_reason_id', '', 1, 'maxwidth200 widthcentpercentminusx');
@@ -1827,12 +1857,7 @@ if ($action == 'create' && $usercancreate) {
 
 	print dol_get_fiche_end();
 
-	// Button "Create Draft"
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" onclick="javascript:history.go(-1)">';
-	print '</div>';
+	print $form->buttonsSaveCancel("CreateDraft");
 
 	// Show origin lines
 	if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
@@ -1915,6 +1940,21 @@ if ($action == 'create' && $usercancreate) {
 				);
 			}
 
+			// mandatoryPeriod
+			$nbMandated = 0;
+			foreach ($object->lines as $line) {
+				$res = $line->fetch_product();
+				if ($res  > 0  ) {
+					if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end) )) {
+						$nbMandated++;
+						break;
+					}
+				}
+			}
+			if ($nbMandated > 0 ) $text .= '<div><span class="clearboth nowraponall warning">'.$langs->trans("mandatoryPeriodNeedTobeSetMsgValidate").'</span></div>';
+
+
+
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateOrder'), $text, 'confirm_validate', $formquestion, 0, 1, 220);
 		}
 
@@ -2024,7 +2064,7 @@ if ($action == 'create' && $usercancreate) {
 		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', 0, 1);
 		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', null, null, '', 1);
 		// Thirdparty
-		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$soc->getNomUrl(1);
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$soc->getNomUrl(1, 'customer');
 		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
 		}
@@ -2034,7 +2074,7 @@ if ($action == 'create' && $usercancreate) {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($usercancreate) {
 				if ($action != 'classify') {
-					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+					$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);
@@ -2051,9 +2091,10 @@ if ($action == 'create' && $usercancreate) {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
@@ -2120,11 +2161,11 @@ if ($action == 'create' && $usercancreate) {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate">';
 			print $form->selectDate($object->date, 'order_', '', '', '', "setdate");
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
 			print $object->date ? dol_print_date($object->date, 'day') : '&nbsp;';
-			if ($object->hasDelay()) {
+			if ($object->hasDelay() && empty($object->delivery_date)) {	// If there is a delivery date planned, warning should be on this date
 				print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 			}
 		}
@@ -2141,7 +2182,7 @@ if ($action == 'create' && $usercancreate) {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate_livraison">';
 			print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
 			print $object->delivery_date ? dol_print_date($object->delivery_date, 'dayhour') : '&nbsp;';
@@ -2152,6 +2193,18 @@ if ($action == 'create' && $usercancreate) {
 		print '</td>';
 		print '</tr>';
 
+		// Delivery delay
+		print '<tr class="fielddeliverydelay"><td>';
+		$editenable = $usercancreate;
+		print $form->editfieldkey("AvailabilityPeriod", 'availability', '', $object, $editenable);
+		print '</td><td class="valuefield">';
+		if ($action == 'editavailability') {
+			$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'availability_id', 1);
+		} else {
+			$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'none', 1);
+		}
+		print '</td></tr>';
+
 		// Shipping Method
 		if (!empty($conf->expedition->enabled)) {
 			print '<tr><td>';
@@ -2185,6 +2238,18 @@ if ($action == 'create' && $usercancreate) {
 			print '</tr>';
 		}
 
+		// Source reason (why we have an order)
+		print '<tr><td>';
+		$editenable = $usercancreate;
+		print $form->editfieldkey("Source", 'demandreason', '', $object, $editenable);
+		print '</td><td class="valuefield">';
+		if ($action == 'editdemandreason') {
+			$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'demand_reason_id', 1);
+		} else {
+			$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'none');
+		}
+		print '</td></tr>';
+
 		// Terms of payment
 		print '<tr><td>';
 		$editenable = $usercancreate;
@@ -2250,30 +2315,6 @@ if ($action == 'create' && $usercancreate) {
 			}
 		}
 
-		// Delivery delay
-		print '<tr class="fielddeliverydelay"><td>';
-		$editenable = $usercancreate;
-		print $form->editfieldkey("AvailabilityPeriod", 'availability', '', $object, $editenable);
-		print '</td><td class="valuefield">';
-		if ($action == 'editavailability') {
-			$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'availability_id', 1);
-		} else {
-			$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'none', 1);
-		}
-		print '</td></tr>';
-
-		// Source reason (why we have an ordrer)
-		print '<tr><td>';
-		$editenable = $usercancreate;
-		print $form->editfieldkey("Channel", 'demandreason', '', $object, $editenable);
-		print '</td><td class="valuefield">';
-		if ($action == 'editdemandreason') {
-			$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'demand_reason_id', 1);
-		} else {
-			$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'none');
-		}
-		print '</td></tr>';
-
 		// TODO Order mode (how we receive order). Not yet implemented
 		/*
 		print '<tr><td>';
@@ -2343,7 +2384,6 @@ if ($action == 'create' && $usercancreate) {
 
 		print '</div>';
 		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border tableforfield centpercent">';
@@ -2400,7 +2440,6 @@ if ($action == 'create' && $usercancreate) {
 		}
 
 
-		print '</div>';
 		print '</div>';
 		print '</div>'; // Close fichecenter
 
@@ -2478,14 +2517,14 @@ 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.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans('ReOpen').'</a>';
 				}
 
 				// Send
 				if (empty($user->socid)) {
 					if ($object->statut > Commande::STATUS_DRAFT || !empty($conf->global->COMMANDE_SENDBYEMAIL_FOR_ALL_STATUS)) {
 						if ($usercansend) {
-							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
+							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
 						} else {
 							print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
 						}
@@ -2567,31 +2606,31 @@ if ($action == 'create' && $usercancreate) {
 				// 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&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
+						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 ($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.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifybilled&token='.newToken().'">'.$langs->trans("ClassifyBilled").'</a>';
 					}
 				}
 				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.'&amp;action=classifyunbilled">'.$langs->trans("ClassifyUnBilled").'</a>';
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifyunbilled&token='.newToken().'">'.$langs->trans("ClassifyUnBilled").'</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>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&token='.newToken().'&object=order">'.$langs->trans("ToClone").'</a>';
 				}
 
 				// Cancel order
 				if ($object->statut == Commande::STATUS_VALIDATED && (!empty($usercanclose) || !empty($usercancancel))) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("Cancel").'</a>';
+					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.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
+						print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>';
 					} else {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ShippingExist").'">'.$langs->trans("Delete").'</a>';
 					}
@@ -2639,14 +2678,14 @@ if ($action == 'create' && $usercancreate) {
 				print showOnlinePaymentUrl('order', $object->ref).'<br>';
 			}
 
-			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+			print '</div><div class="fichehalfright">';
 
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'order', $socid, 1);
 
-			print '</div></div></div>';
+			print '</div></div>';
 		}
 
 		// Presend form
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index b550139cd94..48865f958a2 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -199,8 +199,9 @@ class Orders extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -962,6 +963,102 @@ class Orders extends DolibarrApi
 		return $this->_cleanObjectDatas($this->commande);
 	}
 
+	/**
+	 * Get the shipments of an order
+	 *
+	 * @param int   $id       Id of the order
+	 *
+	 * @url     GET {id}/shipment
+	 *
+	 * @return array
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 */
+	public function getOrderShipments($id)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+		if (!DolibarrApiAccess::$user->rights->expedition->lire) {
+			throw new RestException(401);
+		}
+		$obj_ret = array();
+		$sql = "SELECT e.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
+		$sql .= " JOIN ".MAIN_DB_PREFIX."expeditiondet as edet";
+		$sql .= " ON e.rowid = edet.fk_expedition";
+		$sql .= " JOIN ".MAIN_DB_PREFIX."commandedet as cdet";
+		$sql .= " ON edet.fk_origin_line = cdet.rowid";
+		$sql .= " JOIN ".MAIN_DB_PREFIX."commande as c";
+		$sql .= " ON cdet.fk_commande = c.rowid";
+		$sql .= " WHERE c.rowid = ".((int) $id);
+		$sql .= " GROUP BY e.rowid";
+		$sql .= $this->db->order("e.rowid", "ASC");
+
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			if ($num <= 0) {
+				throw new RestException(404, 'Shipments not found ');
+			}
+			$i = 0;
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($result);
+				$shipment_static = new Expedition($this->db);
+				if ($shipment_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($shipment_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(500, 'Error when retrieve shipment list : '.$this->db->lasterror());
+		}
+		return $obj_ret;
+	}
+
+	/**
+	 * Create the shipment of an order
+	 *
+	 * @param int   $id       Id of the order
+	 * @param int	$warehouse_id Id of a warehouse
+	 *
+	 * @url     POST {id}/shipment/{warehouse_id}
+	 *
+	 * @return int
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 */
+	public function createOrderShipment($id, $warehouse_id)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+		if (!DolibarrApiAccess::$user->rights->expedition->creer) {
+			throw new RestException(401);
+		}
+		if ($warehouse_id <= 0) {
+			throw new RestException(404, 'Warehouse not found');
+		}
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
+		$shipment = new Expedition($this->db);
+		$shipment->socid = $this->commande->socid;
+		$result = $shipment->create(DolibarrApiAccess::$user);
+		if ($result <= 0) {
+			throw new RestException(500, 'Error on creating expedition :'.$this->db->lasterror());
+		}
+		foreach ($this->commande->lines as $line) {
+			$result = $shipment->create_line($warehouse_id, $line->id, $line->qty);
+			if ($result <= 0) {
+				throw new RestException(500, 'Error on creating expedition lines:'.$this->db->lasterror());
+			}
+		}
+		return $shipment->id;
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index f02e74687af..c315a4fcd61 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -261,6 +261,11 @@ class Commande extends CommonOrder
 	//! key of pos source ('0', '1', ...)
 	public $pos_source;
 
+	/**
+	 * @var array	Array with line of all shipments
+	 */
+	public $expeditions;
+
 
 	/**
 	 *  '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')
@@ -386,9 +391,6 @@ class Commande extends CommonOrder
 	public function __construct($db)
 	{
 		$this->db = $db;
-
-		$this->remise = 0;
-		$this->remise_percent = 0;
 	}
 
 	/**
@@ -493,7 +495,8 @@ 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 = ".((int) $user->id).",";
+		$sql .= " fk_user_modif = ".((int) $user->id);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::valid", LOG_DEBUG);
@@ -623,7 +626,8 @@ class Commande extends CommonOrder
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-		$sql .= " SET fk_statut = ".self::STATUS_DRAFT;
+		$sql .= " SET fk_statut = ".self::STATUS_DRAFT.",";
+		$sql .= " fk_user_modif = ".((int) $user->id);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		if ($this->db->query($sql)) {
@@ -697,8 +701,9 @@ class Commande extends CommonOrder
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
-		$sql .= ' SET fk_statut='.self::STATUS_VALIDATED.', facture=0';
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= ' SET fk_statut='.self::STATUS_VALIDATED.', facture=0,';
+		$sql .= " fk_user_modif = ".((int) $user->id);
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::set_reopen", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -757,9 +762,10 @@ class Commande extends CommonOrder
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET fk_statut = '.self::STATUS_CLOSED.',';
-			$sql .= ' fk_user_cloture = '.$user->id.',';
-			$sql .= " date_cloture = '".$this->db->idate($now)."'";
-			$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
+			$sql .= ' fk_user_cloture = '.((int) $user->id).',';
+			$sql .= " date_cloture = '".$this->db->idate($now)."',";
+			$sql .= " fk_user_modif = ".((int) $user->id);
+			$sql .= " WHERE rowid = ".((int) $this->id).' AND fk_statut > '.self::STATUS_DRAFT;
 
 			if ($this->db->query($sql)) {
 				if (!$notrigger) {
@@ -806,7 +812,8 @@ class Commande extends CommonOrder
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."commande";
-		$sql .= " SET fk_statut = ".self::STATUS_CANCELED;
+		$sql .= " SET fk_statut = ".self::STATUS_CANCELED.",";
+		$sql .= " fk_user_modif = ".((int) $user->id);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 		$sql .= " AND fk_statut = ".self::STATUS_VALIDATED;
 
@@ -934,8 +941,8 @@ class Commande extends CommonOrder
 		$sql .= ", multicurrency_code";
 		$sql .= ", multicurrency_tx";
 		$sql .= ")";
-		$sql .= " VALUES ('(PROV)', ".$this->socid.", '".$this->db->idate($now)."', ".$user->id;
-		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
+		$sql .= " VALUES ('(PROV)', ".((int) $this->socid).", '".$this->db->idate($now)."', ".((int) $user->id);
+		$sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : "null");
 		$sql .= ", '".$this->db->idate($date)."'";
 		$sql .= ", ".($this->source >= 0 && $this->source != '' ? $this->db->escape($this->source) : 'null');
 		$sql .= ", '".$this->db->escape($this->note_private)."'";
@@ -944,15 +951,15 @@ class Commande extends CommonOrder
 		$sql .= ", ".($this->ref_client ? "'".$this->db->escape($this->ref_client)."'" : "null");
 		$sql .= ", ".($this->ref_int ? "'".$this->db->escape($this->ref_int)."'" : "null");
 		$sql .= ", '".$this->db->escape($this->model_pdf)."'";
-		$sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : "null");
-		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : "null");
-		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
-		$sql .= ", ".($this->availability_id > 0 ? $this->availability_id : "null");
-		$sql .= ", ".($this->demand_reason_id > 0 ? $this->demand_reason_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 .= ", ".($this->fk_account > 0 ? ((int) $this->fk_account) : 'NULL');
+		$sql .= ", ".($this->availability_id > 0 ? ((int) $this->availability_id) : "null");
+		$sql .= ", ".($this->demand_reason_id > 0 ? ((int) $this->demand_reason_id) : "null");
 		$sql .= ", ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : "null");
-		$sql .= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : 'NULL');
-		$sql .= ", ".(!empty($this->shipping_method_id) && $this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
-		$sql .= ", ".(!empty($this->warehouse_id) && $this->warehouse_id > 0 ? $this->warehouse_id : 'NULL');
+		$sql .= ", ".($this->fk_delivery_address > 0 ? ((int) $this->fk_delivery_address) : 'NULL');
+		$sql .= ", ".(!empty($this->shipping_method_id) && $this->shipping_method_id > 0 ? ((int) $this->shipping_method_id) : 'NULL');
+		$sql .= ", ".(!empty($this->warehouse_id) && $this->warehouse_id > 0 ? ((int) $this->warehouse_id) : 'NULL');
 		$sql .= ", ".($this->remise_absolue > 0 ? $this->db->escape($this->remise_absolue) : 'NULL');
 		$sql .= ", ".($this->remise_percent > 0 ? $this->db->escape($this->remise_percent) : 0);
 		$sql .= ", ".(int) $this->fk_incoterms;
@@ -962,7 +969,7 @@ class Commande extends CommonOrder
 		$sql .= ", ".($this->pos_source != '' ? "'".$this->db->escape($this->pos_source)."'" : "null");
 		$sql .= ", ".(int) $this->fk_multicurrency;
 		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql .= ", ".(double) $this->multicurrency_tx;
+		$sql .= ", ".(float) $this->multicurrency_tx;
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -1782,7 +1789,7 @@ class Commande extends CommonOrder
 			return -1;
 		}
 
-		$sql = 'SELECT c.rowid, c.entity, c.date_creation, c.ref, c.fk_soc, c.fk_user_author, c.fk_user_valid, c.fk_statut';
+		$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.fk_account';
 		$sql .= ', c.date_commande, c.date_valid, c.tms';
@@ -1847,6 +1854,7 @@ class Commande extends CommonOrder
 
 				$this->user_author_id = $obj->fk_user_author;
 				$this->user_valid = $obj->fk_user_valid;
+				$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;
@@ -2007,9 +2015,9 @@ class Commande extends CommonOrder
 	/**
 	 *	Load array lines
 	 *
-	 *	@param		int		$only_product	Return only physical products, not services
+	 *	@param		int		$only_product			Return only physical products, not services
 	 *	@param		int		$loadalsotranslation	Return translation for products
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int								<0 if KO, >0 if OK
 	 */
 	public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
 	{
@@ -2026,7 +2034,7 @@ class Commande extends CommonOrder
 		$sql .= ' p.weight, p.weight_units, p.volume, p.volume_units';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)';
-		$sql .= ' WHERE l.fk_commande = '.$this->id;
+		$sql .= ' WHERE l.fk_commande = '.((int) $this->id);
 		if ($only_product) {
 			$sql .= ' AND p.fk_product_type = 0';
 		}
@@ -2180,7 +2188,7 @@ class Commande extends CommonOrder
 		$sql .= ' '.MAIN_DB_PREFIX.'commandedet as cd';
 		$sql .= ' WHERE';
 		$sql .= ' ed.fk_origin_line = cd.rowid';
-		$sql .= ' AND cd.fk_commande ='.$this->id;
+		$sql .= ' AND cd.fk_commande = '.((int) $this->id);
 		//print $sql;
 
 		dol_syslog(get_class($this)."::getNbOfShipments", LOG_DEBUG);
@@ -2204,9 +2212,10 @@ class Commande extends CommonOrder
 	 *  Note: For a dedicated shipment, the fetch_lines can be used to load the qty_asked and qty_shipped. This function is use to return qty_shipped cumulated for the order
 	 *
 	 *	@param      int		$filtre_statut      Filter on shipment status
+	 *  @param		int		$fk_product			Add a filter on a product
 	 * 	@return     int                			<0 if KO, Nb of lines found if OK
 	 */
-	public function loadExpeditions($filtre_statut = -1)
+	public function loadExpeditions($filtre_statut = -1, $fk_product = 0)
 	{
 		$this->expeditions = array();
 
@@ -2222,12 +2231,12 @@ class Commande extends CommonOrder
 			$sql .= ' ed.fk_expedition = e.rowid AND';
 		}
 		$sql .= ' ed.fk_origin_line = cd.rowid';
-		$sql .= ' AND cd.fk_commande ='.$this->id;
+		$sql .= ' AND cd.fk_commande = '.((int) $this->id);
 		if ($this->fk_product > 0) {
-			$sql .= ' AND cd.fk_product = '.$this->fk_product;
+			$sql .= ' AND cd.fk_product = '.((int) $this->fk_product);
 		}
 		if ($filtre_statut >= 0) {
-			$sql .= ' AND e.fk_statut >= '.$filtre_statut;
+			$sql .= ' AND e.fk_statut >= '.((int) $filtre_statut);
 		}
 		$sql .= ' GROUP BY cd.rowid, cd.fk_product';
 		//print $sql;
@@ -2264,7 +2273,7 @@ class Commande extends CommonOrder
 		$sql = 'SELECT count(*)';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'expedition as e';
 		$sql .= ', '.MAIN_DB_PREFIX.'element_element as el';
-		$sql .= ' WHERE el.fk_source = '.$this->id;
+		$sql .= ' WHERE el.fk_source = '.((int) $this->id);
 		$sql .= " AND el.sourcetype = 'commande'";
 		$sql .= " AND el.fk_target = e.rowid";
 		$sql .= " AND el.targettype = 'shipping'";
@@ -2421,7 +2430,7 @@ class Commande extends CommonOrder
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
 			$sql .= ' SET remise_percent = '.((float) $remise);
-			$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT;
+			$sql .= ' WHERE rowid = '.((int) $this->id).' AND fk_statut = '.((int) self::STATUS_DRAFT);
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -2485,7 +2494,7 @@ class Commande extends CommonOrder
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande';
 			$sql .= ' SET remise_absolue = '.((float) $remise);
-			$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT;
+			$sql .= ' WHERE rowid = '.((int) $this->id).' AND fk_statut = '.self::STATUS_DRAFT;
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -2678,16 +2687,16 @@ class Commande extends CommonOrder
 
 		$sql = "SELECT s.rowid, s.nom as name, s.client,";
 		$sql .= " c.rowid as cid, c.ref";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", sc.fk_soc, sc.fk_user";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.entity IN (".getEntity('commande').")";
 		$sql .= " AND c.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$socid) { //restriction
+		if (empty($user->rights->societe->client->voir) && !$socid) { //restriction
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($socid) {
@@ -2874,7 +2883,7 @@ class Commande extends CommonOrder
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET';
 			$sql .= ' ref_client = '.(empty($ref_client) ? 'NULL' : "'".$this->db->escape($ref_client)."'");
-			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= ' WHERE rowid = '.((int) $this->id);
 
 			dol_syslog(__METHOD__.' this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -2930,7 +2939,7 @@ class Commande extends CommonOrder
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 1';
-		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
+		$sql .= " WHERE rowid = ".((int) $this->id).' AND fk_statut > '.self::STATUS_DRAFT;
 
 		dol_syslog(get_class($this)."::classifyBilled", LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -2980,7 +2989,7 @@ class Commande extends CommonOrder
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 0';
-		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
+		$sql .= " WHERE rowid = ".((int) $this->id).' AND fk_statut > '.self::STATUS_DRAFT;
 
 		dol_syslog(get_class($this)."::classifyUnBilled", LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -3505,7 +3514,7 @@ class Commande extends CommonOrder
 
 		$sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.date_livraison as delivery_date, c.fk_statut, c.total_ht";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = " AND";
@@ -3915,7 +3924,7 @@ class Commande extends CommonOrder
 		$sql = "SELECT count(co.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande as co";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
@@ -4396,25 +4405,25 @@ class OrderLine extends CommonOrderLine
 		$sql .= " ".($this->price != '' ? "'".price2num($this->price)."'" : "null").",";
 		$sql .= " '".price2num($this->remise)."',";
 		$sql .= ' '.(!empty($this->fk_remise_except) ? $this->fk_remise_except : "null").',';
-		$sql .= ' '.$this->special_code.',';
-		$sql .= ' '.$this->rang.',';
+		$sql .= ' '.((int) $this->special_code).',';
+		$sql .= ' '.((int) $this->rang).',';
 		$sql .= ' '.(!empty($this->fk_fournprice) ? $this->fk_fournprice : "null").',';
 		$sql .= ' '.price2num($this->pa_ht).',';
-		$sql .= " '".$this->db->escape($this->info_bits)."',";
-		$sql .= " ".price2num($this->total_ht).",";
-		$sql .= " ".price2num($this->total_tva).",";
-		$sql .= " ".price2num($this->total_localtax1).",";
-		$sql .= " ".price2num($this->total_localtax2).",";
-		$sql .= " ".price2num($this->total_ttc).",";
+		$sql .= " ".((int) $this->info_bits).",";
+		$sql .= " ".price2num($this->total_ht, 'MT').",";
+		$sql .= " ".price2num($this->total_tva, 'MT').",";
+		$sql .= " ".price2num($this->total_localtax1, 'MT').",";
+		$sql .= " ".price2num($this->total_localtax2, 'MT').",";
+		$sql .= " ".price2num($this->total_ttc, 'MT').",";
 		$sql .= " ".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null").',';
 		$sql .= " ".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null").',';
-		$sql .= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit);
-		$sql .= ", ".(!empty($this->fk_multicurrency) ? $this->fk_multicurrency : 'NULL');
+		$sql .= ' '.(!$this->fk_unit ? 'NULL' : ((int) $this->fk_unit));
+		$sql .= ", ".(!empty($this->fk_multicurrency) ? ((int) $this->fk_multicurrency) : 'NULL');
 		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql .= ", ".$this->multicurrency_subprice;
-		$sql .= ", ".$this->multicurrency_total_ht;
-		$sql .= ", ".$this->multicurrency_total_tva;
-		$sql .= ", ".$this->multicurrency_total_ttc;
+		$sql .= ", ".price2num($this->multicurrency_subprice, 'CU');
+		$sql .= ", ".price2num($this->multicurrency_total_ht, 'CT');
+		$sql .= ", ".price2num($this->multicurrency_total_tva, 'CT');
+		$sql .= ", ".price2num($this->multicurrency_total_ttc, 'CT');
 		$sql .= ')';
 
 		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index 8ac89d5a18f..d02d56175ff 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -93,7 +93,7 @@ class CommandeStats extends Stats
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
 		$this->where .= ($this->where ? ' AND ' : '').'c.entity IN ('.getEntity('commande').')';
 
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($this->socid) {
@@ -128,7 +128,7 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -153,7 +153,7 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT date_format(c.date_commande,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -177,7 +177,7 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -202,7 +202,7 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, AVG(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -225,7 +225,7 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT date_format(c.date_commande,'%Y') as year, COUNT(*) as nb, SUM(c.".$this->field.") as total, AVG(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -249,7 +249,7 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT product.ref, COUNT(product.ref) as nb, SUM(tl.".$this->field_line.") as total, AVG(tl.".$this->field_line.") as avg";
 		$sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 0a44d87f4ae..a4d857a47fd 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -143,7 +143,7 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->commande->creer) {
 				if ($action != 'classify') {
-					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
 				}
 				if ($action == 'classify') {
@@ -161,9 +161,10 @@ if ($id > 0 || !empty($ref)) {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 3ecaa0fbee1..e181cc03c6a 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -46,8 +46,8 @@ if (!$user->rights->facture->creer) {
 $langs->loadLangs(array("companies", "orders"));
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -77,16 +77,16 @@ $thirdpartystatic = new Societe($db);
 
 $sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea";
 $sql .= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta ";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", sc.fk_soc, sc.fk_user ";
 }
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st, ".MAIN_DB_PREFIX."commande as c";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE s.fk_stcomm = st.id AND c.fk_soc = s.rowid";
 $sql .= " AND s.entity IN (".getEntity('societe').")";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if (GETPOST("search_nom")) {
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index f8cc503e0ec..684d8e61334 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -46,8 +46,8 @@ $ref		= GETPOST('ref');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -135,7 +135,7 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->commande->creer) {
 				if ($action != 'classify') {
-					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
 				}
 				if ($action == 'classify') {
@@ -153,9 +153,10 @@ if ($id > 0 || !empty($ref)) {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index a794d79e743..03644fe5690 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -94,7 +94,7 @@ if (!empty($conf->commande->enabled)) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
@@ -103,7 +103,7 @@ if (!empty($conf->commande->enabled)) {
 	if ($socid) {
 		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 
@@ -146,7 +146,7 @@ if (!empty($conf->commande->enabled)) {
 }
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 $max = 5;
@@ -162,7 +162,7 @@ $sql .= ", s.code_client";
 $sql .= ", s.canvas";
 $sql .= " FROM ".MAIN_DB_PREFIX."commande as c,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE c.fk_soc = s.rowid";
@@ -171,7 +171,7 @@ $sql .= " AND c.entity IN (".getEntity('commande').")";
 if ($socid) {
 	$sql .= " AND c.fk_soc = ".((int) $socid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " ORDER BY c.tms DESC";
@@ -246,7 +246,7 @@ if (!empty($conf->commande->enabled)) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
@@ -255,7 +255,7 @@ if (!empty($conf->commande->enabled)) {
 	if ($socid) {
 		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	$sql .= " ORDER BY c.rowid DESC";
@@ -335,7 +335,7 @@ if (!empty($conf->commande->enabled)) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
@@ -344,7 +344,7 @@ if (!empty($conf->commande->enabled)) {
 	if ($socid) {
 		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	$sql .= " ORDER BY c.rowid DESC";
@@ -414,7 +414,7 @@ if (!empty($conf->commande->enabled)) {
 }
 
 
-print '</div></div></div>';
+print '</div></div>';
 
 $parameters = array('user' => $user);
 $reshook = $hookmanager->executeHooks('dashboardOrders', $parameters, $object); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 2e5f0b696ff..38d8beba2ec 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -88,7 +88,7 @@ if (!empty($conf->projet->enabled)) {
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->commande->creer) {
 		if ($action != 'classify') {
-			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			$morehtmlref .= ' : ';
 		}
 		if ($action == 'classify') {
@@ -106,9 +106,10 @@ if (!empty($conf->projet->enabled)) {
 		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>';
+			$morehtmlref .= ' : '.$proj->getNomUrl(1);
+			if ($proj->title) {
+				$morehtmlref .= ' - '.$proj->title;
+			}
 		} else {
 			$morehtmlref .= '';
 		}
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index b534d915914..35abd34728a 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -33,7 +33,6 @@
  *	\brief      Page to list orders
  */
 
-
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -41,6 +40,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+if (!empty($conf->margin->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
+}
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -117,8 +119,8 @@ $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/ma
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
@@ -187,6 +189,11 @@ $arrayfields = array(
 	'c.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>105),
 	'c.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>110),
 	'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_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)),
 	'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>120),
 	'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>125),
 	'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>130),
@@ -309,13 +316,14 @@ if ($action == 'validate' && $permissiontoadd) {
 						$idwarehouse = 0;
 					}
 					if ($objecttmp->valid($user, $idwarehouse)) {
-						setEventMessage($objecttmp->ref." ".$langs->trans('PassedInOpenStatus'), 'mesgs');
+						setEventMessage($langs->trans('hasBeenValidated', $objecttmp->ref), 'mesgs');
 					} else {
 						setEventMessage($langs->trans('CantBeValidated'), 'errors');
 						$error++;
 					}
 				} else {
-					setEventMessage($objecttmp->ref." ".$langs->trans('IsNotADraft'), 'errors');
+					$langs->load("errors");
+					setEventMessage($langs->trans('ErrorIsNotADraft', $objecttmp->ref), 'errors');
 					$error++;
 				}
 			} else {
@@ -339,13 +347,14 @@ if ($action == 'shipped' && $permissiontoadd) {
 			if ($objecttmp->fetch($checked)) {
 				if ($objecttmp->statut == 1) {
 					if ($objecttmp->cloture($user)) {
-						setEventMessage($objecttmp->ref." ".$langs->trans('PassedInOpenStatus'), 'mesgs');
+						setEventMessage($langs->trans('PassedInClosedStatus', $objecttmp->ref), 'mesgs');
 					} else {
-						setEventMessage($langs->trans('CantBeValidated'), 'errors');
+						setEventMessage($langs->trans('CantBeClosed'), 'errors');
 						$error++;
 					}
 				} else {
-					setEventMessage($objecttmp->ref." ".$langs->trans('IsNotADraft'), 'errors');
+					$langs->load("errors");
+					setEventMessage($langs->trans('ErrorIsNotADraft', $objecttmp->ref), 'errors');
 					$error++;
 				}
 			} else {
@@ -405,6 +414,10 @@ $now = dol_now();
 $form = new Form($db);
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
+$formmargin = null;
+if (!empty($conf->margin->enabled)) {
+	$formmargin = new FormMargin($db);
+}
 $companystatic = new Societe($db);
 $formcompany = new FormCompany($db);
 $projectstatic = new Project($db);
@@ -435,7 +448,7 @@ if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
 // 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
@@ -450,7 +463,7 @@ if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
 }
 $sql .= ', '.MAIN_DB_PREFIX.'commande as c';
-if (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."commande_extrafields as ef on (c.rowid = ef.fk_object)";
 }
 if ($sall || $search_product_category > 0) {
@@ -463,7 +476,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = c.fk_projet";
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON c.fk_user_author = u.rowid';
 
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
+if ($search_sale > 0 || (empty($user->rights->societe->client->voir) && !$socid)) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 if ($search_user > 0) {
@@ -484,7 +497,7 @@ if ($search_product_category > 0) {
 if ($socid > 0) {
 	$sql .= ' AND s.rowid = '.((int) $socid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+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) {
@@ -500,16 +513,13 @@ if ($search_billed != '' && $search_billed >= 0) {
 	$sql .= ' AND c.facture = '.((int) $search_billed);
 }
 if ($search_status <> '') {
-	if ($search_status < 4 && $search_status > -3) {
+	if ($search_status <= 3 && $search_status >= -1) {	// status from -1 to 3 are real status (other are virtual combination)
 		if ($search_status == 1 && empty($conf->expedition->enabled)) {
 			$sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status 'sending in process' into 'validated'
 		} else {
-			$sql .= ' AND c.fk_statut = '.$search_status; // brouillon, validee, en cours, annulee
+			$sql .= ' AND c.fk_statut = '.((int) $search_status); // brouillon, validee, en cours, annulee
 		}
 	}
-	if ($search_status == 4) {
-		$sql .= ' AND c.facture = 1'; // invoice created
-	}
 	if ($search_status == -2) {	// To process
 		//$sql.= ' AND c.fk_statut IN (1,2,3) AND c.facture = 0';
 		$sql .= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))"; // If status is 2 and facture=1, it must be selected
@@ -519,6 +529,9 @@ if ($search_status <> '') {
 		//$sql.= ' AND c.facture = 0'; // invoice not created
 		$sql .= ' AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))'; // validated, in process or closed but not billed
 	}
+	if ($search_status == -4) {	//  "validate and in progress"
+		$sql .= ' AND (c.fk_statut IN (1,2))'; // validated, in process
+	}
 }
 
 if ($search_datecloture_start) {
@@ -579,7 +592,7 @@ if ($search_warehouse != '' && $search_warehouse > 0) {
 	$sql .= natural_search('c.fk_warehouse', $search_warehouse, 1);
 }
 if ($search_multicurrency_code != '') {
-	$sql .= ' AND c.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
+	$sql .= " AND c.multicurrency_code = '".$db->escape($search_multicurrency_code)."'";
 }
 if ($search_multicurrency_tx != '') {
 	$sql .= natural_search('c.multicurrency_tx', $search_multicurrency_tx, 1);
@@ -631,7 +644,7 @@ $sql .= $hookmanager->resPrint;
 // Add HAVING from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListHaving', $parameters, $object); // Note that $action and $object may have been modified by hook
-$sql .= !empty($hookmanager->resPrint) ? (' HAVING 1=1 ' . $hookmanager->resPrint) : '';
+$sql .= empty($hookmanager->resPrint) ? "" : " HAVING 1=1 ".$hookmanager->resPrint;
 
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -674,9 +687,6 @@ if ($resql) {
 	if ($search_status == 3) {
 		$title .= ' - '.$langs->trans('StatusOrderToBillShort');
 	}
-	if ($search_status == 4) {
-		$title .= ' - '.$langs->trans('StatusOrderProcessedShort');
-	}
 	if ($search_status == -1) {
 		$title .= ' - '.$langs->trans('StatusOrderCanceledShort');
 	}
@@ -686,6 +696,9 @@ if ($resql) {
 	if ($search_status == -3) {
 		$title .= ' - '.$langs->trans('StatusOrderValidated').', '.(empty($conf->expedition->enabled) ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
 	}
+	if ($search_status == -4) {
+		$title .= ' - '.$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort");
+	}
 
 	$num = $db->num_rows($resql);
 
@@ -965,14 +978,14 @@ if ($resql) {
 		$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>';
 	}
 	// If the user can view other users
 	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');
+		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
@@ -981,14 +994,14 @@ if ($resql) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300 widthcentpercentminusx', 1);
 		$moreforfilter .= '</div>';
 	}
 	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
-		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle);
+		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle, 'maxwidth300 widthcentpercentminusx');
 		$moreforfilter .= '</div>';
 	}
 	if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
@@ -996,7 +1009,7 @@ if ($resql) {
 		$formproduct = new FormProduct($db);
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('Warehouse');
-		$moreforfilter .= img_picto($tmptitle, 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', 1, 0, 0, $tmptitle);
+		$moreforfilter .= img_picto($tmptitle, 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', 1, 0, 0, $tmptitle, 0, 0, array(), 'maxwidth250 widthcentpercentminusx');
 		$moreforfilter .= '</div>';
 	}
 	$parameters = array();
@@ -1188,6 +1201,25 @@ if ($resql) {
 		print '<input class="flat" size="4" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
 		print '</td>';
 	}
+	if (!empty($arrayfields['sale_representative']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
+	if (!empty($arrayfields['total_pa']['checked'])) {
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['total_margin']['checked'])) {
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['total_margin_rate']['checked'])) {
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['total_mark_rate']['checked'])) {
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 	// Fields from hook
@@ -1252,9 +1284,10 @@ if ($resql) {
 			Commande::STATUS_SHIPMENTONPROCESS=>$langs->trans("StatusOrderSentShort"),
 			Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
 			-3=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort").'+'.$langs->trans("StatusOrderDelivered"),
+			-2=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort"),
 			Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort")
 		);
-		print $form->selectarray('search_status', $liststatus, $search_status, -4, 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
@@ -1345,11 +1378,41 @@ if ($resql) {
 	if (!empty($arrayfields['u.login']['checked'])) {
 		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
 	}
+	if (!empty($arrayfields['sale_representative']['checked'])) {
+		print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['total_pa']['checked'])) {
+		print_liste_field_titre($arrayfields['total_pa']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['total_margin']['checked'])) {
+		print_liste_field_titre($arrayfields['total_margin']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['total_margin_rate']['checked'])) {
+		print_liste_field_titre($arrayfields['total_margin_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['total_mark_rate']['checked'])) {
+		print_liste_field_titre($arrayfields['total_mark_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
 
+	$totalarray = array(
+		'nbfield' => 0,
+		'val' => array(
+			'c.total_ht' => 0,
+			'c.total_tva' => 0,
+			'c.total_ttc' => 0,
+		),
+		'pos' => array(),
+	);
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
-	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$parameters = array(
+		'arrayfields' => $arrayfields,
+		'param' => $param,
+		'sortfield' => $sortfield,
+		'sortorder' => $sortorder,
+		'totalarray' => &$totalarray,
+	);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (!empty($arrayfields['c.datec']['checked'])) {
@@ -1389,7 +1452,18 @@ if ($resql) {
 	$generic_product = new Product($db);
 	$userstatic = new User($db);
 	$i = 0;
-	$totalarray = array('nbfield' => 0, 'val' => array(), 'pos' => array());
+
+	$with_margin_info = false;
+	if (!empty($conf->margin->enabled) && (
+			!empty($arrayfields['total_pa']['checked'])
+			|| !empty($arrayfields['total_margin']['checked'])
+			|| !empty($arrayfields['total_margin_rate']['checked'])
+			|| !empty($arrayfields['total_mark_rate']['checked'])
+		)
+	) {
+		$with_margin_info = true;
+	}
+
 	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
@@ -1432,6 +1506,12 @@ if ($resql) {
 		$projectstatic->ref = $obj->project_ref;
 		$projectstatic->title = $obj->project_label;
 
+		$marginInfo = array();
+		if ($with_margin_info === true) {
+			$generic_commande->fetch_lines();
+			$marginInfo = $formmargin->getMarginInfosArray($generic_commande);
+		}
+
 		print '<tr class="oddeven">';
 
 		// Ref
@@ -1439,11 +1519,6 @@ if ($resql) {
 			print '<td class="nowraponall">';
 			print $generic_commande->getNomUrl(1, ($search_status != 2 ? 0 : $obj->fk_statut), 0, 0, 0, 1, 1);
 
-			// Warning late icon and note
-			if ($generic_commande->hasDelay()) {
-				print img_picto($langs->trans("Late").' : '.$generic_commande->showDelay(), "warning");
-			}
-
 			$filename = dol_sanitizeFileName($obj->ref);
 			$filedir = $conf->commande->multidir_output[$conf->entity].'/'.dol_sanitizeFileName($obj->ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
@@ -1567,6 +1642,10 @@ if ($resql) {
 		if (!empty($arrayfields['c.date_commande']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->date_commande), 'day');
+			// Warning late icon and note
+			if ($generic_commande->hasDelay()) {
+				print img_picto($langs->trans("Late").' : '.$generic_commande->showDelay(), "warning");
+			}
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1722,6 +1801,86 @@ if ($resql) {
 			}
 		}
 
+		if (!empty($arrayfields['sale_representative']['checked'])) {
+			// Sales representatives
+			print '<td>';
+			if ($obj->socid > 0) {
+				$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
+				if ($listsalesrepresentatives < 0) {
+					dol_print_error($db);
+				}
+				$nbofsalesrepresentative = count($listsalesrepresentatives);
+				if ($nbofsalesrepresentative > 6) {
+					// We print only number
+					print $nbofsalesrepresentative;
+				} elseif ($nbofsalesrepresentative > 0) {
+					$j = 0;
+					foreach ($listsalesrepresentatives as $val) {
+						$userstatic->id = $val['id'];
+						$userstatic->lastname = $val['lastname'];
+						$userstatic->firstname = $val['firstname'];
+						$userstatic->email = $val['email'];
+						$userstatic->statut = $val['statut'];
+						$userstatic->entity = $val['entity'];
+						$userstatic->photo = $val['photo'];
+						$userstatic->login = $val['login'];
+						$userstatic->office_phone = $val['office_phone'];
+						$userstatic->office_fax = $val['office_fax'];
+						$userstatic->user_mobile = $val['user_mobile'];
+						$userstatic->job = $val['job'];
+						$userstatic->gender = $val['gender'];
+						//print '<div class="float">':
+						print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
+						$j++;
+						if ($j < $nbofsalesrepresentative) {
+							print ' ';
+						}
+						//print '</div>';
+					}
+				}
+				//else print $langs->trans("NoSalesRepresentativeAffected");
+			} else {
+				print '&nbsp;';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Total buying or cost price
+		if (!empty($arrayfields['total_pa']['checked'])) {
+			print '<td class="right nowrap">'.price($marginInfo['pa_total']).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Total margin
+		if (!empty($arrayfields['total_margin']['checked'])) {
+			print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
+			}
+			$totalarray['val']['total_margin'] += $marginInfo['total_margin'];
+		}
+		// Total margin rate
+		if (!empty($arrayfields['total_margin_rate']['checked'])) {
+			print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Total mark rate
+		if (!empty($arrayfields['total_mark_rate']['checked'])) {
+			print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
@@ -1784,10 +1943,13 @@ if ($resql) {
 			print '<td class="center">';
 			if (!empty($show_shippable_command) && !empty($conf->stock->enabled)) {
 				if (($obj->fk_statut > $generic_commande::STATUS_DRAFT) && ($obj->fk_statut < $generic_commande::STATUS_CLOSED)) {
-					$generic_commande->getLinesArray(); // This set ->lines
+					$generic_commande->getLinesArray(); 	// Load array ->lines
+					$generic_commande->loadExpeditions();	// Load array ->expeditions
 
 					$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 ($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;
@@ -1802,15 +1964,15 @@ if ($resql) {
 								$generic_product->stock_theorique = $productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_theorique;
 							}
 
+							if ($reliquat > $generic_product->stock_reel) {
+								$notshippable++;
+							}
 							if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) {  // Default code. Default should be this case.
-								$text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->product_ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);
+								$text_info .= $reliquat.' x '.$generic_commande->lines[$lig]->product_ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 20);
 								$text_info .= ' - '.$langs->trans("Stock").': <span class="'.($generic_product->stock_reel > 0 ? 'ok' : 'error').'">'.$generic_product->stock_reel.'</span>';
 								$text_info .= ' - '.$langs->trans("VirtualStock").': <span class="'.($generic_product->stock_theorique > 0 ? 'ok' : 'error').'">'.$generic_product->stock_theorique.'</span>';
+								$text_info .= ($reliquat != $generic_commande->lines[$lig]->qty ? ' <span class="opacitymedium">('.$langs->trans("QtyInOtherShipments").' '.($generic_commande->lines[$lig]->qty - $reliquat).')</span>' : '');
 								$text_info .= '<br>';
-
-								if ($generic_commande->lines[$lig]->qty > $generic_product->stock_reel) {
-									$notshippable++;
-								}
 							} else {  // BUGGED CODE.
 								// DOES NOT TAKE INTO ACCOUNT MANUFACTURING. THIS CODE SHOULD BE USELESS. PREVIOUS CODE SEEMS COMPLETE.
 								// COUNT STOCK WHEN WE SHOULD ALREADY HAVE VALUE
@@ -1838,32 +2000,31 @@ if ($resql) {
 										$stock_order_supplier = $generic_product->stats_commande_fournisseur['qty'];
 									}
 								}
-								$text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);
+								$text_info .= $reliquat.' x '.$generic_commande->lines[$lig]->ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 20);
 								$text_stock_reel = $generic_product->stock_reel.'/'.$stock_order;
 								if ($stock_order > $generic_product->stock_reel && !($generic_product->stock_reel < $generic_commande->lines[$lig]->qty)) {
 									$warning++;
 									$text_warning .= '<span class="warning">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
 								}
-								if ($generic_product->stock_reel < $generic_commande->lines[$lig]->qty) {
-									$notshippable++;
+								if ($reliquat > $generic_product->stock_reel) {
 									$text_info .= '<span class="warning">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
 								} else {
 									$text_info .= '<span class="ok">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
 								}
 								if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled)) {
-									$text_info .= '&nbsp;'.$langs->trans('SupplierOrder').'&nbsp;:&nbsp;'.$stock_order_supplier.'<br>';
-								} else {
-									$text_info .= '<br>';
+									$text_info .= '&nbsp;'.$langs->trans('SupplierOrder').'&nbsp;:&nbsp;'.$stock_order_supplier;
 								}
+								$text_info .= ($reliquat != $generic_commande->lines[$lig]->qty ? ' <span class="opacitymedium">('.$langs->trans("QtyInOtherShipments").' '.($generic_commande->lines[$lig]->qty - $reliquat).')</span>' : '');
+								$text_info .= '<br>';
 							}
 						}
 					}
 					if ($notshippable == 0) {
 						$text_icon = img_picto('', 'dolly', '', false, 0, 0, '', 'green paddingleft');
-						$text_info = $langs->trans('Shippable').'<br>'.$text_info;
+						$text_info = $text_icon.' '.$langs->trans('Shippable').'<br>'.$text_info;
 					} else {
 						$text_icon = img_picto('', 'dolly', '', false, 0, 0, '', 'error paddingleft');
-						$text_info = $langs->trans('NonShippable').'<br>'.$text_info;
+						$text_info = $text_icon.' '.$langs->trans('NonShippable').'<br>'.$text_info;
 					}
 				}
 
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 6872990a3ec..55140c30ae2 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -45,6 +45,10 @@ $socid = 0;
 if ($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('ordernote'));
+
 $result = restrictedArea($user, 'commande', $id, '');
 
 
@@ -61,7 +65,13 @@ $permissionnote = $user->rights->commande->creer; // Used by the include of acti
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$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
+}
 
 
 /*
@@ -97,7 +107,7 @@ if ($id > 0 || !empty($ref)) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->commande->creer) {
 			if ($action != 'classify') {
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -106,7 +116,7 @@ if ($id > 0 || !empty($ref)) {
 				$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 .= '<input type="submit" class="button button-edit 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);
@@ -115,9 +125,10 @@ if ($id > 0 || !empty($ref)) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index bd92dc084c7..3d2dee9a286 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -42,7 +42,7 @@ $mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer';
 if ($mode == 'customer' && !$user->rights->commande->lire) {
 	accessforbidden();
 }
-if ($mode == 'supplier' && !$user->rights->fournisseur->commande->lire) {
+if ($mode == 'supplier' && empty($user->rights->fournisseur->commande->lire)) {
 	accessforbidden();
 }
 
@@ -112,7 +112,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filenamenb = $dir.'/ordersnbinyear-'.$user->id.'-'.$year.'.png';
 	if ($mode == 'customer') {
 		$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
@@ -158,7 +158,7 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
 //var_dump($data);
 // $data = array(array('Lib',val1,val2,val3),...)
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filenameamount = $dir.'/ordersamountinyear-'.$user->id.'-'.$year.'.png';
 	if ($mode == 'customer') {
 		$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
@@ -202,7 +202,7 @@ if (!$mesg) {
 
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
 	if ($mode == 'customer') {
 		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
@@ -347,9 +347,9 @@ if (!in_array($nowyear, $arrayyears)) {
 	$arrayyears[$nowyear] = $nowyear;
 }
 arsort($arrayyears);
-print $form->selectarray('year', $arrayyears, $year, 0);
+print $form->selectarray('year', $arrayyears, $year, 0, 0, 0, '', 0, 0, 0, '', 'width75');
 print '</td></tr>';
-print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
+print '<tr><td align="center" colspan="2"><input type="submit" class="button small" name="submit" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
 print '</form>';
 print '<br><br>';
@@ -401,7 +401,7 @@ print '</table>';
 print '</div>';
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 // Show graphs
@@ -418,7 +418,7 @@ if ($mesg) {
 print '</td></tr></table>';
 
 
-print '</div></div></div>';
+print '</div></div>';
 print '<div style="clear:both"></div>';
 
 print dol_get_fiche_end();
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index a0641c4c493..2a6140aaeed 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 -->\n";
+print "<!-- BEGIN PHP TEMPLATE commande/tpl/linkedopjectblock.tpl.php -->\n";
 
 global $user;
 global $noMoreLinkedObjectBlockAfter;
@@ -52,8 +52,8 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	}
 	echo '</td>';
 	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
-	echo '<td class="linkedcol-ref" align="center">'.$objectlink->ref_client.'</td>';
-	echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date, 'day').'</td>';
+	echo '<td class="linkedcol-ref">'.$objectlink->ref_client.'</td>';
+	echo '<td class="linkedcol-date">'.dol_print_date($objectlink->date, 'day').'</td>';
 	echo '<td class="linkedcol-amount right">';
 	if ($user->rights->commande->lire) {
 		$total = $total + $objectlink->total_ht;
@@ -64,7 +64,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	echo '<td class="linkedcol-action right">';
 	// For now, shipments must stay linked to order, so link is not deletable
 	if ($object->element != 'shipping') {
-		echo '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a>';
+		echo '<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/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index a06dd8dacaf..1f821bf733b 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -499,7 +499,7 @@ if ($result && $action == "dl" && !$error) {
 		$zip->addFromString('transactions.csv', $log);
 		$zip->close();
 
-		///Then download the zipped file.
+		// Then download the zipped file.
 		header('Content-Type: application/zip');
 		header('Content-disposition: attachment; filename='.basename($zipname));
 		header('Content-Length: '.filesize($zipname));
@@ -578,7 +578,7 @@ print '<br>';
 
 foreach ($listofchoices as $choice => $val) {
 	if (empty($val['enabled'])) {
-		continue;		// list not qualified
+		continue; // list not qualified
 	}
 	$disabled = '';
 	if (empty($val['perms'])) {
@@ -588,7 +588,7 @@ 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 class="button" type="submit" name="search" value="'.$langs->trans("Search").'">';
+print '<input type="submit" class="button" name="search" value="'.$langs->trans("Search").'">';
 
 print '</form>'."\n";
 
@@ -736,7 +736,7 @@ if (!empty($date_start) && !empty($date_stop)) {
 				print '<td>';
 				if (!empty($data['files'])) {
 					foreach ($data['files'] as $id => $filecursor) {
-						print '<a href='.DOL_URL_ROOT.'/'.$filecursor['link'].' target="_blank">'.($filecursor['name'] ? $filecursor['name'] : $filecursor['ref']).'</a>&nbsp;'.$formfile->showPreview($filecursor, $filecursor['modulepart'], $filecursor['subdir'].'/'.$filecursor['name']).'<br>';
+						print '<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>';
 					}
 				}
 				print "</td>\n";
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index 03209ad7673..09cf9709aee 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -8,7 +8,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -53,8 +53,8 @@ if ($user->socid) {
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -120,6 +120,8 @@ if (GETPOST("rel") == 'prev') {
 	$found = true;
 }
 
+$permissiontoadd = $user->rights->banque->modifier;	// Used by the include of actions_dellink.inc.php
+
 
 /*
  * Actions
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index d771b307234..36a9d17315a 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -448,9 +448,9 @@ if ($result < 0) {
 
 	print '<div class="fichecenter"><div class="fichehalfleft"><div align="center">'; // do not use class="center" here, it will have no effect for the js graph inside.
 	print $show1;
-	print '</div></div><div class="fichehalfright"><div class="ficheaddleft"><div align="center">'; // do not use class="center" here, it will have no effect for the js graph inside.
+	print '</div></div><div class="fichehalfright"><div align="center">'; // do not use class="center" here, it will have no effect for the js graph inside.
 	print $show2;
-	print '</div></div></div></div>';
+	print '</div></div></div>';
 	print '<div style="clear:both"></div>';
 }
 
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 2e49fc015d2..3d8e6f8bd98 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2016       Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2017-2019  Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021  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
@@ -64,12 +64,13 @@ $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 $contextpage = 'banktransactionlist'.(empty($object->ref) ? '' : '-'.$object->id);
+$massaction = GETPOST('massaction', 'alpha');
 $optioncss = GETPOST('optioncss', 'aZ09');
 
 // Security check
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
 $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
-if ($fielvalue) {
+if ($fieldvalue) {
 	if ($user->socid) {
 		$socid = $user->socid;
 	}
@@ -98,14 +99,16 @@ $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');
+$optioncss = GETPOST('optioncss', 'alpha');
+$toselect = GETPOST('toselect', 'array');
 $num_releve = GETPOST("num_releve", "alpha");
 if (empty($dateop)) {
 	$dateop = -1;
 }
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $pageplusone = GETPOST("pageplusone", 'int');
 if ($pageplusone) {
@@ -211,6 +214,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_thirdparty_user = '';
 	$search_num_releve = '';
 	$search_conciliated = '';
+	$toselect = '';
 
 	$search_account = "";
 	if ($id > 0 || !empty($ref)) {
@@ -221,14 +225,14 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 if (empty($reshook)) {
 	$objectclass = 'Account';
 	$objectlabel = 'BankTransaction';
-	$permissiontoread = $user->rights->banque->lire;
-	$permissiontodelete = $user->rights->banque->supprimer;
+	$permissiontoread = !empty($user->rights->banque->lire);
+	$permissiontodelete = !empty($user->rights->banque->modifier);
 	$uploaddir = $conf->bank->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 // Conciliation
-if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', 'alpha')) && $user->rights->banque->consolidate
+if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', 'alpha')) && !empty($user->rights->banque->consolidate)
 	&& (!GETPOSTISSET('pageplusone') || (GETPOST('pageplusone') == GETPOST('pageplusoneold')))) {
 	$error = 0;
 
@@ -312,7 +316,7 @@ if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', '
 }
 
 
-if (GETPOST('save') && !$cancel && $user->rights->banque->modifier) {
+if (GETPOST('save') && !$cancel && !empty($user->rights->banque->modifier)) {
 	$error = 0;
 
 	if (price2num(GETPOST("addcredit")) > 0) {
@@ -372,7 +376,7 @@ if (GETPOST('save') && !$cancel && $user->rights->banque->modifier) {
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->modifier) {
+if ($action == 'confirm_delete' && $confirm == 'yes' && !empty($user->rights->banque->modifier)) {
 	$accline = new AccountLine($db);
 	$result = $accline->fetch(GETPOST("rowid", "int"));
 	$result = $accline->delete($user);
@@ -485,6 +489,11 @@ if ($optioncss != '') {
 if ($action == 'reconcile') {
 	$param .= '&action=reconcile';
 }
+$totalarray = array(
+	'nbfield' => 0,
+	'totalcred' => 0,
+	'totaldeb' => 0,
+);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -562,7 +571,7 @@ $sql .= " ba.rowid as bankid, ba.ref as bankref";
 // 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
@@ -575,7 +584,7 @@ if ($search_bid > 0) {
 }
 $sql .= " ".MAIN_DB_PREFIX."bank_account as ba,";
 $sql .= " ".MAIN_DB_PREFIX."bank as b";
-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 (b.rowid = ef.fk_object)";
 }
 $sql .= " WHERE b.fk_account = ba.rowid";
@@ -733,7 +742,7 @@ $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
 
-	$arrayofselected = is_array($toselect) ? $toselect : array();
+	$arrayofselected = (!empty($toselect) && is_array($toselect)) ? $toselect : array();
 
 	// List of mass actions available
 	$arrayofmassactions = array(
@@ -760,7 +769,9 @@ if ($resql) {
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="'.($action != 'delete' ? $action : 'search').'">';
-	print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
+	if (!empty($view)) {
+		print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
+	}
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
@@ -834,7 +845,7 @@ if ($resql) {
 	}
 
 	// Form to add a transaction with no invoice
-	if ($user->rights->banque->modifier && $action == 'addline' && !empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {
+	if (!empty($user->rights->banque->modifier) && $action == 'addline' && !empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {
 		print load_fiche_titre($langs->trans("AddBankRecordLong"), '', '');
 
 		print '<table class="noborder centpercent">';
@@ -890,7 +901,7 @@ if ($resql) {
 			print '</td>';
 		}*/
 		print '<td class="center">';
-		print '<input type="submit" name="save" class="button buttongen marginbottomonly" value="'.$langs->trans("Add").'"><br>';
+		print '<input type="submit" name="save" class="button buttongen marginbottomonly button-add" value="'.$langs->trans("Add").'"><br>';
 		print '<input type="submit" name="cancel" class="button buttongen marginbottomonly button-cancel" value="'.$langs->trans("Cancel").'">';
 		print '</td></tr>';
 
@@ -930,16 +941,17 @@ if ($resql) {
 	if ($action != 'addline' && $action != 'reconcile') {
 		if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
 			if (empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {	// Default is to record miscellaneous direct entries using miscellaneous payments
-				$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$search_account.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.urlencode($search_account)), '', $user->rights->banque->modifier);
+				$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.urlencode($search_account).'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.urlencode($search_account)), '', $user->rights->banque->modifier);
 			} else // If direct entries is not done using miscellaneous payments
 			{
-				$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', $user->rights->banque->modifier);
+				$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&token='.newToken().'&page='.$page.$param, '', $user->rights->banque->modifier);
 			}
 		} else {
-			$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', -1);
+			$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&token='.newToken().'&page='.$page.$param, '', -1);
 		}
 	}
 
+	$morehtml = '';
 	/*$morehtml = '<div class="inline-block '.(($buttonreconcile || $newcardbutton) ? 'marginrightonly' : '').'">';
 	$morehtml .= '<label for="pageplusone">'.$langs->trans("Page")."</label> "; // ' Page ';
 	$morehtml .= '<input type="text" name="pageplusone" id="pageplusone" class="flat right width25 pageplusone" value="'.($page + 1).'">';
@@ -1090,8 +1102,7 @@ if ($resql) {
 		print $form->selectyesno('search_conciliated', $search_conciliated, 1, false, 1, 1);
 		print '</td>';
 	}
-	print '<td class="liste_titre" align="middle">';
-	print '</td>';
+	// Actions and select
 	print '<td class="liste_titre" align="middle">';
 	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
 	print $searchpicto;
@@ -1148,7 +1159,7 @@ 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;
-	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', 'class="right"', $sortfield, $sortorder, 'maxwidthsearch ');
+	// Actions and select
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
 
@@ -1161,7 +1172,6 @@ if ($resql) {
 	// Loop on each record
 	$sign = 1;
 
-	$totalarray = array();
 	while ($i < min($num, $limit)) {
 		$objp = $db->fetch_object($resql);
 		$links = $bankaccountstatic->get_url($objp->rowid);
@@ -1268,7 +1278,7 @@ if ($resql) {
 							</script>';
 					print '</td>';
 				}
-				print '<td colspan="'.($tmpnbfieldafterbalance + 2).'">';
+				print '<td colspan="'.($tmpnbfieldafterbalance + 1).'">';
 				print '&nbsp;';
 				print '</td>';
 				print '</tr>';
@@ -1296,18 +1306,10 @@ if ($resql) {
 			$backgroundcolor = "class='oddeven'";
 		} else {
 			if ($objp->amount < 0) {
-				if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR1)) {
-					$color = '#fca955';
-				} else {
-					$color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR1;
-				}
+				$color = '#' . getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR1', 'fca955');
 				$backgroundcolor = 'style="background: '.$color.';"';
 			} else {
-				if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR2)) {
-					$color = '#7fdb86';
-				} else {
-					$color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR2;
-				}
+				$color = '#' . getDolGlobalString('BANK_COLORIZE_MOVEMENT_COLOR2', '7fdb86');
 				$backgroundcolor = 'style="background: '.$color.';"';
 			}
 		}
@@ -1333,18 +1335,19 @@ if ($resql) {
 			$titletoshow = '';
 			$reg = array();
 			preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthee on tente recherche de traduction
-			if ($reg[1] && $langs->trans($reg[1]) != $reg[1]) {
+			if (!empty($reg[1]) && $langs->trans($reg[1]) != $reg[1]) {
 				$labeltoshow = $langs->trans($reg[1]);
 			} else {
 				if ($objp->label == '(payment_salary)') {
-					$labeltoshow = dol_trunc($langs->trans("SalaryPayment", 40));
+					$labeltoshow = $langs->trans("SalaryPayment");
 				} else {
 					$labeltoshow = dol_escape_htmltag($objp->label);
 					$titletoshow = $objp->label;
 				}
 			}
-			print '<td class="tdoverflowmax300"'.($titletoshow ? ' title="'.dol_escape_htmltag($titletoshow).'"' : '').'>';
-			print $labeltoshow;	// Already escaped
+
+
+			print '<td class="tdoverflowmax250"'.($titletoshow ? ' title="'.dol_escape_htmltag($titletoshow).'"' : '').'>';
 
 			// Add info about links after description
 			$cachebankaccount = array();
@@ -1353,69 +1356,70 @@ if ($resql) {
 				if ($links[$key]['type'] == 'withdraw') {
 					$banktransferstatic->id = $links[$key]['url_id'];
 					$banktransferstatic->ref = $links[$key]['label'];
-					print ' '.$banktransferstatic->getNomUrl(0);
+					print $banktransferstatic->getNomUrl(0).' ';
 				} elseif ($links[$key]['type'] == 'payment') {
 					$paymentstatic->id = $links[$key]['url_id'];
 					$paymentstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
-					print ' '.$paymentstatic->getNomUrl(2);
+					$paymentstatic->date = $db->jdate($objp->do);
+					print $paymentstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_supplier') {
 					$paymentsupplierstatic->id = $links[$key]['url_id'];
 					$paymentsupplierstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
-					print ' '.$paymentsupplierstatic->getNomUrl(2);
+					print $paymentsupplierstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_sc') {
 					$paymentscstatic->id = $links[$key]['url_id'];
 					$paymentscstatic->ref = $links[$key]['url_id'];
 					$paymentscstatic->label = $links[$key]['label'];
-					print ' '.$paymentscstatic->getNomUrl(2);
+					print $paymentscstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_vat') {
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $links[$key]['url_id'];
-					print ' '.$paymentvatstatic->getNomUrl(2);
+					print $paymentvatstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_salary') {
 					$paymentsalstatic->id = $links[$key]['url_id'];
 					$paymentsalstatic->ref = $links[$key]['url_id'];
 					$paymentsalstatic->label = $links[$key]['label'];
-					print ' '.$paymentsalstatic->getNomUrl(2);
+					print $paymentsalstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_loan') {
 					print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
 					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
-					print '</a>';
+					print '</a> ';
 				} elseif ($links[$key]['type'] == 'payment_donation') {
 					$paymentdonationstatic->id = $links[$key]['url_id'];
 					$paymentdonationstatic->ref = $links[$key]['url_id'];
-					print ' '.$paymentdonationstatic->getNomUrl(2);
+					print $paymentdonationstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_expensereport') {
 					$paymentexpensereportstatic->id = $links[$key]['url_id'];
 					$paymentexpensereportstatic->ref = $links[$key]['url_id'];
-					print ' '.$paymentexpensereportstatic->getNomUrl(2);
+					print $paymentexpensereportstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'payment_various') {
 					$paymentvariousstatic->id = $links[$key]['url_id'];
 					$paymentvariousstatic->ref = $links[$key]['url_id'];
-					print ' '.$paymentvariousstatic->getNomUrl(2);
+					print $paymentvariousstatic->getNomUrl(2).' ';
 				} elseif ($links[$key]['type'] == 'banktransfert') {
 					// Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
 					if ($objp->amount > 0) {
 						$banklinestatic->fetch($links[$key]['url_id']);
 						$bankstatic->id = $banklinestatic->fk_account;
 						$bankstatic->label = $banklinestatic->bank_account_ref;
-						print ' ('.$langs->trans("TransferFrom").' ';
+						print $langs->trans("TransferFrom").' ';
 						print $bankstatic->getNomUrl(1, 'transactions');
 						print ' '.$langs->trans("toward").' ';
 						$bankstatic->id = $objp->bankid;
 						$bankstatic->label = $objp->bankref;
 						print $bankstatic->getNomUrl(1, '');
-						print ')';
+						print ' - ';
 					} else {
 						$bankstatic->id = $objp->bankid;
 						$bankstatic->label = $objp->bankref;
-						print ' ('.$langs->trans("TransferFrom").' ';
+						print $langs->trans("TransferFrom").' ';
 						print $bankstatic->getNomUrl(1, '');
 						print ' '.$langs->trans("toward").' ';
 						$banklinestatic->fetch($links[$key]['url_id']);
 						$bankstatic->id = $banklinestatic->fk_account;
 						$bankstatic->label = $banklinestatic->bank_account_ref;
 						print $bankstatic->getNomUrl(1, 'transactions');
-						print ')';
+						print ' - ';
 					}
 					//var_dump($links);
 				} elseif ($links[$key]['type'] == 'company') {
@@ -1427,22 +1431,22 @@ if ($resql) {
 					// Information is already shown using the payment_salary link. No need of this link.
 				} else {
 					// Show link with label $links[$key]['label']
-					if (!empty($objp->label) && !empty($links[$key]['label'])) {
-						print ' - ';
-					}
 					print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
 					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
 						// Label generique car entre parentheses. On l'affiche en le traduisant
 						if ($reg[1] == 'paiement') {
 							$reg[1] = 'Payment';
 						}
-						print ' '.$langs->trans($reg[1]);
+						print $langs->trans($reg[1]);
 					} else {
-						print ' '.$links[$key]['label'];
+						print $links[$key]['label'];
 					}
-					print '</a>';
+					print '</a>'.($labeltoshow ? ' - ' : '');
 				}
 			}
+
+			print $labeltoshow;	// Already escaped
+
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1485,7 +1489,7 @@ if ($resql) {
 
 		// Payment type
 		if (!empty($arrayfields['type']['checked'])) {
-			print '<td align="center" class="nowrap">';
+			print '<td class="tdoverflowmax100 center">';
 			$labeltype = ($langs->trans("PaymentTypeShort".$objp->fk_type) != "PaymentTypeShort".$objp->fk_type) ? $langs->trans("PaymentTypeShort".$objp->fk_type) : $langs->getLabelFromKey($db, $objp->fk_type, 'c_paiement', 'code', 'libelle', '', 1);
 			if ($labeltype == 'SOLD') {
 				print '&nbsp;'; //$langs->trans("InitialBankBalance");
@@ -1511,9 +1515,9 @@ if ($resql) {
 			print '<td class="tdoverflowmax150">';
 
 			$companylinked_id = 0;
-				$userlinked_id = 0;
+			$userlinked_id = 0;
 
-				//payment line type to define user display and user or company linked
+			//payment line type to define user display and user or company linked
 			foreach ($links as $key => $value) {
 				if ($links[$key]['type'] == 'payment_sc') {
 					$type_link = 'payment_sc';
@@ -1660,7 +1664,7 @@ if ($resql) {
 			}
 		}
 
-		// Action edit/delete
+		// Action edit/delete and select
 		print '<td class="nowraponall" align="center">';
 		// Transaction reconciliated or edit link
 		if ($objp->conciliated && $bankaccount->canBeConciliated() > 0) {  // If line not conciliated and account can be conciliated
@@ -1688,19 +1692,14 @@ if ($resql) {
 				print '</a>';
 			}
 		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
 
 		// Action column
-		print '<td class="nowrap" align="center">';
 		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 			$selected = 0;
 			if (in_array($obj->rowid, $arrayofselected)) {
 				$selected = 1;
 			}
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		print '</td>';
 		if (!$i) {
diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index 94ae0134a9d..6edee79f86b 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories'));
 
-if (!$user->rights->banque->lire) {
+if (empty($user->rights->banque->lire)) {
 	accessforbidden();
 }
 
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 989ab236a1c..5d2bb71109b 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -78,7 +78,26 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/compta/bank/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.'/compta/bank/card.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 = '';
 	}
 
@@ -324,7 +343,7 @@ if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewFinancialAccount"), '', 'bank_account');
 
 	if ($conf->use_javascript_ajax) {
-		print "\n".'<script type="text/javascript" language="javascript">';
+		print "\n".'<script type="text/javascript">';
 		print 'jQuery(document).ready(function () {
                     jQuery("#selecttype").change(function() {
                         document.formsoc.action.value="create";
@@ -410,7 +429,7 @@ if ($action == 'create') {
 	print '<tr><td>'.$langs->trans("Web").'</td>';
 	print '<td>';
 	print img_picto('', 'globe', 'class="pictofixedwidth"');
-	print '<input class="minwidth300" type="text" class="flat" name="url" value="'.GETPOST("url").'">';
+	print '<input class="minwidth300 widthcentpercentminusx maxwidth500" type="text" class="flat" name="url" value="'.GETPOST("url").'">';
 	print '</td></tr>';
 
 	// Tags-Categories
@@ -565,11 +584,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("CreateAccount").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-	print '</div>';
+	print $form->buttonsSaveCancel("CreateAccount");
 
 	print '</form>';
 } else {
@@ -683,7 +698,6 @@ if ($action == 'create') {
 
 		print '</div>';
 		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border tableforfield centpercent">';
@@ -780,7 +794,6 @@ if ($action == 'create') {
 			print '</table>';
 		}
 
-		print '</div>';
 		print '</div>';
 		print '</div>';
 
@@ -818,7 +831,7 @@ if ($action == 'create') {
 		print load_fiche_titre($langs->trans("EditFinancialAccount"), '', 'bank_account');
 
 		if ($conf->use_javascript_ajax) {
-			print "\n".'<script type="text/javascript" language="javascript">';
+			print "\n".'<script type="text/javascript">';
 			print 'jQuery(document).ready(function () {
                         jQuery("#selecttype").change(function() {
                             document.formsoc.action.value="edit";
@@ -1047,19 +1060,19 @@ if ($action == 'create') {
 
 			// IBAN
 			print '<tr><td>'.$langs->trans($ibankey).'</td>';
-			print '<td><input class="minwidth300 maxwidth200onsmartphone" maxlength="34" type="text" class="flat" name="iban" value="'.$object->iban.'"></td></tr>';
+			print '<td><input class="minwidth300 maxwidth200onsmartphone" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOSTISSET('iban') ? GETPOST('iban',  'alphanohtml') : $object->iban).'"></td></tr>';
 
 			print '<tr><td>'.$langs->trans($bickey).'</td>';
-			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.$object->bic.'"></td></tr>';
+			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOSTISSET('bic') ? GETPOST('bic',  'alphanohtml') : $object->bic).'"></td></tr>';
 
 			if ($conf->prelevement->enabled) {
 				print '<tr><td>'.$langs->trans("ICS").' ('.$langs->trans("StandingOrder").')</td>';
-				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics" value="'.$object->ics.'"></td></tr>';
+				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>';
-				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics_transfer" value="'.$object->ics_transfer.'"></td></tr>';
+				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("BankAccountDomiciliation").'</td><td>';
@@ -1081,11 +1094,7 @@ if ($action == 'create') {
 
 		print dol_get_fiche_end();
 
-		print '<div class="center">';
-		print '<input value="'.$langs->trans("Modify").'" type="submit" class="button">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input name="cancel" value="'.$langs->trans("Cancel").'" type="submit" class="button button-cancel">';
-		print '</div>';
+		print $form->buttonsSaveCancel("Modify");
 
 		print '</form>';
 	}
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index fb9fead3089..2605bc39d30 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" value="'.$langs->trans("Add").'"></td>';
+	print '<td class="center"><input type="submit" name="add" class="button button-add" value="'.$langs->trans("Add").'"></td>';
 	print '</tr>';
 }
 
@@ -146,8 +146,8 @@ if ($result) {
 			//print '<a href="'.DOL_URL_ROOT.'/compta/bank/budget.php?bid='.$objp->rowid.'">'.$langs->trans("List").'</a>';
 			print '</td>';
 			print '<td class="center">';
-			print '<a class="editfielda reposition marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=edit&amp;token='.newToken().'">'.img_edit().'</a>';
-			print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=delete&amp;token='.newToken().'">'.img_delete().'</a>';
+			print '<a class="editfielda reposition marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&action=edit&token='.newToken().'">'.img_edit().'</a>';
+			print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
 			print '</td>';
 		}
 		print "</tr>";
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index c3628e12b7c..c2745b31426 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -132,11 +132,19 @@ class Account extends CommonObject
 	public $bic;
 
 	/**
-	 * IBAN number (International Bank Account Number). Stored into iban_prefix field into database
+	 * IBAN number (International Bank Account Number). Stored into iban_prefix field into database (TODO Rename field in database)
 	 * @var string
 	 */
 	public $iban;
 
+	/**
+	 * IBAN number
+	 *
+	 * @var string
+	 * @deprecated see $iban
+	 */
+	public $iban_prefix;
+
 	/**
 	 * Name of account holder
 	 * @var string
@@ -687,7 +695,7 @@ class Account extends CommonObject
 		$sql .= "'".$this->db->idate($now)."'";
 		$sql .= ", '".$this->db->escape($this->ref)."'";
 		$sql .= ", '".$this->db->escape($this->label)."'";
-		$sql .= ", ".$conf->entity;
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ", '".$this->db->escape($this->account_number)."'";
 		$sql .= ", ".($this->fk_accountancy_journal > 0 ? $this->db->escape($this->fk_accountancy_journal) : "null");
 		$sql .= ", '".$this->db->escape($this->bank)."'";
@@ -702,8 +710,8 @@ class Account extends CommonObject
 		$sql .= ", '".$this->db->escape($this->owner_address)."'";
 		$sql .= ", '".$this->db->escape($this->currency_code)."'";
 		$sql .= ", ".((int) $this->rappro);
-		$sql .= ", ".price2num($this->min_allowed);
-		$sql .= ", ".price2num($this->min_desired);
+		$sql .= ", ".price2num($this->min_allowed, 'MT');
+		$sql .= ", ".price2num($this->min_desired, 'MT');
 		$sql .= ", '".$this->db->escape($this->comment)."'";
 		$sql .= ", ".($this->state_id > 0 ? ((int) $this->state_id) : "null");
 		$sql .= ", ".($this->country_id > 0 ? ((int) $this->country_id) : "null");
@@ -907,8 +915,8 @@ class Account extends CommonObject
 		$sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
 		$sql .= ",state_id = ".($this->state_id > 0 ? $this->state_id : "null");
 		$sql .= ",fk_pays = ".($this->country_id > 0 ? $this->country_id : "null");
-		$sql .= " WHERE rowid = ".$this->id;
-		$sql .= " AND entity = ".$conf->entity;
+		$sql .= " WHERE rowid = ".((int) $this->id);
+		$sql .= " AND entity = ".((int) $conf->entity);
 
 		dol_syslog(get_class($this)."::update_bban", LOG_DEBUG);
 
@@ -1059,7 +1067,7 @@ class Account extends CommonObject
 		// Delete link between tag and bank account
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_account";
-			$sql .= " WHERE fk_account = ".$this->id;
+			$sql .= " WHERE fk_account = ".((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
@@ -1125,12 +1133,12 @@ class Account extends CommonObject
 		$langs->load('banks');
 
 		if ($status == self::STATUS_OPEN) {
-			$label = $langs->trans("StatusAccountOpened");
-			$labelshort = $langs->trans("StatusAccountOpened");
+			$label = $langs->transnoentitiesnoconv("StatusAccountOpened");
+			$labelshort = $langs->transnoentitiesnoconv("StatusAccountOpened");
 			$statusType = 'status4';
 		} else {
-			$label = $langs->trans("StatusAccountClosed");
-			$labelshort = $langs->trans("StatusAccountClosed");
+			$label = $langs->transnoentitiesnoconv("StatusAccountClosed");
+			$labelshort = $langs->transnoentitiesnoconv("StatusAccountClosed");
 			$statusType = 'status5';
 		}
 
@@ -1151,7 +1159,7 @@ class Account extends CommonObject
 
 		$sql = "SELECT COUNT(rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank";
-		$sql .= " WHERE fk_account=".$this->id;
+		$sql .= " WHERE fk_account = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -1188,7 +1196,7 @@ class Account extends CommonObject
 
 		$sql = "SELECT sum(amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank";
-		$sql .= " WHERE fk_account = ".$this->id;
+		$sql .= " WHERE fk_account = ".((int) $this->id);
 		if ($option == 1) {
 			$sql .= " AND dateo <= '".$this->db->idate(dol_now())."'";
 		}
@@ -1503,7 +1511,7 @@ class Account extends CommonObject
 	{
 		$country_code = $this->getCountryCode();
 
-		if (in_array($country_code, array('FR', 'ES', 'GA', 'IT', 'NC'))) {
+		if (in_array($country_code, array('AD', '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'))) {
@@ -1519,6 +1527,12 @@ class Account extends CommonObject
 	 */
 	public function needIBAN()
 	{
+		global $conf;
+
+		if (!empty($conf->global->MAIN_IBAN_IS_NEVER_MANDATORY)) {
+			return 0;
+		}
+
 		$country_code = $this->getCountryCode();
 
 		$country_code_in_EEC = array(
@@ -1690,21 +1704,21 @@ class Account extends CommonObject
 	/**
 	 * Function used to replace a thirdparty id with another one.
 	 *
-	 * @param DoliDB 	$db 			Database handler
+	 * @param DoliDB 	$dbs 			Database handler
 	 * @param int 		$origin_id 		Old thirdparty id
 	 * @param int 		$dest_id 		New thirdparty id
-	 * @return bool
+	 * @return bool						True=SQL success, False=SQL error
 	 */
-	public static function replaceThirdparty($db, $origin_id, $dest_id)
+	public static function replaceThirdparty($dbs, $origin_id, $dest_id)
 	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."bank_url SET url_id = ".((int) $dest_id)." WHERE url_id = ".((int) $origin_id)." AND type='company'";
 
-		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.
-			//$this->errors = $db->lasterror();
-			return false;
-		} else {
+		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.
+			//$this->errors = $dbs->lasterror();
+			return false;
 		}
 	}
 }
@@ -2146,7 +2160,7 @@ class AccountLine extends CommonObject
 				$sql .= ", fk_categ";
 				$sql .= ") VALUES (";
 				$sql .= $this->id;
-				$sql .= ", ".$cat;
+				$sql .= ", ".((int) $cat);
 				$sql .= ")";
 
 				dol_syslog(get_class($this)."::update_conciliation", LOG_DEBUG);
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index fd7ed1838f2..23d4c2eefbb 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -81,8 +81,9 @@ class BankAccounts extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -438,8 +439,9 @@ class BankAccounts extends DolibarrApi
 
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index ccf5828d40a..1795704d4ff 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -81,7 +81,7 @@ class BankCateg // extends CommonObject
 		$sql .= ", entity";
 		$sql .= ") VALUES (";
 		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'")."";
-		$sql .= ", ".$conf->entity;
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ")";
 
 		$this->db->begin();
@@ -213,7 +213,7 @@ class BankCateg // extends CommonObject
 		// Delete link between tag and bank account
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_account";
-			$sql .= " WHERE fk_categorie = ".$this->id;
+			$sql .= " WHERE fk_categorie = ".((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
@@ -225,7 +225,7 @@ class BankCateg // extends CommonObject
 		// Delete link between tag and bank lines
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class";
-			$sql .= " WHERE fk_categ = ".$this->id;
+			$sql .= " WHERE fk_categ = ".((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index cdb2c0596f5..d88676563d6 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -467,11 +467,11 @@ class PaymentVarious extends CommonObject
 		$sql .= ", '".$this->db->escape($this->label)."'";
 		$sql .= ", '".$this->db->escape($this->accountancy_code)."'";
 		$sql .= ", '".$this->db->escape($this->subledger_account)."'";
-		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : 0);
-		$sql .= ", ".$user->id;
+		$sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : 0);
+		$sql .= ", ".((int) $user->id);
 		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ", NULL";	// Filled later
-		$sql .= ", ".$conf->entity;
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -573,7 +573,7 @@ class PaymentVarious extends CommonObject
 	{
 		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'payment_various SET fk_bank = '.((int) $id_bank);
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 		$result = $this->db->query($sql);
 		if ($result) {
 			return 1;
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index ec46002b031..78d45beadf3 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -7,7 +7,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -50,8 +50,8 @@ if ($user->socid) {
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -74,6 +74,8 @@ if ($id > 0 || !empty($ref)) {
 
 $result = restrictedArea($user, 'banque', $object->id, 'bank_account', '', '');
 
+$permissiontoadd = $user->rights->banque->modifier;	// Used by the include of actions_dellink.inc.php
+
 
 /*
  * Actions
diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php
index 22e137c29c8..1bbab933e7b 100644
--- a/htdocs/compta/bank/info.php
+++ b/htdocs/compta/bank/info.php
@@ -42,7 +42,7 @@ if ($user->socid) {
 }
 
 $result = restrictedArea($user, 'banque', $accountid, 'bank_account');
-if (!$user->rights->banque->lire && !$user->rights->banque->consolidate) {
+if (empty($user->rights->banque->lire) && empty($user->rights->banque->consolidate)) {
 	accessforbidden();
 }
 
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index b3675feb63e..bc70d27ba70 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -64,12 +64,13 @@ $cancel = GETPOST('cancel', 'alpha');
 // Security check
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
 $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
+$socid = 0;
 if ($user->socid) {
 	$socid = $user->socid;
 }
 
 $result = restrictedArea($user, 'banque', $accountid, 'bank_account');
-if (!$user->rights->banque->lire && !$user->rights->banque->consolidate) {
+if (empty($user->rights->banque->lire) && empty($user->rights->banque->consolidate)) {
 	accessforbidden();
 }
 
@@ -258,10 +259,14 @@ $form = new Form($db);
 
 llxHeader('', $langs->trans("BankTransaction"));
 
+$arrayselected = array();
+
 $c = new Categorie($db);
 $cats = $c->containing($rowid, Categorie::TYPE_BANK_LINE);
-foreach ($cats as $cat) {
-	$arrayselected[] = $cat->id;
+if (is_array($cats)) {
+	foreach ($cats as $cat) {
+		$arrayselected[] = $cat->id;
+	}
 }
 
 $head = bankline_prepare_head($rowid);
@@ -572,6 +577,16 @@ if ($result) {
 			// Bank line
 			print '<tr><td class="toptd">'.$form->editfieldkey('RubriquesTransactions', 'custcats', '', $object, 0).'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_BANK_LINE, null, 'parent', null, null, 1);
+
+			$arrayselected = array();
+
+			$c = new Categorie($db);
+			$cats = $c->containing($bankline->id, Categorie::TYPE_BANK_LINE);
+			if (is_array($cats)) {
+				foreach ($cats as $cat) {
+					$arrayselected[] = $cat->id;
+				}
+			}
 			print img_picto('', 'category', 'class="paddingright"').$form->multiselectarray('custcats', $cate_arbo, $arrayselected, null, null, null, null, "90%");
 			print "</td></tr>";
 		}
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index c1b446a9dd0..6815a8d664b 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -67,6 +67,8 @@ $socid = 0;
 if ($user->socid) {
 	$socid = $user->socid;
 }
+
+$allowed = 0;
 if (!empty($user->rights->accounting->chartofaccount)) {
 	$allowed = 1; // Dictionary with list of banks accounting account allowed to manager of chart account
 }
@@ -77,8 +79,8 @@ if (!$allowed) {
 $diroutputmassaction = $conf->bank->dir_output.'/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -183,7 +185,7 @@ $sql = "SELECT b.rowid, b.label, b.courant, b.rappro, b.account_number, b.fk_acc
 // 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
@@ -191,7 +193,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."bank_account as b";
-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 (b.rowid = ef.fk_object)";
 }
 
@@ -333,12 +335,12 @@ $objecttmp = new Account($db);
 $trackid = 'bank'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($sall) {
-	foreach ($fieldstosearchall as $key => $val) {
-		$fieldstosearchall[$key] = $langs->trans($val);
-	}
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
-}
+//if ($sall) {
+//	foreach ($fieldstosearchall as $key => $val) {
+//		$fieldstosearchall[$key] = $langs->trans($val);
+//	}
+//	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+//}
 
 $moreforfilter = '';
 
@@ -504,6 +506,8 @@ print "</tr>\n";
 
 $totalarray = array();
 $totalarray['nbfield'] = 0;
+$totalarray['val'] = array('balance'=>0);
+$total = array();
 $found = 0;
 $i = 0;
 $lastcurrencycode = '';
@@ -712,7 +716,11 @@ foreach ($accounts as $key => $type) {
 
 	print '</tr>';
 
-	$total[$objecttmp->currency_code] += $solde;
+	if (empty($total[$objecttmp->currency_code])) {
+		$total[$objecttmp->currency_code] = $solde;
+	} else {
+		$total[$objecttmp->currency_code] += $solde;
+	}
 
 	$i++;
 }
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 94023d65a0f..3417f05c817 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -46,7 +46,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("banks", "categories", "companies", "bills", "trips", "donations", "loan"));
+$langs->loadLangs(array("banks", "categories", "companies", "bills", "trips", "donations", "loan", "salaries"));
 
 $action = GETPOST('action', 'aZ09');
 $id = GETPOST('account', 'int') ? GETPOST('account', 'int') : GETPOST('id', 'int');
@@ -78,8 +78,8 @@ if ($user->rights->banque->consolidate && $action == 'dvprev' && !empty($dvid))
 
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $pageplusone = GETPOST("pageplusone", 'int');
 if ($pageplusone) {
@@ -347,7 +347,7 @@ if (empty($numref)) {
 					$balancestart[$objp->numr] = $obj->amount;
 					$db->free($resql);
 				}
-				print '<td class="right"><span class="amount">'.price($balancestart[$objp->numr], '', $langs, 1, -1, -1, $conf->currency).'</span></td>';
+				print '<td class="right"><span class="amount">'.price($balancestart[$objp->numr], '', $langs, 1, -1, -1, empty($object->currency_code)?$conf->currency:$object->currency_code).'</span></td>';
 
 				// Calculate end amount
 				$sql = "SELECT sum(b.amount) as amount";
@@ -360,11 +360,11 @@ if (empty($numref)) {
 					$content[$objp->numr] = $obj->amount;
 					$db->free($resql);
 				}
-				print '<td class="right"><span class="amount">'.price(($balancestart[$objp->numr] + $content[$objp->numr]), '', $langs, 1, -1, -1, $conf->currency).'</span></td>';
+				print '<td class="right"><span class="amount">'.price(($balancestart[$objp->numr] + $content[$objp->numr]), '', $langs, 1, -1, -1, empty($object->currency_code)?$conf->currency:$object->currency_code).'</span></td>';
 
 				print '<td class="center">';
 				if ($user->rights->banque->consolidate && $action != 'editbankreceipt') {
-					print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?account='.$object->id.($page > 0 ? '&page='.$page : '').'&action=editbankreceipt&brref='.$objp->numr.'">'.img_edit().'</a>';
+					print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?account='.$object->id.($page > 0 ? '&page='.$page : '').'&action=editbankreceipt&token='.newToken().'&brref='.urlencode($objp->numr).'">'.img_edit().'</a>';
 				}
 				print '</td>';
 
@@ -481,7 +481,7 @@ if (empty($numref)) {
 
 			// Description
 			print '<td valign="center">';
-			print '<a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$objp->rowid.'&amp;account='.$object->id.'">';
+			print '<a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$objp->rowid.'&account='.$object->id.'">';
 			$reg = array();
 			preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthese on tente recherche de traduction
 			if ($reg[1] && $langs->trans($reg[1]) != $reg[1]) {
@@ -492,7 +492,7 @@ if (empty($numref)) {
 			print '</a>';
 
 			/*
-			 * Ajout les liens (societe, company...)
+			 * Add links under the label (link to payment, company, user, social contribution...)
 			 */
 			$newline = 1;
 			$links = $object->get_url($objp->rowid);
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index dd734074481..0003570fd02 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -338,7 +338,7 @@ foreach ($bankcateg->fetchAll() as $bankcategory) {
 if ($action == 'create') {
 	// Update fields properties in realtime
 	if (!empty($conf->use_javascript_ajax)) {
-		print "\n".'<script type="text/javascript" language="javascript">';
+		print "\n".'<script type="text/javascript">';
 		print '$(document).ready(function () {
             			setPaymentType();
             			$("#selectpaymenttype").change(function() {
@@ -488,9 +488,8 @@ if ($action == 'create') {
 		$langs->load("projects");
 
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
-
-		$numproject = $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
-
+		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
+		print $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 1);
 		print '</td></tr>';
 	}
 
@@ -510,11 +509,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; ';
-	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onclick="javascript:history.go(-1)">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 }
@@ -542,7 +537,7 @@ if ($id) {
 			array('type' => 'date', 'name' => 'clone_date_value', 'label' => $langs->trans("DateValue"), 'value' => -1),
 			array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'clone_accountid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes($object->fk_account, "accountid", 0, '', 1, '', 0, 'minwidth200', 1)),
 			array('type' => 'text', 'name' => 'clone_amount', 'label' => $langs->trans("Amount"), 'value' => price($object->amount)),
-			array('type' => 'select', 'name' => 'clone_sens', 'label' => $langs->trans("Sens") . ' ' . $set_value_help, 'values' => $sensarray, 'default' => $object->sens),
+			array('type' => 'select', 'name' => 'clone_sens', 'label' => $langs->trans("Sens").' '.$set_value_help, 'values' => $sensarray, 'default' => $object->sens),
 		);
 
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneVariousPayment', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 350);
@@ -557,7 +552,7 @@ if ($id) {
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($user->rights->banque->modifier) {
 			if ($action != 'classify') {
-				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&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);
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 1b5fd5fd383..ad199caaf5a 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -69,6 +69,9 @@ $object->fetch($id, $ref);
 $upload_dir = $conf->bank->dir_output.'/'.dol_sanitizeFileName($object->id);
 $modulepart = 'banque';
 
+$permissiontoadd = $user->rights->banque->modifier;	// Used by the include of actions_dellink.inc.php
+
+
 
 /*
  * Actions
@@ -99,7 +102,7 @@ if ($object->id) {
 		$morehtmlref .= $langs->trans('Project').' : ';
 		if ($user->rights->banque->modifier && 0) {
 			if ($action != 'classify') {
-				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&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);
diff --git a/htdocs/compta/bank/various_payment/info.php b/htdocs/compta/bank/various_payment/info.php
index b173426e179..e50dc10ff7f 100644
--- a/htdocs/compta/bank/various_payment/info.php
+++ b/htdocs/compta/bank/various_payment/info.php
@@ -62,7 +62,7 @@ if (!empty($conf->projet->enabled)) {
 	$morehtmlref .= $langs->trans('Project').' : ';
 	if ($user->rights->banque->modifier && 0) {
 		if ($action != 'classify') {
-			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&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);
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index dda68a096a1..bbec4f23fc6 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -77,8 +77,8 @@ if (empty($search_datev_end)) {
 	$search_datev_end = GETPOST("search_datev_end", 'int');
 }
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -160,7 +160,7 @@ $arrayfields = array(
 	'ref'			=>array('label'=>"Ref", 'checked'=>1, 'position'=>100),
 	'label'			=>array('label'=>"Label", 'checked'=>1, 'position'=>110),
 	'datep'			=>array('label'=>"DatePayment", 'checked'=>1, 'position'=>120),
-	'datev'			=>array('label'=>"DateValue", 'checked'=>1, 'position'=>130),
+	'datev'			=>array('label'=>"DateValue", 'checked'=>-1, 'position'=>130),
 	'type'			=>array('label'=>"PaymentMode", 'checked'=>1, 'position'=>140),
 	'project'		=>array('label'=>"Project", 'checked'=>1, 'position'=>200, "enabled"=>!empty($conf->projet->enabled)),
 	'bank'			=>array('label'=>"BankAccount", 'checked'=>1, 'position'=>300, "enabled"=>!empty($conf->banque->enabled)),
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 26949590334..149710c975b 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -46,8 +46,8 @@ $smonth = (GETPOSTISSET('closemonth') ?GETPOST('closemonth', 'int') : dol_print_
 $sday = (GETPOSTISSET('closeday') ?GETPOST('closeday', 'int') : dol_print_date($now, "%d"));
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -107,9 +107,9 @@ if (!$user->rights->cashdesk->run && !$user->rights->takepos->run) {
 $permissiontoadd = ($user->rights->cashdesk->run || $user->rights->takepos->run);
 $permissiontodelete = ($user->rights->cashdesk->run || $user->rights->takepos->run) || ($permissiontoadd && $object->status == 0);
 if (empty($backtopage)) {
-	$backtopage = dol_buildpath('/compta/cashcontrol/cashcontrol_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+	$backtopage = DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_card.php?id='.($id > 0 ? $id : '__ID__');
 }
-$backurlforlist = dol_buildpath('/compta/cashcontrol/cashcontrol_list.php', 1);
+$backurlforlist = DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_list.php';
 $triggermodname = 'CACHCONTROL_MODIFY'; // Name of trigger action code to execute when we modify record
 
 if (empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH) && empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH1)) {
@@ -128,7 +128,7 @@ if (GETPOST('cancel', 'alpha')) {
 if ($action == "reopen") {
 	$result = $object->setStatut($object::STATUS_DRAFT, null, '', 'CASHFENCE_REOPEN');
 	if ($result < 0) {
-		dol_print_error($db, $object->error, $object->error);
+		setEventMessages($object->error, $object->error, 'errors');
 	}
 
 	$action = 'view';
@@ -312,7 +312,7 @@ if ($action == "create" || $action == "start" || $action == 'close') {
 				} elseif ($syear && $smonth && $sday) {
 					$sql .= " AND dateo < '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."'";
 				} else {
-					dol_print_error('', 'Year not defined');
+					setEventMessages($langs->trans('YearNotDefined'), null, 'errors');
 				}
 
 				$resql = $db->query($sql);
@@ -356,7 +356,7 @@ if ($action == "create" || $action == "start" || $action == 'close') {
 			} elseif ($syear && $smonth && $sday) {
 				$sql .= " AND datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $smonth, $sday, $syear))."'";
 			} else {
-				dol_print_error('', 'Year not defined');
+				setEventMessages($langs->trans('YearNotDefined'), null, 'errors');
 			}
 
 			$resql = $db->query($sql);
@@ -647,9 +647,10 @@ if (empty($action) || $action == "view" || $action == "close") {
 		print '</table>';
 		print '</div>';
 
-		print '<div class="fichehalfright"><div class="ficheaddleft">';
+		print '<div class="fichehalfright">>';
 		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border tableforfield" width="100%">';
+
+		print '<table class="border tableforfield centpercent">';
 
 		print '<tr><td class="titlefield nowrap">';
 		print $langs->trans("DateCreationShort");
@@ -667,7 +668,7 @@ if (empty($action) || $action == "view" || $action == "close") {
 		}
 
 		print "</table>\n";
-		print '</div>';
+
 		print '</div></div>';
 		print '<div style="clear:both"></div>';
 
@@ -676,14 +677,14 @@ if (empty($action) || $action == "view" || $action == "close") {
 		if ($action != 'close') {
 			print '<div class="tabsAction">';
 
-			print '<div class="inline-block divButAction"><a target="_blank" class="butAction" href="report.php?id='.$id.'">'.$langs->trans('PrintTicket').'</a></div>';
+			print '<div class="inline-block divButAction"><a target="_blank" rel="noopener noreferrer" class="butAction" href="report.php?id='.((int) $id).'">'.$langs->trans('PrintTicket').'</a></div>';
 
 			if ($object->status == CashControl::STATUS_DRAFT) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;action=close&amp;contextpage='.$contextpage.'">'.$langs->trans('Close').'</a></div>';
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.((int) $id).'&action=close&token='.newToken().'&contextpage='.$contextpage.'">'.$langs->trans('Close').'</a></div>';
 
-				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;action=confirm_delete">'.$langs->trans('Delete').'</a></div>';
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.((int) $id).'&action=confirm_delete&token='.newToken().'">'.$langs->trans('Delete').'</a></div>';
 			} else {
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a></div>';
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.((int) $id).'&action=reopen&token='.newToken().'">'.$langs->trans('ReOpen').'</a></div>';
 			}
 
 			print '</div>';
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 49919e33e58..89781fcb211 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -22,27 +22,6 @@
  *		\brief      List page for cashcontrol
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
@@ -81,7 +60,7 @@ $pagenext = $page + 1;
 // Initialize technical objects
 $object = new CashControl($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction = $conf->monmodule->dir_output.'/temp/massgeneration/'.$user->id;
+//$diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('cashcontrol')); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
@@ -141,16 +120,16 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
-$permissiontoread = ($user->rights->cashdesk->run || $user->rights->takepos->run);
-$permissiontoadd = ($user->rights->cashdesk->run || $user->rights->takepos->run);
-$permissiontodelete = ($user->rights->cashdesk->run || $user->rights->takepos->run);
+$permissiontoread = (!empty($user->rights->cashdesk->run) || !empty($user->rights->takepos->run));
+$permissiontoadd = (!empty($user->rights->cashdesk->run) || !empty($user->rights->takepos->run));
+$permissiontodelete = (!empty($user->rights->cashdesk->run) || !empty($user->rights->takepos->run));
 
 // Security check
 if ($user->socid > 0) {	// Protection if external user
 	//$socid = $user->socid;
 	accessforbidden();
 }
-if (!$user->rights->cashdesk->run && !$user->rights->takepos->run) {
+if (empty($user->rights->cashdesk->run) && empty($user->rights->takepos->run)) {
 	accessforbidden();
 }
 
@@ -223,7 +202,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
@@ -287,7 +266,7 @@ $sql .= $hookmanager->resPrint;
 /* If a group by is required
 $sql.= " GROUP BY ";
 foreach($object->fields as $key => $val) {
-	$sql.='t.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -341,7 +320,7 @@ 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, '', '', '', 'classforhorizontalscrolloftabs');
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -578,7 +557,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 1cf964815d5..5308c8df1d6 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -192,18 +192,18 @@ class CashControl extends CommonObject
 		$sql .= ", card";
 		$sql .= ") VALUES (";
 		//$sql .= "'(PROV)', ";
-		$sql .= $conf->entity;
-		$sql .= ", ".(is_numeric($this->opening) ? $this->opening : 0);
+		$sql .= ((int) $conf->entity);
+		$sql .= ", ".(is_numeric($this->opening) ? price2num($this->opening, 'MT') : 0);
 		$sql .= ", 0"; // Draft by default
 		$sql .= ", '".$this->db->idate(dol_now())."'";
 		$sql .= ", '".$this->db->escape($this->posmodule)."'";
 		$sql .= ", '".$this->db->escape($this->posnumber)."'";
 		$sql .= ", ".($this->day_close > 0 ? $this->day_close : "null");
 		$sql .= ", ".($this->month_close > 0 ? $this->month_close : "null");
-		$sql .= ", ".$this->year_close;
-		$sql .= ", ".$this->cash;
-		$sql .= ", ".$this->cheque;
-		$sql .= ", ".$this->card;
+		$sql .= ", ".((int) $this->year_close);
+		$sql .= ", ".price2num($this->cash, 'MT');
+		$sql .= ", ".price2num($this->cheque, 'MT');
+		$sql .= ", ".price2num($this->card, 'MT');
 		$sql .= ")";
 
 		$this->db->begin();
@@ -378,10 +378,10 @@ class CashControl extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelStatus[0] = $langs->trans('Draft');
-			$this->labelStatus[1] = $langs->trans('Closed');
-			$this->labelStatusShort[0] = $langs->trans('Draft');
-			$this->labelStatusShort[1] = $langs->trans('Closed');
+			$this->labelStatus[0] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatus[1] = $langs->transnoentitiesnoconv('Closed');
+			$this->labelStatusShort[0] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatusShort[1] = $langs->transnoentitiesnoconv('Closed');
 		}
 
 		$statusType = 'status0';
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index be7c88c0a1a..78f9eae72a0 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -3,10 +3,10 @@
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011-2016 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2011-2014 Juanjo Menent	<jmenent@2byte.es>
+ * Copyright (C) 2011-2014 Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
- * 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
@@ -62,8 +62,8 @@ if (!$year) {
 $search_account = GETPOST('search_account', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -138,7 +138,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);
@@ -299,7 +299,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/clients.php b/htdocs/compta/clients.php
index 504e5638abc..bc1d3790280 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -45,8 +45,8 @@ $langs->load("companies");
 $mode = GETPOST("mode");
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -94,16 +94,16 @@ if ($mode == 'search') {
 
 $sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea";
 $sql .= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta ";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", sc.fk_soc, sc.fk_user ";
 }
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE s.fk_stcomm = st.id AND s.client in (1, 3)";
 $sql .= " AND s.entity IN (".getEntity('societe').")";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if (dol_strlen($stcomm)) {
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 6f390e82552..33b453cd0b4 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -431,7 +431,7 @@ if ($action == 'create') {
 				print $langs->trans('Project');
 				print '</td>';
 				if ($action != 'classify' && $user->rights->deplacement->creer) {
-					print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">';
+					print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&token='.newToken().'&id='.$object->id.'">';
 					print img_edit($langs->trans('SetProject'), 1);
 					print '</a></td>';
 				}
@@ -469,7 +469,7 @@ if ($action == 'create') {
 
 			if ($object->statut < Deplacement::STATUS_REFUNDED) { 	// if not refunded
 				if ($user->rights->deplacement->creer) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$id.'">'.$langs->trans('Modify').'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
 				}
@@ -485,7 +485,7 @@ if ($action == 'create') {
 
 			if ($object->statut == Deplacement::STATUS_VALIDATED) { 	// if validated
 				if ($user->rights->deplacement->creer) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=classifyrefunded&id='.$id.'">'.$langs->trans('ClassifyRefunded').'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=classifyrefunded&token='.newToken().'&id='.$id.'">'.$langs->trans('ClassifyRefunded').'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('ClassifyRefunded').'</a>';
 				}
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 1972e3f686e..e05750918da 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -167,14 +167,14 @@ class Deplacement extends CommonObject
 		$sql .= ", fk_soc";
 		$sql .= ") VALUES (";
 		$sql .= " '".$this->db->idate($now)."'";
-		$sql .= ", ".$conf->entity;
-		$sql .= ", ".$user->id;
-		$sql .= ", ".$this->fk_user;
+		$sql .= ", ".((int) $conf->entity);
+		$sql .= ", ".((int) $user->id);
+		$sql .= ", ".((int) $this->fk_user);
 		$sql .= ", '".$this->db->escape($this->type)."'";
 		$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
 		$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
-		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : 0);
-		$sql .= ", ".($this->fk_soc > 0 ? $this->fk_soc : "null");
+		$sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : 0);
+		$sql .= ", ".($this->fk_soc > 0 ? ((int) $this->fk_soc) : "null");
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -249,7 +249,7 @@ class Deplacement extends CommonObject
 		$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");
 		$sql .= " , fk_projet = ".($this->fk_project > 0 ? $this->fk_project : 0);
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$result = $this->db->query($sql);
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index cdb4b5f0f0f..2a16d6e4f49 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -42,12 +42,6 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
-// Security check
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'deplacement', $id, '');
-
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -74,6 +68,14 @@ $object->fetch($id, $ref);
 $upload_dir = $conf->deplacement->dir_output.'/'.dol_sanitizeFileName($object->ref);
 $modulepart = 'trip';
 
+// Security check
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'deplacement', $id, '');
+
+$permissiontoadd = $user->rights->deplacement->creer;	// Used by the include of actions_dellink.inc.php
+
 
 /*
  * Actions
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 12351032b53..8af897378f5 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -38,8 +38,8 @@ if ($user->socid) {
 $result = restrictedArea($user, 'deplacement', '', '');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -141,7 +141,7 @@ print '</table>';
 
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 $max = 10;
@@ -150,7 +150,7 @@ $langs->load("boxes");
 
 $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, d.rowid, d.dated as date, d.tms as dm, d.km, d.fk_statut";
 $sql .= " FROM ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u";
-if (!$user->rights->societe->client->voir && !$user->socid) {
+if (empty($user->rights->societe->client->voir) && !$user->socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE u.rowid = d.fk_user";
@@ -158,7 +158,7 @@ $sql .= " AND d.entity = ".$conf->entity;
 if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) {
 	$sql .= ' AND d.fk_user IN ('.$db->sanitize(join(',', $childids)).')';
 }
-if (!$user->rights->societe->client->voir && !$user->socid) {
+if (empty($user->rights->societe->client->voir) && !$user->socid) {
 	$sql .= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if ($socid) {
@@ -212,7 +212,7 @@ if ($result) {
 }
 
 
-print '</div></div></div>';
+print '</div></div>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 428eacbc93a..9f92cecc4a7 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -45,8 +45,8 @@ $search_ref = GETPOST('search_ref', 'int');
 $search_name = GETPOST('search_name', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
 // $search_amount=GETPOST('search_amount','alpha');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 if (empty($page) || $page == -1) {
@@ -96,7 +96,7 @@ $sql .= " u.lastname, u.firstname"; // Qui
 $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 $sql .= ", ".MAIN_DB_PREFIX."deplacement as d";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON d.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) {
+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 d.fk_user = u.rowid";
@@ -104,7 +104,7 @@ $sql .= " AND d.entity = ".$conf->entity;
 if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) {
 	$sql .= ' AND d.fk_user IN ('.$db->sanitize(join(',', $childids)).')';
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND (sc.fk_user = ".((int) $user->id)." OR d.fk_soc IS NULL) ";
 }
 if ($socid) {
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index edc590119ef..7da90915b18 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -163,7 +163,7 @@ if (!$mesg) {
 
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
 	if ($mode == 'customer') {
 		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
@@ -260,7 +260,7 @@ if (!in_array($year, $arrayyears)) {
 	$arrayyears[$year] = $year;
 }
 arsort($arrayyears);
-print $form->selectarray('year', $arrayyears, $year, 0);
+print $form->selectarray('year', $arrayyears, $year, 0, 0, 0, '', 0, 0, 0, '', 'width75');
 print '</td></tr>';
 print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
@@ -302,7 +302,7 @@ foreach ($data as $val) {
 print '</table>';
 print '</div>';
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 // Show graphs
@@ -319,7 +319,7 @@ if ($mesg) {
 print '</td></tr></table>';
 
 
-print '</div></div></div>';
+print '</div></div>';
 print '<div style="clear:both"></div>';
 
 
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index b15599cc931..3909d9437b4 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -71,8 +71,8 @@ $year_date_when = GETPOST('year_date_when');
 $month_date_when = GETPOST('month_date_when');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -1146,10 +1146,8 @@ if ($action == 'create') {
 		}
 		print "</table>\n";
 
-		print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Create").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-		print '</div>';
+		print $form->buttonsSaveCancel("Create");
+
 		print "</form>\n";
 	} else {
 		dol_print_error('', "Error, no invoice ".$object->id);
@@ -1203,7 +1201,7 @@ if ($action == 'create') {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->facture->creer) {
 				if ($action != 'classify') {
-					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+					$morehtmlref .= '<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);
@@ -1220,9 +1218,10 @@ if ($action == 'create') {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
@@ -1271,7 +1270,7 @@ if ($action == 'create') {
 		print $langs->trans('PaymentConditionsShort');
 		print '</td>';
 		if ($action != 'editconditions' && $user->rights->facture->creer) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+			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>';
@@ -1292,7 +1291,7 @@ if ($action == 'create') {
 		print $langs->trans('PaymentMode');
 		print '</td>';
 		if ($action != 'editmode' && $user->rights->facture->creer) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+			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>';
@@ -1312,7 +1311,7 @@ if ($action == 'create') {
 			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&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+				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>';
@@ -1328,7 +1327,7 @@ if ($action == 'create') {
 				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&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+					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>';
@@ -1355,6 +1354,7 @@ if ($action == 'create') {
 			$dateexample = $object->date_when;
 		}
 
+		// 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($dateexample, -1, 'm'), '%m').')';
@@ -1400,7 +1400,7 @@ if ($action == 'create') {
 		print $langs->trans('BankAccount');
 		print '<td>';
 		if (($action != 'editbankaccount') && $user->rights->facture->creer && $object->statut == FactureRec::STATUS_DRAFT) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
@@ -1418,7 +1418,7 @@ if ($action == 'create') {
 		print $langs->trans('Model');
 		print '<td>';
 		if (($action != 'editmodelpdf') && $user->rights->facture->creer && $object->statut == FactureRec::STATUS_DRAFT) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'), 1).'</a></td>';
+			print '<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>';
@@ -1445,7 +1445,6 @@ if ($action == 'create') {
 
 		print '</div>';
 		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
 
@@ -1465,7 +1464,7 @@ if ($action == 'create') {
 		print $langs->trans('Frequency');
 		print '</td>';
 		if ($action != 'editfrequency' && $user->rights->facture->creer) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editfrequency&amp;facid='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
+			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>';
@@ -1477,7 +1476,7 @@ if ($action == 'create') {
 			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" value="'.$langs->trans("Modify").'"></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) {
@@ -1593,7 +1592,6 @@ if ($action == 'create') {
 			print '<br>';
 		}
 
-		print '</div>';
 		print '</div>';
 		print '</div>';
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 4230a22daaf..da438af9e01 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -92,6 +92,8 @@ $search_montant_ttc = GETPOST('search_montant_ttc', 'alpha');
 $origin = GETPOST('origin', 'alpha');
 $originid = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST('origin_id', 'int')); // For backward compatibility
 $fac_rec = GETPOST('fac_rec', 'int');
+$facid = GETPOST('facid', 'int');
+$ref_client = GETPOST('ref_client', 'int');
 
 // PDF
 $hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
@@ -128,6 +130,7 @@ $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;
 $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)));
@@ -172,8 +175,23 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/compta/facture/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.'/compta/facture/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
 	if ($cancel) {
-		if (!empty($backtopage)) {
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -592,7 +610,7 @@ if (empty($reshook)) {
 		// Check parameters
 
 		// Check for mandatory fields in thirdparty (defined into setup)
-		$array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL');
+		$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);
@@ -620,6 +638,14 @@ if (empty($reshook)) {
 						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');
+					}
+				}
 			}
 		}
 
@@ -720,7 +746,7 @@ if (empty($reshook)) {
 			// On verifie si la facture a des paiements
 			$sql = 'SELECT pf.amount';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
-			$sql .= ' WHERE pf.fk_facture = '.$object->id;
+			$sql .= ' WHERE pf.fk_facture = '.((int) $object->id);
 
 			$result = $db->query($sql);
 			if ($result) {
@@ -885,7 +911,7 @@ if (empty($reshook)) {
 				$sql = 'SELECT SUM(pf.amount) as total_paiements';
 				$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'paiement as p';
 				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
-				$sql .= ' WHERE pf.fk_facture = '.$object->id;
+				$sql .= ' WHERE pf.fk_facture = '.((int) $object->id);
 				$sql .= ' AND pf.fk_paiement = p.rowid';
 				$sql .= ' AND p.entity IN ('.getEntity('invoice').')';
 				$resql = $db->query($sql);
@@ -901,7 +927,7 @@ if (empty($reshook)) {
 				$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
 				$sql .= " re.description, re.fk_facture_source";
 				$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";
-				$sql .= " WHERE fk_facture = ".$object->id;
+				$sql .= " WHERE fk_facture = ".((int) $object->id);
 				$resql = $db->query($sql);
 				if (!empty($resql)) {
 					while ($obj = $db->fetch_object($resql)) {
@@ -2610,10 +2636,10 @@ if (empty($reshook)) {
 					$errors = 0;
 					if (count($linkedCreditNotesList) > 0) {
 						// now, credit note must follow
-						$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture ';
-						$sql .= ' SET situation_cycle_ref='.$newCycle;
+						$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
+						$sql .= ' SET situation_cycle_ref = '.((int) $newCycle);
 						$sql .= ' , situation_final=0';
-						$sql .= ' , situation_counter='.$object->situation_counter;
+						$sql .= ' , situation_counter='.((int) $object->situation_counter);
 						$sql .= ' WHERE rowid IN ('.$db->sanitize(implode(',', $linkedCreditNotesList)).')';
 
 						$resql = $db->query($sql);
@@ -2764,7 +2790,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 	// Actions to build doc
-	$upload_dir = $conf->facture->multidir_output[$object->entity];
+	$upload_dir = $conf->facture->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity];
 	$permissiontoadd = $usercancreate;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
@@ -2877,6 +2903,7 @@ if ($action == 'create') {
 	}
 
 	$currency_code = $conf->currency;
+	$fk_account = 0;
 
 	// Load objectsrc
 	$remise_absolue = 0;
@@ -3213,7 +3240,7 @@ if ($action == 'create') {
 		if (empty($conf->global->INVOICE_DISABLE_DEPOSIT)) {
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			$tmp = '<input type="radio" id="radio_deposit" name="type" value="3"'.(GETPOST('type') == 3 ? ' checked' : '').'> ';
-			print '<script type="text/javascript" language="javascript">
+			print '<script type="text/javascript">
     		jQuery(document).ready(function() {
     			jQuery("#typestandardinvoice, #valuestandardinvoice").click(function() {
     				jQuery("#radio_standard").prop("checked", true);
@@ -3327,7 +3354,7 @@ if ($action == 'create') {
 				$tmp .= ' disabled';
 			}
 			$tmp .= '> ';
-			print '<script type="text/javascript" language="javascript">
+			print '<script type="text/javascript">
     		jQuery(document).ready(function() {
     			jQuery("#fac_replacement").change(function() {
     				jQuery("#radio_replacement").prop("checked", true);
@@ -3402,6 +3429,10 @@ if ($action == 'create') {
 					$optionsav .= '<option value="'.$key.'"';
 					if ($key == GETPOST('fac_avoir')) {
 						$optionsav .= ' selected';
+
+						// pre-filled extra fields with selected credit note
+						$newinvoice_static->fetch_optionals($key);
+						$object->array_options = $newinvoice_static->array_options;
 					}
 					$optionsav .= '>';
 					$optionsav .= $newinvoice_static->ref;
@@ -3416,7 +3447,7 @@ if ($action == 'create') {
 				}
 				$tmp .= '> ';
 				// Show credit note options only if we checked credit note
-				print '<script type="text/javascript" language="javascript">
+				print '<script type="text/javascript">
     			jQuery(document).ready(function() {
     				if (! jQuery("#radio_creditnote").is(":checked"))
     				{
@@ -3491,7 +3522,7 @@ if ($action == 'create') {
 			$jsListType .= (!empty($jsListType) ? ',' : '').'"'.$type.'":"'.$curent.'"';
 		}
 
-		print '<script type="text/javascript" language="javascript">
+		print '<script type="text/javascript">
         		$(document).ready(function() {
                     var listType = {'.$jsListType.'};
         			$("[name=\'type\'").change(function() {
@@ -3548,7 +3579,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 
-	if ($conf->global->INVOICE_USE_RETAINED_WARRANTY) {
+	if (!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
 		$rwStyle = 'display:none;';
 		if (in_array(GETPOST('type', 'int'), $retainedWarrantyInvoiceAvailableType)) {
 			$rwStyle = '';
@@ -3579,7 +3610,7 @@ if ($action == 'create') {
 		$form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
 		print '</td></tr>';
 
-		print '<script type="text/javascript" language="javascript">
+		print '<script type="text/javascript">
 		$(document).ready(function() {
 		$("[name=\'type\']").change(function() {
 				if($( this ).prop("checked") && $.inArray($( this ).val(), '.json_encode($retainedWarrantyInvoiceAvailableType).' ) !== -1)
@@ -3607,7 +3638,7 @@ if ($action == 'create') {
 	// Bank Account
 	if (!empty($conf->banque->enabled)) {
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
-		$fk_account = GETPOST('fk_account', 'int');
+		$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 '</td></tr>';
 	}
@@ -3624,7 +3655,7 @@ if ($action == 'create') {
 	// 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="2" class="maxwidthonsmartphone">';
 		$incoterm_id = GETPOST('incoterm_id');
 		$incoterm_location = GETPOST('location_incoterms');
@@ -3637,7 +3668,7 @@ if ($action == 'create') {
 	}
 
 	// Other attributes
-	$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="2"', 'cols' => '2', 'socid'=>$socid);
+	$parameters = array('objectsrc' => !empty($objectsrc) ? $objectsrc : 0, 'colspan' => ' colspan="2"', 'cols' => '2', 'socid'=>$socid);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (empty($reshook)) {
@@ -3744,8 +3775,9 @@ if ($action == 'create') {
 		print '<input type="hidden" name="amount"   value="'.$objectsrc->total_ht.'">'."\n";
 		print '<input type="hidden" name="total"    value="'.$objectsrc->total_ttc.'">'."\n";
 		print '<input type="hidden" name="tva"      value="'.$objectsrc->total_tva.'">'."\n";
-		print '<input type="hidden" name="origin"   value="'.$objectsrc->element.'">';
-		print '<input type="hidden" name="originid" value="'.$objectsrc->id.'">';
+		// The commented lines below are fields already added as hidden parameters before
+		//print '<input type="hidden" name="origin"   value="'.$objectsrc->element.'">';
+		//print '<input type="hidden" name="originid" value="'.$objectsrc->id.'">';
 
 		switch (get_class($objectsrc)) {
 			case 'Propal':
@@ -3800,11 +3832,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	// Button "Create Draft"
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'">';
-	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-	print '</div>';
+	print $form->buttonsSaveCancel("CreateDraft");
 
 	// Show origin lines
 	if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
@@ -4036,6 +4064,21 @@ if ($action == 'create') {
 		if ($object->type != Facture::TYPE_CREDIT_NOTE && $object->total_ttc < 0) { 		// Can happen only if $conf->global->FACTURE_ENABLE_NEGATIVE is on
 			$text .= '<br>'.img_warning().' '.$langs->trans("ErrorInvoiceOfThisTypeMustBePositive");
 		}
+
+		// mandatoryPeriod
+		$nbMandated = 0;
+		foreach ($object->lines as $line) {
+			$res = $line->fetch_product();
+			if ($res  > 0  ) {
+				if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end) )) {
+					$nbMandated++;
+					break;
+				}
+			}
+		}
+		if ($nbMandated > 0 ) $text .= '<div><span class="clearboth nowraponall warning">'.$langs->trans("mandatoryPeriodNeedTobeSetMsgValidate").'</span></div>';
+
+
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ValidateBill'), $text, 'confirm_valid', $formquestion, (($object->type != Facture::TYPE_CREDIT_NOTE && $object->total_ttc < 0) ? "no" : "yes"), 2);
 	}
 
@@ -4080,10 +4123,10 @@ if ($action == 'create') {
 	}
 
 	// Confirmation du classement paye
-	if ($action == 'paid' && $resteapayer <= 0) {
+	if ($action == 'paid' && ($resteapayer <= 0 || (!empty($conf->global->INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) && $resteapayer == $object->total_ttc))) {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidBill', $object->ref), 'confirm_paid', '', "yes", 1);
 	}
-	if ($action == 'paid' && $resteapayer > 0) {
+	if ($action == 'paid' && $resteapayer > 0 && (empty($conf->global->INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) || $resteapayer != $object->total_ttc)) {
 		$close = array();
 		// Code
 		$i = 0;
@@ -4091,6 +4134,8 @@ if ($action == 'create') {
 		$i++;
 		$close[$i]['code'] = 'badcustomer';
 		$i++;
+		$close[$i]['code'] = 'bankcharge';
+		$i++;
 		$close[$i]['code'] = 'other';
 		$i++;
 		// Help
@@ -4099,6 +4144,8 @@ if ($action == 'create') {
 		$i++;
 		$close[$i]['label'] = $langs->trans("ConfirmClassifyPaidPartiallyReasonBadCustomerDesc");
 		$i++;
+		$close[$i]['label'] = $langs->trans("ConfirmClassifyPaidPartiallyReasonBankChargeDesc");
+		$i++;
 		$close[$i]['label'] = $langs->trans("Other");
 		$i++;
 		// Texte
@@ -4107,6 +4154,8 @@ if ($action == 'create') {
 		$i++;
 		$close[$i]['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadCustomer", $resteapayer, $langs->trans("Currency".$conf->currency)), $close[$i]['label'], 1);
 		$i++;
+		$close[$i]['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBankCharge", $resteapayer, $langs->trans("Currency".$conf->currency)), $close[$i]['label'], 1);
+		$i++;
 		$close[$i]['reason'] = $form->textwithpicto($langs->transnoentities("Other"), $close[$i]['label'], 1);
 		$i++;
 		// arrayreasons[code]=reason
@@ -4224,7 +4273,7 @@ if ($action == 'create') {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($usercancreate) {
 			if ($action != 'classify') {
-				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				$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);
@@ -4241,9 +4290,10 @@ if ($action == 'create') {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
@@ -4259,7 +4309,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">';
 
 	// Type
 	print '<tr><td class="titlefield fieldname_type">'.$langs->trans('Type').'</td><td class="valuefield fieldname_type">';
@@ -4340,11 +4390,11 @@ if ($action == 'create') {
 
 	// Date invoice
 	print '<tr><td>';
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print '<table class="nobordernopadding centpercent"><tr><td>';
 	print $langs->trans('DateInvoice');
 	print '</td>';
 	if ($action != 'editinvoicedate' && !empty($object->brouillon) && $usercancreate && empty($conf->global->FAC_FORCE_DATE_VALIDATION)) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editinvoicedate&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editinvoicedate&token='.newToken().'&facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td>';
@@ -4361,10 +4411,10 @@ if ($action == 'create') {
 	if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
 		// Date invoice
 		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print '<table class="nobordernopadding centpercent"><tr><td>';
 		print $langs->trans('DatePointOfTax');
 		print '</td>';
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_pointoftax&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_pointoftax&token='.newToken().'&facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editdate_pointoftax') {
@@ -4377,11 +4427,11 @@ if ($action == 'create') {
 
 	// Payment term
 	print '<tr><td>';
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print '<table class="nobordernopadding centpercent"><tr><td>';
 	print $langs->trans('PaymentConditionsShort');
 	print '</td>';
 	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && $usercancreate) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+		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>';
@@ -4398,11 +4448,11 @@ if ($action == 'create') {
 
 	// Date payment term
 	print '<tr><td>';
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print '<table class="nobordernopadding centpercent"><tr><td>';
 	print $langs->trans('DateMaxPayment');
 	print '</td>';
 	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && $usercancreate) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editpaymentterm&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editpaymentterm&token='.newToken().'&facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td>';
@@ -4422,11 +4472,11 @@ if ($action == 'create') {
 
 	// Payment mode
 	print '<tr><td>';
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print '<table class="nobordernopadding centpercent"><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&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		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>';
@@ -4442,11 +4492,11 @@ if ($action == 'create') {
 		// Multicurrency code
 		print '<tr>';
 		print '<td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print '<table class="nobordernopadding centpercent"><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&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+			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>';
@@ -4462,7 +4512,7 @@ if ($action == 'create') {
 			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&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+				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>';
@@ -4486,11 +4536,11 @@ if ($action == 'create') {
 	// Bank Account
 	if (!empty($conf->banque->enabled)) {
 		print '<tr><td class="nowrap">';
-		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 		print $langs->trans('BankAccount');
 		print '<td>';
 		if (($action != 'editbankaccount') && $usercancreate) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+			print '<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>';
@@ -4506,11 +4556,11 @@ if ($action == 'create') {
 	// Incoterms
 	if (!empty($conf->incoterm->enabled)) {
 		print '<tr><td>';
-		print '<table width="100%" class="nobordernopadding"><tr><td>';
+		print '<table class="nobordernopadding centpercent"><tr><td>';
 		print $langs->trans('IncotermLabel');
 		print '<td><td class="right">';
 		if ($usercancreate) {
-			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
 		} else {
 			print '&nbsp;';
 		}
@@ -4540,7 +4590,7 @@ if ($action == 'create') {
 			print $langs->trans('RetainedWarranty');
 			print '</td>';
 			if ($action != 'editretainedwarranty' && $user->rights->facture->creer) {
-				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarranty&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarranty'), 1).'</a></td>';
+				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarranty&token='.newToken().'&facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarranty'), 1).'</a></td>';
 			}
 
 			print '</tr></table>';
@@ -4563,7 +4613,7 @@ if ($action == 'create') {
 			print $langs->trans('PaymentConditionsShortRetainedWarranty');
 			print '</td>';
 			if ($action != 'editretainedwarrantypaymentterms' && $user->rights->facture->creer) {
-				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantypaymentterms&amp;facid='.$object->id.'">'.img_edit($langs->trans('setPaymentConditionsShortRetainedWarranty'), 1).'</a></td>';
+				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantypaymentterms&token='.newToken().'&facid='.$object->id.'">'.img_edit($langs->trans('setPaymentConditionsShortRetainedWarranty'), 1).'</a></td>';
 			}
 
 			print '</tr></table>';
@@ -4598,7 +4648,7 @@ if ($action == 'create') {
 			print $langs->trans('RetainedWarrantyDateLimit');
 			print '</td>';
 			if ($action != 'editretainedwarrantydatelimit' && $user->rights->facture->creer) {
-				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantydatelimit&amp;facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarrantyDateLimit'), 1).'</a></td>';
+				print '<td align="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editretainedwarrantydatelimit&token='.newToken().'&facid='.$object->id.'">'.img_edit($langs->trans('setretainedwarrantyDateLimit'), 1).'</a></td>';
 			}
 
 			print '</tr></table>';
@@ -4632,10 +4682,10 @@ if ($action == 'create') {
 
 	print '</div>';
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 
 	print '<!-- amounts -->'."\n";
-	print '<table class="border bordertop tableforfield centpercent">';
+	print '<div class="underbanner clearboth"></div>'."\n";
+	print '<table class="border tableforfield centpercent">';
 
 	$sign = 1;
 	if (!empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE_SCREEN) && $object->type == $object::TYPE_CREDIT_NOTE) {
@@ -4684,7 +4734,7 @@ if ($action == 'create') {
 		print $langs->trans('RevenueStamp');
 		print '</td>';
 		if ($action != 'editrevenuestamp' && !empty($object->brouillon) && $usercancreate) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrevenuestamp&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrevenuestamp&token='.newToken().'&facid='.$object->id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
@@ -4695,7 +4745,7 @@ if ($action == 'create') {
 			print '<input type="hidden" name="revenuestamp" id="revenuestamp_val" value="'.price2num($object->revenuestamp).'">';
 			print $formother->select_revenue_stamp('', 'revenuestamp_type', $mysoc->country_code);
 			print ' &rarr; <span id="revenuestamp_span"></span>';
-			print ' <input type="submit" class="button buttongen" value="'.$langs->trans('Modify').'">';
+			print ' <input type="submit" class="button buttongen button-save" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 			print " <script>
                 $(document).ready(function(){
@@ -4923,7 +4973,7 @@ if ($action == 'create') {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
-	$sql .= ' WHERE pf.fk_facture = '.$object->id.' AND pf.fk_paiement = p.rowid';
+	$sql .= ' WHERE pf.fk_facture = '.((int) $object->id).' AND pf.fk_paiement = p.rowid';
 	$sql .= ' AND p.entity IN ('.getEntity('invoice').')';
 	$sql .= ' ORDER BY p.datep, p.tms';
 
@@ -5014,7 +5064,7 @@ if ($action == 'create') {
 		$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
 		$sql .= " re.description, re.fk_facture_source";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";
-		$sql .= " WHERE fk_facture = ".$object->id;
+		$sql .= " WHERE fk_facture = ".((int) $object->id);
 		$resql = $db->query($sql);
 		if ($resql) {
 			$num = $db->num_rows($resql);
@@ -5109,8 +5159,20 @@ if ($action == 'create') {
 		}
 		print '</span>';
 		print '</td>';
-		print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td>';
-		print '<td class="nowrap">&nbsp;</td></tr>';
+		print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td><td>&nbsp;</td></tr>';
+
+		// Remainder to pay Multicurrency
+		if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
+			print '<tr><td colspan="'.$nbcols.'" class="right">';
+			print '<span class="opacitymedium">';
+			print $langs->trans('RemainderToPayMulticurrency');
+			if ($resteapayeraffiche < 0) {
+				print ' ('.$langs->trans('NegativeIfExcessReceived').')';
+			}
+			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>';
+		}
 
 		// Retained warranty : usualy use on construction industry
 		if (!empty($object->situation_final) && !empty($object->retained_warranty) && $displayWarranty) {
@@ -5154,6 +5216,18 @@ if ($action == 'create') {
 		print '<td class="right'.($resteapayeraffiche ? ' amountremaintopayback' : (' '.$cssforamountpaymentcomplete)).'">'.price($sign * $resteapayeraffiche).'</td>';
 		print '<td class="nowrap">&nbsp;</td></tr>';
 
+		// Remainder to pay back Multicurrency
+		if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
+			print '<tr><td colspan="'.$nbcols.'" class="right">';
+			print '<span class="opacitymedium">'.$langs->trans('RemainderToPayBackMulticurrency');
+			if ($resteapayeraffiche > 0) {
+				print ' ('.$langs->trans('NegativeIfExcessRefunded').')';
+			}
+			print '</span>';
+			print '</td>';
+			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopayback' : (' '.$cssforamountpaymentcomplete)).'">'.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($sign * $object->multicurrency_tx * $resteapayeraffiche, 'MT')).'</td><td>&nbsp;</td></tr>';
+		}
+
 		// Sold credit note
 		// print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans('TotalTTC').' :</td>';
 		// print '<td class="right" style="border: 1px solid;" bgcolor="#f0f0f0"><b>'.price($sign *
@@ -5168,7 +5242,6 @@ if ($action == 'create') {
 		$formmargin->displayMarginInfos($object);
 	}
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
@@ -5220,7 +5293,7 @@ if ($action == 'create') {
 			}
 			print '<td>&nbsp;</td>';
 			print '<td class="nowrap right"><input type="text" size="1" value="" name="all_progress">%</td>';
-			print '<td class="right"><input class="button" type="submit" name="all_percent" value="Modifier" /></td>';
+			print '<td class="right"><input type="submit" class="button" name="all_percent" value="Modifier" /></td>';
 			print '</tr>';
 
 			print '</table>';
@@ -5315,16 +5388,27 @@ 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.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a>';
+					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans('ReOpen').'</a>';
 				} else {
 					print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ReOpen').'</span>';
 				}
 			}
 
+			// Create contract
+			if (!empty($conf->global->CONTRACT_CREATE_FROM_INVOICE)) {
+				if ($conf->contrat->enabled && $object->statut == Facture::STATUS_VALIDATED) {
+					$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>';
+					}
+				}
+			}
+
 			// 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.'&amp;action=valid">'.$langs->trans('Validate').'</a>';
+					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&action=valid&token='.newToken().'">'.$langs->trans('Validate').'</a>';
 				}
 			}
 
@@ -5364,7 +5448,7 @@ if ($action == 'create') {
 			if (!empty($conf->takepos->enabled) && $object->module_source == 'takepos') {
 				$langs->load("cashdesk");
 				$receipt_url = DOL_URL_ROOT."/takepos/receipt.php";
-				print '<a target="_blank" class="butAction" href="'.$receipt_url.'?facid='.$object->id.'">'.$langs->trans('POSTicket').'</a>';
+				print '<a target="_blank" rel="noopener noreferrer" class="butAction" href="'.$receipt_url.'?facid='.((int) $object->id).'">'.$langs->trans('POSTicket').'</a>';
 			}
 
 			// Create payment
@@ -5418,8 +5502,11 @@ if ($action == 'create') {
 			}
 
 			// Classify paid
-			if (($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $usercanissuepayment
-				&& (($object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT && $resteapayer <= 0) || ($object->type == Facture::TYPE_CREDIT_NOTE && $resteapayer >= 0) || ($object->type == Facture::TYPE_DEPOSIT && $object->total_ttc > 0)))
+			if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $usercanissuepayment && (
+					($object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT && ($resteapayer <= 0 || (!empty($conf->global->INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) && $object->total_ttc == $resteapayer))) ||
+					($object->type == Facture::TYPE_CREDIT_NOTE && $resteapayer >= 0) ||
+					($object->type == Facture::TYPE_DEPOSIT && $object->total_ttc > 0)
+				)
 			) {
 				if ($object->type == Facture::TYPE_DEPOSIT && price2num($object->total_ttc, 'MT') != price2num($sumofpaymentall, 'MT')) {
 					// We can close a down payment only if paid amount is same than amount of down payment (by definition)
@@ -5429,8 +5516,8 @@ if ($action == 'create') {
 				}
 			}
 
-			// Classify 'closed not completely paid' (possible if validated and not yet set paid)
-			if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $resteapayer > 0 && $usercanissuepayment) {
+			// 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 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>';
@@ -5524,7 +5611,7 @@ if ($action == 'create') {
 				} elseif ($objectidnext) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('Delete').'</a>';
 				} else {
-					print '<a class="butActionDelete'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
+					print '<a class="butActionDelete'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>';
 				}
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
@@ -5594,14 +5681,14 @@ if ($action == 'create') {
 			print showOnlinePaymentUrl('invoice', $object->ref).'<br>';
 		}
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
 		$somethingshown = $formactions->showactions($object, 'invoice', $socid, 1);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 3dfa5f70603..8282610d01d 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -221,8 +221,9 @@ class Invoices extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -1138,7 +1139,7 @@ class Invoices extends DolibarrApi
 				$sql = 'SELECT SUM(pf.amount) as total_payments';
 				$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'paiement as p';
 				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
-				$sql .= ' WHERE pf.fk_facture = '.$this->invoice->id;
+				$sql .= ' WHERE pf.fk_facture = '.((int) $this->invoice->id);
 				$sql .= ' AND pf.fk_paiement = p.rowid';
 				$sql .= ' AND p.entity IN ('.getEntity('invoice').')';
 				$resql = $this->db->query($sql);
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 6b9837e77bd..047a66a78b9 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -126,8 +126,8 @@ class FactureRec extends CommonInvoice
 
 	public $suspended; // status
 
-	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 $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)
 
 	/**
 	 * @var int 1 if status is draft
@@ -300,32 +300,32 @@ class FactureRec extends CommonInvoice
 			$sql .= ", suspended";
 			$sql .= ") VALUES (";
 			$sql .= "'".$this->db->escape($this->titre ? $this->titre : $this->title)."'";
-			$sql .= ", ".$facsrc->socid;
-			$sql .= ", ".$conf->entity;
+			$sql .= ", ".((int) $facsrc->socid);
+			$sql .= ", ".((int) $conf->entity);
 			$sql .= ", '".$this->db->idate($now)."'";
-			$sql .= ", ".(!empty($facsrc->amount) ? $facsrc->amount : '0');
-			$sql .= ", ".(!empty($facsrc->remise) ? $this->remise : '0');
+			$sql .= ", ".(!empty($facsrc->total_ttc) ? ((float) $facsrc->total_ttc) : '0');
+			$sql .= ", ".(!empty($facsrc->remise_absolue) ? ((float) $this->remise_absolue) : '0');
 			$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 .= ", '".$this->db->escape($user->id)."'";
-			$sql .= ", ".(!empty($facsrc->fk_project) ? "'".$this->db->escape($facsrc->fk_project)."'" : "null");
-			$sql .= ", ".(!empty($facsrc->fk_account) ? "'".$this->db->escape($facsrc->fk_account)."'" : "null");
-			$sql .= ", ".($facsrc->cond_reglement_id > 0 ? $this->db->escape($facsrc->cond_reglement_id) : "null");
-			$sql .= ", ".($facsrc->mode_reglement_id > 0 ? $this->db->escape($facsrc->mode_reglement_id) : "null");
-			$sql .= ", ".$this->usenewprice;
-			$sql .= ", ".$this->frequency;
+			$sql .= ", ".((int) $user->id);
+			$sql .= ", ".(!empty($facsrc->fk_project) ? ((int) $facsrc->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 .= ", ".((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 .= ", ".$this->db->escape($this->nb_gen_done);
-			$sql .= ", ".$this->db->escape($this->nb_gen_max);
-			$sql .= ", ".$this->db->escape($this->auto_validate);
-			$sql .= ", ".$this->db->escape($this->generate_pdf);
-			$sql .= ", ".$this->db->escape($facsrc->fk_multicurrency);
+			$sql .= ", ".((int) $this->nb_gen_done);
+			$sql .= ", ".((int) $this->nb_gen_max);
+			$sql .= ", ".((int) $this->auto_validate);
+			$sql .= ", ".((int) $this->generate_pdf);
+			$sql .= ", ".((int) $facsrc->fk_multicurrency);
 			$sql .= ", '".$this->db->escape($facsrc->multicurrency_code)."'";
-			$sql .= ", ".$this->db->escape($facsrc->multicurrency_tx);
-			$sql .= ", ".$this->db->escape($this->suspended);
+			$sql .= ", ".((float) $facsrc->multicurrency_tx);
+			$sql .= ", ".((int) $this->suspended);
 			$sql .= ")";
 
 			if ($this->db->query($sql)) {
@@ -470,11 +470,23 @@ class FactureRec extends CommonInvoice
 		$error = 0;
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_rec SET";
-		$sql .= " fk_soc = ".((int) $this->fk_soc);
+		$sql .= " entity = ".((int) $this->entity).",";
+		$sql .= " titre = '".$this->db->escape($this->title)."',";
+		$sql .= " suspended = ".((int) $this->suspended).",";
+		$sql .= " fk_soc = ".((int) $this->socid).",";
+		$sql .= " total_tva = ".((float) $this->total_tva).",";
+		$sql .= " localtax1 = ".((float) $this->localtax1).",";
+		$sql .= " localtax2 = ".((float) $this->localtax2).",";
+		$sql .= " total_ht = ".((float) $this->total_ht).",";
+		$sql .= " total_ttc = ".((float) $this->total_ttc).",";
+		$sql .= " remise_percent = ".((float) $this->remise_percent);
 		// TODO Add missing fields
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
+		$this->db->begin();
+
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if (!$error) {
@@ -498,7 +510,7 @@ class FactureRec extends CommonInvoice
 		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
-			return -2;
+			return -1;
 		}
 	}
 
@@ -531,9 +543,9 @@ class FactureRec extends CommonInvoice
 		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = f.rowid AND el.targettype = 'facture'";
 		$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')';
 		if ($rowid) {
-			$sql .= ' AND f.rowid='.((int) $rowid);
+			$sql .= ' AND f.rowid = '.((int) $rowid);
 		} elseif ($ref) {
-			$sql .= " AND f.titre='".$this->db->escape($ref)."'";
+			$sql .= " AND f.titre = '".$this->db->escape($ref)."'";
 		} else {
 			$sql .= ' AND f.rowid = 0';
 		}
@@ -665,7 +677,7 @@ class FactureRec extends CommonInvoice
 		$sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facturedet_rec as l';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-		$sql .= ' WHERE l.fk_facture = '.$this->id;
+		$sql .= ' WHERE l.fk_facture = '.((int) $this->id);
 		$sql .= ' ORDER BY l.rang';
 
 		dol_syslog('FactureRec::fetch_lines', LOG_DEBUG);
@@ -712,12 +724,12 @@ class FactureRec extends CommonInvoice
 				//$line->code_ventilation = $objp->fk_code_ventilation;
 
 				$line->fk_product_fournisseur_price = $objp->fk_product_fournisseur_price;
-				$line->fk_fournprice = $objp->fk_product_fournisseur_price;	// For backward compatibility
+				$line->fk_fournprice = $objp->fk_product_fournisseur_price; // For backward compatibility
 
 				$marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $objp->fk_product_fournisseur_price, $objp->pa_ht);
 
 				$line->buyprice = $marginInfos[0];
-				$line->pa_ht = $marginInfos[0];			// For backward compatibility
+				$line->pa_ht = $marginInfos[0]; // For backward compatibility
 				$line->marge_tx			= $marginInfos[1];
 				$line->marque_tx		= $marginInfos[2];
 				$line->rang = $objp->rang;
@@ -963,7 +975,7 @@ class FactureRec extends CommonInvoice
 			$sql .= ", ".price2num($txlocaltax2);
 			$sql .= ", '".$this->db->escape(isset($localtaxes_type[2]) ? $localtaxes_type[2] : '')."'";
 			$sql .= ", ".(!empty($fk_product) ? "'".$this->db->escape($fk_product)."'" : "null");
-			$sql .= ", ".$product_type;
+			$sql .= ", ".((int) $product_type);
 			$sql .= ", ".price2num($remise_percent);
 			$sql .= ", ".price2num($pu_ht);
 			$sql .= ", null";
@@ -976,16 +988,16 @@ class FactureRec extends CommonInvoice
 			$sql .= ", ".(int) $date_end_fill;
 			$sql .= ", ".($fk_fournprice > 0 ? $fk_fournprice : 'null');
 			$sql .= ", ".($pa_ht ? price2num($pa_ht) : 0);
-			$sql .= ", ".$info_bits;
-			$sql .= ", ".$rang;
-			$sql .= ", ".$special_code;
-			$sql .= ", ".($fk_unit ? "'".$this->db->escape($fk_unit)."'" : "null");
+			$sql .= ", ".((int) $info_bits);
+			$sql .= ", ".((int) $rang);
+			$sql .= ", ".((int) $special_code);
+			$sql .= ", ".($fk_unit ? ((int) $fk_unit) : "null");
 			$sql .= ", ".(int) $this->fk_multicurrency;
 			$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
-			$sql .= ", ".price2num($pu_ht_devise);
-			$sql .= ", ".price2num($multicurrency_total_ht);
-			$sql .= ", ".price2num($multicurrency_total_tva);
-			$sql .= ", ".price2num($multicurrency_total_ttc);
+			$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);
@@ -1461,56 +1473,55 @@ class FactureRec extends CommonInvoice
 		global $langs;
 		$langs->load('bills');
 
-		$labelStatus = $langs->trans('Active');
+		$labelStatus = $langs->transnoentitiesnoconv('Active');
 		$statusType = 'status0';
 
 		//print "$recur,$status,$mode,$alreadypaid,$type";
 		if ($mode == 0) {
-			$prefix = '';
 			if ($recur) {
 				if ($status == self::STATUS_SUSPENDED) {
-					$labelStatus = $langs->trans('Disabled');
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
-					$labelStatus = $langs->trans('Active');
+					$labelStatus = $langs->transnoentitiesnoconv('Active');
 				}
 			} else {
 				if ($status == self::STATUS_SUSPENDED) {
-					$labelStatus = $langs->trans('Disabled');
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
-					$labelStatus = $langs->trans("Draft");
+					$labelStatus = $langs->transnoentitiesnoconv("Draft");
 				}
 			}
 		} elseif ($mode == 1) {
 			$prefix = 'Short';
 			if ($recur) {
 				if ($status == self::STATUS_SUSPENDED) {
-					$labelStatus = $langs->trans('Disabled');
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
-					$labelStatus = $langs->trans('Active');
+					$labelStatus = $langs->transnoentitiesnoconv('Active');
 				}
 			} else {
 				if ($status == self::STATUS_SUSPENDED) {
-					$labelStatus = $langs->trans('Disabled');
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
-					$labelStatus = $langs->trans("Draft");
+					$labelStatus = $langs->transnoentitiesnoconv("Draft");
 				}
 			}
 		} elseif ($mode == 2) {
 			if ($recur) {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
-					$labelStatus = $langs->trans('Disabled');
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
 					$statusType = 'status4';
-					$labelStatus = $langs->trans('Active');
+					$labelStatus = $langs->transnoentitiesnoconv('Active');
 				}
 			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
-					$labelStatus = $langs->trans('Disabled');
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
 					$statusType = 'status0';
-					$labelStatus = $langs->trans('Draft');
+					$labelStatus = $langs->transnoentitiesnoconv('Draft');
 				}
 			}
 		} elseif ($mode == 3) {
@@ -1518,18 +1529,18 @@ class FactureRec extends CommonInvoice
 				$prefix = 'Short';
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
-					$labelStatus = $langs->trans('Disabled');
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
 					$statusType = 'status4';
-					$labelStatus = $langs->trans('Active');
+					$labelStatus = $langs->transnoentitiesnoconv('Active');
 				}
 			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
-					$labelStatus = $langs->trans('Disabled');
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
 					$statusType = 'status0';
-					$labelStatus = $langs->trans('Draft');
+					$labelStatus = $langs->transnoentitiesnoconv('Draft');
 				}
 			}
 		} elseif ($mode == 4) {
@@ -1537,18 +1548,18 @@ class FactureRec extends CommonInvoice
 			if ($recur) {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
-					$labelStatus = $langs->trans('Disabled');
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
 					$statusType = 'status4';
-					$labelStatus = $langs->trans('Active');
+					$labelStatus = $langs->transnoentitiesnoconv('Active');
 				}
 			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
-					$labelStatus = $langs->trans('Disabled');
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
 					$statusType = 'status0';
-					$labelStatus = $langs->trans('Draft');
+					$labelStatus = $langs->transnoentitiesnoconv('Draft');
 				}
 			}
 		} elseif ($mode == 5 || $mode == 6) {
@@ -1559,25 +1570,23 @@ class FactureRec extends CommonInvoice
 			if ($recur) {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
-					$labelStatus = $langs->trans('Disabled');
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
 					$statusType = 'status4';
-					$labelStatus = $langs->trans('Active');
+					$labelStatus = $langs->transnoentitiesnoconv('Active');
 				}
 			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
-					$labelStatus = $langs->trans('Disabled');
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
 				} else {
 					$statusType = 'status0';
-					$labelStatus = $langs->trans('Draft');
+					$labelStatus = $langs->transnoentitiesnoconv('Draft');
 				}
 			}
 		}
 
-		if (empty($labelStatusShort)) {
-			$labelStatusShort = $labelStatus;
-		}
+		$labelStatusShort = $labelStatus;
 
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
@@ -1752,7 +1761,7 @@ class FactureRec extends CommonInvoice
 		if (!empty($unit)) {
 			$sql .= ', unit_frequency = \''.$this->db->escape($unit).'\'';
 		}
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::setFrequencyAndUnit", LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -1785,7 +1794,7 @@ class FactureRec extends CommonInvoice
 		if ($increment_nb_gen_done > 0) {
 			$sql .= ', nb_gen_done = nb_gen_done + 1';
 		}
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::setNextDate", LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -1819,7 +1828,7 @@ class FactureRec extends CommonInvoice
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 		$sql .= ' SET nb_gen_max = '.((int) $nb);
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::setMaxPeriod", LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -1846,7 +1855,7 @@ class FactureRec extends CommonInvoice
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 		$sql .= ' SET auto_validate = '.((int) $validate);
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::setAutoValidate", LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -1873,7 +1882,7 @@ class FactureRec extends CommonInvoice
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 		$sql .= ' SET generate_pdf = '.((int) $validate);
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::setGeneratePdf", LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -1899,8 +1908,8 @@ class FactureRec extends CommonInvoice
 		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		$sql .= ' SET modelpdf = "'.$model.'"';
-		$sql .= ' WHERE rowid = '.$this->id;
+		$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)) {
@@ -1933,14 +1942,14 @@ class FactureLigneRec extends CommonInvoiceLine
 
 
 	public $fk_product_fournisseur_price;
-	public $fk_fournprice;					// For backward compatibility
+	public $fk_fournprice; // For backward compatibility
 
 	public $rang;
 
 	public $desc;
 	public $description;
 
-	public $fk_product_type;	// Use instead product_type
+	public $fk_product_type; // Use instead product_type
 
 	public $fk_contract_line;
 
@@ -1980,7 +1989,7 @@ class FactureLigneRec extends CommonInvoiceLine
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.((int) $this->id);
 
 			$res = $this->db->query($sql);
-			if ($res === false) {
+			if (!$res) {
 				$error++;
 				$this->errors[] = $this->db->lasterror();
 			}
@@ -2133,6 +2142,7 @@ class FactureLigneRec extends CommonInvoiceLine
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if (!$error) {
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 4feeb3d60b6..cc722bafca3 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -148,14 +148,15 @@ class Facture extends CommonInvoice
 	//Check constants for types
 	public $type = self::TYPE_STANDARD;
 
-	//var $amount;
+	// Warning: Do not set default value into property defintion. it must stay null.
+	// For example to avoid to have substition done when object is generic and not yet defined.
 	public $remise_absolue;
 	public $remise_percent;
-	public $total_ht = 0;
-	public $total_tva = 0;
-	public $total_localtax1 = 0;
-	public $total_localtax2 = 0;
-	public $total_ttc = 0;
+	public $total_ht;
+	public $total_tva;
+	public $total_localtax1;
+	public $total_localtax2;
+	public $total_ttc;
 	public $revenuestamp;
 
 	/**
@@ -464,11 +465,17 @@ class Facture extends CommonInvoice
 		$this->status = self::STATUS_DRAFT;
 		$this->statut = self::STATUS_DRAFT;
 
-		// 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);
+		if (!empty($this->multicurrency_code)) {
+			// Multicurrency (test on $this->multicurrency_tx because we should take the default rate of multicurrency_code only if not using original rate)
+			if (empty($this->multicurrency_tx)) {
+				// If original rate is not set, we take a default value from date
+				list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
+			} else {
+				// original rate multicurrency_tx and multicurrency_code are set, we use them
+				$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+			}
 		} else {
-			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+			$this->fk_multicurrency = 0;
 		}
 		if (empty($this->fk_multicurrency)) {
 			$this->multicurrency_code = $conf->currency;
@@ -521,9 +528,9 @@ class Facture extends CommonInvoice
 
 			// Fields coming from GUI (priority on template). TODO Value of template should be used as default value on GUI so we can use here always value from GUI
 			$this->fk_project        = GETPOST('projectid', 'int') > 0 ? ((int) GETPOST('projectid', 'int')) : $_facrec->fk_project;
-			$this->note_public       = GETPOST('note_public', 'none') ? GETPOST('note_public', 'restricthtml') : $_facrec->note_public;
-			$this->note_private      = GETPOST('note_private', 'none') ? GETPOST('note_private', 'restricthtml') : $_facrec->note_private;
-			$this->model_pdf = GETPOST('model', 'alpha') ? GETPOST('model', 'alpha') : $_facrec->model_pdf;
+			$this->note_public       = GETPOSTISSET('note_public') ? GETPOST('note_public', 'restricthtml') : $_facrec->note_public;
+			$this->note_private      = GETPOSTISSET('note_private') ? GETPOST('note_private', 'restricthtml') : $_facrec->note_private;
+			$this->model_pdf = GETPOSTISSET('model') ? 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;
@@ -1059,7 +1066,7 @@ class Facture extends CommonInvoice
 	{
 		global $conf;
 
-		// Charge facture source
+		// Source invoice load
 		$facture = new Facture($this->db);
 
 		// Retrieve all extrafield
@@ -1564,8 +1571,11 @@ class Facture extends CommonInvoice
 		$hookmanager->initHooks(array('invoicedao'));
 		$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;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -1616,7 +1626,7 @@ class Facture extends CommonInvoice
 		if ($rowid) {
 			$sql .= " WHERE f.rowid=".((int) $rowid);
 		} else {
-			$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')'; // Dont't use entity if you use rowid
+			$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')'; // Don't use entity if you use rowid
 			if ($ref) {
 				$sql .= " AND f.ref='".$this->db->escape($ref)."'";
 			}
@@ -1741,7 +1751,7 @@ class Facture extends CommonInvoice
 			} else {
 				$this->error = 'Invoice with id='.$rowid.' or ref='.$ref.' or ref_ext='.$ref_ext.' not found';
 
-				dol_syslog(__METHOD__ . $this->error, LOG_WARNING);
+				dol_syslog(__METHOD__.$this->error, LOG_WARNING);
 				return 0;
 			}
 		} else {
@@ -1777,7 +1787,7 @@ class Facture extends CommonInvoice
 		$sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facturedet as l';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-		$sql .= ' WHERE l.fk_facture = '.$this->id;
+		$sql .= ' WHERE l.fk_facture = '.((int) $this->id);
 		$sql .= ' ORDER BY l.rang, l.rowid';
 
 		dol_syslog(get_class($this).'::fetch_lines', LOG_DEBUG);
@@ -1884,8 +1894,8 @@ class Facture extends CommonInvoice
 		$this->tab_next_situation_invoice = array();
 
 		$sql = 'SELECT rowid, type, situation_cycle_ref, situation_counter FROM '.MAIN_DB_PREFIX.'facture';
-		$sql .= ' WHERE rowid <> '.$this->id;
-		$sql .= ' AND entity = '.$this->entity;
+		$sql .= " WHERE rowid <> ".((int) $this->id);
+		$sql .= ' AND entity = '.((int) $this->entity);
 		$sql .= ' AND situation_cycle_ref = '.(int) $this->situation_cycle_ref;
 		$sql .= ' ORDER BY situation_counter ASC';
 
@@ -2160,7 +2170,7 @@ class Facture extends CommonInvoice
 		} else {
 			$sql .= ' SET ref_client = \''.$this->db->escape($ref_client).'\'';
 		}
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(__METHOD__.' this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2406,7 +2416,7 @@ class Facture extends CommonInvoice
 
 	/**
 	 *  Tag the invoice as paid completely (if close_code is filled) => this->fk_statut=2, this->paye=1
-	 *  or partialy (if close_code filled) + appel trigger BILL_PAYED => this->fk_statut=2, this->paye stay 0
+	 *  or partially (if close_code filled) + appel trigger BILL_PAYED => this->fk_statut=2, this->paye stay 0
 	 *
 	 *  @param	User	$user      	Object user that modify
 	 *	@param  string	$close_code	Code renseigne si on classe a payee completement alors que paiement incomplet (cas escompte par exemple)
@@ -2422,7 +2432,7 @@ class Facture extends CommonInvoice
 
 			$now = dol_now();
 
-			dol_syslog(get_class($this)."::set_paid rowid=".((int) $this->id), LOG_DEBUG);
+			dol_syslog(get_class($this)."::setPaid rowid=".((int) $this->id), LOG_DEBUG);
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET';
 			$sql .= ' fk_statut='.self::STATUS_CLOSED;
@@ -2435,9 +2445,9 @@ class Facture extends CommonInvoice
 			if ($close_note) {
 				$sql .= ", close_note='".$this->db->escape($close_note)."'";
 			}
-			$sql .= ', fk_user_closing = '.$user->id;
+			$sql .= ', fk_user_closing = '.((int) $user->id);
 			$sql .= ", date_closing = '".$this->db->idate($now)."'";
-			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -2501,9 +2511,9 @@ class Facture extends CommonInvoice
 		$sql .= ' SET paye=0, fk_statut='.self::STATUS_VALIDATED.', close_code=null, close_note=null,';
 		$sql .= ' date_closing=null,';
 		$sql .= ' fk_user_closing=null';
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
-		dol_syslog(get_class($this)."::set_unpaid", LOG_DEBUG);
+		dol_syslog(get_class($this)."::setUnpaid", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			// Call trigger
@@ -2572,7 +2582,7 @@ class Facture extends CommonInvoice
 		if ($close_note) {
 			$sql .= ", close_note='".$this->db->escape($close_note)."'";
 		}
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -2580,7 +2590,7 @@ class Facture extends CommonInvoice
 			// as they have not been used since the invoice is abandoned.
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe_remise_except';
 			$sql .= ' SET fk_facture = NULL';
-			$sql .= ' WHERE fk_facture = '.$this->id;
+			$sql .= ' WHERE fk_facture = '.((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -2720,7 +2730,7 @@ class Facture extends CommonInvoice
 				$sql .= ", datef='".$this->db->idate($this->date)."'";
 				$sql .= ", date_lim_reglement='".$this->db->idate($this->date_lim_reglement)."'";
 			}
-			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::validate", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -2729,7 +2739,7 @@ class Facture extends CommonInvoice
 				$error++;
 			}
 
-			// On verifie si la facture etait une provisoire
+			// We check if the invoice was provisional
 			if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref))) {
 				// La verif qu'une remise n'est pas utilisee 2 fois est faite au moment de l'insertion de ligne
 			}
@@ -2738,7 +2748,7 @@ class Facture extends CommonInvoice
 				// Define third party as a customer
 				$result = $this->thirdparty->set_as_client();
 
-				// Si active on decremente le produit principal et ses composants a la validation de facture
+				// If active we decrement the main product and its components at invoice validation
 				if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL) && $idwarehouse > 0) {
 					require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 					$langs->load("agenda");
@@ -3141,7 +3151,7 @@ class Facture extends CommonInvoice
 		$fk_remise_except = '',
 		$price_base_type = 'HT',
 		$pu_ttc = 0,
-		$type = self::TYPE_STANDARD,
+		$type = 0,
 		$rang = -1,
 		$special_code = 0,
 		$origin = '',
@@ -3783,7 +3793,7 @@ class Facture extends CommonInvoice
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
 			$sql .= ' SET remise_percent = '.((float) $remise);
-			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			$sql .= ' AND fk_statut = '.self::STATUS_DRAFT;
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
@@ -3845,7 +3855,7 @@ class Facture extends CommonInvoice
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
 			$sql .= ' SET remise_absolue = '.((float) $remise);
-			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			$sql .= ' AND fk_statut = '.self::STATUS_DRAFT;
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
@@ -3897,7 +3907,7 @@ class Facture extends CommonInvoice
 		global $conf, $langs;
 
 		if ($this->module_source == 'takepos') {
-			$langs->load('cashdesk@cashdesk');
+			$langs->load('cashdesk');
 
 			$moduleName = 'takepos';
 			$moduleSourceName = 'Takepos';
@@ -4060,16 +4070,16 @@ class Facture extends CommonInvoice
 
 		$sql = "SELECT s.rowid, s.nom as name, s.client,";
 		$sql .= " f.rowid as fid, f.ref as ref, f.datef as df";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", sc.fk_soc, sc.fk_user";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE f.entity IN (".getEntity('invoice').")";
 		$sql .= " AND f.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$socid) { //restriction
+		if (empty($user->rights->societe->client->voir) && !$socid) { //restriction
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($socid) {
@@ -4257,10 +4267,10 @@ class Facture extends CommonInvoice
 
 		$clause = " WHERE";
 
-		$sql = "SELECT f.rowid, f.date_lim_reglement as datefin,f.fk_statut, f.total_ht";
+		$sql = "SELECT f.rowid, f.date_lim_reglement as datefin, f.fk_statut, f.total_ht";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON f.fk_soc = sc.fk_soc";
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
+			$sql .= " JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON f.fk_soc = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = " AND";
 		}
@@ -4298,6 +4308,7 @@ class Facture extends CommonInvoice
 				}
 			}
 
+			$this->db->free($resql);
 			return $response;
 		} else {
 			dol_print_error($this->db);
@@ -4506,7 +4517,7 @@ class Facture extends CommonInvoice
 		$sql = "SELECT count(f.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
@@ -4626,7 +4637,7 @@ class Facture extends CommonInvoice
 
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'facture';
 		$sql .= ' WHERE situation_cycle_ref = '.((int) $this->situation_cycle_ref);
-		$sql .= ' AND situation_counter < '.$this->situation_counter;
+		$sql .= ' AND situation_counter < '.((int) $this->situation_counter);
 		$sql .= ' AND entity = '.($this->entity > 0 ? $this->entity : $conf->entity);
 		$resql = $this->db->query($sql);
 		$res = array();
@@ -4659,7 +4670,7 @@ class Facture extends CommonInvoice
 
 		$this->db->begin();
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET situation_final = '.$this->situation_final.' where rowid = '.((int) $this->id);
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET situation_final = '.((int) $this->situation_final).' WHERE rowid = '.((int) $this->id);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -4784,7 +4795,7 @@ class Facture extends CommonInvoice
 
 		// TODO : add a flag on invoices to store this conf : INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION
 
-		// note : we dont need to test INVOICE_USE_RETAINED_WARRANTY because if $this->retained_warranty is not empty it's because it was set when this conf was active
+		// note : we don't need to test INVOICE_USE_RETAINED_WARRANTY because if $this->retained_warranty is not empty it's because it was set when this conf was active
 
 		$displayWarranty = false;
 		if (!empty($this->retained_warranty)) {
@@ -4877,10 +4888,11 @@ class Facture extends CommonInvoice
 	public function setRetainedWarranty($value)
 	{
 		dol_syslog(get_class($this).'::setRetainedWarranty('.$value.')');
+
 		if ($this->statut >= 0) {
 			$fieldname = 'retained_warranty';
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' SET '.$fieldname.' = '.floatval($value);
+			$sql .= " SET ".$fieldname." = ".((float) $value);
 			$sql .= ' WHERE rowid='.((int) $this->id);
 
 			if ($this->db->query($sql)) {
@@ -4917,8 +4929,8 @@ class Facture extends CommonInvoice
 		if ($this->statut >= 0) {
 			$fieldname = 'retained_warranty_date_limit';
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' SET '.$fieldname.' = '.(strval($timestamp) != '' ? '\''.$this->db->idate($timestamp).'\'' : 'null');
-			$sql .= ' WHERE rowid='.((int) $this->id);
+			$sql .= " SET ".$fieldname." = ".(strval($timestamp) != '' ? "'".$this->db->idate($timestamp)."'" : 'null');
+			$sql .= ' WHERE rowid = '.((int) $this->id);
 
 			if ($this->db->query($sql)) {
 				$this->retained_warranty_date_limit = $timestamp;
@@ -4982,7 +4994,7 @@ class Facture extends CommonInvoice
 
 		$this->db->begin();
 
-		//Select all action comm reminder
+		// 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";
@@ -5382,7 +5394,7 @@ class FactureLigne extends CommonInvoiceLine
 
 		$this->db->begin();
 
-		// Insertion dans base de la ligne
+		// Update line in database
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facturedet';
 		$sql .= ' (fk_facture, fk_parent_line, label, description, qty,';
 		$sql .= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
@@ -5413,9 +5425,9 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= ' '.(!empty($this->fk_remise_except) ? $this->fk_remise_except : "null").',';
 		$sql .= " ".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null").",";
 		$sql .= " ".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null").",";
-		$sql .= ' '.$this->fk_code_ventilation.',';
-		$sql .= ' '.$this->rang.',';
-		$sql .= ' '.$this->special_code.',';
+		$sql .= ' '.((int) $this->fk_code_ventilation).',';
+		$sql .= ' '.((int) $this->rang).',';
+		$sql .= ' '.((int) $this->special_code).',';
 		$sql .= ' '.(!empty($this->fk_fournprice) ? $this->fk_fournprice : "null").',';
 		$sql .= ' '.price2num($this->pa_ht).',';
 		$sql .= " '".$this->db->escape($this->info_bits)."',";
@@ -5424,11 +5436,11 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= " ".price2num($this->total_ttc).",";
 		$sql .= " ".price2num($this->total_localtax1).",";
 		$sql .= " ".price2num($this->total_localtax2);
-		$sql .= ", ".$this->situation_percent;
+		$sql .= ", ".((float) $this->situation_percent);
 		$sql .= ", ".(!empty($this->fk_prev_id) ? $this->fk_prev_id : "null");
 		$sql .= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
-		$sql .= ", ".$user->id;
-		$sql .= ", ".$user->id;
+		$sql .= ", ".((int) $user->id);
+		$sql .= ", ".((int) $user->id);
 		$sql .= ", ".(int) $this->fk_multicurrency;
 		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql .= ", ".price2num($this->multicurrency_subprice);
@@ -5450,8 +5462,8 @@ class FactureLigne extends CommonInvoiceLine
 				}
 			}
 
-			// Si fk_remise_except defini, on lie la remise a la facture
-			// ce qui la flague comme "consommee".
+			// If fk_remise_except is defined, the discount is linked to the invoice
+			// which flags it as "consumed".
 			if ($this->fk_remise_except) {
 				$discount = new DiscountAbsolute($this->db);
 				$result = $discount->fetch($this->fk_remise_except);
@@ -5607,17 +5619,17 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= " description='".$this->db->escape($this->desc)."'";
 		$sql .= ", ref_ext='".$this->db->escape($this->ref_ext)."'";
 		$sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
-		$sql .= ", subprice=".price2num($this->subprice)."";
-		$sql .= ", remise_percent=".price2num($this->remise_percent)."";
+		$sql .= ", subprice=".price2num($this->subprice);
+		$sql .= ", remise_percent=".price2num($this->remise_percent);
 		if ($this->fk_remise_except) {
 			$sql .= ", fk_remise_except=".$this->fk_remise_except;
 		} else {
 			$sql .= ", fk_remise_except=null";
 		}
 		$sql .= ", vat_src_code = '".(empty($this->vat_src_code) ? '' : $this->db->escape($this->vat_src_code))."'";
-		$sql .= ", tva_tx=".price2num($this->tva_tx)."";
-		$sql .= ", localtax1_tx=".price2num($this->localtax1_tx)."";
-		$sql .= ", localtax2_tx=".price2num($this->localtax2_tx)."";
+		$sql .= ", tva_tx=".price2num($this->tva_tx);
+		$sql .= ", localtax1_tx=".price2num($this->localtax1_tx);
+		$sql .= ", localtax2_tx=".price2num($this->localtax2_tx);
 		$sql .= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
 		$sql .= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
 		$sql .= ", qty=".price2num($this->qty);
@@ -5639,15 +5651,15 @@ class FactureLigne extends CommonInvoiceLine
 		if (!empty($this->rang)) {
 			$sql .= ", rang=".((int) $this->rang);
 		}
-		$sql .= ", situation_percent=".$this->situation_percent;
-		$sql .= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
-		$sql .= ", fk_user_modif =".$user->id;
+		$sql .= ", situation_percent = ".((float) $this->situation_percent);
+		$sql .= ", fk_unit = ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		$sql .= ", fk_user_modif = ".((int) $user->id);
 
 		// Multicurrency
-		$sql .= ", multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
-		$sql .= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
-		$sql .= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
-		$sql .= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+		$sql .= ", multicurrency_subprice=".price2num($this->multicurrency_subprice);
+		$sql .= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht);
+		$sql .= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva);
+		$sql .= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc);
 
 		$sql .= " WHERE rowid = ".((int) $this->rowid);
 
@@ -5681,22 +5693,25 @@ class FactureLigne extends CommonInvoiceLine
 	}
 
 	/**
-	 * 	Delete line in database
-	 *  TODO Add param User $user and notrigger (see skeleton)
+	 * Delete line in database
 	 *
-	 *	@return	    int		           <0 if KO, >0 if OK
+	 * @param 	User 	$tmpuser    User that deletes
+	 * @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 * @return 	int		           	<0 if KO, >0 if OK
 	 */
-	public function delete()
+	public function delete($tmpuser = null, $notrigger = false)
 	{
 		global $user;
 
 		$this->db->begin();
 
 		// Call trigger
-		$result = $this->call_trigger('LINEBILL_DELETE', $user);
-		if ($result < 0) {
-			$this->db->rollback();
-			return -1;
+		if (empty($notrigger)) {
+			$result = $this->call_trigger('LINEBILL_DELETE', $user);
+			if ($result < 0) {
+				$this->db->rollback();
+				return -1;
+			}
 		}
 		// End call triggers
 
@@ -5708,7 +5723,7 @@ class FactureLigne extends CommonInvoiceLine
 		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet WHERE rowid = ".((int) $this->rowid);
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+
 		if ($this->db->query($sql)) {
 			$this->db->commit();
 			return 1;
@@ -5740,7 +5755,7 @@ class FactureLigne extends CommonInvoiceLine
 			$this->total_localtax2 = 0;
 		}
 
-		// Mise a jour ligne en base
+		// Update line in database
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET";
 		$sql .= " total_ht=".price2num($this->total_ht)."";
 		$sql .= ",total_tva=".price2num($this->total_tva)."";
@@ -5787,7 +5802,7 @@ class FactureLigne extends CommonInvoiceLine
 				return 0;
 			}
 
-			$sql = 'SELECT situation_percent FROM '.MAIN_DB_PREFIX.'facturedet WHERE rowid='.$this->fk_prev_id;
+			$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) {
 				$res = $this->db->fetch_array($resql);
@@ -5797,9 +5812,9 @@ class FactureLigne extends CommonInvoiceLine
 				if ($include_credit_note) {
 					$sql = 'SELECT fd.situation_percent FROM '.MAIN_DB_PREFIX.'facturedet fd';
 					$sql .= ' JOIN '.MAIN_DB_PREFIX.'facture f ON (f.rowid = fd.fk_facture) ';
-					$sql .= ' WHERE fd.fk_prev_id = '.((int) $this->fk_prev_id);
-					$sql .= ' AND f.situation_cycle_ref = '.((int) $invoicecache[$invoiceid]->situation_cycle_ref); // Prevent cycle outed
-					$sql .= ' AND f.type = '.Facture::TYPE_CREDIT_NOTE;
+					$sql .= " WHERE fd.fk_prev_id = ".((int) $this->fk_prev_id);
+					$sql .= " AND f.situation_cycle_ref = ".((int) $invoicecache[$invoiceid]->situation_cycle_ref); // Prevent cycle outed
+					$sql .= " AND f.type = ".Facture::TYPE_CREDIT_NOTE;
 
 					$res = $this->db->query($sql);
 					if ($res) {
diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php
index 96c8e88b97e..a54cd1a6668 100644
--- a/htdocs/compta/facture/class/facturestats.class.php
+++ b/htdocs/compta/facture/class/facturestats.class.php
@@ -85,7 +85,7 @@ class FactureStats extends Stats
 
 		$this->where = " f.fk_statut >= 0";
 		$this->where .= " AND f.entity IN (".getEntity('invoice').")";
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$this->where .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($mode == 'customer') {
@@ -129,7 +129,7 @@ class FactureStats extends Stats
 
 		$sql = "SELECT date_format(f.datef,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -155,7 +155,7 @@ class FactureStats extends Stats
 
 		$sql = "SELECT date_format(f.datef,'%Y') as dm, COUNT(*), SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -180,7 +180,7 @@ class FactureStats extends Stats
 
 		$sql = "SELECT date_format(datef,'%m') as dm, SUM(f.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -206,7 +206,7 @@ class FactureStats extends Stats
 
 		$sql = "SELECT date_format(datef,'%m') as dm, AVG(f.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -229,7 +229,7 @@ class FactureStats extends Stats
 
 		$sql = "SELECT date_format(datef,'%Y') as year, COUNT(*) as nb, SUM(f.".$this->field.") as total, AVG(f.".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -253,7 +253,7 @@ class FactureStats extends Stats
 
 		$sql = "SELECT product.ref, COUNT(product.ref) as nb, SUM(tl.".$this->field_line.") as total, AVG(tl.".$this->field_line.") as avg";
 		$sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -266,4 +266,31 @@ class FactureStats extends Stats
 
 		return $this->_getAllByProduct($sql, $limit);
 	}
+	/**
+	 *      Return the invoices amount by year for a number of past years
+	 *
+	 *      @param  int             $numberYears    Years to scan
+	 *      @param  int             $format         0=Label of abscissa is a translated text, 1=Label of abscissa is year, 2=Label of abscissa is last number of year
+	 *      @return array                           Array with amount by year
+	 */
+	public function getAmountByYear($numberYears, $format = 0)
+	{
+		global $user;
+
+		$endYear = date('Y');
+		$startYear = $endYear - $numberYears;
+		$sql = "SELECT date_format(datef,'%Y') as dm, SUM(f.".$this->field.")";
+		$sql .= " FROM ".$this->from;
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= $this->join;
+		$sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($startYear))."' AND '".$this->db->idate(dol_get_last_day($endYear))."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'ASC');
+
+		$res = $this->_getAmountByYear($sql);
+		return $res;
+	}
 }
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index 87cd50d27c6..f94ad573a81 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -311,7 +311,7 @@ class PaymentTerm // extends CommonObject
 		$sql .= " type_cdr=".(isset($this->type_cdr) ? $this->type_cdr : "null").",";
 		$sql .= " nbjour=".(isset($this->nbjour) ? $this->nbjour : "null").",";
 		$sql .= " decalage=".(isset($this->decalage) ? $this->decalage : "null")."";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$this->db->begin();
 
@@ -350,7 +350,7 @@ class PaymentTerm // extends CommonObject
 		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_payment_term";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$this->db->begin();
 
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 2105e197e1f..43897172779 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -142,7 +142,7 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->facture->creer) {
 				if ($action != 'classify') {
-					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
 				}
 				if ($action == 'classify') {
@@ -160,9 +160,10 @@ if ($id > 0 || !empty($ref)) {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index e58e5299d05..6eb05a16922 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -50,8 +50,8 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -143,7 +143,7 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->facture->creer) {
 				if ($action != 'classify') {
-					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
 				}
 				if ($action == 'classify') {
@@ -161,9 +161,10 @@ if ($id > 0 || !empty($ref)) {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php
index d3d3a33acb5..1821d4720af 100644
--- a/htdocs/compta/facture/index.php
+++ b/htdocs/compta/facture/index.php
@@ -16,7 +16,7 @@
  */
 
 /**
- *	\file		htdocs/compat/facture/index.php
+ *	\file		htdocs/compta/facture/index.php
 *	\ingroup	facture
  *	\brief		Home page of customer invoices area
  */
@@ -43,9 +43,8 @@ if (isset($user->socid) && $user->socid > 0) {
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 // Maximum elements of the tables
-$maxDraftCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
-$maxLatestEditCount = 5;
-$maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxDraftCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? $max : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? $max : $conf->global->MAIN_MAXLIST_OVERLOAD;
 
 
 /*
@@ -64,7 +63,7 @@ if ($tmp) {
 	print $tmp;
 	print '<br>';
 }
-$tmp = getCustomerInvoiceDraftTable($max, $socid);
+$tmp = getCustomerInvoiceDraftTable($maxDraftCount, $socid);
 if ($tmp) {
 	print $tmp;
 	print '<br>';
@@ -73,21 +72,19 @@ if ($tmp) {
 print '</div>';
 
 print '<div class="fichetwothirdright">';
-print '<div class="ficheaddleft">';
 
-$tmp = getCustomerInvoiceLatestEditTable($maxLatestEditCount, $socid);
+$tmp = getCustomerInvoiceLatestEditTable($max, $socid);
 if ($tmp) {
 	print $tmp;
 	print '<br>';
 }
 
-$tmp = getCustomerInvoiceUnpaidOpenTable($max, $socid);
+$tmp = getCustomerInvoiceUnpaidOpenTable($maxOpenCount, $socid);
 if ($tmp) {
 	print $tmp;
 	print '<br>';
 }
 
-print '</div>';
 print '</div>';
 
 print '</div>';
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index 11362b4fb3c..60efaf36e3d 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -102,7 +102,7 @@ if (!empty($conf->projet->enabled)) {
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->facture->creer) {
 		if ($action != 'classify') {
-			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			$morehtmlref .= ' : ';
 		}
 		if ($action == 'classify') {
@@ -120,9 +120,10 @@ if (!empty($conf->projet->enabled)) {
 		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>';
+			$morehtmlref .= ' : '.$proj->getNomUrl(1);
+			if ($proj->title) {
+				$morehtmlref .= ' - '.$proj->title;
+			}
 		} else {
 			$morehtmlref .= '';
 		}
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 8c46f8df59a..a07d95094dd 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -74,20 +74,30 @@ $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_day = GETPOST('search_day', 'int');
-$search_year = GETPOST('search_year', 'int');
-$search_month = GETPOST('search_month', 'int');
-$search_day_date_when = GETPOST('search_day_date_when', 'int');
-$search_year_date_when = GETPOST('search_year_date_when', 'int');
-$search_month_date_when = GETPOST('search_month_date_when', '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);
+$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');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -206,12 +216,22 @@ if (empty($reshook)) {
 		$search_montant_ttc = '';
 		$search_payment_mode = '';
 		$search_payment_term = '';
-		$search_day = '';
-		$search_year = '';
-		$search_month = '';
-		$search_day_date_when = '';
-		$search_year_date_when = '';
-		$search_month_date_when = '';
+		$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 = '';
@@ -260,7 +280,7 @@ $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 : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 	}
 }
 // Add fields from hooks
@@ -271,12 +291,12 @@ $sql = preg_replace('/,\s*$/', '', $sql);
 
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_rec as f";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_rec_extrafields as ef ON ef.fk_object = f.rowid";
-if (!$user->rights->societe->client->voir && !$socid) {
+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 (!$user->rights->societe->client->voir && !$socid) {
+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) {
@@ -326,8 +346,18 @@ if ($search_status != '' && $search_status >= -1) {
 		$sql .= ' AND suspended = 1';
 	}
 }
-$sql .= dolSqlDateFilter('f.date_last_gen', $search_day, $search_month, $search_year);
-$sql .= dolSqlDateFilter('f.date_when', $search_day_date_when, $search_month_date_when, $search_year_date_when);
+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') {
@@ -361,23 +391,41 @@ if ($resql) {
 	if ($socid > 0) {
 		$param .= '&socid='.urlencode($socid);
 	}
-	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_day_date_when) {
-		$param .= '&search_day_date_when='.urlencode($search_day_date_when);
+	if ($search_date_endday) {
+		$param .= '&search_date_endday='.urlencode($search_date_endday);
 	}
-	if ($search_month_date_when) {
-		$param .= '&search_month_date_when='.urlencode($search_month_date_when);
+	if ($search_date_endmonth) {
+		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
 	}
-	if ($search_year_date_when) {
-		$param .= '&search_year_date_when='.urlencode($search_year_date_when);
+	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);
@@ -457,7 +505,7 @@ if ($resql) {
 		print '<input class="flat maxwidth100" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 		print '</td>';
 	}
-	// Thirpdarty
+	// 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>';
 	}
@@ -493,19 +541,19 @@ if ($resql) {
 	}
 	if (!empty($arrayfields['recurring']['checked'])) {
 		// Recurring or not
-		print '<td class="liste_titre" align="center">';
+		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" align="center">';
+		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" align="center">';
+		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>';
 	}
@@ -516,22 +564,24 @@ if ($resql) {
 	}
 	// Date invoice
 	if (!empty($arrayfields['f.date_last_gen']['checked'])) {
-		print '<td class="liste_titre nowraponall" align="center">';
-		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-			print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
-		}
-		print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
-		$formother->select_year($search_year ? $search_year : -1, 'search_year', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
+		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 nowraponall" align="center">';
-		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-			print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day_date_when" value="'.$search_day_date_when.'">';
-		}
-		print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month_date_when" value="'.$search_month_date_when.'">';
-		$formother->select_year($search_year_date_when ? $search_year_date_when : -1, 'search_year_date_when', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
+		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
@@ -563,7 +613,7 @@ if ($resql) {
 	}
 	// Status
 	if (!empty($arrayfields['status']['checked'])) {
-		print '<td class="liste_titre" align="center">';
+		print '<td class="liste_titre center">';
 		$liststatus = array(
 			0=>$langs->trans("Draft"),
 			1=>$langs->trans("Active"),
@@ -642,6 +692,10 @@ if ($resql) {
 	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)) {
@@ -651,7 +705,7 @@ if ($resql) {
 			$companystatic->id = $objp->socid;
 			$companystatic->name = $objp->name;
 
-			$invoicerectmp->id = $objp->id ? $objp->id : $objp->facid;
+			$invoicerectmp->id = !empty($objp->id) ? $objp->id : $objp->facid;
 			$invoicerectmp->frequency = $objp->frequency;
 			$invoicerectmp->suspended = $objp->suspended;
 			$invoicerectmp->unit_frequency = $objp->unit_frequency;
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index ccf3c2f3f0c..f526220c071 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -106,7 +106,7 @@ $search_pos_source = GETPOST('search_pos_source', 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state");
-$search_country = GETPOST("search_country", 'int');
+$search_country = GETPOST("search_country", 'alpha');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_user = GETPOST('search_user', 'int');
 $search_sale = GETPOST('search_sale', 'int');
@@ -116,7 +116,7 @@ $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_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_valid_startday = GETPOST('search_date_valid_startday', 'int');
 $search_date_valid_startmonth = GETPOST('search_date_valid_startmonth', 'int');
@@ -124,7 +124,7 @@ $search_date_valid_startyear = GETPOST('search_date_valid_startyear', 'int');
 $search_date_valid_endday = GETPOST('search_date_valid_endday', 'int');
 $search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int');
 $search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int');
-$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear);	// Use tzserver
+$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver
 $search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
 $search_datelimit_startday = GETPOST('search_datelimit_startday', 'int');
 $search_datelimit_startmonth = GETPOST('search_datelimit_startmonth', 'int');
@@ -147,8 +147,8 @@ if ($option == 'late') {
 $filtre = GETPOST('filtre', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
@@ -234,6 +234,7 @@ $arrayfields = array(
 	'dynamount_payed'=>array('label'=>"Received", 'checked'=>0, 'position'=>140),
 	'rtp'=>array('label'=>"Rest", 'checked'=>0, 'position'=>150), // Not enabled by default because slow
 	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>165),
+	'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>0, 'position'=>166),
 	'f.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>280),
 	'f.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>285),
 	'f.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>290),
@@ -241,10 +242,10 @@ $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) || !$user->rights->margins->liretous ? 0 : 1)),
-	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)),
-	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)),
-	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)),
+	'total_pa' => array('label' => ($conf->global->MARGIN_TYPE == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (empty($conf->margin->enabled) || 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)),
 	'f.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	'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))),
@@ -252,7 +253,7 @@ $arrayfields = array(
 	'f.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 );
 
-if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_RETAINED_WARRANTY) {
+if (getDolGlobalString("INVOICE_USE_SITUATION") && $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)
@@ -375,13 +376,64 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
-if ($massaction == 'makepayment_confirm') {
+if ($action == 'makepayment_confirm' && $user->rights->facture->paiement) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 	$arrayofselected = is_array($toselect) ? $toselect : array();
-
-	$loc = dol_buildpath('/compta/paiement.php', 2).'?action=create&facids='.implode(',', $arrayofselected);
-
-	header('Location: '.$loc);
-	exit;
+	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');
+								$errorpayment++;
+							} else {
+								$result = $paiement->addPaymentToBank($user, 'payment', '', $bankid, '', '');
+								if ($result < 0) {
+									setEventMessages($facture->ref.' '.$paiement->error, $paiement->errors, 'errors');
+									$errorpayment++;
+								}
+							}
+						}
+					} else {
+						setEventMessage($langs->trans('NoPaymentAvailable', $facture->ref), 'warnings');
+						$errorpayment++;
+					}
+				} else {
+					setEventMessage($langs->trans('NoPaymentAvailable', $facture->ref), 'warnings');
+					$errorpayment++;
+				}
+			}
+			if (empty($errorpayment)) {
+				setEventMessage($langs->trans('PaymentRegisteredAndInvoiceSetToPaid', $facture->ref));
+			}
+		}
+	}
 } elseif ($massaction == 'withdrawrequest') {
 	$langs->load("withdrawals");
 
@@ -503,13 +555,13 @@ $sql .= ' u.login, u.lastname, u.firstname, u.email as user_email, u.statut as u
 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) {
+if ($search_categ_cus && $search_categ_cus != -1) {
 	$sql .= ", cc.fk_categorie, cc.fk_soc";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 	}
 }
 // Add fields from hooks
@@ -540,7 +592,7 @@ if ($search_product_category > 0) {
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = f.fk_projet";
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user AS u ON f.fk_user_author = u.rowid';
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
+if ($search_sale > 0 || (empty($user->rights->societe->client->voir) && !$socid)) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 if ($search_user > 0) {
@@ -554,7 +606,7 @@ $sql .= $hookmanager->resPrint;
 
 $sql .= ' WHERE f.fk_soc = s.rowid';
 $sql .= ' AND f.entity IN ('.getEntity('invoice').')';
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if ($search_product_category > 0) {
@@ -600,8 +652,26 @@ if ($search_zip) {
 if ($search_state) {
 	$sql .= natural_search("state.nom", $search_state);
 }
-if ($search_country) {
-	$sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
+if (strlen(trim($search_country))) {
+	$arrayofcode = getCountriesInEEC();
+	$country_code_in_EEC = $country_code_in_EEC_without_me = '';
+	foreach ($arrayofcode as $key => $value) {
+		$country_code_in_EEC .= ($country_code_in_EEC ? "," : "")."'".$value."'";
+		if ($value != $mysoc->country_code) {
+			$country_code_in_EEC_without_me .= ($country_code_in_EEC_without_me ? "," : "")."'".$value."'";
+		}
+	}
+	if ($search_country == 'special_allnotme') {
+		$sql .= " AND country.code <> '".$db->escape($mysoc->country_code)."'";
+	} elseif ($search_country == 'special_eec') {
+		$sql .= " AND country.code IN (".$db->sanitize($country_code_in_EEC, 1).")";
+	} elseif ($search_country == 'special_eecnotme') {
+		$sql .= " AND country.code IN (".$db->sanitize($country_code_in_EEC_without_me, 1).")";
+	} elseif ($search_country == 'special_noteec') {
+		$sql .= " AND country.code NOT IN (".$db->sanitize($country_code_in_EEC, 1).")";
+	} else {
+		$sql .= natural_search("country.code", $search_country);
+	}
 }
 if ($search_type_thirdparty != '' && $search_type_thirdparty != '-1') {
 	$sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
@@ -622,7 +692,7 @@ if ($search_montant_ttc != '') {
 	$sql .= natural_search('f.total_ttc', $search_montant_ttc, 1);
 }
 if ($search_multicurrency_code != '') {
-	$sql .= ' AND f.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
+	$sql .= " AND f.multicurrency_code = '".$db->escape($search_multicurrency_code)."'";
 }
 if ($search_multicurrency_tx != '') {
 	$sql .= natural_search('f.multicurrency_tx', $search_multicurrency_tx, 1);
@@ -725,7 +795,7 @@ if (!$sall) {
 	$sql .= ' country.code,';
 	$sql .= " p.rowid, p.ref, p.title,";
 	$sql .= " u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender";
-	if ($search_categ_cus && $search_categ_cus!=-1) {
+	if ($search_categ_cus && $search_categ_cus != -1) {
 		$sql .= ", cc.fk_categorie, cc.fk_soc";
 	}
 	// Add fields from extrafields
@@ -735,7 +805,7 @@ if (!$sall) {
 		}
 	}
 	// Add GroupBy from hooks
-	$parameters = array('all' => $all, 'fieldstosearchall' => $fieldstosearchall);
+	$parameters = array('all' => !empty($all) ? $all : 0, 'fieldstosearchall' => $fieldstosearchall);
 	$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
 } else {
@@ -745,7 +815,7 @@ if (!$sall) {
 // 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) : '';
+$sql .= empty($hookmanager->resPrint) ? "" : " HAVING 1=1 ".$hookmanager->resPrint;
 
 $sql .= ' ORDER BY ';
 $listfield = explode(',', $sortfield);
@@ -838,7 +908,7 @@ if ($resql) {
 	if ($search_date_valid_endyear) {
 		$param .= '&search_date_valid_endyear='.urlencode($search_date_valid_endyear);
 	}
-	if ($search_datelimit_startday)	{
+	if ($search_datelimit_startday) {
 		$param .= '&search_datelimit_startday='.urlencode($search_datelimit_startday);
 	}
 	if ($search_datelimit_startmonth) {
@@ -883,6 +953,9 @@ if ($resql) {
 	if ($search_zip) {
 		$param .= '&search_zip='.urlencode($search_zip);
 	}
+	if ($search_country) {
+		$param .= "&search_country=".urlencode($search_country);
+	}
 	if ($search_sale > 0) {
 		$param .= '&search_sale='.urlencode($search_sale);
 	}
@@ -965,8 +1038,10 @@ if ($resql) {
 		'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"),
-		//'makepayment'=>$langs->trans("InvoicePaymentsLimits"),
 	);
+	if ($user->rights->facture->paiement) {
+		$arrayofmassactions['makepayment'] = $langs->trans("RegisterPaymentAndClasiffiedPayed");
+	}
 	if ($conf->prelevement->enabled && !empty($user->rights->prelevement->bons->creer)) {
 			$langs->load("withdrawals");
 			$arrayofmassactions['withdrawrequest'] = img_picto('', 'payment', 'class="pictofixedwidth"').$langs->trans("MakeWithdrawRequest");
@@ -978,7 +1053,7 @@ if ($resql) {
 			$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 		}
 	}
-	if (in_array($massaction, array('presend', 'predelete'))) {
+	if (in_array($massaction, array('presend', 'predelete', 'makepayment'))) {
 		$arrayofmassactions = array();
 	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -1000,7 +1075,9 @@ if ($resql) {
 	}
 	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">';
+	if (!in_array($massaction, array('makepayment'))) {
+		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="search_status" value="'.$search_status.'">';
@@ -1014,6 +1091,21 @@ if ($resql) {
 	$trackid = 'inv'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
+	if ($massaction == 'makepayment') {
+		$formconfirm = '';
+		$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' => 'date', 'name' => 'datepaiment', 'label' => $langs->trans("Date")),
+			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);
+		print $formconfirm;
+	}
+
 	if ($sall) {
 		foreach ($fieldstosearchall as $key => $val) {
 			$fieldstosearchall[$key] = $langs->trans($val);
@@ -1182,7 +1274,7 @@ if ($resql) {
 	// Country
 	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print '<td class="liste_titre" align="center">';
-		print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
+		print $form->select_country($search_country, 'search_country', '', 0, 'minwidth150imp maxwidth150', 'code2', 1, 0, 1, null, 1);
 		print '</td>';
 	}
 	// Company type
@@ -1251,6 +1343,9 @@ if ($resql) {
 		print '<input class="flat" size="4" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
 		print '</td>';
 	}
+	if (!empty($arrayfields['sale_representative']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
 	if (!empty($arrayfields['f.retained_warranty']['checked'])) {
 		print '<td class="liste_titre" align="right">';
 		print '</td>';
@@ -1443,6 +1538,9 @@ if ($resql) {
 	if (!empty($arrayfields['u.login']['checked'])) {
 		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
 	}
+	if (!empty($arrayfields['sale_representative']['checked'])) {
+		print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder);
+	}
 	if (!empty($arrayfields['f.retained_warranty']['checked'])) {
 		print_liste_field_titre($arrayfields['f.retained_warranty']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
 	}
@@ -1523,6 +1621,18 @@ if ($resql) {
 		$totalarray['val'] = array();
 		$totalarray['val']['f.total_ht'] = 0;
 		$totalarray['val']['f.total_ttc'] = 0;
+
+		$with_margin_info = false;
+		if (!empty($conf->margin->enabled) && (
+				!empty($arrayfields['total_pa']['checked'])
+				|| !empty($arrayfields['total_margin']['checked'])
+				|| !empty($arrayfields['total_margin_rate']['checked'])
+				|| !empty($arrayfields['total_mark_rate']['checked'])
+			)
+		) {
+			$with_margin_info = true;
+		}
+
 		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($resql);
 
@@ -1552,7 +1662,7 @@ if ($resql) {
 
 			$facturestatic->note_public = $obj->note_public;
 			$facturestatic->note_private = $obj->note_private;
-			if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_RETAINED_WARRANTY) {
+			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;
@@ -1608,14 +1718,20 @@ if ($resql) {
 			$facturestatic->alreadypaid = $paiement;
 
 			$marginInfo = array();
-			if (!empty($conf->margin->enabled)) {
+			if ($with_margin_info === true) {
 				$facturestatic->fetch_lines();
 				$marginInfo = $formmargin->getMarginInfosArray($facturestatic);
 			}
 
 			print '<tr class="oddeven"';
 			if ($contextpage == 'poslist') {
-				print ' onclick="parent.$(\'#poslines\').load(\'invoice.php?action=history&placeid='.$obj->id.'\', function() {parent.$.colorbox.close();});"';
+				print ' onclick="parent.$(\'#poslines\').load(\'invoice.php?action=history&placeid='.$obj->id.'\', function() {parent.$.colorbox.close();';
+				if (strpos($obj->ref, 'PROV') !== false) {
+					//If is a draft invoice, load var to be able to add products
+					$place = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
+					print 'parent.place=\''.$place.'\'';
+				}
+				print '});"';
 			}
 			print '>';
 
@@ -1751,7 +1867,7 @@ if ($resql) {
 			}
 			// Town
 			if (!empty($arrayfields['s.town']['checked'])) {
-				print '<td>';
+				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->town).'">';
 				print dol_escape_htmltag($obj->town);
 				print '</td>';
 				if (!$i) {
@@ -1769,7 +1885,7 @@ if ($resql) {
 			}
 			// State
 			if (!empty($arrayfields['state.nom']['checked'])) {
-				print "<td>".$obj->state_name."</td>\n";
+				print "<td>".dol_escape_htmltag($obj->state_name)."</td>\n";
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
@@ -1933,6 +2049,53 @@ if ($resql) {
 				}
 			}
 
+			if (!empty($arrayfields['sale_representative']['checked'])) {
+				// Sales representatives
+				print '<td>';
+				if ($obj->socid > 0) {
+					$listsalesrepresentatives = $thirdpartystatic->getSalesRepresentatives($user);
+					if ($listsalesrepresentatives < 0) {
+						dol_print_error($db);
+					}
+					$nbofsalesrepresentative = count($listsalesrepresentatives);
+					if ($nbofsalesrepresentative > 6) {
+						// We print only number
+						print $nbofsalesrepresentative;
+					} elseif ($nbofsalesrepresentative > 0) {
+						$j = 0;
+						foreach ($listsalesrepresentatives as $val) {
+							$userstatic->id = $val['id'];
+							$userstatic->lastname = $val['lastname'];
+							$userstatic->firstname = $val['firstname'];
+							$userstatic->email = $val['email'];
+							$userstatic->statut = $val['statut'];
+							$userstatic->entity = $val['entity'];
+							$userstatic->photo = $val['photo'];
+							$userstatic->login = $val['login'];
+							$userstatic->office_phone = $val['office_phone'];
+							$userstatic->office_fax = $val['office_fax'];
+							$userstatic->user_mobile = $val['user_mobile'];
+							$userstatic->job = $val['job'];
+							$userstatic->gender = $val['gender'];
+							//print '<div class="float">':
+							print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
+							$j++;
+							if ($j < $nbofsalesrepresentative) {
+								print ' ';
+							}
+							//print '</div>';
+						}
+					}
+					//else print $langs->trans("NoSalesRepresentativeAffected");
+				} else {
+					print '&nbsp;';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
 			if (!empty($arrayfields['f.retained_warranty']['checked'])) {
 				print '<td align="right">'.(!empty($obj->retained_warranty) ? price($obj->retained_warranty).'%' : '&nbsp;').'</td>';
 			}
@@ -2043,7 +2206,7 @@ if ($resql) {
 					$totalarray['nbfield']++;
 				}
 			}
-			// total mark rate
+			// Total mark rate
 			if (!empty($arrayfields['total_mark_rate']['checked'])) {
 				print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
 				if (!$i) {
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 437cfa456f4..6f699774d32 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -54,6 +54,8 @@ $socid = 0;
 if ($user->socid) {
 	$socid = $user->socid;
 }
+$hookmanager->initHooks(array('invoicenote'));
+
 $result = restrictedArea($user, 'facture', $id, '');
 
 
@@ -61,7 +63,13 @@ $result = restrictedArea($user, 'facture', $id, '');
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$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
+}
 
 
 
@@ -111,7 +119,7 @@ if ($id > 0 || !empty($ref)) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->facture->creer) {
 			if ($action != 'classify') {
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -129,9 +137,10 @@ if ($id > 0 || !empty($ref)) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 2fc980a122a..cd34a027651 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -73,7 +73,7 @@ $hookmanager->initHooks(array('directdebitcard', 'globalcard'));
 
 if ($type == 'bank-transfer') {
 	$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture', 'fk_soc', $fieldid, $isdraft);
-	if (!$user->rights->fournisseur->facture->lire) {
+	if (empty($user->rights->fournisseur->facture->lire)) {
 		accessforbidden();
 	}
 } else {
@@ -83,6 +83,12 @@ if ($type == 'bank-transfer') {
 	}
 }
 
+if ($type == 'bank-transfer') {
+	$usercancreate = ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer);
+} else {
+	$usercancreate = $user->rights->facture->creer;
+}
+
 
 /*
  * Actions
@@ -95,7 +101,7 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
-	if ($action == "new") {
+	if ($action == "new" && $usercancreate) {
 		if ($object->id > 0) {
 			$db->begin();
 
@@ -119,7 +125,7 @@ if (empty($reshook)) {
 		$action = '';
 	}
 
-	if ($action == "delete") {
+	if ($action == "delete" && $usercancreate) {
 		if ($object->id > 0) {
 			$result = $object->demande_prelevement_delete($user, GETPOST('did', 'int'));
 			if ($result == 0) {
@@ -128,6 +134,83 @@ if (empty($reshook)) {
 			}
 		}
 	}
+
+	// payments conditions
+	if ($action == 'setconditions' && $usercancreate) {
+		$object->fetch($id);
+		$object->cond_reglement_code = 0; // To clean property
+		$object->cond_reglement_id = 0; // To clean property
+
+		$error = 0;
+
+		$db->begin();
+
+		if (!$error) {
+			$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+			if ($result < 0) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+
+		if (!$error) {
+			$old_date_echeance = $object->date_echeance;
+			$new_date_echeance = $object->calculate_date_lim_reglement();
+			if ($new_date_echeance > $old_date_echeance) {
+				$object->date_echeance = $new_date_echeance;
+			}
+			if ($object->date_echeance < $object->date) {
+				$object->date_echeance = $object->date;
+			}
+			$result = $object->update($user);
+			if ($result < 0) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+
+		if ($error) {
+			$db->rollback();
+		} else {
+			$db->commit();
+		}
+	} elseif ($action == 'setmode' && $usercancreate) {
+		// payment mode
+		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+	} elseif ($action == 'setdatef' && $usercancreate) {
+		$newdate = dol_mktime(0, 0, 0, GETPOST('datefmonth', 'int'), GETPOST('datefday', 'int'), GETPOST('datefyear', 'int'), 'tzserver');
+		if ($newdate > (dol_now('tzuserrel') + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			if (empty($conf->global->INVOICE_MAX_FUTURE_DELAY)) {
+				setEventMessages($langs->trans("WarningInvoiceDateInFuture"), null, 'warnings');
+			} else {
+				setEventMessages($langs->trans("WarningInvoiceDateTooFarInFuture"), null, 'warnings');
+			}
+		}
+
+		$object->date = $newdate;
+		$date_echence_calc = $object->calculate_date_lim_reglement();
+		if (!empty($object->date_echeance) && $object->date_echeance < $date_echence_calc) {
+			$object->date_echeance = $date_echence_calc;
+		}
+		if ($object->date_echeance && $object->date_echeance < $object->date) {
+			$object->date_echeance = $object->date;
+		}
+
+		$result = $object->update($user);
+		if ($result < 0) {
+			dol_print_error($db, $object->error);
+		}
+	} elseif ($action == 'setdate_lim_reglement' && $usercancreate) {
+		$object->date_echeance = dol_mktime(12, 0, 0, GETPOST('date_lim_reglementmonth', 'int'), GETPOST('date_lim_reglementday', 'int'), GETPOST('date_lim_reglementyear', 'int'));
+		if (!empty($object->date_echeance) && $object->date_echeance < $object->date) {
+			$object->date_echeance = $object->date;
+			setEventMessages($langs->trans("DatePaymentTermCantBeLowerThanObjectDate"), null, 'warnings');
+		}
+		$result = $object->update($user);
+		if ($result < 0) {
+			dol_print_error($db, $object->error);
+		}
+	}
 }
 
 
@@ -208,6 +291,34 @@ if ($object->id > 0) {
 		$head = facture_prepare_head($object);
 	}
 
+	$numopen = 0;
+	$pending = 0;
+	$numclosed = 0;
+
+	// How many Direct debit or Credit transfer open requests ?
+
+	$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
+	$sql .= " , pfd.date_traite as date_traite";
+	$sql .= " , pfd.amount";
+	$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+	if ($type == 'bank-transfer') {
+		$sql .= " WHERE fk_facture_fourn = ".((int) $object->id);
+	} else {
+		$sql .= " WHERE fk_facture = ".((int) $object->id);
+	}
+	$sql .= " AND pfd.traite = 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);
+		$numopen = $num;
+	} else {
+		dol_print_error($db);
+	}
+
+
 	print dol_get_fiche_head($head, 'standingorders', $title, -1, ($type == 'bank-transfer' ? 'supplier_invoice' : 'bill'));
 
 	// Invoice content
@@ -243,7 +354,7 @@ if ($object->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->facture->creer) {
 			if ($action != 'classify') {
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -262,9 +373,10 @@ if ($object->id > 0) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
@@ -365,14 +477,14 @@ if ($object->id > 0) {
 	print $langs->trans('DateInvoice');
 	print '</td>';
 	if ($object->type != $object::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && !empty($object->brouillon) && $user->rights->facture->creer) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editinvoicedate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editinvoicedate&token='.newToken().'&id='.$object->id.'&type='.urlencode($type).'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 
 	if ($object->type != $object::TYPE_CREDIT_NOTE) {
 		if ($action == 'editinvoicedate') {
-			$form->form_date($_SERVER['PHP_SELF'].'?id='.$object->id, $object->date, 'invoicedate');
+			print $form->form_date($_SERVER['PHP_SELF'].'?id='.$object->id, $object->date, 'invoicedate', 0, 0, 1, $type);
 		} else {
 			print dol_print_date($object->date, 'day');
 		}
@@ -388,13 +500,13 @@ if ($object->id > 0) {
 	print $langs->trans('PaymentConditionsShort');
 	print '</td>';
 	if ($object->type != $object::TYPE_CREDIT_NOTE && $action != 'editconditions' && !empty($object->brouillon) && $user->rights->facture->creer) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&token='.newToken().'&id='.$object->id.'&type='.urlencode($type).'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($object->type != $object::TYPE_CREDIT_NOTE) {
 		if ($action == 'editconditions') {
-			$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, $type);
 		} else {
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
 		}
@@ -409,7 +521,7 @@ if ($object->id > 0) {
 	print $langs->trans('DateMaxPayment');
 	print '</td>';
 	if ($object->type != $object::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && !empty($object->brouillon) && $user->rights->facture->creer) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editpaymentterm&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editpaymentterm&token='.newToken().'&id='.$object->id.'&type='.urlencode($type).'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td colspan="3">';
@@ -420,7 +532,7 @@ if ($object->id > 0) {
 		}
 
 		if ($action == 'editpaymentterm') {
-			$form->form_date($_SERVER['PHP_SELF'].'?id='.$object->id, $duedate, 'paymentterm');
+			print $form->form_date($_SERVER['PHP_SELF'].'?id='.$object->id, $duedate, 'paymentterm', 0, 0, 1, $type);
 		} else {
 			print dol_print_date($duedate, 'day');
 			if ($object->hasDelay()) {
@@ -438,12 +550,16 @@ if ($object->id > 0) {
 	print $langs->trans('PaymentMode');
 	print '</td>';
 	if ($action != 'editmode' && !empty($object->brouillon) && $user->rights->facture->creer) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'&type='.urlencode($type).'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td colspan="3">';
+	$filtertype = 'CRDT';
+	if ($type == 'bank-transfer') {
+		$filtertype = 'DBIT';
+	}
 	if ($action == 'editmode') {
-		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id');
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', $filtertype, 1, 0, $type);
 	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
 	}
@@ -455,7 +571,7 @@ if ($object->id > 0) {
 	print $langs->trans('BankAccount');
 	print '<td>';
 	if (($action != 'editbankaccount') && $user->rights->commande->creer && !empty($object->brouillon)) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&token='.newToken().'&id='.$object->id.'&type='.urlencode($type).'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td colspan="3">';
@@ -483,7 +599,9 @@ if ($object->id > 0) {
 			print img_warning('Error on default bank number for IBAN : '.$bac->error_message);
 		}
 	} else {
-		print img_warning($langs->trans("NoDefaultIBANFound"));
+		if ($numopen || ($type != 'bank-transfer' && $object->mode_reglement_code == 'PRE') || ($type == 'bank-transfer' && $object->mode_reglement_code == 'VIR')) {
+			print img_warning($langs->trans("NoDefaultIBANFound"));
+		}
 	}
 
 	print '</td></tr>';
@@ -492,7 +610,6 @@ if ($object->id > 0) {
 
 	print '</div>';
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border centpercent tableforfield">';
@@ -539,7 +656,7 @@ if ($object->id > 0) {
 		print $langs->trans('RevenueStamp');
 		print '</td>';
 		if ($action != 'editrevenuestamp' && !empty($object->brouillon) && $user->rights->facture->creer) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrevenuestamp&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrevenuestamp&token='.newToken().'&facid='.$object->id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
@@ -557,7 +674,6 @@ if ($object->id > 0) {
 
 	print '</table>';
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
@@ -567,42 +683,14 @@ if ($object->id > 0) {
 	print dol_get_fiche_end();
 
 
-	$numopen = 0;
-	$pending = 0;
-	$numclosed = 0;
-
-
-	// How many Direct debit opened requests ?
-
-	$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
-	$sql .= " , pfd.date_traite as date_traite";
-	$sql .= " , pfd.amount";
-	$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-	if ($type == 'bank-transfer') {
-		$sql .= " WHERE fk_facture_fourn = ".$object->id;
-	} else {
-		$sql .= " WHERE fk_facture = ".$object->id;
-	}
-	$sql .= " AND pfd.traite = 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);
-		$numopen = $num;
-	} else {
-		dol_print_error($db);
-	}
-
 	// For which amount ?
 
 	$sql = "SELECT SUM(pfd.amount) as amount";
 	$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 	if ($type == 'bank-transfer') {
-		$sql .= " WHERE fk_facture_fourn = ".$object->id;
+		$sql .= " WHERE fk_facture_fourn = ".((int) $object->id);
 	} else {
-		$sql .= " WHERE fk_facture = ".$object->id;
+		$sql .= " WHERE fk_facture = ".((int) $object->id);
 	}
 	$sql .= " AND pfd.traite = 0";
 	$sql .= " AND pfd.ext_payment_id IS NULL";
@@ -701,9 +789,9 @@ if ($object->id > 0) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on pfd.fk_user_demande = u.rowid";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."prelevement_bons as pb ON pb.rowid = pfd.fk_prelevement_bons";
 	if ($type == 'bank-transfer') {
-		$sql .= " WHERE fk_facture_fourn = ".$object->id;
+		$sql .= " WHERE fk_facture_fourn = ".((int) $object->id);
 	} else {
-		$sql .= " WHERE fk_facture = ".$object->id;
+		$sql .= " WHERE fk_facture = ".((int) $object->id);
 	}
 	$sql .= " AND pfd.traite = 0";
 	$sql .= " AND pfd.ext_payment_id IS NULL";
@@ -767,9 +855,9 @@ if ($object->id > 0) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on pfd.fk_user_demande = u.rowid";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."prelevement_bons as pb ON pb.rowid = pfd.fk_prelevement_bons";
 	if ($type == 'bank-transfer') {
-		$sql .= " WHERE fk_facture_fourn = ".$object->id;
+		$sql .= " WHERE fk_facture_fourn = ".((int) $object->id);
 	} else {
-		$sql .= " WHERE fk_facture = ".$object->id;
+		$sql .= " WHERE fk_facture = ".((int) $object->id);
 	}
 	$sql .= " AND pfd.traite = 1";
 	$sql .= " AND pfd.ext_payment_id IS NULL";
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 8a32077cb54..6ee1a057664 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -46,7 +46,7 @@ $mode = GETPOST("mode") ? GETPOST("mode") : 'customer';
 if ($mode == 'customer' && !$user->rights->facture->lire) {
 	accessforbidden();
 }
-if ($mode == 'supplier' && !$user->rights->fournisseur->facture->lire) {
+if ($mode == 'supplier' && empty($user->rights->fournisseur->facture->lire)) {
 	accessforbidden();
 }
 
@@ -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 ON (f.fk_soc = cat.fk_soc)';
+		$stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cat OmdN (f.fk_soc = cat.fk_soc)';
 		$stats->where .= ' AND cat.fk_categorie IN ('.$db->sanitize(implode(',', $custcats)).')';
 	}
 }
@@ -123,10 +123,10 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
 $filenamenb = $dir."/invoicesnbinyear-".$year.".png";
 if ($mode == 'customer') {
-	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$year.'.png';
+	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$year.'.png';
 }
 if ($mode == 'supplier') {
-	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicesnbinyear-'.$year.'.png';
+	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicesnbinyear-'.$year.'.png';
 }
 
 $px1 = new DolGraph();
@@ -192,7 +192,7 @@ if (!$mesg) {
 
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
 	if ($mode == 'customer') {
 		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
@@ -341,7 +341,7 @@ if (!in_array($nowyear, $arrayyears)) {
 	$arrayyears[$nowyear] = $nowyear;
 }
 arsort($arrayyears);
-print $form->selectarray('year', $arrayyears, $year, 0);
+print $form->selectarray('year', $arrayyears, $year, 0, 0, 0, '', 0, 0, 0, '', 'width75');
 print '</td></tr>';
 print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
@@ -380,11 +380,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;').'">'.($val['nb_diff'] < 0 ? '' : '+').round($val['nb_diff']).'%</td>';
+	print '<td class="right opacitylow" style="'.((empty($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(!empty($val['nb_diff']) && $val['nb_diff'] < 0 ? '' : '+').round(!empty($val['nb_diff']) ? $val['nb_diff'] : 0).'%</td>';
 	print '<td class="right"><span class="amount">'.price(price2num($val['total'], 'MT'), 1).'</span></td>';
-	print '<td class="right opacitylow" style="'.(($val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.($val['total_diff'] < 0 ? '' : '+').round($val['total_diff']).'%</td>';
+	print '<td class="right opacitylow" style="'.((empty($val['total_diff']) || $val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.( !empty($val['total_diff']) && $val['total_diff'] < 0 ? '' : '+').round(!empty($val['total_diff']) ? $val['total_diff'] : 0).'%</td>';
 	print '<td class="right"><span class="amount">'.price(price2num($val['avg'], 'MT'), 1).'</span></td>';
-	print '<td class="right opacitylow" style="'.(($val['avg_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.($val['avg_diff'] < 0 ? '' : '+').round($val['avg_diff']).'%</td>';
+	print '<td class="right opacitylow" style="'.((empty($val['avg_diff']) || $val['avg_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(!empty($val['avg_diff']) && $val['avg_diff'] < 0 ? '' : '+').round(!empty($val['avg_diff']) ? $val['avg_diff'] : 0).'%</td>';
 	print '</tr>';
 	$oldyear = $year;
 }
@@ -392,7 +392,7 @@ foreach ($data as $val) {
 print '</table>';
 print '</div>';
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 // Show graphs
@@ -409,7 +409,7 @@ if ($mesg) {
 print '</td></tr></table>';
 
 
-print '</div></div></div>';
+print '</div></div>';
 print '<div style="clear:both"></div>';
 
 
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index 47523447205..0b22e31be4b 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 -->\n";
+print "<!-- BEGIN PHP TEMPLATE compta/facture/tpl/linkedopjectblock.tpl.php -->\n";
 
 global $user;
 global $noMoreLinkedObjectBlockAfter;
@@ -93,7 +93,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		print $objectlink->getLibStatut(3);
 	}
 	print '</td>';
-	print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
+	print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
 	print "</tr>\n";
 }
 if (count($linkedObjectBlock) > 1) {
diff --git a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
index 935f6b03948..d222dfd21dc 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 -->\n";
+print "<!-- BEGIN PHP TEMPLATE compta/facture/tpl/linkedopjectblockForRec.tpl.php -->\n";
 
 
 global $user;
@@ -57,7 +57,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	}
 	?></td>
 	<td class="linkedcol-statut right"><?php echo $objectlink->getLibStatut(3); ?></td>
-	<td class="linkedcol-action right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+	<td class="linkedcol-action right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 </tr>
 	<?php
 }
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 9cb9bca667b..c68a686d2bf 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -112,7 +112,7 @@ print getCustomerInvoiceDraftTable($max, $socid);
 print '<br>';
 print getDraftSupplierTable($max, $socid);
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 // Latest modified customer invoices
@@ -129,12 +129,12 @@ if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
 	$sql .= ", sum(pf.amount) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays, ".MAIN_DB_PREFIX."facture as f";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE s.rowid = f.fk_soc";
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -210,11 +210,11 @@ if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
 				print '<td class="nobordernopadding nowraponall">';
 				print $tmpinvoice->getNomUrl(1, '');
 				print '</td>';
-				print '<td width="20" class="nobordernopadding nowrap">';
 				if ($tmpinvoice->hasDelay()) {
+					print '<td width="20" class="nobordernopadding nowrap">';
 					print img_warning($langs->trans("Late"));
+					print '</td>';
 				}
-				print '</td>';
 				print '<td width="16" class="nobordernopadding hideonsmartphone right">';
 				$filename = dol_sanitizeFileName($obj->ref);
 				$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($obj->ref);
@@ -279,12 +279,12 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$sql .= ", SUM(pf.amount) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE s.rowid = ff.fk_soc";
 	$sql .= " AND ff.entity = ".$conf->entity;
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -363,7 +363,8 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				}
 				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>'.$facstatic->getLibStatut(3).'</td>';
+				$alreadypaid = $facstatic->getSommePaiement();
+				print '<td>'.$facstatic->getLibStatut(3, $alreadypaid).'</td>';
 				print '</tr>';
 				$total_ht += $obj->total_ht;
 				$total_ttc += $obj->total_ttc;
@@ -588,7 +589,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 	$sql .= ", c.rowid, c.ref, c.facture, c.fk_statut as status, c.total_ht, c.total_tva, c.total_ttc,";
 	$sql .= " cc.rowid as country_id, cc.code as country_code";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= ", ".MAIN_DB_PREFIX."commande as c";
@@ -596,7 +597,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture AS f ON el.fk_target = f.rowid AND el.targettype = 'facture'";
 	$sql .= " WHERE c.fk_soc = s.rowid";
 	$sql .= " AND c.entity = ".$conf->entity;
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -711,7 +712,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 				print "</tr>\n";
 			}
 
-			print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToBill").': '.price($tot_tobill).')</font> </td>';
+			print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <span style="font-weight: normal">('.$langs->trans("RemainderToBill").': '.price($tot_tobill).')</span> </td>';
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
 				print '<td class="right">'.price($tot_ht).'</td>';
 			}
@@ -748,7 +749,7 @@ if ($resql) {
 }
 
 
-print '</div></div></div>';
+print '</div></div>';
 
 $parameters = array('user' => $user);
 $reshook = $hookmanager->executeHooks('dashboardAccountancy', $parameters, $object); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 4cffc5c85db..35c6aa399fe 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -196,11 +196,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 }
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index f9ea0ac02d9..234073cdb38 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -568,8 +568,7 @@ print '</tr>';
 print '</table>';
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
-
+print '</div><div class="fichetwothirdright">';
 
 
 /*
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 03acd9d88eb..635727233d3 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -48,7 +48,7 @@ $paymentnum	= GETPOST('num_paiement', 'alpha');
 $socid      = GETPOST('socid', 'int');
 
 $sortfield	= GETPOST('sortfield', 'aZ09comma');
-$sortorder	= GETPOST('sortorder', 'alpha');
+$sortorder	= GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
 $amounts = array();
@@ -131,7 +131,7 @@ if (empty($reshook)) {
 			} elseif (substr($key, 0, 21) == 'multicurrency_amount_') {
 				$cursorfacid = substr($key, 21);
 				$multicurrency_amounts[$cursorfacid] = price2num(GETPOST($key));
-				$multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
+				$multicurrency_totalpayment += floatval($multicurrency_amounts[$cursorfacid]);
 				if (!empty($multicurrency_amounts[$cursorfacid])) {
 					$atleastonepaymentnotnull++;
 				}
@@ -348,7 +348,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 		// Add realtime total information
 		if (!empty($conf->use_javascript_ajax)) {
-			print "\n".'<script type="text/javascript" language="javascript">';
+			print "\n".'<script type="text/javascript">';
 			print '$(document).ready(function () {
             			setPaiementCode();
 
@@ -529,14 +529,14 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		$sql .= ' f.datef as df, f.fk_soc as socid, f.date_lim_reglement as dlr';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f';
 		$sql .= ' WHERE f.entity IN ('.getEntity('facture').')';
-		$sql .= ' AND (f.fk_soc = '.$facture->socid;
+		$sql .= ' AND (f.fk_soc = '.((int) $facture->socid);
 		// Can pay invoices of all child of parent company
 		if (!empty($conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS) && !empty($facture->thirdparty->parent)) {
-			$sql .= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.$facture->thirdparty->parent.')';
+			$sql .= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.((int) $facture->thirdparty->parent).')';
 		}
 		// Can pay invoices of all child of myself
 		if (!empty($conf->global->FACTURE_PAYMENTS_ON_SUBSIDIARY_COMPANIES)) {
-			$sql .= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.$facture->thirdparty->id.')';
+			$sql .= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.((int) $facture->thirdparty->id).')';
 		}
 		$sql .= ') AND f.paye = 0';
 		$sql .= ' AND f.fk_statut = 1'; // Statut=0 => not validated, Statut=2 => canceled
@@ -726,7 +726,31 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 					print '</span></td>';
 
 					// Remain to take or to pay back
-					print '<td class="right">'.price($sign * $remaintopay).'</td>';
+					print '<td class="right">';
+					print price($sign * $remaintopay);
+					if (!empty($conf->prelevement->enabled)) {
+						$numdirectdebitopen = 0;
+						$totaldirectdebit = 0;
+						$sql = "SELECT COUNT(pfd.rowid) as nb, SUM(pfd.amount) as amount";
+						$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+						$sql .= " WHERE fk_facture = ".((int) $objp->facid);
+						$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);
+							$numdirectdebitopen = $obj->nb;
+							$totaldirectdebit = $obj->amount;
+						} else {
+							dol_print_error($db);
+						}
+						if ($numdirectdebitopen) {
+							$langs->load("withdrawals");
+							print img_warning($langs->trans("WarningSomeDirectDebitOrdersAlreadyExists", $numdirectdebitopen, price(price2num($totaldirectdebit, 'MT'), 0, $langs, 1, -1, -1, $conf->currency)), '', 'classfortooltip');
+						}
+					}
+					print '</td>';
 					//$test= price(price2num($objp->total_ttc - $paiement - $creditnotes - $deposits));
 
 					// Amount
@@ -802,6 +826,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 			dol_print_error($db);
 		}
 
+		$formconfirm = '';
 
 		// Save button
 		if ($action != 'add_paiement') {
@@ -840,9 +865,21 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				$text .= '<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
 				print '<input type="hidden" name="closepaidinvoices" value="'.GETPOST('closepaidinvoices').'">';
 			}
-			print $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type, $langs->trans('ReceivedCustomersPayments'), $text, 'confirm_paiement', $formquestion, $preselectedchoice);
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type, $langs->trans('ReceivedCustomersPayments'), $text, 'confirm_paiement', $formquestion, $preselectedchoice);
 		}
 
+		// 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;
+
 		print "</form>\n";
 	}
 }
@@ -875,7 +912,7 @@ if (!GETPOST('action', 'aZ09')) {
 		$sql .= ' AND f.fk_soc = '.((int) $socid);
 	}
 
-	$sql .= ' ORDER BY '.$sortfield.' '.$sortorder;
+	$sql .= $db->order($sortfield, $sortorder);
 	$sql .= $db->plimit($limit + 1, $offset);
 	$resql = $db->query($sql);
 
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index e798eecaefa..93fdd415513 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -126,7 +126,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture
 			$sql .= ' WHERE pf.fk_facture = f.rowid';
 			$sql .= ' AND f.fk_soc = s.rowid';
 			$sql .= ' AND f.entity IN ('.getEntity('invoice').')';
-			$sql .= ' AND pf.fk_paiement = '.$object->id;
+			$sql .= ' AND pf.fk_paiement = '.((int) $object->id);
 			$resql = $db->query($sql);
 			if ($resql) {
 				$i = 0;
@@ -295,7 +295,7 @@ print '</td></tr>';
 if (!empty($conf->banque->enabled)) {
 	if ($object->fk_account > 0) {
 		if ($object->type_code == 'CHQ' && $bankline->fk_bordereau > 0) {
-			dol_include_once('/compta/paiement/cheque/class/remisecheque.class.php');
+			include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 			$bordereau = new RemiseCheque($db);
 			$bordereau->fetch($bankline->fk_bordereau);
 
@@ -342,7 +342,7 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf,'.MAIN_DB_PREFIX.'factur
 $sql .= ' WHERE pf.fk_facture = f.rowid';
 $sql .= ' AND f.fk_soc = s.rowid';
 $sql .= ' AND f.entity IN ('.getEntity('invoice').')';
-$sql .= ' AND pf.fk_paiement = '.$object->id;
+$sql .= ' AND pf.fk_paiement = '.((int) $object->id);
 $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
@@ -448,7 +448,7 @@ print '<div class="tabsAction">';
 if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
 	if ($user->socid == 0 && $object->statut == 0 && $_GET['action'] == '') {
 		if ($user->rights->facture->paiement) {
-			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;facid='.$objp->facid.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
+			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&facid='.$objp->facid.'&action=valide&token='.newToken().'">'.$langs->trans('Valid').'</a>';
 		}
 	}
 }
@@ -456,7 +456,7 @@ if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
 if ($user->socid == 0 && $action == '') {
 	if ($user->rights->facture->paiement) {
 		if (!$disable_delete) {
-			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
+			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$title_button.'">'.$langs->trans('Delete').'</a>';
 		}
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 32f81532ecf..0dd6c57313e 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2011-2016	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013 		Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2015-2016	Alexandre Spangaro		<aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-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
@@ -388,7 +388,7 @@ if ($action == 'new') {
 		$i = 0;
 		while ($obj = $db->fetch_object($resql)) {
 			$accounts[$obj->bid] = $obj->label;
-			$lines[$obj->bid][$i]["date"] = $db->jdate($obj->date);
+			$lines[$obj->bid][$i]["date"] = $db->jdate($obj->datec);
 			$lines[$obj->bid][$i]["amount"] = $obj->amount;
 			$lines[$obj->bid][$i]["emetteur"] = $obj->emetteur;
 			$lines[$obj->bid][$i]["numero"] = $obj->num_chq;
@@ -398,6 +398,7 @@ if ($action == 'new') {
 			$lines[$obj->bid][$i]["label"] = $obj->transactionlabel;
 			$lines[$obj->bid][$i]["paymentid"] = $obj->paymentid;
 			$lines[$obj->bid][$i]["paymentref"] = $obj->paymentref;
+			$lines[$obj->bid][$i]["paymentdate"] = $db->jdate($obj->date);
 			$i++;
 		}
 
@@ -408,7 +409,7 @@ if ($action == 'new') {
 
 	foreach ($accounts as $bid => $account_label) {
 		print '
-        <script language="javascript" type="text/javascript">
+        <script type="text/javascript">
         jQuery(document).ready(function()
         {
             jQuery("#checkall_'.$bid.'").click(function()
@@ -468,6 +469,7 @@ if ($action == 'new') {
 				print '<td class="center">';
 				$paymentstatic->id = $value["paymentid"];
 				$paymentstatic->ref = $value["paymentref"];
+				$paymentstatic->date = $value["paymentdate"];
 				if ($paymentstatic->id) {
 					print $paymentstatic->getNomUrl(1);
 				} else {
@@ -529,7 +531,7 @@ if ($action == 'new') {
 	print $langs->trans('Date');
 	print '</td>';
 	if ($action != 'editdate') {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td colspan="2">';
@@ -538,7 +540,7 @@ if ($action == 'new') {
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setdate">';
 		print $form->selectDate($object->date_bordereau, 'datecreate_', '', '', '', "setdate");
-		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
 		print $object->date_bordereau ? dol_print_date($object->date_bordereau, 'day') : '&nbsp;';
@@ -554,7 +556,7 @@ if ($action == 'new') {
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('RefExt');
 	print '</td>';
-	if ($action != 'editrefext') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrefext&amp;id='.$object->id.'">'.img_edit($langs->trans('SetRefExt'),1).'</a></td>';
+	if ($action != 'editrefext') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrefext&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetRefExt'),1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="2">';
 	if ($action == 'editrefext')
@@ -563,7 +565,7 @@ if ($action == 'new') {
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setrefext">';
 		print '<input type="text" name="ref_ext" value="'.$object->ref_ext.'">';
-		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	}
 	else
@@ -710,11 +712,11 @@ if ($action == 'new') {
 print '<div class="tabsAction">';
 
 if ($user->socid == 0 && !empty($object->id) && $object->statut == 0 && $user->rights->banque->cheque) {
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valide&amp;token='.newToken().'&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$langs->trans('Validate').'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valide&token='.newToken().'&sortfield='.$sortfield.'&sortorder='.$sortorder.'">'.$langs->trans('Validate').'</a>';
 }
 
 if ($user->socid == 0 && !empty($object->id) && $user->rights->banque->cheque) {
-	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$langs->trans('Delete').'</a>';
+	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'&sortfield='.$sortfield.'&sortorder='.$sortorder.'">'.$langs->trans('Delete').'</a>';
 }
 print '</div>';
 
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 683b2fd0423..c66edfc8fe1 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -170,12 +170,12 @@ class RemiseCheque extends CommonObject
 		$sql .= ") VALUES (";
 		$sql .= "'".$this->db->idate($now)."'";
 		$sql .= ", '".$this->db->idate($now)."'";
-		$sql .= ", ".$user->id;
+		$sql .= ", ".((int) $user->id);
 		$sql .= ", ".((int) $account_id);
 		$sql .= ", 0";
 		$sql .= ", 0";
 		$sql .= ", 0";
-		$sql .= ", ".$conf->entity;
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ", 0";
 		$sql .= ", ''";
 		$sql .= ")";
@@ -305,7 +305,7 @@ class RemiseCheque extends CommonObject
 			if ($this->errno === 0) {
 				$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
 				$sql .= " SET fk_bordereau = 0";
-				$sql .= " WHERE fk_bordereau = ".$this->id;
+				$sql .= " WHERE fk_bordereau = ".((int) $this->id);
 
 				$resql = $this->db->query($sql);
 				if (!$resql) {
@@ -647,7 +647,7 @@ class RemiseCheque extends CommonObject
 		$nb = 0;
 		$sql = "SELECT amount ";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank";
-		$sql .= " WHERE fk_bordereau = ".$this->id;
+		$sql .= " WHERE fk_bordereau = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -1005,10 +1005,10 @@ class RemiseCheque extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			$langs->load('compta');
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('ToValidate');
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated');
-			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('ToValidate');
-			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('ToValidate');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('ToValidate');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
 		}
 
 		$statusType = 'status'.$status;
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 8bde7fac19e..e4aad2c5bf4 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -83,7 +83,7 @@ if ($resql) {
 }
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 $max = 10;
 
@@ -145,7 +145,7 @@ if ($resql) {
 }
 
 
-print '</div></div></div>';
+print '</div></div>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index f4d6c9e2686..d12caf36bbe 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -45,8 +45,8 @@ $search_account = GETPOST('search_account', 'int');
 $search_amount = GETPOST('search_amount', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/compta/paiement/class/cpaiement.class.php b/htdocs/compta/paiement/class/cpaiement.class.php
index e9623f55c11..1c7abf71c3b 100644
--- a/htdocs/compta/paiement/class/cpaiement.class.php
+++ b/htdocs/compta/paiement/class/cpaiement.class.php
@@ -273,7 +273,7 @@ class Cpaiement
 		$sql .= ' active = '.(isset($this->active) ? $this->active : "null").',';
 		$sql .= ' accountancy_code = '.(isset($this->accountancy_code) ? "'".$this->db->escape($this->accountancy_code)."'" : "null").',';
 		$sql .= ' module = '.(isset($this->module) ? "'".$this->db->escape($this->module)."'" : "null");
-		$sql .= ' WHERE id='.$this->id;
+		$sql .= ' WHERE id = '.((int) $this->id);
 
 		$this->db->begin();
 
@@ -334,7 +334,7 @@ class Cpaiement
 
 		if (!$error) {
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' WHERE id='.$this->id;
+			$sql .= ' WHERE id = '.((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 6b5ab4ef333..2a8522ab05b 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -292,8 +292,8 @@ class Paiement extends CommonObject
 		$note = ($this->note_private ? $this->note_private : $this->note);
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, ref, ref_ext, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, ext_payment_id, ext_payment_site, fk_user_creat, pos_change)";
-		$sql .= " VALUES (".$conf->entity.", '".$this->db->escape($this->ref)."', '".$this->db->escape($this->ref_ext)."', '".$this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', ".$total.", ".$mtotal.", ".$this->paiementid.", ";
-		$sql .= "'".$this->db->escape($num_payment)."', '".$this->db->escape($note)."', ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").", ".$user->id.", ".((float) $this->pos_change).")";
+		$sql .= " VALUES (".((int) $conf->entity).", '".$this->db->escape($this->ref)."', '".$this->db->escape($this->ref_ext)."', '".$this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', ".((float) $total).", ".((float) $mtotal).", ".((int) $this->paiementid).", ";
+		$sql .= "'".$this->db->escape($num_payment)."', '".$this->db->escape($note)."', ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").", ".((int) $user->id).", ".((float) $this->pos_change).")";
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -304,8 +304,8 @@ class Paiement extends CommonObject
 				$facid = $key;
 				if (is_numeric($amount) && $amount <> 0) {
 					$amount = price2num($amount);
-					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiement_facture (fk_facture, fk_paiement, amount, multicurrency_amount)';
-					$sql .= ' VALUES ('.$facid.', '.$this->id.', \''.$amount.'\', \''.$this->multicurrency_amounts[$key].'\')';
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount, multicurrency_amount)";
+					$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);
 					$resql = $this->db->query($sql);
@@ -533,12 +533,12 @@ class Paiement extends CommonObject
 
 		// Delete payment (into paiement_facture and paiement)
 		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'paiement_facture';
-		$sql .= ' WHERE fk_paiement = '.$this->id;
+		$sql .= ' WHERE fk_paiement = '.((int) $this->id);
 		dol_syslog($sql);
 		$result = $this->db->query($sql);
 		if ($result) {
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'paiement';
-			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			dol_syslog($sql);
 			$result = $this->db->query($sql);
 			if (!$result) {
@@ -756,7 +756,7 @@ class Paiement extends CommonObject
 	{
 		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' set fk_bank = '.((int) $id_bank);
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this).'::update_fk_bank', LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -788,7 +788,7 @@ class Paiement extends CommonObject
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET datep = '".$this->db->idate($date)."'";
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			$result = $this->db->query($sql);
 			if (!$result) {
@@ -839,7 +839,7 @@ class Paiement extends CommonObject
 		if (!empty($num) && $this->statut != 1) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET num_paiement = '".$this->db->escape($num)."'";
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::update_num", LOG_DEBUG);
 			$result = $this->db->query($sql);
@@ -956,7 +956,7 @@ class Paiement extends CommonObject
 	{
 		$sql = 'SELECT pf.fk_facture';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'facture as f'; // We keep link on invoice to allow use of some filters on invoice
-		$sql .= ' WHERE pf.fk_facture = f.rowid AND pf.fk_paiement = '.$this->id;
+		$sql .= ' WHERE pf.fk_facture = f.rowid AND pf.fk_paiement = '.((int) $this->id);
 		if ($filter) {
 			$sql .= ' AND '.$filter;
 		}
@@ -989,7 +989,7 @@ class Paiement extends CommonObject
 	{
 		$sql = 'SELECT pf.fk_facture, pf.amount';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
-		$sql .= ' WHERE pf.fk_paiement = '.$this->id;
+		$sql .= ' WHERE pf.fk_paiement = '.((int) $this->id);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$i = 0;
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 3d38f97b687..3732e76b880 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
  * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
  * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2017		Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2017-2021	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2021	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018		Charlene Benke			<charlie@patas-monkey.com>
  * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
@@ -49,24 +49,30 @@ $contextpage		= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'p
 $facid				= GETPOST('facid', 'int');
 $socid				= GETPOST('socid', 'int');
 $userid = GETPOST('userid', 'int');
-$day = GETPOST('day', 'int');
-$month				= GETPOST('month', 'int');
-$year = GETPOST('year', 'int');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'facture', $facid, '');
 
 $search_ref = GETPOST("search_ref", "alpha");
-$search_company		= GETPOST("search_company", 'alpha');
-$search_paymenttype	= GETPOST("search_paymenttype");
-$search_account		= GETPOST("search_account", "int");
-$search_payment_num	= GETPOST('search_payment_num', 'alpha');
+$search_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_company = GETPOST("search_company", 'alpha');
+$search_paymenttype = GETPOST("search_paymenttype");
+$search_account = GETPOST("search_account", "int");
+$search_payment_num = GETPOST('search_payment_num', 'alpha');
 $search_amount = GETPOST("search_amount", 'alpha'); // alpha because we must be able to search on "< x"
+$search_status = GETPOST('search_status', 'intcomma');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield			= GETPOST("sortfield", 'alpha');
-$sortorder			= GETPOST("sortorder", 'alpha');
+$sortfield			= GETPOST('sortfield', 'aZ09comma');
+$sortorder			= GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
 if (empty($page) || $page == -1) {
@@ -127,14 +133,20 @@ if (empty($reshook)) {
 	// All tests are required to be compatible with all browsers
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 		$search_ref = '';
+		$search_date_startday = '';
+		$search_date_startmonth = '';
+		$search_date_startyear = '';
+		$search_date_endday = '';
+		$search_date_endmonth = '';
+		$search_date_endyear = '';
+		$search_date_start = '';
+		$search_date_end = '';
 		$search_account = '';
 		$search_amount = '';
 		$search_paymenttype = '';
 		$search_payment_num = '';
 		$search_company = '';
-		$day = '';
-		$year = '';
-		$month = '';
+		$search_status = '';
 		$option = '';
 		$toselect = '';
 		$search_array_options = array();
@@ -189,11 +201,11 @@ if (GETPOST("orphelins", "alpha")) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	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('invoice').")";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid > 0) {
@@ -208,10 +220,15 @@ if (GETPOST("orphelins", "alpha")) {
 	}
 
 	// Search criteria
-	$sql .= dolSqlDateFilter("p.datep", $day, $month, $year);
 	if ($search_ref) {
 		$sql .= natural_search('p.ref', $search_ref);
 	}
+	if ($search_date_start) {
+		$sql .= " AND p.datep >= '" . $db->idate($search_date_start) . "'";
+	}
+	if ($search_date_end) {
+		$sql .= " AND p.datep <= '" . $db->idate($search_date_end) . "'";
+	}
 	if ($search_account > 0) {
 		$sql .= " AND b.fk_account=".((int) $search_account);
 	}
@@ -270,16 +287,46 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
-$param .= (GETPOST("orphelins") ? "&orphelins=1" : '');
-$param .= ($search_ref ? "&search_ref=".urlencode($search_ref) : '');
-$param .= ($search_company ? "&search_company=".urlencode($search_company) : '');
-$param .= ($search_amount ? "&search_amount=".urlencode($search_amount) : '');
-$param .= ($search_paymenttype ? "&search_paymenttype=".urlencode($search_paymenttype) : '');
-$param .= ($search_account ? "&search_account=".urlencode($search_account) : '');
-$param .= ($day ? "&day=".urlencode($day) : '');
-$param .= ($month ? "&month=".urlencode($month) : '');
-$param .= ($year ? "&year=".urlencode($year) : '');
-$param .= ($search_payment_num ? "&search_payment_num=".urlencode($search_payment_num) : '');
+
+if (GETPOST("orphelins")) {
+	$param .= '&orphelins=1';
+}
+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_company) {
+	$param .= '&search_company='.urlencode($search_company);
+}
+if ($search_amount != '') {
+	$param .= '&search_amount='.urlencode($search_amount);
+}
+if ($search_paymenttype) {
+	$param .= '&search_paymenttype='.urlencode($search_paymenttype);
+}
+if ($search_account) {
+	$param .= '&search_account='.urlencode($search_account);
+}
+if ($search_payment_num) {
+	$param .= '&search_payment_num='.urlencode($search_payment_num);
+}
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
 }
@@ -306,10 +353,12 @@ if ($search_all) {
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$massactionbutton = '';
 if ($massactionbutton) {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
 
+$moreforfilter = '';
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';
 
@@ -332,11 +381,12 @@ if (!empty($arrayfields['p.ref']['checked'])) {
 // Filter: Date
 if (!empty($arrayfields['p.datep']['checked'])) {
 	print '<td class="liste_titre center">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
-	}
-	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
-	$formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
+	print '<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>';
 }
 
@@ -477,10 +527,7 @@ while ($i < min($num, $limit)) {
 
 	// Date
 	if (!empty($arrayfields['p.datep']['checked'])) {
-		$dateformatforpayment = 'day';
-		if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) {
-			$dateformatforpayment = 'dayhour';
-		}
+		$dateformatforpayment = 'dayhour';
 		print '<td class="center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 492404a9380..cf02c2aeb74 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -39,7 +39,7 @@ if ($user->socid > 0) {
 }
 
 $dir = $conf->facture->dir_output.'/payments';
-if (!$user->rights->societe->client->voir || $socid) {
+if (empty($user->rights->societe->client->voir) || $socid) {
 	$dir .= '/private/'.$user->id; // If user has no permission to see all, output dir is specific to user
 }
 
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index c161551d3e3..6ed84de293c 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -154,7 +154,7 @@ if ($action == 'create') {
 
 	$total = $charge->amount;
 	if (!empty($conf->use_javascript_ajax)) {
-		print "\n".'<script type="text/javascript" language="javascript">';
+		print "\n".'<script type="text/javascript">';
 
 		//Add js for AutoFill
 		print ' $(document).ready(function () {';
diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php
index 323221f6f2b..916a0bf5498 100644
--- a/htdocs/compta/paiement_vat.php
+++ b/htdocs/compta/paiement_vat.php
@@ -154,7 +154,7 @@ if ($action == 'create') {
 
 	$total = $tva->amount;
 	if (!empty($conf->use_javascript_ajax)) {
-		print "\n".'<script type="text/javascript" language="javascript">';
+		print "\n".'<script type="text/javascript">';
 
 		//Add js for AutoFill
 		print ' $(document).ready(function () {';
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index c75974077c3..b1ec9800aa5 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -170,7 +170,7 @@ $sql = 'SELECT f.rowid as scid, f.libelle as label, f.paye, f.amount as sc_amoun
 $sql .= ' FROM '.MAIN_DB_PREFIX.'paiementcharge as pf,'.MAIN_DB_PREFIX.'chargesociales as f, '.MAIN_DB_PREFIX.'c_chargesociales as pc';
 $sql .= ' WHERE pf.fk_charge = f.rowid AND f.fk_type = pc.id';
 $sql .= ' AND f.entity = '.$conf->entity;
-$sql .= ' AND pf.rowid = '.$object->id;
+$sql .= ' AND pf.rowid = '.((int) $object->id);
 
 dol_syslog("compta/payment_sc/card.php", LOG_DEBUG);
 $resql = $db->query($sql);
@@ -251,7 +251,7 @@ if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
 if ($action == '') {
 	if ($user->rights->tax->charges->supprimer) {
 		if (!$disable_delete) {
-			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.GETPOST('id', 'int').'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
+			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.GETPOST('id', 'int').'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
 		}
diff --git a/htdocs/compta/payment_vat/card.php b/htdocs/compta/payment_vat/card.php
index 1b615bcbb8d..94dd817900e 100644
--- a/htdocs/compta/payment_vat/card.php
+++ b/htdocs/compta/payment_vat/card.php
@@ -227,7 +227,7 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'payment_vat as pf,'.MAIN_DB_PREFIX.'tva as f';
 $sql .= ' WHERE pf.fk_tva = f.rowid';
 //$sql .= ' AND f.fk_type = pc.id';
 $sql .= ' AND f.entity = '.$conf->entity;
-$sql .= ' AND pf.rowid = '.$object->id;
+$sql .= ' AND pf.rowid = '.((int) $object->id);
 
 dol_syslog("compta/payment_vat/card.php", LOG_DEBUG);
 $resql = $db->query($sql);
@@ -307,7 +307,7 @@ if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
 if ($action == '') {
 	if ($user->rights->tax->charges->supprimer) {
 		if (!$disable_delete) {
-			print '<a class="butActionDelete" href="card.php?id='.GETPOST('id', 'int').'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
+			print '<a class="butActionDelete" href="card.php?id='.GETPOST('id', 'int').'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentVATPaid")).'">'.$langs->trans('Delete').'</a>';
 		}
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index 25763dd8339..63cd091652a 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -43,12 +43,14 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'paymentbybanktransfer', '', '');
 
+$usercancreate = $user->rights->paymentbybanktransfer->create;
+
 
 /*
  * Actions
  */
 
-
+// None
 
 
 /*
@@ -62,7 +64,12 @@ if (prelevement_check_config('bank-transfer') < 0) {
 	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("PaymentByBankTransfer")), null, 'errors');
 }
 
-print load_fiche_titre($langs->trans("SuppliersStandingOrdersArea"));
+$newcardbutton = '';
+if ($usercancreate) {
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewStandingOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/prelevement/create.php?type=bank-transfer');
+}
+
+print load_fiche_titre($langs->trans("SuppliersStandingOrdersArea"), $newcardbutton);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -98,7 +105,7 @@ $sql .= " pfd.date_demande, pfd.amount,";
 $sql .= " s.nom as name, s.email, s.rowid as socid, s.tva_intra";
 $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
@@ -111,7 +118,7 @@ if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
 $sql .= " AND pfd.traite = 0";
 $sql .= " AND pfd.ext_payment_id IS NULL";
 $sql .= " AND pfd.fk_facture_fourn = f.rowid";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if ($socid) {
@@ -166,7 +173,7 @@ if ($resql) {
 			$i++;
 		}
 	} else {
-		print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoSupplierInvoiceToWithdraw", $langs->transnoentitiesnoconv("BankTransfer")).'</td></tr>';
+		print '<tr class="oddeven"><td colspan="5"><span class="opacitymedium">'.$langs->trans("NoSupplierInvoiceToWithdraw", $langs->transnoentitiesnoconv("BankTransfer")).'</span></td></tr>';
 	}
 	print "</table></div><br>";
 } else {
@@ -174,7 +181,7 @@ if ($resql) {
 }
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 /*
@@ -223,7 +230,7 @@ if ($result) {
 			$i++;
 		}
 	} else {
-		print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
+		print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 
 	print "</table></div><br>";
@@ -233,7 +240,7 @@ if ($result) {
 }
 
 
-print '</div></div></div>';
+print '</div></div>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index fb63fa45b38..3812d72f405 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -33,11 +33,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories', 'bills', 'companies', 'withdrawals'));
 
-// Security check
-if ($user->socid > 0) {
-	accessforbidden();
-}
-
 // Get supervariables
 $action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
@@ -71,11 +66,12 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 
 $hookmanager->initHooks(array('directdebitprevcard', 'globalcard', 'directdebitprevlist'));
 
-if (!$user->rights->prelevement->bons->lire && $object->type != 'bank-transfer') {
-	accessforbidden();
-}
-if (!$user->rights->paymentbybanktransfer->read && $object->type == 'bank-transfer') {
-	accessforbidden();
+$type = $object->type;
+
+if ($type == 'bank-transfer') {
+	$result = restrictedArea($user, 'paymentbybanktransfer', '', '', '');
+} else {
+	$result = restrictedArea($user, 'prelevement', '', '', 'bons');
 }
 
 
@@ -91,9 +87,10 @@ if ($reshook < 0) {
 
 if (empty($reshook)) {
 	if ($action == 'confirm_delete') {
+		$savtype = $object->type;
 		$res = $object->delete($user);
 		if ($res > 0) {
-			if ($object->type == 'bank-transfer') {
+			if ($savtype == 'bank-transfer') {
 				header("Location: ".DOL_URL_ROOT.'/compta/paymentbybanktransfer/index.php');
 			} else {
 				header("Location: ".DOL_URL_ROOT.'/compta/prelevement/index.php');
@@ -177,8 +174,7 @@ if ($id > 0 || $ref) {
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
-	//print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$object->getNomUrl(1).'</td></tr>';
-	print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</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><span class="amount">'.price($object->amount).'</span></td></tr>';
 
@@ -216,7 +212,7 @@ if ($id > 0 || $ref) {
 	$acc = new Account($db);
 	$result = $acc->fetch(($object->type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT));
 
-	print '<tr><td class="titlefield">';
+	print '<tr><td class="titlefieldcreate">';
 	$labelofbankfield = "BankToReceiveWithdraw";
 	if ($object->type == 'bank-transfer') {
 		$labelofbankfield = 'BankToPayCreditTransfer';
@@ -230,7 +226,7 @@ if ($id > 0 || $ref) {
 	print '</td>';
 	print '</tr>';
 
-	print '<tr><td class="titlefield">';
+	print '<tr><td class="titlefieldcreate">';
 	$labelfororderfield = 'WithdrawalFile';
 	if ($object->type == 'bank-transfer') {
 		$labelfororderfield = 'CreditTransferFile';
@@ -364,6 +360,9 @@ if ($id > 0 || $ref) {
 		$i = 0;
 
 		$urladd = "&id=".urlencode($id);
+		if ($limit > 0 && $limit != $conf->liste_limit) {
+			$urladd .= '&limit='.urlencode($limit);
+		}
 
 		print '<form method="get" action="'.$_SERVER ['PHP_SELF'].'" name="search_form">'."\n";
 		print '<input type="hidden" name="id" value="'.$id.'"/>';
@@ -374,6 +373,12 @@ if ($id > 0 || $ref) {
 		if (!empty($limit)) {
 			print '<input type="hidden" name="limit" value="'.$limit.'"/>';
 		}
+		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("Lines"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
 		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
@@ -394,10 +399,9 @@ if ($id > 0 || $ref) {
 
 			// Status of line
 			print "<td>";
+			print '<a class="valignmiddle" href="'.DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$obj->rowid.'&type='.$object->type.'&token='.newToken().'">';
 			print $ligne->LibStatut($obj->statut, 2);
-			print "&nbsp;";
-			print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$obj->rowid.'&type='.$object->type.'&token='.newtoken().'">';
-			print sprintf("%06s", $obj->rowid);
+			print '<span class="paddingleft">'.$obj->rowid.'</span>';
 			print '</a></td>';
 
 			$thirdparty = new Societe($db);
@@ -417,7 +421,7 @@ if ($id > 0 || $ref) {
 					if ($obj->statut == 2) {
 						if ($user->rights->prelevement->bons->credit) {
 							//print '<a class="butActionDelete" href="line.php?action=rejet&id='.$obj->rowid.'">'.$langs->trans("StandingOrderReject").'</a>';
-							print '<a href="line.php?action=rejet&type='.$object->type.'&id='.$obj->rowid.'&token='.newtoken().'">'.$langs->trans("StandingOrderReject").'</a>';
+							print '<a href="line.php?action=rejet&type='.$object->type.'&id='.$obj->rowid.'&token='.newToken().'">'.$langs->trans("StandingOrderReject").'</a>';
 						} else {
 							//print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("StandingOrderReject").'</a>';
 						}
@@ -435,6 +439,8 @@ if ($id > 0 || $ref) {
 		}
 
 		if ($num > 0) {
+			$total = price2num($total, 'MT');
+
 			print '<tr class="liste_total">';
 			print '<td>'.$langs->trans("Total").'</td>';
 			print '<td>&nbsp;</td>';
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 18216c1cda6..e5697ab3cb3 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -155,8 +155,8 @@ class BonPrelevement extends CommonObject
 				}
 				$sql .= ",fk_prelevement_lignes";
 				$sql .= ") VALUES (";
-				$sql .= $invoice_id;
-				$sql .= ", ".$line_id;
+				$sql .= ((int) $invoice_id);
+				$sql .= ", ".((int) $line_id);
 				$sql .= ")";
 
 				if ($this->db->query($sql)) {
@@ -800,7 +800,7 @@ class BonPrelevement extends CommonObject
 			$sql .= " AND f.total_ttc > 0";
 			$sql .= " AND pfd.ext_payment_id IS NULL";
 
-			dol_syslog(__METHOD__."::Read invoices, sql=".$sql, LOG_DEBUG);
+			dol_syslog(__METHOD__."::Read invoices,", LOG_DEBUG);
 
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -924,7 +924,7 @@ class BonPrelevement extends CommonObject
 				$sql .= " AND entity = ".((int) $conf->entity);
 				$sql .= " ORDER BY ref DESC LIMIT 1";
 
-				dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+				dol_syslog(get_class($this)."::create", LOG_DEBUG);
 				$resql = $this->db->query($sql);
 
 				if ($resql) {
@@ -1272,18 +1272,14 @@ class BonPrelevement extends CommonObject
 	}
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Delete a notification def by id
 	 *
 	 *	@param	int		$rowid		id of notification
 	 *	@return	int					0 if OK, <0 if KO
 	 */
-	public function DeleteNotificationById($rowid)
+	public function deleteNotificationById($rowid)
 	{
-		// phpcs:enable
-		$result = 0;
-
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
 		$sql .= " WHERE rowid = ".((int) $rowid);
 
@@ -1294,21 +1290,23 @@ class BonPrelevement extends CommonObject
 		}
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Delete a notification
 	 *
-	 *	@param	int	$user		notification user
-	 *	@param	string	$action		notification action
-	 *	@return	int					>0 if OK, <0 if KO
+	 *	@param	int|User	$user		notification user
+	 *	@param	string		$action		notification action
+	 *	@return	int						>0 if OK, <0 if KO
 	 */
-	public function DeleteNotification($user, $action)
+	public function deleteNotification($user, $action)
 	{
-		// phpcs:enable
-		$result = 0;
+		if (is_object($user)) {
+			$userid = $user->id;
+		} else {	// If user is an id
+			$userid = $user;
+		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
-		$sql .= " WHERE fk_user=".$user." AND fk_action='".$this->db->escape($action)."'";
+		$sql .= " WHERE fk_user=".((int) $userid)." AND fk_action='".$this->db->escape($action)."'";
 
 		if ($this->db->query($sql)) {
 			return 0;
@@ -1321,28 +1319,34 @@ class BonPrelevement extends CommonObject
 	/**
 	 *	Add a notification
 	 *
-	 *	@param	DoliDB	$db			database handler
-	 *	@param	int	$user		notification user
-	 *	@param	string	$action		notification action
-	 *	@return	int					0 if OK, <0 if KO
+	 *	@param	DoliDB		$db			database handler
+	 *	@param	int|User	$user		notification user
+	 *	@param	string		$action		notification action
+	 *	@return	int						0 if OK, <0 if KO
 	 */
-	public function AddNotification($db, $user, $action)
+	public function addNotification($db, $user, $action)
 	{
 		// phpcs:enable
 		$result = 0;
 
-		if ($this->DeleteNotification($user, $action) == 0) {
+		if (is_object($user)) {
+			$userid = $user->id;
+		} else {	// If user is an id
+			$userid = $user;
+		}
+
+		if ($this->deleteNotification($user, $action) == 0) {
 			$now = dol_now();
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_soc, fk_contact, fk_action)";
-			$sql .= " VALUES ('".$this->db->idate($now)."', ".$user.", 'NULL', 'NULL', '".$this->db->escape($action)."')";
+			$sql .= " VALUES ('".$this->db->idate($now)."', ".((int) $userid).", 'NULL', 'NULL', '".$this->db->escape($action)."')";
 
 			dol_syslog("adnotiff: ".$sql);
 			if ($this->db->query($sql)) {
 				$result = 0;
 			} else {
 				$result = -1;
-				dol_syslog(get_class($this)."::AddNotification Error $result");
+				dol_syslog(get_class($this)."::addNotification Error $result");
 			}
 		}
 
@@ -1479,7 +1483,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>'.strtoupper(dol_string_unaccent($this->raison_sociale)).'</Nm>'.$CrLf);
+				fputs($this->file, '				<Nm>'.dolEscapeXML(strtoupper(dol_string_unaccent($this->raison_sociale))).'</Nm>'.$CrLf);
 				fputs($this->file, '				<Id>'.$CrLf);
 				fputs($this->file, '				    <PrvtId>'.$CrLf);
 				fputs($this->file, '					<Othr>'.$CrLf);
@@ -1595,7 +1599,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>'.strtoupper(dol_string_unaccent($this->raison_sociale)).'</Nm>'.$CrLf);
+				fputs($this->file, '				<Nm>'.dolEscapeXML(strtoupper(dol_string_unaccent($this->raison_sociale))).'</Nm>'.$CrLf);
 				fputs($this->file, '				<Id>'.$CrLf);
 				fputs($this->file, '				    <PrvtId>'.$CrLf);
 				fputs($this->file, '					<Othr>'.$CrLf);
@@ -1848,13 +1852,13 @@ class BonPrelevement extends CommonObject
 			$XML_DEBITOR .= '					<Nm>'.dolEscapeXML(strtoupper(dol_string_unaccent($row_nom))).'</Nm>'.$CrLf;
 			$XML_DEBITOR .= '					<PstlAdr>'.$CrLf;
 			$XML_DEBITOR .= '						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
-			$addressline1 = dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => "")));
-			$addressline2 = dol_string_unaccent(strtr($row_zip.(($row_zip && $row_town) ? ' ' : ''.$row_town), array(CHR(13) => ", ", CHR(10) => "")));
+			$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($addressline1, 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
+				$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent($addressline1), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 			}
 			if (trim($addressline2)) {
-				$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc($addressline2, 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
+				$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent($addressline2), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 			}
 			$XML_DEBITOR .= '					</PstlAdr>'.$CrLf;
 			$XML_DEBITOR .= '				</Dbtr>'.$CrLf;
@@ -1899,13 +1903,13 @@ class BonPrelevement extends CommonObject
 			$XML_CREDITOR .= '					<Nm>'.dolEscapeXML(strtoupper(dol_string_unaccent($row_nom))).'</Nm>'.$CrLf;
 			$XML_CREDITOR .= '					<PstlAdr>'.$CrLf;
 			$XML_CREDITOR .= '						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
-			$addressline1 = dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => "")));
-			$addressline2 = dol_string_unaccent(strtr($row_zip.(($row_zip && $row_town) ? ' ' : ''.$row_town), array(CHR(13) => ", ", CHR(10) => "")));
+			$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($addressline1, 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
+				$XML_CREDITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent($addressline1), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 			}
 			if (trim($addressline2)) {
-				$XML_CREDITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc($addressline2, 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
+				$XML_CREDITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent($addressline2), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 			}
 			$XML_CREDITOR .= '					</PstlAdr>'.$CrLf;
 			$XML_CREDITOR .= '				</Cdtr>'.$CrLf;
@@ -2068,16 +2072,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>'.strtoupper(dol_string_unaccent($this->raison_sociale)).'</Nm>'.$CrLf;
+				$XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(dol_string_unaccent($this->raison_sociale))).'</Nm>'.$CrLf;
 				$XML_SEPA_INFO .= '				<PstlAdr>'.$CrLf;
 				$XML_SEPA_INFO .= '					<Ctry>'.$country[1].'</Ctry>'.$CrLf;
-				$addressline1 = dol_string_unaccent(strtr($configuration->global->MAIN_INFO_SOCIETE_ADDRESS, array(CHR(13) => ", ", CHR(10) => "")));
-				$addressline2 = dol_string_unaccent(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) => "")));
+				$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>'.$addressline1.'</AdrLine>'.$CrLf;
+					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent($addressline1), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 				}
 				if ($addressline2) {
-					$XML_SEPA_INFO .= '					<AdrLine>'.$addressline2.'</AdrLine>'.$CrLf;
+					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent($addressline2), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 				}
 				$XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
 				$XML_SEPA_INFO .= '			</Cdtr>'.$CrLf;
@@ -2092,11 +2096,11 @@ class BonPrelevement extends CommonObject
 				$XML_SEPA_INFO .= '				</FinInstnId>'.$CrLf;
 				$XML_SEPA_INFO .= '			</CdtrAgt>'.$CrLf;
 				/* $XML_SEPA_INFO .= '			<UltmtCdtr>'.$CrLf;
-				 $XML_SEPA_INFO .= '				<Nm>'.$this->raison_sociale.'</Nm>'.$CrLf;
+				 $XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(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>'.$conf->global->MAIN_INFO_SOCIETE_ADDRESS.'</AdrLine>'.$CrLf;
-				 $XML_SEPA_INFO .= '					<AdrLine>'.$conf->global->MAIN_INFO_SOCIETE_ZIP.' '.$conf->global->MAIN_INFO_SOCIETE_TOWN.'</AdrLine>'.$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 .= '				</PstlAdr>'.$CrLf;
 				 $XML_SEPA_INFO .= '			</UltmtCdtr>'.$CrLf;*/
 				$XML_SEPA_INFO .= '			<ChrgBr>SLEV</ChrgBr>'.$CrLf; // Field "Responsible of fees". Must be SLEV
@@ -2134,16 +2138,16 @@ class BonPrelevement extends CommonObject
 				*/
 				$XML_SEPA_INFO .= '			<ReqdExctnDt>'.dol_print_date($dateTime_ETAD, 'dayrfc').'</ReqdExctnDt>'.$CrLf;
 				$XML_SEPA_INFO .= '			<Dbtr>'.$CrLf;
-				$XML_SEPA_INFO .= '				<Nm>'.strtoupper(dol_string_unaccent($this->raison_sociale)).'</Nm>'.$CrLf;
+				$XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(dol_string_unaccent($this->raison_sociale))).'</Nm>'.$CrLf;
 				$XML_SEPA_INFO .= '				<PstlAdr>'.$CrLf;
 				$XML_SEPA_INFO .= '					<Ctry>'.$country[1].'</Ctry>'.$CrLf;
-				$addressline1 = dol_string_unaccent(strtr($configuration->global->MAIN_INFO_SOCIETE_ADDRESS, array(CHR(13) => ", ", CHR(10) => "")));
-				$addressline2 = dol_string_unaccent(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) => "")));
+				$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>'.$addressline1.'</AdrLine>'.$CrLf;
+					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent($addressline1), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 				}
 				if ($addressline2) {
-					$XML_SEPA_INFO .= '					<AdrLine>'.$addressline2.'</AdrLine>'.$CrLf;
+					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent($addressline2), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 				}
 				$XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
 				$XML_SEPA_INFO .= '			</Dbtr>'.$CrLf;
@@ -2158,11 +2162,11 @@ class BonPrelevement extends CommonObject
 				$XML_SEPA_INFO .= '				</FinInstnId>'.$CrLf;
 				$XML_SEPA_INFO .= '			</DbtrAgt>'.$CrLf;
 				/* $XML_SEPA_INFO .= '			<UltmtCdtr>'.$CrLf;
-				 $XML_SEPA_INFO .= '				<Nm>'.$this->raison_sociale.'</Nm>'.$CrLf;
+				 $XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(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>'.$conf->global->MAIN_INFO_SOCIETE_ADDRESS.'</AdrLine>'.$CrLf;
-				 $XML_SEPA_INFO .= '					<AdrLine>'.$conf->global->MAIN_INFO_SOCIETE_ZIP.' '.$conf->global->MAIN_INFO_SOCIETE_TOWN.'</AdrLine>'.$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 .= '				</PstlAdr>'.$CrLf;
 				 $XML_SEPA_INFO .= '			</UltmtCdtr>'.$CrLf;*/
 				$XML_SEPA_INFO .= '			<ChrgBr>SLEV</ChrgBr>'.$CrLf; // Field "Responsible of fees". Must be SLEV
@@ -2273,16 +2277,16 @@ class BonPrelevement extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('StatusWaiting');
-			$this->labelStatus[self::STATUS_TRANSFERED] = $langs->trans('StatusTrans');
-			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('StatusWaiting');
-			$this->labelStatusShort[self::STATUS_TRANSFERED] = $langs->trans('StatusTrans');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('StatusWaiting');
+			$this->labelStatus[self::STATUS_TRANSFERED] = $langs->transnoentitiesnoconv('StatusTrans');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('StatusWaiting');
+			$this->labelStatusShort[self::STATUS_TRANSFERED] = $langs->transnoentitiesnoconv('StatusTrans');
 			if ($this->type == 'bank-transfer') {
-				$this->labelStatus[self::STATUS_DEBITED] = $langs->trans('StatusDebited');
-				$this->labelStatusShort[self::STATUS_DEBITED] = $langs->trans('StatusDebited');
+				$this->labelStatus[self::STATUS_DEBITED] = $langs->transnoentitiesnoconv('StatusDebited');
+				$this->labelStatusShort[self::STATUS_DEBITED] = $langs->transnoentitiesnoconv('StatusDebited');
 			} else {
-				$this->labelStatus[self::STATUS_CREDITED] = $langs->trans('StatusCredited');
-				$this->labelStatusShort[self::STATUS_CREDITED] = $langs->trans('StatusCredited');
+				$this->labelStatus[self::STATUS_CREDITED] = $langs->transnoentitiesnoconv('StatusCredited');
+				$this->labelStatusShort[self::STATUS_CREDITED] = $langs->transnoentitiesnoconv('StatusCredited');
 			}
 		}
 
@@ -2296,4 +2300,78 @@ class BonPrelevement extends CommonObject
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+	 *
+	 *      @param      User	$user       	Objet user
+	 *      @param		string	$mode			Mode 'direct_debit' or 'credit_transfer'
+	 *      @return 	WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
+	 */
+	public function load_board($user, $mode)
+	{
+		// phpcs:enable
+		global $conf, $langs;
+
+		if ($user->socid) {
+			return -1; // protection pour eviter appel par utilisateur externe
+		}
+
+		/*
+		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();
+
+			$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++;
+
+				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;
+		}
+		*/
+		return 0;
+	}
 }
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index 1c57feca37e..0093db77c32 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -137,29 +137,31 @@ class LignePrelevement
 			return $langs->trans($this->statuts[$status]);
 		} elseif ($mode == 1) {
 			if ($status == 0) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut1').' '.$langs->trans($this->statuts[$status]); // Waiting
+				return img_picto($langs->trans($this->statuts[$status]), 'statut1', 'class="valignmiddle"').' '.$langs->transnoentitiesnoconv($this->statuts[$status]); // Waiting
 			} elseif ($status == 2) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]); // Credited
+				return img_picto($langs->trans($this->statuts[$status]), 'statut6', 'class="valignmiddle"').' '.$langs->transnoentitiesnoconv($this->statuts[$status]); // Credited
 			} elseif ($status == 3) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]); // Refused
+				return img_picto($langs->trans($this->statuts[$status]), 'statut8', 'class="valignmiddle"').' '.$langs->transnoentitiesnoconv($this->statuts[$status]); // Refused
 			}
 		} elseif ($mode == 2) {
 			if ($status == 0) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut1');
+				return img_picto($langs->trans($this->statuts[$status]), 'statut1', 'class="valignmiddle"');
 			} elseif ($status == 2) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut6');
+				return img_picto($langs->trans($this->statuts[$status]), 'statut6', 'class="valignmiddle"');
 			} elseif ($status == 3) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut8');
+				return img_picto($langs->trans($this->statuts[$status]), 'statut8', 'class="valignmiddle"');
 			}
 		} elseif ($mode == 3) {
 			if ($status == 0) {
-				return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut1');
+				return $langs->trans($this->statuts[$status]).' '.img_picto($langs->transnoentitiesnoconv($this->statuts[$status]), 'statut1', 'class="valignmiddle"');
 			} elseif ($status == 2) {
-				return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut6');
+				return $langs->trans($this->statuts[$status]).' '.img_picto($langs->transnoentitiesnoconv($this->statuts[$status]), 'statut6', 'class="valignmiddle"');
 			} elseif ($status == 3) {
-				return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut8');
+				return $langs->trans($this->statuts[$status]).' '.img_picto($langs->transnoentitiesnoconv($this->statuts[$status]), 'statut8', 'class="valignmiddle"');
 			}
 		}
+
+		//return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
 
 	/**
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index db92da8ce90..f88ff5201f3 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -100,7 +100,7 @@ class RejetPrelevement
 		$facs = $this->getListInvoices(1);
 
 		require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
-		$lipre = new LignePrelevement($this->db, $user);
+		$lipre = new LignePrelevement($this->db);
 		$lipre->fetch($id);
 
 		$this->db->begin();
@@ -114,12 +114,12 @@ class RejetPrelevement
 		$sql .= ", date_creation";
 		$sql .= ", afacturer";
 		$sql .= ") VALUES (";
-		$sql .= $id;
+		$sql .= ((int) $id);
 		$sql .= ", '".$this->db->idate($date_rejet)."'";
-		$sql .= ", ".$motif;
-		$sql .= ", ".$user->id;
+		$sql .= ", ".((int) $motif);
+		$sql .= ", ".((int) $user->id);
 		$sql .= ", '".$this->db->idate($now)."'";
-		$sql .= ", ".$facturation;
+		$sql .= ", ".((int) $facturation);
 		$sql .= ")";
 
 		$result = $this->db->query($sql);
@@ -222,8 +222,8 @@ class RejetPrelevement
 
 		$sql = "SELECT fk_user_demande";
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-		$sql .= " WHERE pfd.fk_prelevement_bons = ".$this->bon_id;
-		$sql .= " AND pfd.fk_facture".($this->type == 'bank-transfer' ? '_fourn=' : '=').$fac->id;
+		$sql .= " WHERE pfd.fk_prelevement_bons = ".((int) $this->bon_id);
+		$sql .= " AND pfd.fk_facture".($this->type == 'bank-transfer' ? '_fourn' : '').' = '.((int) $fac->id);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -296,7 +296,7 @@ class RejetPrelevement
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON (pf.fk_facture = f.rowid)";
 		}
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."prelevement_lignes as pl ON (pf.fk_prelevement_lignes = pl.rowid)";
-		$sql .= " WHERE pf.fk_prelevement_lignes = ".$this->id;
+		$sql .= " WHERE pf.fk_prelevement_lignes = ".((int) $this->id);
 		$sql .= " AND f.entity IN  (".getEntity('invoice').")";
 
 		$resql = $this->db->query($sql);
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 172cf020e34..3f00a4f0660 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -39,21 +39,18 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies', 'bills'));
 
-// Security check
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'prelevement', '', '', 'bons');
-
 $type = GETPOST('type', 'aZ09');
 
 // Get supervariables
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+
 $mode = GETPOST('mode', 'alpha') ?GETPOST('mode', 'alpha') : 'real';
 $format = GETPOST('format', 'aZ09');
 $id_bankaccount = GETPOST('id_bankaccount', 'int');
+$executiondate = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
@@ -63,6 +60,18 @@ $offset = $limit * $page;
 
 $hookmanager->initHooks(array('directdebitcreatecard', 'globalcard'));
 
+// Security check
+if ($user->socid) {
+	$socid = $user->socid;
+}
+if ($type == 'bank-transfer') {
+	$result = restrictedArea($user, 'paymentbybanktransfer', '', '', '');
+} else {
+	$result = restrictedArea($user, 'prelevement', '', '', 'bons');
+}
+
+$error = 0;
+
 
 /*
  * Actions
@@ -86,10 +95,12 @@ if (empty($reshook)) {
 		}
 	}
 	if ($action == 'create') {
-		$default_account=($type == 'bank-transfer' ? 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT' : 'PRELEVEMENT_ID_BANKACCOUNT');
+		$default_account = ($type == 'bank-transfer' ? 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT' : 'PRELEVEMENT_ID_BANKACCOUNT');
 
-		if ($id_bankaccount != $conf->global->{$default_account}) {
-			$res = dolibarr_set_const($db, $default_account, $id_bankaccount, 'chaine', 0, '', $conf->entity);	//Set as default
+		//var_dump($default_account);var_dump($conf->global->$default_account);var_dump($id_bankaccount);exit;
+
+		if ($id_bankaccount != $conf->global->$default_account) {
+			$res = dolibarr_set_const($db, $default_account, $id_bankaccount, 'chaine', 0, '', $conf->entity); // Set as default
 		}
 
 		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
@@ -100,48 +111,47 @@ if (empty($reshook)) {
 		) {
 			$errormessage = str_replace('{url}', $bank->getNomUrl(1, '', '', -1, 1), $langs->trans("ErrorICSmissing", '{url}'));
 			setEventMessages($errormessage, null, 'errors');
-			header("Location: ".DOL_URL_ROOT.'/compta/prelevement/create.php');
-			exit;
+			$action = '';
+			$error++;
 		}
 
 
-		$delayindays = 0;
-		if ($type != 'bank-transfer') {
-			$delayindays = $conf->global->PRELEVEMENT_ADDDAYS;
-		} else {
-			$delayindays = $conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS;
-		}
 		$bprev = new BonPrelevement($db);
-		$executiondate = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), (GETPOST('reday', 'int') + $delayindays), GETPOST('reyear', 'int'));
 
-		// $conf->global->PRELEVEMENT_CODE_BANQUE and $conf->global->PRELEVEMENT_CODE_GUICHET should be empty (we don't use them anymore)
-		$result = $bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET, $mode, $format, $executiondate, 0, $type);
-		if ($result < 0) {
-			setEventMessages($bprev->error, $bprev->errors, 'errors');
-		} elseif ($result == 0) {
-			$mesg = $langs->trans("NoInvoiceCouldBeWithdrawed", $format);
-			setEventMessages($mesg, null, 'errors');
-			$mesg .= '<br>'."\n";
-			foreach ($bprev->invoice_in_error as $key => $val) {
-				$mesg .= '<span class="warning">'.$val."</span><br>\n";
-			}
-		} else {
-			if ($type != 'bank-transfer') {
-				$texttoshow = $langs->trans("DirectDebitOrderCreated", '{s}');
-				$texttoshow = str_replace('{s}', $bprev->getNomUrl(1), $texttoshow);
-				setEventMessages($texttoshow, null);
+		if (!$error) {
+			// $conf->global->PRELEVEMENT_CODE_BANQUE and $conf->global->PRELEVEMENT_CODE_GUICHET should be empty (we don't use them anymore)
+			$result = $bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET, $mode, $format, $executiondate, 0, $type);
+			if ($result < 0) {
+				setEventMessages($bprev->error, $bprev->errors, 'errors');
+			} elseif ($result == 0) {
+				$mesg = $langs->trans("NoInvoiceCouldBeWithdrawed", $format);
+				setEventMessages($mesg, null, 'errors');
+				$mesg .= '<br>'."\n";
+				foreach ($bprev->invoice_in_error as $key => $val) {
+					$mesg .= '<span class="warning">'.$val."</span><br>\n";
+				}
 			} else {
-				$texttoshow = $langs->trans("CreditTransferOrderCreated", '{s}');
-				$texttoshow = str_replace('{s}', $bprev->getNomUrl(1), $texttoshow);
-				setEventMessages($texttoshow, null);
-			}
+				if ($type != 'bank-transfer') {
+					$texttoshow = $langs->trans("DirectDebitOrderCreated", '{s}');
+					$texttoshow = str_replace('{s}', $bprev->getNomUrl(1), $texttoshow);
+					setEventMessages($texttoshow, null);
+				} else {
+					$texttoshow = $langs->trans("CreditTransferOrderCreated", '{s}');
+					$texttoshow = str_replace('{s}', $bprev->getNomUrl(1), $texttoshow);
+					setEventMessages($texttoshow, null);
+				}
 
-			header("Location: ".DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$bprev->id);
-			exit;
+				header("Location: ".DOL_URL_ROOT.'/compta/prelevement/card.php?id='.urlencode($bprev->id).'&type='.urlencode($type));
+				exit;
+			}
 		}
 	}
 	$objectclass = "BonPrelevement";
-	$uploaddir = $conf->prelevement->dir_output;
+	if ($type == 'bank-transfer') {
+		$uploaddir = $conf->paymentbybanktransfer->dir_output;
+	} else {
+		$uploaddir = $conf->prelevement->dir_output;
+	}
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
@@ -242,11 +252,25 @@ if ($nb) {
 		}
 		print $title;
 		print img_picto('', 'bank_account');
-		print $form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'id_bankaccount', 0, "courant=1", 0, '', 0, '', 1);
+
+		$default_account = ($type == 'bank-transfer' ? 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT' : 'PRELEVEMENT_ID_BANKACCOUNT');
+
+		print $form->select_comptes($conf->global->$default_account, 'id_bankaccount', 0, "courant=1", 0, '', 0, '', 1);
 		print ' - ';
 
+		if (empty($executiondate)) {
+			$delayindays = 0;
+			if ($type != 'bank-transfer') {
+				$delayindays = $conf->global->PRELEVEMENT_ADDDAYS;
+			} else {
+				$delayindays = $conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS;
+			}
+
+			$executiondate = dol_time_plus_duree(dol_now(), $delayindays, 'd');
+		}
+
 		print $langs->trans('ExecutionDate').' ';
-		$datere = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$datere = $executiondate;
 		print $form->selectDate($datere, 're');
 
 
@@ -262,13 +286,14 @@ if ($nb) {
 				print '<option value="RCUR"'.(GETPOST('format', 'aZ09') == 'RCUR' ? ' selected="selected"' : '').'>'.$langs->trans('SEPARCUR').'</option>';
 				print '</select>';
 			}
-			print '<input class="butAction" type="submit" value="'.$title.'"/>';
+			print '<input type="submit" class="butAction" value="'.$title.'"/>';
 		} else {
 			$title = $langs->trans("CreateAll");
 			if ($type == 'bank-transfer') {
 				$title = $langs->trans("CreateFileForPaymentByBankTransfer");
 			}
-			print '<a class="butAction" type="submit" href="create.php?action=create&format=ALL&type='.$type.'">'.$title."</a>\n";
+			print '<input type="hidden" name="format" value="ALL">'."\n";
+			print '<input type="submit" class="butAction" value="'.$title.'">'."\n";
 		}
 	} else {
 		if ($mysoc->isInEEC()) {
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 0230e4cb726..86f1bcf583c 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -37,10 +37,6 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
 // Security check
 $socid = GETPOST('socid', 'int');
 $status = GETPOST('status', 'int');
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
@@ -53,8 +49,8 @@ $search_societe = GETPOST('search_societe', 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
@@ -73,6 +69,15 @@ $massactionbutton = '';
 
 $hookmanager->initHooks(array('withdrawalstodolist'));
 
+if ($user->socid) {
+	$socid = $user->socid;
+}
+if ($type == 'bank-transfer') {
+	$result = restrictedArea($user, 'paymentbybanktransfer', '', '', '');
+} else {
+	$result = restrictedArea($user, 'prelevement', '', '', 'bons');
+}
+
 
 /*
  * Actions
@@ -132,12 +137,12 @@ if ($type != 'bank-transfer') {
 }
 $sql .= " ".MAIN_DB_PREFIX."societe as s,";
 $sql .= " ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE s.rowid = f.fk_soc";
 $sql .= " AND f.entity IN (".getEntity('invoice').")";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if ($socid) {
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index c00c29e1c39..35c49df8d1e 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -34,11 +34,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories', 'bills', 'companies', 'withdrawals'));
 
-// Securite acces client
-if ($user->socid > 0) {
-	accessforbidden();
-}
-
 // Get supervariables
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -70,11 +65,16 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 
 $hookmanager->initHooks(array('directdebitprevcard', 'globalcard', 'directdebitprevlist'));
 
-if (!$user->rights->prelevement->bons->lire && $object->type != 'bank-transfer') {
+// Security check
+if ($user->socid > 0) {
 	accessforbidden();
 }
-if (!$user->rights->paymentbybanktransfer->read && $object->type == 'bank-transfer') {
-	accessforbidden();
+
+$type = $object->type;
+if ($type == 'bank-transfer') {
+	$result = restrictedArea($user, 'paymentbybanktransfer', '', '', '');
+} else {
+	$result = restrictedArea($user, 'prelevement', '', '', 'bons');
 }
 
 
@@ -100,8 +100,8 @@ if ($id > 0 || $ref) {
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent tableforfield">'."\n";
 
-		//print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$object->getNomUrl(1).'</td></tr>';
-		print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
+		//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>';
 
 		if ($object->date_trans <> 0) {
@@ -131,7 +131,7 @@ if ($id > 0 || $ref) {
 		$acc = new Account($db);
 		$result = $acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT);
 
-		print '<tr><td class="titlefield">';
+		print '<tr><td class="titlefieldcreate">';
 		$labelofbankfield = "BankToReceiveWithdraw";
 		if ($object->type == 'bank-transfer') {
 			$labelofbankfield = 'BankToPayCreditTransfer';
@@ -145,7 +145,7 @@ if ($id > 0 || $ref) {
 		print '</td>';
 		print '</tr>';
 
-		print '<tr><td class="titlefield">';
+		print '<tr><td class="titlefieldcreate">';
 		$labelfororderfield = 'WithdrawalFile';
 		if ($object->type == 'bank-transfer') {
 			$labelfororderfield = 'CreditTransferFile';
@@ -220,6 +220,9 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param.='&limit='.urlencode($limit);
+	}
 	$param = "&id=".urlencode($id);
 
 	// Lines of title fields
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 8711f663d55..febc4827a94 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -62,11 +62,16 @@ $object = new BonPrelevement($db);
 // 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 (!$user->rights->prelevement->bons->lire && $object->type != 'bank-transfer') {
+// Security check
+if ($user->socid > 0) {
 	accessforbidden();
 }
-if (!$user->rights->paymentbybanktransfer->read && $object->type == 'bank-transfer') {
-	accessforbidden();
+
+$type = $object->type;
+if ($type == 'bank-transfer') {
+	$result = restrictedArea($user, 'paymentbybanktransfer', '', '', '');
+} else {
+	$result = restrictedArea($user, 'prelevement', '', '', 'bons');
 }
 
 
@@ -90,8 +95,8 @@ if ($prev_id > 0 || $ref) {
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent tableforfield">'."\n";
 
-		//print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$object->getNomUrl(1).'</td></tr>';
-		print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
+		//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>';
 
 		if ($object->date_trans <> 0) {
@@ -121,7 +126,7 @@ if ($prev_id > 0 || $ref) {
 		$acc = new Account($db);
 		$result = $acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT);
 
-		print '<tr><td class="titlefield">';
+		print '<tr><td class="titlefieldcreate">';
 		$labelofbankfield = "BankToReceiveWithdraw";
 		if ($object->type == 'bank-transfer') {
 			$labelofbankfield = 'BankToPayCreditTransfer';
@@ -135,7 +140,7 @@ if ($prev_id > 0 || $ref) {
 		print '</td>';
 		print '</tr>';
 
-		print '<tr><td class="titlefield">';
+		print '<tr><td class="titlefieldcreate">';
 		$labelfororderfield = 'WithdrawalFile';
 		if ($object->type == 'bank-transfer') {
 			$labelfororderfield = 'CreditTransferFile';
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 4a9bfbf6345..8255c537442 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -32,11 +32,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("banks", "categories", 'withdrawals', 'bills'));
 
-// Security check
-if ($user->socid > 0) {
-	accessforbidden();
-}
-
 // Get supervariables
 $prev_id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -61,11 +56,16 @@ $object = new BonPrelevement($db);
 // 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 (!$user->rights->prelevement->bons->lire && $object->type != 'bank-transfer') {
+// Security check
+if ($user->socid > 0) {
 	accessforbidden();
 }
-if (!$user->rights->paymentbybanktransfer->read && $object->type == 'bank-transfer') {
-	accessforbidden();
+
+$type = $object->type;
+if ($type == 'bank-transfer') {
+	$result = restrictedArea($user, 'paymentbybanktransfer', '', '', '');
+} else {
+	$result = restrictedArea($user, 'prelevement', '', '', 'bons');
 }
 
 
@@ -89,8 +89,8 @@ if ($prev_id > 0 || $ref) {
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent tableforfield">'."\n";
 
-		//print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$object->getNomUrl(1).'</td></tr>';
-		print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
+		//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>';
 
 		if ($object->date_trans <> 0) {
@@ -120,7 +120,7 @@ if ($prev_id > 0 || $ref) {
 		$acc = new Account($db);
 		$result = $acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT);
 
-		print '<tr><td class="titlefield">';
+		print '<tr><td class="titlefieldcreate">';
 		$labelofbankfield = "BankToReceiveWithdraw";
 		if ($object->type == 'bank-transfer') {
 			$labelofbankfield = 'BankToPayCreditTransfer';
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index c0f89a7e046..4aef7e8b9e4 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -41,14 +41,16 @@ $socid = GETPOST('socid', 'int');
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'prelevement', '', '');
+$result = restrictedArea($user, 'prelevement', '', 'bons');
+
+$usercancreate = $user->rights->prelevement->bons->creer;
 
 
 /*
  * Actions
  */
 
-
+// None
 
 
 /*
@@ -62,7 +64,12 @@ if (prelevement_check_config() < 0) {
 	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("PaymentByDirectDebit")), null, 'errors');
 }
 
-print load_fiche_titre($langs->trans("CustomersStandingOrdersArea"));
+$newcardbutton = '';
+if ($usercancreate) {
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewStandingOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/prelevement/create.php?type=');
+}
+
+print load_fiche_titre($langs->trans("CustomersStandingOrdersArea"), $newcardbutton);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -98,7 +105,7 @@ $sql .= " pfd.date_demande, pfd.amount,";
 $sql .= " s.nom as name, s.email, s.rowid as socid";
 $sql .= " FROM ".MAIN_DB_PREFIX."facture as f,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
@@ -111,7 +118,7 @@ if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
 $sql .= " AND pfd.traite = 0";
 $sql .= " AND pfd.ext_payment_id IS NULL";
 $sql .= " AND pfd.fk_facture = f.rowid";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if ($socid) {
@@ -174,7 +181,7 @@ if ($resql) {
 }
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 /*
@@ -225,7 +232,7 @@ if ($result) {
 			$i++;
 		}
 	} else {
-		print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
+		print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 
 	print "</table></div><br>";
@@ -235,7 +242,7 @@ if ($result) {
 }
 
 
-print '</div></div></div>';
+print '</div></div>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 05bbb547102..38ea2fb1d52 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -35,11 +35,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 // Load translation files required by the page
 $langs->loadlangs(array('banks', 'categories', 'bills', 'withdrawals'));
 
-// Security check
-if ($user->socid > 0) {
-	accessforbidden();
-}
-
 // Get supervariables
 $action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
@@ -66,6 +61,13 @@ if ($sortfield == "") {
 	$sortfield = "pl.fk_soc";
 }
 
+$type = $object->type;
+if ($type == 'bank-transfer') {
+	$result = restrictedArea($user, 'paymentbybanktransfer', '', '', '');
+} else {
+	$result = restrictedArea($user, 'prelevement', '', '', 'bons');
+}
+
 
 /*
  * Actions
@@ -226,7 +228,7 @@ if ($id) {
 		print '</table><br>';
 
 		//Confirm Button
-		print '<div class="center"><input type="submit" class="button" value='.$langs->trans("Confirm").'></div>';
+		print '<div class="center"><input type="submit" class="button button-save" value='.$langs->trans("Confirm").'></div>';
 		print '</form>';
 	}
 
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index feb69bdc7fb..ae92286dfec 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -42,13 +42,6 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'di
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
-// Security check
-$socid = GETPOST('socid', 'int');
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'prelevement', '', '', 'bons');
-
 $type = GETPOST('type', 'aZ09');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -80,6 +73,17 @@ $company = new Societe($db);
 
 $hookmanager->initHooks(array('withdrawalsreceiptslineslist'));
 
+// Security check
+$socid = GETPOST('socid', 'int');
+if ($user->socid) {
+	$socid = $user->socid;
+}
+if ($type == 'bank-transfer') {
+	$result = restrictedArea($user, 'paymentbybanktransfer', '', '', '');
+} else {
+	$result = restrictedArea($user, 'prelevement', '', '', 'bons');
+}
+
 
 /*
  * Actions
@@ -274,7 +278,7 @@ if ($result) {
 			$i++;
 		}
 	} else {
-		print '<tr><td class="opacitymedium" colspan="8">'.$langs->trans("None").'</td></tr>';
+		print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 	print "</table>";
 	print '</div>';
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index 3ca9ce32fbe..c80acb39f8e 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -33,13 +33,6 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals'));
 
 $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, 'prelevement', '', '', 'bons');
-
 $type = GETPOST('type', 'aZ09');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -72,6 +65,17 @@ if ($type == 'bank-transfer') {
 	$usercancreate = $user->rights->paymentbybanktransfer->create;
 }
 
+// Security check
+$socid = GETPOST('socid', 'int');
+if ($user->socid) {
+	$socid = $user->socid;
+}
+if ($type == 'bank-transfer') {
+	$result = restrictedArea($user, 'paymentbybanktransfer', '', '', '');
+} else {
+	$result = restrictedArea($user, 'prelevement', '', '', 'bons');
+}
+
 
 /*
  * Actions
@@ -137,15 +141,15 @@ if ($result) {
 
 	$newcardbutton = '';
 	if ($usercancreate) {
-		$newcardbutton .= dolGetButtonTitle($langs->trans('NewStandingOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/prelevement/create.php');
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewStandingOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/prelevement/create.php?type='.urlencode($type));
 	}
 
 	// Lines of title fields
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	if ($optioncss != '') {
 		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	}
-	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
@@ -208,7 +212,7 @@ if ($result) {
 			print '<td class="right"><span class="amount">'.price($obj->amount)."</span></td>\n";
 
 			print '<td class="right">';
-			print $bon->LibStatut($obj->statut, 3);
+			print $bon->LibStatut($obj->statut, 5);
 			print '</td>';
 
 			print '<td class="right"></td>'."\n";
@@ -217,7 +221,7 @@ if ($result) {
 			$i++;
 		}
 	} else {
-		print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
+		print '<tr><td colspan="5"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 
 	print "</table>";
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index ed8c704bcfa..029d5dd8598 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -33,13 +33,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
 
-// Security check
-$socid = GETPOST('socid', 'int');
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'prelevement', '', '', 'bons');
-
 $type = GETPOST('type', 'aZ09');
 
 // Get supervariables
@@ -54,6 +47,17 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
+// Security check
+$socid = GETPOST('socid', 'int');
+if ($user->socid) {
+	$socid = $user->socid;
+}
+if ($type == 'bank-transfer') {
+	$result = restrictedArea($user, 'paymentbybanktransfer', '', '', '');
+} else {
+	$result = restrictedArea($user, 'prelevement', '', '', 'bons');
+}
+
 
 /*
  * View
@@ -140,7 +144,7 @@ if ($result) {
 			$i++;
 		}
 	} else {
-		print '<tr><td class="opacitymedium" colspan="3">'.$langs->trans("None").'</td></tr>';
+		print '<tr><td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 
 	print "</table>";
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index ae1dd54a13c..9c30db6e08a 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -31,14 +31,18 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
 
+$type = GETPOST('type', 'aZ09');
+
 // Security check
 $socid = GETPOST('socid', 'int');
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'prelevement', '', '', 'bons');
-
-$type = GETPOST('type', 'aZ09');
+if ($type == 'bank-transfer') {
+	$result = restrictedArea($user, 'paymentbybanktransfer', '', '', '');
+} else {
+	$result = restrictedArea($user, 'prelevement', '', '', 'bons');
+}
 
 
 /*
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index b5aca49aaae..342360bd454 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -49,11 +49,11 @@ $date_startyear = GETPOST('date_startyear', 'int');
 $date_endmonth = GETPOST('date_endmonth', 'int');
 $date_endday = GETPOST('date_endday', 'int');
 $date_endyear = GETPOST('date_endyear', 'int');
-$showaccountdetail = GETPOST('showaccountdetail', 'aZ09') ?GETPOST('showaccountdetail', 'aZ09') : 'no';
+$showaccountdetail = GETPOST('showaccountdetail', 'aZ09') ? GETPOST('showaccountdetail', 'aZ09') : 'yes';
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -210,9 +210,9 @@ if ($modecompta == "CREANCES-DETTES") {
 	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{s1}', '{s2}').')';
 	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=CREANCES-DETTES">', '</a>'), $calcmode);
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-	$arraylist = array('no'=>$langs->trans("No"), 'yes'=>$langs->trans("AccountWithNonZeroValues"), 'all'=>$langs->trans("All"));
+	$arraylist = array('no'=>$langs->trans("CustomerCode"), 'yes'=>$langs->trans("AccountWithNonZeroValues"), 'all'=>$langs->trans("All"));
 	$period .= ' &nbsp; &nbsp; '.$langs->trans("DetailByAccount").' '.$form->selectarray('showaccountdetail', $arraylist, $showaccountdetail, 0);
-	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
+	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."&showaccountdetail=".$showaccountdetail."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."&showaccountdetail=".$showaccountdetail."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesResultBookkeepingPredefined");
 	$description .= ' ('.$langs->trans("SeePageForSetup", DOL_URL_ROOT.'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', $langs->transnoentitiesnoconv("Accountancy").' / '.$langs->transnoentitiesnoconv("Setup").' / '.$langs->transnoentitiesnoconv("Chartofaccounts")).')';
 	$builddate = dol_now();
@@ -221,7 +221,7 @@ if ($modecompta == "CREANCES-DETTES") {
 
 $hselected = 'report';
 
-report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array('modecompta'=>$modecompta), $calcmode);
+report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array('modecompta'=>$modecompta, 'showaccountdetail'=>$showaccountdetail), $calcmode);
 
 if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
@@ -280,7 +280,10 @@ if ($modecompta == 'BOOKKEEPING') {
 	$charofaccountstring = $conf->global->CHARTOFACCOUNTS;
 	$charofaccountstring = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
 
-	$sql = "SELECT f.thirdparty_code as name, -1 as socid, aa.pcg_type, SUM(f.credit - f.debit) as amount";
+	$sql = "SELECT -1 as socid, aa.pcg_type, SUM(f.credit - f.debit) as amount";
+	if ($showaccountdetail == 'no') {
+		$sql .= ", f.thirdparty_code as name";
+	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as f";
 	$sql .= ", ".MAIN_DB_PREFIX."accounting_account as aa";
 	$sql .= " WHERE f.numero_compte = aa.account_number";
@@ -290,11 +293,13 @@ if ($modecompta == 'BOOKKEEPING') {
 	if (!empty($date_start) && !empty($date_end)) {
 		$sql .= " AND f.doc_date >= '".$db->idate($date_start)."' AND f.doc_date <= '".$db->idate($date_end)."'";
 	}
-	$sql .= " GROUP BY pcg_type DESC, name, socid";
+	$sql .= " GROUP BY pcg_type DESC";
+	if ($showaccountdetail == 'no') {
+		$sql .= ", name, socid";	// group by "accounting group" (INCOME/EXPENSE), then "customer".
+	}
 	$sql .= $db->order($sortfield, $sortorder);
 
 	$oldpcgtype = '';
-	$oldpcgsubtype = '';
 
 	dol_syslog("get bookkeeping entries", LOG_DEBUG);
 	$result = $db->query($sql);
@@ -305,16 +310,30 @@ if ($modecompta == 'BOOKKEEPING') {
 			while ($i < $num) {
 				$objp = $db->fetch_object($result);
 
-				if ($objp->pcg_type != $oldpcgtype) {
-					print '<tr><td colspan="4">'.$objp->pcg_type.'</td></tr>';
-					$oldpcgtype = $objp->pcg_type;
+				if ($showaccountdetail == 'no') {
+					if ($objp->pcg_type != $oldpcgtype) {
+						print '<tr class="trforbreak"><td colspan="3" class="tdforbreak">'.$objp->pcg_type.'</td></tr>';
+						$oldpcgtype = $objp->pcg_type;
+					}
 				}
 
-				print '<tr class="oddeven">';
-				print '<td>&nbsp;</td>';
-				print '<td>'.$objp->pcg_type.($objp->name ? ' ('.$objp->name.')' : '')."</td>\n";
-				print '<td class="right"><span class="amount">'.price($objp->amount)."</span></td>\n";
-				print "</tr>\n";
+				if ($showaccountdetail == 'no') {
+					print '<tr class="oddeven">';
+					print '<td></td>';
+					print '<td>';
+					print $objp->pcg_type;
+					print ($objp->name ? ' ('.$objp->name.')' : ' ('.$langs->trans("Unknown").')');
+					print "</td>\n";
+					print '<td class="right"><span class="amount">'.price($objp->amount)."</span></td>\n";
+					print "</tr>\n";
+				} else {
+					print '<tr class="oddeven trforbreak">';
+					print '<td colspan="2" class="tdforbreak">';
+					print $objp->pcg_type;
+					print "</td>\n";
+					print '<td class="right tdforbreak"><span class="amount">'.price($objp->amount)."</span></td>\n";
+					print "</tr>\n";
+				}
 
 				$total_ht += (isset($objp->amount) ? $objp->amount : 0);
 				$total_ttc += (isset($objp->amount) ? $objp->amount : 0);
@@ -333,7 +352,7 @@ if ($modecompta == 'BOOKKEEPING') {
 				if ($showaccountdetail != 'no') {
 					$tmppredefinedgroupwhere = "pcg_type = '".$db->escape($objp->pcg_type)."'";
 					$tmppredefinedgroupwhere .= " AND fk_pcg_version = '".$db->escape($charofaccountstring)."'";
-					//$tmppredefinedgroupwhere.= " AND thirdparty_code = '".$db->escape($objp->name)."'";
+					//$tmppredefinedgroupwhere .= " AND thirdparty_code = '".$db->escape($objp->name)."'";
 
 					// Get cpts of category/group
 					$cpts = $AccCat->getCptsCat(0, $tmppredefinedgroupwhere);
@@ -361,7 +380,7 @@ if ($modecompta == 'BOOKKEEPING') {
 				$i++;
 			}
 		} else {
-			print '<tr><td colspan="4" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+			print '<tr><td colspan="3" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 		}
 	} else {
 		dol_print_error($db);
@@ -418,12 +437,15 @@ if ($modecompta == 'BOOKKEEPING') {
 		while ($i < $num) {
 			$objp = $db->fetch_object($result);
 
-			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<tr class="oddeven">';
+			print '<td>&nbsp;</td>';
 			print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->name."</td>\n";
 
+			print '<td class="right">';
 			if ($modecompta == 'CREANCES-DETTES') {
-				print '<td class="right"><span class="amount">'.price($objp->amount_ht)."</span></td>\n";
+				print '<span class="amount">'.price($objp->amount_ht)."</span>";
 			}
+			print "</td>\n";
 			print '<td class="right"><span class="amount">'.price($objp->amount_ttc)."</span></td>\n";
 
 			$total_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0);
@@ -463,12 +485,15 @@ if ($modecompta == 'BOOKKEEPING') {
 					$objp = $db->fetch_object($result);
 
 
-					print '<tr class="oddeven"><td>&nbsp;</td>';
+					print '<tr class="oddeven">';
+					print '<td>&nbsp;</td>';
 					print "<td>".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n";
 
+					print '<td class="right">';
 					if ($modecompta == 'CREANCES-DETTES') {
-						print '<td class="right"><span class="amount">'.price($objp->amount_ht)."</span></td>\n";
+						print '<span class="amount">'.price($objp->amount_ht)."</span></td>\n";
 					}
+					print '</td>';
 					print '<td class="right"><span class="amount">'.price($objp->amount_ttc)."</span></td>\n";
 
 					$total_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0);
@@ -485,7 +510,8 @@ if ($modecompta == 'BOOKKEEPING') {
 	}
 
 	if ($total_ttc == 0) {
-		print '<tr class="oddeven"><td>&nbsp;</td>';
+		print '<tr class="oddeven">';
+		print '<td>&nbsp;</td>';
 		print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 		print '</tr>';
 	}
@@ -494,10 +520,14 @@ if ($modecompta == 'BOOKKEEPING') {
 	$total_ttc_income += $total_ttc;
 
 	print '<tr class="liste_total">';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td class="right">';
 	if ($modecompta == 'CREANCES-DETTES') {
-		print '<td colspan="3" class="right">'.price($total_ht).'</td>';
+		print price($total_ht);
 	}
-	print '<td colspan="3" class="right">'.price($total_ttc).'</td>';
+	print '</td>';
+	print '<td class="right">'.price($total_ttc).'</td>';
 	print '</tr>';
 
 	/*
@@ -554,13 +584,16 @@ if ($modecompta == 'BOOKKEEPING') {
 					$subtotal_ht += $obj->amount;
 					$subtotal_ttc += $obj->amount;
 
-					print '<tr class="oddeven"><td>&nbsp;</td>';
+					print '<tr class="oddeven">';
+					print '<td>&nbsp;</td>';
 
 					print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/don/list.php?search_company=".$obj->name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name." ".$obj->firstname." ".$obj->lastname."</a></td>\n";
 
+					print '<td class="right">';
 					if ($modecompta == 'CREANCES-DETTES') {
-						print '<td class="right"><span class="amount">'.price($obj->amount).'</span></td>';
+						print '<span class="amount">'.price($obj->amount).'</span>';
 					}
+					print '</td>';
 					print '<td class="right"><span class="amount">'.price($obj->amount).'</span></td>';
 					print '</tr>';
 					$i++;
@@ -578,10 +611,14 @@ if ($modecompta == 'BOOKKEEPING') {
 		$total_ttc_income += $subtotal_ttc;
 
 		print '<tr class="liste_total">';
+		print '<td></td>';
+		print '<td></td>';
+		print '<td class="right">';
 		if ($modecompta == 'CREANCES-DETTES') {
-			print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
+			print price($subtotal_ht);
 		}
-		print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
+		print '</td>';
+		print '<td class="right">'.price($subtotal_ttc).'</td>';
 		print '</tr>';
 	}
 
@@ -636,12 +673,15 @@ if ($modecompta == 'BOOKKEEPING') {
 			while ($i < $num) {
 				$objp = $db->fetch_object($result);
 
-				print '<tr class="oddeven"><td>&nbsp;</td>';
-				print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->name."</a></td>\n";
+				print '<tr class="oddeven">';
+				print '<td>&nbsp;</td>';
+				print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid.'">'.$objp->name.'</a></td>'."\n";
 
+				print '<td class="right">';
 				if ($modecompta == 'CREANCES-DETTES') {
-					print '<td class="right"><span class="amount">'.price(-$objp->amount_ht)."</span></td>\n";
+					print '<span class="amount">'.price(-$objp->amount_ht)."</span>";
 				}
+				print "</td>\n";
 				print '<td class="right"><span class="amount">'.price(-$objp->amount_ttc)."</span></td>\n";
 
 				$total_ht -= (isset($objp->amount_ht) ? $objp->amount_ht : 0);
@@ -653,7 +693,8 @@ if ($modecompta == 'BOOKKEEPING') {
 				$i++;
 			}
 		} else {
-			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<tr class="oddeven">';
+			print '<td>&nbsp;</td>';
 			print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 			print '</tr>';
 		}
@@ -667,10 +708,14 @@ if ($modecompta == 'BOOKKEEPING') {
 	$total_ttc_outcome += $subtotal_ttc;
 
 	print '<tr class="liste_total">';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td class="right">';
 	if ($modecompta == 'CREANCES-DETTES') {
-		print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
+		print price(-$subtotal_ht);
 	}
-	print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
+	print '</td>';
+	print '<td class="right">'.price(-$subtotal_ttc).'</td>';
 	print '</tr>';
 
 
@@ -681,7 +726,7 @@ if ($modecompta == 'BOOKKEEPING') {
 	print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("SocialContributionsNondeductibles").'</td></tr>';
 
 	if ($modecompta == 'CREANCES-DETTES') {
-		$sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount";
+		$sql = "SELECT c.id, c.libelle as label, c.accountancy_code, sum(cs.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
 		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
 		$sql .= " WHERE cs.fk_type = c.id";
@@ -690,7 +735,7 @@ if ($modecompta == 'BOOKKEEPING') {
 			$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
 		}
 	} elseif ($modecompta == 'RECETTES-DEPENSES') {
-		$sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
+		$sql = "SELECT c.id, c.libelle as label, c.accountancy_code, sum(p.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
 		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
 		$sql .= ", ".MAIN_DB_PREFIX."paiementcharge as p";
@@ -702,7 +747,7 @@ if ($modecompta == 'BOOKKEEPING') {
 		}
 	}
 	$sql .= " AND cs.entity = ".$conf->entity;
-	$sql .= " GROUP BY c.libelle, c.id";
+	$sql .= " GROUP BY c.libelle, c.id, c.accountancy_code";
 	$newsortfield = $sortfield;
 	if ($newsortfield == 's.nom, s.rowid') {
 		$newsortfield = 'c.libelle, c.id';
@@ -732,17 +777,29 @@ if ($modecompta == 'BOOKKEEPING') {
 				$subtotal_ht += $obj->amount;
 				$subtotal_ttc += $obj->amount;
 
-				print '<tr class="oddeven"><td>&nbsp;</td>';
-				print '<td>'.$obj->label.'</td>';
-				if ($modecompta == 'CREANCES-DETTES') {
-					print '<td class="right"><span class="amount">'.price(-$obj->amount).'</span></td>';
+				$titletoshow = '';
+				if ($obj->accountancy_code) {
+					$titletoshow = $langs->trans("AccountingCode").': '.$obj->accountancy_code;
+					$tmpaccountingaccount = new AccountingAccount($db);
+					$tmpaccountingaccount->fetch(0, $obj->accountancy_code, 1);
+					$titletoshow .= ' - '.$langs->trans("AccountingCategory").': '.$tmpaccountingaccount->pcg_type;
 				}
+
+				print '<tr class="oddeven">';
+				print '<td>&nbsp;</td>';
+				print '<td'.($obj->accountancy_code ? ' title="'.dol_escape_htmltag($titletoshow).'"' : '').'>'.dol_escape_htmltag($obj->label).'</td>';
+				print '<td class="right">';
+				if ($modecompta == 'CREANCES-DETTES') {
+					print '<span class="amount">'.price(-$obj->amount).'</span>';
+				}
+				print '</td>';
 				print '<td class="right"><span class="amount">'.price(-$obj->amount).'</span></td>';
 				print '</tr>';
 				$i++;
 			}
 		} else {
-			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<tr class="oddeven">';
+			print '<td>&nbsp;</td>';
 			print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 			print '</tr>';
 		}
@@ -754,10 +811,14 @@ if ($modecompta == 'BOOKKEEPING') {
 	$total_ttc_outcome += $subtotal_ttc;
 
 	print '<tr class="liste_total">';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td class="right">';
 	if ($modecompta == 'CREANCES-DETTES') {
-		print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
+		print price(-$subtotal_ht);
 	}
-	print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
+	print '</td>';
+	print '<td class="right">'.price(-$subtotal_ttc).'</td>';
 	print '</tr>';
 
 
@@ -768,7 +829,7 @@ if ($modecompta == 'BOOKKEEPING') {
 	print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("SocialContributionsDeductibles").'</td></tr>';
 
 	if ($modecompta == 'CREANCES-DETTES') {
-		$sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount";
+		$sql = "SELECT c.id, c.libelle as label, c.accountancy_code, sum(cs.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
 		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
 		$sql .= " WHERE cs.fk_type = c.id";
@@ -778,7 +839,7 @@ if ($modecompta == 'BOOKKEEPING') {
 		}
 		$sql .= " AND cs.entity = ".$conf->entity;
 	} elseif ($modecompta == 'RECETTES-DEPENSES') {
-		$sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
+		$sql = "SELECT c.id, c.libelle as label, c.accountancy_code, sum(p.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
 		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
 		$sql .= ", ".MAIN_DB_PREFIX."paiementcharge as p";
@@ -790,7 +851,7 @@ if ($modecompta == 'BOOKKEEPING') {
 		}
 		$sql .= " AND cs.entity = ".$conf->entity;
 	}
-	$sql .= " GROUP BY c.libelle, c.id";
+	$sql .= " GROUP BY c.libelle, c.id, c.accountancy_code";
 	$newsortfield = $sortfield;
 	if ($newsortfield == 's.nom, s.rowid') {
 		$newsortfield = 'c.libelle, c.id';
@@ -819,17 +880,29 @@ if ($modecompta == 'BOOKKEEPING') {
 				$subtotal_ht += $obj->amount;
 				$subtotal_ttc += $obj->amount;
 
-				print '<tr class="oddeven"><td>&nbsp;</td>';
-				print '<td>'.$obj->label.'</td>';
-				if ($modecompta == 'CREANCES-DETTES') {
-					print '<td class="right"><span class="amount">'.price(-$obj->amount).'</span></td>';
+				$titletoshow = '';
+				if ($obj->accountancy_code) {
+					$titletoshow = $langs->trans("AccountingCode").': '.$obj->accountancy_code;
+					$tmpaccountingaccount = new AccountingAccount($db);
+					$tmpaccountingaccount->fetch(0, $obj->accountancy_code, 1);
+					$titletoshow .= ' - '.$langs->trans("AccountingCategory").': '.$tmpaccountingaccount->pcg_type;
 				}
+
+				print '<tr class="oddeven">';
+				print '<td>&nbsp;</td>';
+				print '<td'.($obj->accountancy_code ? ' title="'.dol_escape_htmltag($titletoshow).'"' : '').'>'.dol_escape_htmltag($obj->label).'</td>';
+				print '<td class="right">';
+				if ($modecompta == 'CREANCES-DETTES') {
+					print '<span class="amount">'.price(-$obj->amount).'</span>';
+				}
+				print '</td>';
 				print '<td class="right"><span class="amount">'.price(-$obj->amount).'</span></td>';
 				print '</tr>';
 				$i++;
 			}
 		} else {
-			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<tr class="oddeven">';
+			print '<td>&nbsp;</td>';
 			print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 			print '</tr>';
 		}
@@ -841,10 +914,14 @@ if ($modecompta == 'BOOKKEEPING') {
 	$total_ttc_outcome += $subtotal_ttc;
 
 	print '<tr class="liste_total">';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td class="right">';
 	if ($modecompta == 'CREANCES-DETTES') {
-		print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
+		print price(-$subtotal_ht);
 	}
-	print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
+	print '</td>';
+	print '<td class="right">'.price(-$subtotal_ttc).'</td>';
 	print '</tr>';
 
 
@@ -857,7 +934,8 @@ if ($modecompta == 'BOOKKEEPING') {
 
 		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES') {
 			if ($modecompta == 'CREANCES-DETTES') {
-				$column = 'p.datev';
+				//$column = 's.dateep';	// We use the date of salary
+				$column = 'p.datep';
 			} else {
 				$column = 'p.datep';
 			}
@@ -866,13 +944,14 @@ if ($modecompta == 'BOOKKEEPING') {
 			$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').")";
+			$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, 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";
@@ -918,16 +997,18 @@ if ($modecompta == 'BOOKKEEPING') {
 					$userstatic->fetch($obj->fk_user);
 
 					print "<td>".$langs->trans("Salary")." <a href=\"".DOL_URL_ROOT."/salaries/list.php?search_user=".urlencode($userstatic->getFullName($langs))."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
-
+					print '<td class="right">';
 					if ($modecompta == 'CREANCES-DETTES') {
-						print '<td class="right"><span class="amount">'.price(-$obj->amount).'</span></td>';
+						print '<span class="amount">'.price(-$obj->amount).'</span>';
 					}
+					print '</td>';
 					print '<td class="right"><span class="amount">'.price(-$obj->amount).'</span></td>';
 					print '</tr>';
 					$i++;
 				}
 			} else {
-				print '<tr class="oddeven"><td>&nbsp;</td>';
+				print '<tr class="oddeven">';
+				print '<td>&nbsp;</td>';
 				print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 				print '</tr>';
 			}
@@ -939,10 +1020,14 @@ if ($modecompta == 'BOOKKEEPING') {
 		$total_ttc_outcome += $subtotal_ttc;
 
 		print '<tr class="liste_total">';
+		print '<td></td>';
+		print '<td></td>';
+		print '<td class="right">';
 		if ($modecompta == 'CREANCES-DETTES') {
-			print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
+			print price(-$subtotal_ht);
 		}
-		print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
+		print '</td>';
+		print '<td class="right">'.price(-$subtotal_ttc).'</td>';
 		print '</tr>';
 	}
 
@@ -1001,18 +1086,20 @@ if ($modecompta == 'BOOKKEEPING') {
 					$subtotal_ht += $obj->amount_ht;
 					$subtotal_ttc += $obj->amount_ttc;
 
-					print '<tr class="oddeven"><td>&nbsp;</td>';
-
+					print '<tr class="oddeven">';
+					print '<td>&nbsp;</td>';
 					print "<td>".$langs->trans("ExpenseReport")." <a href=\"".DOL_URL_ROOT."/expensereport/list.php?search_user=".$obj->userid."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
-
+					print '<td class="right">';
 					if ($modecompta == 'CREANCES-DETTES') {
-						print '<td class="right"><span class="amount">'.price(-$obj->amount_ht).'</span></td>';
+						print '<span class="amount">'.price(-$obj->amount_ht).'</span>';
 					}
+					print '</td>';
 					print '<td class="right"><span class="amount">'.price(-$obj->amount_ttc).'</span></td>';
 					print '</tr>';
 				}
 			} else {
-				print '<tr class="oddeven"><td>&nbsp;</td>';
+				print '<tr class="oddeven">';
+				print '<td>&nbsp;</td>';
 				print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 				print '</tr>';
 			}
@@ -1024,10 +1111,14 @@ if ($modecompta == 'BOOKKEEPING') {
 		$total_ttc_outcome += $subtotal_ttc;
 
 		print '<tr class="liste_total">';
+		print '<td></td>';
+		print '<td></td>';
+		print '<td class="right">';
 		if ($modecompta == 'CREANCES-DETTES') {
-			print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
+			print price(-$subtotal_ht);
 		}
-		print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
+		print '</td>';
+		print '<td class="right">'.price(-$subtotal_ttc).'</td>';
 		print '</tr>';
 	}
 
@@ -1064,11 +1155,14 @@ if ($modecompta == 'BOOKKEEPING') {
 				$total_ht_outcome += $obj->amount;
 				$total_ttc_outcome += $obj->amount;
 			}
-			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<tr class="oddeven">';
+			print '<td>&nbsp;</td>';
 			print "<td>".$langs->trans("Debit")."</td>\n";
+			print '<td class="right">';
 			if ($modecompta == 'CREANCES-DETTES') {
-				print '<td class="right"><span class="amount">'.price(-$obj->amount).'</span></td>';
+				print '<span class="amount">'.price(-$obj->amount).'</span>';
 			}
+			print '</td>';
 			print '<td class="right"><span class="amount">'.price(-$obj->amount)."</span></td>\n";
 			print "</tr>\n";
 
@@ -1083,9 +1177,11 @@ if ($modecompta == 'BOOKKEEPING') {
 			}
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print "<td>".$langs->trans("Credit")."</td>\n";
+			print '<td class="right">';
 			if ($modecompta == 'CREANCES-DETTES') {
-				print '<td class="right"><span class="amount">'.price($obj->amount).'</span></td>';
+				print '<span class="amount">'.price($obj->amount).'</span>';
 			}
+			print '</td>';
 			print '<td class="right"><span class="amount">'.price($obj->amount)."</span></td>\n";
 			print "</tr>\n";
 
@@ -1093,10 +1189,14 @@ if ($modecompta == 'BOOKKEEPING') {
 			$total_ht += $subtotal_ht;
 			$total_ttc += $subtotal_ttc;
 			print '<tr class="liste_total">';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td class="right">';
 			if ($modecompta == 'CREANCES-DETTES') {
-				print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
+				print price($subtotal_ht);
 			}
-			print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
+			print '</td>';
+			print '<td class="right">'.price($subtotal_ttc).'</td>';
 			print '</tr>';
 		} else {
 			dol_print_error($db);
@@ -1148,10 +1248,14 @@ if ($modecompta == 'BOOKKEEPING') {
 			$total_ttc_income += $subtotal_ttc;
 
 			print '<tr class="liste_total">';
+			print '<td></td>';
+			print '<td></td>';
+			print '<td class="right">';
 			if ($modecompta == 'CREANCES-DETTES') {
-				print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
+				print price($subtotal_ht);
 			}
-			print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
+			print '</td>';
+			print '<td class="right">'.price($subtotal_ttc).'</td>';
 			print '</tr>';
 		} else {
 			dol_print_error($db);
@@ -1219,7 +1323,8 @@ if ($modecompta == 'BOOKKEEPING') {
 			$total_ht_outcome -= 0;
 			$total_ttc_outcome -= $amount;
 
-			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<tr class="oddeven">';
+			print '<td>&nbsp;</td>';
 			print "<td>".$langs->trans("VATToPay")."</td>\n";
 			print '<td class="right">&nbsp;</td>'."\n";
 			print '<td class="right"><span class="amount">'.price($amount)."</span></td>\n";
@@ -1277,7 +1382,8 @@ if ($modecompta == 'BOOKKEEPING') {
 			$total_ht_income += 0;
 			$total_ttc_income += $amount;
 
-			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<tr class="oddeven">';
+			print '<td>&nbsp;</td>';
 			print '<td>'.$langs->trans("VATToCollect")."</td>\n";
 			print '<td class="right">&nbsp;</td>'."\n";
 			print '<td class="right"><span class="amount">'.price($amount)."</span></td>\n";
@@ -1331,11 +1437,10 @@ if ($modecompta == 'BOOKKEEPING') {
 			$total_ht_outcome -= 0;
 			$total_ttc_outcome -= $amount;
 
-			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<tr class="oddeven">';
+			print '<td>&nbsp;</td>';
 			print "<td>".$langs->trans("VATPaid")."</td>\n";
-			if ($modecompta == 'CREANCES-DETTES') {
-				print '<td <class="right"></td>'."\n";
-			}
+			print '<td <class="right"></td>'."\n";
 			print '<td class="right"><span class="amount">'.price($amount)."</span></td>\n";
 			print "</tr>\n";
 
@@ -1387,11 +1492,10 @@ if ($modecompta == 'BOOKKEEPING') {
 			$total_ht_income += 0;
 			$total_ttc_income += $amount;
 
-			print '<tr class="oddeven"><td>&nbsp;</td>';
+			print '<tr class="oddeven">';
+			print '<td>&nbsp;</td>';
 			print "<td>".$langs->trans("VATCollected")."</td>\n";
-			if ($modecompta == 'CREANCES-DETTES') {
-				print '<td class="right"></td>'."\n";
-			}
+			print '<td class="right"></td>'."\n";
 			print '<td class="right"><span class="amount">'.price($amount)."</span></td>\n";
 			print "</tr>\n";
 		}
@@ -1399,10 +1503,10 @@ if ($modecompta == 'BOOKKEEPING') {
 
 	if ($mysoc->tva_assuj != '0') {	// Assujetti
 		print '<tr class="liste_total">';
-		if ($modecompta == 'CREANCES-DETTES') {
-			print '<td colspan="3" class="right">&nbsp;</td>';
-		}
-		print '<td colspan="3" class="right">'.price(price2num($subtotal_ttc, 'MT')).'</td>';
+		print '<td></td>';
+		print '<td></td>';
+		print '<td class="right">&nbsp;</td>';
+		print '<td class="right">'.price(price2num($subtotal_ttc, 'MT')).'</td>';
 		print '</tr>';
 	}
 }
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 2d4ea6fc9e0..6aab9093c05 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -60,11 +60,11 @@ $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
 // We define date_start and date_end
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q") ?GETPOST("q") : 0;
+	$q = GETPOST("q") ? GETPOST("q", 'int') : 0;
 	if ($q == 0) {
 		// We define date_start and date_end
 		$year_end = $year_start + ($nbofyear - 1);
-		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		$month_start = GETPOST("month") ? GETPOST("month", 'int') : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		if (!GETPOST('month')) {
 			if (!GETPOST("year") && $month_start > $month_current) {
 				$year_start--;
@@ -140,6 +140,11 @@ $form = new Form($db);
 
 $exportlink = '';
 
+$encaiss = array();
+$encaiss_ttc = array();
+$decaiss = array();
+$decaiss_ttc = array();
+
 // Affiche en-tete du rapport
 if ($modecompta == 'CREANCES-DETTES') {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
@@ -152,7 +157,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	}
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
-	$description = $langs->trans("RulesAmountWithTaxIncluded");
+	$description = $langs->trans("RulesAmountWithTaxExcluded");
 	$description .= '<br>'.$langs->trans("RulesResultDue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 		$description .= "<br>".$langs->trans("DepositsAreNotIncluded");
@@ -237,10 +242,9 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 		}
 	}
-
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
 	if ($socid) {
-		$sql .= " AND f.fk_soc = $socid";
+		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
 	$sql .= " GROUP BY dm";
 	$sql .= " ORDER BY dm";
@@ -344,8 +348,8 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 		}
 	}
+	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 
-	$sql .= " AND f.entity = ".$conf->entity;
 	if ($socid) {
 		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
@@ -413,10 +417,10 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 				while ($i < $num) {
 					$obj = $db->fetch_object($result);
 
-					if (!isset($decaiss[$obj->dm])) {
+					/*if (!isset($decaiss[$obj->dm])) {
 						$decaiss[$obj->dm] = 0;
 					}
-					$decaiss[$obj->dm] += $obj->amount;
+					$decaiss[$obj->dm] += $obj->amount;*/
 
 					if (!isset($decaiss_ttc[$obj->dm])) {
 						$decaiss_ttc[$obj->dm] = 0;
@@ -438,7 +442,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		} else {
 			$sql .= " AND f.type IN (0,1,2,3)";
 		}
-		$sql .= " AND f.entity = ".$conf->entity;
+		$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 		}
@@ -453,10 +457,10 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 				while ($i < $num) {
 					$obj = $db->fetch_object($result);
 
-					if (!isset($encaiss[$obj->dm])) {
+					/*if (!isset($encaiss[$obj->dm])) {
 						$encaiss[$obj->dm] = 0;
 					}
-					$encaiss[$obj->dm] += $obj->amount;
+					$encaiss[$obj->dm] += $obj->amount;*/
 
 					if (!isset($encaiss_ttc[$obj->dm])) {
 						$encaiss_ttc[$obj->dm] = 0;
@@ -474,7 +478,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$sql = "SELECT sum(t.amount) as amount, date_format(t.datev,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
 		$sql .= " WHERE amount > 0";
-		$sql .= " AND t.entity = ".$conf->entity;
+		$sql .= " AND t.entity IN (".getEntity('vat').")";
 		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
 		}
@@ -489,10 +493,10 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 				while ($i < $num) {
 					$obj = $db->fetch_object($result);
 
-					if (!isset($decaiss[$obj->dm])) {
+					/*if (!isset($decaiss[$obj->dm])) {
 						$decaiss[$obj->dm] = 0;
 					}
-					$decaiss[$obj->dm] += $obj->amount;
+					$decaiss[$obj->dm] += $obj->amount;*/
 
 					if (!isset($decaiss_ttc[$obj->dm])) {
 						$decaiss_ttc[$obj->dm] = 0;
@@ -509,7 +513,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$sql = "SELECT sum(t.amount) as amount, date_format(t.datev,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
 		$sql .= " WHERE amount < 0";
-		$sql .= " AND t.entity = ".$conf->entity;
+		$sql .= " AND t.entity IN (".getEntity('vat').")";
 		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
 		}
@@ -524,10 +528,10 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 				while ($i < $num) {
 					$obj = $db->fetch_object($result);
 
-					if (!isset($encaiss[$obj->dm])) {
+					/*if (!isset($encaiss[$obj->dm])) {
 						$encaiss[$obj->dm] = 0;
 					}
-					$encaiss[$obj->dm] += -$obj->amount;
+					$encaiss[$obj->dm] += -$obj->amount;*/
 
 					if (!isset($encaiss_ttc[$obj->dm])) {
 						$encaiss_ttc[$obj->dm] = 0;
@@ -572,7 +576,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		}
 	}
 
-	$sql .= " AND cs.entity = ".$conf->entity;
+	$sql .= " AND cs.entity IN (".getEntity('social_contributions').")";
 	$sql .= " GROUP BY c.libelle, dm";
 
 	dol_syslog("get social contributions", LOG_DEBUG);
@@ -611,7 +615,8 @@ 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 = 'p.datev';
+		//$column = 's.dateep';		// we use the date of salary
+		$column = 'p.datep';
 	}
 	if ($modecompta == "RECETTES-DEPENSES") {
 		$column = 'p.datep';
@@ -620,8 +625,9 @@ if (!empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $mo
 	$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";
-	$sql .= " WHERE p.entity IN (".getEntity('payment_salary').")";
+	$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)."'";
 	}
@@ -786,7 +792,8 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
 	// decaiss
 
 	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
-	$sql .= ' WHERE p.sens = 0';
+	$sql .= " WHERE p.entity IN (".getEntity('variouspayment').")";
+	$sql .= ' AND p.sens = 0';
 	if (!empty($date_start) && !empty($date_end)) {
 		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
@@ -816,7 +823,8 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
 	// encaiss
 
 	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various AS p";
-	$sql .= ' WHERE p.sens = 1';
+	$sql .= " WHERE p.entity IN (".getEntity('variouspayment').")";
+	$sql .= ' AND p.sens = 1';
 	if (!empty($date_start) && !empty($date_end)) {
 		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
@@ -852,8 +860,10 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
  */
 
 if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
-	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) AS amount FROM ".MAIN_DB_PREFIX."payment_loan AS p";
-	$sql .= ' WHERE 1 = 1';
+	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) AS amount";
+	$sql .= " FROM ".MAIN_DB_PREFIX."payment_loan AS p, ".MAIN_DB_PREFIX."loan as l";
+	$sql .= " WHERE l.entity IN (".getEntity('variouspayment').")";
+	$sql .= " AND p.fk_loan = l.rowid";
 	if (!empty($date_start) && !empty($date_end)) {
 		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
@@ -1025,7 +1035,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;';
-		if ($modecompta == 'BOOKKEEPING') {
+		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>';
 				if (!isset($totsorties[$annee])) {
@@ -1045,7 +1055,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
 		print "</td>";
 
 		print '<td class="borderrightlight nowrap right">&nbsp;';
-		if ($modecompta == 'BOOKKEEPING') {
+		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>';
 				if (!isset($totentrees[$annee])) {
@@ -1072,7 +1082,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
 
 $nbcols = 0;
 print '<tr class="liste_total impair"><td>';
-if ($modecompta == 'BOOKKEEPING') {
+if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'BOOKKEEPING') {
 	print $langs->trans("Total");
 } else {
 	print $langs->trans("TotalTTC");
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 7454f61f6de..0ea9b1ba30d 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -26,11 +26,11 @@
  */
 
 require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -46,8 +46,14 @@ if (!empty($conf->accounting->enabled)) {
 $langs->loadLangs(array('compta', 'bills', 'banks', 'hrm'));
 
 $id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$confirm = GETPOST('confirm');
+$confirm = GETPOST('confirm', 'alpha');
+$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');
+
 $fk_project = (GETPOST('fk_project') ? GETPOST('fk_project', 'int') : 0);
 
 $dateech = dol_mktime(GETPOST('echhour'), GETPOST('echmin'), GETPOST('echsec'), GETPOST('echmonth'), GETPOST('echday'), GETPOST('echyear'));
@@ -56,11 +62,31 @@ $label = GETPOST('label', 'alpha');
 $actioncode = GETPOST('actioncode');
 $fk_user = GETPOST('userid', 'int');
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('taxcard', 'globalcard'));
+
+// Initialize technical objects
 $object = new ChargeSociales($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->tax->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('taxsocialcontributioncard', 'globalcard'));
+
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
+
+// Load object
 if ($id > 0) {
 	$object->fetch($id);
 }
 
+$permissiontoread = $user->rights->tax->charges->lire;
+$permissiontoadd = $user->rights->tax->charges->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->tax->charges->supprimer || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote = $user->rights->tax->charges->creer; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->tax->charges->creer; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->tax->multidir_output[isset($object->entity) ? $object->entity : 1];
+
 // Security check
 $socid = GETPOST('socid', 'int');
 if ($user->socid) {
@@ -74,6 +100,12 @@ $result = restrictedArea($user, 'tax', $object->id, 'chargesociales', 'charges')
  * 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');
+}
+
 // Classify paid
 if ($action == 'confirm_paid' && $user->rights->tax->charges->creer && $confirm == 'yes') {
 	$object->fetch($id);
@@ -122,7 +154,7 @@ if ($action == 'setmode' && $user->rights->tax->charges->creer) {
 	}
 }
 
-// bank account
+// Bank account
 if ($action == 'setbankaccount' && $user->rights->tax->charges->creer) {
 	$object->fetch($id);
 	$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
@@ -151,7 +183,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes') {
 
 // Add social contribution
 if ($action == 'add' && $user->rights->tax->charges->creer) {
-	$amount = price2num(GETPOST('amount'), 'MT');
+	$amount = price2num(GETPOST('amount', 'alpha'), 'MT');
 
 	if (!$dateech) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
@@ -189,7 +221,7 @@ if ($action == 'add' && $user->rights->tax->charges->creer) {
 
 
 if ($action == 'update' && !GETPOST("cancel") && $user->rights->tax->charges->creer) {
-	$amount = price2num(GETPOST('amount'), 'MT');
+	$amount = price2num(GETPOST('amount', 'alpha'), 'MT');
 
 	if (!$dateech) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
@@ -231,8 +263,11 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 	$object->fetch($id);
 
 	if ($object->id > 0) {
-		$object->paye = 0;
 		$object->id = $object->ref = null;
+		$object->paye = 0;
+		if (GETPOST('amount', 'alphanohtml')) {
+			$object->amount = price2num(GETPOST('amount', 'alphanohtml'), 'MT', 2);
+		}
 
 		if (GETPOST('clone_label', 'alphanohtml')) {
 			$object->label = GETPOST('clone_label', 'alphanohtml');
@@ -244,7 +279,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 			$object->periode = dol_time_plus_duree($object->periode, 1, 'm');
 			$object->date_ech = dol_time_plus_duree($object->date_ech, 1, 'm');
 		} else {
-			// Note dateech is often a little bit higher than dateperiod
+			// Note date_ech is often a little bit higher than dateperiod
 			$newdateperiod = dol_mktime(0, 0, 0, GETPOST('clone_periodmonth', 'int'), GETPOST('clone_periodday', 'int'), GETPOST('clone_periodyear', 'int'));
 			$newdateech = dol_mktime(0, 0, 0, GETPOST('clone_date_echmonth', 'int'), GETPOST('clone_date_echday', 'int'), GETPOST('clone_date_echyear', 'int'));
 			if ($newdateperiod) {
@@ -263,7 +298,8 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 			}
 		}
 
-		if ($object->check()) {
+		$resultcheck = $object->check();
+		if ($resultcheck) {
 			$id = $object->create($user);
 			if ($id > 0) {
 				$db->commit();
@@ -293,6 +329,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
  */
 
 $form = new Form($db);
+$formfile = new FormFile($db);
 $formsocialcontrib = new FormSocialContrib($db);
 $bankaccountstatic = new Account($db);
 if (!empty($conf->projet->enabled)) {
@@ -304,7 +341,7 @@ $help_url = 'EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividen
 llxHeader("", $title, $help_url);
 
 
-// Mode creation
+// Form to create a social contribution
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewSocialContribution"));
 
@@ -399,7 +436,7 @@ if ($action == 'create') {
 	print dol_get_fiche_end();
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+	print '<input type="submit" class="button button-add" value="'.$langs->trans("Add").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	print '</div>';
@@ -407,15 +444,13 @@ if ($action == 'create') {
 	print '</form>';
 }
 
-/* *************************************************************************** */
-/*                                                                             */
-/* Card Mode                                                                   */
-/*                                                                             */
-/* *************************************************************************** */
+// View mode
 if ($id > 0) {
 	$object = new ChargeSociales($db);
 	$result = $object->fetch($id);
 
+	$formconfirm = '';
+
 	if ($result > 0) {
 		$head = tax_prepare_head($object);
 
@@ -429,29 +464,41 @@ if ($id > 0) {
 			if (!empty($conf->global->TAX_ADD_CLONE_FOR_NEXT_MONTH_CHECKBOX)) {
 				$formquestion[] = array('type' => 'checkbox', 'name' => 'clone_for_next_month', 'label' => $langs->trans("CloneTaxForNextMonth"), 'value' => 1);
 			} else {
-				$formquestion[] = array('type' => 'date', 'name' => 'clone_date_ech', 'label' => $langs->trans("Date"), 'value' => -1);
+				$formquestion[] = array('type' => 'date', 'datenow'=>1, 'name' => 'clone_date_ech', 'label' => $langs->trans("Date"), 'value' => -1);
 				$formquestion[] = array('type' => 'date', 'name' => 'clone_period', 'label' => $langs->trans("PeriodEndDate"), 'value' => -1);
+				$formquestion[] = array('type' => 'text', 'name' => 'amount', 'label' => $langs->trans("Amount"), 'value' => price($object->amount), 'morecss' => 'width100');
 			}
 
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneTax', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 240);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneTax', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 280);
 		}
 
 
 		if ($action == 'paid') {
 			$text = $langs->trans('ConfirmPaySocialContribution');
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans('PaySocialContribution'), $text, "confirm_paid", '', '', 2);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans('PaySocialContribution'), $text, "confirm_paid", '', '', 2);
 		}
 
 		// Confirmation of the removal of the Social Contribution
 		if ($action == 'delete') {
 			$text = $langs->trans('ConfirmDeleteSocialContribution');
-			print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteSocialContribution'), $text, 'confirm_delete', '', '', 2);
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteSocialContribution'), $text, 'confirm_delete', '', '', 2);
 		}
 
 		if ($action == 'edit') {
 			print "<form name=\"charge\" action=\"".$_SERVER["PHP_SELF"]."?id=$object->id&amp;action=update\" method=\"post\">";
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 		}
+		// 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;
 
 		print dol_get_fiche_head($head, 'card', $langs->trans("SocialContribution"), -1, 'bill');
 
@@ -497,7 +544,7 @@ if ($id > 0) {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->tax->charges->creer) {
 				if ($action != 'classify') {
-					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+					$morehtmlref .= '<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);
@@ -514,9 +561,10 @@ if ($id > 0) {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
@@ -546,7 +594,7 @@ if ($id > 0) {
 		// Date
 		if ($action == 'edit') {
 			print '<tr><td>'.$langs->trans("Date")."</td><td>";
-			print $form->selectDate($object->date_ech, 'ech', 0, 0, 0, 'charge', 1);
+			print $form->selectDate($object->date_ech, 'ech', 0, 0, 0, 'charge', 1, 1);
 			print "</td></tr>";
 		} else {
 			print "<tr><td>".$langs->trans("Date")."</td><td>".dol_print_date($object->date_ech, 'day')."</td></tr>";
@@ -568,7 +616,7 @@ if ($id > 0) {
 			print '<input type="text" name="amount" size="12" class="flat" value="'.price($object->amount).'">';
 			print "</td></tr>";
 		} else {
-			print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</td></tr>';
+			print '<tr><td>'.$langs->trans("AmountTTC").'</td><td><span class="amount">'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span></td></tr>';
 		}
 
 		// Mode of payment
@@ -577,7 +625,7 @@ if ($id > 0) {
 		print $langs->trans('DefaultPaymentMode');
 		print '</td>';
 		if ($action != 'editmode') {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
@@ -588,14 +636,14 @@ if ($id > 0) {
 		}
 		print '</td></tr>';
 
-		// Bank Account
+		// Bank account
 		if (!empty($conf->banque->enabled)) {
 			print '<tr><td class="nowrap">';
 			print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 			print $langs->trans('DefaultBankAccount');
 			print '<td>';
 			if ($action != 'editbankaccount' && $user->rights->tax->charges->creer) {
-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+				print '<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>';
@@ -608,11 +656,15 @@ 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>';
 		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
 
 		$nbcols = 3;
 		if (!empty($conf->banque->enabled)) {
@@ -622,7 +674,7 @@ if ($id > 0) {
 		/*
 		 * Payments
 		 */
-		$sql = "SELECT p.rowid, p.num_paiement as num_payment, datep as dp, p.amount,";
+		$sql = "SELECT p.rowid, p.num_paiement as num_payment, p.datep as dp, p.amount,";
 		$sql .= " c.code as type_code,c.libelle as paiement_type,";
 		$sql .= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.currency_code as bacurrency_code, ba.fk_accountancy_journal';
 		$sql .= " FROM ".MAIN_DB_PREFIX."paiementcharge as p";
@@ -632,7 +684,7 @@ if ($id > 0) {
 		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
 		$sql .= " WHERE p.fk_charge = ".((int) $id);
 		$sql .= " AND p.fk_charge = cs.rowid";
-		$sql .= " AND cs.entity IN (".getEntity('tax').")";
+		$sql .= " AND cs.entity IN (".getEntity('sc').")";
 		$sql .= " ORDER BY dp DESC";
 
 		//print $sql;
@@ -705,8 +757,8 @@ 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("AmountExpected")." :</td><td class=\"right\">".price($object->amount)."</td></tr>\n";
+			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("AmountExpected").' :</td><td class="right">'.price($object->amount)."</td></tr>\n";
 
 			$resteapayer = $object->amount - $totalpaye;
 			$cssforamountpaymentcomplete = 'amountpaymentcomplete';
@@ -722,7 +774,6 @@ if ($id > 0) {
 			dol_print_error($db);
 		}
 
-		print '</div>';
 		print '</div>';
 		print '</div>';
 
@@ -731,59 +782,110 @@ if ($id > 0) {
 		print dol_get_fiche_end();
 
 		if ($action == 'edit') {
-			print '<div align="center">';
-			print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-			print ' &nbsp; ';
-			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-			print '</div>';
-		}
+			print $form->buttonsSaveCancel();
 
-		if ($action == 'edit') {
 			print "</form>\n";
 		}
 
 
 
-		/*
-		*   Actions buttons
-		*/
+		// Buttons for actions
+
 		if ($action != 'edit') {
 			print '<div class="tabsAction">'."\n";
 
 			// Reopen
 			if ($object->paye && $user->rights->tax->charges->creer) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.dol_buildpath("/compta/sociales/card.php", 1).'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a></div>';
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a></div>';
 			}
 
 			// Edit
 			if ($object->paye == 0 && $user->rights->tax->charges->creer) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>';
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a></div>';
 			}
 
 			// Emit payment
 			if ($object->paye == 0 && ((price2num($object->amount) < 0 && price2num($resteapayer, 'MT') < 0) || (price2num($object->amount) > 0 && price2num($resteapayer, 'MT') > 0)) && $user->rights->tax->charges->creer) {
-				print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/paiement_charge.php?id=$object->id&amp;action=create\">".$langs->trans("DoPayment")."</a></div>";
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/paiement_charge.php?id='.$object->id.'&action=create&token='.newToken().'">'.$langs->trans("DoPayment")."</a></div>";
 			}
 
 			// Classify 'paid'
 			if ($object->paye == 0 && round($resteapayer) <= 0 && $user->rights->tax->charges->creer) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&amp;action=paid&amp;token='.newToken().'">'.$langs->trans("ClassifyPaid").'</a></div>';
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&action=paid&token='.newToken().'">'.$langs->trans("ClassifyPaid").'</a></div>';
 			}
 
 			// Clone
 			if ($user->rights->tax->charges->creer) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.dol_buildpath("/compta/sociales/card.php", 1).'?id='.$object->id.'&amp;action=clone">'.$langs->trans("ToClone")."</a></div>";
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&action=clone&token='.newToken().'">'.$langs->trans("ToClone")."</a></div>";
 			}
 
 			// Delete
 			if ($user->rights->tax->charges->supprimer && empty($totalpaye)) {
-				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
+				print '<div 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>';
 			}
 
 			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->tax->dir_output.'/'.$objref;
+				$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+				//$genallowed = $user->rights->tax->charges->lire; // If you can read, you can build the PDF to read content
+				$genallowed = 0;
+				$delallowed = $user->rights->tax->charges->creer; // If you can create/edit, you can remove a file on card
+				print $formfile->showdocuments('tax', $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('myobject'));
+			//$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+
+			print '</div><div class="fichehalfright">';
+
+			/*
+			 $MAXEVENT = 10;
+
+			 $morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt 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 = 'sc';
+		$defaulttopic = 'InformationMessage';
+		$diroutput = $conf->tax->dir_output;
+		$trackid = 'sc'.$object->id;
+
+		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 	} else {
 		/* Social contribution not found */
 		dol_print_error('', $object->error);
diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
index ee9a270b283..d03132b04f7 100644
--- a/htdocs/compta/sociales/class/cchargesociales.class.php
+++ b/htdocs/compta/sociales/class/cchargesociales.class.php
@@ -329,7 +329,7 @@ class Cchargesociales
 
 		if (!$error) {
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' WHERE id='.$this->id;
+			$sql .= ' WHERE id = '.((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 14b2cf67590..431f0bcba72 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -198,11 +198,10 @@ class ChargeSociales extends CommonObject
 		$newamount = price2num($this->amount, 'MT');
 
 		// Validation of parameters
-		if (!$newamount > 0 || empty($this->date_ech) || empty($this->periode)) {
+		if ($newamount == 0 || empty($this->date_ech) || empty($this->periode)) {
 			return false;
 		}
 
-
 		return true;
 	}
 
@@ -230,17 +229,17 @@ class ChargeSociales extends CommonObject
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, fk_account, fk_mode_reglement, libelle, date_ech, periode, amount, fk_projet, entity, fk_user_author, fk_user, date_creation)";
-		$sql .= " VALUES (".$this->type;
-		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
-		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : "NULL");
+		$sql .= " VALUES (".((int) $this->type);
+		$sql .= ", ".($this->fk_account > 0 ? ((int) $this->fk_account) : 'NULL');
+		$sql .= ", ".($this->mode_reglement_id > 0 ? ((int) $this->mode_reglement_id) : "NULL");
 		$sql .= ", '".$this->db->escape($this->label ? $this->label : $this->lib)."'";
 		$sql .= ", '".$this->db->idate($this->date_ech)."'";
 		$sql .= ", '".$this->db->idate($this->periode)."'";
 		$sql .= ", '".price2num($newamount)."'";
-		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : 'NULL');
-		$sql .= ", ".$conf->entity;
-		$sql .= ", ".$user->id;
-		$sql .= ", ".($this->fk_user > 0 ? $this->db->escape($this->fk_user) : 'NULL');
+		$sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : 'NULL');
+		$sql .= ", ".((int) $conf->entity);
+		$sql .= ", ".((int) $user->id);
+		$sql .= ", ".($this->fk_user > 0 ? ((int) $this->fk_user) : 'NULL');
 		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ")";
 
@@ -445,7 +444,7 @@ class ChargeSociales extends CommonObject
 	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
 		$sql .= " paye = 1";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 		$return = $this->db->query($sql);
 		if ($return) {
 			return 1;
@@ -480,7 +479,7 @@ class ChargeSociales extends CommonObject
 	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
 		$sql .= " paye = 0";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 		$return = $this->db->query($sql);
 		if ($return) {
 			return 1;
@@ -525,15 +524,15 @@ class ChargeSociales extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('Unpaid');
-			$this->labelStatus[self::STATUS_PAID] = $langs->trans('Paid');
+			$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('Unpaid');
+			$this->labelStatus[self::STATUS_PAID] = $langs->transnoentitiesnoconv('Paid');
 			if ($status == self::STATUS_UNPAID && $alreadypaid > 0) {
-				$this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+				$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
 			}
-			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('Unpaid');
-			$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('Paid');
+			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('Unpaid');
+			$this->labelStatusShort[self::STATUS_PAID] = $langs->transnoentitiesnoconv('Paid');
 			if ($status == self::STATUS_UNPAID && $alreadypaid > 0) {
-				$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+				$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
 			}
 		}
 
@@ -642,7 +641,7 @@ class ChargeSociales extends CommonObject
 
 		$sql = 'SELECT sum(amount) as amount';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$table;
-		$sql .= ' WHERE '.$field.' = '.$this->id;
+		$sql .= " WHERE ".$field." = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index fa95b08faca..9a4b50e3474 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -600,7 +600,7 @@ class PaymentSocialContribution extends CommonObject
 							$result = $acc->add_url_line(
 								$bank_line_id,
 								$socialcontrib->fk_user,
-								DOL_URL_ROOT . '/user/card.php?id=',
+								DOL_URL_ROOT.'/user/card.php?id=',
 								$fuser->getFullName($langs),
 								'user'
 							);
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 1fbfdfa296a..6918b2c84ee 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -47,8 +47,8 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -78,6 +78,8 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'tax', $object->id, 'chargesociales', 'charges');
 
+$permissiontoadd = $user->rights->tax->charges->creer;	// Used by the include of actions_dellink.inc.php
+
 
 /*
  * Actions
@@ -125,9 +127,10 @@ if ($object->id) {
 		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>';
+			$morehtmlref .= ' : '.$proj->getNomUrl(1);
+			if ($proj->title) {
+				$morehtmlref .= ' - '.$proj->title;
+			}
 		} else {
 			$morehtmlref .= '';
 		}
diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php
index eefd667b964..546a4c711d0 100644
--- a/htdocs/compta/sociales/info.php
+++ b/htdocs/compta/sociales/info.php
@@ -94,9 +94,10 @@ if (!empty($conf->projet->enabled)) {
 	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>';
+		$morehtmlref .= ' : '.$proj->getNomUrl(1);
+		if ($proj->title) {
+			$morehtmlref .= ' - '.$proj->title;
+		}
 	} else {
 		$morehtmlref .= '';
 	}
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 578c7650846..8d63e52256e 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -4,8 +4,9 @@
  * 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) 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>
  *
  * This 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,17 +51,29 @@ $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_day_lim		= GETPOST('search_day_lim', 'int');
-$search_month_lim = GETPOST('search_month_lim', 'int');
-$search_year_lim	= GETPOST('search_year_lim', '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);
+$search_date_limit_startday = GETPOST('search_date_limit_startday', 'int');
+$search_date_limit_startmonth = GETPOST('search_date_limit_startmonth', 'int');
+$search_date_limit_startyear = GETPOST('search_date_limit_startyear', 'int');
+$search_date_limit_endday = GETPOST('search_date_limit_endday', 'int');
+$search_date_limit_endmonth = GETPOST('search_date_limit_endmonth', 'int');
+$search_date_limit_endyear = GETPOST('search_date_limit_endyear', 'int');
+$search_date_limit_start = dol_mktime(0, 0, 0, $search_date_limit_startmonth, $search_date_limit_startday, $search_date_limit_startyear);
+$search_date_limit_end = dol_mktime(23, 59, 59, $search_date_limit_endmonth, $search_date_limit_endday, $search_date_limit_endyear);
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
-$search_project = GETPOST('search_project', 'alpha');
 $search_users = GETPOST('search_users');
 $search_type = GETPOST('search_type', 'int');
 $search_account				= GETPOST('search_account', 'int');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield			= GETPOST("sortfield", 'alpha');
+$sortfield			= GETPOST('sortfield', 'aZ09comma');
 $sortorder			= GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
@@ -78,7 +91,6 @@ if (!$sortorder) {
 	$sortorder = "DESC";
 }
 
-$year = GETPOST("year", 'int');
 $filtre = GETPOST("filtre", 'int');
 
 if (!GETPOSTISSET('search_typeid')) {
@@ -146,12 +158,23 @@ if (empty($reshook)) {
 		$search_amount = '';
 		$search_status = '';
 		$search_typeid = '';
-		$year = '';
-		$search_day_lim = '';
-		$search_year_lim = '';
-		$search_month_lim = '';
+		$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_limit_startday = '';
+		$search_date_limit_startmonth = '';
+		$search_date_limit_startyear = '';
+		$search_date_limit_endday = '';
+		$search_date_limit_endmonth = '';
+		$search_date_limit_endyear = '';
+		$search_date_limit_start = '';
+		$search_date_limit_end = '';
 		$search_project_ref = '';
-		$search_project = '';
 		$search_users = '';
 		$search_type = '';
 		$search_account = '';
@@ -175,11 +198,11 @@ if (!empty($conf->projet->enabled)) {
 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,";
+$sql .= " cs.amount, cs.date_ech, cs.libelle as label, cs.paye, cs.periode, cs.fk_account,";
 if (!empty($conf->projet->enabled)) {
 	$sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
 }
-$sql .= " c.libelle as type_label, cs.fk_account,";
+$sql .= " c.libelle as type_label, c.accountancy_code as type_accountancy_code,";
 $sql .= " ba.label as blabel, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.iban_prefix as iban, ba.bic, ba.currency_code, ba.clos,";
 $sql .= " SUM(pc.amount) as alreadypayed, pay.code as payment_code";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
@@ -192,7 +215,7 @@ if (!empty($conf->projet->enabled)) {
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON (cs.fk_user = u.rowid)";
 $sql .= " WHERE cs.fk_type = c.id";
-$sql .= " AND cs.entity = ".$conf->entity;
+$sql .= " AND cs.entity = ".((int) $conf->entity);
 // Search criteria
 if ($search_ref) {
 	$sql .= " AND cs.ref = '".$db->escape($search_ref)."'";
@@ -209,10 +232,10 @@ if (!empty($search_users)) {
 	$sql .= ' AND cs.fk_user IN ('.$db->sanitize(implode(', ', $search_users)).')';
 }
 if (!empty($search_type) && $search_type > 0) {
-	$sql .= ' AND cs.fk_mode_reglement='.$search_type;
+	$sql .= ' AND cs.fk_mode_reglement='.((int) $search_type);
 }
 if (!empty($search_account) && $search_account > 0) {
-	$sql .= ' AND cs.fk_account='.$search_account;
+	$sql .= ' AND cs.fk_account='.((int) $search_account);
 }
 if ($search_amount) {
 	$sql .= natural_search("cs.amount", $search_amount, 1);
@@ -220,20 +243,22 @@ if ($search_amount) {
 if ($search_status != '' && $search_status >= 0) {
 	$sql .= " AND cs.paye = ".((int) $search_status);
 }
-$sql .= dolSqlDateFilter("cs.periode", $search_day_lim, $search_month_lim, $search_year_lim);
-//$sql.= dolSqlDateFilter("cs.periode", 0, 0, $year);
-if ($year > 0) {
-	$sql .= " AND (";
-	// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
-	// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
-	$sql .= "   (cs.periode IS NOT NULL AND date_format(cs.periode, '%Y') = '".$db->escape($year)."') ";
-	$sql .= "OR (cs.periode IS NULL AND date_format(cs.date_ech, '%Y') = '".$db->escape($year)."')";
-	$sql .= ")";
+if ($search_date_start) {
+	$sql .= " AND cs.date_ech >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+	$sql .= " AND cs.date_ech <= '".$db->idate($search_date_end)."'";
+}
+if ($search_date_limit_start) {
+	$sql .= " AND cs.periode >= '".$db->idate($search_date_limit_start)."'";
+}
+if ($search_date_limit_end) {
+	$sql .= " AND cs.periode <= '".$db->idate($search_date_limit_end)."'";
 }
 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, c.libelle, cs.fk_account, ba.label, ba.ref, ba.number, ba.account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.clos, pay.code, u.lastname";
+$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)) {
 	$sql .= ", p.rowid, p.ref, p.title";
 }
@@ -293,8 +318,41 @@ if ($search_account) {
 if ($search_status != '' && $search_status != '-1') {
 	$param .= '&search_status='.urlencode($search_status);
 }
-if ($year) {
-	$param .= '&year='.urlencode($year);
+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_limit_startday) {
+	$param .= '&search_date_limit_startday='.urlencode($search_date_limit_startday);
+}
+if ($search_date_limit_startmonth) {
+	$param .= '&search_date_limit_startmonth='.urlencode($search_date_limit_startmonth);
+}
+if ($search_date_limit_startyear) {
+	$param .= '&search_date_limit_startyear='.urlencode($search_date_limit_startyear);
+}
+if ($search_date_limit_endday) {
+	$param .= '&search_date_limit_endday='.urlencode($search_date_limit_endday);
+}
+if ($search_date_limit_endmonth) {
+	$param .= '&search_date_limit_endmonth='.urlencode($search_date_limit_endmonth);
+}
+if ($search_date_limit_endyear) {
+	$param .= '&search_date_limit_endyear='.urlencode($search_date_limit_endyear);
 }
 
 $newcardbutton = '';
@@ -315,11 +373,6 @@ print '<input type="hidden" name="search_status" value="'.$search_status.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $center = '';
-if ($year) {
-	$center = '<a href="list.php?year='.($year - 1).'">'.img_previous().'</a>';
-	$center .= ' '.$langs->trans("Year").' '.$year;
-	$center .= ' <a href="list.php?year='.($year + 1).'">'.img_next().'</a>';
-}
 
 print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'bill', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -375,25 +428,32 @@ if (!empty($arrayfields['cs.fk_type']['checked'])) {
 
 // Filter: Date (placeholder)
 if (!empty($arrayfields['cs.date_ech']['checked'])) {
-	print '<td class="liste_titre">';
+	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: Period end date
 if (!empty($arrayfields['cs.periode']['checked'])) {
 	print '<td class="liste_titre center">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day_lim" value="'.dol_escape_htmltag($search_day_lim).'">';
-	}
-	print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month_lim" value="'.dol_escape_htmltag($search_month_lim).'">';
-	$formother->select_year($search_year_lim ? $search_year_lim : -1, 'search_year_lim', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_limit_start ? $search_date_limit_start : -1, 'search_date_limit_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_limit_end ? $search_date_limit_end : -1, 'search_date_limit_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	print '</div>';
 	print '</td>';
 }
 
 // Filter: Project ref
 if (!empty($arrayfields['p.ref']['checked'])) {
 	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" size="6" name="search_project_ref" value="'.$search_project_ref.'">';
+	print '<input type="text" class="flat" size="6" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'">';
 	print '</td>';
 }
 
@@ -452,13 +512,13 @@ if (!empty($arrayfields['cs.rowid']['checked'])) {
 	print_liste_field_titre($arrayfields['cs.rowid']['label'], $_SERVER["PHP_SELF"], "cs.rowid", '', $param, '', $sortfield, $sortorder);
 }
 if (!empty($arrayfields['cs.libelle']['checked'])) {
-	print_liste_field_titre($arrayfields['cs.libelle']['label'], $_SERVER["PHP_SELF"], "cs.libelle", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['cs.libelle']['label'], $_SERVER["PHP_SELF"], "cs.libelle,cs.periode", '', $param, '', $sortfield, $sortorder);
 }
 if (!empty($arrayfields['cs.fk_type']['checked'])) {
-	print_liste_field_titre($arrayfields['cs.fk_type']['label'], $_SERVER["PHP_SELF"], "cs.fk_type", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['cs.fk_type']['label'], $_SERVER["PHP_SELF"], "cs.fk_type,cs.periode", '', $param, '', $sortfield, $sortorder);
 }
 if (!empty($arrayfields['cs.date_ech']['checked'])) {
-	print_liste_field_titre($arrayfields['cs.date_ech']['label'], $_SERVER["PHP_SELF"], "cs.date_ech", '', $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre($arrayfields['cs.date_ech']['label'], $_SERVER["PHP_SELF"], "cs.date_ech,cs.periode", '', $param, '', $sortfield, $sortorder, 'center ');
 }
 if (!empty($arrayfields['cs.periode']['checked'])) {
 	print_liste_field_titre($arrayfields['cs.periode']['label'], $_SERVER["PHP_SELF"], "cs.periode", '', $param, '', $sortfield, $sortorder, 'center ');
@@ -467,19 +527,19 @@ 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['cs.fk_user']['checked'])) {
-	print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.lastname", "", $param, 'class="left"', $sortfield, $sortorder);
+	print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.lastname,cs.periode", "", $param, 'class="left"', $sortfield, $sortorder);
 }
 if (!empty($arrayfields['cs.fk_mode_reglement']['checked'])) {
-	print_liste_field_titre($arrayfields['cs.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "cs.fk_mode_reglement", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['cs.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "cs.fk_mode_reglement,cs.periode", '', $param, '', $sortfield, $sortorder);
 }
 if (!empty($arrayfields['cs.fk_account']['checked'])) {
-	print_liste_field_titre($arrayfields['cs.fk_account']['label'], $_SERVER["PHP_SELF"], "cs.fk_account", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['cs.fk_account']['label'], $_SERVER["PHP_SELF"], "cs.fk_account,cs.periode", '', $param, '', $sortfield, $sortorder);
 }
 if (!empty($arrayfields['cs.amount']['checked'])) {
-	print_liste_field_titre($arrayfields['cs.amount']['label'], $_SERVER["PHP_SELF"], "cs.amount", '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['cs.amount']['label'], $_SERVER["PHP_SELF"], "cs.amount,cs.periode", '', $param, 'class="right"', $sortfield, $sortorder);
 }
 if (!empty($arrayfields['cs.paye']['checked'])) {
-	print_liste_field_titre($arrayfields['cs.paye']['label'], $_SERVER["PHP_SELF"], "cs.paye", '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['cs.paye']['label'], $_SERVER["PHP_SELF"], "cs.paye,cs.periode", '', $param, 'class="right"', $sortfield, $sortorder);
 }
 
 // Hook fields
@@ -499,6 +559,7 @@ while ($i < min($num, $limit)) {
 	$chargesociale_static->ref = $obj->rowid;
 	$chargesociale_static->label = $obj->label;
 	$chargesociale_static->type_label = $obj->type_label;
+
 	if (!empty($conf->projet->enabled)) {
 		$projectstatic->id = $obj->project_id;
 		$projectstatic->ref = $obj->project_ref;
@@ -533,7 +594,12 @@ while ($i < min($num, $limit)) {
 
 	// Type
 	if (!empty($arrayfields['cs.fk_type']['checked'])) {
-		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->type_label).'">'.dol_escape_htmltag($obj->type_label).'</td>';
+		$typelabeltoshow = $obj->type_label;
+		$typelabelpopup = $obj->type_label;
+		if (!empty($conf->accounting->enabled)) {
+			$typelabelpopup .= ' - '.$langs->trans("AccountancyCode").': '.$obj->type_accountancy_code;
+		}
+		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($typelabelpopup).'">'.dol_escape_htmltag($typelabeltoshow).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -549,13 +615,7 @@ while ($i < min($num, $limit)) {
 
 	// Date end period
 	if (!empty($arrayfields['cs.periode']['checked'])) {
-		print '<td class="center">';
-		if ($obj->periode) {
-			print '<a href="list.php?search_year_lim='.dol_print_date($db->jdate($obj->periode), "%Y").'">';
-			print dol_print_date($db->jdate($obj->periode), 'day');
-			print '</a>';
-		}
-		print '</td>';
+		print '<td class="center">'.dol_print_date($db->jdate($obj->periode), 'day').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -595,7 +655,9 @@ while ($i < min($num, $limit)) {
 	// Type
 	if (!empty($arrayfields['cs.fk_mode_reglement']['checked'])) {
 		print '<td>';
-		if (!empty($obj->payment_code)) print $langs->trans("PaymentTypeShort".$obj->payment_code);
+		if (!empty($obj->payment_code)) {
+			print $langs->trans("PaymentTypeShort".$obj->payment_code);
+		}
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index b2ee4ffce5e..77230bac407 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -50,8 +50,8 @@ $year = GETPOST("year", 'int');
 $search_sc_type = GETPOST('search_sc_type', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0) {
 	$page = 0;
@@ -135,8 +135,8 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 
-$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 = "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 .= " pct.code as payment_code,";
 $sql .= " u.rowid uid, u.lastname, u.firstname, u.email, u.login, u.admin,";
@@ -231,8 +231,8 @@ print '<tr class="liste_titre">';
 print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pc.rowid", "", $param, '', $sortfield, $sortorder);
 print_liste_field_titre("SocialContribution", $_SERVER["PHP_SELF"], "c.libelle", "", $param, '', $sortfield, $sortorder);
 print_liste_field_titre("TypeContrib", $_SERVER["PHP_SELF"], "cs.fk_type", "", $param, '', $sortfield, $sortorder);
-print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.periode", "", $param, 'width="140px"', $sortfield, $sortorder);
-print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.periode", "", $param, '', $sortfield, $sortorder, 'center ');
+print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, '', $sortfield, $sortorder, 'center ');
 print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.rowid", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
 print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "pc.num_paiement", "", $param, '', $sortfield, $sortorder, '', 'ChequeOrTransferNumber');
@@ -257,26 +257,34 @@ $totalpaye = 0;
 
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
-	print '<tr class="oddeven">';
-	// Ref payment
+
 	$payment_sc_static->id = $obj->pid;
 	$payment_sc_static->ref = $obj->pid;
-	print '<td>'.$payment_sc_static->getNomUrl(1)."</td>\n";
-	// Label
-	print '<td>';
+	$payment_sc_static->date = $db->jdate($obj->datep);
+
 	$socialcontrib->id = $obj->rowid;
-	$socialcontrib->ref = empty($obj->libelle) ? $obj->label : $obj->libelle;
-	$socialcontrib->label = empty($obj->libelle) ? $obj->label : $obj->libelle;
-	print $socialcontrib->getNomUrl(1, '20');
+	$socialcontrib->ref = empty($obj->label_sc) ? $obj->type_label : $obj->label_sc;
+	$socialcontrib->paye = $obj->paye;
+	// $obj->label_sc is label of social contribution (may be empty)
+	// $obj->type_label is label of type of social contribution
+	$socialcontrib->label = empty($obj->label_sc) ? $obj->type_label : $obj->label_sc;
+	$socialcontrib->type_label = $obj->type_label;
+
+	print '<tr class="oddeven">';
+	// Ref payment
+	print '<td class="nowraponall">'.$payment_sc_static->getNomUrl(1)."</td>\n";
+	// Label
+	print '<td class="tdoverflowmax250">';
+	print $socialcontrib->getNomUrl(1, '');
 	print '</td>';
 	// Type
-	print '<td title="'.dol_escape_htmltag($obj->label).'" class="tdmaxoverflow300">'.$obj->label.'</td>';
+	print '<td title="'.dol_escape_htmltag($obj->label).'" class="tdoverflowmax300">'.$obj->label.'</td>';
 	// Date
 	$date = $obj->periode;
 	if (empty($date)) {
 		$date = $obj->date_ech;
 	}
-	print '<td>'.dol_print_date($date, 'day').'</td>';
+	print '<td class="center">'.dol_print_date($date, 'day').'</td>';
 	// Date payment
 	print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
 
diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php
index d65bed019fc..afc56532fdf 100644
--- a/htdocs/compta/stats/byratecountry.php
+++ b/htdocs/compta/stats/byratecountry.php
@@ -306,7 +306,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= " fd.product_type AS product_type,";
 	$sql .= " cc.code, cc.label AS country,";
 	for ($i = 1; $i <= 12; $i++) {
-		$sql .= " SUM(".$db->ifsql('MONTH(f.datef)='.$i, 'fd.total_ht', '0').") AS month".str_pad($i, 2, '0', STR_PAD_LEFT).",";
+		$sql .= " SUM(".$db->ifsql("MONTH(f.datef)=".$i, "fd.total_ht", "0").") AS month".str_pad($i, 2, "0", STR_PAD_LEFT).",";
 	}
 	$sql .= "  SUM(fd.total_ht) as total";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
@@ -325,7 +325,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= " GROUP BY fd.tva_tx,fd.product_type, cc.label, cc.code ";
 	$sql .= " ORDER BY country, product_type, vatrate";
 
-	dol_syslog("htdocs/compta/tva/index.php sql=".$sql, LOG_DEBUG);
+	dol_syslog("htdocs/compta/tva/index.php", LOG_DEBUG);
 	$resql = $db->query($sql);
 	if ($resql) {
 		$num = $db->num_rows($resql);
@@ -393,7 +393,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql2 .= " ffd.product_type AS product_type,";
 	$sql2 .= " cc.code, cc.label AS country,";
 	for ($i = 1; $i <= 12; $i++) {
-		$sql2 .= " SUM(".$db->ifsql('MONTH(ff.datef)='.$i, 'ffd.total_ht', '0').") AS month".str_pad($i, 2, '0', STR_PAD_LEFT).",";
+		$sql2 .= " SUM(".$db->ifsql("MONTH(ff.datef)=".$i, "ffd.total_ht", "0").") AS month".str_pad($i, 2, "0", STR_PAD_LEFT).",";
 	}
 	$sql2 .= "  SUM(ffd.total_ht) as total";
 	$sql2 .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as ffd";
@@ -413,7 +413,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql2 .= " ORDER BY country, product_type, vatrate";
 
 	//print $sql2;
-	dol_syslog("htdocs/compta/tva/index.php sql=".$sql, LOG_DEBUG);
+	dol_syslog("htdocs/compta/tva/index.php", LOG_DEBUG);
 	$resql2 = $db->query($sql2);
 	if ($resql2) {
 		$num = $db->num_rows($resql2);
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
old mode 100755
new mode 100644
index 2f3f4edf83c..317838009c7
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -27,6 +27,9 @@
  */
 
 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.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/paymentvat.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
@@ -40,9 +43,14 @@ if (!empty($conf->accounting->enabled)) {
 $langs->loadLangs(array('compta', 'banks', 'bills'));
 
 $id = GETPOST("id", 'int');
-$action = GETPOST("action", "alpha");
-$cancel = GETPOST('cancel');
-$confirm = GETPOST('confirm');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST("action", "aZ09");
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+
 $refund = GETPOST("refund", "int");
 if (GETPOSTISSET('auto_create_paiement') || $action === 'add') {
 	$auto_create_payment = GETPOST("auto_create_paiement", "int");
@@ -57,15 +65,42 @@ if (empty($refund)) {
 $datev = dol_mktime(12, 0, 0, GETPOST("datevmonth", 'int'), GETPOST("datevday", 'int'), GETPOST("datevyear", 'int'));
 $datep = dol_mktime(12, 0, 0, GETPOST("datepmonth", 'int'), GETPOST("datepday", 'int'), GETPOST("datepyear", 'int'));
 
+// Initialize technical objects
 $object = new Tva($db);
-
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->tax->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('taxvatcard', 'globalcard'));
 
+// 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
 if ($id > 0) {
 	$object->fetch($id);
 }
 
+$permissiontoread = $user->rights->tax->charges->lire;
+$permissiontoadd = $user->rights->tax->charges->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->tax->charges->supprimer || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote = $user->rights->tax->charges->creer; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->tax->charges->creer; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->tax->multidir_output[isset($object->entity) ? $object->entity : 1].'/vat';
+
 // Security check
 $socid = GETPOST('socid', 'int');
 if ($user->socid) {
@@ -74,10 +109,16 @@ if ($user->socid) {
 $result = restrictedArea($user, 'tax', '', 'tva', 'charges');
 
 
-/**
+/*
  * 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 ($cancel && !$id) {
 	header("Location: list.php");
 	exit;
@@ -155,7 +196,8 @@ if ($action == 'add' && !$cancel) {
 	}
 	$object->amount = $amount;
 	$object->label = GETPOST("label", 'alpha');
-	$object->note = GETPOST("note", 'none');
+	$object->note = GETPOST("note", 'restricthtml');
+	$object->note_private = GETPOST("note", 'restricthtml');
 
 	if (empty($object->datep)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DatePayment")), null, 'errors');
@@ -195,7 +237,7 @@ if ($action == 'add' && !$cancel) {
 			$paiement->amounts      = array($object->id=>$amount); // Tableau de montant
 			$paiement->paiementtype = GETPOST("type_payment", 'alphanohtml');
 			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
-			$paiement->note = GETPOST("note", 'none');
+			$paiement->note = GETPOST("note", 'restricthtml');
 
 			if (!$error) {
 				$paymentid = $paiement->create($user, (int) GETPOST('closepaidtva'));
@@ -265,7 +307,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes') {
 }
 
 if ($action == 'update' && !GETPOST("cancel") && $user->rights->tax->charges->creer) {
-	$amount = price2num(GETPOST('amount'));
+	$amount = price2num(GETPOST('amount', 'alpha'), 'MT');
 
 	if (empty($amount)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
@@ -276,7 +318,7 @@ if ($action == 'update' && !GETPOST("cancel") && $user->rights->tax->charges->cr
 	} else {
 		$result = $object->fetch($id);
 
-		$object->amount		= price2num($amount);
+		$object->amount	= $amount;
 
 		$result = $object->update($user);
 		if ($result <= 0) {
@@ -298,8 +340,8 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 	$object->fetch($id);
 
 	if ($object->id > 0) {
-		$object->paye = 0;
 		$object->id = $object->ref = null;
+		$object->paye = 0;
 
 		if (GETPOST('clone_label', 'alphanohtml')) {
 			$object->label = GETPOST('clone_label', 'alphanohtml');
@@ -339,11 +381,12 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
  */
 
 $form = new Form($db);
+$formfile = new FormFile($db);
+$formproject = new FormProjets($db);
 
 $title = $langs->trans("VAT")." - ".$langs->trans("Card");
 $help_url = '';
-
-llxHeader("", $title, $help_url);
+llxHeader('', $title, $help_url);
 
 
 if ($id) {
@@ -359,7 +402,7 @@ if ($action == 'create') {
 	print load_fiche_titre($langs->trans("VAT").' - '.$langs->trans("New"));
 
 	if (!empty($conf->use_javascript_ajax)) {
-		print "\n".'<script type="text/javascript" language="javascript">';
+		print "\n".'<script type="text/javascript">';
 		print /** @lang JavaScript */'
 			$(document).ready(function () {
 				let onAutoCreatePaiementChange = function () {
@@ -493,7 +536,7 @@ if ($action == 'create') {
 }
 
 // View mode
-if ($id) {
+if ($id > 0) {
 	$head = vat_prepare_head($object);
 
 	$totalpaye = $object->getSommePaiement();
@@ -573,7 +616,7 @@ if ($id) {
 	print $langs->trans('PaymentMode');
 	print '</td>';
 	if ($action != 'editmode') {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td>';
@@ -591,7 +634,7 @@ if ($id) {
 		print $langs->trans('BankAccount');
 		print '<td>';
 		if ($action != 'editbankaccount' && $user->rights->tax->charges->creer) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+			print '<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>';
@@ -614,7 +657,6 @@ if ($id) {
 	print '</div>';
 
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 
 	$nbcols = 3;
 	if (!empty($conf->banque->enabled)) {
@@ -664,7 +706,8 @@ if ($id) {
 				$objp = $db->fetch_object($resql);
 
 				print '<tr class="oddeven"><td>';
-				print '<a href="'.DOL_URL_ROOT.'/compta/payment_vat/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"), "payment").' '.$objp->rowid.'</a></td>';
+				print '<a href="'.DOL_URL_ROOT.'/compta/payment_vat/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"), "payment").' '.$objp->rowid.'</a>';
+				print '</td>';
 				print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
 				$labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
 				print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
@@ -717,7 +760,6 @@ if ($id) {
 		dol_print_error($db);
 	}
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
@@ -726,32 +768,30 @@ if ($id) {
 	print dol_get_fiche_end();
 
 	if ($action == 'edit') {
-		print '<div align="center">';
-		print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-		print ' &nbsp; ';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
+		print $form->buttonsSaveCancel();
+
 		print "</form>\n";
 	}
 
-	/*
-	 * Action bar
-	 */
-	print "<div class=\"tabsAction\">\n";
+
+	// Buttons for actions
+
+	print '<div class="tabsAction">'."\n";
+
 	if ($action != 'edit') {
 		// Reopen
 		if ($object->paye && $user->rights->tax->charges->creer) {
-			print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".dol_buildpath("/compta/tva/card.php", 1)."?id=$object->id&amp;action=reopen\">".$langs->trans("ReOpen")."</a></div>";
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/tva/card.php?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen")."</a></div>";
 		}
 
 		// Edit
 		if ($object->paye == 0 && $user->rights->tax->charges->creer) {
-			print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/tva/card.php?id=$object->id&amp;action=edit\">".$langs->trans("Modify")."</a></div>";
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/tva/card.php?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify")."</a></div>";
 		}
 
 		// Emit payment
 		if ($object->paye == 0 && ((price2num($object->amount) < 0 && price2num($resteapayer, 'MT') < 0) || (price2num($object->amount) > 0 && price2num($resteapayer, 'MT') > 0)) && $user->rights->tax->charges->creer) {
-			print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/paiement_vat.php?id=$object->id&amp;action=create\">".$langs->trans("DoPayment")."</a></div>";
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/paiement_vat.php?id='.$object->id.'&action=create&token='.newToken().'">'.$langs->trans("DoPayment").'</a></div>';
 		}
 
 		// Classify 'paid'
@@ -761,21 +801,80 @@ if ($id) {
 			|| (round($resteapayer) >= 0 && $object->amount < 0)
 		)
 		&& $user->rights->tax->charges->creer) {
-			print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/tva/card.php?id=$object->id&amp;action=paid\">".$langs->trans("ClassifyPaid")."</a></div>";
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/tva/card.php?id='.$object->id.'&token='.newToken().'&action=paid">'.$langs->trans("ClassifyPaid")."</a></div>";
 		}
 
 		// Clone
 		if ($user->rights->tax->charges->creer) {
-			print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".dol_buildpath("/compta/tva/card.php", 1)."?id=$object->id&amp;action=clone\">".$langs->trans("ToClone")."</a></div>";
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_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)) {
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
+			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
 		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("DisabledBecausePayments"))).'">'.$langs->trans("Delete").'</a></div>';
 		}
 	}
-	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
+
+		$includedocgeneration = 1;
+
+		// Documents
+		if ($includedocgeneration) {
+			$objref = dol_sanitizeFileName($object->ref);
+			$relativepath = $objref.'/'.$objref.'.pdf';
+			$filedir = $conf->tax->dir_output.'/vat/'.$objref;
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+			//$genallowed = $user->rights->tax->charges->lire; // If you can read, you can build the PDF to read content
+			$genallowed = 0;
+			$delallowed = $user->rights->tax->charges->creer; // If you can create/edit, you can remove a file on card
+			print $formfile->showdocuments('tax-vat', $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('myobject'));
+		//$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+
+		print '</div><div class="fichehalfright">';
+
+		/*
+		$MAXEVENT = 10;
+
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt 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 = 'vat';
+	$defaulttopic = 'InformationMessage';
+	$diroutput = $conf->tax->dir_output;
+	$trackid = 'vat'.$object->id;
+
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
 llxFooter();
diff --git a/htdocs/compta/tva/class/paymentvat.class.php b/htdocs/compta/tva/class/paymentvat.class.php
index bc234b4516e..8eaf141b06c 100644
--- a/htdocs/compta/tva/class/paymentvat.class.php
+++ b/htdocs/compta/tva/class/paymentvat.class.php
@@ -620,7 +620,7 @@ class PaymentVAT extends CommonObject
 	public function update_fk_bank($id_bank)
 	{
         // phpcs:enable
-		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_vat SET fk_bank = ".((int) $id_bank)." WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_vat SET fk_bank = ".((int) $id_bank)." WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
 		$result = $this->db->query($sql);
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 45d3d2e74b4..8628d7d7836 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -247,7 +247,7 @@ class Tva extends CommonObject
 		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."tva SET";
 		$sql .= " paye = 1";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			return 1;
@@ -267,7 +267,7 @@ class Tva extends CommonObject
 		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."tva SET";
 		$sql .= " paye = 0";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			return 1;
@@ -596,7 +596,7 @@ class Tva extends CommonObject
 		}
 		$sql .= ", '".$this->db->escape($user->id)."'";
 		$sql .= ", NULL";
-		$sql .= ", ".$conf->entity;
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::addPayment", LOG_DEBUG);
@@ -768,7 +768,7 @@ class Tva extends CommonObject
 
 		$sql = 'SELECT sum(amount) as amount';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$table;
-		$sql .= ' WHERE '.$field.' = '.$this->id;
+		$sql .= " WHERE ".$field." = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -866,15 +866,15 @@ class Tva extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('BillStatusNotPaid');
-			$this->labelStatus[self::STATUS_PAID] = $langs->trans('BillStatusPaid');
+			$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('BillStatusNotPaid');
+			$this->labelStatus[self::STATUS_PAID] = $langs->transnoentitiesnoconv('BillStatusPaid');
 			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) {
-				$this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+				$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
 			}
-			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('BillStatusNotPaid');
-			$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('BillStatusPaid');
+			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('BillStatusNotPaid');
+			$this->labelStatusShort[self::STATUS_PAID] = $langs->transnoentitiesnoconv('BillStatusPaid');
 			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) {
-				$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+				$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
 			}
 		}
 
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index e2f0dcec96d..a0573cf2812 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -48,8 +48,8 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -79,6 +79,8 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'tax', '', 'tva', 'charges');
 
+$permissiontoadd = $user->rights->tax->charges->creer;	// Used by the include of actions_dellink.inc.php
+
 
 /*
  * Actions
@@ -86,7 +88,7 @@ $result = restrictedArea($user, 'tax', '', 'tva', 'charges');
 
 include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
-if ($action == 'setlib' && $user->rights->tax->charges->creer) {
+if ($action == 'setlib' && $permissiontoadd) {
 	$object->fetch($id);
 	$result = $object->setValueFrom('label', GETPOST('lib', 'alpha'), '', '', 'text', '', $user, 'TAX_MODIFY');
 	if ($result < 0) {
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index e1ac3f96a2d..fed0cf209c1 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -514,7 +514,7 @@ if ($refresh === true) {
 	print '</table>';
 
 
-	print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+	print '</div><div class="fichetwothirdright">';
 
 
 	/*
@@ -544,7 +544,7 @@ if ($refresh === true) {
 
 	pt($db, $sql, $langs->trans("Month"));
 
-	print '</div></div>';
+	print '</div>';
 }
 
 llxFooter();
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 1dc0180bd60..f1731420852 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -56,8 +56,8 @@ $search_amount 				= GETPOST('search_amount', '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');
+$sortfield					= GETPOST('sortfield', 'aZ09comma');
+$sortorder					= GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
 
 if (empty($page) || $page == -1) {
@@ -161,16 +161,16 @@ if (!empty($search_label)) {
 	$sql .= natural_search('t.label', $search_label);
 }
 if (!empty($search_dateend_start)) {
-	$sql .= ' AND t.datev >= "'.$db->idate($search_dateend_start).'"';
+	$sql .= " AND t.datev >= '".$db->idate($search_dateend_start)."'";
 }
 if (!empty($search_dateend_end)) {
-	$sql .= ' AND t.datev <= "'.$db->idate($search_dateend_end).'"';
+	$sql .= " AND t.datev <= '".$db->idate($search_dateend_end)."'";
 }
 if (!empty($search_datepayment_start)) {
-	$sql .= ' AND t.datep >= "'.$db->idate($search_datepayment_start).'"';
+	$sql .= " AND t.datep >= '".$db->idate($search_datepayment_start)."'";
 }
 if (!empty($search_datepayment_end)) {
-	$sql .= ' AND t.datep <= "'.$db->idate($search_datepayment_end).'"';
+	$sql .= " AND t.datep <= '".$db->idate($search_datepayment_end)."'";
 }
 if (!empty($search_type) && $search_type > 0) {
 	$sql .= ' AND t.fk_typepayment = '.((int) $search_type);
diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
index 57e70e70a3d..cf91df3a775 100644
--- a/htdocs/compta/tva/payments.php
+++ b/htdocs/compta/tva/payments.php
@@ -46,8 +46,8 @@ if (!$year && $mode != 'tvaonly') {
 }
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -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');
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index 4b44959bc1a..15c45d6055b 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2014       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Eric Seigne             <eric.seigne@cap-rel.fr>
- * Copyright (C) 2021       Open-Dsi                <support@open-dsi.fr>
+ * 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
@@ -47,7 +47,7 @@ $langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "produ
 
 $refresh = (GETPOSTISSET('submit') || GETPOSTISSET('vat_rate_show') || GETPOSTISSET('invoice_type')) ? true : false;
 $invoice_type = GETPOSTISSET('invoice_type') ? GETPOST('invoice_type', 'alpha') : '';
-$vat_rate_show = GETPOSTISSET('vat_rate_show') ? GETPOST('vat_rate_show', 'int') : -1;
+$vat_rate_show = GETPOSTISSET('vat_rate_show') ? GETPOST('vat_rate_show', 'alphanohtml') : -1;
 
 include DOL_DOCUMENT_ROOT.'/compta/tva/initdatesforvat.inc.php';
 
@@ -409,7 +409,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
 			print '<td class="tax_rate" colspan="' . ($span+1) . '">';
 			print $langs->trans('Rate') . ' : ' . vatrate($rate) . '%';
 			print ' - <a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?invoice_type=customer';
-			if (!GETPOSTISSET('vat_rate_show') || GETPOST('vat_rate_show') != $rate) {
+			if ($invoice_type != 'customer' || !GETPOSTISSET('vat_rate_show') || GETPOST('vat_rate_show') != $rate) {
 				print '&amp;vat_rate_show='.urlencode($rate);
 			}
 			print '&amp;date_startyear='.urlencode($date_start_year).'&amp;date_startmonth='.urlencode($date_start_month).'&amp;date_startday='.urlencode($date_start_day).'&amp;date_endyear='.urlencode($date_end_year).'&amp;date_endmonth='.urlencode($date_end_month).'&amp;date_endday='.urlencode($date_end_day).'">' . img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . '</a>';
@@ -643,7 +643,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
 			print '<td class="tax_rate" colspan="' . ($span+1) . '">';
 			print $langs->trans('Rate') . ' : ' . vatrate($rate) . '%';
 			print ' - <a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?invoice_type=supplier';
-			if (!GETPOSTISSET('vat_rate_show') || GETPOST('vat_rate_show') != $rate) {
+			if ($invoice_type != 'supplier' || !GETPOSTISSET('vat_rate_show') || GETPOST('vat_rate_show') != $rate) {
 				print '&amp;vat_rate_show='.urlencode($rate);
 			}
 			print '&amp;date_startyear='.urlencode($date_start_year).'&amp;date_startmonth='.urlencode($date_start_month).'&amp;date_startday='.urlencode($date_start_day).'&amp;date_endyear='.urlencode($date_end_year).'&amp;date_endmonth='.urlencode($date_end_month).'&amp;date_endday='.urlencode($date_end_day).'">' . img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . '</a>';
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index fba3e1004f4..6bf2873b50c 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -151,6 +151,15 @@ $dolibarr_main_db_character_set='utf8';
 $dolibarr_main_db_collation='utf8_unicode_ci';
 
 
+// dolibarr_main_db_readonly
+// Set this to 1 to have the application working in readonly mode. All sql access INSERT/UPDATE/DELETE/CREATE/ALTER/TRUNCATE/DROP will be disabled. 
+// Default value: 0
+// Examples:
+// $dolibarr_main_db_readonly='0';
+//
+$dolibarr_main_db_readonly=0;
+
+
 // dolibarr_main_instance_unique_id
 // An secret ID that is unique for each installation.
 // This value is also visible and never propagated outside of Dolibarr, so it can be used as a salt / key for some encryption.
@@ -273,18 +282,21 @@ $dolibarr_nocsrfcheck='0';
 // If set to 1, you will be able to define some command line in the internale Job scheduler module.
 // Default value: '0'
 // Examples: '1'
+//
 $dolibarr_cron_allow_cli='0';
 
 // dolibarr_mailing_limit_sendbyweb
-// Can set a limit for mailing send by web. This overwrite database value. Can be used to restrict on OS level.
+// Can set a limit for mailing send by web. This overwrite database value. Can be used to restrict on system level.
 // Default value: '25'
 // Examples: '-1' (sending by web is forbidden)
+//
 // $dolibarr_mailing_limit_sendbyweb='25';
 
 // dolibarr_mailing_limit_sendbycli
-// Can set a limit for mailing send by cli. This overwrite database value. Can be used to restrict on OS level.
+// Can set a limit for mailing send by cli. This overwrite database value. Can be used to restrict on system level.
 // Default value: '0' (no hard limit, use soft database value if exists)
 // Examples: '-1' (sending by cli is forbidden)
+//
 // $dolibarr_mailing_limit_sendbycli='0';
 
 // MAIN_ANTIVIRUS_COMMAND (as a constant)
@@ -299,6 +311,17 @@ $dolibarr_cron_allow_cli='0';
 // Example: '--fdpass';
 // define('MAIN_ANTIVIRUS_PARAM', '--fdpass');
 
+// php_session_save_handler
+// Try to use the Dolibarr internal session handler that uses a database instead of the PHP handler (experimental).
+// If you enable this feature to 'db', you may also want to enable the following constants:
+//  $dolibarr_session_db_type, $dolibarr_session_db_host, $dolibarr_session_db_user, $dolibarr_session_db_pass
+//  $dolibarr_session_db_pass, $dolibarr_session_db_name, $dolibarr_session_db_type = $dolibarr_main_db_port
+// Default value: ''
+// Example: 'db';
+//
+// $php_session_save_handler='';
+
+
 
 //##################
 // Other
@@ -322,6 +345,12 @@ $dolibarr_cron_allow_cli='0';
 // Examples:
 // $dolibarr_strict_mode=0;
 
+// dolibarr_allow_download_external_modules
+// Provide a link to download the zip of an external modules installed into custom directory from the web admin.
+// Default value: 0
+// Examples:
+// $dolibarr_allow_download_external_modules=0;
+
 
 
 //#################################
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 293c4f11aa3..0eed6ba6219 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -88,8 +88,8 @@ if ($user->socid) {
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -212,7 +212,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		$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)) {
 			$objsoc = new Societe($db);
 			$objsoc->fetch($object->socid);
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index f63f25b2a18..195a4d028f4 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -105,7 +105,7 @@ abstract class ActionsContactCardCommon
 
 		if ($action == 'create' || $action == 'edit') {
 			if ($conf->use_javascript_ajax) {
-				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
+				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript">
 				jQuery(document).ready(function () {
 						jQuery("#selectcountry_id").change(function() {
 							document.formsoc.action.value="'.$action.'";
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
index cceb6310dc2..bc8ff9ebcf4 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
@@ -30,8 +30,6 @@ print load_fiche_titre($this->control->tpl['title']);
 
 dol_htmloutput_errors((is_numeric($object->error) ? '' : $object->error), $object->errors);
 
-dol_htmloutput_errors((is_numeric($GLOBALS['error']) ? '' : $GLOBALS['error']), $GLOBALS['errors']);
-
 dol_htmloutput_errors($this->control->tpl['error'], $this->control->tpl['errors']);
 
 echo $this->control->tpl['ajax_selectcountry']; ?>
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
index c624eca4026..adf5bb722d3 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
@@ -139,15 +139,15 @@ if (!empty($this->control->tpl['action_delete'])) {
 if (empty($user->socid)) {
 	print '<div class="tabsAction">';
 	if ($user->rights->societe->contact->creer) {
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=edit&amp;canvas='.$canvas.'">'.$langs->trans('Modify').'</a>';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&action=edit&token='.newToken().'&canvas='.$canvas.'">'.$langs->trans('Modify').'</a>';
 	}
 
 	if (!$this->control->tpl['user_id'] && $user->rights->user->user->creer) {
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=create_user&amp;canvas='.$canvas.'">'.$langs->trans("CreateDolibarrLogin").'</a>';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&action=create_user&token='.newToken().'&canvas='.$canvas.'">'.$langs->trans("CreateDolibarrLogin").'</a>';
 	}
 
 	if ($user->rights->societe->contact->supprimer) {
-		print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=delete&amp;token='.newToken().'&amp;canvas='.$canvas.'">'.$langs->trans('Delete').'</a>';
+		print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&action=delete&token='.newToken().'&canvas='.$canvas.'">'.$langs->trans('Delete').'</a>';
 	}
 
 	print '</div><br>';
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index bd2150b850d..bd0d694eb57 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -111,10 +111,27 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
-	// Cancel
-	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
-		header("Location: ".$backtopage);
-		exit;
+	$backurlforlist = DOL_URL_ROOT.'/contact/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.'/contact/card.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 = '';
 	}
 
 	// Creation utilisateur depuis contact
@@ -279,7 +296,7 @@ if (empty($reshook)) {
 		if (empty($error) && $id > 0) {
 			$db->commit();
 			if (!empty($backtopage)) {
-				$url = $backtopage;
+				$url = str_replace('__ID__', $id, $backtopage);
 			} else {
 				$url = 'card.php?id='.$id;
 			}
@@ -515,6 +532,8 @@ if (empty($reshook)) {
  *	View
  */
 
+$form = new Form($db);
+$formcompany = new FormCompany($db);
 
 $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
@@ -523,13 +542,10 @@ if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contactnameonly/', $c
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
-$form = new Form($db);
-$formcompany = new FormCompany($db);
-
 $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
+$objsoc = new Societe($db);
 if ($socid > 0) {
-	$objsoc = new Societe($db);
 	$objsoc->fetch($socid);
 }
 
@@ -603,7 +619,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			dol_htmloutput_errors(is_numeric($error) ? '' : $error, $errors);
 
 			if ($conf->use_javascript_ajax) {
-				print "\n".'<script type="text/javascript" language="javascript">'."\n";
+				print "\n".'<script type="text/javascript">'."\n";
 				print 'jQuery(document).ready(function () {
 							jQuery("#selectcountry_id").change(function() {
 								document.formsoc.action.value="create";
@@ -678,7 +694,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Address
-			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->address)) == 0) {
+			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->address)) == 0) {
 				$object->address = $objsoc->address; // Predefined with third party
 			}
 			print '<tr><td><label for="address">'.$langs->trans("Address").'</label></td>';
@@ -697,10 +713,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</tr>';
 
 			// Zip / Town
-			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->zip)) == 0) {
+			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->zip)) == 0) {
 				$object->zip = $objsoc->zip; // Predefined with third party
 			}
-			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->town)) == 0) {
+			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->town)) == 0) {
 				$object->town = $objsoc->town; // Predefined with third party
 			}
 			print '<tr><td><label for="zipcode">'.$langs->trans("Zip").'</label> / <label for="town">'.$langs->trans("Town").'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
@@ -734,10 +750,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</td></tr>';
 			}
 
-			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->phone_pro)) == 0) {
+			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->phone_pro)) == 0) {
 				$object->phone_pro = $objsoc->phone; // Predefined with third party
 			}
-			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->fax)) == 0) {
+			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->fax)) == 0) {
 				$object->fax = $objsoc->fax; // Predefined with third party
 			}
 
@@ -767,7 +783,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<input type="text" name="fax" id="fax" class="maxwidth200" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td>';
 			print '</tr>';
 
-			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->email)) == 0) {
+			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->email)) == 0) {
 				$object->email = $objsoc->email; // Predefined with third party
 			}
 
@@ -781,7 +797,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Unsubscribe
 			if (!empty($conf->mailing->enabled)) {
 				if ($conf->use_javascript_ajax && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2) {
-					print "\n".'<script type="text/javascript" language="javascript">'."\n";
+					print "\n".'<script type="text/javascript">'."\n";
 					print '$(document).ready(function () {
 							$("#email").keyup(function() {
 								if ($(this).val()!="") {
@@ -873,7 +889,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</td>';
 
 			print '<td><label for="birthday_alert">'.$langs->trans("Alert").'</label>: ';
-			if ($object->birthday_alert) {
+			if (!empty($object->birthday_alert)) {
 				print '<input type="checkbox" name="birthday_alert" id="birthday_alert" checked>';
 			} else {
 				print '<input type="checkbox" name="birthday_alert" id="birthday_alert">';
@@ -885,16 +901,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			print dol_get_fiche_end();
 
-			print '<div class="center">';
-			print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
-			if (!empty($backtopage)) {
-				print ' &nbsp; &nbsp; ';
-				print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-			} else {
-				print ' &nbsp; &nbsp; ';
-				print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-			}
-			print '</div>';
+			print $form->buttonsSaveCancel("Add");
 
 			print "</form>";
 		} elseif ($action == 'edit' && !empty($id)) {
@@ -916,7 +923,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			dol_htmloutput_errors(is_numeric($error) ? '' : $error, $errors);
 
 			if ($conf->use_javascript_ajax) {
-				print "\n".'<script type="text/javascript" language="javascript">'."\n";
+				print "\n".'<script type="text/javascript">'."\n";
 				print 'jQuery(document).ready(function () {
 							jQuery("#selectcountry_id").change(function() {
 								document.formsoc.action.value="edit";
@@ -1063,7 +1070,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Unsubscribe
 			if (!empty($conf->mailing->enabled)) {
 				if ($conf->use_javascript_ajax && isset($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2) {
-					print "\n".'<script type="text/javascript" language="javascript">'."\n";
+					print "\n".'<script type="text/javascript">'."\n";
 
 					print '
 					jQuery(document).ready(function () {
@@ -1224,11 +1231,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			print dol_get_fiche_end();
 
-			print '<div class="center">';
-			print '<input type="submit" class="button button-save" name="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 $form->buttonsSaveCancel();
 
 			print "</form>";
 		}
@@ -1280,7 +1283,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		$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)) {
 			$objsoc->fetch($object->socid);
 			// Thirdparty
@@ -1354,7 +1361,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print $langs->trans('ProspectLevel');
 				print '<td>';
 				if ($action != 'editlevel' && $user->rights->societe->contact->creer) {
-					print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;id='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
+					print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editlevel&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
 				}
 				print '</tr></table>';
 				print '</td><td>';
@@ -1377,7 +1384,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						$titlealt = $val['label'];
 					}
 					if ($object->stcomm_id != $val['id']) {
-						print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm&token='.newToken().'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
+						print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&stcomm='.urlencode($val['code']).'&action=setstcomm&token='.newToken().'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
 					}
 				}
 				print '</div></td></tr>';
@@ -1387,10 +1394,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 		}
 
-		print '<div class="fichehalfright"><div class="ficheaddleft">';
+		print '<div class="fichehalfright">';
 
 		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border tableforfield" width="100%">';
+		print '<table class="border tableforfield centpercent">';
 
 		// Categories
 		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
@@ -1458,17 +1465,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 		print '</td></tr>';
 
-		print '<tr><td>';
-		print $langs->trans("VCard").'</td><td colspan="3">';
-		print '<a href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$object->id.'">';
-		print img_picto($langs->trans("Download"), 'vcard.png', 'class="paddingrightonly"');
-		print $langs->trans("Download");
-		print '</a>';
-		print '</td></tr>';
-
 		print "</table>";
 
-		print '</div></div></div>';
+		print '</div></div>';
 		print '<div style="clear:both"></div>';
 
 		print dol_get_fiche_end();
@@ -1492,11 +1491,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			if ($user->rights->societe->contact->creer) {
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit">'.$langs->trans('Modify').'</a>';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&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">'.$langs->trans("CreateDolibarrLogin").'</a>';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create_user&token='.newToken().'">'.$langs->trans("CreateDolibarrLogin").'</a>';
 			}
 
 			// Activer
@@ -1524,7 +1523,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if ($action != 'presend') {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 
-			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+			print '</div><div class="fichehalfright">';
 
 			$MAXEVENT = 10;
 
@@ -1535,7 +1534,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'contact', $object->socid, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for thirdparty
 
-			print '</div></div></div>';
+			print '</div></div>';
 		}
 
 		// Presend form
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index db99a8203bc..bb3f2ae035d 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -383,14 +383,14 @@ class Contact extends CommonObject
 
 		$sql = "SELECT count(sp.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql .= " WHERE sp.fk_soc = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
 		}
-		$sql .= ' '.$clause.' sp.entity IN ('.getEntity($this->element).')';
-		$sql .= " AND (sp.priv='0' OR (sp.priv='1' AND sp.fk_user_creat=".((int) $user->id)."))";
+		$sql .= " ".$clause." sp.entity IN (".getEntity($this->element).")";
+		$sql .= " AND (sp.priv='0' OR (sp.priv='1' AND sp.fk_user_creat = ".((int) $user->id)."))";
 		if ($user->socid > 0) {
 			$sql .= " AND sp.fk_soc = ".((int) $user->socid);
 		}
@@ -596,7 +596,7 @@ class Contact extends CommonObject
 		$sql .= ", fk_user_modif=".($user->id > 0 ? "'".$this->db->escape($user->id)."'" : "NULL");
 		$sql .= ", default_lang=".($this->default_lang ? "'".$this->db->escape($this->default_lang)."'" : "NULL");
 		$sql .= ", entity = ".((int) $this->entity);
-		$sql .= " WHERE rowid=".((int) $id);
+		$sql .= " WHERE rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -872,12 +872,12 @@ class Contact extends CommonObject
 
 		// Mis a jour contact
 		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET";
-		$sql .= " birthday=".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null");
+		$sql .= " birthday = ".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null");
 		$sql .= ", photo = ".($this->photo ? "'".$this->db->escape($this->photo)."'" : "null");
 		if ($user) {
-			$sql .= ", fk_user_modif=".$user->id;
+			$sql .= ", fk_user_modif = ".((int) $user->id);
 		}
-		$sql .= " WHERE rowid=".$this->db->escape($id);
+		$sql .= " WHERE rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::update_perso this->birthday=".$this->birthday." -", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1280,7 +1280,7 @@ class Contact extends CommonObject
 
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople";
-			$sql .= " WHERE rowid=".((int) $this->id);
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$result = $this->db->query($sql);
 			if (!$result) {
@@ -1389,24 +1389,25 @@ class Contact extends CommonObject
 	 *  Return name of contact with link (and eventually picto)
 	 *	Use $this->id, $this->lastname, $this->firstname, this->civility_id
 	 *
-	 *	@param		int			$withpicto					Include picto with link
+	 *	@param		int			$withpicto					Include picto with link (1=picto + name, 2=picto only, -1=photo+name, -2=photo only)
 	 *	@param		string		$option						Where the link point to
 	 *	@param		int			$maxlen						Max length of
 	 *  @param		string		$moreparam					Add more param into URL
 	 *  @param      int     	$save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@param		int			$notooltip					1=Disable tooltip
+	 *  @param  	string  	$morecss            		Add more css on link
 	 *	@return		string									String with URL
 	 */
-	public function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $moreparam = '', $save_lastsearch_value = -1, $notooltip = 0)
+	public function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $moreparam = '', $save_lastsearch_value = -1, $notooltip = 0, $morecss = '')
 	{
 		global $conf, $langs, $hookmanager;
 
 		$result = ''; $label = '';
-
 		if (!empty($this->photo) && class_exists('Form')) {
-			$label .= '<div class="photointooltip">';
-			$label .= Form::showphoto('contact', $this, 0, 40, 0, '', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
-			$label .= '</div><div style="clear: both;"></div>';
+			$label .= '<div class="photointooltip floatright">';
+			$label .= Form::showphoto('contact', $this, 0, 40, 0, 'photoref', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
+			$label .= '</div>';
+			//$label .= '<div style="clear: both;"></div>';
 		}
 
 		$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Contact").'</u>';
@@ -1453,7 +1454,7 @@ class Contact extends CommonObject
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose .= ' class="classfortooltip"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
 			/*
 				$hookmanager->initHooks(array('contactdao'));
@@ -1474,14 +1475,14 @@ class Contact extends CommonObject
 
 		$result .= $linkstart;
 		if ($withpicto) {
-			if ($withpicto == -2) {
-				$result .= '<!-- picto photo user --><span class="nopadding userimg'.($moreparam ? ' '.$moreparam : '').'">'.Form::showphoto('contact', $this, 0, 0, 0, 'userphoto'.($withpicto == -3 ? 'small' : ''), 'mini', 0, 1).'</span>';
+			if ($withpicto < 0) {
+				$result .= '<!-- picto photo user --><span class="nopadding userimg'.($morecss ? ' '.$morecss : '').'">'.Form::showphoto('contact', $this, 0, 0, 0, 'userphoto'.($withpicto == -3 ? 'small' : ''), 'mini', 0, 1).'</span>';
 			} 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 && $withpicto != -2) {
-			$result .= ($maxlen ?dol_trunc($this->getFullName($langs), $maxlen) : $this->getFullName($langs));
+			$result .= '<span class="valigmiddle">'.($maxlen ? dol_trunc($this->getFullName($langs), $maxlen) : $this->getFullName($langs)).'</span>';
 		}
 		$result .= $linkend;
 
@@ -1558,8 +1559,8 @@ class Contact extends CommonObject
 			$statusType = 'status5';
 		}
 
-		$label = $langs->trans($labelStatus[$status]);
-		$labelshort = $langs->trans($labelStatusShort[$status]);
+		$label = $langs->transnoentitiesnoconv($labelStatus[$status]);
+		$labelshort = $langs->transnoentitiesnoconv($labelStatusShort[$status]);
 
 		return dolGetStatus($label, $labelshort, '', $statusType, $mode);
 	}
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 974bfb15e77..631bf932640 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -20,7 +20,7 @@
  */
 
 /**
- *	\file       htdocs/societe/consumption.php
+ *	\file       htdocs/contact/consumption.php
  *  \ingroup    societe
  *	\brief      Add a tab on thirpdarty view to list all products/services bought or sells by thirdparty
  */
@@ -32,10 +32,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
-// Security check
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+
 $id = GETPOST('id', 'int');
 
-$result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
 $object = new Contact($db);
 if ($id > 0) {
 	$object->fetch($id);
@@ -47,8 +47,8 @@ $socid = $object->thirdparty->id;
 
 // Sort & Order fields
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -86,6 +86,8 @@ $langs->loadLangs(array("companies", "bills", "orders", "suppliers", "propal", "
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('consumptioncontact'));
 
+$result = restrictedArea($user, 'contact', $object->id, 'socpeople&societe');
+
 
 /*
  * Actions
@@ -120,7 +122,11 @@ print dol_get_fiche_head($head, 'consumption', $langs->trans("ContactsAddresses"
 
 $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)) {
 	$objsoc->fetch($socid);
 	// Thirdparty
@@ -196,7 +202,7 @@ if ($type_element == 'fichinter') { 	// Customer : show products from invoices
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, tc.libelle as type_contact_label, ';
 	$tables_from = MAIN_DB_PREFIX.'fichinterdet d';
 	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinter as f ON d.fk_fichinter=f.rowid';
-	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople = '.((int) $object->id);
 	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='fichinter' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE f.entity IN ('.getEntity('ficheinter').')';
 	$dateprint = 'f.datec';
@@ -208,7 +214,7 @@ if ($type_element == 'fichinter') { 	// Customer : show products from invoices
 	$tables_from = MAIN_DB_PREFIX.'facturedet d';
 	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture as f ON d.fk_facture=f.rowid';
 	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople = '.((int) $object->id);
 	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='facture' and tc.source='external' and tc.active=1)";
 	$where = " WHERE f.entity IN (".getEntity('invoice').")";
 	$dateprint = 'f.datef';
@@ -221,7 +227,7 @@ if ($type_element == 'fichinter') { 	// Customer : show products from invoices
 	$tables_from = MAIN_DB_PREFIX.'propaldet d';
 	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'propal as c ON d.fk_propal=c.rowid';
 	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'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';
@@ -234,7 +240,7 @@ if ($type_element == 'fichinter') { 	// Customer : show products from invoices
 	$tables_from = MAIN_DB_PREFIX.'commandedet d';
 	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande as c ON d.fk_commande=c.rowid';
 	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'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='commande' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE c.entity IN ('.getEntity('order').')';
 	$dateprint = 'c.date_commande';
@@ -247,7 +253,7 @@ if ($type_element == 'fichinter') { 	// Customer : show products from invoices
 	$tables_from = MAIN_DB_PREFIX.'facture_fourn_det d';
 	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn as f ON d.fk_facture_fourn=f.rowid';
 	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople = '.((int) $object->id);
 	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='invoice_supplier' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE f.entity IN ('.getEntity($documentstatic->element).')';
 	$dateprint = 'f.datef';
@@ -272,7 +278,7 @@ if ($type_element == 'fichinter') { 	// Customer : show products from invoices
 	$tables_from = MAIN_DB_PREFIX.'commande_fournisseurdet d';
 	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseur as c ON d.fk_commande=c.rowid';
 	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'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='order_supplier' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE c.entity IN ('.getEntity($documentstatic->element).')';
 	$dateprint = 'c.date_valid';
@@ -286,7 +292,7 @@ if ($type_element == 'fichinter') { 	// Customer : show products from invoices
 	$tables_from = MAIN_DB_PREFIX.'contratdet d';
 	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'contrat as c ON d.fk_contrat=c.rowid';
 	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
+	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'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='contrat' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE c.entity IN ('.getEntity('contrat').')';
 	$dateprint = 'c.date_valid';
@@ -645,7 +651,7 @@ if ($sql_select) {
 	print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
 	print "</tr>\n";
 
-	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
+	print '<tr class="oddeven"><td colspan="5"><span class="opacitymedium">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</span></td></tr>';
 
 	print "</table>";
 } else {
@@ -653,7 +659,7 @@ if ($sql_select) {
 
 	print '<table class="liste centpercent">'."\n";
 
-	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+	print '<tr class="oddeven"><td colspan="5"><span class="opacitymedium">'.$langs->trans("FeatureNotYetAvailable").'</span></td></tr>';
 
 	print "</table>";
 }
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 3005c6b7827..3fac8adea15 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -49,16 +49,10 @@ if (!empty($canvas)) {
 	$objcanvas->getCanvas('contact', 'contactcard', $canvas);
 }
 
-// Security check
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
-
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -91,6 +85,15 @@ $modulepart = 'contact';
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('contactdocument'));
 
+// Security check
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
+
+$permissiontoadd = $user->rights->societe->contact->creer;	// Used by the include of actions_dellink.inc.php
+
+
 /*
  * Actions
  */
@@ -127,7 +130,11 @@ if ($object->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)) {
 		$objsoc = new Societe($db);
 		$objsoc->fetch($object->socid);
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 6677a7b17d7..d7ddd520ac0 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2006-2010	Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2006-2017	Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2006-2021	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
@@ -114,15 +114,15 @@ print $object->getCivilityLabel();
 print '</td></tr>';
 
 // LDAP DN
-print '<tr><td>LDAP '.$langs->trans("LDAPContactDn").'</td><td class="valeur" colspan="3">'.$conf->global->LDAP_CONTACT_DN."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPContactDn").'</td><td class="valeur" colspan="3">'.getDolGlobalString('LDAP_CONTACT_DN')."</td></tr>\n";
 
 // LDAP Cle
-print '<tr><td>LDAP '.$langs->trans("LDAPNamingAttribute").'</td><td class="valeur" colspan="3">'.$conf->global->LDAP_KEY_CONTACTS."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPNamingAttribute").'</td><td class="valeur" colspan="3">'.getDolGlobalString('LDAP_KEY_CONTACTS')."</td></tr>\n";
 
 // LDAP Server
-print '<tr><td>LDAP '.$langs->trans("LDAPPrimaryServer").'</td><td class="valeur" colspan="3">'.$conf->global->LDAP_SERVER_HOST."</td></tr>\n";
-print '<tr><td>LDAP '.$langs->trans("LDAPSecondaryServer").'</td><td class="valeur" colspan="3">'.$conf->global->LDAP_SERVER_HOST_SLAVE."</td></tr>\n";
-print '<tr><td>LDAP '.$langs->trans("LDAPServerPort").'</td><td class="valeur" colspan="3">'.$conf->global->LDAP_SERVER_PORT."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPPrimaryServer").'</td><td class="valeur" colspan="3">'.getDolGlobalString('LDAP_SERVER_HOST')."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPSecondaryServer").'</td><td class="valeur" colspan="3">'.getDolGlobalString('LDAP_SERVER_HOST_SLAVE')."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPServerPort").'</td><td class="valeur" colspan="3">'.getDolGlobalString('LDAP_SERVER_PORT')."</td></tr>\n";
 
 print '</table>';
 
@@ -136,13 +136,13 @@ print dol_get_fiche_end();
  */
 print '<div class="tabsAction">';
 
-if (!empty($conf->global->LDAP_CONTACT_ACTIVE) && $conf->global->LDAP_CONTACT_ACTIVE != 'ldap2dolibarr') {
+if (!empty($conf->global->LDAP_CONTACT_ACTIVE) && getDolGlobalInt('LDAP_CONTACT_ACTIVE') != Ldap::SYNCHRO_LDAP_TO_DOLIBARR) {
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
 }
 
 print "</div>\n";
 
-if (!empty($conf->global->LDAP_CONTACT_ACTIVE) && $conf->global->LDAP_CONTACT_ACTIVE != 'ldap2dolibarr') {
+if (!empty($conf->global->LDAP_CONTACT_ACTIVE) && getDolGlobalInt('LDAP_CONTACT_ACTIVE') != Ldap::SYNCHRO_LDAP_TO_DOLIBARR) {
 	print "<br>\n";
 }
 
@@ -173,16 +173,15 @@ if ($result > 0) {
 	// Show tree
 	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
 		if (!is_array($records)) {
-			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
+			print '<tr class="oddeven"><td colspan="2"><span class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</span></td></tr>';
 		} else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
 		}
 	} else {
-		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
+		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.dol_escape_htmltag($dn).' - search='.dol_escape_htmltag($search).')</td></tr>';
 	}
 
 	$ldap->unbind();
-	$ldap->close();
 } else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index fd61f16dd0c..66561730829 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -93,6 +93,7 @@ $search_categ_thirdparty = GETPOST("search_categ_thirdparty", 'int');
 $search_categ_supplier = GETPOST("search_categ_supplier", 'int');
 $search_status = GETPOST("search_status", 'int');
 $search_type = GETPOST('search_type', 'alpha');
+$search_address = GETPOST('search_address', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_import_key = GETPOST("search_import_key", "alpha");
@@ -273,6 +274,7 @@ if (empty($reshook)) {
 		$search_firstname = "";
 		$search_societe = "";
 		$search_town = "";
+		$search_address = "";
 		$search_zip = "";
 		$search_country = "";
 		$search_poste = "";
@@ -366,7 +368,7 @@ if ($resql) {
 }
 
 $sql = "SELECT s.rowid as socid, s.nom as name,";
-$sql .= " p.rowid, p.lastname as lastname, p.statut, p.firstname, p.zip, p.town, p.poste, p.email,";
+$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 .= " st.libelle as stcomm, st.picto as stcomm_picto, p.fk_stcommcontact as stcomm_id, p.fk_prospectcontactlevel,";
@@ -374,7 +376,7 @@ $sql .= " co.label as country, co.code as country_code";
 // 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 : '');
 	}
 }
 if (!empty($conf->mailing->enabled)) {
@@ -385,7 +387,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."socpeople as p";
-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 (p.rowid = ef.fk_object)";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = p.fk_pays";
@@ -400,11 +402,11 @@ if (!empty($search_categ_thirdparty) && $search_categ_thirdparty != '-1') {
 if (!empty($search_categ_supplier) && $search_categ_supplier != '-1') {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs2 ON s.rowid = cs2.fk_soc"; // We need this table joined to the select in order to filter by categ
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+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').')';
-if (!$user->rights->societe->client->voir && !$socid) { //restriction
+if (empty($user->rights->societe->client->voir) && !$socid) { //restriction
 	$sql .= " AND (sc.fk_user = ".((int) $user->id)." OR p.fk_soc IS NULL)";
 }
 if (!empty($userid)) {    // propre au commercial
@@ -494,13 +496,16 @@ if (strlen($search_fax)) {
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active'] && strlen($search_[$key])) {
-			$sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.$search_[$key].'%\'';
+			$sql .= " AND p.socialnetworks LIKE '%\"".$key."\":\"".$search_[$key]."%'";
 		}
 	}
 }
 if (strlen($search_email)) {
 	$sql .= natural_search('p.email', $search_email);
 }
+if (strlen($search_address)) {
+	$sql .= natural_search("p.address", $search_address);
+}
 if (strlen($search_zip)) {
 	$sql .= natural_search("p.zip", $search_zip);
 }
@@ -582,72 +587,75 @@ llxHeader('', $title, $help_url);
 
 $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
-	$param .= '&amp;contextpage='.$contextpage;
+	$param .= '&contextpage='.urlencode($contextpage);
 }
 if ($limit > 0 && $limit != $conf->liste_limit) {
-	$param .= '&amp;limit='.$limit;
+	$param .= '&limit='.((int) $limit);
 }
-$param .= '&amp;begin='.urlencode($begin).'&amp;userid='.urlencode($userid).'&amp;contactname='.urlencode($sall);
-$param .= '&amp;type='.urlencode($type).'&amp;view='.urlencode($view);
+$param .= '&begin='.urlencode($begin).'&userid='.urlencode($userid).'&contactname='.urlencode($sall);
+$param .= '&type='.urlencode($type).'&view='.urlencode($view);
 if (!empty($search_categ) && $search_categ != '-1') {
-	$param .= '&amp;search_categ='.urlencode($search_categ);
+	$param .= '&search_categ='.urlencode($search_categ);
 }
 if (!empty($search_categ_thirdparty) && $search_categ_thirdparty != '-1') {
-	$param .= '&amp;search_categ_thirdparty='.urlencode($search_categ_thirdparty);
+	$param .= '&search_categ_thirdparty='.urlencode($search_categ_thirdparty);
 }
 if (!empty($search_categ_supplier) && $search_categ_supplier != '-1') {
-	$param .= '&amp;search_categ_supplier='.urlencode($search_categ_supplier);
+	$param .= '&search_categ_supplier='.urlencode($search_categ_supplier);
 }
 if ($sall != '') {
-	$param .= '&amp;sall='.urlencode($sall);
+	$param .= '&sall='.urlencode($sall);
 }
 if ($search_id > 0) {
-	$param .= "&amp;search_id=".urlencode($search_id);
+	$param .= "&search_id=".urlencode($search_id);
 }
 if ($search_lastname != '') {
-	$param .= '&amp;search_lastname='.urlencode($search_lastname);
+	$param .= '&search_lastname='.urlencode($search_lastname);
 }
 if ($search_firstname != '') {
-	$param .= '&amp;search_firstname='.urlencode($search_firstname);
+	$param .= '&search_firstname='.urlencode($search_firstname);
 }
 if ($search_societe != '') {
-	$param .= '&amp;search_societe='.urlencode($search_societe);
+	$param .= '&search_societe='.urlencode($search_societe);
+}
+if ($search_address != '') {
+	$param .= '&search_address='.urlencode($search_address);
 }
 if ($search_zip != '') {
-	$param .= '&amp;search_zip='.urlencode($search_zip);
+	$param .= '&search_zip='.urlencode($search_zip);
 }
 if ($search_town != '') {
-	$param .= '&amp;search_town='.urlencode($search_town);
+	$param .= '&search_town='.urlencode($search_town);
 }
 if ($search_country != '') {
 	$param .= "&search_country=".urlencode($search_country);
 }
 if ($search_poste != '') {
-	$param .= '&amp;search_poste='.urlencode($search_poste);
+	$param .= '&search_poste='.urlencode($search_poste);
 }
 if ($search_phone_pro != '') {
-	$param .= '&amp;search_phone_pro='.urlencode($search_phone_pro);
+	$param .= '&search_phone_pro='.urlencode($search_phone_pro);
 }
 if ($search_phone_perso != '') {
-	$param .= '&amp;search_phone_perso='.urlencode($search_phone_perso);
+	$param .= '&search_phone_perso='.urlencode($search_phone_perso);
 }
 if ($search_phone_mobile != '') {
-	$param .= '&amp;search_phone_mobile='.urlencode($search_phone_mobile);
+	$param .= '&search_phone_mobile='.urlencode($search_phone_mobile);
 }
 if ($search_fax != '') {
-	$param .= '&amp;search_fax='.urlencode($search_fax);
+	$param .= '&search_fax='.urlencode($search_fax);
 }
 if ($search_email != '') {
-	$param .= '&amp;search_email='.urlencode($search_email);
+	$param .= '&search_email='.urlencode($search_email);
 }
 if ($search_no_email != '') {
-	$param .= '&amp;search_no_email='.urlencode($search_no_email);
+	$param .= '&search_no_email='.urlencode($search_no_email);
 }
 if ($search_status != '') {
-	$param .= '&amp;search_status='.urlencode($search_status);
+	$param .= '&search_status='.urlencode($search_status);
 }
 if ($search_priv == '0' || $search_priv == '1') {
-	$param .= "&amp;search_priv=".urlencode($search_priv);
+	$param .= "&search_priv=".urlencode($search_priv);
 }
 if ($search_stcomm != '') {
 	$param .= '&search_stcomm='.urlencode($search_stcomm);
@@ -794,6 +802,11 @@ if (!empty($arrayfields['p.poste']['checked'])) {
 	print '<input class="flat" type="text" name="search_poste" size="5" value="'.dol_escape_htmltag($search_poste).'">';
 	print '</td>';
 }
+if (!empty($arrayfields['p.address']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" name="search_address" size="6" value="'.dol_escape_htmltag($search_address).'">';
+	print '</td>';
+}
 if (!empty($arrayfields['p.zip']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="search_zip" size="3" value="'.dol_escape_htmltag($search_zip).'">';
@@ -942,6 +955,9 @@ if (!empty($arrayfields['p.firstname']['checked'])) {
 if (!empty($arrayfields['p.poste']['checked'])) {
 	print_liste_field_titre($arrayfields['p.poste']['label'], $_SERVER["PHP_SELF"], "p.poste", $begin, $param, '', $sortfield, $sortorder);
 }
+if (!empty($arrayfields['p.address']['checked'])) {
+	print_liste_field_titre($arrayfields['p.address']['label'], $_SERVER["PHP_SELF"], "p.address", $begin, $param, '', $sortfield, $sortorder);
+}
 if (!empty($arrayfields['p.zip']['checked'])) {
 	print_liste_field_titre($arrayfields['p.zip']['label'], $_SERVER["PHP_SELF"], "p.zip", $begin, $param, '', $sortfield, $sortorder);
 }
@@ -1022,6 +1038,7 @@ print "</tr>\n";
 
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 
@@ -1035,6 +1052,7 @@ while ($i < min($num, $limit)) {
 	$contactstatic->phone_pro = $obj->phone_pro;
 	$contactstatic->phone_perso = $obj->phone_perso;
 	$contactstatic->phone_mobile = $obj->phone_mobile;
+	$contactstatic->address = $obj->address;
 	$contactstatic->zip = $obj->zip;
 	$contactstatic->town = $obj->town;
 	$contactstatic->socialnetworks = $arraysocialnetworks;
@@ -1078,6 +1096,13 @@ while ($i < min($num, $limit)) {
 			$totalarray['nbfield']++;
 		}
 	}
+	// Address
+	if (!empty($arrayfields['p.address']['checked'])) {
+		print '<td>'.$obj->address.'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
 	// Zip
 	if (!empty($arrayfields['p.zip']['checked'])) {
 		print '<td>'.$obj->zip.'</td>';
@@ -1144,7 +1169,7 @@ while ($i < min($num, $limit)) {
 	}
 	// EMail
 	if (!empty($arrayfields['p.email']['checked'])) {
-		print '<td class="nowraponall tdmaxoverflow300">'.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18, 0, 1).'</td>';
+		print '<td class="nowraponall tdoverflowmax300">'.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18, 0, 1).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1217,7 +1242,7 @@ while ($i < min($num, $limit)) {
 				$titlealt = $val['label'];
 			}
 			if ($obj->stcomm_id != $val['id']) {
-				print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommcontactid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm&token='.newToken().$param.($page ? '&page='.urlencode($page) : '').'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
+				print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommcontactid='.$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>';
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index c301ef02276..a3bfb861b0f 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -34,28 +34,39 @@ $action = GETPOST('action', 'aZ09');
 // Load translation files required by the page
 $langs->load("companies");
 
-// Security check
 $id = GETPOST('id', 'int');
-if ($user->socid) {
-	$id = $user->socid;
-}
-$result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
 
 $object = new Contact($db);
 if ($id > 0) {
 	$object->fetch($id);
 }
 
+// Security check
+if ($user->socid > 0) {
+	if ($object->fk_soc > 0 && $object->fk_soc != $user->socid) {
+		accessforbidden();
+	}
+}
+$result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
+
+
 $permissionnote = $user->rights->societe->creer; // Used by the include of actions_setnotes.inc.php
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('contactcard'));
+// $hookmanager->initHooks(array('contactcard')); -> Name conflict with product/card.php
+$hookmanager->initHooks(array('contactnote'));
+
 
 /*
  * Actions
  */
-
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$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
+}
 
 
 /*
@@ -85,7 +96,11 @@ if ($id > 0) {
 
 	$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)) {
 		$objsoc = new Societe($db);
 		$objsoc->fetch($object->socid);
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 261ffebf29c..e90f8b46bd0 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -205,11 +205,7 @@ if ($action == 'edit') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print "</form>";
 } else {
@@ -219,7 +215,11 @@ if ($action == 'edit') {
 
 	$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)) {
 		$objsoc = new Societe($db);
 		$objsoc->fetch($object->socid);
@@ -315,7 +315,7 @@ if ($action != 'edit') {
 		print '<div class="tabsAction">';
 
 		if ($user->rights->societe->contact->creer) {
-			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>';
+			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans('Modify').'</a>';
 		}
 
 		print "</div>";
diff --git a/htdocs/contact/project.php b/htdocs/contact/project.php
new file mode 100644
index 00000000000..b05709f019a
--- /dev/null
+++ b/htdocs/contact/project.php
@@ -0,0 +1,117 @@
+<?php
+/*
+ * Copyright (C) 2021		VIAL--GOUTEYRON Quentin		<quentin.vial-gouteyron@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/contact/project.php
+ *  \ingroup    contact
+ *  \brief      Page of third party projects
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+$langs->loadLangs(array("contacts", "companies", "projects"));
+
+// Security check
+$id = GETPOST('id', 'int');
+$result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('projectcontact'));
+
+/*
+ *	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');
+}
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+
+if ($id) {
+	require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
+
+	$object = new Contact($db);
+
+	$result = $object->fetch($id);
+	if (empty($object->thirdparty)) {
+		$object->fetch_thirdparty();
+	}
+	$socid = $object->thirdparty->id;
+	$title = $langs->trans("Projects");
+	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+		$title = $object->name." - ".$title;
+	}
+	llxHeader('', $title);
+
+	if (! empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
+	$head = contact_prepare_head($object);
+
+	print dol_get_fiche_head($head, 'project', $langs->trans("Contact"), -1, 'contact');
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS) && !empty($socid)) {
+		$object->thirdparty->fetch($socid);
+		// Thirdparty
+		$morehtmlref .= $langs->trans('ThirdParty').' : ';
+		if ($object->thirdparty->id > 0) {
+			$morehtmlref .= $object->thirdparty->getNomUrl(1, 'contact');
+		} else {
+			$morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+		}
+	}
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'id', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', $morehtmlref);
+
+	print '<div class="fichecenter">';
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
+
+	// Civility
+	print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td>';
+	print $object->getCivilityLabel();
+	print '</td></tr>';
+
+	print '</table>';
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+	print '<br>';
+
+	// Projects list
+	$result = show_contacts_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?id='.$object->id, 1);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index a291a9d8761..d654ac38d9f 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -57,8 +57,8 @@ if ($user->socid) {
 $result = restrictedArea($user, 'contrat', $id, '');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -176,7 +176,7 @@ if ($id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->contrat->creer) {
 			if ($action != 'classify') {
-				//$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a>';
+				//$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a>';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -194,9 +194,10 @@ if ($id > 0) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 1466f595b3d..abc89ecc1eb 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -40,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+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';
 }
@@ -110,6 +111,29 @@ if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/contrat/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.'/contrat/card.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 = '';
+	}
+
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
@@ -225,6 +249,10 @@ if (empty($reshook)) {
 				if ($element == 'propal') {
 					$element = 'comm/propal'; $subelement = 'propal';
 				}
+				if ($element == 'invoice' || $element == 'facture') {
+					$element = 'compta/facture';
+					$subelement = 'facture';
+				}
 
 				$object->origin    = $origin;
 				$object->origin_id = $originid;
@@ -482,8 +510,8 @@ if (empty($reshook)) {
 				$desc = $prod->description;
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
-				if ($product_desc==$desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
-					$product_desc='';
+				if ($product_desc == $desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+					$product_desc = '';
 				}
 
 				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
@@ -806,8 +834,7 @@ if (empty($reshook)) {
 			$action = 'edit_extras';
 		}
 	} elseif ($action == 'setref_supplier') {
-		$cancelbutton = GETPOST('cancel', 'alpha');
-		if (!$cancelbutton) {
+		if (!$cancel) {
 			$object->oldcopy = dol_clone($object);
 
 			$result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier', 'alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
@@ -823,9 +850,7 @@ if (empty($reshook)) {
 			exit;
 		}
 	} elseif ($action == 'setref_customer') {
-		$cancelbutton = GETPOST('cancel', 'alpha');
-
-		if (!$cancelbutton) {
+		if (!$cancel) {
 			$object->oldcopy = dol_clone($object);
 
 			$result = $object->setValueFrom('ref_customer', GETPOST('ref_customer', 'alpha'), '', null, 'text', '', $user, 'CONTRACT_MODIFY');
@@ -841,9 +866,7 @@ if (empty($reshook)) {
 			exit;
 		}
 	} elseif ($action == 'setref') {
-		$cancelbutton = GETPOST('cancel', 'alpha');
-
-		if (!$cancelbutton) {
+		if (!$cancel) {
 			$result = $object->fetch($id);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -878,9 +901,7 @@ if (empty($reshook)) {
 			exit;
 		}
 	} elseif ($action == 'setdate_contrat') {
-		$cancelbutton = GETPOST('cancel', 'alpha');
-
-		if (!$cancelbutton) {
+		if (!$cancel) {
 			$result = $object->fetch($id);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -900,6 +921,8 @@ if (empty($reshook)) {
 		}
 	}
 
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to build doc
 	$upload_dir = $conf->contrat->multidir_output[$object->entity];
@@ -1022,6 +1045,10 @@ if ($action == 'create') {
 			if ($element == 'propal') {
 				$element = 'comm/propal'; $subelement = 'propal';
 			}
+			if ($element == 'invoice' || $element == 'facture') {
+				$element = 'compta/facture';
+				$subelement = 'facture';
+			}
 
 			dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
@@ -1105,18 +1132,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>';
 	}
 
@@ -1174,11 +1199,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-	print '</div>';
+	print $form->buttonsSaveCancel("Create");
 
 	if (is_object($objectsrc)) {
 		print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
@@ -1190,12 +1211,8 @@ if ($action == 'create') {
 	}
 
 	print "</form>\n";
-} else /* *************************************************************************** */
-/*                                                                             */
-/* Mode vue et edition                                                         */
-/*                                                                             */
-/* *************************************************************************** */
-{
+} else {
+	// View and edit mode
 	$now = dol_now();
 
 	if ($object->id > 0) {
@@ -1310,7 +1327,7 @@ if ($action == 'create') {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->contrat->creer) {
 				if ($action != 'classify') {
-					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+					$morehtmlref .= '<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);
@@ -1327,9 +1344,10 @@ if ($action == 'create') {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
@@ -1350,18 +1368,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
@@ -1437,7 +1453,7 @@ if ($action == 'create') {
 			$sql .= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity, p.tosell, p.tobuy, p.tobatch";
 			$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-			$sql .= " WHERE cd.rowid = ".$object->lines[$cursorline - 1]->id;
+			$sql .= " WHERE cd.rowid = ".((int) $object->lines[$cursorline - 1]->id);
 
 			$result = $db->query($sql);
 			if ($result) {
@@ -1526,24 +1542,24 @@ if ($action == 'create') {
 
 					// Margin
 					if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) {
-						print '<td class="right nowrap">'.price($objp->pa_ht).'</td>';
+						print '<td class="right nowraponall">'.price($objp->pa_ht).'</td>';
 					}
 
 					// Icon move, update et delete (statut contrat 0=brouillon,1=valide,2=ferme)
-					print '<td class="nowrap right">';
+					print '<td class="nowraponall right">';
 					if ($user->rights->contrat->creer && 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.'&amp;action=move&amp;rowid='.$objp->rowid.'">';
+						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');
 						print '</a>';
 					}
 					if ($user->rights->contrat->creer && ($object->statut >= 0)) {
-						print '<a class="reposition marginrightonly editfielda" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=editline&amp;rowid='.$objp->rowid.'">';
+						print '<a class="reposition marginrightonly editfielda" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=editline&token='.newToken().'&rowid='.$objp->rowid.'">';
 						print img_edit();
 						print '</a>';
 					}
 					if ($user->rights->contrat->creer && ($object->statut >= 0)) {
-						print '<a class="reposition marginrightonly" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=deleteline&amp;token='.newToken().'&amp;rowid='.$objp->rowid.'">';
+						print '<a class="reposition marginrightonly" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=deleteline&token='.newToken().'&rowid='.$objp->rowid.'">';
 						print img_delete();
 						print '</a>';
 					}
@@ -2031,7 +2047,7 @@ if ($action == 'create') {
 				}
 				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.'&amp;action=reopen&amp;token='.newToken().'">'.$langs->trans("Modify").'</a></div>';
+						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>';
 					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Modify").'</a></div>';
 					}
@@ -2040,7 +2056,7 @@ if ($action == 'create') {
 				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&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateOrder").'</a></div>';
+						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>';
 					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateOrder").'</a></div>';
 					}
@@ -2095,7 +2111,7 @@ if ($action == 'create') {
 				// - Droit de creer + mode brouillon (erreur creation)
 				// - Droit de supprimer
 				if (($user->rights->contrat->creer && $object->statut == $object::STATUS_DRAFT) || $user->rights->contrat->supprimer) {
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
 				} else {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Delete").'</a></div>';
 				}
@@ -2129,7 +2145,7 @@ if ($action == 'create') {
 			$linktoelem = $form->showLinkToObjectBlock($object, null, array('contrat'));
 			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
-			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+			print '</div><div class="fichehalfright">';
 
 			$MAXEVENT = 10;
 
@@ -2140,7 +2156,7 @@ if ($action == 'create') {
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'contract', $socid, 1, 'listactions', $MAXEVENT, '', $morehtmlcenter);
 
-			print '</div></div></div>';
+			print '</div></div>';
 		}
 
 		// Presend form
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index ea7886f022c..5e534f3e43c 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -147,8 +147,9 @@ class Contracts extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index f364e82dd68..b2c9543453b 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -387,7 +387,7 @@ class Contrat extends CommonObject
 			if ($contratline->statut != ContratLigne::STATUS_OPEN) {
 				$contratline->context = $this->context;
 
-				$result = $contratline->active_line($user, $date_start, -1, $comment);
+				$result = $contratline->active_line($user, $date_start, -1, $comment);	// This call trigger LINECONTRACT_ACTIVATE
 				if ($result < 0) {
 					$error++;
 					$this->error = $contratline->error;
@@ -507,7 +507,7 @@ class Contrat extends CommonObject
 		if ($num) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET ref = '".$this->db->escape($num)."', statut = 1";
 			//$sql.= ", fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
-			$sql .= " WHERE rowid = ".$this->id." AND statut = 0";
+			$sql .= " WHERE rowid = ".((int) $this->id)." AND statut = 0";
 
 			dol_syslog(get_class($this)."::validate", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -607,7 +607,7 @@ class Contrat extends CommonObject
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET statut = 0";
 		//$sql.= ", fk_user_valid = null, date_valid = null";
-		$sql .= " WHERE rowid = ".$this->id." AND statut = 1";
+		$sql .= " WHERE rowid = ".((int) $this->id)." AND statut = 1";
 
 		dol_syslog(get_class($this)."::validate", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -913,10 +913,11 @@ class Contrat extends CommonObject
 			return -3;
 		}
 
+		// Now set the global properties on contract not stored into database.
 		$this->nbofservices = count($this->lines);
-		$this->total_ttc = price2num($total_ttc); // TODO For the moment value is false as value is not stored in database for line linked to products
-		$this->total_tva = price2num($total_vat); // TODO For the moment value is false as value is not stored in database for line linked to products
-		$this->total_ht = price2num($total_ht); // TODO For the moment value is false as value is not stored in database for line linked to products
+		$this->total_ttc = price2num($total_ttc);
+		$this->total_tva = price2num($total_vat);
+		$this->total_ht = price2num($total_ht);
 
 		return $this->lines;
 	}
@@ -957,13 +958,13 @@ class Contrat extends CommonObject
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."contrat (datec, fk_soc, fk_user_author, date_contrat,";
 		$sql .= " fk_commercial_signature, fk_commercial_suivi, fk_projet,";
 		$sql .= " ref, entity, note_private, note_public, ref_customer, ref_supplier, ref_ext)";
-		$sql .= " VALUES ('".$this->db->idate($now)."',".$this->socid.",".$user->id;
+		$sql .= " VALUES ('".$this->db->idate($now)."', ".((int) $this->socid).", ".((int) $user->id);
 		$sql .= ", ".(dol_strlen($this->date_contrat) != 0 ? "'".$this->db->idate($this->date_contrat)."'" : "NULL");
-		$sql .= ",".($this->commercial_signature_id > 0 ? $this->commercial_signature_id : "NULL");
-		$sql .= ",".($this->commercial_suivi_id > 0 ? $this->commercial_suivi_id : "NULL");
-		$sql .= ",".($this->fk_project > 0 ? $this->fk_project : "NULL");
+		$sql .= ",".($this->commercial_signature_id > 0 ? ((int) $this->commercial_signature_id) : "NULL");
+		$sql .= ",".($this->commercial_suivi_id > 0 ? ((int) $this->commercial_suivi_id) : "NULL");
+		$sql .= ",".($this->fk_project > 0 ? ((int) $this->fk_project) : "NULL");
 		$sql .= ", ".(dol_strlen($this->ref) <= 0 ? "null" : "'".$this->db->escape($this->ref)."'");
-		$sql .= ", ".$conf->entity;
+		$sql .= ", ".((int) $conf->entity);
 		$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->ref_customer) ? ("'".$this->db->escape($this->ref_customer)."'") : "NULL");
@@ -1197,7 +1198,7 @@ class Contrat extends CommonObject
 				// Delete contratdet extrafields
 				$main = MAIN_DB_PREFIX.'contratdet';
 				$ef = $main."_extrafields";
-				$sql = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_contrat = ".((int) $this->id).")";
+				$sql = "DELETE FROM ".$ef." WHERE fk_object IN (SELECT rowid FROM ".$main." WHERE fk_contrat = ".((int) $this->id).")";
 
 				dol_syslog(get_class($this)."::delete contratdet_extrafields", LOG_DEBUG);
 				$resql = $this->db->query($sql);
@@ -1222,7 +1223,7 @@ class Contrat extends CommonObject
 
 		// Delete llx_ecm_files
 		if (!$error) {
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? '' : '@'.$this->module))."' AND src_object_id = ".((int) $this->id);
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? "" : "@".$this->module))."' AND src_object_id = ".((int) $this->id);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$this->error = $this->db->lasterror();
@@ -1729,85 +1730,77 @@ class Contrat extends CommonObject
 			}
 		}
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet set description='".$this->db->escape($desc)."'";
-		$sql .= ",price_ht='".price2num($price)."'";
-		$sql .= ",subprice='".price2num($subprice)."'";
-		$sql .= ",remise='".price2num($remise)."'";
-		$sql .= ",remise_percent='".price2num($remise_percent)."'";
-		$sql .= ",qty='".$qty."'";
-		$sql .= ",tva_tx='".price2num($tvatx)."'";
-		$sql .= ",localtax1_tx='".price2num($localtax1tx)."'";
-		$sql .= ",localtax2_tx='".price2num($localtax2tx)."'";
-		$sql .= ",localtax1_type='".$this->db->escape($localtax1_type)."'";
-		$sql .= ",localtax2_type='".$this->db->escape($localtax2_type)."'";
-		$sql .= ", total_ht='".price2num($total_ht)."'";
-		$sql .= ", total_tva='".price2num($total_tva)."'";
-		$sql .= ", total_localtax1='".price2num($total_localtax1)."'";
-		$sql .= ", total_localtax2='".price2num($total_localtax2)."'";
-		$sql .= ", total_ttc='".price2num($total_ttc)."'";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet set description = '".$this->db->escape($desc)."'";
+		$sql .= ",price_ht = ".((float) price2num($price));
+		$sql .= ",subprice = ".((float) price2num($subprice));
+		$sql .= ",remise = ".((float) price2num($remise));
+		$sql .= ",remise_percent = ".((float) price2num($remise_percent));
+		$sql .= ",qty = ".((float) $qty);
+		$sql .= ",tva_tx = ".((float) price2num($tvatx));
+		$sql .= ",localtax1_tx = ".((float) price2num($localtax1tx));
+		$sql .= ",localtax2_tx = ".((float) price2num($localtax2tx));
+		$sql .= ",localtax1_type='".$this->db->escape($localtax1_type);
+		$sql .= ",localtax2_type='".$this->db->escape($localtax2_type);
+		$sql .= ", total_ht = ".((float) price2num($total_ht));
+		$sql .= ", total_tva = ".((float) price2num($total_tva));
+		$sql .= ", total_localtax1 = ".((float) price2num($total_localtax1));
+		$sql .= ", total_localtax2 = ".((float) price2num($total_localtax2));
+		$sql .= ", total_ttc = ".((float) price2num($total_ttc));
 		$sql .= ", fk_product_fournisseur_price=".($fk_fournprice > 0 ? $fk_fournprice : "null");
-		$sql .= ", buy_price_ht='".price2num($pa_ht)."'";
+		$sql .= ", buy_price_ht = ".((float) price2num($pa_ht));
 		if ($date_start > 0) {
-			$sql .= ",date_ouverture_prevue='".$this->db->idate($date_start)."'";
+			$sql .= ",date_ouverture_prevue = '".$this->db->idate($date_start)."'";
 		} else {
-			$sql .= ",date_ouverture_prevue=null";
+			$sql .= ",date_ouverture_prevue = null";
 		}
 		if ($date_end > 0) {
-			$sql .= ",date_fin_validite='".$this->db->idate($date_end)."'";
+			$sql .= ",date_fin_validite = '".$this->db->idate($date_end)."'";
 		} else {
-			$sql .= ",date_fin_validite=null";
+			$sql .= ",date_fin_validite = null";
 		}
 		if ($date_debut_reel > 0) {
-			$sql .= ",date_ouverture='".$this->db->idate($date_debut_reel)."'";
+			$sql .= ",date_ouverture = '".$this->db->idate($date_debut_reel)."'";
 		} else {
-			$sql .= ",date_ouverture=null";
+			$sql .= ",date_ouverture = null";
 		}
 		if ($date_fin_reel > 0) {
-			$sql .= ",date_cloture='".$this->db->idate($date_fin_reel)."'";
+			$sql .= ",date_cloture = '".$this->db->idate($date_fin_reel)."'";
 		} else {
-			$sql .= ",date_cloture=null";
+			$sql .= ",date_cloture = null";
 		}
-		$sql .= ", fk_unit=".($fk_unit ? "'".$this->db->escape($fk_unit)."'" : "null");
+		$sql .= ", fk_unit = ".($fk_unit > 0 ? ((int) $fk_unit) : "null");
 		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
-			$result = $this->update_statut($user);
-			if ($result >= 0) {
-				if (is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
-					$contractline = new ContratLigne($this->db);
-					$contractline->fetch($rowid);
-					$contractline->fetch_optionals();
+			if (is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
+				$contractline = new ContratLigne($this->db);
+				$contractline->fetch($rowid);
 
-					// We replace values in $contractline->array_options only for entries defined into $array_options
-					foreach ($array_options as $key => $value) {
-						$contractline->array_options[$key] = $array_options[$key];
-					}
-
-					$result = $contractline->insertExtraFields();
-					if ($result < 0) {
-						$this->error[] = $contractline->error;
-						$error++;
-					}
+				// We replace values in $contractline->array_options only for entries defined into $array_options
+				foreach ($array_options as $key => $value) {
+					$contractline->array_options[$key] = $array_options[$key];
 				}
 
-				if (empty($error)) {
-					// Call trigger
-					$result = $this->call_trigger('LINECONTRACT_UPDATE', $user);
-					if ($result < 0) {
-						$this->db->rollback();
-						return -3;
-					}
-					// End call triggers
-
-					$this->db->commit();
-					return 1;
+				$result = $contractline->insertExtraFields();
+				if ($result < 0) {
+					$this->error[] = $contractline->error;
+					$error++;
 				}
-			} else {
-				$this->db->rollback();
-				dol_syslog(get_class($this)."::updateline Erreur -2");
-				return -2;
+			}
+
+			if (empty($error)) {
+				// Call trigger
+				$result = $this->call_trigger('LINECONTRACT_UPDATE', $user);
+				if ($result < 0) {
+					$this->db->rollback();
+					return -3;
+				}
+				// End call triggers
+
+				$this->db->commit();
+				return 1;
 			}
 		} else {
 			$this->db->rollback();
@@ -2112,7 +2105,7 @@ class Contrat extends CommonObject
 
 		$sql = "SELECT cd.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
-		$sql .= " WHERE fk_contrat =".$this->id;
+		$sql .= " WHERE fk_contrat =".((int) $this->id);
 		if ($status >= 0) {
 			$sql .= " AND statut = ".((int) $status);
 		}
@@ -2146,9 +2139,9 @@ class Contrat extends CommonObject
 
 		$sql = "SELECT c.rowid, c.ref";
 		$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c";
-		$sql .= " WHERE fk_soc =".$this->socid;
+		$sql .= " WHERE fk_soc =".((int) $this->socid);
 		if ($option == 'others') {
-			$sql .= " AND c.rowid != ".$this->id;
+			$sql .= " AND c.rowid <> ".((int) $this->id);
 		}
 
 		dol_syslog(get_class($this)."::getOtherContracts()", LOG_DEBUG);
@@ -2187,7 +2180,7 @@ class Contrat extends CommonObject
 		$this->from = " FROM ".MAIN_DB_PREFIX."contrat as c";
 		$this->from .= ", ".MAIN_DB_PREFIX."contratdet as cd";
 		$this->from .= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$this->from .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 
@@ -2218,7 +2211,7 @@ class Contrat extends CommonObject
 		if ($user->socid) {
 			$sql .= " AND c.fk_soc = ".((int) $user->socid);
 		}
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 
@@ -2286,7 +2279,7 @@ class Contrat extends CommonObject
 		$sql = "SELECT count(c.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
@@ -2545,7 +2538,7 @@ class Contrat extends CommonObject
 
 		if (!$error) {
 			foreach ($this->lines as $line) {
-				$result = $clonedObj->addline($line->desc, $line->subprice, $line->qty, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, $line->date_ouverture, $line->date_cloture, 'HT', 0, $line->info_bits, $line->fk_fournprice, $line->pa_ht, $line->array_options, $line->fk_unit);
+				$result = $clonedObj->addline($line->description, $line->subprice, $line->qty, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, $line->date_ouverture, $line->date_cloture, 'HT', 0, $line->info_bits, $line->fk_fournprice, $line->pa_ht, $line->array_options, $line->fk_unit);
 				if ($result < 0) {
 					$error++;
 					$this->error = $clonedObj->error;
@@ -2770,20 +2763,20 @@ class ContratLigne extends CommonObjectLine
 		$langs->load("contracts");
 
 		if ($status == self::STATUS_INITIAL) {
-			$labelStatus = $langs->trans("ServiceStatusInitial");
-			$labelStatusShort = $langs->trans("ServiceStatusInitial");
+			$labelStatus = $langs->transnoentities("ServiceStatusInitial");
+			$labelStatusShort = $langs->transnoentities("ServiceStatusInitial");
 		} elseif ($status == self::STATUS_OPEN && $expired == -1) {
-			$labelStatus = $langs->trans("ServiceStatusRunning");
-			$labelStatusShort = $langs->trans("ServiceStatusRunning");
+			$labelStatus = $langs->transnoentities("ServiceStatusRunning");
+			$labelStatusShort = $langs->transnoentities("ServiceStatusRunning");
 		} elseif ($status == self::STATUS_OPEN && $expired == 0) {
-			$labelStatus = $langs->trans("ServiceStatusNotLate");
-			$labelStatusShort = $langs->trans("ServiceStatusNotLateShort");
+			$labelStatus = $langs->transnoentities("ServiceStatusNotLate");
+			$labelStatusShort = $langs->transnoentities("ServiceStatusNotLateShort");
 		} elseif ($status == self::STATUS_OPEN && $expired == 1) {
-			$labelStatus = $langs->trans("ServiceStatusLate");
-			$labelStatusShort = $langs->trans("ServiceStatusLateShort");
+			$labelStatus = $langs->transnoentities("ServiceStatusLate");
+			$labelStatusShort = $langs->transnoentities("ServiceStatusLateShort");
 		} elseif ($status == self::STATUS_CLOSED) {
-			$labelStatus = $langs->trans("ServiceStatusClosed");
-			$labelStatusShort = $langs->trans("ServiceStatusClosed");
+			$labelStatus = $langs->transnoentities("ServiceStatusClosed");
+			$labelStatusShort = $langs->transnoentities("ServiceStatusClosed");
 		}
 
 		$statusType = 'status'.$status;
@@ -3202,7 +3195,7 @@ class ContratLigne extends CommonObjectLine
 		$sql .= ",total_localtax1=".price2num($this->total_localtax1, 'MT')."";
 		$sql .= ",total_localtax2=".price2num($this->total_localtax2, 'MT')."";
 		$sql .= ",total_ttc=".price2num($this->total_ttc, 'MT')."";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update_total", LOG_DEBUG);
 
@@ -3257,12 +3250,12 @@ class ContratLigne extends CommonObjectLine
 		$sql .= " '".$this->db->escape($this->info_bits)."',";
 		$sql .= " ".price2num($this->price_ht).",".price2num($this->remise).",";
 		if ($this->fk_fournprice > 0) {
-			$sql .= ' '.$this->fk_fournprice.',';
+			$sql .= ' '.((int) $this->fk_fournprice).',';
 		} else {
 			$sql .= ' null,';
 		}
 		if ($this->pa_ht > 0) {
-			$sql .= ' '.price2num($this->pa_ht);
+			$sql .= ' '.((float) price2num($this->pa_ht));
 		} else {
 			$sql .= ' null';
 		}
@@ -3332,10 +3325,10 @@ class ContratLigne extends CommonObjectLine
 		if ($date_end >= 0) {
 			$sql .= " date_fin_validite = ".(dol_strlen($date_end) != 0 ? "'".$this->db->idate($date_end)."'" : "null").",";
 		}
-		$sql .= " fk_user_ouverture = ".$user->id.",";
+		$sql .= " fk_user_ouverture = ".((int) $user->id).",";
 		$sql .= " date_cloture = null,";
 		$sql .= " commentaire = '".$this->db->escape($comment)."'";
-		$sql .= " WHERE rowid = ".$this->id." AND (statut = ".ContratLigne::STATUS_INITIAL." OR statut = ".ContratLigne::STATUS_CLOSED.")";
+		$sql .= " WHERE rowid = ".((int) $this->id)." AND (statut = ".ContratLigne::STATUS_INITIAL." OR statut = ".ContratLigne::STATUS_CLOSED.")";
 
 		dol_syslog(get_class($this)."::active_line", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -3396,9 +3389,9 @@ class ContratLigne extends CommonObjectLine
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = ".((int) ContratLigne::STATUS_CLOSED).",";
 		$sql .= " date_cloture = '".$this->db->idate($date_end)."',";
-		$sql .= " fk_user_cloture = ".$user->id.",";
+		$sql .= " fk_user_cloture = ".((int) $user->id).",";
 		$sql .= " commentaire = '".$this->db->escape($comment)."'";
-		$sql .= " WHERE rowid = ".$this->id." AND statut = ".((int) ContratLigne::STATUS_OPEN);
+		$sql .= " WHERE rowid = ".((int) $this->id)." AND statut = ".((int) ContratLigne::STATUS_OPEN);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 3d0be4d9552..d053a9a4fa0 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -159,7 +159,7 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->contrat->creer) {
 				if ($action != 'classify') {
-					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
 				}
 				if ($action == 'classify') {
@@ -177,9 +177,10 @@ if ($id > 0 || !empty($ref)) {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 0d66204f81d..953fd0002d2 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -55,8 +55,8 @@ $result = restrictedArea($user, 'contrat', $id);
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -84,6 +84,8 @@ $modulepart = 'contract';
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('contractcard', 'globalcard'));
 
+$permissiontoadd = $user->rights->contrat->creer;	// Used by the include of actions_dellink.inc.php
+
 
 /*
  * Actions
@@ -147,7 +149,7 @@ if ($object->id) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->contrat->creer) {
 			if ($action != 'classify') {
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -165,9 +167,10 @@ if ($object->id) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index cc3bc87ca54..99739260b36 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -92,16 +92,16 @@ $vals = array();
 $sql = "SELECT count(cd.rowid) as nb, cd.statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
 $sql .= " AND (cd.statut != 4 OR (cd.statut = 4 AND (cd.date_fin_validite is null or cd.date_fin_validite >= '".$db->idate($now)."')))";
 $sql .= " AND c.entity IN (".getEntity('contract', 0).")";
 if ($user->socid) {
-	$sql .= ' AND c.fk_soc = '.$user->socid;
+	$sql .= ' AND c.fk_soc = '.((int) $user->socid);
 }
-if (!$user->rights->societe->client->voir && !$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 cd.statut";
@@ -129,16 +129,16 @@ if ($resql) {
 $sql = "SELECT count(cd.rowid) as nb, cd.statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
 $sql .= " AND (cd.statut = 4 AND cd.date_fin_validite < '".$db->idate($now)."')";
 $sql .= " AND c.entity IN (".getEntity('contract', 0).")";
 if ($user->socid) {
-	$sql .= ' AND c.fk_soc = '.$user->socid;
+	$sql .= ' AND c.fk_soc = '.((int) $user->socid);
 }
-if (!$user->rights->societe->client->voir && !$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 cd.statut";
@@ -240,13 +240,13 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
 	$sql = "SELECT c.rowid, c.ref,";
 	$sql .= " s.nom as name, s.rowid as socid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE s.rowid = c.fk_soc";
 	$sql .= " AND c.entity IN (".getEntity('contract', 0).")";
 	$sql .= " AND c.statut = 0";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -298,20 +298,20 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
 }
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 // Last modified contracts
 $max = 5;
 $sql = 'SELECT ';
-$sql .= ' sum('.$db->ifsql("cd.statut=0", 1, 0).') as nb_initial,';
-$sql .= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite >= '".$db->idate($now)."')", 1, 0).') as nb_running,';
-$sql .= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')", 1, 0).') as nb_expired,';
-$sql .= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')", 1, 0).') as nb_late,';
-$sql .= ' sum('.$db->ifsql("cd.statut=5", 1, 0).') as nb_closed,';
+$sql .= " sum(".$db->ifsql("cd.statut=0", 1, 0).') as nb_initial,';
+$sql .= " sum(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite >= '".$db->idate($now)."')", 1, 0).') as nb_running,';
+$sql .= " sum(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')", 1, 0).') as nb_expired,';
+$sql .= " sum(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')", 1, 0).') as nb_late,';
+$sql .= " sum(".$db->ifsql("cd.statut=5", 1, 0).') as nb_closed,';
 $sql .= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut, s.nom as name, s.rowid as socid";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
 }
 $sql .= " ".MAIN_DB_PREFIX."contrat as c";
@@ -319,7 +319,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contra
 $sql .= " WHERE c.fk_soc = s.rowid";
 $sql .= " AND c.entity IN (".getEntity('contract', 0).")";
 $sql .= " AND c.statut > 0";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if ($socid) {
@@ -386,7 +386,7 @@ $sql .= " s.nom as name,";
 $sql .= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
 $sql .= " FROM (".MAIN_DB_PREFIX."contrat as c";
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= ", ".MAIN_DB_PREFIX."contratdet as cd";
@@ -394,7 +394,7 @@ $sql .= ") LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
 $sql .= " WHERE c.entity IN (".getEntity('contract', 0).")";
 $sql .= " AND cd.fk_contrat = c.rowid";
 $sql .= " AND c.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if ($socid) {
@@ -466,7 +466,7 @@ $sql .= " s.nom as name,";
 $sql .= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
 $sql .= " FROM (".MAIN_DB_PREFIX."contrat as c";
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= ", ".MAIN_DB_PREFIX."contratdet as cd";
@@ -476,7 +476,7 @@ $sql .= " AND c.statut = 1";
 $sql .= " AND cd.statut = 0";
 $sql .= " AND cd.fk_contrat = c.rowid";
 $sql .= " AND c.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if ($socid) {
@@ -547,7 +547,7 @@ $sql .= " s.nom as name,";
 $sql .= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
 $sql .= " FROM (".MAIN_DB_PREFIX."contrat as c";
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= ", ".MAIN_DB_PREFIX."contratdet as cd";
@@ -558,7 +558,7 @@ $sql .= " AND cd.statut = 4";
 $sql .= " AND cd.date_fin_validite < '".$db->idate($now)."'";
 $sql .= " AND cd.fk_contrat = c.rowid";
 $sql .= " AND c.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if ($socid) {
@@ -622,7 +622,7 @@ if ($resql) {
 }
 
 
-print '</div></div></div>';
+print '</div></div>';
 
 $parameters = array('user' => $user);
 $reshook = $hookmanager->executeHooks('dashboardContracts', $parameters, $object); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index bdbdb27331e..e6446e3585b 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -7,7 +7,8 @@
  * Copyright (C) 2015	   Claudio Aschieri		<c.aschieri@19.coop>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2016-2018 Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
+ * Copyright (C) 2019      Nicolas Zabouri      <info@inovea-conseil.com>
+ * Copyright (C) 2021      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
@@ -66,15 +67,20 @@ $search_product_category = GETPOST('search_product_category', 'int');
 $search_dfmonth = GETPOST('search_dfmonth', 'int');
 $search_dfyear = GETPOST('search_dfyear', 'int');
 $search_op2df = GETPOST('search_op2df', 'alpha');
-$day = GETPOST("day", "int");
-$year = GETPOST("year", "int");
-$month = GETPOST("month", "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);
 
 $optioncss = GETPOST('optioncss', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -171,9 +177,6 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
-	$day = '';
-	$month = '';
-	$year = '';
 	$search_dfmonth = '';
 	$search_dfyear = '';
 	$search_op2df = '';
@@ -190,6 +193,14 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_user = '';
 	$search_sale = '';
 	$search_product_category = '';
+	$search_date_startday = '';
+	$search_date_startmonth = '';
+	$search_date_startyear = '';
+	$search_date_endday = '';
+	$search_date_endmonth = '';
+	$search_date_endyear = '';
+	$search_date_start = '';
+	$search_date_end = '';
 	$sall = "";
 	$search_status = "";
 	$toselect = '';
@@ -218,6 +229,7 @@ $formother = new FormOther($db);
 $socstatic = new Societe($db);
 $formcompany = new FormCompany($db);
 $contracttmp = new Contrat($db);
+$title = "";
 
 $sql = 'SELECT';
 $sql .= " c.rowid, c.ref, c.datec as date_creation, c.tms as date_update, c.date_contrat, c.statut, c.ref_customer, c.ref_supplier, c.note_private, c.note_public, c.entity,";
@@ -225,15 +237,15 @@ $sql .= ' s.rowid as socid, s.nom as name, s.name_alias, s.email, s.town, s.zip,
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") as lower_planned_end_date,";
-$sql .= ' SUM('.$db->ifsql("cd.statut=0", 1, 0).') as nb_initial,';
-$sql .= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite >= '".$db->idate($now)."')", 1, 0).') as nb_running,';
-$sql .= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')", 1, 0).') as nb_expired,';
-$sql .= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')", 1, 0).') as nb_late,';
-$sql .= ' SUM('.$db->ifsql("cd.statut=5", 1, 0).') as nb_closed';
+$sql .= " SUM(".$db->ifsql("cd.statut=0", 1, 0).') as nb_initial,';
+$sql .= " SUM(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite >= '".$db->idate($now)."')", 1, 0).') as nb_running,';
+$sql .= " SUM(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')", 1, 0).') as nb_expired,';
+$sql .= " SUM(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')", 1, 0).') as nb_late,';
+$sql .= " SUM(".$db->ifsql("cd.statut=5", 1, 0).') as nb_closed';
 // 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
@@ -244,11 +256,11 @@ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
+if ($search_sale > 0 || (empty($user->rights->societe->client->voir) && !$socid)) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= ", ".MAIN_DB_PREFIX."contrat as c";
-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 (c.rowid = ef.fk_object)";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
@@ -270,10 +282,15 @@ if ($search_product_category > 0) {
 if ($socid) {
 	$sql .= " AND s.rowid = ".((int) $socid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
-$sql .= dolSqlDateFilter('c.date_contrat', $day, $month, $year);
+if ($search_date_start) {
+	$sql .= " AND c.date_contrat >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+	$sql .= " AND c.date_contrat <= '".$db->idate($search_date_end)."'";
+}
 if ($search_name) {
 	$sql .= natural_search('s.nom', $search_name);
 }
@@ -415,10 +432,28 @@ if ($search_ref_supplier != '') {
 if ($search_op2df != '') {
 	$param .= '&search_op2df='.urlencode($search_op2df);
 }
-if ($search_dfyear != '') {
+if ($search_date_startday > 0) {
+	$param .= '&search_date_startday='.urlencode($search_date_startday);
+}
+if ($search_date_startmonth > 0) {
+	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+}
+if ($search_date_startyear > 0) {
+	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+}
+if ($search_date_endday > 0) {
+	$param .= '&search_date_endday='.urlencode($search_date_endday);
+}
+if ($search_date_endmonth > 0) {
+	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+}
+if ($search_date_endyear > 0) {
+	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+}
+if ($search_dfyear > 0) {
 	$param .= '&search_dfyear='.urlencode($search_dfyear);
 }
-if ($search_dfmonth != '') {
+if ($search_dfmonth > 0) {
 	$param .= '&search_dfmonth='.urlencode($search_dfmonth);
 }
 if ($search_sale > 0) {
@@ -458,7 +493,7 @@ $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $url = DOL_URL_ROOT.'/contrat/card.php?action=create';
 if (!empty($socid)) {
-	$url .= '&socid='.$socid;
+	$url .= '&socid='.((int) $socid);
 }
 $newcardbutton = dolGetButtonTitle($langs->trans('NewContractSubscription'), '', 'fa fa-plus-circle', $url, '', $user->rights->contrat->creer);
 
@@ -566,11 +601,11 @@ if (!empty($arrayfields['s.email']['checked'])) {
 }
 // Town
 if (!empty($arrayfields['s.town']['checked'])) {
-	print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
 }
 // Zip
 if (!empty($arrayfields['s.zip']['checked'])) {
-	print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
+	print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
 }
 // State
 if (!empty($arrayfields['state.nom']['checked'])) {
@@ -594,16 +629,13 @@ if (!empty($arrayfields['sale_representative']['checked'])) {
 	print '<td class="liste_titre"></td>';
 }
 if (!empty($arrayfields['c.date_contrat']['checked'])) {
-	// Date contract
-	print '<td class="liste_titre center nowraponall">';
-	//print $langs->trans('Month').': ';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.$day.'">';
-	}
-	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.$month.'">';
-	//print '&nbsp;'.$langs->trans('Year').': ';
-	$syear = $year;
-	print $formother->selectyear($syear, '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>';
 }
 // Extra fields
@@ -764,11 +796,12 @@ while ($i < min($num, $limit)) {
 		print '</td>';
 	}
 
+	// Ref thirdparty
 	if (!empty($arrayfields['c.ref_customer']['checked'])) {
-		print '<td>'.$contracttmp->getFormatedCustomerRef($obj->ref_customer).'</td>';
+		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag(dol_string_nohtmltag($contracttmp->getFormatedCustomerRef($obj->ref_customer))).'">'.$contracttmp->getFormatedCustomerRef($obj->ref_customer).'</td>';
 	}
 	if (!empty($arrayfields['c.ref_supplier']['checked'])) {
-		print '<td>'.$obj->ref_supplier.'</td>';
+		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->ref_supplier).'">'.dol_escape_htmltag($obj->ref_supplier).'</td>';
 	}
 	if (!empty($arrayfields['s.nom']['checked'])) {
 		print '<td class="tdoverflowmax150">';
@@ -778,8 +811,9 @@ while ($i < min($num, $limit)) {
 		}
 		print '</td>';
 	}
+	// Email
 	if (!empty($arrayfields['s.email']['checked'])) {
-		print '<td>'.$obj->email.'</td>';
+		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->email).'">'.dol_print_email($obj->email, 0, $obj->socid, 0, 0, 1, 1).'</td>';
 	}
 	// Town
 	if (!empty($arrayfields['s.town']['checked'])) {
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index eab56b97a16..01378a65786 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -44,6 +44,10 @@ $ref = GETPOST('ref', 'alpha');
 if ($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('contractcard', 'globalcard'));  -> Conflict with contrat\card.php
+$hookmanager->initHooks(array('contractnote'));
+
 $result = restrictedArea($user, 'contrat', $id);
 
 $object = new Contrat($db);
@@ -51,16 +55,18 @@ $object->fetch($id, $ref);
 
 $permissionnote = $user->rights->contrat->creer; // Used by the include of actions_setnotes.inc.php
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('contractcard', 'globalcard'));
-
-
 
 /*
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$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
+}
 
 
 
@@ -110,7 +116,7 @@ if ($id > 0 || !empty($ref)) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->contrat->creer) {
 			if ($action != 'classify') {
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -128,9 +134,10 @@ if ($id > 0 || !empty($ref)) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index d6aec7155d6..39dfe336a31 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -37,9 +37,10 @@ $langs->loadLangs(array('products', 'contracts', 'companies'));
 
 $optioncss = GETPOST('optioncss', 'aZ09');
 
+$massaction = GETPOST('massaction', 'alpha');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -218,7 +219,7 @@ $sql = "SELECT c.rowid as cid, c.ref, c.statut as cstatut, c.ref_customer, c.ref
 $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,";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " sc.fk_soc, sc.fk_user,";
 }
 $sql .= " cd.date_ouverture_prevue,";
@@ -235,7 +236,7 @@ $sql .= " cd.tms as date_update";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$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
@@ -244,11 +245,11 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."contrat as c,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s,";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
 }
 $sql .= " ".MAIN_DB_PREFIX."contratdet as cd";
-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 (cd.rowid = ef.fk_object)";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
@@ -261,7 +262,7 @@ if ($search_product_category > 0) {
 	$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
 }
 $sql .= " AND c.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if ($mode == "0") {
@@ -292,6 +293,11 @@ if ($socid > 0) {
 	$sql .= " AND s.rowid = ".((int) $socid);
 }
 
+$filter_dateouvertureprevue = '';
+$filter_date1 = '';
+$filter_date2 = '';
+$filter_opcloture = '';
+
 $filter_dateouvertureprevue_start = dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
 $filter_dateouvertureprevue_end = dol_mktime(23, 59, 59, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
 if ($filter_dateouvertureprevue_start != '' && $filter_opouvertureprevue == -1) {
@@ -414,19 +420,20 @@ if (!empty($filter_opcloture) && $filter_opcloture != -1) {
 	$param .= '&amp;filter_opcloture='.urlencode($filter_opcloture);
 }
 if ($filter_dateouvertureprevue_start != '') {
-	$param .= '&amp;opouvertureprevueday='.$opouvertureprevueday.'&amp;opouvertureprevuemonth='.$opouvertureprevuemonth.'&amp;opouvertureprevueyear='.$opouvertureprevueyear;
+	$param .= '&amp;opouvertureprevueday='.((int) $opouvertureprevueday).'&amp;opouvertureprevuemonth='.((int) $opouvertureprevuemonth).'&amp;opouvertureprevueyear='.((int) $opouvertureprevueyear);
 }
 if ($filter_date1_start != '') {
-	$param .= '&amp;op1day='.$op1day.'&amp;op1month='.$op1month.'&amp;op1year='.$op1year;
+	$param .= '&amp;op1day='.((int) $op1day).'&amp;op1month='.((int) $op1month).'&amp;op1year='.((int) $op1year);
 }
 if ($filter_date2_start != '') {
-	$param .= '&amp;op2day='.$op2day.'&amp;op2month='.$op2month.'&amp;op2year='.$op2year;
+	$param .= '&amp;op2day='.((int) $op2day).'&amp;op2month='.((int) $op2month).'&amp;op2year='.((int) $op2year);
 }
 if ($filter_datecloture_start != '') {
-	$param .= '&amp;opclotureday='.$op2day.'&amp;opcloturemonth='.$op2month.'&amp;opclotureyear='.$op2year;
+	$param .= '&amp;opclotureday='.((int) $op2day).'&amp;opcloturemonth='.((int) $op2month).'&amp;opclotureyear='.((int) $op2year);
 }
+
 if ($optioncss != '') {
-	$param .= '&optioncss='.$optioncss;
+	$param .= '&optioncss='.urlencode($optioncss);
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -468,7 +475,7 @@ if ($mode == "5") {
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contract', 0, '', '', $limit);
 
-if ($sall) {
+if (!empty($sall)) {
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 	}
@@ -476,14 +483,15 @@ if ($sall) {
 }
 
 $morefilter = '';
+$moreforfilter = '';
 
 // If the user can view categories of products
 if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire)) {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= $langs->trans('IncludingProductWithTag').': ';
+	$tmptitle = $langs->trans('IncludingProductWithTag');
 	$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-	$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'widthcentpercentminusx maxwidth300', 1);
 	$moreforfilter .= '</div>';
 }
 
@@ -610,7 +618,7 @@ if (!empty($arrayfields['s.nom']['checked'])) {
 if (!empty($arrayfields['cd.date_ouverture_prevue']['checked'])) {
 	print '<td class="liste_titre center">';
 	$arrayofoperators = array('<'=>'<', '>'=>'>');
-	print $form->selectarray('filter_opouvertureprevue', $arrayofoperators, $filter_opouvertureprevue, 1);
+	print $form->selectarray('filter_opouvertureprevue', $arrayofoperators, $filter_opouvertureprevue, 1, 0, 0, '', 0, 0, 0, '', 'width50');
 	print ' ';
 	$filter_dateouvertureprevue = dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
 	print $form->selectDate($filter_dateouvertureprevue, 'opouvertureprevue', 0, 0, 1, '', 1, 0);
@@ -619,7 +627,7 @@ if (!empty($arrayfields['cd.date_ouverture_prevue']['checked'])) {
 if (!empty($arrayfields['cd.date_ouverture']['checked'])) {
 	print '<td class="liste_titre center">';
 	$arrayofoperators = array('<'=>'<', '>'=>'>');
-	print $form->selectarray('filter_op1', $arrayofoperators, $filter_op1, 1);
+	print $form->selectarray('filter_op1', $arrayofoperators, $filter_op1, 1, 0, 0, '', 0, 0, 0, '', 'width50');
 	print ' ';
 	$filter_date1 = dol_mktime(0, 0, 0, $op1month, $op1day, $op1year);
 	print $form->selectDate($filter_date1, 'op1', 0, 0, 1, '', 1, 0);
@@ -628,7 +636,7 @@ if (!empty($arrayfields['cd.date_ouverture']['checked'])) {
 if (!empty($arrayfields['cd.date_fin_validite']['checked'])) {
 	print '<td class="liste_titre center">';
 	$arrayofoperators = array('<'=>'<', '>'=>'>');
-	print $form->selectarray('filter_op2', $arrayofoperators, $filter_op2, 1);
+	print $form->selectarray('filter_op2', $arrayofoperators, $filter_op2, 1, 0, 0, '', 0, 0, 0, '', 'width50');
 	print ' ';
 	$filter_date2 = dol_mktime(0, 0, 0, $op2month, $op2day, $op2year);
 	print $form->selectDate($filter_date2, 'op2', 0, 0, 1, '', 1, 0);
@@ -637,7 +645,7 @@ if (!empty($arrayfields['cd.date_fin_validite']['checked'])) {
 if (!empty($arrayfields['cd.date_cloture']['checked'])) {
 	print '<td class="liste_titre center">';
 	$arrayofoperators = array('<'=>'<', '>'=>'>');
-	print $form->selectarray('filter_opcloture', $arrayofoperators, $filter_opcloture, 1);
+	print $form->selectarray('filter_opcloture', $arrayofoperators, $filter_opcloture, 1, 0, 0, '', 0, 0, 0, '', 'width50');
 	print ' ';
 	$filter_date_cloture = dol_mktime(0, 0, 0, $opcloturemonth, $opclotureday, $opclotureyear);
 	print $form->selectDate($filter_date_cloture, 'opcloture', 0, 0, 1, '', 1, 0);
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index 310e2bd00b9..cdbda7a17b8 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 -->\n";
+print "<!-- BEGIN PHP TEMPLATE contrat/tpl/linkedopjectblock.tpl.php -->\n";
 
 
 global $user;
@@ -46,7 +46,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	?>
 <tr class="<?php echo $trclass; ?>">
 	<td><?php echo $langs->trans("Contract"); ?></td>
-	<td><?php echo $objectlink->getNomUrl(1); ?></td>
+	<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
@@ -62,7 +62,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		echo price($totalcontrat);
 	} ?></td>
 	<td class="right"><?php echo $objectlink->getLibStatut(7); ?></td>
-	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 </tr>
 	<?php
 }
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 86c5fe4175a..4857902b8cc 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -35,8 +35,7 @@ if (!empty($permissionedit) && empty($permissiontoadd)) {
 }
 
 if ($cancel) {
-	/*var_dump($cancel);
-	var_dump($backtopage);exit;*/
+	/*var_dump($cancel);var_dump($backtopage);var_dump($backtopageforcancel);exit;*/
 	if (!empty($backtopageforcancel)) {
 		header("Location: ".$backtopageforcancel);
 		exit;
@@ -53,11 +52,11 @@ if ($action == 'add' && !empty($permissiontoadd)) {
 	foreach ($object->fields as $key => $val) {
 		if ($object->fields[$key]['type'] == 'duration') {
 			if (GETPOST($key.'hour') == '' && GETPOST($key.'min') == '') {
-				continue; // The field was not submited to be edited
+				continue; // The field was not submited to be saved
 			}
 		} else {
 			if (!GETPOSTISSET($key)) {
-				continue; // The field was not submited to be edited
+				continue; // The field was not submited to be saved
 			}
 		}
 		// Ignore special fields
@@ -74,7 +73,7 @@ if ($action == 'add' && !empty($permissiontoadd)) {
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
 			$value = GETPOST($key, 'restricthtml');
 		} elseif ($object->fields[$key]['type'] == 'date') {
-			$value = dol_mktime(12, 0, 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));	// for date without hour, we use gmt
+			$value = dol_mktime(12, 0, 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int')); // for date without hour, we use gmt
 		} elseif ($object->fields[$key]['type'] == 'datetime') {
 			$value = dol_mktime(GETPOST($key.'hour', 'int'), GETPOST($key.'min', 'int'), GETPOST($key.'sec', 'int'), GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'), 'tzuserrel');
 		} elseif ($object->fields[$key]['type'] == 'duration') {
@@ -87,7 +86,11 @@ if ($action == 'add' && !empty($permissiontoadd)) {
 			$tmparraykey = array_keys($object->param_list);
 			$value = $tmparraykey[GETPOST($key)].','.GETPOST($key.'2');
 		} else {
-			$value = GETPOST($key, 'alphanohtml');
+			if ($key == 'lang') {
+				$value = GETPOST($key, 'aZ09') ?GETPOST($key, 'aZ09') : "";
+			} else {
+				$value = GETPOST($key, 'alphanohtml');
+			}
 		}
 		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') {
 			$value = ''; // This is an implicit foreign key field
@@ -105,6 +108,15 @@ if ($action == 'add' && !empty($permissiontoadd)) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
 		}
+
+		// Validation of fields values
+		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2 || !empty($conf->global->MAIN_ACTIVATE_VALIDATION_RESULT)) {
+			if (!$error && !empty($val['validate']) && is_callable(array($object, 'validateField'))) {
+				if (!$object->validateField($object->fields, $key, $value)) {
+					$error++;
+				}
+			}
+		}
 	}
 
 	// Fill array 'array_options' with data from add form
@@ -119,11 +131,16 @@ if ($action == 'add' && !empty($permissiontoadd)) {
 		$result = $object->create($user);
 		if ($result > 0) {
 			// Creation OK
+			if ($conf->categorie->enabled && 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;
 		} else {
+			$error++;
 			// Creation KO
 			if (!empty($object->errors)) {
 				setEventMessages(null, $object->errors, 'errors');
@@ -143,7 +160,7 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 		// Check if field was submited to be edited
 		if ($object->fields[$key]['type'] == 'duration') {
 			if (!GETPOSTISSET($key.'hour') || !GETPOSTISSET($key.'min')) {
-				continue; // The field was not submited to be edited
+				continue; // The field was not submited to be saved
 			}
 		} elseif ($object->fields[$key]['type'] == 'boolean') {
 			if (!GETPOSTISSET($key)) {
@@ -152,7 +169,7 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 			}
 		} else {
 			if (!GETPOSTISSET($key)) {
-				continue; // The field was not submited to be edited
+				continue; // The field was not submited to be saved
 			}
 		}
 		// Ignore special fields
@@ -161,7 +178,7 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 		}
 		if (in_array($key, array('date_creation', 'tms', 'fk_user_creat', 'fk_user_modif'))) {
 			if (!in_array(abs($val['visible']), array(1, 3, 4))) {
-				continue; // Only 1 and 3 and 4 that are case to update
+				continue; // Only 1 and 3 and 4, that are cases to update
 			}
 		}
 
@@ -174,7 +191,7 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 				$value = GETPOST($key, 'restricthtml');
 			}
 		} elseif ($object->fields[$key]['type'] == 'date') {
-			$value = dol_mktime(12, 0, 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));	// for date without hour, we use gmt
+			$value = dol_mktime(12, 0, 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int')); // for date without hour, we use gmt
 		} elseif ($object->fields[$key]['type'] == 'datetime') {
 			$value = dol_mktime(GETPOST($key.'hour', 'int'), GETPOST($key.'min', 'int'), GETPOST($key.'sec', 'int'), GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'), 'tzuserrel');
 		} elseif ($object->fields[$key]['type'] == 'duration') {
@@ -190,7 +207,11 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 		} elseif ($object->fields[$key]['type'] == 'reference') {
 			$value = array_keys($object->param_list)[GETPOST($key)].','.GETPOST($key.'2');
 		} else {
-			$value = GETPOST($key, 'alpha');
+			if ($key == 'lang') {
+				$value = GETPOST($key, 'aZ09');
+			} else {
+				$value = GETPOST($key, 'alphanohtml');
+			}
 		}
 		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') {
 			$value = ''; // This is an implicit foreign key field
@@ -204,6 +225,22 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
 		}
+
+		// Validation of fields values
+		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2 || !empty($conf->global->MAIN_ACTIVATE_VALIDATION_RESULT)) {
+			if (!$error && !empty($val['validate']) && is_callable(array($object, 'validateField'))) {
+				if (!$object->validateField($object->fields, $key, $value)) {
+					$error++;
+				}
+			}
+		}
+
+		if ($conf->categorie->enabled) {
+			$categories = GETPOST('categories', 'array');
+			if (method_exists($object, 'setCategories')) {
+				$object->setCategories($categories);
+			}
+		}
 	}
 
 	// Fill array 'array_options' with data from add form
@@ -219,6 +256,7 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 		if ($result > 0) {
 			$action = 'view';
 		} else {
+			$error++;
 			// Creation KO
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'edit';
@@ -248,6 +286,7 @@ if ($action == "update_extras" && !empty($permissiontoadd)) {
 		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		$action = 'view';
 	} else {
+		$error++;
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit_extras';
 	}
@@ -265,15 +304,19 @@ if ($action == 'confirm_delete' && !empty($permissiontodelete)) {
 	if ($result > 0) {
 		// Delete OK
 		setEventMessages("RecordDeleted", null, 'mesgs');
+
 		header("Location: ".$backurlforlist);
 		exit;
 	} else {
+		$error++;
 		if (!empty($object->errors)) {
 			setEventMessages(null, $object->errors, 'errors');
 		} else {
 			setEventMessages($object->error, null, 'errors');
 		}
 	}
+
+	$action = '';
 }
 
 // Remove a line
@@ -305,11 +348,14 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissionto
 		}
 
 		setEventMessages($langs->trans('RecordDeleted'), null, 'mesgs');
+
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit;
 	} else {
+		$error++;
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
+	$action = '';
 }
 
 // Action validate object
@@ -343,8 +389,10 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd) {
 			}
 		}
 	} else {
+		$error++;
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
+	$action = '';
 }
 
 // Action close object
@@ -373,8 +421,10 @@ if ($action == 'confirm_close' && $confirm == 'yes' && $permissiontoadd) {
 			}
 		}
 	} else {
+		$error++;
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
+	$action = '';
 }
 
 // Action setdraft object
@@ -383,8 +433,10 @@ if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissiontoadd) {
 	if ($result >= 0) {
 		// Nothing else done
 	} else {
+		$error++;
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
+	$action = '';
 }
 
 // Action reopen object
@@ -413,8 +465,10 @@ if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) {
 			}
 		}
 	} else {
+		$error++;
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
+	$action = '';
 }
 
 // Action clone object
@@ -433,9 +487,11 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd))
 			} else {
 				$newid = $result;
 			}
+
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid); // Open record of new object
 			exit;
 		} else {
+			$error++;
 			setEventMessages($objectutil->error, $objectutil->errors, 'errors');
 			$action = '';
 		}
diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index 63cac253976..c813e8af4a0 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -66,13 +66,13 @@ if ($action == 'builddoc' && $permissiontoadd) {
 		$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) && isset($object->thirdparty->default_lang)) {
+		if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && isset($object->thirdparty->default_lang)) {
 			$newlang = $object->thirdparty->default_lang; // for proposal, order, invoice, ...
 		}
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) {
+		if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && isset($object->default_lang)) {
 			$newlang = $object->default_lang; // for thirdparty
 		}
 		if (!empty($newlang)) {
@@ -102,12 +102,12 @@ if ($action == 'builddoc' && $permissiontoadd) {
 			if (empty($donotredirect)) {	// This is set when include is done by bulk action "Bill Orders"
 				setEventMessages($langs->trans("FileGenerated"), null);
 
-				$urltoredirect = $_SERVER['REQUEST_URI'];
+				/*$urltoredirect = $_SERVER['REQUEST_URI'];
 				$urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
 				$urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect); // To avoid infinite loop
 
 				header('Location: '.$urltoredirect.'#builddoc');
-				exit;
+				exit;*/
 			}
 		}
 	}
@@ -127,8 +127,23 @@ if ($action == 'remove_file' && $permissiontoadd) {
 		$langs->load("other");
 		$filetodelete = GETPOST('file', 'alpha');
 		$file = $upload_dir.'/'.$filetodelete;
+		$dirthumb = dirname($file).'/thumbs/'; // Chemin du dossier contenant la vignette (if file is an image)
 		$ret = dol_delete_file($file, 0, 0, 0, $object);
 		if ($ret) {
+			// If it exists, remove thumb.
+			$regs = array();
+			if (preg_match('/(\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff)$/i', $file, $regs)) {
+				$photo_vignette = basename(preg_replace('/'.$regs[0].'/i', '', $file).'_small'.$regs[0]);
+				if (file_exists(dol_osencode($dirthumb.$photo_vignette))) {
+					dol_delete_file($dirthumb.$photo_vignette);
+				}
+
+				$photo_vignette = basename(preg_replace('/'.$regs[0].'/i', '', $file).'_mini'.$regs[0]);
+				if (file_exists(dol_osencode($dirthumb.$photo_vignette))) {
+					dol_delete_file($dirthumb.$photo_vignette);
+				}
+			}
+
 			setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
 		} else {
 			setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
diff --git a/htdocs/core/actions_dellink.inc.php b/htdocs/core/actions_dellink.inc.php
index a7ac035506f..fbecacce515 100644
--- a/htdocs/core/actions_dellink.inc.php
+++ b/htdocs/core/actions_dellink.inc.php
@@ -27,17 +27,42 @@
 // $permissiondellink must be defined
 
 $dellinkid = GETPOST('dellinkid', 'int');
+$addlink = GETPOST('addlink', 'alpha');
 $addlinkid = GETPOST('idtolinkto', 'int');
+$addlinkref = GETPOST('reftolinkto', 'alpha');
+$cancellink = GETPOST('cancel', 'alpha');
 
 // Link invoice to order
-if ($action == 'addlink' && !empty($permissiondellink) && !GETPOST('cancel', 'alpha') && $id > 0 && $addlinkid > 0) {
+if ($action == 'addlink' && !empty($permissiondellink) && !$cancellink && $id > 0 && $addlinkid > 0) {
 	$object->fetch($id);
 	$object->fetch_thirdparty();
-	$result = $object->add_object_linked(GETPOST('addlink', 'alpha'), $addlinkid);
+	$result = $object->add_object_linked($addlink, $addlinkid);
+}
+
+// Link by reference
+if ($action == 'addlinkbyref' && ! empty($permissiondellink) && !$cancellink && $id > 0 && !empty($addlinkref) && !empty($conf->global->MAIN_LINK_BY_REF_IN_LINKTO)) {
+	$element_prop = getElementProperties($addlink);
+	if (is_array($element_prop)) {
+		dol_include_once('/' . $element_prop['classpath'] . '/' . $element_prop['classfile'] . '.class.php');
+
+		$objecttmp = new $element_prop['classname']($db);
+		$ret = $objecttmp->fetch(0, $addlinkref);
+		if ($ret > 0) {
+			$object->fetch($id);
+			$object->fetch_thirdparty();
+			$result = $object->add_object_linked($addlink, $objecttmp->id);
+			if (isset($_POST['reftolinkto'])) unset($_POST['reftolinkto']);
+		} elseif ($ret < 0) {
+			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+		} else {
+			$langs->load('errors');
+			setEventMessage($langs->trans('ErrorRecordNotFound'), 'errors');
+		}
+	}
 }
 
 // Delete link
-if ($action == 'dellink' && !empty($permissiondellink) && !GETPOST('cancel', 'alpha') && $dellinkid > 0) {
+if ($action == 'dellink' && !empty($permissiondellink) && !$cancellink && $dellinkid > 0) {
 	$result = $object->deleteObjectLinked(0, '', 0, '', $dellinkid);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 3e2438f63d3..86d4e923131 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -36,8 +36,19 @@ if (GETPOST('uploadform', 'int') && empty($_POST) && empty($_FILES)) {
 	die;
 }
 
+if ((GETPOST('sendit', 'alpha')
+	|| GETPOST('linkit', 'restricthtml')
+	|| ($action == 'confirm_deletefile' && $confirm == 'yes')
+	|| ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha'))
+	|| ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))) && empty($permissiontoadd)) {
+	dol_syslog('The file actions_linkedfiles.inc.php was included but paramater $permissiontoadd as not set before.');
+	print 'The file actions_linkedfiles.inc.php was included but paramater $permissiontoadd as not set before.';
+	die;
+}
+
+
 // Submit file/link
-if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC) && (!isset($permissiontoadd) || $permissiontoadd)) {
+if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC) && !empty($permissiontoadd)) {
 	if (!empty($_FILES)) {
 		if (is_array($_FILES['userfile']['tmp_name'])) {
 			$userfiles = $_FILES['userfile']['tmp_name'];
@@ -75,7 +86,7 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC) && (!is
 			}
 		}
 	}
-} elseif (GETPOST('linkit', 'restricthtml') && !empty($conf->global->MAIN_UPLOAD_DOC) && (!isset($permissiontoadd) || $permissiontoadd)) {
+} elseif (GETPOST('linkit', 'restricthtml') && !empty($conf->global->MAIN_UPLOAD_DOC) && !empty($permissiontoadd)) {
 	$link = GETPOST('link', 'alpha');
 	if ($link) {
 		if (substr($link, 0, 7) != 'http://' && substr($link, 0, 8) != 'https://' && substr($link, 0, 7) != 'file://' && substr($link, 0, 7) != 'davs://') {
@@ -87,7 +98,7 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC) && (!is
 
 
 // Delete file/link
-if ($action == 'confirm_deletefile' && $confirm == 'yes' && (!isset($permissiontoadd) || $permissiontoadd)) {
+if ($action == 'confirm_deletefile' && $confirm == 'yes' && !empty($permissiontoadd)) {
 	$urlfile = GETPOST('urlfile', 'alpha', 0, null, null, 1); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 	if (GETPOST('section', 'alpha')) {
 		// For a delete from the ECM module, upload_dir is ECM root dir and urlfile contains relative path from upload_dir
@@ -112,21 +123,20 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes' && (!isset($permissiont
 			dol_delete_file($fileold, 0, 0, 0, (is_object($object) ? $object : null)); // Delete file using old path
 		}
 
-		// If it exists, remove thumb.
-		$regs = array();
-		if (preg_match('/(\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff)$/i', $file, $regs)) {
-			$photo_vignette = basename(preg_replace('/'.$regs[0].'/i', '', $file).'_small'.$regs[0]);
-			if (file_exists(dol_osencode($dirthumb.$photo_vignette))) {
-				dol_delete_file($dirthumb.$photo_vignette);
-			}
-
-			$photo_vignette = basename(preg_replace('/'.$regs[0].'/i', '', $file).'_mini'.$regs[0]);
-			if (file_exists(dol_osencode($dirthumb.$photo_vignette))) {
-				dol_delete_file($dirthumb.$photo_vignette);
-			}
-		}
-
 		if ($ret) {
+			// If it exists, remove thumb.
+			$regs = array();
+			if (preg_match('/(\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff)$/i', $file, $regs)) {
+				$photo_vignette = basename(preg_replace('/'.$regs[0].'/i', '', $file).'_small'.$regs[0]);
+				if (file_exists(dol_osencode($dirthumb.$photo_vignette))) {
+					dol_delete_file($dirthumb.$photo_vignette);
+				}
+
+				$photo_vignette = basename(preg_replace('/'.$regs[0].'/i', '', $file).'_mini'.$regs[0]);
+				if (file_exists(dol_osencode($dirthumb.$photo_vignette))) {
+					dol_delete_file($dirthumb.$photo_vignette);
+				}
+			}
 			setEventMessages($langs->trans("FileWasRemoved", $urlfile), null, 'mesgs');
 		} else {
 			setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors');
@@ -159,7 +169,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes' && (!isset($permissiont
 			exit;
 		}
 	}
-} elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha') && (!isset($permissiontoadd) || $permissiontoadd)) {
+} elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha') && !empty($permissiontoadd)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$langs->load('link');
 	$link = new Link($db);
@@ -177,7 +187,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes' && (!isset($permissiont
 	} else {
 		//error fetching
 	}
-} elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha') && (!isset($permissiontoadd) || $permissiontoadd)) {
+} elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha') && !empty($permissiontoadd)) {
 	// For documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
 	if (!empty($upload_dir)) {
 		$filenamefrom = dol_sanitizeFileName(GETPOST('renamefilefrom', 'alpha'), '_', 0); // Do not remove accents
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 64578ad68bb..602897d34f9 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -81,7 +81,7 @@ if (!$error && $massaction == 'confirm_presend') {
 	$listofobjectref = array();
 	$contactidtosend = array();
 	$attachedfilesThirdpartyObj = array();
-	$oneemailperrecipient = (GETPOST('oneemailperrecipient') == 'on' ? 1 : 0);
+	$oneemailperrecipient = (GETPOST('oneemailperrecipient', 'int') ? 1 : 0);
 
 	if (!$error) {
 		$thirdparty = new Societe($db);
@@ -357,7 +357,7 @@ if (!$error && $massaction == 'confirm_presend') {
 					$tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
 					$from = trim($tmp[($reg[1] - 1)]);
 				} elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
-					$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
+					$sql = "SELECT rowid, label, email FROM ".MAIN_DB_PREFIX."c_email_senderprofile WHERE rowid = ".(int) $reg[1];
 					$resql = $db->query($sql);
 					$obj = $db->fetch_object($resql);
 					if ($obj) {
@@ -1287,6 +1287,7 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 
 	$objecttmp = new $objectclass($db);
 	$nbok = 0;
+	$TMsg = array();
 	foreach ($toselect as $toselectid) {
 		$result = $objecttmp->fetch($toselectid);
 		if ($result > 0) {
@@ -1294,7 +1295,14 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 			if ($objectclass == 'Facture' && empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $objecttmp->status != Facture::STATUS_DRAFT) {
 				$langs->load("errors");
 				$nbignored++;
-				$resaction .= '<div class="error">'.$langs->trans('ErrorOnlyDraftStatusCanBeDeletedInMassAction', $objecttmp->ref).'</div><br>';
+				$TMsg[] = '<div class="error">'.$langs->trans('ErrorOnlyDraftStatusCanBeDeletedInMassAction', $objecttmp->ref).'</div><br>';
+				continue;
+			}
+
+			if (method_exists($objecttmp, 'is_erasable') && $objecttmp->is_erasable() <= 0) {
+				$langs->load("errors");
+				$nbignored++;
+				$TMsg[] = '<div class="error">'.$langs->trans('ErrorRecordHasChildren').' '.$objecttmp->ref.'</div><br>';
 				continue;
 			}
 
@@ -1320,7 +1328,9 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 				$result = $objecttmp->delete($user);
 			}
 
-			if ($result <= 0) {
+			if (empty($result)) { // if delete returns 0, there is at least one object linked
+				$TMsg = array_merge($objecttmp->errors, $TMsg);
+			} elseif ($result < 0) { // if delete returns is < 0, there is an error, we break and rollback later
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
 				break;
@@ -1334,7 +1344,8 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 		}
 	}
 
-	if (!$error) {
+	if (empty($error)) {
+		// Message for elements well deleted
 		if ($nbok > 1) {
 			setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
 		} elseif ($nbok > 0) {
@@ -1342,10 +1353,18 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 		} else {
 			setEventMessages($langs->trans("NoRecordDeleted"), null, 'mesgs');
 		}
+
+		// Message for elements which can't be deleted
+		if (!empty($TMsg)) {
+			sort($TMsg);
+			setEventMessages('', array_unique($TMsg), 'warnings');
+		}
+
 		$db->commit();
 	} else {
 		$db->rollback();
 	}
+
 	//var_dump($listofobjectthirdparties);exit;
 }
 
@@ -1478,6 +1497,201 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 	}
 }
 
+if (!$error && ($massaction == 'enable' || ($action == 'enable' && $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->setStatut(1);
+			}
+			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("RecordsEnabled", $nbok), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("RecordEnabled"), null, 'mesgs');
+		}
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
+}
+
+if (!$error && ($massaction == 'disable' || ($action == 'disable' && $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->setStatut(0);
+			}
+			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("RecordsDisabled", $nbok), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("RecordDisabled"), null, 'mesgs');
+		}
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
+}
+
+// Approve for leave only
+if (!$error && ($massaction == 'approveleave' || ($action == 'approveleave' && $confirm == 'yes')) && $permissiontoapprove) {
+	$db->begin();
+
+	$objecttmp = new $objectclass($db);
+	$nbok = 0;
+	foreach ($toselect as $toselectid) {
+		$result = $objecttmp->fetch($toselectid);
+		if ($result>0) {
+			if ($objecttmp->statut == Holiday::STATUS_VALIDATED && $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++;
+				}
+
+				// If no SQL error, we redirect to the request form
+				if (!$error) {
+					// Calculcate number of days consummed
+					$nbopenedday = num_open_day($objecttmp->date_debut_gmt, $objecttmp->date_fin_gmt, 0, 1, $objecttmp->halfday);
+					$soldeActuel = $objecttmp->getCpforUser($objecttmp->fk_user, $objecttmp->fk_type);
+					$newSolde = ($soldeActuel - $nbopenedday);
+
+					// The modification is added to the LOG
+					$result = $objecttmp->addLogCP($user->id, $objecttmp->fk_user, $langs->transnoentitiesnoconv("Holidays"), $newSolde, $objecttmp->fk_type);
+					if ($result < 0) {
+						$error++;
+						setEventMessages(null, $objecttmp->errors, 'errors');
+					}
+
+					// Update balance
+					$result = $objecttmp->updateSoldeCP($objecttmp->fk_user, $newSolde, $objecttmp->fk_type);
+					if ($result < 0) {
+						$error++;
+						setEventMessages(null, $objecttmp->errors, 'errors');
+					}
+				}
+
+				if (!$error) {
+					// To
+					$destinataire = new User($db);
+					$destinataire->fetch($objecttmp->fk_user);
+					$emailTo = $destinataire->email;
+
+					if (!$emailTo) {
+						dol_syslog("User that request leave has no email, so we redirect directly to finished page without sending email");
+					} else {
+						// From
+						$expediteur = new User($db);
+						$expediteur->fetch($objecttmp->fk_validator);
+						//$emailFrom = $expediteur->email;		Email of user can be an email into another company. Sending will fails, we must use the generic email.
+						$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
+
+						// Subject
+						$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
+						if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+							$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+						}
+
+						$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysValidated");
+
+						// Content
+						$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
+						$message .= "\n";
+
+						$message .= $langs->transnoentities("HolidaysValidatedBody", dol_print_date($objecttmp->date_debut, 'day'), dol_print_date($objecttmp->date_fin, 'day'))."\n";
+
+						$message .= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+
+						$message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$objecttmp->id."\n\n";
+						$message .= "\n";
+
+						$trackid = 'leav'.$objecttmp->id;
+
+						$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+
+						// Sending email
+						$result = $mail->sendfile();
+
+						if (!$result) {
+							setEventMessages($mail->error, $mail->errors, 'warnings'); // Show error, but do no make rollback, so $error is not set to 1
+							$action = '';
+						}
+					}
+				}
+
+				if (!$error) {
+					$db->commit();
+					$nbok++;
+				} else {
+					$db->rollback();
+					$action = '';
+				}
+			}
+		} else {
+			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			$error++;
+			break;
+		}
+	}
+
+	if (!$error) {
+		if ($nbok > 1) {
+			setEventMessages($langs->trans("RecordsApproved", $nbok), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("RecordAproved"), null, 'mesgs');
+		}
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
+}
+
 $parameters['toselect'] = $toselect;
 $parameters['uploaddir'] = $uploaddir;
 $parameters['massaction'] = $massaction;
diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index 797bb8e4cb7..fbf526fd58e 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -26,8 +26,16 @@
 // $arrayofparameters must be set for action 'update'
 // $nomessageinupdate can be set to 1
 // $nomessageinsetmoduleoptions can be set to 1
+// $formSetup may be defined
 
-if ($action == 'update' && is_array($arrayofparameters)) {
+
+if ($action == 'update' && !empty($formSetup) && is_object($formSetup) && !empty($user->admin)) {
+	$formSetup->saveConfFromPost();
+	return;
+}
+
+
+if ($action == 'update' && is_array($arrayofparameters) && !empty($user->admin)) {
 	$db->begin();
 
 	foreach ($arrayofparameters as $key => $val) {
@@ -64,8 +72,37 @@ if ($action == 'update' && is_array($arrayofparameters)) {
 	}
 }
 
+if ($action == 'deletefile' && $modulepart == 'doctemplates' && !empty($user->admin)) {
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	$keyforuploaddir = GETPOST('keyforuploaddir', 'aZ09');
+
+	$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($keyforuploaddir))));
+	foreach ($listofdir as $key => $tmpdir) {
+		$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);	// Clean string if we found a hardcoded DOL_DATA_ROOT
+		if (!$tmpdir) {
+			unset($listofdir[$key]);
+			continue;
+		}
+		$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir;	// Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
+		if (!is_dir($tmpdir)) {
+			if (empty($nomessageinsetmoduleoptions)) {
+				setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
+			}
+		} else {
+			$upload_dir = $tmpdir;
+			break;	// So we take the first directory found into setup $conf->global->$keyforuploaddir
+		}
+	}
+
+	$filetodelete = $tmpdir.'/'.GETPOST('file');
+	$result = dol_delete_file($filetodelete);
+	if ($result > 0) {
+		setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
+	}
+}
+
 // Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions') {
+if ($action == 'setModuleOptions' && !empty($user->admin)) {
 	$db->begin();
 
 	// Process common param fields
@@ -89,20 +126,22 @@ if ($action == 'setModuleOptions') {
 	if (GETPOST('upload', 'alpha') && GETPOST('keyforuploaddir', 'aZ09')) {
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$keyforuploaddir = GETPOST('keyforuploaddir', 'aZ09');
-		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->$keyforuploaddir)));
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($keyforuploaddir))));
 		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
-			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);	// Clean string if we found a hardcoded DOL_DATA_ROOT
 			if (!$tmpdir) {
 				unset($listofdir[$key]);
 				continue;
 			}
+			$tmpdir = DOL_DATA_ROOT.'/'.$tmpdir;	// Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
 			if (!is_dir($tmpdir)) {
 				if (empty($nomessageinsetmoduleoptions)) {
 					setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
 				}
 			} else {
 				$upload_dir = $tmpdir;
+				break;	// So we take the first directory found into setup $conf->global->$keyforuploaddir
 			}
 		}
 		if ($upload_dir) {
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 917a9786ab2..c4b79d89920 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -204,6 +204,8 @@ if ($type == 'directory') {
 		'contract',
 		'product',
 		'tax',
+		'tax-vat',
+		'salaries',
 		'project',
 		'project_task',
 		'fichinter',
@@ -218,13 +220,14 @@ if ($type == 'directory') {
 
 	$parameters = array('modulepart'=>$module);
 	$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
-	if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray)>0) {
-		$automodules[]=$hookmanager->resArray['module'];
+	if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray) > 0) {
+		$automodules[] = $hookmanager->resArray['module'];
 	}
 
 	// TODO change for multicompany sharing
 	if ($module == 'company') {
 		$upload_dir = $conf->societe->dir_output;
+		$excludefiles[] = '^contact$'; // The subdir 'contact' contains files of contacts.
 	} elseif ($module == 'invoice') {
 		$upload_dir = $conf->facture->dir_output;
 	} elseif ($module == 'invoice_supplier') {
@@ -243,6 +246,11 @@ if ($type == 'directory') {
 		$upload_dir = $conf->product->dir_output;
 	} elseif ($module == 'tax') {
 		$upload_dir = $conf->tax->dir_output;
+		$excludefiles[] = '^vat$'; // The subdir 'vat' contains files of vats.
+	} elseif ($module == 'tax-vat') {
+		$upload_dir = $conf->tax->dir_output.'/vat';
+	} elseif ($module == 'salaries') {
+		$upload_dir = $conf->salaries->dir_output;
 	} elseif ($module == 'project') {
 		$upload_dir = $conf->projet->dir_output;
 	} elseif ($module == 'project_task') {
@@ -280,10 +288,6 @@ if ($type == 'directory') {
 
 		$textifempty = ($section ? $langs->trans("NoFileFound") : ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("NoFileFound")));
 
-		if ($module == 'company') {
-			$excludefiles[] = '^contact$'; // The subdir 'contact' contains files of contacts with no id of thirdparty.
-		}
-
 		$filter = preg_quote($search_doc_ref, '/');
 		$filearray = dol_dir_list($upload_dir, "files", 1, $filter, $excludefiles, $sortfield, $sorting, 1);
 
@@ -334,13 +338,13 @@ if ($type == 'directory') {
 		if ($section) {
 			$param .= '&section='.$section;
 			if (isset($search_doc_ref) && $search_doc_ref != '') {
-				$param .= '&search_doc_ref='.$search_doc_ref;
+				$param .= '&search_doc_ref='.urlencode($search_doc_ref);
 			}
 
 			$textifempty = $langs->trans('NoFileFound');
 		} elseif ($section === '0') {
 			if ($module == 'ecm') {
-				$textifempty = '<br><div class="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
+				$textifempty = '<br><div class="center"><span class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</span></div><br>';
 			} else {
 				$textifempty = $langs->trans('NoFileFound');
 			}
@@ -402,9 +406,9 @@ if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) {
 
 //$param.=($param?'?':'').(preg_replace('/^&/','',$param));
 
-if ($useajax || $action == 'delete') {
+if ($useajax || $action == 'deletefile') {
 	$urlfile = '';
-	if ($action == 'delete') {
+	if ($action == 'deletefile') {
 		$urlfile = GETPOST('urlfile', 'alpha');
 	}
 
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index 9a0a11f04d4..19c389ec7f8 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -125,7 +125,7 @@ $userstatic = new User($db);
 $form = new Form($db);
 $ecmdirstatic = new EcmDirectory($db);
 
-// Load full tree of ECM module from database. We will use it to define nbofsubdir and nboffilesinsubdir
+// Load full manual tree of ECM module from database. We will use it to define nbofsubdir and nboffilesinsubdir
 if (empty($sqltree)) {
 	$sqltree = $ecmdirstatic->get_full_arbo(0);
 }
@@ -160,7 +160,7 @@ if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_
 	            	</script>';
 
 	// This ajax service is called only when a directory $selecteddir is opened but not when closed.
-	//print '<script language="javascript">';
+	//print '<script type="text/javascript">';
 	//print "loadandshowpreview('".dol_escape_js($selecteddir)."');";
 	//print '</script>';
 }
@@ -169,7 +169,7 @@ if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_
 if (empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_ECM_DISABLE_JS)) {
 	print '<ul class="ecmjqft">';
 
-	// Load full tree from database. We will use it to define nbofsubdir and nboffilesinsubdir
+	// Load full manual tree from database. We will use it to define nbofsubdir and nboffilesinsubdir
 	if (empty($sqltree)) {
 		$sqltree = $ecmdirstatic->get_full_arbo(0); // Slow
 	}
@@ -283,7 +283,7 @@ if (empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_ECM_DISABLE_
 			print '</td>';
 			print '<td class="left">';
 			if ($nbofsubdir && $nboffilesinsubdir) {
-				print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+				print '<span style="color: #AAAAAA">+'.$nboffilesinsubdir.'</span> ';
 			}
 			print '</td>';
 
@@ -439,7 +439,7 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 						print '</td>';
 						print '<td class="left">';
 						if ($nbofsubdir > 0 && $nboffilesinsubdir > 0) {
-							print '<font class="opacitymedium">+'.$nboffilesinsubdir.'</font> ';
+							print '<span class="opacitymedium">+'.$nboffilesinsubdir.'</span> ';
 						}
 						print '</td>';
 
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index 35d10af49b6..a5efb52e787 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -75,12 +75,9 @@ if ($action == 'stopreminder') {
 	$listofreminderid = GETPOST('listofreminderids', 'intcomma');
 
 	// Set the reminder as done
-	//foreach ($listofreminderidsarray as $listofreminderid) {
-	//	if (empty($listofreminderid)) continue;
-	//$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'action_reminder WHERE rowid = '.$listofreminderid.' AND fk_user = '.$user->id;
 	$sql = 'UPDATE '.MAIN_DB_PREFIX.'actioncomm_reminder SET status = 1';
 	$sql .= ' WHERE status = 0 AND rowid IN ('.$db->sanitize($db->escape($listofreminderid)).')';
-	$sql .= ' AND fk_user = '.$user->id.' AND entity = '.$conf->entity;
+	$sql .= ' AND fk_user = '.((int) $user->id).' AND entity = '.((int) $conf->entity);
 	$resql = $db->query($sql);
 	if (!$resql) {
 		dol_print_error($db);
@@ -149,13 +146,13 @@ if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto
 	$sql = 'SELECT a.id as id_agenda, a.code, a.datep, a.label, a.location, ar.rowid as id_reminder, ar.dateremind, ar.fk_user as id_user_reminder';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a';
 	if (!empty($user->conf->MAIN_USER_WANT_ALL_EVENTS_NOTIFICATIONS)) {
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_reminder as ar ON a.id = ar.fk_actioncomm AND ar.fk_user = '.$user->id;
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_reminder as ar ON a.id = ar.fk_actioncomm AND ar.fk_user = '.((int) $user->id);
 		$sql .= ' WHERE a.code <> "AC_OTH_AUTO"';
 		$sql .= ' AND (';
 		$sql .= " (ar.typeremind = 'browser' AND ar.dateremind < '".$db->idate(dol_now())."' AND ar.status = 0 AND ar.entity = ".$conf->entity;
 		$sql .= ' )';
 	} else {
-		$sql .= ' JOIN '.MAIN_DB_PREFIX.'actioncomm_reminder as ar ON a.id = ar.fk_actioncomm AND ar.fk_user = '.$user->id;
+		$sql .= ' JOIN '.MAIN_DB_PREFIX.'actioncomm_reminder as ar ON a.id = ar.fk_actioncomm AND ar.fk_user = '.((int) $user->id);
 		$sql .= " AND ar.typeremind = 'browser' AND ar.dateremind < '".$db->idate(dol_now())."' AND ar.status = 0 AND ar.entity = ".$conf->entity;
 	}
 	$sql .= $db->order('datep', 'ASC');
@@ -173,8 +170,10 @@ if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto
 			$event['code'] = $obj->code;
 			$event['label'] = $obj->label;
 			$event['location'] = $obj->location;
-			$event['reminder_date_formated'] = dol_print_date($db->jdate($obj->dateremind), 'standard');
-			$event['event_date_start_formated'] = dol_print_date($db->jdate($obj->datep), 'standard');
+			$event['reminder_date_formated_tzserver'] = dol_print_date($db->jdate($obj->dateremind), 'standard', 'tzserver');
+			$event['event_date_start_formated_tzserver'] = dol_print_date($db->jdate($obj->datep), 'standard', 'tzserver');
+			$event['reminder_date_formated'] = dol_print_date($db->jdate($obj->dateremind), 'standard', 'tzuser');
+			$event['event_date_start_formated'] = dol_print_date($db->jdate($obj->datep), 'standard', 'tzuser');
 
 			$eventfound[$obj->id_agenda] = $event;
 		}
diff --git a/htdocs/core/ajax/constantonoff.php b/htdocs/core/ajax/constantonoff.php
index 60684c1520b..b8beec3111a 100644
--- a/htdocs/core/ajax/constantonoff.php
+++ b/htdocs/core/ajax/constantonoff.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2011-2015 Regis Houssin  <regis.houssin@inodbox.com>
+/* Copyright (C) 2011-2015 Regis Houssin <regis.houssin@inodbox.com>
+ * Copyright (C) 2021      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,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 $action = GETPOST('action', 'aZ09'); // set or del
 $name = GETPOST('name', 'alpha');
+$entity = GETPOST('entity', 'int');
+$value = ((GETPOST('value', 'int') || GETPOST('value', 'int') == '0') ? GETPOST('value', 'int') : 1);
 
 
 /*
@@ -64,9 +67,6 @@ top_httphead();
 
 // Registering the new value of constant
 if (!empty($action) && !empty($name)) {
-	$entity = GETPOST('entity', 'int');
-	$value = (GETPOST('value') ?GETPOST('value') : 1);
-
 	if ($user->admin) {
 		if ($action == 'set') {
 			dolibarr_set_const($db, $name, $value, 'chaine', 0, '', $entity);
diff --git a/htdocs/core/ajax/fetchKnowledgeRecord.php b/htdocs/core/ajax/fetchKnowledgeRecord.php
new file mode 100644
index 00000000000..0182887c225
--- /dev/null
+++ b/htdocs/core/ajax/fetchKnowledgeRecord.php
@@ -0,0 +1,92 @@
+<?php
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       /htdocs/core/ajax/fetchKnowledgeRecord.php
+ *	\brief      File to make Ajax action on Knowledge Management
+ */
+
+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 '../../main.inc.php';
+
+$action = GETPOST('action', 'aZ09');
+$idticketgroup = GETPOST('idticketgroup', 'aZ09');
+$idticketgroup = GETPOST('idticketgroup', 'aZ09');
+$lang = GETPOST('lang', 'aZ09');
+
+/*
+ * Actions
+ */
+
+// None
+
+
+/*
+ * View
+ */
+
+if ($action == "getKnowledgeRecord") {
+	$response = '';
+	$sql = "SELECT kr.rowid, kr.ref, kr.question, kr.answer,kr.url,ctc.code";
+	$sql .= " FROM ".MAIN_DB_PREFIX."knowledgemanagement_knowledgerecord as kr ";
+	$sql .= " JOIN ".MAIN_DB_PREFIX."c_ticket_category as ctc ON ctc.rowid = kr.fk_c_ticket_category";
+	$sql .= " WHERE ctc.code = '".$db->escape($idticketgroup)."'";
+	$sql .= " AND ctc.active = 1 AND ctc.public = 1 AND (kr.lang = '".$db->escape($lang)."' OR kr.lang = 0 OR kr.lang IS NULL)";
+	$sql .= " AND kr.status = 1 AND (kr.answer IS NOT NULL AND kr.answer <> '')";
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		$i = 0;
+		$response = array();
+		while ($i < $num) {
+			$obj = $db->fetch_object($resql);
+			$response[] = array('title'=>$obj->question,'ref'=>$obj->ref,'answer'=>dol_escape_htmltag(preg_replace('/\\r|\\r\\n|\\n/', "", $obj->answer)),'url'=>$obj->url);
+			$i++;
+		}
+	} else {
+		dol_print_error($db);
+	}
+	$response =json_encode($response);
+	echo $response;
+}
diff --git a/htdocs/core/ajax/locationincoterms.php b/htdocs/core/ajax/locationincoterms.php
new file mode 100644
index 00000000000..3a508a07057
--- /dev/null
+++ b/htdocs/core/ajax/locationincoterms.php
@@ -0,0 +1,110 @@
+<?php
+/* Copyright (C) 2010      Regis Houssin       <regis.houssin@inodbox.com>
+ * Copyright (C) 2011-2014 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 	   Henry Guo <henrynopo@homtail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file      htdocs/core/ajax/locationincoterms.php
+ *       \ingroup	core
+ *       \brief     File to return Ajax response on location_incoterms 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';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.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('location_incoterms call with MAIN_USE_LOCATION_INCOTERMS_DICTIONNARY='.(empty($conf->global->MAIN_USE_LOCATION_INCOTERMS_DICTIONNARY) ? '' : $conf->global->MAIN_USE_LOCATION_INCOTERMS_DICTIONNARY));
+//var_dump($_GET);
+
+// Generation of list of zip-town
+if (GETPOST('location_incoterms')) {
+	$return_arr = array();
+
+	// Define filter on text typed
+	$location_incoterms = GETPOST('location_incoterms');
+
+	if (!empty($conf->global->MAIN_USE_LOCATION_INCOTERMS_DICTIONNARY)) {   // Use location_incoterms
+		$sql = "SELECT z.location as location_incoterms, z.label as label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_location_incoterms as z";
+		$sql .= " WHERE z.active = 1  AND UPPER(z.location) LIKE UPPER('%".$db->escape($location_incoterms)."%')";
+		$sql .= " ORDER BY z.location";
+		$sql .= $db->plimit(100); // Avoid pb with bad criteria
+	} else // Use table of commande
+	{
+		$sql = "SELECT DISTINCT s.location_incoterms FROM ".MAIN_DB_PREFIX.'commande as s';
+		$sql .= " WHERE UPPER(s.location_incoterms) LIKE UPPER('%".$db->escape($location_incoterms)."%')";
+
+		//Todo: merge with data from table of supplier order
+		/*	$sql .=" UNION";
+		$sql .= " SELECT DISTINCT p.location_incoterms FROM ".MAIN_DB_PREFIX.'commande_fournisseur as p';
+		$sql .= " WHERE UPPER(p.location_incoterms) LIKE UPPER('%".$db->escape($location_incoterms)."%')";
+		*/
+		$sql .= " ORDER BY s.location_incoterms";
+		$sql .= $db->plimit(100); // Avoid pb with bad criteria
+	}
+
+	//print $sql;
+	$resql = $db->query($sql);
+	//var_dump($db);
+	if ($resql) {
+		while ($row = $db->fetch_array($resql)) {
+			$row_array['label'] = $row['location_incoterms'].($row['label']?' - '.$row['label'] : '');
+			if ($location_incoterms) {
+				$row_array['value'] = $row['location_incoterms'];
+			}
+			// TODO Use a cache here to avoid to make select_state in each pass (this make a SQL and lot of logs)
+
+			array_push($return_arr, $row_array);
+		}
+	}
+
+	echo json_encode($return_arr);
+}
+
+$db->close();
diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php
new file mode 100644
index 00000000000..5110918541f
--- /dev/null
+++ b/htdocs/core/ajax/onlineSign.php
@@ -0,0 +1,180 @@
+<?php
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       /htdocs/core/ajax/onlineSign.php
+ *	\brief      File to make Ajax action on Knowledge Management
+ */
+
+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 '../../main.inc.php';
+
+$action = GETPOST('action', 'aZ09');
+
+$signature = GETPOST('signaturebase64');
+$ref = GETPOST('ref', 'aZ09');
+$mode = GETPOST('mode', 'aZ09');
+$SECUREKEY = GETPOST("securekey"); // Secure key
+
+$error = 0;
+$response = "";
+
+$type = $mode;
+
+// Check securitykey
+$securekeyseed = '';
+if ($type == 'proposal') {
+	$securekeyseed = $conf->global->PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN;
+}
+
+if (!dol_verifyHash($securekeyseed.$type.$ref, $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);
+}
+
+
+/*
+ * Actions
+ */
+
+// None
+
+
+/*
+ * View
+ */
+
+if ($action == "importSignature") {
+	if (!empty($signature) && $signature[0] == "image/png;base64") {
+		$signature = $signature[1];
+		$data = base64_decode($signature);
+
+		if ($mode == "propale" || $mode == 'proposal') {
+			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+			$object = new Propal($db);
+			$object->fetch(0, $ref);
+
+			$upload_dir = !empty($conf->propal->multidir_output[$object->entity])?$conf->propal->multidir_output[$object->entity]:$conf->propal->dir_output;
+			$upload_dir .= '/'.dol_sanitizeFileName($object->ref).'/';
+
+			$date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
+			$filename = "signatures/".$date."_signature.png";
+			if (!is_dir($upload_dir."signatures/")) {
+				if (!dol_mkdir($upload_dir."signatures/")) {
+					$response ="Error mkdir. Failed to create dir ".$upload_dir."signatures/";
+					$error++;
+				}
+			}
+
+			if (!$error) {
+				$return = file_put_contents($upload_dir.$filename, $data);
+				if ($return == false) {
+					$error++;
+					$response = 'Error file_put_content: failed to create signature file.';
+				}
+			}
+
+			if (!$error) {
+				$newpdffilename = $upload_dir.$ref."_signed-".$date.".pdf";
+
+				$pdf = pdf_getInstance();
+				$pdf->Open();
+				$pdf->AddPage();
+				$pagecount = $pdf->setSourceFile($upload_dir.$ref.".pdf");		// original 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");
+
+				$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
+
+				$sql  = "UPDATE ".MAIN_DB_PREFIX."propal";
+				$sql .= " SET fk_statut = ".((int) $object::STATUS_SIGNED).", note_private = '".$db->escape($object->note_private)."',";
+				$sql .= " date_signature = '".$db->idate(dol_now())."',";
+				$sql .= " online_sign_ip = '".$db->escape($online_sign_ip)."'";
+				if ($online_sign_name) {
+					$sql .= ", online_sign_name = '".$db->escape($online_sign_name)."'";
+				}
+				$sql .= " WHERE rowid = ".((int) $object->id);
+
+				dol_syslog(__METHOD__, LOG_DEBUG);
+				$resql = $db->query($sql);
+				if (!$resql) {
+					$error++;
+				} else {
+					$num = $db->affected_rows($resql);
+				}
+
+				if (!$error) {
+					$db->commit();
+					$response = "success";
+					setEventMessages("PropalSigned", null, 'warnings');
+				} else {
+					$db->rollback();
+					$error++;
+					$response = "error sql";
+				}
+			}
+		}
+	} else {
+		$error++;
+		$response = 'error signature_not_found';
+	}
+}
+
+if ($error) {
+	http_response_code(501);
+}
+
+echo $response;
diff --git a/htdocs/core/ajax/row.php b/htdocs/core/ajax/row.php
index 6047d8d289c..9853faa8585 100644
--- a/htdocs/core/ajax/row.php
+++ b/htdocs/core/ajax/row.php
@@ -95,10 +95,14 @@ 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 == 'facture_fourn_det_rec' && $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))) {
 		$perm = 1;
 	} elseif ($table_element_line == 'ecm_files' && $fk_element == 'fk_ticket' && !empty($user->rights->ticket->write)) {
 		$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) {
 		$perm = 1;
 	} else {
diff --git a/htdocs/core/ajax/security.php b/htdocs/core/ajax/security.php
index 066e5b7812d..0056120c6bd 100644
--- a/htdocs/core/ajax/security.php
+++ b/htdocs/core/ajax/security.php
@@ -53,7 +53,7 @@ top_httphead();
 
 // Registering the location of boxes
 if (isset($_GET['action']) && !empty($_GET['action'])) {
-	if ($_GET['action'] == 'getrandompassword' && $user->admin) {
+	if ($_GET['action'] == 'getrandompassword' && ($user->admin || $user->rights->api->apikey->generate)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 		$generic = $_GET['generic'] ? true : false;
 		echo getRandomPassword($generic);
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 1814b476d06..ae4f7c41515 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -65,58 +65,58 @@ $arrayresult = array();
 // Define $searchform
 
 if (!empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire) {
-	$arrayresult['searchintomember'] = array('position'=>8, 'shortcut'=>'M', 'img'=>'object_member', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('', 'object_member').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+	$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) {
-	$arrayresult['searchintothirdparty'] = array('position'=>10, 'shortcut'=>'T', 'img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('', 'object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+	$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) {
-	$arrayresult['searchintocontact'] = array('position'=>15, 'shortcut'=>'A', 'img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('', 'object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+	$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)) {
-	$arrayresult['searchintoproduct'] = array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'text'=>img_picto('', 'object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+	$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) ) {
-		$arrayresult['searchintobatch'] = array('position'=>32, 'shortcut'=>'B', 'img'=>'object_lot', 'label'=>$langs->trans("SearchIntoBatch", $search_boxvalue), 'text'=>img_picto('', 'object_lot').' '.$langs->trans("SearchIntoBatch", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/stock/productlot_list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+		$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)) {
-	$arrayresult['searchintomo'] = array('position'=>35, 'shortcut'=>'', 'img'=>'object_mrp', 'label'=>$langs->trans("SearchIntoMO", $search_boxvalue), 'text'=>img_picto('', 'object_mrp').' '.$langs->trans("SearchIntoMO", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/mrp/mo_list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$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) {
-	$arrayresult['searchintoprojects'] = array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_project', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('', 'object_project').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$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) {
-	$arrayresult['searchintotasks'] = array('position'=>45, 'img'=>'object_projecttask', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('', 'object_projecttask').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$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) {
-	$arrayresult['searchintopropal'] = array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('', 'object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+	$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) {
-	$arrayresult['searchintoorder'] = array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('', 'object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+	$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) {
-	$arrayresult['searchintoshipment'] = array('position'=>80, 'img'=>'object_shipment', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('', 'object_shipment').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+	$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) {
-	$arrayresult['searchintoinvoice'] = array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+	$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) {
-	$arrayresult['searchintosupplierpropal'] = array('position'=>100, 'img'=>'object_supplier_proposal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_proposal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+	$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)) {
-	$arrayresult['searchintosupplierorder'] = array('position'=>110, 'img'=>'object_supplier_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
+	$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)) {
-	$arrayresult['searchintosupplierinvoice'] = array('position'=>120, 'img'=>'object_supplier_invoice', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_invoice').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+	$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
@@ -125,7 +125,7 @@ if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUST
 		'position'=>170,
 		'img'=>'object_payment',
 		'label'=>$langs->trans("SearchIntoCustomerPayments", $search_boxvalue),
-		'text'=>img_picto('', 'object_payment').' '.$langs->trans("SearchIntoCustomerPayments", $search_boxvalue),
+		'text'=>img_picto('', 'object_payment', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerPayments", $search_boxvalue),
 		'url'=>DOL_URL_ROOT.'/compta/paiement/list.php?leftmenu=customers_bills_payment'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
 }
 
@@ -135,7 +135,7 @@ if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_S
 		'position'=>175,
 		'img'=>'object_payment',
 		'label'=>$langs->trans("SearchIntoVendorPayments", $search_boxvalue),
-		'text'=>img_picto('', 'object_payment').' '.$langs->trans("SearchIntoVendorPayments", $search_boxvalue),
+		'text'=>img_picto('', 'object_payment', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoVendorPayments", $search_boxvalue),
 		'url'=>DOL_URL_ROOT.'/fourn/paiement/list.php?leftmenu=suppliers_bills_payment'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
 }
 
@@ -145,29 +145,29 @@ if (!empty($conf->banque->enabled) && empty($conf->global->MAIN_SEARCHFORM_MISC_
 		'position'=>180,
 		'img'=>'object_payment',
 		'label'=>$langs->trans("SearchIntoMiscPayments", $search_boxvalue),
-		'text'=>img_picto('', 'object_payment').' '.$langs->trans("SearchIntoMiscPayments", $search_boxvalue),
+		'text'=>img_picto('', 'object_payment', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoMiscPayments", $search_boxvalue),
 		'url'=>DOL_URL_ROOT.'/compta/bank/various_payment/list.php?leftmenu=tax_various'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
 }
 
 if (!empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire) {
-	$arrayresult['searchintocontract'] = array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('', 'object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+	$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) {
-	$arrayresult['searchintointervention'] = array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('', 'object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+	$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) {
-	$arrayresult['searchintotickets'] = array('position'=>145, 'img'=>'object_ticket', 'label'=>$langs->trans("SearchIntoTickets", $search_boxvalue), 'text'=>img_picto('', 'object_ticket').' '.$langs->trans("SearchIntoTickets", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/ticket/list.php?mainmenu=ticket'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
+	$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) {
-	$arrayresult['searchintouser'] = array('position'=>200, 'shortcut'=>'U', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('', 'object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
+	$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) {
-	$arrayresult['searchintoexpensereport'] = array('position'=>210, 'img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('', 'object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
+	$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) {
-	$arrayresult['searchintoleaves'] = array('position'=>220, 'img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('', 'object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
+	$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) : ''));
 }
 
 // Execute hook addSearchEntry
diff --git a/htdocs/core/bookmarks_page.php b/htdocs/core/bookmarks_page.php
new file mode 100644
index 00000000000..dde8df5f82e
--- /dev/null
+++ b/htdocs/core/bookmarks_page.php
@@ -0,0 +1,160 @@
+<?php
+/* Copyright (C) 2005-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This file is a modified version of datepicker.php from phpBSM to fix some
+ * bugs, to add new features and to dramatically increase speed.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/bookmarks_page.php
+ *       \brief      File to return a page with the complete list of bookmarks
+ */
+
+//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'))    define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+//if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
+
+require_once '../main.inc.php';
+
+if (GETPOST('lang', 'aZ09')) {
+	$langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
+}
+
+$langs->loadLangs(array("bookmarks"));
+
+$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
+$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
+
+
+/*
+ * View
+ */
+
+// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
+if (empty($dolibarr_nocache) && GETPOST('cache', 'int')) {
+	header('Cache-Control: max-age='.GETPOST('cache', 'int').', public');
+	// For a .php, we must set an Expires to avoid to have it forced to an expired value by the web server
+	header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + GETPOST('cache', 'int')).' GMT');
+	// HTTP/1.0
+	header('Pragma: token=public');
+} else {
+	// HTTP/1.0
+	header('Cache-Control: no-cache');
+}
+
+$title = $langs->trans("Bookmarks");
+
+// URL http://mydolibarr/core/bookmarks_page?dol_use_jmobile=1 can be used for tests
+$head = '<!-- Bookmarks -->'."\n";	// This is used by DoliDroid to know page is a bookmark selection page
+$arrayofjs = array();
+$arrayofcss = array();
+top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
+
+
+
+print '<body>'."\n";
+print '<div>';
+//print '<br>';
+
+// Instantiate hooks of thirdparty module
+$hookmanager->initHooks(array('bookmarks'));
+
+// Define $bookmarks
+$bookmarkList = '';
+$searchForm = '';
+
+
+if (empty($conf->bookmark->enabled)) {
+	$langs->load("admin");
+	$bookmarkList .= '<br><span class="opacitymedium">'.$langs->trans("WarningModuleNotActive", $langs->transnoentitiesnoconv("Bookmarks")).'</span>';
+	$bookmarkList .= '<br><br>';
+} else {
+	// Menu with list of bookmarks
+	$sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark";
+	$sql .= " WHERE (fk_user = ".((int) $user->id)." OR fk_user is NULL OR fk_user = 0)";
+	$sql .= " AND entity IN (".getEntity('bookmarks').")";
+	$sql .= " ORDER BY position";
+	if ($resql = $db->query($sql)) {
+		$bookmarkList = '<div id="dropdown-bookmarks-list" class="start">';
+		$i = 0;
+		while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql)) {
+			$bookmarkList .= '<a class="dropdown-item bookmark-item'.(strpos($obj->url, 'http') === 0 ? ' bookmark-item-external' : '').'" id="bookmark-item-'.$obj->rowid.'" data-id="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank" rel="noopener noreferrer"' : '').' href="'.dol_escape_htmltag($obj->url).'" >';
+			$bookmarkList .= dol_escape_htmltag($obj->title);
+			$bookmarkList .= '</a>';
+			$i++;
+		}
+		if ($i == 0) {
+			$bookmarkList .= '<br><span class="opacitymedium">'.$langs->trans("NoBookmarks").'</span>';
+			$bookmarkList .= '<br><br>';
+		}
+
+		$newcardbutton = '';
+		$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/bookmarks/card.php?action=create&backtopage='.urlencode(DOL_URL_ROOT.'/bookmarks/list.php'), '', !empty($user->rights->bookmark->creer));
+
+		// Url to list bookmark
+		$bookmarkList .= '<br>';
+		$bookmarkList .= '<a class="top-menu-dropdown-link" title="'.$langs->trans('Bookmarks').'" href="'.DOL_URL_ROOT.'/bookmarks/list.php" >';
+		$bookmarkList .= img_picto('', 'bookmark', 'class="paddingright"').$langs->trans('Bookmarks').'</a>';
+		$bookmarkList .= '<br>';
+		$bookmarkList .= '<br>';
+
+		$bookmarkList .= '<center>'.$newcardbutton.'</center>';
+
+		$bookmarkList .= '</div>';
+
+
+		$searchForm .= '<input name="bookmark" id="top-bookmark-search-input" class="dropdown-search-input" placeholder="'.$langs->trans('Bookmarks').'" autocomplete="off" >';
+	} else {
+		dol_print_error($db);
+	}
+}
+
+// Execute hook printBookmarks
+$parameters = array('bookmarks'=>$bookmarkList);
+$reshook = $hookmanager->executeHooks('printBookmarks', $parameters); // Note that $action and $object may have been modified by some hooks
+if (empty($reshook)) {
+	$bookmarkList .= $hookmanager->resPrint;
+} else {
+	$bookmarkList = $hookmanager->resPrint;
+}
+
+
+print "\n";
+print "<!-- Begin Bookmarks list -->\n";
+print '<div class="center"><div class="center" style="padding: 6px;">';
+print '<style>.menu_titre { padding-top: 7px; }</style>';
+print '<div id="blockvmenusearch" class="tagtable center searchpage">'."\n";
+print $bookmarkList;
+print '</div>'."\n";
+print '</div></div>';
+print "\n<!-- End SearchForm -->\n";
+
+print '</div>';
+print '</body></html>'."\n";
+
+$db->close();
diff --git a/htdocs/core/boxes/box_accountancy_last_manual_entries.php b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
index b1e4a637046..96abd8699f3 100644
--- a/htdocs/core/boxes/box_accountancy_last_manual_entries.php
+++ b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
@@ -134,7 +134,7 @@ class box_accountancy_last_manual_entries extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="nowraponall right"',
+						'td' => 'class="nowraponall right amount"',
 						'text' => price($amount, 0, $langs, 0, -1, -1, $conf->currency),
 					);
 
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 64a2314560c..ee41df3cdd2 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -92,20 +92,20 @@ class box_actions extends ModeleBoxes
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm AS ta, ".MAIN_DB_PREFIX."actioncomm AS a";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
 			}
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 			$sql .= " WHERE a.fk_action = ta.id";
 			$sql .= " AND a.entity IN (".getEntity('actioncomm').")";
 			$sql .= " AND a.percent >= 0 AND a.percent < 100";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".((int) $user->id).")";
 			}
 			if ($user->socid) {
 				$sql .= " AND s.rowid = ".((int) $user->socid);
 			}
-			if (!$user->rights->agenda->allactions->read) {
+			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";
@@ -162,7 +162,7 @@ class box_actions extends ModeleBoxes
 
 					$this->info_box_contents[$line][2] = array(
 						'td' => 'class="center nowraponall"',
-						'text' => dol_print_date($datelimite, "dayhour", 'tzuserrel'),
+						'text' => $datelimite ? dol_print_date($datelimite, "dayhour", 'tzuserrel') : '',
 						'asis' => 1
 					);
 
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index a858111d76d..371a7a0dbed 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -113,13 +113,13 @@ class box_activity extends ModeleBoxes
 			if ($refresh) {
 				$sql = "SELECT p.fk_statut, SUM(p.total_ttc) as Mnttot, COUNT(*) as nb";
 				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
-				if (!$user->rights->societe->client->voir && !$user->socid) {
+				if (empty($user->rights->societe->client->voir) && !$user->socid) {
 					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 				}
 				$sql .= ")";
 				$sql .= " WHERE p.entity IN (".getEntity('propal').")";
 				$sql .= " AND p.fk_soc = s.rowid";
-				if (!$user->rights->societe->client->voir && !$user->socid) {
+				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) {
@@ -174,7 +174,7 @@ class box_activity extends ModeleBoxes
 					$totalnb += $data[$j]->nb;
 
 					$this->info_box_contents[$line][3] = array(
-						'td' => 'class="nowraponall right"',
+						'td' => 'class="nowraponall right amount"',
 						'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
 					);
 					$this->info_box_contents[$line][4] = array(
@@ -203,13 +203,13 @@ class box_activity extends ModeleBoxes
 			if ($refresh) {
 				$sql = "SELECT c.fk_statut, sum(c.total_ttc) as Mnttot, count(*) as nb";
 				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
-				if (!$user->rights->societe->client->voir && !$user->socid) {
+				if (empty($user->rights->societe->client->voir) && !$user->socid) {
 					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 				}
 				$sql .= ")";
 				$sql .= " WHERE c.entity IN (".getEntity('commande').")";
 				$sql .= " AND c.fk_soc = s.rowid";
-				if (!$user->rights->societe->client->voir && !$user->socid) {
+				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) {
@@ -262,7 +262,7 @@ class box_activity extends ModeleBoxes
 					$totalnb += $data[$j]->nb;
 
 					$this->info_box_contents[$line][3] = array(
-						'td' => 'class="nowraponall right"',
+						'td' => 'class="nowraponall right amount"',
 						'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
 					);
 					$this->info_box_contents[$line][4] = array(
@@ -291,12 +291,12 @@ class box_activity extends ModeleBoxes
 			if ($refresh) {
 				$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
 				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-				if (!$user->rights->societe->client->voir && !$user->socid) {
+				if (empty($user->rights->societe->client->voir) && !$user->socid) {
 					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 				}
 				$sql .= ")";
 				$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
-				if (!$user->rights->societe->client->voir && !$user->socid) {
+				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) {
@@ -350,7 +350,7 @@ class box_activity extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][3] = array(
-						'td' => 'class="nowraponall right"',
+						'td' => 'class="nowraponall right amount"',
 						'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency)
 					);
 
@@ -433,7 +433,7 @@ class box_activity extends ModeleBoxes
 					);
 					$totalnb += $data[$j]->nb;
 					$this->info_box_contents[$line][3] = array(
-						'td' => 'class="nowraponall right"',
+						'td' => 'class="nowraponall right amount"',
 						'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
 					);
 					$this->info_box_contents[$line][4] = array(
diff --git a/htdocs/core/boxes/box_boms.php b/htdocs/core/boxes/box_boms.php
index ee248d0a083..d96fac8bc76 100644
--- a/htdocs/core/boxes/box_boms.php
+++ b/htdocs/core/boxes/box_boms.php
@@ -85,7 +85,11 @@ class box_boms extends ModeleBoxes
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatestModifiedBoms", $max));
 
 		if ($user->rights->bom->read) {
-			$sql = "SELECT p.ref as product_ref, p.tobuy, p.tosell";
+			$sql = "SELECT p.ref as product_ref";
+			$sql .= ", p.rowid as productid";
+			$sql .= ", p.tosell";
+			$sql .= ", p.tobuy";
+			$sql .= ", p.tobatch";
 			$sql .= ", c.rowid";
 			$sql .= ", c.date_creation";
 			$sql .= ", c.tms";
@@ -111,12 +115,13 @@ class box_boms extends ModeleBoxes
 
 					$bomstatic->id = $objp->rowid;
 					$bomstatic->ref = $objp->ref;
-					$bomstatic->id = $objp->socid;
 					$bomstatic->status = $objp->status;
 
+					$productstatic->id = $objp->productid;
 					$productstatic->ref = $objp->product_ref;
-					$productstatic->status = $objp->tobuy;
-					$productstatic->status_buy = $objp->tosell;
+					$productstatic->status = $objp->tosell;
+					$productstatic->status_buy = $objp->tobuy;
+					$productstatic->status_batch = $objp->tobatch;
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="nowraponall"',
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 995f017f5f1..74ba5a9d4c9 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -92,12 +92,12 @@ class box_clients extends ModeleBoxes
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE s.client IN (1, 3)";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			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) {
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 4d47f703fff..ae939afe25c 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -101,7 +101,7 @@ class box_commandes extends ModeleBoxes
 			$sql .= ", c.total_ttc";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."commande as c";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE c.fk_soc = s.rowid";
@@ -109,7 +109,7 @@ class box_commandes extends ModeleBoxes
 			if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) {
 				$sql .= " AND c.fk_statut = 1";
 			}
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			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) {
@@ -163,7 +163,7 @@ class box_commandes extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="nowraponall right"',
+						'td' => 'class="nowraponall right amount"',
 						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
 					);
 
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index 7166ebb713e..5570051a065 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -122,7 +122,12 @@ class box_comptes extends ModeleBoxes
 					$account_static->accountancy_journal = $objp->accountancy_journal;
 					$solde = $account_static->solde(0);
 
-					$solde_total[$objp->currency_code] += $solde;
+					if (!array_key_exists($objp->currency_code, $solde_total)) {
+						$solde_total[$objp->currency_code] = $solde;
+					} else {
+						$solde_total[$objp->currency_code] += $solde;
+					}
+
 
 					$this->info_box_contents[$line][] = array(
 						'td' => '',
@@ -136,8 +141,11 @@ class box_comptes extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right nowraponall"',
-						'text' => price($solde, 0, $langs, 1, -1, -1, $objp->currency_code)
+						'td' => 'class="nowraponall right amount"',
+						'text' => '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$account_static->id.'">'
+									.price($solde, 0, $langs, 1, -1, -1, $objp->currency_code)
+									.'</a>',
+						'asis' => 1,
 					);
 
 					$line++;
@@ -156,7 +164,7 @@ class box_comptes extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="liste_total right nowraponall"',
+						'td' => 'class="liste_total nowraponall right amount"',
 						'text' => price($solde, 0, $langs, 0, -1, -1, $key)
 					);
 					$line++;
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 6aefc1f2d74..0d774faf569 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -86,18 +86,28 @@ class box_contacts extends ModeleBoxes
 
 			$sql .= ", sp.address, sp.zip, sp.town, sp.phone, sp.phone_perso, sp.phone_mobile, sp.email as spemail";
 			$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
-			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.code_client, s.client";
 			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+			if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+				$sql .= ", spe.accountancy_code_customer as code_compta";
+				$sql .= ", spe.accountancy_code_supplier as code_compta_fournisseur";
+			} else {
+				$sql .= ", s.code_compta";
+				$sql .= ", s.code_compta_fournisseur";
+			}
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", co.label as country, co.code as country_code";
 			$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON sp.fk_pays = co.rowid";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+				$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+			}
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			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) {
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 9bb794b94fa..8eeb1b93323 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -86,12 +86,12 @@ class box_contracts extends ModeleBoxes
 			$sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
 			$sql .= ", c.ref_customer, c.ref_supplier";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE c.fk_soc = s.rowid";
 			$sql .= " AND c.entity = ".$conf->entity;
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			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) {
diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
index b61fe66f064..22fafb4633c 100644
--- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -35,7 +35,7 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 	public $boxcode = "customersoutstandingbillreached";
 	public $boximg = "object_company";
 	public $boxlabel = "BoxCustomersOutstandingBillReached";
-	public $depends = array("facture","societe");
+	public $depends = array("facture", "societe");
 
 	/**
 	 * @var DoliDB Database handler.
@@ -93,12 +93,12 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 			$sql .= ", s.outstanding_limit";
 			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE s.client IN (1, 3)";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			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) {
@@ -133,7 +133,8 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 					$thirdpartystatic->entity = $objp->entity;
 					$thirdpartystatic->outstanding_limit = $objp->outstanding_limit;
 
-					$outstandingtotal = $thirdpartystatic->getOutstandingBills()['opened'];
+					$tmp = $thirdpartystatic->getOutstandingBills();
+					$outstandingtotal = $tmp['opened'];
 					$outstandinglimit = $thirdpartystatic->outstanding_limit;
 
 					if ($outstandingtotal >= $outstandinglimit) {
diff --git a/htdocs/core/boxes/box_dolibarr_state_board.php b/htdocs/core/boxes/box_dolibarr_state_board.php
index 21bf58b859f..0381b493448 100644
--- a/htdocs/core/boxes/box_dolibarr_state_board.php
+++ b/htdocs/core/boxes/box_dolibarr_state_board.php
@@ -105,7 +105,8 @@ class box_dolibarr_state_board extends ModeleBoxes
 				'supplier_invoices',
 				'contracts',
 				'interventions',
-				'ticket'
+				'ticket',
+				'dolresource'
 			);
 			$conditions = array(
 				'users' => $user->rights->user->user->lire,
@@ -132,7 +133,8 @@ class box_dolibarr_state_board extends ModeleBoxes
 				'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
+				'ticket' => !empty($conf->ticket->enabled) && $user->rights->ticket->read,
+				'dolresource' => !empty($conf->resource->enabled) && $user->rights->resource->read
 			);
 			$classes = array(
 				'users' => 'User',
@@ -156,6 +158,7 @@ class box_dolibarr_state_board extends ModeleBoxes
 				'expensereports' => 'ExpenseReport',
 				'holidays' => 'Holiday',
 				'ticket' => 'Ticket',
+				'dolresource' => 'Dolresource'
 			);
 			$includes = array(
 				'users' => DOL_DOCUMENT_ROOT . "/user/class/user.class.php",
@@ -178,7 +181,8 @@ class box_dolibarr_state_board extends ModeleBoxes
 				'projects' => DOL_DOCUMENT_ROOT . "/projet/class/project.class.php",
 				'expensereports' => DOL_DOCUMENT_ROOT . "/expensereport/class/expensereport.class.php",
 				'holidays' => DOL_DOCUMENT_ROOT . "/holiday/class/holiday.class.php",
-				'ticket' => DOL_DOCUMENT_ROOT . "/ticket/class/ticket.class.php"
+				'ticket' => DOL_DOCUMENT_ROOT . "/ticket/class/ticket.class.php",
+				'dolresource' => DOL_DOCUMENT_ROOT . "/resource/class/dolresource.class.php"
 			);
 			$links = array(
 				'users' => DOL_URL_ROOT . '/user/list.php',
@@ -201,7 +205,8 @@ class box_dolibarr_state_board extends ModeleBoxes
 				'projects' => DOL_URL_ROOT . '/projet/list.php?mainmenu=project',
 				'expensereports' => DOL_URL_ROOT . '/expensereport/list.php?mainmenu=hrm&leftmenu=expensereport',
 				'holidays' => DOL_URL_ROOT . '/holiday/list.php?mainmenu=hrm&leftmenu=holiday',
-				'ticket' => DOL_URL_ROOT . '/ticket/list.php?leftmenu=ticket'
+				'ticket' => DOL_URL_ROOT . '/ticket/list.php?leftmenu=ticket',
+				'dolresource' => DOL_URL_ROOT . '/resource/list.php?mainmenu=tools',
 			);
 			$titres = array(
 				'users' => "Users",
@@ -225,6 +230,7 @@ class box_dolibarr_state_board extends ModeleBoxes
 				'expensereports' => "ExpenseReports",
 				'holidays' => "Holidays",
 				'ticket' => "Ticket",
+				'dolresource' => "Resources",
 			);
 			$langfile = array(
 				'customers' => "companies",
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 6bdeabda212..e1d2860b212 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -100,13 +100,13 @@ class box_factures extends ModeleBoxes
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", 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."societe as s,".MAIN_DB_PREFIX."facture as f";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= ")";
 			$sql .= " WHERE f.fk_soc = s.rowid";
 			$sql .= " AND f.entity IN (".getEntity('invoice').")";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			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) {
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 70640efeb78..42a945b9289 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -100,12 +100,12 @@ class box_factures_fourn extends ModeleBoxes
 			$sql .= ', f.date_lim_reglement as datelimite, f.tms, f.type';
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE f.fk_soc = s.rowid";
 			$sql .= " AND f.entity = ".$conf->entity;
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			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) {
@@ -183,7 +183,7 @@ class box_factures_fourn extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right nowraponall"',
+						'td' => 'class="nowraponall right amount"',
 						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
 					);
 
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index fac13c654a4..a421706e855 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -92,16 +92,17 @@ class box_factures_fourn_imp extends ModeleBoxes
 			$sql .= ", f.tva as total_tva";
 			$sql .= ", f.total_ttc";
 			$sql .= ", f.paye, f.fk_statut as status, f.type";
+			$sql .= ", f.tms";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ",".MAIN_DB_PREFIX."facture_fourn as f";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE f.fk_soc = s.rowid";
 			$sql .= " AND f.entity = ".$conf->entity;
 			$sql .= " AND f.paye = 0";
 			$sql .= " AND fk_statut = 1";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			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) {
@@ -169,7 +170,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="nowraponall right"',
+						'td' => 'class="nowraponall right amount"',
 						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
 					);
 
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 3b6e857b058..9a8e764f208 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -88,7 +88,12 @@ class box_factures_imp extends ModeleBoxes
 
 		if ($user->rights->facture->lire) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
-			$sql .= ", s.code_client, s.code_compta, s.client";
+			$sql .= ", s.code_client, s.client";
+			if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+				$sql .= ", spe.accountancy_code_customer as code_compta";
+			} else {
+				$sql .= ", s.code_compta";
+			}
 			$sql .= ", s.logo, s.email, s.entity";
 			$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";
@@ -100,7 +105,10 @@ class box_factures_imp extends ModeleBoxes
 			$sql .= ", f.paye, f.fk_statut as status, f.rowid as facid";
 			$sql .= ", sum(pf.amount) as am";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+				$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+			}
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= ", ".MAIN_DB_PREFIX."facture as f";
@@ -109,13 +117,18 @@ class box_factures_imp extends ModeleBoxes
 			$sql .= " AND f.entity IN (".getEntity('invoice').")";
 			$sql .= " AND f.paye = 0";
 			$sql .= " AND fk_statut = 1";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			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);
 			}
-			$sql .= " GROUP BY s.rowid, s.nom, s.name_alias, s.code_client, s.code_compta, s.client, s.logo, s.email, s.entity, s.tva_intra, s.siren, s.siret, s.ape, s.idprof4, s.idprof5, s.idprof6,";
+			$sql .= " GROUP BY s.rowid, s.nom, s.name_alias, s.code_client, s.client, s.logo, s.email, s.entity, s.tva_intra, s.siren, s.siret, s.ape, s.idprof4, s.idprof5, s.idprof6,";
+			if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+				$sql .= " spe.accountancy_code_customer as code_compta,";
+			} else {
+				$sql .= " s.code_compta,";
+			}
 			$sql .= " f.ref, f.date_lim_reglement,";
 			$sql .= " f.type, f.datef, f.total_ht, f.total_tva, f.total_ttc, f.paye, f.fk_statut, f.rowid";
 			//$sql.= " ORDER BY f.datef DESC, f.ref DESC ";
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 3b62361343a..e0bdaf709ce 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -89,13 +89,13 @@ class box_ficheinter extends ModeleBoxes
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir) {
+			if (empty($user->rights->societe->client->voir)) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= ", ".MAIN_DB_PREFIX."fichinter as f";
 			$sql .= " WHERE f.fk_soc = s.rowid ";
 			$sql .= " AND f.entity = ".$conf->entity;
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			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) {
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index c0516c1cf4c..4f297135b26 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -87,12 +87,12 @@ class box_fournisseurs extends ModeleBoxes
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE s.fournisseur = 1";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			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) {
diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index dd5bce78301..cdaa9298f63 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -24,7 +24,7 @@
  *  \ingroup    projet
  *  \brief      Module to show the funnel of prospection
  */
-include_once DOL_DOCUMENT_ROOT . "/core/boxes/modules_boxes.php";
+include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
 
 /**
  * Class to manage the box to show last projet
@@ -91,8 +91,8 @@ class box_funnel_of_prospection extends ModeleBoxes
 		$badgeStatus7 = '#baa32b';
 		$badgeStatus8 = '#993013';
 		$badgeStatus9 = '#e7f0f0';
-		if (file_exists(DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php')) {
-			include DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php';
+		if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php')) {
+			include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 		}
 		$listofoppstatus = array();
 		$listofopplabel = array();
@@ -100,7 +100,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 		$colorseriesstat = array();
 		$bordercolorseries = array();
 		$sql = "SELECT cls.rowid, cls.code, cls.percent, cls.label";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "c_lead_status as cls";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_lead_status as cls";
 		$sql .= " WHERE active=1";
 		$sql .= " AND cls.code <> 'LOST'";
 		$sql .= $this->db->order('cls.rowid', 'ASC');
@@ -148,14 +148,14 @@ class box_funnel_of_prospection extends ModeleBoxes
 		$this->max = $max;
 
 		$this->info_box_head = array(
-			'text' => $langs->trans("Statistics") . ' - ' . $langs->trans("BoxTitleFunnelOfProspection"),
+			'text' => $langs->trans("Statistics").' - '.$langs->trans("BoxTitleFunnelOfProspection"),
 			'graph' => '1'
 		);
 
 		if ($user->rights->projet->lire || !empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 			$sql = "SELECT p.fk_opp_status as opp_status, cls.code, COUNT(p.rowid) as nb, SUM(p.opp_amount) as opp_amount, SUM(p.opp_amount * p.opp_percent) as ponderated_opp_amount";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "projet as p, " . MAIN_DB_PREFIX . "c_lead_status as cls";
-			$sql .= " WHERE p.entity IN (" . getEntity('project') . ")";
+			$sql .= " FROM ".MAIN_DB_PREFIX."projet as p, ".MAIN_DB_PREFIX."c_lead_status as cls";
+			$sql .= " WHERE p.entity IN (".getEntity('project').")";
 			$sql .= " AND p.fk_opp_status = cls.rowid";
 			$sql .= " AND p.fk_statut = 1"; // Opend projects only
 			$sql .= " AND cls.code NOT IN ('LOST')";
@@ -200,14 +200,14 @@ class box_funnel_of_prospection extends ModeleBoxes
 				$liststatus = array();
 				$data = array('');
 				$customlabels = array();
-				$total=0;
+				$total = 0;
 				foreach ($listofstatus as $status) {
 					$customlabel = '';
 					$labelStatus = '';
 					if ($status != 7) {
 						$code = dol_getIdFromCode($this->db, $status, 'c_lead_status', 'rowid', 'code');
 						if ($code) {
-							$labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code);
+							$labelStatus = $langs->transnoentitiesnoconv("OppStatus".$code);
 						}
 						if (empty($labelStatus)) {
 							$labelStatus = $listofopplabel[$status];
@@ -218,16 +218,16 @@ class box_funnel_of_prospection extends ModeleBoxes
 						$liststatus[] = $labelStatus;
 						if (!$conf->use_javascript_ajax) {
 							$stringtoprint .= '<tr class="oddeven">';
-							$stringtoprint .= '<td>' . $labelStatus . '</td>';
-							$stringtoprint .= '<td class="right"><a href="list.php?statut=' . $status . '">' . price((isset($valsamount[$status]) ? (float) $valsamount[$status] : 0), 0, '', 1, -1, -1, $conf->currency) . '</a></td>';
+							$stringtoprint .= '<td>'.$labelStatus.'</td>';
+							$stringtoprint .= '<td class="nowraponall right amount"><a href="list.php?statut='.$status.'">'.price((isset($valsamount[$status]) ? (float) $valsamount[$status] : 0), 0, '', 1, -1, -1, $conf->currency).'</a></td>';
 							$stringtoprint .= "</tr>\n";
 						}
 					}
-					$customlabels[]=$customlabel;
+					$customlabels[] = $customlabel;
 				}
 				$dataseries[] = $data;
 				if ($conf->use_javascript_ajax) {
-					include_once DOL_DOCUMENT_ROOT . '/core/class/dolgraph.class.php';
+					include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 					$dolgraph = new DolGraph();
 					$dolgraph->SetMinValue(0);
 					$dolgraph->SetData($dataseries);
@@ -273,11 +273,11 @@ class box_funnel_of_prospection extends ModeleBoxes
 					'tr' => 'class="oddeven"',
 					'td' => 'class="left "',
 					'maxlength' => 500,
-					'text' => $langs->trans("OpportunityTotalAmount") . ' (' . $langs->trans("WonLostExcluded") . ')'
+					'text' => $langs->trans("OpportunityTotalAmount").' ('.$langs->trans("WonLostExcluded").')'
 				);
 				$this->info_box_contents[$line][] = array(
 					'tr' => 'class="oddeven"',
-					'td' => 'class="right "',
+					'td' => 'class="nowraponall right amount"',
 					'maxlength' => 500,
 					'text' => price($totalamount, 0, '', 1, -1, -1, $conf->currency)
 				);
@@ -286,11 +286,11 @@ class box_funnel_of_prospection extends ModeleBoxes
 					'tr' => 'class="oddeven"',
 					'td' => 'class="left "',
 					'maxlength' => 500,
-					'text' => $form->textwithpicto($langs->trans("OpportunityPonderatedAmount") . ' (' . $langs->trans("WonLostExcluded") . ')', $langs->trans("OpportunityPonderatedAmountDesc"), 1)
+					'text' => $form->textwithpicto($langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')', $langs->trans("OpportunityPonderatedAmountDesc"), 1)
 
 				);
 				$this->info_box_contents[$line][] = array(
-					'td' => 'class="right "',
+					'td' => 'class="nowraponall right amount"',
 					'maxlength' => 500,
 					'text' => price(price2num($ponderated_opp_amount, 'MT'), 0, '', 1, -1, -1, $conf->currency)
 				);
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index e4418020bfc..8179e134bcf 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -99,7 +99,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 		if ($user->socid) {
 			$socid = $user->socid;
 		}
-		if (!$user->rights->societe->client->voir || $socid) {
+		if (empty($user->rights->societe->client->voir) || $socid) {
 			$prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
 		}
 
@@ -145,10 +145,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 
 				$filenamenb = $dir."/".$prefix."invoicesnbinyear-".$endyear.".png";
 				// default value for customer mode
-				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') {
-					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessuppliernbinyear-'.$endyear.'.png';
-				}
+				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesnbinyear-'.$endyear.'.png';
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
@@ -189,10 +186,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 
 				$filenamenb = $dir."/".$prefix."invoicesamountinyear-".$endyear.".png";
 				// default value for customer mode
-				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') {
-					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessupplieramountinyear-'.$endyear.'.png';
-				}
+				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesamountinyear-'.$endyear.'.png';
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
@@ -233,7 +227,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 
 			if (!$mesg) {
 				$stringtoshow = '';
-				$stringtoshow .= '<script type="text/javascript" language="javascript">
+				$stringtoshow .= '<script type="text/javascript">
 					jQuery(document).ready(function() {
 						jQuery("#idsubimg'.$this->boxcode.'").click(function() {
 							jQuery("#idfilter'.$this->boxcode.'").toggle();
@@ -251,7 +245,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				$stringtoshow .= '<input type="checkbox" name="'.$param_showtot.'"'.($showtot ? ' checked' : '').'> '.$langs->trans("AmountOfBillsByMonthHT");
 				$stringtoshow .= '<br>';
 				$stringtoshow .= $langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow .= '<input class="reposition inline-block valigntextbottom" type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"), 'refresh.png', '', '', 1).'">';
+				$stringtoshow .= '<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"), 'refresh.png', '', '', 1).'">';
 				$stringtoshow .= '</form>';
 				$stringtoshow .= '</div>';
 				if ($shownb && $showtot) {
diff --git a/htdocs/core/boxes/box_graph_invoices_peryear.php b/htdocs/core/boxes/box_graph_invoices_peryear.php
new file mode 100644
index 00000000000..9126cfcfb37
--- /dev/null
+++ b/htdocs/core/boxes/box_graph_invoices_peryear.php
@@ -0,0 +1,217 @@
+<?php
+/* Copyright (C) 2013 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/core/boxes/box_graph_invoices_peryear.php
+ *	\ingroup    factures
+ *	\brief      Box to show graph of invoices per year
+ */
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
+
+
+/**
+ * Class to manage the box to show last invoices
+ */
+class box_graph_invoices_peryear extends ModeleBoxes
+{
+	public $boxcode = "invoicesperyear";
+	public $boximg = "object_bill";
+	public $boxlabel = "BoxCustomersInvoicesPerYear";
+	public $depends = array("facture");
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	public $info_box_head = array();
+	public $info_box_contents = array();
+
+
+	/**
+	 *  Constructor
+	 *
+	 * 	@param	DoliDB	$db			Database handler
+	 *  @param	string	$param		More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $user;
+
+		$this->db = $db;
+
+		$this->hidden = !($user->rights->facture->lire);
+	}
+
+	/**
+	 *  Load data into info_box_contents array to show array later.
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
+
+		$this->max = $max;
+
+		$refreshaction = 'refresh_'.$this->boxcode;
+
+		//include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+		//$facturestatic=new Facture($this->db);
+
+		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
+		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1;
+
+		$text = $langs->trans("Turnover", $max);
+		$this->info_box_head = array(
+			'text' => $text,
+			'limit'=> dol_strlen($text),
+			'graph'=> 1,
+			'sublink'=>'',
+			'subtext'=>$langs->trans("Filter"),
+			'subpicto'=>'filter.png',
+			'subclass'=>'linkobject boxfilter',
+			'target'=>'none'	// Set '' to get target="_blank"
+		);
+
+		$dir = ''; // We don't need a path because image file will not be saved into disk
+		$prefix = '';
+		$socid = 0;
+		if ($user->socid) $socid = $user->socid;
+		if (empty($user->rights->societe->client->voir) || $socid) $prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
+
+		if ($user->rights->facture->lire) {
+			$mesg = '';
+
+			$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
+			$param_showtot = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
+
+			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
+			$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
+			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray)) {
+				$endyear = GETPOST($param_year, 'int');
+				$showtot = GETPOST($param_showtot, 'alpha');
+			} else {
+				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
+				$endyear = $tmparray['year'];
+				$showtot = $tmparray['showtot'];
+			}
+			if (empty($showtot)) { $showtot = 1; }
+			$nowarray = dol_getdate(dol_now(), true);
+			if (empty($endyear)) $endyear = $nowarray['year'];
+			$numberyears = (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 5 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
+			$startyear = $endyear - $numberyears;
+
+			$mode = 'customer';
+			$WIDTH = (($showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
+			$HEIGHT = '192';
+
+			$stats = new FactureStats($this->db, $socid, $mode, 0);
+
+			// Build graphic amount of object. $data = array(array('Lib',val1,val2,val3),...)
+			$data2 = $stats->getAmountByYear($numberyears);
+
+			$filenamenb = $dir."/".$prefix."invoicesamountyears-".$endyear.".png";
+			// default value for customer mode
+			$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=invoicesamountyears-'.$endyear.'.png';
+			if ($mode == 'supplier') {
+				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessupplieramountyears-'.$endyear.'.png';
+			}
+
+			$px2 = new DolGraph();
+			$mesg = $px2->isGraphKo();
+			if (!$mesg) {
+				$langs->load("bills");
+
+				$px2->SetData($data2);
+				unset($data2);
+				$i = $startyear;
+				$legend = array();
+				while ($i <= $endyear) {
+					if ($startmonth != 1) {
+						$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
+					} else {
+						$legend[] = $i;
+					}
+					$i++;
+				}
+				$px2->SetLegend([$langs->trans("AmountOfBillsHT")]);
+				$px2->SetMaxValue($px2->GetCeilMaxValue());
+				$px2->SetWidth($WIDTH);
+				$px2->SetHeight($HEIGHT);
+				$px2->SetYLabel($langs->trans("AmountOfBillsHT"));
+				$px2->SetShading(3);
+				$px2->SetHorizTickIncrement(1);
+				$px2->SetCssPrefix("cssboxes");
+				$px2->mode = 'depth';
+				$px2->SetTitle($langs->trans("Turnover"));
+
+				$px2->draw($filenamenb, $fileurlnb);
+			}
+
+			if (empty($conf->use_javascript_ajax)) {
+				$langs->load("errors");
+				$mesg = $langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
+			}
+
+			if (!$mesg) {
+				$stringtoshow = '';
+				$stringtoshow .= '<script type="text/javascript" language="javascript">
+					jQuery(document).ready(function() {
+						jQuery("#idsubimg'.$this->boxcode.'").click(function() {
+							jQuery("#idfilter'.$this->boxcode.'").toggle();
+						});
+					});
+					</script>';
+				$stringtoshow .= '<div class="center hideobject" id="idfilter'.$this->boxcode.'">'; // hideobject is to start hidden
+				$stringtoshow .= '<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+				$stringtoshow .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$stringtoshow .= '<input type="hidden" name="action" value="'.$refreshaction.'">';
+				$stringtoshow .= '<input type="hidden" name="page_y" value="">';
+				$stringtoshow .= '<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,showtot">';
+				$stringtoshow .= $langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
+				$stringtoshow .= '<input class="reposition inline-block valigntextbottom" type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"), 'refresh.png', '', '', 1).'">';
+				$stringtoshow .= '</form>';
+				$stringtoshow .= '</div>';
+				$stringtoshow .= $px2->show();
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"', 'textnoformat'=>$stringtoshow);
+			} else {
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover left"', 'maxlength'=>500, 'text' => $mesg);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
+			);
+		}
+	}
+
+	/**
+	 *	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_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 5ecc26c3f90..fc91cb692c1 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -98,7 +98,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 		if ($user->socid) {
 			$socid = $user->socid;
 		}
-		if (!$user->rights->societe->client->voir || $socid) {
+		if (empty($user->rights->societe->client->voir) || $socid) {
 			$prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
 		}
 
@@ -125,9 +125,6 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$showtot = 1;
 			}
 			$nowarray = dol_getdate(dol_now(), true);
-			if (empty($year)) {
-				$year = $nowarray['year'];
-			}
 			if (empty($endyear)) {
 				$endyear = $nowarray['year'];
 			}
@@ -143,12 +140,9 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 			if ($shownb) {
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
-				$filenamenb = $dir."/".$prefix."invoicessuppliernbinyear-".$year.".png";
+				$filenamenb = $dir."/".$prefix."invoicessuppliernbinyear-".$endyear.".png";
 				// default value for customer mode
-				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$year.'.png';
-				if ($mode == 'supplier') {
-					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessuppliernbinyear-'.$year.'.png';
-				}
+				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessuppliernbinyear-'.$endyear.'.png';
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
@@ -186,12 +180,9 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 			if ($showtot) {
 				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
-				$filenamenb = $dir."/".$prefix."invoicessupplieramountinyear-".$year.".png";
+				$filenamenb = $dir."/".$prefix."invoicessupplieramountinyear-".$endyear.".png";
 				// default value for customer mode
-				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$year.'.png';
-				if ($mode == 'supplier') {
-					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessupplieramountinyear-'.$year.'.png';
-				}
+				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&file=invoicessupplieramountinyear-'.$endyear.'.png';
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
@@ -232,7 +223,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 
 			if (!$mesg) {
 				$stringtoshow = '';
-				$stringtoshow .= '<script type="text/javascript" language="javascript">
+				$stringtoshow .= '<script type="text/javascript">
 					jQuery(document).ready(function() {
 						jQuery("#idsubimg'.$this->boxcode.'").click(function() {
 							jQuery("#idfilter'.$this->boxcode.'").toggle();
@@ -273,17 +264,12 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				}
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"', 'textnoformat'=>$stringtoshow);
 			} else {
-				$this->info_box_contents[0][0] = array(
-					'tr'=>'class="oddeven nohover"',
-					'td' => 'class="nohover left"',
-					'maxlength'=>500,
-					'text' => $mesg,
-				);
+				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover left"', 'maxlength'=>500, 'text' => $mesg);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
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 baa822dcf29..2ce9444f677 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
@@ -65,6 +65,8 @@ class box_graph_nb_ticket_last_x_days extends ModeleBoxes
 	public function loadBox($max = 5)
 	{
 		global $conf, $user, $langs;
+		$dataseries = array();
+		$graphtoshow = "";
 
 		$badgeStatus0 = '#cbd3d3'; // draft
 		$badgeStatus1 = '#bc9526'; // validated
@@ -78,14 +80,14 @@ class box_graph_nb_ticket_last_x_days extends ModeleBoxes
 		$badgeStatus7 = '#baa32b';
 		$badgeStatus8 = '#993013';
 		$badgeStatus9 = '#e7f0f0';
-		if (file_exists(DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php')) {
-			include DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php';
+		if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php')) {
+			include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 		}
 		$this->max = $max;
 
 
 		$param_day = 'DOLUSERCOOKIE_ticket_last_days';
-		if ($_POST[$param_day]) {
+		if (!empty($_POST[$param_day])) {
 			if ($_POST[$param_day] >= 15) {
 				$days = 14;
 			} else {
@@ -95,28 +97,27 @@ class box_graph_nb_ticket_last_x_days extends ModeleBoxes
 			$days = 7;
 		}
 		require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
-		$text = $langs->trans("BoxTicketLastXDays", $days).'&nbsp;' . img_picto('', 'filter.png', 'id="idsubimgDOLUSERCOOKIE_ticket_last_days" class="linkobject"');
+		$text = $langs->trans("BoxTicketLastXDays", $days).'&nbsp;'.img_picto('', 'filter.png', 'id="idsubimgDOLUSERCOOKIE_ticket_last_days" class="linkobject"');
 		$this->info_box_head = array(
 			'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');
+		$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));
 
 		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 .= " FROM ".MAIN_DB_PREFIX."ticket as t";
+			$sql .= " WHERE CAST(t.datec AS DATE) > DATE_SUB(CURRENT_DATE, INTERVAL ".$days." DAY)";
 			$sql .= " GROUP BY CAST(t.datec AS DATE)";
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$num = $this->db->num_rows($resql);
 				$i = 0;
-				$dataseries = array();
 				while ($i < $num) {
 					$objp = $this->db->fetch_object($resql);
 					while ($minimumdatecformated < $objp->datec) {
@@ -139,7 +140,7 @@ class box_graph_nb_ticket_last_x_days extends ModeleBoxes
 				dol_print_error($this->db);
 			}
 			$stringtoshow = '<div class="div-table-responsive-no-min">';
-			$stringtoshow .= '<script type="text/javascript" language="javascript">
+			$stringtoshow .= '<script type="text/javascript">
 				jQuery(document).ready(function() {
 					jQuery("#idsubimgDOLUSERCOOKIE_ticket_last_days").click(function() {
 						jQuery("#idfilterDOLUSERCOOKIE_ticket_last_days").toggle();
@@ -147,12 +148,12 @@ class box_graph_nb_ticket_last_x_days extends ModeleBoxes
 				});
 				</script>';
 			$stringtoshow .= '<div class="center hideobject" id="idfilterDOLUSERCOOKIE_ticket_last_days">'; // hideobject is to start hidden
-			$stringtoshow .= '<form class="flat formboxfilter" method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
-			$stringtoshow .= '<input type="hidden" name="token" value="' . newToken() . '">';
+			$stringtoshow .= '<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+			$stringtoshow .= '<input type="hidden" name="token" value="'.newToken().'">';
 			$stringtoshow .= '<input type="hidden" name="action" value="refresh">';
 			$stringtoshow .= '<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_ticket_last_days:days">';
-			$stringtoshow .= ' <input class="flat" size="4" type="text" name="' . $param_day . '" value="' . $days . '">' . $langs->trans("Days");
-			$stringtoshow .= '<input type="image" alt="' . $langs->trans("Refresh") . '" src="' . img_picto($langs->trans("Refresh"), 'refresh.png', '', '', 1) . '">';
+			$stringtoshow .= ' <input class="flat" size="4" type="text" name="'.$param_day.'" value="'.$days.'">'.$langs->trans("Days");
+			$stringtoshow .= '<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"), 'refresh.png', '', '', 1).'">';
 			$stringtoshow .= '</form>';
 			$stringtoshow .= '</div>';
 
@@ -180,21 +181,21 @@ class box_graph_nb_ticket_last_x_days extends ModeleBoxes
 				$px1->mode = 'depth';
 
 				$px1->draw('idgraphticketlastxdays');
-				$graphtoshow= $px1->show($totalnb ? 0 : 1);
+				$graphtoshow = $px1->show($totalnb ? 0 : 1);
 			}
 			if ($totalnb) {
 				$stringtoshow .= $graphtoshow;
 			}
 			$stringtoshow .= '</div>';
 			if ($totalnb) {
-				$this->info_box_contents[][]=array(
+				$this->info_box_contents[][] = array(
 					'td' => 'center',
 					'text' => $stringtoshow
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(
 					'td' => 'class="center opacitymedium"',
-					'text' => $stringtoshow . $langs->trans("BoxNoTicketLastXDays", $days)
+					'text' => $stringtoshow.$langs->trans("BoxNoTicketLastXDays", $days)
 				);
 			}
 		} else {
diff --git a/htdocs/core/boxes/box_graph_new_vs_close_ticket.php b/htdocs/core/boxes/box_graph_new_vs_close_ticket.php
index a4bf2d6990f..435cc76451e 100644
--- a/htdocs/core/boxes/box_graph_new_vs_close_ticket.php
+++ b/htdocs/core/boxes/box_graph_new_vs_close_ticket.php
@@ -2,7 +2,7 @@
 /* Module descriptor for ticket system
  * Copyright (C) 2013-2016  Jean-François FERRY     <hello@librethic.io>
  *               2016       Christophe Battarel     <christophe@altairis.fr>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-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
@@ -19,7 +19,7 @@
  */
 
 /**
- *     \file        core/boxes/box_nb_ticket_last_x_days.php
+ *     \file        htdocs/core/boxes/box_graph_new_vs_close_ticket.php
  *     \ingroup     ticket
  *     \brief       This box shows the number of new daily tickets the last X days
  */
@@ -98,10 +98,10 @@ class box_graph_new_vs_close_ticket extends ModeleBoxes
 				$num = $this->db->num_rows($resql);
 				if ($num > 0) {
 					$objp = $this->db->fetch_object($resql);
-					$data[] = array($langs->trans('TicketCreatedToday'), $objp->nb);
+					$data[] = array($langs->transnoentitiesnoconv('TicketCreatedToday'), $objp->nb);
 					$totalnb += $objp->nb;
 				} else {
-					$data[] = array($langs->trans('TicketCreatedToday'), 0);
+					$data[] = array($langs->transnoentitiesnoconv('TicketCreatedToday'), 0);
 				}
 			} else {
 				dol_print_error($this->db);
@@ -116,10 +116,10 @@ class box_graph_new_vs_close_ticket extends ModeleBoxes
 				$num = $this->db->num_rows($resql);
 				if ($num > 0) {
 					$objp = $this->db->fetch_object($resql);
-					$data[] = array($langs->trans('TicketClosedToday'), $objp->nb);
+					$data[] = array($langs->transnoentitiesnoconv('TicketClosedToday'), $objp->nb);
 					$totalnb += $objp->nb;
 				} else {
-					$data[] = array($langs->trans('TicketClosedToday'), 0);
+					$data[] = array($langs->transnoentitiesnoconv('TicketClosedToday'), 0);
 				}
 			} else {
 				dol_print_error($this->db);
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 48f0bd67ec3..885ec469632 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -99,7 +99,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 		if ($user->socid) {
 			$socid = $user->socid;
 		}
-		if (!$user->rights->societe->client->voir || $socid) {
+		if (empty($user->rights->societe->client->voir) || $socid) {
 			$prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
 		}
 
@@ -228,7 +228,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 
 			if (!$mesg) {
 				$stringtoshow = '';
-				$stringtoshow .= '<script type="text/javascript" language="javascript">
+				$stringtoshow .= '<script type="text/javascript">
 					jQuery(document).ready(function() {
 						jQuery("#idsubimg'.$this->boxcode.'").click(function() {
 							jQuery("#idfilter'.$this->boxcode.'").toggle();
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index a394834cd97..db7400c1c5a 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -98,7 +98,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 		if ($user->socid) {
 			$socid = $user->socid;
 		}
-		if (!$user->rights->societe->client->voir || $socid) {
+		if (empty($user->rights->societe->client->voir) || $socid) {
 			$prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
 		}
 
@@ -227,7 +227,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 
 			if (!$mesg) {
 				$stringtoshow = '';
-				$stringtoshow .= '<script type="text/javascript" language="javascript">
+				$stringtoshow .= '<script type="text/javascript">
 					jQuery(document).ready(function() {
 						jQuery("#idsubimg'.$this->boxcode.'").click(function() {
 							jQuery("#idfilter'.$this->boxcode.'").toggle();
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 5110b929a2e..04d785799af 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -352,7 +352,7 @@ class box_graph_product_distribution extends ModeleBoxes
 
 		if (!$mesg) {
 			$stringtoshow = '';
-			$stringtoshow .= '<script type="text/javascript" language="javascript">
+			$stringtoshow .= '<script type="text/javascript">
 				jQuery(document).ready(function() {
 					jQuery("#idsubimg'.$this->boxcode.'").click(function() {
 						jQuery("#idfilter'.$this->boxcode.'").toggle();
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 8a95761ea08..cb9a543bc19 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -101,7 +101,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 		if ($user->socid) {
 			$socid = $user->socid;
 		}
-		if (!$user->rights->societe->client->voir || $socid) {
+		if (empty($user->rights->societe->client->voir) || $socid) {
 			$prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
 		}
 
@@ -231,7 +231,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 
 			if (!$mesg) {
 				$stringtoshow = '';
-				$stringtoshow .= '<script type="text/javascript" language="javascript">
+				$stringtoshow .= '<script type="text/javascript">
 					jQuery(document).ready(function() {
 						jQuery("#idsubimg'.$this->boxcode.'").click(function() {
 							jQuery("#idfilter'.$this->boxcode.'").toggle();
diff --git a/htdocs/core/boxes/box_graph_ticket_by_severity.php b/htdocs/core/boxes/box_graph_ticket_by_severity.php
index 13cd0c40c86..5e69a49e88e 100644
--- a/htdocs/core/boxes/box_graph_ticket_by_severity.php
+++ b/htdocs/core/boxes/box_graph_ticket_by_severity.php
@@ -2,7 +2,7 @@
 /* Module descriptor for ticket system
  * Copyright (C) 2013-2016  Jean-François FERRY     <hello@librethic.io>
  *               2016       Christophe Battarel     <christophe@altairis.fr>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-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
@@ -19,7 +19,7 @@
  */
 
 /**
- *     \file        core/boxes/box_ticket_by_severity.php
+ *     \file        htdocs/core/boxes/box_graph_ticket_by_severity.php
  *     \ingroup     ticket
  *     \brief       This box shows open tickets by severity
  */
diff --git a/htdocs/core/boxes/box_last_modified_ticket.php b/htdocs/core/boxes/box_last_modified_ticket.php
index 57e54594255..300a13803c5 100644
--- a/htdocs/core/boxes/box_last_modified_ticket.php
+++ b/htdocs/core/boxes/box_last_modified_ticket.php
@@ -96,7 +96,7 @@ class box_last_modified_ticket extends ModeleBoxes
 
 			$sql .= " WHERE t.entity IN (".getEntity('ticket').')';
 			//  		$sql.= " AND e.rowid = er.fk_event";
-			//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .((int) $user->id);
+			//if (empty($user->rights->societe->client->voir) && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = " .((int) $user->id);
 			if ($user->socid) {
 				$sql .= " AND t.fk_soc = ".((int) $user->socid);
 			}
diff --git a/htdocs/core/boxes/box_last_ticket.php b/htdocs/core/boxes/box_last_ticket.php
index 39086464f73..25cb353b268 100644
--- a/htdocs/core/boxes/box_last_ticket.php
+++ b/htdocs/core/boxes/box_last_ticket.php
@@ -95,7 +95,7 @@ class box_last_ticket extends ModeleBoxes
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
 			$sql .= " WHERE t.entity IN (".getEntity('ticket').")";
 			//          $sql.= " AND e.rowid = er.fk_event";
-			//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+			//if (empty($user->rights->societe->client->voir) && !$user->socid) $sql.= " WHERE s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			if ($user->socid) {
 				$sql .= " AND t.fk_soc= ".((int) $user->socid);
 			}
diff --git a/htdocs/core/boxes/box_members_by_type.php b/htdocs/core/boxes/box_members_by_type.php
index 5b95b58d29d..0a5e4548e3f 100644
--- a/htdocs/core/boxes/box_members_by_type.php
+++ b/htdocs/core/boxes/box_members_by_type.php
@@ -68,7 +68,7 @@ class box_members_by_type extends ModeleBoxes
 			$this->enabled = 0; // disabled for external users
 		}
 
-		$this->hidden = !($user->rights->adherent->lire);
+		$this->hidden = !(!empty($conf->adherent->enabled) && $user->rights->adherent->lire);
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_members_last_modified.php b/htdocs/core/boxes/box_members_last_modified.php
index 9de6a3af12f..cf70bcafcb1 100644
--- a/htdocs/core/boxes/box_members_last_modified.php
+++ b/htdocs/core/boxes/box_members_last_modified.php
@@ -67,7 +67,7 @@ class box_members_last_modified extends ModeleBoxes
 			$this->enabled = 0; // disabled for external users
 		}
 
-		$this->hidden = !($user->rights->adherent->lire);
+		$this->hidden = !(!empty($conf->adherent->enabled) && $user->rights->adherent->lire);
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_members_last_subscriptions.php b/htdocs/core/boxes/box_members_last_subscriptions.php
index 3cea44c2dc3..930b4d3a874 100644
--- a/htdocs/core/boxes/box_members_last_subscriptions.php
+++ b/htdocs/core/boxes/box_members_last_subscriptions.php
@@ -67,7 +67,7 @@ class box_members_last_subscriptions extends ModeleBoxes
 			$this->enabled = 0; // disabled for external users
 		}
 
-		$this->hidden = !($user->rights->adherent->lire);
+		$this->hidden = !(!empty($conf->adherent->enabled) && $user->rights->adherent->lire);
 	}
 
 	/**
@@ -152,8 +152,8 @@ class box_members_last_subscriptions extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right" width="18"',
-						'text' => '<span class="amount">'.price($obj->subscription).'</span>',
+						'td' => 'class="nowraponall right amount" width="18"',
+						'text' => price($obj->subscription),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_members_subscriptions_by_year.php b/htdocs/core/boxes/box_members_subscriptions_by_year.php
index b6c146312bc..e7bf916d236 100644
--- a/htdocs/core/boxes/box_members_subscriptions_by_year.php
+++ b/htdocs/core/boxes/box_members_subscriptions_by_year.php
@@ -67,7 +67,7 @@ class box_members_subscriptions_by_year extends ModeleBoxes
 			$this->enabled = 0; // disabled for external users
 		}
 
-		$this->hidden = !($user->rights->adherent->lire);
+		$this->hidden = !(!empty($conf->adherent->enabled) && $user->rights->adherent->lire);
 	}
 
 	/**
@@ -179,12 +179,12 @@ class box_members_subscriptions_by_year extends ModeleBoxes
 						'text' => $Number[$key],
 					);
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => '<span class="amount">'.price($value).'</span>',
+						'td' => 'class="nowraponall right amount"',
+						'text' => price($value),
 					);
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => '<span class="amount">'.price(price2num($value / $Number[$key], 'MT')).'</span>',
+						'td' => 'class="nowraponall right amount"',
+						'text' => price(price2num($value / $Number[$key], 'MT')),
 					);
 					$line++;
 				}
@@ -204,12 +204,12 @@ class box_members_subscriptions_by_year extends ModeleBoxes
 						'text' => $numb,
 					);
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="liste_total right"',
-						'text' => '<span class="amount">'.price($tot).'</span>',
+						'td' => 'class="liste_total nowraponall right amount"',
+						'text' => price($tot),
 					);
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="liste_total right"',
-						'text' => '<span class="amount">'.price(price2num($numb > 0 ? ($tot / $numb) : 0, 'MT')).'</span>',
+						'td' => 'class="liste_total nowraponall right amount"',
+						'text' => price(price2num($numb > 0 ? ($tot / $numb) : 0, 'MT')),
 					);
 				}
 			} else {
diff --git a/htdocs/core/boxes/box_mos.php b/htdocs/core/boxes/box_mos.php
index 18a19da93dc..6436fb8e34e 100644
--- a/htdocs/core/boxes/box_mos.php
+++ b/htdocs/core/boxes/box_mos.php
@@ -86,12 +86,15 @@ class box_mos extends ModeleBoxes
 
 		if ($user->rights->mrp->read) {
 			$sql = "SELECT p.ref as product_ref";
+			$sql .= ", p.rowid as productid";
+			$sql .= ", p.tosell";
+			$sql .= ", p.tobuy";
+			$sql .= ", p.tobatch";
 			$sql .= ", c.rowid";
 			$sql .= ", c.date_creation";
 			$sql .= ", c.tms";
 			$sql .= ", c.ref";
 			$sql .= ", c.status";
-			//$sql.= ", c.fk_user_valid";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 			$sql .= ", ".MAIN_DB_PREFIX."mrp_mo as c";
 			$sql .= " WHERE c.fk_product = p.rowid";
@@ -110,9 +113,12 @@ class box_mos extends ModeleBoxes
 					$datem = $this->db->jdate($objp->tms);
 					$mostatic->id = $objp->rowid;
 					$mostatic->ref = $objp->ref;
-					$mostatic->id = $objp->socid;
 					$mostatic->status = $objp->status;
+					$productstatic->id = $objp->productid;
 					$productstatic->ref = $objp->product_ref;
+					$productstatic->status = $objp->tosell;
+					$productstatic->status_buy = $objp->tobuy;
+					$productstatic->status_batch = $objp->tobatch;
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="nowraponall"',
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index dde3b685d25..9a0c76503d0 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -122,8 +122,8 @@ class box_produits extends ModeleBoxes
 					if (!empty($conf->global->MAIN_MULTILANGS)) { // si l'option est active
 						$sqld = "SELECT label";
 						$sqld .= " FROM ".MAIN_DB_PREFIX."product_lang";
-						$sqld .= " WHERE fk_product=".$objp->rowid;
-						$sqld .= " AND lang='".$this->db->escape($langs->getDefaultLang())."'";
+						$sqld .= " WHERE fk_product = ".((int) $objp->rowid);
+						$sqld .= " AND lang = '".$this->db->escape($langs->getDefaultLang())."'";
 						$sqld .= " LIMIT 1";
 
 						$resultd = $this->db->query($sqld);
@@ -180,7 +180,7 @@ class box_produits extends ModeleBoxes
 						}
 					}
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
+						'td' => 'class="nowraponall right amount"',
 						'text' => $price,
 					);
 
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 09431b820bb..e074cb76198 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -129,8 +129,8 @@ class box_produits_alerte_stock extends ModeleBoxes
 					if (!empty($conf->global->MAIN_MULTILANGS)) { // si l'option est active
 						$sqld = "SELECT label";
 						$sqld .= " FROM ".MAIN_DB_PREFIX."product_lang";
-						$sqld .= " WHERE fk_product=".$objp->rowid;
-						$sqld .= " AND lang='".$this->db->escape($langs->getDefaultLang())."'";
+						$sqld .= " WHERE fk_product = ".((int) $objp->rowid);
+						$sqld .= " AND lang = '".$this->db->escape($langs->getDefaultLang())."'";
 						$sqld .= " LIMIT 1";
 
 						$resultd = $this->db->query($sqld);
@@ -163,7 +163,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'td' => 'class="tdoverflowmax100 maxwidth150onsmartphone"',
 						'text' => $objp->label,
 					);
 
@@ -186,18 +186,13 @@ class box_produits_alerte_stock extends ModeleBoxes
 						}
 					}
 
-					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right nowraponall"',
-						'text' => $price,
-					);
+					/*$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowraponall right amount"',
+						'text' => $price.' '.$price_base_type,
+					);*/
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => $price_base_type,
-					);
-
-					$this->info_box_contents[$line][] = array(
-						'td' => 'class="center"',
+						'td' => 'class="center nowraponall"',
 						'text' => price2num($objp->total_stock, 'MS').' / '.$objp->seuil_stock_alerte,
 						'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)),
 					);
@@ -210,7 +205,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right" width="18"',
-						'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 0).'</span>',
+						'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 1).'</span>',
 						'asis' => 1
 					);
 
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index f14ab699690..63a4e90cdd0 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -94,7 +94,7 @@ class box_project extends ModeleBoxes
 
 			// Get list of project id allowed to user (in a string list separated by coma)
 			$projectsListId = '';
-			if (!$user->rights->projet->all->lire) {
+			if (empty($user->rights->projet->all->lire)) {
 				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
 			}
 
@@ -102,7 +102,7 @@ class box_project extends ModeleBoxes
 			$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 			$sql .= " WHERE p.entity IN (".getEntity('project').")"; // Only current entity or severals if permission ok
 			$sql .= " AND p.fk_statut = 1"; // Only open projects
-			if (!$user->rights->projet->all->lire) {
+			if (empty($user->rights->projet->all->lire)) {
 				$sql .= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")"; // public and assigned to, or restricted to company for external users
 			}
 
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 6599116a980..f3f9496325f 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -90,12 +90,12 @@ class box_propales extends ModeleBoxes
 			$sql .= ", p.rowid, p.ref, p.fk_statut as status, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.total_tva, p.total_ttc, p.tms";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."propal as p";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE p.fk_soc = s.rowid";
 			$sql .= " AND p.entity IN (".getEntity('propal').")";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			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) {
@@ -160,7 +160,7 @@ class box_propales extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right nowraponall"',
+						'td' => 'class="nowraponall right amount"',
 						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
 					);
 
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 06d42e34b18..a46713a3206 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -93,12 +93,12 @@ class box_prospect extends ModeleBoxes
 			$sql .= ", s.fk_stcomm";
 			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE s.client IN (2, 3)";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			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) {
diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 53cf5c79571..94695034cce 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -170,7 +170,7 @@ class box_scheduled_jobs extends ModeleBoxes
 				);
 				$this->info_box_contents[$line][] = array(
 					'td' => 'class="center"',
-					'textnoformat' => ($nbjobsinerror ? '<a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'"><div class="badge badge-danger"><i class="fa fa-exclamation-triangle"></i> '.$nbjobsinerror.'</div></a>' : '<div class="center badge-status4">0</div>')
+					'textnoformat' => ($nbjobsinerror ? '<a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'"><div class="badge badge-danger"><i class="fa fa-exclamation-triangle"></i> '.$nbjobsinerror.'</div></a>' : '<a href="'.DOL_URL_ROOT.'/cron/list.php"><div class="center badge-status4">0</div></a>')
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 320932a0c6f..c72a378a1a2 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -95,7 +95,7 @@ class box_services_contracts extends ModeleBoxes
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."contrat as c ON s.rowid = c.fk_soc";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			$sql .= ")";
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index 95086cdf2a3..4353fb7eb02 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -86,16 +86,16 @@ class box_services_expired extends ModeleBoxes
 			$sql .= " s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 			$sql .= " MIN(cd.date_fin_validite) as date_line, COUNT(cd.rowid) as nb_services";
 			$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE cd.statut = 4 AND cd.date_fin_validite <= '".$this->db->idate($now)."'";
 			$sql .= " AND c.entity = ".$conf->entity;
 			$sql .= " AND c.fk_soc=s.rowid AND cd.fk_contrat=c.rowid AND c.statut > 0";
 			if ($user->socid) {
-				$sql .= ' AND c.fk_soc = '.$user->socid;
+				$sql .= ' AND c.fk_soc = '.((int) $user->socid);
 			}
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			$sql .= " GROUP BY c.rowid, c.ref, c.statut, c.date_contrat, c.ref_customer, c.ref_supplier, s.nom, s.rowid";
diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php
index 2b6adfe3bdc..ba95fe14356 100644
--- a/htdocs/core/boxes/box_shipments.php
+++ b/htdocs/core/boxes/box_shipments.php
@@ -33,7 +33,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 class box_shipments extends ModeleBoxes
 {
 	public $boxcode = "lastcustomershipments";
-	public $boximg = "sending";
+	public $boximg = "dolly";
 	public $boxlabel = "BoxLastCustomerShipments";
 	public $depends = array("expedition");
 
@@ -101,7 +101,7 @@ class box_shipments extends ModeleBoxes
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
 			}
 			$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
@@ -111,7 +111,7 @@ class box_shipments extends ModeleBoxes
 			if ($user->socid > 0) {
 				$sql.= " AND s.rowid = ".((int) $user->socid);
 			}
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= " AND sc.fk_user = ".((int) $user->id);
 			} else {
 				$sql .= " ORDER BY e.date_delivery, e.ref DESC ";
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index b3451d9b6c3..89fd7850c5c 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -92,12 +92,12 @@ class box_supplier_orders extends ModeleBoxes
 			$sql .= ", c.fk_statut as status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE c.fk_soc = s.rowid";
 			$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			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) {
@@ -147,7 +147,7 @@ class box_supplier_orders extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right nowraponall"',
+						'td' => 'class="nowraponall right amount"',
 						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
 					);
 
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index 78d38455d83..9a40c3f9aec 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -92,14 +92,14 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 			$sql .= ", c.fk_statut as status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE c.fk_soc = s.rowid";
 			$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
 			$sql .= " AND c.date_livraison IS NOT NULL";
 			$sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.")";
-			if (!$user->rights->societe->client->voir && !$user->socid) {
+			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) {
@@ -151,7 +151,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right nowraponall"',
+						'td' => 'class="nowraponall right amount"',
 						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
 					);
 
@@ -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> '.dol_print_date($delivery_date, 'day', 'tzuserrel').'</span>',
+						'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>',
 						'asis' => 1
 					);
 
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index 9b7cbfc2fe6..82e917b102a 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -122,11 +122,11 @@ class box_task extends ModeleBoxes
 			$boxcontent .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 			$selectArray = array('all' => $langs->trans("NoFilter"), 'im_task_contact' => $langs->trans("WhichIamLinkedTo"), 'im_project_contact' => $langs->trans("WhichIamLinkedToProject"));
 			$boxcontent .= $form->selectArray($cookie_name, $selectArray, $filterValue);
-			$boxcontent .= '<button type="submit" class="button buttongen">'.$langs->trans("Refresh").'</button>';
+			$boxcontent .= '<button type="submit" class="button buttongen button-save">'.$langs->trans("Refresh").'</button>';
 			$boxcontent .= '</form>'."\n";
 			$boxcontent .= '</div>'."\n";
 			if (!empty($conf->use_javascript_ajax)) {
-				$boxcontent .= '<script type="text/javascript" language="javascript">
+				$boxcontent .= '<script type="text/javascript">
 						jQuery(document).ready(function() {
 							jQuery("#idsubimg'.$this->boxcode.'").click(function() {
 								jQuery(".showiffilter'.$this->boxcode.'").toggle();
@@ -145,7 +145,7 @@ class box_task extends ModeleBoxes
 
 			// Get list of project id allowed to user (in a string list separated by coma)
 			$projectsListId = '';
-			if (!$user->rights->projet->all->lire) {
+			if (empty($user->rights->projet->all->lire)) {
 				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
 			}
 
@@ -168,7 +168,7 @@ class box_task extends ModeleBoxes
 			$sql .= " AND p.fk_statut = ".Project::STATUS_VALIDATED;
 			$sql .= " AND (pt.progress < 100 OR pt.progress IS NULL ) "; // 100% is done and not displayed
 			$sql .= " AND p.usage_task = 1 ";
-			if (!$user->rights->projet->all->lire) {
+			if (empty($user->rights->projet->all->lire)) {
 				$sql .= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")"; // public and assigned to, or restricted to company for external users
 			}
 
diff --git a/htdocs/core/boxes/box_validated_projects.php b/htdocs/core/boxes/box_validated_projects.php
index f1fb55878aa..e57bb1f14d9 100644
--- a/htdocs/core/boxes/box_validated_projects.php
+++ b/htdocs/core/boxes/box_validated_projects.php
@@ -26,6 +26,7 @@
  */
 include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
 
+
 /**
  * Class to manage the box to show last projet
  */
@@ -63,7 +64,7 @@ class box_validated_projects extends ModeleBoxes
 		$langs->loadLangs(array('boxes', 'projects'));
 
 		$this->db = $db;
-		$this->boxlabel = "ProjectsWithTask";
+		$this->boxlabel = "ProjectTasksWithoutTimeSpent";
 
 		$this->hidden = !($user->rights->projet->lire);
 
@@ -101,7 +102,7 @@ class box_validated_projects extends ModeleBoxes
 
 			// Get list of project id allowed to user (in a string list separated by coma)
 			$projectsListId = '';
-			if (!$user->rights->projet->all->lire) {
+			if (empty($user->rights->projet->all->lire)) {
 				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
 			}
 
@@ -112,11 +113,11 @@ class box_validated_projects extends ModeleBoxes
 			$sql .= " COUNT(DISTINCT t.rowid) as tasknumber";
 			$sql .= " FROM ".MAIN_DB_PREFIX."projet AS p";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."projet_task AS t ON p.rowid = t.fk_projet";
-			// TODO Replace -1, -2, -3 with ID used for type of contat project_task into llx_c_type_contact. Once done, we can switch widget as stable.
+			// TODO Replace -1, -2, -3 with ID used for type of contact project_task into llx_c_type_contact. Once done, we can switch widget as stable.
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id = t.rowid AND fk_c_type_contact IN (-1, -2, -3)";
 			$sql .= " WHERE p.fk_statut = 1"; // Only open projects
 			if ($projectsListId) {
-				$sql .= ' AND p.rowid IN ('.$this->db->sanitize($projectsListId).')'; // Only project we ara allowed
+				$sql .= ' AND p.rowid IN ('.$this->db->sanitize($projectsListId).')'; // Only projects that are allowed
 			}
 			$sql .= " AND t.rowid NOT IN (SELECT fk_task FROM ".MAIN_DB_PREFIX."projet_task_time WHERE fk_user = ".((int) $user->id).")";
 			$sql .= " GROUP BY p.rowid, p.ref, p.fk_soc, p.dateo";
@@ -157,7 +158,7 @@ class box_validated_projects extends ModeleBoxes
 					);
 
 					if ($objp->fk_soc > 0) {
-						$sql = 'SELECT rowid, nom as name FROM '.MAIN_DB_PREFIX.'societe WHERE rowid ='.$objp->fk_soc;
+						$sql = "SELECT rowid, nom as name FROM ".MAIN_DB_PREFIX."societe WHERE rowid = ".((int) $objp->fk_soc);
 						$resql = $this->db->query($sql);
 						//$socstatic = new Societe($this->db);
 						$obj2 = $this->db->fetch_object($resql);
@@ -165,7 +166,7 @@ class box_validated_projects extends ModeleBoxes
 							'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
 							'text' => $obj2->name,
 							'asis' => 1,
-							'url' => DOL_URL_ROOT.'/societe/card.php?socid='.$obj2->rowid
+							'url' => DOL_URL_ROOT.'/societe/card.php?socid='.urlencode($obj2->rowid)
 						);
 					} else {
 						$this->info_box_contents[$i][] = array(
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 33db393bbc6..a8986475095 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -127,7 +127,7 @@ class CMailFile
 	 *	@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
-	 *	@param 	string	$addr_cc             Email cc
+	 *	@param 	string	$addr_cc             Email cc (Example: 'abc@def.com, ghk@lmn.com')
 	 *	@param 	string	$addr_bcc            Email bcc (Note: This is autocompleted with MAIN_MAIL_AUTOCOPY_TO if defined)
 	 *	@param 	int		$deliveryreceipt     Ask a delivery receipt
 	 *	@param 	int		$msgishtml           1=String IS already html, 0=String IS NOT html, -1=Unknown make autodetection (with fast mode, not reliable)
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index 8d5bcf7dc50..3f082ba6d53 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -29,8 +29,9 @@
 
 /**
  *		Class to send SMS
- *      Usage: $smsfile = new CSMSFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to);
- *             $smsfile->sendfile();
+ *      Usage:	$smsfile = new CSMSFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to);
+ *      		$smsfile->socid=...; $smsfile->contact_id=...; $smsfile->member_id=...; $smsfile->fk_project=...;
+ *             	$smsfile->sendfile();
  */
 class CSMSFile
 {
@@ -48,7 +49,8 @@ class CSMSFile
 	public $nostop;
 
 	public $socid;
-	public $contactid;
+	public $contact_id;
+	public $member_id;
 
 	public $fk_project;
 
@@ -135,6 +137,7 @@ class CSMSFile
 
 				$sms->socid = $this->socid;
 				$sms->contact_id = $this->contact_id;
+				$sms->member_id = $this->member_id;
 				$sms->project = $this->fk_project;
 
 				$res = $sms->SmsSend();
@@ -167,6 +170,7 @@ class CSMSFile
 
 					$sms->socid = $this->socid;
 					$sms->contact_id = $this->contact_id;
+					$sms->member_id = $this->member_id;
 					$sms->fk_project = $this->fk_project;
 
 					$res = $sms->SmsSend();
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index 4f448845e80..7b46b0a08b0 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -111,7 +111,7 @@ class Ccountry // extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_country(";
+		$sql = "INSERT INTO ".$this->db->prefix()."c_country(";
 		$sql .= "rowid,";
 		$sql .= "code,";
 		$sql .= "code_iso,";
@@ -135,7 +135,7 @@ class Ccountry // extends CommonObject
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country");
+			$this->id = $this->db->last_insert_id($this->db->prefix()."c_country");
 		}
 
 		// Commit or rollback
@@ -169,7 +169,7 @@ class Ccountry // extends CommonObject
 		$sql .= " t.code_iso,";
 		$sql .= " t.label,";
 		$sql .= " t.active";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_country as t";
+		$sql .= " FROM ".$this->db->prefix()."c_country as t";
 		if ($id) {
 			$sql .= " WHERE t.rowid = ".((int) $id);
 		} elseif ($code) {
@@ -235,7 +235,7 @@ class Ccountry // extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET";
+		$sql = "UPDATE ".$this->db->prefix()."c_country SET";
 		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
 		$sql .= " code_iso=".(isset($this->code_iso) ? "'".$this->db->escape($this->code_iso)."'" : "null").",";
 		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
@@ -278,7 +278,7 @@ class Ccountry // extends CommonObject
 		global $conf, $langs;
 		$error = 0;
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_country";
+		$sql = "DELETE FROM ".$this->db->prefix()."c_country";
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$this->db->begin();
diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php
index 7184d7846b0..937ca6f7875 100644
--- a/htdocs/core/class/comment.class.php
+++ b/htdocs/core/class/comment.class.php
@@ -113,7 +113,7 @@ class Comment extends CommonObject
 		$error = 0;
 
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+		$sql = "INSERT INTO ".$this->db->prefix().$this->table_element." (";
 		$sql .= "description";
 		$sql .= ", datec";
 		$sql .= ", fk_element";
@@ -128,7 +128,7 @@ class Comment extends CommonObject
 		$sql .= ", '".(isset($this->fk_element) ? $this->fk_element : "null")."'";
 		$sql .= ", '".$this->db->escape($this->element_type)."'";
 		$sql .= ", '".(isset($this->fk_user_author) ? $this->fk_user_author : "null")."'";
-		$sql .= ", ".$user->id."";
+		$sql .= ", ".((int) $user->id);
 		$sql .= ", ".(!empty($this->entity) ? $this->entity : '1');
 		$sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
 		$sql .= ")";
@@ -146,7 +146,7 @@ class Comment extends CommonObject
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);
 
 			if (!$notrigger) {
 				// Call trigger
@@ -195,7 +195,7 @@ class Comment extends CommonObject
 		$sql .= " c.fk_user_modif,";
 		$sql .= " c.entity,";
 		$sql .= " c.import_key";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as c";
+		$sql .= " FROM ".$this->db->prefix().$this->table_element." as c";
 		$sql .= " WHERE c.rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -254,7 +254,7 @@ class Comment extends CommonObject
 
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element." SET";
 		$sql .= " description=".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "null").",";
 		$sql .= " datec=".($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null').",";
 		$sql .= " fk_element=".(isset($this->fk_element) ? $this->fk_element : "null").",";
@@ -315,7 +315,7 @@ class Comment extends CommonObject
 
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql = "DELETE FROM ".$this->db->prefix().$this->table_element;
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$resql = $this->db->query($sql);
@@ -364,7 +364,7 @@ class Comment extends CommonObject
 		if (!empty($element_type) && !empty($fk_element)) {
 			$sql = "SELECT";
 			$sql .= " c.rowid";
-			$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as c";
+			$sql .= " FROM ".$this->db->prefix().$this->table_element." as c";
 			$sql .= " WHERE c.fk_element = ".((int) $fk_element);
 			$sql .= " AND c.element_type = '".$this->db->escape($element_type)."'";
 			$sql .= " AND c.entity = ".$conf->entity;
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index d65ecc1325d..8a0ce49ce00 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -220,6 +220,7 @@ abstract class CommonDocGenerator
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Define array with couple substitution key => substitution value
+	 * For example {company_name}, {company_name_alias}
 	 *
 	 * @param	Societe		$object			Object
 	 * @param   Translate	$outputlangs    Language object for output
@@ -491,7 +492,7 @@ abstract class CommonDocGenerator
 			$array_key.'_remain_to_pay'=>price2num($object->total_ttc - $already_payed_all, 'MT')
 		);
 
-		if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {
+		if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Propal', 'Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {
 			$resarray[$array_key.'_total_discount_ht_locale'] = price($object->getTotalDiscount(), 0, $outputlangs);
 			$resarray[$array_key.'_total_discount_ht'] = price2num($object->getTotalDiscount());
 		} else {
@@ -515,8 +516,9 @@ abstract class CommonDocGenerator
 		// Add vat by rates
 		if (is_array($object->lines) && count($object->lines) > 0) {
 			$totalUp = 0;
+			// Set substitution keys for different VAT rates
 			foreach ($object->lines as $line) {
-				// $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward compatibility
+				// $line->tva_tx format depends on database field accuracy, no reliable. This is kept for backward compatibility
 				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) {
 					$resarray[$array_key.'_total_vat_'.$line->tva_tx] = 0;
 				}
@@ -537,7 +539,7 @@ abstract class CommonDocGenerator
 			// Note that this added fields does not match a field into database in Dolibarr (Dolibarr manage discount on lines not as a global property of object)
 			$resarray['object_total_up'] = $totalUp;
 			$resarray['object_total_up_locale'] = price($resarray['object_total_up'], 0, $outputlangs);
-			if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {
+			if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Propal', 'Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {
 				$totalDiscount = $object->getTotalDiscount();
 			} else {
 				$totalDiscount = 0;
@@ -651,7 +653,7 @@ abstract class CommonDocGenerator
 
 				if ($columns != "") {
 					$columns = substr($columns, 0, strlen($columns) - 2);
-					$resql = $this->db->query("SELECT ".$columns." FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields AS ex INNER JOIN ".MAIN_DB_PREFIX."product_fournisseur_price AS f ON ex.fk_object = f.rowid WHERE f.ref_fourn = '".$this->db->escape($line->ref_supplier)."'");
+					$resql = $this->db->query("SELECT ".$columns." FROM ".$this->db->prefix()."product_fournisseur_price_extrafields AS ex INNER JOIN ".$this->db->prefix()."product_fournisseur_price AS f ON ex.fk_object = f.rowid WHERE f.ref_fourn = '".$this->db->escape($line->ref_supplier)."'");
 
 					if ($this->db->num_rows($resql) > 0) {
 						$resql = $this->db->fetch_object($resql);
@@ -1203,11 +1205,12 @@ abstract class CommonDocGenerator
 	 *  get extrafield content for pdf writeHtmlCell compatibility
 	 *  usage for PDF line columns and object note block
 	 *
-	 *  @param	object		$object     common object
-	 *  @param	string		$extrafieldKey    	the extrafield key
+	 *  @param	object		$object     		Common object
+	 *  @param	string		$extrafieldKey    	The extrafield key
+	 *  @param	Translate	$outputlangs		The output langs (if value is __(XXX)__ we use it to translate it).
 	 *  @return	string
 	 */
-	public function getExtrafieldContent($object, $extrafieldKey)
+	public function getExtrafieldContent($object, $extrafieldKey, $outputlangs = null)
 	{
 		global $hookmanager;
 
@@ -1343,7 +1346,7 @@ abstract class CommonDocGenerator
 
 				$field = new stdClass();
 				$field->rank = intval($extrafields->attributes[$object->table_element]['pos'][$key]);
-				$field->content = $this->getExtrafieldContent($object, $key);
+				$field->content = $this->getExtrafieldContent($object, $key, $outputlangs);
 				$field->label = $outputlangs->transnoentities($label);
 				$field->type = $extrafields->attributes[$object->table_element]['type'][$key];
 
diff --git a/htdocs/core/class/commonincoterm.class.php b/htdocs/core/class/commonincoterm.class.php
index 25745bb4c5c..e74d1428781 100644
--- a/htdocs/core/class/commonincoterm.class.php
+++ b/htdocs/core/class/commonincoterm.class.php
@@ -60,7 +60,7 @@ trait CommonIncoterm
 
 		$this->label_incoterms = '';
 		if (!empty($this->fk_incoterms)) {
-			$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
+			$sql = "SELECT code FROM ".$this->db->prefix()."c_incoterms WHERE rowid = ".(int) $this->fk_incoterms;
 			$result = $this->db->query($sql);
 			if ($result) {
 				$res = $this->db->fetch_object($result);
@@ -80,7 +80,7 @@ trait CommonIncoterm
 	 */
 	public function getIncotermsForPDF()
 	{
-		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
+		$sql = "SELECT code FROM ".$this->db->prefix()."c_incoterms WHERE rowid = ".(int) $this->fk_incoterms;
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -106,17 +106,17 @@ trait CommonIncoterm
 	public function setIncoterms($id_incoterm, $location)
 	{
 		if ($this->id && $this->table_element) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-			$sql .= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");
+			$sql = "UPDATE ".$this->db->prefix().$this->table_element;
+			$sql .= " SET fk_incoterms = ".($id_incoterm > 0 ? ((int) $id_incoterm) : "null");
 			$sql .= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			dol_syslog(get_class($this).'::setIncoterms', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$this->fk_incoterms = $id_incoterm;
 				$this->location_incoterms = $location;
 
-				$sql = 'SELECT libelle as label_incotermsFROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
+				$sql = "SELECT libelle as label_incoterms FROM ".$this->db->prefix()."c_incoterms WHERE rowid = ".(int) $this->fk_incoterms;
 				$res = $this->db->query($sql);
 				if ($res) {
 					$obj = $this->db->fetch_object($res);
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index f6edbd3f8d4..29fd230a61b 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -130,9 +130,9 @@ abstract class CommonInvoice extends CommonObject
 			$field = 'fk_facturefourn';
 		}
 
-		$sql = 'SELECT sum(amount) as amount, sum(multicurrency_amount) as multicurrency_amount';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$table;
-		$sql .= ' WHERE '.$field.' = '.$this->id;
+		$sql = "SELECT sum(amount) as amount, sum(multicurrency_amount) as multicurrency_amount";
+		$sql .= " FROM ".$this->db->prefix().$table;
+		$sql .= " WHERE ".$field." = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -226,10 +226,10 @@ abstract class CommonInvoice extends CommonObject
 	{
 		$idarray = array();
 
-		$sql = 'SELECT rowid';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-		$sql .= ' WHERE fk_facture_source = '.$this->id;
-		$sql .= ' AND type = 2';
+		$sql = "SELECT rowid";
+		$sql .= " FROM ".$this->db->prefix().$this->table_element;
+		$sql .= " WHERE fk_facture_source = ".((int) $this->id);
+		$sql .= " AND type = 2";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -253,10 +253,10 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	public function getIdReplacingInvoice($option = '')
 	{
-		$sql = 'SELECT rowid';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-		$sql .= ' WHERE fk_facture_source = '.$this->id;
-		$sql .= ' AND type < 2';
+		$sql = "SELECT rowid";
+		$sql .= " FROM ".$this->db->prefix().$this->table_element;
+		$sql .= " WHERE fk_facture_source = ".((int) $this->id);
+		$sql .= " AND type < 2";
 		if ($option == 'validated') {
 			$sql .= ' AND fk_statut = 1';
 		}
@@ -265,7 +265,7 @@ abstract class CommonInvoice extends CommonObject
 		// and another no, priority is given to the valid one.
 		// Should not happen (unless concurrent access and 2 people have created a
 		// replacement invoice for the same invoice at the same time)
-		$sql .= ' ORDER BY fk_statut DESC';
+		$sql .= " ORDER BY fk_statut DESC";
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -307,11 +307,10 @@ abstract class CommonInvoice extends CommonObject
 			$sharedentity = 'facture_fourn';
 		}
 
-		$sql = 'SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code'.$field3;
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$table.' as pf, '.MAIN_DB_PREFIX.$table2.' as p, '.MAIN_DB_PREFIX.'c_paiement as t';
-		$sql .= ' WHERE pf.'.$field.' = '.$this->id;
-		//$sql.= ' WHERE pf.'.$field.' = 1';
-		$sql .= ' AND pf.'.$field2.' = p.rowid';
+		$sql = "SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code".$field3;
+		$sql .= " FROM ".$this->db->prefix().$table." as pf, ".$this->db->prefix().$table2." as p, ".$this->db->prefix()."c_paiement as t";
+		$sql .= " WHERE pf.".$field." = ".((int) $this->id);
+		$sql .= " AND pf.".$field2." = p.rowid";
 		$sql .= ' AND p.fk_paiement = t.id';
 		$sql .= ' AND p.entity IN ('.getEntity($sharedentity).')';
 		if ($filtertype) {
@@ -337,14 +336,14 @@ abstract class CommonInvoice extends CommonObject
 			//look for credit notes and discounts and deposits
 			$sql = '';
 			if ($this->element == 'facture' || $this->element == 'invoice') {
-				$sql = 'SELECT rc.amount_ttc as amount, rc.multicurrency_amount_ttc as multicurrency_amount, rc.datec as date, f.ref as ref, rc.description as type';
-				$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-				$sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$this->id;
+				$sql = "SELECT rc.amount_ttc as amount, rc.multicurrency_amount_ttc as multicurrency_amount, rc.datec as date, f.ref as ref, rc.description as type";
+				$sql .= ' FROM '.$this->db->prefix().'societe_remise_except as rc, '.$this->db->prefix().'facture as f';
+				$sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.((int) $this->id);
 				$sql .= ' AND (f.type = 2 OR f.type = 0 OR f.type = 3)'; // Find discount coming from credit note or excess received or deposits (payments from deposits are always null except if FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is set)
 			} elseif ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
-				$sql = 'SELECT rc.amount_ttc as amount, rc.multicurrency_amount_ttc as multicurrency_amount, rc.datec as date, f.ref as ref, rc.description as type';
-				$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
-				$sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$this->id;
+				$sql = "SELECT rc.amount_ttc as amount, rc.multicurrency_amount_ttc as multicurrency_amount, rc.datec as date, f.ref as ref, rc.description as type";
+				$sql .= ' FROM '.$this->db->prefix().'societe_remise_except as rc, '.$this->db->prefix().'facture_fourn as f';
+				$sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.((int) $this->id);
 				$sql .= ' AND (f.type = 2 OR f.type = 0 OR f.type = 3)'; // Find discount coming from credit note or excess received or deposits (payments from deposits are always null except if FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is set)
 			}
 
@@ -463,7 +462,7 @@ abstract class CommonInvoice extends CommonObject
 			$type = 'supplier_invoice';
 		}
 
-		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$this->db->escape($type)."' AND ab.fk_doc = ".((int) $this->id);
+		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".$this->db->prefix()."accounting_bookkeeping as ab WHERE ab.doc_type='".$this->db->escape($type)."' AND ab.fk_doc = ".((int) $this->id);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
@@ -602,8 +601,8 @@ abstract class CommonInvoice extends CommonObject
 		$cdr_type = 0;
 		$cdr_decalage = 0;
 
-		$sqltemp = 'SELECT c.type_cdr, c.nbjour, c.decalage';
-		$sqltemp .= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
+		$sqltemp = "SELECT c.type_cdr, c.nbjour, c.decalage";
+		$sqltemp .= " FROM ".$this->db->prefix()."c_payment_term as c";
 		if (is_numeric($cond_reglement)) {
 			$sqltemp .= " WHERE c.rowid=".((int) $cond_reglement);
 		} else {
@@ -698,15 +697,15 @@ abstract class CommonInvoice extends CommonObject
 			$bac = new CompanyBankAccount($this->db);
 			$bac->fetch(0, $this->socid);
 
-			$sql = 'SELECT count(*)';
-			$sql .= ' FROM '.MAIN_DB_PREFIX.'prelevement_facture_demande';
+			$sql = "SELECT count(*)";
+			$sql .= " FROM ".$this->db->prefix()."prelevement_facture_demande";
 			if ($type == 'bank-transfer') {
-				$sql .= ' WHERE fk_facture_fourn = '.$this->id;
+				$sql .= " WHERE fk_facture_fourn = ".((int) $this->id);
 			} else {
-				$sql .= ' WHERE fk_facture = '.$this->id;
+				$sql .= " WHERE fk_facture = ".((int) $this->id);
 			}
-			$sql .= ' AND ext_payment_id IS NULL'; // To exclude record done for some online payments
-			$sql .= ' AND traite = 0';
+			$sql .= " AND ext_payment_id IS NULL"; // To exclude record done for some online payments
+			$sql .= " AND traite = 0";
 
 			dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -729,23 +728,23 @@ abstract class CommonInvoice extends CommonObject
 					}
 
 					if (is_numeric($amount) && $amount != 0) {
-						$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'prelevement_facture_demande(';
+						$sql = 'INSERT INTO '.$this->db->prefix().'prelevement_facture_demande(';
 						if ($type == 'bank-transfer') {
 							$sql .= 'fk_facture_fourn, ';
 						} else {
 							$sql .= 'fk_facture, ';
 						}
 						$sql .= ' amount, date_demande, fk_user_demande, code_banque, code_guichet, number, cle_rib, sourcetype, entity)';
-						$sql .= ' VALUES ('.$this->id;
-						$sql .= ",'".price2num($amount)."'";
-						$sql .= ",'".$this->db->idate($now)."'";
-						$sql .= ",".$fuser->id;
-						$sql .= ",'".$this->db->escape($bac->code_banque)."'";
-						$sql .= ",'".$this->db->escape($bac->code_guichet)."'";
-						$sql .= ",'".$this->db->escape($bac->number)."'";
-						$sql .= ",'".$this->db->escape($bac->cle_rib)."'";
-						$sql .= ",'".$this->db->escape($sourcetype)."'";
-						$sql .= ",".$conf->entity;
+						$sql .= " VALUES (".((int) $this->id);
+						$sql .= ", ".((float) price2num($amount));
+						$sql .= ", '".$this->db->idate($now)."'";
+						$sql .= ", ".((int) $fuser->id);
+						$sql .= ", '".$this->db->escape($bac->code_banque)."'";
+						$sql .= ", '".$this->db->escape($bac->code_guichet)."'";
+						$sql .= ", '".$this->db->escape($bac->number)."'";
+						$sql .= ", '".$this->db->escape($bac->cle_rib)."'";
+						$sql .= ", '".$this->db->escape($sourcetype)."'";
+						$sql .= ", ".((int) $conf->entity);
 						$sql .= ")";
 
 						dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
@@ -801,7 +800,7 @@ abstract class CommonInvoice extends CommonObject
 	public function demande_prelevement_delete($fuser, $did)
 	{
 		// phpcs:enable
-		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'prelevement_facture_demande';
+		$sql = 'DELETE FROM '.$this->db->prefix().'prelevement_facture_demande';
 		$sql .= ' WHERE rowid = '.((int) $did);
 		$sql .= ' AND traite = 0';
 		if ($this->db->query($sql)) {
@@ -812,6 +811,64 @@ abstract class CommonInvoice extends CommonObject
 			return -1;
 		}
 	}
+
+
+	/**
+	 * Build string for ZATCA QR Code (Arabi Saudia)
+	 *
+	 * @return	string			String for ZATCA QR Code
+	 */
+	public function buildZATCAQRString()
+	{
+		global $conf;
+
+		$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);
+
+		/*
+		$name = implode(unpack("H*", $this->thirdparty->name));
+		$vatnumber = implode(unpack("H*", $this->thirdparty->tva_intra));
+		$date = implode(unpack("H*", $datestring));
+		$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));
+
+		$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;
+		$s .= '03'.str_pad(dechex(strlen($datestring)), 2, '0', STR_PAD_LEFT).$date;
+		$s .= '04'.str_pad(dechex(strlen($pricewithtaxstring)), 2, '0', STR_PAD_LEFT).$pricewithtax;
+		$s .= '05'.str_pad(dechex(strlen($pricetaxstring)), 2, '0', STR_PAD_LEFT).$pricetax;
+		$s .= '';					// Hash of xml invoice
+		$s .= '';					// ecda signature
+		$s .= '';					// ecda public key
+		$s .= '';					// ecda signature of public key stamp
+		*/
+
+		// 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', 4).pack('C1', strlen($pricewithtaxstring)).$pricewithtaxstring;
+		$s .= pack('C1', 5).pack('C1', strlen($pricetaxstring)).$pricetaxstring;
+		$s .= '';					// Hash of xml invoice
+		$s .= '';					// ecda signature
+		$s .= '';					// ecda public key
+		$s .= '';					// ecda signature of public key stamp
+
+		$s = base64_encode($s);
+
+		return $s;
+	}
 }
 
 
@@ -972,8 +1029,8 @@ abstract class CommonInvoiceLine extends CommonObjectLine
 	public $date_end_fill; // If set to 1, when invoice is created from a template invoice, it will also auto set the field date_end at creation
 
 	public $buy_price_ht;
-	public $buyprice;		// For backward compatibility
-	public $pa_ht;			// For backward compatibility
+	public $buyprice; // For backward compatibility
+	public $pa_ht; // For backward compatibility
 
 	public $marge_tx;
 	public $marque_tx;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 85987c8a3cf..87f6ba693fc 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -73,6 +73,11 @@ abstract class CommonObject
 	 */
 	public $errors = array();
 
+	/**
+	 * @var array   To store error results of ->validateField()
+	 */
+	public $validateFieldsErrors = array();
+
 	/**
 	 * @var string ID to identify managed object
 	 */
@@ -123,6 +128,10 @@ abstract class CommonObject
 	 */
 	protected $table_ref_field = '';
 
+	/**
+	 * @var integer   0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
+	 */
+	public $restrictiononfksoc = 0;
 
 
 	// Following vars are used by some objects only. We keep this property here in CommonObject to be able to provide common method using them.
@@ -527,7 +536,7 @@ abstract class CommonObject
 		global $db, $conf;
 
 		$sql = "SELECT rowid, ref, ref_ext";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$element;
+		$sql .= " FROM ".$db->prefix().$element;
 		$sql .= " WHERE entity IN (".getEntity($element).")";
 
 		if ($id > 0) {
@@ -541,7 +550,7 @@ abstract class CommonObject
 			dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);
 			return -1;
 		}
-		if ($ref || $ref_ext) {
+		if ($ref || $ref_ext) {		// Because the same ref can exists in 2 different entities, we force the current one in priority
 			$sql .= " AND entity = ".((int) $conf->entity);
 		}
 
@@ -672,13 +681,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>';
@@ -1032,7 +1048,7 @@ abstract class CommonObject
 		} else {
 			// We look for id type_contact
 			$sql = "SELECT tc.rowid";
-			$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
+			$sql .= " FROM ".$this->db->prefix()."c_type_contact as tc";
 			$sql .= " WHERE tc.element='".$this->db->escape($this->element)."'";
 			$sql .= " AND tc.source='".$this->db->escape($source)."'";
 			$sql .= " AND tc.code='".$this->db->escape($type_contact)."' AND tc.active=1";
@@ -1070,7 +1086,7 @@ abstract class CommonObject
 			$this->db->begin();
 
 			// Insert into database
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";
+			$sql = "INSERT INTO ".$this->db->prefix()."element_contact";
 			$sql .= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
 			$sql .= " VALUES (".$this->id.", ".((int) $fk_socpeople)." , ";
 			$sql .= "'".$this->db->idate($datecreate)."'";
@@ -1139,7 +1155,7 @@ abstract class CommonObject
 	{
 		// phpcs:enable
 		// Insert into database
-		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
+		$sql = "UPDATE ".$this->db->prefix()."element_contact set";
 		$sql .= " statut = ".$statut;
 		if ($type_contact_id) {
 			$sql .= ", fk_c_type_contact = ".((int) $type_contact_id);
@@ -1173,7 +1189,7 @@ abstract class CommonObject
 
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
+		$sql = "DELETE FROM ".$this->db->prefix()."element_contact";
 		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		dol_syslog(get_class($this)."::delete_contact", LOG_DEBUG);
@@ -1206,17 +1222,20 @@ abstract class CommonObject
 	public function delete_linked_contact($source = '', $code = '')
 	{
 		// phpcs:enable
+		$listId = '';
 		$temp = array();
 		$typeContact = $this->liste_type_contact($source, '', 0, 0, $code);
 
-		foreach ($typeContact as $key => $value) {
-			array_push($temp, $key);
+		if (!empty($typeContact)) {
+			foreach ($typeContact as $key => $value) {
+				array_push($temp, $key);
+			}
+			$listId = implode(",", $temp);
 		}
-		$listId = implode(",", $temp);
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
-		$sql .= " WHERE element_id = ".$this->id;
-		if ($listId) {
+		$sql = "DELETE FROM ".$this->db->prefix()."element_contact";
+		$sql .= " WHERE element_id = ".((int) $this->id);
+		if (!empty($listId)) {
 			$sql .= " AND fk_c_type_contact IN (".$this->db->sanitize($listId).")";
 		}
 
@@ -1255,17 +1274,17 @@ abstract class CommonObject
 		}
 		$sql .= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
 		$sql .= ", tc.source, tc.element, tc.code, tc.libelle";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
-		$sql .= ", ".MAIN_DB_PREFIX."element_contact ec";
+		$sql .= " FROM ".$this->db->prefix()."c_type_contact tc";
+		$sql .= ", ".$this->db->prefix()."element_contact ec";
 		if ($source == 'internal') {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."user t on ec.fk_socpeople = t.rowid";
 		}
 		if ($source == 'external' || $source == 'thirdparty') {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."socpeople t on ec.fk_socpeople = t.rowid";
 		}
-		$sql .= " WHERE ec.element_id =".((int) $this->id);
-		$sql .= " AND ec.fk_c_type_contact=tc.rowid";
-		$sql .= " AND tc.element='".$this->db->escape($this->element)."'";
+		$sql .= " WHERE ec.element_id = ".((int) $this->id);
+		$sql .= " AND ec.fk_c_type_contact = tc.rowid";
+		$sql .= " AND tc.element = '".$this->db->escape($this->element)."'";
 		if ($code) {
 			$sql .= " AND tc.code = '".$this->db->escape($code)."'";
 		}
@@ -1336,7 +1355,7 @@ abstract class CommonObject
 	{
 		$sql = "SELECT ec.datecreate, ec.statut, ec.fk_socpeople, ec.fk_c_type_contact,";
 		$sql .= " tc.code, tc.libelle";
-		$sql .= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";
+		$sql .= " FROM (".$this->db->prefix()."element_contact as ec, ".$this->db->prefix()."c_type_contact as tc)";
 		$sql .= " WHERE ec.rowid =".((int) $rowid);
 		$sql .= " AND ec.fk_c_type_contact=tc.rowid";
 		$sql .= " AND tc.element = '".$this->db->escape($this->element)."'";
@@ -1381,7 +1400,7 @@ abstract class CommonObject
 
 		$tab = array();
 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
+		$sql .= " FROM ".$this->db->prefix()."c_type_contact as tc";
 		$sql .= " WHERE tc.element='".$this->db->escape($this->element)."'";
 		if ($activeonly == 1) {
 			$sql .= " AND tc.active=1"; // only the active types
@@ -1441,7 +1460,7 @@ abstract class CommonObject
 		$tab = array();
 
 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position, tc.element";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
+		$sql .= " FROM ".$this->db->prefix()."c_type_contact as tc";
 
 		$sqlWhere = array();
 		if (!empty($element)) {
@@ -1539,14 +1558,14 @@ abstract class CommonObject
 		}
 
 		$sql = "SELECT ec.fk_socpeople";
-		$sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
+		$sql .= " FROM ".$this->db->prefix()."element_contact as ec,";
 		if ($source == 'internal') {
-			$sql .= " ".MAIN_DB_PREFIX."user as c,";
+			$sql .= " ".$this->db->prefix()."user as c,";
 		}
 		if ($source == 'external') {
-			$sql .= " ".MAIN_DB_PREFIX."socpeople as c,";
+			$sql .= " ".$this->db->prefix()."socpeople as c,";
 		}
-		$sql .= " ".MAIN_DB_PREFIX."c_type_contact as tc";
+		$sql .= " ".$this->db->prefix()."c_type_contact as tc";
 		$sql .= " WHERE ec.element_id = ".((int) $id);
 		$sql .= " AND ec.fk_socpeople = c.rowid";
 		if ($source == 'internal') {
@@ -1653,8 +1672,8 @@ abstract class CommonObject
 	 * Looks for an object with ref matching the wildcard provided
 	 * It does only work when $this->table_ref_field is set
 	 *
-	 * @param string $ref Wildcard
-	 * @return int >1 = OK, 0 = Not found or table_ref_field not defined, <0 = KO
+	 * @param 	string 	$ref 	Wildcard
+	 * @return 	int 			>1 = OK, 0 = Not found or table_ref_field not defined, <0 = KO
 	 */
 	public function fetchOneLike($ref)
 	{
@@ -1662,7 +1681,7 @@ abstract class CommonObject
 			return 0;
 		}
 
-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE '.$this->table_ref_field.' LIKE "'.$this->db->escape($ref).'" LIMIT 1';
+		$sql = "SELECT rowid FROM ".$this->db->prefix().$this->table_element." WHERE ".$this->table_ref_field." LIKE '".$this->db->escape($ref)."' LIMIT 1";
 
 		$query = $this->db->query($sql);
 
@@ -1692,7 +1711,7 @@ abstract class CommonObject
 
 		$idtype = $this->barcode_type;
 		if (empty($idtype) && $idtype != '0') {	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
-			if ($this->element == 'product') {
+			if ($this->element == 'product' && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) {
 				$idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
 			} elseif ($this->element == 'societe') {
 				$idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
@@ -1704,7 +1723,7 @@ abstract class CommonObject
 		if ($idtype > 0) {
 			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder)) {    // If data not already loaded
 				$sql = "SELECT rowid, code, libelle as label, coder";
-				$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+				$sql .= " FROM ".$this->db->prefix()."c_barcode_type";
 				$sql .= " WHERE rowid = ".((int) $idtype);
 				dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);
 				$resql = $this->db->query($sql);
@@ -1841,8 +1860,8 @@ abstract class CommonObject
 
 		$result = false;
 
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$table;
-		$sql .= " WHERE ".$field." = '".$key."'";
+		$sql = "SELECT rowid FROM ".$this->db->prefix().$table;
+		$sql .= " WHERE ".$field." = '".$this->db->escape($key)."'";
 		if (!empty($element)) {
 			$sql .= " AND entity IN (".getEntity($element).")";
 		} else {
@@ -1874,7 +1893,7 @@ abstract class CommonObject
 	{
 		$result = false;
 		if (!empty($id) && !empty($field) && !empty($table)) {
-			$sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table;
+			$sql = "SELECT ".$field." FROM ".$this->db->prefix().$table;
 			$sql .= " WHERE rowid = ".((int) $id);
 
 			dol_syslog(get_class($this).'::getValueFrom', LOG_DEBUG);
@@ -1932,7 +1951,7 @@ abstract class CommonObject
 			$fk_user_field = 'fk_user_mod';
 		}
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
+		$sql = "UPDATE ".$this->db->prefix().$table." SET ";
 
 		if ($format == 'text') {
 			$sql .= $field." = '".$this->db->escape($value)."'";
@@ -1944,9 +1963,9 @@ abstract class CommonObject
 
 		if ($fk_user_field) {
 			if (!empty($fuser) && is_object($fuser)) {
-				$sql .= ", ".$fk_user_field." = ".$fuser->id;
+				$sql .= ", ".$fk_user_field." = ".((int) $fuser->id);
 			} elseif (empty($fuser) || $fuser != 'none') {
-				$sql .= ", ".$fk_user_field." = ".$user->id;
+				$sql .= ", ".$fk_user_field." = ".((int) $user->id);
 			}
 		}
 
@@ -2032,26 +2051,26 @@ abstract class CommonObject
 		}
 		$restrictiononfksoc = empty($this->restrictiononfksoc) ? 0 : $this->restrictiononfksoc;
 		$sql = "SELECT MAX(te.".$fieldid.")";
-		$sql .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";
+		$sql .= " FROM ".(empty($nodbprefix) ?$this->db->prefix():'').$this->table_element." as te";
 		if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-			$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+			$sql .= ",".$this->db->prefix()."usergroup_user as ug";
 		}
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
-			$sql .= ", ".MAIN_DB_PREFIX.$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity
-		} elseif ($restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
-		} elseif ($restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
+			$sql .= ", ".$this->db->prefix().$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity
+		} elseif ($restrictiononfksoc == 1 && $this->element != 'societe' && empty($user->rights->societe->client->voir) && !$socid) {
+			$sql .= ", ".$this->db->prefix()."societe as s"; // If we need to link to societe to limit select to socid
+		} elseif ($restrictiononfksoc == 2 && $this->element != 'societe' && empty($user->rights->societe->client->voir) && !$socid) {
+			$sql .= " LEFT JOIN ".$this->db->prefix()."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
 		}
-		if ($restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
+		if ($restrictiononfksoc && empty($user->rights->societe->client->voir) && !$socid) {
+			$sql .= " LEFT JOIN ".$this->db->prefix()."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
 		}
 		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($fieldid == 'rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
-		if ($restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+		if ($restrictiononfksoc == 1 && empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND sc.fk_user = ".((int) $user->id);
 		}
-		if ($restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+		if ($restrictiononfksoc == 2 && empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND (sc.fk_user = ".((int) $user->id).' OR te.fk_soc IS NULL)';
 		}
 		if (!empty($filter)) {
@@ -2062,8 +2081,8 @@ abstract class CommonObject
 		}
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
-			$sql .= ' AND te.'.$tmparray[0].' = '.($tmparray[1] == 'societe' ? 's' : 'parenttable').'.rowid'; // If we need to link to this table to limit select to entity
-		} elseif ($restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND te.".$tmparray[0]." = ".($tmparray[1] == "societe" ? "s" : "parenttable").".rowid"; // If we need to link to this table to limit select to entity
+		} elseif ($restrictiononfksoc == 1 && $this->element != 'societe' && empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
 		}
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
@@ -2083,13 +2102,13 @@ abstract class CommonObject
 			$sql .= ' AND parenttable.entity IN ('.getEntity($tmparray[1]).')';
 		}
 		if ($restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
-			$sql .= ' AND te.fk_soc = '.$socid;
+			$sql .= ' AND te.fk_soc = '.((int) $socid);
 		}
 		if ($restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
-			$sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
+			$sql .= ' AND (te.fk_soc = '.((int) $socid).' OR te.fk_soc IS NULL)';
 		}
 		if ($restrictiononfksoc && $socid && $this->element == 'societe') {
-			$sql .= ' AND te.rowid = '.$socid;
+			$sql .= ' AND te.rowid = '.((int) $socid);
 		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 
@@ -2102,26 +2121,26 @@ abstract class CommonObject
 		$this->ref_previous = $row[0];
 
 		$sql = "SELECT MIN(te.".$fieldid.")";
-		$sql .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";
+		$sql .= " FROM ".(empty($nodbprefix) ?$this->db->prefix():'').$this->table_element." as te";
 		if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-			$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+			$sql .= ",".$this->db->prefix()."usergroup_user as ug";
 		}
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
-			$sql .= ", ".MAIN_DB_PREFIX.$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity
-		} elseif ($restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
-		} elseif ($restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
+			$sql .= ", ".$this->db->prefix().$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity
+		} elseif ($restrictiononfksoc == 1 && $this->element != 'societe' && empty($user->rights->societe->client->voir) && !$socid) {
+			$sql .= ", ".$this->db->prefix()."societe as s"; // If we need to link to societe to limit select to socid
+		} elseif ($restrictiononfksoc == 2 && $this->element != 'societe' && empty($user->rights->societe->client->voir) && !$socid) {
+			$sql .= " LEFT JOIN ".$this->db->prefix()."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
 		}
-		if ($restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
+		if ($restrictiononfksoc && empty($user->rights->societe->client->voir) && !$socid) {
+			$sql .= " LEFT JOIN ".$this->db->prefix()."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
 		}
 		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($fieldid == 'rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
-		if ($restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+		if ($restrictiononfksoc == 1 && empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND sc.fk_user = ".((int) $user->id);
 		}
-		if ($restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+		if ($restrictiononfksoc == 2 && empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND (sc.fk_user = ".((int) $user->id).' OR te.fk_soc IS NULL)';
 		}
 		if (!empty($filter)) {
@@ -2132,8 +2151,8 @@ abstract class CommonObject
 		}
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
-			$sql .= ' AND te.'.$tmparray[0].' = '.($tmparray[1] == 'societe' ? 's' : 'parenttable').'.rowid'; // If we need to link to this table to limit select to entity
-		} elseif ($restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND te.".$tmparray[0]." = ".($tmparray[1] == "societe" ? "s" : "parenttable").".rowid"; // If we need to link to this table to limit select to entity
+		} elseif ($restrictiononfksoc == 1 && $this->element != 'societe' && empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
 		}
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
@@ -2153,13 +2172,13 @@ abstract class CommonObject
 			$sql .= ' AND parenttable.entity IN ('.getEntity($tmparray[1]).')';
 		}
 		if ($restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
-			$sql .= ' AND te.fk_soc = '.$socid;
+			$sql .= ' AND te.fk_soc = '.((int) $socid);
 		}
 		if ($restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
-			$sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
+			$sql .= ' AND (te.fk_soc = '.((int) $socid).' OR te.fk_soc IS NULL)';
 		}
 		if ($restrictiononfksoc && $socid && $this->element == 'societe') {
-			$sql .= ' AND te.rowid = '.$socid;
+			$sql .= ' AND te.rowid = '.((int) $socid);
 		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 		// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
@@ -2214,19 +2233,19 @@ abstract class CommonObject
 			return -1;
 		}
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element;
 		if (!empty($this->fields['fk_project'])) {		// Common case
 			if ($projectid) {
-				$sql .= ' SET fk_project = '.((int) $projectid);
+				$sql .= " SET fk_project = ".((int) $projectid);
 			} else {
-				$sql .= ' SET fk_project = NULL';
+				$sql .= " SET fk_project = NULL";
 			}
 			$sql .= ' WHERE rowid = '.((int) $this->id);
 		} elseif ($this->table_element == 'actioncomm') {	// Special case for actioncomm
 			if ($projectid) {
-				$sql .= ' SET fk_project = '.((int) $projectid);
+				$sql .= " SET fk_project = ".((int) $projectid);
 			} else {
-				$sql .= ' SET fk_project = NULL';
+				$sql .= " SET fk_project = NULL";
 			}
 			$sql .= ' WHERE id = '.((int) $this->id);
 		} else // Special case for old architecture objects
@@ -2236,7 +2255,7 @@ abstract class CommonObject
 			} else {
 				$sql .= ' SET fk_projet = NULL';
 			}
-			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 		}
 
 		dol_syslog(get_class($this)."::setProject", LOG_DEBUG);
@@ -2257,7 +2276,12 @@ abstract class CommonObject
 	 */
 	public function setPaymentMethods($id)
 	{
+		global $user;
+
+		$error = 0; $notrigger = 0;
+
 		dol_syslog(get_class($this).'::setPaymentMethods('.$id.')');
+
 		if ($this->statut >= 0 || $this->element == 'societe') {
 			// TODO uniformize field name
 			$fieldname = 'fk_mode_reglement';
@@ -2274,8 +2298,8 @@ abstract class CommonObject
 				$fieldname = 'fk_typepayment';
 			}
 
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
+			$sql = "UPDATE ".$this->db->prefix().$this->table_element;
+			$sql .= " SET ".$fieldname." = ".(($id > 0 || $id == '0') ? ((int) $id) : 'NULL');
 			$sql .= ' WHERE rowid='.((int) $this->id);
 
 			if ($this->db->query($sql)) {
@@ -2284,9 +2308,22 @@ abstract class CommonObject
 				if (get_class($this) == 'Fournisseur') {
 					$this->mode_reglement_supplier_id = $id;
 				}
+				// Triggers
+				if (!$error && !$notrigger) {
+					// Call triggers
+					if (get_class($this) == 'Commande') {
+						$result = $this->call_trigger('ORDER_MODIFY', $user);
+					} else {
+						$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);
+					}
+					if ($result < 0) {
+						$error++;
+					}
+					// End call triggers
+				}
 				return 1;
 			} else {
-				dol_syslog(get_class($this).'::setPaymentMethods Error '.$sql.' - '.$this->db->error());
+				dol_syslog(get_class($this).'::setPaymentMethods Error '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
@@ -2309,8 +2346,8 @@ abstract class CommonObject
 		if ($this->statut >= 0 || $this->element == 'societe') {
 			$fieldname = 'multicurrency_code';
 
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' SET '.$fieldname." = '".$this->db->escape($code)."'";
+			$sql = 'UPDATE '.$this->db->prefix().$this->table_element;
+			$sql .= " SET ".$fieldname." = '".$this->db->escape($code)."'";
 			$sql .= ' WHERE rowid='.((int) $this->id);
 
 			if ($this->db->query($sql)) {
@@ -2347,8 +2384,8 @@ abstract class CommonObject
 		if ($this->statut >= 0 || $this->element == 'societe') {
 			$fieldname = 'multicurrency_tx';
 
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' SET '.$fieldname.' = '.((float) $rate);
+			$sql = 'UPDATE '.$this->db->prefix().$this->table_element;
+			$sql .= " SET ".$fieldname." = ".((float) $rate);
 			$sql .= ' WHERE rowid='.((int) $this->id);
 
 			if ($this->db->query($sql)) {
@@ -2555,8 +2592,8 @@ abstract class CommonObject
 				$fieldname = 'cond_reglement_supplier';
 			}
 
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
+			$sql = 'UPDATE '.$this->db->prefix().$this->table_element;
+			$sql .= " SET ".$fieldname." = ".(($id > 0 || $id == '0') ? ((int) $id) : 'NULL');
 			$sql .= ' WHERE rowid='.((int) $this->id);
 
 			if ($this->db->query($sql)) {
@@ -2597,8 +2634,8 @@ abstract class CommonObject
 				$fieldname = 'transport_mode_supplier';
 			}
 
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
+			$sql = 'UPDATE '.$this->db->prefix().$this->table_element;
+			$sql .= " SET ".$fieldname." = ".(($id > 0 || $id == '0') ? ((int) $id) : 'NULL');
 			$sql .= ' WHERE rowid='.((int) $this->id);
 
 			if ($this->db->query($sql)) {
@@ -2632,8 +2669,8 @@ abstract class CommonObject
 		if ($this->statut >= 0 || $this->element == 'societe') {
 			$fieldname = 'retained_warranty_fk_cond_reglement';
 
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' SET '.$fieldname.' = '.((int) $id);
+			$sql = 'UPDATE '.$this->db->prefix().$this->table_element;
+			$sql .= " SET ".$fieldname." = ".((int) $id);
 			$sql .= ' WHERE rowid='.((int) $this->id);
 
 			if ($this->db->query($sql)) {
@@ -2665,15 +2702,15 @@ abstract class CommonObject
 			$fieldname = 'fk_address';
 		}
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".((int) $id);
-		$sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element." SET ".$fieldname." = ".((int) $id);
+		$sql .= " WHERE rowid = ".((int) $this->id)." AND fk_statut = 0";
 
 		if ($this->db->query($sql)) {
 			$this->fk_delivery_address = $id;
 			return 1;
 		} else {
 			$this->error = $this->db->error();
-			dol_syslog(get_class($this).'::setDeliveryAddress Error '.$sql.' - '.$this->error);
+			dol_syslog(get_class($this).'::setDeliveryAddress Error '.$this->error);
 			return -1;
 		}
 	}
@@ -2710,7 +2747,7 @@ abstract class CommonObject
 		}
 		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element;
 		$sql .= " SET fk_shipping_method = ".((int) $shipping_method_id);
 		$sql .= " WHERE rowid=".((int) $this->id);
 		$resql = $this->db->query($sql);
@@ -2757,7 +2794,7 @@ abstract class CommonObject
 		}
 		dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element;
 		$sql .= " SET fk_warehouse = ".((int) $warehouse_id);
 		$sql .= " WHERE rowid=".((int) $this->id);
 
@@ -2788,9 +2825,9 @@ abstract class CommonObject
 
 		$newmodelpdf = dol_trunc($modelpdf, 255);
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element;
 		$sql .= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::setDocModel", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2834,7 +2871,7 @@ abstract class CommonObject
 		}
 		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element;
 		$sql .= " SET fk_account = ".((int) $fk_account);
 		$sql .= " WHERE rowid=".((int) $this->id);
 
@@ -2891,8 +2928,8 @@ abstract class CommonObject
 
 		// Count number of lines to reorder (according to choice $renum)
 		$nl = 0;
-		$sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql .= ' WHERE '.$this->fk_element.'='.$this->id;
+		$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';
 		}
@@ -2913,12 +2950,12 @@ abstract class CommonObject
 			$rows = array();
 
 			// We first search all lines that are parent lines (for multilevel details lines)
-			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+			$sql = "SELECT rowid FROM ".$this->db->prefix().$this->table_element_line;
+			$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);
 			if ($fk_parent_line) {
 				$sql .= ' AND fk_parent_line IS NULL';
 			}
-			$sql .= ' ORDER BY rang ASC, rowid '.$rowidorder;
+			$sql .= " ORDER BY rang ASC, rowid ".$rowidorder;
 
 			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -2961,12 +2998,12 @@ abstract class CommonObject
 	{
 		$rows = array();
 
-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
-		$sql .= ' AND fk_parent_line = '.$id;
+		$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';
 
-		dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id."", LOG_DEBUG);
+		dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($this->db->num_rows($resql) > 0) {
@@ -3029,21 +3066,28 @@ abstract class CommonObject
 	 *
 	 * 	@param	int		$rowid		Id of line
 	 * 	@param	int		$rang		Position
-	 * 	@return	void
+	 * 	@return	int					<0 if KO, >0 if OK
 	 */
 	public function updateRangOfLine($rowid, $rang)
 	{
+		global $hookmanager;
 		$fieldposition = 'rang'; // @todo Rename 'rang' into 'position'
 		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction'))) {
 			$fieldposition = 'position';
 		}
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.((int) $rang);
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldposition." = ".((int) $rang);
 		$sql .= ' WHERE rowid = '.((int) $rowid);
 
 		dol_syslog(get_class($this)."::updateRangOfLine", LOG_DEBUG);
 		if (!$this->db->query($sql)) {
 			dol_print_error($this->db);
+			return -1;
+		} else {
+			$parameters=array('rowid'=>$rowid, 'rang'=>$rang, 'fieldposition' => $fieldposition);
+			$action='';
+			$reshook = $hookmanager->executeHooks('afterRankOfLineUpdate', $parameters, $this, $action);
+			return 1;
 		}
 	}
 
@@ -3078,11 +3122,11 @@ abstract class CommonObject
 				$fieldposition = 'position';
 			}
 
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.((int) $rang);
-			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
-			$sql .= ' AND rang = '.($rang - 1);
+			$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));
 			if ($this->db->query($sql)) {
-				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.((int) ($rang - 1));
+				$sql = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldposition." = ".((int) ($rang - 1));
 				$sql .= ' WHERE rowid = '.((int) $rowid);
 				if (!$this->db->query($sql)) {
 					dol_print_error($this->db);
@@ -3109,11 +3153,11 @@ abstract class CommonObject
 				$fieldposition = 'position';
 			}
 
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.((int) $rang);
-			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+			$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));
 			if ($this->db->query($sql)) {
-				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.((int) ($rang + 1));
+				$sql = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldposition." = ".((int) ($rang + 1));
 				$sql .= ' WHERE rowid = '.((int) $rowid);
 				if (!$this->db->query($sql)) {
 					dol_print_error($this->db);
@@ -3132,8 +3176,8 @@ abstract class CommonObject
 	 */
 	public function getRangOfLine($rowid)
 	{
-		$sql = 'SELECT rang FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql .= ' WHERE rowid ='.((int) $rowid);
+		$sql = "SELECT rang FROM ".$this->db->prefix().$this->table_element_line;
+		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		dol_syslog(get_class($this)."::getRangOfLine", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -3151,9 +3195,9 @@ abstract class CommonObject
 	 */
 	public function getIdOfLine($rang)
 	{
-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
-		$sql .= ' AND rang = '.((int) $rang);
+		$sql = "SELECT rowid FROM ".$this->db->prefix().$this->table_element_line;
+		$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);
+		$sql .= " AND rang = ".((int) $rang);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$row = $this->db->fetch_row($resql);
@@ -3178,9 +3222,9 @@ abstract class CommonObject
 
 		// Search the last rang with fk_parent_line
 		if ($fk_parent_line) {
-			$sql = 'SELECT max('.$positionfield.') FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
-			$sql .= ' AND fk_parent_line = '.$fk_parent_line;
+			$sql = "SELECT max(".$positionfield.") FROM ".$this->db->prefix().$this->table_element_line;
+			$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);
+			$sql .= " AND fk_parent_line = ".((int) $fk_parent_line);
 
 			dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -3194,8 +3238,8 @@ abstract class CommonObject
 			}
 		} else {
 			// If not, search the last rang of element
-			$sql = 'SELECT max('.$positionfield.') FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+			$sql = "SELECT max(".$positionfield.") FROM ".$this->db->prefix().$this->table_element_line;
+			$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -3221,9 +3265,9 @@ abstract class CommonObject
 			return -1;
 		}
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element;
 		$sql .= " SET ref_ext = '".$this->db->escape($ref_ext)."'";
-		$sql .= " WHERE ".(isset($this->table_rowid) ? $this->table_rowid : 'rowid')." = ".$this->id;
+		$sql .= " WHERE ".(isset($this->table_rowid) ? $this->table_rowid : 'rowid')." = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update_ref_ext", LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -3272,10 +3316,10 @@ abstract class CommonObject
 		} else {
 			$fieldusermod = "fk_user_modif";
 		}
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element;
 		$sql .= " SET note".$newsuffix." = ".(!empty($note) ? ("'".$this->db->escape($note)."'") : "NULL");
-		$sql .= " ,".$fieldusermod." = ".$user->id;
-		$sql .= " WHERE rowid =".$this->id;
+		$sql .= ", ".$fieldusermod." = ".((int) $user->id);
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update_note", LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -3341,7 +3385,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";
@@ -3386,25 +3430,28 @@ abstract class CommonObject
 			$fieldtva = 'tva';
 			$fieldup = 'pu_ht';
 		}
+		if ($this->element == 'invoice_supplier_rec') {
+			$fieldup = 'pu_ht';
+		}
 		if ($this->element == 'expensereport') {
 			$fieldup = 'value_unit';
 		}
 
-		$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';
+		$sql = "SELECT rowid, qty, ".$fieldup." as up, remise_percent, total_ht, ".$fieldtva." as total_tva, total_ttc, ".$fieldlocaltax1." as total_localtax1, ".$fieldlocaltax2." as total_localtax2,";
 		$sql .= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
 		if ($this->table_element_line == 'facturedet') {
 			$sql .= ', situation_percent';
 		}
 		$sql .= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+		$sql .= " FROM ".$this->db->prefix().$this->table_element_line;
+		$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);
 		if ($exclspec) {
 			$product_field = 'product_type';
 			if ($this->table_element_line == 'contratdet') {
 				$product_field = ''; // contratdet table has no product_type field
 			}
 			if ($product_field) {
-				$sql .= ' AND '.$product_field.' <> 9';
+				$sql .= " AND ".$product_field." <> 9";
 			}
 		}
 		$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
@@ -3444,7 +3491,7 @@ abstract class CommonObject
 					//var_dump($diff_when_using_price_ht.' '.$diff_on_current_total);
 
 					if ($diff_when_using_price_ht && $diff_on_current_total) {
-						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;
+						$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);
 						$resqlfix = $this->db->query($sqlfix);
 						if (!$resqlfix) {
@@ -3488,7 +3535,7 @@ abstract class CommonObject
 							dol_print_error('', $errmsg);
 							exit;
 						}
-						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;
+						$sqlfix = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldtva." = ".price2num($obj->total_tva - $diff).", total_ttc = ".price2num($obj->total_ttc - $diff)." WHERE rowid = ".((int) $obj->rowid);
 						dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
 								$resqlfix = $this->db->query($sqlfix);
 						if (!$resqlfix) {
@@ -3536,7 +3583,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') {
@@ -3556,16 +3603,16 @@ abstract class CommonObject
 			}
 
 			if (empty($nodatabaseupdate)) {
-				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
-				$sql .= " ".$fieldht." = ".price2num($this->total_ht).",";
-				$sql .= " ".$fieldtva." = ".price2num($this->total_tva).",";
-				$sql .= " ".$fieldlocaltax1." = ".price2num($this->total_localtax1).",";
-				$sql .= " ".$fieldlocaltax2." = ".price2num($this->total_localtax2).",";
-				$sql .= " ".$fieldttc." = ".price2num($this->total_ttc);
-				$sql .= ", multicurrency_total_ht = ".price2num($this->multicurrency_total_ht, 'MT', 1);
-				$sql .= ", multicurrency_total_tva = ".price2num($this->multicurrency_total_tva, 'MT', 1);
-				$sql .= ", multicurrency_total_ttc = ".price2num($this->multicurrency_total_ttc, 'MT', 1);
-				$sql .= ' WHERE rowid = '.$this->id;
+				$sql = "UPDATE ".$this->db->prefix().$this->table_element.' SET';
+				$sql .= " ".$fieldht." = ".((float) price2num($this->total_ht)).",";
+				$sql .= " ".$fieldtva." = ".((float) price2num($this->total_tva)).",";
+				$sql .= " ".$fieldlocaltax1." = ".((float) price2num($this->total_localtax1)).",";
+				$sql .= " ".$fieldlocaltax2." = ".((float) price2num($this->total_localtax2)).",";
+				$sql .= " ".$fieldttc." = ".((float) price2num($this->total_ttc));
+				$sql .= ", multicurrency_total_ht = ".((float) price2num($this->multicurrency_total_ht, 'MT', 1));
+				$sql .= ", multicurrency_total_tva = ".((float) price2num($this->multicurrency_total_tva, 'MT', 1));
+				$sql .= ", multicurrency_total_ttc = ".((float) price2num($this->multicurrency_total_ttc, 'MT', 1));
+				$sql .= " WHERE rowid = ".((int) $this->id);
 
 				dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
 				$resql = $this->db->query($sql);
@@ -3602,7 +3649,7 @@ abstract class CommonObject
 	public function add_object_linked($origin = null, $origin_id = null, $f_user = null, $notrigger = 0)
 	{
 		// phpcs:enable
-		global $user;
+		global $user, $hookmanager, $action;
 		$origin = (!empty($origin) ? $origin : $this->origin);
 		$origin_id = (!empty($origin_id) ? $origin_id : $this->origin_id);
 		$f_user = isset($f_user) ? $f_user : $user;
@@ -3620,10 +3667,24 @@ abstract class CommonObject
 		if ($origin == 'supplierorder') {
 			$origin = 'order_supplier';
 		}
+
+		// 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');
+		// 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;
+
+		$parameters = array('targettype'=>$targettype);
+		// Hook for explicitly set the targettype if it must be differtent than $this->element
+		$reshook = $hookmanager->executeHooks('setLinkedObjectSourceTargetType', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) {
+			if (!empty($hookmanager->resArray['targettype'])) $targettype = $hookmanager->resArray['targettype'];
+		}
+
 		$this->db->begin();
 		$error = 0;
 
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "element_element (";
+		$sql = "INSERT INTO " . $this->db->prefix() . "element_element (";
 		$sql .= "fk_source";
 		$sql .= ", sourcetype";
 		$sql .= ", fk_target";
@@ -3632,7 +3693,7 @@ abstract class CommonObject
 		$sql .= ((int) $origin_id);
 		$sql .= ", '" . $this->db->escape($origin) . "'";
 		$sql .= ", " . ((int) $this->id);
-		$sql .= ", '" . $this->db->escape($this->element) . "'";
+		$sql .= ", '" . $this->db->escape($targettype) . "'";
 		$sql .= ")";
 
 		dol_syslog(get_class($this) . "::add_object_linked", LOG_DEBUG);
@@ -3664,28 +3725,28 @@ abstract class CommonObject
 	/**
 	 *	Fetch array of objects linked to current object (object of enabled modules only). Links are loaded into
 	 *		this->linkedObjectsIds array +
-	 *		this->linkedObjects array if $loadalsoobjects = 1
+	 *		this->linkedObjects array if $loadalsoobjects = 1 or $loadalsoobjects = type
 	 *  Possible usage for parameters:
 	 *  - all parameters empty -> we look all link to current object (current object can be source or target)
-	 *  - source id+type -> will get target list linked to source
-	 *  - target id+type -> will get source list linked to target
-	 *  - source id+type + target type -> will get target list of the type
-	 *  - target id+type + target source -> will get source list of the type
+	 *  - source id+type -> will get list of targets linked to source
+	 *  - target id+type -> will get list of sources linked to target
+	 *  - source id+type + target type -> will get list of targets of the type linked to source
+	 *  - target id+type + source type -> will get list of sources of the type linked to target
 	 *
-	 *	@param	int		$sourceid			Object source id (if not defined, id of object)
-	 *	@param  string	$sourcetype			Object source type (if not defined, element name of object)
-	 *	@param  int		$targetid			Object target id (if not defined, id of object)
-	 *	@param  string	$targettype			Object target type (if not defined, elemennt name of object)
-	 *	@param  string	$clause				'OR' or 'AND' clause used when both source id and target id are provided
-	 *  @param  int		$alsosametype		0=Return only links to object that differs from source type. 1=Include also link to objects of same type.
-	 *  @param  string	$orderby			SQL 'ORDER BY' clause
-	 *  @param	int		$loadalsoobjects	Load also array this->linkedObjects (Use 0 to increase performances)
-	 *	@return int							<0 if KO, >0 if OK
+	 *	@param	int			$sourceid			Object source id (if not defined, id of object)
+	 *	@param  string		$sourcetype			Object source type (if not defined, element name of object)
+	 *	@param  int			$targetid			Object target id (if not defined, id of object)
+	 *	@param  string		$targettype			Object target type (if not defined, element name of object)
+	 *	@param  string		$clause				'OR' or 'AND' clause used when both source id and target id are provided
+	 *  @param  int			$alsosametype		0=Return only links to object that differs from source type. 1=Include also link to objects of same type.
+	 *  @param  string		$orderby			SQL 'ORDER BY' clause
+	 *  @param	int|string	$loadalsoobjects	Load also array this->linkedObjects. Use 0 to increase performances, Use 1 to load all, Use value of type ('facture', 'facturerec', ...) to load only a type of object.
+	 *	@return int								<0 if KO, >0 if OK
 	 *  @see	add_object_linked(), updateObjectLinked(), deleteObjectLinked()
 	 */
 	public function fetchObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $clause = 'OR', $alsosametype = 1, $orderby = 'sourcetype', $loadalsoobjects = 1)
 	{
-		global $conf;
+		global $conf, $hookmanager, $action;
 
 		$this->linkedObjectsIds = array();
 		$this->linkedObjects = array();
@@ -3695,6 +3756,16 @@ abstract class CommonObject
 		$withtargettype = false;
 		$withsourcetype = false;
 
+		$parameters = array('sourcetype'=>$sourcetype, 'sourceid'=>$sourceid, 'targettype'=>$targettype, 'targetid'=>$targetid);
+		// Hook for explicitly set the targettype if it must be differtent than $this->element
+		$reshook = $hookmanager->executeHooks('setLinkedObjectSourceTargetType', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) {
+			if (!empty($hookmanager->resArray['sourcetype'])) $sourcetype = $hookmanager->resArray['sourcetype'];
+			if (!empty($hookmanager->resArray['sourceid'])) $sourceid = $hookmanager->resArray['sourceid'];
+			if (!empty($hookmanager->resArray['targettype'])) $targettype = $hookmanager->resArray['targettype'];
+			if (!empty($hookmanager->resArray['targetid'])) $targetid = $hookmanager->resArray['targetid'];
+		}
+
 		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid)) {
 			$justsource = true; // the source (id and type) is a search criteria
 			if (!empty($targettype)) {
@@ -3720,8 +3791,8 @@ abstract class CommonObject
 		 }*/
 
 		// Links between objects are stored in table element_element
-		$sql = 'SELECT rowid, fk_source, sourcetype, fk_target, targettype';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'element_element';
+		$sql = "SELECT rowid, fk_source, sourcetype, fk_target, targettype";
+		$sql .= " FROM ".$this->db->prefix()."element_element";
 		$sql .= " WHERE ";
 		if ($justsource || $justtarget) {
 			if ($justsource) {
@@ -3739,7 +3810,7 @@ abstract class CommonObject
 			$sql .= "(fk_source = ".((int) $sourceid)." AND sourcetype = '".$this->db->escape($sourcetype)."')";
 			$sql .= " ".$clause." (fk_target = ".((int) $targetid)." AND targettype = '".$this->db->escape($targettype)."')";
 		}
-		$sql .= ' ORDER BY '.$orderby;
+		$sql .= " ORDER BY ".$orderby;
 
 		dol_syslog(get_class($this)."::fetchObjectLink", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -3845,11 +3916,16 @@ abstract class CommonObject
 						$classfile = 'conferenceorbooth';
 						$classname = 'ConferenceOrBooth';
 						$module = 'eventorganization';
+					} elseif ($objecttype == 'mo') {
+						$classpath = 'mrp/class';
+						$classfile = 'mo';
+						$classname = 'Mo';
+						$module = 'mrp';
 					}
 
-					// Here $module, $classfile and $classname are set
+					// Here $module, $classfile and $classname are set, we can use them.
 					if ($conf->$module->enabled && (($element != $this->element) || $alsosametype)) {
-						if ($loadalsoobjects) {
+						if ($loadalsoobjects && (is_numeric($loadalsoobjects) || ($loadalsoobjects === $objecttype))) {
 							dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
 							//print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);
 							if (class_exists($classname)) {
@@ -3902,7 +3978,7 @@ abstract class CommonObject
 		$this->db->begin();
 		$error = 0;
 
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "element_element SET ";
+		$sql = "UPDATE " . $this->db->prefix() . "element_element SET ";
 		if ($updatesource) {
 			$sql .= "fk_source = " . ((int) $sourceid);
 			$sql .= ", sourcetype = '" . $this->db->escape($sourcetype) . "'";
@@ -3991,7 +4067,7 @@ abstract class CommonObject
 		}
 
 		if (!$error) {
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "element_element";
+			$sql = "DELETE FROM " . $this->db->prefix() . "element_element";
 			$sql .= " WHERE";
 			if ($rowid > 0) {
 				$sql .= " rowid = " . ((int) $rowid);
@@ -4043,7 +4119,7 @@ abstract class CommonObject
 
 		global $db;
 
-		$sql = 'SELECT '.$field_select.' FROM '.MAIN_DB_PREFIX.$table_element.' WHERE '.$field_where.' = '.((int) $fk_object_where);
+		$sql = "SELECT ".$field_select." FROM ".$db->prefix().$table_element." WHERE ".$field_where." = ".((int) $fk_object_where);
 		$resql = $db->query($sql);
 
 		$TRes = array();
@@ -4072,7 +4148,7 @@ abstract class CommonObject
 
 		global $db;
 
-		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table_element.' WHERE '.$field_where.' = '.((int) $fk_object_where);
+		$sql = "DELETE FROM ".$db->prefix().$table_element." WHERE ".$field_where." = ".((int) $fk_object_where);
 		$resql = $db->query($sql);
 
 		if (empty($resql)) {
@@ -4086,12 +4162,13 @@ abstract class CommonObject
 	 *      Set status of an object
 	 *
 	 *      @param	int		$status			Status to set
-	 *      @param	int		$elementId		Id of element to force (use this->id by default)
+	 *      @param	int		$elementId		Id of element to force (use this->id by default if null)
 	 *      @param	string	$elementType	Type of element to force (use this->table_element by default)
-	 *      @param	string	$trigkey		Trigger key to use for trigger
+	 *      @param	string	$trigkey		Trigger key to use for trigger. Use '' means automatic but it not recommended and is deprecated.
+	 *      @param	string	$fieldstatus	Name of status field in this->table_element
 	 *      @return int						<0 if KO, >0 if OK
 	 */
-	public function setStatut($status, $elementId = null, $elementType = '', $trigkey = '')
+	public function setStatut($status, $elementId = null, $elementType = '', $trigkey = '', $fieldstatus = 'fk_statut')
 	{
 		global $user, $langs, $conf;
 
@@ -4102,7 +4179,6 @@ abstract class CommonObject
 
 		$this->db->begin();
 
-		$fieldstatus = "fk_statut";
 		if ($elementTable == 'facture_rec') {
 			$fieldstatus = "suspended";
 		}
@@ -4125,12 +4201,19 @@ abstract class CommonObject
 			$fieldstatus = 'status';
 		}
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
+		$sql = "UPDATE ".$this->db->prefix().$elementTable;
 		$sql .= " SET ".$fieldstatus." = ".((int) $status);
 		// If status = 1 = validated, update also fk_user_valid
-		if ($status == 1 && $elementTable == 'expensereport') {
+		// TODO Replace the test on $elementTable by doing a test on existence of the field in $this->fields
+		if ($status == 1 && in_array($elementTable, array('expensereport', 'inventory'))) {
 			$sql .= ", fk_user_valid = ".((int) $user->id);
 		}
+		if ($status == 1 && in_array($elementTable, array('expensereport'))) {
+			$sql .= ", date_valid = '".$this->db->idate(dol_now())."'";
+		}
+		if ($status == 1 && in_array($elementTable, array('inventory'))) {
+			$sql .= ", date_validation = '".$this->db->idate(dol_now())."'";
+		}
 		$sql .= " WHERE rowid=".((int) $elementId);
 
 		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
@@ -4171,9 +4254,16 @@ abstract class CommonObject
 			if (!$error) {
 				$this->db->commit();
 
-				if (empty($savElementId)) {    // If the element we update was $this (so $elementId is null)
-					$this->statut = $status;
-					$this->status = $status;
+				if (empty($savElementId)) {
+					// If the element we update is $this (so $elementId was provided as null)
+					if ($fieldstatus == 'tosell') {
+						$this->status = $status;
+					} elseif ($fieldstatus == 'tobuy') {
+						$this->status_buy = $status;
+					} else {
+						$this->statut = $status;
+						$this->status = $status;
+					}
 				}
 
 				return 1;
@@ -4212,7 +4302,7 @@ abstract class CommonObject
 		$ref = trim($ref);
 
 		$sql = "SELECT rowid, canvas";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " FROM ".$this->db->prefix().$this->table_element;
 		$sql .= " WHERE entity IN (".getEntity($this->element).")";
 		if (!empty($id)) {
 			$sql .= " AND rowid = ".((int) $id);
@@ -4245,8 +4335,8 @@ abstract class CommonObject
 	 */
 	public function getSpecialCode($lineid)
 	{
-		$sql = 'SELECT special_code FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql .= ' WHERE rowid = '.((int) $lineid);
+		$sql = "SELECT special_code FROM ".$this->db->prefix().$this->table_element_line;
+		$sql .= " WHERE rowid = ".((int) $lineid);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$row = $this->db->fetch_row($resql);
@@ -4287,7 +4377,7 @@ abstract class CommonObject
 		foreach ($arraytoscan as $table => $elementname) {
 			//print $id.'-'.$table.'-'.$elementname.'<br>';
 			// Check if third party can be deleted
-			$sql = "SELECT COUNT(*) as nb from ".MAIN_DB_PREFIX.$table;
+			$sql = "SELECT COUNT(*) as nb from ".$this->db->prefix().$table;
 			$sql .= " WHERE ".$this->fk_element." = ".((int) $id);
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -4297,10 +4387,10 @@ abstract class CommonObject
 					//print 'Found into table '.$table.', type '.$langs->transnoentitiesnoconv($elementname).', haschild='.$haschild;
 					$haschild += $obj->nb;
 					if (is_numeric($elementname)) {	// old usage
-						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
+						$this->errors[] = $langs->transnoentities("ErrorRecordHasAtLeastOneChildOfType", method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref, $table);
 					} else // new usage: $elementname=Translation key
 					{
-						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
+						$this->errors[] = $langs->transnoentities("ErrorRecordHasAtLeastOneChildOfType", method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref, $langs->transnoentitiesnoconv($elementname));
 					}
 					break; // We found at least one, we stop here
 				}
@@ -4363,8 +4453,8 @@ abstract class CommonObject
 			$total_discount = 0.00;
 
 			$sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";
-			$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element_line;
-			$sql .= " WHERE ".$this->fk_element." = ".$this->id;
+			$sql .= " FROM ".$this->db->prefix().$this->table_element_line;
+			$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);
 
 			dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -4435,14 +4525,14 @@ abstract class CommonObject
 				$qty = $line->qty ? $line->qty : 0;
 			}
 
-			$weight = $line->weight ? $line->weight : 0;
+			$weight = !empty($line->weight) ? $line->weight : 0;
 			($weight == 0 && !empty($line->product->weight)) ? $weight = $line->product->weight : 0;
-			$volume = $line->volume ? $line->volume : 0;
+			$volume = !empty($line->volume) ? $line->volume : 0;
 			($volume == 0 && !empty($line->product->volume)) ? $volume = $line->product->volume : 0;
 
-			$weight_units = $line->weight_units;
+			$weight_units = !empty($line->weight_units) ? $line->weight_units : 0;
 			($weight_units == 0 && !empty($line->product->weight_units)) ? $weight_units = $line->product->weight_units : 0;
-			$volume_units = $line->volume_units;
+			$volume_units = !empty($line->volume_units) ? $line->volume_units : 0;
 			($volume_units == 0 && !empty($line->product->volume_units)) ? $volume_units = $line->product->volume_units : 0;
 
 			$weightUnit = 0;
@@ -4503,9 +4593,9 @@ abstract class CommonObject
 
 		$extraparams = (!empty($this->extraparams) ? json_encode($this->extraparams) : null);
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element;
 		$sql .= " SET extraparams = ".(!empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::setExtraParameters", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -4802,7 +4892,7 @@ abstract class CommonObject
 	 */
 	public function printOriginLinesList($restrictlist = '', $selectedLines = array())
 	{
-		global $langs, $hookmanager, $conf, $form;
+		global $langs, $hookmanager, $conf, $form, $action;
 
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans('Ref').'</td>';
@@ -4823,13 +4913,14 @@ abstract class CommonObject
 
 		if (!empty($this->lines)) {
 			foreach ($this->lines as $line) {
-				if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line))) {
-					if (empty($line->fk_parent_line)) {
-						$parameters = array('line'=>$line, 'i'=>$i);
-						$action = '';
-						$hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-					}
-				} else {
+				$reshook = 0;
+				//if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line))) {
+				if (is_object($hookmanager)) {   // Old code is commented on preceding line.
+					$parameters = array('line'=>$line, 'i'=>$i, 'restrictlist'=>$restrictlist, 'selectedLines'=> $selectedLines);
+					if (!empty($line->fk_parent_line)) { $parameters['fk_parent_line'] = $line->fk_parent_line; }
+					$reshook = $hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				}
+				if (empty($reshook)) {
 					$this->printOriginLine($line, '', $restrictlist, '/core/tpl', $selectedLines);
 				}
 
@@ -4997,7 +5088,7 @@ abstract class CommonObject
 		// phpcs:enable
 		$this->db->begin();
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_resources (";
+		$sql = "INSERT INTO ".$this->db->prefix()."element_resources (";
 		$sql .= "resource_id";
 		$sql .= ", resource_type";
 		$sql .= ", element_id";
@@ -5040,7 +5131,7 @@ abstract class CommonObject
 
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
+		$sql = "DELETE FROM ".$this->db->prefix()."element_resources";
 		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);
@@ -5231,103 +5322,14 @@ abstract class CommonObject
 					// Index file in database
 					if (!empty($obj->result['fullpath'])) {
 						$destfull = $obj->result['fullpath'];
-						$upload_dir = dirname($destfull);
-						$destfile = basename($destfull);
-						$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
 
-						if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {     // If not a tmp dir
-							$filename = basename($destfile);
-							$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-							$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
-
-							include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-							$ecmfile = new EcmFiles($this->db);
-							$result = $ecmfile->fetch(0, '', ($rel_dir ? $rel_dir.'/' : '').$filename);
-
-							 // Set the public "share" key
-							$setsharekey = false;
-							if ($this->element == 'propal') {
-								$useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok
-								if ($useonlinesignature) {
-									$setsharekey = true;
-								}
-								if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
-									$setsharekey = true;
-								}
-							}
-							if ($this->element == 'commande' && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
-								$setsharekey = true;
-							}
-							if ($this->element == 'facture' && !empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
-								$setsharekey = true;
-							}
-							if ($this->element == 'bank_account' && !empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
-								$setsharekey = true;
-							}
-							if ($this->element == 'contrat' && !empty($conf->global->CONTRACT_ALLOW_EXTERNAL_DOWNLOAD)) {
-								$setsharekey = true;
-							}
-							if ($this->element == 'supplier_proposal' && !empty($conf->global->SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
-								$setsharekey = true;
-							}
-
-							if ($setsharekey) {
-								if (empty($ecmfile->share)) {	// Because object not found or share not set yet
-									require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-									$ecmfile->share = getRandomPassword(true);
-								}
-							}
-
-							if ($result > 0) {
-								$ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
-								$ecmfile->fullpath_orig = '';
-								$ecmfile->gen_or_uploaded = 'generated';
-								$ecmfile->description = ''; // indexed content
-								$ecmfile->keywords = ''; // keyword content
-								$result = $ecmfile->update($user);
-								if ($result < 0) {
-									setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-								}
-							} else {
-								$ecmfile->entity = $conf->entity;
-								$ecmfile->filepath = $rel_dir;
-								$ecmfile->filename = $filename;
-								$ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
-								$ecmfile->fullpath_orig = '';
-								$ecmfile->gen_or_uploaded = 'generated';
-								$ecmfile->description = ''; // indexed content
-								$ecmfile->keywords = ''; // keyword content
-								$ecmfile->src_object_type = $this->table_element;	// $this->table_name is 'myobject' or 'mymodule_myobject'.
-								$ecmfile->src_object_id   = $this->id;
-
-								$result = $ecmfile->create($user);
-								if ($result < 0) {
-									setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-								}
-							}
-
-							/*$this->result['fullname']=$destfull;
-							$this->result['filepath']=$ecmfile->filepath;
-							$this->result['filename']=$ecmfile->filename;*/
-							//var_dump($obj->update_main_doc_field);exit;
-
-							// Update the last_main_doc field into main object (if document generator has property ->update_main_doc_field set)
-							$update_main_doc_field = 0;
-							if (!empty($obj->update_main_doc_field)) {
-								$update_main_doc_field = 1;
-							}
-							if ($update_main_doc_field && !empty($this->table_element)) {
-								$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".$this->db->escape($ecmfile->filepath.'/'.$ecmfile->filename)."'";
-								$sql .= ' WHERE rowid = '.$this->id;
-
-								$resql = $this->db->query($sql);
-								if (!$resql) {
-									dol_print_error($this->db);
-								} else {
-									$this->last_main_doc = $ecmfile->filepath.'/'.$ecmfile->filename;
-								}
-							}
+						// Update the last_main_doc field into main object (if document generator has property ->update_main_doc_field set)
+						$update_main_doc_field = 0;
+						if (!empty($obj->update_main_doc_field)) {
+							$update_main_doc_field = 1;
 						}
+
+						$this->indexFile($destfull, $update_main_doc_field);
 					} else {
 						dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);
 					}
@@ -5356,6 +5358,115 @@ 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
+	 * @return	int								<0 if KO, >0 if OK
+	 */
+	public function indexFile($destfull, $update_main_doc_field)
+	{
+		global $conf, $user;
+
+		$upload_dir = dirname($destfull);
+		$destfile = basename($destfull);
+		$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
+
+		if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {     // If not a tmp dir
+			$filename = basename($destfile);
+			$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+			$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+
+			include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+			$ecmfile = new EcmFiles($this->db);
+			$result = $ecmfile->fetch(0, '', ($rel_dir ? $rel_dir.'/' : '').$filename);
+
+			// Set the public "share" key
+			$setsharekey = false;
+			if ($this->element == 'propal' || $this->element == 'proposal') {
+				if (!isset($conf->global->PROPOSAL_ALLOW_ONLINESIGN) || !empty($conf->global->PROPOSAL_ALLOW_ONLINESIGN)) {
+					$setsharekey = true;	// feature to make online signature is not set or set to on (default)
+				}
+				if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
+					$setsharekey = true;
+				}
+			}
+			if ($this->element == 'commande' && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
+				$setsharekey = true;
+			}
+			if ($this->element == 'facture' && !empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
+				$setsharekey = true;
+			}
+			if ($this->element == 'bank_account' && !empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
+				$setsharekey = true;
+			}
+			if ($this->element == 'contrat' && !empty($conf->global->CONTRACT_ALLOW_EXTERNAL_DOWNLOAD)) {
+				$setsharekey = true;
+			}
+			if ($this->element == 'supplier_proposal' && !empty($conf->global->SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
+				$setsharekey = true;
+			}
+
+			if ($setsharekey) {
+				if (empty($ecmfile->share)) {	// Because object not found or share not set yet
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+					$ecmfile->share = getRandomPassword(true);
+				}
+			}
+
+			if ($result > 0) {
+				$ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
+				$ecmfile->fullpath_orig = '';
+				$ecmfile->gen_or_uploaded = 'generated';
+				$ecmfile->description = ''; // indexed content
+				$ecmfile->keywords = ''; // keyword content
+				$result = $ecmfile->update($user);
+				if ($result < 0) {
+					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+					return -1;
+				}
+			} else {
+				$ecmfile->entity = $conf->entity;
+				$ecmfile->filepath = $rel_dir;
+				$ecmfile->filename = $filename;
+				$ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
+				$ecmfile->fullpath_orig = '';
+				$ecmfile->gen_or_uploaded = 'generated';
+				$ecmfile->description = ''; // indexed content
+				$ecmfile->keywords = ''; // keyword content
+				$ecmfile->src_object_type = $this->table_element;	// $this->table_name is 'myobject' or 'mymodule_myobject'.
+				$ecmfile->src_object_id   = $this->id;
+
+				$result = $ecmfile->create($user);
+				if ($result < 0) {
+					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+					return -1;
+				}
+			}
+
+			/*$this->result['fullname']=$destfull;
+			 $this->result['filepath']=$ecmfile->filepath;
+			 $this->result['filename']=$ecmfile->filename;*/
+			//var_dump($obj->update_main_doc_field);exit;
+
+			if ($update_main_doc_field && !empty($this->table_element)) {
+				$sql = "UPDATE ".$this->db->prefix().$this->table_element." SET last_main_doc = '".$this->db->escape($ecmfile->filepath."/".$ecmfile->filename)."'";
+				$sql .= " WHERE rowid = ".((int) $this->id);
+
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					dol_print_error($this->db);
+					return -1;
+				} else {
+					$this->last_main_doc = $ecmfile->filepath.'/'.$ecmfile->filename;
+				}
+			}
+		}
+
+		return 1;
+	}
+
 	/**
 	 *  Build thumb
 	 *  @todo Move this into files.lib.php
@@ -5504,7 +5615,7 @@ abstract class CommonObject
 
 		// Request to get translation values for object
 		$sql = "SELECT rowid, property, lang , value";
-		$sql .= " FROM ".MAIN_DB_PREFIX."object_lang";
+		$sql .= " FROM ".$this->db->prefix()."object_lang";
 		$sql .= " WHERE type_object = '".$this->db->escape($element)."'";
 		$sql .= " AND fk_object = ".((int) $this->id);
 
@@ -5709,7 +5820,7 @@ abstract class CommonObject
 					$sql .= ", ".$name;
 				}
 			}
-			$sql .= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";
+			$sql .= " FROM ".$this->db->prefix().$table_element."_extrafields";
 			$sql .= " WHERE fk_object = ".((int) $rowid);
 
 			//dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose
@@ -5783,7 +5894,7 @@ abstract class CommonObject
 
 		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
 
-		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".((int) $this->id);
+		$sql_del = "DELETE FROM ".$this->db->prefix().$table_element."_extrafields WHERE fk_object = ".((int) $this->id);
 
 		$resql = $this->db->query($sql_del);
 		if (!$resql) {
@@ -5983,10 +6094,10 @@ abstract class CommonObject
 
 			dol_syslog(get_class($this)."::insertExtraFields delete then insert", LOG_DEBUG);
 
-			$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".((int) $this->id);
+			$sql_del = "DELETE FROM ".$this->db->prefix().$table_element."_extrafields WHERE fk_object = ".((int) $this->id);
 			$this->db->query($sql_del);
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";
+			$sql = "INSERT INTO ".$this->db->prefix().$table_element."_extrafields (fk_object";
 			foreach ($new_array_options as $key => $value) {
 				$attributeKey = substr($key, 8); // Remove 'options_' prefix
 				// Add field of attribut
@@ -6029,6 +6140,7 @@ abstract class CommonObject
 			}
 
 			$sql .= ")";
+
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$this->error = $this->db->lasterror();
@@ -6133,13 +6245,13 @@ abstract class CommonObject
 
 			foreach ($new_array_languages as $key => $langcodearray) {	// $key = 'name', 'town', ...
 				foreach ($langcodearray as $langcode => $value) {
-					$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."object_lang";
-					$sql_del .= " WHERE fk_object = ".$this->id." AND property = '".$this->db->escape($key)."' AND type_object = '".$this->db->escape($table_element)."'";
+					$sql_del = "DELETE FROM ".$this->db->prefix()."object_lang";
+					$sql_del .= " WHERE fk_object = ".((int) $this->id)." AND property = '".$this->db->escape($key)."' AND type_object = '".$this->db->escape($table_element)."'";
 					$sql_del .= " AND lang = '".$this->db->escape($langcode)."'";
 					$this->db->query($sql_del);
 
 					if ($value !== '') {
-						$sql = "INSERT INTO ".MAIN_DB_PREFIX."object_lang (fk_object, property, type_object, lang, value";
+						$sql = "INSERT INTO ".$this->db->prefix()."object_lang (fk_object, property, type_object, lang, value";
 						$sql .= ") VALUES (".$this->id.", '".$this->db->escape($key)."', '".$this->db->escape($table_element)."', '".$this->db->escape($langcode)."', '".$this->db->escape($value)."'";
 						$sql .= ")";
 
@@ -6323,7 +6435,7 @@ abstract class CommonObject
 			$linealreadyfound = 0;
 
 			// Check if there is already a line for this object (in most cases, it is, but sometimes it is not, for example when extra field has been created after), so we must keep this overload)
-			$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id;
+			$sql = "SELECT COUNT(rowid) as nb FROM ".$this->db->prefix().$this->table_element."_extrafields WHERE fk_object = ".((int) $this->id);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$tmpobj = $this->db->fetch_object($resql);
@@ -6334,11 +6446,11 @@ abstract class CommonObject
 
 			if ($linealreadyfound) {
 				if ($this->array_options["options_".$key] === null) {
-					$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key." = null";
+					$sql = "UPDATE ".$this->db->prefix().$this->table_element."_extrafields SET ".$key." = null";
 				} else {
-					$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key." = '".$this->db->escape($this->array_options["options_".$key])."'";
+					$sql = "UPDATE ".$this->db->prefix().$this->table_element."_extrafields SET ".$key." = '".$this->db->escape($this->array_options["options_".$key])."'";
 				}
-				$sql .= " WHERE fk_object = ".$this->id;
+				$sql .= " WHERE fk_object = ".((int) $this->id);
 			} else {
 				$result = $this->insertExtraFields('', $user);
 				if ($result < 0) {
@@ -6429,9 +6541,19 @@ abstract class CommonObject
 			$val = $this->fields[$key];
 		}
 
+		// Validation tests and output
+		$fieldValidationErrorMsg = '';
+		$validationClass = '';
+		$fieldValidationErrorMsg = $this->getFieldError($key);
+		if (!empty($fieldValidationErrorMsg)) {
+			$validationClass = ' --error'; // the -- is use as class state in css :  .--error can't be be defined alone it must be define with another class like .my-class.--error or input.--error
+		} else {
+			$validationClass = ' --success'; // the -- is use as class state in css :  .--success can't be be defined alone it must be define with another class like .my-class.--success or input.--success
+		}
+
 		$out = '';
 		$type = '';
-		$isDependList=0;
+		$isDependList = 0;
 		$param = array();
 		$param['options'] = array();
 		$reg = array();
@@ -6520,6 +6642,11 @@ abstract class CommonObject
 			}
 		}
 
+		// Add validation state class
+		if (!empty($validationClass)) {
+			$morecss.= ' '.$validationClass;
+		}
+
 		if (in_array($type, array('date'))) {
 			$tmp = explode(',', $size);
 			$newsize = $tmp[0];
@@ -6649,8 +6776,8 @@ abstract class CommonObject
 				}
 
 				$sqlwhere = '';
-				$sql = 'SELECT '.$keyList;
-				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+				$sql = "SELECT ".$keyList;
+				$sql .= " FROM ".$this->db->prefix().$InfoFieldList[0];
 				if (!empty($InfoFieldList[4])) {
 					// can use SELECT request
 					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
@@ -6666,17 +6793,17 @@ abstract class CommonObject
 
 					//We have to join on extrafield table
 					if (strpos($InfoFieldList[4], 'extra') !== false) {
-						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
-						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
+						$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];
+						$sqlwhere .= " WHERE ".$InfoFieldList[4];
 					}
 				} else {
 					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
 				if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-					$sqlwhere .= ' AND entity = '.$conf->entity;
+					$sqlwhere .= " AND entity = ".((int) $conf->entity);
 				}
 				$sql .= $sqlwhere;
 				//print $sql;
@@ -6734,7 +6861,7 @@ abstract class CommonObject
 
 							if (!empty($InfoFieldList[3]) && $parentField) {
 								$parent = $parentName.':'.$obj->{$parentField};
-								$isDependList=1;
+								$isDependList = 1;
 							}
 
 							$out .= '<option value="'.$obj->rowid.'"';
@@ -6801,8 +6928,8 @@ abstract class CommonObject
 				}
 
 				$sqlwhere = '';
-				$sql = 'SELECT '.$keyList;
-				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+				$sql = "SELECT ".$keyList;
+				$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];
 				if (!empty($InfoFieldList[4])) {
 					// can use SELECT request
 					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
@@ -6818,17 +6945,17 @@ abstract class CommonObject
 
 					// We have to join on extrafield table
 					if (strpos($InfoFieldList[4], 'extra') !== false) {
-						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
-						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
+						$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];
+						$sqlwhere .= " WHERE ".$InfoFieldList[4];
 					}
 				} else {
 					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
 				if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-					$sqlwhere .= ' AND entity = '.$conf->entity;
+					$sqlwhere .= " AND entity = ".((int) $conf->entity);
 				}
 				// $sql.=preg_replace('/^ AND /','',$sqlwhere);
 				// print $sql;
@@ -6889,7 +7016,7 @@ abstract class CommonObject
 
 							if (!empty($InfoFieldList[3]) && $parentField) {
 								$parent = $parentName.':'.$obj->{$parentField};
-								$isDependList=1;
+								$isDependList = 1;
 							}
 
 							$data[$obj->rowid] = $labeltoshow;
@@ -6905,7 +7032,7 @@ abstract class CommonObject
 				}
 			}
 		} elseif ($type == 'link') {
-			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter]]'
+			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter[:Sortfield]]]'
 			$param_list_array = explode(':', $param_list[0]);
 			$showempty = (($required && $default != '') ? 0 : 1);
 
@@ -6986,6 +7113,12 @@ abstract class CommonObject
 		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
 		 elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)';
 		 */
+
+		// Display error message for field
+		if (!empty($fieldValidationErrorMsg) && function_exists('getFieldErrorIcon')) {
+			$out .= ' '.getFieldErrorIcon($fieldValidationErrorMsg);
+		}
+
 		return $out;
 	}
 
@@ -7156,8 +7289,8 @@ abstract class CommonObject
 				$keyList .= implode(', ', $fields_label);
 			}
 
-			$sql = 'SELECT '.$keyList;
-			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+			$sql = "SELECT ".$keyList;
+			$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];
 			if (strpos($InfoFieldList[4], 'extra') !== false) {
 				$sql .= ' as main';
 			}
@@ -7239,8 +7372,8 @@ abstract class CommonObject
 				$keyList .= implode(', ', $fields_label);
 			}
 
-			$sql = 'SELECT '.$keyList;
-			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+			$sql = "SELECT ".$keyList;
+			$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];
 			if (strpos($InfoFieldList[4], 'extra') !== false) {
 				$sql .= ' as main';
 			}
@@ -7329,6 +7462,228 @@ abstract class CommonObject
 		return $out;
 	}
 
+	/**
+	 * clear validation message result for a field
+	 *
+	 * @param string $fieldKey Key of attribute to clear
+	 * @return null
+	 */
+	public function clearFieldError($fieldKey)
+	{
+		$this->error = '';
+		unset($this->validateFieldsErrors[$fieldKey]);
+	}
+
+	/**
+	 * set validation error message a field
+	 *
+	 * @param string $fieldKey Key of attribute
+	 * @param string $msg the field error message
+	 * @return null
+	 */
+	public function setFieldError($fieldKey, $msg = '')
+	{
+		global $langs;
+		if (empty($msg)) { $msg = $langs->trans("UnknowError"); }
+
+		$this->error = $this->validateFieldsErrors[$fieldKey] = $msg;
+	}
+
+	/**
+	 * get field error message
+	 *
+	 * @param  string  $fieldKey            Key of attribute
+	 * @return string
+	 */
+	public function getFieldError($fieldKey)
+	{
+		if (!empty($this->validateFieldsErrors[$fieldKey])) {
+			return $this->validateFieldsErrors[$fieldKey];
+		}
+		return '';
+	}
+
+	/**
+	 * Return validation test result for a field
+	 *
+	 * @param  array   $val		       		Array of properties of field to show
+	 * @param  string  $fieldKey            Key of attribute
+	 * @param  string  $fieldValue          value of attribute
+	 * @return bool return false if fail true on success, see $this->error for error message
+	 */
+	public function validateField($val, $fieldKey, $fieldValue)
+	{
+		global $langs;
+
+		if (!class_exists('Validate')) { require_once DOL_DOCUMENT_ROOT . '/core/class/validate.class.php'; }
+
+		$this->clearFieldError($fieldKey);
+
+		if (!isset($val[$fieldKey])) {
+			$this->setFieldError($fieldKey, $langs->trans('FieldNotFoundInObject'));
+			return false;
+		}
+
+		$param = array();
+		$param['options'] = array();
+		$type  = $val[$fieldKey]['type'];
+
+		$required = false;
+		if (isset($val[$fieldKey]['notnull']) && $val[$fieldKey]['notnull'] === 1) {
+			// 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+			$required = true;
+		}
+
+		$maxSize = 0;
+		$minSize = 0;
+
+		//
+		// PREPARE Elements
+		//
+
+		// Convert var to be able to share same code than showOutputField of extrafields
+		if (preg_match('/varchar\((\d+)\)/', $type, $reg)) {
+			$type = 'varchar'; // convert varchar(xx) int varchar
+			$maxSize = $reg[1];
+		} elseif (preg_match('/varchar/', $type)) {
+			$type = 'varchar'; // convert varchar(xx) int varchar
+		}
+
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+			$type = 'select';
+		}
+
+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
+			$type = 'link';
+		}
+
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+			$param['options'] = $val['arrayofkeyval'];
+		}
+
+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
+			$type = 'link';
+			$param['options'] = array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);
+		} elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+			$param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
+			$type = 'sellist';
+		} elseif (preg_match('/^sellist:(.*):(.*):(.*)/i', $val['type'], $reg)) {
+			$param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3] => 'N');
+			$type = 'sellist';
+		} elseif (preg_match('/^sellist:(.*):(.*)/i', $val['type'], $reg)) {
+			$param['options'] = array($reg[1].':'.$reg[2] => 'N');
+			$type = 'sellist';
+		}
+
+		//
+		// TEST Value
+		//
+
+		// Use Validate class to allow external Modules to use data validation part instead of concentrate all test here (factoring) or just for reuse
+		$validate = new Validate($this->db, $langs);
+
+
+		// little trick : to perform tests with good performances sort tests by quick to low
+
+		//
+		// COMMON TESTS
+		//
+
+		// Required test and empty value
+		if ($required && !$validate->isNotEmptyString($fieldValue)) {
+			$this->setFieldError($fieldKey, $validate->error);
+			return false;
+		} elseif (!$required && !$validate->isNotEmptyString($fieldValue)) {
+			// if no value sent and the field is not mandatory, no need to perform tests
+			return true;
+		}
+
+		// MAX Size test
+		if (!empty($maxSize) && !$validate->isMaxLength($fieldValue, $maxSize)) {
+			$this->setFieldError($fieldKey, $validate->error);
+			return false;
+		}
+
+		// MIN Size test
+		if (!empty($minSize) && !$validate->isMinLength($fieldValue, $minSize)) {
+			$this->setFieldError($fieldKey, $validate->error);
+			return false;
+		}
+
+		//
+		// TESTS for TYPE
+		//
+
+		if (in_array($type, array('date', 'datetime', 'timestamp'))) {
+			if (!$validate->isTimestamp($fieldValue)) {
+				$this->setFieldError($fieldKey, $validate->error);
+				return false;
+			} else { return true; }
+		} elseif ($type == 'duration') {
+			if (!$validate->isDuration($fieldValue)) {
+				$this->setFieldError($fieldKey, $validate->error);
+				return false;
+			} else { return true; }
+		} elseif (in_array($type, array('double', 'real', 'price'))) {
+			// is numeric
+			if (!$validate->isNumeric($fieldValue)) {
+				$this->setFieldError($fieldKey, $validate->error);
+				return false;
+			} else { return true; }
+		} elseif ($type == 'boolean') {
+			if (!$validate->isBool($fieldValue)) {
+				$this->setFieldError($fieldKey, $validate->error);
+				return false;
+			} else { return true; }
+		} elseif ($type == 'mail') {
+			if (!$validate->isEmail($fieldValue)) {
+				$this->setFieldError($fieldKey, $validate->error);
+				return false;
+			}
+		} elseif ($type == 'url') {
+			if (!$validate->isUrl($fieldValue)) {
+				$this->setFieldError($fieldKey, $validate->error);
+				return false;
+			} else { return true; }
+		} elseif ($type == 'phone') {
+			if (!$validate->isPhone($fieldValue)) {
+				$this->setFieldError($fieldKey, $validate->error);
+				return false;
+			} else { return true; }
+		} elseif ($type == 'select' || $type == 'radio') {
+			if (!isset($param['options'][$fieldValue])) {
+				$this->error = $langs->trans('RequireValidValue');
+				return false;
+			} else { return true; }
+		} elseif ($type == 'sellist' || $type == 'chkbxlst') {
+			$param_list = array_keys($param['options']);
+			$InfoFieldList = explode(":", $param_list[0]);
+			$value_arr = explode(',', $fieldValue);
+			$value_arr = array_map(array($this->db, 'escape'), $value_arr);
+
+			$selectkey = "rowid";
+			if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
+				$selectkey = $InfoFieldList[2];
+			}
+
+			if (!$validate->isInDb($value_arr, $InfoFieldList[0], $selectkey)) {
+				$this->setFieldError($fieldKey, $validate->error);
+				return false;
+			} else { return true; }
+		} elseif ($type == 'link') {
+			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
+			$InfoFieldList = explode(":", $param_list[0]);
+			$classname = $InfoFieldList[0];
+			$classpath = $InfoFieldList[1];
+			if (!$validate->isFetchable($fieldValue, $classname, $classpath)) {
+				$this->setFieldError($fieldKey, $validate->error);
+				return false;
+			} else { return true; }
+		}
+
+		// if no test failled all is ok
+		return true;
+	}
 
 	/**
 	 * Function to show lines of extrafields with output datas.
@@ -7403,7 +7758,7 @@ abstract class CommonObject
 						$langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
 					}
 
-					$colspan = '';
+					$colspan = 0;
 					if (is_array($params) && count($params) > 0 && $display_type=='card') {
 						if (array_key_exists('cols', $params)) {
 							$colspan = $params['cols'];
@@ -7416,6 +7771,7 @@ abstract class CommonObject
 							}
 						}
 					}
+					$colspan = intval($colspan);
 
 					switch ($mode) {
 						case "view":
@@ -7461,7 +7817,8 @@ abstract class CommonObject
 							}
 						}
 
-						$out .= $extrafields->showSeparator($key, $this, ($colspan + 1), $display_type);
+						// 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);
 					} else {
 						$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
 						$csstyle = '';
@@ -7482,7 +7839,7 @@ abstract class CommonObject
 						$html_id = (empty($this->id) ? '' : 'extrarow-'.$this->element.'_'.$key.'_'.$this->id);
 						if ($display_type=='card') {
 							if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) {
-								$colspan = '0';
+								$colspan = 0;
 							}
 
 							if ($action == 'selectlines') {
@@ -7542,7 +7899,7 @@ abstract class CommonObject
 								$out .= $labeltoshow;
 							}
 							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) {
-								$out .= '&nbsp;<font color="red">*</font>';
+								$out .= '&nbsp;<span style="color: red">*</span>';
 							}
 						} else {
 							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) {
@@ -7560,6 +7917,7 @@ 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.'"' : '').'>';
 						} elseif ($display_type == 'line') {
 							$out .= '<div '.($html_id ? 'id="'.$html_id.'" ' : '').' style="display: inline-block" class="'.$this->element.'_extras_'.$key.'">';
@@ -7567,7 +7925,7 @@ abstract class CommonObject
 
 						switch ($mode) {
 							case "view":
-								$out .= $extrafields->showOutputField($key, $value);
+								$out .= $extrafields->showOutputField($key, $value, '', $this->table_element);
 								break;
 							case "create":
 								$out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', 0, $this->id, $this->table_element);
@@ -7579,11 +7937,6 @@ abstract class CommonObject
 
 						$out .= ($display_type=='card' ? '</td>' : '</div>');
 
-						/*for($ii = 0; $ii < ($colspan - 1); $ii++)
-						{
-							$out .='<td class="'.$this->element.'_extras_'.$key.'"></td>';
-						}*/
-
 						if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) {
 							$out .= ($display_type=='card' ? '</tr>' : '</div>');
 						} else {
@@ -7693,6 +8046,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};
@@ -7713,7 +8068,7 @@ abstract class CommonObject
 	public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors = 0)
 	{
 		foreach ($tables as $table) {
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET fk_soc = '.((int) $dest_id).' WHERE fk_soc = '.((int) $origin_id);
+			$sql = 'UPDATE '.$db->prefix().$table.' SET fk_soc = '.((int) $dest_id).' WHERE fk_soc = '.((int) $origin_id);
 
 			if (!$db->query($sql)) {
 				if ($ignoreerrors) {
@@ -7800,7 +8155,7 @@ abstract class CommonObject
 	 *  @param      string	$sdir        	Directory to scan (full absolute path)
 	 *  @param      int		$size        	0=original size, 1='small' use thumbnail if possible
 	 *  @param      int		$nbmax       	Nombre maximum de photos (0=pas de max)
-	 *  @param      int		$nbbyrow     	Number of image per line or -1 to use div. Used only if size=1.
+	 *  @param      int		$nbbyrow     	Number of image per line or -1 to use div separator or 0 to use no separator. Used only if size=1 or 'small'.
 	 * 	@param		int		$showfilename	1=Show filename
 	 * 	@param		int		$showaction		1=Show icon with action links (resize, delete)
 	 * 	@param		int		$maxHeight		Max height of original image when size='small' (so we can use original even if small requested). If 0, always use 'small' thumb image.
@@ -7907,7 +8262,7 @@ abstract class CommonObject
 							if ($urladvanced) {
 								$return .= '<a href="'.$urladvanced.'">';
 							} else {
-								$return .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+								$return .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank" rel="noopener noreferrer">';
 							}
 						}
 
@@ -7919,26 +8274,28 @@ abstract class CommonObject
 							$alt = '';
 						}
 
+						$addphotorefcss = 1;
+
 						if ($usesharelink) {
 							if ($val['share']) {
 								if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight) {
 									$return .= '<!-- Show original file (thumb not yet available with shared links) -->';
-									$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
+									$return .= '<img class="photo photowithmargin'.($addphotorefcss ? ' photoref' : '').'" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
 								} else {
 									$return .= '<!-- Show original file -->';
-									$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
+									$return .= '<img class="photo photowithmargin'.($addphotorefcss ? ' photoref' : '').'" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
 								}
 							} else {
 								$return .= '<!-- Show nophoto file (because file is not shared) -->';
-								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
+								$return .= '<img class="photo photowithmargin'.($addphotorefcss ? ' photoref' : '').'" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
 							}
 						} else {
 							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight) {
 								$return .= '<!-- Show thumb -->';
-								$return .= '<img class="photo photowithmargin maxwidth150onsmartphone" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
+								$return .= '<img class="photo photowithmargin'.($addphotorefcss ? ' photoref' : '').' maxwidth150onsmartphone maxwidth200" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
 							} else {
 								$return .= '<!-- Show original file -->';
-								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
+								$return .= '<img class="photo photowithmargin'.($addphotorefcss ? ' photoref' : '').'" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
 							}
 						}
 
@@ -7954,15 +8311,15 @@ abstract class CommonObject
 							$return .= '<br>';
 							// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
 							if ($photo_vignette && (image_format_supported($photo) > 0) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight)) {
-								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=addthumb&token='.newToken().'&file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
 							}
 							// Special cas for product
 							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer)) {
 								// Link to resize
-								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
+								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
 
 								// Link to delete
-								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;token='.newToken().'&amp;file='.urlencode($pdir.$viewfilename).'">';
+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=delete&token='.newToken().'&file='.urlencode($pdir.$viewfilename).'">';
 								$return .= img_delete().'</a>';
 							}
 						}
@@ -7988,10 +8345,10 @@ abstract class CommonObject
 							// Special case for product
 							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer)) {
 								// Link to resize
-								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
+								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
 
 								// Link to delete
-								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;token='.newToken().'&amp;file='.urlencode($pdir.$viewfilename).'">';
+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=delete&token='.newToken().'&file='.urlencode($pdir.$viewfilename).'">';
 								$return .= img_delete().'</a>';
 							}
 						}
@@ -8235,6 +8592,8 @@ abstract class CommonObject
 					}
 				}
 			} else {
+				// Note: If $this->{$field} is not defined, it means there is a bug into definition of ->fields or a missing declaration of property
+				// We should keep the warning generated by this because it is a bug somewhere else in code, not here.
 				$queryarray[$field] = $this->{$field};
 			}
 
@@ -8341,7 +8700,7 @@ abstract class CommonObject
 		if (is_null($value)) {
 			return 'NULL';
 		} elseif (preg_match('/^(int|double|real|price)/i', $fieldsentry['type'])) {
-			return $this->db->escape("$value");
+			return price2num("$value");
 		} elseif ($fieldsentry['type'] == 'boolean') {
 			if ($value) {
 				return 'true';
@@ -8416,7 +8775,7 @@ abstract class CommonObject
 			// If field is an implicit foreign key field
 			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) {
 				if (isset($this->fields[$key]['default'])) {
-					$values[$key] = $this->fields[$key]['default'];
+					$values[$key] = ((int) $this->fields[$key]['default']);
 				} else {
 					$values[$key] = 'null';
 				}
@@ -8433,25 +8792,29 @@ abstract class CommonObject
 		$this->db->begin();
 
 		if (!$error) {
-			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' ('.implode(", ", $keys).')';
-			$sql .= ' VALUES ('.implode(", ", $values).')';
+			$sql = "INSERT INTO ".$this->db->prefix().$this->table_element;
+			$sql .= " (".implode(", ", $keys).')';
+			$sql .= " VALUES (".implode(", ", $values).")";		// $values can contains 'abc' or 123
 
 			$res = $this->db->query($sql);
-			if ($res === false) {
+			if (!$res) {
 				$error++;
-				$this->errors[] = $this->db->lasterror();
+				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+					$this->errors[] = "ErrorRefAlreadyExists";
+				} else {
+					$this->errors[] = $this->db->lasterror();
+				}
 			}
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);
 		}
 
 		// If we have a field ref with a default value of (PROV)
 		if (!$error) {
 			if (key_exists('ref', $this->fields) && $this->fields['ref']['notnull'] > 0 && key_exists('default', $this->fields['ref']) && $this->fields['ref']['default'] == '(PROV)') {
-				$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ref = '(PROV".$this->id.")' WHERE (ref = '(PROV)' OR ref = '') AND rowid = ".((int) $this->id);
+				$sql = "UPDATE ".$this->db->prefix().$this->table_element." SET ref = '(PROV".((int) $this->id).")' WHERE (ref = '(PROV)' OR ref = '') AND rowid = ".((int) $this->id);
 				$resqlupdate = $this->db->query($sql);
 
 				if ($resqlupdate === false) {
@@ -8535,13 +8898,13 @@ abstract class CommonObject
 			return 0;
 		}
 
-		$sql = 'SELECT '.$fieldlist;
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql = "SELECT ".$fieldlist;
+		$sql .= " FROM ".$this->db->prefix().$this->table_element.' as t';
 
 		if (!empty($id)) {
 			$sql .= ' WHERE t.rowid = '.((int) $id);
 		} elseif (!empty($ref)) {
-			$sql .= " WHERE t.ref = ".$this->quote($ref, $this->fields['ref']);
+			$sql .= " WHERE t.ref = '".$this->db->escape($ref)."'";
 		} else {
 			$sql .= ' WHERE 1 = 1'; // usage with empty id and empty ref is very rare
 		}
@@ -8590,9 +8953,9 @@ abstract class CommonObject
 
 		$objectline = new $objectlineclassname($this->db);
 
-		$sql = 'SELECT '.$objectline->getFieldList('l');
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$objectline->table_element.' as l';
-		$sql .= ' WHERE l.fk_'.$this->element.' = '.$this->id;
+		$sql = "SELECT ".$objectline->getFieldList('l');
+		$sql .= " FROM ".$this->db->prefix().$objectline->table_element." as l";
+		$sql .= " WHERE l.fk_".$this->db->escape($this->element)." = ".((int) $this->id);
 		if ($morewhere) {
 			$sql .= $morewhere;
 		}
@@ -8681,12 +9044,12 @@ abstract class CommonObject
 			}*/
 		}
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode(', ', $tmp).' WHERE rowid='.((int) $this->id);
+		$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 === false) {
+			if (!$res) {
 				$error++;
 				$this->errors[] = $this->db->lasterror();
 			}
@@ -8726,7 +9089,7 @@ abstract class CommonObject
 	 * @param 	User 	$user       			User that deletes
 	 * @param 	bool 	$notrigger  			false=launch triggers after, true=disable triggers
 	 * @param	int		$forcechilddeletion		0=no, 1=Force deletion of children
-	 * @return 	int             				<=0 if KO, >0 if OK
+	 * @return 	int             				<=0 if KO, 0=Nothing done because object has child, >0 if OK
 	 */
 	public function deleteCommon(User $user, $notrigger = false, $forcechilddeletion = 0)
 	{
@@ -8738,7 +9101,7 @@ abstract class CommonObject
 
 		if ($forcechilddeletion) {	// Force also delete of childtables that should lock deletion in standard case when option force is off
 			foreach ($this->childtables as $table) {
-				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
+				$sql = "DELETE FROM ".$this->db->prefix().$table." WHERE ".$this->fk_element." = ".((int) $this->id);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$this->error = $this->db->lasterror();
@@ -8766,10 +9129,15 @@ abstract class CommonObject
 					$className = str_replace('@', '', $deleteFromObject[0]);
 					$filePath = $deleteFromObject[1];
 					$columnName = $deleteFromObject[2];
+					$TMoreSQL = array();
+					$more_sql = $deleteFromObject[3];
+					if (!empty($more_sql)) {
+						$TMoreSQL['customsql'] = $more_sql;
+					}
 					if (dol_include_once($filePath)) {
 						$childObject = new $className($this->db);
 						if (method_exists($childObject, 'deleteByParentField')) {
-							$result = $childObject->deleteByParentField($this->id, $columnName);
+							$result = $childObject->deleteByParentField($this->id, $columnName, $TMoreSQL);
 							if ($result < 0) {
 								$error++;
 								$this->errors[] = $childObject->error;
@@ -8787,7 +9155,7 @@ abstract class CommonObject
 					}
 				} else {
 					// Delete record in child table
-					$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
+					$sql = "DELETE FROM ".$this->db->prefix().$table." WHERE ".$this->fk_element." = ".((int) $this->id);
 
 					$resql = $this->db->query($sql);
 					if (!$resql) {
@@ -8827,7 +9195,7 @@ abstract class CommonObject
 		}
 
 		if (!$error) {
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.((int) $this->id);
+			$sql = 'DELETE FROM '.$this->db->prefix().$this->table_element.' WHERE rowid='.((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
@@ -8851,10 +9219,12 @@ abstract class CommonObject
 	 *
 	 * @param		int		$parentId      Parent Id
 	 * @param		string	$parentField   Name of Foreign key parent column
+	 * @param 		array 	$filter		an array filter
+	 * @param		string	$filtermode	AND or OR
 	 * @return		int						<0 if KO, >0 if OK
 	 * @throws Exception
 	 */
-	public function deleteByParentField($parentId = 0, $parentField = '')
+	public function deleteByParentField($parentId = 0, $parentField = '', $filter = array(), $filtermode = "AND")
 	{
 		global $user;
 
@@ -8864,8 +9234,25 @@ abstract class CommonObject
 		if (!empty($parentId) && !empty($parentField)) {
 			$this->db->begin();
 
-			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' WHERE '.$parentField.' = '.(int) $parentId;
+			$sql = "SELECT rowid FROM ".$this->db->prefix().$this->table_element;
+			$sql .= " WHERE ".$parentField." = ".(int) $parentId;
+
+			// Manage filters
+			$sqlwhere = array();
+			if (count($filter) > 0) {
+				foreach ($filter as $key => $value) {
+					if ($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).")";
+			}
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
@@ -8932,7 +9319,7 @@ abstract class CommonObject
 
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element_line;
+		$sql = "DELETE FROM ".$this->db->prefix().$this->table_element_line;
 		$sql .= " WHERE rowid = ".((int) $idline);
 
 		dol_syslog(get_class($this)."::deleteLineCommon", LOG_DEBUG);
@@ -8986,9 +9373,9 @@ abstract class CommonObject
 			$statusfield = 'fk_statut';
 		}
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element;
 		$sql .= " SET ".$statusfield." = ".((int) $status);
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		if ($this->db->query($sql)) {
 			if (!$error) {
@@ -9171,7 +9558,7 @@ abstract class CommonObject
 		}
 
 		$error = 0;
-		$ok=0;
+		$ok = 0;
 
 		// Process
 		foreach ($to_del as $del) {
@@ -9183,7 +9570,7 @@ abstract class CommonObject
 					$this->errors = $c->errors;
 					break;
 				} else {
-					$ok+=$result;
+					$ok += $result;
 				}
 			}
 		}
@@ -9196,7 +9583,7 @@ abstract class CommonObject
 					$this->errors = $c->errors;
 					break;
 				} else {
-					$ok+=$result;
+					$ok += $result;
 				}
 			}
 		}
@@ -9223,8 +9610,8 @@ abstract class CommonObject
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categorystatic = new Categorie($this->db);
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".(empty($categorystatic->MAP_CAT_TABLE[$type]) ? $type : $categorystatic->MAP_CAT_TABLE[$type])." (fk_categorie, fk_product)";
-		$sql .= " SELECT fk_categorie, $toId FROM ".MAIN_DB_PREFIX."categorie_".(empty($categorystatic->MAP_CAT_TABLE[$type]) ? $type : $categorystatic->MAP_CAT_TABLE[$type]);
+		$sql = "INSERT INTO ".$this->db->prefix()."categorie_".(empty($categorystatic->MAP_CAT_TABLE[$type]) ? $type : $categorystatic->MAP_CAT_TABLE[$type])." (fk_categorie, fk_product)";
+		$sql .= " SELECT fk_categorie, $toId FROM ".$this->db->prefix()."categorie_".(empty($categorystatic->MAP_CAT_TABLE[$type]) ? $type : $categorystatic->MAP_CAT_TABLE[$type]);
 		$sql .= " WHERE fk_product = ".((int) $fromId);
 
 		if (!$this->db->query($sql)) {
@@ -9272,8 +9659,8 @@ abstract class CommonObject
 			}
 
 			// Delete ecm_files extrafields
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."ecm_files_extrafields WHERE fk_object IN (";
-			$sql .= " SELECT rowid FROM ".MAIN_DB_PREFIX."ecm_files WHERE filename LIKE '".$this->db->escape($this->ref)."%'";
+			$sql = "DELETE FROM ".$this->db->prefix()."ecm_files_extrafields WHERE fk_object IN (";
+			$sql .= " SELECT rowid FROM ".$this->db->prefix()."ecm_files WHERE filename LIKE '".$this->db->escape($this->ref)."%'";
 			$sql .= " AND filepath = '".$this->db->escape($element)."/".$this->db->escape($this->ref)."' AND entity = ".((int) $conf->entity); // No need of getEntity here
 			$sql .= ")";
 
@@ -9284,7 +9671,7 @@ abstract class CommonObject
 			}
 
 			// Delete ecm_files
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."ecm_files";
+			$sql = "DELETE FROM ".$this->db->prefix()."ecm_files";
 			$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%'";
 			$sql .= " AND filepath = '".$this->db->escape($element)."/".$this->db->escape($this->ref)."' AND entity = ".((int) $conf->entity); // No need of getEntity here
 
@@ -9297,8 +9684,8 @@ abstract class CommonObject
 
 		// Delete in database with mode 1
 		if ($mode == 1) {
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."ecm_files_extrafields";
-			$sql .= " WHERE fk_object IN (SELECT rowid FROM ".MAIN_DB_PREFIX."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? '' : '@'.$this->module))."' AND src_object_id = ".((int) $this->id).")";
+			$sql = 'DELETE FROM '.$this->db->prefix()."ecm_files_extrafields";
+			$sql .= " WHERE fk_object IN (SELECT rowid FROM ".$this->db->prefix()."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? "" : "@".$this->module))."' AND src_object_id = ".((int) $this->id).")";
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$this->error = $this->db->lasterror();
@@ -9306,8 +9693,8 @@ abstract class CommonObject
 				return false;
 			}
 
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."ecm_files";
-			$sql .= " WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? '' : '@'.$this->module))."' AND src_object_id = ".((int) $this->id);
+			$sql = 'DELETE FROM '.$this->db->prefix()."ecm_files";
+			$sql .= " WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? "" : "@".$this->module))."' AND src_object_id = ".((int) $this->id);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$this->error = $this->db->lasterror();
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index 7e134aa19bf..487482a9b3c 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -26,6 +26,8 @@
 /**
  *  Parent class for class inheritance lines of business objects
  *  This class is useless for the moment so no inherit are done on it
+ *
+ *  TODO For the moment we use the extends on CommonObject until PHP min is 5.4 so we can use Traits.
  */
 abstract class CommonObjectLine extends CommonObject
 {
@@ -49,6 +51,11 @@ abstract class CommonObjectLine extends CommonObject
 	 */
 	public $fk_unit;
 
+	public $date_debut_prevue;
+	public $date_debut_reel;
+	public $date_fin_prevue;
+	public $date_fin_reel;
+
 
 	/**
 	 *	Constructor
@@ -61,7 +68,7 @@ abstract class CommonObjectLine extends CommonObject
 	}
 
 	/**
-	 *	Returns the label, shot_label or code found in units dictionary from ->fk_unit.
+	 *	Returns the label, short_label or code found in units dictionary from ->fk_unit.
 	 *  A langs->trans() must be called on result to get translated value.
 	 *
 	 * 	@param	string $type 	Label type ('long', 'short' or 'code'). This can be a translation key.
@@ -86,7 +93,8 @@ abstract class CommonObjectLine extends CommonObject
 			$label_type = 'code';
 		}
 
-		$sql = 'select '.$label_type.', code from '.MAIN_DB_PREFIX.'c_units where rowid = '.((int) $this->fk_unit);
+		$sql = "SELECT ".$label_type.", code from ".$this->db->prefix()."c_units where rowid = ".((int) $this->fk_unit);
+
 		$resql = $this->db->query($sql);
 		if ($resql && $this->db->num_rows($resql) > 0) {
 			$res = $this->db->fetch_array($resql);
@@ -98,12 +106,25 @@ abstract class CommonObjectLine extends CommonObject
 			$this->db->free($resql);
 			return $label;
 		} else {
-			$this->error = $this->db->error().' sql='.$sql;
+			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
-	// Currently we need function at end of file CommonObject for all object lines. Should find a way to avoid duplicate code.
 
-	// For the moment we use the extends on CommonObject until PHP min is 5.4 so use Traits.
+	/**
+	 * Empty function to prevent errors on call of this function must be overload if usefull
+	 *
+	 * @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')
+	{
+		return 0;
+	}
 }
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 60ee78bbff5..c7d01cab586 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -110,10 +110,13 @@ class Conf
 		// Common objects that are not modules
 		$this->mycompany = new stdClass();
 		$this->admin = new stdClass();
-		$this->browser = new stdClass();
 		$this->medias = new stdClass();
 		$this->global = new stdClass();
 
+		// Common objects that are not modules and set by the main and not into the this->setValues()
+		$this->browser = new stdClass();
+
+		// Common arrays
 		$this->cache = array();
 		$this->modules = array();
 		$this->modules_parts = array(
@@ -152,7 +155,6 @@ class Conf
 		$this->facture			= new stdClass();
 		$this->contrat			= new stdClass();
 		$this->user	= new stdClass();
-		$this->usergroup		= new stdClass();
 		$this->adherent			= new stdClass();
 		$this->bank = new stdClass();
 		$this->notification		= new stdClass();
@@ -161,6 +163,24 @@ class Conf
 		$this->productbatch		= new stdClass();
 	}
 
+	/**
+	 * 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.
+	 *
+	 * @param	DoliDB	$db			Database handler
+	 * @param	int		$entity		Entity to get
+	 * @return	int					< 0 if KO, >= 0 if OK
+	 */
+	public function setEntityValues($db, $entity)
+	{
+		if ($this->entity != $entity) {
+			// If we ask to reload setup for a new entity
+			$this->entity = $entity;
+			return $this->setValues($db);
+		}
+
+		return 0;
+	}
 
 	/**
 	 *  Load setup values into conf object (read llx_const)
@@ -173,11 +193,72 @@ class Conf
 	{
 		dol_syslog(get_class($this)."::setValues");
 
+		// Unset all old modules values
+		if (!empty($this->modules)) {
+			foreach ($this->modules as $m) {
+				if (isset($this->$m)) unset($this->$m);
+			}
+		}
+
+		// Common objects that are not modules
+		$this->mycompany = new stdClass();
+		$this->admin = new stdClass();
+		$this->medias = new stdClass();
+		$this->global = new stdClass();
+
+		// Common objects that are not modules and set by the main and not into the this->setValues()
+		//$this->browser = new stdClass();	// This is set by main and not into this setValues(), so we keep it intact.
+
+		// First level object
+		// TODO Remove this part.
+		$this->syslog = new stdClass();
+		$this->expedition_bon = new stdClass();
+		$this->delivery_note = new stdClass();
+		$this->fournisseur = new stdClass();
+		$this->product			= new stdClass();
+		$this->service			= new stdClass();
+		$this->contrat			= new stdClass();
+		$this->actions			= new stdClass();
+		$this->agenda			= new stdClass();
+		$this->commande = new stdClass();
+		$this->propal = new stdClass();
+		$this->facture			= new stdClass();
+		$this->contrat			= new stdClass();
+		$this->user	= new stdClass();
+		$this->adherent			= new stdClass();
+		$this->bank = new stdClass();
+		$this->notification		= new stdClass();
+		$this->mailing = new stdClass();
+		$this->expensereport	= new stdClass();
+		$this->productbatch		= new stdClass();
+
+		// Common arrays
+		$this->cache = array();
+		$this->modules = array();;
+		$this->modules_parts = array(
+			'css' => array(),
+			'js' => array(),
+			'tabs' => array(),
+			'triggers' => array(),
+			'login' => array(),
+			'substitutions' => array(),
+			'menus' => array(),
+			'theme' => array(),
+			'sms' => array(),
+			'tpl' => array(),
+			'barcode' => array(),
+			'models' => array(),
+			'societe' => array(),
+			'hooks' => array(),
+			'dir' => array(),
+			'syslog' => array(),
+		);
+
 		if (!is_null($db) && is_object($db)) {
 			// Define all global constants into $this->global->key=value
 			$sql = "SELECT ".$db->decrypt('name')." as name,";
 			$sql .= " ".$db->decrypt('value')." as value, entity";
-			$sql .= " FROM ".MAIN_DB_PREFIX."const";
+			$sql .= " FROM ".$db->prefix()."const";
 			$sql .= " WHERE entity IN (0,".$this->entity.")";
 			$sql .= " ORDER BY entity"; // This is to have entity 0 first, then entity 1 that overwrite.
 
@@ -215,26 +296,33 @@ class Conf
 								// modules_parts['login'], modules_parts['menus'], modules_parts['substitutions'], modules_parts['triggers'], modules_parts['tpl'],
 								// modules_parts['models'], modules_parts['theme']
 								// modules_parts['sms'],
-								// modules_parts['css'], ...
+								// modules_parts['css'], modules_parts['js'],...
 
 								$modulename = strtolower($reg[1]);
 								$partname = strtolower($reg[2]);
 								if (!isset($this->modules_parts[$partname]) || !is_array($this->modules_parts[$partname])) {
 									$this->modules_parts[$partname] = array();
 								}
+
 								$arrValue = json_decode($value, true);
-								if (is_array($arrValue) && !empty($arrValue)) {
-									$value = $arrValue;
+
+								if (is_array($arrValue)) {
+									$newvalue = $arrValue;
 								} elseif (in_array($partname, array('login', 'menus', 'substitutions', 'triggers', 'tpl'))) {
-									$value = '/'.$modulename.'/core/'.$partname.'/';
+									$newvalue = '/'.$modulename.'/core/'.$partname.'/';
 								} elseif (in_array($partname, array('models', 'theme'))) {
-									$value = '/'.$modulename.'/';
+									$newvalue = '/'.$modulename.'/';
 								} elseif (in_array($partname, array('sms'))) {
-									$value = '/'.$modulename.'/';
+									$newvalue = '/'.$modulename.'/';
 								} elseif ($value == 1) {
-									$value = '/'.$modulename.'/core/modules/'.$partname.'/'; // ex: partname = societe
+									$newvalue = '/'.$modulename.'/core/modules/'.$partname.'/'; // ex: partname = societe
+								} else {
+									$newvalue = $value;
+								}
+
+								if (!empty($newvalue)) {
+									$this->modules_parts[$partname] = array_merge($this->modules_parts[$partname], array($modulename => $newvalue)); // $value may be a string or an array
 								}
-								$this->modules_parts[$partname] = array_merge($this->modules_parts[$partname], array($modulename => $value)); // $value may be a string or an array
 							} elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)$/i', $key, $reg)) {
 								// If this is a module constant (must be at end)
 								$modulename = strtolower($reg[1]);
@@ -394,10 +482,6 @@ class Conf
 			$this->user->dir_output = $rootforuser."/users";
 			$this->user->dir_temp = $rootfortemp."/users/temp";
 
-			// For usergroup storage
-			$this->usergroup->dir_output = $rootforuser."/usergroups";
-			$this->usergroup->dir_temp = $rootfortemp."/usergroups/temp";
-
 			// For proposal storage
 			$this->propal->multidir_output = array($this->entity => $rootfordata."/propale");
 			$this->propal->multidir_temp = array($this->entity => $rootfortemp."/propale/temp");
@@ -617,14 +701,15 @@ class Conf
 			if (!empty($this->global->MAILING_EMAIL_FROM)) {
 				$this->mailing->email_from = $this->global->MAILING_EMAIL_FROM;
 			}
-			if (!isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) {
-				$this->global->MAIN_EMAIL_ADD_TRACK_ID = 1;
-			}
 
 			if (!isset($this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
 				$this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP = 1;
 			}
 
+			if (!isset($this->global->MAIN_FIX_FOR_BUGGED_MTA)) {
+				$this->global->MAIN_FIX_FOR_BUGGED_MTA = 1;
+			}
+
 			// Format for date (used by default when not found or not searched in lang)
 			$this->format_date_short = "%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)
 			$this->format_date_short_java = "dd/MM/yyyy"; // Format of day with Java tags
@@ -684,6 +769,11 @@ class Conf
 				$this->global->MAIN_SHOW_STATE_CODE = 1;
 			}
 
+			// By default, we show state code in combo list
+			if (!isset($this->global->MULTICURRENCY_USE_ORIGIN_TX)) {
+				$this->global->MULTICURRENCY_USE_ORIGIN_TX = 1;
+			}
+
 			// 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;
@@ -767,8 +857,8 @@ class Conf
 				$this->contrat->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 86400;
 			}
 			if (isset($this->commande)) {
-				$this->bank->rappro					= new stdClass();
-				$this->bank->cheque					= new stdClass();
+				$this->bank->rappro	= new stdClass();
+				$this->bank->cheque	= new stdClass();
 				$this->bank->rappro->warning_delay = (isset($this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE) ? $this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE : 0) * 86400;
 				$this->bank->cheque->warning_delay = (isset($this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT) ? $this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT : 0) * 86400;
 			}
@@ -799,10 +889,6 @@ class Conf
 				$this->global->MAIN_SIZE_SHORTLIST_LIMIT = 3;
 			}
 
-			if (!isset($this->global->THEME_HIDE_BORDER_ON_INPUT)) {
-				$this->global->THEME_HIDE_BORDER_ON_INPUT = 0;
-			}
-
 			// Save inconsistent option
 			if (empty($this->global->AGENDA_USE_EVENT_TYPE) && (!isset($this->global->AGENDA_DEFAULT_FILTER_TYPE) || $this->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO')) {
 				$this->global->AGENDA_DEFAULT_FILTER_TYPE = '0'; // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.
@@ -819,16 +905,39 @@ class Conf
 				$this->global->MAIN_MODULE_DOLISTORE_API_KEY = 'dolistorecatalogpublickey1234567';
 			}
 
-			// If we are in develop mode, we activate the option MAIN_SECURITY_CSRF_WITH_TOKEN to 1 if not already defined.
-			if (!isset($this->global->MAIN_SECURITY_CSRF_WITH_TOKEN) && $this->global->MAIN_FEATURES_LEVEL >= 2) {
+			// Enable by default the CSRF protection by token.
+			if (!isset($this->global->MAIN_SECURITY_CSRF_WITH_TOKEN)) {
+				// 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;
+				// 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)
 			}
 
-			if (defined('MAIN_ANTIVIRUS_COMMAND')) {
-				$this->global->MAIN_ANTIVIRUS_COMMAND = constant('MAIN_ANTIVIRUS_COMMAND');
+			if (!defined('MAIN_ANTIVIRUS_BYPASS_COMMAND_AND_PARAM')) {
+				if (defined('MAIN_ANTIVIRUS_COMMAND')) {
+					$this->global->MAIN_ANTIVIRUS_COMMAND = constant('MAIN_ANTIVIRUS_COMMAND');
+				}
+				if (defined('MAIN_ANTIVIRUS_PARAM')) {
+					$this->global->MAIN_ANTIVIRUS_PARAM = constant('MAIN_ANTIVIRUS_PARAM');
+				}
 			}
-			if (defined('MAIN_ANTIVIRUS_PARAM')) {
-				$this->global->MAIN_ANTIVIRUS_PARAM = constant('MAIN_ANTIVIRUS_PARAM');
+
+			// For backward compatibility
+			if (!empty($this->global->LDAP_SYNCHRO_ACTIVE)) {
+				if ($this->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') {
+					$this->global->LDAP_SYNCHRO_ACTIVE = 1;
+				} elseif ($this->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr') {
+					$this->global->LDAP_SYNCHRO_ACTIVE = 2;
+				}
+			}
+			// For backward compatibility
+			if (!empty($this->global->LDAP_MEMBER_ACTIVE) && $this->global->LDAP_MEMBER_ACTIVE == 'ldap2dolibarr') {
+				$this->global->LDAP_MEMBER_ACTIVE = 2;
+			}
+			// For backward compatibility
+			if (!empty($this->global->LDAP_MEMBER_TYPE_ACTIVE) && $this->global->LDAP_MEMBER_TYPE_ACTIVE == 'ldap2dolibarr') {
+				$this->global->LDAP_MEMBER_TYPE_ACTIVE = 2;
 			}
 
 			if (!empty($this->global->MAIN_TZUSERINPUTKEY)) {
diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 45018cb1d8f..91b176f899d 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -183,7 +183,7 @@ class CoreObject extends CommonObject
 
 				$this->{$className} = array();
 
-				$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$childTable.' WHERE '.$this->fk_element.' = '.$this->id;
+				$sql = "SELECT rowid FROM ".$this->db->prefix().$childTable." WHERE ".$this->fk_element." = ".((int) $this->id);
 				$res = $this->db->query($sql);
 
 				if ($res) {
diff --git a/htdocs/core/class/cproductnature.class.php b/htdocs/core/class/cproductnature.class.php
index 6c3a1f7bb9d..d0c8a5d3933 100644
--- a/htdocs/core/class/cproductnature.class.php
+++ b/htdocs/core/class/cproductnature.class.php
@@ -102,7 +102,7 @@ class CProductNature // extends CommonObject
 		global $conf, $langs;
 
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."(";
+		$sql = "INSERT INTO ".$this->db->prefix().$this->table_element."(";
 		$sql .= "rowid,";
 		$sql .= "code,";
 		$sql .= "label,";
@@ -125,7 +125,7 @@ class CProductNature // extends CommonObject
 			$this->db->rollback();
 			return -1;
 		} else {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);
 			$this->db->commit();
 			return $this->id;
 		}
@@ -148,7 +148,7 @@ class CProductNature // extends CommonObject
 		$sql .= " t.code,";
 		$sql .= " t.label,";
 		$sql .= " t.active";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
 		$sql_where = array();
 		if ($id) {
 			$sql_where[] = " t.rowid = ".((int) $id);
@@ -197,36 +197,36 @@ class CProductNature // extends CommonObject
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$sql = 'SELECT';
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 		$sql .= " t.code,";
 		$sql .= " t.label,";
 		$sql .= " t.active";
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid' || $key == 't.active' || $key == 't.code') {
-					$sqlwhere[] = $key.'='.(int) $value;
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 't.label') {
-					$sqlwhere[] = $key.' = \''.$this->db->escape($value).'\'';
+					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
 				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$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);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -267,7 +267,7 @@ class CProductNature // extends CommonObject
 		global $conf, $langs;
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element." SET";
 		$sql .= " code=".(isset($this->code) ? ((int) $this->code) : "null").",";
 		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape(trim($this->label))."'" : "null").",";
 		$sql .= " active=".(isset($this->active) ? ((int) $this->active) : "null");
@@ -302,7 +302,7 @@ class CProductNature // extends CommonObject
 		global $conf, $langs;
 		$error = 0;
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql = "DELETE FROM ".$this->db->prefix().$this->table_element;
 		$sql .= " WHERE rowid=".(int) $this->id;
 
 		$this->db->begin();
diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
index 2b9b1d6880e..36c3cb2c0fe 100644
--- a/htdocs/core/class/cstate.class.php
+++ b/htdocs/core/class/cstate.class.php
@@ -106,7 +106,7 @@ class Cstate // extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_departements(";
+		$sql = "INSERT INTO ".$this->db->prefix()."c_departements(";
 		$sql .= "rowid,";
 		$sql .= "code_departement,";
 		$sql .= "nom,";
@@ -128,7 +128,7 @@ class Cstate // extends CommonObject
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_departements");
+			$this->id = $this->db->last_insert_id($this->db->prefix()."c_departements");
 		}
 
 		// Commit or rollback
@@ -161,7 +161,7 @@ class Cstate // extends CommonObject
 		$sql .= " t.code_departement,";
 		$sql .= " t.nom,";
 		$sql .= " t.active";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_departements as t";
+		$sql .= " FROM ".$this->db->prefix()."c_departements as t";
 		if ($id) {
 			$sql .= " WHERE t.rowid = ".((int) $id);
 		} elseif ($code) {
@@ -219,7 +219,7 @@ class Cstate // extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."c_departements SET";
+		$sql = "UPDATE ".$this->db->prefix()."c_departements SET";
 		$sql .= " code_departement=".(isset($this->code_departement) ? "'".$this->db->escape($this->code_departement)."'" : "null").",";
 		$sql .= " nom=".(isset($this->nom) ? "'".$this->db->escape($this->nom)."'" : "null").",";
 		$sql .= " active=".(isset($this->active) ? $this->active : "null")."";
@@ -260,7 +260,7 @@ class Cstate // extends CommonObject
 		global $conf, $langs;
 		$error = 0;
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_departements";
+		$sql = "DELETE FROM ".$this->db->prefix()."c_departements";
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$this->db->begin();
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index c8421c54b1f..6de7de7d5cb 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -105,7 +105,7 @@ class Ctypent // extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_typent(";
+		$sql = "INSERT INTO ".$this->db->prefix()."c_typent(";
 
 		$sql .= "id,";
 		$sql .= "code,";
@@ -135,7 +135,7 @@ class Ctypent // extends CommonObject
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_typent");
+			$this->id = $this->db->last_insert_id($this->db->prefix()."c_typent");
 		}
 
 		// Commit or rollback
@@ -170,7 +170,7 @@ class Ctypent // extends CommonObject
 		$sql .= " t.fk_country as country_id,";
 		$sql .= " t.active,";
 		$sql .= " t.module";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_typent as t";
+		$sql .= " FROM ".$this->db->prefix()."c_typent as t";
 		if ($id) {
 			$sql .= " WHERE t.id = ".((int) $id);
 		} elseif ($code) {
@@ -232,7 +232,7 @@ class Ctypent // extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."c_typent SET";
+		$sql = "UPDATE ".$this->db->prefix()."c_typent SET";
 		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
 		$sql .= " libelle=".(isset($this->libelle) ? "'".$this->db->escape($this->libelle)."'" : "null").",";
 		$sql .= " active=".(isset($this->active) ? $this->active : "null").",";
@@ -275,7 +275,7 @@ class Ctypent // extends CommonObject
 		global $conf, $langs;
 		$error = 0;
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_typent";
+		$sql = "DELETE FROM ".$this->db->prefix()."c_typent";
 		$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 b0a604e9e28..32fe3164ad8 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -99,7 +99,7 @@ class Ctyperesource
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
+		$sql = 'INSERT INTO '.$this->db->prefix().$this->table_element.'(';
 
 		$sql .= 'code,';
 		$sql .= 'label';
@@ -125,7 +125,7 @@ class Ctyperesource
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);
 
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action to call a trigger.
@@ -163,12 +163,12 @@ class Ctyperesource
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
 		$sql .= " t.code,";
 		$sql .= " t.label,";
 		$sql .= " t.active";
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
 		if ($id) {
 			$sql .= " WHERE t.id = ".((int) $id);
 		} elseif ($code) {
@@ -228,32 +228,29 @@ class Ctyperesource
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
 		$sql .= " t.code,";
 		$sql .= " t.label,";
 		$sql .= " t.active";
-
-
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= " 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).'%\'';
+				$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 			}
 		}
 
 		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE '.implode(' '.$filtermode.' ', $sqlwhere);
+			$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);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -310,7 +307,7 @@ class Ctyperesource
 		// Put here code to add a control on parameters values
 
 		// Update request
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
+		$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").',';
@@ -379,7 +376,7 @@ class Ctyperesource
 		// If you need to delete child tables to, you can insert them here
 
 		if (!$error) {
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;
+			$sql = 'DELETE FROM '.$this->db->prefix().$this->table_element;
 			$sql .= ' WHERE rowid='.((int) $this->id);
 
 			$resql = $this->db->query($sql);
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index 364565af3aa..d7571b8ca90 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -112,7 +112,7 @@ class CUnits // extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_units(";
+		$sql = "INSERT INTO ".$this->db->prefix()."c_units(";
 		$sql .= "rowid,";
 		$sql .= "code,";
 		$sql .= "label,";
@@ -138,7 +138,7 @@ class CUnits // extends CommonObject
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_units");
+			$this->id = $this->db->last_insert_id($this->db->prefix()."c_units");
 		}
 
 		// Commit or rollback
@@ -178,7 +178,7 @@ class CUnits // extends CommonObject
 		$sql .= " t.unit_type,";
 		$sql .= " t.scale,";
 		$sql .= " t.active";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
+		$sql .= " FROM ".$this->db->prefix()."c_units as t";
 		$sql_where = array();
 		if ($id) {
 			$sql_where[] = " t.rowid = ".((int) $id);
@@ -237,39 +237,40 @@ class CUnits // extends CommonObject
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$sql = 'SELECT';
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 		$sql .= " t.code,";
+		$sql .= " t.sortorder,";
 		$sql .= " t.label,";
 		$sql .= " t.short_label,";
 		$sql .= " t.unit_type,";
 		$sql .= " t.scale,";
 		$sql .= " t.active";
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'c_units as t';
+		$sql .= " FROM ".$this->db->prefix()."c_units as t";
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid' || $key == 't.active' || $key == 't.scale') {
-					$sqlwhere[] = $key.'='.(int) $value;
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 't.unit_type' || $key == 't.code' || $key == 't.short_label') {
-					$sqlwhere[] = $key.' = \''.$this->db->escape($value).'\'';
+					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
 				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$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);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -280,8 +281,9 @@ class CUnits // extends CommonObject
 				while ($obj = $this->db->fetch_object($resql)) {
 					$record = new self($this->db);
 
-					$record->id    = $obj->rowid;
+					$record->id = $obj->rowid;
 					$record->code = $obj->code;
+					$record->sortorder = $obj->sortorder;
 					$record->label = $obj->label;
 					$record->short_label = $obj->short_label;
 					$record->unit_type = $obj->unit_type;
@@ -318,6 +320,9 @@ class CUnits // extends CommonObject
 		if (isset($this->code)) {
 			$this->code = trim($this->code);
 		}
+		if (isset($this->sortorder)) {
+			$this->sortorder = trim($this->sortorder);
+		}
 		if (isset($this->label)) {
 			$this->libelle = trim($this->label);
 		}
@@ -338,8 +343,9 @@ class CUnits // extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."c_units SET";
+		$sql = "UPDATE ".$this->db->prefix()."c_units SET";
 		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
+		$sql .= " sortorder=".(isset($this->sortorder) ? "'".$this->db->escape($this->sortorder)."'" : "null").",";
 		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
 		$sql .= " short_label=".(isset($this->short_label) ? "'".$this->db->escape($this->short_label)."'" : "null").",";
 		$sql .= " unit_type=".(isset($this->unit_type) ? "'".$this->db->escape($this->unit_type)."'" : "null").",";
@@ -383,7 +389,7 @@ class CUnits // extends CommonObject
 		global $conf, $langs;
 		$error = 0;
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_units";
+		$sql = "DELETE FROM ".$this->db->prefix()."c_units";
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$this->db->begin();
@@ -465,7 +471,7 @@ class CUnits // extends CommonObject
 	{
 		$base = 10;
 		// TODO : add base col into unit dictionary table
-		$unit = $this->db->getRow('SELECT scale, unit_type from '.MAIN_DB_PREFIX.'c_units WHERE rowid = '.intval($id));
+		$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') {
diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index 5b49254b275..278b5d5e0e6 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -88,7 +88,7 @@ class DefaultValues extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	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),
 		'type' =>array('type'=>'varchar(10)', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'position'=>20),
@@ -145,8 +145,12 @@ class DefaultValues extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
 
 		// Unset fields that are disabled
 		foreach ($this->fields as $key => $val) {
@@ -255,38 +259,38 @@ class DefaultValues extends CommonObject
 
 		$records = array();
 
-		$sql = 'SELECT ';
+		$sql = "SELECT ";
 		$sql .= $this->getFieldList();
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql .= ' WHERE 1 = 1';
+		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
+		$sql .= " WHERE 1 = 1";
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid' || ($key == 't.entity' && !is_array($value)) || ($key == 't.user_id' && !is_array($value))) {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (isset($this->fields[$key]) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 't.page' || $key == 't.param' || $key == 't.type') {
-					$sqlwhere[] = $key.' = \''.$this->db->escape($value).'\'';
+					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
 				} elseif (is_array($value)) {
-					$sqlwhere[] = $key.' IN ('.$this->db->sanitize(implode(',', $value)).')';
+					$sqlwhere[] = $key." IN (".$this->db->sanitize(implode(',', $value)).")";
 				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index eaf4bc511c8..7939965828a 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -139,9 +139,9 @@ class DiscountAbsolute
 		$sql .= " sr.datec,";
 		$sql .= " f.ref as ref_facture_source, f.type as type_facture_source,";
 		$sql .= " fsup.ref as ref_invoice_supplier_source, fsup.type as type_invoice_supplier_source";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as sr";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";
+		$sql .= " FROM ".$this->db->prefix()."societe_remise_except as sr";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."facture as f ON sr.fk_facture_source = f.rowid";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."facture_fourn as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";
 		$sql .= " WHERE sr.entity IN (".getEntity('invoice').")";
 		if ($rowid) {
 			$sql .= " AND sr.rowid = ".((int) $rowid);
@@ -251,7 +251,7 @@ class DiscountAbsolute
 		}
 
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_except";
+		$sql = "INSERT INTO ".$this->db->prefix()."societe_remise_except";
 		$sql .= " (entity, datec, fk_soc, discount_type, fk_user, description,";
 		$sql .= " amount_ht, amount_tva, amount_ttc, tva_tx, vat_src_code,";
 		$sql .= " multicurrency_amount_ht, multicurrency_amount_tva, multicurrency_amount_ttc,";
@@ -267,7 +267,7 @@ class DiscountAbsolute
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
+			$this->id = $this->db->last_insert_id($this->db->prefix()."societe_remise_except");
 			return $this->id;
 		} else {
 			$this->error = $this->db->lasterror().' - sql='.$sql;
@@ -289,7 +289,7 @@ class DiscountAbsolute
 		// Check if we can remove the discount
 		if ($this->fk_facture_source) {
 			$sql = "SELECT COUNT(rowid) as nb";
-			$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
+			$sql .= " FROM ".$this->db->prefix()."societe_remise_except";
 			$sql .= " WHERE (fk_facture_line IS NOT NULL"; // Not used as absolute simple discount
 			$sql .= " OR fk_facture IS NOT NULL)"; // Not used as credit note and not used as deposit
 			$sql .= " AND fk_facture_source = ".((int) $this->fk_facture_source);
@@ -312,7 +312,7 @@ class DiscountAbsolute
 		// Check if we can remove the discount
 		if ($this->fk_invoice_supplier_source) {
 			$sql = "SELECT COUNT(rowid) as nb";
-			$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
+			$sql .= " FROM ".$this->db->prefix()."societe_remise_except";
 			$sql .= " WHERE (fk_invoice_supplier_line IS NOT NULL"; // Not used as absolute simple discount
 			$sql .= " OR fk_invoice_supplier IS NOT NULL)"; // Not used as credit note and not used as deposit
 			$sql .= " AND fk_invoice_supplier_source = ".((int) $this->fk_invoice_supplier_source);
@@ -335,7 +335,7 @@ class DiscountAbsolute
 		$this->db->begin();
 
 		// Delete but only if not used
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except ";
+		$sql = "DELETE FROM ".$this->db->prefix()."societe_remise_except ";
 		if ($this->fk_facture_source) {
 			$sql .= " WHERE fk_facture_source = ".((int) $this->fk_facture_source); // Delete all lines of same serie
 		} elseif ($this->fk_invoice_supplier_source) {
@@ -353,7 +353,7 @@ class DiscountAbsolute
 		if ($result) {
 			// If source of discount was a credit note or deposit, we change source statut.
 			if ($this->fk_facture_source) {
-				$sql = "UPDATE ".MAIN_DB_PREFIX."facture";
+				$sql = "UPDATE ".$this->db->prefix()."facture";
 				$sql .= " set paye=0, fk_statut=1";
 				$sql .= " WHERE (type = 2 or type = 3) AND rowid = ".((int) $this->fk_facture_source);
 
@@ -368,7 +368,7 @@ class DiscountAbsolute
 					return -1;
 				}
 			} elseif ($this->fk_invoice_supplier_source) {
-				$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
+				$sql = "UPDATE ".$this->db->prefix()."facture_fourn";
 				$sql .= " set paye=0, fk_statut=1";
 				$sql .= " WHERE (type = 2 or type = 3) AND rowid = ".((int) $this->fk_invoice_supplier_source);
 
@@ -418,7 +418,7 @@ class DiscountAbsolute
 			return -2;
 		}
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
+		$sql = "UPDATE ".$this->db->prefix()."societe_remise_except";
 		if (!empty($this->discount_type)) {
 			if ($rowidline) {
 				$sql .= " SET fk_invoice_supplier_line = ".((int) $rowidline);
@@ -434,7 +434,7 @@ class DiscountAbsolute
 				$sql .= " SET fk_facture = ".((int) $rowidinvoice);
 			}
 		}
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::link_to_invoice", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -464,13 +464,13 @@ class DiscountAbsolute
 	public function unlink_invoice()
 	{
 		// phpcs:enable
-		$sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
+		$sql = "UPDATE ".$this->db->prefix()."societe_remise_except";
 		if (!empty($this->discount_type)) {
 			$sql .= " SET fk_invoice_supplier_line = NULL, fk_invoice_supplier = NULL";
 		} else {
 			$sql .= " SET fk_facture_line = NULL, fk_facture = NULL";
 		}
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -501,7 +501,7 @@ class DiscountAbsolute
 		dol_syslog(get_class($this)."::getAvailableDiscounts discount_type=".$discount_type, LOG_DEBUG);
 
 		$sql = "SELECT SUM(rc.amount_ttc) as amount, SUM(rc.multicurrency_amount_ttc) as multicurrency_amount";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
+		$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc";
 		$sql .= " WHERE rc.entity = ".$conf->entity;
 		$sql .= " AND rc.discount_type=".((int) $discount_type);
 		if (!empty($discount_type)) {
@@ -516,10 +516,10 @@ class DiscountAbsolute
 			$sql .= " AND rc.fk_user = ".((int) $user->id);
 		}
 		if ($filter) {
-			$sql .= ' AND ('.$filter.')';
+			$sql .= " AND (".$filter.")";
 		}
 		if ($maxvalue) {
-			$sql .= ' AND rc.amount_ttc <= '.price2num($maxvalue);
+			$sql .= ' AND rc.amount_ttc <= '.((float) price2num($maxvalue));
 		}
 
 		$resql = $this->db->query($sql);
@@ -553,15 +553,15 @@ class DiscountAbsolute
 		dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
 
 		if ($invoice->element == 'facture' || $invoice->element == 'invoice') {
-			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-			$sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-			$sql .= ' AND f.type = 3';
+			$sql = "SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount";
+			$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc, ".$this->db->prefix()."facture as f";
+			$sql .= " WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = ".((int) $invoice->id);
+			$sql .= " AND f.type = 3";
 		} elseif ($invoice->element == 'invoice_supplier') {
-			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
-			$sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
-			$sql .= ' AND f.type = 3';
+			$sql = "SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount";
+			$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc, ".$this->db->prefix()."facture_fourn as f";
+			$sql .= " WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = ".((int) $invoice->id);
+			$sql .= " AND f.type = 3";
 		} else {
 			$this->error = get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
 			dol_print_error($this->error);
@@ -594,15 +594,15 @@ class DiscountAbsolute
 		dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
 
 		if ($invoice->element == 'facture' || $invoice->element == 'invoice') {
-			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-			$sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-			$sql .= ' AND f.type IN ('.$this->db->sanitize($invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.', '.$invoice::TYPE_SITUATION).')'; // Find discount coming from credit note or excess received
+			$sql = "SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount";
+			$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc, ".$this->db->prefix()."facture as f";
+			$sql .= " WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = ".((int) $invoice->id);
+			$sql .= " AND f.type IN (".$this->db->sanitize($invoice::TYPE_STANDARD.", ".$invoice::TYPE_CREDIT_NOTE.", ".$invoice::TYPE_SITUATION).")"; // Find discount coming from credit note or excess received
 		} elseif ($invoice->element == 'invoice_supplier') {
-			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
-			$sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
-			$sql .= ' AND f.type IN ('.$this->db->sanitize($invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE).')'; // Find discount coming from credit note or excess paid
+			$sql = "SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount";
+			$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc, ".$this->db->prefix()."facture_fourn as f";
+			$sql .= " WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = ".((int) $invoice->id);
+			$sql .= " AND f.type IN (".$this->db->sanitize($invoice::TYPE_STANDARD.", ".$invoice::TYPE_CREDIT_NOTE).")"; // Find discount coming from credit note or excess paid
 		} else {
 			$this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
 			dol_print_error($this->error);
@@ -634,13 +634,13 @@ class DiscountAbsolute
 		dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
 
 		if ($invoice->element == 'facture' || $invoice->element == 'invoice') {
-			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
-			$sql .= ' WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = '.$invoice->id;
+			$sql = "SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount";
+			$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc";
+			$sql .= " WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = ".((int) $invoice->id);
 		} elseif ($invoice->element == 'invoice_supplier') {
-			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
-			$sql .= ' WHERE rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_source = '.$invoice->id;
+			$sql = "SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount";
+			$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc";
+			$sql .= " WHERE rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_source = ".((int) $invoice->id);
 		} else {
 			$this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
 			dol_print_error($this->error);
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index ab8f432c85d..927674942e7 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -55,8 +55,8 @@ class DolEditor
 	 *  @param 	int		$height			       		 	Height in pixel of edit area (200px by default)
 	 *  @param 	string	$toolbarname	       		 	Name of bar set to use ('Full', 'dolibarr_notes[_encoded]', 'dolibarr_details[_encoded]'=the less featured, 'dolibarr_mailings[_encoded]', 'dolibarr_readonly').
 	 *  @param  string	$toolbarlocation       			Where bar is stored :
-	 *                       		                    'In' each window has its own toolbar
-	 *                              		            'Out:name' share toolbar into the div called 'name'
+	 *                       		                    'In' = each window has its own toolbar
+	 *                              		            'Out:name' = share toolbar into the div called 'name'
 	 *  @param  boolean	$toolbarstartexpanded  			Bar is visible or not at start
 	 *  @param	int		$uselocalbrowser				Enabled to add links to local object with local browser. If false, only external images can be added in content.
 	 *  @param  boolean|string	$okforextendededitor    True=Allow usage of extended editor tool if qualified (like ckeditor). If 'textarea', force use of simple textarea. If 'ace', force use of Ace.
@@ -155,10 +155,20 @@ class DolEditor
 				} else {
 					$skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
 				}
+
+				$pluginstodisable = 'elementspath,save,flash';
+				if (!empty($conf->dol_optimize_smallscreen)) {
+					$pluginstodisable .= ',scayt,wsc,find,undo';
+				}
+				if (empty($conf->global->FCKEDITOR_ENABLE_WSC)) {	// spellchecker has end of life december 2021
+					$pluginstodisable .= ',wsc';
+				}
+				$scaytautostartup = '';
 				if (!empty($conf->global->FCKEDITOR_ENABLE_SCAYT_AUTOSTARTUP)) {
 					$scaytautostartup = 'scayt_autoStartup: true,';
+					$scaytautostartup .= 'scayt_sLang: \''.dol_escape_js($langs->getDefaultLang()).'\',';
 				} else {
-					$scaytautostartup = '/*scayt is disable*/'; // Disable by default
+					$pluginstodisable .= ',scayt';
 				}
 
 				$htmlencode_force = preg_match('/_encoded$/', $this->toolbarname) ? 'true' : 'false';
@@ -168,11 +178,12 @@ class DolEditor
             			$(document).ready(function () {
 							/* console.log("Run ckeditor"); */
                             /* if (CKEDITOR.loadFullCore) CKEDITOR.loadFullCore(); */
-                            /* should be editor=CKEDITOR.replace but what if serveral editors ? */
-                            CKEDITOR.replace(\''.$this->htmlname.'\',
+                            /* should be editor=CKEDITOR.replace but what if there is several editors ? */
+                            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').',
@@ -185,25 +196,22 @@ class DolEditor
             						height: '.$this->height.',
                                     skin: \''.$skin.'\',
                                     '.$scaytautostartup.'
-                                    scayt_sLang: \''.$langs->getDefaultLang().'\',
                                     language: \''.$langs->defaultlang.'\',
                                     textDirection: \''.$langs->trans("DIRECTION").'\',
-                                    on :
-                                            {
+                                    on : {
                                                 instanceReady : function( ev )
                                                 {
                                                     // Output paragraphs as <p>Text</p>.
-                                                    this.dataProcessor.writer.setRules( \'p\',
-                                                        {
-                                                            indent : false,
-                                                            breakBeforeOpen : true,
-                                                            breakAfterOpen : false,
-                                                            breakBeforeClose : false,
-                                                            breakAfterClose : true
-                                                        });
+                                                    this.dataProcessor.writer.setRules( \'p\', {
+                                                        indent : false,
+                                                        breakBeforeOpen : true,
+                                                        breakAfterOpen : false,
+                                                        breakBeforeClose : false,
+                                                        breakAfterClose : true
+                                                    });
                                                 }
-                                            },
-											disableNativeSpellChecker: '.(empty($conf->global->CKEDITOR_NATIVE_SPELLCHECKER) ? 'true' : 'false');
+                                          },
+									disableNativeSpellChecker: '.(empty($conf->global->CKEDITOR_NATIVE_SPELLCHECKER) ? 'true' : 'false');
 
 				if ($this->uselocalbrowser) {
 					$out .= ','."\n";
@@ -226,8 +234,10 @@ class DolEditor
                                filebrowserImageWindowWidth : \'900\',
                                filebrowserImageWindowHeight : \'500\'';
 				}
-				$out .= '	})'.$morejs;
-				$out .= '});'."\n";
+				$out .= '	})'.$morejs;	// end CKEditor.replace
+				// Show the CKEditor javascript object once loaded is ready 'For debug)
+				//$out .= '; CKEDITOR.on(\'instanceReady\', function(ck) { ck.editor.removeMenuItem(\'maximize\'); ck.editor.removeMenuItem(\'Undo\'); ck.editor.removeMenuItem(\'undo\'); console.log(ck.editor); console.log(ck.editor.toolbar[0]); }); ';
+				$out .= '});'."\n";	// end document.ready
 				$out .= '</script>'."\n";
 			}
 		}
@@ -244,7 +254,7 @@ class DolEditor
 				$out .= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
 				$out .= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.' reposition">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
 				$out .= '</div>';
-				$out .= '<script type="text/javascript" language="javascript">'."\n";
+				$out .= '<script type="text/javascript">'."\n";
 				$out .= 'jQuery(document).ready(function() {'."\n";
 				$out .= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 	    	    		   	var StatusBar = window.ace.require("ace/ext/statusbar").StatusBar;									// Init status bar. Need lib ext-statusbar
@@ -281,7 +291,7 @@ class DolEditor
 			$out .= htmlspecialchars($this->content);
 			$out .= '</textarea>';
 
-			$out .= '<script type="text/javascript" language="javascript">'."\n";
+			$out .= '<script type="text/javascript">'."\n";
 			$out .= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 
 				    aceEditor.session.setMode("ace/mode/'.$format.'");
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index a1725526898..a93ed92e8f5 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -107,10 +107,12 @@ class DolGraph
 		global $conf;
 		global $theme_bordercolor, $theme_datacolor, $theme_bgcolor;
 
+		// Some default values for the case it is not defined into the theme later.
 		$this->bordercolor = array(235, 235, 224);
 		$this->datacolor = array(array(120, 130, 150), array(160, 160, 180), array(190, 190, 220));
 		$this->bgcolor = array(235, 235, 224);
 
+		// Load color of the theme
 		$color_file = DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php';
 		if (is_readable($color_file)) {
 			include $color_file;
@@ -741,7 +743,7 @@ class DolGraph
 	/**
 	 * Build a graph using JFlot library. Input when calling this method should be:
 	 *	$this->data  = array(array(0=>'labelxA',1=>yA),  array('labelxB',yB));
-	 *	$this->data  = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn));   // or when there is n series to show for each x
+	 *	$this->data  = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn));   // when there is n series to show for each x
 	 *  $this->data  = array(array('label'=>'labelxA','data'=>yA),  array('labelxB',yB));			// Syntax deprecated
 	 *  $this->legend= array("Val1",...,"Valn");													// list of n series name
 	 *  $this->type  = array('bars',...'lines','linesnopoint'); or array('pie') or array('polar')
@@ -1028,7 +1030,7 @@ class DolGraph
 	/**
 	 * Build a graph using Chart library. Input when calling this method should be:
 	 *	$this->data  = array(array(0=>'labelxA',1=>yA),  array('labelxB',yB));
-	 *	$this->data  = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn));   // or when there is n series to show for each x
+	 *	$this->data  = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn));   // when there is n series to show for each x
 	 *  $this->data  = array(array('label'=>'labelxA','data'=>yA),  array('labelxB',yB));			// Syntax deprecated
 	 *  $this->legend= array("Val1",...,"Valn");													// list of n series name
 	 *  $this->type  = array('bars',...'lines', 'linesnopoint'); or array('pie') or array('polar') or array('piesemicircle');
@@ -1054,6 +1056,7 @@ class DolGraph
 		}
 
 		$showlegend = $this->showlegend;
+		$bordercolor = "";
 
 		$legends = array();
 		$nblot = 0;
@@ -1303,6 +1306,8 @@ class DolGraph
 			$this->stringtoshow .= 'var options = { maintainAspectRatio: false, aspectRatio: 2.5, ';
 			if (empty($showlegend)) {
 				$this->stringtoshow .= 'legend: { display: false }, ';
+			} else {
+				$this->stringtoshow .= 'legend: { position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\' },';
 			}
 			$this->stringtoshow .= 'scales: { xAxes: [{ ';
 			if ($this->hideXValues) {
@@ -1382,7 +1387,7 @@ class DolGraph
 
 					$textoflegend = $arrayofgroupslegend[$i]['legendwithgroup'];
 				} else {
-					$textoflegend = $this->Legend[$i];
+					$textoflegend = !empty($this->Legend[$i]) ? $this->Legend[$i] : '';
 				}
 
 				if ($usecolorvariantforgroupby) {
@@ -1412,13 +1417,13 @@ class DolGraph
 					$color = 'rgb(' . $newcolor[0] . ', ' . $newcolor[1] . ', ' . $newcolor[2] . ', 0.9)';
 					$bordercolor = 'rgb(' . $newcolor[0] . ', ' . $newcolor[1] . ', ' . $newcolor[2] . ')';
 				} else { // We do not use a 'group by'
-					if (is_array($this->datacolor[$i])) {
+					if (!empty($this->datacolor[$i]) && is_array($this->datacolor[$i])) {
 						$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ', 0.9)';
 					} else {
 						$color = $this->datacolor[$i];
 					}
-					if (is_array($this->bordercolor[$i])) {
-						$color = 'rgb(' . $this->bordercolor[$i][0] . ', ' . $this->bordercolor[$i][1] . ', ' . $this->bordercolor[$i][2] . ', 0.9)';
+					if (!empty($this->bordercolor[$i]) && is_array($this->bordercolor[$i])) {
+						$bordercolor = 'rgb(' . $this->bordercolor[$i][0] . ', ' . $this->bordercolor[$i][1] . ', ' . $this->bordercolor[$i][2] . ', 0.9)';
 					} else {
 						if ($type != 'horizontalBar') {
 							$bordercolor = $color;
@@ -1426,6 +1431,14 @@ class DolGraph
 							$bordercolor = $this->bordercolor[$i];
 						}
 					}
+
+					// For negative colors, we invert border and background
+					$tmp = str_replace('#', '', $color);
+					if (strpos($tmp, '-') !== false) {
+						$foundnegativecolor++;
+						$bordercolor = str_replace('-', '', $color);
+						$color = '#FFFFFF'; // If $val is '-123'
+					}
 				}
 				if ($i > 0) {
 					$this->stringtoshow .= ', ';
@@ -1517,7 +1530,7 @@ class DolGraph
 			if (empty($conf->dol_optimize_smallscreen)) {
 				return ($defaultsize ? $defaultsize : '500');
 			} else {
-				return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width'] - 40));
+				return (empty($_SESSION['dol_screenwidth']) ? '280' : ($_SESSION['dol_screenwidth'] - 40));
 			}
 		}
 		if ($direction == 'height') {
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 82d068ab14d..7653fd24437 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -61,6 +61,7 @@
  * <dol_value_month>                                Replaced by month number
  * <dol_value_day>                                  Replaced by day number
  * <dol_value_day_letters>                          Replaced by day number
+ * <dol_value_currentdate>                          Replaced by current date
  * <dol_object_id>                                  Replaced by object id
  * <dol_object_ref>                                 Replaced by object ref
  * <dol_value_customer_firstname>                   Replaced by customer firstname
@@ -186,6 +187,7 @@ class dolReceiptPrinter extends Printer
 			'dol_value_month' => 'DOL_VALUE_MONTH',
 			'dol_value_day' => 'DOL_VALUE_DAY',
 			'dol_value_day_letters' => 'DOL_VALUE_DAY',
+			'dol_value_currentdate' => 'DOL_VALUE_CURRENTDATE',
 			'dol_print_payment' => 'DOL_PRINT_PAYMENT',
 			'dol_print_logo' => 'DOL_PRINT_LOGO',
 			'dol_print_logo_old' => 'DOL_PRINT_LOGO_OLD',
@@ -221,6 +223,7 @@ class dolReceiptPrinter extends Printer
 			'dol_value_mysoc_idprof6' => 'ProfId6',
 			'dol_value_mysoc_tva_intra' => 'VATIntra',
 			'dol_value_mysoc_capital' => 'Capital',
+			'dol_value_mysoc_url' => 'Web',
 			'dol_value_vendor_lastname' => 'VendorLastname',
 			'dol_value_vendor_firstname' => 'VendorFirstname',
 			'dol_value_vendor_mail' => 'VendorEmail',
@@ -239,9 +242,9 @@ class dolReceiptPrinter extends Printer
 		$error = 0;
 		$line = 0;
 		$obj = array();
-		$sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-		$sql .= ' WHERE entity = '.$conf->entity;
+		$sql = "SELECT rowid, name, fk_type, fk_profile, parameter";
+		$sql .= " FROM ".$this->db->prefix()."printer_receipt";
+		$sql .= " WHERE entity = ".$conf->entity;
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -307,9 +310,9 @@ class dolReceiptPrinter extends Printer
 		$error = 0;
 		$line = 0;
 		$obj = array();
-		$sql = 'SELECT rowid, name, template';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-		$sql .= ' WHERE entity = '.$conf->entity;
+		$sql = "SELECT rowid, name, template";
+		$sql .= " FROM ".$this->db->prefix()."printer_receipt_template";
+		$sql .= " WHERE entity = ".$conf->entity;
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -388,7 +391,7 @@ class dolReceiptPrinter extends Printer
 	{
 		global $conf;
 		$error = 0;
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."printer_receipt";
+		$sql = "INSERT INTO ".$this->db->prefix()."printer_receipt";
 		$sql .= " (name, fk_type, fk_profile, parameter, entity)";
 		$sql .= " VALUES ('".$this->db->escape($name)."', ".((int) $type).", ".((int) $profile).", '".$this->db->escape($parameter)."', ".((int) $conf->entity).")";
 		$resql = $this->db->query($sql);
@@ -414,7 +417,7 @@ class dolReceiptPrinter extends Printer
 		global $conf;
 		$error = 0;
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."printer_receipt";
+		$sql = "UPDATE ".$this->db->prefix()."printer_receipt";
 		$sql .= " SET name='".$this->db->escape($name)."'";
 		$sql .= ", fk_type=".((int) $type);
 		$sql .= ", fk_profile=".((int) $profile);
@@ -439,7 +442,7 @@ class dolReceiptPrinter extends Printer
 	{
 		global $conf;
 		$error = 0;
-		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt';
+		$sql = 'DELETE FROM '.$this->db->prefix().'printer_receipt';
 		$sql .= ' WHERE rowid='.((int) $printerid);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
@@ -460,7 +463,7 @@ class dolReceiptPrinter extends Printer
 	{
 		global $conf;
 		$error = 0;
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."printer_receipt_template";
+		$sql = "INSERT INTO ".$this->db->prefix()."printer_receipt_template";
 		$sql .= " (name, template, entity) VALUES ('".$this->db->escape($name)."'";
 		$sql .= ", '".$this->db->escape($template)."', ".$conf->entity.")";
 		$resql = $this->db->query($sql);
@@ -481,7 +484,7 @@ class dolReceiptPrinter extends Printer
 	{
 		global $conf;
 		$error = 0;
-		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+		$sql = 'DELETE FROM '.$this->db->prefix().'printer_receipt_template';
 		$sql .= " WHERE rowid = ".((int) $templateid);
 		$sql .= " AND entity = ".$conf->entity;
 		$resql = $this->db->query($sql);
@@ -505,7 +508,7 @@ class dolReceiptPrinter extends Printer
 		global $conf;
 		$error = 0;
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."printer_receipt_template";
+		$sql = "UPDATE ".$this->db->prefix()."printer_receipt_template";
 		$sql .= " SET name='".$this->db->escape($name)."'";
 		$sql .= ", template='".$this->db->escape($template)."'";
 		$sql .= " WHERE rowid=".((int) $templateid);
@@ -584,6 +587,7 @@ class dolReceiptPrinter extends Printer
 		$this->template = str_replace('{dol_value_month}', dol_print_date($object->date, '%m'), $this->template);
 		$this->template = str_replace('{dol_value_day}', dol_print_date($object->date, '%d'), $this->template);
 		$this->template = str_replace('{dol_value_day_letters}', $langs->trans("Day".dol_print_date($object->date, '%m')[1]), $this->template);
+		$this->template = str_replace('{dol_value_currentdate}', dol_print_date(dol_now(), 'dayhour'), $this->template);
 
 		$this->template = str_replace('{dol_value_customer_firstname}', $object->thirdparty->firstname, $this->template);
 		$this->template = str_replace('{dol_value_customer_lastname}', $object->thirdparty->lastname, $this->template);
@@ -607,6 +611,7 @@ class dolReceiptPrinter extends Printer
 		$this->template = str_replace('{dol_value_mysoc_idprof6}', $mysoc->idprof6, $this->template);
 		$this->template = str_replace('{dol_value_mysoc_tva_intra}', $mysoc->tva_intra, $this->template);
 		$this->template = str_replace('{dol_value_mysoc_capital}', $mysoc->capital, $this->template);
+		$this->template = str_replace('{dol_value_mysoc_url}', $mysoc->url, $this->template);
 
 		$this->template = str_replace('{dol_value_vendor_firstname}', $user->firstname, $this->template);
 		$this->template = str_replace('{dol_value_vendor_lastname}', $user->lastname, $this->template);
@@ -672,9 +677,9 @@ class dolReceiptPrinter extends Printer
 							$vatarray[$line->tva_tx] += $line->total_tva;
 						}
 						foreach ($vatarray as $vatkey => $vatvalue) {
-							 $spacestoadd = $nbcharactbyline - strlen($vatkey) - 12;
-							 $spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
-							 $this->printer->text($spaces.$vatkey.'% '.str_pad(price($vatvalue), 10, ' ', STR_PAD_LEFT)."\n");
+							$spacestoadd = $nbcharactbyline - strlen($vatkey) - 12;
+							$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
+							$this->printer->text($spaces.$vatkey.'% '.str_pad(price($vatvalue), 10, ' ', STR_PAD_LEFT)."\n");
 						}
 						break;
 					case 'DOL_PRINT_OBJECT_TAX1':
@@ -802,8 +807,8 @@ class dolReceiptPrinter extends Printer
 					case 'DOL_PRINT_PAYMENT':
 						$sql = "SELECT p.pos_change as pos_change, p.datep as date, p.fk_paiement, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,";
 						$sql .= " cp.code";
-						$sql .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
-						$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
+						$sql .= " FROM ".$this->db->prefix()."paiement_facture as pf, ".$this->db->prefix()."paiement as p";
+						$sql .= " LEFT JOIN ".$this->db->prefix()."c_paiement as cp ON p.fk_paiement = cp.id";
 						$sql .= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".((int) $object->id);
 						$sql .= " ORDER BY p.datep";
 						$resql = $this->db->query($sql);
@@ -829,7 +834,7 @@ class dolReceiptPrinter extends Printer
 						}
 						break;
 					case 'DOL_VALUE_PLACE':
-							$sql = "SELECT floor, label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $object->ref)));
+							$sql = "SELECT floor, label FROM ".$this->db->prefix()."takepos_floor_tables where rowid=".((int) str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $object->ref)));
 							$resql = $this->db->query($sql);
 							$obj = $this->db->fetch_object($resql);
 						if ($obj) {
@@ -868,10 +873,10 @@ class dolReceiptPrinter extends Printer
 	{
 		global $conf;
 		$error = 0;
-		$sql = 'SELECT template';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-		$sql .= ' WHERE rowid='.$templateid;
-		$sql .= ' AND entity = '.$conf->entity;
+		$sql = "SELECT template";
+		$sql .= " FROM ".$this->db->prefix()."printer_receipt_template";
+		$sql .= " WHERE rowid = ".((int) $templateid);
+		$sql .= " AND entity = ".$conf->entity;
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_array($resql);
@@ -905,10 +910,10 @@ class dolReceiptPrinter extends Printer
 			return;
 		}
 		$error = 0;
-		$sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-		$sql .= ' WHERE rowid = '.((int) $printerid);
-		$sql .= ' AND entity = '.$conf->entity;
+		$sql = "SELECT rowid, name, fk_type, fk_profile, parameter";
+		$sql .= " FROM ".$this->db->prefix()."printer_receipt";
+		$sql .= " WHERE rowid = ".((int) $printerid);
+		$sql .= " AND entity = ".((int) $conf->entity);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_array($resql);
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index bea56d0701b..517fc953830 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -326,9 +326,9 @@ class EmailSenderProfile extends CommonObject
 		global $langs;
 
 		if ($status == 1) {
-			$label = $labelshort = $langs->trans('Enabled');
+			$label = $labelshort = $langs->transnoentitiesnoconv('Enabled');
 		} else {
-			$label = $labelshort = $langs->trans('Disabled');
+			$label = $labelshort = $langs->transnoentitiesnoconv('Disabled');
 		}
 
 		$statusType = 'status'.$status;
@@ -347,36 +347,17 @@ class EmailSenderProfile extends CommonObject
 	 */
 	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 .= " FROM ".$this->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->date_creation     = $this->db->jdate($obj->datec);
 				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
 			}
 
 			$this->db->free($result);
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index c8799ebbd5e..104f1567d44 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -152,7 +152,7 @@ class Events // extends CommonObject
 		}
 
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
+		$sql = "INSERT INTO ".$this->db->prefix()."events(";
 		$sql .= "type,";
 		$sql .= "entity,";
 		$sql .= "ip,";
@@ -175,7 +175,7 @@ class Events // extends CommonObject
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
+			$this->id = $this->db->last_insert_id($this->db->prefix()."events");
 			return $this->id;
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
@@ -202,7 +202,7 @@ class Events // extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
+		$sql = "UPDATE ".$this->db->prefix()."events SET";
 		$sql .= " type='".$this->db->escape($this->type)."',";
 		$sql .= " dateevent='".$this->db->idate($this->dateevent)."',";
 		$sql .= " description='".$this->db->escape($this->description)."'";
@@ -237,7 +237,7 @@ class Events // extends CommonObject
 		$sql .= " t.ip,";
 		$sql .= " t.user_agent,";
 		$sql .= " t.prefix_session";
-		$sql .= " FROM ".MAIN_DB_PREFIX."events as t";
+		$sql .= " FROM ".$this->db->prefix()."events as t";
 		$sql .= " WHERE t.rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -274,7 +274,7 @@ class Events // extends CommonObject
 	 */
 	public function delete($user)
 	{
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
+		$sql = "DELETE FROM ".$this->db->prefix()."events";
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index eccee441921..732be0937d0 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -42,12 +42,6 @@ class ExtraFields
 	 */
 	public $db;
 
-	/**
-	 * @var array Array with type of element (for what object is the extrafield)
-	 * @deprecated
-	 */
-	public $attribute_elementtype;
-
 	/**
 	 * @var array Array with type of the extra field
 	 * @deprecated
@@ -60,90 +54,12 @@ class ExtraFields
 	 */
 	public $attribute_label;
 
-	/**
-	 * @var array Array with size of extra field
-	 * @deprecated
-	 */
-	public $attribute_size;
-
 	/**
 	 * @var array Array with list of possible values for some types of extra fields
 	 * @deprecated
 	 */
 	public $attribute_choice;
 
-	/**
-	 * @var array Array to store compute formula for computed fields
-	 * @deprecated
-	 */
-	public $attribute_computed;
-
-	/**
-	 * @var array Array to store default value
-	 * @deprecated
-	 */
-	public $attribute_default;
-
-	/**
-	 * @var array Array to store if attribute is unique or not
-	 * @deprecated
-	 */
-	public $attribute_unique;
-
-	/**
-	 * @var array Array to store if attribute is required or not
-	 * @deprecated
-	 */
-	public $attribute_required;
-
-	/**
-	 * @var array Array to store parameters of attribute (used in select type)
-	 * @deprecated
-	 */
-	public $attribute_param;
-
-	/**
-	 * @var array Array to store position of attribute
-	 * @deprecated
-	 */
-	public $attribute_pos;
-
-	/**
-	 * @var array Array to store if attribute is editable regardless of the document status
-	 * @deprecated
-	 */
-	public $attribute_alwayseditable;
-
-	/**
-	 * @var array Array to store permission to check
-	 * @deprecated
-	 */
-	public $attribute_perms;
-
-	/**
-	 * @var array Array to store language file to translate label of values
-	 * @deprecated
-	 */
-	public $attribute_langfile;
-
-	/**
-	 * @var array Array to store if field is visible by default on list
-	 * @deprecated
-	 */
-	public $attribute_list;
-
-	/**
-	 * @var array Array to store if field is summable
-	 * @deprecated
-	 */
-	public $attribute_totalizable;
-
-	/**
-	 * @var array Array to store entity id of extrafield
-	 * @deprecated
-	 */
-	public $attribute_entityid;
-
 
 	/**
 	 * @var array New array to store extrafields definition
@@ -203,17 +119,8 @@ class ExtraFields
 		$this->attributes = array();
 
 		// For old usage
-		$this->attribute_elementtype = array();
 		$this->attribute_type = array();
 		$this->attribute_label = array();
-		$this->attribute_size = array();
-		$this->attribute_computed = array();
-		$this->attribute_default = array();
-		$this->attribute_unique = array();
-		$this->attribute_required = array();
-		$this->attribute_perms = array();
-		$this->attribute_langfile = array();
-		$this->attribute_list = array();
 	}
 
 	/**
@@ -238,7 +145,7 @@ class ExtraFields
 	 *  @param  string  		$langfile  		 	Language file
 	 *  @param  string  		$enabled  		 	Condition to have the field enabled or not
 	 *  @param	int				$totalizable		Is a measure. Must show a total on lists
-	 *  @param  int             $printable        Is extrafield displayed on PDF
+	 *  @param  int             $printable          Is extrafield displayed on PDF
 	 *  @return int      							<=0 if KO, >0 if OK
 	 */
 	public function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique = 0, $required = 0, $default_value = '', $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0)
@@ -250,6 +157,8 @@ class ExtraFields
 			return -1;
 		}
 
+		$result = 0;
+
 		if ($type == 'separate') {
 			$unique = 0;
 			$required = 0;
@@ -356,10 +265,10 @@ class ExtraFields
 				'default' => $default_value
 			);
 
-			$result = $this->db->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
+			$result = $this->db->DDLAddField($this->db->prefix().$table, $attrname, $field_desc);
 			if ($result > 0) {
 				if ($unique) {
-					$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
+					$sql = "ALTER TABLE ".$this->db->prefix().$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
 					$resql = $this->db->query($sql, 1, 'dml');
 				}
 				return 1;
@@ -444,7 +353,7 @@ class ExtraFields
 				$params = '';
 			}
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
+			$sql = "INSERT INTO ".$this->db->prefix()."extrafields(";
 			$sql .= " name,";
 			$sql .= " label,";
 			$sql .= " type,";
@@ -538,7 +447,7 @@ class ExtraFields
 
 			if (!$error) {
 				$sql = "SELECT COUNT(rowid) as nb";
-				$sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
+				$sql .= " FROM ".$this->db->prefix()."extrafields";
 				$sql .= " WHERE elementtype = '".$this->db->escape($elementtype)."'";
 				$sql .= " AND name = '".$this->db->escape($attrname)."'";
 				//$sql.= " AND entity IN (0,".$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table
@@ -546,7 +455,7 @@ class ExtraFields
 				if ($resql) {
 					$obj = $this->db->fetch_object($resql);
 					if ($obj->nb <= 0) {
-						$result = $this->db->DDLDropField(MAIN_DB_PREFIX.$table, $attrname); // This also drop the unique key
+						$result = $this->db->DDLDropField($this->db->prefix().$table, $attrname); // This also drop the unique key
 						if ($result < 0) {
 							$this->error = $this->db->lasterror();
 							$this->errors[] = $this->db->lasterror();
@@ -583,7 +492,7 @@ class ExtraFields
 		}
 
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
+			$sql = "DELETE FROM ".$this->db->prefix()."extrafields";
 			$sql .= " WHERE name = '".$this->db->escape($attrname)."'";
 			$sql .= " AND entity IN  (0,".$conf->entity.')';
 			$sql .= " AND elementtype = '".$this->db->escape($elementtype)."'";
@@ -688,7 +597,7 @@ class ExtraFields
 			}
 
 			if ($type != 'separate') { // No table update when separate type
-				$result = $this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
+				$result = $this->db->DDLUpdateField($this->db->prefix().$table, $attrname, $field_desc);
 			}
 			if ($result > 0 || $type == 'separate') {
 				if ($label) {
@@ -697,9 +606,9 @@ class ExtraFields
 				if ($result > 0) {
 					$sql = '';
 					if ($unique) {
-						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
+						$sql = "ALTER TABLE ".$this->db->prefix().$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
 					} else {
-						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX IF EXISTS 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');
@@ -794,20 +703,20 @@ class ExtraFields
 
 			if ($entity === '' || $entity != '0') {
 				// We dont want on all entities, we delete all and current
-				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
+				$sql_del = "DELETE FROM ".$this->db->prefix()."extrafields";
 				$sql_del .= " WHERE name = '".$this->db->escape($attrname)."'";
 				$sql_del .= " AND entity IN (0, ".($entity === '' ? $conf->entity : $entity).")";
 				$sql_del .= " AND elementtype = '".$this->db->escape($elementtype)."'";
 			} else {
 				// We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
-				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
+				$sql_del = "DELETE FROM ".$this->db->prefix()."extrafields";
 				$sql_del .= " WHERE name = '".$this->db->escape($attrname)."'";
 				$sql_del .= " AND entity = 0";
 				$sql_del .= " AND elementtype = '".$this->db->escape($elementtype)."'";
 			}
 			$resql1 = $this->db->query($sql_del);
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
+			$sql = "INSERT INTO ".$this->db->prefix()."extrafields(";
 			$sql .= " name,"; // This is code
 			$sql .= " entity,";
 			$sql .= " label,";
@@ -875,7 +784,7 @@ class ExtraFields
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * 	Load array this->attributes, or old this->attribute_xxx like attribute_label, attribute_type, ...
+	 * 	Load array this->attributes (and some old this->attribute_xxx like attribute_label, attribute_type, ...
 	 *
 	 * 	@param	string		$elementtype		Type of element ('' = all or $object->table_element like 'adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...).
 	 * 	@param	boolean		$forceload			Force load of extra fields whatever is status of cache.
@@ -899,15 +808,12 @@ class ExtraFields
 		if ($elementtype == 'order_supplier') {
 			$elementtype = 'commande_fournisseur';
 		}
-		if ($elementtype == 'stock_mouvement') {
-			$elementtype = 'movement';
-		}
 
 		$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 .= " FROM ".MAIN_DB_PREFIX."extrafields";
+		$sql .= " FROM ".$this->db->prefix()."extrafields";
 		//$sql.= " WHERE entity IN (0,".$conf->entity.")";    // Filter is done later
 		if ($elementtype) {
 			$sql .= " WHERE elementtype = '".$this->db->escape($elementtype)."'"; // Filed with object->table_element
@@ -934,20 +840,6 @@ class ExtraFields
 					// Old usage
 					$this->attribute_type[$tab->name] = $tab->type;
 					$this->attribute_label[$tab->name] = $tab->label;
-					$this->attribute_size[$tab->name] = $tab->size;
-					$this->attribute_elementtype[$tab->name] = $tab->elementtype;
-					$this->attribute_default[$tab->name] = $tab->fielddefault;
-					$this->attribute_computed[$tab->name] = $tab->fieldcomputed;
-					$this->attribute_unique[$tab->name] = $tab->fieldunique;
-					$this->attribute_required[$tab->name] = $tab->fieldrequired;
-					$this->attribute_param[$tab->name] = ($tab->param ? jsonOrUnserialize($tab->param) : '');
-					$this->attribute_pos[$tab->name] = $tab->pos;
-					$this->attribute_alwayseditable[$tab->name] = $tab->alwayseditable;
-					$this->attribute_perms[$tab->name] = (strlen($tab->perms) == 0 ? 1 : $tab->perms);
-					$this->attribute_langfile[$tab->name] = $tab->langs;
-					$this->attribute_list[$tab->name] = $tab->list;
-					$this->attribute_totalizable[$tab->name] = $tab->totalizable;
-					$this->attribute_entityid[$tab->name] = $tab->entity;
 
 					// New usage
 					$this->attributes[$tab->elementtype]['type'][$tab->name] = $tab->type;
@@ -1030,20 +922,11 @@ class ExtraFields
 			$totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
 			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		} else // Old usage
-		{
+		} else {
+			// Old usage
 			$label = $this->attribute_label[$key];
 			$type = $this->attribute_type[$key];
-			$size = $this->attribute_size[$key];
-			$elementtype = $this->attribute_elementtype[$key]; // Seems not used
-			$default = $this->attribute_default[$key];
-			$computed = $this->attribute_computed[$key];
-			$unique = $this->attribute_unique[$key];
-			$required = $this->attribute_required[$key];
-			$param = $this->attribute_param[$key];
-			$langfile = $this->attribute_langfile[$key];
 			$list = $this->attribute_list[$key];
-			$totalizable = $this->attribute_totalizable[$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)
 		}
 
@@ -1256,8 +1139,8 @@ class ExtraFields
 					}
 
 					$sqlwhere = '';
-					$sql = 'SELECT '.$keyList;
-					$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+					$sql = "SELECT ".$keyList;
+					$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];
 					if (!empty($InfoFieldList[4])) {
 						// can use curent entity filter
 						if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {
@@ -1276,17 +1159,17 @@ class ExtraFields
 						}
 						//We have to join on extrafield table
 						if (strpos($InfoFieldList[4], 'extra') !== false) {
-							$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
-							$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
+							$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];
+							$sqlwhere .= " WHERE ".$InfoFieldList[4];
 						}
 					} else {
 						$sqlwhere .= ' WHERE 1=1';
 					}
 					// Some tables may have field, some other not. For the moment we disable it.
 					if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-						$sqlwhere .= ' AND entity = '.$conf->entity;
+						$sqlwhere .= ' AND entity = '.((int) $conf->entity);
 					}
 					$sql .= $sqlwhere;
 					//print $sql;
@@ -1424,8 +1307,8 @@ class ExtraFields
 					}
 
 					$sqlwhere = '';
-					$sql = 'SELECT '.$keyList;
-					$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+					$sql = "SELECT ".$keyList;
+					$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];
 					if (!empty($InfoFieldList[4])) {
 						// can use SELECT request
 						if (strpos($InfoFieldList[4], '$SEL$') !== false) {
@@ -1488,17 +1371,17 @@ class ExtraFields
 
 						// We have to join on extrafield table
 						if (strpos($InfoFieldList[4], 'extra.') !== false) {
-							$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
-							$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
+							$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];
+							$sqlwhere .= " WHERE ".$InfoFieldList[4];
 						}
 					} else {
 						$sqlwhere .= ' WHERE 1=1';
 					}
 					// Some tables may have field, some other not. For the moment we disable it.
 					if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-						$sqlwhere .= ' AND entity = '.$conf->entity;
+						$sqlwhere .= " AND entity = ".((int) $conf->entity);
 					}
 					// $sql.=preg_replace('/^ AND /','',$sqlwhere);
 					// print $sql;
@@ -1607,7 +1490,7 @@ class ExtraFields
 	 * @param   string	$key            		Key of attribute
 	 * @param   string	$value          		Value to show
 	 * @param	string	$moreparam				To add more parameters on html input tag (only checkbox use html input for output rendering)
-	 * @param	string	$extrafieldsobjectkey	If defined (for example $object->table_element), function uses the new method to get extrafields data
+	 * @param	string	$extrafieldsobjectkey	Required (for example $object->table_element).
 	 * @return	string							Formated value
 	 */
 	public function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '')
@@ -1628,22 +1511,10 @@ class ExtraFields
 			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
 			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		} else // Old usage
-		{
-			//dol_syslog("Warning: parameter 'extrafieldsobjectkey' is missing", LOG_WARNING);
-			$label = $this->attribute_label[$key];
-			$type = $this->attribute_type[$key];
-			$size = $this->attribute_size[$key];
-			$default = $this->attribute_default[$key];
-			$computed = $this->attribute_computed[$key];
-			$unique = $this->attribute_unique[$key];
-			$required = $this->attribute_required[$key];
-			$param = $this->attribute_param[$key];
-			$perms = dol_eval($this->attribute_perms[$key], 1);
-			$langfile = $this->attribute_langfile[$key];
-			$list = dol_eval($this->attribute_list[$key], 1);
-			$help = ''; // Not supported with old syntax
-			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+		} else {
+			// Old usage not allowed anymore
+			dol_syslog(get_class($this).'::showOutputField extrafieldsobjectkey required', LOG_WARNING);
+			return '';
 		}
 
 		if ($hidden) {
@@ -1655,10 +1526,14 @@ class ExtraFields
 		$showsize = 0;
 		if ($type == 'date') {
 			$showsize = 10;
-			$value = dol_print_date($value, 'day');	// For date without hour, date is always GMT for storage and output
+			if ($value !== '') {
+				$value = dol_print_date($value, 'day');	// For date without hour, date is always GMT for storage and output
+			}
 		} elseif ($type == 'datetime') {
 			$showsize = 19;
-			$value = dol_print_date($value, 'dayhour', 'tzuserrel');
+			if ($value !== '') {
+				$value = dol_print_date($value, 'dayhour', 'tzuserrel');
+			}
 		} elseif ($type == 'int') {
 			$showsize = 10;
 		} elseif ($type == 'double') {
@@ -1720,9 +1595,9 @@ class ExtraFields
 				}
 			}
 
-			$sql = 'SELECT '.$keyList;
-			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra') !== false) {
+			$sql = "SELECT ".$keyList;
+			$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];
+			if (!empty($InfoFieldList[4]) && strpos($InfoFieldList[4], 'extra') !== false) {
 				$sql .= ' as main';
 			}
 			if ($selectkey == 'rowid' && empty($value)) {
@@ -1824,8 +1699,8 @@ class ExtraFields
 				}
 			}
 
-			$sql = 'SELECT '.$keyList;
-			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+			$sql = "SELECT ".$keyList;
+			$sql .= " FROM ".$this->db->prefix().$InfoFieldList[0];
 			if (strpos($InfoFieldList[4], 'extra') !== false) {
 				$sql .= ' as main';
 			}
@@ -1982,10 +1857,10 @@ class ExtraFields
 	{
 		global $conf, $langs;
 
-		if ($display_type=='card') {
-			$tagtype='tr';
-			$tagtype_dyn='td';
-		} elseif ($display_type=='line') {
+		$tagtype='tr';
+		$tagtype_dyn='td';
+
+		if ($display_type=='line') {
 			$tagtype='div';
 			$tagtype_dyn='span';
 			$colspan=0;
@@ -2073,8 +1948,8 @@ class ExtraFields
 				if (!empty($onlykey) && $onlykey != '@GETPOSTISSET' && $key != $onlykey) {
 					continue;
 				}
-				if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key) && $this->attributes[$object->table_element]['type'][$key] != 'boolean') {
-					//when unticking boolean field, it's not set in POST
+
+				if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key) && (! in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'chkbxlst')))) {
 					continue;
 				}
 
@@ -2084,9 +1959,15 @@ class ExtraFields
 				}
 
 				$enabled = 1;
-				if (isset($this->attributes[$object->table_element]['list'][$key])) {
-					$enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 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);
 				}
+
+				$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);
+				}
+
 				$perms = 1;
 				if (isset($this->attributes[$object->table_element]['perms'][$key])) {
 					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
@@ -2094,6 +1975,9 @@ class ExtraFields
 				if (empty($enabled)) {
 					continue;
 				}
+				if (empty($visibility)) {
+					continue;
+				}
 				if (empty($perms)) {
 					continue;
 				}
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index 45bc622b9db..ea8618c8b92 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -222,7 +222,7 @@ class FileUpload
 	protected function setFileDeleteUrl($file)
 	{
 		$file->delete_url = $this->options['script_url']
-		.'?file='.rawurlencode($file->name).'&fk_element='.$this->fk_element.'&element='.$this->element;
+		.'?file='.urlencode($file->name).'&fk_element='.urlencode($this->fk_element).'&element='.urlencode($this->element);
 		$file->delete_type = $this->options['delete_type'];
 		if ($file->delete_type !== 'DELETE') {
 			$file->delete_url .= '&_method=DELETE';
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 7356e53dc0a..772c67ff282 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -134,7 +134,7 @@ class Fiscalyear extends CommonObject
 
 		$this->db->begin();
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_fiscalyear (";
+		$sql = "INSERT INTO ".$this->db->prefix()."accounting_fiscalyear (";
 		$sql .= "label";
 		$sql .= ", date_start";
 		$sql .= ", date_end";
@@ -147,15 +147,15 @@ class Fiscalyear extends CommonObject
 		$sql .= ", '".$this->db->idate($this->date_start)."'";
 		$sql .= ", ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
 		$sql .= ", 0";
-		$sql .= ", ".$conf->entity;
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ", '".$this->db->idate($now)."'";
-		$sql .= ", ".$user->id;
+		$sql .= ", ".((int) $user->id);
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_fiscalyear");
+			$this->id = $this->db->last_insert_id($this->db->prefix()."accounting_fiscalyear");
 
 			$result = $this->update($user);
 			if ($result > 0) {
@@ -191,7 +191,7 @@ class Fiscalyear extends CommonObject
 
 		$this->db->begin();
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_fiscalyear";
+		$sql = "UPDATE ".$this->db->prefix()."accounting_fiscalyear";
 		$sql .= " SET label = '".$this->db->escape($this->label)."'";
 		$sql .= ", date_start = '".$this->db->idate($this->date_start)."'";
 		$sql .= ", date_end = ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
@@ -221,7 +221,7 @@ class Fiscalyear extends CommonObject
 	public function fetch($id)
 	{
 		$sql = "SELECT rowid, label, date_start, date_end, statut";
-		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear";
+		$sql .= " FROM ".$this->db->prefix()."accounting_fiscalyear";
 		$sql .= " WHERE rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -253,7 +253,7 @@ class Fiscalyear extends CommonObject
 	{
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."accounting_fiscalyear WHERE rowid = ".((int) $id);
+		$sql = "DELETE FROM ".$this->db->prefix()."accounting_fiscalyear WHERE rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -291,7 +291,7 @@ class Fiscalyear extends CommonObject
 
 		$url = DOL_URL_ROOT.'/accountancy/admin/fiscalyear_card.php?id='.$this->id;
 
-		if (!$user->rights->accounting->fiscalyear->write) {
+		if (empty($user->rights->accounting->fiscalyear->write)) {
 			$option = 'nolink';
 		}
 
@@ -414,10 +414,10 @@ 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 .= ' FROM '.MAIN_DB_PREFIX.'accounting_fiscalyear as fy';
-		$sql .= ' WHERE fy.rowid = '.((int) $id);
+		$sql = "SELECT fy.rowid, fy.datec, fy.fk_user_author, fy.fk_user_modif,";
+		$sql .= " fy.tms";
+		$sql .= " FROM ".$this->db->prefix()."accounting_fiscalyear as fy";
+		$sql .= " WHERE fy.rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::fetch info", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -464,7 +464,7 @@ class Fiscalyear extends CommonObject
 		}
 
 		$sql = "SELECT count(DISTINCT piece_num) as nb";
-		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
+		$sql .= " FROM ".$this->db->prefix()."accounting_bookkeeping";
 		$sql .= " WHERE entity IN (".getEntity('bookkeeping', 0).")";
 		$sql .= " AND doc_date >= '".$this->db->idate($datestart)."' and doc_date <= '".$this->db->idate($dateend)."'";
 
@@ -498,7 +498,7 @@ class Fiscalyear extends CommonObject
 		}
 
 		$sql = "SELECT count(rowid) as nb";
-		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
+		$sql .= " FROM ".$this->db->prefix()."accounting_bookkeeping ";
 		$sql .= " WHERE entity IN (".getEntity('bookkeeping', 0).")";
 		$sql .= " AND doc_date >= '".$this->db->idate($datestart)."' and doc_date <= '".$this->db->idate($dateend)."'";
 
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 5e24ee03fa4..a40ec3e30c3 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -111,7 +111,7 @@ class HookManager
 
 				if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks)) {    // We instantiate action class only if initialized hook is handled by module
 					// Include actions class overwriting hooks
-					if (empty($this->hooks[$context][$module]) || !is_object($this->hooks[$context][$module])) {	// If set to an object value, class was already loaded
+					if (empty($this->hooks[$context][$module]) || !is_object($this->hooks[$context][$module])) {	// If set to an object value, class was already loaded so we do nothing.
 						$path = '/'.$module.'/class/';
 						$actionfile = 'actions_'.$module.'.class.php';
 
@@ -146,7 +146,7 @@ class HookManager
 	 *  @param		Object	$object			Object to use hooks on
 	 *  @param		string	$action			Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
 	 *  @return		mixed					For 'addreplace' hooks (doActions, formConfirm, formObjectOptions, pdf_xxx,...): 	Return 0 if we want to keep standard actions, >0 if we want to stop/replace standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
-	 *                                      For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
+	 *                                      For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0 if we want to keep standard actions, >0 uf we want to stop/replace standard actions (at least one > 0 and replacement will be done), <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
 	 *                                      All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.
 	 *                                      $this->error or this->errors are also defined by class called by this function if error.
 	 */
@@ -160,7 +160,7 @@ class HookManager
 		//dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
 
 		// Define type of hook ('output' or 'addreplace').
-		// TODO Remove hooks with type 'output'. All hooks must be converted into 'addreplace' hooks.
+		// TODO Remove hooks with type 'output' (exemple getNomUrl). All hooks must be converted into 'addreplace' hooks.
 		$hooktype = 'output';
 		if (in_array(
 			$method,
@@ -172,6 +172,7 @@ class HookManager
 				'addSearchEntry',
 				'addStatisticLine',
 				'addSectionECMAuto',
+				'checkSecureAccess',
 				'createDictionaryFieldlist',
 				'editDictionaryFieldlist',
 				'getFormMail',
@@ -188,11 +189,13 @@ class HookManager
 				'formConfirm',
 				'getAccessForbiddenMessage',
 				'getDirList',
+				'hookGetEntity',
 				'getFormMail',
 				'getFormatedCustomerRef',
 				'getFormatedSupplierRef',
 				'getIdProfUrl',
 				'getInputIdProf',
+				'menuLeftMenuItems',
 				'moveUploadedFile',
 				'moreHtmlStatus',
 				'pdf_build_address',
@@ -226,7 +229,9 @@ class HookManager
 				'showLinkToObjectBlock',
 				'setContentSecurityPolicy',
 				'setHtmlTitle',
-				'completeTabsHead'
+				'completeTabsHead',
+				'formDolBanner',
+				'displayMarginInfos',
 				)
 		)) {
 			$hooktype = 'addreplace';
@@ -237,6 +242,7 @@ class HookManager
 		$this->resArray = array();
 		$this->resNbOfHooks = 0;
 
+		// Here, the value for $method and $hooktype are given.
 		// Loop on each hook to qualify modules that have declared context
 		$modulealreadyexecuted = array();
 		$resaction = 0;
@@ -260,15 +266,16 @@ class HookManager
 
 					$this->resNbOfHooks++;
 
-					$modulealreadyexecuted[$module] = $module; // Use the $currentcontext in method to avoid running twice
+					$modulealreadyexecuted[$module] = $module;
 
 					// Clean class (an error may have been set from a previous call of another method for same module/hook)
 					$actionclassinstance->error = 0;
 					$actionclassinstance->errors = array();
 
-					dol_syslog(get_class($this)."::executeHooks Qualified hook found (hooktype=".$hooktype."). We call method ".get_class($actionclassinstance).'->'.$method.", context=".$context.", module=".$module.", action=".$action.((is_object($object) && property_exists($object, 'id')) ? ', objectid='.$object->id : ''), LOG_DEBUG);
+					dol_syslog(get_class($this)."::executeHooks Qualified hook found (hooktype=".$hooktype."). We call method ".get_class($actionclassinstance).'->'.$method.", context=".$context.", module=".$module.", action=".$action.((is_object($object) && property_exists($object, 'id')) ? ', object id='.$object->id : '').((is_object($object) && property_exists($object, 'element')) ? ', object element='.$object->element : ''), LOG_DEBUG);
 
 					// Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
+					// Note: The hook can use the $currentcontext in its code to avoid to be ran twice or be ran for one given context only
 					$parameters['currentcontext'] = $context;
 					// Hooks that must return int (hooks with type 'addreplace')
 					if ($hooktype == 'addreplace') {
@@ -305,7 +312,8 @@ class HookManager
 						}
 
 						//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
-						$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
+						$resactiontmp = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
+						$resaction += $resactiontmp;
 
 						if (!empty($actionclassinstance->results) && is_array($actionclassinstance->results)) {
 							$this->resArray = array_merge($this->resArray, $actionclassinstance->results);
@@ -313,23 +321,23 @@ class HookManager
 						if (!empty($actionclassinstance->resprints)) {
 							$this->resPrint .= $actionclassinstance->resprints;
 						}
-						if (is_numeric($resaction) && $resaction < 0) {
+						if (is_numeric($resactiontmp) && $resactiontmp < 0) {
 							$error++;
 							$this->error = $actionclassinstance->error;
 							$this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
 							dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
 						}
-						// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
-						if (!is_array($resaction) && !is_numeric($resaction)) {
+
+						// TODO dead code to remove (do not disable this, but fix your hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
+						if (!is_array($resactiontmp) && !is_numeric($resactiontmp)) {
 							dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
 							if (empty($actionclassinstance->resprints)) {
-								$this->resPrint .= $resaction;
-								$resaction = 0;
+								$this->resPrint .= $resactiontmp;
 							}
 						}
 					}
 
-					//print "After hook  ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
+					//print "After hook context=".$context." ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
 
 					unset($actionclassinstance->results);
 					unset($actionclassinstance->resprints);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 39d53e9dbc7..09225f97158 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2007       Franky Van Liedekerke   <franky.van.liedekerker@telenet.be>
  * Copyright (C) 2007       Patrick Raguin          <patrick.raguin@gmail.com>
  * Copyright (C) 2010       Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2010-2019  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2010-2021  Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2011       Herve Prot              <herve.prot@symeos.com>
  * Copyright (C) 2012-2016  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2012       Cedric Salvador         <csalvador@gpcsolutions.fr>
@@ -165,7 +165,7 @@ class Form
 				$ret .= '<td class="right">';
 			}
 			if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
-				$ret .= '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&amp;'.$paramid.'='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';
+				$ret .= '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&token='.newToken().'&'.$paramid.'='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';
 			}
 			if (!empty($notabletag) && $notabletag == 1) {
 				$ret .= ' : ';
@@ -193,18 +193,18 @@ class Form
 	 * @param	object	$object			Object
 	 * @param	boolean	$perm			Permission to allow button to edit parameter
 	 * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols%', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datepickerhour', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select;xkey:xval,ykey:yval,...')
-	 * @param	string	$editvalue		When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of value). Use '' to use same than $value
+	 * @param	string	$editvalue		When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of numeric value). Use '' to use same than $value
 	 * @param	object	$extObject		External object
 	 * @param	mixed	$custommsg		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
 	 * @param	string	$moreparam		More param to add on the form action href URL
 	 * @param   int     $notabletag     Do no output table tags
-	 * @param	string	$formatfunc		Call a specific function to output field
+	 * @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')
 	 * @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')
 	{
-		global $conf, $langs, $db;
+		global $conf, $langs;
 
 		$ret = '';
 
@@ -214,7 +214,7 @@ class Form
 		}
 
 		// When option to edit inline is activated
-		if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) { // TODO add jquery timepicker and support select
+		if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|day|datepicker|dayhour|datehourpicker/', $typeofdata)) { // TODO add jquery timepicker and support select
 			$ret .= $this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
 		} else {
 			$editmode = (GETPOST('action', 'aZ09') == 'edit'.$htmlname);
@@ -236,7 +236,7 @@ class Form
 				} 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) : '').'"'.($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] : '') . '/>';
@@ -791,7 +791,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'.(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 small'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' '.$name.' '.$name.'confirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
 		$ret .= '</div>';
 
 		if (!empty($conf->use_javascript_ajax)) {
@@ -886,7 +886,7 @@ class Form
 		$atleastonefavorite = 0;
 
 		$sql = "SELECT rowid, code as code_iso, code_iso as code_iso3, label, favorite, eec";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_country";
+		$sql .= " FROM ".$this->db->prefix()."c_country";
 		$sql .= " WHERE active > 0";
 		//$sql.= " ORDER BY code ASC";
 
@@ -958,7 +958,7 @@ class Form
 					if ($row['code_iso']) {
 						$labeltoshow .= ' <span class="opacitymedium">('.$row['code_iso'].')</span>';
 						if (empty($hideflags)) {
-							$tmpflag = picto_from_langcode($row['code_iso'], 'class="saturatemedium paddingrightonly"');
+							$tmpflag = picto_from_langcode($row['code_iso'], 'class="saturatemedium paddingrightonly"', 1);
 							$labeltoshow = $tmpflag.' '.$labeltoshow;
 						}
 					}
@@ -1005,10 +1005,11 @@ class Form
 		$langs->load("dict");
 
 		$out = '';
+		$moreattrib = '';
 		$incotermArray = array();
 
 		$sql = "SELECT rowid, code";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_incoterms";
+		$sql .= " FROM ".$this->db->prefix()."c_incoterms";
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY code ASC";
 
@@ -1056,7 +1057,11 @@ class Form
 			}
 			$out .= '</select>';
 
-			$out .= '<input id="location_incoterms" class="maxwidth100onsmartphone nomargintop nomarginbottom" name="location_incoterms" value="'.$location_incoterms.'">';
+			if ($conf->use_javascript_ajax && empty($disableautocomplete)) {
+				$out .= ajax_multiautocompleter('location_incoterms', '', DOL_URL_ROOT.'/core/ajax/locationincoterms.php')."\n";
+				$moreattrib .= ' autocomplete="off"';
+			}
+			$out .= '<input id="location_incoterms" class="maxwidthonsmartphone type="text" name="location_incoterms" value="'.$location_incoterms.'">'."\n";
 
 			if (!empty($page)) {
 				$out .= '<input type="submit" class="button valignmiddle smallpaddingimp nomargintop nomarginbottom" value="'.$langs->trans("Modify").'"></form>';
@@ -1083,7 +1088,7 @@ class Form
 	public function select_type_of_lines($selected = '', $htmlname = 'type', $showempty = 0, $hidetext = 0, $forceall = 0)
 	{
 		// phpcs:enable
-		global $db, $langs, $user, $conf;
+		global $langs, $conf;
 
 		// If product & services are enabled or both disabled.
 		if ($forceall == 1 || (empty($forceall) && !empty($conf->product->enabled) && !empty($conf->service->enabled))
@@ -1150,7 +1155,7 @@ class Form
 		$langs->load("trips");
 
 		$sql = "SELECT c.code, c.label";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";
+		$sql .= " FROM ".$this->db->prefix()."c_type_fees as c";
 		$sql .= " WHERE active > 0";
 
 		$resql = $this->db->query($sql);
@@ -1264,6 +1269,7 @@ class Form
 				$selected_input_value = $societetmp->name;
 				unset($societetmp);
 			}
+
 			// 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);
@@ -1333,17 +1339,17 @@ class Form
 		}
 
 		// We search companies
-		$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
+		$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.tva_intra, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
 		if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
 			$sql .= ", s.address, s.zip, s.town";
 			$sql .= ", dictp.code as country_code";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."societe as s";
 		if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid = s.fk_pays";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."c_country as dictp ON dictp.rowid = s.fk_pays";
 		}
-		if (!$user->rights->societe->client->voir && !$user->socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE s.entity IN (".getEntity('societe').")";
 		if (!empty($user->socid)) {
@@ -1352,7 +1358,7 @@ class Form
 		if ($filter) {
 			$sql .= " AND (".$filter.")";
 		}
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if (!empty($conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX)) {
@@ -1385,6 +1391,7 @@ class Form
 				$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)."%'";
+			$sql .= " OR s.name_alias LIKE '".$this->db->escape($prefix.$filterkey)."%' OR s.tva_intra LIKE '".$this->db->escape($prefix.$filterkey)."%'";
 			$sql .= ")";
 		}
 		$sql .= $this->db->order("nom", "ASC");
@@ -1396,7 +1403,7 @@ class Form
 		if ($resql) {
 			if (!$forcecombo) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($htmlname, $events, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
+				$out .= ajax_combobox($htmlname, $events, getDolGlobalString("COMPANY_USE_SEARCH_TO_SELECT"));
 			}
 
 			// Construct $out and $outarray
@@ -1438,6 +1445,10 @@ class Form
 						$label .= ' ('.$obj->name_alias.')';
 					}
 
+					if (!empty($conf->global->SOCIETE_SHOW_VAT_IN_LIST) && !empty($obj->tva_intra)) {
+						$label .= ' - '.$obj->tva_intra.'';
+					}
+
 					if ($showtype) {
 						if ($obj->client || $obj->fournisseur) {
 							$label .= ' (';
@@ -1512,7 +1523,7 @@ class Form
 		// On recherche les remises
 		$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
 		$sql .= " re.description, re.fk_facture_source";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";
+		$sql .= " FROM ".$this->db->prefix()."societe_remise_except as re";
 		$sql .= " WHERE re.fk_soc = ".(int) $socid;
 		$sql .= " AND re.entity = ".$conf->entity;
 		if ($filter) {
@@ -1657,9 +1668,9 @@ class Form
 		if ($showsoc > 0 || !empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) {
 			$sql .= ", s.nom as company, s.town AS company_town";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
+		$sql .= " FROM ".$this->db->prefix()."socpeople as sp";
 		if ($showsoc > 0 || !empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) {
-			$sql .= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX."societe as s ON s.rowid=sp.fk_soc";
+			$sql .= " LEFT OUTER JOIN  ".$this->db->prefix()."societe as s ON s.rowid=sp.fk_soc";
 		}
 		$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
 		if ($socid > 0 || $socid == -1) {
@@ -1679,11 +1690,16 @@ class Form
 				$out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.(($num || empty($disableifempty)) ? '' : ' disabled').($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
 			}
 
-			if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) {
-				$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
-			}
-			if ($showempty == 2) {
-				$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
+			if ($showempty && ! is_numeric($showempty)) {
+				$textforempty = $showempty;
+				$out .= '<option class="optiongrey" value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>'.$textforempty.'</option>';
+			} else {
+				if (($showempty == 1 || ($showempty == 3 && $num > 1)) && ! $multiple) {
+					$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
+				}
+				if ($showempty == 2) {
+					$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
+				}
 			}
 
 			$i = 0;
@@ -1807,7 +1823,7 @@ class Form
 
 			if ($conf->use_javascript_ajax && !$forcecombo && !$options_only) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($htmlid, $events, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
+				$out .= ajax_combobox($htmlid, $events, getDolGlobalString("CONTACT_USE_SEARCH_TO_SELECT"));
 			}
 
 			$this->num = $num;
@@ -1906,17 +1922,17 @@ class Form
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {
 			$sql .= ", e.label";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+		$sql .= " FROM ".$this->db->prefix()."user as u";
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid = u.entity";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."entity as e ON e.rowid = u.entity";
 			if ($force_entity) {
 				$sql .= " WHERE u.entity IN (0, ".$this->db->sanitize($force_entity).")";
 			} else {
 				$sql .= " WHERE u.entity IS NOT NULL";
 			}
 		} else {
-			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";
+			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				$sql .= " LEFT JOIN ".$this->db->prefix()."usergroup_user as ug";
 				$sql .= " ON ug.fk_user = u.rowid";
 				$sql .= " WHERE ug.entity = ".$conf->entity;
 			} else {
@@ -2069,7 +2085,7 @@ class Form
 			if ($num) {
 				// Enhance with select2
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($htmlname);
+				$out = ajax_combobox($htmlname).$out;
 			}
 		} else {
 			dol_print_error($this->db);
@@ -2162,7 +2178,7 @@ class Form
 		// Method with no ajax
 		if ($action != 'view') {
 			$out .= '<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';
-			$out .= '<script type="text/javascript" language="javascript">jQuery(document).ready(function () {';
+			$out .= '<script type="text/javascript">jQuery(document).ready(function () {';
 			$out .= 'jQuery(".removedassigned").click(function() { jQuery(".removedassignedhidden").val(jQuery(this).val()); });';
 			$out .= 'jQuery(".assignedtouser").change(function() { console.log(jQuery(".assignedtouser option:selected").val());';
 			$out .= ' if (jQuery(".assignedtouser option:selected").val() > 0) { jQuery("#'.$action.'assignedtouser").attr("disabled", false); }';
@@ -2336,7 +2352,7 @@ class Form
 					$out .= img_picto($langs->trans("Search"), 'search');
 				}
 			}
-			$out .= '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
+			$out .= '<input type="text" class="minwidth100'.($morecss ? ' '.$morecss : '').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
 			if ($hidelabel == 3) {
 				$out .= img_picto($langs->trans("Search"), 'search');
 			}
@@ -2351,6 +2367,69 @@ class Form
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
+	/**
+	 *  Return list of BOM for customer in Ajax if Ajax activated or go to select_produits_list
+	 *
+	 * @param int $selected Preselected BOM id
+	 * @param string $htmlname Name of HTML select field (must be unique in page).
+	 * @param int $limit Limit on number of returned lines
+	 * @param int $status Sell status -1=Return all bom, 0=Draft BOM, 1=Validated BOM
+	 * @param int $type type of the BOM (-1=Return all BOM, 0=Return disassemble BOM, 1=Return manufacturing BOM)
+	 * @param string $showempty '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
+	 * @param string $morecss Add more css on select
+	 * @param string $nooutput No print, return the output into a string
+	 * @param int $forcecombo Force to use combo box
+	 * @return        void|string
+	 */
+	public function select_bom($selected = '', $htmlname = 'bom_id', $limit = 0, $status = 1, $type = 1, $showempty = '1', $morecss = '', $nooutput = '', $forcecombo = 0)
+	{
+		// phpcs:enable
+		global $conf, $user, $langs, $db;
+
+		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+		$error = 0;
+		$out = '';
+
+		if (!$forcecombo) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$out .= ajax_combobox($htmlname, $events, getDolGlobalInt("PRODUIT_USE_SEARCH_TO_SELECT"));
+		}
+
+		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+
+		$sql = 'SELECT b.rowid, b.ref, b.label, b.fk_product';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'bom_bom as b';
+		$sql.= ' WHERE b.entity IN ('.getEntity('bom').')';
+		if (!empty($status)) $sql.= ' AND status = '. (int) $status;
+		if (!empty($type)) $sql.= ' AND status = '. (int) $type;
+		if (!empty($limit)) $sql.= 'LIMIT '. (int) $limit;
+		$resql = $db->query($sql);
+		if ($resql) {
+			if ($showempty)	{
+				$out .= '<option value="-1"';
+				if (empty($selected)) $out .= ' selected';
+				$out .= '>&nbsp;</option>';
+			}
+			while ($obj = $db->fetch_object($resql)) {
+				$product = new Product($db);
+				$res = $product->fetch($obj->fk_product);
+				if ($obj->rowid == $selected) $out .= '<option value="'.$obj->rowid.'" selected>'.$obj->ref.' - '. $product->label .' - '.$obj->label.'</option>';
+				$out .= '<option value="'.$obj->rowid.'">'.$obj->ref.' - '.$product->label .' - '. $obj->label.'</option>';
+			}
+		} else {
+			$error++;
+			dol_print_error($db);
+		}
+		if (empty($nooutput)) {
+			print $out;
+		} else {
+			return $out;
+		}
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of products for a customer.
@@ -2379,7 +2458,7 @@ class Form
 	public function select_produits_list($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $filterkey = '', $status = 1, $finished = 2, $outputmode = 0, $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '')
 	{
 		// phpcs:enable
-		global $langs, $conf, $user, $db;
+		global $langs, $conf;
 
 		$out = '';
 		$outarray = array();
@@ -2403,7 +2482,7 @@ class Form
 			}
 		}
 
-		$selectFields = " p.rowid, p.ref, p.label, p.description, p.barcode, p.fk_country, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.fk_price_expression";
+		$selectFields = " p.rowid, p.ref, p.label, p.description, p.barcode, p.fk_country, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.default_vat_code, p.duration, p.fk_price_expression";
 		if (count($warehouseStatusArray)) {
 			$selectFieldsGrouped = ", sum(".$this->db->ifsql("e.statut IS NULL", "0", "ps.reel").") as stock"; // e.statut is null if there is no record in stock
 		} else {
@@ -2415,9 +2494,9 @@ class Form
 
 		if (!empty($conf->global->PRODUCT_SORT_BY_CATEGORY)) {
 			//Product category
-			$sql .= ", (SELECT ".MAIN_DB_PREFIX."categorie_product.fk_categorie
-						FROM ".MAIN_DB_PREFIX."categorie_product
-						WHERE ".MAIN_DB_PREFIX."categorie_product.fk_product=p.rowid
+			$sql .= ", (SELECT ".$this->db->prefix()."categorie_product.fk_categorie
+						FROM ".$this->db->prefix()."categorie_product
+						WHERE ".$this->db->prefix()."categorie_product.fk_product=p.rowid
 						LIMIT 1
 				) AS categorie_product_id ";
 		}
@@ -2425,8 +2504,8 @@ class Form
 		//Price by customer
 		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
 			$sql .= ', pcp.rowid as idprodcustprice, pcp.price as custprice, pcp.price_ttc as custprice_ttc,';
-			$sql .= ' pcp.price_base_type as custprice_base_type, pcp.tva_tx as custtva_tx, pcp.ref_customer as custref';
-			$selectFields .= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx, custref";
+			$sql .= ' pcp.price_base_type as custprice_base_type, pcp.tva_tx as custtva_tx, pcp.default_vat_code as custdefault_vat_code, pcp.ref_customer as custref';
+			$selectFields .= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx, custdefault_vat_code, custref";
 		}
 		// Units
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
@@ -2443,13 +2522,13 @@ class Form
 		}
 		// Price by quantity
 		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-			$sql .= ", (SELECT pp.rowid FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid";
+			$sql .= ", (SELECT pp.rowid FROM ".$this->db->prefix()."product_price as pp WHERE pp.fk_product = p.rowid";
 			if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
 				$sql .= " AND price_level = ".((int) $price_level);
 			}
 			$sql .= " ORDER BY date_price";
 			$sql .= " DESC LIMIT 1) as price_rowid";
-			$sql .= ", (SELECT pp.price_by_qty FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable
+			$sql .= ", (SELECT pp.price_by_qty FROM ".$this->db->prefix()."product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable
 			if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
 				$sql .= " AND price_level = ".((int) $price_level);
 			}
@@ -2457,45 +2536,45 @@ class Form
 			$sql .= " DESC LIMIT 1) as price_by_qty";
 			$selectFields .= ", price_rowid, price_by_qty";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+		$sql .= " FROM ".$this->db->prefix()."product as p";
 		if (count($warehouseStatusArray)) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_product = p.rowid";
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on ps.fk_entrepot = e.rowid AND e.entity IN (".getEntity('stock').")";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."product_stock as ps on ps.fk_product = p.rowid";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."entrepot as e on ps.fk_entrepot = e.rowid AND e.entity IN (".getEntity('stock').")";
 			$sql .= ' AND e.statut IN ('.$this->db->sanitize($this->db->escape(implode(',', $warehouseStatusArray))).')'; // Return line if product is inside the selected stock. If not, an empty line will be returned so we will count 0.
 		}
 
 		// include search in supplier ref
 		if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
 		}
 
 		//Price by customer
 		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
-			$sql .= " LEFT JOIN  ".MAIN_DB_PREFIX."product_customer_price as pcp ON pcp.fk_soc=".((int) $socid)." AND pcp.fk_product=p.rowid";
+			$sql .= " LEFT JOIN  ".$this->db->prefix()."product_customer_price as pcp ON pcp.fk_soc=".((int) $socid)." AND pcp.fk_product=p.rowid";
 		}
 		// Units
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."c_units u ON u.rowid = p.fk_unit";
 		}
 		// Multilang : we add translation
 		if (!empty($conf->global->MAIN_MULTILANGS)) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid ";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."product_lang as pl ON pl.fk_product = p.rowid ";
 			if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && !empty($socid)) {
 				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-				$soc = new Societe($db);
+				$soc = new Societe($this->db);
 				$result = $soc->fetch($socid);
 				if ($result > 0 && !empty($soc->default_lang)) {
-					$sql .= " AND pl.lang='" . $this->db->escape($soc->default_lang) . "'";
+					$sql .= " AND pl.lang = '".$this->db->escape($soc->default_lang)."'";
 				} else {
-					$sql .= " AND pl.lang='".$this->db->escape($langs->getDefaultLang())."'";
+					$sql .= " AND pl.lang = '".$this->db->escape($langs->getDefaultLang())."'";
 				}
 			} else {
-				$sql .= " AND pl.lang='".$this->db->escape($langs->getDefaultLang())."'";
+				$sql .= " AND pl.lang = '".$this->db->escape($langs->getDefaultLang())."'";
 			}
 		}
 
 		if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
 		}
 
 		$sql .= ' WHERE p.entity IN ('.getEntity('product').')';
@@ -2564,7 +2643,7 @@ class Form
 			$sql .= ')';
 		}
 		if (count($warehouseStatusArray)) {
-			$sql .= ' GROUP BY'.$selectFields;
+			$sql .= " GROUP BY ".$selectFields;
 		}
 
 		//Sort by category
@@ -2592,7 +2671,7 @@ class Form
 
 			if (!$forcecombo) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($htmlname, $events, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT);
+				$out .= ajax_combobox($htmlname, $events, getDolGlobalInt("PRODUIT_USE_SEARCH_TO_SELECT"));
 			}
 
 			$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
@@ -2623,8 +2702,8 @@ class Form
 
 				if ((!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($objp->price_by_qty) && $objp->price_by_qty == 1) { // Price by quantity will return many prices for the same product
 					$sql = "SELECT rowid, quantity, price, unitprice, remise_percent, remise, price_base_type";
-					$sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
-					$sql .= " WHERE fk_product_price=".$objp->price_rowid;
+					$sql .= " FROM ".$this->db->prefix()."product_price_by_qty";
+					$sql .= " WHERE fk_product_price = ".((int) $objp->price_rowid);
 					$sql .= " ORDER BY quantity ASC";
 
 					dol_syslog(get_class($this)."::select_produits_list search prices by qty", LOG_DEBUG);
@@ -2647,6 +2726,9 @@ class Form
 							$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
+
 							$this->constructProductListOption($objp, $opt, $optJson, 0, $selected, $hidepriceinlabel, $filterkey);
 
 							$j++;
@@ -2693,13 +2775,14 @@ class Form
 			}
 			return $outarray;
 		} else {
-			dol_print_error($db);
+			dol_print_error($this->db);
 		}
 	}
 
 	/**
-	 * constructProductListOption.
+	 * Function to forge the string with OPTIONs of SELECT.
 	 * This define value for &$opt and &$optJson.
+	 * This function is called by select_produits_list().
 	 *
 	 * @param 	resource	$objp			    Resultset of fetch
 	 * @param 	string		$opt			    Option (var used for returned value in string option format)
@@ -2713,7 +2796,7 @@ class Form
 	 */
 	protected function constructProductListOption(&$objp, &$opt, &$optJson, $price_level, $selected, $hidepriceinlabel = 0, $filterkey = '', $novirtualstock = 0)
 	{
-		global $langs, $conf, $user, $db;
+		global $langs, $conf, $user;
 
 		$outkey = '';
 		$outval = '';
@@ -2729,6 +2812,7 @@ class Form
 		$outprice_ttc = '';
 		$outpricebasetype = '';
 		$outtva_tx = '';
+		$outdefault_vat_code = '';
 		$outqty = 1;
 		$outdiscount = 0;
 
@@ -2855,10 +2939,10 @@ class Form
 		$found = 0;
 
 		// Multiprice
-		// If we need a particular price level (from 1 to 6)
+		// If we need a particular price level (from 1 to n)
 		if (empty($hidepriceinlabel) && $price_level >= 1 && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) {
-			$sql = "SELECT price, price_ttc, price_base_type, tva_tx";
-			$sql .= " FROM ".MAIN_DB_PREFIX."product_price";
+			$sql = "SELECT price, price_ttc, price_base_type, tva_tx, default_vat_code";
+			$sql .= " FROM ".$this->db->prefix()."product_price";
 			$sql .= " WHERE fk_product = ".((int) $objp->rowid);
 			$sql .= " AND entity IN (".getEntity('productprice').")";
 			$sql .= " AND price_level = ".((int) $price_level);
@@ -2881,7 +2965,13 @@ class Form
 					$outprice_ht = price($objp2->price);
 					$outprice_ttc = price($objp2->price_ttc);
 					$outpricebasetype = $objp2->price_base_type;
-					$outtva_tx = $objp2->tva_tx;
+					if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {  // using this option is a bug. kept for backward compatibility
+						$outtva_tx = $objp2->tva_tx;						// We use the vat rate on line of multiprice
+						$outdefault_vat_code = $objp2->default_vat_code;	// We use the vat code on line of multiprice
+					} else {
+						$outtva_tx = $objp->tva_tx;							// We use the vat rate of product, not the one on line of multiprice
+						$outdefault_vat_code = $objp->default_vat_code;		// We use the vat code or product, not the one on line of multiprice
+					}
 				}
 			} else {
 				dol_print_error($this->db);
@@ -2908,7 +2998,8 @@ class Form
 			$outprice_ht = price($objp->unitprice);
 			$outprice_ttc = price($objp->unitprice * (1 + ($objp->tva_tx / 100)));
 			$outpricebasetype = $objp->price_base_type;
-			$outtva_tx = $objp->tva_tx;
+			$outtva_tx = $objp->tva_tx;							// This value is the value on product when constructProductListOption is called by select_produits_list even if other field $objp-> are from table price_by_qty
+			$outdefault_vat_code = $objp->default_vat_code;		// This value is the value on product when constructProductListOption is called by select_produits_list even if other field $objp-> are from table price_by_qty
 		}
 		if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1) {
 			$opt .= " (".price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit").")"; // Do not use strtolower because it breaks utf8 encoding
@@ -2936,6 +3027,7 @@ class Form
 				$outprice_ttc = price($objp->custprice_ttc);
 				$outpricebasetype = $objp->custprice_base_type;
 				$outtva_tx = $objp->custtva_tx;
+				$outdefault_vat_code = $objp->custdefault_vat_code;
 			}
 		}
 
@@ -2952,6 +3044,7 @@ class Form
 			$outprice_ttc = price($objp->price_ttc);
 			$outpricebasetype = $objp->price_base_type;
 			$outtva_tx = $objp->tva_tx;
+			$outdefault_vat_code = $objp->default_vat_code;
 		}
 
 		if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))) {
@@ -3000,7 +3093,9 @@ class Form
 			'price_ht'=>price2num($outprice_ht),
 			'price_ttc'=>price2num($outprice_ttc),
 			'pricebasetype'=>$outpricebasetype,
-			'tva_tx'=>$outtva_tx, 'qty'=>$outqty,
+			'tva_tx'=>$outtva_tx,
+			'default_vat_code'=>$outdefault_vat_code,
+			'qty'=>$outqty,
 			'discount'=>$outdiscount,
 			'duration_value'=>$outdurationvalue,
 			'duration_unit'=>$outdurationunit,
@@ -3078,7 +3173,7 @@ class Form
 	public function select_produits_fournisseurs_list($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $filterkey = '', $statut = -1, $outputmode = 0, $limit = 100, $alsoproductwithnosupplierprice = 0, $morecss = '', $showstockinlist = 0, $placeholder = '')
 	{
 		// phpcs:enable
-		global $langs, $conf, $db, $user;
+		global $langs, $conf, $user;
 
 		$out = '';
 		$outarray = array();
@@ -3093,7 +3188,7 @@ class Form
 
 		$sql = "SELECT p.rowid, p.ref, p.label, p.price, p.duration, p.fk_product_type, p.stock,";
 		$sql .= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";
-		$sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.fk_soc, s.nom as name,";
+		$sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.default_vat_code, pfp.fk_soc, s.nom as name,";
 		$sql .= " pfp.supplier_reputation";
 		// if we use supplier description of the products
 		if (!empty($conf->global->PRODUIT_FOURN_TEXTS)) {
@@ -3108,15 +3203,15 @@ class Form
 		if (!empty($conf->barcode->enabled)) {
 			$sql .= ", pfp.barcode";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON ( p.rowid = pfp.fk_product AND pfp.entity IN (".getEntity('product').") )";
+		$sql .= " FROM ".$this->db->prefix()."product as p";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."product_fournisseur_price as pfp ON ( p.rowid = pfp.fk_product AND pfp.entity IN (".getEntity('product').") )";
 		if ($socid > 0) {
 			$sql .= " AND pfp.fk_soc = ".((int) $socid);
 		}
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."societe as s ON pfp.fk_soc = s.rowid";
 		// Units
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."c_units u ON u.rowid = p.fk_unit";
 		}
 		$sql .= " WHERE p.entity IN (".getEntity('product').")";
 		if ($statut != -1) {
@@ -3248,7 +3343,7 @@ class Form
 
 				$optlabel = $objp->ref;
 				if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn)) {
-					$optlabel .= ' <span class=\'opacitymedium\'>('.$objp->ref_fourn.')</span>';
+					$optlabel .= ' <span class="opacitymedium">('.$objp->ref_fourn.')</span>';
 				}
 				if (!empty($conf->barcode->enabled) && !empty($objp->barcode)) {
 					$optlabel .= ' ('.$outbarcode.')';
@@ -3378,7 +3473,7 @@ class Form
 					$opt .= ' disabled';
 				}
 				if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0) {
-					$opt .= ' data-qty="'.$objp->quantity.'" data-up="'.$objp->unitprice.'" data-discount="'.$outdiscount.'"';
+					$opt .= ' data-product-id="'.$objp->rowid.'" data-price-id="'.$objp->idprodfournprice.'" data-qty="'.$objp->quantity.'" data-up="'.$objp->unitprice.'" data-discount="'.$outdiscount.'"';
 				}
 				$opt .= ' data-description="'.dol_escape_htmltag($objp->description, 0, 1).'"';
 				$opt .= ' data-html="'.dol_escape_htmltag($optlabel).'"';
@@ -3389,7 +3484,6 @@ class Form
 
 				$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
@@ -3400,7 +3494,11 @@ class Form
 						'value'=>$outref,
 						'label'=>$outval,
 						'qty'=>$outqty,
-						'price_ht'=>price2num($objp->unitprice, 'MT'),
+						'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,
@@ -3455,9 +3553,9 @@ class Form
 		$sql = "SELECT p.rowid, p.ref, p.label, p.price, p.duration, pfp.fk_soc,";
 		$sql .= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.remise_percent, pfp.quantity, pfp.unitprice,";
 		$sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, s.nom as name";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
+		$sql .= " FROM ".$this->db->prefix()."product as p";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."societe as s ON pfp.fk_soc = s.rowid";
 		$sql .= " WHERE pfp.entity IN (".getEntity('productsupplierprice').")";
 		$sql .= " AND p.tobuy = 1";
 		$sql .= " AND s.fournisseur = 1";
@@ -3553,7 +3651,7 @@ class Form
 		// phpcs:enable
 		// looking for users
 		$sql = "SELECT a.rowid, a.label";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe_address as a";
+		$sql .= " FROM ".$this->db->prefix()."societe_address as a";
 		$sql .= " WHERE a.fk_soc = ".((int) $socid);
 		$sql .= " ORDER BY a.label ASC";
 
@@ -3605,7 +3703,7 @@ class Form
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$sql = "SELECT rowid, code, libelle as label";
-		$sql .= " FROM ".MAIN_DB_PREFIX.'c_payment_term';
+		$sql .= " FROM ".$this->db->prefix().'c_payment_term';
 		$sql .= " WHERE entity IN (".getEntity('c_payment_term').")";
 		$sql .= " AND active > 0";
 		$sql .= " ORDER BY sortorder";
@@ -3635,7 +3733,7 @@ class Form
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *      Charge dans cache la liste des délais de livraison possibles
+	 *      Load int a cache property th elist of possible delivery delays.
 	 *
 	 *      @return     int             Nb of lines loaded, <0 if KO
 	 */
@@ -3644,7 +3742,7 @@ class Form
 		// phpcs:enable
 		global $langs;
 
-		$num = count($this->cache_availability);
+		$num = count($this->cache_availability);	// TODO Use $conf->cache['availability'] instead of $this->cache_availability
 		if ($num > 0) {
 			return 0; // Cache already loaded
 		}
@@ -3654,7 +3752,7 @@ class Form
 		$langs->load('propal');
 
 		$sql = "SELECT rowid, code, label, position";
-		$sql .= " FROM ".MAIN_DB_PREFIX.'c_availability';
+		$sql .= " FROM ".$this->db->prefix().'c_availability';
 		$sql .= " WHERE active > 0";
 
 		$resql = $this->db->query($sql);
@@ -3728,13 +3826,13 @@ class Form
 	{
 		global $langs;
 
-		$num = count($this->cache_demand_reason);
+		$num = count($this->cache_demand_reason);	// TODO Use $conf->cache['input_reason'] instead of $this->cache_demand_reason
 		if ($num > 0) {
 			return 0; // Cache already loaded
 		}
 
 		$sql = "SELECT rowid, code, label";
-		$sql .= " FROM ".MAIN_DB_PREFIX.'c_input_reason';
+		$sql .= " FROM ".$this->db->prefix().'c_input_reason';
 		$sql .= " WHERE active > 0";
 
 		$resql = $this->db->query($sql);
@@ -3824,7 +3922,7 @@ class Form
 		// phpcs:enable
 		global $langs;
 
-		$num = count($this->cache_types_paiements);
+		$num = count($this->cache_types_paiements);		// TODO Use $conf->cache['payment_mode'] instead of $this->cache_types_paiements
 		if ($num > 0) {
 			return $num; // Cache already loaded
 		}
@@ -3834,7 +3932,7 @@ class Form
 		$this->cache_types_paiements = array();
 
 		$sql = "SELECT id, code, libelle as label, type, active";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_paiement";
+		$sql .= " FROM ".$this->db->prefix()."c_paiement";
 		$sql .= " WHERE entity IN (".getEntity('c_paiement').")";
 
 		$resql = $this->db->query($sql);
@@ -3865,6 +3963,26 @@ 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.
+	 *
+	 *      @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
+	 */
+	public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '')
+	{
+		// phpcs:enable
+		print $this->getSelectConditionsPaiements($selected, $htmlname, $filtertype, $addempty, $noinfoadmin, $morecss);
+	}
+
+
 	/**
 	 *      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.
@@ -3874,15 +3992,15 @@ class Form
 	 *      @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
+	 * 		@param	int		$noinfoadmin	0=Add admin info, 1=Disable admin info
+	 * 		@param	string	$morecss		Add more CSS on select tag
 	 *		@return	void
 	 */
-	public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '')
+	public function getSelectConditionsPaiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '')
 	{
-		// phpcs:enable
-		global $langs, $user, $conf;
 
+		global $langs, $user, $conf;
+		$out = '';
 		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
 
 		$this->load_cache_conditions_paiements();
@@ -3892,24 +4010,25 @@ class Form
 			$selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
 		}
 
-		print '<select id="'.$htmlname.'" class="flat selectpaymentterms'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
+		$out.=  '<select id="'.$htmlname.'" class="flat selectpaymentterms'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
 		if ($addempty) {
-			print '<option value="0">&nbsp;</option>';
+			$out.=  '<option value="0">&nbsp;</option>';
 		}
 		foreach ($this->cache_conditions_paiements as $id => $arrayconditions) {
 			if ($selected == $id) {
-				print '<option value="'.$id.'" selected>';
+				$out.=  '<option value="'.$id.'" selected>';
 			} else {
-				print '<option value="'.$id.'">';
+				$out.=  '<option value="'.$id.'">';
 			}
-			print $arrayconditions['label'];
-			print '</option>';
+			$out.=  $arrayconditions['label'];
+			$out.=  '</option>';
 		}
-		print '</select>';
+		$out.=  '</select>';
 		if ($user->admin && empty($noinfoadmin)) {
-			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			$out.=  info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
-		print ajax_combobox($htmlname);
+		$out.=  ajax_combobox($htmlname);
+		return $out;
 	}
 
 
@@ -3927,13 +4046,16 @@ class Form
 	 *      @param  int		$maxlength      Max length of label
 	 *      @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
 	 */
-	public function select_types_paiements($selected = '', $htmlname = 'paiementtype', $filtertype = '', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '')
+	public function select_types_paiements($selected = '', $htmlname = 'paiementtype', $filtertype = '', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '', $nooutput = 0)
 	{
 		// phpcs:enable
 		global $langs, $user, $conf;
 
+		$out = '';
+
 		dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
 
 		$filterarray = array();
@@ -3952,9 +4074,9 @@ class Form
 			$selected = $conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID;
 		}
 
-		print '<select id="select'.$htmlname.'" class="flat selectpaymenttypes'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
+		$out .= '<select id="select'.$htmlname.'" class="flat selectpaymenttypes'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
 		if ($empty) {
-			print '<option value="">&nbsp;</option>';
+			$out .= '<option value="">&nbsp;</option>';
 		}
 		foreach ($this->cache_types_paiements as $id => $arraytypes) {
 			// If not good status
@@ -3973,25 +4095,25 @@ class Form
 			}
 
 			if ($format == 0) {
-				print '<option value="'.$id.'"';
+				$out .= '<option value="'.$id.'"';
 			} elseif ($format == 1) {
-				print '<option value="'.$arraytypes['code'].'"';
+				$out .= '<option value="'.$arraytypes['code'].'"';
 			} elseif ($format == 2) {
-				print '<option value="'.$arraytypes['code'].'"';
+				$out .= '<option value="'.$arraytypes['code'].'"';
 			} elseif ($format == 3) {
-				print '<option value="'.$id.'"';
+				$out .= '<option value="'.$id.'"';
 			}
 			// Print attribute selected or not
 			if ($format == 1 || $format == 2) {
 				if ($selected == $arraytypes['code']) {
-					print ' selected';
+					$out .= ' selected';
 				}
 			} else {
 				if ($selected == $id) {
-					print ' selected';
+					$out .= ' selected';
 				}
 			}
-			print '>';
+			$out .= '>';
 			if ($format == 0) {
 				$value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
 			} elseif ($format == 1) {
@@ -4001,14 +4123,20 @@ class Form
 			} elseif ($format == 3) {
 				$value = $arraytypes['code'];
 			}
-			print $value ? $value : '&nbsp;';
-			print '</option>';
+			$out .= $value ? $value : '&nbsp;';
+			$out .= '</option>';
 		}
-		print '</select>';
+		$out .= '</select>';
 		if ($user->admin && !$noadmininfo) {
-			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
+		$out .= ajax_combobox('select'.$htmlname);
+
+		if (empty($nooutput)) {
+			print $out;
+		} else {
+			return $out;
 		}
-		print ajax_combobox('select'.$htmlname);
 	}
 
 
@@ -4056,7 +4184,7 @@ class Form
 		// phpcs:enable
 		global $langs;
 
-		$num = count($this->cache_transport_mode);
+		$num = count($this->cache_transport_mode);		// TODO Use $conf->cache['payment_mode'] instead of $this->cache_transport_mode
 		if ($num > 0) {
 			return $num; // Cache already loaded
 		}
@@ -4066,7 +4194,7 @@ class Form
 		$this->cache_transport_mode = array();
 
 		$sql = "SELECT rowid, code, label, active";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_transport_mode";
+		$sql .= " FROM ".$this->db->prefix()."c_transport_mode";
 		$sql .= " WHERE entity IN (".getEntity('c_transport_mode').")";
 
 		$resql = $this->db->query($sql);
@@ -4184,7 +4312,7 @@ class Form
 		$langs->load("deliveries");
 
 		$sql = "SELECT rowid, code, libelle as label";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode";
+		$sql .= " FROM ".$this->db->prefix()."c_shipment_mode";
 		$sql .= " WHERE active > 0";
 		if ($filtre) {
 			$sql .= " AND ".$filtre;
@@ -4237,7 +4365,7 @@ class Form
 	 */
 	public function formSelectShippingMethod($page, $selected = '', $htmlname = 'shipping_method_id', $addempty = 0)
 	{
-		global $langs, $db;
+		global $langs;
 
 		$langs->load("deliveries");
 
@@ -4250,7 +4378,7 @@ class Form
 			print '</form>';
 		} else {
 			if ($selected) {
-				$code = $langs->getLabelFromKey($db, $selected, 'c_shipment_mode', 'rowid', 'code');
+				$code = $langs->getLabelFromKey($this->db, $selected, 'c_shipment_mode', 'rowid', 'code');
 				print $langs->trans("SendingMethod".strtoupper($code));
 			} else {
 				print "&nbsp;";
@@ -4272,9 +4400,9 @@ class Form
 
 		$langs->load('bills');
 
-		$opt = '<option value ="" selected></option>';
-		$sql = 'SELECT rowid, ref, situation_cycle_ref, situation_counter, situation_final, fk_soc';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture';
+		$opt = '<option value="" selected></option>';
+		$sql = "SELECT rowid, ref, situation_cycle_ref, situation_counter, situation_final, fk_soc";
+		$sql .= ' FROM '.$this->db->prefix().'facture';
 		$sql .= ' WHERE entity IN ('.getEntity('invoice').')';
 		$sql .= ' AND situation_counter >= 1';
 		$sql .= ' AND fk_soc = '.(int) $socid;
@@ -4329,11 +4457,12 @@ class Form
 
 		$return = '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
 
-		$sql = 'SELECT rowid, label, code from '.MAIN_DB_PREFIX.'c_units';
+		$sql = "SELECT rowid, label, code FROM ".$this->db->prefix()."c_units";
 		$sql .= ' WHERE active > 0';
 		if (!empty($unit_type)) {
 			$sql .= " AND unit_type = '".$this->db->escape($unit_type)."'";
 		}
+		$sql .= " ORDER BY sortorder";
 
 		$resql = $this->db->query($sql);
 		if ($resql && $this->db->num_rows($resql) > 0) {
@@ -4384,7 +4513,7 @@ class Form
 		$num = 0;
 
 		$sql = "SELECT rowid, label, bank, clos as status, currency_code";
-		$sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
+		$sql .= " FROM ".$this->db->prefix()."bank_account";
 		$sql .= " WHERE entity IN (".getEntity('bank_account').")";
 		if ($status != 2) {
 			$sql .= " AND clos = ".(int) $status;
@@ -4458,14 +4587,13 @@ class Form
 	 */
 	public function selectEstablishments($selected = '', $htmlname = 'entity', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '')
 	{
-		// phpcs:enable
 		global $langs, $conf;
 
 		$langs->load("admin");
 		$num = 0;
 
 		$sql = "SELECT rowid, name, fk_country, status, entity";
-		$sql .= " FROM ".MAIN_DB_PREFIX."establishment";
+		$sql .= " FROM ".$this->db->prefix()."establishment";
 		$sql .= " WHERE 1=1";
 		if ($status != 2) {
 			$sql .= " AND status = ".(int) $status;
@@ -4587,7 +4715,7 @@ class Form
 			// TODO Move this into common category feature
 			$cate_arbo = array();
 			$sql = "SELECT c.label, c.rowid";
-			$sql .= " FROM ".MAIN_DB_PREFIX."bank_categ as c";
+			$sql .= " FROM ".$this->db->prefix()."bank_categ as c";
 			$sql .= " WHERE entity = ".$conf->entity;
 			$sql .= " ORDER BY c.label";
 			$result = $this->db->query($sql);
@@ -4714,7 +4842,7 @@ class Form
 			foreach ($formquestion as $key => $input) {
 				if (is_array($input) && !empty($input)) {
 					if ($input['type'] == 'hidden') {
-						$more .= '<input type="hidden" id="'.$input['name'].'" name="'.$input['name'].'" value="'.dol_escape_htmltag($input['value']).'">'."\n";
+						$more .= '<input type="hidden" id="'.dol_escape_htmltag($input['name']).'" name="'.dol_escape_htmltag($input['name']).'" value="'.dol_escape_htmltag($input['value']).'">'."\n";
 					}
 				}
 			}
@@ -4729,9 +4857,21 @@ class Form
 					$morecss = (!empty($input['morecss']) ? ' '.$input['morecss'] : '');
 
 					if ($input['type'] == 'text') {
-						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div><div class="tagtd"><input type="text" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></div></div>'."\n";
+						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div><div class="tagtd"><input type="text" class="flat'.$morecss.'" id="'.dol_escape_htmltag($input['name']).'" name="'.dol_escape_htmltag($input['name']).'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></div></div>'."\n";
 					} elseif ($input['type'] == 'password')	{
-						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div><div class="tagtd"><input type="password" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></div></div>'."\n";
+						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div><div class="tagtd"><input type="password" class="flat'.$morecss.'" id="'.dol_escape_htmltag($input['name']).'" name="'.dol_escape_htmltag($input['name']).'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></div></div>'."\n";
+					} elseif ($input['type'] == 'textarea') {
+						/*$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div><div class="tagtd">';
+						$more .= '<textarea name="'.$input['name'].'" class="'.$morecss.'"'.$moreattr.'>';
+						$more .= $input['value'];
+						$more .= '</textarea>';
+						$more .= '</div></div>'."\n";*/
+						$moreonecolumn .= '<div class="margintoponly">';
+						$moreonecolumn .= $input['label'].'<br>';
+						$moreonecolumn .= '<textarea name="'.dol_escape_htmltag($input['name']).'" id="'.dol_escape_htmltag($input['name']).'" class="'.$morecss.'"'.$moreattr.'>';
+						$moreonecolumn .= $input['value'];
+						$moreonecolumn .= '</textarea>';
+						$moreonecolumn .= '</div>';
 					} elseif ($input['type'] == 'select') {
 						if (empty($morecss)) {
 							$morecss = 'minwidth100';
@@ -4754,7 +4894,7 @@ class Form
 					} 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="'.$input['name'].'" name="'.$input['name'].'"'.$moreattr;
+						$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') {
 							$more .= ' checked';
 						}
@@ -4775,7 +4915,7 @@ class Form
 							} else {
 								$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="'.$input['name'].$selkey.'" name="'.$input['name'].'" value="'.$selkey.'"'.$moreattr;
+							$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']) {
 								$more .= ' disabled';
 							}
@@ -4783,14 +4923,15 @@ class Form
 								$more .= ' checked="checked"';
 							}
 							$more .= ' /> ';
-							$more .= '<label for="'.$input['name'].$selkey.'">'.$selval.'</label>';
+							$more .= '<label for="'.dol_escape_htmltag($input['name'].$selkey).'">'.$selval.'</label>';
 							$more .= '</div></div>'."\n";
 							$i++;
 						}
 					} elseif ($input['type'] == 'date') {
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div>';
 						$more .= '<div class="tagtd">';
-						$more .= $this->selectDate($input['value'], $input['name'], 0, 0, 0, '', 1, 0);
+						$addnowlink = (empty($input['datenow']) ? 0 : 1);
+						$more .= $this->selectDate($input['value'], $input['name'], 0, 0, 0, '', 1, $addnowlink);
 						$more .= '</div></div>'."\n";
 						$formquestion[] = array('name'=>$input['name'].'day');
 						$formquestion[] = array('name'=>$input['name'].'month');
@@ -4819,7 +4960,7 @@ class Form
 			$more .= $moreonecolumn;
 		}
 
-		// JQUI method dialog is broken with jmobile, we use standard HTML.
+		// JQUERY method dialog is broken with smartphone, we use standard HTML.
 		// Note: When using dol_use_jmobile or no js, you must also check code for button use a GET url with action=xxx and check that you also output the confirm code when action=xxx
 		// See page product/card.php for example
 		if (!empty($conf->dol_use_jmobile)) {
@@ -4872,8 +5013,9 @@ class Form
 			$formconfirm .= ($question ? '<div class="confirmmessage">'.img_help('', '').' '.$question.'</div>' : '');
 			$formconfirm .= '</div>'."\n";
 
-			$formconfirm .= "\n<!-- begin ajax formconfirm page=".$page." -->\n";
+			$formconfirm .= "\n<!-- begin code of popup for formconfirm page=".$page." -->\n";
 			$formconfirm .= '<script type="text/javascript">'."\n";
+			$formconfirm .= "/* Code for the jQuery('#dialogforpopup').dialog() */\n";
 			$formconfirm .= 'jQuery(document).ready(function() {
             $(function() {
             	$( "#'.$dialogconfirm.'" ).dialog(
@@ -4907,7 +5049,7 @@ class Form
                          				inputvalue = $("#" + inputname + more).val();
 									}
                          			if (typeof inputvalue == "undefined") { inputvalue=""; }
-									console.log("check inputname="+inputname+" inputvalue="+inputvalue);
+									console.log("formconfirm check inputname="+inputname+" inputvalue="+inputvalue);
                          			options += "&" + inputname + "=" + encodeURIComponent(inputvalue);
                          		});
                          	}
@@ -4992,7 +5134,7 @@ class Form
 			}
 			$formconfirm .= '<br>';
 
-			if (empty($conf->use_javascript_ajax)) {
+			if (!empty($conf->use_javascript_ajax)) {
 				$formconfirm .= '<!-- code to disable button to avoid double clic -->';
 				$formconfirm .= '<script type="text/javascript">'."\n";
 				$formconfirm .= '
@@ -5055,8 +5197,7 @@ class Form
 			if ($selected) {
 				$projet = new Project($this->db);
 				$projet->fetch($selected);
-				//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
-				$out .= $projet->getNomUrl(0, '', 1);
+				$out .= $projet->getNomUrl(1, '', 1);
 			} else {
 				$out .= "&nbsp;";
 			}
@@ -5077,17 +5218,21 @@ class Form
 	 *  @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')
 	 *  @return	void
 	 */
-	public function form_conditions_reglement($page, $selected = '', $htmlname = 'cond_reglement_id', $addempty = 0)
+	public function form_conditions_reglement($page, $selected = '', $htmlname = 'cond_reglement_id', $addempty = 0, $type = '')
 	{
 		// phpcs:enable
 		global $langs;
 		if ($htmlname != "none") {
-			print '<form method="post" action="'.$page.'">';
+			print '<form method="POST" action="'.$page.'">';
 			print '<input type="hidden" name="action" value="setconditions">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
-			$this->select_conditions_paiements($selected, $htmlname, -1, $addempty);
+			if ($type) {
+				print '<input type="hidden" name="type" value="'.dol_escape_htmltag($type).'">';
+			}
+			$this->select_conditions_paiements($selected, $htmlname, -1, $addempty, 0, '');
 			print '<input type="submit" class="button valignmiddle smallpaddingimp" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
@@ -5124,7 +5269,8 @@ class Form
 			print '<input type="hidden" name="action" value="setavailability">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			$this->selectAvailabilityDelay($selected, $htmlname, -1, $addempty);
-			print '<input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';
+			print '<input type="submit" name="modify" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';
+			print '<input type="submit" name="cancel" class="button smallpaddingimp" value="'.$langs->trans("Cancel").'">';
 			print '</form>';
 		} else {
 			if ($selected) {
@@ -5181,10 +5327,11 @@ class Form
 	 *    @param    int			$displayhour 	Display hour selector
 	 *    @param    int			$displaymin		Display minutes selector
 	 *    @param	int			$nooutput		1=No print output, return string
+	 *    @param	string		$type			'direct-debit' or 'bank-transfer'
 	 *    @return	string
 	 *    @see		selectDate()
 	 */
-	public function form_date($page, $selected, $htmlname, $displayhour = 0, $displaymin = 0, $nooutput = 0)
+	public function form_date($page, $selected, $htmlname, $displayhour = 0, $displaymin = 0, $nooutput = 0, $type = '')
 	{
 		// phpcs:enable
 		global $langs;
@@ -5192,9 +5339,12 @@ class Form
 		$ret = '';
 
 		if ($htmlname != "none") {
-			$ret .= '<form method="post" action="'.$page.'" name="form'.$htmlname.'">';
+			$ret .= '<form method="POST" action="'.$page.'" name="form'.$htmlname.'">';
 			$ret .= '<input type="hidden" name="action" value="set'.$htmlname.'">';
 			$ret .= '<input type="hidden" name="token" value="'.newToken().'">';
+			if ($type) {
+				$ret .= '<input type="hidden" name="type" value="'.dol_escape_htmltag($type).'">';
+			}
 			$ret .= '<table class="nobordernopadding">';
 			$ret .= '<tr><td>';
 			$ret .= $this->selectDate($selected, $htmlname, $displayhour, $displaymin, 1, 'form'.$htmlname, 1, 0);
@@ -5259,12 +5409,13 @@ class Form
 	 *    @param	string	$page        	Page
 	 *    @param    int		$selected    	Id mode pre-selectionne
 	 *    @param    string	$htmlname    	Name of select html field
-	 *    @param  	string	$filtertype		To filter on field type in llx_c_paiement (array('code'=>xx,'label'=>zz))
+	 *    @param  	string	$filtertype		To filter on field type in llx_c_paiement ('CRDT' or 'DBIT' or array('code'=>xx,'label'=>zz))
 	 *    @param    int     $active         Active or not, -1 = all
-	 *    @param   int     $addempty       1=Add empty entry
+	 *    @param   	int     $addempty       1=Add empty entry
+	 *    @param	string	$type			Type ('direct-debit' or 'bank-transfer')
 	 *    @return	void
 	 */
-	public function form_modes_reglement($page, $selected = '', $htmlname = 'mode_reglement_id', $filtertype = '', $active = 1, $addempty = 0)
+	public function form_modes_reglement($page, $selected = '', $htmlname = 'mode_reglement_id', $filtertype = '', $active = 1, $addempty = 0, $type = '')
 	{
 		// phpcs:enable
 		global $langs;
@@ -5272,7 +5423,10 @@ class Form
 			print '<form method="POST" action="'.$page.'">';
 			print '<input type="hidden" name="action" value="setmode">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
-			$this->select_types_paiements($selected, $htmlname, $filtertype, 0, $addempty, 0, 0, $active);
+			if ($type) {
+				print '<input type="hidden" name="type" value="'.dol_escape_htmltag($type).'">';
+			}
+			print $this->select_types_paiements($selected, $htmlname, $filtertype, 0, $addempty, 0, 0, $active, '', 1);
 			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
@@ -5645,13 +5799,13 @@ class Form
 	 */
 	public function selectMultiCurrency($selected = '', $htmlname = 'multicurrency_code', $useempty = 0, $filter = '', $excludeConfCurrency = false)
 	{
-		global $db, $conf, $langs, $user;
+		global $conf, $langs;
 
 		$langs->loadCacheCurrencies(''); // Load ->cache_currencies
 
 		$TCurrency = array();
 
-		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
+		$sql = "SELECT code FROM ".$this->db->prefix()."multicurrency";
 		$sql .= " WHERE entity IN ('".getEntity('mutlicurrency')."')";
 		if ($filter) {
 			$sql .= " AND ".$filter;
@@ -5716,7 +5870,7 @@ class Form
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$sql = "SELECT DISTINCT t.rowid, t.code, t.taux, t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.recuperableonly";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " FROM ".$this->db->prefix()."c_tva as t, ".$this->db->prefix()."c_country as c";
 		$sql .= " WHERE t.fk_pays = c.rowid";
 		$sql .= " AND t.active > 0";
 		$sql .= " AND c.code IN (".$this->db->sanitize($country_code, 1).")";
@@ -5757,11 +5911,11 @@ class Form
 
 				return $num;
 			} else {
-				$this->error = '<font class="error">'.$langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code).'</font>';
+				$this->error = '<span class="error">'.$langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code).'</span>';
 				return -1;
 			}
 		} else {
-			$this->error = '<font class="error">'.$this->db->error().'</font>';
+			$this->error = '<span class="error">'.$this->db->error().'</span>';
 			return -2;
 		}
 	}
@@ -5812,9 +5966,9 @@ class Form
 		// Check parameters
 		if (is_object($societe_vendeuse) && !$societe_vendeuse->country_code) {
 			if ($societe_vendeuse->id == $mysoc->id) {
-				$return .= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</font>';
+				$return .= '<span class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</span>';
 			} else {
-				$return .= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</font>';
+				$return .= '<span class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</span>';
 			}
 			return $return;
 		}
@@ -6181,7 +6335,7 @@ class Form
 						if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS)) {
 							$retstring .= "
 								showOn: 'button',	/* both has problem with autocompletion */
-								buttonImage: '".DOL_URL_ROOT."/theme/".$conf->theme."/img/object_calendarday.png',
+								buttonImage: '".DOL_URL_ROOT."/theme/".dol_escape_js($conf->theme)."/img/object_calendarday.png',
 								buttonImageOnly: true";
 						}
 						$retstring .= "
@@ -6194,7 +6348,7 @@ class Form
 					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidthdate" maxlength="11" value="'.$formated_date.'"';
 					$retstring .= ($disabled ? ' disabled' : '');
 					$retstring .= ($placeholder ? ' placeholder="'.dol_escape_htmltag($placeholder).'"' : '');
-					$retstring .= ' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
+					$retstring .= ' onChange="dpChangeDay(\''.dol_escape_js($prefix).'\',\''.dol_escape_js($langs->trans("FormatDateShortJavaInput")).'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
 					$retstring .= '>';
 
 					// Icone calendrier
@@ -6482,7 +6636,7 @@ class Form
 			unset($TDurationTypes[$value]);
 		}
 
-		$retstring = '<select class="flat" id="select_'.$prefix.'type_duration" name="'.$prefix.'type_duration">';
+		$retstring = '<select class="flat minwidth75 maxwidth100" id="select_'.$prefix.'type_duration" name="'.$prefix.'type_duration">';
 		foreach ($TDurationTypes as $key => $typeduration) {
 			$retstring .= '<option value="'.$key.'"';
 			if ($key == $selected) {
@@ -6586,13 +6740,626 @@ class Form
 		return;
 	}
 
+	/**
+	 *  Return list of tickets in Ajax if Ajax activated or go to selectTicketsList
+	 *
+	 *  @param		int			$selected				Preselected tickets
+	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page).
+	 *  @param  	string		$filtertype     		To add a filter
+	 *  @param		int			$limit					Limit on number of returned lines
+	 *  @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		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.
+	 * 	@param		int			$forcecombo				Force to use combo box
+	 *  @param      string      $morecss                Add more css on select
+	 *  @param 		array 		$selected_combinations 	Selected combinations. Format: array([attrid] => attrval, [...])
+	 *  @param		string		$nooutput				No print, return the output into a string
+	 *  @return		void|string
+	 */
+	public function selectTickets($selected = '', $htmlname = 'ticketid', $filtertype = '', $limit = 0, $status = 1, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $selected_combinations = null, $nooutput = 0)
+	{
+		global $langs, $conf;
+
+		$out = '';
+
+		// check parameters
+		if (is_null($ajaxoptions)) $ajaxoptions = array();
+
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->TICKET_USE_SEARCH_TO_SELECT)) {
+			$placeholder = '';
+
+			if ($selected && empty($selected_input_value)) {
+				require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
+				$tickettmpselect = new Ticket($this->db);
+				$tickettmpselect->fetch($selected);
+				$selected_input_value = $tickettmpselect->ref;
+				unset($tickettmpselect);
+			}
+
+			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/ticket/ajax/tickets.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);
+
+			if (empty($hidelabel)) $out .= $langs->trans("RefOrLabel").' : ';
+			elseif ($hidelabel > 1) {
+				$placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';
+				if ($hidelabel == 2) {
+					$out .= img_picto($langs->trans("Search"), 'search');
+				}
+			}
+			$out .= '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
+			if ($hidelabel == 3) {
+				$out .= img_picto($langs->trans("Search"), 'search');
+			}
+		} else {
+			$out .= $this->selectTicketsList($selected, $htmlname, $filtertype, $limit, $status, 0, $socid, $showempty, $forcecombo, $morecss);
+		}
+
+		if (empty($nooutput)) print $out;
+		else return $out;
+	}
+
+
+	/**
+	 *	Return list of tickets.
+	 *  Called by selectTickets.
+	 *
+	 *	@param      int		$selected           Preselected ticket
+	 *	@param      string	$htmlname           Name of select html
+	 *  @param		string	$filtertype         Filter on ticket type
+	 *	@param      int		$limit              Limit on number of returned lines
+	 * 	@param      string	$filterkey          Filter on ticket ref or subject
+	 *	@param		int		$status             Ticket 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
+	 *  @param      string  $morecss            Add more css on select
+	 *  @return     array    				    Array of keys for json
+	 */
+	public function selectTicketsList($selected = '', $htmlname = 'ticketid', $filtertype = '', $limit = 20, $filterkey = '', $status = 1, $outputmode = 0, $showempty = '1', $forcecombo = 0, $morecss = '')
+	{
+		global $langs, $conf;
+
+		$out = '';
+		$outarray = array();
+
+		$selectFields = " p.rowid, p.ref, p.message";
+
+		$sql = "SELECT ";
+		$sql .= $selectFields;
+		$sql .= " FROM ".$this->db->prefix()."ticket as p";
+		$sql .= ' WHERE p.entity IN ('.getEntity('ticket').')';
+
+		// 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
+			// 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)."%' OR p.subject LIKE '".$this->db->escape($prefix.$crit)."%'";
+				$sql .= ")";
+				$i++;
+			}
+			if (count($scrit) > 1) $sql .= ")";
+			$sql .= ')';
+		}
+
+		$sql .= $this->db->plimit($limit, 0);
+
+		// Build output string
+		dol_syslog(get_class($this)."::selectTicketsList search tickets", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php';
+
+			$num = $this->db->num_rows($result);
+
+			$events = null;
+
+			if (!$forcecombo) {
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($htmlname, $events, $conf->global->TICKET_USE_SEARCH_TO_SELECT);
+			}
+
+			$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+
+			$textifempty = '';
+			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
+			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+			if (!empty($conf->global->TICKET_USE_SEARCH_TO_SELECT)) {
+				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+				else $textifempty .= $langs->trans("All");
+			} else {
+				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+			}
+			if ($showempty) $out .= '<option value="0" selected>'.$textifempty.'</option>';
+
+			$i = 0;
+			while ($num && $i < $num) {
+				$opt = '';
+				$optJson = array();
+				$objp = $this->db->fetch_object($result);
+
+				$this->constructTicketListOption($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
+				$out .= $opt;
+				array_push($outarray, $optJson);
+
+				$i++;
+			}
+
+			$out .= '</select>';
+
+			$this->db->free($result);
+
+			if (empty($outputmode)) return $out;
+			return $outarray;
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * constructTicketListOption.
+	 * This define value for &$opt and &$optJson.
+	 *
+	 * @param 	resource	$objp			    Result set of fetch
+	 * @param 	string		$opt			    Option (var used for returned value in string option format)
+	 * @param 	string		$optJson		    Option (var used for returned value in json format)
+	 * @param 	string		$selected		    Preselected value
+	 * @param   string      $filterkey          Filter key to highlight
+	 * @return	void
+	 */
+	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.'"';
+		$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;
+
+		$opt .= "</option>\n";
+		$optJson = array('key'=>$outkey, 'value'=>$outref, 'type'=>$outtypem);
+	}
+
+	/**
+	 *  Return list of projects in Ajax if Ajax activated or go to selectTicketsList
+	 *
+	 *  @param		int			$selected				Preselected tickets
+	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page).
+	 *  @param  	string		$filtertype     		To add a filter
+	 *  @param		int			$limit					Limit on number of returned lines
+	 *  @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		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.
+	 * 	@param		int			$forcecombo				Force to use combo box
+	 *  @param      string      $morecss                Add more css on select
+	 *  @param 		array 		$selected_combinations 	Selected combinations. Format: array([attrid] => attrval, [...])
+	 *  @param		string		$nooutput				No print, return the output into a string
+	 *  @return		void|string
+	 */
+	public function selectProjects($selected = '', $htmlname = 'projectid', $filtertype = '', $limit = 0, $status = 1, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $selected_combinations = null, $nooutput = 0)
+	{
+		global $langs, $conf;
+
+		$out = '';
+
+		// check parameters
+		if (is_null($ajaxoptions)) $ajaxoptions = array();
+
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->TICKET_USE_SEARCH_TO_SELECT)) {
+			$placeholder = '';
+
+			if ($selected && empty($selected_input_value)) {
+				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+				$projecttmpselect = new Project($this->db);
+				$projecttmpselect->fetch($selected);
+				$selected_input_value = $projecttmpselect->ref;
+				unset($projecttmpselect);
+			}
+
+			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/projet/ajax/projects.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);
+
+			if (empty($hidelabel)) $out .= $langs->trans("RefOrLabel").' : ';
+			elseif ($hidelabel > 1) {
+				$placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';
+				if ($hidelabel == 2) {
+					$out .= img_picto($langs->trans("Search"), 'search');
+				}
+			}
+			$out .= '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
+			if ($hidelabel == 3) {
+				$out .= img_picto($langs->trans("Search"), 'search');
+			}
+		} else {
+			$out .= $this->selectProjectsList($selected, $htmlname, $filtertype, $limit, $status, 0, $socid, $showempty, $forcecombo, $morecss);
+		}
+
+		if (empty($nooutput)) print $out;
+		else return $out;
+	}
+
+	/**
+	 *	Return list of projects.
+	 *  Called by selectProjects.
+	 *
+	 *	@param      int		$selected           Preselected project
+	 *	@param      string	$htmlname           Name of select html
+	 *  @param		string	$filtertype         Filter on project type
+	 *	@param      int		$limit              Limit on number of returned lines
+	 * 	@param      string	$filterkey          Filter on project ref or subject
+	 *	@param		int		$status             Ticket 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
+	 *  @param      string  $morecss            Add more css on select
+	 *  @return     array    				    Array of keys for json
+	 */
+	public function selectProjectsList($selected = '', $htmlname = 'projectid', $filtertype = '', $limit = 20, $filterkey = '', $status = 1, $outputmode = 0, $showempty = '1', $forcecombo = 0, $morecss = '')
+	{
+		global $langs, $conf;
+
+		$out = '';
+		$outarray = array();
+
+		$selectFields = " p.rowid, p.ref";
+
+		$sql = "SELECT ";
+		$sql .= $selectFields;
+		$sql .= " FROM ".$this->db->prefix()."projet as p";
+		$sql .= ' WHERE p.entity IN ('.getEntity('project').')';
+
+		// 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
+			// 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 .= "";
+				$i++;
+			}
+			if (count($scrit) > 1) $sql .= ")";
+			$sql .= ')';
+		}
+
+		$sql .= $this->db->plimit($limit, 0);
+
+		// Build output string
+		dol_syslog(get_class($this)."::selectProjectsList search projects", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+
+			$num = $this->db->num_rows($result);
+
+			$events = null;
+
+			if (!$forcecombo) {
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($htmlname, $events, $conf->global->PROJECT_USE_SEARCH_TO_SELECT);
+			}
+
+			$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+
+			$textifempty = '';
+			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
+			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+			if (!empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT)) {
+				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+				else $textifempty .= $langs->trans("All");
+			} else {
+				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+			}
+			if ($showempty) $out .= '<option value="0" selected>'.$textifempty.'</option>';
+
+			$i = 0;
+			while ($num && $i < $num) {
+				$opt = '';
+				$optJson = array();
+				$objp = $this->db->fetch_object($result);
+
+				$this->constructProjectListOption($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
+				$out .= $opt;
+				array_push($outarray, $optJson);
+
+				$i++;
+			}
+
+			$out .= '</select>';
+
+			$this->db->free($result);
+
+			if (empty($outputmode)) return $out;
+			return $outarray;
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * constructProjectListOption.
+	 * This define value for &$opt and &$optJson.
+	 *
+	 * @param 	resource	$objp			    Result set of fetch
+	 * @param 	string		$opt			    Option (var used for returned value in string option format)
+	 * @param 	string		$optJson		    Option (var used for returned value in json format)
+	 * @param 	string		$selected		    Preselected value
+	 * @param   string      $filterkey          Filter key to highlight
+	 * @return	void
+	 */
+	protected function constructProjectListOption(&$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.'"';
+		$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;
+
+		$opt .= "</option>\n";
+		$optJson = array('key'=>$outkey, 'value'=>$outref, 'type'=>$outtype);
+	}
+
+
+	/**
+	 *  Return list of members in Ajax if Ajax activated or go to selectTicketsList
+	 *
+	 *  @param		int			$selected				Preselected tickets
+	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page).
+	 *  @param  	string		$filtertype     		To add a filter
+	 *  @param		int			$limit					Limit on number of returned lines
+	 *  @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		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.
+	 * 	@param		int			$forcecombo				Force to use combo box
+	 *  @param      string      $morecss                Add more css on select
+	 *  @param 		array 		$selected_combinations 	Selected combinations. Format: array([attrid] => attrval, [...])
+	 *  @param		string		$nooutput				No print, return the output into a string
+	 *  @return		void|string
+	 */
+	public function selectMembers($selected = '', $htmlname = 'adherentid', $filtertype = '', $limit = 0, $status = 1, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $selected_combinations = null, $nooutput = 0)
+	{
+		global $langs, $conf;
+
+		$out = '';
+
+		// check parameters
+		if (is_null($ajaxoptions)) $ajaxoptions = array();
+
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->TICKET_USE_SEARCH_TO_SELECT)) {
+			$placeholder = '';
+
+			if ($selected && empty($selected_input_value)) {
+				require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+				$adherenttmpselect = new Member($this->db);
+				$adherenttmpselect->fetch($selected);
+				$selected_input_value = $adherenttmpselect->ref;
+				unset($adherenttmpselect);
+			}
+
+			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/adherents/ajax/adherents.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);
+
+			if (empty($hidelabel)) $out .= $langs->trans("RefOrLabel").' : ';
+			elseif ($hidelabel > 1) {
+				$placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';
+				if ($hidelabel == 2) {
+					$out .= img_picto($langs->trans("Search"), 'search');
+				}
+			}
+			$out .= '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
+			if ($hidelabel == 3) {
+				$out .= img_picto($langs->trans("Search"), 'search');
+			}
+		} else {
+			$out .= $this->selectMembersList($selected, $htmlname, $filtertype, $limit, $status, 0, $socid, $showempty, $forcecombo, $morecss);
+		}
+
+		if (empty($nooutput)) print $out;
+		else return $out;
+	}
+
+	/**
+	 *	Return list of adherents.
+	 *  Called by selectMembers.
+	 *
+	 *	@param      int		$selected           Preselected adherent
+	 *	@param      string	$htmlname           Name of select html
+	 *  @param		string	$filtertype         Filter on adherent type
+	 *	@param      int		$limit              Limit on number of returned lines
+	 * 	@param      string	$filterkey          Filter on adherent ref or subject
+	 *	@param		int		$status             Ticket 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
+	 *  @param      string  $morecss            Add more css on select
+	 *  @return     array    				    Array of keys for json
+	 */
+	public function selectMembersList($selected = '', $htmlname = 'adherentid', $filtertype = '', $limit = 20, $filterkey = '', $status = 1, $outputmode = 0, $showempty = '1', $forcecombo = 0, $morecss = '')
+	{
+		global $langs, $conf;
+
+		$out = '';
+		$outarray = array();
+
+		$selectFields = " p.rowid, p.ref";
+
+		$sql = "SELECT ";
+		$sql .= $selectFields;
+		$sql .= " FROM ".$this->db->prefix()."adherent as p";
+		$sql .= ' WHERE p.entity IN ('.getEntity('adherent').')';
+
+		// 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
+			// 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 .= "";
+				$i++;
+			}
+			if (count($scrit) > 1) $sql .= ")";
+			$sql .= ')';
+		}
+
+		$sql .= $this->db->plimit($limit, 0);
+
+		// Build output string
+		dol_syslog(get_class($this)."::selectMembersList search adherents", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
+
+			$num = $this->db->num_rows($result);
+
+			$events = null;
+
+			if (!$forcecombo) {
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($htmlname, $events, $conf->global->PROJECT_USE_SEARCH_TO_SELECT);
+			}
+
+			$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+
+			$textifempty = '';
+			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
+			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+			if (!empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT)) {
+				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+				else $textifempty .= $langs->trans("All");
+			} else {
+				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+			}
+			if ($showempty) $out .= '<option value="0" selected>'.$textifempty.'</option>';
+
+			$i = 0;
+			while ($num && $i < $num) {
+				$opt = '';
+				$optJson = array();
+				$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
+				$out .= $opt;
+				array_push($outarray, $optJson);
+
+				$i++;
+			}
+
+			$out .= '</select>';
+
+			$this->db->free($result);
+
+			if (empty($outputmode)) return $out;
+			return $outarray;
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * constructMemberListOption.
+	 * This define value for &$opt and &$optJson.
+	 *
+	 * @param 	resource	$objp			    Result set of fetch
+	 * @param 	string		$opt			    Option (var used for returned value in string option format)
+	 * @param 	string		$optJson		    Option (var used for returned value in json format)
+	 * @param 	string		$selected		    Preselected value
+	 * @param   string      $filterkey          Filter key to highlight
+	 * @return	void
+	 */
+	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;
+
+		$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;
+
+		$opt .= "</option>\n";
+		$optJson = array('key'=>$outkey, 'value'=>$outref, 'type'=>$outtype);
+	}
 
 	/**
 	 * Generic method to select a component from a combo list.
 	 * Can use autocomplete with ajax after x key pressed or a full combo, depending on setup.
 	 * This is the generic method that will replace all specific existing methods.
 	 *
-	 * @param 	string			$objectdesc			ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]
+	 * @param 	string			$objectdesc			ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]
 	 * @param	string			$htmlname			Name of HTML select component
 	 * @param	int				$preselectedvalue	Preselected value (ID of element)
 	 * @param	string			$showempty			''=empty values not allowed, 'string'=value show if we allow empty values (for example 'All', ...)
@@ -6612,11 +7379,16 @@ class Form
 
 		$objecttmp = null;
 
-		$InfoFieldList = explode(":", $objectdesc);
+		$InfoFieldList = explode(":", $objectdesc, 4);
+		$vartmp = $InfoFieldList[3];
+		$InfoFieldList[4] = preg_replace('/^.*:(\w*)$/', '\1', $vartmp);	// take the sort field
+		$InfoFieldList[3] = preg_replace('/:\w*$/', '', $vartmp);			// take the filter field
+
 		$classname = $InfoFieldList[0];
 		$classpath = $InfoFieldList[1];
 		$addcreatebuttonornot = empty($InfoFieldList[2]) ? 0 : $InfoFieldList[2];
 		$filter = empty($InfoFieldList[3]) ? '' : $InfoFieldList[3];
+		$sortfield = empty($InfoFieldList[4]) ? '' : $InfoFieldList[4];
 
 		if (!empty($classpath)) {
 			dol_include_once($classpath);
@@ -6662,14 +7434,14 @@ class Form
 			$urlforajaxcall = DOL_URL_ROOT.'/core/ajax/selectobject.php';
 
 			// No immediate load of all database
-			$urloption = 'htmlname='.$htmlname.'&outjson=1&objectdesc='.$objectdesc.'&filter='.urlencode($objecttmp->filter);
+			$urloption = 'htmlname='.urlencode($htmlname).'&outjson=1&objectdesc='.urlencode($objectdesc).'&filter='.urlencode($objecttmp->filter).($sortfield ? '&sortfield='.urlencode($sortfield) : '');
 			// Activate the auto complete using ajax call.
 			$out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, $conf->global->$confkeyforautocompletemode, 0, array());
 			$out .= '<style type="text/css">.ui-autocomplete { z-index: 1003; }</style>';
 			$out .= '<input type="text" class="'.$morecss.'"'.($disabled ? ' disabled="disabled"' : '').' name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.($placeholder ? ' placeholder="'.dol_escape_htmltag($placeholder).'"' : '') .' />';
 		} else {
 			// Immediate load of table record. Note: filter is inside $objecttmp->filter
-			$out .= $this->selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo, 0, $disabled);
+			$out .= $this->selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo, 0, $disabled, $sortfield);
 		}
 
 		return $out;
@@ -6719,10 +7491,11 @@ class Form
 	 * @param	int				$forcecombo			Force to load all values and output a standard combobox (with no beautification)
 	 * @param	int				$outputmode			0=HTML select string, 1=Array
 	 * @param	int				$disabled			1=Html component is disabled
+	 * @param	string			$sortfield			Sort field
 	 * @return	string|array						Return HTML string
 	 * @see selectForForms()
 	 */
-	public function selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $outputmode = 0, $disabled = 0)
+	public function selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $outputmode = 0, $disabled = 0, $sortfield = '')
 	{
 		global $conf, $langs, $user, $hookmanager;
 
@@ -6768,15 +7541,15 @@ class Form
 		$num = 0;
 
 		// Search data
-		$sql = "SELECT t.rowid, ".$fieldstoshow." FROM ".MAIN_DB_PREFIX.$objecttmp->table_element." as t";
+		$sql = "SELECT t.rowid, ".$fieldstoshow." FROM ".$this->db->prefix().$objecttmp->table_element." as t";
 		if (isset($objecttmp->ismultientitymanaged)) {
 			if (!is_numeric($objecttmp->ismultientitymanaged)) {
 				$tmparray = explode('@', $objecttmp->ismultientitymanaged);
-				$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$tmparray[1]." as parenttable ON parenttable.rowid = t.".$tmparray[0];
+				$sql .= " INNER JOIN ".$this->db->prefix().$tmparray[1]." as parenttable ON parenttable.rowid = t.".$tmparray[0];
 			}
 			if ($objecttmp->ismultientitymanaged === 'fk_soc@societe') {
-				if (!$user->rights->societe->client->voir && !$user->socid) {
-					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				if (empty($user->rights->societe->client->voir) && !$user->socid) {
+					$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 				}
 			}
 		}
@@ -6803,7 +7576,7 @@ class Form
 					}
 				}
 				if ($objecttmp->ismultientitymanaged === 'fk_soc@societe') {
-					if (!$user->rights->societe->client->voir && !$user->socid) {
+					if (empty($user->rights->societe->client->voir) && !$user->socid) {
 						$sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 					}
 				}
@@ -6811,11 +7584,6 @@ class Form
 			if ($searchkey != '') {
 				$sql .= natural_search(explode(',', $fieldstoshow), $searchkey);
 			}
-			if ($objecttmp->ismultientitymanaged == 'fk_soc@societe') {
-				if (!$user->rights->societe->client->voir && !$user->socid) {
-					$sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-				}
-			}
 			if ($objecttmp->filter) {	 // Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 				/*if (! DolibarrApi::_checkFilters($objecttmp->filter))
 				{
@@ -6825,7 +7593,7 @@ class Form
 				$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'Form::forgeCriteriaCallback', $objecttmp->filter).")";
 			}
 		}
-		$sql .= $this->db->order($fieldstoshow, "ASC");
+		$sql .= $this->db->order($sortfield ? $sortfield : $fieldstoshow, "ASC");
 		//$sql.=$this->db->plimit($limit, 0);
 		//print $sql;
 
@@ -7283,19 +8051,19 @@ class Form
 	/**
 	 *	Show a multiselect form from an array. WARNING: Use this only for short lists.
 	 *
-	 *	@param	string	$htmlname		Name of select
-	 *	@param	array	$array			Array with key+value
-	 *	@param	array	$selected		Array with key+value preselected
-	 *	@param	int		$key_in_label   1 to show key like in "[key] value"
-	 *	@param	int		$value_as_key   1 to use value as key
-	 *	@param  string	$morecss        Add more css style
-	 *	@param  int		$translate		Translate and encode value
-	 *  @param	int		$width			Force width of select box. May be used only when using jquery couch. Example: 250, 95%
-	 *  @param	string	$moreattrib		Add more options on select component. Example: 'disabled'
-	 *  @param	string	$elemtype		Type of element we show ('category', ...). Will execute a formating function on it. To use in readonly mode if js component support HTML formatting.
-	 *  @param	string	$placeholder	String to use as placeholder
-	 *  @param	int		$addjscombo		Add js combo
-	 *	@return	string					HTML multiselect string
+	 *	@param	string		$htmlname		Name of select
+	 *	@param	array		$array			Array with key+value
+	 *	@param	array		$selected		Array with key+value preselected
+	 *	@param	int			$key_in_label   1 to show key like in "[key] value"
+	 *	@param	int			$value_as_key   1 to use value as key
+	 *	@param  string		$morecss        Add more css style
+	 *	@param  int			$translate		Translate and encode value
+	 *  @param	int|string	$width			Force width of select box. May be used only when using jquery couch. Example: 250, '95%'
+	 *  @param	string		$moreattrib		Add more options on select component. Example: 'disabled'
+	 *  @param	string		$elemtype		Type of element we show ('category', ...). Will execute a formating function on it. To use in readonly mode if js component support HTML formatting.
+	 *  @param	string		$placeholder	String to use as placeholder
+	 *  @param	int			$addjscombo		Add js combo
+	 *	@return	string						HTML multiselect string
 	 *  @see selectarray(), selectArrayAjax(), selectArrayFilter()
 	 */
 	public static function multiselectarray($htmlname, $array, $selected = array(), $key_in_label = 0, $value_as_key = 0, $morecss = '', $translate = 0, $width = 0, $moreattrib = '', $elemtype = '', $placeholder = '', $addjscombo = -1)
@@ -7312,6 +8080,31 @@ class Form
 			}
 		}
 
+		// Try also magic suggest
+		$out .= '<select id="'.$htmlname.'" class="multiselect'.($morecss ? ' '.$morecss : '').'" multiple name="'.$htmlname.'[]"'.($moreattrib ? ' '.$moreattrib : '').($width ? ' style="width: '.(preg_match('/%/', $width) ? $width : $width.'px').'"' : '').'>'."\n";
+		if (is_array($array) && !empty($array)) {
+			if ($value_as_key) {
+				$array = array_combine($array, $array);
+			}
+
+			if (!empty($array)) {
+				foreach ($array as $key => $value) {
+					$newval = ($translate ? $langs->trans($value) : $value);
+					$newval = ($key_in_label ? $key.' - '.$newval : $newval);
+
+					$out .= '<option value="'.$key.'"';
+					if (is_array($selected) && !empty($selected) && in_array((string) $key, $selected) && ((string) $key != '')) {
+						$out .= ' selected';
+					}
+					$out .= ' data-html="'.dol_escape_htmltag($newval).'"';
+					$out .= '>';
+					$out .= dol_htmlentitiesbr($newval);
+					$out .= '</option>'."\n";
+				}
+			}
+		}
+		$out .= '</select>'."\n";
+
 		// Add code for jquery to use multiselect
 		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')) {
 			$out .= "\n".'<!-- JS CODE TO ENABLE select for id '.$htmlname.', addjscombo='.$addjscombo.' -->';
@@ -7366,31 +8159,6 @@ class Form
 			$out .= '</script>';
 		}
 
-		// Try also magic suggest
-		$out .= '<select id="'.$htmlname.'" class="multiselect'.($morecss ? ' '.$morecss : '').'" multiple name="'.$htmlname.'[]"'.($moreattrib ? ' '.$moreattrib : '').($width ? ' style="width: '.(preg_match('/%/', $width) ? $width : $width.'px').'"' : '').'>'."\n";
-		if (is_array($array) && !empty($array)) {
-			if ($value_as_key) {
-				$array = array_combine($array, $array);
-			}
-
-			if (!empty($array)) {
-				foreach ($array as $key => $value) {
-					$newval = ($translate ? $langs->trans($value) : $value);
-					$newval = ($key_in_label ? $key.' - '.$newval : $newval);
-
-					$out .= '<option value="'.$key.'"';
-					if (is_array($selected) && !empty($selected) && in_array((string) $key, $selected) && ((string) $key != '')) {
-						$out .= ' selected';
-					}
-					$out .= ' data-html="'.dol_escape_htmltag($newval).'"';
-					$out .= '>';
-					$out .= dol_htmlentitiesbr($newval);
-					$out .= '</option>'."\n";
-				}
-			}
-		}
-		$out .= '</select>'."\n";
-
 		return $out;
 	}
 
@@ -7427,7 +8195,7 @@ class Form
 			}
 		} else {								// There is no list of fields already customized for user
 			foreach ($array as $key => $val) {
-				if ($array[$key]['checked'] < 0) {
+				if (!empty($array[$key]['checked']) && $array[$key]['checked'] < 0) {
 					$array[$key]['checked'] = 0;
 				}
 			}
@@ -7455,7 +8223,7 @@ class Form
 				}
 
 				// Note: $val['checked'] <> 0 means we must show the field into the combo list
-				$listoffieldsforselection .= '<li><input type="checkbox" id="checkbox'.$key.'" value="'.$key.'"'.((empty($val['checked']) && $val['checked'] != '-1') ? '' : ' checked="checked"').'/><label for="checkbox'.$key.'">'.dol_escape_htmltag($langs->trans($val['label'])).'</label></li>';
+				$listoffieldsforselection .= '<li><input type="checkbox" id="checkbox'.$key.'" value="'.$key.'"'.((empty($val['checked']) || $val['checked'] == '-1') ? '' : ' checked="checked"').'/><label for="checkbox'.$key.'">'.dol_escape_htmltag($langs->trans($val['label'])).'</label></li>';
 				$listcheckedstring .= (empty($val['checked']) ? '' : $key.',');
 			}
 		}
@@ -7515,11 +8283,9 @@ class Form
 	 */
 	public function showCategories($id, $type, $rendermode = 0, $nolink = 0)
 	{
-		global $db;
-
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
-		$cat = new Categorie($db);
+		$cat = new Categorie($this->db);
 		$categories = $cat->containing($id, $type);
 
 		if ($rendermode == 1) {
@@ -7530,7 +8296,7 @@ class Form
 					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #bbb"').'>'.$way.'</li>';
 				}
 			}
-			return '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+			return '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 		}
 
 		if ($rendermode == 0) {
@@ -7644,6 +8410,16 @@ 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)) {
+						continue; // Do not show if module disabled
+					}
 				} elseif ($objecttype == 'invoice_supplier') {
 					$tplpath = 'fourn/facture';
 				} elseif ($objecttype == 'order_supplier') {
@@ -7656,12 +8432,16 @@ class Form
 					$tplpath = 'eventorganization';
 				} elseif ($objecttype == 'conferenceorboothattendee') {
 					$tplpath = 'eventorganization';
+				} elseif ($objecttype == 'mo') {
+					$tplpath = 'mrp';
+					if (empty($conf->mrp->enabled)) {
+						continue; // Do not show if module disabled
+					}
 				}
 
 				global $linkedObjectBlock;
 				$linkedObjectBlock = $objects;
 
-
 				// Output template part (modules that overwrite templates must declare this into descriptor)
 				$dirtpls = array_merge($conf->modules_parts['tpl'], array('/'.$tplpath.'/tpl'));
 				foreach ($dirtpls as $reldir) {
@@ -7679,7 +8459,7 @@ class Form
 			}
 
 			if (!$nboftypesoutput) {
-				print '<tr><td class="impair opacitymedium" colspan="7">'.$langs->trans("None").'</td></tr>';
+				print '<tr><td class="impair" colspan="7"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 			}
 
 			print '</table>';
@@ -7733,21 +8513,23 @@ 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 ".MAIN_DB_PREFIX."societe as s, ".MAIN_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 ".MAIN_DB_PREFIX."societe as s, ".MAIN_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 ".MAIN_DB_PREFIX."societe as s, ".MAIN_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 ".MAIN_DB_PREFIX."societe as s, ".MAIN_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'=>$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').')'),
 				'contrat'=>array(
 					'enabled'=>$conf->contrat->enabled,
 					'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 ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t, ".MAIN_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'
+					'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'=>$conf->ficheinter->enabled, 'perms'=>1, 'label'=>'LinkToIntervention', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_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 ".MAIN_DB_PREFIX."societe as s, ".MAIN_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 ".MAIN_DB_PREFIX."societe as s, ".MAIN_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 ".MAIN_DB_PREFIX."societe as s, ".MAIN_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 ".MAIN_DB_PREFIX."societe as s, ".MAIN_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').')')
+				'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').')')
 			);
 		}
 
@@ -7778,6 +8560,21 @@ class Form
 
 			if (!empty($possiblelink['perms']) && (empty($restrictlinksto) || in_array($key, $restrictlinksto)) && (empty($excludelinksto) || !in_array($key, $excludelinksto))) {
 				print '<div id="'.$key.'list"'.(empty($conf->use_javascript_ajax) ? '' : ' style="display:none"').'>';
+
+				if (!empty($conf->global->MAIN_LINK_BY_REF_IN_LINKTO)) {
+					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="addlink" value="' . $key . '">';
+					print '<table class="noborder">';
+					print '<tr>';
+					print '<td>' . $langs->trans("Ref") . '</td>';
+					print '<td><input type="text" name="reftolinkto" value="' . dol_escape_htmltag(GETPOST('reftolinkto', 'alpha')) . '">&nbsp;<input type="submit" class="button valignmiddle" value="' . $langs->trans('ToLink') . '">&nbsp;<input type="submit" class="button" name="cancel" value="' . $langs->trans('Cancel') . '"></td>';
+					print '</tr>';
+					print '</table>';
+					print '</form>';
+				}
+
 				$sql = $possiblelink['sql'];
 
 				$resqllist = $this->db->query($sql);
@@ -7835,7 +8632,7 @@ class Form
 				print '</div>';
 
 				//$linktoelem.=($linktoelem?' &nbsp; ':'');
-				if ($num > 0) {
+				if ($num > 0 || !empty($conf->global->MAIN_LINK_BY_REF_IN_LINKTO)) {
 					$linktoelemlist .= '<li><a href="#linkto'.$key.'" class="linkto dropdowncloseonclick" rel="'.$key.'">'.$langs->trans($possiblelink['label']).' ('.$num.')</a></li>';
 					// } else $linktoelem.=$langs->trans($possiblelink['label']);
 				} else {
@@ -7938,7 +8735,7 @@ class Form
 	{
 		// phpcs:enable
 		$sql = "SELECT rowid, label";
-		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
+		$sql .= " FROM ".$this->db->prefix()."export_model";
 		$sql .= " WHERE type = '".$this->db->escape($type)."'";
 		$sql .= " ORDER BY rowid";
 		$result = $this->db->query($sql);
@@ -7987,7 +8784,7 @@ class Form
 	 */
 	public function showrefnav($object, $paramid, $morehtml = '', $shownav = 1, $fieldid = 'rowid', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlstatus = '', $morehtmlright = '')
 	{
-		global $langs, $conf, $hookmanager, $extralanguages;
+		global $conf, $langs, $hookmanager, $extralanguages;
 
 		$ret = '';
 		if (empty($fieldid)) {
@@ -7999,7 +8796,7 @@ class Form
 
 		// Preparing gender's display if there is one
 		$addgendertxt = '';
-		if (!empty($object->gender)) {
+		if (property_exists($object, 'gender') && !empty($object->gender)) {
 			$addgendertxt = ' ';
 			switch ($object->gender) {
 				case 'man':
@@ -8013,6 +8810,15 @@ class Form
 					break;
 			}
 		}
+		/*
+		$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"');
+			}
+		}*/
 
 		// Add where from hooks
 		if (is_object($hookmanager)) {
@@ -8145,7 +8951,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)).$addgendertxt;
+			$ret .= dol_htmlentities($object->getFullName($langs));
 		} elseif (in_array($object->element, array('action', 'agenda'))) {
 			$ret .= $object->ref.'<br>'.$object->label;
 		} elseif (in_array($object->element, array('adherent_type'))) {
@@ -8393,7 +9199,7 @@ class Form
 				}
 				$ret .= '<table class="nobordernopadding centpercent">';
 				if ($object->photo) {
-					$ret .= '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+					$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 .= '</table>';
@@ -8447,9 +9253,9 @@ class Form
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {
 			$sql .= ", e.label";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as ug ";
+		$sql .= " FROM ".$this->db->prefix()."usergroup as ug ";
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=ug.entity";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."entity as e ON e.rowid=ug.entity";
 			if ($force_entity) {
 				$sql .= " WHERE ug.entity IN (0, ".$force_entity.")";
 			} else {
@@ -8611,24 +9417,24 @@ class Form
 	 */
 	public function selectExpenseCategories($selected = '', $htmlname = 'fk_c_exp_tax_cat', $useempty = 0, $excludeid = array(), $target = '', $default_selected = 0, $params = array(), $info_admin = 1)
 	{
-		global $db, $langs, $user;
+		global $langs, $user;
 
 		$out = '';
-		$sql = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat WHERE active = 1';
-		$sql .= ' AND entity IN (0,'.getEntity('exp_tax_cat').')';
+		$sql = "SELECT rowid, label FROM ".$this->db->prefix()."c_exp_tax_cat WHERE active = 1";
+		$sql .= " AND entity IN (0,".getEntity('exp_tax_cat').")";
 		if (!empty($excludeid)) {
-			$sql .= ' AND rowid NOT IN ('.$this->db->sanitize(implode(',', $excludeid)).')';
+			$sql .= " AND rowid NOT IN (".$this->db->sanitize(implode(',', $excludeid)).")";
 		}
-		$sql .= ' ORDER BY label';
+		$sql .= " ORDER BY label";
 
-		$resql = $db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql) {
 			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp maxwidth200">';
 			if ($useempty) {
 				$out .= '<option value="0">&nbsp;</option>';
 			}
 
-			while ($obj = $db->fetch_object($resql)) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$out .= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.$langs->trans($obj->label).'</option>';
 			}
 			$out .= '</select>';
@@ -8639,11 +9445,11 @@ class Form
 			}
 
 			if (!empty($target)) {
-				$sql = "SELECT c.id FROM ".MAIN_DB_PREFIX."c_type_fees as c WHERE c.code = 'EX_KME' AND c.active = 1";
-				$resql = $db->query($sql);
+				$sql = "SELECT c.id FROM ".$this->db->prefix()."c_type_fees as c WHERE c.code = 'EX_KME' AND c.active = 1";
+				$resql = $this->db->query($sql);
 				if ($resql) {
-					if ($db->num_rows($resql) > 0) {
-						$obj = $db->fetch_object($resql);
+					if ($this->db->num_rows($resql) > 0) {
+						$obj = $this->db->fetch_object($resql);
 						$out .= '<script>
 							$(function() {
 								$("select[name='.$target.']").on("change", function() {
@@ -8685,7 +9491,7 @@ class Form
 				}
 			}
 		} else {
-			dol_print_error($db);
+			dol_print_error($this->db);
 		}
 
 		return $out;
@@ -8701,25 +9507,25 @@ class Form
 	 */
 	public function selectExpenseRanges($selected = '', $htmlname = 'fk_range', $useempty = 0)
 	{
-		global $db, $conf, $langs;
+		global $conf, $langs;
 
 		$out = '';
-		$sql = 'SELECT rowid, range_ik FROM '.MAIN_DB_PREFIX.'c_exp_tax_range';
-		$sql .= ' WHERE entity = '.$conf->entity.' AND active = 1';
+		$sql = "SELECT rowid, range_ik FROM ".$this->db->prefix()."c_exp_tax_range";
+		$sql .= " WHERE entity = ".$conf->entity." AND active = 1";
 
-		$resql = $db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql) {
 			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';
 			if ($useempty) {
 				$out .= '<option value="0"></option>';
 			}
 
-			while ($obj = $db->fetch_object($resql)) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$out .= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.price($obj->range_ik, 0, $langs, 1, 0).'</option>';
 			}
 			$out .= '</select>';
 		} else {
-			dol_print_error($db);
+			dol_print_error($this->db);
 		}
 
 		return $out;
@@ -8737,13 +9543,13 @@ class Form
 	 */
 	public function selectExpense($selected = '', $htmlname = 'fk_c_type_fees', $useempty = 0, $allchoice = 1, $useid = 0)
 	{
-		global $db, $langs;
+		global $langs;
 
 		$out = '';
-		$sql = 'SELECT id, code, label FROM '.MAIN_DB_PREFIX.'c_type_fees';
-		$sql .= ' WHERE active = 1';
+		$sql = "SELECT id, code, label FROM ".$this->db->prefix()."c_type_fees";
+		$sql .= " WHERE active = 1";
 
-		$resql = $db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql) {
 			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';
 			if ($useempty) {
@@ -8758,13 +9564,13 @@ class Form
 				$field = 'id';
 			}
 
-			while ($obj = $db->fetch_object($resql)) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$key = $langs->trans($obj->code);
 				$out .= '<option '.($selected == $obj->{$field} ? 'selected="selected"' : '').' value="'.$obj->{$field}.'">'.($key != $obj->code ? $key : $obj->label).'</option>';
 			}
 			$out .= '</select>';
 		} else {
-			dol_print_error($db);
+			dol_print_error($this->db);
 		}
 
 		return $out;
@@ -8816,9 +9622,9 @@ class Form
 		$sql = "SELECT f.rowid, f.ref as fref, 'nolabel' as flabel, p.rowid as pid, f.ref,
             p.title, p.fk_soc, p.fk_statut, p.public,";
 		$sql .= ' s.nom as name';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
-		$sql .= ' '.MAIN_DB_PREFIX.'facture as f';
+		$sql .= ' FROM '.$this->db->prefix().'projet as p';
+		$sql .= ' LEFT JOIN '.$this->db->prefix().'societe as s ON s.rowid = p.fk_soc,';
+		$sql .= ' '.$this->db->prefix().'facture as f';
 		$sql .= " WHERE p.entity IN (".getEntity('project').")";
 		$sql .= " AND f.fk_projet = p.rowid AND f.fk_statut=0"; //Brouillons seulement
 		//if ($projectsListId) $sql.= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")";
@@ -8929,9 +9735,10 @@ class Form
 	 * @param	array		$arrayofcriterias			          Array of available search criterias. Example: array($object->element => $object->fields, 'otherfamily' => otherarrayoffields, ...)
 	 * @param	array		$search_component_params	          Array of selected search criterias
 	 * @param   array       $arrayofinputfieldsalreadyoutput      Array of input fields already inform. The component will not generate a hidden input field if it is in this list.
+	 * @param	string		$search_component_params_hidden		  String with $search_component_params criterias
 	 * @return	string									          HTML component for advanced search
 	 */
-	public function searchComponent($arrayofcriterias, $search_component_params, $arrayofinputfieldsalreadyoutput = array())
+	public function searchComponent($arrayofcriterias, $search_component_params, $arrayofinputfieldsalreadyoutput = array(), $search_component_params_hidden = '')
 	{
 		global $langs;
 
@@ -8949,7 +9756,12 @@ class Form
 
 		$ret .= '<div class="search_component inline-block valignmiddle">'.$texttoshow.'</div>';
 		$ret .= '</div>';
-		$ret .= '<input type="hidden" name="search_component_params_hidden" class="search_component_params_hidden" value="'.GETPOST("search_component_params_hidden").'">';
+		$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 .= '<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.'">';
+
 		// 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) {
@@ -8990,14 +9802,14 @@ class Form
 	 */
 	public function selectModelMail($prefix, $modelType = '', $default = 0, $addjscombo = 0)
 	{
-		global $langs, $db, $user;
+		global $langs, $user;
 
 		$retstring = '';
 
 		$TModels = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
+		$formmail = new FormMail($this->db);
 		$result = $formmail->fetchAllEMailTemplate($modelType, $user, $langs);
 
 		if ($default) {
@@ -9024,4 +9836,55 @@ class Form
 
 		return $retstring;
 	}
+
+	/**
+	 * 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
+	 */
+	public function buttonsSaveCancel($save_label = 'Save', $cancel_label = 'Cancel', $morebuttons = array(), $withoutdiv = 0, $morecss = '')
+	{
+		global $langs;
+
+		$buttons = array();
+
+		$save = array(
+			'name' => 'save',
+			'label_key' => $save_label,
+		);
+
+		if ($save_label == 'Create' || $save_label == 'Add' ) {
+			$save['name'] = 'add';
+		} elseif ($save_label == 'Modify') {
+			$save['name'] = 'edit';
+		}
+
+		$cancel = array(
+				'name' => 'cancel',
+				'label_key' => 'Cancel',
+		);
+
+		!empty($save_label) ? $buttons[] = $save : '';
+
+		if (!empty($morebuttons)) {
+			$buttons[] = $morebuttons;
+		}
+
+		!empty($cancel_label) ? $buttons[] = $cancel : '';
+
+		$retstring = $withoutdiv ? '': '<div class="center">';
+
+		foreach ($buttons as $button) {
+			$addclass = empty($button['addclass']) ? '' : $button['addclass'];
+			$retstring .= '<input type="submit" class="button button-'.$button['name'].($morecss ? ' '.$morecss : '').' '.$addclass.'" name="'.$button['name'].'" value="'.dol_escape_htmltag($langs->trans($button['label_key'])).'">';
+		}
+		$retstring .= $withoutdiv ? '': '</div>';
+
+		return $retstring;
+	}
 }
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index dc6e6d8c6cd..2e1b9661f58 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -82,7 +82,7 @@ class FormAccounting extends Form
 			$selected = $selectid;
 		} else {
 			$sql = "SELECT rowid, code, label, nature, entity, active";
-			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
+			$sql .= " FROM ".$this->db->prefix()."accounting_journal";
 			$sql .= " WHERE active = 1";
 			$sql .= " AND entity = ".$conf->entity;
 			if ($nature && is_numeric($nature)) {
@@ -162,7 +162,7 @@ class FormAccounting extends Form
 			$selected = $selectedIds;
 		} else {
 			$sql = "SELECT rowid, code, label, nature, entity, active";
-			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
+			$sql .= " FROM ".$this->db->prefix()."accounting_journal";
 			$sql .= " WHERE active = 1";
 			$sql .= " AND entity = ".$conf->entity;
 			if ($nature && is_numeric($nature)) {
@@ -238,7 +238,7 @@ class FormAccounting extends Form
 
 		if (!empty($mysoc->country_id)) {
 			$sql = "SELECT c.rowid, c.label as type, c.range_account";
-			$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
+			$sql .= " FROM ".$this->db->prefix()."c_accounting_category as c";
 			$sql .= " WHERE c.active = 1";
 			$sql .= " AND c.category_type = 0";
 			if (empty($allcountries)) {
@@ -247,7 +247,7 @@ class FormAccounting extends Form
 			$sql .= " ORDER BY c.label ASC";
 		} else {
 			$sql = "SELECT c.rowid, c.label as type, c.range_account";
-			$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
+			$sql .= " FROM ".$this->db->prefix()."c_accounting_category as c, ".$this->db->prefix()."c_country as co";
 			$sql .= " WHERE c.active = 1";
 			$sql .= " AND c.category_type = 0";
 			$sql .= " AND c.fk_country = co.rowid";
@@ -307,7 +307,7 @@ class FormAccounting extends Form
 		// phpcs:enable
 		$options = array();
 
-		$sql = 'SELECT DISTINCT import_key from '.MAIN_DB_PREFIX.'accounting_bookkeeping';
+		$sql = "SELECT DISTINCT import_key FROM ".$this->db->prefix()."accounting_bookkeeping";
 		$sql .= " WHERE entity IN (".getEntity('accountancy').")";
 		$sql .= ' ORDER BY import_key DESC';
 
@@ -363,8 +363,8 @@ class FormAccounting extends Form
 			$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
 
 			$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.labelshort, aa.rowid, aa.fk_pcg_version";
-			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+			$sql .= " FROM ".$this->db->prefix()."accounting_account as aa";
+			$sql .= " INNER JOIN ".$this->db->prefix()."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
 			$sql .= " AND asy.rowid = ".((int) $conf->global->CHARTOFACCOUNTS);
 			$sql .= " AND aa.active = 1";
 			$sql .= " AND aa.entity=".$conf->entity;
@@ -454,7 +454,7 @@ class FormAccounting extends Form
 
 			// Auxiliary thirdparties account
 			$sql = "SELECT code_compta, code_compta_fournisseur, nom as name";
-			$sql .= " FROM ".MAIN_DB_PREFIX."societe";
+			$sql .= " FROM ".$this->db->prefix()."societe";
 			$sql .= " WHERE entity IN (".getEntity('societe').")";
 			$sql .= " AND (client IN (1,3) OR fournisseur = 1)";
 
@@ -480,7 +480,7 @@ class FormAccounting extends Form
 
 			// Auxiliary user account
 			$sql = "SELECT DISTINCT accountancy_code, lastname, firstname ";
-			$sql .= " FROM ".MAIN_DB_PREFIX."user";
+			$sql .= " FROM ".$this->db->prefix()."user";
 			$sql .= " WHERE entity IN (".getEntity('user').")";
 			$sql .= " ORDER BY accountancy_code";
 
@@ -527,7 +527,7 @@ class FormAccounting extends Form
 		$out_array = array();
 
 		$sql = "SELECT DISTINCT date_format(doc_date, '%Y') as dtyear";
-		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
+		$sql .= " FROM ".$this->db->prefix()."accounting_bookkeeping";
 		$sql .= " WHERE entity IN (".getEntity('accountancy').")";
 		$sql .= " ORDER BY date_format(doc_date, '%Y')";
 		dol_syslog(__METHOD__, LOG_DEBUG);
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 06c0aea628c..457d310492c 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -178,7 +178,8 @@ class FormActions
 		$sortfield = 'a.datep,a.id';
 		$sortorder = 'DESC,DESC';
 
-		$listofactions = ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max ? ($max + 1) : 0));
+		$actioncomm = new ActionComm($this->db);
+		$listofactions = $actioncomm->getActions($socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max ? ($max + 1) : 0));
 		if (!is_array($listofactions)) {
 			dol_print_error($this->db, 'FailedToGetActions');
 		}
@@ -221,10 +222,14 @@ class FormActions
 			if ($typeelement == 'project') {
 				$projectid = $object->id;
 			}
+			$taskid = 0;
+			if ($typeelement == 'task') {
+				$taskid = $object->id;
+			}
 
 			$newcardbutton = '';
 			if (!empty($conf->agenda->enabled) && !empty($user->rights->agenda->myactions->create)) {
-				$url = DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog', 'tzuser')).'&amp;origin='.urlencode($typeelement).'&amp;originid='.$object->id.((!empty($object->socid) && $object->socid > 0) ? '&amp;socid='.$object->socid : ((!empty($socid) && $socid > 0) ? '&amp;socid='.$socid : '')).($projectid > 0 ? '&amp;projectid='.$projectid : '').'&amp;backtopage='.urlencode($urlbacktopage);
+				$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);
 			}
 
@@ -347,14 +352,14 @@ class FormActions
 	 *  @param	array|string	$selected       Type pre-selected (can be 'manual', 'auto' or 'AC_xxx'). Can be an array too.
 	 *  @param  string		    $htmlname       Name of select field
 	 *  @param	string		    $excludetype	A type to exclude ('systemauto', 'system', '')
-	 *  @param	integer		    $onlyautoornot	1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line "All manual"
+	 *  @param	integer		    $onlyautoornot	1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line "All manual", -2=Combined line is disabled (not implemented yet)
 	 *  @param	int		        $hideinfohelp	1=Do not show info help, 0=Show, -1=Show+Add info to tell how to set default value
 	 *  @param  int		        $multiselect    1=Allow multiselect of action type
 	 *  @param  int             $nooutput       1=No output
 	 *  @param	string			$morecss		More css to add to SELECT component.
 	 * 	@return	string
 	 */
-	public function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0, $morecss = '')
+	public function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0, $morecss = 'minwidth300')
 	{
 		// phpcs:enable
 		global $langs, $user, $form, $conf;
@@ -368,7 +373,7 @@ class FormActions
 		$caction = new CActionComm($this->db);
 
 		// Suggest a list with manual events or all auto events
-		$arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
+		$arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot, '', 0);		// If we use param 'all' instead of 'code', there is no group by include in answer but the key 'type' of answer array contains the key for the group by.
 		if (empty($multiselect)) {
 			// Add empty line at start only if no multiselect
 			array_unshift($arraylist, '&nbsp;');
@@ -394,7 +399,7 @@ class FormActions
 			}
 			$out .= $form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
 		} else {
-			$out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth300'.($morecss ? ' '.$morecss : ''), 1);
+			$out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', $morecss, 1);
 		}
 
 		if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0) {
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 05c5fe3a9ea..9f9a096c0b9 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -73,15 +73,19 @@ class FormAdmin
 
 		$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 12, 0, $mainlangonly);
 
-		// If the language to select is not inside the list of available language and empty value is not available, we must find
-		// an alternative as the language code to pre-select (to avoid to have first element in list pre-selected).
-		if ($selected && !array_key_exists($selected, $langs_available) && empty($showempty)) {
-			$tmparray = explode('_', $selected);
-			if (!empty($tmparray[1])) {
-				$selected = getLanguageCodeFromCountryCode($tmparray[1]);
-			}
-			if (empty($selected)) {
-				$selected = $langs->defaultlang;
+		// If empty value is not allowed and the language to select is not inside the list of available language and we must find
+		// an alternative of the language code to pre-select (to avoid to have first element in list pre-selected).
+		if ($selected && empty($showempty)) {
+			if (!is_array($selected) && !array_key_exists($selected, $langs_available)) {
+				$tmparray = explode('_', $selected);
+				if (!empty($tmparray[1])) {
+					$selected = getLanguageCodeFromCountryCode($tmparray[1]);
+				}
+				if (empty($selected)) {
+					$selected = $langs->defaultlang;
+				}
+			} else {
+				// If the preselected value is an array, we do not try to find alternative to preselect
 			}
 		}
 
@@ -304,7 +308,7 @@ class FormAdmin
 								if (preg_match('/\.lib/i', $filelib)) {
 									continue;
 								}
-								if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file, $expdevmenu)) {
+								if (getDolGlobalInt('MAIN_FEATURES_LEVEL') == 0 && in_array($file, $expdevmenu)) {
 									continue;
 								}
 
@@ -416,7 +420,7 @@ class FormAdmin
 		$langs->load("dict");
 
 		$sql = "SELECT code, label, width, height, unit";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_paper_format";
+		$sql .= " FROM ".$this->db->prefix()."c_paper_format";
 		$sql .= " WHERE active=1";
 		if ($filter) {
 			$sql .= " AND code LIKE '%".$this->db->escape($filter)."%'";
diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index 23811b1f5b7..8c3d84dffa4 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -67,7 +67,7 @@ class FormBarCode
 		$disable = '';
 
 		if (!empty($conf->use_javascript_ajax)) {
-			print "\n".'<script type="text/javascript" language="javascript">';
+			print "\n".'<script type="text/javascript">';
 			print 'jQuery(document).ready(function () {
                         jQuery("#select'.$idForm.'").change(function() {
                             var formName = document.getElementById("form'.$idForm.'");
@@ -139,7 +139,7 @@ class FormBarCode
 		$out = '';
 
 		$sql = "SELECT rowid, code, libelle";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+		$sql .= " FROM ".$this->db->prefix()."c_barcode_type";
 		$sql .= " WHERE coder <> '0'";
 		$sql .= " AND entity = ".$conf->entity;
 		$sql .= " ORDER BY code";
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 92106da94fd..5b3d07fe80f 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -56,7 +56,7 @@ class FormCompany extends Form
 		$effs = array();
 
 		$sql = "SELECT id, code, libelle";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_typent";
+		$sql .= " FROM ".$this->db->prefix()."c_typent";
 		$sql .= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id) ? '0' : $mysoc->country_id).")";
 		if ($filter) {
 			$sql .= " ".$filter;
@@ -105,7 +105,7 @@ class FormCompany extends Form
 		$effs = array();
 
 		$sql = "SELECT id, code, libelle";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_effectif";
+		$sql .= " FROM ".$this->db->prefix()."c_effectif";
 		$sql .= " WHERE active = 1";
 		if ($filter) {
 			$sql .= " ".$filter;
@@ -155,7 +155,7 @@ class FormCompany extends Form
 
 		dol_syslog(get_class($this).'::form_prospect_level', LOG_DEBUG);
 		$sql = "SELECT code, label";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
+		$sql .= " FROM ".$this->db->prefix()."c_prospectlevel";
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY sortorder";
 		$resql = $this->db->query($sql);
@@ -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 valignmiddle" value="'.$langs->trans("Modify").'">';
+		print '<input type="submit" class="button button-save valignmiddle" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
 
@@ -206,7 +206,7 @@ class FormCompany extends Form
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$sql = "SELECT code, label";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectcontactlevel";
+		$sql .= " FROM ".$this->db->prefix()."c_prospectcontactlevel";
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY sortorder";
 		$resql = $this->db->query($sql);
@@ -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 valignmiddle" value="'.$langs->trans("Modify").'">';
+		print '<input type="submit" class="button button-save valignmiddle" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
 
@@ -266,10 +266,11 @@ class FormCompany extends Form
 	 *    @param	int		$selected        	Code state preselected (mus be state id)
 	 *    @param    integer	$country_codeid    	Country code or id: 0=list for all countries, otherwise country code or country rowid to show
 	 *    @param    string	$htmlname			Id of department. If '', we want only the string with <option>
+	 *    @param	string	$morecss			Add more css
 	 * 	  @return	string						String with HTML select
 	 *    @see select_country()
 	 */
-	public function select_state($selected = 0, $country_codeid = 0, $htmlname = 'state_id')
+	public function select_state($selected = 0, $country_codeid = 0, $htmlname = 'state_id', $morecss = 'maxwidth200onsmartphone  minwidth300')
 	{
 		// phpcs:enable
 		global $conf, $langs, $user;
@@ -282,7 +283,7 @@ class FormCompany extends Form
 
 		// Serch departements/cantons/province active d'une region et pays actif
 		$sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.nom as region_name FROM";
-		$sql .= " ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " ".$this->db->prefix()."c_departements as d, ".$this->db->prefix()."c_regions as r,".$this->db->prefix()."c_country as c";
 		$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid";
 		$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
 		if ($country_codeid && is_numeric($country_codeid)) {
@@ -296,7 +297,7 @@ class FormCompany extends Form
 		$result = $this->db->query($sql);
 		if ($result) {
 			if (!empty($htmlname)) {
-				$out .= '<select id="'.$htmlname.'" class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'">';
+				$out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
 			}
 			if ($country_codeid) {
 				$out .= '<option value="0">&nbsp;</option>';
@@ -384,7 +385,7 @@ class FormCompany extends Form
 		$langs->load("dict");
 
 		$sql = "SELECT r.rowid, r.code_region as code, r.nom as label, r.active, c.code as country_code, c.label as country";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " FROM ".$this->db->prefix()."c_regions as r, ".$this->db->prefix()."c_country as c";
 		$sql .= " WHERE r.fk_pays=c.rowid AND r.active = 1 and c.active = 1";
 		$sql .= " ORDER BY c.code, c.label ASC";
 
@@ -443,7 +444,7 @@ class FormCompany extends Form
 
 		$out = '';
 
-		$sql = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_civility";
+		$sql = "SELECT rowid, code, label, active FROM ".$this->db->prefix()."c_civility";
 		$sql .= " WHERE active = 1";
 
 		dol_syslog("Form::select_civility", LOG_DEBUG);
@@ -524,7 +525,7 @@ class FormCompany extends Form
 
 		// On recherche les formes juridiques actives des pays actifs
 		$sql  = "SELECT f.rowid, f.code as code , f.libelle as label, f.active, c.label as country, c.code as country_code";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " FROM ".$this->db->prefix()."c_forme_juridique as f, ".$this->db->prefix()."c_country as c";
 		$sql .= " WHERE f.fk_pays=c.rowid";
 		$sql .= " AND f.active = 1 AND c.active = 1";
 		if ($country_codeid) {
@@ -700,8 +701,18 @@ class FormCompany extends Form
 			return $socid;
 		} else {
 			// Search to list thirdparties
-			$sql = "SELECT s.rowid, s.nom as name FROM";
-			$sql .= " ".MAIN_DB_PREFIX."societe as s";
+			$sql = "SELECT s.rowid, s.nom as name ";
+			if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST)) {
+				$sql .= ", s.code_client, s.code_fournisseur";
+			}
+			if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+				$sql .= ", s.address, s.zip, s.town";
+				$sql .= ", dictp.code as country_code";
+			}
+			$sql .= " FROM ".$this->db->prefix()."societe as s";
+			if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+				$sql .= " LEFT JOIN ".$this->db->prefix()."c_country as dictp ON dictp.rowid = s.fk_pays";
+			}
 			$sql .= " WHERE s.entity IN (".getEntity('societe').")";
 			// For ajax search we limit here. For combo list, we limit later
 			if (is_array($limitto) && count($limitto)) {
@@ -761,20 +772,21 @@ class FormCompany extends Form
 	/**
 	 *  Return a select list with types of contacts
 	 *
-	 *  @param	object		$object         Object to use to find type of contact
-	 *  @param  string		$selected       Default selected value
-	 *  @param  string		$htmlname		HTML select name
-	 *  @param  string		$source			Source ('internal' or 'external')
-	 *  @param  string		$sortorder		Sort criteria ('position', 'code', ...)
-	 *  @param  int			$showempty      1=Add en empty line
-	 *  @param  string      $morecss        Add more css to select component
-	 *  @param  int      	$output         0=return HTML, 1= direct print
+	 *  @param	object		$object         	Object to use to find type of contact
+	 *  @param  string		$selected       	Default selected value
+	 *  @param  string		$htmlname			HTML select name
+	 *  @param  string		$source				Source ('internal' or 'external')
+	 *  @param  string		$sortorder			Sort criteria ('position', 'code', ...)
+	 *  @param  int			$showempty      	1=Add en empty line
+	 *  @param  string      $morecss        	Add more css to select component
+	 *  @param  int      	$output         	0=return HTML, 1= direct print
 	 *  @param	int			$forcehidetooltip	Force hide tooltip for admin
-	 *  @return	void
+	 *  @return	string|void						Depending on $output param, return the HTML select list (recommended method) or nothing
 	 */
 	public function selectTypeContact($object, $selected, $htmlname = 'type', $source = 'internal', $sortorder = 'position', $showempty = 0, $morecss = '', $output = 1, $forcehidetooltip = 0)
 	{
 		global $user, $langs;
+
 		$out = '';
 		if (is_object($object) && method_exists($object, 'liste_type_contact')) {
 			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);
@@ -1085,7 +1097,7 @@ class FormCompany extends Form
 			$out .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
 		} else {
-			if ($selected) {
+			if ($selected > 0) {
 				$arr = $this->typent_array(0);
 				$typent = $arr[$selected];
 				$out .= $typent;
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index 5db615f4654..f3798181bcd 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -64,7 +64,7 @@ class FormContract
 	public function select_contract($socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0)
 	{
 		// phpcs:enable
-		global $db, $user, $conf, $langs;
+		global $user, $conf, $langs;
 
 		$hideunselectables = false;
 		if (!empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) {
@@ -72,9 +72,9 @@ class FormContract
 		}
 
 		// Search all contacts
-		$sql = 'SELECT c.rowid, c.ref, c.fk_soc, c.statut,';
-		$sql .= ' c.ref_customer, c.ref_supplier';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'contrat as c';
+		$sql = "SELECT c.rowid, c.ref, c.fk_soc, c.statut,";
+		$sql .= " c.ref_customer, c.ref_supplier";
+		$sql .= " FROM ".$this->db->prefix()."contrat as c";
 		$sql .= " WHERE c.entity = ".$conf->entity;
 		//if ($contratListId) $sql.= " AND c.rowid IN (".$this->db->sanitize($contratListId).")";
 		if ($socid > 0) {
@@ -104,7 +104,7 @@ class FormContract
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire) {
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($user->rights->societe->lire)) {
 						// Do nothing
 					} else {
 						$labeltoshow = dol_trunc($obj->ref, 18);
diff --git a/htdocs/core/class/html.formexpensereport.class.php b/htdocs/core/class/html.formexpensereport.class.php
index 5ecc4e4669d..b20260acc41 100644
--- a/htdocs/core/class/html.formexpensereport.class.php
+++ b/htdocs/core/class/html.formexpensereport.class.php
@@ -112,7 +112,7 @@ class FormExpenseReport
 			$out .= '>&nbsp;</option>';
 		}
 
-		$sql = "SELECT c.id, c.code, c.label as type FROM ".MAIN_DB_PREFIX."c_type_fees as c";
+		$sql = "SELECT c.id, c.code, c.label as type FROM ".$this->db->prefix()."c_type_fees as c";
 		if ($active >= 0) {
 			$sql .= " WHERE c.active = ".((int) $active);
 		}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index fcca60dad78..217bba55330 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -359,7 +359,7 @@ 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				$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				$urlsource          Url of origin page (for return)
@@ -379,9 +379,10 @@ class FormFile
 	 *      @param      Object              $object             Object when method is called from an object card.
 	 *      @param		int					$hideifempty		Hide section of generated files if there is no file
 	 *      @param      string              $removeaction       (optional) The action to remove a file
+	 *      @param		string				$tooltipontemplatecombo		Text to show on a tooltip after the combo list of templates
 	 * 		@return		string              					Output string with HTML array of documents (might be empty string)
 	 */
-	public function showdocuments($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed = 0, $modelselected = '', $allowgenifempty = 1, $forcenomultilang = 0, $iconPDF = 0, $notused = 0, $noform = 0, $param = '', $title = '', $buttonlabel = '', $codelang = '', $morepicto = '', $object = null, $hideifempty = 0, $removeaction = 'remove_file')
+	public function showdocuments($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed = 0, $modelselected = '', $allowgenifempty = 1, $forcenomultilang = 0, $iconPDF = 0, $notused = 0, $noform = 0, $param = '', $title = '', $buttonlabel = '', $codelang = '', $morepicto = '', $object = null, $hideifempty = 0, $removeaction = 'remove_file', $tooltipontemplatecombo = '')
 	{
 		global $dolibarr_main_url_root;
 
@@ -393,6 +394,38 @@ class FormFile
 		global $langs, $conf, $user, $hookmanager;
 		global $form;
 
+		$reshook = 0;
+		if (is_object($hookmanager)) {
+			$parameters = array(
+				'modulepart'=>&$modulepart,
+				'modulesubdir'=>&$modulesubdir,
+				'filedir'=>&$filedir,
+				'urlsource'=>&$urlsource,
+				'genallowed'=>&$genallowed,
+				'delallowed'=>&$delallowed,
+				'modelselected'=>&$modelselected,
+				'allowgenifempty'=>&$allowgenifempty,
+				'forcenomultilang'=>&$forcenomultilang,
+				'noform'=>&$noform,
+				'param'=>&$param,
+				'title'=>&$title,
+				'buttonlabel'=>&$buttonlabel,
+				'codelang'=>&$codelang,
+				'morepicto'=>&$morepicto,
+				'hideifempty'=>&$hideifempty,
+				'removeaction'=>&$removeaction
+			);
+			$reshook = $hookmanager->executeHooks('showDocuments', $parameters, $object); // Note that parameters may have been updated by hook
+			// May report error
+			if ($reshook < 0) {
+				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			}
+		}
+		// Remode default action if $reskook > 0
+		if ($reshook > 0) {
+			return $hookmanager->resPrint;
+		}
+
 		if (!is_object($form)) {
 			$form = new Form($this->db);
 		}
@@ -410,7 +443,8 @@ class FormFile
 		}
 
 		$printer = 0;
-		if (in_array($modulepart, array('facture', 'supplier_proposal', 'propal', 'proposal', 'order', 'commande', 'expedition', 'commande_fournisseur', 'expensereport', 'delivery', 'ticket'))) {	// The direct print feature is implemented only for such elements
+		// The direct print feature is implemented only for such elements
+		if (in_array($modulepart, array('contract', 'facture', 'supplier_proposal', 'propal', 'proposal', 'order', 'commande', 'expedition', 'commande_fournisseur', 'expensereport', 'delivery', 'ticket'))) {
 			$printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled)) ?true:false;
 		}
 
@@ -468,7 +502,7 @@ class FormFile
 			$modellist = array();
 
 			if ($modulepart == 'company') {
-				$showempty = 1;		// can have no template active
+				$showempty = 1; // can have no template active
 				if (is_array($genallowed)) {
 					$modellist = $genallowed;
 				} else {
@@ -532,7 +566,7 @@ class FormFile
 					$modellist = ModelePDFFactures::liste_modeles($this->db);
 				}
 			} elseif ($modulepart == 'contract') {
-				$showempty = 1;		// can have no template active
+				$showempty = 1; // can have no template active
 				if (is_array($genallowed)) {
 					$modellist = $genallowed;
 				} else {
@@ -596,7 +630,7 @@ class FormFile
 					$modellist = ModelePDFSuppliersOrders::liste_modeles($this->db);
 				}
 			} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice') {
-				$showempty = 1; 	// can have no template active
+				$showempty = 1; // can have no template active
 				if (is_array($genallowed)) {
 					$modellist = $genallowed;
 				} else {
@@ -686,7 +720,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;
 				}
 			}
@@ -702,9 +736,10 @@ class FormFile
 				$urlsource .= '#'.$forname.'_form'; // So we switch to form after a generation
 			}
 			if (empty($noform)) {
-				$out .= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc').'" id="'.$forname.'_form" method="post">';
+				$out .= '<form action="'.$urlsource.'" id="'.$forname.'_form" method="post">';
 			}
 			$out .= '<input type="hidden" name="action" value="builddoc">';
+			$out .= '<input type="hidden" name="page_y" value="">';
 			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 
 			$out .= load_fiche_titre($titletoshow, '', '');
@@ -727,7 +762,7 @@ class FormFile
 					$arraykeys = array_keys($modellist);
 					$modelselected = $arraykeys[0];
 				}
-				$morecss = 'maxwidth200';
+				$morecss = 'minwidth75 maxwidth200';
 				if ($conf->browser->layout == 'phone') {
 					$morecss = 'maxwidth100';
 				}
@@ -735,6 +770,7 @@ class FormFile
 				if ($conf->use_javascript_ajax) {
 					$out .= ajax_combobox('model');
 				}
+				$out .= $form->textwithpicto('', $tooltipontemplatecombo, 1, 'help', 'marginrightonly', 0, 3, '', 0);
 			} else {
 				$out .= '<div class="float">'.$langs->trans("Files").'</div>';
 			}
@@ -754,7 +790,7 @@ class FormFile
 			}
 
 			// Button
-			$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+			$genbutton = '<input class="button buttongen reposition" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
 			$genbutton .= ' type="submit" value="'.$buttonlabel.'"';
 			if (!$allowgenifempty && !is_array($modellist) && empty($modellist)) {
 				$genbutton .= ' disabled';
@@ -854,7 +890,7 @@ class FormFile
 
 					$mime = dol_mimetype($relativepath, '', 0);
 					if (preg_match('/text/', $mime)) {
-						$out .= ' target="_blank"';
+						$out .= ' target="_blank" rel="noopener noreferrer"';
 					}
 					$out .= '>';
 					$out .= img_mime($file["name"], $langs->trans("File").': '.$file["name"]);
@@ -899,20 +935,20 @@ class FormFile
 					}
 					$out .= '</td>';
 
+					// Show picto delete, print...
 					if ($delallowed || $printer || $morepicto) {
 						$out .= '<td class="right nowraponall">';
 						if ($delallowed) {
 							$tmpurlsource = preg_replace('/#[a-zA-Z0-9_]*$/', '', $urlsource);
-							$out .= '<a href="'.$tmpurlsource.((strpos($tmpurlsource, '?') === false) ? '?' : '&amp;').'action='.$removeaction.'&amp;file='.urlencode($relativepath);
-							$out .= ($param ? '&amp;'.$param : '');
+							$out .= '<a class="reposition" href="'.$tmpurlsource.((strpos($tmpurlsource, '?') === false) ? '?' : '&').'action='.urlencode($removeaction).'&token='.newToken().'&file='.urlencode($relativepath);
+							$out .= ($param ? '&'.$param : '');
 							//$out.= '&modulepart='.$modulepart; // TODO obsolete ?
 							//$out.= '&urlsource='.urlencode($urlsource); // TODO obsolete ?
 							$out .= '">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 						}
 						if ($printer) {
-							//$out.= '<td class="right">';
-							$out .= '<a class="marginleftonly" href="'.$urlsource.(strpos($urlsource, '?') ? '&amp;' : '?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
-							$out .= ($param ? '&amp;'.$param : '');
+							$out .= '<a class="marginleftonly reposition" href="'.$urlsource.(strpos($urlsource, '?') ? '&' : '?').'action=print_file&token='.newToken().'&printer='.urlencode($modulepart).'&file='.urlencode($relativepath);
+							$out .= ($param ? '&'.$param : '');
 							$out .= '">'.img_picto($langs->trans("PrintFile", $relativepath), 'printer.png').'</a>';
 						}
 						if ($morepicto) {
@@ -943,7 +979,7 @@ class FormFile
 				foreach ($link_list as $file) {
 					$out .= '<tr class="oddeven">';
 					$out .= '<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">';
-					$out .= '<a data-ajax="false" href="'.$file->url.'" target="_blank">';
+					$out .= '<a data-ajax="false" href="'.$file->url.'" target="_blank" rel="noopener noreferrer">';
 					$out .= $file->label;
 					$out .= '</a>';
 					$out .= '</td>';
@@ -959,7 +995,7 @@ class FormFile
 			}
 
 			if (count($file_list) == 0 && count($link_list) == 0 && $headershown) {
-				$out .= '<tr><td colspan="'.(3 + ($addcolumforpicto ? 1 : 0)).'" class="opacitymedium">'.$langs->trans("None").'</td></tr>'."\n";
+				$out .= '<tr><td colspan="'.(3 + ($addcolumforpicto ? 1 : 0)).'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>'."\n";
 			}
 		}
 
@@ -1073,7 +1109,7 @@ class FormFile
 				$tmpout .= '<li class="nowrap"><a class="pictopreview nowrap" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&amp;entity='.$entity.'&amp;file='.urlencode($relativepath).'"';
 				$mime = dol_mimetype($relativepath, '', 0);
 				if (preg_match('/text/', $mime)) {
-					$tmpout .= ' target="_blank"';
+					$tmpout .= ' target="_blank" rel="noopener noreferrer"';
 				}
 				$tmpout .= '>';
 				$tmpout .= img_mime($relativepath, $file["name"]);
@@ -1235,7 +1271,7 @@ class FormFile
 			}
 
 			print '<div class="div-table-responsive-no-min">';
-			print '<table width="100%" id="tablelines" class="liste noborder nobottom">'."\n";
+			print '<table id="tablelines" class="centpercent liste noborder nobottom">'."\n";
 
 			if (!empty($addfilterfields)) {
 				print '<tr class="liste_titre nodrag nodrop">';
@@ -1305,11 +1341,11 @@ class FormFile
 					print '<tr class="oddeven" id="row-'.($filearray[$key]['rowid'] > 0 ? $filearray[$key]['rowid'] : 'AFTER'.$lastrowid.'POS'.($i + 1)).'">';
 
 					// File name
-					print '<td class="minwith200">';
+					print '<td class="minwith200 tdoverflowmax500">';
 
 					// Show file name with link to download
 					//print "XX".$file['name'];	//$file['name'] must be utf8
-					print '<a class="paddingright" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
+					print '<a class="paddingright valignmiddle" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 					if ($forcedownload) {
 						print '&attachment=1';
 					}
@@ -1318,7 +1354,7 @@ class FormFile
 					}
 					print '&file='.urlencode($filepath);
 					print '">';
-					print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'], 0, 0).')', 'inline-block valignbottom paddingright');
+					print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'], 0, 0).')', 'inline-block valignmiddle paddingright');
 					if ($showrelpart == 1) {
 						print $relativepath;
 					}
@@ -1340,7 +1376,7 @@ class FormFile
 					}
 					// Preview link
 					if (!$editline) {
-						print $this->showPreview($file, $modulepart, $filepath, 0, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+						print $this->showPreview($file, $modulepart, $filepath, 0, 'entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
 					}
 
 					print "</td>\n";
@@ -1357,7 +1393,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) {
@@ -1377,11 +1413,11 @@ class FormFile
 							$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
 							if (empty($urlforhref)) {
 								$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
-								print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
+								print '<a href="'.$urlforhref.'" class="aphoto" target="_blank" rel="noopener noreferrer">';
 							} else {
 								print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
 							}
-							print '<img class="photo maxwidth200 shadow valignmiddle" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6) ? '12' : $maxheightmini).'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$smallfile).'" title="">';
+							print '<img class="photo maxwidth200 shadow valignmiddle" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6) ? '20' : $maxheightmini).'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$smallfile).'" title="">';
 							print '</a>';
 						} else {
 							print '&nbsp;';
@@ -1456,7 +1492,7 @@ class FormFile
 
 							if ($permtoeditline) {
 								$paramsectiondir = (in_array($modulepart, array('medias', 'ecm')) ? '&section_dir='.urlencode($relativepath) : '');
-								print '<a class="editfielda reposition editfilelink" href="'.(($useinecm == 1 || $useinecm == 5) ? '#' : ($url.'?action=editfile&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" rel="'.$filepath.'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
+								print '<a class="editfielda reposition editfilelink" href="'.(($useinecm == 1 || $useinecm == 5) ? '#' : ($url.'?action=editfile&token='.newToken().'&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" rel="'.$filepath.'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
 							}
 						}
 						if ($permonobject) {
@@ -1470,7 +1506,7 @@ class FormFile
 							if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) {
 								$useajax = 0;
 							}
-							print '<a href="'.((($useinecm && $useinecm != 6) && $useajax) ? '#' : ($url.'?action=delete&token='.newToken().'&urlfile='.urlencode($filepath).$param)).'" class="reposition deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
+							print '<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 "</td>";
 
@@ -1478,10 +1514,10 @@ class FormFile
 							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.'&amp;action=up&amp;rowid='.$line->id.'">'.img_up('default', 0, 'imgupforline').'</a>';
+									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) {
-									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default', 0, 'imgdownforline').'</a>';
+									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=down&rowid='.$line->id.'">'.img_down('default', 0, 'imgdownforline').'</a>';
 								}
 								print '</td>';
 							} else {
@@ -1509,11 +1545,11 @@ class FormFile
 				if (empty($disablemove)) {
 					$colspan++; // 6 columns or 7
 				}
-				print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">';
+				print '<tr class="oddeven"><td colspan="'.$colspan.'">';
 				if (empty($textifempty)) {
-					print $langs->trans("NoFileFound");
+					print '<span class="opacitymedium">'.$langs->trans("NoFileFound").'</span>';
 				} else {
-					print $textifempty;
+					print '<span class="opacitymedium">'.$textifempty.'</span>';
 				}
 				print '</td></tr>';
 			}
@@ -1612,6 +1648,7 @@ class FormFile
 		print '</tr>'."\n";
 
 		// To show ref or specific information according to view to show (defined by $module)
+		$object_instance = null;
 		if ($modulepart == 'company') {
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 			$object_instance = new Societe($this->db);
@@ -1642,6 +1679,12 @@ class FormFile
 		} elseif ($modulepart == 'tax') {
 			include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 			$object_instance = new ChargeSociales($this->db);
+		} elseif ($modulepart == 'tax-vat') {
+			include_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+			$object_instance = new Tva($this->db);
+		} elseif ($modulepart == 'salaries') {
+			include_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
+			$object_instance = new Salary($this->db);
 		} elseif ($modulepart == 'project') {
 			include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 			$object_instance = new Project($this->db);
@@ -1675,7 +1718,7 @@ class FormFile
 		} else {
 			$parameters = array('modulepart'=>$modulepart);
 			$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
-			if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray)>0) {
+			if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray) > 0) {
 				if (array_key_exists('classpath', $hookmanager->resArray) && !empty($hookmanager->resArray['classpath'])) {
 					dol_include_once($hookmanager->resArray['classpath']);
 					if (array_key_exists('classname', $hookmanager->resArray) && !empty($hookmanager->resArray['classname'])) {
@@ -1689,6 +1732,7 @@ class FormFile
 		}
 
 		//var_dump($filearray);
+		//var_dump($object_instance);
 
 		// Get list of files stored into database for same relative directory
 		$relativepathfromroot = preg_replace('/'.preg_quote(DOL_DATA_ROOT.'/', '/').'/', '', $upload_dir);
@@ -1718,7 +1762,7 @@ class FormFile
 				// To show ref or specific information according to view to show (defined by $modulepart)
 				// $modulepart can be $object->table_name (that is 'mymodule_myobject') or $object->element.'-'.$module (for compatibility purpose)
 				$reg = array();
-				if ($modulepart == 'company' || $modulepart == 'tax') {
+				if ($modulepart == 'company' || $modulepart == 'tax' || $modulepart == 'tax-vat' || $modulepart == 'salaries') {
 					preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg);
 					$id = (isset($reg[1]) ? $reg[1] : '');
 				} elseif ($modulepart == 'invoice_supplier') {
@@ -1756,9 +1800,9 @@ class FormFile
 					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg);
 					$ref = (isset($reg[1]) ? $reg[1] : '');
 				} else {
-					$parameters = array('modulepart'=>$modulepart,'fileinfo'=>$file);
+					$parameters = array('modulepart'=>$modulepart, 'fileinfo'=>$file);
 					$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
-					if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray)>0) {
+					if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray) > 0) {
 						if (array_key_exists('ref', $hookmanager->resArray) && !empty($hookmanager->resArray['ref'])) {
 							$ref = $hookmanager->resArray['ref'];
 						}
@@ -1772,21 +1816,26 @@ class FormFile
 				if (!$id && !$ref) {
 					continue;
 				}
+
 				$found = 0;
 				if (!empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) {
 					$found = 1;
 				} else {
 					//print 'Fetch '.$id." - ".$ref.' class='.get_class($object_instance).'<br>';
 
-					if ($id) {
-						$result = $object_instance->fetch($id);
-					} else {
-						//fetchOneLike looks for objects with wildcards in its reference.
-						//It is useful for those masks who get underscores instead of their actual symbols
-						//fetchOneLike requires some info in the object. If it doesn't have it, then 0 is returned
-						//that's why we look only into fetchOneLike when fetch returns 0
-						if (!$result = $object_instance->fetch('', $ref)) {
-							$result = $object_instance->fetchOneLike($ref);
+					$result = 0;
+					if (is_object($object_instance)) {
+						if ($id) {
+							$result = $object_instance->fetch($id);
+						} else {
+							if (!($result = $object_instance->fetch('', $ref))) {
+								//fetchOneLike looks for objects with wildcards in its reference.
+								//It is useful for those masks who get underscores instead of their actual symbols (because the _ had replaced a forbiddn char)
+								//fetchOneLike requires some info in the object. If it doesn't have it, then 0 is returned
+								//that's why we look only into fetchOneLike when fetch returns 0
+								// TODO Remove this part ?
+								$result = $object_instance->fetchOneLike($ref);
+							}
 						}
 					}
 
@@ -2052,13 +2101,13 @@ class FormFile
 				print '<td class="center">'.dol_print_date(dol_now(), "dayhour", "tzuser").'</td>';
 				print '<td class="right"></td>';
 				print '<td class="right">';
-				print '<input type="submit" name="save" class="button button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
-				print '<input type="submit" name="cancel" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+				print '<input type="submit" class="button button-save" name="save" 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>';
 			} else {
 				print '<td>';
 				print img_picto('', 'globe').' ';
-				print '<a data-ajax="false" href="'.$link->url.'" target="_blank">';
+				print '<a data-ajax="false" href="'.$link->url.'" target="_blank" rel="noopener noreferrer">';
 				print dol_escape_htmltag($link->label);
 				print '</a>';
 				print '</td>'."\n";
@@ -2077,8 +2126,8 @@ class FormFile
 			print "</tr>\n";
 		}
 		if ($nboflinks == 0) {
-			print '<tr class="oddeven"><td colspan="5" class="opacitymedium">';
-			print $langs->trans("NoLinkFound");
+			print '<tr class="oddeven"><td colspan="5">';
+			print '<span class="opacitymedium">'.$langs->trans("NoLinkFound").'</span>';
 			print '</td></tr>';
 		}
 		print "</table>";
diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php
index 7058e80b1d7..107e9ba378a 100644
--- a/htdocs/core/class/html.formintervention.class.php
+++ b/htdocs/core/class/html.formintervention.class.php
@@ -57,21 +57,22 @@ class FormIntervention
 	 *	@param  int		$selected   Id intervention preselected
 	 *	@param  string	$htmlname   Nom de la zone html
 	 *	@param	int		$maxlength	Maximum length of label
-	 *	@param	int		$showempty	Show empty line
+	 *	@param	int		$showempty	Show empty line ('1' or string to show for empty line)
+	 *	@param	int		$draftonly	Show only drafts intervention
 	 *	@return int         		Nbre of project if OK, <0 if KO
 	 */
-	public function select_interventions($socid = -1, $selected = '', $htmlname = 'interventionid', $maxlength = 16, $showempty = 1)
+	public function select_interventions($socid = -1, $selected = '', $htmlname = 'interventionid', $maxlength = 16, $showempty = 1, $draftonly = false)
 	{
 		// phpcs:enable
-		global $db, $user, $conf, $langs;
+		global $user, $conf, $langs;
 
 		$out = '';
 
 		$hideunselectables = false;
 
 		// Search all contacts
-		$sql = 'SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinter as f';
+		$sql = "SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut";
+		$sql .= " FROM ".$this->db->prefix()."fichinter as f";
 		$sql .= " WHERE f.entity = ".$conf->entity;
 		if ($socid != '') {
 			if ($socid == '0') {
@@ -80,13 +81,17 @@ class FormIntervention
 				$sql .= " AND f.fk_soc = ".((int) $socid);
 			}
 		}
+		if ($draftonly) $sql .= " AND f.fk_statut = 0";
 
 		dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$out .= '<select id="interventionid" class="flat" name="'.dol_escape_htmltag($htmlname).'">';
 			if ($showempty) {
-				$out .= '<option value="0">&nbsp;</option>';
+				$out .= '<option value="0">';
+				if (!is_numeric($showempty)) $out .= $showempty;
+				else $out .= '&nbsp;';
+				$out .= '</option>';
 			}
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -94,7 +99,7 @@ class FormIntervention
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire) {
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($user->rights->societe->lire)) {
 						// Do nothing
 					} else {
 						$labeltoshow = dol_trunc($obj->ref, 18);
@@ -102,7 +107,7 @@ class FormIntervention
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						} else {
 							$disabled = 0;
-							if (!$obj->fk_statut > 0) {
+							if (!$obj->fk_statut > 0 && ! $draftonly) {
 								$disabled = 1;
 								$labeltoshow .= ' ('.$langs->trans("Draft").')';
 							}
diff --git a/htdocs/core/class/html.formldap.class.php b/htdocs/core/class/html.formldap.class.php
new file mode 100644
index 00000000000..04c204edfd2
--- /dev/null
+++ b/htdocs/core/class/html.formldap.class.php
@@ -0,0 +1,201 @@
+<?php
+/* Copyright (C) 2021	Regis Houssin	<regis.houssin@inodbox.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/core/class/html.formldap.class.php
+ *       \ingroup    core
+ *       \brief      File of class with ldap html predefined components
+ */
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+
+/**
+ *      Class to manage generation of HTML components for ldap module
+ */
+class FormLdap
+{
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
+
+	/**
+	 * @var string[]	Array of error strings
+	 */
+	public $errors = array();
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $form;
+
+		if (!is_object($form)) {
+			$form = new Form($this->db);
+		}
+
+		$langs->loadLangs(array("admin", "ldap"));
+
+		$this->db = $db;
+	}
+
+	/**
+	 *  Return list of types of hash
+	 *
+	 *  @param	string		$selected		Preselected type
+	 *	@param  string		$htmlname		Name of field in form
+	 * 	@param	int			$showempty		Add an empty field
+	 *  @return	string						HTML select string
+	 */
+	public function selectLdapPasswordHashType($selected = 'md5', $htmlname = 'ldaphashtype', $showempty = 0)
+	{
+		global $form;
+
+		if (empty($selected)) {
+			$selected = 'md5';
+		}
+		if (empty($htmlname)) {
+			$htmlname = 'ldaphashtype';
+		}
+
+		$arraylist = array(
+			//"pbkdf2sha256"	=> "PBKDF2_SHA256",
+			"ssha512"		=> "SSHA-512",
+			"ssha384"		=> "SSHA-384",
+			"ssha256"		=> "SSHA-256",
+			"ssha" 			=> "SSHA",
+			"sha512"		=> "SHA-512",
+			"sha384"		=> "SHA-384",
+			"sha256"		=> "SHA-256",
+			"sha"			=> "SHA",
+			"md5"			=> "MD5",
+			"smd5"			=> "SMD5",
+			//"cryptmd5"	=> "CRYPT-MD5",
+			//"cryptsha512"	=> "CRYPT-SHA512",
+			//"cryptsha384"	=> "CRYPT-SHA384",
+			//"cryptsha256"	=> "CRYPT-SHA256",
+			"crypt"			=> "CRYPT",
+			"clear"			=> "CLEAR"
+		);
+
+		return $form->selectarray($htmlname, $arraylist, $selected, $showempty);
+	}
+
+	/**
+	 *	Return list of type of synchronization
+	 *
+	 *	@param	int			$selected		Preselected type
+	 *	@param  string		$htmlname		Name of field in form
+	 *	@param	array		$exclude		Exclude values from the list
+	 *	@param	int			$scriptonly		Add warning if synchro only work with a script (0 = disable, 1 = Dolibarr2ldap, 2 = ldap2dolibarr, 3 = all)
+	 * 	@param	int			$showempty		Add an empty field
+	 *  @return	string						HTML select string
+	 */
+	public function selectLdapDnSynchroActive($selected = 0, $htmlname = 'activesynchro', $exclude = array(), $scriptonly = 0, $showempty = 0)
+	{
+		global $langs, $form;
+
+		if (empty($selected)) {
+			$selected = Ldap::SYNCHRO_NONE;
+		}
+		if (empty($htmlname)) {
+			$htmlname = 'activesynchro';
+		}
+
+		$dolibarr2ldaplabel = $langs->trans("DolibarrToLDAP") . (($scriptonly == 1 || $scriptonly == 3) ? " (".$langs->trans("SupportedForLDAPExportScriptOnly").")" : "");
+		$ldap2dolibarrlabel = $langs->trans("LDAPToDolibarr") . (($scriptonly == 2 || $scriptonly == 3) ? " (".$langs->trans("SupportedForLDAPImportScriptOnly").")" : "");
+
+		$arraylist = array(
+			Ldap::SYNCHRO_NONE				=> $langs->trans("No"),
+			Ldap::SYNCHRO_DOLIBARR_TO_LDAP	=> $dolibarr2ldaplabel,
+			Ldap::SYNCHRO_LDAP_TO_DOLIBARR	=> $ldap2dolibarrlabel
+		);
+
+		if (is_array($exclude) && !empty($exclude)) {
+			foreach ($exclude as $value) {
+				if (array_key_exists($value, $arraylist)) {
+					unset($arraylist[$value]);
+				}
+			}
+		}
+
+		return $form->selectarray($htmlname, $arraylist, $selected, $showempty);
+	}
+
+	/**
+	 *  Return list of ldap server types
+	 *
+	 *  @param	string		$selected		Preselected type
+	 *	@param  string		$htmlname		Name of field in form
+	 * 	@param	int			$showempty		Add an empty field
+	 *  @return	string						HTML select string
+	 */
+	public function selectLdapServerType($selected = 'openldap', $htmlname = 'type', $showempty = 0)
+	{
+		global $form;
+
+		if (empty($selected)) {
+			$selected = 'openldap';
+		}
+		if (empty($htmlname)) {
+			$htmlname = 'type';
+		}
+
+		$arraylist = array(
+			'activedirectory'	=> 'Active Directory',
+			'openldap'			=> 'OpenLdap',
+			'egroupware'		=> 'Egroupware'
+		);
+
+		return $form->selectarray($htmlname, $arraylist, $selected, $showempty);
+	}
+
+	/**
+	 *  Return list of ldap server protocol version
+	 *
+	 *  @param	string		$selected		Preselected type
+	 *	@param  string		$htmlname		Name of field in form
+	 * 	@param	int			$showempty		Add an empty field
+	 *  @return	string						HTML select string
+	 */
+	public function selectLdapServerProtocolVersion($selected = '3', $htmlname = 'ldapprotocolversion', $showempty = 0)
+	{
+		global $form;
+
+		if (empty($selected)) {
+			$selected = '3';
+		}
+		if (empty($htmlname)) {
+			$htmlname = 'ldapprotocolversion';
+		}
+
+		$arraylist = array(
+			'3'	=> 'Version 3',
+			'2'	=> 'Version 2'
+		);
+
+		return $form->selectarray($htmlname, $arraylist, $selected, $showempty);
+	}
+}
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 4356bfd932e..752f57dfdf9 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -157,6 +157,9 @@ class FormMail extends Form
 
 	public $lines_model;
 
+	// -1 suggest the checkbox 'one email per recipient' not checked, 0 = no suggestion, 1 = suggest and checked
+	public $withoptiononeemailperrecipient;
+
 
 	/**
 	 *	Constructor
@@ -355,7 +358,7 @@ class FormMail extends Form
 		// phpcs:enable
 		global $conf, $langs, $user, $hookmanager, $form;
 
-		// Required to show preview of mail attachments
+		// Required to show preview wof mail attachments
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 		$formfile = new Formfile($this->db);
 
@@ -364,7 +367,7 @@ class FormMail extends Form
 		}
 
 		// Load translation files required by the page
-		$langs->loadLangs(array('other', 'mails'));
+		$langs->loadLangs(array('other', 'mails', 'members'));
 
 		// Clear temp files. Must be done before call of triggers, at beginning (mode = init), or when we select a new template
 		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
@@ -462,11 +465,10 @@ class FormMail extends Form
 			$modelmail_array = array();
 			if ($this->param['models'] != 'none') {
 				$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
-
 				if ($result < 0) {
 					setEventMessages($this->error, $this->errors, 'errors');
 				}
-				$langs->trans("members");
+
 				foreach ($this->lines_model as $line) {
 					$reg = array();
 					if (preg_match('/\((.*)\)/', $line->label, $reg)) {
@@ -501,7 +503,7 @@ class FormMail extends Form
 				}
 
 				$out .= ' &nbsp; ';
-				$out .= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
+				$out .= '<input type="submit" class="button reposition" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
 				$out .= ' &nbsp; ';
 				$out .= '</div>';
 			} elseif (!empty($this->param['models']) && in_array($this->param['models'], array(
@@ -516,7 +518,7 @@ class FormMail extends Form
 					$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);
 				}
 				$out .= ' &nbsp; ';
-				$out .= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" disabled="disabled" id="modelselected">';
+				$out .= '<input type="submit" class="button" value="'.$langs->trans('Apply').'" name="modelselected" disabled="disabled" id="modelselected">';
 				$out .= ' &nbsp; ';
 				$out .= '</div>';
 			} else {
@@ -524,7 +526,7 @@ class FormMail extends Form
 			}
 
 
-			$out .= '<table class="tableforemailform boxtablenotop" width="100%">'."\n";
+			$out .= '<table class="tableforemailform boxtablenotop centpercent">'."\n";
 
 			// Substitution array/string
 			$helpforsubstitution = '';
@@ -600,9 +602,9 @@ class FormMail extends Form
 						}
 
 						// Add also email aliases from the c_email_senderprofile table
-						$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile';
-						$sql .= ' WHERE active = 1 AND (private = 0 OR private = '.$user->id.')';
-						$sql .= ' ORDER BY position';
+						$sql = "SELECT rowid, label, email FROM ".$this->db->prefix()."c_email_senderprofile";
+						$sql .= " WHERE active = 1 AND (private = 0 OR private = ".((int) $user->id).")";
+						$sql .= " ORDER BY position";
 						$resql = $this->db->query($sql);
 						if ($resql) {
 							$num = $this->db->num_rows($resql);
@@ -686,16 +688,20 @@ class FormMail extends Form
 
 			// With option one email per recipient
 			if (!empty($this->withoptiononeemailperrecipient)) {
-				$out .= '<tr><td class="minwidth200">';
-				$out .= $langs->trans("GroupEmails");
-				$out .= '</td><td>';
-				$out .= ' <input type="checkbox" id="oneemailperrecipient" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0 ? ' checked="checked"' : '').'> ';
-				$out .= '<label for="oneemailperrecipient">'.$langs->trans("OneEmailPerRecipient").'</label>';
-				$out .= '<span class="hideonsmartphone opacitymedium">';
-				$out .= ' - ';
-				$out .= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");
-				$out .= '</span>';
-				$out .= '</td></tr>';
+				if (abs($this->withoptiononeemailperrecipient) == 1) {
+					$out .= '<tr><td class="minwidth200">';
+					$out .= $langs->trans("GroupEmails");
+					$out .= '</td><td>';
+					$out .= ' <input type="checkbox" id="oneemailperrecipient" value="1" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0 ? ' checked="checked"' : '').'> ';
+					$out .= '<label for="oneemailperrecipient">'.$langs->trans("OneEmailPerRecipient").'</label>';
+					$out .= '<span class="hideonsmartphone opacitymedium">';
+					$out .= ' - ';
+					$out .= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");
+					$out .= '</span>';
+					$out .= '</td></tr>';
+				} else {
+					$out .= '<tr><td><input type="hidden" name="oneemailperrecipient" value="1"></td><td></td></tr>';
+				}
 			}
 
 			// CC
@@ -781,7 +787,7 @@ class FormMail extends Form
 				if (is_numeric($this->withfile)) {
 					// TODO Trick to have param removedfile containing nb of file to delete. But this does not works without javascript
 					$out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
-					$out .= '<script type="text/javascript" language="javascript">';
+					$out .= '<script type="text/javascript">';
 					$out .= 'jQuery(document).ready(function () {';
 					$out .= '    jQuery(".removedfile").click(function() {';
 					$out .= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
@@ -811,8 +817,7 @@ class FormMail extends Form
 							$out .= '<br></div>';
 						}
 					} elseif (empty($this->withmaindocfile)) {
-						// Do not show message if we asked to show the checkbox
-						$out .= $langs->trans("NoAttachedFiles").'<br>';
+						$out .= '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
 					}
 					if ($this->withfile == 2) {
 						// Can add other files
@@ -822,7 +827,7 @@ class FormMail extends Form
 							$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
 						}
 						$out .= ' ';
-						$out .= '<input class="button" type="submit" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
+						$out .= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
 					}
 				} else {
 					$out .= $this->withfile;
@@ -957,15 +962,14 @@ class FormMail extends Form
 			$out .= '</table>'."\n";
 
 			if ($this->withform == 1 || $this->withform == -1) {
-				$out .= '<br><div class="center">';
-				$out .= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
+				$out .= '<div class="center">';
+				$out .= '<input type="submit" class="button button-add" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
 				// Add a javascript test to avoid to forget to submit file before sending email
 				if ($this->withfile == 2 && $conf->use_javascript_ajax) {
 					$out .= ' onClick="if (document.mailform.addedfile.value != \'\') { alert(\''.dol_escape_js($langs->trans("FileWasNotUploaded")).'\'); return false; } else { return true; }"';
 				}
 				$out .= ' />';
 				if ($this->withcancel) {
-					$out .= ' &nbsp; &nbsp; ';
 					$out .= '<input class="button button-cancel" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
 				}
 				$out .= '</div>'."\n";
@@ -977,7 +981,7 @@ class FormMail extends Form
 
 			// Disable enter key if option MAIN_MAILFORM_DISABLE_ENTERKEY is set
 			if (!empty($conf->global->MAIN_MAILFORM_DISABLE_ENTERKEY)) {
-				$out .= '<script type="text/javascript" language="javascript">';
+				$out .= '<script type="text/javascript">';
 				$out .= 'jQuery(document).ready(function () {';
 				$out .= '	$(document).on("keypress", \'#mailform\', function (e) {		/* Note this is called at every key pressed ! */
 	    						var code = e.keyCode || e.which;
@@ -1216,6 +1220,7 @@ class FormMail extends Form
 		global $conf, $langs, $form;
 
 		$defaulttopic = GETPOST('subject', 'restricthtml');
+
 		if (!GETPOST('modelselected', 'alpha') || GETPOST('modelmailselected') != '-1') {
 			if ($arraydefaultmessage && $arraydefaultmessage->topic) {
 				$defaulttopic = $arraydefaultmessage->topic;
@@ -1274,7 +1279,7 @@ class FormMail extends Form
 		}
 
 		$sql = "SELECT rowid, module, label, type_template, topic, joinfiles, content, content_lines, lang";
-		$sql .= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
+		$sql .= " FROM ".$db->prefix().'c_email_templates';
 		$sql .= " WHERE (type_template='".$db->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
@@ -1397,7 +1402,7 @@ class FormMail extends Form
 	public function isEMailTemplate($type_template, $user, $outputlangs)
 	{
 		$sql = "SELECT label, topic, content, lang";
-		$sql .= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
+		$sql .= " FROM ".$this->db->prefix().'c_email_templates';
 		$sql .= " WHERE type_template='".$this->db->escape($type_template)."'";
 		$sql .= " AND entity IN (".getEntity('c_email_templates').")";
 		$sql .= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".((int) $user->id).")";
@@ -1433,7 +1438,7 @@ class FormMail extends Form
 		global $conf;
 
 		$sql = "SELECT rowid, module, label, topic, content, content_lines, lang, fk_user, private, position";
-		$sql .= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
+		$sql .= " FROM ".$this->db->prefix().'c_email_templates';
 		$sql .= " WHERE type_template IN ('".$this->db->escape($type_template)."', 'all')";
 		$sql .= " AND entity IN (".getEntity('c_email_templates').")";
 		$sql .= " AND (private = 0 OR fk_user = ".((int) $user->id).")"; // See all public templates or templates I own.
@@ -1524,7 +1529,7 @@ class FormMail extends Form
 					$product = new Product($this->db);
 					$product->fetch($line->fk_product, '', '', 1);
 					$product->fetch_optionals();
-					if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
+					if (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];
 						}
@@ -1568,6 +1573,7 @@ class FormMail extends Form
 
 			// For mass emailing, we have different keys
 			$tmparray['__ID__'] = 'IdRecord';
+			$tmparray['__THIRDPARTY_CUSTOMER_CODE__'] = 'CustomerCode';
 			$tmparray['__EMAIL__'] = 'EMailRecipient';
 			$tmparray['__LASTNAME__'] = 'Lastname';
 			$tmparray['__FIRSTNAME__'] = 'Firstname';
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index 02972f39630..f39680d1fe3 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -201,100 +201,109 @@ class FormMargin
 	 */
 	public function displayMarginInfos($object, $force_price = false)
 	{
-		global $langs, $conf, $user;
+		global $langs, $conf, $user, $hookmanager;
 
 		if (!empty($user->socid)) {
 			return;
 		}
 
-		if (!$user->rights->margins->liretous) {
+		if (empty($user->rights->margins->liretous)) {
 			return;
 		}
 
 		$marginInfo = $this->getMarginInfosArray($object, $force_price);
 
-		if (!empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON)) {	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
-			print $langs->trans('ShowMarginInfos').' : ';
-			$hidemargininfos = preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW']); // Clean cookie
-			print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? '' : 'hideobject').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</span>';
-			print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? 'hideobject' : '').'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</span>';
+		$parameters=array('marginInfo'=>&$marginInfo);
+		$reshook = $hookmanager->executeHooks('displayMarginInfos', $parameters, $object, $action);
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		} elseif (empty($reshook)) {
+			if (!empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON)) {    // TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
+				print $langs->trans('ShowMarginInfos') . ' : ';
+				$hidemargininfos = preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW']); // Clean cookie
+				print '<span id="showMarginInfos" class="linkobject ' . (!empty($hidemargininfos) ? '' : 'hideobject') . '">' . img_picto($langs->trans("Disabled"), 'switch_off') . '</span>';
+				print '<span id="hideMarginInfos" class="linkobject ' . (!empty($hidemargininfos) ? 'hideobject' : '') . '">' . img_picto($langs->trans("Enabled"), 'switch_on') . '</span>';
 
-			print '<script>$(document).ready(function() {
-        	    $("span#showMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 0); $(".margininfos").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject");})});
-        	    $("span#hideMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 1); $(".margininfos").hide(); $("span#hideMarginInfos").addClass("hideobject"); $("span#showMarginInfos").removeClass("hideobject");})});
+				print '<script>$(document).ready(function() {
+        	    $("span#showMarginInfos").click(function() { $.getScript( "' . dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1) . '", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 0); $(".margininfos").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject");})});
+        	    $("span#hideMarginInfos").click(function() { $.getScript( "' . dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1) . '", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 1); $(".margininfos").hide(); $("span#hideMarginInfos").addClass("hideobject"); $("span#showMarginInfos").removeClass("hideobject");})});
       	        });</script>';
-			if (!empty($hidemargininfos)) {
-				print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
+				if (!empty($hidemargininfos)) {
+					print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
+				}
 			}
-		}
 
-		print '<div class="div-table-responsive-no-min">';
-		print '<!-- Margin table -->'."\n";
+			print '<div class="div-table-responsive-no-min">';
+			print '<!-- Margin table -->' . "\n";
 
-		print '<table class="noborder margintable centpercent">';
-		print '<tr class="liste_titre">';
-		print '<td class="liste_titre">'.$langs->trans('Margins').'</td>';
-		print '<td class="liste_titre right">'.$langs->trans('SellingPrice').'</td>';
-		if ($conf->global->MARGIN_TYPE == "1") {
-			print '<td class="liste_titre right">'.$langs->trans('BuyingPrice').'</td>';
-		} else {
-			print '<td class="liste_titre right">'.$langs->trans('CostPrice').'</td>';
-		}
-		print '<td class="liste_titre right">'.$langs->trans('Margin').'</td>';
-		if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
-			print '<td class="liste_titre right">'.$langs->trans('MarginRate').'</td>';
-		}
-		if (!empty($conf->global->DISPLAY_MARK_RATES)) {
-			print '<td class="liste_titre right">'.$langs->trans('MarkRate').'</td>';
-		}
-		print '</tr>';
-
-		if (!empty($conf->product->enabled)) {
-			//if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {
-			print '<tr class="oddeven">';
-			print '<td>'.$langs->trans('MarginOnProducts').'</td>';
-			print '<td class="right">'.price($marginInfo['pv_products']).'</td>';
-			print '<td class="right">'.price($marginInfo['pa_products']).'</td>';
-			print '<td class="right">'.price($marginInfo['margin_on_products']).'</td>';
+			print '<table class="noborder margintable centpercent">';
+			print '<tr class="liste_titre">';
+			print '<td class="liste_titre">' . $langs->trans('Margins') . '</td>';
+			print '<td class="liste_titre right">' . $langs->trans('SellingPrice') . '</td>';
+			if ($conf->global->MARGIN_TYPE == "1") {
+				print '<td class="liste_titre right">' . $langs->trans('BuyingPrice') . '</td>';
+			} else {
+				print '<td class="liste_titre right">' . $langs->trans('CostPrice') . '</td>';
+			}
+			print '<td class="liste_titre right">' . $langs->trans('Margin') . '</td>';
 			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
-				print '<td class="right">'.(($marginInfo['margin_rate_products'] == '') ? '' : price($marginInfo['margin_rate_products'], null, null, null, null, 2).'%').'</td>';
+				print '<td class="liste_titre right">' . $langs->trans('MarginRate') . '</td>';
 			}
 			if (!empty($conf->global->DISPLAY_MARK_RATES)) {
-				print '<td class="right">'.(($marginInfo['mark_rate_products'] == '') ? '' : price($marginInfo['mark_rate_products'], null, null, null, null, 2).'%').'</td>';
+				print '<td class="liste_titre right">' . $langs->trans('MarkRate') . '</td>';
 			}
 			print '</tr>';
-		}
 
-		if (!empty($conf->service->enabled)) {
-			print '<tr class="oddeven">';
-			print '<td>'.$langs->trans('MarginOnServices').'</td>';
-			print '<td class="right">'.price($marginInfo['pv_services']).'</td>';
-			print '<td class="right">'.price($marginInfo['pa_services']).'</td>';
-			print '<td class="right">'.price($marginInfo['margin_on_services']).'</td>';
-			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
-				print '<td class="right">'.(($marginInfo['margin_rate_services'] == '') ? '' : price($marginInfo['margin_rate_services'], null, null, null, null, 2).'%').'</td>';
+			if (!empty($conf->product->enabled)) {
+				//if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {
+				print '<tr class="oddeven">';
+				print '<td>' . $langs->trans('MarginOnProducts') . '</td>';
+				print '<td class="right">' . price($marginInfo['pv_products']) . '</td>';
+				print '<td class="right">' . price($marginInfo['pa_products']) . '</td>';
+				print '<td class="right">' . price($marginInfo['margin_on_products']) . '</td>';
+				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+					print '<td class="right">' . (($marginInfo['margin_rate_products'] == '') ? '' : price($marginInfo['margin_rate_products'], null, null, null, null, 2) . '%') . '</td>';
+				}
+				if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+					print '<td class="right">' . (($marginInfo['mark_rate_products'] == '') ? '' : price($marginInfo['mark_rate_products'], null, null, null, null, 2) . '%') . '</td>';
+				}
+				print '</tr>';
 			}
-			if (!empty($conf->global->DISPLAY_MARK_RATES)) {
-				print '<td class="right">'.(($marginInfo['mark_rate_services'] == '') ? '' : price($marginInfo['mark_rate_services'], null, null, null, null, 2).'%').'</td>';
-			}
-			print '</tr>';
-		}
 
-		if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
-			print '<tr class="liste_total">';
-			print '<td>'.$langs->trans('TotalMargin').'</td>';
-			print '<td class="right">'.price($marginInfo['pv_total']).'</td>';
-			print '<td class="right">'.price($marginInfo['pa_total']).'</td>';
-			print '<td class="right">'.price($marginInfo['total_margin']).'</td>';
-			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
-				print '<td class="right">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';
+			if (!empty($conf->service->enabled)) {
+				print '<tr class="oddeven">';
+				print '<td>' . $langs->trans('MarginOnServices') . '</td>';
+				print '<td class="right">' . price($marginInfo['pv_services']) . '</td>';
+				print '<td class="right">' . price($marginInfo['pa_services']) . '</td>';
+				print '<td class="right">' . price($marginInfo['margin_on_services']) . '</td>';
+				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+					print '<td class="right">' . (($marginInfo['margin_rate_services'] == '') ? '' : price($marginInfo['margin_rate_services'], null, null, null, null, 2) . '%') . '</td>';
+				}
+				if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+					print '<td class="right">' . (($marginInfo['mark_rate_services'] == '') ? '' : price($marginInfo['mark_rate_services'], null, null, null, null, 2) . '%') . '</td>';
+				}
+				print '</tr>';
 			}
-			if (!empty($conf->global->DISPLAY_MARK_RATES)) {
-				print '<td class="right">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
+
+			if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+				print '<tr class="liste_total">';
+				print '<td>' . $langs->trans('TotalMargin') . '</td>';
+				print '<td class="right">' . price($marginInfo['pv_total']) . '</td>';
+				print '<td class="right">' . price($marginInfo['pa_total']) . '</td>';
+				print '<td class="right">' . price($marginInfo['total_margin']) . '</td>';
+				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+					print '<td class="right">' . (($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2) . '%') . '</td>';
+				}
+				if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+					print '<td class="right">' . (($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2) . '%') . '</td>';
+				}
+				print '</tr>';
 			}
-			print '</tr>';
+			print  $hookmanager->resPrint;
+			print '</table>';
+			print '</div>';
+		} elseif ($reshook > 0) {
+			print $hookmanager->resPrint;
 		}
-		print '</table>';
-		print '</div>';
 	}
 }
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index 9c75d15bae5..b97175f1397 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -87,7 +87,7 @@ class FormOrder extends Form
 		$listofmethods = array();
 
 		$sql = "SELECT rowid, code, libelle as label";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_input_method";
+		$sql .= " FROM ".$this->db->prefix()."c_input_method";
 		$sql .= " WHERE active = 1";
 
 		dol_syslog(get_class($this)."::selectInputMethod", LOG_DEBUG);
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index e81308faf79..c47646419aa 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -57,13 +57,14 @@ class FormOther
 	}
 
 	/**
-	 * Return HTML code for scanner tool.
+	 * Return the HTML code for scanner tool.
 	 * This must be called into an existing <form>
 	 *
-	 * @param	string	$jstoexecuteonadd		Name of javascript function to call
+	 * @param	string	$jstoexecuteonadd	Name of javascript function to call once the barcode scanning session is complete and user has click on "Add".
+	 * @param	string	$mode				'all' (both product and lot barcode) or 'product' (product barcode only) or 'lot' (lot number only)
 	 * @return	string						HTML component
 	 */
-	public function getHTMLScannerForm($jstoexecuteonadd = 'barcodscannerjs')
+	public function getHTMLScannerForm($jstoexecuteonadd = 'barcodescannerjs', $mode = 'all')
 	{
 		global $langs;
 
@@ -71,14 +72,23 @@ class FormOther
 
 		$out .= '<!-- Popup for mass barcode scanning -->'."\n";
 		$out .= '<div class="div-for-modal-topright" style="padding: 15px">';
-		$out .= '<center><strong>Barcode scanner tool...</strong></center><br>';
+		$out .= '<center>'.img_picto('', 'barcode', 'class="pictofixedwidth"').'<strong>Barcode scanner tool...</strong></center><br>';
 
-		$out .= '<input type="checkbox" name="barcodeforautodetect" checked="checked"> Autodetect if we scan a product barcode or a lot/serial barcode<br>';
-		$out .= '<input type="checkbox" name="barcodeforproduct"> Scan a product barcode<br>';
-		$out .= '<input type="checkbox" name="barcodeforlotserial"> Scan a product lot or serial number<br>';
-
-		$out .= $langs->trans("QtyToAddAfterBarcodeScan").' <input type="text" name="barcodeproductqty" class="width50 right" value="1"><br>';
-		$out .= '<textarea type="text" name="barcodelist" class="centpercent" autofocus rows="'.ROWS_3.'"></textarea>';
+		if ($mode == 'product') {
+			$out .= '<input type="hidden" name="barcodemode" value="barcodeforproduct" id="barcodeforproduct">';
+		} elseif ($mode == 'lot') {
+			$out .= '<input type="hidden" name="barcodemode" value="barcodeforlotserial" id="barcodeforlotserial">';
+		} else {	// $mode = 'all'
+			$out .= '<input type="radio" name="barcodemode" value="barcodeforautodetect" id="barcodeforautodetect" checked="checked"> <label for="barcodeforautodetect">Autodetect if we scan a product barcode or a lot/serial barcode</label><br>';
+			$out .= '<input type="radio" name="barcodemode" value="barcodeforproduct" id="barcodeforproduct"> <label for="barcodeforproduct">Scan a product barcode</label><br>';
+			$out .= '<input type="radio" name="barcodemode" value="barcodeforlotserial" id="barcodeforlotserial"> <label for="barcodeforlotserial">Scan a product lot or serial number</label><br>';
+		}
+		$stringaddbarcode = $langs->trans("QtyToAddAfterBarcodeScan", "tmphtml");
+		$htmltoreplaceby = '<select name="selectaddorreplace"><option selected value="add">'.$langs->trans("Add").'</option><option value="replace">'.$langs->trans("ToReplace").'</option></select>';
+		$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>';
 
 		/*print '<br>'.$langs->trans("or").'<br>';
 
@@ -88,13 +98,23 @@ class FormOther
 		*/
 		$out .= '<br>';
 		$out .= '<center>';
-		$out .= '<input type="submit" class="button marginleftonly marginrightonly" name="addscan" value="'.$langs->trans("Add").'">';
-		$out .= '<input type="submit" class="button marginleftonly marginrightonly" name="cancel" value="'.$langs->trans("Cancel").'">';
+		$out .= '<input type="submit" class="button marginleftonly marginrightonly" id ="exec'.dol_escape_js($jstoexecuteonadd).'" name="addscan" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
+		$out .= '<input type="submit" class="button marginleftonly marginrightonly" name="cancel" value="'.dol_escape_htmltag($langs->trans("CloseWindow")).'">';
+		$out .= '</center>';
 		$out .= '<br>';
+		$out .= '<div type="text" id="scantoolmessage" class="scantoolmessage ok nopadding"></div>';
 
-		$out .= '<span class="opacitymedium">'.$langs->trans("FeatureNotYetAvailable").'</span>';
-
-		// TODO Add call of javascript $jstoexecuteonadd so each scan will add qty into the inventory page + an ajax save.
+		$out .= '<script>';
+		$out .= 'jQuery("#barcodeforautodetect, #barcodeforproduct, #barcodeforlotserial").click(function(){';
+		$out .= 'console.log("select choice");';
+		$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).'");
+			'.dol_escape_js($jstoexecuteonadd).'();
+			return false;	/* We want to stay on the scan tool */
+		})';
+		$out .= '</script>';
 
 		$out .= '</center>';
 		$out .= '</div>';
@@ -119,7 +139,7 @@ class FormOther
 		global $conf, $langs, $user;
 
 		$sql = "SELECT rowid, label, fk_user";
-		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
+		$sql .= " FROM ".$this->db->prefix()."export_model";
 		$sql .= " WHERE type = '".$this->db->escape($type)."'";
 		if (empty($conf->global->EXPORTS_SHARE_MODELS)) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
 			$sql .= " AND fk_user IN (0, ".((int) $fk_user).")";
@@ -181,7 +201,7 @@ class FormOther
 		global $conf, $langs, $user;
 
 		$sql = "SELECT rowid, label, fk_user";
-		$sql .= " FROM ".MAIN_DB_PREFIX."import_model";
+		$sql .= " FROM ".$this->db->prefix()."import_model";
 		$sql .= " WHERE type = '".$this->db->escape($type)."'";
 		if (empty($conf->global->EXPORTS_SHARE_MODELS)) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
 			$sql .= " AND fk_user IN (0, ".((int) $fk_user).")";
@@ -241,7 +261,7 @@ class FormOther
 
 		$sql = "SELECT e.rowid, e.code, e.label, e.price, e.organization,";
 		$sql .= " c.label as country";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_ecotaxe as e,".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " FROM ".$this->db->prefix()."c_ecotaxe as e,".$this->db->prefix()."c_country as c";
 		$sql .= " WHERE e.active = 1 AND e.fk_pays = c.rowid";
 		$sql .= " ORDER BY country, e.organization ASC, e.code ASC";
 
@@ -293,7 +313,7 @@ class FormOther
 		$out = '';
 
 		$sql = "SELECT r.taux, r.revenuestamp_type";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " FROM ".$this->db->prefix()."c_revenuestamp as r,".$this->db->prefix()."c_country as c";
 		$sql .= " WHERE r.active = 1 AND r.fk_pays = c.rowid";
 		$sql .= " AND c.code = '".$this->db->escape($country_code)."'";
 
@@ -480,13 +500,13 @@ class FormOther
 
 		// Get list of users allowed to be viewed
 		$sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut as status, u.login, u.photo, u.gender, u.entity, u.admin";
-		$sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u";
+		$sql_usr .= " FROM ".$this->db->prefix()."user as u";
 
 		if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 			if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
 				$sql_usr .= " WHERE u.entity IS NOT NULL"; // Show all users
 			} else {
-				$sql_usr .= " WHERE EXISTS (SELECT ug.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('usergroup')."))";
+				$sql_usr .= " WHERE EXISTS (SELECT ug.fk_user FROM ".$this->db->prefix()."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('usergroup')."))";
 				$sql_usr .= " OR u.entity = 0"; // Show always superadmin
 			}
 		} else {
@@ -509,13 +529,13 @@ class FormOther
 		if (empty($user->rights->user->user->lire) && $user->socid) {
 			$sql_usr .= " UNION ";
 			$sql_usr .= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut as status, u2.login, u2.photo, u2.gender, u2.entity, u2.admin";
-			$sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql_usr .= " FROM ".$this->db->prefix()."user as u2, ".$this->db->prefix()."societe_commerciaux as sc";
 
 			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
 					$sql_usr .= " WHERE u2.entity IS NOT NULL"; // Show all users
 				} else {
-					$sql_usr .= " WHERE EXISTS (SELECT ug2.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('usergroup')."))";
+					$sql_usr .= " WHERE EXISTS (SELECT ug2.fk_user FROM ".$this->db->prefix()."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('usergroup')."))";
 				}
 			} else {
 				$sql_usr .= " WHERE u2.entity IN (".getEntity('user').")";
@@ -539,7 +559,6 @@ class FormOther
 		$resql_usr = $this->db->query($sql_usr);
 		if ($resql_usr) {
 			$userstatic = new User($this->db);
-			$showstatus = 1;
 
 			while ($obj_usr = $this->db->fetch_object($resql_usr)) {
 				$userstatic->id = $obj_usr->rowid;
@@ -825,6 +844,7 @@ class FormOther
 				$out .= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
 				$out .= '<script type="text/javascript">
 	             jQuery(document).ready(function(){
+					var originalhex = null;
 	                $(\'#colorpicker'.$prefix.'\').jPicker( {
 		                window: {
 		                  title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', /* any title for the jPicker window itself - displays "Drag Markers To Pick A Color" if left null */
@@ -854,25 +874,39 @@ class FormOther
 		                      title: \''.dol_escape_js($langs->trans("SelectAColor")).'\',
 		                      newColor: \''.dol_escape_js($langs->trans("New")).'\',
 		                      currentColor: \''.dol_escape_js($langs->trans("Current")).'\',
-		                      ok: \''.dol_escape_js($langs->trans("Save")).'\',
+		                      ok: \''.dol_escape_js($langs->trans("Validate")).'\',
 		                      cancel: \''.dol_escape_js($langs->trans("Cancel")).'\'
 		                    }
 		                  }
 				        },
-						function(color, context) { console.log("close"); },
-						function(color, context) { var hex = color.val(\'hex\'); console.log("new color selected in jpicker "+hex);';
+						function(color, context) { console.log("close color selector"); },
+						function(color, context) { var hex = color.val(\'hex\'); console.log("new color selected in jpicker "+hex+" setpropertyonselect='.dol_escape_js($setpropertyonselect).'");';
 				if ($setpropertyonselect) {
-					$out .= ' if (hex != null) document.documentElement.style.setProperty(\'--'.$setpropertyonselect.'\', \'#\'+hex);';
+					$out .= 'if (originalhex == null) {';
+					$out .= ' 	originalhex = getComputedStyle(document.querySelector(":root")).getPropertyValue(\'--'.dol_escape_js($setpropertyonselect).'\');';
+					$out .= '   console.log("original color is saved into originalhex = "+originalhex);';
+					$out .= '}';
+					$out .= 'if (hex != null) {';
+					$out .= '	document.documentElement.style.setProperty(\'--'.dol_escape_js($setpropertyonselect).'\', \'#\'+hex);';
+					$out .= '}';
 				}
-						$out .= '},
-						function(color, context) { console.log("cancel"); }
+				$out .= '},
+						function(color, context) {
+							console.log("cancel selection of color");';
+				if ($setpropertyonselect) {
+					$out .= 'if (originalhex != null) {
+								console.log("Restore old color "+originalhex);
+								document.documentElement.style.setProperty(\'--'.dol_escape_js($setpropertyonselect).'\', originalhex);
+							}';
+				}
+				$out .= '
+						}
 					);
 				 });
 	             </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>';
@@ -903,11 +937,11 @@ class FormOther
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Creation d'un icone de couleur
+	 *	Creae an image for color
 	 *
-	 *	@param	string	$color		Couleur de l'image
-	 *	@param	string	$module 	Nom du module
-	 *	@param	string	$name		Nom de l'image
+	 *	@param	string	$color		Color of image
+	 *	@param	string	$module 	Name of module
+	 *	@param	string	$name		Name of image
 	 *	@param	int		$x 			Largeur de l'image en pixels
 	 *	@param	int		$y      	Hauteur de l'image en pixels
 	 *	@return	void
@@ -1192,7 +1226,7 @@ class FormOther
 
 		// Javascript code for dynamic actions
 		if (!empty($conf->use_javascript_ajax)) {
-			$selectboxlist .= '<script type="text/javascript" language="javascript">
+			$selectboxlist .= '<script type="text/javascript">
 
 	        // To update list of activated boxes
 	        function updateBoxOrder(closing) {
@@ -1363,7 +1397,7 @@ class FormOther
 		$langs->load("admin");
 
 		$sql = "SELECT rowid, ".$keyfield.", ".$labelfield;
-		$sql .= " FROM ".MAIN_DB_PREFIX.$dictionarytable;
+		$sql .= " FROM ".$this->db->prefix().$dictionarytable;
 		$sql .= " ORDER BY ".$labelfield;
 
 		dol_syslog(get_class($this)."::select_dictionary", LOG_DEBUG);
@@ -1379,12 +1413,13 @@ class FormOther
 
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($result);
-					if ($selected == $obj->rowid || $selected == $obj->$keyfield) {
-						print '<option value="'.$obj->$keyfield.'" selected>';
+					if ($selected == $obj->rowid || $selected == $obj->{$keyfield}) {
+						print '<option value="'.$obj->{$keyfield}.'" selected>';
 					} else {
-						print '<option value="'.$obj->$keyfield.'">';
+						print '<option value="'.$obj->{$keyfield}.'">';
 					}
-					print $obj->$labelfield;
+					$label = ($langs->trans($dictionarytable.$obj->{$keyfield}) != ($dictionarytable.$obj->{$labelfield}) ? $langs->trans($dictionarytable.$obj->{$keyfield}) : $obj->{$labelfield});
+					print $label;
 					print '</option>';
 					$i++;
 				}
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index d485720dab8..aa7a38969be 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -39,6 +39,8 @@ class FormProjets
 	 */
 	public $error = '';
 
+	public $nboftasks;
+
 
 	/**
 	 *	Constructor
@@ -162,8 +164,8 @@ class FormProjets
 		}
 
 		// Search all projects
-		$sql = 'SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, s.nom as name, s.name_alias';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
+		$sql = "SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, s.nom as name, s.name_alias";
+		$sql .= " FROM ".$this->db->prefix()."projet as p LEFT JOIN ".$this->db->prefix()."societe as s ON s.rowid = p.fk_soc";
 		$sql .= " WHERE p.entity IN (".getEntity('project').")";
 		if ($projectsListId !== false) {
 			$sql .= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")";
@@ -205,7 +207,7 @@ class FormProjets
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire) {
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($user->rights->societe->lire)) {
 						// Do nothing
 					} else {
 						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) { // We discard closed except if selected
@@ -307,11 +309,11 @@ class FormProjets
 	 *  @param	int		$disabled		Disabled
 	 *  @param	string	$morecss        More css added to the select component
 	 *  @param	string	$projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.
-	 *  @param	string	$showproject	'all' = Show project info, ''=Hide project info
+	 *  @param	string	$showmore		'all' = Show project info, 'progress' = Show task progression, ''=Show nothing more
 	 *  @param	User	$usertofilter	User object to use for filtering
 	 *	@return int         			Nbr of tasks if OK, <0 if KO
 	 */
-	public function selectTasks($socid = -1, $selected = '', $htmlname = 'taskid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
+	public function selectTasks($socid = -1, $selected = '', $htmlname = 'taskid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showmore = 'all', $usertofilter = null)
 	{
 		global $user, $conf, $langs;
 
@@ -336,11 +338,12 @@ class FormProjets
 		}
 
 		// Search all projects
-		$sql = 'SELECT t.rowid, t.ref as tref, t.label as tlabel, p.rowid as pid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public,';
-		$sql .= ' s.nom as name';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
-		$sql .= ' '.MAIN_DB_PREFIX.'projet_task as t';
+		$sql = "SELECT t.rowid, t.ref as tref, t.label as tlabel, t.progress,";
+		$sql .= " p.rowid as pid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, p.usage_task,";
+		$sql .= " s.nom as name";
+		$sql .= " FROM ".$this->db->prefix()."projet as p";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."societe as s ON s.rowid = p.fk_soc,";
+		$sql .= " ".$this->db->prefix()."projet_task as t";
 		$sql .= " WHERE p.entity IN (".getEntity('project').")";
 		$sql .= " AND t.fk_projet = p.rowid";
 		if ($projectsListId) {
@@ -407,7 +410,7 @@ class FormProjets
 							$disabled = 1;
 						}
 
-						if ($showproject == 'all') {
+						if (preg_match('/all/', $showmore)) {
 							$labeltoshow .= dol_trunc($obj->ref, 18); // Project ref
 							//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 							//else $labeltoshow.=' ('.$langs->trans("Private").')';
@@ -442,6 +445,10 @@ class FormProjets
 						// Label for task
 						$labeltoshow .= $obj->tref.' '.dol_trunc($obj->tlabel, $maxlength);
 						$titletoshow .= $obj->tref.' '.dol_trunc($obj->tlabel, $maxlength);
+						if ($obj->usage_task && preg_match('/progress/', $showmore)) {
+							$labeltoshow .= ' <span class="opacitymedium">('.$obj->progress.'%)</span>';
+							$titletoshow .= ' <span class="opacitymedium">('.$obj->progress.'%)</span>';
+						}
 
 						if (!empty($selected) && $selected == $obj->rowid) {
 							$out .= '<option value="'.$obj->rowid.'" selected';
@@ -473,6 +480,8 @@ class FormProjets
 				$out .= '</select>';
 			}
 
+			$this->nboftasks = $num;
+
 			print $out;
 
 			$this->db->free($resql);
@@ -493,9 +502,10 @@ class FormProjets
 	 *    @param	string		$morecss			More CSS
 	 *    @param    int         $limitonstatus      Add filters to limit length of list to opened status (for example to avoid ERR_RESPONSE_HEADERS_TOO_BIG on project/element.php page). TODO To implement
 	 *    @param	string		$projectkey			Equivalent key  to fk_projet for actual table_element
+	 *    @param	string		$placeholder		Placeholder
 	 *    @return	int|string						The HTML select list of element or '' if nothing or -1 if KO
 	 */
-	public function select_element($table_element, $socid = 0, $morecss = '', $limitonstatus = -2, $projectkey = "fk_projet")
+	public function select_element($table_element, $socid = 0, $morecss = '', $limitonstatus = -2, $projectkey = "fk_projet", $placeholder = '')
 	{
 		// phpcs:enable
 		global $conf, $langs;
@@ -556,7 +566,7 @@ class FormProjets
 				$sql = "SELECT t.rowid, t.ref";
 				break;
 			case 'stock_mouvement':
-				$sql = 'SELECT t.rowid, t.label as ref';
+				$sql = "SELECT t.rowid, t.label as ref";
 				$projectkey = 'fk_origin';
 				break;
 			case "payment_salary":
@@ -573,9 +583,9 @@ class FormProjets
 		if ($linkedtothirdparty) {
 			$sql .= ", s.nom as name";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX.$table_element." as t";
+		$sql .= " FROM ".$this->db->prefix().$table_element." as t";
 		if ($linkedtothirdparty) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".$this->db->prefix()."societe as s";
 		}
 		$sql .= " WHERE ".$projectkey." is null";
 		if (!empty($socid) && $linkedtothirdparty) {
@@ -603,7 +613,7 @@ class FormProjets
 			$i = 0;
 			if ($num > 0) {
 				$sellist = '<select class="flat elementselect css'.$table_element.($morecss ? ' '.$morecss : '').'" name="elementselect">';
-				$sellist .= '<option value="-1"></option>';
+				$sellist .= '<option value="-1"'.($placeholder ? ' class="optiongrey"' : '').'>'.$placeholder.'</option>';
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					$ref = $obj->ref ? $obj->ref : $obj->rowid;
@@ -656,7 +666,7 @@ class FormProjets
 		global $conf, $langs, $user;
 
 		$sql = "SELECT rowid, code, label, percent";
-		$sql .= " FROM ".MAIN_DB_PREFIX.'c_lead_status';
+		$sql .= " FROM ".$this->db->prefix().'c_lead_status';
 		$sql .= " WHERE active = 1";
 		$sql .= " ORDER BY position";
 
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index b78ff5cfa8e..87919141727 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -58,9 +58,10 @@ class FormPropal
 	 *    @param	int 	$showempty		1=Add empty line
 	 *    @param    string  $mode           'customer', 'supplier'
 	 *    @param    string  $htmlname       Name of select field
+	 *    @param	string	$morecss		More css
 	 *    @return	void
 	 */
-	public function selectProposalStatus($selected = '', $short = 0, $excludedraft = 0, $showempty = 1, $mode = 'customer', $htmlname = 'propal_statut')
+	public function selectProposalStatus($selected = '', $short = 0, $excludedraft = 0, $showempty = 1, $mode = 'customer', $htmlname = 'propal_statut', $morecss = '')
 	{
 		global $langs;
 
@@ -80,7 +81,7 @@ class FormPropal
 		} else {
 			$prefix = "PropalStatus";
 
-			$sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
+			$sql = "SELECT id, code, label, active FROM ".$this->db->prefix()."c_propalst";
 			$sql .= " WHERE active = 1";
 			dol_syslog(get_class($this)."::selectProposalStatus", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -99,11 +100,12 @@ class FormPropal
 			}
 		}
 
-		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+		print '<select id="'.$htmlname.'" name="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'">';
 		if ($showempty) {
 			print '<option value="-1">&nbsp;</option>';
 		}
 
+		$i = 0;
 		foreach ($listofstatus as $key => $obj) {
 			if ($excludedraft) {
 				if ($obj['code'] == 'Draft' || $obj['code'] == 'PR_DRAFT') {
diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
new file mode 100644
index 00000000000..82e4f0c96dd
--- /dev/null
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -0,0 +1,1079 @@
+<?php
+/* Copyright (C) 2021  John BOTELLA    <john.botella@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+
+/**
+ * This class help you create setup render
+ */
+class FormSetup
+{
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	/** @var FormSetupItem[]  */
+	public $items = array();
+
+	/**
+	 * @var int
+	 */
+	public $setupNotEmpty = 0;
+
+	/** @var Translate */
+	public $langs;
+
+	/** @var Form */
+	public $form;
+
+	/** @var int */
+	protected $maxItemRank;
+
+	/**
+	 * this is an html string display before output form
+	 * @var string
+	 */
+	public $htmlBeforeOutputForm = '';
+
+	/**
+	 * this is an html string display after output form
+	 * @var string
+	 */
+	public $htmlAfterOutputForm = '';
+
+	/**
+	 * this is an html string display on buttons zone
+	 * @var string
+	 */
+	public $htmlOutputMoreButton = '';
+
+
+	/**
+	 *
+	 * @var array
+	 */
+	public $formAttributes = array(
+		'action' => '', // set in __construct
+		'method' => 'POST'
+	);
+
+	/**
+	 * an list of hidden inputs used only in edit mode
+	 * @var array
+	 */
+	public $formHiddenInputs = array();
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param Translate $outputLangs if needed can use another lang
+	 */
+	public function __construct($db, $outputLangs = false)
+	{
+		global $langs;
+		$this->db = $db;
+		$this->form = new Form($this->db);
+		$this->formAttributes['action'] = $_SERVER["PHP_SELF"];
+
+		$this->formHiddenInputs['token'] = newToken();
+		$this->formHiddenInputs['action'] = 'update';
+
+
+		if ($outputLangs) {
+			$this->langs = $outputLangs;
+		} else {
+			$this->langs = $langs;
+		}
+	}
+
+	/**
+	 * Generate an attributes string form an input array
+	 *
+	 * @param 	array 	$attributes 	an array of attributes keys and values,
+	 * @return 	string					attribute string
+	 */
+	static public function generateAttributesStringFromArray($attributes)
+	{
+		$Aattr = array();
+		if (is_array($attributes)) {
+			foreach ($attributes as $attribute => $value) {
+				if (is_array($value) || is_object($value)) {
+					continue;
+				}
+				$Aattr[] = $attribute.'="'.dol_escape_htmltag($value).'"';
+			}
+		}
+
+		return !empty($Aattr)?implode(' ', $Aattr):'';
+	}
+
+
+	/**
+	 * generateOutput
+	 *
+	 * @param 	bool 	$editMode 	true will display output on edit mod
+	 * @return 	string				html output
+	 */
+	public function generateOutput($editMode = false)
+	{
+		global $hookmanager, $action;
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+
+		$parameters = array(
+			'editMode' => $editMode
+		);
+		$reshook = $hookmanager->executeHooks('formSetupBeforeGenerateOutput', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
+
+		if ($reshook > 0) {
+			return $hookmanager->resPrint;
+		} else {
+			$out = '<!-- Start generateOutput from FormSetup class  -->';
+			$out.= $this->htmlBeforeOutputForm;
+
+			if ($editMode) {
+				$out.= '<form ' . self::generateAttributesStringFromArray($this->formAttributes) . ' >';
+
+				// generate hidden values from $this->formHiddenInputs
+				if (!empty($this->formHiddenInputs) && is_array($this->formHiddenInputs)) {
+					foreach ($this->formHiddenInputs as $hiddenKey => $hiddenValue) {
+						$out.= '<input type="hidden" name="'.dol_escape_htmltag($hiddenKey).'" value="' . dol_escape_htmltag($hiddenValue) . '">';
+					}
+				}
+			}
+
+			// generate output table
+			$out .= $this->generateTableOutput($editMode);
+
+
+			$reshook = $hookmanager->executeHooks('formSetupBeforeGenerateOutputButton', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+			if ($reshook < 0) {
+				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			}
+
+			if ($reshook > 0) {
+				return $hookmanager->resPrint;
+			} elseif ($editMode) {
+				$out .= '<br>'; // Todo : remove this <br/> by adding style to form-setup-button-container css class in all themes
+				$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 .= '</div>';
+			}
+
+			if ($editMode) {
+				$out .= '</form>';
+			}
+
+			$out.= $this->htmlAfterOutputForm;
+
+			return $out;
+		}
+	}
+
+	/**
+	 * generateTableOutput
+	 *
+	 * @param 	bool 	$editMode 	true will display output on edit mod
+	 * @return 	string				html output
+	 */
+	public function generateTableOutput($editMode = false)
+	{
+		global $hookmanager, $action;
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+
+		$parameters = array(
+			'editMode' => $editMode
+		);
+		$reshook = $hookmanager->executeHooks('formSetupBeforeGenerateTableOutput', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
+
+		if ($reshook > 0) {
+			return $hookmanager->resPrint;
+		} else {
+			$out = '<table class="noborder centpercent">';
+			$out .= '<thead>';
+			$out .= '<tr class="liste_titre">';
+			$out .= '	<td>' . $this->langs->trans("Parameter") . '</td>';
+			$out .= '	<td>' . $this->langs->trans("Value") . '</td>';
+			$out .= '</tr>';
+			$out .= '</thead>';
+
+			// Sort items before render
+			$this->sortingItems();
+
+			$out .= '<tbody>';
+			foreach ($this->items as $item) {
+				$out .= $this->generateLineOutput($item, $editMode);
+			}
+			$out .= '</tbody>';
+
+			$out .= '</table>';
+			return $out;
+		}
+	}
+
+	/**
+	 * saveConfFromPost
+	 *
+	 * @param 	bool 		$noMessageInUpdate display event message on errors and success
+	 * @return 	void|null
+	 */
+	public function saveConfFromPost($noMessageInUpdate = false)
+	{
+		if (empty($this->items)) {
+			return null;
+		}
+
+		$this->db->begin();
+		$error = 0;
+		foreach ($this->items as $item) {
+			$res = $item->setValueFromPost();
+			if ($res > 0) {
+				$item->saveConfValue();
+			} elseif ($res < 0) {
+				$error++;
+				break;
+			}
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			if (empty($noMessageInUpdate)) {
+				setEventMessages($this->langs->trans("SetupSaved"), null);
+			}
+		} else {
+			$this->db->rollback();
+			if (empty($noMessageInUpdate)) {
+				setEventMessages($this->langs->trans("SetupNotSaved"), null, 'errors');
+			}
+		}
+	}
+
+	/**
+	 * generateLineOutput
+	 *
+	 * @param 	FormSetupItem 	$item 		the setup item
+	 * @param 	bool 			$editMode 	Display as edit mod
+	 * @return 	string 						the html output for an setup item
+	 */
+	public function generateLineOutput($item, $editMode = false)
+	{
+
+		$out = '';
+		if ($item->enabled==1) {
+			$this->setupNotEmpty++;
+			$out.= '<tr class="oddeven">';
+
+			$out.= '<td class="col-setup-title">';
+			$out.= '<span id="helplink'.$item->confKey.'" class="spanforparamtooltip">';
+			$out.= $this->form->textwithpicto($item->getNameText(), $item->getHelpText(), 1, 'info', '', 0, 3, 'tootips'.$item->confKey);
+			$out.= '</span>';
+			$out.= '</td>';
+
+			$out.= '<td>';
+
+			if ($editMode) {
+				$out.= $item->generateInputField();
+			} else {
+				$out.= $item->generateOutputField();
+			}
+
+			if (!empty($item->errors)) {
+				// TODO : move set event message in a methode to be called by cards not by this class
+				setEventMessages(null, $item->errors, 'errors');
+			}
+
+			$out.= '</td>';
+			$out.= '</tr>';
+		}
+
+		return $out;
+	}
+
+
+	/**
+	 * Method used to test  module builder convertion to this form usage
+	 *
+	 * @param array 	$params 	an array of arrays of params from old modulBuilder params
+	 * @return null
+	 */
+	public function addItemsFromParamsArray($params)
+	{
+		if (!is_array($params) || empty($params)) { return false; }
+		foreach ($params as $confKey => $param) {
+			$this->addItemFromParams($confKey, $param); // todo manage error
+		}
+	}
+
+
+	/**
+	 * From old
+	 * Method was used to test  module builder convertion to this form usage.
+	 *
+	 * @param 	string 	$confKey 	the conf name to store
+	 * @param 	array 	$params 	an array of params from old modulBuilder params
+	 * @return 	bool
+	 */
+	public function addItemFromParams($confKey, $params)
+	{
+		if (empty($confKey) || empty($params['type'])) { return false; }
+
+		/*
+		 * Exemple from old module builder setup page
+		 * 	// '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),
+		 */
+
+		$item = new FormSetupItem($confKey);
+		// need to be ignored from scrutinizer setTypeFromTypeString was created as deprecated to incite developper to use object oriented usage
+		/** @scrutinizer ignore-deprecated */ $item->setTypeFromTypeString($params['type']);
+
+		if (!empty($params['enabled'])) {
+			$item->enabled = $params['enabled'];
+		}
+
+		if (!empty($params['css'])) {
+			$item->cssClass = $params['css'];
+		}
+
+		$this->items[$item->confKey] = $item;
+
+		return true;
+	}
+
+	/**
+	 * Used to export param array for /core/actions_setmoduleoptions.inc.php template
+	 * Method exists only for manage setup convertion
+	 *
+	 * @return array $arrayofparameters for /core/actions_setmoduleoptions.inc.php
+	 */
+	public function exportItemsAsParamsArray()
+	{
+		$arrayofparameters = array();
+		foreach ($this->items as $item) {
+			$arrayofparameters[$item->confKey] = array(
+				'type' => $item->getType(),
+				'enabled' => $item->enabled
+			);
+		}
+
+		return $arrayofparameters;
+	}
+
+	/**
+	 * Reload for each item default conf
+	 * note: this will override custom configuration
+	 *
+	 * @return bool
+	 */
+	public function reloadConfs()
+	{
+
+		if (!array($this->items)) { return false; }
+		foreach ($this->items as $item) {
+			$item->reloadValueFromConf();
+		}
+
+		return true;
+	}
+
+
+	/**
+	 * Create a new item
+	 * the tagret is useful with hooks : that allow externals modules to add setup items on good place
+	 *
+	 * @param string	$confKey 				the conf key used in database
+	 * @param string	$targetItemKey    		target item used to place the new item beside
+	 * @param bool		$insertAfterTarget		insert before or after target item ?
+	 * @return FormSetupItem the new setup item created
+	 */
+	public function newItem($confKey, $targetItemKey = false, $insertAfterTarget = false)
+	{
+		$item = new FormSetupItem($confKey);
+
+		// set item rank if not defined as last item
+		if (empty($item->rank)) {
+			$item->rank = $this->getCurentItemMaxRank() + 1;
+			$this->setItemMaxRank($item->rank); // set new max rank if needed
+		}
+
+		// try to get rank from target column, this will override item->rank
+		if (!empty($targetItemKey)) {
+			if (isset($this->items[$targetItemKey])) {
+				$targetItem = $this->items[$targetItemKey];
+				$item->rank = $targetItem->rank; // $targetItem->rank will be increase after
+				if ($targetItem->rank >= 0 && $insertAfterTarget) {
+					$item->rank++;
+				}
+			}
+
+			// calc new rank for each item to make place for new item
+			foreach ($this->items as $fItem) {
+				if ($item->rank <= $fItem->rank) {
+					$fItem->rank = $fItem->rank + 1;
+					$this->setItemMaxRank($fItem->rank); // set new max rank if needed
+				}
+			}
+		}
+
+		$this->items[$item->confKey] = $item;
+		return $this->items[$item->confKey];
+	}
+
+	/**
+	 * Sort items according to rank
+	 *
+	 * @return bool
+	 */
+	public function sortingItems()
+	{
+		// Sorting
+		return uasort($this->items, array($this, 'itemSort'));
+	}
+
+	/**
+	 * getCurentItemMaxRank
+	 *
+	 * @param bool $cache To use cache or not
+	 * @return int
+	 */
+	public function getCurentItemMaxRank($cache = true)
+	{
+		if (empty($this->items)) {
+			return 0;
+		}
+
+		if ($cache && $this->maxItemRank > 0) {
+			return $this->maxItemRank;
+		}
+
+		$this->maxItemRank = 0;
+		foreach ($this->items as $item) {
+			$this->maxItemRank = max($this->maxItemRank, $item->rank);
+		}
+
+		return $this->maxItemRank;
+	}
+
+
+	/**
+	 * set new max rank if needed
+	 *
+	 * @param 	int 		$rank 	the item rank
+	 * @return 	int|void			new max rank
+	 */
+	public function setItemMaxRank($rank)
+	{
+		$this->maxItemRank = max($this->maxItemRank, $rank);
+	}
+
+
+	/**
+	 * get item position rank from item key
+	 *
+	 * @param	string		$itemKey    	the item key
+	 * @return	int         				rank on success and -1 on error
+	 */
+	public function getLineRank($itemKey)
+	{
+		if (!isset($this->items[$itemKey]->rank)) {
+			return -1;
+		}
+		return  $this->items[$itemKey]->rank;
+	}
+
+
+	/**
+	 *  uasort callback function to Sort params items
+	 *
+	 *  @param	FormSetupItem	$a  formSetup item
+	 *  @param	FormSetupItem	$b  formSetup item
+	 *  @return	int					Return compare result
+	 */
+	public function itemSort(FormSetupItem $a, FormSetupItem $b)
+	{
+		if (empty($a->rank)) {
+			$a->rank = 0;
+		}
+		if (empty($b->rank)) {
+			$b->rank = 0;
+		}
+		if ($a->rank == $b->rank) {
+			return 0;
+		}
+		return ($a->rank < $b->rank) ? -1 : 1;
+	}
+}
+
+/**
+ * This class help to create item for class formSetup
+ */
+class FormSetupItem
+{
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	/** @var Translate */
+	public $langs;
+
+	/** @var int */
+	public $entity;
+
+	/** @var Form */
+	public $form;
+
+	/** @var string $confKey the conf key used in database */
+	public $confKey;
+
+	/** @var string|false $nameText  */
+	public $nameText = false;
+
+	/** @var string $helpText  */
+	public $helpText = '';
+
+	/** @var string $fieldValue  */
+	public $fieldValue;
+
+	/** @var array $fieldAttr  fields attribute only for compatible fields like input text */
+	public $fieldAttr;
+
+	/** @var bool|string set this var to override field output will override $fieldInputOverride and $fieldOutputOverride too */
+	public $fieldOverride = false;
+
+	/** @var bool|string set this var to override field input */
+	public $fieldInputOverride = false;
+
+	/** @var bool|string set this var to override field output */
+	public $fieldOutputOverride = false;
+
+	/** @var int $rank  */
+	public $rank = 0;
+
+	/**
+	 * @var string $errors
+	 */
+	public $errors = array();
+
+	/**
+	 * TODO each type must have setAs{type} method to help configuration
+	 *   And set var as protected when its done configuration must be done by method
+	 *   this is important for retrocompatibility of futures versions
+	 * @var string $type  'string', 'textarea', 'category:'.Categorie::TYPE_CUSTOMER', 'emailtemplate', 'thirdparty_type'
+	 */
+	protected $type = 'string';
+
+	public $enabled = 1;
+
+	public $cssClass = '';
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $confKey the conf key used in database
+	 */
+	public function __construct($confKey)
+	{
+		global $langs, $db, $conf, $form;
+		$this->db = $db;
+
+		if (!empty($form) && is_object($form) && get_class($form) == 'Form') { // the form class has a cache inside so I am using it to optimize
+			$this->form = $form;
+		} else {
+			$this->form = new Form($this->db);
+		}
+
+		$this->langs = $langs;
+		$this->entity = $conf->entity;
+
+		$this->confKey = $confKey;
+		$this->fieldValue = $conf->global->{$this->confKey};
+	}
+
+	/**
+	 * reload conf value from databases
+	 * @return null
+	 */
+	public function reloadValueFromConf()
+	{
+		global $conf;
+		$this->fieldValue = $conf->global->{$this->confKey};
+	}
+
+
+	/**
+	 * Save const value based on htdocs/core/actions_setmoduleoptions.inc.php
+	 *	@return     int         			-1 if KO, 1 if OK
+	 */
+	public function saveConfValue()
+	{
+		// 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);
+			if ($result < 0) {
+				return -1;
+			} else {
+				return 1;
+			}
+		}
+	}
+
+
+	/**
+	 * Save const value based on htdocs/core/actions_setmoduleoptions.inc.php
+	 *	@return     int         			-1 if KO, 0  nothing to do , 1 if OK
+	 */
+	public function setValueFromPost()
+	{
+		// Modify constant only if key was posted (avoid resetting key to the null value)
+		if ($this->type != 'title') {
+			if (preg_match('/category:/', $this->type)) {
+				if (GETPOST($this->confKey, 'int') == '-1') {
+					$val_const = '';
+				} else {
+					$val_const = GETPOST($this->confKey, 'int');
+				}
+			} else {
+				$val_const = GETPOST($this->confKey, 'alpha');
+			}
+
+			// TODO add value check with class validate
+			$this->fieldValue = $val_const;
+
+			return 1;
+		}
+
+		return 0;
+	}
+
+	/**
+	 * Get help text or generate it
+	 * @return int|string
+	 */
+	public function getHelpText()
+	{
+		if (!empty($this->helpText)) { return $this->helpText; }
+		return (($this->langs->trans($this->confKey . 'Tooltip') != $this->confKey . 'Tooltip') ? $this->langs->trans($this->confKey . 'Tooltip') : '');
+	}
+
+	/**
+	 * Get field name text or generate it
+	 * @return false|int|string
+	 */
+	public function getNameText()
+	{
+		if (!empty($this->nameText)) { return $this->nameText; }
+		return (($this->langs->trans($this->confKey) != $this->confKey) ? $this->langs->trans($this->confKey) : $this->langs->trans('MissingTranslationForConfKey', $this->confKey));
+	}
+
+	/**
+	 * generate input field
+	 * @return bool|string
+	 */
+	public function generateInputField()
+	{
+		global $conf;
+
+		if (!empty($this->fieldOverride)) {
+			return $this->fieldOverride;
+		}
+
+		if (!empty($this->fieldInputOverride)) {
+			return $this->fieldInputOverride;
+		}
+
+		$this->fieldAttr['name'] = $this->confKey;
+		$this->fieldAttr['id'] = 'setup-'.$this->confKey;
+		$this->fieldAttr['value'] = $this->fieldValue;
+
+		$out = '';
+
+		if ($this->type == 'title') {
+			$out.= $this->generateOutputField(); // title have no input
+		} elseif ($this->type == 'textarea') {
+			$out.= $this->generateInputFieldTextarea();
+		} elseif ($this->type== 'html') {
+			$out.= $this->generateInputFieldHtml();
+		} elseif ($this->type == 'yesno') {
+			$out.= $this->form->selectyesno($this->confKey, $this->fieldValue, 1);
+		} elseif (preg_match('/emailtemplate:/', $this->type)) {
+			$out.= $this->generateInputFieldEmailTemplate();
+		} elseif (preg_match('/category:/', $this->type)) {
+			$out.=$this->generateInputFieldCategories();
+		} elseif (preg_match('/thirdparty_type/', $this->type)) {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+			$formcompany = new FormCompany($this->db);
+			$out.= $formcompany->selectProspectCustomerType($this->fieldValue, $this->confKey);
+		} elseif ($this->type == 'securekey') {
+			$out.= $this->generateInputFieldSecureKey();
+		} elseif ($this->type == 'product') {
+			if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+				$selected = (empty($this->fieldValue) ? '' : $this->fieldValue);
+				$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).' />';
+		}
+
+		return $out;
+	}
+
+	/**
+	 * generate input field for textarea
+	 * @return string
+	 */
+	public function generateInputFieldTextarea()
+	{
+		$out = '<textarea class="flat" name="'.$this->confKey.'" id="'.$this->confKey.'" cols="50" rows="5" wrap="soft">' . "\n";
+		$out.= dol_htmlentities($this->fieldValue);
+		$out.= "</textarea>\n";
+		return $out;
+	}
+
+	/**
+	 * generate input field for html
+	 * @return string
+	 */
+	public function generateInputFieldHtml()
+	{
+		global $conf;
+		require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+		$doleditor = new DolEditor($this->confKey, $this->fieldValue, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
+		return $doleditor->Create(1);
+	}
+
+	/**
+	 * generate input field for categories
+	 * @return string
+	 */
+	public function generateInputFieldCategories()
+	{
+		global $conf;
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+		$formother = new FormOther($this->db);
+
+		$tmp = explode(':', $this->type);
+		$out= img_picto('', 'category', 'class="pictofixedwidth"');
+		$out.= $formother->select_categories($tmp[1],  $this->fieldValue, $this->confKey, 0, $this->langs->trans('CustomersProspectsCategoriesShort'));
+		return $out;
+	}
+
+	/**
+	 * generate input field for email template selector
+	 * @return string
+	 */
+	public function generateInputFieldEmailTemplate()
+	{
+		global $conf, $user;
+		$out = '';
+		if (preg_match('/emailtemplate:/', $this->type)) {
+			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+			$formmail = new FormMail($this->db);
+
+			$tmp = explode(':', $this->type);
+			$nboftemplates = $formmail->fetchAllEMailTemplate($tmp[1], $user, null, 1); // We set lang=null to get in priority record with no lang
+			$arrayOfMessageName = array();
+			if (is_array($formmail->lines_model)) {
+				foreach ($formmail->lines_model as $modelMail) {
+					$moreonlabel = '';
+					if (!empty($arrayOfMessageName[$modelMail->label])) {
+						$moreonlabel = ' <span class="opacitymedium">(' . $this->langs->trans("SeveralLangugeVariatFound") . ')</span>';
+					}
+					// The 'label' is the key that is unique if we exclude the language
+					$arrayOfMessageName[$modelMail->id] = $this->langs->trans(preg_replace('/\(|\)/', '', $modelMail->label)) . $moreonlabel;
+				}
+			}
+			$out .= $this->form->selectarray($this->confKey, $arrayOfMessageName, $this->fieldValue, 'None', 0, 0, '', 0, 0, 0, '', '', 1);
+		}
+
+		return $out;
+	}
+
+
+	/**
+	 * generate input field for secure key
+	 * @return string
+	 */
+	public function generateInputFieldSecureKey()
+	{
+		global $conf;
+		$out = '<input required="required" type="text" class="flat" id="'.$this->confKey.'" name="'.$this->confKey.'" value="'.(GETPOST($this->confKey, 'alpha') ?GETPOST($this->confKey, 'alpha') : $this->fieldValue).'" size="40">';
+		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>';
+		}
+		return $out;
+	}
+
+	/**
+	 * 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
+	 * to be sure we can manage evolution easily
+	 *
+	 * @return string
+	 */
+	public function getType()
+	{
+		return $this->type;
+	}
+
+	/**
+	 * set the type from string : used for old module builder setup conf style conversion and tests
+	 * because this two class will quickly evolve it's important to not set directly $this->type (will be protected) so this method exist
+	 * to be sure we can manage evolution easily
+	 * @param string $type possible values based on old module builder setup : 'string', 'textarea', 'category:'.Categorie::TYPE_CUSTOMER', 'emailtemplate', 'thirdparty_type'
+	 * @deprecated yes this setTypeFromTypeString came deprecated because it exists only for manage setup convertion
+	 * @return bool
+	 */
+	public function setTypeFromTypeString($type)
+	{
+		$this->type = $type;
+		return true;
+	}
+
+	/**
+	 * Add error
+	 * @param array|string $errors the error text
+	 * @return null
+	 */
+	public function setErrors($errors)
+	{
+		if (is_array($errors)) {
+			if (!empty($errors)) {
+				foreach ($errors as $error) {
+					$this->setErrors($error);
+				}
+			}
+		} elseif (!empty($errors)) {
+			$this->errors[] = $errors;
+		}
+	}
+
+	/**
+	 * @return bool|string Generate the output html for this item
+	 */
+	public function generateOutputField()
+	{
+		global $conf, $user;
+
+		if (!empty($this->fieldOverride)) {
+			return $this->fieldOverride;
+		}
+
+		if (!empty($this->fieldOutputOverride)) {
+			return $this->fieldOutputOverride;
+		}
+
+		$out = '';
+
+		if ($this->type == 'title') {
+			// nothing to do
+		} elseif ($this->type == 'textarea') {
+			$out.= dol_nl2br($this->fieldValue);
+		} elseif ($this->type== 'html') {
+			$out.=  $this->fieldValue;
+		} elseif ($this->type == 'yesno') {
+			$out.= ajax_constantonoff($this->confKey);
+		} elseif (preg_match('/emailtemplate:/', $this->type)) {
+			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+			$formmail = new FormMail($this->db);
+
+			$tmp = explode(':', $this->type);
+
+			$template = $formmail->getEMailTemplate($this->db, $tmp[1], $user, $this->langs, $this->fieldValue);
+			if ($template<0) {
+				$this->setErrors($formmail->errors);
+			}
+			$out.= $this->langs->trans($template->label);
+		} elseif (preg_match('/category:/', $this->type)) {
+			$c = new Categorie($this->db);
+			$result = $c->fetch($this->fieldValue);
+			if ($result < 0) {
+				$this->setErrors($c->errors);
+			}
+			$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>';
+			}
+			$out.='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+		} elseif (preg_match('/thirdparty_type/', $this->type)) {
+			if ($this->fieldValue==2) {
+				$out.= $this->langs->trans("Prospect");
+			} elseif ($this->fieldValue==3) {
+				$out.= $this->langs->trans("ProspectCustomer");
+			} elseif ($this->fieldValue==1) {
+				$out.= $this->langs->trans("Customer");
+			} elseif ($this->fieldValue==0) {
+				$out.= $this->langs->trans("NorProspectNorCustomer");
+			}
+		} elseif ($this->type == 'product') {
+			$product = new Product($this->db);
+			$resprod = $product->fetch($this->fieldValue);
+			if ($resprod > 0) {
+				$out.= $product->ref;
+			} elseif ($resprod < 0) {
+				$this->setErrors($product->errors);
+			}
+		} else {
+			$out.= $this->fieldValue;
+		}
+
+		return $out;
+	}
+
+
+	/*
+	 * METHODS FOR SETTING DISPLAY TYPE
+	 */
+
+	/**
+	 * Set type of input as string
+	 * @return self
+	 */
+	public function setAsString()
+	{
+		$this->type = 'string';
+		return $this;
+	}
+
+	/**
+	 * Set type of input as textarea
+	 * @return self
+	 */
+	public function setAsTextarea()
+	{
+		$this->type = 'textarea';
+		return $this;
+	}
+
+	/**
+	 * Set type of input as html editor
+	 * @return self
+	 */
+	public function setAsHtml()
+	{
+		$this->type = 'html';
+		return $this;
+	}
+
+	/**
+	 * Set type of input as emailtemplate selector
+	 * @param string $templateType email template type
+	 * @return self
+	 */
+	public function setAsEmailTemplate($templateType)
+	{
+		$this->type = 'emailtemplate:'.$templateType;
+		return $this;
+	}
+
+	/**
+	 * Set type of input as thirdparty_type selector
+	 * @return self
+	 */
+	public function setAsThirdpartyType()
+	{
+		$this->type = 'thirdparty_type';
+		return $this;
+	}
+
+	/**
+	 * Set type of input as Yes
+	 * @return self
+	 */
+	public function setAsYesNo()
+	{
+		$this->type = 'yesno';
+		return $this;
+	}
+
+	/**
+	 * Set type of input as secure key
+	 * @return self
+	 */
+	public function setAsSecureKey()
+	{
+		$this->type = 'securekey';
+		return $this;
+	}
+
+	/**
+	 * Set type of input as product
+	 * @return self
+	 */
+	public function setAsProduct()
+	{
+		$this->type = 'product';
+		return $this;
+	}
+
+	/**
+	 * Set type of input as a category selector
+	 * TODO add default value
+	 * @param	int		$catType		Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.
+	 * @return self
+	 */
+	public function setAsCategory($catType)
+	{
+		$this->type = 'category:'.$catType;
+		return $this;
+	}
+
+	/**
+	 * Set type of input as a simple title
+	 * no data to store
+	 * @return self
+	 */
+	public function setAsTitle()
+	{
+		$this->type = 'title';
+		return $this;
+	}
+}
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index 57d8876c3ea..68b8410e647 100644
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -127,7 +127,7 @@ class FormSms
 		print "\n<!-- Begin form SMS -->\n";
 
 		print '
-<script language="javascript">
+<script type="text/javascript">
 function limitChars(textarea, limit, infodiv)
 {
     var text = textarea.value;
@@ -178,7 +178,7 @@ function limitChars(textarea, limit, infodiv)
 				} else {
 					if ($this->fromtype) {
 						$langs->load("errors");
-						print '<font class="warning"> &lt;'.$langs->trans("ErrorNoPhoneDefinedForThisUser").'&gt; </font>';
+						print '<span class="warning"> &lt;'.$langs->trans("ErrorNoPhoneDefinedForThisUser").'&gt; </span>';
 					}
 				}
 				print "</td></tr>\n";
@@ -322,7 +322,7 @@ function limitChars(textarea, limit, infodiv)
 
 		if ($showform) {
 			print '<div class="center">';
-			print '<input class="button" type="submit" name="sendmail" value="'.dol_escape_htmltag($langs->trans("SendSms")).'">';
+			print '<input type="submit" class="button" name="sendmail" value="'.dol_escape_htmltag($langs->trans("SendSms")).'">';
 			if ($this->withcancel) {
 				print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 				print '<input class="button button-cancel" type="submit" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
diff --git a/htdocs/core/class/html.formsocialcontrib.class.php b/htdocs/core/class/html.formsocialcontrib.class.php
index 3455b572888..ea325a4b591 100644
--- a/htdocs/core/class/html.formsocialcontrib.class.php
+++ b/htdocs/core/class/html.formsocialcontrib.class.php
@@ -74,13 +74,13 @@ class FormSocialContrib
 
 		if (!empty($mysoc->country_id)) {
 			$sql = "SELECT c.id, c.libelle as type";
-			$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+			$sql .= " FROM ".$this->db->prefix()."c_chargesociales as c";
 			$sql .= " WHERE c.active = 1";
 			$sql .= " AND c.fk_pays = ".((int) $mysoc->country_id);
 			$sql .= " ORDER BY c.libelle ASC";
 		} else {
 			$sql = "SELECT c.id, c.libelle as type";
-			$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
+			$sql .= " FROM ".$this->db->prefix()."c_chargesociales as c, ".$this->db->prefix()."c_country as co";
 			$sql .= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
 			$sql .= " AND co.code = '".$this->db->escape($mysoc->country_code)."'";
 			$sql .= " ORDER BY c.libelle ASC";
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 7d116fd692a..ad83c706c12 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -22,7 +22,7 @@
 /**
  *       \file       htdocs/core/class/html.formticket.class.php
  *       \ingroup    ticket
- *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
+ *       \brief      File of class to generate the form for creating a new ticket.
  */
 require_once DOL_DOCUMENT_ROOT."/core/class/html.form.class.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/html.formmail.class.php";
@@ -33,12 +33,12 @@ if (!class_exists('FormCompany')) {
 }
 
 /**
- * Classe permettant la generation du formulaire d'un nouveau ticket.
+ * Class to generate the form for creating a new ticket.
+ * Usage: 	$formticket = new FormTicket($db)
+ * 			$formticket->proprietes=1 ou chaine ou tableau de valeurs
+ * 			$formticket->show_form() affiche le formulaire
  *
  * @package Ticket
- * \remarks Utilisation: $formticket = new FormTicket($db)
- * \remarks $formticket->proprietes=1 ou chaine ou tableau de valeurs
- * \remarks $formticket->show_form() affiche le formulaire
  */
 class FormTicket
 {
@@ -244,6 +244,63 @@ class FormTicket
 			}
 		}
 
+		if ($conf->knowledgemanagement->enabled) {
+			// KM Articles
+			print '<tr id="KWwithajax"></tr>';
+			print '<!-- Script to manage change of ticket group -->
+			<script>
+			jQuery(document).ready(function() {
+				function groupticketchange(){
+					console.log("We called groupticketchange, so we try to load list KM linked to event");
+					$("#KWwithajax").html("");
+					idgroupticket = $("#selectcategory_code").val();
+
+					console.log("We have selected id="+idgroupticket);
+
+					if (idgroupticket != "") {
+						$.ajax({ url: \''.DOL_URL_ROOT.'/core/ajax/fetchKnowledgeRecord.php\',
+							 data: { action: \'getKnowledgeRecord\', idticketgroup: idgroupticket, token: \''.newToken().'\', lang:\''.$langs->defaultlang.'\'},
+							 type: \'GET\',
+							 success: function(response) {
+								var urllist = \'\';
+								console.log("We received response "+response);
+								response = JSON.parse(response)
+								for (key in response) {
+									answer = response[key].answer;
+									urllist += \'<li><a href="#" title="\'+response[key].title+\'" class="button_KMpopup" data-html="\'+answer+\'">\' +response[key].title+\'</a></li>\';
+								}
+								if (urllist != "") {
+									$("#KWwithajax").html(\'<td>'.$langs->trans("KMFoundForTicketGroup").'</td><td><ul>\'+urllist+\'</ul></td>\');
+									$("#KWwithajax").show();
+									$(".button_KMpopup").on("click",function(){
+										console.log("Open popup with jQuery(...).dialog() with KM article")
+										var $dialog = $("<div></div>").html($(this).attr("data-html"))
+											.dialog({
+												autoOpen: false,
+												modal: true,
+												height: (window.innerHeight - 150),
+												width: "80%",
+												title: $(this).attr("title"),
+											});
+										$dialog.dialog("open");
+										console.log($dialog);
+									})
+								}
+							 },
+							 error : function(output) {
+								console.error("Error on Fetch of KM articles");
+							 },
+						});
+					}
+				};
+				$("#selectcategory_code").on("change",function() { groupticketchange(); });
+				if ($("#selectcategory_code").val() != "") {
+					groupticketchange();
+				}
+			});
+			</script>'."\n";
+		}
+
 		// MESSAGE
 		$msg = GETPOSTISSET('message') ? GETPOST('message', 'restricthtml') : '';
 		print '<tr><td><label for="message"><span class="fieldrequired">'.$langs->trans("Message").'</span></label></td><td>';
@@ -273,6 +330,19 @@ class FormTicket
 			print '</td></tr>';
 		}
 
+		// Categories
+		if ($conf->categorie->enabled) {
+			include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+			$cate_arbo = $form->select_all_categories(Categorie::TYPE_TICKET, '', 'parent', 64, 0, 1);
+
+			if (count($cate_arbo)) {
+				// Categories
+				print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
+				print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+				print "</td></tr>";
+			}
+		}
+
 		// Attached files
 		if (!empty($this->withfile)) {
 			// Define list of attached files
@@ -296,7 +366,7 @@ class FormTicket
 			$out .= '<td>';
 			// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
 			$out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
-			$out .= '<script type="text/javascript" language="javascript">';
+			$out .= '<script type="text/javascript">';
 			$out .= 'jQuery(document).ready(function () {';
 			$out .= '    jQuery(".removedfile").click(function() {';
 			$out .= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
@@ -428,6 +498,15 @@ class FormTicket
 				print '<input type="checkbox" id="notify_tiers_at_create" name="notify_tiers_at_create"'.($this->withnotifytiersatcreate ? ' checked="checked"' : '').'>';
 				print '</td></tr>';
 			}
+
+			// User assigned
+			print '<tr><td>';
+			print $langs->trans("AssignedTo");
+			print '</td><td>';
+			print img_picto('', 'user', 'class="pictofixedwidth"');
+			print $form->select_dolusers(GETPOST('fk_user_assign', 'int'), 'fk_user_assign', 1);
+			print '</td>';
+			print '</tr>';
 		}
 
 		if ($subelement != 'project') {
@@ -452,13 +531,19 @@ class FormTicket
 			print dol_get_fiche_end();
 		}
 
-		print '<br><div class="center">';
-		print '<input class="button" type="submit" name="add" value="'.$langs->trans(($this->withthreadid > 0 ? "SendResponse" : "CreateTicket")).'" />';
+		print '<br>';
+
+		print $form->buttonsSaveCancel((($this->withthreadid > 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")).'" />';
 		if ($this->withcancel) {
 			print " &nbsp; &nbsp; &nbsp;";
 			print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 		}
 		print '</div>';
+		*/
 
 		print '<input type="hidden" name="page_y">'."\n";
 
@@ -564,28 +649,33 @@ class FormTicket
 	/**
 	 *      Return html list of ticket anaytic codes
 	 *
-	 *      @param  string $selected    Id categorie pre-selectionnée
-	 *      @param  string $htmlname    Nom de la zone select
-	 *      @param  string $filtertype  To filter on some properties in llx_c_ticket_category ('public = 1'). This parameter must not come from input of users.
-	 *      @param  int    $format      0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code
-	 *      @param  int    $empty       1=peut etre vide, 0 sinon
-	 *      @param  int    $noadmininfo 0=Add admin info, 1=Disable admin info
-	 *      @param  int    $maxlength   Max length of label
-	 *      @param	string	$morecss	More CSS
-	 * 		@param	int 	$use_multilevel	if != 0 create a multilevel select ( Do not use any of the other params)
+	 *      @param  string 		$selected   		Id categorie pre-selectionnée
+	 *      @param  string 		$htmlname   		Name of select component
+	 *      @param  string 		$filtertype 		To filter on some properties in llx_c_ticket_category ('public = 1'). This parameter must not come from input of users.
+	 *      @param  int    		$format     		0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code
+	 *      @param  int    		$empty      		1=peut etre vide, 0 sinon
+	 *      @param  int    		$noadmininfo		0=Add admin info, 1=Disable admin info
+	 *      @param  int    		$maxlength  		Max length of label
+	 *      @param	string		$morecss			More CSS
+	 * 		@param	int 		$use_multilevel		If > 0 create a multilevel select which use $htmlname example: $use_multilevel = 1 permit to have 2 select boxes.
+	 * 		@param	Translate	$outputlangs		Output lnaguage
 	 *      @return void
 	 */
-	public function selectGroupTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '', $use_multilevel = 0)
+	public function selectGroupTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '', $use_multilevel = 0, $outputlangs = null)
 	{
-		global $langs, $user;
+		global $conf, $langs, $user;
 
-		if ($use_multilevel == 0) {
-			$ticketstat = new Ticket($this->db);
+		dol_syslog(get_class($this)."::selectCategoryTickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
 
-			dol_syslog(get_class($this)."::selectCategoryTickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
+		if (is_null($outputlangs) || !is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
+		$outputlangs->load("ticket");
 
-			$ticketstat->loadCacheCategoriesTickets();
+		$ticketstat = new Ticket($this->db);
+		$ticketstat->loadCacheCategoriesTickets();
 
+		if ($use_multilevel <= 0) {
 			print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
 			if ($empty) {
 				print '<option value="">&nbsp;</option>';
@@ -605,6 +695,13 @@ class FormTicket
 						continue;
 					}
 
+					$label = ($arraycategories['label'] != '-' ? $arraycategories['label'] : '');
+					if ($outputlangs->trans("TicketCategoryShort".$arraycategories['code']) != ("TicketCategoryShort".$arraycategories['code'])) {
+						$label = $outputlangs->trans("TicketCategoryShort".$arraycategories['code']);
+					} elseif ($outputlangs->trans($arraycategories['code']) != $arraycategories['code']) {
+						$label = $outputlangs->trans($arraycategories['code']);
+					}
+
 					if ($format == 0) {
 						print '<option value="'.$id.'"';
 					}
@@ -633,7 +730,7 @@ class FormTicket
 					print '>';
 
 					if ($format == 0) {
-						$value = ($maxlength ? dol_trunc($arraycategories['label'], $maxlength) : $arraycategories['label']);
+						$value = ($maxlength ? dol_trunc($label, $maxlength) : $label);
 					}
 
 					if ($format == 1) {
@@ -641,7 +738,7 @@ class FormTicket
 					}
 
 					if ($format == 2) {
-						$value = ($maxlength ? dol_trunc($arraycategories['label'], $maxlength) : $arraycategories['label']);
+						$value = ($maxlength ? dol_trunc($label, $maxlength) : $label);
 					}
 
 					if ($format == 3) {
@@ -658,106 +755,237 @@ class FormTicket
 			}
 
 			print ajax_combobox('select'.$htmlname);
-		} else {
-			$groupticket=GETPOST('groupticket', 'aZ09');
-			$groupticketchild=GETPOST('groupticket_child', 'aZ09');
+		} elseif ($htmlname!='') {
+			$selectedgroups = array();
+			$groupvalue = "";
+			$groupticket=GETPOST($htmlname, 'aZ09');
+			$child_id=GETPOST($htmlname.'_child_id', 'aZ09')?GETPOST($htmlname.'_child_id', 'aZ09'):0;
+			if (!empty($groupticket)) {
+				$tmpgroupticket = $groupticket;
+				$sql = "SELECT ctc.rowid, ctc.fk_parent, ctc.code FROM ".$this->db->prefix()."c_ticket_category as ctc WHERE ctc.code = '".$this->db->escape($tmpgroupticket)."'";
+				$resql = $this->db->query($sql);
+				if ($resql) {
+					$obj = $this->db->fetch_object($resql);
+					$selectedgroups[] = $obj->code;
+					while ($obj->fk_parent > 0) {
+						$sql = "SELECT ctc.rowid, ctc.fk_parent, ctc.code FROM ".$this->db->prefix()."c_ticket_category as ctc WHERE ctc.rowid ='".$this->db->escape($obj->fk_parent)."'";
+						$resql = $this->db->query($sql);
+						if ($resql) {
+							$obj = $this->db->fetch_object($resql);
+							$selectedgroups[] = $obj->code;
+						}
+					}
+				}
+			}
+			$arrayidused = array();
+			$arrayidusedconcat = array();
+			$arraycodenotparent = array();
 			$arraycodenotparent[] = "";
+
 			$stringtoprint = '<span class="supportemailfield bold">'.$langs->trans("GroupOfTicket").'</span> ';
-			$stringtoprint .= '<select name="groupticket" id ="groupticket" class="maxwidth500 minwidth400">';
+			$stringtoprint .= '<select id ="'.$htmlname.'" class="minwidth500" child_id="0">';
 			$stringtoprint .= '<option value="">&nbsp;</option>';
 
-			$sql = "SELECT ctc.rowid, ctc.code, ctc.label, ctc.fk_parent, ";
+			$sql = "SELECT ctc.rowid, ctc.code, ctc.label, ctc.fk_parent, ctc.public, ";
 			$sql .= $this->db->ifsql("ctc.rowid NOT IN (SELECT ctcfather.rowid FROM llx_c_ticket_category as ctcfather JOIN llx_c_ticket_category as ctcjoin ON ctcfather.rowid = ctcjoin.fk_parent)", "'NOTPARENT'", "'PARENT'")." as isparent";
-			$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as ctc";
-			$sql .= " WHERE ctc.public = 1";
-			$sql .= " AND ctc.active = 1";
+			$sql .= " FROM ".$this->db->prefix()."c_ticket_category as ctc";
+			$sql .= " WHERE ctc.active > 0 AND ctc.entity = ".((int) $conf->entity);
+			if ($filtertype == 'public=1') {
+				$sql .= " AND ctc.public = 1";
+			}
 			$sql .= " AND ctc.fk_parent = 0";
 			$sql .= $this->db->order('ctc.pos', 'ASC');
+
 			$resql = $this->db->query($sql);
 			if ($resql) {
-				$num_rows = $this->db->num_rows($resql);
+				$num_rows_level0 = $this->db->num_rows($resql);
 				$i = 0;
-				while ($i < $num_rows) {
+				while ($i < $num_rows_level0) {
 					$obj = $this->db->fetch_object($resql);
 					if ($obj) {
+						$label = ($obj->label != '-' ? $obj->label : '');
+						if ($outputlangs->trans("TicketCategoryShort".$obj->code) != ("TicketCategoryShort".$obj->code)) {
+							$label = $outputlangs->trans("TicketCategoryShort".$obj->code);
+						} elseif ($outputlangs->trans($obj->code) != $obj->code) {
+							$label = $outputlangs->trans($obj->code);
+						}
+
 						$grouprowid = $obj->rowid;
 						$groupvalue = $obj->code;
-						$grouplabel = $obj->label;
+						$grouplabel = $label;
+
 						$isparent = $obj->isparent;
-						$iselected = $groupticket == $obj->code ?'selected':'';
-						$stringtoprint .= '<option '.$iselected.' class="groupticket'.dol_escape_htmltag($grouprowid).'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
+						if (is_array($selectedgroups)) {
+							$iselected = in_array($obj->code, $selectedgroups) ?'selected':'';
+						} else {
+							$iselected = $groupticket == $obj->code ?'selected':'';
+						}
+						$stringtoprint .= '<option '.$iselected.' class="'.$htmlname.dol_escape_htmltag($grouprowid).'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
 						if ($isparent == 'NOTPARENT') {
 							$arraycodenotparent[] = $groupvalue;
 						}
+						$arrayidused[] = $grouprowid;
+						$arrayidusedconcat[] = $grouprowid;
 					}
 					$i++;
 				}
 			} else {
 				dol_print_error($this->db);
 			}
-			if ($num_rows == 1) {
-				return '<input type="hidden" name="groupticket" id="groupticket" value="'.dol_escape_htmltag($groupvalue).'">';
-			}
-			$stringtoprint .= '</select>&nbsp';
-
-			$stringtoprint .= '<select name="groupticket_child" id ="groupticket_child" class="maxwidth500 minwidth400">';
-			$stringtoprint .= '<option value="">&nbsp;</option>';
-
-			$sql = "SELECT ctc.rowid, ctc.code, ctc.label, ctc.fk_parent, ctcjoin.code as codefather";
-			$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as ctc";
-			$sql .= " JOIN ".MAIN_DB_PREFIX."c_ticket_category as ctcjoin ON ctc.fk_parent = ctcjoin.rowid";
-			$sql .= " WHERE ctc.public = 1";
-			$sql .= " AND ctc.active = 1";
-			$sql .= " AND ctc.fk_parent <> 0";
-			$sql .= $this->db->order('ctc.pos', 'ASC');
-			$resql = $this->db->query($sql);
-			if ($resql) {
-				$num_rows = $this->db->num_rows($resql);
-				$i = 0;
-				while ($i < $num_rows) {
-					$obj = $this->db->fetch_object($resql);
-					if ($obj) {
-						$grouprowid = $obj->rowid;
-						$groupvalue = $obj->code;
-						$grouplabel = $obj->label;
-						$fatherid = $obj->fk_parent;
-						$groupcodefather = $obj->codefather;
-						$iselected = $groupticketchild == $obj->code ?'selected':'';
-						$stringtoprint .= '<option '.$iselected.' class="groupticket_'.dol_escape_htmltag($fatherid).'_child" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
-						$tabscript[] = 'if($("#groupticket")[0].value == "'.dol_escape_js($groupcodefather).'"){
-							$(".groupticket_'.dol_escape_htmltag($fatherid).'_child").show()
-						}else{
-							$(".groupticket_'.dol_escape_htmltag($fatherid).'_child").hide()
-						}';
-					}
-					$i++;
-				}
+			if (count($arrayidused) == 1) {
+				return '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.dol_escape_htmltag($groupvalue).'">';
 			} else {
-				dol_print_error($this->db);
+				$stringtoprint .= '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'_select" class="maxwidth500 minwidth400">';
+				$stringtoprint .= '<input type="hidden" name="'.$htmlname.'_child_id" id="'.$htmlname.'_select_child_id" class="maxwidth500 minwidth400">';
 			}
-			$stringtoprint .='</select>';
+			$stringtoprint .= '</select>&nbsp;';
 
-			$stringtoprint .='<script>';
-			$stringtoprint .='var arraynotparents = '.json_encode($arraycodenotparent).';';
-			$stringtoprint .='if (arraynotparents.includes($("#groupticket")[0].value)){$("#groupticket_child").hide()}
-			else{';
-			foreach ($tabscript as $script) {
-				$stringtoprint .= $script;
-			};
-			$stringtoprint .='}
-			$("#groupticket").change(function() {
-				$("#groupticket_child")[0].value = ""
-				if (!arraynotparents.includes(this.value)) {
-				$("#groupticket_child").show()
+			$levelid = 1;	// The first combobox
+			while ($levelid <= $use_multilevel) {	// Loop to take the child of the combo
+				$tabscript = array();
+				$stringtoprint .= '<select id ="'.$htmlname.'_child_'.$levelid.'" class="maxwidth500 minwidth400 groupticketchild" child_id="'.$levelid.'">';
+				$stringtoprint .= '<option value="">&nbsp;</option>';
+
+				$sql = "SELECT ctc.rowid, ctc.code, ctc.label, ctc.fk_parent, ctc.public, ctcjoin.code as codefather";
+				$sql .= " FROM ".$this->db->prefix()."c_ticket_category as ctc";
+				$sql .= " JOIN ".$this->db->prefix()."c_ticket_category as ctcjoin ON ctc.fk_parent = ctcjoin.rowid";
+				$sql .= " WHERE ctc.active > 0 AND ctc.entity = ".((int) $conf->entity);
+				$sql .= " AND ctc.rowid NOT IN (".$this->db->sanitize(join(',', $arrayidusedconcat)).")";
+
+				if ($filtertype == 'public=1') {
+					$sql .= " AND ctc.public = 1";
+				}
+				// Add a test to take only record that are direct child
+				if (!empty($arrayidused)) {
+					$sql .= " AND ctc.fk_parent IN ( ";
+					foreach ($arrayidused as $idused) {
+						$sql .= $idused.", ";
+					}
+					$sql = substr($sql, 0, -2);
+					$sql .= ")";
 				} else {
-				$("#groupticket_child").hide()
 				}
-			';
-			foreach ($tabscript as $script) {
-				$stringtoprint .= $script;
-			};
-			$stringtoprint .='})';
+				$sql .= $this->db->order('ctc.pos', 'ASC');
+
+				$resql = $this->db->query($sql);
+				if ($resql) {
+					$num_rows = $this->db->num_rows($resql);
+					$i = 0;
+					$arrayidused=array();
+					while ($i < $num_rows) {
+						$obj = $this->db->fetch_object($resql);
+						if ($obj) {
+							$label = ($obj->label != '-' ? $obj->label : '');
+							if ($outputlangs->trans("TicketCategoryShort".$obj->code) != ("TicketCategoryShort".$obj->code)) {
+								$label = $outputlangs->trans("TicketCategoryShort".$obj->code);
+							} elseif ($outputlangs->trans($obj->code) != $obj->code) {
+								$label = $outputlangs->trans($obj->code);
+							}
+
+							$grouprowid = $obj->rowid;
+							$groupvalue = $obj->code;
+							$grouplabel = $label;
+							$isparent = $obj->isparent;
+							$fatherid = $obj->fk_parent;
+							$arrayidused[] = $grouprowid;
+							$arrayidusedconcat[] = $grouprowid;
+							$groupcodefather = $obj->codefather;
+							if ($isparent == 'NOTPARENT') {
+								$arraycodenotparent[] = $groupvalue;
+							}
+							if (is_array($selectedgroups)) {
+								$iselected = in_array($obj->code, $selectedgroups) ?'selected':'';
+							} else {
+								$iselected = $groupticket == $obj->code ?'selected':'';
+							}
+							$stringtoprint .= '<option '.$iselected.' class="'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
+							if (empty($tabscript[$groupcodefather])) {
+								$tabscript[$groupcodefather] = 'if ($("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'").val() == "'.dol_escape_js($groupcodefather).'"){
+									$(".'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'").show()
+									console.log("We show childs tickets of '.$groupcodefather.' group ticket")
+								}else{
+									$(".'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'").hide()
+									console.log("We hide childs tickets of '.$groupcodefather.' group ticket")
+								}';
+							}
+						}
+						$i++;
+					}
+				} else {
+					dol_print_error($this->db);
+				}
+				$stringtoprint .='</select>';
+
+				$stringtoprint .='<script>';
+				$stringtoprint .='arraynotparents = '.json_encode($arraycodenotparent).';';	// when the last visible combo list is number x, this is the array of group
+				$stringtoprint .='if (arraynotparents.includes($("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'").val())){
+					console.log("'.$htmlname.'_child_'.$levelid.'")
+					if($("#'.$htmlname.'_child_'.$levelid.'").val() == "" && ($("#'.$htmlname.'_child_'.$levelid.'").attr("child_id")>'.$child_id.')){
+						$("#'.$htmlname.'_child_'.$levelid.'").hide();
+						console.log("We hide '.$htmlname.'_child_'.$levelid.' input")
+					}
+					if(arraynotparents.includes("'.$groupticket.'") && '.$child_id.' == 0){
+						$("#ticketcategory_select_child_id").val($("#'.$htmlname.'").attr("child_id"))
+						$("#ticketcategory_select").val($("#'.$htmlname.'").val()) ;
+						console.log("We choose '.$htmlname.' input and reload hidden input");
+					}
+				}
+				$("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid-1:'').'").change(function() {
+					child_id = $("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid:'').'").attr("child_id");
+
+					/* Change of value to select this value*/
+					if (arraynotparents.includes($(this).val()) || $(this).attr("child_id") == '.$use_multilevel.') {
+						$("#ticketcategory_select").val($(this).val());
+						$("#ticketcategory_select_child_id").val($(this).attr("child_id")) ;
+						console.log("We choose to select "+ $(this).val());
+					}else{
+						if ($("#'.$htmlname.'_child_'.$levelid.' option").length <= 1) {
+							$("#ticketcategory_select").val($(this).val());
+							$("#ticketcategory_select_child_id").val($(this).attr("child_id"));
+							console.log("We choose to select "+ $(this).val() + " and next combo has no item, so we keep this selection");
+						} else {
+							console.log("We choose to select "+ $(this).val() + " but next combo has some item, so we clean selected item");
+							$("#ticketcategory_select").val("");
+							$("#ticketcategory_select_child_id").val("");
+						}
+					}
+
+					console.log("We select a new value into combo child_id="+child_id);
+
+					/* Hide all selected box that are child of the one modified */
+					$(".groupticketchild").each(function(){
+						if ($(this).attr("child_id") > child_id) {
+							console.log("hide child_id="+$(this).attr("child_id"));
+							$(this).val("");
+							$(this).hide();
+						}
+					})
+
+					/* Now we enable the next combo */
+					$("#'.$htmlname.'_child_'.$levelid.'").val("");
+					if (!arraynotparents.includes($(this).val()) && $("#'.$htmlname.'_child_'.$levelid.' option").length > 1) {
+						console.log($("#'.$htmlname.'_child_'.$levelid.' option").length);
+						$("#'.$htmlname.'_child_'.$levelid.'").show()
+					} else {
+						$("#'.$htmlname.'_child_'.$levelid.'").hide()
+					}
+				';
+				$levelid++;
+				foreach ($tabscript as $script) {
+					$stringtoprint .= $script;
+				};
+				$stringtoprint .='})';
+				$stringtoprint .='</script>';
+			}
+			$stringtoprint .='<script>';
+			$stringtoprint .='$("#'.$htmlname.'_child_'.$use_multilevel.'").change(function() {
+				$("#ticketcategory_select").val($(this).val());
+				$("#ticketcategory_select_child_id").val($(this).attr("child_id"));
+				console.log($("#ticketcategory_select").val());
+			})';
 			$stringtoprint .='</script>';
+			$stringtoprint .= ajax_combobox($htmlname);
+
 			return $stringtoprint;
 		}
 	}
@@ -976,7 +1204,7 @@ class FormTicket
 		$send_email = GETPOST('send_email', 'int') ? GETPOST('send_email', 'int') : 0;
 
 		// Example 1 : Adding jquery code
-		print '<script type="text/javascript" language="javascript">
+		print '<script type="text/javascript">
 		jQuery(document).ready(function() {
 			send_email=' . $send_email.';
 			if (send_email) {
@@ -1025,7 +1253,7 @@ class FormTicket
 		// External users can't send message email
 		if ($user->rights->ticket->write && !$user->socid) {
 			print '<tr><td></td><td>';
-			$checkbox_selected = (GETPOST('send_email') == "1" ? ' checked' : '');
+			$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.'/> ';
 			print '<label for="send_msg_email">'.$langs->trans('SendMessageByEmail').'</label>';
 			print '</td></tr>';
@@ -1033,12 +1261,12 @@ class FormTicket
 			// Zone to select its email template
 			if (count($modelmail_array) > 0) {
 				print '<tr class="email_line"><td></td><td colspan="2"><div style="padding: 3px 0 3px 0">'."\n";
-				print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1);
+				 print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1, 0, "", "", 0, 0, 0, '', 'minwidth200');
 				if ($user->admin) {
 					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 				}
 				print ' &nbsp; ';
-				print '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
+				print '<input type="submit" class="button" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
 				print '</div></td>';
 			}
 
@@ -1094,6 +1322,7 @@ class FormTicket
 
 				// Print recipient list
 				if (is_array($sendto) && count($sendto) > 0) {
+					print img_picto('', 'email', 'class="pictofixedwidth"');
 					print implode(', ', $sendto);
 				} else {
 					print '<div class="warning">'.$langs->trans('WarningNoEMailsAdded').' '.$langs->trans('TicketGoIntoContactTab').'</div>';
@@ -1176,7 +1405,7 @@ class FormTicket
 			$out .= '<td>';
 			// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
 			$out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
-			$out .= '<script type="text/javascript" language="javascript">';
+			$out .= '<script type="text/javascript">';
 			$out .= 'jQuery(document).ready(function () {';
 			$out .= '    jQuery(".removedfile").click(function() {';
 			$out .= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
@@ -1208,7 +1437,7 @@ class FormTicket
 		print '</table>';
 
 		print '<center><br>';
-		print '<input class="button" type="submit" name="btn_add_message" value="'.$langs->trans("AddMessage").'" />';
+		print '<input type="submit" class="button" name="btn_add_message" value="'.$langs->trans("AddMessage").'" />';
 		if ($this->withcancel) {
 			print " &nbsp; &nbsp; ";
 			print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 4210113f990..083e571cf35 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -64,7 +64,7 @@ class FormWebsite
 		$out = '';
 
 		$sql = "SELECT rowid, ref";
-		$sql .= " FROM ".MAIN_DB_PREFIX."website";
+		$sql .= " FROM ".$this->db->prefix()."website";
 		$sql .= " WHERE 1 = 1";
 		$sql .= " ORDER BY rowid";
 		$result = $this->db->query($sql);
@@ -104,16 +104,17 @@ 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;
 
 		$langs->load("admin");
 
 		$sql = "SELECT rowid, code, label, entity";
-		$sql .= " FROM ".MAIN_DB_PREFIX.'c_type_container';
+		$sql .= " FROM ".$this->db->prefix().'c_type_container';
 		$sql .= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
 		$sql .= " ORDER BY label";
 
@@ -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>';
 				}
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index fb59e2b7c42..f3f28abe149 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -37,7 +37,7 @@ class InfoBox
 	{
 		global $conf;
 
-		if (empty($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2) {
+		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 			return array(
 				0 => 'Home',
 				1 => 'UsersHome',
@@ -83,7 +83,7 @@ class InfoBox
 	/**
 	 *  Return array of boxes qualified for area and user
 	 *
-	 *  @param	DoliDB		$db				Database handler
+	 *  @param	DoliDB		$dbs			Database handler
 	 *  @param	string		$mode			'available' or 'activated'
 	 *  @param	int			$zone			Name or area (-1 for all, 0 for Homepage, 1 for Accountancy, 2 for xxx, ...)
 	 *  @param  User|null   $user	  		Object user to filter
@@ -91,7 +91,7 @@ class InfoBox
 	 *  @param  int         $includehidden  Include also hidden boxes
 	 *  @return array       	        	Array of boxes
 	 */
-	public static function listBoxes($db, $mode, $zone, $user = null, $excludelist = array(), $includehidden = 1)
+	public static function listBoxes($dbs, $mode, $zone, $user = null, $excludelist = array(), $includehidden = 1)
 	{
 		global $conf;
 
@@ -100,7 +100,7 @@ class InfoBox
 		if ($mode == 'activated') {	// activated
 			$sql = "SELECT b.rowid, b.position, b.box_order, b.fk_user,";
 			$sql .= " d.rowid as box_id, d.file, d.note, d.tms";
-			$sql .= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
+			$sql .= " FROM ".$dbs->prefix()."boxes as b, ".$dbs->prefix()."boxes_def as d";
 			$sql .= " WHERE b.box_id = d.rowid";
 			$sql .= " AND b.entity IN (0,".$conf->entity.")";
 			if ($zone >= 0) {
@@ -114,17 +114,17 @@ class InfoBox
 			$sql .= " ORDER BY b.box_order";
 		} else { // available
 			$sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
-			$sql .= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
+			$sql .= " FROM ".$dbs->prefix()."boxes_def as d";
 			$sql .= " WHERE d.entity IN (0, ".$conf->entity.")";
 		}
 
 		dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user) ? $user->id : '')."", LOG_DEBUG);
-		$resql = $db->query($sql);
+		$resql = $dbs->query($sql);
 		if ($resql) {
-			$num = $db->num_rows($resql);
+			$num = $dbs->num_rows($resql);
 			$j = 0;
 			while ($j < $num) {
-				$obj = $db->fetch_object($resql);
+				$obj = $dbs->fetch_object($resql);
 
 				if (!in_array($obj->box_id, $excludelist)) {
 					$regs = array();
@@ -144,14 +144,14 @@ class InfoBox
 					// Goal is to avoid making a "new" done for each boxes returned by select.
 					dol_include_once($relsourcefile);
 					if (class_exists($boxname)) {
-						$box = new $boxname($db, $obj->note); // Constructor may set properties like box->enabled. obj->note is note into box def, not user params.
+						$box = new $boxname($dbs, $obj->note); // Constructor may set properties like box->enabled. obj->note is note into box def, not user params.
 						//$box=new stdClass();
 
 						// box properties
 						$box->rowid = (empty($obj->rowid) ? '' : $obj->rowid);
 						$box->id = (empty($obj->box_id) ? '' : $obj->box_id);
 						$box->position = ((isset($obj->position) && $obj->position == '') ? '' : (isset($obj->position) ? $obj->position : '')); // '0' must stay '0'
-						$box->box_order	= (empty($obj->box_order) ? '' : $obj->box_order);
+						$box->box_order = (empty($obj->box_order) ? '' : $obj->box_order);
 						$box->fk_user = (empty($obj->fk_user) ? 0 : $obj->fk_user);
 						$box->sourcefile = $relsourcefile;
 						$box->class = $boxname;
@@ -204,8 +204,8 @@ class InfoBox
 				$j++;
 			}
 		} else {
-			dol_syslog($db->lasterror(), LOG_ERR);
-			return array('error'=>$db->lasterror());
+			dol_syslog($dbs->lasterror(), LOG_ERR);
+			return array('error'=>$dbs->lasterror());
 		}
 
 		return $boxes;
@@ -215,13 +215,13 @@ class InfoBox
 	/**
 	 *  Save order of boxes for area and user
 	 *
-	 *  @param	DoliDB	$db				Database handler
+	 *  @param	DoliDB	$dbs			Database handler
 	 *  @param	int		$zone       	Name of area (0 for Homepage, ...)
 	 *  @param  string  $boxorder   	List of boxes with correct order 'A:123,456,...-B:789,321...'
 	 *  @param  int     $userid     	Id of user
 	 *  @return int                   	<0 if KO, 0=Nothing done, > 0 if OK
 	 */
-	public static function saveboxorder($db, $zone, $boxorder, $userid = 0)
+	public static function saveboxorder($dbs, $zone, $boxorder, $userid = 0)
 	{
 		global $conf;
 
@@ -235,29 +235,29 @@ class InfoBox
 			return 0;
 		}
 
-		$user = new User($db);
+		$user = new User($dbs);
 		$user->id = $userid;
 
-		$db->begin();
+		$dbs->begin();
 
 		// Save parameters to say user has a dedicated setup
 		$tab = array();
 		$confuserzone = 'MAIN_BOXES_'.$zone;
 		$tab[$confuserzone] = 1;
-		if (dol_set_user_param($db, $conf, $user, $tab) < 0) {
-			$error = $db->lasterror();
-			$db->rollback();
+		if (dol_set_user_param($dbs, $conf, $user, $tab) < 0) {
+			$error = $dbs->lasterror();
+			$dbs->rollback();
 			return -3;
 		}
 
 		// Delete all lines
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
+		$sql = "DELETE FROM ".$dbs->prefix()."boxes";
 		$sql .= " WHERE entity = ".$conf->entity;
 		$sql .= " AND fk_user = ".((int) $userid);
 		$sql .= " AND position = ".((int) $zone);
 
 		dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
-		$result = $db->query($sql);
+		$result = $dbs->query($sql);
 		if ($result) {
 			$colonnes = explode('-', $boxorder);
 			foreach ($colonnes as $collist) {
@@ -274,17 +274,17 @@ class InfoBox
 						$i++;
 						$ii = sprintf('%02d', $i);
 
-						$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes";
+						$sql = "INSERT INTO ".$dbs->prefix()."boxes";
 						$sql .= "(box_id, position, box_order, fk_user, entity)";
 						$sql .= " values (";
 						$sql .= " ".((int) $id).",";
 						$sql .= " ".((int) $zone).",";
-						$sql .= " '".$db->escape($colonne.$ii)."',";
+						$sql .= " '".$dbs->escape($colonne.$ii)."',";
 						$sql .= " ".((int) $userid).",";
 						$sql .= " ".((int) $conf->entity);
 						$sql .= ")";
 
-						$result = $db->query($sql);
+						$result = $dbs->query($sql);
 						if ($result < 0) {
 							$error++;
 							break;
@@ -297,10 +297,10 @@ class InfoBox
 		}
 
 		if ($error) {
-			$db->rollback();
+			$dbs->rollback();
 			return -2;
 		} else {
-			$db->commit();
+			$dbs->commit();
 			return 1;
 		}
 	}
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index fa8f05873a6..9e2c45fd634 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -1,8 +1,8 @@
 <?php
 /* Copyright (C) 2004		Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004		Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005-2017	Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2006-2015	Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2021	Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2006-2021	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
@@ -48,6 +48,11 @@ class Ldap
 	 */
 	public $server = array();
 
+	/**
+	 * Current connected server
+	 */
+	public $connectedServer;
+
 	/**
 	 * Base DN (e.g. "dc=foo,dc=com")
 	 */
@@ -117,6 +122,21 @@ class Ldap
 	 */
 	public $result;
 
+	/**
+	 * No Ldap synchronization
+	 */
+	const SYNCHRO_NONE = 0;
+
+	/**
+	 * Dolibarr to Ldap synchronization
+	 */
+	const SYNCHRO_DOLIBARR_TO_LDAP = 1;
+
+	/**
+	 * Ldap to Dolibarr synchronization
+	 */
+	const SYNCHRO_LDAP_TO_DOLIBARR = 2;
+
 
 	/**
 	 *  Constructor
@@ -132,35 +152,33 @@ class Ldap
 		if (!empty($conf->global->LDAP_SERVER_HOST_SLAVE)) {
 			$this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;
 		}
-		$this->serverPort          = $conf->global->LDAP_SERVER_PORT;
-		$this->ldapProtocolVersion = $conf->global->LDAP_SERVER_PROTOCOLVERSION;
-		$this->dn                  = $conf->global->LDAP_SERVER_DN;
-		$this->serverType          = $conf->global->LDAP_SERVER_TYPE;
+		$this->serverPort          = getDolGlobalInt('LDAP_SERVER_PORT', 389);
+		$this->ldapProtocolVersion = getDolGlobalString('LDAP_SERVER_PROTOCOLVERSION');
+		$this->dn                  = getDolGlobalString('LDAP_SERVER_DN');
+		$this->serverType          = getDolGlobalString('LDAP_SERVER_TYPE');
 
-		$this->domain              = $conf->global->LDAP_SERVER_DN;
-		$this->searchUser          = $conf->global->LDAP_ADMIN_DN;
-		$this->searchPassword      = $conf->global->LDAP_ADMIN_PASS;
-		$this->people              = $conf->global->LDAP_USER_DN;
-		$this->groups              = $conf->global->LDAP_GROUP_DN;
+		$this->domain              = getDolGlobalString('LDAP_SERVER_DN');
+		$this->searchUser          = getDolGlobalString('LDAP_ADMIN_DN');
+		$this->searchPassword      = getDolGlobalString('LDAP_ADMIN_PASS');
+		$this->people              = getDolGlobalString('LDAP_USER_DN');
+		$this->groups              = getDolGlobalString('LDAP_GROUP_DN');
 
-		$this->filter              = $conf->global->LDAP_FILTER_CONNECTION; // Filter on user
-		$this->filtergroup         = $conf->global->LDAP_GROUP_FILTER; // Filter on groups
-		$this->filtermember        = $conf->global->LDAP_MEMBER_FILTER; // Filter on member
+		$this->filter              = getDolGlobalString('LDAP_FILTER_CONNECTION'); // Filter on user
+		$this->filtergroup         = getDolGlobalString('LDAP_GROUP_FILTER'); // Filter on groups
+		$this->filtermember        = getDolGlobalString('LDAP_MEMBER_FILTER'); // Filter on member
 
 		// Users
-		$this->attr_login      = $conf->global->LDAP_FIELD_LOGIN; //unix
-		$this->attr_sambalogin = $conf->global->LDAP_FIELD_LOGIN_SAMBA; //samba, activedirectory
-		$this->attr_name       = $conf->global->LDAP_FIELD_NAME;
-		$this->attr_firstname  = $conf->global->LDAP_FIELD_FIRSTNAME;
-		$this->attr_mail       = $conf->global->LDAP_FIELD_MAIL;
-		$this->attr_phone      = $conf->global->LDAP_FIELD_PHONE;
-		$this->attr_skype      = $conf->global->LDAP_FIELD_SKYPE;
-		$this->attr_fax        = $conf->global->LDAP_FIELD_FAX;
-		$this->attr_mobile     = $conf->global->LDAP_FIELD_MOBILE;
+		$this->attr_login      = getDolGlobalString('LDAP_FIELD_LOGIN'); //unix
+		$this->attr_sambalogin = getDolGlobalString('LDAP_FIELD_LOGIN_SAMBA'); //samba, activedirectory
+		$this->attr_name       = getDolGlobalString('LDAP_FIELD_NAME');
+		$this->attr_firstname  = getDolGlobalString('LDAP_FIELD_FIRSTNAME');
+		$this->attr_mail       = getDolGlobalString('LDAP_FIELD_MAIL');
+		$this->attr_phone      = getDolGlobalString('LDAP_FIELD_PHONE');
+		$this->attr_skype      = getDolGlobalString('LDAP_FIELD_SKYPE');
+		$this->attr_fax        = getDolGlobalString('LDAP_FIELD_FAX');
+		$this->attr_mobile     = getDolGlobalString('LDAP_FIELD_MOBILE');
 	}
 
-
-
 	// Connection handling methods -------------------------------------------
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -178,6 +196,8 @@ class Ldap
 
 		$connected = 0;
 		$this->bind = 0;
+		$this->error = 0;
+		$this->connectedServer = '';
 
 		// Check parameters
 		if (count($this->server) == 0 || empty($this->server[0])) {
@@ -220,13 +240,14 @@ class Ldap
 						// For test/debug
 						//ldap_set_option($this->connection, LDAP_OPT_DEBUG_LEVEL, 7);
 						//ldap_set_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, 3);
+						//ldap_set_option($this->connection, LDAP_OPT_REFERRALS, 0);
 
 						$resulttls = ldap_start_tls($this->connection);
 						if (!$resulttls) {
 							dol_syslog(get_class($this)."::connect_bind failed to start tls", LOG_WARNING);
 							$this->error = 'ldap_start_tls Failed to start TLS '.ldap_errno($this->connection).' '.ldap_error($this->connection);
 							$connected = 0;
-							$this->close();
+							$this->unbind();
 						}
 					}
 
@@ -275,7 +296,9 @@ class Ldap
 				}
 
 				if (!$connected) {
-					$this->close();
+					$this->unbind();
+				} else {
+					$this->connectedServer = $host;
 				}
 			}
 		}
@@ -288,16 +311,17 @@ class Ldap
 			$return = -1;
 			dol_syslog(get_class($this)."::connect_bind return=".$return.' - '.$this->error, LOG_WARNING);
 		}
+
 		return $return;
 	}
 
-
-
 	/**
-	 * Simply closes the connection set up earlier.
-	 * Returns true if OK, false if there was an error.
+	 * Simply closes the connection set up earlier. Returns true if OK, false if there was an error.
+	 * This method seems a duplicate/alias of unbind().
 	 *
 	 * @return	boolean			true or false
+	 * @deprecated ldap_close is an alias of ldap_unbind
+	 * @see unbind()
 	 */
 	public function close()
 	{
@@ -350,16 +374,21 @@ class Ldap
 	}
 
 	/**
-	 * Unbind du serveur ldap.
+	 * Unbind of LDAP server (close connection).
 	 *
 	 * @return	boolean					true or false
+	 * @see close()
 	 */
 	public function unbind()
 	{
-		if (!$this->result = @ldap_unbind($this->connection)) {
-			return false;
-		} else {
+		$this->result = true;
+		if ($this->connection) {
+			$this->result = @ldap_unbind($this->connection);
+		}
+		if ($this->result) {
 			return true;
+		} else {
+			return false;
 		}
 	}
 
@@ -412,7 +441,7 @@ class Ldap
 	 */
 	public function add($dn, $info, $user)
 	{
-		dol_syslog(get_class($this)."::add dn=".$dn." info=".join(',', $info));
+		dol_syslog(get_class($this)."::add dn=".$dn." info=".json_encode($info));
 
 		// Check parameters
 		if (!$this->connection) {
@@ -907,10 +936,10 @@ class Ldap
 			return -3;
 		}
 
-		$search = ldap_search($this->connection, $dn, $filter);
+		$search = @ldap_search($this->connection, $dn, $filter);
 
 		// Only one entry should ever be returned
-		$entry = ldap_first_entry($this->connection, $search);
+		$entry = @ldap_first_entry($this->connection, $search);
 
 		if (!$entry) {
 			$this->ldapErrorCode = -1;
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index be81c1e2737..239c527ec53 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -97,17 +97,17 @@ class Link extends CommonObject
 
 		$this->db->begin();
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."links (entity, datea, url, label, objecttype, objectid)";
+		$sql = "INSERT INTO ".$this->db->prefix()."links (entity, datea, url, label, objecttype, objectid)";
 		$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datea)."'";
 		$sql .= ", '".$this->db->escape($this->url)."'";
 		$sql .= ", '".$this->db->escape($this->label)."'";
 		$sql .= ", '".$this->db->escape($this->objecttype)."'";
-		$sql .= ", ".$this->objectid.")";
+		$sql .= ", ".((int) $this->objectid).")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."links");
+			$this->id = $this->db->last_insert_id($this->db->prefix()."links");
 
 			if ($this->id > 0) {
 				// Call trigger
@@ -175,14 +175,14 @@ class Link extends CommonObject
 
 		$this->db->begin();
 
-		$sql  = "UPDATE ".MAIN_DB_PREFIX."links SET ";
+		$sql  = "UPDATE ".$this->db->prefix()."links SET ";
 		$sql .= "entity = ".$conf->entity;
 		$sql .= ", datea = '".$this->db->idate(dol_now())."'";
 		$sql .= ", url = '".$this->db->escape($this->url)."'";
 		$sql .= ", label = '".$this->db->escape($this->label)."'";
 		$sql .= ", objecttype = '".$this->db->escape($this->objecttype)."'";
 		$sql .= ", objectid = ".$this->objectid;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update sql = ".$sql);
 		$resql = $this->db->query($sql);
@@ -233,7 +233,7 @@ class Link extends CommonObject
 	{
 		global $conf;
 
-		$sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";
+		$sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".$this->db->prefix()."links";
 		$sql .= " WHERE objecttype = '".$this->db->escape($objecttype)."' AND objectid = ".((int) $objectid);
 		if ($conf->entity != 0) {
 			$sql .= " AND entity = ".$conf->entity;
@@ -249,7 +249,7 @@ class Link extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			dol_syslog(get_class($this)."::fetchAll ".$num."records", LOG_DEBUG);
+			dol_syslog(get_class($this)."::fetchAll num=".((int) $num), LOG_DEBUG);
 			if ($num > 0) {
 				while ($obj = $this->db->fetch_object($resql)) {
 					$link = new Link($this->db);
@@ -274,24 +274,24 @@ class Link extends CommonObject
 	/**
 	 *  Return nb of links
 	 *
-	 *  @param  DoliDb  $db         Database handler
+	 *  @param  DoliDb  $dbs		Database handler
 	 *  @param  string  $objecttype Type of the associated object in dolibarr
 	 *  @param  int     $objectid   Id of the associated object in dolibarr
 	 *  @return int                 Nb of links, -1 if error
 	 **/
-	public static function count($db, $objecttype, $objectid)
+	public static function count($dbs, $objecttype, $objectid)
 	{
 		global $conf;
 
-		$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."links";
-		$sql .= " WHERE objecttype = '".$db->escape($objecttype)."' AND objectid = ".((int) $objectid);
+		$sql = "SELECT COUNT(rowid) as nb FROM ".$dbs->prefix()."links";
+		$sql .= " WHERE objecttype = '".$dbs->escape($objecttype)."' AND objectid = ".((int) $objectid);
 		if ($conf->entity != 0) {
 			$sql .= " AND entity = ".$conf->entity;
 		}
 
-		$resql = $db->query($sql);
+		$resql = $dbs->query($sql);
 		if ($resql) {
-			$obj = $db->fetch_object($resql);
+			$obj = $dbs->fetch_object($resql);
 			if ($obj) {
 				return $obj->nb;
 			}
@@ -313,7 +313,7 @@ class Link extends CommonObject
 			$rowid = $this->id;
 		}
 
-		$sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";
+		$sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".$this->db->prefix()."links";
 		$sql .= " WHERE rowid = ".((int) $rowid);
 		if ($conf->entity != 0) {
 			$sql .= " AND entity = ".$conf->entity;
@@ -364,8 +364,8 @@ class Link extends CommonObject
 		// End call triggers
 
 		// Remove link
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."links";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql = "DELETE FROM ".$this->db->prefix()."links";
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		if (!$this->db->query($sql)) {
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 6f024c91b0b..6b45cd08f98 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -213,7 +213,7 @@ class Menubase
 		// may use an already used value because its internal cursor does not increase when we do
 		// an insert with a forced id.
 		if (in_array($this->db->type, array('pgsql'))) {
-			$sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";
+			$sql = "SELECT MAX(rowid) as maxrowid FROM ".$this->db->prefix()."menu";
 			$resqlrowid = $this->db->query($sql);
 			if ($resqlrowid) {
 				$obj = $this->db->fetch_object($resqlrowid);
@@ -224,7 +224,7 @@ class Menubase
 					$maxrowid = 1;
 				}
 
-				$sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
+				$sql = "SELECT setval('".$this->db->prefix()."menu_rowid_seq', ".($maxrowid).")";
 				//print $sql; exit;
 				$resqlrowidset = $this->db->query($sql);
 				if (!$resqlrowidset) {
@@ -237,7 +237,7 @@ class Menubase
 
 		// Check that entry does not exists yet on key menu_handler-fk_menu-position-url-entity, to avoid errors with postgresql
 		$sql = "SELECT count(*)";
-		$sql .= " FROM ".MAIN_DB_PREFIX."menu";
+		$sql .= " FROM ".$this->db->prefix()."menu";
 		$sql .= " WHERE menu_handler = '".$this->db->escape($this->menu_handler)."'";
 		$sql .= " AND fk_menu = ".((int) $this->fk_menu);
 		$sql .= " AND position = ".((int) $this->position);
@@ -250,7 +250,7 @@ class Menubase
 
 			if ($row[0] == 0) {   // If not found
 				// Insert request
-				$sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";
+				$sql = "INSERT INTO ".$this->db->prefix()."menu(";
 				$sql .= "menu_handler,";
 				$sql .= "entity,";
 				$sql .= "module,";
@@ -293,7 +293,7 @@ class Menubase
 				dol_syslog(get_class($this)."::create", LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql) {
-					$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."menu");
+					$this->id = $this->db->last_insert_id($this->db->prefix()."menu");
 					dol_syslog(get_class($this)."::create record added has rowid=".((int) $this->id), LOG_DEBUG);
 
 					return $this->id;
@@ -346,7 +346,7 @@ class Menubase
 		// Put here code to add control on parameters values
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
+		$sql = "UPDATE ".$this->db->prefix()."menu SET";
 		$sql .= " menu_handler='".$this->db->escape($this->menu_handler)."',";
 		$sql .= " module='".$this->db->escape($this->module)."',";
 		$sql .= " type='".$this->db->escape($this->type)."',";
@@ -409,7 +409,7 @@ class Menubase
 		$sql .= " t.enabled,";
 		$sql .= " t.usertype as user,";
 		$sql .= " t.tms";
-		$sql .= " FROM ".MAIN_DB_PREFIX."menu as t";
+		$sql .= " FROM ".$this->db->prefix()."menu as t";
 		$sql .= " WHERE t.rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -460,7 +460,7 @@ class Menubase
 	{
 		//global $conf, $langs;
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
+		$sql = "DELETE FROM ".$this->db->prefix()."menu";
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
@@ -635,7 +635,7 @@ class Menubase
 		$leftmenu = $myleftmenu; // To export to dol_eval function
 
 		$sql = "SELECT m.rowid, m.type, m.module, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.prefix, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu, m.position";
-		$sql .= " FROM ".MAIN_DB_PREFIX."menu as m";
+		$sql .= " FROM ".$this->db->prefix()."menu as m";
 		$sql .= " WHERE m.entity IN (0,".$conf->entity.")";
 		$sql .= " AND m.menu_handler IN ('".$this->db->escape($menu_handler)."','all')";
 		if ($type_user == 0) {
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index e865f9bd0e8..853de6d0a41 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -62,13 +62,11 @@ class Notify
 	 */
 	public $fk_project;
 
-	// Les codes actions sont definis dans la table llx_notify_def
-
-	// codes actions supported are
-	// @todo defined also into interface_50_modNotificiation_Notificiation.class.php
-	public $arrayofnotifsupported = array(
+	// This codes actions are defined into table llx_notify_def
+	static public $arrayofnotifsupported = array(
 		'BILL_VALIDATE',
 		'BILL_PAYED',
+		'ORDER_CREATE',
 		'ORDER_VALIDATE',
 		'PROPAL_VALIDATE',
 		'PROPAL_CLOSE_SIGNED',
@@ -80,12 +78,11 @@ class Notify
 		'SHIPPING_VALIDATE',
 		'EXPENSE_REPORT_VALIDATE',
 		'EXPENSE_REPORT_APPROVE',
-	'HOLIDAY_VALIDATE',
-	'HOLIDAY_APPROVE',
+		'HOLIDAY_VALIDATE',
+		'HOLIDAY_APPROVE',
 		'ACTION_CREATE'
 	);
 
-
 	/**
 	 *	Constructor
 	 *
@@ -108,11 +105,37 @@ class Notify
 	 */
 	public function confirmMessage($action, $socid, $object)
 	{
-		global $langs;
+		global $conf, $langs;
 		$langs->load("mails");
 
+		// Get full list of all notifications subscribed for $action, $socid and $object
 		$listofnotiftodo = $this->getNotificationsArray($action, $socid, $object, 0);
 
+		if (!empty($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_USER)) {
+			foreach ($listofnotiftodo as $val) {
+				if ($val['type'] == 'touser') {
+					unset($listofnotiftodo[$val['email']]);
+					//$listofnotiftodo = array_merge($listofnotiftodo);
+				}
+			}
+		}
+		if (!empty($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT)) {
+			foreach ($listofnotiftodo as $val) {
+				if ($val['type'] == 'tocontact') {
+					unset($listofnotiftodo[$val['email']]);
+					//$listofnotiftodo = array_merge($listofnotiftodo);
+				}
+			}
+		}
+		if (!empty($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_FIX)) {
+			foreach ($listofnotiftodo as $val) {
+				if ($val['type'] == 'tofixedemail') {
+					unset($listofnotiftodo[$val['email']]);
+					//$listofnotiftodo = array_merge($listofnotiftodo);
+				}
+			}
+		}
+
 		$texte = '';
 		$nb = -1;
 		if (is_array($listofnotiftodo)) {
@@ -185,10 +208,10 @@ class Notify
 		if (!$error) {
 			if ($socid >= 0 && in_array('thirdparty', $scope)) {
 				$sql = "SELECT a.code, c.email, c.rowid";
-				$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
-				$sql .= " ".MAIN_DB_PREFIX."socpeople as c,";
-				$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-				$sql .= " ".MAIN_DB_PREFIX."societe as s";
+				$sql .= " FROM ".$this->db->prefix()."notify_def as n,";
+				$sql .= " ".$this->db->prefix()."socpeople as c,";
+				$sql .= " ".$this->db->prefix()."c_action_trigger as a,";
+				$sql .= " ".$this->db->prefix()."societe as s";
 				$sql .= " WHERE n.fk_contact = c.rowid";
 				$sql .= " AND a.rowid = n.fk_action";
 				$sql .= " AND n.fk_soc = s.rowid";
@@ -225,9 +248,9 @@ class Notify
 		if (!$error) {
 			if ($userid >= 0 && in_array('user', $scope)) {
 				$sql = "SELECT a.code, c.email, c.rowid";
-				$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
-				$sql .= " ".MAIN_DB_PREFIX."user as c,";
-				$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a";
+				$sql .= " FROM ".$this->db->prefix()."notify_def as n,";
+				$sql .= " ".$this->db->prefix()."user as c,";
+				$sql .= " ".$this->db->prefix()."c_action_trigger as a";
 				$sql .= " WHERE n.fk_user = c.rowid";
 				$sql .= " AND a.rowid = n.fk_action";
 				$sql .= $sqlnotifcode;
@@ -332,7 +355,7 @@ class Notify
 		global $dolibarr_main_url_root;
 		global $action;
 
-		if (!in_array($notifcode, $this->arrayofnotifsupported)) {
+		if (!in_array($notifcode, Notify::$arrayofnotifsupported)) {
 			return 0;
 		}
 
@@ -372,10 +395,10 @@ class Notify
 		if (!empty($object->socid) && $object->socid > 0) {
 			$sql .= "SELECT 'tocontactid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.default_lang,";
 			$sql .= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
-			$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
-			$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-			$sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
-			$sql .= " ".MAIN_DB_PREFIX."societe as s";
+			$sql .= " FROM ".$this->db->prefix()."socpeople as c,";
+			$sql .= " ".$this->db->prefix()."c_action_trigger as a,";
+			$sql .= " ".$this->db->prefix()."notify_def as n,";
+			$sql .= " ".$this->db->prefix()."societe as s";
 			$sql .= " WHERE n.fk_contact = c.rowid AND a.rowid = n.fk_action";
 			$sql .= " AND n.fk_soc = s.rowid";
 			$sql .= " AND c.statut = 1";
@@ -392,9 +415,9 @@ class Notify
 		// Check notification per user
 		$sql .= "SELECT 'touserid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.lang as default_lang,";
 		$sql .= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user as c,";
-		$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-		$sql .= " ".MAIN_DB_PREFIX."notify_def as n";
+		$sql .= " FROM ".$this->db->prefix()."user as c,";
+		$sql .= " ".$this->db->prefix()."c_action_trigger as a,";
+		$sql .= " ".$this->db->prefix()."notify_def as n";
 		$sql .= " WHERE n.fk_user = c.rowid AND a.rowid = n.fk_action";
 		$sql .= " AND c.statut = 1";
 		if (is_numeric($notifcode)) {
@@ -423,10 +446,10 @@ class Notify
 					$notifcodedefid = $obj->adid;
 					$trackid = '';
 					if ($obj->type_target == 'tocontactid') {
-						$trackid = 'con'.$obj->id;
+						$trackid = 'con'.$obj->cid;
 					}
 					if ($obj->type_target == 'touserid') {
-						$trackid = 'use'.$obj->id;
+						$trackid = 'use'.$obj->cid;
 					}
 
 					if (dol_strlen($obj->email)) {
@@ -546,7 +569,7 @@ class Notify
 								$object_type = 'holiday';
 								$labeltouse = $conf->global->HOLIDAY_APPROVE_TEMPLATE;
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
-				break;
+								break;
 							case 'ACTION_CREATE':
 								$link = '<a href="'.$urlwithroot.'/comm/action/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
 								$dir_output = $conf->agenda->dir_output;
@@ -567,10 +590,10 @@ class Notify
 							$subject = make_substitutions($arraydefaultmessage->topic, $substitutionarray, $outputlangs);
 							$message = make_substitutions($arraydefaultmessage->content, $substitutionarray, $outputlangs);
 						} else {
-									$message = $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification", $application, $mysoc->name)."\n";
-									$message .= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";
-									$message .= "\n";
-									$message .= $mesg;
+							$message = $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification", $application, $mysoc->name)."\n";
+							$message .= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";
+							$message .= "\n";
+							$message .= $mesg;
 						}
 
 						$ref = dol_sanitizeFileName($newref);
@@ -621,11 +644,11 @@ class Notify
 
 						if ($mailfile->sendfile()) {
 							if ($obj->type_target == 'touserid') {
-								$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";
-								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
+								$sql = "INSERT INTO ".$this->db->prefix()."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";
+								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".((int) $notifcodedefid).", ".($object->socid > 0 ? ((int) $object->socid) : 'null').", ".((int) $obj->cid).", '".$this->db->escape($obj->type)."', '".$this->db->escape($object_type)."', '".$this->db->escape($obj->type_target)."', ".((int) $object->id).", '".$this->db->escape($obj->email)."')";
 							} else {
-								$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";
-								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
+								$sql = "INSERT INTO ".$this->db->prefix()."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";
+								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".((int) $notifcodedefid).", ".($object->socid > 0 ? ((int) $object->socid) : 'null').", ".((int) $obj->cid).", '".$this->db->escape($obj->type)."', '".$this->db->escape($object_type)."', '".$this->db->escape($obj->type_target)."', ".((int) $object->id).", '".$this->db->escape($obj->email)."')";
 							}
 							if (!$this->db->query($sql)) {
 								dol_print_error($this->db);
@@ -782,7 +805,7 @@ class Notify
 						$dir_output = $conf->holiday->dir_output;
 						$object_type = 'holiday';
 						$mesg = $langs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
-			break;
+						break;
 					case 'ACTION_CREATE':
 						$link = '<a href="'.$urlwithroot.'/comm/action/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
 						$dir_output = $conf->agenda->dir_output;
@@ -856,8 +879,8 @@ class Notify
 					);
 
 					if ($mailfile->sendfile()) {
-						$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, type_target, objet_type, objet_id, email)";
-						$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", null, 'email', 'tofixedemail', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')";
+						$sql = "INSERT INTO ".$this->db->prefix()."notify (daten, fk_action, fk_soc, fk_contact, type, type_target, objet_type, objet_id, email)";
+						$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".((int) $notifcodedefid).", ".($object->socid > 0 ? ((int) $object->socid) : 'null').", null, 'email', 'tofixedemail', '".$this->db->escape($object_type)."', ".((int) $object->id).", '".$this->db->escape($conf->global->$param)."')";
 						if (!$this->db->query($sql)) {
 							dol_print_error($this->db);
 						}
diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php
index abb006969db..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);
@@ -457,7 +422,7 @@ class SimpleOpenID
 		// phpcs:enable
 		$redirect_to = $this->GetRedirectURL();
 		if (headers_sent()) { // Use JavaScript to redirect if content has been previously sent (not recommended, but safe)
-			echo '<script language="JavaScript" type="text/javascript">window.location=\'';
+			echo '<script type="text/javascript">window.location=\'';
 			echo $redirect_to;
 			echo '\';</script>';
 		} else {	// Default Header Redirect
@@ -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/smtps.class.php b/htdocs/core/class/smtps.class.php
index a14edc36d36..dbaaacc2d18 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -231,7 +231,7 @@ class SMTPs
 	/**
 	 * An array of options for stream_context_create()
 	 */
-	private $_options = [];
+	private $_options = array();
 
 	/**
 	 * Set delivery receipt
@@ -239,7 +239,7 @@ class SMTPs
 	 * @param	array		$_options		An array of options for stream_context_create()
 	 * @return	void
 	 */
-	public function setOptions($_options = [])
+	public function setOptions($_options = array())
 	{
 		$this->_options = $_options;
 	}
@@ -464,20 +464,26 @@ class SMTPs
 			$host = 'tls://'.$host;
 		}
 
-		$hosth = $host;
+		$hosth = $host;	// so for example 'localhost' or 'smtp-relay.gmail.com'
 
 		if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO)) {
-			// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
-			$hosth = $this->getFrom('addr');
-			$hosth = preg_replace('/^.*</', '', $hosth);
-			$hosth = preg_replace('/>.*$/', '', $hosth);
-			$hosth = preg_replace('/.*@/', '', $hosth);
+			if (!is_numeric($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO)) {
+				// If value of MAIL_SMTP_USE_FROM_FOR_HELO is a string, we use it as domain name
+				$hosth = $conf->global->MAIL_SMTP_USE_FROM_FOR_HELO;
+			} else {
+				// If value of MAIL_SMTP_USE_FROM_FOR_HELO is 1, we use the domain in the from.
+				// So if the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
+				$hosth = $this->getFrom('addr');
+				$hosth = preg_replace('/^.*</', '', $hosth);
+				$hosth = preg_replace('/>.*$/', '', $hosth);
+				$hosth = preg_replace('/.*@/', '', $hosth);
+			}
 		}
 
 		if ($_retVal = $this->socket_send_str('EHLO '.$hosth, '250')) {
 			if ($usetls) {
 				/*
-				The following dialog illustrates how a client and server can start a TLS STARTTLS session
+				The following dialog illustrates how a client and server can start a TLS STARTTLS session:
 				S: <waits for connection on TCP port 25>
 				C: <opens connection>
 				S: 220 mail.imc.org SMTP service ready
@@ -494,6 +500,39 @@ class SMTPs
 				S: 250-server-domain.com
 				S: 250 AUTH LOGIN
 				C: <continues by sending an SMTP command
+
+				Another example here:
+				S: 220 smtp.server.com Simple Mail Transfer Service Ready
+				C: EHLO client.example.com
+				S: 250-smtp.server.com Hello client.example.com
+				S: 250-SIZE 1000000
+				S: 250-AUTH LOGIN PLAIN CRAM-MD5
+				S: 250-STARTTLS
+				S: 250 HELP
+				C: STARTTLS
+				S: 220 TLS go ahead
+				C: EHLO client.example.com *
+				S: 250-smtp.server.com Hello client.example.com
+				S: 250-SIZE 1000000
+				S: 250-AUTH LOGIN PLAIN CRAM-MD5
+				S: 250 HELP
+				C: AUTH LOGIN
+				S: 334 VXNlcm5hbWU6
+				C: adlxdkej
+				S: 334 UGFzc3dvcmQ6
+				C: lkujsefxlj
+				S: 235 2.7.0 Authentication successful
+				C: MAIL FROM:<mail@samlogic.com>
+				S: 250 OK
+				C: RCPT TO:<john@mail.com>
+				S: 250 OK
+				C: DATA
+				S: 354 Send message, end with a "." on a line by itself
+				C: <The message data (body text, subject, e-mail header, attachments etc) is sent>
+				S .
+				S: 250 OK, message accepted for delivery: queued as 12345
+				C: QUIT
+				S: 221 Bye
 				*/
 				if (!$_retVal = $this->socket_send_str('STARTTLS', 220)) {
 					$this->_setErr(131, 'STARTTLS connection is not supported.');
@@ -517,10 +556,10 @@ class SMTPs
 					$this->_setErr(132, 'STARTTLS connection failed.');
 					return $_retVal;
 				}
-				// Most server servers expect a 2nd pass of EHLO after TLS is established to get another time
+				// Most servers expect a 2nd pass of EHLO after TLS is established to get another time
 				// the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
-				if (!$_retVal = $this->socket_send_str('EHLO '.$hosth, '250')) {
-					$this->_setErr(126, '"'.$hosth.'" does not support authenticated connections.');
+				if (! $_retVal = $this->socket_send_str('EHLO '.$hosth, '250')) {
+					$this->_setErr(126, '"'.$hosth.'" does not support authenticated connections. Error after sending EHLO '.$hosth);
 					return $_retVal;
 				}
 			}
@@ -560,7 +599,7 @@ class SMTPs
 				$this->_setErr(130, 'Invalid Authentication Credentials.');
 			}
 		} else {
-			$this->_setErr(126, '"'.$host.'" does not support authenticated connections.');
+			$this->_setErr(126, '"'.$host.'" does not support authenticated connections. Error after sending EHLO '.$hosth);
 		}
 
 		return $_retVal;
@@ -603,11 +642,17 @@ class SMTPs
 				$hosth = $host;
 
 				if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO)) {
-					// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
-					$hosth = $this->getFrom('addr');
-					$hosth = preg_replace('/^.*</', '', $hosth);
-					$hosth = preg_replace('/>.*$/', '', $hosth);
-					$hosth = preg_replace('/.*@/', '', $hosth);
+					if (!is_numeric($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO)) {
+						// If value of MAIL_SMTP_USE_FROM_FOR_HELO is a string, we use it as domain name
+						$hosth = $conf->global->MAIL_SMTP_USE_FROM_FOR_HELO;
+					} else {
+						// If value of MAIL_SMTP_USE_FROM_FOR_HELO is 1, we use the domain in the from.
+						// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
+						$hosth = $this->getFrom('addr');
+						$hosth = preg_replace('/^.*</', '', $hosth);
+						$hosth = preg_replace('/>.*$/', '', $hosth);
+						$hosth = preg_replace('/.*@/', '', $hosth);
+					}
 				}
 
 				$_retVal = $this->socket_send_str('HELO '.$hosth, '250');
@@ -1422,7 +1467,7 @@ class SMTPs
 		$this->_msgContent[$strType]['dataText'] = $strContentAltText;
 
 		if ($this->getMD5flag()) {
-			$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
+			$this->_msgContent[$strType]['md5'] = dol_hash($strContent, 3);
 		}
 		//}
 	}
@@ -1622,7 +1667,7 @@ class SMTPs
 			$this->_msgContent['image'][$strImageName]['data']     = $strContent;
 
 			if ($this->getMD5flag()) {
-				$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
+				$this->_msgContent['image'][$strImageName]['md5'] = dol_hash($strContent, 3);
 			}
 		}
 	}
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index 4ac164b1d3a..ae9a8e56e58 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -617,4 +617,31 @@ abstract class Stats
 
 		return $result;
 	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *  Returns the summed amounts per year for a given number of past years ending now
+	 *  @param  string  $sql    SQL
+	 *  @return array
+	 */
+	protected function _getAmountByYear($sql)
+	{
+		$result = array();
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num) {
+				$row = $this->db->fetch_row($resql);
+				$j = (int) $row[0];
+				$result[] = [
+					0 => (int) $row[0],
+					1 => (int) $row[1],
+				];
+				$i++;
+			}
+			$this->db->free($resql);
+		}
+		return $result;
+	}
 }
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index b535d2b3585..8be6f77251c 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -480,7 +480,7 @@ class Translate
 
 		if (!$found && !empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) {
 			// Overwrite translation with database read
-			$sql = "SELECT transkey, transvalue FROM ".MAIN_DB_PREFIX."overwrite_trans where lang='".$db->escape($this->defaultlang)."' OR lang IS NULL";
+			$sql = "SELECT transkey, transvalue FROM ".$db->prefix()."overwrite_trans where lang='".$db->escape($this->defaultlang)."' OR lang IS NULL";
 			$sql .= " AND entity IN (0, ".getEntity('overwrite_trans').")";
 			$sql .= $db->order("lang", "DESC");
 			$resql = $db->query($sql);
@@ -555,9 +555,9 @@ class Translate
 	 * Return translated value of key for special keys ("Currency...", "Civility...", ...).
 	 * Search in lang file, then into database. Key must be any complete entry into lang file: CurrencyEUR, ...
 	 * If not found, return key.
-	 * The string return is not formated (translated with transnoentitiesnoconv)
-	 * NOTE: To avoid infinite loop (getLabelFromKey->transnoentities->getTradFromKey), if you modify this function,
-	 * check that getLabelFromKey is not called with same value than input.
+	 * The string return is not formated (translated with transnoentitiesnoconv).
+	 * NOTE: To avoid infinite loop (getLabelFromKey->transnoentities->getTradFromKey->getLabelFromKey), if you modify this function,
+	 * check that getLabelFromKey is never called with the same value than $key.
 	 *
 	 * @param	string		$key		Key to translate
 	 * @return 	string					Translated string (translated with transnoentitiesnoconv)
@@ -579,17 +579,17 @@ class Translate
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_currencies', 'code_iso', 'label');
 		} elseif (preg_match('/^SendingMethod([0-9A-Z]+)$/i', $key, $reg)) {
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_shipment_mode', 'code', 'libelle');
-		} elseif (preg_match('/^PaymentTypeShort([0-9A-Z]+)$/i', $key, $reg)) {
+		} elseif (preg_match('/^PaymentType(?:Short)?([0-9A-Z]+)$/i', $key, $reg)) {
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_paiement', 'code', 'libelle', '', 1);
 		} elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i', $key, $reg)) {
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_lead_status', 'code', 'label');
 		} elseif (preg_match('/^OrderSource([0-9A-Z]+)$/i', $key, $reg)) {
 			// TODO OrderSourceX must be replaced with content of table llx_c_input_reason or llx_c_input_method
-			//$newstr=$this->getLabelFromKey($db,$reg[1],'c_ordersource','code','label');
+			//$newstr=$this->getLabelFromKey($db,$reg[1],'llx_c_input_reason','code','label');
 		}
 
 		/* Disabled. There is too many cases where translation of $newstr is not defined is normal (like when output with setEventMessage an already translated string)
-		if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
+		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2)
 		{
 			dol_syslog(__METHOD__." MAIN_FEATURES_LEVEL=DEVELOP: missing translation for key '".$newstr."' in ".$_SERVER["PHP_SELF"], LOG_DEBUG);
 		}*/
@@ -945,9 +945,9 @@ class Translate
 	 *
 	 * 		@param	DoliDB	$db				Database handler
 	 * 		@param	string	$key			Translation key to get label (key in language file)
-	 * 		@param	string	$tablename		Table name without prefix
-	 * 		@param	string	$fieldkey		Field for key
-	 * 		@param	string	$fieldlabel		Field for label
+	 * 		@param	string	$tablename		Table name without prefix. This value must always be a hardcoded string and not a value coming from user input.
+	 * 		@param	string	$fieldkey		Field for key. This value must always be a hardcoded string and not a value coming from user input.
+	 * 		@param	string	$fieldlabel		Field for label. This value must always be a hardcoded string and not a value coming from user input.
 	 *      @param	string	$keyforselect	Use another value than the translation key for the where into select
 	 *      @param  int		$filteronentity	Use a filter on entity
 	 *      @return string					Label in UTF8 (but without entities)
@@ -959,10 +959,15 @@ class Translate
 		if ($key == '') {
 			return '';
 		}
+		// Test should be useless because the 3 variables are never set from user input but we keep it in case of.
+		if (preg_match('/[^0-9A-Z_]/i', $tablename) || preg_match('/[^0-9A-Z_]/i', $fieldkey) || preg_match('/[^0-9A-Z_]/i', $fieldlabel)) {
+			$this->error = 'Bad value for parameter tablename, fieldkey or fieldlabel';
+			return -1;
+		}
 
 		//print 'param: '.$key.'-'.$keydatabase.'-'.$this->trans($key); exit;
 
-		// Check if a translation is available (this can call getTradFromKey)
+		// Check if a translation is available (Note: this can call getTradFromKey that can call getLabelFromKey)
 		$tmp = $this->transnoentitiesnoconv($key);
 		if ($tmp != $key && $tmp != 'ErrorBadValueForParamNotAString') {
 			return $tmp; // Found in language array
@@ -973,8 +978,9 @@ class Translate
 			return $this->cache_labels[$tablename][$key]; // Found in cache
 		}
 
+		// Not found in loaded language file nor in cache. So we will take the label into database.
 		$sql = "SELECT ".$fieldlabel." as label";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$tablename;
+		$sql .= " FROM ".$db->prefix().$tablename;
 		$sql .= " WHERE ".$fieldkey." = '".$db->escape($keyforselect ? $keyforselect : $key)."'";
 		if ($filteronentity) {
 			$sql .= " AND entity IN (".getEntity($tablename).')';
@@ -1061,7 +1067,7 @@ class Translate
 		}
 
 		$sql = "SELECT code_iso, label, unicode";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_currencies";
+		$sql .= " FROM ".$db->prefix()."c_currencies";
 		$sql .= " WHERE active = 1";
 		if (!empty($currency_code)) {
 			$sql .= " AND code_iso = '".$db->escape($currency_code)."'";
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 09e11ed5221..2fa329406fb 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2016 Destailleur Laurent <eldy@users.sourceforge.net>
+/* Copyright (C) 2016	Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2021	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
@@ -202,7 +203,7 @@ class Utils
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		// Check compression parameter
-		if (!in_array($compression, array('none', 'gz', 'bz', 'zip'))) {
+		if (!in_array($compression, array('none', 'gz', 'bz', 'zip', 'zstd'))) {
 			$langs->load("errors");
 			$this->error = $langs->transnoentitiesnoconv("ErrorBadValueForParameter", $compression, "Compression");
 			return -1;
@@ -240,17 +241,25 @@ class Utils
 
 		// MYSQL
 		if ($type == 'mysql' || $type == 'mysqli') {
-			$cmddump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
-
+			if (empty($conf->global->SYSTEMTOOLS_MYSQLDUMP)) {
+				$cmddump = $db->getPathOfDump();
+			} else {
+				$cmddump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
+			}
+			if (empty($cmddump)) {
+				$this->error = "Failed to detect command to use for mysqldump. Try a manual backup before to set path of command.";
+				return -1;
+			}
 
 			$outputfile = $outputdir.'/'.$file;
 			// for compression format, we add extension
 			$compression = $compression ? $compression : 'none';
 			if ($compression == 'gz') {
 				$outputfile .= '.gz';
-			}
-			if ($compression == 'bz') {
+			} elseif ($compression == 'bz') {
 				$outputfile .= '.bz2';
+			} elseif ($compression == 'zstd') {
+				$outputfile .= '.zst';
 			}
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
@@ -337,12 +346,12 @@ class Utils
 			$fullcommandclear = $command." ".$paramclear." 2>&1";
 			if ($compression == 'none') {
 				$handle = fopen($outputfile, 'w');
-			}
-			if ($compression == 'gz') {
+			} elseif ($compression == 'gz') {
 				$handle = gzopen($outputfile, 'w');
-			}
-			if ($compression == 'bz') {
+			} elseif ($compression == 'bz') {
 				$handle = bzopen($outputfile, 'w');
+			} elseif ($compression == 'zstd') {
+				$handle = fopen($outputfile, 'w');
 			}
 
 			$ok = 0;
@@ -356,10 +365,19 @@ class Utils
 
 				dol_syslog("Utils::dumpDatabase execmethod=".$execmethod." command:".$fullcommandcrypted, LOG_INFO);
 
+
+				/* If value has been forced with a php_admin_value, this has no effect. Example of value: '512M' */
+				$MemoryLimit = getDolGlobalString('MAIN_MEMORY_LIMIT_DUMP');
+				if (!empty($MemoryLimit)) {
+					@ini_set('memory_limit', $MemoryLimit);
+				}
+
+
 				// TODO Replace with executeCLI function
 				if ($execmethod == 1) {
 					$output_arr = array();
 					$retval = null;
+
 					exec($fullcommandclear, $output_arr, $retval);
 
 					if ($retval != 0) {
@@ -410,12 +428,12 @@ class Utils
 
 				if ($compression == 'none') {
 					fclose($handle);
-				}
-				if ($compression == 'gz') {
+				} elseif ($compression == 'gz') {
 					gzclose($handle);
-				}
-				if ($compression == 'bz') {
+				} elseif ($compression == 'bz') {
 					bzclose($handle);
+				} elseif ($compression == 'zstd') {
+					fclose($handle);
 				}
 
 				if (!empty($conf->global->MAIN_UMASK)) {
@@ -430,12 +448,12 @@ class Utils
 			// Get errorstring
 			if ($compression == 'none') {
 				$handle = fopen($outputfile, 'r');
-			}
-			if ($compression == 'gz') {
+			} elseif ($compression == 'gz') {
 				$handle = gzopen($outputfile, 'r');
-			}
-			if ($compression == 'bz') {
+			} elseif ($compression == 'bz') {
 				$handle = bzopen($outputfile, 'r');
+			} elseif ($compression == 'zstd') {
+				$handle = fopen($outputfile, 'r');
 			}
 			if ($handle) {
 				// Get 2048 first chars of error message.
@@ -445,12 +463,12 @@ class Utils
 				// Close file
 				if ($compression == 'none') {
 					fclose($handle);
-				}
-				if ($compression == 'gz') {
+				} elseif ($compression == 'gz') {
 					gzclose($handle);
-				}
-				if ($compression == 'bz') {
+				} elseif ($compression == 'bz') {
 					bzclose($handle);
+				} elseif ($compression == 'zstd') {
+					fclose($handle);
 				}
 				if ($ok && preg_match('/^-- (MySql|MariaDB)/i', $errormsg)) {	// No error
 					$errormsg = '';
@@ -627,7 +645,6 @@ class Utils
 			$execmethod = 1;
 		}
 		//$execmethod=1;
-
 		dol_syslog("Utils::executeCLI execmethod=".$execmethod." system:".$command, LOG_DEBUG);
 		$output_arr = array();
 
@@ -1090,11 +1107,11 @@ class Utils
 					fwrite($handle, "/*!40000 ALTER TABLE `".$table."` DISABLE KEYS */;\n");
 				}
 
-				$sql = 'SELECT * FROM '.$table; // Here SELECT * is allowed because we don't have definition of columns to take
+				$sql = "SELECT * FROM ".$table; // Here SELECT * is allowed because we don't have definition of columns to take
 				$result = $db->query($sql);
 				while ($row = $db->fetch_row($result)) {
 					// For each row of data we print a line of INSERT
-					fwrite($handle, 'INSERT '.$delayed.$ignore.'INTO `'.$table.'` VALUES (');
+					fwrite($handle, "INSERT ".$delayed.$ignore."INTO ".$table." VALUES (");
 					$columns = count($row);
 					for ($j = 0; $j < $columns; $j++) {
 						// Processing each columns of the row to ensure that we correctly save the value (eg: add quotes for string - in fact we add quotes for everything, it's easier)
diff --git a/htdocs/core/class/validate.class.php b/htdocs/core/class/validate.class.php
new file mode 100644
index 00000000000..d3aa5707c05
--- /dev/null
+++ b/htdocs/core/class/validate.class.php
@@ -0,0 +1,327 @@
+<?php
+/* Copyright (C) 2021 John BOTELLA <john.botella@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/validate.class.php
+ *      \ingroup    core
+ *		\brief      File for Utils class
+ */
+
+
+/**
+ *		Class toolbox to validate values
+ */
+class Validate
+{
+
+	/**
+	 * @var DoliDb		Database handler (result of a new DoliDB)
+	 */
+	public $db;
+
+	/**
+	 * @var Translate $outputLang
+	 */
+	public $outputLang;
+
+	/**
+	 * @var string 		Error string
+	 * @see             $errors
+	 */
+	public $error;
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB 		$db 			Database handler
+	 * @param Translate   	$outputLang 	Output lang for error
+	 */
+	public function __construct($db, $outputLang = null)
+	{
+		global $langs;
+
+		if (empty($outputLang)) {
+			$this->outputLang = $langs;
+		} else {
+			$this->outputLang = $outputLang;
+		}
+
+		if (!is_object($this->outputLang) || !method_exists($this->outputLang, 'load')) {
+			return false;
+		}
+
+		$this->outputLang->loadLangs(array('validate', 'errors'));
+
+		$this->db = $db;
+	}
+
+	/**
+	 * Use to clear errors msg or other ghost vars
+	 * @return null
+	 */
+	protected function clear()
+	{
+		$this->error = '';
+	}
+
+	/**
+	 * Use to clear errors msg or other ghost vars
+	 *
+	 * @param string $errMsg your error message
+	 * @return null
+	 */
+	protected function setError($errMsg)
+	{
+		$this->error = $errMsg;
+	}
+
+	/**
+	 * Check for e-mail validity
+	 *
+	 * @param string $email e-mail address to validate
+	 * @param int   $maxLength string max length
+	 * @return boolean Validity is ok or not
+	 */
+	public function isEmail($email, $maxLength = false)
+	{
+		if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
+			$this->error = $this->outputLang->trans('RequireValidEmail');
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Check for price validity
+	 *
+	 * @param string $price Price to validate
+	 * @return boolean Validity is ok or not
+	 */
+	public function isPrice($price)
+	{
+		if (!preg_match('/^[0-9]{1,10}(\.[0-9]{1,9})?$/ui', $price)) {
+			$this->error = $this->outputLang->trans('RequireValidValue');
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Check for timestamp validity
+	 *
+	 * @param string|int $stamp timestamp to validate
+	 * @return boolean Validity is ok or not
+	 */
+	public function isTimestamp($stamp)
+	{
+		if (!is_numeric($stamp) && (int) $stamp == $stamp) {
+			$this->error = $this->outputLang->trans('RequireValidDate');
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Check for phone validity
+	 *
+	 * @param string $phone Phone string to validate
+	 * @return boolean Validity is ok or not
+	 */
+	public function isPhone($phone)
+	{
+		if (!preg_match('/^[+0-9. ()-]*$/ui', $phone)) {
+			$this->error = $this->outputLang->trans('RequireValidPhone');
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Check for string max length validity
+	 *
+	 * @param string $string to validate
+	 * @param int  $length max length
+	 * @return boolean Validity is ok or not
+	 */
+	public function isMaxLength($string, $length)
+	{
+		if (strlen($string) > $length) {
+			$this->error = $this->outputLang->trans('RequireMaxLength', $length);
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Check for string not empty
+	 *
+	 * @param string $string to validate
+	 * @return boolean Validity is ok or not
+	 */
+	public function isNotEmptyString($string)
+	{
+		if (!strlen($string)) {
+			$this->error = $this->outputLang->trans('RequireANotEmptyValue');
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Check for string min length validity
+	 *
+	 * @param string $string to validate
+	 * @param int  $length max length
+	 * @return boolean Validity is ok or not
+	 */
+	public function isMinLength($string, $length)
+	{
+		if (!strlen($string) < $length) {
+			$this->error = $this->outputLang->trans('RequireMinLength', $length);
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Check url validity
+	 *
+	 * @param string $url to validate
+	 * @return boolean Validity is ok or not
+	 */
+	public function isUrl($url)
+	{
+		if (!filter_var($url, FILTER_VALIDATE_URL)) {
+			$this->error = $this->outputLang->trans('RequireValidUrl');
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Check Duration validity
+	 *
+	 * @param mixed $duration to validate
+	 * @return boolean Validity is ok or not
+	 */
+	public function isDuration($duration)
+	{
+		if (!is_int($duration) && $duration >= 0) {
+			$this->error = $this->outputLang->trans('RequireValidDuration');
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Check numeric validity
+	 *
+	 * @param mixed $string to validate
+	 * @return boolean Validity is ok or not
+	 */
+	public function isNumeric($string)
+	{
+		if (!is_numeric($string)) {
+			$this->error = $this->outputLang->trans('RequireValidNumeric');
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Check for boolean validity
+	 *
+	 * @param boolean $bool Boolean to validate
+	 * @return boolean Validity is ok or not
+	 */
+	public function isBool($bool)
+	{
+		if (!(is_null($bool) || is_bool($bool) || preg_match('/^[0|1]{1}$/ui', $bool))) {
+			$this->error = $this->outputLang->trans('RequireValidBool');
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Check for all values in db
+	 *
+	 * @param array  $values Boolean to validate
+	 * @param string $table  the db table name without $this->db->prefix()
+	 * @param string $col    the target col
+	 * @return boolean Validity is ok or not
+	 * @throws Exception
+	 */
+	public function isInDb($values, $table, $col)
+	{
+		if (!is_array($values)) {
+			$value_arr = array($values);
+		} else {
+			$value_arr = $values;
+		}
+
+		if (!count($value_arr)) {
+			$this->error = $this->outputLang->trans('RequireValue');
+			return false;
+		}
+
+		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);
+			if ($resql) {
+				continue;
+			} else {
+				$this->error = $this->outputLang->trans('RequireValidExistingElement');
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check for all values in db
+	 *
+	 * @param array  $values    Boolean to validate
+	 * @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)
+	{
+		if (!empty($classpath)) {
+			if (dol_include_once($classpath)) {
+				if ($classname && class_exists($classname)) {
+					/** @var CommonObject $object */
+					$object = new $classname($this->db);
+
+					if (!is_callable(array($object, 'fetch')) || !is_callable(array($object, 'isExistingObject'))) {
+						$this->error = $this->outputLang->trans('BadSetupOfFieldFetchNotCallable');
+						return false;
+					}
+
+					if (!empty($object->table_element) && $object->isExistingObject($object->table_element, $values)) {
+						return true;
+					} else { $this->error = $this->outputLang->trans('RequireValidExistingElement'); }
+				} else { $this->error = $this->outputLang->trans('BadSetupOfFieldClassNotFoundForValidation'); }
+			} else { $this->error = $this->outputLang->trans('BadSetupOfFieldFileNotFound'); }
+		} else { $this->error = $this->outputLang->trans('BadSetupOfField'); }
+		return false;
+	}
+}
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index ca6e61e3b1c..fafd1c015e8 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -40,7 +40,6 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 		$objecttype = 'thirdparty';
 	}
 
-	$search_filters = GETPOST('search_filters', 'array');
 	$search_measures = GETPOST('search_measures', 'array');
 
 	//$search_xaxis = GETPOST('search_xaxis', 'array');
@@ -57,7 +56,7 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	}
 
 	$search_yaxis = GETPOST('search_yaxis', 'array');
-	$search_graph = GETPOST('search_graph', 'none');
+	$search_graph = GETPOST('search_graph', 'restricthtml');
 
 	// Load variable for pagination
 	$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -158,6 +157,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 $search_component_params = array('');
+$search_component_params_hidden = GETPOST('search_component_params_hidden', 'alphanohtml');
 
 $MAXUNIQUEVALFORGROUP = 20;
 $MAXMEASURESINBARGRAPH = 20;
@@ -175,14 +175,16 @@ $arrayofgroupby = array();
 $arrayofyaxis = array();
 $arrayofvaluesforgroupby = array();
 
-$result = restrictedArea($user, $object->element, 0, '');
+restrictedArea($user, $object->element, 0, '');
+
+$error = 0;
 
 
 /*
  * Actions
  */
 
-
+// None
 
 
 
@@ -239,13 +241,25 @@ if (is_array($search_groupby) && count($search_groupby)) {
 			$fieldtocount = $search_groupby[$gkey];
 		}
 
-		$sql = 'SELECT DISTINCT '.$fieldtocount.' as val';
+		$sql = "SELECT DISTINCT ".$fieldtocount." as val";
 		if (strpos($fieldtocount, 'te.') === 0) {
 			$sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.'_extrafields as te';
 		} else {
 			$sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.' as t';
 		}
-		// TODO Add the where here
+
+		// Add the where here
+		/*
+		$sqlfilters = GETPOST('search_component_params_hidden', 'alphanohtml');
+		if ($sqlfilters) {
+			$errormessage = '';
+			if (dolCheckFilters($sqlfilters, $errormessage)) {
+				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
+				$sql .= " WHERE (".preg_replace_callback('/'.$regexstring.'/', 'dolForgeCriteriaCallback', $sqlfilters).")";
+			} else {
+				print $errormessage;
+			}
+		}*/
 
 		$sql .= ' LIMIT '.($MAXUNIQUEVALFORGROUP + 1);
 
@@ -332,6 +346,24 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="viewgraph">';
 print '<input type="hidden" name="tabfamily" value="'.$tabfamily.'">';
 
+$viewmode = '';
+
+$viewmode .= '<div class="divadvancedsearchfield">';
+$arrayofgraphs = array('bars' => 'Bars', 'lines' => 'Lines'); // also 'pies'
+$viewmode .= '<div class="inline-block opacitymedium"><span class="fas fa-chart-area paddingright" title="'.$langs->trans("Graph").'"></span>'.$langs->trans("Graph").'</div> ';
+$viewmode .= $form->selectarray('search_graph', $arrayofgraphs, $search_graph, 0, 0, 0, 'minwidth100', 1);
+$viewmode .= '</div>';
+
+$num = 0;
+$massactionbutton = '';
+$nav = '';
+$newcardbutton = '';
+$limit = 0;
+
+print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, -1, 'object_action', 0, $nav.'<span class="marginleftonly"></span>'.$newcardbutton, '', $limit, 1, 0, 1, $viewmode);
+
+
+
 print '<div class="liste_titre liste_titre_bydiv centpercent">';
 
 // Select object
@@ -348,22 +380,23 @@ foreach ($arrayoftype as $key => $val) {
 }
 print $form->selectarray('objecttype', $newarrayoftype, $objecttype, 0, 0, 0, '', 1, 0, 0, '', 'minwidth200', 1);
 if (empty($conf->use_javascript_ajax)) {
-	print '<input type="submit" class="button buttongen" name="changeobjecttype" value="'.$langs->trans("Refresh").'">';
+	print '<input type="submit" class="button buttongen button-save nomargintop" name="changeobjecttype" value="'.$langs->trans("Refresh").'">';
 } else {
-	print '<script type="text/javascript" language="javascript">
+	print '<!-- js code to reload page with good object type -->
+	<script type="text/javascript">
         jQuery(document).ready(function() {
         	jQuery("#objecttype").change(function() {
         		console.log("Reload for "+jQuery("#objecttype").val());
-                location.href = "'.$_SERVER["PHP_SELF"].'?objecttype="+jQuery("#objecttype").val()+"'.($tabfamily ? '&tabfamily='.$tabfamily : '').'";
+                location.href = "'.$_SERVER["PHP_SELF"].'?objecttype="+jQuery("#objecttype").val()+"'.($tabfamily ? '&tabfamily='.urlencode($tabfamily) : '').(GETPOST('show_search_component_params_hidden', 'int') ? '&show_search_component_params_hidden='.((int) GETPOST('show_search_component_params_hidden', 'int')) : '').'";
         	});
         });
     </script>';
 }
 print '</div><div class="clearboth"></div>';
 
-// Add Filter
+// Add Filter (you can use param &show_search_component_params_hidden=1 for debug)
 print '<div class="divadvancedsearchfield quatrevingtpercent">';
-print $form->searchComponent(array($object->element => $object->fields), $search_component_params);
+print $form->searchComponent(array($object->element => $object->fields), $search_component_params, array(), $search_component_params_hidden);
 print '</div>';
 
 // Add measures into array
@@ -392,13 +425,6 @@ print $form->multiselectarray('search_measures', $arrayofmesures, $search_measur
 print '</div>';
 
 
-// Group by
-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>';
-
-
 // XAxis
 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> ';
@@ -406,6 +432,13 @@ print $formother->selectXAxisField($object, $search_xaxis, $arrayofxaxis);
 print '</div>';
 
 
+// Group by
+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>';
+
+
 if ($mode == 'grid') {
 	// YAxis
 	print '<div class="divadvancedsearchfield">';
@@ -448,14 +481,11 @@ if ($mode == 'grid') {
 }
 
 if ($mode == 'graph') {
-	print '<div class="divadvancedsearchfield">';
-	$arrayofgraphs = array('bars' => 'Bars', 'lines' => 'Lines'); // also 'pies'
-	print '<div class="inline-block opacitymedium"><span class="fas fa-chart-area paddingright" title="'.$langs->trans("Graph").'"></span>'.$langs->trans("Graph").'</div> ';
-	print $form->selectarray('search_graph', $arrayofgraphs, $search_graph, 0, 0, 0, 'minwidth100', 1);
-	print '</div>';
+	//
 }
+
 print '<div class="divadvancedsearchfield">';
-print '<input type="submit" class="button buttongen" value="'.$langs->trans("Refresh").'">';
+print '<input type="submit" class="button buttongen button-save nomargintop" value="'.$langs->trans("Refresh").'">';
 print '</div>';
 print '</div>';
 print '</form>';
@@ -469,60 +499,60 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 	foreach ($search_xaxis as $key => $val) {
 		if (preg_match('/\-year$/', $val)) {
 			$tmpval = preg_replace('/\-year$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y') as x_".$key.', ';
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y') as x_".$key.', ';
 		} elseif (preg_match('/\-month$/', $val)) {
 			$tmpval = preg_replace('/\-month$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m') as x_".$key.', ';
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m') as x_".$key.', ';
 		} elseif (preg_match('/\-day$/', $val)) {
 			$tmpval = preg_replace('/\-day$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d') as x_".$key.', ';
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d') as x_".$key.', ';
 		} else {
-			$sql .= $val.' as x_'.$key.', ';
+			$sql .= $val." as x_".$key.", ";
 		}
 	}
 	foreach ($search_groupby as $key => $val) {
 		if (preg_match('/\-year$/', $val)) {
 			$tmpval = preg_replace('/\-year$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y') as g_".$key.', ';
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y') as g_".$key.', ';
 		} elseif (preg_match('/\-month$/', $val)) {
 			$tmpval = preg_replace('/\-month$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m') as g_".$key.', ';
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m') as g_".$key.', ';
 		} elseif (preg_match('/\-day$/', $val)) {
 			$tmpval = preg_replace('/\-day$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d') as g_".$key.', ';
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d') as g_".$key.', ';
 		} else {
-			$sql .= $val.' as g_'.$key.', ';
+			$sql .= $val." as g_".$key.", ";
 		}
 	}
 	foreach ($search_measures as $key => $val) {
 		if ($val == 't.count') {
-			$sql .= 'COUNT(t.'.$fieldid.') as y_'.$key.', ';
+			$sql .= "COUNT(t.".$fieldid.") as y_".$key.', ';
 		} elseif (preg_match('/\-sum$/', $val)) {
 			$tmpval = preg_replace('/\-sum$/', '', $val);
-			$sql .= 'SUM('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
+			$sql .= "SUM(".$db->ifsql($tmpval.' IS NULL', '0', $tmpval).") as y_".$key.", ";
 		} elseif (preg_match('/\-average$/', $val)) {
 			$tmpval = preg_replace('/\-average$/', '', $val);
-			$sql .= 'AVG('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
+			$sql .= "AVG(".$db->ifsql($tmpval.' IS NULL', '0', $tmpval).") as y_".$key.", ";
 		} elseif (preg_match('/\-min$/', $val)) {
 			$tmpval = preg_replace('/\-min$/', '', $val);
-			$sql .= 'MIN('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
+			$sql .= "MIN(".$db->ifsql($tmpval.' IS NULL', '0', $tmpval).") as y_".$key.", ";
 		} elseif (preg_match('/\-max$/', $val)) {
 			$tmpval = preg_replace('/\-max$/', '', $val);
-			$sql .= 'MAX('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
+			$sql .= "MAX(".$db->ifsql($tmpval.' IS NULL', '0', $tmpval).") as y_".$key.", ";
 		}
 	}
 	$sql = preg_replace('/,\s*$/', '', $sql);
 	$sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.' as t';
 	// Add measure from extrafields
 	if ($object->isextrafieldmanaged) {
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.$object->table_element.'_extrafields as te ON te.fk_object = t.'.$fieldid;
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as te ON te.fk_object = t.".$fieldid;
 	}
 	if ($object->ismultientitymanaged) {
 		if ($object->ismultientitymanaged == 1) {
 			// Nothing here
 		} else {
 			$tmparray = explode('@', $object->ismultientitymanaged);
-			$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.$tmparray[1].' as parenttable ON t.'.$tmparray[0].' = parenttable.rowid';
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$tmparray[1]." as parenttable ON t.".$tmparray[0]." = parenttable.rowid";
 			$sql .= ' AND parenttable.entity IN ('.getEntity($tmparray[1]).')';
 		}
 	}
@@ -530,34 +560,42 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 	if ($object->ismultientitymanaged == 1) {
 		$sql .= ' AND entity IN ('.getEntity($object->element).')';
 	}
-	foreach ($search_filters as $key => $val) {
-		// TODO Add the where here
+	// Add the where here
+	$sqlfilters = GETPOST('search_component_params_hidden', 'alphanohtml');
+	if ($sqlfilters) {
+		$errormessage = '';
+		if (dolCheckFilters($sqlfilters, $errormessage)) {
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'dolForgeCriteriaCallback', $sqlfilters).")";
+		} else {
+			print $errormessage;
+		}
 	}
 	$sql .= ' GROUP BY ';
 	foreach ($search_xaxis as $key => $val) {
 		if (preg_match('/\-year$/', $val)) {
 			$tmpval = preg_replace('/\-year$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y'), ";
 		} elseif (preg_match('/\-month$/', $val)) {
 			$tmpval = preg_replace('/\-month$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m'), ";
 		} elseif (preg_match('/\-day$/', $val)) {
 			$tmpval = preg_replace('/\-day$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d'), ";
 		} else {
-			$sql .= $val.', ';
+			$sql .= $val.", ";
 		}
 	}
 	foreach ($search_groupby as $key => $val) {
 		if (preg_match('/\-year$/', $val)) {
 			$tmpval = preg_replace('/\-year$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y'), ";
 		} elseif (preg_match('/\-month$/', $val)) {
 			$tmpval = preg_replace('/\-month$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m'), ";
 		} elseif (preg_match('/\-day$/', $val)) {
 			$tmpval = preg_replace('/\-day$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d'), ";
 		} else {
 			$sql .= $val.', ';
 		}
@@ -567,13 +605,13 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 	foreach ($search_xaxis as $key => $val) {
 		if (preg_match('/\-year$/', $val)) {
 			$tmpval = preg_replace('/\-year$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y'), ";
 		} elseif (preg_match('/\-month$/', $val)) {
 			$tmpval = preg_replace('/\-month$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m'), ";
 		} elseif (preg_match('/\-day$/', $val)) {
 			$tmpval = preg_replace('/\-day$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d'), ";
 		} else {
 			$sql .= $val.', ';
 		}
@@ -581,13 +619,13 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 	foreach ($search_groupby as $key => $val) {
 		if (preg_match('/\-year$/', $val)) {
 			$tmpval = preg_replace('/\-year$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y'), ";
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y'), ";
 		} elseif (preg_match('/\-month$/', $val)) {
 			$tmpval = preg_replace('/\-month$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m'), ";
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m'), ";
 		} elseif (preg_match('/\-day$/', $val)) {
 			$tmpval = preg_replace('/\-day$/', '', $val);
-			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
+			$sql .= "DATE_FORMAT(".$tmpval.", '%Y-%m-%d'), ";
 		} else {
 			$sql .= $val.', ';
 		}
diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php
index f3e5d45afef..e349072ddec 100644
--- a/htdocs/core/db/Database.interface.php
+++ b/htdocs/core/db/Database.interface.php
@@ -122,7 +122,7 @@ interface Database
 	 *  List tables into a database
 	 *
 	 *  @param	string		$database	Name of database
-	 *  @param	string		$table		Nmae of table filter ('xxx%')
+	 *  @param	string		$table		Name of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
 	 */
 	public function DDLListTables($database, $table = '');
@@ -197,7 +197,7 @@ interface Database
 	/**
 	 * Get last ID after an insert INSERT
 	 *
-	 * @param	string 	$tab 		Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
+	 * @param	string 	$tab 		Table name concerned by insert. Not used under MySql but required for compatibility with Postgresql
 	 * @param   string 	$fieldid 	Field name
 	 * @return  int                	Id of row
 	 */
@@ -222,13 +222,14 @@ interface Database
 	/**
 	 * Execute a SQL request and return the resultset
 	 *
-	 * @param   string $query SQL query string
-	 * @param   int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
-	 *                            Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
-	 * @param   string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-	 * @return  resource                Resultset of answer
+	 * @param   string 	$query 			SQL query string
+	 * @param   int		$usesavepoint 	0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
+	 *                            		Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
+	 * @param   string 	$type 			Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 * @param	int		$result_mode	Result mode
+	 * @return  bool|resource			Resultset of answer or false
 	 */
-	public function query($query, $usesavepoint = 0, $type = 'auto');
+	public function query($query, $usesavepoint = 0, $type = 'auto', $result_mode = 0);
 
 	/**
 	 *    Connexion to server
@@ -439,13 +440,13 @@ interface Database
 
 	/**
 	 * Encrypt sensitive data in database
-	 * Warning: This function includes the escape, so it must use direct value
+	 * Warning: This function includes the escape and add the SQL simple quotes on strings.
 	 *
-	 * @param   string 			$fieldorvalue 	Field name or value to encrypt
-	 * @param  	int 			$withQuotes 	Return string with quotes
-	 * @return 	string                     		XXX(field) or XXX('value') or field or 'value'
+	 * @param	string	$fieldorvalue	Field name or value to encrypt
+	 * @param	int		$withQuotes		Return string including the SQL simple quotes. This param must always be 1 (Value 0 is bugged and deprecated).
+	 * @return	string					XXX(field) or XXX('value') or field or 'value'
 	 */
-	public function encrypt($fieldorvalue, $withQuotes = 0);
+	public function encrypt($fieldorvalue, $withQuotes = 1);
 
 	/**
 	 * Validate a database transaction
@@ -501,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 $resultset 	Cursor 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 63fec8968ec..4476228d509 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -62,11 +62,26 @@ abstract class DoliDB implements Database
 	/** @var string Last error number. For example: 'DB_ERROR_RECORD_ALREADY_EXISTS', '12345', ... */
 	public $lasterrno;
 
+	/** @var string If we need to set a prefix specific to the database so it can be reused (when defined instead of MAIN_DB_PREFIX) to forge requests */
+	public $prefix_db;
+
 	/** @var bool Status */
 	public $ok;
 	/** @var string */
 	public $error;
 
+
+
+	/**
+	 *	Return the DB prefix
+	 *
+	 *	@return string		The DB prefix
+	 */
+	public function prefix()
+	{
+		return (empty($this->prefix_db) ? MAIN_DB_PREFIX : $this->prefix_db);
+	}
+
 	/**
 	 *	Format a SQL IF
 	 *
@@ -77,7 +92,8 @@ abstract class DoliDB implements Database
 	 */
 	public function ifsql($test, $resok, $resko)
 	{
-		return 'IF('.$test.','.$resok.','.$resko.')';
+		//return 'IF('.$test.','.$resok.','.$resko.')';		// Not sql standard
+		return '(CASE WHEN '.$test.' THEN '.$resok.' ELSE '.$resko.' END)';
 	}
 
 	/**
@@ -203,9 +219,9 @@ abstract class DoliDB implements Database
 			$limit = $conf->liste_limit;
 		}
 		if ($offset > 0) {
-			return " LIMIT $offset,$limit ";
+			return " LIMIT ".((int) $offset).",".((int) $limit)." ";
 		} else {
-			return " LIMIT $limit ";
+			return " LIMIT ".((int) $limit)." ";
 		}
 	}
 
@@ -233,7 +249,7 @@ abstract class DoliDB implements Database
 	 * Define sort criteria of request
 	 *
 	 * @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';
+	 * @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC'. Note: If the quantity fo sortorder values is lower than sortfield, we used the last value for missing values.
 	 * @return	string						String to provide syntax of a sort sql string
 	 */
 	public function order($sortfield = null, $sortorder = null)
@@ -341,11 +357,13 @@ abstract class DoliDB implements Database
 	}
 
 	/**
-	 * return all results from query as an array of objects
+	 * Return all results from query as an array of objects
 	 * Note : This method executes a given SQL query and retrieves all row of results as an array of objects. It should only be used with SELECT queries
-	 * be carefull with this method use it only with some limit of results to avoid performences loss
-	 * @param string $sql the sql query string
-	 * @return bool| array
+	 * be carefull with this method use it only with some limit of results to avoid performences loss.
+	 *
+	 * @param 	string 		$sql 		The sql query string
+	 * @return 	bool|array				Result
+	 * @deprecated
 	 */
 	public function getRows($sql)
 	{
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 3a8aabd3bf9..fa24e4a70ac 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -210,6 +210,8 @@ class DoliDBMysqli extends DoliDB
 	{
 		dol_syslog(get_class($this)."::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name", LOG_DEBUG);
 
+		//mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+
 		// 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);
@@ -255,6 +257,8 @@ class DoliDBMysqli extends DoliDB
 		return false;
 	}
 
+
+
 	/**
 	 * 	Execute a SQL request and return the resultset
 	 *
@@ -262,11 +266,12 @@ 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
 	 *	@return	bool|mysqli_result		Resultset of answer
 	 */
-	public function query($query, $usesavepoint = 0, $type = 'auto')
+	public function query($query, $usesavepoint = 0, $type = 'auto', $result_mode = 0)
 	{
-		global $conf;
+		global $conf, $dolibarr_main_db_readonly;
 
 		$query = trim($query);
 
@@ -278,11 +283,25 @@ class DoliDBMysqli extends DoliDB
 			return false; // Return false = error if empty request
 		}
 
-		if (!$this->database_name) {
-			// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
-			$ret = $this->db->query($query);
-		} else {
-			$ret = $this->db->query($query);
+		if (!empty($dolibarr_main_db_readonly)) {
+			if (preg_match('/^(INSERT|UPDATE|REPLACE|DELETE|CREATE|ALTER|TRUNCATE|DROP)/i', $query)) {
+				$this->lasterror = 'Application in read-only mode';
+				$this->lasterrno = 'APPREADONLY';
+				$this->lastquery = $query;
+				return false;
+			}
+		}
+
+		try {
+			if (!$this->database_name) {
+				// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
+				$ret = $this->db->query($query, $result_mode);
+			} else {
+				$ret = $this->db->query($query, $result_mode);
+			}
+		} catch (Exception $e) {
+			dol_syslog(get_class($this)."::query Exception in query instead of returning an error: ".$e->getMessage(), LOG_ERR);
+			$ret = false;
 		}
 
 		if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query)) {
@@ -307,7 +326,7 @@ class DoliDBMysqli 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	mysqli_result	$resultset	Curseur de la requete voulue
 	 *	@return	object|null					Object result line or null if KO or end of cursor
@@ -523,15 +542,14 @@ class DoliDBMysqli extends DoliDB
 	}
 
 	/**
-	 *	Encrypt sensitive data in database
-	 *  Warning: This function includes the escape, so it must use direct value
-	 *
-	 *	@param	string	$fieldorvalue	Field name or value to encrypt
-	 * 	@param	int		$withQuotes		Return string with quotes
-	 * 	@return	string					XXX(field) or XXX('value') or field or 'value'
+	 * Encrypt sensitive data in database
+	 * Warning: This function includes the escape and add the SQL simple quotes on strings.
 	 *
+	 * @param	string	$fieldorvalue	Field name or value to encrypt
+	 * @param	int		$withQuotes		Return string including the SQL simple quotes. This param must always be 1 (Value 0 is bugged and deprecated).
+	 * @return	string					XXX(field) or XXX('value') or field or 'value'
 	 */
-	public function encrypt($fieldorvalue, $withQuotes = 0)
+	public function encrypt($fieldorvalue, $withQuotes = 1)
 	{
 		global $conf;
 
@@ -541,17 +559,17 @@ class DoliDBMysqli extends DoliDB
 		//Encryption key
 		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
-		$return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
+		$escapedstringwithquotes = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
 
 		if ($cryptType && !empty($cryptKey)) {
 			if ($cryptType == 2) {
-				$return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+				$escapedstringwithquotes = "AES_ENCRYPT(".$escapedstringwithquotes.", '".$this->escape($cryptKey)."')";
 			} elseif ($cryptType == 1) {
-				$return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+				$escapedstringwithquotes = "DES_ENCRYPT(".$escapedstringwithquotes.", '".$this->escape($cryptKey)."')";
 			}
 		}
 
-		return $return;
+		return $escapedstringwithquotes;
 	}
 
 	/**
@@ -654,9 +672,13 @@ class DoliDBMysqli extends DoliDB
 
 		$like = '';
 		if ($table) {
-			$like = "LIKE '".$table."'";
+			$tmptable = preg_replace('/[^a-z0-9\.\-\_%]/i', '', $table);
+
+			$like = "LIKE '".$this->escape($tmptable)."'";
 		}
-		$sql = "SHOW TABLES FROM ".$database." ".$like.";";
+		$tmpdatabase = preg_replace('/[^a-z0-9\.\-\_]/i', '', $database);
+
+		$sql = "SHOW TABLES FROM ".$tmpdatabase." ".$like.";";
 		//print $sql;
 		$result = $this->query($sql);
 		if ($result) {
@@ -679,7 +701,9 @@ class DoliDBMysqli extends DoliDB
 		// phpcs:enable
 		$infotables = array();
 
-		$sql = "SHOW FULL COLUMNS FROM ".$table.";";
+		$tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
+
+		$sql = "SHOW FULL COLUMNS FROM ".$tmptable.";";
 
 		dol_syslog($sql, LOG_DEBUG);
 		$result = $this->query($sql);
@@ -785,7 +809,9 @@ class DoliDBMysqli extends DoliDB
 	public function DDLDropTable($table)
 	{
 		// phpcs:enable
-		$sql = "DROP TABLE ".$table;
+		$tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
+
+		$sql = "DROP TABLE ".$tmptable;
 
 		if (!$this->query($sql)) {
 			return -1;
@@ -916,8 +942,9 @@ class DoliDBMysqli extends DoliDB
 	public function DDLDropField($table, $field_name)
 	{
 		// phpcs:enable
-		$sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
-		dol_syslog(get_class($this)."::DDLDropField ".$sql, LOG_DEBUG);
+		$tmp_field_name = preg_replace('/[^a-z0-9\.\-\_]/i', '', $field_name);
+
+		$sql = "ALTER TABLE ".$table." DROP COLUMN `".$tmp_field_name."`";
 		if ($this->query($sql)) {
 			return 1;
 		}
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 543e24a1b12..74abf7a1e36 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -494,11 +494,12 @@ class DoliDBPgsql extends DoliDB
 	 * @param	string	$query			SQL query string
 	 * @param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
 	 * @param   string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-	 * @return	false|resource			Resultset of answer
+	 * @param	int		$result_mode	Result mode (not used with pgsql)
+	 * @return	bool|resource			Resultset of answer
 	 */
-	public function query($query, $usesavepoint = 0, $type = 'auto')
+	public function query($query, $usesavepoint = 0, $type = 'auto', $result_mode = 0)
 	{
-		global $conf;
+		global $conf, $dolibarr_main_db_readonly;
 
 		$query = trim($query);
 
@@ -527,6 +528,18 @@ class DoliDBPgsql extends DoliDB
 			$SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
 			dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
 		}
+		if (empty($query)) {
+			return false; // Return false = error if empty request
+		}
+
+		if (!empty($dolibarr_main_db_readonly)) {
+			if (preg_match('/^(INSERT|UPDATE|REPLACE|DELETE|CREATE|ALTER|TRUNCATE|DROP)/i', $query)) {
+				$this->lasterror = 'Application in read-only mode';
+				$this->lasterrno = 'APPREADONLY';
+				$this->lastquery = $query;
+				return false;
+			}
+		}
 
 		$ret = @pg_query($this->db, $query);
 
@@ -558,7 +571,7 @@ class DoliDBPgsql 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	false|object			Object result line or false if KO or end of cursor
@@ -821,22 +834,22 @@ class DoliDBPgsql extends DoliDB
 	}
 
 	/**
-	 *  Encrypt sensitive data in database
-	 *  Warning: This function includes the escape, so it must use direct value
+	 * Encrypt sensitive data in database
+	 * Warning: This function includes the escape and add the SQL simple quotes on strings.
 	 *
-	 *  @param  string  $fieldorvalue   Field name or value to encrypt
-	 *  @param	int		$withQuotes     Return string with quotes
-	 *  @return string          		XXX(field) or XXX('value') or field or 'value'
+	 * @param	string	$fieldorvalue	Field name or value to encrypt
+	 * @param	int		$withQuotes		Return string including the SQL simple quotes. This param must always be 1 (Value 0 is bugged and deprecated).
+	 * @return	string					XXX(field) or XXX('value') or field or 'value'
 	 */
-	public function encrypt($fieldorvalue, $withQuotes = 0)
+	public function encrypt($fieldorvalue, $withQuotes = 1)
 	{
 		global $conf;
 
 		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-		$cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
+		//$cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
 
 		//Encryption key
-		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
+		//$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
 		$return = $fieldorvalue;
 		return ($withQuotes ? "'" : "").$this->escape($return).($withQuotes ? "'" : "");
@@ -903,7 +916,7 @@ class DoliDBPgsql extends DoliDB
 		// Test charset match LC_TYPE (pgsql error otherwise)
 		//print $charset.' '.setlocale(LC_CTYPE,'0'); exit;
 
-		$sql = 'CREATE DATABASE "'.$database.'" OWNER "'.$owner.'" ENCODING \''.$charset.'\'';
+		$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;
@@ -922,11 +935,13 @@ class DoliDBPgsql extends DoliDB
 		// phpcs:enable
 		$listtables = array();
 
-		$like = '';
+		$escapedlike = '';
 		if ($table) {
-			$like = " AND table_name LIKE '".$this->escape($table)."'";
+			$tmptable = preg_replace('/[^a-z0-9\.\-\_%]/i', '', $table);
+
+			$escapedlike = " AND table_name LIKE '".$this->escape($tmptable)."'";
 		}
-		$result = pg_query($this->db, "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'".$like." ORDER BY table_name");
+		$result = pg_query($this->db, "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'".$escapedlike." ORDER BY table_name");
 		if ($result) {
 			while ($row = $this->fetch_row($result)) {
 				$listtables[] = $row[0];
@@ -960,8 +975,8 @@ class DoliDBPgsql extends DoliDB
 		$sql .= "	'' as \"Extra\",";
 		$sql .= "	'' as \"Privileges\"";
 		$sql .= "	FROM information_schema.columns infcol";
-		$sql .= "	WHERE table_schema='public' ";
-		$sql .= "	AND table_name='".$this->escape($table)."'";
+		$sql .= "	WHERE table_schema = 'public' ";
+		$sql .= "	AND table_name = '".$this->escape($table)."'";
 		$sql .= "	ORDER BY ordinal_position;";
 
 		dol_syslog($sql, LOG_DEBUG);
@@ -1065,7 +1080,9 @@ class DoliDBPgsql extends DoliDB
 	public function DDLDropTable($table)
 	{
 		// phpcs:enable
-		$sql = "DROP TABLE ".$table;
+		$tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
+
+		$sql = "DROP TABLE ".$tmptable;
 
 		if (!$this->query($sql)) {
 			return -1;
@@ -1223,8 +1240,9 @@ class DoliDBPgsql extends DoliDB
 	public function DDLDropField($table, $field_name)
 	{
 		// phpcs:enable
-		$sql = "ALTER TABLE ".$table." DROP COLUMN ".$field_name;
-		dol_syslog($sql, LOG_DEBUG);
+		$tmp_field_name = preg_replace('/[^a-z0-9\.\-\_]/i', '', $field_name);
+
+		$sql = "ALTER TABLE ".$table." DROP COLUMN ".$tmp_field_name;
 		if (!$this->query($sql)) {
 			$this->error = $this->lasterror();
 			return -1;
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 008c7311ac8..10f9c021c0d 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -393,11 +393,12 @@ class DoliDBSqlite3 extends DoliDB
 	 * 	@param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
 	 * 									Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
 	 *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-	 *	@return	SQLite3Result			Resultset of answer
+	 * @param	int		$result_mode	Result mode (not used with sqlite)
+	 *	@return	bool|SQLite3Result		Resultset of answer
 	 */
-	public function query($query, $usesavepoint = 0, $type = 'auto')
+	public function query($query, $usesavepoint = 0, $type = 'auto', $result_mode = 0)
 	{
-		global $conf;
+		global $conf, $dolibarr_main_db_readonly;
 
 		$ret = null;
 
@@ -406,6 +407,7 @@ class DoliDBSqlite3 extends DoliDB
 		$this->error = '';
 
 		// Convert MySQL syntax to SQLite syntax
+		$reg = array();
 		if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i', $query, $reg)) {
 			// Ajout d'une clef étrangère à la table
 			// procédure de remplacement de la table pour ajouter la contrainte
@@ -420,7 +422,7 @@ class DoliDBSqlite3 extends DoliDB
 			$descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='".$this->escape($tablename)."'");
 
 			// 1- Renommer la table avec un nom temporaire
-			$this->query('ALTER TABLE '.$tablename.' RENAME TO tmp_'.$tablename);
+			$this->query("ALTER TABLE ".$tablename." RENAME TO tmp_".$tablename);
 
 			// 2- Recréer la table avec la contrainte ajoutée
 
@@ -435,10 +437,10 @@ class DoliDBSqlite3 extends DoliDB
 			$this->query($descTable);
 
 			// 3- Transférer les données
-			$this->query('INSERT INTO '.$tablename.' SELECT * FROM tmp_'.$tablename);
+			$this->query("INSERT INTO ".$tablename." SELECT * FROM tmp_".$tablename);
 
 			// 4- Supprimer la table temporaire
-			$this->query('DROP TABLE tmp_'.$tablename);
+			$this->query("DROP TABLE tmp_".$tablename);
 
 			// dummy statement
 			$query = "SELECT 0";
@@ -455,6 +457,15 @@ class DoliDBSqlite3 extends DoliDB
 			return false; // Return false = error if empty request
 		}
 
+		if (!empty($dolibarr_main_db_readonly)) {
+			if (preg_match('/^(INSERT|UPDATE|REPLACE|DELETE|CREATE|ALTER|TRUNCATE|DROP)/i', $query)) {
+				$this->lasterror = 'Application in read-only mode';
+				$this->lasterrno = 'APPREADONLY';
+				$this->lastquery = $query;
+				return false;
+			}
+		}
+
 		// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
 		try {
 			//$ret = $this->db->exec($query);
@@ -495,7 +506,7 @@ class DoliDBSqlite3 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	SQLite3Result	$resultset  Curseur de la requete voulue
 	 *	@return	false|object				Object result line or false if KO or end of cursor
@@ -745,34 +756,34 @@ class DoliDBSqlite3 extends DoliDB
 	}
 
 	/**
-	 *  Encrypt sensitive data in database
-	 *  Warning: This function includes the escape, so it must use direct value
+	 * Encrypt sensitive data in database
+	 * Warning: This function includes the escape and add the SQL simple quotes on strings.
 	 *
-	 *  @param  string  $fieldorvalue   Field name or value to encrypt
-	 *  @param	int		$withQuotes     Return string with quotes
-	 *  @return string          		XXX(field) or XXX('value') or field or 'value'
+	 * @param	string	$fieldorvalue	Field name or value to encrypt
+	 * @param	int		$withQuotes		Return string including the SQL simple quotes. This param must always be 1 (Value 0 is bugged and deprecated).
+	 * @return	string					XXX(field) or XXX('value') or field or 'value'
 	 */
-	public function encrypt($fieldorvalue, $withQuotes = 0)
+	public function encrypt($fieldorvalue, $withQuotes = 1)
 	{
 		global $conf;
 
 		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-		$cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
+		$cryptType = (!empty($conf->db->dolibarr_main_db_encryption) ? $conf->db->dolibarr_main_db_encryption : 0);
 
 		//Encryption key
 		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
-		$return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
+		$escapedstringwithquotes = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
 
 		if ($cryptType && !empty($cryptKey)) {
 			if ($cryptType == 2) {
-				$return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+				$escapedstringwithquotes = "AES_ENCRYPT(".$escapedstringwithquotes.", '".$this->escape($cryptKey)."')";
 			} elseif ($cryptType == 1) {
-				$return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+				$escapedstringwithquotes = "DES_ENCRYPT(".$escapedstringwithquotes.", '".$this->escape($cryptKey)."')";
 			}
 		}
 
-		return $return;
+		return $escapedstringwithquotes;
 	}
 
 	/**
@@ -841,17 +852,12 @@ class DoliDBSqlite3 extends DoliDB
 		}
 
 		// ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
-		$sql = 'CREATE DATABASE '.$database;
-		$sql .= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
+		$sql = "CREATE DATABASE ".$this->escape($database);
+		$sql .= " DEFAULT CHARACTER SET ".$this->escape($charset)." DEFAULT COLLATE ".$this->escape($collation);
 
 		dol_syslog($sql, LOG_DEBUG);
 		$ret = $this->query($sql);
-		if (!$ret) {
-			// We try again for compatibility with Mysql < 4.1.1
-			$sql = 'CREATE DATABASE '.$database;
-			$ret = $this->query($sql);
-			dol_syslog($sql, LOG_DEBUG);
-		}
+
 		return $ret;
 	}
 
@@ -870,9 +876,13 @@ class DoliDBSqlite3 extends DoliDB
 
 		$like = '';
 		if ($table) {
-			$like = "LIKE '".$table."'";
+			$tmptable = preg_replace('/[^a-z0-9\.\-\_%]/i', '', $table);
+
+			$like = "LIKE '".$this->escape($tmptable)."'";
 		}
-		$sql = "SHOW TABLES FROM ".$database." ".$like.";";
+		$tmpdatabase = preg_replace('/[^a-z0-9\.\-\_]/i', '', $database);
+
+		$sql = "SHOW TABLES FROM ".$tmpdatabase." ".$like.";";
 		//print $sql;
 		$result = $this->query($sql);
 		if ($result) {
@@ -896,7 +906,9 @@ class DoliDBSqlite3 extends DoliDB
 		// phpcs:enable
 		$infotables = array();
 
-		$sql = "SHOW FULL COLUMNS FROM ".$table.";";
+		$tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
+
+		$sql = "SHOW FULL COLUMNS FROM ".$tmptable.";";
 
 		dol_syslog($sql, LOG_DEBUG);
 		$result = $this->query($sql);
@@ -997,7 +1009,9 @@ class DoliDBSqlite3 extends DoliDB
 	public function DDLDropTable($table)
 	{
 		// phpcs:enable
-		$sql = "DROP TABLE ".$table;
+		$tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
+
+		$sql = "DROP TABLE ".$tmptable;
 
 		if (!$this->query($sql)) {
 			return -1;
@@ -1107,8 +1121,9 @@ class DoliDBSqlite3 extends DoliDB
 	public function DDLDropField($table, $field_name)
 	{
 		// phpcs:enable
-		$sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
-		dol_syslog(get_class($this)."::DDLDropField ".$sql, LOG_DEBUG);
+		$tmp_field_name = preg_replace('/[^a-z0-9\.\-\_]/i', '', $field_name);
+
+		$sql = "ALTER TABLE ".$table." DROP COLUMN `".$tmp_field_name."`";
 		if (!$this->query($sql)) {
 			$this->error = $this->lasterror();
 			return -1;
diff --git a/htdocs/core/extrafieldsinexport.inc.php b/htdocs/core/extrafieldsinexport.inc.php
index 70dd0077e57..fc2210eabd8 100644
--- a/htdocs/core/extrafieldsinexport.inc.php
+++ b/htdocs/core/extrafieldsinexport.inc.php
@@ -48,7 +48,7 @@ if ($resql) {    // This can fail when class is used on old database (during mig
 			case 'sellist':
 				$tmp = '';
 				$tmpparam = jsonOrUnserialize($obj->param); // $tmp may be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-				if ($tmpparam['options'] && is_array($tmpparam['options'])) {
+				if (is_array($tmpparam) && array_key_exists('options', $tmpparam) &&  $tmpparam['options'] && is_array($tmpparam['options'])) {
 					$tmpkeys = array_keys($tmpparam['options']);
 					$tmp = array_shift($tmpkeys);
 				}
diff --git a/htdocs/core/get_info.php b/htdocs/core/get_info.php
index 4927be6a005..067372c26ff 100644
--- a/htdocs/core/get_info.php
+++ b/htdocs/core/get_info.php
@@ -33,7 +33,7 @@ if (!defined('NOCSRFCHECK')) {
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', 1);
 }
-//if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
+//if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language and need security layer
 if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', 1);
 }
@@ -56,8 +56,8 @@ $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 
 $title = $langs->trans("Info");
 
-// URL http://mydolibarr/core/search_page?dol_use_jmobile=1 can be used for tests
-$head = '<!-- Quick access -->'."\n";
+// URL http://mydolibarr/core/get_info.php?dol_use_jmobile=1 can be used for tests
+$head = '<!-- Info user page -->'."\n";
 $arrayofjs = array();
 $arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
@@ -83,8 +83,8 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
 	$appli .= " ".DOL_VERSION;
 }
 
-if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
-	$appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
+	$appli .= "<br>".$langs->trans("LevelOfFeature").': '.getDolGlobalInt('MAIN_FEATURES_LEVEL');
 }
 
 $logouttext = '';
@@ -93,7 +93,7 @@ if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 	if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') {
 		$logouthtmltext .= $langs->trans("Logout").'<br>';
 
-		$logouttext .= '<a href="'.DOL_URL_ROOT.'/user/logout.php">';
+		$logouttext .= '<a href="'.DOL_URL_ROOT.'/user/logout.php?token='.newToken().'">';
 		//$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
 		$logouttext .= '<span class="fa fa-sign-out atoplogin"></span>';
 		$logouttext .= '</a>';
@@ -158,7 +158,7 @@ if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OP
 		}
 	}
 	$qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
-	$text ='<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
+	$text ='<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank" rel="noopener noreferrer">';
 	//$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
 	$text.='<span class="fa fa-print atoplogin"></span>';
 	$text.='</a>';
@@ -191,7 +191,7 @@ if (empty($conf->global->MAIN_HELP_DISABLELINK) && empty($conf->global->MAIN_OPT
 		$title=$appli.'<br>';
 		$title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
 		if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
-		$text.='<a class="help" target="_blank" rel="noopener" href="';
+		$text.='<a class="help" target="_blank" rel="noopener noreferrer" href="';
 		if ($mode == 'wiki') $text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
 		else $text.=sprintf($helpbaseurl,$helppage);
 		$text.='">';
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index 84be9ff8e0f..597031945f1 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -81,10 +81,22 @@ $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
  * View
  */
 
+// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
+if (empty($dolibarr_nocache) && GETPOST('cache', 'int')) {
+	header('Cache-Control: max-age='.GETPOST('cache', 'int').', public, must-revalidate');
+	// For a .php, we must set an Expires to avoid to have it forced to an expired value by the web server
+	header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + GETPOST('cache', 'int')).' GMT');
+	// HTTP/1.0
+	header('Pragma: token=public');
+} else {
+	// HTTP/1.0
+	header('Cache-Control: no-cache');
+}
+
 $title = $langs->trans("Menu");
 
 // URL http://mydolibarr/core/get_menudiv.php?dol_use_jmobile=1 can be used for tests
-$head = '<!-- Menu -->'."\n";
+$head = '<!-- Menu -->'."\n";	// This is used by DoliDroid to know page is a menu page
 $arrayofjs = array();
 $arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
@@ -109,12 +121,13 @@ print '
         display: none;
     }
 
-    a.alilevel0 {
+    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-position-y: 16px;
         padding: 1em 15px 1em 40px;
+		display: block;
     }
     li.lilevel0 font.vsmenudisabled {
         background-repeat: no-repeat !important;
diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index 764fde5097e..997132ca132 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -102,8 +102,7 @@ print "});\n";
 // Wrapper to manage dropdown
 if (!defined('JS_JQUERY_DISABLE_DROPDOWN')) {
 	print "\n/* JS CODE TO ENABLE dropdown (hamburger, linkto, ...) */\n";
-	print '
-              jQuery(document).ready(function () {
+	print '		jQuery(document).ready(function () {
 				  var lastopendropdown = null;
 
                   // Click onto the link "link to" or "hamburger", toggle dropdown
@@ -171,21 +170,19 @@ if (!defined('JS_JQUERY_DISABLE_DROPDOWN')) {
 // Wrapper to manage document_preview
 if ($conf->browser->layout != 'phone') {
 	print "\n/* JS CODE TO ENABLE document_preview */\n"; // Function document_preview is into header
-	print '
-                jQuery(document).ready(function () {
+	print '		jQuery(document).ready(function () {
 			        jQuery(".documentpreview").click(function () {
             		    console.log("We click on preview for element with href="+$(this).attr(\'href\')+" mime="+$(this).attr(\'mime\'));
             		    document_preview($(this).attr(\'href\'), $(this).attr(\'mime\'), \''.dol_escape_js($langs->transnoentities("Preview")).'\');
                 		return false;
         			});
-        		});
-           ' . "\n";
+		});'."\n";
 }
 
 // Code to manage reposition
 print "\n/* JS CODE TO ENABLE reposition management (does not work if a redirect is done after action of submission) */\n";
 print '
-			jQuery(document).ready(function() {
+	jQuery(document).ready(function() {
 				/* If page_y set, we set scollbar with it */
 				page_y=getParameterByName(\'page_y\', 0);				/* search in GET parameter */
 				if (page_y == 0) page_y = jQuery("#page_y").text();		/* search in POST parameter that is filed at bottom of page */
@@ -216,37 +213,139 @@ print '
 						}
 					}
 				});
-			});'."\n";
+	});'."\n";
 
-print "\n/* JS CODE TO ENABLE ClipBoard copy paste*/\n";
-print 'jQuery(\'.clipboardCPShowOnHover\').hover(
-			function() {
-				console.log("We hover a value with a copy paste feature");
-				$(this).children(".clipboardCPButton, .clipboardCPText").show();
-			},
-			function() {
-				console.log("We hover out the value with a copy paste feature");
-				$(this).children(".clipboardCPButton, .clipboardCPText").hide();
-			}
-		);';
-print 'jQuery(\'.clipboardCPButton, .clipboardCPValueToPrint\').click(function() {
-		/* console.log(this.parentNode); */
-		console.log("We click on a clipboardCPButton or clipboardCPValueToPrint class");
-		if (window.getSelection) {
-			selection = window.getSelection();
+// Code to manage Copy To Clipboard click
+print "\n/* JS CODE TO ENABLE ClipBoard copy paste */\n";
+print '
+	jQuery(document).ready(function() {
+				jQuery(\'.clipboardCPShowOnHover\').hover(
+					function() {
+						console.log("We hover a value with a copy paste feature");
+						$(this).children(".clipboardCPButton, .clipboardCPText").show();
+					},
+					function() {
+						console.log("We hover out the value with a copy paste feature");
+						$(this).children(".clipboardCPButton, .clipboardCPText").hide();
+					}
+				);
 
-			range = document.createRange();
-			range.selectNodeContents(this.parentNode.firstChild);
+				jQuery(\'.clipboardCPButton, .clipboardCPValueToPrint\').click(function() {
+					/* console.log(this.parentNode); */
+					console.log("We click on a clipboardCPButton or clipboardCPValueToPrint class and we want to copy content of clipboardCPValue class");
 
-			selection.removeAllRanges();
-			selection.addRange( range );
-		}
-		document.execCommand( \'copy\' );
-		window.getSelection().removeAllRanges();
+					if (window.getSelection) {
+						range = document.createRange();
 
-		/* Show message */
-		var lastchild = this.parentNode.lastChild;
-		var tmp = lastchild.innerHTML
-		lastchild.innerHTML = \''.dol_escape_js($langs->trans('CopiedToClipboard')).'\';
-		setTimeout(() => { lastchild.innerHTML = tmp; }, 1000);
-	})'."\n";
+						/* 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);
+
+						selection = window.getSelection();	/* get the object used for selection */
+						selection.removeAllRanges();		/* clear current selection */
+						selection.addRange(range);			/* make the new selection with the value to copy */
+					}
+
+					/* 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 */
+					var lastchild = this.parentNode.lastChild;		/* .parentNode is clipboardCP and last child is clipboardCPText */
+					var tmp = lastchild.innerHTML
+					if (succeed) {
+						lastchild.innerHTML = \'<div class="clipboardCPTextDivInside opacitymedium">'.dol_escape_js($langs->trans('CopiedToClipboard')).'</div>\';
+					} else {
+						lastchild.innerHTML = \'<div class="clipboardCPTextDivInside opacitymedium">'.dol_escape_js($langs->trans('Error')).'</div>\';
+					}
+					setTimeout(() => { lastchild.innerHTML = tmp; }, 1000);
+				});
+	});'."\n";
+
+// Code to manage clicktodial
+print "\n/* JS CODE TO ENABLE clicktodial call of an URL */\n";
+print '
+	jQuery(document).ready(function() {
+		jQuery(".cssforclicktodial").click(function() {
+			event.preventDefault();
+			console.log("We click on a cssforclicktodial class with url="+this.href);
+			$.ajax({
+			  url: this.href,
+			  type: \'GET\',
+			  data: { token: \''.newToken().'\' }
+			}).done(function(xhr, textStatus, errorThrown) {
+			    /* do nothing */
+			}).fail(function(xhr, textStatus, errorThrown) {
+			    alert("Error: "+textStatus);
+			});
+			return false;
+		});
+	});'."\n";
+
+
+// Code to manage the confirm dialog box
+print "\n/* JS CODE TO ENABLE DIALOG CONFIRM POPUP ON ACTION BUTTON */\n";
+print '
+	jQuery(document).ready(function() {
+		$(document).on("click", \'.butActionConfirm\', function(event) {
+			event.preventDefault();
+
+			// I don\'t use jquery $(this).data(\'confirm-url\'); to get $(this).attr(\'data-confirm-url\'); because .data() can doesn\'t work with ajax
+			var confirmUrl  			= $(this).attr(\'data-confirm-url\');
+			var confirmTitle 			= $(this).attr(\'data-confirm-title\');
+			var confirmContent 			= $(this).attr(\'data-confirm-content\');
+			var confirmActionBtnLabel 	= $(this).attr(\'data-confirm-action-btn-label\');
+			var confirmCancelBtnLabel 	= $(this).attr(\'data-confirm-cancel-btn-label\');
+			var confirmModal	= $(this).attr(\'data-confirm-modal\');
+			if(confirmModal == undefined){ confirmModal = false; }
+
+			var confirmId = \'confirm-dialog-box\';
+			if($(this).attr(\'id\') != undefined){ var confirmId = confirmId + "-" + $(this).attr(\'id\'); }
+			if($("#" + confirmId)  != undefined) { $(\'#\' + confirmId).remove(); }
+
+			// Create modal box
+
+			var $confirmBox = $(\'<div/>\', {
+				id: confirmId,
+				title: confirmTitle
+			}).appendTo(\'body\');
+
+			$confirmBox.dialog({
+				autoOpen: true,
+				modal: confirmModal,
+				//width: Math.min($( window ).width() - 50, 1700),
+				width: \'auto\',
+				dialogClass: \'confirm-dialog-box\',
+				buttons: [
+					{
+						text: confirmActionBtnLabel,
+						"class": \'ui-state-information\',
+						click: function () {
+						window.location.replace(confirmUrl);
+					}
+					},
+					{
+						text: confirmCancelBtnLabel,
+						"class": \'ui-state-information\',
+						click: function () {
+						$(this).dialog("close");
+					}
+					}
+				],
+				close: function( event, ui ) {
+					$(\'#\'+confirmBox).remove();
+				},
+				open: function( event, ui ) {
+					$confirmBox.html(confirmContent);
+				}
+			});
+		});
+	});
+'."\n";
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index 175c2fa1981..1e9b53b1424 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -549,20 +549,27 @@ function hideMessage(fieldId,message) {
  * @param	int		strict		Strict
  * @param   int     forcereload Force reload
  * @param   int     userid      User id
+ * @param	int		value       Value to set
  * @param   string  token       Token
  */
-function setConstant(url, code, input, entity, strict, forcereload, userid, token) {
+function setConstant(url, code, input, entity, strict, forcereload, userid, token, value) {
 	var saved_url = url; /* avoid undefined url */
 	$.post( url, {
 		action: "set",
 		name: code,
 		entity: entity,
-		token: token
+		token: token,
+		value: value
 	},
 	function() {	/* handler for success of post */
-		console.log("url request success forcereload="+forcereload);
-		$("#set_" + code).hide();
-		$("#del_" + code).show();
+		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();
+		} else {
+			$("#set_" + code).hide();
+			$("#del_" + code).show();
+		}
 		$.each(input, function(type, data) {
 			// Enable another element
 			if (type == "disabled" && strict != 1) {
@@ -608,9 +615,19 @@ 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";
+				}
+			}
+			window.location.href = url;
+			//location.reload();
+			return false;
 		}
-	}).fail(function(error) { location.reload(); });	/* When it fails, we always force reload to have setEventErrorMEssage 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 */
 }
 
 /*
@@ -635,7 +652,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) {
@@ -679,9 +696,19 @@ 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";
+				}
+			}
+			window.location.href = url;
+			//location.reload();
+			return false;
 		}
-	}).fail(function(error) { location.reload(); });	/* When it fails, we always force reload to have setEventErrorMEssage 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 */
 }
 
 /*
@@ -716,7 +743,7 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
 						text : yesButton,
 						click : function() {
 							if (action == "set") {
-								setConstant(url, code, input, entity, strict, 0, userid, token);
+								setConstant(url, code, input, entity, strict, 0, userid, token, 1);
 							} else if (action == "del") {
 								delConstant(url, code, input, entity, strict, 0, userid, token);
 							}
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index ee41555119a..af5952f6026 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -64,26 +64,31 @@ print "jQuery(document).ready(function () {\n";
 //print "	console.log('referrer=".dol_escape_js($_SERVER['HTTP_REFERER'])."');\n";
 
 print '	var nowtime = Date.now();';
-print '	var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined
+print '	var time_auto_update = '.max(1, getDolGlobalInt('MAIN_BROWSER_NOTIFICATION_FREQUENCY')).';'."\n"; // Always defined
 print '	var time_js_next_test;'."\n";
 ?>
 
-/* Check if permission ok */
-if (Notification.permission !== "granted") {
-	console.log("Ask Notification.permission");
-	Notification.requestPermission()
+/* Check if Notification is supported */
+if ("Notification" in window) {
+	/* Check if permission ok */
+	if (Notification.permission !== "granted") {
+		console.log("Ask Notification.permission");
+		Notification.requestPermission()
+	}
+
+	/* Launch timer */
+
+	// We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
+	//var time_first_execution = (time_auto_update + (time_js_next_test - nowtime)) * 1000;	//need milliseconds
+	var time_first_execution = <?php echo max(3, empty($conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION) ? 0 : $conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION); ?>;
+
+	setTimeout(first_execution, time_first_execution * 1000);
+	time_js_next_test = nowtime + time_first_execution;
+	console.log("Launch browser notif check: setTimeout is set to launch 'first_execution' function after a wait of time_first_execution="+time_first_execution+". nowtime (time php page generation) = "+nowtime+" time_js_next_check = "+time_js_next_test);
+} else {
+	console.log("This browser in this context does not support Notification.");
 }
 
-/* Launch timer */
-
-// We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
-//var time_first_execution = (time_auto_update + (time_js_next_test - nowtime)) * 1000;	//need milliseconds
-var time_first_execution = <?php echo max(3, empty($conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION) ? 0 : $conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION); ?>;
-
-setTimeout(first_execution, time_first_execution * 1000);
-time_js_next_test = nowtime + time_first_execution;
-console.log("Launch browser notif check: setTimeout is set to launch 'first_execution' function after a wait of time_first_execution="+time_first_execution+". nowtime (time php page generation) = "+nowtime+" time_js_next_check = "+time_js_next_test);
-
 
 function first_execution() {
 	console.log("Call first_execution then set repeat time to time_auto_update = MAIN_BROWSER_NOTIFICATION_FREQUENCY = "+time_auto_update);
diff --git a/htdocs/core/js/lib_photosresize.js b/htdocs/core/js/lib_photosresize.js
index 99c7c36c29e..38c508f90b3 100644
--- a/htdocs/core/js/lib_photosresize.js
+++ b/htdocs/core/js/lib_photosresize.js
@@ -32,12 +32,40 @@ function updateCoords(c)
 {
 	//alert(parseInt(jQuery("#ratioforcrop").val()));
 	ratio=1;
-	if (parseInt(jQuery("#ratioforcrop").val()) > 0) ratio = parseInt(jQuery("#ratioforcrop").val());
+	imagewidth=0;
+	imageheight=0;
+	
+	console.log(c);
+
+	if (parseInt(jQuery("#ratioforcrop").val()) > 1) {
+		ratio = parseInt(jQuery("#ratioforcrop").val());
+		if (parseInt(jQuery("#imagewidth").val()) > 0) imagewidth = parseInt(jQuery("#imagewidth").val());
+		if (parseInt(jQuery("#imageheight").val()) > 0) imageheight = parseInt(jQuery("#imageheight").val());
+	}
+	
+	x = Math.floor(c.x * ratio);
+	y = Math.floor(c.y * ratio);
+	x2 = Math.ceil(c.x2 * ratio);
+	y2 = Math.ceil(c.y2 * ratio);
+	console.log("x="+x+" y="+y+" x2="+x2+" y2="+y2+" imageheight="+imageheight+" ratio="+ratio);
+	if (imagewidth > 0 && x > imagewidth) {
+		x = imagewidth;
+	}
+	if (imageheight > 0 && y > imageheight) {
+		y = imageheight;
+	}
+	if (imagewidth > 0 && x2 > imagewidth) {
+		x2 = imagewidth;
+	}
+	if (imageheight > 0 && y2 > imageheight) {
+		y2 = imageheight;
+	}
+	
 	//console.log(ratio);
-	jQuery('#x').val(Math.ceil(c.x * ratio));
-	jQuery('#y').val(Math.ceil(c.y * ratio));
-	jQuery('#x2').val(Math.ceil(c.x2 * ratio));
-	jQuery('#y2').val(Math.ceil(c.y2 * ratio));
-	jQuery('#w').val(Math.ceil(c.w * ratio));
-	jQuery('#h').val(Math.ceil(c.h * ratio));
+	jQuery('#x').val(x);
+	jQuery('#y').val(y);
+	jQuery('#x2').val(x2);
+	jQuery('#y2').val(y2);
+	jQuery('#w').val(x2-x);
+	jQuery('#h').val(y2-y);
 };
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index db1447d57b9..448677002df 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -123,6 +123,7 @@ function versioncompare($versionarray1, $versionarray2)
  *	Return version PHP
  *
  *	@return     array               Tableau de version (vermajeur,vermineur,autre)
+ *  @see versioncompare()
  */
 function versionphparray()
 {
@@ -133,6 +134,7 @@ function versionphparray()
  *	Return version Dolibarr
  *
  *	@return     array               Tableau de version (vermajeur,vermineur,autre)
+ *  @see versioncompare()
  */
 function versiondolibarrarray()
 {
@@ -158,9 +160,10 @@ function versiondolibarrarray()
  *  @param		int		$linelengthlimit	Limit for length of each line (Use 0 if unknown, may be faster if defined)
  *  @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
  * 	@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)
+function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handler = '', $okerror = 'default', $linelengthlimit = 32768, $nocommentremoval = 0, $offsetforchartofaccount = 0, $colspan = 0)
 {
 	global $db, $conf, $langs, $user;
 
@@ -237,6 +240,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 				if (empty($nocommentremoval)) {
 					$buf = preg_replace('/([,;ERLT\)])\s*--.*$/i', '\1', $buf); //remove comment from a line that not start with -- before add it to the buffer
 				}
+				if ($buffer) $buffer .= ' ';
 				$buffer .= trim($buf);
 			}
 
@@ -280,13 +284,9 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 					}
 				} else {
 					if (!$silent) {
-						print '<tr><td class="tdtop" colspan="2">';
-					}
-					if (!$silent) {
-						print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div></td>";
-					}
-					if (!$silent) {
-						print '</tr>';
+						print '<tr><td class="tdtop"'.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
+						print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div>";
+						print '</td></tr>';
 					}
 					$error++;
 					break;
@@ -307,8 +307,8 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 			// with
 			// 'INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1401 + 200100000, 'PCG99-ABREGE','CAPIT', '1234', 1400 + 200100000,...'
 			// Note: string with 'PCG99-ABREGE','CAPIT', 1234  instead of  'PCG99-ABREGE','CAPIT', '1234' is also supported
-			$newsql = preg_replace('/VALUES\s*\(__ENTITY__, \s*(\d+)\s*,(\s*\'[^\',]*\'\s*,\s*\'[^\',]*\'\s*,\s*\'?[^\',]*\'?\s*),\s*\'?([^\',]*)\'?/ims', 'VALUES (__ENTITY__, \1 + '.$offsetforchartofaccount.', \2, \3 + '.$offsetforchartofaccount, $newsql);
-			$newsql = preg_replace('/([,\s])0 \+ '.$offsetforchartofaccount.'/ims', '\1 0', $newsql);
+			$newsql = preg_replace('/VALUES\s*\(__ENTITY__, \s*(\d+)\s*,(\s*\'[^\',]*\'\s*,\s*\'[^\',]*\'\s*,\s*\'?[^\',]*\'?\s*),\s*\'?([^\',]*)\'?/ims', 'VALUES (__ENTITY__, \1 + '.((int) $offsetforchartofaccount).', \2, \3 + '.((int) $offsetforchartofaccount), $newsql);
+			$newsql = preg_replace('/([,\s])0 \+ '.((int) $offsetforchartofaccount).'/ims', '\1 0', $newsql);
 			//var_dump($newsql);
 			$arraysql[$i] = $newsql;
 
@@ -335,7 +335,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">'.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."'</td></tr>\n";
+				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";
 			}
 			dol_syslog('Admin.lib::run_sql Request '.($i + 1), LOG_DEBUG);
 			$sqlmodified = 0;
@@ -346,7 +346,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 
 				for ($j = 0; $j < $num; $j++) {
 					$from = $reg[0][$j];
-					$to = $db->encrypt($reg[1][$j], 1);
+					$to = $db->encrypt($reg[1][$j]);
 					$newsql = str_replace($from, $to, $newsql);
 				}
 				$sqlmodified++;
@@ -369,13 +369,9 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 				$cursor = $reg[1];
 				if (empty($listofinsertedrowid[$cursor])) {
 					if (!$silent) {
-						print '<tr><td class="tdtop" colspan="2">';
-					}
-					if (!$silent) {
-						print '<div class="error">'.$langs->trans("FileIsNotCorrect")."</div></td>";
-					}
-					if (!$silent) {
-						print '</tr>';
+						print '<tr><td class="tdtop"'.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
+						print '<div class="error">'.$langs->trans("FileIsNotCorrect")."</div>";
+						print '</td></tr>';
 					}
 					$error++;
 					break;
@@ -435,22 +431,14 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 				// Is it an error we accept
 				if (!in_array($errno, $okerrors)) {
 					if (!$silent) {
-						print '<tr><td class="tdtop" colspan="2">';
-					}
-					if (!$silent) {
-						print '<div class="error">'.$langs->trans("Error")." ".$db->errno().": ".$newsql."<br>".$db->error()."</div></td>";
-					}
-					if (!$silent) {
-						print '</tr>'."\n";
+						print '<tr><td class="tdtop"'.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
+						print '<div class="error">'.$langs->trans("Error")." ".$db->errno().": ".$newsql."<br>".$db->error()."</div>";
+						print '</td></tr>'."\n";
 					}
 					dol_syslog('Admin.lib::run_sql Request '.($i + 1)." Error ".$db->errno()." ".$newsql."<br>".$db->error(), LOG_ERR);
 					$error++;
 				}
 			}
-
-			if (!$silent) {
-				print '</tr>'."\n";
-			}
 		}
 	}
 
@@ -464,7 +452,7 @@ 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" language="javascript">
+		print '<script type="text/javascript">
 		jQuery(document).ready(function() {
 			function init_trrunsql()
 			{
@@ -494,10 +482,10 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 
 
 /**
- *	Effacement d'une constante dans la base de donnees
+ *	Delete a constant
  *
  *	@param	    DoliDB		$db         Database handler
- *	@param	    string		$name		Name of constant or rowid of line
+ *	@param	    string|int	$name		Name of constant or rowid of line
  *	@param	    int			$entity		Multi company id, -1 for all entities
  *	@return     int         			<0 if KO, >0 if OK
  *
@@ -515,7 +503,7 @@ function dolibarr_del_const($db, $name, $entity = 1)
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
 	$sql .= " WHERE (".$db->decrypt('name')." = '".$db->escape($name)."'";
 	if (is_numeric($name)) {
-		$sql .= " OR rowid = '".$db->escape($name)."'";
+		$sql .= " OR rowid = ".((int) $name);
 	}
 	$sql .= ")";
 	if ($entity >= 0) {
@@ -549,7 +537,7 @@ function dolibarr_get_const($db, $name, $entity = 1)
 
 	$sql = "SELECT ".$db->decrypt('value')." as value";
 	$sql .= " FROM ".MAIN_DB_PREFIX."const";
-	$sql .= " WHERE name = ".$db->encrypt($name, 1);
+	$sql .= " WHERE name = ".$db->encrypt($name);
 	$sql .= " AND entity = ".((int) $entity);
 
 	dol_syslog("admin.lib::dolibarr_get_const", LOG_DEBUG);
@@ -596,7 +584,7 @@ function dolibarr_set_const($db, $name, $value, $type = 'chaine', $visible = 0,
 	$db->begin();
 
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-	$sql .= " WHERE name = ".$db->encrypt($name, 1);
+	$sql .= " WHERE name = ".$db->encrypt($name);
 	if ($entity >= 0) {
 		$sql .= " AND entity = ".((int) $entity);
 	}
@@ -607,8 +595,8 @@ function dolibarr_set_const($db, $name, $value, $type = 'chaine', $visible = 0,
 	if (strcmp($value, '')) {	// true if different. Must work for $value='0' or $value=0
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity)";
 		$sql .= " VALUES (";
-		$sql .= $db->encrypt($name, 1);
-		$sql .= ", ".$db->encrypt($value, 1);
+		$sql .= $db->encrypt($name);
+		$sql .= ", ".$db->encrypt($value);
 		$sql .= ",'".$db->escape($type)."',".((int) $visible).",'".$db->escape($note)."',".((int) $entity).")";
 
 		//print "sql".$value."-".pg_escape_string($value)."-".$sql;exit;
@@ -634,7 +622,7 @@ function dolibarr_set_const($db, $name, $value, $type = 'chaine', $visible = 0,
 /**
  * Prepare array with list of tabs
  *
- * @param	int		$nbofactivatedmodules	Number f oactivated modules
+ * @param	int		$nbofactivatedmodules	Number if activated modules
  * @param	int		$nboftotalmodules		Nb of total modules
  * @return  array							Array of tabs to show
  */
@@ -678,6 +666,45 @@ function modules_prepare_head($nbofactivatedmodules, $nboftotalmodules)
 	return $head;
 }
 
+/**
+ * Prepare array with list of tabs
+ *
+ * @return  array				Array of tabs to show
+ */
+function ihm_prepare_head()
+{
+	global $langs, $conf, $user;
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT."/admin/ihm.php?mode=other";
+	$head[$h][1] = $langs->trans("LanguageAndPresentation");
+	$head[$h][2] = 'other';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT."/admin/ihm.php?mode=template";
+	$head[$h][1] = $langs->trans("SkinAndColors");
+	$head[$h][2] = 'template';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT."/admin/ihm.php?mode=dashboard";
+	$head[$h][1] = $langs->trans("Dashboard");
+	$head[$h][2] = 'dashboard';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT."/admin/ihm.php?mode=login";
+	$head[$h][1] = $langs->trans("LoginPage");
+	$head[$h][2] = 'login';
+	$h++;
+
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'ihm_admin');
+
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'ihm_admin', 'remove');
+
+
+	return $head;
+}
+
 
 /**
  * Prepare array with list of tabs
@@ -728,7 +755,7 @@ function security_prepare_head()
 	$sql = "SELECT COUNT(r.id) as nb";
 	$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
 	$sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
-	$sql .= " AND entity = ".$conf->entity;
+	$sql .= " AND entity = ".((int) $conf->entity);
 	$sql .= " AND bydefault = 1";
 	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 		$sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
@@ -809,7 +836,7 @@ function translation_prepare_head()
 	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=overwrite";
-	$head[$h][1] = $langs->trans("TranslationOverwriteKey").'<span class="fa fa-plus-circle valignmiddle paddingleft"></span>';
+	$head[$h][1] = '<span class="valignmiddle">'.$langs->trans("TranslationOverwriteKey").'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span>';
 	$head[$h][2] = 'overwrite';
 	$h++;
 
@@ -1781,7 +1808,7 @@ function addDocumentModel($name, $type, $label = '', $description = '')
 	$db->begin();
 
 	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
-	$sql .= " VALUES ('".$db->escape($name)."','".$db->escape($type)."',".$conf->entity.", ";
+	$sql .= " VALUES ('".$db->escape($name)."','".$db->escape($type)."',".((int) $conf->entity).", ";
 	$sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";
 	$sql .= (!empty($description) ? "'".$db->escape($description)."'" : "null");
 	$sql .= ")";
@@ -1814,7 +1841,7 @@ function delDocumentModel($name, $type)
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
 	$sql .= " WHERE nom = '".$db->escape($name)."'";
 	$sql .= " AND type = '".$db->escape($type)."'";
-	$sql .= " AND entity = ".$conf->entity;
+	$sql .= " AND entity = ".((int) $conf->entity);
 
 	dol_syslog("admin.lib::delDocumentModel", LOG_DEBUG);
 	$resql = $db->query($sql);
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 048335201ee..d2528f45dfa 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -73,11 +73,11 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		print '<div class="divsearchfield">';
 
 		// Type
-		print '<span class="fas fa-square inline-block fawidth30" style=" color: #ddd;" title="'.$langs->trans("ActionType").'"></span>';
 		$multiselect = 0;
 		if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE)) {     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
 			$multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE));
 		}
+		print 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 '</div>';
 
@@ -162,12 +162,12 @@ function show_array_actions_to_do($max = 5)
 	$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
 	$sql .= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
 	$sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -183,7 +183,7 @@ function show_array_actions_to_do($max = 5)
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo", $max).'</th>';
-		print '<th colspan="2" class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&status=todo">'.$langs->trans("FullList").'</a></th>';
+		print '<th colspan="2" class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&status=todo">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
 
 		$i = 0;
@@ -278,12 +278,12 @@ function show_array_last_actions_done($max = 5)
 	$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
 	$sql .= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action ";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
 	$sql .= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -299,7 +299,7 @@ function show_array_last_actions_done($max = 5)
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastDoneTasks", $max).'</th>';
-		print '<th colspan="2" class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&status=done">'.$langs->trans("FullList").'</a></th>';
+		print '<th colspan="2" class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&status=done">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
 
 		$i = 0;
@@ -479,22 +479,22 @@ function calendars_prepare_head($param)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/action/list.php?action=show_list'.($param ? '&'.$param : '');
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/list.php?mode=show_list'.($param ? '&'.$param : '');
 	$head[$h][1] = $langs->trans("ViewList");
 	$head[$h][2] = 'cardlist';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_month'.($param ? '&'.$param : '');
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?mode=show_month'.($param ? '&'.$param : '');
 	$head[$h][1] = $langs->trans("ViewCal");
 	$head[$h][2] = 'cardmonth';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_week'.($param ? '&'.$param : '');
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?mode=show_week'.($param ? '&'.$param : '');
 	$head[$h][1] = $langs->trans("ViewWeek");
 	$head[$h][2] = 'cardweek';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_day'.($param ? '&'.$param : '');
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?mode=show_day'.($param ? '&'.$param : '');
 	$head[$h][1] = $langs->trans("ViewDay");
 	$head[$h][2] = 'cardday';
 	$h++;
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 99cf4e4f8d1..e7bea722e0c 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -34,7 +34,7 @@
  * @param string	$url 				Ajax Url to call for request: /path/page.php. Must return a json array ('key'=>id, 'value'=>String shown into input field once selected, 'label'=>String shown into combo list)
  * @param string	$urloption			More parameters on URL request
  * @param int		$minLength			Minimum number of chars to trigger that Ajax search
- * @param int		$autoselect			Automatic selection if just one value (trigger("change") on field is done is search return only 1 result)
+ * @param int		$autoselect			Automatic selection if just one value (trigger("change") on field is done if search return only 1 result)
  * @param array		$ajaxoptions		Multiple options array
  *                                      - Ex: array('update'=>array('field1','field2'...)) will reset field1 and field2 once select done
  *                                      - Ex: array('disabled'=> )
@@ -46,6 +46,8 @@
  */
 function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLength = 2, $autoselect = 0, $ajaxoptions = array(), $moreparams = '')
 {
+	global $conf;
+
 	if (empty($minLength)) {
 		$minLength = 1;
 	}
@@ -67,7 +69,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 	$script .= '<!-- Javascript code for autocomplete of field '.$htmlname.' -->'."\n";
 	$script .= '<script>'."\n";
 	$script .= '$(document).ready(function() {
-					var autoselect = '.$autoselect.';
+					var autoselect = '.((int) $autoselect).';
 					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 */
@@ -540,14 +542,17 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
  * 	@param	string	$code					Name of constant
  * 	@param	array	$input					Array of complementary actions to do if success ("disabled"|"enabled'|'set'|'del') => CSS element to switch, 'alert' => message to show, ... Example: array('disabled'=>array(0=>'cssid'))
  * 	@param	int		$entity					Entity. Current entity is used if null.
- *  @param	int		$revertonoff			Revert on/off
+ *  @param	int		$revertonoff			1=Revert on/off
  *  @param	int		$strict					Use only "disabled" with delConstant and "enabled" with setConstant
  *  @param	int		$forcereload			Force to reload page if we click/change value (this is supported only when there is no 'alert' option in input)
- *  @param	string	$marginleftonlyshort	1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No left margin. Works for fontawesome picto only.
+ *  @param	string	$marginleftonlyshort	1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No left margin.
  *  @param	int		$forcenoajax			1 = Force to use a ahref link instead of ajax code.
+ *  @param	int		$setzeroinsteadofdel	1 = Set constantto '0' instead of deleting it
+ *  @param	string	$suffix					Suffix to use on the name of the switch_on picto. Example: '', '_red'
+ *  @param	string	$mode					Add parameter &mode= to the href link (Used for href link)
  * 	@return	string
  */
-function ajax_constantonoff($code, $input = array(), $entity = null, $revertonoff = 0, $strict = 0, $forcereload = 0, $marginleftonlyshort = 2, $forcenoajax = 0)
+function ajax_constantonoff($code, $input = array(), $entity = null, $revertonoff = 0, $strict = 0, $forcereload = 0, $marginleftonlyshort = 2, $forcenoajax = 0, $setzeroinsteadofdel = 0, $suffix = '', $mode = '')
 {
 	global $conf, $langs, $user;
 
@@ -558,9 +563,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.'">'.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.'">'.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." -->".'
@@ -568,10 +573,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().'\';
@@ -583,7 +588,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);
 					}
 				});
 
@@ -593,16 +598,20 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 						if (input.alert.del.yesButton) yesButton = input.alert.del.yesButton;
 						if (input.alert.del.noButton)  noButton = input.alert.del.noButton;
 						confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton, strict, userid, token);
-					} else {
-						delConstant(url, code, input, entity, 0, '.$forcereload.', userid, token);
-					}
+					} else {';
+		if (empty($setzeroinsteadofdel)) {
+			$out .=' 	delConstant(url, code, input, entity, 0, '.((int) $forcereload).', userid, token);';
+		} else {
+			$out .=' 	setConstant(url, code, input, entity, 0, '.((int) $forcereload).', userid, token, 0);';
+		}
+		$out .= '	}
 				});
 			});
 		</script>'."\n";
 
 		$out .= '<div id="confirm_'.$code.'" title="" style="display: none;"></div>';
 		$out .= '<span id="set_'.$code.'" class="valignmiddle linkobject '.(!empty($conf->global->$code) ? 'hideobject' : '').'">'.($revertonoff ?img_picto($langs->trans("Enabled"), 'switch_on', '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', '', $marginleftonlyshort)).'</span>';
-		$out .= '<span id="del_'.$code.'" class="valignmiddle linkobject '.(!empty($conf->global->$code) ? '' : 'hideobject').'">'.($revertonoff ?img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Enabled"), 'switch_on', '', false, 0, 0, '', '', $marginleftonlyshort)).'</span>';
+		$out .= '<span id="del_'.$code.'" class="valignmiddle linkobject '.(!empty($conf->global->$code) ? '' : 'hideobject').'">'.($revertonoff ?img_picto($langs->trans("Disabled"), 'switch_off'.$suffix, '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Enabled"), 'switch_on'.$suffix, '', false, 0, 0, '', '', $marginleftonlyshort)).'</span>';
 		$out .= "\n";
 	}
 
@@ -619,9 +628,10 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
  *  @param  string  $text_on    Text if on
  *  @param  string  $text_off   Text if off
  *  @param  array   $input      Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid'))
+ *  @param	string	$morecss	More CSS
  *  @return string              html for button on/off
  */
-function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input = array())
+function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input = array(), $morecss = '')
 {
 	global $langs;
 
@@ -692,8 +702,8 @@ function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input =
             });
         });
     </script>';
-	$out .= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? 'hideobject' : '').'">'.img_picto($langs->trans($text_off), 'switch_off').'</span>';
-	$out .= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? '' : 'hideobject').'">'.img_picto($langs->trans($text_on), 'switch_on').'</span>';
+	$out .= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? 'hideobject' : '').($morecss ? ' '.$morecss : '').'">'.img_picto($langs->trans($text_off), 'switch_off').'</span>';
+	$out .= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? '' : 'hideobject').($morecss ? ' '.$morecss : '').'">'.img_picto($langs->trans($text_on), 'switch_on').'</span>';
 
 	return $out;
 }
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 30a3d21de90..563f0be8665 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2015		Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2016		Juanjo Menent   	<jmenent@2byte.es>
  * Copyright (C) 2019	   Nicolas ZABOURI     <info@inovea-conseil.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
@@ -66,7 +67,7 @@ function bank_prepare_head(Account $object)
 	$head[$h][2] = 'graph';
 	$h++;
 
-	if ($object->courant != Account::TYPE_CASH) {
+	if ($object->courant != Account::TYPE_CASH || !empty($conf->global->BANK_CAN_RECONCILIATE_CASHACCOUNT)) {
 		$nbReceipts = 0;
 
 		// List of all standing receipts
@@ -276,7 +277,9 @@ function checkIbanForAccount($account)
 {
 	require_once DOL_DOCUMENT_ROOT.'/includes/php-iban/oophp-iban.php';
 
-	$iban = new IBAN($account->iban);
+	$ibantocheck = ($account->iban ? $account->iban : $account->iban_prefix);		// iban or iban_prefix for backward compatibility
+
+	$iban = new IBAN($ibantocheck);
 	$check = $iban->Verify();
 
 	if ($check) {
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index 12022ed178c..702d6673527 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -59,7 +59,10 @@ if (empty($font_loc)) {
 if (defined('PHP-BARCODE_PATH_COMMAND')) {
 	$genbarcode_loc = constant('PHP-BARCODE_PATH_COMMAND');
 } else {
-	$genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
+	$genbarcode_loc = '';
+	if (!empty($conf->global->GENBARCODE_LOCATION)) {
+		$genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
+	}
 }
 
 
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index f120e7b67fe..2d46ee2a239 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -64,7 +64,7 @@ function societe_prepare_head(Societe $object)
 			} else {
 				$sql = "SELECT COUNT(p.rowid) as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
-				$sql .= " WHERE p.fk_soc = ".$object->id;
+				$sql .= " WHERE p.fk_soc = ".((int) $object->id);
 				$resql = $db->query($sql);
 				if ($resql) {
 					$obj = $db->fetch_object($resql);
@@ -140,7 +140,7 @@ function societe_prepare_head(Societe $object)
 		} else {
 			$sql = "SELECT COUNT(n.rowid) as nb";
 			$sql .= " FROM ".MAIN_DB_PREFIX."projet as n";
-			$sql .= " WHERE fk_soc = ".$object->id;
+			$sql .= " WHERE fk_soc = ".((int) $object->id);
 			$sql .= " AND entity IN (".getEntity('project').")";
 			$resql = $db->query($sql);
 			if ($resql) {
@@ -201,8 +201,7 @@ function societe_prepare_head(Societe $object)
 		$foundonexternalonlinesystem = 0;
 		$langs->load("banks");
 
-		//$title = $langs->trans("BankAccounts");
-		$title = $langs->trans("PaymentInformation");
+		$title = $langs->trans("PaymentModes");
 
 		if (!empty($conf->stripe->enabled)) {
 			//$langs->load("stripe");
@@ -223,7 +222,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 = ".$object->id;
+		$sql .= " WHERE n.fk_soc = ".((int) $object->id);
 		if (empty($conf->stripe->enabled)) {
 			$sql .= " AND n.stripe_card_ref IS NULL";
 		} else {
@@ -240,7 +239,7 @@ function societe_prepare_head(Societe $object)
 
 		//if (! empty($conf->stripe->enabled) && $nbBankAccount > 0) $nbBankAccount = '...';	// No way to know exact number
 
-		$head[$h][0] = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.urlencode($object->id);
 		$head[$h][1] = $title;
 		if ($foundonexternalonlinesystem) {
 			$head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';
@@ -252,12 +251,12 @@ function societe_prepare_head(Societe $object)
 	}
 
 	if (!empty($conf->website->enabled) && (!empty($conf->global->WEBSITE_USE_WEBSITE_ACCOUNTS)) && (!empty($user->rights->societe->lire))) {
-		$head[$h][0] = DOL_URL_ROOT.'/societe/website.php?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/societe/website.php?id='.urlencode($object->id);
 		$head[$h][1] = $langs->trans("WebSiteAccounts");
 		$nbNote = 0;
 		$sql = "SELECT COUNT(n.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account as n";
-		$sql .= " WHERE fk_soc = ".$object->id.' AND fk_website > 0';
+		$sql .= " WHERE fk_soc = ".((int) $object->id).' AND fk_website > 0';
 		$resql = $db->query($sql);
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
@@ -274,6 +273,7 @@ function societe_prepare_head(Societe $object)
 
 	if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'thirdparty') {
 		if (!empty($user->rights->partnership->read)) {
+			$langs->load("partnership");
 			$nbPartnership = is_array($object->partnerships) ? count($object->partnerships) : 0;
 			$head[$h][0] = DOL_URL_ROOT.'/societe/partnership.php?socid='.$object->id;
 			$head[$h][1] = $langs->trans("Partnership");
@@ -295,7 +295,7 @@ function societe_prepare_head(Societe $object)
 		// Notifications
 		if (!empty($conf->notification->enabled)) {
 			$nbNotif = 0;
-			// Enable caching of thirdrparty count notifications
+			// Enable caching of thirdparty count notifications
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 			$cachekey = 'count_notifications_thirdparty_'.$object->id;
 			$dataretrieved = dol_getcache($cachekey);
@@ -304,7 +304,7 @@ function societe_prepare_head(Societe $object)
 			} else {
 				$sql = "SELECT COUNT(n.rowid) as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n";
-				$sql .= " WHERE fk_soc = ".$object->id;
+				$sql .= " WHERE fk_soc = ".((int) $object->id);
 				$resql = $db->query($sql);
 				if ($resql) {
 					$obj = $db->fetch_object($resql);
@@ -315,7 +315,7 @@ function societe_prepare_head(Societe $object)
 				dol_setcache($cachekey, $nbNotif, 120);		// If setting cache fails, this is not a problem, so we do not test result.
 			}
 
-			$head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.$object->id;
+			$head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.urlencode($object->id);
 			$head[$h][1] = $langs->trans("Notifications");
 			if ($nbNotif > 0) {
 				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNotif.'</span>';
@@ -332,7 +332,7 @@ function societe_prepare_head(Societe $object)
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = DOL_URL_ROOT.'/societe/note.php?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/societe/note.php?id='.urlencode($object->id);
 		$head[$h][1] = $langs->trans("Notes");
 		if ($nbNote > 0) {
 			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
@@ -380,7 +380,7 @@ function societe_prepare_head(Societe $object)
 		} else {
 			$sql = "SELECT COUNT(id) as nb";
 			$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm";
-			$sql .= " WHERE fk_soc = ".$object->id;
+			$sql .= " WHERE fk_soc = ".((int) $object->id);
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
@@ -724,7 +724,7 @@ function getFormeJuridiqueLabel($code)
 function getCountriesInEEC()
 {
 	// List of all country codes that are in europe for european vat rules
-	// List found on http://ec.europa.eu/taxation_customs/common/faq/faq_1179_en.htm#9
+	// List found on https://ec.europa.eu/taxation_customs/territorial-status-eu-countries-and-certain-territories_en
 	global $conf, $db;
 	$country_code_in_EEC = array();
 
@@ -806,7 +806,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 		$sql .= ", cls.code as opp_status_code";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";
-		$sql .= " WHERE p.fk_soc = ".$object->id;
+		$sql .= " WHERE p.fk_soc = ".((int) $object->id);
 		$sql .= " AND p.entity IN (".getEntity('project').")";
 		$sql .= " ORDER BY p.dateo DESC";
 
@@ -879,7 +879,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 					$i++;
 				}
 			} else {
-				print '<tr class="oddeven"><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				print '<tr class="oddeven"><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 			}
 			$db->free($result);
 		} else {
@@ -915,8 +915,8 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	$form = new Form($db);
 
 	$optioncss = GETPOST('optioncss', 'alpha');
-	$sortfield = GETPOST("sortfield", 'alpha');
-	$sortorder = GETPOST("sortorder", 'alpha');
+	$sortfield = GETPOST('sortfield', 'aZ09comma');
+	$sortorder = GETPOST('sortorder', 'aZ09comma');
 	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
 	$search_status = GETPOST("search_status", 'int');
@@ -1083,7 +1083,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	$sql .= " t.civility as civility_id, t.address, t.zip, t.town";
 	$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as ef on (t.rowid = ef.fk_object)";
-	$sql .= " WHERE t.fk_soc = ".$object->id;
+	$sql .= " WHERE t.fk_soc = ".((int) $object->id);
 	if ($search_status != '' && $search_status != '-1') {
 		$sql .= " AND t.statut = ".((int) $search_status);
 	}
@@ -1295,7 +1295,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 
 			// Edit
 			if ($user->rights->societe->contact->creer) {
-				print '<a class="editfielda paddingleft" href="'.DOL_URL_ROOT.'/contact/card.php?action=edit&id='.$obj->rowid.'&backtopage='.urlencode($backtopage).'">';
+				print '<a class="editfielda paddingleft" href="'.DOL_URL_ROOT.'/contact/card.php?action=edit&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($backtopage).'">';
 				print img_edit();
 				print '</a>';
 			}
@@ -1446,8 +1446,12 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			$sql .= ", o.ref";
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {
 			$sql .= ", o.ref";
-		} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) {
-			$sql .= ", o.ref";
+		} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && $filterobj->table_element && $filterobj->element) {
+			if (!empty($filterobj->fields['ref'])) {
+				$sql .= ", o.ref";
+			} elseif (!empty($filterobj->fields['label'])) {
+				$sql .= ", o.label";
+			}
 		}
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
@@ -1482,7 +1486,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			$sql .= ", ".MAIN_DB_PREFIX."bom_bom as o";
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {
 			$sql .= ", ".MAIN_DB_PREFIX."contrat as o";
-		} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) {
+		} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && (is_array($filterobj->fields['ref']) || is_array($filterobj->fields['label'])) && $filterobj->table_element && $filterobj->element) {
 			$sql .= ", ".MAIN_DB_PREFIX.$filterobj->table_element." as o";
 		}
 
@@ -1524,9 +1528,9 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 				if ($filterobj->id) {
 					$sql .= " AND a.fk_element = ".((int) $filterobj->id);
 				}
-			} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) {
+			} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && (is_array($filterobj->fields['ref']) || is_array($filterobj->fields['label'])) && $filterobj->table_element && $filterobj->element) {
 				// Generic case
-				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = '".$db->escape($filterobj->element).($module ? '@'.$module : '')."'";
+				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = '".$db->escape($filterobj->element).($module ? "@".$module : "")."'";
 				if ($filterobj->id) {
 					$sql .= " AND a.fk_element = ".((int) $filterobj->id);
 				}
@@ -1705,7 +1709,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		$out .= '<td class="liste_titre"></td>';
 		$out .= '<td class="liste_titre"></td>';
 		$out .= '<td class="liste_titre">';
-		$out .= $formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1, 0, (empty($conf->global->AGENDA_USE_MULTISELECT_TYPE) ? 0 : 1), 1);
+		$out .= $formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1, 0, (empty($conf->global->AGENDA_USE_MULTISELECT_TYPE) ? 0 : 1), 1, 'minwidth200');
 		$out .= '</td>';
 		$out .= '<td class="liste_titre maxwidth100onsmartphone"><input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="'.$filters['search_agenda_label'].'"></td>';
 		$out .= '<td class="liste_titre center">';
@@ -1725,7 +1729,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		if ($donetodo) {
 			$tmp = '';
 			if (get_class($filterobj) == 'Societe') {
-				$tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&socid='.$filterobj->id.'&status=done">';
+				$tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&socid='.$filterobj->id.'&status=done">';
 			}
 			$tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
 			$tmp .= ($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
@@ -1736,14 +1740,14 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			}
 			$out .= getTitleFieldOfList($tmp);
 		}
-		$out .= getTitleFieldOfList($langs->trans("Ref"), 0, $_SERVER["PHP_SELF"], 'a.id', '', $param, '', $sortfield, $sortorder);
-		$out .= getTitleFieldOfList($langs->trans("Owner"));
-		$out .= getTitleFieldOfList($langs->trans("Type"));
-		$out .= getTitleFieldOfList($langs->trans("Label"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
-		$out .= getTitleFieldOfList($langs->trans("Date"), 0, $_SERVER["PHP_SELF"], 'a.datep,a.id', '', $param, 'align="center"', $sortfield, $sortorder);
-		$out .= getTitleFieldOfList($langs->trans("RelatedObjects"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
-		$out .= getTitleFieldOfList($langs->trans("ActionOnContact"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
-		$out .= getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], 'a.percent', '', $param, 'align="center"', $sortfield, $sortorder);
+		$out .= getTitleFieldOfList("Ref", 0, $_SERVER["PHP_SELF"], 'a.id', '', $param, '', $sortfield, $sortorder);
+		$out .= getTitleFieldOfList("Owner");
+		$out .= getTitleFieldOfList("Type");
+		$out .= getTitleFieldOfList("Label", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+		$out .= getTitleFieldOfList("Date", 0, $_SERVER["PHP_SELF"], 'a.datep,a.id', '', $param, '', $sortfield, $sortorder, 'center ');
+		$out .= getTitleFieldOfList("RelatedObjects", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+		$out .= getTitleFieldOfList("ActionOnContact", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'tdoverflowmax125 ', 0, '', 0);
+		$out .= getTitleFieldOfList("Status", 0, $_SERVER["PHP_SELF"], 'a.percent', '', $param, '', $sortfield, $sortorder, 'center ');
 		$out .= getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'maxwidthsearch ');
 		$out .= '</tr>';
 
@@ -1777,7 +1781,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			$out .= '</td>';
 
 			// Author of event
-			$out .= '<td class="tdoverflowmax200">';
+			$out .= '<td class="tdoverflowmax150">';
 			//$userstatic->id=$histo[$key]['userid'];
 			//$userstatic->login=$histo[$key]['login'];
 			//$out.=$userstatic->getLoginUrl(1);
@@ -1808,25 +1812,27 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 					$labeltype .= ' - '.$arraylist[$actionstatic->code]; // Use code in priority on type_code
 				}
 			}
-			$out .= '<td class="tdoverflowmax200" title="'.$labeltype.'">';
+			$out .= '<td class="tdoverflowmax150" title="'.$labeltype.'">';
 			$out .= $actionstatic->getTypePicto();
 			$out .= $labeltype;
 			$out .= '</td>';
 
-			// Title
-			$out .= '<td>';
+			// Title/Label of event
+			$out .= '<td class="tdoverflowmax300"';
 			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'action') {
 				$transcode = $langs->trans("Action".$histo[$key]['acode']);
 				$libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : $histo[$key]['alabel']);
 				//$actionstatic->libelle=$libelle;
 				$libelle = $histo[$key]['note'];
 				$actionstatic->id = $histo[$key]['id'];
+				$out .= ' title="'.dol_escape_htmltag($libelle).'">';
 				$out .= dol_trunc($libelle, 120);
 			}
 			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') {
 				$out .= '<a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"), "email").' ';
 				$transcode = $langs->trans("Action".$histo[$key]['acode']);
 				$libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : 'Send mass mailing');
+				$out .= ' title="'.dol_escape_htmltag($libelle).'">';
 				$out .= dol_trunc($libelle, 120);
 			}
 			$out .= '</td>';
@@ -1883,13 +1889,8 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			$out .= '</td>';
 
 			// Contact(s) for action
-			if (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0) {
-				$contactstatic->lastname = $histo[$key]['lastname'];
-				$contactstatic->firstname = $histo[$key]['firstname'];
-				$contactstatic->id = $histo[$key]['contact_id'];
-				$out .= '<td width="120">'.$contactstatic->getNomUrl(1, '', 10).'</td>';
-			} elseif (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) {
-				$out .= '<td>';
+			if (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) {
+				$out .= '<td class="valignmiddle">';
 				$contact = new Contact($db);
 				foreach ($histo[$key]['socpeopleassigned'] as $cid => $value) {
 					$result = $contact->fetch($cid);
@@ -1899,7 +1900,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 					}
 
 					if ($result > 0) {
-						$out .= $contact->getNomUrl(1, '', 16);
+						$out .= $contact->getNomUrl(-3, '', 10, '', -1, 0, 'paddingright');
 						if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {
 							if (!empty($contact->phone_pro)) {
 								$out .= '('.dol_print_phone($contact->phone_pro).')';
@@ -1909,6 +1910,12 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 					}
 				}
 				$out .= '</td>';
+			} elseif (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0) {
+				$contactstatic->lastname = $histo[$key]['lastname'];
+				$contactstatic->firstname = $histo[$key]['firstname'];
+				$contactstatic->id = $histo[$key]['contact_id'];
+				$contactstatic->photo = $histo[$key]['contact_photo'];
+				$out .= '<td width="120">'.$contactstatic->getNomUrl(-1, '', 10).'</td>';
 			} else {
 				$out .= '<td>&nbsp;</td>';
 			}
@@ -2003,7 +2010,7 @@ function show_subsidiaries($conf, $langs, $db, $object)
 			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->code_client).'">'.$obj->code_client.'</td>';
 
 			print '<td class="center">';
-			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/societe/card.php?socid='.((int) $obj->rowid).'&action=edit">';
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/societe/card.php?socid='.((int) $obj->rowid).'&action=edit&token='.newToken().'">';
 			print img_edit();
 			print '</a></td>';
 
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index c60cb0c8c18..5a0c6c376fb 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -57,6 +57,40 @@ function contact_prepare_head(Contact $object)
 	$head[$tab][2] = 'perso';
 	$tab++;
 
+	if (!empty($conf->projet->enabled) && (!empty($user->rights->projet->lire))) {
+		$nbProject = 0;
+		// Enable caching of thirdrparty count projects
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+		$cachekey = 'count_projects_contact_'.$object->id;
+		$dataretrieved = dol_getcache($cachekey);
+
+		if (!is_null($dataretrieved)) {
+			$nbProject = $dataretrieved;
+		} else {
+			$sql = 'SELECT COUNT(n.rowid) as nb';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as n';
+			$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (n.rowid = cc.element_id)';
+			$sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id);
+			$sql .= ' AND cc.fk_c_type_contact IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE element="project" AND source="external")';
+			$sql .= ' AND n.entity IN ('.getEntity('project').')';
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				$nbProject = $obj->nb;
+			} else {
+				dol_print_error($db);
+			}
+			dol_setcache($cachekey, $nbProject, 120);	// If setting cache fails, this is not a problem, so we do not test result.
+		}
+		$head[$tab][0] = DOL_URL_ROOT.'/contact/project.php?id='.$object->id;
+		$head[$tab][1] = $langs->trans("Projects");
+		if ($nbProject > 0) {
+			$head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbProject.'</span>';
+		}
+		$head[$tab][2] = 'project';
+		$tab++;
+	}
+
 	// Related items
 	if (!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || !empty($conf->ficheinter->enabled) || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
 		$head[$tab][0] = DOL_URL_ROOT.'/contact/consumption.php?id='.$object->id;
@@ -117,3 +151,131 @@ function contact_prepare_head(Contact $object)
 
 	return $head;
 }
+
+/**
+ * 		Show html area for list of projects
+ *
+ *		@param	Conf		$conf			Object conf
+ * 		@param	Translate	$langs			Object langs
+ * 		@param	DoliDB		$db				Database handler
+ * 		@param	Object		$object			Third party object
+ *      @param  string		$backtopage		Url to go once contact is created
+ *      @param  int         $nocreatelink   1=Hide create project link
+ *      @param	string		$morehtmlright	More html on right of title
+ *      @return	int
+ */
+function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatelink = 0, $morehtmlright = '')
+{
+	global $user;
+
+	$i = -1;
+
+	if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
+		$langs->load("projects");
+
+		$newcardbutton = '';
+		if (!empty($conf->projet->enabled) && $user->rights->projet->creer && empty($nocreatelink)) {
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AddProject'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage));
+		}
+
+		print "\n";
+		print load_fiche_titre($langs->trans("ProjectsHavingThisContact"), $newcardbutton.$morehtmlright, '');
+		print '<div class="div-table-responsive">';
+		print "\n".'<table class="noborder" width=100%>';
+
+		$sql  = 'SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount';
+		$sql .= ', cls.code as opp_status_code, ctc.libelle';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_lead_status as cls on p.fk_opp_status = cls.rowid';
+		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact as cc ON (p.rowid = cc.element_id)';
+		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_contact as ctc ON (ctc.rowid = cc.fk_c_type_contact)';
+		$sql .= ' WHERE cc.fk_socpeople = '.((int) $object->id);
+		$sql .= ' AND ctc.element="project" AND ctc.source="external"';
+		$sql .= ' AND p.entity IN ('.getEntity('project').')';
+		$sql .= ' ORDER BY p.dateo DESC';
+
+		$result = $db->query($sql);
+		if ($result) {
+			$num = $db->num_rows($result);
+
+			print '<tr class="liste_titre">';
+			print '<td>'.$langs->trans("Ref").'</td>';
+			print '<td>'.$langs->trans("Name").'</td>';
+			print '<td>'.$langs->trans("ContactType").'</td>';
+			print '<td class="center">'.$langs->trans("DateStart").'</td>';
+			print '<td class="center">'.$langs->trans("DateEnd").'</td>';
+			print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';
+			print '<td class="center">'.$langs->trans("OpportunityStatusShort").'</td>';
+			print '<td class="right">'.$langs->trans("OpportunityProbabilityShort").'</td>';
+			print '<td class="right">'.$langs->trans("Status").'</td>';
+			print '</tr>';
+
+			if ($num > 0) {
+				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+				$projecttmp = new Project($db);
+
+				$i = 0;
+
+				while ($i < $num) {
+					$obj = $db->fetch_object($result);
+					$projecttmp->fetch($obj->id);
+
+					// To verify role of users
+					$userAccess = $projecttmp->restrictedProjectArea($user);
+
+					if ($user->rights->projet->lire && $userAccess > 0) {
+						print '<tr class="oddeven">';
+
+						// Ref
+						print '<td>';
+						print $projecttmp->getNomUrl(1);
+						print '</td>';
+
+						// Label
+						print '<td>'.$obj->title.'</td>';
+						print '<td>'.$obj->libelle.'</td>';
+						// Date start
+						print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>';
+						// Date end
+						print '<td class="center">'.dol_print_date($db->jdate($obj->de), "day").'</td>';
+						// Opp amount
+						print '<td class="right">';
+						if ($obj->opp_status_code) {
+							print price($obj->opp_amount, 1, '', 1, -1, -1, '');
+						}
+						print '</td>';
+						// Opp status
+						print '<td class="center">';
+						if ($obj->opp_status_code) {
+							print $langs->trans("OppStatus".$obj->opp_status_code);
+						}
+						print '</td>';
+						// Opp percent
+						print '<td class="right">';
+						if ($obj->opp_percent) {
+							print price($obj->opp_percent, 1, '', 1, 0).'%';
+						}
+						print '</td>';
+						// Status
+						print '<td class="right">'.$projecttmp->getLibStatut(5).'</td>';
+
+						print '</tr>';
+					}
+					$i++;
+				}
+			} else {
+				print '<tr class="oddeven"><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+			}
+			$db->free($result);
+		} else {
+			dol_print_error($db);
+		}
+		print "</table>";
+		print '</div>';
+
+		print "<br>\n";
+	}
+
+	return $i;
+}
diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index 5216ff554e4..b4c728fd611 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -100,10 +100,10 @@ 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">'.$url."</a><br>\n";
+	print img_picto('', 'globe').' <a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.$url."</a><br>\n";
 	print ' '.$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">'.$url."</a><br>\n";
+	print img_picto('', 'globe').' <a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.$url."</a><br>\n";
 	print '</div>';
 	print '<br>';
 
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index fe21071901a..d4028e2196b 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -115,9 +115,10 @@ function getServerTimeZoneInt($refgmtdate = 'now')
  *  @param      int			$time               Date timestamp (or string with format YYYY-MM-DD)
  *  @param      int			$duration_value     Value of delay to add
  *  @param      int			$duration_unit      Unit of added delay (d, m, y, w, h, i)
+ *  @param      int         $ruleforendofmonth  Change the behavior of PHP over data-interval, 0 or 1
  *  @return     int      			        	New timestamp
  */
-function dol_time_plus_duree($time, $duration_value, $duration_unit)
+function dol_time_plus_duree($time, $duration_value, $duration_unit, $ruleforendofmonth = 0)
 {
 	global $conf;
 
@@ -166,7 +167,31 @@ function dol_time_plus_duree($time, $duration_value, $duration_unit)
 	} else {
 		$date->add($interval);
 	}
+	//Change the behavior of PHP over data-interval when the result of this function is Feb 29 (non-leap years), 30 or Feb 31 (php returns March 1, 2 or 3 respectively)
+	if ($ruleforendofmonth == 1 && $duration_unit == 'm') {
+		$timeyear = dol_print_date($time, '%Y');
+		$timemonth = dol_print_date($time, '%m');
+		$timetotalmonths = (($timeyear * 12) + $timemonth);
 
+		$monthsexpected = ($timetotalmonths + $duration_value);
+
+		$newtime = $date->getTimestamp();
+
+		$newtimeyear = dol_print_date($newtime, '%Y');
+		$newtimemonth = dol_print_date($newtime, '%m');
+		$newtimetotalmonths = (($newtimeyear * 12) + $newtimemonth);
+
+		if ($monthsexpected < $newtimetotalmonths) {
+			$newtimehours = dol_print_date($newtime, '%H');
+			$newtimemins = dol_print_date($newtime, '%M');
+			$newtimesecs = dol_print_date($newtime, '%S');
+
+			$datelim = dol_mktime($newtimehours, $newtimemins, $newtimesecs, $newtimemonth, 1, $newtimeyear);
+			$datelim -= (3600 * 24);
+
+			$date->setTimestamp($datelim);
+		}
+	}
 	return $date->getTimestamp();
 }
 
@@ -656,7 +681,7 @@ function dol_get_first_day_week($day, $month, $year, $gm = false)
 function getGMTEasterDatetime($year)
 {
 	$base = new DateTime("$year-03-21", new DateTimeZone("UTC"));
-	$days = easter_days($year);	// Return number of days between 21 march and easter day.
+	$days = easter_days($year); // Return number of days between 21 march and easter day.
 	$tmp = $base->add(new DateInterval("P{$days}D"));
 	return $tmp->getTimestamp();
 }
@@ -668,15 +693,16 @@ function getGMTEasterDatetime($year)
  *
  *  @param	int			$timestampStart		Timestamp start (UTC with hour, min, sec = 0)
  *  @param	int			$timestampEnd		Timestamp end (UTC with hour, min, sec = 0)
- *  @param	string			$country_code		Country code
- *  @param	int			$lastday		Last day is included, 0: no, 1:yes
+ *  @param	string		$country_code		Country code
+ *  @param	int			$lastday			Last day is included, 0: no, 1:yes
  *  @param	int			$includesaturday	Include saturday as non working day (-1=use setup, 0=no, 1=yes)
  *  @param	int			$includesunday		Include sunday as non working day (-1=use setup, 0=no, 1=yes)
  *  @param	int			$includefriday		Include friday as non working day (-1=use setup, 0=no, 1=yes)
- *  @return	int|string					Number of non working days or error message string if error
+ *  @param	int			$includemonday		Include monday as non working day (-1=use setup, 0=no, 1=yes)
+ *  @return	int|string						Number of non working days or error message string if error
  *  @see num_between_day(), num_open_day()
  */
-function num_public_holiday($timestampStart, $timestampEnd, $country_code = '', $lastday = 0, $includesaturday = -1, $includesunday = -1, $includefriday = -1)
+function num_public_holiday($timestampStart, $timestampEnd, $country_code = '', $lastday = 0, $includesaturday = -1, $includesunday = -1, $includefriday = -1, $includemonday = -1)
 {
 	global $db, $conf, $mysoc;
 
@@ -690,6 +716,9 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 	if (empty($country_code)) {
 		$country_code = $mysoc->country_code;
 	}
+	if ($includemonday < 0) {
+		$includemonday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY : 0);
+	}
 	if ($includefriday < 0) {
 		$includefriday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY : 0);
 	}
diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php
index 79f38a8990a..fecf10f48fe 100644
--- a/htdocs/core/lib/doleditor.lib.php
+++ b/htdocs/core/lib/doleditor.lib.php
@@ -66,10 +66,6 @@ function show_skin($fuser, $edit = 0)
 	// Title
 	print '<tr class="liste_titre"><th width="35%">'.$langs->trans("DefaultSkin").'</th>';
 	print '<th class="right">';
-	$url = 'http://ckeditor.com/addons/skins/all';
-	/*print '<a href="'.$url.'" target="_blank">';
-	   print $langs->trans('DownloadMoreSkins');
-	   print '</a>';*/
 	print '</th></tr>';
 
 	print '<tr class="oddeven">';
diff --git a/htdocs/core/lib/eventorganization.lib.php b/htdocs/core/lib/eventorganization.lib.php
index 2f8ea573c1f..51ff1f2a90f 100644
--- a/htdocs/core/lib/eventorganization.lib.php
+++ b/htdocs/core/lib/eventorganization.lib.php
@@ -16,7 +16,7 @@
  */
 
 /**
- * \file    eventorganization/lib/eventorganization.lib.php
+ * \file    htdocs/core/lib/eventorganization.lib.php
  * \ingroup eventorganization
  * \brief   Library files with common functions for EventOrganization
  */
diff --git a/htdocs/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php
index 8e27ef12466..3287227a05d 100644
--- a/htdocs/core/lib/expensereport.lib.php
+++ b/htdocs/core/lib/expensereport.lib.php
@@ -140,12 +140,10 @@ function expensereport_admin_prepare_head()
 	$head[$h][2] = 'expensereport';
 	$h++;
 
-	if (!empty($conf->global->MAIN_USE_EXPENSE_RULE)) {
-		$head[$h][0] = DOL_URL_ROOT."/admin/expensereport_rules.php";
-		$head[$h][1] = $langs->trans("ExpenseReportsRules");
-		$head[$h][2] = 'expenserules';
-		$h++;
-	}
+	$head[$h][0] = DOL_URL_ROOT."/admin/expensereport_rules.php";
+	$head[$h][1] = $langs->trans("ExpenseReportsRules");
+	$head[$h][2] = 'expenserules';
+	$h++;
 
 	if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/expensereport_ik.php";
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index f774982b240..c70ea041e0a 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2008-2012  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2012-2015  Regis Houssin       <regis.houssin@inodbox.com>
+ * Copyright (C) 2012-2021  Regis Houssin       <regis.houssin@inodbox.com>
  * Copyright (C) 2012-2016  Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Marcos García       <marcosgdf@gmail.com>
  * Copyright (C) 2016       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
@@ -107,7 +107,7 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 		if ($dir = opendir($newpath)) {
 			$filedate = '';
 			$filesize = '';
-
+			$fileperm = '';
 			while (false !== ($file = readdir($dir))) {        // $file is always a basename (into directory $newpath)
 				if (!utf8_check($file)) {
 					$file = utf8_encode($file); // To be sure data is stored in utf8 in memory
@@ -1778,7 +1778,7 @@ function dol_remove_file_process($filenb, $donotupdatesession = 0, $donotdeletef
  */
 function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uploaded', $setsharekey = 0, $object = null)
 {
-	global $db, $user;
+	global $db, $user, $conf;
 
 	$result = 0;
 
@@ -1801,7 +1801,18 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
 
 		if (is_object($object) && $object->id > 0) {
 			$ecmfile->src_object_id = $object->id;
-			$ecmfile->src_object_type = $object->table_element;
+			if (isset($object->table_element)) {
+				$ecmfile->src_object_type = $object->table_element;
+			} else {
+				dol_syslog('Error: object ' . get_class($object) . ' has no table_element attribute.');
+				return -1;
+			}
+			if (isset($object->src_object_description)) $ecmfile->description = $object->src_object_description;
+			if (isset($object->src_object_keywords)) $ecmfile->keywords = $object->src_object_keywords;
+		}
+
+		if (!empty($conf->global->MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE)) {
+			$setsharekey = 1;
 		}
 
 		if ($setsharekey) {
@@ -1960,6 +1971,9 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 		} elseif ($mode == 'bz') {
 			$foundhandler = 1;
 			$compressdata = bzcompress($data, 9);
+		} elseif ($mode == 'zstd') {
+			$foundhandler = 1;
+			$compressdata = zstd_compress($data, 9);
 		} elseif ($mode == 'zip') {
 			if (class_exists('ZipArchive') && !empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS)) {
 				$foundhandler = 1;
@@ -1990,11 +2004,15 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 					// Skip directories (they would be added automatically)
 					if (!$file->isDir()) {
 						// Get real and relative path for current file
-						$filePath = $file->getRealPath();
-						$relativePath = substr($filePath, strlen($rootPath) + 1);
+						$filePath = $file->getPath();				// the full path with filename using the $inputdir root.
+						$fileName = $file->getFilename();
+						$fileFullRealPath = $file->getRealPath();	// the full path with name and transformed to use real path directory.
+
+						//$relativePath = substr($fileFullRealPath, strlen($rootPath) + 1);
+						$relativePath = substr(($filePath ? $filePath.'/' : '').$fileName, strlen($rootPath) + 1);
 
 						// Add current file to archive
-						$zip->addFile($filePath, $relativePath);
+						$zip->addFile($fileFullRealPath, $relativePath);
 					}
 				}
 
@@ -2182,22 +2200,29 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 				}
 
 				// Create recursive directory iterator
+				// This does not return symbolic links
 				/** @var SplFileInfo[] $files */
 				$files = new RecursiveIteratorIterator(
 					new RecursiveDirectoryIterator($inputdir),
 					RecursiveIteratorIterator::LEAVES_ONLY
 				);
 
+				//var_dump($inputdir);
 				foreach ($files as $name => $file) {
 					// Skip directories (they would be added automatically)
 					if (!$file->isDir()) {
 						// Get real and relative path for current file
-						$filePath = $file->getRealPath();
-						$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($filePath, strlen($inputdir) + 1);
+						$filePath = $file->getPath();				// the full path with filename using the $inputdir root.
+						$fileName = $file->getFilename();
+						$fileFullRealPath = $file->getRealPath();	// the full path with name and transformed to use real path directory.
 
-						if (empty($excludefiles) || !preg_match($excludefiles, $filePath)) {
+						//$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($fileFullRealPath, strlen($inputdir) + 1);
+						$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr(($filePath ? $filePath.'/' : '').$fileName, strlen($inputdir) + 1);
+
+						//var_dump($filePath);var_dump($fileFullRealPath);var_dump($relativePath);
+						if (empty($excludefiles) || !preg_match($excludefiles, $fileFullRealPath)) {
 							// Add current file to archive
-							$zip->addFile($filePath, $relativePath);
+							$zip->addFile($fileFullRealPath, $relativePath);
 						}
 					}
 				}
@@ -2245,21 +2270,22 @@ function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(
 
 /**
  * Security check when accessing to a document (used by document.php, viewimage.php and webservices to get documents).
- * TODO Replace code that set $accesallowed by a call to restrictedArea()
+ * TODO Replace code that set $accessallowed by a call to restrictedArea()
  *
  * @param	string	$modulepart			Module of document ('module', 'module_user_temp', 'module_user' or 'module_temp'). Exemple: 'medias', 'invoice', 'logs', 'tax-vat', ...
  * @param	string	$original_file		Relative path with filename, relative to modulepart.
  * @param	string	$entity				Restrict onto entity (0=no restriction)
  * @param  	User	$fuser				User object (forced)
- * @param	string	$refname			Ref of object to check permission for external users (autodetect if not provided)
+ * @param	string	$refname			Ref of object to check permission for external users (autodetect if not provided) or for hierarchy
  * @param   string  $mode               Check permission for 'read' or 'write'
  * @return	mixed						Array with access information : 'accessallowed' & 'sqlprotectagainstexternals' & 'original_file' (as a full path name)
  * @see restrictedArea()
  */
 function dol_check_secure_access_document($modulepart, $original_file, $entity, $fuser = '', $refname = '', $mode = 'read')
 {
-	global $conf, $db, $user;
+	global $conf, $db, $user, $hookmanager;
 	global $dolibarr_main_data_root, $dolibarr_main_document_root_alt;
+	global $object;
 
 	if (!is_object($fuser)) {
 		$fuser = $user;
@@ -2397,6 +2423,30 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$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)) {
+			$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)) {
+				include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+				$tmpholiday = new Holiday($db);
+				$tmpholiday->fetch('', $refname);
+				$accessallowed = checkUserAccessToObject($user, array('holiday'), $tmpholiday, 'holiday', '', '', 'rowid', '');
+			}
+		}
+		$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)) {
+			$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)) {
+				include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+				$tmpexpensereport = new ExpenseReport($db);
+				$tmpexpensereport->fetch('', $refname);
+				$accessallowed = checkUserAccessToObject($user, array('expensereport'), $tmpexpensereport, 'expensereport', '', '', 'rowid', '');
+			}
+		}
+		$original_file = $conf->expensereport->dir_output.'/'.$original_file;
 	} elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output)) {
 		// Wrapping pour les apercu supplier invoice
 		if ($fuser->rights->expensereport->{$lire}) {
@@ -2852,6 +2902,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		if ($fuser->admin) {
 			$accessallowed = 1; // If user is admin
 		}
+
 		$tmpmodulepart = explode('-', $modulepart);
 		if (!empty($tmpmodulepart[1])) {
 				$modulepart = $tmpmodulepart[0];
@@ -2921,27 +2972,32 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			}
 		}
 
-		// For modules who wants to manage different levels of permissions for documents
-		$subPermCategoryConstName = strtoupper($modulepart).'_SUBPERMCATEGORY_FOR_DOCUMENTS';
-		if (!empty($conf->global->$subPermCategoryConstName)) {
-			$subPermCategory = $conf->global->$subPermCategoryConstName;
-			if (!empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->{$lire}) || ($fuser->rights->$modulepart->$subPermCategory->{$read}) || ($fuser->rights->$modulepart->$subPermCategory->{$download}))) {
-				$accessallowed = 1;
+		$parameters = array(
+			'modulepart' => $modulepart,
+			'original_file' => $original_file,
+			'entity' => $entity,
+			'fuser' => $fuser,
+			'refname' => '',
+			'mode' => $mode
+		);
+		$reshook = $hookmanager->executeHooks('checkSecureAccess', $parameters, $object);
+		if ($reshook > 0) {
+			if (!empty($hookmanager->resArray['original_file'])) {
+				$original_file = $hookmanager->resArray['original_file'];
+			}
+			if (!empty($hookmanager->resArray['accessallowed'])) {
+				$accessallowed = $hookmanager->resArray['accessallowed'];
+			}
+			if (!empty($hookmanager->resArray['sqlprotectagainstexternals'])) {
+				$sqlprotectagainstexternals = $hookmanager->resArray['sqlprotectagainstexternals'];
 			}
-		}
-
-		// Define $sqlprotectagainstexternals for modules who want to protect access using a SQL query.
-		$sqlProtectConstName = strtoupper($modulepart).'_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS';
-		if (!empty($conf->global->$sqlProtectConstName)) {	// If module want to define its own $sqlprotectagainstexternals
-			// Example: mymodule__SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS = "SELECT fk_soc FROM ".MAIN_DB_PREFIX.$modulepart." WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-			eval('$sqlprotectagainstexternals = "'.$conf->global->$sqlProtectConstName.'";');
 		}
 	}
 
 	$ret = array(
-		'accessallowed' => $accessallowed,
-		'sqlprotectagainstexternals'=>$sqlprotectagainstexternals,
-		'original_file'=>$original_file
+		'accessallowed' => ($accessallowed ? 1 : 0),
+		'sqlprotectagainstexternals' => $sqlprotectagainstexternals,
+		'original_file' => $original_file
 	);
 
 	return $ret;
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index efc9f60147c..683b4b49912 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -132,7 +132,7 @@ function facturefourn_prepare_head($object)
  * @param   Object	$object		Object related to tabs
  * @return  array				Array of tabs to show
  */
-function ordersupplier_prepare_head($object)
+function ordersupplier_prepare_head(CommandeFournisseur $object)
 {
 	global $db, $langs, $conf, $user;
 
@@ -159,6 +159,28 @@ function ordersupplier_prepare_head($object)
 		$langs->load("stocks");
 		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("OrderDispatch");
+
+		//If dispach process running we add the number of item to dispatch into the head
+		if (in_array($object->statut, array($object::STATUS_ORDERSENT, $object::STATUS_RECEIVED_PARTIALLY, $object::STATUS_RECEIVED_COMPLETELY))) {
+			$sumQtyAllreadyDispatched = 0;
+			$sumQtyOrdered = 0;
+
+			if (empty($object->lines)) {
+				$object->fetch_lines();
+			}
+			$nbLinesOrdered = count($object->lines);
+			$dispachedLines = $object->getDispachedLines(1);
+			$nbDispachedLines = count($dispachedLines);
+
+			for ($line = 0 ; $line < $nbDispachedLines; $line++) {
+				$sumQtyAllreadyDispatched = $sumQtyAllreadyDispatched + $dispachedLines[$line]['qty'];
+			}
+			for ($line = 0 ; $line < $nbLinesOrdered; $line++) {
+				$sumQtyOrdered = $sumQtyOrdered + $object->lines[$line]->qty;
+			}
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.price2num($sumQtyAllreadyDispatched, 'MS').' / '.price2num($sumQtyOrdered, 'MS').'</span>';
+		}
+
 		$head[$h][2] = 'dispatch';
 		$h++;
 	}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e891904e39e..0c7bb3f08dc 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -17,6 +17,7 @@
  * Copyright (C) 2019       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>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,25 +45,27 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 /**
  * Return dolibarr global constant string value
  * @param string $key key to return value, return '' if not set
+ * @param string $default value to return
  * @return string
  */
-function getDolGlobalString($key)
+function getDolGlobalString($key, $default = '')
 {
 	global $conf;
-	// return $conf->global->$key ?? '';
-	return (string) (empty($conf->global->$key) ? '' : $conf->global->$key);
+	// return $conf->global->$key ?? $default;
+	return (string) (empty($conf->global->$key) ? $default : $conf->global->$key);
 }
 
 /**
  * Return dolibarr global constant int value
  * @param string $key key to return value, return 0 if not set
+ * @param int $default value to return
  * @return int
  */
-function getDolGlobalInt($key)
+function getDolGlobalInt($key, $default = 0)
 {
 	global $conf;
-	// return $conf->global->$key ?? 0;
-	return (int) (empty($conf->global->$key) ? 0 : $conf->global->$key);
+	// return $conf->global->$key ?? $default;
+	return (int) (empty($conf->global->$key) ? $default : $conf->global->$key);
 }
 
 /**
@@ -104,7 +107,11 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
  */
 function getEntity($element, $shared = 1, $currentobject = null)
 {
-	global $conf, $mc;
+	global $conf, $mc, $hookmanager, $object, $action, $db;
+
+	if (! is_object($hookmanager)) {
+		$hookmanager = new HookManager($db);
+	}
 
 	// fix different element names (France to English)
 	switch ($element) {
@@ -117,7 +124,7 @@ function getEntity($element, $shared = 1, $currentobject = null)
 	}
 
 	if (is_object($mc)) {
-		return $mc->getEntity($element, $shared, $currentobject);
+		$out = $mc->getEntity($element, $shared, $currentobject);
 	} else {
 		$out = '';
 		$addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');
@@ -125,8 +132,27 @@ function getEntity($element, $shared = 1, $currentobject = null)
 			$out .= '0,';
 		}
 		$out .= ((int) $conf->entity);
-		return $out;
 	}
+
+	// Manipulate entities to query on the fly
+	$parameters = array(
+		'element' => $element,
+		'shared' => $shared,
+		'object' => $object,
+		'currentobject' => $currentobject,
+		'out' => $out
+	);
+	$reshook = $hookmanager->executeHooks('hookGetEntity', $parameters, $currentobject, $action); // Note that $action and $object may have been modified by some hooks
+
+	if (is_numeric($reshook)) {
+		if ($reshook == 0 && !empty($hookmanager->resPrint)) {
+			$out .= ','.$hookmanager->resPrint; // add
+		} elseif ($reshook == 1) {
+			$out = $hookmanager->resPrint; // replace
+		}
+	}
+
+	return $out;
 }
 
 /**
@@ -327,12 +353,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 {
@@ -422,10 +450,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
@@ -616,7 +646,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 	}
 
 	// Check rule
-	if (preg_match('/^array/', $check)) {	// If 'array' or 'array:restricthtml' or 'array:aZ09'
+	if (preg_match('/^array/', $check)) {	// If 'array' or 'array:restricthtml' or 'array:aZ09' or 'array:intcomma'
 		if (!is_array($out) || empty($out)) {
 			$out = array();
 		} else {
@@ -673,14 +703,11 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
  *
  *  @param  string  $paramname   Name of parameter to found
  *  @param	int		$method	     Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get)
- *  @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'
- *  @param	string	$noreplace   Force disable of replacement of __xxx__ strings.
  *  @return int                  Value found (int)
  */
-function GETPOSTINT($paramname, $method = 0, $filter = null, $options = null, $noreplace = 0)
+function GETPOSTINT($paramname, $method = 0)
 {
-	return (int) GETPOST($paramname, 'int', $method, $filter, $options, $noreplace);
+	return (int) GETPOST($paramname, 'int', $method, null, null, 0);
 }
 
 /**
@@ -760,7 +787,7 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 				// keep lines feed
 			}
 			break;
-		case 'alphawithlgt':		// No " and no ../ but we keep balanced < > tags with no special chars inside. Can be used for email string like "Name <email>"
+		case 'alphawithlgt':		// No " and no ../ but we keep balanced < > tags with no special chars inside. Can be used for email string like "Name <email>". Less secured than 'alphanohtml'
 			if (!is_array($out)) {
 				$out = trim($out);
 				do {
@@ -806,8 +833,9 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 				// We replace chars from a/A to z/Z encoded with numeric HTML entities with the real char so we won't loose the chars at the next step (preg_replace).
 				// No need to use a loop here, this step is not to sanitize (this is done at next step, this is to try to save chars, even if they are
 				// using a non coventionnel way to be encoded, to not have them sanitized just after)
-				$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', 'realCharForNumericEntities', $out);
-				//$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', function ($m) { return realCharForNumericEntities($m); }, $out);
+				//$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', 'realCharForNumericEntities', $out);
+				$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', function ($m) {
+					return realCharForNumericEntities($m); }, $out);
 
 
 				// Now we remove all remaining HTML entities starting with a number. We don't want such entities.
@@ -815,10 +843,10 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 
 				$out = dol_string_onlythesehtmltags($out, 0, 1, 1);
 
-				// We should also exclude non expected attributes
+				// We should also exclude non expected HTML attributes and clean content of some attributes.
 				if (!empty($conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES)) {
 					// Warning, the function may add a LF so we are forced to trim to compare with old $out without having always a difference and an infinit loop.
-					$out = trim(dol_string_onlythesehtmlattributes($out));
+					$out = dol_string_onlythesehtmlattributes($out);
 				}
 
 				// Restore entity &apos; into &#39; (restricthtml is for html content so we can use html entity)
@@ -1071,7 +1099,7 @@ function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1)
 	// List of special chars for filenames in windows are defined on page https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file
 	// Char '>' '<' '|' '$' and ';' are special chars for shells.
 	// Char '/' and '\' are file delimiters.
-	// -- car can be used into filename to inject special paramaters like --use-compress-program to make command with file as parameter making remote execution of command
+	// Chars '--' can be used into filename to inject special paramaters like --use-compress-program to make command with file as parameter making remote execution of command
 	$filesystem_forbidden_chars = array('<', '>', '/', '\\', '?', '*', '|', '"', ':', '°', '$', ';');
 	$tmp = dol_string_nospecial($unaccent ? dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);
 	$tmp = preg_replace('/\-\-+/', '_', $tmp);
@@ -1092,7 +1120,10 @@ function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1)
  */
 function dol_sanitizePathName($str, $newstr = '_', $unaccent = 1)
 {
-	$filesystem_forbidden_chars = array('<', '>', '?', '*', '|', '"', '°');
+	// List of special chars for filenames in windows are defined on page https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file
+	// Char '>' '<' '|' '$' and ';' are special chars for shells.
+	// Chars '--' can be used into filename to inject special paramaters like --use-compress-program to make command with file as parameter making remote execution of command
+	$filesystem_forbidden_chars = array('<', '>', '?', '*', '|', '"', '°', '$', ';');
 	$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);
@@ -1146,23 +1177,34 @@ function dol_sanitizeUrl($stringtoclean, $type = 1)
  */
 function dol_string_unaccent($str)
 {
+	global $conf;
+
 	if (utf8_check($str)) {
+		if (extension_loaded('intl') && !empty($conf->global->MAIN_UNACCENT_USE_TRANSLITERATOR)) {
+			$transliterator = \Transliterator::createFromRules(':: Any-Latin; :: Latin-ASCII; :: NFD; :: [:Nonspacing Mark:] Remove; :: NFC;', \Transliterator::FORWARD);
+			return $transliterator->transliterate($str);
+		}
 		// See http://www.utf8-chartable.de/
 		$string = rawurlencode($str);
 		$replacements = array(
 		'%C3%80' => 'A', '%C3%81' => 'A', '%C3%82' => 'A', '%C3%83' => 'A', '%C3%84' => 'A', '%C3%85' => 'A',
+		'%C3%87' => 'C',
 		'%C3%88' => 'E', '%C3%89' => 'E', '%C3%8A' => 'E', '%C3%8B' => 'E',
 		'%C3%8C' => 'I', '%C3%8D' => 'I', '%C3%8E' => 'I', '%C3%8F' => 'I',
+		'%C3%91' => 'N',
 		'%C3%92' => 'O', '%C3%93' => 'O', '%C3%94' => 'O', '%C3%95' => 'O', '%C3%96' => 'O',
+		'%C5%A0' => 'S',
 		'%C3%99' => 'U', '%C3%9A' => 'U', '%C3%9B' => 'U', '%C3%9C' => 'U',
+		'%C3%9D' => 'Y', '%C5%B8' => 'y',
 		'%C3%A0' => 'a', '%C3%A1' => 'a', '%C3%A2' => 'a', '%C3%A3' => 'a', '%C3%A4' => 'a', '%C3%A5' => 'a',
 		'%C3%A7' => 'c',
 		'%C3%A8' => 'e', '%C3%A9' => 'e', '%C3%AA' => 'e', '%C3%AB' => 'e',
 		'%C3%AC' => 'i', '%C3%AD' => 'i', '%C3%AE' => 'i', '%C3%AF' => 'i',
 		'%C3%B1' => 'n',
 		'%C3%B2' => 'o', '%C3%B3' => 'o', '%C3%B4' => 'o', '%C3%B5' => 'o', '%C3%B6' => 'o',
+		'%C5%A1' => 's',
 		'%C3%B9' => 'u', '%C3%BA' => 'u', '%C3%BB' => 'u', '%C3%BC' => 'u',
-		'%C3%BF' => 'y'
+		'%C3%BD' => 'y', '%C3%BF' => 'y'
 		);
 		$string = strtr($string, $replacements);
 		return rawurldecode($string);
@@ -1194,8 +1236,8 @@ function dol_string_unaccent($str)
  *
  *	@param	string			$str            	String to clean
  * 	@param	string			$newstr				String to replace forbidden chars with
- *  @param  array|string	$badcharstoreplace  List of forbidden characters to replace
- *  @param  array|string	$badcharstoremove   List of forbidden characters to remove
+ *  @param  array|string	$badcharstoreplace  Array of forbidden characters to replace. Use '' to keep default list.
+ *  @param  array|string	$badcharstoremove   Array of forbidden characters to remove. Use '' to keep default list.
  * 	@return string          					Cleaned string
  *
  * 	@see    		dol_sanitizeFilename(), dol_string_unaccent(), dol_string_nounprintableascii()
@@ -1285,9 +1327,9 @@ function dol_escape_json($stringtoescape)
  *  Returns text escaped for inclusion in HTML alt or title tags, or into values of HTML input fields.
  *
  *  @param      string		$stringtoescape			String to escape
- *  @param		int			$keepb					1=Keep b tags, 0=remove them completeley
+ *  @param		int			$keepb					1=Keep b tags, 0=remove them completely
  *  @param      int         $keepn              	1=Preserve \r\n strings (otherwise, replace them with escaped value). Set to 1 when escaping for a <textarea>.
- *  @param		string		$noescapetags			'' or 'common' or list of tags to not escape
+ *  @param		string		$noescapetags			'' or 'common' or list of tags to not escape. TODO Does not works yet when there is attributes to tag.
  *  @param		int			$escapeonlyhtmltags		1=Escape only html tags, not the special chars like accents.
  *  @return     string     				 			Escaped string
  *  @see		dol_string_nohtmltag(), dol_string_nospecial(), dol_string_unaccent()
@@ -1295,7 +1337,7 @@ function dol_escape_json($stringtoescape)
 function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapetags = '', $escapeonlyhtmltags = 0)
 {
 	if ($noescapetags == 'common') {
-		$noescapetags = 'html,body,a,b,em,i,u,ul,li,br,div,img,font,p,span,strong,table,tr,td,th,tbody';
+		$noescapetags = 'html,body,a,b,em,hr,i,u,ul,li,br,div,img,font,p,span,strong,table,tr,td,th,tbody';
 	}
 
 	// escape quotes and backslashes, newlines, etc.
@@ -1315,15 +1357,16 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 		return htmlspecialchars($tmp, ENT_COMPAT, 'UTF-8');
 	} else {
 		// Escape tags to keep
+		// TODO Does not works yet when there is attributes to tag
 		$tmparrayoftags = array();
 		if ($noescapetags) {
 			$tmparrayoftags = explode(',', $noescapetags);
 		}
-
 		if (count($tmparrayoftags)) {
 			foreach ($tmparrayoftags as $tagtoreplace) {
 				$tmp = str_ireplace('<'.$tagtoreplace.'>', '__BEGINTAGTOREPLACE'.$tagtoreplace.'__', $tmp);
 				$tmp = str_ireplace('</'.$tagtoreplace.'>', '__ENDTAGTOREPLACE'.$tagtoreplace.'__', $tmp);
+				$tmp = str_ireplace('<'.$tagtoreplace.' />', '__BEGINENDTAGTOREPLACE'.$tagtoreplace.'__', $tmp);
 			}
 		}
 
@@ -1333,6 +1376,7 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 			foreach ($tmparrayoftags as $tagtoreplace) {
 				$result = str_ireplace('__BEGINTAGTOREPLACE'.$tagtoreplace.'__', '<'.$tagtoreplace.'>', $result);
 				$result = str_ireplace('__ENDTAGTOREPLACE'.$tagtoreplace.'__', '</'.$tagtoreplace.'>', $result);
+				$result = str_ireplace('__BEGINENDTAGTOREPLACE'.$tagtoreplace.'__', '<'.$tagtoreplace.' />', $result);
 			}
 		}
 
@@ -1505,6 +1549,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 			// This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).
 			$data['ip'] = '???@'.$_SERVER['LOGNAME'];
 		}
+
 		// Loop on each log handler and send output
 		foreach ($conf->loghandlers as $loghandlerinstance) {
 			if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) {
@@ -1544,7 +1589,7 @@ function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $di
 	//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 .= '<!-- Add js code to open dialog popup on dialog -->';
-	$out .= '<script language="javascript">
+	$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).'")
@@ -1587,14 +1632,14 @@ function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0
 /**
  *  Show tabs of a record
  *
- *	@param	array	$links				Array of tabs
+ *	@param	array	$links				Array of tabs. Note that label into $links[$i][1] must be already HTML escaped.
  *	@param	string	$active     		Active tab name
  *	@param  string	$title      		Title
  *	@param  int		$notab				-1 or 0=Add tab header, 1=no tab header (if you set this to 1, using print dol_get_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after)
  * 	@param	string	$picto				Add a picto on tab title
  *	@param	int		$pictoisfullpath	If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto.
  *  @param	string	$morehtmlright		Add more html content on right of tabs title
- *  @param	string	$morecss			More Css
+ *  @param	string	$morecss			More CSS on the link <a>
  *  @param	int		$limittoshow		Limit number of tabs to show. Use 0 to use automatic default value.
  *  @param	string	$moretabssuffix		A suffix to use when you have several dol_get_fiche_head() in same page
  * 	@return	string
@@ -1625,7 +1670,11 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 		$limittitle = 30;
 		$out .= '<a class="tabTitle">';
 		if ($picto) {
-			$out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath, 0, 0, '', 'imgTabTitle').' ';
+			$noprefix = $pictoisfullpath;
+			if (strpos($picto, 'fontawesome_') !== false) {
+				$noprefix = 1;
+			}
+			$out .= img_picto($title, ($noprefix ? '' : 'object_').$picto, '', $pictoisfullpath, 0, 0, '', 'imgTabTitle').' ';
 		}
 		$out .= '<span class="tabTitleText">'.dol_escape_htmltag(dol_trunc($title, $limittitle)).'</span>';
 		$out .= '</a>';
@@ -1672,8 +1721,8 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 		}
 
 		if ($i < $limittoshow || $isactive) {
-			// Add a new entry
-			$out .= '<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((!$isactive && !empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '').'"><!-- id tab = '.(empty($links[$i][2]) ? '' : $links[$i][2]).' -->';
+			// Output entry with a visible tab
+			$out .= '<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((!$isactive && !empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '').'"><!-- id tab = '.(empty($links[$i][2]) ? '' : dol_escape_htmltag($links[$i][2])).' -->';
 
 			if (isset($links[$i][2]) && $links[$i][2] == 'image') {
 				if (!empty($links[$i][0])) {
@@ -1685,7 +1734,8 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 				//print "x $i $active ".$links[$i][2]." z";
 				$out .= '<div class="tab tab'.($isactive?'active':'unactive').'" style="margin: 0 !important">';
 				if (!empty($links[$i][0])) {
-					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$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 .= $links[$i][1];
 				if (!empty($links[$i][0])) {
@@ -1697,7 +1747,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 
 			$out .= '</div>';
 		} else {
-			// The popup with the other tabs
+			// Add entry into the combo popup with the other tabs
 			if (!$popuptab) {
 				$popuptab = 1;
 				$outmore .= '<div class="popuptabset wordwrap">'; // The css used to hide/show popup
@@ -1734,7 +1784,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 			$tabsname = str_replace("@", "", $picto);
 		}
 		$out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';
-		$out .= '<a href="#" class="tab moretab inline-block tabunactive"><span class="hideonsmartphone">'.$langs->trans("More").'</span>... ('.$nbintab.')</a>'; // Do not use "reposition" class in the "More".
+		$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;
 		$out .= '</div>';
@@ -1820,7 +1870,7 @@ function dol_get_fiche_end($notab = 0)
  */
 function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldid = 'rowid', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlstatus = '', $onlybanner = 0, $morehtmlright = '')
 {
-	global $conf, $form, $user, $langs;
+	global $conf, $form, $user, $langs, $hookmanager, $action;
 
 	$error = 0;
 
@@ -1857,7 +1907,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 
 	if ($object->element == 'product') {
 		$width = 80;
-		$cssclass = 'photoref';
+		$cssclass = 'photowithmargin photoref';
 		$showimage = $object->is_photo_available($conf->product->multidir_output[$entity]);
 		$maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);
 		if ($conf->browser->layout == 'phone') {
@@ -1959,7 +2009,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 						}
 					}
 				} elseif (!$phototoshow) { // example if modulepart = 'societe' or 'photo'
-					$phototoshow .= $form->showphoto($modulepart, $object, 0, 0, 0, 'photoref', 'small', 1, 0, $maxvisiblephotos);
+					$phototoshow .= $form->showphoto($modulepart, $object, 0, 0, 0, 'photowithmargin photoref', 'small', 1, 0, $maxvisiblephotos);
 				}
 
 				if ($phototoshow) {
@@ -1979,10 +2029,14 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 					$width = 14;
 					$cssclass = 'photorefcenter';
 					$picto = $object->picto;
+					$prefix = 'object_';
 					if ($object->element == 'project' && !$object->public) {
 						$picto = 'project'; // instead of projectpub
 					}
-					$nophoto = img_picto('No photo', 'object_'.$picto);
+					if (strpos($picto, 'fontawesome_') !== false) {
+						$prefix = '';
+					}
+					$nophoto = img_picto('No photo', $prefix.$picto);
 				}
 				$morehtmlleft .= '<!-- No photo to show -->';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
@@ -2091,6 +2145,17 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		$morehtmlref .= '</div>';
 	}
 
+	$parameters=array('morehtmlref'=>$morehtmlref);
+	$reshook = $hookmanager->executeHooks('formDolBanner', $parameters, $object, $action);
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	} elseif (empty($reshook)) {
+		$morehtmlref .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$morehtmlref = $hookmanager->resPrint;
+	}
+
+
 	print '<div class="'.($onlybanner ? 'arearefnobottom ' : 'arearef ').'heightref valignmiddle centpercent">';
 	print $form->showrefnav($object, $paramid, $morehtml, $shownav, $fieldid, $fieldref, $morehtmlref, $moreparam, $nodbprefix, $morehtmlleft, $morehtmlstatus, $morehtmlright);
 	print '</div>';
@@ -2157,7 +2222,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 	global $conf, $langs;
 
 	$ret = '';
-	$countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also MAIN_FORCE_STATE_INTO_ADDRESS
+	$countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR', 'CN'); // See also MAIN_FORCE_STATE_INTO_ADDRESS
 
 	// See format of addresses on https://en.wikipedia.org/wiki/Address
 	// Address
@@ -2165,7 +2230,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 		$ret .= ($extralangcode ? $object->array_languages['address'][$extralangcode] : (empty($object->address) ? '' : $object->address));
 	}
 	// Zip/Town/State
-	if (isset($object->country_code) && in_array($object->country_code, array('AU', 'CA', 'US')) || !empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)) {
+	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;
@@ -2380,7 +2445,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 	// Analyze date
 	$reg = array();
 	if (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg)) {	// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
-		dol_print_error("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"]);
+		dol_print_error('', "Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"]);
 		return '';
 	} elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg)) {    // Still available to solve problems in extrafields of type date
 		// This part of code should not be used anymore.
@@ -2829,15 +2894,15 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor
 		// Use dictionary definition for picto $dictsocialnetworks[$type]['icon']
 		$htmllink .= '<span class="fa paddingright '.($dictsocialnetworks[$type]['icon'] ? $dictsocialnetworks[$type]['icon'] : 'fa-link').'"></span>';
 		if ($type == 'skype') {
-			$htmllink .= $value;
+			$htmllink .= dol_escape_htmltag($value);
 			$htmllink .= '&nbsp;';
 			$htmllink .= '<a href="skype:';
-			$htmllink .= $value;
-			$htmllink .= '?call" alt="'.$langs->trans("Call").'&nbsp;'.$value.'" title="'.$langs->trans("Call").'&nbsp;'.$value.'">';
+			$htmllink .= dol_string_nospecial($value, '_', '', array('@'));
+			$htmllink .= '?call" alt="'.$langs->trans("Call").'&nbsp;'.$value.'" title="'.dol_escape_htmltag($langs->trans("Call").' '.$value).'">';
 			$htmllink .= '<img src="'.DOL_URL_ROOT.'/theme/common/skype_callbutton.png" border="0">';
 			$htmllink .= '</a><a href="skype:';
-			$htmllink .= $value;
-			$htmllink .= '?chat" alt="'.$langs->trans("Chat").'&nbsp;'.$value.'" title="'.$langs->trans("Chat").'&nbsp;'.$value.'">';
+			$htmllink .= dol_string_nospecial($value, '_', '', array('@'));
+			$htmllink .= '?chat" alt="'.$langs->trans("Chat").'&nbsp;'.$value.'" title="'.dol_escape_htmltag($langs->trans("Chat").' '.$value).'">';
 			$htmllink .= '<img class="paddingleft" src="'.DOL_URL_ROOT.'/theme/common/skype_chatbutton.png" border="0">';
 			$htmllink .= '</a>';
 			if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {
@@ -2851,9 +2916,9 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor
 		} else {
 			if (!empty($dictsocialnetworks[$type]['url'])) {
 				$link = str_replace('{socialid}', $value, $dictsocialnetworks[$type]['url']);
-				$htmllink .= '&nbsp;<a href="'.$link.'" target="_blank">'.$value.'</a>';
+				$htmllink .= '&nbsp;<a href="'.$link.'" target="_blank" rel="noopener noreferrer">'.dol_escape_htmltag($value).'</a>';
 			} else {
-				$htmllink .= $value;
+				$htmllink .= dol_escape_htmltag($value);
 			}
 		}
 		$htmllink .= '</div>';
@@ -2864,6 +2929,38 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor
 	return $htmllink;
 }
 
+/**
+ *	Format profIDs according to country
+ *
+ *	@param	string	$profID			Value of profID to format
+ *	@param	string	$profIDtype		Type of profID to format ('1', '2', '3', '4', '5', '6' or 'VAT')
+ *	@param	string	$countrycode	Country code to use for formatting
+ *	@param	int		$addcpButton	Add button to copy to clipboard (1 => show only on hoover ; 2 => always display )
+ * 	@param	string	$separ			Separation between numbers for a better visibility example : xxx xxx xxx xxxxx
+ *	@return string					Formated profID
+ */
+function dol_print_profids($profID, $profIDtype, $countrycode = '', $addcpButton = 1, $separ = '&nbsp;')
+{
+	global $mysoc;
+
+	if (empty($profID) || empty($profIDtype)) {
+		return '';
+	}
+	if (empty($countrycode))	$countrycode = $mysoc->country_code;
+	$newProfID = $profID;
+	$id = substr($profIDtype, -1);
+	$ret = '';
+	if (strtoupper($countrycode) == 'FR') {
+		// France
+		if ($id == 1 && dol_strlen($newProfID) == 9)	$newProfID = substr($newProfID, 0, 3).$separ.substr($newProfID, 3, 3).$separ.substr($newProfID, 6, 3);
+		if ($id == 2 && dol_strlen($newProfID) == 14)	$newProfID = substr($newProfID, 0, 3).$separ.substr($newProfID, 3, 3).$separ.substr($newProfID, 6, 3).$separ.substr($newProfID, 9, 5);
+		if ($profIDtype === 'VAT' && dol_strlen($newProfID) == 13)	$newProfID = substr($newProfID, 0, 4).$separ.substr($newProfID, 4, 3).$separ.substr($newProfID, 7, 3).$separ.substr($newProfID, 10, 3);
+	}
+	if (!empty($addcpButton))	$ret = showValueWithClipboardCPButton(dol_escape_htmltag($profID), ($addcpButton == 1 ? 1 : 0), $newProfID);
+	else $ret = $newProfID;
+	return $ret;
+}
+
 /**
  * 	Format phone numbers according to country
  *
@@ -2873,7 +2970,7 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor
  * 	@param 	int		$socid          Id of third party if known
  * 	@param 	string	$addlink	    ''=no link to create action, 'AC_TEL'=add link to clicktodial (if module enabled) and add link to create event (if conf->global->AGENDA_ADDACTIONFORPHONE set)
  * 	@param 	string	$separ 		    Separation between numbers for a better visibility example : xx.xx.xx.xx.xx
- *  @param	string  $withpicto      Show picto
+ *  @param	string  $withpicto      Show picto ('fax', 'phone', 'mobile')
  *  @param	string	$titlealt	    Text to show on alt
  *  @param  int     $adddivfloat    Add div float around phone.
  * 	@return string 				    Formated phone number
@@ -3096,11 +3193,18 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 								'__PASS__'=>$clicktodial_password);
 			$url = make_substitutions($url, $substitarray);
 			$newphonesav = $newphone;
-			$newphone = '<a href="'.$url.'"';
-			if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) {
-				$newphone .= ' target="_blank"';
+			if (empty($conf->global->CLICKTODIAL_DO_NOT_USE_AJAX_CALL)) {
+				// Default and recommended: New method using ajax without submiting a page making a javascript history.go(-1) back
+				$newphone = '<a href="'.$url.'" class="cssforclicktodial"';	// Call of ajax is handled by the lib_foot.js.php on class 'cssforclicktodial'
+				$newphone .= '>'.$newphonesav.'</a>';
+			} else {
+				// Old method
+				$newphone = '<a href="'.$url.'"';
+				if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) {
+					$newphone .= ' target="_blank" rel="noopener noreferrer"';
+				}
+				$newphone .= '>'.$newphonesav.'</a>';
 			}
-			$newphone .= '>'.$newphonesav.'</a>';
 		}
 
 		//if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
@@ -3549,6 +3653,7 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
  *                                  				Example: picto.png                  if picto.png is stored into htdocs/theme/mytheme/img
  *                                  				Example: picto.png@mymodule         if picto.png is stored into htdocs/mymodule/img
  *                                  				Example: /mydir/mysubdir/picto.png  if picto.png is stored into htdocs/mydir/mysubdir (pictoisfullpath must be set to 1)
+ *                                                  Example: fontawesome_envelope-open-text_fas_red_1em if you want to use fontaweseome icons: fontawesome_<icon-name>_<style>_<color>_<size> (only icon-name is mandatory)
  *	@param		string		$moreatt				Add more attribute on img tag (For example 'class="pictofixedwidth"')
  *	@param		boolean|int	$pictoisfullpath		If true or 1, image path is a full path
  *	@param		int			$srconly				Return only content of the src attribute of img.
@@ -3580,16 +3685,50 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		}
 	} else {
 		$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
+
+		if (strpos($pictowithouttext, 'fontawesome_') !== false) {
+			$pictowithouttext = explode('_', $pictowithouttext);
+			$marginleftonlyshort = 0;
+
+			$fakey      = 'fa-'.$pictowithouttext[1];
+			$fa         = $pictowithouttext[2] ? $pictowithouttext[2] : 'fa';
+			$facolor    = $pictowithouttext[3] ? $pictowithouttext[3] : '';
+			$fasize     = $pictowithouttext[4] ? $pictowithouttext[4] : '';
+
+			// This snippet only needed since function img_edit accepts only one additional parameter: no separate one for css only.
+			// class/style need to be extracted to avoid duplicate class/style validation errors when $moreatt is added to the end of the attributes.
+			$morestyle = '';
+			$reg = array();
+			if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {
+				$morecss .= ($morecss ? ' ' : '').$reg[1];
+				$moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
+			}
+			if (preg_match('/style="([^"]+)"/', $moreatt, $reg)) {
+				$morestyle = $reg[1];
+				$moreatt = str_replace('style="'.$reg[1].'"', '', $moreatt);
+			}
+			$moreatt = trim($moreatt);
+
+			$enabledisablehtml = '<span class="'.$fa.' '.$fakey.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? ' marginleftonlyshort' : ' marginleftonly') : '');
+			$enabledisablehtml .= ($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').($morestyle ? ' '.$morestyle : '').'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : '').'>';
+			/*if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$enabledisablehtml .= $titlealt;
+			}*/
+			$enabledisablehtml .= '</span>';
+
+			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', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'asset',
-				'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'bug', 'building',
-				'calendar', 'calendarmonth', 'calendarweek', 'calendarday', 'calendarperuser', 'calendarpertype',
+				'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',
 				'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'conversation', 'cron', 'cubes',
 				'multicurrency',
 				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',
-				'edit', 'ellipsis-h', 'email', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt',
+				'edit', 'ellipsis-h', 'email', 'entity', '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',
@@ -3597,67 +3736,69 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'label', 'language', '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', 'stock', 'resize', 'service', 'stats', 'trip',
-				'security', 'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
-				'github', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
+				'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',
+				'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',
-				'partnership', 'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'question', 'refresh', 'region',
+				'partnership', 'payment', 'payment_vat', 'pencil-ruler', 'preview', 'project', 'projectpub', 'projecttask', 'question', 'refresh', 'region',
 				'salary', 'shipment', 'state', 'supplier_invoice', 'supplier_invoicea', 'supplier_invoicer', 'supplier_invoiced',
 				'technic', 'ticket',
 				'error', 'warning',
 				'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'resource', 'recurring',
-				'shapes', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
+				'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', 'website', 'workstation',
+				'uncheck', 'user-cog', 'vat', 'website', 'workstation',
 				'conferenceorbooth', 'eventorganization'
 			))) {
 			$fakey = $pictowithouttext;
 			$facolor = '';
 			$fasize = '';
 			$fa = 'fas';
-			if (in_array($pictowithouttext, array('clock', 'establishment', 'generic', 'minus-square', 'object_generic', 'pdf', 'plus-square', 'timespent', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {
+			if (in_array($pictowithouttext, array('card', 'bell', 'clock', 'establishment', 'generic', 'minus-square', 'object_generic', 'pdf', 'plus-square', 'timespent', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {
 				$fa = 'far';
 			}
-			if (in_array($pictowithouttext, array('black-tie', 'github', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'stripe', 'stripe-s', 'youtube', 'google-plus-g', 'whatsapp'))) {
+			if (in_array($pictowithouttext, array('black-tie', 'github', 'google', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'stripe', 'stripe-s', 'youtube', 'google-plus-g', 'whatsapp'))) {
 				$fa = 'fab';
 			}
 
 			$arrayconvpictotofa = array(
-				'account'=>'university', 'accountline'=>'receipt', 'accountancy'=>'search-dollar', 'action'=>'calendar-alt', 'add'=>'plus-circle', 'address'=> 'address-book', 'asset'=>'money-check-alt', 'autofill'=>'fill',
+				'account'=>'university', 'accounting_account'=>'clipboard-list', 'accountline'=>'receipt', 'accountancy'=>'search-dollar', 'action'=>'calendar-alt', 'add'=>'plus-circle', 'address'=> 'address-book', 'asset'=>'money-check-alt', 'autofill'=>'fill',
 				'bank_account'=>'university',
 				'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'billr'=>'file-invoice-dollar', 'billd'=>'file-medical',
 				'supplier_invoice'=>'file-invoice-dollar', 'supplier_invoicea'=>'file-excel', 'supplier_invoicer'=>'file-invoice-dollar', 'supplier_invoiced'=>'file-medical',
 				'bom'=>'shapes',
-				'chart'=>'chart-line', 'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'collab'=>'people-arrows', 'conversation'=>'comments', 'country'=>'globe-americas', 'cron'=>'business-time',
+				'card'=>'address-card', 'chart'=>'chart-line', 'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'collab'=>'people-arrows', 'conversation'=>'comments', 'country'=>'globe-americas', 'cron'=>'business-time',
 				'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
 				'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',
 				'accounting'=>'search-dollar', 'category'=>'tag', 'dollyrevert'=>'dolly',
 				'generate'=>'plus-square', 'hrm'=>'user-tie', 'incoterm'=>'truck-loading',
 				'margin'=>'calculator', 'members'=>'user-friends', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
-				'email'=>'at', 'establishment'=>'building',
-				'edit'=>'pencil-alt', 'graph'=>'chart-line', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
+				'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',
 				'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', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star',
-				'bank'=>'university', 'close_title'=>'times', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',
-				'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarmonth'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
+				'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',
 				'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',
-				'partnership'=>'handshake', 'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
+				'partnership'=>'handshake', 'payment'=>'money-check-alt', 'payment_vat'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'puce'=>'angle-right',
 				'recent' => 'question', 'reception'=>'dolly', 'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
 				'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
 				'refresh'=>'redo', 'region'=>'map-marked', 'resource'=>'laptop-house', 'recurring'=>'history',
+				'service'=>'concierge-bell',
 				'state'=>'map-marked-alt', 'security'=>'key', 'salary'=>'wallet', 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'stripe'=>'stripe-s',
-				'supplier'=>'building', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
+				'supplier'=>'building', 'technic'=>'cogs',
 				'timespent'=>'clock', 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
 				'title_agenda'=>'calendar-alt',
-				'uncheck'=>'times', 'uparrow'=>'share', 'vcard'=>'address-card',
+				'uncheck'=>'times', 'uparrow'=>'share', 'vat'=>'money-check-alt', 'vcard'=>'address-card',
 				'jabber'=>'comment-o',
 				'website'=>'globe-americas', 'workstation'=>'pallet',
 				'conferenceorbooth'=>'chalkboard-teacher', 'eventorganization'=>'project-diagram'
@@ -3703,7 +3844,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			// Define $marginleftonlyshort
 			$arrayconvpictotomarginleftonly = array(
 				'bank', 'check', 'delete', 'generic', 'grip', 'grip_title', 'jabber',
-				'grip_title', 'grip', 'listlight', 'note', 'on', 'off', 'playdisabled', 'printer', 'resize', 'sign-out', 'stats', 'switch_on', 'switch_off',
+				'grip_title', 'grip', 'listlight', 'note', 'on', 'off', 'playdisabled', 'printer', 'resize', 'sign-out', 'stats', 'switch_on', 'switch_on_red', 'switch_off',
 				'uparrow', '1uparrow', '1downarrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected'
 			);
 			if (!isset($arrayconvpictotomarginleftonly[$pictowithouttext])) {
@@ -3712,7 +3853,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 			// Add CSS
 			$arrayconvpictotomorcess = array(
-				'action'=>'infobox-action', 'account'=>'infobox-bank_account', 'accountline'=>'infobox-bank_account', 'accountancy'=>'infobox-bank_account', 'asset'=>'infobox-bank_account',
+				'action'=>'infobox-action', 'account'=>'infobox-bank_account', 'accounting_account'=>'infobox-bank_account', 'accountline'=>'infobox-bank_account', 'accountancy'=>'infobox-bank_account', 'asset'=>'infobox-bank_account',
 				'bank_account'=>'bg-infobox-bank_account',
 				'bill'=>'infobox-commande', 'billa'=>'infobox-commande', 'billr'=>'infobox-commande', 'billd'=>'infobox-commande',
 				'margin'=>'infobox-bank_account', 'conferenceorbooth'=>'infobox-project',
@@ -3725,15 +3866,16 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'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',
+				'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', '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',
 				'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',
 				'supplier'=>'infobox-order_supplier', 'supplier_order'=>'infobox-order_supplier', 'supplier_proposal'=>'infobox-supplier_proposal',
 				'ticket'=>'infobox-contrat', 'title_accountancy'=>'infobox-bank_account', 'title_hrm'=>'infobox-holiday', 'expensereport'=>'infobox-expensereport', 'trip'=>'infobox-expensereport', 'title_agenda'=>'infobox-action',
+				'vat'=>'infobox-bank_account',
 				//'title_setup'=>'infobox-action', 'tools'=>'infobox-action',
 				'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode'
 			);
@@ -3753,7 +3895,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'other'=>'#ddd',
 				'partnership'=>'#6c6aa8', 'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'reception'=>'#a69944', 'resize'=>'#444', 'rss'=>'#cba',
 				//'shipment'=>'#a69944',
-				'security'=>'#999', 'stats'=>'#444', 'switch_off'=>'#999', 'technic'=>'#999', 'timespent'=>'#555',
+				'security'=>'#999', 'square'=>'#888', 'stop-circle'=>'#888', 'stats'=>'#444', 'switch_off'=>'#999', 'technic'=>'#999', 'timespent'=>'#555',
 				'uncheck'=>'#800', 'uparrow'=>'#555', 'user-cog'=>'#999', 'country'=>'#aaa', 'globe-americas'=>'#aaa', 'region'=>'#aaa', 'state'=>'#aaa',
 				'website'=>'#304', 'workstation'=>'#a69944'
 			);
@@ -3825,7 +3967,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		return $fullpathpicto;
 	}
 		// tag title is used for tooltip on <a>, tag alt can be used with very simple text on image for blind people
-	return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt.($morecss ? ' class="'.$morecss.'"' : '') : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup
+	return '<img src="'.$fullpathpicto.'"'.($notitle ? '' : ' alt="'.dol_escape_htmltag($alt).'"').(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt.($morecss ? ' class="'.$morecss.'"' : '') : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup
 }
 
 /**
@@ -3885,10 +4027,11 @@ function img_weather($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $mo
  *	@param      string		$picto       		Name of image file to show (If no extension provided, we use '.png'). Image must be stored into htdocs/theme/common directory.
  *	@param		string		$moreatt			Add more attribute on img tag
  *	@param		int			$pictoisfullpath	If 1, image path is a full path
+ *  @param		int			$notitle			1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
  *	@return     string      					Return img tag
  *  @see        img_object(), img_picto()
  */
-function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0)
+function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $notitle = 0)
 {
 	global $conf;
 
@@ -3910,7 +4053,7 @@ function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0
 		}
 	}
 
-	return img_picto($titlealt, $path, $moreatt, 1);
+	return img_picto($titlealt, $path, $moreatt, 1, 0, $notitle);
 }
 
 /**
@@ -4368,7 +4511,7 @@ function img_mime($file, $titlealt = '', $morecss = '')
 	}
 
 	//return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');
-	return '<i class="fa fa-'.$mimefa.' paddingright"'.($titlealt ? ' title="'.$titlealt.'"' : '').'></i>';
+	return '<i class="fa fa-'.$mimefa.' paddingright'.($morecss ? ' '.$morecss : '').'"'.($titlealt ? ' title="'.$titlealt.'"' : '').'></i>';
 }
 
 
@@ -4444,8 +4587,8 @@ function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss
 		$result = ($nodiv ? '' : '<div class="'.$class.' hideonsmartphone'.($morecss ? ' '.$morecss : '').($textfordropdown ? ' hidden' : '').'">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> '.$text.($nodiv ? '' : '</div>');
 
 		if ($textfordropdown) {
-			$tmpresult .= '<span class="'.$class.'text opacitymedium cursorpointer">'.$langs->trans($textfordropdown).' '.img_picto($langs->trans($textfordropdown), '1downarrow').'</span>';
-			$tmpresult .= '<script type="text/javascript" language="javascript">
+			$tmpresult = '<span class="'.$class.'text opacitymedium cursorpointer">'.$langs->trans($textfordropdown).' '.img_picto($langs->trans($textfordropdown), '1downarrow').'</span>';
+			$tmpresult .= '<script type="text/javascript">
 				jQuery(document).ready(function() {
 					jQuery(".'.$class.'text").click(function() {
 						console.log("toggle text");
@@ -4467,7 +4610,7 @@ function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss
  *  This function must be called when a blocking technical error is encountered.
  *  However, one must try to call it only within php pages, classes must return their error through their property "error".
  *
- *	@param	 	DoliDB          $db      	Database handler
+ *	@param	 	DoliDB|string   $db      	Database handler
  *	@param  	string|string[] $error		String or array of errors strings to show
  *  @param		array           $errors		Array of errors
  *	@return 	void
@@ -4493,7 +4636,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 
 	if ($_SERVER['DOCUMENT_ROOT']) {    // Mode web
 		$out .= $langs->trans("DolibarrHasDetectedError").".<br>\n";
-		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') > 0) {
 			$out .= "You use an experimental or develop level of features, so please do NOT report any bugs or vulnerability, except if problem is confirmed after moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
 		}
 		$out .= $langs->trans("InformationToHelpDiagnose").":<br>\n";
@@ -4501,7 +4644,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 		$out .= "<b>".$langs->trans("Date").":</b> ".dol_print_date(time(), 'dayhourlog')."<br>\n";
 		$out .= "<b>".$langs->trans("Dolibarr").":</b> ".DOL_VERSION." - https://www.dolibarr.org<br>\n";
 		if (isset($conf->global->MAIN_FEATURES_LEVEL)) {
-			$out .= "<b>".$langs->trans("LevelOfFeature").":</b> ".dol_htmlentities($conf->global->MAIN_FEATURES_LEVEL, ENT_COMPAT)."<br>\n";
+			$out .= "<b>".$langs->trans("LevelOfFeature").":</b> ".getDolGlobalInt('MAIN_FEATURES_LEVEL')."<br>\n";
 		}
 		if (function_exists("phpversion")) {
 			$out .= "<b>".$langs->trans("PHP").":</b> ".phpversion()."<br>\n";
@@ -4712,6 +4855,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 	if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./", "", $field1))) {
 		$liste_titre = 'liste_titre_sel';
 	}
+
 	$out .= '<'.$tag.' class="'.$prefix.$liste_titre.'" '.$moreattrib;
 	//$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:&;]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
 	$out .= ($name && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && empty($forcenowrapcolumntitle) && !dol_textishtml($name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '';
@@ -4746,7 +4890,6 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 		//$out .= (empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
 		$out .= '>';
 	}
-
 	if ($tooltip) {
 		// You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 		$tmptooltip = explode(':', $tooltip);
@@ -4795,7 +4938,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
  *	Show a title.
  *
  *	@param	string	$title			Title to show
- *	@return	string					Title to show
+ *  @return	void
  *  @deprecated						Use load_fiche_titre instead
  *  @see load_fiche_titre()
  */
@@ -4975,7 +5118,6 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 					if ($cpt == $page) {
 						$pagelist .= '<li class="pagination"><input type="text" class="width25 center pageplusone" name="pageplusone" value="'.($page + 1).'"></li>';
 						$pagelist .= '/';
-						//if (($cpt + 1) < $nbpages) $pagelist .= '/';
 					}
 				} else {
 					if ($cpt == $page) {
@@ -4998,9 +5140,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 				}
 			} else {
 				//var_dump($page.' '.$cpt.' '.$nbpages);
-				//if (($page + 1) < $nbpages) {
-					$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';
-				//}
+				$pagelist .= '<li class="pagination paginationlastpage"><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';
 			}
 		} else {
 			$pagelist .= '<li class="pagination"><span class="active">'.($page + 1)."</li>";
@@ -5160,16 +5300,16 @@ function vatrate($rate, $addpercent = false, $info_bits = 0, $usestarfornpr = 0)
  *		Function to format a value into an amount for visual output
  *		Function used into PDF and HTML pages
  *
- *		@param	float		$amount			Amount to format
- *		@param	integer		$form			Type of format, HTML or not (not by default)
- *		@param	Translate	$outlangs		Object langs for output
- *		@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)
- *		@param	string		$currency_code	To add currency symbol (''=add nothing, 'auto'=Use default currency, 'XXX'=add currency symbols for XXX currency)
- *		@return	string						Chaine avec montant formate
+ *		@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	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)
+ *		@param	string				$currency_code	To add currency symbol (''=add nothing, 'auto'=Use default currency, 'XXX'=add currency symbols for XXX currency)
+ *		@return	string								String with formated amount
  *
- *		@see	price2num()					Revert function of price
+ *		@see	price2num()							Revert function of price
  */
 function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $forcerounding = -1, $currency_code = '')
 {
@@ -5275,10 +5415,13 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
  *      		                            'CT'=Round to Max for totals with Tax of foreign currency accuracy
  *											Numeric = Nb of digits for rounding (For example 2 for a percentage)
  * 	@param	int				$option			Put 1 if you know that content is already universal format number (so no correction on decimal will be done)
- * 											Put 2 if you know that number is a user input (so we know we don't have to fix decimal separator).
+ * 											Put 2 if you know that number is a user input (so we know we have to fix decimal separator).
  *	@return	string							Amount with universal numeric format (Example: '99.99999').
- *											If conversion fails, it return text unchanged if ($rounding = '' and $option = 1) or '0' if ($rounding is defined and $option = 1).
- *											If amount is null or '', it returns '' if $rounding = '' or '0' if $rounding is defined..
+ *											If conversion fails to return a numeric, it returns:
+ *											- text unchanged or partial if ($rounding = ''): price2num('W9ç', '', 0)   => '9ç', price2num('W9ç', '', 1)   => 'W9ç', price2num('W9ç', '', 2)   => '9ç'
+ *											- '0' if ($rounding is defined):                 price2num('W9ç', 'MT', 0) => '9',  price2num('W9ç', 'MT', 1) => '0',   price2num('W9ç', 'MT', 2) => '9'
+ *											Note: The best way to guarantee a numeric value is to add a cast (float) before the price2num().
+ *											If amount is null or '', it returns '' if $rounding = '' or '0' if $rounding is defined.
  *
  *	@see    price()							Opposite function of price2num
  */
@@ -5395,15 +5538,16 @@ function price2num($amount, $rounding = '', $option = 0)
 /**
  * Output a dimension with best unit
  *
- * @param   float       $dimension      Dimension
- * @param   int         $unit           Unit scale of dimension (Example: 0=kg, -3=g, -6=mg, 98=ounce, 99=pound, ...)
- * @param   string      $type           'weight', 'volume', ...
- * @param   Translate   $outputlangs    Translate language object
- * @param   int         $round          -1 = non rounding, x = number of decimal
+ * @param   float       $dimension      	Dimension
+ * @param   int         $unit           	Unit scale of dimension (Example: 0=kg, -3=g, -6=mg, 98=ounce, 99=pound, ...)
+ * @param   string      $type           	'weight', 'volume', ...
+ * @param   Translate   $outputlangs    	Translate language object
+ * @param   int         $round          	-1 = non rounding, x = number of decimal
  * @param   string      $forceunitoutput    'no' or numeric (-3, -6, ...) compared to $unit (In most case, this value is value defined into $conf->global->MAIN_WEIGHT_DEFAULT_UNIT)
- * @return  string                      String to show dimensions
+ * @param	int			$use_short_label	1=Use short label ('g' instead of 'gram'). Short labels are not translated.
+ * @return  string                      	String to show dimensions
  */
-function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round = -1, $forceunitoutput = 'no')
+function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round = -1, $forceunitoutput = 'no', $use_short_label = 0)
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 
@@ -5433,7 +5577,8 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round
 		$unit = $forceunitoutput;
 	}*/
 
-	$ret = price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuringUnitString(0, $type, $unit);
+	$ret = price($dimension, 0, $outputlangs, 0, 0, $round);
+	$ret .= ' '.measuringUnitString(0, $type, $unit, $use_short_label, $outputlangs);
 
 	return $ret;
 }
@@ -5825,7 +5970,7 @@ function get_product_vat_for_country($idprod, $thirdpartytouse, $idprodfournpric
 						$ret .= ' ('.$obj->default_vat_code.')';
 					}
 				}
-				$db->free($sql);
+				$db->free($resql);
 			} else {
 				dol_print_error($db);
 			}
@@ -6142,7 +6287,7 @@ function yn($yesno, $case = 1, $color = 0)
 		}
 	}
 	if ($color) {
-		return '<font class="'.$classname.'">'.$result.'</font>';
+		return '<span class="'.$classname.'">'.$result.'</span>';
 	}
 	return $result;
 }
@@ -6409,7 +6554,8 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1,
 
 /**
  *	Clean a string from some undesirable HTML tags.
- *  Note. Not as secured as dol_string_onlythesehtmltags().
+ *  Note: Complementary to dol_string_onlythesehtmltags().
+ *  This method is used for example when option MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES is set to 1.
  *
  *	@param	string	$stringtoclean			String to clean
  *  @param	array	$allowed_attributes		Array of tags not allowed
@@ -6420,16 +6566,35 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1,
 function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes = array("allow", "allowfullscreen", "alt", "class", "contenteditable", "data-html", "frameborder", "height", "href", "id", "name", "src", "style", "target", "title", "width"))
 {
 	if (class_exists('DOMDocument') && !empty($stringtoclean)) {
-		$stringtoclean = '<html><body>'.$stringtoclean.'</body></html>';
+		$stringtoclean = '<?xml encoding="UTF-8"><html><body>'.$stringtoclean.'</body></html>';
 
-		$dom = new DOMDocument();
+		$dom = new DOMDocument(null, 'UTF-8');
 		$dom->loadHTML($stringtoclean, LIBXML_ERR_NONE|LIBXML_HTML_NOIMPLIED|LIBXML_HTML_NODEFDTD|LIBXML_NONET|LIBXML_NOWARNING|LIBXML_NOXMLDECL);
+
 		if (is_object($dom)) {
 			for ($els = $dom->getElementsByTagname('*'), $i = $els->length - 1; $i >= 0; $i--) {
 				for ($attrs = $els->item($i)->attributes, $ii = $attrs->length - 1; $ii >= 0; $ii--) {
-					// Delete attribute if not into allowed_attributes
-					if (! empty($attrs->item($ii)->name) && ! in_array($attrs->item($ii)->name, $allowed_attributes)) {
-						$els->item($i)->removeAttribute($attrs->item($ii)->name);
+					//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)) {
+							$els->item($i)->removeAttribute($attrs->item($ii)->name);
+						} elseif (in_array($attrs->item($ii)->name, array('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);
+
+							$attrs->item($ii)->value = $valuetoclean;
+						}
 					}
 				}
 			}
@@ -6438,9 +6603,10 @@ function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes
 		$return = $dom->saveHTML();
 		//$return = '<html><body>aaaa</p>bb<p>ssdd</p>'."\n<p>aaa</p>aa<p>bb</p>";
 
-		$return = preg_replace('/^<html><body>/', '', $return);
-		$return = preg_replace('/<\/body><\/html>$/', '', $return);
-		return $return;
+		$return = preg_replace('/^'.preg_quote('<?xml encoding="UTF-8">', '/').'/', '', $return);
+		$return = preg_replace('/^'.preg_quote('<html><body>', '/').'/', '', $return);
+		$return = preg_replace('/'.preg_quote('</body></html>', '/').'$/', '', $return);
+		return trim($return);
 	} else {
 		return $stringtoclean;
 	}
@@ -6613,7 +6779,8 @@ function dol_htmlentitiesbr_decode($stringtodecode, $pagecodeto = 'UTF-8')
  */
 function dol_htmlcleanlastbr($stringtodecode)
 {
-	$ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|'."\n".'|'."\r".')+$/i', "", $stringtodecode);
+	$ret = preg_replace('/&nbsp;$/i', "", $stringtodecode);		// Because wysiwyg editor may add a &nbsp; at end of last line
+	$ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|'."\n".'|'."\r".')+$/i', "", $ret);
 	return $ret;
 }
 
@@ -6649,7 +6816,7 @@ function dol_html_entity_decode($a, $b, $c = 'UTF-8', $keepsomeentities = 0)
  * @param   bool    $double_encode  When double_encode is turned off, PHP will not encode existing html entities
  * @return  string  $ret            Encoded string
  */
-function dol_htmlentities($string, $flags = null, $encoding = 'UTF-8', $double_encode = false)
+function dol_htmlentities($string, $flags = ENT_QUOTES|ENT_SUBSTITUTE, $encoding = 'UTF-8', $double_encode = false)
 {
 	return htmlentities($string, $flags, $encoding, $double_encode);
 }
@@ -6865,10 +7032,15 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				'__USER_ID__' => (string) $user->id,
 				'__USER_LOGIN__' => (string) $user->login,
 				'__USER_EMAIL__' => (string) $user->email,
+				'__USER_PHONE__' => (string) dol_print_phone($user->office_phone),
+				'__USER_PHONEPRO__' => (string) dol_print_phone($user->user_mobile),
+				'__USER_PHONEMOBILE__' => (string) dol_print_phone($user->personal_mobile),
+				'__USER_FAX__' => (string) $user->office_fax,
 				'__USER_LASTNAME__' => (string) $user->lastname,
 				'__USER_FIRSTNAME__' => (string) $user->firstname,
 				'__USER_FULLNAME__' => (string) $user->getFullName($outputlangs),
 				'__USER_SUPERVISOR_ID__' => (string) ($user->fk_user ? $user->fk_user : '0'),
+				'__USER_JOB__' => (string) $user->job,
 				'__USER_REMOTE_IP__' => (string) getUserRemoteIP()
 				));
 		}
@@ -6877,8 +7049,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		$substitutionarray = array_merge($substitutionarray, array(
 			'__MYCOMPANY_NAME__'    => $mysoc->name,
 			'__MYCOMPANY_EMAIL__'   => $mysoc->email,
-			'__MYCOMPANY_PHONE__'   => $mysoc->phone,
-			'__MYCOMPANY_FAX__'     => $mysoc->fax,
+			'__MYCOMPANY_PHONE__'   => dol_print_phone($mysoc->phone),
+			'__MYCOMPANY_FAX__'     => dol_print_phone($mysoc->fax),
 			'__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
 			'__MYCOMPANY_PROFID2__' => $mysoc->idprof2,
 			'__MYCOMPANY_PROFID3__' => $mysoc->idprof3,
@@ -6901,6 +7073,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		if ($onlykey) {
 			$substitutionarray['__ID__'] = '__ID__';
 			$substitutionarray['__REF__'] = '__REF__';
+			$substitutionarray['__NEWREF__'] = '__NEWREF__';
 			$substitutionarray['__REF_CLIENT__'] = '__REF_CLIENT__';
 			$substitutionarray['__REF_SUPPLIER__'] = '__REF_SUPPLIER__';
 			$substitutionarray['__NOTE_PUBLIC__'] = '__NOTE_PUBLIC__';
@@ -6938,6 +7111,19 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				/*$substitutionarray['__MEMBER_NOTE_PUBLIC__'] = '__MEMBER_NOTE_PUBLIC__';
 				$substitutionarray['__MEMBER_NOTE_PRIVATE__'] = '__MEMBER_NOTE_PRIVATE__';*/
 			}
+			// add variables subtitutions ticket
+			if (!empty($conf->ticket->enabled) && (!is_object($object) || $object->element == 'ticket')) {
+				$substitutionarray['__TICKET_TRACKID__'] = '__TICKET_TRACKID__';
+				$substitutionarray['__TICKET_SUBJECT__'] = '__TICKET_SUBJECT__';
+				$substitutionarray['__TICKET_TYPE__'] = '__TICKET_TYPE__';
+				$substitutionarray['__TICKET_SEVERITY__'] = '__TICKET_SEVERITY__';
+				$substitutionarray['__TICKET_CATEGORY__'] = '__TICKET_CATEGORY__';
+				$substitutionarray['__TICKET_ANALYTIC_CODE__'] = '__TICKET_ANALYTIC_CODE__';
+				$substitutionarray['__TICKET_MESSAGE__'] = '__TICKET_MESSAGE__';
+				$substitutionarray['__TICKET_PROGRESSION__'] = '__TICKET_PROGRESSION__';
+				$substitutionarray['__TICKET_USER_ASSIGN__'] = '__TICKET_USER_ASSIGN__';
+			}
+
 			if (!empty($conf->recruitment->enabled) && (!is_object($object) || $object->element == 'candidature')) {
 				$substitutionarray['__CANDIDATE_FULLNAME__'] = '__CANDIDATE_FULLNAME__';
 				$substitutionarray['__CANDIDATE_FIRSTNAME__'] = '__CANDIDATE_FIRSTNAME__';
@@ -6981,6 +7167,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		} else {
 			$substitutionarray['__ID__'] = $object->id;
 			$substitutionarray['__REF__'] = $object->ref;
+			$substitutionarray['__NEWREF__'] = $object->newref;
 			$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);
@@ -7024,9 +7211,9 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__MEMBER_PHOTO__'] = (isset($object->photo) ? $object->photo : '');
 				$substitutionarray['__MEMBER_LOGIN__'] = (isset($object->login) ? $object->login : '');
 				$substitutionarray['__MEMBER_PASSWORD__'] = (isset($object->pass) ? $object->pass : '');
-				$substitutionarray['__MEMBER_PHONE__'] = (isset($object->phone) ? $object->phone : '');
-				$substitutionarray['__MEMBER_PHONEPRO__'] = (isset($object->phone_perso) ? $object->phone_perso : '');
-				$substitutionarray['__MEMBER_PHONEMOBILE__'] = (isset($object->phone_mobile) ? $object->phone_mobile : '');
+				$substitutionarray['__MEMBER_PHONE__'] = (isset($object->phone) ? dol_print_phone($object->phone) : '');
+				$substitutionarray['__MEMBER_PHONEPRO__'] = (isset($object->phone_perso) ? dol_print_phone($object->phone_perso) : '');
+				$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');
@@ -7043,8 +7230,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__THIRDPARTY_CODE_CLIENT__'] = (is_object($object) ? $object->code_client : '');
 				$substitutionarray['__THIRDPARTY_CODE_FOURNISSEUR__'] = (is_object($object) ? $object->code_fournisseur : '');
 				$substitutionarray['__THIRDPARTY_EMAIL__'] = (is_object($object) ? $object->email : '');
-				$substitutionarray['__THIRDPARTY_PHONE__'] = (is_object($object) ? $object->phone : '');
-				$substitutionarray['__THIRDPARTY_FAX__'] = (is_object($object) ? $object->fax : '');
+				$substitutionarray['__THIRDPARTY_PHONE__'] = (is_object($object) ? dol_print_phone($object->phone) : '');
+				$substitutionarray['__THIRDPARTY_FAX__'] = (is_object($object) ? dol_print_phone($object->fax) : '');
 				$substitutionarray['__THIRDPARTY_ADDRESS__'] = (is_object($object) ? $object->address : '');
 				$substitutionarray['__THIRDPARTY_ZIP__'] = (is_object($object) ? $object->zip : '');
 				$substitutionarray['__THIRDPARTY_TOWN__'] = (is_object($object) ? $object->town : '');
@@ -7066,8 +7253,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__THIRDPARTY_CODE_CLIENT__'] = (is_object($object->thirdparty) ? $object->thirdparty->code_client : '');
 				$substitutionarray['__THIRDPARTY_CODE_FOURNISSEUR__'] = (is_object($object->thirdparty) ? $object->thirdparty->code_fournisseur : '');
 				$substitutionarray['__THIRDPARTY_EMAIL__'] = (is_object($object->thirdparty) ? $object->thirdparty->email : '');
-				$substitutionarray['__THIRDPARTY_PHONE__'] = (is_object($object->thirdparty) ? $object->thirdparty->phone : '');
-				$substitutionarray['__THIRDPARTY_FAX__'] = (is_object($object->thirdparty) ? $object->thirdparty->fax : '');
+				$substitutionarray['__THIRDPARTY_PHONE__'] = (is_object($object->thirdparty) ? dol_print_phone($object->thirdparty->phone) : '');
+				$substitutionarray['__THIRDPARTY_FAX__'] = (is_object($object->thirdparty) ? dol_print_phone($object->thirdparty->fax) : '');
 				$substitutionarray['__THIRDPARTY_ADDRESS__'] = (is_object($object->thirdparty) ? $object->thirdparty->address : '');
 				$substitutionarray['__THIRDPARTY_ZIP__'] = (is_object($object->thirdparty) ? $object->thirdparty->zip : '');
 				$substitutionarray['__THIRDPARTY_TOWN__'] = (is_object($object->thirdparty) ? $object->thirdparty->town : '');
@@ -7126,6 +7313,28 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
 				$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
 			}
+			// add substition variable for ticket
+			if (is_object($object) && $object->element == 'ticket') {
+				$substitutionarray['__TICKET_TRACKID__'] = $object->track_id;
+				$substitutionarray['__REF__'] = $object->ref;
+				$substitutionarray['__TICKET_SUBJECT__'] = $object->subject;
+				$substitutionarray['__TICKET_TYPE__'] = $object->type_code;
+				$substitutionarray['__TICKET_SEVERITY__'] = $object->severity_code;
+				$substitutionarray['__TICKET_CATEGORY__'] = $object->category_code; // For backward compatibility
+				$substitutionarray['__TICKET_ANALYTIC_CODE__'] = $object->category_code;
+				$substitutionarray['__TICKET_MESSAGE__'] = $object->message;
+				$substitutionarray['__TICKET_PROGRESSION__'] = $object->progress;
+				$userstat = new User($db);
+				if ($object->fk_user_assign > 0) {
+					$userstat->fetch($object->fk_user_assign);
+					$substitutionarray['__TICKET_USER_ASSIGN__'] = dolGetFirstLastname($userstat->firstname, $userstat->lastname);
+				}
+
+				if ($object->fk_user_create > 0) {
+					$userstat->fetch($object->fk_user_create);
+					$substitutionarray['__USER_CREATE__'] = dolGetFirstLastname($userstat->firstname, $userstat->lastname);
+				}
+			}
 
 			// Create dynamic tags for __EXTRAFIELD_FIELD__
 			if ($object->table_element && $object->id > 0) {
@@ -7148,6 +7357,11 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour', 'tzserver', $outputlangs) : '');
 								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_DAY_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'day', 'tzserver', $outputlangs) : '');
 								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_RFC__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhourrfc') : '');
+							} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'phone') {
+								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = dol_print_phone($object->array_options['options_'.$key]);
+							} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'price') {
+								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = $object->array_options['options_'.$key];
+								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_FORMATED__'] = price($object->array_options['options_'.$key]);
 							}
 						}
 					}
@@ -7183,6 +7397,9 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__ONLINE_PAYMENT_TEXT_AND_URL__'] = ($paymenturl ?str_replace('\n', "\n", $outputlangs->trans("PredefinedMailContentLink", $paymenturl)) : '');
 				$substitutionarray['__ONLINE_PAYMENT_URL__'] = $paymenturl;
 
+				if (is_object($object) && $object->element == 'propal') {
+					$substitutionarray['__ONLINE_SIGN_URL__'] = getOnlineSignatureUrl(0, 'proposal', $object->ref);
+				}
 				if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal') {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);
 				} else {
@@ -7224,6 +7441,9 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				if (is_object($object) && $object->element == 'supplier_proposal') {
 					$substitutionarray['__URL_SUPPLIER_PROPOSAL__'] = DOL_MAIN_URL_ROOT."/supplier_proposal/card.php?id=".$object->id;
 				}
+				if (is_object($object) && $object->element == 'shipping') {
+					$substitutionarray['__URL_SHIPMENT__'] = DOL_MAIN_URL_ROOT."/expedition/card.php?id=".$object->id;
+				}
 			}
 
 			if (is_object($object) && $object->element == 'action') {
@@ -8074,19 +8294,19 @@ function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid =
 /**
  * Verify if condition in string is ok or not
  *
- * @param 	string		$strRights		String with condition to check
- * @return 	boolean						True or False. Return True if strRights is ''
+ * @param 	string		$strToEvaluate	String with condition to check
+ * @return 	boolean						True or False. Note: It returns True if $strToEvaluate is ''
  */
-function verifCond($strRights)
+function verifCond($strToEvaluate)
 {
 	global $user, $conf, $langs;
 	global $leftmenu;
 	global $rights; // To export to dol_eval function
 
-	//print $strRights."<br>\n";
+	//print $strToEvaluate."<br>\n";
 	$rights = true;
-	if (isset($strRights) && $strRights !== '') {
-		$str = 'if(!('.$strRights.')) { $rights = false; }';
+	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
 	}
 	return $rights;
@@ -8118,16 +8338,20 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
 		return 'Bad string syntax to evaluate: '.$s;
 	}
 
-	// We block using of php exec or php file functions
-	$forbiddenphpstrings = array("exec(", "passthru(", "shell_exec(", "system(", "proc_open(", "popen(", "eval(", "dol_eval(", "executeCLI(");
-	$forbiddenphpstrings = array_merge($forbiddenphpstrings, array("fopen(", "file_put_contents(", "fputs(", "fputscsv(", "fwrite(", "fpassthru(", "unlink(", "mkdir(", "rmdir(", "symlink(", "touch(", "umask("));
-	$forbiddenphpstrings = array_merge($forbiddenphpstrings, array('function(', '$$', 'call_user_func('));
+	// We block use of php exec or php file functions
+	$forbiddenphpstrings = array('$$');
 	$forbiddenphpstrings = array_merge($forbiddenphpstrings, array('_ENV', '_SESSION', '_COOKIE', '_GET', '_POST', '_REQUEST'));
-	$forbiddenphpregex = 'global\s+\$';
+
+	$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_merge($forbiddenphpfunctions, array("function", "call_user_func"));
+
+	$forbiddenphpregex = 'global\s+\$|\b('.implode('|', $forbiddenphpfunctions).')\b';
+
 	do {
 		$oldstringtoclean = $s;
 		$s = str_ireplace($forbiddenphpstrings, '__forbiddenstring__', $s);
-		$s = preg_replace('/'.$forbiddenphpregex.'/', '__forbiddenstring__', $s);
+		$s = preg_replace('/'.$forbiddenphpregex.'/i', '__forbiddenstring__', $s);
 		//$s = preg_replace('/\$[a-zA-Z0-9_\->\$]+\(/i', '', $s);	// Remove $function( call and $mycall->mymethod(
 	} while ($oldstringtoclean != $s);
 
@@ -8168,9 +8392,10 @@ function dol_validElement($element)
  *
  * 	@param	string	$codelang	Language code ('en_IN', 'fr_CA', ...) or ISO Country code on 2 characters in uppercase ('IN', 'FR')
  *  @param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"' or 'class="saturatemedium"')
+ *  @param	int		$notitlealt	No title alt
  * 	@return	string				HTML img string with flag.
  */
-function picto_from_langcode($codelang, $moreatt = '')
+function picto_from_langcode($codelang, $moreatt = '', $notitlealt = 0)
 {
 	if (empty($codelang)) {
 		return '';
@@ -8203,7 +8428,7 @@ function picto_from_langcode($codelang, $moreatt = '')
 		$flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];
 	}
 
-	return img_picto_common($codelang, 'flags/'.strtolower($flagImage).'.png', $moreatt);
+	return img_picto_common($codelang, 'flags/'.strtolower($flagImage).'.png', $moreatt, 0, $notitlealt);
 }
 
 /**
@@ -8784,7 +9009,7 @@ function dolExplodeIntoArray($string, $delimiter = ';', $kv = '=')
  * Set focus onto field with selector (similar behaviour of 'autofocus' HTML5 tag)
  *
  * @param 	string	$selector	Selector ('#id' or 'input[name="ref"]') to use to find the HTML input field that must get the autofocus. You must use a CSS selector, so unique id preceding with the '#' char.
- * @return	string				HTML code to set focus
+ * @return	void
  */
 function dol_set_focus($selector)
 {
@@ -8904,10 +9129,10 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					foreach ($tmparray as $val) {
 						$val = trim($val);
 						if ($val) {
-							$newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape($val).',%\'';
-							$newres .= ' OR '.$field.' = \''.$db->escape($val).'\'';
-							$newres .= ' OR '.$field.' LIKE \'%,'.$db->escape($val).'\'';
-							$newres .= ' OR '.$field.' LIKE \'%,'.$db->escape($val).',%\'';
+							$newres .= ($i2 > 0 ? " OR (" : "(").$field." LIKE '".$db->escape($val).",%'";
+							$newres .= ' OR '.$field." = '".$db->escape($val)."'";
+							$newres .= ' OR '.$field." LIKE '%,".$db->escape($val)."'";
+							$newres .= ' OR '.$field." LIKE '%,".$db->escape($val).",%'";
 							$newres .= ')';
 							$i2++;
 						}
@@ -8927,12 +9152,15 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					if (preg_match('/\.(id|rowid)$/', $field)) {	// Special case for rowid that is sometimes a ref so used as a search field
 						$newres .= $field." = ".(is_numeric(trim($tmpcrit)) ? ((float) trim($tmpcrit)) : '0');
 					} else {
-						$newres .= $field." LIKE '";
-
 						$tmpcrit = trim($tmpcrit);
 						$tmpcrit2 = $tmpcrit;
 						$tmpbefore = '%';
 						$tmpafter = '%';
+						if (preg_match('/^!/', $tmpcrit)) {
+							$newres .= $field." NOT LIKE '"; // ! as exclude character
+							$tmpcrit2 = preg_replace('/^!/', '', $tmpcrit2);
+						} else $newres .= $field." LIKE '";
+
 						if (preg_match('/^[\^\$]/', $tmpcrit)) {
 							$tmpbefore = '';
 							$tmpcrit2 = preg_replace('/^[\^\$]/', '', $tmpcrit2);
@@ -8946,7 +9174,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 						$newres .= $tmpafter;
 						$newres .= "'";
 						if ($tmpcrit2 == '') {
-							$newres .= ' OR '.$field." IS NULL";
+							$newres .= " OR ".$field." IS NULL";
 						}
 					}
 
@@ -9079,11 +9307,12 @@ function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata = 0, $param
 /**
  * Make content of an input box selected when we click into input field.
  *
- * @param string	$htmlname	Id of html object ('#idvalue' or '.classvalue')
- * @param string	$addlink	Add a 'link to' after
+ * @param string	$htmlname		Id of html object ('#idvalue' or '.classvalue')
+ * @param string	$addlink		Add a 'link to' after
+ * @param string	$textonlink		Text to show on link or 'image'
  * @return string
  */
-function ajax_autoselect($htmlname, $addlink = '')
+function ajax_autoselect($htmlname, $addlink = '', $textonlink = 'Link')
 {
 	global $langs;
 	$out = '<script>
@@ -9092,7 +9321,11 @@ function ajax_autoselect($htmlname, $addlink = '')
 				});
 		    </script>';
 	if ($addlink) {
-		$out .= ' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
+		if ($textonlink === 'image') {
+			$out .= ' <a href="'.$addlink.'" target="_blank" rel="noopener noreferrer">'.img_picto('', 'globe').'</a>';
+		} else {
+			$out .= ' <a href="'.$addlink.'" target="_blank" rel="noopener noreferrer">'.$langs->trans("Link").'</a>';
+		}
 	}
 	return $out;
 }
@@ -9131,7 +9364,7 @@ function dolIsAllowedForPreview($file)
 
 
 /**
- *	Return mime type of a file
+ *	Return MIME type of a file from its name with extension.
  *
  *	@param	string	$file		Filename we looking for MIME type
  *  @param  string	$default    Default mime type if extension not found in known list
@@ -9526,23 +9759,26 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0)
 }
 
 /**
- * Return value from dictionary
+ * 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	$field			the value to return
- * @param int		$id				id of line
- * @param bool		$checkentity	add filter on entity
- * @param string	$rowidfield		name of the column rowid
- * @return string
+ * @param string	$tablename		Name of dictionary
+ * @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
+ * @param string	$rowidfield		Name of the column rowid (to use for the filter on $id)
+ * @return string					The value of field $field. This also set $dictvalues cache.
  */
-function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield = 'rowid')
+function getDictionaryValue($tablename, $field, $id, $checkentity = false, $rowidfield = 'rowid')
 {
-	global $dictvalues, $db, $langs;
+	global $conf, $db;
 
-	if (!isset($dictvalues[$tablename])) {
-		$dictvalues[$tablename] = array();
+	$dictvalues = (isset($conf->cache['dictvalues_'.$tablename]) ? $conf->cache['dictvalues_'.$tablename] : null);
 
-		$sql = 'SELECT * FROM '.$tablename.' WHERE 1 = 1'; // Here select * is allowed as it is generic code and we don't have list of fields
+	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
 		if ($checkentity) {
 			$sql .= ' AND entity IN (0,'.getEntity($tablename).')';
 		}
@@ -9550,20 +9786,20 @@ function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield
 		$resql = $db->query($sql);
 		if ($resql) {
 			while ($obj = $db->fetch_object($resql)) {
-				$dictvalues[$tablename][$obj->{$rowidfield}] = $obj;
+				$dictvalues[$obj->{$rowidfield}] = $obj;
 			}
 		} else {
 			dol_print_error($db);
 		}
+
+		$conf->cache['dictvalues_'.$tablename] = $dictvalues;
 	}
 
-	if (!empty($dictvalues[$tablename][$id])) {
-		return $dictvalues[$tablename][$id]->{$field}; // Found
-	} else // Not found
-	{
-		if ($id > 0) {
-			return $id;
-		}
+	if (!empty($dictvalues[$id])) {
+		// Found
+		return $dictvalues[$id]->{$field};
+	} else {
+		// Not found
 		return '';
 	}
 }
@@ -9823,11 +10059,29 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
  * @param string    $url        the url for link
  * @param string    $id         attribute id of button
  * @param int       $userRight  user action right
- * @param array     $params     various params for future : recommended rather than adding more function arguments
+ * // 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)
+ *                      		],
+ *                          ]
+ * // phpcs:enable
  * @return string               html button
  */
 function dolGetButtonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params = array())
 {
+	global $hookmanager, $action, $object, $langs;
+
 	$class = 'butAction';
 	if ($actionType == 'danger' || $actionType == 'delete') {
 		$class = 'butActionDelete';
@@ -9868,12 +10122,30 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 		}
 	}
 
+	// Js Confirm button
+	if ($userRight && !empty($params['confirm'])) {
+		if (!is_array($params['confirm'])) {
+			$params['confirm'] = array(
+				'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
+		$attr['data-confirm-url'] = $params['confirm']['url'];
+		$attr['data-confirm-title'] = !empty($params['confirm']['title']) ? $params['confirm']['title'] : $langs->trans('ConfirmBtnCommonTitle', $label);
+		$attr['data-confirm-content'] = !empty($params['confirm']['content']) ? $params['confirm']['content'] : $langs->trans('ConfirmBtnCommonContent', $label);
+		$attr['data-confirm-content'] = preg_replace("/\r|\n/", "", $attr['data-confirm-content']);
+		$attr['data-confirm-action-btn-label'] = !empty($params['confirm']['action-btn-label']) ? $params['confirm']['action-btn-label'] : $langs->trans('Confirm');
+		$attr['data-confirm-cancel-btn-label'] = !empty($params['confirm']['cancel-btn-label']) ? $params['confirm']['cancel-btn-label'] : $langs->trans('CloseDialog');
+		$attr['data-confirm-modal'] = !empty($params['confirm']['modal']) ? $params['confirm']['modal'] : true;
+
+		$attr['class'].= ' butActionConfirm';
+	}
+
 	if (isset($attr['href']) && empty($attr['href'])) {
 		unset($attr['href']);
 	}
 
-	// TODO : add a hook
-
 	// escape all attribute
 	$attr = array_map('dol_escape_htmltag', $attr);
 
@@ -9886,7 +10158,29 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 
 	$tag = !empty($attr['href']) ? 'a' : 'span';
 
-	return '<'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'>';
+
+	$parameters = array(
+		'TCompiledAttr' => $TCompiledAttr,
+		'compiledAttributes' => $compiledAttributes,
+		'attr' => $attr,
+		'tag' => $tag,
+		'label' => $label,
+		'html' => $html,
+		'actionType' => $actionType,
+		'url' => $url,
+		'id' => $id,
+		'userRight' => $userRight,
+		'params' => $params
+	);
+
+	$reshook = $hookmanager->executeHooks('dolGetButtonAction', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+	if (empty($reshook)) {
+		return '<' . $tag . ' ' . $compiledAttributes . '>' . $html . '</' . $tag . '>';
+	} else {
+		return $hookmanager->resPrint;
+	}
 }
 
 /**
@@ -9900,6 +10194,24 @@ function dolGetButtonTitleSeparator($moreClass = "")
 	return '<span class="button-title-separator '.$moreClass.'" ></span>';
 }
 
+/**
+ * get field error icon
+ *
+ * @param  string  $fieldValidationErrorMsg message to add in tooltip
+ * @return string html output
+ */
+function getFieldErrorIcon($fieldValidationErrorMsg)
+{
+	$out = '';
+	if (!empty($fieldValidationErrorMsg)) {
+		$out.= '<span class="field-error-icon classfortooltip" title="'.dol_escape_htmltag($fieldValidationErrorMsg, 1).'"  role="alert" >'; // role alert is used for accessibility
+		$out.= '<span class="fa fa-exclamation-circle" aria-hidden="true" ></span>'; // For accessibility icon is separated and aria-hidden
+		$out.= '</span>';
+	}
+
+	return $out;
+}
+
 /**
  * Function dolGetButtonTitle : this kind of buttons are used in title in list
  *
@@ -9922,7 +10234,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
 	}
 
 	$class = 'btnTitle';
-	if (in_array($iconClass, array('fa fa-plus-circle', 'fa fa-comment-dots'))) {
+	if (in_array($iconClass, array('fa fa-plus-circle', 'fa fa-plus-circle size15x', 'fa fa-comment-dots'))) {
 		$class .= ' btnTitlePlus';
 	}
 	$useclassfortooltip = 1;
@@ -10197,7 +10509,7 @@ function newToken()
  */
 function currentToken()
 {
-	return $_SESSION['token'];
+	return isset($_SESSION['token']) ? $_SESSION['token'] : '';
 }
 
 /**
@@ -10386,7 +10698,7 @@ 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
+ * Code that handle the click is inside lib_foot.jsp.php.
  *
  * @param 	string 	$valuetocopy 		The value to print
  * @param	int		$showonlyonhover	Show the copy-paste button only on hover
@@ -10402,10 +10714,11 @@ function showValueWithClipboardCPButton($valuetocopy, $showonlyonhover = 1, $tex
 		$showonlyonhover = 0;
 	}*/
 
+	$tag = 'span'; 	// Using div does not work when using the js copy code.
 	if ($texttoshow) {
-		$result = '<span class="clipboardCP'.($showonlyonhover ? ' clipboardCPShowOnHover' : '').'"><span class="clipboardCPValue hidewithsize">'.$valuetocopy.'</span><span class="clipboardCPValueToPrint">'.$texttoshow.'</span><span class="clipboardCPButton far fa-clipboard opacitymedium paddingleft paddingright"></span><span class="clipboardCPText opacitymedium"></span></span>';
+		$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' : '').'"><span class="clipboardCPValue">'.$valuetocopy.'</span><span class="clipboardCPButton far fa-clipboard opacitymedium paddingleft paddingright"></span><span class="clipboardCPText opacitymedium"></span></span>';
+		$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>';
 	}
 
 	return $result;
@@ -10427,3 +10740,90 @@ function jsonOrUnserialize($stringtodecode)
 
 	return $result;
 }
+
+
+
+/**
+ * Return if a $sqlfilters parameter is valid and will pass the preg_replace_callback() to replace Generic filter string with SQL filter string
+ * Example of usage:
+ * if ($sqlfilters) {
+ *	 $errormessage = '';
+ *   if (dolCheckFilters($sqlfilters, $errormessage)) {
+ *	   $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
+ *	   $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'dolForgeCriteriaCallback', $sqlfilters).")";
+ *   }
+ * }
+ *
+ * @param	string  		$sqlfilters     sqlfilter string
+ * @param	string			$error			Error message
+ * @return 	boolean			   				True if valid, False if not valid ($error is filled with the reason in such a case)
+ */
+function dolCheckFilters($sqlfilters, &$error = '')
+{
+	//$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+	//$tmp=preg_replace_all('/'.$regexstring.'/', '', $sqlfilters);
+	$tmp = $sqlfilters;
+	$i = 0; $nb = strlen($tmp);
+	$counter = 0;
+	while ($i < $nb) {
+		if ($tmp[$i] == '(') {
+			$counter++;
+		}
+		if ($tmp[$i] == ')') {
+			$counter--;
+		}
+		if ($counter < 0) {
+			$error = "Bad sqlfilters=".$sqlfilters;
+			dol_syslog($error, LOG_WARNING);
+			return false;
+		}
+		$i++;
+	}
+	return true;
+}
+
+/**
+ * Function to forge a SQL criteria from a Generic filter string.
+ * Example of usage:
+ * if ($sqlfilters) {
+ *	 $errormessage = '';
+ *   if (dolCheckFilters($sqlfilters, $errormessage)) {
+ *	   $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
+ *	   $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'dolForgeCriteriaCallback', $sqlfilters).")";
+ *   }
+ * }
+ *
+ * @param  array    $matches    Array of found string by regex search.
+ * 								Example: "t.ref:like:'SO-%'" or "t.date_creation:<:'20160101'" or "t.date_creation:<:'2016-01-01 12:30:00'" or "t.nature:is:NULL"
+ * @return string               Forged criteria. Example: "t.field like 'abc%'"
+ */
+function dolForgeCriteriaCallback($matches)
+{
+	global $db;
+
+	//dol_syslog("Convert matches ".$matches[1]);
+	if (empty($matches[1])) {
+		return '';
+	}
+	$tmp = explode(':', $matches[1], 3);
+
+	if (count($tmp) < 3) {
+		return '';
+	}
+
+	$operand = preg_replace('/[^a-z0-9\._]/i', '', trim($tmp[0]));
+
+	$operator = strtoupper(preg_replace('/[^a-z<>=]/i', '', trim($tmp[1])));
+
+	$tmpescaped = trim($tmp[2]);
+	$regbis = array();
+	if ($operator == 'IN') {
+		$tmpescaped = "(".$db->sanitize($tmpescaped, 1).")";
+	} elseif (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis)) {
+		$tmpescaped = "'".$db->escape($regbis[1])."'";
+	} else {
+		$tmpescaped = $db->sanitize($db->escape($tmpescaped));
+	}
+
+	return $db->escape($operand).' '.$db->escape($operator)." ".$tmpescaped;
+}
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 0035688c66f..3a0b077be6b 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1235,7 +1235,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 			$sqlwhere .= "(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$db->escape($yearcomp)."'";
 			$sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
 		} else { // reset is done on january
-			$sqlwhere .= '(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$db->escape($yearcomp)."')";
+			$sqlwhere .= "(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$db->escape($yearcomp)."')";
 		}
 	}
 	//print "sqlwhere=".$sqlwhere." yearcomp=".$yearcomp."<br>\n";	// sqlwhere and yearcomp defined only if we ask a reset
@@ -1250,7 +1250,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	if ($posnumstart < 0) {
 		return 'ErrorBadMaskFailedToLocatePosOfSequence';
 	}
-	$sqlstring = 'SUBSTRING('.$field.', '.($posnumstart + 1).', '.dol_strlen($maskcounter).')';
+	$sqlstring = "SUBSTRING(".$field.", ".($posnumstart + 1).", ".dol_strlen($maskcounter).")";
 
 	// Define $maskLike
 	$maskLike = dol_string_nospecial($mask);
@@ -1291,7 +1291,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 		$sql .= $where;
 	}
 	if ($sqlwhere) {
-		$sql .= ' AND '.$sqlwhere;
+		$sql .= " AND ".$sqlwhere;
 	}
 
 	//print $sql.'<br>';
@@ -1351,7 +1351,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 			$sql .= $where;
 		}
 		if ($sqlwhere) {
-			$sql .= ' AND '.$sqlwhere;
+			$sql .= " AND ".$sqlwhere;
 		}
 
 		dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
@@ -1368,6 +1368,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 		$numFinal = $ref;
 	} elseif ($mode == 'next') {
 		$counter++;
+		$maskrefclient_counter = 0;
 
 		// If value for $counter has a length higher than $maskcounter chars
 		if ($counter >= pow(10, dol_strlen($maskcounter))) {
@@ -1398,7 +1399,6 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), $maskrefclient_clientcode.str_pad("", dol_strlen($maskrefclient_maskcounter), "_"), $maskrefclient_maskLike);
 
 			// Get counter in database
-			$maskrefclient_counter = 0;
 			$maskrefclient_sql = "SELECT MAX(".$maskrefclient_sqlstring.") as val";
 			$maskrefclient_sql .= " FROM ".MAIN_DB_PREFIX.$table;
 			//$sql.= " WHERE ".$field." not like '(%'";
@@ -1414,7 +1414,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 			if ($sqlwhere) {
 				$maskrefclient_sql .= ' AND '.$sqlwhere; //use the same sqlwhere as general mask
 			}
-			$maskrefclient_sql .= ' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode, $maskrefclient) + 1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$db->escape($maskrefclient_clientcode)."')";
+			$maskrefclient_sql .= " AND (SUBSTRING(".$field.", ".(strpos($maskwithnocode, $maskrefclient) + 1).", ".dol_strlen($maskrefclient_maskclientcode).") = '".$db->escape($maskrefclient_clientcode)."')";
 
 			dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG);
 			$maskrefclient_resql = $db->query($maskrefclient_sql);
@@ -1790,8 +1790,8 @@ function dol_set_user_param($db, $conf, &$user, $tab)
 
 	// We remove old parameters for all keys in $tab
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";
-	$sql .= " WHERE fk_user = ".$user->id;
-	$sql .= " AND entity = ".$conf->entity;
+	$sql .= " WHERE fk_user = ".((int) $user->id);
+	$sql .= " AND entity = ".((int) $conf->entity);
 	$sql .= " AND param in (";
 	$i = 0;
 	foreach ($tab as $key => $value) {
@@ -1815,7 +1815,7 @@ function dol_set_user_param($db, $conf, &$user, $tab)
 		// Set new parameters
 		if ($value) {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)";
-			$sql .= " VALUES (".$user->id.",".$conf->entity.",";
+			$sql .= " VALUES (".((int) $user->id).",".((int) $conf->entity).",";
 			$sql .= " '".$db->escape($key)."','".$db->escape($value)."')";
 
 			dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);
@@ -1876,7 +1876,7 @@ function version_os($option = '')
  * 	Return PHP version
  *
  * 	@return		string			PHP version
- *  @see		versionphparray()
+ *  @see		versionphparray(), versioncompare()
  */
 function version_php()
 {
@@ -1887,7 +1887,7 @@ function version_php()
  * 	Return Dolibarr version
  *
  * 	@return		string			Dolibarr version
- *  @see		versiondolibarrarray()
+ *  @see		versiondolibarrarray(), versioncompare()
  */
 function version_dolibarr()
 {
@@ -2131,30 +2131,38 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 
 	// Special cases, to work with non standard path
 	if ($objecttype == 'facture' || $objecttype == 'invoice') {
+		$langs->load('bills');
 		$classpath = 'compta/facture/class';
 		$module = 'facture';
 		$myobject = 'facture';
 	} elseif ($objecttype == 'commande' || $objecttype == 'order') {
+		$langs->load('orders');
 		$classpath = 'commande/class';
 		$module = 'commande';
 		$myobject = 'commande';
 	} elseif ($objecttype == 'propal') {
+		$langs->load('propal');
 		$classpath = 'comm/propal/class';
 	} elseif ($objecttype == 'supplier_proposal') {
+		$langs->load('supplier_proposal');
 		$classpath = 'supplier_proposal/class';
 	} elseif ($objecttype == 'shipping') {
+		$langs->load('sendings');
 		$classpath = 'expedition/class';
 		$myobject = 'expedition';
 		$module = 'expedition_bon';
 	} elseif ($objecttype == 'delivery') {
+		$langs->load('deliveries');
 		$classpath = 'delivery/class';
 		$myobject = 'delivery';
 		$module = 'delivery_note';
 	} elseif ($objecttype == 'contract') {
+		$langs->load('contracts');
 		$classpath = 'contrat/class';
 		$module = 'contrat';
 		$myobject = 'contrat';
 	} elseif ($objecttype == 'member') {
+		$langs->load('members');
 		$classpath = 'adherents/class';
 		$module = 'adherent';
 		$myobject = 'adherent';
@@ -2163,10 +2171,16 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 		$module = 'cabinetmed';
 		$myobject = 'cabinetmedcons';
 	} elseif ($objecttype == 'fichinter') {
+		$langs->load('interventions');
 		$classpath = 'fichinter/class';
 		$module = 'ficheinter';
 		$myobject = 'fichinter';
+	} elseif ($objecttype == 'project') {
+		$langs->load('projects');
+		$classpath = 'projet/class';
+		$module = 'projet';
 	} elseif ($objecttype == 'task') {
+		$langs->load('projects');
 		$classpath = 'projet/class';
 		$module = 'projet';
 		$myobject = 'task';
@@ -2250,7 +2264,7 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 	$listofparentid = array();
 
 	// Get list of all id in array listofid and all parents in array listofparentid
-	$sql = 'SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;
+	$sql = "SELECT rowid, ".$fieldfkparent." as parent_id FROM ".MAIN_DB_PREFIX.$tabletocleantree;
 	$resql = $db->query($sql);
 	if ($resql) {
 		$num = $db->num_rows($resql);
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 3398189a771..8d992250cbb 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -35,9 +35,10 @@
  * @param	string[]  $addheaders			Array of string to add into header. Example: ('Accept: application/xrds+xml', ....)
  * @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.
- * @return	array						    Returns an associative array containing the response from the server array('content'=>response, 'curl_error_no'=>errno, 'curl_error_msg'=>errmsg...)
+ * @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('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)
+function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = 1, $addheaders = array(), $allowedschemes = array('http', 'https'), $localurl = 0, $ssl_verifypeer = -1)
 {
 	//declaring of global variables
 	global $conf;
@@ -75,9 +76,18 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 	}
 	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
 
+	// 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));
 
 	// Restrict use to some protocols only
 	$protocols = 0;
@@ -214,11 +224,14 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 				}
 			}
 
-			// Common check (local and external)
-			if (in_array($iptocheck, array('100.100.100.200'))) {
-				$info['http_code'] = 400;
-				$info['content'] = 'Error bad hostname IP (Used by Alibaba metadata). Must be an external URL.';
-				break;
+			// Common check on ip (local and external)
+			$arrayofmetadataserver = array('100.100.100.200' => 'Alibaba', '192.0.0.192'=> 'Oracle', '192.80.8.124'=>'Packet');
+			foreach ($arrayofmetadataserver as $ipofmetadataserver => $nameofmetadataserver) {
+				if ($iptocheck == $ipofmetadataserver) {
+					$info['http_code'] = 400;
+					$info['content'] = 'Error bad hostname IP (Used by '.$nameofmetadataserver.' metadata server). This IP is forbidden.';
+					break 2;	// exit the foreach and the do...
+				}
 			}
 
 			// Set CURLOPT_CONNECT_TO so curl will not try another resolution that may give a different result. Possible only on PHP v7+
@@ -249,7 +262,10 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 	$request = curl_getinfo($ch, CURLINFO_HEADER_OUT); // Reading of request must be done after sending request
 
 	dol_syslog("getURLContent request=".$request);
-	//dol_syslog("getURLContent response =".response);	// This may contains binary data, so we dont output it
+	if (!empty($conf->global->MAIN_GETURLCONTENT_OUTPUT_RESPONSE)) {
+		// This may contains binary data, so we dont output reponse by default.
+		dol_syslog("getURLContent response =".$response);
+	}
 	dol_syslog("getURLContent response size=".strlen($response)); // This may contains binary data, so we dont output it
 
 	$rep = array();
diff --git a/htdocs/core/lib/hrm.lib.php b/htdocs/core/lib/hrm.lib.php
index e24c503f449..e53cc9b3965 100644
--- a/htdocs/core/lib/hrm.lib.php
+++ b/htdocs/core/lib/hrm.lib.php
@@ -54,6 +54,22 @@ function establishment_prepare_head($object)
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'establishment', 'remove');
 
+
+
+	$head[$h][0] = dol_buildpath("/hrm/admin/setup.php", 1);
+	$head[$h][1] = $langs->trans("Settings");
+	$head[$h][2] = 'settings';
+	$h++;
+
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm');
+
+	$head[$h][0] = dol_buildpath("/hrm/admin/about.php", 1);
+	$head[$h][1] = $langs->trans("About");
+	$head[$h][2] = 'about';
+	$h++;
+
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm');
+
 	return $head;
 }
 
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 0ccb6a415fc..6b973d89887 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -388,7 +388,7 @@ function dolRotateImage($file_path)
  * Add exif orientation correction for image
  *
  * @param string $fileSource Full path to source image to rotate
- * @param string $fileDest string : Full path to image to rotate | false return gd img  | null  the raw image stream will be outputted directly
+ * @param string|bool $fileDest string : Full path to image to rotate | false return gd img  | null  the raw image stream will be outputted directly
  * @param int $quality output image quality
  * @return bool : true on success or false on failure or gd img if $fileDest is false.
  */
@@ -630,7 +630,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		}
 
 		// replace image with good orientation
-		if (!empty($rotated)) {
+		if (!empty($rotated) && isset($trueImgWidth) && isset($trueImgHeight)) {
 			$img = $rotated;
 			$imgWidth = $trueImgWidth;
 			$imgHeight = $trueImgHeight;
diff --git a/htdocs/core/lib/import.lib.php b/htdocs/core/lib/import.lib.php
index a9663795988..96ad79f03e6 100644
--- a/htdocs/core/lib/import.lib.php
+++ b/htdocs/core/lib/import.lib.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2007       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2010       Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2010       Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-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
@@ -24,6 +24,7 @@
  *  \file       htdocs/core/lib/import.lib.php
  *  \brief      Ensemble de fonctions de base pour le module import
  *  \ingroup    import
+ */
 
 /**
  * Function to return list of tabs for import pages
@@ -47,7 +48,7 @@ function import_prepare_head($param, $maxstep = 0)
 		if ($i < 6) {
 			$head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step='.$i.$param;
 		} else {
-			$head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step=5'.$param;	// For step6, link is to step 5
+			$head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step=5'.$param; // For step6, link is to step 5
 		}
 		$head[$h][1] = $langs->trans("Step")." ".$i;
 		$head[$h][2] = 'step'.$i;
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 8f6a97894b9..c6f972f46c8 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -47,7 +47,7 @@ function facture_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.urlencode($object->id);
 		$head[$h][1] = $langs->trans('ContactsAddresses');
 		if ($nbContact > 0) {
 			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
@@ -60,7 +60,7 @@ function facture_prepare_head($object)
 		$nbStandingOrders = 0;
 		$sql = "SELECT COUNT(pfd.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-		$sql .= " WHERE pfd.fk_facture = ".$object->id;
+		$sql .= " WHERE pfd.fk_facture = ".((int) $object->id);
 		$sql .= " AND pfd.ext_payment_id IS NULL";
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -71,7 +71,7 @@ function facture_prepare_head($object)
 		} else {
 			dol_print_error($db);
 		}
-		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.urlencode($object->id);
 		$head[$h][1] = $langs->trans('StandingOrders');
 		if ($nbStandingOrders > 0) {
 			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';
@@ -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++;
@@ -216,6 +216,35 @@ function invoice_rec_prepare_head($object)
 	return $head;
 }
 
+/**
+ * Return array head with list of tabs to view object informations.
+ *
+ * @param   Facture     $object     Invoice object
+ * @return array                    head array with tabs
+ */
+function supplier_invoice_rec_prepare_head($object)
+{
+	global $db, $langs, $conf;
+
+	$h = 0;
+	$head = array();
+
+	$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++;
+
+	// 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');
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice_supplier_rec', 'remove');
+
+	return $head;
+}
+
 /**
  * Return a HTML table that contains a pie chart of customer invoices
  *
@@ -233,15 +262,15 @@ function getCustomerInvoicePieChart($socid = 0)
 	$sql = "SELECT count(f.rowid), f.fk_statut";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."facture as f";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	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 = '.$user->socid;
+		$sql .= ' AND f.fk_soc = '.((int) $user->socid);
 	}
-	if (!$user->rights->societe->client->voir && !$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";
@@ -256,7 +285,7 @@ function getCustomerInvoicePieChart($socid = 0)
 	$i = 0;
 
 	$total = 0;
-	$vals = [];
+	$vals = array();
 
 	while ($i < $num) {
 		$row = $db->fetch_row($resql);
@@ -279,14 +308,14 @@ function getCustomerInvoicePieChart($socid = 0)
 	$result .= '</tr>';
 
 	$objectstatic = new Facture($db);
-	$array = [Facture::STATUS_DRAFT, Facture::STATUS_VALIDATED, Facture::STATUS_CLOSED, Facture::STATUS_ABANDONED];
-	$dataseries = [];
+	$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[] = [$objectstatic->getLibStatut(1), (isset($vals[$status]) ? (int) $vals[$status] : 0)];
+		$dataseries[] = array($objectstatic->getLibStatut(1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
 		if ($status == Facture::STATUS_DRAFT) {
 			$colorseries[$status] = '-'.$badgeStatus0;
 		}
@@ -353,15 +382,15 @@ function getPurchaseInvoicePieChart($socid = 0)
 	$sql = "SELECT count(f.rowid), f.fk_statut";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	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 = '.$user->socid;
+		$sql .= ' AND f.fk_soc = '.((int) $user->socid);
 	}
-	if (!$user->rights->societe->client->voir && !$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";
@@ -376,7 +405,7 @@ function getPurchaseInvoicePieChart($socid = 0)
 	$i = 0;
 
 	$total = 0;
-	$vals = [];
+	$vals = array();
 
 	while ($i < $num) {
 		$row = $db->fetch_row($resql);
@@ -400,14 +429,14 @@ function getPurchaseInvoicePieChart($socid = 0)
 	$result .= '</tr>';
 
 	$objectstatic = new FactureFournisseur($db);
-	$array = [FactureFournisseur::STATUS_DRAFT, FactureFournisseur::STATUS_VALIDATED, FactureFournisseur::STATUS_CLOSED, FactureFournisseur::STATUS_ABANDONED];
-	$dataseries = [];
+	$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[] = [$objectstatic->getLibStatut(1), (isset($vals[$status]) ? (int) $vals[$status] : 0)];
+		$dataseries[] = array($objectstatic->getLibStatut(1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
 		if ($status == FactureFournisseur::STATUS_DRAFT) {
 			$colorseries[$status] = '-'.$badgeStatus0;
 		}
@@ -480,10 +509,11 @@ function getNumberInvoicesPieChart($mode)
 		date_add($datenowadd30, $interval30days);
 		date_add($datenowadd15, $interval15days);
 
-		$sql = "SELECT sum(".$db->ifsql("f.date_lim_reglement < '".date_format($datenowsub30, 'Y-m-d')."'", 1, 0).") as nblate30";
+		$sql = "SELECT";
+		$sql .= " sum(".$db->ifsql("f.date_lim_reglement < '".date_format($datenowsub30, 'Y-m-d')."'", 1, 0).") as nblate30";
 		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement < '".date_format($datenowsub15, 'Y-m-d')."'", 1, 0).") as nblate15";
 		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement < '".date_format($now, 'Y-m-d')."'", 1, 0).") as nblatenow";
-		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement >= '".date_format($now, 'Y-m-d')."'", 1, 0).") as nbnotlatenow";
+		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement >= '".date_format($now, 'Y-m-d')."' OR f.date_lim_reglement IS NULL", 1, 0).") as nbnotlatenow";
 		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement > '".date_format($datenowadd15, 'Y-m-d')."'", 1, 0).") as nbnotlate15";
 		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement > '".date_format($datenowadd30, 'Y-m-d')."'", 1, 0).") as nbnotlate30";
 		if ($mode == 'customers') {
@@ -508,24 +538,39 @@ function getNumberInvoicesPieChart($mode)
 
 			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
+				/*
 				$dataseries = array(array($langs->trans('InvoiceLate30Days'), $obj->nblate30)
 									,array($langs->trans('InvoiceLate15Days'), $obj->nblate15 - $obj->nblate30)
 									,array($langs->trans('InvoiceLateMinus15Days'), $obj->nblatenow - $obj->nblate15)
 									,array($langs->trans('InvoiceNotLate'), $obj->nbnotlatenow - $obj->nbnotlate15)
 									,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);
 				$i++;
 			}
-			foreach ($dataseries as $key=>$value) {
-				$total += $value[1];
+			if (!empty($dataseries[0])) {
+				foreach ($dataseries[0] as $key => $value) {
+					if (is_numeric($value)) {
+						$total += $value;
+					}
+				}
 			}
+			$legend = array(
+				$langs->trans('InvoiceLate30Days'),
+				$langs->trans('InvoiceLate15Days'),
+				$langs->trans('InvoiceLateMinus15Days'),
+				$mode == 'customers' ? $langs->trans('InvoiceNotLate') : $langs->trans("InvoiceToPay"),
+				$mode == 'customers' ? $langs->trans('InvoiceNotLate15Days') : $langs->trans("InvoiceToPay15Days"),
+				$mode == 'customers' ? $langs->trans('InvoiceNotLate30Days') : $langs->trans("InvoiceToPay30Days"),
+			);
 
 			$colorseries = array($badgeStatus8, $badgeStatus1, $badgeStatus3, $badgeStatus4, $badgeStatus11, '-'.$badgeStatus11);
 
 			$result = '<div class="div-table-responsive-no-min">';
 			$result .= '<table class="noborder nohover centpercent">';
 			$result .= '<tr class="liste_titre">';
-			$result .= '<td>'.$langs->trans("Statistics").' - ';
+			$result .= '<td>'.$langs->trans("NbOfOpenInvoices").' - ';
 			if ($mode == 'customers') {
 				$result .= $langs->trans("CustomerInvoice");
 			} elseif ($mode == 'fourn' || $mode == 'suppliers') {
@@ -537,14 +582,20 @@ function getNumberInvoicesPieChart($mode)
 			$result .= '</tr>';
 
 			if ($conf->use_javascript_ajax) {
+				//var_dump($dataseries);
 				$dolgraph = new DolGraph();
 				$dolgraph->SetData($dataseries);
+
+				$dolgraph->setLegend($legend);
+
 				$dolgraph->SetDataColor(array_values($colorseries));
 				$dolgraph->setShowLegend(2);
 				$dolgraph->setShowPercent(1);
-				$dolgraph->SetType(['pie']);
-				$dolgraph->setHeight('150');
-				$dolgraph->setWidth('300');
+				$dolgraph->SetType(array('bars', 'bars', 'bars', 'bars', 'bars', 'bars'));
+				//$dolgraph->SetType(array('pie'));
+				$dolgraph->setHeight('160');	/* 160 min is required to show the 6 lines of legend */
+				$dolgraph->setWidth('450');
+				$dolgraph->setHideXValues(true);
 				if ($mode == 'customers') {
 					$dolgraph->draw('idgraphcustomerinvoices');
 				} elseif ($mode == 'fourn' || $mode == 'suppliers') {
@@ -590,16 +641,16 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
 	$sql .= ", s.rowid as socid, s.email";
 	$sql .= ", s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur";
 	$sql .= ", cc.rowid as country_id, cc.code as country_code";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", sc.fk_soc, sc.fk_user ";
 	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = ".Facture::STATUS_DRAFT;
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 
@@ -614,7 +665,7 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
 	$sql .= " GROUP BY f.rowid, f.ref, f.datef, f.total_ht, f.total_tva, f.total_ttc, f.ref_client, f.type, f.fk_statut, f.paye,";
 	$sql .= " s.nom, s.rowid, s.email, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur,";
 	$sql .= " cc.rowid, cc.code";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", sc.fk_soc, sc.fk_user";
 	}
 
@@ -738,12 +789,12 @@ function getDraftSupplierTable($maxCount = 500, $socid = 0)
 	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur";
 	$sql .= ", cc.rowid as country_id, cc.code as country_code";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = ".FactureFournisseur::STATUS_DRAFT;
 	$sql .= " AND f.entity IN (".getEntity('invoice').')';
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -860,7 +911,7 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 	$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE f.fk_soc = s.rowid";
@@ -868,7 +919,7 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 	if ($socid) {
 		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	$sql .= " ORDER BY f.tms DESC";
@@ -965,7 +1016,7 @@ function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 	$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE f.fk_soc = s.rowid";
@@ -973,7 +1024,7 @@ function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 	if ($socid) {
 		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	$sql .= " ORDER BY f.tms DESC";
@@ -1084,12 +1135,12 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 		$sql .= ", sum(pf.amount) as am";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays,".MAIN_DB_PREFIX."facture as f";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE s.rowid = f.fk_soc AND f.paye = 0 AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 		$sql .= " AND f.entity IN (".getEntity('invoice').')';
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($socid) {
@@ -1174,11 +1225,6 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 					print '<td class="nobordernopadding nowrap">';
 					print $tmpinvoice->getNomUrl(1, '');
 					print '</td>';
-					print '<td width="20" class="nobordernopadding nowrap">';
-					if ($tmpinvoice->hasDelay()) {
-						print img_warning($langs->trans("Late"));
-					}
-					print '</td>';
 					print '<td width="16" class="nobordernopadding hideonsmartphone right">';
 					$filename = dol_sanitizeFileName($obj->ref);
 					$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($obj->ref);
@@ -1190,7 +1236,12 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 					print '<td class="nowrap tdoverflowmax100">';
 					print $societestatic->getNomUrl(1, 'customer');
 					print '</td>';
-					print '<td class="right">'.dol_print_date($db->jdate($obj->datelimite), 'day').'</td>';
+					print '<td class="right">';
+					print dol_print_date($db->jdate($obj->datelimite), 'day');
+					if ($tmpinvoice->hasDelay()) {
+						print img_warning($langs->trans("Late"));
+					}
+					print '</td>';
 					if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
 						print '<td class="right"><span class="amount">'.price($obj->total_ht).'</span></td>';
 					}
@@ -1218,7 +1269,7 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 					print "</tr>\n";
 				}
 
-				print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToTake").': '.price($total_ttc - $totalam).')</font> </td>';
+				print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <span style="font-weight: normal">('.$langs->trans("RemainderToTake").': '.price($total_ttc - $totalam).')</span> </td>';
 				print '<td>&nbsp;</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
 					print '<td class="right"><span class="amount">'.price($total).'</span></td>';
@@ -1270,14 +1321,14 @@ function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 		$sql .= ", sum(pf.amount) as am";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE s.rowid = ff.fk_soc";
 		$sql .= " AND ff.entity = ".$conf->entity;
 		$sql .= " AND ff.paye = 0";
 		$sql .= " AND ff.fk_statut = ".FactureFournisseur::STATUS_VALIDATED;
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($socid) {
@@ -1383,7 +1434,7 @@ function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 					print "</tr>\n";
 				}
 
-				print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToPay").': '.price($total_ttc - $totalam).')</font> </td>';
+				print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <span style="font-weight: normal">('.$langs->trans("RemainderToPay").': '.price($total_ttc - $totalam).')</span> </td>';
 				print '<td>&nbsp;</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
 					print '<td class="right">'.price($total).'</td>';
diff --git a/htdocs/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php
index 9d6e0193108..56a8bcc4285 100644
--- a/htdocs/core/lib/ldap.lib.php
+++ b/htdocs/core/lib/ldap.lib.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2006		Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2006-2017	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2006-2021	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
@@ -89,7 +89,6 @@ function ldap_prepare_head()
 	return $head;
 }
 
-
 /**
  *  Show button test LDAP synchro
  *
@@ -119,7 +118,6 @@ function show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass)
 	print '<br><br>';
 }
 
-
 /**
  * Show a LDAP array into an HTML output array.
  *
@@ -153,7 +151,7 @@ function show_ldap_content($result, $level, $count, $var, $hide = 0, $subcount =
 		if ("$key" == "dn") {
 			continue;
 		}
-		if ("$val" == "objectclass") {
+		if (!is_array($val) && "$val" == "objectclass") {
 			continue;
 		}
 
@@ -181,7 +179,7 @@ function show_ldap_content($result, $level, $count, $var, $hide = 0, $subcount =
 			}
 			print '<br>';
 		}
-		if ("$val" != $lastkey[$level] && !$subcount) {
+		if (!is_array($val) && "$val" != $lastkey[$level] && !$subcount) {
 			print '</td></tr>';
 		}
 	}
diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index 94884ea302d..0c056ddbc2e 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -76,7 +76,7 @@ function dol_setcache($memoryid, $data, $expire = 0)
 		}
 	}
 
-	if (!empty($conf->memcached->enabled) &&  class_exists('Memcached')) {
+	if (!empty($conf->memcached->enabled) && class_exists('Memcached')) {
 		// Using a memcached server
 		global $dolmemcache;
 		if (empty($dolmemcache) || !is_object($dolmemcache)) {
@@ -88,7 +88,7 @@ function dol_setcache($memoryid, $data, $expire = 0)
 			}
 		}
 
-		$memoryid = session_name() . '_' . $memoryid;
+		$memoryid = session_name().'_'.$memoryid;
 		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
 		$dolmemcache->add($memoryid, $data, $expire); // This fails if key already exists
 		$rescode = $dolmemcache->getResultCode();
@@ -109,7 +109,7 @@ function dol_setcache($memoryid, $data, $expire = 0)
 			}
 		}
 
-		$memoryid = session_name() . '_' . $memoryid;
+		$memoryid = session_name().'_'.$memoryid;
 		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
 		$result = $dolmemcache->add($memoryid, $data, false, $expire); // This fails if key already exists
 		if ($result) {
@@ -154,7 +154,7 @@ function dol_getcache($memoryid)
 			}
 		}
 
-		$memoryid = session_name() . '_' . $memoryid;
+		$memoryid = session_name().'_'.$memoryid;
 		//$m->setOption(Memcached::OPT_COMPRESSION, false);
 		//print "Get memoryid=".$memoryid;
 		$data = $m->get($memoryid);
@@ -179,7 +179,7 @@ function dol_getcache($memoryid)
 			}
 		}
 
-		$memoryid = session_name() . '_' . $memoryid;
+		$memoryid = session_name().'_'.$memoryid;
 		//$m->setOption(Memcached::OPT_COMPRESSION, false);
 		$data = $m->get($memoryid);
 		//print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";
@@ -187,7 +187,7 @@ function dol_getcache($memoryid)
 		if ($data) {
 			return $data;
 		} else {
-			return null;		// There is no way to make a difference between NOTFOUND and error when using Memcache. So do not use it, use Memcached instead.
+			return null; // There is no way to make a difference between NOTFOUND and error when using Memcache. So do not use it, use Memcached instead.
 		}
 	} elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {	// This is a really not reliable cache ! Use Memcached instead.
 		// Using shmop
@@ -252,7 +252,7 @@ function dol_setshmop($memoryid, $data, $expire)
 	}
 	$shmkey = dol_getshmopaddress($memoryid);
 	if (empty($shmkey)) {
-		return 0;	// No key reserved for this memoryid, we can't cache this memoryid
+		return 0; // No key reserved for this memoryid, we can't cache this memoryid
 	}
 
 	$newdata = serialize($data);
@@ -268,7 +268,7 @@ function dol_setshmop($memoryid, $data, $expire)
 		shmop_close($handle);
 		return ($shm_bytes_written1 + $shm_bytes_written2);
 	} else {
-		print 'Error in shmop_open for memoryid=' . $memoryid . ' shmkey=' . $shmkey . ' 6+size=6+' . $size;
+		print 'Error in shmop_open for memoryid='.$memoryid.' shmkey='.$shmkey.' 6+size=6+'.$size;
 		return -1;
 	}
 }
@@ -290,7 +290,7 @@ function dol_getshmop($memoryid)
 	}
 	$shmkey = dol_getshmopaddress($memoryid);
 	if (empty($shmkey)) {
-		return null;		// No key reserved for this memoryid, we can't cache this memoryid
+		return null; // No key reserved for this memoryid, we can't cache this memoryid
 	}
 
 	//print 'dol_getshmop memoryid='.$memoryid." shmkey=".$shmkey."<br>\n";
@@ -304,7 +304,7 @@ function dol_getshmop($memoryid)
 		}
 		shmop_close($handle);
 	} else {
-		return null;	// Can't open existing block, so we suppose it was not created, so nothing were cached yet for the memoryid
+		return null; // Can't open existing block, so we suppose it was not created, so nothing were cached yet for the memoryid
 	}
 	return $data;
 }
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 27a4ea7a9ab..7c32b377bd4 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -17,8 +17,8 @@
  */
 
 /**
- *  \file		htdocs/core/lib/memory.lib.php
- *  \brief		Set of function for memory/cache management
+ *  \file		htdocs/core/lib/modulebuilder.lib.php
+ *  \brief		Set of function for modulebuilder management
  */
 
 
@@ -176,6 +176,9 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 					}
 					$texttoinsert .= "),";
 				}
+				if ($val['validate']) {
+					$texttoinsert .= " 'validate'=>'".$val['validate']."',";
+				}
 				if ($val['comment']) {
 					$texttoinsert .= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\"";
 				}
@@ -302,6 +305,8 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 			$texttoinsert .= "\t".$key." ".$type;
 			if ($key == 'rowid') {
 				$texttoinsert .= ' AUTO_INCREMENT PRIMARY KEY';
+			} elseif ($type == 'timestamp') {
+				$texttoinsert .= ' DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP';
 			}
 			if ($key == 'entity') {
 				$texttoinsert .= ' DEFAULT 1';
diff --git a/htdocs/core/lib/oauth.lib.php b/htdocs/core/lib/oauth.lib.php
index 48356868143..ab1b5a217b8 100644
--- a/htdocs/core/lib/oauth.lib.php
+++ b/htdocs/core/lib/oauth.lib.php
@@ -25,13 +25,13 @@
 
 // Supported OAUTH (a provider is supported when a file xxx_oauthcallback.php is available into htdocs/core/modules/oauth)
 $supportedoauth2array = array(
-	'OAUTH_GOOGLE_NAME'=>'google',
+	'OAUTH_GOOGLE_NAME'=>array('callbackfile' => 'google', 'picto' => 'google', 'urlforapp' => 'OAUTH_GOOGLE_DESC', 'name'=>'Google'),
 );
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-	$supportedoauth2array['OAUTH_STRIPE_TEST_NAME'] = 'stripetest';
-	$supportedoauth2array['OAUTH_STRIPE_LIVE_NAME'] = 'stripelive';
+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_GITHUB_NAME'] = 'github';
+$supportedoauth2array['OAUTH_GITHUB_NAME'] = array('callbackfile' => 'github', 'picto' => 'github', 'urlforapp' => 'OAUTH_GITHUB_DESC', 'name'=>'GitHub');
 
 
 
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 6dcb40e1cc7..0109847c59a 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -199,15 +199,15 @@ function getCustomerOrderPieChart($socid = 0)
 	$sql = "SELECT count(c.rowid) as nb, c.fk_statut as status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."commande as c";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
 	$sql .= " AND c.entity IN (".getEntity('societe').")";
 	if ($user->socid) {
-		$sql .= ' AND c.fk_soc = '.$user->socid;
+		$sql .= ' AND c.fk_soc = '.((int) $user->socid);
 	}
-	if (!$user->rights->societe->client->voir && !$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 c.fk_statut";
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 4621e22d122..2911564adef 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -99,7 +99,7 @@ function bankline_prepare_head($id)
  */
 function payment_supplier_prepare_head(Paiement $object)
 {
-	global $langs, $conf;
+	global $db, $langs, $conf;
 
 	$h = 0;
 	$head = array();
@@ -120,6 +120,19 @@ function payment_supplier_prepare_head(Paiement $object)
 	$head[$h][2] = 'info';
 	$h++;
 
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->fournisseur->payment->dir_output.'/'.$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.'/fourn/paiement/document.php?id='.$object->id;
+	$head[$h][1] = $langs->trans('Documents');
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
+	$head[$h][2] = 'documents';
+	$h++;
+
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_supplier', 'remove');
 
 	return $head;
@@ -173,8 +186,9 @@ function showOnlinePaymentUrl($type, $ref)
 
 	$out = img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'</span><br>';
 	$url = getOnlinePaymentUrl(0, $type, $ref);
-	$out .= '<div class="urllink"><input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$url.'">';
-	$out .= '<a href="'.$url.'" target="_blank">'.img_picto('', 'globe', 'class="paddingleft"').'</a></div>';
+	$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>';
 	$out .= ajax_autoselect("onlinepaymenturl", 0);
 	return $out;
 }
@@ -191,7 +205,7 @@ function getHtmlOnlinePaymentLink($type, $ref, $label = '')
 {
 	$url = getOnlinePaymentUrl(0, $type, $ref);
 	$label = $label ? $label : $url;
-	return'<a href="'.$url.'" target="_blank">'.$label.'</a>';
+	return '<a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.$label.'</a>';
 }
 
 
@@ -199,14 +213,14 @@ function getHtmlOnlinePaymentLink($type, $ref, $label = '')
  * Return string with full Url
  *
  * @param   int		$mode		      0=True url, 1=Url formated with colors
- * @param   string	$type		      Type of URL ('free', 'order', 'invoice', 'contractline', 'member' ...)
+ * @param   string	$type		      Type of URL ('free', 'order', 'invoice', 'contractline', 'member', 'boothlocation', ...)
  * @param	string	$ref		      Ref of object
- * @param	int		$amount		      Amount (required for $type='free' only)
- * @param	string	$freetag	      Free tag
+ * @param	int		$amount		      Amount (required and used for $type='free' only)
+ * @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
  */
-function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag', $localorexternal = 0)
+function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag', $localorexternal = 1)
 {
 	global $conf, $dolibarr_main_url_root;
 
@@ -224,7 +238,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 	}
 
 	if ($type == 'free') {
-		$out = $urltouse.'/public/payment/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?amount='.($mode ? '<span style="color: #666666">' : '').$amount.($mode ? '</span>' : '').'&tag='.($mode ? '<span style="color: #666666">' : '').$freetag.($mode ? '</span>' : '');
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
@@ -234,120 +248,142 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		}
 		//if ($mode) $out.='&noidempotency=1';
 	} elseif ($type == 'order') {
-		$out = $urltouse.'/public/payment/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source='.$type.'&ref='.($mode ? '<span style="color: #666666">' : '');
 		if ($mode == 1) {
 			$out .= 'order_ref';
 		}
 		if ($mode == 0) {
 			$out .= urlencode($ref);
 		}
-		$out .= ($mode ? '</font>' : '');
+		$out .= ($mode ? '</span>' : '');
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
 			} else {
-				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');
 				if ($mode == 1) {
 					$out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
 				}
 				if ($mode == 0) {
 					$out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
 				}
-				$out .= ($mode ? '</font>' : '');
+				$out .= ($mode ? '</span>' : '');
 			}
 		}
 	} elseif ($type == 'invoice') {
-		$out = $urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source='.$type.'&ref='.($mode ? '<span style="color: #666666">' : '');
 		if ($mode == 1) {
 			$out .= 'invoice_ref';
 		}
 		if ($mode == 0) {
 			$out .= urlencode($ref);
 		}
-		$out .= ($mode ? '</font>' : '');
+		$out .= ($mode ? '</span>' : '');
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
 			} else {
-				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');
 				if ($mode == 1) {
 					$out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
 				}
 				if ($mode == 0) {
 					$out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
 				}
-				$out .= ($mode ? '</font>' : '');
+				$out .= ($mode ? '</span>' : '');
 			}
 		}
 	} elseif ($type == 'contractline') {
-		$out = $urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source='.$type.'&ref='.($mode ? '<span style="color: #666666">' : '');
 		if ($mode == 1) {
 			$out .= 'contractline_ref';
 		}
 		if ($mode == 0) {
 			$out .= urlencode($ref);
 		}
-		$out .= ($mode ? '</font>' : '');
+		$out .= ($mode ? '</span>' : '');
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
 			} else {
-				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');
 				if ($mode == 1) {
 					$out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
 				}
 				if ($mode == 0) {
 					$out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
 				}
-				$out .= ($mode ? '</font>' : '');
+				$out .= ($mode ? '</span>' : '');
 			}
 		}
 	} elseif ($type == 'member' || $type == 'membersubscription') {
 		$newtype = 'member';
-		$out = $urltouse.'/public/payment/newpayment.php?source=member&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=member&ref='.($mode ? '<span style="color: #666666">' : '');
 		if ($mode == 1) {
 			$out .= 'member_ref';
 		}
 		if ($mode == 0) {
 			$out .= urlencode($ref);
 		}
-		$out .= ($mode ? '</font>' : '');
+		$out .= ($mode ? '</span>' : '');
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
 			} else {
-				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');
 				if ($mode == 1) {
 					$out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$newtype."' + member_ref)";
 				}
 				if ($mode == 0) {
 					$out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$newtype.$ref, 2);
 				}
-				$out .= ($mode ? '</font>' : '');
+				$out .= ($mode ? '</span>' : '');
 			}
 		}
-	}
-	if ($type == 'donation') {
-		$out = $urltouse.'/public/payment/newpayment.php?source=donation&ref='.($mode ? '<font color="#666666">' : '');
+	} elseif ($type == 'donation') {
+		$out = $urltouse.'/public/payment/newpayment.php?source='.$type.'&ref='.($mode ? '<span style="color: #666666">' : '');
 		if ($mode == 1) {
 			$out .= 'donation_ref';
 		}
 		if ($mode == 0) {
 			$out .= urlencode($ref);
 		}
-		$out .= ($mode ? '</font>' : '');
+		$out .= ($mode ? '</span>' : '');
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
 			} else {
-				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');
 				if ($mode == 1) {
 					$out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
 				}
 				if ($mode == 0) {
 					$out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
 				}
-				$out .= ($mode ? '</font>' : '');
+				$out .= ($mode ? '</span>' : '');
+			}
+		}
+	} elseif ($type == 'boothlocation') {
+		$out = $urltouse.'/public/payment/newpayment.php?source='.$type.'&ref='.($mode ? '<span style="color: #666666">' : '');
+		if ($mode == 1) {
+			$out .= 'invoice_ref';
+		}
+		if ($mode == 0) {
+			$out .= urlencode($ref);
+		}
+		$out .= ($mode ? '</span>' : '');
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+			} else {
+				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');
+				if ($mode == 1) {
+					$out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
+				}
+				if ($mode == 0) {
+					$out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				}
+				$out .= ($mode ? '</span>' : '');
 			}
 		}
 	}
@@ -425,9 +461,11 @@ function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0,
 		$line2 .= ($line2 ? " - " : "").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
 	}
 
+	print '<!-- htmlPrintOnlinePaymentFooter -->'."\n";
+
 	print '<br>';
 
-	print '<div class="center">'."\n";
+	print '<div class="center paddingleft paddingright">'."\n";
 	if ($addformmessage) {
 		print '<!-- object = '.$object->element.' -->';
 		print '<br>';
@@ -450,7 +488,7 @@ function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0,
 		}
 	}
 
-	print '<font style="font-size: 10px;"><br><hr>'."\n";
+	print '<span style="font-size: 10px;"><br><hr>'."\n";
 	print $fromcompany->name.'<br>';
 	print $line1;
 	if (strlen($line1.$line2) > 50) {
@@ -459,5 +497,5 @@ function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0,
 		print ' - ';
 	}
 	print $line2;
-	print '</font></div>'."\n";
+	print '</span></div>'."\n";
 }
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 1755378f7d4..374c4ff4c4c 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
@@ -35,6 +35,8 @@
  *	\ingroup    core
  */
 
+include_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
+
 
 /**
  *  Return array head with list of tabs to view object informations.
@@ -49,7 +51,7 @@ function pdf_admin_prepare_head()
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/admin/pdf.php';
-	$head[$h][1] = $langs->trans("Common");
+	$head[$h][1] = $langs->trans("Parameters");
 	$head[$h][2] = 'general';
 	$h++;
 
@@ -177,8 +179,8 @@ function pdf_getInstance($format = '', $metric = 'mm', $pagetype = 'P')
 	//$metric=$arrayformat['unit'];
 
 	$pdfa = false; // PDF-1.3
-	if (!empty($conf->global->PDF_USE_1A)) {
-		$pdfa = true; // PDF1/A
+	if (!empty($conf->global->PDF_USE_A)) {
+		$pdfa = $conf->global->PDF_USE_A; 	// PDF/A-1 ou PDF/A-3
 	}
 
 	if (class_exists('TCPDI')) {
@@ -707,9 +709,13 @@ function pdf_pagehead(&$pdf, $outputlangs, $page_height)
 
 	// Add a background image on document only if good setup of const
 	if (!empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF) && ($conf->global->MAIN_USE_BACKGROUND_ON_PDF != '-1')) {		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
-		$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak before adding image
-		$pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_X : 0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y : 0), 0, $page_height);
-		$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak
+		$filepath = $conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF;
+		if (file_exists($filepath)) {
+			$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak before adding image
+			$pdf->Image($filepath, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_X : 0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y : 0), 0, $page_height);
+			$pdf->SetPageMark(); // This option avoid to have the images missing on some pages
+			$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak
+		}
 	}
 }
 
@@ -975,7 +981,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
  */
 function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_basse, $marge_gauche, $page_hauteur, $object, $showdetails = 0, $hidefreetext = 0)
 {
-	global $conf, $user, $mysoc;
+	global $conf, $user, $mysoc, $hookmanager;
 
 	$outputlangs->load("dict");
 	$line = '';
@@ -1046,7 +1052,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 			$line2 .= ($line2 ? " - " : "").$fromcompany->email;
 		}
 	}
-	if ($showdetails == 2 || $showdetails == 3 || ($fromcompany->country_code == 'DE')) {
+	if ($showdetails == 2 || $showdetails == 3 || (!empty($fromcompany->country_code) && $fromcompany->country_code == 'DE')) {
 		// Managers
 		if ($fromcompany->managers) {
 			$line2 .= ($line2 ? " - " : "").$fromcompany->managers;
@@ -1055,11 +1061,11 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 
 	// Line 3 of company infos
 	// Juridical status
-	if ($fromcompany->forme_juridique_code) {
+	if (!empty($fromcompany->forme_juridique_code) && $fromcompany->forme_juridique_code) {
 		$line3 .= ($line3 ? " - " : "").$outputlangs->convToOutputCharset(getFormeJuridiqueLabel($fromcompany->forme_juridique_code));
 	}
 	// Capital
-	if ($fromcompany->capital) {
+	if (!empty($fromcompany->capital) && $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));
@@ -1068,7 +1074,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		}
 	}
 	// Prof Id 1
-	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2)) {
+	if (!empty($fromcompany->idprof1) && $fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2)) {
 		$field = $outputlangs->transcountrynoentities("ProfId1", $fromcompany->country_code);
 		if (preg_match('/\((.*)\)/i', $field, $reg)) {
 			$field = $reg[1];
@@ -1076,7 +1082,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		$line3 .= ($line3 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof1);
 	}
 	// Prof Id 2
-	if ($fromcompany->idprof2) {
+	if (!empty($fromcompany->idprof2) && $fromcompany->idprof2) {
 		$field = $outputlangs->transcountrynoentities("ProfId2", $fromcompany->country_code);
 		if (preg_match('/\((.*)\)/i', $field, $reg)) {
 			$field = $reg[1];
@@ -1086,7 +1092,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 
 	// Line 4 of company infos
 	// Prof Id 3
-	if ($fromcompany->idprof3) {
+	if (!empty($fromcompany->idprof3) && $fromcompany->idprof3) {
 		$field = $outputlangs->transcountrynoentities("ProfId3", $fromcompany->country_code);
 		if (preg_match('/\((.*)\)/i', $field, $reg)) {
 			$field = $reg[1];
@@ -1094,7 +1100,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof3);
 	}
 	// Prof Id 4
-	if ($fromcompany->idprof4) {
+	if (!empty($fromcompany->idprof4) && $fromcompany->idprof4) {
 		$field = $outputlangs->transcountrynoentities("ProfId4", $fromcompany->country_code);
 		if (preg_match('/\((.*)\)/i', $field, $reg)) {
 			$field = $reg[1];
@@ -1102,7 +1108,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof4);
 	}
 	// Prof Id 5
-	if ($fromcompany->idprof5) {
+	if (!empty($fromcompany->idprof5) && $fromcompany->idprof5) {
 		$field = $outputlangs->transcountrynoentities("ProfId5", $fromcompany->country_code);
 		if (preg_match('/\((.*)\)/i', $field, $reg)) {
 			$field = $reg[1];
@@ -1110,7 +1116,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof5);
 	}
 	// Prof Id 6
-	if ($fromcompany->idprof6) {
+	if (!empty($fromcompany->idprof6) &&  $fromcompany->idprof6) {
 		$field = $outputlangs->transcountrynoentities("ProfId6", $fromcompany->country_code);
 		if (preg_match('/\((.*)\)/i', $field, $reg)) {
 			$field = $reg[1];
@@ -1118,7 +1124,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof6);
 	}
 	// IntraCommunautary VAT
-	if ($fromcompany->tva_intra != '') {
+	if (!empty($fromcompany->tva_intra)  && $fromcompany->tva_intra != '') {
 		$line4 .= ($line4 ? " - " : "").$outputlangs->transnoentities("VATIntraShort").": ".$outputlangs->convToOutputCharset($fromcompany->tva_intra);
 	}
 
@@ -1143,50 +1149,82 @@ 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;
+	// For customize footer
+	if (is_object($hookmanager)) {
+		$parameters = array('line1' => $line1, 'line2' => $line2, 'line3' => $line3, 'line4' => $line4, 'outputlangs'=>$outputlangs);
+		$action = '';
+		$hookmanager->executeHooks('pdf_pagefoot', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+		if (!empty($hookmanager->resPrint) && $hidefreetext == 0) {
+			$mycustomfooter = $hookmanager->resPrint;
+			$mycustomfooterheight = pdfGetHeightForHtmlContent($pdf, dol_htmlentitiesbr($mycustomfooter, 1, 'UTF-8', 0));
 
-	if ($line) {	// Free text
-		$pdf->SetXY($dims['lm'], -$posy);
-		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {   // by default
-			$pdf->MultiCell(0, 3, $line, 0, $align, 0);
+			$marginwithfooter = $marge_basse + $freetextheight + $mycustomfooterheight;
+			$posy = $marginwithfooter + 0;
+
+			if ($line) {	// Free text
+				$pdf->SetXY($dims['lm'], -$posy);
+				if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {   // by default
+					$pdf->MultiCell(0, 3, $line, 0, $align, 0);
+				} else {
+					$pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
+				}
+				$posy -= $freetextheight;
+			}
+
+			$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));
+
+			$posy -= $mycustomfooterheight - 3;
 		} 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));
+			// Else default footer
+			$marginwithfooter = $marge_basse + $freetextheight + (!empty($line1) ? 3 : 0) + (!empty($line2) ? 3 : 0) + (!empty($line3) ? 3 : 0) + (!empty($line4) ? 3 : 0);
+			$posy = $marginwithfooter + 0;
+
+			if ($line) {	// Free text
+				$pdf->SetXY($dims['lm'], -$posy);
+				if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {   // by default
+					$pdf->MultiCell(0, 3, $line, 0, $align, 0);
+				} else {
+					$pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
+				}
+				$posy -= $freetextheight;
+			}
+
+			$pdf->SetY(-$posy);
+			$pdf->line($dims['lm'], $dims['hk'] - $posy, $dims['wk'] - $dims['rm'], $dims['hk'] - $posy);
+			$posy--;
+
+			if (!empty($line1)) {
+				$pdf->SetFont('', 'B', 7);
+				$pdf->SetXY($dims['lm'], -$posy);
+				$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line1, 0, 'C', 0);
+				$posy -= 3;
+				$pdf->SetFont('', '', 7);
+			}
+
+			if (!empty($line2)) {
+				$pdf->SetFont('', 'B', 7);
+				$pdf->SetXY($dims['lm'], -$posy);
+				$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line2, 0, 'C', 0);
+				$posy -= 3;
+				$pdf->SetFont('', '', 7);
+			}
+
+			if (!empty($line3)) {
+				$pdf->SetXY($dims['lm'], -$posy);
+				$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line3, 0, 'C', 0);
+			}
+
+			if (!empty($line4)) {
+				$posy -= 3;
+				$pdf->SetXY($dims['lm'], -$posy);
+				$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line4, 0, 'C', 0);
+			}
 		}
-		$posy -= $freetextheight;
 	}
-
-	$pdf->SetY(-$posy);
-	$pdf->line($dims['lm'], $dims['hk'] - $posy, $dims['wk'] - $dims['rm'], $dims['hk'] - $posy);
-	$posy--;
-
-	if (!empty($line1)) {
-		$pdf->SetFont('', 'B', 7);
-		$pdf->SetXY($dims['lm'], -$posy);
-		$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line1, 0, 'C', 0);
-		$posy -= 3;
-		$pdf->SetFont('', '', 7);
-	}
-
-	if (!empty($line2)) {
-		$pdf->SetFont('', 'B', 7);
-		$pdf->SetXY($dims['lm'], -$posy);
-		$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line2, 0, 'C', 0);
-		$posy -= 3;
-		$pdf->SetFont('', '', 7);
-	}
-
-	if (!empty($line3)) {
-		$pdf->SetXY($dims['lm'], -$posy);
-		$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line3, 0, 'C', 0);
-	}
-
-	if (!empty($line4)) {
-		$posy -= 3;
-		$pdf->SetXY($dims['lm'], -$posy);
-		$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line4, 0, 'C', 0);
-	}
-
 	// Show page nb only on iso languages (so default Helvetica font)
 	if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica') {
 		$pdf->SetXY($dims['wk'] - $dims['rm'] - 15, -$posy);
@@ -1359,29 +1397,39 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		$desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);
 	}
 
-	// Description short of product line
-	$libelleproduitservice = $label;
-	if (!empty($libelleproduitservice) && !empty($conf->global->PDF_BOLD_PRODUCT_LABEL)) {
-		$libelleproduitservice = '<b>'.$libelleproduitservice.'</b>';
+	if (empty($conf->global->PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES)) {
+		// Description short of product line
+		$libelleproduitservice = $label;
+		if (!empty($libelleproduitservice) && !empty($conf->global->PDF_BOLD_PRODUCT_LABEL)) {
+			// Adding <b> may convert the original string into a HTML string. Sowe have to first
+			// convert \n into <br> we text is not already HTML.
+			if (!dol_textishtml($libelleproduitservice)) {
+				$libelleproduitservice = str_replace("\n", '<br>', $libelleproduitservice);
+			}
+			$libelleproduitservice = '<b>'.$libelleproduitservice.'</b>';
+		}
 	}
 
+
 	// Add ref of subproducts
 	if (!empty($conf->global->SHOW_SUBPRODUCT_REF_IN_PDF)) {
 		$prodser->get_sousproduits_arbo();
 		if (!empty($prodser->sousprods) && is_array($prodser->sousprods) && count($prodser->sousprods)) {
 			$tmparrayofsubproducts = reset($prodser->sousprods);
-			foreach ($tmparrayofsubproducts as $subprodval) {
-				$libelleproduitservice .= "\n * ".$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].')');
+				}
 			}
 		}
 	}
 
 	// Description long of product line
 	if (!empty($desc) && ($desc != $label)) {
-		if ($libelleproduitservice && empty($hidedesc)) {
-			$libelleproduitservice .= '__N__';
-		}
-
 		if ($desc == '(CREDIT_NOTE)' && $object->lines[$i]->fk_remise_except) {
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
@@ -1415,17 +1463,17 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 				}
 				if (empty($hidedesc)) {
 					if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST)) {
-						$libelleproduitservice = $desc."\n".$libelleproduitservice;
+						$libelleproduitservice = dol_concatdesc($desc, $libelleproduitservice);
 					} else {
 						if (!empty($conf->global->HIDE_LABEL_VARIANT_PDF) && $prodser->isVariant()) {
 							$libelleproduitservice = $desc;
 						} else {
-							$libelleproduitservice .= $desc;
+							$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
 						}
 					}
 				}
 			} else {
-				$libelleproduitservice .= $desc;
+				$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
 			}
 		}
 	}
@@ -1489,7 +1537,11 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	}
 
 	if (!empty($ref_prodserv) && !empty($conf->global->PDF_BOLD_PRODUCT_REF_AND_PERIOD)) {
+		if (!dol_textishtml($libelleproduitservice)) {
+			$libelleproduitservice = str_replace("\n", '<br>', $libelleproduitservice);
+		}
 		$ref_prodserv = '<b>'.$ref_prodserv.'</b>';
+		// $prefix_prodserv and $ref_prodser are not HTML var
 	}
 	$libelleproduitservice = $prefix_prodserv.$ref_prodserv.$libelleproduitservice;
 
@@ -1503,7 +1555,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			// Adding the descriptions if they are filled
 			$desccateg = $cate->description;
 			if ($desccateg) {
-				$libelleproduitservice .= '__N__'.$desccateg;
+				$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desccateg);
 			}
 		}
 	}
@@ -1523,9 +1575,12 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		}
 		//print '>'.$outputlangs->charset_output.','.$period;
 		if (!empty($conf->global->PDF_BOLD_PRODUCT_REF_AND_PERIOD)) {
-			$libelleproduitservice .= '<b style="color:#333666;" ><em>'."__N__</b> ".$period.'</em>';
+			if (!dol_textishtml($libelleproduitservice)) {
+				$libelleproduitservice = str_replace("\n", '<br>', $libelleproduitservice);
+			}
+			$libelleproduitservice .= '<br><b style="color:#333666;" ><em>'.$period.'</em></b>';
 		} else {
-			$libelleproduitservice .= "__N__".$period;
+			$libelleproduitservice = dol_concatdesc($libelleproduitservice, $period);
 		}
 		//print $libelleproduitservice;
 	}
@@ -2213,47 +2268,6 @@ function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
 	return $result;
 }
 
-/**
- *	Return total quantity of products and/or services
- *
- *	@param	Object		$object				Object
- *	@param	string		$type				Type
- *  @param  Translate	$outputlangs		Object langs for output
- * 	@return	integer
- *  @deprecated Not used by Dolibarr core, so will be removed.
- */
-function pdf_getTotalQty($object, $type, $outputlangs)
-{
-	global $hookmanager;
-
-	$total = 0;
-	$nblines = count($object->lines);
-
-	// Loop on each lines
-	for ($i = 0; $i < $nblines; $i++) {
-		if ($object->lines[$i]->special_code != 3) {
-			if ($type == 'all') {
-				$total += $object->lines[$i]->qty;
-			} elseif ($type == 9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line))) {
-				$special_code = $object->lines[$i]->special_code;
-				if (!empty($object->lines[$i]->fk_parent_line)) {
-					$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-				}
-				$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
-				$action = '';
-				$reshook = $hookmanager->executeHooks('pdf_getTotalQty', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-				return $hookmanager->resPrint;
-			} elseif ($type == 0 && $object->lines[$i]->product_type == 0) {
-				$total += $object->lines[$i]->qty;
-			} elseif ($type == 1 && $object->lines[$i]->product_type == 1) {
-				$total += $object->lines[$i]->qty;
-			}
-		}
-	}
-
-	return $total;
-}
-
 /**
  * 	Return linked objects to use for document generation.
  *  Warning: To save space, this function returns only one link per link type (all links are concated on same record string). This function is used by pdf_writeLinkedObjects
@@ -2262,7 +2276,7 @@ function pdf_getTotalQty($object, $type, $outputlangs)
  * 	@param	Translate	$outputlangs	Object lang for output
  * 	@return	array                       Linked objects
  */
-function pdf_getLinkedObjects($object, $outputlangs)
+function pdf_getLinkedObjects(&$object, $outputlangs)
 {
 	global $db, $hookmanager;
 
@@ -2284,7 +2298,15 @@ function pdf_getLinkedObjects($object, $outputlangs)
 			}
 		} elseif ($objecttype == 'commande' || $objecttype == 'supplier_order') {
 			$outputlangs->load('orders');
-			foreach ($objects as $elementobject) {
+
+			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("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]['date_title'] = $outputlangs->transnoentities("OrderDate");
@@ -2309,12 +2331,43 @@ function pdf_getLinkedObjects($object, $outputlangs)
 		} elseif ($objecttype == 'shipping') {
 			$outputlangs->loadLangs(array("orders", "sendings"));
 
-			foreach ($objects as $x => $elementobject) {
+			if (count($objects) > 1) {
+				$order = null;
+				if (empty($object->linkedObjects['commande']) && $object->element != 'commande') {
+					$object->note_public = dol_concatdesc($object->note_public, '<br>'.$outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' : <br>');
+				} else {
+					$object->note_public = dol_concatdesc($object->note_public, '<br>'.$outputlangs->transnoentities("RefSending").' : <br>');
+				}
+				// We concat this record info into fields xxx_value. title is overwrote.
+				foreach ($objects as $elementobject) {
+					if (empty($object->linkedObjects['commande']) && $object->element != 'commande') {    // There is not already a link to order and object is not the order, so we show also info with order
+						$elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
+						if (! empty($elementobject->linkedObjectsIds['commande'])) {
+							include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+							$order = new Commande($db);
+							$ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande']));
+							if ($ret < 1) {
+								$order = null;
+							}
+						}
+					}
+
+					if (! is_object($order)) {
+						$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities($elementobject->ref));
+						$object->note_public = dol_concatdesc($object->note_public, '<br>');
+					} else {
+						$object->note_public = dol_concatdesc($object->note_public, $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : ''));
+						$object->note_public = dol_concatdesc($object->note_public, ' / '.$outputlangs->transnoentities($elementobject->ref));
+						$object->note_public = dol_concatdesc($object->note_public, '<br>');
+					}
+				}
+			} elseif (count($objects) == 1) {
+				$elementobject = array_shift($objects);
 				$order = null;
 				// We concat this record info into fields xxx_value. title is overwrote.
-				if (empty($object->linkedObjects['commande']) && $object->element != 'commande') {	// There is not already a link to order and object is not the order, so we show also info with order
+				if (empty($object->linkedObjects['commande']) && $object->element != 'commande') {    // There is not already a link to order and object is not the order, so we show also info with order
 					$elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
-					if (!empty($elementobject->linkedObjectsIds['commande'])) {
+					if (! empty($elementobject->linkedObjectsIds['commande'])) {
 						include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 						$order = new Commande($db);
 						$ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande']));
@@ -2323,24 +2376,15 @@ function pdf_getLinkedObjects($object, $outputlangs)
 						}
 					}
 				}
-				if (!is_object($order)) {
+
+				if (! is_object($order)) {
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
-					if (!empty($linkedobjects[$objecttype]['ref_value'])) {
-						$linkedobjects[$objecttype]['ref_value'] .= ' / ';
-					}
+					if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / ';
 					$linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref);
-					//$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");
-					//if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';
-					//$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
 				} else {
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending");
-					if (empty($linkedobjects[$objecttype]['ref_value'])) {
-						$linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');
-					}
+					if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');
 					$linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref);
-					//$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : '');
-					//if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
-					//$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
 				}
 			}
 		}
diff --git a/htdocs/core/lib/phpsessionindb.lib.php b/htdocs/core/lib/phpsessionindb.lib.php
index 132036ba23d..8001b3ece60 100644
--- a/htdocs/core/lib/phpsessionindb.lib.php
+++ b/htdocs/core/lib/phpsessionindb.lib.php
@@ -29,15 +29,29 @@
 /**
  * The session open handler called by PHP whenever a session is initialized.
  *
- * @param	string	$database_name  Database NamedConstraint
- * @param	string	$table_name		Table name
+ * @param	string	$save_path      Value of session.save_path into php.ini
+ * @param	string	$session_name	Session name (Example: 'DOLSESSID_xxxxxx')
  * @return	boolean					Always true
  */
-function dolSessionOpen($database_name, $table_name)
+function dolSessionOpen($save_path, $session_name)
 {
-	global $conf, $dbsession;
+	global $dbsession;
 
-	$dbsession = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
+	global $dolibarr_main_db_type, $dolibarr_main_db_host;
+	global $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name, $dolibarr_main_db_port;
+
+	global $dolibarr_session_db_type, $dolibarr_session_db_host;
+	global $dolibarr_session_db_user, $dolibarr_session_db_pass, $dolibarr_session_db_name, $dolibarr_session_db_port;
+
+	if (empty($dolibarr_session_db_type)) {	$dolibarr_session_db_type = $dolibarr_main_db_type; }
+	if (empty($dolibarr_session_db_host)) {	$dolibarr_session_db_host = $dolibarr_main_db_host; }
+	if (empty($dolibarr_session_db_user)) {	$dolibarr_session_db_user = $dolibarr_main_db_user; }
+	if (empty($dolibarr_session_db_pass)) {	$dolibarr_session_db_pass = $dolibarr_main_db_pass; }
+	if (empty($dolibarr_session_db_name)) {	$dolibarr_session_db_name = $dolibarr_main_db_name; }
+	if (empty($dolibarr_session_db_port)) {	$dolibarr_session_db_port = $dolibarr_main_db_port; }
+	//var_dump('open '.$database_name.' '.$table_name);
+
+	$dbsession = getDoliDBInstance($dolibarr_session_db_type, $dolibarr_session_db_host, $dolibarr_session_db_user, $dolibarr_session_db_pass, $dolibarr_session_db_name, $dolibarr_session_db_port);
 
 	return true;
 }
@@ -51,8 +65,10 @@ function dolSessionOpen($database_name, $table_name)
 function dolSessionRead($sess_id)
 {
 	global $dbsession;
+	global $sessionlastvalueread;
+	global $sessionidfound;
 
-	$sql = "SELECT session_variable FROM ".MAIN_DB_PREFIX."session";
+	$sql = "SELECT session_id, session_variable FROM ".MAIN_DB_PREFIX."session";
 	$sql .= " WHERE session_id = '".$dbsession->escape($sess_id)."'";
 
 	// Execute the query
@@ -60,10 +76,16 @@ function dolSessionRead($sess_id)
 	$num_rows = $dbsession->num_rows($resql);
 	if ($num_rows == 0) {
 		// No session found - return an empty string
+		$sessionlastvalueread = '';
+		$sessionidfound = '';
 		return '';
 	} else {
 		// Found a session - return the serialized string
 		$obj = $dbsession->fetch_object($resql);
+		$sessionlastvalueread = $obj->session_variable;
+		$sessionidfound = $obj->session_id;
+		//var_dump($sessionlastvalueread);
+		//var_dump($sessionidfound);
 		return $obj->session_variable;
 	}
 }
@@ -79,42 +101,84 @@ function dolSessionRead($sess_id)
 function dolSessionWrite($sess_id, $val)
 {
 	global $dbsession;
+	global $sessionlastvalueread;
+	global $sessionidfound;
 
-	$time_stamp = dol_now();
+	/*var_dump('write '.$sess_id);
+	var_dump($val);
+	var_dump('sessionlastvalueread='.$sessionlastvalueread.' sessionidfound='.$sessionidfound);
+	*/
 
-	$sql = "SELECT session_id FROM ".MAIN_DB_PREFIX."session";
-	$sql .= " WHERE session_id = '".$dbsession->escape($sess_id)."'";
+	//$sessionlastvalueread='';
+	if ($sessionlastvalueread != $val) {
+		$time_stamp = dol_now();
 
-	// Execute the query
-	$resql = $dbsession->query($sql);
-	$num_rows = $dbsession->num_rows($resql);
-	if ($num_rows == 0) {
-		// No session found, insert a new one
-		$insert_query = "INSERT INTO ".MAIN_DB_PREFIX."session";
-		$insert_query .= "(session_id, session_variable, last_accessed)";
-		$insert_query .= " VALUES ('".$dbsession->escape($sess_id)."', '".$dbsession->escape($val)."', '".$dbsession->idate($time_stamp)."')";
-		$dbsession->query($insert_query);
-	} else {
-		// Existing session found - Update the session variables
-		$update_query = "UPDATE ".MAIN_DB_PREFIX."session";
-		$update_query .= "SET session_variable = '".$dbsession->escape($val)."',";
-		$update_query .= " last_accessed = '".$dbsession->idate($time_stamp)."'";
-		$update_query .= " WHERE session_id = '".$dbsession->escape($sess_id)."'";
-		$dbsession->query($update_query);
+		if (empty($sessionidfound)) {
+			// No session found, insert a new one
+			$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))."')";
+
+			$result = $dbsession->query($insert_query);
+			if (!$result) {
+				dol_print_error($dbsession);
+				return false;
+			}
+		} else {
+			if ($sessionidfound != $sess_id) {
+				// oops. How can this happen ?
+				dol_print_error($dbsession, 'Oops sess_id received in dolSessionWrite differs from the cache value $sessionidfound. How can this happen ?');
+				return false;
+			}
+			/*$sql = "SELECT session_id, session_variable FROM ".MAIN_DB_PREFIX."session";
+			$sql .= " WHERE session_id = '".$dbsession->escape($sess_id)."'";
+
+			// Execute the query
+			$resql = $dbsession->query($sql);
+			$num_rows = $dbsession->num_rows($resql);
+			if ($num_rows == 0) {
+			// No session found, insert a new one
+			$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);
+			$result = $dbsession->query($insert_query);
+			if (!$result) {
+				dol_print_error($dbsession);
+				return false;
+			}
+			} else {
+			*/
+			// Existing session found - Update the session variables
+			$update_query = "UPDATE ".MAIN_DB_PREFIX."session";
+			$update_query .= " SET session_variable = '".$dbsession->escape($val)."',";
+			$update_query .= " last_accessed = '".$dbsession->idate($time_stamp)."',";
+			$update_query .= " remote_ip = '".$dbsession->escape(getUserRemoteIP())."',";
+			$update_query .= " user_agent = '".$dbsession->escape($_SERVER['HTTP_USER_AGENT'])."'";
+			$update_query .= " WHERE session_id = '".$dbsession->escape($sess_id)."'";
+
+			$result = $dbsession->query($update_query);
+			if (!$result) {
+				dol_print_error($dbsession);
+				return false;
+			}
+		}
 	}
+
 	return true;
 }
 
 /**
  * This function is executed on shutdown of the session.
  *
- * @param	string		$sess_id	Session ID
  * @return	boolean					Always returns true.
  */
-function dolSessionClose($sess_id)
+function dolSessionClose()
 {
 	global $dbsession;
 
+	//var_dump('close');
+
 	$dbsession->close();
 
 	return true;
@@ -130,6 +194,8 @@ function dolSessionDestroy($sess_id)
 {
 	global $dbsession;
 
+	//var_dump('destroy');
+
 	$delete_query = "DELETE FROM ".MAIN_DB_PREFIX."session";
 	$delete_query .= " WHERE session_id = '".$dbsession->escape($sess_id)."'";
 	$dbsession->query($delete_query);
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 9be293a81ab..4375d14430b 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -157,8 +157,8 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
 			if ($obj) {
-				$localtax1_rate = (float) $obj->localtax1;		// Use float to force to get first numeric value when value is x:y:z
-				$localtax2_rate = (float) $obj->localtax2;		// Use float to force to get first numeric value when value is -19:-15:-9
+				$localtax1_rate = (float) $obj->localtax1; // Use float to force to get first numeric value when value is x:y:z
+				$localtax2_rate = (float) $obj->localtax2; // Use float to force to get first numeric value when value is -19:-15:-9
 				$localtax1_type = $obj->localtax1_type;
 				$localtax2_type = $obj->localtax2_type;
 				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);
@@ -404,7 +404,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 			}
 		}
 
-		// Recal function using the multicurrency price as reference price. We must set param $multicurrency_tx to 1 to avoid infinite loop.
+		// Recall function using the multicurrency price as reference price. We must set param $multicurrency_tx to 1 to avoid infinite loop.
 		$newresult = calcul_price_total($qty, $pu_devise, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller, $localtaxes_array, $progress, 1, 0, '');
 
 		if ($multicurrency_code) {
@@ -443,7 +443,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	// initialize result array
 	//for ($i=0; $i <= 18; $i++) $result[$i] = (float) $result[$i];
 
-	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.(empty($conf->global->MAIN_ROUNDING_RULE_TOT)?'':$conf->global->MAIN_ROUNDING_RULE_TOT).' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
+	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.(empty($conf->global->MAIN_ROUNDING_RULE_TOT) ? '' : $conf->global->MAIN_ROUNDING_RULE_TOT).' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
 
 	return $result;
 }
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 64cc72a8879..117871b4712 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -382,7 +382,7 @@ function show_stats_for_company($product, $socid)
 		}
 		$langs->load("propal");
 		print '<tr><td>';
-		print '<a href="propal.php?id='.$product->id.'">'.img_object('', 'propal', 'class="paddingright"').$langs->trans("Proposals").'</a>';
+		print '<a href="propal.php?id='.$product->id.'">'.img_object('', 'propal', 'class="pictofixedwidth"').$langs->trans("Proposals").'</a>';
 		print '</td><td class="right">';
 		print $product->stats_propale['customers'];
 		print '</td><td class="right">';
@@ -401,7 +401,7 @@ function show_stats_for_company($product, $socid)
 		}
 		$langs->load("supplier_proposal");
 		print '<tr><td>';
-		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('', 'supplier_proposal', 'class="paddingright"').$langs->trans("SupplierProposals").'</a>';
+		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('', 'supplier_proposal', 'class="pictofixedwidth"').$langs->trans("SupplierProposals").'</a>';
 		print '</td><td class="right">';
 		print $product->stats_proposal_supplier['suppliers'];
 		print '</td><td class="right">';
@@ -420,7 +420,7 @@ function show_stats_for_company($product, $socid)
 		}
 		$langs->load("orders");
 		print '<tr><td>';
-		print '<a href="commande.php?id='.$product->id.'">'.img_object('', 'order', 'class="paddingright"').$langs->trans("CustomersOrders").'</a>';
+		print '<a href="commande.php?id='.$product->id.'">'.img_object('', 'order', 'class="pictofixedwidth"').$langs->trans("CustomersOrders").'</a>';
 		print '</td><td class="right">';
 		print $product->stats_commande['customers'];
 		print '</td><td class="right">';
@@ -439,7 +439,7 @@ function show_stats_for_company($product, $socid)
 		}
 		$langs->load("orders");
 		print '<tr><td>';
-		print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('', 'supplier_order', 'class="paddingright"').$langs->trans("SuppliersOrders").'</a>';
+		print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('', 'supplier_order', 'class="pictofixedwidth"').$langs->trans("SuppliersOrders").'</a>';
 		print '</td><td class="right">';
 		print $product->stats_commande_fournisseur['suppliers'];
 		print '</td><td class="right">';
@@ -458,7 +458,7 @@ function show_stats_for_company($product, $socid)
 		}
 		$langs->load("bills");
 		print '<tr><td>';
-		print '<a href="facture.php?id='.$product->id.'">'.img_object('', 'bill').' '.$langs->trans("CustomersInvoices").'</a>';
+		print '<a href="facture.php?id='.$product->id.'">'.img_object('', 'bill', 'class="pictofixedwidth"').$langs->trans("CustomersInvoices").'</a>';
 		print '</td><td class="right">';
 		print $product->stats_facture['customers'];
 		print '</td><td class="right">';
@@ -477,7 +477,7 @@ function show_stats_for_company($product, $socid)
 		}
 		$langs->load("bills");
 		print '<tr><td>';
-		print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('', 'supplier_invoice', 'class="paddingright"').$langs->trans("SuppliersInvoices").'</a>';
+		print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('', 'supplier_invoice', 'class="pictofixedwidth"').$langs->trans("SuppliersInvoices").'</a>';
 		print '</td><td class="right">';
 		print $product->stats_facture_fournisseur['suppliers'];
 		print '</td><td class="right">';
@@ -497,7 +497,7 @@ function show_stats_for_company($product, $socid)
 		}
 		$langs->load("contracts");
 		print '<tr><td>';
-		print '<a href="contrat.php?id='.$product->id.'">'.img_object('', 'contract', 'class="paddingright"').$langs->trans("Contracts").'</a>';
+		print '<a href="contrat.php?id='.$product->id.'">'.img_object('', 'contract', 'class="pictofixedwidth"').$langs->trans("Contracts").'</a>';
 		print '</td><td class="right">';
 		print $product->stats_contrat['customers'];
 		print '</td><td class="right">';
@@ -518,7 +518,7 @@ function show_stats_for_company($product, $socid)
 		$langs->load("mrp");
 
 		print '<tr><td>';
-		print '<a href="bom.php?id='.$product->id.'">'.img_object('', 'bom', 'class="paddingright"').$langs->trans("BOM").'</a>';
+		print '<a href="bom.php?id='.$product->id.'">'.img_object('', 'bom', 'class="pictofixedwidth"').$langs->trans("BOM").'</a>';
 		print '</td><td class="right">';
 
 		print '</td><td class="right">';
@@ -540,7 +540,7 @@ function show_stats_for_company($product, $socid)
 		}
 		$langs->load("mrp");
 		print '<tr><td>';
-		print '<a href="mo.php?id='.$product->id.'">'.img_object('', 'mrp', 'class="paddingright"').$langs->trans("MO").'</a>';
+		print '<a href="mo.php?id='.$product->id.'">'.img_object('', 'mrp', 'class="pictofixedwidth"').$langs->trans("MO").'</a>';
 		print '</td><td class="right">';
 		print $form->textwithpicto($product->stats_mo['customers_toconsume'], $langs->trans("ToConsume"));
 		print $form->textwithpicto($product->stats_mo['customers_consumed'], $langs->trans("QtyAlreadyConsumed"));
@@ -589,12 +589,12 @@ function measuring_units_string($scale = '', $measuring_style = '', $unit = 0, $
 /**
  *	Return translation label of a unit key
  *
- *	@param	int		$unit                ID of unit (rowid in llx_c_units table)
- *	@param  string	$measuring_style     Style of unit: 'weight', 'volume', ..., '' = 'net_measure' for option PRODUCT_ADD_NET_MEASURE
- *  @param	string  $scale				 Scale of unit: '0', '-3', '6', ...
- *  @param	int		$use_short_label	 1=Use short label ('g' instead of 'gram'). Short labels are not translated.
+ *	@param	int			$unit               ID of unit (rowid in llx_c_units table)
+ *	@param  string		$measuring_style    Style of unit: 'weight', 'volume', ..., '' = 'net_measure' for option PRODUCT_ADD_NET_MEASURE
+ *  @param	string  	$scale				Scale of unit: '0', '-3', '6', ...
+ *  @param	int			$use_short_label	1=Use short label ('g' instead of 'gram'). Short labels are not translated.
  *  @param	Translate	$outputlangs		Language object
- *	@return	string	   			         Unit string
+ *	@return	string	   			         	Unit string
  * 	@see	formproduct->selectMeasuringUnits()
  */
 function measuringUnitString($unit, $measuring_style = '', $scale = '', $use_short_label = 0, $outputlangs = null)
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index c293b7c47ae..90a67991413 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -311,7 +311,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");
+	$head[$h][1] = $langs->trans("Events");
 	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$h][1] .= '/';
 		$head[$h][1] .= $langs->trans("Agenda");
@@ -357,7 +357,7 @@ function task_prepare_head($object)
 	//$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".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 .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
-	$sql .= " WHERE t.fk_task =".$object->id;
+	$sql .= " WHERE t.fk_task = ".((int) $object->id);
 	$resql = $db->query($sql);
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
@@ -368,7 +368,7 @@ function task_prepare_head($object)
 		dol_print_error($db);
 	}
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.urlencode($object->id).(GETPOST('withproject') ? '&withproject=1' : '');
 	$head[$h][1] = $langs->trans("TimeSpent");
 	if ($nbTimeSpent > 0) {
 		$head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';
@@ -390,7 +390,7 @@ function task_prepare_head($object)
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.urlencode($object->id).(GETPOST('withproject') ? '&withproject=1' : '');
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
 			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
@@ -471,14 +471,6 @@ function project_timesheet_prepare_head($mode, $fuser = null)
 		$h++;
 	}
 
-	/*if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
-	{
-		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perline.php".($param?'?'.$param:'');
-		$head[$h][1] = $langs->trans("InputDetail");
-		$head[$h][2] = 'inputperline';
-		$h++;
-	}*/
-
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'project_timesheet');
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'project_timesheet', 'remove');
@@ -517,7 +509,7 @@ function project_admin_prepare_head()
 	$head[$h][2] = 'attributes_task';
 	$h++;
 
-	if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
+	if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 		$langs->load("members");
 
 		$head[$h][0] = DOL_URL_ROOT.'/projet/admin/website.php';
@@ -572,7 +564,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 	$numlines = count($lines);
 
 	// We declare counter as global because we want to edit them into recursive call
-	global $total_projectlinesa_spent, $total_projectlinesa_planned, $total_projectlinesa_spent_if_planned, $total_projectlinesa_declared_if_planned, $total_projectlinesa_tobill, $total_projectlinesa_billed;
+	global $total_projectlinesa_spent, $total_projectlinesa_planned, $total_projectlinesa_spent_if_planned, $total_projectlinesa_declared_if_planned, $total_projectlinesa_tobill, $total_projectlinesa_billed, $total_budget_amount;
 
 	if ($level == 0) {
 		$total_projectlinesa_spent = 0;
@@ -581,6 +573,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		$total_projectlinesa_declared_if_planned = 0;
 		$total_projectlinesa_tobill = 0;
 		$total_projectlinesa_billed = 0;
+		$total_budget_amount = 0;
 	}
 
 	for ($i = 0; $i < $numlines; $i++) {
@@ -651,6 +644,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				$taskstatic->datee = $lines[$i]->date_end; // deprecated
 				$taskstatic->planned_workload = $lines[$i]->planned_workload;
 				$taskstatic->duration_effective = $lines[$i]->duration;
+				$taskstatic->budget_amount = $lines[$i]->budget_amount;
 
 
 				if ($showproject) {
@@ -685,22 +679,23 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 				// Title of task
 				if (count($arrayfields) > 0 && !empty($arrayfields['t.label']['checked'])) {
-					print '<td>';
+					$labeltoshow = '';
 					if ($showlineingray) {
-						print '<i>';
+						$labeltoshow .= '<i>';
 					}
 					//else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$lines[$i]->id.'&withproject=1">';
 					for ($k = 0; $k < $level; $k++) {
-						print '<div class="marginleftonly">';
+						$labeltoshow .= '<div class="marginleftonly">';
 					}
-					print $lines[$i]->label;
+					$labeltoshow .= dol_escape_htmltag($lines[$i]->label);
 					for ($k = 0; $k < $level; $k++) {
-						print '</div>';
+						$labeltoshow .= '</div>';
 					}
 					if ($showlineingray) {
-						print '</i>';
+						$labeltoshow .= '</i>';
 					}
-					//else print '</a>';
+					print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($labeltoshow).'">';
+					print $labeltoshow;
 					print "</td>\n";
 				}
 
@@ -828,36 +823,21 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					}
 				}
 
-				// Contacts of tasks. Disabled, because available by default just after
-				/*
-				if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) {
-					print '<td>';
-					foreach (array('internal', 'external') as $source) {
-						$tab = $lines[$i]->liste_contact(-1, $source);
-						$num = count($tab);
-						if (!empty($num)) {
-							foreach ($tab as $contacttask) {
-								//var_dump($contacttask);
-								if ($source == 'internal') {
-									$c = new User($db);
-								} else {
-									$c = new Contact($db);
-								}
-								$c->fetch($contacttask['id']);
-								print $c->getNomUrl(1).' ('.$contacttask['libelle'].')<br>';
-							}
-						}
-					}
+				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;
 					print '</td>';
-				}*/
+				}
 
 				// Contacts of task
 				if (count($arrayfields) > 0 && !empty($arrayfields['c.assigned']['checked'])) {
 					print '<td class="center">';
+					$ifisrt = 1;
 					foreach (array('internal', 'external') as $source) {
 						$tab = $lines[$i]->liste_contact(-1, $source);
-						$num = count($tab);
-						if (!empty($num)) {
+						$numcontact = count($tab);
+						if (!empty($numcontact)) {
 							foreach ($tab as $contacttask) {
 								//var_dump($contacttask);
 								if ($source == 'internal') {
@@ -867,14 +847,19 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 								}
 								$c->fetch($contacttask['id']);
 								if (!empty($c->photo)) {
-									print $c->getNomUrl(-2).'&nbsp;';
+									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);//.'&nbsp;';
+										print $c->getNomUrl(2, '', 0, 0, 24, 1, '', ($ifisrt ? '' : 'notfirst'));
 									} else {
-										print $c->getNomUrl(2);//.'&nbsp;';
+										print $c->getNomUrl(2, '', 0, '', -1, 0, ($ifisrt ? '' : 'notfirst'));
 									}
 								}
+								$ifisrt = 0;
 							}
 						}
 					}
@@ -921,7 +906,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		}
 	}
 
-	if (($total_projectlinesa_planned > 0 || $total_projectlinesa_spent > 0 || $total_projectlinesa_tobill > 0 || $total_projectlinesa_billed > 0)
+	if (($total_projectlinesa_planned > 0 || $total_projectlinesa_spent > 0 || $total_projectlinesa_tobill > 0 || $total_projectlinesa_billed > 0 || $total_budget_amount > 0)
 		&& $level <= 0) {
 		print '<tr class="liste_total nodrag nodrop">';
 		print '<td class="liste_total">'.$langs->trans("Total").'</td>';
@@ -1021,6 +1006,13 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				print '</td>';
 			}
 		}
+
+		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);
+			print '</td>';
+		}
+
 		// Contacts of task for backward compatibility,
 		if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) {
 			print '<td></td>';
@@ -1313,6 +1305,13 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 to start break , -1 no break
 	}
 
+	$restrictBefore = null;
+
+	if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+	}
+
 	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 	for ($i = 0; $i < $numlines; $i++) {
 		if ($parent == 0) {
@@ -1558,6 +1557,10 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 					$disabledtask = 1;
 				}
 
+				if ($restrictBefore && $preselectedday < $restrictBefore) {
+					$disabledtask = 1;
+				}
+
 				// Form to add new time
 				print '<td class="nowrap leftborder center">';
 				$tableCell = $form->selectDate($preselectedday, $lines[$i]->id, 1, 1, 2, "addtime", 0, 0, $disabledtask);
@@ -1706,6 +1709,13 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 = start break, -1 = never break
 	}
 
+	$restrictBefore = null;
+
+	if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+	}
+
 	for ($i = 0; $i < $numlines; $i++) {
 		if ($parent == 0) {
 			$level = 0;
@@ -1984,6 +1994,12 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 						$cssweekend = 'weekend';
 					}
 
+					$disabledtaskday = $disabledtask;
+
+					if (! $disabledtask && $restrictBefore && $tmpday < $restrictBefore) {
+						$disabledtaskday = 1;
+					}
+
 					$tableCell = '<td class="center hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';
 					//$tableCell .= 'idw='.$idw.' '.$conf->global->MAIN_START_WEEK.' '.$numstartworkingday.'-'.$numendworkingday;
 					$placeholder = '';
@@ -1992,7 +2008,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 						//$placeholder=' placeholder="00:00"';
 						//$tableCell.='+';
 					}
-					$tableCell .= '<input type="text" alt="'.($disabledtask ? '' : $alttitle).'" title="'.($disabledtask ? '' : $alttitle).'" '.($disabledtask ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
+					$tableCell .= '<input type="text" alt="'.($disabledtaskday ? '' : $alttitle).'" title="'.($disabledtaskday ? '' : $alttitle).'" '.($disabledtaskday ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
 					$tableCell .= ' onkeypress="return regexEvent(this,event,\'timeChar\')"';
 					$tableCell .= ' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
 					$tableCell .= ' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
@@ -2086,6 +2102,13 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 = start break, -1 = never break
 	}
 
+	$restrictBefore = null;
+
+	if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+	}
+
 	for ($i = 0; $i < $numlines; $i++) {
 		if ($parent == 0) {
 			$level = 0;
@@ -2238,10 +2261,11 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 				$modeinput = 'hours';
 				$TFirstDay = getFirstDayOfEachWeek($TWeek, date('Y', $firstdaytoshow));
 				$TFirstDay[reset($TWeek)] = 1;
-				foreach ($TFirstDay as &$fday) {
-					$fday--;
-				}
-				foreach ($TWeek as $weekNb) {
+
+				$firstdaytoshowarray = dol_getdate($firstdaytoshow);
+				$year = $firstdaytoshowarray['year'];
+				$month = $firstdaytoshowarray['mon'];
+				foreach ($TWeek as $weekIndex => $weekNb) {
 					$weekWorkLoad = $projectstatic->monthWorkLoadPerTask[$weekNb][$lines[$i]->id];
 					$totalforeachweek[$weekNb] += $weekWorkLoad;
 
@@ -2251,6 +2275,12 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 					}
 					$alttitle = $langs->trans("AddHereTimeSpentForWeek", $weekNb);
 
+					$disabledtaskweek = $disabledtask;
+					$firstdayofweek = dol_mktime(0, 0, 0, $month, $TFirstDay[$weekIndex], $year);
+
+					if (! $disabledtask && $restrictBefore && $firstdayofweek < $restrictBefore) {
+						$disabledtaskweek = 1;
+					}
 
 					$tableCell = '<td class="center hide weekend">';
 					$placeholder = '';
@@ -2260,7 +2290,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 						//$tableCell.='+';
 					}
 
-					$tableCell .= '<input type="text" alt="'.($disabledtask ? '' : $alttitle).'" title="'.($disabledtask ? '' : $alttitle).'" '.($disabledtask ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.((int) $weekNb).']" name="task['.$lines[$i]->id.']['.$TFirstDay[$weekNb].']" value="" cols="2"  maxlength="5"';
+					$tableCell .= '<input type="text" alt="'.($disabledtaskweek ? '' : $alttitle).'" title="'.($disabledtaskweek ? '' : $alttitle).'" '.($disabledtaskweek ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.((int) $weekNb).']" name="task['.$lines[$i]->id.']['.($TFirstDay[$weekNb] - 1).']" value="" cols="2"  maxlength="5"';
 					$tableCell .= ' onkeypress="return regexEvent(this,event,\'timeChar\')"';
 					$tableCell .= ' onkeyup="updateTotal('.$weekNb.',\''.$modeinput.'\')"';
 					$tableCell .= ' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$weekNb.',\''.$modeinput.'\')" />';
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index f7dc3970dcb..c5d2a647a57 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -178,15 +178,15 @@ function getCustomerProposalPieChart($socid = 0)
 	$sql = "SELECT count(p.rowid) as nb, p.fk_statut as status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."propal as p";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";
 	$sql .= " AND p.fk_soc = s.rowid";
 	if ($user->socid) {
-		$sql .= ' AND p.fk_soc = '.$user->socid;
+		$sql .= ' AND p.fk_soc = '.((int) $user->socid);
 	}
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	$sql .= " AND p.fk_statut IN (".$db->sanitize(implode(" ,", $listofstatus)).")";
diff --git a/htdocs/core/lib/reception.lib.php b/htdocs/core/lib/reception.lib.php
index 42355497286..26f6817ed24 100644
--- a/htdocs/core/lib/reception.lib.php
+++ b/htdocs/core/lib/reception.lib.php
@@ -36,8 +36,7 @@ function reception_prepare_head(Reception $object)
 {
 	global $db, $langs, $conf, $user;
 
-	$langs->load("sendings");
-	$langs->load("deliveries");
+	$langs->loadLangs(array("sendings", "deliveries"));
 
 	$h = 0;
 	$head = array();
@@ -49,8 +48,8 @@ function reception_prepare_head(Reception $object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$objectsrc = $object;
-		if ($object->origin == 'commande' && $object->origin_id > 0) {
-			$objectsrc = new Commande($db);
+		if ($object->origin == 'supplier_order' && $object->origin_id > 0) {
+			$objectsrc = new CommandeFournisseur($db);
 			$objectsrc->fetch($object->origin_id);
 		}
 		$nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));
@@ -69,6 +68,19 @@ function reception_prepare_head(Reception $object)
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'reception');
 
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->reception->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.'/reception/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++;
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 3ea554a4a8f..4a20fbf96f2 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2008-2017 Regis Houssin        <regis.houssin@inodbox.com>
+/* Copyright (C) 2008-2021 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2008-2021 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2020	   Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -91,14 +91,13 @@ function dol_decode($chain, $key = '1')
 	return $chain;
 }
 
-
 /**
  * 	Returns a hash of a string.
  *  If constant MAIN_SECURITY_HASH_ALGO is defined, we use this function as hashing function (recommanded value is 'password_hash')
  *  If constant MAIN_SECURITY_SALT is defined, we use it as a salt (used only if hashing algorightm is something else than 'password_hash').
  *
  * 	@param 		string		$chain		String to hash
- * 	@param		string		$type		Type of hash ('0':auto will use MAIN_SECURITY_HASH_ALGO else md5, '1':sha1, '2':sha1+md5, '3':md5, '4':md5 for OpenLdap with no salt, '5':sha256, '6':password_hash). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.
+ * 	@param		string		$type		Type of hash ('0':auto will use MAIN_SECURITY_HASH_ALGO else md5, '1':sha1, '2':sha1+md5, '3':md5, '4': for OpenLdap, '5':sha256, '6':password_hash). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.
  * 	@return		string					Hash of string
  *  @see getRandomPassword()
  */
@@ -112,7 +111,7 @@ function dol_hash($chain, $type = '0')
 	}
 
 	// Salt value
-	if (!empty($conf->global->MAIN_SECURITY_SALT) && $type != '4' && $type !== 'md5openldap') {
+	if (!empty($conf->global->MAIN_SECURITY_SALT) && $type != '4' && $type !== 'openldap') {
 		$chain = $conf->global->MAIN_SECURITY_SALT.$chain;
 	}
 
@@ -122,8 +121,8 @@ function dol_hash($chain, $type = '0')
 		return sha1(md5($chain));
 	} elseif ($type == '3' || $type == 'md5') {
 		return md5($chain);
-	} elseif ($type == '4' || $type == 'md5openldap') {
-		return '{md5}'.base64_encode(mhash(MHASH_MD5, $chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
+	} elseif ($type == '4' || $type == 'openldap') {
+		return dolGetLdapPasswordHash($chain, getDolGlobalString('LDAP_PASSWORD_HASH_TYPE', 'md5'));
 	} elseif ($type == '5' || $type == 'sha256') {
 		return hash('sha256', $chain);
 	} elseif ($type == '6' || $type == 'password_hash') {
@@ -146,7 +145,7 @@ function dol_hash($chain, $type = '0')
  *
  * 	@param 		string		$chain		String to hash (not hashed string)
  * 	@param 		string		$hash		hash to compare
- * 	@param		string		$type		Type of hash ('0':auto, '1':sha1, '2':sha1+md5, '3':md5, '4':md5 for OpenLdap, '5':sha256). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.
+ * 	@param		string		$type		Type of hash ('0':auto, '1':sha1, '2':sha1+md5, '3':md5, '4': for OpenLdap, '5':sha256). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.
  * 	@return		bool					True if the computed hash is the same as the given one
  */
 function dol_verifyHash($chain, $hash, $type = '0')
@@ -168,6 +167,49 @@ function dol_verifyHash($chain, $hash, $type = '0')
 	return dol_hash($chain, $type) == $hash;
 }
 
+/**
+ * 	Returns a specific ldap hash of a password.
+ *
+ * 	@param 		string		$password	Password to hash
+ * 	@param		string		$type		Type of hash
+ * 	@return		string					Hash of password
+ */
+function dolGetLdapPasswordHash($password, $type = 'md5')
+{
+	if (empty($type)) {
+		$type = 'md5';
+	}
+
+	$salt = substr(sha1(time()), 0, 8);
+
+	if ($type === 'md5') {
+		return '{MD5}' . base64_encode(hash("md5", $password, true)); //For OpenLdap with md5 (based on an unencrypted password in base)
+	} elseif ($type === 'md5frommd5') {
+		return '{MD5}' . base64_encode(hex2bin($password)); // Create OpenLDAP MD5 password from Dolibarr MD5 password
+	} elseif ($type === 'smd5') {
+		return "{SMD5}" . base64_encode(hash("md5", $password . $salt, true) . $salt);
+	} elseif ($type === 'sha') {
+		return '{SHA}' . base64_encode(hash("sha1", $password, true));
+	} elseif ($type === 'ssha') {
+		return "{SSHA}" . base64_encode(hash("sha1", $password . $salt, true) . $salt);
+	} elseif ($type === 'sha256') {
+		return "{SHA256}" . base64_encode(hash("sha256", $password, true));
+	} elseif ($type === 'ssha256') {
+		return "{SSHA256}" . base64_encode(hash("sha256", $password . $salt, true) . $salt);
+	} elseif ($type === 'sha384') {
+		return "{SHA384}" . base64_encode(hash("sha384", $password, true));
+	} elseif ($type === 'ssha384') {
+		return "{SSHA384}" . base64_encode(hash("sha384", $password . $salt, true) . $salt);
+	} elseif ($type === 'sha512') {
+		return "{SHA512}" . base64_encode(hash("sha512", $password, true));
+	} elseif ($type === 'ssha512') {
+		return "{SSHA512}" . base64_encode(hash("sha512", $password . $salt, true) . $salt);
+	} elseif ($type === 'crypt') {
+		return '{CRYPT}' . crypt($password, $salt);
+	} elseif ($type === 'clear') {
+		return '{CLEAR}' . $password;  // Just for test, plain text password is not secured !
+	}
+}
 
 /**
  *	Check permissions of a user to show a page and an object. Check read permission.
@@ -280,12 +322,12 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 		}
 
 		if ($feature == 'societe') {
-			if (!$user->rights->societe->lire && !$user->rights->fournisseur->lire) {
+			if (empty($user->rights->societe->lire) && empty($user->rights->fournisseur->lire)) {
 				$readok = 0;
 				$nbko++;
 			}
 		} elseif ($feature == 'contact') {
-			if (!$user->rights->societe->contact->lire) {
+			if (empty($user->rights->societe->contact->lire)) {
 				$readok = 0;
 				$nbko++;
 			}
@@ -300,12 +342,12 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 				$nbko++;
 			}
 		} elseif ($feature == 'cheque') {
-			if (!$user->rights->banque->cheque) {
+			if (empty($user->rights->banque->cheque)) {
 				$readok = 0;
 				$nbko++;
 			}
 		} elseif ($feature == 'projet') {
-			if (!$user->rights->projet->lire && !$user->rights->projet->all->lire) {
+			if (!$user->rights->projet->lire && empty($user->rights->projet->all->lire)) {
 				$readok = 0;
 				$nbko++;
 			}
@@ -315,7 +357,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 				$nbko++;
 			}
 		} elseif ($feature == 'payment_supplier') {
-			if (!$user->rights->fournisseur->facture->lire) {
+			if (empty($user->rights->fournisseur->facture->lire)) {
 				$readok = 0;
 				$nbko++;
 			}
@@ -365,18 +407,18 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 	// Check write permission from module (we need to know write permission to create but also to delete drafts record or to upload files)
 	$createok = 1;
 	$nbko = 0;
-	$wemustcheckpermissionforcreate = (GETPOST('sendit', 'alpha') || GETPOST('linkit', 'alpha') || GETPOST('action', 'aZ09') == 'create' || GETPOST('action', 'aZ09') == 'update') || GETPOST('roworder', 'alpha', 2);
+	$wemustcheckpermissionforcreate = (GETPOST('sendit', 'alpha') || GETPOST('linkit', 'alpha') || in_array(GETPOST('action', 'aZ09'), array('create', 'update', 'add_element_resource', 'confirm_delete_linked_resource')) || GETPOST('roworder', 'alpha', 2));
 	$wemustcheckpermissionfordeletedraft = ((GETPOST("action", "aZ09") == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09") == 'delete');
 
 	if ($wemustcheckpermissionforcreate || $wemustcheckpermissionfordeletedraft) {
 		foreach ($featuresarray as $feature) {
 			if ($feature == 'contact') {
-				if (!$user->rights->societe->contact->creer) {
+				if (empty($user->rights->societe->contact->creer)) {
 					$createok = 0;
 					$nbko++;
 				}
 			} elseif ($feature == 'produit|service') {
-				if (!$user->rights->produit->creer && !$user->rights->service->creer) {
+				if (empty($user->rights->produit->creer) && empty($user->rights->service->creer)) {
 					$createok = 0;
 					$nbko++;
 				}
@@ -386,22 +428,22 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 					$nbko++;
 				}
 			} elseif ($feature == 'commande_fournisseur') {
-				if (!$user->rights->fournisseur->commande->creer || !$user->rights->supplier_order->creer) {
+				if (empty($user->rights->fournisseur->commande->creer) || empty($user->rights->supplier_order->creer)) {
 					$createok = 0;
 					$nbko++;
 				}
 			} elseif ($feature == 'banque') {
-				if (!$user->rights->banque->modifier) {
+				if (empty($user->rights->banque->modifier)) {
 					$createok = 0;
 					$nbko++;
 				}
 			} elseif ($feature == 'cheque') {
-				if (!$user->rights->banque->cheque) {
+				if (empty($user->rights->banque->cheque)) {
 					$createok = 0;
 					$nbko++;
 				}
 			} elseif ($feature == 'import') {
-				if (!$user->rights->import->run) {
+				if (empty($user->rights->import->run)) {
 					$createok = 0;
 					$nbko++;
 				}
@@ -418,6 +460,9 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 					if ($subfeature == 'user' && $user->id == $objectid && $user->rights->user->self->password) {
 						continue; // User can edit its own password
 					}
+					if ($subfeature == 'user' && $user->id != $objectid && $user->rights->user->user->password) {
+						continue; // User can edit another user's password
+					}
 
 					if (empty($user->rights->$feature->$subfeature->creer)
 					&& empty($user->rights->$feature->$subfeature->write)
@@ -499,11 +544,11 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 						$deleteok = 0;
 				}
 			} elseif ($feature == 'banque') {
-				if (!$user->rights->banque->modifier) {
+				if (empty($user->rights->banque->modifier)) {
 					$deleteok = 0;
 				}
 			} elseif ($feature == 'cheque') {
-				if (!$user->rights->banque->cheque) {
+				if (empty($user->rights->banque->cheque)) {
 					$deleteok = 0;
 				}
 			} elseif ($feature == 'ecm') {
@@ -519,7 +564,15 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 					$deleteok = 0;
 				}
 			} elseif ($feature == 'adherent') {
-				if (!$user->rights->adherent->supprimer) {
+				if (empty($user->rights->adherent->supprimer)) {
+					$deleteok = 0;
+				}
+			} elseif ($feature == 'paymentbybanktransfer') {
+				if (empty($user->rights->paymentbybanktransfer->create)) {	// There is no delete permission
+					$deleteok = 0;
+				}
+			} elseif ($feature == 'prelevement') {
+				if (empty($user->rights->prelevement->bons->creer)) {		// There is no delete permission
 					$deleteok = 0;
 				}
 			} elseif (!empty($feature2)) {							// This is for permissions on 2 levels
@@ -573,24 +626,30 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 }
 
 /**
- * Check access by user to object is ok.
- * This function is also called by restrictedArea that check before if module is enabled and if permission of user for $action is ok.
+ * Check that access by a given user to an object is ok.
+ * This function is also called by restrictedArea() that check before if module is enabled and if permission of user for $action is ok.
  *
- * @param User			$user					User to check
- * @param array			$featuresarray			Features/modules to check. Example: ('user','service','member','project','task',...)
- * @param int|string	$objectid				Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
- * @param string		$tableandshare			'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany modume. Param not used if objectid is null (optional).
- * @param string		$feature2				Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.
- * @param string		$dbt_keyfield			Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
- * @param string		$dbt_select				Field name for select if not rowid. Not used if objectid is null (optional)
- * @param string		$parenttableforentity  	Parent table for entity. Example 'fk_website@website'
- * @return	bool								True if user has access, False otherwise
+ * @param 	User				$user					User to check
+ * @param 	array				$featuresarray			Features/modules to check. Example: ('user','service','member','project','task',...)
+ * @param 	int|string|Object	$object					Full object or object ID or list of object id. For example if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
+ * @param 	string				$tableandshare			'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany modume. Param not used if objectid is null (optional).
+ * @param 	string				$feature2				Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.
+ * @param 	string				$dbt_keyfield			Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
+ * @param 	string				$dbt_select				Field name for select if not rowid. Not used if objectid is null (optional)
+ * @param 	string				$parenttableforentity  	Parent table for entity. Example 'fk_website@website'
+ * @return	bool										True if user has access, False otherwise
  * @see restrictedArea()
  */
-function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = '', $dbt_select = 'rowid', $parenttableforentity = '')
+function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = '', $dbt_select = 'rowid', $parenttableforentity = '')
 {
 	global $db, $conf;
 
+	if (is_object($object)) {
+		$objectid = $object->id;
+	} else {
+		$objectid = $object;		// $objectid can be X or 'X,Y,Z'
+	}
+
 	//dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename, $feature2, $dbt_socfield, $dbt_select, $isdraft");
 	//print "user_id=".$user->id.", features=".join(',', $featuresarray).", feature2=".$feature2.", objectid=".$objectid;
 	//print ", tableandshare=".$tableandshare.", dbt_socfield=".$dbt_keyfield.", dbt_select=".$dbt_select."<br>";
@@ -616,11 +675,15 @@ function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $ta
 			$feature = 'projet_task';
 		}
 
+		$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)
 		$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
-		$checktask = array('projet_task');	// Test for task object
+		$checktask = array('projet_task'); // Test for task object
+		$checkhierarchy = array('expensereport', 'holiday');
 		$nocheck = array('barcode', 'stock'); // No test
 		//$checkdefault = 'all other not already defined'; // Test on entity + link to third party on field $dbt_keyfield. Not allowed if link is empty (Ex: invoice, orders...).
 
@@ -661,13 +724,15 @@ function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $ta
 					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 				}
 			}
-		} elseif (in_array($feature, $checksoc)) {	// We check feature = checksoc
+			$checkonentitydone = 1;
+		}
+		if (in_array($feature, $checksoc)) {	// We check feature = checksoc
 			// If external user: Check permission for external users
 			if ($user->socid > 0) {
-				if ($user->socid <> $objectid) {
+				if ($user->socid != $objectid) {
 					return false;
 				}
-			} elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir)) {
+			} elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && empty($user->rights->societe->client->voir))) {
 				// If internal user: Check permission for internal users that are restricted on their objects
 				$sql = "SELECT COUNT(sc.fk_soc) as nb";
 				$sql .= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -683,14 +748,17 @@ function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $ta
 				$sql .= " WHERE s.rowid IN (".$db->sanitize($objectid, 1).")";
 				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		} elseif (in_array($feature, $checkother)) {	// Test on entity + link to thirdparty. Allowed if link is empty (Ex: contacts...).
+
+			$checkonentitydone = 1;
+		}
+		if (in_array($feature, $checkother)) {	// Test on entity + link to thirdparty. Allowed if link is empty (Ex: contacts...).
 			// If external user: Check permission for external users
 			if ($user->socid > 0) {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";
 				$sql .= " AND dbt.fk_soc = ".((int) $user->socid);
-			} elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir)) {
+			} elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && empty($user->rights->societe->client->voir))) {
 				// If internal user: Check permission for internal users that are restricted on their objects
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
@@ -705,25 +773,19 @@ function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $ta
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-			if ($feature == 'agenda') {
-				// Also check owner or attendee for users without allactions->read
-				if ($objectid > 0 && empty($user->rights->agenda->allactions->read)) {
-					require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-					$action = new ActionComm($db);
-					$action->fetch($objectid);
-					if ($action->authorid != $user->id && $action->userownerid != $user->id && !(array_key_exists($user->id, $action->userassigned))) {
-						return false;
-					}
-				}
-			}
-		} elseif (in_array($feature, $checkproject)) {
+
+			$checkonentitydone = 1;
+		}
+		if (in_array($feature, $checkproject)) {
 			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire)) {
+				$projectid = $objectid;
+
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$projectstatic = new Project($db);
 				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
 
 				$tmparray = explode(',', $tmps);
-				if (!in_array($objectid, $tmparray)) {
+				if (!in_array($projectid, $tmparray)) {
 					return false;
 				}
 			} else {
@@ -732,16 +794,21 @@ function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $ta
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		} elseif (in_array($feature, $checktask)) {
+
+			$checkonentitydone = 1;
+		}
+		if (in_array($feature, $checktask)) {
 			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire)) {
 				$task = new Task($db);
 				$task->fetch($objectid);
+				$projectid = $task->fk_project;
 
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$projectstatic = new Project($db);
 				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
+
 				$tmparray = explode(',', $tmps);
-				if (!in_array($task->fk_project, $tmparray)) {
+				if (!in_array($projectid, $tmparray)) {
 					return false;
 				}
 			} else {
@@ -750,7 +817,10 @@ function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $ta
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		} elseif (!in_array($feature, $nocheck)) {		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
+
+			$checkonentitydone = 1;
+		}
+		if (!$checkonentitydone && !in_array($feature, $nocheck)) {		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
 			// If external user: Check permission for external users
 			if ($user->socid > 0) {
 				if (empty($dbt_keyfield)) {
@@ -760,7 +830,7 @@ function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $ta
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.rowid IN (".$db->sanitize($objectid, 1).")";
 				$sql .= " AND dbt.".$dbt_keyfield." = ".((int) $user->socid);
-			} elseif (!empty($conf->societe->enabled) && !$user->rights->societe->client->voir) {
+			} elseif (!empty($conf->societe->enabled) && empty($user->rights->societe->client->voir)) {
 				// If internal user: Check permission for internal users that are restricted on their objects
 				if ($feature != 'ticket') {
 					if (empty($dbt_keyfield)) {
@@ -792,11 +862,47 @@ function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $ta
 		}
 		//print $sql;
 
+		// For events, check on users assigned to event
+		if ($feature === 'agenda') {
+			// Also check owner or attendee for users without allactions->read
+			if ($objectid > 0 && empty($user->rights->agenda->allactions->read)) {
+				require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+				$action = new ActionComm($db);
+				$action->fetch($objectid);
+				if ($action->authorid != $user->id && $action->userownerid != $user->id && !(array_key_exists($user->id, $action->userassigned))) {
+					return false;
+				}
+			}
+		}
+
+		// For some object, we also have to check it is in the user hierarchy
+		// Param $object must be the full object and not a simple id to have this test possible.
+		if (in_array($feature, $checkhierarchy) && is_object($object)) {
+			$childids = $user->getAllChildIds(1);
+			$useridtocheck = 0;
+			if ($feature == 'holiday') {
+				$useridtocheck = $object->fk_user;
+				if (!in_array($useridtocheck, $childids)) {
+					return false;
+				}
+				$useridtocheck = $object->fk_validator;
+				if (!in_array($useridtocheck, $childids)) {
+					return false;
+				}
+			}
+			if ($feature == 'expensereport') {
+				$useridtocheck = $object->fk_user_author;
+				if (!in_array($useridtocheck, $childids)) {
+					return false;
+				}
+			}
+		}
+
 		if ($sql) {
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				if (!$obj || $obj->nb < count(explode(',', $objectid))) {
+				if (!$obj || $obj->nb < count(explode(',', $objectid))) {	// error if we found 0 or less record than nb of id provided
 					return false;
 				}
 			} else {
@@ -857,9 +963,11 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho
 		$reshook = $hookmanager->executeHooks('getAccessForbiddenMessage', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		print $hookmanager->resPrint;
 		if (empty($reshook)) {
+			$langs->loadLangs(array("errors"));
 			if ($user->login) {
-				print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
+				print $langs->trans("CurrentLogin").': <span class="error">'.$user->login.'</span><br>';
 				print $langs->trans("ErrorForbidden2", $langs->transnoentitiesnoconv("Home"), $langs->transnoentitiesnoconv("Users"));
+				print $langs->trans("ErrorForbidden4");
 			} else {
 				print $langs->trans("ErrorForbidden3");
 			}
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index e015313ad15..a37a77712c3 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -157,7 +157,7 @@ if (!function_exists('dol_loginfunction')) {
 
 		// Note: $conf->css looks like '/theme/eldy/style.css.php'
 		/*
-		$conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php";
+		$conf->css = "/theme/".(GETPOST('theme','aZ09')?GETPOST('theme','aZ09'):$conf->theme)."/style.css.php";
 		$themepath=dol_buildpath($conf->css,1);
 		if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
 		{
@@ -215,15 +215,20 @@ if (!function_exists('dol_loginfunction')) {
 		}
 
 		// Execute hook getLoginPageOptions (for table)
-		$parameters = array('entity' => GETPOST('entity', 'int'));
+		$parameters = array('entity' => GETPOST('entity', 'int'), 'switchentity' => GETPOST('switchentity', 'int'));
 		$reshook = $hookmanager->executeHooks('getLoginPageOptions', $parameters); // Note that $action and $object may have been modified by some hooks.
 		$morelogincontent = $hookmanager->resPrint;
 
 		// Execute hook getLoginPageExtraOptions (eg for js)
-		$parameters = array('entity' => GETPOST('entity', 'int'));
+		$parameters = array('entity' => GETPOST('entity', 'int'), 'switchentity' => GETPOST('switchentity', 'int'));
 		$reshook = $hookmanager->executeHooks('getLoginPageExtraOptions', $parameters); // Note that $action and $object may have been modified by some hooks.
 		$moreloginextracontent = $hookmanager->resPrint;
 
+		//Redirect after connection
+		$parameters = array('entity' => GETPOST('entity', 'int'), 'switchentity' => GETPOST('switchentity', 'int'));
+		$reshook = $hookmanager->executeHooks('redirectAfterConnection', $parameters); // Note that $action and $object may have been modified by some hooks.
+		$php_self = $hookmanager->resPrint;
+
 		// Login
 		$login = (!empty($hookmanager->resArray['username']) ? $hookmanager->resArray['username'] : (GETPOST("username", "alpha") ? GETPOST("username", "alpha") : $demologin));
 		$password = $demopassword;
@@ -234,7 +239,7 @@ if (!function_exists('dol_loginfunction')) {
 
 		if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
 			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
-		} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))	{
+		} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
 			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
 			$width = 128;
 		} elseif (!empty($mysoc->logo_squarred_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_small)) {
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 0814c0f4825..e2ab74b8cfc 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -180,7 +180,7 @@ function delivery_prepare_head($object)
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->commande->dir_output."/".dol_sanitizeFileName($tmpobject->ref);
+	$upload_dir = $conf->expedition->dir_output."/sending/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $tmpobject->element, $tmpobject->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expedition/document.php?id='.$tmpobject->id;
diff --git a/htdocs/core/lib/signature.lib.php b/htdocs/core/lib/signature.lib.php
index 82f446f04c7..1d529be6327 100644
--- a/htdocs/core/lib/signature.lib.php
+++ b/htdocs/core/lib/signature.lib.php
@@ -18,7 +18,7 @@
  */
 
 /**
- * Return string with full Url
+ * Return string with full online Url to accept and sign a quote
  *
  * @param   string	$type		Type of URL ('proposal', ...)
  * @param	string	$ref		Ref of object
@@ -39,8 +39,9 @@ function showOnlineSignatureUrl($type, $ref)
 	if ($url == $langs->trans("FeatureOnlineSignDisabled")) {
 		$out .= $url;
 	} else {
-		$out .= '<input type="text" id="onlinesignatureurl" class="quatrevingtpercent" value="'.$url.'">';
+		$out .= '<input type="text" id="onlinesignatureurl" class="quatrevingtpercentminusx" value="'.$url.'">';
 	}
+	$out .= '<a class="" href="'.$url.'" target="_blank" rel="noopener noreferrer">'.img_picto('', 'globe', 'class="paddingleft"').'</a>';
 	$out .= '</div>';
 	$out .= ajax_autoselect("onlinesignatureurl", 0);
 	return $out;
@@ -50,29 +51,50 @@ function showOnlineSignatureUrl($type, $ref)
 /**
  * Return string with full Url
  *
- * @param   int		$mode		0=True url, 1=Url formated with colors
- * @param   string	$type		Type of URL ('proposal', ...)
- * @param	string	$ref		Ref of object
- * @return	string				Url string
+ * @param   int		$mode				0=True url, 1=Url formated with colors
+ * @param   string	$type				Type of URL ('proposal', ...)
+ * @param	string	$ref				Ref of object
+ * @param   string  $localorexternal  	0=Url for browser, 1=Url for external access
+ * @return	string						Url string
  */
-function getOnlineSignatureUrl($mode, $type, $ref = '')
+function getOnlineSignatureUrl($mode, $type, $ref = '', $localorexternal = 1)
 {
-	global $conf, $db, $langs;
+	global $conf, $db, $langs, $dolibarr_main_url_root;
 
 	$ref = str_replace(' ', '', $ref);
 	$out = '';
 
+	// Define $urlwithroot
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+	$urltouse = DOL_MAIN_URL_ROOT;
+	if ($localorexternal) {
+		$urltouse = $urlwithroot;
+	}
+
+	$securekeyseed = '';
+
 	if ($type == 'proposal') {
-		$out = DOL_MAIN_URL_ROOT.'/public/onlinesign/newonlinesign.php?source=proposal&ref='.($mode ? '<font color="#666666">' : '');
+		$securekeyseed = $conf->global->PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN;
+
+		$out = $urltouse.'/public/onlinesign/newonlinesign.php?source=proposal&ref='.($mode ? '<span style="color: #666666">' : '');
 		if ($mode == 1) {
 			$out .= 'proposal_ref';
 		}
 		if ($mode == 0) {
 			$out .= urlencode($ref);
 		}
-		$out .= ($mode ? '</font>' : '');
+		$out .= ($mode ? '</span>' : '');
 		if ($mode == 1) {
-			$out .= '&hashp=<font color="#666666">hash_of_file</font>';
+			$out .= "hash('".$securekeyseed."' + '".$type."' + proposal_ref)";
+		} else {
+			$out .= '&securekey='.dol_hash($securekeyseed.$type.$ref, '0');
+		}
+		/*
+		if ($mode == 1) {
+			$out .= '&hashp=<span style="color: #666666">hash_of_file</span>';
 		} else {
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$propaltmp = new Propal($db);
@@ -93,13 +115,15 @@ function getOnlineSignatureUrl($mode, $type, $ref = '')
 			} else {
 				$out .= '&hashp='.$hashp;
 			}
-		}
+		}*/
 	}
 
 	// For multicompany
+	/*
 	if (!empty($out)) {
 		$out .= "&entity=".$conf->entity; // Check the entity because He may be 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 2e58e6c8082..066bf2165be 100644
--- a/htdocs/core/lib/stock.lib.php
+++ b/htdocs/core/lib/stock.lib.php
@@ -109,6 +109,11 @@ function stock_admin_prepare_head()
 	$head[$h][2] = 'attributes';
 	$h++;
 
+	$head[$h][0] = DOL_URL_ROOT.'/product/admin/stock_mouvement_extrafields.php';
+	$head[$h][1] = $langs->trans("StockMouvementExtraFields");
+	$head[$h][2] = 'stockMouvementAttributes';
+	$h++;
+
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin', 'remove');
 
 	return $head;
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index 743a847b2f2..490b95cc92d 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -6,7 +6,7 @@
  * 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) 2021       Open-Dsi            <support@open-dsi.fr>
+ * 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
@@ -696,7 +696,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 	if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
 		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')) {
 		// Count on delivery date (use invoice date as delivery is unknown)
-		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.vat_src_code as vat_src_code, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
 		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
 		$sql .= " d.date_start as date_start, d.date_end as date_end,";
 		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef,";
@@ -739,7 +739,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " ORDER BY d.rowid, d.".$fk_facture;
 	} else {
 		// Count on payments date
-		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.vat_src_code as vat_src_code, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
 		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
 		$sql .= " d.date_start as date_start, d.date_end as date_end,";
 		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef,";
@@ -751,7 +751,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
 		$sql .= " pa.datep as datep, pa.ref as payment_ref";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f";
-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$paymentfacturetable." as pf ON pf.".$fk_facture2." = f.rowid";;
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$paymentfacturetable." as pf ON pf.".$fk_facture2." = f.rowid";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$paymenttable." as pa ON pa.rowid = pf.".$fk_payment;
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$invoicedettable." as d ON d.".$fk_facture." = f.rowid";
@@ -799,66 +799,71 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 			$rate = -1;
 			$oldrowid = '';
 			while ($assoc = $db->fetch_array($resql)) {
+				$rate_key = $assoc['rate'];
+				if ($f_rate == 'tva_tx' && !empty($assoc['vat_src_code']) && !preg_match('/\(/', $rate_key)) {
+					$rate_key .= ' (' . $assoc['vat_src_code'] . ')';
+				}
+
 				// Code to avoid warnings when array entry not defined
-				if (!isset($list[$assoc['rate']]['totalht'])) {
-					$list[$assoc['rate']]['totalht'] = 0;
+				if (!isset($list[$rate_key]['totalht'])) {
+					$list[$rate_key]['totalht'] = 0;
 				}
-				if (!isset($list[$assoc['rate']]['vat'])) {
-					$list[$assoc['rate']]['vat'] = 0;
+				if (!isset($list[$rate_key]['vat'])) {
+					$list[$rate_key]['vat'] = 0;
 				}
-				if (!isset($list[$assoc['rate']]['localtax1'])) {
-					$list[$assoc['rate']]['localtax1'] = 0;
+				if (!isset($list[$rate_key]['localtax1'])) {
+					$list[$rate_key]['localtax1'] = 0;
 				}
-				if (!isset($list[$assoc['rate']]['localtax2'])) {
-					$list[$assoc['rate']]['localtax2'] = 0;
+				if (!isset($list[$rate_key]['localtax2'])) {
+					$list[$rate_key]['localtax2'] = 0;
 				}
 
 				if ($assoc['rowid'] != $oldrowid) {       // Si rupture sur d.rowid
 					$oldrowid = $assoc['rowid'];
-					$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
-					$list[$assoc['rate']]['vat']       += $assoc['total_vat'];
-					$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
-					$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
+					$list[$rate_key]['totalht']   += $assoc['total_ht'];
+					$list[$rate_key]['vat']       += $assoc['total_vat'];
+					$list[$rate_key]['localtax1'] += $assoc['total_localtax1'];
+					$list[$rate_key]['localtax2'] += $assoc['total_localtax2'];
 				}
-				$list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
-				$list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
-				$list[$assoc['rate']]['datef'][] = $db->jdate($assoc['datef']);
-				$list[$assoc['rate']]['datep'][] = $db->jdate($assoc['datep']);
+				$list[$rate_key]['dtotal_ttc'][] = $assoc['total_ttc'];
+				$list[$rate_key]['dtype'][] = $assoc['dtype'];
+				$list[$rate_key]['datef'][] = $db->jdate($assoc['datef']);
+				$list[$rate_key]['datep'][] = $db->jdate($assoc['datep']);
 
-				$list[$assoc['rate']]['company_name'][] = $assoc['company_name'];
-				$list[$assoc['rate']]['company_id'][] = $assoc['company_id'];
-				$list[$assoc['rate']]['company_alias'][] = $assoc['company_alias'];
-				$list[$assoc['rate']]['company_email'][] = $assoc['company_email'];
-				$list[$assoc['rate']]['company_tva_intra'][] = $assoc['company_tva_intra'];
-				$list[$assoc['rate']]['company_client'][] = $assoc['company_client'];
-				$list[$assoc['rate']]['company_fournisseur'][] = $assoc['company_fournisseur'];
-				$list[$assoc['rate']]['company_customer_code'][] = $assoc['company_customer_code'];
-				$list[$assoc['rate']]['company_supplier_code'][] = $assoc['company_supplier_code'];
-				$list[$assoc['rate']]['company_customer_accounting_code'][] = $assoc['company_customer_accounting_code'];
-				$list[$assoc['rate']]['company_supplier_accounting_code'][] = $assoc['company_supplier_accounting_code'];
-				$list[$assoc['rate']]['company_status'][] = $assoc['company_status'];
+				$list[$rate_key]['company_name'][] = $assoc['company_name'];
+				$list[$rate_key]['company_id'][] = $assoc['company_id'];
+				$list[$rate_key]['company_alias'][] = $assoc['company_alias'];
+				$list[$rate_key]['company_email'][] = $assoc['company_email'];
+				$list[$rate_key]['company_tva_intra'][] = $assoc['company_tva_intra'];
+				$list[$rate_key]['company_client'][] = $assoc['company_client'];
+				$list[$rate_key]['company_fournisseur'][] = $assoc['company_fournisseur'];
+				$list[$rate_key]['company_customer_code'][] = $assoc['company_customer_code'];
+				$list[$rate_key]['company_supplier_code'][] = $assoc['company_supplier_code'];
+				$list[$rate_key]['company_customer_accounting_code'][] = $assoc['company_customer_accounting_code'];
+				$list[$rate_key]['company_supplier_accounting_code'][] = $assoc['company_supplier_accounting_code'];
+				$list[$rate_key]['company_status'][] = $assoc['company_status'];
 
-				$list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-				$list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+				$list[$rate_key]['ddate_start'][] = $db->jdate($assoc['date_start']);
+				$list[$rate_key]['ddate_end'][] = $db->jdate($assoc['date_end']);
 
-				$list[$assoc['rate']]['facid'][] = $assoc['facid'];
-				$list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
-				$list[$assoc['rate']]['type'][] = $assoc['type'];
-				$list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-				$list[$assoc['rate']]['descr'][] = $assoc['descr'];
+				$list[$rate_key]['facid'][] = $assoc['facid'];
+				$list[$rate_key]['facnum'][] = $assoc['facnum'];
+				$list[$rate_key]['type'][] = $assoc['type'];
+				$list[$rate_key]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+				$list[$rate_key]['descr'][] = $assoc['descr'];
 
-				$list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
-				$list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
-				$list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
-				$list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
+				$list[$rate_key]['totalht_list'][] = $assoc['total_ht'];
+				$list[$rate_key]['vat_list'][] = $assoc['total_vat'];
+				$list[$rate_key]['localtax1_list'][] = $assoc['total_localtax1'];
+				$list[$rate_key]['localtax2_list'][] = $assoc['total_localtax2'];
 
-				$list[$assoc['rate']]['pid'][] = $assoc['pid'];
-				$list[$assoc['rate']]['pref'][] = $assoc['pref'];
-				$list[$assoc['rate']]['ptype'][] = $assoc['ptype'];
+				$list[$rate_key]['pid'][] = $assoc['pid'];
+				$list[$rate_key]['pref'][] = $assoc['pref'];
+				$list[$rate_key]['ptype'][] = $assoc['ptype'];
 
-				$list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
-				$list[$assoc['rate']]['payment_ref'][] = $assoc['payment_ref'];
-				$list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
+				$list[$rate_key]['payment_id'][] = $assoc['payment_id'];
+				$list[$rate_key]['payment_ref'][] = $assoc['payment_ref'];
+				$list[$rate_key]['payment_amount'][] = $assoc['payment_amount'];
 
 				$rate = $assoc['rate'];
 			}
@@ -876,7 +881,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 	if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
 		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) {
 		// Count on invoice date
-		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.vat_src_code as vat_src_code, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
 		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
 		$sql .= " d.date_start as date_start, d.date_end as date_end,";
 		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef,";
@@ -919,7 +924,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " ORDER BY d.rowid, d.".$fk_facture;
 	} else {
 		// Count on payments date
-		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.vat_src_code as vat_src_code, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
 		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
 		$sql .= " d.date_start as date_start, d.date_end as date_end,";
 		$sql .= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef,";
@@ -979,66 +984,71 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 			$rate = -1;
 			$oldrowid = '';
 			while ($assoc = $db->fetch_array($resql)) {
+				$rate_key = $assoc['rate'];
+				if ($f_rate == 'tva_tx' && !empty($assoc['vat_src_code']) && !preg_match('/\(/', $rate_key)) {
+					$rate_key .= ' (' . $assoc['vat_src_code'] . ')';
+				}
+
 				// Code to avoid warnings when array entry not defined
-				if (!isset($list[$assoc['rate']]['totalht'])) {
-					$list[$assoc['rate']]['totalht'] = 0;
+				if (!isset($list[$rate_key]['totalht'])) {
+					$list[$rate_key]['totalht'] = 0;
 				}
-				if (!isset($list[$assoc['rate']]['vat'])) {
-					$list[$assoc['rate']]['vat'] = 0;
+				if (!isset($list[$rate_key]['vat'])) {
+					$list[$rate_key]['vat'] = 0;
 				}
-				if (!isset($list[$assoc['rate']]['localtax1'])) {
-					$list[$assoc['rate']]['localtax1'] = 0;
+				if (!isset($list[$rate_key]['localtax1'])) {
+					$list[$rate_key]['localtax1'] = 0;
 				}
-				if (!isset($list[$assoc['rate']]['localtax2'])) {
-					$list[$assoc['rate']]['localtax2'] = 0;
+				if (!isset($list[$rate_key]['localtax2'])) {
+					$list[$rate_key]['localtax2'] = 0;
 				}
 
 				if ($assoc['rowid'] != $oldrowid) {       // Si rupture sur d.rowid
 					$oldrowid = $assoc['rowid'];
-					$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
-					$list[$assoc['rate']]['vat']       += $assoc['total_vat'];
-					$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
-					$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
+					$list[$rate_key]['totalht']   += $assoc['total_ht'];
+					$list[$rate_key]['vat']       += $assoc['total_vat'];
+					$list[$rate_key]['localtax1'] += $assoc['total_localtax1'];
+					$list[$rate_key]['localtax2'] += $assoc['total_localtax2'];
 				}
-				$list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
-				$list[$assoc['rate']]['dtype'][] = $assoc['dtype'];
-				$list[$assoc['rate']]['datef'][] = $db->jdate($assoc['datef']);
-				$list[$assoc['rate']]['datep'][] = $db->jdate($assoc['datep']);
+				$list[$rate_key]['dtotal_ttc'][] = $assoc['total_ttc'];
+				$list[$rate_key]['dtype'][] = $assoc['dtype'];
+				$list[$rate_key]['datef'][] = $db->jdate($assoc['datef']);
+				$list[$rate_key]['datep'][] = $db->jdate($assoc['datep']);
 
-				$list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-				$list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+				$list[$rate_key]['ddate_start'][] = $db->jdate($assoc['date_start']);
+				$list[$rate_key]['ddate_end'][] = $db->jdate($assoc['date_end']);
 
-				$list[$assoc['rate']]['company_name'][] = $assoc['company_name'];
-				$list[$assoc['rate']]['company_id'][] = $assoc['company_id'];
-				$list[$assoc['rate']]['company_alias'][] = $assoc['company_alias'];
-				$list[$assoc['rate']]['company_email'][] = $assoc['company_email'];
-				$list[$assoc['rate']]['company_tva_intra'][] = $assoc['company_tva_intra'];
-				$list[$assoc['rate']]['company_client'][] = $assoc['company_client'];
-				$list[$assoc['rate']]['company_fournisseur'][] = $assoc['company_fournisseur'];
-				$list[$assoc['rate']]['company_customer_code'][] = $assoc['company_customer_code'];
-				$list[$assoc['rate']]['company_supplier_code'][] = $assoc['company_supplier_code'];
-				$list[$assoc['rate']]['company_customer_accounting_code'][] = $assoc['company_customer_accounting_code'];
-				$list[$assoc['rate']]['company_supplier_accounting_code'][] = $assoc['company_supplier_accounting_code'];
-				$list[$assoc['rate']]['company_status'][] = $assoc['company_status'];
+				$list[$rate_key]['company_name'][] = $assoc['company_name'];
+				$list[$rate_key]['company_id'][] = $assoc['company_id'];
+				$list[$rate_key]['company_alias'][] = $assoc['company_alias'];
+				$list[$rate_key]['company_email'][] = $assoc['company_email'];
+				$list[$rate_key]['company_tva_intra'][] = $assoc['company_tva_intra'];
+				$list[$rate_key]['company_client'][] = $assoc['company_client'];
+				$list[$rate_key]['company_fournisseur'][] = $assoc['company_fournisseur'];
+				$list[$rate_key]['company_customer_code'][] = $assoc['company_customer_code'];
+				$list[$rate_key]['company_supplier_code'][] = $assoc['company_supplier_code'];
+				$list[$rate_key]['company_customer_accounting_code'][] = $assoc['company_customer_accounting_code'];
+				$list[$rate_key]['company_supplier_accounting_code'][] = $assoc['company_supplier_accounting_code'];
+				$list[$rate_key]['company_status'][] = $assoc['company_status'];
 
-				$list[$assoc['rate']]['facid'][] = $assoc['facid'];
-				$list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
-				$list[$assoc['rate']]['type'][] = $assoc['type'];
-				$list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-				$list[$assoc['rate']]['descr'][] = $assoc['descr'];
+				$list[$rate_key]['facid'][] = $assoc['facid'];
+				$list[$rate_key]['facnum'][] = $assoc['facnum'];
+				$list[$rate_key]['type'][] = $assoc['type'];
+				$list[$rate_key]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+				$list[$rate_key]['descr'][] = $assoc['descr'];
 
-				$list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
-				$list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
-				$list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
-				$list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
+				$list[$rate_key]['totalht_list'][] = $assoc['total_ht'];
+				$list[$rate_key]['vat_list'][] = $assoc['total_vat'];
+				$list[$rate_key]['localtax1_list'][] = $assoc['total_localtax1'];
+				$list[$rate_key]['localtax2_list'][] = $assoc['total_localtax2'];
 
-				$list[$assoc['rate']]['pid'][] = $assoc['pid'];
-				$list[$assoc['rate']]['pref'][] = $assoc['pref'];
-				$list[$assoc['rate']]['ptype'][] = $assoc['ptype'];
+				$list[$rate_key]['pid'][] = $assoc['pid'];
+				$list[$rate_key]['pref'][] = $assoc['pref'];
+				$list[$rate_key]['ptype'][] = $assoc['ptype'];
 
-				$list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
-				$list[$assoc['rate']]['payment_ref'][] = $assoc['payment_ref'];
-				$list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
+				$list[$rate_key]['payment_id'][] = $assoc['payment_id'];
+				$list[$rate_key]['payment_ref'][] = $assoc['payment_ref'];
+				$list[$rate_key]['payment_amount'][] = $assoc['payment_amount'];
 
 				$rate = $assoc['rate'];
 			}
@@ -1056,7 +1066,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql = '';
 
 		// Count on payments date
-		$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";
+		$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.vat_src_code as vat_src_code, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";
 		$sql .= " d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
 		$sql .= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
 		$sql .= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
@@ -1101,55 +1111,60 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 				$rate = -1;
 				$oldrowid = '';
 				while ($assoc = $db->fetch_array($resql)) {
+					$rate_key = $assoc['rate'];
+					if ($f_rate == 'tva_tx' && !empty($assoc['vat_src_code']) && !preg_match('/\(/', $rate_key)) {
+						$rate_key .= ' (' . $assoc['vat_src_code'] . ')';
+					}
+
 					// Code to avoid warnings when array entry not defined
-					if (!isset($list[$assoc['rate']]['totalht'])) {
-						$list[$assoc['rate']]['totalht'] = 0;
+					if (!isset($list[$rate_key]['totalht'])) {
+						$list[$rate_key]['totalht'] = 0;
 					}
-					if (!isset($list[$assoc['rate']]['vat'])) {
-						$list[$assoc['rate']]['vat'] = 0;
+					if (!isset($list[$rate_key]['vat'])) {
+						$list[$rate_key]['vat'] = 0;
 					}
-					if (!isset($list[$assoc['rate']]['localtax1'])) {
-						$list[$assoc['rate']]['localtax1'] = 0;
+					if (!isset($list[$rate_key]['localtax1'])) {
+						$list[$rate_key]['localtax1'] = 0;
 					}
-					if (!isset($list[$assoc['rate']]['localtax2'])) {
-						$list[$assoc['rate']]['localtax2'] = 0;
+					if (!isset($list[$rate_key]['localtax2'])) {
+						$list[$rate_key]['localtax2'] = 0;
 					}
 
 					if ($assoc['rowid'] != $oldrowid) {       // Si rupture sur d.rowid
 						$oldrowid = $assoc['rowid'];
-						$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
-						$list[$assoc['rate']]['vat'] += $assoc['total_vat'];
-						$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
-						$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
+						$list[$rate_key]['totalht']   += $assoc['total_ht'];
+						$list[$rate_key]['vat'] += $assoc['total_vat'];
+						$list[$rate_key]['localtax1'] += $assoc['total_localtax1'];
+						$list[$rate_key]['localtax2'] += $assoc['total_localtax2'];
 					}
 
-					$list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
-					$list[$assoc['rate']]['dtype'][] = 'ExpenseReportPayment';
-					$list[$assoc['rate']]['datef'][] = $assoc['datef'];
-					$list[$assoc['rate']]['company_name'][] = '';
-					$list[$assoc['rate']]['company_id'][] = '';
-					$list[$assoc['rate']]['user_id'][] = $assoc['fk_user_author'];
-					$list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-					$list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+					$list[$rate_key]['dtotal_ttc'][] = $assoc['total_ttc'];
+					$list[$rate_key]['dtype'][] = 'ExpenseReportPayment';
+					$list[$rate_key]['datef'][] = $assoc['datef'];
+					$list[$rate_key]['company_name'][] = '';
+					$list[$rate_key]['company_id'][] = '';
+					$list[$rate_key]['user_id'][] = $assoc['fk_user_author'];
+					$list[$rate_key]['ddate_start'][] = $db->jdate($assoc['date_start']);
+					$list[$rate_key]['ddate_end'][] = $db->jdate($assoc['date_end']);
 
-					$list[$assoc['rate']]['facid'][] = $assoc['facid'];
-					$list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
-					$list[$assoc['rate']]['type'][] = $assoc['type'];
-					$list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-					$list[$assoc['rate']]['descr'][] = $assoc['descr'];
+					$list[$rate_key]['facid'][] = $assoc['facid'];
+					$list[$rate_key]['facnum'][] = $assoc['facnum'];
+					$list[$rate_key]['type'][] = $assoc['type'];
+					$list[$rate_key]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+					$list[$rate_key]['descr'][] = $assoc['descr'];
 
-					$list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
-					$list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
-					$list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
-					$list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
+					$list[$rate_key]['totalht_list'][] = $assoc['total_ht'];
+					$list[$rate_key]['vat_list'][] = $assoc['total_vat'];
+					$list[$rate_key]['localtax1_list'][] = $assoc['total_localtax1'];
+					$list[$rate_key]['localtax2_list'][] = $assoc['total_localtax2'];
 
-					$list[$assoc['rate']]['pid'][] = $assoc['pid'];
-					$list[$assoc['rate']]['pref'][] = $assoc['pref'];
-					$list[$assoc['rate']]['ptype'][] = 'ExpenseReportPayment';
+					$list[$rate_key]['pid'][] = $assoc['pid'];
+					$list[$rate_key]['pref'][] = $assoc['pref'];
+					$list[$rate_key]['ptype'][] = 'ExpenseReportPayment';
 
-					$list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
-					$list[$assoc['rate']]['payment_ref'][] = $assoc['payment_ref'];
-					$list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
+					$list[$rate_key]['payment_id'][] = $assoc['payment_id'];
+					$list[$rate_key]['payment_ref'][] = $assoc['payment_ref'];
+					$list[$rate_key]['payment_amount'][] = $assoc['payment_amount'];
 
 					$rate = $assoc['rate'];
 				}
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 3aededf6a81..3599c17887f 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -101,7 +101,7 @@ function ticket_prepare_head($object)
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	$upload_dir = $conf->ticket->dir_output."/".$object->ref;
 	$nbFiles = count(dol_dir_list($upload_dir, 'files'));
-	$head[$h][0] = dol_buildpath('/ticket/document.php', 1).'?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/ticket/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
 	if ($nbFiles > 0) {
 		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbFiles.'</span>';
@@ -164,7 +164,7 @@ function showDirectPublicLink($object)
 		if ($url) {
 			$out .= '<div class="urllink">';
 			$out .= '<input type="text" id="directpubliclink" class="quatrevingtpercentminusx" value="'.$url.'">';
-			$out .= '<a href="'.$url.'" target="_blank" rel="noopener">'.img_picto('', 'object_globe.png', 'class="paddingleft"').'</a>';
+			$out .= '<a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.img_picto('', 'object_globe.png', 'class="paddingleft"').'</a>';
 			$out .= '</div>';
 			$out .= ajax_autoselect("directpubliclink", 0);
 		} else {
@@ -178,16 +178,16 @@ function showDirectPublicLink($object)
 /**
  *  Generate a random id
  *
- *  @param  int $car Length of string to generate key
+ *  @param  int 	$car 	Length of string to generate key
  *  @return string
  */
 function generate_random_id($car = 16)
 {
 	$string = "";
 	$chaine = "abcdefghijklmnopqrstuvwxyz123456789";
-	srand((double) microtime() * 1000000);
+	mt_srand((double) microtime() * 1000000);
 	for ($i = 0; $i < $car; $i++) {
-		$string .= $chaine[rand() % strlen($chaine)];
+		$string .= $chaine[mt_rand() % strlen($chaine)];
 	}
 	return $string;
 }
@@ -635,7 +635,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 		if ($donetodo) {
 			$tmp = '';
 			if (get_class($filterobj) == 'Societe') {
-				$tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&socid='.$filterobj->id.'&status=done">';
+				$tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&socid='.$filterobj->id.'&status=done">';
 			}
 			$tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
 			$tmp .= ($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
@@ -699,7 +699,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 
 			if ($user->rights->agenda->allactions->create ||
 				(($actionstatic->authorid == $user->id || $actionstatic->userownerid == $user->id) && $user->rights->agenda->myactions->create)) {
-				$out .= '<a class="timeline-btn" href="'.DOL_MAIN_URL_ROOT.'/comm/action/card.php?action=edit&id='.$actionstatic->id.'"><i class="fa fa-pencil" title="'.$langs->trans("Modify").'" ></i></a>';
+				$out .= '<a class="timeline-btn" href="'.DOL_MAIN_URL_ROOT.'/comm/action/card.php?action=edit&token='.newToken().'&id='.$actionstatic->id.'"><i class="fa fa-pencil" title="'.$langs->trans("Modify").'" ></i></a>';
 			}
 
 			$out .= '</span>';
@@ -850,7 +850,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 						$class .= ' documentpreview';
 					}
 
-					$footer .= '<a href="'.$doclink.'" class="btn-link '.$class.'" target="_blank"  '.$mimeAttr.' >';
+					$footer .= '<a href="'.$doclink.'" class="btn-link '.$class.'" target="_blank" rel="noopener noreferrer" '.$mimeAttr.' >';
 					$footer .= img_mime($filePath).' '.$doc->filename;
 					$footer .= '</a>';
 
@@ -958,8 +958,8 @@ function getTicketActionCommEcmList($object)
 
 	$sql = 'SELECT ecm.rowid as id, ecm.src_object_type, ecm.src_object_id, ecm.filepath, ecm.filename';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'ecm_files ecm';
-	$sql .= ' WHERE ecm.filepath = \'agenda/'.$object->id.'\'';
-	//$sql.= ' ecm.src_object_type = \''.$object->element.'\' AND ecm.src_object_id = '.$object->id; // Actually upload file doesn't add type
+	$sql .= " WHERE ecm.filepath = 'agenda/".((int) $object->id)."'";
+	//$sql.= " ecm.src_object_type = '".$db->escape($object->element)."' AND ecm.src_object_id = ".((int) $object->id); // Old version didn't add object_type during upload
 	$sql .= ' ORDER BY ecm.position ASC';
 
 	$resql = $db->query($sql);
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index fda21e28a21..78703c669c5 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -121,7 +121,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 
 	if ($rang == 0) {
 		// Test also done with jstree and dynatree (not able to have <a> inside label)
-		print '<script type="text/javascript" language="javascript">
+		print '<script type="text/javascript">
 		$(document).ready(function(){
 			$("#'.$iddivjstree.'").treeview({
 				collapsed: true,
@@ -190,7 +190,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 			print "\n".'<li '.(!empty($tab[$x]['statut']) ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
 			if ($showfk) {
 				print '<table class="nobordernopadding centpercent"><tr><td>';
-				print '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$tab[$x]['rowid'].$moreparam.'">';
+				print '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&token='.newToken().'&menuId='.$tab[$x]['rowid'].$moreparam.'">';
 				print $tab[$x]['title'];
 				print '</a></strong>';
 				print '&nbsp; (mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' - fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].')';
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 29f208e5254..2792b6d9997 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2010-2017	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2015	    Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Ferran Marcet       <fmarcet@2byte.es>
+ * Copyright (C) 2021       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
@@ -339,7 +340,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 
 	$thumbsbyrow = 6;
 	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder centpercent'.($edit ? ' editmode' : '').'">';
+	print '<table class="noborder centpercent'.($edit ? ' editmodeforshowskin' : '').'">';
 
 	// Title
 	if ($foruserprofile) {
@@ -364,7 +365,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '</th>';
 		print '<th class="right">';
 		$url = 'https://www.dolistore.com/9-skins';
-		print '<a href="'.$url.'" target="_blank">';
+		print '<a href="'.$url.'" target="_blank" rel="noopener noreferrer external">';
 		print $langs->trans('DownloadMoreSkins');
 		print '</a>';
 		print '</th></tr>';
@@ -400,13 +401,13 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 						if (!file_exists($file)) {
 							$url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';
 						}
-						print '<a href="'.$_SERVER["PHP_SELF"].($edit ? '?action=edit&theme=' : '?theme=').$subdir.(GETPOST('optioncss', 'alpha', 1) ? '&optioncss='.GETPOST('optioncss', 'alpha', 1) : '').($fuser ? '&id='.$fuser->id : '').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
+						print '<a href="'.$_SERVER["PHP_SELF"].($edit ? '?action=edit&token='.newToken().'&mode=template&theme=' : '?theme=').$subdir.(GETPOST('optioncss', 'alpha', 1) ? '&optioncss='.GETPOST('optioncss', 'alpha', 1) : '').($fuser ? '&id='.$fuser->id : '').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
 						if ($subdir == $conf->global->MAIN_THEME) {
 							$title = $langs->trans("ThemeCurrentlyActive");
 						} 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>';
@@ -439,6 +440,9 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	$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';
 	}
@@ -502,6 +506,27 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '</tr>';
 	}
 
+	// BorderTableActive
+	/* Disabled because not supported by md theme
+	if ($foruserprofile) {
+	} else {
+		$default = $langs->trans('No');
+		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 ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</td>';
+		print '</tr>';
+	}
+	*/
+
 	// Background color THEME_ELDY_BACKBODY
 	if ($foruserprofile) {
 		/*
@@ -859,15 +884,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// Use Checked
 	if ($foruserprofile) {
 		/* Must first change option to choose color of highlight instead of yes or no.
-		 print '<tr class="oddeven">';
-		 print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
-		 print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
-		 print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
-		 print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
-		 print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-		 print '</td>';
-		 print '</tr>';
-		 */
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
+		print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
+		print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
+		print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
+		print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+		print '</td>';
+		print '</tr>';
+		*/
 	} else {
 		$default = (empty($colorbacklinepairchecked) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairchecked)));
 
@@ -905,6 +930,98 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '</tr>';
 	}
 
+	// Btn action
+	if ($foruserprofile) {
+		/*
+		 print '<tr class="oddeven">';
+		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
+		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_BTNACTION:$langs->trans("Default")).'</td>';
+		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_BTNACTION" id="check_THEME_ELDY_BTNACTION" type="checkbox" '.(! empty($object->conf->THEME_ELDY_BTNACTION)?" checked":"");
+		 print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
+		 print '> '.$langs->trans("UsePersonalValue").'</td>';
+		 print '<td>';
+		 if ($edit)
+		 {
+		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION,array()),''),'THEME_ELDY_BTNACTION','',1).' ';
+		 }
+		 else
+		 {
+		 $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION,array()),'');
+		 if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+		 else print '';
+		 }
+			if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+			print '</td>';*/
+	} else {
+		$default = (empty($butactionbg) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($butactionbg)));
+
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("BtnActionColor").'</td>';
+		print '<td colspan="'.($colspan - 1).'">';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_BTNACTION) ? $conf->global->THEME_ELDY_BTNACTION : ''), array()), ''), 'THEME_ELDY_BTNACTION', '', 1, '', '', 'butactionbg').' ';
+		} else {
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION, array()), '');
+			if ($color) {
+				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+				//print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
+				//print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
+				print $langs->trans("Default");
+			}
+		}
+		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</td>';
+		print '</tr>';
+	}
+
+	// Text btn action
+	if ($foruserprofile) {
+		/*
+		 print '<tr class="oddeven">';
+		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
+		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TEXTBTNACTION:$langs->trans("Default")).'</td>';
+		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TEXTBTNACTION" id="check_THEME_ELDY_TEXTBTNACTION" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TEXTBTNACTION)?" checked":"");
+		 print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"'; // Disabled for demo
+		 print '> '.$langs->trans("UsePersonalValue").'</td>';
+		 print '<td>';
+		 if ($edit)
+		 {
+		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTBTNACTION,array()),''),'THEME_ELDY_TEXTBTNACTION','',1).' ';
+		 }
+		 else
+		 {
+		 $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION,array()),'');
+		 if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+		 else print '';
+		 }
+			if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+			print '</td>';*/
+	} else {
+		$default = (empty($textbutaction) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($textbutaction)));
+
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("TextBtnActionColor").'</td>';
+		print '<td colspan="'.($colspan - 1).'">';
+		if ($edit) {
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTBTNACTION) ? $conf->global->THEME_ELDY_TEXTBTNACTION : ''), array()), ''), 'THEME_ELDY_TEXTBTNACTION', '', 1, '', '', 'textbutaction').' ';
+		} else {
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTBTNACTION, array()), '');
+			if ($color) {
+				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+				//print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
+				//print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
+				print $langs->trans("Default");
+			}
+		}
+		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #000">'.$default.'</span></strong> ';
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print '</td>';
+		print '</tr>';
+	}
+
 	// Use MAIN_OPTIMIZEFORTEXTBROWSER
 	if ($foruserprofile && !empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		//$default=yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 5dd45589936..ca907ae6f1c 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -736,6 +736,81 @@ function getStructuredData($type, $data = array())
 	return $ret;
 }
 
+/**
+ * Return HTML content to add as header card for an article, news or Blog Post or home page.
+ *
+ * @param	array	$params					Array of parameters
+ * @return  string							HTML content
+ */
+function getSocialNetworkHeaderCards($params = null)
+{
+	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
+
+	$out = '';
+
+	if ($website->virtualhost) {
+		$pageurl = $websitepage->pageurl;
+		$title = $websitepage->title;
+		$image = $websitepage->image;
+		$companyname = $mysoc->name;
+		$description = $websitepage->description;
+
+		$pageurl = str_replace('__WEBSITE_KEY__', $website->ref, $pageurl);
+		$title = str_replace('__WEBSITE_KEY__', $website->ref, $title);
+		$image = '/medias'.(preg_match('/^\//', $image) ? '' : '/').str_replace('__WEBSITE_KEY__', $website->ref, $image);
+		$companyname = str_replace('__WEBSITE_KEY__', $website->ref, $companyname);
+		$description = str_replace('__WEBSITE_KEY__', $website->ref, $description);
+
+		$shortlangcode = '';
+		if ($websitepage->lang) {
+			$shortlangcode = substr($websitepage->lang, 0, 2); // en_US or en-US -> en
+		}
+		if (empty($shortlangcode)) {
+			$shortlangcode = substr($website->lang, 0, 2); // en_US or en-US -> en
+		}
+
+		$fullurl = $website->virtualhost.'/'.$websitepage->pageurl.'.php';
+		$canonicalurl = $website->virtualhost.(($websitepage->id == $website->fk_default_home) ? '/' : (($shortlangcode != substr($website->lang, 0, 2) ? '/'.$shortlangcode : '').'/'.$websitepage->pageurl.'.php'));
+		$hashtags = trim(join(' #', array_map('trim', explode(',', $websitepage->keywords))));
+
+		// Open Graph
+		$out .= '<meta name="og:type" content="website">'."\n";	// TODO If blogpost, use type article
+		$out .= '<meta name="og:title" content="'.$websitepage->title.'">'."\n";
+		if ($websitepage->image) {
+			$out .= '<meta name="og:image" content="'.$website->virtualhost.$image.'">'."\n";
+		}
+		$out .= '<meta name="og:url" content="'.$canonicalurl.'">'."\n";
+
+		// Twitter
+		$out .= '<meta name="twitter:card" content="summary">'."\n";
+		if (!empty($params) && !empty($params['twitter_account'])) {
+			$out .= '<meta name="twitter:site" content="@'.$params['twitter_account'].'">'."\n";
+			$out .= '<meta name="twitter:creator" content="@'.$params['twitter_account'].'">'."\n";
+		}
+		$out .= '<meta name="twitter:title" content="'.$websitepage->title.'">'."\n";
+		if ($websitepage->description) {
+			$out .= '<meta name="twitter:description" content="'.$websitepage->description.'">'."\n";
+		}
+		if ($websitepage->image) {
+			$out .= '<meta name="twitter:image" content="'.$website->virtualhost.$image.'">'."\n";
+		}
+		//$out .= '<meta name="twitter:domain" content="'.getDomainFromURL($website->virtualhost, 1).'">';
+		/*
+		 $out .= '<meta name="twitter:app:name:iphone" content="">';
+		 $out .= '<meta name="twitter:app:name:ipad" content="">';
+		 $out .= '<meta name="twitter:app:name:googleplay" content="">';
+		 $out .= '<meta name="twitter:app:url:iphone" content="">';
+		 $out .= '<meta name="twitter:app:url:ipad" content="">';
+		 $out .= '<meta name="twitter:app:url:googleplay" content="">';
+		 $out .= '<meta name="twitter:app:id:iphone" content="">';
+		 $out .= '<meta name="twitter:app:id:ipad" content="">';
+		 $out .= '<meta name="twitter:app:id:googleplay" content="">';
+		 */
+	}
+
+	return $out;
+}
+
 /**
  * Return HTML content to add structured data for an article, news or Blog Post.
  *
@@ -761,7 +836,7 @@ function getSocialNetworkSharingLinks()
 
 		// Reddit
 		$out .= '<div class="dol-social-share-reddit">'."\n";
-		$out .= '<a href="https://www.reddit.com/submit" target="_blank" onclick="window.location = \'https://www.reddit.com/submit?url='.$fullurl.'\'; return false">';
+		$out .= '<a href="https://www.reddit.com/submit" target="_blank" rel="noopener noreferrer external" onclick="window.location = \'https://www.reddit.com/submit?url='.$fullurl.'\'; return false">';
 		$out .= '<span class="dol-social-share-reddit-span">Reddit</span>';
 		$out .= '</a>';
 		$out .= '</div>'."\n";
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 721b908b9d1..fb11846a4fb 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -149,18 +149,20 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 	global $conf, $db;
 
 	// Now create the .tpl file (duplicate code with actions updatesource or updatecontent but we need this to save new header)
-	dol_syslog("We regenerate the tpl page filetpl=".$filetpl);
+	dol_syslog("dolSavePageContent We regenerate the tpl page filetpl=".$filetpl);
 
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	if ($backupold) {
-		dol_delete_file($filetpl.'.old');
-		$result = dol_move($filetpl, $filetpl.'.old', 0, 1, 0, 0);
-		if (! $result) {
-			return false;
+	if (dol_is_file($filetpl)) {
+		if ($backupold) {
+			dol_delete_file($filetpl.'.old');
+			$result = dol_move($filetpl, $filetpl.'.old', 0, 1, 0, 0);
+			if (! $result) {
+				return false;
+			}
+		} else {
+			dol_delete_file($filetpl);
 		}
-	} else {
-		dol_delete_file($filetpl);
 	}
 
 	$shortlangcode = '';
@@ -223,7 +225,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 		}
 
 		// Add "has translation pages"
-		$sql = 'SELECT rowid as id, lang, pageurl from '.MAIN_DB_PREFIX.'website_page where fk_page IN ('.$db->sanitize($objectpage->id.($translationof ? ', '.$translationof : '')).")";
+		$sql = "SELECT rowid as id, lang, pageurl from ".MAIN_DB_PREFIX.'website_page where fk_page IN ('.$db->sanitize($objectpage->id.($translationof ? ", ".$translationof : '')).")";
 		$resql = $db->query($sql);
 		if ($resql) {
 			$num_rows = $db->num_rows($resql);
@@ -523,7 +525,7 @@ function showWebsiteTemplates(Website $website)
 	print '</th>';
 	print '<th class="right">';
 	$url = 'https://www.dolistore.com/43-web-site-templates';
-	print '<a href="'.$url.'" target="_blank">';
+	print '<a href="'.$url.'" target="_blank" rel="noopener noreferrer external">';
 	print $langs->trans('DownloadMoreSkins');
 	print '</a>';
 	print '</th></tr>';
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index 6daea1f2c68..292ce1b44f5 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2007-2015 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010-2011 Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2022      Harry Winner Kamdem  <harry@sense.africa>
  *
  * This 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,18 +56,18 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 		$usernamecol2 = 'email';
 		$entitycol = 'entity';
 
-		$sql = 'SELECT rowid, login, entity, pass, pass_crypted, datestartvalidity, dateendvalidity';
-		$sql .= ' FROM '.$table;
-		$sql .= ' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'";
+		$sql = "SELECT rowid, login, entity, pass, pass_crypted, datestartvalidity, dateendvalidity";
+		$sql .= " FROM ".$table;
+		$sql .= " WHERE (".$usernamecol1." = '".$db->escape($usertotest)."'";
 		if (preg_match('/@/', $usertotest)) {
-			$sql .= ' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
+			$sql .= " OR ".$usernamecol2." = '".$db->escape($usertotest)."'";
 		}
-		$sql .= ') AND '.$entitycol." IN (0,".($entity ? $entity : 1).")";
-		$sql .= ' AND statut = 1';
+		$sql .= ") AND ".$entitycol." IN (0,".($entity ? ((int) $entity) : 1).")";
+		$sql .= " AND statut = 1";
 		// Note: Test on validity is done later
-		// Required to firstly found the user into entity, then the superadmin.
-		// For the case (TODO we must avoid that) a user has renamed its login with same value than a user in entity 0.
-		$sql .= ' ORDER BY entity DESC';
+		// Order is required to firstly found the user into entity, then the superadmin.
+		// For the case (TODO: we must avoid that) a user has renamed its login with same value than a user in entity 0.
+		$sql .= " ORDER BY entity DESC";
 
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -104,7 +105,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 				}
 				// Check crypted password according to crypt algorithm
 				if ($cryptType == 'auto') {
-					if (dol_verifyHash($passtyped, $passcrypted, '0')) {
+					if ($passcrypted && dol_verifyHash($passtyped, $passcrypted, '0')) {
 						$passok = true;
 						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - hash ".$cryptType." of pass is ok");
 					}
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 6b11474995b..1db98f5384e 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2008-2021 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
@@ -120,7 +121,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 					if ($ldapdebug) {
 						print "DEBUG: User ".$usertotest." must change password<br>\n";
 					}
-					$ldap->close();
+					$ldap->unbind();
 					sleep(1);
 					$langs->load('ldap');
 					$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("YouMustChangePassNextLogon", $usertotest, $ldap->domainFQDN);
@@ -131,7 +132,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 					print "DEBUG: ".$ldap->error."<br>\n";
 				}
 			}
-			$ldap->close();
+			$ldap->unbind();
 		}
 
 		// Forge LDAP user and password to test with them
@@ -156,7 +157,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 				// we need to get the real login to use in the ldap answer.
 				if (!empty($conf->global->LDAP_FIELD_LOGIN) && !empty($ldap->login)) {
 					$login = $ldap->login;
-					dol_syslog("functions_ldap::check_user_password_ldap login is now $login (LDAP_FIELD_LOGIN=".$conf->global->LDAP_FIELD_LOGIN.")");
+					dol_syslog("functions_ldap::check_user_password_ldap login is now $login (LDAP_FIELD_LOGIN=".getDolGlobalString('LDAP_FIELD_LOGIN').")");
 				}
 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -166,14 +167,14 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 
 				$now = dol_now();
 				if ($tmpuser->datestartvalidity && $db->jdate($tmpuser->datestartvalidity) >= $now) {
-					$ldap->close();
+					$ldap->unbind();
 					// Load translation files required by the page
 					$langs->loadLangs(array('main', 'errors'));
 					$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorLoginDateValidity");
 					return '--bad-login-validity--';
 				}
 				if ($tmpuser->dateendvalidity && $db->jdate($tmpuser->dateendvalidity) <= dol_get_first_hour($now)) {
-					$ldap->close();
+					$ldap->unbind();
 					// Load translation files required by the page
 					$langs->loadLangs(array('main', 'errors'));
 					$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorLoginDateValidity");
@@ -181,7 +182,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 				}
 
 				// ldap2dolibarr synchronisation
-				if ($login && !empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr') {	// ldap2dolibarr synchronisation
+				if ($login && !empty($conf->ldap->enabled) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') == Ldap::SYNCHRO_LDAP_TO_DOLIBARR) {	// ldap2dolibarr synchronization
 					dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");
 
 					// On charge les attributs du user ldap
@@ -271,7 +272,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 			$_SESSION["dol_loginmesg"] = ($ldap->error ? $ldap->error : $langs->transnoentitiesnoconv("ErrorBadLoginPassword"));
 		}
 
-		$ldap->close();
+		$ldap->unbind();
 	}
 
 	return $login;
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index b032ba5beb4..3b173cecb26 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -283,6 +283,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $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__);
@@ -295,8 +297,6 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2432__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Bookkeeping', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 12, __ENTITY__);
 -- Journals
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2434__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Journals', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
--- Export accounting documents
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2436__+MAX_llx_menu__, 'accountancy', 'accountancy_files', 2400__+MAX_llx_menu__, '/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files', 'AccountantFiles', 1, 'accountancy', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire', '', 0, 16, __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
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index b191e24b117..6504cfa27a6 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -546,7 +546,7 @@ 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.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
+					print '<div class="menu_titre">'.$tabstring.'<span class="vmenudisabled">'.$menu_array[$i]['titre'].'</span></div>'."\n";
 					$lastlevel0 = 'greyed';
 				} else {
 					$lastlevel0 = 'hidden';
@@ -582,7 +582,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					}
 					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.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
+					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<span class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</span><br></div>'."\n";
 				}
 			}
 
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 77725be2ae7..ebb5edc1c3b 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -309,7 +309,7 @@ class MenuManager
 					print '</ul>';
 				}
 				if ($val['enabled'] == 2) {
-					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
+					print '<span class="vsmenudisabled">'.$val['titre'].'</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 13b16bac52d..e69644bd123 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -85,9 +85,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'position' => 10,
 		'id' => $id,
 		'idsel' => 'home',
-		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home") ? 'class="tmenusel"' : 'class="tmenu"',
+		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "home") ? 'class="tmenusel"' : 'class="tmenu"',
 		'prefix' => '<span class="fa fa-home fa-fw paddingright"></span>',
-		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home") ? 0 : 1),
+		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "home") ? 0 : 1),
 		'loadLangs' => array(),
 		'submenus' => array(),
 	);
@@ -110,9 +110,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'position' => 18,
 		'id' => $id,
 		'idsel' => 'members',
-		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") ? 'class="tmenusel"' : 'class="tmenu"',
+		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "members") ? 'class="tmenusel"' : 'class="tmenu"',
 		'prefix' => img_picto('', 'member', 'class="fa-fw paddingright"'),
-		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") ? 0 : 1),
+		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "members") ? 0 : 1),
 		'loadLangs' => array(),
 		'submenus' => array(),
 	);
@@ -139,9 +139,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'position' => 20,
 		'id' => $id,
 		'idsel' => 'companies',
-		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies") ? 'class="tmenusel"' : 'class="tmenu"',
+		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "companies") ? 'class="tmenusel"' : 'class="tmenu"',
 		'prefix' => img_picto('', 'company', 'class="fa-fw paddingright"'),
-		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies") ? 0 : 1),
+		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "companies") ? 0 : 1),
 		'loadLangs' => array("companies", "suppliers"),
 		'submenus' => array(),
 	);
@@ -166,9 +166,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'position' => 30,
 		'id' => $id,
 		'idsel' => 'products',
-		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products") ? 'class="tmenusel"' : 'class="tmenu"',
+		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "products") ? 'class="tmenusel"' : 'class="tmenu"',
 		'prefix' => img_picto('', 'product', 'class="fa-fw paddingright"'),
-		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products") ? 0 : 1),
+		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "products") ? 0 : 1),
 		'loadLangs' => array("products"),
 		'submenus' => array(),
 	);
@@ -191,9 +191,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'position' => 31,
 		'id' => $id,
 		'idsel' => 'mrp',
-		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 'class="tmenusel"' : 'class="tmenu"',
+		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "mrp") ? 'class="tmenusel"' : 'class="tmenu"',
 		'prefix' => img_picto('', 'mrp', 'class="fa-fw paddingright"'),
-		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 0 : 1),
+		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "mrp") ? 0 : 1),
 		'loadLangs' => array("mrp"),
 		'submenus' => array(),
 	);
@@ -216,9 +216,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'position' => 35,
 		'id' => $id,
 		'idsel' => 'project',
-		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project") ? 'class="tmenusel"' : 'class="tmenu"',
+		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "project") ? 'class="tmenusel"' : 'class="tmenu"',
 		'prefix' => img_picto('', 'project', 'class="fa-fw paddingright"'),
-		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project") ? 0 : 1),
+		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "project") ? 0 : 1),
 		'loadLangs' => array("projects"),
 		'submenus' => array(),
 	);
@@ -265,9 +265,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'position' => 40,
 		'id' => $id,
 		'idsel' => 'commercial',
-		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial") ? 'class="tmenusel"' : 'class="tmenu"',
+		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "commercial") ? 'class="tmenusel"' : 'class="tmenu"',
 		'prefix' => img_picto('', 'contract', 'class="fa-fw paddingright"'),
-		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial") ? 0 : 1),
+		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "commercial") ? 0 : 1),
 		'loadLangs' => array("commercial"),
 		'submenus' => array(),
 	);
@@ -299,9 +299,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'position' => 50,
 		'id' => $id,
 		'idsel' => 'billing',
-		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "billing") ? 'class="tmenusel"' : 'class="tmenu"',
+		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "billing") ? 'class="tmenusel"' : 'class="tmenu"',
 		'prefix' => img_picto('', 'bill', 'class="fa-fw paddingright"'),
-		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "billing") ? 0 : 1),
+		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "billing") ? 0 : 1),
 		'loadLangs' => array("compta"),
 		'submenus' => array(),
 	);
@@ -324,9 +324,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'position' => 52,
 		'id' => $id,
 		'idsel' => 'bank',
-		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank") ? 'class="tmenusel"' : 'class="tmenu"',
+		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "bank") ? 'class="tmenusel"' : 'class="tmenu"',
 		'prefix' => img_picto('', 'bank_account', 'class="fa-fw paddingright"'),
-		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank") ? 0 : 1),
+		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "bank") ? 0 : 1),
 		'loadLangs' => array("compta", "banks"),
 		'submenus' => array(),
 	);
@@ -349,9 +349,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'position' => 54,
 		'id' => $id,
 		'idsel' => 'accountancy',
-		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") ? 'class="tmenusel"' : 'class="tmenu"',
+		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "accountancy") ? 'class="tmenusel"' : 'class="tmenu"',
 		'prefix' => img_picto('', 'accountancy', 'class="fa-fw paddingright"'),
-		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") ? 0 : 1),
+		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "accountancy") ? 0 : 1),
 		'loadLangs' => array("compta", "accountancy", "assets", "intracommreport"),
 		'submenus' => array(),
 	);
@@ -375,9 +375,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'position' => 80,
 		'id' => $id,
 		'idsel' => 'hrm',
-		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "hrm") ? 'class="tmenusel"' : 'class="tmenu"',
+		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "hrm") ? 'class="tmenusel"' : 'class="tmenu"',
 		'prefix' => img_picto('', 'hrm', 'class="fa-fw paddingright"'),
-		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "hrm") ? 0 : 1),
+		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "hrm") ? 0 : 1),
 		'loadLangs' => array("holiday"),
 		'submenus' => array(),
 	);
@@ -406,9 +406,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'position' => 88,
 		'id' => $id,
 		'idsel' => 'ticket',
-		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "ticket") ? 'class="tmenusel"' : 'class="tmenu"',
+		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "ticket") ? 'class="tmenusel"' : 'class="tmenu"',
 		'prefix' => img_picto('', 'ticket', 'class="fa-fw paddingright"'),
-		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "ticket") ? 0 : 1),
+		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "ticket") ? 0 : 1),
 		'loadLangs' => array("other"),
 		'submenus' => array(),
 	);
@@ -431,9 +431,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'position' => 90,
 		'id' => $id,
 		'idsel' => 'tools',
-		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools") ? 'class="tmenusel"' : 'class="tmenu"',
+		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "tools") ? 'class="tmenusel"' : 'class="tmenu"',
 		'prefix' => img_picto('', 'tools', 'class="fa-fw paddingright"'),
-		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools") ? 0 : 1),
+		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "tools") ? 0 : 1),
 		'loadLangs' => array("other"),
 		'submenus' => array(),
 	);
@@ -696,7 +696,8 @@ 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;
+
+	global $user, $conf, $langs, $dolibarr_main_db_name, $mysoc, $hookmanager;
 
 	//var_dump($tabMenu);
 
@@ -1066,7 +1067,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				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');
+				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');
 			}
@@ -1084,9 +1087,13 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_paid');
 				}
 
+				$newmenu->add("/fourn/facture/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');
 
-				$newmenu->add("/fourn/facture/rapport.php?leftmenu=suppliers_bills_report", $langs->trans("Reportings"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_report');
+				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');
 			}
@@ -1347,6 +1354,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$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"'));
 
@@ -1359,11 +1372,6 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				// Account Balance
 				$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->rights->accounting->mouvements->lire);
 
-				// 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);
-				}
-
 				// Closure
 				$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'closure');
 
@@ -1486,7 +1494,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 			// Intracomm report
 			if (!empty($conf->intracommreport->enabled)) {
-				$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
+				$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);
@@ -1572,7 +1580,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 			// Cash Control
 			if (!empty($conf->takepos->enabled) || !empty($conf->cashdesk->enabled)) {
-				$permtomakecashfence = ($user->rights->cashdesk->run || $user->rights->takepos->run);
+				$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);
@@ -1617,7 +1625,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$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->propale->lire);
+					$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)) {
@@ -1792,6 +1800,31 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$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
@@ -1964,6 +1997,28 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		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'];
+		//      }
+		//      array_multisort($position, SORT_ASC, $menu_array);
+	}
+
 	// TODO Use the position property in menu_array to reorder the $menu_array
 	//var_dump($menu_array);
 	/*$new_menu_array = array();
@@ -2058,7 +2113,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					print '</div>'."\n";
 					$lastlevel0 = 'enabled';
 				} elseif ($showmenu) {                 // Not enabled but visible (so greyed)
-					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></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';
@@ -2099,7 +2158,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					// Not enabled but visible (so greyed), except if parent was not enabled.
 					print '<div class="menu_contenu'.$cssmenu.'">';
 					print $tabstring;
-					print '<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
+					print '<span class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</span><br>';
+					print '</div>'."\n";
 				}
 			}
 
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index a9817f3d1a5..5b426199a6e 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -317,14 +317,14 @@ class MenuManager
 					print '</ul>';
 				}
 				if ($val['enabled'] == 2) {
-					print '<font class="vsmenudisabled">';
+					print '<span class="spanlilevel0 vsmenudisabled">';
 					// Add font-awesome
 					if ($val['level'] == 0 && !empty($val['prefix'])) {
 						print $val['prefix'];
 					}
 
 					print $val['titre'];
-					print '</font>';
+					print '</span>';
 				}
 				print '</li>';
 				print '</ul>'."\n";
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index d1c222570cf..9a45a9b7fc2 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -320,7 +320,7 @@ class MenuManager
 					print '</ul>';
 				}
 				if ($val['enabled'] == 2) {
-					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
+					print '<span class="vsmenudisabled">'.$val['titre'].'</span>';
 				}
 				print '</li>';
 				print '</ul>'."\n";
@@ -407,7 +407,7 @@ class MenuManager
 						if ($menu_array[$i]['enabled']) {
 							print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($menu_array[$i]['url'], 1).'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>'.$menu_array[$i]['titre'].'</a></div>'."\n";
 						} else {
-							print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
+							print '<div class="menu_titre">'.$tabstring.'<span class="vmenudisabled">'.$menu_array[$i]['titre'].'</span></div>'."\n";
 						}
 						print '<div class="menu_top"></div>'."\n";
 					}
@@ -433,7 +433,7 @@ class MenuManager
 								print '</span>';
 							}
 						} else {
-							print $tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font>';
+							print $tabstring.'<span class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</span>';
 						}
 
 						// If title is not pure text and contains a table, no carriage return added
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 3b7cc0d1184..9f2676dfd72 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -266,6 +266,11 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	 */
 	public $always_enabled;
 
+	/**
+	 * @var bool Module is disabled
+	 */
+	public $disabled;
+
 	/**
 	 * @var int Module is enabled globally (Multicompany support)
 	 */
@@ -343,8 +348,10 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	 */
 	public $hidden = false;
 
-
-
+	/**
+	 * @var string url to check for module update
+	 */
+	public $url_last_version;
 
 
 	/**
@@ -952,7 +959,12 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				$tmp = json_decode($obj->note, true);
 			}
 			if ($obj) {
-				return array('authorid'=>$tmp['authorid'], 'ip'=>$tmp['ip'], 'lastactivationdate'=>$this->db->jdate($obj->tms));
+				return array(
+					'authorid' => $tmp['authorid'],
+					'ip' => $tmp['ip'],
+					'lastactivationdate' => $this->db->jdate($obj->tms),
+					'lastactivationversion' => (!empty($tmp['lastactivationversion']) ? $tmp['lastactivationversion'] : 'unknown'),
+				);
 			}
 		}
 
@@ -986,12 +998,18 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			$err++;
 		}
 
-		$note = json_encode(array('authorid'=>(is_object($user) ? $user->id : 0), 'ip'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR'])));
+		$note = json_encode(
+			array(
+				'authorid' => (is_object($user) ? $user->id : 0),
+				'ip' => (empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']),
+				'lastactivationversion' => $this->version,
+			)
+		);
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name, value, visible, entity, note) VALUES";
-		$sql .= " (".$this->db->encrypt($this->const_name, 1);
-		$sql .= ", ".$this->db->encrypt('1', 1);
-		$sql .= ", 0, ".$entity;
+		$sql .= " (".$this->db->encrypt($this->const_name);
+		$sql .= ", ".$this->db->encrypt('1');
+		$sql .= ", 0, ".((int) $entity);
 		$sql .= ", '".$this->db->escape($note)."')";
 
 		dol_syslog(get_class($this)."::_active insert activation constant", LOG_DEBUG);
@@ -1033,15 +1051,21 @@ 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 and module.key.sql with create table and create keys
-	 * commands must be stored in directory reldir='/module/sql/'
-	 * This function is called by this->init
+	 * Create tables and keys required by module:
+	 * - Files module.sql with create table instructions
+	 * - Then modules.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 may also be called by :
+	 * - _load_tables('/install/mysql/tables/', '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
-	 * @return int             <=0 if KO, >0 if OK
+	 * @param  	string 	$reldir 			Relative directory where to scan files. Example: '/install/mysql/tables' or '/module/sql/'
+	 * @param	string	$onlywithsuffix		Only with the defined suffix
+	 * @return 	int             			<=0 if KO, >0 if OK
 	 */
-	protected function _load_tables($reldir)
+	protected function _load_tables($reldir, $onlywithsuffix = '')
 	{
 		// phpcs:enable
 		global $conf;
@@ -1072,6 +1096,14 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 					}
 					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_' && substr($file, 0, 4) != 'data') {
 							$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
 							if ($result <= 0) {
@@ -1089,6 +1121,14 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 					}
 					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_' && substr($file, 0, 4) != 'data') {
 							$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
 							if ($result <= 0) {
@@ -1106,6 +1146,14 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 					}
 					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) {
@@ -1123,6 +1171,14 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 					}
 					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) {
@@ -1217,8 +1273,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 									continue; // Not enabled by default onto this page.
 								}
 
-								$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id,position,box_order,fk_user,entity)";
-								$sql .= " VALUES (".$lastid.", ".$key2.", '0', 0, ".$conf->entity.")";
+								$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id, position, box_order, fk_user, entity)";
+								$sql .= " VALUES (".((int) $lastid).", ".((int) $key2).", '0', 0, ".((int) $conf->entity).")";
 
 								dol_syslog(get_class($this)."::insert_boxes onto page ".$key2."=".$val2."", LOG_DEBUG);
 								$resql = $this->db->query($sql);
@@ -1263,7 +1319,12 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		if (is_array($this->boxes)) {
 			foreach ($this->boxes as $key => $value) {
 				//$titre = $this->boxes[$key][0];
-				$file = $this->boxes[$key]['file'];
+				if (empty($this->boxes[$key]['file'])) {
+					$file = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility
+				} else {
+					$file = $this->boxes[$key]['file'];
+				}
+
 				//$note  = $this->boxes[$key][2];
 
 				// TODO If the box is also included by another module and the other module is still on, we should not remove it.
@@ -1276,10 +1337,6 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 					}
 				}
 
-				if (empty($file)) {
-					$file = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility
-				}
-
 				if ($this->db->type == 'sqlite3') {
 					// sqlite doesn't support "USING" syntax.
 					// TODO: remove this dependency.
@@ -1549,12 +1606,12 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 					$sql .= ", entity";
 					$sql .= ")";
 					$sql .= " VALUES (";
-					$sql .= $this->db->encrypt($this->const_name."_TABS_".$i, 1);
+					$sql .= $this->db->encrypt($this->const_name."_TABS_".$i);
 					$sql .= ", 'chaine'";
-					$sql .= ", ".$this->db->encrypt($newvalue, 1);
+					$sql .= ", ".$this->db->encrypt($newvalue);
 					$sql .= ", null";
 					$sql .= ", '0'";
-					$sql .= ", ".$entity;
+					$sql .= ", ".((int) $entity);
 					$sql .= ")";
 
 					$resql = $this->db->query($sql);
@@ -1621,9 +1678,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				if ($row[0] == 0) {   // If not found
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
 					$sql .= " VALUES (";
-					$sql .= $this->db->encrypt($name, 1);
+					$sql .= $this->db->encrypt($name);
 					$sql .= ",'".$this->db->escape($type)."'";
-					$sql .= ",".(($val != '') ? $this->db->encrypt($val, 1) : "''");
+					$sql .= ",".(($val != '') ? $this->db->encrypt($val) : "''");
 					$sql .= ",".($note ? "'".$this->db->escape($note)."'" : "null");
 					$sql .= ",'".$this->db->escape($visible)."'";
 					$sql .= ",".$entity;
@@ -1683,10 +1740,10 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	/**
 	 * Adds access rights
 	 *
-	 * @param  int $reinitadminperms If 1, we also grant them to all admin users
-	 * @param  int $force_entity     Force current entity
-	 * @param  int $notrigger        1=Does not execute triggers, 0= execute triggers
-	 * @return int                     Error count (0 if OK)
+	 * @param  int $reinitadminperms 	If 1, we also grant them to all admin users
+	 * @param  int $force_entity     	Force current entity
+	 * @param  int $notrigger        	1=Does not execute triggers, 0= execute triggers
+	 * @return int                     	Error count (0 if OK)
 	 */
 	public function insert_permissions($reinitadminperms = 0, $force_entity = null, $notrigger = 0)
 	{
@@ -1708,16 +1765,19 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
+
 			if ($obj !== null && !empty($obj->value) && !empty($this->rights)) {
+				include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+
 				// If the module is active
 				foreach ($this->rights as $key => $value) {
-					$r_id       = $this->rights[$key][0];
+					$r_id       = $this->rights[$key][0];	// permission id in llx_rights_def (not unique because primary key is couple id-entity)
 					$r_desc     = $this->rights[$key][1];
 					$r_type     = isset($this->rights[$key][2]) ? $this->rights[$key][2] : '';
 					$r_def      = empty($this->rights[$key][3]) ? 0 : $this->rights[$key][3];
 					$r_perms    = $this->rights[$key][4];
 					$r_subperms = isset($this->rights[$key][5]) ? $this->rights[$key][5] : '';
-					$r_modul = empty($this->rights_class) ?strtolower($this->name) : $this->rights_class;
+					$r_modul = empty($this->rights_class) ? strtolower($this->name) : $this->rights_class;
 
 					if (empty($r_type)) {
 						$r_type = 'w';
@@ -1770,21 +1830,20 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 					// If we want to init permissions on admin users
 					if ($reinitadminperms) {
-						if (!class_exists('User')) {
-							include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-						}
 						$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 1";
 						dol_syslog(get_class($this)."::insert_permissions Search all admin users", LOG_DEBUG);
+
 						$resqlseladmin = $this->db->query($sql, 1);
+
 						if ($resqlseladmin) {
 							$num = $this->db->num_rows($resqlseladmin);
 							$i = 0;
 							while ($i < $num) {
-								  $obj2 = $this->db->fetch_object($resqlseladmin);
-								  dol_syslog(get_class($this)."::insert_permissions Add permission to user id=".$obj2->rowid);
+								$obj2 = $this->db->fetch_object($resqlseladmin);
+								dol_syslog(get_class($this)."::insert_permissions Add permission id '.$r_id.' to user id=".$obj2->rowid);
 
-								  $tmpuser = new User($this->db);
-								  $result = $tmpuser->fetch($obj2->rowid);
+								$tmpuser = new User($this->db);
+								$result = $tmpuser->fetch($obj2->rowid);
 								if ($result > 0) {
 									$tmpuser->addrights($r_id, '', '', 0, 1);
 								} else {
@@ -2058,8 +2117,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			$row = $this->db->fetch_row($result);
 
 			if ($row[0] == 0) {
-				$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
-				$sql .= " VALUES (".$this->db->encrypt($name, 1).",'chaine',".$this->db->encrypt($dir, 1).",'Directory for module ".$this->name."','0',".$conf->entity.")";
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name, type, value, note, visible, entity)";
+				$sql .= " VALUES (".$this->db->encrypt($name).", 'chaine', ".$this->db->encrypt($dir).", '".$this->db->escape("Directory for module ".$this->name)."', '0', ".((int) $conf->entity).")";
 
 				dol_syslog(get_class($this)."::insert_dirs", LOG_DEBUG);
 				$this->db->query($sql);
@@ -2135,8 +2194,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 						if (isset($value['entity'])) {
 							$entity = $value['entity'];
 						}
-					} else // when hook is declared with syntax 'hook'=>array('hookcontext1','hookcontext2',...)
-					{
+					} else { // when hook is declared with syntax 'hook'=>array('hookcontext1','hookcontext2',...)
 						$newvalue = json_encode($value);
 					}
 				}
@@ -2150,12 +2208,12 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				$sql .= ", entity";
 				$sql .= ")";
 				$sql .= " VALUES (";
-				$sql .= $this->db->encrypt($this->const_name."_".strtoupper($key), 1);
+				$sql .= " ".$this->db->encrypt($this->const_name."_".strtoupper($key));
 				$sql .= ", 'chaine'";
-				$sql .= ", ".$this->db->encrypt($newvalue, 1);
+				$sql .= ", ".$this->db->encrypt($newvalue);
 				$sql .= ", null";
 				$sql .= ", '0'";
-				$sql .= ", ".$entity;
+				$sql .= ", ".((int) $entity);
 				$sql .= ")";
 
 				dol_syslog(get_class($this)."::insert_module_parts for key=".$this->const_name."_".strtoupper($key), LOG_DEBUG);
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index a87817cdc73..2a76b04fa41 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -186,9 +186,9 @@ class pdf_ban extends ModeleBankAccountDoc
 				$pdf->SetTextColor(0, 0, 0);
 
 				$tab_top = 50;
-				$tab_height = 200;
 				$tab_top_newpage = 40;
-				$tab_height_newpage = 210;
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
 				// Affiche notes
 				if (!empty($object->note_public)) {
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 49e311f1c89..b73a173e015 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -1,4 +1,6 @@
 <?php
+use Stripe\BankAccount;
+
 /* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2020 Josep Lluís Amador  <joseplluis@lliuretic.cat>
  *
@@ -198,9 +200,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$pdf->SetTextColor(0, 0, 0);
 
 				$tab_top = 50;
-				$tab_height = 200;
 				$tab_top_newpage = 40;
-				$tab_height_newpage = 210;
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
 				// Show notes
 				if (!empty($object->note_public)) {
@@ -236,8 +238,15 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$posY = $pdf->GetY();
 				$posY += 2;
 				$pdf->SetXY($this->marge_gauche, $posY);
+
 				$ics = '';
-				if (!empty($conf->global->PRELEVEMENT_ICS)) {
+				$idbankfordirectdebit = getDolGlobalInt('PRELEVEMENT_ID_BANKACCOUNT');
+				if ($idbankfordirectdebit > 0) {
+					$tmpbankfordirectdebit = new Account($this->db);
+					$tmpbankfordirectdebit->fetch($idbankfordirectdebit);
+					$ics = $tmpbankfordirectdebit->ics;	// ICS for direct debit
+				}
+				if (empty($ics) && !empty($conf->global->PRELEVEMENT_ICS)) {
 					$ics = $conf->global->PRELEVEMENT_ICS;
 				}
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->transnoentitiesnoconv("ICS").') : '.$ics, 0, 'L');
@@ -251,7 +260,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$posY += 1;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("Address").' : ', 0, 'L');
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $mysoc->getFullAddress(), 0, 'L');
+				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $mysoc->getFullAddress(1), 0, 'L');
 
 				$posY = $pdf->GetY();
 				$posY += 3;
@@ -282,7 +291,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 				$sepaname = '______________________________________________';
 				if ($thirdparty->id > 0) {
-					$sepaname = $thirdparty->name.($object->account_owner ? ' ('.$object->account_owner.')' : '');
+					$sepaname = $thirdparty->name.($object->proprio ? ' ('.$object->proprio.')' : '');
 				}
 				$posY = $pdf->GetY();
 				$posY += 3;
@@ -304,7 +313,10 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 				$address = '______________________________________________';
 				if ($thirdparty->id > 0) {
-					$address = $thirdparty->getFullAddress();
+					$tmpaddresswithoutcountry = $thirdparty->getFullAddress();	// we test on address without country
+					if ($tmpaddresswithoutcountry) {
+						$address = $thirdparty->getFullAddress(1);	// full address
+					}
 				}
 				$posY = $pdf->GetY();
 				$posY += 1;
@@ -490,7 +502,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		$pdf->SetXY($this->marge_gauche, $posy);
 		$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 		$pdf->MultiCell(100, 6, $mysoc->name, 0, 'L', 0);
-		$pdf->MultiCell(100, 6, $outputlangs->convToOutputCharset($mysoc->getFullAddress()), 0, 'L', 0);
+		$pdf->MultiCell(100, 6, $outputlangs->convToOutputCharset($mysoc->getFullAddress(1)), 0, 'L', 0);
 		$posy = $pdf->GetY() + 2;
 
 		return $posy;
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 0d1bee3c28a..a0197f18cd3 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -92,6 +92,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		$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_PRODUCT_MASK">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
@@ -108,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" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></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 .= '</tr>';
 
 		$texte .= '</table>';
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 242cc0bd3e1..463cbc46a24 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
@@ -115,6 +115,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 		$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="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="BOM_ADDON_PDF_ODT_PATH">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
@@ -151,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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -176,7 +177,9 @@ class doc_generic_bom_odt extends ModelePDFBom
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/bom/mod_bom_advanced.php b/htdocs/core/modules/bom/mod_bom_advanced.php
index d590c3ff70c..09faf05d7d6 100644
--- a/htdocs/core/modules/bom/mod_bom_advanced.php
+++ b/htdocs/core/modules/bom/mod_bom_advanced.php
@@ -81,7 +81,7 @@ class mod_bom_advanced extends ModeleNumRefboms
 		$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="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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
index 16e0f666774..40d63e63143 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
@@ -75,7 +75,7 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskchequereceipts" value="'.$conf->global->CHEQUERECEIPTS_THYME_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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
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 9eeba08297b..b98d403d8f7 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
@@ -53,7 +53,8 @@ class doc_generic_order_odt extends ModelePDFCommandes
 	public $phpmin = array(5, 6);
 
 	/**
-	 * @var string Dolibarr version of the loaded document
+	 * Dolibarr version of the loaded document
+	 * @var string
 	 */
 	public $version = 'dolibarr';
 
@@ -122,6 +123,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 		$texte = $this->description.".<br>\n";
 		$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">';
 		$texte .= '<input type="hidden" name="param1" value="COMMANDE_ADDON_PDF_ODT_PATH">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
@@ -158,7 +160,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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -182,13 +184,15 @@ class doc_generic_order_odt extends ModelePDFCommandes
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="COMMANDE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
@@ -234,6 +238,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 		$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->commande->dir_output) {
@@ -271,7 +276,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$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)) {
@@ -459,7 +464,6 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				}
 
 				// 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
 
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 2de5c057f4d..db961962ba6 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -201,6 +201,7 @@ class pdf_einstein extends ModelePDFCommandes
 		}
 
 		$this->tva = array();
+		$this->tva_array = array();
 		$this->localtax1 = array();
 		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
@@ -567,10 +568,17 @@ class pdf_einstein extends ModelePDFCommandes
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
 						$vatrate .= '*';
 					}
+
+					// Fill $this->tva and $this->tva_array
 					if (!isset($this->tva[$vatrate])) {
 						$this->tva[$vatrate] = 0;
 					}
 					$this->tva[$vatrate] += $tvaligne;
+					$vatcode = $object->lines[$i]->vat_src_code;
+					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
+						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
+					}
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					// Add line
 					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
@@ -882,16 +890,16 @@ class pdf_einstein extends ModelePDFCommandes
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
 	 *	@param	Translate	$outputlangs	Objet langs
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *	@return int							Position pour suite
 	 */
-	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs, $outputlangsbis = null)
 	{
 		// phpcs:enable
 		global $conf, $mysoc, $hookmanager;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$outputlangsbis = null;
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
 			$outputlangsbis = new Translate('', $conf);
 			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
@@ -994,8 +1002,9 @@ class pdf_einstein extends ModelePDFCommandes
 					}
 				}
 				//}
+
 				// VAT
-				foreach ($this->tva as $tvakey => $tvaval) {
+				foreach ($this->tva_array as $tvakey => $tvaval) {
 					if ($tvakey != 0) {    // On affiche pas taux 0
 						$this->atleastoneratenotnull++;
 
@@ -1009,11 +1018,17 @@ class pdf_einstein extends ModelePDFCommandes
 						}
 						$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalVAT", $mysoc->country_code) : '');
 						$totalvat .= ' ';
-						$totalvat .= vatrate($tvakey, 1).$tvacompl;
+						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($tvaval, 0, $outputlangs), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', 1);
 					}
 				}
 
@@ -1256,7 +1271,9 @@ class pdf_einstein extends ModelePDFCommandes
 		global $conf, $langs, $hookmanager;
 
 		$ltrdirection = 'L';
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
+			$ltrdirection = 'R';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "bills", "propal", "orders", "companies"));
@@ -1311,16 +1328,23 @@ class pdf_einstein extends ModelePDFCommandes
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$title = $outputlangs->transnoentities($titlekey);
+		$title .= ' '.$outputlangs->convToOutputCharset($object->ref);
+		if ($object->statut == $object::STATUS_DRAFT) {
+			$pdf->SetTextColor(128, 0, 0);
+			$title .= ' - '.$outputlangs->transnoentities("NotValidated");
+		}
 		$pdf->MultiCell($w, 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;
+		$posy += 3;
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		if ($object->ref_client) {
@@ -1356,7 +1380,7 @@ class pdf_einstein extends ModelePDFCommandes
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
-		if (!empty($conf->global->DOC_SHOW_CUSTOMER_CODE) && !empty($object->thirdparty->code_client)) {
+		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && !empty($object->thirdparty->code_client)) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1408,20 +1432,24 @@ class pdf_einstein extends ModelePDFCommandes
 			$hautcadre = 40;
 
 			// Show sender frame
-			$pdf->SetTextColor(0, 0, 0);
-			$pdf->SetFont('', '', $default_font_size - 2);
-			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
-			$pdf->SetXY($posx, $posy);
-			$pdf->SetFillColor(230, 230, 230);
-			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0, 0, 60);
+			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+				$pdf->SetTextColor(0, 0, 0);
+				$pdf->SetFont('', '', $default_font_size - 2);
+				$pdf->SetXY($posx, $posy - 5);
+				$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetFillColor(230, 230, 230);
+				$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+				$pdf->SetTextColor(0, 0, 60);
+			}
 
 			// Show sender name
-			$pdf->SetXY($posx + 2, $posy + 3);
-			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
-			$posy = $pdf->getY();
+			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+				$pdf->SetXY($posx + 2, $posy + 3);
+				$pdf->SetFont('', 'B', $default_font_size);
+				$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
+				$posy = $pdf->getY();
+			}
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
@@ -1462,11 +1490,13 @@ class pdf_einstein extends ModelePDFCommandes
 			}
 
 			// 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, $ltrdirection);
-			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_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, $ltrdirection);
+				$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+			}
 
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 6486306d9ed..210ef249ac2 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -185,6 +185,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		//  Use new system for position of columns, view  $this->defineColumnField()
 
 		$this->tva = array();
+		$this->tva_array = array();
 		$this->localtax1 = array();
 		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
@@ -258,7 +259,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$arephoto = false;
 				foreach ($pdir as $midir) {
 					if (!$arephoto) {
-						if ($conf->product->entity != $objphoto->entity) {
+						if ($conf->entity != $objphoto->entity) {
 							$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
 						} else {
 							$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
@@ -388,6 +389,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$tab_top = 90 + $top_shift;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
+
 				// Incoterm
 				$height_incoterms = 0;
 				if (!empty($conf->incoterm->enabled)) {
@@ -521,8 +524,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 						}
 						$height_note = $posyafter - $tab_top_newpage;
 						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-					} else // No pagebreak
-					{
+					} else {
+						// No pagebreak
 						$pdf->commitTransaction();
 						$posyafter = $pdf->GetY();
 						$height_note = $posyafter - $tab_top;
@@ -726,7 +729,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					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);
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey, $outputlangs);
 								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
 								$nexY = max($pdf->GetY(), $nexY);
 							}
@@ -790,10 +793,17 @@ class pdf_eratosthene extends ModelePDFCommandes
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
 						$vatrate .= '*';
 					}
+
+					// Fill $this->tva and $this->tva_array
 					if (!isset($this->tva[$vatrate])) {
 						$this->tva[$vatrate] = 0;
 					}
 					$this->tva[$vatrate] += $tvaligne;
+					$vatcode = $object->lines[$i]->vat_src_code;
+					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
+						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
+					}
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					// Add line
 					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
@@ -1096,15 +1106,15 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
 	 *	@param	Translate	$outputlangs	Objet langs
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *	@return int							Position pour suite
 	 */
-	protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs, $outputlangsbis = null)
 	{
 		global $conf, $mysoc, $hookmanager;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$outputlangsbis = null;
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
 			$outputlangsbis = new Translate('', $conf);
 			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
@@ -1205,8 +1215,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 					}
 				}
 				//}
+
 				// VAT
-				foreach ($this->tva as $tvakey => $tvaval) {
+				foreach ($this->tva_array as $tvakey => $tvaval) {
 					if ($tvakey != 0) {    // On affiche pas taux 0
 						$this->atleastoneratenotnull++;
 
@@ -1220,11 +1231,46 @@ class pdf_eratosthene extends ModelePDFCommandes
 						}
 						$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalVAT", $mysoc->country_code) : '');
 						$totalvat .= ' ';
-						$totalvat .= vatrate($tvakey, 1).$tvacompl;
+						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($tvaval, 0, $outputlangs), 0, 'R', 1);
+						$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
+						$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'] ? $tvaval['vatcode'] : vatrate($tvaval['vatrate'], 1)).$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);
 					}
 				}
 
@@ -1482,11 +1528,17 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$title .= ' - ';
 			$title .= $outputlangsbis->transnoentities($titlekey);
 		}
+		$title .= ' '.$outputlangs->convToOutputCharset($object->ref);
+		if ($object->statut == $object::STATUS_DRAFT) {
+			$pdf->SetTextColor(128, 0, 0);
+			$title .= ' - '.$outputlangs->transnoentities("NotValidated");
+		}
 
 		$pdf->MultiCell($w, 3, $title, '', 'R');
 
 		$pdf->SetFont('', 'B', $default_font_size);
 
+		/*
 		$posy += 5;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
@@ -1496,8 +1548,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
 		}
 		$pdf->MultiCell($w, 4, $textref, '', 'R');
+		*/
 
-		$posy += 1;
+		$posy += 3;
 		$pdf->SetFont('', '', $default_font_size - 2);
 
 		if ($object->ref_client) {
@@ -1538,7 +1591,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		}
 		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
-		if (!empty($conf->global->DOC_SHOW_CUSTOMER_CODE) && !empty($object->thirdparty->code_client)) {
+		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && !empty($object->thirdparty->code_client)) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1594,20 +1647,24 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 
 			// Show sender frame
-			$pdf->SetTextColor(0, 0, 0);
-			$pdf->SetFont('', '', $default_font_size - 2);
-			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
-			$pdf->SetXY($posx, $posy);
-			$pdf->SetFillColor(230, 230, 230);
-			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0, 0, 60);
+			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+				$pdf->SetTextColor(0, 0, 0);
+				$pdf->SetFont('', '', $default_font_size - 2);
+				$pdf->SetXY($posx, $posy - 5);
+				$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
+				$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, $ltrdirection);
-			$posy = $pdf->getY();
+			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+				$pdf->SetXY($posx + 2, $posy + 3);
+				$pdf->SetFont('', 'B', $default_font_size);
+				$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
+				$posy = $pdf->getY();
+			}
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
@@ -1647,11 +1704,13 @@ class pdf_eratosthene extends ModelePDFCommandes
 			}
 
 			// 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, $ltrdirection);
-			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_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, $ltrdirection);
+				$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+			}
 
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php
index 8b4ccdfaba7..ffb53480aa3 100644
--- a/htdocs/core/modules/commande/mod_commande_saphir.php
+++ b/htdocs/core/modules/commande/mod_commande_saphir.php
@@ -81,7 +81,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskorder" value="'.$conf->global->COMMANDE_SAPHIR_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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
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 a640d342ddc..d673379b32d 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
@@ -121,6 +121,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$texte = $this->description.".<br>\n";
 		$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">';
 		$texte .= '<input type="hidden" name="param1" value="CONTRACT_ADDON_PDF_ODT_PATH">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
@@ -157,7 +158,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$texte .= $conf->global->CONTRACT_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Modify")).'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Modify")).'" name="Button">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -168,13 +169,15 @@ 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 .= '<input type="hidden" value="CONTRACT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 655c461da20..69a4d5ce96e 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -657,7 +657,7 @@ class pdf_strato extends ModelePDFContract
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date_contrat, "day", false, $outputlangs, true), '', 'R');
 
-		if ($object->thirdparty->code_client) {
+		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && $object->thirdparty->code_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -685,19 +685,23 @@ class pdf_strato extends ModelePDFContract
 			$hautcadre = 40;
 
 			// Show sender frame
-			$pdf->SetTextColor(0, 0, 0);
-			$pdf->SetFont('', '', $default_font_size - 2);
-			$pdf->SetXY($posx, $posy - 5);
-			$pdf->SetXY($posx, $posy);
-			$pdf->SetFillColor(230, 230, 230);
-			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+				$pdf->SetTextColor(0, 0, 0);
+				$pdf->SetFont('', '', $default_font_size - 2);
+				$pdf->SetXY($posx, $posy - 5);
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetFillColor(230, 230, 230);
+				$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+			}
 
 			// Show sender name
-			$pdf->SetXY($posx + 2, $posy + 3);
-			$pdf->SetTextColor(0, 0, 60);
-			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-			$posy = $pdf->getY();
+			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+				$pdf->SetXY($posx + 2, $posy + 3);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->SetFont('', 'B', $default_font_size);
+				$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+				$posy = $pdf->getY();
+			}
 
 			// Show sender information
 			$pdf->SetFont('', '', $default_font_size - 1);
@@ -738,11 +742,13 @@ class pdf_strato extends ModelePDFContract
 			}
 
 			// Show recipient frame
-			$pdf->SetTextColor(0, 0, 0);
-			$pdf->SetFont('', '', $default_font_size - 2);
-			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
-			$pdf->SetTextColor(0, 0, 0);
+			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_FRAME)) {
+				$pdf->SetTextColor(0, 0, 0);
+				$pdf->SetFont('', '', $default_font_size - 2);
+				$pdf->SetXY($posx + 2, $posy - 5);
+				$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+				$pdf->SetTextColor(0, 0, 0);
+			}
 
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php
index dcaee5eadbc..e0c54c1d022 100644
--- a/htdocs/core/modules/contract/mod_contract_magre.php
+++ b/htdocs/core/modules/contract/mod_contract_magre.php
@@ -86,7 +86,7 @@ class mod_contract_magre extends ModelNumRefContracts
 
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskcontract" value="'.$conf->global->CONTRACT_MAGRE_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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 		$texte .= '</tr>';
 		$texte .= '</table>';
 		$texte .= '</form>';
diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index 4e61c44858d..742d06e2e34 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -156,6 +156,9 @@ class pdf_storm extends ModelePDFDeliveryOrder
 		}
 
 		$this->tva = array();
+		$this->tva_array = array();
+		$this->localtax1 = array();
+		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
 		$this->atleastonediscount = 0;
 	}
@@ -342,8 +345,8 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 				$tab_top = 90;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
-				$tab_height = 130;
-				$tab_height_newpage = 150;
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
 				$this->posxdesc = $this->marge_gauche + 1;
 
@@ -352,7 +355,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms) {
-						$tab_top = 88;
+						$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);
@@ -539,7 +542,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 					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);
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey, $outputlangs);
 								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
 								$nexY = max($pdf->GetY(), $nexY);
 							}
diff --git a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
index 19e319d0522..5875814b546 100644
--- a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
@@ -173,6 +173,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		}
 
 		$this->tva = array();
+		$this->tva_array = array();
+		$this->localtax1 = array();
+		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
 		$this->atleastonediscount = 0;
 	}
@@ -321,15 +324,15 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 				$tab_top = 90;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
-				$tab_height = 130;
-				$tab_height_newpage = 150;
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
 				// Incoterm
 				$height_incoterms = 0;
 				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms) {
-						$tab_top = 88;
+						$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);
diff --git a/htdocs/core/modules/delivery/mod_delivery_saphir.php b/htdocs/core/modules/delivery/mod_delivery_saphir.php
index d5ac288b52a..7fc9b2e6e52 100644
--- a/htdocs/core/modules/delivery/mod_delivery_saphir.php
+++ b/htdocs/core/modules/delivery/mod_delivery_saphir.php
@@ -85,7 +85,7 @@ class mod_delivery_saphir extends ModeleNumRefDeliveryOrder
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskdelivery" value="'.$conf->global->DELIVERY_SAPHIR_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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
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 2455e9447d8..2dd33bab141 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
@@ -123,6 +123,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 		$texte = $this->description.".<br>\n";
 		$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">';
 		$texte .= '<input type="hidden" name="param1" value="EXPEDITION_ADDON_PDF_ODT_PATH">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
@@ -159,7 +160,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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button button-edit reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -182,12 +183,14 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="EXPEDITION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 430398d28d1..fc1094ea949 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -324,8 +324,8 @@ class pdf_espadon extends ModelePdfExpedition
 
 				$tab_top = 90;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift: 10);
-				$tab_height = 130;
-				$tab_height_newpage = 150;
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
 				$this->posxdesc = $this->marge_gauche + 1;
 
@@ -334,7 +334,7 @@ class pdf_espadon extends ModelePdfExpedition
 				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms) {
-						$tab_top = 88;
+						$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);
@@ -651,6 +651,11 @@ class pdf_espadon extends ModelePdfExpedition
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
+					if ($this->getColumnStatus('unit_order')) {
+						$this->printStdColumnContent($pdf, $curY, 'unit_order', measuringUnitString($object->lines[$i]->fk_unit));
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
 					if ($this->getColumnStatus('qty_shipped')) {
 						$this->printStdColumnContent($pdf, $curY, 'qty_shipped', $object->lines[$i]->qty_shipped);
 						$nexY = max($pdf->GetY(), $nexY);
@@ -665,7 +670,7 @@ class pdf_espadon extends ModelePdfExpedition
 					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);
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey, $outputlangs);
 								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
 								$nexY = max($pdf->GetY(), $nexY);
 							}
@@ -1021,7 +1026,7 @@ class pdf_espadon extends ModelePdfExpedition
 				$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, "day", false, $outputlangs, true), '', 'R');
 		}
 
-		if (!empty($object->thirdparty->code_client)) {
+		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && !empty($object->thirdparty->code_client)) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1086,21 +1091,25 @@ class pdf_espadon extends ModelePdfExpedition
 			$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($widthrecbox, 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);
+			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+				$pdf->SetTextColor(0, 0, 0);
+				$pdf->SetFont('', '', $default_font_size - 2);
+				$pdf->SetXY($posx, $posy - 5);
+				$pdf->MultiCell($widthrecbox, 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($this->emetteur->name), 0, 'L');
-			$posy = $pdf->getY();
+			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+				$pdf->SetXY($posx + 2, $posy + 3);
+				$pdf->SetFont('', 'B', $default_font_size);
+				$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+				$posy = $pdf->getY();
+			}
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
@@ -1139,11 +1148,13 @@ class pdf_espadon extends ModelePdfExpedition
 			}
 
 			// 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);
+			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_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);
@@ -1306,6 +1317,20 @@ class pdf_espadon extends ModelePdfExpedition
 			),
 		);
 
+		$rank = $rank + 10;
+		$this->cols['unit_order'] = array(
+			'rank' => $rank,
+			'width' => 15, // in mm
+			'status' => empty($conf->global->PRODUCT_USE_UNITS) ? 0 : 1,
+			'title' => array(
+				'textkey' => 'Unit'
+			),
+			'border-left' => true, // add left line separator
+			'content' => array(
+				'align' => 'C',
+			),
+		);
+
 		$rank = $rank + 10;
 		$this->cols['qty_shipped'] = array(
 			'rank' => $rank,
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index 56c8fb143fb..9a905422ff1 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -282,8 +282,8 @@ class pdf_merou extends ModelePdfExpedition
 
 				$tab_top = 52;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
-				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter;
-				$tab_height_newpage = $this->page_hauteur - $tab_top_newpage - $heightforfooter;
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
 				// Display notes
 				if (!empty($object->note_public)) {
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index e0ebc4c6094..211231b9812 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -127,7 +127,7 @@ class pdf_rouget extends ModelePdfExpedition
 
 		$this->db = $db;
 		$this->name = "rouget";
-		$this->description = $langs->trans("DocumentModelStandardPDF");
+		$this->description = $langs->trans("DocumentModelStandardPDF").' ('.$langs->trans("OldImplementation").')';
 		$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';
@@ -349,15 +349,15 @@ class pdf_rouget extends ModelePdfExpedition
 
 				$tab_top = 90;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
-				$tab_height = 130;
-				$tab_height_newpage = 150;
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
 				// Incoterm
 				$height_incoterms = 0;
 				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms) {
-						$tab_top = 88;
+						$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);
@@ -971,7 +971,7 @@ class pdf_rouget extends ModelePdfExpedition
 				$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, "day", false, $outputlangs, true), '', 'R');
 		}
 
-		if (!empty($object->thirdparty->code_client)) {
+		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && !empty($object->thirdparty->code_client)) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1036,21 +1036,25 @@ class pdf_rouget extends ModelePdfExpedition
 			$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($widthrecbox, 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);
+			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+				$pdf->SetTextColor(0, 0, 0);
+				$pdf->SetFont('', '', $default_font_size - 2);
+				$pdf->SetXY($posx, $posy - 5);
+				$pdf->MultiCell($widthrecbox, 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($this->emetteur->name), 0, 'L');
-			$posy = $pdf->getY();
+			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+				$pdf->SetXY($posx + 2, $posy + 3);
+				$pdf->SetFont('', 'B', $default_font_size);
+				$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+				$posy = $pdf->getY();
+			}
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
@@ -1089,11 +1093,13 @@ class pdf_rouget extends ModelePdfExpedition
 			}
 
 			// 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);
+			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_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);
diff --git a/htdocs/core/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php
index 79bbcbdb481..736ddc3ab3f 100644
--- a/htdocs/core/modules/expedition/mod_expedition_ribera.php
+++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php
@@ -81,7 +81,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 
 		$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="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 button-edit" name="Button" value="'.$langs->trans("Modify").'"></td>';
 		$texte .= '</tr>';
 		$texte .= '</table>';
 		$texte .= '</form>';
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index f5862bfc5f2..a4e3ab491a5 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -197,9 +197,11 @@ class pdf_standard extends ModeleExpenseReport
 		}
 
 		$this->tva = array();
+		$this->tva_array = array();
 		$this->localtax1 = array();
 		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
+		$this->atleastonediscount = 0;
 	}
 
 
@@ -313,8 +315,8 @@ class pdf_standard extends ModeleExpenseReport
 
 				$tab_top = 95;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 65 : 10);
-				$tab_height = 130;
-				$tab_height_newpage = 150;
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
 				// Show notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
index 482b8c06431..c403aa8c228 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
@@ -84,7 +84,7 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
 		$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>';
 
-		$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 button-edit" name="Button" value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
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 bcbb02d1e91..b8bfcdc16ac 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
@@ -122,6 +122,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		$texte = $this->description.".<br>\n";
 		$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">';
 		$texte .= '<input type="hidden" name="param1" value="FACTURE_ADDON_PDF_ODT_PATH">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
@@ -158,7 +159,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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button"value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -181,12 +182,14 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="FACTURE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
@@ -397,6 +400,20 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_propal, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 
+				// Complete also with substitution from keys directly found into template
+				// TODO Search all tags {object_...:xxxx} into template then loop on this found tags to analyze them and the the corresponding
+				// property of object and use the xxxx to know how to format it.
+				// Before that, we hard code this substitution as if we have found them into the template.
+				$tmparray['object_PREVIOUS_MONTH'] = dol_print_date(dol_time_plus_duree($this->date, -1, 'm'), '%m');
+				$tmparray['object_MONTH'] = dol_print_date($this->date, '%m');
+				$tmparray['object_NEXT_MONTH'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'm'), '%m');
+				$tmparray['object_PREVIOUS_MONTH_TEXT'] = dol_print_date(dol_time_plus_duree($this->date, -1, 'm'), '%B');
+				$tmparray['object_MONTH_TEXT'] = dol_print_date($this->date, '%B');
+				$tmparray['object_NEXT_MONTH_TEXT'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'm'), '%B');
+				$tmparray['object_PREVIOUS_YEAR'] = dol_print_date(dol_time_plus_duree($this->date, -1, 'y'), '%Y');
+				$tmparray['object_YEAR'] = dol_print_date($this->date, '%Y');
+				$tmparray['object_NEXT_YEAR'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'y'), '%Y');
+
 				// 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
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index e26b03cdc46..b9ceb3e346b 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -210,6 +210,7 @@ class pdf_crabe extends ModelePDFFactures
 		}
 
 		$this->tva = array();
+		$this->tva_array = array();
 		$this->localtax1 = array();
 		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
@@ -248,6 +249,14 @@ class pdf_crabe extends ModelePDFFactures
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
 
+		global $outputlangsbis;
+		$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", "bills", "products", "dict", "companies"));
+		}
+
 		$nblines = count($object->lines);
 
 		// Loop on each lines to detect if there is at least one image to show
@@ -420,15 +429,54 @@ class pdf_crabe extends ModelePDFFactures
 				}
 				$pagenb++;
 
+				// Output header (logo, ref and address blocks). This is first call for first page.
 				$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;
+				// $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);
 
+				// You can add more thing under header here, if you increase $extra_under_address_shift too.
+				$extra_under_address_shift = 0;
+				if (! empty($conf->global->INVOICE_ADD_ZATCA_QR_CODE)) {
+					$qrcodestring = $object->buildZATCAQRString();
+					$qrcodecolor = array('25', '25', '25');
+					// set style for QR-code
+					$styleQr = array(
+						'border' => false,
+						'padding' => 0,
+						'fgcolor' => $qrcodecolor,
+						'bgcolor' => false, //array(255,255,255)
+						'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');
+					$extra_under_address_shift += 25;
+				}
+
+				// Call hook printUnderHeaderPDFline
+				$parameters = array(
+					'object' => $object,
+					'i' => $i,
+					'pdf' =>& $pdf,
+					'outputlangs' => $outputlangs,
+					'hidedetails' => $hidedetails
+				);
+				$reshook = $hookmanager->executeHooks('printUnderHeaderPDFline', $parameters, $this); // Note that $object may have been modified by hook
+				if (!empty($hookmanager->resArray['extra_under_address_shift'])) {
+					$extra_under_address_shift += $hookmanager->resArray['extra_under_header_shift'];
+				}
+
+				$tab_top += $extra_under_address_shift;
+				$tab_top_newpage += $extra_under_address_shift;
+
 				// Incoterm
+				$height_incoterms = 0;
 				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms) {
@@ -696,10 +744,17 @@ class pdf_crabe extends ModelePDFFactures
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
 						$vatrate .= '*';
 					}
+
+					// Fill $this->tva and $this->tva_array
 					if (!isset($this->tva[$vatrate])) {
 						$this->tva[$vatrate] = 0;
 					}
-					$this->tva[$vatrate] += $tvaligne;
+					$this->tva[$vatrate] += $tvaligne;	// ->tva is abandonned, we use now ->tva_array that is more complete
+					$vatcode = $object->lines[$i]->vat_src_code;
+					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
+						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
+					}
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					if ($posYAfterImage > $posYAfterDescription) {
 						$nexY = $posYAfterImage;
@@ -761,10 +816,10 @@ class pdf_crabe extends ModelePDFFactures
 				}
 
 				// Display info area
-				$posy = $this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
+				$posy = $this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs, $outputlangsbis);
 
 				// Display total area
-				$posy = $this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+				$posy = $this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs, $outputlangsbis);
 
 				// Display Payments area
 				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS)) {
@@ -1014,9 +1069,10 @@ class pdf_crabe extends ModelePDFFactures
 	 *   @param		Facture		$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	void
+	 *   @param  	Translate	$outputlangsbis	Object lang for output bis
+	 *   @return	int							Pos y
 	 */
-	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs, $outputlangsbis)
 	{
 		// phpcs:enable
 		global $conf, $mysoc;
@@ -1053,7 +1109,7 @@ class pdf_crabe extends ModelePDFFactures
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			$pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
 
-			$posy = $pdf->GetY() + 3;
+			$posy = $pdf->GetY() + 3;	// We need spaces for 2 lines payment conditions
 		}
 
 		if ($object->type != 2) {
@@ -1078,7 +1134,7 @@ class pdf_crabe extends ModelePDFFactures
 			}
 
 			// Show payment mode
-			if ($object->mode_reglement_code
+			if (!empty($object->mode_reglement_code)
 			&& $object->mode_reglement_code != 'CHQ'
 			&& $object->mode_reglement_code != 'VIR') {
 				$pdf->SetFont('', 'B', $default_font_size - 2);
@@ -1091,9 +1147,25 @@ class pdf_crabe extends ModelePDFFactures
 				$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');
 
-				// Show online payment link
-				$useonlinepayment = ((!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled)) && !empty($conf->global->PDF_SHOW_LINK_TO_ONLINE_PAYMENT));
-				if (($object->mode_reglement_code == 'CB' || $object->mode_reglement_code == 'VAD') && $object->statut != Facture::STATUS_DRAFT && $useonlinepayment) {
+				$posy = $pdf->GetY();
+			}
+
+			// Show online payment link
+			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CB' || $object->mode_reglement_code == 'VAD') {
+				$useonlinepayment = 0;
+				if (!empty($conf->global->PDF_SHOW_LINK_TO_ONLINE_PAYMENT)) {
+					if (!empty($conf->paypal->enabled)) {
+						$useonlinepayment++;
+					}
+					if (!empty($conf->stripe->enabled)) {
+						$useonlinepayment++;
+					}
+					if (!empty($conf->paybox->enabled)) {
+						$useonlinepayment++;
+					}
+				}
+
+				if ($object->statut != Facture::STATUS_DRAFT && $useonlinepayment) {
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 					global $langs;
 
@@ -1102,11 +1174,11 @@ class pdf_crabe extends ModelePDFFactures
 					$paiement_url = getOnlinePaymentUrl('', 'invoice', $object->ref, '', '', '');
 					$linktopay = $langs->trans("ToOfferALinkForOnlinePayment", $servicename).' <a href="'.$paiement_url.'">'.$outputlangs->transnoentities("ClickHere").'</a>';
 
-					$pdf->writeHTMLCell(80, 10, '', '', dol_htmlentitiesbr($linktopay), 0, 1);
+					$pdf->SetXY($this->marge_gauche, $posy);
+					$pdf->writeHTMLCell(80, 5, '', '', dol_htmlentitiesbr($linktopay), 0, 1);
 				}
 
-
-				$posy = $pdf->GetY() + 2;
+				$posy = $pdf->GetY() + 1;
 			}
 
 			// Show payment mode CHQ
@@ -1181,12 +1253,13 @@ class pdf_crabe extends ModelePDFFactures
 	 *	@param  int			$deja_regle     Amount already paid (in the currency of invoice)
 	 *	@param	int			$posy			Position depart
 	 *	@param	Translate	$outputlangs	Objet langs
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *	@return int							Position pour suite
 	 */
-	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs, $outputlangsbis)
 	{
 		// phpcs:enable
-		global $conf, $mysoc;
+		global $conf, $mysoc, $hookmanager;
 
 		$sign = 1;
 		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
@@ -1261,7 +1334,8 @@ class pdf_crabe extends ModelePDFFactures
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
 
-							$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
+							$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalLT1", $mysoc->country_code) : '');
+							$totalvat .= ' ';
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
@@ -1283,8 +1357,6 @@ class pdf_crabe extends ModelePDFFactures
 						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
-
-
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
@@ -1293,7 +1365,8 @@ class pdf_crabe extends ModelePDFFactures
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
-							$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
+							$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalLT2", $mysoc->country_code) : '');
+							$totalvat .= ' ';
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
@@ -1306,7 +1379,7 @@ class pdf_crabe extends ModelePDFFactures
 				//}
 
 				// VAT
-				foreach ($this->tva as $tvakey => $tvaval) {
+				foreach ($this->tva_array as $tvakey => $tvaval) {
 					if ($tvakey != 0) {    // On affiche pas taux 0
 						$this->atleastoneratenotnull++;
 
@@ -1318,12 +1391,19 @@ class pdf_crabe extends ModelePDFFactures
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
-						$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).' ';
-						$totalvat .= vatrate($tvakey, 1).$tvacompl;
+						$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, 'MT'), 0, $outputlangs), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', 1);
 					}
 				}
 
@@ -1616,7 +1696,7 @@ class pdf_crabe extends ModelePDFFactures
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @param  Translate	$outputlangsbis	Object lang for output bis
-	 *  @return	void
+	 *  @return	int							top shift of linked object lines
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null)
 	{
@@ -1710,10 +1790,17 @@ class pdf_crabe extends ModelePDFFactures
 				$title .= $outputlangsbis->transnoentities("InvoiceProForma");
 			}
 		}
+		$title .= ' '.$outputlangs->convToOutputCharset($object->ref);
+		if ($object->statut == $object::STATUS_DRAFT) {
+			$pdf->SetTextColor(128, 0, 0);
+			$title .= ' - '.$outputlangs->transnoentities("NotValidated");
+		}
+
 		$pdf->MultiCell($w, 3, $title, '', 'R');
 
 		$pdf->SetFont('', 'B', $default_font_size);
 
+		/*
 		$posy += 5;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
@@ -1722,9 +1809,9 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->SetTextColor(128, 0, 0);
 			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
 		}
-		$pdf->MultiCell($w, 4, $textref, '', 'R');
+		$pdf->MultiCell($w, 4, $textref, '', 'R');*/
 
-		$posy += 1;
+		$posy += 3;
 		$pdf->SetFont('', '', $default_font_size - 2);
 
 		if ($object->ref_client) {
@@ -1811,7 +1898,7 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date_lim_reglement, "day", false, $outputlangs, true), '', 'R');
 		}
 
-		if ($object->thirdparty->code_client) {
+		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && $object->thirdparty->code_client) {
 			$posy += 3;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1858,20 +1945,24 @@ class pdf_crabe extends ModelePDFFactures
 
 
 			// Show sender frame
-			$pdf->SetTextColor(0, 0, 0);
-			$pdf->SetFont('', '', $default_font_size - 2);
-			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
-			$pdf->SetXY($posx, $posy);
-			$pdf->SetFillColor(230, 230, 230);
-			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0, 0, 60);
+			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+				$pdf->SetTextColor(0, 0, 0);
+				$pdf->SetFont('', '', $default_font_size - 2);
+				$pdf->SetXY($posx, $posy - 5);
+				$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
+				$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, $ltrdirection);
-			$posy = $pdf->getY();
+			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+				$pdf->SetXY($posx + 2, $posy + 3);
+				$pdf->SetFont('', 'B', $default_font_size);
+				$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
+				$posy = $pdf->getY();
+			}
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
@@ -1912,11 +2003,13 @@ class pdf_crabe extends ModelePDFFactures
 			}
 
 			// Show recipient frame
-			$pdf->SetTextColor(0, 0, 0);
-			$pdf->SetFont('', '', $default_font_size - 2);
-			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox - 2, 5, $outputlangs->transnoentities("BillTo"), 0, $ltrdirection);
-			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_FRAME)) {
+				$pdf->SetTextColor(0, 0, 0);
+				$pdf->SetFont('', '', $default_font_size - 2);
+				$pdf->SetXY($posx + 2, $posy - 5);
+				$pdf->MultiCell($widthrecbox - 2, 5, $outputlangs->transnoentities("BillTo"), 0, $ltrdirection);
+				$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+			}
 
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index ef63ad14a94..c1666545891 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -187,6 +187,7 @@ class pdf_sponge extends ModelePDFFactures
 		//  Use new system for position of columns, view  $this->defineColumnField()
 
 		$this->tva = array();
+		$this->tva_array = array();
 		$this->localtax1 = array();
 		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
@@ -264,7 +265,7 @@ class pdf_sponge extends ModelePDFFactures
 				$arephoto = false;
 				foreach ($pdir as $midir) {
 					if (!$arephoto) {
-						if ($conf->product->entity != $objphoto->entity) {
+						if ($conf->entity != $objphoto->entity) {
 							$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
 						} else {
 							$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
@@ -411,19 +412,56 @@ class pdf_sponge extends ModelePDFFactures
 				}
 				$pagenb++;
 
+				// Output header (logo, ref and address blocks). This is first call for first page.
 				$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;
+				// $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);
-				$tab_height = 130 - $top_shift;
-				$tab_height_newpage = 150;
-				if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
-					$tab_height_newpage -= $top_shift;
+
+				// You can add more thing under header here, if you increase $extra_under_address_shift too.
+				$extra_under_address_shift = 0;
+				if (! empty($conf->global->INVOICE_ADD_ZATCA_QR_CODE)) {
+					$qrcodestring = $object->buildZATCAQRString();
+					$qrcodecolor = array('25', '25', '25');
+					// set style for QR-code
+					$styleQr = array(
+						'border' => false,
+						'padding' => 0,
+						'fgcolor' => $qrcodecolor,
+						'bgcolor' => false, //array(255,255,255)
+						'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');
+					$extra_under_address_shift += 25;
 				}
 
+				// Call hook printUnderHeaderPDFline
+				$parameters = array(
+					'object' => $object,
+					'i' => $i,
+					'pdf' =>& $pdf,
+					'outputlangs' => $outputlangs,
+					'hidedetails' => $hidedetails
+				);
+				$reshook = $hookmanager->executeHooks('printUnderHeaderPDFline', $parameters, $this); // Note that $object may have been modified by hook
+				if (!empty($hookmanager->resArray['extra_under_address_shift'])) {
+					$extra_under_address_shift += $hookmanager->resArray['extra_under_header_shift'];
+				}
+
+				$tab_top += $extra_under_address_shift;
+				$tab_top_newpage += $extra_under_address_shift;
+
+
+				// Define heigth of table for lines (for first page)
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
+
 				$nexY = $tab_top - 1;
 
 				// Incoterm
@@ -447,7 +485,7 @@ class pdf_sponge extends ModelePDFFactures
 					}
 				}
 
-				// Displays notes
+				// Displays notes. Here we are still on code eecuted only for the first page.
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
 				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
 					// Get first sale rep
@@ -560,8 +598,8 @@ class pdf_sponge extends ModelePDFFactures
 						}
 						$height_note = $posyafter - $tab_top_newpage;
 						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-					} else // No pagebreak
-					{
+					} else {
+						// No pagebreak
 						$pdf->commitTransaction();
 						$posyafter = $pdf->GetY();
 						$height_note = $posyafter - $tab_top;
@@ -594,7 +632,7 @@ class pdf_sponge extends ModelePDFFactures
 				// Use new auto column system
 				$this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
-				// Table simulation to know the height of the title line
+				// 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);
 				$pdf->rollbackTransaction(true);
@@ -766,7 +804,7 @@ class pdf_sponge extends ModelePDFFactures
 					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);
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey, $outputlangs);
 								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
 								$nexY = max($pdf->GetY(), $nexY);
 							}
@@ -844,10 +882,17 @@ class pdf_sponge extends ModelePDFFactures
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
 						$vatrate .= '*';
 					}
+
+					// Fill $this->tva and $this->tva_array
 					if (!isset($this->tva[$vatrate])) {
 						$this->tva[$vatrate] = 0;
 					}
-					$this->tva[$vatrate] += $tvaligne;
+					$this->tva[$vatrate] += $tvaligne;	// ->tva is abandonned, we use now ->tva_array that is more complete
+					$vatcode = $object->lines[$i]->vat_src_code;
+					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
+						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
+					}
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					$nexY = max($nexY, $posYAfterImage);
 
@@ -906,10 +951,10 @@ class pdf_sponge extends ModelePDFFactures
 				}
 
 				// Display infos area
-				$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
+				$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs, $outputlangsbis);
 
 				// Display total zone
-				$posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+				$posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs, $outputlangsbis);
 
 				// Display payment area
 				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS)) {
@@ -1104,9 +1149,10 @@ class pdf_sponge extends ModelePDFFactures
 	 *   @param		Facture		$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
+	 *   @param  	Translate	$outputlangsbis	Object lang for output bis
 	 *   @return	int							Pos y
 	 */
-	protected function drawInfoTable(&$pdf, $object, $posy, $outputlangs)
+	protected function drawInfoTable(&$pdf, $object, $posy, $outputlangs, $outputlangsbis)
 	{
 		global $conf, $mysoc;
 
@@ -1118,7 +1164,11 @@ class pdf_sponge extends ModelePDFFactures
 		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);
+			if ($mysoc->forme_juridique_code == 92) {
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoiceAsso"), 0, 'L', 0);
+			} else {
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+			}
 
 			$posy = $pdf->GetY() + 4;
 		}
@@ -1138,7 +1188,7 @@ class pdf_sponge extends ModelePDFFactures
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			$pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
 
-			$posy = $pdf->GetY() + 3;
+			$posy = $pdf->GetY() + 3; // We need spaces for 2 lines payment conditions
 		}
 
 		if ($object->type != 2) {
@@ -1163,7 +1213,7 @@ class pdf_sponge extends ModelePDFFactures
 			}
 
 			// Show payment mode
-			if ($object->mode_reglement_code
+			if (!empty($object->mode_reglement_code)
 			&& $object->mode_reglement_code != 'CHQ'
 			&& $object->mode_reglement_code != 'VIR') {
 				$pdf->SetFont('', 'B', $default_font_size - 2);
@@ -1176,9 +1226,25 @@ class pdf_sponge extends ModelePDFFactures
 				$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');
 
-				// Show online payment link
-				$useonlinepayment = ((!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled)) && !empty($conf->global->PDF_SHOW_LINK_TO_ONLINE_PAYMENT));
-				if (($object->mode_reglement_code == 'CB' || $object->mode_reglement_code == 'VAD') && $object->statut != Facture::STATUS_DRAFT && $useonlinepayment) {
+				$posy = $pdf->GetY();
+			}
+
+			// Show online payment link
+			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CB' || $object->mode_reglement_code == 'VAD') {
+				$useonlinepayment = 0;
+				if (!empty($conf->global->PDF_SHOW_LINK_TO_ONLINE_PAYMENT)) {
+					if (!empty($conf->paypal->enabled)) {
+						$useonlinepayment++;
+					}
+					if (!empty($conf->stripe->enabled)) {
+						$useonlinepayment++;
+					}
+					if (!empty($conf->paybox->enabled)) {
+						$useonlinepayment++;
+					}
+				}
+
+				if ($object->statut != Facture::STATUS_DRAFT && $useonlinepayment) {
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 					global $langs;
 
@@ -1187,10 +1253,11 @@ class pdf_sponge extends ModelePDFFactures
 					$paiement_url = getOnlinePaymentUrl('', 'invoice', $object->ref, '', '', '');
 					$linktopay = $langs->trans("ToOfferALinkForOnlinePayment", $servicename).' <a href="'.$paiement_url.'">'.$outputlangs->transnoentities("ClickHere").'</a>';
 
-					$pdf->writeHTMLCell(80, 10, '', '', dol_htmlentitiesbr($linktopay), 0, 1);
+					$pdf->SetXY($this->marge_gauche, $posy);
+					$pdf->writeHTMLCell(80, 5, '', '', dol_htmlentitiesbr($linktopay), 0, 1);
 				}
 
-				$posy = $pdf->GetY() + 2;
+				$posy = $pdf->GetY() + 1;
 			}
 
 			// Show payment mode CHQ
@@ -1263,9 +1330,10 @@ class pdf_sponge extends ModelePDFFactures
 	 *	@param  int			$deja_regle     Amount already paid (in the currency of invoice)
 	 *	@param	int			$posy			Position depart
 	 *	@param	Translate	$outputlangs	Objet langs
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *	@return int							Position pour suite
 	 */
-	protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs, $outputlangsbis)
 	{
 		global $conf, $mysoc, $hookmanager;
 
@@ -1276,14 +1344,6 @@ class pdf_sponge extends ModelePDFFactures
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$outputlangsbis = null;
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
-			$outputlangsbis = new Translate('', $conf);
-			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
-			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
-			$default_font_size--;
-		}
-
 		$tab2_top = $posy;
 		$tab2_hl = 4;
 		$pdf->SetFont('', '', $default_font_size - 1);
@@ -1541,9 +1601,8 @@ class pdf_sponge extends ModelePDFFactures
 				}
 				//}
 
-				// VAT
-				// Situations totals migth be wrong on huge amounts
-				if ($object->situation_cycle_ref && $object->situation_counter > 1) {
+				// Situations totals migth be wrong on huge amounts with old mode 1
+				if (getDolGlobalInt('INVOICE_USE_SITUATION') == 1 && $object->situation_cycle_ref && $object->situation_counter > 1) {
 					$sum_pdf_tva = 0;
 					foreach ($this->tva as $tvakey => $tvaval) {
 						$sum_pdf_tva += $tvaval; // sum VAT amounts to compare to object
@@ -1560,10 +1619,14 @@ class pdf_sponge extends ModelePDFFactures
 						foreach ($this->tva as $tvakey => $tvaval) {
 							$this->tva[$tvakey] = $tvaval * $coef_fix_tva;
 						}
+						foreach ($this->tva_array as $tvakey => $tvaval) {
+							$this->tva_array[$tvakey]['amount'] = $tvaval['amount'] * $coef_fix_tva;
+						}
 					}
 				}
 
-				foreach ($this->tva as $tvakey => $tvaval) {
+				// VAT
+				foreach ($this->tva_array as $tvakey => $tvaval) {
 					if ($tvakey != 0) {    // On affiche pas taux 0
 						$this->atleastoneratenotnull++;
 
@@ -1577,11 +1640,17 @@ class pdf_sponge extends ModelePDFFactures
 						}
 						$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalVAT", $mysoc->country_code) : '');
 						$totalvat .= ' ';
-						$totalvat .= vatrate($tvakey, 1).$tvacompl;
+						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'] ? $tvaval['vatcode'] : vatrate($tvaval['vatrate'], 1)).$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($tvaval, 0, $outputlangs), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', 1);
 					}
 				}
 
@@ -1838,14 +1907,14 @@ class pdf_sponge extends ModelePDFFactures
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
-	 *  Show top header of page.
+	 *  Show top header of page. This include the logo, ref and address blocs
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Facture		$object     	Object to show
-	 *  @param  int	    	$showaddress    0=no, 1=yes
+	 *  @param  int	    	$showaddress    0=no, 1=yes (usually set to 1 for first page, and 0 for next pages)
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @param  Translate	$outputlangsbis	Object lang for output bis
-	 *  @return	void
+	 *  @return	int							top shift of linked object lines
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null)
 	{
@@ -1939,10 +2008,17 @@ class pdf_sponge extends ModelePDFFactures
 				$title .= $outputlangsbis->transnoentities("InvoiceProForma");
 			}
 		}
+		$title .= ' '.$outputlangs->convToOutputCharset($object->ref);
+		if ($object->statut == $object::STATUS_DRAFT) {
+			$pdf->SetTextColor(128, 0, 0);
+			$title .= ' - '.$outputlangs->transnoentities("NotValidated");
+		}
+
 		$pdf->MultiCell($w, 3, $title, '', 'R');
 
 		$pdf->SetFont('', 'B', $default_font_size);
 
+		/*
 		$posy += 5;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
@@ -1951,9 +2027,9 @@ class pdf_sponge extends ModelePDFFactures
 			$pdf->SetTextColor(128, 0, 0);
 			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
 		}
-		$pdf->MultiCell($w, 4, $textref, '', 'R');
+		$pdf->MultiCell($w, 4, $textref, '', 'R');*/
 
-		$posy += 1;
+		$posy += 3;
 		$pdf->SetFont('', '', $default_font_size - 2);
 
 		if ($object->ref_client) {
@@ -2041,7 +2117,7 @@ class pdf_sponge extends ModelePDFFactures
 			$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date_lim_reglement, "day", false, $outputlangs, true), '', 'R');
 		}
 
-		if ($object->thirdparty->code_client) {
+		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && $object->thirdparty->code_client) {
 			$posy += 3;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -2088,20 +2164,24 @@ class pdf_sponge extends ModelePDFFactures
 
 
 			// Show sender frame
-			$pdf->SetTextColor(0, 0, 0);
-			$pdf->SetFont('', '', $default_font_size - 2);
-			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
-			$pdf->SetXY($posx, $posy);
-			$pdf->SetFillColor(230, 230, 230);
-			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0, 0, 60);
+			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+				$pdf->SetTextColor(0, 0, 0);
+				$pdf->SetFont('', '', $default_font_size - 2);
+				$pdf->SetXY($posx, $posy - 5);
+				$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
+				$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, $ltrdirection);
-			$posy = $pdf->getY();
+			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+				$pdf->SetXY($posx + 2, $posy + 3);
+				$pdf->SetFont('', 'B', $default_font_size);
+				$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
+				$posy = $pdf->getY();
+			}
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
@@ -2125,7 +2205,7 @@ class pdf_sponge extends ModelePDFFactures
 
 			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$mode =  'target';
+			$mode = 'target';
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object);
 
 			// Show recipient
@@ -2141,11 +2221,13 @@ class pdf_sponge extends ModelePDFFactures
 			}
 
 			// Show recipient frame
-			$pdf->SetTextColor(0, 0, 0);
-			$pdf->SetFont('', '', $default_font_size - 2);
-			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->MultiCell($widthrecbox - 2, 5, $outputlangs->transnoentities("BillTo"), 0, $ltrdirection);
-			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_FRAME)) {
+				$pdf->SetTextColor(0, 0, 0);
+				$pdf->SetFont('', '', $default_font_size - 2);
+				$pdf->SetXY($posx + 2, $posy - 5);
+				$pdf->MultiCell($widthrecbox - 2, 5, $outputlangs->transnoentities("BillTo"), 0, $ltrdirection);
+				$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+			}
 
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 32e06f285a9..621bb8e6d2d 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -75,25 +75,25 @@ class mod_facture_mercure extends ModeleNumRefFactures
 		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Setting the prefix
-		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").'):</td>';
+		$texte .= '<tr><td><span class="opacitymedium">'.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").'):</span></td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskinvoice" value="'.$conf->global->FACTURE_MERCURE_MASK_INVOICE.'">', $tooltip, 1, 1).'</td>';
 
-		$texte .= '<td class="left" rowspan="3">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td class="left" rowspan="3">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
 		// Prefix setting of replacement invoices
-		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
+		$texte .= '<tr><td><span class="opacitymedium">'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</span></td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskreplacement" value="'.$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT.'">', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
 		// Prefix setting of credit note
-		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
+		$texte .= '<tr><td><span class="opacitymedium">'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</span></td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskcredit" value="'.$conf->global->FACTURE_MERCURE_MASK_CREDIT.'">', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
 		// Prefix setting of deposit
-		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
+		$texte .= '<tr><td><span class="opacitymedium">'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</span></td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskdeposit" value="'.$conf->global->FACTURE_MERCURE_MASK_DEPOSIT.'">', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index f3e38cf7db7..55f6dd816d1 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -177,12 +177,15 @@ class mod_facture_terre extends ModeleNumRefFactures
 	}
 
 	/**
-	 * Return next value not used or last value used
+	 * Return next value not used or last value used.
+	 * Note to increase perf of this numbering engine, you can create a calculated column and modify request to use this field instead for select:
+	 * ALTER TABLE llx_facture ADD COLUMN calculated_numrefonly INTEGER AS (CASE SUBSTRING(ref FROM 1 FOR 2) WHEN 'FA' THEN CAST(SUBSTRING(ref FROM 10) AS SIGNED) ELSE 0 END) PERSISTENT;
+	 * ALTER TABLE llx_facture ADD INDEX calculated_numrefonly_idx (calculated_numrefonly);
 	 *
 	 * @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       			Next ref value or last ref if $mode is 'last'
 	 */
 	public function getNextValue($objsoc, $invoice, $mode = 'next')
 	{
diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
index b5f8b62d419..e188f66b1ad 100644
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -42,10 +42,14 @@ abstract class ModelePDFFactures extends CommonDocGenerator
 	 */
 	public $error = '';
 
+	public $tva;
+	public $tva_array;
+	public $localtax1;
+	public $localtax2;
+
 	public $atleastonediscount = 0;
 	public $atleastoneratenotnull = 0;
 
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation modules
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index e69da5fa557..719fb670672 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -271,8 +271,8 @@ class pdf_soleil extends ModelePDFFicheinter
 
 				$tab_top = 90;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
-				$tab_height = 130;
-				$tab_height_newpage = 150;
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
 				// Display notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
@@ -613,7 +613,7 @@ 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 ($object->thirdparty->code_client) {
+		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && $object->thirdparty->code_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -641,19 +641,23 @@ class pdf_soleil extends ModelePDFFicheinter
 			$hautcadre = 40;
 
 			// Show sender frame
-			$pdf->SetTextColor(0, 0, 0);
-			$pdf->SetFont('', '', $default_font_size - 2);
-			$pdf->SetXY($posx, $posy - 5);
-			$pdf->SetXY($posx, $posy);
-			$pdf->SetFillColor(230, 230, 230);
-			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+				$pdf->SetTextColor(0, 0, 0);
+				$pdf->SetFont('', '', $default_font_size - 2);
+				$pdf->SetXY($posx, $posy - 5);
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetFillColor(230, 230, 230);
+				$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+			}
 
 			// Show sender name
-			$pdf->SetXY($posx + 2, $posy + 3);
-			$pdf->SetTextColor(0, 0, 60);
-			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-			$posy = $pdf->getY();
+			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+				$pdf->SetXY($posx + 2, $posy + 3);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->SetFont('', 'B', $default_font_size);
+				$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+				$posy = $pdf->getY();
+			}
 
 			// Show sender information
 			$pdf->SetFont('', '', $default_font_size - 1);
@@ -692,11 +696,13 @@ class pdf_soleil extends ModelePDFFicheinter
 			}
 
 			// Show recipient frame
-			$pdf->SetTextColor(0, 0, 0);
-			$pdf->SetFont('', '', $default_font_size - 2);
-			$pdf->SetXY($posx + 2, $posy - 5);
-			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
-			$pdf->SetTextColor(0, 0, 0);
+			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_FRAME)) {
+				$pdf->SetTextColor(0, 0, 0);
+				$pdf->SetFont('', '', $default_font_size - 2);
+				$pdf->SetXY($posx + 2, $posy - 5);
+				$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+				$pdf->SetTextColor(0, 0, 0);
+			}
 
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php
index 91025817a9d..cb5acddd6e9 100644
--- a/htdocs/core/modules/fichinter/mod_arctic.php
+++ b/htdocs/core/modules/fichinter/mod_arctic.php
@@ -86,7 +86,7 @@ class mod_arctic extends ModeleNumRefFicheinter
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.$conf->global->FICHINTER_ARTIC_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 button-edit" name="Button" value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/holiday/mod_holiday_immaculate.php b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
index 000c7881561..84d6638a27e 100644
--- a/htdocs/core/modules/holiday/mod_holiday_immaculate.php
+++ b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
@@ -86,7 +86,7 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 
 		$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="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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 		$texte .= '</tr>';
 		$texte .= '</table>';
 		$texte .= '</form>';
diff --git a/htdocs/core/modules/hrm/mod_evaluation_advanced.php b/htdocs/core/modules/hrm/mod_evaluation_advanced.php
new file mode 100644
index 00000000000..0468c9ebb30
--- /dev/null
+++ b/htdocs/core/modules/hrm/mod_evaluation_advanced.php
@@ -0,0 +1,148 @@
+<?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/hrm/mod_evaluation_advanced.php
+ * \ingroup    hrm
+ * \brief      File containing class for advanced numbering model of Evaluation
+ */
+
+dol_include_once('/core/modules/hrm/modules_evaluation.php');
+
+
+/**
+ *	Class to manage customer Bom numbering rules advanced
+ */
+class mod_evaluation_advanced extends ModeleNumRefEvaluation
+{
+	/**
+	 * 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="HRM_EVALUATION_ADVANCED_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Evaluation"), $langs->transnoentities("Evaluation"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Evaluation"), $langs->transnoentities("Evaluation"));
+		$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="maskEvaluation" value="'.$conf->global->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 .= '</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 Evaluation($db);
+		$object->initAsSpecimen();
+
+		/*$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';*/
+
+		$numExample = $this->getNextValue($object);
+
+		/*$mysoc->code_client = $old_code_client;
+		$mysoc->typent_code = $old_code_type;*/
+
+		if (!$numExample) {
+			$numExample = $langs->trans('NotConfigured');
+		}
+		return $numExample;
+	}
+
+	/**
+	 * 	Return next free value
+	 *
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return string      			Value if KO, <0 if KO
+	 */
+	public function getNextValue($object)
+	{
+		global $db, $conf;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+		// We get cursor rule
+		$mask = $conf->global->HRM_EVALUATION_ADVANCED_MASK;
+
+		if (!$mask) {
+			$this->error = 'NotConfigured';
+			return 0;
+		}
+
+		$date = $object->date;
+
+		$numFinal = get_next_value($db, $mask, 'hrm_evaluation', 'ref', '', null, $date);
+
+		return  $numFinal;
+	}
+}
diff --git a/htdocs/core/modules/hrm/mod_evaluation_standard.php b/htdocs/core/modules/hrm/mod_evaluation_standard.php
new file mode 100644
index 00000000000..4c5bb083870
--- /dev/null
+++ b/htdocs/core/modules/hrm/mod_evaluation_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/hrm/mod_evaluation_standard.php
+ *  \ingroup    hrm
+ *  \brief      File of class to manage Evaluation numbering rules standard
+ */
+dol_include_once('/core/modules/hrm/modules_evaluation.php');
+
+
+/**
+ *	Class to manage customer order numbering rules standard
+ */
+class mod_evaluation_standard extends ModeleNumRefEvaluation
+{
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+
+	public $prefix = 'EVAL';
+
+	/**
+	 * @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."hrm_evaluation";
+		$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."hrm_evaluation";
+		$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_evaluation_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_evaluation_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
+		return $this->prefix.$yymm."-".$num;
+	}
+}
diff --git a/htdocs/core/modules/hrm/modules_evaluation.php b/htdocs/core/modules/hrm/modules_evaluation.php
new file mode 100644
index 00000000000..36fc7e26d81
--- /dev/null
+++ b/htdocs/core/modules/hrm/modules_evaluation.php
@@ -0,0 +1,158 @@
+<?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/hrm/modules_evaluation.php
+ *  \ingroup		hrm
+ *  \brief			File that contains parent class for evaluations document models and parent class for evaluations 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 ModelePDFEvaluation 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 = 'evaluation';
+		$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 Evaluation
+ */
+abstract class ModeleNumRefEvaluation
+{
+	/**
+	 * @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("hrm");
+		return $langs->trans("NoDescription");
+	}
+
+	/**
+	 *	Returns an example of numbering
+	 *
+	 *	@return     string      Example
+	 */
+	public function getExample()
+	{
+		global $langs;
+		$langs->load("hrm");
+		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/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 35f0e4bc2f9..9eeb76cc3cf 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -724,7 +724,7 @@ class ImportCsv extends ModeleImports
 						}
 						if ($val == 'user->id') {
 							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
-							$listvalues[] = $user->id;
+							$listvalues[] = ((int) $user->id);
 						} elseif (preg_match('/^lastrowid-/', $val)) {
 							$tmp = explode('-', $val);
 							$lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
@@ -735,7 +735,7 @@ class ImportCsv extends ModeleImports
 						} elseif (preg_match('/^const-/', $val)) {
 							$tmp = explode('-', $val, 2);
 							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
-							$listvalues[] = "'".$tmp[1]."'";
+							$listvalues[] = "'".$this->db->escape($tmp[1])."'";
 						} else {
 							$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
 							$this->errors[$error]['type'] = 'Import profile setup';
@@ -757,7 +757,7 @@ class ImportCsv extends ModeleImports
 							// 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 rowid FROM ".$tablename;
 
 								$data = array_combine($listfields, $listvalues);
 								$where = array();
@@ -768,7 +768,7 @@ class ImportCsv extends ModeleImports
 									$where[] = $key.' = '.$data[$key];
 									$filters[] = $col.' = '.$data[$key];
 								}
-								$sqlSelect .= ' WHERE '.implode(' AND ', $where);
+								$sqlSelect .= " WHERE ".implode(' AND ', $where);
 
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
@@ -795,12 +795,12 @@ class ImportCsv extends ModeleImports
 								// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
 								// may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
 								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
-								$sqlSelect = 'SELECT rowid FROM '.$tablename;
+								$sqlSelect = "SELECT rowid FROM ".$tablename;
 
 								if (empty($keyfield)) {
 									$keyfield = 'rowid';
 								}
-								$sqlSelect .= ' WHERE '.$keyfield.' = '.((int) $lastinsertid);
+								$sqlSelect .= " WHERE ".$keyfield.' = '.((int) $lastinsertid);
 
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
@@ -822,19 +822,19 @@ class ImportCsv extends ModeleImports
 
 							if (!empty($lastinsertid)) {
 								// Build SQL UPDATE request
-								$sqlstart = 'UPDATE '.$tablename;
+								$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);
+								$sqlstart .= " SET ".implode(', ', $set);
 
 								if (empty($keyfield)) {
 									$keyfield = 'rowid';
 								}
-								$sqlend = ' WHERE '.$keyfield.' = '.((int) $lastinsertid);
+								$sqlend = " WHERE ".$keyfield." = ".((int) $lastinsertid);
 
 								$sql = $sqlstart.$sqlend;
 
@@ -855,17 +855,17 @@ class ImportCsv extends ModeleImports
 						// Update not done, we do insert
 						if (!$error && !$updatedone) {
 							// Build SQL INSERT request
-							$sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
-							$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$this->db->escape($importid)."'";
+							$sqlstart = "INSERT INTO ".$tablename."(".implode(", ", $listfields).", import_key";
+							$sqlend = ") VALUES(".implode(', ', $listvalues).", '".$this->db->escape($importid)."'";
 							if (!empty($tablewithentity_cache[$tablename])) {
-								$sqlstart .= ', entity';
-								$sqlend .= ', '.$conf->entity;
+								$sqlstart .= ", entity";
+								$sqlend .= ", ".$conf->entity;
 							}
 							if (!empty($objimport->array_import_tables_creator[0][$alias])) {
-								$sqlstart .= ', '.$objimport->array_import_tables_creator[0][$alias];
-								$sqlend .= ', '.$user->id;
+								$sqlstart .= ", ".$objimport->array_import_tables_creator[0][$alias];
+								$sqlend .= ", ".$user->id;
 							}
-							$sql = $sqlstart.$sqlend.')';
+							$sql = $sqlstart.$sqlend.")";
 							//dol_syslog("import_csv.modules", LOG_DEBUG);
 
 							// Run insert request
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index ed14ae31ebb..0171eb83ea9 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -765,7 +765,7 @@ class ImportXlsx extends ModeleImports
 						}
 						if ($val == 'user->id') {
 							$listfields[] = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
-							$listvalues[] = $user->id;
+							$listvalues[] = ((int) $user->id);
 						} elseif (preg_match('/^lastrowid-/', $val)) {
 							$tmp = explode('-', $val);
 							$lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
@@ -776,7 +776,7 @@ class ImportXlsx extends ModeleImports
 						} elseif (preg_match('/^const-/', $val)) {
 							$tmp = explode('-', $val, 2);
 							$listfields[] = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
-							$listvalues[] = "'" . $tmp[1] . "'";
+							$listvalues[] = "'" . $this->db->escape($tmp[1]) . "'";
 						} else {
 							$this->errors[$error]['lib'] = 'Bad value of profile setup ' . $val . ' for array_import_fieldshidden';
 							$this->errors[$error]['type'] = 'Import profile setup';
@@ -797,7 +797,7 @@ class ImportXlsx extends ModeleImports
 							// 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 rowid FROM " . $tablename;
 
 								$data = array_combine($listfields, $listvalues);
 								$where = array();
@@ -808,7 +808,7 @@ class ImportXlsx extends ModeleImports
 									$where[] = $key . ' = ' . $data[$key];
 									$filters[] = $col . ' = ' . $data[$key];
 								}
-								$sqlSelect .= ' WHERE ' . implode(' AND ', $where);
+								$sqlSelect .= " WHERE " . implode(' AND ', $where);
 
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
@@ -835,12 +835,12 @@ class ImportXlsx extends ModeleImports
 								// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
 								// may already exists. So we rescan the extrafield table to know if record exists or not for the rowid.
 								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
-								$sqlSelect = 'SELECT rowid FROM ' . $tablename;
+								$sqlSelect = "SELECT rowid FROM " . $tablename;
 
 								if (empty($keyfield)) {
 									$keyfield = 'rowid';
 								}
-								$sqlSelect .= ' WHERE ' . $keyfield . ' = ' .((int) $lastinsertid);
+								$sqlSelect .= "WHERE " . $keyfield . " = " .((int) $lastinsertid);
 
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
@@ -862,19 +862,19 @@ class ImportXlsx extends ModeleImports
 
 							if (!empty($lastinsertid)) {
 								// Build SQL UPDATE request
-								$sqlstart = 'UPDATE ' . $tablename;
+								$sqlstart = "UPDATE " . $tablename;
 
 								$data = array_combine($listfields, $listvalues);
 								$set = array();
 								foreach ($data as $key => $val) {
 									$set[] = $key . ' = ' . $val;
 								}
-								$sqlstart .= ' SET ' . implode(', ', $set);
+								$sqlstart .= " SET " . implode(', ', $set);
 
 								if (empty($keyfield)) {
 									$keyfield = 'rowid';
 								}
-								$sqlend = ' WHERE ' . $keyfield . ' = '.((int) $lastinsertid);
+								$sqlend = " WHERE " . $keyfield . " = ".((int) $lastinsertid);
 
 								$sql = $sqlstart . $sqlend;
 
@@ -895,17 +895,17 @@ class ImportXlsx extends ModeleImports
 						// Update not done, we do insert
 						if (!$error && !$updatedone) {
 							// Build SQL INSERT request
-							$sqlstart = 'INSERT INTO ' . $tablename . '(' . implode(', ', $listfields) . ', import_key';
-							$sqlend = ') VALUES(' . implode(', ', $listvalues) . ", '" . $this->db->escape($importid) . "'";
+							$sqlstart = "INSERT INTO " . $tablename . "(" . implode(", ", $listfields) . ", import_key";
+							$sqlend = ") VALUES(" . implode(', ', $listvalues) . ", '" . $this->db->escape($importid) . "'";
 							if (!empty($tablewithentity_cache[$tablename])) {
-								$sqlstart .= ', entity';
-								$sqlend .= ', ' . $conf->entity;
+								$sqlstart .= ", entity";
+								$sqlend .= ", " . $conf->entity;
 							}
 							if (!empty($objimport->array_import_tables_creator[0][$alias])) {
-								$sqlstart .= ', ' . $objimport->array_import_tables_creator[0][$alias];
-								$sqlend .= ', ' . $user->id;
+								$sqlstart .= ", " . $objimport->array_import_tables_creator[0][$alias];
+								$sqlend .= ", " . $user->id;
 							}
-							$sql = $sqlstart . $sqlend . ')';
+							$sql = $sqlstart . $sqlend . ")";
 							//dol_syslog("import_xlsx.modules", LOG_DEBUG);
 
 							// Run insert request
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index ef43f05b86a..4b928d8af07 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -138,9 +138,8 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " ORDER BY sp.poste";
 		$resql = $this->db->query($sql);
 
-		$s .= $langs->trans("PostOrFunction").' ';
-		$s .= '<select name="filter_jobposition" class="flat marginrightonly" placeholder="'.dol_escape_htmltag($langs->trans("PostOrFunction")).'">';
-		$s .= '<option value="all">&nbsp;</option>';
+		$s .= '<select id="filter_jobposition_contact" name="filter_jobposition" class="flat" placeholder="'.dol_escape_htmltag($langs->trans("PostOrFunction")).'">';
+		$s .= '<option value="-1">'.$langs->trans("PostOrFunction").'</option>';
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -157,11 +156,10 @@ class mailing_contacts1 extends MailingTargets
 			dol_print_error($this->db);
 		}
 		$s .= '</select>';
-
+		$s .= ajax_combobox("filter_jobposition_contact");
 		$s .= ' ';
 
 		// Filter on contact category
-		$s .= $langs->trans("ContactCategoriesShort").' ';
 		$sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
 		$sql .= " FROM ";
 		$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
@@ -176,8 +174,8 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " ORDER BY c.label";
 		$resql = $this->db->query($sql);
 
-		$s .= '<select name="filter_category" class="flat marginrightonly">';
-		$s .= '<option value="all">&nbsp;</option>';
+		$s .= '<select id="filter_category_contact" name="filter_category" class="flat">';
+		$s .= '<option value="-1">'.$langs->trans("ContactCategoriesShort").'</option>';
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			if ($num) {
@@ -194,12 +192,11 @@ class mailing_contacts1 extends MailingTargets
 			dol_print_error($this->db);
 		}
 		$s .= '</select>';
-
+		$s .= ajax_combobox("filter_category_contact");
 		$s .= '<br>';
 
 		// Add prospect of a particular level
-		$s .= $langs->trans("NatureOfThirdParty").' ';
-		$s .= '<select name="filter" class="flat marginrightonly">';
+		$s .= '<select id="filter_contact" name="filter" class="flat">';
 		$sql = "SELECT code, label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
 		$sql .= " WHERE active > 0";
@@ -208,9 +205,9 @@ class mailing_contacts1 extends MailingTargets
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			if ($num) {
-				$s .= '<option value="all">&nbsp;</option>';
+				$s .= '<option value="-1">'.$langs->trans("NatureOfThirdParty").'</option>';
 			} else {
-				$s .= '<option value="all">'.$langs->trans("ContactsAllShort").'</option>';
+				$s .= '<option value="-1">'.$langs->trans("ContactsAllShort").'</option>';
 			}
 			$s .= '<option value="prospects">'.$langs->trans("ThirdPartyProspects").'</option>';
 
@@ -231,11 +228,11 @@ class mailing_contacts1 extends MailingTargets
 		//$s.='<option value="customersidprof">'.$langs->trans("ThirdPartyCustomersWithIdProf12",$langs->trans("ProfId1"),$langs->trans("ProfId2")).'</option>';
 		$s .= '<option value="suppliers">'.$langs->trans("ThirdPartySuppliers").'</option>';
 		$s .= '</select>';
+		$s .= ajax_combobox("filter_contact");
 
 		$s .= ' ';
 
 		// Filter on thirdparty category
-		$s .= $langs->trans("CustomersProspectsCategoriesShort").' ';
 		$sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
 		$sql .= " FROM ";
 		$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
@@ -250,8 +247,8 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " ORDER BY c.label";
 		$resql = $this->db->query($sql);
 
-		$s .= '<select name="filter_category_customer" class="flat marginrightonly maxwidth200">';
-		$s .= '<option value="all">&nbsp;</option>';
+		$s .= '<select id="filter_category_customer_contact" name="filter_category_customer" class="flat maxwidth200">';
+		$s .= '<option value="-1">'.$langs->trans("CustomersProspectsCategoriesShort").'</option>';
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			if ($num) {
@@ -268,11 +265,11 @@ class mailing_contacts1 extends MailingTargets
 			dol_print_error($this->db);
 		}
 		$s .= '</select>';
+		$s .= ajax_combobox("filter_category_customer_contact");
 
 		$s .= ' ';
 
 		// Filter on thirdparty category
-		$s .= $langs->trans("SuppliersCategoriesShort").' ';
 		$sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
 		$sql .= " FROM ";
 		$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
@@ -287,8 +284,8 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " ORDER BY c.label";
 		$resql = $this->db->query($sql);
 
-		$s .= '<select name="filter_category_supplier" class="flat marginrightonly maxwidth200">';
-		$s .= '<option value="all">&nbsp;</option>';
+		$s .= '<select id="filter_category_supplier_contact" name="filter_category_supplier" class="flat maxwidth200">';
+		$s .= '<option value="-1">'.$langs->trans("SuppliersCategoriesShort").'</option>';
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			if ($num) {
@@ -305,7 +302,7 @@ class mailing_contacts1 extends MailingTargets
 			dol_print_error($this->db);
 		}
 		$s .= '</select>';
-
+		$s .= ajax_combobox("filter_category_supplier_contact");
 		return $s;
 	}
 
@@ -366,22 +363,16 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " s.nom as companyname";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
-		if ($filter_category <> 'all') {
+		if ($filter_category != 'all' && $filter_category != '-1') {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie as c";
-		}
-		if ($filter_category <> 'all') {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_contact as cs";
 		}
-		if ($filter_category_customer <> 'all') {
+		if ($filter_category_customer != 'all' && $filter_category_customer != '-1') {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie as c2";
-		}
-		if ($filter_category_customer <> 'all') {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c2s";
 		}
-		if ($filter_category_supplier <> 'all') {
+		if ($filter_category_supplier != 'all' && $filter_category_supplier != '-1') {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie as c3";
-		}
-		if ($filter_category_supplier <> 'all') {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_fournisseur as c3s";
 		}
 		$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
@@ -391,34 +382,28 @@ class mailing_contacts1 extends MailingTargets
 		$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') {
+		if ($filter_category != 'all' && $filter_category != '-1') {
 			$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_socpeople = sp.rowid";
-		}
-		if ($filter_category <> 'all') {
 			$sql .= " AND c.label = '".$this->db->escape($filter_category)."'";
 		}
-		if ($filter_category_customer <> 'all') {
+		if ($filter_category_customer != 'all' && $filter_category_customer != '-1') {
 			$sql .= " AND c2s.fk_categorie = c2.rowid AND c2s.fk_soc = sp.fk_soc";
-		}
-		if ($filter_category_customer <> 'all') {
 			$sql .= " AND c2.label = '".$this->db->escape($filter_category_customer)."'";
 		}
-		if ($filter_category_supplier <> 'all') {
+		if ($filter_category_supplier != 'all' && $filter_category_supplier != '-1') {
 			$sql .= " AND c3s.fk_categorie = c3.rowid AND c3s.fk_soc = sp.fk_soc";
-		}
-		if ($filter_category_supplier <> 'all') {
 			$sql .= " AND c3.label = '".$this->db->escape($filter_category_supplier)."'";
 		}
 		// Filter on nature
 		$key = $filter;
-		{
-			//print "xx".$key;
+
+		//print "xx".$key;
 		if ($key == 'prospects') {
 			$sql .= " AND s.client=2";
 		}
 		foreach ($prospectlevel as $codelevel => $valuelevel) {
 			if ($key == 'prospectslevel'.$codelevel) {
-				$sql .= " AND s.fk_prospectlevel='".$this->db->escape($codelevel)."'";
+				$sql .= " AND s.fk_prospectlevel = '".$this->db->escape($codelevel)."'";
 			}
 		}
 		if ($key == 'customers') {
@@ -427,17 +412,18 @@ class mailing_contacts1 extends MailingTargets
 		if ($key == 'suppliers') {
 			$sql .= " AND s.fournisseur=1";
 		}
-			}
+
 		// Filter on job position
-			$key = $filter_jobposition;
-		if (!empty($key) && $key != 'all') {
-			$sql .= " AND sp.poste ='".$this->db->escape($key)."'";
+		$key = $filter_jobposition;
+		if (!empty($key) && $key != 'all'  && $key != '-1') {
+			$sql .= " AND sp.poste = '".$this->db->escape($key)."'";
 		}
-			$sql .= " ORDER BY sp.email";
+
+		$sql .= " ORDER BY sp.email";
 		//print "wwwwwwx".$sql;
 
 		// Stocke destinataires dans cibles
-			$result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 09445264dc7..aa7c218417b 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -123,16 +123,16 @@ class mailing_fraise extends MailingTargets
 		$s = '';
 
 		// Status
-		$s .= $langs->trans("Status").': ';
-		$s .= '<select name="filter" class="flat">';
-		$s .= '<option value="none">&nbsp;</option>';
-		$s .= '<option value="-1">'.$langs->trans("MemberStatusDraft").'</option>';
+		$s .= '<select id="filter_fraise" name="filter" class="flat">';
+		$s .= '<option value="-1">'.$langs->trans("Status").'</option>';
+		$s .= '<option value="draft">'.$langs->trans("MemberStatusDraft").'</option>';
 		$s .= '<option value="1a">'.$langs->trans("MemberStatusActiveShort").' ('.$langs->trans("MemberStatusPaidShort").')</option>';
 		$s .= '<option value="1b">'.$langs->trans("MemberStatusActiveShort").' ('.$langs->trans("MemberStatusActiveLateShort").')</option>';
 		$s .= '<option value="0">'.$langs->trans("MemberStatusResiliatedShort").'</option>';
 		$s .= '</select> ';
-		$s .= $langs->trans("Type").': ';
-		$s .= '<select name="filter_type" class="flat">';
+		$s .= ajax_combobox("filter_fraise");
+
+		$s .= '<select id="filter_type_fraise" name="filter_type" class="flat">';
 		$sql = "SELECT rowid, libelle as label, statut";
 		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type";
 		$sql .= " WHERE entity IN (".getEntity('member_type').")";
@@ -141,7 +141,7 @@ class mailing_fraise extends MailingTargets
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
-			$s .= '<option value="0">&nbsp;</option>';
+			$s .= '<option value="-1">'.$langs->trans("Type").'</option>';
 			if (!$num) {
 				$s .= '<option value="0" disabled="disabled">'.$langs->trans("NoCategoriesDefined").'</option>';
 			}
@@ -154,16 +154,17 @@ class mailing_fraise extends MailingTargets
 				$s .= '</option>';
 				$i++;
 			}
+			$s .= ajax_combobox("filter_type");
 		} else {
 			dol_print_error($this->db);
 		}
 
 		$s .= '</select>';
+		$s .= ajax_combobox("filter_type_fraise");
 
 		$s .= ' ';
 
-		$s .= $langs->trans("Category").': ';
-		$s .= '<select name="filter_category" class="flat">';
+		$s .= '<select id="filter_category_fraise" name="filter_category" class="flat">';
 
 		// Show categories
 		$sql = "SELECT rowid, label, type, visible";
@@ -178,7 +179,7 @@ class mailing_fraise extends MailingTargets
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
-			$s .= '<option value="0">&nbsp;</option>';
+			$s .= '<option value="-1">'.$langs->trans("Category").'</option>';
 			if (!$num) {
 				$s .= '<option value="0" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
 			}
@@ -191,6 +192,7 @@ class mailing_fraise extends MailingTargets
 				$s .= '</option>';
 				$i++;
 			}
+			$s .= ajax_combobox("filter_category_fraise");
 		} else {
 			dol_print_error($this->db);
 		}
@@ -246,7 +248,7 @@ class mailing_fraise extends MailingTargets
 		$sql .= " a.lastname, a.firstname,";
 		$sql .= " a.datefin, a.civility as civility_id, a.login, a.societe"; // Other fields
 		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
-		if (GETPOST('filter_category')) {
+		if (GETPOST('filter_category', 'int') > 0) {
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = a.rowid";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie AND c.rowid = ".((int) GETPOST('filter_category', 'int'));
 		}
@@ -254,16 +256,13 @@ class mailing_fraise extends MailingTargets
 		$sql .= " WHERE a.entity IN (".getEntity('member').") AND a.email <> ''"; // Note that null != '' is false
 		$sql .= " AND a.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 		// Filter on status
-		if (GETPOST("filter") == '-1') {
-			$sql .= " AND a.statut=-1";
-		}
-		if (GETPOST("filter", 'aZ09') == '1a') {
+		if (GETPOST("filter", 'aZ09') == 'draft') {
+			$sql .= " AND a.statut = -1";
+		} elseif (GETPOST("filter", 'aZ09') == '1a') {
 			$sql .= " AND a.statut=1 AND (a.datefin >= '".$this->db->idate($now)."' OR ta.subscription = 0)";
-		}
-		if (GETPOST("filter", 'aZ09') == '1b') {
+		} elseif (GETPOST("filter", 'aZ09') == '1b') {
 			$sql .= " AND a.statut=1 AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND ta.subscription = 1)";
-		}
-		if (GETPOST("filter", 'aZ09') === '0') {
+		} elseif (GETPOST("filter", 'aZ09') === '0') {
 			$sql .= " AND a.statut=0";
 		}
 		// Filter on date
@@ -276,7 +275,7 @@ class mailing_fraise extends MailingTargets
 		$sql .= " AND a.fk_adherent_type = ta.rowid";
 		// Filter on type
 		if (GETPOST('filter_type', 'int') > 0) {
-			$sql .= " AND ta.rowid='".$this->db->escape(GETPOST('filter_type', 'int'))."'";
+			$sql .= " AND ta.rowid = ".((int) GETPOST('filter_type', 'int'));
 		}
 		$sql .= " ORDER BY a.email";
 		//print $sql;
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index 245ee88b847..9df8d44daf1 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -184,7 +184,7 @@ class MailingTargets // This can't be abstract as it is used for some method
 				$sql .= "'".$this->db->escape($targetarray['other'])."',";
 				$sql .= "'".$this->db->escape($targetarray['source_url'])."',";
 				$sql .= (empty($targetarray['source_id']) ? 'null' : "'".$this->db->escape($targetarray['source_id'])."'").",";
-				$sql .= "'".$this->db->escape(dol_hash($dolibarr_main_instance_unique_id.';'.$targetarray['email'].';'.$targetarray['lastname'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY, 'md5'))."',";
+				$sql .= "'".$this->db->escape(dol_hash($dolibarr_main_instance_unique_id.";".$targetarray['email'].";".$targetarray['lastname'].";".$mailing_id.";".$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY, 'md5'))."',";
 				$sql .= "'".$this->db->escape($targetarray['source_type'])."')";
 				dol_syslog(__METHOD__, LOG_DEBUG);
 				$result = $this->db->query($sql);
@@ -208,7 +208,7 @@ class MailingTargets // This can't be abstract as it is used for some method
 		//Update the status to show thirdparty mail that don't want to be contacted anymore'
 		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
 		$sql .= " SET statut=3";
-		$sql .= " WHERE fk_mailing=".((int) $mailing_id)." AND email in (SELECT email FROM ".MAIN_DB_PREFIX."societe where fk_stcomm=-1)";
+		$sql .= " WHERE fk_mailing = ".((int) $mailing_id)." AND email in (SELECT email FROM ".MAIN_DB_PREFIX."societe where fk_stcomm=-1)";
 		$sql .= " AND source_type='thirdparty'";
 		dol_syslog(__METHOD__.": mailing update status to display thirdparty mail that do not want to be contacted");
 		$result=$this->db->query($sql);
@@ -216,7 +216,7 @@ class MailingTargets // This can't be abstract as it is used for some method
 		//Update the status to show contact mail that don't want to be contacted anymore'
 		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
 		$sql .= " SET statut=3";
-		$sql .= " WHERE fk_mailing=".((int) $mailing_id)." AND source_type='contact' AND (email in (SELECT sc.email FROM ".MAIN_DB_PREFIX."socpeople AS sc ";
+		$sql .= " WHERE fk_mailing = ".((int) $mailing_id)." AND source_type='contact' AND (email in (SELECT sc.email FROM ".MAIN_DB_PREFIX."socpeople AS sc ";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe s ON s.rowid=sc.fk_soc WHERE s.fk_stcomm=-1 OR no_email=1))";
 		dol_syslog(__METHOD__.": mailing update status to display contact mail that do not want to be contacted",LOG_DEBUG);
 		$result=$this->db->query($sql);
@@ -224,7 +224,7 @@ class MailingTargets // This can't be abstract as it is used for some method
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
 		$sql .= " SET statut=3";
-		$sql .= " WHERE fk_mailing=".((int) $mailing_id)." AND email IN (SELECT mu.email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe AS mu WHERE mu.entity IN ('".getEntity('mailing')."'))";
+		$sql .= " WHERE fk_mailing = ".((int) $mailing_id)." AND email IN (SELECT mu.email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe AS mu WHERE mu.entity IN ('".getEntity('mailing')."'))";
 
 		dol_syslog(__METHOD__.":mailing update status to display emails that do not want to be contacted anymore", LOG_DEBUG);
 		$result = $this->db->query($sql);
diff --git a/htdocs/core/modules/mailings/partnership.modules.php b/htdocs/core/modules/mailings/partnership.modules.php
new file mode 100644
index 00000000000..b41a5e04c85
--- /dev/null
+++ b/htdocs/core/modules/mailings/partnership.modules.php
@@ -0,0 +1,264 @@
+<?php
+/* Copyright (C) 2018-2018 Andre Schild        <a.schild@aarboard.ch>
+ * Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin       <regis.houssin@inodbox.com>
+ *
+ * This file is an example to follow to add your own email selector inside
+ * the Dolibarr email tool.
+ * Follow instructions given in README file to know what to change to build
+ * your own emailing list selector.
+ * Code that need to be changed in this file are marked by "CHANGE THIS" tag.
+ */
+
+/**
+ *	\file       htdocs/core/modules/mailings/partnership.modules.php
+ *	\ingroup    mailing
+ *	\brief      Example file to provide a list of recipients for mailing module
+ */
+
+include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php';
+
+
+/**
+ *	Class to manage a list of personalised recipients for mailing feature
+ */
+class mailing_partnership extends MailingTargets
+{
+	public $name = 'PartnershipThirdartiesOrMembers';
+	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
+	public $desc = "Thirdparties or members included into a partnership program";
+	public $require_admin = 0;
+
+	public $require_module = array(); // This module allows to select by categories must be also enabled if category module is not activated
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'partnership';
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs;
+		$langs->load("companies");
+
+		$this->db = $db;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    This is the main function that returns the array of emails
+	 *
+	 *    @param	int		$mailing_id    	Id of mailing. No need to use it.
+	 *    @return   int 					<0 if error, number of emails added if ok
+	 */
+	public function add_to_target($mailing_id)
+	{
+		// phpcs:enable
+		global $conf, $langs;
+
+		$cibles = array();
+		$addDescription = '';
+
+		$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, pt.label as label, 'thirdparty' as source";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."partnership as p, ".MAIN_DB_PREFIX."c_partnership_type as pt";
+		$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).")";
+		$sql .= " AND p.fk_soc = s.rowid";
+		$sql .= " AND pt.rowid = p.fk_type";
+		if (GETPOST('filter', 'int') > 0) {
+			$sql .= " AND pt.rowid=".((int) GETPOST('filter', 'int'));
+		}
+
+		$sql .= " UNION ";
+
+		$sql .= "SELECT s.rowid as id, s.email as email, s.lastname as name, null as fk_contact, s.firstname as firstname, pt.label as label, 'member' as source";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as s, ".MAIN_DB_PREFIX."partnership as p, ".MAIN_DB_PREFIX."c_partnership_type as pt";
+		$sql .= " WHERE s.email <> ''";
+		$sql .= " AND s.entity IN (".getEntity('member').")";
+		$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
+		$sql .= " AND p.fk_member = s.rowid";
+		$sql .= " AND pt.rowid = p.fk_type";
+		if (GETPOST('filter', 'int') > 0) {
+			$sql .= " AND pt.rowid=".((int) GETPOST('filter', 'int'));
+		}
+
+		$sql .= " ORDER BY email";
+
+		// Stock recipients emails into targets table
+		$result = $this->db->query($sql);
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			$j = 0;
+
+			dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
+
+			$old = '';
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($result);
+				if ($old <> $obj->email) {
+					$otherTxt = ($obj->label ? $langs->transnoentities("PartnershipType").'='.$obj->label : '');
+					if (strlen($addDescription) > 0 && strlen($otherTxt) > 0) {
+						$otherTxt .= ";";
+					}
+					$otherTxt .= $addDescription;
+					$cibles[$j] = array(
+								'email' => $obj->email,
+								'fk_contact' => $obj->fk_contact,
+								'lastname' => $obj->name, // For a thirdparty, we must use name
+								'firstname' => '', // For a thirdparty, lastname is ''
+								'other' => $otherTxt,
+								'source_url' => $this->url($obj->id, $obj->source),
+								'source_id' => $obj->id,
+								'source_type' => $obj->source
+					);
+					$old = $obj->email;
+					$j++;
+				}
+
+				$i++;
+			}
+		} else {
+			dol_syslog($this->db->error());
+			$this->error = $this->db->error();
+			return -1;
+		}
+
+		return parent::addTargetsToDatabase($mailing_id, $cibles);
+	}
+
+
+	/**
+	 *	On the main mailing area, there is a box with statistics.
+	 *	If you want to add a line in this report you must provide an
+	 *	array of SQL request that returns two field:
+	 *	One called "label", One called "nb".
+	 *
+	 *	@return		array		Array with SQL requests
+	 */
+	public function getSqlArrayForStats()
+	{
+		// CHANGE THIS: Optionnal
+
+		//var $statssql=array();
+		//$this->statssql[0]="SELECT field1 as label, count(distinct(email)) as nb FROM mytable WHERE email IS NOT NULL";
+		return array();
+	}
+
+
+	/**
+	 *	Return here number of distinct emails returned by your selector.
+	 *	For example if this selector is used to extract 500 different
+	 *	emails from a text file, this function must return 500.
+	 *
+	 *  @param      string	$sql        Requete sql de comptage
+	 *	@return		int					Nb of recipients
+	 */
+	public function getNbOfRecipients($sql = '')
+	{
+		global $conf;
+
+		$sql = "SELECT count(distinct(s.email)) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."partnership as p, ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " WHERE s.rowid = p.fk_soc AND s.email <> ''";
+		$sql .= " AND s.entity IN (".getEntity('societe').")";
+
+		$sql .= " UNION ";
+
+		$sql .= "SELECT count(distinct(s.email)) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."partnership as p, ".MAIN_DB_PREFIX."adherent as s";
+		$sql .= " WHERE s.rowid = p.fk_member AND s.email <> ''";
+		$sql .= " AND s.entity IN (".getEntity('member').")";
+
+		//print $sql;
+
+		// La requete doit retourner un champ "nb" pour etre comprise
+		// par parent::getNbOfRecipients
+		return parent::getNbOfRecipients($sql);
+	}
+
+	/**
+	 *  This is to add a form filter to provide variant of selector
+	 *	If used, the HTML select must be called "filter"
+	 *
+	 *  @return     string      A html select zone
+	 */
+	public function formFilter()
+	{
+		global $conf, $langs;
+
+		$langs->load("companies");
+
+		$s = '<select id="filter_partnership" name="filter" class="flat">';
+
+		// Show categories
+		$sql = "SELECT rowid, label, code, active";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_partnership_type";
+		$sql .= " WHERE active = 1";
+		$sql .= " AND entity = ".$conf->entity;
+		$sql .= " ORDER BY label";
+
+		//print $sql;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+
+			if (empty($conf->partnership->enabled)) {
+				$num = 0; // Force empty list if category module is not enabled
+			}
+
+			if ($num) {
+				$s .= '<option value="-1">'.$langs->trans("PartnershipType").'</option>';
+			}
+
+			$i = 0;
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($resql);
+
+				$s .= '<option value="'.$obj->rowid.'">'.dol_escape_htmltag($obj->label);
+				$s .= '</option>';
+				$i++;
+			}
+			$s .= ajax_combobox("filter_partnership");
+		} else {
+			dol_print_error($this->db);
+		}
+
+		$s .= '</select> ';
+
+		return $s;
+	}
+
+
+	/**
+	 *  Can include an URL link on each record provided by selector shown on target page.
+	 *
+	 *  @param	int		$id			ID
+	 *  @param	string	$sourcetype	Source type
+	 *  @return string      		Url link
+	 */
+	public function url($id, $sourcetype = 'thirdparty')
+	{
+		if ($sourcetype == 'thirparty') {
+			return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.((int) $id).'">'.img_object('', "societe").'</a>';
+		}
+		if ($sourcetype == 'member') {
+			return '<a href="'.DOL_URL_ROOT.'/adherent/card.php?id='.((int) $id).'">'.img_object('', "member").'</a>';
+		}
+
+		return '';
+	}
+}
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index 6880452a416..56d62449bcf 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -119,20 +119,20 @@ class mailing_pomme extends MailingTargets
 		$langs->load("users");
 
 		$s = '';
-		$s .= $langs->trans("Status").' ';
-		$s .= '<select name="filter" class="flat marginrightonly">';
-		$s .= '<option value="-1">&nbsp;</option>';
+		$s .= '<select id="filter_pomme"" name="filter" class="flat">';
+		$s .= '<option value="-1">'.$langs->trans("Status").'</option>';
 		$s .= '<option value="1">'.$langs->trans("Enabled").'</option>';
 		$s .= '<option value="0">'.$langs->trans("Disabled").'</option>';
 		$s .= '</select>';
+		$s .= ajax_combobox("filter_pomme");
 
 		$s .= ' ';
-		$s .= $langs->trans("Employee").' ';
-		$s .= '<select name="filteremployee" class="flat marginrightonly">';
-		$s .= '<option value="-1">&nbsp;</option>';
+		$s .= '<select id="filteremployee_pomme" name="filteremployee" class="flat">';
+		$s .= '<option value="-1">'.$langs->trans("Employee").'</option>';
 		$s .= '<option value="1">'.$langs->trans("Yes").'</option>';
 		$s .= '<option value="0">'.$langs->trans("No").'</option>';
 		$s .= '</select>';
+		$s .= ajax_combobox("filteremployee_pomme");
 
 		return $s;
 	}
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index ae26dfc19fd..8550440d5d1 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -115,7 +115,9 @@ class mailing_thirdparties extends MailingTargets
 			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 			$sql .= " AND cs.fk_soc = s.rowid";
 			$sql .= " AND c.rowid = cs.fk_categorie";
-			$sql .= " AND c.rowid=".((int) GETPOST('filter', 'int'));
+			if (GETPOST('filter', 'int') > 0) {
+				$sql .= " AND c.rowid=".((int) GETPOST('filter', 'int'));
+			}
 			$sql .= $addFilter;
 			$sql .= " UNION ";
 			$sql .= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
@@ -125,7 +127,9 @@ class mailing_thirdparties extends MailingTargets
 			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 			$sql .= " AND cs.fk_soc = s.rowid";
 			$sql .= " AND c.rowid = cs.fk_categorie";
-			$sql .= " AND c.rowid=".((int) GETPOST('filter', 'int'));
+			if (GETPOST('filter', 'int') > 0) {
+				$sql .= " AND c.rowid=".((int) GETPOST('filter', 'int'));
+			}
 			$sql .= $addFilter;
 		}
 		$sql .= " ORDER BY email";
@@ -206,7 +210,7 @@ class mailing_thirdparties extends MailingTargets
 
 		$sql = "SELECT count(distinct(s.email)) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-		$sql .= " WHERE s.email != ''";
+		$sql .= " WHERE s.email <> ''";
 		$sql .= " AND s.entity IN (".getEntity('societe').")";
 
 		// La requete doit retourner un champ "nb" pour etre comprise
@@ -226,8 +230,7 @@ class mailing_thirdparties extends MailingTargets
 
 		$langs->load("companies");
 
-		$s = $langs->trans("Categories").' ';
-		$s .= '<select name="filter" class="flat marginrightonly">';
+		$s = '<select id="filter_thirdparties" name="filter" class="flat">';
 
 		// Show categories
 		$sql = "SELECT rowid, label, type, visible";
@@ -247,7 +250,7 @@ class mailing_thirdparties extends MailingTargets
 			}
 
 			if ($num) {
-				$s .= '<option value="0">&nbsp;</option>';
+				$s .= '<option value="-1">'.$langs->trans("Categories").'</option>';
 			} else {
 				$s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
 			}
@@ -270,14 +273,15 @@ class mailing_thirdparties extends MailingTargets
 				$s .= '</option>';
 				$i++;
 			}
+			$s .= ajax_combobox("filter_thirdparties");
 		} else {
 			dol_print_error($this->db);
 		}
 
 		$s .= '</select> ';
-		$s .= $langs->trans('ProspectCustomer');
-		$s .= ' <select name="filter_client" class="flat marginrightonly">';
-		$s .= '<option value="-1">&nbsp;</option>';
+
+		$s .= '<select id="filter_client_thirdparties" name="filter_client_thirdparties" class="flat">';
+		$s .= '<option value="-1">'.$langs->trans('ProspectCustomer').'</option>';
 		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
 			$s .= '<option value="2">'.$langs->trans('Prospect').'</option>';
 		}
@@ -290,13 +294,14 @@ class mailing_thirdparties extends MailingTargets
 		$s .= '<option value="0">'.$langs->trans('NorProspectNorCustomer').'</option>';
 
 		$s .= '</select> ';
+		$s .= ajax_combobox("filter_client_thirdparties");
 
-		$s .= $langs->trans("Status");
-		$s .= ' <select name="filter_status" class="flat marginrightonly">';
-		$s .= '<option value="-1">&nbsp;</option>';
-		$s .= '<option value="1" selected>'.$langs->trans("Enabled").'</option>';
+		$s .= ' <select id="filter_status_thirdparties" name="filter_status" class="flat">';
+		$s .= '<option value="-1">'.$langs->trans("Status").'</option>';
+		$s .= '<option value="1">'.$langs->trans("Enabled").'</option>';
 		$s .= '<option value="0">'.$langs->trans("Disabled").'</option>';
 		$s .= '</select>';
+		$s .= ajax_combobox("filter_status_thirdparties");
 		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 4c848b69ac0..09f4cf76ae6 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -215,10 +215,9 @@ class mailing_thirdparties_services_expired extends MailingTargets
 	{
 		global $langs;
 
-		$s = $langs->trans("ProductOrService");
-		$s .= '<select name="filter" class="flat">';
+		$s .= '<select id="filter_services_expired" name="filter" class="flat">';
 		if (count($this->arrayofproducts)) {
-			$s .= '<option value="0">&nbsp;</option>';
+			$s .= '<option value="-1">'.$langs->trans("ProductOrService").'</option>';
 		} else {
 			$s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
 		}
@@ -226,6 +225,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
 			$s .= '<option value="'.$key.'">'.$val.'</option>';
 		}
 		$s .= '</select>';
+		$s .= ajax_combobox("filter_services_expired");
 		return $s;
 	}
 
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 8e77d2197ab..4f1c20a464e 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
@@ -118,6 +118,7 @@ class doc_generic_member_odt extends ModelePDFMember
 		$texte = $this->description.".<br>\n";
 		$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">';
 		$texte .= '<input type="hidden" name="param1" value="MEMBER_ADDON_PDF_ODT_PATH">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
@@ -154,7 +155,7 @@ class doc_generic_member_odt extends ModelePDFMember
 		$texte .= $conf->global->MEMBER_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -171,12 +172,14 @@ class doc_generic_member_odt extends ModelePDFMember
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="MEMBER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
@@ -195,9 +198,10 @@ class doc_generic_member_odt extends ModelePDFMember
 	 * 	@param	string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *	@param	string		$mode				Tell if doc module is called for 'member', ...
 	 *  @param  int         $nooutput           1=Generate only file on disk and do not return it on response
+	 *  @param	string		$filename			Name of output file (without extension)
 	 *	@return	int         					1 if OK, <=0 if KO
 	 */
-	public function write_file($object, $outputlangs, $srctemplatepath, $mode = 'member', $nooutput = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath, $mode = 'member', $nooutput = 0, $filename = 'tmp_cards')
 	{
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index 1d1a892cc56..15f3260c4d2 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -243,9 +243,10 @@ class pdf_standard extends CommonStickerGenerator
 	 *	@param	string		$srctemplatepath	Full path of source filename for generator using a template file. Example: '5161', 'AVERYC32010', 'CARD', ...
 	 *	@param	string		$mode				Tell if doc module is called for 'member', ...
 	 *  @param  int         $nooutput           1=Generate only file on disk and do not return it on response
+	 *  @param	string		$filename			Name of output file (without extension)
 	 *	@return	int								1=OK, 0=KO
 	 */
-	public function write_file($object, $outputlangs, $srctemplatepath, $mode = 'member', $nooutput = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath, $mode = 'member', $nooutput = 0, $filename = 'tmp_cards')
 	{
 		// phpcs:enable
 		global $user, $conf, $langs, $mysoc, $_Avery_Labels;
@@ -282,7 +283,7 @@ class pdf_standard extends CommonStickerGenerator
 				'__MONTH__'=>$month,
 				'__DAY__'=>$day,
 				'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
-				'__SERVER__'=>"http://".$_SERVER["SERVER_NAME"]."/"
+				'__SERVER__'=>"https://".$_SERVER["SERVER_NAME"]."/"
 			);
 			complete_substitutions_array($substitutionarray, $langs);
 
@@ -320,7 +321,10 @@ class pdf_standard extends CommonStickerGenerator
 			dol_print_error('', 'ErrorBadTypeForCard'.$this->code);
 			exit;
 		}
+
 		$this->type = 'pdf';
+		$filename .= '.pdf';
+
 		// standard format or custom
 		if ($this->Tformat['paper-size'] != 'custom') {
 			$this->format = $this->Tformat['paper-size'];
@@ -349,7 +353,7 @@ class pdf_standard extends CommonStickerGenerator
 			return -1;
 		}
 
-		$filename = 'tmp_cards.pdf';
+
 		if (is_object($object)) {
 			$outputdir = $conf->adherent->dir_output;
 			$dir = $outputdir."/".get_exdir(0, 0, 0, 0, $object, 'member');
diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
index 937e8a06870..b37b9144d3e 100644
--- a/htdocs/core/modules/member/modules_cards.php
+++ b/htdocs/core/modules/member/modules_cards.php
@@ -74,9 +74,10 @@ class ModelePDFCards
  *	@param	Translate	$outputlangs	Object langs to use for translation
  *	@param	string		$outputdir		Output directory
  *	@param	string		$template		pdf generenate document class to use default 'standard'
+ *  @param	string		$filename		Name of output file (without extension)
  *	@return int							<0 if KO, >0 if OK
  */
-function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $outputdir = '', $template = 'standard')
+function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $outputdir = '', $template = 'standard', $filename = 'tmp_cards')
 {
 	// phpcs:enable
 	global $conf, $langs;
@@ -125,7 +126,7 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 		foreach (array('doc', 'pdf') as $prefix) {
 			$file = $prefix."_".$template.".class.php";
 
-			// On verifie l'emplacement du modele
+			// We check that file of doc generaotr exists
 			$file = dol_buildpath($reldir."core/modules/member/doc/".$file, 0);
 			if (file_exists($file)) {
 				$filefound = 1;
@@ -148,7 +149,7 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
 		$sav_charset_output = $outputlangs->charset_output;
-		if ($obj->write_file($arrayofmembers, $outputlangs, $srctemplatepath) > 0) {
+		if ($obj->write_file($arrayofmembers, $outputlangs, $srctemplatepath, 'member', 0, $filename) > 0) {
 			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
 		} else {
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index e0bf3a9bbc5..2a78baa00c9 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -350,8 +350,8 @@ class modAccounting extends DolibarrModules
 			'b.fk_doc'=>'const-0',
 			'b.fk_docdet'=>'const-0',
 			'b.fk_user_author'=>'user->id',
-			'b.montant'=>'rule-computeMontant',
-			'b.sens'=>'rule-computeSens'
+			'b.montant'=>'rule-computeAmount',
+			'b.sens'=>'rule-computeDirection'
 		); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_convertvalue_array[$r]=array(
 			'b.numero_compte'=>array('rule'=>'accountingaccount'),
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 8bb59b832e9..0d4a85e00ae 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -397,9 +397,7 @@ class modAdherent extends DolibarrModules
 		if (!empty($conf->societe->enabled)) {
 			$this->import_examplevalues_array[$r]['a.fk_soc'] = "rowid or name";
 		}
-		//$this->import_run_sql_after_array[$r] = array(
-		//	'UPDATE '.MAIN_DB_PREFIX."adherent as a SET a.ref = a.rowid WHERE a.ref LIKE '(PROV%)'"
-		//);
+		$this->import_updatekeys_array[$r] = array('a.ref'=>'Member Ref', 'a.login'=>'Login');
 
 		// Cronjobs
 		$arraydate = dol_getdate(dol_now());
@@ -456,8 +454,8 @@ class modAdherent extends DolibarrModules
 		}*/
 
 		$sql = array(
-			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type='member' AND entity = ".$conf->entity,
-			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','member',".$conf->entity.")"
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type='member' AND entity = ".((int) $conf->entity),
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','member',".((int) $conf->entity).")"
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 7a593740590..ffd8fde5f1d 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -325,7 +325,7 @@ class modAgenda extends DolibarrModules
 			'type'=>'left',
 			'titre'=>'List',
 			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda',
+			'url'=>'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda',
 			'langs'=>'agenda',
 			'position'=>110,
 			'perms'=>'$user->rights->agenda->myactions->read',
@@ -339,7 +339,7 @@ class modAgenda extends DolibarrModules
 			'type'=>'left',
 			'titre'=>'MenuToDoMyActions',
 			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine',
+			'url'=>'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine',
 			'langs'=>'agenda',
 			'position'=>111,
 			'perms'=>'$user->rights->agenda->myactions->read',
@@ -353,7 +353,7 @@ class modAgenda extends DolibarrModules
 			'type'=>'left',
 			'titre'=>'MenuDoneMyActions',
 			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine',
+			'url'=>'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine',
 			'langs'=>'agenda',
 			'position'=>112,
 			'perms'=>'$user->rights->agenda->myactions->read',
@@ -367,7 +367,7 @@ class modAgenda extends DolibarrModules
 			'type'=>'left',
 			'titre'=>'MenuToDoActions',
 			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1',
+			'url'=>'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1',
 			'langs'=>'agenda',
 			'position'=>113,
 			'perms'=>'$user->rights->agenda->allactions->read',
@@ -381,7 +381,7 @@ class modAgenda extends DolibarrModules
 			'type'=>'left',
 			'titre'=>'MenuDoneActions',
 			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1',
+			'url'=>'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1',
 			'langs'=>'agenda',
 			'position'=>114,
 			'perms'=>'$user->rights->agenda->allactions->read',
diff --git a/htdocs/core/modules/modApi.class.php b/htdocs/core/modules/modApi.class.php
index bf7fc2777ae..6ad632c944e 100644
--- a/htdocs/core/modules/modApi.class.php
+++ b/htdocs/core/modules/modApi.class.php
@@ -134,16 +134,18 @@ class modApi extends DolibarrModules
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
+		$this->rights_admin_allowed = 1; // Admin is always granted of permission (even when module is disabled)
+
 		$r = 0;
 
 		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
 		// Example:
-		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		// $this->rights[$r][1] = 'Permision label';	// Permission label
-		// $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $r++;
+		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+		$this->rights[$r][1] = 'Générer / modifier la clé API des utilisateurs';	// Permission label
+		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'apikey';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][5] = 'generate';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$r++;
 
 
 		// Main menu entries
@@ -228,8 +230,6 @@ class modApi extends DolibarrModules
 	{
 		$sql = array();
 
-		$result = $this->_load_tables('/api/sql/');
-
 		return $this->_init($sql, $options);
 	}
 
@@ -245,8 +245,8 @@ class modApi extends DolibarrModules
 	{
 		// Remove old constants with entity fields different of 0
 		$sql = array(
-			"DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = '".$this->db->escape($this->db->encrypt('MAIN_MODULE_API'))."'",
-			"DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = '".$this->db->escape($this->db->encrypt('API_PRODUCTION_MODE'))."'"
+			"DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = ".$this->db->encrypt('MAIN_MODULE_API'),		// API can't be enabled per environment. Why ?
+			"DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = ".$this->db->encrypt('API_PRODUCTION_MODE')	// Not in production mode by default at activation
 		);
 
 		return $this->_remove($sql, $options);
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 9a90fa945bb..0c645099f56 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -170,9 +170,9 @@ class modBlockedLog extends DolibarrModules
 		$sql = array();
 
 		// If already used, we add an entry to show we enable module
-		   require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+		require_once DOL_DOCUMENT_ROOT . '/blockedlog/class/blockedlog.class.php';
 
-		   $object = new stdClass();
+		$object = new stdClass();
 		$object->id = 1;
 		$object->element = 'module';
 		$object->ref = 'systemevent';
diff --git a/htdocs/core/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php
index ab55536777c..5eba97b1103 100644
--- a/htdocs/core/modules/modBom.class.php
+++ b/htdocs/core/modules/modBom.class.php
@@ -327,11 +327,11 @@ class modBom extends DolibarrModules
 		$this->import_label[$r] = 'BillOfMaterials';
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = array();
-		$this->import_tables_array[$r] = ['b' => MAIN_DB_PREFIX.'bom_bom', 'extra' => MAIN_DB_PREFIX.'bom_bom_extrafields'];
-		$this->import_tables_creator_array[$r] = ['b' => 'fk_user_creat']; // Fields to store import user id
-		$this->import_fields_array[$r] = [
-			'b.ref'               => 'Document Ref*',
-			'b.label'             => 'BomLabel*',
+		$this->import_tables_array[$r] = array('b' => MAIN_DB_PREFIX.'bom_bom', 'extra' => MAIN_DB_PREFIX.'bom_bom_extrafields');
+		$this->import_tables_creator_array[$r] = array('b' => 'fk_user_creat'); // Fields to store import user id
+		$this->import_fields_array[$r] = array(
+			'b.ref'               => 'Ref*',
+			'b.label'             => 'Label*',
 			'b.fk_product'        => 'ProductRef*',
 			'b.description'       => 'Description',
 			'b.note_public'       => 'Note',
@@ -346,9 +346,9 @@ class modBom extends DolibarrModules
 			'b.fk_user_valid'     => 'ValidatedById',
 			'b.model_pdf'         => 'Model',
 			'b.status'         	  => 'Status*',
-			'b.bomtype'       	  => 'BomType*'
-
-		];
+			'b.bomtype'       	  => 'Type*'
+		);
+		$import_sample = array();
 
 		// Add extra fields
 		$import_extrafield_sample = array();
@@ -365,61 +365,62 @@ class modBom extends DolibarrModules
 		}
 		// End add extra fields
 
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'bom_bom'];
-		$this->import_regex_array[$r] = [
-			'b.ref' => '(CPV\d{4}-\d{4}|BOM\d{4}-\d{4}|PROV.{1,32}$)'
-		];
+		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'bom_bom');
+		$this->import_regex_array[$r] = array(
+			'b.ref' => ''
+		);
 
-		$this->import_updatekeys_array[$r] = ['b.ref' => 'Ref'];
-		$this->import_convertvalue_array[$r] = [
-			'b.fk_product' => [
+		$this->import_updatekeys_array[$r] = array('b.ref' => 'Ref');
+		$this->import_convertvalue_array[$r] = array(
+			'b.fk_product' => array(
 				'rule'    => 'fetchidfromref',
 				'file'    => '/product/class/product.class.php',
 				'class'   => 'Product',
 				'method'  => 'fetch',
 				'element' => 'Product'
-			],
-			'b.fk_warehouse' => [
+			),
+			'b.fk_warehouse' => array(
 				'rule'    => 'fetchidfromref',
 				'file'    => '/product/stock/class/entrepot.class.php',
 				'class'   => 'Entrepot',
 				'method'  => 'fetch',
 				'element' => 'Warehouse'
-			],
-			'b.fk_user_valid' => [
+			),
+			'b.fk_user_valid' => array(
 				'rule'    => 'fetchidfromref',
 				'file'    => '/user/class/user.class.php',
 				'class'   => 'User',
 				'method'  => 'fetch',
 				'element' => 'user'
-			],
-			'b.fk_user_modif' => [
+			),
+			'b.fk_user_modif' => array(
 				'rule'    => 'fetchidfromref',
 				'file'    => '/user/class/user.class.php',
 				'class'   => 'User',
 				'method'  => 'fetch',
 				'element' => 'user'
-			],
-		];
+			),
+		);
 
 		//Import BOM Lines
 		$r++;
 		$this->import_code[$r] = 'bom_lines_'.$r;
-		$this->import_label[$r] = 'BillOfMaterialsLine';
+		$this->import_label[$r] = 'BillOfMaterialsLines';
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = array();
-		$this->import_tables_array[$r] = ['bd' => MAIN_DB_PREFIX.'bom_bomline', 'extra' => MAIN_DB_PREFIX.'bom_bomline_extrafields'];
-		$this->import_fields_array[$r] = [
-			'bd.fk_bom'         => 'Document Ref*',
+		$this->import_tables_array[$r] = array('bd' => MAIN_DB_PREFIX.'bom_bomline', 'extra' => MAIN_DB_PREFIX.'bom_bomline_extrafields');
+		$this->import_fields_array[$r] = array(
+			'bd.fk_bom'         => 'BOM*',
 			'bd.fk_product'     => 'ProductRef',
 			'bd.fk_bom_child'   => 'BOMChild',
 			'bd.description'    => 'Description',
 			'bd.qty'            => 'LineQty',
-			'bd.qty_frozen'      => 'LineIsFrozen',
+			'bd.qty_frozen'     => 'LineIsFrozen',
 			'bd.disable_stock_change' => 'Disable Stock Change',
 			'bd.efficiency'     => 'Efficiency',
 			'bd.position'       => 'LinePosition'
-		];
+		);
 
 		// Add extra fields
 		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'bom_bomline' AND entity IN (0, ".$conf->entity.")";
@@ -433,25 +434,25 @@ class modBom extends DolibarrModules
 		}
 		// End add extra fields
 
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'bom_bomline'];
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'bom_bomline');
 		$this->import_regex_array[$r] = array();
-		$this->import_updatekeys_array[$r] = ['bd.fk_bom' => 'BOM Id'];
-		$this->import_convertvalue_array[$r] = [
-			'bd.fk_bom' => [
+		$this->import_updatekeys_array[$r] = array('bd.fk_bom' => 'BOM Id');
+		$this->import_convertvalue_array[$r] = array(
+			'bd.fk_bom' => array(
 				'rule'    => 'fetchidfromref',
 				'file'    => '/bom/class/bom.class.php',
 				'class'   => 'BOM',
 				'method'  => 'fetch',
 				'element' => 'bom'
-			],
-			'bd.fk_product' => [
+			),
+			'bd.fk_product' => array(
 				'rule'    => 'fetchidfromref',
 				'file'    => '/product/class/product.class.php',
 				'class'   => 'Product',
 				'method'  => 'fetch',
 				'element' => 'Product'
-			],
-		];
+			),
+		);
 	}
 
 	/**
@@ -466,11 +467,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);
@@ -503,8 +499,8 @@ class modBom extends DolibarrModules
 		}
 
 		$sql = array(
-			//"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('standard')."' AND type = 'bom' AND entity = ".$conf->entity,
-			//"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('standard')."', 'bom', ".$conf->entity.")"
+			//"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('standard')."' AND type = 'bom' AND entity = ".((int) $conf->entity),
+			//"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('standard')."', 'bom', ".((int) $conf->entity).")"
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
deleted file mode 100644
index a128b92ee29..00000000000
--- a/htdocs/core/modules/modCashDesk.class.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-/* Copyright (C) 2008-2011 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/>.
- */
-
-/**
- *      \defgroup   pos       Module points of sale
- *      \brief      Module to manage points of sale
- *      \file       htdocs/core/modules/modCashDesk.class.php
- *      \ingroup    pos
- *      \brief      Description and activation file for the module Point Of Sales
- */
-include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
-
-
-/**
- *	Class to describe and enable module Point Of Sales
- */
-class modCashDesk extends DolibarrModules
-{
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	public function __construct($db)
-	{
-		$this->db = $db;
-
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used module id).
-		$this->numero = 50100;
-		// Key text used to identify module (for permission, menus, etc...)
-		$this->rights_class = 'cashdesk';
-
-		$this->family = "portal";
-		$this->module_position = '59';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i', '', get_class($this));
-		$this->description = "CashDesk module";
-
-		$this->version = 'deprecated';
-
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto = 'cash-register';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array();
-
-		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
-		$this->config_page_url = array("cashdesk.php@cashdesk");
-
-		// Dependencies
-		$this->hidden = false; // A condition to hide module
-		$this->depends = array('always'=>"modBanque", 'always'=>"modFacture", 'always'=>"modProduct", 'FR'=>'modBlockedLog'); // List of modules id that must be enabled if this module is enabled
-		$this->requiredby = array(); // List of modules id to disable if this one is disabled
-		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(2, 4); // Minimum version of Dolibarr required by module
-		$this->langfiles = array("cashdesk");
-		$this->warnings_activation = array('FR'=>'WarningNoteModulePOSForFrenchLaw'); // Warning to show when we activate module. array('always'='text') or array('FR'='text')
-		//$this->warnings_activation_ext = array('FR'=>'WarningInstallationMayBecomeNotCompliantWithLaw');  // Warning to show when we activate an external module. array('always'='text') or array('FR'='text')
-
-		// Constants
-		$this->const = array();
-
-		// Boxes
-		$this->boxes = array();
-
-		// Permissions
-		$this->rights = array();
-		$r = 0;
-
-		$r++;
-		$this->rights[$r][0] = 50101;
-		$this->rights[$r][1] = 'Use Point of sale';
-		$this->rights[$r][2] = 'a';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'run';
-
-		// Main menu entries
-		$this->menus = array(); // List of menus to add
-		$r = 0;
-
-		// This is to declare the Top Menu entry:
-		$this->menu[$r] = array('fk_menu'=>0, // Put 0 if this is a top menu
-									'type'=>'top', // This is a Top menu entry
-									'titre'=>'PointOfSaleShort',
-									'mainmenu'=>'cashdesk',
-									'leftmenu'=>'',
-									'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
-									'url'=>'/cashdesk/index.php?user=__USER_LOGIN__',
-									'langs'=>'cashdesk', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-									'position'=>900,
-									'enabled'=>'$conf->cashdesk->enabled',
-									'perms'=>'$user->rights->cashdesk->run', // Use 'perms'=>'1' if you want your menu with no permission rules
-									'target'=>'pointofsale',
-									'user'=>0); // 0=Menu for internal users, 1=external users, 2=both
-
-		$r++;
-
-		// This is to declare a Left Menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'r=0',		// Use r=value where r is index key used for the top menu entry
-		//							'type'=>'left',			// This is a Left menu entry
-		//							'titre'=>'Title left menu',
-		//							'mainmenu'=>'mymodule',
-		//							'url'=>'/comm/action/index2.php',
-		//							'langs'=>'mylangfile',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'perms'=>'$user->rights->mymodule->level1->level2',		// Use 'perms'=>'1' if you want your menu with no permission rules
-		//							'target'=>'',
-		//							'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-	}
-
-
-	/**
-	 *  Function called when module is enabled.
-	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *  It also creates data directories
-	 *
-	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *  @return     int             	1 if OK, 0 if KO
-	 */
-	public function init($options = '')
-	{
-		$sql = array();
-
-		// Remove permissions and default values
-		$this->remove($options);
-
-		return $this->_init($sql, $options);
-	}
-}
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 776c5c76681..c3b7f256b4b 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -164,8 +164,8 @@ class modCategorie extends DolibarrModules
 			$typeexample .= ($typeexample ? " / " : "")."11=Website page";
 		}
 
-		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.type'=>"Type", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'pcat.label'=>"ParentCategoryLabel" );
-		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.type'=>"Numeric", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'pcat.label'=>'Text' );
+		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.type'=>"Type", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'pcat.label'=>"ParentCategoryLabel");
+		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.type'=>"Numeric", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'pcat.label'=>'Text');
 		$this->export_entities_array[$r] = array(); // We define here only fields that use another picto
 		$this->export_help_array[$r] = array('cat.type'=>$typeexample);
 
@@ -460,7 +460,7 @@ class modCategorie extends DolibarrModules
 		);
 
 		$this->import_examplevalues_array[$r] = array(
-			'ca.label'=>"My Category Label", 'ca.type'=>$typeexample, 'ca.description'=>"My Category description",		// $typeexample built above in exports
+			'ca.label'=>"My Category Label", 'ca.type'=>$typeexample, 'ca.description'=>"My Category description", // $typeexample built above in exports
 			'ca.fk_parent' => 'rowid or label'
 		);
 		$this->import_updatekeys_array[$r] = array('ca.label'=>'Label');
@@ -538,7 +538,7 @@ class modCategorie extends DolibarrModules
 
 			$this->import_convertvalue_array[$r] = array(
 				'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-				'cs.fk_member'=>array('rule'=>'fetchidfromref','classfile'=>'/adherents/class/adherent.class.php','class'=>'Adherent','method'=>'fetch','element'=>'Member')
+				'cs.fk_member'=>array('rule'=>'fetchidfromref', 'classfile'=>'/adherents/class/adherent.class.php', 'class'=>'Adherent', 'method'=>'fetch', 'element'=>'Member')
 			);
 			$this->import_examplevalues_array[$r] = array('cs.fk_categorie'=>"rowid or label", 'cs.fk_member'=>"rowid or ref");
 		}
@@ -579,7 +579,7 @@ class modCategorie extends DolibarrModules
 
 			$this->import_convertvalue_array[$r] = array(
 				'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-				'cs.fk_project'=>array('rule'=>'fetchidfromref','classfile'=>'/projet/class/project.class.php','class'=>'Project','method'=>'fetch','element'=>'Project')
+				'cs.fk_project'=>array('rule'=>'fetchidfromref', 'classfile'=>'/projet/class/project.class.php', 'class'=>'Project', 'method'=>'fetch', 'element'=>'Project')
 			);
 			$this->import_examplevalues_array[$r] = array('cp.fk_categorie'=>"rowid or label", 'cp.fk_project'=>"rowid or ref");
 		}
@@ -597,7 +597,7 @@ class modCategorie extends DolibarrModules
 
 			$this->import_convertvalue_array[$r] = array(
 				'cu.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
-				'cu.fk_user'=>array('rule'=>'fetchidfromref','classfile'=>'/user/class/user.class.php','class'=>'User','method'=>'fetch','element'=>'User')
+				'cu.fk_user'=>array('rule'=>'fetchidfromref', 'classfile'=>'/user/class/user.class.php', 'class'=>'User', 'method'=>'fetch', 'element'=>'User')
 			);
 			$this->import_examplevalues_array[$r] = array('cu.fk_categorie'=>"rowid or label", 'cu.fk_user'=>"rowid or login");
 		}
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index d0c98c72ab8..d8ba1f98146 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -210,6 +210,13 @@ class modCommande extends DolibarrModules
 			$this->export_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
 			$this->export_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
+		// Add multicompany field
+		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
+			$nbofallowedentities = count(explode(',', getEntity('commande')));
+			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) {
+				$this->export_fields_array[$r]['c.entity'] = 'Entity';
+			}
+		}
 		//$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",
@@ -224,7 +231,8 @@ class modCommande extends DolibarrModules
 			'c.date_commande'=>"Date", 'c.date_livraison'=>"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', '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'
+			'cd.total_ttc'=>"Numeric", 'p.rowid'=>'List:product:ref::product', 'p.ref'=>'Text', 'p.label'=>'Text', 'd.nom'=>'Text',
+			'c.entity'=>'List:entity:label:rowid',
 		);
 		$this->export_entities_array[$r] = array(
 			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'd.nom'=>'company', 'co.label'=>'company',
@@ -286,10 +294,10 @@ class modCommande extends DolibarrModules
 		$this->import_label[$r] = 'CustomersOrders';
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = array();
-		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX.'commande', 'extra' => MAIN_DB_PREFIX.'commande_extrafields'];
-		$this->import_tables_creator_array[$r] = ['c' => 'fk_user_author']; // Fields to store import user id
-		$this->import_fields_array[$r] = [
-			'c.ref'               => 'Document Ref*',
+		$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
+		$this->import_fields_array[$r] = array(
+			'c.ref'               => 'Ref*',
 			'c.ref_client'        => 'RefCustomer',
 			'c.fk_soc'            => 'ThirdPartyName*',
 			'c.fk_projet'         => 'ProjectId',
@@ -310,7 +318,7 @@ class modCommande extends DolibarrModules
 			'c.fk_cond_reglement' => 'Payment Condition',
 			'c.fk_mode_reglement' => 'Payment Mode',
 			'c.model_pdf'         => 'Model'
-		];
+		);
 
 		if (!empty($conf->multicurrency->enabled)) {
 			$this->import_fields_array[$r]['c.multicurrency_code']      = 'Currency';
@@ -337,7 +345,6 @@ class modCommande extends DolibarrModules
 
 		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commande'];
 		$this->import_regex_array[$r] = [
-			'c.ref' => '(CPV\d{4}-\d{4}|CO\d{4}-\d{4}|PROV.{1,32}$)',
 			'c.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'
 		];
 
@@ -372,9 +379,9 @@ class modCommande extends DolibarrModules
 		$this->import_label[$r] = 'SaleOrderLines';
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = array();
-		$this->import_tables_array[$r] = ['cd' => MAIN_DB_PREFIX.'commandedet', 'extra' => MAIN_DB_PREFIX.'commandedet_extrafields'];
-		$this->import_fields_array[$r] = [
-			'cd.fk_commande'    => 'Document Ref*',
+		$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_product'     => 'IdProduct',
 			'cd.label'          => 'Label',
@@ -393,7 +400,7 @@ class modCommande extends DolibarrModules
 			'cd.date_end'       => 'End Date',
 			'cd.buy_price_ht'   => 'LineBuyPriceHT',
 			'cd.rang'           => 'LinePosition'
-		];
+		);
 
 		if (!empty($conf->multicurrency->enabled)) {
 			$this->import_fields_array[$r]['cd.multicurrency_code'] = 'Currency';
@@ -466,8 +473,8 @@ class modCommande extends DolibarrModules
 		}
 
 		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'order' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','order',".$conf->entity.")"
+				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'order' AND entity = ".((int) $conf->entity),
+				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."', 'order', ".((int) $conf->entity).")"
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index f91e54039f4..2fc0c7f1e0d 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -33,7 +33,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modContrat extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -246,8 +245,8 @@ class modContrat extends DolibarrModules
 		}
 
 		$sql = array(
-			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'contract' AND entity = ".$conf->entity,
-			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."','contract',".$conf->entity.")"
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'contract' AND entity = ".((int) $conf->entity),
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."', 'contract', ".((int) $conf->entity).")"
 		);
 
 		return $this->_init($sql, $options);
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..46168280575 100644
--- a/htdocs/core/modules/modDav.class.php
+++ b/htdocs/core/modules/modDav.class.php
@@ -266,8 +266,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..bceb313e120 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -159,6 +159,11 @@ class modDeplacement extends DolibarrModules
 	 */
 	public function init($options = '')
 	{
+		$result = $this->_load_tables('/install/mysql/tables/', '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 7d8a8fc9455..f2564cd3cc6 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -155,9 +155,14 @@ class modDon extends DolibarrModules
 	{
 		global $conf;
 
+		$result = $this->_load_tables('/install/mysql/tables/', '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')
+		}
+
 		$sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'donation' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','donation',".$conf->entity.")",
+			 "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).")",
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modEmailCollector.class.php b/htdocs/core/modules/modEmailCollector.class.php
index 53223ecd705..566d050aacd 100644
--- a/htdocs/core/modules/modEmailCollector.class.php
+++ b/htdocs/core/modules/modEmailCollector.class.php
@@ -264,16 +264,6 @@ class modEmailCollector extends DolibarrModules
 	public function init($options = '')
 	{
 		global $conf, $user;
-		//$this->_load_tables('/dav/sql/');
-
-		// Create extrafields
-		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-		//$extrafields = new ExtraFields($this->db);
-		//$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-		//$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
-		//$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->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, '', '', 'dav@dav', '$conf->dav->enabled');
-		//$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
 
 		$sql = array();
 
@@ -285,17 +275,17 @@ class modEmailCollector extends DolibarrModules
 				$descriptionA1 .= ' If the collector Collect_Responses is also enabled, when you send an email from the ticket, you may also see answers of your customers or partners directly on the ticket view.';
 
 				$sqlforexampleA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-				$sqlforexampleA1 .= " VALUES (".$conf->entity.", 'Collect_Ticket_Requets', 'Example to collect ticket requests', '".$this->db->escape($descriptionA1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
+				$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)";
 
 				$sqlforexampleFilterA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-				$sqlforexampleFilterA1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'isnotanswer', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$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())."', ".$user->id.", 1)";
+				$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)";
 				$sqlforexampleFilterA3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, rulevalue, date_creation, fk_user_creat, status)";
-				$sqlforexampleFilterA3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'to', 'support@example.com', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$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)";
 
 				$sqlforexampleA4 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-				$sqlforexampleA4 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'ticket', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$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)";
 
 				$sql[] = $sqlforexampleA1;
 				$sql[] = $sqlforexampleFilterA1;
@@ -314,14 +304,14 @@ class modEmailCollector extends DolibarrModules
 				$descriptionA1 = 'This collector will scan your mailbox "Sent" directory to find emails that was sent as an answer of another email directly from your email software and not from Dolibarr. If such an email is found, the event of answer is recorded into Dolibarr.';
 
 				$sqlforexampleA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-				$sqlforexampleA1 .= " VALUES (".$conf->entity.", 'Collect_Responses_Out', 'Example to collect answers to emails done from your external email software', '".$this->db->escape($descriptionA1)."', 'Sent', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
+				$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)";
 
 				$sqlforexampleFilterA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-				$sqlforexampleFilterA1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = ".$conf->entity."), 'isanswer', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$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 = ".$conf->entity."), 'withouttrackingidinmsgid', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$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 = ".$conf->entity."), 'recordevent', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$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;
@@ -330,18 +320,18 @@ class modEmailCollector extends DolibarrModules
 			}
 		}
 
-		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = ".$conf->entity;
+		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = ".((int) $conf->entity);
 		$tmpresql = $this->db->query($tmpsql);
 		if ($tmpresql) {
 			if ($this->db->num_rows($tmpresql) == 0) {
 				$descriptionB1 = 'This collector will scan your mailbox to find all emails that are an answer of an email sent from your application. An event (Module Agenda must be enabled) with the email response will be recorded at the good place. For example, if your send a commercial proposal, order, invoice or message for a ticket by email from the application, and your customer answers your email, the system will automatically catch the answer and add it into your ERP.';
 
 				$sqlforexampleB1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-				$sqlforexampleB1 .= " VALUES (".$conf->entity.", 'Collect_Responses_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())."', ".$user->id.", 0)";
+				$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 = ".$conf->entity."), 'isanswer', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleB2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = ".((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 = ".$conf->entity."), 'recordevent', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleB3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = ".((int) $conf->entity)."), 'recordevent', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
 
 				$sql[] = $sqlforexampleB1;
 				$sql[] = $sqlforexampleB2;
@@ -351,7 +341,7 @@ class modEmailCollector extends DolibarrModules
 			dol_print_error($this->db);
 		}
 
-		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".$conf->entity;
+		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".((int) $conf->entity);
 		$tmpresql = $this->db->query($tmpsql);
 		if ($tmpresql) {
 			if ($this->db->num_rows($tmpresql) == 0) {
@@ -360,17 +350,17 @@ class modEmailCollector extends DolibarrModules
 				$descriptionC1 .= "Note: With this initial example, the title of the lead is generated including the email. If the thirdparty can't be found in database (new customer), the lead will be attached to the thirdparty with ID 1.";
 
 				$sqlforexampleC1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-				$sqlforexampleC1 .= " VALUES (".$conf->entity.", 'Collect_Leads', 'Example to collect leads', '".$this->db->escape($descriptionC1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
+				$sqlforexampleC1 .= " VALUES (".$conf->entity.", 'Collect_Leads', 'Example to collect leads', '".$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 = ".$conf->entity."), 'isnotanswer', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$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 = ".$conf->entity."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$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 = ".$conf->entity."), 'to', 'sales@example.com', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$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 = ".$conf->entity."), 'project', 'tmp_from=EXTRACT:HEADER:^From:(.*);socid=SETIFEMPTY:1;usage_opportunity=SET:1;description=EXTRACT:BODY:(.*);title=SET:Lead or message from __tmp_from__ received by email', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$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)";
 
 				$sql[] = $sqlforexampleC1;
 				$sql[] = $sqlforexampleFilterC1;
@@ -382,7 +372,7 @@ class modEmailCollector extends DolibarrModules
 			dol_print_error($this->db);
 		}
 
-		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".$conf->entity;
+		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".((int) $conf->entity);
 		$tmpresql = $this->db->query($tmpsql);
 		if ($tmpresql) {
 			if ($this->db->num_rows($tmpresql) == 0) {
@@ -390,17 +380,17 @@ class modEmailCollector extends DolibarrModules
 				$descriptionC1 .= "Note: With this initial example, the title of the candidature is generated including the email.";
 
 				$sqlforexampleC1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-				$sqlforexampleC1 .= " VALUES (".$conf->entity.", 'Collect_Candidatures', 'Example to collect email for job candidatures', '".$this->db->escape($descriptionC1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
+				$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)";
 
 				$sqlforexampleFilterC1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-				$sqlforexampleFilterC1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".$conf->entity."), 'isnotanswer', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$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 = ".$conf->entity."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$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 = ".$conf->entity."), 'to', 'jobs@example.com', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$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 = ".$conf->entity."), 'candidature', 'tmp_from=EXTRACT:HEADER:^From:(.*)(<.*>)?;fk_recruitmentjobposition=EXTRACT:HEADER:^To:[^\n]*\+([^\n]*);description=EXTRACT:BODY:(.*);lastname=SET:__tmp_from__', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$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)";
 
 				$sql[] = $sqlforexampleC1;
 				$sql[] = $sqlforexampleFilterC1;
diff --git a/htdocs/core/modules/modEventOrganization.class.php b/htdocs/core/modules/modEventOrganization.class.php
index 4ba73d4fe2c..f2dc614cb03 100644
--- a/htdocs/core/modules/modEventOrganization.class.php
+++ b/htdocs/core/modules/modEventOrganization.class.php
@@ -19,7 +19,7 @@
  * 	\defgroup   eventorganization     Module EventOrganization
  *  \brief      EventOrganization module descriptor.
  *
- *  \file       htdocs/eventorganization/core/modules/modEventOrganization.class.php
+ *  \file       htdocs/core/modules/modEventOrganization.class.php
  *  \ingroup    eventorganization
  *  \brief      Description and activation file for the EventOrganization
  */
@@ -55,7 +55,7 @@ class modEventOrganization extends DolibarrModules
 		$this->description = "EventOrganizationDescription";
 		$this->descriptionlong = "EventOrganizationDescriptionLong";
 
-		$this->version = 'development';
+		$this->version = 'experimental';
 
 
 		// Key used in llx_const table to save module status enabled/disabled (where EVENTORGANIZATION is value of property name of module in uppercase)
@@ -351,11 +351,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);
 
@@ -387,10 +382,10 @@ class modEventOrganization extends DolibarrModules
 				}
 
 				$sql = array_merge($sql, array(
-					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard_".strtolower($myTmpObjectKey)."' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
-					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard_".strtolower($myTmpObjectKey)."','".strtolower($myTmpObjectKey)."',".$conf->entity.")",
-					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'generic_".strtolower($myTmpObjectKey)."_odt' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
-					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('generic_".strtolower($myTmpObjectKey)."_odt', '".strtolower($myTmpObjectKey)."', ".$conf->entity.")"
+					"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/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 238eef2d6fe..c10e13a46d8 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -359,10 +359,10 @@ class modExpedition extends DolibarrModules
 		$sql = array();
 
 		$sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'shipping' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','shipping',".$conf->entity.")",
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[3][2])."' AND type = 'delivery' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[3][2])."','delivery',".$conf->entity.")",
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'shipping' AND entity = ".((int) $conf->entity),
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','shipping',".((int) $conf->entity).")",
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[3][2])."' AND type = 'delivery' AND entity = ".((int) $conf->entity),
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[3][2])."','delivery',".((int) $conf->entity).")",
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index 63bc99f41ee..53708ece3dd 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -249,8 +249,8 @@ class modExpenseReport extends DolibarrModules
 		$this->remove($options);
 
 		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard' AND type='expensereport' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard','expensereport',".$conf->entity.")"
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard' AND type='expensereport' AND entity = ".((int) $conf->entity),
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard','expensereport',".((int) $conf->entity).")"
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 475c8fc5996..fac768b9c60 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -142,7 +142,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 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).',
+				'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).',
 				'frequency'=>1,
 				'unitfrequency'=>3600 * 24,
 				'priority'=>50,
@@ -270,17 +270,25 @@ class modFacture extends DolibarrModules
 			$this->export_fields_array[$r]['f.module_source'] = 'Module';
 			$this->export_fields_array[$r]['f.pos_source'] = 'POSTerminal';
 		}
+		// Add multicompany field
+		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
+			$nbofallowedentities = count(explode(',', getEntity('invoice')));
+			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) {
+				$this->export_fields_array[$r]['f.entity'] = 'Entity';
+			}
+		}
 		$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',
-			'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.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",
 			'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'
+			$alias_product_perentity . '.accountancy_code_sell'=>'Text',
+			'f.entity'=>'List:entity:label:rowid',
 		);
 		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS)) {
 			$this->export_TypeFields_array[$r]['f.module_source'] = 'Text';
@@ -458,8 +466,8 @@ class modFacture extends DolibarrModules
 		}
 
 		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'invoice' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."','invoice',".$conf->entity.")"
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'invoice' AND entity = ".((int) $conf->entity),
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."','invoice',".((int) $conf->entity).")"
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php
index 480a936f656..8c30d8a0a51 100644
--- a/htdocs/core/modules/modFckeditor.class.php
+++ b/htdocs/core/modules/modFckeditor.class.php
@@ -63,14 +63,14 @@ class modFckeditor extends DolibarrModules
 		$this->config_page_url = array("fckeditor.php");
 
 		// Dependencies
-		$this->disabled = (in_array(constant('JS_CKEDITOR'), array('disabled', 'disabled/')) ? 1 : 0); // A condition to disable module (used for native debian packages)
+		$this->disabled = in_array(constant('JS_CKEDITOR'), array('disabled', 'disabled/'));
 		$this->depends = array();
 		$this->requiredby = array('modWebsites');
 
 		// Constants
 		$this->const = array();
-		$this->const[0] = array("FCKEDITOR_ENABLE_SOCIETE", "yesno", "1", "WYSIWIG for description and note (except products/services)");
-		$this->const[1] = array("FCKEDITOR_ENABLE_PRODUCTDESC", "yesno", "1", "WYSIWIG for products/services description and note");
+		$this->const[0] = array("FCKEDITOR_ENABLE_SOCIETE", "yesno", "1", "WYSIWIG for the fields descriptions of elements (except products/services)");
+		$this->const[1] = array("FCKEDITOR_ENABLE_PRODUCTDESC", "yesno", "1", "WYSIWIG for the fields description of products/services");
 		$this->const[2] = array("FCKEDITOR_ENABLE_MAILING", "yesno", "1", "WYSIWIG for mass emailings");
 		$this->const[3] = array("FCKEDITOR_ENABLE_DETAILS", "yesno", "1", "WYSIWIG for products details lines for all entities");
 		$this->const[4] = array("FCKEDITOR_ENABLE_USERSIGN", "yesno", "1", "WYSIWIG for user signature");
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index af99e6f646f..1e3bb99c070 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -77,6 +77,11 @@ class modFicheinter extends DolibarrModules
 		$this->const = array();
 		$r = 0;
 
+		if (!isset($conf->ficheinter) || !isset($conf->ficheinter->enabled)) {
+			$conf->ficheinter = new stdClass();
+			$conf->ficheinter->enabled = 0;
+		}
+
 		$this->const[$r][0] = "FICHEINTER_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "soleil";
@@ -174,18 +179,11 @@ class modFicheinter extends DolibarrModules
 			'fd.rowid'=>'InterLineId',
 			'fd.date'=>"InterLineDate", 'fd.duree'=>"InterLineDuration", 'fd.description'=>"InterLineDesc"
 		);
-		//$this->export_TypeFields_array[$r]=array(
-		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label',
-		//	's.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text',
-		//	's.code_compta_fournisseur'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.duree'=>"Duree",'f.fk_statut'=>'Statut','f.description'=>"Text",
-		//	'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean",'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",
-		//	'fd.total_ht'=>"Numeric"
-		//);
 		$this->export_TypeFields_array[$r] = array(
 			's.rowid'=>"Numeric", 's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 's.fk_pays'=>'List:c_country:label', 's.phone'=>'Text', 's.siren'=>'Text',
 			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text',
 			'f.rowid'=>'Numeric', 'f.ref'=>"Text", 'f.datec'=>"Date",
-			'f.duree'=>"Duree", 'f.fk_statut'=>'Numeric', 'f.description'=>"Text", 'f.datee'=>"Date", 'f.dateo'=>"Date", 'f.fulldayevent'=>"Boolean",
+			'f.duree'=>"Duree", 'f.fk_statut'=>'Numeric', 'f.description'=>"Text", 'f.datee'=>"Date", 'f.dateo'=>"Date", 'f.fulldayevent'=>"Text",
 			'pj.ref'=>'Text', 'pj.title'=>'Text',
 			'fd.rowid'=>"Numeric", 'fd.date'=>"Date", 'fd.duree'=>"Duree", 'fd.description'=>"Text", 'fd.total_ht'=>"Numeric"
 		);
@@ -231,8 +229,8 @@ class modFicheinter extends DolibarrModules
 		$this->remove($options);
 
 		$sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'ficheinter' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','ficheinter',".$conf->entity.")",
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'ficheinter' AND entity = ".((int) $conf->entity),
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','ficheinter',".((int) $conf->entity).")",
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index d65d9674f59..8bd801e0daa 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -34,7 +34,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modFournisseur extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -130,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'=>'RecurringSupplierInvoices',
+				'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'=>50,
+				'status'=>1,
+				'datestart'=>$datestart
+			));
+
+
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'fournisseur';
@@ -353,7 +371,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture_fourn';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('supplier_invoice').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) {
-			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.((int) $user->id);
 		}
 
 		$r++;
@@ -417,7 +435,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('supplier_invoice').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) {
-			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.((int) $user->id);
 		}
 
 		// Order
@@ -430,8 +448,8 @@ class modFournisseur extends DolibarrModules
 			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom'=>'ParentCompany', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 's.phone'=>'Phone',
 			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.idprof5'=>'ProfId5', 's.idprof6'=>'ProfId6', 's.tva_intra'=>'VATIntra',
 			'f.rowid'=>"OrderId", 'f.ref'=>"Ref", 'f.ref_supplier'=>"RefSupplier", 'f.date_creation'=>"DateCreation", 'f.date_commande'=>"OrderDate", 'f.date_livraison'=>"DateDeliveryPlanned",
-			'f.total_ht'=>"TotalHT", 'f.total_ttc'=>"TotalTTC", 'f.total_tva'=>"TotalVAT", 'f.fk_statut'=>'Status', 'f.date_approve'=>'DateApprove', 'f.date_approve2'=>'DateApprove2',
-			'f.note_public'=>"NotePublic", 'f.note_private'=>"NotePrivate", 'ua1.login'=>'ApprovedBy', 'ua2.login'=>'ApprovedBy2', 'fd.rowid'=>'LineId', 'fd.description'=>"LineDescription",
+			'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',
 			'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'project.rowid'=>'ProjectId', 'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
@@ -451,13 +469,13 @@ class modFournisseur extends DolibarrModules
 			's.rowid'=>"company", 's.nom'=>'Text', 'ps.nom'=>'Text', 's.address'=>'Text', 's.cp'=>'Text', 's.ville'=>'Text', 'c.code'=>'Text', 's.tel'=>'Text', 's.siren'=>'Text',
 			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.idprof5'=>'Text', 's.idprof6'=>'Text', 's.tva_intra'=>'Text', 'f.ref'=>"Text", 'f.ref_supplier'=>"Text",
 			'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_approve'=>'Date', 'f.date_approve2'=>'Date', 'f.note_public'=>"Text", 'f.note_private'=>"Text", 'fd.description'=>"Text",
+			'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.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', 'ua1.login'=>'user',
+			'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',
 			'p.ref'=>'product', 'p.label'=>'product', 'project.rowid'=>'project', 'project.ref'=>'project', 'project.title'=>'project'
@@ -484,6 +502,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'commande_fournisseur as f';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as project on (f.fk_projet = project.rowid)';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON uv.rowid = f.fk_user_valid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as ua1 ON ua1.rowid = f.fk_user_approve';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as ua2 ON ua2.rowid = f.fk_user_approve2';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseur_extrafields as extra ON f.rowid = extra.fk_object,';
@@ -493,7 +512,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('supplier_order').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) {
-			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.((int) $user->id);
 		}
 
 		//Import Supplier Invoice
@@ -505,9 +524,9 @@ class modFournisseur extends DolibarrModules
 		$this->import_label[$r] = "SupplierInvoices"; // 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] = ['f' => MAIN_DB_PREFIX.'facture_fourn', 'extra' => MAIN_DB_PREFIX.'facture_fourn_extrafields'];
-		$this->import_tables_creator_array[$r] = ['f' => 'fk_user_author']; // Fields to store import user id
-		$this->import_fields_array[$r] = [
+		$this->import_tables_array[$r] = array('f' => MAIN_DB_PREFIX.'facture_fourn', 'extra' => MAIN_DB_PREFIX.'facture_fourn_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_supplier' => 'RefSupplier',
 			'f.type' => 'Type*',
@@ -531,7 +550,7 @@ class modFournisseur extends DolibarrModules
 			'f.fk_mode_reglement' => 'Payment Mode',
 			'f.model_pdf' => 'Model',
 			'f.date_valid' => 'Validation Date'
-		];
+		);
 		if (!empty($conf->multicurrency->enabled)) {
 			$this->import_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
@@ -552,9 +571,9 @@ class modFournisseur extends DolibarrModules
 			}
 		}
 		// End add extra fields
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'facture_fourn'];
-		$this->import_regex_array[$r] = ['f.ref' => '(SI\d{4}-\d{4}|PROV.{1,32}$)', 'f.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'];
-		$import_sample = [
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'facture_fourn');
+		$this->import_regex_array[$r] = array('f.ref' => '(SI\d{4}-\d{4}|PROV.{1,32}$)', 'f.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency');
+		$import_sample = array(
 			'f.ref' => '(PROV001)',
 			'f.ref_supplier' => 'Supplier1',
 			'f.type' => '0',
@@ -583,14 +602,14 @@ class modFournisseur extends DolibarrModules
 			'f.multicurrency_total_ht' => '1000',
 			'f.multicurrency_total_tva' => '0',
 			'f.multicurrency_total_ttc' => '1000'
-		];
+		);
 		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
-		$this->import_updatekeys_array[$r] = ['f.ref' => 'Ref'];
-		$this->import_convertvalue_array[$r] = [
+		$this->import_updatekeys_array[$r] = array('f.ref' => 'Ref');
+		$this->import_convertvalue_array[$r] = array(
 			//'c.ref'=>array('rule'=>'getrefifauto'),
-			'f.fk_soc' => ['rule' => 'fetchidfromref', 'file' => '/societe/class/societe.class.php', 'class' => 'Societe', 'method' => 'fetch', 'element' => 'ThirdParty'],
-			'f.fk_account' => ['rule' => 'fetchidfromref', 'file' => '/compta/bank/class/account.class.php', 'class' => 'Account', 'method' => 'fetch', 'element' => 'bank_account'],
-		];
+			'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'),
+		);
 
 		//Import Supplier Invoice Lines
 		$r++;
@@ -598,8 +617,8 @@ class modFournisseur extends DolibarrModules
 		$this->import_label[$r] = "SupplierInvoiceLines"; // 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] = ['fd' => MAIN_DB_PREFIX.'facture_fourn_det', 'extra' => MAIN_DB_PREFIX.'facture_fourn_det_extrafields'];
-		$this->import_fields_array[$r] = [
+		$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_product' => 'IdProduct',
@@ -618,7 +637,7 @@ class modFournisseur extends DolibarrModules
 			'fd.date_start' => 'Start Date',
 			'fd.date_end' => 'End Date',
 			'fd.fk_unit' => 'Unit'
-		];
+		);
 		if (!empty($conf->multicurrency->enabled)) {
 			$this->import_fields_array[$r]['fd.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['fd.multicurrency_subprice'] = 'CurrencyRate';
@@ -639,9 +658,9 @@ class modFournisseur extends DolibarrModules
 			}
 		}
 		// End add extra fields
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'facture_fourn_det'];
-		$this->import_regex_array[$r] = ['fd.product_type' => '[0|1]$', 'fd.fk_product' => 'rowid@'.MAIN_DB_PREFIX.'product', 'fd.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'];
-		$import_sample = [
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'facture_fourn_det');
+		$this->import_regex_array[$r] = array('fd.product_type' => '[0|1]$', 'fd.fk_product' => 'rowid@'.MAIN_DB_PREFIX.'product', 'fd.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency');
+		$import_sample = array(
 			'fd.fk_facture_fourn' => '(PROV001)',
 			'fd.fk_parent_line' => '',
 			'fd.fk_product' => '',
@@ -665,23 +684,23 @@ class modFournisseur extends DolibarrModules
 			'fd.multicurrency_total_ht' => '50000',
 			'fd.multicurrency_total_tva' => '0',
 			'fd.multicurrency_total_ttc' => '50000'
-		];
+		);
 		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
-		$this->import_updatekeys_array[$r] = ['fd.rowid' => 'Row Id', 'fd.fk_facture_fourn' => 'Invoice Id', 'fd.fk_product' => 'Product Id'];
-		$this->import_convertvalue_array[$r] = [
-			'fd.fk_facture_fourn' => ['rule' => 'fetchidfromref', 'file' => '/fourn/class/fournisseur.facture.class.php', 'class' => 'FactureFournisseur', 'method' => 'fetch'],
-		];
+		$this->import_updatekeys_array[$r] = array('fd.rowid' => 'Row Id', 'fd.fk_facture_fourn' => 'Invoice Id', 'fd.fk_product' => 'Product Id');
+		$this->import_convertvalue_array[$r] = array(
+			'fd.fk_facture_fourn' => array('rule' => 'fetchidfromref', 'file' => '/fourn/class/fournisseur.facture.class.php', 'class' => 'FactureFournisseur', 'method' => 'fetch'),
+		);
 
 		//Import Purchase Orders
 		$r++;
 		$this->import_code[$r] = 'commande_fournisseur_'.$r;
 		$this->import_label[$r] = 'SuppliersOrders';
 		$this->import_icon[$r] = $this->picto;
-		$this->import_entities_array[$r] = [];
-		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX.'commande_fournisseur', 'extra' => MAIN_DB_PREFIX.'commande_fournisseur_extrafields'];
-		$this->import_tables_creator_array[$r] = ['c' => 'fk_user_author']; // Fields to store import user id
-		$this->import_fields_array[$r] = [
-			'c.ref'               => 'Document Ref*',
+		$this->import_entities_array[$r] = array();
+		$this->import_tables_array[$r] = array('c' => MAIN_DB_PREFIX.'commande_fournisseur', 'extra' => MAIN_DB_PREFIX.'commande_fournisseur_extrafields');
+		$this->import_tables_creator_array[$r] = array('c' => 'fk_user_author'); // Fields to store import user id
+		$this->import_fields_array[$r] = array(
+			'c.ref'               => 'Ref*',
 			'c.ref_supplier'      => 'RefSupplier',
 			'c.fk_soc'            => 'ThirdPartyName*',
 			'c.fk_projet'         => 'ProjectId',
@@ -705,7 +724,7 @@ class modFournisseur extends DolibarrModules
 			'c.fk_cond_reglement' => 'Payment Condition',
 			'c.fk_mode_reglement' => 'Payment Mode',
 			'c.model_pdf'         => 'Model'
-		];
+		);
 
 		if (!empty($conf->multicurrency->enabled)) {
 			$this->import_fields_array[$r]['c.multicurrency_code']      = 'Currency';
@@ -730,40 +749,39 @@ class modFournisseur extends DolibarrModules
 		}
 		// End add extra fields
 
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commande_fournisseur'];
-		$this->import_regex_array[$r] = [
-			'c.ref' => '(PO\d{4}-\d{4}|PORDER.{1,32}$|PROV.{1,32}$)',
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commande_fournisseur');
+		$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_updatekeys_array[$r] = array('c.ref' => 'Ref');
+		$this->import_convertvalue_array[$r] = array(
+			'c.fk_soc' => array(
 				'rule'    => 'fetchidfromref',
 				'file'    => '/societe/class/societe.class.php',
 				'class'   => 'Societe',
 				'method'  => 'fetch',
 				'element' => 'ThirdParty'
-			],
-			'c.fk_mode_reglement' => [
+			),
+			'c.fk_mode_reglement' => array(
 				'rule' => 'fetchidfromcodeorlabel',
 				'file' => '/compta/paiement/class/cpaiement.class.php',
 				'class' => 'Cpaiement',
 				'method' => 'fetch',
 				'element' => 'cpayment'
-			],
-			'c.source' => ['rule' => 'zeroifnull'],
-		];
+			),
+			'c.source' => array('rule' => 'zeroifnull'),
+		);
 
-		//Import PO Lines
+		// Import PO Lines
 		$r++;
 		$this->import_code[$r] = 'commande_fournisseurdet_'.$r;
 		$this->import_label[$r] = 'PurchaseOrderLines';
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = array();
-		$this->import_tables_array[$r] = ['cd' => MAIN_DB_PREFIX.'commande_fournisseurdet', 'extra' => MAIN_DB_PREFIX.'commande_fournisseurdet_extrafields'];
-		$this->import_fields_array[$r] = [
-			'cd.fk_commande'    => 'Document Ref*',
+		$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_product'     => 'IdProduct',
 			'cd.label'          => 'Label',
@@ -783,7 +801,7 @@ class modFournisseur extends DolibarrModules
 			'cd.special_code'   => 'Special Code',
 			'cd.rang'           => 'LinePosition',
 			'cd.fk_unit'        => 'Unit'
-		];
+		);
 
 		if (!empty($conf->multicurrency->enabled)) {
 			$this->import_fields_array[$r]['cd.multicurrency_code'] = 'Currency';
@@ -805,24 +823,24 @@ class modFournisseur extends DolibarrModules
 		}
 		// End add extra fields
 
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commande_fournisseurdet'];
-		$this->import_regex_array[$r] = [
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commande_fournisseurdet');
+		$this->import_regex_array[$r] = array(
 			'cd.product_type'       => '[0|1]$',
 			'cd.fk_product'         => 'rowid@'.MAIN_DB_PREFIX.'product',
 			'cd.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'
-		];
-		$this->import_updatekeys_array[$r] = ['cd.fk_commande' => 'Purchase Order Id'];
-		$this->import_convertvalue_array[$r] = [
-			'cd.fk_commande' => [
+		);
+		$this->import_updatekeys_array[$r] = array('cd.fk_commande' => 'Purchase Order Id');
+		$this->import_convertvalue_array[$r] = array(
+			'cd.fk_commande' => array(
 				'rule'    => 'fetchidfromref',
 				'file'    => '/fourn/class/fournisseur.commande.class.php',
 				'class'   => 'CommandeFournisseur',
 				'method'  => 'fetch',
 				'element' => 'order_supplier'
-			],
-			'cd.info_bits' => ['rule' => 'zeroifnull'],
-			'cd.special_code' => ['rule' => 'zeroifnull'],
-		];
+			),
+			'cd.info_bits' => array('rule' => 'zeroifnull'),
+			'cd.special_code' => array('rule' => 'zeroifnull'),
+		);
 	}
 
 
@@ -857,8 +875,8 @@ class modFournisseur extends DolibarrModules
 		}
 
 		$sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'order_supplier' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','order_supplier',".$conf->entity.")",
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'order_supplier' AND entity = ".((int) $conf->entity),
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."', 'order_supplier', ".((int) $conf->entity).")",
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index a50b06201a2..3e75f8efcd5 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2015 Alexandre Spangaro <aspangaro@open-dsi.fr>
+/* Copyright (C) 2015-2021  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
@@ -13,25 +13,27 @@
  *
  * 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/modHRM.class.php
- * \ingroup HRM
- * \brief   Description and activation file for the module HRM
+ * \defgroup   HRM 	Module hrm
+ * \file       htdocs/core/modules/modHRM.class.php
+ * \ingroup    HRM
+ * \brief      Description and activation file for the module HRM
  */
 include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
 
+
 /**
- * Class to describe and activate the HRM module
+ *		Description and activation class for module HRM
  */
 class modHRM extends DolibarrModules
 {
 	/**
-	 * Constructor.
-	 * Define names, constants, directories, boxes, permissions
+	 *  Constructor. Define names, constants, directories, boxes, permissions
 	 *
-	 * @param 	DoliDB 	$db		Database handler
+	 *  @param	DoliDB	$db		Database handler
 	 */
 	public function __construct($db)
 	{
@@ -39,105 +41,234 @@ class modHRM extends DolibarrModules
 
 		$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 = 4000;
+		// Key text used to identify module (for permissions, menus, etc...)
 		$this->rights_class = 'hrm';
 
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
 		$this->family = "hr";
 		$this->module_position = '50';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
-		$this->description = "Management of employees carrier and feelings (department, employment contract)";
-
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+		$this->description = "HRM";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'experimental';
-
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		// Name of image file used for this module.
 		// 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 = 'hrm';
 
-		// define triggers
-		$this->module_parts = array();
+		// 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 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(),
+			// Set this to relative path of js file if module must load a js on all pages
+			'js' => array(),
 
-		// Data directories to create when module is enabled
-		$this->dirs = array();
+			// Set this to 1 if features of module are opened to external users
+			'moduleforexternal' => 0,
+		);
 
-		// Config pages
-		$this->config_page_url = array('admin_hrm.php@hrm');
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/hrm/temp","/hrm/subdir");
+		$this->dirs = array("/hrm/temp");
+
+		// Config pages. Put here list of php page, stored into hrm/admin directory, to use to setup module.
+		$this->config_page_url = array("hrm.php");
 
 		// Dependencies
 		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array(/*"modSalaries, modExpenseReport, modHoliday"*/); // List of module ids to disable if this one is disabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3, 9); // Minimum version of Dolibarr required by module
+		$this->need_dolibarr_version = array(11, 0); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("hrm");
 
+		// Constants
+		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',0),
+		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0) );
+		//                             2=>array('MAIN_MODULE_MYMODULE_NEEDSMARTY','chaine',1,'Constant to say module need smarty',0)
+		$this->const = array(); // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 0 or 'allentities')
+		$r = 0;
+
+
+		if (!isset($conf->hrm) || !isset($conf->hrm->enabled)) {
+			$conf->hrm = new stdClass();
+			$conf->hrm->enabled = 0;
+		}
+
+		// Array to add new pages in new tabs
+		$this->tabs = array();
+		$this->tabs[] = array('data'=>'user:+skill_tab:Skills:hrm:1:/hrm/skill_tab.php?id=__ID__&objecttype=user');  					// To add a new tab identified by code tabname1
+		//$this->tabs[] = array('data'=>'job:+tabname1:Poste:mylangfile@hrm:1:/hrm/poste_list.php?fk_job=__ID__');  					// To add a new tab identified by code tabname1
+		// Example:
+		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@hrm:$user->rights->hrm->read:/hrm/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@hrm:$user->rights->othermodule->read:/hrm/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();
 
-		// Constantes
-		$this->const = array();
-		$r = 0;
+		// Boxes/Widgets
+		// Add here list of php file(s) stored in hrm/core/boxes that contains a class to show a widget.
+		$this->boxes = array(
+			//  0 => array(
+			//      'file' => 'hrmwidget1.php@hrm',
+			//      'note' => 'Widget provided by HrmTest',
+			//      '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' => '/hrm/class/poste.class.php',
+			//      'objectname' => 'Poste',
+			//      'method' => 'doScheduledJob',
+			//      'parameters' => '',
+			//      'comment' => 'Comment',
+			//      'frequency' => 2,
+			//      'unitfrequency' => 3600,
+			//      'status' => 0,
+			//      'test' => '$conf->hrm->enabled',
+			//      'priority' => 50,
+			//  ),
+		);
 
-		// Boxes
-		$this->boxes = array();
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
 		$r = 0;
 
-		/*
-		$this->rights[$r][0] = 4001;
-		$this->rights[$r][1] = 'See employees';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'employee';
-		$this->rights[$r][5] = 'read';
+		// Skill / Job / Position
+		$this->rights[$r][0] = 4001; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read skill/job/position'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'all';
+		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->hrm->all->read)
 		$r++;
 
-		$this->rights[$r][0] = 4002;
-		$this->rights[$r][1] = 'Create employees';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'employee';
-		$this->rights[$r][5] = 'write';
+		$this->rights[$r][0] = 4002; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/modify skill/job/position'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'all';
+		$this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->hrm->all->write)
 		$r++;
 
-		$this->rights[$r][0] = 4003;
-		$this->rights[$r][1] = 'Delete employees';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'employee';
-		$this->rights[$r][5] = 'delete';
+		$this->rights[$r][0] = 4003; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Delete skill/job/position'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'all';
+		$this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->hrm->all->delete)
 		$r++;
 
-		$this->rights[$r][0] = 4004;
-		$this->rights[$r][1] = 'Export employees';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'employee';
-		$this->rights[$r][5] = 'export';
+		// Evaluation
+		$this->rights[$r][0] = 4020; // 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++;
-		*/
 
-		// Menus
-		//-------
-		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
+		$this->rights[$r][0] = 4021; // 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][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][1] = 'Delete 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] = 'delete'; // In php code, permission will be checked by test if ($user->rights->hrm->evaluation->delete)
+		$r++;
+
+		// Comparison
+		$this->rights[$r][0] = 4030; // 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++;
 	}
 
 	/**
-	 * 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
+	 *		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 Enabling module ('', 'noboxes')
-	 * @return int if OK, 0 if KO
+	 *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
 	{
 		// Permissions
 		$this->remove($options);
 
+		$result = $this->_load_tables('/install/mysql/tables/', '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')
+		}
+
 		$sql = array();
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 2d34cee5626..53f69dfefaf 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -135,6 +135,28 @@ class modHoliday extends DolibarrModules
 		//$r++;
 
 
+		// Cronjobs
+		$arraydate = dol_getdate(dol_now());
+		$datestart = dol_mktime(4, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
+		$this->cronjobs = array(
+			0 => array(
+				'label' => 'HolidayBalanceMonthlyUpdate',
+				'jobtype' => 'method',
+				'class' => 'holiday/class/holiday.class.php',
+				'objectname' => 'Holiday',
+				'method' => 'updateBalance',
+				'parameters' => '',
+				'comment' => 'Update holiday balance every month',
+				'frequency' => 1,
+				'unitfrequency' => 3600 * 24,
+				'priority' => 50,
+				'status' => 1,
+				'test' => '$conf->holiday->enabled',
+				'datestart' => $datestart
+			)
+		);
+
+
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
 		$r = 0;
@@ -177,7 +199,7 @@ class modHoliday extends DolibarrModules
 		$this->rights[$r][0] = 20005; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Create/modify leave requests for everybody'; // Permission label
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'writeall_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][4] = 'writeall'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
@@ -314,8 +336,8 @@ class modHoliday extends DolibarrModules
 		*/
 
 		$sql = array(
-		//	"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'holiday' AND entity = ".$conf->entity,
-		//	"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','holiday',".$conf->entity.")"
+			//	"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'holiday' AND entity = ".((int) $conf->entity),
+			//	"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','holiday',".((int) $conf->entity).")"
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modIntracommreport.class.php b/htdocs/core/modules/modIntracommreport.class.php
index 47ef889e2dd..817c893934b 100644
--- a/htdocs/core/modules/modIntracommreport.class.php
+++ b/htdocs/core/modules/modIntracommreport.class.php
@@ -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/tables/', '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 6d9bef40232..93b44f31204 100644
--- a/htdocs/core/modules/modKnowledgeManagement.class.php
+++ b/htdocs/core/modules/modKnowledgeManagement.class.php
@@ -1,7 +1,7 @@
 <?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) 2019-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2021 SuperAdmin
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
  * 	\defgroup   knowledgemanagement     Module KnowledgeManagement
  *  \brief      KnowledgeManagement module descriptor.
  *
- *  \file       htdocs/knowledgemanagement/core/modules/modKnowledgeManagement.class.php
+ *  \file       htdocs/core/modules/modKnowledgeManagement.class.php
  *  \ingroup    knowledgemanagement
  *  \brief      Description and activation file for module KnowledgeManagement
  */
@@ -68,7 +68,7 @@ class modKnowledgeManagement extends DolibarrModules
 		$this->descriptionlong = "Manage a Knowledge Management (KM) or Help-Desk base";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = 'experimental';
+		$this->version = 'dolibarr';
 		// Url to the file with your last numberversion of this module
 		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
 
@@ -317,7 +317,7 @@ class modKnowledgeManagement extends DolibarrModules
 			// Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 			'enabled'=>'$conf->knowledgemanagement->enabled',
 			// Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
-			'perms'=>'1',
+			'perms'=>'$user->rights->knowledgemanagement->knowledgerecord->read',
 			'target'=>'',
 			// 0=Menu for internal users, 1=external users, 2=both
 			'user'=>2,
@@ -337,7 +337,7 @@ class modKnowledgeManagement extends DolibarrModules
 			// Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 			'enabled'=>'$conf->knowledgemanagement->enabled',
 			// Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
-			'perms'=>'1',
+			'perms'=>'$user->rights->knowledgemanagement->knowledgerecord->read',
 			'target'=>'',
 			// 0=Menu for internal users, 1=external users, 2=both
 			'user'=>2,
@@ -357,11 +357,24 @@ class modKnowledgeManagement extends DolibarrModules
 			// Define condition to show or hide menu entry. Use '$conf->knowledgemanagement->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 			'enabled'=>'$conf->knowledgemanagement->enabled',
 			// Use 'perms'=>'$user->rights->knowledgemanagement->level1->level2' if you want your menu with a permission rules
-			'perms'=>'1',
+			'perms'=>'$user->rights->knowledgemanagement->knowledgerecord->write',
 			'target'=>'',
 			// 0=Menu for internal users, 1=external users, 2=both
 			'user'=>2
 		);
+		$this->menu[$r++] = array(
+			'fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=knowledgemanagement_knowledgerecord',
+			'type' => 'left',
+			'titre' => 'Categories',
+			'mainmenu' => 'ticket',
+			'url' => '/categories/index.php?type=13',
+			'langs' => 'knowledgemanagement',
+			'position' => 112,
+			'enabled' => '$conf->knowledgemanagement->enabled',
+			'perms' => '$user->rights->knowledgemanagement->knowledgerecord->read',
+			'target' => '',
+			'user' => 0
+		);
 
 		/* END MODULEBUILDER LEFTMENU KNOWLEDGERECORD */
 
@@ -429,7 +442,7 @@ class modKnowledgeManagement extends DolibarrModules
 	{
 		global $conf, $langs;
 
-		$result = $this->_load_tables('/knowledgemanagement/sql/');
+		$result = $this->_load_tables('/install/mysql/tables/', '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')
 		}
@@ -474,10 +487,10 @@ class modKnowledgeManagement extends DolibarrModules
 				}
 
 				$sql = array_merge($sql, array(
-					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard_".strtolower($myTmpObjectKey)."' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
-					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard_".strtolower($myTmpObjectKey)."','".strtolower($myTmpObjectKey)."',".$conf->entity.")",
-					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'generic_".strtolower($myTmpObjectKey)."_odt' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
-					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('generic_".strtolower($myTmpObjectKey)."_odt', '".strtolower($myTmpObjectKey)."', ".$conf->entity.")"
+					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard_".strtolower($myTmpObjectKey)."' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".((int) $conf->entity),
+					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard_".strtolower($myTmpObjectKey)."','".strtolower($myTmpObjectKey)."',".((int) $conf->entity).")",
+					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'generic_".strtolower($myTmpObjectKey)."_odt' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".((int) $conf->entity),
+					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('generic_".strtolower($myTmpObjectKey)."_odt', '".strtolower($myTmpObjectKey)."', ".((int) $conf->entity).")"
 				));
 			}
 		}
diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php
index b061e1b73a6..e19ec1b81f8 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/tables/', '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/modMrp.class.php b/htdocs/core/modules/modMrp.class.php
index eb3baae78cd..2bfc026d959 100644
--- a/htdocs/core/modules/modMrp.class.php
+++ b/htdocs/core/modules/modMrp.class.php
@@ -263,31 +263,78 @@ class modMrp extends DolibarrModules
 		/* BEGIN MODULEBUILDER TOPMENU */
 		/* END MODULEBUILDER LEFTMENU MO */
 
+		$langs->loadLangs(array("mrp", "stocks"));
+
 		// Exports profiles provided by this module
 		$r = 1;
-		/* BEGIN MODULEBUILDER EXPORT MO */
-		/*
-		$langs->load("mrp");
+
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='MoLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-		$this->export_icon[$r]='mo@mrp';
-		$keyforclass = 'Mo'; $keyforclassfile='/mymobule/class/mo.class.php'; $keyforelement='mo';
-		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
-		$keyforselect='mo'; $keyforaliasextra='extra'; $keyforelement='mo';
+		$this->export_label[$r]='MOs';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r]='mrp';
+		$this->export_fields_array[$r] = array(
+			'm.rowid'=>"Id",
+			'm.ref'=>"Ref",
+			'm.label'=>"Label",
+			'm.fk_project'=>'Project',
+			'm.fk_bom'=>"Bom",
+			'm.date_start_planned'=>"DateStartPlanned",
+			'm.date_end_planned'=>"DateEndPlanned",
+			'm.fk_product'=>"Product",
+			'm.status'=>'Status',
+			'm.model_pdf'=>'Model',
+			'm.fk_user_valid'=>'ValidatedById',
+			'm.fk_user_modif'=>'ModifiedById',
+			'm.fk_user_creat'=>'CreatedById',
+			'm.date_valid'=>'DateValidation',
+			'm.note_private'=>'NotePrivate',
+			'm.note_public'=>'Note',
+			'm.fk_soc'=>'Tiers',
+			'e.rowid'=>'WarehouseId',
+			'e.ref'=>'WarehouseRef',
+			'm.qty'=>'Qty',
+			'm.date_creation'=>'DateCreation',
+			'm.tms'=>'DateModification'
+		);
+		$keyforselect = 'mrp_mo';
+		$keyforelement = 'mrp_mo';
+		$keyforaliasextra = 'extra';
 		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.'mo as t';
-		$this->export_sql_end[$r] .=' WHERE 1 = 1';
-		$this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('mo').')';
-		$r++; */
-		/* END MODULEBUILDER EXPORT MO */
+		$this->export_TypeFields_array[$r] = array(
+			'm.ref'=>"Text",
+			'm.label'=>"Text",
+			'm.fk_project'=>'Numeric',
+			'm.fk_bom'=>"Numeric",
+			'm.date_end_planned'=>"Date",
+			'm.date_start_planned'=>"Date",
+			'm.fk_product'=>"Numeric",
+			'm.status'=>'Numeric',
+			'm.model_pdf'=>'Text',
+			'm.fk_user_valid'=>'Numeric',
+			'm.fk_user_modif'=>'Numeric',
+			'm.fk_user_creat'=>'Numeric',
+			'm.date_valid'=>'Date',
+			'm.note_private'=>'Text',
+			'm.note_public'=>'Text',
+			'm.fk_soc'=>'Numeric',
+			'e.fk_warehouse'=>'Numeric',
+			'e.ref'=>'Text',
+			'm.qty'=>'Numeric',
+			'm.date_creation'=>'Date',
+			'm.tms'=>'Date'
+
+		);
+		$this->export_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'mrp_mo as m';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'mrp_mo_extrafields as extra ON m.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as e ON e.rowid = m.fk_warehouse';
+		$this->export_sql_end[$r] .= ' WHERE m.entity IN ('.getEntity('mrp_mo').')'; // For product and service profile
 
 		// Imports profiles provided by this module
-		$r = 1;
+		$r = 0;
+		$langs->load("mrp");
 		/* BEGIN MODULEBUILDER IMPORT MO */
 		/*
-		 $langs->load("mrp");
 		 $this->export_code[$r]=$this->rights_class.'_'.$r;
 		 $this->export_label[$r]='MoLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		 $this->export_icon[$r]='mo@mrp';
@@ -302,6 +349,89 @@ class modMrp extends DolibarrModules
 		 $this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('mo').')';
 		 $r++; */
 		/* END MODULEBUILDER IMPORT MO */
+		$r++;
+		$this->import_code[$r]=$this->rights_class.'_'.$r;
+		$this->import_label[$r]='MOs';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->import_icon[$r]='mrp';
+		$this->import_entities_array[$r] = array(); // We define here only fields that use a different icon from the one defined in import_icon
+		$this->import_tables_array[$r] = array('m'=>MAIN_DB_PREFIX.'mrp_mo', 'extra'=>MAIN_DB_PREFIX.'mrp_mo_extrafields');
+		$this->import_tables_creator_array[$r] = array('m'=>'fk_user_creat'); // Fields to store import user id
+		$this->import_fields_array[$r] = array(
+			'm.ref' => "Ref*",
+			'm.label' => "Label*",
+			'm.fk_project'=>'Project',
+			'm.fk_bom'=>"Bom",
+			'm.date_start_planned'=>"DateStartPlanned",
+			'm.date_end_planned'=>"DateEndPlanned",
+			'm.fk_product'=>"Product*",
+			'm.status'=>'Status',
+			'm.model_pdf'=>'Model',
+			'm.fk_user_valid'=>'ValidatedById',
+			'm.fk_user_modif'=>'ModifiedById',
+			'm.fk_user_creat'=>'CreatedById',
+			'm.date_valid'=>'DateValid',
+			'm.note_private'=>'NotePrivate',
+			'm.note_public'=>'Note',
+			'm.fk_soc'=>'Tiers',
+			'm.fk_warehouse'=>'Warehouse',
+			'm.qty'=>'Qty*',
+			'm.date_creation'=>'DateCreation',
+			'm.tms'=>'DateModification',
+		);
+		$import_sample = array();
+
+		// Add extra fields
+		$import_extrafield_sample = array();
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'mrp_mo' 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.'mrp_mo');
+		/*$this->import_regex_array[$r] = array(
+			'm.ref' => ''
+		);*/
+
+		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
+		$this->import_updatekeys_array[$r] = array('m.ref' => 'Ref');
+		$this->import_convertvalue_array[$r] = array(
+			'm.fk_product' => array(
+				'rule'    => 'fetchidfromref',
+				'file'    => '/product/class/product.class.php',
+				'class'   => 'Product',
+				'method'  => 'fetch',
+				'element' => 'Product'
+			),
+			'm.fk_warehouse' => array(
+				'rule'    => 'fetchidfromref',
+				'file'    => '/product/stock/class/entrepot.class.php',
+				'class'   => 'Entrepot',
+				'method'  => 'fetch',
+				'element' => 'Warehouse'
+			),
+			'm.fk_user_valid' => array(
+				'rule'    => 'fetchidfromref',
+				'file'    => '/user/class/user.class.php',
+				'class'   => 'User',
+				'method'  => 'fetch',
+				'element' => 'user'
+			),
+			'm.fk_user_modif' => array(
+				'rule'    => 'fetchidfromref',
+				'file'    => '/user/class/user.class.php',
+				'class'   => 'User',
+				'method'  => 'fetch',
+				'element' => 'user'
+			),
+		);
 	}
 
 	/**
@@ -316,11 +446,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);
@@ -352,8 +477,8 @@ class modMrp extends DolibarrModules
 		}
 
 		$sql = array(
-			//"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('standard')."' AND type = 'mo' AND entity = ".$conf->entity,
-			//"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('standard')."', 'mo', ".$conf->entity.")"
+			//"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('standard')."' AND type = 'mo' AND entity = ".((int) $conf->entity),
+			//"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('standard')."', 'mo', ".((int) $conf->entity).")"
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
index 5bf91ec341e..bc7e044c7af 100644
--- a/htdocs/core/modules/modMultiCurrency.class.php
+++ b/htdocs/core/modules/modMultiCurrency.class.php
@@ -265,7 +265,6 @@ class modMultiCurrency extends DolibarrModules
 	{
 		$sql = array();
 
-		//$this->_load_tables('/multicurrency/sql/');
 		$res = $this->_init($sql, $options);
 
 		if ($res) {
@@ -300,10 +299,11 @@ class modMultiCurrency extends DolibarrModules
 	{
 		global $conf, $user, $langs;
 
-		if (!MultiCurrency::checkCodeAlreadyExists($conf->currency)) {
+		$multicurrency = new MultiCurrency($this->db);
+
+		if (!$multicurrency->checkCodeAlreadyExists($conf->currency)) {
 			$langs->loadCacheCurrencies('');
 
-			$multicurrency = new MultiCurrency($this->db);
 			$multicurrency->code = $conf->currency;
 			$multicurrency->name = $langs->cache_currencies[$conf->currency]['label'].' ('.$langs->getCurrencySymbol($conf->currency).')';
 			$r = $multicurrency->create($user);
diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index d7041eca754..516c2b41e13 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -1,7 +1,7 @@
 <?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) 2019-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2021 Dorian Laurent <i.merraha@sofimedmaroc.com>
  * Copyright (C) 2021 NextGestion <contact@nextgestion.com>
  *
@@ -23,7 +23,7 @@
  * 	\defgroup   partnership     Module Partnership
  *  \brief      Partnership module descriptor.
  *
- *  \file       htdocs/partnership/core/modules/modPartnership.class.php
+ *  \file       htdocs/core/modules/modPartnership.class.php
  *  \ingroup    partnership
  *  \brief      Description and activation file for module Partnership
  */
@@ -408,7 +408,7 @@ class modPartnership extends DolibarrModules
 	{
 		global $conf, $langs;
 
-		$result = $this->_load_tables('/partnership/sql/');
+		$result = $this->_load_tables('/install/mysql/tables/', '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')
 		}
@@ -453,10 +453,10 @@ class modPartnership extends DolibarrModules
 				}
 
 				$sql = array_merge($sql, array(
-					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard_".strtolower($myTmpObjectKey)."' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
-					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard_".strtolower($myTmpObjectKey)."','".strtolower($myTmpObjectKey)."',".$conf->entity.")",
-					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'generic_".strtolower($myTmpObjectKey)."_odt' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
-					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('generic_".strtolower($myTmpObjectKey)."_odt', '".strtolower($myTmpObjectKey)."', ".$conf->entity.")"
+					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard_".strtolower($myTmpObjectKey)."' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".((int) $conf->entity),
+					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard_".strtolower($myTmpObjectKey)."','".strtolower($myTmpObjectKey)."',".((int) $conf->entity).")",
+					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'generic_".strtolower($myTmpObjectKey)."_odt' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".((int) $conf->entity),
+					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('generic_".strtolower($myTmpObjectKey)."_odt', '".strtolower($myTmpObjectKey)."', ".((int) $conf->entity).")"
 				));
 			}
 		}
diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php
index 8d68b372e91..a42d3c8b5a0 100644
--- a/htdocs/core/modules/modPrelevement.class.php
+++ b/htdocs/core/modules/modPrelevement.class.php
@@ -145,8 +145,8 @@ class modPrelevement extends DolibarrModules
 		$this->remove($options);
 
 		$sql = array(
-			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'bankaccount' AND entity = ".$conf->entity,
-			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','bankaccount',".$conf->entity.")",
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'bankaccount' AND entity = ".((int) $conf->entity),
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','bankaccount',".((int) $conf->entity).")",
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php
index 4c104b30ecf..c9e99b3d933 100644
--- a/htdocs/core/modules/modPrinting.class.php
+++ b/htdocs/core/modules/modPrinting.class.php
@@ -34,7 +34,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modPrinting extends DolibarrModules
 {
-
 	/**
 	 *  Constructor
 	 *
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 5e51dd0344d..d1c1906d4a6 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -322,7 +322,7 @@ class modProduct extends DolibarrModules
 			$this->export_code[$r] = $this->rights_class.'_'.$r;
 			$this->export_label[$r] = "ProductsMultiPrice"; // Translation key (used only if key ExportDataset_xxx_z not found)
 			$this->export_permission[$r] = array(array("produit", "export"));
-			$this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref",
+			$this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref", 'p.label'=>"Label",
 				'pr.price_base_type'=>"PriceBase", 'pr.price_level'=>"PriceLevel",
 				'pr.price'=>"PriceLevelUnitPriceHT", 'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
 				'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
@@ -337,7 +337,7 @@ class modProduct extends DolibarrModules
 			//	'p.price_base_type'=>"Text",'p.price'=>"Numeric",'p.price_ttc'=>"Numeric",'p.tva_tx'=>'Numeric','p.tosell'=>"Boolean",'p.tobuy'=>"Boolean",
 			//	'p.datec'=>'Date','p.tms'=>'Date'
 			//);
-			$this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product",
+			$this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product", 'p.label'=>"Label",
 				'pr.price_base_type'=>"product", 'pr.price_level'=>"product", 'pr.price'=>"product",
 				'pr.price_ttc'=>"product",
 				'pr.price_min'=>"product", 'pr.price_min_ttc'=>"product",
@@ -348,6 +348,8 @@ class modProduct extends DolibarrModules
 			$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_price as pr ON p.rowid = pr.fk_product AND pr.entity = '.$conf->entity; // export prices only for the current entity
 			$this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
+			$this->export_sql_end[$r] .= ' AND pr.date_price = (SELECT MAX(pr2.date_price) FROM '.MAIN_DB_PREFIX.'product_price as pr2 WHERE pr2.fk_product = pr.fk_product AND pr2.entity IN ('.getEntity('product').'))'; // export only latest prices not full history
+			$this->export_sql_end[$r] .= ' ORDER BY p.ref, pr.price_level';
 		}
 
 		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
@@ -356,7 +358,7 @@ class modProduct extends DolibarrModules
 			$this->export_code[$r] = $this->rights_class.'_'.$r;
 			$this->export_label[$r] = "ProductsPricePerCustomer"; // Translation key (used only if key ExportDataset_xxx_z not found)
 			$this->export_permission[$r] = array(array("produit", "export"));
-			$this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref",
+			$this->export_fields_array[$r] = array('p.rowid'=>"Id", 'p.ref'=>"Ref", 'p.label'=>"Label",
 				's.nom'=>'ThirdParty',
 				'pr.price_base_type'=>"PriceBase",
 				'pr.price'=>"PriceUnitPriceHT", 'pr.price_ttc'=>"PriceUnitPriceTTC",
@@ -367,7 +369,7 @@ class modProduct extends DolibarrModules
 			if (is_object($mysoc) && $usenpr) {
 				$this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
 			}
-			$this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product",
+			$this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product", 'p.label'=>"Label",
 				's.nom'=>'company',
 				'pr.price_base_type'=>"product", 'pr.price'=>"product",
 				'pr.price_ttc'=>"product",
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index c4124ee7c24..08eb3c58adc 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -366,12 +366,12 @@ class modProjet extends DolibarrModules
 		}
 
 		$sql = array();
-		$sql[] = "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[3][2])."' AND type = 'task' AND entity = ".$conf->entity;
-		$sql[] = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[3][2])."','task',".$conf->entity.")";
-		$sql[] = "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'beluga' AND type = 'project' AND entity = ".$conf->entity;
-		$sql[] = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('beluga','project',".$conf->entity.")";
-		$sql[] = "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'baleine' AND type = 'project' AND entity = ".$conf->entity;
-		$sql[] = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('baleine','project',".$conf->entity.")";
+		$sql[] = "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[3][2])."' AND type = 'task' AND entity = ".((int) $conf->entity);
+		$sql[] = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[3][2])."','task',".((int) $conf->entity).")";
+		$sql[] = "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'beluga' AND type = 'project' AND entity = ".((int) $conf->entity);
+		$sql[] = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('beluga','project',".((int) $conf->entity).")";
+		$sql[] = "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'baleine' AND type = 'project' AND entity = ".((int) $conf->entity);
+		$sql[] = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('baleine','project',".((int) $conf->entity).")";
 
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 3ae994ec4b6..4f0633cd578 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -204,6 +204,13 @@ class modPropale extends DolibarrModules
 			$this->export_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
 			$this->export_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
+		// Add multicompany field
+		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
+			$nbofallowedentities = count(explode(',', getEntity('propal')));
+			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) {
+				$this->export_fields_array[$r]['c.entity'] = 'Entity';
+			}
+		}
 		//$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.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",
@@ -216,7 +223,8 @@ class modPropale extends DolibarrModules
 			'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',
 			'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'
+			'cd.total_tva'=>"Numeric", 'cd.total_ttc'=>"Numeric", 'p.ref'=>'Text', 'p.label'=>'Text',
+			'c.entity'=>'List:entity:label:rowid',
 		);
 		$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',
@@ -276,10 +284,10 @@ class modPropale extends DolibarrModules
 		$this->import_label[$r] = 'Proposals'; // 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] = ['c' => MAIN_DB_PREFIX.'propal', 'extra' => MAIN_DB_PREFIX.'propal_extrafields'];
-		$this->import_tables_creator_array[$r] = ['c'=>'fk_user_author']; // Fields to store import user id
-		$this->import_fields_array[$r] = [
-			'c.ref' => 'Document Ref*',
+		$this->import_tables_array[$r] = array('c' => MAIN_DB_PREFIX.'propal', 'extra' => MAIN_DB_PREFIX.'propal_extrafields');
+		$this->import_tables_creator_array[$r] = array('c'=>'fk_user_author'); // Fields to store import user id
+		$this->import_fields_array[$r] = array(
+			'c.ref' => 'Ref*',
 			'c.ref_client' => 'RefCustomer',
 			'c.fk_soc' => 'ThirdPartyName*',
 			'c.datec' => 'DateCreation',
@@ -292,7 +300,7 @@ class modPropale extends DolibarrModules
 			'c.note_public' => 'Note',
 			'c.date_livraison' => 'DeliveryDate',
 			'c.fk_user_valid' => 'ValidatedById'
-		];
+		);
 		if (!empty($conf->multicurrency->enabled)) {
 			$this->import_fields_array[$r]['c.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
@@ -353,12 +361,12 @@ class modPropale extends DolibarrModules
 		$this->import_label[$r] = "ProposalLines"; // 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] = [
+		$this->import_tables_array[$r] = array(
 			'cd' => MAIN_DB_PREFIX.'propaldet',
 			'extra' => MAIN_DB_PREFIX.'propaldet_extrafields'
-		];
-		$this->import_fields_array[$r] = [
-			'cd.fk_propal' => 'Document Ref*',
+		);
+		$this->import_fields_array[$r] = array(
+			'cd.fk_propal' => 'Proposal*',
 			'cd.fk_parent_line' => 'PrParentLine',
 			'cd.fk_product' => 'IdProduct',
 			'cd.label' => 'Label',
@@ -376,7 +384,7 @@ class modPropale extends DolibarrModules
 			'cd.date_start' => 'Start Date',
 			'cd.date_end' => 'End Date',
 			'cd.buy_price_ht' => 'LineBuyPriceHT'
-		];
+		);
 		if (!empty($conf->multicurrency->enabled)) {
 			$this->import_fields_array[$r]['cd.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['cd.multicurrency_subprice'] = 'CurrencyRate';
@@ -397,9 +405,9 @@ class modPropale extends DolibarrModules
 			}
 		}
 		// End add extra fields
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'propaldet'];
-		$this->import_regex_array[$r] = ['cd.product_type' => '[0|1]$'];
-		$import_sample = [
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'propaldet');
+		$this->import_regex_array[$r] = array('cd.product_type' => '[0|1]$');
+		$import_sample = array(
 			'cd.fk_propal' => 'PROV(0001)',
 			'cd.fk_parent_line' => '',
 			'cd.fk_product' => '',
@@ -423,17 +431,17 @@ class modPropale extends DolibarrModules
 			'cd.multicurrency_total_ht' => '10000',
 			'cd.multicurrency_total_tva' => '0',
 			'cd.multicurrency_total_ttc' => '10100'
-		];
+		);
 		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
-		$this->import_updatekeys_array[$r] = ['cd.fk_propal' => 'Quotation Id', 'cd.fk_product' => 'Product Id'];
-		$this->import_convertvalue_array[$r] = [
-			'cd.fk_propal' => [
+		$this->import_updatekeys_array[$r] = array('cd.fk_propal' => 'Quotation Id', 'cd.fk_product' => 'Product Id');
+		$this->import_convertvalue_array[$r] = array(
+			'cd.fk_propal' => array(
 				'rule'=>'fetchidfromref',
 				'file'=>'/comm/propal/class/propal.class.php',
 				'class'=>'Propal',
 				'method'=>'fetch'
-			]
-		];
+			)
+		);
 	}
 
 
@@ -469,8 +477,8 @@ class modPropale extends DolibarrModules
 		}
 
 		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'propal' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','propal',".$conf->entity.")",
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'propal' AND entity = ".((int) $conf->entity),
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','propal',".((int) $conf->entity).")",
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index ee87f4c57ba..1e26de93bcb 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -133,6 +133,7 @@ class modReceiptPrinter extends DolibarrModules
 	public function init($options = '')
 	{
 		global $conf, $langs;
+
 		// Clean before activation
 		$this->remove($options);
 
@@ -140,8 +141,8 @@ class modReceiptPrinter extends DolibarrModules
 		$sql = array(
 			"CREATE TABLE IF NOT EXISTS ".MAIN_DB_PREFIX."printer_receipt (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), fk_type integer, fk_profile integer, parameter varchar(128), entity integer) ENGINE=innodb;",
 			"CREATE TABLE IF NOT EXISTS ".MAIN_DB_PREFIX."printer_receipt_template (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), template text, entity integer) ENGINE=innodb;",
-			"DELETE FROM ".MAIN_DB_PREFIX."printer_receipt_template WHERE name = '".$langs->trans('Example')."';",
-			"INSERT INTO ".MAIN_DB_PREFIX."printer_receipt_template (name,template,entity) VALUES ('".$langs->trans('Example')."', '".$templateexample."', 1);",
+			"DELETE FROM ".MAIN_DB_PREFIX."printer_receipt_template WHERE name = '".$this->db->escape($langs->trans('Example'))."';",
+			"INSERT INTO ".MAIN_DB_PREFIX."printer_receipt_template (name,template,entity) VALUES ('".$this->db->escape($langs->trans('Example'))."', '".$this->db->escape($templateexample)."', 1);",
 		);
 		return $this->_init($sql, $options);
 	}
diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php
index 02f17cf0fbe..29c10ccb3e5 100644
--- a/htdocs/core/modules/modReception.class.php
+++ b/htdocs/core/modules/modReception.class.php
@@ -47,7 +47,7 @@ class modReception extends DolibarrModules
 		$this->module_position = '40';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
-		$this->description = "Gestion des réceptions fournisseurs";
+		$this->description = "ReceptionDescription";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
@@ -282,8 +282,8 @@ class modReception extends DolibarrModules
 		$sql = array();
 
 		$sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'reception' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','reception',".$conf->entity.")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'reception' AND entity = ".((int) $conf->entity),
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','reception',".((int) $conf->entity).")",
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modRecruitment.class.php b/htdocs/core/modules/modRecruitment.class.php
index 3d4e88872ef..c4bbd573fa9 100644
--- a/htdocs/core/modules/modRecruitment.class.php
+++ b/htdocs/core/modules/modRecruitment.class.php
@@ -1,7 +1,7 @@
 <?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) 2019-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
@@ -21,7 +21,7 @@
  * 	\defgroup   recruitment     Module Recruitment
  *  \brief      Recruitment module descriptor.
  *
- *  \file       htdocs/recruitment/core/modules/modRecruitment.class.php
+ *  \file       htdocs/core/modules/modRecruitment.class.php
  *  \ingroup    recruitment
  *  \brief      Description and activation file for the module Recruitment
  */
@@ -403,7 +403,7 @@ class modRecruitment extends DolibarrModules
 	{
 		global $conf, $langs;
 
-		$result = $this->_load_tables('/recruitment/sql/');
+		$result = $this->_load_tables('/install/mysql/tables/', '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')
 		}
@@ -448,10 +448,10 @@ class modRecruitment extends DolibarrModules
 				}
 
 				$sql = array_merge($sql, array(
-					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard_".strtolower($myTmpObjectKey)."' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
-					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard_".strtolower($myTmpObjectKey)."','".strtolower($myTmpObjectKey)."',".$conf->entity.")",
-					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'generic_".strtolower($myTmpObjectKey)."_odt' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
-					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('generic_".strtolower($myTmpObjectKey)."_odt', '".strtolower($myTmpObjectKey)."', ".$conf->entity.")"
+					"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..51117868e35 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -301,21 +301,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/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 2d1c9285582..a733484d043 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -197,6 +197,13 @@ class modSociete extends DolibarrModules
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'export';
 
+		$r++;
+		$this->rights[$r][0] = 130;
+		$this->rights[$r][1] = 'Modify thirdparty information payment';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'thirdparty_paymentinformation_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][5] = 'write';
+
 		// 262 : Restrict access to sales representative
 		$r++;
 		$this->rights[$r][0] = 262;
@@ -320,7 +327,7 @@ class modSociete extends DolibarrModules
 			'payterm.libelle'=>'Text', 'paymode.libelle'=>'Text',
 			's.outstanding_limit'=>'Numeric', 'pbacc.ref'=>'Text', 'incoterm.code'=>'Text',
 			'u.login'=>'Text', 'u.firstname'=>'Text', 'u.lastname'=>'Text',
-			's.entity'=>'Numeric', 's.price_level'=>'Numeric',
+			's.entity'=>'List:entity:label:rowid', 's.price_level'=>'Numeric',
 			's.accountancy_code_sell'=>'Text', 's.accountancy_code_buy'=>'Text'
 		);
 
@@ -344,7 +351,7 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as incoterm ON s.fk_incoterms = incoterm.rowid';
 		$this->export_sql_end[$r] .= ' WHERE s.entity IN ('.getEntity('societe').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) {
-			$this->export_sql_end[$r] .= ' AND (sc.fk_user = '.$user->id.' ';
+			$this->export_sql_end[$r] .= ' AND (sc.fk_user = '.((int) $user->id).' ';
 			if (!empty($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS)) {
 				$subordinatesids = $user->getAllChildIds();
 				$this->export_sql_end[$r] .= count($subordinatesids) > 0 ? ' OR (sc.fk_user IN ('.$this->db->sanitize(implode(',', $subordinatesids)).')' : '';
@@ -369,6 +376,20 @@ class modSociete extends DolibarrModules
 			's.address'=>'Address', 's.zip'=>"Zip", 's.town'=>"Town", 's.phone'=>'Phone', 's.email'=>"Email",
 			't.libelle'=>"ThirdPartyType"
 		);
+		// Add multicompany field
+		if (! empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
+			if (!empty($conf->multicompany->enabled)) {
+				$nbofallowedentities = count(explode(',', getEntity('socpeople')));
+				if ($nbofallowedentities > 1) {
+					$this->export_fields_array[$r]['c.entity'] = 'Entity';
+				}
+
+				$nbofallowedentities = count(explode(',', getEntity('societe')));
+				if ($nbofallowedentities > 1) {
+					$this->export_fields_array[$r]['s.entity'] = 'Entity';
+				}
+			}
+		}
 		$this->export_examplevalues_array[$r] = array('s.client'=>'0 (no customer no prospect)/1 (customer)/2 (prospect)/3 (customer and prospect)', 's.fournisseur'=>'0 (not a supplier) or 1 (supplier)');
 		$this->export_TypeFields_array[$r] = array(
 			'c.civility'=>"List:c_civility:label:code", 'c.lastname'=>'Text', 'c.firstname'=>'Text', 'c.poste'=>'Text', 'c.datec'=>"Date", 'c.priv'=>"Boolean",
@@ -379,14 +400,17 @@ class modSociete extends DolibarrModules
 			'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",
-			't.libelle'=>"Text"
+			't.libelle'=>"Text",
+			'c.entity'=>'List:entity:label:rowid',
+			's.entity'=>'List:entity:label:rowid',
 		);
 		$this->export_entities_array[$r] = array(
 			's.rowid'=>"company", 's.nom'=>"company", 's.status'=>'company', 's.code_client'=>"company", 's.code_fournisseur'=>"company",
 			's.code_compta'=>"company", 's.code_compta_fournisseur'=>"company",
 			's.client'=>"company", 's.fournisseur'=>"company",
 			's.address'=>"company", 's.zip'=>"company", 's.town'=>"company", 's.phone'=>"company", 's.email'=>"company",
-			't.libelle'=>"company"
+			't.libelle'=>"company",
+			's.entity'=>'company',
 		); // We define here only fields that use another picto
 		if (empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
 			unset($this->export_fields_array[$r]['s.code_fournisseur']);
@@ -414,7 +438,7 @@ class modSociete extends DolibarrModules
 		$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').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) {
-			$this->export_sql_end[$r] .= ' AND (sc.fk_user = '.$user->id.' ';
+			$this->export_sql_end[$r] .= ' AND (sc.fk_user = '.((int) $user->id).' ';
 			if (!empty($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS)) {
 				$subordinatesids = $user->getAllChildIds();
 				$this->export_sql_end[$r] .= count($subordinatesids) > 0 ? ' OR (sc.fk_user IN ('.$this->db->sanitize(implode(',', $subordinatesids)).')' : '';
@@ -757,7 +781,7 @@ class modSociete extends DolibarrModules
 			'sr.bank' => "Bank",
 			'sr.code_banque' => "BankCode",
 			'sr.code_guichet' => "DeskCode",
-			'sr.number' => "BankAccountNumber*",
+			'sr.number' => "BankAccountNumber",
 			'sr.cle_rib' => "BankAccountNumberKey",
 			'sr.bic' => "BIC",
 			'sr.iban_prefix' => "IBAN",
@@ -766,6 +790,7 @@ class modSociete extends DolibarrModules
 			'sr.owner_address' => "BankAccountOwnerAddress",
 			'sr.default_rib' => 'Default',
 			'sr.rum' => 'RUM',
+			'sr.frstrecur' => "WithdrawMode",
 			'sr.type' => "Type ban is defaut",
 		);
 
@@ -797,6 +822,7 @@ class modSociete extends DolibarrModules
 			'sr.owner_address' => 'address of account holder',
 			'sr.default_rib' => '1 (default account) / 0 (not default)',
 			'sr.rum' => 'RUM code',
+			'sr.frstrecur' => 'FRST',
 			'sr.type' => 'ban',
 		);
 
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 3a62b9953fa..839a62325f3 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -35,7 +35,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modStock extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -236,19 +235,22 @@ class modStock extends DolibarrModules
 			'p.rowid'=>"ProductId", 'p.ref'=>"Ref", 'p.fk_product_type'=>"Type", 'p.label'=>"Label", 'p.description'=>"Description", 'p.note'=>"Note",
 			'p.price'=>"Price", 'p.tva_tx'=>'VAT', 'p.tosell'=>"OnSell", 'p.tobuy'=>'OnBuy', 'p.duration'=>"Duration",
 			'p.datec'=>'DateCreation', 'p.tms'=>'DateModification', 'p.pmp'=>'PMPValue', 'p.cost_price'=>'CostPrice',
+			'p.seuil_stock_alerte'=>'StockLimit',
 		);
 		$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.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'
+			'ps.reel'=>'Numeric',
+			'p.seuil_stock_alerte'=>'Numeric',
 		);
 		$this->export_entities_array[$r] = array(
 			'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product", 'p.note'=>"product",
 			'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product",
 			'p.datec'=>'product', 'p.tms'=>'product', 'p.pmp'=>'product', 'p.cost_price'=>'product',
-			'ps.reel'=>'stock'
+			'ps.reel'=>'stock',
+			'p.seuil_stock_alerte'=>'product',
 		);	// We define here only fields that use another icon that the one defined into export_icon
 		$this->export_aggregate_array[$r] = array('ps.reel'=>'SUM'); // TODO Not used yet
 		$this->export_dependencies_array[$r] = array('stock'=>array('p.rowid', 'e.rowid')); // We must keep this until the aggregate_array is used. To have a unique key, if we ask a field of a child, to avoid the DISTINCT to discard them.
@@ -432,6 +434,11 @@ class modStock extends DolibarrModules
 	{
 		global $conf, $langs;
 
+		$result = $this->_load_tables('/install/mysql/tables/', '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);
 
@@ -454,10 +461,10 @@ class modStock extends DolibarrModules
 		$sql = array();
 
 		$sql = array(
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'stock' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."','stock',".$conf->entity.")",
-			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[2][2])."' AND type = 'mouvement' AND entity = ".$conf->entity,
-			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[2][2])."','mouvement',".$conf->entity.")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[1][2])."' AND type = 'stock' AND entity = ".((int) $conf->entity),
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[1][2])."','stock',".((int) $conf->entity).")",
+			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[2][2])."' AND type = 'mouvement' AND entity = ".((int) $conf->entity),
+			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[2][2])."','mouvement',".((int) $conf->entity).")",
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index 4a0fc21fa44..36df0dd27bd 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -179,8 +179,8 @@ class modSupplierProposal extends DolibarrModules
 		}
 
 		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'supplier_proposal' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','supplier_proposal',".$conf->entity.")",
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'supplier_proposal' AND entity = ".((int) $conf->entity),
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','supplier_proposal',".((int) $conf->entity).")",
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index 5cb7a7f0c38..6c7d43a8388 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -283,8 +283,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 b78125753b2..01561b40b01 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -137,19 +137,19 @@ class modTicket extends DolibarrModules
 			'tabsql' => array(
 				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_type as f',
 				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_severity as f',
-				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default, f.public FROM '.MAIN_DB_PREFIX.'c_ticket_category as f',
+				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default, f.public, f.fk_parent FROM '.MAIN_DB_PREFIX.'c_ticket_category as f',
 				'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_resolution as f'
 			),
 			'tabsqlsort' => array("pos ASC", "pos ASC", "pos ASC", "pos ASC"),
-			'tabfield' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public", "code,label,pos,use_default"),
-			'tabfieldvalue' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public", "code,label,pos,use_default"),
-			'tabfieldinsert' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public", "code,label,pos,use_default"),
+			'tabfield' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public,fk_parent", "code,label,pos,use_default"),
+			'tabfieldvalue' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public,fk_parent", "code,label,pos,use_default"),
+			'tabfieldinsert' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default,public,fk_parent", "code,label,pos,use_default"),
 			'tabrowid' => array("rowid", "rowid", "rowid", "rowid"),
 			'tabcond' => array($conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled && !empty($conf->global->TICKET_ENABLE_RESOLUTION)),
 			'tabhelp' => array(
 				array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")),
 				array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")),
-				array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1"), 'public'=>$langs->trans("Enter0or1").'<br>'.$langs->trans("TicketGroupIsPublicDesc")),
+				array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1"), 'public'=>$langs->trans("Enter0or1").'<br>'.$langs->trans("TicketGroupIsPublicDesc"), 'fk_parent'=>$langs->trans("IfThisCategoryIsChildOfAnother")),
 				array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1"))
 			),
 		);
@@ -293,6 +293,19 @@ class modTicket extends DolibarrModules
 			'target' => '',
 			'user' => 0);
 		$r++;
+
+		$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
+			'type' => 'left',
+			'titre' => 'Categories',
+			'mainmenu' => 'ticket',
+			'url' => '/categories/index.php?type=12',
+			'langs' => 'ticket',
+			'position' => 107,
+			'enabled' => '$conf->categorie->enabled',
+			'perms' => '$user->rights->ticket->read',
+			'target' => '',
+			'user' => 0);
+		$r++;
 	}
 
 	/**
@@ -331,8 +344,8 @@ class modTicket extends DolibarrModules
 			array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110121, 'ticket',  'internal', 'CONTRIBUTOR', 'Intervenant', 1);", "ignoreerror" => 1),
 			array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110122, 'ticket',  'external', 'SUPPORTCLI', 'Contact client suivi incident', 1);", "ignoreerror" => 1),
 			array("sql" => "insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (110123, 'ticket',  'external', 'CONTRIBUTOR', 'Intervenant', 1);", "ignoreerror" => 1),
-			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'TICKET_ADDON_PDF_ODT_PATH' AND type = 'ticket' AND entity = ".$conf->entity,
-			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('TICKET_ADDON_PDF_ODT_PATH','ticket',".$conf->entity.")"
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'TICKET_ADDON_PDF_ODT_PATH' AND type = 'ticket' AND entity = ".((int) $conf->entity),
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('TICKET_ADDON_PDF_ODT_PATH','ticket',".((int) $conf->entity).")"
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index c4043779c64..f77f1dacedf 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -49,7 +49,7 @@ class modUser extends DolibarrModules
 		$this->module_position = '05';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
-		$this->description = "Gestion des utilisateurs (requis)";
+		$this->description = "Management of users and groups of users (mandatory)";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
@@ -90,7 +90,7 @@ class modUser extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 251;
-		$this->rights[$r][1] = 'Consulter les autres utilisateurs';
+		$this->rights[$r][1] = 'Read information of other users, groups and permissions';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'user';
@@ -98,15 +98,15 @@ class modUser extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 252;
-		$this->rights[$r][1] = 'Consulter les permissions des autres utilisateurs';
+		$this->rights[$r][1] = 'Read permissions of other users';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'user_advance';
+		$this->rights[$r][4] = 'user_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'readperms';
 
 		$r++;
 		$this->rights[$r][0] = 253;
-		$this->rights[$r][1] = 'Creer/modifier utilisateurs internes et externes';
+		$this->rights[$r][1] = 'Create/modify internal and external users, groups and permissions';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'user';
@@ -114,15 +114,15 @@ class modUser extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 254;
-		$this->rights[$r][1] = 'Creer/modifier utilisateurs externes seulement';
+		$this->rights[$r][1] = 'Create/modify external users only';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'user_advance';
+		$this->rights[$r][4] = 'user_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'write';
 
 		$r++;
 		$this->rights[$r][0] = 255;
-		$this->rights[$r][1] = 'Modifier le mot de passe des autres utilisateurs';
+		$this->rights[$r][1] = 'Modify the password of other users';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'user';
@@ -130,7 +130,7 @@ class modUser extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 256;
-		$this->rights[$r][1] = 'Supprimer ou desactiver les autres utilisateurs';
+		$this->rights[$r][1] = 'Delete or disable other users';
 		$this->rights[$r][2] = 'd';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'user';
@@ -138,7 +138,7 @@ class modUser extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 341;
-		$this->rights[$r][1] = 'Consulter ses propres permissions';
+		$this->rights[$r][1] = 'Read its own permissions';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'self_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
@@ -146,7 +146,7 @@ class modUser extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 342;
-		$this->rights[$r][1] = 'Creer/modifier ses propres infos utilisateur';
+		$this->rights[$r][1] = 'Create/modify of its own user';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'self';
@@ -154,7 +154,7 @@ class modUser extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 343;
-		$this->rights[$r][1] = 'Modifier son propre mot de passe';
+		$this->rights[$r][1] = 'Modify its own password';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'self';
@@ -162,7 +162,7 @@ class modUser extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 344;
-		$this->rights[$r][1] = 'Modifier ses propres permissions';
+		$this->rights[$r][1] = 'Modify its own permissions';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'self_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
@@ -170,7 +170,7 @@ class modUser extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 351;
-		$this->rights[$r][1] = 'Consulter les groupes';
+		$this->rights[$r][1] = 'Read groups';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'group_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
@@ -178,7 +178,7 @@ class modUser extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 352;
-		$this->rights[$r][1] = 'Consulter les permissions des groupes';
+		$this->rights[$r][1] = 'Read permissions of groups';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'group_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
@@ -186,7 +186,7 @@ class modUser extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 353;
-		$this->rights[$r][1] = 'Creer/modifier les groupes et leurs permissions';
+		$this->rights[$r][1] = 'Create/modify groups and permissions';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'group_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
@@ -194,7 +194,7 @@ class modUser extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 354;
-		$this->rights[$r][1] = 'Supprimer ou desactiver les groupes';
+		$this->rights[$r][1] = 'Delete groups';
 		$this->rights[$r][2] = 'd';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'group_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
@@ -202,7 +202,7 @@ class modUser extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 358;
-		$this->rights[$r][1] = 'Exporter les utilisateurs';
+		$this->rights[$r][1] = 'Export all users';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'user';
diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index fbf7927ed1c..4122f347664 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -87,10 +87,13 @@ class modWorkflow extends DolibarrModules
 			0=>array('WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL', 0, 'current', 0),
 			1=>array('WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL', 'chaine', '1', 'WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL', 0, 'current', 0),
 			2=>array('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING', 0, 'current', 0),
+			3=>array('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED', 0, 'current', 0),
 			4=>array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER', 0, 'current', 0),
 			5=>array('WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL', 0, 'current', 0),
-			6=>array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 0, 'current', 0),
-			7=>array('WORKFLOW_BILL_ON_RECEPTION', 'chaine', '1', 'WORKFLOW_BILL_ON_RECEPTION', 0, 'current', 0)
+			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)
 		);
 
 		// Boxes
diff --git a/htdocs/core/modules/modWorkstation.class.php b/htdocs/core/modules/modWorkstation.class.php
old mode 100755
new mode 100644
index 8e2d676bf27..854dd45b969
--- a/htdocs/core/modules/modWorkstation.class.php
+++ b/htdocs/core/modules/modWorkstation.class.php
@@ -1,7 +1,7 @@
 <?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) 2019-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020 		Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
  * 	\defgroup   workstation     Module Workstation
  *  \brief      Workstation module descriptor.
  *
- *  \file       htdocs/workstation/core/modules/modWorkstation.class.php
+ *  \file       htdocs/core/modules/modWorkstation.class.php
  *  \ingroup    workstation
  *  \brief      Description and activation file for the module Workstation
  */
@@ -62,7 +62,7 @@ class modWorkstation extends DolibarrModules
 		// Used only if file README.md and README-LL.md not found.
 		$this->descriptionlong = "WorkstationsDescription";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = 'development';
+		$this->version = 'experimental';
 		// Url to the file with your last numberversion of this module
 		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
 
@@ -390,7 +390,7 @@ class modWorkstation extends DolibarrModules
 	{
 		global $conf, $langs;
 
-		$result = $this->_load_tables('/workstation/sql/');
+		$result = $this->_load_tables('/install/mysql/tables/', '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')
 		}
@@ -435,10 +435,10 @@ class modWorkstation extends DolibarrModules
 				}
 
 				$sql = array_merge($sql, array(
-					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard_".strtolower($myTmpObjectKey)."' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
-					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard_".strtolower($myTmpObjectKey)."','".strtolower($myTmpObjectKey)."',".$conf->entity.")",
-					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'generic_".strtolower($myTmpObjectKey)."_odt' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
-					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('generic_".strtolower($myTmpObjectKey)."_odt', '".strtolower($myTmpObjectKey)."', ".$conf->entity.")"
+					"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/modZapier.class.php b/htdocs/core/modules/modZapier.class.php
index 430622465ca..e638d906693 100644
--- a/htdocs/core/modules/modZapier.class.php
+++ b/htdocs/core/modules/modZapier.class.php
@@ -281,9 +281,9 @@ class modZapier extends DolibarrModules
 	 */
 	public function init($options = '')
 	{
-		$result = $this->_load_tables('/zapier/sql/');
+		$result = $this->_load_tables('/install/mysql/tables/', '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 +294,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 e029c4d5d66..48483066e5e 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 /**
  *	Class to build documents using ODF templates generator
  */
-class pdf_stdandard extends ModelePDFMovement
+class pdf_standard extends ModelePDFMovement
 {
 	/**
 	 * @var DoliDb Database handler
@@ -238,8 +238,8 @@ class pdf_stdandard extends ModelePDFMovement
 
 		$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 		$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-		$sortfield = GETPOST("sortfield", 'alpha');
-		$sortorder = GETPOST("sortorder", 'alpha');
+		$sortfield = GETPOST('sortfield', 'aZ09comma');
+		$sortorder = GETPOST('sortorder', 'aZ09comma');
 		if (empty($page) || $page == -1) {
 			$page = 0;
 		}     // If $page is not defined, or '' or -1
@@ -278,7 +278,7 @@ class pdf_stdandard extends ModelePDFMovement
 		// Add fields from extrafields
 		if (!empty($extrafields->attributes[$element]['label'])) {
 			foreach ($extrafields->attributes[$element]['label'] as $key => $val) {
-				$sql .= ($extrafields->attributes[$element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+				$sql .= ($extrafields->attributes[$element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 			}
 		}
 		// Add fields from hooks
@@ -499,14 +499,10 @@ class pdf_stdandard extends ModelePDFMovement
 
 				$tab_top = 42;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
-				$tab_height = 130;
-				$tab_height_newpage = 150;
 
-				/* ************************************************************************** */
-				/*                                                                            */
-				/* Affichage de la liste des produits du MouvementStock                           */
-				/*                                                                            */
-				/* ************************************************************************** */
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
+
+				// Show list of product of the MouvementStock
 
 				$nexY += 5;
 				$nexY = $pdf->GetY();
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 85aa35bc5f9..07f5d5d1890 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
@@ -122,6 +122,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 		$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="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="MRP_MO_ADDON_PDF_ODT_PATH">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
@@ -158,7 +159,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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -183,7 +184,9 @@ class doc_generic_mo_odt extends ModelePDFMo
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
new file mode 100644
index 00000000000..0927c795749
--- /dev/null
+++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
@@ -0,0 +1,1516 @@
+<?php
+/* Copyright (C) 2004-2014 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011 Regis Houssin         <regis.houssin@inodbox.com>
+ * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
+ * Copyright (C) 2010-2014 Juanjo Menent         <jmenent@2byte.es>
+ * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
+ * Copyright (C) 2017      Ferran Marcet         <fmarcet@2byte.es>
+ * Copyright (C) 2018-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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/mrp/doc/pdf_vinci.modules.php
+ *	\ingroup    mrp
+ *	\brief      File of class to generate MO document from vinci model
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/mrp/modules_mo.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.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/pdf.lib.php';
+
+
+/**
+ *	Class to generate the manufacturing orders with the vinci model
+ */
+class pdf_vinci extends ModelePDFMo
+{
+	/**
+	 * @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;
+
+
+	/**
+	 *	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", "bills"));
+
+		$this->db = $db;
+		$this->name = "vinci";
+		$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
+
+		// Page size for A4 format
+		$this->type = 'pdf';
+		$formatarray = pdf_getFormat();
+		$this->page_largeur = $formatarray['width'];
+		$this->page_hauteur = $formatarray['height'];
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
+
+		$this->option_logo = 1; // Display logo
+		$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; // For module retrocompatibility support durring PDF transition: TODO remove this at the end
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		CommandeFournisseur	$object				Id of object to generate
+	 *  @param		Translate			$outputlangs		Lang output object
+	 *  @param		string				$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int					$hidedetails		Do not show line details
+	 *  @param		int					$hidedesc			Do not show desc
+	 *  @param		int					$hideref			Do not show ref
+	 *  @return		int										1=OK, 0=KO
+	 */
+	public function write_file($object, $outputlangs = '', $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		// phpcs:enable
+		global $user, $langs, $conf, $hookmanager, $mysoc;
+
+		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", "orders", "companies", "bills", "dict", "products"));
+
+		global $outputlangsbis;
+		$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", "orders", "companies", "bills", "dict", "products"));
+		}
+
+		if (!isset($object->lines) || !is_array($object->lines)) {
+			$object->lines = array();
+		}
+
+		$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();
+
+		if ($conf->mrp->dir_output) {
+			$object->fetch_thirdparty();
+
+			$deja_regle = 0;
+			$amount_credit_notes_included = 0;
+			$amount_deposits_included = 0;
+			//$amount_credit_notes_included = $object->getSumCreditNotesUsed();
+			//$amount_deposits_included = $object->getSumDepositsUsed();
+
+			// Definition of $dir and $file
+			if ($object->specimen) {
+				$dir = $conf->mrp->dir_output;
+				$file = $dir."/SPECIMEN.pdf";
+			} else {
+				$objectref = dol_sanitizeFileName($object->ref);
+				$dir = $conf->mrp->dir_output.'/'.$objectref;
+				$file = $dir."/".$objectref.".pdf";
+			}
+
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+					return 0;
+				}
+			}
+
+			if (file_exists($dir)) {
+				// Add pdfgeneration hook
+				if (!is_object($hookmanager)) {
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager = new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+
+				$nblines = count($object->lines);
+
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$heightforinfotot = 50; // Height reserved to output the info and total part
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
+				$pdf->SetAutoPageBreak(1, 0);
+
+				if (class_exists('TCPDF')) {
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
+				// Set path to the background PDF File
+				if (!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);
+
+				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+				$pdf->SetSubject($outputlangs->transnoentities("Mo"));
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Mo")." ".$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
+
+				// 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);
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
+
+
+				// Affiche notes
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
+
+				// Extrafields in note
+				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+				if (!empty($extranote)) {
+					$notetoshow = dol_concatdesc($notetoshow, $extranote);
+				}
+
+				$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);
+
+						// prepar pages to receive notes
+						while ($pagenb < $pageposafternote) {
+							$pdf->AddPage();
+							$pagenb++;
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
+							// $this->_pagefoot($pdf,$object,$outputlangs,1);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						}
+
+						// back to start
+						$pdf->setPage($pageposbeforenote);
+						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+						$pageposafternote = $pdf->getPage();
+
+						$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 previus pages
+						$i = $pageposbeforenote;
+						while ($i < $pageposafternote) {
+							$pdf->setPage($i);
+
+
+							$pdf->SetDrawColor(128, 128, 128);
+							// Draw note frame
+							if ($i > $pageposbeforenote) {
+								$height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+							} else {
+								$height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+							}
+
+							// 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;
+				}
+
+				$nexY = $tab_top + 5;
+
+				// Use new auto collum system
+				$this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
+
+				// Loop on each lines
+				$pageposbeforeprintlines = $pdf->getPage();
+				$pagenb = $pageposbeforeprintlines;
+
+				$bom = new BOM($this->db);
+				$bom -> fetch($object->fk_bom);
+
+				$nblines = count($bom->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);
+
+					$prod = new Product($this->db);
+					$prod->fetch($bom->lines[$i]->fk_product);
+
+					// 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 (!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);
+
+						$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($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'];
+					}
+					// Description of product line
+					$curX = $this->posxdesc - 1;
+					$showpricebeforepagebreak = 1;
+
+					if ($this->getColumnStatus('code')) {
+						$pdf->startTransaction(); //description
+						//$this->printColDescContent($pdf, $curY, 'code', $object, $i, $outputlangs, $hideref, $hidedesc, $showsupplierSKU);
+						$this->printStdColumnContent($pdf, $curY, 'code', $prod->ref);
+
+						$pageposafter = $pdf->getPage();
+						$posyafter = $pdf->GetY();
+						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
+							$pdf->rollbackTransaction(true);
+
+							//$this->printColDescContent($pdf, $curY, 'code', $object, $i, $outputlangs, $hideref, $hidedesc, $showsupplierSKU);
+							$this->printStdColumnContent($pdf, $curY, 'code', $prod->ref);
+
+							$pageposafter = $pdf->getPage();
+							$posyafter = $pdf->GetY();
+						} elseif ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+							if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
+								$pdf->AddPage('', '', true);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								$pdf->setPage($pageposafter + 1);
+							} else {
+								// We found a page break
+								// Allows data in the first page if description is long enough to break in multiples pages
+								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
+									$showpricebeforepagebreak = 1;
+								} else {
+									$showpricebeforepagebreak = 0;
+								}
+							}
+						} else // No pagebreak
+						{
+							$pdf->commitTransaction();
+						}
+						$posYAfterDescription = $pdf->GetY();
+					}
+
+					$nexY = $pdf->GetY();
+					$pageposafter = $pdf->getPage();
+					$pdf->setPage($pageposbefore);
+					$pdf->setTopMargin($this->marge_haute);
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+
+					// We suppose that a too long description is moved completely on next page
+					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+						$pdf->setPage($pageposafter);
+						$curY = $tab_top_newpage;
+					}
+
+					if ($this->getColumnStatus('desc')) {
+						$pdf->startTransaction(); //description
+						$des = $prod -> description;
+						$descr = $des;//implode("<br>", $des);
+
+						$this->printStdColumnContent($pdf, $curY, 'desc', $descr);
+
+						$pageposafter = $pdf->getPage();
+						$posyafter = $pdf->GetY();
+						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
+							$pdf->rollbackTransaction(true);
+
+							$this->printStdColumnContent($pdf, $curY, 'desc', $descr);
+
+							$pageposafter = $pdf->getPage();
+							$posyafter = $pdf->GetY();
+						} elseif ($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 = max($posYAfterDescription, $pdf->GetY());
+					}
+
+					$nexY = max($nexY, $pdf->GetY());
+					$pageposafter = $pdf->getPage();
+					$pdf->setPage($pageposbefore);
+					$pdf->setTopMargin($this->marge_haute);
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+
+					// We suppose that a too long description is moved completely on next page
+					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+						$pdf->setPage($pageposafter);
+						$curY = $tab_top_newpage;
+					}
+
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+
+					// Quantity
+					// Enough for 6 chars
+					if ($this->getColumnStatus('qty')) {
+						$qty = $bom->lines[$i]->qty;
+						$this->printStdColumnContent($pdf, $curY, 'qty', $qty);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
+					// Quantity
+					// Enough for 6 chars
+					if ($this->getColumnStatus('qtytot')) {
+						$qtytot = $object->qty * $bom->lines[$i]->qty;
+						$this->printStdColumnContent($pdf, $curY, 'qtytot', $qtytot);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
+					// Dimensions
+					if ($this->getColumnStatus('dim')) {
+						$array = array_filter(array($prod->length, $prod->width, $prod->height));
+						$dim = implode("x", $array);
+						$this->printStdColumnContent($pdf, $curY, 'dim', $dim);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+				}
+
+
+
+
+				// 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);
+					$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);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+
+				// Affiche zone infos
+				$posy = $this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
+
+				// Affiche zone totaux
+				//$posy = $this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+
+				// Affiche zone versements
+				if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included) {
+					$posy = $this->_tableau_versements($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->trans("ErrorCanNotCreateDir", $dir);
+				return 0;
+			}
+		} else {
+			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
+			return 0;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Show payments table
+	 *
+	 *  @param	TCPDF		$pdf     		Object PDF
+	 *  @param  CommandeFournisseur		$object			Object order
+	 *	@param	int			$posy			Position y in PDF
+	 *	@param	Translate	$outputlangs	Object langs for output
+	 *	@return int							<0 if KO, >0 if OK
+	 */
+	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
+	{
+		// phpcs:enable
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *   Show miscellaneous information (payment mode, payment term, ...)
+	 *
+	 *   @param		TCPDF		$pdf     		Object PDF
+	 *   @param		CommandeFournisseur		$object			Object to show
+	 *   @param		int			$posy			Y
+	 *   @param		Translate	$outputlangs	Langs object
+	 *   @return	integer
+	 */
+	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf, $mysoc;
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		// If France, show VAT mention if not applicable
+		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
+			$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 (!empty($object->cond_reglement_code) || $object->cond_reglement) {
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$titre = $outputlangs->transnoentities("PaymentConditions").':';
+			$pdf->MultiCell(80, 4, $titre, 0, 'L');
+
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posxval, $posy);
+			$lib_condition_paiement = $outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code) != ('PaymentCondition'.$object->cond_reglement_code) ? $outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code) : $outputlangs->convToOutputCharset($object->cond_reglement_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
+			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
+			$pdf->MultiCell(80, 4, $lib_condition_paiement, 0, 'L');
+
+			$posy = $pdf->GetY() + 3;
+		}
+
+		// Show payment mode
+		if (!empty($object->mode_reglement_code)) {
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$titre = $outputlangs->transnoentities("PaymentMode").':';
+			$pdf->MultiCell(80, 5, $titre, 0, 'L');
+
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posxval, $posy);
+			$lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement);
+			$pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
+
+			$posy = $pdf->GetY() + 2;
+		}
+
+
+		return $posy;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	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 _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	{
+		// phpcs:enable
+		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;
+
+		// Total HT
+		$pdf->SetFillColor(255, 255, 255);
+		$pdf->SetXY($col1x, $tab2_top + 0);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+
+		$total_ht = ((!empty($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, 'R', 1);
+
+		// Show VAT by rates and total
+		$pdf->SetFillColor(248, 248, 248);
+
+		$this->atleastoneratenotnull = 0;
+		foreach ($this->tva 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).' ';
+				$totalvat .= vatrate($tvakey, 1).$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($tvaval), 0, 'R', 1);
+			}
+		}
+		if (!$this->atleastoneratenotnull) { // If no vat at all
+			$index++;
+			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code), 0, 'L', 1);
+
+			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', 1);
+
+			// Total LocalTax1
+			if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION == 'localtax1on' && $object->total_localtax1 > 0) {
+				$index++;
+				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code), 0, 'L', 1);
+				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), $useborder, 'R', 1);
+			}
+
+			// Total LocalTax2
+			if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION == 'localtax2on' && $object->total_localtax2 > 0) {
+				$index++;
+				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code), 0, 'L', 1);
+				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
+			}
+		} else {
+			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+			//{
+				//Local tax 1
+			foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+				if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+					continue;
+				}
+
+				foreach ($localtax_rate 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("TotalLT1", $mysoc->country_code).' ';
+						$totalvat .= vatrate(abs($tvakey), 1).$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($tvaval, 0, $outputlangs), 0, 'R', 1);
+					}
+				}
+			}
+
+			//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+			//{
+				//Local tax 2
+			foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+				if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+					continue;
+				}
+
+				foreach ($localtax_rate 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("TotalLT2", $mysoc->country_code).' ';
+						$totalvat .= vatrate(abs($tvakey), 1).$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($tvaval), 0, 'R', 1);
+					}
+				}
+			}
+		}
+
+		// 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("TotalTTC"), $useborder, 'L', 1);
+
+		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc), $useborder, 'R', 1);
+		$pdf->SetFont('', '', $default_font_size - 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"), 0, 'L', 0);
+			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 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"), $useborder, 'L', 1);
+
+			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $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		Hide top bar of array
+	 *   @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
+
+		foreach ($this->cols as $colKey => $colDef) {
+			if (!$this->getColumnStatus($colKey)) {
+				continue;
+			}
+
+			// get title label
+			$colDef['title']['label'] = !empty($colDef['title']['label']) ? $colDef['title']['label'] : $outputlangs->transnoentities($colDef['title']['textkey']);
+
+			// Add column separator
+			if (!empty($colDef['border-left'])) {
+				$pdf->line($colDef['xStartPos'], $tab_top, $colDef['xStartPos'], $tab_top + $tab_height);
+			}
+
+			if (empty($hidetop)) {
+				$pdf->SetXY($colDef['xStartPos'] + $colDef['title']['padding'][3], $tab_top + $colDef['title']['padding'][0]);
+
+				$textWidth = $colDef['width'] - $colDef['title']['padding'][3] - $colDef['title']['padding'][1];
+				$pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $colDef['title']['align']);
+			}
+		}
+
+		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
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *  Show top header of page.
+	 *
+	 *  @param	TCPDF		$pdf     		Object PDF
+	 *  @param  CommandeFournisseur		$object     	Object to show
+	 *  @param  int	    	$showaddress    0=no, 1=yes
+	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @return	void
+	 */
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	{
+		global $langs, $conf, $mysoc;
+
+		$ltrdirection = 'L';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+
+		// Load translation files required by the page
+		$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "sendings"));
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		// Do not add the BACKGROUND as this is for suppliers
+		//pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+
+		//Affiche le filigrane brouillon - Print 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);
+		}*/
+		//Print content
+
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+
+		$posx = $this->page_largeur - $this->marge_droite - 100;
+		$posy = $this->marge_haute;
+
+		$pdf->SetXY($this->marge_gauche, $posy);
+
+		// Logo
+		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+		if ($this->emetteur->logo) {
+			if (is_readable($logo)) {
+				$height = pdf_getHeightForLogo($logo);
+				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+			} else {
+				$pdf->SetTextColor(200, 0, 0);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
+			}
+		} else {
+			$text = $this->emetteur->name;
+			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, $ltrdirection);
+		}
+
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$title = $outputlangs->transnoentities("Mo")." ".$outputlangs->convToOutputCharset($object->ref);
+		$pdf->MultiCell(100, 3, $title, '', 'R');
+		$posy += 1;
+
+		if ($object->ref_supplier) {
+			$posy += 4;
+			$pdf->SetFont('', 'B', $default_font_size);
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefSupplier")." : ".$outputlangs->convToOutputCharset($object->ref_supplier), '', 'R');
+			$posy += 1;
+		}
+
+		$pdf->SetFont('', '', $default_font_size - 1);
+		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->project->title), '', 'R');
+			}
+		}
+
+		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
+			$object->fetch_projet();
+			if (!empty($object->project->ref)) {
+				$outputlangs->load("projects");
+				$posy += 4;
+				$pdf->SetXY($posx, $posy);
+				$langs->load("projects");
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Project")." : ".(empty($object->project->ref) ? '' : $object->project->ref), '', 'R');
+			}
+		}
+
+		if (!empty($object->date_approve)) {
+			$posy += 5;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("MoDate")." : ".dol_print_date($object->date_approve, "day", false, $outputlangs, true), '', 'R');
+		} else {
+			$posy += 5;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(255, 0, 0);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ToApprove"), '', 'R');
+		}
+
+		// product info
+		$posy += 7;
+		$prodToMake = new Product($this->db);
+		$prodToMake->fetch($object->fk_product);
+		$pdf->SetFont('', 'B', $default_font_size + 1);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell($w, 3, $prodToMake->ref, '', 'R');
+
+		$posy += 5;
+		$prodToMake = new Product($this->db);
+		$prodToMake->fetch($object->fk_product);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell($w, 3, $prodToMake->description, '', 'R');
+
+		$array = array_filter(array($prodToMake->length, $prodToMake->width, $prodToMake->height));
+		$dim = implode("x", $array);
+		if (!empty($dim)) {
+			$posy += 5;
+			$pdf->SetFont('', 'B', $default_font_size + 3);
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 3, $dim, '', 'R');
+		}
+
+		$posy += 5;
+		$prodToMake = new Product($this->db);
+		$prodToMake->fetch($object->fk_product);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("QtyToProduce").": " .$object->qty, '', 'R');
+
+
+		$pdf->SetTextColor(0, 0, 60);
+		$usehourmin = 'day';
+		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
+			$usehourmin = 'dayhour';
+		}
+		if (!empty($object->delivery_date)) {
+			$posy += 4;
+			$pdf->SetXY($posx - 90, $posy);
+			$pdf->MultiCell(190, 3, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->delivery_date, $usehourmin, false, $outputlangs, true), '', 'R');
+		}
+
+		if ($object->thirdparty->code_fournisseur) {
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("SupplierCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_fournisseur), '', '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("BuyerName")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
+		}
+
+		$posy += 1;
+		$pdf->SetTextColor(0, 0, 60);
+
+		$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 proposal if defined
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
+			if (count($arrayidcontact) > 0) {
+				$object->fetch_user($arrayidcontact[0]);
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+			}
+
+			$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+
+			// Show sender
+			$posy = 42 + $top_shift;
+			$posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
+			$hautcadre = 40;
+
+			// Show sender frame
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx, $posy - 5);
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetFillColor(230, 230, 230);
+			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+			$pdf->SetTextColor(0, 0, 60);
+
+			// Show sender name
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
+			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
+			$posy = $pdf->getY();
+
+			// Show sender information
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->MultiCell(80, 4, $carac_emetteur, 0, $ltrdirection);
+
+
+
+			// If CUSTOMER contact defined on order, we use it. Note: Even if this is a supplier object, the code for external contat that follow order is 'CUSTOMER'
+			$usecontact = false;
+			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
+			if (count($arrayidcontact) > 0) {
+				$usecontact = true;
+				$result = $object->fetch_contact($arrayidcontact[0]);
+			}
+
+			// Recipient name
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+				$thirdparty = $object->contact;
+			} else {
+				$thirdparty = $object->thirdparty;
+			}
+
+			//$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
+
+			//$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object);
+
+			// Show recipient
+			//$widthrecbox = 100;
+			//if ($this->page_largeur < 210) {
+			//	$widthrecbox = 84; // To work with US executive format
+			//}
+			//$posy = 42 + $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, $ltrdirection);
+			//$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+			//
+			//// Show recipient name
+			//$pdf->SetXY($posx + 2, $posy + 3);
+			//$pdf->SetFont('', 'B', $default_font_size);
+			//$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, $ltrdirection);
+			//
+			//$posy = $pdf->getY();
+			//
+			//// Show recipient information
+			//$pdf->SetFont('', '', $default_font_size - 1);
+			//$pdf->SetXY($posx + 2, $posy);
+			//$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, $ltrdirection);
+		}
+
+		return $top_shift;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *   	Show footer of page. Need this->emetteur object
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
+	 * 		@param	CommandeFournisseur		$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, 'SUPPLIER_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;
+		$this->cols['code'] = array(
+			'rank' => $rank,
+			'status' => false,
+			'width' => 35, // in mm
+			'title' => array(
+				'textkey' => 'Ref'
+			),
+			'border-left' => true, // add left line separator
+		);
+		$this->cols['code']['status'] = true;
+
+		$rank = 1; // 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
+			),
+			'border-left' => true,
+			'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['dim'] = array(
+			'rank' => $rank,
+			'status' => false,
+			'width' => 25, // in mm
+			'title' => array(
+				'textkey' => 'Size'
+			),
+			'border-left' => true, // add left line separator
+		);
+		$this->cols['dim']['status'] = true;
+
+		$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
+		);
+		$this->cols['qty']['status'] = true;
+
+		$rank = $rank + 10;
+		$this->cols['qtytot'] = array(
+			'rank' => $rank,
+			'width' => 25, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'QtyTot'
+			),
+			'border-left' => true, // add left line separator
+		);
+		$this->cols['qtytot']['status'] = true;
+
+		// 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/mrp/mod_mo_advanced.php b/htdocs/core/modules/mrp/mod_mo_advanced.php
index 14292f7f896..ba518159dbf 100644
--- a/htdocs/core/modules/mrp/mod_mo_advanced.php
+++ b/htdocs/core/modules/mrp/mod_mo_advanced.php
@@ -82,7 +82,7 @@ class mod_mo_advanced extends ModeleNumRefMos
 		$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="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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 4f9fded878f..9fbc38ef156 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -16,6 +16,9 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+// This page should make the process to login and get token as described here:
+// https://developers.google.com/identity/protocols/oauth2/openid-connect#server-flow
+
 /**
  *      \file       htdocs/core/modules/oauth/google_oauthcallback.php
  *      \ingroup    oauth
@@ -70,9 +73,13 @@ $credentials = new Credentials(
 	$currentUri->getAbsoluteUri()
 );
 
+$state = GETPOST('state');
+
 $requestedpermissionsarray = array();
-if (GETPOST('state')) {
-	$requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to store a hash value and can be used to retrieve some parameters back
+if ($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'.
 }
 if ($action != 'delete' && empty($requestedpermissionsarray)) {
 	print 'Error, parameter state is not defined';
@@ -80,6 +87,8 @@ if ($action != 'delete' && empty($requestedpermissionsarray)) {
 }
 //var_dump($requestedpermissionsarray);exit;
 
+
+
 // Instantiate the Api service using the credentials, http client and storage mechanism for the token
 // $requestedpermissionsarray contains list of scopes.
 // Conversion into URL is done by Reflection on constant with name SCOPE_scope_in_uppercase
@@ -89,7 +98,6 @@ $apiService = $serviceFactory->createService('Google', $credentials, $storage, $
 // also note that a refresh token is sent only after a prompt
 $apiService->setAccessType('offline');
 
-$apiService->setApprouvalPrompt('force');
 
 $langs->load("oauth");
 
@@ -108,48 +116,86 @@ if ($action == 'delete') {
 	exit();
 }
 
-if (!empty($_GET['code'])) {     // We are coming from oauth provider page
+if (GETPOST('code')) {     // We are coming from oauth provider page.
 	dol_syslog("We are coming from the oauth provider page");
-	//llxHeader('',$langs->trans("OAuthSetup"));
 
-	//$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-	//print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
+	// 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']) {
+		print 'Value for state = '.dol_escape_htmltag($state).' differs from value in $_SESSION["oauthstateanticsrf"]. Code is refused.';
+		unset($_SESSION['oauthstateanticsrf']);
+	} else {
+		// This was a callback request from service, get the token
+		try {
+			//var_dump($_GET['code']);
+			//var_dump($state);
+			//var_dump($apiService);      // OAuth\OAuth2\Service\Google
 
-	//print dol_get_fiche_head();
-	// retrieve the CSRF state parameter
-	$state = isset($_GET['state']) ? $_GET['state'] : null;
-	//print '<table>';
+			// This request the token
+			// Result is stored into object managed by class DoliStorage into includes/OAuth/Common/Storage/DoliStorage.php, so into table llx_oauth_token
+			$token = $apiService->requestAccessToken(GETPOST('code'), $state);
 
-	// This was a callback request from service, get the token
-	try {
-		//var_dump($_GET['code']);
-		//var_dump($state);
-		//var_dump($apiService);      // OAuth\OAuth2\Service\Google
+			// Note: The extraparams has the 'id_token' than contains a lot of information about the user.
+			$extraparams = $token->getExtraParams();
+			$jwt = explode('.', $extraparams['id_token']);
 
-		$token = $apiService->requestAccessToken($_GET['code'], $state);
+			// Extract the middle part, base64 decode, then json_decode it
+			if (!empty($jwt[1])) {
+				$userinfo = json_decode(base64_decode($jwt[1]), true);
 
-		setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
+				// TODO
+				// We should make the 5 steps of validation of id_token
+				// Verify that the ID token is properly signed by the issuer. Google-issued tokens are signed using one of the certificates found at the URI specified in the jwks_uri metadata value of the Discovery document.
+				// Verify that the value of the iss claim in the ID token is equal to https://accounts.google.com or accounts.google.com.
+				// Verify that the value of the aud claim in the ID token is equal to your app's client ID.
+				// Verify that the expiry time (exp claim) of the ID token has not passed.
+				// If you specified a hd parameter value in the request, verify that the ID token has a hd claim that matches an accepted G Suite hosted domain.
 
-		$backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
-		unset($_SESSION["backtourlsavedbeforeoauthjump"]);
+				/*
+				$useremailuniq = $userinfo['sub'];
+				$useremail = $userinfo['email'];
+				$useremailverified = $userinfo['email_verified'];
+				$username = $userinfo['name'];
+				$userfamilyname = $userinfo['family_name'];
+				$usergivenname = $userinfo['given_name'];
+				$hd = $userinfo['hd'];
+				*/
+			}
 
-		header('Location: '.$backtourl);
-		exit();
-	} catch (Exception $e) {
-		print $e->getMessage();
+			setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');
+
+			$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
-{
+} 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
 	$_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
+	if (!preg_match('/^forlogin/', $state)) {
+		$apiService->setApprouvalPrompt('force');
+	}
+
 	// 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')));
+	if ($state) {
+		$url = $apiService->getAuthorizationUri(array('state' => $state));
 	} else {
 		$url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
 	}
 
+	// Add more param
+	$url .= '&nonce='.bin2hex(random_bytes(64/8));
+	// TODO Add param hd and/or login_hint
+	if (!preg_match('/^forlogin/', $state)) {
+		//$url .= 'hd=xxx';
+	}
+
 	// we go on oauth provider authorization page
 	header('Location: '.$url);
 	exit();
@@ -160,6 +206,6 @@ if (!empty($_GET['code'])) {     // We are coming from oauth provider page
  * View
  */
 
-// No view at all, just actions
+// No view at all, just actions, so we never reach this line.
 
 $db->close();
diff --git a/htdocs/core/modules/payment/mod_payment_ant.php b/htdocs/core/modules/payment/mod_payment_ant.php
index dca32b26505..958074202fe 100644
--- a/htdocs/core/modules/payment/mod_payment_ant.php
+++ b/htdocs/core/modules/payment/mod_payment_ant.php
@@ -84,7 +84,7 @@ class mod_payment_ant extends ModeleNumRefPayments
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskpayment" value="'.$conf->global->PAYMENT_ANT_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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/printing/modules_printing.php b/htdocs/core/modules/printing/modules_printing.php
index 41a87cb2704..fa86d832b73 100644
--- a/htdocs/core/modules/printing/modules_printing.php
+++ b/htdocs/core/modules/printing/modules_printing.php
@@ -69,7 +69,7 @@ class PrintingDriver
 		$listoffiles = array();
 		$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
 		foreach ($dirmodels as $dir) {
-			$tmpfiles = dol_dir_list(dol_buildpath($dir, 0), 'all', 0, '\modules.php', '', 'name', SORT_ASC, 0);
+			$tmpfiles = dol_dir_list(dol_buildpath($dir, 0), 'all', 0, '\.modules.php', '', 'name', SORT_ASC, 0);
 			if (!empty($tmpfiles)) {
 				$listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index ec53b523336..226ed6c43cd 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -237,7 +237,7 @@ class printing_printgcp extends PrintingDriver
 			if ($conf->global->PRINTING_GCP_DEFAULT == $printer_det['id']) {
 				$html .= img_picto($langs->trans("Default"), 'on');
 			} else {
-				$html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;token='.newToken().'&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+				$html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&token='.newToken().'&mode=test&varname=PRINTING_GCP_DEFAULT&driver=printgcp&value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 			}
 			$html .= '</td>';
 			$html .= '</tr>'."\n";
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
index 6c4403e2593..02ba610961d 100644
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (C) 2014-2020  Frederic France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2014-2021  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
@@ -108,10 +108,10 @@ class printing_printipp extends PrintingDriver
 		global $conf;
 
 		$this->db = $db;
-		$this->host = $conf->global->PRINTIPP_HOST;
-		$this->port = $conf->global->PRINTIPP_PORT;
-		$this->user = $conf->global->PRINTIPP_USER;
-		$this->password = $conf->global->PRINTIPP_PASSWORD;
+		$this->host = getDolGlobalString('PRINTIPP_HOST');
+		$this->port = getDolGlobalString('PRINTIPP_PORT');
+		$this->user = getDolGlobalString('PRINTIPP_USER');
+		$this->password = getDolGlobalString('PRINTIPP_PASSWORD');
 		$this->conf[] = array('varname'=>'PRINTIPP_HOST', 'required'=>1, 'example'=>'localhost', 'type'=>'text');
 		$this->conf[] = array('varname'=>'PRINTIPP_PORT', 'required'=>1, 'example'=>'631', 'type'=>'text');
 		$this->conf[] = array('varname'=>'PRINTIPP_USER', 'required'=>0, 'example'=>'', 'type'=>'text', 'moreattributes'=>'autocomplete="off"');
@@ -159,8 +159,8 @@ class printing_printipp extends PrintingDriver
 				$ipp->setCopies($obj->copy);
 			} else {
 				if (!empty($conf->global->PRINTIPP_URI_DEFAULT)) {
-					dol_syslog("Will use default printer conf->global->PRINTIPP_URI_DEFAULT = ".$conf->global->PRINTIPP_URI_DEFAULT);
-					$ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT);
+					dol_syslog("Will use default printer conf->global->PRINTIPP_URI_DEFAULT = ".getDolGlobalString('PRINTIPP_URI_DEFAULT'));
+					$ipp->setPrinterURI(getDolGlobalString('PRINTIPP_URI_DEFAULT'));
 				} else {
 					$this->errors[] = 'NoDefaultPrinterDefined';
 					$error++;
@@ -233,7 +233,7 @@ class printing_printipp extends PrintingDriver
 			if ($conf->global->PRINTIPP_URI_DEFAULT == $value) {
 				$html .= img_picto($langs->trans("Default"), 'on');
 			} else {
-				$html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;token='.newToken().'&amp;mode=test&amp;varname=PRINTIPP_URI_DEFAULT&amp;driver=printipp&amp;value='.urlencode($value).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+				$html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&token='.newToken().'&mode=test&varname=PRINTIPP_URI_DEFAULT&driver=printipp&value='.urlencode($value).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 			}
 			$html .= '</td>';
 			$html .= '</tr>'."\n";
@@ -309,7 +309,7 @@ class printing_printipp extends PrintingDriver
 			$ipp->setAuthentication($this->user, $this->password);
 		}
 		// select printer uri for module order, propal,...
-		$sql = 'SELECT rowid,printer_uri,printer_name FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
+		$sql = "SELECT rowid,printer_uri,printer_name FROM ".MAIN_DB_PREFIX."printer_ipp WHERE module = '".$this->db->escape($module)."'";
 		$result = $this->db->query($sql);
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
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 a8c60f76806..7fff122ec57 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
@@ -118,15 +118,11 @@ class doc_generic_product_odt extends ModelePDFProduct
 		$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">';
 		$texte .= '<input type="hidden" name="param1" value="PRODUCT_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
-			$texte .= '<input type="hidden" name="param2" value="PRODUCT_ADDON_PDF_ODT_DEFAULT">';
-			$texte .= '<input type="hidden" name="param3" value="PRODUCT_ADDON_PDF_ODT_TOBILL">';
-			$texte .= '<input type="hidden" name="param4" value="PRODUCT_ADDON_PDF_ODT_CLOSED">';
-		}
 		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		// List of directories area
@@ -161,43 +157,38 @@ 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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
-		if (count($listofdir)) {
+		$nbofiles = count($listoffiles);
+		if (!empty($conf->global->PRODUCT_ADDON_PDF_ODT_PATH)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
-
-			/*if ($conf->global->MAIN_PRODUCT_CHOOSE_ODT_DOCUMENT > 0)
-			{
-				// Model for creation
-				$liste=ModelePDFProduct::liste_modeles($this->db);
-				$texte.= '<table width="50%;">';
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value2',$liste,$conf->global->PRODUCT_ADDON_PDF_ODT_DEFAULT);
-				$texte.= "</td></tr>";
-
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value3',$liste,$conf->global->PRODUCT_ADDON_PDF_ODT_TOBILL);
-				$texte.= "</td></tr>";
-				$texte.= '<tr>';
-
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value4',$liste,$conf->global->PRODUCT_ADDON_PDF_ODT_CLOSED);
-				$texte.= "</td></tr>";
-				$texte.= '</table>';
-			}*/
 		}
 
+		if ($nbofiles) {
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
+			foreach ($listoffiles as $file) {
+				$texte .= '- '.$file['name'];
+				$texte .= ' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=products/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=PRODUCT_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
+			}
+			$texte .= '</div>';
+		}
+		// Add input to upload a new template file.
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<input type="hidden" value="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>';
+
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
@@ -347,7 +338,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 
 				// Line of free text
 				$newfreetext = '';
-				$paramfreetext = 'product_FREE_TEXT';
+				$paramfreetext = 'PRODUCT_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
 					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
@@ -375,7 +366,6 @@ class doc_generic_product_odt extends ModelePDFProduct
 				//print html_entity_decode($odfHandler->__toString());
 				//print exit;
 
-				$object->fetch_optionals();
 
 				// Make substitutions into odt of freetext
 				try {
@@ -402,7 +392,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 
 				// Call the ODTSubstitution hook
-				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$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) {
@@ -483,6 +473,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 					}
 				}
 
+				$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)) {
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 815fc4d1c66..940aa1d4279 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -270,8 +270,8 @@ class pdf_standard extends ModelePDFProduct
 
 				$tab_top = 42;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
-				$tab_height = 130;
-				$tab_height_newpage = 150;
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
 				// Label of product
 				$pdf->SetFont('', 'B', $default_font_size);
@@ -293,18 +293,21 @@ class pdf_standard extends ModelePDFProduct
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 					$nexY = $pdf->GetY();
 				}
-				if ($object->weight) {
-					$texttoshow = $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != '' ? $object->length : '?').' x '.($object->width != '' ? $object->width : '?').' x '.($object->height != '' ? $object->height : '?');
+				if ($object->length) {
+					$texttoshow = $langs->trans("Length") . ' x ' . $langs->trans("Width") . ' x ' . $langs->trans("Height") . ': ' . ($object->length != '' ? $object->length : '?') . ' x ' . ($object->width != '' ? $object->width : '?') . ' x ' . ($object->height != '' ? $object->height : '?');
+					$texttoshow .= ' ' . measuringUnitString(0, "size", $object->length_units);
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 					$nexY = $pdf->GetY();
 				}
 				if ($object->surface) {
-					$texttoshow = $langs->trans("Area").': '.dol_htmlentitiesbr($object->surface);
+					$texttoshow = $langs->trans("Surface") . ': ' . dol_htmlentitiesbr($object->surface);
+					$texttoshow .= ' ' . measuringUnitString(0, "surface", $object->surface_units);
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 					$nexY = $pdf->GetY();
 				}
 				if ($object->volume) {
-					$texttoshow = $langs->trans("Volume").': '.dol_htmlentitiesbr($object->volume);
+					$texttoshow = $langs->trans("Volume") . ': ' . dol_htmlentitiesbr($object->volume);
+					$texttoshow .= ' ' . measuringUnitString(0, "volume", $object->volume_units);
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 					$nexY = $pdf->GetY();
 				}
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index 0b03bd9b6a4..40b1f324cdd 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -104,6 +104,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		$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="PRODUCT_ELEPHANT_MASK_PRODUCT">';
 		$texte .= '<input type="hidden" name="param2" value="PRODUCT_ELEPHANT_MASK_SERVICE">';
@@ -118,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" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></td>';
+		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'"'.$disabled.'></td>';
 
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/product_batch/mod_lot_advanced.php b/htdocs/core/modules/product_batch/mod_lot_advanced.php
index 8ee857bfbea..d44a261a16b 100644
--- a/htdocs/core/modules/product_batch/mod_lot_advanced.php
+++ b/htdocs/core/modules/product_batch/mod_lot_advanced.php
@@ -82,14 +82,14 @@ class mod_lot_advanced extends ModeleNumRefBatch
 		$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="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 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) {
-			$texte .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmaskslot&amp;value=0">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+			$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&amp;value=1">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+			$texte .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmaskslot&token='.newToken().'&value=1">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		}
 		$texte .= ' '.$langs->trans('CustomMasks')."\n";
 		$texte .= '</td>';
diff --git a/htdocs/core/modules/product_batch/mod_lot_free.php b/htdocs/core/modules/product_batch/mod_lot_free.php
index 0f069143ab1..def14bd37b3 100644
--- a/htdocs/core/modules/product_batch/mod_lot_free.php
+++ b/htdocs/core/modules/product_batch/mod_lot_free.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *       \file       htdocs/core/modules/product/mod_lot_free.php
+ *       \file       htdocs/core/modules/product_batch/mod_lot_free.php
  *       \ingroup    productbatch
  *       \brief      File containing class for numbering model of Lot free
  */
diff --git a/htdocs/core/modules/product_batch/mod_sn_advanced.php b/htdocs/core/modules/product_batch/mod_sn_advanced.php
index 54c67291d9a..abe094220d2 100644
--- a/htdocs/core/modules/product_batch/mod_sn_advanced.php
+++ b/htdocs/core/modules/product_batch/mod_sn_advanced.php
@@ -22,7 +22,7 @@
  */
 
 /**
- * \file       htdocs/core/modules/product_batch/mod_batch_advanced.php
+ * \file       htdocs/core/modules/product_batch/mod_sn_advanced.php
  * \ingroup    productbatch
  * \brief      File containing class for numbering model of SN advanced
  */
@@ -82,14 +82,14 @@ class mod_sn_advanced extends ModeleNumRefBatch
 		$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="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 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) {
-			$texte .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmaskssn&amp;value=0">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+			$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&amp;value=1">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+			$texte .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmaskssn&token='.newToken().'&value=1">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		}
 		$texte .= ' '.$langs->trans('CustomMasks')."\n";
 		$texte .= '</td>';
diff --git a/htdocs/core/modules/product_batch/mod_sn_free.php b/htdocs/core/modules/product_batch/mod_sn_free.php
index 95e1bd20359..67d39ec085a 100644
--- a/htdocs/core/modules/product_batch/mod_sn_free.php
+++ b/htdocs/core/modules/product_batch/mod_sn_free.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *       \file       htdocs/core/modules/product/mod_sn_free.php
+ *       \file       htdocs/core/modules/product_batch/mod_sn_free.php
  *       \ingroup    productbatch
  *       \brief      File containing class for numbering model of SN free
  */
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 233180630b0..bad6a369ba6 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
@@ -413,6 +413,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		$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="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="PROJECT_ADDON_PDF_ODT_PATH">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
@@ -449,7 +450,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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -474,7 +475,9 @@ class doc_generic_project_odt extends ModelePDFProjects
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 373d41abc31..716c88e1f92 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -286,8 +286,8 @@ class pdf_baleine extends ModelePDFProjects
 
 				$tab_top = 50;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
-				$tab_height = 170;
-				$tab_height_newpage = 190;
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
 				// Show public note
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 30b9271a110..f71b0cdb6a7 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -327,8 +327,8 @@ class pdf_beluga extends ModelePDFProjects
 
 				$tab_top = 50;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
-				$tab_height = 170;
-				$tab_height_newpage = 190;
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
 				// Show public note
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index ef2ec4fcaf8..991ff794d72 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -286,8 +286,8 @@ class pdf_timespent extends ModelePDFProjects
 
 				$tab_top = 50;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
-				$tab_height = 170;
-				$tab_height_newpage = 190;
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
 				// Show public note
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php
index 480d19396c3..550d72c4f68 100644
--- a/htdocs/core/modules/project/mod_project_universal.php
+++ b/htdocs/core/modules/project/mod_project_universal.php
@@ -85,7 +85,7 @@ class mod_project_universal extends ModeleNumRefProjects
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskproject" value="'.$conf->global->PROJECT_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
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 638ab70bb84..1fd0f9c23ee 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
@@ -380,6 +380,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		$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="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="PROJECT_TASK_ADDON_PDF_ODT_PATH">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
@@ -416,7 +417,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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -441,7 +442,9 @@ class doc_generic_task_odt extends ModelePDFTask
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php
index 3a6ef89f3fb..6de02dcaf99 100644
--- a/htdocs/core/modules/project/task/mod_task_universal.php
+++ b/htdocs/core/modules/project/task/mod_task_universal.php
@@ -85,7 +85,7 @@ class mod_task_universal extends ModeleNumRefTask
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="masktask" value="'.$conf->global->PROJECT_TASK_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
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 a6261fb4b34..e636645f6c8 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
@@ -119,6 +119,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		$texte = $this->description.".<br>\n";
 		$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">';
 		$texte .= '<input type="hidden" name="param1" value="PROPALE_ADDON_PDF_ODT_PATH">';
 		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
@@ -126,7 +127,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 			$texte .= '<input type="hidden" name="param3" value="PROPALE_ADDON_PDF_ODT_TOBILL">';
 			$texte .= '<input type="hidden" name="param4" value="PROPALE_ADDON_PDF_ODT_CLOSED">';
 		}
-		$texte .= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<table class="nobordernopadding centpercent">';
 
 		// List of directories area
 		$texte .= '<tr><td>';
@@ -160,7 +161,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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -177,7 +178,10 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 			$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=doctemplates&file=proposals/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'];
+				$texte .= ' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=proposals/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=PROPALE_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 
@@ -209,12 +213,14 @@ 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 .= '<input type="hidden" value="PROPALE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 0e30e8246a3..5135a1708af 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -197,6 +197,7 @@ class pdf_azur extends ModelePDFPropales
 		}
 
 		$this->tva = array();
+		$this->tva_array = array();
 		$this->localtax1 = array();
 		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
@@ -220,6 +221,8 @@ class pdf_azur extends ModelePDFPropales
 		// 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;
 		}
@@ -228,13 +231,22 @@ class pdf_azur extends ModelePDFPropales
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
-		// Load traductions files required by page
+		// Load translation files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "propal", "products"));
 
+		global $outputlangsbis;
+		$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"));
+		}
+
 		$nblines = count($object->lines);
 
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
+		$this->atleastonephoto = false;
 		if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE)) {
 			$objphoto = new Product($this->db);
 
@@ -254,9 +266,10 @@ class pdf_azur extends ModelePDFPropales
 				}
 
 				$arephoto = false;
+				$realpath = '';
 				foreach ($pdir as $midir) {
 					if (!$arephoto) {
-						if ($conf->product->entity != $objphoto->entity) {
+						if ($conf->entity != $objphoto->entity) {
 							$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
 						} else {
 							$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
@@ -274,6 +287,7 @@ class pdf_azur extends ModelePDFPropales
 
 							$realpath = $dir.$filename;
 							$arephoto = true;
+							$this->atleastonephoto = true;
 						}
 					}
 				}
@@ -321,6 +335,10 @@ class pdf_azur extends ModelePDFPropales
 				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 content of lines after hook
+				$nblines = count($object->lines);
+				//$nbpayments = count($object->getListOfPayments());
+
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
@@ -356,7 +374,7 @@ class pdf_azur extends ModelePDFPropales
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
-				// Positionne $this->atleastonediscount si on a au moins une remise
+				// Set $this->atleastonediscount if you have at least one discount
 				for ($i = 0; $i < $nblines; $i++) {
 					if ($object->lines[$i]->remise_percent) {
 						$this->atleastonediscount++;
@@ -389,7 +407,7 @@ class pdf_azur extends ModelePDFPropales
 				}
 				//print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
 
-				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
+				$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);
@@ -399,6 +417,7 @@ class pdf_azur extends ModelePDFPropales
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
+				$height_incoterms = 0;
 				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms) {
@@ -414,10 +433,11 @@ class pdf_azur extends ModelePDFPropales
 						$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;
 					}
 				}
 
-				// Affiche notes
+				// 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
@@ -438,14 +458,15 @@ class pdf_azur extends ModelePDFPropales
 				if (!empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0) {
 					$tmpuser = new User($this->db);
 					$tmpuser->fetch($object->user_author_id);
-					$notetoshow .= $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs);
-					if ($tmpuser->email) {
-						$notetoshow .= ',  Mail: '.$tmpuser->email;
-					}
-					if ($tmpuser->office_phone) {
-						$notetoshow .= ', Tel: '.$tmpuser->office_phone;
-					}
+
+
+					$creator_info = $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs);
+					if ($tmpuser->email) $creator_info .= ',  '.$langs->trans("EMail").': '.$tmpuser->email;
+					if ($tmpuser->office_phone) $creator_info .= ', '.$langs->trans("Phone").': '.$tmpuser->office_phone;
+
+					$notetoshow = dol_concatdesc($notetoshow, $creator_info);
 				}
+
 				if ($notetoshow) {
 					$tab_top -= 2;
 
@@ -658,10 +679,17 @@ class pdf_azur extends ModelePDFPropales
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
 						$vatrate .= '*';
 					}
+
+					// Fill $this->tva and $this->tva_array
 					if (!isset($this->tva[$vatrate])) {
 						$this->tva[$vatrate] = 0;
 					}
 					$this->tva[$vatrate] += $tvaligne;
+					$vatcode = $object->lines[$i]->vat_src_code;
+					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
+						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
+					}
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					if ($posYAfterImage > $posYAfterDescription) {
 						$nexY = $posYAfterImage;
@@ -891,6 +919,11 @@ class pdf_azur extends ModelePDFPropales
 		}
 
 		$posxval = 52;
+		if (!empty($conf->global->MAIN_PDF_DELIVERY_DATE_TEXT)) {
+			$displaydate = "daytext";
+		} else {
+			$displaydate = "day";
+		}
 
 		// Show shipping date
 		if (!empty($object->delivery_date)) {
@@ -901,7 +934,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$dlp = dol_print_date($object->delivery_date, "daytext", false, $outputlangs, true);
+			$dlp = dol_print_date($object->delivery_date, $displaydate, false, $outputlangs, true);
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
 			$posy = $pdf->GetY() + 1;
@@ -1040,9 +1073,10 @@ class pdf_azur extends ModelePDFPropales
 	 *	@param  int			$deja_regle     Amount already paid
 	 *	@param	int			$posy			Start position
 	 *	@param	Translate	$outputlangs	Objet langs
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *	@return int							Position for continuation
 	 */
-	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs, $outputlangsbis = null)
 	{
 		// phpcs:enable
 		global $conf, $mysoc;
@@ -1145,8 +1179,9 @@ class pdf_azur extends ModelePDFPropales
 					}
 				}
 				//}
+
 				// VAT
-				foreach ($this->tva as $tvakey => $tvaval) {
+				foreach ($this->tva_array as $tvakey => $tvaval) {
 					if ($tvakey != 0) {    // On affiche pas taux 0
 						$this->atleastoneratenotnull++;
 
@@ -1158,12 +1193,19 @@ class pdf_azur extends ModelePDFPropales
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
-						$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).' ';
-						$totalvat .= vatrate($tvakey, 1).$tvacompl;
+						$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'] ? $tvaval['vatcode'] : vatrate($tvaval['vatrate'], 1)).$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($tvaval, 0, $outputlangs), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', 1);
 					}
 				}
 
@@ -1473,16 +1515,23 @@ class pdf_azur extends ModelePDFPropales
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$title = $outputlangs->transnoentities("PdfCommercialProposalTitle");
+		$title .= ' '.$outputlangs->convToOutputCharset($object->ref);
+		if ($object->statut == $object::STATUS_DRAFT) {
+			$pdf->SetTextColor(128, 0, 0);
+			$title .= ' - '.$outputlangs->transnoentities("NotValidated");
+		}
 		$pdf->MultiCell(100, 4, $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;
+		$posy += 3;
 		$pdf->SetFont('', '', $default_font_size - 2);
 
 		if ($object->ref_client) {
@@ -1513,17 +1562,23 @@ class pdf_azur extends ModelePDFPropales
 			}
 		}
 
-		$posy += 4;
-		$pdf->SetXY($posx, $posy);
-		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DatePropal")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
+		if (!empty($conf->global->MAIN_PDF_DATE_TEXT)) {
+			$displaydate = "daytext";
+		} else {
+			$displaydate = "day";
+		}
 
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : ".dol_print_date($object->fin_validite, "day", false, $outputlangs, true), '', 'R');
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DatePropal")." : ".dol_print_date($object->date, $displaydate, false, $outputlangs, true), '', 'R');
 
-		if ($object->thirdparty->code_client) {
+		$posy += 4;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : ".dol_print_date($object->fin_validite, $displaydate, false, $outputlangs, true), '', 'R');
+
+		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && $object->thirdparty->code_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1575,20 +1630,24 @@ class pdf_azur extends ModelePDFPropales
 			$hautcadre = 40;
 
 			// Show sender frame
-			$pdf->SetTextColor(0, 0, 0);
-			$pdf->SetFont('', '', $default_font_size - 2);
-			$pdf->SetXY($posx, $posy - 5);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
-			$pdf->SetXY($posx, $posy);
-			$pdf->SetFillColor(230, 230, 230);
-			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0, 0, 60);
+			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+				$pdf->SetTextColor(0, 0, 0);
+				$pdf->SetFont('', '', $default_font_size - 2);
+				$pdf->SetXY($posx, $posy - 5);
+				$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetFillColor(230, 230, 230);
+				$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+				$pdf->SetTextColor(0, 0, 60);
+			}
 
 			// Show sender name
-			$pdf->SetXY($posx + 2, $posy + 3);
-			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
-			$posy = $pdf->getY();
+			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+				$pdf->SetXY($posx + 2, $posy + 3);
+				$pdf->SetFont('', 'B', $default_font_size);
+				$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
+				$posy = $pdf->getY();
+			}
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
@@ -1628,11 +1687,13 @@ class pdf_azur extends ModelePDFPropales
 			}
 
 			// 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, $ltrdirection);
-			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_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, $ltrdirection);
+				$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+			}
 
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 5fb9949acd3..1e48a826257 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -179,6 +179,7 @@ class pdf_cyan extends ModelePDFPropales
 		//  Use new system for position of columns, view  $this->defineColumnField()
 
 		$this->tva = array();
+		$this->tva_array = array();
 		$this->localtax1 = array();
 		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
@@ -254,7 +255,7 @@ class pdf_cyan extends ModelePDFPropales
 				$arephoto = false;
 				foreach ($pdir as $midir) {
 					if (!$arephoto) {
-						if ($conf->product->entity != $objphoto->entity) {
+						if ($conf->entity != $objphoto->entity) {
 							$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
 						} else {
 							$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
@@ -321,7 +322,7 @@ class pdf_cyan extends ModelePDFPropales
 				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
+				// Set nblines with the new content of lines after hook
 				$nblines = count($object->lines);
 				//$nbpayments = count($object->getListOfPayments());
 
@@ -408,6 +409,7 @@ class pdf_cyan extends ModelePDFPropales
 						$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;
 					}
 				}
 
@@ -537,8 +539,8 @@ class pdf_cyan extends ModelePDFPropales
 						}
 						$height_note = $posyafter - $tab_top_newpage;
 						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-					} else // No pagebreak
-					{
+					} else {
+						// No pagebreak
 						$pdf->commitTransaction();
 						$posyafter = $pdf->GetY();
 						$height_note = $posyafter - $tab_top;
@@ -737,7 +739,7 @@ class pdf_cyan extends ModelePDFPropales
 					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);
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey, $outputlangs);
 								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
 								$nexY = max($pdf->GetY(), $nexY);
 							}
@@ -801,10 +803,17 @@ class pdf_cyan extends ModelePDFPropales
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
 						$vatrate .= '*';
 					}
+
+					// Fill $this->tva and $this->tva_array
 					if (!isset($this->tva[$vatrate])) {
 						$this->tva[$vatrate] = 0;
 					}
 					$this->tva[$vatrate] += $tvaligne;
+					$vatcode = $object->lines[$i]->vat_src_code;
+					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
+						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
+					}
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					if ($posYAfterImage > $posYAfterDescription) {
 						$nexY = max($nexY, $posYAfterImage);
@@ -815,11 +824,11 @@ class pdf_cyan extends ModelePDFPropales
 						$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->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
 						$pdf->SetLineStyle(array('dash'=>0));
 					}
 
-
+					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter) {
@@ -1029,6 +1038,11 @@ class pdf_cyan extends ModelePDFPropales
 		}
 
 		$posxval = 52;
+		if (!empty($conf->global->MAIN_PDF_DATE_TEXT)) {
+			$displaydate = "daytext";
+		} else {
+			$displaydate = "day";
+		}
 
 		// Show shipping date
 		if (!empty($object->delivery_date)) {
@@ -1039,7 +1053,7 @@ class pdf_cyan extends ModelePDFPropales
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$dlp = dol_print_date($object->delivery_date, "daytext", false, $outputlangs, true);
+			$dlp = dol_print_date($object->delivery_date, $displaydate, false, $outputlangs, true);
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
 			$posy = $pdf->GetY() + 1;
@@ -1177,15 +1191,15 @@ class pdf_cyan extends ModelePDFPropales
 	 *	@param  int			$deja_regle     Amount already paid (in the currency of invoice)
 	 *	@param	int			$posy			Position depart
 	 *	@param	Translate	$outputlangs	Objet langs
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *	@return int							Position pour suite
 	 */
-	protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs, $outputlangsbis = null)
 	{
 		global $conf, $mysoc, $hookmanager;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$outputlangsbis = null;
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
 			$outputlangsbis = new Translate('', $conf);
 			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
@@ -1292,6 +1306,7 @@ class pdf_cyan extends ModelePDFPropales
 					}
 				}
 				//}
+
 				// VAT
 				foreach ($this->tva as $tvakey => $tvaval) {
 					if ($tvakey != 0) {    // On affiche pas taux 0
@@ -1574,10 +1589,17 @@ class pdf_cyan extends ModelePDFPropales
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$title = $outputlangs->transnoentities("PdfCommercialProposalTitle");
+		$title .= ' '.$outputlangs->convToOutputCharset($object->ref);
+		if ($object->statut == $object::STATUS_DRAFT) {
+			$pdf->SetTextColor(128, 0, 0);
+			$title .= ' - '.$outputlangs->transnoentities("NotValidated");
+		}
+
 		$pdf->MultiCell($w, 4, $title, '', 'R');
 
 		$pdf->SetFont('', 'B', $default_font_size);
 
+		/*
 		$posy += 5;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
@@ -1587,8 +1609,9 @@ class pdf_cyan extends ModelePDFPropales
 			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
 		}
 		$pdf->MultiCell($w, 4, $textref, '', 'R');
+		*/
 
-		$posy += 1;
+		$posy += 3;
 		$pdf->SetFont('', '', $default_font_size - 2);
 
 		if ($object->ref_client) {
@@ -1619,10 +1642,16 @@ class pdf_cyan extends ModelePDFPropales
 			}
 		}
 
+		if (!empty($conf->global->MAIN_PDF_DATE_TEXT)) {
+			$displaydate = "daytext";
+		} else {
+			$displaydate = "day";
+		}
+
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
+		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date, $displaydate, false, $outputlangs, true), '', 'R');
 
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);
@@ -1632,9 +1661,9 @@ class pdf_cyan extends ModelePDFPropales
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
 			$title .= ' - '.$outputlangsbis->transnoentities("DateEndPropal");
 		}
-		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->fin_validite, "day", false, $outputlangs, true), '', 'R');
+		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->fin_validite, $displaydate, false, $outputlangs, true), '', 'R');
 
-		if ($object->thirdparty->code_client) {
+		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && $object->thirdparty->code_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1689,20 +1718,24 @@ class pdf_cyan extends ModelePDFPropales
 			$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($widthrecbox, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
-			$pdf->SetXY($posx, $posy);
-			$pdf->SetFillColor(230, 230, 230);
-			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0, 0, 60);
+			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+				$pdf->SetTextColor(0, 0, 0);
+				$pdf->SetFont('', '', $default_font_size - 2);
+				$pdf->SetXY($posx, $posy - 5);
+				$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillFrom"), 0, $ltrdirection);
+				$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, $ltrdirection);
-			$posy = $pdf->getY();
+			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+				$pdf->SetXY($posx + 2, $posy + 3);
+				$pdf->SetFont('', 'B', $default_font_size);
+				$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
+				$posy = $pdf->getY();
+			}
 
 			// Show sender information
 			$pdf->SetXY($posx + 2, $posy);
@@ -1727,7 +1760,7 @@ class pdf_cyan extends ModelePDFPropales
 
 			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$mode =  'target';
+			$mode = 'target';
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object);
 
 			// Show recipient
@@ -1743,11 +1776,13 @@ class pdf_cyan extends ModelePDFPropales
 			}
 
 			// 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, $ltrdirection);
-			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_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, $ltrdirection);
+				$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+			}
 
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php
index ce78f341319..af7579fb142 100644
--- a/htdocs/core/modules/propale/mod_propale_saphir.php
+++ b/htdocs/core/modules/propale/mod_propale_saphir.php
@@ -87,7 +87,7 @@ class mod_propale_saphir extends ModeleNumRefPropales
 		$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>';
 
-		$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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 5904db84398..215987054ce 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -196,7 +196,7 @@ class pdf_paiement
 					$sql .= " ".MAIN_DB_PREFIX."bank as b, ".MAIN_DB_PREFIX."bank_account as ba,";
 				}
 				$sql .= " ".MAIN_DB_PREFIX."societe as s";
-				if (!$user->rights->societe->client->voir && !$socid) {
+				if (empty($user->rights->societe->client->voir) && !$socid) {
 					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 				}
 				$sql .= " WHERE f.fk_soc = s.rowid AND pf.fk_facture = f.rowid AND pf.fk_paiement = p.rowid";
@@ -205,7 +205,7 @@ class pdf_paiement
 				}
 				$sql .= " AND f.entity IN (".getEntity('invoice').")";
 				$sql .= " AND p.datep BETWEEN '".$this->db->idate(dol_get_first_day($year, $month))."' AND '".$this->db->idate(dol_get_last_day($year, $month))."'";
-				if (!$user->rights->societe->client->voir && !$socid) {
+				if (empty($user->rights->societe->client->voir) && !$socid) {
 					$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 				}
 				if (!empty($socid)) {
@@ -234,7 +234,7 @@ class pdf_paiement
 					$sql .= " ".MAIN_DB_PREFIX."bank as b, ".MAIN_DB_PREFIX."bank_account as ba,";
 				}
 				$sql .= " ".MAIN_DB_PREFIX."societe as s";
-				if (!$user->rights->societe->client->voir && !$socid) {
+				if (empty($user->rights->societe->client->voir) && !$socid) {
 					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 				}
 				$sql .= " WHERE f.fk_soc = s.rowid AND pf.fk_facturefourn = f.rowid AND pf.fk_paiementfourn = p.rowid";
@@ -243,7 +243,7 @@ class pdf_paiement
 				}
 				$sql .= " AND f.entity IN (".getEntity('invoice').")";
 				$sql .= " AND p.datep BETWEEN '".$this->db->idate(dol_get_first_day($year, $month))."' AND '".$this->db->idate(dol_get_last_day($year, $month))."'";
-				if (!$user->rights->societe->client->voir && !$socid) {
+				if (empty($user->rights->societe->client->voir) && !$socid) {
 					$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 				}
 				if (!empty($socid)) {
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 383ab491346..7fde8e26c82 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
@@ -116,9 +116,10 @@ class doc_generic_reception_odt extends ModelePdfReception
 		$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="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="RECEPTION_ADDON_PDF_ODT_PATH">';
-		$texte .= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<table class="nobordernopadding centpercent">';
 
 		// List of directories area
 		$texte .= '<tr><td>';
@@ -152,7 +153,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 small" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button button-edit small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -175,13 +176,15 @@ class doc_generic_reception_odt extends ModelePdfReception
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="RECEPTION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 38344a5f486..9f03abef52c 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -263,15 +263,15 @@ class pdf_squille extends ModelePdfReception
 
 				$tab_top = 90;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
-				$tab_height = 130;
-				$tab_height_newpage = 150;
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
 				// Incoterm
 				$height_incoterms = 0;
 				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms) {
-						$tab_top = 88;
+						$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);
diff --git a/htdocs/core/modules/reception/mod_reception_moonstone.php b/htdocs/core/modules/reception/mod_reception_moonstone.php
index 0d0ced20eb4..e1a5669dc09 100644
--- a/htdocs/core/modules/reception/mod_reception_moonstone.php
+++ b/htdocs/core/modules/reception/mod_reception_moonstone.php
@@ -62,7 +62,7 @@ class mod_reception_moonstone extends ModelNumRefReception
 
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskreception" value="'.$conf->global->RECEPTION_MOONSTONE_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 button-edit" name="Button" value="'.$langs->trans("Modify").'"></td>';
 		$texte .= '</tr>';
 		$texte .= '</table>';
 		$texte .= '</form>';
diff --git a/htdocs/core/modules/security/generate/README b/htdocs/core/modules/security/generate/README
index c47cee09469..23dc7dcdd91 100644
--- a/htdocs/core/modules/security/generate/README
+++ b/htdocs/core/modules/security/generate/README
@@ -4,8 +4,7 @@ Adding your own password generator module
 ------------------------------------
 
 
-If you want to add your own password generator module. This is steps to follow
-to add you own password generator:
+If you want to add your own password generator module. This is steps to follow to add your own password generator:
 
 
 ***** STEP 1 *****
@@ -13,18 +12,16 @@ to add you own password generator:
 Copy file
 htdocs/core/modules/security/modGeneratePassNone.class.php
 into
-htdocs/core/modules/mailings/modMyGenerator.class.php
+htdocs/core/modules/mailings/modGeneratePassMygenerator.class.php
 
-You can choose value of your choice instead of "myGenerator" in name
-of new file.
+You can choose value of your choice instead of "Mygenerator" in name of new file.
 
 
 ***** STEP 2 *****
 
-Edit this file modMyGenerator.class.php and change following text:
+Edit this file modGeneratePassMygenerator.class.php and change following text:
 
-"class modGeneratePassNone"       into    "class modMyGenerator"
-"function modGeneratePassNone"    into    "function modMyGenerator"
+"class modGeneratePassNone"     into    "class modGeneratePassMygenerator"
 
 Then add code inside the "getDecription" function. 
 Then add code inside the "getExample" function. 
diff --git a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
index e353903b6e7..c6cfb733f73 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
@@ -26,8 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/security/generate/modules_genpassw
 
 
 /**
- *	    \class      modGeneratePassNone
- *		\brief      Class to generate a password according to rule 'no password'
+ *	Class to generate a password according to rule 'no password'
  */
 class modGeneratePassNone extends ModeleGenPassword
 {
@@ -36,8 +35,20 @@ class modGeneratePassNone extends ModeleGenPassword
 	 */
 	public $id;
 
+	/**
+	 * Minimum length (text visible by end user)
+	 *
+	 * @var string
+	 */
 	public $length;
 
+	/**
+	 * Minimum length in number of characters
+	 *
+	 * @var integer
+	 */
+	public $length2;
+
 	/**
 	 * @var DoliDB Database handler.
 	 */
@@ -60,6 +71,7 @@ class modGeneratePassNone extends ModeleGenPassword
 	{
 		$this->id = "none";
 		$this->length = 0;
+		$this->length2 = 0;
 
 		$this->db = $db;
 		$this->conf = $conf;
@@ -99,10 +111,11 @@ class modGeneratePassNone extends ModeleGenPassword
 	}
 
 	/**
-	 * 		Validate a password
+	 * 	Validate a password.
+	 * 	This function is called by User->setPassword() and internally to validate that the password matches the constraints.
 	 *
-	 *		@param		string	$password	Password to check
-	 *      @return     int					0 if KO, >0 if OK
+	 *	@param		string	$password	Password to check
+	 *  @return     int					0 if KO, >0 if OK
 	 */
 	public function validatePassword($password)
 	{
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
index d49d8b69c46..baa818aa63b 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -28,8 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/security/generate/modules_genpassw
 
 
 /**
- *	    \class      modGeneratePassPerso
- *		\brief      Class to generate a password according to personal rules
+ *	Class to generate a password according to personal rules
  */
 class modGeneratePassPerso extends ModeleGenPassword
 {
@@ -38,13 +37,31 @@ class modGeneratePassPerso extends ModeleGenPassword
 	 */
 	public $id;
 
+	/**
+	 * Minimum length (text visible by end user)
+	 *
+	 * @var string
+	 */
 	public $length;
-	public $length2; // didn't overright display
+
+	/**
+	 * Minimum length in number of characters
+	 *
+	 * @var integer
+	 */
+	public $length2;
+
 	public $NbMaj;
 	public $NbNum;
 	public $NbSpe;
 	public $NbRepeat;
-	public $WithoutAmbi;
+
+	/**
+	 * Flag to 1 if we must clean ambiguous charaters for the autogeneration of password (List of ambiguous char is in $this->Ambi)
+	 *
+	 * @var integer
+	 */
+	public $WithoutAmbi = 0;
 
 	/**
 	 * @var DoliDB Database handler.
@@ -81,7 +98,7 @@ class modGeneratePassPerso extends ModeleGenPassword
 		$this->user = $user;
 
 		if (empty($conf->global->USER_PASSWORD_PATTERN)) {
-			// default value (10carac, 1maj, 1digit, 1spe,  3 repeat, no ambi at auto generation.
+			// default value at auto generation (12 chars, 1 upercase, 1 digit, 1 special char,  3 repeat, exclude ambiguous characters).
 			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '12;1;1;1;3;1', 'chaine', 0, '', $conf->entity);
 		}
 
@@ -98,7 +115,15 @@ class modGeneratePassPerso extends ModeleGenPassword
 		$this->NbSpe = $tabConf[3];
 		$this->NbRepeat = $tabConf[4];
 		$this->WithoutAmbi = $tabConf[5];
+	}
 
+	/**
+	 *	Init the property ->All and clean ->Maj, ->Min, ->Nb and ->Spe with list of valid chars
+	 *
+	 *  @return		void
+	 */
+	private function initAll()
+	{
 		if ($this->WithoutAmbi) {
 			$this->Maj = str_replace($this->Ambi, "", $this->Maj);
 			$this->Min = str_replace($this->Ambi, "", $this->Min);
@@ -108,16 +133,12 @@ class modGeneratePassPerso extends ModeleGenPassword
 
 		$pattern = $this->Min.(!empty($this->NbMaj) ? $this->Maj : '').(!empty($this->NbNum) ? $this->Nb : '').(!empty($this->NbSpe) ? $this->Spe : '');
 		$this->All = str_shuffle($pattern);
-
-		//$this->All = str_shuffle($this->Maj. $this->Min. $this->Nb. $this->Spe);
-		//$this->All = $this->Maj. $this->Min. $this->Nb. $this->Spe;
-		//$this->All =  $this->Spe;
 	}
 
 	/**
-	 *		Return description of module
+	 *	Return description of module
 	 *
-	 *      @return     string      Description of text
+	 *  @return     string      Description of text
 	 */
 	public function getDescription()
 	{
@@ -126,9 +147,9 @@ class modGeneratePassPerso extends ModeleGenPassword
 	}
 
 	/**
-	 * 		Return an example of password generated by this module
+	 * 	Return an example of password generated by this module
 	 *
-	 *      @return     string      Example of password
+	 *  @return     string      Example of password
 	 */
 	public function getExample()
 	{
@@ -142,6 +163,8 @@ class modGeneratePassPerso extends ModeleGenPassword
 	 */
 	public function getNewGeneratedPassword()
 	{
+		$this->initAll();
+
 		$pass = "";
 		for ($i = 0; $i < $this->NbMaj; $i++) {
 			// Y
@@ -169,67 +192,95 @@ class modGeneratePassPerso extends ModeleGenPassword
 			return $pass;
 		}
 
-		return $this->getNewGeneratedPassword();
+		return $this->getNewGeneratedPassword();	// warning, may generate infinite loop if conditions are not possible
 	}
 
 	/**
-	 *  Validate a password
+	 *  Validate a password.
+	 * 	This function is called by User->setPassword() and internally to validate that the password matches the constraints.
 	 *
 	 *  @param      string  $password   Password to check
-	 *  @return     bool                false if KO, true if OK
+	 *  @return     int					0 if KO, >0 if OK
 	 */
 	public function validatePassword($password)
 	{
+		global $langs;
+
+		$this->initAll();	// For the case this method is called alone
+
+		$password_a = preg_split('//u', $password, null, PREG_SPLIT_NO_EMPTY);
+		$maj = preg_split('//u', $this->Maj, null, PREG_SPLIT_NO_EMPTY);
+		$num = preg_split('//u', $this->Nb, null, PREG_SPLIT_NO_EMPTY);;
+		$spe = preg_split('//u', $this->Spe, null, PREG_SPLIT_NO_EMPTY);
+		/*
 		$password_a = str_split($password);
 		$maj = str_split($this->Maj);
 		$num = str_split($this->Nb);
 		$spe = str_split($this->Spe);
+		*/
+
+		if (dol_strlen($password) < $this->length2) {
+			$langs->load("other");
+			$this->error = $langs->trans("YourPasswordMustHaveAtLeastXChars", $this->length2);
+			return 0;
+		}
 
 		if (count(array_intersect($password_a, $maj)) < $this->NbMaj) {
-			return false;
+			$langs->load("other");
+			$this->error = $langs->trans('PasswordNeedAtLeastXUpperCaseChars', $this->NbMaj);
+			return 0;
 		}
 
 		if (count(array_intersect($password_a, $num)) < $this->NbNum) {
-			return false;
+			$langs->load("other");
+			$this->error = $langs->trans('PasswordNeedAtLeastXDigitChars', $this->NbNum);
+			return 0;
 		}
 
 		if (count(array_intersect($password_a, $spe)) < $this->NbSpe) {
-			return false;
+			$langs->load("other");
+			$this->error = $langs->trans('PasswordNeedAtLeastXSpecialChars', $this->NbSpe);
+			return 0;
 		}
 
-		if (!$this->consecutiveInterationSameCharacter($password)) {
-			return false;
+		if (!$this->consecutiveIterationSameCharacter($password)) {
+			$langs->load("other");
+			$this->error = $langs->trans('PasswordNeedNoXConsecutiveChars', $this->NbRepeat);
+			return 0;
 		}
 
-		return true;
+		return 1;
 	}
 
 	/**
-	 *  Check the consecutive iterations of the same character. Return false if the number doesn't match the maximum consecutive value allowed.
+	 *  Check the consecutive iterations of the same character.
 	 *
 	 *  @param		string	$password	Password to check
-	 *  @return     bool
+	 *  @return     bool				False if the number doesn't match the maximum consecutive value allowed.
 	 */
-	private function consecutiveInterationSameCharacter($password)
+	public function consecutiveIterationSameCharacter($password)
 	{
-		$last = "";
+		$this->initAll();
 
 		if (empty($this->NbRepeat)) {
-			return 1;
+			return true;
 		}
 
-		$count = 0;
-		$char = str_split($password);
+		$char = preg_split('//u', $password, null, PREG_SPLIT_NO_EMPTY);
 
+		$last = "";
+		$count = 0;
 		foreach ($char as $c) {
 			if ($c != $last) {
 				$last = $c;
-				$count = 0;
-
+				$count = 1;
+				//print "Char $c - count = $count\n";
 				continue;
 			}
 
 			$count++;
+			//print "Char $c - count = $count\n";
+
 			if ($count > $this->NbRepeat) {
 				return false;
 			}
diff --git a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
index a358f916429..f0e6fcf2a7f 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
@@ -26,8 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/security/generate/modules_genpassw
 
 
 /**
- *	    \class      modGeneratePassStandard
- *		\brief      Class to generate a password according to a dolibarr standard rule (8 random chars)
+ *	Class to generate a password according to a dolibarr standard rule (12 random chars)
  */
 class modGeneratePassStandard extends ModeleGenPassword
 {
@@ -36,8 +35,20 @@ class modGeneratePassStandard extends ModeleGenPassword
 	 */
 	public $id;
 
+	/**
+	 * Minimum length (text visible by end user)
+	 *
+	 * @var string
+	 */
 	public $length;
 
+	/**
+	 * Minimum length in number of characters
+	 *
+	 * @var integer
+	 */
+	public $length2;
+
 	/**
 	 * @var DoliDB Database handler.
 	 */
@@ -60,6 +71,7 @@ class modGeneratePassStandard extends ModeleGenPassword
 	{
 		$this->id = "standard";
 		$this->length = 12;
+		$this->length2 = 12;
 
 		$this->db = $db;
 		$this->conf = $conf;
@@ -125,15 +137,21 @@ class modGeneratePassStandard extends ModeleGenPassword
 
 	/**
 	 *  Validate a password
+	 * 	This function is called by User->setPassword() and internally to validate that the password matches the constraints.
 	 *
 	 *  @param      string  $password   Password to check
 	 *  @return     int                 0 if KO, >0 if OK
 	 */
 	public function validatePassword($password)
 	{
-		if (dol_strlen($password) < $this->length) {
+		global $langs;
+
+		if (dol_strlen($password) < $this->length2) {
+			$langs->load("other");
+			$this->error = $langs->trans("YourPasswordMustHaveAtLeastXChars", $this->length2);
 			return 0;
 		}
+
 		return 1;
 	}
 }
diff --git a/htdocs/core/modules/security/generate/modules_genpassword.php b/htdocs/core/modules/security/generate/modules_genpassword.php
index 37bb37ad092..4d397605240 100644
--- a/htdocs/core/modules/security/generate/modules_genpassword.php
+++ b/htdocs/core/modules/security/generate/modules_genpassword.php
@@ -25,11 +25,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 
 
 /**
- *  \class      ModeleGenPassword
- *  \brief      Parent class for password rules/management modules
+ *  Parent class for password rules/management modules
  */
 abstract class ModeleGenPassword
 {
+	/**
+	 * Flag to 1 if we must clean ambiguous charaters for the autogeneration of password (List of ambiguous char is in $this->Ambi)
+	 *
+	 * @var integer
+	 */
+	public $WithoutAmbi = 0;
+
 	/**
 	 * @var string Error code (or message)
 	 */
@@ -80,10 +86,11 @@ abstract class ModeleGenPassword
 	}
 
 	/**
-	 * 		Validate a password
+	 * 	Validate a password.
+	 * 	This function is called by User->setPassword() and internally to validate that the password matches the constraints.
 	 *
-	 *		@param		string	$password	Password to check
-	 *      @return     int					0 if KO, >0 if OK
+	 *	@param		string	$password	Password to check
+	 *  @return     int					0 if KO, >0 if OK
 	 */
 	public function validatePassword($password)
 	{
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 fdafb22e96b..aaa9c03c6e7 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -102,11 +102,13 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
+		$texte .= '<!-- form for option of ODT templates -->';
 		$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">';
 		$texte .= '<input type="hidden" name="param1" value="COMPANY_ADDON_PDF_ODT_PATH">';
-		$texte .= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<table class="nobordernopadding centpercent">';
 
 		// List of directories area
 		$texte .= '<tr><td>';
@@ -141,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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 		$texte .= '</table>';
@@ -160,19 +162,23 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 			$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=doctemplates&file=thirdparties/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' &nbsp; <a class="reposition" href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=thirdparties/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=COMPANY_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="COMPANY_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
@@ -320,17 +326,22 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 
 						foreach ($contact_arrray as $array_key => $contact_id) {
 							$res_contact = $contactstatic->fetch($contact_id);
-							$tmparray = $this->get_substitutionarray_contact($contactstatic, $outputlangs, 'contact');
-							foreach ($tmparray as $key => $val) {
-								try {
-									$listlines->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e) {
-									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e) {
-									dol_syslog($e->getMessage(), LOG_INFO);
+							if ((int) $res_contact > 0) {
+								$tmparray = $this->get_substitutionarray_contact($contactstatic, $outputlangs, 'contact');
+								foreach ($tmparray as $key => $val) {
+									try {
+										$listlines->setVars($key, $val, true, 'UTF-8');
+									} catch (OdfException $e) {
+										dol_syslog($e->getMessage(), LOG_INFO);
+									} catch (SegmentException $e) {
+										dol_syslog($e->getMessage(), LOG_INFO);
+									}
 								}
+								$listlines->merge();
+							} else {
+								$this->error = $contactstatic->error;
+								dol_syslog($this->error, LOG_WARNING);
 							}
-							$listlines->merge();
 						}
 						$odfHandler->mergeSegment($listlines);
 					} catch (OdfException $e) {
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 705564e7e8e..6079120a305 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -119,6 +119,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		$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="COMPANY_ELEPHANT_MASK_CUSTOMER">';
 		$texte .= '<input type="hidden" name="param2" value="COMPANY_ELEPHANT_MASK_SUPPLIER">';
@@ -132,15 +133,15 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 
 		// Parametrage du prefix customers
 		$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="'.$conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER.'"'.$disabled.'>', $tooltip, 1, 1).'</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" value="'.$langs->trans("Modify").'" name="Button"'.$disabled.'></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 .= '</tr>';
 
 		// Parametrage du prefix suppliers
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("SupplierCodeModel").'):</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value2" value="'.$conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER.'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value2" value="'.getDolGlobalString('COMPANY_ELEPHANT_MASK_SUPPLIER').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
 		$texte .= '</table>';
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index 752691b03b8..ff5d737872a 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -82,6 +82,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		$tooltip = '';
 		$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="COMPANY_AQUARIUM_MASK_SUPPLIER">';
 		$texte .= '<input type="hidden" name="param2" value="COMPANY_AQUARIUM_MASK_CUSTOMER">';
@@ -102,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" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td class="right"><input type="submit" class="button button-edit reposition" name="Button" 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 56c5b8e8885..217e027d152 100644
--- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
@@ -96,6 +96,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 		$tooltip = '';
 		$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="COMPANY_DIGITARIA_MASK_SUPPLIER">';
 		$texte .= '<input type="hidden" name="param2" value="COMPANY_DIGITARIA_MASK_CUSTOMER">';
@@ -125,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" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td class="right"><input type="submit" class="button button-edit reposition" name="Button" value="'.$langs->trans("Modify").'"></td>';
 		$texte .= '</tr></table>';
 		$texte .= '</form>';
 
@@ -252,17 +253,32 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 	 */
 	public function checkIfAccountancyCodeIsAlreadyUsed($db, $code, $type = '')
 	{
+		global $conf;
+
 		if ($type == 'supplier') {
-			$typethirdparty = 'code_compta_fournisseur';
+			if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+				$typethirdparty = 'accountancy_code_supplier';
+			} else {
+				$typethirdparty = 'code_compta_fournisseur';
+			}
 		} elseif ($type == 'customer') {
-			$typethirdparty = 'code_compta';
+			if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+				$typethirdparty = 'accountancy_code_customer';
+			} else {
+				$typethirdparty = 'code_compta';
+			}
 		} else {
 			$this->error = 'Bad value for parameter type';
 			return -1;
 		}
 
-		$sql = "SELECT ".$typethirdparty." FROM ".MAIN_DB_PREFIX."societe";
-		$sql .= " WHERE ".$typethirdparty." = '".$db->escape($code)."'";
+		if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+			$sql = "SELECT " . $typethirdparty . " FROM " . MAIN_DB_PREFIX . "societe_perentity";
+			$sql .= " WHERE " . $typethirdparty . " = '" . $db->escape($code) . "'";
+		} else {
+			$sql = "SELECT " . $typethirdparty . " FROM " . MAIN_DB_PREFIX . "societe";
+			$sql .= " WHERE " . $typethirdparty . " = '" . $db->escape($code) . "'";
+		}
 
 		$resql = $db->query($sql);
 		if ($resql) {
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 7786a6db3fe..c3e26e591c7 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
@@ -119,6 +119,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 		$texte = $this->description.".<br>\n";
 		$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">';
 		$texte .= '<input type="hidden" name="param1" value="STOCK_ADDON_PDF_ODT_PATH">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
@@ -155,7 +156,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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -179,13 +180,15 @@ class doc_generic_stock_odt extends ModelePDFStock
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="STOCK_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index d3cc0b7d6a7..f66e7e6e5d1 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -174,10 +174,13 @@ class pdf_standard extends ModelePDFStock
 			$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;
 	}
 
 
@@ -209,8 +212,6 @@ class pdf_standard extends ModelePDFStock
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "stocks", "orders", "deliveries"));
 
-		$nblines = count($object->lines);
-
 		if ($conf->stock->dir_output) {
 			// Definition of $dir and $file
 			if ($object->specimen) {
@@ -296,14 +297,10 @@ class pdf_standard extends ModelePDFStock
 				$tab_top = 65 + $top_shift;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
-				$tab_height = 130;
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
 
-				/* ************************************************************************** */
-				/*                                                                            */
-				/* Show list of product in warehouse                                          */
-				/*                                                                            */
-				/* ************************************************************************** */
+				// Show list of product in warehouse                                          */
 
 				$totalunit = 0;
 				$totalvalue = $totalvaluesell = 0;
@@ -326,7 +323,6 @@ class pdf_standard extends ModelePDFStock
 					$i = 0;
 					$nblines = $num;
 
-					$this->tabTitleHeight = 10;
 					$nexY = $tab_top + $this->tabTitleHeight;
 
 					for ($i = 0; $i < $nblines; $i++) {
@@ -338,8 +334,8 @@ class pdf_standard extends ModelePDFStock
 						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=".$objp->rowid;
-							$sql .= " AND lang='".$this->db->escape($langs->getDefaultLang())."'";
+							$sql .= " WHERE fk_product = ".((int) $objp->rowid);
+							$sql .= " AND lang = '".$this->db->escape($langs->getDefaultLang())."'";
 							$sql .= " LIMIT 1";
 
 							$result = $this->db->query($sql);
@@ -738,7 +734,7 @@ class pdf_standard extends ModelePDFStock
 		if (empty($hidetop)) {
 			$pdf->SetDrawColor(200, 200, 200);
 			$pdf->SetLineStyle(array('dash' => '0', 'color' => array(200, 200, 200)));
-			$pdf->line($this->marge_gauche, $tab_top + 10, $this->page_largeur - $this->marge_droite, $tab_top + 10);
+			$pdf->line($this->marge_gauche, $tab_top + $this->tabTitleHeight, $this->page_largeur - $this->marge_droite, $tab_top + $this->tabTitleHeight);
 			$pdf->SetLineStyle(array('dash' => 0));
 		}
 	}
@@ -772,8 +768,8 @@ class pdf_standard extends ModelePDFStock
 		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);
+		if ($object->statut == 0 && (!empty($conf->global->STOCK_DRAFT_WATERMARK))) {
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->STOCK_DRAFT_WATERMARK);
 		}
 
 		$pdf->SetTextColor(0, 0, 60);
@@ -785,6 +781,7 @@ class pdf_standard extends ModelePDFStock
 		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
+		$height = 0;
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
 		if ($this->emetteur->logo) {
 			if (is_readable($logo)) {
@@ -801,29 +798,19 @@ class pdf_standard extends ModelePDFStock
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
 
+		$yafterleft = $pdf->GetY() + $height;
+
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$title = $outputlangs->transnoentities("Warehouse");
-		$pdf->MultiCell(100, 3, $title, '', 'R');
 
-		$pdf->SetFont('', 'B', $default_font_size);
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Warehouse").' '.$outputlangs->convToOutputCharset($object->label), '', 'R');
 
-		$posy += 5;
-		$pdf->SetXY($posx, $posy);
-		$pdf->SetTextColor(0, 0, 60);
-
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->label), '', 'R');
-
-		$posy += 5;
+		$posy += 6;
 		$pdf->SetFont('', '', $default_font_size - 1);
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("LocationSummary").' :', '', 'R');
-
-		$posy += 4;
-		$pdf->SetXY($posx - 50, $posy);
-		$pdf->MultiCell(150, 3, $object->lieu, '', 'R');
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Label").' : '.$object->lieu, '', 'R');
 
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);
@@ -841,8 +828,10 @@ class pdf_standard extends ModelePDFStock
 			$pdf->MultiCell(150, 3, $e->label, '', 'R');
 		}
 
+		$yafterright = $pdf->GetY();
+
 		// Description
-		$nexY = $pdf->GetY();
+		$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);
@@ -864,6 +853,9 @@ class pdf_standard extends ModelePDFStock
 		$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();
 
 		// Last movement
 		$sql = "SELECT max(m.datem) as datem";
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 c4fb2ef7b50..23a38b961ec 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -133,7 +133,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$this->db = $db;
 		$this->name = "canelle";
 		$this->description = $langs->trans('SuppliersInvoiceModel');
-		$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 = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		// Page dimensions
 		$this->type = 'pdf';
@@ -181,6 +181,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		}
 
 		$this->tva = array();
+		$this->tva_array = array();
 		$this->localtax1 = array();
 		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
index 57d5798c29e..e6838b9c4c4 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
@@ -95,7 +95,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 		$texte .= ':</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskinvoice" value="'.$conf->global->SUPPLIER_INVOICE_TULIP_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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
@@ -104,7 +104,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskcredit" value="'.$conf->global->SUPPLIER_CREDIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
-		if ($conf->global->MAIN_FEATURE_LEVEL >= 2) {
+		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 			// Parametrage du prefix des replacement
 			$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
 			$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
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 fda262a8870..436622d6451 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
@@ -123,6 +123,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 		$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="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="SUPPLIER_ORDER_ADDON_PDF_ODT_PATH">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
@@ -159,7 +160,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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -184,7 +185,9 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
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 e823ceebb25..5fcd0ee20de 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -169,6 +169,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$this->posxdesc = $this->marge_gauche + 1; // For module retrocompatibility support durring PDF transition: TODO remove this at the end
 
 		$this->tva = array();
+		$this->tva_array = array();
 		$this->localtax1 = array();
 		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
@@ -363,6 +364,8 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$tab_top = 90 + $top_shift;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
+
 				// Incoterm
 				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
@@ -484,8 +487,8 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 						}
 						$height_note = $posyafter - $tab_top_newpage;
 						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-					} else // No pagebreak
-					{
+					} else {
+						// No pagebreak
 						$pdf->commitTransaction();
 						$posyafter = $pdf->GetY();
 						$height_note = $posyafter - $tab_top;
@@ -672,7 +675,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					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);
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey, $outputlangs);
 								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
 								$nexY = max($pdf->GetY(), $nexY);
 							}
@@ -736,10 +739,17 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
 						$vatrate .= '*';
 					}
+
+					// Fill $this->tva and $this->tva_array
 					if (!isset($this->tva[$vatrate])) {
 						$this->tva[$vatrate] = 0;
 					}
 					$this->tva[$vatrate] += $tvaligne;
+					$vatcode = $object->lines[$i]->vat_src_code;
+					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
+						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
+					}
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					if ($posYAfterImage > $posYAfterDescription) {
 						$nexY = $posYAfterImage;
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 736e23519bc..11ae04993eb 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -135,7 +135,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$this->db = $db;
 		$this->name = "muscadet";
 		$this->description = $langs->trans('SuppliersCommandModelMuscadet');
-		$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 = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		// Page size for A4 format
 		$this->type = 'pdf';
@@ -197,6 +197,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		}
 
 		$this->tva = array();
+		$this->tva_array = array();
 		$this->localtax1 = array();
 		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
@@ -617,10 +618,17 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
 						$vatrate .= '*';
 					}
+
+					// Fill $this->tva and $this->tva_array
 					if (!isset($this->tva[$vatrate])) {
 						$this->tva[$vatrate] = 0;
 					}
 					$this->tva[$vatrate] += $tvaligne;
+					$vatcode = $object->lines[$i]->vat_src_code;
+					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
+						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
+					}
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					if ($posYAfterImage > $posYAfterDescription) {
 						$nexY = $posYAfterImage;
@@ -1127,7 +1135,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		global $langs, $conf, $mysoc;
 
 		$ltrdirection = 'L';
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
+			$ltrdirection = 'R';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "sendings"));
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
index c691b1448ef..473664cb44c 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
@@ -87,7 +87,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskorder" value="'.$conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
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 b6da2d4c294..608d765b1c5 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -132,7 +132,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 = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		// Page size for A4 format
 		$this->type = 'pdf';
@@ -168,6 +168,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		}
 
 		$this->tva = array();
+		$this->tva_array = array();
 		$this->localtax1 = array();
 		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
@@ -317,8 +318,8 @@ class pdf_standard extends ModelePDFSuppliersPayments
 
 				$tab_top = 90;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
-				$tab_height = 130;
-				$tab_height_newpage = 150;
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
 				// Incoterm
 				$height_incoterms = 0;
@@ -812,6 +813,25 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
 			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+
+			// Show default IBAN account
+			$sql = "SELECT iban_prefix as iban";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as rib";
+			$sql .= " WHERE fk_soc = ".($object->thirdparty->id);
+			$sql .= " AND rib.default_rib = 1";
+			$sql .= " AND rib.type = 'ban'";
+			$sql .= " LIMIT 1";
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$obj = $this->db->fetch_object($resql);
+				$iban = $obj->iban;
+			}
+
+			if (!empty($iban)) {
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->SetXY($posx + 2, $posy + 15);
+				$pdf->MultiCell($widthrecbox, 4, $langs->trans("IBAN").': '.$iban, 0, 'L');
+			}
 		}
 	}
 
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
index 19e632a6264..0bc0543e6cd 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
@@ -84,7 +84,7 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="masksupplierpayment" value="'.$conf->global->SUPPLIER_PAYMENT_BRODATOR_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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
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 1efb4af3a55..04f6ed49012 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
@@ -121,6 +121,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		$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="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH">';
 		if ($conf->global->MAIN_SUPPLIER_PROPOSAL_CHOOSE_ODT_DOCUMENT > 0) {
@@ -162,7 +163,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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -211,7 +212,9 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
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 7e1b1105452..0c708351acc 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -132,7 +132,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$this->db = $db;
 		$this->name = "aurore";
 		$this->description = $langs->trans('DocModelAuroreDescription');
-		$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 = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
 		// Page size for A4 format
 		$this->type = 'pdf';
@@ -194,6 +194,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		}
 
 		$this->tva = array();
+		$this->tva_array = array();
 		$this->localtax1 = array();
 		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
@@ -611,10 +612,17 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
 						$vatrate .= '*';
 					}
+
+					// Fill $this->tva and $this->tva_array
 					if (!isset($this->tva[$vatrate])) {
 						$this->tva[$vatrate] = 0;
 					}
 					$this->tva[$vatrate] += $tvaligne;
+					$vatcode = $object->lines[$i]->vat_src_code;
+					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
+						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
+					}
+					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					if ($posYAfterImage > $posYAfterDescription) {
 						$nexY = $posYAfterImage;
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 3b8754d9928..e7db54062cb 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
@@ -87,7 +87,7 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="masksupplier_proposal" value="'.$conf->global->SUPPLIER_PROPOSAL_SAPHIR_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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
index 1b0a5d5bf32..41b7bb8c90e 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
@@ -63,17 +63,20 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 	{
 		global $langs;
 
-		return $langs->trans('SimpleNumRefModelDesc', $this->prefix.'0-');
+		$textinfo = $langs->trans('SimpleNumRefModelDesc', $this->prefix.'0-');
+		$textinfo .= '<br>'.$langs->trans('EachTerminalHasItsOwnCounter');
+
+		return $textinfo;
 	}
 
 	/**
-	 *  Return an example of numbering module values
+	 * Return an example of numbering module values
 	 *
-	 * @return     string      Example
+	 * @return     string      Example.
 	 */
 	public function getExample()
 	{
-		return $this->prefix.'0-0501-0001';
+		return $this->prefix.'0-0501-0001';		// TC0-0501-0001
 	}
 
 	/**
@@ -89,14 +92,14 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 		$pryymm = '';
 		$max = '';
 
-		$pos_source = 0;
+		$pos_source = 0;	// POS source = Terminal ID
 
 		// First, we get the max value
-		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;
+		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;	// So posindice is position after TCX-YYMM-
 
 		$sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source."-____-%")."'";
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
@@ -118,25 +121,29 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 	}
 
 	/**
-	 *  Return next value
+	 * Return next value.
+	 * Note to increase perf of this numbering engine:
+	 * ALTER TABLE llx_facture ADD COLUMN calculated_numrefonly INTEGER AS (CASE SUBSTRING(ref FROM 1 FOR 2) WHEN 'TC' THEN CAST(SUBSTRING(ref FROM 10) AS SIGNED) ELSE 0 END) PERSISTENT;
+	 * ALTER TABLE llx_facture ADD INDEX calculated_numrefonly_idx (calculated_numrefonly);
 	 *
 	 * @param   Societe     $objsoc     Object third party
 	 * @param   Facture		$invoice	Object invoice
 	 * @param   string		$mode       'next' for next value or 'last' for last value
-	 * @return  string      Next value
+	 * @return  string      			Next ref value or last ref if $mode is 'last'
 	 */
 	public function getNextValue($objsoc = null, $invoice = null, $mode = 'next')
 	{
 		global $db;
 
-		$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;
+		$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;	// POS source = Terminal ID
 
 		// First, we get the max value
-		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;
+		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;	// So posindice is position after TCX-YYMM-
 		$sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source)."-____-%'";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source."-____-%")."'";
 		$sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
+		//$sql .= " and module_source = 'takepos'";
 
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -161,7 +168,7 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 			$ref = '';
 			$sql  = "SELECT ref as ref";
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture";
-			$sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source)."-____-".$num."'";
+			$sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source."-____-".$num)."'";
 			$sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
 			$sql .= " ORDER BY ref DESC";
 
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
index d103dbe3b0b..b3d26b39511 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
@@ -81,7 +81,7 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
 		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.$conf->global->TAKEPOS_REF_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
index e2aeb135ef4..86b9d44ad9b 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
@@ -113,6 +113,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 		$texte = $this->description.".<br>\n";
 		$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">';
 		$texte .= '<input type="hidden" name="param1" value="TICKET_ADDON_PDF_ODT_PATH">';
 
@@ -150,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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -167,13 +168,15 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="TICKET_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php
index f60b1f16481..176af782dc7 100644
--- a/htdocs/core/modules/ticket/mod_ticket_universal.php
+++ b/htdocs/core/modules/ticket/mod_ticket_universal.php
@@ -83,7 +83,7 @@ class mod_ticket_universal extends ModeleNumRefTicket
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskticket" value="'.$conf->global->TICKET_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
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 eb36929a252..656eb88ecaa 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
@@ -118,6 +118,7 @@ class doc_generic_user_odt extends ModelePDFUser
 		$texte = $this->description.".<br>\n";
 		$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">';
 		$texte .= '<input type="hidden" name="param1" value="USER_ADDON_PDF_ODT_PATH">';
 		if (!empty($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT)) {
@@ -159,7 +160,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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -199,13 +200,15 @@ class doc_generic_user_odt extends ModelePDFUser
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="USER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
-		$texte .= '<input type="submit" class="button small" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
 
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
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 7dca5765ed1..e1c83023df9 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
@@ -121,6 +121,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 		$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="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) {
@@ -162,7 +163,7 @@ 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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -197,7 +198,9 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
@@ -258,7 +261,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				}
 			}
 
-			$dir = $conf->usergroup->dir_output;
+			$dir = $conf->user->dir_output.'/usergroups';
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) {
 				$dir .= "/".$objectref;
diff --git a/htdocs/core/modules/workstation/mod_workstation_advanced.php b/htdocs/core/modules/workstation/mod_workstation_advanced.php
old mode 100755
new mode 100644
index bf783542c75..6611f8d926e
--- a/htdocs/core/modules/workstation/mod_workstation_advanced.php
+++ b/htdocs/core/modules/workstation/mod_workstation_advanced.php
@@ -27,7 +27,7 @@
  * \brief      File containing class for advanced numbering model of Workstation
  */
 
-require_once DOL_DOCUMENT_ROOT . '/core/modules/workstation/modules_workstation.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/workstation/modules_workstation.php';
 
 
 /**
@@ -82,7 +82,7 @@ class mod_workstation_advanced extends ModeleNumRefWorkstation
 		$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="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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/workstation/mod_workstation_standard.php b/htdocs/core/modules/workstation/mod_workstation_standard.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/modules/workstation/modules_workstation.php b/htdocs/core/modules/workstation/modules_workstation.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/multicompany_page.php b/htdocs/core/multicompany_page.php
new file mode 100644
index 00000000000..4a3bcba51fb
--- /dev/null
+++ b/htdocs/core/multicompany_page.php
@@ -0,0 +1,154 @@
+<?php
+/* Copyright (C) 2005-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This file is a modified version of datepicker.php from phpBSM to fix some
+ * bugs, to add new features and to dramatically increase speed.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/multicompany_page.php
+ *       \brief      File to return a page with the list of all entities user can switch to
+ */
+
+//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'))    define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+//if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+//if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
+
+require_once '../main.inc.php';
+
+$action = GETPOST('action', 'aZ09');
+$entityid = GETPOST('entity', 'int');
+$backtourl = GETPOST('backtourl');
+if (empty($backtourl)) {
+	$backtourl = DOL_URL_ROOT;
+}
+
+if (GETPOST('lang', 'aZ09')) {
+	$langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
+}
+
+$langs->load("main");
+
+$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
+$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('acction', 'aZ') == 'switchentity') {
+	if (is_object($mc)) {
+		$mc->switchEntity($entityid);
+	}
+
+	header("Location: ".$backtourl);
+	exit(0);
+}
+
+
+
+/*
+ * View
+ */
+
+$title = $langs->trans("Multicompanies");
+
+// URL http://mydolibarr/core/multicompany_page?dol_use_jmobile=1 can be used for tests
+$head = '<!-- Multicompany selection -->'."\n";	// This is used by DoliDroid to know page is a multicompany selection page
+$arrayofjs = array();
+$arrayofcss = array();
+top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
+
+
+print '<body>'."\n";
+print '<div>';
+//print '<br>';
+
+
+if (empty($conf->multicompany->enabled)) {
+	$langs->load("admin");
+	$bookmarkList .= '<br><span class="opacitymedium">'.$langs->trans("WarningModuleNotActive", $langs->transnoentitiesnoconv("MultiCompany")).'</span>';
+	$bookmarkList .= '<br><br>';
+} else {
+	// Instantiate hooks of thirdparty module
+	$hookmanager->initHooks(array('multicompany'));
+
+	// Define $bookmarks
+	$multicompanyList = '';
+	$searchForm = '';
+
+
+	if (is_object($mc)) {
+		$listofentities = $mc->getEntitiesList($user->login, false, true);
+	}
+
+	$multicompanyList .= '<ul class="ullistonly left" style="list-style: none;">';
+	foreach ($listofentities as $entityid => $entitycursor) {
+		$url = DOL_URL_ROOT.'/core/multicompany_page.php?action=switchentity&token='.newToken().'&entity='.((int) $entityid).($backtourl ? '&backtourl='.urlencode($backtourl) : '');
+		$multicompanyList .= '<li class="lilistonly" style="height: 2.5em; font-size: 1.15em;">';
+		$multicompanyList .= '<a class="dropdown-item multicompany-item" id="multicompany-item-'.$entityid.'" data-id="'.$entityid.'" href="'.dol_escape_htmltag($url).'">';
+		$multicompanyList .= img_picto('', 'entity', 'class="pictofixedwidth"');
+		$multicompanyList .= dol_escape_htmltag($entitycursor);
+		if ($conf->entity == $entityid) {
+			$multicompanyList .= ' <span class="opacitymedium">('.$langs->trans("Currently").')</span>';
+		}
+		$multicompanyList .= '</a>';
+		$multicompanyList .= '</li>';
+	}
+	$multicompanyList .= '</ul>';
+
+	$searchForm .= '<input name="bookmark" id="top-multicompany-search-input" class="dropdown-search-input" placeholder="'.$langs->trans('Entity').'" autocomplete="off" >';
+
+
+	// Execute hook printBookmarks
+	$parameters = array('multicompany'=>$multicompanyList);
+	$reshook = $hookmanager->executeHooks('printMultiCompanyEntities', $parameters); // Note that $action and $object may have been modified by some hooks
+	if (empty($reshook)) {
+		$multicompanyList .= $hookmanager->resPrint;
+	} else {
+		$multicompanyList = $hookmanager->resPrint;
+	}
+
+
+	print "\n";
+	print "<!-- Begin Multicompany list -->\n";
+	print '<div class="center"><div class="center" style="padding: 6px;">';
+	print '<style>.menu_titre { padding-top: 7px; }</style>';
+	print '<div id="blockvmenusearch" class="tagtable center searchpage">'."\n";
+	print $multicompanyList;
+	print '</div>'."\n";
+	print '</div></div>';
+	print "\n<!-- End SearchForm -->\n";
+}
+
+print '</div>';
+print '</body></html>'."\n";
+
+$db->close();
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 374f381c098..e5c652d7d51 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -68,7 +68,7 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	$accessallowed = 1;
 } elseif ($modulepart == 'member') {
 	$result = restrictedArea($user, 'adherent', $id, '', '', 'fk_soc', 'rowid');
-	if (!$user->rights->adherent->lire) {
+	if (empty($user->rights->adherent->lire)) {
 		accessforbidden();
 	}
 	$accessallowed = 1;
@@ -86,7 +86,7 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	$accessallowed = 1;
 } elseif ($modulepart == 'bank') {
 	$result = restrictedArea($user, 'banque', $id, 'bank_account');
-	if (!$user->rights->banque->lire) {
+	if (empty($user->rights->banque->lire)) {
 		accessforbidden();
 	}
 	$accessallowed = 1;
@@ -98,7 +98,7 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	$accessallowed = 1;
 } elseif ($modulepart == 'facture_fourn' || $modulepart == 'facture_fournisseur') {
 	$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
-	if (!$user->rights->fournisseur->facture->lire) {
+	if (empty($user->rights->fournisseur->facture->lire)) {
 		accessforbidden();
 	}
 	$accessallowed = 1;
@@ -475,7 +475,7 @@ if ($action == 'confirm_crop') {
  * View
  */
 
-$title= $langs->trans("ImageEditor");
+$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');
 
@@ -536,11 +536,16 @@ if (!empty($conf->use_javascript_ajax)) {
 	$widthforcrop = $width;
 	$refsizeforcrop = 'orig';
 	$ratioforcrop = 1;
+
 	// If image is too large, we use another scale.
-	if (!empty($_SESSION['dol_screenwidth']) && ($widthforcrop > round($_SESSION['dol_screenwidth'] / 2))) {
-		$ratioforcrop = 2;
-		$widthforcrop = round($_SESSION['dol_screenwidth'] / $ratioforcrop);
-		$refsizeforcrop = 'screenwidth';
+	if (!empty($_SESSION['dol_screenwidth'])) {
+		$widthforcroporigin = $widthforcrop;
+		while ($widthforcrop > round($_SESSION['dol_screenwidth'] / 1.5)) {
+			//var_dump($widthforcrop.' '.round($_SESSION['dol_screenwidth'] / 1.5));
+			$ratioforcrop = 2 * $ratioforcrop;
+			$widthforcrop = floor($widthforcroporigin / $ratioforcrop);
+			$refsizeforcrop = 'screenwidth';
+		}
 	}
 
 	print '<!-- Form to crop -->'."\n";
@@ -571,8 +576,11 @@ if (!empty($conf->use_javascript_ajax)) {
 		      <input type="hidden" id="file" name="file" value="'.dol_escape_htmltag($original_file).'" />
 		      <input type="hidden" id="action" name="action" value="confirm_crop" />
 		      <input type="hidden" id="product" name="product" value="'.dol_escape_htmltag($id).'" />
+		      <input type="hidden" id="dol_screenwidth" name="dol_screenwidth" value="'.$_SESSION['dol_screenwidth'].'" />
 		      <input type="hidden" id="refsizeforcrop" name="refsizeforcrop" value="'.$refsizeforcrop.'" />
-		      <input type="hidden" id="ratioforcrop" name="ratioforcrop" value="'.$ratioforcrop.'" /><!-- field used by core/lib/lib_photoresize.js -->
+		      <input type="hidden" id="ratioforcrop" name="ratioforcrop" value="'.$ratioforcrop.'" /><!-- value in field used by js/lib/lib_photoresize.js -->
+		      <input type="hidden" id="imagewidth" name="imagewidth" value="'.$width.'" /><!-- value in field used by js/lib/lib_photoresize.js -->
+		      <input type="hidden" id="imageheight" name="imageheight" value="'.$height.'" /><!-- value in field used by js/lib/lib_photoresize.js -->
 	          <input type="hidden" name="modulepart" value="'.dol_escape_htmltag($modulepart).'" />
 		      <input type="hidden" name="id" value="'.dol_escape_htmltag($id).'" />
 		      <br>
@@ -589,7 +597,7 @@ if (!empty($conf->use_javascript_ajax)) {
 }
 
 /* Check that mandatory fields are filled */
-print '<script type="text/javascript" language="javascript">
+print '<script type="text/javascript">
 jQuery(document).ready(function() {
 	$("#submitcrop").click(function(e) {
         console.log("We click on submitcrop");
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index 2b82501208a..4f6911497e4 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -55,10 +55,22 @@ $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
  * View
  */
 
+// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
+if (empty($dolibarr_nocache) && GETPOST('cache', 'int')) {
+	header('Cache-Control: max-age='.GETPOST('cache', 'int').', public');
+	// For a .php, we must set an Expires to avoid to have it forced to an expired value by the web server
+	header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + GETPOST('cache', 'int')).' GMT');
+	// HTTP/1.0
+	header('Pragma: token=public');
+} else {
+	// HTTP/1.0
+	header('Cache-Control: no-cache');
+}
+
 $title = $langs->trans("Search");
 
 // URL http://mydolibarr/core/search_page?dol_use_jmobile=1 can be used for tests
-$head = '<!-- Quick access -->'."\n";
+$head = '<!-- Quick access -->'."\n";	// This is used by DoliDroid to know page is a search page
 $arrayofjs = array();
 $arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index d9c0f650395..9b46fba6c67 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -185,7 +185,7 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 <?php } else { ?>
 	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td>
 <?php } ?>
-<td class="valeur"><textarea name="computed_value" id="computed_value" class="quatrevingtpercent" rows="<?php echo ROWS_4 ?>"><?php echo (GETPOST('computed_value', 'none') ?GETPOST('computed_value', 'none') : ''); ?></textarea></td>
+<td class="valeur"><textarea name="computed_value" id="computed_value" class="quatrevingtpercent" rows="<?php echo ROWS_4 ?>"><?php echo (GETPOSTISSET('computed_value') ? GETPOST('computed_value', 'restricthtml') : ''); ?></textarea></td>
 </tr>
 <!-- Default Value (at sql setup level) -->
 <tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo (GETPOST('default_value', 'alpha') ?GETPOST('default_value', 'alpha') : ''); ?>"></td></tr>
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 284407383d4..d1145229db7 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -41,7 +41,7 @@ $langs->load("modulebuilder");
 print '<span class="opacitymedium">'.$langs->trans("DefineHereComplementaryAttributes", $textobject).'</span><br>'."\n";
 print '<br>';
 
-// Load attribute_label
+// Load $extrafields->attributes
 $extrafields->fetch_name_optionals_label($elementtype);
 
 print '<div class="div-table-responsive">';
@@ -84,18 +84,34 @@ if (isset($extrafields->attributes[$elementtype]['type']) && is_array($extrafiel
 		}
 
 		print '<tr class="oddeven">';
-		print "<td>".$extrafields->attributes[$elementtype]['pos'][$key]."</td>\n";
-		print "<td>".$extrafields->attributes[$elementtype]['label'][$key]."</td>\n"; // We don't translate here, we want admin to know what is the key not translated value
-		print "<td>".$langs->trans($extrafields->attributes[$elementtype]['label'][$key])."</td>\n";
-		print "<td>".$key."</td>\n";
-		print "<td>".$type2label[$extrafields->attributes[$elementtype]['type'][$key]]."</td>\n";
-		print '<td class="right">'.$extrafields->attributes[$elementtype]['size'][$key]."</td>\n";
-		print '<td>'.dol_trunc($extrafields->attributes[$elementtype]['computed'][$key], 20)."</td>\n";
+		// Position
+		print "<td>".dol_escape_htmltag($extrafields->attributes[$elementtype]['pos'][$key])."</td>\n";
+		// Label
+		print "<td>".dol_escape_htmltag($extrafields->attributes[$elementtype]['label'][$key])."</td>\n"; // We don't translate here, we want admin to know what is the key not translated value
+		// Label translated
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv($extrafields->attributes[$elementtype]['label'][$key])).'">'.dol_escape_htmltag($langs->transnoentitiesnoconv($extrafields->attributes[$elementtype]['label'][$key]))."</td>\n";
+		// Key
+		print "<td>".dol_escape_htmltag($key)."</td>\n";
+		// Type
+		$typetoshow = $type2label[$extrafields->attributes[$elementtype]['type'][$key]];
+		print '<td title="'.dol_escape_htmltag($typetoshow).'" class="tdoverflowmax150">';
+		print dol_escape_htmltag($typetoshow);
+		print "</td>\n";
+		// Size
+		print '<td class="right">'.dol_escape_htmltag($extrafields->attributes[$elementtype]['size'][$key])."</td>\n";
+		// Computed field
+		print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($extrafields->attributes[$elementtype]['computed'][$key]).'">'.dol_escape_htmltag($extrafields->attributes[$elementtype]['computed'][$key])."</td>\n";
+		// Is unique ?
 		print '<td class="center">'.yn($extrafields->attributes[$elementtype]['unique'][$key])."</td>\n";
+		// Is mandatory ?
 		print '<td class="center">'.yn($extrafields->attributes[$elementtype]['required'][$key])."</td>\n";
+		// Can always be editable ?
 		print '<td class="center">'.yn($extrafields->attributes[$elementtype]['alwayseditable'][$key])."</td>\n";
-		print '<td class="center">'.$extrafields->attributes[$elementtype]['list'][$key]."</td>\n";
-		print '<td class="center">'.$extrafields->attributes[$elementtype]['printable'][$key]."</td>\n";
+		// Visible
+		print '<td class="center tdoverflowmax100" title="'.dol_escape_htmltag($extrafields->attributes[$elementtype]['list'][$key]).'">'.dol_escape_htmltag($extrafields->attributes[$elementtype]['list'][$key])."</td>\n";
+		// Print on PDF
+		print '<td class="center tdoverflowmax100" title="'.dol_escape_htmltag($extrafields->attributes[$elementtype]['printable'][$key]).'">'.dol_escape_htmltag($extrafields->attributes[$elementtype]['printable'][$key])."</td>\n";
+		// Summable
 		print '<td class="center">'.yn($extrafields->attributes[$elementtype]['totalizable'][$key])."</td>\n";
 		if (!empty($conf->multicompany->enabled)) {
 			print '<td class="center">';
@@ -116,8 +132,8 @@ if (isset($extrafields->attributes[$elementtype]['type']) && is_array($extrafiel
 			print '</td>';
 		}
 		print '<td class="right nowraponall">';
-		print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&attrname='.$key.'#formeditextrafield">'.img_edit().'</a>';
-		print '&nbsp; <a class="paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&attrname='.$key.'">'.img_delete().'</a>';
+		print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&attrname='.urlencode($key).'#formeditextrafield">'.img_edit().'</a>';
+		print '&nbsp; <a class="paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&attrname='.urlencode($key).'">'.img_delete().'</a>';
 		print '</td>'."\n";
 		print "</tr>";
 	}
@@ -128,9 +144,9 @@ if (isset($extrafields->attributes[$elementtype]['type']) && is_array($extrafiel
 	}
 
 	print '<tr class="oddeven">';
-	print '<td class="opacitymedium" colspan="'.$colspan.'">';
+	print '<td colspan="'.$colspan.'"><span class="opacitymedium">';
 	print $langs->trans("None");
-	print '</td>';
+	print '</span></td>';
 	print '</tr>';
 }
 
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index 88c643c641d..61428170f50 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -61,12 +61,13 @@ $(document).ready(function(){
 			console.log("tableDND onDrop");
 			console.log(decodeURI($("#<?php echo $tagidfortablednd; ?>").tableDnDSerialize()));
 			$('#<?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 roworder = cleanSerialize(decodeURI($("#<?php echo $tagidfortablednd; ?>").tableDnDSerialize()));
 			var table_element_line = "<?php echo $table_element_line; ?>";
 			var fk_element = "<?php echo $fk_element; ?>";
 			var element_id = "<?php echo $id; ?>";
 			var filepath = "<?php echo urlencode($filepath); ?>";
-			var token = "<?php echo $_SESSION["token"]; ?>";	// We use old 'token' and not 'newtoken' for Ajax call because the ajax page has the NOTOKENRENEWAL constant set.
+			var token = "<?php echo currentToken(); ?>";	// We use old 'token' and not 'newtoken' for Ajax call because the ajax page has the NOTOKENRENEWAL constant set.
 			$.post("<?php echo DOL_URL_ROOT; ?>/core/ajax/row.php",
 					{
 						roworder: roworder,
diff --git a/htdocs/core/tpl/bloc_comment.tpl.php b/htdocs/core/tpl/bloc_comment.tpl.php
index f30bb0c5c61..a868bb61879 100644
--- a/htdocs/core/tpl/bloc_comment.tpl.php
+++ b/htdocs/core/tpl/bloc_comment.tpl.php
@@ -49,7 +49,7 @@ if ($action !== 'editcomment') {
 	print '</td>';
 
 	print '<td class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+	print '<input type="submit" class="button button-add" value="'.$langs->trans("Add").'">';
 	print '</td></tr>';
 }
 
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index cbc7a8a688b..83f96c1bcb1 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -124,25 +124,26 @@ if ($action == 'presend') {
 
 	if ($object->element === 'facture' && !empty($conf->global->INVOICE_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->INVOICE_EMAIL_SENDER;
-		$formmail->fromname = '';
+		$formmail->fromname = (!empty($conf->global->INVOICE_EMAIL_SENDER_NAME) ? $conf->global->INVOICE_EMAIL_SENDER_NAME : '');
 		$formmail->fromtype = 'special';
 	}
 	if ($object->element === 'shipping' && !empty($conf->global->SHIPPING_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->SHIPPING_EMAIL_SENDER;
-		$formmail->fromname = '';
+		$formmail->fromname = (!empty($conf->global->SHIPPING_EMAIL_SENDER_NAME) ? $conf->global->SHIPPING_EMAIL_SENDER_NAME : '');
 		$formmail->fromtype = 'special';
 	}
 	if ($object->element === 'commande' && !empty($conf->global->COMMANDE_EMAIL_SENDER)) {
 		$formmail->frommail = $conf->global->COMMANDE_EMAIL_SENDER;
-		$formmail->fromname = '';
+		$formmail->fromname = (!empty($conf->global->COMMANDE_EMAIL_SENDER_NAME) ? $conf->global->COMMANDE_EMAIL_SENDER_NAME : '');
+		$formmail->fromtype = 'special';
+	}
+	if ($object->element === 'order_supplier' && !empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER)) {
+		$formmail->frommail = $conf->global->ORDER_SUPPLIER_EMAIL_SENDER;
+		$formmail->fromname = (!empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME) ? $conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME : '');
 		$formmail->fromtype = 'special';
 	}
 
 	$formmail->trackid = $trackid;
-	if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) {	// If bit 2 is set
-		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$formmail->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
-	}
 	$formmail->withfrom = 1;
 
 	// Fill list of recipient with email inside <>.
@@ -207,6 +208,9 @@ if ($action == 'presend') {
 	}
 
 	// Make substitution in email content
+	if ($object) {
+		$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['__PERSONALIZED__'] = ''; // deprecated
diff --git a/htdocs/core/tpl/commonfields_add.tpl.php b/htdocs/core/tpl/commonfields_add.tpl.php
index cd07c0b8191..be91d7b28a5 100644
--- a/htdocs/core/tpl/commonfields_add.tpl.php
+++ b/htdocs/core/tpl/commonfields_add.tpl.php
@@ -79,13 +79,20 @@ foreach ($object->fields as $key => $val) {
 		$value = (GETPOST($key) == 'on' ? 1 : 0);
 	} elseif ($val['type'] == 'price') {
 		$value = price2num(GETPOST($key));
+	} elseif ($key == 'lang') {
+		$value = GETPOST($key, 'aZ09');
 	} else {
 		$value = GETPOST($key, 'alphanohtml');
 	}
 	if (!empty($val['noteditable'])) {
 		print $object->showOutputField($val, $key, $value, '', '', '', 0);
 	} else {
-		print $object->showInputField($val, $key, $value, '', '', '', 0);
+		if ($key == 'lang') {
+			print img_picto('', 'language', 'class="pictofixedwidth"');
+			print $formadmin->select_language($value, $key, 0, null, 1, 0, 0, 'minwidth300', 2);
+		} else {
+			print $object->showInputField($val, $key, $value, '', '', '', 0);
+		}
 	}
 	print '</td>';
 	print '</tr>';
diff --git a/htdocs/core/tpl/commonfields_edit.tpl.php b/htdocs/core/tpl/commonfields_edit.tpl.php
index 9670271d1a4..39103fdbb0a 100644
--- a/htdocs/core/tpl/commonfields_edit.tpl.php
+++ b/htdocs/core/tpl/commonfields_edit.tpl.php
@@ -19,6 +19,7 @@
  * $action
  * $conf
  * $langs
+ * $form
  */
 
 // Protection to avoid direct call of template
@@ -79,14 +80,21 @@ foreach ($object->fields as $key => $val) {
 		$value = GETPOSTISSET($key) ? GETPOST($key, $check) : $object->$key;
 	} elseif ($val['type'] == 'price') {
 		$value = GETPOSTISSET($key) ? price2num(GETPOST($key)) : price2num($object->$key);
+	} elseif ($key == 'lang') {
+		$value = GETPOSTISSET($key) ? GETPOST($key, 'aZ09') : $object->lang;
 	} else {
 		$value = GETPOSTISSET($key) ? GETPOST($key, 'alpha') : $object->$key;
 	}
 	//var_dump($val.' '.$key.' '.$value);
-	if ($val['noteditable']) {
+	if (!empty($val['noteditable'])) {
 		print $object->showOutputField($val, $key, $value, '', '', '', 0);
 	} else {
-		print $object->showInputField($val, $key, $value, '', '', '', 0);
+		if ($key == 'lang') {
+			print img_picto('', 'language', 'class="pictofixedwidth"');
+			print $formadmin->select_language($value, $key, 0, null, 1, 0, 0, 'minwidth300', 2);
+		} else {
+			print $object->showInputField($val, $key, $value, '', '', '', 0);
+		}
 	}
 	print '</td>';
 	print '</tr>';
diff --git a/htdocs/core/tpl/commonfields_view.tpl.php b/htdocs/core/tpl/commonfields_view.tpl.php
index f9da77c5894..42ead1573f4 100644
--- a/htdocs/core/tpl/commonfields_view.tpl.php
+++ b/htdocs/core/tpl/commonfields_view.tpl.php
@@ -58,7 +58,7 @@ foreach ($object->fields as $key => $val) {
 	$value = $object->$key;
 
 	print '<tr class="field_'.$key.'"><td';
-	print ' class="titlefield fieldname_'.$key;
+	print ' class="'.(empty($val['tdcss']) ? 'titlefield' : $val['tdcss']).' fieldname_'.$key;
 	//if ($val['notnull'] > 0) print ' fieldrequired';     // No fieldrequired on the view output
 	if ($val['type'] == 'text' || $val['type'] == 'html') {
 		print ' tdtop';
@@ -67,7 +67,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['help'])) {
 		print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
 	} else {
-		print $langs->trans($val['label']);
+		if (isset($val['copytoclipboard']) && $val['copytoclipboard'] == 1) {
+			print showValueWithClipboardCPButton($value, 0, $langs->transnoentitiesnoconv($val['label']));
+		} else {
+			print $langs->trans($val['label']);
+		}
 	}
 	print '</td>';
 	print '<td class="valuefield fieldname_'.$key;
@@ -81,7 +85,19 @@ foreach ($object->fields as $key => $val) {
 	if (in_array($val['type'], array('text', 'html'))) {
 		print '<div class="longmessagecut">';
 	}
-	print $object->showOutputField($val, $key, $value, '', '', '', 0);
+	if ($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($val['copytoclipboard']) && $val['copytoclipboard'] == 2) {
+			$out = $object->showOutputField($val, $key, $value, '', '', '', 0);
+			print showValueWithClipboardCPButton($out, 0, $out);
+		} else {
+			print $object->showOutputField($val, $key, $value, '', '', '', 0);
+		}
+	}
 	//print dol_escape_htmltag($object->$key, 1, 1);
 	if (in_array($val['type'], array('text', 'html'))) {
 		print '</div>';
@@ -94,11 +110,9 @@ 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">';
 
+$rightpart = '';
 $alreadyoutput = 1;
 foreach ($object->fields as $key => $val) {
 	if ($alreadyoutput) {
@@ -123,38 +137,46 @@ foreach ($object->fields as $key => $val) {
 
 	$value = $object->$key;
 
-	print '<tr><td';
-	print ' class="titlefield fieldname_'.$key;
-	//if ($val['notnull'] > 0) print ' fieldrequired';		// No fieldrequired inthe view output
+	$rightpart .= '<tr><td';
+	$rightpart .= ' class="'.(empty($val['tdcss']) ? 'titlefield' : $val['tdcss']).'  fieldname_'.$key;
+	//if ($val['notnull'] > 0) $rightpart .= ' fieldrequired';		// No fieldrequired inthe view output
 	if ($val['type'] == 'text' || $val['type'] == 'html') {
-		print ' tdtop';
+		$rightpart .= ' tdtop';
 	}
-	print '">';
+	$rightpart.= '">';
 	if (!empty($val['help'])) {
-		print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
+		$rightpart .= $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
 	} else {
-		print $langs->trans($val['label']);
+		$rightpart .= $langs->trans($val['label']);
 	}
-	print '</td>';
-	print '<td class="valuefield fieldname_'.$key;
+	$rightpart .= '</td>';
+	$rightpart .= '<td class="valuefield fieldname_'.$key;
 	if ($val['type'] == 'text') {
-		print ' wordbreak';
+		$rightpart .= ' wordbreak';
 	}
-	if ($val['cssview']) {
-		print ' '.$val['cssview'];
+	if (!empty($val['cssview'])) {
+		$rightpart .= ' '.$val['cssview'];
 	}
-	print '">';
+	$rightpart .= '">';
 	if (in_array($val['type'], array('text', 'html'))) {
-		print '<div class="longmessagecut">';
+		$rightpart .= '<div class="longmessagecut">';
 	}
-	print $object->showOutputField($val, $key, $value, '', '', '', 0);
-	//print dol_escape_htmltag($object->$key, 1, 1);
+	$rightpart .= $object->showOutputField($val, $key, $value, '', '', '', 0);
+	//$rightpart .= dol_escape_htmltag($object->$key, 1, 1);
 	if (in_array($val['type'], array('text', 'html'))) {
-		print '</div>';
+		$rightpart .= '</div>';
 	}
-	print '</td>';
-	print '</tr>';
+	$rightpart .= '</td>';
+	$rightpart .= '</tr>';
 }
 
+
+print '<div class="fichehalfright">';
+print '<div class="underbanner clearboth"></div>';
+
+print '<table class="border centpercent tableforfield">';
+
+print $rightpart;
+
 ?>
 <!-- END PHP TEMPLATE commonfields_view.tpl.php -->
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 4ec84283345..2dd9751a4c6 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -111,17 +111,17 @@ if ($permission) {
 
 		<div class="tagtd"><?php echo $conf->global->MAIN_INFO_SOCIETE_NOM; ?></div>
 		<!--  <div class="nowrap tagtd"><?php echo img_object('', 'user').' '.$langs->trans("Users"); ?></div> -->
-		<div class="tagtd maxwidthonsmartphone"><?php echo img_object('', 'user', 'class="pictofixedwidth"').$form->select_dolusers($user->id, 'userid', 0, (!empty($userAlreadySelected) ? $userAlreadySelected : null), 0, null, null, 0, 56, '', 0, '', 'minwidth200imp'); ?></div>
+		<div class="tagtd maxwidthonsmartphone"><?php echo img_object('', 'user', 'class="pictofixedwidth"').$form->select_dolusers($user->id, 'userid', 0, (!empty($userAlreadySelected) ? $userAlreadySelected : null), 0, null, null, 0, 56, 0, '', 0, '', 'minwidth100imp widthcentpercentminusxx maxwidth400'); ?></div>
 		<div class="tagtd maxwidthonsmartphone">
 		<?php
 		$tmpobject = $object;
 		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) {
 			$tmpobject = $objectsrc;
 		}
-		$formcompany->selectTypeContact($tmpobject, '', 'type', 'internal');
+		$formcompany->selectTypeContact($tmpobject, '', 'type', 'internal', 'position', 0, 'minwidth125imp widthcentpercentminusx maxwidth400');
 		?></div>
 		<div class="tagtd">&nbsp;</div>
-		<div class="tagtd center"><input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>"></div>
+		<div class="tagtd center"><input type="submit" class="button small" value="<?php echo $langs->trans("Add"); ?>"></div>
 	</form>
 
 		<?php
@@ -163,14 +163,14 @@ if ($permission) {
 			if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) {
 				$tmpobject = $objectsrc;
 			}
-			$formcompany->selectTypeContact($tmpobject, $preselectedtypeofcontact, 'typecontact', 'external', 'position', 0, 'minwidth100imp');
+			$formcompany->selectTypeContact($tmpobject, $preselectedtypeofcontact, 'typecontact', 'external', 'position', 0, 'minwidth125imp widthcentpercentminusx maxwidth400');
 			?>
 		</div>
 		<div class="tagtd noborderbottom">&nbsp;</div>
 		<div class="tagtd center noborderbottom">
-			<input type="submit" id="add-customer-contact" class="button" value="<?php echo $langs->trans("Add"); ?>"<?php if (!$nbofcontacts) {
+			<input type="submit" id="add-customer-contact" class="button small" value="<?php echo $langs->trans("Add"); ?>"<?php if (!$nbofcontacts) {
 				echo ' disabled';
-																				 } ?>>
+																					   } ?>>
 		</div>
 	</form>
 
@@ -303,12 +303,12 @@ foreach ($list as $entry) {
 
 	if ($permission) {
 		$href = $_SERVER["PHP_SELF"];
-		$href .= '?id='.$object->id;
+		$href .= '?id='.((int) $object->id);
 		$href .= '&action=deletecontact&token='.newToken();
-		$href .= '&lineid='.$entry->id;
+		$href .= '&lineid='.((int) $entry->id);
 
-		print "<td class='center'>";
-		print "<a href='$href'>";
+		print '<td class="center">';
+		print '<a href="'.$href.'">';
 		print img_picto($langs->trans("Unlink"), "unlink");
 		print "</a>";
 		print "</td>";
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index 4ec69efbac8..fdc315a588d 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -63,10 +63,10 @@ if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticket
 
 
 /*
- * Confirm form to delete
+ * Confirm form to delete a file
  */
 
-if ($action == 'delete') {
+if ($action == 'deletefile') {
 	$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),
@@ -74,7 +74,7 @@ if ($action == 'delete') {
 		$langs->trans('ConfirmDeleteFile'),
 		'confirm_deletefile',
 		'',
-		0,
+		'',
 		1
 	);
 }
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index 7d547d52dea..80d6cd7da56 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -19,13 +19,8 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
 
 		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val) {
 			if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked'])) {
-				$align = $extrafields->getAlignFlag($key, $extrafieldsobjectkey);
-				print '<td';
-				if ($align) {
-					print ' class="'.$align.'"';
-				}
-				print ' data-key="'.$key.'"';
-				print '>';
+				$cssclass = $extrafields->getAlignFlag($key, $extrafieldsobjectkey);
+
 				$tmpkey = 'options_'.$key;
 
 				if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey)) {
@@ -47,9 +42,20 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
 					//var_dump($value);
 				}
 
-				print $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey);
+				$valuetoshow = $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey);
+				$title = dol_string_nohtmltag($valuetoshow);
+
+				print '<td'.($cssclass ? ' class="'.$cssclass.'"' : '');	// TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist'
+				print ' data-key="'.$extrafieldsobjectkey.'.'.$key.'"';
+				print ($title ? ' title="'.dol_escape_htmltag($title).'"' : '');
+				print '>';
+				print $valuetoshow;
 				print '</td>';
+
 				if (!$i) {
+					if (empty($totalarray)) {
+						$totalarray['nbfield'] = 0;
+					}
 					$totalarray['nbfield']++;
 				}
 
@@ -62,7 +68,7 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
 						$totalarray['totalizable'][$key]['total'] += $obj->$tmpkey;
 					}
 				}
-				if (!empty($val['isameasure'])) {
+				if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 					if (!$i) {
 						$totalarray['pos'][$totalarray['nbfield']] = $extrafieldsobjectprefix.$tmpkey;
 					}
diff --git a/htdocs/core/tpl/extrafields_list_search_param.tpl.php b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
index 56652b87dd3..7e58e106882 100644
--- a/htdocs/core/tpl/extrafields_list_search_param.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
@@ -18,17 +18,17 @@ if (!empty($search_array_options) && is_array($search_array_options)) {	// $extr
 		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_pattern.$tmpkey.'_startyear='  . dol_print_date($val['start'], '%Y');
-			$param .= '&' . $search_options_pattern.$tmpkey.'_startmonth=' . dol_print_date($val['start'], '%m');
-			$param .= '&' . $search_options_pattern.$tmpkey.'_startday='   . dol_print_date($val['start'], '%d');
-			$param .= '&' . $search_options_pattern.$tmpkey.'_starthour='  . dol_print_date($val['start'], '%H');
-			$param .= '&' . $search_options_pattern.$tmpkey.'_startmin='   . dol_print_date($val['start'], '%M');
+			$param .= '&'.$search_options_pattern.$tmpkey.'_startyear='.dol_print_date($val['start'], '%Y');
+			$param .= '&'.$search_options_pattern.$tmpkey.'_startmonth='.dol_print_date($val['start'], '%m');
+			$param .= '&'.$search_options_pattern.$tmpkey.'_startday='.dol_print_date($val['start'], '%d');
+			$param .= '&'.$search_options_pattern.$tmpkey.'_starthour='.dol_print_date($val['start'], '%H');
+			$param .= '&'.$search_options_pattern.$tmpkey.'_startmin='.dol_print_date($val['start'], '%M');
 			// end date
-			$param .= '&' . $search_options_pattern.$tmpkey.'_endyear='  . dol_print_date($val['end'], '%Y');
-			$param .= '&' . $search_options_pattern.$tmpkey.'_endmonth=' . dol_print_date($val['end'], '%m');
-			$param .= '&' . $search_options_pattern.$tmpkey.'_endday='   . dol_print_date($val['end'], '%d');
-			$param .= '&' . $search_options_pattern.$tmpkey.'_endhour='  . dol_print_date($val['end'], '%H');
-			$param .= '&' . $search_options_pattern.$tmpkey.'_endmin='   . dol_print_date($val['end'], '%M');
+			$param .= '&'.$search_options_pattern.$tmpkey.'_endyear='.dol_print_date($val['end'], '%Y');
+			$param .= '&'.$search_options_pattern.$tmpkey.'_endmonth='.dol_print_date($val['end'], '%m');
+			$param .= '&'.$search_options_pattern.$tmpkey.'_endday='.dol_print_date($val['end'], '%d');
+			$param .= '&'.$search_options_pattern.$tmpkey.'_endhour='.dol_print_date($val['end'], '%H');
+			$param .= '&'.$search_options_pattern.$tmpkey.'_endmin='.dol_print_date($val['end'], '%M');
 			$val = '';
 		}
 		if ($val != '') {
diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 8b7ff9ac62c..4ba40384648 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -33,11 +33,11 @@ if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($
 				$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = '".$db->idate($crit)."'";
 			} elseif (is_array($crit)) {
 				if ($crit['start'] !== '' && $crit['end'] !== '') {
-					$sql .= ' AND ('.$extrafieldsobjectprefix.$tmpkey." BETWEEN '". $db->idate($crit['start']). "' AND '".$db->idate($crit['end']) . "')";
+					$sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." BETWEEN '". $db->idate($crit['start']). "' AND '".$db->idate($crit['end']) . "')";
 				} elseif ($crit['start'] !== '') {
-					$sql .= ' AND ('.$extrafieldsobjectprefix.$tmpkey." >= '". $db->idate($crit['start'])."')";
+					$sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." >= '". $db->idate($crit['start'])."')";
 				} elseif ($crit['end'] !== '') {
-					$sql .= ' AND ('.$extrafieldsobjectprefix.$tmpkey." <= '". $db->idate($crit['end'])."')";
+					$sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." <= '". $db->idate($crit['end'])."')";
 				}
 			}
 		} elseif (in_array($typ, array('boolean'))) {
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index 0a61e51d33d..2283d111cbc 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -37,6 +37,9 @@ 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";
+					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 f50276821b1..b5656c89339 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -125,7 +125,7 @@ if (empty($reshook) && isset($extrafields->attributes[$object->table_element]['l
 
 			$lastseparatorkeyfound = $tmpkeyextra;
 		} else {
-			print '<tr class="trextrafields_collapse'.$extrafields_collapse_num.(!empty($object->id)?'_'.$object->id:'');
+			print '<tr class="trextrafields_collapse'.$extrafields_collapse_num.(!empty($object->id) ? '_'.$object->id : '');
 			/*if ($extrafields_collapse_num && $extrafields_collapse_num_old && $extrafields_collapse_num != $extrafields_collapse_num_old) {
 				print ' trextrafields_collapse_new';
 			}*/
@@ -208,7 +208,7 @@ if (empty($reshook) && isset($extrafields->attributes[$object->table_element]['l
 					$fieldid = 'socid';
 				}
 
-				print '<td class="right"><a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?'.$fieldid.'='.$valueid.'&action=edit_extras&attribute='.$tmpkeyextra.'&ignorecollapsesetup=1">'.img_edit().'</a></td>';
+				print '<td class="right"><a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?'.$fieldid.'='.$valueid.'&action=edit_extras&token='.newToken().'&attribute='.$tmpkeyextra.'&ignorecollapsesetup=1">'.img_edit().'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td>';
@@ -219,18 +219,18 @@ if (empty($reshook) && isset($extrafields->attributes[$object->table_element]['l
 
 			// Convert date into timestamp format
 			if (in_array($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra], array('date'))) {
-				$datenotinstring = $object->array_options['options_'.$tmpkeyextra];
+				$datenotinstring = empty($object->array_options['options_'.$tmpkeyextra]) ? '' : $object->array_options['options_'.$tmpkeyextra];
 				// print 'X'.$object->array_options['options_' . $tmpkeyextra].'-'.$datenotinstring.'x';
-				if (!is_numeric($object->array_options['options_'.$tmpkeyextra])) {	// For backward compatibility
+				if (!empty($object->array_options['options_'.$tmpkeyextra]) && !is_numeric($object->array_options['options_'.$tmpkeyextra])) {	// For backward compatibility
 					$datenotinstring = $db->jdate($datenotinstring);
 				}
 				//print 'x'.$object->array_options['options_' . $tmpkeyextra].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');
 				$value = GETPOSTISSET("options_".$tmpkeyextra) ? dol_mktime(12, 0, 0, GETPOST("options_".$tmpkeyextra."month", 'int'), GETPOST("options_".$tmpkeyextra."day", 'int'), GETPOST("options_".$tmpkeyextra."year", 'int')) : $datenotinstring;
 			}
 			if (in_array($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra], array('datetime'))) {
-				$datenotinstring = $object->array_options['options_'.$tmpkeyextra];
+				$datenotinstring = empty($object->array_options['options_'.$tmpkeyextra]) ? '' : $object->array_options['options_'.$tmpkeyextra];
 				// print 'X'.$object->array_options['options_' . $tmpkeyextra].'-'.$datenotinstring.'x';
-				if (!is_numeric($object->array_options['options_'.$tmpkeyextra])) {	// For backward compatibility
+				if (!empty($object->array_options['options_'.$tmpkeyextra]) && !is_numeric($object->array_options['options_'.$tmpkeyextra])) {	// For backward compatibility
 					$datenotinstring = $db->jdate($datenotinstring);
 				}
 				//print 'x'.$object->array_options['options_' . $tmpkeyextra].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index 57a95c48ece..e776388ac53 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -233,7 +233,7 @@ if ($action == 'convertimgwebp' && $permtoadd) {
 if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg_match('/refresh/i', $action) || $action == 'delete') {
 	$langs->load("ecm");
 
-	print '<table width="100%" class="liste noborderbottom">'."\n";
+	print '<table class="liste centpercent">'."\n";
 
 	print '<!-- Title for manual directories -->'."\n";
 	print '<tr class="liste_titre">'."\n";
diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php
index 543bb939850..b015dc51fdc 100644
--- a/htdocs/core/tpl/list_print_total.tpl.php
+++ b/htdocs/core/tpl/list_print_total.tpl.php
@@ -13,7 +13,13 @@ if (isset($totalarray['pos'])) {
 	while ($i < $totalarray['nbfield']) {
 		$i++;
 		if (!empty($totalarray['pos'][$i])) {
-			print '<td class="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+			print '<td class="right">';
+			if ($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 7f460587248..c07e01570c2 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -30,9 +30,18 @@ if (empty($conf) || !is_object($conf)) {
 	exit;
 }
 
+// DDOS protection
+$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;
+}
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
+
 header('Cache-Control: Public, must-revalidate');
 header("Content-type: text/html; charset=".$conf->file->character_set_client);
 
@@ -57,7 +66,7 @@ if (!empty($conf->dol_use_jmobile)) {
 	$conf->use_javascript_ajax = 1;
 }
 
-$php_self = dol_escape_htmltag($_SERVER['PHP_SELF']);
+$php_self = empty($php_self) ? dol_escape_htmltag($_SERVER['PHP_SELF']) : $php_self;
 $php_self .= dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '';
 if (!preg_match('/mainmenu=/', $php_self)) {
 	$php_self .= (preg_match('/\?/', $php_self) ? '&' : '?').'mainmenu=home';
@@ -85,7 +94,7 @@ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 	$disablenofollow = 0;
 }
 
-print top_htmlhead('', $titleofloginpage, 0, 0, $arrayofjs, array(), 0, $disablenofollow);
+print top_htmlhead('', $titleofloginpage, 0, 0, $arrayofjs, array(), 1, $disablenofollow);
 
 
 $colorbackhmenu1 = '60,70,100'; // topmenu
@@ -147,7 +156,7 @@ $(document).ready(function () {
 <div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
 <?php
 if ($disablenofollow) {
-	echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+	echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank" rel="noopener noreferrer external">';
 }
 echo dol_escape_htmltag($title);
 if ($disablenofollow) {
@@ -291,7 +300,7 @@ if ($forgetpasslink || $helpcenterlink) {
 		if (!empty($conf->global->MAIN_HELPCENTER_LINKTOUSE)) {
 			$url = $conf->global->MAIN_HELPCENTER_LINKTOUSE;
 		}
-		echo '<a class="alogin" href="'.dol_escape_htmltag($url).'" target="_blank">';
+		echo '<a class="alogin" href="'.dol_escape_htmltag($url).'" target="_blank" rel="noopener noreferrer">';
 		echo $langs->trans('NeedHelpCenter');
 		echo '</a>';
 	}
@@ -310,12 +319,38 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->fil
 		print '<a class="alogin" href="'.$url.'">'.$langs->trans("LoginUsingOpenID").'</a>';
 	} else {
 		$langs->load("errors");
-		print '<font class="warning">'.$langs->trans("ErrorOpenIDSetupNotComplete", 'MAIN_AUTHENTICATION_OPENID_URL').'</font>';
+		print '<span class="warning">'.$langs->trans("ErrorOpenIDSetupNotComplete", 'MAIN_AUTHENTICATION_OPENID_URL').'</span>';
 	}
 
 	echo '</div>';
 }
 
+if (isset($conf->file->main_authentication) && preg_match('/google/', $conf->file->main_authentication)) {
+	$langs->load("users");
+
+	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
+
+	echo '<br>';
+	echo '<div class="center" style="margin-top: 4px;">';
+
+	//$shortscope = 'userinfo_email,userinfo_profile';
+	$shortscope = 'openid,email,profile';	// For openid connect
+
+	$oauthstateanticsrf = bin2hex(random_bytes(128/8));
+	$_SESSION['oauthstateanticsrf'] = $shortscope.'-'.$oauthstateanticsrf;
+	$urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state=forlogin-'.$shortscope.'-'.$oauthstateanticsrf;
+
+	$url = $urltorenew;
+
+	print img_picto('', 'google', 'class="pictofixedwidth"').'<a class="alogin" href="'.$url.'">'.$langs->trans("LoginWith", "Google").'</a>';
+
+	echo '</div>';
+}
 
 ?>
 
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index dc0a9d4bb8c..b3a40ba3582 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -19,12 +19,17 @@
  */
 
 // Following var must be set:
+// $action
 // $arrayofselected = array of id selected
-// $object
-// $objecttmp=new Propal($db);
+// $objecttmp = new MyObject($db);
 // $topicmail="SendSupplierProposalRef";
 // $modelmail="supplier_proposal_send";
-// $trackid='ord'.$object->id;
+// $trackid='ord'.$objecttmp->id;
+//
+// Following var can be set
+// $object = Object fetched;
+// $sendto
+// $withmaindocfilemail
 
 
 if ($massaction == 'predeletedraft') {
@@ -38,17 +43,18 @@ if ($massaction == 'predelete') {
 if ($massaction == 'preaffecttag') {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$categ = new Categorie($db);
-	$categ_types=array();
-	$categ_type_array=$categ->getMapList();
+	$categ_types = array();
+	$categ_type_array = $categ->getMapList();
 	foreach ($categ_type_array as $categdef) {
-		if (isset($object) && $categdef['obj_table']==$object->table_element) {
+		// Test on $object (should be useless, we already check on $objecttmp just after)
+		if (isset($object) && $categdef['obj_table'] == $object->table_element) {
 			if (!array_key_exists($categdef['code'], $categ_types)) {
-				$categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
+				$categ_types[$categdef['code']] = array('code'=>$categdef['code'], 'label'=>$langs->trans($categdef['obj_class']));
 			}
 		}
-		if (isset($objecttmp) && $categdef['obj_table']==$objecttmp->table_element) {
+		if (isset($objecttmp) && $categdef['obj_table'] == $objecttmp->table_element) {
 			if (!array_key_exists($categdef['code'], $categ_types)) {
-				$categ_types[$categdef['code']] = array('code'=>$categdef['code'],'label'=>$langs->trans($categdef['obj_class']));
+				$categ_types[$categdef['code']] = array('code'=>$categdef['code'], 'label'=>$langs->trans($categdef['obj_class']));
 			}
 		}
 	}
@@ -57,12 +63,12 @@ if ($massaction == 'preaffecttag') {
 	if (!empty($categ_types)) {
 		foreach ($categ_types as $categ_type) {
 			$cate_arbo = $form->select_all_categories($categ_type['code'], null, 'parent', null, null, 1);
-			$formquestion[]=array('type' => 'other',
+			$formquestion[] = array('type' => 'other',
 					'name' => 'affecttag_'.$categ_type['code'],
 					'label' => $langs->trans("Tag").' '.$categ_type['label'],
 					'value' => $form->multiselectarray('contcats_'.$categ_type['code'], $cate_arbo, GETPOST('contcats_'.$categ_type['code'], 'array'), null, null, null, null, '60%'));
 		}
-		$formquestion[]=array('type' => 'other',
+		$formquestion[] = array('type' => 'other',
 				'name' => 'affecttag_type',
 				'label' => '',
 				'value' => '<input type="hidden" name="affecttag_type"  id="affecttag_type" value="'.implode(",", array_keys($categ_types)).'"/>');
@@ -76,7 +82,7 @@ if ($massaction == 'presend') {
 	$langs->load("mails");
 
 	$listofselectedid = array();
-	$listofselectedthirdparties = array();
+	$listofselectedrecipientobjid = array();
 	$listofselectedref = array();
 
 	if (!GETPOST('cancel', 'alpha')) {
@@ -84,14 +90,19 @@ if ($massaction == 'presend') {
 			$result = $objecttmp->fetch($toselectid);
 			if ($result > 0) {
 				$listofselectedid[$toselectid] = $toselectid;
-				$thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid);
-				if ($objecttmp->element == 'societe') {
+				$thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid);	// For proposal, order, invoice, conferenceorbooth, ...
+				if (in_array($objecttmp->element, array('societe', 'conferenceorboothattendee'))) {
 					$thirdpartyid = $objecttmp->id;
 				}
 				if ($objecttmp->element == 'expensereport') {
 					$thirdpartyid = $objecttmp->fk_user_author;
 				}
-				$listofselectedthirdparties[$thirdpartyid] = $thirdpartyid;
+				if (empty($thirdpartyid)) {
+					$thirdpartyid = 0;
+				}
+				if ($thirdpartyid) {
+					$listofselectedrecipientobjid[$thirdpartyid] = $thirdpartyid;
+				}
 				$listofselectedref[$thirdpartyid][$toselectid] = $objecttmp->ref;
 			}
 		}
@@ -111,15 +122,11 @@ if ($massaction == 'presend') {
 		$formmail->fromid = $user->id;
 	}
 	$formmail->trackid = $trackid;
-	if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) { // If bit 2 is set
-		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$formmail->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
-	}
 	$formmail->withfrom = 1;
 	$liste = $langs->trans("AllRecipientSelected", count($arrayofselected));
-	if (count($listofselectedthirdparties) == 1) { // Only 1 different recipient selected, we can suggest contacts
+	if (count($listofselectedrecipientobjid) == 1) { // Only 1 different recipient selected, we can suggest contacts
 		$liste = array();
-		$thirdpartyid = array_shift($listofselectedthirdparties);
+		$thirdpartyid = array_shift($listofselectedrecipientobjid);
 		if ($objecttmp->element == 'expensereport') {
 			$fuser = new User($db);
 			$fuser->fetch($thirdpartyid);
@@ -140,19 +147,31 @@ if ($massaction == 'presend') {
 		$formmail->withtoreadonly = 1;
 	}
 
-	$formmail->withoptiononeemailperrecipient = ((count($listofselectedref) == 1 && count(reset($listofselectedref)) == 1) || empty($liste)) ? 0 : ((GETPOST('oneemailperrecipient') == 'on') ? 1 : -1);
+
+	$formmail->withoptiononeemailperrecipient = ((count($listofselectedref) == 1 && count(reset($listofselectedref)) == 1) || empty($liste)) ? 0 : (GETPOST('oneemailperrecipient', 'int') ? 1 : -1);
+	if (in_array($objecttmp->element, array('conferenceorboothattendee'))) {
+		$formmail->withoptiononeemailperrecipient = 0;
+	}
 
 	$formmail->withto = empty($liste) ? (GETPOST('sendto', 'alpha') ?GETPOST('sendto', 'alpha') : array()) : $liste;
 	$formmail->withtofree = empty($liste) ? 1 : 0;
 	$formmail->withtocc = 1;
 	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-	$formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REF_CLIENT__');
-	$formmail->withfile = 1;
-	// $formmail->withfile = 2; Not yet supported in mass action
-	$formmail->withmaindocfile = 1; // Add a checkbox "Attach also main document"
-	if ($objecttmp->element != 'societe') {
-		$formmail->withfile = '<span class="hideonsmartphone opacitymedium">'.$langs->trans("OnlyPDFattachmentSupported").'</span>';
-		$formmail->withmaindocfile = - 1; // Add a checkbox "Attach also main document" but not checked by default
+	if (!empty($topicmail)) {
+		$formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REF_CLIENT__');
+	} else {
+		$formmail->withtopic = 1;
+	}
+	$formmail->withfile = 1;	// $formmail->withfile = 2 to allow to upload files is not yet supported in mass action
+	// Add a checkbox "Attach also main document"
+	if (isset($withmaindocfilemail)) {
+		$formmail->withmaindocfile = $withmaindocfilemail;
+	} else {	// Do an automatic definition of $formmail->withmaindocfile
+		$formmail->withmaindocfile = 1;
+		if ($objecttmp->element != 'societe') {
+			$formmail->withfile = '<span class="hideonsmartphone opacitymedium">'.$langs->trans("OnlyPDFattachmentSupported").'</span>';
+			$formmail->withmaindocfile = -1; // Add a checkbox "Attach also main document" but not checked by default
+		}
 	}
 	$formmail->withbody = 1;
 	$formmail->withdeliveryreceipt = 1;
@@ -171,16 +190,16 @@ if ($massaction == 'presend') {
 	);
 	complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
 
-	// Tableau des substitutions
+	// Array of substitutions
 	$formmail->substit = $substitutionarray;
 
 	// Tableau des parametres complementaires du post
 	$formmail->param['action'] = $action;
-	$formmail->param['models'] = $modelmail;
-	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
+	$formmail->param['models'] = $modelmail;	// the filter to know which kind of template emails to show. 'none' means no template suggested.
+	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int') ? GETPOST('modelmailselected', 'int') : '-1';
 	$formmail->param['id'] = join(',', $arrayofselected);
 	// $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedthirdparties) > $conf->global->MAILING_LIMIT_SENDBYWEB) {
+	if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedrecipientobjid) > $conf->global->MAILING_LIMIT_SENDBYWEB) {
 		$langs->load("errors");
 		print img_warning().' '.$langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
 		print ' - <a href="javascript: window.history.go(-1)">'.$langs->trans("GoBack").'</a>';
@@ -191,6 +210,18 @@ if ($massaction == 'presend') {
 
 	print dol_get_fiche_end();
 }
+
+if ($massaction == 'preenable') {
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassEnabling"), $langs->trans("ConfirmMassEnablingQuestion", count($toselect)), "enable", null, '', 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 == 'preapproveleave') {
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassLeaveApproval"), $langs->trans("ConfirmMassLeaveApprovalQuestion", count($toselect)), "approveleave", null, '', 0, 200, 500, 1);
+}
+
 // Allow Pre-Mass-Action hook (eg for confirmation dialog)
 $parameters = array(
 	'toselect' => $toselect,
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 6c01c44bc36..e0f0c5d9142 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -99,16 +99,26 @@ if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_
 } else {
 	$typeofdata = 'textarea:12:95%';
 }
+if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC)) {
+	$typeofdatapub = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
+} else {
+	$typeofdatapub = 'textarea:12:95%';
+}
+if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE)) {
+	$typeofdatapriv = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
+} else {
+	$typeofdatapriv = 'textarea:12:95%';
+}
 
 print '<!-- BEGIN PHP TEMPLATE NOTES -->'."\n";
 print '<div class="tagtable border table-border tableforfield centpercent">'."\n";
 print '<div class="tagtr table-border-row">'."\n";
 $editmode = (GETPOST('action', 'aZ09') == 'edit'.$note_public);
 print '<div class="tagtd tagtdnote tdtop'.($editmode ? '' : ' sensiblehtmlcontent').' table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
-print $form->editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam, '', 0);
+print $form->editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdatapub, $moreparam, '', 0);
 print '</div>'."\n";
 print '<div class="tagtd wordbreak table-val-border-col'.($editmode ? '' : ' sensiblehtmlcontent').'">'."\n";
-print $form->editfieldval("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, '', null, null, $moreparam, 1)."\n";
+print $form->editfieldval("NotePublic", $note_public, $value_public, $object, $permission, $typeofdatapub, '', null, null, $moreparam, 1)."\n";
 print '</div>'."\n";
 print '</div>'."\n";
 if (empty($user->socid)) {
@@ -116,10 +126,10 @@ if (empty($user->socid)) {
 	print '<div class="tagtr table-border-row">'."\n";
 	$editmode = (GETPOST('action', 'aZ09') == 'edit'.$note_private);
 	print '<div class="tagtd tagtdnote tdtop'.($editmode ? '' : ' sensiblehtmlcontent').' table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
-	print $form->editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam, '', 0);
+	print $form->editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdatapriv, $moreparam, '', 0);
 	print '</div>'."\n";
 	print '<div class="tagtd wordbreak table-val-border-col'.($editmode ? '' : ' sensiblehtmlcontent').'">'."\n";
-	print $form->editfieldval("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, '', null, null, $moreparam, 1);
+	print $form->editfieldval("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdatapriv, '', null, null, $moreparam, 1);
 	print '</div>'."\n";
 	print '</div>'."\n";
 }
diff --git a/htdocs/core/tpl/object_discounts.tpl.php b/htdocs/core/tpl/object_discounts.tpl.php
index 4761e5857c2..4373f09fdb7 100644
--- a/htdocs/core/tpl/object_discounts.tpl.php
+++ b/htdocs/core/tpl/object_discounts.tpl.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2018		ATM Consulting		<support@atm-consulting.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
@@ -30,9 +31,17 @@ $objclassname = get_class($object);
 $isInvoice = in_array($object->element, array('facture', 'invoice', 'facture_fourn', 'invoice_supplier'));
 $isNewObject = empty($object->id) && empty($object->rowid);
 
+// Clean variables not defined
+if (!isset($absolute_discount)) {
+	$absolute_discount = 0;
+}
+if (!isset($absolute_creditnote)) {
+	$absolute_creditnote = 0;
+}
+
 // Relative and absolute discounts
-$addrelativediscount = '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$thirdparty->id.'&backtopage='.$backtopage.'">'.$langs->trans("EditRelativeDiscount").'</a>';
-$addabsolutediscount = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$thirdparty->id.'&backtopage='.$backtopage.'">'.$langs->trans("EditGlobalDiscounts").'</a>';
+$addrelativediscount = '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$thirdparty->id.'&backtopage='.$backtopage.'&action=create&token='.newToken().'">'.$langs->trans("EditRelativeDiscount").'</a>';
+$addabsolutediscount = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$thirdparty->id.'&backtopage='.$backtopage.'&action=create&token='.newToken().'">'.$langs->trans("EditGlobalDiscounts").'</a>';
 $viewabsolutediscount = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$thirdparty->id.'&backtopage='.$backtopage.'">'.$langs->trans("ViewAvailableGlobalDiscounts").'</a>';
 
 $fixedDiscount = $thirdparty->remise_percent;
@@ -80,7 +89,7 @@ if ($absolute_discount > 0) {
 // Is there credit notes availables ?
 if ($absolute_creditnote > 0) {
 	// If validated, we show link "add credit note to payment"
-	if ($cannotApplyDiscount || !$isInvoice || $isNewObject || $object->statut != $objclassname::STATUS_VALIDATED || $object->type == $objclassname::TYPE_CREDIT_NOTE) {
+	if (!empty($cannotApplyDiscount) || !$isInvoice || $isNewObject || $object->statut != $objclassname::STATUS_VALIDATED || $object->type == $objclassname::TYPE_CREDIT_NOTE) {
 		$translationKey = !empty($discount_type) ? 'HasCreditNoteFromSupplier' : 'CompanyHasCreditNote';
 		$text = $langs->trans($translationKey, price($absolute_creditnote), $langs->transnoentities("Currency".$conf->currency)).'.';
 
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index f978a436354..335754a8168 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -65,9 +65,10 @@ $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
 }
+
 //print $object->element;
 // Lines for extrafield
 $objectline = null;
@@ -88,6 +89,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";
@@ -102,7 +105,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
@@ -342,7 +345,7 @@ 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').' ';
 			echo $form->selectyesno('date_start_fill', $line->date_start_fill, 1);
@@ -361,7 +364,7 @@ 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>
@@ -673,15 +676,27 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
 		$("#prod_entry_mode_predef").click();
 		<?php
 	}
-	?>
 
+	if (in_array($this->table_element_line, array('propaldet', 'commandedet', 'facturedet'))) { ?>
+	$("#date_start, #date_end").focusout(function() {
+		let type = $(this).attr('type');
+		let mandatoryP = $(this).attr('mandatoryperiod');
+		if (type == 1 && mandatoryP == 1) {
+			if ($(this).val() == ''  && !$(this).hasClass('inputmandatory')) {
+				$(this).addClass('inputmandatory');
+			}else{
+				$(this).removeClass('inputmandatory');
+			}
+		}
+	});
+		<?php
+	} ?>
 	/* When changing predefined product, we reload list of supplier prices required for margin combo */
 	$("#idprod, #idprodfournprice").change(function()
 	{
 		console.log("Call method change() after change on #idprod or #idprodfournprice (senderissupplier=<?php echo $senderissupplier; ?>). this.val = "+$(this).val());
 
 		setforpredef();		// TODO Keep vat combo visible and set it to first entry into list that match result of get_default_tva
-
 		jQuery('#trlinefordates').show();
 
 		<?php
@@ -703,6 +718,26 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
 					{ 'id': $(this).val(), 'socid': <?php print $object->socid; ?> },
 					function(data) {
 						console.log("Load unit price end, we got value "+data.price_ht);
+
+						$('#date_start').removeAttr('type');
+						$('#date_end').removeAttr('type');
+						$('#date_start').attr('type', data.type);
+						$('#date_end').attr('type', data.type);
+
+						$('#date_start').removeAttr('mandatoryperiod');
+						$('#date_end').removeAttr('mandatoryperiod');
+						$('#date_start').attr('mandatoryperiod', data.mandatory_period);
+						$('#date_end').attr('mandatoryperiod', data.mandatory_period);
+
+						// service and we setted mandatory_period to true
+						if (data.mandatory_period == 1 && data.type == 1) {
+							jQuery('#date_start').addClass('inputmandatory');
+							jQuery('#date_end').addClass('inputmandatory');
+						}else{
+							jQuery('#date_start').removeClass('inputmandatory');
+							jQuery('#date_end').removeClass('inputmandatory');
+						}
+
 						jQuery("#price_ht").val(data.price_ht);
 						<?php
 						if (!empty($conf->global->PRODUIT_AUTOFILL_DESC) && $conf->global->PRODUIT_AUTOFILL_DESC == 1) {
@@ -980,10 +1015,11 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
 		jQuery("#prod_entry_mode_free").prop('checked',true).change();
 		jQuery("#prod_entry_mode_predef").prop('checked',false).change();
 		jQuery("#search_idprod, #idprod, #search_idprodfournprice, #buying_price").val('');
-		jQuery("#price_ht, #multicurrency_price_ht, #price_ttc, #price_ttc, #fourn_ref, #tva_tx, #buying_price, #title_fourn_ref, #title_vat, #title_up_ht, #title_up_ht_currency, #title_up_ttc, #title_up_ttc_currency").show();
+		jQuery("#price_ht, #multicurrency_price_ht, #price_ttc, #multicurrency_price_ttc, #fourn_ref, #tva_tx, #buying_price, #title_fourn_ref, #title_vat, #title_up_ht, #title_up_ht_currency, #title_up_ttc, #title_up_ttc_currency").show();
 		jQuery("#np_marginRate, #np_markRate, .np_marginRate, .np_markRate, #units, #title_units").show();
 		jQuery("#fournprice_predef").hide();
 	}
+
 	function setforpredef() {
 		console.log("Call setforpredef. We hide some fields and show dates");
 		jQuery("#select_type").val(-1);
@@ -998,7 +1034,17 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
 			jQuery("#multicurrency_price_ht").val('').hide();
 			jQuery("#title_up_ht, #title_up_ht_currency").hide();
 		<?php } ?>
-		jQuery("#price_ttc, #fourn_ref, #tva_tx, #title_fourn_ref, #title_vat, #title_up_ttc, #title_up_ttc_currency").hide();
+		<?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 */ ?>
+			jQuery("#price_ttc").val('').show();
+			jQuery("#multicurrency_price_ttc").val('').show();
+			jQuery("#title_up_ttc, #title_up_ttc_currency").show();
+		<?php } ?>
+		jQuery("#fourn_ref, #tva_tx, #title_vat").hide();
+		/* jQuery("#title_fourn_ref").hide(); */
 		jQuery("#np_marginRate, #np_markRate, .np_marginRate, .np_markRate, #units, #title_units").hide();
 		jQuery("#buying_price").show();
 		jQuery('#trlinefordates, .divlinefordates').show();
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 3ce3fffd28d..0f0043eadd6 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -66,7 +66,7 @@ $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) {
@@ -125,7 +125,7 @@ $coldisplay++;
 
 	<?php
 	if (is_object($hookmanager)) {
-		$fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line') : $line->fk_parent_line);
+		$fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line', 'int') : $line->fk_parent_line);
 		$parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);
 		$reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
 	}
@@ -151,10 +151,12 @@ $coldisplay++;
 		if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) {
 			$toolbarname = 'dolibarr_notes';
 		}
-		$doleditor = new DolEditor('product_desc', $line->description, '', (empty($conf->global->MAIN_DOLEDITOR_HEIGHT) ? 164 : $conf->global->MAIN_DOLEDITOR_HEIGHT), $toolbarname, '', false, true, $enable, $nbrows, '98%');
+		$doleditor = new DolEditor('product_desc', GETPOSTISSET('product_desc') ? GETPOST('product_desc', 'restricthtml') : $line->description, '', (empty($conf->global->MAIN_DOLEDITOR_HEIGHT) ? 164 : $conf->global->MAIN_DOLEDITOR_HEIGHT), $toolbarname, '', false, true, $enable, $nbrows, '98%');
 		$doleditor->Create();
 	} else {
-		print '<textarea id="product_desc" class="flat" name="product_desc" readonly style="width: 200px; height:80px;">'.$line->description.'</textarea>';
+		print '<textarea id="product_desc" class="flat" name="product_desc" readonly style="width: 200px; height:80px;">';
+		print GETPOSTISSET('product_desc') ? GETPOST('product_desc', 'restricthtml') : $line->description;
+		print '</textarea>';
 	}
 
 	//Line extrafield
@@ -168,35 +170,39 @@ $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', $line->date_start_fill, 1);
+		echo $form->selectyesno('date_start_fill', GETPOSTISSET('date_start_fill') ? GETPOST('date_start_fill', 'int') : $line->date_start_fill, 1);
 		echo ' - ';
 		echo $langs->trans('AutoFillDateTo').' ';
-		echo $form->selectyesno('date_end_fill', $line->date_end_fill, 1);
+		echo $form->selectyesno('date_end_fill', GETPOSTISSET('date_end_fill') ? GETPOST('date_end_fill', 'int') : $line->date_end_fill, 1);
 	}
 
 	?>
 	</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 ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn); ?>"></td>
+		<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>
 		<?php
 	}
 
 	$coldisplay++;
 	if (!$situationinvoicelinewithparent) {
-		print '<td class="right">'.$form->load_tva('tva_tx', $line->tva_tx.($line->vat_src_code ? (' ('.$line->vat_src_code.')') : ''), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1).'</td>';
+		print '<td class="right">'.$form->load_tva('tva_tx', GETPOSTISSET('tva_tx') ? GETPOST('tva_tx', 'alpha') : ($line->tva_tx.($line->vat_src_code ? (' ('.$line->vat_src_code.')') : '')), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1).'</td>';
 	} else {
 		print '<td class="right"><input size="1" type="text" class="flat right" name="tva_tx" value="'.price($line->tva_tx).'" readonly />%</td>';
 	}
 
 	$coldisplay++;
-	print '<td class="right"><input type="text" class="flat right" size="5" id="price_ht" name="price_ht" value="'.(isset($line->pu_ht) ?price($line->pu_ht, 0, '', 0) : price($line->subprice, 0, '', 0)).'"';
+	print '<td class="right"><input type="text" class="flat right" size="5" id="price_ht" name="price_ht" value="'.(GETPOSTISSET('price_ht') ? GETPOST('price_ht', 'alpha') : (isset($line->pu_ht) ? price($line->pu_ht, 0, '', 0) : price($line->subprice, 0, '', 0))).'"';
 	if ($situationinvoicelinewithparent) {
 		print ' readonly';
 	}
@@ -204,12 +210,12 @@ $coldisplay++;
 
 	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
 		$coldisplay++;
-		print '<td class="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat right" size="5" id="multicurrency_subprice" name="multicurrency_subprice" value="'.price($line->multicurrency_subprice).'" /></td>';
+		print '<td class="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat right" size="5" id="multicurrency_subprice" name="multicurrency_subprice" value="'.(GETPOSTISSET('multicurrency_subprice') ? GETPOST('multicurrency_subprice', 'alpha') : price($line->multicurrency_subprice)).'" /></td>';
 	}
 
 	if ($inputalsopricewithtax) {
 		$coldisplay++;
-		print '<td class="right"><input type="text" class="flat right" size="5" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc) ?price($line->pu_ttc, 0, '', 0) : '').'"';
+		print '<td class="right"><input type="text" class="flat right" size="5" id="price_ttc" name="price_ttc" value="'.(GETPOSTISSET('price_ttc') ? GETPOST('price_ttc') : (isset($line->pu_ttc) ? price($line->pu_ttc, 0, '', 0) : '')).'"';
 		if ($line->fk_prev_id != null) {
 			print ' readonly';
 		}
@@ -223,7 +229,7 @@ $coldisplay++;
 		// for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
 		// must also not be output for most entities (proposal, intervention, ...)
 		//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
-		print '<input size="3" type="text" class="flat right" name="qty" id="qty" value="'.$line->qty.'"';
+		print '<input size="3" type="text" class="flat right" name="qty" id="qty" value="'.(GETPOSTISSET('qty') ? GETPOST('qty') : $line->qty).'"';
 		if ($situationinvoicelinewithparent) {	// Do not allow editing during a situation cycle
 			print ' readonly';
 		}
@@ -248,7 +254,7 @@ $coldisplay++;
 		}
 		$coldisplay++;
 		print '<td class="left">';
-		print $form->selectUnits($line->fk_unit, "units", 0, $unit_type);
+		print $form->selectUnits(GETPOSTISSET('units') ? GETPOST('units') : $line->fk_unit, "units", 0, $unit_type);
 		print '</td>';
 	}
 	?>
@@ -256,7 +262,7 @@ $coldisplay++;
 	<td class="nowrap right">
 	<?php $coldisplay++;
 	if (($line->info_bits & 2) != 2) {
-		print '<input size="1" type="text" class="flat right" name="remise_percent" id="remise_percent" value="'.$line->remise_percent.'"';
+		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).'"';
 		if ($situationinvoicelinewithparent) {
 			print ' readonly';
 		}
@@ -268,7 +274,7 @@ $coldisplay++;
 	<?php
 	if ($this->situation_cycle_ref) {
 		$coldisplay++;
-		print '<td class="nowrap right linecolcycleref"><input class="right" type="text" size="1" value="'.$line->situation_percent.'" name="progress">%</td>';
+		print '<td class="nowrap right linecolcycleref"><input class="right" type="text" size="1" value="'.(GETPOSTISSET('progress') ? GETPOST('progress') : $line->situation_percent).'" name="progress">%</td>';
 		$coldisplay++;
 		print '<td></td>';
 	}
@@ -282,7 +288,7 @@ $coldisplay++;
 			<select id="fournprice_predef" name="fournprice_predef" class="flat minwidth75imp right" style="display: none;"></select>
 			<?php } ?>
 			<!-- For free product -->
-			<input class="flat maxwidth75 right" type="text" id="buying_price" name="buying_price" class="hideobject" value="<?php echo price($line->pa_ht, 0, '', 0); ?>">
+			<input class="flat maxwidth75 right" type="text" id="buying_price" name="buying_price" class="hideobject" value="<?php echo (GETPOSTISSET('buying_price') ? GETPOST('buying_price') : price($line->pa_ht, 0, '', 0)); ?>">
 		</td>
 		<?php }
 
@@ -334,9 +340,18 @@ $coldisplay++;
 		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
 			print 'jQuery("#date_starthour").val("'.$conf->global->MAIN_DEFAULT_DATE_START_HOUR.'");';
 		}
+
+
 		if (isset($conf->global->MAIN_DEFAULT_DATE_START_MIN)) {
 			print 'jQuery("#date_startmin").val("'.$conf->global->MAIN_DEFAULT_DATE_START_MIN.'");';
 		}
+
+		$res = $line->fetch_product();
+		if ($res  > 0  ) {
+			if ( $line->product->isMandatoryPeriod() && $line->product->isService()) {
+				print  'jQuery("#date_start").addClass("error");';
+			}
+		}
 	}
 	if (!$line->date_end) {
 		if (isset($conf->global->MAIN_DEFAULT_DATE_END_HOUR)) {
@@ -345,6 +360,14 @@ $coldisplay++;
 		if (isset($conf->global->MAIN_DEFAULT_DATE_END_MIN)) {
 			print 'jQuery("#date_endmin").val("'.$conf->global->MAIN_DEFAULT_DATE_END_MIN.'");';
 		}
+
+		$res = $line->fetch_product();
+		// on doit fetch le product là !!! pour connaître le type
+		if ($res  > 0  ) {
+			if ($line->product->isMandatoryperiod() && $line->product->isService()) {
+				print  'jQuery("#date_end").addClass("error");';
+			}
+		}
 	}
 	print '</script>'
 	?>
@@ -452,7 +475,17 @@ jQuery(document).ready(function()
 		}
 	});
 
-	<?php
+	<?php if (in_array($this->table_element_line, array('propaldet', 'commandedet', 'facturedet'))) { ?>
+	$("#date_start, #date_end").focusout(function() {
+		if ( $(this).val() == ''  && !$(this).hasClass('inputmandatory') ) {
+			$(this).addClass('inputmandatory');
+		} else {
+			$(this).removeClass('inputmandatory');
+		}
+	});
+		<?php
+	}
+
 	if (!empty($conf->margin->enabled)) {
 		?>
 		/* Add rule to clear margin when we change some data, so when we change sell or buy price, margin will be recalculated after submitting form */
diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index e1f89b18937..0f86289dfe1 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -55,7 +55,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>';
 }
 
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index b50ca83c6f6..36eceb87341 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -162,9 +162,13 @@ 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"><br>';
+			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);
@@ -180,14 +184,33 @@ if (($line->info_bits & 2) == 2) {
 		}
 	} else {
 		if ($line->date_start || $line->date_end) {
-			print '<div class="clearboth nowraponall opacitymedium">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
+			print '<div class="clearboth nowraponall opacitymedium daterangeofline">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
 		}
+		if (!$line->date_start || !$line->date_end) {
+			// show warning under line
+			// we need to fetch product associated to line for some test
+			if ($object->element == 'propal'  || $object->element == 'order' || $object->element == 'propal_supplier' || $object->element == 'supplier_proposal' || $object->element == 'commande') {
+				$res = $line->fetch_product();
+				if ($res  > 0  ) {
+					if ($line->product->isService() && $line->product->isMandatoryPeriod()) {
+						print '<div><span class="clearboth nowraponall warning">'.$langs->trans("mandatoryPeriodNeedTobeSet").'</span></div>';
+					}
+				}
+			}
+		}
+
 		//print get_date_range($line->date_start, $line->date_end, $format);
 	}
 
 	// Add description in form
 	if ($line->fk_product > 0 && !empty($conf->global->PRODUIT_DESC_IN_FORM)) {
-		print (!empty($line->description) && $line->description != $line->product_label) ? (($line->date_start || $line->date_end) ? '' : '<br>').'<br>'.dol_htmlentitiesbr($line->description) : '';
+		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) : '';
+		}
 	}
 
 	// Line extrafield
@@ -222,7 +245,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>';
@@ -368,7 +391,7 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
 	$coldisplay++;
 	if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
 	} else { ?>
-		<a class="editfielda reposition" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'#line_'.$line->id; ?>">
+		<a class="editfielda reposition" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&action=editline&token='.newToken().'&lineid='.$line->id.'#line_'.$line->id; ?>">
 		<?php print img_edit().'</a>';
 	}
 	print '</td>';
@@ -376,7 +399,7 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
 	print '<td class="linecoldelete center">';
 	$coldisplay++;
 	if (!$situationinvoicelinewithparent && 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 '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=ask_deleteline&token='.newToken().'&lineid='.$line->id.'">';
 		print img_delete();
 		print '</a>';
 	}
@@ -386,12 +409,12 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
 		print '<td class="linecolmove tdlineupdown center">';
 		$coldisplay++;
 		if ($i > 0) { ?>
-			<a class="lineupdown" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id; ?>">
+			<a class="lineupdown" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&action=up&token='.newToken().'&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; ?>">
+			<a class="lineupdown" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&action=down&token='.newToken().'&rowid='.$line->id; ?>">
 			<?php print img_down('default', 0, 'imgdownforline'); ?>
 			</a>
 		<?php }
diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php
index d4943ac454d..7e56611a282 100644
--- a/htdocs/core/tpl/originproductline.tpl.php
+++ b/htdocs/core/tpl/originproductline.tpl.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2010-2012	Regis Houssin	<regis.houssin@inodbox.com>
-/* Copyright (C) 2017		Charlie Benke	<charlie@patas-monkey.com>
+ * Copyright (C) 2017		Charlie Benke	<charlie@patas-monkey.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 6fe5ddad2d6..6d52cfff267 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -27,6 +27,14 @@ if (empty($conf) || !is_object($conf)) {
 	exit;
 }
 
+// DDOS protection
+$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;
+}
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
@@ -60,7 +68,18 @@ $php_self = str_replace('action=validatenewpassword', '', $php_self);
 
 $titleofpage = $langs->trans('SendNewPassword');
 
-print top_htmlhead('', $titleofpage);
+// Javascript code on logon page only to detect user tz, dst_observed, dst_first, dst_second
+$arrayofjs = array();
+
+$disablenofollow = 1;
+if (!preg_match('/'.constant('DOL_APPLICATION_TITLE').'/', $title)) {
+	$disablenofollow = 0;
+}
+if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	$disablenofollow = 0;
+}
+
+print top_htmlhead('', $titleofpage, 0, 0, $arrayofjs, array(), 1, $disablenofollow);
 
 
 $colorbackhmenu1 = '60,70,100'; // topmenu
@@ -99,7 +118,7 @@ $(document).ready(function () {
 <div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
 <?php
 if (!empty($disablenofollow)) {
-	echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+	echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank" rel="noopener noreferrer external">';
 }
 echo dol_escape_htmltag($title);
 if (!empty($disablenofollow)) {
diff --git a/htdocs/core/tpl/resource_add.tpl.php b/htdocs/core/tpl/resource_add.tpl.php
index 01c3897f991..64d545ba583 100644
--- a/htdocs/core/tpl/resource_add.tpl.php
+++ b/htdocs/core/tpl/resource_add.tpl.php
@@ -35,7 +35,7 @@ $out .= '<div class="tagtd"><label>'.$langs->trans('Busy').'</label> '.$form->se
 $out .= '<div class="tagtd"><label>'.$langs->trans('Mandatory').'</label> '.$form->selectyesno('mandatory', (GETPOSTISSET('mandatory') ? GETPOST('mandatory') : 0), 1).'</div>';
 
 $out .= '<div class="tagtd right">';
-$out .= '<input type="submit" id="add-resource-place" class="button" value="'.$langs->trans("Add").'"/>';
+$out .= '<input type="submit" id="add-resource-place" class="button button-add" value="'.$langs->trans("Add").'"/>';
 $out .= '</div>';
 
 $out .= '</form>';
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 0ea378672c1..048dc170c0a 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -134,7 +134,6 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 		// classify billed order & billed propososal
 		if ($action == 'BILL_VALIDATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			$ret = 0;
 
 			// First classify billed the order to allow the proposal classify process
 			if (!empty($conf->commande->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) {
@@ -174,11 +173,11 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				}
 			}
 
-			if (! empty($conf->expedition->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE)) {
+			if (!empty($conf->expedition->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE)) {
 				/** @var Facture $object */
 				$object->fetchObjectLinked('', 'shipping', $object->id, $object->element);
 
-				if (! empty($object->linkedObjects)) {
+				if (!empty($object->linkedObjects)) {
 					/** @var Expedition $shipment */
 					$shipment = array_shift($object->linkedObjects['shipping']);
 
@@ -189,7 +188,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 			return $ret;
 		}
 
-		// classify billed order & billed propososal
+		// classify billed order & billed proposal
 		if ($action == 'BILL_SUPPLIER_VALIDATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -244,12 +243,14 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
 					foreach ($object->linkedObjects['reception'] as $element) {
-						if ($element->statut == Reception::STATUS_VALIDATED) $totalonlinkedelements += $element->total_ht;
+						if ($element->statut == Reception::STATUS_VALIDATED) {
+							$totalonlinkedelements += $element->total_ht;
+						}
 					}
 					dol_syslog("Amount of linked reception = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
 					if ($totalonlinkedelements == $object->total_ht) {
 						foreach ($object->linkedObjects['reception'] as $element) {
-							$ret = $element->set_billed();
+							$ret = $element->setBilled();
 							if ($ret < 0) {
 								return $ret;
 							}
@@ -285,10 +286,16 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 			}
 		}
 
-		if ($action == 'SHIPPING_VALIDATE') {
+		// If we validate or close a shipment
+		if (($action == 'SHIPPING_VALIDATE') || ($action == 'SHIPPING_CLOSED')) {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (!empty($conf->commande->enabled) && !empty($conf->expedition->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING)) {
+			if (!empty($conf->commande->enabled) && !empty($conf->expedition->enabled) && !empty($conf->workflow->enabled) &&
+				(
+					(!empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING) && ($action == 'SHIPPING_VALIDATE')) ||
+					(!empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED) && ($action == 'SHIPPING_CLOSED'))
+				)
+			) {
 				$qtyshipped = array();
 				$qtyordred = array();
 				require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
@@ -348,6 +355,75 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 			}
 		}
 
+		// If we validate or close a shipment
+		if (($action == 'RECEPTION_VALIDATE') || ($action == 'RECEPTION_CLOSED')) {
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+			if ((!empty($conf->fournisseur->enabled) || !empty($conf->supplier_order->enabled)) && !empty($conf->reception->enabled) && !empty($conf->workflow->enabled) &&
+				(
+					(!empty($conf->global->WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION) && ($action == 'RECEPTION_VALIDATE')) ||
+					(!empty($conf->global->WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED) && ($action == 'RECEPTION_CLOSED'))
+				)
+			) {
+				$qtyshipped = array();
+				$qtyordred = array();
+				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+
+				// Find all reception on purchase order origin
+				$order = new CommandeFournisseur($this->db);
+				$ret = $order->fetch($object->origin_id);
+				if ($ret < 0) {
+					$this->error = $order->error;
+					$this->errors = $order->errors;
+					return $ret;
+				}
+				$ret = $order->fetchObjectLinked($order->id, 'supplier_order', null, 'reception');
+				if ($ret < 0) {
+					$this->error = $order->error;
+					$this->errors = $order->errors;
+					return $ret;
+				}
+				//Build array of quantity received by product for a purchase order
+				if (is_array($order->linkedObjects) && count($order->linkedObjects) > 0) {
+					foreach ($order->linkedObjects as $type => $shipping_array) {
+						if ($type == 'reception' && is_array($shipping_array) && count($shipping_array) > 0) {
+							foreach ($shipping_array as $shipping) {
+								if (is_array($shipping->lines) && count($shipping->lines) > 0) {
+									foreach ($shipping->lines as $shippingline) {
+										$qtyshipped[$shippingline->fk_product] += $shippingline->qty;
+									}
+								}
+							}
+						}
+					}
+				}
+
+				//Build array of quantity ordered to be received
+				if (is_array($order->lines) && count($order->lines) > 0) {
+					foreach ($order->lines as $orderline) {
+						// Exclude lines not qualified for shipment, similar code is found into calcAndSetStatusDispatch() for vendors
+						if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $orderline->product_type > 0) {
+							continue;
+						}
+						$qtyordred[$orderline->fk_product] += $orderline->qty;
+					}
+				}
+				//dol_syslog(var_export($qtyordred,true),LOG_DEBUG);
+				//dol_syslog(var_export($qtyshipped,true),LOG_DEBUG);
+				//Compare array
+				$diff_array = array_diff_assoc($qtyordred, $qtyshipped);
+				if (count($diff_array) == 0) {
+					//No diff => mean everythings is received
+					$ret = $order->setStatut(CommandeFournisseur::STATUS_RECEIVED_COMPLETELY, $object->origin_id, $object->origin, 'SUPPLIER_ORDER_CLOSE');
+					if ($ret < 0) {
+						$this->error = $order->error;
+						$this->errors = $order->errors;
+						return $ret;
+					}
+				}
+			}
+		}
+
 		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 d0597f617fb..2ff5d3f9c43 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -66,7 +66,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 	 *      $object->elementtype (->element of object to link action to)
 	 *      $object->module (if defined, elementtype in llx_actioncomm will be elementtype@module)
 	 *
-	 * @param string		$action		Event action code ('CONTRACT_MODIFY', 'RECRUITMENTCANDIDATURE_MODIFIY', ...)
+	 * @param string		$action		Event action code ('CONTRACT_MODIFY', 'RECRUITMENTCANDIDATURE_MODIFIY', or example by external module: 'SENTBYSMS'...)
 	 * @param Object		$object     Object
 	 * @param User		    $user       Object user
 	 * @param Translate 	$langs      Object langs
@@ -88,6 +88,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		//var_dump($action.' - '.$conf->global->$key);exit;
 
 		// Do not log events not enabled for this action
+		// GUI allow to set this option only if entry exists into table llx_c_action_trigger
 		if (empty($conf->global->$key)) {
 			return 0;
 		}
@@ -556,6 +557,21 @@ class InterfaceActionsAuto extends DolibarrTriggers
 				$object->actionmsg .= $langs->trans("Reason") . ': '.$object->refuse_note;
 			}
 
+			$object->sendtoid = 0;
+		} elseif ($action == 'ORDER_SUPPLIER_CANCEL') {
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "orders", "main"));
+
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
+			}
+			$object->actionmsg = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
+
+			if (!empty($object->cancel_note)) {
+				$object->actionmsg .= '<br>';
+				$object->actionmsg .= $langs->trans("Reason") . ': '.$object->cancel_note;
+			}
+
 			$object->sendtoid = 0;
 		} elseif ($action == 'ORDER_SUPPLIER_SUBMIT') {
 			// Load translation files required by the page
@@ -566,6 +582,11 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			}
 			$object->actionmsg = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
+			if (!empty($object->context['comments'])) {
+				$object->actionmsg .= '<br>';
+				$object->actionmsg .= $langs->trans("Comment") . ': '.$object->context['comments'];
+			}
+
 			$object->sendtoid = 0;
 		} elseif ($action == 'ORDER_SUPPLIER_RECEIVE') {
 			// Load translation files required by the page
@@ -867,8 +888,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		} else {
 			// TODO Merge all previous cases into this generic one
 			// $action = BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, CONTACT_SENTBYMAIL, RECRUITMENTCANDIDATURE_MODIFY, ...
+			// Can also be a value defined by an external module like SENTBYSMS, COMPANY_SENTBYSMS, MEMBER_SENTBYSMS, ...
 			// Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function).
-			// Note that these key can be set in agenda setup, only if defined into c_action_trigger
+			// Note that these key can be set in agenda setup, only if defined into llx_c_action_trigger
 			// Load translation files required by the page
 			if (empty($object->actionmsg2)) {
 				$langs->loadLangs(array("agenda", "other"));
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index d4db5ebccfc..6c2f5ea9060 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2017	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2005-2021	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -81,7 +81,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 		// Users
 		if ($action == 'USER_CREATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -98,7 +98,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} elseif ($action == 'USER_MODIFY') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -177,7 +177,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} elseif ($action == 'USER_NEW_PASSWORD') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -212,7 +212,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 		} elseif ($action == 'USER_DELETE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -229,7 +229,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 			/*} elseif ($action == 'USER_SETINGROUP') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -263,7 +263,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 			} elseif ($action == 'USER_REMOVEFROMGROUP') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -298,7 +298,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 		} elseif ($action == 'USERGROUP_CREATE') {
 			// Groupes
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -320,7 +320,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} elseif ($action == 'USERGROUP_MODIFY') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -353,7 +353,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} elseif ($action == 'USERGROUP_DELETE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap') {
+			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -439,7 +439,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 		} elseif ($action == 'MEMBER_CREATE') {
 			// Members
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1') {
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -450,7 +450,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->add($dn, $info, $user);
 
 					// For member type
-					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1') {
+					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 						if ($object->typeid > 0) {
 							require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
 							$membertype = new AdherentType($this->db);
@@ -482,7 +482,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} elseif ($action == 'MEMBER_VALIDATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1') {
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				// If status field is setup to be synchronized
 				if (!empty($conf->global->LDAP_FIELD_MEMBER_STATUS)) {
 					$ldap = new Ldap();
@@ -503,13 +503,13 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} elseif ($action == 'MEMBER_SUBSCRIPTION') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1') {
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				// If subscriptions fields are setup to be synchronized
-				if ($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE
-					|| $conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT
-					|| $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE
-					|| $conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT
-					|| $conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION) {
+				if (!empty($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE)
+					|| !empty($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT)
+					|| !empty($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE)
+					|| !empty($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT)
+					|| !empty($conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)) {
 					$ldap = new Ldap();
 					$result = $ldap->connect_bind();
 
@@ -528,7 +528,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} elseif ($action == 'MEMBER_MODIFY') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1') {
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -557,7 +557,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->update($dn, $info, $user, $olddn, $newrdn, $newparent);
 
 					// For member type
-					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1') {
+					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 						require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
 
 						/*
@@ -616,9 +616,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} elseif ($action == 'MEMBER_NEW_PASSWORD') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1') {
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				// If password field is setup to be synchronized
-				if ($conf->global->LDAP_FIELD_PASSWORD || $conf->global->LDAP_FIELD_PASSWORD_CRYPTED) {
+				if (!empty($conf->global->LDAP_FIELD_PASSWORD) || !empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED)) {
 					$ldap = new Ldap();
 					$result = $ldap->connect_bind();
 
@@ -637,7 +637,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} elseif ($action == 'MEMBER_RESILIATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1') {
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				// If status field is setup to be synchronized
 				if (!empty($conf->global->LDAP_FIELD_MEMBER_STATUS)) {
 					$ldap = new Ldap();
@@ -658,7 +658,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} elseif ($action == 'MEMBER_DELETE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1') {
+			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -669,7 +669,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->delete($dn);
 
 					// For member type
-					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1') {
+					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 						if ($object->typeid > 0) {
 							require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
 
@@ -706,7 +706,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 		} elseif ($action == 'MEMBER_TYPE_CREATE') {
 			// Members types
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1') {
+			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -728,7 +728,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} elseif ($action == 'MEMBER_TYPE_MODIFY') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1') {
+			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -765,7 +765,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} elseif ($action == 'MEMBER_TYPE_DELETE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1') {
+			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index 7d315f142a7..fe89a05ab20 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -23,6 +23,7 @@
  *  \brief      File of class of triggers for notification module
  */
 require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 
 
 /**
@@ -30,26 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
  */
 class InterfaceNotification extends DolibarrTriggers
 {
-	// @todo Defined also into notify.class.php)
-	public $listofmanagedevents = array(
-		'BILL_VALIDATE',
-		'BILL_PAYED',
-		'ORDER_CREATE',
-		'ORDER_VALIDATE',
-		'PROPAL_VALIDATE',
-		'PROPAL_CLOSE_SIGNED',
-		'FICHINTER_VALIDATE',
-		'FICHINTER_ADD_CONTACT',
-		'ORDER_SUPPLIER_VALIDATE',
-		'ORDER_SUPPLIER_APPROVE',
-		'ORDER_SUPPLIER_REFUSE',
-		'SHIPPING_VALIDATE',
-		'EXPENSE_REPORT_VALIDATE',
-		'EXPENSE_REPORT_APPROVE',
-		'HOLIDAY_VALIDATE',
-		'HOLIDAY_APPROVE',
-		'ACTION_CREATE'
-	);
+	public $listofmanagedevents = array();
 
 	/**
 	 * Constructor
@@ -66,6 +48,8 @@ class InterfaceNotification extends DolibarrTriggers
 		// 'development', 'experimental', 'dolibarr' or version
 		$this->version = self::VERSION_DOLIBARR;
 		$this->picto = 'email';
+
+		$this->listofmanagedevents = Notify::$arrayofnotifsupported;
 	}
 
 	/**
@@ -85,15 +69,13 @@ class InterfaceNotification extends DolibarrTriggers
 			return 0; // Module not active, we do nothing
 		}
 
-		require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
-		$notify = new Notify($this->db);
-
-		if (!in_array($action, $notify->arrayofnotifsupported)) {
+		if (!in_array($action, $this->listofmanagedevents)) {
 			return 0;
 		}
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
+		$notify = new Notify($this->db);
 		$notify->send($action, $object);
 
 		return 1;
@@ -114,6 +96,7 @@ class InterfaceNotification extends DolibarrTriggers
 		$sql = "SELECT rowid, code, label, description, elementtype";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
 		$sql .= $this->db->order("rang, elementtype, code");
+
 		dol_syslog("getListOfManagedEvents Get list of notifications", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 12b688d9b61..dfd83022393 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -157,7 +157,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						if (is_array($object->array_options) && count($object->array_options) > 0) {
 							foreach ($object->array_options as $key => $value) {
 								$key = substr($key, 8); // remove "options_"
-								$message_admin .= '<li>'.$langs->trans($extraFields->attributes[$object->element]['label'][$key]).' : '.$extraFields->showOutputField($key, $value).'</li>';
+								$message_admin .= '<li>'.$langs->trans($extraFields->attributes[$object->element]['label'][$key]).' : '.$extraFields->showOutputField($key, $value, '', $object->table_element).'</li>';
 							}
 						}
 						$message_admin .= '</ul>';
@@ -279,7 +279,12 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						if ($mailfile->error) {
 							dol_syslog($mailfile->error, LOG_DEBUG);
 						} else {
-								  $result = $mailfile->sendfile();
+							$result = $mailfile->sendfile();
+							if ($result) {
+								// update last_msg_sent date
+								$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/cron/admin/cron.php b/htdocs/cron/admin/cron.php
index 5afbf30d292..28078242dc6 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -110,9 +110,7 @@ print '</table>';
 
 print dol_get_fiche_end();
 
-print '<div class="center">';
-print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">';
-print '</div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 7911194603b..77ace0e4937 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT."/core/class/html.formcron.class.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/cron.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'cron', 'members'));
+$langs->loadLangs(array('admin', 'cron', 'members', 'bills'));
 
 $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
@@ -263,7 +263,7 @@ if ($action == 'create') {
 }
 
 if ($conf->use_javascript_ajax) {
-	print "\n".'<script type="text/javascript" language="javascript">';
+	print "\n".'<script type="text/javascript">';
 	print 'jQuery(document).ready(function () {
                     function initfields()
                     {
@@ -532,11 +532,7 @@ if (($action == "create") || ($action == "edit")) {
 
 	print dol_get_fiche_end();
 
-	print '<div align="center">';
-	print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
-	print "</div>";
+	print $form->buttonsSaveCancel();
 
 	print "</form>\n";
 } else {
@@ -749,7 +745,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("Edit").'</a>';
 	} else {
-		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$object->id.'">'.$langs->trans("Edit").'</a>';
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Edit").'</a>';
 	}
 
 	if ((empty($user->rights->cron->execute))) {
@@ -757,7 +753,7 @@ if (($action == "create") || ($action == "edit")) {
 	} elseif (empty($object->status)) {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("JobDisabled")).'">'.$langs->trans("CronExecute").'</a>';
 	} else {
-		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=execute&id='.$object->id.(empty($conf->global->CRON_KEY) ? '' : '&securitykey='.$conf->global->CRON_KEY).'">'.$langs->trans("CronExecute").'</a>';
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=execute&token='.newToken().'&id='.$object->id.(empty($conf->global->CRON_KEY) ? '' : '&securitykey='.$conf->global->CRON_KEY).'">'.$langs->trans("CronExecute").'</a>';
 	}
 
 	if (!$user->rights->cron->create) {
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 2ffce20a924..44564e1b0ab 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -557,9 +557,9 @@ class Cronjob extends CommonObject
 		if (is_array($filter) && count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sql .= ' AND '.$key.' = '.((int) $value);
+					$sql .= " AND ".$key." = ".((int) $value);
 				} else {
-					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sql .= " AND ".$key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
@@ -1081,7 +1081,7 @@ class Cronjob extends CommonObject
 			dol_syslog("We try to run a job in entity ".$this->entity." when we are in entity ".$conf->entity, LOG_WARNING);
 		}
 		$savcurrententity = $conf->entity;
-		$conf->entity = $this->entity;
+		$conf->setEntityValues($this->db, $this->entity);
 		dol_syslog(get_class($this)."::run_jobs entity for running job is ".$conf->entity);
 
 		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -1090,13 +1090,13 @@ class Cronjob extends CommonObject
 		if ($result < 0) {
 			$this->error = "User Error:".$user->error;
 			dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
-			$conf->entity = $savcurrententity;
+			$conf->setEntityValues($this->db, $savcurrententity);
 			return -1;
 		} else {
 			if (empty($user->id)) {
 				$this->error = " User user login:".$userlogin." do not exists";
 				dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
-				$conf->entity = $savcurrententity;
+				$conf->setEntityValues($this->db, $savcurrententity);
 				return -1;
 			}
 		}
@@ -1126,7 +1126,7 @@ class Cronjob extends CommonObject
 		$result = $this->update($user); // This include begin/commit
 		if ($result < 0) {
 			dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
-			$conf->entity = $savcurrententity;
+			$conf->setEntityValues($this->db, $savcurrententity);
 			return -1;
 		}
 
@@ -1241,7 +1241,7 @@ class Cronjob extends CommonObject
 			if ($ret === false) {
 				$this->error = $langs->trans('CronCannotLoadLib').': '.$libpath;
 				dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
-				$conf->entity = $savcurrententity;
+				$conf->setEntityValues($this->db, $savcurrententity);
 				return -1;
 			}
 
@@ -1250,7 +1250,7 @@ class Cronjob extends CommonObject
 			$result = $langs->load($this->module_name.'@'.$this->module_name); // If this->module_name was an existing language file, this will make nothing
 			if ($result < 0) {	// If technical error
 				dol_syslog(get_class($this)."::run_jobs Cannot load module langs".$langs->error, LOG_ERR);
-				$conf->entity = $savcurrententity;
+				$conf->setEntityValues($this->db, $savcurrententity);
 				return -1;
 			}
 
@@ -1316,11 +1316,11 @@ class Cronjob extends CommonObject
 		$result = $this->update($user); // This include begin/commit
 		if ($result < 0) {
 			dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
-			$conf->entity = $savcurrententity;
+			$conf->setEntityValues($this->db, $savcurrententity);
 			return -1;
 		}
 
-		$conf->entity = $savcurrententity;
+		$conf->setEntityValues($this->db, $savcurrententity);
 		return $error ?-1 : 1;
 	}
 
@@ -1432,10 +1432,10 @@ class Cronjob extends CommonObject
 				$moretext .= ' ('.$langs->trans("Error").')';
 			}
 
-			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled').$moretext;
-			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Scheduled').$moretext;
-			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled');
-			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Scheduled');
+			$this->labelStatus[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled').$moretext;
+			$this->labelStatus[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Scheduled').$moretext;
+			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Scheduled');
 		}
 
 		$statusType = 'status4';
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 686bb8a52a9..fc208fd9ac3 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -46,8 +46,8 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'cro
 $id = GETPOST('id', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -278,12 +278,12 @@ if ($search_lastresult != '') {
 //Manage filter
 if (is_array($filter) && count($filter) > 0) {
 	foreach ($filter as $key => $value) {
-		$sql .= ' AND '.$key.' LIKE \'%'.$db->escape($value).'%\'';
+		$sql .= " AND ".$key." LIKE '%".$db->escape($value)."%'";
 	}
 }
 $sqlwhere = array();
 if (!empty($search_module_name)) {
-	$sqlwhere[] = '(t.module_name='.$db->escape($search_module_name).')';
+	$sqlwhere[] = "(t.module_name = '".$db->escape($search_module_name)."')";
 }
 if (count($sqlwhere) > 0) {
 	$sql .= " WHERE ".implode(' AND ', $sqlwhere);
@@ -572,15 +572,17 @@ if ($num > 0) {
 		}
 		print '</td>';
 
+		$datefromto = (empty($datelastrun) ? '' : dol_print_date($datelastrun, 'dayhoursec', 'tzserver')).' - '.(empty($datelastresult) ? '' : dol_print_date($datelastresult, 'dayhoursec', 'tzserver'));
+
 		// Date start last run
-		print '<td class="center">';
+		print '<td class="center" title="'.dol_escape_htmltag($datefromto).'">';
 		if (!empty($datelastrun)) {
 			print dol_print_date($datelastrun, 'dayhoursec', 'tzserver');
 		}
 		print '</td>';
 
 		// Duration
-		print '<td class="center">';
+		print '<td class="center" title="'.dol_escape_htmltag($datefromto).'">';
 		if (!empty($datelastresult) && ($datelastresult >= $datelastrun)) {
 			print convertSecondToTime(max($datelastresult - $datelastrun, 1), 'allhourminsec');
 			//print '<br>'.($datelastresult - $datelastrun).' '.$langs->trans("seconds");
@@ -588,7 +590,7 @@ if ($num > 0) {
 		print '</td>';
 
 		// Return code of last run
-		print '<td class="center">';
+		print '<td class="center" title="'.dol_escape_htmltag($datefromto).'">';
 		if ($obj->lastresult != '') {
 			if (empty($obj->lastresult)) {
 				print $obj->lastresult;
diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php
index dde8644571e..8f25461eb64 100644
--- a/htdocs/datapolicy/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -175,7 +175,7 @@ if ($action == 'edit') {
 	print '</table>';
 
 	print '<div class="tabsAction">';
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 	print '</div>';
 }
 
diff --git a/htdocs/datapolicy/admin/setupmail.php b/htdocs/datapolicy/admin/setupmail.php
index c25d4c2263d..535c4383d0d 100644
--- a/htdocs/datapolicy/admin/setupmail.php
+++ b/htdocs/datapolicy/admin/setupmail.php
@@ -151,7 +151,7 @@ $doleditor->Create();
 print '</td><tr>';
 print '</table>';
 
-print '<br><center><input type="submit" class="button" value="'.$langs->trans("Modify").'"></center>';
+print '<br><center><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></center>';
 
 print '</form>';
 
@@ -160,7 +160,7 @@ print dol_get_fiche_end();
 print '<br><br>';
 
 print $langs->trans('SendAgreementText');
-print '<a class="button" href="'.dol_buildpath('/datapolicy/mailing.php').'">'.$langs->trans('SendAgreement').'</a>';
+print '<a class="button" href="'.DOL_URL_ROOT.'/datapolicy/mailing.php">'.$langs->trans('SendAgreement').'</a>';
 
 llxFooter();
 $db->close();
diff --git a/htdocs/datapolicy/class/actions_datapolicy.class.php b/htdocs/datapolicy/class/actions_datapolicy.class.php
index c58e1634fc2..5a27b97b691 100644
--- a/htdocs/datapolicy/class/actions_datapolicy.class.php
+++ b/htdocs/datapolicy/class/actions_datapolicy.class.php
@@ -359,11 +359,11 @@ class ActionsDatapolicy
                       </script>';
 			echo $dialog;
 			if ($parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
-				echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
+				echo '<div class="inline-block divButAction"><a target="_blank" rel="noopener noreferrer" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
 			} elseif ($parameters['currentcontext'] == 'membercard') {
-				echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
+				echo '<div class="inline-block divButAction"><a target="_blank" rel="noopener noreferrer" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
 			} elseif ($parameters['currentcontext'] == 'contactcard') {
-				echo '<div class="inline-block divButAction"><a target="_blank" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?id=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
+				echo '<div class="inline-block divButAction"><a target="_blank" rel="noopener noreferrer" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?id=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
 			}
 			if (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
 				echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICIES_SEND').'">'.$langs->trans("DATAPOLICIES_SEND").'</a></div>';
diff --git a/htdocs/datapolicy/class/datapolicy.class.php b/htdocs/datapolicy/class/datapolicy.class.php
index 8d74d3e9b4e..d0cf2e48434 100644
--- a/htdocs/datapolicy/class/datapolicy.class.php
+++ b/htdocs/datapolicy/class/datapolicy.class.php
@@ -182,8 +182,8 @@ class DataPolicy
 		$deliveryreceipt = 0;
 
 		$substitutionarray = array(
-			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&c='.$contact->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linka.'</a>',
-			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&c='.$contact->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linkr.'</a>',
+			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&c='.$contact->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linka.'</a>',
+			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&c='.$contact->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linkr.'</a>',
 			'__FIRSTNAME__' => $contact->firstname,
 			'__NAME__' => $contact->lastname,
 			'__CIVILITY__' => $contact->civility,
@@ -259,8 +259,8 @@ class DataPolicy
 		$deliveryreceipt = 0;
 
 		$substitutionarray = array(
-			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&s='.$societe->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linka.'</a>',
-			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&s='.$societe->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linkr.'</a>',
+			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&s='.$societe->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linka.'</a>',
+			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&s='.$societe->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linkr.'</a>',
 		);
 		$subject = make_substitutions($subject, $substitutionarray);
 		$message = make_substitutions($message, $substitutionarray);
@@ -332,8 +332,8 @@ class DataPolicy
 		$deliveryreceipt = 0;
 
 		$substitutionarray = array(
-			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&a='.$adherent->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linka.'</a>',
-			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&a='.$adherent->id.'&l='.$l.'&key='.$code, 3).'" target="_blank">'.$linkr.'</a>',
+			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&a='.$adherent->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linka.'</a>',
+			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&a='.$adherent->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linkr.'</a>',
 		);
 		$subject = make_substitutions($subject, $substitutionarray);
 		$message = make_substitutions($message, $substitutionarray);
diff --git a/htdocs/datapolicy/langs/en_US/datapolicy.lang b/htdocs/datapolicy/langs/en_US/datapolicy.lang
index 368caffcbda..a870c3499a6 100644
--- a/htdocs/datapolicy/langs/en_US/datapolicy.lang
+++ b/htdocs/datapolicy/langs/en_US/datapolicy.lang
@@ -23,7 +23,7 @@ Module4100Desc = Module to manage Data Privacy (Conformity with the GDPR)
 #
 datapolicySetup = Module Data Privacy Policy Setup
 Deletion = Deletion of data
-datapolicySetupPage = Depending of laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding that necessary for the purposes for which they were collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without event (the duration which you will have indicated below).
+datapolicySetupPage = Depending of laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding that necessary for the purposes for which they were collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without event (the duration which you will have indicated below).
 NB_MONTHS = %s months
 ONE_YEAR = 1 year
 NB_YEARS = %s years
diff --git a/htdocs/datapolicy/langs/fr_FR/datapolicy.lang b/htdocs/datapolicy/langs/fr_FR/datapolicy.lang
index 48b6a88cce3..6bf0c6a904d 100644
--- a/htdocs/datapolicy/langs/fr_FR/datapolicy.lang
+++ b/htdocs/datapolicy/langs/fr_FR/datapolicy.lang
@@ -27,7 +27,7 @@ Module4100Desc = Module de gestion de la protection des données (RGPD)
 #
 datapolicySetup = Configuration du module Protection des données
 Settings_DATAPOLICY = Paramétrage du module Protection des données
-datapolicySetupPage = Selon la loi de votre pays (Exemple <a href="http://www.privacy-regulation.eu/fr/5.htm" target="_blank">l’article 5</a> du RGPD), les données à caractère personnel doivent être conservées pendant une durée n’excédant pas celle nécessaire au regard des finalités pour lesquelles elles ont été traitées, à l’exception de fins archivistiques. La suppression se fera automatiquement après une certaine durée sans évènement (la durée que vous aurez indiquée ci-dessous).
+datapolicySetupPage = Selon la loi de votre pays (Exemple <a href="http://www.privacy-regulation.eu/fr/5.htm" target="_blank" rel="noopener noreferrer">l’article 5</a> du RGPD), les données à caractère personnel doivent être conservées pendant une durée n’excédant pas celle nécessaire au regard des finalités pour lesquelles elles ont été traitées, à l’exception de fins archivistiques. La suppression se fera automatiquement après une certaine durée sans évènement (la durée que vous aurez indiquée ci-dessous).
 NB_MONTHS = %s mois
 ONE_YEAR = 1 an
 NB_YEARS = %s ans
diff --git a/htdocs/datapolicy/langs/it_IT/datapolicy.lang b/htdocs/datapolicy/langs/it_IT/datapolicy.lang
index d8858b56c5b..68284e17844 100644
--- a/htdocs/datapolicy/langs/it_IT/datapolicy.lang
+++ b/htdocs/datapolicy/langs/it_IT/datapolicy.lang
@@ -10,7 +10,7 @@ Module4100Desc = Conformità con GDPR
 #
 datapolicySetup = Module Setup
 Settings_DATAPOLICY = Configurazione modulo GDPR 
-datapolicySetupPage = In accordo con <a href="http://www.privacy-regulation.eu/it/5.htm" target="_blank">l'art 5 del GDPR </a> i dati personali devono essere conservati per un periodo di tempo che .... ed eliminati se non sono più utili agli scopi per cui sono stati processati.
+datapolicySetupPage = In accordo con <a href="http://www.privacy-regulation.eu/it/5.htm" target="_blank" rel="noopener noreferrer">l'art 5 del GDPR </a> i dati personali devono essere conservati per un periodo di tempo che .... ed eliminati se non sono più utili agli scopi per cui sono stati processati.
 NB_MONTHS = %s mesi
 ONE_YEAR = 1 anno
 NB_YEARS = %s anni
diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php
index 6ff9e58b73a..a4c98eba8a7 100644
--- a/htdocs/dav/dav.class.php
+++ b/htdocs/dav/dav.class.php
@@ -82,8 +82,8 @@ class CdavLib
 						LEFT OUTER JOIN '.MAIN_DB_PREFIX.'user AS u ON (u.rowid=fk_element)
 						WHERE ar.element_type=\'user\' AND fk_actioncomm=a.id) AS other_users
 				FROM '.MAIN_DB_PREFIX.'actioncomm AS a';
-		if (!$this->user->rights->societe->client->voir) {//FIXME si 'voir' on voit plus de chose ?
-			$sql .= ' LEFT OUTER JOIN '.MAIN_DB_PREFIX.'societe_commerciaux AS sc ON (a.fk_soc = sc.fk_soc AND sc.fk_user='.$this->user->id.')
+		if (!$this->user->rights->societe->client->voir) { //FIXME si 'voir' on voit plus de chose ?
+			$sql .= ' LEFT OUTER JOIN '.MAIN_DB_PREFIX.'societe_commerciaux AS sc ON (a.fk_soc = sc.fk_soc AND sc.fk_user='.((int) $this->user->id).')
 					LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = sc.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.fk_soc = sc.fk_soc AND sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
@@ -95,7 +95,7 @@ class CdavLib
 
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON co.rowid = sp.fk_pays
 				LEFT JOIN '.MAIN_DB_PREFIX.'c_country as cos ON cos.rowid = s.fk_pays
-				WHERE 	a.id IN (SELECT ar.fk_actioncomm FROM '.MAIN_DB_PREFIX.'actioncomm_resources ar WHERE ar.element_type=\'user\' AND ar.fk_element='.intval($calid).')
+				WHERE 	a.id IN (SELECT ar.fk_actioncomm FROM '.MAIN_DB_PREFIX.'actioncomm_resources ar WHERE ar.element_type=\'user\' AND ar.fk_element='.((int) $calid).')
 						AND a.code IN (SELECT cac.code FROM '.MAIN_DB_PREFIX.'c_actioncomm cac WHERE cac.type<>\'systemauto\')
 						AND a.entity IN ('.getEntity('societe', 1).')';
 		if ($oid !== false) {
diff --git a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
index 520a0a20a72..5fd339918fa 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 = $conf->global->DEBUGBAR_USE_LOGFILE;
+		$uselogfile =  getDolGlobalInt('DEBUGBAR_USE_LOGFILE');
 
 		if ($uselogfile) {
 			$this->getStorageLogs($this->path);
diff --git a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
index 2e11887360f..c69ebb9a121 100644
--- a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
@@ -86,12 +86,12 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
 		global $conf, $langs;
 		global $dolibarr_mailing_limit_sendbyweb;
 
-		$info  = $langs->trans('Method').': <strong>'.$conf->global->MAIN_MAIL_SENDMODE.'</strong><br>';
-		$info .= $langs->trans('Server').': <strong>'.$conf->global->MAIN_MAIL_SMTP_SERVER.'</strong><br>';
-		$info .= $langs->trans('Port').': <strong>'.$conf->global->MAIN_MAIL_SMTP_PORT.'</strong><br>';
-		$info .= $langs->trans('ID').': <strong>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</strong><br>';
-		$info .= $langs->trans('Pwd').': <strong>'.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW).'</strong><br>';
-		$info .= $langs->trans('TLS/STARTTLS').': <strong>'.(empty($conf->global->MAIN_MAIL_EMAIL_TLS) ? '' : $conf->global->MAIN_MAIL_EMAIL_TLS).'</strong> / <strong>'.(empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) ? '' : $conf->global->MAIN_MAIL_EMAIL_STARTTLS).'</strong><br>';
+		$info  = $langs->trans('Method').': <strong>'.getDolGlobalString("MAIN_MAIL_SENDMODE").'</strong><br>';
+		$info .= $langs->trans('Server').': <strong>'.getDolGlobalString("MAIN_MAIL_SMTP_SERVER").'</strong><br>';
+		$info .= $langs->trans('Port').': <strong>'.getDolGlobalString("MAIN_MAIL_SMTP_PORT").'</strong><br>';
+		$info .= $langs->trans('ID').': <strong>'.getDolGlobalString("MAIN_MAIL_SMTPS_IDT").'</strong><br>';
+		$info .= $langs->trans('Pwd').': <strong>'.preg_replace('/./', '*', getDolGlobalString("MAIN_MAIL_SMTPS_PW")).'</strong><br>';
+		$info .= $langs->trans('TLS/STARTTLS').': <strong>'.getDolGlobalString("MAIN_MAIL_EMAIL_TLS").'</strong> / <strong>'.getDolGlobalString("MAIN_MAIL_EMAIL_STARTTLS").'</strong><br>';
 		$info .= $langs->trans('MAIN_DISABLE_ALL_MAILS').': <strong>'.(empty($conf->global->MAIN_DISABLE_ALL_MAILS) ? $langs->trans('No') : $langs->trans('Yes')).'</strong><br>';
 		$info .= 'dolibarr_mailing_limit_sendbyweb = <strong>'.$dolibarr_mailing_limit_sendbyweb.'</strong><br>';
 
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 093e9b36280..2d9f70a1eb5 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -299,17 +299,18 @@ class TraceableDB extends DoliDB
 	/**
 	 * Execute a SQL request and return the resultset
 	 *
-	 * @param   string $query          SQL query string
-	 * @param   int    $usesavepoint   0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
-	 *                                 Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
-	 * @param   string $type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-	 * @return  resource               Resultset of answer
+	 * @param   string 	$query          SQL query string
+	 * @param   int    	$usesavepoint   0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
+	 *                                 	Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
+	 * @param   string 	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 * @param	int		$result_mode	Result mode
+	 * @return  resource               	Resultset of answer
 	 */
-	public function query($query, $usesavepoint = 0, $type = 'auto')
+	public function query($query, $usesavepoint = 0, $type = 'auto', $result_mode = 0)
 	{
 		$this->startTracing();
 
-		$resql = $this->db->query($query, $usesavepoint, $type);
+		$resql = $this->db->query($query, $usesavepoint, $type, $result_mode);
 
 		$this->endTracing($query, $resql);
 
@@ -606,13 +607,13 @@ class TraceableDB extends DoliDB
 
 	/**
 	 * Encrypt sensitive data in database
-	 * Warning: This function includes the escape, so it must use direct value
+	 * Warning: This function includes the escape and add the SQL simple quotes on strings.
 	 *
-	 * @param   string 			$fieldorvalue 	Field name or value to encrypt
-	 * @param  	int 			$withQuotes 	Return string with quotes
-	 * @return 	string                     		XXX(field) or XXX('value') or field or 'value'
+	 * @param	string	$fieldorvalue	Field name or value to encrypt
+	 * @param	int		$withQuotes		Return string including the SQL simple quotes. This param must always be 1 (Value 0 is bugged and deprecated).
+	 * @return	string					XXX(field) or XXX('value') or field or 'value'
 	 */
-	public function encrypt($fieldorvalue, $withQuotes = 0)
+	public function encrypt($fieldorvalue, $withQuotes = 1)
 	{
 		return $this->db->encrypt($fieldorvalue, $withQuotes);
 	}
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index ee41019d218..00975946f6b 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -101,7 +101,7 @@ if ($action == 'add') {
 	$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 
 	if (!$conf->expedition_bon->enabled && !empty($conf->stock->enabled)) {
-		$expedition->entrepot_id = GETPOST('entrepot_id');
+		$expedition->entrepot_id = GETPOST('entrepot_id', 'int');
 	}
 
 	// We loop on each line of order to complete object delivery with qty to delivery
@@ -282,7 +282,7 @@ if ($action == 'create') {    // Create. Seems to no be used
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
 			print '<input type="hidden" name="ref" value="'.$object->ref.'">';
 
-			print dol_get_fiche_head($head, 'delivery', $langs->trans("Shipment"), -1, 'sending');
+			print dol_get_fiche_head($head, 'delivery', $langs->trans("Shipment"), -1, 'dolly');
 
 			/*
 			 * Confirmation de la suppression
@@ -330,7 +330,7 @@ if ($action == 'create') {    // Create. Seems to no be used
 				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 				if (0) {    // Do not change on shipment
 					if ($action != 'classify') {
-						$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$expedition->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+						$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$expedition->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 					}
 					if ($action == 'classify') {
 						// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $expedition->id, $expedition->socid, $expedition->fk_project, 'projectid', 0, 0, 1, 1);
@@ -338,7 +338,7 @@ if ($action == 'create') {    // Create. Seems to no be used
 						$morehtmlref .= '<input type="hidden" name="action" value="classin">';
 						$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
 						$morehtmlref .= $formproject->select_projects($expedition->socid, $expedition->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-						$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+						$morehtmlref .= '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 						$morehtmlref .= '</form>';
 					} else {
 						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$expedition->id, $expedition->socid, $expedition->fk_project, 'none', 0, 0, 0, 1);
@@ -348,9 +348,10 @@ if ($action == 'create') {    // Create. Seems to no be used
 					if (!empty($objectsrc->fk_project)) {
 						$proj = new Project($db);
 						$proj->fetch($objectsrc->fk_project);
-						$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-						$morehtmlref .= $proj->ref;
-						$morehtmlref .= '</a>';
+						$morehtmlref .= ' : '.$proj->getNomUrl(1);
+						if ($proj->title) {
+							$morehtmlref .= ' - '.$proj->title;
+						}
 					} else {
 						$morehtmlref .= '';
 					}
@@ -427,7 +428,7 @@ if ($action == 'create') {    // Create. Seems to no be used
 			print '</td>';
 
 			if ($action != 'editdate_delivery') {
-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_delivery&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_delivery&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td><td colspan="2">';
@@ -436,7 +437,7 @@ if ($action == 'create') {    // Create. Seems to no be used
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="action" value="setdate_delivery">';
 				print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_delivery", 1, 1);
-				print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+				print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 				print '</form>';
 			} else {
 				print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
@@ -451,7 +452,7 @@ if ($action == 'create') {    // Create. Seems to no be used
 				print $langs->trans('IncotermLabel');
 				print '<td><td class="right">';
 				if ($user->rights->expedition->delivery->creer) {
-					print '<a class="editfielda" href="'.DOL_URL_ROOT.'/delivery/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+					print '<a class="editfielda" href="'.DOL_URL_ROOT.'/delivery/card.php?id='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
 				} else {
 					print '&nbsp;';
 				}
@@ -633,7 +634,7 @@ if ($action == 'create') {    // Create. Seems to no be used
 			print dol_get_fiche_end();
 
 			//if ($object->statut == 0)	// only if draft
-			//	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+			// print $form->buttonsSaveCancel("Save", '');
 
 			print '</form>';
 
@@ -654,9 +655,9 @@ if ($action == 'create') {    // Create. Seems to no be used
 
 				if ($user->rights->expedition->delivery->supprimer) {
 					if ($conf->expedition_bon->enabled) {
-						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;expid='.$object->origin_id.'&amp;action=delete&amp;token='.newToken().'&amp;backtopage='.urlencode(DOL_URL_ROOT.'/expedition/card.php?id='.$object->origin_id).'">'.$langs->trans("Delete").'</a>';
+						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>';
 					} else {
-						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
+						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>';
 					}
 				}
 
@@ -692,11 +693,11 @@ if ($action == 'create') {    // Create. Seems to no be used
 			}
 
 
-			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+			print '</div><div class="fichehalfright">';
 
 			// Nothing on right
 
-			print '</div></div></div>';
+			print '</div></div>';
 		} else {
 			/* Expedition non trouvee */
 			print "Expedition inexistante ou acces refuse";
diff --git a/htdocs/document.php b/htdocs/document.php
index d6f6584bb6f..7498fbb3cf6 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -119,7 +119,7 @@ if ($user->socid > 0) {
 
 // For some module part, dir may be privates
 if (in_array($modulepart, array('facture_paiement', 'unpaid'))) {
-	if (!$user->rights->societe->client->voir || $socid) {
+	if (empty($user->rights->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
 	}
 }
@@ -138,6 +138,7 @@ if (in_array($modulepart, array('facture_paiement', 'unpaid'))) {
  */
 
 // If we have a hash public (hashp), we guess the original_file.
+$ecmfile='';
 if (!empty($hashp)) {
 	include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 	$ecmfile = new EcmFiles($db);
@@ -213,7 +214,7 @@ $check_access = dol_check_secure_access_document($modulepart, $original_file, $e
 $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 $fullpath_original_file     = $check_access['original_file']; // $fullpath_original_file is now a full path name
-//var_dump($fullpath_original_file);exit;
+//var_dump($fullpath_original_file.' '.$original_file.' '.$refname.' '.$accessallowed);exit;
 
 if (!empty($hashp)) {
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index f14fae538ab..c56effea73a 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -251,12 +251,12 @@ if (is_resource($handle)) {
 						print '</td>';
 					} else {
 						print "<td class=\"center\">\n";
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 						print '</td>';
 					}
 				} else {
 					print "<td class=\"center\">\n";
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+					print '<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>";
 				}
 
@@ -267,7 +267,7 @@ if (is_resource($handle)) {
 					print '</td>';
 				} else {
 					print "<td class=\"center\">";
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+					print '<a 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>';
 					print '</td>';
 				}
 
@@ -341,7 +341,7 @@ if (!empty($conf->accounting->enabled)) {
 	print '<input type="text" size="10" id="DONATION_ACCOUNTINGACCOUNT" name="DONATION_ACCOUNTINGACCOUNT" value="'.$conf->global->DONATION_ACCOUNTINGACCOUNT.'">';
 }
 print '</td><td class="center">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'" />';
 print "</td></tr>\n";
 print '</form>';
 
@@ -353,7 +353,7 @@ print '<tr class="oddeven"><td colspan="2">';
 print $langs->trans("FreeTextOnDonations").' '.img_info($langs->trans("AddCRIfTooLong")).'<br>';
 print '<textarea name="DONATION_MESSAGE" class="flat" cols="80">'.$conf->global->DONATION_MESSAGE.'</textarea>';
 print '</td><td class="center">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'" />';
 print "</td></tr>\n";
 
 print "</table>\n";
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index bcd3da0dfb5..960ff7e7b2d 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -84,259 +84,289 @@ if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
-// Action reopen object
-if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) {
-	$object->fetch($id);
+if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/don/list.php';
 
-	$result = $object->reopen($user);
-	if ($result >= 0) {
-		// Define output language
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-			if (method_exists($object, 'generateDocument')) {
-				$outputlangs = $langs;
-				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
-					$newlang = GETPOST('lang_id', 'aZ09');
-				}
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
-					$newlang = $object->thirdparty->default_lang;
-				}
-				if (!empty($newlang)) {
-					$outputlangs = new Translate("", $conf);
-					$outputlangs->setDefaultLang($newlang);
-				}
-				$model = $object->model_pdf;
-				$ret = $object->fetch($id); // Reload to get new records
-
-				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	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.'/don/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
 			}
 		}
-
-		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
-		exit;
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
-}
-
-
-// Action update object
-if ($action == 'update') {
-	if (!empty($cancel)) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".urlencode($id));
-		exit;
 	}
 
-	$error = 0;
-
-	if (empty($donation_date)) {
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-		$action = "create";
-		$error++;
+	if ($cancel) {
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action = '';
 	}
 
-	if (empty($amount)) {
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
-		$action = "create";
-		$error++;
-	}
-
-	if (!$error) {
+	// Action reopen object
+	if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) {
 		$object->fetch($id);
 
-		$object->firstname = (string) GETPOST("firstname", 'alpha');
-		$object->lastname = (string) GETPOST("lastname", 'alpha');
-		$object->societe = (string) GETPOST("societe", 'alpha');
-		$object->address = (string) GETPOST("address", 'alpha');
-		$object->amount = price2num(GETPOST("amount", 'alpha'));
-		$object->town = (string) GETPOST("town", 'alpha');
-		$object->zip = (string) GETPOST("zipcode", 'alpha');
-		$object->country_id = (int) GETPOST('country_id', 'int');
-		$object->email = (string) GETPOST("email", 'alpha');
-		$object->date = $donation_date;
-		$object->public = $public_donation;
-		$object->fk_project = (int) GETPOST("fk_project", 'int');
-		$object->note_private = (string) GETPOST("note_private", 'restricthtml');
-		$object->note_public = (string) GETPOST("note_public", 'restricthtml');
-		$object->modepaymentid = (int) GETPOST('modepayment', 'int');
+		$result = $object->reopen($user);
+		if ($result >= 0) {
+			// Define output language
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				if (method_exists($object, 'generateDocument')) {
+					$outputlangs = $langs;
+					$newlang = '';
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+						$newlang = GETPOST('lang_id', 'aZ09');
+					}
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+						$newlang = $object->thirdparty->default_lang;
+					}
+					if (!empty($newlang)) {
+						$outputlangs = new Translate("", $conf);
+						$outputlangs->setDefaultLang($newlang);
+					}
+					$model = $object->model_pdf;
+					$ret = $object->fetch($id); // Reload to get new records
 
-		// Fill array 'array_options' with data from add form
-		$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
-		if ($ret < 0) {
+					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				}
+			}
+
+			header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = 'create';
+		}
+	}
+
+
+	// Action update object
+	if ($action == 'update') {
+		if (!empty($cancel)) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".urlencode($id));
+			exit;
+		}
+
+		$error = 0;
+
+		if (empty($donation_date)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+			$action = "create";
 			$error++;
 		}
 
-		if ($object->update($user) > 0) {
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-	}
-}
-
-
-// Action add/create object
-if ($action == 'add') {
-	if (!empty($cancel)) {
-		header("Location: index.php");
-		exit;
-	}
-
-	$error = 0;
-
-	if (!empty($conf->societe->enabled) && !empty($conf->global->DONATION_USE_THIRDPARTIES) && !(GETPOST("socid", 'int') > 0)) {
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
-		$action = "create";
-		$error++;
-	}
-	if (empty($donation_date)) {
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-		$action = "create";
-		$error++;
-	}
-
-	if (empty($amount)) {
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
-		$action = "create";
-		$error++;
-	}
-
-	if (!$error) {
-		$object->socid = (int) GETPOST("socid", 'int');
-		$object->firstname = (string) GETPOST("firstname", 'alpha');
-		$object->lastname = (string) GETPOST("lastname", 'alpha');
-		$object->societe = (string) GETPOST("societe", 'alpha');
-		$object->address = (string) GETPOST("address", 'alpha');
-		$object->amount = price2num(GETPOST("amount", 'alpha'));
-		$object->zip = (string) GETPOST("zipcode", 'alpha');
-		$object->town = (string) GETPOST("town", 'alpha');
-		$object->country_id = (int) GETPOST('country_id', 'int');
-		$object->email = (string) GETPOST('email', 'alpha');
-		$object->date = $donation_date;
-		$object->note_private = (string) GETPOST("note_private", 'restricthtml');
-		$object->note_public = (string) GETPOST("note_public", 'restricthtml');
-		$object->public = $public_donation;
-		$object->fk_project = (int) GETPOST("fk_project", 'int');
-		$object->modepaymentid = (int) GETPOST('modepayment', 'int');
-
-		// Fill array 'array_options' with data from add form
-		$ret = $extrafields->setOptionalsFromPost(null, $object);
-		if ($ret < 0) {
+		if (empty($amount)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
+			$action = "create";
 			$error++;
 		}
 
-		$res = $object->create($user);
-		if ($res > 0) {
-			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$res);
+		if (!$error) {
+			$object->fetch($id);
+
+			$object->firstname = (string) GETPOST("firstname", 'alpha');
+			$object->lastname = (string) GETPOST("lastname", 'alpha');
+			$object->societe = (string) GETPOST("societe", 'alpha');
+			$object->address = (string) GETPOST("address", 'alpha');
+			$object->amount = price2num(GETPOST("amount", 'alpha'), '', 2);
+			$object->town = (string) GETPOST("town", 'alpha');
+			$object->zip = (string) GETPOST("zipcode", 'alpha');
+			$object->country_id = (int) GETPOST('country_id', 'int');
+			$object->email = (string) GETPOST("email", 'alpha');
+			$object->date = $donation_date;
+			$object->public = $public_donation;
+			$object->fk_project = (int) GETPOST("fk_project", 'int');
+			$object->note_private = (string) GETPOST("note_private", 'restricthtml');
+			$object->note_public = (string) GETPOST("note_public", 'restricthtml');
+			$object->modepaymentid = (int) GETPOST('modepayment', 'int');
+
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
+			if ($ret < 0) {
+				$error++;
+			}
+
+			if ($object->update($user) > 0) {
+				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+				exit;
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = "create";
+			}
+		}
+	}
+
+
+	// Action add/create object
+	if ($action == 'add') {
+		if (!empty($cancel)) {
+			header("Location: index.php");
 			exit;
+		}
+
+		$error = 0;
+
+		if (!empty($conf->societe->enabled) && !empty($conf->global->DONATION_USE_THIRDPARTIES) && !(GETPOST("socid", 'int') > 0)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
+			$action = "create";
+			$error++;
+		}
+		if (empty($donation_date)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+			$action = "create";
+			$error++;
+		}
+
+		if (empty($amount)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
+			$action = "create";
+			$error++;
+		}
+
+		if (!$error) {
+			$object->socid = (int) GETPOST("socid", 'int');
+			$object->firstname = (string) GETPOST("firstname", 'alpha');
+			$object->lastname = (string) GETPOST("lastname", 'alpha');
+			$object->societe = (string) GETPOST("societe", 'alpha');
+			$object->address = (string) GETPOST("address", 'alpha');
+			$object->amount = price2num(GETPOST("amount", 'alpha'), '', 2);
+			$object->zip = (string) GETPOST("zipcode", 'alpha');
+			$object->town = (string) GETPOST("town", 'alpha');
+			$object->country_id = (int) GETPOST('country_id', 'int');
+			$object->email = (string) GETPOST('email', 'alpha');
+			$object->date = $donation_date;
+			$object->note_private = (string) GETPOST("note_private", 'restricthtml');
+			$object->note_public = (string) GETPOST("note_public", 'restricthtml');
+			$object->public = $public_donation;
+			$object->fk_project = (int) GETPOST("fk_project", 'int');
+			$object->modepaymentid = (int) GETPOST('modepayment', 'int');
+
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
+			if ($ret < 0) {
+				$error++;
+			}
+
+			$res = $object->create($user);
+			if ($res > 0) {
+				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$res);
+				exit;
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = "create";
+			}
+		}
+	}
+
+	// Action delete object
+	if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->don->supprimer) {
+		$object->fetch($id);
+		$result = $object->delete($user);
+		if ($result > 0) {
+			header("Location: index.php");
+			exit;
+		} else {
+			dol_syslog($object->error, LOG_DEBUG);
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+
+	// Action validation
+	if ($action == 'valid_promesse') {
+		$object->fetch($id);
+		if ($object->valid_promesse($id, $user->id) >= 0) {
+			setEventMessages($langs->trans("DonationValidated", $object->ref), null);
+			$action = '';
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-}
 
-// Action delete object
-if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->don->supprimer) {
-	$object->fetch($id);
-	$result = $object->delete($user);
-	if ($result > 0) {
-		header("Location: index.php");
-		exit;
-	} else {
-		dol_syslog($object->error, LOG_DEBUG);
-		setEventMessages($object->error, $object->errors, 'errors');
+	// Action cancel
+	if ($action == 'set_cancel') {
+		$object->fetch($id);
+		if ($object->set_cancel($id) >= 0) {
+			$action = '';
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
-}
 
-// Action validation
-if ($action == 'valid_promesse') {
-	$object->fetch($id);
-	if ($object->valid_promesse($id, $user->id) >= 0) {
-		setEventMessages($langs->trans("DonationValidated", $object->ref), null);
-		$action = '';
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
+	// Action set paid
+	if ($action == 'set_paid') {
+		$object->fetch($id);
+		if ($object->setPaid($id, $modepayment) >= 0) {
+			$action = '';
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} elseif ($action == 'classin' && $user->rights->don->creer) {
+		$object->fetch($id);
+		$object->setProject($projectid);
 	}
-}
-
-// Action cancel
-if ($action == 'set_cancel') {
-	$object->fetch($id);
-	if ($object->set_cancel($id) >= 0) {
-		$action = '';
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
-}
-
-// Action set paid
-if ($action == 'set_paid') {
-	$object->fetch($id);
-	if ($object->setPaid($id, $modepayment) >= 0) {
-		$action = '';
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
-} elseif ($action == 'classin' && $user->rights->don->creer) {
-	$object->fetch($id);
-	$object->setProject($projectid);
-}
 
 
-// Actions to build doc
-include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+	// Actions to build doc
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 
-// Remove file in doc form
-/*if ($action == 'remove_file')
-{
-	$object = new Don($db, 0, GETPOST('id', 'int'));
-	if ($object->fetch($id))
+	// Remove file in doc form
+	/*if ($action == 'remove_file')
 	{
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		$object = new Don($db, 0, GETPOST('id', 'int'));
+		if ($object->fetch($id))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$object->fetch_thirdparty();
+			$object->fetch_thirdparty();
 
-		$langs->load("other");
-		$upload_dir = $conf->don->dir_output;
-		$file = $upload_dir . '/' . GETPOST('file');
-		$ret=dol_delete_file($file,0,0,0,$object);
-		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-		$action='';
+			$langs->load("other");
+			$upload_dir = $conf->don->dir_output;
+			$file = $upload_dir . '/' . GETPOST('file');
+			$ret=dol_delete_file($file,0,0,0,$object);
+			if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+			else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+			$action='';
+		}
 	}
-}
-*/
+	*/
 
-/*
- * Build doc
- */
-/*
-if ($action == 'builddoc')
-{
-	$object = new Don($db);
-	$result=$object->fetch($id);
-
-	// Save last template used to generate document
-	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang='';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
-	if (! empty($newlang))
+	/*
+	 * Build doc
+	 */
+	/*
+	if ($action == 'builddoc')
 	{
-		$outputlangs = new Translate("",$conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-	$result=don_create($db, $object->id, '', $object->model_pdf, $outputlangs);
-	if ($result <= 0)
-	{
-		dol_print_error($db,$result);
-		exit;
+		$object = new Don($db);
+		$result=$object->fetch($id);
+
+		// Save last template used to generate document
+		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
+
+		// Define output language
+		$outputlangs = $langs;
+		$newlang='';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
+		if (! empty($newlang))
+		{
+			$outputlangs = new Translate("",$conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
+		$result=don_create($db, $object->id, '', $object->model_pdf, $outputlangs);
+		if ($result <= 0)
+		{
+			dol_print_error($db,$result);
+			exit;
+		}
 	}
+	*/
 }
-*/
 
 
 /*
@@ -500,11 +530,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" onClick="javascript:history.go(-1)">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print "</form>\n";
 }
@@ -634,7 +660,7 @@ if (!empty($id) && $action == 'edit') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+	print $form->buttonsSaveCancel();
 
 	print "</form>\n";
 }
@@ -679,7 +705,7 @@ if (!empty($id) && $action != 'edit') {
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($user->rights->don->creer) {
 			if ($action != 'classify') {
-				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				$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);
@@ -696,9 +722,10 @@ if (!empty($id) && $action != 'edit') {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
@@ -757,7 +784,6 @@ if (!empty($id) && $action != 'edit') {
 
 	print '</div>';
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 
 	/*
 	 * Payments
@@ -767,7 +793,7 @@ if (!empty($id) && $action != 'edit') {
 	$sql .= " FROM ".MAIN_DB_PREFIX."payment_donation as p";
 	$sql .= ", ".MAIN_DB_PREFIX."c_paiement as c ";
 	$sql .= ", ".MAIN_DB_PREFIX."don as d";
-	$sql .= " WHERE d.rowid = '".$id."'";
+	$sql .= " WHERE d.rowid = ".((int) $id);
 	$sql .= " AND p.fk_donation = d.rowid";
 	$sql .= " AND d.entity IN (".getEntity('donation').")";
 	$sql .= " AND p.fk_typepayment = c.id";
@@ -815,7 +841,6 @@ if (!empty($id) && $action != 'edit') {
 		dol_print_error($db);
 	}
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
@@ -834,7 +859,7 @@ if (!empty($id) && $action != 'edit') {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_reopen&confirm=yes&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
 	}
 
-	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
+	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&rowid='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
 
 	if ($object->statut == $object::STATUS_DRAFT) {
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=valid_promesse&token='.newToken().'">'.$langs->trans("ValidPromess").'</a></div>';
@@ -849,13 +874,13 @@ if (!empty($id) && $action != 'edit') {
 		if ($remaintopay == 0) {
 			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPayment').'</span></div>';
 		} else {
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/don/payment/payment.php?rowid='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a></div>';
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/don/payment/payment.php?rowid='.$object->id.'&action=create&token='.newToken().'">'.$langs->trans('DoPayment').'</a></div>';
 		}
 	}
 
 	// Classify 'paid'
 	if ($object->statut == $object::STATUS_VALIDATED && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer) {
-		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=set_paid&token='.newToken().'">'.$langs->trans("ClassifyPaid")."</a></div>";
 	}
 
 	// Delete
@@ -898,9 +923,9 @@ if (!empty($id) && $action != 'edit') {
 		print showOnlinePaymentUrl('donation', $object->ref).'<br>';
 	}
 
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright">';
 
-	print '</div></div></div>';
+	print '</div></div>';
 }
 
 llxFooter();
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index cfd9e8ccd8b..597f15b7f10 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -128,8 +128,9 @@ class Donations extends DolibarrApi
 
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 181b3fc0ca3..cbd5a386354 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -353,6 +353,13 @@ class Don extends CommonObject
 		$this->town = ($this->town > 0 ? $this->town : $this->town);
 		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
 		$this->country = ($this->country ? $this->country : $this->country);
+		$this->amount = price2num($this->amount);
+
+		// Check parameters
+		if ($this->amount < 0) {
+			$this->error = $langs->trans('FieldCannotBeNegative', $langs->transnoentitiesnoconv("Amount"));
+			return -1;
+		}
 
 		$this->db->begin();
 
@@ -381,8 +388,8 @@ class Don extends CommonObject
 		$sql .= ", phone_mobile";
 		$sql .= ") VALUES (";
 		$sql .= "'".$this->db->idate($this->date ? $this->date : $now)."'";
-		$sql .= ", ".$conf->entity;
-		$sql .= ", ".price2num($this->amount);
+		$sql .= ", ".((int) $conf->entity);
+		$sql .= ", ".((float) $this->amount);
 		$sql .= ", ".($this->modepaymentid ? $this->modepaymentid : "null");
 		$sql .= ", ".($this->socid > 0 ? $this->socid : "null");
 		$sql .= ", '".$this->db->escape($this->firstname)."'";
@@ -396,7 +403,7 @@ class Don extends CommonObject
 		$sql .= ", ".($this->fk_project > 0 ? (int) $this->fk_project : "null");
 		$sql .= ", ".(!empty($this->note_private) ? ("'".$this->db->escape($this->note_private)."'") : "NULL");
 		$sql .= ", ".(!empty($this->note_public) ? ("'".$this->db->escape($this->note_public)."'") : "NULL");
-		$sql .= ", ".$user->id;
+		$sql .= ", ".((int) $user->id);
 		$sql .= ", null";
 		$sql .= ", '".$this->db->idate($this->date)."'";
 		$sql .= ", '".$this->db->escape(trim($this->email))."'";
@@ -464,29 +471,36 @@ class Don extends CommonObject
 		$this->town = ($this->town > 0 ? $this->town : $this->town);
 		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
 		$this->country = ($this->country ? $this->country : $this->country);
+		$this->amount = price2num($this->amount);
+
+		// Check parameters
+		if ($this->amount < 0) {
+			$this->error = $langs->trans('FieldCannotBeNegative', $langs->transnoentitiesnoconv("Amount"));
+			return -1;
+		}
 
 		$this->db->begin();
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."don SET ";
-		$sql .= "amount = ".price2num($this->amount);
-		$sql .= ",fk_payment = ".($this->modepaymentid ? $this->modepaymentid : "null");
-		$sql .= ",firstname = '".$this->db->escape($this->firstname)."'";
-		$sql .= ",lastname='".$this->db->escape($this->lastname)."'";
-		$sql .= ",societe='".$this->db->escape($this->societe)."'";
-		$sql .= ",address='".$this->db->escape($this->address)."'";
-		$sql .= ",zip='".$this->db->escape($this->zip)."'";
-		$sql .= ",town='".$this->db->escape($this->town)."'";
-		$sql .= ",fk_country = ".($this->country_id > 0 ? ((int) $this->country_id) : '0');
-		$sql .= ",public=".((int) $this->public);
-		$sql .= ",fk_projet=".($this->fk_project > 0 ? $this->fk_project : 'null');
-		$sql .= ",note_private=".(!empty($this->note_private) ? ("'".$this->db->escape($this->note_private)."'") : "NULL");
-		$sql .= ",note_public=".(!empty($this->note_public) ? ("'".$this->db->escape($this->note_public)."'") : "NULL");
-		$sql .= ",datedon='".$this->db->idate($this->date)."'";
-		$sql .= ",date_valid=".($this->date_valid ? "'".$this->db->idate($this->date)."'" : "null");
-		$sql .= ",email='".$this->db->escape(trim($this->email))."'";
-		$sql .= ",phone='".$this->db->escape(trim($this->phone))."'";
-		$sql .= ",phone_mobile='".$this->db->escape(trim($this->phone_mobile))."'";
-		$sql .= ",fk_statut=".((int) $this->statut);
+		$sql = "UPDATE ".MAIN_DB_PREFIX."don SET";
+		$sql .= " amount = ".((float) $this->amount);
+		$sql .= ", fk_payment = ".($this->modepaymentid ? $this->modepaymentid : "null");
+		$sql .= ", firstname = '".$this->db->escape($this->firstname)."'";
+		$sql .= ", lastname='".$this->db->escape($this->lastname)."'";
+		$sql .= ", societe='".$this->db->escape($this->societe)."'";
+		$sql .= ", address='".$this->db->escape($this->address)."'";
+		$sql .= ", zip='".$this->db->escape($this->zip)."'";
+		$sql .= ", town='".$this->db->escape($this->town)."'";
+		$sql .= ", fk_country = ".($this->country_id > 0 ? ((int) $this->country_id) : '0');
+		$sql .= ", public=".((int) $this->public);
+		$sql .= ", fk_projet=".($this->fk_project > 0 ? $this->fk_project : 'null');
+		$sql .= ", note_private=".(!empty($this->note_private) ? ("'".$this->db->escape($this->note_private)."'") : "NULL");
+		$sql .= ", note_public=".(!empty($this->note_public) ? ("'".$this->db->escape($this->note_public)."'") : "NULL");
+		$sql .= ", datedon='".$this->db->idate($this->date)."'";
+		$sql .= ", date_valid=".($this->date_valid ? "'".$this->db->idate($this->date)."'" : "null");
+		$sql .= ", email='".$this->db->escape(trim($this->email))."'";
+		$sql .= ", phone='".$this->db->escape(trim($this->phone))."'";
+		$sql .= ", phone_mobile='".$this->db->escape(trim($this->phone_mobile))."'";
+		$sql .= ", fk_statut=".((int) $this->statut);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::Update", LOG_DEBUG);
@@ -555,7 +569,7 @@ class Don extends CommonObject
 		// Delete donation
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."don_extrafields";
-			$sql .= " WHERE fk_object=".$this->id;
+			$sql .= " WHERE fk_object = ".((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
@@ -1116,7 +1130,7 @@ class Don extends CommonObject
 			return -1;
 		}
 
-		$sql = 'SELECT SUM(amount) as sum_amount FROM '.MAIN_DB_PREFIX.'payment_donation WHERE fk_donation = '.$this->id;
+		$sql = "SELECT SUM(amount) as sum_amount FROM ".MAIN_DB_PREFIX."payment_donation WHERE fk_donation = ".((int) $this->id);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			dol_print_error($this->db);
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 374306bc7b0..ab99ba3df1d 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -80,6 +80,8 @@ $object->fetch($id, $ref);
 $upload_dir = $conf->don->dir_output.'/'.get_exdir($filename, 0, 0, 0, $object, 'donation').'/'.dol_sanitizeFileName($object->ref);
 $modulepart = 'don';
 
+$permissiontoadd = $user->rights->don->creer;	// Used by the include of actions_dellink.inc.php
+
 
 /*
  * Actions
@@ -132,7 +134,7 @@ if ($object->id) {
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($user->rights->don->creer) {
 			if ($action != 'classify') {
-				// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				// $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);
@@ -149,9 +151,10 @@ if ($object->id) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index e7aaeb8a4bd..85e2eb3e48f 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -106,7 +106,7 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // TODO Add a s
 			print '<tr '.$bc[false].'>';
 			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
 			if ($i == 0) {
-				print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+				print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
 			}
 			print '</tr>';
 			$i++;
@@ -190,7 +190,7 @@ print '</tr>';
 print "</table>";
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 $max = 10;
@@ -252,7 +252,7 @@ if ($resql) {
 }
 
 
-print '</div></div></div>';
+print '</div></div>';
 
 $parameters = array('user' => $user);
 $reshook = $hookmanager->executeHooks('dashboardDonation', $parameters, $object); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/don/info.php b/htdocs/don/info.php
index 8d8f4065dda..0057bf87dce 100644
--- a/htdocs/don/info.php
+++ b/htdocs/don/info.php
@@ -82,7 +82,7 @@ if (!empty($conf->projet->enabled)) {
 	$morehtmlref .= $langs->trans('Project').' ';
 	if ($user->rights->don->creer) {
 		if ($action != 'classify') {
-			// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			// $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);
@@ -99,9 +99,10 @@ if (!empty($conf->projet->enabled)) {
 		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>';
+			$morehtmlref .= ' : '.$proj->getNomUrl(1);
+			if ($proj->title) {
+				$morehtmlref .= ' - '.$proj->title;
+			}
 		} else {
 			$morehtmlref .= '';
 		}
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 0c8f51281a3..d7697dba43d 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -37,8 +37,8 @@ $langs->loadLangs(array("companies", "donations"));
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'sclist';
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index 2e153d73b95..1629aa0f28f 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -47,6 +47,8 @@ $socid = 0;
 if ($user->socid) {
 	$socid = $user->socid;
 }
+$hookmanager->initHooks(array('donnote'));
+
 $result = restrictedArea($user, 'don', $id, '');
 
 $object = new Don($db);
@@ -58,7 +60,13 @@ $permissionnote = $user->rights->don->creer; // Used by the include of actions_s
 /*
  * Actions
  */
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$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
+}
 
 if ($action == 'classin' && $user->rights->don->creer) {
 	$object->fetch($id);
@@ -97,7 +105,7 @@ if ($id > 0 || !empty($ref)) {
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($user->rights->don->creer) {
 			if ($action != 'classify') {
-				// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				// $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);
@@ -114,9 +122,10 @@ if ($id > 0 || !empty($ref)) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 40cf0298895..363ef6d34ef 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -213,7 +213,7 @@ print '<div class="tabsAction">';
 if (empty($action)) {
 	if ($user->rights->don->supprimer) {
 		if (!$disable_delete) {
-			print '<a class="butActionDelete" href="card.php?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
+			print '<a class="butActionDelete" href="card.php?id='.$object->id.'&amp;action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
 		}
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index cf6328d15c4..e81a4a30af5 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -162,7 +162,7 @@ if ($action == 'create') {
 	print load_fiche_titre($langs->trans("DoPayment"));
 
 	if (!empty($conf->use_javascript_ajax)) {
-		print "\n".'<script type="text/javascript" language="javascript">';
+		print "\n".'<script type="text/javascript">';
 		//Add js for AutoFill
 		print ' $(document).ready(function () {';
 		print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
@@ -280,11 +280,7 @@ if ($action == 'create') {
 
 	print "</table>";
 
-	print '<br><div class="center">';
-	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print "</form>\n";
 }
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 23e6c0a46c0..f56bdcd15ac 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -70,7 +70,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
 	$filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
@@ -105,7 +105,7 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear,$startyear);
 //var_dump($data);
 // $data = array(array('Lib',val1,val2,val3),...)
 
-if (!$user->rights->societe->client->voir || $user->socid)
+if (empty($user->rights->societe->client->voir) || $user->socid)
 {
 	$filenameamount = $dir.'/shipmentsamountinyear-'.$user->id.'-'.$year.'.png';
 }
@@ -143,7 +143,7 @@ if (! $mesg)
 /*
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
-if (!$user->rights->societe->client->voir || $user->socid)
+if (empty($user->rights->societe->client->voir) || $user->socid)
 {
 	$filename_avg = $dir.'/shipmentsaverage-'.$user->id.'-'.$year.'.png';
 }
@@ -233,7 +233,7 @@ if (!in_array($nowyear, $arrayyears)) {
 	$arrayyears[$nowyear] = $nowyear;
 }
 arsort($arrayyears);
-print $form->selectarray('year', $arrayyears, $year, 0);
+print $form->selectarray('year', $arrayyears, $year, 0, 0, 0, '', 0, 0, 0, '', 'width75');
 print '</td></tr>';
 print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
@@ -276,7 +276,7 @@ print '</table>';
 print '</div>';
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 // Show graphs
@@ -293,7 +293,7 @@ if ($mesg) {
 print '</td></tr></table>';
 
 
-print '</div></div></div>';
+print '</div></div>';
 print '<div style="clear:both"></div>';
 
 print dol_get_fiche_end();
diff --git a/htdocs/don/tpl/linkedobjectblock.tpl.php b/htdocs/don/tpl/linkedobjectblock.tpl.php
index 3d6ec68ba2e..4097e73d560 100644
--- a/htdocs/don/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/don/tpl/linkedobjectblock.tpl.php
@@ -19,7 +19,7 @@
  *
  */
 
-print "<!-- BEGIN PHP TEMPLATE -->\n";
+print "<!-- BEGIN PHP TEMPLATE don/tpl/linkedopjectblock.tpl.php -->\n";
 
 global $user;
 global $noMoreLinkedObjectBlockAfter;
diff --git a/htdocs/ecm/ajax/ecmdatabase.php b/htdocs/ecm/ajax/ecmdatabase.php
index 4d782a3caeb..2ce35973483 100644
--- a/htdocs/ecm/ajax/ecmdatabase.php
+++ b/htdocs/ecm/ajax/ecmdatabase.php
@@ -17,7 +17,7 @@
 
 /**
  *       \file       htdocs/ecm/ajax/ecmdatabase.php
- *       \brief      File to build ecm database
+ *       \brief      File to build/refresh the ecm database for directories
  */
 
 if (!defined('NOTOKENRENEWAL')) {
@@ -39,6 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 $action = GETPOST('action', 'aZ09');
 $element = GETPOST('element', 'alpha');
 
+
 /*
  * View
  */
@@ -86,7 +87,7 @@ if (isset($action) && !empty($action)) {
 			}
 
 			if (!$dirisindatabase) {
-				$txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
+				$txt = "Directory found on disk ".$dirdesc['fullname'].", not found into table ecm_directories, so we add it";
 				dol_syslog($txt);
 
 				// We must first find the fk_parent of directory to create $dirdesc['fullname']
@@ -155,15 +156,16 @@ if (isset($action) && !empty($action)) {
 		foreach ($sqltree as $dirdesc) {    // Loop on each sqltree to check dir is on disk
 			$dirtotest = $conf->$element->dir_output.'/'.$dirdesc['fullrelativename'];
 			if (!dol_is_dir($dirtotest)) {
-				$mesg .= $dirtotest." not found onto disk. We delete from database dir with id=".$dirdesc['id']."<br>\n";
+				dol_syslog($dirtotest." not found onto disk. We delete from database dir with id=".$dirdesc['id']);
 				$ecmdirtmp->id = $dirdesc['id'];
 				$ecmdirtmp->delete($user, 'databaseonly');
 				//exit;
 			}
 		}
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories set cachenbofdoc = -1 WHERE cachenbofdoc < 0"; // If pb into cahce counting, we set to value -1 = "unknown"
-		dol_syslog("sql = ".$sql);
+		dol_syslog("Nb of directories added into database = ".$adirwascreated);
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories set cachenbofdoc = -1 WHERE cachenbofdoc < 0"; // If pb into cache counting, we set to value -1 = "unknown"
 		$db->query($sql);
 	}
 }
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index c2961794bbc..03413a56eb1 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -144,7 +144,6 @@ class EcmDirectory extends CommonObject
 
 		// Clean parameters
 		$this->label = dol_sanitizeFileName(trim($this->label));
-		$this->fk_parent = trim($this->fk_parent);
 		$this->description = trim($this->description);
 		$this->date_c = $now;
 		$this->fk_user_c = $user->id;
@@ -155,7 +154,7 @@ class EcmDirectory extends CommonObject
 
 		// Check if same directory does not exists with this name
 		$relativepath = $this->label;
-		if ($this->fk_parent) {
+		if ($this->fk_parent > 0) {
 			$parent = new EcmDirectory($this->db);
 			$parent->fetch($this->fk_parent);
 			$relativepath = $parent->getRelativePath().$relativepath;
@@ -194,11 +193,11 @@ class EcmDirectory extends CommonObject
 			$sql .= ") VALUES (";
 			$sql .= " '".$this->db->escape($this->label)."',";
 			$sql .= " '".$this->db->escape($conf->entity)."',";
-			$sql .= " '".$this->db->escape($this->fk_parent)."',";
+			$sql .= " ".($this->fk_parent > 0 ? ((int) $this->fk_parent) : "null").",";
 			$sql .= " '".$this->db->escape($this->description)."',";
 			$sql .= " ".((int) $this->cachenbofdoc).",";
 			$sql .= " '".$this->db->idate($this->date_c)."',";
-			$sql .= " '".$this->db->escape($this->fk_user_c)."'";
+			$sql .= " ".($this->fk_user_c > 0 ? ((int) $this->fk_user_c) : "null");
 			$sql .= ")";
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -249,20 +248,19 @@ class EcmDirectory extends CommonObject
 
 		// Clean parameters
 		$this->label = trim($this->label);
-		$this->fk_parent = trim($this->fk_parent);
 		$this->description = trim($this->description);
-
-		// Check parameters
-		// Put here code to add control on parameters values
+		if ($this->fk_parent <= 0) {
+			$this->fk_parent = 0;
+		}
 
 		$this->db->begin();
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories SET";
-		$sql .= " label='".$this->db->escape($this->label)."',";
-		$sql .= " fk_parent='".$this->db->escape($this->fk_parent)."',";
-		$sql .= " description='".$this->db->escape($this->description)."'";
-		$sql .= " WHERE rowid=".((int) $this->id);
+		$sql .= " label = '".$this->db->escape($this->label)."',";
+		$sql .= " fk_parent = ".($this->fk_parent > 0 ? ((int) $this->fk_parent) : "null").",";
+		$sql .= " description = '".$this->db->escape($this->description)."'";
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -305,7 +303,7 @@ class EcmDirectory extends CommonObject
 		} else {
 			$sql .= " cachenbofdoc = cachenbofdoc ".$value." 1";
 		}
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::changeNbOfFiles", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -731,10 +729,10 @@ class EcmDirectory extends CommonObject
 		// We count number of _ to have level (we use strlen that is faster than dol_strlen)
 		$this->cats[$id_categ]['level'] = strlen(preg_replace('/([^_])/i', '', $this->cats[$id_categ]['fullpath']));
 
-		// Traite ces enfants
+		// Process children
 		$protection++;
 		if ($protection > 20) {
-			return; // On ne traite pas plus de 20 niveaux
+			return; // We never go more than 20 levels
 		}
 		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) {
@@ -764,7 +762,7 @@ class EcmDirectory extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories SET";
 		$sql .= " cachenbofdoc = '".count($filelist)."'";
 		if (empty($all)) {  // By default
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 		} else {
 			$sql .= " WHERE entity = ".$conf->entity;
 		}
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 035a7aee9c6..6c2b8fc4023 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -303,17 +303,17 @@ class EcmFiles extends CommonObject
 		$sql .= " '".$this->db->escape($ref)."', ";
 		$sql .= ' '.(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").',';
 		$sql .= ' '.(!isset($this->share) ? 'NULL' : "'".$this->db->escape($this->share)."'").',';
-		$sql .= ' '.$this->entity.',';
+		$sql .= ' '.((int) $this->entity).',';
 		$sql .= ' '.(!isset($this->filename) ? 'NULL' : "'".$this->db->escape($this->filename)."'").',';
 		$sql .= ' '.(!isset($this->filepath) ? 'NULL' : "'".$this->db->escape($this->filepath)."'").',';
 		$sql .= ' '.(!isset($this->fullpath_orig) ? 'NULL' : "'".$this->db->escape($this->fullpath_orig)."'").',';
 		$sql .= ' '.(!isset($this->description) ? 'NULL' : "'".$this->db->escape($this->description)."'").',';
 		$sql .= ' '.(!isset($this->keywords) ? 'NULL' : "'".$this->db->escape($this->keywords)."'").',';
 		$sql .= ' '.(!isset($this->cover) ? 'NULL' : "'".$this->db->escape($this->cover)."'").',';
-		$sql .= ' '.$maxposition.',';
+		$sql .= ' '.((int) $maxposition).',';
 		$sql .= ' '.(!isset($this->gen_or_uploaded) ? 'NULL' : "'".$this->db->escape($this->gen_or_uploaded)."'").',';
 		$sql .= ' '.(!isset($this->extraparams) ? 'NULL' : "'".$this->db->escape($this->extraparams)."'").',';
-		$sql .= ' '."'".$this->db->idate($this->date_c)."'".',';
+		$sql .= " '".$this->db->idate($this->date_c)."',";
 		$sql .= ' '.(!isset($this->date_m) || dol_strlen($this->date_m) == 0 ? 'NULL' : "'".$this->db->idate($this->date_m)."'").',';
 		$sql .= ' '.(!isset($this->fk_user_c) ? $user->id : $this->fk_user_c).',';
 		$sql .= ' '.(!isset($this->fk_user_m) ? 'NULL' : $this->fk_user_m).',';
@@ -530,9 +530,9 @@ class EcmFiles extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.src_object_id') {
-					$sqlwhere[] = $key.' = '.((int) $value);
+					$sqlwhere[] = $key." = ".((int) $value);
 				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
@@ -542,13 +542,13 @@ class EcmFiles extends CommonObject
 		 $sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
 		 }*/
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
+			$sql .= ' AND '.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
 		}
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$this->lines = array();
@@ -664,7 +664,7 @@ class EcmFiles extends CommonObject
 
 		// Update request
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
-		$sql .= " ref = '".dol_hash($this->filepath.'/'.$this->filename, 3)."',";
+		$sql .= " ref = '".$this->db->escape(dol_hash($this->filepath."/".$this->filename, 3))."',";
 		$sql .= ' label = '.(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").',';
 		$sql .= ' share = '.(!empty($this->share) ? "'".$this->db->escape($this->share)."'" : "null").',';
 		$sql .= ' entity = '.(isset($this->entity) ? $this->entity : $conf->entity).',';
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index 4b9d0a847f2..623d626935d 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -55,9 +55,10 @@ class FormEcm
 	 *  @param	int		$selected    		Id of preselected section
 	 *  @param  string	$select_name		Name of HTML select component
 	 *  @param	string	$module				Module ('ecm', 'medias', ...)
+	 *  @param	array	$ids_to_ignore		Array of id to ignore
 	 *  @return	string						String with HTML select
 	 */
-	public function selectAllSections($selected = 0, $select_name = '', $module = 'ecm')
+	public function selectAllSections($selected = 0, $select_name = '', $module = 'ecm', $ids_to_ignore = array())
 	{
 		global $conf, $langs;
 		$langs->load("ecm");
@@ -65,6 +66,9 @@ class FormEcm
 		if ($select_name == '') {
 			$select_name = "catParent";
 		}
+		if (!is_array($ids_to_ignore)) {
+			$ids_to_ignore = array($ids_to_ignore);
+		}
 
 		$cate_arbo = null;
 		if ($module == 'ecm') {
@@ -83,13 +87,15 @@ class FormEcm
 			} else {
 				$output .= '<option value="-1">&nbsp;</option>';
 				foreach ($cate_arbo as $key => $value) {
-					$valueforoption = empty($cate_arbo[$key]['id']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['id'];
-					if ($selected && $valueforoption == $selected) {
-						$add = 'selected ';
-					} else {
-						$add = '';
+					if (!in_array($cate_arbo[$key]['id'], $ids_to_ignore)) {
+						$valueforoption = empty($cate_arbo[$key]['id']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['id'];
+						if ($selected && $valueforoption == $selected) {
+							$add = 'selected ';
+						} else {
+							$add = '';
+						}
+						$output .= '<option '.$add.'value="'.dol_escape_htmltag($valueforoption).'">'.(empty($cate_arbo[$key]['fulllabel']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['fulllabel']).'</option>';
 					}
-					$output .= '<option '.$add.'value="'.dol_escape_htmltag($valueforoption).'">'.(empty($cate_arbo[$key]['fulllabel']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['fulllabel']).'</option>';
 				}
 			}
 		}
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index 1416983e3a3..d7de6acc727 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -66,8 +66,8 @@ if ($module == 'ecm') {
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index d84a7330e69..930575d1778 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -28,6 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/ecm/class/htmlecm.form.class.php';
 
 // Load translation files required by page
 $langs->loadLangs(array('ecm', 'companies', 'other'));
@@ -46,8 +47,8 @@ if (empty($module)) {
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -204,6 +205,12 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha') && $permtoadd) {
 
 		// Fetch was already done
 		$ecmdir->label = dol_sanitizeFileName(GETPOST("label"));
+		$fk_parent = GETPOST("catParent", 'int');
+		if ($fk_parent == "-1") {
+			$ecmdir->fk_parent = "0";
+		} else {
+			$ecmdir->fk_parent = $fk_parent;
+		}
 		$ecmdir->description = GETPOST("description");
 		$ret = $extrafields->setOptionalsFromPost(null, $ecmdir);
 		if ($ret < 0) {
@@ -219,8 +226,10 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha') && $permtoadd) {
 		}
 		$result = $ecmdir->update($user);
 		if ($result > 0) {
+			$newdir = $ecmdir->getRelativePath(1);
+			$newdir = $conf->ecm->dir_output.'/'.$newdir;
 			// Try to rename file if changed
-			if ($oldlabel != $ecmdir->label && file_exists($olddir)) {
+			if (($oldlabel != $ecmdir->label && file_exists($olddir)) || ($olddir != $newdir && file_exists($olddir))) {
 				$newdir = $ecmdir->getRelativePath(1); // return "xxx/zzz/" from ecm directory
 				$newdir = $conf->ecm->dir_output.'/'.$newdir;
 				//print $olddir.'-'.$newdir;
@@ -270,6 +279,7 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha') && $permtoadd) {
  */
 
 $form = new Form($db);
+$formecm = new FormEcm($db);
 
 $object = new EcmDirectory($db); // Need to create a new one instance
 $extrafields = new ExtraFields($db);
@@ -317,11 +327,7 @@ if ($module == 'ecm') {
 		$tmpecmdir->fetch($ecmdir->id);
 		while ($tmpecmdir && $result > 0) {
 			$tmpecmdir->ref = $tmpecmdir->label;
-			if ($i == 0 && $action == 'edit') {
-				$s = '<input type="text" name="label" class="minwidth300" maxlength="32" value="'.$tmpecmdir->label.'">';
-			} else {
-				$s = $tmpecmdir->getNomUrl(1).$s;
-			}
+			$s = $tmpecmdir->getNomUrl(1).$s;
 			if ($tmpecmdir->fk_parent) {
 				$s = ' -> '.$s;
 				$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
@@ -371,6 +377,16 @@ print img_picto('','object_dir').' <a href="'.DOL_URL_ROOT.'/ecm/index.php">'.$l
 print $s;
 print '</td></tr>';*/
 if ($module == 'ecm') {
+	if ($action == 'edit') {
+		print '<tr><td class="titlefield tdtop">'.$langs->trans("ECMDirName").'</td><td>';
+		print '<input type="text" name="label" class="minwidth300" maxlength="32" value="'.$ecmdir->label.'">';
+		print '</td></tr>';
+		print '<tr><td class="titlefield tdtop">'.$langs->trans("ECMParentDirectory").'</td><td>';
+		print $formecm->selectAllSections($ecmdir->fk_parent, '', 'ecm', array($ecmdir->id));
+		print '</td><td>';
+		print '</td></tr>';
+	}
+
 	print '<tr><td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
 	if ($action == 'edit') {
 		print '<textarea class="flat quatrevingtpercent" name="description">';
@@ -421,11 +437,7 @@ print $object->showOptionals($extrafields, ($action == 'edit' ? 'edit' : 'view')
 print '</table>';
 
 if ($action == 'edit') {
-	print '<br><div align="center">';
-	print '<input type="submit" class="button button-save" name="submit" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; &nbsp; ';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 }
 
 print '</div>';
@@ -438,15 +450,15 @@ print dol_get_fiche_end();
 
 
 // Actions buttons
-if ($action != 'edit' && $action != 'delete') {
+if ($action != 'edit' && $action != 'delete' && $action != 'deletefile') {
 	print '<div class="tabsAction">';
 
 	if ($permtoadd) {
-		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit'.($module ? '&module='.$module : '').'&section='.$section.'">'.$langs->trans('Edit').'</a>';
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().($module ? '&module='.$module : '').'&section='.$section.'">'.$langs->trans('Edit').'</a>';
 	}
 
 	if ($permtoadd) {
-		print '<a class="butAction" href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create'.($module ? '&module='.$module : '').'&catParent='.$section.'">'.$langs->trans('ECMAddSection').'</a>';
+		print '<a class="butAction" href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&token='.newToken().($module ? '&module='.$module : '').'&catParent='.$section.'">'.$langs->trans('ECMAddSection').'</a>';
 	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('ECMAddSection').'</a>';
 	}
@@ -470,8 +482,8 @@ if ($action != 'edit' && $action != 'delete') {
 }
 
 // Confirm remove file
-if ($action == 'delete') {
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.GETPOST("section", 'alpha').'&urlfile='.urlencode($_GET["urlfile"]).($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile');
+if ($action == 'deletefile') {
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode(GETPOST("section", 'alpha')).'&urlfile='.urlencode(GETPOST("urlfile")).($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile');
 }
 
 // Confirm remove file
@@ -486,7 +498,7 @@ if ($action == 'delete_dir') {
 		);
 	}
 
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.GETPOST('section', 'alpha').($module ? '&module='.$module : '').($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $relativepathwithoutslash), 'confirm_deletedir', $formquestion, 1, 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode(GETPOST('section', 'alpha')).($module ? '&module='.$module : '').($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $relativepathwithoutslash), 'confirm_deletedir', $formquestion, 1, 1);
 }
 
 
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 209b3dceff2..7de02f56083 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -46,8 +46,8 @@ if ($user->socid > 0) {
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -405,18 +405,14 @@ print ajax_autoselect('downloadlink');
 print dol_get_fiche_end();
 
 if ($action == 'edit') {
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" name="submit" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; &nbsp; ';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 }
 
 
-// Confirmation de la suppression d'une ligne categorie
-if ($action == 'delete_file') {
+// Confirm deletion of a file
+if ($action == 'deletefile') {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile', $urlfile), 'confirm_deletefile', '', 1, 1);
 }
 
@@ -430,7 +426,7 @@ if ($action != 'edit') {
 	/*
 	if ($user->rights->ecm->setup)
 	{
-		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=delete_file&token='.newToken().'&section='.$section.'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Delete').'</a>';
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=deletefile&token='.newToken().'&section='.$section.'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Delete').'</a>';
 	}
 	else
 	{
diff --git a/htdocs/ecm/file_note.php b/htdocs/ecm/file_note.php
index 505e432f982..43dcc20e744 100644
--- a/htdocs/ecm/file_note.php
+++ b/htdocs/ecm/file_note.php
@@ -48,8 +48,8 @@ if ($user->socid > 0) {
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 813ee69b6fb..2b68206d70a 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -45,8 +45,8 @@ $section_dir = GETPOST('section_dir', 'alpha');
 $overwritefile = GETPOST('overwritefile', 'int');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index acce421fb9a..3b906883c00 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -52,8 +52,8 @@ $section_dir = GETPOST('section_dir', 'alpha');
 $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -310,64 +310,78 @@ $rowspan = 0;
 $sectionauto = array();
 if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
 	if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-		$langs->load("products"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts"));
+		$langs->load("products");
+		$rowspan++; $sectionauto[] = array('position'=>10, 'level'=>1, 'module'=>'product', 'test'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts"));
 	}
 	if (!empty($conf->societe->enabled)) {
-		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties")));
+		$rowspan++; $sectionauto[] = array('position'=>20, 'level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties")));
 	}
 	if (!empty($conf->propal->enabled)) {
-		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));
+		$rowspan++; $sectionauto[] = array('position'=>30, 'level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));
 	}
 	if (!empty($conf->contrat->enabled)) {
-		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
+		$rowspan++; $sectionauto[] = array('position'=>40, 'level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
 	}
 	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")));
+		$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)) {
-		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
+		$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)) {
-		$langs->load("supplier_proposal"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals")));
+		$langs->load("supplier_proposal");
+		$rowspan++; $sectionauto[] = array('position'=>70, 'level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals")));
 	}
 	if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) {
-		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)), 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders")));
+		$rowspan++; $sectionauto[] = array('position'=>80, 'level'=>1, 'module'=>'order_supplier', 'test'=>(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)), 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders")));
 	}
 	if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) {
-		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)), 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices")));
+		$rowspan++; $sectionauto[] = array('position'=>90, 'level'=>1, 'module'=>'invoice_supplier', 'test'=>(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)), 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices")));
 	}
 	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")));
+		$langs->load("compta");
+		$rowspan++; $sectionauto[] = array('position'=>100, 'level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
+		$rowspan++; $sectionauto[] = array('position'=>110, 'level'=>1, 'module'=>'tax-vat', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("VAT"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("VAT")));
+	}
+	if (!empty($conf->salaries->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('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
-		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project_task', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Tasks"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Tasks")));
+		$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->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")));
+		$langs->load("interventions");
+		$rowspan++; $sectionauto[] = array('position'=>150, 'level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
 	}
 	if (!empty($conf->expensereport->enabled)) {
-		$langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
+		$langs->load("trips");
+		$rowspan++; $sectionauto[] = array('position'=>160, 'level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
 	}
 	if (!empty($conf->holiday->enabled)) {
-		$langs->load("holiday"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays")));
+		$langs->load("holiday");
+		$rowspan++; $sectionauto[] = array('position'=>170, 'level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays")));
 	}
 	if (!empty($conf->banque->enabled)) {
-		$langs->load("banks"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
-		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'chequereceipt', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("CheckReceipt"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("CheckReceipt")));
+		$langs->load("banks");
+		$rowspan++; $sectionauto[] = array('position'=>180, 'level'=>1, 'module'=>'banque', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
+		$rowspan++; $sectionauto[] = array('position'=>190, 'level'=>1, 'module'=>'chequereceipt', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("CheckReceipt"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("CheckReceipt")));
 	}
 	if (!empty($conf->mrp->enabled)) {
-		$langs->load("mrp"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'mrp-mo', 'test'=>$conf->mrp->enabled, 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders")));
+		$langs->load("mrp");
+		$rowspan++; $sectionauto[] = array('position'=>200, 'level'=>1, 'module'=>'mrp-mo', 'test'=>$conf->mrp->enabled, 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders")));
 	}
 	if (!empty($conf->recruitment->enabled)) {
-		$langs->load("recruitment"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>$conf->recruitment->enabled, 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications")));
+		$langs->load("recruitment");
+		$rowspan++; $sectionauto[] = array('position'=>210, 'level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>$conf->recruitment->enabled, 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications")));
 	}
-	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Users")));
+	$rowspan++; $sectionauto[] = array('position'=>220, 'level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Users")));
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
-	if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray)>0) {
-		$sectionauto[]=$hookmanager->resArray;
+	if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray) > 0) {
+		$sectionauto[] = $hookmanager->resArray;
 		$rowspan += count($hookmanager->resArray);
 	}
 }
@@ -378,7 +392,7 @@ print dol_get_fiche_head($head, 'index_auto', '', -1, '');
 
 
 // Confirm remove file (for non javascript users)
-if ($action == 'delete' && empty($conf->use_javascript_ajax)) {
+if ($action == 'deletefile' && empty($conf->use_javascript_ajax)) {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 1);
 }
 
@@ -415,8 +429,8 @@ if ($action == 'delete_section') {
 // End confirm
 
 
-if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $action) || $action == 'delete') {
-	print '<table width="100%" class="liste noborderbottom">'."\n";
+if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $action) || $action == 'deletefile') {
+	print '<table class="liste centpercent">'."\n";
 
 	print '<!-- Title for auto directories -->'."\n";
 	print '<tr class="liste_titre">'."\n";
@@ -439,7 +453,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 		$oldvallevel = 0;
 		foreach ($sectionauto as $key => $val) {
 			if (empty($val['test'])) {
-				continue; // If condition to show is ok
+				continue; // If condition to show the ECM auto directory is ok
 			}
 
 			print '<li class="directory collapsed">';
@@ -482,7 +496,6 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 <?php
 // Start right panel
 
-
 $mode = 'noajax';
 $url = DOL_URL_ROOT.'/ecm/index_auto.php';
 include_once DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php';
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index aa792e0c9d7..42b8efba42f 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -59,8 +59,8 @@ if (empty($module)) {
 $upload_dir = $conf->ecm->dir_output.'/'.$section;
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -239,7 +239,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
 $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 
 $formfile = new FormFile($db);
-$param = '&amp;section='.$section;
+$param = '&section='.urlencode($section);
 $textifempty = ($section ? $langs->trans("NoFileFound") : $langs->trans("ECMSelectASection"));
 $formfile->list_of_documents($filearray, '', 'ecm', $param, 1, $relativepath, $user->rights->ecm->upload, 1, $textifempty);
 
diff --git a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
index 17c185426c0..6397a333fb0 100644
--- a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
+++ b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
@@ -16,6 +16,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  * Output javascript for interactions code of ecm module
+ * $conf, $module, $param, $preopened, $nameforformuserfile may be defined
  */
 
 // Protection to avoid direct call of template
@@ -47,8 +48,8 @@ $(document).ready(function() {
 	$('#filetree').fileTree({
 		root: '<?php print dol_escape_js($openeddir); ?>',
 		// Ajax called if we click to expand a dir (not a file). Parameter 'dir' is provided as a POST parameter by fileTree code to this following URL.
-		// We must use token=$_SESSION['token'] and not token=$_SESSION['newtoken'] here because ajaxdirtree has NOTOKENRENEWAL define so there is no rollup of token so we must compare with the one valid on main page
-		script: '<?php echo DOL_URL_ROOT.'/core/ajax/ajaxdirtree.php?token='.urlencode($_SESSION['token']).'&modulepart='.urlencode($module).(empty($preopened) ? '' : '&preopened='.urlencode($preopened)).'&openeddir='.urlencode($openeddir).(empty($paramwithoutsection) ? '' : $paramwithoutsection); ?>',
+		// We must use token=currentToken() and not newToken() here because ajaxdirtree has NOTOKENRENEWAL define so there is no rollup of token so we must compare with the one valid on main page
+		script: '<?php echo DOL_URL_ROOT.'/core/ajax/ajaxdirtree.php?token='.currentToken().'&modulepart='.urlencode($module).(empty($preopened) ? '' : '&preopened='.urlencode($preopened)).'&openeddir='.urlencode($openeddir).(empty($paramwithoutsection) ? '' : $paramwithoutsection); ?>',
 		folderEvent: 'click',	// 'dblclick'
 		multiFolder: false  },
 		// Called if we click on a file (not a dir)
@@ -77,13 +78,14 @@ $(document).ready(function() {
 	$('#refreshbutton').click( function() {
 		console.log("Click on refreshbutton");
 		$.pleaseBePatient("<?php echo $langs->trans('PleaseBePatient'); ?>");
-		$.get( "<?php echo DOL_URL_ROOT.'/ecm/ajax/ecmdatabase.php'; ?>", {
-			action: "build",
-			element: "ecm"
+		$.get("<?php echo DOL_URL_ROOT.'/ecm/ajax/ecmdatabase.php'; ?>", {
+			action: 'build',
+			token: '<?php echo newToken(); ?>',
+			element: 'ecm'
 		},
 		function(response) {
 			$.unblockUI();
-			location.href="<?php echo $_SERVER['PHP_SELF']; ?>";
+			location.href='<?php echo $_SERVER['PHP_SELF']; ?>';
 		});
 	});
 });
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index f4341109000..17fe55d0583 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -30,6 +30,16 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
 
+require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; // customer proposal
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; // customer order
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; // Shipment
+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.'/holiday/class/holiday.class.php'; // Holidays (leave request)
+//require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php'; // expernse report
+
 
 /**
  * Class for EmailCollector
@@ -505,7 +515,7 @@ class EmailCollector extends CommonObject
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-		$url = dol_buildpath('/admin/emailcollector_card.php', 1).'?id='.$this->id;
+		$url = DOL_URL_ROOT.'/admin/emailcollector_card.php?id='.$this->id;
 
 		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
@@ -589,10 +599,10 @@ class EmailCollector extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
-			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled');
-			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled');
-			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled');
+			$this->labelStatus[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatus[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
 		}
 
 		$statusType = 'status5';
@@ -675,7 +685,7 @@ class EmailCollector extends CommonObject
 
 		$sql = 'SELECT rowid, type, rulevalue, status';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'emailcollector_emailcollectorfilter';
-		$sql .= ' WHERE fk_emailcollector = '.$this->id;
+		$sql .= ' WHERE fk_emailcollector = '.((int) $this->id);
 		//$sql.= ' ORDER BY position';
 
 		$resql = $this->db->query($sql);
@@ -707,7 +717,7 @@ class EmailCollector extends CommonObject
 
 		$sql = 'SELECT rowid, type, actionparam, status';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'emailcollector_emailcollectoraction';
-		$sql .= ' WHERE fk_emailcollector = '.$this->id;
+		$sql .= ' WHERE fk_emailcollector = '.((int) $this->id);
 		$sql .= ' ORDER BY position';
 
 		$resql = $this->db->query($sql);
@@ -752,6 +762,11 @@ class EmailCollector extends CommonObject
 		if ($norsh || !empty($conf->global->IMAP_FORCE_NORSH)) {
 			$flags .= '/norsh';
 		}
+		//Used in shared mailbox from Office365
+		if (strpos($this->login, '/') != false) {
+			$partofauth = explode('/', $this->login);
+			$flags .= '/authuser='.$partofauth[0].'/user='.$partofauth[1];
+		}
 
 		$connectstringserver = '{'.$this->host.':993'.$flags.'}';
 
@@ -1415,8 +1430,8 @@ class EmailCollector extends CommonObject
 				$reg = array();
 				if (!empty($headers['References'])) {
 					$arrayofreferences = preg_split('/(,|\s+)/', $headers['References']);
-					//var_dump($headers['References']);
-					//var_dump($arrayofreferences);
+					// var_dump($headers['References']);
+					// var_dump($arrayofreferences);
 
 					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";
@@ -1432,9 +1447,30 @@ class EmailCollector extends CommonObject
 							if ($reg[1] == 'ctc') {
 								$objectemail = new Contact($this->db);
 							}
-							if ($reg[1] == 'inv') {
+							if ($reg[1] == 'inv') { // customer invoices
 								$objectemail = new Facture($this->db);
 							}
+							if ($reg[1] == 'sinv') { // supplier invoices
+								$objectemail = new FactureFournisseur($this->db);
+							}
+							if ($reg[1] == 'pro') { // customer proposals
+								$objectemail = new Propal($this->db);
+							}
+							if ($reg[1] == 'ord') { // customer orders
+								$objectemail = new Commande($this->db);
+							}
+							if ($reg[1] == 'shi') { // shipments
+								$objectemail = new Expedition($this->db);
+							}
+							if ($reg[1] == 'spro') { // supplier proposal
+								$objectemail = new SupplierProposal($this->db);
+							}
+							if ($reg[1] == 'sord') { // supplier order
+								$objectemail = new CommandeFournisseur($this->db);
+							}
+							if ($reg[1] == 'rec') { // Reception
+								$objectemail = new Reception($this->db);
+							}
 							if ($reg[1] == 'proj') {
 								$objectemail = new Project($this->db);
 							}
@@ -1456,6 +1492,12 @@ class EmailCollector extends CommonObject
 							if ($reg[1] == 'mem') {
 								$objectemail = new Adherent($this->db);
 							}
+							/*if ($reg[1] == 'leav') {
+								$objectemail = new Holiday($db);
+							}
+							if ($reg[1] == 'exp') {
+								$objectemail = new ExpenseReport($db);
+							}*/
 						} elseif (preg_match('/<(.*@.*)>/', $reference, $reg)) {
 							// This is an external reference, we check if we have it in our database
 							if (!is_object($objectemail)) {
@@ -1860,6 +1902,164 @@ class EmailCollector extends CommonObject
 								}
 							}
 						}
+					} elseif ($operation['type'] == 'recordjoinpiece') {
+						$pj = getAttachments($imapemail, $connection);
+						foreach ($pj as $key => $val) {
+							$data[$val['filename']] = getFileData($imapemail, $val['pos'], $val['type'], $connection);
+						}
+						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';
+							}
+							$arrayobject = array(
+								'propale' => array('table' => 'propal',
+									'fields' => array('ref'),
+									'class' => 'comm/propal/class/propal.class.php',
+									'object' => 'Propal'),
+								'holiday' => array('table' => 'holiday',
+									'fields' => array('ref'),
+									'class' => 'holiday/class/holiday.class.php',
+									'object' => 'Holiday'),
+								'expensereport' => array('table' => 'expensereport',
+									'fields' => array('ref'),
+									'class' => 'expensereport/class/expensereport.class.php',
+									'object' => 'ExpenseReport'),
+								'recruitment/recruitmentjobposition' => array('table' => 'recruitment_recruitmentjobposition',
+									'fields' => array('ref'),
+									'class' => 'recruitment/class/recruitmentjobposition.class.php',
+									'object' => 'RecruitmentJobPosition'),
+								'recruitment/recruitmentjobposition' => array('table' => 'recruitment_recruitmentcandidature',
+									'fields' => array('ref'),
+									'class' => 'recruitment/class/recruitmentcandidature.class.php',
+									'object' => ' RecruitmentCandidature'),
+								'societe' => array('table' => 'societe',
+									'fields' => array('code_client', 'code_fournisseur'),
+									'class' => 'societe/class/societe.class.php',
+									'object' => 'Societe'),
+								'commande' => array('table' => 'commande',
+									'fields' => array('ref'),
+									'class' => 'commande/class/commande.class.php',
+									'object' => 'Commande'),
+								'expedition' => array('table' => 'expedition',
+									'fields' => array('ref'),
+									'class' => 'expedition/class/expedition.class.php',
+									'object' => 'Expedition'),
+								'contract' => array('table' => 'contrat',
+									'fields' => array('ref'),
+									'class' => 'contrat/class/contrat.class.php',
+									'object' => 'Contrat'),
+								'fichinter' => array('table' => 'fichinter',
+									'fields' => array('ref'),
+									'class' => 'fichinter/class/fichinter.class.php',
+									'object' => 'Fichinter'),
+								'ticket' => array('table' => 'ticket',
+									'fields' => array('ref'),
+									'class' => 'ticket/class/ticket.class.php',
+									'object' => ' Ticket'),
+								'knowledgemanagement' => array('table' => 'knowledgemanagement_knowledgerecord',
+									'fields' => array('ref'),
+									'class' => 'knowledgemanagement/class/knowledgemanagement.class.php',
+									'object' => 'KnowledgeRecord'),
+								'supplier_proposal' => array('table' => 'supplier_proposal',
+									'fields' => array('ref'),
+									'class' => 'supplier_proposal/class/supplier_proposal.class.php',
+									'object' => 'SupplierProposal'),
+								'fournisseur/commande' => array('table' => 'commande_fournisseur',
+									'fields' => array('ref', 'ref_supplier'),
+									'class' => 'fourn/class/fournisseur.commande.class.php',
+									'object' => 'SupplierProposal'),
+								'facture' => array('table' => 'facture',
+									'fields' => array('ref'),
+									'class' => 'compta/facture/class/facture.class.php',
+									'object' => 'Facture'),
+								'fournisseur/facture' => array('table' => 'facture_fourn',
+									'fields' => array('ref', ref_client),
+									'class' => 'fourn/class/fournisseur.facture.class.php',
+									'object' => 'FactureFournisseur'),
+								'produit' => array('table' => 'product',
+									'fields' => array('ref'),
+									'class' => 'product/class/product.class.php',
+									'object' => 'Product'),
+								'productlot' => array('table' => 'product_lot',
+									'fields' => array('batch'),
+									'class' => 'product/stock/class/productlot.class.php',
+									'object' => 'Productlot'),
+								'projet' => array('table' => 'projet',
+									'fields' => array('ref'),
+									'class' => 'projet/class/projet.class.php',
+									'object' => 'Project'),
+								'projet_task' => array('table' => 'projet_task',
+									'fields' => array('ref'),
+									'class' => 'projet/class/task.class.php',
+									'object' => 'Task'),
+								'ressource' => array('table' => 'resource',
+									'fields' => array('ref'),
+									'class' => 'ressource/class/dolressource.class.php',
+									'object' => 'Dolresource'),
+								'bom' => array('table' => 'bom_bom',
+									'fields' => array('ref'),
+									'class' => 'bom/class/bom.class.php',
+									'object' => 'BOM'),
+								'mrp' => array('table' => 'mrp_mo',
+									'fields' => array('ref'),
+									'class' => 'mrp/class/mo.class.php',
+									'object' => 'Mo'),
+							);
+
+							$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;
+
+							$resultobj = array();
+
+							foreach ($arrayobject as $key => $objectdesc) {
+								$sql = 'SELECT DISTINCT t.rowid ';
+								$sql .= ' FROM ' . MAIN_DB_PREFIX . $objectdesc['table'] . ' AS t';
+								$sql .= ' WHERE ';
+								foreach ($objectdesc['fields'] as $field) {
+									$sql .= "'" .$this->db->escape($subject) . "'  LIKE CONCAT('%',  t." . $field . ", '%') OR ";
+								}
+								$sql = substr($sql, 0, -4);
+
+								$ressqlobj = $this->db->query($sql);
+								if ($ressqlobj) {
+									while ($obj = $this->db->fetch_object($ressqlobj)) {
+										$resultobj[$key][] = $obj->rowid;
+									}
+								}
+							}
+							$dirs = array();
+							foreach ($resultobj as $mod => $ids) {
+								$moddesc = $arrayobject[$mod];
+								$elementpath = $mod;
+								dol_include_once($moddesc['class']);
+								$objectmanaged = new $moddesc['object']($this->db);
+								foreach ($ids as $val) {
+									$res = $objectmanaged->fetch($val);
+									if ($res) {
+										$path = ($objectmanaged->entity > 1 ? "/" . $objectmanaged->entity : '');
+										$dirs[] = DOL_DATA_ROOT . $path . "/" . $elementpath . '/' . dol_sanitizeFileName($objectmanaged->ref) . '/';
+									} else {
+										$this->errors = 'object not found';
+									}
+								}
+							}
+							foreach ($dirs as $target) {
+								foreach ($data as $filename => $content) {
+									$prefix = $this->actions[$this->id]['actionparam'];
+
+									$resr = saveAttachment($target, $prefix . '_' . $filename, $content);
+									if ($resr == -1) {
+										$this->errors = 'Doc not saved';
+									}
+								}
+							}
+						} else {
+							$this->errors = 'no joined piece';
+						}
 					} elseif ($operation['type'] == 'project') {
 						// Create project / lead
 						$projecttocreate = new Project($this->db);
@@ -2067,6 +2267,14 @@ class EmailCollector extends CommonObject
 										$errorforactions++;
 										$this->error = 'Failed to create ticket: '.$langs->trans($tickettocreate->error);
 										$this->errors = $tickettocreate->errors;
+									} else {
+										if ($attachments) {
+											$destdir = $conf->ticket->dir_output.'/'.$tickettocreate->ref;
+											if (!dol_is_dir($destdir)) {
+												dol_mkdir($destdir);
+												$this->getmsg($connection, $imapemail, $destdir);
+											}
+										}
 									}
 								}
 							}
@@ -2166,7 +2374,8 @@ class EmailCollector extends CommonObject
 						global $hookmanager;
 
 						if (!is_object($hookmanager)) {
-							$hookmanager->initHooks(array('emailcollectorcard'));
+							include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+							$hookmanager = new HookManager($this->db);
 						}
 
 						$parameters = array(
@@ -2186,6 +2395,7 @@ class EmailCollector extends CommonObject
 							'messagetext'=>$messagetext,
 							'subject'=>$subject,
 							'header'=>$header,
+							'attachments'=>$attachments,
 						);
 						$res = $hookmanager->executeHooks('doCollectOneCollector', $parameters, $this, $operation['type']);
 
@@ -2288,9 +2498,10 @@ class EmailCollector extends CommonObject
 	 *
 	 * @param 	Object $mbox     	Structure
 	 * @param 	string $mid		    prefix
+	 * @param 	string $destdir	    Target dir for attachments
 	 * @return 	array				Array with number and object
 	 */
-	private function getmsg($mbox, $mid)
+	private function getmsg($mbox, $mid, $destdir = '')
 	{
 		// input $mbox = IMAP stream, $mid = message id
 		// output all the following:
@@ -2311,7 +2522,7 @@ class EmailCollector extends CommonObject
 		} else {
 			// multipart: cycle through each part
 			foreach ($s->parts as $partno0 => $p) {
-				$this->getpart($mbox, $mid, $p, $partno0 + 1);
+				$this->getpart($mbox, $mid, $p, $partno0 + 1, $destdir);
 			}
 		}
 	}
@@ -2338,9 +2549,10 @@ class EmailCollector extends CommonObject
 	 * @param 	string		$mid			Part no
 	 * @param 	Object		$p              Object p
 	 * @param   string      $partno         Partno
+	 * @param 	string 		$destdir	    Target dir for attachments
 	 * @return	void
 	 */
-	private function getpart($mbox, $mid, $p, $partno)
+	private function getpart($mbox, $mid, $p, $partno, $destdir = '')
 	{
 		// $partno = '1', '2', '2.1', '2.1.3', etc for multipart, 0 if simple
 		global $htmlmsg, $plainmsg, $charset, $attachments;
@@ -2378,6 +2590,38 @@ class EmailCollector extends CommonObject
 			$filename = ($params['filename']) ? $params['filename'] : $params['name'];
 			// filename may be encoded, so see imap_mime_header_decode()
 			$attachments[$filename] = $data; // this is a problem if two files have same name
+
+			// Get file name (with extension)
+			$file_name_complete =  $params['filename'];
+
+
+			$destination = $destdir.'/'.$file_name_complete;
+
+			// Extract file extension
+			$extension = pathinfo($file_name_complete, PATHINFO_EXTENSION);
+
+			// Extract file name without extension
+			$file_name = pathinfo($file_name_complete, PATHINFO_FILENAME);
+
+			// Save an original file name variable to track while renaming if file already exists
+			$file_name_original = $file_name;
+
+			// Increment file name by 1
+			$num = 1;
+
+			/**
+			 * Check if the same file name already exists in the upload folder,
+			 * append increment number to the original filename
+			 */
+			while (file_exists($destdir."/" . $file_name . "." . $extension)) {
+				$file_name = (string) $file_name_original . ' (' . $num . ')';
+				$file_name_complete = $file_name . "." . $extension;
+				$destination = $destdir.'/'.$file_name_complete;
+				$num++;
+			}
+
+
+			file_put_contents($destination, $data);
 		}
 
 		// TEXT
diff --git a/htdocs/emailcollector/lib/emailcollector.lib.php b/htdocs/emailcollector/lib/emailcollector.lib.php
index fe4a5f1b19c..9b63bbea66a 100644
--- a/htdocs/emailcollector/lib/emailcollector.lib.php
+++ b/htdocs/emailcollector/lib/emailcollector.lib.php
@@ -85,3 +85,132 @@ function emailcollectorPrepareHead($object)
 
 	return $head;
 }
+
+/**
+ * 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
+ */
+function getParts($structure)
+{
+	return isset($structure->parts) ? $structure->parts : false;
+}
+
+/**
+ * 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
+ */
+function getDParameters($part)
+{
+	return $part->ifdparameters ? $part->dparameters : false;
+}
+
+/**
+ * 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
+ */
+function getAttachments($jk, $mbox)
+{
+	$structure = imap_fetchstructure($mbox, $jk);
+	$parts = getParts($structure);
+	$fpos = 2;
+	$attachments = array();
+	$nb = count($parts);
+	if ($parts && $nb) {
+		for ($i = 1; $i < $nb; $i++) {
+			$part = $parts[$i];
+
+			if ($part->ifdisposition && strtolower($part->disposition) == "attachment") {
+				$ext = $part->subtype;
+				$params = getDParameters($part);
+
+				if ($params) {
+					$filename = $part->dparameters[0]->value;
+					$filename = imap_utf8($filename);
+					$attachments[] = array('type' => $part->type, 'filename' => $filename, 'pos' => $fpos);
+				}
+			}
+			$fpos++;
+		}
+	}
+	return $attachments;
+}
+
+/**
+ * Récupère la contenu de la pièce jointe par rapport a sa position dans un mail donné
+ * @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
+ * @param object $mbox object connection imaap
+ * @return mixed data
+ */
+function getFileData($jk, $fpos, $type, $mbox)
+{
+	$mege = imap_fetchbody($mbox, $jk, $fpos);
+	$data = getDecodeValue($mege, $type);
+
+	return $data;
+}
+
+/**
+ * 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
+ **/
+function saveAttachment($path, $filename, $data)
+{
+	global $lang;
+	$tmp = explode('.', $filename);
+	$ext = array_pop($tmp);
+	$filename = implode('.', $tmp);
+	if (!file_exists($path)) {
+		if (dol_mkdir($path) < 0) {
+			return -1;
+		}
+	}
+
+	$i = 1;
+	$filepath = $path . $filename . '.' . $ext;
+
+	while (file_exists($filepath)) {
+		$filepath = $path . $filename . '(' . $i . ').' . $ext;
+		$i++;
+	}
+	file_put_contents($filepath, $data);
+	return $filepath;
+}
+
+/**
+ * Décode le contenu du message
+ * @param string $message message
+ * @param integer $coding type de contenu
+ * @return message décodé
+ **/
+function getDecodeValue($message, $coding)
+{
+	switch ($coding) {
+		case 0: //text
+		case 1: //multipart
+			$message = imap_8bit($message);
+			break;
+		case 2: //message
+			$message = imap_binary($message);
+			break;
+		case 3: //application
+		case 5: //image
+		case 6: //video
+		case 7: //other
+			$message = imap_base64($message);
+			break;
+		case 4: //audio
+			$message = imap_qprint($message);
+			break;
+	}
+
+	return $message;
+}
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 6d21fb911b2..1d462ddae30 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -24,7 +24,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 . '/comm/action/class/actioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
 /**
@@ -102,7 +102,7 @@ class ConferenceOrBooth extends ActionComm
 	/**
 	 * @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(
+	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',),
@@ -135,7 +135,8 @@ class ConferenceOrBooth extends ActionComm
 	public $status;
 	// END MODULEBUILDER PROPERTIES
 
-	public $pubregister;
+	//public $pubregister;
+
 
 	/**
 	 * Constructor
@@ -195,11 +196,11 @@ class ConferenceOrBooth extends ActionComm
 	 */
 	protected function setPercentageFromStatus()
 	{
-		if ($this->status==self::STATUS_DONE) {
-			$this->percentage=100;
+		if ($this->status == self::STATUS_DONE) {
+			$this->percentage = 100;
 		}
-		if ($this->status==self::STATUS_DRAFT) {
-			$this->percentage=0;
+		if ($this->status == self::STATUS_DRAFT) {
+			$this->percentage = 0;
 		}
 	}
 
@@ -211,12 +212,12 @@ class ConferenceOrBooth extends ActionComm
 	 */
 	protected function setActionCommFields(User $user)
 	{
-		$this->userownerid=$user->id;
-		$this->type_id=$this->fk_action;
-		$this->socid=$this->fk_soc;
-		$this->datef=$this->datep2;
-		$this->note_private=$this->note;
-		$this->fk_user_author=$this->fk_user_author;
+		$this->userownerid = $user->id;
+		$this->type_id = $this->fk_action;
+		$this->socid = $this->fk_soc;
+		$this->datef = $this->datep2;
+		$this->note_private = $this->note;
+		$this->fk_user_author = $this->fk_user_author;
 	}
 
 	/**
@@ -226,9 +227,9 @@ class ConferenceOrBooth extends ActionComm
 	 */
 	protected function getActionCommFields()
 	{
-		$this->fk_action=$this->type_id;
-		$this->fk_soc=$this->socid;
-		$this->datep2=$this->datef;
+		$this->fk_action = $this->type_id;
+		$this->fk_soc = $this->socid;
+		$this->datep2 = $this->datef;
 	}
 
 	/**
@@ -238,21 +239,22 @@ class ConferenceOrBooth extends ActionComm
 	 * @param string $ref  Ref
 	 * @param  string	$ref_ext		Ref ext to get
 	 * @param	string	$email_msgid	Email msgid
+	 * @param int 		$loadresources	1=Load also resources
 	 * @return int         <0 if KO, 0 if not found, >0 if OK
 	 */
-	public function fetch($id, $ref = null, $ref_ext = '', $email_msgid = '')
+	public function fetch($id, $ref = null, $ref_ext = '', $email_msgid = '', $loadresources = 1)
 	{
 		global $dolibarr_main_url_root, $conf, $langs;
 
 		$result = parent::fetch($id, $ref, $ref_ext, $email_msgid);
 
-		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_register.php?id='.urlencode($id).'&type=conf';
+		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.urlencode($id).'&type=conf';
 
 		$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 		$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
 
-		$this->fields['pubregister'] = array('type'=>'url', 'label'=>$langs->trans("PublicAttendeeSubscriptionPage"), 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>1);
-		$this->pubregister = $link_subscription;
+		/*$this->fields['pubregister'] = array('type'=>'url', 'label'=>$langs->trans("PublicAttendeeSubscriptionPage"), 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>1);
+		$this->pubregister = $link_subscription;*/
 
 		$this->getActionCommFields();
 		return $result;
@@ -292,27 +294,27 @@ class ConferenceOrBooth extends ActionComm
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.id' || $key == 't.fk_project' || $key == 't.fk_soc' || $key == 't.fk_action') {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$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).'%\'';
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -382,7 +384,7 @@ class ConferenceOrBooth extends ActionComm
 		$error = 0;
 
 		// Protection
-		if ($this->status == self::STATUS_VALIDATED) {
+		if ($this->status == self::STATUS_CONFIRMED) {
 			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
 			return 0;
 		}
@@ -407,48 +409,14 @@ class ConferenceOrBooth extends ActionComm
 		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('CONFERENCEORBOOTH_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 = 'conferenceorbooth/".$this->db->escape($this->newref)."'";
-				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'conferenceorbooth/".$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->eventorganization->dir_output.'/conferenceorbooth/'.$oldref;
-				$dirdest = $conf->eventorganization->dir_output.'/conferenceorbooth/'.$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->eventorganization->dir_output.'/conferenceorbooth/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-						foreach ($listoffiles as $fileentry) {
-							$dirsource = $fileentry['name'];
-							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
-							$dirsource = $fileentry['path'].'/'.$dirsource;
-							$dirdest = $fileentry['path'].'/'.$dirdest;
-							@rename($dirsource, $dirdest);
-						}
-					}
-				}
+			if ($result < 0) {
+				$error++;
 			}
+			// End call triggers
 		}
 
 		// Set new ref and current status
 		if (!$error) {
-			$this->ref = $num;
 			$this->status = self::STATUS_CONFIRMED;
 		}
 
@@ -575,7 +543,7 @@ class ConferenceOrBooth extends ActionComm
 			if ($add_save_lastsearch_values) {
 				$url .= '&save_lastsearch_values=1';
 			}
-			if ($option=='withproject') {
+			if ($option == 'withproject') {
 				$url .= '&withproject=1';
 			}
 		}
@@ -671,18 +639,18 @@ class ConferenceOrBooth extends ActionComm
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("eventorganization@eventorganization");
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatus[self::STATUS_SUGGESTED] = $langs->trans('Suggested');
-			$this->labelStatus[self::STATUS_CONFIRMED] = $langs->trans('Confirmed');
-			$this->labelStatus[self::STATUS_NOT_QUALIFIED] = $langs->trans('NotSelected');
-			$this->labelStatus[self::STATUS_DONE] = $langs->trans('Done');
-			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
-			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatusShort[self::STATUS_SUGGESTED] = $langs->trans('Suggested');
-			$this->labelStatusShort[self::STATUS_CONFIRMED] = $langs->trans('Confirmed');
-			$this->labelStatusShort[self::STATUS_NOT_QUALIFIED] = $langs->trans('NotSelected');
-			$this->labelStatusShort[self::STATUS_DONE] = $langs->trans('Done');
-			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatus[self::STATUS_SUGGESTED] = $langs->transnoentitiesnoconv('Suggested');
+			$this->labelStatus[self::STATUS_CONFIRMED] = $langs->transnoentitiesnoconv('Confirmed');
+			$this->labelStatus[self::STATUS_NOT_QUALIFIED] = $langs->transnoentitiesnoconv('NotSelected');
+			$this->labelStatus[self::STATUS_DONE] = $langs->transnoentitiesnoconv('Done');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatusShort[self::STATUS_SUGGESTED] = $langs->transnoentitiesnoconv('Suggested');
+			$this->labelStatusShort[self::STATUS_CONFIRMED] = $langs->transnoentitiesnoconv('Confirmed');
+			$this->labelStatusShort[self::STATUS_NOT_QUALIFIED] = $langs->transnoentitiesnoconv('NotSelected');
+			$this->labelStatusShort[self::STATUS_DONE] = $langs->transnoentitiesnoconv('Done');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
 		}
 
 		$statusType = 'status'.$status;
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 0ee05489347..96131aa5946 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -100,7 +100,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	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'=>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'),
@@ -119,7 +119,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 		'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, 'default'=>0,'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '9'=>'Canceled'),),
+		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'default'=>0, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '9'=>'Canceled'),),
 	);
 	public $rowid;
 	public $ref;
@@ -436,14 +436,14 @@ class ConferenceOrBoothAttendee extends CommonObject
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -567,7 +567,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 			if (!empty($this->fields['fk_user_valid'])) {
 				$sql .= ", fk_user_valid = ".$user->id;
 			}
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -766,7 +766,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 		$label .= '<br><b>'.$langs->trans('DateOfRegistration').':</b> '.dol_print_date($this->date_subscription, 'dayhour');
 		$label .= '<br><b>'.$langs->trans('AmountPaid').':</b> '.$this->amount;
 
-		$url = dol_buildpath('/eventorganization/conferenceorboothattendee_card.php', 1).'?id='.$this->id;
+		$url = DOL_URL_ROOT.'/eventorganization/conferenceorboothattendee_card.php?id='.$this->id;
 
 		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
@@ -787,7 +787,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 			}
 
 			if ($option == 'conforboothidproject') {
-				$url .= '&conforboothid='.((int) $this->fk_actioncomm).'&withproject=1' ;
+				$url .= '&conforboothid='.((int) $this->fk_actioncomm).'&withproject=1';
 			}
 		}
 
@@ -982,28 +982,6 @@ class ConferenceOrBoothAttendee 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 ConferenceOrBoothAttendeeLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_conferenceorboothattendee = '.((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.
 	 *
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index 0ca8697b9d0..0d14811ef67 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -31,19 +31,23 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.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.'/categories/class/categorie.class.php';
+
+global $dolibarr_main_url_root;
 
 // Load translation files required by the page
 $langs->loadLangs(array("eventorganization", "projects"));
 
-// 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') : 'conferenceorboothcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
 $withproject = GETPOST('withproject', 'int');
 $mode = GETPOST('mode', 'alpha');
 
@@ -114,7 +118,7 @@ if (empty($reshook)) {
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = dol_buildpath('/eventorganization/conferenceorbooth_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+				$backtopage = dol_buildpath('/eventorganization/conferenceorbooth_card.php', 1).'?id='.($id > 0 ? $id : '__ID__').($withproject ? '&withproject=1' : '');
 			}
 		}
 	}
@@ -194,13 +198,13 @@ if (!empty($withproject)) {
 	// Title
 	$morehtmlref .= $projectstatic->title;
 	// Thirdparty
-	if ($projectstatic->thirdparty->id > 0) {
+	if (isset($projectstatic->thirdparty->id) && $projectstatic->thirdparty->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
-	if (!$user->rights->projet->all->lire) {
+	if (empty($user->rights->project->all->lire)) {
 		$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 		$projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 	}
@@ -275,27 +279,29 @@ if (!empty($withproject)) {
 
 	// Other attributes
 	$cols = 2;
-	//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+	$objectconf = $object;
+	$object = $projectstatic;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	$object = $objectconf;
 
 	print '</table>';
 
 	print '</div>';
 
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
 
-	print '<table class="border centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
 	// Description
-	print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+	print '<td class="tdtop">'.$langs->trans("Description").'</td><td>';
 	print nl2br($projectstatic->description);
 	print '</td></tr>';
 
 	// Categories
 	if ($conf->categorie->enabled) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-		print $form->showCategories($projectstatic->id, 'project', 1);
+		print $form->showCategories($projectstatic->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
 	}
 
@@ -316,15 +322,15 @@ if (!empty($withproject)) {
 	print "</td></tr>";
 
 	print '<tr><td>';
-	print $form->editfieldkey('PriceOfRegistration', 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
+	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td>';
-	print $form->editfieldval('PriceOfRegistration', 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td>';
-	print $form->editfieldkey('PriceOfBooth', 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
+	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td>';
-	print $form->editfieldval('PriceOfBooth', 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+	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 valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
@@ -333,15 +339,48 @@ if (!empty($withproject)) {
 	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
 
 	// Show message
-	$message = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
-	$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
-	$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').'</a>';
+	$message = '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
+	$message .= '&exportkey='.urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY', '...'));
+	$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').img_picto('', 'download', 'class="paddingleft"').'</a>';
 	print $message;
 	print "</td></tr>";
 
+	// Link to the submit vote/register page
+	print '<tr><td>';
+	//print '<span class="opacitymedium">';
+	print $form->textwithpicto($langs->trans("SuggestOrVoteForConfOrBooth"), $langs->trans("EvntOrgRegistrationHelpMessage"));
+	//print '</span>';
+	print '</td><td>';
+	$linksuggest = $dolibarr_main_url_root.'/public/project/index.php?id='.((int) $projectstatic->id);
+	$encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $projectstatic->id), 'md5');
+	$linksuggest .= '&securekey='.urlencode($encodedsecurekey);
+	//print '<div class="urllink">';
+	//print '<input type="text" value="'.$linksuggest.'" id="linkregister" class="quatrevingtpercent paddingrightonly">';
+	print '<div class="tdoverflowmax200 inline-block valignmiddle"><a target="_blank" href="'.$linksuggest.'" class="quatrevingtpercent">'.$linksuggest.'</a></div>';
+	print '<a target="_blank" rel="noopener noreferrer" href="'.$linksuggest.'">'.img_picto('', 'globe').'</a>';
+	//print '</div>';
+	//print ajax_autoselect("linkregister");
+	print '</td></tr>';
+
+	// Link to the subscribe
+	print '<tr><td>';
+	//print '<span class="opacitymedium">';
+	print $langs->trans("PublicAttendeeSubscriptionGlobalPage");
+	//print '</span>';
+	print '</td><td>';
+	$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.((int) $projectstatic->id).'&type=global';
+	$encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $projectstatic->id), 'md5');
+	$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
+	//print '<div class="urllink">';
+	//print '<input type="text" value="'.$linkregister.'" id="linkregister" class="quatrevingtpercent paddingrightonly">';
+	print '<div class="tdoverflowmax200 inline-block valignmiddle"><a target="_blank" href="'.$link_subscription.'" class="quatrevingtpercent">'.$link_subscription.'</a></div>';
+	print '<a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer" href="'.$link_subscription.'">'.img_picto('', 'globe').'</a>';
+	//print '</div>';
+	//print ajax_autoselect("linkregister");
+	print '</td></tr>';
+
 	print '</table>';
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
@@ -380,11 +419,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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 $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 
@@ -423,9 +458,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	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->buttonsSaveCancel();
 
 	print '</form>';
 }
@@ -481,7 +514,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Object card
 	// ------------------------------------------------------------
-	http://dolibarr.local/eventorganization/conferenceorbooth_list.php?projectid=7
 	$linkback = '<a href="'.dol_buildpath('/eventorganization/conferenceorbooth_list.php', 1).'?projectid='.$object->fk_project.$withProjectUrl.'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
@@ -499,44 +531,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	//$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
-	$keyforbreak='pubregister';
+	$keyforbreak='num_vote';
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
-	$object->fetchObjectLinked();
 
-
-	if (is_array($object->linkedObjects) && count($object->linkedObjects)>0 && array_key_exists("facture", $object->linkedObjects)) {
-		foreach ($object->linkedObjects["facture"] as $fac) {
-			/**
-			 * @var $fac Facture
-			 */
-			if (empty($fac->paye)) {
-				$key = 'paymentlink_'.$fac->id;
-				print '<tr class="field_'.$key.'"><td';
-				print ' class="titlefield fieldname_'.$key;
-				print '">';
-				print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePayment", $langs->transnoentitiesnoconv('Online')) . ' '. $fac->ref.'</span><br>';
-				print '</td>';
-
-				print '<td class="valuefield fieldname_'.$key;
-				print '">';
-				$sourcetouse = 'boothlocation';
-				$reftouse = $fac->id;
-				$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse.'&booth='.$object->id;
-				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-						$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
-					} else {
-						$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-					}
-				}
-				print '<div class="urllink"><input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$redirection.'">';
-				print '<a href="'.$redirection.'" target="_blank">'.img_picto('', 'globe', 'class="paddingleft"').'</a></div>';
-				print '</td>';
-				print '</tr>';
-			}
-		}
-	}
 	//var_dump($object);
 	// Other attributes. Fields from hook formObjectOptions and Extrafields.
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
@@ -562,16 +560,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (empty($reshook)) {
 			// Send
 			if (empty($user->socid)) {
-				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.$withProjectUrl.'&action=presend&mode=init#formmailbeforetitle');
+				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.$withProjectUrl.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle');
 			}
 
-			print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.$withProjectUrl.'&action=edit', '', $permissiontoadd);
+			print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.$withProjectUrl.'&action=edit&token='.newToken().'', '', $permissiontoadd);
 
 			// Clone
-			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.$withProjectUrl.'&socid='.$object->socid.'&action=clone&object=scrumsprint', '', $permissiontoadd);
+			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.$withProjectUrl.'&socid='.$object->socid.'&action=clone&token='.newToken().'&object=scrumsprint', '', $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.$withProjectUrl.'&action=delete', '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.$withProjectUrl.'&action=delete&token='.newToken().'', '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
 		}
 		print '</div>'."\n";
 	}
@@ -600,9 +598,29 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		// Show links to link elements
-		$linktoelem = $form->showLinkToObjectBlock($object, null, array('conferenceorbooth'));
-		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('conferenceorbooth'));
+		//$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
+		$object->fetchObjectLinked();
+
+		if (is_array($object->linkedObjects) && count($object->linkedObjects)>0 && array_key_exists("facture", $object->linkedObjects)) {
+			foreach ($object->linkedObjects["facture"] as $fac) {
+				if (empty($fac->paye)) {
+					$key = 'paymentlink_'.$fac->id;
+
+					print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePayment", $langs->transnoentitiesnoconv('Online')) . ' '. $fac->ref.'</span><br>';
+
+					$sourcetouse = 'boothlocation';
+					$reftouse = $fac->id;
+
+					$url = getOnlinePaymentUrl(0, $sourcetouse, $reftouse);
+					$url .= '&booth='.$object->id;
+
+					print '<div class="urllink"><input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$url.'">';
+					print '<a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.img_picto('', 'globe', 'class="paddingleft"').'</a></div>';
+				}
+			}
+		}
 
 		print '</div><div class="fichehalfright">';
 		print '</div></div>';
diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
index 9fc26503c44..67cb2c659ee 100644
--- a/htdocs/eventorganization/conferenceorbooth_contact.php
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -17,41 +17,12 @@
  */
 
 /**
- *  \file       conferenceorbooth_contact.php
+ *  \file       htdocs/eventorganization/conferenceorbooth_contact.php
  *  \ingroup    eventorganization
  *  \brief      Tab for contacts linked to ConferenceOrBooth
  */
 
-// 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 '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
@@ -59,14 +30,25 @@ require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/lib/eventorganization_conferenceorbooth.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
-// Load translation files required by the page
-$langs->loadLangs(array("eventorganization@eventorganization", "companies", "other", "mails"));
+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.'/categories/class/categorie.class.php';
 
-$id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+// Load translation files required by the page
+$langs->loadLangs(array("eventorganization", "projects", "companies", "other", "mails"));
+
+$id = GETPOST('id', 'int');
 $ref    = GETPOST('ref', 'alpha');
 $lineid = GETPOST('lineid', 'int');
 $socid  = GETPOST('socid', 'int');
+
 $action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+
 $withproject = GETPOST('withproject', 'int');
 
 // Initialize technical objects
@@ -78,8 +60,10 @@ $hookmanager->initHooks(array('conferenceorboothcontact', 'globalcard')); // Not
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
 // 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
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
 // Security check
 if ($user->socid > 0) {
@@ -88,13 +72,35 @@ if ($user->socid > 0) {
 $isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
 
-$permission = $user->rights->eventorganization->write;
+$permissiontoread = $user->rights->eventorganization->read;
+$permissiontoadd = $user->rights->eventorganization->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->eventorganization->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote = $user->rights->eventorganization->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->eventorganization->write; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->eventorganization->multidir_output[isset($object->entity) ? $object->entity : 1];
+
+// Security check
+if ($user->socid > 0) {
+	accessforbidden();
+}
+$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
+$result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
+
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
  * Actions
  */
 
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
 if ($action == 'addcontact' && $permission) {	// Add a new contact
 	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
 	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
@@ -131,16 +137,16 @@ if ($action == 'addcontact' && $permission) {	// Add a new contact
  * View
  */
 
-$title = $langs->trans('ConferenceOrBooth')." - ".$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);
 
+$title = $langs->trans('ConferenceOrBooth')." - ".$langs->trans('ContactsAddresses');
+$help_url = '';
+//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
+
 
 /* *************************************************************************** */
 /*                                                                             */
@@ -175,13 +181,13 @@ if (!empty($withproject)) {
 	// Title
 	$morehtmlref .= $projectstatic->title;
 	// Thirdparty
-	if ($projectstatic->thirdparty->id > 0) {
+	if (isset($projectstatic->thirdparty->id) && $projectstatic->thirdparty->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
-	if (!$user->rights->projet->all->lire) {
+	if (empty($user->rights->project->all->lire)) {
 		$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 		$projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 	}
@@ -256,27 +262,29 @@ if (!empty($withproject)) {
 
 	// Other attributes
 	$cols = 2;
-	//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+	$objectconf = $object;
+	$object = $projectstatic;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	$object = $objectconf;
 
 	print '</table>';
 
 	print '</div>';
 
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
 
-	print '<table class="border centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
 	// Description
-	print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+	print '<td class="tdtop">'.$langs->trans("Description").'</td><td>';
 	print nl2br($projectstatic->description);
 	print '</td></tr>';
 
 	// Categories
 	if ($conf->categorie->enabled) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-		print $form->showCategories($projectstatic->id, 'project', 1);
+		print $form->showCategories($projectstatic->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
 	}
 
@@ -297,15 +305,15 @@ if (!empty($withproject)) {
 	print "</td></tr>";
 
 	print '<tr><td>';
-	print $form->editfieldkey('PriceOfRegistration', 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
+	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td>';
-	print $form->editfieldval('PriceOfRegistration', 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td>';
-	print $form->editfieldkey('PriceOfBooth', 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
+	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td>';
-	print $form->editfieldval('PriceOfBooth', 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+	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 valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
@@ -314,15 +322,48 @@ if (!empty($withproject)) {
 	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
 
 	// Show message
-	$message = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
-	$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
-	$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').'</a>';
+	$message = '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
+	$message .= '&exportkey='.urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY', '...'));
+	$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').img_picto('', 'download', 'class="paddingleft"').'</a>';
 	print $message;
 	print "</td></tr>";
 
+	// Link to the submit vote/register page
+	print '<tr><td>';
+	//print '<span class="opacitymedium">';
+	print $form->textwithpicto($langs->trans("SuggestOrVoteForConfOrBooth"), $langs->trans("EvntOrgRegistrationHelpMessage"));
+	//print '</span>';
+	print '</td><td>';
+	$linksuggest = $dolibarr_main_url_root.'/public/project/index.php?id='.((int) $projectstatic->id);
+	$encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $projectstatic->id), 'md5');
+	$linksuggest .= '&securekey='.urlencode($encodedsecurekey);
+	//print '<div class="urllink">';
+	//print '<input type="text" value="'.$linksuggest.'" id="linkregister" class="quatrevingtpercent paddingrightonly">';
+	print '<div class="tdoverflowmax200 inline-block valignmiddle"><a target="_blank" href="'.$linksuggest.'" class="quatrevingtpercent">'.$linksuggest.'</a></div>';
+	print '<a target="_blank" rel="noopener noreferrer" href="'.$linksuggest.'">'.img_picto('', 'globe').'</a>';
+	//print '</div>';
+	//print ajax_autoselect("linkregister");
+	print '</td></tr>';
+
+	// Link to the subscribe
+	print '<tr><td>';
+	//print '<span class="opacitymedium">';
+	print $langs->trans("PublicAttendeeSubscriptionGlobalPage");
+	//print '</span>';
+	print '</td><td>';
+	$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.((int) $projectstatic->id).'&type=global';
+	$encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $projectstatic->id), 'md5');
+	$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
+	//print '<div class="urllink">';
+	//print '<input type="text" value="'.$linkregister.'" id="linkregister" class="quatrevingtpercent paddingrightonly">';
+	print '<div class="tdoverflowmax200 inline-block valignmiddle"><a target="_blank" href="'.$link_subscription.'" class="quatrevingtpercent">'.$link_subscription.'</a></div>';
+	print '<a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer" href="'.$link_subscription.'">'.img_picto('', 'globe').'</a>';
+	//print '</div>';
+	//print ajax_autoselect("linkregister");
+	print '</td></tr>';
+
 	print '</table>';
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
@@ -358,7 +399,7 @@ if ($object->id) {
 	 if ($permissiontoadd)
 	 {
 	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index 8b064c12b72..742585ffb16 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -32,13 +32,19 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.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.'/categories/class/categorie.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("eventorganization", "companies", "other", "mails"));
+$langs->loadLangs(array("eventorganization", "projects", "companies", "other", "mails"));
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+
+$id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $withproject = GETPOST('withproject', 'int');
 $project_ref = GETPOST('project_ref', 'alpha');
@@ -46,8 +52,8 @@ $project_ref = GETPOST('project_ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -69,17 +75,25 @@ $extrafields = new ExtraFields($db);
 $projectstatic = new Project($db);
 $diroutputmassaction = $conf->eventorganization->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('conferenceorboothdocument', '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_');
+
 // 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
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
 if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->eventorganization->multidir_output[$object->entity ? $object->entity : $conf->entity]."/conferenceorbooth/".get_exdir(0, 0, 0, 1, $object);
 }
 
-$permissiontoadd = $user->rights->eventorganization->conferenceorbooth->write; // Used by the include of actions_addupdatedelete.inc.php
+$permissiontoread = $user->rights->eventorganization->read;
+$permissiontoadd = $user->rights->eventorganization->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->eventorganization->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote = $user->rights->eventorganization->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->eventorganization->write; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->eventorganization->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 // Security check
 if ($user->socid > 0) {
@@ -88,11 +102,21 @@ if ($user->socid > 0) {
 $isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
 
+if (!$permissiontoread) {
+	accessforbidden();
+}
+
 
 /*
  * Actions
  */
 
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
 include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 
@@ -104,7 +128,6 @@ $form = new Form($db);
 
 $title = $langs->trans("ConferenceOrBooth").' - '.$langs->trans("Files");
 $help_url = '';
-//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
 $result = $projectstatic->fetch($object->fk_project);
@@ -121,6 +144,7 @@ $object->project = clone $projectstatic;
 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, '', '');
 
@@ -132,13 +156,13 @@ if (!empty($withproject)) {
 	// Title
 	$morehtmlref .= $projectstatic->title;
 	// Thirdparty
-	if ($projectstatic->thirdparty->id > 0) {
+	if (isset($projectstatic->thirdparty->id) && $projectstatic->thirdparty->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
-	if (!$user->rights->projet->all->lire) {
+	if (empty($user->rights->project->all->lire)) {
 		$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 		$projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 	}
@@ -213,27 +237,29 @@ if (!empty($withproject)) {
 
 	// Other attributes
 	$cols = 2;
-	//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+	$objectconf = $object;
+	$object = $projectstatic;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	$object = $objectconf;
 
 	print '</table>';
 
 	print '</div>';
 
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
 
-	print '<table class="border centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
 	// Description
-	print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+	print '<td class="tdtop">'.$langs->trans("Description").'</td><td>';
 	print nl2br($projectstatic->description);
 	print '</td></tr>';
 
 	// Categories
 	if ($conf->categorie->enabled) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-		print $form->showCategories($projectstatic->id, 'project', 1);
+		print $form->showCategories($projectstatic->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
 	}
 
@@ -254,15 +280,15 @@ if (!empty($withproject)) {
 	print "</td></tr>";
 
 	print '<tr><td>';
-	print $form->editfieldkey('PriceOfRegistration', 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
+	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td>';
-	print $form->editfieldval('PriceOfRegistration', 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td>';
-	print $form->editfieldkey('PriceOfBooth', 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
+	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td>';
-	print $form->editfieldval('PriceOfBooth', 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
+	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 valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
@@ -271,15 +297,48 @@ if (!empty($withproject)) {
 	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
 
 	// Show message
-	$message = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
-	$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
-	$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').'</a>';
+	$message = '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
+	$message .= '&exportkey='.urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY', '...'));
+	$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').img_picto('', 'download', 'class="paddingleft"').'</a>';
 	print $message;
 	print "</td></tr>";
 
+	// Link to the submit vote/register page
+	print '<tr><td>';
+	//print '<span class="opacitymedium">';
+	print $form->textwithpicto($langs->trans("SuggestOrVoteForConfOrBooth"), $langs->trans("EvntOrgRegistrationHelpMessage"));
+	//print '</span>';
+	print '</td><td>';
+	$linksuggest = $dolibarr_main_url_root.'/public/project/index.php?id='.((int) $projectstatic->id);
+	$encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $projectstatic->id), 'md5');
+	$linksuggest .= '&securekey='.urlencode($encodedsecurekey);
+	//print '<div class="urllink">';
+	//print '<input type="text" value="'.$linksuggest.'" id="linkregister" class="quatrevingtpercent paddingrightonly">';
+	print '<div class="tdoverflowmax200 inline-block valignmiddle"><a target="_blank" href="'.$linksuggest.'" class="quatrevingtpercent">'.$linksuggest.'</a></div>';
+	print '<a target="_blank" rel="noopener noreferrer" href="'.$linksuggest.'">'.img_picto('', 'globe').'</a>';
+	//print '</div>';
+	//print ajax_autoselect("linkregister");
+	print '</td></tr>';
+
+	// Link to the subscribe
+	print '<tr><td>';
+	//print '<span class="opacitymedium">';
+	print $langs->trans("PublicAttendeeSubscriptionGlobalPage");
+	//print '</span>';
+	print '</td><td>';
+	$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.((int) $projectstatic->id).'&type=global';
+	$encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $projectstatic->id), 'md5');
+	$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
+	//print '<div class="urllink">';
+	//print '<input type="text" value="'.$linkregister.'" id="linkregister" class="quatrevingtpercent paddingrightonly">';
+	print '<div class="tdoverflowmax200 inline-block valignmiddle"><a target="_blank" href="'.$link_subscription.'" class="quatrevingtpercent">'.$link_subscription.'</a></div>';
+	print '<a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer" href="'.$link_subscription.'">'.img_picto('', 'globe').'</a>';
+	//print '</div>';
+	//print ajax_autoselect("linkregister");
+	print '</td></tr>';
+
 	print '</table>';
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
@@ -307,7 +366,6 @@ if ($object->id) {
 	}
 
 	// Object card
-	// -------------
 	//-----------------------------------------------
 	$linkback = '<a href="'.dol_buildpath('/eventorganization/conferenceorbooth_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index a002aa2844c..d105ad05c43 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -31,9 +31,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) {
-	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-}
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 global $dolibarr_main_url_root;
 
@@ -231,9 +229,9 @@ if (empty($reshook)) {
 $form = new Form($db);
 $now = dol_now();
 
+$title = $langs->trans('ListOfConferencesOrBooths');
 //$help_url="EN:Module_ConferenceOrBooth|FR:Module_ConferenceOrBooth_FR|ES:Módulo_ConferenceOrBooth";
 $help_url = '';
-$title = $langs->trans('ListOfConferencesOrBooths');
 
 if ($projectid > 0 || $projectref) {
 	$project = new Project($db);
@@ -282,13 +280,13 @@ if ($projectid > 0) {
 	// Title
 	$morehtmlref .= $project->title;
 	// Thirdparty
-	if ($project->thirdparty->id > 0) {
+	if (isset($project->thirdparty->id) && $project->thirdparty->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$project->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
-	if (!$user->rights->project->all->lire) {
+	if (empty($user->rights->project->all->lire)) {
 		$objectsListId = $project->getProjectsAuthorizedForUser($user, 0, 0);
 		$project->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 	}
@@ -302,34 +300,36 @@ if ($projectid > 0) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	print '<tr><td class="tdtop">';
-	print $langs->trans("Usage");
-	print '</td>';
-	print '<td>';
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
-		print '<input type="checkbox" disabled name="usage_opportunity"'.($project->usage_opportunity ? ' checked="checked"' : '').'"> ';
-		$htmltext = $langs->trans("ProjectFollowOpportunity");
-		print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
-		print '<br>';
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+		print '<tr><td class="tdtop">';
+		print $langs->trans("Usage");
+		print '</td>';
+		print '<td>';
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			print '<input type="checkbox" disabled name="usage_opportunity"'.($project->usage_opportunity ? ' checked="checked"' : '').'"> ';
+			$htmltext = $langs->trans("ProjectFollowOpportunity");
+			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+			print '<br>';
+		}
+		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+			print '<input type="checkbox" disabled name="usage_task"'.($project->usage_task ? ' checked="checked"' : '').'"> ';
+			$htmltext = $langs->trans("ProjectFollowTasks");
+			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+			print '<br>';
+		}
+		if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+			print '<input type="checkbox" disabled name="usage_bill_time"'.($project->usage_bill_time ? ' checked="checked"' : '').'"> ';
+			$htmltext = $langs->trans("ProjectBillTimeDescription");
+			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+			print '<br>';
+		}
+		if (!empty($conf->eventorganization->enabled)) {
+			print '<input type="checkbox" disabled name="usage_organize_event"'.($project->usage_organize_event ? ' checked="checked"' : '').'"> ';
+			$htmltext = $langs->trans("EventOrganizationDescriptionLong");
+			print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
+		}
+		print '</td></tr>';
 	}
-	if (empty($conf->global->PROJECT_HIDE_TASKS)) {
-		print '<input type="checkbox" disabled name="usage_task"'.($project->usage_task ? ' checked="checked"' : '').'"> ';
-		$htmltext = $langs->trans("ProjectFollowTasks");
-		print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
-		print '<br>';
-	}
-	if (!empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
-		print '<input type="checkbox" disabled name="usage_bill_time"'.($project->usage_bill_time ? ' checked="checked"' : '').'"> ';
-		$htmltext = $langs->trans("ProjectBillTimeDescription");
-		print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
-		print '<br>';
-	}
-	if (!empty($conf->eventorganization->enabled)) {
-		print '<input type="checkbox" disabled name="usage_organize_event"'.($project->usage_organize_event ? ' checked="checked"' : '').'"> ';
-		$htmltext = $langs->trans("EventOrganizationDescriptionLong");
-		print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
-	}
-	print '</td></tr>';
 
 	// Visibility
 	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
@@ -370,7 +370,6 @@ if ($projectid > 0) {
 
 	print '</div>';
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border tableforfield centpercent">';
@@ -382,7 +381,7 @@ if ($projectid > 0) {
 
 	// Categories
 	if ($conf->categorie->enabled) {
-		print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
+		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 		print $form->showCategories($project->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
 	}
@@ -421,8 +420,8 @@ if ($projectid > 0) {
 	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
 
 	// Show message
-	$message = '<a target="_blank" href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
-	$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
+	$message = '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
+	$message .= '&exportkey='.urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY', '...'));
 	$message .= "&project=".$projectid.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').img_picto('', 'download', 'class="paddingleft"').'</a>';
 	print $message;
 	print "</td></tr>";
@@ -434,12 +433,12 @@ if ($projectid > 0) {
 	//print '</span>';
 	print '</td><td>';
 	$linksuggest = $dolibarr_main_url_root.'/public/project/index.php?id='.((int) $project->id);
-	$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.((int) $project->id), 'md5');
+	$encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $project->id), 'md5');
 	$linksuggest .= '&securekey='.urlencode($encodedsecurekey);
 	//print '<div class="urllink">';
 	//print '<input type="text" value="'.$linksuggest.'" id="linkregister" class="quatrevingtpercent paddingrightonly">';
 	print '<div class="tdoverflowmax200 inline-block valignmiddle"><a target="_blank" href="'.$linksuggest.'" class="quatrevingtpercent">'.$linksuggest.'</a></div>';
-	print '<a target="_blank" href="'.$linksuggest.'">'.img_picto('', 'globe').'</a>';
+	print '<a target="_blank" rel="noopener noreferrer" href="'.$linksuggest.'">'.img_picto('', 'globe').'</a>';
 	//print '</div>';
 	//print ajax_autoselect("linkregister");
 	print '</td></tr>';
@@ -450,20 +449,19 @@ if ($projectid > 0) {
 	print $langs->trans("PublicAttendeeSubscriptionGlobalPage");
 	//print '</span>';
 	print '</td><td>';
-	$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_register.php?id='.((int) $project->id).'&type=global';
-	$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.((int) $project->id), 'md5');
+	$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);
 	//print '<div class="urllink">';
 	//print '<input type="text" value="'.$linkregister.'" id="linkregister" class="quatrevingtpercent paddingrightonly">';
 	print '<div class="tdoverflowmax200 inline-block valignmiddle"><a target="_blank" href="'.$link_subscription.'" class="quatrevingtpercent">'.$link_subscription.'</a></div>';
-	print '<a target="_blank" href="'.$link_subscription.'">'.img_picto('', 'globe').'</a>';
+	print '<a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer" href="'.$link_subscription.'">'.img_picto('', 'globe').'</a>';
 	//print '</div>';
 	//print ajax_autoselect("linkregister");
 	print '</td></tr>';
 
 	print '</table>';
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
@@ -475,7 +473,8 @@ if ($projectid > 0) {
 if (!empty($project->id)) {
 	$head = conferenceorboothProjectPrepareHead($project);
 	$tab = 'conferenceorbooth';
-	print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($project->public ? 'projectpub' : 'project'), 0, '', '');
+
+	print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($project->public ? 'projectpub' : 'project'), 0, '', 'reposition');
 }
 
 // Build and execute select
@@ -486,7 +485,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
@@ -495,7 +494,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 (!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.id = ef.fk_object)";
 }
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."c_actioncomm as cact ON cact.id=t.fk_action AND cact.module LIKE '%@eventorganization'";
@@ -509,7 +508,7 @@ if ($object->ismultientitymanaged == 1) {
 	$sql .= " WHERE 1 = 1";
 }
 if ($projectid > 0) {
-	$sql .= ' AND t.fk_project='.$project->id;
+	$sql .= " AND t.fk_project = ".((int) $project->id);
 }
 foreach ($search as $key => $val) {
 	if (array_key_exists($key, $object->fields)) {
@@ -622,13 +621,13 @@ $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").' - '.$langs->trans("ConferenceOrBooth"),
-	'presend_attendees'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail").' - '.$langs->trans("Attendees"),
+	'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail").' ('.$langs->trans("ToSpeakers").')',
+	//'presend_attendees'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail").' - '.$langs->trans("Attendees"),
 );
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'presend_attendees', 'predelete'))) {
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -651,12 +650,13 @@ $newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle'
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
+
 // Add code for pre mass action (confirmation or email presend form)
-$topicmail = $object->ref;
+$topicmail = $projectstatic->title;
 $modelmail = "conferenceorbooth";
 $objecttmp = new ConferenceOrBooth($db);
 $trackid = 'conferenceorbooth_'.$object->id;
-include DOL_DOCUMENT_ROOT.'/eventorganization/tpl/massactions_mail_pre.tpl.php';
+$withmaindocfilemail = 0;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 
@@ -690,6 +690,7 @@ $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";
 
@@ -699,6 +700,7 @@ 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]);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
@@ -711,11 +713,11 @@ foreach ($object->fields as $key => $val) {
 	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'], $searchkey, $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);
+			print $object->showInputField($val, $key, $searchkey, '', '', '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 '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($searchkey).'">';
 		} 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'));
@@ -773,7 +775,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 (!empty($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
@@ -797,6 +799,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	// Show here line of result
 	print '<tr class="oddeven">';
+	$totalarray['nbfield'] = 0;
 	foreach ($object->fields as $key => $val) {
 		$cssforfield = (empty($val['css']) ? '' : $val['css']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
@@ -829,7 +832,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index 6c27aa71705..c60c0418d43 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -202,7 +202,7 @@ $title = $langs->trans("ConferenceOrBoothAttendee");
 $help_url = '';
 llxHeader('', $title, $help_url);
 
-$result = $projectstatic->fetch(empty($confOrBooth->fk_project)?$fk_project:$confOrBooth->fk_project);
+$result = $projectstatic->fetch(empty($confOrBooth->fk_project) ? $fk_project : $confOrBooth->fk_project);
 if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 	$projectstatic->fetchComments();
 }
@@ -235,7 +235,7 @@ if (!empty($withproject)) {
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
-	if (!$user->rights->projet->all->lire) {
+	if (empty($user->rights->projet->all->lire)) {
 		$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 		$projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 	}
@@ -317,7 +317,6 @@ if (!empty($withproject)) {
 	print '</div>';
 
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border tableforfield centpercent">';
@@ -368,7 +367,7 @@ if (!empty($withproject)) {
 	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
 
 	// Show message
-	$message = '<a target="_blank" href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
+	$message = '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
 	$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
 	$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').img_picto('', 'download', 'class="paddingleft"').'</a>';
 	print $message;
@@ -386,7 +385,7 @@ if (!empty($withproject)) {
 	//print '<div class="urllink">';
 	//print '<input type="text" value="'.$linksuggest.'" id="linkregister" class="quatrevingtpercent paddingrightonly">';
 	print '<div class="tdoverflowmax200 inline-block valignmiddle"><a target="_blank" href="'.$linksuggest.'" class="quatrevingtpercent">'.$linksuggest.'</a></div>';
-	print '<a target="_blank" href="'.$linksuggest.'">'.img_picto('', 'globe').'</a>';
+	print '<a target="_blank" rel="noopener noreferrer" rel="noopener noreferrer" href="'.$linksuggest.'">'.img_picto('', 'globe').'</a>';
 	//print '</div>';
 	//print ajax_autoselect("linkregister");
 	print '</td></tr>';
@@ -397,20 +396,19 @@ if (!empty($withproject)) {
 	print $langs->trans("PublicAttendeeSubscriptionGlobalPage");
 	//print '</span>';
 	print '</td><td>';
-	$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_register.php?id='.$projectstatic->id.'&type=global';
+	$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.$projectstatic->id.'&type=global';
 	$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$projectstatic->id, 'md5');
 	$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
 	//print '<div class="urllink">';
 	//print '<input type="text" value="'.$linkregister.'" id="linkregister" class="quatrevingtpercent paddingrightonly">';
 	print '<div class="tdoverflowmax200 inline-block valignmiddle"><a target="_blank" href="'.$link_subscription.'" class="quatrevingtpercent">'.$link_subscription.'</a></div>';
-	print '<a target="_blank" href="'.$link_subscription.'">'.img_picto('', 'globe').'</a>';
+	print '<a target="_blank" rel="noopener noreferrer" href="'.$link_subscription.'">'.img_picto('', 'globe').'</a>';
 	//print '</div>';
 	//print ajax_autoselect("linkregister");
 	print '</td></tr>';
 
 	print '</table>';
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
@@ -459,11 +457,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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 $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 
@@ -508,9 +502,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	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->buttonsSaveCancel();
 
 	print '</form>';
 }
@@ -527,7 +519,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$moreparam .= '&fk_project='.((int) $fk_project);
 	}
 
-	$head = conferenceorboothattendeePrepareHead($object);
+	$head = conferenceorboothAttendeePrepareHead($object);
 	print dol_get_fiche_head($head, 'card', $langs->trans("ConferenceOrBoothAttendee"), -1, $object->picto);
 
 	$formconfirm = '';
@@ -596,58 +588,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	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') {
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index 4b107021a09..e084c68cfe7 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -181,7 +181,9 @@ 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 != 'presend'
+&& $massaction != 'confirm_presend') {
 	$massaction = '';
 }
 
@@ -216,6 +218,7 @@ if (empty($reshook)) {
 	$objectclass = 'ConferenceOrBoothAttendee';
 	$objectlabel = 'ConferenceOrBoothAttendee';
 	$uploaddir = $conf->eventorganization->dir_output;
+	include DOL_DOCUMENT_ROOT.'/eventorganization/core/actions_massactions_mail.inc.php';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
@@ -263,7 +266,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
@@ -409,7 +412,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		$morehtmlref .= '</div>';
 
 		// Define a complementary filter for search of next/prev ref.
-		if (!$user->rights->projet->all->lire) {
+		if (empty($user->rights->projet->all->lire)) {
 			$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 			$projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 		}
@@ -494,7 +497,6 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		print '</div>';
 
 		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border tableforfield centpercent">';
@@ -545,7 +547,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
 
 		// Show message
-		$message = '<a target="_blank" href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
+		$message = '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
 		$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
 		$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').img_picto('', 'download', 'class="paddingleft"').'</a>';
 		print $message;
@@ -562,8 +564,8 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		$linksuggest .= '&securekey='.urlencode($encodedsecurekey);
 		//print '<div class="urllink">';
 		//print '<input type="text" value="'.$linksuggest.'" id="linkregister" class="quatrevingtpercent paddingrightonly">';
-		print '<div class="tdoverflowmax200 inline-block valignmiddle"><a target="_blank" href="'.$linksuggest.'" class="quatrevingtpercent">'.$linksuggest.'</a></div>';
-		print '<a target="_blank" href="'.$linksuggest.'">'.img_picto('', 'globe').'</a>';
+		print '<div class="tdoverflowmax200 inline-block valignmiddle"><a target="_blank" rel="noopener noreferrer" href="'.$linksuggest.'" class="quatrevingtpercent">'.$linksuggest.'</a></div>';
+		print '<a target="_blank" rel="noopener noreferrer" href="'.$linksuggest.'">'.img_picto('', 'globe').'</a>';
 		//print '</div>';
 		//print ajax_autoselect("linkregister");
 		print '</td></tr>';
@@ -574,20 +576,19 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		print $langs->trans("PublicAttendeeSubscriptionGlobalPage");
 		//print '</span>';
 		print '</td><td>';
-		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_register.php?id='.$projectstatic->id.'&type=global';
+		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.$projectstatic->id.'&type=global';
 		$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$projectstatic->id, 'md5');
 		$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
 		//print '<div class="urllink">';
 		//print '<input type="text" value="'.$linkregister.'" id="linkregister" class="quatrevingtpercent paddingrightonly">';
 		print '<div class="tdoverflowmax200 inline-block valignmiddle"><a target="_blank" href="'.$link_subscription.'" class="quatrevingtpercent">'.$link_subscription.'</a></div>';
-		print '<a target="_blank" href="'.$link_subscription.'">'.img_picto('', 'globe').'</a>';
+		print '<a target="_blank" rel="noopener noreferrer" href="'.$link_subscription.'">'.img_picto('', 'globe').'</a>';
 		//print '</div>';
 		//print ajax_autoselect("linkregister");
 		print '</td></tr>';
 
 		print '</table>';
 
-		print '</div>';
 		print '</div>';
 		print '</div>';
 
@@ -598,7 +599,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		if (empty($confOrBooth->id)) {
 			$head = conferenceorboothProjectPrepareHead($projectstatic);
 			$tab = 'attendees';
-			print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($project->public ? 'projectpub' : 'project'), 0, '', '');
+			print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($project->public ? 'projectpub' : 'project'), 0, '', 'reposition');
 		}
 	}
 
@@ -675,7 +676,7 @@ $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"),
+	'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
@@ -704,13 +705,16 @@ $newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle'
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
+
 // Add code for pre mass action (confirmation or email presend form)
-$topicmail = "SendConferenceOrBoothAttendeeRef";
-$modelmail = "conferenceorboothattendee";
+$topicmail = $projectstatic->title;
+$modelmail = "conferenceorbooth";
 $objecttmp = new ConferenceOrBoothAttendee($db);
-$trackid = 'xxxx'.$object->id;
+$trackid = 'conferenceorbooth_'.$object->id;
+$withmaindocfilemail = 0;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
+
 if ($search_all) {
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
@@ -884,7 +888,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
diff --git a/htdocs/eventorganization/conferenceorboothattendee_note.php b/htdocs/eventorganization/conferenceorboothattendee_note.php
index 46620112311..b8fb87d39fa 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_note.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_note.php
@@ -39,7 +39,6 @@
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
 //if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
 //if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 
@@ -115,8 +114,13 @@ $permissiontoadd = $user->rights->eventorganization->conferenceorboothattendee->
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
-
+$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
@@ -131,7 +135,7 @@ llxHeader('', $langs->trans('ConferenceOrBoothAttendee'), $help_url);
 if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
 
-	$head = conferenceorboothattendeePrepareHead($object);
+	$head = conferenceorboothAttendeePrepareHead($object);
 
 	print dol_get_fiche_head($head, 'note', $langs->trans("ConferenceOrBoothAttendee"), -1, $object->picto);
 
@@ -154,7 +158,7 @@ if ($id > 0 || !empty($ref)) {
 	 if ($permissiontoadd)
 	 {
 	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&&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);
diff --git a/htdocs/eventorganization/core/actions_massactions_mail.inc.php b/htdocs/eventorganization/core/actions_massactions_mail.inc.php
index 483a1e5bc84..afdee363f24 100644
--- a/htdocs/eventorganization/core/actions_massactions_mail.inc.php
+++ b/htdocs/eventorganization/core/actions_massactions_mail.inc.php
@@ -78,7 +78,7 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 	$listofobjectid = array();
 
 	$listofobjectref = array();
-	$oneemailperrecipient = (GETPOST('oneemailperrecipient') == 'on' ? 1 : 0);
+	$oneemailperrecipient = (GETPOST('oneemailperrecipient', 'int') ? 1 : 0);
 
 	if (!$error) {
 		require_once DOL_DOCUMENT_ROOT . '/eventorganization/class/conferenceorboothattendee.class.php';
@@ -90,7 +90,7 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 		foreach ($toselect as $toselectid) {
 			$result = $objecttmp->fetch($toselectid);
 			if ($result > 0) {
-				$attendees = $attendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm' => $objecttmp->id));
+				$attendees = $attendee->fetchAll();
 				if (is_array($attendees) && count($attendees) > 0) {
 					foreach ($attendees as $attmail) {
 						if (!empty($attmail->email)) {
@@ -119,7 +119,7 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 			$receiver = array($receiver);
 		}
 	}
-	if (!trim($_POST['sendto']) && count($receiver) == 0 && count($listofselectedid) == 1) {    // if only one recipient, receiver is mandatory
+	if (!trim($_POST['sendto']) && count($receiver) == 0 && count($listofselectedid) == 0) {    // if only one recipient, receiver is mandatory
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Recipient")), null, 'warnings');
 		$massaction = 'presend_attendees';
@@ -173,7 +173,7 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 				$tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
 				$from = trim($tmp[($reg[1] - 1)]);
 			} elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
-				$sql = 'SELECT rowid, label, email FROM ' . MAIN_DB_PREFIX . 'c_email_senderprofile WHERE rowid = ' . (int) $reg[1];
+				$sql = "SELECT rowid, label, email FROM " . MAIN_DB_PREFIX . "c_email_senderprofile WHERE rowid = " . (int) $reg[1];
 				$resql = $db->query($sql);
 				$obj = $db->fetch_object($resql);
 				if ($obj) {
diff --git a/htdocs/eventorganization/eventorganizationindex.php b/htdocs/eventorganization/eventorganizationindex.php
index d708883c249..77c2ec512f4 100644
--- a/htdocs/eventorganization/eventorganizationindex.php
+++ b/htdocs/eventorganization/eventorganizationindex.php
@@ -144,7 +144,7 @@ if (! empty($conf->eventorganization->enabled) && $user->rights->eventorganizati
 END MODULEBUILDER DRAFT MYOBJECT */
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 $NBMAX = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
@@ -205,7 +205,7 @@ if (! empty($conf->eventorganization->enabled) && $user->rights->eventorganizati
 }
 */
 
-print '</div></div></div>';
+print '</div></div>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php b/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
index 3951cc25df7..6a76a14a38c 100644
--- a/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
+++ b/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
@@ -42,16 +42,19 @@ function conferenceorboothPrepareHead($object, $with_project = 0)
 		$withProjectUrl = "&withproject=1";
 	}
 
-	$head[$h][0] = DOL_URL_ROOT.'/eventorganization/conferenceorbooth_card.ph?id='.$object->id.$withProjectUrl;
+	$head[$h][0] = DOL_URL_ROOT.'/eventorganization/conferenceorbooth_card.php?id='.$object->id.$withProjectUrl;
 	$head[$h][1] = $langs->trans("Card");
 	$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++;
+	*/
 
+	/*
 	$head[$h][0] = DOL_URL_ROOT.'/eventorganization/conferenceorboothattendee_list.php?conforboothid='.$object->id.$withProjectUrl;
 	$head[$h][1] = $langs->trans("Attendees");
 	$head[$h][2] = 'attendees';
@@ -77,6 +80,7 @@ function conferenceorboothPrepareHead($object, $with_project = 0)
 		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbAttendees.'</span>';
 	}
 	$h++;
+	*/
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
@@ -127,6 +131,7 @@ function conferenceorboothProjectPrepareHead($object)
 	$head[$h][2] = 'conferenceorbooth';
 	// Enable caching of conf or booth count attendees
 	$nbAttendees = 0;
+	$nbConferenceOrBooth= 0;
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 	$cachekey = 'count_conferenceorbooth_project_'.$object->id;
 	$dataretrieved = dol_getcache($cachekey);
@@ -187,7 +192,7 @@ function conferenceorboothProjectPrepareHead($object)
  * @param	ConferenceOrBoothAttendee	$object		ConferenceOrBoothAttendee
  * @return 	array					Array of tabs
  */
-function conferenceorboothattendeePrepareHead($object)
+function conferenceorboothAttendeePrepareHead($object)
 {
 	global $db, $langs, $conf;
 
diff --git a/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php b/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
index f2bb6f0c3ae..9f761c24bc6 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 -->\n";
+echo "<!-- BEGIN PHP TEMPLATE eventorganization/tpl/linkedopjectblock.tpl.php -->\n";
 
 global $user;
 
@@ -54,7 +54,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	}
 	print '</td>';
 	echo '<td class="right">'.$objectlink->getLibStatut(3).'</td>';
-	echo '<td class="right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
+	echo '<td class="right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
 	echo '</tr>';
 }
 
diff --git a/htdocs/eventorganization/tpl/massactions_mail_pre.tpl.php b/htdocs/eventorganization/tpl/massactions_mail_pre.tpl.php
deleted file mode 100644
index 17c78babfea..00000000000
--- a/htdocs/eventorganization/tpl/massactions_mail_pre.tpl.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/* Copyright (C)    2013      Cédric Salvador     <csalvador@gpcsolutions.fr>
- * Copyright (C)    2013-2014 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C)	2015	  Marcos García		  <marcosgdf@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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/
- */
-
-// Following var must be set:
-// $arrayofselected = array of id selected
-// $object
-// $objecttmp=new Propal($db);
-// $topicmail="SendSupplierProposalRef";
-// $modelmail="supplier_proposal_send";
-// $trackid='ord'.$object->id;
-
-if ($massaction == 'presend_attendees') {
-	$langs->load("mails");
-	require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
-	$attendee = new ConferenceOrBoothAttendee($db);
-	$listofselectedid = array();
-	$listofselectedref = array();
-
-	if (!GETPOST('cancel', 'alpha')) {
-		foreach ($arrayofselected as $toselectid) {
-			$result = $objecttmp->fetch($toselectid);
-			if ($result > 0) {
-				$attendees = $attendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm'=>$objecttmp->id));
-				if (is_array($attendees) && count($attendees)>0) {
-					foreach ($attendees as $attmail) {
-						if (!empty($attmail->email)) {
-							$listofselectedid[$attmail->email] = $attmail->id;
-							$listofselectedref[$attmail->id][$toselectid] = $objecttmp->ref;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	print '<input type="hidden" name="massaction" value="confirm_presend_attendees">';
-	print '<input type="hidden" name="projectid" value="'.GETPOST('projectid', 'int').'">';
-
-	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	$formmail = new FormMail($db);
-
-	print dol_get_fiche_head(null, '', '');
-
-	// Cree l'objet formulaire mail
-	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	$formmail = new FormMail($db);
-	$formmail->withform = -1;
-	$formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
-
-	if ($formmail->fromtype === 'user') {
-		$formmail->fromid = $user->id;
-	}
-	$formmail->trackid = $trackid;
-	if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) { // If bit 2 is set
-		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$formmail->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
-	}
-	$formmail->withfrom = 1;
-	$liste = $langs->trans("AllRecipientSelected", count($listofselectedid));
-	$formmail->withtoreadonly = 1;
-
-	$formmail->withoptiononeemailperrecipient = ((count($listofselectedref) == 1 && count(reset($listofselectedref)) == 1) || empty($liste)) ? 0 : ((GETPOST('oneemailperrecipient') == 'on') ? 1 : -1);
-
-	$formmail->withto = empty($liste) ? (GETPOST('sendto', 'alpha') ?GETPOST('sendto', 'alpha') : array()) : $liste;
-	$formmail->withtofree = empty($liste) ? 1 : 0;
-	$formmail->withtocc = 1;
-	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-	$formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REF_CLIENT__');
-	$formmail->withfile = 0;
-	// $formmail->withfile = 2; Not yet supported in mass action
-	$formmail->withmaindocfile = 0; // Add a checkbox "Attach also main document"
-	$formmail->withbody = 1;
-	$formmail->withdeliveryreceipt = 1;
-	$formmail->withcancel = 1;
-
-	// Make substitution in email content
-	$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
-
-	$substitutionarray['__EMAIL__'] = $sendto;
-	$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['__PERSONALIZED__'] = ''; // deprecated
-	$substitutionarray['__CONTACTCIVNAME__'] = '';
-
-	$parameters = array(
-		'mode' => 'formemail'
-	);
-	complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
-
-	// Tableau des substitutions
-	$formmail->substit = $substitutionarray;
-
-	// Tableau des parametres complementaires du post
-	$formmail->param['action'] = $action;
-	$formmail->param['models'] = $modelmail;
-	$formmail->param['models_id'] = empty(GETPOST('modelmailselected', 'int'))?$conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES:GETPOST('modelmailselected', 'int');
-	$formmail->param['id'] = join(',', $arrayofselected);
-	// $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedid) > $conf->global->MAILING_LIMIT_SENDBYWEB) {
-		$langs->load("errors");
-		print img_warning().' '.$langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
-		print ' - <a href="javascript: window.history.go(-1)">'.$langs->trans("GoBack").'</a>';
-		$arrayofmassactions = array();
-	} else {
-		print $formmail->get_form();
-	}
-
-	print dol_get_fiche_end();
-}
-// Allow Pre-Mass-Action hook (eg for confirmation dialog)
-$parameters = array(
-	'toselect' => $toselect,
-	'uploaddir' => isset($uploaddir) ? $uploaddir : null
-);
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 743930767dd..f835e293f5f 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -81,6 +81,7 @@ if (empty($origin_id)) {
 }
 $ref = GETPOST('ref', 'alpha');
 $line_id = GETPOST('lineid', 'int') ?GETPOST('lineid', 'int') : '';
+$facid = GETPOST('facid', 'int');
 
 $action		= GETPOST('action', 'alpha');
 $confirm	= GETPOST('confirm', 'alpha');
@@ -122,7 +123,7 @@ if ($user->socid) {
 $result = restrictedArea($user, 'expedition', $object->id, '');
 
 $permissiondellink = $user->rights->expedition->delivery->creer; // Used by the include of actions_dellink.inc.php
-//var_dump($object->lines[0]->detail_batch);
+$permissiontoadd = $user->rights->expedition->creer;
 
 
 /*
@@ -137,15 +138,21 @@ if ($reshook < 0) {
 
 if (empty($reshook)) {
 	if ($cancel) {
-		$action = '';
-		$object->fetch($id); // show shipment also after canceling modification
+		if ($origin && $origin_id > 0) {
+			if ($origin == 'commande') {
+				header("Location: ".DOL_URL_ROOT.'/expedition/shipment.php?id='.((int) $origin_id));
+				exit;
+			}
+		} else {
+			$action = '';
+			$object->fetch($id); // show shipment also after canceling modification
+		}
 	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
 
 	// Actions to build doc
 	$upload_dir = $conf->expedition->dir_output.'/sending';
-	$permissiontoadd = $user->rights->expedition->creer;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	// Reopen
@@ -1015,7 +1022,7 @@ if ($action == 'create') {
 
 			$numAsked = count($object->lines);
 
-			print '<script type="text/javascript" language="javascript">'."\n";
+			print '<script type="text/javascript">'."\n";
 			print 'jQuery(document).ready(function() {'."\n";
 			print 'jQuery("#autofill").click(function() {';
 			$i = 0;
@@ -1049,7 +1056,7 @@ if ($action == 'create') {
 				print '<td class="center">'.$langs->trans("QtyShipped").'</td>';
 				print '<td class="center">'.$langs->trans("QtyToShip");
 				if (empty($conf->productbatch->enabled)) {
-					print '<br><a href="#" id="autofill" class="opacitymedium link cursor cursorpointer">'.img_picto($langs->trans("Autofill"), 'autofill', 'class="paddingrightonly"').$langs->trans("Fill").'</a>';
+					print '<br><a href="#" id="autofill" class="opacitymedium link cursor cursorpointer">'.img_picto($langs->trans("Autofill"), 'autofill', 'class="paddingrightonly"').'</a>';
 					print ' / ';
 				} else {
 					print '<br>';
@@ -1119,16 +1126,19 @@ if ($action == 'create') {
 						$product_static->status_buy = $line->product_tobuy;
 						$product_static->status_batch = $line->product_tobatch;
 
+						$showdescinproductdesc = (getDolGlobalString('PRODUIT_DESC_IN_FORM') == 2 ? 1 : 0);
+
 						$text = $product_static->getNomUrl(1);
 						$text .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
-						$description = ($conf->global->PRODUIT_DESC_IN_FORM ? '' : dol_htmlentitiesbr($line->desc));
+						$description = ($showdescinproductdesc ? '' : dol_htmlentitiesbr($line->desc));
+
 						print $form->textwithtooltip($text, $description, 3, '', '', $i);
 
 						// Show range
 						print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
 
 						// Add description in form
-						if (!empty($conf->global->PRODUIT_DESC_IN_FORM)) {
+						if ($showdescinproductdesc) {
 							print ($line->desc && $line->desc != $line->product_label) ? '<br>'.dol_htmlentitiesbr($line->desc) : '';
 						}
 
@@ -1153,10 +1163,16 @@ if ($action == 'create') {
 						print "</td>\n";
 					}
 
+					// unit of order
+					$unit_order = '';
+					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+						$unit_order = measuringUnitString($line->fk_unit);
+					}
+
 					// Qty
 					print '<td class="center">'.$line->qty;
 					print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
-					print '</td>';
+					print ''.$unit_order.'</td>';
 					$qtyProdCom = $line->qty;
 
 					// Qty already shipped
@@ -1164,7 +1180,7 @@ if ($action == 'create') {
 					$quantityDelivered = $object->expeditions[$line->id];
 					print $quantityDelivered;
 					print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
-					print '</td>';
+					print ''.$unit_order.'</td>';
 
 					// Qty to ship
 					$quantityAsked = $line->qty;
@@ -1570,11 +1586,7 @@ if ($action == 'create') {
 
 			print '<br>';
 
-			print '<div class="center">';
-			print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-			print '&nbsp; ';
-			print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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 $form->buttonsSaveCancel("Create");
 
 			print '</form>';
 
@@ -1702,7 +1714,7 @@ if ($action == 'create') {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if (0) {    // Do not change on shipment
 				if ($action != 'classify') {
-					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+					$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);
@@ -1710,7 +1722,7 @@ if ($action == 'create') {
 					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
 					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
 					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-					$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '<input type="submit" class="button button-edit" 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);
@@ -1722,9 +1734,10 @@ if ($action == 'create') {
 				if (!empty($objectsrc->fk_project)) {
 					$proj = new Project($db);
 					$proj->fetch($objectsrc->fk_project);
-					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-					$morehtmlref .= $proj->ref;
-					$morehtmlref .= '</a>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
@@ -1772,7 +1785,7 @@ if ($action == 'create') {
 		print '</td>';
 
 		if ($action != 'editdate_livraison') {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td colspan="2">';
@@ -1781,7 +1794,7 @@ if ($action == 'create') {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate_livraison">';
 			print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
 			print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
@@ -1892,7 +1905,6 @@ if ($action == 'create') {
 
 		print '</div>';
 		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border centpercent tableforfield">';
@@ -1904,7 +1916,7 @@ if ($action == 'create') {
 		print '</td>';
 
 		if ($action != 'editshipping_method_id') {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetSendingMethod'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetSendingMethod'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td colspan="2">';
@@ -1917,7 +1929,7 @@ if ($action == 'create') {
 			if ($user->admin) {
 				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
 			if ($object->shipping_method_id > 0) {
@@ -1941,7 +1953,7 @@ if ($action == 'create') {
 			print $langs->trans('IncotermLabel');
 			print '<td><td class="right">';
 			if ($user->rights->expedition->creer) {
-				print '<a class="editfielda" href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+				print '<a class="editfielda" href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
 			} else {
 				print '&nbsp;';
 			}
@@ -1963,7 +1975,6 @@ if ($action == 'create') {
 
 		print "</table>";
 
-		print '</div>';
 		print '</div>';
 		print '</div>';
 
@@ -2042,9 +2053,10 @@ if ($action == 'create') {
 		print "</tr>\n";
 		print '</thead>';
 
+		$outputlangs = $langs;
+
 		if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 			$object->fetch_thirdparty();
-			$outputlangs = $langs;
 			$newlang = '';
 			if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 				$newlang = GETPOST('lang_id', 'aZ09');
@@ -2061,7 +2073,7 @@ if ($action == 'create') {
 		// Get list of products already sent for same source object into $alreadysent
 		$alreadysent = array();
 		if ($origin && $origin_id > 0) {
-			$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end";
+			$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.fk_unit, obj.date_start, obj.date_end";
 			$sql .= ", ed.rowid as shipmentline_id, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot";
 			$sql .= ", e.rowid as shipment_id, e.ref as shipment_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_expedition";
 			//if ($conf->delivery_note->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref, l.date_delivery, ld.qty as qty_received";
@@ -2104,7 +2116,7 @@ if ($action == 'create') {
 
 		// Loop on each product to send/sent
 		for ($i = 0; $i < $num_prod; $i++) {
-			$parameters = array('i' => $i, 'line' => $lines[$i], 'line_id' => $line_id, 'num' => $num_prod, 'alreadysent' => $alreadysent, 'editColspan' => $editColspan, 'outputlangs' => $outputlangs);
+			$parameters = array('i' => $i, 'line' => $lines[$i], 'line_id' => $line_id, 'num' => $num_prod, 'alreadysent' => $alreadysent, 'editColspan' => !empty($editColspan) ? $editColspan : 0, 'outputlangs' => $outputlangs);
 			$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
 			if ($reshook < 0) {
 				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -2144,10 +2156,10 @@ if ($action == 'create') {
 					$product_static->weight_units = $lines[$i]->weight_units;
 					$product_static->length = $lines[$i]->length;
 					$product_static->length_units = $lines[$i]->length_units;
-					$product_static->width = $lines[$i]->width;
-					$product_static->width_units = $lines[$i]->width_units;
-					$product_static->height = $lines[$i]->height;
-					$product_static->height_units = $lines[$i]->height_units;
+					$product_static->width = !empty($lines[$i]->width) ? $lines[$i]->width : 0;
+					$product_static->width_units = !empty($lines[$i]->width_units) ? $lines[$i]->width_units : 0;
+					$product_static->height = !empty($lines[$i]->height) ? $lines[$i]->height : 0;
+					$product_static->height_units = !empty($lines[$i]->height_units) ? $lines[$i]->height_units : 0;
 					$product_static->surface = $lines[$i]->surface;
 					$product_static->surface_units = $lines[$i]->surface_units;
 					$product_static->volume = $lines[$i]->volume;
@@ -2157,7 +2169,7 @@ if ($action == 'create') {
 					$text .= ' - '.$label;
 					$description = (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($lines[$i]->description));
 					print $form->textwithtooltip($text, $description, 3, '', '', $i);
-					print_date_range($lines[$i]->date_start, $lines[$i]->date_end);
+					print_date_range(!empty($lines[$i]->date_start) ? $lines[$i]->date_start : '', !empty($lines[$i]->date_end) ? $lines[$i]->date_end : '');
 					if (!empty($conf->global->PRODUIT_DESC_IN_FORM)) {
 						print (!empty($lines[$i]->description) && $lines[$i]->description != $lines[$i]->product) ? '<br>'.dol_htmlentitiesbr($lines[$i]->description) : '';
 					}
@@ -2181,8 +2193,13 @@ if ($action == 'create') {
 					print "</td>\n";
 				}
 
+				$unit_order = '';
+				if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+					$unit_order = measuringUnitString($lines[$i]->fk_unit);
+				}
+
 				// Qty ordered
-				print '<td class="center linecolqty">'.$lines[$i]->qty_asked.'</td>';
+				print '<td class="center linecolqty">'.$lines[$i]->qty_asked.' '.$unit_order.'</td>';
 
 				// Qty in other shipments (with shipment and warehouse used)
 				if ($origin && $origin_id > 0) {
@@ -2246,7 +2263,7 @@ if ($action == 'create') {
 								print '<!-- case edit 2 -->';
 								print '<tr>';
 								// Qty to ship or shipped
-								print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'"></td>';
+								print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
 								// Warehouse source
 								print '<td>'.$formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
 								// Batch number managment
@@ -2257,7 +2274,7 @@ if ($action == 'create') {
 								foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
 									print '<tr>';
 									// Qty to ship or shipped
-									print '<td><input class="qtyl" name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'"></td>';
+									print '<td><input class="qtyl" name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">'.$unit_order.'</td>';
 									// Warehouse source
 									print '<td>'.$formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
 									// Batch number managment
@@ -2272,7 +2289,7 @@ if ($action == 'create') {
 							print '<!-- case edit 5 -->';
 							print '<tr>';
 							// Qty to ship or shipped
-							print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'"></td>';
+							print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
 							// Warehouse source
 							print '<td></td>';
 							// Batch number managment
@@ -2294,7 +2311,7 @@ if ($action == 'create') {
 					print '</table></td>';
 				} else {
 					// Qty to ship or shipped
-					print '<td class="linecolqtytoship center">'.$lines[$i]->qty_shipped.'</td>';
+					print '<td class="linecolqtytoship center">'.$lines[$i]->qty_shipped.' '.$unit_order.'</td>';
 
 					// Warehouse source
 					if (!empty($conf->stock->enabled)) {
@@ -2375,10 +2392,10 @@ if ($action == 'create') {
 				} elseif ($object->statut == Expedition::STATUS_DRAFT) {
 					// edit-delete buttons
 					print '<td class="linecoledit center">';
-					print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$lines[$i]->id.'">'.img_edit().'</a>';
+					print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_edit().'</a>';
 					print '</td>';
 					print '<td class="linecoldelete" width="10">';
-					print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deleteline&amp;token='.newToken().'&amp;lineid='.$lines[$i]->id.'">'.img_delete().'</a>';
+					print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_delete().'</a>';
 					print '</td>';
 
 					// Display lines extrafields
@@ -2408,9 +2425,9 @@ if ($action == 'create') {
 
 					// TODO Show all in same line by setting $display_type = 'line'
 					if ($action == 'editline' && $line->id == $line_id) {
-						print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), $indiceAsked, '', 0, 'card');
+						print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), !empty($indiceAsked) ? $indiceAsked : '', '', 0, 'card');
 					} else {
-						print $lines[$i]->showOptionals($extrafields, 'view', array('colspan'=>$colspan), $indiceAsked, '', 0, 'card');
+						print $lines[$i]->showOptionals($extrafields, 'view', array('colspan'=>$colspan), !empty($indiceAsked) ? $indiceAsked : '', '', 0, 'card');
 					}
 				}
 			}
@@ -2454,9 +2471,9 @@ if ($action == 'create') {
 			// 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.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
+					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.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
 				}
 			}
 
@@ -2494,20 +2511,20 @@ if ($action == 'create') {
 						$label = "ClassifyBilled";
 						$paramaction = 'classifybilled';
 					}
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$paramaction.'">'.$langs->trans($label).'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action='.$paramaction.'&token='.newToken().'">'.$langs->trans($label).'</a>';
 				}
 			}
 
 			// Cancel
 			if ($object->statut == Expedition::STATUS_VALIDATED) {
 				if ($user->rights->expedition->supprimer) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("Cancel").'</a>';
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel&token='.newToken().'">'.$langs->trans("Cancel").'</a>';
 				}
 			}
 
 			// Delete
 			if ($user->rights->expedition->supprimer) {
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>';
 			}
 		}
 
@@ -2538,14 +2555,14 @@ if ($action == 'create') {
 		$somethingshown = $form->showLinkedObjectBlock($object, '');
 
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
 		$somethingshown = $formactions->showactions($object, 'shipping', $socid, 1);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 2a4b6765b4e..402fbdc04d1 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -144,8 +144,9 @@ class Shipments extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -530,14 +531,9 @@ class Shipments extends DolibarrApi
 		if ($result < 0) {
 			throw new RestException(500, 'Error when validating Shipment: '.$this->shipment->error);
 		}
-		$result = $this->shipment->fetch($id);
-		if (!$result) {
-			throw new RestException(404, 'Shipment not found');
-		}
 
-		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
+		// Reload shipment
+		$result = $this->shipment->fetch($id);
 
 		$this->shipment->fetchObjectLinked();
 		return $this->_cleanObjectDatas($this->shipment);
@@ -626,6 +622,47 @@ class Shipments extends DolibarrApi
 	}
 	*/
 
+	/**
+	* Close a shipment (Classify it as "Delivered")
+	*
+	* @param   int     $id             Expedition ID
+	* @param   int     $notrigger      Disabled triggers
+	*
+	* @url POST    {id}/close
+	*
+	* @return  int
+	*/
+	public function close($id, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->expedition->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->shipment->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Shipment not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->commande->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->shipment->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 shipment
+		$result = $this->shipment->fetch($id);
+
+		$this->shipment->fetchObjectLinked();
+
+		return $this->_cleanObjectDatas($this->shipment);
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Clean sensible object datas
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 64f0e00d6f8..837c82be361 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -43,9 +43,7 @@ if (!empty($conf->propal->enabled)) {
 if (!empty($conf->commande->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
-if (!empty($conf->productbatch->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
-}
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionlinebatch.class.php';
 
 
 /**
@@ -227,10 +225,10 @@ class Expedition extends CommonObject
 	}
 
 	/**
-	 *	Return next contract ref
+	 *	Return next expedition ref
 	 *
 	 *	@param	Societe		$soc	Thirdparty object
-	 *	@return string				Free reference for contract
+	 *	@return string				Free reference for expedition
 	 */
 	public function getNextNumRef($soc)
 	{
@@ -303,7 +301,6 @@ class Expedition extends CommonObject
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."expedition (";
-
 		$sql .= "ref";
 		$sql .= ", entity";
 		$sql .= ", ref_customer";
@@ -330,18 +327,18 @@ class Expedition extends CommonObject
 		$sql .= ", fk_incoterms, location_incoterms";
 		$sql .= ") VALUES (";
 		$sql .= "'(PROV)'";
-		$sql .= ", ".$conf->entity;
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ", ".($this->ref_customer ? "'".$this->db->escape($this->ref_customer)."'" : "null");
 		$sql .= ", ".($this->ref_int ? "'".$this->db->escape($this->ref_int)."'" : "null");
 		$sql .= ", ".($this->ref_ext ? "'".$this->db->escape($this->ref_ext)."'" : "null");
 		$sql .= ", '".$this->db->idate($now)."'";
-		$sql .= ", ".$user->id;
+		$sql .= ", ".((int) $user->id);
 		$sql .= ", ".($this->date_expedition > 0 ? "'".$this->db->idate($this->date_expedition)."'" : "null");
 		$sql .= ", ".($this->date_delivery > 0 ? "'".$this->db->idate($this->date_delivery)."'" : "null");
-		$sql .= ", ".$this->socid;
-		$sql .= ", ".$this->fk_project;
+		$sql .= ", ".($this->socid > 0 ? ((int) $this->socid) : "null");
+		$sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : "null");
 		$sql .= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null");
-		$sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : "null");
+		$sql .= ", ".($this->shipping_method_id > 0 ? ((int) $this->shipping_method_id) : "null");
 		$sql .= ", '".$this->db->escape($this->tracking_number)."'";
 		$sql .= ", ".(is_numeric($this->weight) ? $this->weight : 'NULL');
 		$sql .= ", ".(is_numeric($this->sizeS) ? $this->sizeS : 'NULL'); // TODO Should use this->trueDepth
@@ -363,7 +360,7 @@ class Expedition extends CommonObject
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."expedition";
 			$sql .= " SET ref = '(PROV".$this->id.")'";
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			if ($this->db->query($sql)) {
@@ -445,7 +442,7 @@ class Expedition extends CommonObject
 	 * @param	array	$array_options		extrafields array
 	 * @return	int							<0 if KO, line_id if OK
 	 */
-	public function create_line($entrepot_id, $origin_line_id, $qty, $rang = 0, $array_options = 0)
+	public function create_line($entrepot_id, $origin_line_id, $qty, $rang = 0, $array_options = null)
 	{
 		//phpcs:enable
 		global $user;
@@ -710,7 +707,7 @@ class Expedition extends CommonObject
 		$sql .= ", fk_statut = 1";
 		$sql .= ", date_valid = '".$this->db->idate($now)."'";
 		$sql .= ", fk_user_valid = ".$user->id;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::valid update expedition", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1188,7 +1185,6 @@ class Expedition extends CommonObject
 		global $conf, $langs, $user;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
 
 		$error = 0;
 		$this->error = '';
@@ -1230,6 +1226,9 @@ class Expedition extends CommonObject
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$cpt = $this->db->num_rows($resql);
+
+				$shipmentlinebatch = new ExpeditionLineBatch($this->db);
+
 				for ($i = 0; $i < $cpt; $i++) {
 					dol_syslog(get_class($this)."::delete movement index ".$i);
 					$obj = $this->db->fetch_object($resql);
@@ -1240,11 +1239,12 @@ class Expedition extends CommonObject
 					// get lot/serial
 					$lotArray = null;
 					if ($conf->productbatch->enabled) {
-						$lotArray = ExpeditionLineBatch::fetchAll($this->db, $obj->expeditiondet_id);
+						$lotArray = $shipmentlinebatch->fetchAll($obj->expeditiondet_id);
 						if (!is_array($lotArray)) {
 							$error++; $this->errors[] = "Error ".$this->db->lasterror();
 						}
 					}
+
 					if (empty($lotArray)) {
 						// no lot/serial
 						// We increment stock of product (and sub-products)
@@ -1276,7 +1276,8 @@ class Expedition extends CommonObject
 
 		// delete batch expedition line
 		if (!$error && $conf->productbatch->enabled) {
-			if (ExpeditionLineBatch::deletefromexp($this->db, $this->id) < 0) {
+			$shipmentlinebatch = new ExpeditionLineBatch($this->db);
+			if ($shipmentlinebatch->deleteFromShipment($this->id) < 0) {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
@@ -1296,7 +1297,7 @@ class Expedition extends CommonObject
 				// No delete expedition
 				if (!$error) {
 					$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."expedition";
-					$sql .= " WHERE rowid = ".$this->id;
+					$sql .= " WHERE rowid = ".((int) $this->id);
 
 					if ($this->db->query($sql)) {
 						if (!empty($this->origin) && $this->origin_id > 0) {
@@ -1372,7 +1373,6 @@ class Expedition extends CommonObject
 		global $conf, $langs, $user;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
 
 		$error = 0;
 		$this->error = '';
@@ -1403,6 +1403,9 @@ class Expedition extends CommonObject
 
 			$langs->load("agenda");
 
+			// we try deletion of batch line even if module batch not enabled in case of the module were enabled and disabled previously
+			$shipmentlinebatch = new ExpeditionLineBatch($this->db);
+
 			// Loop on each product line to add a stock movement
 			$sql = "SELECT cd.fk_product, cd.subprice, ed.qty, ed.fk_entrepot, ed.rowid as expeditiondet_id";
 			$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
@@ -1422,12 +1425,9 @@ class Expedition extends CommonObject
 					// we do not log origin because it will be deleted
 					$mouvS->origin = null;
 					// get lot/serial
-					$lotArray = null;
-					if ($conf->productbatch->enabled) {
-						$lotArray = ExpeditionLineBatch::fetchAll($this->db, $obj->expeditiondet_id);
-						if (!is_array($lotArray)) {
-							$error++; $this->errors[] = "Error ".$this->db->lasterror();
-						}
+					$lotArray = $shipmentlinebatch->fetchAll($obj->expeditiondet_id);
+					if (!is_array($lotArray)) {
+						$error++; $this->errors[] = "Error ".$this->db->lasterror();
 					}
 					if (empty($lotArray)) {
 						// no lot/serial
@@ -1458,17 +1458,18 @@ class Expedition extends CommonObject
 			}
 		}
 
-		// delete batch expedition line (we try deletion even if module not enabled in case of the module were enabled and disabled previously)
+		// delete batch expedition line
 		if (!$error) {
-			if (ExpeditionLineBatch::deletefromexp($this->db, $this->id) < 0) {
+			$shipmentlinebatch = new ExpeditionLineBatch($this->db);
+			if ($shipmentlinebatch->deleteFromShipment($this->id) < 0) {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
 		if (!$error) {
-					$main = MAIN_DB_PREFIX.'expeditiondet';
-					$ef = $main."_extrafields";
-					$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_expedition = ".((int) $this->id).")";
+			$main = MAIN_DB_PREFIX.'expeditiondet';
+			$ef = $main."_extrafields";
+			$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_expedition = ".((int) $this->id).")";
 
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
 			$sql .= " WHERE fk_expedition = ".((int) $this->id);
@@ -1480,15 +1481,15 @@ class Expedition extends CommonObject
 					$error++;
 				}
 
-								// delete extrafields
-								$res = $this->deleteExtraFields();
+				// delete extrafields
+				$res = $this->deleteExtraFields();
 				if ($res < 0) {
 					$error++;
 				}
 
 				if (!$error) {
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."expedition";
-					$sql .= " WHERE rowid = ".$this->id;
+					$sql .= " WHERE rowid = ".((int) $this->id);
 
 					if ($this->db->query($sql)) {
 						if (!empty($this->origin) && $this->origin_id > 0) {
@@ -1597,6 +1598,7 @@ class Expedition extends CommonObject
 			$this->total_localtax2 = 0;
 
 			$line = new ExpeditionLigne($this->db);
+			$shipmentlinebatch = new ExpeditionLineBatch($this->db);
 
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
@@ -1695,9 +1697,8 @@ class Expedition extends CommonObject
 
 				// Detail of batch
 				if (!empty($conf->productbatch->enabled) && $obj->line_id > 0 && $obj->product_tobatch > 0) {
-					require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
+					$newdetailbatch = $shipmentlinebatch->fetchAll($obj->line_id, $obj->fk_product);
 
-					$newdetailbatch = ExpeditionLineBatch::fetchAll($this->db, $obj->line_id, $obj->fk_product);
 					if (is_array($newdetailbatch)) {
 						if ($originline != $obj->fk_origin_line) {
 							$line->detail_batch = $newdetailbatch;
@@ -1851,8 +1852,8 @@ class Expedition extends CommonObject
 		// phpcs:enable
 		global $langs;
 
-		$labelStatus = $langs->trans($this->statuts[$status]);
-		$labelStatusShort = $langs->trans($this->statutshorts[$status]);
+		$labelStatus = $langs->transnoentitiesnoconv($this->statuts[$status]);
+		$labelStatusShort = $langs->transnoentitiesnoconv($this->statutshorts[$status]);
 
 		$statusType = 'status'.$status;
 		if ($status == self::STATUS_VALIDATED) {
@@ -1972,7 +1973,7 @@ class Expedition extends CommonObject
 		if ($user->rights->expedition->creer) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."expedition";
 			$sql .= " SET date_delivery = ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : 'null');
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::setDeliveryDate", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -2090,7 +2091,7 @@ class Expedition extends CommonObject
 	{
 		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
-		$sql .= ' WHERE rowid='.$id;
+		$sql .= " WHERE rowid = ".((int) $id);
 
 		$resql = $this->db->query($sql);
 	}
@@ -2107,7 +2108,7 @@ class Expedition extends CommonObject
 	{
 		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
-		$sql .= ' WHERE rowid='.$id;
+		$sql .= " WHERE rowid= ".((int) $id);
 
 		$resql = $this->db->query($sql);
 	}
@@ -2136,7 +2137,7 @@ class Expedition extends CommonObject
 
 		if (!empty($tracking) && !empty($value)) {
 			$url = str_replace('{TRACKID}', $value, $tracking);
-			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
+			$this->tracking_url = sprintf('<a target="_blank" rel="noopener noreferrer" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
 		} else {
 			$this->tracking_url = $value;
 		}
@@ -2161,7 +2162,7 @@ class Expedition extends CommonObject
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut='.self::STATUS_CLOSED;
-		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
+		$sql .= " WHERE rowid = ".((int) $this->id).' AND fk_statut > 0';
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -2306,7 +2307,7 @@ class Expedition extends CommonObject
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut=2, billed=1'; // TODO Update only billed
-		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
+		$sql .= " WHERE rowid = ".((int) $this->id).' AND fk_statut > 0';
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -2355,7 +2356,7 @@ class Expedition extends CommonObject
 		$oldbilled = $this->billed;
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut=1';
-		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
+		$sql .= " WHERE rowid = ".((int) $this->id).' AND fk_statut > 0';
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -2743,9 +2744,9 @@ class ExpeditionLigne extends CommonObjectLine
 		$sql .= ") VALUES (";
 		$sql .= $this->fk_expedition;
 		$sql .= ", ".(empty($this->entrepot_id) ? 'NULL' : $this->entrepot_id);
-		$sql .= ", ".$this->fk_origin_line;
-		$sql .= ", ".$this->qty;
-		$sql .= ", ".$ranktouse;
+		$sql .= ", ".((int) $this->fk_origin_line);
+		$sql .= ", ".price2num($this->qty, 'MS');
+		$sql .= ", ".((int) $ranktouse);
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
@@ -2806,7 +2807,7 @@ class ExpeditionLigne extends CommonObjectLine
 		// delete batch expedition line
 		if ($conf->productbatch->enabled) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
-			$sql .= " WHERE fk_expeditiondet = ".$this->id;
+			$sql .= " WHERE fk_expeditiondet = ".((int) $this->id);
 
 			if (!$this->db->query($sql)) {
 				$this->errors[] = $this->db->lasterror()." - sql=$sql";
@@ -2815,7 +2816,7 @@ class ExpeditionLigne extends CommonObjectLine
 		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		if (!$error && $this->db->query($sql)) {
 			// Remove extrafields
@@ -2927,8 +2928,9 @@ class ExpeditionLigne extends CommonObjectLine
 			}
 
 			// fetch remaining lot qty
-			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
-			if (!$error && ($lotArray = ExpeditionLineBatch::fetchAll($this->db, $this->id)) < 0) {
+			$shipmentlinebatch = new ExpeditionLineBatch($this->db);
+
+			if (!$error && ($lotArray = $shipmentlinebatch->fetchAll($this->id)) < 0) {
 				$this->errors[] = $this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
 				$error++;
 			} else {
@@ -2952,7 +2954,7 @@ class ExpeditionLigne extends CommonObjectLine
 				if (!$error && !empty($expedition_batch_id)) {
 					// delete lot expedition line
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
-					$sql .= " WHERE fk_expeditiondet = ".$this->id;
+					$sql .= " WHERE fk_expeditiondet = ".((int) $this->id);
 					$sql .= " AND rowid = ".((int) $expedition_batch_id);
 
 					if (!$this->db->query($sql)) {
diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionlinebatch.class.php
similarity index 85%
rename from htdocs/expedition/class/expeditionbatch.class.php
rename to htdocs/expedition/class/expeditionlinebatch.class.php
index 03066869450..b2562734447 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionlinebatch.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *  \file       expedition/class/expeditionbatch.class.php
+ *  \file       htdocs/expedition/class/expeditionlinebatch.class.php
  *  \ingroup    productbatch
  *  \brief      This file implements CRUD method for managing shipment batch lines
  *				with batch record
@@ -33,7 +33,10 @@ class ExpeditionLineBatch extends CommonObject
 	 */
 	public $element = 'expeditionlignebatch';
 
-	private static $_table_element = 'expeditiondet_batch'; //!< 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 = 'expeditiondet_batch';
 
 	public $sellby;
 	public $eatby;
@@ -44,6 +47,7 @@ class ExpeditionLineBatch extends CommonObject
 	public $fk_origin_stock;
 	public $fk_expeditiondet;
 
+
 	/**
 	 *  Constructor
 	 *
@@ -74,6 +78,7 @@ class ExpeditionLineBatch extends CommonObject
 		$sql .= " WHERE pb.rowid = ".(int) $id_stockdluo;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($this->db->num_rows($resql)) {
@@ -106,7 +111,7 @@ class ExpeditionLineBatch extends CommonObject
 
 		$id_line_expdet = (int) $id_line_expdet;
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX.self::$_table_element." (";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
 		$sql .= "fk_expeditiondet";
 		$sql .= ", sellby";
 		$sql .= ", eatby";
@@ -129,7 +134,8 @@ class ExpeditionLineBatch extends CommonObject
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+
 			$this->fk_expeditiondet = $id_line_expdet;
 			return $this->id;
 		} else {
@@ -145,17 +151,16 @@ class ExpeditionLineBatch extends CommonObject
 	/**
 	 * Delete batch record attach to a shipment
 	 *
-	 * @param	DoliDB	$db				Database object
 	 * @param	int		$id_expedition	rowid of shipment
 	 * @return 	int						-1 if KO, 1 if OK
 	 */
-	public static function deletefromexp($db, $id_expedition)
+	public function deleteFromShipment($id_expedition)
 	{
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX.self::$_table_element;
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " WHERE fk_expeditiondet in (SELECT rowid FROM ".MAIN_DB_PREFIX."expeditiondet WHERE fk_expedition=".((int) $id_expedition).")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		if ($db->query($sql)) {
+		if ($this->db->query($sql)) {
 			return 1;
 		} else {
 			return -1;
@@ -165,12 +170,11 @@ class ExpeditionLineBatch extends CommonObject
 	/**
 	 * Retrieve all batch number detailed information of a shipment line
 	 *
-	 * @param	DoliDB		$db					Database object
 	 * @param	int			$id_line_expdet		id of shipment line
 	 * @param	int			$fk_product			If provided, load also detailed information of lot
 	 * @return	int|array						-1 if KO, array of ExpeditionLineBatch if OK
 	 */
-	public static function fetchAll($db, $id_line_expdet, $fk_product = 0)
+	public function fetchAll($id_line_expdet, $fk_product = 0)
 	{
 		$sql = "SELECT";
 		$sql .= " eb.rowid,";
@@ -184,25 +188,24 @@ class ExpeditionLineBatch extends CommonObject
 			$sql .= ", pl.sellby";
 			$sql .= ", pl.eatby";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX.self::$_table_element." as eb";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as eb";
 		if ($fk_product > 0) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON pl.batch = eb.batch AND pl.fk_product = ".((int) $fk_product);
 		}
 		$sql .= " WHERE fk_expeditiondet=".(int) $id_line_expdet;
 
 		dol_syslog(__METHOD__."", LOG_DEBUG);
-		$resql = $db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql) {
-			$num = $db->num_rows($resql);
+			$num = $this->db->num_rows($resql);
 			$i = 0;
 			$ret = array();
 			while ($i < $num) {
-				$tmp = new self($db);
+				$obj = $this->db->fetch_object($resql);
 
-				$obj = $db->fetch_object($resql);
-
-				$tmp->sellby = $db->jdate($obj->sellby ? $obj->sellby : $obj->oldsellby);
-				$tmp->eatby = $db->jdate($obj->eatby ? $obj->eatby : $obj->oldeatby);
+				$tmp = new self($this->db);
+				$tmp->sellby = $this->db->jdate($obj->sellby ? $obj->sellby : $obj->oldsellby);
+				$tmp->eatby = $this->db->jdate($obj->eatby ? $obj->eatby : $obj->oldeatby);
 				$tmp->batch = $obj->batch;
 				$tmp->id = $obj->rowid;
 				$tmp->fk_origin_stock = $obj->fk_origin_stock;
@@ -213,10 +216,12 @@ class ExpeditionLineBatch extends CommonObject
 				$ret[] = $tmp;
 				$i++;
 			}
-			$db->free($resql);
+
+			$this->db->free($resql);
+
 			return $ret;
 		} else {
-			dol_print_error($db);
+			dol_print_error($this->db);
 			return -1;
 		}
 	}
diff --git a/htdocs/expedition/class/expeditionstats.class.php b/htdocs/expedition/class/expeditionstats.class.php
index 3c1bef04d09..8eb31896f38 100644
--- a/htdocs/expedition/class/expeditionstats.class.php
+++ b/htdocs/expedition/class/expeditionstats.class.php
@@ -73,7 +73,7 @@ class ExpeditionStats extends Stats
 
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
 		$this->where .= " AND c.entity = ".$conf->entity;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($this->socid) {
@@ -97,7 +97,7 @@ class ExpeditionStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
@@ -121,7 +121,7 @@ class ExpeditionStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE ".$this->where;
@@ -142,7 +142,7 @@ class ExpeditionStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, SUM(c.".$this->field.") as total, AVG(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE ".$this->where;
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 164935a1437..944f76266d2 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -154,7 +154,7 @@ if ($id > 0 || !empty($ref)) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if (0) {    // Do not change on shipment
 			if ($action != 'classify') {
-				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				$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);
@@ -162,7 +162,7 @@ if ($id > 0 || !empty($ref)) {
 				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
 				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
 				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-				$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '<input type="submit" class="button button-edit" 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);
@@ -174,9 +174,10 @@ if ($id > 0 || !empty($ref)) {
 			if (!empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($objectsrc->fk_project);
-				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-				$morehtmlref .= $proj->ref;
-				$morehtmlref .= '</a>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
@@ -221,11 +222,9 @@ if ($id > 0 || !empty($ref)) {
 
 	//print '</div>';
 	//print '<div class="fichehalfright">';
-	//print '<div class="ficheaddleft">';
 	//print '<div class="underbanner clearboth"></div>';
 
 
-	//print '</div>';
 	//print '</div>';
 	print '</div>';
 
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 200a4b67aac..68336e8dbf6 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -47,8 +47,8 @@ $ref		= GETPOST('ref');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -76,6 +76,8 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'expedition', $object->id, '');
 
+$permissiontoadd = $user->rights->expedition->creer;	// Used by the include of actions_dellink.inc.php
+
 
 /*
  * Actions
@@ -126,7 +128,7 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if (0) {    // Do not change on shipment
 				if ($action != 'classify') {
-					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+					$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);
@@ -134,7 +136,7 @@ if ($id > 0 || !empty($ref)) {
 					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
 					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
 					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-					$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '<input type="submit" class="button button-edit" 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);
@@ -146,9 +148,10 @@ if ($id > 0 || !empty($ref)) {
 				if (!empty($objectsrc->fk_project)) {
 					$proj = new Project($db);
 					$proj->fetch($objectsrc->fk_project);
-					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-					$morehtmlref .= $proj->ref;
-					$morehtmlref .= '</a>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 173cc1889bc..8a992e0c7ec 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
 $hookmanager = new HookManager($db);
+$socid = GETPOST('socid', 'int');
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $hookmanager->initHooks(array('sendingindex'));
@@ -66,7 +67,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping'";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
 	$sql .= $clause." sc.fk_user = ".((int) $user->id);
 	$clause = " AND ";
@@ -124,7 +125,7 @@ if ($resql) {
 
 
 //print '</td><td valign="top" width="70%">';
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 $max = 5;
 
@@ -138,11 +139,11 @@ $sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
 }
 $sql .= " WHERE e.entity IN (".getEntity('expedition').")";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " AND e.fk_statut = ".Expedition::STATUS_VALIDATED;
@@ -208,7 +209,7 @@ if ($resql) {
 $sql = "SELECT c.rowid, c.ref, c.ref_client as ref_customer, c.fk_statut as status, c.facture as billed, s.nom as name, s.rowid as socid";
 $sql .= " FROM ".MAIN_DB_PREFIX."commande as c,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE c.fk_soc = s.rowid";
@@ -217,7 +218,7 @@ $sql .= " AND c.fk_statut IN (".Commande::STATUS_VALIDATED.", ".Commande::STATUS
 if ($socid > 0) {
 	$sql .= " AND c.fk_soc = ".((int) $socid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " ORDER BY c.rowid ASC";
@@ -283,7 +284,7 @@ if ($resql) {
 }
 
 
-print '</div></div></div>';
+print '</div></div>';
 
 $parameters = array('user' => $user);
 $reshook = $hookmanager->executeHooks('dashboardWarehouseSendings', $parameters, $object); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index d4f91a24466..378d95e00c8 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -58,6 +58,7 @@ $search_ref_exp = GETPOST("search_ref_exp", 'alpha');
 $search_ref_liv = GETPOST('search_ref_liv', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_company = GETPOST("search_company", 'alpha');
+$search_shipping_method_id = GETPOST('search_shipping_method_id');
 $search_tracking = GETPOST("search_tracking", 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
@@ -115,6 +116,7 @@ $fieldstosearchall = array(
 	'e.ref'=>"Ref",
 	's.nom'=>"ThirdParty",
 	'e.note_public'=>'NotePublic',
+	'e.shipping_method_id'=>'SendingMethod',
 	'e.tracking_number'=>"TrackingNumber",
 );
 if (empty($user->socid)) {
@@ -123,17 +125,18 @@ if (empty($user->socid)) {
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-	'e.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'e.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1),
-	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
-	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
-	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
-	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
-	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
-	'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
-	'e.date_delivery'=>array('label'=>$langs->trans("DateDeliveryPlanned"), 'checked'=>1),
-	'e.tracking_number'=>array('label'=>$langs->trans("TrackingNumber"), 'checked'=>1),
-	'e.weight'=>array('label'=>$langs->trans("Weight"), 'checked'=>0),
+	'e.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1, 'position'=>1),
+	'e.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1, 'position'=>2),
+	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>3),
+	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1, 'position'=>4),
+	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1, 'position'=>5),
+	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0, 'position'=>6),
+	'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.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),
 	'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
 	'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
@@ -185,6 +188,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_type = '';
 	$search_country = '';
 	$search_tracking = '';
+	$search_shipping_method_id = '';
 	$search_type_thirdparty = '';
 	$search_billed = '';
 	$search_datedelivery_start = '';
@@ -228,7 +232,7 @@ $sql = 'SELECT';
 if ($sall || $search_product_category > 0 || $search_user > 0) {
 	$sql = 'SELECT DISTINCT';
 }
-$sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as delivery_date, e.fk_statut, e.billed, e.tracking_number,";
+$sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as delivery_date, e.fk_statut, e.billed, e.tracking_number, e.fk_shipping_method,";
 $sql .= " l.date_delivery as date_reception,";
 $sql .= " s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ";
 $sql .= " typent.code as typent_code,";
@@ -241,7 +245,7 @@ if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
 // 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
@@ -249,7 +253,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."expedition as e";
-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 (e.rowid = ef.fk_object)";
 }
 if ($sall || $search_product_category > 0) {
@@ -273,7 +277,7 @@ if ($search_user > 0) {		// Get link to order to get the order id in eesource.fk
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as eesource ON eesource.fk_target = e.rowid AND eesource.targettype = 'shipping' AND eesource.sourcetype = 'commande'";
 }
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
+if ($search_sale > 0 || (empty($user->rights->societe->client->voir) && !$socid)) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 if ($search_user > 0) {
@@ -291,9 +295,9 @@ if ($search_product_category > 0) {
 	$sql .= " AND cp.fk_categorie = ".((int) $search_product_category);
 }
 if ($socid > 0) {
-	$sql .= ' AND s.rowid = '.$socid;
+	$sql .= " AND s.rowid = ".((int) $socid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {	// Internal user with no permission to see all
+if (empty($user->rights->societe->client->voir) && !$socid) {	// Internal user with no permission to see all
 	$sql .= " AND e.fk_soc = sc.fk_soc";
 	$sql .= " AND sc.fk_user = ".((int) $user->id);
 }
@@ -321,6 +325,9 @@ if ($search_state) {
 if ($search_country) {
 	$sql .= " AND s.fk_pays IN (".$db->sanitize($search_country).')';
 }
+if ($search_shipping_method_id > 0) {
+	$sql .= " AND e.fk_shipping_method = ".((int) $search_shipping_method_id);
+}
 if ($search_tracking) {
 	$sql .= natural_search("e.tracking_number", $search_tracking);
 }
@@ -376,7 +383,7 @@ $sql .= $hookmanager->resPrint;
 // Add HAVING from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListHaving', $parameters, $object); // Note that $action and $object may have been modified by hook
-$sql .= !empty($hookmanager->resPrint) ? (' HAVING 1=1 ' . $hookmanager->resPrint) : '';
+$sql .= empty($hookmanager->resPrint) ? "" : " HAVING 1=1 ".$hookmanager->resPrint;
 
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -433,6 +440,9 @@ if ($search_sale > 0) {
 if ($search_company) {
 	$param .= "&search_company=".urlencode($search_company);
 }
+if ($search_shipping_method_id) {
+	$param .= "&amp;search_shipping_method_id=".urlencode($search_shipping_method_id);
+}
 if ($search_tracking) {
 	$param .= "&search_tracking=".urlencode($search_tracking);
 }
@@ -644,6 +654,13 @@ if (!empty($arrayfields['e.date_delivery']['checked'])) {
 	print '</div>';
 	print '</td>';
 }
+if (!empty($arrayfields['e.shipping_method_id']['checked'])) {
+	// Delivery method
+	print '<td class="liste_titre center">';
+	$shipment->fetch_delivery_methods();
+	print $form->selectarray("search_shipping_method_id", $shipment->meths, $search_shipping_method_id, 1, 0, 0, "", 1);
+	print "</td>\n";
+}
 // Tracking number
 if (!empty($arrayfields['e.tracking_number']['checked'])) {
 	print '<td class="liste_titre center">';
@@ -734,6 +751,9 @@ 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.tracking_number']['checked'])) {
 	print_liste_field_titre($arrayfields['e.tracking_number']['label'], $_SERVER["PHP_SELF"], "e.tracking_number", "", $param, '', $sortfield, $sortorder, 'center ');
 }
@@ -767,11 +787,13 @@ print "</tr>\n";
 $typenArray = $formcompany->typent_array(1);
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 
 	$shipment->id = $obj->rowid;
 	$shipment->ref = $obj->ref;
+	$shipment->shipping_method_id=$obj->fk_shipping_method;
 
 	$companystatic->id = $obj->socid;
 	$companystatic->ref = $obj->name;
@@ -879,9 +901,18 @@ 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'])) {
+		// Get code using getLabelFromKey
+		$code=$langs->getLabelFromKey($db, $shipment->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
+		print '<td class="center">';
+		if ($shipment->shipping_method_id > 0) print $langs->trans("SendingMethod".strtoupper($code));
+		print '</td>';
+	}
 	// Tracking number
 	if (!empty($arrayfields['e.tracking_number']['checked'])) {
-		print '<td class="center">'.$obj->tracking_number."</td>\n";
+		$shipment->getUrlTrackingStatus($obj->tracking_number);
+		print '<td class="center">'.$shipment->tracking_url."</td>\n";
+		//print $form->editfieldval("TrackingNumber", 'tracking_number', $obj->tracking_url, $obj, $user->rights->expedition->creer, 'string', $obj->tracking_number);
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index a9076162015..d8d70b3cc49 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -69,6 +69,8 @@ $permissionnote = $user->rights->expedition->creer; // Used by the include of ac
 if ($user->socid) {
 	$socid = $user->socid;
 }
+
+$hookmanager->initHooks(array('expeditionnote'));
 $result = restrictedArea($user, 'expedition', $object->id, '');
 
 
@@ -76,7 +78,13 @@ $result = restrictedArea($user, 'expedition', $object->id, '');
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$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
+}
 
 
 /*
@@ -107,7 +115,7 @@ if ($id > 0 || !empty($ref)) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if (0) {    // Do not change on shipment
 			if ($action != 'classify') {
-				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				$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);
@@ -115,7 +123,7 @@ if ($id > 0 || !empty($ref)) {
 				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
 				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
 				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-				$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '<input type="submit" class="button button-edit" 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);
@@ -127,9 +135,10 @@ if ($id > 0 || !empty($ref)) {
 			if (!empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($objectsrc->fk_project);
-				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-				$morehtmlref .= $proj->ref;
-				$morehtmlref .= '</a>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 42b8630bd3c..bfa48e9aa0f 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2012-2015	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Philippe Grand          <philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -293,7 +293,7 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->commande->creer) {
 				if ($action != 'classify') {
-					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+					$morehtmlref .= '<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);
@@ -310,9 +310,10 @@ if ($id > 0 || !empty($ref)) {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
@@ -357,7 +358,7 @@ if ($id > 0 || !empty($ref)) {
 		print '<tr><td>'.$langs->trans('Date').'</td>';
 		print '<td colspan="2">';
 		print dol_print_date($object->date, 'day');
-		if ($object->hasDelay() && empty($object->delivery_date)) {
+		if ($object->hasDelay() && empty($object->delivery_date)) {	// If there is a delivery date planned, warning should be on this date
 			print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 		}
 		print '</td>';
@@ -370,7 +371,7 @@ if ($id > 0 || !empty($ref)) {
 		print '</td>';
 
 		if ($action != 'editdate_livraison') {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td colspan="2">';
@@ -379,7 +380,7 @@ if ($id > 0 || !empty($ref)) {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdatedelivery">';
 			print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
 			print dol_print_date($object->delivery_date, 'dayhour');
@@ -394,13 +395,30 @@ if ($id > 0 || !empty($ref)) {
 		//print '</td>';
 		print '</tr>';
 
+		// Delivery delay
+		print '<tr><td height="10">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('AvailabilityPeriod');
+		print '</td>';
+		if ($action != 'editavailability') {
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editavailability&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetAvailability'), 1).'</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editavailability') {
+			$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'availability_id', 1);
+		} else {
+			$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'none', 1);
+		}
+		print '</td></tr>';
+
 		// Shipping Method
 		print '<tr><td>';
 		print '<table width="100%" class="nobordernopadding"><tr><td>';
 		print $langs->trans('SendingMethod');
 		print '</td>';
 		if ($action != 'editshippingmethod' && $user->rights->expedition->creer) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td colspan="2">';
@@ -421,7 +439,7 @@ if ($id > 0 || !empty($ref)) {
 			print $langs->trans('Warehouse');
 			print '</td>';
 			if ($action != 'editwarehouse' && $user->rights->commande->creer) {
-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editwarehouse&amp;id='.$object->id.'">'.img_edit($langs->trans('SetWarehouse'), 1).'</a></td>';
+				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editwarehouse&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetWarehouse'), 1).'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td><td colspan="2">';
@@ -434,6 +452,22 @@ if ($id > 0 || !empty($ref)) {
 			print '</tr>';
 		}
 
+		// Source reason (why we have an order)
+		print '<tr><td height="10">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Source');
+		print '</td>';
+		if ($action != 'editdemandreason') {
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdemandreason&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDemandReason'), 1).'</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editdemandreason') {
+			$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'demand_reason_id', 1);
+		} else {
+			$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'none');
+		}
+
 		// Terms of payment
 		/*
 		print '<tr><td height="10">';
@@ -441,7 +475,7 @@ if ($id > 0 || !empty($ref)) {
 		print $langs->trans('PaymentConditionsShort');
 		print '</td>';
 
-		if ($action != 'editconditions' && $object->statut == Expedition::STATUS_VALIDATED) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
+		if ($action != 'editconditions' && $object->statut == Expedition::STATUS_VALIDATED) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="2">';
 		if ($action == 'editconditions')
@@ -459,7 +493,7 @@ if ($id > 0 || !empty($ref)) {
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('PaymentMode');
 		print '</td>';
-		if ($action != 'editmode' && $object->statut == Expedition::STATUS_VALIDATED) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
+		if ($action != 'editmode' && $object->statut == Expedition::STATUS_VALIDATED) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="2">';
 		if ($action == 'editmode')
@@ -472,39 +506,6 @@ if ($id > 0 || !empty($ref)) {
 		}
 		print '</td></tr>';*/
 
-		// Availability
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('AvailabilityPeriod');
-		print '</td>';
-		if ($action != 'editavailability') {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editavailability&amp;id='.$object->id.'">'.img_edit($langs->trans('SetAvailability'), 1).'</a></td>';
-		}
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'editavailability') {
-			$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'availability_id', 1);
-		} else {
-			$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'none', 1);
-		}
-		print '</td></tr>';
-
-		// Source
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('Source');
-		print '</td>';
-		if ($action != 'editdemandreason') {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdemandreason&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDemandReason'), 1).'</a></td>';
-		}
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'editdemandreason') {
-			$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'demand_reason_id', 1);
-		} else {
-			$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'none');
-		}
-
 		$tmparray = $object->getTotalWeightVolume();
 		$totalWeight = $tmparray['weight'];
 		$totalVolume = $tmparray['volume'];
@@ -528,7 +529,7 @@ if ($id > 0 || !empty($ref)) {
 			print $langs->trans('IncotermLabel');
 			print '<td><td class="right">';
 			if ($user->rights->commande->creer) {
-				print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'/expedition/shipment.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+				print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'/expedition/shipment.php?id='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
 			} else {
 				print '&nbsp;';
 			}
@@ -554,7 +555,6 @@ if ($id > 0 || !empty($ref)) {
 
 		print '</div>';
 		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border centpercent tableforfield">';
@@ -601,14 +601,12 @@ if ($id > 0 || !empty($ref)) {
 
 		print '</table>';
 
-		print '</div>';
 		print '</div>';
 		print '</div>';
 
 		print '<div class="clearboth"></div><br>';
 
 
-
 		/**
 		 *  Lines or orders with quantity shipped and remain to ship
 		 *  Note: Qty shipped are already available into $object->expeditions[fk_product]
@@ -617,15 +615,18 @@ if ($id > 0 || !empty($ref)) {
 
 		$sql = "SELECT cd.rowid, cd.fk_product, cd.product_type as type, cd.label, cd.description,";
 		$sql .= " cd.price, cd.tva_tx, cd.subprice,";
-		$sql .= " cd.qty,";
+		$sql .= " cd.qty, cd.fk_unit,";
 		$sql .= ' cd.date_start,';
 		$sql .= ' cd.date_end,';
 		$sql .= ' cd.special_code,';
 		$sql .= ' p.rowid as prodid, p.label as product_label, p.entity, p.ref, p.fk_product_type as product_type, p.description as product_desc,';
 		$sql .= ' p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units,';
 		$sql .= ' p.surface, p.surface_units, p.volume, p.volume_units';
+		$sql .= ', p.tobatch, p.tosell, p.tobuy, p.barcode';
+		$sql .= ', u.short_label as unit_order';
 		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units as u ON cd.fk_unit = u.rowid";
 		$sql .= " WHERE cd.fk_commande = ".((int) $object->id);
 		$sql .= " ORDER BY cd.rang, cd.rowid";
 
@@ -711,6 +712,10 @@ if ($id > 0 || !empty($ref)) {
 						$product_static->id = $objp->fk_product;
 						$product_static->ref = $objp->ref;
 						$product_static->entity = $objp->entity;
+						$product_static->status = $objp->tosell;
+						$product_static->status_buy = $objp->tobuy;
+						$product_static->status_batch = $objp->tobatch;
+						$product_static->barcode = $objp->barcode;
 
 						$product_static->weight = $objp->weight;
 						$product_static->weight_units = $objp->weight_units;
@@ -761,7 +766,7 @@ if ($id > 0 || !empty($ref)) {
 					}
 
 					// Qty ordered
-					print '<td class="center">'.$objp->qty.'</td>';
+					print '<td class="center">'.$objp->qty.($objp->unit_order ? ' '.$objp->unit_order : '').'</td>';
 
 					// Qty already shipped
 					$qtyProdCom = $objp->qty;
@@ -769,7 +774,7 @@ if ($id > 0 || !empty($ref)) {
 					// Nb of sending products for this line of order
 					$qtyAlreadyShipped = (!empty($object->expeditions[$objp->rowid]) ? $object->expeditions[$objp->rowid] : 0);
 					print $qtyAlreadyShipped;
-					print '</td>';
+					print ($objp->unit_order ? ' '.$objp->unit_order : '').'</td>';
 
 					// Qty remains to ship
 					print '<td class="center">';
@@ -780,7 +785,7 @@ if ($id > 0 || !empty($ref)) {
 					} else {
 						print '0 ('.$langs->trans("Service").')';
 					}
-					print '</td>';
+					print ($objp->unit_order ? ' '.$objp->unit_order : '').'</td>';
 
 					if ($objp->fk_product > 0) {
 						$product = new Product($db);
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index 42cac2d3c92..b97af33cb6e 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -75,7 +75,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
 	$filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
@@ -110,7 +110,7 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear,$startyear);
 //var_dump($data);
 // $data = array(array('Lib',val1,val2,val3),...)
 
-if (!$user->rights->societe->client->voir || $user->socid)
+if (empty($user->rights->societe->client->voir) || $user->socid)
 {
 	$filenameamount = $dir.'/shipmentsamountinyear-'.$user->id.'-'.$year.'.png';
 }
@@ -148,7 +148,7 @@ if (! $mesg)
 /*
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
-if (!$user->rights->societe->client->voir || $user->socid)
+if (empty($user->rights->societe->client->voir) || $user->socid)
 {
 	$filename_avg = $dir.'/shipmentsaverage-'.$user->id.'-'.$year.'.png';
 }
@@ -238,7 +238,7 @@ if (!in_array($nowyear, $arrayyears)) {
 	$arrayyears[$nowyear] = $nowyear;
 }
 arsort($arrayyears);
-print $form->selectarray('year', $arrayyears, $year, 0);
+print $form->selectarray('year', $arrayyears, $year, 0, 0, 0, '', 0, 0, 0, '', 'width75');
 print '</td></tr>';
 print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
@@ -291,7 +291,7 @@ print '</table>';
 print '</div>';
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 // Show graphs
@@ -308,7 +308,7 @@ if ($mesg) {
 print '</td></tr></table>';
 
 
-print '</div></div></div>';
+print '</div></div>';
 print '<div style="clear:both"></div>';
 
 print dol_get_fiche_end();
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index b00d63eaba1..26e4ebbb47d 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 -->\n";
+print "<!-- BEGIN PHP TEMPLATE expedition/tpl/linkedopjectblock.tpl.php -->\n";
 
 
 global $user;
diff --git a/htdocs/expensereport/ajax/ajaxik.php b/htdocs/expensereport/ajax/ajaxik.php
index c2cc8345671..6cd8c05fe5b 100644
--- a/htdocs/expensereport/ajax/ajaxik.php
+++ b/htdocs/expensereport/ajax/ajaxik.php
@@ -76,7 +76,8 @@ if (empty($fk_expense) || $fk_expense < 0) {
 		if ($userauthor->fetch($expense->fk_user_author) <= 0) {
 			echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_user_author' => $expense->fk_user_author));
 		} else {
-			$range = ExpenseReportIk::getRangeByUser($userauthor, $fk_c_exp_tax_cat);
+			$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));
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 240fdcfb73c..307294d5422 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -68,6 +68,17 @@ $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('socid_id',
 
 $childids = $user->getAllChildIds(1);
 
+if (! empty($conf->global->EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH)) {
+	if (empty($date_start)) {
+		$date_start = dol_mktime(0, 0, 0, (int) dol_print_date(dol_now(), '%m'),  1, (int) dol_print_date(dol_now(), '%Y'));
+	}
+
+	if (empty($date_end)) {
+		// date('t') => number of days in the month, so last day of the month too
+		$date_end = dol_mktime(0, 0, 0, (int) dol_print_date(dol_now(), '%m'), (int) date('t'), (int) dol_print_date(dol_now(), '%Y'));
+	}
+}
+
 // Hack to use expensereport dir
 $rootfordata = DOL_DATA_ROOT;
 $rootforuser = DOL_DATA_ROOT;
@@ -106,6 +117,9 @@ $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);
+$fileRequired = !empty($conf->global->EXPENSEREPORT_FILE_IS_REQUIRED);
+
 if ($object->id > 0) {
 	// Check current user can read this expense report
 	$canread = 0;
@@ -134,6 +148,8 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'expensereport', $object->id, 'expensereport');
 
+$permissiontoadd = $user->rights->expensereport->creer;	// Used by the include of actions_dellink.inc.php
+
 
 /*
  * Actions
@@ -146,8 +162,23 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/expensereport/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.'/expensereport/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
 	if ($cancel) {
-		if (!empty($backtopage)) {
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -259,10 +290,14 @@ if (empty($reshook)) {
 			}
 		}
 
-		if (!$error && empty($conf->global->EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS) && $object->periode_existe($fuser, $object->date_debut, $object->date_fin)) {
-			$error++;
-			setEventMessages($langs->trans("ErrorDoubleDeclaration"), null, 'errors');
-			$action = 'create';
+		if (!$error && empty($conf->global->EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS)) {
+			$overlappingExpenseReportID = $object->periode_existe($fuser, $object->date_debut, $object->date_fin, true);
+
+			if ($overlappingExpenseReportID > 0) {
+				$error++;
+				setEventMessages($langs->trans("ErrorDoubleDeclaration").' <a href="'.$_SERVER['PHP_SELF'].'?id='.$overlappingExpenseReportID.'">'. $langs->trans('ShowTrip').'</a>', null, 'errors');
+				$action = 'create';
+			}
 		}
 
 		if (!$error) {
@@ -1071,6 +1106,7 @@ if (empty($reshook)) {
 			$arrayoffiles = GETPOST('attachfile', 'array');
 			if (is_array($arrayoffiles) && !empty($arrayoffiles[0])) {
 				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+				$entityprefix = ($conf->entity != '1') ? $conf->entity.'/' : '';
 				$relativepath = 'expensereport/'.$object->ref.'/'.$arrayoffiles[0];
 				$ecmfiles = new EcmFiles($db);
 				$ecmfiles->fetch(0, '', $relativepath);
@@ -1125,6 +1161,18 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PriceUTTC")), null, 'errors');
 		}
 
+		// If no project entered
+		if ($projectRequired && $fk_project <= 0) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Project")), null, 'errors');
+		}
+
+		// If no file associated
+		if ($fileRequired && $fk_ecm_files == 0) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
+		}
+
 		if (!$error) {
 			$type = 0; // TODO What if service ? We should take the type product/service from the type of expense report llx_c_type_fees
 
@@ -1258,6 +1306,12 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans("WarningDateOfLineMustBeInExpenseReportRange"), null, 'warnings');
 		}
 
+		// If no project entered
+		if ($projectRequired && $projet_id <= 0) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Project")), null, 'errors');
+		}
+
 		if (!$error) {
 			// TODO Use update method of ExpenseReportLine
 			$result = $object->updateline($rowid, $type_fees_id, $projet_id, $vatrate, $comments, $qty, $value_unit, $date, $id, $fk_c_exp_tax_cat, $fk_ecm_files);
@@ -1303,7 +1357,6 @@ if (empty($reshook)) {
 
 	// Actions to build doc
 	$upload_dir = $conf->expensereport->dir_output;
-	$permissiontoadd = $user->rights->expensereport->creer;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
@@ -1437,10 +1490,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" value="'.$langs->trans("AddTrip").'" name="bouton" class="button" />';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$langs->trans("Cancel").'" class="button button-cancel" onclick="history.go(-1)" />';
-	print '</div>';
+	print $form->buttonsSaveCancel("AddTrip");
 
 	print '</form>';
 } elseif ($id > 0 || $ref) {
@@ -1557,13 +1607,12 @@ if ($action == 'create') {
 
 			print dol_get_fiche_end();
 
-			print '<div class="center">';
-			print '<input type="submit" value="'.$langs->trans("Modify").'" name="bouton" class="button">';
-			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$langs->trans("Cancel").'" class="button button-cancel" onclick="history.go(-1)" />';
-			print '</div>';
+			print $form->buttonsSaveCancel("Modify");
 
 			print '</form>';
 		} else {
+			$taxlessUnitPriceDisabled = ! empty($conf->global->EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY) ? ' disabled' : '';
+
 			print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
 
 			// Clone confirmation
@@ -1640,7 +1689,7 @@ if ($action == 'create') {
 			 if ($user->rights->commande->creer)
 			 {
 			 if ($action != 'classify')
-			 $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			 $morehtmlref.='<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.'">';
@@ -1664,20 +1713,20 @@ if ($action == 'create') {
 			 }
 			 }
 			 }*/
-			 $morehtmlref .= '</div>';
+			$morehtmlref .= '</div>';
 
-			 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-			 print '<div class="fichecenter">';
-			 print '<div class="fichehalfleft">';
-			 print '<div class="underbanner clearboth"></div>';
+			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-			 print '<table class="border tableforfield centpercent">';
+			print '<table class="border tableforfield centpercent">';
 
-			 // Author
-			 print '<tr>';
-			 print '<td class="titlefield">'.$langs->trans("User").'</td>';
-			 print '<td>';
+			// Author
+			print '<tr>';
+			print '<td class="titlefield">'.$langs->trans("User").'</td>';
+			print '<td>';
 			if ($object->fk_user_author > 0) {
 				$userauthor = new User($db);
 				$result = $userauthor->fetch($object->fk_user_author);
@@ -1687,15 +1736,15 @@ if ($action == 'create') {
 					print $userauthor->getNomUrl(-1);
 				}
 			}
-			 print '</td></tr>';
+			print '</td></tr>';
 
-			 // Period
-			 print '<tr>';
-			 print '<td class="titlefield">'.$langs->trans("Period").'</td>';
-			 print '<td>';
-			 print get_date_range($object->date_debut, $object->date_fin, 'day', $langs, 0);
-			 print '</td>';
-			 print '</tr>';
+			// Period
+			print '<tr>';
+			print '<td class="titlefield">'.$langs->trans("Period").'</td>';
+			print '<td>';
+			print get_date_range($object->date_debut, $object->date_fin, 'day', $langs, 0);
+			print '</td>';
+			print '</tr>';
 			if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
 				print '<tr>';
 				print '<td>'.$langs->trans("ModePaiement").'</td>';
@@ -1703,20 +1752,20 @@ if ($action == 'create') {
 				print '</tr>';
 			}
 
-			 // Validation date
-			 print '<tr>';
-			 print '<td>'.$langs->trans("DATE_SAVE").'</td>';
-			 print '<td>'.dol_print_date($object->date_valid, 'dayhour', 'tzuser');
+			// Validation date
+			print '<tr>';
+			print '<td>'.$langs->trans("DATE_SAVE").'</td>';
+			print '<td>'.dol_print_date($object->date_valid, 'dayhour', 'tzuser');
 			if ($object->status == 2 && $object->hasDelay('toapprove')) {
 				print ' '.img_warning($langs->trans("Late").' - '.$langs->trans("ToApprove"));
 			}
 			if ($object->status == 5 && $object->hasDelay('topay')) {
 				print ' '.img_warning($langs->trans("Late").' - '.$langs->trans("ToPay"));
 			}
-			 print '</td></tr>';
-			 print '</tr>';
+			print '</td></tr>';
+			print '</tr>';
 
-			 // User to inform for approval
+			// User to inform for approval
 			if ($object->status <= ExpenseReport::STATUS_VALIDATED) {	// informed
 				print '<tr>';
 				print '<td>'.$langs->trans("VALIDATOR").'</td>'; // approver
@@ -1810,24 +1859,23 @@ if ($action == 'create') {
 				  */
 			}
 
-			 // Other attributes
-			 $cols = 2;
-			 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+			// Other attributes
+			$cols = 2;
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-			 print '</table>';
+			print '</table>';
 
-			 print '</div>';
-			 print '<div class="fichehalfright">';
-			 print '<div class="ficheaddleft">';
-			 print '<div class="underbanner clearboth"></div>';
+			print '</div>';
+			print '<div class="fichehalfright">';
+			print '<div class="underbanner clearboth"></div>';
 
-			 print '<table class="border tableforfield centpercent">';
+			print '<table class="border tableforfield centpercent">';
 
-			 // Amount
-			 print '<tr>';
-			 print '<td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
-			 print '<td class="nowrap amountcard">'.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
-			 $rowspan = 5;
+			// Amount
+			print '<tr>';
+			print '<td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
+			print '<td class="nowrap amountcard">'.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
+			$rowspan = 5;
 			if ($object->status <= ExpenseReport::STATUS_VALIDATED) {
 				$rowspan++;
 			} elseif ($object->status == ExpenseReport::STATUS_CANCELED) {
@@ -1841,15 +1889,15 @@ if ($action == 'create') {
 			if ($object->status == ExpenseReport::STATUS_CLOSED) {
 				$rowspan += 2;
 			}
-			 print "</td>";
-			 print '</tr>';
+			print "</td>";
+			print '</tr>';
 
-			 print '<tr>';
-			 print '<td>'.$langs->trans("AmountVAT").'</td>';
-			 print '<td class="nowrap amountcard">'.price($object->total_tva, 1, '', 1, -1, -1, $conf->currency).'</td>';
-			 print '</tr>';
+			print '<tr>';
+			print '<td>'.$langs->trans("AmountVAT").'</td>';
+			print '<td class="nowrap amountcard">'.price($object->total_tva, 1, '', 1, -1, -1, $conf->currency).'</td>';
+			print '</tr>';
 
-			 // Amount Local Taxes
+			// 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>';
@@ -1859,45 +1907,45 @@ if ($action == 'create') {
 				print '<td class="valuefield">'.price($object->total_localtax2, 1, '', 1, -1, -1, $conf->currency).'</td></tr>';
 			}
 
-			 print '<tr>';
-			 print '<td>'.$langs->trans("AmountTTC").'</td>';
-			 print '<td class="nowrap amountcard">'.price($object->total_ttc, 1, '', 1, -1, -1, $conf->currency).'</td>';
-			 print '</tr>';
+			print '<tr>';
+			print '<td>'.$langs->trans("AmountTTC").'</td>';
+			print '<td class="nowrap amountcard">'.price($object->total_ttc, 1, '', 1, -1, -1, $conf->currency).'</td>';
+			print '</tr>';
 
-			 // List of payments already done
-			 $nbcols = 3;
+			// List of payments already done
+			$nbcols = 3;
 			if (!empty($conf->banque->enabled)) {
 				$nbrows++;
 				$nbcols++;
 			}
 
-			 print '<table class="noborder paymenttable" width="100%">';
+			print '<table class="noborder paymenttable centpercent">';
 
-			 print '<tr class="liste_titre">';
-			 print '<td class="liste_titre">'.$langs->trans('Payments').'</td>';
-			 print '<td class="liste_titre">'.$langs->trans('Date').'</td>';
-			 print '<td class="liste_titre">'.$langs->trans('Type').'</td>';
+			print '<tr class="liste_titre">';
+			print '<td class="liste_titre">'.$langs->trans('Payments').'</td>';
+			print '<td class="liste_titre">'.$langs->trans('Date').'</td>';
+			print '<td class="liste_titre">'.$langs->trans('Type').'</td>';
 			if (!empty($conf->banque->enabled)) {
 				print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
 			}
-			 print '<td class="liste_titre right">'.$langs->trans('Amount').'</td>';
-			 print '<td class="liste_titre" width="18">&nbsp;</td>';
-			 print '</tr>';
+			print '<td class="liste_titre right">'.$langs->trans('Amount').'</td>';
+			print '<td class="liste_titre" width="18">&nbsp;</td>';
+			print '</tr>';
 
-			 // 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 .= "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";
-			 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
-			 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
-			 $sql .= " WHERE e.rowid = '".$id."'";
-			 $sql .= " AND p.fk_expensereport = e.rowid";
-			 $sql .= ' AND e.entity IN ('.getEntity('expensereport').')';
-			 $sql .= " ORDER BY dp";
+			// 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 .= "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";
+			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
+			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
+			$sql .= " WHERE e.rowid = ".((int) $id);
+			$sql .= " AND p.fk_expensereport = e.rowid";
+			$sql .= ' AND e.entity IN ('.getEntity('expensereport').')';
+			$sql .= " ORDER BY dp";
 
-			 $resql = $db->query($sql);
+			$resql = $db->query($sql);
 			if ($resql) {
 				$num = $db->num_rows($resql);
 				$i = 0; $totalpaid = 0;
@@ -1968,29 +2016,28 @@ if ($action == 'create') {
 			} else {
 				dol_print_error($db);
 			}
-			 print "</table>";
+			print "</table>";
 
-			 print '</div>';
-			 print '</div>';
-			 print '</div>';
+			print '</div>';
+			print '</div>';
 
-			 print '<div class="clearboth"></div><br>';
+			print '<div class="clearboth"></div><br>';
 
-			 print '<div style="clear: both;"></div>';
+			print '<div style="clear: both;"></div>';
 
-			 $actiontouse = 'updateline';
+			$actiontouse = 'updateline';
 			if (($object->status == 0 || $object->status == 99) && $action != 'editline') {
 				$actiontouse = 'addline';
 			}
 
-			 print '<form name="expensereport" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" method="post" >';
-			 print '<input type="hidden" name="token" value="'.newToken().'">';
-			 print '<input type="hidden" name="action" value="'.$actiontouse.'">';
-			 print '<input type="hidden" name="id" value="'.$object->id.'">';
-			 print '<input type="hidden" name="fk_expensereport" value="'.$object->id.'" />';
+			print '<form name="expensereport" 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="'.$actiontouse.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="fk_expensereport" value="'.$object->id.'" />';
 
-			 print '<div class="div-table-responsive-no-min">';
-			 print '<table id="tablelines" class="noborder centpercent">';
+			print '<div class="div-table-responsive-no-min">';
+			print '<table id="tablelines" class="noborder centpercent">';
 
 			if (!empty($object->lines)) {
 				$i = 0; $total = 0;
@@ -2018,6 +2065,11 @@ if ($action == 'create') {
 				// Picture
 				print '<td>';
 				print '</td>';
+
+				// Information if theres a rule restriction
+				print '<td>';
+				print '</td>';
+
 				// Ajout des boutons de modification/suppression
 				if (($object->status < 2 || $object->status == 99) && $user->rights->expensereport->creer) {
 					print '<td class="right"></td>';
@@ -2050,8 +2102,23 @@ if ($action == 'create') {
 							print '</td>';
 						}
 
+						$titlealt = '';
+						if (!empty($conf->accounting->enabled)) {
+							require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+							$accountingaccount = new AccountingAccount($db);
+							$resaccountingaccount = $accountingaccount->fetch(0, $line->type_fees_accountancy_code, 1);
+							//$titlealt .= '<span class="opacitymedium">';
+							$titlealt .= $langs->trans("AccountancyCode").': ';
+							if ($resaccountingaccount > 0) {
+								$titlealt .= $accountingaccount->account_number;
+							} else {
+								$titlealt .= $langs->trans("NotFound");
+							}
+							//$titlealt .= '</span>';
+						}
+
 						// Type of fee
-						print '<td class="center">';
+						print '<td class="center" 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>';
@@ -2065,8 +2132,10 @@ if ($action == 'create') {
 
 						// Comment
 						print '<td class="left">'.dol_nl2br($line->comments).'</td>';
+
 						// VAT rate
 						print '<td class="right">'.vatrate($line->vatrate.($line->vat_src_code ? ' ('.$line->vat_src_code.')' : ''), true).'</td>';
+
 						// Unit price HT
 						print '<td class="right">';
 						if (!empty($line->value_unit_ht)) {
@@ -2074,7 +2143,7 @@ if ($action == 'create') {
 						} else {
 							$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $line->vatrate));
 							$pricenettoshow = price2num($line->value_unit / (1 + $tmpvat / 100), 'MU');
-							print $pricenettoshow;
+							print price($pricenettoshow);
 						}
 						print '</td>';
 
@@ -2106,7 +2175,7 @@ if ($action == 'create') {
 									$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.'/'.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
 									if (empty($urlforhref)) {
 										$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
-										print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
+										print '<a href="'.$urlforhref.'" class="aphoto" target="_blank" rel="noopener noreferrer">';
 									} else {
 										print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
 									}
@@ -2142,7 +2211,10 @@ if ($action == 'create') {
 											// If the preview file is found
 											if (file_exists($fileimage)) {
 												$thumbshown = 1;
+												$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.'/'.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+												print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
 												print '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
+												print '</a>';
 											}
 										}
 									}
@@ -2155,14 +2227,18 @@ if ($action == 'create') {
 						}
 						print '</td>';
 
+						print '<td class="nowrap right">';
+						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 '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;token='.newToken().'&amp;rowid='.$line->rowid.'">';
+							print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editline&token='.newToken().'&rowid='.$line->rowid.'">';
 							print img_edit();
 							print '</a> &nbsp; ';
-							print '<a class="paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete_line&amp;token='.newToken().'&amp;rowid='.$line->rowid.'">';
+							print '<a class="paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete_line&token='.newToken().'&rowid='.$line->rowid.'">';
 							print img_delete();
 							print '</a>';
 
@@ -2174,7 +2250,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 = 10;
+						$colspan = 11;
 						if (!empty($conf->projet->enabled)) {
 							$colspan++;
 						}
@@ -2182,6 +2258,7 @@ if ($action == 'create') {
 							$colspan++;
 						}
 
+						print '<!-- line of expense report -->'."\n";
 						print '<tr class="tredited">';
 
 						print '<td class="center">';
@@ -2199,7 +2276,7 @@ if ($action == 'create') {
 						}
 
 						print '<!-- Code to open/close section to submit or link files in edit mode -->'."\n";
-						print '<script language="javascript">'."\n";
+						print '<script type="text/javascript">'."\n";
 						print '$(document).ready(function() {
         				        $( ".auploadnewfilenow" ).click(function() {
         				            jQuery(".truploadnewfilenow").toggle();
@@ -2251,7 +2328,7 @@ if ($action == 'create') {
 						// Select project
 						if (!empty($conf->projet->enabled)) {
 							print '<td>';
-							$formproject->select_projects(-1, $line->fk_project, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth300');
+							$formproject->select_projects(-1, $line->fk_project, 'fk_project', 0, 0, $projectRequired ? 0 : 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth300');
 							print '</td>';
 						}
 
@@ -2280,7 +2357,7 @@ if ($action == 'create') {
 
 						// Unit price
 						print '<td class="right">';
-						print '<input type="text" min="0" class="right maxwidth50" id="value_unit_ht" name="value_unit_ht" value="'.dol_escape_htmltag(price2num($line->value_unit_ht)).'" />';
+						print '<input type="text" min="0" class="right maxwidth50" id="value_unit_ht" name="value_unit_ht" value="'.dol_escape_htmltag(price2num($line->value_unit_ht)).'"'.$taxlessUnitPriceDisabled.' />';
 						print '</td>';
 
 						// Unit price with tax
@@ -2300,11 +2377,13 @@ if ($action == 'create') {
 						print '<td class="center">';
 						//print $line->fk_ecm_files;
 						print '</td>';
-
+						// Information if theres a rule restriction
 						print '<td class="center">';
+						print '</td>';
+
+						print '<td>';
 						print '<input type="hidden" name="rowid" value="'.$line->rowid.'">';
-						print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-						print '<br><input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+						print $form->buttonsSaveCancel('Save', 'Cancel', array(), 0, 'small');
 						print '</td>';
 
 						print '</tr>';
@@ -2315,10 +2394,8 @@ if ($action == 'create') {
 			}
 
 			 // Add a new line
-			if (($object->status == ExpenseReport::STATUS_DRAFT || $object->status == ExpenseReport::STATUS_REFUSED)
-				&& $action != 'editline'
-				&& $user->rights->expensereport->creer) {
-					$colspan = 11;
+			if (($object->status == ExpenseReport::STATUS_DRAFT || $object->status == ExpenseReport::STATUS_REFUSED) && $action != 'editline' && $user->rights->expensereport->creer) {
+				$colspan = 12;
 				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 					$colspan++;
 				}
@@ -2329,8 +2406,8 @@ if ($action == 'create') {
 					$colspan++;
 				}
 
-					$nbFiles = $nbLinks = 0;
-					$arrayoffiles = array();
+				$nbFiles = $nbLinks = 0;
+				$arrayoffiles = array();
 				if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
@@ -2341,21 +2418,21 @@ if ($action == 'create') {
 					$nbLinks = Link::count($db, $object->element, $object->id);
 				}
 
-					// Add line with link to add new file or attach to an existing file
-					print '<tr class="liste_titre">';
-					print '<td colspan="'.$colspan.'" class="liste_titre">';
-					print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
-					print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
-					print '</a>';
+				// Add line with link to add new file or attach to an existing file
+				print '<tr class="liste_titre">';
+				print '<td colspan="'.$colspan.'" class="liste_titre">';
+				print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
+				print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
+				print '</a>';
 				if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 					print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
 					print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
 					print '</a>';
 				}
 
-					print '<!-- Code to open/close section to submit or link files in the form to add new line -->'."\n";
-					print '<script language="javascript">'."\n";
-					print '$(document).ready(function() {
+				print '<!-- Code to open/close section to submit or link files in the form to add new line -->'."\n";
+				print '<script type="text/javascript">'."\n";
+				print '$(document).ready(function() {
 				        $( ".auploadnewfilenow" ).click(function() {
 							console.log("We click on toggle of auploadnewfilenow");
 				            jQuery(".truploadnewfilenow").toggle();
@@ -2376,7 +2453,7 @@ if ($action == 'create') {
 				if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array')) && $action != 'updateline') {
 					print 'jQuery(".trattachnewfilenow").show();'."\n";
 				}
-					print '
+				print '
 						jQuery("form[name=\"expensereport\"]").submit(function() {
 							if (jQuery(".truploadnewfilenow").is(":hidden")) {
 								/* When section to send file is not expanded, we disable the button sendit that submit form to add a new file, so button to submit line will work. */
@@ -2387,50 +2464,51 @@ if ($action == 'create') {
 							}
 						});
 					';
-					print '
+				print '
                     });
 				    ';
-					print '</script>'."\n";
-					print '</td></tr>';
+				print '</script>'."\n";
+				print '</td></tr>';
 
-					include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
-					include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
+				include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
+				include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
 
-					print '<tr class="liste_titre">';
-					print '<td></td>';
-					print '<td class="center">'.$langs->trans('Date').'</td>';
+				print '<tr class="liste_titre">';
+				print '<td></td>';
+				print '<td class="center">'.$langs->trans('Date').'</td>';
 				if (!empty($conf->projet->enabled)) {
 					print '<td class="minwidth100imp">'.$form->textwithpicto($langs->trans('Project'), $langs->trans("ClosedProjectsAreHidden")).'</td>';
 				}
-					print '<td class="center">'.$langs->trans('Type').'</td>';
+				print '<td class="center">'.$langs->trans('Type').'</td>';
 				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 					print '<td>'.$langs->trans('CarCategory').'</td>';
 				}
-					print '<td>'.$langs->trans('Description').'</td>';
-					print '<td class="right">'.$langs->trans('VAT').'</td>';
-					print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
-					print '<td class="right">'.$langs->trans('PriceUTTC').'</td>';
-					print '<td class="right">'.$langs->trans('Qty').'</td>';
-					print '<td></td>';
-					print '<td></td>';
-					print '<td></td>';
-					print '<td></td>';
-					print '</tr>';
+				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></td>';
+				print '<td></td>';
+				print '<td></td>';
+				print '<td></td>';
+				print '<td></td>';
+				print '</tr>';
 
-					print '<tr class="oddeven nohover">';
+				print '<tr class="oddeven nohover">';
 
-					// Line number
-					print '<td></td>';
+				// Line number
+				print '<td></td>';
 
-					// Select date
-					print '<td class="center">';
-					print $form->selectDate($date ? $date : -1, 'date', 0, 0, 0, '', 1, 1);
-					print '</td>';
+				// Select date
+				print '<td class="center">';
+				print $form->selectDate($date ? $date : -1, 'date', 0, 0, 0, '', 1, 1);
+				print '</td>';
 
-					// Select project
+				// Select project
 				if (!empty($conf->projet->enabled)) {
 					print '<td>';
-					$formproject->select_projects(-1, $fk_project, 'fk_project', 0, 0, 1, -1, 0, 0, 0, '', 0, 0, 'maxwidth300');
+					$formproject->select_projects(-1, $fk_project, 'fk_project', 0, 0, $projectRequired ? 0 : 1, -1, 0, 0, 0, '', 0, 0, 'maxwidth300');
 					print '</td>';
 				}
 
@@ -2446,46 +2524,48 @@ if ($action == 'create') {
 					print '</td>';
 				}
 
-					// Add comments
-					print '<td>';
-					print '<textarea class="flat_ndf centpercent" name="comments" rows="'.ROWS_2.'">'.dol_escape_htmltag($comments, 0, 1).'</textarea>';
-					print '</td>';
+				// Add comments
+				print '<td>';
+				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">';
-					$defaultvat = -1;
+				// Select VAT
+				print '<td class="right">';
+				$defaultvat = -1;
 				if (!empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) {
 					$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
 				}
-					print $form->load_tva('vatrate', ($vatrate != '' ? $vatrate : $defaultvat), $mysoc, '', 0, 0, '', false, 1);
-					print '</td>';
+				print $form->load_tva('vatrate', ($vatrate != '' ? $vatrate : $defaultvat), $mysoc, '', 0, 0, '', false, 1);
+				print '</td>';
 
-					// Unit price net
-					print '<td class="right">';
-					print '<input type="text" class="right maxwidth50" id="value_unit_ht" name="value_unit_ht" value="'.dol_escape_htmltag($value_unit_ht).'">';
-					print '</td>';
+				// Unit price net
+				print '<td class="right">';
+				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 '<input type="text" class="right maxwidth50" id="value_unit" name="value_unit" value="'.dol_escape_htmltag($value_unit).'">';
-					print '</td>';
+				// Unit price with tax
+				print '<td class="right">';
+				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>';
+				// 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>';
 
-					// Picture
-					print '<td></td>';
+				// Picture
+				print '<td></td>';
 
 				if ($action != 'editline') {
 					print '<td class="right"></td>';
 					print '<td class="right"></td>';
 				}
 
-					print '<td class="center"><input type="submit" value="'.$langs->trans("Add").'" name="bouton" class="button"></td>';
+				print '<td class="center">';
+				print $form->buttonsSaveCancel("Add", '', '', 1);
+				print '</td>';
 
-					print '</tr>';
+				print '</tr>';
 			} // Fin si c'est payé/validé
 
 			print '</table>';
@@ -2554,11 +2634,11 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
 	if ($user->rights->expensereport->creer && $object->status == ExpenseReport::STATUS_DRAFT) {
 		if (in_array($object->fk_user_author, $user->getAllChildIds(1)) || !empty($user->rights->expensereport->writeall_advance)) {
 			// Modify
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
 
 			// Validate
 			if (count($object->lines) > 0) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=save&id='.$object->id.'">'.$langs->trans('ValidateAndSubmit').'</a></div>';
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=save&token='.newToken().'&id='.$object->id.'">'.$langs->trans('ValidateAndSubmit').'</a></div>';
 			}
 		}
 	}
@@ -2571,12 +2651,12 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
 	if ($user->rights->expensereport->creer && $object->status == ExpenseReport::STATUS_REFUSED) {
 		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) {
 			// Modify
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
 
 			// setdraft (le statut refusée est identique à brouillon)
-			//print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=brouillonner&id='.$id.'">'.$langs->trans('BROUILLONNER').'</a>';
+			//print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=brouillonner&id='.$id.'">'.$langs->trans('ReOpen').'</a>';
 			// Enregistrer depuis le statut "Refusée"
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=save_from_refuse&id='.$object->id.'">'.$langs->trans('ValidateAndSubmit').'</a></div>';
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=save_from_refuse&token='.newToken().'&id='.$object->id.'">'.$langs->trans('ValidateAndSubmit').'</a></div>';
 		}
 	}
 
@@ -2710,13 +2790,13 @@ if ($action != 'presend') {
 	}
 	*/
 
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright">';
 	// List of actions on element
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 	$formactions = new FormActions($db);
 	$somethingshown = $formactions->showactions($object, 'expensereport', null);
 
-	print '</div></div></div>';
+	print '</div></div>';
 }
 
 // Presend form
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 907e1001439..df942ff93e6 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -117,8 +117,9 @@ class ExpenseReports extends DolibarrApi
 
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 3f62087dd0b..70dad3ff48f 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -275,23 +275,23 @@ class ExpenseReport extends CommonObject
 		$sql .= ",entity";
 		$sql .= ") VALUES(";
 		$sql .= "'(PROV)'";
-		$sql .= ", ".$this->total_ht;
-		$sql .= ", ".$this->total_ttc;
-		$sql .= ", ".$this->total_tva;
+		$sql .= ", ".price2num($this->total_ht, 'MT');
+		$sql .= ", ".price2num($this->total_ttc, 'MT');
+		$sql .= ", ".price2num($this->total_tva, 'MT');
 		$sql .= ", '".$this->db->idate($this->date_debut)."'";
 		$sql .= ", '".$this->db->idate($this->date_fin)."'";
 		$sql .= ", '".$this->db->idate($now)."'";
-		$sql .= ", ".$user->id;
-		$sql .= ", ".$fuserid;
-		$sql .= ", ".($this->fk_user_validator > 0 ? $this->fk_user_validator : "null");
-		$sql .= ", ".($this->fk_user_approve > 0 ? $this->fk_user_approve : "null");
-		$sql .= ", ".($this->fk_user_modif > 0 ? $this->fk_user_modif : "null");
-		$sql .= ", ".($this->fk_statut > 1 ? $this->fk_statut : 0);
-		$sql .= ", ".($this->modepaymentid ? $this->modepaymentid : "null");
+		$sql .= ", ".((int) $user->id);
+		$sql .= ", ".((int) $fuserid);
+		$sql .= ", ".($this->fk_user_validator > 0 ? ((int) $this->fk_user_validator) : "null");
+		$sql .= ", ".($this->fk_user_approve > 0 ? ((int) $this->fk_user_approve) : "null");
+		$sql .= ", ".($this->fk_user_modif > 0 ? ((int) $this->fk_user_modif) : "null");
+		$sql .= ", ".($this->fk_statut > 1 ? ((int) $this->fk_statut) : 0);
+		$sql .= ", ".($this->modepaymentid ? ((int) $this->modepaymentid) : "null");
 		$sql .= ", 0";
 		$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
 		$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
-		$sql .= ", ".$conf->entity;
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ")";
 
 		$result = $this->db->query($sql);
@@ -506,9 +506,9 @@ class ExpenseReport extends CommonObject
 		$sql .= " , note_public = ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "''");
 		$sql .= " , note_private = ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "''");
 		$sql .= " , detail_refuse = ".(!empty($this->detail_refuse) ? "'".$this->db->escape($this->detail_refuse)."'" : "''");
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			if (!$notrigger) {
@@ -564,7 +564,7 @@ class ExpenseReport extends CommonObject
 		}
 		//$sql.= $restrict;
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
@@ -682,7 +682,7 @@ class ExpenseReport extends CommonObject
 		$sql .= " SET fk_statut = ".self::STATUS_CLOSED.", paid=1";
 		$sql .= " WHERE rowid = ".((int) $id)." AND fk_statut = ".self::STATUS_APPROVED;
 
-		dol_syslog(get_class($this)."::set_paid sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::set_paid", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($this->db->affected_rows($resql)) {
@@ -899,7 +899,7 @@ class ExpenseReport extends CommonObject
 			$sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as de";
 			$sql .= " WHERE de.fk_projet = ".((int) $projectid);
 
-			dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 			$result = $this->db->query($sql);
 			if ($result) {
 				$num = $this->db->num_rows($result);
@@ -993,18 +993,18 @@ class ExpenseReport extends CommonObject
 		$this->lines = array();
 
 		$sql = ' SELECT de.rowid, de.comments, de.qty, de.value_unit, de.date, de.rang,';
-		$sql .= ' de.'.$this->fk_element.', de.fk_c_type_fees, de.fk_c_exp_tax_cat, de.fk_projet as fk_project,';
+		$sql .= " de.".$this->fk_element.", de.fk_c_type_fees, de.fk_c_exp_tax_cat, de.fk_projet as fk_project,";
 		$sql .= ' de.tva_tx, de.vat_src_code,';
 		$sql .= ' de.localtax1_tx, de.localtax2_tx, de.localtax1_type, de.localtax2_type,';
 		$sql .= ' de.fk_ecm_files,';
 		$sql .= ' de.total_ht, de.total_tva, de.total_ttc,';
-		$sql .= ' de.total_localtax1, de.total_localtax2,';
-		$sql .= ' ctf.code as code_type_fees, ctf.label as libelle_type_fees,';
+		$sql .= ' de.total_localtax1, de.total_localtax2, de.rule_warning_message,';
+		$sql .= ' ctf.code as code_type_fees, ctf.label as libelle_type_fees, ctf.accountancy_code as accountancy_code_type_fees,';
 		$sql .= ' p.ref as ref_projet, p.title as title_projet';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as de';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON de.fk_c_type_fees = ctf.id';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON de.fk_projet = p.rowid';
-		$sql .= ' WHERE de.'.$this->fk_element.' = '.((int) $this->id);
+		$sql .= " WHERE de.".$this->fk_element." = ".((int) $this->id);
 		if (!empty($conf->global->EXPENSEREPORT_LINES_SORTED_BY_ROWID)) {
 			$sql .= ' ORDER BY de.rang ASC, de.rowid ASC';
 		} else {
@@ -1043,6 +1043,7 @@ class ExpenseReport extends CommonObject
 
 				$deplig->type_fees_code     = empty($objp->code_type_fees) ? 'TF_OTHER' : $objp->code_type_fees;
 				$deplig->type_fees_libelle  = $objp->libelle_type_fees;
+				$deplig->type_fees_accountancy_code = $objp->accountancy_code_type_fees;
 
 				$deplig->tva_tx             = $objp->tva_tx;
 				$deplig->vatrate            = $objp->tva_tx;
@@ -1055,6 +1056,8 @@ class ExpenseReport extends CommonObject
 				$deplig->projet_ref         = $objp->ref_projet;
 				$deplig->projet_title       = $objp->title_projet;
 
+				$deplig->rule_warning_message = $objp->rule_warning_message;
+
 				$deplig->rang               = $objp->rang;
 
 				$this->lines[$i] = $deplig;
@@ -1234,7 +1237,7 @@ class ExpenseReport extends CommonObject
 		$sql .= " fk_statut = ".self::STATUS_VALIDATED.",";
 		$sql .= " date_valid='".$this->db->idate($this->date_valid)."',";
 		$sql .= " fk_user_valid = ".$user->id;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -1322,7 +1325,7 @@ class ExpenseReport extends CommonObject
 		// Sélection de la date de début de la NDF
 		$sql = 'SELECT date_debut';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$result = $this->db->query($sql);
 
@@ -1333,9 +1336,9 @@ class ExpenseReport extends CommonObject
 		if ($this->status != self::STATUS_VALIDATED) {
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET fk_statut = ".self::STATUS_VALIDATED;
-			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
-			dol_syslog(get_class($this)."::set_save_from_refuse sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::set_save_from_refuse", LOG_DEBUG);
 
 			if ($this->db->query($sql)) {
 				return 1;
@@ -1368,7 +1371,7 @@ class ExpenseReport extends CommonObject
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = ".self::STATUS_APPROVED.", fk_user_approve = ".((int) $fuser->id).",";
 			$sql .= " date_approve='".$this->db->idate($this->date_approve)."'";
-			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			if ($this->db->query($sql)) {
 				if (!$notrigger) {
 					// Call trigger
@@ -1420,7 +1423,7 @@ class ExpenseReport extends CommonObject
 			$sql .= " date_refuse='".$this->db->idate($now)."',";
 			$sql .= " detail_refuse='".$this->db->escape($details)."',";
 			$sql .= " fk_user_approve = NULL";
-			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			if ($this->db->query($sql)) {
 				$this->fk_statut = 99; // deprecated
 				$this->status = 99;
@@ -1489,9 +1492,9 @@ class ExpenseReport extends CommonObject
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET paid = 0, fk_statut = ".self::STATUS_APPROVED;
-			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
-			dol_syslog(get_class($this)."::set_unpaid sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::set_unpaid", LOG_DEBUG);
 
 			if ($this->db->query($sql)) {
 				if (!$notrigger) {
@@ -1543,9 +1546,9 @@ class ExpenseReport extends CommonObject
 			$sql .= " SET fk_statut = ".self::STATUS_CANCELED.", fk_user_cancel = ".((int) $fuser->id);
 			$sql .= ", date_cancel='".$this->db->idate($this->date_cancel)."'";
 			$sql .= " ,detail_cancel='".$this->db->escape($detail)."'";
-			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
-			dol_syslog(get_class($this)."::set_cancel sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::set_cancel", LOG_DEBUG);
 
 			if ($this->db->query($sql)) {
 				if (!$notrigger) {
@@ -1728,7 +1731,7 @@ class ExpenseReport extends CommonObject
 		$sql .= " total_ht = ".$this->total_ht;
 		$sql .= " , total_ttc = ".$this->total_ttc;
 		$sql .= " , total_tva = ".$this->total_tva;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -1739,9 +1742,8 @@ class ExpenseReport extends CommonObject
 		}
 	}
 
-
 	/**
-	 * addline
+	 * Add expense report line
 	 *
 	 * @param    float       $qty                      Qty
 	 * @param    double      $up                       Unit price (price with tax)
@@ -1875,10 +1877,6 @@ class ExpenseReport extends CommonObject
 
 		$langs->load('trips');
 
-		if (empty($conf->global->MAIN_USE_EXPENSE_RULE)) {
-			return true; // if don't use rules
-		}
-
 		// We don't know seller and buyer for expense reports
 		if (!is_object($seller)) {
 			$seller = $mysoc;			// We use same than current company (expense report are often done in same country)
@@ -1888,7 +1886,8 @@ class ExpenseReport extends CommonObject
 		}
 		//$buyer = new Societe($this->db);
 
-		$rulestocheck = ExpenseReportRule::getAllRule($this->line->fk_c_type_fees, $this->line->date, $this->fk_user_author);
+		$expensereportrule = new ExpenseReportRule($db);
+		$rulestocheck = $expensereportrule->getAllRule($this->line->fk_c_type_fees, $this->line->date, $this->fk_user_author);
 
 		$violation = 0;
 		$rule_warning_message_tab = array();
@@ -1914,12 +1913,12 @@ class ExpenseReport extends CommonObject
 					$this->errors[] = $this->error;
 
 					$new_current_total_ttc -= $amount_to_test - $rule->amount; // ex, entered 16€, limit 12€, subtracts 4€;
-					$rule_warning_message_tab[] = $langs->trans('ExpenseReportConstraintViolationError', $rule->id, price($amount_to_test, 0, $langs, 1, -1, -1, $conf->currency), price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency), $langs->trans('by'.$rule->code_expense_rules_type, price($new_current_total_ttc, 0, $langs, 1, -1, -1, $conf->currency)));
+					$rule_warning_message_tab[] = $langs->trans('ExpenseReportConstraintViolationError', $rule->id, price($amount_to_test, 0, $langs, 1, -1, -1, $conf->currency), price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency));
 				} else {
 					$this->error = 'ExpenseReportConstraintViolationWarning';
 					$this->errors[] = $this->error;
 
-					$rule_warning_message_tab[] = $langs->trans('ExpenseReportConstraintViolationWarning', $rule->id, price($amount_to_test, 0, $langs, 1, -1, -1, $conf->currency), price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency), $langs->trans('nolimitby'.$rule->code_expense_rules_type));
+					$rule_warning_message_tab[] = $langs->trans('ExpenseReportConstraintViolationWarning', $rule->id, price($amount_to_test, 0, $langs, 1, -1, -1, $conf->currency), price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency));
 				}
 
 				// No break, we sould test if another rule is violated
@@ -1975,7 +1974,8 @@ class ExpenseReport extends CommonObject
 		}
 		//$buyer = new Societe($this->db);
 
-		$range = ExpenseReportIk::getRangeByUser($userauthor, $this->line->fk_c_exp_tax_cat);
+		$expenseik = new ExpenseReportIk($this->db);
+		$range = $expenseik->getRangeByUser($userauthor, $this->line->fk_c_exp_tax_cat);
 
 		if (empty($range)) {
 			$this->error = 'ErrorNoRangeAvailable';
@@ -2015,12 +2015,12 @@ class ExpenseReport extends CommonObject
 	public function offsetAlreadyGiven()
 	{
 		$sql = 'SELECT e.rowid FROM '.MAIN_DB_PREFIX.'expensereport e';
-		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'expensereport_det d ON (e.rowid = d.fk_expensereport)';
-		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_fees f ON (d.fk_c_type_fees = f.id AND f.code = "EX_KME")';
-		$sql .= ' WHERE e.fk_user_author = '.(int) $this->fk_user_author;
-		$sql .= ' AND YEAR(d.date) = "'.dol_print_date($this->line->date, '%Y').'" AND MONTH(d.date) = "'.dol_print_date($this->line->date, '%m').'"';
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."expensereport_det d ON (e.rowid = d.fk_expensereport)";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."c_type_fees f ON (d.fk_c_type_fees = f.id AND f.code = 'EX_KME')";
+		$sql .= " WHERE e.fk_user_author = ".(int) $this->fk_user_author;
+		$sql .= " AND YEAR(d.date) = '".dol_print_date($this->line->date, '%Y')."' AND MONTH(d.date) = '".dol_print_date($this->line->date, '%m')."'";
 		if (!empty($this->line->id)) {
-			$sql .= ' AND d.rowid <> '.$this->line->id;
+			$sql .= ' AND d.rowid <> '.((int) $this->line->id);
 		}
 
 		dol_syslog(get_class($this)."::offsetAlreadyGiven");
@@ -2212,8 +2212,6 @@ class ExpenseReport extends CommonObject
 				$date_d_form = $date_debut;
 				$date_f_form = $date_fin;
 
-				$existe = false;
-
 				while ($i < $num_rows) {
 					$objp = $this->db->fetch_object($result);
 
@@ -2221,17 +2219,13 @@ class ExpenseReport extends CommonObject
 					$date_f_req = $this->db->jdate($objp->date_fin); // 4
 
 					if (!($date_f_form < $date_d_req || $date_d_form > $date_f_req)) {
-						$existe = true;
+						return $objp->rowid;
 					}
 
 					$i++;
 				}
 
-				if ($existe) {
-					return 1;
-				} else {
-					return 0;
-				}
+				return 0;
 			} else {
 				return 0;
 			}
@@ -2523,7 +2517,7 @@ class ExpenseReport extends CommonObject
 
 		$sql = 'SELECT sum(amount) as amount';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$table;
-		$sql .= ' WHERE '.$field.' = '.$this->id;
+		$sql .= " WHERE ".$field." = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::getSumPayments", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2586,6 +2580,7 @@ class ExpenseReportLine
 
 	public $type_fees_code;
 	public $type_fees_libelle;
+	public $type_fees_accountancy_code;
 
 	public $projet_ref;
 	public $projet_title;
@@ -2608,6 +2603,8 @@ class ExpenseReportLine
 	 */
 	public $fk_ecm_files;
 
+	public $rule_warning_message;
+
 
 	/**
 	 * Constructor
@@ -2629,7 +2626,7 @@ class ExpenseReportLine
 	{
 		$sql = 'SELECT fde.rowid, fde.fk_expensereport, fde.fk_c_type_fees, fde.fk_c_exp_tax_cat, fde.fk_projet as fk_project, fde.date,';
 		$sql .= ' fde.tva_tx as vatrate, fde.vat_src_code, fde.comments, fde.qty, fde.value_unit, fde.total_ht, fde.total_tva, fde.total_ttc, fde.fk_ecm_files,';
-		$sql .= ' fde.localtax1_tx, fde.localtax2_tx, fde.localtax1_type, fde.localtax2_type, fde.total_localtax1, fde.total_localtax2,';
+		$sql .= ' fde.localtax1_tx, fde.localtax2_tx, fde.localtax1_type, fde.localtax2_type, fde.total_localtax1, fde.total_localtax2, fde.rule_warning_message,';
 		$sql .= ' ctf.code as type_fees_code, ctf.label as type_fees_libelle,';
 		$sql .= ' pjt.rowid as projet_id, pjt.title as projet_title, pjt.ref as projet_ref';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'expensereport_det as fde';
@@ -2675,6 +2672,8 @@ class ExpenseReportLine
 
 			$this->fk_ecm_files = $objp->fk_ecm_files;
 
+			$this->rule_warning_message = $objp->rule_warning_message;
+
 			$this->db->free($result);
 		} else {
 			dol_print_error($this->db);
@@ -2786,15 +2785,15 @@ class ExpenseReportLine
 		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'expensereport e ON (d.fk_expensereport = e.rowid)';
 		$sql .= ' WHERE e.fk_user_author = '.((int) $fk_user);
 		if (!empty($this->id)) {
-			$sql .= ' AND d.rowid <> '.$this->id;
+			$sql .= ' AND d.rowid <> '.((int) $this->id);
 		}
 		$sql .= ' AND d.fk_c_type_fees = '.((int) $rule->fk_c_type_fees);
 		if ($mode == 'day' || $mode == 'EX_DAY') {
 			$sql .= " AND d.date = '".dol_print_date($this->date, '%Y-%m-%d')."'";
 		} elseif ($mode == 'mon' || $mode == 'EX_MON') {
-			$sql .= ' AND DATE_FORMAT(d.date, \'%Y-%m\') = \''.dol_print_date($this->date, '%Y-%m').'\''; // @todo DATE_FORMAT is forbidden
+			$sql .= " AND DATE_FORMAT(d.date, '%Y-%m') = '".dol_print_date($this->date, '%Y-%m')."'"; // @todo DATE_FORMAT is forbidden
 		} elseif ($mode == 'year' || $mode == 'EX_YEA') {
-			$sql .= ' AND DATE_FORMAT(d.date, \'%Y\') = \''.dol_print_date($this->date, '%Y').'\''; // @todo DATE_FORMAT is forbidden
+			$sql .= " AND DATE_FORMAT(d.date, '%Y') = '".dol_print_date($this->date, '%Y')."'"; 	// @todo DATE_FORMAT is forbidden
 		}
 
 		dol_syslog('ExpenseReportLine::getExpAmount');
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index 358a2fe06ca..53cf3695b12 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -87,8 +87,6 @@ class ExpenseReportIk extends CoreObject
 	 */
 	public function __construct(DoliDB &$db)
 	{
-		global $conf;
-
 		parent::__construct($db);
 		parent::init();
 
@@ -102,29 +100,28 @@ class ExpenseReportIk extends CoreObject
 	 * @param	int		$mode	1=only active; 2=only inactive; other value return all
 	 * @return	array of category
 	 */
-	public static function getTaxCategories($mode = 1)
+	public function getTaxCategories($mode = 1)
 	{
-		global $db;
-
 		$categories = array();
 
 		$sql = 'SELECT rowid, label, entity, active';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat';
-		$sql .= ' WHERE entity IN ('.getEntity('c_exp_tax_cat').')';
+		$sql .= ' WHERE entity IN (0, '.getEntity($this->element).')';
 		if ($mode == 1) {
 			$sql .= ' AND active = 1';
 		} elseif ($mode == 2) {
 			$sql .= 'AND active = 0';
 		}
 
-		dol_syslog(get_called_class().'::getTaxCategories sql='.$sql, LOG_DEBUG);
-		$resql = $db->query($sql);
+		dol_syslog(get_called_class().'::getTaxCategories', LOG_DEBUG);
+
+		$resql = $this->db->query($sql);
 		if ($resql) {
-			while ($obj = $db->fetch_object($resql)) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$categories[$obj->rowid] = $obj;
 			}
 		} else {
-			dol_print_error($db);
+			dol_print_error($this->db);
 		}
 
 		return $categories;
@@ -137,10 +134,10 @@ class ExpenseReportIk extends CoreObject
 	 * @param int   $fk_c_exp_tax_cat   category
 	 * @return boolean|array
 	 */
-	public static function getRangeByUser(User $userauthor, int $fk_c_exp_tax_cat)
+	public function getRangeByUser(User $userauthor, int $fk_c_exp_tax_cat)
 	{
 		$default_range = (int) $userauthor->default_range; // if not defined, then 0
-		$ranges = self::getRangesByCategory($fk_c_exp_tax_cat);
+		$ranges = $this->getRangesByCategory($fk_c_exp_tax_cat);
 
 		// substract 1 because array start from 0
 		if (empty($ranges) || !isset($ranges[$default_range - 1])) {
@@ -157,10 +154,8 @@ class ExpenseReportIk extends CoreObject
 	 * @param int	$active				active
 	 * @return array
 	 */
-	public static function getRangesByCategory(int $fk_c_exp_tax_cat, $active = 1)
+	public function getRangesByCategory(int $fk_c_exp_tax_cat, $active = 1)
 	{
-		global $db;
-
 		$ranges = array();
 
 		dol_syslog(get_called_class().'::getRangesByCategory for fk_c_exp_tax_cat='.$fk_c_exp_tax_cat, LOG_DEBUG);
@@ -170,24 +165,25 @@ class ExpenseReportIk extends CoreObject
 			$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_exp_tax_cat c ON (r.fk_c_exp_tax_cat = c.rowid)';
 		}
 		$sql .= ' WHERE r.fk_c_exp_tax_cat = '.((int) $fk_c_exp_tax_cat);
+		$sql .= " AND r.entity IN(0, ".getEntity($this->element).")";
 		if ($active) {
 			$sql .= ' AND r.active = 1 AND c.active = 1';
 		}
 		$sql .= ' ORDER BY r.range_ik';
 
-		$resql = $db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql) {
-			$num = $db->num_rows($resql);
+			$num = $this->db->num_rows($resql);
 			if ($num > 0) {
-				while ($obj = $db->fetch_object($resql)) {
-					$object = new ExpenseReportIk($db);
+				while ($obj = $this->db->fetch_object($resql)) {
+					$object = new ExpenseReportIk($this->db);
 					$object->fetch($obj->rowid);
 
 					$ranges[] = $object;
 				}
 			}
 		} else {
-			dol_print_error($db);
+			dol_print_error($this->db);
 		}
 
 		return $ranges;
@@ -198,24 +194,23 @@ class ExpenseReportIk extends CoreObject
 	 *
 	 * @return array
 	 */
-	public static function getAllRanges()
+	public function getAllRanges()
 	{
-		global $db;
-
 		$ranges = array();
 
 		$sql = ' SELECT r.rowid, r.fk_c_exp_tax_cat, r.range_ik, c.label, i.rowid as fk_expense_ik, r.active as range_active, c.active as cat_active';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'c_exp_tax_range r';
 		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_exp_tax_cat c ON (r.fk_c_exp_tax_cat = c.rowid)';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'expensereport_ik i ON (r.rowid = i.fk_range)';
-		$sql .= ' WHERE r.entity IN (0, '.getEntity('').')';
+		$sql .= ' WHERE r.entity IN (0, '.getEntity($this->element).')';
 		$sql .= ' ORDER BY r.fk_c_exp_tax_cat, r.range_ik';
 
-		dol_syslog(get_called_class().'::getAllRanges sql='.$sql, LOG_DEBUG);
-		$resql = $db->query($sql);
+		dol_syslog(get_called_class().'::getAllRanges', LOG_DEBUG);
+
+		$resql = $this->db->query($sql);
 		if ($resql) {
-			while ($obj = $db->fetch_object($resql)) {
-				$ik = new ExpenseReportIk($db);
+			while ($obj = $this->db->fetch_object($resql)) {
+				$ik = new ExpenseReportIk($this->db);
 				if ($obj->fk_expense_ik > 0) {
 					$ik->fetch($obj->fk_expense_ik);
 				}
@@ -227,7 +222,7 @@ class ExpenseReportIk extends CoreObject
 				$ranges[$obj->fk_c_exp_tax_cat]['ranges'][] = $obj;
 			}
 		} else {
-			dol_print_error($db);
+			dol_print_error($this->db);
 		}
 
 		return $ranges;
@@ -236,30 +231,28 @@ class ExpenseReportIk extends CoreObject
 	/**
 	 * Return the max number of range by a category
 	 *
-	 * @param int $default_c_exp_tax_cat id
-	 * @return int
+	 * @param 	int 	$default_c_exp_tax_cat id	Default c_exp_tax_cat
+	 * @return 	int									Max nb
 	 */
-	public static function getMaxRangeNumber($default_c_exp_tax_cat = 0)
+	public function getMaxRangeNumber($default_c_exp_tax_cat = 0)
 	{
-		global $db, $conf;
-
 		$sql = 'SELECT MAX(counted) as nbRange FROM (';
 		$sql .= ' SELECT COUNT(*) as counted';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'c_exp_tax_range r';
-		$sql .= ' WHERE r.entity IN (0, '.$conf->entity.')';
+		$sql .= ' WHERE r.entity IN (0, '.getEntity($this->element).')';
 		if ($default_c_exp_tax_cat > 0) {
 			$sql .= ' AND r.fk_c_exp_tax_cat = '.((int) $default_c_exp_tax_cat);
 		}
 		$sql .= ' GROUP BY r.fk_c_exp_tax_cat';
 		$sql .= ') as counts';
 
-		dol_syslog(get_called_class().'::getMaxRangeNumber sql='.$sql, LOG_DEBUG);
-		$resql = $db->query($sql);
+		dol_syslog(get_called_class().'::getMaxRangeNumber', LOG_DEBUG);
+		$resql = $this->db->query($sql);
 		if ($resql) {
-			$obj = $db->fetch_object($resql);
+			$obj = $this->db->fetch_object($resql);
 			return $obj->nbRange;
 		} else {
-			dol_print_error($db);
+			dol_print_error($this->db);
 		}
 
 		return 0;
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index 03ecab10f6a..ae89b4b0f51 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -148,20 +148,19 @@ class ExpenseReportRule extends CoreObject
 	 * @param int        $fk_user		    user of expense
 	 * @return array                        Array with ExpenseReportRule
 	 */
-	public static function getAllRule($fk_c_type_fees = '', $date = '', $fk_user = '')
+	public function getAllRule($fk_c_type_fees = '', $date = '', $fk_user = '')
 	{
-		global $db;
-
 		$rules = array();
+
 		$sql = 'SELECT er.rowid';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'expensereport_rules er';
-		$sql .= ' WHERE er.entity IN (0,'.getEntity('').')';
+		$sql .= ' WHERE er.entity IN (0,'.getEntity($this->element).')';
 		if (!empty($fk_c_type_fees)) {
-			$sql .= ' AND er.fk_c_type_fees IN (-1, '.$fk_c_type_fees.')';
+			$sql .= ' AND er.fk_c_type_fees IN (-1, '.((int) $fk_c_type_fees).')';
 		}
 		if (!empty($date)) {
-			$sql .= " AND er.dates <= '".dol_print_date($date, '%Y-%m-%d')."'";
-			$sql .= " AND er.datee >= '".dol_print_date($date, '%Y-%m-%d')."'";
+			$sql .= " AND er.dates <= '".$this->db->idate($date)."'";
+			$sql .= " AND er.datee >= '".$this->db->idate($date)."'";
 		}
 		if ($fk_user > 0) {
 			$sql .= ' AND (er.is_for_all = 1';
@@ -170,20 +169,20 @@ class ExpenseReportRule extends CoreObject
 		}
 		$sql .= ' ORDER BY er.is_for_all, er.fk_usergroup, er.fk_user';
 
-		dol_syslog("ExpenseReportRule::getAllRule sql=".$sql);
+		dol_syslog("ExpenseReportRule::getAllRule");
 
-		$resql = $db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql) {
-			while ($obj = $db->fetch_object($resql)) {
-				$rule = new ExpenseReportRule($db);
+			while ($obj = $this->db->fetch_object($resql)) {
+				$rule = new ExpenseReportRule($this->db);
 				if ($rule->fetch($obj->rowid) > 0) {
 					$rules[$rule->id] = $rule;
 				} else {
-					dol_print_error($db);
+					dol_print_error($this->db);
 				}
 			}
 		} else {
-			dol_print_error($db);
+			dol_print_error($this->db);
 		}
 
 		return $rules;
@@ -201,7 +200,7 @@ class ExpenseReportRule extends CoreObject
 		if ($this->fk_usergroup > 0) {
 			$group = new UserGroup($this->db);
 			if ($group->fetch($this->fk_usergroup) > 0) {
-				return $group->nom;
+				return $group->name;
 			} else {
 				$this->error = $group->error;
 				$this->errors[] = $this->error;
diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php
index 13e7a44bc7f..e36b1c1e49e 100644
--- a/htdocs/expensereport/class/expensereportstats.class.php
+++ b/htdocs/expensereport/class/expensereportstats.class.php
@@ -94,7 +94,7 @@ class ExpenseReportStats extends Stats
 	 */
 	public function getNbByYear()
 	{
-		$sql = "SELECT YEAR(".$this->db->ifsql('e.'.$this->datetouse.' IS NULL', 'e.date_create', 'e.'.$this->datetouse).") as dm, count(*)";
+		$sql = "SELECT YEAR(".$this->db->ifsql("e.".$this->datetouse." IS NULL", "e.date_create", "e.".$this->datetouse).") as dm, count(*)";
 		$sql .= " FROM ".$this->from;
 		$sql .= " GROUP BY dm DESC";
 		$sql .= " WHERE ".$this->where;
@@ -112,7 +112,7 @@ class ExpenseReportStats extends Stats
 	 */
 	public function getNbByMonth($year, $format = 0)
 	{
-		$sql = "SELECT MONTH(".$this->db->ifsql('e.'.$this->datetouse.' IS NULL', 'e.date_create', 'e.'.$this->datetouse).") as dm, count(*)";
+		$sql = "SELECT MONTH(".$this->db->ifsql("e.".$this->datetouse." IS NULL", "e.date_create", "e.".$this->datetouse).") as dm, count(*)";
 		$sql .= " FROM ".$this->from;
 		$sql .= " WHERE YEAR(e.".$this->datetouse.") = ".((int) $year);
 		$sql .= " AND ".$this->where;
@@ -134,9 +134,9 @@ class ExpenseReportStats extends Stats
 	 */
 	public function getAmountByMonth($year, $format = 0)
 	{
-		$sql = "SELECT date_format(".$this->db->ifsql('e.'.$this->datetouse.' IS NULL', 'e.date_create', 'e.'.$this->datetouse).",'%m') as dm, sum(".$this->field.")";
+		$sql = "SELECT date_format(".$this->db->ifsql("e.".$this->datetouse." IS NULL", "e.date_create", "e.".$this->datetouse).",'%m') as dm, sum(".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		$sql .= " WHERE date_format(".$this->db->ifsql('e.'.$this->datetouse.' IS NULL', 'e.date_create', 'e.'.$this->datetouse).",'%Y') = '".$this->db->escape($year)."'";
+		$sql .= " WHERE date_format(".$this->db->ifsql("e.".$this->datetouse." IS NULL", "e.date_create", "e.".$this->datetouse).",'%Y') = '".$this->db->escape($year)."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -154,9 +154,9 @@ class ExpenseReportStats extends Stats
 	 */
 	public function getAverageByMonth($year)
 	{
-		$sql = "SELECT date_format(".$this->db->ifsql('e.'.$this->datetouse.' IS NULL', 'e.date_create', 'e.'.$this->datetouse).",'%m') as dm, avg(".$this->field.")";
+		$sql = "SELECT date_format(".$this->db->ifsql("e.".$this->datetouse." IS NULL", "e.date_create", "e.".$this->datetouse).",'%m') as dm, avg(".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		$sql .= " WHERE date_format(".$this->db->ifsql('e.'.$this->datetouse.' IS NULL', 'e.date_create', 'e.'.$this->datetouse).",'%Y') = '".$this->db->escape($year)."'";
+		$sql .= " WHERE date_format(".$this->db->ifsql("e.".$this->datetouse." IS NULL", "e.date_create", "e.".$this->datetouse).",'%Y') = '".$this->db->escape($year)."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -171,7 +171,7 @@ class ExpenseReportStats extends Stats
 	 */
 	public function getAllByYear()
 	{
-		$sql = "SELECT date_format(".$this->db->ifsql('e.'.$this->datetouse.' IS NULL', 'e.date_create', 'e.'.$this->datetouse).",'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
+		$sql = "SELECT date_format(".$this->db->ifsql("e.".$this->datetouse." IS NULL", "e.date_create", "e.".$this->datetouse).",'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 48adeab929d..3aac0cee2b8 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -635,7 +635,16 @@ class PaymentExpenseReport extends CommonObject
 		if (empty($this->ref)) {
 			$this->ref = $this->label;
 		}
-		$label = $langs->trans("ShowPayment").': '.$this->ref;
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Payment").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		if (!empty($this->ref)) {
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		}
+		if (!empty($this->datep)) {
+			$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->datep, 'dayhour');
+		}
 
 		if (!empty($this->id)) {
 			$link = '<a href="'.DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index d7ecea8fcc9..8c3b5f56549 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -44,13 +44,6 @@ $confirm = GETPOST('confirm', 'alpha');
 
 $childids = $user->getAllChildIds(1);
 
-// Security check
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'expensereport', $id, 'expensereport');
-
-
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -81,6 +74,12 @@ $modulepart = 'trip';
 // Load object
 //include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
+// Security check
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'expensereport', $id, 'expensereport');
+
 if ($object->id > 0) {
 	// Check current user can read this expense report
 	$canread = 0;
@@ -95,6 +94,8 @@ if ($object->id > 0) {
 	}
 }
 
+$permissiontoadd = $user->rights->expensereport->creer;	// Used by the include of actions_dellink.inc.php
+
 
 /*
  * Actions
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index c87cc08fb40..504101a1720 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -48,8 +48,8 @@ if ($user->socid) {
 $result = restrictedArea($user, 'expensereport', '', '');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -185,7 +185,7 @@ print '</div>';
 
 
 // Right area
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 $max = 10;
@@ -265,7 +265,7 @@ if ($result) {
 	dol_print_error($db);
 }
 
-print '</div></div></div>';
+print '</div></div>';
 
 $parameters = array('user' => $user);
 $reshook = $hookmanager->executeHooks('dashboardExpenseReport', $parameters, $object); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 1f3468d06fc..760c25e4db8 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -277,7 +277,7 @@ $sql .= " u.rowid as id_user, u.firstname, u.lastname, u.login, u.email, u.statu
 // 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
@@ -487,9 +487,7 @@ if ($resql) {
 
 			print '</div>';
 		} else {
-			print '<div class="center">';
-			print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-			print '</div><br>';
+			print $form->buttonsSaveCancel("Save", '');
 		}
 	} else {
 		$title = $langs->trans("ListTripsAndExpenses");
diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php
index b0156c6a475..5649f2144e4 100644
--- a/htdocs/expensereport/note.php
+++ b/htdocs/expensereport/note.php
@@ -44,6 +44,8 @@ $socid = 0;
 if ($user->socid) {
 	$socid = $user->socid;
 }
+$hookmanager->initHooks(array('expensereportnote'));
+
 $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 
 
@@ -68,12 +70,17 @@ if ($object->id > 0) {
 	}
 }
 
-
 /*
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$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
+}
 
 
 /*
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index 7b86f295b5b..847c059a9c6 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -240,7 +240,7 @@ print '<div class="tabsAction">';
 if ($action == '') {
 	if ($user->rights->expensereport->supprimer) {
 		if (!$disable_delete) {
-			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
+			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($title_button).'">'.$langs->trans('Delete').'</a>';
 		}
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index b7057af86fc..845b8852cc1 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -170,7 +170,7 @@ if ($action == 'create' || empty($action)) {
 
 	// autofill remainder amount
 	if (!empty($conf->use_javascript_ajax)) {
-		print "\n".'<script type="text/javascript" language="javascript">';
+		print "\n".'<script type="text/javascript">';
 		//Add js for AutoFill
 		print ' $(document).ready(function () {';
 		print ' 	$(".AutoFillAmount").on(\'click touchstart\', function(){
@@ -324,11 +324,7 @@ if ($action == 'create' || empty($action)) {
 
 	print "</table>";
 
-	print '<br><div class="center">';
-	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print "</form>\n";
 }
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index 5f8a9f628b5..ded5a7a3805 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -146,7 +146,7 @@ if (!$mesg) {
 
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
 	if ($mode == 'customer') {
 		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
@@ -249,7 +249,7 @@ if (!in_array($year, $arrayyears)) {
 	$arrayyears[$year] = $year;
 }
 arsort($arrayyears);
-print $form->selectarray('year', $arrayyears, $year, 0);
+print $form->selectarray('year', $arrayyears, $year, 0, 0, 0, '', 0, 0, 0, '', 'width75');
 print '</td></tr>';
 print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
@@ -292,7 +292,7 @@ foreach ($data as $val) {
 print '</table>';
 print '</div>';
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 // Show graphs
@@ -309,7 +309,7 @@ if ($mesg) {
 print '</td></tr></table>';
 
 
-print '</div></div></div>';
+print '</div></div>';
 print '<div style="clear:both"></div>';
 
 
diff --git a/htdocs/expensereport/tpl/expensereport_addfile.tpl.php b/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
index c27136ebd38..d74b68e6738 100644
--- a/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
@@ -2,7 +2,14 @@
 // Add line to upload new file
 print '<!-- expensereport_addfile.tpl.php -->'."\n";
 print '<tr class="truploadnewfilenow'.(empty($tredited) ? ' oddeven nohover' : ' '.$tredited).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
-print '<td colspan="'.$colspan.'">';
+
+// Num line
+if ($action == 'editline') {
+	print '<td></td>';
+}
+
+// Upload section
+print '<td colspan="'.($action == 'editline' ? $colspan - 1 : $colspan).'">';
 
 $modulepart = 'expensereport';
 $permission = $user->rights->expensereport->creer;
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index 9264400a71f..76a11c7121b 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -13,7 +13,14 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 
 	if ($nbFiles > 0) {
 		print '<tr class="trattachnewfilenow'.(empty($tredited) ? ' oddeven nohover' : ' '.$tredited).'"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
-		print '<td colspan="'.$colspan.'">';
+
+		// Num line
+		if ($action == 'editline') {
+			print '<td></td>';
+		}
+
+		// Select image section
+		print '<td colspan="'.($action == 'editline' ? $colspan - 1 : $colspan).'">';
 		//print '<span class="opacitymedium">'.$langs->trans("AttachTheNewLineToTheDocument").'</span><br>';
 		$modulepart = 'expensereport'; $maxheightmini = 48;
 		$relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';
@@ -31,7 +38,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 				$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
 				if (empty($urlforhref)) {
 					$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($fileinfo['relativename'].'.'.strtolower($fileinfo['extension']));
-					print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
+					print '<a href="'.$urlforhref.'" class="aphoto" target="_blank" rel="noopener noreferrer">';
 				} else {
 					print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
 				}
@@ -78,7 +85,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 				}
 
 				if (empty($urlforhref) || empty($thumbshown)) {
-					print '<span href="" class="aphoto" target="_blank">';
+					print '<span href="" class="aphoto" target="_blank" rel="noopener noreferrer">';
 				} else {
 					print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
 				}
@@ -112,8 +119,8 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 			if (!empty($filenamelinked) && $filenamelinked == $file['relativename']) {
 				$checked = ' checked';
 			}
-			print '<div class="margintoponly minwidth150 maxwidth150"><input type="checkbox"'.$checked.' id="radio'.$filei.'" name="attachfile[]" class="checkboxattachfile" value="'.$file['relativename'].'">';
-			print '<label class="wordbreak checkboxattachfilelabel" for="radio'.$filei.'"> '.$file['relativename'].'</label>';
+			print '<div class="margintoponly minwidth150 maxwidth150 divoverflow"><input type="checkbox"'.$checked.' id="radio'.$filei.'" name="attachfile[]" class="checkboxattachfile valignmiddle" value="'.$file['relativename'].'">';
+			print '<label class="wordbreak checkboxattachfilelabel paddingrightonly valignmiddle" for="radio'.$filei.'" title="'.dol_escape_htmltag($file['relativename']).'">'.$file['relativename'].'</label>';
 			print '</div>';
 
 			print '</div>';
diff --git a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
index 31c5526903b..6a36b62f924 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 -->\n";
+print "<!-- BEGIN PHP TEMPLATE expensereport/tpl/linkedopjectblock.tpl.php -->\n";
 
 
 global $user;
@@ -47,7 +47,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		echo price($objectlink->total_ht);
 	} ?></td>
 	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
-	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 </tr>
 	<?php
 }
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 7eb88e4fbb3..c87f03f3110 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -178,7 +178,7 @@ class Export
 									// Code du dataset export
 									$this->array_export_code[$i] = $module->export_code[$r];
 									// Define a key for sort
-									$this->array_export_code_for_sort[$i] = $module->module_position.'_'.$module->export_code[$r];	// Add a key into the module
+									$this->array_export_code_for_sort[$i] = $module->module_position.'_'.$module->export_code[$r]; // Add a key into the module
 									// Libelle du dataset export
 									$this->array_export_label[$i] = $module->getExportDatasetLabel($r);
 									// Tableau des champ a exporter (cle=champ, valeur=libelle)
@@ -455,14 +455,14 @@ class Export
 				} else {
 					$keyList = 'rowid';
 				}
-				$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
+				$sql = "SELECT ".$keyList." as rowid, ".$InfoFieldList[2]." as label".(empty($InfoFieldList[3]) ? "" : ", ".$InfoFieldList[3]." as code");
 				if ($InfoFieldList[1] == 'c_stcomm') {
-					$sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
+					$sql = "SELECT id as id, ".$keyList." as rowid, ".$InfoFieldList[2]." as label".(empty($InfoFieldList[3]) ? "" : ", ".$InfoFieldList[3].' as code');
 				}
 				if ($InfoFieldList[1] == 'c_country') {
-					$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
+					$sql = "SELECT ".$keyList." as rowid, ".$InfoFieldList[2]." as label, code as code";
 				}
-				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[1];
+				$sql .= " FROM ".MAIN_DB_PREFIX.$InfoFieldList[1];
 				if (!empty($InfoFieldList[4])) {
 					$sql .= ' WHERE entity IN ('.getEntity($InfoFieldList[4]).')';
 				}
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index df03b6a1cdc..ae5629b733b 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -151,7 +151,6 @@ $sqlusedforexport = '';
 $head = array();
 $upload_dir = $conf->export->dir_temp.'/'.$user->id;
 
-//$usefilters=($conf->global->MAIN_FEATURES_LEVEL > 1);
 $usefilters = 1;
 
 // Security check
diff --git a/htdocs/externalsite/admin/index.php b/htdocs/externalsite/admin/index.php
index a9a41c5e555..0b55a297be9 100644
--- a/htdocs/externalsite/admin/index.php
+++ b/htdocs/externalsite/admin/index.php
@@ -56,9 +56,10 @@ if ($action == 'update') {
 
 	$label  = GETPOST('EXTERNALSITE_LABEL', 'alphanohtml');
 
-	$exturl = GETPOST('EXTERNALSITE_URL', 'none');
+	// exturl can be an url or a HTML string
+	$exturl = GETPOST('EXTERNALSITE_URL', 'restricthtml');
 	$exturl = dol_string_onlythesehtmltags($exturl, 1, 1, 0, 1);
-	$exturl = trim(dol_string_onlythesehtmlattributes($exturl));
+	$exturl = dol_string_onlythesehtmlattributes($exturl);
 
 	$i += dolibarr_set_const($db, 'EXTERNALSITE_LABEL', trim($label), 'chaine', 0, '', $conf->entity);
 	$i += dolibarr_set_const($db, 'EXTERNALSITE_URL', trim($exturl), 'chaine', 0, '', $conf->entity);
@@ -109,9 +110,9 @@ print '<tr class="oddeven">';
 print '<td class="fieldrequired">'.$langs->trans("ExternalSiteURL")."</td>";
 print '<td><textarea class="flat minwidth500" name="EXTERNALSITE_URL">';
 
-$exturl = GETPOST('EXTERNALSITE_URL', 'none');
+$exturl = GETPOST('EXTERNALSITE_URL', 'restricthtml');
 $exturl = dol_string_onlythesehtmltags($exturl, 1, 1, 0, 1);
-$exturl = trim(dol_string_onlythesehtmlattributes($exturl));
+$exturl = dol_string_onlythesehtmlattributes($exturl);
 
 print (GETPOSTISSET('EXTERNALSITE_URL') ? $exturl : (empty($conf->global->EXTERNALSITE_URL) ? '' : $conf->global->EXTERNALSITE_URL));
 print '</textarea></td>';
@@ -124,9 +125,7 @@ print "</tr>";
 print "</table>";
 
 
-print '<br><div class="center">';
-print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">';
-print '</div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print "</form>\n";
 
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index 04b48ba3cad..7462dd82c35 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -35,7 +35,7 @@ $langs->load("externalsite");
 $mainmenu = GETPOST('mainmenu', "aZ09");
 $leftmenu = GETPOST('leftmenu', "aZ09");
 $idmenu = GETPOST('idmenu', 'int');
-$theme = GETPOST('theme', 'alpha');
+$theme = GETPOST('theme', 'aZ09');
 $codelang = GETPOST('lang', 'aZ09');
 $keyforcontent = GETPOST('keyforcontent', 'aZ09');
 
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 260bff00016..0953d314202 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -68,7 +68,7 @@ if ($page == -1) {
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 if ($sortorder == "") {
 	$sortorder = "DESC";
@@ -436,10 +436,8 @@ if ($action == 'create') {
 
 		print dol_get_fiche_end();
 
-		print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Create").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-		print '</div>';
+		print $form->buttonsSaveCancel("Create");
+
 		print "</form>\n";
 	} else {
 		dol_print_error('', "Error, no fichinter ".$object->id);
@@ -457,11 +455,9 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
 	print '<input type="hidden" name="action" value="createfrommodel">';
 	print '<input type="hidden" name="id" value="'.$id.'">';
-	print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel("CreateDraftIntervention", '');
 
 	print '</form>';
 } else {
@@ -494,7 +490,7 @@ if ($action == 'create') {
 				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 				if ($user->rights->ficheinter->creer) {
 					if ($action != 'classify') {
-						$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">';
+						$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">';
 						$morehtmlref .= img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 					}
 					if ($action == 'classify') {
@@ -511,10 +507,10 @@ if ($action == 'create') {
 					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.'"';
-						$morehtmlref .= 'title="'.$langs->trans('ShowProject').'">';
-						$morehtmlref .= $proj->ref;
-						$morehtmlref .= '</a>';
+						$morehtmlref .= ' : '.$proj->getNomUrl(1);
+						if ($proj->title) {
+							$morehtmlref .= ' - '.$proj->title;
+						}
 					} else {
 						$morehtmlref .= '';
 					}
@@ -577,7 +573,6 @@ if ($action == 'create') {
 			print '</div>';
 
 			print '<div class="fichehalfright">';
-			print '<div class="ficheaddleft">';
 			print '<div class="underbanner clearboth"></div>';
 
 			$title = $langs->trans("Recurrence");
@@ -591,7 +586,7 @@ if ($action == 'create') {
 			print $langs->trans('Frequency');
 			print '</td>';
 			if ($action != 'editfrequency' && $user->rights->ficheinter->creer) {
-				print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editfrequency&amp;id='.$id.'">';
+				print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editfrequency&token='.newToken().'&id='.$id.'">';
 				print img_edit($langs->trans('Edit'), 1).'</a></td>';
 			}
 			print '</tr></table>';
@@ -605,7 +600,7 @@ if ($action == 'create') {
 				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" value="'.$langs->trans("Modify").'"></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) {
@@ -678,7 +673,6 @@ if ($action == 'create') {
 				print '<br>';
 			}
 
-			print '</div>';
 			print '</div>';
 			print '</div>';
 
@@ -765,7 +759,7 @@ if ($action == 'create') {
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."fichinter_rec as f";
 		$sql .= " , ".MAIN_DB_PREFIX."societe as s ";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " , ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE f.fk_soc = s.rowid";
@@ -773,7 +767,7 @@ if ($action == 'create') {
 		if ($socid) {
 			$sql .= " AND s.rowid = ".((int) $socid);
 		}
-		if (!$user->rights->societe->client->voir && !$socid) {
+		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) {
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 225f9ebacb8..a58a62b5ffd 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -51,7 +51,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('bills', 'companies', 'interventions'));
+$langs->loadLangs(array('bills', 'companies', 'interventions', 'stocks'));
 
 $id			= GETPOST('id', 'int');
 $ref		= GETPOST('ref', 'alpha');
@@ -66,17 +66,13 @@ $originid = (GETPOST('originid', 'int') ?GETPOST('originid', 'int') : GETPOST('o
 $note_public = GETPOST('note_public', 'restricthtml');
 $lineid = GETPOST('line_id', 'int');
 
+$error = 0;
+
 //PDF
 $hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
 $hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
 $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
-// Security check
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
-
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('interventioncard', 'globalcard'));
 
@@ -96,11 +92,15 @@ if ($id > 0 || !empty($ref)) {
 	}
 }
 
+// Security check
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
+
 $permissionnote = $user->rights->ficheinter->creer; // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $user->rights->ficheinter->creer; // Used by the include of actions_dellink.inc.php
 
-$error = 0;
-
 
 /*
  * Actions
@@ -113,8 +113,23 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/fichinter/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.'/fichinter/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
 	if ($cancel) {
-		if (!empty($backtopage)) {
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -822,6 +837,10 @@ if ($action == 'create') {
 			$note_private = (!empty($objectsrc->note) ? $objectsrc->note : (!empty($objectsrc->note_private) ? $objectsrc->note_private : GETPOST('note_private', 'restricthtml')));
 			$note_public = (!empty($objectsrc->note_public) ? $objectsrc->note_public : GETPOST('note_public', 'restricthtml'));
 
+			// Replicate extrafields
+			$objectsrc->fetch_optionals();
+			$object->array_options = $objectsrc->array_options;
+
 			// Object source contacts list
 			$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
 		}
@@ -977,11 +996,7 @@ if ($action == 'create') {
 
 		print dol_get_fiche_end();
 
-		print '<div class="center">';
-		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-		print '</div>';
+		print $form->buttonsSaveCancel("CreateDraftIntervention");
 
 		// Show origin lines
 		if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
@@ -999,6 +1014,7 @@ if ($action == 'create') {
 	} else {
 		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="create">';		// We go back to create action
 
 		print dol_get_fiche_head('');
 
@@ -1017,12 +1033,7 @@ if ($action == 'create') {
 
 		print dol_get_fiche_end();
 
-		print '<div class="center">';
-		print '<input type="hidden" name="action" value="create">';
-		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-		print '</div>';
+		print $form->buttonsSaveCancel("CreateDraftIntervention");
 
 		print '</form>';
 	}
@@ -1079,7 +1090,7 @@ if ($action == 'create') {
 
 	// Confirm back to open
 	if ($action == 'reopen') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Reopen'), $langs->trans('ConfirmReopenIntervention', $object->ref), 'confirm_reopen', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $langs->trans('ConfirmReopenIntervention', $object->ref), 'confirm_reopen', '', 0, 1);
 	}
 
 	// Confirm deletion of line
@@ -1131,7 +1142,7 @@ if ($action == 'create') {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->ficheinter->creer) {
 			if ($action != 'classify') {
-				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				$morehtmlref .= '<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);
@@ -1139,7 +1150,7 @@ if ($action == 'create') {
 				$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 .= '<input type="submit" class="button button-edit 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);
@@ -1148,9 +1159,10 @@ if ($action == 'create') {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
@@ -1239,7 +1251,6 @@ if ($action == 'create') {
 
 	print '</div>';
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border tableforfield centpercent">';
@@ -1253,7 +1264,6 @@ if ($action == 'create') {
 
 	print "</table>";
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
@@ -1288,7 +1298,7 @@ if ($action == 'create') {
 		$sql = 'SELECT ft.rowid, ft.description, ft.fk_fichinter, ft.duree, ft.rang,';
 		$sql .= ' ft.date as date_intervention';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
-		$sql .= ' WHERE ft.fk_fichinter = '.$object->id;
+		$sql .= ' WHERE ft.fk_fichinter = '.((int) $object->id);
 		if (!empty($conf->global->FICHINTER_HIDE_EMPTY_DURATION)) {
 			$sql .= ' AND ft.duree <> 0';
 		}
@@ -1343,21 +1353,21 @@ if ($action == 'create') {
 					// Icon to edit and delete
 					if ($object->statut == 0 && $user->rights->ficheinter->creer) {
 						print '<td class="center">';
-						print '<a class="editfielda marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;line_id='.$objp->rowid.'#'.$objp->rowid.'">';
+						print '<a class="editfielda marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editline&token='.newToken().'&line_id='.$objp->rowid.'#'.$objp->rowid.'">';
 						print img_edit();
 						print '</a>';
-						print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=ask_deleteline&amp;line_id='.$objp->rowid.'">';
+						print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=ask_deleteline&token='.newToken().'&line_id='.$objp->rowid.'">';
 						print img_delete();
 						print '</a></td>';
 						print '<td class="center">';
 						if ($num > 1) {
 							if ($i > 0) {
-								print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=up&amp;line_id='.$objp->rowid.'">';
+								print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=up&token='.newToken().'&line_id='.$objp->rowid.'">';
 								print img_up();
 								print '</a>';
 							}
 							if ($i < $num - 1) {
-								print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=down&amp;line_id='.$objp->rowid.'">';
+								print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=down&token='.newToken().'&line_id='.$objp->rowid.'">';
 								print img_down();
 								print '</a>';
 							}
@@ -1500,7 +1510,7 @@ if ($action == 'create') {
 				}
 				print '</td>';
 
-				print '<td class="center" valign="middle" colspan="3"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline"></td>';
+				print '<td class="center" valign="middle" colspan="3"><input type="submit" class="button button-add" value="'.$langs->trans('Add').'" name="addline"></td>';
 				print '</tr>';
 
 				//Line extrafield
@@ -1566,7 +1576,7 @@ if ($action == 'create') {
 				// Reopen
 				if ($object->statut >= Fichinter::STATUS_CLOSED) {
 					if ($user->rights->ficheinter->creer) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen">'.$langs->trans('Reopen').'</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans('Reopen').'</a></div>';
 					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Reopen').'</a></div>';
 					}
@@ -1576,7 +1586,7 @@ if ($action == 'create') {
 				if (empty($user->socid)) {
 					if ($object->statut > Fichinter::STATUS_DRAFT) {
 						if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send) {
-							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
+							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
 						} else {
 							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
 						}
@@ -1615,26 +1625,26 @@ if ($action == 'create') {
 
 					if (!empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {    // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
 						if ($object->statut != Fichinter::STATUS_BILLED) {
-							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("InterventionClassifyBilled").'</a></div>';
+							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifybilled&token='.newToken().'">'.$langs->trans("InterventionClassifyBilled").'</a></div>';
 						} else {
-							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifyunbilled">'.$langs->trans("InterventionClassifyUnBilled").'</a></div>';
+							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifyunbilled&token='.newToken().'">'.$langs->trans("InterventionClassifyUnBilled").'</a></div>';
 						}
 					}
 				}
 
 				// Done
 				if (empty($conf->global->FICHINTER_CLASSIFY_BILLED) && $object->statut > Fichinter::STATUS_DRAFT && $object->statut < Fichinter::STATUS_CLOSED) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifydone">'.$langs->trans("InterventionClassifyDone").'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifydone&token='.newToken().'">'.$langs->trans("InterventionClassifyDone").'</a></div>';
 				}
 
 				// Clone
 				if ($user->rights->ficheinter->creer) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=ficheinter">'.$langs->trans("ToClone").'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&token='.newToken().'&object=ficheinter">'.$langs->trans("ToClone").'</a></div>';
 				}
 
 				// Delete
 				if (($object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer) || $user->rights->ficheinter->supprimer) {
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'"';
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'"';
 					print '>'.$langs->trans('Delete').'</a></div>';
 				}
 			}
@@ -1661,14 +1671,14 @@ if ($action == 'create') {
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
 		$somethingshown = $formactions->showactions($object, 'fichinter', $socid, 1);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index 0c03da526a8..f96dc3d6aa7 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -151,8 +151,9 @@ class Interventions extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 371853dc70c..7a532998b1f 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -204,7 +204,7 @@ class Fichinter extends CommonObject
 		$sql = "SELECT count(fi.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as fi";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON fi.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
@@ -286,14 +286,14 @@ class Fichinter extends CommonObject
 		$sql .= $this->socid;
 		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ", '".$this->db->escape($this->ref)."'";
-		$sql .= ", ".$conf->entity;
-		$sql .= ", ".$user->id;
-		$sql .= ", ".$user->id;
+		$sql .= ", ".((int) $conf->entity);
+		$sql .= ", ".((int) $user->id);
+		$sql .= ", ".((int) $user->id);
 		$sql .= ", ".($this->description ? "'".$this->db->escape($this->description)."'" : "null");
 		$sql .= ", '".$this->db->escape($this->model_pdf)."'";
-		$sql .= ", ".($this->fk_project ? $this->fk_project : 0);
-		$sql .= ", ".($this->fk_contrat ? $this->fk_contrat : 0);
-		$sql .= ", ".$this->statut;
+		$sql .= ", ".($this->fk_project ? ((int) $this->fk_project) : 0);
+		$sql .= ", ".($this->fk_contrat ? ((int) $this->fk_contrat) : 0);
+		$sql .= ", ".((int) $this->statut);
 		$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
 		$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
 		$sql .= ")";
@@ -430,9 +430,9 @@ class Fichinter extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
 		if ($ref) {
 			$sql .= " WHERE f.entity IN (".getEntity('intervention').")";
-			$sql .= " AND f.ref='".$this->db->escape($ref)."'";
+			$sql .= " AND f.ref = '".$this->db->escape($ref)."'";
 		} else {
-			$sql .= " WHERE f.rowid=".((int) $rowid);
+			$sql .= " WHERE f.rowid = ".((int) $rowid);
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -1004,7 +1004,7 @@ class Fichinter extends CommonObject
 		if (!$error) {
 			// Delete object
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinter";
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog("Fichinter::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -1066,7 +1066,7 @@ class Fichinter extends CommonObject
 		if ($user->rights->ficheinter->creer) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
 			$sql .= " SET datei = '".$this->db->idate($date_delivery)."'";
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			$sql .= " AND fk_statut = 0";
 
 			if ($this->db->query($sql)) {
@@ -1097,7 +1097,7 @@ class Fichinter extends CommonObject
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
 			$sql .= " SET description = '".$this->db->escape($description)."',";
 			$sql .= " fk_user_modif = ".$user->id;
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			if ($this->db->query($sql)) {
 				$this->description = $description;
@@ -1127,7 +1127,7 @@ class Fichinter extends CommonObject
 		if ($user->rights->ficheinter->creer) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
 			$sql .= " SET fk_contrat = ".((int) $contractid);
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			if ($this->db->query($sql)) {
 				$this->fk_contrat = $contractid;
@@ -1481,7 +1481,7 @@ class FichinterLigne extends CommonObjectLine
 		if ($rangToUse == -1) {
 			// Recupere rang max de la ligne d'intervention dans $rangmax
 			$sql = 'SELECT max(rang) as max FROM '.MAIN_DB_PREFIX.'fichinterdet';
-			$sql .= ' WHERE fk_fichinter ='.$this->fk_fichinter;
+			$sql .= ' WHERE fk_fichinter = '.((int) $this->fk_fichinter);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$obj = $this->db->fetch_object($resql);
@@ -1496,7 +1496,7 @@ class FichinterLigne extends CommonObjectLine
 		// Insertion dans base de la ligne
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'fichinterdet';
 		$sql .= ' (fk_fichinter, description, date, duree, rang)';
-		$sql .= " VALUES (".$this->fk_fichinter.",";
+		$sql .= " VALUES (".((int) $this->fk_fichinter).",";
 		$sql .= " '".$this->db->escape($this->desc)."',";
 		$sql .= " '".$this->db->idate($this->datei)."',";
 		$sql .= " ".((int) $this->duration).",";
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index 4fe35c32a2c..ee385cbc7a4 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -182,18 +182,18 @@ class FichinterRec extends Fichinter
 
 			$sql .= ") VALUES (";
 			$sql .= "'".$this->db->escape($this->title)."'";
-			$sql .= ", ".($this->socid > 0 ? $this->socid : 'null');
-			$sql .= ", ".$conf->entity;
+			$sql .= ", ".($this->socid > 0 ? ((int) $this->socid) : 'null');
+			$sql .= ", ".((int) $conf->entity);
 			$sql .= ", '".$this->db->idate($now)."'";
-			$sql .= ", ".(!empty($fichintsrc->duration) ? $fichintsrc->duration : '0');
+			$sql .= ", ".(!empty($fichintsrc->duration) ? ((int) $fichintsrc->duration) : '0');
 			$sql .= ", ".(!empty($this->description) ? ("'".$this->db->escape($this->description)."'") : "null");
 			$sql .= ", ".(!empty($fichintsrc->note_private) ? ("'".$this->db->escape($fichintsrc->note_private)."'") : "null");
 			$sql .= ", ".(!empty($fichintsrc->note_public) ? ("'".$this->db->escape($fichintsrc->note_public)."'") : "null");
-			$sql .= ", ".$user->id;
+			$sql .= ", ".((int) $user->id);
 			// si c'est la même société on conserve les liens vers le projet et le contrat
 			if ($this->socid == $fichintsrc->socid) {
-				$sql .= ", ".(!empty($fichintsrc->fk_project) ? $fichintsrc->fk_project : "null");
-				$sql .= ", ".(!empty($fichintsrc->fk_contrat) ? $fichintsrc->fk_contrat : "null");
+				$sql .= ", ".(!empty($fichintsrc->fk_project) ? ((int) $fichintsrc->fk_project) : "null");
+				$sql .= ", ".(!empty($fichintsrc->fk_contrat) ? ((int) $fichintsrc->fk_contrat) : "null");
 			} else {
 				$sql .= ", null, null";
 			}
@@ -201,12 +201,12 @@ class FichinterRec extends Fichinter
 			$sql .= ", ".(!empty($fichintsrc->model_pdf) ? "'".$this->db->escape($fichintsrc->model_pdf)."'" : "''");
 
 			// récurrence
-			$sql .= ", ".(!empty($this->frequency) ? $this->frequency : "null");
+			$sql .= ", ".(!empty($this->frequency) ? ((int) $this->frequency) : "null");
 			$sql .= ", '".$this->db->escape($this->unit_frequency)."'";
 			$sql .= ", ".(!empty($this->date_when) ? "'".$this->db->idate($this->date_when)."'" : 'null');
 			$sql .= ", ".(!empty($this->date_last_gen) ? "'".$this->db->idate($this->date_last_gen)."'" : 'null');
 			$sql .= ", 0"; // we start à 0
-			$sql .= ", ".$this->nb_gen_max;
+			$sql .= ", ".((int) $this->nb_gen_max);
 			// $sql.= ", ".$this->auto_validate;
 			$sql .= ")";
 
@@ -279,9 +279,9 @@ class FichinterRec extends Fichinter
 		$sql .= ', f.note_private, f.note_public, f.fk_user_author';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinter_rec as f';
 		if ($rowid > 0) {
-			$sql .= ' WHERE f.rowid='.$rowid;
+			$sql .= " WHERE f.rowid = ".((int) $rowid);
 		} elseif ($ref) {
-			$sql .= " WHERE f.titre='".$this->db->escape($ref)."'";
+			$sql .= " WHERE f.titre = '".$this->db->escape($ref)."'";
 		}
 
 		dol_syslog(get_class($this)."::fetch rowid=".$rowid, LOG_DEBUG);
@@ -356,7 +356,7 @@ class FichinterRec extends Fichinter
 		$sql .= ' p.label as product_label, p.description as product_desc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinterdet_rec as l';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-		$sql .= ' WHERE l.fk_fichinter = '.$this->id;
+		$sql .= ' WHERE l.fk_fichinter = '.((int) $this->id);
 
 		dol_syslog('FichInter-rec::fetch_lines', LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -599,7 +599,7 @@ class FichinterRec extends Fichinter
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter_rec ";
 			$sql .= " SET frequency='".$this->db->escape($freq)."'";
 			$sql .= ", date_last_gen='".$this->db->escape($courant)."'";
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			$resql = $this->db->query($sql);
 
@@ -718,7 +718,7 @@ class FichinterRec extends Fichinter
 		if (!empty($unit)) {
 			$sql .= ', unit_frequency = "'.$this->db->escape($unit).'"';
 		}
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::setFrequencyAndUnit", LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -751,7 +751,7 @@ class FichinterRec extends Fichinter
 		if ($increment_nb_gen_done > 0) {
 			$sql .= ', nb_gen_done = nb_gen_done + 1';
 		}
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::setNextDate", LOG_DEBUG);
 		if ($this->db->query($sql)) {
@@ -844,7 +844,7 @@ class FichinterRec extends Fichinter
 			$sql .= ' , statut = 1';
 		}
 
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::setAutoValidate", LOG_DEBUG);
 		if ($this->db->query($sql)) {
diff --git a/htdocs/fichinter/class/fichinterstats.class.php b/htdocs/fichinter/class/fichinterstats.class.php
index 297aeca7760..f6fbdb8d305 100644
--- a/htdocs/fichinter/class/fichinterstats.class.php
+++ b/htdocs/fichinter/class/fichinterstats.class.php
@@ -72,7 +72,7 @@ class FichinterStats extends Stats
 			$this->field_line = '0';
 			//$this->where.= " AND c.fk_statut > 0";    // Not draft and not cancelled
 		}
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		$this->where .= ($this->where ? ' AND ' : '')."c.entity IN (".getEntity('fichinter').')';
@@ -98,7 +98,7 @@ class FichinterStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
@@ -122,7 +122,7 @@ class FichinterStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, 0";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE ".$this->where;
@@ -145,7 +145,7 @@ class FichinterStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%m') as dm, 0";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
@@ -169,7 +169,7 @@ class FichinterStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%m') as dm, 0";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
@@ -191,7 +191,7 @@ class FichinterStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, 0 as total, 0 as avg";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE ".$this->where;
@@ -214,7 +214,7 @@ class FichinterStats extends Stats
 
 		$sql = "SELECT product.ref, COUNT(product.ref) as nb, 0 as total, 0 as avg";
 		$sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
-		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		//if (empty($user->rights->societe->client->voir) && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE ".$this->where;
 		$sql .= " AND c.rowid = tl.fk_fichinter AND tl.fk_product = product.rowid";
 		$sql .= " AND c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index 7957479e611..f2f50963287 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -128,7 +128,7 @@ if ($id > 0 || !empty($ref)) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->ficheinter->creer) {
 			if ($action != 'classify') {
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -146,9 +146,10 @@ if ($id > 0 || !empty($ref)) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 71f52212978..7fdcaa151a0 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -78,6 +78,8 @@ $object->fetch($id, $ref);
 $upload_dir = $conf->ficheinter->dir_output.'/'.dol_sanitizeFileName($object->ref);
 $modulepart = 'fichinter';
 
+$permissiontoadd = $user->rights->ficheinter->creer; // Used by the include of actions_setnotes.inc.php
+
 
 /*
  * Actions
@@ -126,7 +128,7 @@ if ($object->id) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->commande->creer) {
 			if ($action != 'classify') {
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -144,9 +146,10 @@ if ($object->id) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 8513238b385..0f0fc0acc99 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -74,15 +74,15 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 $sql = "SELECT count(f.rowid), f.fk_statut";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."fichinter as f";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE f.entity IN (".getEntity('intervention').")";
 $sql .= " AND f.fk_soc = s.rowid";
 if ($user->socid) {
-	$sql .= ' AND f.fk_soc = '.$user->socid;
+	$sql .= ' AND f.fk_soc = '.((int) $user->socid);
 }
-if (!$user->rights->societe->client->voir && !$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";
@@ -192,7 +192,7 @@ if (!empty($conf->ficheinter->enabled)) {
 	$sql = "SELECT f.rowid, f.ref, s.nom as name, s.rowid as socid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE f.entity IN (".getEntity('intervention').")";
@@ -201,7 +201,7 @@ if (!empty($conf->ficheinter->enabled)) {
 	if ($socid) {
 		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 
@@ -229,7 +229,7 @@ if (!empty($conf->ficheinter->enabled)) {
 }
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 $max = 5;
@@ -242,7 +242,7 @@ $sql = "SELECT f.rowid, f.ref, f.fk_statut, f.date_valid as datec, f.tms as date
 $sql .= " s.nom as name, s.rowid as socid";
 $sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE f.entity IN (".getEntity('intervention').")";
@@ -251,7 +251,7 @@ $sql .= " AND f.fk_soc = s.rowid";
 if ($socid) {
 	$sql .= " AND f.fk_soc = ".((int) $socid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " ORDER BY f.tms DESC";
@@ -315,7 +315,7 @@ if (!empty($conf->ficheinter->enabled)) {
 	$sql = "SELECT f.rowid, f.ref, f.fk_statut, s.nom as name, s.rowid as socid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE f.entity IN (".getEntity('intervention').")";
@@ -324,7 +324,7 @@ if (!empty($conf->ficheinter->enabled)) {
 	if ($socid) {
 		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	$sql .= " ORDER BY f.rowid DESC";
@@ -381,7 +381,7 @@ if (!empty($conf->ficheinter->enabled)) {
 	}
 }
 
-print '</div></div></div>';
+print '</div></div>';
 
 $parameters = array('user' => $user);
 $reshook = $hookmanager->executeHooks('dashboardInterventions', $parameters, $object); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php
index 39ac695f84e..e5eea9f846c 100644
--- a/htdocs/fichinter/info.php
+++ b/htdocs/fichinter/info.php
@@ -83,7 +83,7 @@ if (!empty($conf->projet->enabled)) {
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->commande->creer) {
 		if ($action != 'classify') {
-			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			$morehtmlref .= ' : ';
 		}
 		if ($action == 'classify') {
@@ -101,9 +101,10 @@ if (!empty($conf->projet->enabled)) {
 		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>';
+			$morehtmlref .= ' : '.$proj->getNomUrl(1);
+			if ($proj->title) {
+				$morehtmlref .= ' - '.$proj->title;
+			}
 		} else {
 			$morehtmlref .= '';
 		}
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 508eb984307..c61fa4b1393 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
@@ -231,7 +232,7 @@ if (!empty($conf->contrat->enabled)) {
 // 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
@@ -257,7 +258,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-if (!$user->rights->societe->client->voir && empty($socid)) {
+if (empty($user->rights->societe->client->voir) && empty($socid)) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
@@ -285,7 +286,7 @@ if ($search_desc) {
 if ($search_status != '' && $search_status >= 0) {
 	$sql .= ' AND f.fk_statut = '.urlencode($search_status);
 }
-if (!$user->rights->societe->client->voir && empty($socid)) {
+if (empty($user->rights->societe->client->voir) && empty($socid)) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if ($socid) {
@@ -739,6 +740,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 			if (!$i) {
+				$totalarray['type'][$totalarray['nbfield']] = 'duration';
 				$totalarray['pos'][$totalarray['nbfield']] = 'fd.duree';
 			}
 			$totalarray['val']['fd.duree'] += $obj->duree;
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index fcc790bf8c2..579760cf55f 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -42,6 +42,7 @@ $action = GETPOST('action', 'aZ09');
 if ($user->socid) {
 	$socid = $user->socid;
 }
+$hookmanager->initHooks(array('fichinternote'));
 $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
 $object = new Fichinter($db);
@@ -53,7 +54,13 @@ $permissionnote = $user->rights->ficheinter->creer; // Used by the include of ac
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$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
+}
 
 
 /*
@@ -86,7 +93,7 @@ if ($id > 0 || !empty($ref)) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->commande->creer) {
 			if ($action != 'classify') {
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -104,9 +111,10 @@ if ($id > 0 || !empty($ref)) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index 7a7adb639b3..9e49d9bc4b5 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -79,7 +79,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filenamenb = $dir.'/interventionsnbinyear-'.$user->id.'-'.$year.'.png';
 	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
@@ -114,7 +114,7 @@ if (!$mesg) {
 $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filenameamount = $dir.'/interventionsamountinyear-'.$user->id.'-'.$year.'.png';
 	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$user->id.'-'.$year.'.png';
 } else {
@@ -148,7 +148,7 @@ if (!$mesg) {
 
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filename_avg = $dir.'/interventionsaverage-'.$user->id.'-'.$year.'.png';
 	$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$user->id.'-'.$year.'.png';
 } else {
@@ -245,7 +245,7 @@ if (!in_array($nowyear, $arrayyears)) {
 	$arrayyears[$nowyear] = $nowyear;
 }
 arsort($arrayyears);
-print $form->selectarray('year', $arrayyears, $year, 0);
+print $form->selectarray('year', $arrayyears, $year, 0, 0, 0, '', 0, 0, 0, '', 'width75');
 print '</td></tr>';
 print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
@@ -300,7 +300,7 @@ print '</table>';
 print '</div>';
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 // Show graphs
@@ -317,7 +317,7 @@ if ($mesg) {
 print '</td></tr></table>';
 
 
-print '</div></div></div>';
+print '</div></div>';
 print '<div style="clear:both"></div>';
 
 print dol_get_fiche_end();
diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
index ba754ec3321..e5903ee5863 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 -->\n";
+print "<!-- BEGIN PHP TEMPLATE fichinter/tpl/linkedopjectblock.tpl.php -->\n";
 
 
 global $user;
@@ -50,7 +50,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		<td class="center"><?php echo dol_print_date($objectlink->datev, 'day'); ?></td>
 		<td></td>
 		<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
-		<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+		<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 	</tr>
 	<?php
 }
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 038810332bb..e14322a62e9 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', '14.0.5'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '16.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {
@@ -178,6 +178,19 @@ if (empty($dolibarr_strict_mode)) {
 
 define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root); // Filesystem core php (htdocs)
 
+if (!file_exists(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php")) {
+	print "Error: Dolibarr config file content seems to be not correctly defined.<br>\n";
+	print "Please run dolibarr setup by calling page <b>/install</b>.<br>\n";
+	exit;
+}
+
+
+// Included by default (must be before the CSRF check so wa can use the dol_syslog)
+include_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
+include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
+//print memory_get_usage();
+
+
 // Security: CSRF protection
 // This test check if referrer ($_SERVER['HTTP_REFERER']) is same web site than Dolibarr ($_SERVER['HTTP_HOST'])
 // when we post forms (we allow GET and HEAD to accept direct link from a particular page).
@@ -198,7 +211,6 @@ if (!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck)) {
 		if ($csrfattack) {
 			//print 'NOCSRFCHECK='.defined('NOCSRFCHECK').' REQUEST_METHOD='.$_SERVER['REQUEST_METHOD'].' HTTP_HOST='.$_SERVER['HTTP_HOST'].' HTTP_REFERER='.$_SERVER['HTTP_REFERER'];
 			// Note: We can't use dol_escape_htmltag here to escape output because lib functions.lib.ph is not yet loaded.
-			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 			dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"])?'':$_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (Bad referer).", LOG_WARNING);
 			print "Access refused by CSRF protection in main.inc.php. Referer of form (".htmlentities($_SERVER['HTTP_REFERER'], ENT_COMPAT, 'UTF-8').") is outside the server that serve this page (with method = ".htmlentities($_SERVER['REQUEST_METHOD'], ENT_COMPAT, 'UTF-8').").\n";
 			print "If you access your server behind a proxy using url rewriting, you might check that all HTTP headers are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file to remove this security check).\n";
@@ -335,18 +347,6 @@ if (!defined('ADODB_DATE_VERSION')) {
 	include_once ADODB_PATH.'adodb-time.inc.php';
 }
 
-if (!file_exists(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php")) {
-	print "Error: Dolibarr config file content seems to be not correctly defined.<br>\n";
-	print "Please run dolibarr setup by calling page <b>/install</b>.<br>\n";
-	exit;
-}
-
-
-// Included by default
-include_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
-include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
-//print memory_get_usage();
-
 // If password is encoded, we decode it. Note: When page is called for install, $dolibarr_main_db_pass may not be defined yet.
 if ((!empty($dolibarr_main_db_pass) && preg_match('/crypted:/i', $dolibarr_main_db_pass)) || !empty($dolibarr_main_db_encrypted_pass)) {
 	if (!empty($dolibarr_main_db_pass) && preg_match('/crypted:/i', $dolibarr_main_db_pass)) {
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index 889484cec44..6cfc4fbe7b9 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -95,11 +95,39 @@ if ($idprod > 0) {
 	if (!empty($conf->stock->enabled)) {
 		// Add price for pmp
 		$price = $producttmp->pmp;
-		$prices[] = array("id" => 'pmpprice', "price" => price2num($price), "label" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency), "title" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency)); // For price field, we must use price2num(), for label or title, price()
+		if (empty($price) && !empty($conf->global->PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY)) {
+			// get pmp for subproducts if any
+			$producttmp->get_sousproduits_arbo();
+			$prods_arbo=$producttmp->get_arbo_each_prod();
+			if (!empty($prods_arbo)) {
+				$price = 0;
+				foreach ($prods_arbo as $child) {
+					$sousprod = new Product($db);
+					$sousprod->fetch($child['id']);
+					$price += $sousprod->pmp;
+				}
+			}
+		}
+
+		$prices[] = array("id" => 'pmpprice', "price" => price2num($price), "label" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency), "title" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency));  // For price field, we must use price2num(), for label or title, price()
 	}
 
 	// Add price for costprice (at end)
 	$price = $producttmp->cost_price;
+	if (empty($price) && ! empty($conf->global->PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY)) {
+		// get costprice for subproducts if any
+		$producttmp->get_sousproduits_arbo();
+		$prods_arbo=$producttmp->get_arbo_each_prod();
+		if (!empty($prods_arbo)) {
+			$price = 0;
+			foreach ($prods_arbo as $child) {
+				$sousprod = new Product($db);
+				$sousprod->fetch($child['id']);
+				$price += $sousprod->cost_price;
+			}
+		}
+	}
+
 	$prices[] = array("id" => 'costprice', "price" => price2num($price), "label" => $langs->trans("CostPrice").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency), "title" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency)); // For price field, we must use price2num(), for label or title, price()
 }
 
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 866fd31318e..77932cf4e3d 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -54,7 +54,7 @@ $langs->loadLangs(array(
 ));
 
 $action = GETPOST('action', 'aZ09');
-$cancelbutton = GETPOST('cancel', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
 
 // Security check
 $id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
@@ -73,7 +73,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $hookmanager->initHooks(array('suppliercard', 'globalcard'));
 
 // Security check
-$result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
+$result = restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid', 0);
 
 if ($object->id > 0) {
 	if (!($object->fournisseur > 0) || empty($user->rights->fournisseur->lire)) {
@@ -93,7 +93,7 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
-	if ($cancelbutton) {
+	if ($cancel) {
 		$action = "";
 	}
 
@@ -212,7 +212,7 @@ if ($object->id > 0) {
 		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
 		$tmpcheck = $object->check_codefournisseur();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+			print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
 		}
 		print '</td>';
 		print '</tr>';
@@ -261,7 +261,7 @@ if ($object->id > 0) {
 	print $langs->trans('PaymentConditions');
 	print '<td>';
 	if (($action != 'editconditions') && $user->rights->societe->creer) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td>';
@@ -279,7 +279,7 @@ if ($object->id > 0) {
 	print $langs->trans('PaymentMode');
 	print '<td>';
 	if (($action != 'editmode') && $user->rights->societe->creer) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td>';
@@ -297,7 +297,7 @@ if ($object->id > 0) {
 	print $langs->trans("CustomerRelativeDiscountShort");
 	print '<td><td class="right">';
 	if ($user->rights->societe->creer && !$user->socid > 0) {
-		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
+		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'&action=create&token='.newToken().'">'.img_edit($langs->trans("Modify")).'</a>';
 	}
 	print '</td></tr></table>';
 	print '</td><td>'.($object->remise_supplier_percent ? '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_supplier_percent.'%</a>' : '').'</td>';
@@ -310,7 +310,7 @@ if ($object->id > 0) {
 	print $langs->trans("CustomerAbsoluteDiscountShort");
 	print '<td><td class="right">';
 	if ($user->rights->societe->creer && !$user->socid > 0) {
-		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.img_edit($langs->trans("Modify")).'</a>';
+		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'&action=create&token='.newToken().'">'.img_edit($langs->trans("Modify")).'</a>';
 	}
 	print '</td></tr></table>';
 	print '</td>';
@@ -320,7 +320,7 @@ if ($object->id > 0) {
 		dol_print_error($db, $object->error);
 	}
 	if ($amount_discount > 0) {
-		print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency).'</a>';
+		print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'&action=create&token='.newToken().'">'.price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency).'</a>';
 	}
 	//else print $langs->trans("DiscountNone");
 	print '</td>';
@@ -371,7 +371,7 @@ if ($object->id > 0) {
 	print '</table>';
 
 
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright">';
 
 	$boxstat = '';
 
@@ -385,7 +385,7 @@ if ($object->id > 0) {
 	$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">';
 
-	if ($conf->supplier_proposal->enabled) {
+	if (!empty($conf->supplier_proposal->enabled)) {
 		// Box proposals
 		$tmp = $object->getOutstandingProposals('supplier');
 		$outstandingOpened = $tmp['opened'];
@@ -428,6 +428,7 @@ if ($object->id > 0) {
 	}
 
 	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled)) {
+		$warn = '';
 		$tmp = $object->getOutstandingBills('supplier');
 		$outstandingOpened = $tmp['opened'];
 		$outstandingTotal = $tmp['total_ht'];
@@ -519,7 +520,7 @@ if ($object->id > 0) {
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'product_fournisseur_price as pfp';
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = pfp.fk_product";
 		$sql .= ' WHERE p.entity IN ('.getEntity('product').')';
-		$sql .= ' AND pfp.fk_soc = '.$object->id;
+		$sql .= ' AND pfp.fk_soc = '.((int) $object->id);
 		$sql .= $db->order('pfp.tms', 'desc');
 		$sql .= $db->plimit($MAXLIST);
 
@@ -530,10 +531,11 @@ if ($object->id > 0) {
 
 		$num = $db->num_rows($query);
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent lastrecordtable">';
 		print '<tr class="liste_titre'.(($num == 0) ? ' nobottom' : '').'">';
 		print '<td colspan="3">'.$langs->trans("ProductsAndServices").'</td><td class="right">';
-		print '<a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/product/list.php?fourn_id='.$object->id.'">'.$langs->trans("AllProductReferencesOfSupplier").'<span class="badge marginleftonlyshort">'.$object->nbOfProductRefs().'</span>';
+		print '<a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/product/list.php?fourn_id='.$object->id.'"><span class="hideonsmartphone">'.$langs->trans("AllProductReferencesOfSupplier").'</span><span class="badge marginleftonlyshort">'.$object->nbOfProductRefs().'</span>';
 		print '</a></td></tr>';
 
 		$return = array();
@@ -555,7 +557,7 @@ if ($object->id > 0) {
 				print $productstatic->getNomUrl(1);
 				print '</td>';
 				print '<td>';
-				print $objp->supplier_ref;
+				print dol_escape_htmltag($objp->supplier_ref);
 				print '</td>';
 				print '<td class="maxwidthonsmartphone">';
 				print dol_trunc(dol_htmlentities($objp->label), 30);
@@ -564,7 +566,7 @@ if ($object->id > 0) {
 				print '<td class="right">';
 				//print (isset($objp->unitprice) ? price($objp->unitprice) : '');
 				if (isset($objp->price)) {
-					print price($objp->price);
+					print '<span class="amount">'.price($objp->price).'</span>';
 					if ($objp->quantity > 1) {
 						print ' / ';
 						print $objp->quantity;
@@ -576,6 +578,7 @@ if ($object->id > 0) {
 		}
 
 		print '</table>';
+		print '</div>';
 	}
 
 
@@ -584,12 +587,12 @@ if ($object->id > 0) {
 	 */
 	$proposalstatic = new SupplierProposal($db);
 
-	if ($user->rights->supplier_proposal->lire) {
+	if (!empty($user->rights->supplier_proposal->lire)) {
 		$langs->loadLangs(array("supplier_proposal"));
 
 		$sql = "SELECT p.rowid, p.ref, p.date_valid as dc, p.fk_statut, p.total_ht, p.total_tva, p.total_ttc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p ";
-		$sql .= " WHERE p.fk_soc =".$object->id;
+		$sql .= " WHERE p.fk_soc = ".((int) $object->id);
 		$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
 		$sql .= " ORDER BY p.date_valid DESC";
 		$sql .= $db->plimit($MAXLIST);
@@ -600,12 +603,13 @@ if ($object->id > 0) {
 			$num = $db->num_rows($resql);
 
 			if ($num > 0) {
+				print '<div class="div-table-responsive-no-min">';
 				print '<table class="noborder centpercent lastrecordtable">';
 
 				print '<tr class="liste_titre">';
 				print '<td colspan="3">';
 				print '<table class="nobordernopadding centpercent"><tr><td>'.$langs->trans("LastSupplierProposals", ($num < $MAXLIST ? "" : $MAXLIST)).'</td>';
-				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->id.'">'.$langs->trans("AllPriceRequests").'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
+				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->id.'"><span class="hideonsmartphone">'.$langs->trans("AllPriceRequests").'</span><span class="badge marginleftonlyshort">'.$num.'</span></td>';
 				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/supplier_proposal/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
 				print '</tr></table>';
 				print '</td></tr>';
@@ -637,7 +641,7 @@ if ($object->id > 0) {
 			$db->free($resql);
 
 			if ($num > 0) {
-				print "</table>";
+				print "</table></div>";
 			}
 		} else {
 			dol_print_error($db);
@@ -658,7 +662,7 @@ if ($object->id > 0) {
 		$sql2 .= ', '.MAIN_DB_PREFIX.'commande_fournisseur as c';
 		$sql2 .= ' WHERE c.fk_soc = s.rowid';
 		$sql2 .= " AND c.entity IN (".getEntity('commande_fournisseur').")";
-		$sql2 .= ' AND s.rowid = '.$object->id;
+		$sql2 .= ' AND s.rowid = '.((int) $object->id);
 		// Show orders we can bill
 		if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS)) {
 			$sql2 .= " AND c.fk_statut IN (".$db->sanitize(CommandeFournisseur::STATUS_RECEIVED_COMPLETELY).")"; //  Must match filter in htdocs/fourn/commande/list.php
@@ -681,7 +685,7 @@ if ($object->id > 0) {
 		// TODO move to DAO class
 		$sql = "SELECT count(p.rowid) as total";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p";
-		$sql .= " WHERE p.fk_soc =".$object->id;
+		$sql .= " WHERE p.fk_soc = ".((int) $object->id);
 		$sql .= " AND p.entity IN (".getEntity('commande_fournisseur').")";
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -689,9 +693,9 @@ if ($object->id > 0) {
 			$num = $object_count->total;
 		}
 
-		$sql  = "SELECT p.rowid,p.ref, p.date_commande as dc, p.fk_statut, p.total_ht, p.total_tva, p.total_ttc";
+		$sql  = "SELECT p.rowid,p.ref, p.date_commande as date, p.fk_statut, p.total_ht, p.total_tva, p.total_ttc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p";
-		$sql .= " WHERE p.fk_soc =".$object->id;
+		$sql .= " WHERE p.fk_soc = ".((int) $object->id);
 		$sql .= " AND p.entity IN (".getEntity('commande_fournisseur').")";
 		$sql .= " ORDER BY p.date_commande DESC";
 		$sql .= $db->plimit($MAXLIST);
@@ -701,12 +705,13 @@ if ($object->id > 0) {
 			$i = 0;
 
 			if ($num > 0) {
+				print '<div class="div-table-responsive-no-min">';
 				print '<table class="noborder centpercent lastrecordtable">';
 
 				print '<tr class="liste_titre">';
-				print '<td colspan="3">';
+				print '<td colspan="4">';
 				print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans("LastSupplierOrders", ($num < $MAXLIST ? "" : $MAXLIST)).'</td>';
-				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id.'">'.$langs->trans("AllOrders").'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
+				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id.'"><span class="hideonsmartphone">'.$langs->trans("AllOrders").'</span><span class="badge marginleftonlyshort">'.$num.'</span></td>';
 				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/commande/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
 				print '</tr></table>';
 				print '</td></tr>';
@@ -715,22 +720,23 @@ if ($object->id > 0) {
 			while ($i < $num && $i < $MAXLIST) {
 				$obj = $db->fetch_object($resql);
 
-				print '<tr class="oddeven">';
-				print '<td class="nowrap">';
 				$orderstatic->id = $obj->rowid;
 				$orderstatic->ref = $obj->ref;
 				$orderstatic->total_ht = $obj->total_ht;
 				$orderstatic->total_tva = $obj->total_tva;
 				$orderstatic->total_ttc = $obj->total_ttc;
+				$orderstatic->date = $db->jdate($obj->date);
+
+				print '<tr class="oddeven">';
+				print '<td class="nowraponall">';
 				print $orderstatic->getNomUrl(1);
 				print '</td>';
 				print '<td class="center" width="80">';
-				if ($obj->dc) {
-					print dol_print_date($db->jdate($obj->dc), 'day');
-				} else {
-					print "-";
+				if ($obj->date) {
+					print dol_print_date($orderstatic->date, 'day');
 				}
 				print '</td>';
+				print '<td class="right nowrap"><span class="amount">'.price($orderstatic->total_ttc).'</span></td>';
 				print '<td class="right" class="nowrap">'.$orderstatic->LibStatut($obj->fk_statut, 5).'</td>';
 				print '</tr>';
 				$i++;
@@ -738,7 +744,7 @@ if ($object->id > 0) {
 			$db->free($resql);
 
 			if ($num > 0) {
-				print "</table>";
+				print "</table></div>";
 			}
 		} else {
 			dol_print_error($db);
@@ -754,11 +760,11 @@ if ($object->id > 0) {
 
 	if ($user->rights->fournisseur->facture->lire) {
 		// TODO move to DAO class
-		$sql = 'SELECT f.rowid, f.libelle as label, f.ref, f.ref_supplier, f.fk_statut, f.datef as df, f.total_ht, f.total_tva, f.total_ttc as amount,f.paye,';
+		$sql = 'SELECT f.rowid, f.libelle as label, f.ref, f.ref_supplier, f.fk_statut, f.datef as df, f.total_ht, f.total_tva, f.total_ttc, f.paye,';
 		$sql .= ' SUM(pf.amount) as am';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON f.rowid=pf.fk_facturefourn';
-		$sql .= ' WHERE f.fk_soc = '.$object->id;
+		$sql .= ' WHERE f.fk_soc = '.((int) $object->id);
 		$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
 		$sql .= ' GROUP BY f.rowid,f.libelle,f.ref,f.ref_supplier,f.fk_statut,f.datef,f.total_ht,f.total_tva,f.total_ttc,f.paye';
 		$sql .= ' ORDER BY f.datef DESC';
@@ -767,11 +773,13 @@ if ($object->id > 0) {
 			$i = 0;
 			$num = $db->num_rows($resql);
 			if ($num > 0) {
+				print '<div class="div-table-responsive-no-min">';
 				print '<table class="noborder centpercent lastrecordtable">';
 
 				print '<tr class="liste_titre">';
 				print '<td colspan="4">';
-				print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('LastSuppliersBills', ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->id.'">'.$langs->trans('AllBills').'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
+				print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('LastSuppliersBills', ($num <= $MAXLIST ? "" : $MAXLIST)).'</td>';
+				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->id.'"><span class="hideonsmartphone">'.$langs->trans('AllBills').'</span><span class="badge marginleftonlyshort">'.$num.'</span></td>';
 				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
 				print '</tr></table>';
 				print '</td></tr>';
@@ -780,9 +788,6 @@ if ($object->id > 0) {
 			while ($i < min($num, $MAXLIST)) {
 				$obj = $db->fetch_object($resql);
 
-				print '<tr class="oddeven">';
-				print '<td>';
-				print '<a href="facture/card.php?facid='.$obj->rowid.'">';
 				$facturestatic->id = $obj->rowid;
 				$facturestatic->ref = ($obj->ref ? $obj->ref : $obj->rowid);
 				$facturestatic->ref_supplier = $obj->ref_supplier;
@@ -791,12 +796,16 @@ if ($object->id > 0) {
 				$facturestatic->total_ht = $obj->total_ht;
 				$facturestatic->total_tva = $obj->total_tva;
 				$facturestatic->total_ttc = $obj->total_ttc;
-				print $facturestatic->getNomUrl(1);
+				$facturestatic->date = $db->jdate($obj->df);
+
+				print '<tr class="oddeven">';
+				print '<td class="tdoverflowmax200">';
+				print '<span class="nowraponall">'.$facturestatic->getNomUrl(1).'</span>';
 				print $obj->ref_supplier ? ' - '.$obj->ref_supplier : '';
 				print ($obj->label ? ' - ' : '').dol_trunc($obj->label, 14);
 				print '</td>';
-				print '<td class="center nowrap">'.dol_print_date($db->jdate($obj->df), 'day').'</td>';
-				print '<td class="right nowrap">'.price($obj->amount).'</td>';
+				print '<td class="center nowrap">'.dol_print_date($facturestatic->date, 'day').'</td>';
+				print '<td class="right nowrap"><span class="amount">'.price($facturestatic->total_ttc).'</span></td>';
 				print '<td class="right nowrap">';
 				print $facturestatic->LibStatut($obj->paye, $obj->fk_statut, 5, $obj->am);
 				print '</td>';
@@ -805,14 +814,14 @@ if ($object->id > 0) {
 			}
 			$db->free($resql);
 			if ($num > 0) {
-				print '</table>';
+				print '</table></div>';
 			}
 		} else {
 			dol_print_error($db);
 		}
 	}
 
-	print '</div></div></div>';
+	print '</div></div>';
 	print '<div style="clear:both"></div>';
 
 	print dol_get_fiche_end();
@@ -831,7 +840,7 @@ if ($object->id > 0) {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
 		}
 
-		if ($conf->supplier_proposal->enabled && $user->rights->supplier_proposal->creer) {
+		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>';
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index df1bf36b723..06c836b4d77 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -159,8 +159,9 @@ class SupplierInvoices extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -201,6 +202,10 @@ class SupplierInvoices extends DolibarrApi
 	/**
 	 * Create supplier invoice object
 	 *
+	 * Note: soc_id = dolibarr_order_id
+	 *
+	 * Example: {'ref': 'auto', 'ref_supplier': '7985630', 'socid': 1, 'note': 'Inserted with Python', 'order_supplier': 1, 'date': '2021-07-28'}
+	 *
 	 * @param array $request_data Request datas
 	 *
 	 * @return int  ID of supplier invoice
@@ -525,6 +530,10 @@ class SupplierInvoices extends DolibarrApi
 	/**
 	 * Add a line to given supplier invoice
 	 *
+	 * Note: socid = dolibarr_order_id, pu_ht = net price, remise = discount
+	 *
+	 * Example: {'socid': 1, 'qty': 1, 'pu_ht': 21.0, 'tva_tx': 25.0, 'fk_product': '1189', 'product_type': 0, 'remise_percent': 1.0, 'vat_src_code': None}
+	 *
 	 * @param int   $id             Id of supplier invoice to update
 	 * @param array $request_data   supplier invoice line data
 	 *
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index f221035a2ab..e21eb3436dc 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -175,8 +175,9 @@ class SupplierOrders extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -368,6 +369,189 @@ class SupplierOrders extends DolibarrApi
 		);
 	}
 
+	/**
+	 * Approve an order
+	 *
+	 * @param   int $id             Order ID
+	 * @param   int $idwarehouse    Warehouse ID
+	 * @param   int $secondlevel      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/approve
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "idwarehouse": 0,
+	 *   "secondlevel": 0
+	 * }
+	 */
+	public function approve($id, $idwarehouse = 0, $secondlevel = 0)
+	{
+		if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->creer) && empty(DolibarrApiAccess::$user->rights->supplier_order->creer)) {
+			throw new RestException(401);
+		}
+		$result = $this->order->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, 'commande_fournisseur', 'commande')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->order->approve(DolibarrApiAccess::$user, $idwarehouse, $secondlevel);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already approved');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when approve Order: '.$this->order->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Order approved (Ref='.$this->order->ref.')'
+			)
+		);
+	}
+
+
+	/**
+	 * Sends an order to the vendor
+	 *
+	 * @param   int		$id             Order ID
+	 * @param   integer	$date		Date (unix timestamp in sec)
+	 * @param   int		$method		Method
+	 * @param  string	$comment	Comment
+	 *
+	 * @url POST    {id}/makeorder
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "date": 0,
+	 *   "method": 0,
+	 *   "comment": ""
+	 * }
+	 */
+	public function makeOrder($id, $date, $method, $comment = '')
+	{
+		if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->creer) && empty(DolibarrApiAccess::$user->rights->supplier_order->creer)) {
+			throw new RestException(401);
+		}
+		$result = $this->order->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, 'commande_fournisseur', 'commande')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->order->commande(DolibarrApiAccess::$user, $date, $method, $comment);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already sent');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when sending Order: '.$this->order->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Order sent (Ref='.$this->order->ref.')'
+			)
+		);
+	}
+
+		/**
+	 * Receives the order, dispatches products.
+		 *
+	 * Example:
+	 * <code> {
+	 *   "closeopenorder": 1,
+	 *   "comment": "",
+		 *   "lines": [{
+		 *      "id": 14,
+		 *      "fk_product": 112,
+		 *      "qty": 18,
+		 *      "warehouse": 1,
+		 *      "price": 114,
+		 *      "comment": "",
+		 *      "eatby": 0,
+		 *      "sellby": 0,
+		 *      "batch": 0,
+		 *      "notrigger": 0
+		 *   }]
+	 * }</code>
+		 *
+	 * @param   int		$id             Order ID
+	 * @param   integer	$closeopenorder	Close order if everything is received {@required false}
+	 * @param   string	$comment	Comment {@required false}
+	 * @param   array	$lines		Array of product dispatches
+	 *
+	 * @url POST    {id}/receive
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 *
+	 */
+	public function receiveOrder($id, $closeopenorder, $comment, $lines)
+	{
+		if (empty(DolibarrApiAccess::$user->rights->fournisseur->commande->creer) && empty(DolibarrApiAccess::$user->rights->supplier_order->creer)) {
+			throw new RestException(401);
+		}
+		$result = $this->order->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->order->id, 'commande_fournisseur', 'commande')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		foreach ($lines as $line) {
+			$lineObj =(object) $line;
+
+			$result=$this->order->dispatchProduct(DolibarrApiAccess::$user,
+				  $lineObj->fk_product,
+				  $lineObj->qty,
+				  $lineObj->warehouse,
+				  $lineObj->price,
+				  $lineObj->comment,
+				  $lineObj->eatby,
+				  $lineObj->sellby,
+				  $lineObj->batch,
+				  $lineObj->id,
+				  $lineObj->notrigger);
+
+			if ($result < 0) {
+				throw new RestException(500, 'Error dispatch order line '.$line->id.': '.$this->order->error);
+			}
+		}
+
+		$result = $this->order->calcAndSetStatusDispatch(DolibarrApiAccess::$user, $closeopenorder, $comment);
+
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already dispatched');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when receivce order: '.$this->order->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Order received (Ref='.$this->order->ref.')'
+			)
+		);
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Clean sensible object datas
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 121e699757c..b47cfa263c0 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -59,7 +59,7 @@ class Fournisseur extends Societe
 	{
 		$sql = "SELECT rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf";
-		$sql .= " WHERE cf.fk_soc = ".$this->id;
+		$sql .= " WHERE cf.fk_soc = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -113,7 +113,7 @@ class Fournisseur extends Societe
 
 		$sql = "SELECT count(s.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
@@ -178,12 +178,12 @@ class Fournisseur extends Societe
 
 		$sql = "SELECT s.rowid, s.nom as name";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE s.fournisseur = 1";
 		$sql .= " AND s.entity IN (".getEntity('societe').")";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index b86834ee206..aefb8741668 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -11,6 +11,7 @@
  * 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) 2021       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
@@ -111,6 +112,7 @@ class CommandeFournisseur extends CommonOrder
 	public $socid;
 	public $fourn_id;
 	public $date;
+	public $date_creation;
 	public $date_valid;
 	public $date_approve;
 	public $date_approve2; // Used when SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set
@@ -374,11 +376,16 @@ class CommandeFournisseur extends CommonOrder
 			$this->total_localtax1		= $obj->localtax1;
 			$this->total_localtax2		= $obj->localtax2;
 			$this->total_ttc			= $obj->total_ttc;
-			$this->date = $this->db->jdate($obj->date_creation);
+			$this->date_creation = $this->db->jdate($obj->date_creation);
 			$this->date_valid = $this->db->jdate($obj->date_valid);
 			$this->date_approve			= $this->db->jdate($obj->date_approve);
 			$this->date_approve2		= $this->db->jdate($obj->date_approve2);
 			$this->date_commande		= $this->db->jdate($obj->date_commande); // date we make the order to supplier
+			if (isset($obj->date_commande)) {
+				$this->date = $this->date_commande;
+			} else {
+				$this->date = $this->date_creation;
+			}
 			$this->date_livraison = $this->db->jdate($obj->delivery_date); // deprecated
 			$this->delivery_date = $this->db->jdate($obj->delivery_date);
 			$this->remise_percent = $obj->remise_percent;
@@ -460,7 +467,7 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= " l.vat_src_code, l.tva_tx, l.remise_percent, l.subprice,";
 		$sql .= " l.localtax1_tx, l. localtax2_tx, l.localtax1_type, l. localtax2_type, l.total_localtax1, l.total_localtax2,";
 		$sql .= " l.total_ht, l.total_tva, l.total_ttc, l.special_code, l.fk_parent_line, l.rang,";
-		$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc,";
+		$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc, p.tobatch as product_tobatch, p.barcode as product_barcode,";
 		$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';
@@ -472,7 +479,7 @@ class CommandeFournisseur extends CommonOrder
 		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 = ".$this->id;
+		$sql .= " WHERE l.fk_commande = ".((int) $this->id);
 		if ($only_product) {
 			$sql .= ' AND p.fk_product_type = 0';
 		}
@@ -516,6 +523,8 @@ class CommandeFournisseur extends CommonOrder
 				$line->libelle             = $objp->product_label; // deprecated
 				$line->product_label       = $objp->product_label;
 				$line->product_desc        = $objp->product_desc;
+				$line->product_tobatch     = $objp->product_tobatch;
+				$line->product_barcode     = $objp->product_barcode;
 
 				$line->ref                 = $objp->product_ref; // Ref of product
 				$line->product_ref         = $objp->product_ref; // Ref of product
@@ -624,7 +633,7 @@ class CommandeFournisseur extends CommonOrder
 				if (preg_match('/^[\(]?PROV/i', $this->ref)) {
 					// Now we rename also files into index
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'fournisseur/commande/".$this->db->escape($this->newref)."'";
-					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'fournisseur/commande/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'fournisseur/commande/".$this->db->escape($this->ref)."' and entity = ".((int) $conf->entity);
 					$resql = $this->db->query($sql);
 					if (!$resql) {
 						$error++; $this->error = $this->db->lasterror();
@@ -761,6 +770,7 @@ class CommandeFournisseur extends CommonOrder
 		if ($reshook > 0) {
 			return $hookmanager->resPrint;
 		}
+
 		return dolGetStatus($statusLong, $statusShort, '', $statusClass, $mode);
 	}
 
@@ -927,7 +937,7 @@ class CommandeFournisseur extends CommonOrder
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur SET billed = 1';
-		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
+		$sql .= " WHERE rowid = ".((int) $this->id).' AND fk_statut > '.self::STATUS_DRAFT;
 
 		if ($this->db->query($sql)) {
 			if (!$error) {
@@ -1332,14 +1342,14 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= ", '".$this->db->escape($this->ref_supplier)."'";
 		$sql .= ", '".$this->db->escape($this->note_private)."'";
 		$sql .= ", '".$this->db->escape($this->note_public)."'";
-		$sql .= ", ".$conf->entity;
-		$sql .= ", ".$this->socid;
-		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
+		$sql .= ", ".((int) $conf->entity);
+		$sql .= ", ".((int) $this->socid);
+		$sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : "null");
 		$sql .= ", '".$this->db->idate($date)."'";
 		$sql .= ", ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : "null");
-		$sql .= ", ".$user->id;
+		$sql .= ", ".((int) $user->id);
 		$sql .= ", ".self::STATUS_DRAFT;
-		$sql .= ", ".$this->db->escape($this->source);
+		$sql .= ", ".((int) $this->source);
 		$sql .= ", '".$this->db->escape($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)."'";
 		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'null');
 		$sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'null');
@@ -2008,6 +2018,8 @@ 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);
 					if ($result < 0) {
 						$this->error = $mouv->error;
@@ -2239,7 +2251,7 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= " FROM ".MAIN_DB_PREFIX."product as p,";
 		$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid";
-		$sql .= " WHERE cfd.fk_commande = ".$this->id;
+		$sql .= " WHERE cfd.fk_commande = ".((int) $this->id);
 		$sql .= " AND cfd.fk_product = p.rowid";
 		if ($status >= 0) {
 			$sql .= " AND cfd.status = ".((int) $status);
@@ -2271,7 +2283,6 @@ class CommandeFournisseur extends CommonOrder
 		return $ret;
 	}
 
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Set a delivery in database for this supplier order
@@ -2292,7 +2303,14 @@ class CommandeFournisseur extends CommonOrder
 
 		dol_syslog(get_class($this)."::Livraison");
 
-		if ($user->rights->fournisseur->commande->receptionner) {
+		$usercanreceive = 0;
+		if (empty($conf->reception->enabled)) {
+			$usercanreceive = $user->rights->fournisseur->commande->receptionner;
+		} else {
+			$usercanreceive = $user->rights->reception->creer;
+		}
+
+		if ($usercanreceive) {
 			// Define the new status
 			if ($type == 'par') {
 				$statut = self::STATUS_RECEIVED_PARTIALLY;
@@ -2540,10 +2558,10 @@ class CommandeFournisseur extends CommonOrder
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseurdet";
 			$sql .= " (fk_commande, label, description, fk_product, price, qty, tva_tx, localtax1_tx, localtax2_tx, remise_percent, subprice, remise, ref)";
-			$sql .= " VALUES (".$idc.", '".$this->db->escape($label)."', ".$this->db->escape($comclient->lines[$i]->desc);
-			$sql .= ",".$comclient->lines[$i]->fk_product.", ".price2num($comclient->lines[$i]->price);
-			$sql .= ", ".$comclient->lines[$i]->qty.", ".$comclient->lines[$i]->tva_tx.", ".$comclient->lines[$i]->localtax1_tx.", ".$comclient->lines[$i]->localtax2_tx.", ".$comclient->lines[$i]->remise_percent;
-			$sql .= ", '".price2num($comclient->lines[$i]->subprice)."','0', '".$this->db->escape($ref)."');";
+			$sql .= " VALUES (".((int) $idc).", '".$this->db->escape($label)."', '".$this->db->escape($comclient->lines[$i]->desc)."'";
+			$sql .= ",".$comclient->lines[$i]->fk_product.", ".price2num($comclient->lines[$i]->price, 'MU');
+			$sql .= ", ".price2num($comclient->lines[$i]->qty, 'MS').", ".price2num($comclient->lines[$i]->tva_tx, 5).", ".price2num($comclient->lines[$i]->localtax1_tx, 5).", ".price2num($comclient->lines[$i]->localtax2_tx, 5).", ".price2num($comclient->lines[$i]->remise_percent, 3);
+			$sql .= ", '".price2num($comclient->lines[$i]->subprice, 'MT')."','0', '".$this->db->escape($ref)."');";
 			if ($this->db->query($sql)) {
 				$this->update_price();
 			}
@@ -2567,8 +2585,8 @@ class CommandeFournisseur extends CommonOrder
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur';
-		$sql .= ' SET fk_statut='.$status;
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " SET fk_statut = ".$status;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::setStatus", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2962,7 +2980,7 @@ class CommandeFournisseur extends CommonOrder
 		$sql = "SELECT count(co.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as co";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
@@ -2998,10 +3016,10 @@ class CommandeFournisseur extends CommonOrder
 
 		$clause = " WHERE";
 
-		$sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.fk_statut, c.date_livraison as delivery_date";
+		$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 (!$user->rights->societe->client->voir && !$user->socid) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
+		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";
 		}
@@ -3033,12 +3051,13 @@ class CommandeFournisseur extends CommonOrder
 			}
 
 			while ($obj = $this->db->fetch_object($resql)) {
-				$response->nbtodo++;
-
 				$commandestatic->delivery_date = $this->db->jdate($obj->delivery_date);
 				$commandestatic->date_commande = $this->db->jdate($obj->date_commande);
 				$commandestatic->statut = $obj->fk_statut;
 
+				$response->nbtodo++;
+				$response->total += $obj->total_ht;
+
 				if ($commandestatic->hasDelay()) {
 					$response->nbtodolate++;
 				}
@@ -3298,7 +3317,6 @@ class CommandeFournisseur extends CommonOrder
 					$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);
@@ -3402,12 +3420,12 @@ class CommandeFournisseur extends CommonOrder
 			$sql .= ' cfd.fk_reception = e.rowid AND';
 		}
 		$sql .= ' cfd.fk_commandefourndet = cd.rowid';
-		$sql .= ' AND cd.fk_commande ='.$this->id;
+		$sql .= ' AND cd.fk_commande ='.((int) $this->id);
 		if ($this->fk_product > 0) {
-			$sql .= ' AND cd.fk_product = '.$this->fk_product;
+			$sql .= ' AND cd.fk_product = '.((int) $this->fk_product);
 		}
 		if ($filtre_statut >= 0) {
-			$sql .= ' AND e.fk_statut >= '.$filtre_statut;
+			$sql .= ' AND e.fk_statut >= '.((int) $filtre_statut);
 		}
 		$sql .= ' GROUP BY cd.rowid, cd.fk_product';
 
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index b2c4d101b74..7037cd94262 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -103,6 +103,7 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 	public $batch;
 	public $eatby = '';
 	public $sellby = '';
+	public $cost_price = 0;
 
 
 
@@ -189,7 +190,8 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 		$sql .= "batch,";
 		$sql .= "eatby,";
 		$sql .= "sellby,";
-		$sql .= "fk_reception";
+		$sql .= "fk_reception,";
+		$sql .= "cost_price";
 
 
 		$sql .= ") VALUES (";
@@ -205,7 +207,8 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 		$sql .= " ".(!isset($this->batch) ? 'NULL' : "'".$this->db->escape($this->batch)."'").",";
 		$sql .= " ".(!isset($this->eatby) || dol_strlen($this->eatby) == 0 ? 'NULL' : "'".$this->db->idate($this->eatby)."'").",";
 		$sql .= " ".(!isset($this->sellby) || dol_strlen($this->sellby) == 0 ? 'NULL' : "'".$this->db->idate($this->sellby)."'").",";
-		$sql .= " ".(!isset($this->fk_reception) ? 'NULL' : "'".$this->db->escape($this->fk_reception)."'")."";
+		$sql .= " ".(!isset($this->fk_reception) ? 'NULL' : "'".$this->db->escape($this->fk_reception)."'").",";
+		$sql .= " ".(!isset($this->cost_price) ? '0' : "'".$this->db->escape($this->cost_price)."'")."";
 		$sql .= ")";
 
 		$this->db->begin();
@@ -283,7 +286,7 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
 		if ($ref) {
-			$sql .= " WHERE t.ref = '".$ref."'";
+			$sql .= " WHERE t.ref = '".$this->db->escape($ref)."'";
 		} else {
 			$sql .= " WHERE t.rowid = ".((int) $id);
 		}
@@ -371,7 +374,6 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-
 		$sql .= " fk_commande=".(isset($this->fk_commande) ? $this->fk_commande : "null").",";
 		$sql .= " fk_product=".(isset($this->fk_product) ? $this->fk_product : "null").",";
 		$sql .= " fk_commandefourndet=".(isset($this->fk_commandefourndet) ? $this->fk_commandefourndet : "null").",";
@@ -385,8 +387,6 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 		$sql .= " batch=".(isset($this->batch) ? "'".$this->db->escape($this->batch)."'" : "null").",";
 		$sql .= " eatby=".(dol_strlen($this->eatby) != 0 ? "'".$this->db->idate($this->eatby)."'" : 'null').",";
 		$sql .= " sellby=".(dol_strlen($this->sellby) != 0 ? "'".$this->db->idate($this->sellby)."'" : 'null')."";
-
-
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$this->db->begin();
@@ -666,25 +666,25 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.comment') {
-					$sqlwhere [] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sqlwhere [] = $key." LIKE '%".$this->db->escape($value)."%'";
 				} elseif ($key == 't.datec' || $key == 't.tms' || $key == 't.eatby' || $key == 't.sellby' || $key == 't.batch') {
-					$sqlwhere [] = $key.' = \''.$this->db->escape($value).'\'';
+					$sqlwhere [] = $key." = '".$this->db->escape($value)."'";
 				} elseif ($key == 'qty') {
-					$sqlwhere [] = $key.' = '.((float) $value);
+					$sqlwhere [] = $key." = ".((float) $value);
 				} else {
-					$sqlwhere [] = $key.' = '.((int) $value);
+					$sqlwhere [] = $key." = ".((int) $value);
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE '.implode(' '.$filtermode.' ', $sqlwhere);
+			$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);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 		$this->lines = array();
 
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..f77db53e116
--- /dev/null
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -0,0 +1,2193 @@
+<?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
+{
+    /**
+     * @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 $amount;
+    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;
+
+    /* 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'=>1, '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),
+        '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),
+
+        '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'=>1, 'visible'=>-1, 'position'=>85),
+        'fk_account' =>array('type'=>'integer', 'label'=>'Fk account', 'enabled'=>1, '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
+     * @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;
+        $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 .= ', amount';
+            $sql .= ', remise';
+            $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;
+            if (!empty(GETPOST('libelle'))){
+                $sql .= ", '" . $this->db->escape(GETPOST('libelle')) . "'";
+            } elseif (! empty($this->libelle)) {
+                $sql .= ", '" . $this->db->escape($this->libelle) . "'";
+            } else {
+                $sql .= ", ''";
+            }
+            $sql .= ', ' .(!empty($facfourn_src->total_ttc) ? (float) $facfourn_src->total_ttc : '0');                              // amount
+            $sql .= ', ' .(!empty($facfourn_src->remise) ? (float) $facfourn_src->remise : '0');
+            $sql .= ', ' . (int) $user->id;
+            $sql .= ', ' .(!empty($this->fk_project) ? $this->fk_project : 'NULL');                                                 // Fields declarded on creation
+            $sql .= ', ' .(!empty($facfourn_src->fk_account) ? $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');                  // Fields declarded on creation         
+            $sql .= ', ' .(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : 'NULL');                    // Fields declarded on creation
+            $sql .= ', ' .(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : 'NULL');                        // Fields declarded on creation
+            $sql .= ', ' . (int) $facfourn_src->fk_multicurrency;
+            $sql .= ", '".$this->db->escape($facfourn_src->multicurrency_code)."'";                
+            $sql .= ', ' . (float) $facfourn_src->multicurrency_tx;                                
+            $sql .= ', ' . (int) $this->usenewprice;                                                                                      // Fields declarded on creation
+            $sql .= ', ' . (int) $this->frequency;                                                                                  // Fields declarded on creation
+            $sql .= ", '".$this->db->escape($this->unit_frequency)."'";                                                             // Fields declarded on creation
+            $sql .= ', ' .(!empty($this->date_when) ? "'".$this->db->idate($this->date_when)."'" : 'NULL');                         // Fields declarded on creation
+            $sql .= ', ' .(!empty($this->date_last_gen) ? "'".$this->db->idate($this->date_last_gen)."'" : 'NULL');                 // Fields declarded on creation
+            $sql .= ', ' . (int) $this->nb_gen_done;                                                                                      // Fields declarded on creation
+            $sql .= ', ' . (int) $this->nb_gen_max;                                                                                       // Fields declarded on creation
+            $sql .= ', ' . (int) $this->auto_validate;                                                                                    // Fields declarded on creation
+            $sql .= ', ' . (int) $this->generate_pdf;                                                                                     // Fields declarded on creation
+            $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->titre .'",' : '"",') ;
+        $sql .= ' ref_supplier = "'. (!empty($this->ref_supplier) ? $this->ref_supplier .'",' : '" ",');
+        $sql .= " entity = ". (!empty($this->entity) ? $this->entity : 1) . ',';
+        if ($this->fk_soc > 0) $sql .= " fk_soc = ". (int) $this->fk_soc. ',';
+        $sql .= ' tms = "'. date('Y-m-d H:i:s', dol_now()) . '",';
+        $sql .= " suspended = ". (!empty($this->suspended) ? $this->suspended : 0) . ',';
+        $sql .= ' libelle = "'. (!empty($this->libelle) ? $this->libelle : 'NULL') . '",';
+        $sql .= " amount = ". (!empty($this->amount) ? $this->amount : 0.00) . ',';
+        $sql .= " remise = ". (!empty($this->remise) ? $this->remise : 'NULL') . ',';
+        $sql .= " vat_src_code = ". (!empty($this->vat_src_code) ? $this->vat_src_code : 'NULL') . ',';
+        $sql .= " localtax1 = ". (!empty($this->localtax1) ? $this->localtax1 : 0.00) . ',';
+        $sql .= " localtax2 = ". (!empty($this->localtax2) ? $this->localtax2 : 0.00) . ',';
+        $sql .= " total_ht = ". (!empty($this->total_ht) ? $this->total_ht : 0.00) . ',';
+        $sql .= " total_tva = ". (!empty($this->total_tva) ? $this->total_tva : 0.00) . ',';
+        $sql .= " total_ttc = ". (!empty($this->total_ttc) ? $this->total_ttc : 0.00) . ',';
+        $sql .= " fk_user_modif = ". $user->id . ',';
+        $sql .= " fk_projet = ". (!empty($this->fk_project) ? $this->fk_project : 'NULL') . ',';
+        $sql .= " fk_account = ". (!empty($this->fk_account) ? $this->fk_account : 'NULL') . ',';
+        $sql .= " fk_mode_reglement = ". (!empty($this->mode_reglement_id) ? $this->mode_reglement_id : 'NULL') . ',';
+        $sql .= " fk_cond_reglement = ". (!empty($this->cond_reglement_id) ? $this->cond_reglement_id : 'NULL') . ',';
+        $sql .= " date_lim_reglement = ". (!empty($this->date_lim_reglement) ? '"'.date("Y-m-d H:i:s", $this->date_lim_reglement).'"' : 'NULL') . ',';
+        $sql .= ' note_private = "'. (!empty($this->note_private) ? $this->note_private : '') . '",';
+        $sql .= ' note_public = "'. (!empty($this->note_public) ? $this->note_public : '') . '",';
+        $sql .= ' modelpdf = "'. (!empty($this->model_pdf) ? $this->model_pdf : 'NULL') . '",';
+        $sql .= " fk_multicurrency = ". (!empty($this->fk_multicurrency) ? $this->fk_multicurrency : 'NULL') . ',';
+        $sql .= ' multicurrency_code = "'. (!empty($this->multicurrency_code) ? $this->multicurrency_code : 'NULL') . '",';
+        $sql .= " multicurrency_tx = ". (!empty($this->multicurrency_tx) ? $this->multicurrency_tx : 1) . ',';
+        $sql .= " multicurrency_total_ht = ". (!empty($this->multicurrency_total_ht) ? $this->multicurrency_total_ht : 0.00) . ',';
+        $sql .= " multicurrency_total_tva = ". (!empty($this->multicurrency_total_tva) ? $this->multicurrency_total_tva : 0.00) . ',';
+        $sql .= " multicurrency_total_ttc = ". (!empty($this->multicurrency_total_ttc) ? $this->multicurrency_total_ttc : 0.00) . ',';
+        $sql .= " usenewprice = ". (!empty($this->usenewprice) ? $this->usenewprice : 0) . ',';
+        $sql .= " frequency = ". (!empty($this->frequency) ? $this->frequency : 0). ',';
+        $sql .= ' unit_frequency = "'. (!empty($this->unit_frequency) ? $this->unit_frequency : 0). '",';
+        $sql .= " date_when = ". (!empty($this->date_when) ? '"'.date("Y-m-d H:i:s", $this->date_when).'"' : 0) . ',';
+        $sql .= " date_last_gen = ". (!empty($this->date_last_gen) ? '"'.date("Y-m-d H:i:s", $this->date_last_gen).'"' : 0) . ',';
+        $sql .= " nb_gen_done = ". (!empty($this->nb_gen_done) ? $this->nb_gen_done : 0) . ',';
+        $sql .= " nb_gen_max = ". (!empty($this->nb_gen_max) ? $this->nb_gen_max : 0) . ',';
+        $sql .= " auto_validate = ". (!empty($this->auto_validate) ? $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('BILLREC_UPDATE', $user);
+                if ($result < 0) {
+                    $this->db->rollback();
+                    return -2;
+                }
+                // End call triggers
+            }
+            $this->db->commit();
+            return 1;
+        } else {
+            $this->error = $this->db->lasterror();
+            $this->db->rollback();
+            return -2;
+        }
+    }
+
+    /**
+     *	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, f.amount, f.remise';
+        $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, 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);
+
+                $this->id                       = $obj->rowid;
+                $this->titre                    = $obj->titre;
+                $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->libelle;
+                $this->amount                   = $obj->amount;
+                $this->remise                   = $obj->remise;
+                $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_projet;
+                $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()
+    {
+        global $extrafields;
+
+        // 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) {
+            $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
+     * @param string $label
+     * @param string $desc Description de la ligne
+     * @param double $pu_ht
+     * @param int $pu_ttc
+     * @param double $qty Quantite
+     * @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
+     * @param int $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 $rowid
+     * @param int $fk_product Product/Service ID predefined
+     * @param $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 Quantite
+     * @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
+     * @param int $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= ' . $facid;;
+            $sql .= ', fk_product=' . (! empty($fk_product) ? "'" . $this->db->escape($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;
+
+        $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;
+
+        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 ? $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 {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+    /**
+     *	Update the next date of execution
+     *
+     *	@param     	datetime	$date					date of execution
+     *	@param     	int			$increment_nb_gen_done	0 do nothing more, >0 increment nb_gen_done
+     *	@return		int									<0 if KO, >0 if OK
+     */
+    public function setNextDate($date, $increment_nb_gen_done = 0)
+    {
+        if (!$this->table_element) {
+            dol_syslog(get_class($this). '::setNextDate was called on objet with property table_element not defined', LOG_ERR);
+            return -1;
+        }
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+        $sql .= ' SET date_when = ' .($date ? "'".$this->db->idate($date)."'" : 'null');
+        if ($increment_nb_gen_done > 0) {
+            $sql .= ', nb_gen_done = nb_gen_done + 1';
+        }
+        $sql .= ' WHERE rowid = ' . (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 {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+    /**
+     *	Update the maximum period
+     *
+     *	@param     	int		$nb		number of maximum period
+     *	@return		int				<0 if KO, >0 if OK
+     */
+    public function setMaxPeriod($nb)
+    {
+        if (!$this->table_element) {
+            dol_syslog(get_class($this). '::setMaxPeriod was called on objet with property table_element not defined', LOG_ERR);
+            return -1;
+        }
+
+        if (empty($nb)) {
+            $nb = 0;
+        }
+
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+        $sql .= ' SET nb_gen_max = '. (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('LINEBILLREC_DELETE', $user);
+                if ($result < 0) {
+                    $error++;
+                } // Do also here what you must do to rollback action if trigger fail
+                // End call triggers
+            }
+        }
+
+        if (! $error) {
+            $result = $this->deleteExtraFields();
+            if ($result < 0) {
+                $error++;
+            }
+        }
+
+        if (! $error) {
+            $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element . ' WHERE rowid=' . (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 ='" . price2num($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_UPDATE', $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 66c441841d1..37d4ee2b11e 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -181,15 +181,17 @@ class FactureFournisseur extends CommonInvoice
 	 * @var float tva
 	 * @deprecated Use $total_tva
 	 */
-	public $tva = 0;
+	public $tva;
 
+	// Warning: Do not set default value into property defintion. it must stay null.
+	// For example to avoid to have substition done when object is generic and not yet defined.
 	public $localtax1;
 	public $localtax2;
-	public $total_ht = 0;
-	public $total_tva = 0;
-	public $total_localtax1 = 0;
-	public $total_localtax2 = 0;
-	public $total_ttc = 0;
+	public $total_ht;
+	public $total_tva;
+	public $total_localtax1;
+	public $total_localtax2;
+	public $total_ttc;
 
 	/**
 	 * @deprecated
@@ -209,7 +211,7 @@ class FactureFournisseur extends CommonInvoice
 	/**
 	 * @var int ID
 	 */
-	public $fk_account;
+	public $fk_account;		// default bank account
 
 	public $mode_reglement_id;
 	public $mode_reglement_code;
@@ -249,6 +251,8 @@ class FactureFournisseur extends CommonInvoice
 	 */
 	public $fk_facture_source;
 
+	public $fac_rec;
+
 
 	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
@@ -408,6 +412,128 @@ class FactureFournisseur extends CommonInvoice
 
 		$this->db->begin();
 
+		// 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_projet = GETPOST('projectid', 'int') > 0 ? ((int) GETPOST('projectid', 'int')) : $_facrec->fk_projet;
+			$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->remise = $_facrec->remise;
+			$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->remise) $this->remise = 0;
+			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;
+		}
+
 		if (!$remise) {
 			$remise = 0;
 		}
@@ -435,24 +561,25 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= ", multicurrency_code";
 		$sql .= ", multicurrency_tx";
 		$sql .= ", fk_facture_source";
+		$sql .= ", fk_fac_rec_source";
 		$sql .= ")";
 		$sql .= " VALUES (";
 		$sql .= "'(PROV)'";
 		$sql .= ", '".$this->db->escape($this->ref_supplier)."'";
 		$sql .= ", '".$this->db->escape($this->ref_ext)."'";
-		$sql .= ", ".$conf->entity;
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ", '".$this->db->escape($this->type)."'";
 		$sql .= ", '".$this->db->escape(isset($this->label) ? $this->label : (isset($this->libelle) ? $this->libelle : ''))."'";
-		$sql .= ", ".$this->socid;
+		$sql .= ", ".((int) $this->socid);
 		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ", '".$this->db->idate($this->date)."'";
-		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
-		$sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : "null");
-		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : "null");
-		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+		$sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : "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 .= ", ".($this->fk_account > 0 ? ((int) $this->fk_account) : 'NULL');
 		$sql .= ", '".$this->db->escape($this->note_private)."'";
 		$sql .= ", '".$this->db->escape($this->note_public)."'";
-		$sql .= ", ".$user->id.",";
+		$sql .= ", ".((int) $user->id).",";
 		$sql .= $this->date_echeance != '' ? "'".$this->db->idate($this->date_echeance)."'" : "null";
 		$sql .= ", ".(int) $this->fk_incoterms;
 		$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
@@ -460,6 +587,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);
@@ -504,17 +632,17 @@ 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)';
-					$sql .= ' VALUES ('.$this->id.','.intval($this->lines[$i]->special_code).','.($this->lines[$i]->fk_remise_except > 0 ? $this->lines[$i]->fk_remise_except : 'NULL').')';
+					$sql .= " VALUES (".((int) $this->id).", ".((int) $this->lines[$i]->special_code).", ".($this->lines[$i]->fk_remise_except > 0 ? ((int) $this->lines[$i]->fk_remise_except) : 'NULL').')';
 
 					$resql_insert = $this->db->query($sql);
 					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,
@@ -541,8 +669,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];
@@ -554,7 +681,7 @@ class FactureFournisseur extends CommonInvoice
 					}
 
 					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn, special_code, fk_remise_except)';
-					$sql .= ' VALUES ('.$this->id.','.intval($this->lines[$i]->special_code).','.($this->lines[$i]->fk_remise_except > 0 ? $this->lines[$i]->fk_remise_except : 'NULL').')';
+					$sql .= " VALUES (".((int) $this->id).", ".((int) $this->lines[$i]->special_code).", ".($this->lines[$i]->fk_remise_except > 0 ? ((int) $this->lines[$i]->fk_remise_except) : 'NULL').')';
 
 					$resql_insert = $this->db->query($sql);
 					if ($resql_insert) {
@@ -589,6 +716,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) {
@@ -672,6 +885,7 @@ class FactureFournisseur extends CommonInvoice
 		$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,";
@@ -727,7 +941,7 @@ class FactureFournisseur extends CommonInvoice
 				$this->remise				= $obj->remise;
 				$this->close_code			= $obj->close_code;
 				$this->close_note			= $obj->close_note;
-				$this->tva = $obj->tva;
+				//$this->tva = $obj->tva;
 				$this->total_localtax1		= $obj->localtax1;
 				$this->total_localtax2		= $obj->localtax2;
 				$this->total_ht				= $obj->total_ht;
@@ -739,6 +953,7 @@ class FactureFournisseur extends CommonInvoice
 				$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;
@@ -822,7 +1037,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= ', f.fk_code_ventilation, f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
-		$sql .= ' WHERE fk_facture_fourn='.$this->id;
+		$sql .= ' WHERE fk_facture_fourn='.((int) $this->id);
 		$sql .= ' ORDER BY f.rang, f.rowid';
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
@@ -861,7 +1076,7 @@ class FactureFournisseur extends CommonInvoice
 					$line->qty				= $obj->qty;
 					$line->remise_percent = $obj->remise_percent;
 					$line->fk_remise_except = $obj->fk_remise_except;
-					$line->tva				= $obj->total_tva; // deprecated
+					//$line->tva				= $obj->total_tva; // deprecated
 					$line->total_ht			= $obj->total_ht;
 					$line->total_ttc		= $obj->total_ttc;
 					$line->total_tva		= $obj->total_tva;
@@ -961,9 +1176,9 @@ class FactureFournisseur extends CommonInvoice
 		if (isset($this->close_note)) {
 			$this->close_note = trim($this->close_note);
 		}
-		if (isset($this->tva)) {
+		/*if (isset($this->tva)) {
 			$this->tva = trim($this->tva);
-		}
+		}*/
 		if (isset($this->localtax1)) {
 			$this->localtax1 = trim($this->localtax1);
 		}
@@ -1035,7 +1250,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= " remise=".(isset($this->remise) ? $this->remise : "null").",";
 		$sql .= " close_code=".(isset($this->close_code) ? "'".$this->db->escape($this->close_code)."'" : "null").",";
 		$sql .= " close_note=".(isset($this->close_note) ? "'".$this->db->escape($this->close_note)."'" : "null").",";
-		$sql .= " tva=".(isset($this->tva) ? $this->tva : "null").",";
+		//$sql .= " tva=".(isset($this->tva) ? $this->tva : "null").",";
 		$sql .= " localtax1=".(isset($this->localtax1) ? $this->localtax1 : "null").",";
 		$sql .= " localtax2=".(isset($this->localtax2) ? $this->localtax2 : "null").",";
 		$sql .= " total_ht=".(isset($this->total_ht) ? $this->total_ht : "null").",";
@@ -1383,7 +1598,7 @@ class FactureFournisseur extends CommonInvoice
 			if ($close_note) {
 				$sql .= ", close_note='".$this->db->escape($close_note)."'";
 			}
-			$sql .= ', fk_user_closing = '.$user->id;
+			$sql .= ', fk_user_closing = '.((int) $user->id);
 			$sql .= ", date_closing = '".$this->db->idate($now)."'";
 			$sql .= ' WHERE rowid = '.((int) $this->id);
 
@@ -1499,7 +1714,7 @@ class FactureFournisseur extends CommonInvoice
 		if ($close_note) {
 			$sql .= ", close_note='".$this->db->escape($close_note)."'";
 		}
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -1507,7 +1722,7 @@ class FactureFournisseur extends CommonInvoice
 			// as they have not been used since the invoice is abandoned.
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe_remise_except';
 			$sql .= ' SET fk_invoice_supplier = NULL';
-			$sql .= ' WHERE fk_invoice_supplier = '.$this->id;
+			$sql .= ' WHERE fk_invoice_supplier = '.((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -1587,7 +1802,7 @@ class FactureFournisseur extends CommonInvoice
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
 		$sql .= " SET ref='".$this->db->escape($num)."', fk_statut = 1, fk_user_valid = ".((int) $user->id).", date_valid = '".$this->db->idate($now)."'";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::validate", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1714,7 +1929,7 @@ class FactureFournisseur extends CommonInvoice
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
 		$sql .= " SET fk_statut = ".self::STATUS_DRAFT;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -1791,14 +2006,14 @@ class FactureFournisseur extends CommonInvoice
 	 *  @param		array	$array_options		extrafields array
 	 * 	@param 		string	$fk_unit 			Code of the unit to use. Null to use the default one
 	 *  @param      int     $origin_id          id origin document
-	 *  @param		double	$pu_ht_devise		Amount in currency
+	 *  @param		double	$pu_devise			Amount in currency
 	 *  @param		string	$ref_supplier		Supplier ref
 	 *  @param      string  $special_code       Special code
 	 *  @param		int		$fk_parent_line		Parent line id
 	 *  @param    	int		$fk_remise_except	Id discount used
 	 *	@return    	int             			>0 if OK, <0 if KO
 	 */
-	public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $ventil = 0, $info_bits = '', $price_base_type = 'HT', $type = 0, $rang = -1, $notrigger = false, $array_options = 0, $fk_unit = null, $origin_id = 0, $pu_ht_devise = 0, $ref_supplier = '', $special_code = '', $fk_parent_line = 0, $fk_remise_except = 0)
+	public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $ventil = 0, $info_bits = '', $price_base_type = 'HT', $type = 0, $rang = -1, $notrigger = false, $array_options = 0, $fk_unit = null, $origin_id = 0, $pu_devise = 0, $ref_supplier = '', $special_code = '', $fk_parent_line = 0, $fk_remise_except = 0)
 	{
 		global $langs, $mysoc, $conf;
 
@@ -1904,7 +2119,7 @@ class FactureFournisseur extends CommonInvoice
 				$product_type = $type;
 			}
 
-			if (!empty($conf->multicurrency->enabled) && $pu_ht_devise > 0) {
+			if (!empty($conf->multicurrency->enabled) && $pu_devise > 0) {
 				$pu = 0;
 			}
 
@@ -1923,7 +2138,7 @@ class FactureFournisseur extends CommonInvoice
 			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
 			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_devise);
 			$total_ht  = $tabprice[0];
 			$total_tva = $tabprice[1];
 			$total_ttc = $tabprice[2];
@@ -2050,21 +2265,21 @@ class FactureFournisseur extends CommonInvoice
 	 * @param      	integer     $date_end       	Date end of service
 	 * @param		array		$array_options		extrafields array
 	 * @param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
-	 * @param		double		$pu_ht_devise		Amount in currency
+	 * @param		double		$pu_devise			Amount in currency
 	 * @param		string		$ref_supplier		Supplier ref
 	 * @return    	int           					<0 if KO, >0 if OK
 	 */
-	public function updateline($id, $desc, $pu, $vatrate, $txlocaltax1 = 0, $txlocaltax2 = 0, $qty = 1, $idproduct = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $remise_percent = 0, $notrigger = false, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $ref_supplier = '')
+	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 = '')
 	{
 		global $mysoc, $langs;
 
-		dol_syslog(get_class($this)."::updateline $id,$desc,$pu,$vatrate,$qty,$idproduct,$price_base_type,$info_bits,$type,$remise_percent,$notrigger,$date_start,$date_end,$fk_unit,$pu_ht_devise,$ref_supplier", LOG_DEBUG);
+		dol_syslog(get_class($this)."::updateline $id,$desc,$pu,$vatrate,$qty,$idproduct,$price_base_type,$info_bits,$type,$remise_percent,$notrigger,$date_start,$date_end,$fk_unit,$pu_devise,$ref_supplier", LOG_DEBUG);
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		$pu = price2num($pu);
 		$qty = price2num($qty);
 		$remise_percent = price2num($remise_percent);
-		$pu_ht_devise = price2num($pu_ht_devise);
+		$pu_devise = price2num($pu_devise);
 
 		// Check parameters
 		//if (! is_numeric($pu) || ! is_numeric($qty)) return -1;
@@ -2108,7 +2323,7 @@ class FactureFournisseur extends CommonInvoice
 			$vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
 		}
 
-		$tabprice = calcul_price_total($qty, $pu, $remise_percent, $vatrate, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+		$tabprice = calcul_price_total($qty, $pu, $remise_percent, $vatrate, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_devise);
 		$total_ht  = $tabprice[0];
 		$total_tva = $tabprice[1];
 		$total_ttc = $tabprice[2];
@@ -2147,10 +2362,12 @@ class FactureFournisseur extends CommonInvoice
 		$line->context = $this->context;
 
 		$line->description = $desc;
-		$line->subprice = $pu_ht;
-		$line->pu_ht = $pu_ht;
-		$line->pu_ttc = $pu_ttc;
-		$line->qty = $qty;
+
+		$line->qty = ($this->type == self::TYPE_CREDIT_NOTE ? abs($qty) : $qty); // For credit note, quantity is always positive and unit price negative
+		$line->subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
+		$line->pu_ht = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
+		$line->pu_ttc = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ttc) : $pu_ttc); // For credit note, unit price always negative, always positive otherwise
+
 		$line->remise_percent = $remise_percent;
 		$line->ref_supplier = $ref_supplier;
 
@@ -2163,11 +2380,13 @@ class FactureFournisseur extends CommonInvoice
 		$line->localtax2_tx = $txlocaltax2;
 		$line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
 		$line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
+
 		$line->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ht) : $total_ht);
 		$line->total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_tva) : $total_tva);
 		$line->total_localtax1 = $total_localtax1;
 		$line->total_localtax2 = $total_localtax2;
 		$line->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ttc) : $total_ttc);
+
 		$line->fk_product = $idproduct;
 		$line->product_type = $product_type;
 		$line->info_bits = $info_bits;
@@ -2412,19 +2631,20 @@ class FactureFournisseur extends CommonInvoice
 		// phpcs:enable
 		global $conf, $langs;
 
-		$sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut';
+		$clause = " WHERE";
+
+		$sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut, ff.total_ht';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
-		if (!$user->rights->societe->client->voir && !$user->socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		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 .= ' WHERE ff.paye=0';
+		$sql .= $clause.' ff.paye=0';
 		$sql .= ' AND ff.fk_statut = '.self::STATUS_VALIDATED;
 		$sql .= " AND ff.entity = ".$conf->entity;
 		if ($user->socid) {
-			$sql .= ' AND ff.fk_soc = '.$user->socid;
-		}
-		if (!$user->rights->societe->client->voir && !$user->socid) {
-			$sql .= " AND ff.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+			$sql .= ' AND ff.fk_soc = '.((int) $user->socid);
 		}
 
 		$resql = $this->db->query($sql);
@@ -2443,16 +2663,18 @@ class FactureFournisseur extends CommonInvoice
 			$facturestatic = new FactureFournisseur($this->db);
 
 			while ($obj = $this->db->fetch_object($resql)) {
-				$response->nbtodo++;
-
 				$facturestatic->date_echeance = $this->db->jdate($obj->datefin);
 				$facturestatic->statut = $obj->fk_statut;
 
+				$response->nbtodo++;
+				$response->total += $obj->total_ht;
+
 				if ($facturestatic->hasDelay()) {
 					$response->nbtodolate++;
 					$response->url_late = DOL_URL_ROOT.'/fourn/facture/list.php?search_option=late&mainmenu=billing&leftmenu=suppliers_bills';
 				}
 			}
+
 			$this->db->free($resql);
 			return $response;
 		} else {
@@ -2769,7 +2991,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql = "SELECT count(f.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
@@ -2956,7 +3178,7 @@ class FactureFournisseur extends CommonInvoice
 	{
 		$isUsed = false;
 
-		$sql = "SELECT fk_invoice_supplier FROM ".MAIN_DB_PREFIX."societe_remise_except WHERE fk_invoice_supplier_source=".$this->id;
+		$sql = "SELECT fk_invoice_supplier FROM ".MAIN_DB_PREFIX."societe_remise_except WHERE fk_invoice_supplier_source = ".((int) $this->id);
 		$resql = $this->db->query($sql);
 		if (!empty($resql)) {
 			$obj = $this->db->fetch_object($resql);
@@ -3265,7 +3487,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$this->qty				= $obj->qty;
 		$this->remise_percent = $obj->remise_percent;
 		$this->fk_remise_except = $obj->fk_remise_except;
-		$this->tva				= $obj->total_tva; // deprecated
+		//$this->tva				= $obj->total_tva; // deprecated
 		$this->total_ht = $obj->total_ht;
 		$this->total_tva			= $obj->total_tva;
 		$this->total_localtax1	= $obj->total_localtax1;
@@ -3327,7 +3549,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		if (!$error) {
 			// Supprime ligne
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det ';
-			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
@@ -3403,7 +3625,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
-		$sql .= "  description ='".$this->db->escape($this->description)."'";
+		$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");
@@ -3702,12 +3924,12 @@ class SupplierInvoiceLine extends CommonObjectLine
 
 		// Mise a jour ligne en base
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
-		$sql .= "  total_ht='".price2num($this->total_ht)."'";
-		$sql .= ", tva='".price2num($this->total_tva)."'";
-		$sql .= ", total_localtax1='".price2num($this->total_localtax1)."'";
-		$sql .= ", total_localtax2='".price2num($this->total_localtax2)."'";
-		$sql .= ", total_ttc='".price2num($this->total_ttc)."'";
-		$sql .= " WHERE rowid = ".$this->rowid;
+		$sql .= "  total_ht = ".price2num($this->total_ht);
+		$sql .= ", tva= ".price2num($this->total_tva);
+		$sql .= ", total_localtax1 = ".price2num($this->total_localtax1);
+		$sql .= ", total_localtax2 = ".price2num($this->total_localtax2);
+		$sql .= ", total_ttc = ".price2num($this->total_ttc);
+		$sql .= " WHERE rowid = ".((int) $this->rowid);
 
 		dol_syslog("FactureFournisseurLigne.class.php::update_total", LOG_DEBUG);
 
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 6232b901382..e20add0bb9d 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -165,7 +165,7 @@ class ProductFournisseur extends Product
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
-		$sql .= " WHERE fk_product = ".$this->id." AND fk_soc = ".((int) $id_fourn);
+		$sql .= " WHERE fk_product = ".((int) $this->id)." AND fk_soc = ".((int) $id_fourn);
 
 		dol_syslog(get_class($this)."::remove_fournisseur", LOG_DEBUG);
 		$resql2 = $this->db->query($sql);
@@ -439,7 +439,7 @@ class ProductFournisseur extends Product
 
 			// Delete price for this quantity
 			$sql = "DELETE FROM  ".MAIN_DB_PREFIX."product_fournisseur_price";
-			$sql .= " WHERE fk_soc = ".$fourn->id." AND ref_fourn = '".$this->db->escape($ref_fourn)."' AND quantity = ".((float) $qty)." AND entity = ".$conf->entity;
+			$sql .= " WHERE fk_soc = ".((int) $fourn->id)." AND ref_fourn = '".$this->db->escape($ref_fourn)."' AND quantity = ".((float) $qty)." AND entity = ".((int) $conf->entity);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				// Add price for this quantity to supplier
@@ -460,7 +460,7 @@ class ProductFournisseur extends Product
 				$sql .= " ".((int) $fourn->id).",";
 				$sql .= " '".$this->db->escape($ref_fourn)."',";
 				$sql .= " '".$this->db->escape($desc_fourn)."',";
-				$sql .= " ".$user->id.",";
+				$sql .= " ".((int) $user->id).",";
 				$sql .= " ".price2num($buyprice).",";
 				$sql .= " ".((float) $qty).",";
 				$sql .= " ".((float) $remise_percent).",";
@@ -636,7 +636,7 @@ class ProductFournisseur extends Product
 	 *    @param	int		$limit		Limit
 	 *    @param	int		$offset		Offset
 	 *    @param	int		$socid		Filter on a third party id
-	 *    @return	array				Array of Products with new properties to define supplier price
+	 *    @return	array				Array of ProductFournisseur with new properties to define supplier price
 	 */
 	public function list_product_fournisseur_price($prodid, $sortfield = '', $sortorder = '', $limit = 0, $offset = 0, $socid = 0)
 	{
@@ -1188,7 +1188,7 @@ class ProductFournisseur extends Product
 			$label .= $this->displayPriceProductFournisseurLog($logPrices);
 		}
 
-		$url = dol_buildpath('/product/fournisseurs.php', 1).'?id='.$this->id.'&action=add_price&socid='.$this->fourn_id.'&rowid='.$this->product_fourn_price_id;
+		$url = dol_buildpath('/product/fournisseurs.php', 1).'?id='.$this->id.'&action=add_price&token='.newToken().'&socid='.$this->fourn_id.'&rowid='.$this->product_fourn_price_id;
 
 		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 28ef8025a98..de9aa4eade9 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -93,7 +93,7 @@ class PaiementFourn extends Paiement
 
 		$sql = 'SELECT p.rowid, p.ref, p.entity, p.datep as dp, p.amount, p.statut, p.fk_bank, p.multicurrency_amount,';
 		$sql .= ' c.code as payment_code, c.libelle as payment_type,';
-		$sql .= ' p.num_paiement as num_payment, p.note, b.fk_account';
+		$sql .= ' p.num_paiement as num_payment, p.note, b.fk_account, p.fk_paiement';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn 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';
@@ -130,6 +130,7 @@ class PaiementFourn extends Paiement
 				$this->note_private         = $obj->note;
 				$this->type_code            = $obj->payment_code;
 				$this->type_label           = $obj->payment_type;
+				$this->fk_paiement           = $obj->fk_paiement;
 				$this->statut               = $obj->statut;
 
 				$error = 1;
@@ -201,8 +202,8 @@ class PaiementFourn extends Paiement
 
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiementfourn (';
 			$sql .= 'ref, entity, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, fk_user_author, fk_bank)';
-			$sql .= " VALUES ('".$this->db->escape($ref)."', ".$conf->entity.", '".$this->db->idate($now)."',";
-			$sql .= " '".$this->db->idate($this->datepaye)."', '".$total."', '".$mtotal."', ".$this->paiementid.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_private)."', ".$user->id.", 0)";
+			$sql .= " VALUES ('".$this->db->escape($ref)."', ".((int) $conf->entity).", '".$this->db->idate($now)."',";
+			$sql .= " '".$this->db->idate($this->datepaye)."', ".((float) $total).", ".((float) $mtotal).", ".((int) $this->paiementid).", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_private)."', ".((int) $user->id).", 0)";
 
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -214,7 +215,7 @@ class PaiementFourn extends Paiement
 					if (is_numeric($amount) && $amount <> 0) {
 						$amount = price2num($amount);
 						$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiementfourn_facturefourn (fk_facturefourn, fk_paiementfourn, amount, multicurrency_amount)';
-						$sql .= ' VALUES ('.$facid.','.$this->id.',\''.$amount.'\', \''.$this->multicurrency_amounts[$key].'\')';
+						$sql .= " VALUES (".((int) $facid).", ".((int) $this->id).", ".((float) $amount).', '.((float) $this->multicurrency_amounts[$key]).')';
 						$resql = $this->db->query($sql);
 						if ($resql) {
 							$invoice = new FactureFournisseur($this->db);
@@ -398,11 +399,11 @@ class PaiementFourn extends Paiement
 
 		// Efface la ligne de paiement (dans paiement_facture et paiement)
 		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn';
-		$sql .= ' WHERE fk_paiementfourn = '.$this->id;
+		$sql .= ' WHERE fk_paiementfourn = '.((int) $this->id);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'paiementfourn';
-			$sql .= ' WHERE rowid = '.$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			$result = $this->db->query($sql);
 			if (!$result) {
 				$this->error = $this->db->error();
@@ -484,16 +485,16 @@ class PaiementFourn extends Paiement
 	/**
 	 *	Return list of supplier invoices the payment point to
 	 *
-	 *	@param      string	$filter         SQL filter
+	 *	@param      string	$filter         SQL filter. Warning: This value must not come from a user input.
 	 *	@return     array           		Array of supplier invoice id
 	 */
 	public function getBillsArray($filter = '')
 	{
 		$sql = 'SELECT fk_facturefourn';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf, '.MAIN_DB_PREFIX.'facture_fourn as f';
-		$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND fk_paiementfourn = '.$this->id;
+		$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND fk_paiementfourn = '.((int) $this->id);
 		if ($filter) {
-			$sql .= ' AND '.$filter;
+			$sql .= " AND ".$filter;
 		}
 
 		dol_syslog(get_class($this).'::getBillsArray', LOG_DEBUG);
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 86e34ce39a1..ec4ea692f78 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -8,7 +8,8 @@
  * Copyright (C) 2012-2016 Marcos García        <marcosgdf@gmail.com>
  * 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) 2018-2019 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
@@ -85,6 +86,12 @@ $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($con
 
 $datelivraison = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), GETPOST('liv_sec', 'int'), GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
+
+// Security check
+if ($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('ordersuppliercard', 'globalcard'));
 
@@ -137,7 +144,11 @@ $usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($us
 $usercanapprove			= $user->rights->fournisseur->commande->approuver;
 $usercanapprovesecond	= $user->rights->fournisseur->commande->approve2;
 $usercanorder			= $user->rights->fournisseur->commande->commander;
-$usercanreceived		= $user->rights->fournisseur->commande->receptionner;
+if (empty($conf->reception->enabled)) {
+	$usercanreceive = $user->rights->fournisseur->commande->receptionner;
+} else {
+	$usercanreceive = $user->rights->reception->creer;
+}
 
 // Permissions for includes
 $permissionnote		= $usercancreate; // Used by the include of actions_setnotes.inc.php
@@ -145,6 +156,12 @@ $permissiondellink	= $usercancreate; // Used by the include of actions_dellink.i
 $permissiontoedit	= $usercancreate; // Used by the include of actions_lineupdown.inc.php
 $permissiontoadd	= $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
 
+// Project permission
+$caneditproject = false;
+if (!empty($conf->projet->enabled)) {
+	$caneditproject = empty($conf->global->SUPPLIER_ORDER_FORBID_EDIT_PROJECT) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && preg_match('/^[\(]?PROV/i', $object->ref));
+}
+
 
 /*
  * Actions
@@ -157,7 +174,7 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
-	$backurlforlist = DOL_URL_ROOT.'/fourn/commande/list.php'.($socid > 0 ? '&socid='.((int) $socid)  : '');
+	$backurlforlist = DOL_URL_ROOT.'/fourn/commande/list.php'.($socid > 0 ? '?socid='.((int) $socid)  : '');
 
 	if (empty($backtopage) || ($cancel && empty($id))) {
 		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
@@ -169,6 +186,17 @@ if (empty($reshook)) {
 		}
 	}
 
+	if ($cancel) {
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action = '';
+	}
+
 	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
@@ -229,7 +257,7 @@ if (empty($reshook)) {
 	}
 
 	// Set project
-	if ($action == 'classin' && $usercancreate) {
+	if ($action == 'classin' && $usercancreate && $caneditproject) {
 		$result = $object->setProject($projectid);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -244,9 +272,9 @@ if (empty($reshook)) {
 
 			// Update supplier
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur';
-			$sql .= ' SET fk_soc='.$new_socid;
-			$sql .= ' WHERE fk_soc='.$object->thirdparty->id;
-			$sql .= ' AND rowid='.$object->id;
+			$sql .= ' SET fk_soc = '.((int) $new_socid);
+			$sql .= ' WHERE fk_soc = '.((int) $object->thirdparty->id);
+			$sql .= ' AND rowid = '.((int) $object->id);
 
 			$res = $db->query($sql);
 
@@ -259,8 +287,8 @@ if (empty($reshook)) {
 				foreach ($object->lines as $l) {
 					$sql = 'SELECT price, unitprice, tva_tx, ref_fourn';
 					$sql .= ' FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
-					$sql .= ' WHERE fk_product='.$l->fk_product;
-					$sql .= ' AND fk_soc='.$new_socid;
+					$sql .= ' WHERE fk_product = '.((int) $l->fk_product);
+					$sql .= ' AND fk_soc = '.((int) $new_socid);
 					$sql .= ' ORDER BY unitprice ASC';
 
 					$resql = $db->query($sql);
@@ -338,14 +366,14 @@ if (empty($reshook)) {
 				// Currently the "Re-open" also remove the billed flag because there is no button "Set unpaid" yet.
 				$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur';
 				$sql .= ' SET billed = 0';
-				$sql .= ' WHERE rowid = '.$object->id;
+				$sql .= ' WHERE rowid = '.((int) $object->id);
 
 				$resql = $db->query($sql);
 
 				if ($newstatus == 0) {
 					$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur';
 					$sql .= ' SET fk_user_approve = null, fk_user_approve2 = null, date_approve = null, date_approve2 = null';
-					$sql .= ' WHERE rowid = '.$object->id;
+					$sql .= ' WHERE rowid = '.((int) $object->id);
 
 					$resql = $db->query($sql);
 				}
@@ -985,7 +1013,9 @@ if (empty($reshook)) {
 	if ($action == 'commande') {
 		$methodecommande = GETPOST('methodecommande', 'int');
 
-		if ($methodecommande <= 0) {
+		if ($cancel) {
+			$action = '';
+		} elseif ($methodecommande <= 0) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("OrderMode")), null, 'errors');
 			$action = 'makeorder';
 		}
@@ -1060,37 +1090,44 @@ if (empty($reshook)) {
 	}
 
 	// Set status of reception (complete, partial, ...)
-	if ($action == 'livraison' && $usercanreceived) {
-		$db->begin();
+	if ($action == 'livraison' && $usercanreceive) {
+		if ($cancel) {
+			$action = '';
+		} else {
+			$db->begin();
 
-		if (GETPOST("type") != '') {
-			$date_liv = dol_mktime(GETPOST('rehour'), GETPOST('remin'), GETPOST('resec'), GETPOST("remonth"), GETPOST("reday"), GETPOST("reyear"));
+			if (GETPOST("type") != '') {
+				$date_liv = dol_mktime(GETPOST('rehour'), GETPOST('remin'), GETPOST('resec'), GETPOST("remonth"), GETPOST("reday"), GETPOST("reyear"));
 
-			$result = $object->Livraison($user, $date_liv, GETPOST("type"), GETPOST("comment")); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
-			if ($result > 0) {
-				$langs->load("deliveries");
-				setEventMessages($langs->trans("DeliveryStateSaved"), null);
-				$action = '';
-			} elseif ($result == -3) {
-				$error++;
-				setEventMessages($object->error, $object->errors, 'errors');
+				$result = $object->Livraison($user, $date_liv, GETPOST("type"), GETPOST("comment")); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+				if ($result > 0) {
+					$langs->load("deliveries");
+					setEventMessages($langs->trans("DeliveryStateSaved"), null);
+					$action = '';
+				} elseif ($result == -3) {
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+				} else {
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
 			} else {
 				$error++;
-				setEventMessages($object->error, $object->errors, 'errors');
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Delivery")), null, 'errors');
 			}
-		} else {
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Delivery")), null, 'errors');
-		}
 
-		if (!$error) {
-			$db->commit();
-		} else {
-			$db->rollback();
+			if (!$error) {
+				$db->commit();
+			} else {
+				$db->rollback();
+			}
 		}
 	}
 
 	if ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanorder) {
+		if (GETPOST('cancel_note')) {
+			$object->cancel_note = GETPOST('cancel_note');
+		}
 		$result = $object->cancel($user);
 		if ($result > 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
@@ -1182,13 +1219,17 @@ if (empty($reshook)) {
 			if (!$error) {
 				// If creation from another object of another module (Example: origin=propal, originid=1)
 				if (!empty($origin) && !empty($originid)) {
+					$element = $subelement = $origin;
+					$classname = ucfirst($subelement);
 					if ($origin == 'propal' || $origin == 'proposal') {
-						$classname = 'Propal';
 						$element = 'comm/propal'; $subelement = 'propal';
-					} elseif ($origin == 'order' || $origin == 'commande') {
-						$classname = 'Commande';
+						$classname = 'Propal';
+					}
+					if ($origin == 'order' || $origin == 'commande') {
 						$element = $subelement = 'commande';
-					} else {
+						$classname = 'Commande';
+					}
+					if ($origin == 'supplier_proposal') {
 						$classname = 'SupplierProposal';
 						$element = 'supplier_proposal';
 						$subelement = 'supplier_proposal';
@@ -1500,6 +1541,7 @@ if ($action == 'create') {
 	if (!empty($origin) && !empty($originid)) {
 		// Parse element/subelement (ex: project_task)
 		$element = $subelement = $origin;
+		$classname = ucfirst($subelement);
 		$regs = array();
 		if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
 			$element = $regs[1];
@@ -1509,15 +1551,19 @@ if ($action == 'create') {
 		if ($origin == 'propal' || $origin == 'proposal') {
 			$classname = 'Propal';
 			$element = 'comm/propal'; $subelement = 'propal';
-		} elseif ($origin == 'order' || $origin == 'commande') {
+		}
+		if ($origin == 'order' || $origin == 'commande') {
 			$classname = 'Commande';
 			$element = $subelement = 'commande';
-		} else {
+		}
+		if ($origin == 'supplier_proposal') {
 			$classname = 'SupplierProposal';
 			$element = 'supplier_proposal';
 			$subelement = 'supplier_proposal';
 		}
 
+
+
 		dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
 		$objectsrc = new $classname($db);
@@ -1584,7 +1630,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">';
-	print '<input type="hidden" name="remise_percent" value="'.$soc->remise_supplier_percent.'">';
+	print '<input type="hidden" name="remise_percent" value="'.(empty($soc->remise_supplier_percent) ? '' : $soc->remise_supplier_percent).'">';
 	print '<input type="hidden" name="origin" value="'.$origin.'">';
 	print '<input type="hidden" name="originid" value="'.$originid.'">';
 	if ($backtopage) {
@@ -1610,7 +1656,7 @@ if ($action == 'create') {
 	print '<td>';
 
 	if ($societe->id > 0) {
-		print $societe->getNomUrl(1);
+		print $societe->getNomUrl(1, 'supplier');
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
 	} else {
 		print img_picto('', 'company').$form->select_company((empty($socid) ? '' : $socid), 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
@@ -1620,8 +1666,9 @@ if ($action == 'create') {
 			$(document).ready(function() {
 				$("#socid").change(function() {
 					var socid = $(this).val();
+					var prjid = $("#projectid").val();
 					// reload page
-					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid;
+					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&projectid="+prjid
 				});
 			});
 			</script>';
@@ -1686,7 +1733,7 @@ if ($action == 'create') {
 		$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='.$soc->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?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 '</td></tr>';
 	}
 
@@ -1736,7 +1783,7 @@ if ($action == 'create') {
 		print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
 
 		$newclassname = $classname;
-		print '<tr><td>'.$langs->trans($newclassname).'</td><td>'.$objectsrc->getNomUrl(1).'</td></tr>';
+		print '<tr><td>'.$langs->trans($newclassname).'</td><td>'.$objectsrc->getNomUrl(1, 'supplier').'</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($objectsrc->total_ht).'</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($objectsrc->total_tva)."</td></tr>";
 		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) { 		// Localtax1 RE
@@ -1770,13 +1817,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-	print '</div>';
-
-
+	print $form->buttonsSaveCancel("CreateDraft");
 
 	// Show origin lines
 	if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
@@ -1891,13 +1932,13 @@ if ($action == 'create') {
 		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ApproveThisOrder"), $text, "confirm_".$action, $formquestion, 1, 1, 240);
 	}
 
-	// Confirmation de la desapprobation
+	// Confirmation of disapproval
 	if ($action == 'refuse') {
 		$formquestion = array(
 			array(
 				'type' => 'text',
 				'name' => 'refuse_note',
-				'label' => $langs->trans("MotifCP"),
+				'label' => $langs->trans("Reason"),
 				'value' => '',
 				'morecss' => 'minwidth300'
 			)
@@ -1905,9 +1946,18 @@ if ($action == 'create') {
 		$formconfirm  = $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("DenyingThisOrder"), $langs->trans("ConfirmDenyingThisOrder", $object->ref), "confirm_refuse", $formquestion, 0, 1);
 	}
 
-	// Confirmation de l'annulation
+	// Confirmation of cancellation
 	if ($action == 'cancel') {
-		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("Cancel"), $langs->trans("ConfirmCancelThisOrder", $object->ref), "confirm_cancel", '', 0, 1);
+		$formquestion = array(
+			array(
+				'type' => 'text',
+				'name' => 'cancel_note',
+				'label' => $langs->trans("Reason"),
+				'value' => '',
+				'morecss' => 'minwidth300'
+			)
+		);
+		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("Cancel"), $langs->trans("ConfirmCancelThisOrder", $object->ref), "confirm_cancel", $formquestion, 0, 1);
 	}
 
 	// Confirmation de l'envoi de la commande
@@ -1954,9 +2004,9 @@ if ($action == 'create') {
 	}
 	if (empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) || $action != 'edit_thirdparty') {
 		if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && $object->statut == CommandeFournisseur::STATUS_DRAFT) {
-			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=edit_thirdparty&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetThirdParty')).'</a>';
+			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=edit_thirdparty&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetThirdParty')).'</a>';
 		}
-		$morehtmlref .= ' : '.$object->thirdparty->getNomUrl(1);
+		$morehtmlref .= ' : '.$object->thirdparty->getNomUrl(1, 'supplier');
 		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
 		}
@@ -1967,15 +2017,15 @@ if ($action == 'create') {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($usercancreate) {
-			if ($action != 'classify') {
-				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			if ($action != 'classify' && $caneditproject) {
+				$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((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1, 0, 'maxwidth500');
+				$morehtmlref .= $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, 'projectid', 0, 0, 1, 1, 1, 0, 0, '', 1, 0, 'maxwidth500');
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
@@ -1985,9 +2035,10 @@ if ($action == 'create') {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
@@ -2054,7 +2105,7 @@ if ($action == 'create') {
 	print $langs->trans('PaymentConditions');
 	print '<td>';
 	if ($action != 'editconditions') {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td>';
@@ -2073,7 +2124,7 @@ if ($action == 'create') {
 	print $langs->trans('PaymentMode');
 	print '</td>';
 	if ($action != 'editmode') {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td>';
@@ -2093,7 +2144,7 @@ if ($action == 'create') {
 		print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
 		print '</td>';
 		if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_DRAFT) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+			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>';
@@ -2113,7 +2164,7 @@ if ($action == 'create') {
 			print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
 			print '</td>';
 			if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+				print '<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>';
@@ -2141,7 +2192,7 @@ if ($action == 'create') {
 		print $langs->trans('BankAccount');
 		print '<td>';
 		if ($action != 'editbankaccount' && $usercancreate) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+			print '<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>';
@@ -2166,7 +2217,7 @@ if ($action == 'create') {
 	print $langs->trans('DateDeliveryPlanned');
 	print '</td>';
 	if ($action != 'editdate_livraison') {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td>';
@@ -2179,7 +2230,7 @@ if ($action == 'create') {
 			$usehourmin = 1;
 		}
 		print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', $usehourmin, $usehourmin, '', "setdate_livraison");
-		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
 		$usehourmin = 'day';
@@ -2200,7 +2251,7 @@ if ($action == 'create') {
 		print $langs->trans('IncotermLabel');
 		print '<td><td class="right">';
 		if ($usercancreate) {
-			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
 		} else {
 			print '&nbsp;';
 		}
@@ -2222,7 +2273,6 @@ if ($action == 'create') {
 
 	print '</div>';
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border tableforfield centpercent">';
@@ -2281,7 +2331,6 @@ if ($action == 'create') {
 	}*/
 
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
@@ -2389,7 +2438,7 @@ if ($action == 'create') {
 			// Modify
 			if ($object->statut == CommandeFournisseur::STATUS_VALIDATED) {
 				if ($usercanorder) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 				}
 			}
 
@@ -2445,20 +2494,20 @@ if ($action == 'create') {
 				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.'&amp;action=reopen">'.$langs->trans("Disapprove").'</a>';
+						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.'&amp;action=reopen">'.$langs->trans("Disapprove").'</a>';
+						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.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
 				}
 			}
 
@@ -2479,7 +2528,7 @@ if ($action == 'create') {
 				}
 
 				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)) && $usercanreceived) {
+					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>';
@@ -2497,8 +2546,8 @@ if ($action == 'create') {
 
 			// Classify received (this does not record reception)
 			if ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY) {
-				if ($usercanreceived) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifyreception#classifyreception">'.$langs->trans("ClassifyReception").'</a></div>';
+				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>';
 				}
 			}
 
@@ -2515,11 +2564,11 @@ if ($action == 'create') {
 			// 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.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
+					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.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
+							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>';
@@ -2529,7 +2578,7 @@ if ($action == 'create') {
 
 			// 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.'&amp;action=webservice&amp;mode=init">'.$langs->trans('CreateRemoteOrder').'</a>';
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=webservice&token='.newToken().'&mode=init">'.$langs->trans('CreateRemoteOrder').'</a>';
 			}
 
 			// Clone
@@ -2549,7 +2598,7 @@ if ($action == 'create') {
 				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.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>';
 				}
 			}
 		}
@@ -2604,18 +2653,19 @@ if ($action == 'create') {
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 			$genallowed = $usercanread;
 			$delallowed = $usercancreate;
+			$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF) ? '' : $conf->global->COMMANDE_SUPPLIER_ADDON_PDF));
 
-			print $formfile->showdocuments('commande_fournisseur', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 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);
 			$somethingshown = $formfile->numoffiles;
 
 			// Show links to link elements
 			$linktoelem = $form->showLinkToObjectBlock($object, null, array('supplier_order', 'order_supplier'));
 			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
-			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+			print '</div><div class="fichehalfright">';
 
 			if ($action == 'classifyreception') {
-				if ($usercanreceived && ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY)) {
+				if ($usercanreceive && ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY)) {
 					// Set status to received (action=livraison)
 					print '<!-- form to record purchase order received -->'."\n";
 					print '<form id="classifyreception" action="card.php?id='.$object->id.'" method="post">';
@@ -2642,7 +2692,11 @@ if ($action == 'create') {
 
 					print '</td></tr>';
 					print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment"></td></tr>';
-					print '<tr><td class="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Receive").'"></td></tr>';
+					print '<tr><td class="center" colspan="2">';
+					print '<input type="submit" name="receive" class="button" value="'.$langs->trans("Receive").'">';
+					print ' &nbsp; &nbsp; ';
+					print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
+					print '</td></tr>';
 					print "</table>\n";
 					print "</form>\n";
 					print "<br>";
@@ -2654,7 +2708,7 @@ if ($action == 'create') {
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'order_supplier', $socid, 1, 'listaction'.($genallowed ? 'largetitle' : ''));
 
-			print '</div></div></div>';
+			print '</div></div>';
 		}
 
 		/*
@@ -2710,7 +2764,7 @@ if ($action == 'create') {
 					print '<tr><td>'.$langs->trans("Password").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_password"></td></tr>';
 					//Submit button
 					print '<tr><td class="center" colspan="2">';
-					print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("CreateRemoteOrder").'">';
+					print '<input type="submit" class="button" id="ws_submit" name="ws_submit" value="'.$langs->trans("CreateRemoteOrder").'">';
 					print ' &nbsp; &nbsp; ';
 					//Cancel button
 					print '<input class="button button-cancel" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -2829,7 +2883,7 @@ if ($action == 'create') {
 				if ($error_occurred) {
 					print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
 				} else {
-					print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("Confirm").'">';
+					print '<input type="submit" class="button" id="ws_submit" name="ws_submit" value="'.$langs->trans("Confirm").'">';
 					print ' &nbsp; &nbsp; ';
 				}
 				print '<input class="button button-cancel" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index f53fba883c0..e521caf1080 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -140,7 +140,7 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {
 				if ($action != 'classify') {
-					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
 				}
 				if ($action == 'classify') {
@@ -158,9 +158,10 @@ if ($id > 0 || !empty($ref)) {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 9a8ab1fa7ef..f93e51dc850 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -10,19 +10,18 @@
  * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2019-2020 Christophe Battarel	<christophe@altairis.fr>
  *
- * This	program	is free	software; you can redistribute it and/or modify
- * it under the	terms of the GNU General Public	License	as published by
- * the Free Software Foundation; either	version	2 of the License, or
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
- * This	program	is distributed in the hope that	it will	be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * 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/
  */
 
 /**
@@ -63,11 +62,6 @@ $confirm = GETPOST('confirm', 'alpha');
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
-
-if (empty($conf->stock->enabled)) {
-	accessforbidden();
-}
 
 $hookmanager->initHooks(array('ordersupplierdispatch'));
 
@@ -90,6 +84,21 @@ if ($id > 0 || !empty($ref)) {
 	}
 }
 
+if (empty($conf->reception->enabled)) {
+	$permissiontoreceive = $user->rights->fournisseur->commande->receptionner;
+	$permissiontocontrol = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande_advance->check)));
+} else {
+	$permissiontoreceive = $user->rights->reception->creer;
+	$permissiontocontrol = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)));
+}
+
+// $id is id of a purchase order.
+$result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
+
+if (empty($conf->stock->enabled)) {
+	accessforbidden();
+}
+
 
 /*
  * Actions
@@ -101,7 +110,7 @@ if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
-if ($action == 'checkdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check)))) {
+if ($action == 'checkdispatchline' && $permissiontocontrol) {
 	$error = 0;
 	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
 
@@ -138,7 +147,7 @@ if ($action == 'checkdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_
 	}
 }
 
-if ($action == 'uncheckdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check)))) {
+if ($action == 'uncheckdispatchline' && $permissiontocontrol) {
 	$error = 0;
 	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
 
@@ -174,7 +183,7 @@ if ($action == 'uncheckdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCE
 	}
 }
 
-if ($action == 'denydispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check)))) {
+if ($action == 'denydispatchline' && $permissiontocontrol) {
 	$error = 0;
 	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
 
@@ -210,7 +219,7 @@ if ($action == 'denydispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_P
 	}
 }
 
-if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner) {
+if ($action == 'dispatch' && $permissiontoreceive) {
 	$error = 0;
 
 	$db->begin();
@@ -341,11 +350,11 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 							if (GETPOSTISSET($saveprice)) {
 								// TODO Use class
 								$sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
-								$sql .= " SET unitprice='".GETPOST($pu)."'";
-								$sql .= ", price=".GETPOST($pu)."*quantity";
-								$sql .= ", remise_percent='".(!empty($dto) ? $dto : 0)."'";
-								$sql .= " WHERE fk_soc=".$object->socid;
-								$sql .= " AND fk_product=".GETPOST($prod, 'int');
+								$sql .= " SET unitprice = ".price2num(GETPOST($pu), 'MU', 2);
+								$sql .= ", price = ".price2num(GETPOST($pu), 'MU', 2)." * quantity";
+								$sql .= ", remise_percent = ".price2num((empty($dto) ? 0 : $dto), 3, 2)."'";
+								$sql .= " WHERE fk_soc = ".((int) $object->socid);
+								$sql .= " AND fk_product=".((int) GETPOST($prod, 'int'));
 
 								$resql = $db->query($sql);
 							}
@@ -388,7 +397,7 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 }
 
 // Remove a dispatched line
-if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fournisseur->commande->receptionner) {
+if ($action == 'confirm_deleteline' && $confirm == 'yes' && $permissiontoreceive) {
 	$db->begin();
 
 	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
@@ -431,7 +440,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fourn
 }
 
 // Update a dispatched line
-if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionner) {
+if ($action == 'updateline' && $permissiontoreceive) {
 	$db->begin();
 	$error = 0;
 
@@ -547,7 +556,7 @@ if ($id > 0 || !empty($ref)) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {
 			if ($action != 'classify') {
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -565,9 +574,10 @@ if ($id > 0 || !empty($ref)) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
@@ -654,7 +664,7 @@ if ($id > 0 || !empty($ref)) {
 		$sql = "SELECT l.rowid, cfd.fk_product, sum(cfd.qty) as qty";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseurdet as l on l.rowid = cfd.fk_commandefourndet";
-		$sql .= " WHERE cfd.fk_commande = ".$object->id;
+		$sql .= " WHERE cfd.fk_commande = ".((int) $object->id);
 		$sql .= " GROUP BY l.rowid, cfd.fk_product";
 
 		$resql = $db->query($sql);
@@ -690,7 +700,7 @@ if ($id > 0 || !empty($ref)) {
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product=p.rowid";
-		$sql .= " WHERE l.fk_commande = ".$object->id;
+		$sql .= " WHERE l.fk_commande = ".((int) $object->id);
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 			$sql .= " AND l.product_type = 0";
 		}
@@ -752,9 +762,9 @@ if ($id > 0 || !empty($ref)) {
 
 				// Select warehouse to force it everywhere
 				if (count($listwarehouses) > 1) {
-					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 1, 0, 0, '', 0, 0, $disabled, '', 'minwidth100 maxwidth300', 1);
+					print '<br><span class="opacitymedium">'.$langs->trans("ForceTo").'</span> '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 1, 0, 0, '', 0, 0, $disabled, '', 'minwidth100 maxwidth300', 1);
 				} elseif (count($listwarehouses) == 1) {
-					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 0, 0, 0, '', 0, 0, $disabled, '', 'minwidth100 maxwidth300', 1);
+					print '<br><span class="opacitymedium">'.$langs->trans("ForceTo").'</span> '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 0, 0, 0, '', 0, 0, $disabled, '', 'minwidth100 maxwidth300', 1);
 				}
 
 				print '</td>';
@@ -779,6 +789,8 @@ if ($id > 0 || !empty($ref)) {
 			$nbproduct = 0; // Nb of predefined product lines to dispatch (already done or not) if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is off (default)
 									// or nb of line that remain to dispatch if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is on.
 
+			$conf->cache['product'] = array();
+
 			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
@@ -806,11 +818,20 @@ if ($id > 0 || !empty($ref)) {
 						print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.(float) $products_dispatched[$objp->rowid].'">';
 						print '<tr class="oddeven">';
 
-						$linktoprod = '<a href="'.DOL_URL_ROOT.'/product/fournisseurs.php?id='.$objp->fk_product.'">'.img_object($langs->trans("ShowProduct"), 'product').' '.$objp->ref.'</a>';
+						if (empty($conf->cache['product'][$objp->fk_product])) {
+							$tmpproduct = new Product($db);
+							$tmpproduct->fetch($objp->fk_product);
+							$conf->cache['product'][$objp->fk_product] = $tmpproduct;
+						} else {
+							$tmpproduct = $conf->cache['product'][$objp->fk_product];
+						}
+
+						$linktoprod = $tmpproduct->getNomUrl(1);
 						$linktoprod .= ' - '.$objp->label."\n";
 
 						if (!empty($conf->productbatch->enabled)) {
 							if ($objp->tobatch) {
+								// Product
 								print '<td>';
 								print $linktoprod;
 								print "</td>";
@@ -822,6 +843,7 @@ if ($id > 0 || !empty($ref)) {
 									print '<td class="dispatch_dluo"></td>';
 								}
 							} else {
+								// Product
 								print '<td>';
 								print $linktoprod;
 								print "</td>";
@@ -1056,10 +1078,19 @@ if ($id > 0 || !empty($ref)) {
 
 				$dispatchBt = empty($conf->reception->enabled) ? $langs->trans("Receive") : $langs->trans("CreateReception");
 
-				print '<br><input type="submit" class="button" name="dispatch" value="'.dol_escape_htmltag($dispatchBt).'"';
+				print '<br>';
+				print '<input type="submit" class="button" name="dispatch" value="'.dol_escape_htmltag($dispatchBt).'"';
+				$disabled = 0;
+				if (!$permissiontoreceive) {
+					$disabled = 1;
+				}
 				if (count($listwarehouses) <= 0) {
+					$disabled = 1;
+				}
+				if ($disabled) {
 					print ' disabled';
 				}
+
 				print '>';
 			}
 			print '</div>';
@@ -1114,7 +1145,7 @@ if ($id > 0 || !empty($ref)) {
 	if ($conf->reception->enabled) {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."reception as r ON cfd.fk_reception = r.rowid";
 	}
-	$sql .= " WHERE cfd.fk_commande = ".$object->id;
+	$sql .= " WHERE cfd.fk_commande = ".((int) $object->id);
 	$sql .= " AND cfd.fk_product = p.rowid";
 	$sql .= " ORDER BY cfd.rowid ASC";
 
@@ -1132,10 +1163,11 @@ if ($id > 0 || !empty($ref)) {
 			print '<table id="dispatch_received_products" class="noborder centpercent">';
 
 			print '<tr class="liste_titre">';
+			// Reception ref
 			if ($conf->reception->enabled) {
 				print '<td>'.$langs->trans("Reception").'</td>';
 			}
-
+			// Product
 			print '<td>'.$langs->trans("Product").'</td>';
 			print '<td>'.$langs->trans("DateCreation").'</td>';
 			print '<td>'.$langs->trans("DateDeliveryPlanned").'</td>';
@@ -1163,9 +1195,14 @@ if ($id > 0 || !empty($ref)) {
 
 			print "</tr>\n";
 
+
 			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
+				$tmpproduct->id = $objp->fk_product;
+				$tmpproduct->ref = $objp->ref;
+				$tmpproduct->label = $objp->label;
+
 				if ($action == 'editline' && $lineid == $objp->dispatchlineid) {
 					print '<form name="editdispatchedlines" id="editdispatchedlines" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'#line_'.GETPOST('lineid', 'int').'" method="POST">
 					<input type="hidden" name="token" value="'.newToken().'">
@@ -1176,6 +1213,7 @@ if ($id > 0 || !empty($ref)) {
 
 				print '<tr class="oddeven" id="line_'.$objp->dispatchlineid.'" >';
 
+				// Reception ref
 				if (!empty($conf->reception->enabled)) {
 					print '<td>';
 					if (!empty($objp->fk_reception)) {
@@ -1187,8 +1225,16 @@ if ($id > 0 || !empty($ref)) {
 					print "</td>";
 				}
 
+				// Product
 				print '<td>';
-				print '<a href="'.DOL_URL_ROOT.'/product/fournisseurs.php?id='.$objp->fk_product.'">'.img_object($langs->trans("ShowProduct"), 'product').' '.$objp->ref.'</a>';
+				if (empty($conf->cache['product'][$objp->fk_product])) {
+					$tmpproduct = new Product($db);
+					$tmpproduct->fetch($objp->fk_product);
+					$conf->cache['product'][$objp->fk_product] = $tmpproduct;
+				} else {
+					$tmpproduct = $conf->cache['product'][$objp->fk_product];
+				}
+				print $tmpproduct->getNomUrl(1);
 				print ' - '.$objp->label;
 				print "</td>\n";
 				print '<td>'.dol_print_date($db->jdate($objp->datec), 'day').'</td>';
@@ -1258,7 +1304,7 @@ if ($id > 0 || !empty($ref)) {
 
 					// Add button to check/uncheck disaptching
 					print '<td class="center">';
-					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check))) {
+					if (!$permissiontocontrol) {
 						if (empty($objp->status)) {
 							print '<a class="button buttonRefused" href="#">'.$langs->trans("Approve").'</a>';
 							print '<a class="button buttonRefused" href="#">'.$langs->trans("Deny").'</a>';
@@ -1295,13 +1341,13 @@ if ($id > 0 || !empty($ref)) {
 				if ($action != 'editline' || $lineid != $objp->dispatchlineid) {
 					if (empty($reception->id) || ($reception->statut == Reception::STATUS_DRAFT)) { // only allow edit on draft reception
 						print '<td class="linecoledit center">';
-						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$objp->dispatchlineid.'#line_'.$objp->dispatchlineid.'">';
+						print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editline&token='.newToken().'&lineid='.$objp->dispatchlineid.'#line_'.$objp->dispatchlineid.'">';
 						print img_edit();
 						print '</a>';
 						print '</td>';
 
 						print '<td class="linecoldelete center">';
-						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=ask_deleteline&amp;lineid='.$objp->dispatchlineid.'#dispatch_received_products">';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=ask_deleteline&token='.newToken().'&lineid='.$objp->dispatchlineid.'#dispatch_received_products">';
 						print img_delete();
 						print '</a>';
 						print '</td>';
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index c38751fc138..d54d5553efb 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -46,16 +46,10 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
-// Security check
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
-
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -81,6 +75,15 @@ if ($object->fetch($id, $ref) < 0) {
 $upload_dir = $conf->fournisseur->commande->dir_output.'/'.dol_sanitizeFileName($object->ref);
 $object->fetch_thirdparty();
 
+// Security check
+$socid = 0;
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
+
+$permissiontoadd = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer); // Used by the include of actions_setnotes.inc.php
+
 
 /*
  * Actions
@@ -133,7 +136,7 @@ if ($object->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {
 			if ($action != 'classify') {
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -151,9 +154,10 @@ if ($object->id > 0) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 866063382bb..7d6b3b6936a 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -67,15 +67,15 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 $sql = "SELECT count(cf.rowid) as nb, fk_statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE cf.fk_soc = s.rowid";
 $sql .= " AND cf.entity IN (".getEntity('supplier_order').")";
 if ($user->socid) {
-	$sql .= ' AND cf.fk_soc = '.$user->socid;
+	$sql .= ' AND cf.fk_soc = '.((int) $user->socid);
 }
-if (!$user->rights->societe->client->voir && !$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 cf.fk_statut";
@@ -176,7 +176,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
@@ -185,7 +185,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	if (!empty($socid)) {
 		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 
@@ -272,7 +272,7 @@ if ($resql) {
 }
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 /*
@@ -283,7 +283,7 @@ $max = 5;
 $sql = "SELECT c.rowid, c.ref, c.fk_statut as status, c.tms, c.billed, s.nom as name, s.rowid as socid";
 $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE c.fk_soc = s.rowid";
@@ -292,7 +292,7 @@ $sql .= " AND c.entity IN (".getEntity('supplier_order').")";
 if (!empty($socid)) {
 	$sql .= " AND c.fk_soc = ".((int) $socid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " ORDER BY c.tms DESC";
@@ -355,12 +355,12 @@ if ($resql) {
  $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as name, s.rowid as socid";
 $sql.=" FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (empty($user->rights->societe->client->voir) && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE c.fk_soc = s.rowid";
 $sql.= " AND c.entity IN (".getEntity("supplier_order").")";
 $sql.= " AND c.fk_statut = 1";
 if ($socid) $sql.= " AND c.fk_soc = ".((int) $socid);
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .((int) $user->id);
+if (empty($user->rights->societe->client->voir) && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .((int) $user->id);
 $sql.= " ORDER BY c.rowid DESC";
 
 $resql=$db->query($sql);
@@ -417,7 +417,7 @@ print "</table></div><br>";
 }
 */
 
-print '</div></div></div>';
+print '</div></div>';
 
 $parameters = array('user' => $user);
 $reshook = $hookmanager->executeHooks('dashboardOrdersSuppliers', $parameters, $object); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 9de144f1f90..6c64672ee84 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -41,8 +41,8 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -74,7 +74,7 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
 
-if (!$user->rights->fournisseur->commande->lire) {
+if (empty($user->rights->fournisseur->commande->lire)) {
 	accessforbidden();
 }
 
@@ -144,7 +144,7 @@ if (!empty($conf->projet->enabled)) {
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {
 		if ($action != 'classify') {
-			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			$morehtmlref .= ' : ';
 		}
 		if ($action == 'classify') {
@@ -162,9 +162,10 @@ if (!empty($conf->projet->enabled)) {
 		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>';
+			$morehtmlref .= ' : '.$proj->getNomUrl(1);
+			if ($proj->title) {
+				$morehtmlref .= ' - '.$proj->title;
+			}
 		} else {
 			$morehtmlref .= '';
 		}
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index eb13ead4fbd..59c3a57c4ac 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1,14 +1,15 @@
 <?php
-/* Copyright (C) 2001-2006 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      Cédric Salvador      <csalvador@gpcsolutions.fr>
- * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
- * 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) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
+/* Copyright (C) 2001-2006 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      Cédric Salvador		<csalvador@gpcsolutions.fr>
+ * Copyright (C) 2014      Marcos García		<marcosgdf@gmail.com>
+ * 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) 2019      Nicolas Zabouri		<info@inovea-conseil.com>
+ * Copyright (C) 2021      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
@@ -52,12 +53,39 @@ $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'supplierorderlist';
 
-$search_orderyear = GETPOST("search_orderyear", "int");
-$search_ordermonth = GETPOST("search_ordermonth", "int");
-$search_orderday = GETPOST("search_orderday", "int");
-$search_deliveryyear = GETPOST("search_deliveryyear", "int");
-$search_deliverymonth = GETPOST("search_deliverymonth", "int");
-$search_deliveryday = GETPOST("search_deliveryday", "int");
+$search_date_order_startday = GETPOST('search_date_order_startday', 'int');
+$search_date_order_startmonth = GETPOST('search_date_order_startmonth', 'int');
+$search_date_order_startyear = GETPOST('search_date_order_startyear', 'int');
+$search_date_order_endday = GETPOST('search_date_order_endday', 'int');
+$search_date_order_endmonth = GETPOST('search_date_order_endmonth', 'int');
+$search_date_order_endyear = GETPOST('search_date_order_endyear', 'int');
+$search_date_order_start = dol_mktime(0, 0, 0, $search_date_order_startmonth, $search_date_order_startday, $search_date_order_startyear);	// Use tzserver
+$search_date_order_end = dol_mktime(23, 59, 59, $search_date_order_endmonth, $search_date_order_endday, $search_date_order_endyear);
+$search_date_delivery_startday = GETPOST('search_date_delivery_startday', 'int');
+$search_date_delivery_startmonth = GETPOST('search_date_delivery_startmonth', 'int');
+$search_date_delivery_startyear = GETPOST('search_date_delivery_startyear', 'int');
+$search_date_delivery_endday = GETPOST('search_date_delivery_endday', 'int');
+$search_date_delivery_endmonth = GETPOST('search_date_delivery_endmonth', 'int');
+$search_date_delivery_endyear = GETPOST('search_date_delivery_endyear', 'int');
+$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear);	// Use tzserver
+$search_date_delivery_end = dol_mktime(23, 59, 59, $search_date_delivery_endmonth, $search_date_delivery_endday, $search_date_delivery_endyear);
+
+$search_date_valid_startday = GETPOST('search_date_valid_startday', 'int');
+$search_date_valid_startmonth = GETPOST('search_date_valid_startmonth', 'int');
+$search_date_valid_startyear = GETPOST('search_date_valid_startyear', 'int');
+$search_date_valid_endday = GETPOST('search_date_valid_endday', 'int');
+$search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int');
+$search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int');
+$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear);	// Use tzserver
+$search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
+$search_date_approve_startday = GETPOST('search_date_approve_startday', 'int');
+$search_date_approve_startmonth = GETPOST('search_date_approve_startmonth', 'int');
+$search_date_approve_startyear = GETPOST('search_date_approve_startyear', 'int');
+$search_date_approve_endday = GETPOST('search_date_approve_endday', 'int');
+$search_date_approve_endmonth = GETPOST('search_date_approve_endmonth', 'int');
+$search_date_approve_endyear = GETPOST('search_date_approve_endyear', 'int');
+$search_date_approve_start = dol_mktime(0, 0, 0, $search_date_approve_startmonth, $search_date_approve_startday, $search_date_approve_startyear);	// Use tzserver
+$search_date_approve_end = dol_mktime(23, 59, 59, $search_date_approve_endmonth, $search_date_approve_endday, $search_date_approve_endyear);
 
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 
@@ -107,8 +135,8 @@ $result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
 $diroutputmassaction = $conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
@@ -123,10 +151,6 @@ if (!$sortorder) {
 	$sortorder = 'DESC';
 }
 
-if ($search_status == '') {
-	$search_status = -1;
-}
-
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new CommandeFournisseur($db);
 $hookmanager->initHooks(array('supplierorderlist'));
@@ -177,7 +201,9 @@ $arrayfields = array(
 	'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.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)
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -234,13 +260,39 @@ if (empty($reshook)) {
 		$search_multicurrency_montant_tva = '';
 		$search_multicurrency_montant_ttc = '';
 		$search_project_ref = '';
-		$search_status = -1;
-		$search_orderyear = '';
-		$search_ordermonth = '';
-		$search_orderday = '';
-		$search_deliveryday = '';
-		$search_deliverymonth = '';
-		$search_deliveryyear = '';
+		$search_status = '';
+		$search_date_order_startday = '';
+		$search_date_order_startmonth = '';
+		$search_date_order_startyear = '';
+		$search_date_order_endday = '';
+		$search_date_order_endmonth = '';
+		$search_date_order_endyear = '';
+		$search_date_order_start = '';
+		$search_date_order_end = '';
+		$search_date_delivery_startday = '';
+		$search_date_delivery_startmonth = '';
+		$search_date_delivery_startyear = '';
+		$search_date_delivery_endday = '';
+		$search_date_delivery_endmonth = '';
+		$search_date_delivery_endyear = '';
+		$search_date_delivery_start = '';
+		$search_date_delivery_end = '';
+		$search_date_valid_startday = '';
+		$search_date_valid_startmonth = '';
+		$search_date_valid_startyear = '';
+		$search_date_valid_endday = '';
+		$search_date_valid_endmonth = '';
+		$search_date_valid_endyear = '';
+		$search_date_valid_start = '';
+		$search_date_valid_end = '';
+		$search_date_approve_startday = '';
+		$search_date_approve_startmonth = '';
+		$search_date_approve_startyear = '';
+		$search_date_approve_endday = '';
+		$search_date_approve_endmonth = '';
+		$search_date_approve_endyear = '';
+		$search_date_approve_start = '';
+		$search_date_approve_end = '';
 		$billed = '';
 		$search_billed = '';
 		$toselect = '';
@@ -256,9 +308,42 @@ if (empty($reshook)) {
 	$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';
 
+	if ($action == 'validate' && $permissiontovalidate) {
+		if (GETPOST('confirm') == 'yes') {
+			$objecttmp = new CommandeFournisseur($db);
+			$db->begin();
+			$error = 0;
+
+			foreach ($toselect as $checked) {
+				if ($objecttmp->fetch($checked)) {
+					if ($objecttmp->statut == 0) {
+						$objecttmp->date_commande = dol_now();
+						$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))) {
+								$result = $objecttmp->approve($user);
+								setEventMessages($langs->trans("SupplierOrderValidatedAndApproved"), array($objecttmp->ref));
+							} else {
+								setEventMessages($langs->trans("SupplierOrderValidated"), array($objecttmp->ref));
+							}
+						} else {
+							setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+							$error++;
+						}
+					}
+				}
+			}
+
+			if (!$error) $db->commit();
+			else $db->rollback();
+		}
+	}
+
 	// Mass action to generate vendor bills
 	if ($massaction == 'confirm_createsupplierbills') {
 		$orders = GETPOST('toselect', 'array');
@@ -321,7 +406,7 @@ if (empty($reshook)) {
 				$sql .= ") VALUES (";
 				$sql .= $id_order;
 				$sql .= ", '".$db->escape($objecttmp->origin)."'";
-				$sql .= ", ".$objecttmp->id;
+				$sql .= ", ".((int) $objecttmp->id);
 				$sql .= ", '".$db->escape($objecttmp->element)."'";
 				$sql .= ")";
 
@@ -494,23 +579,77 @@ if (empty($reshook)) {
 			if ($search_status != '') {
 				$param .= '&search_status='.urlencode($search_status);
 			}
-			if ($search_orderday) {
-				$param .= '&search_orderday='.urlencode($search_orderday);
+			if ($search_date_order_startday) {
+				$param .= '&search_date_order_startday='.urlencode($search_date_order_startday);
 			}
-			if ($search_ordermonth) {
-				$param .= '&search_ordermonth='.urlencode($search_ordermonth);
+			if ($search_date_order_startmonth) {
+				$param .= '&search_date_order_startmonth='.urlencode($search_date_order_startmonth);
 			}
-			if ($search_orderyear) {
-				$param .= '&search_orderyear='.urlencode($search_orderyear);
+			if ($search_date_order_startyear) {
+				$param .= '&search_date_order_startyear='.urlencode($search_date_order_startyear);
 			}
-			if ($search_deliveryday) {
-				$param .= '&search_deliveryday='.urlencode($search_deliveryday);
+			if ($search_date_order_endday) {
+				$param .= '&search_date_order_endday='.urlencode($search_date_order_endday);
 			}
-			if ($search_deliverymonth) {
-				$param .= '&search_deliverymonth='.urlencode($search_deliverymonth);
+			if ($search_date_order_endmonth) {
+				$param .= '&search_date_order_endmonth='.urlencode($search_date_order_endmonth);
 			}
-			if ($search_deliveryyear) {
-				$param .= '&search_deliveryyear='.urlencode($search_deliveryyear);
+			if ($search_date_order_endyear) {
+				$param .= '&search_date_order_endyear='.urlencode($search_date_order_endyear);
+			}
+			if ($search_date_delivery_startday) {
+				$param .= '&search_date_delivery_startday='.urlencode($search_date_delivery_startday);
+			}
+			if ($search_date_delivery_startmonth) {
+				$param .= '&search_date_delivery_startmonth='.urlencode($search_date_delivery_startmonth);
+			}
+			if ($search_date_delivery_startyear) {
+				$param .= '&search_date_delivery_startyear='.urlencode($search_date_delivery_startyear);
+			}
+			if ($search_date_delivery_endday) {
+				$param .= '&search_date_delivery_endday='.urlencode($search_date_delivery_endday);
+			}
+			if ($search_date_delivery_endmonth) {
+				$param .= '&search_date_delivery_endmonth='.urlencode($search_date_delivery_endmonth);
+			}
+			if ($search_date_delivery_endyear) {
+				$param .= '&search_date_delivery_endyear='.urlencode($search_date_delivery_endyear);
+			}
+			if ($search_date_valid_startday) {
+				$param .= '&search_date_valid_startday='.urlencode($search_date_valid_startday);
+			}
+			if ($search_date_valid_startmonth) {
+				$param .= '&search_date_valid_startmonth='.urlencode($search_date_valid_startmonth);
+			}
+			if ($search_date_valid_startyear) {
+				$param .= '&search_date_valid_startyear='.urlencode($search_date_valid_startyear);
+			}
+			if ($search_date_valid_endday) {
+				$param .= '&search_date_valid_endday='.urlencode($search_date_valid_endday);
+			}
+			if ($search_date_valid_endmonth) {
+				$param .= '&search_date_valid_endmonth='.urlencode($search_date_valid_endmonth);
+			}
+			if ($search_date_valid_endyear) {
+				$param .= '&search_date_valid_endyear='.urlencode($search_date_valid_endyear);
+			}
+			if ($search_date_approve_startday) {
+				$param .= '&search_date_approve_startday='.urlencode($search_date_approve_startday);
+			}
+			if ($search_date_approve_startmonth) {
+				$param .= '&search_date_approve_startmonth='.urlencode($search_date_approve_startmonth);
+			}
+			if ($search_date_approve_startyear) {
+				$param .= '&search_date_approve_startyear='.urlencode($search_date_approve_startyear);
+			}
+			if ($search_date_approve_endday) {
+				$param .= '&search_date_approve_endday='.urlencode($search_date_approve_endday);
+			}
+			if ($search_date_approve_endmonth) {
+				$param .= '&search_date_approve_endmonth='.urlencode($search_date_approve_endmonth);
+			}
+			if ($search_date_approve_endyear) {
+				$param .= '&search_date_approve_endyear='.urlencode($search_date_approve_endyear);
 			}
 			if ($search_ref) {
 				$param .= '&search_ref='.urlencode($search_ref);
@@ -605,7 +744,7 @@ if ($sall || $search_product_category > 0) {
 $sql .= ' s.rowid as socid, s.nom as name, 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,";
+$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,";
 $sql .= ' cf.fk_multicurrency, cf.multicurrency_code, cf.multicurrency_tx, cf.multicurrency_total_ht, cf.multicurrency_total_tva, cf.multicurrency_total_ttc,';
 $sql .= ' cf.date_creation as date_creation, cf.tms as date_update,';
 $sql .= ' cf.note_public, cf.note_private,';
@@ -614,7 +753,7 @@ $sql .= " u.firstname, u.lastname, u.photo, u.login, u.email as user_email, u.st
 // 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
@@ -626,7 +765,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."commande_fournisseur as cf";
-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 (cf.rowid = ef.fk_object)";
 }
 if ($sall || $search_product_category > 0) {
@@ -638,7 +777,7 @@ if ($search_product_category > 0) {
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON cf.fk_user_author = u.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = cf.fk_projet";
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
+if ($search_sale > 0 || (empty($user->rights->societe->client->voir) && !$socid)) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $parameters = array();
@@ -649,7 +788,7 @@ $sql .= ' AND cf.entity IN ('.getEntity('supplier_order').')';
 if ($socid > 0) {
 	$sql .= " AND s.rowid = ".((int) $socid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+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) {
@@ -680,8 +819,30 @@ if (GETPOST('statut', 'intcomma') !== '') {
 if ($search_status != '' && $search_status != '-1') {
 	$sql .= " AND cf.fk_statut IN (".$db->sanitize($db->escape($search_status)).")";
 }
-$sql .= dolSqlDateFilter("cf.date_commande", $search_orderday, $search_ordermonth, $search_orderyear);
-$sql .= dolSqlDateFilter("cf.date_livraison", $search_deliveryday, $search_deliverymonth, $search_deliveryyear);
+if ($search_date_order_start) {
+	$sql .= " AND cf.date_commande >= '".$db->idate($search_date_order_start)."'";
+}
+if ($search_date_order_end) {
+	$sql .= " AND cf.date_commande <= '".$db->idate($search_date_order_end)."'";
+}
+if ($search_date_delivery_start) {
+	$sql .= " AND cf.date_livraison >= '".$db->idate($search_date_delivery_start)."'";
+}
+if ($search_date_delivery_end) {
+	$sql .= " AND cf.date_livraison <= '".$db->idate($search_date_delivery_end)."'";
+}
+if ($search_date_valid_start) {
+	$sql .= " AND cf.date_commande >= '".$db->idate($search_date_valid_start)."'";
+}
+if ($search_date_valid_end) {
+	$sql .= " AND cf.date_commande <= '".$db->idate($search_date_valid_end)."'";
+}
+if ($search_date_approve_start) {
+	$sql .= " AND cf.date_livraison >= '".$db->idate($search_date_approve_start)."'";
+}
+if ($search_date_approve_end) {
+	$sql .= " AND cf.date_livraison <= '".$db->idate($search_date_approve_end)."'";
+}
 if ($search_town) {
 	$sql .= natural_search('s.town', $search_town);
 }
@@ -722,7 +883,7 @@ if ($search_total_ttc != '') {
 	$sql .= natural_search('cf.total_ttc', $search_total_ttc, 1);
 }
 if ($search_multicurrency_code != '') {
-	$sql .= ' AND cf.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
+	$sql .= " AND cf.multicurrency_code = '".$db->escape($search_multicurrency_code)."'";
 }
 if ($search_multicurrency_tx != '') {
 	$sql .= natural_search('cf.multicurrency_tx', $search_multicurrency_tx, 1);
@@ -793,23 +954,77 @@ if ($resql) {
 	if ($sall) {
 		$param .= "&search_all=".urlencode($sall);
 	}
-	if ($search_orderday) {
-		$param .= '&search_orderday='.urlencode($search_orderday);
+	if ($search_date_order_startday) {
+		$param .= '&search_date_order_startday='.urlencode($search_date_order_startday);
 	}
-	if ($search_ordermonth) {
-		$param .= '&search_ordermonth='.urlencode($search_ordermonth);
+	if ($search_date_order_startmonth) {
+		$param .= '&search_date_order_startmonth='.urlencode($search_date_order_startmonth);
 	}
-	if ($search_orderyear) {
-		$param .= '&search_orderyear='.urlencode($search_orderyear);
+	if ($search_date_order_startyear) {
+		$param .= '&search_date_order_startyear='.urlencode($search_date_order_startyear);
 	}
-	if ($search_deliveryday) {
-		$param .= '&search_deliveryday='.urlencode($search_deliveryday);
+	if ($search_date_order_endday) {
+		$param .= '&search_date_order_endday='.urlencode($search_date_order_endday);
 	}
-	if ($search_deliverymonth) {
-		$param .= '&search_deliverymonth='.urlencode($search_deliverymonth);
+	if ($search_date_order_endmonth) {
+		$param .= '&search_date_order_endmonth='.urlencode($search_date_order_endmonth);
 	}
-	if ($search_deliveryyear) {
-		$param .= '&search_deliveryyear='.urlencode($search_deliveryyear);
+	if ($search_date_order_endyear) {
+		$param .= '&search_date_order_endyear='.urlencode($search_date_order_endyear);
+	}
+	if ($search_date_delivery_startday) {
+		$param .= '&search_date_delivery_startday='.urlencode($search_date_delivery_startday);
+	}
+	if ($search_date_delivery_startmonth) {
+		$param .= '&search_date_delivery_startmonth='.urlencode($search_date_delivery_startmonth);
+	}
+	if ($search_date_delivery_startyear) {
+		$param .= '&search_date_delivery_startyear='.urlencode($search_date_delivery_startyear);
+	}
+	if ($search_date_delivery_endday) {
+		$param .= '&search_date_delivery_endday='.urlencode($search_date_delivery_endday);
+	}
+	if ($search_date_delivery_endmonth) {
+		$param .= '&search_date_delivery_endmonth='.urlencode($search_date_delivery_endmonth);
+	}
+	if ($search_date_delivery_endyear) {
+		$param .= '&search_date_delivery_endyear='.urlencode($search_date_delivery_endyear);
+	}
+	if ($search_date_valid_startday) {
+		$param .= '&search_date_valid_startday='.urlencode($search_date_valid_startday);
+	}
+	if ($search_date_valid_startmonth) {
+		$param .= '&search_date_valid_startmonth='.urlencode($search_date_valid_startmonth);
+	}
+	if ($search_date_valid_startyear) {
+		$param .= '&search_date_valid_startyear='.urlencode($search_date_valid_startyear);
+	}
+	if ($search_date_valid_endday) {
+		$param .= '&search_date_valid_endday='.urlencode($search_date_valid_endday);
+	}
+	if ($search_date_valid_endmonth) {
+		$param .= '&search_date_valid_endmonth='.urlencode($search_date_valid_endmonth);
+	}
+	if ($search_date_valid_endyear) {
+		$param .= '&search_date_valid_endyear='.urlencode($search_date_valid_endyear);
+	}
+	if ($search_date_approve_startday) {
+		$param .= '&search_date_approve_startday='.urlencode($search_date_approve_startday);
+	}
+	if ($search_date_approve_startmonth) {
+		$param .= '&search_date_approve_startmonth='.urlencode($search_date_approve_startmonth);
+	}
+	if ($search_date_approve_startyear) {
+		$param .= '&search_date_approve_startyear='.urlencode($search_date_approve_startyear);
+	}
+	if ($search_date_approve_endday) {
+		$param .= '&search_date_approve_endday='.urlencode($search_date_approve_endday);
+	}
+	if ($search_date_approve_endmonth) {
+		$param .= '&search_date_approve_endmonth='.urlencode($search_date_approve_endmonth);
+	}
+	if ($search_date_approve_endyear) {
+		$param .= '&search_date_approve_endyear='.urlencode($search_date_approve_endyear);
 	}
 	if ($search_ref) {
 		$param .= '&search_ref='.urlencode($search_ref);
@@ -882,6 +1097,15 @@ if ($resql) {
 		'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 		'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 	);
+
+	if ($permissiontovalidate) {
+		if ($user->rights->fournisseur->commande->approuver && 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");
+		}
+	}
+
 	if ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer) {
 		$arrayofmassactions['createbills'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisSupplier");
 	}
@@ -921,6 +1145,10 @@ if ($resql) {
 	$trackid = 'sord'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
+	if ($massaction == 'prevalidate') {
+		print $form->formconfirm($_SERVER["PHP_SELF"].$fieldstosearchall, $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);
+	}
+
 	if ($massaction == 'createbills') {
 		//var_dump($_REQUEST);
 		print '<input type="hidden" name="massaction" value="confirm_createsupplierbills">';
@@ -974,14 +1202,14 @@ if ($resql) {
 		$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>';
 	}
 	// If the user can view other users
 	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');
+		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
@@ -990,7 +1218,7 @@ if ($resql) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300 widthcentpercentminusx', 1);
 		$moreforfilter .= '</div>';
 	}
 	$parameters = array();
@@ -1075,22 +1303,24 @@ if ($resql) {
 	}
 	// Date order
 	if (!empty($arrayfields['cf.date_commande']['checked'])) {
-		print '<td class="liste_titre nowraponall center">';
-		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-			print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_orderday" value="'.$search_orderday.'">';
-		}
-		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_ordermonth" value="'.$search_ordermonth.'">';
-		$formother->select_year($search_orderyear ? $search_orderyear : -1, 'search_orderyear', 1, 20, 5);
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_order_start ? $search_date_order_start : -1, 'search_date_order_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print '</div>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_order_end ? $search_date_order_end : -1, 'search_date_order_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
 		print '</td>';
 	}
 	// Date delivery
 	if (!empty($arrayfields['cf.date_livraison']['checked'])) {
-		print '<td class="liste_titre nowraponall center">';
-		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-			print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_deliveryday" value="'.$search_deliveryday.'">';
-		}
-		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_deliverymonth" value="'.$search_deliverymonth.'">';
-		$formother->select_year($search_deliveryyear ? $search_deliveryyear : -1, 'search_deliveryyear', 1, 20, 5);
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_delivery_start ? $search_date_delivery_start : -1, 'search_date_delivery_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print '</div>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_delivery_end ? $search_date_delivery_end : -1, 'search_date_delivery_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
 		print '</td>';
 	}
 	if (!empty($arrayfields['cf.total_ht']['checked'])) {
@@ -1170,6 +1400,28 @@ if ($resql) {
 		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1, 1);
 		print '</td>';
 	}
+	// Date valid
+	if (!empty($arrayfields['cf.date_valid']['checked'])) {
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_valid_start ? $search_date_valid_start : -1, 'search_date_valid_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print '</div>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_valid_end ? $search_date_valid_end : -1, 'search_date_valid_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
+		print '</td>';
+	}
+	// Date approve
+	if (!empty($arrayfields['cf.date_approve']['checked'])) {
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_approve_start ? $search_date_approve_start : -1, 'search_date_approve_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print '</div>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_approve_end ? $search_date_approve_end : -1, 'search_date_approve_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
+		print '</td>';
+	}
 	// Action column
 	print '<td class="liste_titre middle">';
 	$searchpicto = $form->showFilterButtons();
@@ -1261,6 +1513,12 @@ if ($resql) {
 	if (!empty($arrayfields['cf.billed']['checked'])) {
 		print_liste_field_titre($arrayfields['cf.billed']['label'], $_SERVER["PHP_SELF"], 'cf.billed', '', $param, '', $sortfield, $sortorder, 'center ');
 	}
+	if (!empty($arrayfields['cf.date_valid']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.date_valid']['label'], $_SERVER["PHP_SELF"], "cf.date_valid", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['cf.date_approve']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.date_approve']['label'], $_SERVER["PHP_SELF"], 'cf.date_approve', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
@@ -1559,6 +1817,25 @@ if ($resql) {
 			}
 		}
 
+		// valid date
+		if (!empty($arrayfields['cf.date_valid']['checked'])) {
+			print '<td class="center">';
+			print dol_print_date($db->jdate($obj->date_valid), 'day');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// approve date
+		if (!empty($arrayfields['cf.date_approve']['checked'])) {
+			print '<td class="center">';
+			print dol_print_date($db->jdate($obj->date_approve), 'day');
+			print '</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
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index d9b0904c7ef..1c67c03d727 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -43,13 +43,13 @@ $action = GETPOST('action', 'aZ09');
 if ($user->socid) {
 	$socid = $user->socid;
 }
+
+$hookmanager->initHooks(array('ordersuppliercardnote'));
 $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
 
 $object = new CommandeFournisseur($db);
 $object->fetch($id, $ref);
 
-$hookmanager->initHooks(array('ordersuppliercardnote'));
-
 $permissionnote = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer); // Used by the include of actions_setnotes.inc.php
 
 
@@ -57,7 +57,13 @@ $permissionnote = ($user->rights->fournisseur->commande->creer || $user->rights-
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$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
+}
 
 
 /*
@@ -105,7 +111,7 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {
 				if ($action != 'classify') {
-					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
 				}
 				if ($action == 'classify') {
@@ -123,9 +129,10 @@ if ($id > 0 || !empty($ref)) {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
index a152ca26ff1..1efd78df372 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 -->\n";
+print "<!-- BEGIN PHP TEMPLATE fourn/commande/tpl/linkedopjectblock.tpl.php -->\n";
 
 
 global $user;
@@ -55,7 +55,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 			echo price($objectlink->total_ht);
 		} ?></td>
 		<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
-		<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+		<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 	</tr>
 	<?php
 }
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 9fd4dd30b26..9d6e3abd4cf 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -41,8 +41,8 @@ if ($user->socid > 0) {
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -64,18 +64,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
  */
 
 $sql = "SELECT s.rowid as socid, s.nom as name, st.libelle as stcomm, p.rowid as cidp, p.lastname, p.firstname, p.email, p.phone";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", sc.fk_soc, sc.fk_user ";
 }
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."socpeople as p, ".MAIN_DB_PREFIX."c_stcomm as st";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE s.fk_stcomm = st.id";
 $sql .= " AND s.fournisseur = 1";
 $sql .= " AND s.rowid = p.fk_soc";
 $sql .= " AND s.entity IN (".getEntity('societe').")";
-if (!$user->rights->societe->client->voir && !$socid) {
+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/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
new file mode 100644
index 00000000000..502d0d124ce
--- /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->projet->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', 'nohtml'); // deprecated
+			$object->title = GETPOST('title', 'nohtml');
+			$object->fk_project = GETPOST('projectid', 'int');
+			$object->ref_supplier = GETPOST('ref_supplier', 'nohtml');
+
+			$object->note_private = GETPOST('note_private', 'restricthtml');
+			$object->note_public = GETPOST('note_public', 'restricthtml');
+			$object->model_pdf = GETPOST('modelpdf', 'alpha');
+			$object->usenewprice = GETPOST('usenewprice', 'alpha');
+
+			$object->frequency = $frequency;
+			$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->projet->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->projet->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->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>";
+			$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->projet->enabled)) {
+			$langs->load('projects');
+			$morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+			if ($usercancreate) {
+				if ($action != 'classify') {
+					$morehtmlref .= '<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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 37ef9c813a2..b98ef2f8cc6 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -37,6 +37,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';
@@ -140,8 +141,23 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/fourn/facture/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.'/fourn/facture/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
 	if ($cancel) {
-		if (!empty($backtopage)) {
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -580,7 +596,7 @@ if (empty($reshook)) {
 				$sql = 'SELECT SUM(pf.amount) as total_paiements';
 				$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf, '.MAIN_DB_PREFIX.'paiementfourn as p';
 				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id AND c.entity IN ('.getEntity('c_paiement').')';
-				$sql .= ' WHERE pf.fk_facturefourn = '.$object->id;
+				$sql .= ' WHERE pf.fk_facturefourn = '.((int) $object->id);
 				$sql .= ' AND pf.fk_paiementfourn = p.rowid';
 				$sql .= ' AND p.entity IN ('.getEntity('invoice').')';
 
@@ -597,7 +613,7 @@ if (empty($reshook)) {
 				$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
 				$sql .= " re.description, re.fk_invoice_supplier_source";
 				$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";
-				$sql .= " WHERE fk_invoice_supplier = ".$object->id;
+				$sql .= " WHERE fk_invoice_supplier = ".((int) $object->id);
 				$resql = $db->query($sql);
 				if (!empty($resql)) {
 					while ($obj = $db->fetch_object($resql)) {
@@ -868,8 +884,52 @@ if (empty($reshook)) {
 			}
 		}
 
+		// Standard invoice or Deposit invoice, created from a Predefined template invoice
+		if ((GETPOST('type') == FactureFournisseur::TYPE_STANDARD || GETPOST('type') == FactureFournisseur::TYPE_DEPOSIT) && GETPOST('fac_rec', 'int') > 0) {
+			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';
+			}
+
+			if (!$error) {
+				$object->socid = GETPOST('socid', 'int');
+				$object->type            = GETPOST('type');
+				$object->ref             = GETPOST('ref');
+				$object->date            = $dateinvoice;
+				$object->note_public = trim(GETPOST('note_public', 'restricthtml'));
+				$object->note_private    = trim(GETPOST('note_private', 'restricthtml'));
+				$object->ref_client      = GETPOST('ref_client');
+				$object->model_pdf = GETPOST('model');
+				$object->fk_project = GETPOST('projectid', 'int');
+				$object->cond_reglement_id	= (GETPOST('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
+				$object->mode_reglement_id	= GETPOST('mode_reglement_id', 'int');
+				$object->fk_account = GETPOST('fk_account', 'int');
+				$object->amount = 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 = GETPOST('fac_rec', 'int');
+				$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
+			}
+		}
+
 		// Standard invoice or Deposit invoice, not from a Predefined template invoice
-		if (GETPOST('type') == FactureFournisseur::TYPE_STANDARD || GETPOST('type') == FactureFournisseur::TYPE_DEPOSIT) {
+		if (GETPOST('type') == FactureFournisseur::TYPE_STANDARD || GETPOST('type') == FactureFournisseur::TYPE_DEPOSIT && GETPOST('fac_rec') <= 0) {
 			if (GETPOST('socid', 'int') < 1) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Supplier')), null, 'errors');
 				$action = 'create';
@@ -1284,7 +1344,7 @@ if (empty($reshook)) {
 		$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
 
 		$remise_percent = price2num(GETPOST('remise_percent'), '', 2);
-		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), 'MU', 2);
+		$pu_devise = price2num(GETPOST('multicurrency_subprice'), 'MU', 2);
 
 		// Extrafields Lines
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -1296,7 +1356,7 @@ if (empty($reshook)) {
 			}
 		}
 
-		$result = $object->updateline(GETPOST('lineid', 'int'), $label, $up, $tva_tx, $localtax1_tx, $localtax2_tx, price2num(GETPOST('qty'), 'MS'), GETPOST('productid', 'int'), $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, GETPOST('units'), $pu_ht_devise, GETPOST('fourn_ref', 'alpha'));
+		$result = $object->updateline(GETPOST('lineid', 'int'), $label, $up, $tva_tx, $localtax1_tx, $localtax2_tx, price2num(GETPOST('qty'), 'MS'), GETPOST('productid', 'int'), $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, GETPOST('units'), $pu_devise, GETPOST('fourn_ref', 'alpha'));
 		if ($result >= 0) {
 			unset($_POST['label']);
 			unset($_POST['fourn_ref']);
@@ -1312,6 +1372,8 @@ if (empty($reshook)) {
 			unset($_POST['date_endday']);
 			unset($_POST['date_endmonth']);
 			unset($_POST['date_endyear']);
+			unset($_POST['price_ttc']);
+			unset($_POST['price_ht']);
 
 			$db->commit();
 		} else {
@@ -1340,17 +1402,18 @@ if (empty($reshook)) {
 		$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 = '';
 		}
 
+		$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 = price2num(GETPOST('remise_percent'.$predef), 2);
-		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'MU', 2);
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -1440,8 +1503,8 @@ 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)) {
-					$product_desc='';
+				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;
@@ -1450,32 +1513,39 @@ if (empty($reshook)) {
 					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 				}
 
-				$type = $productsupplier->type;
-				if (GETPOST('price_ht') != '' || GETPOST('price_ht_devise') != '') {
-					$price_base_type = 'HT';
-					$pu = price2num($price_ht, 'MU');
-					$pu_ht_devise = price2num($price_ht_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;
-					} else {
-						$pu = $productsupplier->fourn_pu;
-						$pu_ht_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'));
+				// 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);
 
+				$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
 				}
@@ -1500,7 +1570,7 @@ if (empty($reshook)) {
 					$array_options,
 					$productsupplier->fk_unit,
 					0,
-					$pu_ht_devise,
+					$pu_devise,
 					$ref_supplier,
 					''
 				);
@@ -1542,9 +1612,9 @@ if (empty($reshook)) {
 				$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, 'CU');
+			$pu_devise = price2num($price_devise, 'CU');
 
-			$result = $object->addline($product_desc, $pu_ht, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $date_start, $date_end, 0, $tva_npr, $price_base_type, $type, -1, 0, $array_options, $fk_unit, 0, $pu_ht_devise, $ref_supplier);
+			$result = $object->addline($product_desc, $pu_ht, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $date_start, $date_end, 0, $tva_npr, $price_base_type, $type, -1, 0, $array_options, $fk_unit, 0, $pu_devise, $ref_supplier);
 		}
 
 		//print "xx".$tva_tx; exit;
@@ -1932,32 +2002,108 @@ 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) && GETPOST('fac_rec', 'int') > 0) {
+		$invoice_predefined->fetch(GETPOST('fac_rec', 'int'));
+	}
+
 	// Third party
 	print '<tr><td class="fieldrequired">'.$langs->trans('Supplier').'</td>';
 	print '<td>';
 
-	if ($societe->id > 0) {
+	if ($societe->id > 0 && (!GETPOST('fac_rec', 'int') || !empty($invoice_predefined->frequency))) {
 		$absolute_discount = $societe->getAvailableDiscounts('', '', 0, 1);
-		print $societe->getNomUrl(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');
+		print img_picto('', 'company').$form->select_company($societe->id, '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 (!GETPOST('fac_rec', 'int')) {
+			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) && GETPOST('fac_rec', 'int') > 0) {
+		$invoice_predefined->fetch(GETPOST('fac_rec', 'int'));
+
+		$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="'.GETPOST('fac_rec', 'int').'">';
+				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 (GETPOST('fac_rec', 'int') == $objp->rowid) {
+						print ' selected';
+						$exampletemplateinvoice->fetch(GETPOST('fac_rec', 'int'));
+					}
+					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) {
@@ -1982,7 +2128,7 @@ if ($action == 'create') {
 		if (empty($conf->global->INVOICE_DISABLE_DEPOSIT)) {
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			$tmp='<input type="radio" id="radio_deposit" name="type" value="3"' . (GETPOST('type') == 3 ? ' checked' : '') . '> ';
-			print '<script type="text/javascript" language="javascript">
+			print '<script type="text/javascript">
 			jQuery(document).ready(function() {
     			jQuery("#typestandardinvoice, #valuestandardinvoice").click(function() {
     				jQuery("#radio_standard").prop("checked", true);
@@ -2064,7 +2210,7 @@ if ($action == 'create') {
 			$tmp='<input type="radio" name="type" id="radio_replacement" value="1"' . (GETPOST('type') == 1 ? ' checked' : '');
 			if (! $options) $tmp.=' disabled';
 			$tmp.='> ';
-			print '<script type="text/javascript" language="javascript">
+			print '<script type="text/javascript">
 			jQuery(document).ready(function() {
 				jQuery("#fac_replacement").change(function() {
 					jQuery("#radio_replacement").prop("checked", true);
@@ -2136,7 +2282,7 @@ if ($action == 'create') {
 				}
 				$tmp .= '> ';
 				// Show credit note options only if we checked credit note
-				print '<script type="text/javascript" language="javascript">
+				print '<script type="text/javascript">
    				jQuery(document).ready(function() {
    					if (! jQuery("#radio_creditnote").is(":checked"))
    					{
@@ -2263,6 +2409,34 @@ if ($action == 'create') {
 		print '</td></tr>';
 	}
 
+	// Help of substitution key
+	$htmltext = '';
+	if (GETPOST('fac_rec', 'int') > 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"));
@@ -2348,16 +2522,12 @@ if ($action == 'create') {
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
-	// Bouton "Create Draft"
+
 	print "</table>\n";
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-	print '</div>';
+	print $form->buttonsSaveCancel("CreateDraft");
 
 	// Show origin lines
 	if (is_object($objectsrc)) {
@@ -2384,18 +2554,23 @@ if ($action == 'create') {
 
 		$productstatic = new Product($db);
 
-		$object->fetch($id, $ref);
-		$result = $object->fetch_thirdparty();
-		if ($result < 0) {
-			dol_print_error($db);
+		$result = $object->fetch($id, $ref);
+		if ($result <= 0) {
+			$langs->load("errors");
+			print $langs->trans("ErrorRecordNotFound");
+			llxFooter();
+			$db->close();
+			exit;
 		}
 
-		$societe = new Fournisseur($db);
-		$result = $societe->fetch($object->socid);
+		$result = $object->fetch_thirdparty();
 		if ($result < 0) {
-			dol_print_error($db);
+			dol_print_error($db, $object->error, $object->errors);
+			exit;
 		}
 
+		$societe = $object->thirdparty;
+
 		$totalpaye = $object->getSommePaiement();
 		$totalcreditnotes = $object->getSumCreditNotesUsed();
 		$totaldeposits = $object->getSumDepositsUsed();
@@ -2557,11 +2732,11 @@ if ($action == 'create') {
 		}
 
 		// Confirmation set paid
-		if ($action == 'paid' && $resteapayer <= 0) {
+		if ($action == 'paid' && ($resteapayer <= 0 || (!empty($conf->global->SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) && $resteapayer == $object->total_ttc))) {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidBill', $object->ref), 'confirm_paid', '', 0, 1);
 		}
 
-		if ($action == 'paid' && $resteapayer > 0) {
+		if ($action == 'paid' && $resteapayer > 0 && (empty($conf->global->SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) || $resteapayer != $object->total_ttc)) {
 			$close = array();
 			// Code
 			$i = 0;
@@ -2655,7 +2830,7 @@ if ($action == 'create') {
 		$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);
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'supplier');
 		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>)';
 		}
@@ -2665,7 +2840,7 @@ if ($action == 'create') {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($usercancreate) {
 				if ($action != 'classify') {
-					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+					$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);
@@ -2682,9 +2857,10 @@ if ($action == 'create') {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
@@ -2714,8 +2890,12 @@ if ($action == 'create') {
 		}
 		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 			$facusing = new FactureFournisseur($db);
-			$facusing->fetch($object->fk_facture_source);
-			print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
+			if ($object->fk_facture_source > 0) {
+				$facusing->fetch($object->fk_facture_source);
+				print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
+			} else {
+				print ' ('.$langs->transnoentities("CorrectedInvoiceNotFound").')';
+			}
 		}
 
 		$facidavoir = $object->getListIdAvoirFromInvoice();
@@ -2745,6 +2925,19 @@ 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>';
 
 
@@ -2782,7 +2975,7 @@ if ($action == 'create') {
 		print $langs->trans('PaymentConditions');
 		print '<td>';
 		if ($action != 'editconditions' && $form_permission) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
@@ -2811,7 +3004,7 @@ if ($action == 'create') {
 		print $langs->trans('PaymentMode');
 		print '</td>';
 		if ($action != 'editmode' && $form_permission2) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
@@ -2831,7 +3024,7 @@ if ($action == 'create') {
 			print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
 			print '</td>';
 			if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_DRAFT) {
-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+				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>';
@@ -2850,7 +3043,7 @@ if ($action == 'create') {
 				print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
 				print '</td>';
 				if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
-					print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+					print '<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>';
@@ -2878,7 +3071,7 @@ if ($action == 'create') {
 			print $langs->trans('BankAccount');
 			print '<td>';
 			if ($action != 'editbankaccount' && $usercancreate) {
-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+				print '<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>';
@@ -2898,7 +3091,7 @@ if ($action == 'create') {
 			print $langs->trans('IncotermLabel');
 			print '<td><td class="right">';
 			if ($usercancreate) {
-				print '<a class="editfielda" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+				print '<a class="editfielda" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
 			} else {
 				print '&nbsp;';
 			}
@@ -2921,7 +3114,7 @@ if ($action == 'create') {
 			print $langs->trans('IntracommReportTransportMode');
 			print '</td>';
 			if ($action != 'editmode' && ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer)) {
-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit().'</a></td>';
+				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'">'.img_edit().'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td>';
@@ -2942,7 +3135,6 @@ if ($action == 'create') {
 		print '</div>';
 
 		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border tableforfield centpercent">';
@@ -3044,7 +3236,7 @@ if ($action == 'create') {
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_paiementfourn = p.rowid';
-		$sql .= ' WHERE pf.fk_facturefourn = '.$object->id;
+		$sql .= ' WHERE pf.fk_facturefourn = '.((int) $object->id);
 		$sql .= ' ORDER BY p.datep, p.tms';
 
 		$result = $db->query($sql);
@@ -3158,11 +3350,10 @@ if ($action == 'create') {
 			$creditnoteamount = 0;
 			$depositamount = 0;
 
-
 			$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
 			$sql .= " re.description, re.fk_invoice_supplier_source";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";
-			$sql .= " WHERE fk_invoice_supplier = ".$object->id;
+			$sql .= " WHERE fk_invoice_supplier = ".((int) $object->id);
 			$resql = $db->query($sql);
 			if ($resql) {
 				$num = $db->num_rows($resql);
@@ -3258,8 +3449,21 @@ if ($action == 'create') {
 			}
 			print '</span>';
 			print '</td>';
-			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td>';
-			print '<td class="nowrap">&nbsp;</td></tr>';
+			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td><td>&nbsp;</td></tr>';
+
+			// Remainder to pay Multicurrency
+			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 '</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>';
+			}
 		} else // Credit note
 		{
 			$cssforamountpaymentcomplete = 'amountpaymentneutral';
@@ -3282,8 +3486,21 @@ if ($action == 'create') {
 			}
 			print '</td>';
 			print '</span>';
-			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($sign * $resteapayeraffiche).'</td>';
-			print '<td class="nowrap">&nbsp;</td></tr>';
+			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($sign * $resteapayeraffiche).'</td><td>&nbsp;</td></tr>';
+
+			// Remainder to pay back Multicurrency
+			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 '</span>';
+				print '</td>';
+				print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($sign * $object->multicurrency_tx * $resteapayeraffiche, 'MT')).'</td><td>&nbsp;</td></tr>';
+			}
 
 			// Sold credit note
 			// print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans('TotalTTC').' :</td>';
@@ -3294,7 +3511,6 @@ if ($action == 'create') {
 		print '</table>';
 		print '</div>';
 
-		print '</div>';
 		print '</div>';
 		print '</div>';
 
@@ -3384,7 +3600,7 @@ if ($action == 'create') {
 					$ventilExportCompta = $object->getVentilExportCompta(); // Should be 0 since the sum of payments are zero. But we keep the protection.
 
 					if ($ventilExportCompta == 0) {
-						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>';
+						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans('Modify').'</a>';
 					} else {
 						print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Modify').'</span>';
 					}
@@ -3399,7 +3615,7 @@ if ($action == 'create') {
 					|| ($object->type == FactureFournisseur::TYPE_DEPOSIT && empty($discount->id)))
 					&& ($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED)) {				// A paid invoice (partially or completely)
 					if (!$facidnext && $object->close_code != 'replaced' && $usercancreate) {	// Not replaced by another invoice
-						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a>';
+						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans('ReOpen').'</a>';
 					} else {
 						if ($usercancreate) {
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ReOpen').'</span>';
@@ -3466,14 +3682,17 @@ if ($action == 'create') {
 				}
 
 				// Classify paid
-				if (($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && (($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->type != FactureFournisseur::TYPE_DEPOSIT && $resteapayer <= 0) || ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $resteapayer >= 0)))
-					|| ($object->type == FactureFournisseur::TYPE_DEPOSIT && $object->paye == 0 && $object->total_ttc > 0 && $resteapayer == 0 && empty($discount->id))
+				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && (
+						($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->type != FactureFournisseur::TYPE_DEPOSIT && ($resteapayer <= 0 || (!empty($conf->global->SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) && $object->total_ttc == $resteapayer))) ||
+						($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $resteapayer >= 0) ||
+						($object->type == FactureFournisseur::TYPE_DEPOSIT && $object->total_ttc > 0 && ($resteapayer == 0 || (!empty($conf->global->SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) && $object->total_ttc == $resteapayer)))
+					)
 				) {
 					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaid').'</a>';
 				}
 
 				// Classify 'closed not completely paid' (possible if validated and not yet filed paid)
-				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $resteapayer > 0) {
+				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 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>';
@@ -3502,6 +3721,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)
@@ -3517,7 +3743,7 @@ if ($action == 'create') {
 					} elseif ($isErasable <= 0) {	// Any other cases
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a>';
 					} else {
-						print '<a class="butActionDelete'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
+						print '<a class="butActionDelete'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>';
 					}
 				}
 				print '</div>';
@@ -3543,17 +3769,14 @@ if ($action == 'create') {
 					$linktoelem = $form->showLinkToObjectBlock($object, null, array('invoice_supplier'));
 					$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
-					print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-					//print '</td><td valign="top" width="50%">';
-					//print '<br>';
+					print '</div><div class="fichehalfright">';
 
 					// List of actions on element
 					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 					$formactions = new FormActions($db);
 					$somethingshown = $formactions->showactions($object, 'invoice_supplier', $socid, 1, 'listaction'.($genallowed ? 'largetitle' : ''));
 
-					print '</div></div></div>';
-					//print '</td></tr></table>';
+					print '</div></div>';
 				}
 			}
 		}
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 22892823f05..927cc5f36b9 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -142,7 +142,7 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->facture->creer) {
 				if ($action != 'classify') {
-					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
 				}
 				if ($action == 'classify') {
@@ -160,9 +160,10 @@ if ($id > 0 || !empty($ref)) {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index d7c11045f03..34255541c01 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -54,8 +54,8 @@ $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -77,6 +77,8 @@ if ($object->fetch($id, $ref)) {
 	$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$ref;
 }
 
+$permissiontoadd = ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer); // Used by the include of actions_setnotes.inc.php
+
 
 /*
  * Actions
@@ -118,7 +120,7 @@ if ($object->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->facture->creer) {
 			if ($action != 'classify') {
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -136,9 +138,10 @@ if ($object->id > 0) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 5479ad22462..9546d434bb9 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -27,9 +27,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 
-// Security check
-restrictedArea($user, 'fournisseur', 0, '', 'facture');
-
 // Load translation files required by the page
 $langs->loadLangs(['bills', 'boxes']);
 
@@ -47,9 +44,21 @@ $maxDraftCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->glob
 $maxLatestEditCount = 5;
 $maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
 
+// Security check
+restrictedArea($user, 'fournisseur', 0, '', 'facture');
+
+
 /*
-* View
-*/
+ * Actions
+ */
+
+// None
+
+
+
+/*
+ * View
+ */
 
 llxHeader("", $langs->trans("SupplierInvoicesArea"), 'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores');
 
@@ -64,7 +73,7 @@ if ($tmp) {
 	print '<br>';
 }
 
-$tmp = getDraftSupplierTable($maxDraftCount, $socid);
+$tmp = getDraftSupplierTable($max, $socid);
 if ($tmp) {
 	print $tmp;
 	print '<br>';
@@ -73,7 +82,6 @@ if ($tmp) {
 print '</div>';
 
 print '<div class="fichetwothirdright">';
-print '<div class="ficheaddleft">';
 
 $tmp = getPurchaseInvoiceLatestEditTable($maxLatestEditCount, $socid);
 if ($tmp) {
@@ -87,7 +95,6 @@ if ($tmp) {
 	print '<br>';
 }
 
-print '</div>';
 print '</div>';
 
 print '</div>';
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index efe91880a56..f17d3c3e127 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -86,7 +86,7 @@ if (!empty($conf->projet->enabled)) {
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->facture->creer) {
 		if ($action != 'classify') {
-			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			$morehtmlref .= ' : ';
 		}
 		if ($action == 'classify') {
@@ -104,9 +104,10 @@ if (!empty($conf->projet->enabled)) {
 		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>';
+			$morehtmlref .= ' : '.$proj->getNomUrl(1);
+			if ($proj->title) {
+				$morehtmlref .= ' - '.$proj->title;
+			}
 		} else {
 			$morehtmlref .= '';
 		}
diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
new file mode 100644
index 00000000000..7da3a224d4f
--- /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->projet->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 a752c0d1545..0e682351992 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -126,8 +126,8 @@ if ($option == 'late') {
 $filter = GETPOST('filtre', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if ($page == -1 || $page == null || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
@@ -344,7 +344,7 @@ if (empty($reshook)) {
 					$rsql .= " , u.rowid as user_id, u.lastname, u.firstname, u.login";
 					$rsql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 					$rsql .= " , ".MAIN_DB_PREFIX."user as u";
-					$rsql .= " WHERE fk_facture_fourn = ".$objecttmp->id;
+					$rsql .= " WHERE fk_facture_fourn = ".((int) $objecttmp->id);
 					$rsql .= " AND pfd.fk_user_demande = u.rowid";
 					$rsql .= " AND pfd.traite = 0";
 					$rsql .= " ORDER BY pfd.date_demande DESC";
@@ -430,7 +430,7 @@ if (!$search_all) {
 // 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
@@ -461,7 +461,7 @@ if ($search_product_category > 0) {
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user AS u ON f.fk_user_author = u.rowid';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = f.fk_projet";
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
+if ($search_sale > 0 || (empty($user->rights->societe->client->voir) && !$socid)) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 if ($search_user > 0) {
@@ -474,7 +474,7 @@ $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object
 $sql .= $hookmanager->resPrint;
 $sql .= ' WHERE f.fk_soc = s.rowid';
 $sql .= ' AND f.entity IN ('.getEntity('facture_fourn').')';
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if ($search_product_category > 0) {
@@ -549,7 +549,7 @@ if ($search_montant_ttc != '') {
 	$sql .= natural_search('f.total_ttc', $search_montant_ttc, 1);
 }
 if ($search_multicurrency_code != '') {
-	$sql .= ' AND f.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
+	$sql .= " AND f.multicurrency_code = '".$db->escape($search_multicurrency_code)."'";
 }
 if ($search_multicurrency_tx != '') {
 	$sql .= natural_search('f.multicurrency_tx', $search_multicurrency_tx, 1);
@@ -564,7 +564,7 @@ if ($search_multicurrency_montant_ttc != '') {
 	$sql .= natural_search('f.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
 }
 if ($search_login) {
-	$sql .= natural_search('u.login', $search_login);
+	$sql .= natural_search(array('u.lastname', 'u.firstname', 'u.login'), $search_login);
 }
 if ($search_status != '' && $search_status >= 0) {
 	$sql .= " AND f.fk_statut = ".((int) $search_status);
@@ -606,7 +606,7 @@ if ($filter && $filter != -1) {
 	$aFilter = explode(',', $filter);
 	foreach ($aFilter as $fil) {
 		$filt = explode(':', $fil);
-		$sql .= ' AND '.$db->escape(trim($filt[0]))." = '".$db->escape(trim($filt[1]))."'";
+		$sql .= " AND ".$db->escape(trim($filt[0]))." = '".$db->escape(trim($filt[1]))."'";
 	}
 }
 if ($search_sale > 0) {
@@ -655,7 +655,7 @@ if (!$search_all) {
 // 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) : '';
+$sql .= empty($hookmanager->resPrint) ? "" : " HAVING 1=1 ".$hookmanager->resPrint;
 
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -936,7 +936,7 @@ if ($resql) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300 widthcentpercentminusx', 1);
 		$moreforfilter .= '</div>';
 	}
 
@@ -975,13 +975,13 @@ if ($resql) {
 	// Ref
 	if (!empty($arrayfields['f.ref']['checked'])) {
 		print '<td class="liste_titre left">';
-		print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.$search_ref.'">';
+		print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 		print '</td>';
 	}
 	// Ref supplier
 	if (!empty($arrayfields['f.ref_supplier']['checked'])) {
 		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth50" type="text" name="search_refsupplier" value="'.$search_refsupplier.'">';
+		print '<input class="flat maxwidth75" type="text" name="search_refsupplier" value="'.dol_escape_htmltag($search_refsupplier).'">';
 		print '</td>';
 	}
 	// Type
@@ -1006,7 +1006,7 @@ if ($resql) {
 	// Label
 	if (!empty($arrayfields['f.label']['checked'])) {
 		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth75" type="text" name="search_label" value="'.$search_label.'">';
+		print '<input class="flat maxwidth75" type="text" name="search_label" value="'.dol_escape_htmltag($search_label).'">';
 		print '</td>';
 	}
 	// Date invoice
@@ -1037,11 +1037,11 @@ if ($resql) {
 	}
 	// Project
 	if (!empty($arrayfields['p.ref']['checked'])) {
-		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_project" value="'.$search_project.'"></td>';
+		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_project" value="'.dol_escape_htmltag($search_project).'"></td>';
 	}
 	// Thirpdarty
 	if (!empty($arrayfields['s.nom']['checked'])) {
-		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_company" value="'.$search_company.'"></td>';
+		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'"></td>';
 	}
 	// Town
 	if (!empty($arrayfields['s.town']['checked'])) {
@@ -1096,13 +1096,13 @@ if ($resql) {
 	if (!empty($arrayfields['f.total_localtax1']['checked'])) {
 		// Amount tax 1
 		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_localtax1" value="'.$search_montant_localtax1.'">';
+		print '<input class="flat" type="text" size="5" name="search_montant_localtax1" value="'.dol_escape_htmltag($search_montant_localtax1).'">';
 		print '</td>';
 	}
 	if (!empty($arrayfields['f.total_localtax2']['checked'])) {
 		// Amount tax 2
 		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_localtax2" value="'.$search_montant_localtax2.'">';
+		print '<input class="flat" type="text" size="5" name="search_montant_localtax2" value="'.dol_escape_htmltag($search_montant_localtax2).'">';
 		print '</td>';
 	}
 	if (!empty($arrayfields['f.total_ttc']['checked'])) {
@@ -1367,11 +1367,11 @@ if ($resql) {
 
 			print '<tr class="oddeven">';
 			if (!empty($arrayfields['f.ref']['checked'])) {
-				print '<td class="nowrap">';
+				print '<td class="nowraponall">';
 
 				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 				// Picto + Ref
-				print '<td class="nobordernopadding nowrap">';
+				print '<td class="nobordernopadding nowraponall">';
 				print $facturestatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
 
 				$filename = dol_sanitizeFileName($obj->ref);
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 5bbf1fdcba6..d59aefe7831 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -44,6 +44,9 @@ $action = GETPOST('action', 'aZ09');
 if ($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('invoicesuppliernote'));
+
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
 $object = new FactureFournisseur($db);
@@ -56,7 +59,13 @@ $permissionnote = ($user->rights->fournisseur->facture->creer || $user->rights->
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$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
+}
 
 // Set label
 if ($action == 'setlabel' && ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer)) {
@@ -106,7 +115,7 @@ if ($object->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {
 			if ($action != 'classify') {
-				// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -124,9 +133,10 @@ if ($object->id > 0) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 76e15127098..d65b3010367 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -10,6 +10,8 @@
  * Copyright (C) 2015       Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2017       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2021       Charlene Benke          <charlene@patas-monkey.com>
+ * Copyright (C) 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
@@ -53,16 +55,16 @@ $day = GETPOST('day', 'int');
 $month = GETPOST('month', 'int');
 $year = GETPOST('year', 'int');
 
-$search_ref = GETPOST("search_ref", "alpha");
-$search_account = GETPOST("search_account", "int");
-$search_paymenttype = GETPOST("search_paymenttype");
-$search_amount = GETPOST("search_amount", 'alpha'); // alpha because we must be able to search on "< x"
-$search_company = GETPOST("search_company", 'alpha');
+$search_ref = GETPOST('search_ref', 'alpha');
+$search_account = GETPOST('search_account', 'int');
+$search_paymenttype = GETPOST('search_paymenttype');
+$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on "< x"
+$search_company = GETPOST('search_company', 'alpha');
 $search_payment_num = GETPOST('search_payment_num', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -291,8 +293,6 @@ if (empty($reshook)) {
 
 			$paiement->num_payment  = GETPOST('num_paiement', 'alphanohtml');
 			$paiement->note_private = GETPOST('comment', 'alpha');
-			$paiement->num_payment = $paiement->num_payment;
-			$paiement->note_private = $paiement->note_private;
 
 			if (!$error) {
 				$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty);
@@ -361,16 +361,16 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 	$sql = 'SELECT s.nom as name, s.rowid as socid,';
 	$sql .= ' f.rowid, f.ref, f.ref_supplier, f.total_ttc as total, f.fk_mode_reglement, f.fk_account';
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", sc.fk_soc, sc.fk_user ";
 	}
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'facture_fourn as f';
-	if (!$user->rights->societe->client->voir && !$socid) {
+	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.rowid = '.((int) $facid);
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	$resql = $db->query($sql);
@@ -384,7 +384,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 			// Add realtime total information
 			if (!empty($conf->use_javascript_ajax)) {
-				print "\n".'<script type="text/javascript" language="javascript">';
+				print "\n".'<script type="text/javascript">';
 				print '$(document).ready(function () {
 
 						function _elemToJson(selector)
@@ -510,8 +510,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				$sql .= ' SUM(pf.amount) as am, SUM(pf.multicurrency_amount) as multicurrency_am';
 				$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
 				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
-				$sql .= " WHERE f.entity = ".$conf->entity;
-				$sql .= ' AND f.fk_soc = '.$object->socid;
+				$sql .= " WHERE f.entity = ".((int) $conf->entity);
+				$sql .= ' AND f.fk_soc = '.((int) $object->socid);
 				$sql .= ' AND f.paye = 0';
 				$sql .= ' AND f.fk_statut = 1'; // Status=0 => unvalidated, Status=2 => canceled
 				if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE) {
@@ -520,7 +520,9 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 					$sql .= ' AND f.type = 2'; // If paying back a credit note, we show all credit notes
 				}
 				// Group by because we have a total
-				$sql .= ' GROUP BY f.datef, f.ref, f.ref_supplier, f.rowid, f.type, f.total_ht, f.total_ttc, f.multicurrency_total_ttc, f.datef, f.date_lim_reglement';
+				$sql .= ' GROUP BY f.datef, f.ref, f.ref_supplier, f.rowid, f.type, f.total_ht, f.total_ttc,';
+				$sql .= ' f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc,';
+				$sql .= ' f.datef, f.date_lim_reglement';
 				// Sort invoices by date and serial number: the older one comes first
 				$sql .= ' ORDER BY f.datef ASC, f.ref ASC';
 
@@ -533,7 +535,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 						if (!empty($conf->use_javascript_ajax)) {
 							//Add js for AutoFill
-							print "\n".'<script type="text/javascript" language="javascript">';
+							print "\n".'<script type="text/javascript">';
 							print ' $(document).ready(function () {';
 							print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
 											$("input[name="+$(this).data(\'rowname\')+"]").val($(this).data("value"));
@@ -686,7 +688,31 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							}
 							print '</td>';
 
-							print '<td class="right">'.price($sign * $remaintopay).'</td>';
+							print '<td class="right">';
+							print price($sign * $remaintopay);
+							if (!empty($conf->paymentbybanktransfer->enabled)) {
+								$numdirectdebitopen = 0;
+								$totaldirectdebit = 0;
+								$sql = "SELECT COUNT(pfd.rowid) as nb, SUM(pfd.amount) as amount";
+								$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+								$sql .= " WHERE fk_facture_fourn = ".((int) $objp->facid);
+								$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);
+									$numdirectdebitopen = $obj->nb;
+									$totaldirectdebit = $obj->amount;
+								} else {
+									dol_print_error($db);
+								}
+								if ($numdirectdebitopen) {
+									$langs->load("withdrawals");
+									print img_warning($langs->trans("WarningSomeCreditTransferAlreadyExists", $numdirectdebitopen, price(price2num($totaldirectdebit, 'MT'), 0, $langs, 1, -1, -1, $conf->currency)), '', 'classfortooltip');
+								}
+							}
+							print '</td>';
 
 							// Amount
 							print '<td class="center nowraponall">';
@@ -699,10 +725,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 									print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
 								}
 									print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
-									print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';	// class is requied to be used by javascript callForResult();
+									print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">'; // class is requied to be used by javascript callForResult();
 							} else {
 								print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
-								print '<input type="hidden" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';	// class is requied to be used by javascript callForResult();
+								print '<input type="hidden" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">'; // class is requied to be used by javascript callForResult();
 							}
 							print "</td>";
 
@@ -748,10 +774,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				}
 			}
 
-			// Save Button
+			// Save + Cancel Buttons
 			if ($action != 'add_paiement') {
 				print '<br><div class="center"><input type="checkbox" checked name="closepaidinvoices"> '.$langs->trans("ClosePaidInvoicesAutomatically");
-				print '<br><input type="submit" class="button" value="'.$langs->trans('ToMakePayment').'"></div>';
+				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>';
 			}
 
 			// Form to confirm payment
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index fe2bb78008d..59b92f349c0 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -46,7 +46,7 @@ if ($user->socid > 0) {
 }
 
 $dir = $conf->fournisseur->facture->dir_output.'/payments';
-if (!$user->rights->societe->client->voir || $socid) {
+if (empty($user->rights->societe->client->voir) || $socid) {
 	$dir .= '/private/'.$user->id; // If user has no permission to see all, output dir is specific to user
 }
 
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index ae600ec4080..3f728d99567 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 -->\n";
+print "<!-- BEGIN PHP TEMPLATE fourn/facture/tpl/linkedopjectblock.tpl.php -->\n";
 
 
 global $user;
@@ -71,7 +71,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 			echo $objectlink->getLibStatut(3);
 		}
 		?></td>
-		<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.urlencode($object->id).'&action=dellink&dellinkid='.urlencode($key); ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+		<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.urlencode($object->id).'&action=dellink&token='.newToken().'&dellinkid='.urlencode($key); ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 	</tr>
 	<?php
 }
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 2b3017708dc..1dc3e963db7 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -60,11 +60,11 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 $sql = "SELECT count(cf.rowid), cf.fk_statut";
 $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) {
+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 cf.fk_soc = s.rowid ";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " AND cf.entity = ".$conf->entity;
@@ -106,11 +106,11 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$sql .= " s.nom as name, s.rowid as socid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	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 cf.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND sc.fk_user = ".((int) $user->id);
 	}
 	$sql .= " AND cf.entity = ".$conf->entity;
@@ -162,11 +162,11 @@ if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_S
 	$sql .= ", s.nom as name, s.rowid as socid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as ff";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	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 s.rowid = ff.fk_soc";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND sc.fk_user = ".((int) $user->id);
 	}
 	$sql .= " AND ff.entity = ".$conf->entity;
@@ -221,25 +221,32 @@ if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_S
 }
 
 
-//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 /*
  * List last modified supliers
  */
 $max = 10;
-$sql = "SELECT s.rowid as socid, s.nom as name, s.town, s.datec, s.tms, s.prefix_comm, s.code_fournisseur, s.code_compta_fournisseur";
+$sql = "SELECT s.rowid as socid, s.nom as name, s.town, s.datec, s.tms, s.prefix_comm, s.code_fournisseur";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= ", spe.accountancy_code_supplier as code_compta_fournisseur";
+} else {
+	$sql .= ", s.code_compta_fournisseur";
+}
 $sql .= ", st.libelle as stcomm";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+}
 $sql .= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE s.fk_stcomm = st.id";
 $sql .= " AND s.fournisseur = 1";
 $sql .= " AND s.entity IN (".getEntity('societe').")";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if ($socid) {
@@ -310,8 +317,7 @@ if (count($companystatic->SupplierCategories)) {
 }
 
 
-//print "</td></tr></table>\n";
-print '</div></div></div>';
+print '</div></div>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/fourn/js/lib_dispatch.js.php b/htdocs/fourn/js/lib_dispatch.js.php
index fd15894b4ec..01af2ee5d91 100644
--- a/htdocs/fourn/js/lib_dispatch.js.php
+++ b/htdocs/fourn/js/lib_dispatch.js.php
@@ -70,7 +70,9 @@ function addDispatchLine(index, type, mode)
 	mode = mode || 'qtymissing'
 
 	console.log("fourn/js/lib_dispatch.js.php Split line type="+type+" index="+index+" mode="+mode);
-	var $row = $("tr[name='"+type+'_0_'+index+"']").clone(true); 		// clone first batch line to jQuery object
+	var $row0 = $("tr[name='"+type+'_0_'+index+"']");
+	var $dpopt = $row0.find('.hasDatepicker').first().datepicker('option', 'all'); // get current datepicker options to apply the same to the cloned datepickers
+	var $row = $row0.clone(true); 		// clone first batch line to jQuery object
 	var nbrTrs = $("tr[name^='"+type+"_'][name$='_"+index+"']").length; // position of line for batch
 	var qtyOrdered = parseFloat($("#qty_ordered_0_"+index).val()); 		// Qty ordered is same for all rows
 	var qty = parseFloat($("#qty_"+(nbrTrs - 1)+"_"+index).val());
@@ -96,6 +98,18 @@ function addDispatchLine(index, type, mode)
 	} else if (qtyDispatched < qtyOrdered) {
 		//replace tr suffix nbr
 		$row.html($row.html().replace(/_0_/g,"_"+nbrTrs+"_"));
+
+		// jquery's deep clone is incompatible with date pickers (the clone shares data with the original)
+		// so we destroy and rebuild the new date pickers
+		setTimeout(() => {
+			$row.find('.hasDatepicker').each((i, dp) => {
+				$(dp).removeData()
+					.removeClass('hasDatepicker');
+				$(dp).next('img.ui-datepicker-trigger').remove();
+				$(dp).datepicker($dpopt);
+			});
+		}, 0);
+
 		//create new select2 to avoid duplicate id of cloned one
 		$row.find("select[name='"+'entrepot_'+nbrTrs+'_'+index+"']").select2();
 		// TODO find solution to copy selected option to new select
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index ccc29105e4f..f8f484f0cc9 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -135,6 +135,13 @@ $upload_dir = $conf->fournisseur->payment->dir_output;
 $permissiontoadd = true;
 include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
+// Actions to send emails
+$triggersendname = 'PAYMENTRECEIPT_SENTBYMAIL';
+$paramname = 'id';
+$autocopy = 'MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO';
+$trackid = 'pre'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
 
 /*
  * View
@@ -259,7 +266,7 @@ if ($result > 0) {
 	$sql .= ' pf.amount, s.nom as name, s.rowid as socid';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf,'.MAIN_DB_PREFIX.'facture_fourn as f,'.MAIN_DB_PREFIX.'societe as s';
 	$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid';
-	$sql .= ' AND pf.fk_paiementfourn = '.$object->id;
+	$sql .= ' AND pf.fk_paiementfourn = '.((int) $object->id);
 	$resql = $db->query($sql);
 	if ($resql) {
 		$num = $db->num_rows($resql);
@@ -334,6 +341,18 @@ if ($result > 0) {
 	 */
 
 	print '<div class="tabsAction">';
+
+	// Send by mail
+	if ($user->socid == 0 && $action == '') {
+		$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS));
+		if ($usercansend) {
+			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
+		} else {
+			print '<span class="butActionRefused classfortooltip">'.$langs->trans('SendMail').'</span>';
+		}
+	}
+
+	// Payment validation
 	if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
 		if ($user->socid == 0 && $object->statut == 0 && $action == '') {
 			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && (!empty($user->rights->fournisseur->facture->creer) || !empty($user->rights->supplier_invoice->creer)))
@@ -342,10 +361,12 @@ if ($result > 0) {
 			}
 		}
 	}
+
+	// Delete payment
 	if ($user->socid == 0 && $action == '') {
 		if ($user->rights->fournisseur->facture->supprimer) {
 			if ($allow_delete) {
-				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
+				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>';
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$title_button.'">'.$langs->trans('Delete').'</a>';
 			}
@@ -371,7 +392,7 @@ if ($result > 0) {
 		$somethingshown = $formfile->numoffiles;
 	}
 
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright">';
 	//print '<br>';
 
 	// List of actions on element
@@ -380,7 +401,16 @@ if ($result > 0) {
 	$somethingshown = $formactions->showactions($object,'supplier_payment',$socid,1,'listaction'.($genallowed?'largetitle':''));
 	*/
 
-	print '</div></div></div>';
+	print '</div></div>';
+
+	// Presend form
+	$modelmail = ''; //TODO: Add new 'payment receipt' model in email models
+	$defaulttopic = 'SendPaymentReceipt';
+	$diroutput = $conf->fournisseur->payment->dir_output;
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO';
+	$trackid = 'pre'.$object->id;
+
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 } else {
 	$langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
diff --git a/htdocs/fourn/paiement/document.php b/htdocs/fourn/paiement/document.php
new file mode 100644
index 00000000000..e1b0ce6f581
--- /dev/null
+++ b/htdocs/fourn/paiement/document.php
@@ -0,0 +1,180 @@
+<?php
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2016 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@inodbox.com>
+ * Copyright (C) 2012      Marcos García         <marcosgdf@gmail.com>
+ * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
+ * Copyright (C) 2021      Jesus Jerez       	 <jesusballesteros@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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/paiement/document.php
+ *	\ingroup    facture, fournisseur
+ *	\brief      Management page of attached documents to a payment
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+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)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+}
+
+// Load translation files required by the page
+$langs->loadLangs(array('bills', 'banks', 'companies', 'suppliers', 'other'));
+
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+
+// Security check
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, $object->element, $object->id, 'paiementfourn', '');
+
+// Get parameters
+$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 = "name";
+}
+
+// Load object
+$object = new PaiementFourn($db);
+if ($object->fetch($id, $ref)) {
+	$object->fetch_thirdparty();
+	$ref = dol_sanitizeFileName($object->ref);
+	$upload_dir = $conf->fournisseur->payment->dir_output.'/'.dol_sanitizeFileName($object->ref);
+}
+
+$permissiontoadd = ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer); // Used by the include of actions_setnotes.inc.php
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+
+
+/*
+ * View
+ */
+
+$form = new	Form($db);
+
+$title = $langs->trans('Payment')." - ".$langs->trans('Documents');
+llxHeader('', $title);
+
+if ($object->id > 0) {
+	$head = payment_supplier_prepare_head($object);
+	print dol_get_fiche_head($head, 'documents', $langs->trans("SupplierPayment"), -1, 'payment');
+
+	// Supplier order card
+	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/paiement/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+
+	// Date of payment
+	$morehtmlref .= $form->editfieldkey("Date", 'datep', $object->date, $object, $object->statut == 0 && ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer), 'datehourpicker', '', null, 3).': ';
+	$morehtmlref .= $form->editfieldval("Date", 'datep', $object->date, $object, $object->statut == 0 && ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer), 'datehourpicker', '', null, $langs->trans('PaymentDateUpdateSucceeded'));
+
+	// Payment mode
+	$morehtmlref .= '<br>'.$langs->trans('PaymentMode').' : ';
+	$morehtmlref .= $langs->trans("PaymentType".$object->type_code) != ("PaymentType".$object->type_code) ? $langs->trans("PaymentType".$object->type_code) : $object->type_label;
+	$morehtmlref .= $object->num_payment ? ' - '.$object->num_payment : '';
+
+	// Thirdparty
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+
+	// Amount
+	$morehtmlref .= '<br>'.$langs->trans('Amount').' : '. price($object->amount, '', $langs, 0, 0, -1, $conf->currency);
+
+	$allow_delete = 1;
+	// Bank account
+	if (!empty($conf->banque->enabled)) {
+		if ($object->fk_account) {
+			$bankline = new AccountLine($db);
+			$bankline->fetch($object->bank_line);
+			if ($bankline->rappro) {
+				$allow_delete = 0;
+				$title_button = dol_escape_htmltag($langs->transnoentitiesnoconv("CantRemoveConciliatedPayment"));
+			}
+
+			$morehtmlref .= '<br>'.$langs->trans('BankAccount').' : ';
+			$accountstatic = new Account($db);
+			$accountstatic->fetch($bankline->fk_account);
+			$morehtmlref .= $accountstatic->getNomUrl(1);
+
+			$morehtmlref .= '<br>'.$langs->trans('BankTransactionLine').' : ';
+			$morehtmlref .= $bankline->getNomUrl(1, 0, 'showconciliated');
+		}
+	}
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	// Build file list
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file) {
+		$totalsize += $file['size'];
+	}
+
+	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 = 'supplier_payment';
+	// TODO: get the appropriate permission
+	$permissiontoadd = true;
+	$permtoedit = true;
+	$param = '&id='.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+} else {
+	header('Location: index.php');
+	exit;
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 2ac24706cb6..0f8f9050755 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
  * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2017		Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * 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>
@@ -35,7 +35,10 @@
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.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('companies', 'bills', 'banks', 'compta'));
@@ -51,18 +54,23 @@ $socid = GETPOST('socid', 'int');
 if ($user->socid) $socid = $user->socid;
 
 $search_ref				= GETPOST('search_ref', 'alpha');
-$search_day				= GETPOST('search_day', 'int');
-$search_month = GETPOST('search_month', 'int');
-$search_year			= GETPOST('search_year', 'int');
-$search_company = GETPOST('search_company', 'alpha');
+$search_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_company			= GETPOST('search_company', 'alpha');
 $search_payment_type	= GETPOST('search_payment_type');
-$search_cheque_num = GETPOST('search_cheque_num', 'alpha');
+$search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
 $search_bank_account	= GETPOST('search_bank_account', 'int');
-$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
+$search_amount			= GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield				= GETPOST('sortfield', 'alpha');
-$sortorder				= GETPOST('sortorder', 'alpha');
+$sortfield				= GETPOST('sortfield', 'aZ09comma');
+$sortorder				= GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
 
 if (empty($page) || $page == -1) {
@@ -140,9 +148,14 @@ 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_ref = '';
-		$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 = '';
 		$search_company = '';
 		$search_payment_type = '';
 		$search_cheque_num = '';
@@ -159,14 +172,15 @@ llxHeader('', $langs->trans('ListPayment'));
 
 $form = new Form($db);
 $formother = new FormOther($db);
+$accountstatic = new Account($db);
 $companystatic = new Societe($db);
 $paymentfournstatic = new PaiementFourn($db);
 
 $sql = 'SELECT p.rowid, p.ref, p.datep, p.amount as pamount, p.num_paiement';
 $sql .= ', s.rowid as socid, s.nom as name, s.email';
 $sql .= ', c.code as paiement_type, c.libelle as paiement_libelle';
-$sql .= ', ba.rowid as bid, ba.label';
-if (!$user->rights->societe->client->voir) {
+$sql .= ', ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.fk_accountancy_journal as accountancy_journal';
+if (empty($user->rights->societe->client->voir)) {
 	$sql .= ', sc.fk_soc, sc.fk_user';
 }
 $sql .= ', SUM(pf.amount)';
@@ -178,13 +192,13 @@ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement AS c ON p.fk_paiement = c.id';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON s.rowid = f.fk_soc';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
-if (!$user->rights->societe->client->voir) {
+if (empty($user->rights->societe->client->voir)) {
 	$sql .= ', '.MAIN_DB_PREFIX.'societe_commerciaux as sc';
 }
 
 $sql .= ' WHERE f.entity = '.$conf->entity;
-if (!$user->rights->societe->client->voir) {
-	$sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.$user->id;
+if (empty($user->rights->societe->client->voir)) {
+	$sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.((int) $user->id);
 }
 if ($socid > 0) {
 	$sql .= ' AND f.fk_soc = '.((int) $socid);
@@ -192,7 +206,13 @@ if ($socid > 0) {
 if ($search_ref) {
 	$sql .= natural_search('p.ref', $search_ref);
 }
-$sql .= dolSqlDateFilter('p.datep', $search_day, $search_month, $search_year);
+if ($search_date_start) {
+	$sql .= " AND p.datep >= '" . $db->idate($search_date_start) . "'";
+}
+if ($search_date_end) {
+	$sql .=" AND p.datep <= '" . $db->idate($search_date_end) . "'";
+}
+
 if ($search_company) {
 	$sql .= natural_search('s.nom', $search_company);
 }
@@ -215,8 +235,9 @@ if ($search_all) {
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 
-$sql .= ' GROUP BY p.rowid, p.ref, p.datep, p.amount, p.num_paiement, s.rowid, s.nom, s.email, c.code, c.libelle, ba.rowid, ba.label';
-if (!$user->rights->societe->client->voir) {
+$sql .= ' GROUP BY p.rowid, p.ref, p.datep, p.amount, p.num_paiement, s.rowid, s.nom, s.email, c.code, c.libelle,';
+$sql .= ' ba.rowid, ba.ref, ba.label, ba.number, ba.account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.fk_accountancy_journal';
+if (empty($user->rights->societe->client->voir)) {
 	$sql .= ', sc.fk_soc, sc.fk_user';
 }
 
@@ -259,14 +280,23 @@ if ($optioncss != '') {
 if ($search_ref) {
 	$param .= '&search_ref='.urlencode($search_ref);
 }
-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_company) {
 	$param .= '&search_company='.urlencode($search_company);
@@ -322,7 +352,7 @@ if ($moreforfilter) {
 
 $varpage = empty($contextpage) ? $_SERVER['PHP_SELF'] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-if ($massactionbutton) {
+if (!empty($massactionbutton)) {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
 
@@ -341,11 +371,12 @@ if (!empty($arrayfields['p.ref']['checked'])) {
 // Filter: Date
 if (!empty($arrayfields['p.datep']['checked'])) {
 	print '<td class="liste_titre center">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_day" value="'.dol_escape_htmltag($search_day).'">';
-	}
-	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
-	$formother->select_year($search_year ? $search_year : -1, 'search_year', 1, 20, 5);
+	print '<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>';
 }
 
@@ -470,10 +501,7 @@ while ($i < min($num, $limit)) {
 
 	// Date
 	if (!empty($arrayfields['p.datep']['checked'])) {
-		$dateformatforpayment = 'day';
-		if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) {
-			$dateformatforpayment = 'dayhour';
-		}
+		$dateformatforpayment = 'dayhour';
 		print '<td class="nowrap center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -509,11 +537,24 @@ while ($i < min($num, $limit)) {
 		}
 	}
 
-	// Account
+	// Bank account
 	if (!empty($arrayfields['ba.label']['checked'])) {
 		print '<td>';
 		if ($objp->bid) {
-			print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.dol_trunc($objp->label, 24).'</a>';
+			$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;';
 		}
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 9a67c3922f0..a20e586e2ee 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -257,6 +257,7 @@ if ($resql) {
 	$trackid = 'prod'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="liste centpercent">';
 
 	// Fields title search
@@ -357,7 +358,7 @@ if ($resql) {
 	}
 	$db->free($resql);
 
-	print "</table>";
+	print "</table></div>";
 
 	print '</form>';
 } else {
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 6a97265b050..bbf01bb4fbe 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -52,8 +52,8 @@ $upload_dir = $conf->ftp->dir_temp;
 $download_dir = $conf->ftp->dir_temp;
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 70d9c8da54d..fb53811aeaf 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -7,6 +7,7 @@
  * 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
@@ -94,9 +95,7 @@ $cancreateall = 0;
 if (!empty($user->rights->holiday->write) && in_array($fuserid, $childids)) {
 	$cancreate = 1;
 }
-// TODO Remove the writeall_advance and replace it with writeall
-if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall))
-	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))) {
+if (!empty($user->rights->holiday->writeall)) {
 	$cancreate = 1;
 	$cancreateall = 1;
 }
@@ -127,8 +126,23 @@ if ($reshook < 0) {
 }
 
 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.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
 	if ($cancel) {
-		if (!empty($backtopage)) {
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -336,25 +350,25 @@ if (empty($reshook)) {
 
 				// If no start date
 				if (!GETPOST('date_debut_')) {
-					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=nodatedebut');
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'&error=nodatedebut');
 					exit;
 				}
 
 				// If no end date
 				if (!GETPOST('date_fin_')) {
-					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=nodatefin');
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'&error=nodatefin');
 					exit;
 				}
 
 				// If start date after end date
 				if ($date_debut > $date_fin) {
-					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=datefin');
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'&error=datefin');
 					exit;
 				}
 
 				// If no validator designated
 				if ($approverid < 1) {
-					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=Valideur');
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'&error=Valideur');
 					exit;
 				}
 
@@ -462,22 +476,24 @@ if (empty($reshook)) {
 
 				$message .= $langs->transnoentities("HolidaysToValidateBody")."\n";
 
-				$delayForRequest = $object->getConfCP('delayForRequest');
-				//$delayForRequest = $delayForRequest * (60*60*24);
-
-				$nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
 
 				// option to warn the validator in case of too short delay
-				if ($object->getConfCP('AlertValidatorDelay')) {
-					if ($object->date_debut < $nextMonth) {
-						$message .= "\n";
-						$message .= $langs->transnoentities("HolidaysToValidateDelay", $object->getConfCP('delayForRequest'))."\n";
+				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 .= "\n";
+							$message .= $langs->transnoentities("HolidaysToValidateDelay", $delayForRequest)."\n";
+						}
 					}
 				}
 
 				// option to notify the validator if the balance is less than the request
-				if ($object->getConfCP('AlertValidatorSolde')) {
+				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 .= "\n";
 						$message .= $langs->transnoentities("HolidaysToValidateAlertSolde")."\n";
@@ -769,6 +785,12 @@ if (empty($reshook)) {
 			$result = $object->update($user);
 
 			if ($result >= 0 && $oldstatus == Holiday::STATUS_APPROVED) {	// holiday was already validated, status 3, so we must increase back the balance
+				// Call trigger
+				$result = $object->call_trigger('HOLIDAY_CANCEL', $user);
+				if ($result < 0) {
+					$error++;
+				}
+
 				// Calculcate number of days consummed
 				$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
 
@@ -875,7 +897,7 @@ $object = new Holiday($db);
 
 $listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
 
-$title = $langs->trans('CPTitreMenu');
+$title = $langs->trans('Leave');
 $help_url = 'EN:Module_Holiday';
 
 llxHeader('', $title, $help_url);
@@ -921,42 +943,40 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 		}
 
 
-		$delayForRequest = $object->getConfCP('delayForRequest');
-		//$delayForRequest = $delayForRequest * (60*60*24);
-
-		$nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
-
 		print '<script type="text/javascript">
-	    function 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;
-	        }
-       	}
+		$( document ).ready(function() {
+			$("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;
+		        }
+	       	});
+		});
        </script>'."\n";
 
+
 		// Formulaire de demande
-		print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" onsubmit="return valider()" name="demandeCP">'."\n";
+		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";
 
@@ -1082,7 +1102,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 		print '<tr>';
 		print '<td>'.$langs->trans("DescCP").'</td>';
 		print '<td class="tdtop">';
-		$doleditor = new DolEditor('description', GETPOST('description', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+		$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>';
 
@@ -1094,11 +1114,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 
 		print dol_get_fiche_end();
 
-		print '<div class="center">';
-		print '<input type="submit" value="'.$langs->trans("SendRequestCP").'" name="bouton" class="button">';
-		print '&nbsp; &nbsp; ';
-		print '<input type="button" value="'.$langs->trans("Cancel").'" class="button button-cancel" onclick="history.go(-1)">';
-		print '</div>';
+		print $form->buttonsSaveCancel("SendRequestCP");
 
 		print '</from>'."\n";
 	}
@@ -1156,7 +1172,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 				setEventMessages($errors, null, 'errors');
 			}
 
-			// On vérifie si l'utilisateur à le droit de lire cette demande
+			// check if the user has the right to read this request
 			if ($canread) {
 				$head = holiday_prepare_head($object);
 
@@ -1287,7 +1303,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 					print '<tr>';
 					print '<td>'.$langs->trans('DescCP').'</td>';
 					print '<td class="tdtop">';
-					$doleditor = new DolEditor('description', $object->description, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+					$doleditor = new DolEditor('description', $object->description, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->fckeditor->enabled) ? false : $conf->fckeditor->enabled, ROWS_3, '90%');
 					print $doleditor->Create(1);
 					print '</td></tr>';
 				}
@@ -1300,7 +1316,6 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 
 				print '</div>';
 				print '<div class="fichehalfright">';
-				print '<div class="ficheaddleft">';
 
 				print '<div class="underbanner clearboth"></div>';
 
@@ -1337,7 +1352,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 					}
 					$include_users = $object->fetch_users_approver_holiday();
 					if (is_array($include_users) && in_array($user->id, $include_users) && $object->statut == Holiday::STATUS_VALIDATED) {
-						print '<a class="editfielda paddingleft" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editvalidator">'.img_edit($langs->trans("Edit")).'</a>';
+						print '<a class="editfielda paddingleft" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editvalidator&token='.newToken().'">'.img_edit($langs->trans("Edit")).'</a>';
 					}
 					print '</td>';
 					print '</tr>';
@@ -1389,7 +1404,6 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 				print '</tbody>';
 				print '</table>';
 
-				print '</div>';
 				print '</div>';
 				print '</div>';
 
@@ -1433,11 +1447,9 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 
 				if (($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) || ($action == 'editvalidator')) {
 					if ($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) {
-						print '<div class="center">';
 						if ($cancreate && $object->statut == Holiday::STATUS_DRAFT) {
-							print '<input type="submit" value="'.$langs->trans("Save").'" class="button button-save">';
+							print $form->buttonsSaveCancel();
 						}
-						print '</div>';
 					}
 
 					print '</form>';
@@ -1449,11 +1461,11 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 					print '<div class="tabsAction">';
 
 					if ($cancreate && $object->statut == Holiday::STATUS_DRAFT) {
-						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit" class="butAction">'.$langs->trans("EditCP").'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'" class="butAction">'.$langs->trans("EditCP").'</a>';
 					}
 
 					if ($cancreate && $object->statut == Holiday::STATUS_DRAFT) {		// If draft
-						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=sendToValidate" class="butAction">'.$langs->trans("Validate").'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=sendToValidate&token='.newToken().'" class="butAction">'.$langs->trans("Validate").'</a>';
 					}
 
 					if ($object->statut == Holiday::STATUS_VALIDATED) {	// If validated
@@ -1519,7 +1531,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			$action = 'presend';
 		}
 
-		if ($action != 'presend') {
+		if ($action != 'presend' && $action != 'edit') {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 			print '<a name="builddoc"></a>'; // ancre
 
@@ -1541,20 +1553,16 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			//$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+			print '</div><div class="fichehalfright">';
 
 			$MAXEVENT = 10;
 
-			/*$morehtmlright = '<a href="'.dol_buildpath('/holiday/myobject_agenda.php', 1).'?id='.$object->id.'">';
-			$morehtmlright .= $langs->trans("SeeAll");
-			$morehtmlright .= '</a>';*/
-
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, $object->element, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
 
-			print '</div></div></div>';
+			print '</div></div>';
 		}
 	}
 }
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 6271f1d43e8..29e7c41bb5f 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -238,7 +238,7 @@ class Holiday extends CommonObject
 
 		if ($result >= 0) {
 			$this->db->commit();
-			return 1;
+			return 0; // for cronjob use (0 is OK, any other value is an error code)
 		} else {
 			$this->db->rollback();
 			return -1;
@@ -704,6 +704,17 @@ class Holiday extends CommonObject
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$error = 0;
 
+		$checkBalance = getDictionaryValue(MAIN_DB_PREFIX.'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);
@@ -720,7 +731,7 @@ class Holiday extends CommonObject
 			$error++;
 		}
 		$sql .= " ref = '".$this->db->escape($num)."'";
-		$sql .= " WHERE rowid= ".((int) $this->id);
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$this->db->begin();
 
@@ -806,6 +817,17 @@ class Holiday extends CommonObject
 		global $conf, $langs;
 		$error = 0;
 
+		$checkBalance = getDictionaryValue(MAIN_DB_PREFIX.'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";
 
@@ -821,9 +843,9 @@ class Holiday extends CommonObject
 		} else {
 			$error++;
 		}
-		$sql .= " halfday = ".$this->halfday.",";
+		$sql .= " halfday = ".((int) $this->halfday).",";
 		if (!empty($this->statut) && is_numeric($this->statut)) {
-			$sql .= " statut = ".$this->statut.",";
+			$sql .= " statut = ".((int) $this->statut).",";
 		} else {
 			$error++;
 		}
@@ -867,8 +889,7 @@ class Holiday extends CommonObject
 		} else {
 			$sql .= " detail_refuse = NULL";
 		}
-
-		$sql .= " WHERE rowid= ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$this->db->begin();
 
@@ -915,6 +936,17 @@ class Holiday extends CommonObject
 		global $conf, $langs;
 		$error = 0;
 
+		$checkBalance = getDictionaryValue(MAIN_DB_PREFIX.'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";
 
@@ -977,7 +1009,7 @@ class Holiday extends CommonObject
 			$sql .= " detail_refuse = NULL";
 		}
 
-		$sql .= " WHERE rowid= ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$this->db->begin();
 
@@ -1306,16 +1338,16 @@ class Holiday extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('DraftCP');
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('ToReviewCP');
-			$this->labelStatus[self::STATUS_APPROVED] = $langs->trans('ApprovedCP');
-			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('CancelCP');
-			$this->labelStatus[self::STATUS_REFUSED] = $langs->trans('RefuseCP');
-			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('DraftCP');
-			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('ToReviewCP');
-			$this->labelStatusShort[self::STATUS_APPROVED] = $langs->trans('ApprovedCP');
-			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('CancelCP');
-			$this->labelStatusShort[self::STATUS_REFUSED] = $langs->trans('RefuseCP');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('DraftCP');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('ToReviewCP');
+			$this->labelStatus[self::STATUS_APPROVED] = $langs->transnoentitiesnoconv('ApprovedCP');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('CancelCP');
+			$this->labelStatus[self::STATUS_REFUSED] = $langs->transnoentitiesnoconv('RefuseCP');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('DraftCP');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('ToReviewCP');
+			$this->labelStatusShort[self::STATUS_APPROVED] = $langs->transnoentitiesnoconv('ApprovedCP');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('CancelCP');
+			$this->labelStatusShort[self::STATUS_REFUSED] = $langs->transnoentitiesnoconv('RefuseCP');
 		}
 
 		$params = array();
@@ -1471,11 +1503,11 @@ class Holiday extends CommonObject
 			$monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
 			//print 'month: '.$month.' lastUpdate:'.$lastUpdate.' monthLastUpdate:'.$monthLastUpdate;exit;
 
-			// Si la date du mois n'est pas la même que celle sauvegardée, on met à jour le timestamp
+			// If month date is not same than the one of last update (the one we saved in database), then we update the timestamp and balance of each open user.
 			if ($month != $monthLastUpdate) {
 				$this->db->begin();
 
-				$users = $this->fetchUsers(false, false);
+				$users = $this->fetchUsers(false, false, ' AND u.statut > 0');
 				$nbUser = count($users);
 
 				$sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
@@ -1487,7 +1519,7 @@ class Holiday extends CommonObject
 
 				// Update each user counter
 				foreach ($users as $userCounter) {
-					$nbDaysToAdd = (isset($typeleaves[$userCounter['type']]['newByMonth']) ? $typeleaves[$userCounter['type']]['newByMonth'] : 0);
+					$nbDaysToAdd = (isset($typeleaves[$userCounter['type']]['newbymonth']) ? $typeleaves[$userCounter['type']]['newbymonth'] : 0);
 					if (empty($nbDaysToAdd)) {
 						continue;
 					}
@@ -1641,7 +1673,7 @@ class Holiday extends CommonObject
 
 
 	/**
-	 *  Retourne le solde de congés payés pour un utilisateur
+	 *  Return balance of holiday for one user
 	 *
 	 *  @param	int		$user_id    ID de l'utilisateur
 	 *  @param	int		$fk_type	Filter on type
@@ -1676,7 +1708,7 @@ class Holiday extends CommonObject
 	 *
 	 *    @param      boolean			$stringlist	    If true return a string list of id. If false, return an array with detail.
 	 *    @param      boolean   		$type			If true, read Dolibarr user list, if false, return vacation balance list.
-	 *    @param      string            $filters        Filters
+	 *    @param      string            $filters        Filters. Warning: This must not contains data from user input.
 	 *    @return     array|string|int      			Return an array
 	 */
 	public function fetchUsers($stringlist = true, $type = true, $filters = '')
@@ -1777,7 +1809,7 @@ class Holiday extends CommonObject
 			// Si faux donc return array
 			// List for Dolibarr users
 			if ($type) {
-								// If user of Dolibarr
+				// If we need users of Dolibarr
 				$sql = "SELECT";
 				if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 					$sql .= " DISTINCT";
@@ -2121,7 +2153,7 @@ class Holiday extends CommonObject
 	{
 		global $mysoc;
 
-		$sql = "SELECT rowid, code, label, affect, delay, newByMonth";
+		$sql = "SELECT rowid, code, label, affect, delay, newbymonth";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_holiday_types";
 		$sql .= " WHERE (fk_country IS NULL OR fk_country = ".((int) $mysoc->country_id).')';
 		if ($active >= 0) {
@@ -2136,7 +2168,7 @@ class Holiday extends CommonObject
 			$num = $this->db->num_rows($result);
 			if ($num) {
 				while ($obj = $this->db->fetch_object($result)) {
-					$types[$obj->rowid] = array('rowid'=> $obj->rowid, 'code'=> $obj->code, 'label'=>$obj->label, 'affect'=>$obj->affect, 'delay'=>$obj->delay, 'newByMonth'=>$obj->newByMonth);
+					$types[$obj->rowid] = array('rowid'=> $obj->rowid, 'code'=> $obj->code, 'label'=>$obj->label, 'affect'=>$obj->affect, 'delay'=>$obj->delay, 'newbymonth'=>$obj->newbymonth);
 				}
 
 				return $types;
@@ -2242,12 +2274,12 @@ class Holiday extends CommonObject
 		$this->id = 0;
 		$this->specimen = 1;
 
-		$this->fk_user = 1;
+		$this->fk_user = $user->id;
 		$this->description = 'SPECIMEN description';
 		$this->date_debut = dol_now();
 		$this->date_fin = dol_now() + (24 * 3600);
 		$this->date_valid = dol_now();
-		$this->fk_validator = 1;
+		$this->fk_validator = $user->id;
 		$this->halfday = 0;
 		$this->fk_type = 1;
 		$this->statut = Holiday::STATUS_VALIDATED;
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index 8eb88b1ceae..1e9c5602704 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -103,6 +103,7 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'holiday', $object->id, 'holiday');
 
+$permissiontoadd = $user->rights->holiday->write; // Used by the include of actions_setnotes.inc.php
 
 
 /*
@@ -119,8 +120,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 $form = new Form($db);
 
 $listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
-
-$title = $langs->trans('InterventionCard');
+$title = $langs->trans("Leave").' - '.$langs->trans("Files");
 
 llxHeader('', $title);
 
@@ -266,7 +266,6 @@ if ($object->id) {
 	/*
 	print '</div>';
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 
 	print '<div class="underbanner clearboth"></div>';
 
@@ -323,7 +322,6 @@ if ($object->id) {
 	print '</tbody>';
 	print '</table>';
 
-	print '</div>';
 	print '</div>'; */
 	print '</div>';
 
@@ -331,12 +329,12 @@ if ($object->id) {
 
 	print dol_get_fiche_end();
 
-
-
-	$modulepart = 'holiday';
 	$permissiontoadd = $user->rights->holiday->write;
 	$permtoedit = $user->rights->holiday->write;
 	$param = '&id='.$object->id;
+	$relativepathwithnofile = dol_sanitizeFileName($object->ref).'/';
+	$savingdocmask = dol_sanitizeFileName($object->ref).'-__file__';
+
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
 	print $langs->trans("ErrorUnknown");
diff --git a/htdocs/holiday/info.php b/htdocs/holiday/info.php
index 3ec95e61a52..5df3a5069de 100644
--- a/htdocs/holiday/info.php
+++ b/htdocs/holiday/info.php
@@ -78,7 +78,7 @@ $result = restrictedArea($user, 'holiday', $object->id, 'holiday');
 
 $form = new Form($db);
 
-$title = $langs->trans("Holiday")." - ".$langs->trans("Info");
+$title = $langs->trans("Leave")." - ".$langs->trans("Info");
 $helpurl = "";
 llxHeader("", $title, $helpurl);
 
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index fc8538b5f58..b4985100e44 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -213,6 +213,7 @@ if (empty($reshook)) {
 	$objectlabel = 'Holiday';
 	$permissiontoread = $user->rights->holiday->read;
 	$permissiontodelete = $user->rights->holiday->delete;
+	$permissiontoapprove = $user->rights->holiday->approve;
 	$uploaddir = $conf->holiday->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -295,7 +296,7 @@ $sql .= " ua.photo as validator_photo";
 // 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
@@ -441,6 +442,9 @@ if ($resql) {
 	if (!empty($user->rights->holiday->delete)) {
 		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 	}
+	if (!empty($user->rights->holiday->approve)) {
+		$arrayofmassactions['preapproveleave'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Approve");
+	}
 	if (in_array($massaction, array('presend', 'predelete'))) {
 		$arrayofmassactions = array();
 	}
@@ -485,9 +489,8 @@ if ($resql) {
 		print '<div class="tabsAction">';
 
 		$cancreate = 0;
-		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall))
-			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))) {
-				$cancreate = 1;
+		if (!empty($user->rights->holiday->writeall)) {
+			$cancreate = 1;
 		}
 		if (!empty($user->rights->holiday->write) && in_array($user_id, $childids)) {
 			$cancreate = 1;
@@ -739,6 +742,7 @@ if ($resql) {
 		$i = 0;
 		$totalarray = array();
 		$totalarray['nbfield'] = 0;
+		$totalduration = 0;
 		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($resql);
 
@@ -808,6 +812,7 @@ if ($resql) {
 			if (!empty($arrayfields['duration']['checked'])) {
 				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 '</td>';
 				if (!$i) {
@@ -890,6 +895,21 @@ if ($resql) {
 
 			$i++;
 		}
+
+		// Add a line for total if there is a total to show
+		if (!empty($arrayfields['duration']['checked'])) {
+			print '<tr class="total">';
+			foreach ($arrayfields as $key => $val) {
+				if (!empty($val['checked'])) {
+					if ($key == 'duration') {
+						print '<td class="right">'.$totalduration.' '.$langs->trans('DurationDays').'</td>';
+					} else {
+						print '<td></td>';
+					}
+				}
+			}
+			print '</tr>';
+		}
 	}
 
 	// Si il n'y a pas d'enregistrement suite à une recherche
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index c70124d9d18..9080072220e 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -6,7 +6,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -54,7 +54,7 @@ $search_description = GETPOST('search_description', 'alphanohtml');
 
 $limit       = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield   = GETPOST('sortfield', 'aZ09comma');
-$sortorder   = GETPOST('sortorder', 'alpha');
+$sortorder   = GETPOST('sortorder', 'aZ09comma');
 
 if (!$sortfield) {
 	$sortfield = "cp.rowid";
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index f5baeee4027..bf1886f4bca 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -21,7 +21,7 @@
  * \brief 	HRM Establishment module setup page
  */
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php';
 
 // Load translation files required by the page
@@ -60,8 +60,8 @@ $title = $langs->trans('Establishments');
 llxHeader('', $title, '');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortorder     = GETPOST("sortorder", 'alpha');
-$sortfield     = GETPOST("sortfield", 'alpha');
+$sortorder     = GETPOST('sortorder', 'aZ09comma');
+$sortfield     = GETPOST('sortfield', 'aZ09comma');
 if (!$sortorder) {
 	$sortorder = "DESC";
 }
@@ -80,12 +80,12 @@ $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);
+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 = hrm_admin_prepare_head();
+$head = hrmAdminPrepareHead();
 print dol_get_fiche_head($head, 'establishments', $langs->trans("HRM"), -1, "user", 0, $newcardbutton);
 
 $sql = "SELECT e.rowid, e.rowid as ref, e.label, e.address, e.zip, e.town, e.status";
@@ -99,7 +99,6 @@ if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
 
-	// Load attribute_label
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "e.ref", "", "", "", $sortfield, $sortorder);
diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php
index 455035a6b53..810c0da870d 100644
--- a/htdocs/hrm/admin/admin_hrm.php
+++ b/htdocs/hrm/admin/admin_hrm.php
@@ -117,7 +117,7 @@ print "</table>\n";
 
 print dol_get_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
+print '<div class="center"><input type="submit" class="button button-edit" name="button" value="'.$langs->trans('Modify').'"></div>';
 
 print '</form>';
 
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 2cac4a1352b..88e93f1398f 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -204,12 +204,12 @@ class Establishment extends CommonObject
 		$sql .= ", '".$this->db->escape($this->address)."'";
 		$sql .= ", '".$this->db->escape($this->zip)."'";
 		$sql .= ", '".$this->db->escape($this->town)."'";
-		$sql .= ", ".$this->country_id;
-		$sql .= ", ".$this->status;
-		$sql .= ", ".$conf->entity;
+		$sql .= ", ".((int) $this->country_id);
+		$sql .= ", ".((int) $this->status);
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ", '".$this->db->idate($now)."'";
-		$sql .= ", ".$user->id;
-		$sql .= ", ".$user->id;
+		$sql .= ", ".((int) $user->id);
+		$sql .= ", ".((int) $user->id);
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -231,7 +231,7 @@ class Establishment extends CommonObject
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'establishment');
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX."establishment SET ref = '".$this->db->escape($this->id)."'";
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			$this->db->query($sql);
 
 			$this->db->commit();
@@ -269,7 +269,7 @@ class Establishment extends CommonObject
 		$sql .= ", entity = ".((int) $this->entity);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			$this->db->commit();
@@ -369,10 +369,10 @@ class Establishment extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelStatus[self::STATUS_OPEN] = $langs->trans('Open');
-			$this->labelStatus[self::STATUS_CLOSED] = $langs->trans('Closed');
-			$this->labelStatusShort[self::STATUS_OPEN] = $langs->trans('Open');
-			$this->labelStatusShort[self::STATUS_CLOSED] = $langs->trans('Closed');
+			$this->labelStatus[self::STATUS_OPEN] = $langs->transnoentitiesnoconv('Open');
+			$this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
+			$this->labelStatusShort[self::STATUS_OPEN] = $langs->transnoentitiesnoconv('Open');
+			$this->labelStatusShort[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
 		}
 
 		$statusType = 'status'.$status;
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
new file mode 100644
index 00000000000..58ac7fe3324
--- /dev/null
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -0,0 +1,1145 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/evaluation.class.php
+ * \ingroup     hrm
+ * \brief       This file is a CRUD class file for Evaluation (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 . '/hrm/class/evaluationdet.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class for Evaluation
+ */
+class Evaluation extends CommonObject
+{
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'hrm';
+
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'evaluation';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'hrm_evaluation';
+
+	/**
+	 * @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 evaluation. Must be the part after the 'object_' into object_evaluation.png
+	 */
+	public $picto = 'label';
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_CANCELED = 9;
+	const STATUS_CLOSED = 6;
+
+
+	/**
+	 *  '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: '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.
+	 *
+	 *  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', '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'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2',),
+		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3,),
+		'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,),
+		'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'=>5, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '6' => 'Closed'),),
+		'date_eval' => array('type'=>'date', 'label'=>'DateEval', 'enabled'=>'1', 'position'=>502, 'notnull'=>1, 'visible'=>1,),
+		'fk_user' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'User', 'enabled'=>'1', 'position'=>504, 'notnull'=>1, 'visible'=>1,),
+		'fk_job' => array('type'=>'integer:Job:/hrm/class/job.class.php', 'label'=>'Job', 'enabled'=>'1', 'position'=>505, 'notnull'=>1, 'visible'=>1,),
+	);
+	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 $date_eval;
+	public $fk_user;
+	public $fk_job;
+	// END MODULEBUILDER PROPERTIES
+
+
+	// If this object has a subtable with lines
+
+	/**
+	 * @var string    Name of subtable line
+	 */
+	public $table_element_line = 'hrm_evaluationdet';
+
+	/**
+	 * @var string    Field with ID of parent key if this object has a parent
+	 */
+	public $fk_element = 'fk_evaluation';
+
+	/**
+	 * @var string    Name of subtable class that manage subtable lines
+	 */
+	public $class_element_line = 'Evaluationline';
+
+	// /**
+	//  * @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('@Evaluationline:hrm/class/evaluationdet.class.php:fk_evaluation');
+
+	/**
+	 * @var Evaluationline[]     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;
+		}
+
+		$this->date_eval = dol_now();
+
+		// 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);
+
+		if ($resultcreate > 0) {
+			require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.php';
+			$skillRank = new SkillRank($this->db);
+			$TRequiredRanks = $skillRank->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object='.$this->fk_job." AND objecttype='job'"));
+
+			if (is_array($TRequiredRanks) && !empty($TRequiredRanks)) {
+				$this->lines = array();
+				foreach ($TRequiredRanks as $required) {
+					$line = new Evaluationline($this->db);
+					$line->fk_evaluation = $resultcreate;
+					$line->fk_skill = $required->fk_skill;
+					$line->required_rank = $required->rankorder;
+					$line->fk_rank = 0;
+
+					$res = $line->create($user, $notrigger);
+					if ($res > 0) $this->lines[] = $line;
+				}
+			}
+		}
+
+		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();
+
+		$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.'='.$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;
+		}
+
+
+
+		$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('EVALUATION_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 = 'evaluation/".$this->db->escape($this->newref)."'";
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'evaluation/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++; $this->error = $this->db->lasterror();
+				}
+
+				// 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->hrm->dir_output.'/evaluation/'.$oldref;
+				$dirdest = $conf->hrm->dir_output.'/evaluation/'.$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->hrm->dir_output.'/evaluation/'.$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;
+		}
+	}
+
+	/**
+	 * 		Get the last evaluation by date for the user assigned
+	 *
+	 *		 @param int $fk_user ID of user we need to get last eval
+	 * 		 @return Evaluation|null
+	 */
+	public function getLastEvaluationForUser($fk_user)
+	{
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."hrm_evaluation ";
+		$sql.=	"WHERE fk_user=".((int) $fk_user)." ";
+		$sql.=	"ORDER BY date_eval DESC ";
+		$sql.=	"LIMIT 1 ";
+
+		$res = $this->db->query($sql);
+		if (!$res) { dol_print_error($this->db);}
+
+		$Tab = $this->db->fetch_object($res);
+
+		if (empty($Tab)) return null;
+		else {
+			$evaluation = new Evaluation($this->db);
+			$evaluation->fetch($Tab->rowid);
+
+			return $evaluation;
+		}
+	}
+
+
+	/**
+	 *	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, 'EVALUATION_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, 'EVALUATION_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, 'EVALUATION_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("Evaluation").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+
+		$url = dol_buildpath('/hrm/evaluation_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("ShowEvaluation");
+				$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('evaluationdao'));
+		$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 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("hrm");
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
+			$this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
+			$this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
+		}
+
+		$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;
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+
+				if ($obj->fk_user_valid) {
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
+
+				if ($obj->fk_user_cloture) {
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		// 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 Evaluationline($this->db);
+		$result = $objectline->fetchAll('ASC', '', 0, 0, array('customsql'=>'fk_evaluation = '.$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("hrm");
+
+		if (empty($conf->global->HRMTEST_EVALUATION_ADDON)) {
+			$conf->global->HRMTEST_EVALUATION_ADDON = 'mod_evaluation_standard';
+		}
+
+		if (!empty($conf->global->HRMTEST_EVALUATION_ADDON)) {
+			$mybool = false;
+
+			$file = $conf->global->HRMTEST_EVALUATION_ADDON.".php";
+			$classname = $conf->global->HRMTEST_EVALUATION_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir."core/modules/hrm/");
+
+				// 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("hrm");
+
+		if (!dol_strlen($modele)) {
+			$modele = 'standard_evaluation';
+
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($conf->global->EVALUATION_ADDON_PDF)) {
+				$modele = $conf->global->EVALUATION_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/hrm/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;
+	}
+
+	/**
+	 * @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
new file mode 100644
index 00000000000..115571bb6ba
--- /dev/null
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -0,0 +1,1045 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/evaluationdet.class.php
+ * \ingroup     hrm
+ * \brief       This file is a CRUD class file for Evaluationdet (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 . '/hrm/class/skillrank.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class for Evaluationline
+ */
+class Evaluationline extends CommonObject
+{
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'hrm';
+
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'evaluationdet';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'hrm_evaluationdet';
+
+	/**
+	 * @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 evaluationdet. Must be the part after the 'object_' into object_evaluationdet.png
+	 */
+	public $picto = 'evaluationdet@hrm';
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_CANCELED = 9;
+
+
+	/**
+	 *  '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: '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.
+	 *
+	 *  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"),
+		'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,),
+		'fk_skill' => array('type'=>'integer:Skill:hrm/class/skill.class.php:1', 'label'=>'Skill', 'enabled'=>'1', 'position'=>3, 'notnull'=>1, 'visible'=>1, 'index'=>1,),
+		'fk_evaluation' => array('type'=>'integer:Evaluation:hrm/class/evaluation.class.php:1', 'label'=>'Evaluation', 'enabled'=>'1', 'position'=>3, 'notnull'=>1, 'visible'=>1, 'index'=>1,),
+		'rankorder' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>'1', 'position'=>4, 'notnull'=>1, 'visible'=>1,),
+		'required_rank' => array('type'=>'integer', 'label'=>'requiredRank', 'enabled'=>'1', 'position'=>5, 'notnull'=>1, 'visible'=>1,),
+		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
+	);
+	public $rowid;
+	public $date_creation;
+	public $tms;
+	public $fk_user_creat;
+	public $fk_user_modif;
+	public $fk_skill;
+	public $fk_evaluation;
+	public $fk_rank;
+	public $required_rank;
+	public $import_key;
+	// END MODULEBUILDER PROPERTIES
+
+
+	// If this object has a subtable with lines
+
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
+	// public $table_element_line = 'hrm_evaluationline';
+
+	// /**
+	//  * @var string    Field with ID of parent key if this object has a parent
+	//  */
+	// public $fk_element = 'fk_evaluationdet';
+
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	// public $class_element_line = 'Evaluationline';
+
+	// /**
+	//  * @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('hrm_evaluationdetdet');
+
+	// /**
+	//  * @var EvaluationLine[]     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->hrm->evaluationdet->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);
+
+		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();
+
+		$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.'='.$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)
+	{
+		if ($this->fk_rank) {
+			$skillRank = new SkillRank($this->db);
+			$skillRank->fetch($this->fk_rank);
+			$skillRank->delete($user, $notrigger);
+		}
+		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->hrm->evaluationdet->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->evaluationdet->evaluationdet_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('EVALUATIONLINE_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 = 'evaluationline/".$this->db->escape($this->newref)."'";
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'evaluationline/".$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->hrm->dir_output.'/evaluationline/'.$oldref;
+				$dirdest = $conf->hrm->dir_output.'/evaluationline/'.$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->hrm->dir_output.'/evaluationline/'.$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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'EVALUATIONLINE_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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'EVALUATIONLINE_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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'EVALUATIONLINE_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("Evaluationdet").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+
+		$url = dol_buildpath('/hrm/evaluationdet_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("ShowEvaluationdet");
+				$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('evaluationlinedao'));
+		$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 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("hrm");
+			$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;
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+
+				if ($obj->fk_user_valid) {
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
+
+				if ($obj->fk_user_cloture) {
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		// 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 EvaluationLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_evaluationdet = '.$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("hrm");
+
+		if (empty($conf->global->hrm_EVALUATIONLINE_ADDON)) {
+			$conf->global->hrm_EVALUATIONLINE_ADDON = 'mod_evaluationdet_standard';
+		}
+
+		if (!empty($conf->global->hrm_EVALUATIONLINE_ADDON)) {
+			$mybool = false;
+
+			$file = $conf->global->hrm_EVALUATIONLINE_ADDON.".php";
+			$classname = $conf->global->hrm_EVALUATIONLINE_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir."core/modules/hrm/");
+
+				// 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("hrm");
+
+		if (!dol_strlen($modele)) {
+			$modele = 'standard_evaluationdet';
+
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($conf->global->EVALUATIONLINE_ADDON_PDF)) {
+				$modele = $conf->global->EVALUATIONLINE_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/hrm/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';
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
new file mode 100644
index 00000000000..fc94f4ba6ae
--- /dev/null
+++ b/htdocs/hrm/class/job.class.php
@@ -0,0 +1,1103 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/job.class.php
+ * \ingroup     hrm
+ * \brief       This file is a CRUD class file for Job (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 Job
+ */
+class Job extends CommonObject
+{
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'hrm';
+
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'job';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'hrm_job';
+
+	/**
+	 * @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 job. Must be the part after the 'object_' into object_job.png
+	 */
+	public $picto = 'technic';
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_CANCELED = 9;
+
+
+	/**
+	 *  '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: '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.
+	 *
+	 *  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"),
+		'label' => array('type'=>'varchar(128)', 'label'=>'Label', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Label of object"),
+		'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),
+		'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',),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+	);
+	public $rowid;
+	public $ref;
+	public $description;
+	public $date_creation;
+	public $tms;
+	public $deplacement;
+	public $note_public;
+	public $note_private;
+	public $fk_user_creat;
+	public $fk_user_modif;
+	// END MODULEBUILDER PROPERTIES
+
+
+	// If this object has a subtable with lines
+
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
+	// public $table_element_line = 'hrm_jobline';
+
+	// /**
+	//  * @var string    Field with ID of parent key if this object has a parent
+	//  */
+	public $fk_element = 'fk_job';
+
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	// public $class_element_line = 'Jobline';
+
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
+	protected $childtables = array('hrm_evaluation', 'hrm_job_user');
+
+	// /**
+	//  * @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("@SkillRank:hrm/class/skillrank.class.php:fk_object:objecttype='job'");
+
+	// /**
+	//  * @var JobLine[]     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->hrm->job->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);
+
+		//$resultvalidate = $this->validate($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();
+
+		$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.'='.$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->hrm->job->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->job->job_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('JOB_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 = 'job/".$this->db->escape($this->newref)."'";
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'job/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++; $this->error = $this->db->lasterror();
+				}
+
+				// 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->hrm->dir_output.'/job/'.$oldref;
+				$dirdest = $conf->hrm->dir_output.'/job/'.$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->hrm->dir_output.'/job/'.$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;
+		}
+	}
+
+	/**
+	 * 		Get last job for user
+	 *
+	 * 			@param int $fk_user id of user we need to get last job
+	 * 			@return mixed|string|null
+	 */
+	public function getLastJobForUser($fk_user)
+	{
+		global $db;
+
+		$j = new Job($db);
+		$Tab = $j->getForUser($fk_user);
+
+		if (empty($Tab)) return '';
+
+		$job = array_shift($Tab);
+
+		return $job;
+	}
+
+	/**
+	 * 		Get jobs for user
+	 *
+	 * 			@param int $userid id of user we need to get job list
+	 * 			@return array of jobs
+	 */
+	public function getForUser($userid)
+	{
+		global $db;
+
+		$TReturn = array();
+		$position = new Position($db);
+		$TPosition = $position->getForUser($userid);
+		foreach ($TPosition as $UPosition) {
+			$TReturn[$UPosition->Job->rowid] = $UPosition->Job->ref;
+		}
+		return $TReturn;
+	}
+
+	/**
+	 *	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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'JOB_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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'JOB_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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'JOB_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("Job").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Label').':</b> '.$this->label;
+
+		$url = dol_buildpath('/hrm/job_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("ShowJob");
+				$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->label);
+				$filearray = dol_dir_list($upload_dir, "files");
+				$filename = $filearray[0]['name'];
+				if (!empty($filename)) {
+					$pospoint = strpos($filearray[0]['name'], '.');
+
+					$pathtophoto = $class.'/'.$this->label.'/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->label;
+		}
+
+		$result .= $linkend;
+		//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);
+		$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 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("hrm");
+			$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;
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+
+				if ($obj->fk_user_valid) {
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
+
+				if ($obj->fk_user_cloture) {
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		// 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 JobLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_job = '.$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("hrm");
+
+		if (empty($conf->global->hrm_JOB_ADDON)) {
+			$conf->global->hrm_JOB_ADDON = 'mod_job_standard';
+		}
+
+		if (!empty($conf->global->hrm_JOB_ADDON)) {
+			$mybool = false;
+
+			$file = $conf->global->hrm_JOB_ADDON.".php";
+			$classname = $conf->global->hrm_JOB_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir."core/modules/hrm/");
+
+				// 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("hrm");
+
+		if (!dol_strlen($modele)) {
+			$modele = 'standard_job';
+
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($conf->global->JOB_ADDON_PDF)) {
+				$modele = $conf->global->JOB_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/hrm/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 JobLine. You can also remove this and generate a CRUD class for lines objects.
+ */
+class JobLine extends CommonObjectLine
+{
+	// To complete with content of an object JobLine
+	// We should have a field rowid, fk_job 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/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
new file mode 100644
index 00000000000..2401791bb5f
--- /dev/null
+++ b/htdocs/hrm/class/position.class.php
@@ -0,0 +1,1091 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/position.class.php
+ * \ingroup     hrm
+ * \brief       This file is a CRUD class file for Position (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 Position
+ */
+class Position extends CommonObject
+{
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'hrm';
+
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'position';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'hrm_job_user';
+
+	/**
+	 * @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 position. Must be the part after the 'object_' into object_position.png
+	 */
+	public $picto = 'user-cog';
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_CANCELED = 9;
+
+
+	/**
+	 *  '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: '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.
+	 *
+	 *  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'=>2, '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', 'comment'=>"Reference of object"),
+		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3,),
+		'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_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,),
+		'abort_comment' => array('type'=>'varchar(255)', 'label'=>'AbandonmentComment', 'enabled'=>'1', 'position'=>502, 'notnull'=>0, 'visible'=>1,),
+		'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',),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+	);
+	public $rowid;
+	public $ref;
+	public $description;
+	public $date_creation;
+	public $tms;
+	public $fk_contrat;
+	public $fk_user;
+	public $fk_job;
+	public $date_start;
+	public $date_end;
+	public $abort_comment;
+	public $note_public;
+	public $note_private;
+	public $fk_user_creat;
+	public $fk_user_modif;
+
+
+	// END MODULEBUILDER PROPERTIES
+
+
+	// If this object has a subtable with lines
+
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
+	// public $table_element_line = 'hrm_job_userline';
+
+	// /**
+	//  * @var string    Field with ID of parent key if this object has a parent
+	//  */
+	// public $fk_element = 'fk_position';
+
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	// public $class_element_line = 'Positionline';
+
+	// /**
+	//  * @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('hrm_job_userdet');
+
+	// /**
+	//  * @var PositionLine[]     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->hrm->position->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);
+
+		//$resultvalidate = $this->validate($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();
+
+		$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 . '=' . $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->hrm->position->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->position->position_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('POSITION_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 = 'position/" . $this->db->escape($this->newref) . "'";
+				$sql .= " WHERE filename LIKE '" . $this->db->escape($this->ref) . "%' AND filepath = 'position/" . $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->hrm->dir_output . '/position/' . $oldref;
+				$dirdest = $conf->hrm->dir_output . '/position/' . $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->hrm->dir_output . '/position/' . $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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'POSITION_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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'POSITION_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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'POSITION_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("Position") . '</u>';
+		if (isset($this->status)) {
+			$label .= ' ' . $this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+
+		$url = dol_buildpath('/hrm/position_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("ShowPosition");
+				$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('positiondao'));
+		$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 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("hrm");
+			$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;
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+
+				if ($obj->fk_user_valid) {
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
+
+				if ($obj->fk_user_cloture) {
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
+
+				$this->date_creation = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation = $this->db->jdate($obj->datev);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		// 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 PositionLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql' => 'fk_position = ' . $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("hrm");
+
+		if (empty($conf->global->hrm_POSITION_ADDON)) {
+			$conf->global->hrm_POSITION_ADDON = 'mod_position_standard';
+		}
+
+		if (!empty($conf->global->hrm_POSITION_ADDON)) {
+			$mybool = false;
+
+			$file = $conf->global->hrm_POSITION_ADDON . ".php";
+			$classname = $conf->global->hrm_POSITION_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir . "core/modules/hrm/");
+
+				// 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 "";
+		}
+	}
+
+	/**
+	 * @param int $userid id of user we need to get position list
+	 * @return array|int of positions of user with for each of them the job fetched into that array
+	 */
+	public function getForUser($userid)
+	{
+		$TPosition = array();
+
+		$TPosition = $this->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_user=' . $userid));
+
+		return $TPosition;
+	}
+
+	/**
+	 *  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("hrm");
+
+		if (!dol_strlen($modele)) {
+			$modele = 'standard_position';
+
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($conf->global->POSITION_ADDON_PDF)) {
+				$modele = $conf->global->POSITION_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/hrm/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 PositionLine. You can also remove this and generate a CRUD class for lines objects.
+ */
+class PositionLine extends CommonObjectLine
+{
+	// To complete with content of an object PositionLine
+	// We should have a field rowid, fk_position 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/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
new file mode 100644
index 00000000000..d20d34cfd5e
--- /dev/null
+++ b/htdocs/hrm/class/skill.class.php
@@ -0,0 +1,1132 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/skill.class.php
+ * \ingroup     hrm
+ * \brief       This file is a CRUD class file for Skill (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 Skill
+ */
+class Skill extends CommonObject
+{
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'hrm';
+
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'skill';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'hrm_skill';
+
+
+	/**
+	 * @var string Name of subtable line
+	 */
+	public $table_element_line = 'skilldet';
+
+	/**
+	 * @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 skill. Must be the part after the 'object_' into object_skill.png
+	 */
+	public $picto = 'shapes';
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_CANCELED = 9;
+	const DEFAULT_MAX_RANK_PER_SKILL = 5;
+
+	/**
+	 *  '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: '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.
+	 *
+	 *  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"),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2',),
+		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3,),
+		'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,),
+		'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),
+		'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,),
+	);
+	public $rowid;
+	public $label;
+	public $description;
+	public $date_creation;
+	public $tms;
+	public $fk_user_creat;
+	public $fk_user_modif;
+	public $required_level;
+	public $date_validite;
+	public $temps_theorique;
+	public $skill_type;
+	public $note_public;
+	public $note_private;
+	// END MODULEBUILDER PROPERTIES
+
+
+	// If this object has a subtable with lines
+
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
+	// public $table_element_line = 'hrm_skillline';
+
+	// /**
+	//  * @var string    Field with ID of parent key if this object has a parent
+	//  */
+	public $fk_element = 'fk_skill';
+
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	// public $class_element_line = 'Skillline';
+
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
+	protected $childtables = array('hrm_skillrank', 'hrm_evaluationdet');
+
+	// /**
+	//  * @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('hrm_skilldet');
+
+	// /**
+	//  * @var SkillLine[]     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->hrm->skill->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)
+	{
+		global $langs,$conf;
+
+		$resultcreate = $this->createCommon($user, $notrigger);
+
+
+		if ($resultcreate > 0) {
+			// skillDet create
+			$this->createSkills();
+		}
+
+		return $resultcreate;
+	}
+
+	/**
+	 * createSkills
+	 *
+	 * @param int 	$i 		Rank from which we want to create skilldets (level $i to HRM_MAXRANK wil be created)
+	 * @return null
+	 */
+	public function createSkills($i = 1)
+	{
+		global $conf, $user, $langs;
+
+		$MaxNumberSkill = isset($conf->global->HRM_MAXRANK) ? $conf->global->HRM_MAXRANK : self::DEFAULT_MAX_RANK_PER_SKILL;
+		$defaultSkillDesc = !empty($conf->global->HRM_DEFAULT_SKILL_DESCRIPTION) ? $conf->global->HRM_DEFAULT_SKILL_DESCRIPTION : 'no Description';
+
+		$error = 0;
+
+		require_once __DIR__ . '/skilldet.class.php';
+
+		$this->db->begin();
+
+		// Create level of skills
+		for ($i; $i <= $MaxNumberSkill ; $i++) {
+			$skilldet = new Skilldet($this->db);
+			$skilldet->description = $defaultSkillDesc . " " . $i;
+			$skilldet->rankorder = $i;
+			$skilldet->fk_skill = $this->id;
+
+			$result =  $skilldet->create($user);
+			if ($result <= 0) {
+				$error++;
+			}
+		}
+
+		if (! $error) {
+			$this->db->commit();
+
+			setEventMessage($langs->trans('SkillCreated'), $i);
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * 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 array         <0 if KO, array of skill level found
+	 */
+	public function fetchLines()
+	{
+		$this->lines = array();
+		require_once __DIR__ . '/skilldet.class.php';
+		$skilldet = new Skilldet($this->db);
+		$this->lines = $skilldet->fetchAll('ASC', '', '', '', array('fk_skill' => $this->id), '');
+
+		if (is_array($this->lines)) {
+			return (count($this->lines) > 0) ? $this->lines : array();
+		} elseif ($this->lines < 0) {
+			$this->errors = array_merge($this->errors, $skilldet->errors);
+			$this->error = $skilldet->error;
+			return $this->lines;
+		}
+	}
+
+
+	/**
+	 * 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.'='.$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);;
+	}
+
+	/**
+	 *  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->hrm->skill->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->skill->skill_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('SKILL_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 = 'skill/".$this->db->escape($this->newref)."'";
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'skill/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++; $this->error = $this->db->lasterror();
+				}
+
+				// 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->hrm->dir_output.'/skill/'.$oldref;
+				$dirdest = $conf->hrm->dir_output.'/skill/'.$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->hrm->dir_output.'/skill/'.$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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'SKILL_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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'SKILL_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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'SKILL_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
+	 */
+	/**
+	 *  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("Skill").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Label').':</b> '.$this->label;
+
+		$url = dol_buildpath('/hrm/skill_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("ShowSkill");
+				$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->label;
+		}
+
+		$result .= $linkend;
+		//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);
+		$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 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("hrm");
+			$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;
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+
+				if ($obj->fk_user_valid) {
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
+
+				if ($obj->fk_user_cloture) {
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		// 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 SkillLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'rankorder', 0, 0, array('customsql'=>'fk_skill = '.$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("hrm");
+
+		if (empty($conf->global->hrm_SKILL_ADDON)) {
+			$conf->global->hrm_SKILL_ADDON = 'mod_skill_standard';
+		}
+
+		if (!empty($conf->global->hrm_SKILL_ADDON)) {
+			$mybool = false;
+
+			$file = $conf->global->hrm_SKILL_ADDON.".php";
+			$classname = $conf->global->hrm_SKILL_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir."core/modules/hrm/");
+
+				// 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("hrm");
+
+		if (!dol_strlen($modele)) {
+			$modele = 'standard_skill';
+
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($conf->global->SKILL_ADDON_PDF)) {
+				$modele = $conf->global->SKILL_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/hrm/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;
+	}
+
+	/**
+	 * @param int $code number of code label
+	 * @return int|string
+	 */
+	public static function typeCodeToLabel($code)
+	{
+		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"
+		}
+		return $result;
+	}
+}
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
new file mode 100644
index 00000000000..0e0ce87382f
--- /dev/null
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -0,0 +1,1030 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/skilldet.class.php
+ * \ingroup     hrm
+ * \brief       This file is a CRUD class file for Skilldet (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 Skilldet
+ */
+class Skilldet extends CommonObject
+{
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'hrm';
+
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'skilldet';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'hrm_skilldet';
+
+	/**
+	 * @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 skilldet. Must be the part after the 'object_' into object_skilldet.png
+	 */
+	public $picto = 'skilldet@hrm';
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_CANCELED = 9;
+
+
+	/**
+	 *  '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: '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.
+	 *
+	 *  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"),
+		'fk_skill' => array('type'=>'integer:Skill:/hrm/class/skill.class.php', 'label'=>'fk_skill', 'enabled'=>'1', 'position'=>5, 'notnull'=>1, 'visible'=>0,),
+		'rankorder' => array('type'=>'integer', 'label'=>'rank', 'enabled'=>'1', 'position'=>10, 'notnull'=>0, 'visible'=>2,),
+		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1,),
+		'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'=>0,),
+	);
+	public $rowid;
+	public $fk_skill;
+	public $rankorder;
+	public $description;
+	public $fk_user_creat;
+	public $fk_user_modif;
+	// END MODULEBUILDER PROPERTIES
+
+
+	// If this object has a subtable with lines
+
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
+	// public $table_element_line = 'hrm_skilldetline';
+
+	// /**
+	//  * @var string    Field with ID of parent key if this object has a parent
+	//  */
+	// public $fk_element = 'fk_skilldet';
+
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	// public $class_element_line = 'Skilldetline';
+
+	// /**
+	//  * @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('hrm_skilldetdet');
+
+	// /**
+	//  * @var SkilldetLine[]     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->hrm->skilldet->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);
+
+		//$resultvalidate = $this->validate($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();
+
+		$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.'='.$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->hrm->skilldet->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->skilldet->skilldet_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('SKILLDET_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 = 'skilldet/".$this->db->escape($this->newref)."'";
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'skilldet/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++; $this->error = $this->db->lasterror();
+				}
+
+				// 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->hrm->dir_output.'/skilldet/'.$oldref;
+				$dirdest = $conf->hrm->dir_output.'/skilldet/'.$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->hrm->dir_output.'/skilldet/'.$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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'SKILLDET_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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'SKILLDET_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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'SKILLDET_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("Skilldet").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+
+		$url = dol_buildpath('/hrm/skilldet_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("ShowSkilldet");
+				$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('skilldetdao'));
+		$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 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("hrm");
+			$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;
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+
+				if ($obj->fk_user_valid) {
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
+
+				if ($obj->fk_user_cloture) {
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		// 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 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.
+	 *
+	 *  @return string      		Object free reference
+	 */
+	public function getNextNumRef()
+	{
+		global $langs, $conf;
+		$langs->load("hrm");
+
+		if (empty($conf->global->hrm_SKILLDET_ADDON)) {
+			$conf->global->hrm_SKILLDET_ADDON = 'mod_skilldet_standard';
+		}
+
+		if (!empty($conf->global->hrm_SKILLDET_ADDON)) {
+			$mybool = false;
+
+			$file = $conf->global->hrm_SKILLDET_ADDON.".php";
+			$classname = $conf->global->hrm_SKILLDET_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir."core/modules/hrm/");
+
+				// 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("hrm");
+
+		if (!dol_strlen($modele)) {
+			$modele = 'standard_skilldet';
+
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($conf->global->SKILLDET_ADDON_PDF)) {
+				$modele = $conf->global->SKILLDET_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/hrm/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;
+	}
+}
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
new file mode 100644
index 00000000000..587fc889e0f
--- /dev/null
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -0,0 +1,1086 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/skillrank.class.php
+ * \ingroup     hrm
+ * \brief       This file is a CRUD class file for SkillRank (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 . '/hrm/lib/hrm_skillrank.lib.php';
+
+/**
+ * Class for SkillRank
+ */
+class SkillRank extends CommonObject
+{
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'hrm';
+
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'skillrank';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'hrm_skillrank';
+
+	/**
+	 * @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 skillrank. Must be the part after the 'object_' into object_skillrank.png
+	 */
+	public $picto = 'skillrank@hrm';
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_CANCELED = 9;
+
+	const SKILLRANK_TYPE_JOB = "job";
+	const SKILLRANK_TYPE_USER = "user";
+	const SKILLRANK_TYPE_EVALDET = "evaluationdet";
+
+	/**
+	 *  '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: '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.
+	 *
+	 *  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"),
+		'fk_skill' => array('type'=>'integer:Skill:hrm/class/skill.class.php:1', 'label'=>'Skill', 'enabled'=>'1', 'position'=>3, 'notnull'=>1, 'visible'=>1, 'index'=>1,),
+		'rankorder' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>'1', 'position'=>4, 'notnull'=>1, 'visible'=>1, 'default' => 0),
+		'fk_object' => array('type'=>'integer', 'label'=>'object', 'enabled'=>'1', 'position'=>5, 'notnull'=>1, '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,),
+		'objecttype' => array('type'=>'varchar(128)', 'label'=>'objecttype', 'enabled'=>'1', 'position'=>6, 'notnull'=>1, 'visible'=>0,),
+	);
+	public $rowid;
+	public $fk_skill;
+	public $rank;
+	public $fk_object;
+	public $date_creation;
+	public $tms;
+	public $fk_user_creat;
+	public $fk_user_modif;
+	public $objecttype;
+	// END MODULEBUILDER PROPERTIES
+
+
+	// If this object has a subtable with lines
+
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
+	// public $table_element_line = 'hrm_skillrankline';
+
+	// /**
+	//  * @var string    Field with ID of parent key if this object has a parent
+	//  */
+	// public $fk_element = 'fk_skillrank';
+
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	// public $class_element_line = 'SkillRankline';
+
+	// /**
+	//  * @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('hrm_skillrankdet');
+
+	// /**
+	//  * @var SkillRankLine[]     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->hrm->skillrank->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)
+	{
+		global $langs;
+
+		$sqlfilter = 'fk_object='.((int) $this->fk_object)." AND objecttype='".$this->db->escape($this->objecttype)."' AND fk_skill = ".((int) $this->fk_skill);
+		$alreadyLinked = $this->fetchAll('ASC', 'rowid', 0, 0, array('customsql' => $sqlfilter));
+		if (!empty($alreadyLinked)) {
+			$this->error = $langs->trans('ErrSkillAlreadyAdded');
+			return -1;
+		}
+
+		$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();
+
+		$result = $this->fetchLinesCommon();
+		return $result;
+	}
+
+	/**
+	 *  Clone skillrank Object linked to job with user id
+	 *  The skillrank table is a join table that is marked for multiple objects
+	 *
+	 * @param SkillRank $currentSkill line of evaluation (skill) we need to clone and add to user skills list
+	 * @param int $fk_user id of user linked to skillrank
+	 * @return int > 0 if ok, < 0 if ko
+	 */
+	public function cloneFromCurrentSkill($currentSkill, $fk_user)
+	{
+
+		global $user;
+
+		$this->fk_skill 		= $currentSkill->fk_skill;
+		$this->rankorder 			= $currentSkill->rankorder;
+		$this->fk_object		= $fk_user;
+		$this->date_creation 	= dol_now();
+		$this->fk_user_creat 	= $user->id;
+		$this->fk_user_modif 	= $user->id;
+		$this->objecttype	 	= self::SKILLRANK_TYPE_USER;
+		$result =  $this->create($user);
+
+		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.'='.$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->hrm->skillrank->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->skillrank->skillrank_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('SKILLRANK_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 = 'skillrank/".$this->db->escape($this->newref)."'";
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'skillrank/".$this->db->escape($this->ref)."' and entity = ".((int) $conf->entity);
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++; $this->error = $this->db->lasterror();
+				}
+
+				// 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->hrm->dir_output.'/skillrank/'.$oldref;
+				$dirdest = $conf->hrm->dir_output.'/skillrank/'.$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->hrm->dir_output.'/skillrank/'.$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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'SKILLRANK_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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'SKILLRANK_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->hrm->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'SKILLRANK_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("SkillRank").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+
+		$url = dol_buildpath('/hrm/skillrank_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("ShowSkillRank");
+				$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('skillrankdao'));
+		$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 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("hrm");
+			$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;
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+
+				if ($obj->fk_user_valid) {
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
+
+				if ($obj->fk_user_cloture) {
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		// 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 SkillRankLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_skillrank = '.((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("hrm");
+
+		if (empty($conf->global->hrm_SKILLRANK_ADDON)) {
+			$conf->global->hrm_SKILLRANK_ADDON = 'mod_skillrank_standard';
+		}
+
+		if (!empty($conf->global->hrm_SKILLRANK_ADDON)) {
+			$mybool = false;
+
+			$file = $conf->global->hrm_SKILLRANK_ADDON.".php";
+			$classname = $conf->global->hrm_SKILLRANK_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir."core/modules/hrm/");
+
+				// 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("hrm");
+
+		if (!dol_strlen($modele)) {
+			$modele = 'standard_skillrank';
+
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($conf->global->SKILLRANK_ADDON_PDF)) {
+				$modele = $conf->global->SKILLRANK_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/hrm/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;
+	}
+
+	/**
+	 * @param array $val
+	 * @param string $key
+	 * @param string $value
+	 * @param string $moreparam
+	 * @param string $keysuffix
+	 * @param string $keyprefix
+	 * @param string $morecss
+	 * @return string
+	 */
+	//  public function showOutputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '')
+	//  {
+	//      if ($key == "rank") {
+	//          return displayRankInfos($this);
+	//      } else return parent::showOutputField($val, $key, $value, $moreparam, $keysuffix, $keyprefix, $morecss);
+	//  }
+}
diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php
new file mode 100644
index 00000000000..c8bb01d85e5
--- /dev/null
+++ b/htdocs/hrm/compare.php
@@ -0,0 +1,573 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/compare.php
+ * \ingroup     hrm
+ * \brief       This file compares skills of user groups
+ *
+ * Displays a table in three parts.
+ * 1-  the left part displays the list of users of the selected group 1.
+ *
+ * 2- the central part displays the skills. display of the maximum score for this group and the number of occurrences.
+ *
+ * 3-  the right part displays the members of group 2 or the job to be compared
+ *
+ *
+ *
+ */
+
+require_once '../main.inc.php';
+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 . '/hrm/class/skill.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/evaluation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm.lib.php';
+
+$permissiontoread = $user->rights->hrm->evaluation->read || $user->rights->hrm->compare_advance->read;
+$permissiontoadd = 0;
+if (empty($conf->hrm->enabled)) accessforbidden();
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden();
+
+$langs->load('hrm');
+
+
+
+/*
+ * View
+ */
+
+$css = array();
+$css[] = '/hrm/css/style.css';
+llxHeader('', $langs->trans('SkillComparison'), '', '', 0, 0, '', $css);
+
+$head = array();
+
+$h = 0;
+$head[$h][0] = $_SERVER["PHP_SELF"];
+$head[$h][1] = $langs->trans("SkillComparison");
+$head[$h][2] = 'compare';
+
+print dol_get_fiche_head($head, 'compare', '', 1);
+
+//$PDOdb = new TPDOdb;
+$form = new Form($db);
+?>
+	<script type="text/javascript">
+
+		$(document).ready(function () {
+
+			$("li[fk_user]").click(function () {
+
+				if ($(this).hasClass('disabled')) {
+					$(this).removeClass('disabled');
+				} else {
+					$(this).addClass('disabled');
+				}
+
+
+				$userl = $(this).closest('ul');
+				listname = $userl.attr('name');
+
+				var TId = [];
+
+				$userl.find('li').each(function (i, item) {
+
+					if ($(item).hasClass('disabled')) {
+						TId.push($(item).attr('fk_user'));
+					}
+
+				});
+
+				$('#' + listname + '_excluded_id').val(TId.join(','));
+
+			});
+
+		});
+
+
+	</script>
+
+
+<?php
+$job = new Job($db);
+$form = new Form($db);
+
+$fk_usergroup2 = 0;
+$fk_job = (int) GETPOST('fk_job');
+if ($fk_job <= 0) $fk_usergroup2 = GETPOST('fk_usergroup2');
+
+$fk_usergroup1 = GETPOST('fk_usergroup1');
+
+?>
+
+
+	<div class="fichecenter">
+		<form action="<?php echo $_SERVER['PHP_SELF'] ?>">
+
+			<div class="tabBar tabBarWithBottom">
+				<div class="fichehalfleft">
+					<table class="border tableforfield" width="100%">
+						<tr>
+							<td><?php echo $langs->trans('group1ToCompare').'</td><td>'.$form->select_dolgroups($fk_usergroup1, 'fk_usergroup1', 1); ?></td>
+						</tr>
+						<tr><td>&nbsp;</td></tr>
+						<tr>
+							<td><?php echo $langs->trans('group2ToCompare').'</td><td>'.$form->select_dolgroups($fk_usergroup2, 'fk_usergroup2', 1); ?></td>
+						</tr>
+						<tr>
+							<td><STRONG><?php print $langs->trans('or'); ?></STRONG></td>
+						</tr>
+						<tr>
+							<td><?php
+									echo $langs->trans('OrJobToCompare') . '</td><td>';
+									$j = new Job($db);
+									$jobs = $j->fetchAll();
+									$TJobs = array();
+
+							foreach ($jobs as &$j) {
+								$TJobs[$j->id] = $j->label;
+							}
+
+									print $form->selectarray('fk_job', $TJobs, $fk_job, 1);
+							?></td>
+						</tr>
+					</table>
+				</div>
+
+				<div style="background:#eee;border-radius:5px 0;margin:0px 0 10px;font-style:italic;padding:5px;" class="fichehalfright">
+					<!--<h4><?php echo $langs->trans('legend'); ?></h4>-->
+						<table class="border" width="100%">
+							<tr>
+								<td><span style="vertical-align:middle" class="toohappy diffnote little"></span>
+								<?php echo $langs->trans('CompetenceAcquiredByOneOrMore'); ?></td>
+							</tr>
+							<tr>
+								<td><span style="vertical-align:middle" class="veryhappy diffnote little"></span>
+								<?php echo $langs->trans('MaxlevelGreaterThan'); ?></td>
+							</tr>
+							<tr>
+								<td><span style="vertical-align:middle" class="happy diffnote little"></span>
+								<?php echo $langs->trans('MaxLevelEqualTo'); ?></td>
+							</tr>
+							<tr>
+								<td><span style="vertical-align:middle" class="sad diffnote little"></span>
+								<?php echo $langs->trans('MaxLevelLowerThan'); ?></td>
+							</tr>
+							<tr>
+								<td><span style="vertical-align:middle" class="toosad diffnote little"></span>
+								<?php echo $langs->trans('SkillNotAcquired'); ?></td>
+							</tr>
+						</table>
+
+				</div>
+
+				<div style="clear:both"></div>
+
+			</div>
+
+			<br><br>
+			<div class="center">
+				<input class="button" type="SUBMIT" name="bt1" VALUE="<?php print $langs->trans('Refresh'); ?>">
+			</div>
+			<br><br>
+
+			<div id="compare" width="100%" style="position:relative;">
+
+				<?php if ($fk_usergroup1 > 0 || $fk_usergroup2 > 0 || $fk_job > 0) { ?>
+					<table width="100%">
+						<tr>
+							<th></th>
+							<th><?php print $langs->trans('skill'); ?></th>
+							<th><?php print $langs->trans('rank'); ?></th>
+							<th><?php print $langs->trans('difference'); ?></th>
+							<th><?php print $langs->trans('rank'); ?></th>
+							<th></th>
+						</tr>
+
+						<?php
+						echo '<tr><td id="list-user-left" style="width:30%" valign="top">';
+
+						$TUser1 = $TUser2 = array();
+
+						$userlist1 = displayUsersListWithPicto($TUser1, $fk_usergroup1, 'list1');
+
+
+						$skill = new Skill($db);
+						$TSkill1 = getSkillForUsers($TUser1);
+
+						if ($fk_job > 0) {
+							$TSkill2 = getSkillForJob($fk_job);
+
+							$job = new Job($db);
+							$job->fetch($fk_job);
+							$userlist2 = '<ul>
+											  <li>
+												  <h3>' . $job->label . '</h3>
+												  <p>'  . $job->description . '</p>
+											  </li>
+										  </ul>';
+						} else {
+							$userlist2 = displayUsersListWithPicto($TUser2, $fk_usergroup2, 'list2');
+							$TSkill2 = getSkillForUsers($TUser2);
+						}
+
+						$TMergedSkills = mergeSkills($TSkill1, $TSkill2);
+
+						echo $userlist1;
+
+						echo '</td>';
+
+						echo '<td id="" style="width:20%" valign="top">' . skillList($TMergedSkills) . '</td>';
+						echo '<td id="" style="width:5%" valign="top">' . rate($TMergedSkills, 'rate1') . '</td>';
+						echo '<td id="" style="width:10%" valign="top">' . diff($TMergedSkills) . '</td>';
+						echo '<td id="" style="width:5%" valign="top">' . rate($TMergedSkills, 'rate2') . '</td>';
+
+						echo '<td id="list-user-right" style="width:30%" valign="top">';
+
+						echo $userlist2;
+
+						echo '</td></tr>';
+
+						?>
+
+					</table>
+
+				<?php } ?>
+
+			</div>
+
+		</form>
+
+	</div>
+
+<?php
+
+print dol_get_fiche_end();
+
+llxFooter();
+
+
+
+/**
+ *
+ * 	Return a html list element with diff  between required rank  and user rank
+ *
+ * 		@param array $TMergedSkills skill list with all rate to add good picto
+ * 		@return string
+ */
+function diff(&$TMergedSkills)
+{
+
+	$out = '<ul class="diff">';
+
+	foreach ($TMergedSkills as $id => &$sk) {
+		$class = 'diffnote';
+
+		if (empty($sk->rate2)) $class .= ' toohappy';
+		elseif (empty($sk->rate1)) $class .= ' toosad';
+		elseif ($sk->rate1 == $sk->rate2) $class .= ' happy';
+		elseif ($sk->rate2 < $sk->rate1) $class .= ' veryhappy';
+		elseif ($sk->rate2 > $sk->rate1) $class .= ' sad';
+
+		$out .= '<li fk_skill="' . $id . '" class="' . $class . '" style="text-align:center;">
+	      <span class="' . $class . '">&nbsp;</span>
+	    </li>';
+	}
+
+	$out .= '</ul>';
+
+	return $out;
+}
+
+/**
+ * 	Return a html list with rank informations
+ * 		@param array $TMergedSkills skill list for display
+ * 		@param string $field which column of comparison we are working with
+ * 		@return string
+ */
+function rate(&$TMergedSkills, $field)
+{
+	global $langs, $fk_job;
+
+	$out = '<ul class="competence">';
+
+	foreach ($TMergedSkills as $id => &$sk) {
+		$class = "note";
+		$how_many = 0;
+		if (empty($sk->{$field})) {
+			$note = 'x';
+			$class .= ' none';
+		} else {
+			$note = $sk->{$field};
+			$how_many = ($field === 'rate1') ? $sk->how_many_max1 : $sk->how_many_max2;
+		}
+
+		if ($field === 'rate2' && $fk_job > 0) $trad = $langs->trans('RequiredRank');
+		else $trad = $langs->trans('HighestRank');
+
+		$out .= '<li fk_skill="' . $id . '" style="text-align:center;">
+	      <p><span class="' . $class . ' classfortooltip" title="' . $trad . '">' . $note . '</span>' . ($how_many > 0 ? '<span class="bubble classfortooltip" title="' . $langs->trans('HowManyUserWithThisMaxNote') . '">' . $how_many . '</span>' : '') . '</p>
+	    </li>';
+	}
+
+	$out .= '</ul>';
+
+	return $out;
+}
+
+/**
+ * 	  	return a html ul list of skills
+ *
+ * 			@param array $TMergedSkills skill list for display
+ * 			@return string (ul list in html )
+ */
+function skillList(&$TMergedSkills)
+{
+
+	$out = '<ul class="competence">';
+
+	foreach ($TMergedSkills as $id => &$sk) {
+		$out .= '<li fk_skill="' . $id . '">
+	      <h3>' . $sk->label . '</h3>
+	      <p>' . $sk->description . '</p>
+	    </li>';
+	}
+
+	$out .= '</ul>';
+
+	return $out;
+}
+
+/**
+ *  create an array of lines [ skillLabel,dscription, maxrank on group1 , minrank needed for this skill ]
+ *
+ * @param array $TSkill1 skill list of first column
+ * @param array $TSkill2 skill list of second column
+ * @return array
+ */
+function mergeSkills($TSkill1, $TSkill2)
+{
+
+	$Tab = array();
+
+	foreach ($TSkill1 as &$sk) {
+			if (empty($Tab[$sk->fk_skill])) $Tab[$sk->fk_skill] = new stdClass;
+
+			$Tab[$sk->fk_skill]->rate1 = $sk->rankorder;
+			$Tab[$sk->fk_skill]->how_many_max1 = $sk->how_many_max;
+			$Tab[$sk->fk_skill]->label = $sk->label;
+			$Tab[$sk->fk_skill]->description = $sk->description;
+	}
+
+	foreach ($TSkill2 as &$sk) {
+			if (empty($Tab[$sk->fk_skill])) $Tab[$sk->fk_skill] = new stdClass;
+			$Tab[$sk->fk_skill]->rate2 = $sk->rankorder;
+			$Tab[$sk->fk_skill]->label = $sk->label;
+			$Tab[$sk->fk_skill]->description = $sk->description;
+			$Tab[$sk->fk_skill]->how_many_max2 = $sk->how_many_max;
+	}
+
+	return $Tab;
+}
+
+/**
+ * 	Display a list of User with picto
+ * 		@param array $TUser list of users (employees) in selected usergroup of a column
+ * 		@param int $fk_usergroup selected usergroup id
+ * 		@param string $namelist html name
+ * 		@return string
+ */
+function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list-user')
+{
+	global $db, $langs, $conf, $form;
+
+	$out = '';
+	if ($fk_usergroup > 0) {
+		$list = $namelist . '_excluded_id';
+
+		$excludedIdsList = GETPOST($list);
+
+
+		$sql = "SELECT DISTINCT u.rowid FROM " . MAIN_DB_PREFIX . "user u
+		LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ugu ON (u.rowid = ugu.fk_user)
+		WHERE u.statut > 0
+		AND ugu.fk_usergroup=" . ((int) $fk_usergroup);
+
+		$res = $db->query($sql);
+		$out .= '<ul name="' . $namelist . '">';
+
+		$TExcludedId = explode(',', $excludedIdsList);
+
+		$form = new Form($db);
+		$out .= '<input id="'.$list.'" type="HIDDEN" name="'.$list.'" value="'.$excludedIdsList.'"> ';
+
+		while ($obj = $db->fetch_object($res)) {
+			$class = '';
+
+			$user = new User($db);
+			$user->fetch($obj->rowid);
+
+			$name = $user->getFullName($langs);
+			if (empty($name)) $name = $user->login;
+
+			if (in_array($user->id, $TExcludedId)) {
+				$class .= ' disabled';
+			} else {
+				if (!in_array($user->id, $TUser)) $TUser[] = $user->id;
+			}
+
+
+			$desc = '';
+
+			$job = Job::getLastJobForUser($user->id);
+			$desc .= $job;
+
+			$static_eval = new Evaluation($db);
+			$evaluation = $static_eval->getLastEvaluationForUser($user->id);
+
+			if (!empty($evaluation) && !empty($evaluation->date_eval)) {
+				$desc .= $langs->trans('DateLastEval') . ' : ' . dol_print_date($evaluation->date_eval);
+			} else {
+				$desc .= $langs->trans('NoEval');
+			}
+
+			if (!empty($user->array_options['options_DDA'])) $desc .= '<br>' . $langs->trans('Anciennete') . ' : ' . dol_print_date(strtotime($user->array_options['options_DDA']));
+
+			$out .= '<li fk_user="' . $user->id . '" class="' . $class . '">
+		      ' . $form->showphoto('userphoto', $user, 0, 0, 0, 'photoref', 'small', 1, 0, 1) . '
+		      <h3>' . $name . '</h3>
+		      <p>' . $desc . '</p>
+		    </li>';
+		}
+
+		$out .= '</ul>';
+	}
+
+	return $out;
+}
+
+
+/**
+ *
+ * 		Allow to get skill(s) of a user
+ *
+ * 		@param array $TUser array of employees we need to get skills
+ * 		@return array|int
+ */
+function getSkillForUsers($TUser)
+{
+	global $db;
+
+	//I go back to the user with the highest score in a given group for all the skills assessed in that group
+	if (empty($TUser)) return array();
+
+	$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill, ';
+	$sql.= ' MAX(sr.rankorder) as "rankorder"';
+	$sql.= ' FROM '.MAIN_DB_PREFIX.'hrm_skill sk';
+	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)';
+	$sql.= " WHERE sr.objecttype = '".SkillRank::SKILLRANK_TYPE_USER."'";
+	$sql.= ' AND sr.fk_object IN ('.$db->sanitize(implode(',', $TUser)).')';
+	$sql.= " GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill "; // group par competence
+
+	$resql = $db->query($sql);
+	$Tab = array();
+
+	if ($resql) {
+		//For each skill, we count the number of times that the max score has been reached within a given group
+		$num = 0;
+		while ($obj = $db->fetch_object($resql) ) {
+			$sql1 = "SELECT count(*) as how_many_max FROM ".MAIN_DB_PREFIX."hrm_skillrank sr";
+			$sql1.=" WHERE sr.rankorder = ".((int) $obj->rankorder);
+			$sql1.=" AND sr.objecttype = '".Skillrank::SKILLRANK_TYPE_USER."'";
+			$sql1.=" AND sr.fk_skill = ".((int) $obj->fk_skill);
+			$sql1.=" AND sr.fk_object IN (".$db->sanitize(implode(',', $TUser)).")";
+			$resql1 = $db->query($sql1);
+
+			$objMax = $db->fetch_object($resql1);
+
+			$Tab[$num] = new stdClass();
+			$Tab[$num]->fk_skill = $obj->fk_skill;
+			$Tab[$num]->label = $obj->label;
+			$Tab[$num]->description = $obj->description;
+			$Tab[$num]->skill_type = $obj->skill_type;
+			$Tab[$num]->fk_object = $obj->fk_object;
+			$Tab[$num]->objectType = SkillRank::SKILLRANK_TYPE_USER;
+			$Tab[$num]->rankorder = $obj->rankorder;
+			$Tab[$num]->how_many_max = $objMax->how_many_max;
+
+			$num++;
+		}
+	} else {
+		dol_print_error($db);
+	}
+
+	return $Tab;
+}
+
+/**
+ * 		Allow to get skill(s) of a job
+ *
+ * 		@param int $fk_job job we need to get required skills
+ * 		@return array|int
+ */
+function getSkillForJob($fk_job)
+{
+	global $db;
+
+	if (empty($fk_job)) return array();
+
+	$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill, ';
+	$sql.= ' MAX(sr.rankorder) as "rankorder"';
+	$sql.=' FROM '.MAIN_DB_PREFIX.'hrm_skill sk';
+	$sql.='	LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skillrank sr ON (sk.rowid = sr.fk_skill)';
+	$sql.="	WHERE sr.objecttype = '".SkillRank::SKILLRANK_TYPE_JOB."'";
+	$sql.=' AND sr.fk_object = '.((int) $fk_job);
+	$sql.=' GROUP BY sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill '; // group par competence*/
+
+	$resql = $db->query($sql);
+	$Tab = array();
+
+
+	if ($resql) {
+		$num = 0;
+		while ($obj = $db->fetch_object($resql) ) {
+			$Tab[$num] = new stdClass();
+			$Tab[$num]->fk_skill = $obj->fk_skill;
+			$Tab[$num]->label = $obj->label;
+			$Tab[$num]->description = $obj->description;
+			$Tab[$num]->skill_type = $obj->skill_type;
+			//$Tab[$num]->date_start = '';// du poste
+			//$Tab[$num]->date_end = ''; //  du poste
+			$Tab[$num]->fk_object = $obj->fk_object;
+			$Tab[$num]->objectType = SkillRank::SKILLRANK_TYPE_JOB;
+			$Tab[$num]->rankorder = $obj->rankorder;
+			$Tab[$num]->how_many_max = $obj->how_many_max;
+
+			$num++;
+		}
+	} else {
+		dol_print_error($db);
+	}
+
+
+	return $Tab;
+}
diff --git a/htdocs/hrm/core/tpl/objectline_title.tpl.php b/htdocs/hrm/core/tpl/objectline_title.tpl.php
new file mode 100644
index 00000000000..3801288543a
--- /dev/null
+++ b/htdocs/hrm/core/tpl/objectline_title.tpl.php
@@ -0,0 +1,80 @@
+<?php
+/* Copyright (C) 2010-2013	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2010-2011	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2012-2013	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) 2013		Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2017		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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 objectline_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>';
+}
+
+// Skill type
+print '<td class="linecollabel">'.$langs->trans('SkillType').'</td>';
+
+// Label skill
+print '<td class="linecollabel">'.$langs->trans('Label').'</td>';
+
+// Description
+print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
+
+// Note
+print '<td class="linecolrank right" style="width: 80px">'.$langs->trans('EmployeeRank').'</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>';
+
+print "</tr>\n";
+print "</thead>\n";
+
+print "<!-- END PHP TEMPLATE objectline_title.tpl.php -->\n";
diff --git a/htdocs/hrm/core/tpl/objectline_view.tpl.php b/htdocs/hrm/core/tpl/objectline_view.tpl.php
new file mode 100644
index 00000000000..ce436ca604a
--- /dev/null
+++ b/htdocs/hrm/core/tpl/objectline_view.tpl.php
@@ -0,0 +1,160 @@
+<?php
+/* Copyright (C) 2010-2013	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2010-2011	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2012-2013	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) 2013		Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2017		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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;
+}
+
+global $mysoc;
+global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax;
+
+// 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.'"';
+
+$coldisplay = 0;
+?>
+<!-- BEGIN PHP TEMPLATE objectline_view.tpl.php -->
+<tr  id="row-<?php print $line->id?>" class="drag drop oddeven" <?php print $domData; ?> >
+<?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
+	<td class="linecolnum center"><span class="opacitymedium"><?php $coldisplay++; ?><?php print ($i + 1); ?></span></td>
+<?php } ?>
+	<td class="linecollabel"><?php $coldisplay++; ?><div id="line_<?php print $line->id; ?>"></div>
+<?php
+if ($line->fk_skill > 0) {
+	$skill = new Skill($this->db);
+	$resSkill = $skill->fetch($line->fk_skill);
+	if ($resSkill > 0) {
+		print Skill::typeCodeToLabel($skill->skill_type).'</td>';
+		print '<td>'.$skill->getNomUrl(1);
+	}
+}
+?>
+	</td>
+
+	<td class="linecoldescription minwidth300imp"><?php $coldisplay++; ?>
+<?php
+
+// Add description in form
+if ($line->fk_skill > 0 && $resSkill > 0) {
+	print $skill->description;
+}
+
+print '</td>';
+
+?>
+	<td class="linecolrank nowrap right"><?php $coldisplay++; ?>
+
+<?php
+global $permissiontoadd;
+
+		print displayRankInfos($line->rankorder, $line->fk_skill, 'TNote', ($this->status == 0 && $permissiontoadd) ? 'edit' : 'view');
+
+?>
+
+	</td>
+
+<?php
+
+if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlines') {
+	$situationinvoicelinewithparent = 0;
+	if ($line->fk_prev_id != null && in_array($object->element, array('facture', 'facturedet'))) {
+		if ($object->type == $object::TYPE_SITUATION) {	// The constant TYPE_SITUATION exists only for object invoice
+			// Set constant to disallow editing during a situation cycle
+			$situationinvoicelinewithparent = 1;
+		}
+	}
+
+	print '<td class="linecoledit center">';
+	$coldisplay++;
+	if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
+	} else { ?>
+		<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">';
+	$coldisplay++;
+	if (!$situationinvoicelinewithparent && 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' && ($this->situation_counter == 1 || !$this->situation_cycle_ref) && empty($disablemove)) {
+		print '<td class="linecolmove tdlineupdown center">';
+		$coldisplay++;
+		if ($i > 0) { ?>
+			<a class="lineupdown" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id; ?>">
+			<?php print img_up('default', 0, 'imgupforline'); ?>
+			</a>
+		<?php }
+		if ($i < $num - 1) { ?>
+			<a class="lineupdown" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id; ?>">
+			<?php print img_down('default', 0, 'imgdownforline'); ?>
+			</a>
+		<?php }
+		print '</td>';
+	} 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 objectline_view.tpl.php -->\n";
diff --git a/htdocs/hrm/core/tpl/skilldet.fiche.tpl.php b/htdocs/hrm/core/tpl/skilldet.fiche.tpl.php
new file mode 100644
index 00000000000..60bb56ff173
--- /dev/null
+++ b/htdocs/hrm/core/tpl/skilldet.fiche.tpl.php
@@ -0,0 +1,113 @@
+<?php
+
+// Protection to avoid direct call of template
+if (empty($object) || !is_object($object)) {
+	print "Error, template page can't be called as URL";
+	exit;
+}
+/*
+// $permissionnote 	must be defined by caller. For example $permissionnote=$user->rights->module->create
+// $cssclass   		must be defined by caller. For example $cssclass='fieldtitle'
+$module       = $object->element;
+$note_public  = 'note_public';
+$note_private = 'note_private';
+
+$colwidth = (isset($colwidth) ? $colwidth : (empty($cssclass) ? '25' : ''));
+// Set $permission from the $permissionnote var defined on calling page
+$permission = (isset($permissionnote) ? $permissionnote : (isset($permission) ? $permission : (isset($user->rights->$module->create) ? $user->rights->$module->create : (isset($user->rights->$module->creer) ? $user->rights->$module->creer : 0))));
+$moreparam = (isset($moreparam) ? $moreparam : '');
+$value_public = $object->note_public;
+$value_private = $object->note_private;
+if (!empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES)) {
+$stringtoadd = dol_print_date(dol_now(), 'dayhour').' '.$user->getFullName($langs).' --';
+if (GETPOST('action', 'aZ09') == 'edit'.$note_public) {
+$value_public = dol_concatdesc($value_public, ($value_public ? "\n" : "")."-- ".$stringtoadd);
+if (dol_textishtml($value_public)) {
+$value_public .= "<br>\n";
+} else {
+$value_public .= "\n";
+}
+}
+}
+if (!empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES)) {
+$stringtoadd = dol_print_date(dol_now(), 'dayhour').' '.$user->getFullName($langs).' --';
+if (GETPOST('action', 'aZ09') == 'edit'.$note_private) {
+$value_private = dol_concatdesc($value_private, ($value_private ? "\n" : "")."-- ".$stringtoadd);
+if (dol_textishtml($value_private)) {
+$value_private .= "<br>\n";
+} else {
+$value_private .= "\n";
+}
+}
+}*/
+/*
+// Special cases
+if ($module == 'propal') {
+$permission = $user->rights->propale->creer;
+} elseif ($module == 'supplier_proposal') {
+$permission = $user->rights->supplier_proposal->creer;
+} elseif ($module == 'fichinter') {
+$permission = $user->rights->ficheinter->creer;
+} elseif ($module == 'project') {
+$permission = $user->rights->projet->creer;
+} elseif ($module == 'project_task') {
+$permission = $user->rights->projet->creer;
+} elseif ($module == 'invoice_supplier') {
+if (empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) {
+$permission = $user->rights->fournisseur->facture->creer;
+} else {
+$permission = $user->rights->supplier_invoice->creer;
+}
+} elseif ($module == 'order_supplier') {
+if (empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) {
+$permission = $user->rights->fournisseur->commande->creer;
+} else {
+$permission = $user->rights->supplier_order->creer;
+}
+} elseif ($module == 'societe') {
+$permission = $user->rights->societe->creer;
+} elseif ($module == 'contact') {
+$permission = $user->rights->societe->creer;
+} elseif ($module == 'shipping') {
+$permission = $user->rights->expedition->creer;
+} elseif ($module == 'product') {
+$permission = $user->rights->produit->creer;
+} elseif ($module == 'ecmfiles') {
+$permission = $user->rights->ecm->setup;
+}*/
+//else dol_print_error('','Bad value '.$module.' for param module');
+
+if (!empty($object->table_element_line)) {
+	// Show object lines
+	$result = $object->getLinesArray();
+}
+
+
+
+print '<!-- BEGIN PHP TEMPLATE SKILLDET -->'."\n";
+
+print '<div class="tagtable border table-border tableforfield centpercent">'."\n";
+	print '<div class="tagtr table-border-row">'."\n";
+		$editmode = (GETPOST('action', 'aZ09') == 'edit'.$note_public);
+		print '<div class="tagtd tagtdnote tdtop'.($editmode ? '' : ' sensiblehtmlcontent').' table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
+		print $form->editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam, '', 0);
+		print '</div>'."\n";
+	print '<div class="tagtd wordbreak table-val-border-col'.($editmode ? '' : ' sensiblehtmlcontent').'">'."\n";
+		print $form->editfieldval("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, '', null, null, $moreparam, 1)."\n";
+		print '</div>'."\n";
+	print '</div>'."\n";
+if (empty($user->socid)) {
+	// Private notes (always hidden to external users)
+	print '<div class="tagtr table-border-row">'."\n";
+	$editmode = (GETPOST('action', 'aZ09') == 'edit'.$note_private);
+	print '<div class="tagtd tagtdnote tdtop'.($editmode ? '' : ' sensiblehtmlcontent').' table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
+	print $form->editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam, '', 0);
+	print '</div>'."\n";
+	print '<div class="tagtd wordbreak table-val-border-col'.($editmode ? '' : ' sensiblehtmlcontent').'">'."\n";
+	print $form->editfieldval("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, '', null, null, $moreparam, 1);
+	print '</div>'."\n";
+	print '</div>'."\n";
+}
+print '</div>'."\n";
+?>
+<!-- END PHP TEMPLATE NOTES-->
diff --git a/htdocs/hrm/css/style.css b/htdocs/hrm/css/style.css
new file mode 100644
index 00000000000..0c8ba81d827
--- /dev/null
+++ b/htdocs/hrm/css/style.css
@@ -0,0 +1,130 @@
+#compare ul,#compare li,#compare h3 {margin: 0; padding: 0;}
+
+#compare div {
+  margin: 20px;
+}
+
+#compare ul {
+  list-style-type: none;
+  width: 100%;
+}
+
+#compare h3 {
+  font: bold 20px/1.5 Helvetica, Verdana, sans-serif;
+}
+
+#compare li img {
+  float: left;
+  margin: 0 15px 0 0;
+  max-width:80px;
+}
+
+#compare li p {
+  font: 200 12px/1.5 Georgia, Times New Roman, serif;
+}
+
+#compare li {
+  padding: 10px;
+  overflow: auto;
+  border-bottom: 2px solid #98b880;
+}
+#compare ul.competence li,#compare ul.note li {
+  height:48px;
+  overflow: hidden;
+  border-bottom: 2px solid #6C286C;
+}
+
+#compare li:hover {
+  background: #eee;
+  cursor: pointer;
+}
+
+#compare li.disabled {
+  color:#999;
+  border-bottom: 2px solid #ff0000;
+}
+
+#compare li.disabled img,#compare li.disabled p {
+  display:none;
+}
+
+span.note {
+	font: bold Helvetica, Verdana, sans-serif;
+	background: #eee none repeat scroll 0 0;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    color: #555;
+    cursor: pointer;
+    display: inline-block;
+    margin: 2px;
+    min-width: 20px;
+    padding: 5px 7px;
+    text-align: center;
+    font-weight: bold;
+}
+span.note.none {
+	background: #BA7777 none repeat scroll 0 0;
+}
+#compare ul.diff li {
+	text-align: center;
+	border-bottom:0 none;
+	height:48px;
+	overflow: hidden;
+	border-bottom: 2px solid #77BABA;
+}
+span.diffnote {
+	display: inline-block;
+	background: #c3e6cb;
+	width:42px;
+	height: 42px;
+	overflow: hidden;
+	border:none;
+	box-sizing: border-box;
+}
+span.diffnote.little {
+	width:25px;
+	height: 25px;
+	border-width:3px;
+}
+span.toohappy {
+	background: #3097D1;
+	border:5px solid #3097D1;
+}
+span.veryhappy {
+	border:5px solid #3097D1;
+}
+span.toosad {
+	background: #ccc;
+	border:5px solid #ccc;
+}
+span.sad {
+	background:#bd4147;
+}
+/*span.diffnote {
+	display: inline-block;
+	background: url(img/smiley.png);
+	width:42px;
+	height: 42px;
+	overflow: hidden;
+}
+span.toohappy {
+	background-position: -105px 0px;
+}
+span.veryhappy {
+	background-position: -53px 0px;
+}
+span.toosad {
+	background-position: -105px -52px;
+}
+span.sad {
+	background-position: 0px -52px;
+}*/
+
+span.bubble {
+	background-color: #ccc;
+	border:1px;
+	display:inline-block;
+	width:20px;
+	height:20px;
+	border-radius:20px;
+}
\ No newline at end of file
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index caec6191d0d..0ce7d793003 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -326,11 +326,7 @@ if (($id || $ref) && $action == 'edit') {
 
 			print dol_get_fiche_end();
 
-			print '<div class="center">';
-			print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
-			print '</div>';
+			print $form->buttonsSaveCancel();
 
 			print '</form>';
 		}
@@ -423,7 +419,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 * Action bar
 	 */
 	print '<div class="tabsAction">';
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$id.'">'.$langs->trans('Modify').'</a>';
 	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$id.'">'.$langs->trans('Delete').'</a>';
 	print '</div>';
 }
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index 517b76de93a..b1f7057f6a5 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -46,8 +46,8 @@ if (GETPOST('actioncode', 'array')) {
 $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');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -137,7 +137,7 @@ if ($object->id > 0) {
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/hrm/hrm/myobject_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/hrm/myobject_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
 	/*
@@ -154,7 +154,7 @@ if ($object->id > 0) {
 	 if ($permissiontoadd)
 	 {
 	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/hrm/evaluation_agenda.php b/htdocs/hrm/evaluation_agenda.php
new file mode 100644
index 00000000000..87a09043a62
--- /dev/null
+++ b/htdocs/hrm/evaluation_agenda.php
@@ -0,0 +1,234 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       evaluation_agenda.php
+ *  \ingroup    hr
+ *  \brief      Tab of events on Evaluation
+ */
+
+
+// Load Dolibarr environment
+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.'/hrm/class/evaluation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_evaluation.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
+
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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 Evaluation($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('evaluationagenda', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
+}
+
+$permissiontoadd = $user->rights->hrm->evaluation->write; // Used by the include of actions_addupdatedelete.inc.php
+$permissiontoread = $user->rights->hrm->evaluation->read; // 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, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->hrm->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 = evaluationPrepareHead($object);
+
+
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("Agenda"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/hrm/evaluation_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	$morehtmlref .= $langs->trans('Label').' : '.$object->label;
+	$u_position = new User(($db));
+	$u_position->fetch($object->fk_user);
+	$morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$u_position->getNomUrl(1);
+	$job = new Job($db);
+	$job->fetch($object->fk_job);
+	$morehtmlref .= '<br>'.$langs->trans('Job').' : '.$job->getNomUrl(1);
+	$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("ActionsOnEvaluation"), '', '');
+
+		// 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/hrm/evaluation_card.php b/htdocs/hrm/evaluation_card.php
new file mode 100644
index 00000000000..8aeadeaa18c
--- /dev/null
+++ b/htdocs/hrm/evaluation_card.php
@@ -0,0 +1,711 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       evaluation_card.php
+ *		\ingroup    hrm
+ *		\brief      Page to create/edit/view evaluation
+ */
+
+// 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.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/evaluation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skillrank.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_evaluation.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skillrank.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "other", 'products'));
+
+// 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') : 'evaluationcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+//$lineid   = GETPOST('lineid', 'int');
+
+// Initialize technical objects
+$object = new Evaluation($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('evaluationcard', 'globalcard')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Initialize array of search criterias
+$search_all = GETPOST("search_all", 'alpha');
+$search = array();
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha')) {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+}
+
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+
+$permissiontoread = $user->rights->hrm->evaluation->read;
+$permissiontoadd = $user->rights->hrm->evaluation->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontovalidate = $user->rights->hrm->evaluation_advance->validate;
+$permissiontoClose = $user->rights->hrm->evaluation->write;
+$permissiontodelete = $user->rights->hrm->evaluation->delete/* || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT)*/;
+$permissiondellink = $user->rights->hrm->evaluation->write; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1].'/evaluation';
+
+// 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->hrm->enabled)) accessforbidden();
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) 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('/hrm/evaluation_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('/hrm/evaluation_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+			}
+		}
+	}
+
+	$triggermodname = 'hrm_EVALUATION_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 = 'hrm_EVALUATION_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_EVALUATION_TO';
+	$trackid = 'evaluation'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
+	if ($action == 'saveSkill') {
+		$TNote = GETPOST('TNote', 'array');
+		if (!empty($TNote)) {
+			foreach ($object->lines as $line) {
+				$line->rankorder = $TNote[$line->fk_skill];
+				$line->update($user);
+			}
+		}
+	}
+
+	if ($action == 'close') {
+		// save evaldet lines to user;
+		$sk = new SkillRank($db);
+		$SkillrecordsForActiveUser = $sk->fetchAll('ASC', 'fk_skill', 0, 0, array("customsql"=>"fk_object = ".$object->fk_user ." AND objecttype ='".SkillRank::SKILLRANK_TYPE_USER."'"), 'AND');
+
+		$errors = 0;
+		// we go through the evaldets of the eval
+		foreach ($object->lines as $key => $line) {
+			// no reference .. we add the line to use it
+			if (count($SkillrecordsForActiveUser) == 0) {
+				$newSkill = new SkillRank($db);
+				$resCreate = $newSkill->cloneFromCurrentSkill($line, $object->fk_user);
+
+				if ($resCreate <= 0) {
+					$errors++;
+					setEventMessage($langs->trans('ErrorCreateUserSkill'), $line->fk_skill);
+				}
+			} else {
+				//check if the skill is present to use it
+				$find = false;
+				$keyFind = 0;
+				foreach ($SkillrecordsForActiveUser as $k => $sr) {
+					if ($sr->fk_skill == $line->fk_skill) {
+						$keyFind = $k;
+						$find = true;
+						break;
+					}
+				}
+				//we update the skill user
+				if ($find) {
+					$updSkill = $SkillrecordsForActiveUser[$k];
+
+					$updSkill->rankorder = $line->rankorder;
+					$updSkill->update($user);
+				} else { // sinon on ajoute la skill
+					$newSkill = new SkillRank($db);
+					$resCreate = $newSkill->cloneFromCurrentSkill($line, $object->fk_user);
+				}
+			}
+		}
+		if (empty($errors)) {
+			$object->setStatut(Evaluation::STATUS_CLOSED);
+			setEventMessage('EmployeeSkillsUpdated');
+		}
+	}
+
+	if ($action == 'reopen' ) {
+		// no update here we just change the evaluation status
+		$object->setStatut(Evaluation::STATUS_VALIDATED);
+	}
+}
+
+
+
+
+/*
+ * View
+ *
+ * Put here all code to build page
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formproject = new FormProjets($db);
+
+$title = $langs->trans("Evaluation");
+$help_url = '';
+$css = array();
+$css[] = '/hrm/css/style.css';
+llxHeader('', $title, $help_url, '', 0, 0, '', $css);
+
+print '<script type="text/javascript" language="javascript">
+	$(document).ready(function() {
+	  $("#btn_valid").click(function(){
+		 var form = $("#form_save_rank");
+
+		 $.ajax({
+
+			 type: "POST",
+			 url: form.attr("action"),
+			 data: form.serialize(),
+			 dataType: "json"
+		 }).always(function() {
+             window.location.href = "'.dol_buildpath('/hrm/evaluation_card.php', 1).'?id='.$id.'&action=validate&token='.newToken().'";
+             return false;
+		 });
+
+	   });
+	});
+</script>';
+
+// Part to create
+if ($action == 'create') {
+	print load_fiche_titre($langs->trans("NewEval"), '', '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 '<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 '</form>';
+}
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit') {
+	print load_fiche_titre($langs->trans("Evaluation"), '', '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 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>';
+}
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	$res = $object->fetch_optionals();
+
+	$head = evaluationPrepareHead($object);
+	print dol_get_fiche_head($head, 'card', $langs->trans("Workstation"), -1, $object->picto);
+
+	$formconfirm = '';
+
+	if ($action == 'validate' && $permissiontovalidate) {
+		// Confirm validate proposal
+		$error = 0;
+
+		// We verify whether the object is provisionally numbering
+		$ref = substr($object->ref, 1, 4);
+		if ($ref == 'PROV') {
+			$numref = $object->getNextNumRef();
+			if (empty($numref)) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		} else {
+			$numref = $object->ref;
+		}
+
+		$text = $langs->trans('ConfirmValidateEvaluation', $numref);
+		if (!empty($conf->notification->enabled)) {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
+			$notify = new Notify($db);
+			$text .= '<br>';
+			$text .= $notify->confirmMessage('HRM_EVALUATION_VALIDATE', $object->socid, $object);
+		}
+
+		if (!$error) {
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateEvaluation'), $text, 'confirm_validate', '', 0, 1);
+		}
+	}
+
+	// Confirmation to delete
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteEvaluation'), $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();
+
+		$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('/hrm/evaluation_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	$morehtmlref .= $langs->trans('Label').' : '.$object->label;
+	$u_position = new User(($db));
+	$u_position->fetch($object->fk_user);
+	$morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$u_position->getNomUrl(1);
+	$job = new Job($db);
+	$job->fetch($object->fk_job);
+	$morehtmlref .= '<br>'.$langs->trans('Job').' : '.$job->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 tableforfield">'."\n";
+
+	$object->fields['label']['visible']=0; // Already in banner
+	$object->fields['fk_user']['visible']=0; // Already in banner
+	$object->fields['fk_job']['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>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	print dol_get_fiche_end();
+
+
+	/*
+	 * Lines
+	 */
+
+	if (!empty($object->table_element_line)) {
+		if ($object->status == Evaluation::STATUS_DRAFT) {
+			$result = $object->getLinesArray();
+
+			print '	<form name="form_save_rank" id="form_save_rank" 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="saveSkill">
+		<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%">';
+				print '<tr class="liste_titre">';
+				print '<td>'.$langs->trans('Skill').'</td>';
+				print '<td>'.$langs->trans('Description').'</td>';
+				print '<td class="right">'.$langs->trans('Rank').'</td>';
+				print '</tr>';
+			}*/
+
+
+			if (!empty($object->lines)) {
+				$conf->modules_parts['tpl']['hrm']='/hrm/core/tpl/'; // Pour utilisation du tpl hrm sur cet écran
+				print '<table id="tablelines" class="noborder noshadow">';
+				$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '');
+				print '</table>';
+			}
+
+
+
+			if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+				print '</table>';
+
+				if ($object->status == $object::STATUS_DRAFT && $permissiontoadd) {
+					print '<br><div class="center">';
+					print '<input class="button pll-right" type="submit" value="'.$langs->trans('Save').'" >';
+					print '</div>';
+				}
+			}
+
+
+			print '</div>';
+
+			print "</form>\n";
+			print "<br>";
+		}
+	}
+
+	// list of comparison
+	if ($object->status != Evaluation::STATUS_DRAFT) {
+		// Recovery of skills related to this evaluation
+
+		$sql = 'select';
+		$sql .= '  e.ref,';
+		$sql .= '  e.date_creation,';
+		$sql .= '  e.fk_job,';
+		$sql .= '  j.label as "refjob",';
+		$sql .= '  ed.fk_skill,';
+
+		$sql .= '  sk.label as "skilllabel",';
+		$sql .= '  sk.skill_type,';
+		$sql .= '  sk.description,';
+		$sql .= '  ed.rankorder,';
+		$sql .= '  ed.required_rank,';
+		$sql .= '  ed.rankorder as "userRankForSkill",';
+		$sql .= '  skdet_user.description as "userRankForSkillDesc",';
+		$sql .= '  skdet_required.description as "required_rank_desc"';
+
+		$sql .= '  FROM ' . MAIN_DB_PREFIX . 'hrm_evaluation as e';
+		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_evaluationdet as ed ON  e.rowid = ed.fk_evaluation';
+		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_job as j ON e.fk_job = j.rowid';
+		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_skill as sk ON ed.fk_skill = sk.rowid';
+		$sql .= '  INNER JOIN ' . MAIN_DB_PREFIX . 'hrm_skilldet as skdet_user ON (skdet_user.fk_skill = sk.rowid AND skdet_user.rankorder = ed.rankorder)';
+		//$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "hrm_skillrank as skr ON (j.rowid = skr.fk_object AND skr.fk_skill = ed.fk_skill AND skr.objecttype = 'job')";
+		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_skilldet as skdet_required ON (skdet_required.fk_skill = sk.rowid AND skdet_required.rankorder = ed.required_rank)';
+		$sql .= " WHERE e.rowid =" . ((int) $object->id);
+
+		//      echo $sql;
+
+		$resql = $db->query($sql);
+		$Tab = array();
+
+		if ($resql) {
+			$num = 0;
+			while ($obj = $db->fetch_object($resql)) {
+				$Tab[$num] = new stdClass();
+				$class = '';
+				$Tab[$num]->skill_type = $obj->skill_type;
+				$Tab[$num]->skill_id = $obj->fk_skill;
+				$Tab[$num]->skilllabel = $obj->skilllabel;
+				$Tab[$num]->description = $obj->description;
+				$Tab[$num]->userRankForSkill = '<span title="'.$obj->userRankForSkillDesc.'" class="radio_js_bloc_number TNote_1">' . $obj->userRankForSkill . '</span>';
+				$Tab[$num]->required_rank = '<span title="'.$obj->required_rank_desc.'" class="radio_js_bloc_number TNote_1">' . $obj->required_rank . '</span>';
+
+				if ($obj->userRankForSkill > $obj->required_rank) {
+					$title=$langs->trans('MaxlevelGreaterThanShort');
+					$class .= 'veryhappy diffnote';
+				} elseif ($obj->userRankForSkill == $obj->required_rank) {
+					$title=$langs->trans('MaxLevelEqualToShort');
+					$class .= 'happy diffnote';
+				} elseif ($obj->userRankForSkill < $obj->required_rank) {
+					$title=$langs->trans('MaxLevelLowerThanShort');
+					$class .= 'sad';
+				}
+
+				$Tab[$num]->result = '<span title="'.$title.'" class="classfortooltip ' . $class . ' note">&nbsp;</span>';
+
+				$num++;
+			}
+
+			print '<div class="underbanner clearboth"></div>';
+			print '<table class="noborder centpercent">';
+
+			print '<tr class="liste_titre">';
+			print '<th style="width:auto;text-align:auto" class="liste_titre">' . $langs->trans("TypeSkill") . ' </th>';
+			print '<th style="width:auto;text-align:auto" class="liste_titre">' . $langs->trans("Label") . '</th>';
+			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 '</tr>';
+
+			$sk = new Skill($db);
+			foreach ($Tab as $t) {
+				$sk->fetch($t->skill_id);
+				print '<tr>';
+				print ' <td>' . Skill::typeCodeToLabel($t->skill_type) . '</td>';
+				print ' <td>' . $sk->getNomUrl(1) . '</td>';
+				print ' <td>' . $t->description . '</td>';
+				print ' <td align="center">' . $t->userRankForSkill . '</td>';
+				print ' <td align="center">' . $t->required_rank . '</td>';
+				print ' <td>' . $t->result . '</td>';
+				print '</tr>';
+			}
+
+			print '</table>';
+
+			?>
+
+			<script>
+
+				$(document).ready(function() {
+					$(".radio_js_bloc_number").tooltip();
+				});
+
+			</script>
+
+			<?php
+		}
+	}
+
+	// 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('Close'), '', 'close', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontodelete || ($object->status == $object::STATUS_CLOSED && $permissiontoclose));
+			} elseif ($object->status != $object::STATUS_CLOSED) {
+				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
+			}
+
+			if ($object->status == $object::STATUS_CLOSED) {
+				print dolGetButtonAction($langs->trans('ReOpen'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&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('Save').'&nbsp;'.$langs->trans('and').'&nbsp;'.$langs->trans('Valid'), '', 'default', '#', 'btn_valid', $permissiontovalidate);
+				} else {
+					$langs->load("errors");
+					print dolGetButtonAction($langs->trans("ErrorAddAtLeastOneLineFirst"), $langs->trans("Validate"), 'default', '#', '', 0);
+				}
+			}
+
+
+			// 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);
+		}
+
+
+		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->hrm->dir_output.'/'.$object->element.'/'.$objref;
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+			$genallowed = $user->rights->hrm->evaluation->read; // If you can read, you can build the PDF to read content
+			$delallowed = $user->rights->hrm->evaluation->write; // If you can create/edit, you can remove a file on card
+			print $formfile->showdocuments('hrm:Evaluation', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+		}
+
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('evaluation'));
+		$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.'/hrm/evaluation_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, (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 = 'evaluation';
+	$defaulttopic = 'InformationMessage';
+	$diroutput = $conf->hrm->dir_output;
+	$trackid = 'evaluation'.$object->id;
+
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/hrm/evaluation_contact.php b/htdocs/hrm/evaluation_contact.php
new file mode 100644
index 00000000000..61af793b28a
--- /dev/null
+++ b/htdocs/hrm/evaluation_contact.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>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       evaluation_contact.php
+ *  \ingroup    hrm
+ *  \brief      Tab for contacts linked to Evaluation
+ */
+
+// Load Dolibarr environment
+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';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/evaluation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_evaluation.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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 Evaluation($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('evaluationcontact', '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
+
+$permission = $user->rights->hrm->evaluation->write;
+
+// 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->hrm->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('Evaluation')." - ".$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 = evaluationPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'contact', '', -1, $object->picto);
+
+	$linkback = '<a href="'.dol_buildpath('/hrm/evaluation_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 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/hrm/evaluation_document.php b/htdocs/hrm/evaluation_document.php
new file mode 100644
index 00000000000..215756eff8b
--- /dev/null
+++ b/htdocs/hrm/evaluation_document.php
@@ -0,0 +1,176 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       evaluation_document.php
+ *  \ingroup    hrm
+ *  \brief      Tab for documents linked to Evaluation
+ */
+
+
+// Load Dolibarr environment
+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 . '/hrm/class/evaluation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_evaluation.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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', '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 = $liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
+//if (! $sortfield) $sortfield="position_name";
+
+// Initialize technical objects
+$object = new Evaluation($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('evaluationdocument', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->hrm->multidir_output[$object->entity ? $object->entity : $conf->entity]."/evaluation/".get_exdir(0, 0, 0, 1, $object);
+}
+
+$permissiontoadd = $user->rights->hrm->evaluation->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+$permissiontoread = $user->rights->hrm->evaluation->read;
+
+// 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->hrm->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$title = $langs->trans("Evaluation").' - '.$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 = evaluationPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'document', $langs->trans("Documents"), -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('/hrm/evaluation_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	$morehtmlref .= $langs->trans('Label').' : '.$object->label;
+	$u_position = new User(($db));
+	$u_position->fetch($object->fk_user);
+	$morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$u_position->getNomUrl(1);
+	$job = new Job($db);
+	$job->fetch($object->fk_job);
+	$morehtmlref .= '<br>'.$langs->trans('Job').' : '.$job->getNomUrl(1);
+	$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 = 'hrm';
+	$permtoedit = $permissiontoadd;
+	$param = '&id='.$object->id;
+
+	//$relativepathwithnofile='evaluation/' . dol_sanitizeFileName($object->id).'/';
+	$relativepathwithnofile = 'evaluation/'.dol_sanitizeFileName($object->ref).'/';
+
+	include 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/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php
new file mode 100644
index 00000000000..35189f11b87
--- /dev/null
+++ b/htdocs/hrm/evaluation_list.php
@@ -0,0 +1,683 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       evaluation_list.php
+ *		\ingroup    hrm
+ *		\brief      List page for evaluation
+ */
+
+
+// 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';
+
+// load hrm libraries
+require_once __DIR__.'/class/evaluation.class.php';
+
+// for other modules
+//dol_include_once('/othermodule/class/otherobject.class.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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') : 'evaluationlist'; // 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 Evaluation($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('evaluationlist')); // 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') ? 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'));
+	}
+}
+
+// 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 = $user->rights->hrm->evaluation->read;
+$permissiontoadd = $user->rights->hrm->evaluation->write;
+$permissiontodelete = $user->rights->hrm->evaluation->delete;
+
+// Security check
+if (empty($conf->hrm->enabled)) {
+	accessforbidden('Module not enabled');
+}
+
+// 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, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+//if (empty($conf->hrm->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 (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 = 'Evaluation';
+	$objectlabel = 'Evaluation';
+	$uploaddir = $conf->hrm->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$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');
+$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);
+*/
+
+$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('/hrm/evaluation_card.php', 1).'?id='.$id);
+	exit;
+}
+
+
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
+
+// 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';
+// 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_buildpath('/hrm/evaluation_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 = "SendEvaluationRef";
+$modelmail = "evaluation";
+$objecttmp = new Evaluation($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 '<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'));
+			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>';
+	}
+}
+// 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_hrm', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/hrm/evaluation_note.php b/htdocs/hrm/evaluation_note.php
new file mode 100644
index 00000000000..1b6b5a35564
--- /dev/null
+++ b/htdocs/hrm/evaluation_note.php
@@ -0,0 +1,133 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       evaluation_note.php
+ *  \ingroup    hrm
+ *  \brief      Tab for notes on Evaluation
+ */
+
+// Load Dolibarr environment
+require '../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/evaluation.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_evaluation.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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 Evaluation($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('evaluationnote', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
+}
+
+$permissionnote = $user->rights->hrm->evaluation->write; // Used by the include of actions_setnotes.inc.php
+$permissiontoread = $user->rights->hrm->evaluation->read; // 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, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+//if (empty($conf->hrm->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='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
+$help_url = '';
+llxHeader('', $langs->trans('Evaluation'), $help_url);
+
+if ($id > 0 || !empty($ref)) {
+	$object->fetch_thirdparty();
+
+	$head = evaluationPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'note', $langs->trans('Notes'), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/hrm/evaluation_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	$morehtmlref .= $langs->trans('Label').' : '.$object->label;
+	$u_position = new User(($db));
+	$u_position->fetch($object->fk_user);
+	$morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$u_position->getNomUrl(1);
+	$job = new Job($db);
+	$job->fetch($object->fk_job);
+	$morehtmlref .= '<br>'.$langs->trans('Job').' : '.$job->getNomUrl(1);
+	$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/hrm/index.php b/htdocs/hrm/index.php
index 68bcd78636b..2603d73ab81 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -52,7 +52,7 @@ $hookmanager = new HookManager($db);
 $hookmanager->initHooks('hrmindex');
 
 // Load translation files required by the page
-$langs->loadLangs(array('users', 'holidays', 'trips', 'boxes'));
+$langs->loadLangs(array('users', 'holiday', 'trips', 'boxes'));
 
 $socid = GETPOST("socid", "int");
 
@@ -96,7 +96,7 @@ print load_fiche_titre($langs->trans("HRMArea"), '', 'hrm');
 if (!empty($setupcompanynotcomplete)) {
 	$langs->load("errors");
 	$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));
-	print '<br><div class="warning"><a href="'.DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete) ? '' : '&action=edit').'">'.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'</a></div>';
+	print '<br><div class="warning"><a href="'.DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete) ? '' : '&action=edit&token='.newToken()).'">'.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'</a></div>';
 
 	llxFooter();
 	exit;
@@ -153,7 +153,7 @@ if (!empty($conf->holiday->enabled)) {
 		print '<table class="noborder nohover centpercent">';
 		print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Holidays").'</th></tr>';
 		print '<tr class="oddeven">';
-		print '<td colspan="3">';
+		print '<td>';
 
 		$out = '';
 		$nb_holiday = 0;
@@ -163,8 +163,9 @@ if (!empty($conf->holiday->enabled)) {
 			$nb_holiday += $nb_type;
 			$out .= ' - '.($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']).': <strong>'.($nb_type ? price2num($nb_type) : 0).'</strong><br>';
 		}
-		print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'<br>';
-		print $out;
+		$balancetoshow = $langs->trans('SoldeCPUser', '{s1}');
+		print '<div class="valignmiddle div-balanceofleave">'.str_replace('{s1}', img_picto('', 'holiday', 'class="paddingleft pictofixedwidth"').'<span class="balanceofleave valignmiddle'.($nb_holiday > 0 ? ' amountpaymentcomplete' : ($nb_holiday < 0 ? ' amountremaintopay' : ' amountpaymentneutral')).'">'.round($nb_holiday, 5).'</span>', $balancetoshow).'</div>';
+		print '<span class="opacitymedium">'.$out.'</span>';
 
 		print '</td>';
 		print '</tr>';
@@ -175,7 +176,7 @@ if (!empty($conf->holiday->enabled)) {
 }
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 
@@ -189,7 +190,7 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) {
 	if (empty($user->rights->holiday->readall)) {
 		$sql .= ' AND x.fk_user IN ('.$db->sanitize(join(',', $childids)).')';
 	}
-	//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+	//if (empty($user->rights->societe->client->voir) && !$user->socid) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	//if (!empty($socid)) $sql.= " AND x.fk_soc = ".((int) $socid);
 	$sql .= $db->order("x.tms", "DESC");
 	$sql .= $db->plimit($max, 0);
@@ -222,6 +223,7 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) {
 				$holidaystatic->id = $obj->rowid;
 				$holidaystatic->ref = $obj->ref;
 				$holidaystatic->statut = $obj->status;
+				$holidaystatic->date_debut = $db->jdate($obj->date_start);
 
 				$userstatic->id = $obj->uid;
 				$userstatic->lastname = $obj->lastname;
@@ -242,7 +244,7 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) {
 				print '<td>'.dol_print_date($db->jdate($obj->date_start), 'day').' <span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
 				print '<td>'.dol_print_date($db->jdate($obj->date_end), 'day').' <span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
-				print '<td class="right nowrap" width="16">'.$holidaystatic->LibStatut($obj->status, 3).'</td>';
+				print '<td class="right nowrap" width="16">'.$holidaystatic->LibStatut($obj->status, 3, $holidaystatic->date_debut).'</td>';
 				print '</tr>';
 
 				$i++;
@@ -264,13 +266,13 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.statut as user_status, u.photo,";
 	$sql .= " x.rowid, x.ref, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as x, ".MAIN_DB_PREFIX."user as u";
-	//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	//if (empty($user->rights->societe->client->voir) && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE u.rowid = x.fk_user_author";
 	$sql .= " AND x.entity = ".$conf->entity;
 	if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) {
 		$sql .= ' AND x.fk_user_author IN ('.$db->sanitize(join(',', $childids)).')';
 	}
-	//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+	//if (empty($user->rights->societe->client->voir) && !$user->socid) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	//if (!empty($socid)) $sql.= " AND x.fk_soc = ".((int) $socid);
 	$sql .= $db->order("x.tms", "DESC");
 	$sql .= $db->plimit($max, 0);
@@ -339,11 +341,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 && !$user->rights->societe->client->voir && !$socid) {
+	if ($conf->societe->enabled && 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 && !$user->rights->societe->client->voir && !$socid) {
+	if ($conf->societe->enabled && empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND rp.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -404,7 +406,7 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 	}
 }
 
-print '</div></div></div>';
+print '</div></div>';
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $parameters = array('user' => $user);
diff --git a/htdocs/hrm/job_agenda.php b/htdocs/hrm/job_agenda.php
new file mode 100644
index 00000000000..6bfafcc1269
--- /dev/null
+++ b/htdocs/hrm/job_agenda.php
@@ -0,0 +1,227 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       job_agenda.php
+ *  \ingroup    hrm
+ *  \brief      Tab of events on Job
+ */
+
+
+// Load Dolibarr environment
+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 . '/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
+
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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 Job($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('jobagenda', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
+}
+
+$permissiontoread = $user->rights->hrm->all->read;
+$permissiontoadd = $user->rights->hrm->all->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, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->hrm->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 = jobPrepareHead($object);
+
+
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("Agenda"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refid">';
+	$morehtmlref.= $object->label;
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $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("ActionsOnJob"), '', '');
+
+		// 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/hrm/job_card.php b/htdocs/hrm/job_card.php
new file mode 100644
index 00000000000..d4501c8e685
--- /dev/null
+++ b/htdocs/hrm/job_card.php
@@ -0,0 +1,478 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       job_card.php
+ *        \ingroup    hrm
+ *        \brief      Page to create/edit/view job
+ */
+
+
+// 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 . '/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "other", 'products'));
+
+// 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') : 'jobcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+//$lineid   = GETPOST('lineid', 'int');
+
+// Initialize technical objects
+$object = new Job($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output . '/temp/massgeneration/' . $user->id;
+$hookmanager->initHooks(array('jobcard', 'globalcard')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Initialize array of search criterias
+$search_all = GETPOST("search_all", 'alpha');
+$search = array();
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_' . $key, 'alpha')) {
+		$search[$key] = GETPOST('search_' . $key, 'alpha');
+	}
+}
+
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
+
+// Load object
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+
+$permissiontoread = $user->rights->hrm->all->read;
+$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->hrm->all->delete;
+$upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1] . '/job';
+
+// 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->hrm->enabled)) accessforbidden();
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) 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('/hrm/job_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('/hrm/job_card.php', 1) . '?id=' . ($id > 0 ? $id : '__ID__');
+			}
+		}
+	}
+
+	$triggermodname = 'hrm_JOB_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 = 'hrm_JOB_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_JOB_TO';
+	$trackid = 'job' . $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("Job");
+$help_url = '';
+llxHeader('', $title, $help_url);
+
+// Example : Adding jquery code
+// print '<script type="text/javascript" language="javascript">
+// jQuery(document).ready(function() {
+// 	function init_myfunc()
+// 	{
+// 		jQuery("#myid").removeAttr(\'disabled\');
+// 		jQuery("#myid").attr(\'disabled\',\'disabled\');
+// 	}
+// 	init_myfunc();
+// 	jQuery("#mybutton").click(function() {
+// 		init_myfunc();
+// 	});
+// });
+// </script>';
+
+
+// Part to create
+if ($action == 'create') {
+	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentities('Job')), '', '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 '<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 '</form>';
+
+	//dol_set_focus('input[name="ref"]');
+}
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit') {
+	print load_fiche_titre($langs->trans("Job"), '', '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 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>';
+}
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	$res = $object->fetch_optionals();
+
+	$head = jobPrepareHead($object);
+	$picto = 'company.png';
+	print dol_get_fiche_head($head, 'job_card', $langs->trans("Workstation"), -1, $object->picto);
+
+	$formconfirm = '';
+
+	// Confirmation to delete
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteJob'), $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('/hrm/job_list.php', 1) . '?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+	$morehtmlref = '<div class="refid">';
+	$morehtmlref.= $object->label;
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $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['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>';
+	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)) {
+			// 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);
+
+			// 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);
+		}
+		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->hrm->dir_output . '/' . $object->element . '/' . $objref;
+			$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+			$genallowed = $user->rights->hrm->job->read; // If you can read, you can build the PDF to read content
+			$delallowed = $user->rights->hrm->job->write; // If you can create/edit, you can remove a file on card
+			print $formfile->showdocuments('hrm:Job', $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('job'));
+		$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.'/hrm/job_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, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
+
+		print '</div></div>';
+	}
+
+	// Presend form
+	$modelmail = 'job';
+	$defaulttopic = 'InformationMessage';
+	$diroutput = $conf->hrm->dir_output;
+	$trackid = 'job' . $object->id;
+
+	include DOL_DOCUMENT_ROOT . '/core/tpl/card_presend.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/hrm/job_contact.php b/htdocs/hrm/job_contact.php
new file mode 100644
index 00000000000..67da8ecfd91
--- /dev/null
+++ b/htdocs/hrm/job_contact.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>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       job_contact.php
+ *  \ingroup    hrm
+ *  \brief      Tab for contacts linked to Job
+ */
+
+// Load Dolibarr environment
+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';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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 Job($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('jobcontact', '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
+
+$permission = $user->rights->hrm->job->write;
+
+// 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->hrm->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('Job')." - ".$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 = jobPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'contact', '', -1, $object->picto);
+
+	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 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/hrm/job_document.php b/htdocs/hrm/job_document.php
new file mode 100644
index 00000000000..83745962052
--- /dev/null
+++ b/htdocs/hrm/job_document.php
@@ -0,0 +1,170 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       job_document.php
+ *  \ingroup    hrm
+ *  \brief      Tab for documents linked to Job
+ */
+
+// Load Dolibarr environment
+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 . '/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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', '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 = $liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
+//if (! $sortfield) $sortfield="position_name";
+
+// Initialize technical objects
+$object = new Job($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('jobdocument', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->hrm->multidir_output[$object->entity ? $object->entity : $conf->entity]."/job/".get_exdir(0, 0, 0, 1, $object);
+}
+
+$permissiontoread = $user->rights->hrm->all->read;
+$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+
+// Security check (enable the most restrictive one)
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->hrm->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$title = $langs->trans("Job").' - '.$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 = jobPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'document', $langs->trans("Document"), -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('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refid">';
+	$morehtmlref.= $object->label;
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $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 = 'hrm';
+	//$permissiontoadd = $user->rights->hrm->job->write;
+	//$permtoedit = $user->rights->hrm->job->write;
+	$permtoedit = $permissiontoadd;
+	$param = '&id='.$object->id;
+
+	//$relativepathwithnofile='job/' . dol_sanitizeFileName($object->id).'/';
+	$relativepathwithnofile = 'job/'.dol_sanitizeFileName($object->ref).'/';
+
+	include 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/hrm/job_list.php b/htdocs/hrm/job_list.php
new file mode 100644
index 00000000000..55363d729b5
--- /dev/null
+++ b/htdocs/hrm/job_list.php
@@ -0,0 +1,685 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       job_list.php
+ *		\ingroup    hrm
+ *		\brief      List page for job
+ */
+
+
+// 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';
+
+// load hrm libraries
+require_once __DIR__.'/class/job.class.php';
+
+// for other modules
+//dol_include_once('/othermodule/class/otherobject.class.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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') : 'joblist'; // 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 Job($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('joblist')); // 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') ? 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'));
+	}
+}
+
+// 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 = $user->rights->hrm->all->read;
+$permissiontoadd = $user->rights->hrm->all->write;
+$permissiontodelete = $user->rights->hrm->all->delete;
+
+// Security check
+if (empty($conf->hrm->enabled)) {
+	accessforbidden('Module not enabled');
+}
+
+// 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, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->hrm->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 (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 = 'Job';
+	$objectlabel = 'Job';
+	$uploaddir = $conf->hrm->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$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'));
+$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);
+*/
+
+$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('/hrm/job_card.php', 1).'?id='.$id);
+	exit;
+}
+
+
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
+
+// 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';
+// 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_buildpath('/hrm/job_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 = "SendJobRef";
+$modelmail = "job";
+$objecttmp = new Job($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 '<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'));
+			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>';
+	}
+}
+// 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, '');
+			} elseif ($key == 'label') {
+				print $object->getNomUrl(1);
+			} 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_hrm', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/hrm/job_note.php b/htdocs/hrm/job_note.php
new file mode 100644
index 00000000000..7205afec247
--- /dev/null
+++ b/htdocs/hrm/job_note.php
@@ -0,0 +1,127 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       job_note.php
+ *  \ingroup    hrm
+ *  \brief      Tab for notes on Job
+ */
+
+
+// Load Dolibarr environment
+require '../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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 Job($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('jobnote', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
+}
+
+$permissiontoread = $user->rights->hrm->all->read;
+$permissionnote = $user->rights->hrm->all->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, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->hrm->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='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
+$help_url = '';
+llxHeader('', $langs->trans('Job'), $help_url);
+
+if ($id > 0 || !empty($ref)) {
+	$object->fetch_thirdparty();
+
+	$head = jobPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'note', $langs->trans("Notes"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refid">';
+	$morehtmlref.= $object->label;
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $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/hrm/lib/hrm.lib.php b/htdocs/hrm/lib/hrm.lib.php
new file mode 100644
index 00000000000..e875f61b9e4
--- /dev/null
+++ b/htdocs/hrm/lib/hrm.lib.php
@@ -0,0 +1,76 @@
+<?php
+/* Copyright (C) 2020 jean-pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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    hrm/lib/hrm.lib.php
+ * \ingroup hr
+ * \brief   Library files with common functions for Workstation
+ */
+
+/**
+ * Prepare admin pages header
+ *
+ * @return array
+ */
+function hrmAdminPrepareHead()
+{
+	global $langs, $conf;
+
+	$langs->load("hrm");
+
+	$h = 0;
+	$head = array();
+	$head[$h][0] = DOL_URL_ROOT . "/admin/hrm.php";
+	$head[$h][1] = $langs->trans("Settings");
+	$head[$h][2] = 'settings';
+	$h++;
+
+		$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/admin_establishment.php';
+		$head[$h][1] = $langs->trans("Establishments");
+		$head[$h][2] = 'establishments';
+		$h++;
+
+	/*
+	$head[$h][0] = dol_buildpath("/workstation/admin/myobject_extrafields.php", 1);
+	$head[$h][1] = $langs->trans("ExtraFields");
+	$head[$h][2] = 'myobject_extrafields';
+	$h++;
+	*/
+
+	/*$head[$h][0] = require_once "/admin/about.php";
+	$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:@workstation:/workstation/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@workstation:/workstation/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm_admin');
+
+		complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm_admin', 'remove');
+
+	return $head;
+}
diff --git a/htdocs/hrm/lib/hrm_evaluation.lib.php b/htdocs/hrm/lib/hrm_evaluation.lib.php
new file mode 100644
index 00000000000..87e6b80adaa
--- /dev/null
+++ b/htdocs/hrm/lib/hrm_evaluation.lib.php
@@ -0,0 +1,95 @@
+<?php
+/* Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/hrm_evaluation.lib.php
+ * \ingroup hrm
+ * \brief   Library files with common functions for Evaluation
+ */
+
+/**
+ * Prepare array of tabs for Evaluation
+ *
+ * @param	Evaluation	$object		Evaluation
+ * @return 	array					Array of tabs
+ */
+function evaluationPrepareHead($object)
+{
+	global $db, $langs, $conf;
+
+	$langs->load("hrm");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/hrm/evaluation_card.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans("EvaluationCard");
+	$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('/hrm/evaluation_note.php', 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) {
+			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		}
+		$head[$h][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->hrm->dir_output."/evaluation/".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("/hrm/evaluation_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("/hrm/evaluation_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:@hrm:/hrm/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@hrm:/hrm/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'evaluation@hrm');
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'evaluation@hrm', 'remove');
+
+	return $head;
+}
diff --git a/htdocs/hrm/lib/hrm_job.lib.php b/htdocs/hrm/lib/hrm_job.lib.php
new file mode 100644
index 00000000000..f465d934b0f
--- /dev/null
+++ b/htdocs/hrm/lib/hrm_job.lib.php
@@ -0,0 +1,106 @@
+<?php
+/* Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/hrm_job.lib.php
+ * \ingroup hrm
+ * \brief   Library files with common functions for Job
+ */
+
+/**
+ * Prepare array of tabs for Job
+ *
+ * @param	Job		$object		Job
+ * @return 	array				Array of tabs
+ */
+function jobPrepareHead($object)
+{
+	global $db, $langs, $conf;
+
+	$langs->load("hrm");
+
+	$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][2] = 'job_card';
+	$h++;
+
+	$head[$h][0] = dol_buildpath("/hrm/skill_tab.php", 1).'?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][1] = $langs->trans("EmployeesInThisPosition");
+	$head[$h][2] = 'position';
+	$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('/hrm/job_note.php', 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) {
+			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		}
+		$head[$h][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->hrm->dir_output."/job/".dol_sanitizeFileName($object->label);
+	$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("/hrm/job_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("/hrm/job_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:@hrm:/hrm/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@hrm:/hrm/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'job@hrm');
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'job@hrm', 'remove');
+
+	return $head;
+}
diff --git a/htdocs/hrm/lib/hrm_position.lib.php b/htdocs/hrm/lib/hrm_position.lib.php
new file mode 100644
index 00000000000..da9a7b3123a
--- /dev/null
+++ b/htdocs/hrm/lib/hrm_position.lib.php
@@ -0,0 +1,96 @@
+<?php
+/* Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/hrm_position.lib.php
+ * \ingroup hrm
+ * \brief   Library files with common functions for Position
+ */
+
+
+/**
+ * Prepare array of tabs for positions
+ *
+ * @param	Position	$object		Position
+ * @return 	array					Array of tabs
+ */
+function PositionCardPrepareHead($object)
+{
+	global $db, $langs, $conf;
+
+	$langs->load("hrm");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/hrm/position_card.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans("PositionCard");
+	$head[$h][2] = 'position';
+	$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('/hrm/position_note.php', 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) {
+			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		}
+		$head[$h][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->hrm->dir_output."/position/".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("/hrm/position_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("/hrm/position_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:@hrm:/hrm/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@hrm:/hrm/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'position@hrm');
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'position@hrm', 'remove');
+
+	return $head;
+}
diff --git a/htdocs/hrm/lib/hrm_skill.lib.php b/htdocs/hrm/lib/hrm_skill.lib.php
new file mode 100644
index 00000000000..c9c83fa6411
--- /dev/null
+++ b/htdocs/hrm/lib/hrm_skill.lib.php
@@ -0,0 +1,95 @@
+<?php
+/* Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/hrm_skill.lib.php
+ * \ingroup hrm
+ * \brief   Library files with common functions for Skill
+ */
+
+/**
+ * Prepare array of tabs for Skill
+ *
+ * @param	Skill	$object		Skill
+ * @return 	array					Array of tabs
+ */
+function skillPrepareHead($object)
+{
+	global $db, $langs, $conf;
+
+	$langs->load("hrm");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/hrm/skill_card.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans("SkillCard");
+	$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('/hrm/skill_note.php', 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) {
+			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		}
+		$head[$h][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->hrm->dir_output."/skill/".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("/hrm/skill_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("/hrm/skill_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:@hrm:/hrm/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@hrm:/hrm/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'skill@hrm');
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'skill@hrm', 'remove');
+
+	return $head;
+}
diff --git a/htdocs/hrm/lib/hrm_skilldet.lib.php b/htdocs/hrm/lib/hrm_skilldet.lib.php
new file mode 100644
index 00000000000..df7e1af45fc
--- /dev/null
+++ b/htdocs/hrm/lib/hrm_skilldet.lib.php
@@ -0,0 +1,95 @@
+<?php
+/* Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/hrm_skilldet.lib.php
+ * \ingroup hrm
+ * \brief   Library files with common functions for Skilldet
+ */
+
+/**
+ * Prepare array of tabs for Skilldet
+ *
+ * @param	Skilldet	$object		Skilldet
+ * @return 	array					Array of tabs
+ */
+function skilldetPrepareHead($object)
+{
+	global $db, $langs, $conf;
+
+	$langs->load("hrm");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/hrm/skilldet_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('/hrm/skilldet_note.php', 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) {
+			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		}
+		$head[$h][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->hrm->dir_output."/skilldet/".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("/hrm/skilldet_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("/hrm/skilldet_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:@hrm:/hrm/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@hrm:/hrm/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'skilldet@hrm');
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'skilldet@hrm', 'remove');
+
+	return $head;
+}
diff --git a/htdocs/hrm/lib/hrm_skillrank.lib.php b/htdocs/hrm/lib/hrm_skillrank.lib.php
new file mode 100644
index 00000000000..d979e8ca4b7
--- /dev/null
+++ b/htdocs/hrm/lib/hrm_skillrank.lib.php
@@ -0,0 +1,163 @@
+<?php
+/* Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/hrm_skillrank.lib.php
+ * \ingroup hrm
+ * \brief   Library files with common functions for SkillRank
+ */
+
+/**
+ * Prepare array of tabs for SkillRank
+ *
+ * @param	SkillRank	$object		SkillRank
+ * @return 	array					Array of tabs
+ */
+function skillrankPrepareHead($object)
+{
+	global $db, $langs, $conf;
+
+	$langs->load("hrm");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/hrm/skillrank_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('/hrm/skillrank_note.php', 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) {
+			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		}
+		$head[$h][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->hrm->dir_output."/skillrank/".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("/hrm/skillrank_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("/hrm/skillrank_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:@hrm:/hrm/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@hrm:/hrm/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'skillrank@hrm');
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'skillrank@hrm', 'remove');
+
+	return $head;
+}
+
+/**
+ * Used to print ranks of a skill into several case, view or edit pour js necessary to select a rank
+ *
+ * @param int $selected_rank rank we want to preselect
+ * @param int $fk_skill id of skill we display ranks
+ * @param string $inputname html name of input
+ * @param string $mode view or edit
+ *
+ * @return string string result
+ */
+function displayRankInfos($selected_rank, $fk_skill, $inputname = 'TNote', $mode = 'view')
+{
+	global $db, $conf, $langs;
+
+	require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
+	require_once DOL_DOCUMENT_ROOT . '/hrm/class/skilldet.class.php';
+
+	// On charge les différentes notes possibles pour la compétence $fk_skill
+	$skilldet = new Skilldet($db);
+	$Lines = $skilldet->fetchAll('ASC', 'rankorder', 0, 0, array('customsql'=>'fk_skill = '.$fk_skill));
+
+	if (!is_array($Lines) && $Lines<0) {
+		setEventMessages($skilldet->error, $skilldet->errors, 'errors');
+	}
+	if (empty($Lines)) return $langs->trans('SkillHasNoLines');
+
+	$ret = '<!-- field jquery --><span title="'.$langs->trans('NA').'" class="radio_js_bloc_number '.$inputname.'_'.$fk_skill.(empty($selected_rank) ? ' selected' : '').'">0</span>';
+	if (is_array($Lines) && !empty($Lines)) {
+		foreach ($Lines as $line) {
+			$MaxNumberSkill = isset($conf->global->HRM_MAXRANK) ? $conf->global->HRM_MAXRANK : Skill::DEFAULT_MAX_RANK_PER_SKILL;
+			if ($line->rankorder > $MaxNumberSkill) {
+				continue;
+			}
+
+			$ret .= '<span title="' . $line->description . '" class="radio_js_bloc_number ' . $inputname . '_' . $line->fk_skill;
+			$ret .= $line->rankorder == $selected_rank ? ' selected' : '';
+			$ret .= '">' . $line->rankorder . '</span>';
+		}
+
+		if ($mode == 'edit') {
+			$ret .= '
+		<input type="hidden" id="' . $inputname . '_' . $fk_skill . '" name="' . $inputname . '[' . $fk_skill . ']" value="' . $selected_rank . '">
+		<script type="text/javascript">
+			$(document).ready(function(){
+				$(".radio_js_bloc_number").tooltip();
+				var error,same;
+				$(".' . $inputname . '_' . $fk_skill . '").on("click",function(){
+					same=false;
+					val = $(this).html();
+					if($(this).hasClass("selected"))same=true;
+					$(".' . $inputname . '_' . $fk_skill . '").removeClass("selected");
+					if(same)
+					{
+						$("#' . $inputname . '_' . $fk_skill . '").val("");
+					}else {
+						$(this).addClass("selected");
+						$("#' . $inputname . '_' . $fk_skill . '").val(val);
+					}
+				});
+
+			});
+		</script>';
+		}
+	}
+
+	return $ret;
+}
diff --git a/htdocs/hrm/modulebuilder.txt b/htdocs/hrm/modulebuilder.txt
new file mode 100644
index 00000000000..670a1774929
--- /dev/null
+++ b/htdocs/hrm/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/hrm/position.php b/htdocs/hrm/position.php
new file mode 100644
index 00000000000..d36d352e895
--- /dev/null
+++ b/htdocs/hrm/position.php
@@ -0,0 +1,947 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       position.php
+ *        \ingroup    hrm
+ *        \brief      Page to create/edit/view 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('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
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"] . "/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME'];
+$tmp2 = realpath(__FILE__);
+$i = strlen($tmp) - 1;
+$j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+	$i--;
+	$j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1)) . "/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1)) . "/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1))) . "/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1))) . "/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
+
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
+
+$action 	= GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+$fk_job 	= GETPOST('fk_job', 'int');
+
+// Get parameters
+$id 	 = GETPOST('fk_job', 'int');
+$fk_job  = GETPOST('fk_job', 'int');
+$fk_user = GETPOST('fk_user', 'int');
+//$start_date = date('Y-m-d', GETPOST('date_startyear', 'int').'-'.GETPOST('date_startmonth', 'int').'-'.GETPOST('date_startday', 'int'));
+$start_date = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
+
+$ref 	= GETPOST('ref', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'positioncard'; // To manage different context of search
+
+// Initialize technical objects
+$object = new Job($db);
+
+$extrafields = new ExtraFields($db);
+
+$diroutputmassaction = $conf->hrm->dir_output . '/temp/massgeneration/' . $user->id;
+$hookmanager->initHooks(array('positiontab', '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');
+	}
+}
+
+// Load object
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+$permissiontoread = $user->rights->hrm->all->read;
+$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->hrm->all->delete;
+$upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1] . '/position';
+
+// 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->hrm->enabled)) accessforbidden();
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) 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('/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 && strpos($backtopage, '__ID__'))) {
+			if (empty($fk_job) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				if ($fk_job > 0) {
+					$backtopage = dol_buildpath('/hrm/position.php', 1) . '?fk_job=' . ($fk_job > 0 ? $fk_job : '__ID__');
+				} else {
+					$backtopage = dol_buildpath('/hrm/position_card.php', 1) . '?id=__ID__';
+				}
+			}
+		}
+	}
+
+	$triggermodname = 'hrm_POSITION_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
+	$job = $object;
+	$object = new Position($db);
+	include DOL_DOCUMENT_ROOT . '/core/actions_addupdatedelete.inc.php';
+}
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "other", 'products'));
+
+$title = $langs->trans("Position");
+$help_url = '';
+llxHeader('', $title, $help_url);
+
+if ($job->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	DisplayJob($job);
+	DisplayPositionList();
+}
+
+
+/**
+ * 		Show the top of the page including informations of a job
+ *
+ * 		@param	Job		 	     $object		  Job object
+ *
+ * 		@return void
+ */
+function DisplayJob($object)
+{
+	global $conf, $langs, $db, $extrafields, $hookmanager, $action, $backtopage, $backtopageforcancel, $permissiontoadd;
+
+	/*
+	 * View
+	 *
+	 * Put here all code to build page
+	 */
+
+	$form = new Form($db);
+	$formfile = new FormFile($db);
+	$formproject = new FormProjets($db);
+
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
+	}
+
+	// Part to show record
+
+		$res = $object->fetch_optionals();
+
+		$head = jobPrepareHead($object);
+		print dol_get_fiche_head($head, 'position', $langs->trans("Workstation"), -1, $object->picto);
+
+		// Object card
+		// ------------------------------------------------------------
+		$linkback = '<a href="' . dol_buildpath('/hrm/position_list.php', 1) . '?restore_lastsearch_values=1' . (!empty($fk_job) ? '&fk_job=' . $fk_job : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+		$morehtmlref = '<div class="refid">';
+		$morehtmlref.= $object->label;
+		$morehtmlref .= '</div>';
+
+		dol_banner_tab($object, 'fk_job', $linkback, 1, 'rowid', 'rowid', $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['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>';
+		print '</div>';
+
+		print '<div class="clearboth"></div>';
+
+		print dol_get_fiche_end();
+}
+
+
+/**
+ * 		Show a list of positions for the current job
+ *
+ * 		@return void
+ */
+function DisplayPositionList()
+{
+	global $user, $langs, $db, $conf, $extrafields, $hookmanager, $permissiontoadd, $permissiontodelete;
+
+	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 hrm libraries
+	require_once __DIR__ . '/class/position.class.php';
+
+	// for other modules
+	//dol_include_once('/othermodule/class/otherobject.class.php');
+
+	$action 	 = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+	$massaction  = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+	$show_files  = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+	$confirm 	 = GETPOST('confirm', 'alpha'); // Result of a confirmation
+	$cancel 	 = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+	$toselect 	 = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+	$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'positionlist'; // To manage different context of search
+	$optioncss 	 = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+	$id 		 = GETPOST('id', 'int');
+	$fk_job 	 = GETPOST('fk_job', '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 Position($db);
+
+	$extrafields = new ExtraFields($db);
+	$diroutputmassaction = $conf->hrm->dir_output . '/temp/massgeneration/' . $user->id;
+	$hookmanager->initHooks(array('positiontablist')); // 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') ? 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'));
+		}
+	}
+
+	// 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');
+
+	// Security check
+	if (empty($conf->hrm->enabled)) {
+		accessforbidden('Module not enabled');
+	}
+
+	// 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, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+	//if (empty($conf->hrm->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 (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 = 'Position';
+		$objectlabel = 'Position';
+		$uploaddir = $conf->hrm->dir_output;
+		include DOL_DOCUMENT_ROOT . '/core/actions_massactions.inc.php';
+	}
+
+
+	/*
+	 * View
+	 */
+
+	$form = new Form($db);
+
+	$now = dol_now();
+
+	//$help_url="EN:Module_Position|FR:Module_Position_FR|ES:Módulo_Position";
+	$help_url = '';
+	$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Positions"));
+	$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";
+	}
+	$sql .= " AND t.fk_job =  " . ((int) $fk_job) . " ";
+
+	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') {
+					$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);
+	*/
+
+	$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('/hrm/position.php', 1) . '?id=' . $id);
+		exit;
+	}
+
+	$arrayofselected = is_array($toselect) ? $toselect : array();
+
+	$param = 'fk_job=' . $fk_job;
+	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';
+	// 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"] . '?fk_job=' . $fk_job . '">' . "\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="massaction" value="' . $massaction . '">';
+	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('/hrm/position.php', 1) . '?action=create&backtopage=' . urlencode($_SERVER['PHP_SELF'].'?fk_job=' . $fk_job).'&fk_job=' . $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);
+
+	// Add code for pre mass action (confirmation or email presend form)
+	$topicmail = "SendPositionRef";
+	$modelmail = "position";
+	$objecttmp = new Position($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 '<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'));
+				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>';
+		}
+	}
+	// 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->getNomUrl(1);
+				} 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_hrm', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+	}
+}
+
+// Part to create
+if ($action == 'create') {
+	$object = new Position($db);
+	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Position")), '', '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 '<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 '</form>';
+
+	//dol_set_focus('input[name="ref"]');
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/hrm/position_agenda.php b/htdocs/hrm/position_agenda.php
new file mode 100644
index 00000000000..fda60a29259
--- /dev/null
+++ b/htdocs/hrm/position_agenda.php
@@ -0,0 +1,234 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       position_agenda.php
+ *  \ingroup    hrm
+ *  \brief      Tab of events on Position
+ */
+
+
+// Load Dolibarr environment
+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.'/hrm/class/position.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
+
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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 Position($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('positionagenda', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
+}
+
+$permissiontoread = $user->rights->hrm->all->read;
+$permissiontoadd = $user->rights->hrm->all->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, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->hrm->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 = PositionCardPrepareHead($object);
+
+
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("Agenda"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/hrm/position_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	$u_position = new User(($db));
+	$u_position->fetch($object->fk_user);
+	$morehtmlref .= $langs->trans('Employee').' : '.$u_position->getNomUrl(1);
+	$job = new Job($db);
+	$job->fetch($object->fk_job);
+	$morehtmlref .= '<br>'.$langs->trans('Job').' : '.$job->getNomUrl(1);
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $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("ActionsOnPosition"), '', '');
+
+		// List of all actions
+		$filters = array();
+		$filters['search_agenda_label'] = $search_agenda_label;
+		$object->fields['label']=array(); // Usefull to get only get agenda events linked to position (this object doesn't need label of ref field, but show_actions_done() needs it to work correctly)
+
+		// 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/hrm/position_card.php b/htdocs/hrm/position_card.php
new file mode 100644
index 00000000000..c26d981a324
--- /dev/null
+++ b/htdocs/hrm/position_card.php
@@ -0,0 +1,393 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       position_card.php
+ *        \ingroup    hrm
+ *        \brief      Page to create/edit/view position
+ */
+
+
+// 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 . '/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
+//dol_include_once('/hrm/position.php');
+
+$action 	= GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+$id 	= GETPOST('id', 'int');
+
+// Initialize technical objects
+$form = new Form($db);
+$object = new Position($db);
+$res = $object->fetch($id);
+if ($res < 0) {
+	dol_print_error($db, $object->error);
+}
+
+$permissiontoread = $user->rights->hrm->all->read;
+$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->hrm->all->delete;
+$permissiondellink = $user->rights->hrm->all->write; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1] . '/position';
+
+// 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->hrm->enabled)) accessforbidden();
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden();
+
+$langs->loadLangs(array("hrm", "other"));
+
+
+
+// Get parameters
+$id 	= GETPOST('id', 'int');
+$fk_job = GETPOST('fk_job', 'int');
+
+$ref 	= GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'positioncard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+//	$lineid   = GETPOST('lineid', 'int');
+
+// Initialize technical objects
+//$object = new Position($db);
+//$res = $object->fetch($id);
+/*if ($res < 0) {
+	dol_print_error($db, &$object->error);
+}*/
+
+$extrafields = new ExtraFields($db);
+
+$diroutputmassaction = $conf->hrm->dir_output . '/temp/massgeneration/' . $user->id;
+$hookmanager->initHooks(array('positioncard', '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.
+
+
+/*
+ * 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('/hrm/position_list.php', 1);
+
+	if (empty($backtopage) || ($cancel && empty($fk_job))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = dol_buildpath('/hrm/position_card.php', 1) . '?id=' . ($id > 0 ? $id : '__ID__');
+			}
+		}
+	}
+
+	$triggermodname = 'hrm_POSITION_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 = 'hrm_POSITION_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_POSITION_TO';
+	$trackid = 'position' . $object->id;
+	include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
+}
+
+DisplayPositionCard($object);
+
+/**
+ * 		Show the card of a position
+ *
+ * 		@param	Position		 $object		  Position object
+ *
+ * 		@return void
+ */
+function DisplayPositionCard(&$object)
+{
+
+	global $user, $langs, $db, $conf, $extrafields, $hookmanager, $action, $permissiontoadd, $permissiontodelete;
+
+	$id = $object->id;
+
+	/*
+	 * View
+	 *
+	 * Put here all code to build page
+	 */
+
+	$form = new Form($db);
+	$formfile = new FormFile($db);
+	$formproject = new FormProjets($db);
+
+	$title = $langs->trans("Position");
+	$help_url = '';
+	llxHeader('', $title, $help_url);
+
+
+	// Part to edit record
+	if (($id || $ref) && $action == 'edit') {
+		print load_fiche_titre($langs->trans("Position"), '', 'object_' . $object->picto);
+
+		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">';
+		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 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>';
+	}
+
+
+	// Part to show record
+	if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+		$res = $object->fetch_optionals();
+
+
+		$head = PositionCardPrepareHead($object);
+		print dol_get_fiche_head($head, 'position', $langs->trans("Workstation"), -1, $object->picto);
+
+		$formconfirm = '';
+
+		// Confirmation to delete
+		if ($action == 'delete') {
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeletePosition'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+		}
+
+		// 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('/hrm/position.php', 1) . '?restore_lastsearch_values=1' . (!empty($object->fk_job) ? '&fk_job=' . $object->fk_job : '') . '">' . $langs->trans("BackToList") . '</a>';
+		$linkback = '<a href="' . dol_buildpath('/hrm/position_list.php', 1) . '">' . $langs->trans("BackToList") . '</a>';
+
+		$morehtmlref = '<div class="refidno">';
+		$u_position = new User(($db));
+		$u_position->fetch($object->fk_user);
+		$morehtmlref .= $langs->trans('Employee').' : '.($u_position->id > 0 ? $u_position->getNomUrl(1) : '');
+		$job = new Job($db);
+		$job->fetch($object->fk_job);
+		$morehtmlref .= '<br>'.$langs->trans('Job').' : '.$job->getNomUrl(1);
+		$morehtmlref .= '</div>';
+
+		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $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_user']['visible']=0; // Already in banner
+		$object->fields['fk_job']['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>';
+		print '</div>';
+
+		print '<div class="clearboth"></div>';
+
+		print dol_get_fiche_end();
+
+		/*
+		 * Action bar
+		 */
+		print '<div class="tabsAction">';
+
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+
+
+		print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&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);
+	}
+}
+
+//if ($action != 'presend') {
+//	$formfile = new FormFile($db);
+//	print '<div class="fichecenter"><div class="fichehalfleft">';
+//
+//	if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC)) {
+//		print '<a name="builddoc"></a>'; // ancre
+//
+//		/*
+//		 * Generated documents
+//		 */
+//		$filedir = $conf->societe->multidir_output[$object->entity].'/'.$object->id;
+//		$urlsource = $_SERVER["PHP_SELF"]."?socid=".$object->id;
+//		$genallowed = $user->rights->societe->lire;
+//		$delallowed = $user->rights->societe->creer;
+//
+//		print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
+//	}
+//
+//
+//	print '</div><div class="fichehalfright">';
+//
+//	$MAXEVENT = 10;
+//
+//	$morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id);
+//
+//	// List of actions on element
+//	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+//	$formactions = new FormActions($db);
+//	$somethingshown = $formactions->showactions($object, '', $object->id, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for thirdparty
+//
+//	print '</div></div>';
+//}
+
+
+print '</table>' . "\n";
+print '</div>' . "\n";
+
+print '</form>' . "\n";
+
+
+if ($action !== 'edit' && $action !== 'create') {
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+
+	// Show links to link elements
+	$linktoelem = $form->showLinkToObjectBlock($object, null, array('position'));
+	$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.'/hrm/position_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, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
+
+	print '</div></div>';
+}
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/hrm/position_contact.php b/htdocs/hrm/position_contact.php
new file mode 100644
index 00000000000..a7246e3a82b
--- /dev/null
+++ b/htdocs/hrm/position_contact.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>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       position_contact.php
+ *  \ingroup    hrm
+ *  \brief      Tab for contacts linked to Position
+ */
+
+// Load Dolibarr environment
+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';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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 Position($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('positioncontact', '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
+
+$permission = $user->rights->hrm->position->write;
+
+// 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->hrm->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('Position')." - ".$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 = PositionCardPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'contact', '', -1, $object->picto);
+
+	$linkback = '<a href="'.dol_buildpath('/hrm/position_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 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/hrm/position_document.php b/htdocs/hrm/position_document.php
new file mode 100644
index 00000000000..845f846a212
--- /dev/null
+++ b/htdocs/hrm/position_document.php
@@ -0,0 +1,174 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       position_document.php
+ *  \ingroup    hrm
+ *  \brief      Tab for documents linked to Position
+ */
+
+// Load Dolibarr environment
+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 . '/hrm/class/position.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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', '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 = $liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
+//if (! $sortfield) $sortfield="position_name";
+
+// Initialize technical objects
+$object = new Position($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('positiondocument', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->hrm->multidir_output[$object->entity ? $object->entity : $conf->entity]."/position/".get_exdir(0, 0, 0, 1, $object);
+}
+
+$permissiontoread = $user->rights->hrm->all->read;
+$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+
+// Security check (enable the most restrictive one)
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->hrm->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$title = $langs->trans("Position").' - '.$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 = PositionCardPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'document', $langs->trans("Document"), -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('/hrm/position_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	$u_position = new User(($db));
+	$u_position->fetch($object->fk_user);
+	$morehtmlref .= $langs->trans('Employee').' : '.$u_position->getNomUrl(1);
+	$job = new Job($db);
+	$job->fetch($object->fk_job);
+	$morehtmlref .= '<br>'.$langs->trans('Job').' : '.$job->getNomUrl(1);
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $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 = 'hrm';
+	$permtoedit = $permissiontoadd;
+	$param = '&id='.$object->id;
+
+	//$relativepathwithnofile='position/' . dol_sanitizeFileName($object->id).'/';
+	$relativepathwithnofile = 'position/'.dol_sanitizeFileName($object->ref).'/';
+
+	include 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/hrm/position_list.php b/htdocs/hrm/position_list.php
new file mode 100644
index 00000000000..d6ed72c2612
--- /dev/null
+++ b/htdocs/hrm/position_list.php
@@ -0,0 +1,684 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       position_list.php
+ *		\ingroup    hrm
+ *		\brief      List page for position
+ */
+
+
+// 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';
+
+// load hrm libraries
+require_once __DIR__.'/class/position.class.php';
+
+// for other modules
+//dol_include_once('/othermodule/class/otherobject.class.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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') : 'positionlist'; // 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 Position($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('positionlist')); // 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') ? 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'));
+	}
+}
+
+// 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 = $user->rights->hrm->all->read;
+$permissiontoadd = $user->rights->hrm->all->write;
+$permissiontodelete = $user->rights->hrm->all->delete;
+
+// Security check
+if (empty($conf->hrm->enabled)) {
+	accessforbidden('Module not enabled');
+}
+
+// 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, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->hrm->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 (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 = 'Position';
+	$objectlabel = 'Position';
+	$uploaddir = $conf->hrm->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$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'));
+$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') {
+				$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);
+*/
+
+$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('/hrm/position.php', 1).'?id='.$id);
+	exit;
+}
+
+
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
+
+// 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';
+// 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_buildpath('/hrm/position.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 = "SendPositionRef";
+$modelmail = "position";
+$objecttmp = new Position($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 '<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'));
+			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>';
+	}
+}
+// 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->getNomUrl(1);
+			} 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_hrm', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/hrm/position_note.php b/htdocs/hrm/position_note.php
new file mode 100644
index 00000000000..1eea4b82676
--- /dev/null
+++ b/htdocs/hrm/position_note.php
@@ -0,0 +1,135 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       position_note.php
+ *  \ingroup    hrm
+ *  \ingroup    hrm
+ *  \brief      Tab for notes on Position
+ */
+
+
+// Load Dolibarr environment
+require '../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';;
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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 Position($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('positionnote', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
+}
+
+$permissionnote = $user->rights->hrm->all->write;
+$permissiontoread = $user->rights->hrm->all->read; // 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, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->hrm->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='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
+$help_url = '';
+llxHeader('', $langs->trans('Position'), $help_url);
+
+if ($id > 0 || !empty($ref)) {
+	$object->fetch_thirdparty();
+
+	$head = PositionCardPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'note', $langs->trans("Notes"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/hrm/position_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	$u_position = new User(($db));
+	$u_position->fetch($object->fk_user);
+	$morehtmlref .= $langs->trans('Employee').' : '.$u_position->getNomUrl(1);
+	$job = new Job($db);
+	$job->fetch($object->fk_job);
+	$morehtmlref .= '<br>'.$langs->trans('Job').' : '.$job->getNomUrl(1);
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $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/hrm/skill_agenda.php b/htdocs/hrm/skill_agenda.php
new file mode 100644
index 00000000000..d73271a4f26
--- /dev/null
+++ b/htdocs/hrm/skill_agenda.php
@@ -0,0 +1,227 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       skill_agenda.php
+ *  \ingroup    hrm
+ *  \brief      Tab of events on skill
+ */
+
+
+// Load Dolibarr environment
+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 . '/hrm/class/skill.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
+
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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 Skill($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('skillagenda', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
+}
+
+$permissiontoread = $user->rights->hrm->all->read;
+$permissiontoadd = $user->rights->hrm->all->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, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->hrm->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 = skillPrepareHead($object);
+
+
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("Agenda"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refid">';
+	$morehtmlref.= $object->label;
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $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("ActionsOnskill"), '', '');
+
+		// 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/hrm/skill_card.php b/htdocs/hrm/skill_card.php
new file mode 100644
index 00000000000..a06cf40952a
--- /dev/null
+++ b/htdocs/hrm/skill_card.php
@@ -0,0 +1,859 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       skill_card.php
+ *    \ingroup    hrm
+ *    \brief      Page to create/edit/view skill
+ */
+
+
+// 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 . '/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
+
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "other", 'products'));
+
+// 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') : 'skillcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+//$lineid   = GETPOST('lineid', 'int');
+
+// Initialize technical objects
+$object = new Skill($db);
+//$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('skillcard', 'globalcard')); // Note that conf->hooks_modules contains array
+
+// Initialize array of search criterias
+$search_all = GETPOST("search_all", 'alpha');
+$search = array();
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_' . $key, 'alpha')) {
+		$search[$key] = GETPOST('search_' . $key, 'alpha');
+	}
+}
+
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
+
+// Load object
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+
+$permissiontoread = $user->rights->hrm->all->read;
+$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->hrm->all->delete;
+$upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1] . '/skill';
+
+// 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->hrm->enabled)) accessforbidden();
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden();
+
+$MaxNumberSkill = isset($conf->global->HRM_MAXRANK) ? $conf->global->HRM_MAXRANK : Skill::DEFAULT_MAX_RANK_PER_SKILL;
+
+
+/*
+ * 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.'/hrm/skill_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.'/hrm/skill_card.php?id=' . ($id > 0 ? $id : '__ID__');
+			}
+		}
+	}
+
+	$triggermodname = 'hrm_SKILL_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';
+
+	// action update on Skilldet
+
+	$skilldetArray = GETPOST("descriptionline", "array");
+
+	if (!$error) {
+		if (is_array($skilldetArray) && count($skilldetArray) > 0) {
+			foreach ($skilldetArray as $key => $SkValueToUpdate) {
+				$skilldetObj = new Skilldet($object->db);
+				$res = $skilldetObj->fetch($key);
+				if ($res > 0) {
+					$skilldetObj->description = $SkValueToUpdate;
+					$resupd = $skilldetObj->update($user);
+					if ($resupd <= 0) {
+						setEventMessage($langs->trans('errorUpdateSkilldet'));
+					}
+				}
+			}
+		}
+	}
+
+
+	// 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 = 'hrm_SKILL_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_SKILL_TO';
+	$trackid = 'skill' . $object->id;
+	include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formproject = new FormProjets($db);
+
+$title = $langs->trans("skill");
+$help_url = '';
+llxHeader('', $title, $help_url);
+
+
+// Part to create
+if ($action == 'create') {
+	print load_fiche_titre($langs->trans("NewSkill"), '', '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">';
+	$backtopage .= (strpos($backtopage, '?') > 0 ? '&' : '?' ) ."objecttype=job";
+	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';
+
+
+	// SKILLDET ADD
+	//@todo je stop ici ... à continuer  (affichage des 5 skilled input pour create action
+	//print $object->showInputField($val, $key, $value, '', '['']', '', 0);
+
+	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 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 '</form>';
+
+	//dol_set_focus('input[name="ref"]');
+}
+
+// Part to edit record
+// and skilldet edition
+if (($id || $ref) && $action == 'edit') {
+	print load_fiche_titre($langs->trans("Skill"), '', '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';
+
+	print '</table>';
+
+
+	// SKILLDET
+
+	print dol_get_fiche_head(array(), '');
+
+	$SkilldetRecords = $object->fetchLines();
+
+	if (is_array($SkilldetRecords) && count($SkilldetRecords) == 0) {
+		$object->createSkills(1);
+	}
+
+	if (is_array($SkilldetRecords) && count($SkilldetRecords) > 0) {
+		print '<table>';
+		foreach ($SkilldetRecords as $sk) {
+			if ($sk->rankorder > $MaxNumberSkill) {
+				continue;
+			}
+
+			print '<table class="border centpercent =">' . "\n";
+			$sk->fields = dol_sort_array($sk->fields, 'position');
+			foreach ($sk->fields as $key => $val) {
+				if (abs($val['visible']) != 1 && abs($val['visible']) != 3 && abs($val['visible']) != 4) {
+					continue;
+				}
+
+				if (array_key_exists('enabled', $val) && isset($val['enabled']) && !verifCond($val['enabled'])) {
+					continue; // We don't want this field
+				}
+
+				print '<tr class="field_' . $key . '"><td';
+				print ' class="titlefieldcreate';
+				if (isset($val['notnull']) && $val['notnull'] > 0) {
+					print ' fieldrequired';
+				}
+				if (preg_match('/^(text|html)/', $val['type'])) {
+					print ' tdtop';
+				}
+				print '">';
+				//              if (!empty($val['help'])) {
+				//                  print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
+				//              } else {
+					print $langs->trans($val['label']).'&nbsp;'.$langs->trans('rank').'&nbsp;'.$sk->rankorder;
+				//              }
+				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') : $sk->$key;
+				//              } elseif ($val['type'] == 'double') {
+				//                  $value = GETPOSTISSET($key) ? price2num(GETPOST($key, 'alphanohtml')) : $sk->$key;
+				//              } elseif (preg_match('/^(text|html)/', $val['type'])) {
+				//                  $tmparray = explode(':', $val['type']);
+				if (!empty($tmparray[1])) {
+					$check = $tmparray[1];
+				} else {
+					$check = 'restricthtml';
+				}
+
+					$skilldetArray = GETPOST("descriptionline", "array");
+				if (empty($skilldetArray)) {
+					$value = GETPOSTISSET($key) ? GETPOST($key, $check) : $sk->$key;
+				} else {
+					$value=$skilldetArray[$sk->id];
+				}
+				//
+				//              } elseif ($val['type'] == 'price') {
+				//                  $value = GETPOSTISSET($key) ? price2num(GETPOST($key)) : price2num($sk->$key);
+				//              } else {
+				//                  $value = GETPOSTISSET($key) ? GETPOST($key, 'alpha') : $sk->$key;
+				//              }
+				//var_dump($val.' '.$key.' '.$value);
+				if ($val['noteditable']) {
+					print $sk->showOutputField($val, $key, $value, '', '', '', 0);
+				} else {
+					/** @var Skilldet $sk */
+					print $sk->showInputField($val, $key, $value, "", "line[" . $sk->id . "]", "", "");
+				}
+				print '</td>';
+				print '</tr>';
+			}
+		}
+		print '</table>';
+	}
+
+
+	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>';
+}
+
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	$res = $object->fetch_optionals();
+
+	$head = skillPrepareHead($object);
+	print dol_get_fiche_head($head, 'card', $langs->trans("Workstation"), -1, $object->picto);
+
+	$formconfirm = '';
+
+	// Confirmation to delete
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteSkill'), $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_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+
+	$morehtmlref = '<div class="refid">';
+	$morehtmlref.= $object->label;
+	$morehtmlref .= '</div>';
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
+
+
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">' . "\n";
+
+	$object->fields['label']['visible']=0; // Already in banner
+	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();
+
+
+	//dol_include_once('/hrm/tpl/hrm_skillde.fiche.tpl.php');
+
+	// 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)) {
+			// 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);
+
+			// 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);
+		}
+		print '</div>' . "\n";
+	}
+}
+
+//*----------------------------------------------------------------------------
+//*----------------------------------------------------------------------------
+
+
+//*---------------------------------------------------------------------------
+
+if ($action != "create" && $action != "edit") {
+	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 hrm libraries
+	require_once __DIR__ . '/class/skilldet.class.php';
+
+	// for other modules
+	//dol_include_once('/othermodule/class/otherobject.class.php');
+
+	$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+	$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+	$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+	$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
+	$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+	$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+	$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'skilldetlist'; // 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 = 0;
+	$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
+	$objectline = new Skilldet($db);
+	//  $diroutputmassaction = $conf->hrm->dir_output . '/temp/massgeneration/' . $user->id;
+	//  $hookmanager->initHooks(array('skilldetlist')); // Note that conf->hooks_modules contains array
+
+	// Default sort order (if not yet defined by previous GETPOST)
+	if (!$sortfield) {
+		reset($objectline->fields);                    // Reset is required to avoid key() to return null.
+		$sortfield = "t." . key($objectline->fields); // Set here default search field. By default 1st field in definition.
+	}
+	if (!$sortorder) {
+		$sortorder = "ASC";
+	}
+
+	// Initialize array of search criterias
+	$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+	$search = array();
+	foreach ($objectline->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 ($objectline->fields as $key => $val) {
+		if (!empty($val['searchall'])) {
+			$fieldstosearchall['t.' . $key] = $val['label'];
+		}
+	}
+
+	// Definition of array of fields for columns
+	$arrayfields = array();
+	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);
+			$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'] : ''
+			);
+		}
+	}
+
+	$objectline->fields = dol_sort_array($objectline->fields, 'position');
+	$arrayfields = dol_sort_array($arrayfields, 'position');
+
+
+	/*
+	 * View
+	 */
+
+	$form = new Form($db);
+
+	$now = dol_now();
+
+	$help_url = '';
+	$title = $langs->transnoentitiesnoconv("Skilldets");
+	$morejs = array();
+	$morecss = array();
+
+
+	// Build and execute select
+	// --------------------------------------------------------------------
+	$sql = 'SELECT ';
+	$sql .= $objectline->getFieldList('t');
+	$sql .= " FROM " . MAIN_DB_PREFIX . $objectline->table_element . " as t";
+	if ($objectline->ismultientitymanaged == 1) {
+		$sql .= " WHERE t.entity IN (" . getEntity($objectline->element) . ")";
+	} else {
+		$sql .= " WHERE 1 = 1 ";
+	}
+
+	if (!empty($id)) {
+		$sql .= " AND fk_skill = " . ((int) $id) . " ";
+	}
+
+	// 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);
+	}
+
+	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 . '">';
+	if (!empty($id)) {
+		print '<input type="hidden" name="id" value="' . $id . '">';
+	}
+
+	$param_fk = "&fk_skill=" . $id . "&fk_user_creat=" . $user->rowid;
+	$backtopage = dol_buildpath('/hrm/skill_card.php', 1) . '?id=' . $id;
+	//$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/skilldet_card.php', 1) . '?action=create&backtopage=' . urlencode($_SERVER['PHP_SELF']) . $param_fk . '&backtopage=' . $backtopage, '', $permissiontoadd);
+
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_' . $object->picto, 0, "", '', '', 0, 0, 1);
+
+	// Add code for pre mass action (confirmation or email presend form)
+	$topicmail = "SendSkilldetRef";
+	$modelmail = "skilldet";
+	$objecttmp = new Skilldet($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, $objectline); // Note that $action and $objectline 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 label
+	// --------------------------------------------------------------------
+	print '<tr class="liste_titre">';
+	foreach ($objectline->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";
+		}
+	}
+	print '<td></td>';
+	print '<td></td>';
+	print '</tr>' . "\n";
+
+
+	// Display all ranks of skill
+	// --------------------------------------------------------------------
+
+	$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
+		}
+
+		if ($obj->rankorder > $MaxNumberSkill) {
+			continue;
+		}
+
+		// Store properties in $objectline
+		$objectline->setVarsFromFetchObj($obj);
+
+		// Show here line of result
+		print '<tr class="oddeven">';
+		foreach ($objectline->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 $objectline->getLibStatut(5);
+				} elseif ($key == 'rowid') {
+					print $objectline->showOutputField($val, $key, $objectline->id, '');
+					// ajout pencil
+					print '<a class="timeline-btn" href="' . DOL_MAIN_URL_ROOT . '/comm/action/skilldet_card.php?action=edit&id=' . $objectline->id . '"><i class="fa fa-pencil" title="' . $langs->trans("Modify") . '" ></i></a>';
+				} else {
+					print $objectline->showOutputField($val, $key, $objectline->$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] += $objectline->$key;
+				}
+			}
+		}
+
+
+		// LINE EDITION | SUPPRESSION
+
+		print '<td>';
+
+		print '</td>';
+		print '<td>';
+		// add pencil
+		//@todo change to proper call dol_
+		//print '<a class="timeline-btn" href="' . dol_buildpath("custom/hrm/skilldet_card.php?action=edit&id=" . $objectline->id, 1) . '"><i class="fa fa-pencil" title="' . $langs->trans("Modify") . '" ></i></a>';
+		// add trash
+		//@todo change to proper call dol_
+		//print '<a class="timeline-btn" href="'.dol_buildpath("custom/hrm/skilldet_card.php?action=delete&id=".$objectline->id,1)  .'"><i class="fa fa-trash" title="'.$langs->trans("Delete").'" ></i></a>';
+		//print '</td>';
+
+
+		// Fields from hook
+		$parameters = array('arrayfields' => $arrayfields, 'object' => $objectline, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objectline); // Note that $action and $objectline may have been modified by hook
+		print $hookmanager->resPrint;
+		/*// Action column
+		print '<td class="nowrap center">';
+
+		print '</td>';*/
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+
+		print '</tr>' . "\n";
+
+		$i++;
+	}
+
+
+	// 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, $objectline); // Note that $action and $objectline 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_hrm', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+	//  }
+
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+
+	// Show links to link elements
+	$linktoelem = $form->showLinkToObjectBlock($object, null, array('skill'));
+	$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.'/hrm/skill_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, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
+
+	print '</div></div>';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/hrm/skill_contact.php b/htdocs/hrm/skill_contact.php
new file mode 100644
index 00000000000..d8fecd74610
--- /dev/null
+++ b/htdocs/hrm/skill_contact.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>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       skill_contact.php
+ *  \ingroup    hrm
+ *  \brief      Tab for contacts linked to Skill
+ */
+
+// Load Dolibarr environment
+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';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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 Skill($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('skillcontact', '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
+
+$permission = $user->rights->hrm->skill->write;
+
+// 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->hrm->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('Skill')." - ".$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 = skillPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'contact', '', -1, $object->picto);
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_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') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 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/hrm/skill_document.php b/htdocs/hrm/skill_document.php
new file mode 100644
index 00000000000..f305ecd1e2e
--- /dev/null
+++ b/htdocs/hrm/skill_document.php
@@ -0,0 +1,169 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       skill_document.php
+ *  \ingroup    hrm
+ *  \brief      Tab for documents linked to skill
+ */
+
+
+// Load Dolibarr environment
+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 . '/hrm/class/skill.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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', '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 = $liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
+//if (! $sortfield) $sortfield="position_name";
+
+// Initialize technical objects
+$object = new Skill($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('skilldocument', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->hrm->multidir_output[$object->entity ? $object->entity : $conf->entity]."/skill/".get_exdir(0, 0, 0, 1, $object);
+}
+
+$permissiontoread = $user->rights->hrm->all->read;
+$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+
+// Security check (enable the most restrictive one)
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->hrm->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$title = $langs->trans("Skilldet").' - '.$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 = skillPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'document', $langs->trans("Documents"), -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_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refid">';
+	$morehtmlref.= $object->label;
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $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 = 'hrm';
+	$permtoedit = $permissiontoadd;
+	$param = '&id='.$object->id;
+
+	//$relativepathwithnofile='skill/' . dol_sanitizeFileName($object->id).'/';
+	$relativepathwithnofile = 'skill/'.dol_sanitizeFileName($object->ref).'/';
+
+	include 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/hrm/skill_list.php b/htdocs/hrm/skill_list.php
new file mode 100644
index 00000000000..1fc5440e589
--- /dev/null
+++ b/htdocs/hrm/skill_list.php
@@ -0,0 +1,685 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       skill_list.php
+ *		\ingroup    hrm
+ *		\brief      List page for skill
+ */
+
+
+// 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';
+
+// load hrm libraries
+require_once __DIR__.'/class/skill.class.php';
+
+// for other modules
+//dol_include_once('/othermodule/class/otherobject.class.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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') : 'skilllist'; // 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 Skill($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('skilllist')); // 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') ? 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'));
+	}
+}
+
+// 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 = $user->rights->hrm->all->read;
+$permissiontoadd = $user->rights->hrm->all->write;
+$permissiontodelete = $user->rights->hrm->all->delete;
+
+// Security check
+if (empty($conf->hrm->enabled)) {
+	accessforbidden('Module not enabled');
+}
+
+// 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, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->hrm->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 (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 = 'Skill';
+	$objectlabel = 'Skill';
+	$uploaddir = $conf->hrm->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$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"));
+$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);
+*/
+
+$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('/hrm/skill_card.php', 1).'?id='.$id);
+	exit;
+}
+
+
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
+
+// 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';
+// 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_buildpath('/hrm/skill_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 = "SendSkillRef";
+$modelmail = "skill";
+$objecttmp = new Skill($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 '<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'));
+			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>';
+	}
+}
+// 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, '');
+			} elseif ($key == 'label') {
+				print $object->getNomUrl(1);
+			} 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_hrm', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/hrm/skill_note.php b/htdocs/hrm/skill_note.php
new file mode 100644
index 00000000000..45a0690f176
--- /dev/null
+++ b/htdocs/hrm/skill_note.php
@@ -0,0 +1,127 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       skill_note.php
+ *  \ingroup    hrm
+ *  \brief      Tab for notes on skill
+ */
+
+
+// Load Dolibarr environment
+require '../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "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 Skill($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('skillnote', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
+}
+
+$permissionnote = $user->rights->hrm->all->write;
+$permissiontoread = $user->rights->hrm->all->read; // 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, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->hrm->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='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
+$help_url = '';
+llxHeader('', $langs->trans('Skill'), $help_url);
+
+if ($id > 0 || !empty($ref)) {
+	$object->fetch_thirdparty();
+
+	$head = skillPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'note', $langs->trans("Notes"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refid">';
+	$morehtmlref.= $object->label;
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $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/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
new file mode 100644
index 00000000000..1ed9e370839
--- /dev/null
+++ b/htdocs/hrm/skill_tab.php
@@ -0,0 +1,333 @@
+<?php
+/* Copyright (C) 2021 grégory Blémand  <contact@atm-consulting.fr>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND <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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       skill_tab.php
+ *        \ingroup    hrm
+ *        \brief      Page to add/delete/view skill to jobs/users
+ */
+
+
+
+// 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 . '/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.php';
+require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("hrm", "other"));
+
+$id = GETPOST('id', 'int');
+$TSkillsToAdd = GETPOST('fk_skill', 'array');
+$objecttype = GETPOST('objecttype', 'alpha');
+$TNote = GETPOST('TNote', 'array');
+$lineid = GETPOST('lineid', 'int');
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'skillcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+
+$TAuthorizedObjects = array('job', 'user');
+$skill = new SkillRank($db);
+
+// Initialize technical objects
+if (in_array($objecttype, $TAuthorizedObjects)) {
+	if ($objecttype == 'job') {
+		require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
+		$object = new Job($db);
+	} elseif ($objecttype == "user") {
+		$object = new User($db);
+	}
+} else accessforbidden($langs->trans('ErrorBadObjectType'));
+
+$hookmanager->initHooks(array('skilltab', 'globalcard')); // Note that conf->hooks_modules contains array
+
+// Load object
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+$permissiontoread = $user->rights->hrm->all->read;
+$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+
+// Security check (enable the most restrictive one)
+if ($user->socid > 0) accessforbidden();
+if (empty($conf->hrm->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.'/hrm/skill_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.'/hrm/skill_list.php?id=' . ($id > 0 ? $id : '__ID__');
+			}
+		}
+	}
+
+	if ($action == 'addSkill') {
+		$error = 0;
+
+		if (empty($TSkillsToAdd)) {
+			setEventMessage('ErrNoSkillSelected', 'errors');
+			$error++;
+		}
+
+		if (!$error) {
+			foreach ($TSkillsToAdd as $k=>$v) {
+				$skillAdded = new SkillRank($db);
+				$skillAdded->fk_skill = $v;
+				$skillAdded->fk_object = $id;
+				$skillAdded->objecttype = $objecttype;
+				$ret = $skillAdded->create($user);
+				if ($ret < 0) setEventMessage($skillAdded->error, 'errors');
+				//else unset($TSkillsToAdd);
+			}
+		}
+	} elseif ($action == 'saveSkill') {
+		if (!empty($TNote)) {
+			foreach ($TNote as $skillId => $rank) {
+				$TSkills = $skill->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object=' . ((int) $id) . " AND objecttype='" . $db->escape($objecttype) . "' AND fk_skill = " . ((int) $skillId)));
+				if (is_array($TSkills) && !empty($TSkills)) {
+					foreach ($TSkills as $tmpObj) {
+						$tmpObj->rankorder = $rank;
+						$tmpObj->update($user);
+					}
+				}
+			}
+		}
+	} elseif ($action == 'confirm_deleteskill' && $confirm == 'yes') {
+		$skillToDelete = new SkillRank($db);
+		$ret = $skillToDelete->fetch($lineid);
+		if ($ret > 0) {
+			$skillToDelete->delete($user);
+		}
+	}
+}
+
+/*
+ * View
+ *
+ * Put here all code to build page
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formproject = new FormProjets($db);
+
+$title = $langs->trans("RequiredSkills");
+$help_url = '';
+llxHeader('', $title, $help_url);
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	$res = $object->fetch_optionals();
+
+	// view configuration
+	if ($objecttype == 'job') {
+		require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
+		$head = jobPrepareHead($object);
+		$listLink = dol_buildpath('/hrm/job_list.php', 1);
+	} elseif ($objecttype == "user") {
+		require_once DOL_DOCUMENT_ROOT . "/core/lib/usergroups.lib.php";
+		$object->getRights();
+		$head = user_prepare_head($object);
+		$listLink = dol_buildpath('/user/list.php', 1);
+	}
+
+	print dol_get_fiche_head($head, 'skill_tab', $langs->trans("Workstation"), -1, $object->picto);
+
+	$formconfirm = '';
+
+	// Confirmation to delete
+	/*if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteSkill'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+	}*/
+	// Confirmation to delete line
+	if ($action == 'ask_deleteskill') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&objecttype=' . $objecttype . '&lineid=' . $lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteskill', '', 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);
+	}*/
+
+	// 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="' . $listLink . '?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+	$morehtmlref = '<div class="refid">';
+	$morehtmlref.= $object->label;
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref, '&objecttype='.$objecttype);
+
+
+	// Get all available skills
+	$static_skill = new Skill($db);
+	$TAllSkills = $static_skill->fetchAll();
+
+	// Array format for multiselectarray function
+	$TAllSkillsFormatted=array();
+	if (!empty($TAllSkills)) {
+		foreach ($TAllSkills as $k=>$v) {
+			$TAllSkillsFormatted[$k] = $v->label;
+		}
+	}
+
+	// table of skillRank linked to current object
+	$TSkillsJob = $skill->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object=' . ((int) $id) . " AND objecttype='" . $db->escape($objecttype) . "'"));
+
+	$TAlreadyUsedSkill = array();
+	if (is_array($TSkillsJob) && !empty($TSkillsJob)) {
+		foreach ($TSkillsJob as $skillElement) {
+			$TAlreadyUsedSkill[$skillElement->fk_skill] = $skillElement->fk_skill;
+		}
+	}
+
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">' . "\n";
+	$object->fields['label']['visible']=0; // Already in banner
+	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
+	print '</table>';
+	print '</div>';
+
+	print '<div class="clearboth"></div><br>';
+
+	if ($objecttype != 'user' && $permissiontoadd) {
+		// form pour ajouter des compétences
+		print '<form name="addSkill" 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="action" value="addSkill">';
+		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>';
+		print '<tr>';
+		print '<td>' . $form->multiselectarray('fk_skill', array_diff_key($TAllSkillsFormatted, $TAlreadyUsedSkill), array(), 0, 0, '', 0, '100%') . '</td>';
+		print '<td><input class="button reposition" type="submit" value="' . $langs->trans('Add') . '"></td>';
+		print '</tr>';
+		print '</table>';
+		print '</div>';
+		print '</form>';
+	}
+	print '<br>';
+
+	print '<div class="clearboth"></div>';
+
+	if ($objecttype != 'user' && $permissiontoadd) {
+		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="action" value="saveSkill">';
+	}
+	print '<div class="div-table-responsive-no-min">';
+	print '<table id="tablelines" class="noborder centpercent" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans('SkillType').'</th>';
+	print '<th>'.$langs->trans('Label').'</th>';
+	print '<th>'.$langs->trans('Description').'</th>';
+	print '<th>'.$langs->trans($objecttype === 'job' ? 'RequiredRank' : 'EmployeeRank').'</th>';
+	if ($objecttype === 'job') {
+		print '<th class="linecoledit"></th>';
+		print '<th class="linecoldelete"></th>';
+	}
+	print '</tr>';
+	if (!is_array($TSkillsJob) || empty($TSkillsJob)) {
+		print '<tr><td>' . $langs->trans("NoRecordFound") . '</td></tr>';
+	} else {
+		$sk = new Skill($db);
+		foreach ($TSkillsJob as $skillElement) {
+			$sk->fetch($skillElement->fk_skill);
+			print '<tr>';
+			print '<td>';
+			print Skill::typeCodeToLabel($sk->skill_type);
+			print '</td><td class="linecolfk_skill">';
+			print $sk->getNomUrl(1);
+			print '</td>';
+			print '<td>';
+			print $sk->description;
+			print '</td><td class="linecolrank">';
+			print displayRankInfos($skillElement->rankorder, $skillElement->fk_skill, 'TNote', $objecttype == 'job' && $permissiontoadd ? 'edit' : 'view');
+			print '</td>';
+			if ($objecttype != 'user' && $permissiontoadd) {
+				print '<td class="linecoledit"></td>';
+				print '<td class="linecoldelete">';
+				print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $skillElement->fk_object . '&amp;objecttype=' . $objecttype . '&amp;action=ask_deleteskill&amp;lineid=' . $skillElement->id . '">';
+				print img_delete();
+				print '</a>';
+			}
+			print '</td>';
+			print '</tr>';
+		}
+	}
+
+	print '</table>';
+	if ($objecttype != 'user' && $permissiontoadd) print '<td><input class="button pull-right" type="submit" value="' . $langs->trans('SaveRank') . '"></td>';
+	print '</div>';
+	if ($objecttype != 'user' && $permissiontoadd) print '</form>';
+
+
+	// liste des compétences liées
+
+	print dol_get_fiche_end();
+
+	llxFooter();
+}
diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php
index b919a3c4c3e..6435f91241c 100644
--- a/htdocs/imports/emptyexample.php
+++ b/htdocs/imports/emptyexample.php
@@ -75,9 +75,6 @@ $filename = $langs->trans("ExampleOfImportFile").'_'.$datatoimport.'.'.$format;
 $objimport = new Import($db);
 $objimport->load_arrays($user, $datatoimport);
 // Load arrays from descriptor module
-$entity = $objimport->array_import_entities[0][$code];
-$entityicon = $entitytoicon[$entity] ? $entitytoicon[$entity] : $entity;
-$entitylang = $entitytolang[$entity] ? $entitytolang[$entity] : $entity;
 $fieldstarget = $objimport->array_import_fields[0];
 $valuestarget = $objimport->array_import_examplevalues[0];
 
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index ff9b839d1d5..41059a45e92 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -519,7 +519,7 @@ 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">'.$langs->trans("DownloadEmptyExample");
+		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>';
 		print ' <span class="opacitymedium hideonsmartphone">('.$langs->trans("StarAreMandatory").')</span>';
 		print '</td>';
@@ -608,7 +608,7 @@ 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">'.$langs->trans("DownloadEmptyExample");
+	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>';
 	print ' <span class="opacitymedium hideonsmartphone">('.$langs->trans("StarAreMandatory").')</span>';
 	print '</td></tr>';
@@ -735,7 +735,7 @@ if ($step == 3 && $datatoimport) {
 			print '<tr class="oddeven">';
 			print '<td>';
 			print img_mime($file, '', 'pictofixedwidth');
-			print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=3'.$param.'" target="_blank">';
+			print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=3'.$param.'" target="_blank" rel="noopener noreferrer">';
 			print $file;
 			print '</a>';
 			print '</td>';
@@ -937,7 +937,7 @@ if ($step == 4 && $datatoimport) {
 	print '<td>';
 	$modulepart = 'import';
 	$relativepath = GETPOST('filetoimport');
-	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank">';
+	print '<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 '</a>';
@@ -1178,7 +1178,7 @@ if ($step == 4 && $datatoimport) {
 
 
 	if ($conf->use_javascript_ajax) {
-		print '<script type="text/javascript" language="javascript">';
+		print '<script type="text/javascript">';
 		print 'jQuery(function() {
                     jQuery("#left, #right").sortable({
                         /* placeholder: \'ui-state-highlight\', */
@@ -1206,7 +1206,7 @@ if ($step == 4 && $datatoimport) {
 		//                    async: false
 		//        });'."\n";
 		// Now reload page
-		print 'var newlocation= \''.$_SERVER["PHP_SELF"].'?step=4'.$param.'&action=saveorder&boxorder=\' + boxorder;'."\n";
+		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";
@@ -1435,7 +1435,7 @@ if ($step == 5 && $datatoimport) {
 	print '<td>';
 	$modulepart = 'import';
 	$relativepath = GETPOST('filetoimport');
-	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank">';
+	print '<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 '</a>';
@@ -1453,10 +1453,10 @@ if ($step == 5 && $datatoimport) {
 	print $langs->trans("ImportFromToLine");
 	print '</td><td>';
 	if ($action == 'launchsimu') {
-		print '<input type="number" class="maxwidth50" name="excludefirstlinebis" disabled="disabled" value="'.$excludefirstline.'">';
+		print '<input type="number" class="maxwidth50 right" name="excludefirstlinebis" disabled="disabled" value="'.$excludefirstline.'">';
 		print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
 	} else {
-		print '<input type="number" class="maxwidth50" name="excludefirstline" value="'.$excludefirstline.'">';
+		print '<input type="number" class="maxwidth50 right" name="excludefirstline" value="'.$excludefirstline.'">';
 		print $form->textwithpicto("", $langs->trans("SetThisValueTo2ToExcludeFirstLine"));
 	}
 	print ' - ';
@@ -1881,7 +1881,7 @@ if ($step == 6 && $datatoimport) {
 	print '<td>';
 	$modulepart = 'import';
 	$relativepath = GETPOST('filetoimport');
-	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank">';
+	print '<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 '</a>';
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Google.php b/htdocs/includes/OAuth/OAuth2/Service/Google.php
index 5ab0f8a474b..d2041979faa 100644
--- a/htdocs/includes/OAuth/OAuth2/Service/Google.php
+++ b/htdocs/includes/OAuth/OAuth2/Service/Google.php
@@ -13,194 +13,196 @@ use OAuth\Common\Http\Uri\Uri;
 
 class Google extends AbstractService
 {
-    /**
-     * Defined scopes - More scopes are listed here:
-     * https://developers.google.com/oauthplayground/
-     *
-     * Make a pull request if you need more scopes.
-     */
+	/**
+	 * Defined scopes - More scopes are listed here:
+	 * https://developers.google.com/oauthplayground/
+	 *
+	 * Make a pull request if you need more scopes.
+	 */
 
-    // Basic
-    const SCOPE_EMAIL                       = 'email';
-    const SCOPE_PROFILE                     = 'profile';
+	// Basic
+	const SCOPE_EMAIL                       = 'email';
+	const SCOPE_PROFILE                     = 'profile';
 
-    const SCOPE_USERINFO_EMAIL              = 'https://www.googleapis.com/auth/userinfo.email';
-    const SCOPE_USERINFO_PROFILE            = 'https://www.googleapis.com/auth/userinfo.profile';
+	const SCOPE_USERINFO_EMAIL              = 'https://www.googleapis.com/auth/userinfo.email';
+	const SCOPE_USERINFO_PROFILE            = 'https://www.googleapis.com/auth/userinfo.profile';
 
-    // Google+
-    const SCOPE_GPLUS_ME                    = 'https://www.googleapis.com/auth/plus.me';
-    const SCOPE_GPLUS_LOGIN                 = 'https://www.googleapis.com/auth/plus.login';
-    const SCOPE_GPLUS_CIRCLES_READ          = 'https://www.googleapis.com/auth/plus.circles.read';
-    const SCOPE_GPLUS_CIRCLES_WRITE         = 'https://www.googleapis.com/auth/plus.circles.write';
-    const SCOPE_GPLUS_STREAM_READ           = 'https://www.googleapis.com/auth/plus.stream.read';
-    const SCOPE_GPLUS_STREAM_WRITE          = 'https://www.googleapis.com/auth/plus.stream.write';
-    const SCOPE_GPLUS_MEDIA                 = 'https://www.googleapis.com/auth/plus.media.upload';
+	// Google+
+	const SCOPE_GPLUS_ME                    = 'https://www.googleapis.com/auth/plus.me';
+	const SCOPE_GPLUS_LOGIN                 = 'https://www.googleapis.com/auth/plus.login';
+	const SCOPE_GPLUS_CIRCLES_READ          = 'https://www.googleapis.com/auth/plus.circles.read';
+	const SCOPE_GPLUS_CIRCLES_WRITE         = 'https://www.googleapis.com/auth/plus.circles.write';
+	const SCOPE_GPLUS_STREAM_READ           = 'https://www.googleapis.com/auth/plus.stream.read';
+	const SCOPE_GPLUS_STREAM_WRITE          = 'https://www.googleapis.com/auth/plus.stream.write';
+	const SCOPE_GPLUS_MEDIA                 = 'https://www.googleapis.com/auth/plus.media.upload';
 
-    // Google Drive
-    const SCOPE_DOCUMENTSLIST               = 'https://docs.google.com/feeds/';
-    const SCOPE_SPREADSHEETS                = 'https://spreadsheets.google.com/feeds/';
-    const SCOPE_GOOGLEDRIVE                 = 'https://www.googleapis.com/auth/drive';
-    const SCOPE_DRIVE_APPS                  = 'https://www.googleapis.com/auth/drive.appdata';
-    const SCOPE_DRIVE_APPS_READ_ONLY        = 'https://www.googleapis.com/auth/drive.apps.readonly';
-    const SCOPE_GOOGLEDRIVE_FILES           = 'https://www.googleapis.com/auth/drive.file';
-    const SCOPE_DRIVE_METADATA_READ_ONLY    = 'https://www.googleapis.com/auth/drive.metadata.readonly';
-    const SCOPE_DRIVE_READ_ONLY             = 'https://www.googleapis.com/auth/drive.readonly';
-    const SCOPE_DRIVE_SCRIPTS               = 'https://www.googleapis.com/auth/drive.scripts';
+	// Google Drive
+	const SCOPE_DOCUMENTSLIST               = 'https://docs.google.com/feeds/';
+	const SCOPE_SPREADSHEETS                = 'https://spreadsheets.google.com/feeds/';
+	const SCOPE_GOOGLEDRIVE                 = 'https://www.googleapis.com/auth/drive';
+	const SCOPE_DRIVE_APPS                  = 'https://www.googleapis.com/auth/drive.appdata';
+	const SCOPE_DRIVE_APPS_READ_ONLY        = 'https://www.googleapis.com/auth/drive.apps.readonly';
+	const SCOPE_GOOGLEDRIVE_FILES           = 'https://www.googleapis.com/auth/drive.file';
+	const SCOPE_DRIVE_METADATA_READ_ONLY    = 'https://www.googleapis.com/auth/drive.metadata.readonly';
+	const SCOPE_DRIVE_READ_ONLY             = 'https://www.googleapis.com/auth/drive.readonly';
+	const SCOPE_DRIVE_SCRIPTS               = 'https://www.googleapis.com/auth/drive.scripts';
 
-    // Cloud Print
-    const SCOPE_CLOUD_PRINT                 = 'https://www.googleapis.com/auth/cloudprint';
+	// Cloud Print
+	const SCOPE_CLOUD_PRINT                 = 'https://www.googleapis.com/auth/cloudprint';
 
-    // Adwords
-    const SCOPE_ADSENSE                     = 'https://www.googleapis.com/auth/adsense';
-    const SCOPE_ADWORDS                     = 'https://www.googleapis.com/auth/adwords/';
-    const SCOPE_GAN                         = 'https://www.googleapis.com/auth/gan'; // google affiliate network...?
+	// Adwords
+	const SCOPE_ADSENSE                     = 'https://www.googleapis.com/auth/adsense';
+	const SCOPE_ADWORDS                     = 'https://www.googleapis.com/auth/adwords/';
+	const SCOPE_GAN                         = 'https://www.googleapis.com/auth/gan'; // google affiliate network...?
 
-    // Google Analytics
-    const SCOPE_ANALYTICS                   = 'https://www.googleapis.com/auth/analytics';
-    const SCOPE_ANALYTICS_EDIT              = 'https://www.googleapis.com/auth/analytics.edit';
-    const SCOPE_ANALYTICS_MANAGE_USERS      = 'https://www.googleapis.com/auth/analytics.manage.users';
-    const SCOPE_ANALYTICS_READ_ONLY         = 'https://www.googleapis.com/auth/analytics.readonly';
+	// Google Analytics
+	const SCOPE_ANALYTICS                   = 'https://www.googleapis.com/auth/analytics';
+	const SCOPE_ANALYTICS_EDIT              = 'https://www.googleapis.com/auth/analytics.edit';
+	const SCOPE_ANALYTICS_MANAGE_USERS      = 'https://www.googleapis.com/auth/analytics.manage.users';
+	const SCOPE_ANALYTICS_READ_ONLY         = 'https://www.googleapis.com/auth/analytics.readonly';
 
-    //Gmail
-    const SCOPE_GMAIL_MODIFY                = 'https://www.googleapis.com/auth/gmail.modify';
-    const SCOPE_GMAIL_READONLY              = 'https://www.googleapis.com/auth/gmail.readonly';
-    const SCOPE_GMAIL_COMPOSE               = 'https://www.googleapis.com/auth/gmail.compose';
-    const SCOPE_GMAIL_SEND                  = 'https://www.googleapis.com/auth/gmail.send';
-    const SCOPE_GMAIL_INSERT                = 'https://www.googleapis.com/auth/gmail.insert';
-    const SCOPE_GMAIL_LABELS                = 'https://www.googleapis.com/auth/gmail.labels';
-    const SCOPE_GMAIL_FULL                  = 'https://mail.google.com/';
+	//Gmail
+	const SCOPE_GMAIL_MODIFY                = 'https://www.googleapis.com/auth/gmail.modify';
+	const SCOPE_GMAIL_READONLY              = 'https://www.googleapis.com/auth/gmail.readonly';
+	const SCOPE_GMAIL_COMPOSE               = 'https://www.googleapis.com/auth/gmail.compose';
+	const SCOPE_GMAIL_SEND                  = 'https://www.googleapis.com/auth/gmail.send';
+	const SCOPE_GMAIL_INSERT                = 'https://www.googleapis.com/auth/gmail.insert';
+	const SCOPE_GMAIL_LABELS                = 'https://www.googleapis.com/auth/gmail.labels';
+	const SCOPE_GMAIL_FULL                  = 'https://mail.google.com/';
 
-    // Other services
-    const SCOPE_BOOKS                       = 'https://www.googleapis.com/auth/books';
-    const SCOPE_BLOGGER                     = 'https://www.googleapis.com/auth/blogger';
-    const SCOPE_CALENDAR                    = 'https://www.googleapis.com/auth/calendar';
-    const SCOPE_CALENDAR_READ_ONLY          = 'https://www.googleapis.com/auth/calendar.readonly';
-    const SCOPE_CONTACT                     = 'https://www.google.com/m8/feeds/';
-    const SCOPE_CONTACTS_RO                 = 'https://www.googleapis.com/auth/contacts.readonly';
-    const SCOPE_CHROMEWEBSTORE              = 'https://www.googleapis.com/auth/chromewebstore.readonly';
-    const SCOPE_GMAIL                       = 'https://mail.google.com/mail/feed/atom';
-    const SCOPE_GMAIL_IMAP_SMTP             = 'https://mail.google.com';
-    const SCOPE_PICASAWEB                   = 'https://picasaweb.google.com/data/';
-    const SCOPE_SITES                       = 'https://sites.google.com/feeds/';
-    const SCOPE_URLSHORTENER                = 'https://www.googleapis.com/auth/urlshortener';
-    const SCOPE_WEBMASTERTOOLS              = 'https://www.google.com/webmasters/tools/feeds/';
-    const SCOPE_TASKS                       = 'https://www.googleapis.com/auth/tasks';
+	// Other services
+	const SCOPE_BOOKS                       = 'https://www.googleapis.com/auth/books';
+	const SCOPE_BLOGGER                     = 'https://www.googleapis.com/auth/blogger';
+	const SCOPE_CALENDAR                    = 'https://www.googleapis.com/auth/calendar';
+	const SCOPE_CALENDAR_READ_ONLY          = 'https://www.googleapis.com/auth/calendar.readonly';
+	const SCOPE_CONTACT                     = 'https://www.google.com/m8/feeds/';
+	const SCOPE_CONTACTS_RO                 = 'https://www.googleapis.com/auth/contacts.readonly';
+	const SCOPE_CHROMEWEBSTORE              = 'https://www.googleapis.com/auth/chromewebstore.readonly';
+	const SCOPE_GMAIL                       = 'https://mail.google.com/mail/feed/atom';
+	const SCOPE_GMAIL_IMAP_SMTP             = 'https://mail.google.com';
+	const SCOPE_PICASAWEB                   = 'https://picasaweb.google.com/data/';
+	const SCOPE_SITES                       = 'https://sites.google.com/feeds/';
+	const SCOPE_URLSHORTENER                = 'https://www.googleapis.com/auth/urlshortener';
+	const SCOPE_WEBMASTERTOOLS              = 'https://www.google.com/webmasters/tools/feeds/';
+	const SCOPE_TASKS                       = 'https://www.googleapis.com/auth/tasks';
 
-    // Cloud services
-    const SCOPE_CLOUDSTORAGE                = 'https://www.googleapis.com/auth/devstorage.read_write';
-    const SCOPE_CONTENTFORSHOPPING          = 'https://www.googleapis.com/auth/structuredcontent'; // what even is this
-    const SCOPE_USER_PROVISIONING           = 'https://apps-apis.google.com/a/feeds/user/';
-    const SCOPE_GROUPS_PROVISIONING         = 'https://apps-apis.google.com/a/feeds/groups/';
-    const SCOPE_NICKNAME_PROVISIONING       = 'https://apps-apis.google.com/a/feeds/alias/';
+	// Cloud services
+	const SCOPE_CLOUDSTORAGE                = 'https://www.googleapis.com/auth/devstorage.read_write';
+	const SCOPE_CONTENTFORSHOPPING          = 'https://www.googleapis.com/auth/structuredcontent'; // what even is this
+	const SCOPE_USER_PROVISIONING           = 'https://apps-apis.google.com/a/feeds/user/';
+	const SCOPE_GROUPS_PROVISIONING         = 'https://apps-apis.google.com/a/feeds/groups/';
+	const SCOPE_NICKNAME_PROVISIONING       = 'https://apps-apis.google.com/a/feeds/alias/';
 
-    // Old
-    const SCOPE_ORKUT                       = 'https://www.googleapis.com/auth/orkut';
-    const SCOPE_GOOGLELATITUDE =
-        'https://www.googleapis.com/auth/latitude.all.best https://www.googleapis.com/auth/latitude.all.city';
-    const SCOPE_OPENID                      = 'openid';
+	// Old
+	const SCOPE_ORKUT                       = 'https://www.googleapis.com/auth/orkut';
+	const SCOPE_GOOGLELATITUDE =
+		'https://www.googleapis.com/auth/latitude.all.best https://www.googleapis.com/auth/latitude.all.city';
+	const SCOPE_OPENID                      = 'openid';
 
-    // YouTube
-    const SCOPE_YOUTUBE_GDATA               = 'https://gdata.youtube.com';
-    const SCOPE_YOUTUBE_ANALYTICS_MONETARY  = 'https://www.googleapis.com/auth/yt-analytics-monetary.readonly';
-    const SCOPE_YOUTUBE_ANALYTICS           = 'https://www.googleapis.com/auth/yt-analytics.readonly';
-    const SCOPE_YOUTUBE                     = 'https://www.googleapis.com/auth/youtube';
-    const SCOPE_YOUTUBE_READ_ONLY           = 'https://www.googleapis.com/auth/youtube.readonly';
-    const SCOPE_YOUTUBE_UPLOAD              = 'https://www.googleapis.com/auth/youtube.upload';
-    const SCOPE_YOUTUBE_PARTNER             = 'https://www.googleapis.com/auth/youtubepartner';
-    const SCOPE_YOUTUBE_PARTNER_AUDIT       = 'https://www.googleapis.com/auth/youtubepartner-channel-audit';
+	// YouTube
+	const SCOPE_YOUTUBE_GDATA               = 'https://gdata.youtube.com';
+	const SCOPE_YOUTUBE_ANALYTICS_MONETARY  = 'https://www.googleapis.com/auth/yt-analytics-monetary.readonly';
+	const SCOPE_YOUTUBE_ANALYTICS           = 'https://www.googleapis.com/auth/yt-analytics.readonly';
+	const SCOPE_YOUTUBE                     = 'https://www.googleapis.com/auth/youtube';
+	const SCOPE_YOUTUBE_READ_ONLY           = 'https://www.googleapis.com/auth/youtube.readonly';
+	const SCOPE_YOUTUBE_UPLOAD              = 'https://www.googleapis.com/auth/youtube.upload';
+	const SCOPE_YOUTUBE_PARTNER             = 'https://www.googleapis.com/auth/youtubepartner';
+	const SCOPE_YOUTUBE_PARTNER_AUDIT       = 'https://www.googleapis.com/auth/youtubepartner-channel-audit';
 
-    // Google Glass
-    const SCOPE_GLASS_TIMELINE              = 'https://www.googleapis.com/auth/glass.timeline';
-    const SCOPE_GLASS_LOCATION              = 'https://www.googleapis.com/auth/glass.location';
+	// Google Glass
+	const SCOPE_GLASS_TIMELINE              = 'https://www.googleapis.com/auth/glass.timeline';
+	const SCOPE_GLASS_LOCATION              = 'https://www.googleapis.com/auth/glass.location';
 
-    // Android Publisher
-    const SCOPE_ANDROID_PUBLISHER           = 'https://www.googleapis.com/auth/androidpublisher';
+	// Android Publisher
+	const SCOPE_ANDROID_PUBLISHER           = 'https://www.googleapis.com/auth/androidpublisher';
 
 
-    // Google Gsuite
+	// Google Gsuite
 	const SCOPE_ADMIN_DIRECTORY_USER =        "https://www.googleapis.com/auth/admin.directory.user";
 	const SCOPE_ADMIN_DIRECTORY_CUSTOMER =        "https://www.googleapis.com/auth/admin.directory.customer";
 
-    protected $accessType = 'online';
+	protected $accessType = 'online';
 
-    public function __construct(
-        CredentialsInterface $credentials,
-        ClientInterface $httpClient,
-        TokenStorageInterface $storage,
-        $scopes = array(),
-        UriInterface $baseApiUri = null
-    ) {
-        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri, true);
+	public function __construct(
+		CredentialsInterface $credentials,
+		ClientInterface $httpClient,
+		TokenStorageInterface $storage,
+		$scopes = array(),
+		UriInterface $baseApiUri = null
+	) {
+		parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri, true);
 
-        if (null === $baseApiUri) {
-            $this->baseApiUri = new Uri('https://www.googleapis.com/oauth2/v1/');
-        }
-    }
+		if (null === $baseApiUri) {
+			$this->baseApiUri = new Uri('https://www.googleapis.com/oauth2/v1/');
+		}
+	}
 
-    public function setAccessType($accessType)
-    {
-        if (!in_array($accessType, array('online', 'offline'), true)) {
-            throw new InvalidAccessTypeException('Invalid accessType, expected either online or offline');
-        }
-        $this->accessType = $accessType;
-    }
+	public function setAccessType($accessType)
+	{
+		if (!in_array($accessType, array('online', 'offline'), true)) {
+			throw new InvalidAccessTypeException('Invalid accessType, expected either online or offline');
+		}
+		$this->accessType = $accessType;
+	}
 
-    // LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
-    public $approvalPrompt='auto';
-    public function setApprouvalPrompt($prompt)
-    {
-        if (!in_array($prompt, array('auto', 'force'), true)) {
-            // @todo Maybe could we rename this exception
-            throw new InvalidAccessTypeException('Invalid approuvalPrompt, expected either auto or force.');
-        }
-        $this->approvalPrompt = $prompt;
-    }
+	// LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
+	public $approvalPrompt='auto';
+	public function setApprouvalPrompt($prompt)
+	{
+		if (!in_array($prompt, array('auto', 'force'), true)) {
+			// @todo Maybe could we rename this exception
+			throw new InvalidAccessTypeException('Invalid approuvalPrompt, expected either auto or force.');
+		}
+		$this->approvalPrompt = $prompt;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getAuthorizationEndpoint()
-    {
-        // LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
-        //return new Uri('https://accounts.google.com/o/oauth2/auth?access_type='.$this->accessType);
-        return new Uri('https://accounts.google.com/o/oauth2/auth?'.($this->approvalPrompt?'approval_prompt='.$this->approvalPrompt.'&':'').'access_type='.$this->accessType);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getAuthorizationEndpoint()
+	{
+		// LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
+		//return new Uri('https://accounts.google.com/o/oauth2/auth?access_type='.$this->accessType);
+		$url = 'https://accounts.google.com/o/oauth2/auth?'.($this->approvalPrompt?'approval_prompt='.$this->approvalPrompt.'&':'').'access_type='.$this->accessType;
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getAccessTokenEndpoint()
-    {
-        return new Uri('https://accounts.google.com/o/oauth2/token');
-    }
+		return new Uri($url);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function parseAccessTokenResponse($responseBody)
-    {
-        $data = json_decode($responseBody, true);
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getAccessTokenEndpoint()
+	{
+		return new Uri('https://accounts.google.com/o/oauth2/token');
+	}
 
-        if (null === $data || !is_array($data)) {
-            throw new TokenResponseException('Unable to parse response.');
-        } elseif (isset($data['error'])) {
-            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
-        }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function parseAccessTokenResponse($responseBody)
+	{
+		$data = json_decode($responseBody, true);
 
-        $token = new StdOAuth2Token();
-        $token->setAccessToken($data['access_token']);
-        $token->setLifetime($data['expires_in']);
+		if (null === $data || !is_array($data)) {
+			throw new TokenResponseException('Unable to parse response.');
+		} elseif (isset($data['error'])) {
+			throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+		}
 
-        if (isset($data['refresh_token'])) {
-            $token->setRefreshToken($data['refresh_token']);
-            unset($data['refresh_token']);
-        }
+		$token = new StdOAuth2Token();
+		$token->setAccessToken($data['access_token']);
+		$token->setLifetime($data['expires_in']);
 
-        unset($data['access_token']);
-        unset($data['expires_in']);
+		if (isset($data['refresh_token'])) {
+			$token->setRefreshToken($data['refresh_token']);
+			unset($data['refresh_token']);
+		}
 
-        $token->setExtraParams($data);
+		unset($data['access_token']);
+		unset($data['expires_in']);
 
-        return $token;
-    }
+		$token->setExtraParams($data);
+
+		return $token;
+	}
 }
diff --git a/htdocs/includes/OAuth/OAuth2/Service/WordPress.php b/htdocs/includes/OAuth/OAuth2/Service/WordPress.php
new file mode 100755
index 00000000000..79a13d00e2d
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/WordPress.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\OAuth2\Service\Exception\InvalidAccessTypeException;
+use OAuth\Common\Http\Uri\Uri;
+
+/**
+ * Class For WordPress OAuth
+ */
+class WordPress extends AbstractService
+{
+	/**
+	 * @var string
+	 */
+	protected $accessType = 'online';
+
+	/**
+	 * Construct
+	 *
+	 * @param CredentialsInterface $credentials credentials
+	 * @param ClientInterface $httpClient httpClient
+	 * @param TokenStorageInterface $storage storage
+	 * @param $scopes scope
+	 * @param UriInterface|null $baseApiUri baseApiUri
+	 * @throws Exception\InvalidScopeException
+	 */
+	public function __construct(CredentialsInterface $credentials, ClientInterface $httpClient, TokenStorageInterface $storage, $scopes = array(), UriInterface $baseApiUri = null)
+	{
+		parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri, true);
+
+		if (null === $baseApiUri) {
+			$this->baseApiUri = new Uri('https://addresse_de_votre_site_wordpress');
+		}
+	}
+	/*
+	// LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
+	public $approvalPrompt='auto';
+	public function setApprouvalPrompt($prompt)
+	{
+		if (!in_array($prompt, array('auto', 'force'), true)) {
+			// @todo Maybe could we rename this exception
+			throw new InvalidAccessTypeException('Invalid approuvalPrompt, expected either auto or force.');
+		}
+		$this->approvalPrompt = $prompt;
+	}*/
+
+	/**
+	 * @return Uri
+	 */
+	public function getAuthorizationEndpoint()
+	{
+		return new Uri(sprintf('%s/oauth/authorize', $this->baseApiUri));
+	}
+
+	/**
+	 * @return Uri
+	 */
+	public function getAccessTokenEndpoint()
+	{
+		return new Uri(sprintf('%s/oauth/token', $this->baseApiUri));
+	}
+
+	/**
+	 * @return int
+	 */
+	protected function getAuthorizationMethod()
+	{
+		global $conf;
+		return empty($conf->global->OAUTH_WORDPRESS_AUTHORIZATION_METHOD_QUERY_STRING) ? static::AUTHORIZATION_METHOD_HEADER_BEARER : static::AUTHORIZATION_METHOD_QUERY_STRING;
+	}
+
+	/**
+	 * @param $responseBody responseBody
+	 * @return StdOAuth2Token
+	 * @throws TokenResponseException
+	 */
+	protected function parseAccessTokenResponse($responseBody)
+	{
+		$data = json_decode($responseBody, true);
+
+		if (null === $data || !is_array($data)) {
+			throw new TokenResponseException('Unable to parse response: "'.(isset($responseBody)?$responseBody:'NULL').'"');
+		} elseif (isset($data['error'])) {
+			throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '" : "'.$data['error_description'].'"');
+		}
+
+		$token = new StdOAuth2Token();
+		$token->setAccessToken($data['access_token']);
+		$token->setLifetime($data['expires_in']);
+
+		if (isset($data['refresh_token'])) {
+			$token->setRefreshToken($data['refresh_token']);
+			unset($data['refresh_token']);
+		}
+
+		unset($data['access_token']);
+		unset($data['expires_in']);
+
+		$token->setExtraParams($data);
+
+		return $token;
+	}
+}
diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
index ca8797ba577..b57983321a3 100644
--- a/htdocs/includes/odtphp/Segment.php
+++ b/htdocs/includes/odtphp/Segment.php
@@ -16,296 +16,292 @@ class SegmentException extends Exception
  */
 class Segment implements IteratorAggregate, Countable
 {
-    protected $xml;
-    protected $xmlParsed = '';
-    protected $name;
-    protected $children = array();
-    protected $vars = array();
+	protected $xml;
+	protected $xmlParsed = '';
+	protected $name;
+	protected $children = array();
+	protected $vars = array();
 	protected $images = array();
 	protected $odf;
 	protected $file;
 
-    /**
-     * Constructor
-     *
-     * @param string $name  name of the segment to construct
-     * @param string $xml   XML tree of the segment
-     * @param string $odf   odf
-     */
-    public function __construct($name, $xml, $odf)
-    {
-        $this->name = (string) $name;
-        $this->xml = (string) $xml;
+	/**
+	 * Constructor
+	 *
+	 * @param string $name  name of the segment to construct
+	 * @param string $xml   XML tree of the segment
+	 * @param string $odf   odf
+	 */
+	public function __construct($name, $xml, $odf)
+	{
+		$this->name = (string) $name;
+		$this->xml = (string) $xml;
 		$this->odf = $odf;
-        $zipHandler = $this->odf->getConfig('ZIP_PROXY');
-        $this->file = new $zipHandler($this->odf->getConfig('PATH_TO_TMP'));
-        $this->_analyseChildren($this->xml);
-    }
-    /**
-     * Returns the name of the segment
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-    /**
-     * Does the segment have children ?
-     *
-     * @return bool
-     */
-    public function hasChildren()
-    {
-        return $this->getIterator()->hasChildren();
-    }
-    /**
-     * Countable interface
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->children);
-    }
-    /**
-     * IteratorAggregate interface
-     *
-     * @return Iterator
-     */
-    public function getIterator()
-    {
-        return new RecursiveIteratorIterator(new SegmentIterator($this->children), 1);
-    }
-    /**
-     * Replace variables of the template in the XML code
-     * All the children are also called
-     * Complete the current segment with new line
-     *
-     * @return string
-     */
-    public function merge()
-    {
-        // To provide debug information on line number processed
-        global $count;
-        if (empty($count)) $count=1;
-        else $count++;
+		$zipHandler = $this->odf->getConfig('ZIP_PROXY');
+		$this->file = new $zipHandler($this->odf->getConfig('PATH_TO_TMP'));
+		$this->_analyseChildren($this->xml);
+	}
+	/**
+	 * Returns the name of the segment
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+	/**
+	 * Does the segment have children ?
+	 *
+	 * @return bool
+	 */
+	public function hasChildren()
+	{
+		return $this->getIterator()->hasChildren();
+	}
+	/**
+	 * Countable interface
+	 *
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->children);
+	}
+	/**
+	 * IteratorAggregate interface
+	 *
+	 * @return Iterator
+	 */
+	public function getIterator()
+	{
+		return new RecursiveIteratorIterator(new SegmentIterator($this->children), 1);
+	}
+	/**
+	 * Replace variables of the template in the XML code
+	 * All the children are also called
+	 * Complete the current segment with new line
+	 *
+	 * @return string
+	 */
+	public function merge()
+	{
+		// To provide debug information on line number processed
+		global $count;
+		if (empty($count)) $count=1;
+		else $count++;
 
-        if (empty($this->savxml)) $this->savxml = $this->xml;       // Sav content of line at first line merged, so we will reuse original for next steps
-        $this->xml = $this->savxml;
-        $tmpvars = $this->vars;                                     // Store into $tmpvars so we won't modify this->vars when completing data with empty values
+		if (empty($this->savxml)) $this->savxml = $this->xml;       // Sav content of line at first line merged, so we will reuse original for next steps
+		$this->xml = $this->savxml;
+		$tmpvars = $this->vars;                                     // Store into $tmpvars so we won't modify this->vars when completing data with empty values
 
-        // Search all tags fou into condition to complete $tmpvars, so we will proceed all tests even if not defined
-        $reg='@\[!--\sIF\s([{}a-zA-Z0-9\.\,_]+)\s--\]@smU';
-        preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
-        //var_dump($tmpvars);exit;
-        foreach($matches as $match)   // For each match, if there is no entry into this->vars, we add it
-        {
-            if (! empty($match[1]) && ! isset($tmpvars[$match[1]]))
-            {
-                $tmpvars[$match[1]] = '';     // Not defined, so we set it to '', we just need entry into this->vars for next loop
-            }
-        }
+		// Search all tags fou into condition to complete $tmpvars, so we will proceed all tests even if not defined
+		$reg='@\[!--\sIF\s([{}a-zA-Z0-9\.\,_]+)\s--\]@smU';
+		$matches = array();
+		preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
+		//var_dump($tmpvars);exit;
+		foreach ($matches as $match) {   // For each match, if there is no entry into this->vars, we add it
+			if (! empty($match[1]) && ! isset($tmpvars[$match[1]])) {
+				$tmpvars[$match[1]] = '';     // Not defined, so we set it to '', we just need entry into this->vars for next loop
+			}
+		}
 
-        // Conditionals substitution
-        // Note: must be done before static substitution, else the variable will be replaced by its value and the conditional won't work anymore
-        foreach($tmpvars as $key => $value)
-        {
-            // If value is true (not 0 nor false nor null nor empty string)
-            if ($value)
-            {
-                // Remove the IF tag
-                $this->xml = str_replace('[!-- IF '.$key.' --]', '', $this->xml);
-                // Remove everything between the ELSE tag (if it exists) and the ENDIF tag
-                $reg = '@(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
-                $this->xml = preg_replace($reg, '', $this->xml);
-            }
-            // Else the value is false, then two cases: no ELSE and we're done, or there is at least one place where there is an ELSE clause, then we replace it
-            else
-            {
-                // Find all conditional blocks for this variable: from IF to ELSE and to ENDIF
-                $reg = '@\[!--\sIF\s' . $key . '\s--\](.*)(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
-                preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
-                foreach($matches as $match) { // For each match, if there is an ELSE clause, we replace the whole block by the value in the ELSE clause
-                    if (!empty($match[3])) $this->xml = str_replace($match[0], $match[3], $this->xml);
-                }
-                // Cleanup the other conditional blocks (all the others where there were no ELSE clause, we can just remove them altogether)
-                $this->xml = preg_replace($reg, '', $this->xml);
-            }
-        }
+		// Conditionals substitution
+		// Note: must be done before static substitution, else the variable will be replaced by its value and the conditional won't work anymore
+		foreach ($tmpvars as $key => $value) {
+			// If value is true (not 0 nor false nor null nor empty string)
+			if ($value) {
+				// Remove the IF tag
+				$this->xml = str_replace('[!-- IF '.$key.' --]', '', $this->xml);
+				// Remove everything between the ELSE tag (if it exists) and the ENDIF tag
+				$reg = '@(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
+				$this->xml = preg_replace($reg, '', $this->xml);
+			}
+			// Else the value is false, then two cases: no ELSE and we're done, or there is at least one place where there is an ELSE clause, then we replace it
+			else {
+				// Find all conditional blocks for this variable: from IF to ELSE and to ENDIF
+				$reg = '@\[!--\sIF\s' . $key . '\s--\](.*)(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
+				preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
+				foreach ($matches as $match) { // For each match, if there is an ELSE clause, we replace the whole block by the value in the ELSE clause
+					if (!empty($match[3])) $this->xml = str_replace($match[0], $match[3], $this->xml);
+				}
+				// Cleanup the other conditional blocks (all the others where there were no ELSE clause, we can just remove them altogether)
+				$this->xml = preg_replace($reg, '', $this->xml);
+			}
+		}
 
-        $this->xmlParsed .= str_replace(array_keys($tmpvars), array_values($tmpvars), $this->xml);
-        if ($this->hasChildren()) {
-            foreach ($this->children as $child) {
-                $this->xmlParsed = str_replace($child->xml, ($child->xmlParsed=="")?$child->merge():$child->xmlParsed, $this->xmlParsed);
-                $child->xmlParsed = '';
-            }
-        }
-        $reg = "/\[!--\sBEGIN\s$this->name\s--\](.*)\[!--\sEND\s$this->name\s--\]/sm";
-        $this->xmlParsed = preg_replace($reg, '$1', $this->xmlParsed);
+		$this->xmlParsed .= str_replace(array_keys($tmpvars), array_values($tmpvars), $this->xml);
+		if ($this->hasChildren()) {
+			foreach ($this->children as $child) {
+				$this->xmlParsed = str_replace($child->xml, ($child->xmlParsed=="")?$child->merge():$child->xmlParsed, $this->xmlParsed);
+				$child->xmlParsed = '';
+			}
+		}
+		$reg = "/\[!--\sBEGIN\s$this->name\s--\](.*)\[!--\sEND\s$this->name\s--\]/sm";
+		$this->xmlParsed = preg_replace($reg, '$1', $this->xmlParsed);
 		// Miguel Erill 09704/2017 - Add macro replacement to invoice lines
-        $this->xmlParsed = $this->macroReplace($this->xmlParsed);
-        $this->file->open($this->odf->getTmpfile());
-        foreach ($this->images as $imageKey => $imageValue) {
+		$this->xmlParsed = $this->macroReplace($this->xmlParsed);
+		$this->file->open($this->odf->getTmpfile());
+		foreach ($this->images as $imageKey => $imageValue) {
 			if ($this->file->getFromName('Pictures/' . $imageValue) === false) {
 				// Add the image inside the ODT document
 				$this->file->addFile($imageKey, 'Pictures/' . $imageValue);
 				// Add the image to the Manifest (which maintains a list of images, necessary to avoid "Corrupt ODT file. Repair?" when opening the file with LibreOffice)
 				$this->odf->addImageToManifest($imageValue);
 			}
-        }
-        $this->file->close();
+		}
+		$this->file->close();
 
-        return $this->xmlParsed;
-    }
+		return $this->xmlParsed;
+	}
 
-   /**
-    * Function to replace macros for invoice short and long month, invoice year
-    *
-    * Substitution occur when the invoice is generated, not considering the invoice date
-    * so do not (re)generate in a diferent date than the one that the invoice belongs to
-    * Perhaps it would be better to use the invoice issued date but I still do not know
-    * how to get it here
-    *
-    * Miguel Erill 09/04/2017
-    *
-    * @param	string	$value	String to convert
-    */
-    public function macroReplace($text)
-    {
-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-        global $langs;
+	/**
+	* Function to replace macros for invoice short and long month, invoice year
+	*
+	* Substitution occur when the invoice is generated, not considering the invoice date
+	* so do not (re)generate in a diferent date than the one that the invoice belongs to
+	* Perhaps it would be better to use the invoice issued date but I still do not know
+	* how to get it here
+	*
+	* Miguel Erill 09/04/2017
+	*
+	* @param	string	$value	String to convert
+	*/
+	public function macroReplace($text)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		global $langs;
 
-        $hoy = dol_getdate(dol_now('tzuser'));
-        $dateinonemontharray = dol_get_next_month($hoy['mon'], $hoy['year']);
-        $nextMonth = $dateinonemontharray['month'];
+		$hoy = dol_getdate(dol_now('tzuser'));
+		$dateinonemontharray = dol_get_next_month($hoy['mon'], $hoy['year']);
+		$nextMonth = $dateinonemontharray['month'];
 
-        $patterns=array( '/__CURRENTDAY__/u','/__CURENTWEEKDAY__/u',
-                         '/__CURRENTMONTH__/u','/__CURRENTMONTHLONG__/u',
-                         '/__NEXTMONTH__/u','/__NEXTMONTHLONG__/u',
-                         '/__CURRENTYEAR__/u','/__NEXTYEAR__/u' );
-        $values=array( $hoy['mday'], $langs->transnoentitiesnoconv($hoy['weekday']),
-                       $hoy['mon'], $langs->transnoentitiesnoconv($hoy['month']),
-                       $nextMonth, monthArray($langs)[$nextMonth],
-                       $hoy['year'], $hoy['year']+1 );
+		$patterns=array( '/__CURRENTDAY__/u','/__CURENTWEEKDAY__/u',
+						 '/__CURRENTMONTH__/u','/__CURRENTMONTHLONG__/u',
+						 '/__NEXTMONTH__/u','/__NEXTMONTHLONG__/u',
+						 '/__CURRENTYEAR__/u','/__NEXTYEAR__/u' );
+		$values=array( $hoy['mday'], $langs->transnoentitiesnoconv($hoy['weekday']),
+					   $hoy['mon'], $langs->transnoentitiesnoconv($hoy['month']),
+					   $nextMonth, monthArray($langs)[$nextMonth],
+					   $hoy['year'], $hoy['year']+1 );
 
-        $text=preg_replace($patterns, $values, $text);
+		$text=preg_replace($patterns, $values, $text);
 
-	return $text;
-    }
+		return $text;
+	}
 
-    /**
-     * Analyse the XML code in order to find children
-     *
-     * @param string $xml   Xml
-     * @return Segment
-     */
-    protected function _analyseChildren($xml)
-    {
-        // $reg2 = "#\[!--\sBEGIN\s([\S]*)\s--\](?:<\/text:p>)?(.*)(?:<text:p\s.*>)?\[!--\sEND\s(\\1)\s--\]#sm";
-        $reg2 = "#\[!--\sBEGIN\s([\S]*)\s--\](.*)\[!--\sEND\s(\\1)\s--\]#sm";
-        preg_match_all($reg2, $xml, $matches);
-        for ($i = 0, $size = count($matches[0]); $i < $size; $i++) {
-            if ($matches[1][$i] != $this->name) {
-                $this->children[$matches[1][$i]] = new self($matches[1][$i], $matches[0][$i], $this->odf);
-            } else {
-                $this->_analyseChildren($matches[2][$i]);
-            }
-        }
-        return $this;
-    }
+	/**
+	 * Analyse the XML code in order to find children
+	 *
+	 * @param string $xml   Xml
+	 * @return Segment
+	 */
+	protected function _analyseChildren($xml)
+	{
+		// $reg2 = "#\[!--\sBEGIN\s([\S]*)\s--\](?:<\/text:p>)?(.*)(?:<text:p\s.*>)?\[!--\sEND\s(\\1)\s--\]#sm";
+		$reg2 = "#\[!--\sBEGIN\s([\S]*)\s--\](.*)\[!--\sEND\s(\\1)\s--\]#sm";
+		preg_match_all($reg2, $xml, $matches);
+		for ($i = 0, $size = count($matches[0]); $i < $size; $i++) {
+			if ($matches[1][$i] != $this->name) {
+				$this->children[$matches[1][$i]] = new self($matches[1][$i], $matches[0][$i], $this->odf);
+			} else {
+				$this->_analyseChildren($matches[2][$i]);
+			}
+		}
+		return $this;
+	}
 
-    /**
-     * Assign a template variable to replace
-     *
-     * @param string $key       Key
-     * @param string $value     Value
-     * @param string $encode    Encode
-     * @param string $charset   Charset
-     * @throws SegmentException
-     * @return Segment
-     */
-    public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
-    {
-        if (strpos($this->xml, $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT')) === false) {
-            //throw new SegmentException("var $key not found in {$this->getName()}");
-        }
+	/**
+	 * Assign a template variable to replace
+	 *
+	 * @param string $key       Key
+	 * @param string $value     Value
+	 * @param string $encode    Encode
+	 * @param string $charset   Charset
+	 * @throws SegmentException
+	 * @return Segment
+	 */
+	public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
+	{
+		$tag = $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT');
 
-        $tag = $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT');
+		if (strpos($this->xml, $tag) === false) {
+			//throw new SegmentException("var $key not found in {$this->getName()}");
+		}
 
 		$this->vars[$tag] = $this->odf->convertVarToOdf($value, $encode, $charset);
-        
-        return $this;
-    }
-    /**
-     * Assign a template variable as a picture
-     *
-     * @param string $key name of the variable within the template
-     * @param string $value path to the picture
-     * @throws OdfException
-     * @return Segment
-     */
-    public function setImage($key, $value)
-    {
-        $filename = strtok(strrchr($value, '/'), '/.');
-        $file = substr(strrchr($value, '/'), 1);
-        $size = @getimagesize($value);
-        if ($size === false) {
-            throw new OdfException("Invalid image");
-        }
-        // Set the width and height of the page
-        list ($width, $height) = $size;
-        $width *= Odf::PIXEL_TO_CM;
-        $height *= Odf::PIXEL_TO_CM;
-        // Fix local-aware issues (eg: 12,10 -> 12.10)
-        $width = sprintf("%F", $width);
-        $height = sprintf("%F", $height);
 
-        $xml = <<<IMG
+		return $this;
+	}
+
+	/**
+	 * Assign a template variable as a picture
+	 *
+	 * @param string $key name of the variable within the template
+	 * @param string $value path to the picture
+	 * @throws OdfException
+	 * @return Segment
+	 */
+	public function setImage($key, $value)
+	{
+		$filename = strtok(strrchr($value, '/'), '/.');
+		$file = substr(strrchr($value, '/'), 1);
+		$size = @getimagesize($value);
+		if ($size === false) {
+			throw new OdfException("Invalid image");
+		}
+		// Set the width and height of the page
+		list ($width, $height) = $size;
+		$width *= Odf::PIXEL_TO_CM;
+		$height *= Odf::PIXEL_TO_CM;
+		// Fix local-aware issues (eg: 12,10 -> 12.10)
+		$width = sprintf("%F", $width);
+		$height = sprintf("%F", $height);
+
+		$xml = <<<IMG
 <draw:frame draw:style-name="fr1" draw:name="$filename" text:anchor-type="aschar" svg:width="{$width}cm" svg:height="{$height}cm" draw:z-index="3"><draw:image xlink:href="Pictures/$file" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/></draw:frame>
 IMG;
-        $this->images[$value] = $file;
-        $this->setVars($key, $xml, false);
-        return $this;
-    }
-    /**
-     * Shortcut to retrieve a child
-     *
-     * @param string $prop      Prop
-     * @return Segment
-     * @throws SegmentException
-     */
-    public function __get($prop)
-    {
-        if (array_key_exists($prop, $this->children)) {
-            return $this->children[$prop];
-        } else {
-            throw new SegmentException('child ' . $prop . ' does not exist');
-        }
-    }
-    /**
-     * Proxy for setVars
-     *
-     * @param string $meth      Meth
-     * @param array $args       Args
-     * @return Segment
-     */
-    public function __call($meth, $args)
-    {
-        try {
-            return $this->setVars($meth, $args[0]);
-        } catch (SegmentException $e) {
-            throw new SegmentException("method $meth nor var $meth exist");
-        }
-    }
-    /**
-     * Returns the parsed XML
-     *
-     * @return string
-     */
-    public function getXmlParsed()
-    {
-        return $this->xmlParsed;
-    }
+		$this->images[$value] = $file;
+		$this->setVars($key, $xml, false);
+		return $this;
+	}
+	/**
+	 * Shortcut to retrieve a child
+	 *
+	 * @param string $prop      Prop
+	 * @return Segment
+	 * @throws SegmentException
+	 */
+	public function __get($prop)
+	{
+		if (array_key_exists($prop, $this->children)) {
+			return $this->children[$prop];
+		} else {
+			throw new SegmentException('child ' . $prop . ' does not exist');
+		}
+	}
+	/**
+	 * Proxy for setVars
+	 *
+	 * @param string $meth      Meth
+	 * @param array $args       Args
+	 * @return Segment
+	 */
+	public function __call($meth, $args)
+	{
+		try {
+			return $this->setVars($meth, $args[0]);
+		} catch (SegmentException $e) {
+			throw new SegmentException("method $meth nor var $meth exist");
+		}
+	}
+	/**
+	 * Returns the parsed XML
+	 *
+	 * @return string
+	 */
+	public function getXmlParsed()
+	{
+		return $this->xmlParsed;
+	}
 }
-
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index b780b550b6d..6c63da727b7 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -2,6 +2,9 @@
 
 require 'Segment.php';
 
+/**
+ * Class of ODT Exception
+ */
 class OdfException extends Exception
 {
 }
@@ -65,24 +68,24 @@ class Odf
 		}
 
 		$md5uniqid = md5(uniqid());
-		if ($this->config['PATH_TO_TMP']) $this->tmpdir = preg_replace('|[\/]$|','',$this->config['PATH_TO_TMP']);	// Remove last \ or /
+		if ($this->config['PATH_TO_TMP']) $this->tmpdir = preg_replace('|[\/]$|', '', $this->config['PATH_TO_TMP']);	// Remove last \ or /
 		$this->tmpdir .= ($this->tmpdir?'/':'').$md5uniqid;
 		$this->tmpfile = $this->tmpdir.'/'.$md5uniqid.'.odt';	// We keep .odt extension to allow OpenOffice usage during debug.
 
 		// A working directory is required for some zip proxy like PclZipProxy
-		if (in_array($this->config['ZIP_PROXY'],array('PclZipProxy')) && ! is_dir($this->config['PATH_TO_TMP'])) {
+		if (in_array($this->config['ZIP_PROXY'], array('PclZipProxy')) && ! is_dir($this->config['PATH_TO_TMP'])) {
 			throw new OdfException('Temporary directory '.$this->config['PATH_TO_TMP'].' must exists');
 		}
 
 		// Create tmp direcoty (will be deleted in destructor)
 		if (!file_exists($this->tmpdir)) {
-			$result=mkdir($this->tmpdir);
+			$result = mkdir($this->tmpdir);
 		}
 
 		// Load zip proxy
 		$zipHandler = $this->config['ZIP_PROXY'];
-		if (!defined('PCLZIP_TEMPORARY_DIR')) define('PCLZIP_TEMPORARY_DIR',$this->tmpdir);
-		include_once('zip/'.$zipHandler.'.php');
+		if (!defined('PCLZIP_TEMPORARY_DIR')) define('PCLZIP_TEMPORARY_DIR', $this->tmpdir);
+		include_once 'zip/'.$zipHandler.'.php';
 		if (! class_exists($this->config['ZIP_PROXY'])) {
 			throw new OdfException($this->config['ZIP_PROXY'] . ' class not found - check your php settings');
 		}
@@ -119,7 +122,8 @@ class Odf
 	}
 
 	/**
-	 * Assing a template variable
+	 * Assing a template variable into ->vars.
+	 * For example, key is {object_date} and value is '2021-01-01'
 	 *
 	 * @param string   $key        Name of the variable within the template
 	 * @param string   $value      Replacement value
@@ -131,6 +135,7 @@ class Odf
 	public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
 	{
 		$tag = $this->config['DELIMITER_LEFT'] . $key . $this->config['DELIMITER_RIGHT'];
+
 		// TODO Warning string may be:
 		// <text:span text:style-name="T13">{</text:span><text:span text:style-name="T12">aaa</text:span><text:span text:style-name="T13">}</text:span>
 		// instead of {aaa} so we should enhance this function.
@@ -147,13 +152,13 @@ class Odf
 	}
 
 	/**
-     * Replaces html tags in odt tags and returns a compatible string
-     * @param string   $key        Name of the variable within the template
+	 * Replaces html tags in odt tags and returns a compatible string
+	 *
 	 * @param string   $value      Replacement value
 	 * @param bool     $encode     If true, special XML characters are encoded
 	 * @param string   $charset    Charset
-     * @return string
-     */
+	 * @return string
+	 */
 	public function convertVarToOdf($value, $encode = true, $charset = 'ISO-8859')
 	{
 		$value = $encode ? htmlspecialchars($value) : $value;
@@ -172,6 +177,9 @@ class Odf
 				'<style:style style:name="supText" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style>'
 			);
 
+			$customStyles = array();
+			$fontDeclarations = array();
+
 			$convertedValue = $this->_replaceHtmlWithOdtTag($this->_getDataFromHtml($value), $customStyles, $fontDeclarations);
 
 			foreach ($customStyles as $key => $val) {
@@ -195,207 +203,209 @@ class Odf
 				}
 			}
 			$this->contentXml = str_replace('</office:font-face-decls>', $fonts . '</office:font-face-decls>', $this->contentXml);
-		}
-		else $convertedValue = preg_replace('/(\r\n|\r|\n)/i', "<text:line-break/>", $value);
+		} else $convertedValue = preg_replace('/(\r\n|\r|\n)/i', "<text:line-break/>", $value);
 
 		return $convertedValue;
 	}
 
 	/**
-     * Replaces html tags in with odt tags and returns an odt string
-     * @param array $tags   An array with html tags generated by the getDataFromHtml() function
-     * @param array $customStyles   An array of style defenitions that should be included inside the odt file
-     * @param array $fontDeclarations   An array of font declarations that should be included inside the odt file
-     * @return string
-     */
-    private function _replaceHtmlWithOdtTag($tags, &$customStyles, &$fontDeclarations)
+	 * Replaces html tags in with odt tags and returns an odt string
+	 * @param array $tags   An array with html tags generated by the getDataFromHtml() function
+	 * @param array $customStyles   An array of style defenitions that should be included inside the odt file
+	 * @param array $fontDeclarations   An array of font declarations that should be included inside the odt file
+	 * @return string
+	 */
+	private function _replaceHtmlWithOdtTag($tags, &$customStyles, &$fontDeclarations)
 	{
-        if ($customStyles == null) $customStyles = array();
-        if ($fontDeclarations == null) $fontDeclarations = array();
+		if ($customStyles == null) $customStyles = array();
+		if ($fontDeclarations == null) $fontDeclarations = array();
 
-        $odtResult = '';
+		$odtResult = '';
 
-        foreach ((array) $tags as $tag) {
-            // Check if the current item is a tag or just plain text
-            if (isset($tag['text'])) {
-                $odtResult .= $tag['text'];
-            } elseif (isset($tag['name'])) {
-                switch ($tag['name']) {
-                    case 'br':
-                        $odtResult .= '<text:line-break/>';
-                        break;
-                    case 'strong':
-                    case 'b':
-                        $odtResult .= '<text:span text:style-name="boldText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $tag['innerText']) . '</text:span>';
-                        break;
-                    case 'i':
-                    case 'em':
-                        $odtResult .= '<text:span text:style-name="italicText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $tag['innerText']) . '</text:span>';
-                        break;
-                    case 'u':
-                        $odtResult .= '<text:span text:style-name="underlineText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $tag['innerText']) . '</text:span>';
-                        break;
-                    case 's':
-                        $odtResult .= '<text:span text:style-name="strikethroughText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $tag['innerText']) . '</text:span>';
-                        break;
-                    case 'sub':
-                        $odtResult .= '<text:span text:style-name="subText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $tag['innerText']) . '</text:span>';
-                        break;
-                    case 'sup':
-                        $odtResult .= '<text:span text:style-name="supText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $tag['innerText']) . '</text:span>';
-                        break;
-                    case 'span':
-                        if (isset($tag['attributes']['style'])) {
-                            $odtStyles = '';
-                            foreach ($tag['attributes']['style'] as $styleName => $styleValue) {
-                                switch ($styleName) {
-                                    case 'font-family':
-                                        $fontName = $styleValue;
-                                        if (strpos($fontName, ',') !== false) {
-                                            $fontName = explode(',', $fontName)[0];
-                                        }
-                                        if (!in_array($fontName, $fontDeclarations)) {
-                                            array_push($fontDeclarations, $fontName);
-                                        }
-                                        $odtStyles .= '<style:text-properties style:font-name="' . $fontName . '" />';
-                                        break;
-                                    case 'font-size':
-                                        if (preg_match('/([0-9]+)\s?(px|pt)/', $styleValue, $matches)) {
-                                            $fontSize = intval($matches[1]);
-                                            if ($matches[2] == 'px') {
-                                                $fontSize = round($fontSize * 0.75);
-                                            }
-                                            $odtStyles .= '<style:text-properties fo:font-size="' . $fontSize . 'pt" style:font-size-asian="' . $fontSize . 'pt" style:font-size-complex="' . $fontSize . 'pt" />';
-                                        }
-                                        break;
-                                    case 'color':
-                                        if (preg_match('/#[0-9A-Fa-f]{3}(?:[0-9A-Fa-f]{3})?/', $styleValue)) {
-                                            $odtStyles .= '<style:text-properties fo:color="' . $styleValue . '" />';
-                                        }
-                                        break;
-                                }
-                            }
-                            if (strlen($odtStyles) > 0) {
+		foreach ((array) $tags as $tag) {
+			// Check if the current item is a tag or just plain text
+			if (isset($tag['text'])) {
+				$odtResult .= $tag['text'];
+			} elseif (isset($tag['name'])) {
+				switch ($tag['name']) {
+					case 'br':
+						$odtResult .= '<text:line-break/>';
+						break;
+					case 'strong':
+					case 'b':
+						$odtResult .= '<text:span text:style-name="boldText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $tag['innerText']) . '</text:span>';
+						break;
+					case 'i':
+					case 'em':
+						$odtResult .= '<text:span text:style-name="italicText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $tag['innerText']) . '</text:span>';
+						break;
+					case 'u':
+						$odtResult .= '<text:span text:style-name="underlineText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $tag['innerText']) . '</text:span>';
+						break;
+					case 's':
+						$odtResult .= '<text:span text:style-name="strikethroughText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $tag['innerText']) . '</text:span>';
+						break;
+					case 'sub':
+						$odtResult .= '<text:span text:style-name="subText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $tag['innerText']) . '</text:span>';
+						break;
+					case 'sup':
+						$odtResult .= '<text:span text:style-name="supText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $tag['innerText']) . '</text:span>';
+						break;
+					case 'span':
+						if (isset($tag['attributes']['style'])) {
+							$odtStyles = '';
+							foreach ($tag['attributes']['style'] as $styleName => $styleValue) {
+								switch ($styleName) {
+									case 'font-family':
+										$fontName = $styleValue;
+										if (strpos($fontName, ',') !== false) {
+											$fontName = explode(',', $fontName)[0];
+										}
+										if (!in_array($fontName, $fontDeclarations)) {
+											array_push($fontDeclarations, $fontName);
+										}
+										$odtStyles .= '<style:text-properties style:font-name="' . $fontName . '" />';
+										break;
+									case 'font-size':
+										if (preg_match('/([0-9]+)\s?(px|pt)/', $styleValue, $matches)) {
+											$fontSize = intval($matches[1]);
+											if ($matches[2] == 'px') {
+												$fontSize = round($fontSize * 0.75);
+											}
+											$odtStyles .= '<style:text-properties fo:font-size="' . $fontSize . 'pt" style:font-size-asian="' . $fontSize . 'pt" style:font-size-complex="' . $fontSize . 'pt" />';
+										}
+										break;
+									case 'color':
+										if (preg_match('/#[0-9A-Fa-f]{3}(?:[0-9A-Fa-f]{3})?/', $styleValue)) {
+											$odtStyles .= '<style:text-properties fo:color="' . $styleValue . '" />';
+										}
+										break;
+								}
+							}
+							if (strlen($odtStyles) > 0) {
 								// Generate a unique id for the style (using microtime and random because some CPUs are really fast...)
-                                $key = floatval(str_replace('.', '', microtime(true)))+rand(0, 10);
-                                $customStyles[$key] = $odtStyles;
-                                $odtResult .= '<text:span text:style-name="customStyle' . $key . '">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $tag['innerText']) . '</text:span>';
-                            }
-                        }
-                        break;
-                    default:
-                        $odtResult .= $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations);
-                        break;
-                }
-            }
-        }
-        return $odtResult;
-    }
+								$key = floatval(str_replace('.', '', microtime(true)))+rand(0, 10);
+								$customStyles[$key] = $odtStyles;
+								$odtResult .= '<text:span text:style-name="customStyle' . $key . '">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $tag['innerText']) . '</text:span>';
+							}
+						}
+						break;
+					default:
+						$odtResult .= $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations);
+						break;
+				}
+			}
+		}
+		return $odtResult;
+	}
 
-    /**
-     * Checks if the given text is a html string
-     * @param string    $text   The text to check
-     * @return bool
-     */
-    private function _isHtmlTag($text)
+	/**
+	 * Checks if the given text is a html string
+	 * @param string    $text   The text to check
+	 * @return bool
+	 */
+	private function _isHtmlTag($text)
 	{
-        return preg_match('/<([A-Za-z]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(.*)<\/\1>))/', $text);
-    }
+		return preg_match('/<([A-Za-z]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(.*)<\/\1>))/', $text);
+	}
 
-    /**
-     * Checks if the given text includes a html string
-     * @param string    $text   The text to check
-     * @return bool
-     */
-    private function _hasHtmlTag($text)
+	/**
+	 * Checks if the given text includes a html string
+	 * @param string    $text   The text to check
+	 * @return bool
+	 */
+	private function _hasHtmlTag($text)
 	{
-        $result = preg_match_all('/<([A-Za-z]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(.*)<\/\1>))/', $text);
-        return is_numeric($result) && $result > 0;
-    }
+		$result = preg_match_all('/<([A-Za-z]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(.*)<\/\1>))/', $text);
+		return is_numeric($result) && $result > 0;
+	}
 
-    /**
-     * Returns an array of html elements
-     * @param string    $html   A string with html tags
-     * @return array
-     */
-    private function _getDataFromHtml($html)
+	/**
+	 * Returns an array of html elements
+	 * @param string    $html   A string with html tags
+	 * @return array
+	 */
+	private function _getDataFromHtml($html)
 	{
-        $tags = array();
-        $tempHtml = $html;
+		$tags = array();
+		$tempHtml = $html;
 
-        while (strlen($tempHtml) > 0) {
-            // Check if the string includes a html tag
-            if (preg_match_all('/<([A-Za-z]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(.*)<\/\1>))/', $tempHtml, $matches)) {
-                $tagOffset = strpos($tempHtml, $matches[0][0]);
-                // Check if the string starts with the html tag
-                if ($tagOffset > 0) {
-                    // Push the text infront of the html tag to the result array
-                    array_push($tags, array(
-                        'text' => substr($tempHtml, 0, $tagOffset)
-                    ));
-                    // Remove the text from the string
-                    $tempHtml = substr($tempHtml, $tagOffset);
-                }
-                // Extract the attribute data from the html tag
-                preg_match_all('/([0-9A-Za-z]+(?:="[0-9A-Za-z\:\-\s\,\;\#]*")?)+/', $matches[2][0], $explodedAttributes);
-                $explodedAttributes = array_filter($explodedAttributes[0]);
-                $attributes = array();
-                // Store each attribute with its name in the $attributes array
-                $explodedAttributesCount = count($explodedAttributes);
-                for ($i=0; $i<$explodedAttributesCount; $i++) {
-                    $attribute = trim($explodedAttributes[$i]);
-                    // Check if the attribute has a value (like style="") or has no value (like required)
-                    if (strpos($attribute, '=') !== false) {
-                        $splitAttribute = explode('=', $attribute);
-                        $attrName = trim($splitAttribute[0]);
-                        $attrValue = trim(str_replace('"', '', $splitAttribute[1]));
-                        // check if the current attribute is a style attribute
-                        if (strtolower($attrName) == 'style') {
-                            $attributes[$attrName] = array();
-                            if (strpos($attrValue, ';') !== false) {
-                                // Split the style properties and store them in an array
-                                $explodedStyles = explode(';', $attrValue);
-                                $explodedStylesCount = count($explodedStyles);
-                                for ($n=0; $n<$explodedStylesCount; $n++) {
-                                    $splitStyle = explode(':', $explodedStyles[$n]);
-                                    $attributes[$attrName][trim($splitStyle[0])] = trim($splitStyle[1]);
-                                }
-                            } else {
-                                $splitStyle = explode(':', $attrValue);
-                                $attributes[$attrName][trim($splitStyle[0])] = trim($splitStyle[1]);
-                            }
-                        } else {
-                            // Store the value directly in the $attributes array if this is not the style attribute
-                            $attributes[$attrName] = $attrValue;
-                        }
-                    } else {
-                        $attributes[trim($attribute)] = true;
-                    }
-                }
-                // Push the html tag data to the result array
-                array_push($tags, array(
-                    'name' => $matches[1][0],
-                    'attributes' => $attributes,
-                    'innerText' => strip_tags($matches[3][0]),
-                    'children' => $this->_hasHtmlTag($matches[3][0]) ? $this->_getDataFromHtml($matches[3][0]) : null
-                ));
-                // Remove the processed html tag from the html string
-                $tempHtml = substr($tempHtml, strlen($matches[0][0]));
-            } else {
-                array_push($tags, array(
-                    'text' => $tempHtml
-                ));
-                $tempHtml = '';
-            }
-        }
-        return $tags;
-    }
+		while (strlen($tempHtml) > 0) {
+			$matches = array();
+			// Check if the string includes a html tag
+			if (preg_match_all('/<([A-Za-z]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(.*)<\/\1>))/', $tempHtml, $matches)) {
+				$tagOffset = strpos($tempHtml, $matches[0][0]);
+				// Check if the string starts with the html tag
+				if ($tagOffset > 0) {
+					// Push the text infront of the html tag to the result array
+					array_push($tags, array(
+						'text' => substr($tempHtml, 0, $tagOffset)
+					));
+					// Remove the text from the string
+					$tempHtml = substr($tempHtml, $tagOffset);
+				}
+				// Extract the attribute data from the html tag
+				$explodedAttributes = array();
+				preg_match_all('/([0-9A-Za-z]+(?:="[0-9A-Za-z\:\-\s\,\;\#]*")?)+/', $matches[2][0], $explodedAttributes);
+				$explodedAttributes = array_filter($explodedAttributes[0]);
+				$attributes = array();
+				// Store each attribute with its name in the $attributes array
+				$explodedAttributesCount = count($explodedAttributes);
+				for ($i=0; $i<$explodedAttributesCount; $i++) {
+					$attribute = trim($explodedAttributes[$i]);
+					// Check if the attribute has a value (like style="") or has no value (like required)
+					if (strpos($attribute, '=') !== false) {
+						$splitAttribute = explode('=', $attribute);
+						$attrName = trim($splitAttribute[0]);
+						$attrValue = trim(str_replace('"', '', $splitAttribute[1]));
+						// check if the current attribute is a style attribute
+						if (strtolower($attrName) == 'style') {
+							$attributes[$attrName] = array();
+							if (strpos($attrValue, ';') !== false) {
+								// Split the style properties and store them in an array
+								$explodedStyles = explode(';', $attrValue);
+								$explodedStylesCount = count($explodedStyles);
+								for ($n=0; $n<$explodedStylesCount; $n++) {
+									$splitStyle = explode(':', $explodedStyles[$n]);
+									$attributes[$attrName][trim($splitStyle[0])] = trim($splitStyle[1]);
+								}
+							} else {
+								$splitStyle = explode(':', $attrValue);
+								$attributes[$attrName][trim($splitStyle[0])] = trim($splitStyle[1]);
+							}
+						} else {
+							// Store the value directly in the $attributes array if this is not the style attribute
+							$attributes[$attrName] = $attrValue;
+						}
+					} else {
+						$attributes[trim($attribute)] = true;
+					}
+				}
+				// Push the html tag data to the result array
+				array_push($tags, array(
+					'name' => $matches[1][0],
+					'attributes' => $attributes,
+					'innerText' => strip_tags($matches[3][0]),
+					'children' => $this->_hasHtmlTag($matches[3][0]) ? $this->_getDataFromHtml($matches[3][0]) : null
+				));
+				// Remove the processed html tag from the html string
+				$tempHtml = substr($tempHtml, strlen($matches[0][0]));
+			} else {
+				array_push($tags, array(
+					'text' => $tempHtml
+				));
+				$tempHtml = '';
+			}
+		}
+		return $tags;
+	}
 
 
 	/**
 	 * Function to convert a HTML string into an ODT string
 	 *
 	 * @param	string	$value	String to convert
+	 * @return	string			String converted
 	 */
 	public function htmlToUTFAndPreOdf($value)
 	{
@@ -404,16 +414,15 @@ class Odf
 
 		// We convert html tags
 		$ishtml=dol_textishtml($value);
-		if ($ishtml)
-		{
-	        // If string is "MYPODUCT - Desc <strong>bold</strong> with &eacute; accent<br />\n<br />\nUn texto en espa&ntilde;ol ?"
-    	    // Result after clean must be "MYPODUCT - Desc bold with é accent\n\nUn texto en espa&ntilde;ol ?"
+		if ($ishtml) {
+			// If string is "MYPODUCT - Desc <strong>bold</strong> with &eacute; accent<br />\n<br />\nUn texto en espa&ntilde;ol ?"
+			// Result after clean must be "MYPODUCT - Desc bold with é accent\n\nUn texto en espa&ntilde;ol ?"
 
 			// We want to ignore \n and we want all <br> to be \n
-			$value=preg_replace('/(\r\n|\r|\n)/i','',$value);
-			$value=preg_replace('/<br>/i',"\n",$value);
-			$value=preg_replace('/<br\s+[^<>\/]*>/i',"\n",$value);
-			$value=preg_replace('/<br\s+[^<>\/]*\/>/i',"\n",$value);
+			$value=preg_replace('/(\r\n|\r|\n)/i', '', $value);
+			$value=preg_replace('/<br>/i', "\n", $value);
+			$value=preg_replace('/<br\s+[^<>\/]*>/i', "\n", $value);
+			$value=preg_replace('/<br\s+[^<>\/]*\/>/i', "\n", $value);
 
 			//$value=preg_replace('/<strong>/','__lt__text:p text:style-name=__quot__bold__quot____gt__',$value);
 			//$value=preg_replace('/<\/strong>/','__lt__/text:p__gt__',$value);
@@ -429,6 +438,7 @@ class Odf
 	 * Function to convert a HTML string into an ODT string
 	 *
 	 * @param	string	$value	String to convert
+	 * @return	string			String converted
 	 */
 	public function preOdfToOdf($value)
 	{
@@ -441,33 +451,6 @@ class Odf
 		return $value;
 	}
 
-	/**
-	 * Evaluating php codes inside the ODT and output the buffer (print, echo) inplace of the code
-	 *
-	 * @return int             0
-	 */
-	public function phpEval()
-	{
-		preg_match_all('/[\{\<]\?(php)?\s+(?P<content>.+)\?[\}\>]/iU',$this->contentXml, $matches); // detecting all {?php code ?} or <?php code ? >
-		$nbfound=count($matches['content']);
-		for ($i=0; $i < $nbfound; $i++)
-		{
-			try {
-				$ob_output = ''; // flush the output for each code. This var will be filled in by the eval($code) and output buffering : any print or echo or output will be redirected into this variable
-				$code = $matches['content'][$i];
-				ob_start();
-				eval ($code);
-				$ob_output = ob_get_contents(); // send the content of the buffer into $ob_output
-				$this->contentXml = str_replace($matches[0][$i], $ob_output, $this->contentXml);
-				ob_end_clean();
-			} catch (Exception $e) {
-				ob_end_clean();
-				$this->contentXml = str_replace($matches[0][$i], 'ERROR: there was a problem while evaluating this portion of code, please fix it: '.$e, $this->contentXml);
-			}
-		}
-		return 0;
-	}
-
 	/**
 	 * Assign a template variable as a picture
 	 *
@@ -503,17 +486,19 @@ IMG;
 	 */
 	private function _moveRowSegments()
 	{
-	    // Replace BEGIN<text:s/>xxx into BEGIN xxx
-	    $this->contentXml = preg_replace('/\[!--\sBEGIN<text:s[^>]>(row.[\S]*)\s--\]/sm', '[!-- BEGIN \\1 --]', $this->contentXml);
-	    // Replace END<text:s/>xxx into END xxx
-	    $this->contentXml = preg_replace('/\[!--\sEND<text:s[^>]>(row.[\S]*)\s--\]/sm', '[!-- END \\1 --]', $this->contentXml);
+		// Replace BEGIN<text:s/>xxx into BEGIN xxx
+		$this->contentXml = preg_replace('/\[!--\sBEGIN<text:s[^>]>(row.[\S]*)\s--\]/sm', '[!-- BEGIN \\1 --]', $this->contentXml);
+		// Replace END<text:s/>xxx into END xxx
+		$this->contentXml = preg_replace('/\[!--\sEND<text:s[^>]>(row.[\S]*)\s--\]/sm', '[!-- END \\1 --]', $this->contentXml);
 
-	    // Search all possible rows in the document
+		// Search all possible rows in the document
 		$reg1 = "#<table:table-row[^>]*>(.*)</table:table-row>#smU";
+		$matches = array();
 		preg_match_all($reg1, $this->contentXml, $matches);
 		for ($i = 0, $size = count($matches[0]); $i < $size; $i++) {
 			// Check if the current row contains a segment row.*
 			$reg2 = '#\[!--\sBEGIN\s(row.[\S]*)\s--\](.*)\[!--\sEND\s\\1\s--\]#sm';
+			$matches2 = array();
 			if (preg_match($reg2, $matches[0][$i], $matches2)) {
 				$balise = str_replace('row.', '', $matches2[1]);
 				// Move segment tags around the row
@@ -536,31 +521,28 @@ IMG;
 	 * @param  string	$type		'content', 'styles' or 'meta'
 	 * @return void
 	 */
-	private function _parse($type='content')
+	private function _parse($type = 'content')
 	{
-	    // Search all tags fou into condition to complete $this->vars, so we will proceed all tests even if not defined
-	    $reg='@\[!--\sIF\s([{}a-zA-Z0-9\.\,_]+)\s--\]@smU';
-	    preg_match_all($reg, $this->contentXml, $matches, PREG_SET_ORDER);
+		// Search all tags found into condition to complete $this->vars, so we will proceed all tests even if not defined
+		$reg='@\[!--\sIF\s([{}a-zA-Z0-9\.\,_]+)\s--\]@smU';
+		$matches = array();
+		preg_match_all($reg, $this->contentXml, $matches, PREG_SET_ORDER);
 
-	    //var_dump($this->vars);exit;
-	    foreach($matches as $match)   // For each match, if there is no entry into this->vars, we add it
-		{
-		    if (! empty($match[1]) && ! isset($this->vars[$match[1]]))
-			{
-			    $this->vars[$match[1]] = '';     // Not defined, so we set it to '', we just need entry into this->vars for next loop
+		//var_dump($this->vars);exit;
+		foreach ($matches as $match) {   // For each match, if there is no entry into this->vars, we add it
+			if (! empty($match[1]) && ! isset($this->vars[$match[1]])) {
+				$this->vars[$match[1]] = '';     // Not defined, so we set it to '', we just need entry into this->vars for next loop
 			}
-	    }
-	    //var_dump($this->vars);exit;
+		}
+		//var_dump($this->vars);exit;
 
 		// Conditionals substitution
 		// Note: must be done before static substitution, else the variable will be replaced by its value and the conditional won't work anymore
-	    foreach($this->vars as $key => $value)
-		{
+		foreach ($this->vars as $key => $value) {
 			// If value is true (not 0 nor false nor null nor empty string)
-			if ($value)
-			{
-			    //dol_syslog("Var ".$key." is defined, we remove the IF, ELSE and ENDIF ");
-			    //$sav=$this->contentXml;
+			if ($value) {
+				//dol_syslog("Var ".$key." is defined, we remove the IF, ELSE and ENDIF ");
+				//$sav=$this->contentXml;
 				// Remove the IF tag
 				$this->contentXml = str_replace('[!-- IF '.$key.' --]', '', $this->contentXml);
 				// Remove everything between the ELSE tag (if it exists) and the ENDIF tag
@@ -568,27 +550,26 @@ IMG;
 				$this->contentXml = preg_replace($reg, '', $this->contentXml);
 				/*if ($sav != $this->contentXml)
 				{
-				    dol_syslog("We found a IF and it was processed");
-				    //var_dump($sav);exit;
+					dol_syslog("We found a IF and it was processed");
+					//var_dump($sav);exit;
 				}*/
-			}
-			// Else the value is false, then two cases: no ELSE and we're done, or there is at least one place where there is an ELSE clause, then we replace it
-			else
-			{
-			    //dol_syslog("Var ".$key." is not defined, we remove the IF, ELSE and ENDIF ");
-			    //$sav=$this->contentXml;
+			} else {
+				// Else the value is false, then two cases: no ELSE and we're done, or there is at least one place where there is an ELSE clause, then we replace it
+
+				//dol_syslog("Var ".$key." is not defined, we remove the IF, ELSE and ENDIF ");
+				//$sav=$this->contentXml;
 				// Find all conditional blocks for this variable: from IF to ELSE and to ENDIF
 				$reg = '@\[!--\sIF\s' . $key . '\s--\](.*)(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
 				preg_match_all($reg, $this->contentXml, $matches, PREG_SET_ORDER);
-				foreach($matches as $match) { // For each match, if there is an ELSE clause, we replace the whole block by the value in the ELSE clause
+				foreach ($matches as $match) { // For each match, if there is an ELSE clause, we replace the whole block by the value in the ELSE clause
 					if (!empty($match[3])) $this->contentXml = str_replace($match[0], $match[3], $this->contentXml);
 				}
 				// Cleanup the other conditional blocks (all the others where there were no ELSE clause, we can just remove them altogether)
 				$this->contentXml = preg_replace($reg, '', $this->contentXml);
 				/*if ($sav != $this->contentXml)
 				{
-				    dol_syslog("We found a IF and it was processed");
-				    //var_dump($sav);exit;
+					dol_syslog("We found a IF and it was processed");
+					//var_dump($sav);exit;
 				}*/
 			}
 		}
@@ -597,7 +578,6 @@ IMG;
 		if ($type == 'content')	$this->contentXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->contentXml);
 		if ($type == 'styles')	$this->stylesXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->stylesXml);
 		if ($type == 'meta')	$this->metaXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->metaXml);
-
 	}
 
 	/**
@@ -665,6 +645,7 @@ IMG;
 		}
 		// $reg = "#\[!--\sBEGIN\s$segment\s--\]<\/text:p>(.*)<text:p\s.*>\[!--\sEND\s$segment\s--\]#sm";
 		$reg = "#\[!--\sBEGIN\s$segment\s--\](.*)\[!--\sEND\s$segment\s--\]#sm";
+		$m = array();
 		if (preg_match($reg, html_entity_decode($this->contentXml), $m) == 0) {
 			throw new OdfException("'".$segment."' segment not found in the document. The tag [!-- BEGIN xxx --] or [!-- END xxx --] is not present into content file.");
 		}
@@ -737,21 +718,19 @@ IMG;
 	 */
 	public function setMetaData()
 	{
-	    if (empty($this->creator)) $this->creator='';
+		if (empty($this->creator)) $this->creator='';
 
 		$this->metaXml = preg_replace('/<dc:date>.*<\/dc:date>/', '<dc:date>'.gmdate("Y-m-d\TH:i:s").'</dc:date>', $this->metaXml);
 		$this->metaXml = preg_replace('/<dc:creator>.*<\/dc:creator>/', '<dc:creator>'.htmlspecialchars($this->creator).'</dc:creator>', $this->metaXml);
 		$this->metaXml = preg_replace('/<dc:title>.*<\/dc:title>/', '<dc:title>'.htmlspecialchars($this->title).'</dc:title>', $this->metaXml);
 		$this->metaXml = preg_replace('/<dc:subject>.*<\/dc:subject>/', '<dc:subject>'.htmlspecialchars($this->subject).'</dc:subject>', $this->metaXml);
 
-		if (count($this->userdefined))
-		{
-		    foreach($this->userdefined as $key => $val)
-		    {
-		      $this->metaXml = preg_replace('<meta:user-defined meta:name="'.$key.'"/>', '', $this->metaXml);
-		      $this->metaXml = preg_replace('/<meta:user-defined meta:name="'.$key.'">.*<\/meta:user-defined>/', '', $this->metaXml);
-		      $this->metaXml = str_replace('</office:meta>', '<meta:user-defined meta:name="'.$key.'">'.htmlspecialchars($val).'</meta:user-defined></office:meta>', $this->metaXml);
-		    }
+		if (count($this->userdefined)) {
+			foreach ($this->userdefined as $key => $val) {
+				$this->metaXml = preg_replace('<meta:user-defined meta:name="'.$key.'"/>', '', $this->metaXml);
+				$this->metaXml = preg_replace('/<meta:user-defined meta:name="'.$key.'">.*<\/meta:user-defined>/', '', $this->metaXml);
+				$this->metaXml = str_replace('</office:meta>', '<meta:user-defined meta:name="'.$key.'">'.htmlspecialchars($val).'</meta:user-defined></office:meta>', $this->metaXml);
+			}
 		}
 	}
 
@@ -785,8 +764,7 @@ IMG;
 			throw new OdfException("headers already sent ($filename at $linenum)");
 		}
 
-		if( $name == "" )
-		{
+		if ( $name == "" ) {
 			$name = md5(uniqid()) . ".odt";
 		}
 
@@ -804,11 +782,11 @@ IMG;
 	 * @throws OdfException
 	 * @return void
 	 */
-	public function exportAsAttachedPDF($name="")
+	public function exportAsAttachedPDF($name = "")
 	{
 		global $conf;
 
-		if( $name == "" ) $name = "temp".md5(uniqid());
+		if ( $name == "" ) $name = "temp".md5(uniqid());
 
 		dol_syslog(get_class($this).'::exportAsAttachedPDF $name='.$name, LOG_DEBUG);
 		$this->saveToDisk($name);
@@ -818,8 +796,7 @@ IMG;
 
 
 		// Export to PDF using LibreOffice
-		if ($conf->global->MAIN_ODT_AS_PDF == 'libreoffice')
-		{
+		if ($conf->global->MAIN_ODT_AS_PDF == 'libreoffice') {
 			dol_mkdir($conf->user->dir_temp);	// We must be sure the directory exists and is writable
 
 			// We delete and recreate a subdir because the soffice may have change pemrissions on it
@@ -831,9 +808,7 @@ IMG;
 			// using linux/mac libreoffice that must be in path
 			// Note PHP Config "fastcgi.impersonate=0" must set to 0 - Default is 1
 			$command ='soffice --headless -env:UserInstallation=file:\''.$conf->user->dir_temp.'/odtaspdf\' --convert-to pdf --outdir '. escapeshellarg(dirname($name)). " ".escapeshellarg($name);
-		}
-		elseif (preg_match('/unoconv/', $conf->global->MAIN_ODT_AS_PDF))
-		{
+		} elseif (preg_match('/unoconv/', $conf->global->MAIN_ODT_AS_PDF)) {
 			// If issue with unoconv, see https://github.com/dagwieers/unoconv/issues/87
 
 			// MAIN_ODT_AS_PDF should be   "sudo -u unoconv /usr/bin/unoconv" and userunoconv must have sudo to be root by adding file /etc/sudoers.d/unoconv with content  www-data ALL=(unoconv) NOPASSWD: /usr/bin/unoconv .
@@ -860,19 +835,14 @@ IMG;
 
 			$command = $conf->global->MAIN_ODT_AS_PDF.' '.escapeshellcmd($name);
 			//$command = '/usr/bin/unoconv -vvv '.escapeshellcmd($name);
-		}
-		else
-		{
+		} else {
 			// deprecated old method using odt2pdf.sh (native, jodconverter, ...)
 			$tmpname=preg_replace('/\.odt/i', '', $name);
 
-			if (!empty($conf->global->MAIN_DOL_SCRIPTS_ROOT))
-			{
+			if (!empty($conf->global->MAIN_DOL_SCRIPTS_ROOT)) {
 				$command = $conf->global->MAIN_DOL_SCRIPTS_ROOT.'/scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($tmpname).' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
-			}
-			else
-			{
-			    dol_syslog(get_class($this).'::exportAsAttachedPDF is used but the constant MAIN_DOL_SCRIPTS_ROOT with path to script directory was not defined.', LOG_WARNING);
+			} else {
+				dol_syslog(get_class($this).'::exportAsAttachedPDF is used but the constant MAIN_DOL_SCRIPTS_ROOT with path to script directory was not defined.', LOG_WARNING);
 				$command = '../../scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($tmpname).' '.(is_numeric($conf->global->MAIN_ODT_AS_PDF)?'jodconverter':$conf->global->MAIN_ODT_AS_PDF);
 			}
 		}
@@ -880,30 +850,26 @@ IMG;
 		//$dirname=dirname($name);
 		//$command = DOL_DOCUMENT_ROOT.'/includes/odtphp/odt2pdf.sh '.$name.' '.$dirname;
 
-		dol_syslog(get_class($this).'::exportAsAttachedPDF $execmethod='.$execmethod.' Run command='.$command,LOG_DEBUG);
+		dol_syslog(get_class($this).'::exportAsAttachedPDF $execmethod='.$execmethod.' Run command='.$command, LOG_DEBUG);
 		// TODO Use:
 		// $outputfile = DOL_DATA_ROOT.'/odt2pdf.log';
 		// $result = $utils->executeCLI($command, $outputfile);  and replace test on $execmethod.
 		// $retval will be $result['result']
 		// $errorstring will be $result['output']
 		$retval=0; $output_arr=array();
-		if ($execmethod == 1)
-		{
+		if ($execmethod == 1) {
 			exec($command, $output_arr, $retval);
 		}
-		if ($execmethod == 2)
-		{
+		if ($execmethod == 2) {
 			$outputfile = DOL_DATA_ROOT.'/odt2pdf.log';
 
 			$ok=0;
 			$handle = fopen($outputfile, 'w');
-			if ($handle)
-			{
-				dol_syslog(get_class($this)."Run command ".$command,LOG_DEBUG);
+			if ($handle) {
+				dol_syslog(get_class($this)."Run command ".$command, LOG_DEBUG);
 				fwrite($handle, $command."\n");
 				$handlein = popen($command, 'r');
-				while (!feof($handlein))
-				{
+				while (!feof($handlein)) {
 					$read = fgets($handlein);
 					fwrite($handle, $read);
 					$output_arr[]=$read;
@@ -940,11 +906,10 @@ IMG;
 
 			if ($retval == 126) {
 				throw new OdfException('Permission execute convert script : ' . $command);
-			}
-			else {
-			    $errorstring='';
-				foreach($output_arr as $line) {
-				    $errorstring.= $line."<br>";
+			} else {
+				$errorstring='';
+				foreach ($output_arr as $line) {
+					$errorstring.= $line."<br>";
 				}
 				throw new OdfException('ODT to PDF convert fail (option MAIN_ODT_AS_PDF is '.$conf->global->MAIN_ODT_AS_PDF.', command was '.$command.', retval='.$retval.') : ' . $errorstring);
 			}
@@ -1021,6 +986,7 @@ IMG;
 	public function getvalue($valuename)
 	{
 		$searchreg="/\\[".$valuename."\\](.*)\\[\\/".$valuename."\\]/";
+		$matches = array();
 		preg_match($searchreg, $this->contentXml, $matches);
 		$this->contentXml = preg_replace($searchreg, "", $this->contentXml);
 		return  $matches[1];
diff --git a/htdocs/includes/printipp/http_class.php b/htdocs/includes/printipp/http_class.php
index 30bb33d663b..553152b5c90 100644
--- a/htdocs/includes/printipp/http_class.php
+++ b/htdocs/includes/printipp/http_class.php
@@ -4,7 +4,7 @@
 /* ====================================================================
  * GNU Lesser General Public License
  * Version 2.1, February 1999
- * 
+ *
  * Class http_class - Basic http client with "Basic" and Digest/MD5
  * authorization mechanism.
  * handle ipv4/v6 addresses, Unix sockets, http and https
@@ -31,13 +31,13 @@
  *  This class is intended to implement a subset of Hyper Text Transfer Protocol
  *  (HTTP/1.1) on client side  (currently: POST operation), with file streaming
  *  capability.
- *  
+ *
  *  It can perform Basic and Digest authentication.
- *  
+ *
  *  References needed to debug / add functionnalities:
  *  - RFC 2616
  *  - RFC 2617
- *  
+ *
  *
  * Class and Function List:
  * Function list:
@@ -66,58 +66,55 @@
  ************************/
 class httpException extends Exception
 {
-    protected $errno;
+	protected $errno;
 
-    public function __construct ($msg, $errno = null)
-    {
-        parent::__construct ($msg);
-        $this->errno = $errno;
-    }
+	public function __construct($msg, $errno = null)
+	{
+		parent::__construct($msg);
+		$this->errno = $errno;
+	}
 
-    public function getErrorFormatted ()
-    {
-        return sprintf ("[http_class]: %s -- "._(" file %s, line %s"),
-            $this->getMessage (), $this->getFile (), $this->getLine ());
-    }
+	public function getErrorFormatted()
+	{
+		return sprintf("[http_class]: %s -- "._(" file %s, line %s"),
+			$this->getMessage(), $this->getFile(), $this->getLine());
+	}
 
-    public function getErrno ()
-    {
-        return $this->errno;
-    }
+	public function getErrno()
+	{
+		return $this->errno;
+	}
 }
 
 function error2string($value)
 {
-    $level_names = array(
-        E_ERROR => 'E_ERROR',
-        E_WARNING => 'E_WARNING',
-        E_PARSE => 'E_PARSE',
-        E_NOTICE => 'E_NOTICE',
-        E_CORE_ERROR => 'E_CORE_ERROR',
-        E_CORE_WARNING => 'E_CORE_WARNING',
-        E_COMPILE_ERROR => 'E_COMPILE_ERROR',
-        E_COMPILE_WARNING => 'E_COMPILE_WARNING',
-        E_USER_ERROR => 'E_USER_ERROR',
-        E_USER_WARNING => 'E_USER_WARNING',
-        E_USER_NOTICE => 'E_USER_NOTICE'
-    );
-    if(defined('E_STRICT')) {
-        $level_names[E_STRICT]='E_STRICT';
-    }
-    $levels=array();
-    if(($value&E_ALL)==E_ALL)
-    {
-        $levels[]='E_ALL';
-        $value&=~E_ALL;
-    }
-    foreach($level_names as $level=>$name)
-    {
-        if(($value&$level)==$level)
-        {
-            $levels[]=$name;
-        }
-    }
-    return implode(' | ',$levels);
+	$level_names = array(
+		E_ERROR => 'E_ERROR',
+		E_WARNING => 'E_WARNING',
+		E_PARSE => 'E_PARSE',
+		E_NOTICE => 'E_NOTICE',
+		E_CORE_ERROR => 'E_CORE_ERROR',
+		E_CORE_WARNING => 'E_CORE_WARNING',
+		E_COMPILE_ERROR => 'E_COMPILE_ERROR',
+		E_COMPILE_WARNING => 'E_COMPILE_WARNING',
+		E_USER_ERROR => 'E_USER_ERROR',
+		E_USER_WARNING => 'E_USER_WARNING',
+		E_USER_NOTICE => 'E_USER_NOTICE'
+	);
+	if (defined('E_STRICT')) {
+		$level_names[E_STRICT]='E_STRICT';
+	}
+	$levels=array();
+	if (($value&E_ALL)==E_ALL) {
+		$levels[]='E_ALL';
+		$value&=~E_ALL;
+	}
+	foreach ($level_names as $level=>$name) {
+		if (($value&$level)==$level) {
+			$levels[]=$name;
+		}
+	}
+	return implode(' | ', $levels);
 }
 
 /***********************
@@ -127,486 +124,427 @@ function error2string($value)
  ************************/
 class http_class
 {
-    // variables declaration
-    public $debug;
-    public $html_debug;
-    public $timeout = 30;  // time waiting for connection, seconds
-    public $data_timeout = 30; // time waiting for data, milliseconds
-    public $data_chunk_timeout = 1; // time waiting between data chunks, millisecond
-    public $force_multipart_form_post;
-    public $username;
-    public $password;
-    public $request_headers = array ();
-    public $request_body = "Not a useful information";
-    public $status;
-    public $window_size = 1024; // chunk size of data
-    public $with_exceptions = 0; // compatibility mode for old scripts
-    public $port;
-    public $host;
-    private $default_port = 631;
-    private $headers;
-    private $reply_headers = array ();
-    private $reply_body = array ();
-    private $connection;
-    private $arguments;
-    private $bodystream = array ();
-    private $last_limit;
-    private $connected;
-    private $nc = 1;
-    private $user_agent = "PRINTIPP/0.81+CVS";
-    private $readed_bytes = 0;
+	// variables declaration
+	public $debug;
+	public $html_debug;
+	public $timeout = 30;  // time waiting for connection, seconds
+	public $data_timeout = 30; // time waiting for data, milliseconds
+	public $data_chunk_timeout = 1; // time waiting between data chunks, millisecond
+	public $force_multipart_form_post;
+	public $username;
+	public $password;
+	public $request_headers = array ();
+	public $request_body = "Not a useful information";
+	public $status;
+	public $window_size = 1024; // chunk size of data
+	public $with_exceptions = 0; // compatibility mode for old scripts
+	public $port;
+	public $host;
+	private $default_port = 631;
+	private $headers;
+	private $reply_headers = array ();
+	private $reply_body = array ();
+	private $connection;
+	private $arguments;
+	private $bodystream = array ();
+	private $last_limit;
+	private $connected;
+	private $nc = 1;
+	private $user_agent = "PRINTIPP/0.81+CVS";
+	private $readed_bytes = 0;
 
-    public function __construct ()
-    {
-        true;
-    }
+	public function __construct()
+	{
+		true;
+	}
 
-    /*********************
-     *
-     * Public functions
-     *
-     **********************/
+	/*********************
+	 *
+	 * Public functions
+	 *
+	 **********************/
 
-    public function GetRequestArguments ($url, &$arguments)
-    {
-        $this->arguments = array ();
-        $this->arguments["URL"] = $arguments["URL"] = $url;
-        $this->arguments["RequestMethod"] = $arguments["RequestMethod"] = "POST";
-        $this->headers["Content-Length"] = 0;
-        $this->headers["Content-Type"] = "application/octet-stream";
-        $this->headers["Host"] = $this->host;
-        $this->headers["User-Agent"] = $this->user_agent;
-        //$this->headers["Expect"] = "100-continue";
-    }
+	public function GetRequestArguments($url, &$arguments)
+	{
+		$this->arguments = array ();
+		$this->arguments["URL"] = $arguments["URL"] = $url;
+		$this->arguments["RequestMethod"] = $arguments["RequestMethod"] = "POST";
+		$this->headers["Content-Length"] = 0;
+		$this->headers["Content-Type"] = "application/octet-stream";
+		$this->headers["Host"] = $this->host;
+		$this->headers["User-Agent"] = $this->user_agent;
+		//$this->headers["Expect"] = "100-continue";
+	}
 
-    public function Open ($arguments)
-    {
-        $this->connected = false;
-        $url = $arguments["URL"];
-        $port = $this->default_port;
-        #$url = split (':', $url, 2);
-        $url = preg_split ('#:#', $url, 2);
-        $transport_type = $url[0];
-        $unix = false;
-        switch ($transport_type)
-        {
-            case 'http':
-                $transport_type = 'tcp://';
-                break;
+	public function Open($arguments)
+	{
+		$this->connected = false;
+		$url = $arguments["URL"];
+		$port = $this->default_port;
+		// $url = split (':', $url, 2);
+		$url = preg_split('#:#', $url, 2);
+		$transport_type = $url[0];
+		$unix = false;
+		switch ($transport_type) {
+			case 'http':
+				$transport_type = 'tcp://';
+				break;
 
-            case 'https':
-                $transport_type = 'tls://';
-                break;
+			case 'https':
+				$transport_type = 'tls://';
+				break;
 
-            case 'unix':
-                $transport_type = 'unix://';
-                $port = 0;
-                $unix = true;
-                break;
+			case 'unix':
+				$transport_type = 'unix://';
+				$port = 0;
+				$unix = true;
+				break;
 
-            default:
-                $transport_type = 'tcp://';
-                break;
-        }
-        $url = $url[1];
-        if (!$unix)
-        {
-            #$url = split ("/", preg_replace ("#^/{1,}#", '', $url), 2);
-            $url = preg_split ("#/#", preg_replace ("#^/{1,}#", '', $url), 2);
-            $url = $url[0];
-            $port = $this->port;
-            $error = sprintf (_("Cannot resolve url: %s"), $url);
-            $ip = gethostbyname ($url);
-            $ip = @gethostbyaddr ($ip);
-            if (!$ip)
-            {
-                return $this->_HttpError ($error, E_USER_WARNING);
-            }
-            if (strstr ($url, ":")) // we got an ipv6 address
-            {
-                if (!strstr ($url, "[")) // it is not escaped
-                {
-                    $url = sprintf ("[%s]", $url);
-                }
-            }
-        }
-        $this->connection = @fsockopen ($transport_type.$url, $port, $errno, $errstr, $this->timeout);
-        $error =
-            sprintf (_('Unable to connect to "%s%s port %s": %s'), $transport_type,
-                $url, $port, $errstr);
-        if (!$this->connection)
-        {
-            return $this->_HttpError ($error, E_USER_WARNING);
-        }
-        $this->connected = true;
-        return array (true, "success");
-    }
+			default:
+				$transport_type = 'tcp://';
+				break;
+		}
+		$url = $url[1];
+		if (!$unix) {
+			// $url = split ("/", preg_replace ("#^/{1,}#", '', $url), 2);
+			$url = preg_split("#/#", preg_replace("#^/{1,}#", '', $url), 2);
+			$url = $url[0];
+			$port = $this->port;
+			$error = sprintf(_("Cannot resolve url: %s"), $url);
+			$ip = gethostbyname($url);
+			$ip = @gethostbyaddr($ip);
+			if (!$ip) {
+				return $this->_HttpError($error, E_USER_WARNING);
+			}
+			if (strstr($url, ":")) { // we got an ipv6 address
+				if (!strstr($url, "[")) { // it is not escaped
+					$url = sprintf("[%s]", $url);
+				}
+			}
+		}
+		$this->connection = @fsockopen($transport_type.$url, $port, $errno, $errstr, $this->timeout);
+		$error =
+			sprintf(_('Unable to connect to "%s%s port %s": %s'), $transport_type,
+				$url, $port, $errstr);
+		if (!$this->connection) {
+			return $this->_HttpError($error, E_USER_WARNING);
+		}
+		$this->connected = true;
+		return array (true, "success");
+	}
 
-    public function SendRequest ($arguments)
-    {
-        $error =
-            sprintf (_('Streaming request failed to %s'), $arguments['RequestURI']);
-        $result = self::_StreamRequest ($arguments);
-        if (!$result[0])
-        {
-            return $this->_HttpError ($error." ".$result[1], E_USER_WARNING);
-        }
-        self::_ReadReply ();
-        if (!preg_match ('#http/1.1 401 unauthorized#', $this->status))
-        {
-            return array (true, "success");
-        }
-        $headers = array_keys ($this->reply_headers);
-        $error = _("need authentication but no mechanism provided");
-        if (!in_array ("www-authenticate", $headers))
-        {
-            return $this->_HttpError ($error, E_USER_WARNING);
-        }
-        #$authtype = split (' ', $this->reply_headers["www-authenticate"]);
-        $authtype = preg_split ('# #', $this->reply_headers["www-authenticate"]);
-        $authtype = strtolower ($authtype[0]);
-        switch ($authtype)
-        {
-            case 'basic':
-                $pass = base64_encode ($this->user.":".$this->password);
-                $arguments["Headers"]["Authorization"] = "Basic ".$pass;
-                break;
+	public function SendRequest($arguments)
+	{
+		$error =
+			sprintf(_('Streaming request failed to %s'), $arguments['RequestURI']);
+		$result = self::_StreamRequest($arguments);
+		if (!$result[0]) {
+			return $this->_HttpError($error." ".$result[1], E_USER_WARNING);
+		}
+		self::_ReadReply();
+		if (!preg_match('#http/1.1 401 unauthorized#', $this->status)) {
+			return array (true, "success");
+		}
+		$headers = array_keys($this->reply_headers);
+		$error = _("need authentication but no mechanism provided");
+		if (!in_array("www-authenticate", $headers)) {
+			return $this->_HttpError($error, E_USER_WARNING);
+		}
+		// $authtype = split (' ', $this->reply_headers["www-authenticate"]);
+		$authtype = preg_split('# #', $this->reply_headers["www-authenticate"]);
+		$authtype = strtolower($authtype[0]);
+		switch ($authtype) {
+			case 'basic':
+				$pass = base64_encode($this->user.":".$this->password);
+				$arguments["Headers"]["Authorization"] = "Basic ".$pass;
+				break;
 
-            case 'digest':
-                $arguments["Headers"]["Authorization"] = self::_BuildDigest ();
-                break;
+			case 'digest':
+				$arguments["Headers"]["Authorization"] = self::_BuildDigest();
+				break;
 
-            default:
-                $error =
-                    sprintf (_("need '%s' authentication mechanism, but have not"),
-                        $authtype[0]);
-                return $this->_HttpError ($error, E_USER_WARNING);
-                break;
-        }
-        self::Close ();
-        self::Open ($arguments);
+			default:
+				$error =
+					sprintf(_("need '%s' authentication mechanism, but have not"),
+						$authtype[0]);
+				return $this->_HttpError($error, E_USER_WARNING);
+				break;
+		}
+		self::Close();
+		self::Open($arguments);
 
-        $error = sprintf(_('Streaming request failed to %s after a try to authenticate'), $arguments['RequestURI']);
-        $result = self::_StreamRequest ($arguments);
-        if (!$result[0])
-        {
-            return $this->_HttpError ($error.": ".$result[1], E_USER_WARNING);
-        }
-        self::_ReadReply ();
-        return array (true, "success");
-    }
+		$error = sprintf(_('Streaming request failed to %s after a try to authenticate'), $arguments['RequestURI']);
+		$result = self::_StreamRequest($arguments);
+		if (!$result[0]) {
+			return $this->_HttpError($error.": ".$result[1], E_USER_WARNING);
+		}
+		self::_ReadReply();
+		return array (true, "success");
+	}
 
-    public function ReadReplyHeaders (&$headers)
-    {
-        $headers = $this->reply_headers;
-    }
+	public function ReadReplyHeaders(&$headers)
+	{
+		$headers = $this->reply_headers;
+	}
 
-    public function ReadReplyBody (&$body, $chunk_size)
-    {
-        $body = substr ($this->reply_body, $this->last_limit, $chunk_size);
-        $this->last_limit += $chunk_size;
-    }
+	public function ReadReplyBody(&$body, $chunk_size)
+	{
+		$body = substr($this->reply_body, $this->last_limit, $chunk_size);
+		$this->last_limit += $chunk_size;
+	}
 
-    public function Close ()
-    {
-        if (!$this->connected)
-        {
-            return;
-        }
-        fclose ($this->connection);
-    }
+	public function Close()
+	{
+		if (!$this->connected) {
+			return;
+		}
+		fclose($this->connection);
+	}
 
-    /*********************
-     *
-     *  Private functions
-     *
-     *********************/
+	/*********************
+	 *
+	 *  Private functions
+	 *
+	 *********************/
 
-    private function _HttpError ($msg, $level, $errno = null)
-    {
-        $trace = '';
-        $backtrace = debug_backtrace();
-        foreach ($backtrace as $trace)
-        {
-            $trace .= sprintf ("in [file: '%s'][function: '%s'][line: %s];\n", $trace['file'], $trace['function'],$trace['line']);
-        }
-        $msg = sprintf ( '%s\n%s: [errno: %s]: %s',
-            $trace, error2string ($level), $errno, $msg);
-        if ($this->with_exceptions)
-        {
-            throw new httpException ($msg, $errno);
-        }
-        else
-        {
-            trigger_error ($msg, $level);
-            return array (false, $msg);
-        }
-    }
+	private function _HttpError($msg, $level, $errno = null)
+	{
+		$trace = '';
+		$backtrace = debug_backtrace();
+		foreach ($backtrace as $trace) {
+			$trace .= sprintf("in [file: '%s'][function: '%s'][line: %s];\n", $trace['file'], $trace['function'], $trace['line']);
+		}
+		$msg = sprintf( '%s\n%s: [errno: %s]: %s',
+			$trace, error2string($level), $errno, $msg);
+		if ($this->with_exceptions) {
+			throw new httpException($msg, $errno);
+		} else {
+			trigger_error($msg, $level);
+			return array (false, $msg);
+		}
+	}
 
-    private function _streamString ($string)
-    {
-        $success = fwrite ($this->connection, $string);
-        if (!$success)
-        {
-            return false;
-        }
-        return true;
-    }
+	private function _streamString($string)
+	{
+		$success = fwrite($this->connection, $string);
+		if (!$success) {
+			return false;
+		}
+		return true;
+	}
 
-    private function _StreamRequest ($arguments)
-    {
-        $this->status = false;
-        $this->reply_headers = array ();
-        $this->reply_body = "";
-        if (!$this->connected)
-        {
-            return $this->_HttpError (_("not connected"), E_USER_WARNING);
-        }
-        $this->arguments = $arguments;
-        $content_length = 0;
-        foreach ($this->arguments["BodyStream"] as $argument)
-        {
-            list ($type, $value) = each ($argument);
-            reset ($argument);
-            if ($type == "Data")
-            {
-                $length = strlen ($value);
-            }
-            elseif ($type == "File")
-            {
-                if (is_readable ($value))
-                {
-                    $length = filesize ($value);
-                }
-                else
-                {
-                    $length = 0;
-                    return $this->_HttpError (sprintf (_("%s: file is not readable"), $value), E_USER_WARNING);
-                }
-            }
-            else
-            {
-                $length = 0;
-                return $this->_HttpError (sprintf(_("%s: not a valid argument for content"), $type), E_USER_WARNING);
-            }
-            $content_length += $length;
-        }
-        $this->request_body = sprintf (_("%s Bytes"), $content_length);
-        $this->headers["Content-Length"] = $content_length;
-        $this->arguments["Headers"] = array_merge ($this->headers, $this->arguments["Headers"]);
-        if ($this->arguments["RequestMethod"] != "POST")
-        {
-            return $this->_HttpError (sprintf(_("%s: method not implemented"), $arguments["RequestMethod"]), E_USER_WARNING);
-        }
-        $string = sprintf ("POST %s HTTP/1.1\r\n", $this->arguments["RequestURI"]);
-        $this->request_headers[$string] = '';
-        if (!$this->_streamString ($string))
-        {
-            return $this->_HttpError (_("Error while puts POST operation"), E_USER_WARNING);
-        }
-        foreach ($this->arguments["Headers"] as $header => $value)
-        {
-            $string = sprintf ("%s: %s\r\n", $header, $value);
-            $this->request_headers[$header] = $value;
-            if (!$this->_streamString ($string))
-            {
-                return $this->_HttpError (_("Error while puts HTTP headers"), E_USER_WARNING);
-            }
-        }
-        $string = "\r\n";
-        if (!$this->_streamString ($string))
-        {
-            return $this->_HttpError (_("Error while ends HTTP headers"), E_USER_WARNING);
-        }
-        foreach ($this->arguments["BodyStream"] as $argument)
-        {
-            list ($type, $value) = each ($argument);
-            reset ($argument);
-            if ($type == "Data")
-            {
-                $streamed_length = 0;
-                while ($streamed_length < strlen ($value))
-                {
-                    $string = substr ($value, $streamed_length, $this->window_size);
-                    if (!$this->_streamString ($string))
-                    {
-                        return $this->_HttpError (_("error while sending body data"), E_USER_WARNING);
-                    }
-                    $streamed_length += $this->window_size;
-                }
-            }
-            elseif ($type == "File")
-            {
-                if (is_readable ($value))
-                {
-                    $file = fopen ($value, 'rb');
-                    while (!feof ($file))
-                    {
-                        if (gettype ($block = @fread ($file, $this->window_size)) != "string")
-                        {
-                            return $this->_HttpError (_("cannot read file to upload"), E_USER_WARNING);
-                        }
-                        if (!$this->_streamString ($block))
-                        {
-                            return $this->_HttpError (_("error while sending body data"), E_USER_WARNING);
-                        }
-                    }
-                }
-            }
-        }
-        return array (true, "success");
-    }
+	private function _StreamRequest($arguments)
+	{
+		$this->status = false;
+		$this->reply_headers = array ();
+		$this->reply_body = "";
+		if (!$this->connected) {
+			return $this->_HttpError(_("not connected"), E_USER_WARNING);
+		}
+		$this->arguments = $arguments;
+		$content_length = 0;
+		foreach ($this->arguments["BodyStream"] as $argument) {
+			// list ($type, $value) = each ($argument);
+			$type = key($argument);
+			$value = current($argument);
+			reset($argument);
+			if ($type == "Data") {
+				$length = strlen($value);
+			} elseif ($type == "File") {
+				if (is_readable($value)) {
+					$length = filesize($value);
+				} else {
+					$length = 0;
+					return $this->_HttpError(sprintf(_("%s: file is not readable"), $value), E_USER_WARNING);
+				}
+			} else {
+				$length = 0;
+				return $this->_HttpError(sprintf(_("%s: not a valid argument for content"), $type), E_USER_WARNING);
+			}
+			$content_length += $length;
+		}
+		$this->request_body = sprintf(_("%s Bytes"), $content_length);
+		$this->headers["Content-Length"] = $content_length;
+		$this->arguments["Headers"] = array_merge($this->headers, $this->arguments["Headers"]);
+		if ($this->arguments["RequestMethod"] != "POST") {
+			return $this->_HttpError(sprintf(_("%s: method not implemented"), $arguments["RequestMethod"]), E_USER_WARNING);
+		}
+		$string = sprintf("POST %s HTTP/1.1\r\n", $this->arguments["RequestURI"]);
+		$this->request_headers[$string] = '';
+		if (!$this->_streamString($string)) {
+			return $this->_HttpError(_("Error while puts POST operation"), E_USER_WARNING);
+		}
+		foreach ($this->arguments["Headers"] as $header => $value) {
+			$string = sprintf("%s: %s\r\n", $header, $value);
+			$this->request_headers[$header] = $value;
+			if (!$this->_streamString($string)) {
+				return $this->_HttpError(_("Error while puts HTTP headers"), E_USER_WARNING);
+			}
+		}
+		$string = "\r\n";
+		if (!$this->_streamString($string)) {
+			return $this->_HttpError(_("Error while ends HTTP headers"), E_USER_WARNING);
+		}
+		foreach ($this->arguments["BodyStream"] as $argument) {
+			// list ($type, $value) = each ($argument);
+			$type = key($argument);
+			$value = current($argument);
+			reset($argument);
+			if ($type == "Data") {
+				$streamed_length = 0;
+				while ($streamed_length < strlen($value)) {
+					$string = substr($value, $streamed_length, $this->window_size);
+					if (!$this->_streamString($string)) {
+						return $this->_HttpError(_("error while sending body data"), E_USER_WARNING);
+					}
+					$streamed_length += $this->window_size;
+				}
+			} elseif ($type == "File") {
+				if (is_readable($value)) {
+					$file = fopen($value, 'rb');
+					while (!feof($file)) {
+						if (gettype($block = @fread($file, $this->window_size)) != "string") {
+							return $this->_HttpError(_("cannot read file to upload"), E_USER_WARNING);
+						}
+						if (!$this->_streamString($block)) {
+							return $this->_HttpError(_("error while sending body data"), E_USER_WARNING);
+						}
+					}
+				}
+			}
+		}
+		return array (true, "success");
+	}
 
-    private function _ReadReply ()
-    {
-        if (!$this->connected)
-        {
-            return array (false, _("not connected"));
-        }
-        $this->reply_headers = array ();
-        $this->reply_body = "";
-        $headers = array ();
-        $body = "";
-        while (!feof ($this->connection))
-        {
-            $line = fgets ($this->connection, 1024);
-            if (strlen (trim($line)) == 0)
-            {
-                break;
-            } // \r\n => end of headers
-            if (preg_match ('#^[[:space:]]#', $line))
-            {
-                $headers[-1] .= sprintf(' %s', trim ($line));
-                continue;
-            }
-            $headers[] = trim ($line);
-        }
-        $this->status = isset ($headers[0]) ? strtolower ($headers[0]) : false;
-        foreach ($headers as $header)
-        {
-            $header = preg_split ("#: #", $header);
-            $header[0] = strtolower ($header[0]);
-            if ($header[0] !== "www-authenticate")
-            {
-                $header[1] = isset ($header[1]) ? strtolower ($header[1]) : "";
-            }
-            if (!isset ($this->reply_headers[$header[0]]))
-            {
-                $this->reply_headers[$header[0]] = $header[1];
-            }
-        }
-        self::_ReadStream ();
-        return true;
-    }
+	private function _ReadReply()
+	{
+		if (!$this->connected) {
+			return array (false, _("not connected"));
+		}
+		$this->reply_headers = array ();
+		$this->reply_body = "";
+		$headers = array ();
+		$body = "";
+		while (!feof($this->connection)) {
+			$line = fgets($this->connection, 1024);
+			if (strlen(trim($line)) == 0) {
+				break;
+			} // \r\n => end of headers
+			if (preg_match('#^[[:space:]]#', $line)) {
+				$headers[-1] .= sprintf(' %s', trim($line));
+				continue;
+			}
+			$headers[] = trim($line);
+		}
+		$this->status = isset($headers[0]) ? strtolower($headers[0]) : false;
+		foreach ($headers as $header) {
+			$header = preg_split("#: #", $header);
+			$header[0] = strtolower($header[0]);
+			if ($header[0] !== "www-authenticate") {
+				$header[1] = isset($header[1]) ? strtolower($header[1]) : "";
+			}
+			if (!isset($this->reply_headers[$header[0]])) {
+				$this->reply_headers[$header[0]] = $header[1];
+			}
+		}
+		self::_ReadStream();
+		return true;
+	}
 
-    private function _ReadStream ()
-    {
-        if (! array_key_exists ("content-length", $this->reply_headers))
-        {
-            stream_set_blocking($this->connection, 0);
-            $this->reply_body = stream_get_contents($this->connection);
-            return true;
-        }
-        stream_set_blocking($this->connection, 1);
-        $content_length = $this->reply_headers["content-length"];
-        $this->reply_body = stream_get_contents($this->connection,$content_length);
-        return true;
-    }
+	private function _ReadStream()
+	{
+		if (! array_key_exists("content-length", $this->reply_headers)) {
+			stream_set_blocking($this->connection, 0);
+			$this->reply_body = stream_get_contents($this->connection);
+			return true;
+		}
+		stream_set_blocking($this->connection, 1);
+		$content_length = $this->reply_headers["content-length"];
+		$this->reply_body = stream_get_contents($this->connection, $content_length);
+		return true;
+	}
 
-    private function _BuildDigest ()
-    {
-        $auth = $this->reply_headers["www-authenticate"];
-        #list ($head, $auth) = split (" ", $auth, 2);
-        list ($head, $auth) = preg_split ("# #", $auth, 2);
-        #$auth = split (", ", $auth);
-        $auth = preg_split ("#, #", $auth);
-        foreach ($auth as $sheme)
-        {
-            #list ($sheme, $value) = split ('=', $sheme);
-            list ($sheme, $value) = preg_split ('#=#', $sheme);
-            $fields[$sheme] = trim (trim ($value), '"');
-        }
-        $nc = sprintf ('%x', $this->nc);
-        $prepend = "";
-        while ((strlen ($nc) + strlen ($prepend)) < 8)
-            $prependi .= "0";
-        $nc = $prepend.$nc;
-        $cnonce = "printipp";
-        $username = $this->user;
-        $password = $this->password;
-        $A1 = $username.":".$fields["realm"].":".$password;
-        if (array_key_exists ("algorithm", $fields))
-        {
-            $algorithm = strtolower ($fields["algorithm"]);
-            switch ($algorithm)
-            {
-                case "md5":
-                    break;
+	private function _BuildDigest()
+	{
+		$auth = $this->reply_headers["www-authenticate"];
+		// list ($head, $auth) = split (" ", $auth, 2);
+		list ($head, $auth) = preg_split("# #", $auth, 2);
+		// $auth = split (", ", $auth);
+		$auth = preg_split("#, #", $auth);
+		foreach ($auth as $sheme) {
+			// list ($sheme, $value) = split ('=', $sheme);
+			list ($sheme, $value) = preg_split('#=#', $sheme);
+			$fields[$sheme] = trim(trim($value), '"');
+		}
+		$nc = sprintf('%x', $this->nc);
+		$prepend = "";
+		while ((strlen($nc) + strlen($prepend)) < 8)
+			$prependi .= "0";
+		$nc = $prepend.$nc;
+		$cnonce = "printipp";
+		$username = $this->user;
+		$password = $this->password;
+		$A1 = $username.":".$fields["realm"].":".$password;
+		if (array_key_exists("algorithm", $fields)) {
+			$algorithm = strtolower($fields["algorithm"]);
+			switch ($algorithm) {
+				case "md5":
+					break;
 
-                case "md5-sess":
-                    $A1 =
-                    $username.":".$fields["realm"].":".$password.":".
-                    $fields['nonce'].":".$cnonce;
-                    break;
+				case "md5-sess":
+					$A1 =
+					$username.":".$fields["realm"].":".$password.":".
+					$fields['nonce'].":".$cnonce;
+					break;
 
-                default:
-                    return $this->_HttpError(
-                        sprintf (_("digest Authorization: algorithm '%s' not implemented"),
-                            $algorithm),
-                        E_USER_WARNING);
-                return false;
-                break;
-            }
-        }
-        $A2 = "POST:".$this->arguments["RequestURI"];
-        if (array_key_exists ("qop", $fields))
-        {
-            $qop = strtolower ($fields["qop"]);
-            #$qop = split (" ", $qop);
-            $qop = preg_split ("# #", $qop);
-            if (in_array ("auth", $qop))
-            {
-                $qop = "auth";
-            }
-            else
-            {
-                self::_HttpError(
-                    sprintf (_("digest Authorization: algorithm '%s' not implemented"),
-                        $qop),
-                    E_USER_WARNING);
-                return false;
-            }
-        }
-        $response = md5 (md5 ($A1).":".$fields["nonce"].":".md5 ($A2));
-        if (isset ($qop) && ($qop == "auth"))
-        {
-            $response =
-                md5 (md5 ($A1).":".$fields["nonce"].":".$nc.":".$cnonce.":".$qop.
-                    ":".$A2);
-        }
-        $auth_scheme =
-            sprintf
-            ('Digest username="%s", realm="%s", nonce="%s", uri="%s", response="%s"',
-                $username, $fields["realm"], $fields['nonce'],
-                $this->arguments["RequestURI"], $response);
-        if (isset ($algorithm))
-        {
-            $auth_scheme .= sprintf (', algorithm="%s"', $algorithm);
-        }
-        if (isset ($qop))
-        {
-            $auth_scheme .= sprintf (', cnonce="%s"', $cnonce);
-        }
-        if (array_key_exists ("opaque", $fields))
-        {
-            $auth_scheme .= sprintf (', opaque="%s"', $fields['opaque']);
-        }
-        if (isset ($qop))
-        {
-            $auth_scheme .= sprintf (', qop="%s"', $qop);
-        }
-        $auth_scheme .= sprintf (', nc=%s', $nc);
-        $this->nc++;
-        return $auth_scheme;
-    }
+				default:
+					return $this->_HttpError(
+						sprintf(_("digest Authorization: algorithm '%s' not implemented"),
+							$algorithm),
+						E_USER_WARNING);
+				return false;
+				break;
+			}
+		}
+		$A2 = "POST:".$this->arguments["RequestURI"];
+		if (array_key_exists("qop", $fields)) {
+			$qop = strtolower($fields["qop"]);
+			// $qop = split (" ", $qop);
+			$qop = preg_split("# #", $qop);
+			if (in_array("auth", $qop)) {
+				$qop = "auth";
+			} else {
+				self::_HttpError(
+					sprintf(_("digest Authorization: algorithm '%s' not implemented"),
+						$qop),
+					E_USER_WARNING);
+				return false;
+			}
+		}
+		$response = md5(md5($A1).":".$fields["nonce"].":".md5($A2));
+		if (isset($qop) && ($qop == "auth")) {
+			$response =
+				md5(md5($A1).":".$fields["nonce"].":".$nc.":".$cnonce.":".$qop.
+					":".$A2);
+		}
+		$auth_scheme =
+			sprintf('Digest username="%s", realm="%s", nonce="%s", uri="%s", response="%s"',
+				$username, $fields["realm"], $fields['nonce'],
+				$this->arguments["RequestURI"], $response);
+		if (isset($algorithm)) {
+			$auth_scheme .= sprintf(', algorithm="%s"', $algorithm);
+		}
+		if (isset($qop)) {
+			$auth_scheme .= sprintf(', cnonce="%s"', $cnonce);
+		}
+		if (array_key_exists("opaque", $fields)) {
+			$auth_scheme .= sprintf(', opaque="%s"', $fields['opaque']);
+		}
+		if (isset($qop)) {
+			$auth_scheme .= sprintf(', qop="%s"', $qop);
+		}
+		$auth_scheme .= sprintf(', nc=%s', $nc);
+		$this->nc++;
+		return $auth_scheme;
+	}
 }
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/stripe/stripe-php/build.php b/htdocs/includes/stripe/stripe-php/build.php
old mode 100755
new mode 100644
index 37360ffef92..2d2837a0852
--- a/htdocs/includes/stripe/stripe-php/build.php
+++ b/htdocs/includes/stripe/stripe-php/build.php
@@ -6,20 +6,20 @@ $autoload = (int) $argv[1];
 $returnStatus = null;
 
 if (!$autoload) {
-    // Modify composer to not autoload Stripe
-    $composer = \json_decode(\file_get_contents('composer.json'), true);
-    unset($composer['autoload'], $composer['autoload-dev']);
+	// Modify composer to not autoload Stripe
+	$composer = \json_decode(\file_get_contents('composer.json'), true);
+	unset($composer['autoload'], $composer['autoload-dev']);
 
-    \file_put_contents('composer.json', \json_encode($composer, \JSON_PRETTY_PRINT));
+	\file_put_contents('composer.json', \json_encode($composer, \JSON_PRETTY_PRINT));
 }
 
 \passthru('composer update', $returnStatus);
 if (0 !== $returnStatus) {
-    exit(1);
+	exit(1);
 }
 
 $config = $autoload ? 'phpunit.xml' : 'phpunit.no_autoload.xml';
 \passthru("./vendor/bin/phpunit -c {$config}", $returnStatus);
 if (0 !== $returnStatus) {
-    exit(1);
+	exit(1);
 }
diff --git a/htdocs/includes/stripe/stripe-php/update_certs.php b/htdocs/includes/stripe/stripe-php/update_certs.php
old mode 100755
new mode 100644
index a73622cca77..2310698c142
--- a/htdocs/includes/stripe/stripe-php/update_certs.php
+++ b/htdocs/includes/stripe/stripe-php/update_certs.php
@@ -7,9 +7,9 @@
 $fp = \fopen(__DIR__ . '/data/ca-certificates.crt', 'w+b');
 
 $options = [
-    \CURLOPT_FILE => $fp,
-    \CURLOPT_TIMEOUT => 3600,
-    \CURLOPT_URL => 'https://curl.haxx.se/ca/cacert.pem',
+	\CURLOPT_FILE => $fp,
+	\CURLOPT_TIMEOUT => 3600,
+	\CURLOPT_URL => 'https://curl.haxx.se/ca/cacert.pem',
 ];
 
 $ch = \curl_init();
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailLexer.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailLexer.php
index 882c968154d..59dcd5876fd 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailLexer.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailLexer.php
@@ -13,6 +13,8 @@ class EmailLexer extends AbstractLexer
     const S_BACKSLASH        = 92;
     const S_DOT              = 46;
     const S_DQUOTE           = 34;
+    const S_SQUOTE           = 39;
+    const S_BACKTICK         = 96;
     const S_OPENPARENTHESIS  = 49;
     const S_CLOSEPARENTHESIS = 261;
     const S_OPENBRACKET      = 262;
@@ -58,6 +60,8 @@ class EmailLexer extends AbstractLexer
         '/'    => self::S_SLASH,
         ','    => self::S_COMMA,
         '.'    => self::S_DOT,
+        "'"    => self::S_SQUOTE,
+        "`"    => self::S_BACKTICK,
         '"'    => self::S_DQUOTE,
         '-'    => self::S_HYPHEN,
         '::'   => self::S_DOUBLECOLON,
@@ -73,25 +77,73 @@ class EmailLexer extends AbstractLexer
         '\0'   => self::C_NUL,
     );
 
+    /**
+     * @var bool
+     */
     protected $hasInvalidTokens = false;
 
-    protected $previous;
+    /**
+     * @var array
+     *
+     * @psalm-var array{value:string, type:null|int, position:int}|array<empty, empty>
+     */
+    protected $previous = [];
 
+    /**
+     * The last matched/seen token.
+     *
+     * @var array
+     *
+     * @psalm-var array{value:string, type:null|int, position:int}
+     */
+    public $token;
+
+    /**
+     * The next token in the input.
+     *
+     * @var array|null
+     */
+    public $lookahead;
+
+    /**
+     * @psalm-var array{value:'', type:null, position:0}
+     */
+    private static $nullToken = [
+        'value' => '',
+        'type' => null,
+        'position' => 0,
+    ];
+
+    public function __construct()
+    {
+        $this->previous = $this->token = self::$nullToken;
+        $this->lookahead = null;
+    }
+
+    /**
+     * @return void
+     */
     public function reset()
     {
         $this->hasInvalidTokens = false;
         parent::reset();
+        $this->previous = $this->token = self::$nullToken;
     }
 
+    /**
+     * @return bool
+     */
     public function hasInvalidTokens()
     {
         return $this->hasInvalidTokens;
     }
 
     /**
-     * @param $type
+     * @param int $type
      * @throws \UnexpectedValueException
      * @return boolean
+     *
+     * @psalm-suppress InvalidScalarArgument
      */
     public function find($type)
     {
@@ -107,7 +159,7 @@ class EmailLexer extends AbstractLexer
     /**
      * getPrevious
      *
-     * @return array token
+     * @return array
      */
     public function getPrevious()
     {
@@ -122,8 +174,10 @@ class EmailLexer extends AbstractLexer
     public function moveNext()
     {
         $this->previous = $this->token;
+        $hasNext = parent::moveNext();
+        $this->token = $this->token ?: self::$nullToken;
 
-        return parent::moveNext();
+        return $hasNext;
     }
 
     /**
@@ -179,6 +233,11 @@ class EmailLexer extends AbstractLexer
         return  self::GENERIC;
     }
 
+    /**
+     * @param string $value
+     *
+     * @return bool
+     */
     protected function isValid($value)
     {
         if (isset($this->charValue[$value])) {
@@ -189,7 +248,7 @@ class EmailLexer extends AbstractLexer
     }
 
     /**
-     * @param $value
+     * @param string $value
      * @return bool
      */
     protected function isNullType($value)
@@ -202,7 +261,7 @@ class EmailLexer extends AbstractLexer
     }
 
     /**
-     * @param $value
+     * @param string $value
      * @return bool
      */
     protected function isUTF8Invalid($value)
@@ -214,6 +273,9 @@ class EmailLexer extends AbstractLexer
         return false;
     }
 
+    /**
+     * @return string
+     */
     protected function getModifiers()
     {
         return 'iu';
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailParser.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailParser.php
index d0627d82410..6b7bad66927 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailParser.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailParser.php
@@ -17,11 +17,33 @@ class EmailParser
 {
     const EMAIL_MAX_LENGTH = 254;
 
-    protected $warnings;
+    /**
+     * @var array
+     */
+    protected $warnings = [];
+
+    /**
+     * @var string
+     */
     protected $domainPart = '';
+
+    /**
+     * @var string
+     */
     protected $localPart = '';
+    /**
+     * @var EmailLexer
+     */
     protected $lexer;
+
+    /**
+     * @var LocalPart
+     */
     protected $localPartParser;
+
+    /**
+     * @var DomainPart
+     */
     protected $domainPartParser;
 
     public function __construct(EmailLexer $lexer)
@@ -29,11 +51,10 @@ class EmailParser
         $this->lexer = $lexer;
         $this->localPartParser = new LocalPart($this->lexer);
         $this->domainPartParser = new DomainPart($this->lexer);
-        $this->warnings = new \SplObjectStorage();
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return array
      */
     public function parse($str)
@@ -57,6 +78,9 @@ class EmailParser
         return array('local' => $this->localPart, 'domain' => $this->domainPart);
     }
 
+    /**
+     * @return Warning\Warning[]
+     */
     public function getWarnings()
     {
         $localPartWarnings = $this->localPartParser->getWarnings();
@@ -68,11 +92,17 @@ class EmailParser
         return $this->warnings;
     }
 
+    /**
+     * @return string
+     */
     public function getParsedDomainPart()
     {
         return $this->domainPart;
     }
 
+    /**
+     * @param string $email
+     */
     protected function setParts($email)
     {
         $parts = explode('@', $email);
@@ -80,6 +110,9 @@ class EmailParser
         $this->localPart = $parts[0];
     }
 
+    /**
+     * @return bool
+     */
     protected function hasAtToken()
     {
         $this->lexer->moveNext();
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php
index 44b4b93c6bb..a30f21dcd30 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php
@@ -13,12 +13,12 @@ class EmailValidator
     private $lexer;
 
     /**
-     * @var array
+     * @var Warning\Warning[]
      */
-    protected $warnings;
+    protected $warnings = [];
 
     /**
-     * @var InvalidEmail
+     * @var InvalidEmail|null
      */
     protected $error;
 
@@ -28,7 +28,7 @@ class EmailValidator
     }
 
     /**
-     * @param                 $email
+     * @param string          $email
      * @param EmailValidation $emailValidation
      * @return bool
      */
@@ -58,7 +58,7 @@ class EmailValidator
     }
 
     /**
-     * @return InvalidEmail
+     * @return InvalidEmail|null
      */
     public function getError()
     {
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/DomainAcceptsNoMail.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/DomainAcceptsNoMail.php
new file mode 100644
index 00000000000..40a99705ce9
--- /dev/null
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/DomainAcceptsNoMail.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class DomainAcceptsNoMail extends InvalidEmail
+{
+    const CODE = 154;
+    const REASON = 'Domain accepts no mail (Null MX, RFC7505)';
+}
\ No newline at end of file
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingQPair.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingQPair.php
index 2502811cac0..a738eeb62f0 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingQPair.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingQPair.php
@@ -2,7 +2,7 @@
 
 namespace Egulias\EmailValidator\Exception;
 
-class ExpectedQPair extends InvalidEmail
+class ExpectingQPair extends InvalidEmail
 {
     const CODE = 136;
     const REASON = "Expecting QPAIR";
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/LocalOrReservedDomain.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/LocalOrReservedDomain.php
new file mode 100644
index 00000000000..695b05a46d4
--- /dev/null
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/LocalOrReservedDomain.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class LocalOrReservedDomain extends InvalidEmail
+{
+    const CODE = 153;
+    const REASON = 'Local, mDNS or reserved domain (RFC2606, RFC6762)';
+}
\ No newline at end of file
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoDNSRecord.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoDNSRecord.php
index 86ca21d557b..0aa5fa78902 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoDNSRecord.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoDNSRecord.php
@@ -2,8 +2,6 @@
 
 namespace Egulias\EmailValidator\Exception;
 
-use Egulias\EmailValidator\Exception\InvalidEmail;
-
 class NoDNSRecord extends InvalidEmail
 {
     const CODE = 5;
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/UnclosedComment.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/UnclosedComment.php
index c87c97ac773..86b2b09622d 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/UnclosedComment.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/UnclosedComment.php
@@ -5,5 +5,5 @@ namespace Egulias\EmailValidator\Exception;
 class UnclosedComment extends InvalidEmail
 {
     const CODE = 146;
-    const REASON = "No colosing comment token found";
+    const REASON = "No closing comment token found";
 }
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php
index 51769dea1b2..4dadba8af7c 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php
@@ -35,27 +35,18 @@ use Egulias\EmailValidator\Warning\TLD;
 class DomainPart extends Parser
 {
     const DOMAIN_MAX_LENGTH = 254;
+    const LABEL_MAX_LENGTH = 63;
+
+    /**
+     * @var string
+     */
     protected $domainPart = '';
 
     public function parse($domainPart)
     {
         $this->lexer->moveNext();
 
-        if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
-            throw new DotAtStart();
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_EMPTY) {
-            throw new NoDomainPart();
-        }
-        if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN) {
-            throw new DomainHyphened();
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
-            $this->warnings[DeprecatedComment::CODE] = new DeprecatedComment();
-            $this->parseDomainComments();
-        }
+        $this->performDomainStartChecks();
 
         $domain = $this->doParseDomainPart();
 
@@ -77,11 +68,50 @@ class DomainPart extends Parser
         $this->domainPart = $domain;
     }
 
+    private function performDomainStartChecks()
+    {
+        $this->checkInvalidTokensAfterAT();
+        $this->checkEmptyDomain();
+
+        if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+            $this->warnings[DeprecatedComment::CODE] = new DeprecatedComment();
+            $this->parseDomainComments();
+        }
+    }
+
+    private function checkEmptyDomain()
+    {
+        $thereIsNoDomain = $this->lexer->token['type'] === EmailLexer::S_EMPTY ||
+            ($this->lexer->token['type'] === EmailLexer::S_SP &&
+            !$this->lexer->isNextToken(EmailLexer::GENERIC));
+
+        if ($thereIsNoDomain) {
+            throw new NoDomainPart();
+        }
+    }
+
+    private function checkInvalidTokensAfterAT()
+    {
+        if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
+            throw new DotAtStart();
+        }
+        if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN) {
+            throw new DomainHyphened();
+        }
+    }
+
+    /**
+     * @return string
+     */
     public function getDomainPart()
     {
         return $this->domainPart;
     }
 
+    /**
+     * @param string $addressLiteral
+     * @param int $maxGroups
+     */
     public function checkIPV6Tag($addressLiteral, $maxGroups = 8)
     {
         $prev = $this->lexer->getPrevious();
@@ -125,9 +155,13 @@ class DomainPart extends Parser
         }
     }
 
+    /**
+     * @return string
+     */
     protected function doParseDomainPart()
     {
         $domain = '';
+        $label = '';
         $openedParenthesis = 0;
         do {
             $prev = $this->lexer->getPrevious();
@@ -158,7 +192,12 @@ class DomainPart extends Parser
                 $this->parseDomainLiteral();
             }
 
-            $this->checkLabelLength($prev);
+            if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
+                $this->checkLabelLength($label);
+                $label = '';
+            } else {
+                $label .= $this->lexer->token['value'];
+            }
 
             if ($this->isFWS()) {
                 $this->parseFWS();
@@ -166,12 +205,17 @@ class DomainPart extends Parser
 
             $domain .= $this->lexer->token['value'];
             $this->lexer->moveNext();
-        } while ($this->lexer->token);
+            if ($this->lexer->token['type'] === EmailLexer::S_SP) {
+                throw new CharNotAllowed();
+            }
+        } while (null !== $this->lexer->token['type']);
+
+        $this->checkLabelLength($label);
 
         return $domain;
     }
 
-    private function checkNotAllowedChars($token)
+    private function checkNotAllowedChars(array $token)
     {
         $notAllowed = [EmailLexer::S_BACKSLASH => true, EmailLexer::S_SLASH=> true];
         if (isset($notAllowed[$token['type']])) {
@@ -179,6 +223,9 @@ class DomainPart extends Parser
         }
     }
 
+    /**
+     * @return string|false
+     */
     protected function parseDomainLiteral()
     {
         if ($this->lexer->isNextToken(EmailLexer::S_COLON)) {
@@ -195,6 +242,9 @@ class DomainPart extends Parser
         return $this->doParseDomainLiteral();
     }
 
+    /**
+     * @return string|false
+     */
     protected function doParseDomainLiteral()
     {
         $IPv6TAG = false;
@@ -262,6 +312,11 @@ class DomainPart extends Parser
         return $addressLiteral;
     }
 
+    /**
+     * @param string $addressLiteral
+     *
+     * @return string|false
+     */
     protected function checkIPV4Tag($addressLiteral)
     {
         $matchesIP  = array();
@@ -279,16 +334,18 @@ class DomainPart extends Parser
                 return false;
             }
             // Convert IPv4 part to IPv6 format for further testing
-            $addressLiteral = substr($addressLiteral, 0, $index) . '0:0';
+            $addressLiteral = substr($addressLiteral, 0, (int) $index) . '0:0';
         }
 
         return $addressLiteral;
     }
 
-    protected function checkDomainPartExceptions($prev)
+    protected function checkDomainPartExceptions(array $prev)
     {
         $invalidDomainTokens = array(
             EmailLexer::S_DQUOTE => true,
+            EmailLexer::S_SQUOTE => true,
+            EmailLexer::S_BACKTICK => true,
             EmailLexer::S_SEMICOLON => true,
             EmailLexer::S_GREATERTHAN => true,
             EmailLexer::S_LOWERTHAN => true,
@@ -320,6 +377,9 @@ class DomainPart extends Parser
         }
     }
 
+    /**
+     * @return bool
+     */
     protected function hasBrackets()
     {
         if ($this->lexer->token['type'] !== EmailLexer::S_OPENBRACKET) {
@@ -335,16 +395,31 @@ class DomainPart extends Parser
         return true;
     }
 
-    protected function checkLabelLength($prev)
+    /**
+     * @param string $label
+     */
+    protected function checkLabelLength($label)
     {
-        if ($this->lexer->token['type'] === EmailLexer::S_DOT &&
-            $prev['type'] === EmailLexer::GENERIC &&
-            strlen($prev['value']) > 63
-        ) {
+        if ($this->isLabelTooLong($label)) {
             $this->warnings[LabelTooLong::CODE] = new LabelTooLong();
         }
     }
 
+    /**
+     * @param string $label
+     * @return bool
+     */
+    private function isLabelTooLong($label)
+    {
+        if (preg_match('/[^\x00-\x7F]/', $label)) {
+            idn_to_ascii($label, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46, $idnaInfo);
+
+            return (bool) ($idnaInfo['errors'] & IDNA_ERROR_LABEL_TOO_LONG);
+        }
+
+        return strlen($label) > self::LABEL_MAX_LENGTH;
+    }
+
     protected function parseDomainComments()
     {
         $this->isUnclosedComment();
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php
index 8ab16ab4a1f..3c21f34ac07 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php
@@ -5,7 +5,6 @@ namespace Egulias\EmailValidator\Parser;
 use Egulias\EmailValidator\Exception\DotAtEnd;
 use Egulias\EmailValidator\Exception\DotAtStart;
 use Egulias\EmailValidator\EmailLexer;
-use Egulias\EmailValidator\EmailValidator;
 use Egulias\EmailValidator\Exception\ExpectingAT;
 use Egulias\EmailValidator\Exception\ExpectingATEXT;
 use Egulias\EmailValidator\Exception\UnclosedQuotedString;
@@ -20,9 +19,10 @@ class LocalPart extends Parser
         $parseDQuote = true;
         $closingQuote = false;
         $openedParenthesis = 0;
+        $totalLength = 0;
 
-        while ($this->lexer->token['type'] !== EmailLexer::S_AT && $this->lexer->token) {
-            if ($this->lexer->token['type'] === EmailLexer::S_DOT && !$this->lexer->getPrevious()) {
+        while ($this->lexer->token['type'] !== EmailLexer::S_AT && null !== $this->lexer->token['type']) {
+            if ($this->lexer->token['type'] === EmailLexer::S_DOT && null === $this->lexer->getPrevious()['type']) {
                 throw new DotAtStart();
             }
 
@@ -35,12 +35,13 @@ class LocalPart extends Parser
                 $this->parseComments();
                 $openedParenthesis += $this->getOpenedParenthesis();
             }
+
             if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
                 if ($openedParenthesis === 0) {
                     throw new UnopenedComment();
-                } else {
-                    $openedParenthesis--;
                 }
+
+                $openedParenthesis--;
             }
 
             $this->checkConsecutiveDots();
@@ -58,15 +59,18 @@ class LocalPart extends Parser
                 $this->parseFWS();
             }
 
+            $totalLength += strlen($this->lexer->token['value']);
             $this->lexer->moveNext();
         }
 
-        $prev = $this->lexer->getPrevious();
-        if (strlen($prev['value']) > LocalTooLong::LOCAL_PART_LENGTH) {
+        if ($totalLength > LocalTooLong::LOCAL_PART_LENGTH) {
             $this->warnings[LocalTooLong::CODE] = new LocalTooLong();
         }
     }
 
+    /**
+     * @return bool
+     */
     protected function parseDoubleQuote()
     {
         $parseAgain = true;
@@ -86,7 +90,7 @@ class LocalPart extends Parser
 
         $this->lexer->moveNext();
 
-        while ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE && $this->lexer->token) {
+        while ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE && null !== $this->lexer->token['type']) {
             $parseAgain = false;
             if (isset($special[$this->lexer->token['type']]) && $setSpecialsWarning) {
                 $this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
@@ -118,7 +122,10 @@ class LocalPart extends Parser
         return $parseAgain;
     }
 
-    protected function isInvalidToken($token, $closingQuote)
+    /**
+     * @param bool $closingQuote
+     */
+    protected function isInvalidToken(array $token, $closingQuote)
     {
         $forbidden = array(
             EmailLexer::S_COMMA,
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php
index e5042e1a859..ccdc93889a2 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php
@@ -8,7 +8,7 @@ use Egulias\EmailValidator\Exception\ConsecutiveDot;
 use Egulias\EmailValidator\Exception\CRLFAtTheEnd;
 use Egulias\EmailValidator\Exception\CRLFX2;
 use Egulias\EmailValidator\Exception\CRNoLF;
-use Egulias\EmailValidator\Exception\ExpectedQPair;
+use Egulias\EmailValidator\Exception\ExpectingQPair;
 use Egulias\EmailValidator\Exception\ExpectingATEXT;
 use Egulias\EmailValidator\Exception\ExpectingCTEXT;
 use Egulias\EmailValidator\Exception\UnclosedComment;
@@ -21,8 +21,19 @@ use Egulias\EmailValidator\Warning\QuotedString;
 
 abstract class Parser
 {
+    /**
+     * @var array
+     */
     protected $warnings = [];
+
+    /**
+     * @var EmailLexer
+     */
     protected $lexer;
+
+    /**
+     * @var int
+     */
     protected $openedParenthesis = 0;
 
     public function __construct(EmailLexer $lexer)
@@ -30,11 +41,17 @@ abstract class Parser
         $this->lexer = $lexer;
     }
 
+    /**
+     * @return \Egulias\EmailValidator\Warning\Warning[]
+     */
     public function getWarnings()
     {
         return $this->warnings;
     }
 
+    /**
+     * @param string $str
+     */
     abstract public function parse($str);
 
     /** @return int */
@@ -50,7 +67,7 @@ abstract class Parser
     {
         if (!($this->lexer->token['type'] === EmailLexer::INVALID
             || $this->lexer->token['type'] === EmailLexer::C_DEL)) {
-            throw new ExpectedQPair();
+            throw new ExpectingQPair();
         }
 
         $this->warnings[QuotedPart::CODE] =
@@ -80,6 +97,9 @@ abstract class Parser
         }
     }
 
+    /**
+     * @return bool
+     */
     protected function isUnclosedComment()
     {
         try {
@@ -122,6 +142,9 @@ abstract class Parser
         }
     }
 
+    /**
+     * @return bool
+     */
     protected function isFWS()
     {
         if ($this->escaped()) {
@@ -140,11 +163,14 @@ abstract class Parser
         return false;
     }
 
+    /**
+     * @return bool
+     */
     protected function escaped()
     {
         $previous = $this->lexer->getPrevious();
 
-        if ($previous['type'] === EmailLexer::S_BACKSLASH
+        if ($previous && $previous['type'] === EmailLexer::S_BACKSLASH
             &&
             $this->lexer->token['type'] !== EmailLexer::GENERIC
         ) {
@@ -154,6 +180,9 @@ abstract class Parser
         return false;
     }
 
+    /**
+     * @return bool
+     */
     protected function warnEscaping()
     {
         if ($this->lexer->token['type'] !== EmailLexer::S_BACKSLASH) {
@@ -174,6 +203,11 @@ abstract class Parser
 
     }
 
+    /**
+     * @param bool $hasClosingQuote
+     *
+     * @return bool
+     */
     protected function checkDQUOTE($hasClosingQuote)
     {
         if ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE) {
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php
index ecca1dd976a..491082a590f 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php
@@ -4,6 +4,8 @@ namespace Egulias\EmailValidator\Validation;
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Exception\InvalidEmail;
+use Egulias\EmailValidator\Exception\LocalOrReservedDomain;
+use Egulias\EmailValidator\Exception\DomainAcceptsNoMail;
 use Egulias\EmailValidator\Warning\NoDNSMXRecord;
 use Egulias\EmailValidator\Exception\NoDNSRecord;
 
@@ -15,10 +17,23 @@ class DNSCheckValidation implements EmailValidation
     private $warnings = [];
 
     /**
-     * @var InvalidEmail
+     * @var InvalidEmail|null
      */
     private $error;
 
+    /**
+     * @var array
+     */
+    private $mxRecords = [];
+
+
+    public function __construct()
+    {
+        if (!function_exists('idn_to_ascii')) {
+            throw new \LogicException(sprintf('The %s class requires the Intl extension.', __CLASS__));
+        }
+    }
+
     public function isValid($email, EmailLexer $emailLexer)
     {
         // use the input to check DNS if we cannot extract something similar to a domain
@@ -29,7 +44,40 @@ class DNSCheckValidation implements EmailValidation
             $host = substr($email, $lastAtPos + 1);
         }
 
-        return $this->checkDNS($host);
+        // Get the domain parts
+        $hostParts = explode('.', $host);
+
+        // Reserved Top Level DNS Names (https://tools.ietf.org/html/rfc2606#section-2),
+        // mDNS and private DNS Namespaces (https://tools.ietf.org/html/rfc6762#appendix-G)
+        $reservedTopLevelDnsNames = [
+            // Reserved Top Level DNS Names
+            'test',
+            'example',
+            'invalid',
+            'localhost',
+
+            // mDNS
+            'local',
+
+            // Private DNS Namespaces
+            'intranet',
+            'internal',
+            'private',
+            'corp',
+            'home',
+            'lan',
+        ];
+
+        $isLocalDomain = count($hostParts) <= 1;
+        $isReservedTopLevel = in_array($hostParts[(count($hostParts) - 1)], $reservedTopLevelDnsNames, true);
+
+        // Exclude reserved top level DNS names
+        if ($isLocalDomain || $isReservedTopLevel) {
+            $this->error = new LocalOrReservedDomain();
+            return false;
+        }
+
+        return $this->checkDns($host);
     }
 
     public function getError()
@@ -42,20 +90,77 @@ class DNSCheckValidation implements EmailValidation
         return $this->warnings;
     }
 
-    protected function checkDNS($host)
+    /**
+     * @param string $host
+     *
+     * @return bool
+     */
+    protected function checkDns($host)
     {
-        $host = rtrim($host, '.') . '.';
+        $variant = INTL_IDNA_VARIANT_UTS46;
 
-        $Aresult = true;
-        $MXresult = checkdnsrr($host, 'MX');
+        $host = rtrim(idn_to_ascii($host, IDNA_DEFAULT, $variant), '.') . '.';
 
-        if (!$MXresult) {
-            $this->warnings[NoDNSMXRecord::CODE] = new NoDNSMXRecord();
-            $Aresult = checkdnsrr($host, 'A') || checkdnsrr($host, 'AAAA');
-            if (!$Aresult) {
-                $this->error = new NoDNSRecord();
+        return $this->validateDnsRecords($host);
+    }
+
+
+    /**
+     * Validate the DNS records for given host.
+     *
+     * @param string $host A set of DNS records in the format returned by dns_get_record.
+     *
+     * @return bool True on success.
+     */
+    private function validateDnsRecords($host)
+    {
+        // Get all MX, A and AAAA DNS records for host
+        // Using @ as workaround to fix https://bugs.php.net/bug.php?id=73149
+        $dnsRecords = @dns_get_record($host, DNS_MX + DNS_A + DNS_AAAA);
+
+
+        // No MX, A or AAAA DNS records
+        if (empty($dnsRecords)) {
+            $this->error = new NoDNSRecord();
+            return false;
+        }
+
+        // For each DNS record
+        foreach ($dnsRecords as $dnsRecord) {
+            if (!$this->validateMXRecord($dnsRecord)) {
+                return false;
             }
         }
-        return $MXresult || $Aresult;
+
+        // No MX records (fallback to A or AAAA records)
+        if (empty($this->mxRecords)) {
+            $this->warnings[NoDNSMXRecord::CODE] = new NoDNSMXRecord();
+        }
+
+        return true;
+    }
+
+    /**
+     * Validate an MX record
+     *
+     * @param array $dnsRecord Given DNS record.
+     *
+     * @return bool True if valid.
+     */
+    private function validateMxRecord($dnsRecord)
+    {
+        if ($dnsRecord['type'] !== 'MX') {
+            return true;
+        }
+
+        // "Null MX" record indicates the domain accepts no mail (https://tools.ietf.org/html/rfc7505)
+        if (empty($dnsRecord['target']) || $dnsRecord['target'] === '.') {
+            $this->error = new DomainAcceptsNoMail();
+            return false;
+        }
+
+        $this->mxRecords[] = $dnsRecord;
+
+        return true;
     }
 }
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/Exception/EmptyValidationList.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/Exception/EmptyValidationList.php
index 775ad16fb51..ee7c41aa033 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/Exception/EmptyValidationList.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/Exception/EmptyValidationList.php
@@ -6,6 +6,9 @@ use Exception;
 
 class EmptyValidationList extends \InvalidArgumentException
 {
+    /**
+    * @param int $code
+    */
     public function __construct($code = 0, Exception $previous = null)
     {
         parent::__construct("Empty validation list is not allowed", $code, $previous);
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php
index d5e87d8ce06..3be59732664 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php
@@ -9,16 +9,22 @@ class MultipleErrors extends InvalidEmail
     const CODE = 999;
     const REASON = "Accumulated errors for multiple validations";
     /**
-     * @var array
+     * @var InvalidEmail[]
      */
     private $errors = [];
 
+    /**
+     * @param InvalidEmail[] $errors
+     */
     public function __construct(array $errors)
     {
         $this->errors = $errors;
         parent::__construct();
     }
 
+    /**
+     * @return InvalidEmail[]
+     */
     public function getErrors()
     {
         return $this->errors;
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleValidationWithAnd.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleValidationWithAnd.php
index 43fa42a64b7..feb224023da 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleValidationWithAnd.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleValidationWithAnd.php
@@ -30,12 +30,12 @@ class MultipleValidationWithAnd implements EmailValidation
     private $warnings = [];
 
     /**
-     * @var MultipleErrors
+     * @var MultipleErrors|null
      */
     private $error;
 
     /**
-     * @var bool
+     * @var int
      */
     private $mode;
 
@@ -62,7 +62,8 @@ class MultipleValidationWithAnd implements EmailValidation
         $errors = [];
         foreach ($this->validations as $validation) {
             $emailLexer->reset();
-            $result = $result && $validation->isValid($email, $emailLexer);
+            $validationResult = $validation->isValid($email, $emailLexer);
+            $result = $result && $validationResult;
             $this->warnings = array_merge($this->warnings, $validation->getWarnings());
             $errors = $this->addNewError($validation->getError(), $errors);
 
@@ -78,6 +79,12 @@ class MultipleValidationWithAnd implements EmailValidation
         return $result;
     }
 
+    /**
+     * @param \Egulias\EmailValidator\Exception\InvalidEmail|null $possibleError
+     * @param \Egulias\EmailValidator\Exception\InvalidEmail[] $errors
+     *
+     * @return \Egulias\EmailValidator\Exception\InvalidEmail[]
+     */
     private function addNewError($possibleError, array $errors)
     {
         if (null !== $possibleError) {
@@ -87,13 +94,20 @@ class MultipleValidationWithAnd implements EmailValidation
         return $errors;
     }
 
+    /**
+     * @param bool $result
+     *
+     * @return bool
+     */
     private function shouldStop($result)
     {
         return !$result && $this->mode === self::STOP_ON_ERROR;
     }
 
     /**
-     * {@inheritdoc}
+     * Returns the validation errors.
+     *
+     * @return MultipleErrors|null
      */
     public function getError()
     {
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php
index f3656b35a52..6b31e5440ec 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php
@@ -9,7 +9,7 @@ use Egulias\EmailValidator\Validation\Error\RFCWarnings;
 class NoRFCWarningsValidation extends RFCValidation
 {
     /**
-     * @var InvalidEmail
+     * @var InvalidEmail|null
      */
     private $error;
 
@@ -22,8 +22,7 @@ class NoRFCWarningsValidation extends RFCValidation
             return false;
         }
 
-        $ret = $this->getWarnings();
-        if (empty($ret)) {
+        if (empty($this->getWarnings())) {
             return true;
         }
 
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/RFCValidation.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/RFCValidation.php
index c4ffe35034b..8781e0b62d1 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/RFCValidation.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/RFCValidation.php
@@ -9,7 +9,7 @@ use Egulias\EmailValidator\Exception\InvalidEmail;
 class RFCValidation implements EmailValidation
 {
     /**
-     * @var EmailParser
+     * @var EmailParser|null
      */
     private $parser;
 
@@ -19,7 +19,7 @@ class RFCValidation implements EmailValidation
     private $warnings = [];
 
     /**
-     * @var InvalidEmail
+     * @var InvalidEmail|null
      */
     private $error;
 
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php
index 4721f0d8c98..e10bfabd92f 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php
@@ -10,7 +10,7 @@ use \Spoofchecker;
 class SpoofCheckValidation implements EmailValidation
 {
     /**
-     * @var InvalidEmail
+     * @var InvalidEmail|null
      */
     private $error;
 
@@ -21,6 +21,9 @@ class SpoofCheckValidation implements EmailValidation
         }
     }
 
+    /**
+     * @psalm-suppress InvalidArgument
+     */
     public function isValid($email, EmailLexer $emailLexer)
     {
         $checker = new Spoofchecker();
@@ -33,6 +36,9 @@ class SpoofCheckValidation implements EmailValidation
         return $this->error === null;
     }
 
+    /**
+     * @return InvalidEmail|null
+     */
     public function getError()
     {
         return $this->error;
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedPart.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedPart.php
index 7be9e6a3f25..36a4265a515 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedPart.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedPart.php
@@ -6,6 +6,10 @@ class QuotedPart extends Warning
 {
     const CODE = 36;
 
+    /**
+     * @param scalar $prevToken
+     * @param scalar $postToken
+     */
     public function __construct($prevToken, $postToken)
     {
         $this->message = "Deprecated Quoted String found between $prevToken and $postToken";
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedString.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedString.php
index e9d56e1e032..817e4e84b07 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedString.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedString.php
@@ -6,6 +6,10 @@ class QuotedString extends Warning
 {
     const CODE = 11;
 
+    /**
+     * @param scalar $prevToken
+     * @param scalar $postToken
+     */
     public function __construct($prevToken, $postToken)
     {
         $this->message = "Quoted String found between $prevToken and $postToken";
diff --git a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Warning.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Warning.php
index ec6a365ffb7..a2ee7b0de1e 100644
--- a/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Warning.php
+++ b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Warning.php
@@ -5,19 +5,36 @@ namespace Egulias\EmailValidator\Warning;
 abstract class Warning
 {
     const CODE = 0;
-    protected $message;
-    protected $rfcNumber;
 
+    /**
+     * @var string
+     */
+    protected $message = '';
+
+    /**
+     * @var int
+     */
+    protected $rfcNumber = 0;
+
+    /**
+     * @return string
+     */
     public function message()
     {
         return $this->message;
     }
 
+    /**
+     * @return int
+     */
     public function code()
     {
-        return self::CODE;
+        return static::CODE;
     }
 
+    /**
+     * @return int
+     */
     public function RFCNumber()
     {
         return $this->rfcNumber;
diff --git a/htdocs/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php b/htdocs/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
index 399a55230b0..dd3ea768e3b 100644
--- a/htdocs/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
+++ b/htdocs/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
@@ -258,6 +258,11 @@ abstract class AbstractLexer
         $flags = PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE;
         $matches = preg_split($regex, $input, -1, $flags);
 
+        if (false === $matches) {
+            // Work around https://bugs.php.net/78122
+            $matches = array(array($input, 0));
+        }
+
         foreach ($matches as $match) {
             // Must remain before 'value' assignment since it can change content
             $type = $this->getType($match[0]);
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift.php b/htdocs/includes/swiftmailer/lib/classes/Swift.php
index e89703eaebb..51b19c9cb4e 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift.php
@@ -11,15 +11,14 @@
 /**
  * General utility class in Swift Mailer, not to be instantiated.
  *
- *
  * @author Chris Corbyn
  */
 abstract class Swift
 {
-    const VERSION = '6.0.2';
+    const VERSION = '6.3.0';
 
     public static $initialized = false;
-    public static $inits = array();
+    public static $inits = [];
 
     /**
      * Registers an initializer callable that will be called the first time
@@ -57,7 +56,7 @@ abstract class Swift
         if (self::$inits && !self::$initialized) {
             self::$initialized = true;
             foreach (self::$inits as $init) {
-                call_user_func($init);
+                \call_user_func($init);
             }
         }
     }
@@ -74,6 +73,6 @@ abstract class Swift
         if (null !== $callable) {
             self::$inits[] = $callable;
         }
-        spl_autoload_register(array('Swift', 'autoload'));
+        spl_autoload_register(['Swift', 'autoload']);
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder.php
new file mode 100644
index 00000000000..a1704ffb40a
--- /dev/null
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Email address encoder.
+ *
+ * @author Christian Schmidt
+ */
+interface Swift_AddressEncoder
+{
+    /**
+     * Encodes an email address.
+     *
+     * @throws Swift_AddressEncoderException if the email cannot be represented in
+     *                                       the encoding implemented by this class
+     */
+    public function encodeString(string $address): string;
+}
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php
new file mode 100644
index 00000000000..a373ef9d546
--- /dev/null
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An IDN email address encoder.
+ *
+ * Encodes the domain part of an address using IDN. This is compatible will all
+ * SMTP servers.
+ *
+ * This encoder does not support email addresses with non-ASCII characters in
+ * local-part (the substring before @). To send to such addresses, use
+ * Swift_AddressEncoder_Utf8AddressEncoder together with
+ * Swift_Transport_Esmtp_SmtpUtf8Handler. Your outbound SMTP server must support
+ * the SMTPUTF8 extension.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_AddressEncoder_IdnAddressEncoder implements Swift_AddressEncoder
+{
+    /**
+     * Encodes the domain part of an address using IDN.
+     *
+     * @throws Swift_AddressEncoderException If local-part contains non-ASCII characters
+     */
+    public function encodeString(string $address): string
+    {
+        $i = strrpos($address, '@');
+        if (false !== $i) {
+            $local = substr($address, 0, $i);
+            $domain = substr($address, $i + 1);
+
+            if (preg_match('/[^\x00-\x7F]/', $local)) {
+                throw new Swift_AddressEncoderException('Non-ASCII characters not supported in local-part', $address);
+            }
+
+            if (preg_match('/[^\x00-\x7F]/', $domain)) {
+                $address = sprintf('%s@%s', $local, idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46));
+            }
+        }
+
+        return $address;
+    }
+}
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php
new file mode 100644
index 00000000000..1b454305678
--- /dev/null
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A UTF-8 email address encoder.
+ *
+ * Returns the email address verbatimly in UTF-8 as permitted by RFC 6531 and
+ * RFC 6532. It supports addresses containing non-ASCII characters in both
+ * local-part and domain (i.e. on both sides of @).
+ *
+ * This encoder must be used together with Swift_Transport_Esmtp_SmtpUtf8Handler
+ * and requires that the outbound SMTP server supports the SMTPUTF8 extension.
+ *
+ * If your outbound SMTP server does not support SMTPUTF8, use
+ * Swift_AddressEncoder_IdnAddressEncoder instead. This allows sending to email
+ * addresses with non-ASCII characters in the domain, but not in local-part.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_AddressEncoder_Utf8AddressEncoder implements Swift_AddressEncoder
+{
+    /**
+     * Returns the address verbatimly.
+     */
+    public function encodeString(string $address): string
+    {
+        return $address;
+    }
+}
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoderException.php b/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoderException.php
new file mode 100644
index 00000000000..9b405476bcb
--- /dev/null
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/AddressEncoderException.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * AddressEncoderException when the specified email address is in a format that
+ * cannot be encoded by a given address encoder.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_AddressEncoderException extends Swift_RfcComplianceException
+{
+    protected $address;
+
+    public function __construct(string $message, string $address)
+    {
+        parent::__construct($message);
+
+        $this->address = $address;
+    }
+
+    public function getAddress(): string
+    {
+        return $this->address;
+    }
+}
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Attachment.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Attachment.php
index 1fb232c9fe6..7a1420f7986 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Attachment.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Attachment.php
@@ -26,17 +26,14 @@ class Swift_Attachment extends Swift_Mime_Attachment
      */
     public function __construct($data = null, $filename = null, $contentType = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Mime_Attachment::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Mime_Attachment::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.attachment')
             );
 
-        $this->setBody($data);
+        $this->setBody($data, $contentType);
         $this->setFilename($filename);
-        if ($contentType) {
-            $this->setContentType($contentType);
-        }
     }
 
     /**
@@ -45,7 +42,7 @@ class Swift_Attachment extends Swift_Mime_Attachment
      * @param string $path
      * @param string $contentType optional
      *
-     * @return Swift_Mime_Attachment
+     * @return self
      */
     public static function fromPath($path, $contentType = null)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
index bfd2c79bcbd..3a69c15f1c4 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
@@ -25,7 +25,7 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      *
      * @var Swift_StreamFilter[]
      */
-    private $filters = array();
+    private $filters = [];
 
     /**
      * A buffer for writing.
@@ -37,7 +37,7 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      *
      * @var Swift_InputByteStream[]
      */
-    private $mirrors = array();
+    private $mirrors = [];
 
     /**
      * Commit the given bytes to the storage medium immediately.
@@ -54,8 +54,7 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
     /**
      * Add a StreamFilter to this InputByteStream.
      *
-     * @param Swift_StreamFilter $filter
-     * @param string             $key
+     * @param string $key
      */
     public function addFilter(Swift_StreamFilter $filter, $key)
     {
@@ -110,8 +109,6 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
@@ -124,14 +121,12 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
         foreach ($this->mirrors as $k => $stream) {
             if ($is === $stream) {
-                if ($this->writeBuffer !== '') {
+                if ('' !== $this->writeBuffer) {
                     $stream->write($this->writeBuffer);
                 }
                 unset($this->mirrors[$k]);
@@ -147,7 +142,7 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      */
     public function flushBuffers()
     {
-        if ($this->writeBuffer !== '') {
+        if ('' !== $this->writeBuffer) {
             $this->doWrite($this->writeBuffer);
         }
         $this->flush();
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
index 31b85e0e02a..4f3dcc37745 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
@@ -20,7 +20,7 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      *
      * @var string[]
      */
-    private $array = array();
+    private $array = [];
 
     /**
      * The size of the stack.
@@ -41,7 +41,7 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      *
      * @var Swift_InputByteStream[]
      */
-    private $mirrors = array();
+    private $mirrors = [];
 
     /**
      * Create a new ArrayByteStream.
@@ -52,13 +52,13 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      */
     public function __construct($stack = null)
     {
-        if (is_array($stack)) {
+        if (\is_array($stack)) {
             $this->array = $stack;
-            $this->arraySize = count($stack);
-        } elseif (is_string($stack)) {
+            $this->arraySize = \count($stack);
+        } elseif (\is_string($stack)) {
             $this->write($stack);
         } else {
-            $this->array = array();
+            $this->array = [];
         }
     }
 
@@ -102,7 +102,7 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
         foreach ($to_add as $value) {
             $this->array[] = $value;
         }
-        $this->arraySize = count($this->array);
+        $this->arraySize = \count($this->array);
 
         foreach ($this->mirrors as $stream) {
             $stream->write($bytes);
@@ -121,8 +121,6 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
@@ -135,8 +133,6 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
@@ -172,7 +168,7 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
     public function flushBuffers()
     {
         $this->offset = 0;
-        $this->array = array();
+        $this->array = [];
         $this->arraySize = 0;
 
         foreach ($this->mirrors as $stream) {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
index 61f820e5a14..f6391219e71 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
@@ -81,7 +81,7 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
 
             // If we read one byte after reaching the end of the file
             // feof() will return false and an empty string is returned
-            if ($bytes === '' && feof($fp)) {
+            if ((false === $bytes || '' === $bytes) && feof($fp)) {
                 $this->resetReadHandle();
 
                 return false;
@@ -131,7 +131,7 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
                 throw new Swift_IoException('Unable to open file for reading ['.$this->path.']');
             }
             $this->reader = $pointer;
-            if ($this->offset != 0) {
+            if (0 != $this->offset) {
                 $this->getReadStreamSeekableStatus();
                 $this->seekReadStreamToPosition($this->offset);
             }
@@ -145,9 +145,7 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
     {
         if (!isset($this->writer)) {
             if (!$this->writer = fopen($this->path, $this->mode)) {
-                throw new Swift_IoException(
-                    'Unable to open file for writing ['.$this->path.']'
-                );
+                throw new Swift_IoException('Unable to open file for writing ['.$this->path.']');
             }
         }
 
@@ -173,10 +171,10 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
     /** Streams in a readOnly stream ensuring copy if needed */
     private function seekReadStreamToPosition($offset)
     {
-        if ($this->seekable === null) {
+        if (null === $this->seekable) {
             $this->getReadStreamSeekableStatus();
         }
-        if ($this->seekable === false) {
+        if (false === $this->seekable) {
             $currentPos = ftell($this->reader);
             if ($currentPos < $offset) {
                 $toDiscard = $offset - $currentPos;
@@ -194,7 +192,7 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
     {
         if ($tmpFile = fopen('php://temp/maxmemory:4096', 'w+b')) {
             /* We have opened a php:// Stream Should work without problem */
-        } elseif (function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()) && ($tmpFile = tmpfile())) {
+        } elseif (\function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()) && ($tmpFile = tmpfile())) {
             /* We have opened a tmpfile */
         } else {
             throw new Swift_IoException('Unable to copy the file to make it seekable, sys_temp_dir is not writable, php://memory not available');
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
index 1c9a80c0376..0dc61909d31 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
@@ -17,7 +17,7 @@ class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByte
     {
         $filePath = tempnam(sys_get_temp_dir(), 'FileByteStream');
 
-        if ($filePath === false) {
+        if (false === $filePath) {
             throw new Swift_IoException('Failed to retrieve temporary file name.');
         }
 
@@ -26,7 +26,7 @@ class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByte
 
     public function getContent()
     {
-        if (($content = file_get_contents($this->getPath())) === false) {
+        if (false === ($content = file_get_contents($this->getPath()))) {
             throw new Swift_IoException('Failed to get temporary file content.');
         }
 
@@ -39,4 +39,14 @@ class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByte
             @unlink($this->getPath());
         }
     }
+
+    public function __sleep()
+    {
+        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
+    }
+
+    public function __wakeup()
+    {
+        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+    }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
index b09bb5b6c38..3e055afd9dc 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
@@ -45,7 +45,7 @@ class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterRe
      */
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
     {
-        $strlen = strlen($string);
+        $strlen = \strlen($string);
         // % and / are CPU intensive, so, maybe find a better way
         $ignored = $strlen % $this->width;
         $ignoredChars = $ignored ? substr($string, -$ignored) : '';
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
index 67da48f6cb0..ffc05f7166a 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
@@ -27,7 +27,7 @@ class Swift_CharacterReader_UsAsciiReader implements Swift_CharacterReader
      */
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
     {
-        $strlen = strlen($string);
+        $strlen = \strlen($string);
         $ignoredChars = '';
         for ($i = 0; $i < $strlen; ++$i) {
             if ($string[$i] > "\x07F") {
@@ -65,7 +65,7 @@ class Swift_CharacterReader_UsAsciiReader implements Swift_CharacterReader
     public function validateByteSequence($bytes, $size)
     {
         $byte = reset($bytes);
-        if (1 == count($bytes) && $byte >= 0x00 && $byte <= 0x7F) {
+        if (1 == \count($bytes) && $byte >= 0x00 && $byte <= 0x7F) {
             return 0;
         }
 
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
index 22746bd8575..da37e0da9ab 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
@@ -17,8 +17,8 @@
 class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
 {
     /** Pre-computed for optimization */
-    private static $length_map = array(
-        // N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F,
+    private static $length_map = [
+        // N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x0N
         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x1N
         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x2N
@@ -34,10 +34,10 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
         2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xCN
         2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xDN
         3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 0xEN
-        4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0,  // 0xFN
-    );
+        4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0, // 0xFN
+    ];
 
-    private static $s_length_map = array(
+    private static $s_length_map = [
         "\x00" => 1, "\x01" => 1, "\x02" => 1, "\x03" => 1, "\x04" => 1, "\x05" => 1, "\x06" => 1, "\x07" => 1,
         "\x08" => 1, "\x09" => 1, "\x0a" => 1, "\x0b" => 1, "\x0c" => 1, "\x0d" => 1, "\x0e" => 1, "\x0f" => 1,
         "\x10" => 1, "\x11" => 1, "\x12" => 1, "\x13" => 1, "\x14" => 1, "\x15" => 1, "\x16" => 1, "\x17" => 1,
@@ -70,7 +70,7 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
         "\xe8" => 3, "\xe9" => 3, "\xea" => 3, "\xeb" => 3, "\xec" => 3, "\xed" => 3, "\xee" => 3, "\xef" => 3,
         "\xf0" => 4, "\xf1" => 4, "\xf2" => 4, "\xf3" => 4, "\xf4" => 4, "\xf5" => 4, "\xf6" => 4, "\xf7" => 4,
         "\xf8" => 5, "\xf9" => 5, "\xfa" => 5, "\xfb" => 5, "\xfc" => 6, "\xfd" => 6, "\xfe" => 0, "\xff" => 0,
-     );
+     ];
 
     /**
      * Returns the complete character map.
@@ -85,22 +85,22 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
     {
         if (!isset($currentMap['i']) || !isset($currentMap['p'])) {
-            $currentMap['p'] = $currentMap['i'] = array();
+            $currentMap['p'] = $currentMap['i'] = [];
         }
 
-        $strlen = strlen($string);
-        $charPos = count($currentMap['p']);
+        $strlen = \strlen($string);
+        $charPos = \count($currentMap['p']);
         $foundChars = 0;
         $invalid = false;
         for ($i = 0; $i < $strlen; ++$i) {
             $char = $string[$i];
             $size = self::$s_length_map[$char];
-            if ($size == 0) {
+            if (0 == $size) {
                 /* char is invalid, we must wait for a resync */
                 $invalid = true;
                 continue;
             } else {
-                if ($invalid == true) {
+                if (true === $invalid) {
                     /* We mark the chars as invalid and start a new char */
                     $currentMap['p'][$charPos + $foundChars] = $startOffset + $i;
                     $currentMap['i'][$charPos + $foundChars] = true;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
index f3641f46b46..86900894ab1 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
@@ -20,14 +20,14 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
      *
      * @var array
      */
-    private static $map = array();
+    private static $map = [];
 
     /**
      * Factories which have already been loaded.
      *
      * @var Swift_CharacterReaderFactory[]
      */
-    private static $loaded = array();
+    private static $loaded = [];
 
     /**
      * Creates a new CharacterReaderFactory.
@@ -44,32 +44,32 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
 
     public function init()
     {
-        if (count(self::$map) > 0) {
+        if (\count(self::$map) > 0) {
             return;
         }
 
         $prefix = 'Swift_CharacterReader_';
 
-        $singleByte = array(
+        $singleByte = [
             'class' => $prefix.'GenericFixedWidthReader',
-            'constructor' => array(1),
-            );
+            'constructor' => [1],
+            ];
 
-        $doubleByte = array(
+        $doubleByte = [
             'class' => $prefix.'GenericFixedWidthReader',
-            'constructor' => array(2),
-            );
+            'constructor' => [2],
+            ];
 
-        $fourBytes = array(
+        $fourBytes = [
             'class' => $prefix.'GenericFixedWidthReader',
-            'constructor' => array(4),
-            );
+            'constructor' => [4],
+            ];
 
         // Utf-8
-        self::$map['utf-?8'] = array(
+        self::$map['utf-?8'] = [
             'class' => $prefix.'Utf8Reader',
-            'constructor' => array(),
-            );
+            'constructor' => [],
+            ];
 
         //7-8 bit charsets
         self::$map['(us-)?ascii'] = $singleByte;
@@ -103,11 +103,11 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
      */
     public function getReaderFor($charset)
     {
-        $charset = strtolower(trim($charset));
+        $charset = strtolower(trim($charset ?? ''));
         foreach (self::$map as $pattern => $spec) {
             $re = '/^'.$pattern.'$/D';
             if (preg_match($re, $charset)) {
-                if (!array_key_exists($pattern, self::$loaded)) {
+                if (!\array_key_exists($pattern, self::$loaded)) {
                     $reflector = new ReflectionClass($spec['class']);
                     if ($reflector->getConstructor()) {
                         $reader = $reflector->newInstanceArgs($spec['constructor']);
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream.php
index 717924f5d63..c9d8a078ee0 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream.php
@@ -28,8 +28,6 @@ interface Swift_CharacterStream
 
     /**
      * Set the CharacterReaderFactory for multi charset support.
-     *
-     * @param Swift_CharacterReaderFactory $factory
      */
     public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory);
 
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
index e43bd2ed510..5c2869455b8 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
@@ -31,10 +31,10 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
     private $charset;
 
     /** Array of characters */
-    private $array = array();
+    private $array = [];
 
     /** Size of the array of character */
-    private $array_size = array();
+    private $array_size = [];
 
     /** The current character offset in the stream */
     private $offset = 0;
@@ -65,8 +65,6 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
 
     /**
      * Set the CharacterReaderFactory for multi charset support.
-     *
-     * @param Swift_CharacterReaderFactory $factory
      */
     public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory)
     {
@@ -87,16 +85,16 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
 
         $startLength = $this->charReader->getInitialByteSize();
         while (false !== $bytes = $os->read($startLength)) {
-            $c = array();
-            for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
+            $c = [];
+            for ($i = 0, $len = \strlen($bytes); $i < $len; ++$i) {
                 $c[] = self::$byteMap[$bytes[$i]];
             }
-            $size = count($c);
+            $size = \count($c);
             $need = $this->charReader
                 ->validateByteSequence($c, $size);
             if ($need > 0 &&
                 false !== $bytes = $os->read($need)) {
-                for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
+                for ($i = 0, $len = \strlen($bytes); $i < $len; ++$i) {
                     $c[] = self::$byteMap[$bytes[$i]];
                 }
             }
@@ -132,7 +130,7 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
         }
 
         // Don't use array slice
-        $arrays = array();
+        $arrays = [];
         $end = $length + $this->offset;
         for ($i = $this->offset; $i < $end; ++$i) {
             if (!isset($this->array[$i])) {
@@ -162,7 +160,7 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
         if ($this->offset == $this->array_size) {
             return false;
         }
-        $arrays = array();
+        $arrays = [];
         $end = $length + $this->offset;
         for ($i = $this->offset; $i < $end; ++$i) {
             if (!isset($this->array[$i])) {
@@ -172,7 +170,7 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
         }
         $this->offset += ($i - $this->offset); // Limit function calls
 
-        return call_user_func_array('array_merge', $arrays);
+        return array_merge(...$arrays);
     }
 
     /**
@@ -194,19 +192,19 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
         unset($chars);
         fseek($fp, 0, SEEK_SET);
 
-        $buffer = array(0);
+        $buffer = [0];
         $buf_pos = 1;
         $buf_len = 1;
         $has_datas = true;
         do {
-            $bytes = array();
+            $bytes = [];
             // Buffer Filing
             if ($buf_len - $buf_pos < $startLength) {
                 $buf = array_splice($buffer, $buf_pos);
                 $new = $this->reloadBuffer($fp, 100);
                 if ($new) {
                     $buffer = array_merge($buf, $new);
-                    $buf_len = count($buffer);
+                    $buf_len = \count($buffer);
                     $buf_pos = 0;
                 } else {
                     $has_datas = false;
@@ -226,7 +224,7 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
 
                         if ($new) {
                             $buffer = array_merge($buffer, $new);
-                            $buf_len = count($buffer);
+                            $buf_len = \count($buffer);
                         }
                     }
                     for ($i = 0; $i < $need && isset($buffer[$buf_pos]); ++$i) {
@@ -262,15 +260,15 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
     public function flushContents()
     {
         $this->offset = 0;
-        $this->array = array();
+        $this->array = [];
         $this->array_size = 0;
     }
 
     private function reloadBuffer($fp, $len)
     {
-        if (!feof($fp) && ($bytes = fread($fp, $len)) !== false) {
-            $buf = array();
-            for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
+        if (!feof($fp) && false !== ($bytes = fread($fp, $len))) {
+            $buf = [];
+            for ($i = 0, $len = \strlen($bytes); $i < $len; ++$i) {
                 $buf[] = self::$byteMap[$bytes[$i]];
             }
 
@@ -283,9 +281,9 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
     private static function initializeMaps()
     {
         if (!isset(self::$charMap)) {
-            self::$charMap = array();
+            self::$charMap = [];
             for ($byte = 0; $byte < 256; ++$byte) {
-                self::$charMap[$byte] = chr($byte);
+                self::$charMap[$byte] = \chr($byte);
             }
             self::$byteMap = array_flip(self::$charMap);
         }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
index 0d62fa68ff3..7578dda9cac 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
@@ -81,8 +81,7 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
     /**
      * Constructor.
      *
-     * @param Swift_CharacterReaderFactory $factory
-     * @param string                       $charset
+     * @param string $charset
      */
     public function __construct(Swift_CharacterReaderFactory $factory, $charset)
     {
@@ -106,8 +105,6 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
 
     /**
      * Set the CharacterReaderFactory for multi charset support.
-     *
-     * @param Swift_CharacterReaderFactory $factory
      */
     public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory)
     {
@@ -128,8 +125,6 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
 
     /**
      * @see Swift_CharacterStream::importByteStream()
-     *
-     * @param Swift_OutputByteStream $os
      */
     public function importByteStream(Swift_OutputByteStream $os)
     {
@@ -220,7 +215,7 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
     public function readBytes($length)
     {
         $read = $this->read($length);
-        if ($read !== false) {
+        if (false !== $read) {
             $ret = array_map('ord', str_split($read, 1));
 
             return $ret;
@@ -252,16 +247,16 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
         if (!isset($this->charReader)) {
             $this->charReader = $this->charReaderFactory->getReaderFor(
                 $this->charset);
-            $this->map = array();
+            $this->map = [];
             $this->mapType = $this->charReader->getMapType();
         }
         $ignored = '';
         $this->datas .= $chars;
         $this->charCount += $this->charReader->getCharPositions(substr($this->datas, $this->datasSize), $this->datasSize, $this->map, $ignored);
-        if ($ignored !== false) {
-            $this->datasSize = strlen($this->datas) - strlen($ignored);
+        if (false !== $ignored) {
+            $this->datasSize = \strlen($this->datas) - \strlen($ignored);
         } else {
-            $this->datasSize = strlen($this->datas);
+            $this->datasSize = \strlen($this->datas);
         }
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php b/htdocs/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php
index b1bc3306f22..3cc885ec03b 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/DependencyContainer.php
@@ -16,22 +16,25 @@
 class Swift_DependencyContainer
 {
     /** Constant for literal value types */
-    const TYPE_VALUE = 0x0001;
+    const TYPE_VALUE = 0x00001;
 
     /** Constant for new instance types */
-    const TYPE_INSTANCE = 0x0010;
+    const TYPE_INSTANCE = 0x00010;
 
     /** Constant for shared instance types */
-    const TYPE_SHARED = 0x0100;
+    const TYPE_SHARED = 0x00100;
 
     /** Constant for aliases */
-    const TYPE_ALIAS = 0x1000;
+    const TYPE_ALIAS = 0x01000;
+
+    /** Constant for arrays */
+    const TYPE_ARRAY = 0x10000;
 
     /** Singleton instance */
     private static $instance = null;
 
     /** The data container */
-    private $store = array();
+    private $store = [];
 
     /** The current endpoint in the data container */
     private $endPoint;
@@ -80,7 +83,7 @@ class Swift_DependencyContainer
      */
     public function has($itemName)
     {
-        return array_key_exists($itemName, $this->store)
+        return \array_key_exists($itemName, $this->store)
             && isset($this->store[$itemName]['lookupType']);
     }
 
@@ -98,9 +101,7 @@ class Swift_DependencyContainer
     public function lookup($itemName)
     {
         if (!$this->has($itemName)) {
-            throw new Swift_DependencyException(
-                'Cannot lookup dependency "'.$itemName.'" since it is not registered.'
-                );
+            throw new Swift_DependencyException('Cannot lookup dependency "'.$itemName.'" since it is not registered.');
         }
 
         switch ($this->store[$itemName]['lookupType']) {
@@ -112,6 +113,8 @@ class Swift_DependencyContainer
                 return $this->createNewInstance($itemName);
             case self::TYPE_SHARED:
                 return $this->createSharedInstance($itemName);
+            case self::TYPE_ARRAY:
+                return $this->createDependenciesFor($itemName);
         }
     }
 
@@ -124,7 +127,7 @@ class Swift_DependencyContainer
      */
     public function createDependenciesFor($itemName)
     {
-        $args = array();
+        $args = [];
         if (isset($this->store[$itemName]['args'])) {
             $args = $this->resolveArgs($this->store[$itemName]['args']);
         }
@@ -147,7 +150,7 @@ class Swift_DependencyContainer
      */
     public function register($itemName)
     {
-        $this->store[$itemName] = array();
+        $this->store[$itemName] = [];
         $this->endPoint = &$this->store[$itemName];
 
         return $this;
@@ -227,6 +230,21 @@ class Swift_DependencyContainer
         return $this;
     }
 
+    /**
+     * Specify the previously registered item as array of dependencies.
+     *
+     * {@link register()} must be called before this will work.
+     *
+     * @return $this
+     */
+    public function asArray()
+    {
+        $endPoint = &$this->getEndPoint();
+        $endPoint['lookupType'] = self::TYPE_ARRAY;
+
+        return $this;
+    }
+
     /**
      * Specify a list of injected dependencies for the previously registered item.
      *
@@ -234,14 +252,12 @@ class Swift_DependencyContainer
      *
      * @see addConstructorValue(), addConstructorLookup()
      *
-     * @param array $lookups
-     *
      * @return $this
      */
     public function withDependencies(array $lookups)
     {
         $endPoint = &$this->getEndPoint();
-        $endPoint['args'] = array();
+        $endPoint['args'] = [];
         foreach ($lookups as $lookup) {
             $this->addConstructorLookup($lookup);
         }
@@ -263,9 +279,9 @@ class Swift_DependencyContainer
     {
         $endPoint = &$this->getEndPoint();
         if (!isset($endPoint['args'])) {
-            $endPoint['args'] = array();
+            $endPoint['args'] = [];
         }
-        $endPoint['args'][] = array('type' => 'value', 'item' => $value);
+        $endPoint['args'][] = ['type' => 'value', 'item' => $value];
 
         return $this;
     }
@@ -284,9 +300,9 @@ class Swift_DependencyContainer
     {
         $endPoint = &$this->getEndPoint();
         if (!isset($this->endPoint['args'])) {
-            $endPoint['args'] = array();
+            $endPoint['args'] = [];
         }
-        $endPoint['args'][] = array('type' => 'lookup', 'item' => $lookup);
+        $endPoint['args'][] = ['type' => 'lookup', 'item' => $lookup];
 
         return $this;
     }
@@ -330,9 +346,7 @@ class Swift_DependencyContainer
     private function &getEndPoint()
     {
         if (!isset($this->endPoint)) {
-            throw new BadMethodCallException(
-                'Component must first be registered by calling register()'
-                );
+            throw new BadMethodCallException('Component must first be registered by calling register()');
         }
 
         return $this->endPoint;
@@ -341,7 +355,7 @@ class Swift_DependencyContainer
     /** Get an argument list with dependencies resolved */
     private function resolveArgs(array $args)
     {
-        $resolved = array();
+        $resolved = [];
         foreach ($args as $argDefinition) {
             switch ($argDefinition['type']) {
                 case 'lookup':
@@ -359,8 +373,8 @@ class Swift_DependencyContainer
     /** Resolve a single dependency with an collections */
     private function lookupRecursive($item)
     {
-        if (is_array($item)) {
-            $collection = array();
+        if (\is_array($item)) {
+            $collection = [];
             foreach ($item as $k => $v) {
                 $collection[$k] = $this->lookupRecursive($v);
             }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php b/htdocs/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php
index 9755a88e176..30fc68ab03e 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/EmbeddedFile.php
@@ -26,8 +26,8 @@ class Swift_EmbeddedFile extends Swift_Mime_EmbeddedFile
      */
     public function __construct($data = null, $filename = null, $contentType = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Mime_EmbeddedFile::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Mime_EmbeddedFile::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.embeddedfile')
             );
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
index 0e7b2a1b0c8..b1eedaa051b 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
@@ -34,7 +34,7 @@ class Swift_Encoder_Base64Encoder implements Swift_Encoder
             $maxLineLength = 76;
         }
 
-        $encodedString = base64_encode($string);
+        $encodedString = base64_encode($string ?? '');
         $firstLine = '';
 
         if (0 != $firstLineOffset) {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
index b23b07702ef..f078d6d7c38 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
@@ -36,7 +36,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      *
      * @var string[]
      */
-    protected static $qpMap = array(
+    protected static $qpMap = [
         0 => '=00', 1 => '=01', 2 => '=02', 3 => '=03', 4 => '=04',
         5 => '=05', 6 => '=06', 7 => '=07', 8 => '=08', 9 => '=09',
         10 => '=0A', 11 => '=0B', 12 => '=0C', 13 => '=0D', 14 => '=0E',
@@ -89,16 +89,16 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
         245 => '=F5', 246 => '=F6', 247 => '=F7', 248 => '=F8', 249 => '=F9',
         250 => '=FA', 251 => '=FB', 252 => '=FC', 253 => '=FD', 254 => '=FE',
         255 => '=FF',
-        );
+        ];
 
-    protected static $safeMapShare = array();
+    protected static $safeMapShare = [];
 
     /**
      * A map of non-encoded ascii characters.
      *
      * @var string[]
      */
-    protected $safeMap = array();
+    protected $safeMap = [];
 
     /**
      * Creates a new QpEncoder for the given CharacterStream.
@@ -120,7 +120,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
 
     public function __sleep()
     {
-        return array('charStream', 'filter');
+        return ['charStream', 'filter'];
     }
 
     public function __wakeup()
@@ -135,14 +135,14 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
 
     protected function getSafeMapShareId()
     {
-        return get_class($this);
+        return static::class;
     }
 
     protected function initSafeMap()
     {
         foreach (array_merge(
-            array(0x09, 0x20), range(0x21, 0x3C), range(0x3E, 0x7E)) as $byte) {
-            $this->safeMap[$byte] = chr($byte);
+            [0x09, 0x20], range(0x21, 0x3C), range(0x3E, 0x7E)) as $byte) {
+            $this->safeMap[$byte] = \chr($byte);
         }
     }
 
@@ -153,9 +153,9 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      * If the first line needs to be shorter, indicate the difference with
      * $firstLineOffset.
      *
-     * @param string $string           to encode
-     * @param int    $firstLineOffset, optional
-     * @param int    $maxLineLength,   optional 0 indicates the default of 76 chars
+     * @param string $string          to encode
+     * @param int    $firstLineOffset optional
+     * @param int    $maxLineLength   optional 0 indicates the default of 76 chars
      *
      * @return string
      */
@@ -167,7 +167,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
 
         $thisLineLength = $maxLineLength - $firstLineOffset;
 
-        $lines = array();
+        $lines = [];
         $lNo = 0;
         $lines[$lNo] = '';
         $currentLine = &$lines[$lNo++];
@@ -200,7 +200,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
             $enc = $this->encodeByteSequence($bytes, $size);
 
             $i = strpos($enc, '=0D=0A');
-            $newLineLength = $lineLen + ($i === false ? $size : $i);
+            $newLineLength = $lineLen + (false === $i ? $size : $i);
 
             if ($currentLine && $newLineLength >= $thisLineLength) {
                 $lines[$lNo] = '';
@@ -211,7 +211,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
 
             $currentLine .= $enc;
 
-            if ($i === false) {
+            if (false === $i) {
                 $lineLen += $size;
             } else {
                 // 6 is the length of '=0D=0A'.
@@ -278,10 +278,10 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      */
     protected function standardize($string)
     {
-        $string = str_replace(array("\t=0D=0A", ' =0D=0A', '=0D=0A'),
-            array("=09\r\n", "=20\r\n", "\r\n"), $string
+        $string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'],
+            ["=09\r\n", "=20\r\n", "\r\n"], $string
             );
-        switch ($end = ord(substr($string, -1))) {
+        switch ($end = \ord(substr($string, -1))) {
             case 0x09:
             case 0x20:
                 $string = substr_replace($string, self::$qpMap[$end], -1);
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
index bebb13494bd..7eac36813e0 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
@@ -24,8 +24,6 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
 
     /**
      * Creates a new Rfc2231Encoder using the given character stream instance.
-     *
-     * @param Swift_CharacterStream
      */
     public function __construct(Swift_CharacterStream $charStream)
     {
@@ -44,7 +42,7 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        $lines = array();
+        $lines = [];
         $lineCount = 0;
         $lines[] = '';
         $currentLine = &$lines[$lineCount++];
@@ -60,8 +58,8 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
 
         while (false !== $char = $this->charStream->read(4)) {
             $encodedChar = rawurlencode($char);
-            if (0 != strlen($currentLine)
-                && strlen($currentLine.$encodedChar) > $thisLineLength) {
+            if (0 != \strlen($currentLine)
+                && \strlen($currentLine.$encodedChar) > $thisLineLength) {
                 $lines[] = '';
                 $currentLine = &$lines[$lineCount++];
                 $thisLineLength = $maxLineLength;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
index 9834aa95883..18994c184f3 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
@@ -27,16 +27,15 @@ class Swift_Events_CommandEvent extends Swift_Events_EventObject
      *
      * @var int[]
      */
-    private $successCodes = array();
+    private $successCodes = [];
 
     /**
      * Create a new CommandEvent for $source with $command.
      *
-     * @param Swift_Transport $source
-     * @param string          $command
-     * @param array           $successCodes
+     * @param string $command
+     * @param array  $successCodes
      */
-    public function __construct(Swift_Transport $source, $command, $successCodes = array())
+    public function __construct(Swift_Transport $source, $command, $successCodes = [])
     {
         parent::__construct($source);
         $this->command = $command;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php
index 7545404e765..b158eab462a 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/CommandListener.php
@@ -17,8 +17,6 @@ interface Swift_Events_CommandListener extends Swift_Events_EventListener
 {
     /**
      * Invoked immediately following a command being sent.
-     *
-     * @param Swift_Events_CommandEvent $evt
      */
     public function commandSent(Swift_Events_CommandEvent $evt);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
index f602608eeb6..df25a124863 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
@@ -18,9 +18,6 @@ interface Swift_Events_EventDispatcher
     /**
      * Create a new SendEvent for $source and $message.
      *
-     * @param Swift_Transport $source
-     * @param Swift_Mime_SimpleMessage
-     *
      * @return Swift_Events_SendEvent
      */
     public function createSendEvent(Swift_Transport $source, Swift_Mime_SimpleMessage $message);
@@ -28,20 +25,18 @@ interface Swift_Events_EventDispatcher
     /**
      * Create a new CommandEvent for $source and $command.
      *
-     * @param Swift_Transport $source
-     * @param string          $command      That will be executed
-     * @param array           $successCodes That are needed
+     * @param string $command      That will be executed
+     * @param array  $successCodes That are needed
      *
      * @return Swift_Events_CommandEvent
      */
-    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = array());
+    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = []);
 
     /**
      * Create a new ResponseEvent for $source and $response.
      *
-     * @param Swift_Transport $source
-     * @param string          $response
-     * @param bool            $valid    If the response is valid
+     * @param string $response
+     * @param bool   $valid    If the response is valid
      *
      * @return Swift_Events_ResponseEvent
      */
@@ -50,8 +45,6 @@ interface Swift_Events_EventDispatcher
     /**
      * Create a new TransportChangeEvent for $source.
      *
-     * @param Swift_Transport $source
-     *
      * @return Swift_Events_TransportChangeEvent
      */
     public function createTransportChangeEvent(Swift_Transport $source);
@@ -59,25 +52,19 @@ interface Swift_Events_EventDispatcher
     /**
      * Create a new TransportExceptionEvent for $source.
      *
-     * @param Swift_Transport          $source
-     * @param Swift_TransportException $ex
-     *
      * @return Swift_Events_TransportExceptionEvent
      */
     public function createTransportExceptionEvent(Swift_Transport $source, Swift_TransportException $ex);
 
     /**
      * Bind an event listener to this dispatcher.
-     *
-     * @param Swift_Events_EventListener $listener
      */
     public function bindEventListener(Swift_Events_EventListener $listener);
 
     /**
      * Dispatch the given Event to all suitable listeners.
      *
-     * @param Swift_Events_EventObject $evt
-     * @param string                   $target method
+     * @param string $target method
      */
     public function dispatchEvent(Swift_Events_EventObject $evt, $target);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php
index 21e7c8127d6..24a11f44e23 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/EventObject.php
@@ -43,8 +43,6 @@ class Swift_Events_EventObject implements Swift_Events_Event
 
     /**
      * Prevent this Event from bubbling any further up the stack.
-     *
-     * @param bool $cancel, optional
      */
     public function cancelBubble($cancel = true)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
index 5ae6c04b627..ff7c37116ba 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
@@ -32,9 +32,8 @@ class Swift_Events_ResponseEvent extends Swift_Events_EventObject
     /**
      * Create a new ResponseEvent for $source and $response.
      *
-     * @param Swift_Transport $source
-     * @param string          $response
-     * @param bool            $valid
+     * @param string $response
+     * @param bool   $valid
      */
     public function __construct(Swift_Transport $source, $response, $valid = false)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
index c40919d210f..85115a33811 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
@@ -17,8 +17,6 @@ interface Swift_Events_ResponseListener extends Swift_Events_EventListener
 {
     /**
      * Invoked immediately following a response coming back.
-     *
-     * @param Swift_Events_ResponseEvent $evt
      */
     public function responseReceived(Swift_Events_ResponseEvent $evt);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php
index 5dc8efb1fd6..a435691e0b0 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php
@@ -42,7 +42,7 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
      *
      * @var string[]
      */
-    private $failedRecipients = array();
+    private $failedRecipients = [];
 
     /**
      * The overall result as a bitmask from the class constants.
@@ -53,9 +53,6 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
 
     /**
      * Create a new SendEvent for $source and $message.
-     *
-     * @param Swift_Transport          $source
-     * @param Swift_Mime_SimpleMessage $message
      */
     public function __construct(Swift_Transport $source, Swift_Mime_SimpleMessage $message)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php
index d922e1bfa96..f7bf55ef56c 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendListener.php
@@ -17,15 +17,11 @@ interface Swift_Events_SendListener extends Swift_Events_EventListener
 {
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt);
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
index 815fa4d922b..6557103c99a 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
@@ -16,34 +16,28 @@
 class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
 {
     /** A map of event types to their associated listener types */
-    private $eventMap = array();
+    private $eventMap = [];
 
     /** Event listeners bound to this dispatcher */
-    private $listeners = array();
-
-    /** Listeners queued to have an Event bubbled up the stack to them */
-    private $bubbleQueue = array();
+    private $listeners = [];
 
     /**
      * Create a new EventDispatcher.
      */
     public function __construct()
     {
-        $this->eventMap = array(
+        $this->eventMap = [
             'Swift_Events_CommandEvent' => 'Swift_Events_CommandListener',
             'Swift_Events_ResponseEvent' => 'Swift_Events_ResponseListener',
             'Swift_Events_SendEvent' => 'Swift_Events_SendListener',
             'Swift_Events_TransportChangeEvent' => 'Swift_Events_TransportChangeListener',
             'Swift_Events_TransportExceptionEvent' => 'Swift_Events_TransportExceptionListener',
-            );
+            ];
     }
 
     /**
      * Create a new SendEvent for $source and $message.
      *
-     * @param Swift_Transport $source
-     * @param Swift_Mime_SimpleMessage
-     *
      * @return Swift_Events_SendEvent
      */
     public function createSendEvent(Swift_Transport $source, Swift_Mime_SimpleMessage $message)
@@ -54,13 +48,12 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new CommandEvent for $source and $command.
      *
-     * @param Swift_Transport $source
-     * @param string          $command      That will be executed
-     * @param array           $successCodes That are needed
+     * @param string $command      That will be executed
+     * @param array  $successCodes That are needed
      *
      * @return Swift_Events_CommandEvent
      */
-    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = array())
+    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = [])
     {
         return new Swift_Events_CommandEvent($source, $command, $successCodes);
     }
@@ -68,9 +61,8 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new ResponseEvent for $source and $response.
      *
-     * @param Swift_Transport $source
-     * @param string          $response
-     * @param bool            $valid    If the response is valid
+     * @param string $response
+     * @param bool   $valid    If the response is valid
      *
      * @return Swift_Events_ResponseEvent
      */
@@ -82,8 +74,6 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new TransportChangeEvent for $source.
      *
-     * @param Swift_Transport $source
-     *
      * @return Swift_Events_TransportChangeEvent
      */
     public function createTransportChangeEvent(Swift_Transport $source)
@@ -94,9 +84,6 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new TransportExceptionEvent for $source.
      *
-     * @param Swift_Transport          $source
-     * @param Swift_TransportException $ex
-     *
      * @return Swift_Events_TransportExceptionEvent
      */
     public function createTransportExceptionEvent(Swift_Transport $source, Swift_TransportException $ex)
@@ -106,8 +93,6 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
 
     /**
      * Bind an event listener to this dispatcher.
-     *
-     * @param Swift_Events_EventListener $listener
      */
     public function bindEventListener(Swift_Events_EventListener $listener)
     {
@@ -123,34 +108,35 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Dispatch the given Event to all suitable listeners.
      *
-     * @param Swift_Events_EventObject $evt
-     * @param string                   $target method
+     * @param string $target method
      */
     public function dispatchEvent(Swift_Events_EventObject $evt, $target)
     {
-        $this->prepareBubbleQueue($evt);
-        $this->bubble($evt, $target);
+        $bubbleQueue = $this->prepareBubbleQueue($evt);
+        $this->bubble($bubbleQueue, $evt, $target);
     }
 
     /** Queue listeners on a stack ready for $evt to be bubbled up it */
     private function prepareBubbleQueue(Swift_Events_EventObject $evt)
     {
-        $this->bubbleQueue = array();
-        $evtClass = get_class($evt);
+        $bubbleQueue = [];
+        $evtClass = \get_class($evt);
         foreach ($this->listeners as $listener) {
-            if (array_key_exists($evtClass, $this->eventMap)
+            if (\array_key_exists($evtClass, $this->eventMap)
                 && ($listener instanceof $this->eventMap[$evtClass])) {
-                $this->bubbleQueue[] = $listener;
+                $bubbleQueue[] = $listener;
             }
         }
+
+        return $bubbleQueue;
     }
 
     /** Bubble $evt up the stack calling $target() on each listener */
-    private function bubble(Swift_Events_EventObject $evt, $target)
+    private function bubble(array &$bubbleQueue, Swift_Events_EventObject $evt, $target)
     {
-        if (!$evt->bubbleCancelled() && $listener = array_shift($this->bubbleQueue)) {
+        if (!$evt->bubbleCancelled() && $listener = array_shift($bubbleQueue)) {
             $listener->$target($evt);
-            $this->bubble($evt, $target);
+            $this->bubble($bubbleQueue, $evt, $target);
         }
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
index 253165de89f..4a7492bc551 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
@@ -17,29 +17,21 @@ interface Swift_Events_TransportChangeListener extends Swift_Events_EventListene
 {
     /**
      * Invoked just before a Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt);
 
     /**
      * Invoked immediately after the Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStarted(Swift_Events_TransportChangeEvent $evt);
 
     /**
      * Invoked just before a Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt);
 
     /**
      * Invoked immediately after the Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStopped(Swift_Events_TransportChangeEvent $evt);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
index 77534e3e033..df442cc70f6 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
@@ -24,9 +24,6 @@ class Swift_Events_TransportExceptionEvent extends Swift_Events_EventObject
 
     /**
      * Create a new TransportExceptionEvent for $transport.
-     *
-     * @param Swift_Transport          $transport
-     * @param Swift_TransportException $ex
      */
     public function __construct(Swift_Transport $transport, Swift_TransportException $ex)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
index cc3c0993793..ad80eb01d0f 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
@@ -17,8 +17,6 @@ interface Swift_Events_TransportExceptionListener extends Swift_Events_EventList
 {
     /**
      * Invoked as a TransportException is thrown in the Transport system.
-     *
-     * @param Swift_Events_TransportExceptionEvent $evt
      */
     public function exceptionThrown(Swift_Events_TransportExceptionEvent $evt);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php
index dc2859f74a0..af0be917903 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/FailoverTransport.php
@@ -20,10 +20,10 @@ class Swift_FailoverTransport extends Swift_Transport_FailoverTransport
      *
      * @param Swift_Transport[] $transports
      */
-    public function __construct($transports = array())
+    public function __construct($transports = [])
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_FailoverTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_FailoverTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.failover')
             );
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/FileSpool.php b/htdocs/includes/swiftmailer/lib/classes/Swift/FileSpool.php
index b0b9eb064c5..7af8471c9d7 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/FileSpool.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/FileSpool.php
@@ -121,7 +121,7 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
         foreach (new DirectoryIterator($this->path) as $file) {
             $file = $file->getRealPath();
 
-            if (substr($file, -16) == '.message.sending') {
+            if ('.message.sending' == substr($file, -16)) {
                 $lockedtime = filectime($file);
                 if ((time() - $lockedtime) > $timeout) {
                     rename($file, substr($file, 0, -8));
@@ -145,7 +145,7 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
         /* Start the transport only if there are queued files to send */
         if (!$transport->isStarted()) {
             foreach ($directoryIterator as $file) {
-                if (substr($file->getRealPath(), -8) == '.message') {
+                if ('.message' == substr($file->getRealPath(), -8)) {
                     $transport->start();
                     break;
                 }
@@ -158,7 +158,7 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
         foreach ($directoryIterator as $file) {
             $file = $file->getRealPath();
 
-            if (substr($file, -8) != '.message') {
+            if ('.message' != substr($file, -8)) {
                 continue;
             }
 
@@ -198,7 +198,7 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
         // This string MUST stay FS safe, avoid special chars
         $base = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-';
         $ret = '';
-        $strlen = strlen($base);
+        $strlen = \strlen($base);
         for ($i = 0; $i < $count; ++$i) {
             $ret .= $base[random_int(0, $strlen - 1)];
         }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Filterable.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Filterable.php
index 6b75b52748d..efa1b1def5e 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Filterable.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Filterable.php
@@ -18,8 +18,7 @@ interface Swift_Filterable
     /**
      * Add a new StreamFilter, referenced by $key.
      *
-     * @param Swift_StreamFilter $filter
-     * @param string             $key
+     * @param string $key
      */
     public function addFilter(Swift_StreamFilter $filter, $key);
 
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/InputByteStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/InputByteStream.php
index 56efc7593ac..379a5a17870 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/InputByteStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/InputByteStream.php
@@ -52,7 +52,7 @@ interface Swift_InputByteStream
      *
      * @param Swift_InputByteStream $is
      */
-    public function bind(Swift_InputByteStream $is);
+    public function bind(self $is);
 
     /**
      * Remove an already bound stream.
@@ -63,7 +63,7 @@ interface Swift_InputByteStream
      *
      * @param Swift_InputByteStream $is
      */
-    public function unbind(Swift_InputByteStream $is);
+    public function unbind(self $is);
 
     /**
      * Flush the contents of the stream (empty it) and set the internal pointer
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/IoException.php b/htdocs/includes/swiftmailer/lib/classes/Swift/IoException.php
index c405f352b50..5452bd416a6 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/IoException.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/IoException.php
@@ -18,9 +18,8 @@ class Swift_IoException extends Swift_SwiftException
     /**
      * Create a new IoException with $message.
      *
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
+     * @param string $message
+     * @param int    $code
      */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache.php
index cd6f786df63..87f6a074212 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache.php
@@ -38,10 +38,9 @@ interface Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode);
 
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
index cdd08503004..e8fef1c95d4 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
@@ -20,7 +20,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * @var array
      */
-    private $contents = array();
+    private $contents = [];
 
     /**
      * An InputStream for cloning.
@@ -32,8 +32,6 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
     /**
      * Create a new ArrayKeyCache with the given $stream for cloning to make
      * InputByteStreams.
-     *
-     * @param Swift_KeyCache_KeyCacheInputStream $stream
      */
     public function __construct(Swift_KeyCache_KeyCacheInputStream $stream)
     {
@@ -64,10 +62,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
                 $this->contents[$nsKey][$itemKey] .= $string;
                 break;
             default:
-                throw new Swift_SwiftException(
-                    'Invalid mode ['.$mode.'] used to set nsKey='.
-                    $nsKey.', itemKey='.$itemKey
-                    );
+                throw new Swift_SwiftException('Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey);
         }
     }
 
@@ -76,10 +71,9 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
     {
@@ -87,6 +81,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
         switch ($mode) {
             case self::MODE_WRITE:
                 $this->clearKey($nsKey, $itemKey);
+                // no break
             case self::MODE_APPEND:
                 if (!$this->hasKey($nsKey, $itemKey)) {
                     $this->contents[$nsKey][$itemKey] = '';
@@ -96,10 +91,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
                 }
                 break;
             default:
-                throw new Swift_SwiftException(
-                    'Invalid mode ['.$mode.'] used to set nsKey='.
-                    $nsKey.', itemKey='.$itemKey
-                    );
+                throw new Swift_SwiftException('Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey);
         }
     }
 
@@ -108,9 +100,8 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * NOTE: The stream will always write in append mode.
      *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $writeThrough
+     * @param string $nsKey
+     * @param string $itemKey
      *
      * @return Swift_InputByteStream
      */
@@ -168,7 +159,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
     {
         $this->prepareCache($nsKey);
 
-        return array_key_exists($itemKey, $this->contents[$nsKey]);
+        return \array_key_exists($itemKey, $this->contents[$nsKey]);
     }
 
     /**
@@ -199,8 +190,8 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      */
     private function prepareCache($nsKey)
     {
-        if (!array_key_exists($nsKey, $this->contents)) {
-            $this->contents[$nsKey] = array();
+        if (!\array_key_exists($nsKey, $this->contents)) {
+            $this->contents[$nsKey] = [];
         }
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
index d6a633a1512..33b6367cb8b 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
@@ -43,14 +43,13 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * @var array
      */
-    private $keys = array();
+    private $keys = [];
 
     /**
      * Create a new DiskKeyCache with the given $stream for cloning to make
      * InputByteStreams, and the given $path to save to.
      *
-     * @param Swift_KeyCache_KeyCacheInputStream $stream
-     * @param string                             $path   to save to
+     * @param string $path to save to
      */
     public function __construct(Swift_KeyCache_KeyCacheInputStream $stream, $path)
     {
@@ -81,10 +80,7 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
                 $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_END);
                 break;
             default:
-                throw new Swift_SwiftException(
-                    'Invalid mode ['.$mode.'] used to set nsKey='.
-                    $nsKey.', itemKey='.$itemKey
-                    );
+                throw new Swift_SwiftException('Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey);
                 break;
         }
         fwrite($fp, $string);
@@ -96,10 +92,9 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      *
      * @throws Swift_IoException
      */
@@ -114,10 +109,7 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
                 $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_END);
                 break;
             default:
-                throw new Swift_SwiftException(
-                    'Invalid mode ['.$mode.'] used to set nsKey='.
-                    $nsKey.', itemKey='.$itemKey
-                    );
+                throw new Swift_SwiftException('Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey);
                 break;
         }
         while (false !== $bytes = $os->read(8192)) {
@@ -131,9 +123,8 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * NOTE: The stream will always write in append mode.
      *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $writeThrough
+     * @param string $nsKey
+     * @param string $itemKey
      *
      * @return Swift_InputByteStream
      */
@@ -227,7 +218,7 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      */
     public function clearAll($nsKey)
     {
-        if (array_key_exists($nsKey, $this->keys)) {
+        if (\array_key_exists($nsKey, $this->keys)) {
             foreach ($this->keys[$nsKey] as $itemKey => $null) {
                 $this->clearKey($nsKey, $itemKey);
             }
@@ -250,7 +241,7 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
             if (!mkdir($cacheDir)) {
                 throw new Swift_IoException('Failed to create cache directory '.$cacheDir);
             }
-            $this->keys[$nsKey] = array();
+            $this->keys[$nsKey] = [];
         }
     }
 
@@ -295,4 +286,9 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
             $this->clearAll($nsKey);
         }
     }
+
+    public function __wakeup()
+    {
+        $this->keys = [];
+    }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
index af80bdca6bf..be2dbba0c58 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
@@ -17,8 +17,6 @@ interface Swift_KeyCache_KeyCacheInputStream extends Swift_InputByteStream
 {
     /**
      * Set the KeyCache to wrap.
-     *
-     * @param Swift_KeyCache $keyCache
      */
     public function setKeyCache(Swift_KeyCache $keyCache);
 
@@ -38,8 +36,6 @@ interface Swift_KeyCache_KeyCacheInputStream extends Swift_InputByteStream
 
     /**
      * Specify a stream to write through for each write().
-     *
-     * @param Swift_InputByteStream $is
      */
     public function setWriteThroughStream(Swift_InputByteStream $is);
 
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
index 4efe785648f..957b1b2a000 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
@@ -34,10 +34,9 @@ class Swift_KeyCache_NullKeyCache implements Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
     {
@@ -48,9 +47,8 @@ class Swift_KeyCache_NullKeyCache implements Swift_KeyCache
      *
      * NOTE: The stream will always write in append mode.
      *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $writeThrough
+     * @param string $nsKey
+     * @param string $itemKey
      *
      * @return Swift_InputByteStream
      */
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
index a74df434c46..03bab481ea3 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
@@ -29,8 +29,6 @@ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCach
 
     /**
      * Set the KeyCache to wrap.
-     *
-     * @param Swift_KeyCache $keyCache
      */
     public function setKeyCache(Swift_KeyCache $keyCache)
     {
@@ -39,8 +37,6 @@ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCach
 
     /**
      * Specify a stream to write through for each write().
-     *
-     * @param Swift_InputByteStream $is
      */
     public function setWriteThroughStream(Swift_InputByteStream $is)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
index 03106e55d4e..244b5f60245 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
@@ -20,10 +20,10 @@ class Swift_LoadBalancedTransport extends Swift_Transport_LoadBalancedTransport
      *
      * @param array $transports
      */
-    public function __construct($transports = array())
+    public function __construct($transports = [])
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_LoadBalancedTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_LoadBalancedTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.loadbalanced')
             );
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer.php
index 3561ec6e68e..57630074cd9 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer.php
@@ -20,8 +20,6 @@ class Swift_Mailer
 
     /**
      * Create a new Mailer using $transport for delivery.
-     *
-     * @param Swift_Transport $transport
      */
     public function __construct(Swift_Transport $transport)
     {
@@ -54,8 +52,7 @@ class Swift_Mailer
      * The return value is the number of recipients who were accepted for
      * delivery.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param array                    $failedRecipients An array of failures by-reference
+     * @param array $failedRecipients An array of failures by-reference
      *
      * @return int The number of successful recipients. Can be 0 which indicates failure
      */
@@ -63,6 +60,7 @@ class Swift_Mailer
     {
         $failedRecipients = (array) $failedRecipients;
 
+        // FIXME: to be removed in 7.0 (as transport must now start itself on send)
         if (!$this->transport->isStarted()) {
             $this->transport->start();
         }
@@ -82,8 +80,6 @@ class Swift_Mailer
 
     /**
      * Register a plugin using a known unique key (e.g. myPlugin).
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
index 84dacb5f185..19aa82a9c40 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
@@ -20,12 +20,10 @@ class Swift_Mailer_ArrayRecipientIterator implements Swift_Mailer_RecipientItera
      *
      * @var array
      */
-    private $recipients = array();
+    private $recipients = [];
 
     /**
      * Create a new ArrayRecipientIterator from $recipients.
-     *
-     * @param array $recipients
      */
     public function __construct(array $recipients)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/MemorySpool.php b/htdocs/includes/swiftmailer/lib/classes/Swift/MemorySpool.php
index 9aa62835b32..e3b0894d87a 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/MemorySpool.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/MemorySpool.php
@@ -15,7 +15,7 @@
  */
 class Swift_MemorySpool implements Swift_Spool
 {
-    protected $messages = array();
+    protected $messages = [];
     private $flushRetries = 3;
 
     /**
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Message.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Message.php
index 00f6e160027..5c5834e23d8 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Message.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Message.php
@@ -18,17 +18,17 @@ class Swift_Message extends Swift_Mime_SimpleMessage
     /**
      * @var Swift_Signers_HeaderSigner[]
      */
-    private $headerSigners = array();
+    private $headerSigners = [];
 
     /**
      * @var Swift_Signers_BodySigner[]
      */
-    private $bodySigners = array();
+    private $bodySigners = [];
 
     /**
      * @var array
      */
-    private $savedMessage = array();
+    private $savedMessage = [];
 
     /**
      * Create a new Message.
@@ -42,8 +42,8 @@ class Swift_Message extends Swift_Mime_SimpleMessage
      */
     public function __construct($subject = null, $body = null, $contentType = null, $charset = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Mime_SimpleMessage::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Mime_SimpleMessage::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.message')
             );
@@ -75,9 +75,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
     }
 
     /**
-     * Detach a signature handler from a message.
-     *
-     * @param Swift_Signer $signer
+     * Attach a new signature handler to the message.
      *
      * @return $this
      */
@@ -93,9 +91,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
     }
 
     /**
-     * Attach a new signature handler to the message.
-     *
-     * @param Swift_Signer $signer
+     * Detach a signature handler from a message.
      *
      * @return $this
      */
@@ -122,6 +118,19 @@ class Swift_Message extends Swift_Mime_SimpleMessage
         return $this;
     }
 
+    /**
+     * Clear all signature handlers attached to the message.
+     *
+     * @return $this
+     */
+    public function clearSigners()
+    {
+        $this->headerSigners = [];
+        $this->bodySigners = [];
+
+        return $this;
+    }
+
     /**
      * Get this message as a complete string.
      *
@@ -146,8 +155,6 @@ class Swift_Message extends Swift_Mime_SimpleMessage
 
     /**
      * Write this message to a {@link Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function toByteStream(Swift_InputByteStream $is)
     {
@@ -202,24 +209,22 @@ class Swift_Message extends Swift_Mime_SimpleMessage
      */
     protected function saveMessage()
     {
-        $this->savedMessage = array('headers' => array());
+        $this->savedMessage = ['headers' => []];
         $this->savedMessage['body'] = $this->getBody();
         $this->savedMessage['children'] = $this->getChildren();
-        if (count($this->savedMessage['children']) > 0 && $this->getBody() != '') {
-            $this->setChildren(array_merge(array($this->becomeMimePart()), $this->savedMessage['children']));
+        if (\count($this->savedMessage['children']) > 0 && '' != $this->getBody()) {
+            $this->setChildren(array_merge([$this->becomeMimePart()], $this->savedMessage['children']));
             $this->setBody('');
         }
     }
 
     /**
      * save the original headers.
-     *
-     * @param array $altered
      */
     protected function saveHeaders(array $altered)
     {
         foreach ($altered as $head) {
-            $lc = strtolower($head);
+            $lc = strtolower($head ?? '');
 
             if (!isset($this->savedMessage['headers'][$lc])) {
                 $this->savedMessage['headers'][$lc] = $this->getHeaders()->getAll($head);
@@ -252,7 +257,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
         $this->setChildren($this->savedMessage['children']);
 
         $this->restoreHeaders();
-        $this->savedMessage = array();
+        $this->savedMessage = [];
     }
 
     /**
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php
index a36ce7237cf..d994373bd78 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Attachment.php
@@ -16,18 +16,14 @@
 class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
 {
     /** Recognized MIME types */
-    private $mimeTypes = array();
+    private $mimeTypes = [];
 
     /**
      * Create a new Attachment with $headers, $encoder and $cache.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     * @param Swift_Mime_ContentEncoder  $encoder
-     * @param Swift_KeyCache             $cache
-     * @param Swift_IdGenerator          $idGenerator
-     * @param array                      $mimeTypes
+     * @param array $mimeTypes
      */
-    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = array())
+    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = [])
     {
         parent::__construct($headers, $encoder, $cache, $idGenerator);
         $this->setDisposition('attachment');
@@ -127,8 +123,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
     /**
      * Set the file that this attachment is for.
      *
-     * @param Swift_FileStream $file
-     * @param string           $contentType optional
+     * @param string $contentType optional
      *
      * @return $this
      */
@@ -139,7 +134,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
         if (!isset($contentType)) {
             $extension = strtolower(substr($file->getPath(), strrpos($file->getPath(), '.') + 1));
 
-            if (array_key_exists($extension, $this->mimeTypes)) {
+            if (\array_key_exists($extension, $this->mimeTypes)) {
                 $this->setContentType($this->mimeTypes[$extension]);
             }
         }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
index 8f76d70f358..b7e1e028307 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
@@ -18,10 +18,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
     /**
      * Encode stream $in to stream $out.
      *
-     * @param Swift_OutputByteStream $os
-     * @param Swift_InputByteStream  $is
-     * @param int                    $firstLineOffset
-     * @param int                    $maxLineLength,  optional, 0 indicates the default of 76 bytes
+     * @param int $firstLineOffset
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
@@ -30,7 +27,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
         }
 
         $remainder = 0;
-        $base64ReadBufferRemainderBytes = null;
+        $base64ReadBufferRemainderBytes = '';
 
         // To reduce memory usage, the output buffer is streamed to the input buffer like so:
         //   Output Stream => base64encode => wrap line length => Input Stream
@@ -41,17 +38,17 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
         // When the OutputStream is empty, we must flush any remainder bytes.
         while (true) {
             $readBytes = $os->read(8192);
-            $atEOF = ($readBytes === false);
+            $atEOF = (false === $readBytes);
 
             if ($atEOF) {
                 $streamTheseBytes = $base64ReadBufferRemainderBytes;
             } else {
                 $streamTheseBytes = $base64ReadBufferRemainderBytes.$readBytes;
             }
-            $base64ReadBufferRemainderBytes = null;
-            $bytesLength = strlen($streamTheseBytes);
+            $base64ReadBufferRemainderBytes = '';
+            $bytesLength = \strlen($streamTheseBytes);
 
-            if ($bytesLength === 0) { // no data left to encode
+            if (0 === $bytesLength) { // no data left to encode
                 break;
             }
 
@@ -59,7 +56,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
             // and carry over remainder 1-2 bytes to the next loop iteration
             if (!$atEOF) {
                 $excessBytes = $bytesLength % 3;
-                if ($excessBytes !== 0) {
+                if (0 !== $excessBytes) {
                     $base64ReadBufferRemainderBytes = substr($streamTheseBytes, -$excessBytes);
                     $streamTheseBytes = substr($streamTheseBytes, 0, $bytesLength - $excessBytes);
                 }
@@ -69,7 +66,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
             $encodedTransformed = '';
             $thisMaxLineLength = $maxLineLength - $remainder - $firstLineOffset;
 
-            while ($thisMaxLineLength < strlen($encoded)) {
+            while ($thisMaxLineLength < \strlen($encoded)) {
                 $encodedTransformed .= substr($encoded, 0, $thisMaxLineLength)."\r\n";
                 $firstLineOffset = 0;
                 $encoded = substr($encoded, $thisMaxLineLength);
@@ -77,7 +74,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
                 $remainder = 0;
             }
 
-            if (0 < $remainingLength = strlen($encoded)) {
+            if (0 < $remainingLength = \strlen($encoded)) {
                 $remainder += $remainingLength;
                 $encodedTransformed .= $encoded;
                 $encoded = null;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
index 34de4ef39a4..8dfea605fde 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
@@ -16,16 +16,16 @@
 class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_ContentEncoder
 {
     /**
-     * @var null|string
+     * @var string|null
      */
     private $charset;
 
     /**
-     * @param null|string $charset
+     * @param string|null $charset
      */
     public function __construct($charset = null)
     {
-        $this->charset = $charset ? $charset : 'utf-8';
+        $this->charset = $charset ?: 'utf-8';
     }
 
     /**
@@ -50,9 +50,8 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_Con
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        if ($this->charset !== 'utf-8') {
-            throw new RuntimeException(
-                sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
+        if ('utf-8' !== $this->charset) {
+            throw new RuntimeException(sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
         }
 
         $string = '';
@@ -87,9 +86,8 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_Con
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        if ($this->charset !== 'utf-8') {
-            throw new RuntimeException(
-                sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
+        if ('utf-8' !== $this->charset) {
+            throw new RuntimeException(sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
         }
 
         return $this->standardize(quoted_printable_encode($string));
@@ -107,9 +105,9 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_Con
         // transform CR or LF to CRLF
         $string = preg_replace('~=0D(?!=0A)|(?<!=0D)=0A~', '=0D=0A', $string);
         // transform =0D=0A to CRLF
-        $string = str_replace(array("\t=0D=0A", ' =0D=0A', '=0D=0A'), array("=09\r\n", "=20\r\n", "\r\n"), $string);
+        $string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'], ["=09\r\n", "=20\r\n", "\r\n"], $string);
 
-        switch ($end = ord(substr($string, -1))) {
+        switch (\ord(substr($string, -1))) {
             case 0x09:
                 $string = substr_replace($string, '=09', -1);
                 break;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php
new file mode 100644
index 00000000000..6539de77b12
--- /dev/null
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles the case where the email body is already encoded and you just need specify the correct
+ * encoding without actually changing the encoding of the body.
+ *
+ * @author Jan Flora <jf@penneo.com>
+ */
+class Swift_Mime_ContentEncoder_NullContentEncoder implements Swift_Mime_ContentEncoder
+{
+    /**
+     * The name of this encoding scheme (probably 7bit or 8bit).
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Creates a new NullContentEncoder with $name (probably 7bit or 8bit).
+     *
+     * @param string $name
+     */
+    public function __construct($name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * Encode a given string to produce an encoded string.
+     *
+     * @param string $string
+     * @param int    $firstLineOffset ignored
+     * @param int    $maxLineLength   ignored
+     *
+     * @return string
+     */
+    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        return $string;
+    }
+
+    /**
+     * Encode stream $in to stream $out.
+     *
+     * @param int $firstLineOffset ignored
+     * @param int $maxLineLength   ignored
+     */
+    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        while (false !== ($bytes = $os->read(8192))) {
+            $is->write($bytes);
+        }
+    }
+
+    /**
+     * Get the name of this encoding scheme.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Not used.
+     */
+    public function charsetChanged($charset)
+    {
+    }
+}
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
index 866b0c7c980..72592fc5894 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
@@ -11,6 +11,10 @@
 /**
  * Handles binary/7/8-bit Transfer Encoding in Swift Mailer.
  *
+ * When sending 8-bit content over SMTP, you should use
+ * Swift_Transport_Esmtp_EightBitMimeHandler to enable the 8BITMIME SMTP
+ * extension.
+ *
  * @author Chris Corbyn
  */
 class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_ContentEncoder
@@ -33,7 +37,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
      * Creates a new PlainContentEncoder with $name (probably 7bit or 8bit).
      *
      * @param string $name
-     * @param bool   $canonical If canonicalization transformation should be done.
+     * @param bool   $canonical if canonicalization transformation should be done
      */
     public function __construct($name, $canonical = false)
     {
@@ -62,10 +66,8 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
     /**
      * Encode stream $in to stream $out.
      *
-     * @param Swift_OutputByteStream $os
-     * @param Swift_InputByteStream  $is
-     * @param int                    $firstLineOffset ignored
-     * @param int                    $maxLineLength   optional, 0 means no wrapping will occur
+     * @param int $firstLineOffset ignored
+     * @param int $maxLineLength   optional, 0 means no wrapping will occur
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
@@ -82,7 +84,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
 
             $is->write($wrapped);
         }
-        if (strlen($leftOver)) {
+        if (\strlen($leftOver)) {
             $is->write($leftOver);
         }
     }
@@ -121,7 +123,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
 
         $originalLines = explode($le, $string);
 
-        $lines = array();
+        $lines = [];
         $lineCount = 0;
 
         foreach ($originalLines as $originalLine) {
@@ -132,8 +134,8 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
             $chunks = preg_split('/(?<=\s)/', $originalLine);
 
             foreach ($chunks as $chunk) {
-                if (0 != strlen($currentLine)
-                    && strlen($currentLine.$chunk) > $length) {
+                if (0 != \strlen($currentLine)
+                    && \strlen($currentLine.$chunk) > $length) {
                     $lines[] = '';
                     $currentLine = &$lines[$lineCount++];
                 }
@@ -154,8 +156,8 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
     private function canonicalize($string)
     {
         return str_replace(
-            array("\r\n", "\r", "\n"),
-            array("\n", "\n", "\r\n"),
+            ["\r\n", "\r", "\n"],
+            ["\n", "\n", "\r\n"],
             $string
             );
     }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
index b3577dbe61f..465ffd87850 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
@@ -32,12 +32,12 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
 
     public function __sleep()
     {
-        return array('charStream', 'filter', 'dotEscape');
+        return ['charStream', 'filter', 'dotEscape'];
     }
 
     protected function getSafeMapShareId()
     {
-        return get_class($this).($this->dotEscape ? '.dotEscape' : '');
+        return static::class.($this->dotEscape ? '.dotEscape' : '');
     }
 
     protected function initSafeMap()
@@ -97,7 +97,7 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
             $enc = $this->encodeByteSequence($bytes, $size);
 
             $i = strpos($enc, '=0D=0A');
-            $newLineLength = $lineLen + ($i === false ? $size : $i);
+            $newLineLength = $lineLen + (false === $i ? $size : $i);
 
             if ($currentLine && $newLineLength >= $thisLineLength) {
                 $is->write($prepend.$this->standardize($currentLine));
@@ -109,14 +109,14 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
 
             $currentLine .= $enc;
 
-            if ($i === false) {
+            if (false === $i) {
                 $lineLen += $size;
             } else {
                 // 6 is the length of '=0D=0A'.
                 $lineLen = $size - strrpos($enc, '=0D=0A') - 6;
             }
         }
-        if (strlen($currentLine)) {
+        if (\strlen($currentLine)) {
             $is->write($prepend.$this->standardize($currentLine));
         }
     }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
index 3214e1cf3fd..f3ece43aecd 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
@@ -28,16 +28,14 @@ class Swift_Mime_ContentEncoder_QpContentEncoderProxy implements Swift_Mime_Cont
     private $nativeEncoder;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $charset;
 
     /**
      * Constructor.
      *
-     * @param Swift_Mime_ContentEncoder_QpContentEncoder       $safeEncoder
-     * @param Swift_Mime_ContentEncoder_NativeQpContentEncoder $nativeEncoder
-     * @param string|null                                      $charset
+     * @param string|null $charset
      */
     public function __construct(Swift_Mime_ContentEncoder_QpContentEncoder $safeEncoder, Swift_Mime_ContentEncoder_NativeQpContentEncoder $nativeEncoder, $charset)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
index 0b8526e38c3..870e7f41a93 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
@@ -11,6 +11,9 @@
 /**
  * Handles raw Transfer Encoding in Swift Mailer.
  *
+ * When sending 8-bit content over SMTP, you should use
+ * Swift_Transport_Esmtp_EightBitMimeHandler to enable the 8BITMIME SMTP
+ * extension.
  *
  * @author Sebastiaan Stok <s.stok@rollerscapes.net>
  */
@@ -33,10 +36,8 @@ class Swift_Mime_ContentEncoder_RawContentEncoder implements Swift_Mime_ContentE
     /**
      * Encode stream $in to stream $out.
      *
-     * @param Swift_OutputByteStream $in
-     * @param Swift_InputByteStream  $out
-     * @param int                    $firstLineOffset ignored
-     * @param int                    $maxLineLength   ignored
+     * @param int $firstLineOffset ignored
+     * @param int $maxLineLength   ignored
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
index 7835a492873..42a51770c76 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
@@ -18,13 +18,9 @@ class Swift_Mime_EmbeddedFile extends Swift_Mime_Attachment
     /**
      * Creates a new Attachment with $headers and $encoder.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     * @param Swift_Mime_ContentEncoder  $encoder
-     * @param Swift_KeyCache             $cache
-     * @param Swift_IdGenerator          $idGenerator
-     * @param array                      $mimeTypes   optional
+     * @param array $mimeTypes optional
      */
-    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = array())
+    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = [])
     {
         parent::__construct($headers, $encoder, $cache, $idGenerator, $mimeTypes);
         $this->setDisposition('inline');
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
index cc44a6efb97..1a952ece12c 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
@@ -17,8 +17,6 @@ interface Swift_Mime_EncodingObserver
 {
     /**
      * Notify this observer that the observed entity's ContentEncoder has changed.
-     *
-     * @param Swift_Mime_ContentEncoder $encoder
      */
     public function encoderChanged(Swift_Mime_ContentEncoder $encoder);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Header.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Header.php
index a8ddd272165..ca712f35aa0 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Header.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Header.php
@@ -85,7 +85,7 @@ interface Swift_Mime_Header
     public function getFieldBody();
 
     /**
-     * Get this Header rendered as a compliant string.
+     * Get this Header rendered as a compliant string, including trailing CRLF.
      *
      * @return string
      */
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
index 83a4f2f3b2d..21c8aaabfea 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
@@ -41,7 +41,7 @@ class Swift_Mime_HeaderEncoder_Base64HeaderEncoder extends Swift_Encoder_Base64E
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0, $charset = 'utf-8')
     {
-        if (strtolower($charset) === 'iso-2022-jp') {
+        if ('iso-2022-jp' === strtolower($charset ?? '')) {
             $old = mb_internal_encoding();
             mb_internal_encoding('utf-8');
             $newstring = mb_encode_mimeheader($string, $charset, $this->getName(), "\r\n");
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
index 062be7d7967..378c4805057 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
@@ -29,9 +29,9 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoder extends Swift_Encoder_QpEncoder i
     {
         foreach (array_merge(
             range(0x61, 0x7A), range(0x41, 0x5A),
-            range(0x30, 0x39), array(0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F)
+            range(0x30, 0x39), [0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F]
         ) as $byte) {
-            $this->safeMap[$byte] = chr($byte);
+            $this->safeMap[$byte] = \chr($byte);
         }
     }
 
@@ -58,7 +58,7 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoder extends Swift_Encoder_QpEncoder i
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        return str_replace(array(' ', '=20', "=\r\n"), array('_', '_', "\r\n"),
+        return str_replace([' ', '=20', "=\r\n"], ['_', '_', "\r\n"],
             parent::encodeString($string, $firstLineOffset, $maxLineLength)
         );
     }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
index a569f816189..25740d1155c 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
@@ -109,8 +109,6 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
 
     /**
      * Set the encoder used for encoding the header.
-     *
-     * @param Swift_Mime_HeaderEncoder $encoder
      */
     public function setEncoder(Swift_Mime_HeaderEncoder $encoder)
     {
@@ -196,11 +194,9 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
     /**
      * Produces a compliant, formatted RFC 2822 'phrase' based on the string given.
      *
-     * @param Swift_Mime_Header        $header
-     * @param string                   $string  as displayed
-     * @param string                   $charset of the text
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param bool                     $shorten the first line to make remove for header name
+     * @param string $string  as displayed
+     * @param string $charset of the text
+     * @param bool   $shorten the first line to make remove for header name
      *
      * @return string
      */
@@ -214,13 +210,13 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
             // .. but it is just ascii text, try escaping some characters
             // and make it a quoted-string
             if (preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $phraseStr)) {
-                $phraseStr = $this->escapeSpecials($phraseStr, array('"'));
+                $phraseStr = $this->escapeSpecials($phraseStr, ['"']);
                 $phraseStr = '"'.$phraseStr.'"';
             } else {
                 // ... otherwise it needs encoding
                 // Determine space remaining on line if first line
                 if ($shorten) {
-                    $usedLength = strlen($header->getFieldName().': ');
+                    $usedLength = \strlen($header->getFieldName().': ');
                 } else {
                     $usedLength = 0;
                 }
@@ -239,9 +235,9 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      *
      * @return string
      */
-    private function escapeSpecials($token, $include = array())
+    private function escapeSpecials($token, $include = [])
     {
-        foreach (array_merge(array('\\'), $include) as $char) {
+        foreach (array_merge(['\\'], $include) as $char) {
             $token = str_replace($char, '\\'.$char, $token);
         }
 
@@ -251,9 +247,8 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
     /**
      * Encode needed word tokens within a string of input.
      *
-     * @param Swift_Mime_Header $header
-     * @param string            $input
-     * @param string            $usedLength optional
+     * @param string $input
+     * @param string $usedLength optional
      *
      * @return string
      */
@@ -276,7 +271,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
                 }
 
                 if (-1 == $usedLength) {
-                    $usedLength = strlen($header->getFieldName().': ') + strlen($value);
+                    $usedLength = \strlen($header->getFieldName().': ') + \strlen($value);
                 }
                 $value .= $this->getTokenAsEncodedWord($token, $usedLength);
 
@@ -310,22 +305,22 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     protected function getEncodableWordTokens($string)
     {
-        $tokens = array();
+        $tokens = [];
 
         $encodedToken = '';
         // Split at all whitespace boundaries
-        foreach (preg_split('~(?=[\t ])~', $string) as $token) {
+        foreach (preg_split('~(?=[\t ])~', $string ?? '') as $token) {
             if ($this->tokenNeedsEncoding($token)) {
                 $encodedToken .= $token;
             } else {
-                if (strlen($encodedToken) > 0) {
+                if (\strlen($encodedToken) > 0) {
                     $tokens[] = $encodedToken;
                     $encodedToken = '';
                 }
                 $tokens[] = $token;
             }
         }
-        if (strlen($encodedToken)) {
+        if (\strlen($encodedToken)) {
             $tokens[] = $encodedToken;
         }
 
@@ -347,7 +342,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
         if (isset($this->lang)) {
             $charsetDecl .= '*'.$this->lang;
         }
-        $encodingWrapperLength = strlen(
+        $encodingWrapperLength = \strlen(
             '=?'.$charsetDecl.'?'.$this->encoder->getName().'??='
             );
 
@@ -359,10 +354,10 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
         $encodedTextLines = explode("\r\n",
             $this->encoder->encodeString(
                 $token, $firstLineOffset, 75 - $encodingWrapperLength, $this->charset
-                )
+            ) ?? ''
         );
 
-        if (strtolower($this->charset) !== 'iso-2022-jp') {
+        if ('iso-2022-jp' !== strtolower($this->charset ?? '')) {
             // special encoding for iso-2022-jp using mb_encode_mimeheader
             foreach ($encodedTextLines as $lineNum => $line) {
                 $encodedTextLines[$lineNum] = '=?'.$charsetDecl.
@@ -383,7 +378,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     protected function generateTokenLines($token)
     {
-        return preg_split('~(\r\n)~', $token, -1, PREG_SPLIT_DELIM_CAPTURE);
+        return preg_split('~(\r\n)~', $token ?? '', -1, PREG_SPLIT_DELIM_CAPTURE);
     }
 
     /**
@@ -431,10 +426,10 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
             $string = $this->getFieldBody();
         }
 
-        $tokens = array();
+        $tokens = [];
 
         // Generate atoms; split at all invisible boundaries followed by WSP
-        foreach (preg_split('~(?=[ \t])~', $string) as $token) {
+        foreach (preg_split('~(?=[ \t])~', $string ?? '') as $token) {
             $newTokens = $this->generateTokenLines($token);
             foreach ($newTokens as $newToken) {
                 $tokens[] = $newToken;
@@ -455,7 +450,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
     private function tokensToString(array $tokens)
     {
         $lineCount = 0;
-        $headerLines = array();
+        $headerLines = [];
         $headerLines[] = $this->name.': ';
         $currentLine = &$headerLines[$lineCount++];
 
@@ -463,8 +458,8 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
         foreach ($tokens as $i => $token) {
             // Line longer than specified maximum or token was just a new line
             if (("\r\n" == $token) ||
-                ($i > 0 && strlen($currentLine.$token) > $this->lineLength)
-                && 0 < strlen($currentLine)) {
+                ($i > 0 && \strlen($currentLine.$token) > $this->lineLength)
+                && 0 < \strlen($currentLine)) {
                 $headerLines[] = '';
                 $currentLine = &$headerLines[$lineCount++];
             }
@@ -478,4 +473,14 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
         // Implode with FWS (RFC 2822, 2.2.3)
         return implode("\r\n", $headerLines)."\r\n";
     }
+
+    /**
+     * Make a deep copy of object.
+     */
+    public function __clone()
+    {
+        if ($this->encoder) {
+            $this->encoder = clone $this->encoder;
+        }
+    }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
index 6dcc92bfdd6..efe1dad6619 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
@@ -79,8 +79,6 @@ class Swift_Mime_Headers_DateHeader extends Swift_Mime_Headers_AbstractHeader
      * Set the date-time of the Date in this Header.
      *
      * If a DateTime instance is provided, it is converted to DateTimeImmutable.
-     *
-     * @param DateTimeInterface $dateTime
      */
     public function setDateTime(DateTimeInterface $dateTime)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
index acf794479b6..4fcdff418a7 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
@@ -9,6 +9,7 @@
  */
 
 use Egulias\EmailValidator\EmailValidator;
+use Egulias\EmailValidator\Validation\MessageIDValidation;
 use Egulias\EmailValidator\Validation\RFCValidation;
 
 /**
@@ -25,7 +26,7 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      *
      * @var string[]
      */
-    private $ids = array();
+    private $ids = [];
 
     /**
      * The strict EmailValidator.
@@ -34,16 +35,18 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     private $emailValidator;
 
+    private $addressEncoder;
+
     /**
      * Creates a new IdentificationHeader with the given $name and $id.
      *
-     * @param string         $name
-     * @param EmailValidator $emailValidator
+     * @param string $name
      */
-    public function __construct($name, EmailValidator $emailValidator)
+    public function __construct($name, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->setFieldName($name);
         $this->emailValidator = $emailValidator;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -94,7 +97,7 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     public function setId($id)
     {
-        $this->setIds(is_array($id) ? $id : array($id));
+        $this->setIds(\is_array($id) ? $id : [$id]);
     }
 
     /**
@@ -106,7 +109,7 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     public function getId()
     {
-        if (count($this->ids) > 0) {
+        if (\count($this->ids) > 0) {
             return $this->ids[0];
         }
     }
@@ -120,7 +123,7 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     public function setIds(array $ids)
     {
-        $actualIds = array();
+        $actualIds = [];
 
         foreach ($ids as $id) {
             $this->assertValidId($id);
@@ -156,10 +159,10 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
     public function getFieldBody()
     {
         if (!$this->getCachedValue()) {
-            $angleAddrs = array();
+            $angleAddrs = [];
 
             foreach ($this->ids as $id) {
-                $angleAddrs[] = '<'.$id.'>';
+                $angleAddrs[] = '<'.$this->addressEncoder->encodeString($id).'>';
             }
 
             $this->setCachedValue(implode(' ', $angleAddrs));
@@ -177,7 +180,9 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     private function assertValidId($id)
     {
-        if (!$this->emailValidator->isValid($id, new RFCValidation())) {
+        $emailValidation = class_exists(MessageIDValidation::class) ? new MessageIDValidation() : new RFCValidation();
+
+        if (!$this->emailValidator->isValid($id, $emailValidation)) {
             throw new Swift_RfcComplianceException('Invalid ID given <'.$id.'>');
         }
     }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
index 450e0f25b7e..ddd5e8cffb1 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
@@ -23,7 +23,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      *
      * @var string[]
      */
-    private $mailboxes = array();
+    private $mailboxes = [];
 
     /**
      * The strict EmailValidator.
@@ -32,18 +32,19 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     private $emailValidator;
 
+    private $addressEncoder;
+
     /**
      * Creates a new MailboxHeader with $name.
      *
-     * @param string                   $name           of Header
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param EmailValidator           $emailValidator
+     * @param string $name of Header
      */
-    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, EmailValidator $emailValidator)
+    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->setFieldName($name);
         $this->setEncoder($encoder);
         $this->emailValidator = $emailValidator;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -257,10 +258,10 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     protected function normalizeMailboxes(array $mailboxes)
     {
-        $actualMailboxes = array();
+        $actualMailboxes = [];
 
         foreach ($mailboxes as $key => $value) {
-            if (is_string($key)) {
+            if (\is_string($key)) {
                 //key is email addr
                 $address = $key;
                 $name = $value;
@@ -327,10 +328,10 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     private function createNameAddressStrings(array $mailboxes)
     {
-        $strings = array();
+        $strings = [];
 
         foreach ($mailboxes as $email => $name) {
-            $mailboxStr = $email;
+            $mailboxStr = $this->addressEncoder->encodeString($email);
             if (null !== $name) {
                 $nameStr = $this->createDisplayNameString($name, empty($strings));
                 $mailboxStr = $nameStr.' <'.$mailboxStr.'>';
@@ -346,14 +347,12 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      *
      * @param string $address
      *
-     * @throws Swift_RfcComplianceException If invalid.
+     * @throws Swift_RfcComplianceException if invalid
      */
     private function assertValidAddress($address)
     {
         if (!$this->emailValidator->isValid($address, new RFCValidation())) {
-            throw new Swift_RfcComplianceException(
-                'Address in mailbox given ['.$address.'] does not comply with RFC 2822, 3.6.2.'
-            );
+            throw new Swift_RfcComplianceException('Address in mailbox given ['.$address.'] does not comply with RFC 2822, 3.6.2.');
         }
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
index 29277994c0a..fafb5bae21f 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
@@ -12,6 +12,8 @@
  * An OpenDKIM Specific Header using only raw header datas without encoding.
  *
  * @author De Cock Xavier <xdecock@gmail.com>
+ *
+ * @deprecated since SwiftMailer 6.1.0; use Swift_Signers_DKIMSigner instead.
  */
 class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
 {
@@ -111,7 +113,7 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
      */
     public function toString()
     {
-        return $this->fieldName.': '.$this->value;
+        return $this->fieldName.': '.$this->value."\r\n";
     }
 
     /**
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
index 228946a5ee9..47c15e6c05f 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
@@ -34,14 +34,12 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      *
      * @var string[]
      */
-    private $params = array();
+    private $params = [];
 
     /**
      * Creates a new ParameterizedHeader with $name.
      *
-     * @param string                   $name
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param Swift_Encoder            $paramEncoder, optional
+     * @param string $name
      */
     public function __construct($name, Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder = null)
     {
@@ -83,7 +81,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      */
     public function setParameter($parameter, $value)
     {
-        $this->setParameters(array_merge($this->getParameters(), array($parameter => $value)));
+        $this->setParameters(array_merge($this->getParameters(), [$parameter => $value]));
     }
 
     /**
@@ -97,7 +95,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
     {
         $params = $this->getParameters();
 
-        return isset($params[$parameter]) ? $params[$parameter] : null;
+        return $params[$parameter] ?? null;
     }
 
     /**
@@ -157,7 +155,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
         foreach ($this->params as $name => $value) {
             if (null !== $value) {
                 // Add the semi-colon separator
-                $tokens[count($tokens) - 1] .= ';';
+                $tokens[\count($tokens) - 1] .= ';';
                 $tokens = array_merge($tokens, $this->generateTokenLines(
                     ' '.$this->createParameter($name, $value)
                     ));
@@ -181,7 +179,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
 
         $encoded = false;
         // Allow room for parameter name, indices, "=" and DQUOTEs
-        $maxValueLength = $this->getMaxLineLength() - strlen($name.'=*N"";') - 1;
+        $maxValueLength = $this->getMaxLineLength() - \strlen($name.'=*N"";') - 1;
         $firstLineOffset = 0;
 
         // If it's not already a valid parameter value...
@@ -191,15 +189,15 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
             if (!preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $value)) {
                 $encoded = true;
                 // Allow space for the indices, charset and language
-                $maxValueLength = $this->getMaxLineLength() - strlen($name.'*N*="";') - 1;
-                $firstLineOffset = strlen(
+                $maxValueLength = $this->getMaxLineLength() - \strlen($name.'*N*="";') - 1;
+                $firstLineOffset = \strlen(
                     $this->getCharset()."'".$this->getLanguage()."'"
                     );
             }
         }
 
         // Encode if we need to
-        if ($encoded || strlen($value) > $maxValueLength) {
+        if ($encoded || \strlen($value) > $maxValueLength) {
             if (isset($this->paramEncoder)) {
                 $value = $this->paramEncoder->encodeString(
                     $origValue, $firstLineOffset, $maxValueLength, $this->getCharset()
@@ -211,14 +209,14 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
             }
         }
 
-        $valueLines = isset($this->paramEncoder) ? explode("\r\n", $value) : array($value);
+        $valueLines = isset($this->paramEncoder) ? explode("\r\n", $value) : [$value];
 
         // Need to add indices
-        if (count($valueLines) > 1) {
-            $paramLines = array();
+        if (\count($valueLines) > 1) {
+            $paramLines = [];
             foreach ($valueLines as $i => $line) {
                 $paramLines[] = $name.'*'.$i.
-                    $this->getEndOfParameterValue($line, true, $i == 0);
+                    $this->getEndOfParameterValue($line, true, 0 == $i);
             }
 
             return implode(";\r\n ", $paramLines);
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
index f79e19fd8b3..81b421ee7a8 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
@@ -32,16 +32,18 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
      */
     private $emailValidator;
 
+    private $addressEncoder;
+
     /**
      * Creates a new PathHeader with the given $name.
      *
-     * @param string         $name
-     * @param EmailValidator $emailValidator
+     * @param string $name
      */
-    public function __construct($name, EmailValidator $emailValidator)
+    public function __construct($name, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->setFieldName($name);
         $this->emailValidator = $emailValidator;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -127,7 +129,8 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
     {
         if (!$this->getCachedValue()) {
             if (isset($this->address)) {
-                $this->setCachedValue('<'.$this->address.'>');
+                $address = $this->addressEncoder->encodeString($this->address);
+                $this->setCachedValue('<'.$address.'>');
             }
         }
 
@@ -144,9 +147,7 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
     private function assertValidAddress($address)
     {
         if (!$this->emailValidator->isValid($address, new RFCValidation())) {
-            throw new Swift_RfcComplianceException(
-                'Address set in PathHeader does not comply with addr-spec of RFC 2822.'
-            );
+            throw new Swift_RfcComplianceException('Address set in PathHeader does not comply with addr-spec of RFC 2822.');
         }
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
index d9d9f5e25d3..64f160dec7c 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
@@ -25,8 +25,7 @@ class Swift_Mime_Headers_UnstructuredHeader extends Swift_Mime_Headers_AbstractH
     /**
      * Creates a new SimpleHeader with $name.
      *
-     * @param string                   $name
-     * @param Swift_Mime_HeaderEncoder $encoder
+     * @param string $name
      */
     public function __construct($name, Swift_Mime_HeaderEncoder $encoder)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php
index 8d9452bd0f0..3ce35f27c03 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php
@@ -13,6 +13,8 @@
  */
 class Swift_Mime_IdGenerator implements Swift_IdGenerator
 {
+    private $idRight;
+
     /**
      * @param string $idRight
      */
@@ -46,8 +48,7 @@ class Swift_Mime_IdGenerator implements Swift_IdGenerator
      */
     public function generateId()
     {
-        $idLeft = md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true));
-
-        return $idLeft.'@'.$this->idRight;
+        // 32 hex values for the left part
+        return bin2hex(random_bytes(16)).'@'.$this->idRight;
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php
index d49449fe5be..d0b2e6586b4 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/MimePart.php
@@ -30,11 +30,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
     /**
      * Create a new MimePart with $headers, $encoder and $cache.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     * @param Swift_Mime_ContentEncoder  $encoder
-     * @param Swift_KeyCache             $cache
-     * @param Swift_IdGenerator          $idGenerator
-     * @param string                     $charset
+     * @param string $charset
      */
     public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $charset = null)
     {
@@ -173,7 +169,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
     protected function fixHeaders()
     {
         parent::fixHeaders();
-        if (count($this->getChildren())) {
+        if (\count($this->getChildren())) {
             $this->setHeaderParameter('Content-Type', 'charset', null);
             $this->setHeaderParameter('Content-Type', 'format', null);
             $this->setHeaderParameter('Content-Type', 'delsp', null);
@@ -193,18 +189,9 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
     /** Encode charset when charset is not utf-8 */
     protected function convertString($string)
     {
-        $charset = strtolower($this->getCharset());
-        if (!in_array($charset, array('utf-8', 'iso-8859-1', 'iso-8859-15', ''))) {
-            // mb_convert_encoding must be the first one to check, since iconv cannot convert some words.
-            if (function_exists('mb_convert_encoding')) {
-                $string = mb_convert_encoding($string, $charset, 'utf-8');
-            } elseif (function_exists('iconv')) {
-                $string = iconv('utf-8//TRANSLIT//IGNORE', $charset, $string);
-            } else {
-                throw new Swift_SwiftException('No suitable convert encoding function (use UTF-8 as your charset or install the mbstring or iconv extension).');
-            }
-
-            return $string;
+        $charset = strtolower($this->getCharset() ?? '');
+        if (!\in_array($charset, ['utf-8', 'iso-8859-1', 'iso-8859-15', ''])) {
+            return mb_convert_encoding($string, $charset, 'utf-8');
         }
 
         return $string;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
index e14c9d6f88e..ab3ce6b1914 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
@@ -23,29 +23,27 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
     /** The Encoder used by parameters */
     private $paramEncoder;
 
-    /** The Grammar */
-    private $grammar;
-
     /** Strict EmailValidator */
     private $emailValidator;
 
     /** The charset of created Headers */
     private $charset;
 
+    /** Swift_AddressEncoder */
+    private $addressEncoder;
+
     /**
      * Creates a new SimpleHeaderFactory using $encoder and $paramEncoder.
      *
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param Swift_Encoder            $paramEncoder
-     * @param EmailValidator           $emailValidator
-     * @param string|null              $charset
+     * @param string|null $charset
      */
-    public function __construct(Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder, EmailValidator $emailValidator, $charset = null)
+    public function __construct(Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder, EmailValidator $emailValidator, $charset = null, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->encoder = $encoder;
         $this->paramEncoder = $paramEncoder;
         $this->emailValidator = $emailValidator;
         $this->charset = $charset;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -58,7 +56,7 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
      */
     public function createMailboxHeader($name, $addresses = null)
     {
-        $header = new Swift_Mime_Headers_MailboxHeader($name, $this->encoder, $this->emailValidator);
+        $header = new Swift_Mime_Headers_MailboxHeader($name, $this->encoder, $this->emailValidator, $this->addressEncoder);
         if (isset($addresses)) {
             $header->setFieldBodyModel($addresses);
         }
@@ -70,8 +68,7 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
     /**
      * Create a new Date header using $dateTime.
      *
-     * @param string                 $name
-     * @param DateTimeInterface|null $dateTime
+     * @param string $name
      *
      * @return Swift_Mime_Header
      */
@@ -114,9 +111,9 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
      *
      * @return Swift_Mime_Headers_ParameterizedHeader
      */
-    public function createParameterizedHeader($name, $value = null, $params = array())
+    public function createParameterizedHeader($name, $value = null, $params = [])
     {
-        $header = new Swift_Mime_Headers_ParameterizedHeader($name, $this->encoder, (strtolower($name) == 'content-disposition') ? $this->paramEncoder : null);
+        $header = new Swift_Mime_Headers_ParameterizedHeader($name, $this->encoder, ('content-disposition' == strtolower($name ?? '')) ? $this->paramEncoder : null);
         if (isset($value)) {
             $header->setFieldBodyModel($value);
         }
@@ -185,6 +182,7 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
     {
         $this->encoder = clone $this->encoder;
         $this->paramEncoder = clone $this->paramEncoder;
+        $this->addressEncoder = clone $this->addressEncoder;
     }
 
     /** Apply the charset to the Header */
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
index 6f71fcac132..5195bcf48ae 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
@@ -19,13 +19,13 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     private $factory;
 
     /** Collection of set Headers */
-    private $headers = array();
+    private $headers = [];
 
     /** Field ordering details */
-    private $order = array();
+    private $order = [];
 
     /** List of fields which are required to be displayed */
-    private $required = array();
+    private $required = [];
 
     /** The charset used by Headers */
     private $charset;
@@ -33,8 +33,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     /**
      * Create a new SimpleHeaderSet with the given $factory.
      *
-     * @param Swift_Mime_SimpleHeaderFactory $factory
-     * @param string                         $charset
+     * @param string $charset
      */
     public function __construct(Swift_Mime_SimpleHeaderFactory $factory, $charset = null)
     {
@@ -69,20 +68,17 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      */
     public function addMailboxHeader($name, $addresses = null)
     {
-        $this->storeHeader($name,
-        $this->factory->createMailboxHeader($name, $addresses));
+        $this->storeHeader($name, $this->factory->createMailboxHeader($name, $addresses));
     }
 
     /**
      * Add a new Date header using $dateTime.
      *
-     * @param string            $name
-     * @param DateTimeInterface $dateTime
+     * @param string $name
      */
     public function addDateHeader($name, DateTimeInterface $dateTime = null)
     {
-        $this->storeHeader($name,
-        $this->factory->createDateHeader($name, $dateTime));
+        $this->storeHeader($name, $this->factory->createDateHeader($name, $dateTime));
     }
 
     /**
@@ -93,8 +89,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      */
     public function addTextHeader($name, $value = null)
     {
-        $this->storeHeader($name,
-        $this->factory->createTextHeader($name, $value));
+        $this->storeHeader($name, $this->factory->createTextHeader($name, $value));
     }
 
     /**
@@ -104,7 +99,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      * @param string $value
      * @param array  $params
      */
-    public function addParameterizedHeader($name, $value = null, $params = array())
+    public function addParameterizedHeader($name, $value = null, $params = [])
     {
         $this->storeHeader($name, $this->factory->createParameterizedHeader($name, $value, $params));
     }
@@ -143,18 +138,18 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      */
     public function has($name, $index = 0)
     {
-        $lowerName = strtolower($name);
+        $lowerName = strtolower($name ?? '');
 
-        if (!array_key_exists($lowerName, $this->headers)) {
+        if (!\array_key_exists($lowerName, $this->headers)) {
             return false;
         }
 
-        if (func_num_args() < 2) {
+        if (\func_num_args() < 2) {
             // index was not specified, so we only need to check that there is at least one header value set
-            return (bool) count($this->headers[$lowerName]);
+            return (bool) \count($this->headers[$lowerName]);
         }
 
-        return array_key_exists($index, $this->headers[$lowerName]);
+        return \array_key_exists($index, $this->headers[$lowerName]);
     }
 
     /**
@@ -166,8 +161,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      * If $index is specified, the header will be inserted into the set at this
      * offset.
      *
-     * @param Swift_Mime_Header $header
-     * @param int               $index
+     * @param int $index
      */
     public function set(Swift_Mime_Header $header, $index = 0)
     {
@@ -183,13 +177,13 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      * @param string $name
      * @param int    $index
      *
-     * @return Swift_Mime_Header
+     * @return Swift_Mime_Header|null
      */
     public function get($name, $index = 0)
     {
-        $name = strtolower($name);
+        $name = strtolower($name ?? '');
 
-        if (func_num_args() < 2) {
+        if (\func_num_args() < 2) {
             if ($this->has($name)) {
                 $values = array_values($this->headers[$name]);
 
@@ -212,7 +206,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     public function getAll($name = null)
     {
         if (!isset($name)) {
-            $headers = array();
+            $headers = [];
             foreach ($this->headers as $collection) {
                 $headers = array_merge($headers, $collection);
             }
@@ -220,9 +214,9 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
             return $headers;
         }
 
-        $lowerName = strtolower($name);
-        if (!array_key_exists($lowerName, $this->headers)) {
-            return array();
+        $lowerName = strtolower($name ?? '');
+        if (!\array_key_exists($lowerName, $this->headers)) {
+            return [];
         }
 
         return $this->headers[$lowerName];
@@ -237,7 +231,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     {
         $headers = $this->headers;
         if ($this->canSort()) {
-            uksort($headers, array($this, 'sortHeaders'));
+            uksort($headers, [$this, 'sortHeaders']);
         }
 
         return array_keys($headers);
@@ -253,7 +247,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      */
     public function remove($name, $index = 0)
     {
-        $lowerName = strtolower($name);
+        $lowerName = strtolower($name ?? '');
         unset($this->headers[$lowerName][$index]);
     }
 
@@ -264,7 +258,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      */
     public function removeAll($name)
     {
-        $lowerName = strtolower($name);
+        $lowerName = strtolower($name ?? '');
         unset($this->headers[$lowerName]);
     }
 
@@ -272,8 +266,6 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      * Define a list of Header names as an array in the correct order.
      *
      * These Headers will be output in the given order where present.
-     *
-     * @param array $sequence
      */
     public function defineOrdering(array $sequence)
     {
@@ -284,8 +276,6 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
      * Set a list of header names which must always be displayed when set.
      *
      * Usually headers without a field value won't be output unless set here.
-     *
-     * @param array $names
      */
     public function setAlwaysDisplayed(array $names)
     {
@@ -312,11 +302,11 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
         $string = '';
         $headers = $this->headers;
         if ($this->canSort()) {
-            uksort($headers, array($this, 'sortHeaders'));
+            uksort($headers, [$this, 'sortHeaders']);
         }
         foreach ($headers as $collection) {
             foreach ($collection as $header) {
-                if ($this->isDisplayed($header) || $header->getFieldBody() != '') {
+                if ($this->isDisplayed($header) || '' != $header->getFieldBody()) {
                     $string .= $header->toString();
                 }
             }
@@ -340,38 +330,38 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     /** Save a Header to the internal collection */
     private function storeHeader($name, Swift_Mime_Header $header, $offset = null)
     {
-        if (!isset($this->headers[strtolower($name)])) {
-            $this->headers[strtolower($name)] = array();
+        if (!isset($this->headers[strtolower($name ?? '')])) {
+            $this->headers[strtolower($name ?? '')] = [];
         }
         if (!isset($offset)) {
-            $this->headers[strtolower($name)][] = $header;
+            $this->headers[strtolower($name ?? '')][] = $header;
         } else {
-            $this->headers[strtolower($name)][$offset] = $header;
+            $this->headers[strtolower($name ?? '')][$offset] = $header;
         }
     }
 
     /** Test if the headers can be sorted */
     private function canSort()
     {
-        return count($this->order) > 0;
+        return \count($this->order) > 0;
     }
 
     /** uksort() algorithm for Header ordering */
     private function sortHeaders($a, $b)
     {
-        $lowerA = strtolower($a);
-        $lowerB = strtolower($b);
-        $aPos = array_key_exists($lowerA, $this->order) ? $this->order[$lowerA] : -1;
-        $bPos = array_key_exists($lowerB, $this->order) ? $this->order[$lowerB] : -1;
+        $lowerA = strtolower($a ?? '');
+        $lowerB = strtolower($b ?? '');
+        $aPos = \array_key_exists($lowerA, $this->order) ? $this->order[$lowerA] : -1;
+        $bPos = \array_key_exists($lowerB, $this->order) ? $this->order[$lowerB] : -1;
 
         if (-1 === $aPos && -1 === $bPos) {
             // just be sure to be determinist here
             return $a > $b ? -1 : 1;
         }
 
-        if ($aPos == -1) {
+        if (-1 == $aPos) {
             return 1;
-        } elseif ($bPos == -1) {
+        } elseif (-1 == $bPos) {
             return -1;
         }
 
@@ -381,7 +371,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
     /** Test if the given Header is always displayed */
     private function isDisplayed(Swift_Mime_Header $header)
     {
-        return array_key_exists(strtolower($header->getFieldName()), $this->required);
+        return \array_key_exists(strtolower($header->getFieldName() ?? ''), $this->required);
     }
 
     /** Notify all Headers of the new charset */
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
index f8667954bcf..62da1650a7b 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
@@ -24,16 +24,12 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     /**
      * Create a new SimpleMessage with $headers, $encoder and $cache.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     * @param Swift_Mime_ContentEncoder  $encoder
-     * @param Swift_KeyCache             $cache
-     * @param Swift_IdGenerator          $idGenerator
-     * @param string                     $charset
+     * @param string $charset
      */
     public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $charset = null)
     {
         parent::__construct($headers, $encoder, $cache, $idGenerator, $charset);
-        $this->getHeaders()->defineOrdering(array(
+        $this->getHeaders()->defineOrdering([
             'Return-Path',
             'Received',
             'DKIM-Signature',
@@ -50,8 +46,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
             'MIME-Version',
             'Content-Type',
             'Content-Transfer-Encoding',
-            ));
-        $this->getHeaders()->setAlwaysDisplayed(array('Date', 'Message-ID', 'From'));
+            ]);
+        $this->getHeaders()->setAlwaysDisplayed(['Date', 'Message-ID', 'From']);
         $this->getHeaders()->addTextHeader('MIME-Version', '1.0');
         $this->setDate(new DateTimeImmutable());
         $this->setId($this->getId());
@@ -97,8 +93,6 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     /**
      * Set the date at which this message was created.
      *
-     * @param DateTimeInterface $dateTime
-     *
      * @return $this
      */
     public function setDate(DateTimeInterface $dateTime)
@@ -158,8 +152,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function setSender($address, $name = null)
     {
-        if (!is_array($address) && isset($name)) {
-            $address = array($address => $name);
+        if (!\is_array($address) && isset($name)) {
+            $address = [$address => $name];
         }
 
         if (!$this->setHeaderFieldModel('Sender', (array) $address)) {
@@ -212,8 +206,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function setFrom($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
         if (!$this->setHeaderFieldModel('From', (array) $addresses)) {
@@ -266,8 +260,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function setReplyTo($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
         if (!$this->setHeaderFieldModel('Reply-To', (array) $addresses)) {
@@ -321,8 +315,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function setTo($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
         if (!$this->setHeaderFieldModel('To', (array) $addresses)) {
@@ -373,8 +367,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function setCc($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
         if (!$this->setHeaderFieldModel('Cc', (array) $addresses)) {
@@ -425,8 +419,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function setBcc($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
         if (!$this->setHeaderFieldModel('Bcc', (array) $addresses)) {
@@ -457,13 +451,13 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function setPriority($priority)
     {
-        $priorityMap = array(
+        $priorityMap = [
             self::PRIORITY_HIGHEST => 'Highest',
             self::PRIORITY_HIGH => 'High',
             self::PRIORITY_NORMAL => 'Normal',
             self::PRIORITY_LOW => 'Low',
             self::PRIORITY_LOWEST => 'Lowest',
-            );
+            ];
         $pMapKeys = array_keys($priorityMap);
         if ($priority > max($pMapKeys)) {
             $priority = max($pMapKeys);
@@ -493,7 +487,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
             '%[1-5]'
             );
 
-        return isset($priority) ? $priority : 3;
+        return $priority ?? 3;
     }
 
     /**
@@ -526,13 +520,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     /**
      * Attach a {@link Swift_Mime_SimpleMimeEntity} such as an Attachment or MimePart.
      *
-     * @param Swift_Mime_SimpleMimeEntity $entity
-     *
      * @return $this
      */
     public function attach(Swift_Mime_SimpleMimeEntity $entity)
     {
-        $this->setChildren(array_merge($this->getChildren(), array($entity)));
+        $this->setChildren(array_merge($this->getChildren(), [$entity]));
 
         return $this;
     }
@@ -540,13 +532,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
     /**
      * Remove an already attached entity.
      *
-     * @param Swift_Mime_SimpleMimeEntity $entity
-     *
      * @return $this
      */
     public function detach(Swift_Mime_SimpleMimeEntity $entity)
     {
-        $newChildren = array();
+        $newChildren = [];
         foreach ($this->getChildren() as $child) {
             if ($entity !== $child) {
                 $newChildren[] = $child;
@@ -559,9 +549,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
 
     /**
      * Attach a {@link Swift_Mime_SimpleMimeEntity} and return it's CID source.
-     * This method should be used when embedding images or other data in a message.
      *
-     * @param Swift_Mime_SimpleMimeEntity $entity
+     * This method should be used when embedding images or other data in a message.
      *
      * @return string
      */
@@ -579,8 +568,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
      */
     public function toString()
     {
-        if (count($children = $this->getChildren()) > 0 && $this->getBody() != '') {
-            $this->setChildren(array_merge(array($this->becomeMimePart()), $children));
+        if (\count($children = $this->getChildren()) > 0 && '' != $this->getBody()) {
+            $this->setChildren(array_merge([$this->becomeMimePart()], $children));
             $string = parent::toString();
             $this->setChildren($children);
         } else {
@@ -604,13 +593,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
 
     /**
      * Write this message to a {@link Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function toByteStream(Swift_InputByteStream $is)
     {
-        if (count($children = $this->getChildren()) > 0 && $this->getBody() != '') {
-            $this->setChildren(array_merge(array($this->becomeMimePart()), $children));
+        if (\count($children = $this->getChildren()) > 0 && '' != $this->getBody()) {
+            $this->setChildren(array_merge([$this->becomeMimePart()], $children));
             parent::toByteStream($is);
             $this->setChildren($children);
         } else {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
index 980f1cedc1c..03eaf472dd5 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
@@ -43,14 +43,14 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     private $boundary;
 
     /** Mime types to be used based on the nesting level */
-    private $compositeRanges = array(
-        'multipart/mixed' => array(self::LEVEL_TOP, self::LEVEL_MIXED),
-        'multipart/alternative' => array(self::LEVEL_MIXED, self::LEVEL_ALTERNATIVE),
-        'multipart/related' => array(self::LEVEL_ALTERNATIVE, self::LEVEL_RELATED),
-    );
+    private $compositeRanges = [
+        'multipart/mixed' => [self::LEVEL_TOP, self::LEVEL_MIXED],
+        'multipart/alternative' => [self::LEVEL_MIXED, self::LEVEL_ALTERNATIVE],
+        'multipart/related' => [self::LEVEL_ALTERNATIVE, self::LEVEL_RELATED],
+    ];
 
     /** A set of filter rules to define what level an entity should be nested at */
-    private $compoundLevelFilters = array();
+    private $compoundLevelFilters = [];
 
     /** The nesting level of this entity */
     private $nestingLevel = self::LEVEL_ALTERNATIVE;
@@ -59,20 +59,20 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     private $cache;
 
     /** Direct descendants of this entity */
-    private $immediateChildren = array();
+    private $immediateChildren = [];
 
     /** All descendants of this entity */
-    private $children = array();
+    private $children = [];
 
     /** The maximum line length of the body of this entity */
     private $maxLineLength = 78;
 
     /** The order in which alternative mime types should appear */
-    private $alternativePartOrder = array(
+    private $alternativePartOrder = [
         'text/plain' => 1,
         'text/html' => 2,
         'multipart/related' => 3,
-    );
+    ];
 
     /** The CID of this entity */
     private $id;
@@ -84,20 +84,15 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
 
     /**
      * Create a new SimpleMimeEntity with $headers, $encoder and $cache.
-     *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     * @param Swift_Mime_ContentEncoder  $encoder
-     * @param Swift_KeyCache             $cache
-     * @param Swift_IdGenerator          $idGenerator
      */
     public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator)
     {
-        $this->cacheKey = md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true));
+        $this->cacheKey = bin2hex(random_bytes(16)); // set 32 hex values
         $this->cache = $cache;
         $this->headers = $headers;
         $this->idGenerator = $idGenerator;
         $this->setEncoder($encoder);
-        $this->headers->defineOrdering(array('Content-Type', 'Content-Transfer-Encoding'));
+        $this->headers->defineOrdering(['Content-Type', 'Content-Transfer-Encoding']);
 
         // This array specifies that, when the entire MIME document contains
         // $compoundLevel, then for each child within $level, if its Content-Type
@@ -112,14 +107,14 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         //   )
         // )
 
-        $this->compoundLevelFilters = array(
-            (self::LEVEL_ALTERNATIVE + self::LEVEL_RELATED) => array(
-                self::LEVEL_ALTERNATIVE => array(
+        $this->compoundLevelFilters = [
+            (self::LEVEL_ALTERNATIVE + self::LEVEL_RELATED) => [
+                self::LEVEL_ALTERNATIVE => [
                     'text/plain' => self::LEVEL_ALTERNATIVE,
                     'text/html' => self::LEVEL_RELATED,
-                    ),
-                ),
-            );
+                    ],
+                ],
+            ];
 
         $this->id = $this->idGenerator->generateId();
     }
@@ -168,6 +163,16 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         return $this->getHeaderFieldModel('Content-Type');
     }
 
+    /**
+     * Get the Body Content-type of this entity.
+     *
+     * @return string
+     */
+    public function getBodyContentType()
+    {
+        return $this->userContentType;
+    }
+
     /**
      * Set the Content-type of this entity.
      *
@@ -293,16 +298,16 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     public function setChildren(array $children, $compoundLevel = null)
     {
         // TODO: Try to refactor this logic
-        $compoundLevel = isset($compoundLevel) ? $compoundLevel : $this->getCompoundLevel($children);
-        $immediateChildren = array();
-        $grandchildren = array();
+        $compoundLevel = $compoundLevel ?? $this->getCompoundLevel($children);
+        $immediateChildren = [];
+        $grandchildren = [];
         $newContentType = $this->userContentType;
 
         foreach ($children as $child) {
             $level = $this->getNeededChildLevel($child, $compoundLevel);
             if (empty($immediateChildren)) {
                 //first iteration
-                $immediateChildren = array($child);
+                $immediateChildren = [$child];
             } else {
                 $nextLevel = $this->getNeededChildLevel($immediateChildren[0], $compoundLevel);
                 if ($nextLevel == $level) {
@@ -311,7 +316,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
                     // Re-assign immediateChildren to grandchildren
                     $grandchildren = array_merge($grandchildren, $immediateChildren);
                     // Set new children
-                    $immediateChildren = array($child);
+                    $immediateChildren = [$child];
                 } else {
                     $grandchildren[] = $child;
                 }
@@ -375,7 +380,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         }
 
         $this->body = $body;
-        if (isset($contentType)) {
+        if (null !== $contentType) {
             $this->setContentType($contentType);
         }
 
@@ -395,8 +400,6 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     /**
      * Set the encoder used for the body of this entity.
      *
-     * @param Swift_Mime_ContentEncoder $encoder
-     *
      * @return $this
      */
     public function setEncoder(Swift_Mime_ContentEncoder $encoder)
@@ -420,7 +423,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     public function getBoundary()
     {
         if (!isset($this->boundary)) {
-            $this->boundary = '_=_swift_'.time().'_'.md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true)).'_=_';
+            $this->boundary = '_=_swift_'.time().'_'.bin2hex(random_bytes(16)).'_=_';
         }
 
         return $this->boundary;
@@ -457,8 +460,6 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     /**
      * Receive notification that the encoder of this entity or a parent entity
      * has changed.
-     *
-     * @param Swift_Mime_ContentEncoder $encoder
      */
     public function encoderChanged(Swift_Mime_ContentEncoder $encoder)
     {
@@ -522,8 +523,6 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
 
     /**
      * Write this entire entity to a {@see Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream
      */
     public function toByteStream(Swift_InputByteStream $is)
     {
@@ -535,8 +534,6 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
 
     /**
      * Write this entire entity to a {@link Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream
      */
     protected function bodyToByteStream(Swift_InputByteStream $is)
     {
@@ -637,7 +634,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
      */
     protected function fixHeaders()
     {
-        if (count($this->immediateChildren)) {
+        if (\count($this->immediateChildren)) {
             $this->setHeaderParameter('Content-Type', 'boundary',
                 $this->getBoundary()
                 );
@@ -726,7 +723,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
 
     private function getNeededChildLevel($child, $compoundLevel)
     {
-        $filter = array();
+        $filter = [];
         foreach ($this->compoundLevelFilters as $bitmask => $rules) {
             if (($compoundLevel & $bitmask) === $bitmask) {
                 $filter = $rules + $filter;
@@ -734,7 +731,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         }
 
         $realLevel = $child->getNestingLevel();
-        $lowercaseType = strtolower($child->getContentType());
+        $lowercaseType = strtolower($child->getContentType() ?? '');
 
         if (isset($filter[$realLevel]) && isset($filter[$realLevel][$lowercaseType])) {
             return $filter[$realLevel][$lowercaseType];
@@ -769,7 +766,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         $shouldSort = false;
         foreach ($this->immediateChildren as $child) {
             // NOTE: This include alternative parts moved into a related part
-            if ($child->getNestingLevel() == self::LEVEL_ALTERNATIVE) {
+            if (self::LEVEL_ALTERNATIVE == $child->getNestingLevel()) {
                 $shouldSort = true;
                 break;
             }
@@ -778,13 +775,13 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
         // Sort in order of preference, if there is one
         if ($shouldSort) {
             // Group the messages by order of preference
-            $sorted = array();
+            $sorted = [];
             foreach ($this->immediateChildren as $child) {
                 $type = $child->getContentType();
-                $level = array_key_exists($type, $this->alternativePartOrder) ? $this->alternativePartOrder[$type] : max($this->alternativePartOrder) + 1;
+                $level = \array_key_exists($type, $this->alternativePartOrder) ? $this->alternativePartOrder[$type] : max($this->alternativePartOrder) + 1;
 
                 if (empty($sorted[$level])) {
-                    $sorted[$level] = array();
+                    $sorted[$level] = [];
                 }
 
                 $sorted[$level][] = $child;
@@ -792,7 +789,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
 
             ksort($sorted);
 
-            $this->immediateChildren = array_reduce($sorted, 'array_merge', array());
+            $this->immediateChildren = array_reduce($sorted, 'array_merge', []);
         }
     }
 
@@ -813,11 +810,17 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_M
     {
         $this->headers = clone $this->headers;
         $this->encoder = clone $this->encoder;
-        $this->cacheKey = md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true));
-        $children = array();
+        $this->cacheKey = bin2hex(random_bytes(16)); // set 32 hex values
+        $children = [];
         foreach ($this->children as $pos => $child) {
             $children[$pos] = clone $child;
         }
         $this->setChildren($children);
     }
+
+    public function __wakeup()
+    {
+        $this->cacheKey = bin2hex(random_bytes(16)); // set 32 hex values
+        $this->cache = new Swift_KeyCache_ArrayKeyCache(new Swift_KeyCache_SimpleKeyCacheInputStream());
+    }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/MimePart.php b/htdocs/includes/swiftmailer/lib/classes/Swift/MimePart.php
index 8fa0cbebcd2..ea97619ad69 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/MimePart.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/MimePart.php
@@ -26,8 +26,8 @@ class Swift_MimePart extends Swift_Mime_MimePart
      */
     public function __construct($body = null, $contentType = null, $charset = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Mime_MimePart::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Mime_MimePart::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.part')
             );
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/NullTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/NullTransport.php
index a580dfbefb6..e44b7af982f 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/NullTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/NullTransport.php
@@ -17,8 +17,8 @@ class Swift_NullTransport extends Swift_Transport_NullTransport
 {
     public function __construct()
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_NullTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_NullTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.null')
         );
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
index 06b3109e62c..5b1d7deefff 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
@@ -99,8 +99,6 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -108,8 +106,6 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
index af060a99cc3..36451f44f1f 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
@@ -30,7 +30,7 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
     private $in = 0;
 
     /** Bound byte streams */
-    private $mirrors = array();
+    private $mirrors = [];
 
     /**
      * Not used.
@@ -41,8 +41,6 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -52,24 +50,20 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
 
     /**
      * Invoked immediately following a command being sent.
-     *
-     * @param Swift_Events_CommandEvent $evt
      */
     public function commandSent(Swift_Events_CommandEvent $evt)
     {
         $command = $evt->getCommand();
-        $this->out += strlen($command);
+        $this->out += \strlen($command);
     }
 
     /**
      * Invoked immediately following a response coming back.
-     *
-     * @param Swift_Events_ResponseEvent $evt
      */
     public function responseReceived(Swift_Events_ResponseEvent $evt)
     {
         $response = $evt->getResponse();
-        $this->in += strlen($response);
+        $this->in += \strlen($response);
     }
 
     /**
@@ -79,7 +73,7 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      */
     public function write($bytes)
     {
-        $this->out += strlen($bytes);
+        $this->out += \strlen($bytes);
         foreach ($this->mirrors as $stream) {
             $stream->write($bytes);
         }
@@ -97,8 +91,6 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
@@ -111,8 +103,6 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
index 745ee879003..93124c9a5f4 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
@@ -23,10 +23,10 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
     private $originalBody;
 
     /** The original headers of the message, before replacements */
-    private $originalHeaders = array();
+    private $originalHeaders = [];
 
     /** Bodies of children before they are replaced */
-    private $originalChildBodies = array();
+    private $originalChildBodies = [];
 
     /** The Message that was last replaced */
     private $lastMessage;
@@ -74,8 +74,6 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -98,20 +96,20 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
             foreach ($message->getHeaders()->getAll() as $header) {
                 $body = $header->getFieldBodyModel();
                 $count = 0;
-                if (is_array($body)) {
-                    $bodyReplaced = array();
+                if (\is_array($body)) {
+                    $bodyReplaced = [];
                     foreach ($body as $key => $value) {
                         $count1 = 0;
                         $count2 = 0;
-                        $key = is_string($key) ? str_replace($search, $replace, $key, $count1) : $key;
-                        $value = is_string($value) ? str_replace($search, $replace, $value, $count2) : $value;
+                        $key = \is_string($key) ? str_replace($search, $replace, $key, $count1) : $key;
+                        $value = \is_string($value) ? str_replace($search, $replace, $value, $count2) : $value;
                         $bodyReplaced[$key] = $value;
 
                         if (!$count && ($count1 || $count2)) {
                             $count = 1;
                         }
                     }
-                } elseif (is_string($body)) {
+                } elseif (\is_string($body)) {
                     $bodyReplaced = str_replace($search, $replace, $body, $count);
                 }
 
@@ -159,13 +157,11 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
             return $this->replacements->getReplacementsFor($address);
         }
 
-        return isset($this->replacements[$address]) ? $this->replacements[$address] : null;
+        return $this->replacements[$address] ?? null;
     }
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -182,21 +178,21 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
             }
             if (!empty($this->originalHeaders)) {
                 foreach ($message->getHeaders()->getAll() as $header) {
-                    if (array_key_exists($header->getFieldName(), $this->originalHeaders)) {
+                    if (\array_key_exists($header->getFieldName(), $this->originalHeaders)) {
                         $header->setFieldBodyModel($this->originalHeaders[$header->getFieldName()]);
                     }
                 }
-                $this->originalHeaders = array();
+                $this->originalHeaders = [];
             }
             if (!empty($this->originalChildBodies)) {
                 $children = (array) $message->getChildren();
                 foreach ($children as $child) {
                     $id = $child->getId();
-                    if (array_key_exists($id, $this->originalChildBodies)) {
+                    if (\array_key_exists($id, $this->originalChildBodies)) {
                         $child->setBody($this->originalChildBodies[$id]);
                     }
                 }
-                $this->originalChildBodies = array();
+                $this->originalChildBodies = [];
             }
             $this->lastMessage = null;
         }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
index b975d36b858..3f4dbbfa40f 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
@@ -34,8 +34,6 @@ class Swift_Plugins_ImpersonatePlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -51,8 +49,6 @@ class Swift_Plugins_ImpersonatePlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
index 7ddf1fd16db..e183749b7ec 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
@@ -20,8 +20,6 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
 
     /**
      * Create a new LoggerPlugin using $logger.
-     *
-     * @param Swift_Plugins_Logger $logger
      */
     public function __construct(Swift_Plugins_Logger $logger)
     {
@@ -58,8 +56,6 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
 
     /**
      * Invoked immediately following a command being sent.
-     *
-     * @param Swift_Events_CommandEvent $evt
      */
     public function commandSent(Swift_Events_CommandEvent $evt)
     {
@@ -69,8 +65,6 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
 
     /**
      * Invoked immediately following a response coming back.
-     *
-     * @param Swift_Events_ResponseEvent $evt
      */
     public function responseReceived(Swift_Events_ResponseEvent $evt)
     {
@@ -80,52 +74,42 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
 
     /**
      * Invoked just before a Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
     {
-        $transportName = get_class($evt->getSource());
+        $transportName = \get_class($evt->getSource());
         $this->logger->add(sprintf('++ Starting %s', $transportName));
     }
 
     /**
      * Invoked immediately after the Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStarted(Swift_Events_TransportChangeEvent $evt)
     {
-        $transportName = get_class($evt->getSource());
+        $transportName = \get_class($evt->getSource());
         $this->logger->add(sprintf('++ %s started', $transportName));
     }
 
     /**
      * Invoked just before a Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt)
     {
-        $transportName = get_class($evt->getSource());
+        $transportName = \get_class($evt->getSource());
         $this->logger->add(sprintf('++ Stopping %s', $transportName));
     }
 
     /**
      * Invoked immediately after the Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStopped(Swift_Events_TransportChangeEvent $evt)
     {
-        $transportName = get_class($evt->getSource());
+        $transportName = \get_class($evt->getSource());
         $this->logger->add(sprintf('++ %s stopped', $transportName));
     }
 
     /**
      * Invoked as a TransportException is thrown in the Transport system.
-     *
-     * @param Swift_Events_TransportExceptionEvent $evt
      */
     public function exceptionThrown(Swift_Events_TransportExceptionEvent $evt)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
index 186b6b41bcd..6f595adaa4d 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
@@ -20,7 +20,7 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
      *
      * @var array
      */
-    private $log = array();
+    private $log = [];
 
     /**
      * Max size of the log.
@@ -47,7 +47,7 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
     public function add($entry)
     {
         $this->log[] = $entry;
-        while (count($this->log) > $this->size) {
+        while (\count($this->log) > $this->size) {
             array_shift($this->log);
         }
     }
@@ -57,7 +57,7 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
      */
     public function clear()
     {
-        $this->log = array();
+        $this->log = [];
     }
 
     /**
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
index 5ff1d9321c0..39c48ed18f5 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
@@ -16,19 +16,19 @@
 class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
 {
     /**
-     * @var Swift_Mime_Message[]
+     * @var Swift_Mime_SimpleMessage[]
      */
     private $messages;
 
     public function __construct()
     {
-        $this->messages = array();
+        $this->messages = [];
     }
 
     /**
      * Get the message list.
      *
-     * @return Swift_Mime_Message[]
+     * @return Swift_Mime_SimpleMessage[]
      */
     public function getMessages()
     {
@@ -42,7 +42,7 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
      */
     public function countMessages()
     {
-        return count($this->messages);
+        return \count($this->messages);
     }
 
     /**
@@ -50,13 +50,11 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
      */
     public function clear()
     {
-        $this->messages = array();
+        $this->messages = [];
     }
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -65,8 +63,6 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
index c19403aec61..9448594090b 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
@@ -45,7 +45,8 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
     /**
      * Create a new PopBeforeSmtpPlugin for $host and $port.
      *
-     * @param string $host
+     * @param string $host   Hostname or IP. Literal IPv6 addresses should be
+     *                       wrapped in square brackets.
      * @param int    $port
      * @param string $crypto as "tls" or "ssl"
      */
@@ -59,8 +60,6 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
     /**
      * Set a Pop3Connection to delegate to instead of connecting directly.
      *
-     * @param Swift_Plugins_Pop_Pop3Connection $connection
-     *
      * @return $this
      */
     public function setConnection(Swift_Plugins_Pop_Pop3Connection $connection)
@@ -72,8 +71,6 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
 
     /**
      * Bind this plugin to a specific SMTP transport instance.
-     *
-     * @param Swift_Transport
      */
     public function bindSmtp(Swift_Transport $smtp)
     {
@@ -135,16 +132,12 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
             if (!isset($this->socket)) {
                 if (!$socket = fsockopen(
                     $this->getHostString(), $this->port, $errno, $errstr, $this->timeout)) {
-                    throw new Swift_Plugins_Pop_Pop3Exception(
-                        sprintf('Failed to connect to POP3 host [%s]: %s', $this->host, $errstr)
-                    );
+                    throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to connect to POP3 host [%s]: %s', $this->host, $errstr));
                 }
                 $this->socket = $socket;
 
                 if (false === $greeting = fgets($this->socket)) {
-                    throw new Swift_Plugins_Pop_Pop3Exception(
-                        sprintf('Failed to connect to POP3 host [%s]', trim($greeting))
-                    );
+                    throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to connect to POP3 host [%s]', trim($greeting ?? '')));
                 }
 
                 $this->assertOk($greeting);
@@ -167,9 +160,7 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
         } else {
             $this->command("QUIT\r\n");
             if (!fclose($this->socket)) {
-                throw new Swift_Plugins_Pop_Pop3Exception(
-                    sprintf('POP3 host [%s] connection could not be stopped', $this->host)
-                );
+                throw new Swift_Plugins_Pop_Pop3Exception(sprintf('POP3 host [%s] connection could not be stopped', $this->host));
             }
             $this->socket = null;
         }
@@ -177,8 +168,6 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
 
     /**
      * Invoked just before a Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
     {
@@ -216,15 +205,11 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
     private function command($command)
     {
         if (!fwrite($this->socket, $command)) {
-            throw new Swift_Plugins_Pop_Pop3Exception(
-                sprintf('Failed to write command [%s] to POP3 host', trim($command))
-            );
+            throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to write command [%s] to POP3 host', trim($command ?? '')));
         }
 
         if (false === $response = fgets($this->socket)) {
-            throw new Swift_Plugins_Pop_Pop3Exception(
-                sprintf('Failed to read from POP3 host after command [%s]', trim($command))
-            );
+            throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to read from POP3 host after command [%s]', trim($command ?? '')));
         }
 
         $this->assertOk($response);
@@ -234,17 +219,15 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
 
     private function assertOk($response)
     {
-        if (substr($response, 0, 3) != '+OK') {
-            throw new Swift_Plugins_Pop_Pop3Exception(
-                sprintf('POP3 command failed [%s]', trim($response))
-            );
+        if ('+OK' != substr($response, 0, 3)) {
+            throw new Swift_Plugins_Pop_Pop3Exception(sprintf('POP3 command failed [%s]', trim($response ?? '')));
         }
     }
 
     private function getHostString()
     {
         $host = $this->host;
-        switch (strtolower($this->crypto)) {
+        switch (strtolower($this->crypto ?? '')) {
             case 'ssl':
                 $host = 'ssl://'.$host;
                 break;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
index 8d797dd117b..f7373b2424c 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
@@ -27,15 +27,14 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
      *
      * @var array
      */
-    private $whitelist = array();
+    private $whitelist = [];
 
     /**
      * Create a new RedirectingPlugin.
      *
      * @param mixed $recipient
-     * @param array $whitelist
      */
-    public function __construct($recipient, array $whitelist = array())
+    public function __construct($recipient, array $whitelist = [])
     {
         $this->recipient = $recipient;
         $this->whitelist = $whitelist;
@@ -63,8 +62,6 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
 
     /**
      * Set a list of regular expressions to whitelist certain recipients.
-     *
-     * @param array $whitelist
      */
     public function setWhitelist(array $whitelist)
     {
@@ -83,8 +80,6 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -113,11 +108,11 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
         // Add each hard coded recipient
         $to = $message->getTo();
         if (null === $to) {
-            $to = array();
+            $to = [];
         }
 
         foreach ((array) $this->recipient as $recipient) {
-            if (!array_key_exists($recipient, $to)) {
+            if (!\array_key_exists($recipient, $to)) {
                 $message->addTo($recipient);
             }
         }
@@ -126,8 +121,7 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
     /**
      * Filter header set against a whitelist of regular expressions.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headerSet
-     * @param string                     $type
+     * @param string $type
      */
     private function filterHeaderSet(Swift_Mime_SimpleHeaderSet $headerSet, $type)
     {
@@ -139,13 +133,11 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
     /**
      * Filtered list of addresses => name pairs.
      *
-     * @param array $recipients
-     *
      * @return array
      */
     private function filterNameAddresses(array $recipients)
     {
-        $filtered = array();
+        $filtered = [];
 
         foreach ($recipients as $address => $name) {
             if ($this->isWhitelisted($address)) {
@@ -159,13 +151,11 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
     /**
      * Matches address against whitelist of regular expressions.
      *
-     * @param $recipient
-     *
      * @return bool
      */
     protected function isWhitelisted($recipient)
     {
-        if (in_array($recipient, (array) $this->recipient)) {
+        if (\in_array($recipient, (array) $this->recipient)) {
             return true;
         }
 
@@ -180,8 +170,6 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
index 3a2b6657c09..b8818339722 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
@@ -24,9 +24,8 @@ interface Swift_Plugins_Reporter
     /**
      * Notifies this ReportNotifier that $address failed or succeeded.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string                   $address
-     * @param int                      $result  from {@link RESULT_PASS, RESULT_FAIL}
+     * @param string $address
+     * @param int    $result  from {@link RESULT_PASS, RESULT_FAIL}
      */
     public function notify(Swift_Mime_SimpleMessage $message, $address, $result);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
index 5ffca24c61c..c4a016520f6 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
@@ -24,8 +24,6 @@ class Swift_Plugins_ReporterPlugin implements Swift_Events_SendListener
 
     /**
      * Create a new ReporterPlugin using $reporter.
-     *
-     * @param Swift_Plugins_Reporter $reporter
      */
     public function __construct(Swift_Plugins_Reporter $reporter)
     {
@@ -41,21 +39,19 @@ class Swift_Plugins_ReporterPlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
         $message = $evt->getMessage();
         $failures = array_flip($evt->getFailedRecipients());
         foreach ((array) $message->getTo() as $address => $null) {
-            $this->reporter->notify($message, $address, (array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
+            $this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
         }
         foreach ((array) $message->getCc() as $address => $null) {
-            $this->reporter->notify($message, $address, (array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
+            $this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
         }
         foreach ((array) $message->getBcc() as $address => $null) {
-            $this->reporter->notify($message, $address, (array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
+            $this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
         }
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
index 67c117ac7c2..249cffbde7b 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
@@ -20,16 +20,15 @@ class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
      *
      * @var array
      */
-    private $failures = array();
+    private $failures = [];
 
-    private $failures_cache = array();
+    private $failures_cache = [];
 
     /**
      * Notifies this ReportNotifier that $address failed or succeeded.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string                   $address
-     * @param int                      $result  from {@link RESULT_PASS, RESULT_FAIL}
+     * @param string $address
+     * @param int    $result  from {@link RESULT_PASS, RESULT_FAIL}
      */
     public function notify(Swift_Mime_SimpleMessage $message, $address, $result)
     {
@@ -54,6 +53,6 @@ class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
      */
     public function clear()
     {
-        $this->failures = $this->failures_cache = array();
+        $this->failures = $this->failures_cache = [];
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
index 525eef570a9..1cfc3f974f8 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
@@ -18,9 +18,8 @@ class Swift_Plugins_Reporters_HtmlReporter implements Swift_Plugins_Reporter
     /**
      * Notifies this ReportNotifier that $address failed or succeeded.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string                   $address
-     * @param int                      $result  from {@see RESULT_PASS, RESULT_FAIL}
+     * @param string $address
+     * @param int    $result  from {@see RESULT_PASS, RESULT_FAIL}
      */
     public function notify(Swift_Mime_SimpleMessage $message, $address, $result)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
index 77c2e8db6ec..83d3044927f 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
@@ -72,7 +72,7 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      * Create a new ThrottlerPlugin.
      *
      * @param int                   $rate
-     * @param int                   $mode,   defaults to {@link BYTES_PER_MINUTE}
+     * @param int                   $mode    defaults to {@link BYTES_PER_MINUTE}
      * @param Swift_Plugins_Sleeper $sleeper (only needed in testing)
      * @param Swift_Plugins_Timer   $timer   (only needed in testing)
      */
@@ -86,8 +86,6 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -119,8 +117,6 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
 
     /**
      * Invoked when a Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Preferences.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Preferences.php
index 79eafde9ad9..16103e11031 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Preferences.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Preferences.php
@@ -92,7 +92,7 @@ class Swift_Preferences
         Swift_DependencyContainer::getInstance()
             ->register('mime.qpcontentencoder')
             ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
-            ->withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
+            ->withDependencies(['mime.charstream', 'mime.bytecanonicalizer'])
             ->addConstructorValue($dotEscape);
 
         return $this;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php
index c129281b347..3c756436cc8 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/SendmailTransport.php
@@ -22,8 +22,8 @@ class Swift_SendmailTransport extends Swift_Transport_SendmailTransport
      */
     public function __construct($command = '/usr/sbin/sendmail -bs')
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_SendmailTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_SendmailTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.sendmail')
             );
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signer.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signer.php
index 2d8176d905c..26c5e285c03 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Signer.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Signer.php
@@ -11,7 +11,6 @@
 /**
  * Base Class of Signer Infrastructure.
  *
- *
  * @author Xavier De Cock <xdecock@gmail.com>
  */
 interface Swift_Signer
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
index 8e66e18f4e0..b25c427af83 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
@@ -18,8 +18,6 @@ interface Swift_Signers_BodySigner extends Swift_Signer
     /**
      * Change the Swift_Signed_Message to apply the singing.
      *
-     * @param Swift_Message $message
-     *
      * @return self
      */
     public function signMessage(Swift_Message $message);
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
index a88daa19815..ec82dc05663 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
@@ -66,7 +66,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @var array
      */
-    protected $ignoredHeaders = array('return-path' => true);
+    protected $ignoredHeaders = ['return-path' => true];
 
     /**
      * Signer identity.
@@ -124,14 +124,14 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @var array
      */
-    protected $signedHeaders = array();
+    protected $signedHeaders = [];
 
     /**
      * If debugHeaders is set store debugData here.
      *
-     * @var string
+     * @var string[]
      */
-    private $debugHeadersData = '';
+    private $debugHeadersData = [];
 
     /**
      * Stores the bodyHash.
@@ -163,7 +163,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 
     private $bodyCanonLine = '';
 
-    private $bound = array();
+    private $bound = [];
 
     /**
      * Constructor.
@@ -190,7 +190,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     public function reset()
     {
         $this->headerHash = null;
-        $this->signedHeaders = array();
+        $this->signedHeaders = [];
         $this->bodyHash = null;
         $this->bodyHashHandler = null;
         $this->bodyCanonIgnoreStart = 2;
@@ -236,10 +236,9 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 
     /**
      * Attach $is to this stream.
+     *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
@@ -251,11 +250,10 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 
     /**
      * Remove an already bound stream.
+     *
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
@@ -297,7 +295,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                 break;
             case 'rsa-sha256':
                 $this->hashAlgorithm = 'rsa-sha256';
-                if (!defined('OPENSSL_ALGO_SHA256')) {
+                if (!\defined('OPENSSL_ALGO_SHA256')) {
                     throw new Swift_SwiftException('Unable to set sha256 as it is not supported by OpenSSL.');
                 }
                 break;
@@ -317,7 +315,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setBodyCanon($canon)
     {
-        if ($canon == 'relaxed') {
+        if ('relaxed' == $canon) {
             $this->bodyCanon = 'relaxed';
         } else {
             $this->bodyCanon = 'simple';
@@ -335,7 +333,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setHeaderCanon($canon)
     {
-        if ($canon == 'relaxed') {
+        if ('relaxed' == $canon) {
             $this->headerCanon = 'relaxed';
         } else {
             $this->headerCanon = 'simple';
@@ -367,10 +365,10 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setBodySignedLen($len)
     {
-        if ($len === true) {
+        if (true === $len) {
             $this->showLen = true;
             $this->maxLen = PHP_INT_MAX;
-        } elseif ($len === false) {
+        } elseif (false === $len) {
             $this->showLen = false;
             $this->maxLen = PHP_INT_MAX;
         } else {
@@ -456,9 +454,9 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     public function getAlteredHeaders()
     {
         if ($this->debugHeaders) {
-            return array('DKIM-Signature', 'X-DebugHash');
+            return ['DKIM-Signature', 'X-DebugHash'];
         } else {
-            return array('DKIM-Signature');
+            return ['DKIM-Signature'];
         }
     }
 
@@ -471,7 +469,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function ignoreHeader($header_name)
     {
-        $this->ignoredHeaders[strtolower($header_name)] = true;
+        $this->ignoredHeaders[strtolower($header_name ?? '')] = true;
 
         return $this;
     }
@@ -479,8 +477,6 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     /**
      * Set the headers to sign.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return Swift_Signers_DKIMSigner
      */
     public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
@@ -490,11 +486,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
         $listHeaders = $headers->listAll();
         foreach ($listHeaders as $hName) {
             // Check if we need to ignore Header
-            if (!isset($this->ignoredHeaders[strtolower($hName)])) {
+            if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
                 if ($headers->has($hName)) {
                     $tmp = $headers->getAll($hName);
                     foreach ($tmp as $header) {
-                        if ($header->getFieldBody() != '') {
+                        if ('' != $header->getFieldBody()) {
                             $this->addHeader($header->toString());
                             $this->signedHeaders[] = $header->getFieldName();
                         }
@@ -509,32 +505,30 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     /**
      * Add the signature to the given Headers.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return Swift_Signers_DKIMSigner
      */
     public function addSignature(Swift_Mime_SimpleHeaderSet $headers)
     {
         // Prepare the DKIM-Signature
-        $params = array('v' => '1', 'a' => $this->hashAlgorithm, 'bh' => base64_encode($this->bodyHash), 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'i' => $this->signerIdentity, 's' => $this->selector);
-        if ($this->bodyCanon != 'simple') {
+        $params = ['v' => '1', 'a' => $this->hashAlgorithm, 'bh' => base64_encode($this->bodyHash ?? ''), 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'i' => $this->signerIdentity, 's' => $this->selector];
+        if ('simple' != $this->bodyCanon) {
             $params['c'] = $this->headerCanon.'/'.$this->bodyCanon;
-        } elseif ($this->headerCanon != 'simple') {
+        } elseif ('simple' != $this->headerCanon) {
             $params['c'] = $this->headerCanon;
         }
         if ($this->showLen) {
             $params['l'] = $this->bodyLen;
         }
-        if ($this->signatureTimestamp === true) {
+        if (true === $this->signatureTimestamp) {
             $params['t'] = time();
-            if ($this->signatureExpiration !== false) {
+            if (false !== $this->signatureExpiration) {
                 $params['x'] = $params['t'] + $this->signatureExpiration;
             }
         } else {
-            if ($this->signatureTimestamp !== false) {
+            if (false !== $this->signatureTimestamp) {
                 $params['t'] = $this->signatureTimestamp;
             }
-            if ($this->signatureExpiration !== false) {
+            if (false !== $this->signatureExpiration) {
                 $params['x'] = $this->signatureExpiration;
             }
         }
@@ -550,11 +544,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
         // Add the last DKIM-Signature
         $tmp = $headers->getAll('DKIM-Signature');
         $this->dkimHeader = end($tmp);
-        $this->addHeader(trim($this->dkimHeader->toString())."\r\n b=", true);
+        $this->addHeader(trim($this->dkimHeader->toString() ?? '')."\r\n b=", true);
         if ($this->debugHeaders) {
-            $headers->addTextHeader('X-DebugHash', base64_encode($this->headerHash));
+            $headers->addTextHeader('X-DebugHash', base64_encode($this->headerHash ?? ''));
         }
-        $this->dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->getEncryptedHash()), 73, ' ')));
+        $this->dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->getEncryptedHash() ?? ''), 73, ' ')));
 
         return $this;
     }
@@ -571,6 +565,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                 $value = str_replace("\r\n", '', $exploded[1]);
                 $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
                 $header = $name.':'.trim($value).($is_sig ? '' : "\r\n");
+                // no break
             case 'simple':
                 // Nothing to do
         }
@@ -579,9 +574,9 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 
     protected function canonicalizeBody($string)
     {
-        $len = strlen($string);
+        $len = \strlen($string);
         $canon = '';
-        $method = ($this->bodyCanon == 'relaxed');
+        $method = ('relaxed' == $this->bodyCanon);
         for ($i = 0; $i < $len; ++$i) {
             if ($this->bodyCanonIgnoreStart > 0) {
                 --$this->bodyCanonIgnoreStart;
@@ -592,11 +587,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                     $this->bodyCanonLastChar = "\r";
                     break;
                 case "\n":
-                    if ($this->bodyCanonLastChar == "\r") {
+                    if ("\r" == $this->bodyCanonLastChar) {
                         if ($method) {
                             $this->bodyCanonSpace = false;
                         }
-                        if ($this->bodyCanonLine == '') {
+                        if ('' == $this->bodyCanonLine) {
                             ++$this->bodyCanonEmptyCounter;
                         } else {
                             $this->bodyCanonLine = '';
@@ -613,6 +608,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                         $this->bodyCanonSpace = true;
                         break;
                     }
+                    // no break
                 default:
                     if ($this->bodyCanonEmptyCounter > 0) {
                         $canon .= str_repeat("\r\n", $this->bodyCanonEmptyCounter);
@@ -633,7 +629,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     protected function endOfBody()
     {
         // Add trailing Line return if last line is non empty
-        if (strlen($this->bodyCanonLine) > 0) {
+        if (\strlen($this->bodyCanonLine) > 0) {
             $this->addToBodyHash("\r\n");
         }
         $this->bodyHash = hash_final($this->bodyHashHandler, true);
@@ -641,7 +637,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 
     private function addToBodyHash($string)
     {
-        $len = strlen($string);
+        $len = \strlen($string);
         if ($len > ($new_len = ($this->maxLen - $this->bodyLen))) {
             $string = substr($string, 0, $new_len);
             $len = $new_len;
@@ -653,7 +649,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     private function addToHeaderHash($header)
     {
         if ($this->debugHeaders) {
-            $this->debugHeadersData[] = trim($header);
+            $this->debugHeadersData[] = trim($header ?? '');
         }
         $this->headerCanonData .= $header;
     }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
index 40654987f9b..5e2b67b6520 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
@@ -55,7 +55,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      *
      * @var array
      */
-    protected $ignoredHeaders = array();
+    protected $ignoredHeaders = [];
 
     /**
      * Signer identity.
@@ -77,7 +77,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      *
      * @var array
      */
-    private $signedHeaders = array();
+    private $signedHeaders = [];
 
     /**
      * Stores the signature header.
@@ -93,8 +93,6 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     private $hashHandler;
 
-    private $hash;
-
     private $canonData = '';
 
     private $bodyCanonEmptyCounter = 0;
@@ -107,7 +105,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     private $bodyCanonLine = '';
 
-    private $bound = array();
+    private $bound = [];
 
     /**
      * Constructor.
@@ -131,7 +129,6 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function reset()
     {
-        $this->hash = null;
         $this->hashHandler = null;
         $this->bodyCanonIgnoreStart = 2;
         $this->bodyCanonEmptyCounter = 0;
@@ -185,11 +182,10 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     /**
      * Attach $is to this stream.
+     *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
      *
-     * @param Swift_InputByteStream $is
-     *
      * @return $this
      */
     public function bind(Swift_InputByteStream $is)
@@ -202,12 +198,11 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     /**
      * Remove an already bound stream.
+     *
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
      *
-     * @param Swift_InputByteStream $is
-     *
      * @return $this
      */
     public function unbind(Swift_InputByteStream $is)
@@ -262,7 +257,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function setCanon($canon)
     {
-        if ($canon == 'nofws') {
+        if ('nofws' == $canon) {
             $this->canon = 'nofws';
         } else {
             $this->canon = 'simple';
@@ -322,10 +317,10 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
     public function getAlteredHeaders()
     {
         if ($this->debugHeaders) {
-            return array('DomainKey-Signature', 'X-DebugHash');
+            return ['DomainKey-Signature', 'X-DebugHash'];
         }
 
-        return array('DomainKey-Signature');
+        return ['DomainKey-Signature'];
     }
 
     /**
@@ -337,7 +332,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function ignoreHeader($header_name)
     {
-        $this->ignoredHeaders[strtolower($header_name)] = true;
+        $this->ignoredHeaders[strtolower($header_name ?? '')] = true;
 
         return $this;
     }
@@ -345,8 +340,6 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
     /**
      * Set the headers to sign.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return $this
      */
     public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
@@ -357,11 +350,11 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
         $listHeaders = $headers->listAll();
         foreach ($listHeaders as $hName) {
             // Check if we need to ignore Header
-            if (!isset($this->ignoredHeaders[strtolower($hName)])) {
+            if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
                 if ($headers->has($hName)) {
                     $tmp = $headers->getAll($hName);
                     foreach ($tmp as $header) {
-                        if ($header->getFieldBody() != '') {
+                        if ('' != $header->getFieldBody()) {
                             $this->addHeader($header->toString());
                             $this->signedHeaders[] = $header->getFieldName();
                         }
@@ -377,14 +370,12 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
     /**
      * Add the signature to the given Headers.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return $this
      */
     public function addSignature(Swift_Mime_SimpleHeaderSet $headers)
     {
         // Prepare the DomainKey-Signature Header
-        $params = array('a' => $this->hashAlgorithm, 'b' => chunk_split(base64_encode($this->getEncryptedHash()), 73, ' '), 'c' => $this->canon, 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'q' => 'dns', 's' => $this->selector);
+        $params = ['a' => $this->hashAlgorithm, 'b' => chunk_split(base64_encode($this->getEncryptedHash() ?? ''), 73, ' '), 'c' => $this->canon, 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'q' => 'dns', 's' => $this->selector];
         $string = '';
         foreach ($params as $k => $v) {
             $string .= $k.'='.$v.'; ';
@@ -407,6 +398,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
                 $value = str_replace("\r\n", '', $exploded[1]);
                 $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
                 $header = $name.':'.trim($value)."\r\n";
+                // no break
             case 'simple':
                 // Nothing to do
         }
@@ -420,9 +412,9 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     protected function canonicalizeBody($string)
     {
-        $len = strlen($string);
+        $len = \strlen($string);
         $canon = '';
-        $nofws = ($this->canon == 'nofws');
+        $nofws = ('nofws' == $this->canon);
         for ($i = 0; $i < $len; ++$i) {
             if ($this->bodyCanonIgnoreStart > 0) {
                 --$this->bodyCanonIgnoreStart;
@@ -433,11 +425,11 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
                     $this->bodyCanonLastChar = "\r";
                     break;
                 case "\n":
-                    if ($this->bodyCanonLastChar == "\r") {
+                    if ("\r" == $this->bodyCanonLastChar) {
                         if ($nofws) {
                             $this->bodyCanonSpace = false;
                         }
-                        if ($this->bodyCanonLine == '') {
+                        if ('' == $this->bodyCanonLine) {
                             ++$this->bodyCanonEmptyCounter;
                         } else {
                             $this->bodyCanonLine = '';
@@ -455,6 +447,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
                         $this->bodyCanonSpace = true;
                         break;
                     }
+                    // no break
                 default:
                     if ($this->bodyCanonEmptyCounter > 0) {
                         $canon .= str_repeat("\r\n", $this->bodyCanonEmptyCounter);
@@ -469,10 +462,9 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     protected function endOfBody()
     {
-        if (strlen($this->bodyCanonLine) > 0) {
+        if (\strlen($this->bodyCanonLine) > 0) {
             $this->addToHash("\r\n");
         }
-        $this->hash = hash_final($this->hashHandler, true);
     }
 
     private function addToHash($string)
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
index 6104e34f3f5..6f5c20923dc 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
@@ -41,8 +41,6 @@ interface Swift_Signers_HeaderSigner extends Swift_Signer, Swift_InputByteStream
     /**
      * Give the headers already given.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return self
      */
     public function setHeaders(Swift_Mime_SimpleHeaderSet $headers);
@@ -50,8 +48,6 @@ interface Swift_Signers_HeaderSigner extends Swift_Signer, Swift_InputByteStream
     /**
      * Add the header(s) to the headerSet.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return self
      */
     public function addSignature(Swift_Mime_SimpleHeaderSet $headers);
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
index deb29f575f2..520bcc15e8b 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
@@ -13,6 +13,8 @@
  * Takes advantage of pecl extension.
  *
  * @author     Xavier De Cock <xdecock@gmail.com>
+ *
+ * @deprecated since SwiftMailer 6.1.0; use Swift_Signers_DKIMSigner instead.
  */
 class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
 {
@@ -29,7 +31,7 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
 
     public function __construct($privateKey, $domainName, $selector)
     {
-        if (!extension_loaded('opendkim')) {
+        if (!\extension_loaded('opendkim')) {
             throw new Swift_SwiftException('php-opendkim extension not found');
         }
 
@@ -42,7 +44,7 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
     {
         $header = new Swift_Mime_Headers_OpenDKIMHeader('DKIM-Signature');
         $headerVal = $this->dkimHandler->getSignatureHeader();
-        if (!$headerVal) {
+        if (false === $headerVal || \is_int($headerVal)) {
             throw new Swift_SwiftException('OpenDKIM Error: '.$this->dkimHandler->getError());
         }
         $header->setValue($headerVal);
@@ -53,14 +55,10 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
 
     public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
     {
-        $bodyLen = $this->bodyLen;
-        if (is_bool($bodyLen)) {
-            $bodyLen = -1;
-        }
-        $hash = $this->hashAlgorithm == 'rsa-sha1' ? OpenDKIMSign::ALG_RSASHA1 : OpenDKIMSign::ALG_RSASHA256;
-        $bodyCanon = $this->bodyCanon == 'simple' ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
-        $headerCanon = $this->headerCanon == 'simple' ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
-        $this->dkimHandler = new OpenDKIMSign($this->privateKey, $this->selector, $this->domainName, $headerCanon, $bodyCanon, $hash, $bodyLen);
+        $hash = 'rsa-sha1' == $this->hashAlgorithm ? OpenDKIMSign::ALG_RSASHA1 : OpenDKIMSign::ALG_RSASHA256;
+        $bodyCanon = 'simple' == $this->bodyCanon ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
+        $headerCanon = 'simple' == $this->headerCanon ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
+        $this->dkimHandler = new OpenDKIMSign($this->privateKey, $this->selector, $this->domainName, $headerCanon, $bodyCanon, $hash, -1);
         // Hardcode signature Margin for now
         $this->dkimHandler->setMargin(78);
 
@@ -77,11 +75,11 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
         $listHeaders = $headers->listAll();
         foreach ($listHeaders as $hName) {
             // Check if we need to ignore Header
-            if (!isset($this->ignoredHeaders[strtolower($hName)])) {
+            if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
                 $tmp = $headers->getAll($hName);
                 if ($headers->has($hName)) {
                     foreach ($tmp as $header) {
-                        if ($header->getFieldBody() != '') {
+                        if ('' != $header->getFieldBody()) {
                             $htosign = $header->toString();
                             $this->dkimHandler->header($htosign);
                             $this->signedHeaders[] = $header->getFieldName();
@@ -172,13 +170,13 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
         if (!$this->peclLoaded) {
             return parent::canonicalizeBody($string);
         }
-        if (false && $this->dropFirstLF === true) {
-            if ($string[0] == "\r" && $string[1] == "\n") {
+        if (true === $this->dropFirstLF) {
+            if ("\r" == $string[0] && "\n" == $string[1]) {
                 $string = substr($string, 2);
             }
         }
         $this->dropFirstLF = false;
-        if (strlen($string)) {
+        if (\strlen($string)) {
             $this->dkimHandler->body($string);
         }
     }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
index e2231151993..3dd3cd05f04 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
@@ -11,9 +11,9 @@
 /**
  * MIME Message Signer used to apply S/MIME Signature/Encryption to a message.
  *
- *
  * @author Romain-Geissler
  * @author Sebastiaan Stok <s.stok@rollerscapes.net>
+ * @author Jan Flora <jf@penneo.com>
  */
 class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
 {
@@ -27,6 +27,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     protected $encryptOptions;
     protected $encryptCipher;
     protected $extraCerts = null;
+    protected $wrapFullMessage = false;
 
     /**
      * @var Swift_StreamFilters_StringReplacementFilterFactory
@@ -65,7 +66,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     /**
      * Set the certificate location to use for signing.
      *
-     * @see http://www.php.net/manual/en/openssl.pkcs7.flags.php
+     * @see https://secure.php.net/manual/en/openssl.pkcs7.flags.php
      *
      * @param string       $certificate
      * @param string|array $privateKey  If the key needs an passphrase use array('file-location', 'passphrase') instead
@@ -79,7 +80,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
         $this->signCertificate = 'file://'.str_replace('\\', '/', realpath($certificate));
 
         if (null !== $privateKey) {
-            if (is_array($privateKey)) {
+            if (\is_array($privateKey)) {
                 $this->signPrivateKey = $privateKey;
                 $this->signPrivateKey[0] = 'file://'.str_replace('\\', '/', realpath($privateKey[0]));
             } else {
@@ -88,9 +89,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
         }
 
         $this->signOptions = $signOptions;
-        if (null !== $extraCerts) {
-            $this->extraCerts = str_replace('\\', '/', realpath($extraCerts));
-        }
+        $this->extraCerts = $extraCerts ? realpath($extraCerts) : null;
 
         return $this;
     }
@@ -98,8 +97,8 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     /**
      * Set the certificate location to use for encryption.
      *
-     * @see http://www.php.net/manual/en/openssl.pkcs7.flags.php
-     * @see http://nl3.php.net/manual/en/openssl.ciphers.php
+     * @see https://secure.php.net/manual/en/openssl.pkcs7.flags.php
+     * @see https://secure.php.net/manual/en/openssl.ciphers.php
      *
      * @param string|array $recipientCerts Either an single X.509 certificate, or an assoc array of X.509 certificates.
      * @param int          $cipher
@@ -108,8 +107,8 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
      */
     public function setEncryptCertificate($recipientCerts, $cipher = null)
     {
-        if (is_array($recipientCerts)) {
-            $this->encryptCert = array();
+        if (\is_array($recipientCerts)) {
+            $this->encryptCert = [];
 
             foreach ($recipientCerts as $cert) {
                 $this->encryptCert[] = 'file://'.str_replace('\\', '/', realpath($cert));
@@ -178,9 +177,27 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     }
 
     /**
-     * Change the Swift_Message to apply the signing.
+     * Specify whether to wrap the entire MIME message in the S/MIME message.
      *
-     * @param Swift_Message $message
+     * According to RFC5751 section 3.1:
+     * In order to protect outer, non-content-related message header fields
+     * (for instance, the "Subject", "To", "From", and "Cc" fields), the
+     * sending client MAY wrap a full MIME message in a message/rfc822
+     * wrapper in order to apply S/MIME security services to these header
+     * fields.  It is up to the receiving client to decide how to present
+     * this "inner" header along with the unprotected "outer" header.
+     *
+     * @param bool $wrap
+     *
+     * @return $this
+     */
+    public function setWrapFullMessage($wrap)
+    {
+        $this->wrapFullMessage = $wrap;
+    }
+
+    /**
+     * Change the Swift_Message to apply the signing.
      *
      * @return $this
      */
@@ -190,17 +207,13 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
             return $this;
         }
 
-        // Store the message using ByteStream to a file{1}
-        // Remove all Children
-        // Sign file{1}, parse the new MIME headers and set them on the primary MimeEntity
-        // Set the singed-body as the new body (without boundary)
-
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-        $this->toSMimeByteStream($messageStream, $message);
-        $message->setEncoder(Swift_DependencyContainer::getInstance()->lookup('mime.rawcontentencoder'));
-
-        $message->setChildren(array());
-        $this->streamToMime($messageStream, $message);
+        if ($this->signThenEncrypt) {
+            $this->smimeSignMessage($message);
+            $this->smimeEncryptMessage($message);
+        } else {
+            $this->smimeEncryptMessage($message);
+            $this->smimeSignMessage($message);
+        }
     }
 
     /**
@@ -210,102 +223,303 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
      */
     public function getAlteredHeaders()
     {
-        return array('Content-Type', 'Content-Transfer-Encoding', 'Content-Disposition');
+        return ['Content-Type', 'Content-Transfer-Encoding', 'Content-Disposition'];
     }
 
     /**
-     * @param Swift_InputByteStream $inputStream
-     * @param Swift_Message         $mimeEntity
+     * Sign a Swift message.
      */
-    protected function toSMimeByteStream(Swift_InputByteStream $inputStream, Swift_Message $message)
+    protected function smimeSignMessage(Swift_Message $message)
     {
-        $mimeEntity = $this->createMessage($message);
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-
-        $mimeEntity->toByteStream($messageStream);
-        $messageStream->commit();
-
-        if (null !== $this->signCertificate && null !== $this->encryptCert) {
-            $temporaryStream = new Swift_ByteStream_TemporaryFileByteStream();
-
-            if ($this->signThenEncrypt) {
-                $this->messageStreamToSignedByteStream($messageStream, $temporaryStream);
-                $this->messageStreamToEncryptedByteStream($temporaryStream, $inputStream);
-            } else {
-                $this->messageStreamToEncryptedByteStream($messageStream, $temporaryStream);
-                $this->messageStreamToSignedByteStream($temporaryStream, $inputStream);
-            }
-        } elseif ($this->signCertificate !== null) {
-            $this->messageStreamToSignedByteStream($messageStream, $inputStream);
-        } else {
-            $this->messageStreamToEncryptedByteStream($messageStream, $inputStream);
+        // If we don't have a certificate we can't sign the message
+        if (null === $this->signCertificate) {
+            return;
         }
-    }
 
-    /**
-     * @param Swift_Message $message
-     *
-     * @return Swift_Message
-     */
-    protected function createMessage(Swift_Message $message)
-    {
-        $mimeEntity = new Swift_Message('', $message->getBody(), $message->getContentType(), $message->getCharset());
-        $mimeEntity->setChildren($message->getChildren());
+        // Work on a clone of the original message
+        $signMessage = clone $message;
+        $signMessage->clearSigners();
 
-        $messageHeaders = $mimeEntity->getHeaders();
-        $messageHeaders->remove('Message-ID');
-        $messageHeaders->remove('Date');
-        $messageHeaders->remove('Subject');
-        $messageHeaders->remove('MIME-Version');
-        $messageHeaders->remove('To');
-        $messageHeaders->remove('From');
+        if ($this->wrapFullMessage) {
+            // The original message essentially becomes the body of the new
+            // wrapped message
+            $signMessage = $this->wrapMimeMessage($signMessage);
+        } else {
+            // Only keep header needed to parse the body correctly
+            $this->clearAllHeaders($signMessage);
+            $this->copyHeaders(
+                $message,
+                $signMessage,
+                [
+                    'Content-Type',
+                    'Content-Transfer-Encoding',
+                    'Content-Disposition',
+                ]
+            );
+        }
 
-        return $mimeEntity;
-    }
-
-    /**
-     * @param Swift_FileStream      $outputStream
-     * @param Swift_InputByteStream $inputStream
-     *
-     * @throws Swift_IoException
-     */
-    protected function messageStreamToSignedByteStream(Swift_FileStream $outputStream, Swift_InputByteStream $inputStream)
-    {
+        // Copy the cloned message into a temporary file stream
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $signMessage->toByteStream($messageStream);
+        $messageStream->commit();
         $signedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
 
-        $args = array($outputStream->getPath(), $signedMessageStream->getPath(), $this->signCertificate, $this->signPrivateKey, array(), $this->signOptions);
-        if (null !== $this->extraCerts) {
-            $args[] = $this->extraCerts;
-        }
-
-        if (!call_user_func_array('openssl_pkcs7_sign', $args)) {
+        // Sign the message using openssl
+        if (!openssl_pkcs7_sign(
+                $messageStream->getPath(),
+                $signedMessageStream->getPath(),
+                $this->signCertificate,
+                $this->signPrivateKey,
+                [],
+                $this->signOptions,
+                $this->extraCerts
+            )
+        ) {
             throw new Swift_IoException(sprintf('Failed to sign S/Mime message. Error: "%s".', openssl_error_string()));
         }
 
-        $this->copyFromOpenSSLOutput($signedMessageStream, $inputStream);
+        // Parse the resulting signed message content back into the Swift message
+        // preserving the original headers
+        $this->parseSSLOutput($signedMessageStream, $message);
     }
 
     /**
-     * @param Swift_FileStream      $outputStream
-     * @param Swift_InputByteStream $is
-     *
-     * @throws Swift_IoException
+     * Encrypt a Swift message.
      */
-    protected function messageStreamToEncryptedByteStream(Swift_FileStream $outputStream, Swift_InputByteStream $is)
+    protected function smimeEncryptMessage(Swift_Message $message)
     {
+        // If we don't have a certificate we can't encrypt the message
+        if (null === $this->encryptCert) {
+            return;
+        }
+
+        // Work on a clone of the original message
+        $encryptMessage = clone $message;
+        $encryptMessage->clearSigners();
+
+        if ($this->wrapFullMessage) {
+            // The original message essentially becomes the body of the new
+            // wrapped message
+            $encryptMessage = $this->wrapMimeMessage($encryptMessage);
+        } else {
+            // Only keep header needed to parse the body correctly
+            $this->clearAllHeaders($encryptMessage);
+            $this->copyHeaders(
+                $message,
+                $encryptMessage,
+                [
+                    'Content-Type',
+                    'Content-Transfer-Encoding',
+                    'Content-Disposition',
+                ]
+            );
+        }
+
+        // Convert the message content (including headers) to a string
+        // and place it in a temporary file
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $encryptMessage->toByteStream($messageStream);
+        $messageStream->commit();
         $encryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
 
-        if (!openssl_pkcs7_encrypt($outputStream->getPath(), $encryptedMessageStream->getPath(), $this->encryptCert, array(), 0, $this->encryptCipher)) {
+        // Encrypt the message
+        if (!openssl_pkcs7_encrypt(
+                $messageStream->getPath(),
+                $encryptedMessageStream->getPath(),
+                $this->encryptCert,
+                [],
+                0,
+                $this->encryptCipher
+            )
+        ) {
             throw new Swift_IoException(sprintf('Failed to encrypt S/Mime message. Error: "%s".', openssl_error_string()));
         }
 
-        $this->copyFromOpenSSLOutput($encryptedMessageStream, $is);
+        // Parse the resulting signed message content back into the Swift message
+        // preserving the original headers
+        $this->parseSSLOutput($encryptedMessageStream, $message);
     }
 
     /**
-     * @param Swift_OutputByteStream $fromStream
-     * @param Swift_InputByteStream  $toStream
+     * Copy named headers from one Swift message to another.
      */
+    protected function copyHeaders(
+        Swift_Message $fromMessage,
+        Swift_Message $toMessage,
+        array $headers = []
+    ) {
+        foreach ($headers as $header) {
+            $this->copyHeader($fromMessage, $toMessage, $header);
+        }
+    }
+
+    /**
+     * Copy a single header from one Swift message to another.
+     *
+     * @param string $headerName
+     */
+    protected function copyHeader(Swift_Message $fromMessage, Swift_Message $toMessage, $headerName)
+    {
+        $header = $fromMessage->getHeaders()->get($headerName);
+        if (!$header) {
+            return;
+        }
+        $headers = $toMessage->getHeaders();
+        switch ($header->getFieldType()) {
+            case Swift_Mime_Header::TYPE_TEXT:
+                $headers->addTextHeader($header->getFieldName(), $header->getValue());
+                break;
+            case Swift_Mime_Header::TYPE_PARAMETERIZED:
+                $headers->addParameterizedHeader(
+                    $header->getFieldName(),
+                    $header->getValue(),
+                    $header->getParameters()
+                );
+                break;
+        }
+    }
+
+    /**
+     * Remove all headers from a Swift message.
+     */
+    protected function clearAllHeaders(Swift_Message $message)
+    {
+        $headers = $message->getHeaders();
+        foreach ($headers->listAll() as $header) {
+            $headers->removeAll($header);
+        }
+    }
+
+    /**
+     * Wraps a Swift_Message in a message/rfc822 MIME part.
+     *
+     * @return Swift_MimePart
+     */
+    protected function wrapMimeMessage(Swift_Message $message)
+    {
+        // Start by copying the original message into a message stream
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $message->toByteStream($messageStream);
+        $messageStream->commit();
+
+        // Create a new MIME part that wraps the original stream
+        $wrappedMessage = new Swift_MimePart($messageStream, 'message/rfc822');
+        $wrappedMessage->setEncoder(new Swift_Mime_ContentEncoder_PlainContentEncoder('7bit'));
+
+        return $wrappedMessage;
+    }
+
+    protected function parseSSLOutput(Swift_InputByteStream $inputStream, Swift_Message $message)
+    {
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $this->copyFromOpenSSLOutput($inputStream, $messageStream);
+
+        $this->streamToMime($messageStream, $message);
+    }
+
+    /**
+     * Merges an OutputByteStream from OpenSSL to a Swift_Message.
+     */
+    protected function streamToMime(Swift_OutputByteStream $fromStream, Swift_Message $message)
+    {
+        // Parse the stream into headers and body
+        list($headers, $messageStream) = $this->parseStream($fromStream);
+
+        // Get the original message headers
+        $messageHeaders = $message->getHeaders();
+
+        // Let the stream determine the headers describing the body content,
+        // since the body of the original message is overwritten by the body
+        // coming from the stream.
+        // These are all content-* headers.
+
+        // Default transfer encoding is 7bit if not set
+        $encoding = '';
+        // Remove all existing transfer encoding headers
+        $messageHeaders->removeAll('Content-Transfer-Encoding');
+        // See whether the stream sets the transfer encoding
+        if (isset($headers['content-transfer-encoding'])) {
+            $encoding = $headers['content-transfer-encoding'];
+        }
+
+        // We use the null content encoder, since the body is already encoded
+        // according to the transfer encoding specified in the stream
+        $message->setEncoder(new Swift_Mime_ContentEncoder_NullContentEncoder($encoding));
+
+        // Set the disposition, if present
+        if (isset($headers['content-disposition'])) {
+            $messageHeaders->addTextHeader('Content-Disposition', $headers['content-disposition']);
+        }
+
+        // Copy over the body from the stream using the content type dictated
+        // by the stream content
+        $message->setChildren([]);
+        $message->setBody($messageStream, $headers['content-type']);
+    }
+
+    /**
+     * This message will parse the headers of a MIME email byte stream
+     * and return an array that contains the headers as an associative
+     * array and the email body as a string.
+     *
+     * @return array
+     */
+    protected function parseStream(Swift_OutputByteStream $emailStream)
+    {
+        $bufferLength = 78;
+        $headerData = '';
+        $headerBodySeparator = "\r\n\r\n";
+
+        $emailStream->setReadPointer(0);
+
+        // Read out the headers section from the stream to a string
+        while (false !== ($buffer = $emailStream->read($bufferLength))) {
+            $headerData .= $buffer;
+
+            $headersPosEnd = strpos($headerData, $headerBodySeparator);
+
+            // Stop reading if we found the end of the headers
+            if (false !== $headersPosEnd) {
+                break;
+            }
+        }
+
+        // Split the header data into lines
+        $headerData = trim(substr($headerData, 0, $headersPosEnd));
+        $headerLines = explode("\r\n", $headerData);
+        unset($headerData);
+
+        $headers = [];
+        $currentHeaderName = '';
+
+        // Transform header lines into an associative array
+        foreach ($headerLines as $headerLine) {
+            // Handle headers that span multiple lines
+            if (false === strpos($headerLine, ':')) {
+                $headers[$currentHeaderName] .= ' '.trim($headerLine ?? '');
+                continue;
+            }
+
+            $header = explode(':', $headerLine, 2);
+            $currentHeaderName = strtolower($header[0] ?? '');
+            $headers[$currentHeaderName] = trim($header[1] ?? '');
+        }
+
+        // Read the entire email body into a byte stream
+        $bodyStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+        // Skip the header and separator and point to the body
+        $emailStream->setReadPointer($headersPosEnd + \strlen($headerBodySeparator));
+
+        while (false !== ($buffer = $emailStream->read($bufferLength))) {
+            $bodyStream->write($buffer);
+        }
+
+        $bodyStream->commit();
+
+        return [$headers, $bodyStream];
+    }
+
     protected function copyFromOpenSSLOutput(Swift_OutputByteStream $fromStream, Swift_InputByteStream $toStream)
     {
         $bufferLength = 4096;
@@ -325,93 +539,4 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
 
         $toStream->commit();
     }
-
-    /**
-     * Merges an OutputByteStream to Swift_Message.
-     *
-     * @param Swift_OutputByteStream $fromStream
-     * @param Swift_Message          $message
-     */
-    protected function streamToMime(Swift_OutputByteStream $fromStream, Swift_Message $message)
-    {
-        $bufferLength = 78;
-        $headerData = '';
-
-        $fromStream->setReadPointer(0);
-
-        while (($buffer = $fromStream->read($bufferLength)) !== false) {
-            $headerData .= $buffer;
-
-            if (false !== strpos($buffer, "\r\n\r\n")) {
-                break;
-            }
-        }
-
-        $headersPosEnd = strpos($headerData, "\r\n\r\n");
-        $headerData = trim($headerData);
-        $headerData = substr($headerData, 0, $headersPosEnd);
-        $headerLines = explode("\r\n", $headerData);
-        unset($headerData);
-
-        $headers = array();
-        $currentHeaderName = '';
-
-        foreach ($headerLines as $headerLine) {
-            // Line separated
-            if (ctype_space($headerLines[0]) || false === strpos($headerLine, ':')) {
-                $headers[$currentHeaderName] .= ' '.trim($headerLine);
-                continue;
-            }
-
-            $header = explode(':', $headerLine, 2);
-            $currentHeaderName = strtolower($header[0]);
-            $headers[$currentHeaderName] = trim($header[1]);
-        }
-
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-        $messageStream->addFilter($this->replacementFactory->createFilter("\r\n", "\n"), 'CRLF to LF');
-        $messageStream->addFilter($this->replacementFactory->createFilter("\n", "\r\n"), 'LF to CRLF');
-
-        $messageHeaders = $message->getHeaders();
-
-        // No need to check for 'application/pkcs7-mime', as this is always base64
-        if ('multipart/signed;' === substr($headers['content-type'], 0, 17)) {
-            if (!preg_match('/boundary=("[^"]+"|(?:[^\s]+|$))/is', $headers['content-type'], $contentTypeData)) {
-                throw new Swift_SwiftException('Failed to find Boundary parameter');
-            }
-
-            $boundary = trim($contentTypeData['1'], '"');
-
-            // Skip the header and CRLF CRLF
-            $fromStream->setReadPointer($headersPosEnd + 4);
-
-            while (false !== ($buffer = $fromStream->read($bufferLength))) {
-                $messageStream->write($buffer);
-            }
-
-            $messageStream->commit();
-
-            $messageHeaders->remove('Content-Transfer-Encoding');
-            $message->setContentType($headers['content-type']);
-            $message->setBoundary($boundary);
-            $message->setBody($messageStream);
-        } else {
-            $fromStream->setReadPointer($headersPosEnd + 4);
-
-            if (null === $this->headerFactory) {
-                $this->headerFactory = Swift_DependencyContainer::getInstance()->lookup('mime.headerfactory');
-            }
-
-            $message->setContentType($headers['content-type']);
-            $messageHeaders->set($this->headerFactory->createTextHeader('Content-Transfer-Encoding', $headers['content-transfer-encoding']));
-            $messageHeaders->set($this->headerFactory->createTextHeader('Content-Disposition', $headers['content-disposition']));
-
-            while (false !== ($buffer = $fromStream->read($bufferLength))) {
-                $messageStream->write($buffer);
-            }
-
-            $messageStream->commit();
-            $message->setBody($messageStream);
-        }
-    }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php
index 011c03ab188..56b62323ad7 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/SmtpTransport.php
@@ -23,22 +23,23 @@
 class Swift_SmtpTransport extends Swift_Transport_EsmtpTransport
 {
     /**
-     * Create a new SmtpTransport, optionally with $host, $port and $security.
-     *
      * @param string $host
      * @param int    $port
-     * @param string $security
+     * @param string|null $encryption SMTP encryption mode:
+     *        - null for plain SMTP (no encryption),
+     *        - 'tls' for SMTP with STARTTLS (best effort encryption),
+     *        - 'ssl' for SMTPS = SMTP over TLS (always encrypted).
      */
-    public function __construct($host = 'localhost', $port = 25, $security = null)
+    public function __construct($host = 'localhost', $port = 25, $encryption = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_EsmtpTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_EsmtpTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.smtp')
-            );
+        );
 
         $this->setHost($host);
         $this->setPort($port);
-        $this->setEncryption($security);
+        $this->setEncryption($encryption);
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php
index f92567ba021..c08e0fb17d5 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/SpoolTransport.php
@@ -17,8 +17,6 @@ class Swift_SpoolTransport extends Swift_Transport_SpoolTransport
 {
     /**
      * Create a new SpoolTransport.
-     *
-     * @param Swift_Spool $spool
      */
     public function __construct(Swift_Spool $spool)
     {
@@ -27,8 +25,8 @@ class Swift_SpoolTransport extends Swift_Transport_SpoolTransport
 
         $arguments[] = $spool;
 
-        call_user_func_array(
-            array($this, 'Swift_Transport_SpoolTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_SpoolTransport::__construct'],
             $arguments
         );
     }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
index ba1f6d323fc..7e5ddf1b7da 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
@@ -17,9 +17,6 @@
  */
 class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilter
 {
-    /** The needle(s) to search for */
-    private $search;
-
     /** The replacement(s) to make */
     private $replace;
 
@@ -27,7 +24,7 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
     private $index;
 
     /** The Search Tree */
-    private $tree = array();
+    private $tree = [];
 
     /**  Gives the size of the largest search */
     private $treeMaxLen = 0;
@@ -42,26 +39,25 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
      */
     public function __construct($search, $replace)
     {
-        $this->search = $search;
-        $this->index = array();
-        $this->tree = array();
-        $this->replace = array();
-        $this->repSize = array();
+        $this->index = [];
+        $this->tree = [];
+        $this->replace = [];
+        $this->repSize = [];
 
         $tree = null;
         $i = null;
         $last_size = $size = 0;
         foreach ($search as $i => $search_element) {
-            if ($tree !== null) {
-                $tree[-1] = min(count($replace) - 1, $i - 1);
+            if (null !== $tree) {
+                $tree[-1] = min(\count($replace) - 1, $i - 1);
                 $tree[-2] = $last_size;
             }
             $tree = &$this->tree;
-            if (is_array($search_element)) {
+            if (\is_array($search_element)) {
                 foreach ($search_element as $k => $char) {
                     $this->index[$char] = true;
                     if (!isset($tree[$char])) {
-                        $tree[$char] = array();
+                        $tree[$char] = [];
                     }
                     $tree = &$tree[$char];
                 }
@@ -70,27 +66,27 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
             } else {
                 $last_size = 1;
                 if (!isset($tree[$search_element])) {
-                    $tree[$search_element] = array();
+                    $tree[$search_element] = [];
                 }
                 $tree = &$tree[$search_element];
                 $size = max($last_size, $size);
                 $this->index[$search_element] = true;
             }
         }
-        if ($i !== null) {
-            $tree[-1] = min(count($replace) - 1, $i);
+        if (null !== $i) {
+            $tree[-1] = min(\count($replace) - 1, $i);
             $tree[-2] = $last_size;
             $this->treeMaxLen = $size;
         }
         foreach ($replace as $rep) {
-            if (!is_array($rep)) {
-                $rep = array($rep);
+            if (!\is_array($rep)) {
+                $rep = [$rep];
             }
             $this->replace[] = $rep;
         }
-        for ($i = count($this->replace) - 1; $i >= 0; --$i) {
+        for ($i = \count($this->replace) - 1; $i >= 0; --$i) {
             $this->replace[$i] = $rep = $this->filter($this->replace[$i], $i);
-            $this->repSize[$i] = count($rep);
+            $this->repSize[$i] = \count($rep);
         }
     }
 
@@ -118,12 +114,12 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
      */
     public function filter($buffer, $minReplaces = -1)
     {
-        if ($this->treeMaxLen == 0) {
+        if (0 == $this->treeMaxLen) {
             return $buffer;
         }
 
-        $newBuffer = array();
-        $buf_size = count($buffer);
+        $newBuffer = [];
+        $buf_size = \count($buffer);
         $last_size = 0;
         for ($i = 0; $i < $buf_size; ++$i) {
             $search_pos = $this->tree;
@@ -141,7 +137,7 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
                     }
                 }
                 // We got a complete pattern
-                elseif ($last_found !== PHP_INT_MAX) {
+                elseif (PHP_INT_MAX !== $last_found) {
                     // Adding replacement datas to output buffer
                     $rep_size = $this->repSize[$last_found];
                     for ($j = 0; $j < $rep_size; ++$j) {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php b/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
index f60f0cf8218..783b8896dd7 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
@@ -16,7 +16,7 @@
 class Swift_StreamFilters_StringReplacementFilterFactory implements Swift_ReplacementFilterFactory
 {
     /** Lazy-loaded filters */
-    private $filters = array();
+    private $filters = [];
 
     /**
      * Create a new StreamFilter to replace $search with $replace in a string.
@@ -30,11 +30,11 @@ class Swift_StreamFilters_StringReplacementFilterFactory implements Swift_Replac
     {
         if (!isset($this->filters[$search][$replace])) {
             if (!isset($this->filters[$search])) {
-                $this->filters[$search] = array();
+                $this->filters[$search] = [];
             }
 
             if (!isset($this->filters[$search][$replace])) {
-                $this->filters[$search][$replace] = array();
+                $this->filters[$search][$replace] = [];
             }
 
             $this->filters[$search][$replace] = new Swift_StreamFilters_StringReplacementFilter($search, $replace);
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/SwiftException.php b/htdocs/includes/swiftmailer/lib/classes/Swift/SwiftException.php
index db3d31093ef..15e68b18e79 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/SwiftException.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/SwiftException.php
@@ -18,9 +18,8 @@ class Swift_SwiftException extends Exception
     /**
      * Create a new SwiftException with $message.
      *
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
+     * @param string $message
+     * @param int    $code
      */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport.php
index f6214b7bfc5..bc324e8685a 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport.php
@@ -61,8 +61,9 @@ interface Swift_Transport
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * This is the responsibility of the send method to start the transport if needed.
+     *
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
@@ -70,8 +71,6 @@ interface Swift_Transport
 
     /**
      * Register a plugin in the Transport.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
index 34c3323fdba..d2dbd7a66a0 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
@@ -27,6 +27,14 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     /** The event dispatching layer */
     protected $eventDispatcher;
 
+    protected $addressEncoder;
+
+    /** Whether the PIPELINING SMTP extension is enabled (RFC 2920) */
+    protected $pipelining = null;
+
+    /** The pipelined commands waiting for response */
+    protected $pipeline = [];
+
     /** Source Ip */
     protected $sourceIp;
 
@@ -36,14 +44,13 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     /**
      * Creates a new EsmtpTransport using the given I/O buffer.
      *
-     * @param Swift_Transport_IoBuffer     $buf
-     * @param Swift_Events_EventDispatcher $dispatcher
-     * @param string                       $localDomain
+     * @param string $localDomain
      */
-    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1')
+    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
     {
-        $this->eventDispatcher = $dispatcher;
         $this->buffer = $buf;
+        $this->eventDispatcher = $dispatcher;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
         $this->setLocalDomain($localDomain);
     }
 
@@ -63,7 +70,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function setLocalDomain($domain)
     {
-        if (substr($domain, 0, 1) !== '[') {
+        if ('[' !== substr($domain, 0, 1)) {
             if (filter_var($domain, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
                 $domain = '['.$domain.']';
             } elseif (filter_var($domain, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
@@ -109,6 +116,16 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         return $this->sourceIp;
     }
 
+    public function setAddressEncoder(Swift_AddressEncoder $addressEncoder)
+    {
+        $this->addressEncoder = $addressEncoder;
+    }
+
+    public function getAddressEncoder()
+    {
+        return $this->addressEncoder;
+    }
+
     /**
      * Start the SMTP connection.
      */
@@ -154,13 +171,16 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
     public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
+        if (!$this->isStarted()) {
+            $this->start();
+        }
+
         $sent = 0;
         $failedRecipients = (array) $failedRecipients;
 
@@ -172,31 +192,24 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         }
 
         if (!$reversePath = $this->getReversePath($message)) {
-            $this->throwException(new Swift_TransportException(
-                'Cannot send message without a sender address'
-                )
-            );
+            $this->throwException(new Swift_TransportException('Cannot send message without a sender address'));
         }
 
         $to = (array) $message->getTo();
         $cc = (array) $message->getCc();
-        $tos = array_merge($to, $cc);
         $bcc = (array) $message->getBcc();
+        $tos = array_merge($to, $cc, $bcc);
 
-        $message->setBcc(array());
+        $message->setBcc([]);
 
         try {
             $sent += $this->sendTo($message, $reversePath, $tos, $failedRecipients);
-            $sent += $this->sendBcc($message, $reversePath, $bcc, $failedRecipients);
-        } catch (Exception $e) {
+        } finally {
             $message->setBcc($bcc);
-            throw $e;
         }
 
-        $message->setBcc($bcc);
-
         if ($evt) {
-            if ($sent == count($to) + count($cc) + count($bcc)) {
+            if ($sent == \count($to) + \count($cc) + \count($bcc)) {
                 $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
             } elseif ($sent > 0) {
                 $evt->setResult(Swift_Events_SendEvent::RESULT_TENTATIVE);
@@ -226,7 +239,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
             }
 
             try {
-                $this->executeCommand("QUIT\r\n", array(221));
+                $this->executeCommand("QUIT\r\n", [221]);
             } catch (Swift_TransportException $e) {
             }
 
@@ -253,7 +266,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
                 $this->start();
             }
 
-            $this->executeCommand("NOOP\r\n", array(250));
+            $this->executeCommand("NOOP\r\n", [250]);
         } catch (Swift_TransportException $e) {
             try {
                 $this->stop();
@@ -268,8 +281,6 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
@@ -281,7 +292,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function reset()
     {
-        $this->executeCommand("RSET\r\n", array(250));
+        $this->executeCommand("RSET\r\n", [250], $failures, true);
     }
 
     /**
@@ -299,22 +310,46 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      *
      * If no response codes are given, the response will not be validated.
      * If codes are given, an exception will be thrown on an invalid response.
+     * If the command is RCPT TO, and the pipeline is non-empty, no exception
+     * will be thrown; instead the failing address is added to $failures.
      *
      * @param string   $command
      * @param int[]    $codes
      * @param string[] $failures An array of failures by-reference
+     * @param bool     $pipeline Do not wait for response
+     * @param string   $address  the address, if command is RCPT TO
      *
-     * @return string
+     * @return string|null The server response, or null if pipelining is enabled
      */
-    public function executeCommand($command, $codes = array(), &$failures = null)
+    public function executeCommand($command, $codes = [], &$failures = null, $pipeline = false, $address = null)
     {
         $failures = (array) $failures;
         $seq = $this->buffer->write($command);
-        $response = $this->getFullResponse($seq);
         if ($evt = $this->eventDispatcher->createCommandEvent($this, $command, $codes)) {
             $this->eventDispatcher->dispatchEvent($evt, 'commandSent');
         }
-        $this->assertResponseCode($response, $codes);
+
+        $this->pipeline[] = [$command, $seq, $codes, $address];
+
+        if ($pipeline && $this->pipelining) {
+            return null;
+        }
+
+        $response = null;
+
+        while ($this->pipeline) {
+            list($command, $seq, $codes, $address) = array_shift($this->pipeline);
+            $response = $this->getFullResponse($seq);
+            try {
+                $this->assertResponseCode($response, $codes);
+            } catch (Swift_TransportException $e) {
+                if ($this->pipeline && $address) {
+                    $failures[] = $address;
+                } else {
+                    $this->throwException($e);
+                }
+            }
+        }
 
         return $response;
     }
@@ -322,51 +357,53 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     /** Read the opening SMTP greeting */
     protected function readGreeting()
     {
-        $this->assertResponseCode($this->getFullResponse(0), array(220));
+        $this->assertResponseCode($this->getFullResponse(0), [220]);
     }
 
     /** Send the HELO welcome */
     protected function doHeloCommand()
     {
         $this->executeCommand(
-            sprintf("HELO %s\r\n", $this->domain), array(250)
+            sprintf("HELO %s\r\n", $this->domain), [250]
             );
     }
 
     /** Send the MAIL FROM command */
     protected function doMailFromCommand($address)
     {
+        $address = $this->addressEncoder->encodeString($address);
         $this->executeCommand(
-            sprintf("MAIL FROM:<%s>\r\n", $address), array(250)
+            sprintf("MAIL FROM:<%s>\r\n", $address), [250], $failures, true
             );
     }
 
     /** Send the RCPT TO command */
     protected function doRcptToCommand($address)
     {
+        $address = $this->addressEncoder->encodeString($address);
         $this->executeCommand(
-            sprintf("RCPT TO:<%s>\r\n", $address), array(250, 251, 252)
+            sprintf("RCPT TO:<%s>\r\n", $address), [250, 251, 252], $failures, true, $address
             );
     }
 
     /** Send the DATA command */
-    protected function doDataCommand()
+    protected function doDataCommand(&$failedRecipients)
     {
-        $this->executeCommand("DATA\r\n", array(354));
+        $this->executeCommand("DATA\r\n", [354], $failedRecipients);
     }
 
     /** Stream the contents of the message over the buffer */
     protected function streamMessage(Swift_Mime_SimpleMessage $message)
     {
-        $this->buffer->setWriteTranslations(array("\r\n." => "\r\n.."));
+        $this->buffer->setWriteTranslations(["\r\n." => "\r\n.."]);
         try {
             $message->toByteStream($this->buffer);
             $this->buffer->flushBuffers();
         } catch (Swift_TransportException $e) {
             $this->throwException($e);
         }
-        $this->buffer->setWriteTranslations(array());
-        $this->executeCommand("\r\n.\r\n", array(250));
+        $this->buffer->setWriteTranslations([]);
+        $this->executeCommand("\r\n.\r\n", [250]);
     }
 
     /** Determine the best-use reverse path for this message */
@@ -406,8 +443,12 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     /** Throws an Exception if a response code is incorrect */
     protected function assertResponseCode($response, $wanted)
     {
+        if (!$response) {
+            $this->throwException(new Swift_TransportException('Expected response code '.implode('/', $wanted).' but got an empty response'));
+        }
+
         list($code) = sscanf($response, '%3d');
-        $valid = (empty($wanted) || in_array($code, $wanted));
+        $valid = (empty($wanted) || \in_array($code, $wanted));
 
         if ($evt = $this->eventDispatcher->createResponseEvent($this, $response,
             $valid)) {
@@ -415,12 +456,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         }
 
         if (!$valid) {
-            $this->throwException(
-                new Swift_TransportException(
-                    'Expected response code '.implode('/', $wanted).' but got code '.
-                    '"'.$code.'", with message "'.$response.'"',
-                    $code)
-                );
+            $this->throwException(new Swift_TransportException('Expected response code '.implode('/', $wanted).' but got code "'.$code.'", with message "'.$response.'"', $code));
         }
     }
 
@@ -436,10 +472,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         } catch (Swift_TransportException $e) {
             $this->throwException($e);
         } catch (Swift_IoException $e) {
-            $this->throwException(
-                new Swift_TransportException(
-                    $e->getMessage())
-                );
+            $this->throwException(new Swift_TransportException($e->getMessage(), 0, $e));
         }
 
         return $response;
@@ -456,11 +489,16 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
                 ++$sent;
             } catch (Swift_TransportException $e) {
                 $failedRecipients[] = $forwardPath;
+            } catch (Swift_AddressEncoderException $e) {
+                $failedRecipients[] = $forwardPath;
             }
         }
 
-        if ($sent != 0) {
-            $this->doDataCommand();
+        if (0 != $sent) {
+            $sent += \count($failedRecipients);
+            $this->doDataCommand($failedRecipients);
+            $sent -= \count($failedRecipients);
+
             $this->streamMessage($message);
         } else {
             $this->reset();
@@ -480,20 +518,6 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
             $failedRecipients);
     }
 
-    /** Send a message to all Bcc: recipients */
-    private function sendBcc(Swift_Mime_SimpleMessage $message, $reversePath, array $bcc, array &$failedRecipients)
-    {
-        $sent = 0;
-        foreach ($bcc as $forwardPath => $name) {
-            $message->setBcc(array($forwardPath => $name));
-            $sent += $this->doMailTransaction(
-                $message, $reversePath, array($forwardPath), $failedRecipients
-                );
-        }
-
-        return $sent;
-    }
-
     /**
      * Destructor.
      */
@@ -504,4 +528,14 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         } catch (Exception $e) {
         }
     }
+
+    public function __sleep()
+    {
+        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
+    }
+
+    public function __wakeup()
+    {
+        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+    }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
index 26c2d745a95..bb3a1615096 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
@@ -26,29 +26,23 @@ class Swift_Transport_Esmtp_Auth_CramMd5Authenticator implements Swift_Transport
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
         try {
-            $challenge = $agent->executeCommand("AUTH CRAM-MD5\r\n", array(334));
+            $challenge = $agent->executeCommand("AUTH CRAM-MD5\r\n", [334]);
             $challenge = base64_decode(substr($challenge, 4));
             $message = base64_encode(
                 $username.' '.$this->getResponse($password, $challenge)
-                );
-            $agent->executeCommand(sprintf("%s\r\n", $message), array(235));
+            );
+            $agent->executeCommand(sprintf("%s\r\n", $message), [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 
@@ -62,16 +56,16 @@ class Swift_Transport_Esmtp_Auth_CramMd5Authenticator implements Swift_Transport
      */
     private function getResponse($secret, $challenge)
     {
-        if (strlen($secret) > 64) {
+        if (\strlen($secret) > 64) {
             $secret = pack('H32', md5($secret));
         }
 
-        if (strlen($secret) < 64) {
-            $secret = str_pad($secret, 64, chr(0));
+        if (\strlen($secret) < 64) {
+            $secret = str_pad($secret, 64, \chr(0));
         }
 
-        $k_ipad = substr($secret, 0, 64) ^ str_repeat(chr(0x36), 64);
-        $k_opad = substr($secret, 0, 64) ^ str_repeat(chr(0x5C), 64);
+        $k_ipad = substr($secret, 0, 64) ^ str_repeat(\chr(0x36), 64);
+        $k_opad = substr($secret, 0, 64) ^ str_repeat(\chr(0x5C), 64);
 
         $inner = pack('H32', md5($k_ipad.$challenge));
         $digest = md5($k_opad.$inner);
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
index 6ab6e3337e2..0b9d81b8ad6 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
@@ -26,26 +26,20 @@ class Swift_Transport_Esmtp_Auth_LoginAuthenticator implements Swift_Transport_E
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
         try {
-            $agent->executeCommand("AUTH LOGIN\r\n", array(334));
-            $agent->executeCommand(sprintf("%s\r\n", base64_encode($username)), array(334));
-            $agent->executeCommand(sprintf("%s\r\n", base64_encode($password)), array(235));
+            $agent->executeCommand("AUTH LOGIN\r\n", [334]);
+            $agent->executeCommand(sprintf("%s\r\n", base64_encode($username ?? '')), [334]);
+            $agent->executeCommand(sprintf("%s\r\n", base64_encode($password ?? '')), [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
index 7b8608d4a1b..41931fdd226 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
@@ -31,63 +31,57 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      *
      * @throws \LogicException
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
-        if (!function_exists('openssl_encrypt')) {
+        if (!\function_exists('openssl_encrypt')) {
             throw new LogicException('The OpenSSL extension must be enabled to use the NTLM authenticator.');
         }
 
-        if (!function_exists('bcmul')) {
+        if (!\function_exists('bcmul')) {
             throw new LogicException('The BCMath functions must be enabled to use the NTLM authenticator.');
         }
 
         try {
             // execute AUTH command and filter out the code at the beginning
             // AUTH NTLM xxxx
-            $response = base64_decode(substr(trim($this->sendMessage1($agent)), 4));
+            $response = base64_decode(substr(trim($this->sendMessage1($agent) ?? ''), 4));
 
             // extra parameters for our unit cases
-            $timestamp = func_num_args() > 3 ? func_get_arg(3) : $this->getCorrectTimestamp(bcmul(microtime(true), '1000'));
-            $client = func_num_args() > 4 ? func_get_arg(4) : $this->getRandomBytes(8);
+            $timestamp = \func_num_args() > 3 ? func_get_arg(3) : $this->getCorrectTimestamp(bcmul(microtime(true), '1000'));
+            $client = \func_num_args() > 4 ? func_get_arg(4) : random_bytes(8);
 
             // Message 3 response
             $this->sendMessage3($response, $username, $password, $timestamp, $client, $agent);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 
     protected function si2bin($si, $bits = 32)
     {
         $bin = null;
-        if ($si >= -pow(2, $bits - 1) && ($si <= pow(2, $bits - 1))) {
+        if ($si >= -2 ** ($bits - 1) && ($si <= 2 ** ($bits - 1))) {
             // positive or zero
             if ($si >= 0) {
                 $bin = base_convert($si, 10, 2);
                 // pad to $bits bit
-                $bin_length = strlen($bin);
+                $bin_length = \strlen($bin);
                 if ($bin_length < $bits) {
                     $bin = str_repeat('0', $bits - $bin_length).$bin;
                 }
             } else {
                 // negative
-                $si = -$si - pow(2, $bits);
+                $si = -$si - 2 ** $bits;
                 $bin = base_convert($si, 10, 2);
-                $bin_length = strlen($bin);
+                $bin_length = \strlen($bin);
                 if ($bin_length > $bits) {
                     $bin = str_repeat('1', $bits - $bin_length).$bin;
                 }
@@ -100,15 +94,13 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     /**
      * Send our auth message and returns the response.
      *
-     * @param Swift_Transport_SmtpAgent $agent
-     *
      * @return string SMTP Response
      */
     protected function sendMessage1(Swift_Transport_SmtpAgent $agent)
     {
         $message = $this->createMessage1();
 
-        return $agent->executeCommand(sprintf("AUTH %s %s\r\n", $this->getAuthKeyword(), base64_encode($message)), array(334));
+        return $agent->executeCommand(sprintf("AUTH %s %s\r\n", $this->getAuthKeyword(), base64_encode($message)), [334]);
     }
 
     /**
@@ -131,7 +123,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         $targetInfoBlock = substr($responseHex, $offset);
         list($domainName, $serverName, $DNSDomainName, $DNSServerName, $terminatorByte) = $this->readSubBlock($targetInfoBlock);
 
-        return array(
+        return [
             $challenge,
             $context,
             $targetInfoH,
@@ -142,14 +134,12 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
             $DNSServerName,
             hex2bin($targetInfoBlock),
             $terminatorByte,
-        );
+        ];
     }
 
     /**
      * Read the blob information in from message2.
      *
-     * @param $block
-     *
      * @return array
      */
     protected function readSubBlock($block)
@@ -157,9 +147,9 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         // remove terminatorByte cause it's always the same
         $block = substr($block, 0, -8);
 
-        $length = strlen($block);
+        $length = \strlen($block);
         $offset = 0;
-        $data = array();
+        $data = [];
         while ($offset < $length) {
             $blockLength = hexdec(substr(substr($block, $offset, 8), -4)) / 256;
             $offset += 8;
@@ -167,7 +157,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
             $offset += $blockLength * 2;
         }
 
-        if (count($data) == 3) {
+        if (3 == \count($data)) {
             $data[] = $data[2];
             $data[2] = '';
         }
@@ -180,13 +170,12 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     /**
      * Send our final message with all our data.
      *
-     * @param string                    $response  Message 1 response (message 2)
-     * @param string                    $username
-     * @param string                    $password
-     * @param string                    $timestamp
-     * @param string                    $client
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param bool                      $v2        Use version2 of the protocol
+     * @param string $response  Message 1 response (message 2)
+     * @param string $username
+     * @param string $password
+     * @param string $timestamp
+     * @param string $client
+     * @param bool   $v2        Use version2 of the protocol
      *
      * @return string
      */
@@ -210,7 +199,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
 
         $message = $this->createMessage3($domain, $username, $workstation, $lmResponse, $ntlmResponse);
 
-        return $agent->executeCommand(sprintf("%s\r\n", base64_encode($message)), array(235));
+        return $agent->executeCommand(sprintf("%s\r\n", base64_encode($message)), [235]);
     }
 
     /**
@@ -294,18 +283,18 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      */
     protected function getDomainAndUsername($name)
     {
-        if (strpos($name, '\\') !== false) {
+        if (false !== strpos($name, '\\')) {
             return explode('\\', $name);
         }
 
         if (false !== strpos($name, '@')) {
             list($user, $domain) = explode('@', $name);
 
-            return array($domain, $user);
+            return [$domain, $user];
         }
 
         // no domain passed
-        return array('', $name);
+        return ['', $name];
     }
 
     /**
@@ -375,7 +364,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         $binary = $this->si2bin($time, 64); // create 64 bit binary string
         $timestamp = '';
         for ($i = 0; $i < 8; ++$i) {
-            $timestamp .= chr(bindec(substr($binary, -(($i + 1) * 8), 8)));
+            $timestamp .= \chr(bindec(substr($binary, -(($i + 1) * 8), 8)));
         }
 
         return $timestamp;
@@ -396,7 +385,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     {
         $lmPass = '00'; // by default 00
         // if $password > 15 than we can't use this method
-        if (strlen($password) <= 15) {
+        if (\strlen($password) <= 15) {
             $ntlmHash = $this->md4Encrypt($password);
             $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username).$domain));
 
@@ -436,21 +425,21 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
 
     protected function createDesKey($key)
     {
-        $material = array(bin2hex($key[0]));
-        $len = strlen($key);
+        $material = [bin2hex($key[0])];
+        $len = \strlen($key);
         for ($i = 1; $i < $len; ++$i) {
             list($high, $low) = str_split(bin2hex($key[$i]));
-            $v = $this->castToByte(ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xf)), $i));
+            $v = $this->castToByte(\ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xf)), $i));
             $material[] = str_pad(substr(dechex($v), -2), 2, '0', STR_PAD_LEFT); // cast to byte
         }
-        $material[] = str_pad(substr(dechex($this->castToByte(ord($key[6]) << 1)), -2), 2, '0');
+        $material[] = str_pad(substr(dechex($this->castToByte(\ord($key[6]) << 1)), -2), 2, '0');
 
         // odd parity
         foreach ($material as $k => $v) {
             $b = $this->castToByte(hexdec($v));
-            $needsParity = (($this->uRShift($b, 7) ^ $this->uRShift($b, 6) ^ $this->uRShift($b, 5)
+            $needsParity = 0 == (($this->uRShift($b, 7) ^ $this->uRShift($b, 6) ^ $this->uRShift($b, 5)
                         ^ $this->uRShift($b, 4) ^ $this->uRShift($b, 3) ^ $this->uRShift($b, 2)
-                        ^ $this->uRShift($b, 1)) & 0x01) == 0;
+                        ^ $this->uRShift($b, 1)) & 0x01);
 
             list($high, $low) = str_split($v);
             if ($needsParity) {
@@ -476,7 +465,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      */
     protected function createSecurityBuffer($value, $offset, $is16 = false)
     {
-        $length = strlen(bin2hex($value));
+        $length = \strlen(bin2hex($value));
         $length = $is16 ? $length / 2 : $length;
         $length = $this->createByte(str_pad(dechex($length), 2, '0', STR_PAD_LEFT), 2);
 
@@ -495,7 +484,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         $length = floor(hexdec(substr($value, 0, 4)) / 256) * 2;
         $offset = floor(hexdec(substr($value, 8, 4)) / 256) * 2;
 
-        return array($length, $offset);
+        return [$length, $offset];
     }
 
     /**
@@ -521,7 +510,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      */
     protected function uRShift($a, $b)
     {
-        if ($b == 0) {
+        if (0 == $b) {
             return $a;
         }
 
@@ -548,22 +537,6 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         return $byte;
     }
 
-    /**
-     * Create random bytes.
-     *
-     * @param $length
-     *
-     * @return string
-     */
-    protected function getRandomBytes($length)
-    {
-        $bytes = openssl_random_pseudo_bytes($length, $strong);
-        if (false !== $bytes && true === $strong) {
-            return $bytes;
-        }
-        throw new RuntimeException('OpenSSL did not produce a secure random number.');
-    }
-
     /** ENCRYPTION ALGORITHMS */
 
     /**
@@ -590,7 +563,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     protected function md5Encrypt($key, $msg)
     {
         $blocksize = 64;
-        if (strlen($key) > $blocksize) {
+        if (\strlen($key) > $blocksize) {
             $key = pack('H*', md5($key));
         }
 
@@ -608,13 +581,13 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      *
      * @return string
      *
-     * @see http://php.net/manual/en/ref.hash.php
+     * @see https://secure.php.net/manual/en/ref.hash.php
      */
     protected function md4Encrypt($input)
     {
         $input = $this->convertTo16bit($input);
 
-        return function_exists('hash') ? hex2bin(hash('md4', $input)) : mhash(MHASH_MD4, $input);
+        return \function_exists('hash') ? hex2bin(hash('md4', $input)) : mhash(MHASH_MD4, $input);
     }
 
     /**
@@ -639,8 +612,8 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         echo substr($message, 0, 16)." NTLMSSP Signature<br />\n";
         echo $messageId." Type Indicator<br />\n";
 
-        if ($messageId == '02000000') {
-            $map = array(
+        if ('02000000' == $messageId) {
+            $map = [
                 'Challenge',
                 'Context',
                 'Target Information Security Buffer',
@@ -651,14 +624,14 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
                 'DNS Server Name',
                 'BLOB',
                 'Target Information Terminator',
-            );
+            ];
 
             $data = $this->parseMessage2(hex2bin($message));
 
             foreach ($map as $key => $value) {
                 echo bin2hex($data[$key]).' - '.$data[$key].' ||| '.$value."<br />\n";
             }
-        } elseif ($messageId == '03000000') {
+        } elseif ('03000000' == $messageId) {
             $i = 0;
             $data[$i++] = substr($message, 24, 16);
             list($lmLength, $lmOffset) = $this->readSecurityBuffer($data[$i - 1]);
@@ -683,7 +656,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
             $data[$i++] = substr($message, $lmOffset, $lmLength);
             $data[$i] = substr($message, $ntmlOffset, $ntmlLength);
 
-            $map = array(
+            $map = [
                 'LM Response Security Buffer',
                 'NTLM Response Security Buffer',
                 'Target Name Security Buffer',
@@ -696,7 +669,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
                 'Workstation Name Data',
                 'LM Response Data',
                 'NTLM Response Data',
-            );
+            ];
 
             foreach ($map as $key => $value) {
                 echo $data[$key].' - '.hex2bin($data[$key]).' ||| '.$value."<br />\n";
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
index 43219f93445..41d0a50a82b 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
@@ -26,25 +26,19 @@ class Swift_Transport_Esmtp_Auth_PlainAuthenticator implements Swift_Transport_E
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
         try {
-            $message = base64_encode($username.chr(0).$username.chr(0).$password);
-            $agent->executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), array(235));
+            $message = base64_encode($username.\chr(0).$username.\chr(0).$password);
+            $agent->executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
index d1a4cc3d774..859f22f3d5e 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
@@ -36,25 +36,19 @@ class Swift_Transport_Esmtp_Auth_XOAuth2Authenticator implements Swift_Transport
     }
 
     /**
-     * Try to authenticate the user with $email and $token.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $email
-     * @param string                    $token
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $email, $token)
     {
         try {
             $param = $this->constructXOAuth2Params($email, $token);
-            $agent->executeCommand('AUTH XOAUTH2 '.$param."\r\n", array(235));
+            $agent->executeCommand('AUTH XOAUTH2 '.$param."\r\n", [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
index 94387f01a2e..53a90a87383 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
@@ -9,7 +9,7 @@
  */
 
 /**
- * An ESMTP handler for AUTH support.
+ * An ESMTP handler for AUTH support (RFC 5248).
  *
  * @author Chris Corbyn
  */
@@ -20,7 +20,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      *
      * @var Swift_Transport_Esmtp_Authenticator[]
      */
-    private $authenticators = array();
+    private $authenticators = [];
 
     /**
      * The username for authentication.
@@ -48,7 +48,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      *
      * @var string[]
      */
-    private $esmtpParams = array();
+    private $esmtpParams = [];
 
     /**
      * Create a new AuthHandler with $authenticators for support.
@@ -143,7 +143,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
     /**
      * Get the name of the ESMTP extension this handles.
      *
-     * @return bool
+     * @return string
      */
     public function getHandledKeyword()
     {
@@ -169,19 +169,26 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
     {
         if ($this->username) {
             $count = 0;
+            $errors = [];
             foreach ($this->getAuthenticatorsForAgent() as $authenticator) {
-                if (in_array(strtolower($authenticator->getAuthKeyword()),
-                    array_map('strtolower', $this->esmtpParams))) {
+                if (\in_array(strtolower($authenticator->getAuthKeyword() ?? ''), array_map('strtolower', $this->esmtpParams))) {
                     ++$count;
-                    if ($authenticator->authenticate($agent, $this->username, $this->password)) {
-                        return;
+                    try {
+                        if ($authenticator->authenticate($agent, $this->username, $this->password)) {
+                            return;
+                        }
+                    } catch (Swift_TransportException $e) {
+                        // keep the error message, but tries the other authenticators
+                        $errors[] = [$authenticator->getAuthKeyword(), $e->getMessage()];
                     }
                 }
             }
-            throw new Swift_TransportException(
-                'Failed to authenticate on SMTP server with username "'.
-                $this->username.'" using '.$count.' possible authenticators'
-                );
+
+            $message = 'Failed to authenticate on SMTP server with username "'.$this->username.'" using '.$count.' possible authenticators.';
+            foreach ($errors as $error) {
+                $message .= ' Authenticator '.$error[0].' returned '.$error[1].'.';
+            }
+            throw new Swift_TransportException($message);
         }
     }
 
@@ -190,7 +197,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getMailParams()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -198,13 +205,13 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getRcptParams()
     {
-        return array();
+        return [];
     }
 
     /**
      * Not used.
      */
-    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = array(), &$failedRecipients = null, &$stop = false)
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false)
     {
     }
 
@@ -229,7 +236,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function exposeMixinMethods()
     {
-        return array('setUsername', 'getUsername', 'setPassword', 'getPassword', 'setAuthMode', 'getAuthMode');
+        return ['setUsername', 'getUsername', 'setPassword', 'getPassword', 'setAuthMode', 'getAuthMode'];
     }
 
     /**
@@ -242,19 +249,17 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
     /**
      * Returns the authenticator list for the given agent.
      *
-     * @param Swift_Transport_SmtpAgent $agent
-     *
      * @return array
      */
     protected function getAuthenticatorsForAgent()
     {
-        if (!$mode = strtolower($this->auth_mode)) {
+        if (!$mode = strtolower($this->auth_mode ?? '')) {
             return $this->authenticators;
         }
 
         foreach ($this->authenticators as $authenticator) {
-            if (strtolower($authenticator->getAuthKeyword()) == $mode) {
-                return array($authenticator);
+            if (strtolower($authenticator->getAuthKeyword() ?? '') == $mode) {
+                return [$authenticator];
             }
         }
 
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
index 12a9abf8199..f692a6fe40d 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
@@ -25,11 +25,12 @@ interface Swift_Transport_Esmtp_Authenticator
     /**
      * Try to authenticate the user with $username and $password.
      *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
+     * @param string $username
+     * @param string $password
      *
-     * @return bool
+     * @return bool true if authentication worked (returning false is deprecated, throw a Swift_TransportException instead)
+     *
+     * @throws Swift_TransportException Allows the message to bubble up when authentication was not successful
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php
new file mode 100644
index 00000000000..63f70866939
--- /dev/null
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An ESMTP handler for 8BITMIME support (RFC 6152).
+ *
+ * 8BITMIME is required when sending 8-bit content to over SMTP, e.g. when using
+ * Swift_Mime_ContentEncoder_PlainContentEncoder in "8bit" mode.
+ *
+ * 8BITMIME mode is enabled unconditionally, even when sending ASCII-only
+ * messages, so it should only be used with an outbound SMTP server that will
+ * convert the message to 7-bit MIME if the next hop does not support 8BITMIME.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_Transport_Esmtp_EightBitMimeHandler implements Swift_Transport_EsmtpHandler
+{
+    protected $encoding;
+
+    /**
+     * @param string $encoding The parameter so send with the MAIL FROM command;
+     *                         either "8BITMIME" or "7BIT"
+     */
+    public function __construct(string $encoding = '8BITMIME')
+    {
+        $this->encoding = $encoding;
+    }
+
+    /**
+     * Get the name of the ESMTP extension this handles.
+     *
+     * @return string
+     */
+    public function getHandledKeyword()
+    {
+        return '8BITMIME';
+    }
+
+    /**
+     * Not used.
+     */
+    public function setKeywordParams(array $parameters)
+    {
+    }
+
+    /**
+     * Not used.
+     */
+    public function afterEhlo(Swift_Transport_SmtpAgent $agent)
+    {
+    }
+
+    /**
+     * Get params which are appended to MAIL FROM:<>.
+     *
+     * @return string[]
+     */
+    public function getMailParams()
+    {
+        return ['BODY='.$this->encoding];
+    }
+
+    /**
+     * Not used.
+     */
+    public function getRcptParams()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false)
+    {
+    }
+
+    /**
+     * Returns +1, -1 or 0 according to the rules for usort().
+     *
+     * This method is called to ensure extensions can be execute in an appropriate order.
+     *
+     * @param string $esmtpKeyword to compare with
+     *
+     * @return int
+     */
+    public function getPriorityOver($esmtpKeyword)
+    {
+        return 0;
+    }
+
+    /**
+     * Not used.
+     */
+    public function exposeMixinMethods()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function resetState()
+    {
+    }
+}
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php
new file mode 100644
index 00000000000..7d0252a01bf
--- /dev/null
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php
@@ -0,0 +1,107 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An ESMTP handler for SMTPUTF8 support (RFC 6531).
+ *
+ * SMTPUTF8 is required when sending to email addresses containing non-ASCII
+ * characters in local-part (the substring before @). This handler should be
+ * used together with Swift_AddressEncoder_Utf8AddressEncoder.
+ *
+ * SMTPUTF8 mode is enabled unconditionally, even when sending to ASCII-only
+ * addresses, so it should only be used with an outbound SMTP server that will
+ * deliver ASCII-only messages even if the next hop does not support SMTPUTF8.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_Transport_Esmtp_SmtpUtf8Handler implements Swift_Transport_EsmtpHandler
+{
+    public function __construct()
+    {
+    }
+
+    /**
+     * Get the name of the ESMTP extension this handles.
+     *
+     * @return string
+     */
+    public function getHandledKeyword()
+    {
+        return 'SMTPUTF8';
+    }
+
+    /**
+     * Not used.
+     */
+    public function setKeywordParams(array $parameters)
+    {
+    }
+
+    /**
+     * Not used.
+     */
+    public function afterEhlo(Swift_Transport_SmtpAgent $agent)
+    {
+    }
+
+    /**
+     * Get params which are appended to MAIL FROM:<>.
+     *
+     * @return string[]
+     */
+    public function getMailParams()
+    {
+        return ['SMTPUTF8'];
+    }
+
+    /**
+     * Not used.
+     */
+    public function getRcptParams()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false)
+    {
+    }
+
+    /**
+     * Returns +1, -1 or 0 according to the rules for usort().
+     *
+     * This method is called to ensure extensions can be execute in an appropriate order.
+     *
+     * @param string $esmtpKeyword to compare with
+     *
+     * @return int
+     */
+    public function getPriorityOver($esmtpKeyword)
+    {
+        return 0;
+    }
+
+    /**
+     * Not used.
+     */
+    public function exposeMixinMethods()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function resetState()
+    {
+    }
+}
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
index c17ef8feb3b..b8ea36e2fa8 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
@@ -18,7 +18,7 @@ interface Swift_Transport_EsmtpHandler
     /**
      * Get the name of the ESMTP extension this handles.
      *
-     * @return bool
+     * @return string
      */
     public function getHandledKeyword();
 
@@ -59,7 +59,7 @@ interface Swift_Transport_EsmtpHandler
      * @param string[]                  $failedRecipients to collect failures
      * @param bool                      $stop             to be set true  by-reference if the command is now sent
      */
-    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = array(), &$failedRecipients = null, &$stop = false);
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false);
 
     /**
      * Returns +1, -1 or 0 according to the rules for usort().
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
index 56d9c748769..36545f51feb 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
@@ -20,21 +20,21 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      *
      * @var Swift_Transport_EsmtpHandler[]
      */
-    private $handlers = array();
+    private $handlers = [];
 
     /**
      * ESMTP capabilities.
      *
      * @var string[]
      */
-    private $capabilities = array();
+    private $capabilities = [];
 
     /**
      * Connection buffer parameters.
      *
      * @var array
      */
-    private $params = array(
+    private $params = [
         'protocol' => 'tcp',
         'host' => 'localhost',
         'port' => 25,
@@ -42,26 +42,26 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
         'blocking' => 1,
         'tls' => false,
         'type' => Swift_Transport_IoBuffer::TYPE_SOCKET,
-        'stream_context_options' => array(),
-        );
+        'stream_context_options' => [],
+        ];
 
     /**
      * Creates a new EsmtpTransport using the given I/O buffer.
      *
-     * @param Swift_Transport_IoBuffer       $buf
      * @param Swift_Transport_EsmtpHandler[] $extensionHandlers
-     * @param Swift_Events_EventDispatcher   $dispatcher
      * @param string                         $localDomain
      */
-    public function __construct(Swift_Transport_IoBuffer $buf, array $extensionHandlers, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1')
+    public function __construct(Swift_Transport_IoBuffer $buf, array $extensionHandlers, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
     {
-        parent::__construct($buf, $dispatcher, $localDomain);
+        parent::__construct($buf, $dispatcher, $localDomain, $addressEncoder);
         $this->setExtensionHandlers($extensionHandlers);
     }
 
     /**
      * Set the host to connect to.
      *
+     * Literal IPv6 addresses should be wrapped in square brackets.
+     *
      * @param string $host
      *
      * @return $this
@@ -141,7 +141,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function setEncryption($encryption)
     {
-        $encryption = strtolower($encryption);
+        $encryption = strtolower($encryption ?? '');
         if ('tls' == $encryption) {
             $this->params['protocol'] = 'tcp';
             $this->params['tls'] = true;
@@ -190,6 +190,8 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     /**
      * Sets the source IP.
      *
+     * IPv6 addresses should be wrapped in square brackets.
+     *
      * @param string $source
      *
      * @return $this
@@ -208,7 +210,36 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function getSourceIp()
     {
-        return isset($this->params['sourceIp']) ? $this->params['sourceIp'] : null;
+        return $this->params['sourceIp'] ?? null;
+    }
+
+    /**
+     * Sets whether SMTP pipelining is enabled.
+     *
+     * By default, support is auto-detected using the PIPELINING SMTP extension.
+     * Use this function to override that in the unlikely event of compatibility
+     * issues.
+     *
+     * @param bool $enabled
+     *
+     * @return $this
+     */
+    public function setPipelining($enabled)
+    {
+        $this->pipelining = $enabled;
+
+        return $this;
+    }
+
+    /**
+     * Returns whether SMTP pipelining is enabled.
+     *
+     * @return bool|null a boolean if pipelining is explicitly enabled or disabled,
+     *                   or null if support is auto-detected
+     */
+    public function getPipelining()
+    {
+        return $this->pipelining;
     }
 
     /**
@@ -220,7 +251,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function setExtensionHandlers(array $handlers)
     {
-        $assoc = array();
+        $assoc = [];
         foreach ($handlers as $handler) {
             $assoc[$handler->getHandledKeyword()] = $handler;
         }
@@ -252,10 +283,12 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      * @param string   $command
      * @param int[]    $codes
      * @param string[] $failures An array of failures by-reference
+     * @param bool     $pipeline Do not wait for response
+     * @param string   $address  the address, if command is RCPT TO
      *
-     * @return string
+     * @return string|null The server response, or null if pipelining is enabled
      */
-    public function executeCommand($command, $codes = array(), &$failures = null)
+    public function executeCommand($command, $codes = [], &$failures = null, $pipeline = false, $address = null)
     {
         $failures = (array) $failures;
         $stopSignal = false;
@@ -269,19 +302,19 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
             }
         }
 
-        return parent::executeCommand($command, $codes, $failures);
+        return parent::executeCommand($command, $codes, $failures, $pipeline, $address);
     }
 
     /** Mixin handling method for ESMTP handlers */
     public function __call($method, $args)
     {
         foreach ($this->handlers as $handler) {
-            if (in_array(strtolower($method),
+            if (\in_array(strtolower($method),
                 array_map('strtolower', (array) $handler->exposeMixinMethods())
                 )) {
-                $return = call_user_func_array(array($handler, $method), $args);
+                $return = \call_user_func_array([$handler, $method], $args);
                 // Allow fluid method calls
-                if (null === $return && substr($method, 0, 3) == 'set') {
+                if (null === $return && 'set' == substr($method, 0, 3)) {
                     return $this;
                 } else {
                     return $return;
@@ -302,7 +335,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     {
         try {
             $response = $this->executeCommand(
-                sprintf("EHLO %s\r\n", $this->domain), array(250)
+                sprintf("EHLO %s\r\n", $this->domain), [250]
                 );
         } catch (Swift_TransportException $e) {
             return parent::doHeloCommand();
@@ -310,7 +343,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
 
         if ($this->params['tls']) {
             try {
-                $this->executeCommand("STARTTLS\r\n", array(220));
+                $this->executeCommand("STARTTLS\r\n", [220]);
 
                 if (!$this->buffer->startTLS()) {
                     throw new Swift_TransportException('Unable to connect with TLS encryption');
@@ -318,7 +351,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
 
                 try {
                     $response = $this->executeCommand(
-                        sprintf("EHLO %s\r\n", $this->domain), array(250)
+                        sprintf("EHLO %s\r\n", $this->domain), [250]
                         );
                 } catch (Swift_TransportException $e) {
                     return parent::doHeloCommand();
@@ -329,6 +362,10 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
         }
 
         $this->capabilities = $this->getCapabilities($response);
+        if (!isset($this->pipelining)) {
+            $this->pipelining = isset($this->capabilities['PIPELINING']);
+        }
+
         $this->setHandlerParams();
         foreach ($this->getActiveHandlers() as $handler) {
             $handler->afterEhlo($this);
@@ -338,43 +375,45 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     /** Overridden to add Extension support */
     protected function doMailFromCommand($address)
     {
+        $address = $this->addressEncoder->encodeString($address);
         $handlers = $this->getActiveHandlers();
-        $params = array();
+        $params = [];
         foreach ($handlers as $handler) {
             $params = array_merge($params, (array) $handler->getMailParams());
         }
         $paramStr = !empty($params) ? ' '.implode(' ', $params) : '';
         $this->executeCommand(
-            sprintf("MAIL FROM:<%s>%s\r\n", $address, $paramStr), array(250)
+            sprintf("MAIL FROM:<%s>%s\r\n", $address, $paramStr), [250], $failures, true
             );
     }
 
     /** Overridden to add Extension support */
     protected function doRcptToCommand($address)
     {
+        $address = $this->addressEncoder->encodeString($address);
         $handlers = $this->getActiveHandlers();
-        $params = array();
+        $params = [];
         foreach ($handlers as $handler) {
             $params = array_merge($params, (array) $handler->getRcptParams());
         }
         $paramStr = !empty($params) ? ' '.implode(' ', $params) : '';
         $this->executeCommand(
-            sprintf("RCPT TO:<%s>%s\r\n", $address, $paramStr), array(250, 251, 252)
+            sprintf("RCPT TO:<%s>%s\r\n", $address, $paramStr), [250, 251, 252], $failures, true, $address
             );
     }
 
     /** Determine ESMTP capabilities by function group */
     private function getCapabilities($ehloResponse)
     {
-        $capabilities = array();
-        $ehloResponse = trim($ehloResponse);
+        $capabilities = [];
+        $ehloResponse = trim($ehloResponse ?? '');
         $lines = explode("\r\n", $ehloResponse);
         array_shift($lines);
         foreach ($lines as $line) {
             if (preg_match('/^[0-9]{3}[ -]([A-Z0-9-]+)((?:[ =].*)?)$/Di', $line, $matches)) {
                 $keyword = strtoupper($matches[1]);
                 $paramStr = strtoupper(ltrim($matches[2], ' ='));
-                $params = !empty($paramStr) ? explode(' ', $paramStr) : array();
+                $params = !empty($paramStr) ? explode(' ', $paramStr) : [];
                 $capabilities[$keyword] = $params;
             }
         }
@@ -386,7 +425,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     private function setHandlerParams()
     {
         foreach ($this->handlers as $keyword => $handler) {
-            if (array_key_exists($keyword, $this->capabilities)) {
+            if (\array_key_exists($keyword, $this->capabilities)) {
                 $handler->setKeywordParams($this->capabilities[$keyword]);
             }
         }
@@ -395,9 +434,9 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     /** Get ESMTP handlers which are currently ok to use */
     private function getActiveHandlers()
     {
-        $handlers = array();
+        $handlers = [];
         foreach ($this->handlers as $keyword => $handler) {
-            if (array_key_exists($keyword, $this->capabilities)) {
+            if (\array_key_exists($keyword, $this->capabilities)) {
                 $handlers[] = $handler;
             }
         }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
index 94151f89fef..1a4b4754f07 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
@@ -33,7 +33,7 @@ class Swift_Transport_FailoverTransport extends Swift_Transport_LoadBalancedTran
      */
     public function ping()
     {
-        $maxTransports = count($this->transports);
+        $maxTransports = \count($this->transports);
         for ($i = 0; $i < $maxTransports
             && $transport = $this->getNextTransport(); ++$i) {
             if ($transport->ping()) {
@@ -43,7 +43,7 @@ class Swift_Transport_FailoverTransport extends Swift_Transport_LoadBalancedTran
             }
         }
 
-        return count($this->transports) > 0;
+        return \count($this->transports) > 0;
     }
 
     /**
@@ -52,14 +52,13 @@ class Swift_Transport_FailoverTransport extends Swift_Transport_LoadBalancedTran
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
     public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
-        $maxTransports = count($this->transports);
+        $maxTransports = \count($this->transports);
         $sent = 0;
         $this->lastUsedTransport = null;
 
@@ -80,10 +79,8 @@ class Swift_Transport_FailoverTransport extends Swift_Transport_LoadBalancedTran
             }
         }
 
-        if (count($this->transports) == 0) {
-            throw new Swift_TransportException(
-                'All Transports in FailoverTransport failed, or no Transports available'
-                );
+        if (0 == \count($this->transports)) {
+            throw new Swift_TransportException('All Transports in FailoverTransport failed, or no Transports available');
         }
 
         return $sent;
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
index af97adf1f8f..50f1e5e403c 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
@@ -25,8 +25,6 @@ interface Swift_Transport_IoBuffer extends Swift_InputByteStream, Swift_OutputBy
      * Perform any initialization needed, using the given $params.
      *
      * Parameters will vary depending upon the type of IoBuffer used.
-     *
-     * @param array $params
      */
     public function initialize(array $params);
 
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
index dc6a2149bab..0b5ba9d304e 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
@@ -20,14 +20,14 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      *
      * @var Swift_Transport[]
      */
-    private $deadTransports = array();
+    private $deadTransports = [];
 
     /**
      * The Transports which are used in rotation.
      *
      * @var Swift_Transport[]
      */
-    protected $transports = array();
+    protected $transports = [];
 
     /**
      * The Transport used in the last successful send operation.
@@ -49,7 +49,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
     public function setTransports(array $transports)
     {
         $this->transports = $transports;
-        $this->deadTransports = array();
+        $this->deadTransports = [];
     }
 
     /**
@@ -79,7 +79,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      */
     public function isStarted()
     {
-        return count($this->transports) > 0;
+        return \count($this->transports) > 0;
     }
 
     /**
@@ -111,7 +111,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
             }
         }
 
-        return count($this->transports) > 0;
+        return \count($this->transports) > 0;
     }
 
     /**
@@ -120,14 +120,13 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
     public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
-        $maxTransports = count($this->transports);
+        $maxTransports = \count($this->transports);
         $sent = 0;
         $this->lastUsedTransport = null;
 
@@ -146,10 +145,8 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
             }
         }
 
-        if (count($this->transports) == 0) {
-            throw new Swift_TransportException(
-                'All Transports in LoadBalancedTransport failed, or no Transports available'
-                );
+        if (0 == \count($this->transports)) {
+            throw new Swift_TransportException('All Transports in LoadBalancedTransport failed, or no Transports available');
         }
 
         return $sent;
@@ -157,8 +154,6 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
index dc38078c3c3..7d910db5a58 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
@@ -61,8 +61,7 @@ class Swift_Transport_NullTransport implements Swift_Transport
     /**
      * Sends the given message.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int The number of sent emails
      */
@@ -81,9 +80,9 @@ class Swift_Transport_NullTransport implements Swift_Transport
         }
 
         $count = (
-            count((array) $message->getTo())
-            + count((array) $message->getCc())
-            + count((array) $message->getBcc())
+            \count((array) $message->getTo())
+            + \count((array) $message->getCc())
+            + \count((array) $message->getBcc())
             );
 
         return $count;
@@ -91,8 +90,6 @@ class Swift_Transport_NullTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
index 807538505bf..65a434d1173 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
@@ -24,23 +24,21 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
      *
      * @var array
      */
-    private $params = array(
+    private $params = [
         'timeout' => 30,
         'blocking' => 1,
         'command' => '/usr/sbin/sendmail -bs',
         'type' => Swift_Transport_IoBuffer::TYPE_PROCESS,
-        );
+        ];
 
     /**
      * Create a new SendmailTransport with $buf for I/O.
      *
-     * @param Swift_Transport_IoBuffer     $buf
-     * @param Swift_Events_EventDispatcher $dispatcher
-     * @param string                       $localDomain
+     * @param string $localDomain
      */
-    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1')
+    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
     {
-        parent::__construct($buf, $dispatcher, $localDomain);
+        parent::__construct($buf, $dispatcher, $localDomain, $addressEncoder);
     }
 
     /**
@@ -93,8 +91,7 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
      * NOTE: If using 'sendmail -t' you will not be aware of any failures until
      * they bounce (i.e. send() will always return 100% success).
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
@@ -114,24 +111,24 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
             }
 
             if (false === strpos($command, ' -f')) {
-                $command .= ' -f'.escapeshellarg($this->getReversePath($message));
+                $command .= ' -f'.escapeshellarg($this->getReversePath($message) ?? '');
             }
 
-            $buffer->initialize(array_merge($this->params, array('command' => $command)));
+            $buffer->initialize(array_merge($this->params, ['command' => $command]));
 
             if (false === strpos($command, ' -i') && false === strpos($command, ' -oi')) {
-                $buffer->setWriteTranslations(array("\r\n" => "\n", "\n." => "\n.."));
+                $buffer->setWriteTranslations(["\r\n" => "\n", "\n." => "\n.."]);
             } else {
-                $buffer->setWriteTranslations(array("\r\n" => "\n"));
+                $buffer->setWriteTranslations(["\r\n" => "\n"]);
             }
 
-            $count = count((array) $message->getTo())
-                + count((array) $message->getCc())
-                + count((array) $message->getBcc())
+            $count = \count((array) $message->getTo())
+                + \count((array) $message->getCc())
+                + \count((array) $message->getBcc())
                 ;
             $message->toByteStream($buffer);
             $buffer->flushBuffers();
-            $buffer->setWriteTranslations(array());
+            $buffer->setWriteTranslations([]);
             $buffer->terminate();
 
             if ($evt) {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
index 90e913f8edb..e8ce65c2648 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
@@ -32,5 +32,5 @@ interface Swift_Transport_SmtpAgent
      * @param int[]    $codes
      * @param string[] $failures An array of failures by-reference
      */
-    public function executeCommand($command, $codes = array(), &$failures = null);
+    public function executeCommand($command, $codes = [], &$failures = null);
 }
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
index 9a1d07115e3..0cb6a5b80a9 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
@@ -33,8 +33,6 @@ class Swift_Transport_SpoolTransport implements Swift_Transport
     /**
      * Sets the spool object.
      *
-     * @param Swift_Spool $spool
-     *
      * @return $this
      */
     public function setSpool(Swift_Spool $spool)
@@ -89,8 +87,7 @@ class Swift_Transport_SpoolTransport implements Swift_Transport
     /**
      * Sends the given message.
      *
-     * @param Swift_Mime_SimpleMessage $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int The number of sent e-mail's
      */
@@ -115,8 +112,6 @@ class Swift_Transport_SpoolTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
index bc6ed5a34b4..70782ada044 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
@@ -25,18 +25,16 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     private $out;
 
     /** Buffer initialization parameters */
-    private $params = array();
+    private $params = [];
 
     /** The ReplacementFilterFactory */
     private $replacementFactory;
 
     /** Translations performed on data being streamed into the buffer */
-    private $translations = array();
+    private $translations = [];
 
     /**
      * Create a new StreamBuffer using $replacementFactory for transformations.
-     *
-     * @param Swift_ReplacementFilterFactory $replacementFactory
      */
     public function __construct(Swift_ReplacementFilterFactory $replacementFactory)
     {
@@ -47,8 +45,6 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
      * Perform any initialization needed, using the given $params.
      *
      * Parameters will vary depending upon the type of IoBuffer used.
-     *
-     * @param array $params
      */
     public function initialize(array $params)
     {
@@ -91,7 +87,11 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
 
     public function startTLS()
     {
-        return stream_socket_enable_crypto($this->stream, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+        // STREAM_CRYPTO_METHOD_TLS_CLIENT only allow tls1.0 connections (some php versions)
+        // To support modern tls we allow explicit tls1.0, tls1.1, tls1.2
+        // Ssl3 and older are not allowed because they are vulnerable
+        // @TODO make tls arguments configurable
+        return stream_socket_enable_crypto($this->stream, true, STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT);
     }
 
     /**
@@ -160,14 +160,10 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     {
         if (isset($this->out) && !feof($this->out)) {
             $line = fgets($this->out);
-            if (strlen($line) == 0) {
+            if (0 == \strlen($line)) {
                 $metas = stream_get_meta_data($this->out);
                 if ($metas['timed_out']) {
-                    throw new Swift_IoException(
-                        'Connection to '.
-                            $this->getReadConnectionDescription().
-                        ' Timed Out'
-                    );
+                    throw new Swift_IoException('Connection to '.$this->getReadConnectionDescription().' Timed Out');
                 }
             }
 
@@ -192,14 +188,10 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     {
         if (isset($this->out) && !feof($this->out)) {
             $ret = fread($this->out, $length);
-            if (strlen($ret) == 0) {
+            if (0 == \strlen($ret)) {
                 $metas = stream_get_meta_data($this->out);
                 if ($metas['timed_out']) {
-                    throw new Swift_IoException(
-                        'Connection to '.
-                            $this->getReadConnectionDescription().
-                        ' Timed Out'
-                    );
+                    throw new Swift_IoException('Connection to '.$this->getReadConnectionDescription().' Timed Out');
                 }
             }
 
@@ -224,7 +216,7 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     protected function doCommit($bytes)
     {
         if (isset($this->in)) {
-            $bytesToWrite = strlen($bytes);
+            $bytesToWrite = \strlen($bytes);
             $totalBytesWritten = 0;
 
             while ($totalBytesWritten < $bytesToWrite) {
@@ -255,7 +247,7 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
         if (!empty($this->params['timeout'])) {
             $timeout = $this->params['timeout'];
         }
-        $options = array();
+        $options = [];
         if (!empty($this->params['sourceIp'])) {
             $options['socket']['bindto'] = $this->params['sourceIp'].':0';
         }
@@ -264,13 +256,16 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
             $options = array_merge($options, $this->params['stream_context_options']);
         }
         $streamContext = stream_context_create($options);
-        $this->stream = @stream_socket_client($host.':'.$this->params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext);
-        if (false === $this->stream) {
-            throw new Swift_TransportException(
-                'Connection could not be established with host '.$this->params['host'].
-                ' ['.$errstr.' #'.$errno.']'
-                );
+
+        set_error_handler(function ($type, $msg) {
+            throw new Swift_TransportException('Connection could not be established with host '.$this->params['host'].' :'.$msg);
+        });
+        try {
+            $this->stream = stream_socket_client($host.':'.$this->params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext);
+        } finally {
+            restore_error_handler();
         }
+
         if (!empty($this->params['blocking'])) {
             stream_set_blocking($this->stream, 1);
         } else {
@@ -287,18 +282,16 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     private function establishProcessConnection()
     {
         $command = $this->params['command'];
-        $descriptorSpec = array(
-            0 => array('pipe', 'r'),
-            1 => array('pipe', 'w'),
-            2 => array('pipe', 'w'),
-            );
-        $pipes = array();
+        $descriptorSpec = [
+            0 => ['pipe', 'r'],
+            1 => ['pipe', 'w'],
+            2 => ['pipe', 'w'],
+            ];
+        $pipes = [];
         $this->stream = proc_open($command, $descriptorSpec, $pipes);
         stream_set_blocking($pipes[2], 0);
         if ($err = stream_get_contents($pipes[2])) {
-            throw new Swift_TransportException(
-                'Process could not be started ['.$err.']'
-                );
+            throw new Swift_TransportException('Process could not be started ['.$err.']');
         }
         $this->in = &$pipes[0];
         $this->out = &$pipes[1];
diff --git a/htdocs/includes/swiftmailer/lib/classes/Swift/TransportException.php b/htdocs/includes/swiftmailer/lib/classes/Swift/TransportException.php
index 4ae2412e62a..c7417455b3e 100644
--- a/htdocs/includes/swiftmailer/lib/classes/Swift/TransportException.php
+++ b/htdocs/includes/swiftmailer/lib/classes/Swift/TransportException.php
@@ -18,9 +18,8 @@ class Swift_TransportException extends Swift_IoException
     /**
      * Create a new TransportException with $message.
      *
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
+     * @param string $message
+     * @param int    $code
      */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
diff --git a/htdocs/includes/swiftmailer/lib/dependency_maps/cache_deps.php b/htdocs/includes/swiftmailer/lib/dependency_maps/cache_deps.php
index 6023448e85e..9d94d774014 100644
--- a/htdocs/includes/swiftmailer/lib/dependency_maps/cache_deps.php
+++ b/htdocs/includes/swiftmailer/lib/dependency_maps/cache_deps.php
@@ -12,11 +12,11 @@ Swift_DependencyContainer::getInstance()
 
     ->register('cache.array')
     ->asSharedInstanceOf('Swift_KeyCache_ArrayKeyCache')
-    ->withDependencies(array('cache.inputstream'))
+    ->withDependencies(['cache.inputstream'])
 
     ->register('cache.disk')
     ->asSharedInstanceOf('Swift_KeyCache_DiskKeyCache')
-    ->withDependencies(array('cache.inputstream', 'tempdir'))
+    ->withDependencies(['cache.inputstream', 'tempdir'])
 
     ->register('cache.inputstream')
     ->asNewInstanceOf('Swift_KeyCache_SimpleKeyCacheInputStream')
diff --git a/htdocs/includes/swiftmailer/lib/dependency_maps/mime_deps.php b/htdocs/includes/swiftmailer/lib/dependency_maps/mime_deps.php
index 4ce9c7cbbc5..307756c89f3 100644
--- a/htdocs/includes/swiftmailer/lib/dependency_maps/mime_deps.php
+++ b/htdocs/includes/swiftmailer/lib/dependency_maps/mime_deps.php
@@ -13,101 +13,105 @@ Swift_DependencyContainer::getInstance()
     // As SERVER_NAME can come from the user in certain configurations, check that
     // it does not contain forbidden characters (see RFC 952 and RFC 2181). Use
     // preg_replace() instead of preg_match() to prevent DoS attacks with long host names.
-    ->asValue(!empty($_SERVER['SERVER_NAME']) && preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) === '' ? $_SERVER['SERVER_NAME'] : 'swift.generated')
+    ->asValue(!empty($_SERVER['SERVER_NAME']) && '' === preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'swift.generated')
 
     ->register('mime.idgenerator')
     ->asSharedInstanceOf('Swift_Mime_IdGenerator')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.idgenerator.idright',
-    ))
+    ])
 
     ->register('mime.message')
     ->asNewInstanceOf('Swift_Mime_SimpleMessage')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
-        'mime.qpcontentencoder',
+        'mime.textcontentencoder',
         'cache',
         'mime.idgenerator',
         'properties.charset',
-    ))
+    ])
 
     ->register('mime.part')
     ->asNewInstanceOf('Swift_Mime_MimePart')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
-        'mime.qpcontentencoder',
+        'mime.textcontentencoder',
         'cache',
         'mime.idgenerator',
         'properties.charset',
-    ))
+    ])
 
     ->register('mime.attachment')
     ->asNewInstanceOf('Swift_Mime_Attachment')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
         'mime.base64contentencoder',
         'cache',
         'mime.idgenerator',
-    ))
+    ])
     ->addConstructorValue($swift_mime_types)
 
     ->register('mime.embeddedfile')
     ->asNewInstanceOf('Swift_Mime_EmbeddedFile')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
         'mime.base64contentencoder',
         'cache',
         'mime.idgenerator',
-    ))
+    ])
     ->addConstructorValue($swift_mime_types)
 
     ->register('mime.headerfactory')
     ->asNewInstanceOf('Swift_Mime_SimpleHeaderFactory')
-    ->withDependencies(array(
-            'mime.qpheaderencoder',
-            'mime.rfc2231encoder',
-            'email.validator',
-            'properties.charset',
-        ))
+    ->withDependencies([
+        'mime.qpheaderencoder',
+        'mime.rfc2231encoder',
+        'email.validator',
+        'properties.charset',
+        'address.idnaddressencoder',
+    ])
 
     ->register('mime.headerset')
     ->asNewInstanceOf('Swift_Mime_SimpleHeaderSet')
-    ->withDependencies(array('mime.headerfactory', 'properties.charset'))
+    ->withDependencies(['mime.headerfactory', 'properties.charset'])
 
     ->register('mime.qpheaderencoder')
     ->asNewInstanceOf('Swift_Mime_HeaderEncoder_QpHeaderEncoder')
-    ->withDependencies(array('mime.charstream'))
+    ->withDependencies(['mime.charstream'])
 
     ->register('mime.base64headerencoder')
     ->asNewInstanceOf('Swift_Mime_HeaderEncoder_Base64HeaderEncoder')
-    ->withDependencies(array('mime.charstream'))
+    ->withDependencies(['mime.charstream'])
 
     ->register('mime.charstream')
     ->asNewInstanceOf('Swift_CharacterStream_NgCharacterStream')
-    ->withDependencies(array('mime.characterreaderfactory', 'properties.charset'))
+    ->withDependencies(['mime.characterreaderfactory', 'properties.charset'])
 
     ->register('mime.bytecanonicalizer')
     ->asSharedInstanceOf('Swift_StreamFilters_ByteArrayReplacementFilter')
-    ->addConstructorValue(array(array(0x0D, 0x0A), array(0x0D), array(0x0A)))
-    ->addConstructorValue(array(array(0x0A), array(0x0A), array(0x0D, 0x0A)))
+    ->addConstructorValue([[0x0D, 0x0A], [0x0D], [0x0A]])
+    ->addConstructorValue([[0x0A], [0x0A], [0x0D, 0x0A]])
 
     ->register('mime.characterreaderfactory')
     ->asSharedInstanceOf('Swift_CharacterReaderFactory_SimpleCharacterReaderFactory')
 
+    ->register('mime.textcontentencoder')
+    ->asAliasOf('mime.qpcontentencoder')
+
     ->register('mime.safeqpcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
-    ->withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
+    ->withDependencies(['mime.charstream', 'mime.bytecanonicalizer'])
 
     ->register('mime.rawcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_RawContentEncoder')
 
     ->register('mime.nativeqpcontentencoder')
-    ->withDependencies(array('properties.charset'))
+    ->withDependencies(['properties.charset'])
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_NativeQpContentEncoder')
 
     ->register('mime.qpcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoderProxy')
-    ->withDependencies(array('mime.safeqpcontentencoder', 'mime.nativeqpcontentencoder', 'properties.charset'))
+    ->withDependencies(['mime.safeqpcontentencoder', 'mime.nativeqpcontentencoder', 'properties.charset'])
 
     ->register('mime.7bitcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
@@ -124,7 +128,7 @@ Swift_DependencyContainer::getInstance()
 
     ->register('mime.rfc2231encoder')
     ->asNewInstanceOf('Swift_Encoder_Rfc2231Encoder')
-    ->withDependencies(array('mime.charstream'))
+    ->withDependencies(['mime.charstream'])
 ;
 
 unset($swift_mime_types);
diff --git a/htdocs/includes/swiftmailer/lib/dependency_maps/transport_deps.php b/htdocs/includes/swiftmailer/lib/dependency_maps/transport_deps.php
index 15772abb255..34a63c78e51 100644
--- a/htdocs/includes/swiftmailer/lib/dependency_maps/transport_deps.php
+++ b/htdocs/includes/swiftmailer/lib/dependency_maps/transport_deps.php
@@ -5,24 +5,25 @@ Swift_DependencyContainer::getInstance()
     // As SERVER_NAME can come from the user in certain configurations, check that
     // it does not contain forbidden characters (see RFC 952 and RFC 2181). Use
     // preg_replace() instead of preg_match() to prevent DoS attacks with long host names.
-    ->asValue(!empty($_SERVER['SERVER_NAME']) && preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) === '' ? trim($_SERVER['SERVER_NAME'], '[]') : '127.0.0.1')
+    ->asValue(!empty($_SERVER['SERVER_NAME']) && '' === preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) ? trim($_SERVER['SERVER_NAME'], '[]') : '127.0.0.1')
 
     ->register('transport.smtp')
     ->asNewInstanceOf('Swift_Transport_EsmtpTransport')
-    ->withDependencies(array(
+    ->withDependencies([
         'transport.buffer',
-        array('transport.authhandler'),
+        'transport.smtphandlers',
         'transport.eventdispatcher',
         'transport.localdomain',
-    ))
+        'address.idnaddressencoder',
+    ])
 
     ->register('transport.sendmail')
     ->asNewInstanceOf('Swift_Transport_SendmailTransport')
-    ->withDependencies(array(
+    ->withDependencies([
         'transport.buffer',
         'transport.eventdispatcher',
         'transport.localdomain',
-    ))
+    ])
 
     ->register('transport.loadbalanced')
     ->asNewInstanceOf('Swift_Transport_LoadBalancedTransport')
@@ -32,27 +33,40 @@ Swift_DependencyContainer::getInstance()
 
     ->register('transport.spool')
     ->asNewInstanceOf('Swift_Transport_SpoolTransport')
-    ->withDependencies(array('transport.eventdispatcher'))
+    ->withDependencies(['transport.eventdispatcher'])
 
     ->register('transport.null')
     ->asNewInstanceOf('Swift_Transport_NullTransport')
-    ->withDependencies(array('transport.eventdispatcher'))
+    ->withDependencies(['transport.eventdispatcher'])
 
     ->register('transport.buffer')
     ->asNewInstanceOf('Swift_Transport_StreamBuffer')
-    ->withDependencies(array('transport.replacementfactory'))
+    ->withDependencies(['transport.replacementfactory'])
+
+    ->register('transport.smtphandlers')
+    ->asArray()
+    ->withDependencies(['transport.authhandler'])
 
     ->register('transport.authhandler')
     ->asNewInstanceOf('Swift_Transport_Esmtp_AuthHandler')
-    ->withDependencies(array(
-        array(
-            'transport.crammd5auth',
-            'transport.loginauth',
-            'transport.plainauth',
-            'transport.ntlmauth',
-            'transport.xoauth2auth',
-        ),
-    ))
+    ->withDependencies(['transport.authhandlers'])
+
+    ->register('transport.authhandlers')
+    ->asArray()
+    ->withDependencies([
+        'transport.crammd5auth',
+        'transport.loginauth',
+        'transport.plainauth',
+        'transport.ntlmauth',
+        'transport.xoauth2auth',
+    ])
+
+    ->register('transport.smtputf8handler')
+    ->asNewInstanceOf('Swift_Transport_Esmtp_SmtpUtf8Handler')
+
+    ->register('transport.8bitmimehandler')
+    ->asNewInstanceOf('Swift_Transport_Esmtp_EightBitMimeHandler')
+    ->addConstructorValue('8BITMIME')
 
     ->register('transport.crammd5auth')
     ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_CramMd5Authenticator')
@@ -74,4 +88,10 @@ Swift_DependencyContainer::getInstance()
 
     ->register('transport.replacementfactory')
     ->asSharedInstanceOf('Swift_StreamFilters_StringReplacementFilterFactory')
+
+    ->register('address.idnaddressencoder')
+    ->asNewInstanceOf('Swift_AddressEncoder_IdnAddressEncoder')
+
+    ->register('address.utf8addressencoder')
+    ->asNewInstanceOf('Swift_AddressEncoder_Utf8AddressEncoder')
 ;
diff --git a/htdocs/includes/swiftmailer/lib/mime_types.php b/htdocs/includes/swiftmailer/lib/mime_types.php
index b42c1cc1a3e..72c6fd2afa6 100644
--- a/htdocs/includes/swiftmailer/lib/mime_types.php
+++ b/htdocs/includes/swiftmailer/lib/mime_types.php
@@ -17,7 +17,7 @@
 
 // You may add or take away what you like (lowercase required)
 
-$swift_mime_types = array(
+$swift_mime_types = [
     '3dml' => 'text/vnd.in3d.3dml',
     '3ds' => 'image/x-3ds',
     '3g2' => 'video/3gpp2',
@@ -1004,4 +1004,4 @@ $swift_mime_types = array(
     'zirz' => 'application/vnd.zul',
     'zmm' => 'application/vnd.handheld-entertainment+xml',
     '123' => 'application/vnd.lotus-1-2-3',
-);
+];
diff --git a/htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php b/htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
index 85f2d69f21c..ad8fd2aa0d5 100644
--- a/htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
+++ b/htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php
@@ -1,8 +1,8 @@
 #!/usr/bin/php
 
 <?php
-define('APACHE_MIME_TYPES_URL', 'https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types');
-define('FREEDESKTOP_XML_URL', 'https://raw.github.com/minad/mimemagic/master/script/freedesktop.org.xml');
+\define('APACHE_MIME_TYPES_URL', 'https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types');
+\define('FREEDESKTOP_XML_URL', 'https://raw.github.com/minad/mimemagic/master/script/freedesktop.org.xml');
 
 function generateUpToDateMimeArray()
 {
@@ -25,12 +25,12 @@ function generateUpToDateMimeArray()
     $mime_xml = @file_get_contents(FREEDESKTOP_XML_URL);
 
     // prepare valid mime types
-    $valid_mime_types = array();
+    $valid_mime_types = [];
 
     // split mime type and extensions eg. "video/x-matroska        mkv mk3d mks"
-    if (preg_match_all('/^#?([a-z0-9\-\+\/\.]+)[\t]+(.*)$/miu', $mime_types, $matches) !== false) {
+    if (false !== preg_match_all('/^#?([a-z0-9\-\+\/\.]+)[\t]+(.*)$/miu', $mime_types, $matches)) {
         // collection of predefined mimetypes (bugfix for wrong resolved or missing mime types)
-        $valid_mime_types_preset = array(
+        $valid_mime_types_preset = [
             'php' => 'application/x-php',
             'php3' => 'application/x-php',
             'php4' => 'application/x-php',
@@ -95,7 +95,7 @@ function generateUpToDateMimeArray()
             'xls' => 'application/vnd.ms-excel',
             'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
             'xml' => 'application/xml',
-        );
+        ];
 
         // wrap array for generating file
         foreach ($valid_mime_types_preset as $extension => $mime_type) {
@@ -103,17 +103,14 @@ function generateUpToDateMimeArray()
             $valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
         }
 
-        // collect extensions
-        $valid_extensions = array();
-
         // all extensions from second match
         foreach ($matches[2] as $i => $extensions) {
             // explode multiple extensions from string
-            $extensions = explode(' ', strtolower($extensions));
+            $extensions = explode(' ', strtolower($extensions ?? ''));
 
             // force array for foreach
-            if (!is_array($extensions)) {
-                $extensions = array($extensions);
+            if (!\is_array($extensions)) {
+                $extensions = [$extensions];
             }
 
             foreach ($extensions as $extension) {
@@ -121,10 +118,7 @@ function generateUpToDateMimeArray()
                 $mime_type = $matches[1][$i];
 
                 // check if string length lower than 10
-                if (strlen($extension) < 10) {
-                    // add extension
-                    $valid_extensions[] = $extension;
-
+                if (\strlen($extension) < 10) {
                     if (!isset($valid_mime_types[$mime_type])) {
                         // generate array for mimetype to extension resolver (only first match)
                         $valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
@@ -145,29 +139,24 @@ function generateUpToDateMimeArray()
         // get all matching extensions from match
         foreach ((array) $node->glob['pattern'] as $extension) {
             // skip none glob extensions
-            if (strpos($extension, '.') === false) {
+            if (false === strpos($extension ?? '', '.')) {
                 continue;
             }
 
             // remove get only last part
-            $extension = explode('.', strtolower($extension));
+            $extension = explode('.', strtolower($extension ?? ''));
             $extension = end($extension);
-
-            // maximum length in database column
-            if (strlen($extension) <= 9) {
-                $valid_extensions[] = $extension;
-            }
         }
 
         if (isset($node->glob['pattern'][0])) {
             // mime type
-            $mime_type = strtolower((string) $node['type']);
+            $mime_type = strtolower((string) $node['type'] ?? '');
 
             // get first extension
-            $extension = strtolower(trim($node->glob['ddpattern'][0], '*.'));
+            $extension = strtolower(trim($node->glob['ddpattern'][0] ?? '', '*.'));
 
             // skip none glob extensions and check if string length between 1 and 10
-            if (strpos($extension, '.') !== false || strlen($extension) < 1 || strlen($extension) > 9) {
+            if (false !== strpos($extension, '.') || \strlen($extension) < 1 || \strlen($extension) > 9) {
                 continue;
             }
 
@@ -184,7 +173,7 @@ function generateUpToDateMimeArray()
     ksort($valid_mime_types);
 
     // combine mime types and extensions array
-    $output = "$preamble\$swift_mime_types = array(\n    ".implode($valid_mime_types, ",\n    ")."\n);";
+    $output = "$preamble\$swift_mime_types = array(\n    ".implode(",\n    ", $valid_mime_types)."\n);";
 
     // write mime_types.php config file
     @file_put_contents('./mime_types.php', $output);
diff --git a/htdocs/includes/symfony/var-dumper/Caster/AmqpCaster.php b/htdocs/includes/symfony/var-dumper/Caster/AmqpCaster.php
index 4e9b351c181..4f1aa18a053 100644
--- a/htdocs/includes/symfony/var-dumper/Caster/AmqpCaster.php
+++ b/htdocs/includes/symfony/var-dumper/Caster/AmqpCaster.php
@@ -20,145 +20,191 @@ use Symfony\Component\VarDumper\Cloner\Stub;
  */
 class AmqpCaster
 {
-    private static $flags = array(
-        AMQP_DURABLE => 'AMQP_DURABLE',
-        AMQP_PASSIVE => 'AMQP_PASSIVE',
-        AMQP_EXCLUSIVE => 'AMQP_EXCLUSIVE',
-        AMQP_AUTODELETE => 'AMQP_AUTODELETE',
-        AMQP_INTERNAL => 'AMQP_INTERNAL',
-        AMQP_NOLOCAL => 'AMQP_NOLOCAL',
-        AMQP_AUTOACK => 'AMQP_AUTOACK',
-        AMQP_IFEMPTY => 'AMQP_IFEMPTY',
-        AMQP_IFUNUSED => 'AMQP_IFUNUSED',
-        AMQP_MANDATORY => 'AMQP_MANDATORY',
-        AMQP_IMMEDIATE => 'AMQP_IMMEDIATE',
-        AMQP_MULTIPLE => 'AMQP_MULTIPLE',
-        AMQP_NOWAIT => 'AMQP_NOWAIT',
-        AMQP_REQUEUE => 'AMQP_REQUEUE',
-    );
+	private static $flags = array(
+		AMQP_DURABLE => 'AMQP_DURABLE',
+		AMQP_PASSIVE => 'AMQP_PASSIVE',
+		AMQP_EXCLUSIVE => 'AMQP_EXCLUSIVE',
+		AMQP_AUTODELETE => 'AMQP_AUTODELETE',
+		AMQP_INTERNAL => 'AMQP_INTERNAL',
+		AMQP_NOLOCAL => 'AMQP_NOLOCAL',
+		AMQP_AUTOACK => 'AMQP_AUTOACK',
+		AMQP_IFEMPTY => 'AMQP_IFEMPTY',
+		AMQP_IFUNUSED => 'AMQP_IFUNUSED',
+		AMQP_MANDATORY => 'AMQP_MANDATORY',
+		AMQP_IMMEDIATE => 'AMQP_IMMEDIATE',
+		AMQP_MULTIPLE => 'AMQP_MULTIPLE',
+		AMQP_NOWAIT => 'AMQP_NOWAIT',
+		AMQP_REQUEUE => 'AMQP_REQUEUE',
+	);
 
-    private static $exchangeTypes = array(
-        AMQP_EX_TYPE_DIRECT => 'AMQP_EX_TYPE_DIRECT',
-        AMQP_EX_TYPE_FANOUT => 'AMQP_EX_TYPE_FANOUT',
-        AMQP_EX_TYPE_TOPIC => 'AMQP_EX_TYPE_TOPIC',
-        AMQP_EX_TYPE_HEADERS => 'AMQP_EX_TYPE_HEADERS',
-    );
+	private static $exchangeTypes = array(
+		AMQP_EX_TYPE_DIRECT => 'AMQP_EX_TYPE_DIRECT',
+		AMQP_EX_TYPE_FANOUT => 'AMQP_EX_TYPE_FANOUT',
+		AMQP_EX_TYPE_TOPIC => 'AMQP_EX_TYPE_TOPIC',
+		AMQP_EX_TYPE_HEADERS => 'AMQP_EX_TYPE_HEADERS',
+	);
 
-    public static function castConnection(\AMQPConnection $c, array $a, Stub $stub, $isNested)
-    {
-        $prefix = Caster::PREFIX_VIRTUAL;
+	public static function castConnection(\AMQPConnection $c, array $a, Stub $stub, $isNested)
+	{
+		$prefix = Caster::PREFIX_VIRTUAL;
 
-        // BC layer in the ampq lib
-        if (method_exists($c, 'getReadTimeout')) {
-            $timeout = $c->getReadTimeout();
-        } else {
-            $timeout = $c->getTimeout();
-        }
+		$a += array(
+			$prefix.'is_connected' => $c->isConnected(),
+		);
 
-        $a += array(
-            $prefix.'isConnected' => $c->isConnected(),
-            $prefix.'login' => $c->getLogin(),
-            $prefix.'password' => $c->getPassword(),
-            $prefix.'host' => $c->getHost(),
-            $prefix.'port' => $c->getPort(),
-            $prefix.'vhost' => $c->getVhost(),
-            $prefix.'readTimeout' => $timeout,
-        );
+		// Recent version of the extension already expose private properties
+		if (isset($a["\x00AMQPConnection\x00login"])) {
+			return $a;
+		}
 
-        return $a;
-    }
+		// BC layer in the amqp lib
+		if (method_exists($c, 'getReadTimeout')) {
+			$timeout = $c->getReadTimeout();
+		} else {
+			$timeout = $c->getTimeout();
+		}
 
-    public static function castChannel(\AMQPChannel $c, array $a, Stub $stub, $isNested)
-    {
-        $prefix = Caster::PREFIX_VIRTUAL;
+		$a += array(
+			$prefix.'is_connected' => $c->isConnected(),
+			$prefix.'login' => $c->getLogin(),
+			$prefix.'password' => $c->getPassword(),
+			$prefix.'host' => $c->getHost(),
+			$prefix.'vhost' => $c->getVhost(),
+			$prefix.'port' => $c->getPort(),
+			$prefix.'read_timeout' => $timeout,
+		);
 
-        $a += array(
-            $prefix.'isConnected' => $c->isConnected(),
-            $prefix.'channelId' => $c->getChannelId(),
-            $prefix.'prefetchSize' => $c->getPrefetchSize(),
-            $prefix.'prefetchCount' => $c->getPrefetchCount(),
-            $prefix.'connection' => $c->getConnection(),
-        );
+		return $a;
+	}
 
-        return $a;
-    }
+	public static function castChannel(\AMQPChannel $c, array $a, Stub $stub, $isNested)
+	{
+		$prefix = Caster::PREFIX_VIRTUAL;
 
-    public static function castQueue(\AMQPQueue $c, array $a, Stub $stub, $isNested)
-    {
-        $prefix = Caster::PREFIX_VIRTUAL;
+		$a += array(
+			$prefix.'is_connected' => $c->isConnected(),
+			$prefix.'channel_id' => $c->getChannelId(),
+		);
 
-        $a += array(
-            $prefix.'name' => $c->getName(),
-            $prefix.'flags' => self::extractFlags($c->getFlags()),
-            $prefix.'arguments' => $c->getArguments(),
-            $prefix.'connection' => $c->getConnection(),
-            $prefix.'channel' => $c->getChannel(),
-        );
+		// Recent version of the extension already expose private properties
+		if (isset($a["\x00AMQPChannel\x00connection"])) {
+			return $a;
+		}
 
-        return $a;
-    }
+		$a += array(
+			$prefix.'connection' => $c->getConnection(),
+			$prefix.'prefetch_size' => $c->getPrefetchSize(),
+			$prefix.'prefetch_count' => $c->getPrefetchCount(),
+		);
 
-    public static function castExchange(\AMQPExchange $c, array $a, Stub $stub, $isNested)
-    {
-        $prefix = Caster::PREFIX_VIRTUAL;
+		return $a;
+	}
 
-        $a += array(
-            $prefix.'name' => $c->getName(),
-            $prefix.'flags' => self::extractFlags($c->getFlags()),
-            $prefix.'type' => isset(self::$exchangeTypes[$c->getType()]) ? new ConstStub(self::$exchangeTypes[$c->getType()], $c->getType()) : $c->getType(),
-            $prefix.'arguments' => $c->getArguments(),
-            $prefix.'channel' => $c->getChannel(),
-            $prefix.'connection' => $c->getConnection(),
-        );
+	public static function castQueue(\AMQPQueue $c, array $a, Stub $stub, $isNested)
+	{
+		$prefix = Caster::PREFIX_VIRTUAL;
 
-        return $a;
-    }
+		$a += array(
+			$prefix.'flags' => self::extractFlags($c->getFlags()),
+		);
 
-    public static function castEnvelope(\AMQPEnvelope $c, array $a, Stub $stub, $isNested, $filter = 0)
-    {
-        $prefix = Caster::PREFIX_VIRTUAL;
+		// Recent version of the extension already expose private properties
+		if (isset($a["\x00AMQPQueue\x00name"])) {
+			return $a;
+		}
 
-        if (!($filter & Caster::EXCLUDE_VERBOSE)) {
-            $a += array($prefix.'body' => $c->getBody());
-        }
+		$a += array(
+			$prefix.'connection' => $c->getConnection(),
+			$prefix.'channel' => $c->getChannel(),
+			$prefix.'name' => $c->getName(),
+			$prefix.'arguments' => $c->getArguments(),
+		);
 
-        $a += array(
-            $prefix.'routingKey' => $c->getRoutingKey(),
-            $prefix.'deliveryTag' => $c->getDeliveryTag(),
-            $prefix.'deliveryMode' => new ConstStub($c->getDeliveryMode().(2 === $c->getDeliveryMode() ? ' (persistent)' : ' (non-persistent)'), $c->getDeliveryMode()),
-            $prefix.'exchangeName' => $c->getExchangeName(),
-            $prefix.'isRedelivery' => $c->isRedelivery(),
-            $prefix.'contentType' => $c->getContentType(),
-            $prefix.'contentEncoding' => $c->getContentEncoding(),
-            $prefix.'type' => $c->getType(),
-            $prefix.'timestamp' => $c->getTimestamp(),
-            $prefix.'priority' => $c->getPriority(),
-            $prefix.'expiration' => $c->getExpiration(),
-            $prefix.'userId' => $c->getUserId(),
-            $prefix.'appId' => $c->getAppId(),
-            $prefix.'messageId' => $c->getMessageId(),
-            $prefix.'replyTo' => $c->getReplyTo(),
-            $prefix.'correlationId' => $c->getCorrelationId(),
-            $prefix.'headers' => $c->getHeaders(),
-        );
+		return $a;
+	}
 
-        return $a;
-    }
+	public static function castExchange(\AMQPExchange $c, array $a, Stub $stub, $isNested)
+	{
+		$prefix = Caster::PREFIX_VIRTUAL;
 
-    private static function extractFlags($flags)
-    {
-        $flagsArray = array();
+		$a += array(
+			$prefix.'flags' => self::extractFlags($c->getFlags()),
+		);
 
-        foreach (self::$flags as $value => $name) {
-            if ($flags & $value) {
-                $flagsArray[] = $name;
-            }
-        }
+		$type = isset(self::$exchangeTypes[$c->getType()]) ? new ConstStub(self::$exchangeTypes[$c->getType()], $c->getType()) : $c->getType();
 
-        if (!$flagsArray) {
-            $flagsArray = array('AMQP_NOPARAM');
-        }
+		// Recent version of the extension already expose private properties
+		if (isset($a["\x00AMQPExchange\x00name"])) {
+			$a["\x00AMQPExchange\x00type"] = $type;
 
-        return new ConstStub(implode('|', $flagsArray), $flags);
-    }
+			return $a;
+		}
+
+		$a += array(
+			$prefix.'connection' => $c->getConnection(),
+			$prefix.'channel' => $c->getChannel(),
+			$prefix.'name' => $c->getName(),
+			$prefix.'type' => $type,
+			$prefix.'arguments' => $c->getArguments(),
+		);
+
+		return $a;
+	}
+
+	public static function castEnvelope(\AMQPEnvelope $c, array $a, Stub $stub, $isNested, $filter = 0)
+	{
+		$prefix = Caster::PREFIX_VIRTUAL;
+
+		$deliveryMode = new ConstStub($c->getDeliveryMode().(2 === $c->getDeliveryMode() ? ' (persistent)' : ' (non-persistent)'), $c->getDeliveryMode());
+
+		// Recent version of the extension already expose private properties
+		if (isset($a["\x00AMQPEnvelope\x00body"])) {
+			$a["\0AMQPEnvelope\0delivery_mode"] = $deliveryMode;
+
+			return $a;
+		}
+
+		if (!($filter & Caster::EXCLUDE_VERBOSE)) {
+			$a += array($prefix.'body' => $c->getBody());
+		}
+
+		$a += array(
+			$prefix.'delivery_tag' => $c->getDeliveryTag(),
+			$prefix.'is_redelivery' => $c->isRedelivery(),
+			$prefix.'exchange_name' => $c->getExchangeName(),
+			$prefix.'routing_key' => $c->getRoutingKey(),
+			$prefix.'content_type' => $c->getContentType(),
+			$prefix.'content_encoding' => $c->getContentEncoding(),
+			$prefix.'headers' => $c->getHeaders(),
+			$prefix.'delivery_mode' => $deliveryMode,
+			$prefix.'priority' => $c->getPriority(),
+			$prefix.'correlation_id' => $c->getCorrelationId(),
+			$prefix.'reply_to' => $c->getReplyTo(),
+			$prefix.'expiration' => $c->getExpiration(),
+			$prefix.'message_id' => $c->getMessageId(),
+			$prefix.'timestamp' => $c->getTimeStamp(),
+			$prefix.'type' => $c->getType(),
+			$prefix.'user_id' => $c->getUserId(),
+			$prefix.'app_id' => $c->getAppId(),
+		);
+
+		return $a;
+	}
+
+	private static function extractFlags($flags)
+	{
+		$flagsArray = array();
+
+		foreach (self::$flags as $value => $name) {
+			if ($flags & $value) {
+				$flagsArray[] = $name;
+			}
+		}
+
+		if (!$flagsArray) {
+			$flagsArray = array('AMQP_NOPARAM');
+		}
+
+		return new ConstStub(implode('|', $flagsArray), $flags);
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Caster/ArgsStub.php b/htdocs/includes/symfony/var-dumper/Caster/ArgsStub.php
new file mode 100644
index 00000000000..0fa2e17fa5e
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/ArgsStub.php
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Represents a list of function arguments.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class ArgsStub extends EnumStub
+{
+	private static $parameters = array();
+
+	public function __construct(array $args, $function, $class)
+	{
+		list($variadic, $params) = self::getParameters($function, $class);
+
+		$values = array();
+		foreach ($args as $k => $v) {
+			$values[$k] = !is_scalar($v) && !$v instanceof Stub ? new CutStub($v) : $v;
+		}
+		if (null === $params) {
+			parent::__construct($values, false);
+
+			return;
+		}
+		if (count($values) < count($params)) {
+			$params = array_slice($params, 0, count($values));
+		} elseif (count($values) > count($params)) {
+			$values[] = new EnumStub(array_splice($values, count($params)), false);
+			$params[] = $variadic;
+		}
+		if (array('...') === $params) {
+			$this->dumpKeys = false;
+			$this->value = $values[0]->value;
+		} else {
+			$this->value = array_combine($params, $values);
+		}
+	}
+
+	private static function getParameters($function, $class)
+	{
+		if (isset(self::$parameters[$k = $class.'::'.$function])) {
+			return self::$parameters[$k];
+		}
+
+		try {
+			$r = null !== $class ? new \ReflectionMethod($class, $function) : new \ReflectionFunction($function);
+		} catch (\ReflectionException $e) {
+			return array(null, null);
+		}
+
+		$variadic = '...';
+		$params = array();
+		foreach ($r->getParameters() as $v) {
+			$k = '$'.$v->name;
+			if ($v->isPassedByReference()) {
+				$k = '&'.$k;
+			}
+			if (method_exists($v, 'isVariadic') && $v->isVariadic()) {
+				$variadic .= $k;
+			} else {
+				$params[] = $k;
+			}
+		}
+
+		return self::$parameters[$k] = array($variadic, $params);
+	}
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/Caster.php b/htdocs/includes/symfony/var-dumper/Caster/Caster.php
index 23e72e87701..701c83a599e 100644
--- a/htdocs/includes/symfony/var-dumper/Caster/Caster.php
+++ b/htdocs/includes/symfony/var-dumper/Caster/Caster.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\VarDumper\Caster;
 
+use Symfony\Component\VarDumper\Cloner\Stub;
+
 /**
  * Helper for filtering out properties in casters.
  *
@@ -18,99 +20,123 @@ namespace Symfony\Component\VarDumper\Caster;
  */
 class Caster
 {
-    const EXCLUDE_VERBOSE = 1;
-    const EXCLUDE_VIRTUAL = 2;
-    const EXCLUDE_DYNAMIC = 4;
-    const EXCLUDE_PUBLIC = 8;
-    const EXCLUDE_PROTECTED = 16;
-    const EXCLUDE_PRIVATE = 32;
-    const EXCLUDE_NULL = 64;
-    const EXCLUDE_EMPTY = 128;
-    const EXCLUDE_NOT_IMPORTANT = 256;
-    const EXCLUDE_STRICT = 512;
+	const EXCLUDE_VERBOSE = 1;
+	const EXCLUDE_VIRTUAL = 2;
+	const EXCLUDE_DYNAMIC = 4;
+	const EXCLUDE_PUBLIC = 8;
+	const EXCLUDE_PROTECTED = 16;
+	const EXCLUDE_PRIVATE = 32;
+	const EXCLUDE_NULL = 64;
+	const EXCLUDE_EMPTY = 128;
+	const EXCLUDE_NOT_IMPORTANT = 256;
+	const EXCLUDE_STRICT = 512;
 
-    const PREFIX_VIRTUAL = "\0~\0";
-    const PREFIX_DYNAMIC = "\0+\0";
-    const PREFIX_PROTECTED = "\0*\0";
+	const PREFIX_VIRTUAL = "\0~\0";
+	const PREFIX_DYNAMIC = "\0+\0";
+	const PREFIX_PROTECTED = "\0*\0";
 
-    /**
-     * Casts objects to arrays and adds the dynamic property prefix.
-     *
-     * @param object           $obj       The object to cast.
-     * @param \ReflectionClass $reflector The class reflector to use for inspecting the object definition.
-     *
-     * @return array The array-cast of the object, with prefixed dynamic properties.
-     */
-    public static function castObject($obj, \ReflectionClass $reflector)
-    {
-        if ($reflector->hasMethod('__debugInfo')) {
-            $a = $obj->__debugInfo();
-        } else {
-            $a = (array) $obj;
-        }
+	/**
+	 * Casts objects to arrays and adds the dynamic property prefix.
+	 *
+	 * @param object           $obj       The object to cast
+	 * @param \ReflectionClass $reflector The class reflector to use for inspecting the object definition
+	 *
+	 * @return array The array-cast of the object, with prefixed dynamic properties
+	 */
+	public static function castObject($obj, \ReflectionClass $reflector)
+	{
+		if ($reflector->hasMethod('__debugInfo')) {
+			$a = $obj->__debugInfo();
+		} elseif ($obj instanceof \Closure) {
+			$a = array();
+		} else {
+			$a = (array) $obj;
+		}
+		if ($obj instanceof \__PHP_Incomplete_Class) {
+			return $a;
+		}
 
-        if ($a) {
-            $p = array_keys($a);
-            foreach ($p as $i => $k) {
-                if (!isset($k[0]) || ("\0" !== $k[0] && !$reflector->hasProperty($k))) {
-                    $p[$i] = self::PREFIX_DYNAMIC.$k;
-                } elseif (isset($k[16]) && "\0" === $k[16] && 0 === strpos($k, "\0class@anonymous\0")) {
-                    $p[$i] = "\0".$reflector->getParentClass().'@anonymous'.strrchr($k, "\0");
-                }
-            }
-            $a = array_combine($p, $a);
-        }
+		if ($a) {
+			$combine = false;
+			$p = array_keys($a);
+			foreach ($p as $i => $k) {
+				if (isset($k[0]) ? "\0" !== $k[0] && !$reflector->hasProperty($k) : \PHP_VERSION_ID >= 70200) {
+					$combine = true;
+					$p[$i] = self::PREFIX_DYNAMIC.$k;
+				} elseif (isset($k[16]) && "\0" === $k[16] && 0 === strpos($k, "\0class@anonymous\0")) {
+					$combine = true;
+					$p[$i] = "\0".$reflector->getParentClass().'@anonymous'.strrchr($k, "\0");
+				}
+			}
+			if ($combine) {
+				$a = array_combine($p, $a);
+			}
+		}
 
-        return $a;
-    }
+		return $a;
+	}
 
-    /**
-     * Filters out the specified properties.
-     *
-     * By default, a single match in the $filter bit field filters properties out, following an "or" logic.
-     * When EXCLUDE_STRICT is set, an "and" logic is applied: all bits must match for a property to be removed.
-     *
-     * @param array    $a                The array containing the properties to filter.
-     * @param int      $filter           A bit field of Caster::EXCLUDE_* constants specifying which properties to filter out.
-     * @param string[] $listedProperties List of properties to exclude when Caster::EXCLUDE_VERBOSE is set, and to preserve when Caster::EXCLUDE_NOT_IMPORTANT is set.
-     *
-     * @return array The filtered array
-     */
-    public static function filter(array $a, $filter, array $listedProperties = array())
-    {
-        foreach ($a as $k => $v) {
-            $type = self::EXCLUDE_STRICT & $filter;
+	/**
+	 * Filters out the specified properties.
+	 *
+	 * By default, a single match in the $filter bit field filters properties out, following an "or" logic.
+	 * When EXCLUDE_STRICT is set, an "and" logic is applied: all bits must match for a property to be removed.
+	 *
+	 * @param array    $a                The array containing the properties to filter
+	 * @param int      $filter           A bit field of Caster::EXCLUDE_* constants specifying which properties to filter out
+	 * @param string[] $listedProperties List of properties to exclude when Caster::EXCLUDE_VERBOSE is set, and to preserve when Caster::EXCLUDE_NOT_IMPORTANT is set
+	 * @param int      &$count           Set to the number of removed properties
+	 *
+	 * @return array The filtered array
+	 */
+	public static function filter(array $a, $filter, array $listedProperties = array(), &$count = 0)
+	{
+		$count = 0;
 
-            if (null === $v) {
-                $type |= self::EXCLUDE_NULL & $filter;
-            }
-            if (empty($v)) {
-                $type |= self::EXCLUDE_EMPTY & $filter;
-            }
-            if ((self::EXCLUDE_NOT_IMPORTANT & $filter) && !in_array($k, $listedProperties, true)) {
-                $type |= self::EXCLUDE_NOT_IMPORTANT;
-            }
-            if ((self::EXCLUDE_VERBOSE & $filter) && in_array($k, $listedProperties, true)) {
-                $type |= self::EXCLUDE_VERBOSE;
-            }
+		foreach ($a as $k => $v) {
+			$type = self::EXCLUDE_STRICT & $filter;
 
-            if (!isset($k[1]) || "\0" !== $k[0]) {
-                $type |= self::EXCLUDE_PUBLIC & $filter;
-            } elseif ('~' === $k[1]) {
-                $type |= self::EXCLUDE_VIRTUAL & $filter;
-            } elseif ('+' === $k[1]) {
-                $type |= self::EXCLUDE_DYNAMIC & $filter;
-            } elseif ('*' === $k[1]) {
-                $type |= self::EXCLUDE_PROTECTED & $filter;
-            } else {
-                $type |= self::EXCLUDE_PRIVATE & $filter;
-            }
+			if (null === $v) {
+				$type |= self::EXCLUDE_NULL & $filter;
+			}
+			if (empty($v)) {
+				$type |= self::EXCLUDE_EMPTY & $filter;
+			}
+			if ((self::EXCLUDE_NOT_IMPORTANT & $filter) && !in_array($k, $listedProperties, true)) {
+				$type |= self::EXCLUDE_NOT_IMPORTANT;
+			}
+			if ((self::EXCLUDE_VERBOSE & $filter) && in_array($k, $listedProperties, true)) {
+				$type |= self::EXCLUDE_VERBOSE;
+			}
 
-            if ((self::EXCLUDE_STRICT & $filter) ? $type === $filter : $type) {
-                unset($a[$k]);
-            }
-        }
+			if (!isset($k[1]) || "\0" !== $k[0]) {
+				$type |= self::EXCLUDE_PUBLIC & $filter;
+			} elseif ('~' === $k[1]) {
+				$type |= self::EXCLUDE_VIRTUAL & $filter;
+			} elseif ('+' === $k[1]) {
+				$type |= self::EXCLUDE_DYNAMIC & $filter;
+			} elseif ('*' === $k[1]) {
+				$type |= self::EXCLUDE_PROTECTED & $filter;
+			} else {
+				$type |= self::EXCLUDE_PRIVATE & $filter;
+			}
 
-        return $a;
-    }
+			if ((self::EXCLUDE_STRICT & $filter) ? $type === $filter : $type) {
+				unset($a[$k]);
+				++$count;
+			}
+		}
+
+		return $a;
+	}
+
+	public static function castPhpIncompleteClass(\__PHP_Incomplete_Class $c, array $a, Stub $stub, $isNested)
+	{
+		if (isset($a['__PHP_Incomplete_Class_Name'])) {
+			$stub->class .= '('.$a['__PHP_Incomplete_Class_Name'].')';
+			unset($a['__PHP_Incomplete_Class_Name']);
+		}
+
+		return $a;
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Caster/ClassStub.php b/htdocs/includes/symfony/var-dumper/Caster/ClassStub.php
new file mode 100644
index 00000000000..6acb22d665c
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/ClassStub.php
@@ -0,0 +1,87 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+/**
+ * Represents a PHP class identifier.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class ClassStub extends ConstStub
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param string   A PHP identifier, e.g. a class, method, interface, etc. name
+	 * @param callable The callable targeted by the identifier when it is ambiguous or not a real PHP identifier
+	 */
+	public function __construct($identifier, $callable = null)
+	{
+		$this->value = $identifier;
+
+		if (0 < $i = strrpos($identifier, '\\')) {
+			$this->attr['ellipsis'] = strlen($identifier) - $i;
+		}
+
+		try {
+			if (null !== $callable) {
+				if ($callable instanceof \Closure) {
+					$r = new \ReflectionFunction($callable);
+				} elseif (is_object($callable)) {
+					$r = array($callable, '__invoke');
+				} elseif (is_array($callable)) {
+					$r = $callable;
+				} elseif (false !== $i = strpos($callable, '::')) {
+					$r = array(substr($callable, 0, $i), substr($callable, 2 + $i));
+				} else {
+					$r = new \ReflectionFunction($callable);
+				}
+			} elseif (false !== $i = strpos($identifier, '::')) {
+				$r = array(substr($identifier, 0, $i), substr($identifier, 2 + $i));
+			} else {
+				$r = new \ReflectionClass($identifier);
+			}
+
+			if (is_array($r)) {
+				try {
+					$r = new \ReflectionMethod($r[0], $r[1]);
+				} catch (\ReflectionException $e) {
+					$r = new \ReflectionClass($r[0]);
+				}
+			}
+		} catch (\ReflectionException $e) {
+			return;
+		}
+
+		if ($f = $r->getFileName()) {
+			$this->attr['file'] = $f;
+			$this->attr['line'] = $r->getStartLine();
+		}
+	}
+
+	public static function wrapCallable($callable)
+	{
+		if (is_object($callable) || !is_callable($callable)) {
+			return $callable;
+		}
+
+		if (!is_array($callable)) {
+			$callable = new static($callable);
+		} elseif (is_string($callable[0])) {
+			$callable[0] = new static($callable[0]);
+		} else {
+			$callable[1] = new static($callable[1], $callable);
+		}
+
+		return $callable;
+	}
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/ConstStub.php b/htdocs/includes/symfony/var-dumper/Caster/ConstStub.php
index f20e03cdf0d..64766c3ba4f 100644
--- a/htdocs/includes/symfony/var-dumper/Caster/ConstStub.php
+++ b/htdocs/includes/symfony/var-dumper/Caster/ConstStub.php
@@ -20,9 +20,14 @@ use Symfony\Component\VarDumper\Cloner\Stub;
  */
 class ConstStub extends Stub
 {
-    public function __construct($name, $value)
-    {
-        $this->class = $name;
-        $this->value = $value;
-    }
+	public function __construct($name, $value)
+	{
+		$this->class = $name;
+		$this->value = $value;
+	}
+
+	public function __toString()
+	{
+		return (string) $this->value;
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Caster/CutStub.php b/htdocs/includes/symfony/var-dumper/Caster/CutStub.php
index 8781f5cf3c6..c8f51970abe 100644
--- a/htdocs/includes/symfony/var-dumper/Caster/CutStub.php
+++ b/htdocs/includes/symfony/var-dumper/Caster/CutStub.php
@@ -20,37 +20,40 @@ use Symfony\Component\VarDumper\Cloner\Stub;
  */
 class CutStub extends Stub
 {
-    public function __construct($value)
-    {
-        $this->value = $value;
+	public function __construct($value)
+	{
+		$this->value = $value;
 
-        switch (gettype($value)) {
-            case 'object':
-                $this->type = self::TYPE_OBJECT;
-                $this->class = get_class($value);
-                $this->cut = -1;
-                break;
+		switch (gettype($value)) {
+			case 'object':
+				$this->type = self::TYPE_OBJECT;
+				$this->class = get_class($value);
+				$this->cut = -1;
+				break;
 
-            case 'array':
-                $this->type = self::TYPE_ARRAY;
-                $this->class = self::ARRAY_ASSOC;
-                $this->cut = $this->value = count($value);
-                break;
+			case 'array':
+				$this->type = self::TYPE_ARRAY;
+				$this->class = self::ARRAY_ASSOC;
+				$this->cut = $this->value = count($value);
+				break;
 
-            case 'resource':
-            case 'unknown type':
-                $this->type = self::TYPE_RESOURCE;
-                $this->handle = (int) $value;
-                $this->class = @get_resource_type($value);
-                $this->cut = -1;
-                break;
+			case 'resource':
+			case 'unknown type':
+			case 'resource (closed)':
+				$this->type = self::TYPE_RESOURCE;
+				$this->handle = (int) $value;
+				if ('Unknown' === $this->class = @get_resource_type($value)) {
+					$this->class = 'Closed';
+				}
+				$this->cut = -1;
+				break;
 
-            case 'string':
-                $this->type = self::TYPE_STRING;
-                $this->class = preg_match('//u', $value) ? self::STRING_UTF8 : self::STRING_BINARY;
-                $this->cut = self::STRING_BINARY === $this->class ? strlen($value) : mb_strlen($value, 'UTF-8');
-                $this->value = '';
-                break;
-        }
-    }
+			case 'string':
+				$this->type = self::TYPE_STRING;
+				$this->class = preg_match('//u', $value) ? self::STRING_UTF8 : self::STRING_BINARY;
+				$this->cut = self::STRING_BINARY === $this->class ? strlen($value) : mb_strlen($value, 'UTF-8');
+				$this->value = '';
+				break;
+		}
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Caster/DOMCaster.php b/htdocs/includes/symfony/var-dumper/Caster/DOMCaster.php
index e04cf9534b3..c35c1965b8d 100644
--- a/htdocs/includes/symfony/var-dumper/Caster/DOMCaster.php
+++ b/htdocs/includes/symfony/var-dumper/Caster/DOMCaster.php
@@ -20,283 +20,283 @@ use Symfony\Component\VarDumper\Cloner\Stub;
  */
 class DOMCaster
 {
-    private static $errorCodes = array(
-        DOM_PHP_ERR => 'DOM_PHP_ERR',
-        DOM_INDEX_SIZE_ERR => 'DOM_INDEX_SIZE_ERR',
-        DOMSTRING_SIZE_ERR => 'DOMSTRING_SIZE_ERR',
-        DOM_HIERARCHY_REQUEST_ERR => 'DOM_HIERARCHY_REQUEST_ERR',
-        DOM_WRONG_DOCUMENT_ERR => 'DOM_WRONG_DOCUMENT_ERR',
-        DOM_INVALID_CHARACTER_ERR => 'DOM_INVALID_CHARACTER_ERR',
-        DOM_NO_DATA_ALLOWED_ERR => 'DOM_NO_DATA_ALLOWED_ERR',
-        DOM_NO_MODIFICATION_ALLOWED_ERR => 'DOM_NO_MODIFICATION_ALLOWED_ERR',
-        DOM_NOT_FOUND_ERR => 'DOM_NOT_FOUND_ERR',
-        DOM_NOT_SUPPORTED_ERR => 'DOM_NOT_SUPPORTED_ERR',
-        DOM_INUSE_ATTRIBUTE_ERR => 'DOM_INUSE_ATTRIBUTE_ERR',
-        DOM_INVALID_STATE_ERR => 'DOM_INVALID_STATE_ERR',
-        DOM_SYNTAX_ERR => 'DOM_SYNTAX_ERR',
-        DOM_INVALID_MODIFICATION_ERR => 'DOM_INVALID_MODIFICATION_ERR',
-        DOM_NAMESPACE_ERR => 'DOM_NAMESPACE_ERR',
-        DOM_INVALID_ACCESS_ERR => 'DOM_INVALID_ACCESS_ERR',
-        DOM_VALIDATION_ERR => 'DOM_VALIDATION_ERR',
-    );
+	private static $errorCodes = array(
+		DOM_PHP_ERR => 'DOM_PHP_ERR',
+		DOM_INDEX_SIZE_ERR => 'DOM_INDEX_SIZE_ERR',
+		DOMSTRING_SIZE_ERR => 'DOMSTRING_SIZE_ERR',
+		DOM_HIERARCHY_REQUEST_ERR => 'DOM_HIERARCHY_REQUEST_ERR',
+		DOM_WRONG_DOCUMENT_ERR => 'DOM_WRONG_DOCUMENT_ERR',
+		DOM_INVALID_CHARACTER_ERR => 'DOM_INVALID_CHARACTER_ERR',
+		DOM_NO_DATA_ALLOWED_ERR => 'DOM_NO_DATA_ALLOWED_ERR',
+		DOM_NO_MODIFICATION_ALLOWED_ERR => 'DOM_NO_MODIFICATION_ALLOWED_ERR',
+		DOM_NOT_FOUND_ERR => 'DOM_NOT_FOUND_ERR',
+		DOM_NOT_SUPPORTED_ERR => 'DOM_NOT_SUPPORTED_ERR',
+		DOM_INUSE_ATTRIBUTE_ERR => 'DOM_INUSE_ATTRIBUTE_ERR',
+		DOM_INVALID_STATE_ERR => 'DOM_INVALID_STATE_ERR',
+		DOM_SYNTAX_ERR => 'DOM_SYNTAX_ERR',
+		DOM_INVALID_MODIFICATION_ERR => 'DOM_INVALID_MODIFICATION_ERR',
+		DOM_NAMESPACE_ERR => 'DOM_NAMESPACE_ERR',
+		DOM_INVALID_ACCESS_ERR => 'DOM_INVALID_ACCESS_ERR',
+		DOM_VALIDATION_ERR => 'DOM_VALIDATION_ERR',
+	);
 
-    private static $nodeTypes = array(
-        XML_ELEMENT_NODE => 'XML_ELEMENT_NODE',
-        XML_ATTRIBUTE_NODE => 'XML_ATTRIBUTE_NODE',
-        XML_TEXT_NODE => 'XML_TEXT_NODE',
-        XML_CDATA_SECTION_NODE => 'XML_CDATA_SECTION_NODE',
-        XML_ENTITY_REF_NODE => 'XML_ENTITY_REF_NODE',
-        XML_ENTITY_NODE => 'XML_ENTITY_NODE',
-        XML_PI_NODE => 'XML_PI_NODE',
-        XML_COMMENT_NODE => 'XML_COMMENT_NODE',
-        XML_DOCUMENT_NODE => 'XML_DOCUMENT_NODE',
-        XML_DOCUMENT_TYPE_NODE => 'XML_DOCUMENT_TYPE_NODE',
-        XML_DOCUMENT_FRAG_NODE => 'XML_DOCUMENT_FRAG_NODE',
-        XML_NOTATION_NODE => 'XML_NOTATION_NODE',
-        XML_HTML_DOCUMENT_NODE => 'XML_HTML_DOCUMENT_NODE',
-        XML_DTD_NODE => 'XML_DTD_NODE',
-        XML_ELEMENT_DECL_NODE => 'XML_ELEMENT_DECL_NODE',
-        XML_ATTRIBUTE_DECL_NODE => 'XML_ATTRIBUTE_DECL_NODE',
-        XML_ENTITY_DECL_NODE => 'XML_ENTITY_DECL_NODE',
-        XML_NAMESPACE_DECL_NODE => 'XML_NAMESPACE_DECL_NODE',
-    );
+	private static $nodeTypes = array(
+		XML_ELEMENT_NODE => 'XML_ELEMENT_NODE',
+		XML_ATTRIBUTE_NODE => 'XML_ATTRIBUTE_NODE',
+		XML_TEXT_NODE => 'XML_TEXT_NODE',
+		XML_CDATA_SECTION_NODE => 'XML_CDATA_SECTION_NODE',
+		XML_ENTITY_REF_NODE => 'XML_ENTITY_REF_NODE',
+		XML_ENTITY_NODE => 'XML_ENTITY_NODE',
+		XML_PI_NODE => 'XML_PI_NODE',
+		XML_COMMENT_NODE => 'XML_COMMENT_NODE',
+		XML_DOCUMENT_NODE => 'XML_DOCUMENT_NODE',
+		XML_DOCUMENT_TYPE_NODE => 'XML_DOCUMENT_TYPE_NODE',
+		XML_DOCUMENT_FRAG_NODE => 'XML_DOCUMENT_FRAG_NODE',
+		XML_NOTATION_NODE => 'XML_NOTATION_NODE',
+		XML_HTML_DOCUMENT_NODE => 'XML_HTML_DOCUMENT_NODE',
+		XML_DTD_NODE => 'XML_DTD_NODE',
+		XML_ELEMENT_DECL_NODE => 'XML_ELEMENT_DECL_NODE',
+		XML_ATTRIBUTE_DECL_NODE => 'XML_ATTRIBUTE_DECL_NODE',
+		XML_ENTITY_DECL_NODE => 'XML_ENTITY_DECL_NODE',
+		XML_NAMESPACE_DECL_NODE => 'XML_NAMESPACE_DECL_NODE',
+	);
 
-    public static function castException(\DOMException $e, array $a, Stub $stub, $isNested)
-    {
-        $k = Caster::PREFIX_PROTECTED.'code';
-        if (isset($a[$k], self::$errorCodes[$a[$k]])) {
-            $a[$k] = new ConstStub(self::$errorCodes[$a[$k]], $a[$k]);
-        }
+	public static function castException(\DOMException $e, array $a, Stub $stub, $isNested)
+	{
+		$k = Caster::PREFIX_PROTECTED.'code';
+		if (isset($a[$k], self::$errorCodes[$a[$k]])) {
+			$a[$k] = new ConstStub(self::$errorCodes[$a[$k]], $a[$k]);
+		}
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castLength($dom, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            'length' => $dom->length,
-        );
+	public static function castLength($dom, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			'length' => $dom->length,
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castImplementation($dom, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            Caster::PREFIX_VIRTUAL.'Core' => '1.0',
-            Caster::PREFIX_VIRTUAL.'XML' => '2.0',
-        );
+	public static function castImplementation($dom, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			Caster::PREFIX_VIRTUAL.'Core' => '1.0',
+			Caster::PREFIX_VIRTUAL.'XML' => '2.0',
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castNode(\DOMNode $dom, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            'nodeName' => $dom->nodeName,
-            'nodeValue' => new CutStub($dom->nodeValue),
-            'nodeType' => new ConstStub(self::$nodeTypes[$dom->nodeType], $dom->nodeType),
-            'parentNode' => new CutStub($dom->parentNode),
-            'childNodes' => $dom->childNodes,
-            'firstChild' => new CutStub($dom->firstChild),
-            'lastChild' => new CutStub($dom->lastChild),
-            'previousSibling' => new CutStub($dom->previousSibling),
-            'nextSibling' => new CutStub($dom->nextSibling),
-            'attributes' => $dom->attributes,
-            'ownerDocument' => new CutStub($dom->ownerDocument),
-            'namespaceURI' => $dom->namespaceURI,
-            'prefix' => $dom->prefix,
-            'localName' => $dom->localName,
-            'baseURI' => $dom->baseURI,
-            'textContent' => new CutStub($dom->textContent),
-        );
+	public static function castNode(\DOMNode $dom, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			'nodeName' => $dom->nodeName,
+			'nodeValue' => new CutStub($dom->nodeValue),
+			'nodeType' => new ConstStub(self::$nodeTypes[$dom->nodeType], $dom->nodeType),
+			'parentNode' => new CutStub($dom->parentNode),
+			'childNodes' => $dom->childNodes,
+			'firstChild' => new CutStub($dom->firstChild),
+			'lastChild' => new CutStub($dom->lastChild),
+			'previousSibling' => new CutStub($dom->previousSibling),
+			'nextSibling' => new CutStub($dom->nextSibling),
+			'attributes' => $dom->attributes,
+			'ownerDocument' => new CutStub($dom->ownerDocument),
+			'namespaceURI' => $dom->namespaceURI,
+			'prefix' => $dom->prefix,
+			'localName' => $dom->localName,
+			'baseURI' => $dom->baseURI ? new LinkStub($dom->baseURI) : $dom->baseURI,
+			'textContent' => new CutStub($dom->textContent),
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castNameSpaceNode(\DOMNameSpaceNode $dom, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            'nodeName' => $dom->nodeName,
-            'nodeValue' => new CutStub($dom->nodeValue),
-            'nodeType' => new ConstStub(self::$nodeTypes[$dom->nodeType], $dom->nodeType),
-            'prefix' => $dom->prefix,
-            'localName' => $dom->localName,
-            'namespaceURI' => $dom->namespaceURI,
-            'ownerDocument' => new CutStub($dom->ownerDocument),
-            'parentNode' => new CutStub($dom->parentNode),
-        );
+	public static function castNameSpaceNode(\DOMNameSpaceNode $dom, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			'nodeName' => $dom->nodeName,
+			'nodeValue' => new CutStub($dom->nodeValue),
+			'nodeType' => new ConstStub(self::$nodeTypes[$dom->nodeType], $dom->nodeType),
+			'prefix' => $dom->prefix,
+			'localName' => $dom->localName,
+			'namespaceURI' => $dom->namespaceURI,
+			'ownerDocument' => new CutStub($dom->ownerDocument),
+			'parentNode' => new CutStub($dom->parentNode),
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castDocument(\DOMDocument $dom, array $a, Stub $stub, $isNested, $filter = 0)
-    {
-        $a += array(
-            'doctype' => $dom->doctype,
-            'implementation' => $dom->implementation,
-            'documentElement' => new CutStub($dom->documentElement),
-            'actualEncoding' => $dom->actualEncoding,
-            'encoding' => $dom->encoding,
-            'xmlEncoding' => $dom->xmlEncoding,
-            'standalone' => $dom->standalone,
-            'xmlStandalone' => $dom->xmlStandalone,
-            'version' => $dom->version,
-            'xmlVersion' => $dom->xmlVersion,
-            'strictErrorChecking' => $dom->strictErrorChecking,
-            'documentURI' => $dom->documentURI,
-            'config' => $dom->config,
-            'formatOutput' => $dom->formatOutput,
-            'validateOnParse' => $dom->validateOnParse,
-            'resolveExternals' => $dom->resolveExternals,
-            'preserveWhiteSpace' => $dom->preserveWhiteSpace,
-            'recover' => $dom->recover,
-            'substituteEntities' => $dom->substituteEntities,
-        );
+	public static function castDocument(\DOMDocument $dom, array $a, Stub $stub, $isNested, $filter = 0)
+	{
+		$a += array(
+			'doctype' => $dom->doctype,
+			'implementation' => $dom->implementation,
+			'documentElement' => new CutStub($dom->documentElement),
+			'actualEncoding' => $dom->actualEncoding,
+			'encoding' => $dom->encoding,
+			'xmlEncoding' => $dom->xmlEncoding,
+			'standalone' => $dom->standalone,
+			'xmlStandalone' => $dom->xmlStandalone,
+			'version' => $dom->version,
+			'xmlVersion' => $dom->xmlVersion,
+			'strictErrorChecking' => $dom->strictErrorChecking,
+			'documentURI' => $dom->documentURI ? new LinkStub($dom->documentURI) : $dom->documentURI,
+			'config' => $dom->config,
+			'formatOutput' => $dom->formatOutput,
+			'validateOnParse' => $dom->validateOnParse,
+			'resolveExternals' => $dom->resolveExternals,
+			'preserveWhiteSpace' => $dom->preserveWhiteSpace,
+			'recover' => $dom->recover,
+			'substituteEntities' => $dom->substituteEntities,
+		);
 
-        if (!($filter & Caster::EXCLUDE_VERBOSE)) {
-            $formatOutput = $dom->formatOutput;
-            $dom->formatOutput = true;
-            $a += array(Caster::PREFIX_VIRTUAL.'xml' => $dom->saveXML());
-            $dom->formatOutput = $formatOutput;
-        }
+		if (!($filter & Caster::EXCLUDE_VERBOSE)) {
+			$formatOutput = $dom->formatOutput;
+			$dom->formatOutput = true;
+			$a += array(Caster::PREFIX_VIRTUAL.'xml' => $dom->saveXML());
+			$dom->formatOutput = $formatOutput;
+		}
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castCharacterData(\DOMCharacterData $dom, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            'data' => $dom->data,
-            'length' => $dom->length,
-        );
+	public static function castCharacterData(\DOMCharacterData $dom, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			'data' => $dom->data,
+			'length' => $dom->length,
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castAttr(\DOMAttr $dom, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            'name' => $dom->name,
-            'specified' => $dom->specified,
-            'value' => $dom->value,
-            'ownerElement' => $dom->ownerElement,
-            'schemaTypeInfo' => $dom->schemaTypeInfo,
-        );
+	public static function castAttr(\DOMAttr $dom, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			'name' => $dom->name,
+			'specified' => $dom->specified,
+			'value' => $dom->value,
+			'ownerElement' => $dom->ownerElement,
+			'schemaTypeInfo' => $dom->schemaTypeInfo,
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castElement(\DOMElement $dom, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            'tagName' => $dom->tagName,
-            'schemaTypeInfo' => $dom->schemaTypeInfo,
-        );
+	public static function castElement(\DOMElement $dom, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			'tagName' => $dom->tagName,
+			'schemaTypeInfo' => $dom->schemaTypeInfo,
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castText(\DOMText $dom, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            'wholeText' => $dom->wholeText,
-        );
+	public static function castText(\DOMText $dom, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			'wholeText' => $dom->wholeText,
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castTypeinfo(\DOMTypeinfo $dom, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            'typeName' => $dom->typeName,
-            'typeNamespace' => $dom->typeNamespace,
-        );
+	public static function castTypeinfo(\DOMTypeinfo $dom, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			'typeName' => $dom->typeName,
+			'typeNamespace' => $dom->typeNamespace,
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castDomError(\DOMDomError $dom, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            'severity' => $dom->severity,
-            'message' => $dom->message,
-            'type' => $dom->type,
-            'relatedException' => $dom->relatedException,
-            'related_data' => $dom->related_data,
-            'location' => $dom->location,
-        );
+	public static function castDomError(\DOMDomError $dom, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			'severity' => $dom->severity,
+			'message' => $dom->message,
+			'type' => $dom->type,
+			'relatedException' => $dom->relatedException,
+			'related_data' => $dom->related_data,
+			'location' => $dom->location,
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castLocator(\DOMLocator $dom, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            'lineNumber' => $dom->lineNumber,
-            'columnNumber' => $dom->columnNumber,
-            'offset' => $dom->offset,
-            'relatedNode' => $dom->relatedNode,
-            'uri' => $dom->uri,
-        );
+	public static function castLocator(\DOMLocator $dom, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			'lineNumber' => $dom->lineNumber,
+			'columnNumber' => $dom->columnNumber,
+			'offset' => $dom->offset,
+			'relatedNode' => $dom->relatedNode,
+			'uri' => $dom->uri ? new LinkStub($dom->uri, $dom->lineNumber) : $dom->uri,
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castDocumentType(\DOMDocumentType $dom, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            'name' => $dom->name,
-            'entities' => $dom->entities,
-            'notations' => $dom->notations,
-            'publicId' => $dom->publicId,
-            'systemId' => $dom->systemId,
-            'internalSubset' => $dom->internalSubset,
-        );
+	public static function castDocumentType(\DOMDocumentType $dom, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			'name' => $dom->name,
+			'entities' => $dom->entities,
+			'notations' => $dom->notations,
+			'publicId' => $dom->publicId,
+			'systemId' => $dom->systemId,
+			'internalSubset' => $dom->internalSubset,
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castNotation(\DOMNotation $dom, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            'publicId' => $dom->publicId,
-            'systemId' => $dom->systemId,
-        );
+	public static function castNotation(\DOMNotation $dom, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			'publicId' => $dom->publicId,
+			'systemId' => $dom->systemId,
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castEntity(\DOMEntity $dom, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            'publicId' => $dom->publicId,
-            'systemId' => $dom->systemId,
-            'notationName' => $dom->notationName,
-            'actualEncoding' => $dom->actualEncoding,
-            'encoding' => $dom->encoding,
-            'version' => $dom->version,
-        );
+	public static function castEntity(\DOMEntity $dom, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			'publicId' => $dom->publicId,
+			'systemId' => $dom->systemId,
+			'notationName' => $dom->notationName,
+			'actualEncoding' => $dom->actualEncoding,
+			'encoding' => $dom->encoding,
+			'version' => $dom->version,
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castProcessingInstruction(\DOMProcessingInstruction $dom, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            'target' => $dom->target,
-            'data' => $dom->data,
-        );
+	public static function castProcessingInstruction(\DOMProcessingInstruction $dom, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			'target' => $dom->target,
+			'data' => $dom->data,
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castXPath(\DOMXPath $dom, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            'document' => $dom->document,
-        );
+	public static function castXPath(\DOMXPath $dom, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			'document' => $dom->document,
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Caster/EnumStub.php b/htdocs/includes/symfony/var-dumper/Caster/EnumStub.php
index 67bb2e16390..66d8bc219de 100644
--- a/htdocs/includes/symfony/var-dumper/Caster/EnumStub.php
+++ b/htdocs/includes/symfony/var-dumper/Caster/EnumStub.php
@@ -20,8 +20,11 @@ use Symfony\Component\VarDumper\Cloner\Stub;
  */
 class EnumStub extends Stub
 {
-    public function __construct(array $values)
-    {
-        $this->value = $values;
-    }
+	public $dumpKeys = true;
+
+	public function __construct(array $values, $dumpKeys = true)
+	{
+		$this->value = $values;
+		$this->dumpKeys = $dumpKeys;
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Caster/ExceptionCaster.php b/htdocs/includes/symfony/var-dumper/Caster/ExceptionCaster.php
index a5a8773e859..daf7cebe83f 100644
--- a/htdocs/includes/symfony/var-dumper/Caster/ExceptionCaster.php
+++ b/htdocs/includes/symfony/var-dumper/Caster/ExceptionCaster.php
@@ -21,218 +21,278 @@ use Symfony\Component\VarDumper\Cloner\Stub;
  */
 class ExceptionCaster
 {
-    public static $srcContext = 1;
-    public static $traceArgs = true;
-    public static $errorTypes = array(
-        E_DEPRECATED => 'E_DEPRECATED',
-        E_USER_DEPRECATED => 'E_USER_DEPRECATED',
-        E_RECOVERABLE_ERROR => 'E_RECOVERABLE_ERROR',
-        E_ERROR => 'E_ERROR',
-        E_WARNING => 'E_WARNING',
-        E_PARSE => 'E_PARSE',
-        E_NOTICE => 'E_NOTICE',
-        E_CORE_ERROR => 'E_CORE_ERROR',
-        E_CORE_WARNING => 'E_CORE_WARNING',
-        E_COMPILE_ERROR => 'E_COMPILE_ERROR',
-        E_COMPILE_WARNING => 'E_COMPILE_WARNING',
-        E_USER_ERROR => 'E_USER_ERROR',
-        E_USER_WARNING => 'E_USER_WARNING',
-        E_USER_NOTICE => 'E_USER_NOTICE',
-        E_STRICT => 'E_STRICT',
-    );
+	public static $srcContext = 1;
+	public static $traceArgs = true;
+	public static $errorTypes = array(
+		E_DEPRECATED => 'E_DEPRECATED',
+		E_USER_DEPRECATED => 'E_USER_DEPRECATED',
+		E_RECOVERABLE_ERROR => 'E_RECOVERABLE_ERROR',
+		E_ERROR => 'E_ERROR',
+		E_WARNING => 'E_WARNING',
+		E_PARSE => 'E_PARSE',
+		E_NOTICE => 'E_NOTICE',
+		E_CORE_ERROR => 'E_CORE_ERROR',
+		E_CORE_WARNING => 'E_CORE_WARNING',
+		E_COMPILE_ERROR => 'E_COMPILE_ERROR',
+		E_COMPILE_WARNING => 'E_COMPILE_WARNING',
+		E_USER_ERROR => 'E_USER_ERROR',
+		E_USER_WARNING => 'E_USER_WARNING',
+		E_USER_NOTICE => 'E_USER_NOTICE',
+		E_STRICT => 'E_STRICT',
+	);
 
-    public static function castError(\Error $e, array $a, Stub $stub, $isNested, $filter = 0)
-    {
-        return self::filterExceptionArray($stub->class, $a, "\0Error\0", $filter);
-    }
+	private static $framesCache = array();
 
-    public static function castException(\Exception $e, array $a, Stub $stub, $isNested, $filter = 0)
-    {
-        return self::filterExceptionArray($stub->class, $a, "\0Exception\0", $filter);
-    }
+	public static function castError(\Error $e, array $a, Stub $stub, $isNested, $filter = 0)
+	{
+		return self::filterExceptionArray($stub->class, $a, "\0Error\0", $filter);
+	}
 
-    public static function castErrorException(\ErrorException $e, array $a, Stub $stub, $isNested)
-    {
-        if (isset($a[$s = Caster::PREFIX_PROTECTED.'severity'], self::$errorTypes[$a[$s]])) {
-            $a[$s] = new ConstStub(self::$errorTypes[$a[$s]], $a[$s]);
-        }
+	public static function castException(\Exception $e, array $a, Stub $stub, $isNested, $filter = 0)
+	{
+		return self::filterExceptionArray($stub->class, $a, "\0Exception\0", $filter);
+	}
 
-        return $a;
-    }
+	public static function castErrorException(\ErrorException $e, array $a, Stub $stub, $isNested)
+	{
+		if (isset($a[$s = Caster::PREFIX_PROTECTED.'severity'], self::$errorTypes[$a[$s]])) {
+			$a[$s] = new ConstStub(self::$errorTypes[$a[$s]], $a[$s]);
+		}
 
-    public static function castThrowingCasterException(ThrowingCasterException $e, array $a, Stub $stub, $isNested)
-    {
-        $prefix = Caster::PREFIX_PROTECTED;
-        $xPrefix = "\0Exception\0";
+		return $a;
+	}
 
-        if (isset($a[$xPrefix.'previous'], $a[$xPrefix.'trace'])) {
-            $b = (array) $a[$xPrefix.'previous'];
-            array_unshift($b[$xPrefix.'trace'], array(
-                'function' => 'new '.get_class($a[$xPrefix.'previous']),
-                'file' => $b[$prefix.'file'],
-                'line' => $b[$prefix.'line'],
-            ));
-            $a[$xPrefix.'trace'] = new TraceStub($b[$xPrefix.'trace'], false, 0, -1 - count($a[$xPrefix.'trace']->value));
-        }
+	public static function castThrowingCasterException(ThrowingCasterException $e, array $a, Stub $stub, $isNested)
+	{
+		$prefix = Caster::PREFIX_PROTECTED;
+		$xPrefix = "\0Exception\0";
 
-        unset($a[$xPrefix.'previous'], $a[$prefix.'code'], $a[$prefix.'file'], $a[$prefix.'line']);
+		if (isset($a[$xPrefix.'previous'], $a[$xPrefix.'trace']) && $a[$xPrefix.'previous'] instanceof \Exception) {
+			$b = (array) $a[$xPrefix.'previous'];
+			self::traceUnshift($b[$xPrefix.'trace'], get_class($a[$xPrefix.'previous']), $b[$prefix.'file'], $b[$prefix.'line']);
+			$a[$xPrefix.'trace'] = new TraceStub($b[$xPrefix.'trace'], false, 0, -1 - count($a[$xPrefix.'trace']->value));
+		}
 
-        return $a;
-    }
+		unset($a[$xPrefix.'previous'], $a[$prefix.'code'], $a[$prefix.'file'], $a[$prefix.'line']);
 
-    public static function castTraceStub(TraceStub $trace, array $a, Stub $stub, $isNested)
-    {
-        if (!$isNested) {
-            return $a;
-        }
-        $stub->class = '';
-        $stub->handle = 0;
-        $frames = $trace->value;
+		return $a;
+	}
 
-        $a = array();
-        $j = count($frames);
-        if (0 > $i = $trace->sliceOffset) {
-            $i = max(0, $j + $i);
-        }
-        if (!isset($trace->value[$i])) {
-            return array();
-        }
-        $lastCall = isset($frames[$i]['function']) ? ' ==> '.(isset($frames[$i]['class']) ? $frames[0]['class'].$frames[$i]['type'] : '').$frames[$i]['function'].'()' : '';
+	public static function castTraceStub(TraceStub $trace, array $a, Stub $stub, $isNested)
+	{
+		if (!$isNested) {
+			return $a;
+		}
+		$stub->class = '';
+		$stub->handle = 0;
+		$frames = $trace->value;
+		$prefix = Caster::PREFIX_VIRTUAL;
 
-        for ($j += $trace->numberingOffset - $i++; isset($frames[$i]); ++$i, --$j) {
-            $call = isset($frames[$i]['function']) ? (isset($frames[$i]['class']) ? $frames[$i]['class'].$frames[$i]['type'] : '').$frames[$i]['function'].'()' : '???';
+		$a = array();
+		$j = count($frames);
+		if (0 > $i = $trace->sliceOffset) {
+			$i = max(0, $j + $i);
+		}
+		if (!isset($trace->value[$i])) {
+			return array();
+		}
+		$lastCall = isset($frames[$i]['function']) ? (isset($frames[$i]['class']) ? $frames[0]['class'].$frames[$i]['type'] : '').$frames[$i]['function'].'()' : '';
+		$frames[] = array('function' => '');
 
-            $a[Caster::PREFIX_VIRTUAL.$j.'. '.$call.$lastCall] = new FrameStub(
-                array(
-                    'object' => isset($frames[$i]['object']) ? $frames[$i]['object'] : null,
-                    'class' => isset($frames[$i]['class']) ? $frames[$i]['class'] : null,
-                    'type' => isset($frames[$i]['type']) ? $frames[$i]['type'] : null,
-                    'function' => isset($frames[$i]['function']) ? $frames[$i]['function'] : null,
-                ) + $frames[$i - 1],
-                $trace->keepArgs,
-                true
-            );
+		for ($j += $trace->numberingOffset - $i++; isset($frames[$i]); ++$i, --$j) {
+			$f = $frames[$i];
+			$call = isset($f['function']) ? (isset($f['class']) ? $f['class'].$f['type'] : '').$f['function'].'()' : '???';
 
-            $lastCall = ' ==> '.$call;
-        }
-        $a[Caster::PREFIX_VIRTUAL.$j.'. {main}'.$lastCall] = new FrameStub(
-            array(
-                'object' => null,
-                'class' => null,
-                'type' => null,
-                'function' => '{main}',
-            ) + $frames[$i - 1],
-            $trace->keepArgs,
-            true
-        );
-        if (null !== $trace->sliceLength) {
-            $a = array_slice($a, 0, $trace->sliceLength, true);
-        }
+			$label = substr_replace($prefix, "title=Stack level $j.", 2, 0).$lastCall;
+			$frame = new FrameStub(
+				array(
+					'object' => isset($f['object']) ? $f['object'] : null,
+					'class' => isset($f['class']) ? $f['class'] : null,
+					'type' => isset($f['type']) ? $f['type'] : null,
+					'function' => isset($f['function']) ? $f['function'] : null,
+				) + $frames[$i - 1],
+				false,
+				true
+			);
+			$f = self::castFrameStub($frame, array(), $frame, true);
+			if (isset($f[$prefix.'src'])) {
+				foreach ($f[$prefix.'src']->value as $label => $frame) {
+					$label = substr_replace($label, "title=Stack level $j.&", 2, 0);
+				}
+				$f = $frames[$i - 1];
+				if ($trace->keepArgs && !empty($f['args']) && $frame instanceof EnumStub) {
+					$frame->value['arguments'] = new ArgsStub($f['args'], isset($f['function']) ? $f['function'] : null, isset($f['class']) ? $f['class'] : null);
+				}
+			}
+			$a[$label] = $frame;
 
-        return $a;
-    }
+			$lastCall = $call;
+		}
+		if (null !== $trace->sliceLength) {
+			$a = array_slice($a, 0, $trace->sliceLength, true);
+		}
 
-    public static function castFrameStub(FrameStub $frame, array $a, Stub $stub, $isNested)
-    {
-        if (!$isNested) {
-            return $a;
-        }
-        $f = $frame->value;
-        $prefix = Caster::PREFIX_VIRTUAL;
+		return $a;
+	}
 
-        if (isset($f['file'], $f['line'])) {
-            if (preg_match('/\((\d+)\)(?:\([\da-f]{32}\))? : (?:eval\(\)\'d code|runtime-created function)$/', $f['file'], $match)) {
-                $f['file'] = substr($f['file'], 0, -strlen($match[0]));
-                $f['line'] = (int) $match[1];
-            }
-            if (file_exists($f['file']) && 0 <= self::$srcContext) {
-                $src[$f['file'].':'.$f['line']] = self::extractSource(explode("\n", file_get_contents($f['file'])), $f['line'], self::$srcContext);
+	public static function castFrameStub(FrameStub $frame, array $a, Stub $stub, $isNested)
+	{
+		if (!$isNested) {
+			return $a;
+		}
+		$f = $frame->value;
+		$prefix = Caster::PREFIX_VIRTUAL;
 
-                if (!empty($f['class']) && is_subclass_of($f['class'], 'Twig_Template') && method_exists($f['class'], 'getDebugInfo')) {
-                    $template = isset($f['object']) ? $f['object'] : new $f['class'](new \Twig_Environment(new \Twig_Loader_Filesystem()));
+		if (isset($f['file'], $f['line'])) {
+			$cacheKey = $f;
+			unset($cacheKey['object'], $cacheKey['args']);
+			$cacheKey[] = self::$srcContext;
+			$cacheKey = implode('-', $cacheKey);
 
-                    try {
-                        $templateName = $template->getTemplateName();
-                        $templateSrc = explode("\n", method_exists($template, 'getSource') ? $template->getSource() : $template->getEnvironment()->getLoader()->getSource($templateName));
-                        $templateInfo = $template->getDebugInfo();
-                        if (isset($templateInfo[$f['line']])) {
-                            $src[$templateName.':'.$templateInfo[$f['line']]] = self::extractSource($templateSrc, $templateInfo[$f['line']], self::$srcContext);
-                        }
-                    } catch (\Twig_Error_Loader $e) {
-                    }
-                }
-            } else {
-                $src[$f['file']] = $f['line'];
-            }
-            $a[$prefix.'src'] = new EnumStub($src);
-        }
+			if (isset(self::$framesCache[$cacheKey])) {
+				$a[$prefix.'src'] = self::$framesCache[$cacheKey];
+			} else {
+				if (preg_match('/\((\d+)\)(?:\([\da-f]{32}\))? : (?:eval\(\)\'d code|runtime-created function)$/', $f['file'], $match)) {
+					$f['file'] = substr($f['file'], 0, -strlen($match[0]));
+					$f['line'] = (int) $match[1];
+				}
+				$caller = isset($f['function']) ? sprintf('in %s() on line %d', (isset($f['class']) ? $f['class'].$f['type'] : '').$f['function'], $f['line']) : null;
+				$src = $f['line'];
+				$srcKey = $f['file'];
+				$ellipsis = explode(DIRECTORY_SEPARATOR, $srcKey);
+				$ellipsis = 3 < count($ellipsis) ? 2 + strlen(implode(array_slice($ellipsis, -2))) : 0;
 
-        unset($a[$prefix.'args'], $a[$prefix.'line'], $a[$prefix.'file']);
-        if ($frame->inTraceStub) {
-            unset($a[$prefix.'class'], $a[$prefix.'type'], $a[$prefix.'function']);
-        }
-        foreach ($a as $k => $v) {
-            if (!$v) {
-                unset($a[$k]);
-            }
-        }
-        if ($frame->keepArgs && isset($f['args'])) {
-            $a[$prefix.'args'] = $f['args'];
-        }
+				if (file_exists($f['file']) && 0 <= self::$srcContext) {
+					if (!empty($f['class']) && (is_subclass_of($f['class'], 'Twig\Template') || is_subclass_of($f['class'], 'Twig_Template')) && method_exists($f['class'], 'getDebugInfo')) {
+						$template = isset($f['object']) ? $f['object'] : unserialize(sprintf('O:%d:"%s":0:{}', strlen($f['class']), $f['class']));
 
-        return $a;
-    }
+						$ellipsis = 0;
+						$templateSrc = method_exists($template, 'getSourceContext') ? $template->getSourceContext()->getCode() : (method_exists($template, 'getSource') ? $template->getSource() : '');
+						$templateInfo = $template->getDebugInfo();
+						if (isset($templateInfo[$f['line']])) {
+							if (!method_exists($template, 'getSourceContext') || !file_exists($templatePath = $template->getSourceContext()->getPath())) {
+								$templatePath = null;
+							}
+							if ($templateSrc) {
+								$src = self::extractSource($templateSrc, $templateInfo[$f['line']], self::$srcContext, $caller, 'twig', $templatePath);
+								$srcKey = ($templatePath ?: $template->getTemplateName()).':'.$templateInfo[$f['line']];
+							}
+						}
+					}
+					if ($srcKey == $f['file']) {
+						$src = self::extractSource(file_get_contents($f['file']), $f['line'], self::$srcContext, $caller, 'php', $f['file']);
+						$srcKey .= ':'.$f['line'];
+						if ($ellipsis) {
+							$ellipsis += 1 + strlen($f['line']);
+						}
+					}
+				}
+				$srcAttr = $ellipsis ? 'ellipsis='.$ellipsis : '';
+				self::$framesCache[$cacheKey] = $a[$prefix.'src'] = new EnumStub(array("\0~$srcAttr\0$srcKey" => $src));
+			}
+		}
 
-    private static function filterExceptionArray($xClass, array $a, $xPrefix, $filter)
-    {
-        if (isset($a[$xPrefix.'trace'])) {
-            $trace = $a[$xPrefix.'trace'];
-            unset($a[$xPrefix.'trace']); // Ensures the trace is always last
-        } else {
-            $trace = array();
-        }
+		unset($a[$prefix.'args'], $a[$prefix.'line'], $a[$prefix.'file']);
+		if ($frame->inTraceStub) {
+			unset($a[$prefix.'class'], $a[$prefix.'type'], $a[$prefix.'function']);
+		}
+		foreach ($a as $k => $v) {
+			if (!$v) {
+				unset($a[$k]);
+			}
+		}
+		if ($frame->keepArgs && !empty($f['args'])) {
+			$a[$prefix.'arguments'] = new ArgsStub($f['args'], $f['function'], $f['class']);
+		}
 
-        if (!($filter & Caster::EXCLUDE_VERBOSE)) {
-            array_unshift($trace, array(
-                'function' => $xClass ? 'new '.$xClass : null,
-                'file' => $a[Caster::PREFIX_PROTECTED.'file'],
-                'line' => $a[Caster::PREFIX_PROTECTED.'line'],
-            ));
-            $a[$xPrefix.'trace'] = new TraceStub($trace);
-        }
-        if (empty($a[$xPrefix.'previous'])) {
-            unset($a[$xPrefix.'previous']);
-        }
-        unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message'], $a[Caster::PREFIX_DYNAMIC.'__destructorException']);
+		return $a;
+	}
 
-        return $a;
-    }
+	private static function filterExceptionArray($xClass, array $a, $xPrefix, $filter)
+	{
+		if (isset($a[$xPrefix.'trace'])) {
+			$trace = $a[$xPrefix.'trace'];
+			unset($a[$xPrefix.'trace']); // Ensures the trace is always last
+		} else {
+			$trace = array();
+		}
 
-    private static function extractSource(array $srcArray, $line, $srcContext)
-    {
-        $src = array();
+		if (!($filter & Caster::EXCLUDE_VERBOSE)) {
+			if (isset($a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line'])) {
+				self::traceUnshift($trace, $xClass, $a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line']);
+			}
+			$a[$xPrefix.'trace'] = new TraceStub($trace, self::$traceArgs);
+		}
+		if (empty($a[$xPrefix.'previous'])) {
+			unset($a[$xPrefix.'previous']);
+		}
+		unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message'], $a[Caster::PREFIX_DYNAMIC.'__destructorException']);
 
-        for ($i = $line - 1 - $srcContext; $i <= $line - 1 + $srcContext; ++$i) {
-            $src[] = (isset($srcArray[$i]) ? $srcArray[$i] : '')."\n";
-        }
+		if (isset($a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line'])) {
+			$a[Caster::PREFIX_PROTECTED.'file'] = new LinkStub($a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line']);
+		}
 
-        $ltrim = 0;
-        while (' ' === $src[0][$ltrim] || "\t" === $src[0][$ltrim]) {
-            $i = $srcContext << 1;
-            while ($i > 0 && $src[0][$ltrim] === $src[$i][$ltrim]) {
-                --$i;
-            }
-            if ($i) {
-                break;
-            }
-            ++$ltrim;
-        }
-        if ($ltrim) {
-            foreach ($src as $i => $line) {
-                $src[$i] = substr($line, $ltrim);
-            }
-        }
+		return $a;
+	}
 
-        return implode('', $src);
-    }
+	private static function traceUnshift(&$trace, $class, $file, $line)
+	{
+		if (isset($trace[0]['file'], $trace[0]['line']) && $trace[0]['file'] === $file && $trace[0]['line'] === $line) {
+			return;
+		}
+		array_unshift($trace, array(
+			'function' => $class ? 'new '.$class : null,
+			'file' => $file,
+			'line' => $line,
+		));
+	}
+
+	private static function extractSource($srcLines, $line, $srcContext, $title, $lang, $file = null)
+	{
+		$srcLines = explode("\n", $srcLines);
+		$src = array();
+
+		for ($i = $line - 1 - $srcContext; $i <= $line - 1 + $srcContext; ++$i) {
+			$src[] = (isset($srcLines[$i]) ? $srcLines[$i] : '')."\n";
+		}
+
+		$srcLines = array();
+		$ltrim = 0;
+		do {
+			$pad = null;
+			for ($i = $srcContext << 1; $i >= 0; --$i) {
+				if (isset($src[$i][$ltrim]) && "\r" !== ($c = $src[$i][$ltrim]) && "\n" !== $c) {
+					if (null === $pad) {
+						$pad = $c;
+					}
+					if ((' ' !== $c && "\t" !== $c) || $pad !== $c) {
+						break;
+					}
+				}
+			}
+			++$ltrim;
+		} while (0 > $i && null !== $pad);
+
+		--$ltrim;
+
+		foreach ($src as $i => $c) {
+			if ($ltrim) {
+				$c = isset($c[$ltrim]) && "\r" !== $c[$ltrim] ? substr($c, $ltrim) : ltrim($c, " \t");
+			}
+			$c = substr($c, 0, -1);
+			if ($i !== $srcContext) {
+				$c = new ConstStub('default', $c);
+			} else {
+				$c = new ConstStub($c, $title);
+				if (null !== $file) {
+					$c->attr['file'] = $file;
+					$c->attr['line'] = $line;
+				}
+			}
+			$c->attr['lang'] = $lang;
+			$srcLines[sprintf("\0~%d\0", $i + $line - $srcContext)] = $c;
+		}
+
+		return new EnumStub($srcLines);
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Caster/LinkStub.php b/htdocs/includes/symfony/var-dumper/Caster/LinkStub.php
new file mode 100644
index 00000000000..d275379c2a9
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/LinkStub.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+/**
+ * Represents a file or a URL.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class LinkStub extends ConstStub
+{
+	public function __construct($label, $line = 0, $href = null)
+	{
+		$this->value = $label;
+
+		if (null === $href) {
+			$href = $label;
+		}
+		if (is_string($href)) {
+			if (0 === strpos($href, 'file://')) {
+				if ($href === $label) {
+					$label = substr($label, 7);
+				}
+				$href = substr($href, 7);
+			} elseif (false !== strpos($href, '://')) {
+				$this->attr['href'] = $href;
+
+				return;
+			}
+			if (file_exists($href)) {
+				if ($line) {
+					$this->attr['line'] = $line;
+				}
+				$this->attr['file'] = realpath($href) ?: $href;
+
+				if ($this->attr['file'] === $label && 3 < count($ellipsis = explode(DIRECTORY_SEPARATOR, $href))) {
+					$this->attr['ellipsis'] = 2 + strlen(implode(array_slice($ellipsis, -2)));
+				}
+			}
+		}
+	}
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/PdoCaster.php b/htdocs/includes/symfony/var-dumper/Caster/PdoCaster.php
index e60b9275fd8..782101a90a7 100644
--- a/htdocs/includes/symfony/var-dumper/Caster/PdoCaster.php
+++ b/htdocs/includes/symfony/var-dumper/Caster/PdoCaster.php
@@ -20,95 +20,101 @@ use Symfony\Component\VarDumper\Cloner\Stub;
  */
 class PdoCaster
 {
-    private static $pdoAttributes = array(
-        'CASE' => array(
-            \PDO::CASE_LOWER => 'LOWER',
-            \PDO::CASE_NATURAL => 'NATURAL',
-            \PDO::CASE_UPPER => 'UPPER',
-        ),
-        'ERRMODE' => array(
-            \PDO::ERRMODE_SILENT => 'SILENT',
-            \PDO::ERRMODE_WARNING => 'WARNING',
-            \PDO::ERRMODE_EXCEPTION => 'EXCEPTION',
-        ),
-        'TIMEOUT',
-        'PREFETCH',
-        'AUTOCOMMIT',
-        'PERSISTENT',
-        'DRIVER_NAME',
-        'SERVER_INFO',
-        'ORACLE_NULLS' => array(
-            \PDO::NULL_NATURAL => 'NATURAL',
-            \PDO::NULL_EMPTY_STRING => 'EMPTY_STRING',
-            \PDO::NULL_TO_STRING => 'TO_STRING',
-        ),
-        'CLIENT_VERSION',
-        'SERVER_VERSION',
-        'STATEMENT_CLASS',
-        'EMULATE_PREPARES',
-        'CONNECTION_STATUS',
-        'STRINGIFY_FETCHES',
-        'DEFAULT_FETCH_MODE' => array(
-            \PDO::FETCH_ASSOC => 'ASSOC',
-            \PDO::FETCH_BOTH => 'BOTH',
-            \PDO::FETCH_LAZY => 'LAZY',
-            \PDO::FETCH_NUM => 'NUM',
-            \PDO::FETCH_OBJ => 'OBJ',
-        ),
-    );
+	private static $pdoAttributes = array(
+		'CASE' => array(
+			\PDO::CASE_LOWER => 'LOWER',
+			\PDO::CASE_NATURAL => 'NATURAL',
+			\PDO::CASE_UPPER => 'UPPER',
+		),
+		'ERRMODE' => array(
+			\PDO::ERRMODE_SILENT => 'SILENT',
+			\PDO::ERRMODE_WARNING => 'WARNING',
+			\PDO::ERRMODE_EXCEPTION => 'EXCEPTION',
+		),
+		'TIMEOUT',
+		'PREFETCH',
+		'AUTOCOMMIT',
+		'PERSISTENT',
+		'DRIVER_NAME',
+		'SERVER_INFO',
+		'ORACLE_NULLS' => array(
+			\PDO::NULL_NATURAL => 'NATURAL',
+			\PDO::NULL_EMPTY_STRING => 'EMPTY_STRING',
+			\PDO::NULL_TO_STRING => 'TO_STRING',
+		),
+		'CLIENT_VERSION',
+		'SERVER_VERSION',
+		'STATEMENT_CLASS',
+		'EMULATE_PREPARES',
+		'CONNECTION_STATUS',
+		'STRINGIFY_FETCHES',
+		'DEFAULT_FETCH_MODE' => array(
+			\PDO::FETCH_ASSOC => 'ASSOC',
+			\PDO::FETCH_BOTH => 'BOTH',
+			\PDO::FETCH_LAZY => 'LAZY',
+			\PDO::FETCH_NUM => 'NUM',
+			\PDO::FETCH_OBJ => 'OBJ',
+		),
+	);
 
-    public static function castPdo(\PDO $c, array $a, Stub $stub, $isNested)
-    {
-        $attr = array();
-        $errmode = $c->getAttribute(\PDO::ATTR_ERRMODE);
-        $c->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+	public static function castPdo(\PDO $c, array $a, Stub $stub, $isNested)
+	{
+		$attr = array();
+		$errmode = $c->getAttribute(\PDO::ATTR_ERRMODE);
+		$c->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
 
-        foreach (self::$pdoAttributes as $k => $v) {
-            if (!isset($k[0])) {
-                $k = $v;
-                $v = array();
-            }
+		foreach (self::$pdoAttributes as $k => $v) {
+			if (!isset($k[0])) {
+				$k = $v;
+				$v = array();
+			}
 
-            try {
-                $attr[$k] = 'ERRMODE' === $k ? $errmode : $c->getAttribute(constant('PDO::ATTR_'.$k));
-                if ($v && isset($v[$attr[$k]])) {
-                    $attr[$k] = new ConstStub($v[$attr[$k]], $attr[$k]);
-                }
-            } catch (\Exception $e) {
-            }
-        }
+			try {
+				$attr[$k] = 'ERRMODE' === $k ? $errmode : $c->getAttribute(constant('PDO::ATTR_'.$k));
+				if ($v && isset($v[$attr[$k]])) {
+					$attr[$k] = new ConstStub($v[$attr[$k]], $attr[$k]);
+				}
+			} catch (\Exception $e) {
+			}
+		}
+		if (isset($attr[$k = 'STATEMENT_CLASS'][1])) {
+			if ($attr[$k][1]) {
+				$attr[$k][1] = new ArgsStub($attr[$k][1], '__construct', $attr[$k][0]);
+			}
+			$attr[$k][0] = new ClassStub($attr[$k][0]);
+		}
 
-        $prefix = Caster::PREFIX_VIRTUAL;
-        $a += array(
-            $prefix.'inTransaction' => method_exists($c, 'inTransaction'),
-            $prefix.'errorInfo' => $c->errorInfo(),
-            $prefix.'attributes' => new EnumStub($attr),
-        );
+		$prefix = Caster::PREFIX_VIRTUAL;
+		$a += array(
+			$prefix.'inTransaction' => method_exists($c, 'inTransaction'),
+			$prefix.'errorInfo' => $c->errorInfo(),
+			$prefix.'attributes' => new EnumStub($attr),
+		);
 
-        if ($a[$prefix.'inTransaction']) {
-            $a[$prefix.'inTransaction'] = $c->inTransaction();
-        } else {
-            unset($a[$prefix.'inTransaction']);
-        }
+		if ($a[$prefix.'inTransaction']) {
+			$a[$prefix.'inTransaction'] = $c->inTransaction();
+		} else {
+			unset($a[$prefix.'inTransaction']);
+		}
 
-        if (!isset($a[$prefix.'errorInfo'][1], $a[$prefix.'errorInfo'][2])) {
-            unset($a[$prefix.'errorInfo']);
-        }
+		if (!isset($a[$prefix.'errorInfo'][1], $a[$prefix.'errorInfo'][2])) {
+			unset($a[$prefix.'errorInfo']);
+		}
 
-        $c->setAttribute(\PDO::ATTR_ERRMODE, $errmode);
+		$c->setAttribute(\PDO::ATTR_ERRMODE, $errmode);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castPdoStatement(\PDOStatement $c, array $a, Stub $stub, $isNested)
-    {
-        $prefix = Caster::PREFIX_VIRTUAL;
-        $a[$prefix.'errorInfo'] = $c->errorInfo();
+	public static function castPdoStatement(\PDOStatement $c, array $a, Stub $stub, $isNested)
+	{
+		$prefix = Caster::PREFIX_VIRTUAL;
+		$a[$prefix.'errorInfo'] = $c->errorInfo();
 
-        if (!isset($a[$prefix.'errorInfo'][1], $a[$prefix.'errorInfo'][2])) {
-            unset($a[$prefix.'errorInfo']);
-        }
+		if (!isset($a[$prefix.'errorInfo'][1], $a[$prefix.'errorInfo'][2])) {
+			unset($a[$prefix.'errorInfo']);
+		}
 
-        return $a;
-    }
+		return $a;
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Caster/RedisCaster.php b/htdocs/includes/symfony/var-dumper/Caster/RedisCaster.php
new file mode 100644
index 00000000000..b0e567fcf96
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/RedisCaster.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Casts Redis class from ext-redis to array representation.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class RedisCaster
+{
+	private static $serializer = array(
+		\Redis::SERIALIZER_NONE => 'NONE',
+		\Redis::SERIALIZER_PHP => 'PHP',
+		2 => 'IGBINARY', // Optional Redis::SERIALIZER_IGBINARY
+	);
+
+	public static function castRedis(\Redis $c, array $a, Stub $stub, $isNested)
+	{
+		$prefix = Caster::PREFIX_VIRTUAL;
+
+		if (defined('HHVM_VERSION_ID')) {
+			if (isset($a[Caster::PREFIX_PROTECTED.'serializer'])) {
+				$ser = $a[Caster::PREFIX_PROTECTED.'serializer'];
+				$a[Caster::PREFIX_PROTECTED.'serializer'] = isset(self::$serializer[$ser]) ? new ConstStub(self::$serializer[$ser], $ser) : $ser;
+			}
+
+			return $a;
+		}
+
+		if (!$connected = $c->isConnected()) {
+			return $a + array(
+				$prefix.'isConnected' => $connected,
+			);
+		}
+
+		$ser = $c->getOption(\Redis::OPT_SERIALIZER);
+		$retry = defined('Redis::OPT_SCAN') ? $c->getOption(\Redis::OPT_SCAN) : 0;
+
+		return $a + array(
+			$prefix.'isConnected' => $connected,
+			$prefix.'host' => $c->getHost(),
+			$prefix.'port' => $c->getPort(),
+			$prefix.'auth' => $c->getAuth(),
+			$prefix.'dbNum' => $c->getDbNum(),
+			$prefix.'timeout' => $c->getTimeout(),
+			$prefix.'persistentId' => $c->getPersistentID(),
+			$prefix.'options' => new EnumStub(array(
+				'READ_TIMEOUT' => $c->getOption(\Redis::OPT_READ_TIMEOUT),
+				'SERIALIZER' => isset(self::$serializer[$ser]) ? new ConstStub(self::$serializer[$ser], $ser) : $ser,
+				'PREFIX' => $c->getOption(\Redis::OPT_PREFIX),
+				'SCAN' => new ConstStub($retry ? 'RETRY' : 'NORETRY', $retry),
+			)),
+		);
+	}
+
+	public static function castRedisArray(\RedisArray $c, array $a, Stub $stub, $isNested)
+	{
+		$prefix = Caster::PREFIX_VIRTUAL;
+
+		return $a + array(
+			$prefix.'hosts' => $c->_hosts(),
+			$prefix.'function' => ClassStub::wrapCallable($c->_function()),
+		);
+	}
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/ReflectionCaster.php b/htdocs/includes/symfony/var-dumper/Caster/ReflectionCaster.php
index 936e11982ee..6a53bd2b61b 100644
--- a/htdocs/includes/symfony/var-dumper/Caster/ReflectionCaster.php
+++ b/htdocs/includes/symfony/var-dumper/Caster/ReflectionCaster.php
@@ -20,291 +20,313 @@ use Symfony\Component\VarDumper\Cloner\Stub;
  */
 class ReflectionCaster
 {
-    private static $extraMap = array(
-        'docComment' => 'getDocComment',
-        'extension' => 'getExtensionName',
-        'isDisabled' => 'isDisabled',
-        'isDeprecated' => 'isDeprecated',
-        'isInternal' => 'isInternal',
-        'isUserDefined' => 'isUserDefined',
-        'isGenerator' => 'isGenerator',
-        'isVariadic' => 'isVariadic',
-    );
+	private static $extraMap = array(
+		'docComment' => 'getDocComment',
+		'extension' => 'getExtensionName',
+		'isDisabled' => 'isDisabled',
+		'isDeprecated' => 'isDeprecated',
+		'isInternal' => 'isInternal',
+		'isUserDefined' => 'isUserDefined',
+		'isGenerator' => 'isGenerator',
+		'isVariadic' => 'isVariadic',
+	);
 
-    public static function castClosure(\Closure $c, array $a, Stub $stub, $isNested)
-    {
-        $prefix = Caster::PREFIX_VIRTUAL;
-        $c = new \ReflectionFunction($c);
+	public static function castClosure(\Closure $c, array $a, Stub $stub, $isNested)
+	{
+		$prefix = Caster::PREFIX_VIRTUAL;
+		$c = new \ReflectionFunction($c);
 
-        $stub->class = 'Closure'; // HHVM generates unique class names for closures
-        $a = static::castFunctionAbstract($c, $a, $stub, $isNested);
+		$stub->class = 'Closure'; // HHVM generates unique class names for closures
+		$a = static::castFunctionAbstract($c, $a, $stub, $isNested);
 
-        if (isset($a[$prefix.'parameters'])) {
-            foreach ($a[$prefix.'parameters']->value as &$v) {
-                $param = $v;
-                $v = new EnumStub(array());
-                foreach (static::castParameter($param, array(), $stub, true) as $k => $param) {
-                    if ("\0" === $k[0]) {
-                        $v->value[substr($k, 3)] = $param;
-                    }
-                }
-                unset($v->value['position'], $v->value['isVariadic'], $v->value['byReference'], $v);
-            }
-        }
+		if (isset($a[$prefix.'parameters'])) {
+			foreach ($a[$prefix.'parameters']->value as &$v) {
+				$param = $v;
+				$v = new EnumStub(array());
+				foreach (static::castParameter($param, array(), $stub, true) as $k => $param) {
+					if ("\0" === $k[0]) {
+						$v->value[substr($k, 3)] = $param;
+					}
+				}
+				unset($v->value['position'], $v->value['isVariadic'], $v->value['byReference'], $v);
+			}
+		}
 
-        if ($f = $c->getFileName()) {
-            $a[$prefix.'file'] = $f;
-            $a[$prefix.'line'] = $c->getStartLine().' to '.$c->getEndLine();
-        }
+		if ($f = $c->getFileName()) {
+			$a[$prefix.'file'] = new LinkStub($f, $c->getStartLine());
+			$a[$prefix.'line'] = $c->getStartLine().' to '.$c->getEndLine();
+		}
 
-        $prefix = Caster::PREFIX_DYNAMIC;
-        unset($a['name'], $a[$prefix.'0'], $a[$prefix.'this'], $a[$prefix.'parameter'], $a[Caster::PREFIX_VIRTUAL.'extra']);
+		$prefix = Caster::PREFIX_DYNAMIC;
+		unset($a['name'], $a[$prefix.'this'], $a[$prefix.'parameter'], $a[Caster::PREFIX_VIRTUAL.'extra']);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castGenerator(\Generator $c, array $a, Stub $stub, $isNested)
-    {
-        return class_exists('ReflectionGenerator', false) ? self::castReflectionGenerator(new \ReflectionGenerator($c), $a, $stub, $isNested) : $a;
-    }
+	public static function castGenerator(\Generator $c, array $a, Stub $stub, $isNested)
+	{
+		if (!class_exists('ReflectionGenerator', false)) {
+			return $a;
+		}
 
-    public static function castType(\ReflectionType $c, array $a, Stub $stub, $isNested)
-    {
-        $prefix = Caster::PREFIX_VIRTUAL;
+		// Cannot create ReflectionGenerator based on a terminated Generator
+		try {
+			$reflectionGenerator = new \ReflectionGenerator($c);
+		} catch (\Exception $e) {
+			$a[Caster::PREFIX_VIRTUAL.'closed'] = true;
 
-        $a += array(
-            $prefix.'type' => $c->__toString(),
-            $prefix.'allowsNull' => $c->allowsNull(),
-            $prefix.'isBuiltin' => $c->isBuiltin(),
-        );
+			return $a;
+		}
 
-        return $a;
-    }
+		return self::castReflectionGenerator($reflectionGenerator, $a, $stub, $isNested);
+	}
 
-    public static function castReflectionGenerator(\ReflectionGenerator $c, array $a, Stub $stub, $isNested)
-    {
-        $prefix = Caster::PREFIX_VIRTUAL;
+	public static function castType(\ReflectionType $c, array $a, Stub $stub, $isNested)
+	{
+		$prefix = Caster::PREFIX_VIRTUAL;
 
-        if ($c->getThis()) {
-            $a[$prefix.'this'] = new CutStub($c->getThis());
-        }
-        $x = $c->getFunction();
-        $frame = array(
-            'class' => isset($x->class) ? $x->class : null,
-            'type' => isset($x->class) ? ($x->isStatic() ? '::' : '->') : null,
-            'function' => $x->name,
-            'file' => $c->getExecutingFile(),
-            'line' => $c->getExecutingLine(),
-        );
-        if ($trace = $c->getTrace(DEBUG_BACKTRACE_IGNORE_ARGS)) {
-            $x = new \ReflectionGenerator($c->getExecutingGenerator());
-            array_unshift($trace, array(
-                'function' => 'yield',
-                'file' => $x->getExecutingFile(),
-                'line' => $x->getExecutingLine() - 1,
-            ));
-            $trace[] = $frame;
-            $a[$prefix.'trace'] = new TraceStub($trace, false, 0, -1, -1);
-        } else {
-            $x = new FrameStub($frame, false, true);
-            $x = ExceptionCaster::castFrameStub($x, array(), $x, true);
-            $a[$prefix.'executing'] = new EnumStub(array(
-                $frame['class'].$frame['type'].$frame['function'].'()' => $x[$prefix.'src'],
-            ));
-        }
+		$a += array(
+			$prefix.'name' => $c instanceof \ReflectionNamedType ? $c->getName() : $c->__toString(),
+			$prefix.'allowsNull' => $c->allowsNull(),
+			$prefix.'isBuiltin' => $c->isBuiltin(),
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castClass(\ReflectionClass $c, array $a, Stub $stub, $isNested, $filter = 0)
-    {
-        $prefix = Caster::PREFIX_VIRTUAL;
+	public static function castReflectionGenerator(\ReflectionGenerator $c, array $a, Stub $stub, $isNested)
+	{
+		$prefix = Caster::PREFIX_VIRTUAL;
 
-        if ($n = \Reflection::getModifierNames($c->getModifiers())) {
-            $a[$prefix.'modifiers'] = implode(' ', $n);
-        }
+		if ($c->getThis()) {
+			$a[$prefix.'this'] = new CutStub($c->getThis());
+		}
+		$function = $c->getFunction();
+		$frame = array(
+			'class' => isset($function->class) ? $function->class : null,
+			'type' => isset($function->class) ? ($function->isStatic() ? '::' : '->') : null,
+			'function' => $function->name,
+			'file' => $c->getExecutingFile(),
+			'line' => $c->getExecutingLine(),
+		);
+		if ($trace = $c->getTrace(DEBUG_BACKTRACE_IGNORE_ARGS)) {
+			$function = new \ReflectionGenerator($c->getExecutingGenerator());
+			array_unshift($trace, array(
+				'function' => 'yield',
+				'file' => $function->getExecutingFile(),
+				'line' => $function->getExecutingLine() - 1,
+			));
+			$trace[] = $frame;
+			$a[$prefix.'trace'] = new TraceStub($trace, false, 0, -1, -1);
+		} else {
+			$function = new FrameStub($frame, false, true);
+			$function = ExceptionCaster::castFrameStub($function, array(), $function, true);
+			$a[$prefix.'executing'] = new EnumStub(array(
+				$frame['class'].$frame['type'].$frame['function'].'()' => $function[$prefix.'src'],
+			));
+		}
 
-        self::addMap($a, $c, array(
-            'extends' => 'getParentClass',
-            'implements' => 'getInterfaceNames',
-            'constants' => 'getConstants',
-        ));
+		$a[Caster::PREFIX_VIRTUAL.'closed'] = false;
 
-        foreach ($c->getProperties() as $n) {
-            $a[$prefix.'properties'][$n->name] = $n;
-        }
+		return $a;
+	}
 
-        foreach ($c->getMethods() as $n) {
-            $a[$prefix.'methods'][$n->name] = $n;
-        }
+	public static function castClass(\ReflectionClass $c, array $a, Stub $stub, $isNested, $filter = 0)
+	{
+		$prefix = Caster::PREFIX_VIRTUAL;
 
-        if (!($filter & Caster::EXCLUDE_VERBOSE) && !$isNested) {
-            self::addExtra($a, $c);
-        }
+		if ($n = \Reflection::getModifierNames($c->getModifiers())) {
+			$a[$prefix.'modifiers'] = implode(' ', $n);
+		}
 
-        return $a;
-    }
+		self::addMap($a, $c, array(
+			'extends' => 'getParentClass',
+			'implements' => 'getInterfaceNames',
+			'constants' => 'getConstants',
+		));
 
-    public static function castFunctionAbstract(\ReflectionFunctionAbstract $c, array $a, Stub $stub, $isNested, $filter = 0)
-    {
-        $prefix = Caster::PREFIX_VIRTUAL;
+		foreach ($c->getProperties() as $n) {
+			$a[$prefix.'properties'][$n->name] = $n;
+		}
 
-        self::addMap($a, $c, array(
-            'returnsReference' => 'returnsReference',
-            'returnType' => 'getReturnType',
-            'class' => 'getClosureScopeClass',
-            'this' => 'getClosureThis',
-        ));
+		foreach ($c->getMethods() as $n) {
+			$a[$prefix.'methods'][$n->name] = $n;
+		}
 
-        if (isset($a[$prefix.'returnType'])) {
-            $a[$prefix.'returnType'] = (string) $a[$prefix.'returnType'];
-        }
-        if (isset($a[$prefix.'this'])) {
-            $a[$prefix.'this'] = new CutStub($a[$prefix.'this']);
-        }
+		if (!($filter & Caster::EXCLUDE_VERBOSE) && !$isNested) {
+			self::addExtra($a, $c);
+		}
 
-        foreach ($c->getParameters() as $v) {
-            $k = '$'.$v->name;
-            if ($v->isPassedByReference()) {
-                $k = '&'.$k;
-            }
-            if (method_exists($v, 'isVariadic') && $v->isVariadic()) {
-                $k = '...'.$k;
-            }
-            $a[$prefix.'parameters'][$k] = $v;
-        }
-        if (isset($a[$prefix.'parameters'])) {
-            $a[$prefix.'parameters'] = new EnumStub($a[$prefix.'parameters']);
-        }
+		return $a;
+	}
 
-        if ($v = $c->getStaticVariables()) {
-            foreach ($v as $k => &$v) {
-                $a[$prefix.'use']['$'.$k] = &$v;
-            }
-            unset($v);
-            $a[$prefix.'use'] = new EnumStub($a[$prefix.'use']);
-        }
+	public static function castFunctionAbstract(\ReflectionFunctionAbstract $c, array $a, Stub $stub, $isNested, $filter = 0)
+	{
+		$prefix = Caster::PREFIX_VIRTUAL;
 
-        if (!($filter & Caster::EXCLUDE_VERBOSE) && !$isNested) {
-            self::addExtra($a, $c);
-        }
+		self::addMap($a, $c, array(
+			'returnsReference' => 'returnsReference',
+			'returnType' => 'getReturnType',
+			'class' => 'getClosureScopeClass',
+			'this' => 'getClosureThis',
+		));
 
-        // Added by HHVM
-        unset($a[Caster::PREFIX_DYNAMIC.'static']);
+		if (isset($a[$prefix.'returnType'])) {
+			$v = $a[$prefix.'returnType'];
+			$v = $v instanceof \ReflectionNamedType ? $v->getName() : $v->__toString();
+			$a[$prefix.'returnType'] = new ClassStub($a[$prefix.'returnType']->allowsNull() ? '?'.$v : $v, array(class_exists($v, false) || interface_exists($v, false) || trait_exists($v, false) ? $v : '', ''));
+		}
+		if (isset($a[$prefix.'class'])) {
+			$a[$prefix.'class'] = new ClassStub($a[$prefix.'class']);
+		}
+		if (isset($a[$prefix.'this'])) {
+			$a[$prefix.'this'] = new CutStub($a[$prefix.'this']);
+		}
 
-        return $a;
-    }
+		foreach ($c->getParameters() as $v) {
+			$k = '$'.$v->name;
+			if (method_exists($v, 'isVariadic') && $v->isVariadic()) {
+				$k = '...'.$k;
+			}
+			if ($v->isPassedByReference()) {
+				$k = '&'.$k;
+			}
+			$a[$prefix.'parameters'][$k] = $v;
+		}
+		if (isset($a[$prefix.'parameters'])) {
+			$a[$prefix.'parameters'] = new EnumStub($a[$prefix.'parameters']);
+		}
 
-    public static function castMethod(\ReflectionMethod $c, array $a, Stub $stub, $isNested)
-    {
-        $a[Caster::PREFIX_VIRTUAL.'modifiers'] = implode(' ', \Reflection::getModifierNames($c->getModifiers()));
+		if ($v = $c->getStaticVariables()) {
+			foreach ($v as $k => &$v) {
+				$a[$prefix.'use']['$'.$k] = &$v;
+			}
+			unset($v);
+			$a[$prefix.'use'] = new EnumStub($a[$prefix.'use']);
+		}
 
-        return $a;
-    }
+		if (!($filter & Caster::EXCLUDE_VERBOSE) && !$isNested) {
+			self::addExtra($a, $c);
+		}
 
-    public static function castParameter(\ReflectionParameter $c, array $a, Stub $stub, $isNested)
-    {
-        $prefix = Caster::PREFIX_VIRTUAL;
+		// Added by HHVM
+		unset($a[Caster::PREFIX_DYNAMIC.'static']);
 
-        // Added by HHVM
-        unset($a['info']);
+		return $a;
+	}
 
-        self::addMap($a, $c, array(
-            'position' => 'getPosition',
-            'isVariadic' => 'isVariadic',
-            'byReference' => 'isPassedByReference',
-        ));
+	public static function castMethod(\ReflectionMethod $c, array $a, Stub $stub, $isNested)
+	{
+		$a[Caster::PREFIX_VIRTUAL.'modifiers'] = implode(' ', \Reflection::getModifierNames($c->getModifiers()));
 
-        try {
-            if (method_exists($c, 'hasType')) {
-                if ($c->hasType()) {
-                    $a[$prefix.'typeHint'] = $c->getType()->__toString();
-                }
-            } elseif ($c->isArray()) {
-                $a[$prefix.'typeHint'] = 'array';
-            } elseif (method_exists($c, 'isCallable') && $c->isCallable()) {
-                $a[$prefix.'typeHint'] = 'callable';
-            } elseif ($v = $c->getClass()) {
-                $a[$prefix.'typeHint'] = $v->name;
-            }
-        } catch (\ReflectionException $e) {
-            if (preg_match('/^Class ([^ ]++) does not exist$/', $e->getMessage(), $m)) {
-                $a[$prefix.'typeHint'] = $m[1];
-            }
-        }
+		return $a;
+	}
 
-        try {
-            $a[$prefix.'default'] = $v = $c->getDefaultValue();
-            if (method_exists($c, 'isDefaultValueConstant') && $c->isDefaultValueConstant()) {
-                $a[$prefix.'default'] = new ConstStub($c->getDefaultValueConstantName(), $v);
-            }
-        } catch (\ReflectionException $e) {
-            if (isset($a[$prefix.'typeHint']) && $c->allowsNull()) {
-                $a[$prefix.'default'] = null;
-            }
-        }
+	public static function castParameter(\ReflectionParameter $c, array $a, Stub $stub, $isNested)
+	{
+		$prefix = Caster::PREFIX_VIRTUAL;
 
-        return $a;
-    }
+		// Added by HHVM
+		unset($a['info']);
 
-    public static function castProperty(\ReflectionProperty $c, array $a, Stub $stub, $isNested)
-    {
-        $a[Caster::PREFIX_VIRTUAL.'modifiers'] = implode(' ', \Reflection::getModifierNames($c->getModifiers()));
-        self::addExtra($a, $c);
+		self::addMap($a, $c, array(
+			'position' => 'getPosition',
+			'isVariadic' => 'isVariadic',
+			'byReference' => 'isPassedByReference',
+			'allowsNull' => 'allowsNull',
+		));
 
-        return $a;
-    }
+		if (method_exists($c, 'getType')) {
+			if ($v = $c->getType()) {
+				$a[$prefix.'typeHint'] = $v instanceof \ReflectionNamedType ? $v->getName() : $v->__toString();
+			}
+		} elseif (preg_match('/^(?:[^ ]++ ){4}([a-zA-Z_\x7F-\xFF][^ ]++)/', $c, $v)) {
+			$a[$prefix.'typeHint'] = $v[1];
+		}
 
-    public static function castExtension(\ReflectionExtension $c, array $a, Stub $stub, $isNested)
-    {
-        self::addMap($a, $c, array(
-            'version' => 'getVersion',
-            'dependencies' => 'getDependencies',
-            'iniEntries' => 'getIniEntries',
-            'isPersistent' => 'isPersistent',
-            'isTemporary' => 'isTemporary',
-            'constants' => 'getConstants',
-            'functions' => 'getFunctions',
-            'classes' => 'getClasses',
-        ));
+		if (isset($a[$prefix.'typeHint'])) {
+			$v = $a[$prefix.'typeHint'];
+			$a[$prefix.'typeHint'] = new ClassStub($v, array(class_exists($v, false) || interface_exists($v, false) || trait_exists($v, false) ? $v : '', ''));
+		} else {
+			unset($a[$prefix.'allowsNull']);
+		}
 
-        return $a;
-    }
+		try {
+			$a[$prefix.'default'] = $v = $c->getDefaultValue();
+			if (method_exists($c, 'isDefaultValueConstant') && $c->isDefaultValueConstant()) {
+				$a[$prefix.'default'] = new ConstStub($c->getDefaultValueConstantName(), $v);
+			}
+			if (null === $v) {
+				unset($a[$prefix.'allowsNull']);
+			}
+		} catch (\ReflectionException $e) {
+			if (isset($a[$prefix.'typeHint']) && $c->allowsNull() && !class_exists('ReflectionNamedType', false)) {
+				$a[$prefix.'default'] = null;
+				unset($a[$prefix.'allowsNull']);
+			}
+		}
 
-    public static function castZendExtension(\ReflectionZendExtension $c, array $a, Stub $stub, $isNested)
-    {
-        self::addMap($a, $c, array(
-            'version' => 'getVersion',
-            'author' => 'getAuthor',
-            'copyright' => 'getCopyright',
-            'url' => 'getURL',
-        ));
+		return $a;
+	}
 
-        return $a;
-    }
+	public static function castProperty(\ReflectionProperty $c, array $a, Stub $stub, $isNested)
+	{
+		$a[Caster::PREFIX_VIRTUAL.'modifiers'] = implode(' ', \Reflection::getModifierNames($c->getModifiers()));
+		self::addExtra($a, $c);
 
-    private static function addExtra(&$a, \Reflector $c)
-    {
-        $x = isset($a[Caster::PREFIX_VIRTUAL.'extra']) ? $a[Caster::PREFIX_VIRTUAL.'extra']->value : array();
+		return $a;
+	}
 
-        if (method_exists($c, 'getFileName') && $m = $c->getFileName()) {
-            $x['file'] = $m;
-            $x['line'] = $c->getStartLine().' to '.$c->getEndLine();
-        }
+	public static function castExtension(\ReflectionExtension $c, array $a, Stub $stub, $isNested)
+	{
+		self::addMap($a, $c, array(
+			'version' => 'getVersion',
+			'dependencies' => 'getDependencies',
+			'iniEntries' => 'getIniEntries',
+			'isPersistent' => 'isPersistent',
+			'isTemporary' => 'isTemporary',
+			'constants' => 'getConstants',
+			'functions' => 'getFunctions',
+			'classes' => 'getClasses',
+		));
 
-        self::addMap($x, $c, self::$extraMap, '');
+		return $a;
+	}
 
-        if ($x) {
-            $a[Caster::PREFIX_VIRTUAL.'extra'] = new EnumStub($x);
-        }
-    }
+	public static function castZendExtension(\ReflectionZendExtension $c, array $a, Stub $stub, $isNested)
+	{
+		self::addMap($a, $c, array(
+			'version' => 'getVersion',
+			'author' => 'getAuthor',
+			'copyright' => 'getCopyright',
+			'url' => 'getURL',
+		));
 
-    private static function addMap(&$a, \Reflector $c, $map, $prefix = Caster::PREFIX_VIRTUAL)
-    {
-        foreach ($map as $k => $m) {
-            if (method_exists($c, $m) && false !== ($m = $c->$m()) && null !== $m) {
-                $a[$prefix.$k] = $m instanceof \Reflector ? $m->name : $m;
-            }
-        }
-    }
+		return $a;
+	}
+
+	private static function addExtra(&$a, \Reflector $c)
+	{
+		$x = isset($a[Caster::PREFIX_VIRTUAL.'extra']) ? $a[Caster::PREFIX_VIRTUAL.'extra']->value : array();
+
+		if (method_exists($c, 'getFileName') && $m = $c->getFileName()) {
+			$x['file'] = new LinkStub($m, $c->getStartLine());
+			$x['line'] = $c->getStartLine().' to '.$c->getEndLine();
+		}
+
+		self::addMap($x, $c, self::$extraMap, '');
+
+		if ($x) {
+			$a[Caster::PREFIX_VIRTUAL.'extra'] = new EnumStub($x);
+		}
+	}
+
+	private static function addMap(&$a, \Reflector $c, $map, $prefix = Caster::PREFIX_VIRTUAL)
+	{
+		foreach ($map as $k => $m) {
+			if (method_exists($c, $m) && false !== ($m = $c->$m()) && null !== $m) {
+				$a[$prefix.$k] = $m instanceof \Reflector ? $m->name : $m;
+			}
+		}
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Caster/ResourceCaster.php b/htdocs/includes/symfony/var-dumper/Caster/ResourceCaster.php
index 903641f69c6..0b189d4d9b5 100644
--- a/htdocs/includes/symfony/var-dumper/Caster/ResourceCaster.php
+++ b/htdocs/includes/symfony/var-dumper/Caster/ResourceCaster.php
@@ -20,48 +20,53 @@ use Symfony\Component\VarDumper\Cloner\Stub;
  */
 class ResourceCaster
 {
-    public static function castCurl($h, array $a, Stub $stub, $isNested)
-    {
-        return curl_getinfo($h);
-    }
+	public static function castCurl($h, array $a, Stub $stub, $isNested)
+	{
+		return curl_getinfo($h);
+	}
 
-    public static function castDba($dba, array $a, Stub $stub, $isNested)
-    {
-        $list = dba_list();
-        $a['file'] = $list[(int) $dba];
+	public static function castDba($dba, array $a, Stub $stub, $isNested)
+	{
+		$list = dba_list();
+		$a['file'] = $list[(int) $dba];
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castProcess($process, array $a, Stub $stub, $isNested)
-    {
-        return proc_get_status($process);
-    }
+	public static function castProcess($process, array $a, Stub $stub, $isNested)
+	{
+		return proc_get_status($process);
+	}
 
-    public static function castStream($stream, array $a, Stub $stub, $isNested)
-    {
-        return stream_get_meta_data($stream) + static::castStreamContext($stream, $a, $stub, $isNested);
-    }
+	public static function castStream($stream, array $a, Stub $stub, $isNested)
+	{
+		$a = stream_get_meta_data($stream) + static::castStreamContext($stream, $a, $stub, $isNested);
+		if (isset($a['uri'])) {
+			$a['uri'] = new LinkStub($a['uri']);
+		}
 
-    public static function castStreamContext($stream, array $a, Stub $stub, $isNested)
-    {
-        return stream_context_get_params($stream);
-    }
+		return $a;
+	}
 
-    public static function castGd($gd, array $a, Stub $stub, $isNested)
-    {
-        $a['size'] = imagesx($gd).'x'.imagesy($gd);
-        $a['trueColor'] = imageistruecolor($gd);
+	public static function castStreamContext($stream, array $a, Stub $stub, $isNested)
+	{
+		return @stream_context_get_params($stream) ?: $a;
+	}
 
-        return $a;
-    }
+	public static function castGd($gd, array $a, Stub $stub, $isNested)
+	{
+		$a['size'] = imagesx($gd).'x'.imagesy($gd);
+		$a['trueColor'] = imageistruecolor($gd);
 
-    public static function castMysqlLink($h, array $a, Stub $stub, $isNested)
-    {
-        $a['host'] = mysql_get_host_info($h);
-        $a['protocol'] = mysql_get_proto_info($h);
-        $a['server'] = mysql_get_server_info($h);
+		return $a;
+	}
 
-        return $a;
-    }
+	public static function castMysqlLink($h, array $a, Stub $stub, $isNested)
+	{
+		$a['host'] = mysql_get_host_info($h);
+		$a['protocol'] = mysql_get_proto_info($h);
+		$a['server'] = mysql_get_server_info($h);
+
+		return $a;
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Caster/SplCaster.php b/htdocs/includes/symfony/var-dumper/Caster/SplCaster.php
index 97f21463821..176e7f2ae48 100644
--- a/htdocs/includes/symfony/var-dumper/Caster/SplCaster.php
+++ b/htdocs/includes/symfony/var-dumper/Caster/SplCaster.php
@@ -20,184 +20,188 @@ use Symfony\Component\VarDumper\Cloner\Stub;
  */
 class SplCaster
 {
-    private static $splFileObjectFlags = array(
-        \SplFileObject::DROP_NEW_LINE => 'DROP_NEW_LINE',
-        \SplFileObject::READ_AHEAD => 'READ_AHEAD',
-        \SplFileObject::SKIP_EMPTY => 'SKIP_EMPTY',
-        \SplFileObject::READ_CSV => 'READ_CSV',
-    );
+	private static $splFileObjectFlags = array(
+		\SplFileObject::DROP_NEW_LINE => 'DROP_NEW_LINE',
+		\SplFileObject::READ_AHEAD => 'READ_AHEAD',
+		\SplFileObject::SKIP_EMPTY => 'SKIP_EMPTY',
+		\SplFileObject::READ_CSV => 'READ_CSV',
+	);
 
-    public static function castArrayObject(\ArrayObject $c, array $a, Stub $stub, $isNested)
-    {
-        $prefix = Caster::PREFIX_VIRTUAL;
-        $class = $stub->class;
-        $flags = $c->getFlags();
+	public static function castArrayObject(\ArrayObject $c, array $a, Stub $stub, $isNested)
+	{
+		$prefix = Caster::PREFIX_VIRTUAL;
+		$class = $stub->class;
+		$flags = $c->getFlags();
 
-        $b = array(
-            $prefix.'flag::STD_PROP_LIST' => (bool) ($flags & \ArrayObject::STD_PROP_LIST),
-            $prefix.'flag::ARRAY_AS_PROPS' => (bool) ($flags & \ArrayObject::ARRAY_AS_PROPS),
-            $prefix.'iteratorClass' => $c->getIteratorClass(),
-            $prefix.'storage' => $c->getArrayCopy(),
-        );
+		$b = array(
+			$prefix.'flag::STD_PROP_LIST' => (bool) ($flags & \ArrayObject::STD_PROP_LIST),
+			$prefix.'flag::ARRAY_AS_PROPS' => (bool) ($flags & \ArrayObject::ARRAY_AS_PROPS),
+			$prefix.'iteratorClass' => new ClassStub($c->getIteratorClass()),
+			$prefix.'storage' => $c->getArrayCopy(),
+		);
 
-        if ($class === 'ArrayObject') {
-            $a = $b;
-        } else {
-            if (!($flags & \ArrayObject::STD_PROP_LIST)) {
-                $c->setFlags(\ArrayObject::STD_PROP_LIST);
-                $a = Caster::castObject($c, new \ReflectionClass($class));
-                $c->setFlags($flags);
-            }
+		if ($class === 'ArrayObject') {
+			$a = $b;
+		} else {
+			if (!($flags & \ArrayObject::STD_PROP_LIST)) {
+				$c->setFlags(\ArrayObject::STD_PROP_LIST);
+				$a = Caster::castObject($c, new \ReflectionClass($class));
+				$c->setFlags($flags);
+			}
 
-            $a += $b;
-        }
+			$a += $b;
+		}
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castHeap(\Iterator $c, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            Caster::PREFIX_VIRTUAL.'heap' => iterator_to_array(clone $c),
-        );
+	public static function castHeap(\Iterator $c, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			Caster::PREFIX_VIRTUAL.'heap' => iterator_to_array(clone $c),
+		);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castDoublyLinkedList(\SplDoublyLinkedList $c, array $a, Stub $stub, $isNested)
-    {
-        $prefix = Caster::PREFIX_VIRTUAL;
-        $mode = $c->getIteratorMode();
-        $c->setIteratorMode(\SplDoublyLinkedList::IT_MODE_KEEP | $mode & ~\SplDoublyLinkedList::IT_MODE_DELETE);
+	public static function castDoublyLinkedList(\SplDoublyLinkedList $c, array $a, Stub $stub, $isNested)
+	{
+		$prefix = Caster::PREFIX_VIRTUAL;
+		$mode = $c->getIteratorMode();
+		$c->setIteratorMode(\SplDoublyLinkedList::IT_MODE_KEEP | $mode & ~\SplDoublyLinkedList::IT_MODE_DELETE);
 
-        $a += array(
-            $prefix.'mode' => new ConstStub((($mode & \SplDoublyLinkedList::IT_MODE_LIFO) ? 'IT_MODE_LIFO' : 'IT_MODE_FIFO').' | '.(($mode & \SplDoublyLinkedList::IT_MODE_KEEP) ? 'IT_MODE_KEEP' : 'IT_MODE_DELETE'), $mode),
-            $prefix.'dllist' => iterator_to_array($c),
-        );
-        $c->setIteratorMode($mode);
+		$a += array(
+			$prefix.'mode' => new ConstStub((($mode & \SplDoublyLinkedList::IT_MODE_LIFO) ? 'IT_MODE_LIFO' : 'IT_MODE_FIFO').' | '.(($mode & \SplDoublyLinkedList::IT_MODE_DELETE) ? 'IT_MODE_DELETE' : 'IT_MODE_KEEP'), $mode),
+			$prefix.'dllist' => iterator_to_array($c),
+		);
+		$c->setIteratorMode($mode);
 
-        return $a;
-    }
+		return $a;
+	}
 
-    public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, $isNested)
-    {
-        static $map = array(
-            'path' => 'getPath',
-            'filename' => 'getFilename',
-            'basename' => 'getBasename',
-            'pathname' => 'getPathname',
-            'extension' => 'getExtension',
-            'realPath' => 'getRealPath',
-            'aTime' => 'getATime',
-            'mTime' => 'getMTime',
-            'cTime' => 'getCTime',
-            'inode' => 'getInode',
-            'size' => 'getSize',
-            'perms' => 'getPerms',
-            'owner' => 'getOwner',
-            'group' => 'getGroup',
-            'type' => 'getType',
-            'writable' => 'isWritable',
-            'readable' => 'isReadable',
-            'executable' => 'isExecutable',
-            'file' => 'isFile',
-            'dir' => 'isDir',
-            'link' => 'isLink',
-            'linkTarget' => 'getLinkTarget',
-        );
+	public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, $isNested)
+	{
+		static $map = array(
+			'path' => 'getPath',
+			'filename' => 'getFilename',
+			'basename' => 'getBasename',
+			'pathname' => 'getPathname',
+			'extension' => 'getExtension',
+			'realPath' => 'getRealPath',
+			'aTime' => 'getATime',
+			'mTime' => 'getMTime',
+			'cTime' => 'getCTime',
+			'inode' => 'getInode',
+			'size' => 'getSize',
+			'perms' => 'getPerms',
+			'owner' => 'getOwner',
+			'group' => 'getGroup',
+			'type' => 'getType',
+			'writable' => 'isWritable',
+			'readable' => 'isReadable',
+			'executable' => 'isExecutable',
+			'file' => 'isFile',
+			'dir' => 'isDir',
+			'link' => 'isLink',
+			'linkTarget' => 'getLinkTarget',
+		);
 
-        $prefix = Caster::PREFIX_VIRTUAL;
+		$prefix = Caster::PREFIX_VIRTUAL;
 
-        foreach ($map as $key => $accessor) {
-            try {
-                $a[$prefix.$key] = $c->$accessor();
-            } catch (\Exception $e) {
-            }
-        }
+		foreach ($map as $key => $accessor) {
+			try {
+				$a[$prefix.$key] = $c->$accessor();
+			} catch (\Exception $e) {
+			}
+		}
 
-        if (isset($a[$prefix.'perms'])) {
-            $a[$prefix.'perms'] = new ConstStub(sprintf('0%o', $a[$prefix.'perms']), $a[$prefix.'perms']);
-        }
+		if (isset($a[$prefix.'realPath'])) {
+			$a[$prefix.'realPath'] = new LinkStub($a[$prefix.'realPath']);
+		}
 
-        static $mapDate = array('aTime', 'mTime', 'cTime');
-        foreach ($mapDate as $key) {
-            if (isset($a[$prefix.$key])) {
-                $a[$prefix.$key] = new ConstStub(date('Y-m-d H:i:s', $a[$prefix.$key]), $a[$prefix.$key]);
-            }
-        }
+		if (isset($a[$prefix.'perms'])) {
+			$a[$prefix.'perms'] = new ConstStub(sprintf('0%o', $a[$prefix.'perms']), $a[$prefix.'perms']);
+		}
 
-        return $a;
-    }
+		static $mapDate = array('aTime', 'mTime', 'cTime');
+		foreach ($mapDate as $key) {
+			if (isset($a[$prefix.$key])) {
+				$a[$prefix.$key] = new ConstStub(date('Y-m-d H:i:s', $a[$prefix.$key]), $a[$prefix.$key]);
+			}
+		}
 
-    public static function castFileObject(\SplFileObject $c, array $a, Stub $stub, $isNested)
-    {
-        static $map = array(
-            'csvControl' => 'getCsvControl',
-            'flags' => 'getFlags',
-            'maxLineLen' => 'getMaxLineLen',
-            'fstat' => 'fstat',
-            'eof' => 'eof',
-            'key' => 'key',
-        );
+		return $a;
+	}
 
-        $prefix = Caster::PREFIX_VIRTUAL;
+	public static function castFileObject(\SplFileObject $c, array $a, Stub $stub, $isNested)
+	{
+		static $map = array(
+			'csvControl' => 'getCsvControl',
+			'flags' => 'getFlags',
+			'maxLineLen' => 'getMaxLineLen',
+			'fstat' => 'fstat',
+			'eof' => 'eof',
+			'key' => 'key',
+		);
 
-        foreach ($map as $key => $accessor) {
-            try {
-                $a[$prefix.$key] = $c->$accessor();
-            } catch (\Exception $e) {
-            }
-        }
+		$prefix = Caster::PREFIX_VIRTUAL;
 
-        if (isset($a[$prefix.'flags'])) {
-            $flagsArray = array();
-            foreach (self::$splFileObjectFlags as $value => $name) {
-                if ($a[$prefix.'flags'] & $value) {
-                    $flagsArray[] = $name;
-                }
-            }
-            $a[$prefix.'flags'] = new ConstStub(implode('|', $flagsArray), $a[$prefix.'flags']);
-        }
+		foreach ($map as $key => $accessor) {
+			try {
+				$a[$prefix.$key] = $c->$accessor();
+			} catch (\Exception $e) {
+			}
+		}
 
-        if (isset($a[$prefix.'fstat'])) {
-            $a[$prefix.'fstat'] = new CutArrayStub($a[$prefix.'fstat'], array('dev', 'ino', 'nlink', 'rdev', 'blksize', 'blocks'));
-        }
+		if (isset($a[$prefix.'flags'])) {
+			$flagsArray = array();
+			foreach (self::$splFileObjectFlags as $value => $name) {
+				if ($a[$prefix.'flags'] & $value) {
+					$flagsArray[] = $name;
+				}
+			}
+			$a[$prefix.'flags'] = new ConstStub(implode('|', $flagsArray), $a[$prefix.'flags']);
+		}
 
-        return $a;
-    }
+		if (isset($a[$prefix.'fstat'])) {
+			$a[$prefix.'fstat'] = new CutArrayStub($a[$prefix.'fstat'], array('dev', 'ino', 'nlink', 'rdev', 'blksize', 'blocks'));
+		}
 
-    public static function castFixedArray(\SplFixedArray $c, array $a, Stub $stub, $isNested)
-    {
-        $a += array(
-            Caster::PREFIX_VIRTUAL.'storage' => $c->toArray(),
-        );
+		return $a;
+	}
 
-        return $a;
-    }
+	public static function castFixedArray(\SplFixedArray $c, array $a, Stub $stub, $isNested)
+	{
+		$a += array(
+			Caster::PREFIX_VIRTUAL.'storage' => $c->toArray(),
+		);
 
-    public static function castObjectStorage(\SplObjectStorage $c, array $a, Stub $stub, $isNested)
-    {
-        $storage = array();
-        unset($a[Caster::PREFIX_DYNAMIC."\0gcdata"]); // Don't hit https://bugs.php.net/65967
+		return $a;
+	}
 
-        foreach ($c as $obj) {
-            $storage[spl_object_hash($obj)] = array(
-                'object' => $obj,
-                'info' => $c->getInfo(),
-             );
-        }
+	public static function castObjectStorage(\SplObjectStorage $c, array $a, Stub $stub, $isNested)
+	{
+		$storage = array();
+		unset($a[Caster::PREFIX_DYNAMIC."\0gcdata"]); // Don't hit https://bugs.php.net/65967
 
-        $a += array(
-            Caster::PREFIX_VIRTUAL.'storage' => $storage,
-        );
+		foreach (clone $c as $obj) {
+			$storage[spl_object_hash($obj)] = array(
+				'object' => $obj,
+				'info' => $c->getInfo(),
+			 );
+		}
 
-        return $a;
-    }
+		$a += array(
+			Caster::PREFIX_VIRTUAL.'storage' => $storage,
+		);
 
-    public static function castOuterIterator(\OuterIterator $c, array $a, Stub $stub, $isNested)
-    {
-        $a[Caster::PREFIX_VIRTUAL.'innerIterator'] = $c->getInnerIterator();
+		return $a;
+	}
 
-        return $a;
-    }
+	public static function castOuterIterator(\OuterIterator $c, array $a, Stub $stub, $isNested)
+	{
+		$a[Caster::PREFIX_VIRTUAL.'innerIterator'] = $c->getInnerIterator();
+
+		return $a;
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Caster/StubCaster.php b/htdocs/includes/symfony/var-dumper/Caster/StubCaster.php
index ebad5ba9844..83fde9eba3c 100644
--- a/htdocs/includes/symfony/var-dumper/Caster/StubCaster.php
+++ b/htdocs/includes/symfony/var-dumper/Caster/StubCaster.php
@@ -20,53 +20,63 @@ use Symfony\Component\VarDumper\Cloner\Stub;
  */
 class StubCaster
 {
-    public static function castStub(Stub $c, array $a, Stub $stub, $isNested)
-    {
-        if ($isNested) {
-            $stub->type = $c->type;
-            $stub->class = $c->class;
-            $stub->value = $c->value;
-            $stub->handle = $c->handle;
-            $stub->cut = $c->cut;
+	public static function castStub(Stub $c, array $a, Stub $stub, $isNested)
+	{
+		if ($isNested) {
+			$stub->type = $c->type;
+			$stub->class = $c->class;
+			$stub->value = $c->value;
+			$stub->handle = $c->handle;
+			$stub->cut = $c->cut;
+			$stub->attr = $c->attr;
 
-            return array();
-        }
-    }
+			if (Stub::TYPE_REF === $c->type && !$c->class && is_string($c->value) && !preg_match('//u', $c->value)) {
+				$stub->type = Stub::TYPE_STRING;
+				$stub->class = Stub::STRING_BINARY;
+			}
 
-    public static function castCutArray(CutArrayStub $c, array $a, Stub $stub, $isNested)
-    {
-        return $isNested ? $c->preservedSubset : $a;
-    }
+			$a = array();
+		}
 
-    public static function cutInternals($obj, array $a, Stub $stub, $isNested)
-    {
-        if ($isNested) {
-            $stub->cut += count($a);
+		return $a;
+	}
 
-            return array();
-        }
+	public static function castCutArray(CutArrayStub $c, array $a, Stub $stub, $isNested)
+	{
+		return $isNested ? $c->preservedSubset : $a;
+	}
 
-        return $a;
-    }
+	public static function cutInternals($obj, array $a, Stub $stub, $isNested)
+	{
+		if ($isNested) {
+			$stub->cut += count($a);
 
-    public static function castEnum(EnumStub $c, array $a, Stub $stub, $isNested)
-    {
-        if ($isNested) {
-            $stub->class = '';
-            $stub->handle = 0;
-            $stub->value = null;
+			return array();
+		}
 
-            $a = array();
+		return $a;
+	}
 
-            if ($c->value) {
-                foreach (array_keys($c->value) as $k) {
-                    $keys[] = Caster::PREFIX_VIRTUAL.$k;
-                }
-                // Preserve references with array_combine()
-                $a = array_combine($keys, $c->value);
-            }
-        }
+	public static function castEnum(EnumStub $c, array $a, Stub $stub, $isNested)
+	{
+		if ($isNested) {
+			$stub->class = $c->dumpKeys ? '' : null;
+			$stub->handle = 0;
+			$stub->value = null;
+			$stub->cut = $c->cut;
+			$stub->attr = $c->attr;
 
-        return $a;
-    }
+			$a = array();
+
+			if ($c->value) {
+				foreach (array_keys($c->value) as $k) {
+					$keys[] = !isset($k[0]) || "\0" !== $k[0] ? Caster::PREFIX_VIRTUAL.$k : $k;
+				}
+				// Preserve references with array_combine()
+				$a = array_combine($keys, $c->value);
+			}
+		}
+
+		return $a;
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Caster/XmlReaderCaster.php b/htdocs/includes/symfony/var-dumper/Caster/XmlReaderCaster.php
new file mode 100644
index 00000000000..bbd4645c8e5
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/XmlReaderCaster.php
@@ -0,0 +1,77 @@
+<?php
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Casts XmlReader class to array representation.
+ *
+ * @author Baptiste Clavié <clavie.b@gmail.com>
+ */
+class XmlReaderCaster
+{
+	private static $nodeTypes = array(
+		\XmlReader::NONE => 'NONE',
+		\XmlReader::ELEMENT => 'ELEMENT',
+		\XmlReader::ATTRIBUTE => 'ATTRIBUTE',
+		\XmlReader::TEXT => 'TEXT',
+		\XmlReader::CDATA => 'CDATA',
+		\XmlReader::ENTITY_REF => 'ENTITY_REF',
+		\XmlReader::ENTITY => 'ENTITY',
+		\XmlReader::PI => 'PI (Processing Instruction)',
+		\XmlReader::COMMENT => 'COMMENT',
+		\XmlReader::DOC => 'DOC',
+		\XmlReader::DOC_TYPE => 'DOC_TYPE',
+		\XmlReader::DOC_FRAGMENT => 'DOC_FRAGMENT',
+		\XmlReader::NOTATION => 'NOTATION',
+		\XmlReader::WHITESPACE => 'WHITESPACE',
+		\XmlReader::SIGNIFICANT_WHITESPACE => 'SIGNIFICANT_WHITESPACE',
+		\XmlReader::END_ELEMENT => 'END_ELEMENT',
+		\XmlReader::END_ENTITY => 'END_ENTITY',
+		\XmlReader::XML_DECLARATION => 'XML_DECLARATION',
+	);
+
+	public static function castXmlReader(\XmlReader $reader, array $a, Stub $stub, $isNested)
+	{
+		$props = Caster::PREFIX_VIRTUAL.'parserProperties';
+		$info = array(
+			'localName' => $reader->localName,
+			'prefix' => $reader->prefix,
+			'nodeType' => new ConstStub(self::$nodeTypes[$reader->nodeType], $reader->nodeType),
+			'depth' => $reader->depth,
+			'isDefault' => $reader->isDefault,
+			'isEmptyElement' => \XmlReader::NONE === $reader->nodeType ? null : $reader->isEmptyElement,
+			'xmlLang' => $reader->xmlLang,
+			'attributeCount' => $reader->attributeCount,
+			'value' => $reader->value,
+			'namespaceURI' => $reader->namespaceURI,
+			'baseURI' => $reader->baseURI ? new LinkStub($reader->baseURI) : $reader->baseURI,
+			$props => array(
+				'LOADDTD' => $reader->getParserProperty(\XmlReader::LOADDTD),
+				'DEFAULTATTRS' => $reader->getParserProperty(\XmlReader::DEFAULTATTRS),
+				'VALIDATE' => $reader->getParserProperty(\XmlReader::VALIDATE),
+				'SUBST_ENTITIES' => $reader->getParserProperty(\XmlReader::SUBST_ENTITIES),
+			),
+		);
+
+		if ($info[$props] = Caster::filter($info[$props], Caster::EXCLUDE_EMPTY, array(), $count)) {
+			$info[$props] = new EnumStub($info[$props]);
+			$info[$props]->cut = $count;
+		}
+
+		$info = Caster::filter($info, Caster::EXCLUDE_EMPTY, array(), $count);
+		// +2 because hasValue and hasAttributes are always filtered
+		$stub->cut += $count + 2;
+
+		return $a + $info;
+	}
+}
diff --git a/htdocs/includes/symfony/var-dumper/Cloner/AbstractCloner.php b/htdocs/includes/symfony/var-dumper/Cloner/AbstractCloner.php
index 2807ceb935b..27bc47870ae 100644
--- a/htdocs/includes/symfony/var-dumper/Cloner/AbstractCloner.php
+++ b/htdocs/includes/symfony/var-dumper/Cloner/AbstractCloner.php
@@ -21,293 +21,302 @@ use Symfony\Component\VarDumper\Exception\ThrowingCasterException;
  */
 abstract class AbstractCloner implements ClonerInterface
 {
-    public static $defaultCasters = array(
-        'Symfony\Component\VarDumper\Caster\CutStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castStub',
-        'Symfony\Component\VarDumper\Caster\CutArrayStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castCutArray',
-        'Symfony\Component\VarDumper\Caster\ConstStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castStub',
-        'Symfony\Component\VarDumper\Caster\EnumStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castEnum',
+	public static $defaultCasters = array(
+		'__PHP_Incomplete_Class' => 'Symfony\Component\VarDumper\Caster\Caster::castPhpIncompleteClass',
 
-        'Closure' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castClosure',
-        'Generator' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castGenerator',
-        'ReflectionType' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castType',
-        'ReflectionGenerator' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castReflectionGenerator',
-        'ReflectionClass' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castClass',
-        'ReflectionFunctionAbstract' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castFunctionAbstract',
-        'ReflectionMethod' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castMethod',
-        'ReflectionParameter' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castParameter',
-        'ReflectionProperty' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castProperty',
-        'ReflectionExtension' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castExtension',
-        'ReflectionZendExtension' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castZendExtension',
+		'Symfony\Component\VarDumper\Caster\CutStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castStub',
+		'Symfony\Component\VarDumper\Caster\CutArrayStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castCutArray',
+		'Symfony\Component\VarDumper\Caster\ConstStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castStub',
+		'Symfony\Component\VarDumper\Caster\EnumStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castEnum',
 
-        'Doctrine\Common\Persistence\ObjectManager' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
-        'Doctrine\Common\Proxy\Proxy' => 'Symfony\Component\VarDumper\Caster\DoctrineCaster::castCommonProxy',
-        'Doctrine\ORM\Proxy\Proxy' => 'Symfony\Component\VarDumper\Caster\DoctrineCaster::castOrmProxy',
-        'Doctrine\ORM\PersistentCollection' => 'Symfony\Component\VarDumper\Caster\DoctrineCaster::castPersistentCollection',
+		'Closure' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castClosure',
+		'Generator' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castGenerator',
+		'ReflectionType' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castType',
+		'ReflectionGenerator' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castReflectionGenerator',
+		'ReflectionClass' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castClass',
+		'ReflectionFunctionAbstract' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castFunctionAbstract',
+		'ReflectionMethod' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castMethod',
+		'ReflectionParameter' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castParameter',
+		'ReflectionProperty' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castProperty',
+		'ReflectionExtension' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castExtension',
+		'ReflectionZendExtension' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castZendExtension',
 
-        'DOMException' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castException',
-        'DOMStringList' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLength',
-        'DOMNameList' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLength',
-        'DOMImplementation' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castImplementation',
-        'DOMImplementationList' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLength',
-        'DOMNode' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castNode',
-        'DOMNameSpaceNode' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castNameSpaceNode',
-        'DOMDocument' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castDocument',
-        'DOMNodeList' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLength',
-        'DOMNamedNodeMap' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLength',
-        'DOMCharacterData' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castCharacterData',
-        'DOMAttr' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castAttr',
-        'DOMElement' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castElement',
-        'DOMText' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castText',
-        'DOMTypeinfo' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castTypeinfo',
-        'DOMDomError' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castDomError',
-        'DOMLocator' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLocator',
-        'DOMDocumentType' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castDocumentType',
-        'DOMNotation' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castNotation',
-        'DOMEntity' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castEntity',
-        'DOMProcessingInstruction' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castProcessingInstruction',
-        'DOMXPath' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castXPath',
+		'Doctrine\Common\Persistence\ObjectManager' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
+		'Doctrine\Common\Proxy\Proxy' => 'Symfony\Component\VarDumper\Caster\DoctrineCaster::castCommonProxy',
+		'Doctrine\ORM\Proxy\Proxy' => 'Symfony\Component\VarDumper\Caster\DoctrineCaster::castOrmProxy',
+		'Doctrine\ORM\PersistentCollection' => 'Symfony\Component\VarDumper\Caster\DoctrineCaster::castPersistentCollection',
 
-        'ErrorException' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castErrorException',
-        'Exception' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castException',
-        'Error' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castError',
-        'Symfony\Component\DependencyInjection\ContainerInterface' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
-        'Symfony\Component\VarDumper\Exception\ThrowingCasterException' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castThrowingCasterException',
-        'Symfony\Component\VarDumper\Caster\TraceStub' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castTraceStub',
-        'Symfony\Component\VarDumper\Caster\FrameStub' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castFrameStub',
+		'DOMException' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castException',
+		'DOMStringList' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLength',
+		'DOMNameList' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLength',
+		'DOMImplementation' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castImplementation',
+		'DOMImplementationList' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLength',
+		'DOMNode' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castNode',
+		'DOMNameSpaceNode' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castNameSpaceNode',
+		'DOMDocument' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castDocument',
+		'DOMNodeList' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLength',
+		'DOMNamedNodeMap' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLength',
+		'DOMCharacterData' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castCharacterData',
+		'DOMAttr' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castAttr',
+		'DOMElement' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castElement',
+		'DOMText' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castText',
+		'DOMTypeinfo' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castTypeinfo',
+		'DOMDomError' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castDomError',
+		'DOMLocator' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLocator',
+		'DOMDocumentType' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castDocumentType',
+		'DOMNotation' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castNotation',
+		'DOMEntity' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castEntity',
+		'DOMProcessingInstruction' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castProcessingInstruction',
+		'DOMXPath' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castXPath',
 
-        'PHPUnit_Framework_MockObject_MockObject' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
-        'Prophecy\Prophecy\ProphecySubjectInterface' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
-        'Mockery\MockInterface' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
+		'XmlReader' => 'Symfony\Component\VarDumper\Caster\XmlReaderCaster::castXmlReader',
 
-        'PDO' => 'Symfony\Component\VarDumper\Caster\PdoCaster::castPdo',
-        'PDOStatement' => 'Symfony\Component\VarDumper\Caster\PdoCaster::castPdoStatement',
+		'ErrorException' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castErrorException',
+		'Exception' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castException',
+		'Error' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castError',
+		'Symfony\Component\DependencyInjection\ContainerInterface' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
+		'Symfony\Component\VarDumper\Exception\ThrowingCasterException' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castThrowingCasterException',
+		'Symfony\Component\VarDumper\Caster\TraceStub' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castTraceStub',
+		'Symfony\Component\VarDumper\Caster\FrameStub' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castFrameStub',
 
-        'AMQPConnection' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castConnection',
-        'AMQPChannel' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castChannel',
-        'AMQPQueue' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castQueue',
-        'AMQPExchange' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castExchange',
-        'AMQPEnvelope' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castEnvelope',
+		'PHPUnit_Framework_MockObject_MockObject' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
+		'Prophecy\Prophecy\ProphecySubjectInterface' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
+		'Mockery\MockInterface' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
 
-        'ArrayObject' => 'Symfony\Component\VarDumper\Caster\SplCaster::castArrayObject',
-        'SplDoublyLinkedList' => 'Symfony\Component\VarDumper\Caster\SplCaster::castDoublyLinkedList',
-        'SplFileInfo' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFileInfo',
-        'SplFileObject' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFileObject',
-        'SplFixedArray' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFixedArray',
-        'SplHeap' => 'Symfony\Component\VarDumper\Caster\SplCaster::castHeap',
-        'SplObjectStorage' => 'Symfony\Component\VarDumper\Caster\SplCaster::castObjectStorage',
-        'SplPriorityQueue' => 'Symfony\Component\VarDumper\Caster\SplCaster::castHeap',
-        'OuterIterator' => 'Symfony\Component\VarDumper\Caster\SplCaster::castOuterIterator',
+		'PDO' => 'Symfony\Component\VarDumper\Caster\PdoCaster::castPdo',
+		'PDOStatement' => 'Symfony\Component\VarDumper\Caster\PdoCaster::castPdoStatement',
 
-        'MongoCursorInterface' => 'Symfony\Component\VarDumper\Caster\MongoCaster::castCursor',
+		'AMQPConnection' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castConnection',
+		'AMQPChannel' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castChannel',
+		'AMQPQueue' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castQueue',
+		'AMQPExchange' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castExchange',
+		'AMQPEnvelope' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castEnvelope',
 
-        ':curl' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castCurl',
-        ':dba' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castDba',
-        ':dba persistent' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castDba',
-        ':gd' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castGd',
-        ':mysql link' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castMysqlLink',
-        ':pgsql large object' => 'Symfony\Component\VarDumper\Caster\PgSqlCaster::castLargeObject',
-        ':pgsql link' => 'Symfony\Component\VarDumper\Caster\PgSqlCaster::castLink',
-        ':pgsql link persistent' => 'Symfony\Component\VarDumper\Caster\PgSqlCaster::castLink',
-        ':pgsql result' => 'Symfony\Component\VarDumper\Caster\PgSqlCaster::castResult',
-        ':process' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castProcess',
-        ':stream' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castStream',
-        ':stream-context' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castStreamContext',
-        ':xml' => 'Symfony\Component\VarDumper\Caster\XmlResourceCaster::castXml',
-    );
+		'ArrayObject' => 'Symfony\Component\VarDumper\Caster\SplCaster::castArrayObject',
+		'SplDoublyLinkedList' => 'Symfony\Component\VarDumper\Caster\SplCaster::castDoublyLinkedList',
+		'SplFileInfo' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFileInfo',
+		'SplFileObject' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFileObject',
+		'SplFixedArray' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFixedArray',
+		'SplHeap' => 'Symfony\Component\VarDumper\Caster\SplCaster::castHeap',
+		'SplObjectStorage' => 'Symfony\Component\VarDumper\Caster\SplCaster::castObjectStorage',
+		'SplPriorityQueue' => 'Symfony\Component\VarDumper\Caster\SplCaster::castHeap',
+		'OuterIterator' => 'Symfony\Component\VarDumper\Caster\SplCaster::castOuterIterator',
 
-    protected $maxItems = 2500;
-    protected $maxString = -1;
-    protected $useExt;
+		'MongoCursorInterface' => 'Symfony\Component\VarDumper\Caster\MongoCaster::castCursor',
 
-    private $casters = array();
-    private $prevErrorHandler;
-    private $classInfo = array();
-    private $filter = 0;
+		'Redis' => 'Symfony\Component\VarDumper\Caster\RedisCaster::castRedis',
+		'RedisArray' => 'Symfony\Component\VarDumper\Caster\RedisCaster::castRedisArray',
 
-    /**
-     * @param callable[]|null $casters A map of casters.
-     *
-     * @see addCasters
-     */
-    public function __construct(array $casters = null)
-    {
-        if (null === $casters) {
-            $casters = static::$defaultCasters;
-        }
-        $this->addCasters($casters);
-        $this->useExt = extension_loaded('symfony_debug');
-    }
+		':curl' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castCurl',
+		':dba' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castDba',
+		':dba persistent' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castDba',
+		':gd' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castGd',
+		':mysql link' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castMysqlLink',
+		':pgsql large object' => 'Symfony\Component\VarDumper\Caster\PgSqlCaster::castLargeObject',
+		':pgsql link' => 'Symfony\Component\VarDumper\Caster\PgSqlCaster::castLink',
+		':pgsql link persistent' => 'Symfony\Component\VarDumper\Caster\PgSqlCaster::castLink',
+		':pgsql result' => 'Symfony\Component\VarDumper\Caster\PgSqlCaster::castResult',
+		':process' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castProcess',
+		':stream' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castStream',
+		':persistent stream' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castStream',
+		':stream-context' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castStreamContext',
+		':xml' => 'Symfony\Component\VarDumper\Caster\XmlResourceCaster::castXml',
+	);
 
-    /**
-     * Adds casters for resources and objects.
-     *
-     * Maps resources or objects types to a callback.
-     * Types are in the key, with a callable caster for value.
-     * Resource types are to be prefixed with a `:`,
-     * see e.g. static::$defaultCasters.
-     *
-     * @param callable[] $casters A map of casters.
-     */
-    public function addCasters(array $casters)
-    {
-        foreach ($casters as $type => $callback) {
-            $this->casters[strtolower($type)][] = $callback;
-        }
-    }
+	protected $maxItems = 2500;
+	protected $maxString = -1;
+	protected $useExt;
 
-    /**
-     * Sets the maximum number of items to clone past the first level in nested structures.
-     *
-     * @param int $maxItems
-     */
-    public function setMaxItems($maxItems)
-    {
-        $this->maxItems = (int) $maxItems;
-    }
+	private $casters = array();
+	private $prevErrorHandler;
+	private $classInfo = array();
+	private $filter = 0;
 
-    /**
-     * Sets the maximum cloned length for strings.
-     *
-     * @param int $maxString
-     */
-    public function setMaxString($maxString)
-    {
-        $this->maxString = (int) $maxString;
-    }
+	/**
+	 * @param callable[]|null $casters A map of casters
+	 *
+	 * @see addCasters
+	 */
+	public function __construct(array $casters = null)
+	{
+		if (null === $casters) {
+			$casters = static::$defaultCasters;
+		}
+		$this->addCasters($casters);
+		$this->useExt = extension_loaded('symfony_debug');
+	}
 
-    /**
-     * Clones a PHP variable.
-     *
-     * @param mixed $var    Any PHP variable.
-     * @param int   $filter A bit field of Caster::EXCLUDE_* constants.
-     *
-     * @return Data The cloned variable represented by a Data object.
-     */
-    public function cloneVar($var, $filter = 0)
-    {
-        $this->prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context) {
-            if (E_RECOVERABLE_ERROR === $type || E_USER_ERROR === $type) {
-                // Cloner never dies
-                throw new \ErrorException($msg, 0, $type, $file, $line);
-            }
+	/**
+	 * Adds casters for resources and objects.
+	 *
+	 * Maps resources or objects types to a callback.
+	 * Types are in the key, with a callable caster for value.
+	 * Resource types are to be prefixed with a `:`,
+	 * see e.g. static::$defaultCasters.
+	 *
+	 * @param callable[] $casters A map of casters
+	 */
+	public function addCasters(array $casters)
+	{
+		foreach ($casters as $type => $callback) {
+			$this->casters[strtolower($type)][] = $callback;
+		}
+	}
 
-            if ($this->prevErrorHandler) {
-                return call_user_func($this->prevErrorHandler, $type, $msg, $file, $line, $context);
-            }
+	/**
+	 * Sets the maximum number of items to clone past the first level in nested structures.
+	 *
+	 * @param int $maxItems
+	 */
+	public function setMaxItems($maxItems)
+	{
+		$this->maxItems = (int) $maxItems;
+	}
 
-            return false;
-        });
-        $this->filter = $filter;
+	/**
+	 * Sets the maximum cloned length for strings.
+	 *
+	 * @param int $maxString
+	 */
+	public function setMaxString($maxString)
+	{
+		$this->maxString = (int) $maxString;
+	}
 
-        try {
-            $data = $this->doClone($var);
-        } catch (\Exception $e) {
-        }
-        restore_error_handler();
-        $this->prevErrorHandler = null;
+	/**
+	 * Clones a PHP variable.
+	 *
+	 * @param mixed $var    Any PHP variable
+	 * @param int   $filter A bit field of Caster::EXCLUDE_* constants
+	 *
+	 * @return Data The cloned variable represented by a Data object
+	 */
+	public function cloneVar($var, $filter = 0)
+	{
+		$this->prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context) {
+			if (E_RECOVERABLE_ERROR === $type || E_USER_ERROR === $type) {
+				// Cloner never dies
+				throw new \ErrorException($msg, 0, $type, $file, $line);
+			}
 
-        if (isset($e)) {
-            throw $e;
-        }
+			if ($this->prevErrorHandler) {
+				return call_user_func($this->prevErrorHandler, $type, $msg, $file, $line, $context);
+			}
 
-        return new Data($data);
-    }
+			return false;
+		});
+		$this->filter = $filter;
 
-    /**
-     * Effectively clones the PHP variable.
-     *
-     * @param mixed $var Any PHP variable.
-     *
-     * @return array The cloned variable represented in an array.
-     */
-    abstract protected function doClone($var);
+		try {
+			$data = $this->doClone($var);
+		} catch (\Exception $e) {
+		}
+		restore_error_handler();
+		$this->prevErrorHandler = null;
 
-    /**
-     * Casts an object to an array representation.
-     *
-     * @param Stub $stub     The Stub for the casted object.
-     * @param bool $isNested True if the object is nested in the dumped structure.
-     *
-     * @return array The object casted as array.
-     */
-    protected function castObject(Stub $stub, $isNested)
-    {
-        $obj = $stub->value;
-        $class = $stub->class;
+		if (isset($e)) {
+			throw $e;
+		}
 
-        if (isset($class[15]) && "\0" === $class[15] && 0 === strpos($class, "class@anonymous\x00")) {
-            $stub->class = get_parent_class($class).'@anonymous';
-        }
-        if (isset($this->classInfo[$class])) {
-            $classInfo = $this->classInfo[$class];
-        } else {
-            $classInfo = array(
-                new \ReflectionClass($class),
-                array_reverse(array($class => $class) + class_parents($class) + class_implements($class) + array('*' => '*')),
-            );
+		return new Data($data);
+	}
 
-            $this->classInfo[$class] = $classInfo;
-        }
+	/**
+	 * Effectively clones the PHP variable.
+	 *
+	 * @param mixed $var Any PHP variable
+	 *
+	 * @return array The cloned variable represented in an array
+	 */
+	abstract protected function doClone($var);
 
-        $a = $this->callCaster('Symfony\Component\VarDumper\Caster\Caster::castObject', $obj, $classInfo[0], null, $isNested);
+	/**
+	 * Casts an object to an array representation.
+	 *
+	 * @param Stub $stub     The Stub for the casted object
+	 * @param bool $isNested True if the object is nested in the dumped structure
+	 *
+	 * @return array The object casted as array
+	 */
+	protected function castObject(Stub $stub, $isNested)
+	{
+		$obj = $stub->value;
+		$class = $stub->class;
 
-        foreach ($classInfo[1] as $p) {
-            if (!empty($this->casters[$p = strtolower($p)])) {
-                foreach ($this->casters[$p] as $p) {
-                    $a = $this->callCaster($p, $obj, $a, $stub, $isNested);
-                }
-            }
-        }
+		if (isset($class[15]) && "\0" === $class[15] && 0 === strpos($class, "class@anonymous\x00")) {
+			$stub->class = get_parent_class($class).'@anonymous';
+		}
+		if (isset($this->classInfo[$class])) {
+			$classInfo = $this->classInfo[$class];
+		} else {
+			$classInfo = array(
+				new \ReflectionClass($class),
+				array_reverse(array($class => $class) + class_parents($class) + class_implements($class) + array('*' => '*')),
+			);
+			$classInfo[1] = array_map('strtolower', $classInfo[1]);
 
-        return $a;
-    }
+			$this->classInfo[$class] = $classInfo;
+		}
 
-    /**
-     * Casts a resource to an array representation.
-     *
-     * @param Stub $stub     The Stub for the casted resource.
-     * @param bool $isNested True if the object is nested in the dumped structure.
-     *
-     * @return array The resource casted as array.
-     */
-    protected function castResource(Stub $stub, $isNested)
-    {
-        $a = array();
-        $res = $stub->value;
-        $type = $stub->class;
+		$a = Caster::castObject($obj, $classInfo[0]);
 
-        if (!empty($this->casters[':'.$type])) {
-            foreach ($this->casters[':'.$type] as $c) {
-                $a = $this->callCaster($c, $res, $a, $stub, $isNested);
-            }
-        }
+		foreach ($classInfo[1] as $p) {
+			if (!empty($this->casters[$p])) {
+				foreach ($this->casters[$p] as $p) {
+					$a = $this->callCaster($p, $obj, $a, $stub, $isNested);
+				}
+			}
+		}
 
-        return $a;
-    }
+		return $a;
+	}
 
-    /**
-     * Calls a custom caster.
-     *
-     * @param callable        $callback The caster.
-     * @param object|resource $obj      The object/resource being casted.
-     * @param array           $a        The result of the previous cast for chained casters.
-     * @param Stub            $stub     The Stub for the casted object/resource.
-     * @param bool            $isNested True if $obj is nested in the dumped structure.
-     *
-     * @return array The casted object/resource.
-     */
-    private function callCaster($callback, $obj, $a, $stub, $isNested)
-    {
-        try {
-            $cast = call_user_func($callback, $obj, $a, $stub, $isNested, $this->filter);
+	/**
+	 * Casts a resource to an array representation.
+	 *
+	 * @param Stub $stub     The Stub for the casted resource
+	 * @param bool $isNested True if the object is nested in the dumped structure
+	 *
+	 * @return array The resource casted as array
+	 */
+	protected function castResource(Stub $stub, $isNested)
+	{
+		$a = array();
+		$res = $stub->value;
+		$type = $stub->class;
 
-            if (is_array($cast)) {
-                $a = $cast;
-            }
-        } catch (\Exception $e) {
-            $a[(Stub::TYPE_OBJECT === $stub->type ? Caster::PREFIX_VIRTUAL : '').'⚠'] = new ThrowingCasterException($e);
-        }
+		if (!empty($this->casters[':'.$type])) {
+			foreach ($this->casters[':'.$type] as $c) {
+				$a = $this->callCaster($c, $res, $a, $stub, $isNested);
+			}
+		}
 
-        return $a;
-    }
+		return $a;
+	}
+
+	/**
+	 * Calls a custom caster.
+	 *
+	 * @param callable        $callback The caster
+	 * @param object|resource $obj      The object/resource being casted
+	 * @param array           $a        The result of the previous cast for chained casters
+	 * @param Stub            $stub     The Stub for the casted object/resource
+	 * @param bool            $isNested True if $obj is nested in the dumped structure
+	 *
+	 * @return array The casted object/resource
+	 */
+	private function callCaster($callback, $obj, $a, $stub, $isNested)
+	{
+		try {
+			$cast = call_user_func($callback, $obj, $a, $stub, $isNested, $this->filter);
+
+			if (is_array($cast)) {
+				$a = $cast;
+			}
+		} catch (\Exception $e) {
+			$a = array((Stub::TYPE_OBJECT === $stub->type ? Caster::PREFIX_VIRTUAL : '').'⚠' => new ThrowingCasterException($e)) + $a;
+		}
+
+		return $a;
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Cloner/ClonerInterface.php b/htdocs/includes/symfony/var-dumper/Cloner/ClonerInterface.php
index c1df5933dbf..09d863e8e6f 100644
--- a/htdocs/includes/symfony/var-dumper/Cloner/ClonerInterface.php
+++ b/htdocs/includes/symfony/var-dumper/Cloner/ClonerInterface.php
@@ -16,12 +16,12 @@ namespace Symfony\Component\VarDumper\Cloner;
  */
 interface ClonerInterface
 {
-    /**
-     * Clones a PHP variable.
-     *
-     * @param mixed $var Any PHP variable.
-     *
-     * @return Data The cloned variable represented by a Data object.
-     */
-    public function cloneVar($var);
+	/**
+	 * Clones a PHP variable.
+	 *
+	 * @param mixed $var Any PHP variable
+	 *
+	 * @return Data The cloned variable represented by a Data object
+	 */
+	public function cloneVar($var);
 }
diff --git a/htdocs/includes/symfony/var-dumper/Cloner/Cursor.php b/htdocs/includes/symfony/var-dumper/Cloner/Cursor.php
index 162f3293cf2..23fe80977c6 100644
--- a/htdocs/includes/symfony/var-dumper/Cloner/Cursor.php
+++ b/htdocs/includes/symfony/var-dumper/Cloner/Cursor.php
@@ -18,24 +18,25 @@ namespace Symfony\Component\VarDumper\Cloner;
  */
 class Cursor
 {
-    const HASH_INDEXED = Stub::ARRAY_INDEXED;
-    const HASH_ASSOC = Stub::ARRAY_ASSOC;
-    const HASH_OBJECT = Stub::TYPE_OBJECT;
-    const HASH_RESOURCE = Stub::TYPE_RESOURCE;
+	const HASH_INDEXED = Stub::ARRAY_INDEXED;
+	const HASH_ASSOC = Stub::ARRAY_ASSOC;
+	const HASH_OBJECT = Stub::TYPE_OBJECT;
+	const HASH_RESOURCE = Stub::TYPE_RESOURCE;
 
-    public $depth = 0;
-    public $refIndex = 0;
-    public $softRefTo = 0;
-    public $softRefCount = 0;
-    public $softRefHandle = 0;
-    public $hardRefTo = 0;
-    public $hardRefCount = 0;
-    public $hardRefHandle = 0;
-    public $hashType;
-    public $hashKey;
-    public $hashKeyIsBinary;
-    public $hashIndex = 0;
-    public $hashLength = 0;
-    public $hashCut = 0;
-    public $stop = false;
+	public $depth = 0;
+	public $refIndex = 0;
+	public $softRefTo = 0;
+	public $softRefCount = 0;
+	public $softRefHandle = 0;
+	public $hardRefTo = 0;
+	public $hardRefCount = 0;
+	public $hardRefHandle = 0;
+	public $hashType;
+	public $hashKey;
+	public $hashKeyIsBinary;
+	public $hashIndex = 0;
+	public $hashLength = 0;
+	public $hashCut = 0;
+	public $stop = false;
+	public $attr = array();
 }
diff --git a/htdocs/includes/symfony/var-dumper/Cloner/Data.php b/htdocs/includes/symfony/var-dumper/Cloner/Data.php
index 43a7b67971e..c770f06a928 100644
--- a/htdocs/includes/symfony/var-dumper/Cloner/Data.php
+++ b/htdocs/includes/symfony/var-dumper/Cloner/Data.php
@@ -11,208 +11,260 @@
 
 namespace Symfony\Component\VarDumper\Cloner;
 
+use Symfony\Component\VarDumper\Caster\Caster;
+
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
 class Data
 {
-    private $data;
-    private $maxDepth = 20;
-    private $maxItemsPerDepth = -1;
-    private $useRefHandles = -1;
+	private $data;
+	private $position = 0;
+	private $key = 0;
+	private $maxDepth = 20;
+	private $maxItemsPerDepth = -1;
+	private $useRefHandles = -1;
 
-    /**
-     * @param array $data A array as returned by ClonerInterface::cloneVar().
-     */
-    public function __construct(array $data)
-    {
-        $this->data = $data;
-    }
+	/**
+	 * @param array $data A array as returned by ClonerInterface::cloneVar()
+	 */
+	public function __construct(array $data)
+	{
+		$this->data = $data;
+	}
 
-    /**
-     * @return array The raw data structure.
-     */
-    public function getRawData()
-    {
-        return $this->data;
-    }
+	/**
+	 * @return array The raw data structure
+	 */
+	public function getRawData()
+	{
+		return $this->data;
+	}
 
-    /**
-     * Returns a depth limited clone of $this.
-     *
-     * @param int $maxDepth The max dumped depth level.
-     *
-     * @return self A clone of $this.
-     */
-    public function withMaxDepth($maxDepth)
-    {
-        $data = clone $this;
-        $data->maxDepth = (int) $maxDepth;
+	/**
+	 * Returns a depth limited clone of $this.
+	 *
+	 * @param int $maxDepth The max dumped depth level
+	 *
+	 * @return self A clone of $this
+	 */
+	public function withMaxDepth($maxDepth)
+	{
+		$data = clone $this;
+		$data->maxDepth = (int) $maxDepth;
 
-        return $data;
-    }
+		return $data;
+	}
 
-    /**
-     * Limits the numbers of elements per depth level.
-     *
-     * @param int $maxItemsPerDepth The max number of items dumped per depth level.
-     *
-     * @return self A clone of $this.
-     */
-    public function withMaxItemsPerDepth($maxItemsPerDepth)
-    {
-        $data = clone $this;
-        $data->maxItemsPerDepth = (int) $maxItemsPerDepth;
+	/**
+	 * Limits the number of elements per depth level.
+	 *
+	 * @param int $maxItemsPerDepth The max number of items dumped per depth level
+	 *
+	 * @return self A clone of $this
+	 */
+	public function withMaxItemsPerDepth($maxItemsPerDepth)
+	{
+		$data = clone $this;
+		$data->maxItemsPerDepth = (int) $maxItemsPerDepth;
 
-        return $data;
-    }
+		return $data;
+	}
 
-    /**
-     * Enables/disables objects' identifiers tracking.
-     *
-     * @param bool $useRefHandles False to hide global ref. handles.
-     *
-     * @return self A clone of $this.
-     */
-    public function withRefHandles($useRefHandles)
-    {
-        $data = clone $this;
-        $data->useRefHandles = $useRefHandles ? -1 : 0;
+	/**
+	 * Enables/disables objects' identifiers tracking.
+	 *
+	 * @param bool $useRefHandles False to hide global ref. handles
+	 *
+	 * @return self A clone of $this
+	 */
+	public function withRefHandles($useRefHandles)
+	{
+		$data = clone $this;
+		$data->useRefHandles = $useRefHandles ? -1 : 0;
 
-        return $data;
-    }
+		return $data;
+	}
 
-    /**
-     * Dumps data with a DumperInterface dumper.
-     */
-    public function dump(DumperInterface $dumper)
-    {
-        $refs = array(0);
-        $this->dumpItem($dumper, new Cursor(), $refs, $this->data[0][0]);
-    }
+	/**
+	 * Seeks to a specific key in nested data structures.
+	 *
+	 * @param string|int $key The key to seek to
+	 *
+	 * @return self|null A clone of $this of null if the key is not set
+	 */
+	public function seek($key)
+	{
+		$item = $this->data[$this->position][$this->key];
 
-    /**
-     * Depth-first dumping of items.
-     *
-     * @param DumperInterface $dumper The dumper being used for dumping.
-     * @param Cursor          $cursor A cursor used for tracking dumper state position.
-     * @param array           &$refs  A map of all references discovered while dumping.
-     * @param mixed           $item   A Stub object or the original value being dumped.
-     */
-    private function dumpItem($dumper, $cursor, &$refs, $item)
-    {
-        $cursor->refIndex = 0;
-        $cursor->softRefTo = $cursor->softRefHandle = $cursor->softRefCount = 0;
-        $cursor->hardRefTo = $cursor->hardRefHandle = $cursor->hardRefCount = 0;
-        $firstSeen = true;
+		if (!$item instanceof Stub || !$item->position) {
+			return;
+		}
+		$keys = array($key);
 
-        if (!$item instanceof Stub) {
-            $type = gettype($item);
-        } elseif (Stub::TYPE_REF === $item->type) {
-            if ($item->handle) {
-                if (!isset($refs[$r = $item->handle - (PHP_INT_MAX >> 1)])) {
-                    $cursor->refIndex = $refs[$r] = $cursor->refIndex ?: ++$refs[0];
-                } else {
-                    $firstSeen = false;
-                }
-                $cursor->hardRefTo = $refs[$r];
-                $cursor->hardRefHandle = $this->useRefHandles & $item->handle;
-                $cursor->hardRefCount = $item->refCount;
-            }
-            $type = $item->class ?: gettype($item->value);
-            $item = $item->value;
-        }
-        if ($item instanceof Stub) {
-            if ($item->refCount) {
-                if (!isset($refs[$r = $item->handle])) {
-                    $cursor->refIndex = $refs[$r] = $cursor->refIndex ?: ++$refs[0];
-                } else {
-                    $firstSeen = false;
-                }
-                $cursor->softRefTo = $refs[$r];
-            }
-            $cursor->softRefHandle = $this->useRefHandles & $item->handle;
-            $cursor->softRefCount = $item->refCount;
-            $cut = $item->cut;
+		switch ($item->type) {
+			case Stub::TYPE_OBJECT:
+				$keys[] = Caster::PREFIX_DYNAMIC.$key;
+				$keys[] = Caster::PREFIX_PROTECTED.$key;
+				$keys[] = Caster::PREFIX_VIRTUAL.$key;
+				$keys[] = "\0$item->class\0$key";
+			case Stub::TYPE_ARRAY:
+			case Stub::TYPE_RESOURCE:
+				break;
+			default:
+				return;
+		}
 
-            if ($item->position && $firstSeen) {
-                $children = $this->data[$item->position];
+		$data = null;
+		$children = $this->data[$item->position];
 
-                if ($cursor->stop) {
-                    if ($cut >= 0) {
-                        $cut += count($children);
-                    }
-                    $children = array();
-                }
-            } else {
-                $children = array();
-            }
-            switch ($item->type) {
-                case Stub::TYPE_STRING:
-                    $dumper->dumpString($cursor, $item->value, Stub::STRING_BINARY === $item->class, $cut);
-                    break;
+		foreach ($keys as $key) {
+			if (isset($children[$key]) || array_key_exists($key, $children)) {
+				$data = clone $this;
+				$data->key = $key;
+				$data->position = $item->position;
+				break;
+			}
+		}
 
-                case Stub::TYPE_ARRAY:
-                    $item = clone $item;
-                    $item->type = $item->class;
-                    $item->class = $item->value;
-                    // No break;
-                case Stub::TYPE_OBJECT:
-                case Stub::TYPE_RESOURCE:
-                    $withChildren = $children && $cursor->depth !== $this->maxDepth && $this->maxItemsPerDepth;
-                    $dumper->enterHash($cursor, $item->type, $item->class, $withChildren);
-                    if ($withChildren) {
-                        $cut = $this->dumpChildren($dumper, $cursor, $refs, $children, $cut, $item->type);
-                    } elseif ($children && 0 <= $cut) {
-                        $cut += count($children);
-                    }
-                    $dumper->leaveHash($cursor, $item->type, $item->class, $withChildren, $cut);
-                    break;
+		return $data;
+	}
 
-                default:
-                    throw new \RuntimeException(sprintf('Unexpected Stub type: %s', $item->type));
-            }
-        } elseif ('array' === $type) {
-            $dumper->enterHash($cursor, Cursor::HASH_INDEXED, 0, false);
-            $dumper->leaveHash($cursor, Cursor::HASH_INDEXED, 0, false, 0);
-        } elseif ('string' === $type) {
-            $dumper->dumpString($cursor, $item, false, 0);
-        } else {
-            $dumper->dumpScalar($cursor, $type, $item);
-        }
-    }
+	/**
+	 * Dumps data with a DumperInterface dumper.
+	 */
+	public function dump(DumperInterface $dumper)
+	{
+		$refs = array(0);
+		$this->dumpItem($dumper, new Cursor(), $refs, $this->data[$this->position][$this->key]);
+	}
 
-    /**
-     * Dumps children of hash structures.
-     *
-     * @param DumperInterface $dumper
-     * @param Cursor          $parentCursor The cursor of the parent hash.
-     * @param array           &$refs        A map of all references discovered while dumping.
-     * @param array           $children     The children to dump.
-     * @param int             $hashCut      The number of items removed from the original hash.
-     * @param string          $hashType     A Cursor::HASH_* const.
-     *
-     * @return int The final number of removed items.
-     */
-    private function dumpChildren($dumper, $parentCursor, &$refs, $children, $hashCut, $hashType)
-    {
-        $cursor = clone $parentCursor;
-        ++$cursor->depth;
-        $cursor->hashType = $hashType;
-        $cursor->hashIndex = 0;
-        $cursor->hashLength = count($children);
-        $cursor->hashCut = $hashCut;
-        foreach ($children as $key => $child) {
-            $cursor->hashKeyIsBinary = isset($key[0]) && !preg_match('//u', $key);
-            $cursor->hashKey = $key;
-            $this->dumpItem($dumper, $cursor, $refs, $child);
-            if (++$cursor->hashIndex === $this->maxItemsPerDepth || $cursor->stop) {
-                $parentCursor->stop = true;
+	/**
+	 * Depth-first dumping of items.
+	 *
+	 * @param DumperInterface $dumper The dumper being used for dumping
+	 * @param Cursor          $cursor A cursor used for tracking dumper state position
+	 * @param array           &$refs  A map of all references discovered while dumping
+	 * @param mixed           $item   A Stub object or the original value being dumped
+	 */
+	private function dumpItem($dumper, $cursor, &$refs, $item)
+	{
+		$cursor->refIndex = 0;
+		$cursor->softRefTo = $cursor->softRefHandle = $cursor->softRefCount = 0;
+		$cursor->hardRefTo = $cursor->hardRefHandle = $cursor->hardRefCount = 0;
+		$firstSeen = true;
 
-                return $hashCut >= 0 ? $hashCut + $cursor->hashLength - $cursor->hashIndex : $hashCut;
-            }
-        }
+		if (!$item instanceof Stub) {
+			$cursor->attr = array();
+			$type = gettype($item);
+		} elseif (Stub::TYPE_REF === $item->type) {
+			if ($item->handle) {
+				if (!isset($refs[$r = $item->handle - (PHP_INT_MAX >> 1)])) {
+					$cursor->refIndex = $refs[$r] = $cursor->refIndex ?: ++$refs[0];
+				} else {
+					$firstSeen = false;
+				}
+				$cursor->hardRefTo = $refs[$r];
+				$cursor->hardRefHandle = $this->useRefHandles & $item->handle;
+				$cursor->hardRefCount = $item->refCount;
+			}
+			$cursor->attr = $item->attr;
+			$type = $item->class ?: gettype($item->value);
+			$item = $item->value;
+		}
+		if ($item instanceof Stub) {
+			if ($item->refCount) {
+				if (!isset($refs[$r = $item->handle])) {
+					$cursor->refIndex = $refs[$r] = $cursor->refIndex ?: ++$refs[0];
+				} else {
+					$firstSeen = false;
+				}
+				$cursor->softRefTo = $refs[$r];
+			}
+			$cursor->softRefHandle = $this->useRefHandles & $item->handle;
+			$cursor->softRefCount = $item->refCount;
+			$cursor->attr = $item->attr;
+			$cut = $item->cut;
 
-        return $hashCut;
-    }
+			if ($item->position && $firstSeen) {
+				$children = $this->data[$item->position];
+
+				if ($cursor->stop) {
+					if ($cut >= 0) {
+						$cut += count($children);
+					}
+					$children = array();
+				}
+			} else {
+				$children = array();
+			}
+			switch ($item->type) {
+				case Stub::TYPE_STRING:
+					$dumper->dumpString($cursor, $item->value, Stub::STRING_BINARY === $item->class, $cut);
+					break;
+
+				case Stub::TYPE_ARRAY:
+					$item = clone $item;
+					$item->type = $item->class;
+					$item->class = $item->value;
+					// No break;
+				case Stub::TYPE_OBJECT:
+				case Stub::TYPE_RESOURCE:
+					$withChildren = $children && $cursor->depth !== $this->maxDepth && $this->maxItemsPerDepth;
+					$dumper->enterHash($cursor, $item->type, $item->class, $withChildren);
+					if ($withChildren) {
+						$cut = $this->dumpChildren($dumper, $cursor, $refs, $children, $cut, $item->type, null !== $item->class);
+					} elseif ($children && 0 <= $cut) {
+						$cut += count($children);
+					}
+					$dumper->leaveHash($cursor, $item->type, $item->class, $withChildren, $cut);
+					break;
+
+				default:
+					throw new \RuntimeException(sprintf('Unexpected Stub type: %s', $item->type));
+			}
+		} elseif ('array' === $type) {
+			$dumper->enterHash($cursor, Cursor::HASH_INDEXED, 0, false);
+			$dumper->leaveHash($cursor, Cursor::HASH_INDEXED, 0, false, 0);
+		} elseif ('string' === $type) {
+			$dumper->dumpString($cursor, $item, false, 0);
+		} else {
+			$dumper->dumpScalar($cursor, $type, $item);
+		}
+	}
+
+	/**
+	 * Dumps children of hash structures.
+	 *
+	 * @param DumperInterface $dumper
+	 * @param Cursor          $parentCursor The cursor of the parent hash
+	 * @param array           &$refs        A map of all references discovered while dumping
+	 * @param array           $children     The children to dump
+	 * @param int             $hashCut      The number of items removed from the original hash
+	 * @param string          $hashType     A Cursor::HASH_* const
+	 * @param bool            $dumpKeys     Whether keys should be dumped or not
+	 *
+	 * @return int The final number of removed items
+	 */
+	private function dumpChildren($dumper, $parentCursor, &$refs, $children, $hashCut, $hashType, $dumpKeys)
+	{
+		$cursor = clone $parentCursor;
+		++$cursor->depth;
+		$cursor->hashType = $hashType;
+		$cursor->hashIndex = 0;
+		$cursor->hashLength = count($children);
+		$cursor->hashCut = $hashCut;
+		foreach ($children as $key => $child) {
+			$cursor->hashKeyIsBinary = isset($key[0]) && !preg_match('//u', $key);
+			$cursor->hashKey = $dumpKeys ? $key : null;
+			$this->dumpItem($dumper, $cursor, $refs, $child);
+			if (++$cursor->hashIndex === $this->maxItemsPerDepth || $cursor->stop) {
+				$parentCursor->stop = true;
+
+				return $hashCut >= 0 ? $hashCut + $cursor->hashLength - $cursor->hashIndex : $hashCut;
+			}
+		}
+
+		return $hashCut;
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Cloner/DumperInterface.php b/htdocs/includes/symfony/var-dumper/Cloner/DumperInterface.php
index eba23d42297..8f647a7e5a7 100644
--- a/htdocs/includes/symfony/var-dumper/Cloner/DumperInterface.php
+++ b/htdocs/includes/symfony/var-dumper/Cloner/DumperInterface.php
@@ -18,43 +18,43 @@ namespace Symfony\Component\VarDumper\Cloner;
  */
 interface DumperInterface
 {
-    /**
-     * Dumps a scalar value.
-     *
-     * @param Cursor $cursor The Cursor position in the dump.
-     * @param string $type   The PHP type of the value being dumped.
-     * @param scalar $value  The scalar value being dumped.
-     */
-    public function dumpScalar(Cursor $cursor, $type, $value);
+	/**
+	 * Dumps a scalar value.
+	 *
+	 * @param Cursor $cursor The Cursor position in the dump
+	 * @param string $type   The PHP type of the value being dumped
+	 * @param scalar $value  The scalar value being dumped
+	 */
+	public function dumpScalar(Cursor $cursor, $type, $value);
 
-    /**
-     * Dumps a string.
-     *
-     * @param Cursor $cursor The Cursor position in the dump.
-     * @param string $str    The string being dumped.
-     * @param bool   $bin    Whether $str is UTF-8 or binary encoded.
-     * @param int    $cut    The number of characters $str has been cut by.
-     */
-    public function dumpString(Cursor $cursor, $str, $bin, $cut);
+	/**
+	 * Dumps a string.
+	 *
+	 * @param Cursor $cursor The Cursor position in the dump
+	 * @param string $str    The string being dumped
+	 * @param bool   $bin    Whether $str is UTF-8 or binary encoded
+	 * @param int    $cut    The number of characters $str has been cut by
+	 */
+	public function dumpString(Cursor $cursor, $str, $bin, $cut);
 
-    /**
-     * Dumps while entering an hash.
-     *
-     * @param Cursor $cursor   The Cursor position in the dump.
-     * @param int    $type     A Cursor::HASH_* const for the type of hash.
-     * @param string $class    The object class, resource type or array count.
-     * @param bool   $hasChild When the dump of the hash has child item.
-     */
-    public function enterHash(Cursor $cursor, $type, $class, $hasChild);
+	/**
+	 * Dumps while entering an hash.
+	 *
+	 * @param Cursor $cursor   The Cursor position in the dump
+	 * @param int    $type     A Cursor::HASH_* const for the type of hash
+	 * @param string $class    The object class, resource type or array count
+	 * @param bool   $hasChild When the dump of the hash has child item
+	 */
+	public function enterHash(Cursor $cursor, $type, $class, $hasChild);
 
-    /**
-     * Dumps while leaving an hash.
-     *
-     * @param Cursor $cursor   The Cursor position in the dump.
-     * @param int    $type     A Cursor::HASH_* const for the type of hash.
-     * @param string $class    The object class, resource type or array count.
-     * @param bool   $hasChild When the dump of the hash has child item.
-     * @param int    $cut      The number of items the hash has been cut by.
-     */
-    public function leaveHash(Cursor $cursor, $type, $class, $hasChild, $cut);
+	/**
+	 * Dumps while leaving an hash.
+	 *
+	 * @param Cursor $cursor   The Cursor position in the dump
+	 * @param int    $type     A Cursor::HASH_* const for the type of hash
+	 * @param string $class    The object class, resource type or array count
+	 * @param bool   $hasChild When the dump of the hash has child item
+	 * @param int    $cut      The number of items the hash has been cut by
+	 */
+	public function leaveHash(Cursor $cursor, $type, $class, $hasChild, $cut);
 }
diff --git a/htdocs/includes/symfony/var-dumper/Cloner/Stub.php b/htdocs/includes/symfony/var-dumper/Cloner/Stub.php
index f58a57a7276..8ee0f23b75e 100644
--- a/htdocs/includes/symfony/var-dumper/Cloner/Stub.php
+++ b/htdocs/includes/symfony/var-dumper/Cloner/Stub.php
@@ -18,23 +18,24 @@ namespace Symfony\Component\VarDumper\Cloner;
  */
 class Stub
 {
-    const TYPE_REF = 'ref';
-    const TYPE_STRING = 'string';
-    const TYPE_ARRAY = 'array';
-    const TYPE_OBJECT = 'object';
-    const TYPE_RESOURCE = 'resource';
+	const TYPE_REF = 'ref';
+	const TYPE_STRING = 'string';
+	const TYPE_ARRAY = 'array';
+	const TYPE_OBJECT = 'object';
+	const TYPE_RESOURCE = 'resource';
 
-    const STRING_BINARY = 'bin';
-    const STRING_UTF8 = 'utf8';
+	const STRING_BINARY = 'bin';
+	const STRING_UTF8 = 'utf8';
 
-    const ARRAY_ASSOC = 'assoc';
-    const ARRAY_INDEXED = 'indexed';
+	const ARRAY_ASSOC = 'assoc';
+	const ARRAY_INDEXED = 'indexed';
 
-    public $type = self::TYPE_REF;
-    public $class = '';
-    public $value;
-    public $cut = 0;
-    public $handle = 0;
-    public $refCount = 0;
-    public $position = 0;
+	public $type = self::TYPE_REF;
+	public $class = '';
+	public $value;
+	public $cut = 0;
+	public $handle = 0;
+	public $refCount = 0;
+	public $position = 0;
+	public $attr = array();
 }
diff --git a/htdocs/includes/symfony/var-dumper/Cloner/VarCloner.php b/htdocs/includes/symfony/var-dumper/Cloner/VarCloner.php
index 98d6e9e51c1..caadfe05e7d 100644
--- a/htdocs/includes/symfony/var-dumper/Cloner/VarCloner.php
+++ b/htdocs/includes/symfony/var-dumper/Cloner/VarCloner.php
@@ -16,285 +16,311 @@ namespace Symfony\Component\VarDumper\Cloner;
  */
 class VarCloner extends AbstractCloner
 {
-    private static $hashMask = 0;
-    private static $hashOffset = 0;
+	private static $hashMask = 0;
+	private static $hashOffset = 0;
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function doClone($var)
-    {
-        $useExt = $this->useExt;
-        $i = 0;                         // Current iteration position in $queue
-        $len = 1;                       // Length of $queue
-        $pos = 0;                       // Number of cloned items past the first level
-        $refs = 0;                      // Hard references counter
-        $queue = array(array($var));    // This breadth-first queue is the return value
-        $arrayRefs = array();           // Map of queue indexes to stub array objects
-        $hardRefs = array();            // Map of original zval hashes to stub objects
-        $objRefs = array();             // Map of original object handles to their stub object couterpart
-        $resRefs = array();             // Map of original resource handles to their stub object couterpart
-        $values = array();              // Map of stub objects' hashes to original values
-        $maxItems = $this->maxItems;
-        $maxString = $this->maxString;
-        $cookie = (object) array();     // Unique object used to detect hard references
-        $gid = uniqid(mt_rand(), true); // Unique string used to detect the special $GLOBALS variable
-        $a = null;                      // Array cast for nested structures
-        $stub = null;                   // Stub capturing the main properties of an original item value
-                                        // or null if the original value is used directly
-        $zval = array(                  // Main properties of the current value
-            'type' => null,
-            'zval_isref' => null,
-            'zval_hash' => null,
-            'array_count' => null,
-            'object_class' => null,
-            'object_handle' => null,
-            'resource_type' => null,
-        );
-        if (!self::$hashMask) {
-            self::initHashMask();
-        }
-        $hashMask = self::$hashMask;
-        $hashOffset = self::$hashOffset;
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function doClone($var)
+	{
+		$useExt = $this->useExt;
+		$len = 1;                       // Length of $queue
+		$pos = 0;                       // Number of cloned items past the first level
+		$refsCounter = 0;               // Hard references counter
+		$queue = array(array($var));    // This breadth-first queue is the return value
+		$arrayRefs = array();           // Map of queue indexes to stub array objects
+		$hardRefs = array();            // Map of original zval hashes to stub objects
+		$objRefs = array();             // Map of original object handles to their stub object couterpart
+		$resRefs = array();             // Map of original resource handles to their stub object couterpart
+		$values = array();              // Map of stub objects' hashes to original values
+		$maxItems = $this->maxItems;
+		$maxString = $this->maxString;
+		$cookie = (object) array();     // Unique object used to detect hard references
+		$gid = uniqid(mt_rand(), true); // Unique string used to detect the special $GLOBALS variable
+		$a = null;                      // Array cast for nested structures
+		$stub = null;                   // Stub capturing the main properties of an original item value
+										// or null if the original value is used directly
+		$zval = array(                  // Main properties of the current value
+			'type' => null,
+			'zval_isref' => null,
+			'zval_hash' => null,
+			'array_count' => null,
+			'object_class' => null,
+			'object_handle' => null,
+			'resource_type' => null,
+		);
+		if (!self::$hashMask) {
+			self::initHashMask();
+		}
+		$hashMask = self::$hashMask;
+		$hashOffset = self::$hashOffset;
 
-        for ($i = 0; $i < $len; ++$i) {
-            $indexed = true;            // Whether the currently iterated array is numerically indexed or not
-            $j = -1;                    // Position in the currently iterated array
-            $step = $queue[$i];         // Copy of the currently iterated array used for hard references detection
-            foreach ($step as $k => $v) {
-                // $k is the original key
-                // $v is the original value or a stub object in case of hard references
-                if ($indexed && $k !== ++$j) {
-                    $indexed = false;
-                }
-                if ($useExt) {
-                    $zval = symfony_zval_info($k, $step);
-                } else {
-                    $step[$k] = $cookie;
-                    if ($zval['zval_isref'] = $queue[$i][$k] === $cookie) {
-                        $zval['zval_hash'] = $v instanceof Stub ? spl_object_hash($v) : null;
-                    }
-                    $zval['type'] = gettype($v);
-                }
-                if ($zval['zval_isref']) {
-                    $queue[$i][$k] = &$stub;    // Break hard references to make $queue completely
-                    unset($stub);               // independent from the original structure
-                    if (isset($hardRefs[$zval['zval_hash']])) {
-                        $queue[$i][$k] = $useExt ? ($v = $hardRefs[$zval['zval_hash']]) : ($step[$k] = $v);
-                        if ($v->value instanceof Stub && (Stub::TYPE_OBJECT === $v->value->type || Stub::TYPE_RESOURCE === $v->value->type)) {
-                            ++$v->value->refCount;
-                        }
-                        ++$v->refCount;
-                        continue;
-                    }
-                }
-                // Create $stub when the original value $v can not be used directly
-                // If $v is a nested structure, put that structure in array $a
-                switch ($zval['type']) {
-                    case 'string':
-                        if (isset($v[0]) && !preg_match('//u', $v)) {
-                            $stub = new Stub();
-                            $stub->type = Stub::TYPE_STRING;
-                            $stub->class = Stub::STRING_BINARY;
-                            if (0 <= $maxString && 0 < $cut = strlen($v) - $maxString) {
-                                $stub->cut = $cut;
-                                $stub->value = substr($v, 0, -$cut);
-                            } else {
-                                $stub->value = $v;
-                            }
-                        } elseif (0 <= $maxString && isset($v[1 + ($maxString >> 2)]) && 0 < $cut = iconv_strlen($v, 'UTF-8') - $maxString) {
-                            $stub = new Stub();
-                            $stub->type = Stub::TYPE_STRING;
-                            $stub->class = Stub::STRING_UTF8;
-                            $stub->cut = $cut;
-                            $stub->value = iconv_substr($v, 0, $maxString, 'UTF-8');
-                        }
-                        break;
+		for ($i = 0; $i < $len; ++$i) {
+			$indexed = true;            // Whether the currently iterated array is numerically indexed or not
+			$j = -1;                    // Position in the currently iterated array
+			$fromObjCast = array_keys($queue[$i]);
+			$fromObjCast = array_keys(array_flip($fromObjCast)) !== $fromObjCast;
+			$refs = $vals = $fromObjCast ? array_values($queue[$i]) : $queue[$i];
+			foreach ($queue[$i] as $k => $v) {
+				// $k is the original key
+				// $v is the original value or a stub object in case of hard references
+				if ($k !== ++$j) {
+					$indexed = false;
+				}
+				if ($fromObjCast) {
+					$k = $j;
+				}
+				if ($useExt) {
+					$zval = symfony_zval_info($k, $refs);
+				} else {
+					$refs[$k] = $cookie;
+					if ($zval['zval_isref'] = $vals[$k] === $cookie) {
+						$zval['zval_hash'] = $v instanceof Stub ? spl_object_hash($v) : null;
+					}
+					$zval['type'] = gettype($v);
+				}
+				if ($zval['zval_isref']) {
+					$vals[$k] = &$stub;         // Break hard references to make $queue completely
+					unset($stub);               // independent from the original structure
+					if (isset($hardRefs[$zval['zval_hash']])) {
+						$vals[$k] = $useExt ? ($v = $hardRefs[$zval['zval_hash']]) : ($refs[$k] = $v);
+						if ($v->value instanceof Stub && (Stub::TYPE_OBJECT === $v->value->type || Stub::TYPE_RESOURCE === $v->value->type)) {
+							++$v->value->refCount;
+						}
+						++$v->refCount;
+						continue;
+					}
+				}
+				// Create $stub when the original value $v can not be used directly
+				// If $v is a nested structure, put that structure in array $a
+				switch ($zval['type']) {
+					case 'string':
+						if (isset($v[0]) && !preg_match('//u', $v)) {
+							$stub = new Stub();
+							$stub->type = Stub::TYPE_STRING;
+							$stub->class = Stub::STRING_BINARY;
+							if (0 <= $maxString && 0 < $cut = strlen($v) - $maxString) {
+								$stub->cut = $cut;
+								$stub->value = substr($v, 0, -$cut);
+							} else {
+								$stub->value = $v;
+							}
+						} elseif (0 <= $maxString && isset($v[1 + ($maxString >> 2)]) && 0 < $cut = mb_strlen($v, 'UTF-8') - $maxString) {
+							$stub = new Stub();
+							$stub->type = Stub::TYPE_STRING;
+							$stub->class = Stub::STRING_UTF8;
+							$stub->cut = $cut;
+							$stub->value = mb_substr($v, 0, $maxString, 'UTF-8');
+						}
+						break;
 
-                    case 'integer':
-                        break;
+					case 'integer':
+						break;
 
-                    case 'array':
-                        if ($v) {
-                            $stub = $arrayRefs[$len] = new Stub();
-                            $stub->type = Stub::TYPE_ARRAY;
-                            $stub->class = Stub::ARRAY_ASSOC;
+					case 'array':
+						if ($v) {
+							$stub = $arrayRefs[$len] = new Stub();
+							$stub->type = Stub::TYPE_ARRAY;
+							$stub->class = Stub::ARRAY_ASSOC;
 
-                            // Copies of $GLOBALS have very strange behavior,
-                            // let's detect them with some black magic
-                            $a = $v;
-                            $a[$gid] = true;
+							// Copies of $GLOBALS have very strange behavior,
+							// let's detect them with some black magic
+							$a = $v;
+							$a[$gid] = true;
 
-                            // Happens with copies of $GLOBALS
-                            if (isset($v[$gid])) {
-                                unset($v[$gid]);
-                                $a = array();
-                                foreach ($v as $gk => &$gv) {
-                                    $a[$gk] = &$gv;
-                                }
-                            } else {
-                                $a = $v;
-                            }
+							// Happens with copies of $GLOBALS
+							if (isset($v[$gid])) {
+								unset($v[$gid]);
+								$a = array();
+								foreach ($v as $gk => &$gv) {
+									$a[$gk] = &$gv;
+								}
+							} else {
+								$a = $v;
+							}
 
-                            $stub->value = $zval['array_count'] ?: count($a);
-                        }
-                        break;
+							$stub->value = $zval['array_count'] ?: count($a);
+						}
+						break;
 
-                    case 'object':
-                        if (empty($objRefs[$h = $zval['object_handle'] ?: ($hashMask ^ hexdec(substr(spl_object_hash($v), $hashOffset, PHP_INT_SIZE)))])) {
-                            $stub = new Stub();
-                            $stub->type = Stub::TYPE_OBJECT;
-                            $stub->class = $zval['object_class'] ?: get_class($v);
-                            $stub->value = $v;
-                            $stub->handle = $h;
-                            $a = $this->castObject($stub, 0 < $i);
-                            if ($v !== $stub->value) {
-                                if (Stub::TYPE_OBJECT !== $stub->type || null === $stub->value) {
-                                    break;
-                                }
-                                if ($useExt) {
-                                    $zval['type'] = $stub->value;
-                                    $zval = symfony_zval_info('type', $zval);
-                                    $h = $zval['object_handle'];
-                                } else {
-                                    $h = $hashMask ^ hexdec(substr(spl_object_hash($stub->value), $hashOffset, PHP_INT_SIZE));
-                                }
-                                $stub->handle = $h;
-                            }
-                            $stub->value = null;
-                            if (0 <= $maxItems && $maxItems <= $pos) {
-                                $stub->cut = count($a);
-                                $a = null;
-                            }
-                        }
-                        if (empty($objRefs[$h])) {
-                            $objRefs[$h] = $stub;
-                        } else {
-                            $stub = $objRefs[$h];
-                            ++$stub->refCount;
-                            $a = null;
-                        }
-                        break;
+					case 'object':
+						if (empty($objRefs[$h = $zval['object_handle'] ?: ($hashMask ^ hexdec(substr(spl_object_hash($v), $hashOffset, PHP_INT_SIZE)))])) {
+							$stub = new Stub();
+							$stub->type = Stub::TYPE_OBJECT;
+							$stub->class = $zval['object_class'] ?: get_class($v);
+							$stub->value = $v;
+							$stub->handle = $h;
+							$a = $this->castObject($stub, 0 < $i);
+							if ($v !== $stub->value) {
+								if (Stub::TYPE_OBJECT !== $stub->type || null === $stub->value) {
+									break;
+								}
+								if ($useExt) {
+									$zval['type'] = $stub->value;
+									$zval = symfony_zval_info('type', $zval);
+									$h = $zval['object_handle'];
+								} else {
+									$h = $hashMask ^ hexdec(substr(spl_object_hash($stub->value), $hashOffset, PHP_INT_SIZE));
+								}
+								$stub->handle = $h;
+							}
+							$stub->value = null;
+							if (0 <= $maxItems && $maxItems <= $pos) {
+								$stub->cut = count($a);
+								$a = null;
+							}
+						}
+						if (empty($objRefs[$h])) {
+							$objRefs[$h] = $stub;
+						} else {
+							$stub = $objRefs[$h];
+							++$stub->refCount;
+							$a = null;
+						}
+						break;
 
-                    case 'resource':
-                    case 'unknown type':
-                        if (empty($resRefs[$h = (int) $v])) {
-                            $stub = new Stub();
-                            $stub->type = Stub::TYPE_RESOURCE;
-                            $stub->class = $zval['resource_type'] ?: get_resource_type($v);
-                            $stub->value = $v;
-                            $stub->handle = $h;
-                            $a = $this->castResource($stub, 0 < $i);
-                            $stub->value = null;
-                            if (0 <= $maxItems && $maxItems <= $pos) {
-                                $stub->cut = count($a);
-                                $a = null;
-                            }
-                        }
-                        if (empty($resRefs[$h])) {
-                            $resRefs[$h] = $stub;
-                        } else {
-                            $stub = $resRefs[$h];
-                            ++$stub->refCount;
-                            $a = null;
-                        }
-                        break;
-                }
+					case 'resource':
+					case 'unknown type':
+					case 'resource (closed)':
+						if (empty($resRefs[$h = (int) $v])) {
+							$stub = new Stub();
+							$stub->type = Stub::TYPE_RESOURCE;
+							if ('Unknown' === $stub->class = $zval['resource_type'] ?: @get_resource_type($v)) {
+								$stub->class = 'Closed';
+							}
+							$stub->value = $v;
+							$stub->handle = $h;
+							$a = $this->castResource($stub, 0 < $i);
+							$stub->value = null;
+							if (0 <= $maxItems && $maxItems <= $pos) {
+								$stub->cut = count($a);
+								$a = null;
+							}
+						}
+						if (empty($resRefs[$h])) {
+							$resRefs[$h] = $stub;
+						} else {
+							$stub = $resRefs[$h];
+							++$stub->refCount;
+							$a = null;
+						}
+						break;
+				}
 
-                if (isset($stub)) {
-                    if ($zval['zval_isref']) {
-                        if ($useExt) {
-                            $queue[$i][$k] = $hardRefs[$zval['zval_hash']] = $v = new Stub();
-                            $v->value = $stub;
-                        } else {
-                            $step[$k] = new Stub();
-                            $step[$k]->value = $stub;
-                            $h = spl_object_hash($step[$k]);
-                            $queue[$i][$k] = $hardRefs[$h] = &$step[$k];
-                            $values[$h] = $v;
-                        }
-                        $queue[$i][$k]->handle = ++$refs;
-                    } else {
-                        $queue[$i][$k] = $stub;
-                    }
+				if (isset($stub)) {
+					if ($zval['zval_isref']) {
+						if ($useExt) {
+							$vals[$k] = $hardRefs[$zval['zval_hash']] = $v = new Stub();
+							$v->value = $stub;
+						} else {
+							$refs[$k] = new Stub();
+							$refs[$k]->value = $stub;
+							$h = spl_object_hash($refs[$k]);
+							$vals[$k] = $hardRefs[$h] = &$refs[$k];
+							$values[$h] = $v;
+						}
+						$vals[$k]->handle = ++$refsCounter;
+					} else {
+						$vals[$k] = $stub;
+					}
 
-                    if ($a) {
-                        if ($i && 0 <= $maxItems) {
-                            $k = count($a);
-                            if ($pos < $maxItems) {
-                                if ($maxItems < $pos += $k) {
-                                    $a = array_slice($a, 0, $maxItems - $pos);
-                                    if ($stub->cut >= 0) {
-                                        $stub->cut += $pos - $maxItems;
-                                    }
-                                }
-                            } else {
-                                if ($stub->cut >= 0) {
-                                    $stub->cut += $k;
-                                }
-                                $stub = $a = null;
-                                unset($arrayRefs[$len]);
-                                continue;
-                            }
-                        }
-                        $queue[$len] = $a;
-                        $stub->position = $len++;
-                    }
-                    $stub = $a = null;
-                } elseif ($zval['zval_isref']) {
-                    if ($useExt) {
-                        $queue[$i][$k] = $hardRefs[$zval['zval_hash']] = new Stub();
-                        $queue[$i][$k]->value = $v;
-                    } else {
-                        $step[$k] = $queue[$i][$k] = new Stub();
-                        $step[$k]->value = $v;
-                        $h = spl_object_hash($step[$k]);
-                        $hardRefs[$h] = &$step[$k];
-                        $values[$h] = $v;
-                    }
-                    $queue[$i][$k]->handle = ++$refs;
-                }
-            }
+					if ($a) {
+						if ($i && 0 <= $maxItems) {
+							$k = count($a);
+							if ($pos < $maxItems) {
+								if ($maxItems < $pos += $k) {
+									$a = array_slice($a, 0, $maxItems - $pos);
+									if ($stub->cut >= 0) {
+										$stub->cut += $pos - $maxItems;
+									}
+								}
+							} else {
+								if ($stub->cut >= 0) {
+									$stub->cut += $k;
+								}
+								$stub = $a = null;
+								unset($arrayRefs[$len]);
+								continue;
+							}
+						}
+						$queue[$len] = $a;
+						$stub->position = $len++;
+					}
+					$stub = $a = null;
+				} elseif ($zval['zval_isref']) {
+					if ($useExt) {
+						$vals[$k] = $hardRefs[$zval['zval_hash']] = new Stub();
+						$vals[$k]->value = $v;
+					} else {
+						$refs[$k] = $vals[$k] = new Stub();
+						$refs[$k]->value = $v;
+						$h = spl_object_hash($refs[$k]);
+						$hardRefs[$h] = &$refs[$k];
+						$values[$h] = $v;
+					}
+					$vals[$k]->handle = ++$refsCounter;
+				}
+			}
 
-            if (isset($arrayRefs[$i])) {
-                if ($indexed) {
-                    $arrayRefs[$i]->class = Stub::ARRAY_INDEXED;
-                }
-                unset($arrayRefs[$i]);
-            }
-        }
+			if ($fromObjCast) {
+				$refs = $vals;
+				$vals = array();
+				$j = -1;
+				foreach ($queue[$i] as $k => $v) {
+					foreach (array($k => $v) as $a => $v) {
+					}
+					if ($a !== $k) {
+						$vals = (object) $vals;
+						$vals->{$k} = $refs[++$j];
+						$vals = (array) $vals;
+					} else {
+						$vals[$k] = $refs[++$j];
+					}
+				}
+			}
 
-        foreach ($values as $h => $v) {
-            $hardRefs[$h] = $v;
-        }
+			$queue[$i] = $vals;
 
-        return $queue;
-    }
+			if (isset($arrayRefs[$i])) {
+				if ($indexed) {
+					$arrayRefs[$i]->class = Stub::ARRAY_INDEXED;
+				}
+				unset($arrayRefs[$i]);
+			}
+		}
 
-    private static function initHashMask()
-    {
-        $obj = (object) array();
-        self::$hashOffset = 16 - PHP_INT_SIZE;
-        self::$hashMask = -1;
+		foreach ($values as $h => $v) {
+			$hardRefs[$h] = $v;
+		}
 
-        if (defined('HHVM_VERSION')) {
-            self::$hashOffset += 16;
-        } else {
-            // check if we are nested in an output buffering handler to prevent a fatal error with ob_start() below
-            $obFuncs = array('ob_clean', 'ob_end_clean', 'ob_flush', 'ob_end_flush', 'ob_get_contents', 'ob_get_flush');
-            foreach (debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) as $frame) {
-                if (isset($frame['function'][0]) && !isset($frame['class']) && 'o' === $frame['function'][0] && in_array($frame['function'], $obFuncs)) {
-                    $frame['line'] = 0;
-                    break;
-                }
-            }
-            if (!empty($frame['line'])) {
-                ob_start();
-                debug_zval_dump($obj);
-                self::$hashMask = substr(ob_get_clean(), 17);
-            }
-        }
+		return $queue;
+	}
 
-        self::$hashMask ^= hexdec(substr(spl_object_hash($obj), self::$hashOffset, PHP_INT_SIZE));
-    }
+	private static function initHashMask()
+	{
+		$obj = (object) array();
+		self::$hashOffset = 16 - PHP_INT_SIZE;
+		self::$hashMask = -1;
+
+		if (defined('HHVM_VERSION')) {
+			self::$hashOffset += 16;
+		} else {
+			// check if we are nested in an output buffering handler to prevent a fatal error with ob_start() below
+			$obFuncs = array('ob_clean', 'ob_end_clean', 'ob_flush', 'ob_end_flush', 'ob_get_contents', 'ob_get_flush');
+			foreach (debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) as $frame) {
+				if (isset($frame['function'][0]) && !isset($frame['class']) && 'o' === $frame['function'][0] && in_array($frame['function'], $obFuncs)) {
+					$frame['line'] = 0;
+					break;
+				}
+			}
+			if (!empty($frame['line'])) {
+				ob_start();
+				debug_zval_dump($obj);
+				self::$hashMask = (int) substr(ob_get_clean(), 17);
+			}
+		}
+
+		self::$hashMask ^= hexdec(substr(spl_object_hash($obj), self::$hashOffset, PHP_INT_SIZE));
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Dumper/AbstractDumper.php b/htdocs/includes/symfony/var-dumper/Dumper/AbstractDumper.php
index f8b9c107779..fb68a8908c4 100644
--- a/htdocs/includes/symfony/var-dumper/Dumper/AbstractDumper.php
+++ b/htdocs/includes/symfony/var-dumper/Dumper/AbstractDumper.php
@@ -21,156 +21,181 @@ use Symfony\Component\VarDumper\Cloner\DumperInterface;
  */
 abstract class AbstractDumper implements DataDumperInterface, DumperInterface
 {
-    public static $defaultOutput = 'php://output';
+	const DUMP_LIGHT_ARRAY = 1;
+	const DUMP_STRING_LENGTH = 2;
 
-    protected $line = '';
-    protected $lineDumper;
-    protected $outputStream;
-    protected $decimalPoint; // This is locale dependent
-    protected $indentPad = '  ';
+	public static $defaultOutput = 'php://output';
 
-    private $charset;
+	protected $line = '';
+	protected $lineDumper;
+	protected $outputStream;
+	protected $decimalPoint; // This is locale dependent
+	protected $indentPad = '  ';
+	protected $flags;
 
-    /**
-     * @param callable|resource|string|null $output  A line dumper callable, an opened stream or an output path, defaults to static::$defaultOutput.
-     * @param string                        $charset The default character encoding to use for non-UTF8 strings.
-     */
-    public function __construct($output = null, $charset = null)
-    {
-        $this->setCharset($charset ?: ini_get('php.output_encoding') ?: ini_get('default_charset') ?: 'UTF-8');
-        $this->decimalPoint = (string) 0.5;
-        $this->decimalPoint = $this->decimalPoint[1];
-        $this->setOutput($output ?: static::$defaultOutput);
-        if (!$output && is_string(static::$defaultOutput)) {
-            static::$defaultOutput = $this->outputStream;
-        }
-    }
+	private $charset;
 
-    /**
-     * Sets the output destination of the dumps.
-     *
-     * @param callable|resource|string $output A line dumper callable, an opened stream or an output path.
-     *
-     * @return callable|resource|string The previous output destination.
-     */
-    public function setOutput($output)
-    {
-        $prev = null !== $this->outputStream ? $this->outputStream : $this->lineDumper;
+	/**
+	 * @param callable|resource|string|null $output  A line dumper callable, an opened stream or an output path, defaults to static::$defaultOutput
+	 * @param string                        $charset The default character encoding to use for non-UTF8 strings
+	 * @param int                           $flags   A bit field of static::DUMP_* constants to fine tune dumps representation
+	 */
+	public function __construct($output = null, $charset = null, $flags = 0)
+	{
+		$this->flags = (int) $flags;
+		$this->setCharset($charset ?: ini_get('php.output_encoding') ?: ini_get('default_charset') ?: 'UTF-8');
+		$this->decimalPoint = localeconv();
+		$this->decimalPoint = $this->decimalPoint['decimal_point'];
+		$this->setOutput($output ?: static::$defaultOutput);
+		if (!$output && is_string(static::$defaultOutput)) {
+			static::$defaultOutput = $this->outputStream;
+		}
+	}
 
-        if (is_callable($output)) {
-            $this->outputStream = null;
-            $this->lineDumper = $output;
-        } else {
-            if (is_string($output)) {
-                $output = fopen($output, 'wb');
-            }
-            $this->outputStream = $output;
-            $this->lineDumper = array($this, 'echoLine');
-        }
+	/**
+	 * Sets the output destination of the dumps.
+	 *
+	 * @param callable|resource|string $output A line dumper callable, an opened stream or an output path
+	 *
+	 * @return callable|resource|string The previous output destination
+	 */
+	public function setOutput($output)
+	{
+		$prev = null !== $this->outputStream ? $this->outputStream : $this->lineDumper;
 
-        return $prev;
-    }
+		if (is_callable($output)) {
+			$this->outputStream = null;
+			$this->lineDumper = $output;
+		} else {
+			if (is_string($output)) {
+				$output = fopen($output, 'wb');
+			}
+			$this->outputStream = $output;
+			$this->lineDumper = array($this, 'echoLine');
+		}
 
-    /**
-     * Sets the default character encoding to use for non-UTF8 strings.
-     *
-     * @param string $charset The default character encoding to use for non-UTF8 strings.
-     *
-     * @return string The previous charset.
-     */
-    public function setCharset($charset)
-    {
-        $prev = $this->charset;
+		return $prev;
+	}
 
-        $charset = strtoupper($charset);
-        $charset = null === $charset || 'UTF-8' === $charset || 'UTF8' === $charset ? 'CP1252' : $charset;
+	/**
+	 * Sets the default character encoding to use for non-UTF8 strings.
+	 *
+	 * @param string $charset The default character encoding to use for non-UTF8 strings
+	 *
+	 * @return string The previous charset
+	 */
+	public function setCharset($charset)
+	{
+		$prev = $this->charset;
 
-        $this->charset = $charset;
+		$charset = strtoupper($charset);
+		$charset = null === $charset || 'UTF-8' === $charset || 'UTF8' === $charset ? 'CP1252' : $charset;
 
-        return $prev;
-    }
+		$this->charset = $charset;
 
-    /**
-     * Sets the indentation pad string.
-     *
-     * @param string $pad A string the will be prepended to dumped lines, repeated by nesting level.
-     *
-     * @return string The indent pad.
-     */
-    public function setIndentPad($pad)
-    {
-        $prev = $this->indentPad;
-        $this->indentPad = $pad;
+		return $prev;
+	}
 
-        return $prev;
-    }
+	/**
+	 * Sets the indentation pad string.
+	 *
+	 * @param string $pad A string the will be prepended to dumped lines, repeated by nesting level
+	 *
+	 * @return string The indent pad
+	 */
+	public function setIndentPad($pad)
+	{
+		$prev = $this->indentPad;
+		$this->indentPad = $pad;
 
-    /**
-     * Dumps a Data object.
-     *
-     * @param Data                          $data   A Data object.
-     * @param callable|resource|string|null $output A line dumper callable, an opened stream or an output path.
-     */
-    public function dump(Data $data, $output = null)
-    {
-        $exception = null;
-        if ($output) {
-            $prevOutput = $this->setOutput($output);
-        }
-        try {
-            $data->dump($this);
-            $this->dumpLine(-1);
-        } catch (\Exception $exception) {
-            // Re-thrown below
-        }
-        if ($output) {
-            $this->setOutput($prevOutput);
-        }
-        if (null !== $exception) {
-            throw $exception;
-        }
-    }
+		return $prev;
+	}
 
-    /**
-     * Dumps the current line.
-     *
-     * @param int $depth The recursive depth in the dumped structure for the line being dumped.
-     */
-    protected function dumpLine($depth)
-    {
-        call_user_func($this->lineDumper, $this->line, $depth, $this->indentPad);
-        $this->line = '';
-    }
+	/**
+	 * Dumps a Data object.
+	 *
+	 * @param Data                               $data   A Data object
+	 * @param callable|resource|string|true|null $output A line dumper callable, an opened stream, an output path or true to return the dump
+	 *
+	 * @return string|null The dump as string when $output is true
+	 */
+	public function dump(Data $data, $output = null)
+	{
+		$this->decimalPoint = localeconv();
+		$this->decimalPoint = $this->decimalPoint['decimal_point'];
 
-    /**
-     * Generic line dumper callback.
-     *
-     * @param string $line  The line to write.
-     * @param int    $depth The recursive depth in the dumped structure.
-     */
-    protected function echoLine($line, $depth, $indentPad)
-    {
-        if (-1 !== $depth) {
-            fwrite($this->outputStream, str_repeat($indentPad, $depth).$line."\n");
-        }
-    }
+		if ($returnDump = true === $output) {
+			$output = fopen('php://memory', 'r+b');
+		}
+		if ($output) {
+			$prevOutput = $this->setOutput($output);
+		}
+		try {
+			$data->dump($this);
+			$this->dumpLine(-1);
 
-    /**
-     * Converts a non-UTF-8 string to UTF-8.
-     *
-     * @param string $s The non-UTF-8 string to convert.
-     *
-     * @return string The string converted to UTF-8.
-     */
-    protected function utf8Encode($s)
-    {
-        if (false !== $c = @iconv($this->charset, 'UTF-8', $s)) {
-            return $c;
-        }
-        if ('CP1252' !== $this->charset && false !== $c = @iconv('CP1252', 'UTF-8', $s)) {
-            return $c;
-        }
+			if ($returnDump) {
+				$result = stream_get_contents($output, -1, 0);
+				fclose($output);
 
-        return iconv('CP850', 'UTF-8', $s);
-    }
+				return $result;
+			}
+		} finally {
+			if ($output) {
+				$this->setOutput($prevOutput);
+			}
+		}
+	}
+
+	/**
+	 * Dumps the current line.
+	 *
+	 * @param int $depth The recursive depth in the dumped structure for the line being dumped
+	 */
+	protected function dumpLine($depth)
+	{
+		call_user_func($this->lineDumper, $this->line, $depth, $this->indentPad);
+		$this->line = '';
+	}
+
+	/**
+	 * Generic line dumper callback.
+	 *
+	 * @param string $line      The line to write
+	 * @param int    $depth     The recursive depth in the dumped structure
+	 * @param string $indentPad The line indent pad
+	 */
+	protected function echoLine($line, $depth, $indentPad)
+	{
+		if (-1 !== $depth) {
+			fwrite($this->outputStream, str_repeat($indentPad, $depth).$line."\n");
+		}
+	}
+
+	/**
+	 * Converts a non-UTF-8 string to UTF-8.
+	 *
+	 * @param string $s The non-UTF-8 string to convert
+	 *
+	 * @return string The string converted to UTF-8
+	 */
+	protected function utf8Encode($s)
+	{
+		if (preg_match('//u', $s)) {
+			return $s;
+		}
+
+		if (!function_exists('iconv')) {
+			throw new \RuntimeException('Unable to convert a non-UTF-8 string to UTF-8: required function iconv() does not exist. You should install ext-iconv or symfony/polyfill-iconv.');
+		}
+
+		if (false !== $c = @iconv($this->charset, 'UTF-8', $s)) {
+			return $c;
+		}
+		if ('CP1252' !== $this->charset && false !== $c = @iconv('CP1252', 'UTF-8', $s)) {
+			return $c;
+		}
+
+		return iconv('CP850', 'UTF-8', $s);
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Dumper/CliDumper.php b/htdocs/includes/symfony/var-dumper/Dumper/CliDumper.php
index bca2abcb3d0..95304b92817 100644
--- a/htdocs/includes/symfony/var-dumper/Dumper/CliDumper.php
+++ b/htdocs/includes/symfony/var-dumper/Dumper/CliDumper.php
@@ -20,452 +20,470 @@ use Symfony\Component\VarDumper\Cloner\Cursor;
  */
 class CliDumper extends AbstractDumper
 {
-    public static $defaultColors;
-    public static $defaultOutput = 'php://stdout';
+	public static $defaultColors;
+	public static $defaultOutput = 'php://stdout';
 
-    protected $colors;
-    protected $maxStringWidth = 0;
-    protected $styles = array(
-        // See http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
-        'default' => '38;5;208',
-        'num' => '1;38;5;38',
-        'const' => '1;38;5;208',
-        'str' => '1;38;5;113',
-        'note' => '38;5;38',
-        'ref' => '38;5;247',
-        'public' => '',
-        'protected' => '',
-        'private' => '',
-        'meta' => '38;5;170',
-        'key' => '38;5;113',
-        'index' => '38;5;38',
-    );
+	protected $colors;
+	protected $maxStringWidth = 0;
+	protected $styles = array(
+		// See http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
+		'default' => '38;5;208',
+		'num' => '1;38;5;38',
+		'const' => '1;38;5;208',
+		'str' => '1;38;5;113',
+		'note' => '38;5;38',
+		'ref' => '38;5;247',
+		'public' => '',
+		'protected' => '',
+		'private' => '',
+		'meta' => '38;5;170',
+		'key' => '38;5;113',
+		'index' => '38;5;38',
+	);
 
-    protected static $controlCharsRx = '/[\x00-\x1F\x7F]+/';
-    protected static $controlCharsMap = array(
-        "\t" => '\t',
-        "\n" => '\n',
-        "\v" => '\v',
-        "\f" => '\f',
-        "\r" => '\r',
-        "\033" => '\e',
-    );
+	protected static $controlCharsRx = '/[\x00-\x1F\x7F]+/';
+	protected static $controlCharsMap = array(
+		"\t" => '\t',
+		"\n" => '\n',
+		"\v" => '\v',
+		"\f" => '\f',
+		"\r" => '\r',
+		"\033" => '\e',
+	);
 
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($output = null, $charset = null)
-    {
-        parent::__construct($output, $charset);
+	/**
+	 * {@inheritdoc}
+	 */
+	public function __construct($output = null, $charset = null, $flags = 0)
+	{
+		parent::__construct($output, $charset, $flags);
 
-        if ('\\' === DIRECTORY_SEPARATOR && false !== @getenv('ANSICON')) {
-            // Use only the base 16 xterm colors when using ANSICON
-            $this->setStyles(array(
-                'default' => '31',
-                'num' => '1;34',
-                'const' => '1;31',
-                'str' => '1;32',
-                'note' => '34',
-                'ref' => '1;30',
-                'meta' => '35',
-                'key' => '32',
-                'index' => '34',
-            ));
-        }
-    }
+		if ('\\' === DIRECTORY_SEPARATOR && 'ON' !== @getenv('ConEmuANSI') && 'xterm' !== @getenv('TERM')) {
+			// Use only the base 16 xterm colors when using ANSICON or standard Windows 10 CLI
+			$this->setStyles(array(
+				'default' => '31',
+				'num' => '1;34',
+				'const' => '1;31',
+				'str' => '1;32',
+				'note' => '34',
+				'ref' => '1;30',
+				'meta' => '35',
+				'key' => '32',
+				'index' => '34',
+			));
+		}
+	}
 
-    /**
-     * Enables/disables colored output.
-     *
-     * @param bool $colors
-     */
-    public function setColors($colors)
-    {
-        $this->colors = (bool) $colors;
-    }
+	/**
+	 * Enables/disables colored output.
+	 *
+	 * @param bool $colors
+	 */
+	public function setColors($colors)
+	{
+		$this->colors = (bool) $colors;
+	}
 
-    /**
-     * Sets the maximum number of characters per line for dumped strings.
-     *
-     * @param int $maxStringWidth
-     */
-    public function setMaxStringWidth($maxStringWidth)
-    {
-        $this->maxStringWidth = (int) $maxStringWidth;
-    }
+	/**
+	 * Sets the maximum number of characters per line for dumped strings.
+	 *
+	 * @param int $maxStringWidth
+	 */
+	public function setMaxStringWidth($maxStringWidth)
+	{
+		$this->maxStringWidth = (int) $maxStringWidth;
+	}
 
-    /**
-     * Configures styles.
-     *
-     * @param array $styles A map of style names to style definitions.
-     */
-    public function setStyles(array $styles)
-    {
-        $this->styles = $styles + $this->styles;
-    }
+	/**
+	 * Configures styles.
+	 *
+	 * @param array $styles A map of style names to style definitions
+	 */
+	public function setStyles(array $styles)
+	{
+		$this->styles = $styles + $this->styles;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function dumpScalar(Cursor $cursor, $type, $value)
-    {
-        $this->dumpKey($cursor);
+	/**
+	 * {@inheritdoc}
+	 */
+	public function dumpScalar(Cursor $cursor, $type, $value)
+	{
+		$this->dumpKey($cursor);
 
-        $style = 'const';
-        $attr = array();
+		$style = 'const';
+		$attr = $cursor->attr;
 
-        switch ($type) {
-            case 'integer':
-                $style = 'num';
-                break;
+		switch ($type) {
+			case 'default':
+				$style = 'default';
+				break;
 
-            case 'double':
-                $style = 'num';
+			case 'integer':
+				$style = 'num';
+				break;
 
-                switch (true) {
-                    case INF === $value:  $value = 'INF';  break;
-                    case -INF === $value: $value = '-INF'; break;
-                    case is_nan($value):  $value = 'NAN';  break;
-                    default:
-                        $value = (string) $value;
-                        if (false === strpos($value, $this->decimalPoint)) {
-                            $value .= $this->decimalPoint.'0';
-                        }
-                        break;
-                }
-                break;
+			case 'double':
+				$style = 'num';
 
-            case 'NULL':
-                $value = 'null';
-                break;
+				switch (true) {
+					case INF === $value:  $value = 'INF'; break;
+					case -INF === $value: $value = '-INF'; break;
+					case is_nan($value):  $value = 'NAN'; break;
+					default:
+						$value = (string) $value;
+						if (false === strpos($value, $this->decimalPoint)) {
+							$value .= $this->decimalPoint.'0';
+						}
+						break;
+				}
+				break;
 
-            case 'boolean':
-                $value = $value ? 'true' : 'false';
-                break;
+			case 'NULL':
+				$value = 'null';
+				break;
 
-            default:
-                $attr['value'] = isset($value[0]) && !preg_match('//u', $value) ? $this->utf8Encode($value) : $value;
-                $value = isset($type[0]) && !preg_match('//u', $type) ? $this->utf8Encode($type) : $type;
-                break;
-        }
+			case 'boolean':
+				$value = $value ? 'true' : 'false';
+				break;
 
-        $this->line .= $this->style($style, $value, $attr);
+			default:
+				$attr += array('value' => $this->utf8Encode($value));
+				$value = $this->utf8Encode($type);
+				break;
+		}
 
-        $this->dumpLine($cursor->depth, true);
-    }
+		$this->line .= $this->style($style, $value, $attr);
 
-    /**
-     * {@inheritdoc}
-     */
-    public function dumpString(Cursor $cursor, $str, $bin, $cut)
-    {
-        $this->dumpKey($cursor);
+		$this->dumpLine($cursor->depth, true);
+	}
 
-        if ($bin) {
-            $str = $this->utf8Encode($str);
-        }
-        if ('' === $str) {
-            $this->line .= '""';
-            $this->dumpLine($cursor->depth, true);
-        } else {
-            $attr = array(
-                'length' => 0 <= $cut ? iconv_strlen($str, 'UTF-8') + $cut : 0,
-                'binary' => $bin,
-            );
-            $str = explode("\n", $str);
-            if (isset($str[1]) && !isset($str[2]) && !isset($str[1][0])) {
-                unset($str[1]);
-                $str[0] .= "\n";
-            }
-            $m = count($str) - 1;
-            $i = $lineCut = 0;
+	/**
+	 * {@inheritdoc}
+	 */
+	public function dumpString(Cursor $cursor, $str, $bin, $cut)
+	{
+		$this->dumpKey($cursor);
+		$attr = $cursor->attr;
 
-            if ($bin) {
-                $this->line .= 'b';
-            }
+		if ($bin) {
+			$str = $this->utf8Encode($str);
+		}
+		if ('' === $str) {
+			$this->line .= '""';
+			$this->dumpLine($cursor->depth, true);
+		} else {
+			$attr += array(
+				'length' => 0 <= $cut ? mb_strlen($str, 'UTF-8') + $cut : 0,
+				'binary' => $bin,
+			);
+			$str = explode("\n", $str);
+			if (isset($str[1]) && !isset($str[2]) && !isset($str[1][0])) {
+				unset($str[1]);
+				$str[0] .= "\n";
+			}
+			$m = count($str) - 1;
+			$i = $lineCut = 0;
 
-            if ($m) {
-                $this->line .= '"""';
-                $this->dumpLine($cursor->depth);
-            } else {
-                $this->line .= '"';
-            }
+			if (self::DUMP_STRING_LENGTH & $this->flags) {
+				$this->line .= '('.$attr['length'].') ';
+			}
+			if ($bin) {
+				$this->line .= 'b';
+			}
 
-            foreach ($str as $str) {
-                if ($i < $m) {
-                    $str .= "\n";
-                }
-                if (0 < $this->maxStringWidth && $this->maxStringWidth < $len = iconv_strlen($str, 'UTF-8')) {
-                    $str = iconv_substr($str, 0, $this->maxStringWidth, 'UTF-8');
-                    $lineCut = $len - $this->maxStringWidth;
-                }
-                if ($m && 0 < $cursor->depth) {
-                    $this->line .= $this->indentPad;
-                }
-                if ('' !== $str) {
-                    $this->line .= $this->style('str', $str, $attr);
-                }
-                if ($i++ == $m) {
-                    if ($m) {
-                        if ('' !== $str) {
-                            $this->dumpLine($cursor->depth);
-                            if (0 < $cursor->depth) {
-                                $this->line .= $this->indentPad;
-                            }
-                        }
-                        $this->line .= '"""';
-                    } else {
-                        $this->line .= '"';
-                    }
-                    if ($cut < 0) {
-                        $this->line .= '…';
-                        $lineCut = 0;
-                    } elseif ($cut) {
-                        $lineCut += $cut;
-                    }
-                }
-                if ($lineCut) {
-                    $this->line .= '…'.$lineCut;
-                    $lineCut = 0;
-                }
+			if ($m) {
+				$this->line .= '"""';
+				$this->dumpLine($cursor->depth);
+			} else {
+				$this->line .= '"';
+			}
 
-                $this->dumpLine($cursor->depth, $i > $m);
-            }
-        }
-    }
+			foreach ($str as $str) {
+				if ($i < $m) {
+					$str .= "\n";
+				}
+				if (0 < $this->maxStringWidth && $this->maxStringWidth < $len = mb_strlen($str, 'UTF-8')) {
+					$str = mb_substr($str, 0, $this->maxStringWidth, 'UTF-8');
+					$lineCut = $len - $this->maxStringWidth;
+				}
+				if ($m && 0 < $cursor->depth) {
+					$this->line .= $this->indentPad;
+				}
+				if ('' !== $str) {
+					$this->line .= $this->style('str', $str, $attr);
+				}
+				if ($i++ == $m) {
+					if ($m) {
+						if ('' !== $str) {
+							$this->dumpLine($cursor->depth);
+							if (0 < $cursor->depth) {
+								$this->line .= $this->indentPad;
+							}
+						}
+						$this->line .= '"""';
+					} else {
+						$this->line .= '"';
+					}
+					if ($cut < 0) {
+						$this->line .= '…';
+						$lineCut = 0;
+					} elseif ($cut) {
+						$lineCut += $cut;
+					}
+				}
+				if ($lineCut) {
+					$this->line .= '…'.$lineCut;
+					$lineCut = 0;
+				}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function enterHash(Cursor $cursor, $type, $class, $hasChild)
-    {
-        $this->dumpKey($cursor);
+				$this->dumpLine($cursor->depth, $i > $m);
+			}
+		}
+	}
 
-        if (!preg_match('//u', $class)) {
-            $class = $this->utf8Encode($class);
-        }
-        if (Cursor::HASH_OBJECT === $type) {
-            $prefix = $class && 'stdClass' !== $class ? $this->style('note', $class).' {' : '{';
-        } elseif (Cursor::HASH_RESOURCE === $type) {
-            $prefix = $this->style('note', $class.' resource').($hasChild ? ' {' : ' ');
-        } else {
-            $prefix = $class ? $this->style('note', 'array:'.$class).' [' : '[';
-        }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function enterHash(Cursor $cursor, $type, $class, $hasChild)
+	{
+		$this->dumpKey($cursor);
 
-        if ($cursor->softRefCount || 0 < $cursor->softRefHandle) {
-            $prefix .= $this->style('ref', (Cursor::HASH_RESOURCE === $type ? '@' : '#').(0 < $cursor->softRefHandle ? $cursor->softRefHandle : $cursor->softRefTo), array('count' => $cursor->softRefCount));
-        } elseif ($cursor->hardRefTo && !$cursor->refIndex && $class) {
-            $prefix .= $this->style('ref', '&'.$cursor->hardRefTo, array('count' => $cursor->hardRefCount));
-        } elseif (!$hasChild && Cursor::HASH_RESOURCE === $type) {
-            $prefix = substr($prefix, 0, -1);
-        }
+		$class = $this->utf8Encode($class);
+		if (Cursor::HASH_OBJECT === $type) {
+			$prefix = $class && 'stdClass' !== $class ? $this->style('note', $class).' {' : '{';
+		} elseif (Cursor::HASH_RESOURCE === $type) {
+			$prefix = $this->style('note', $class.' resource').($hasChild ? ' {' : ' ');
+		} else {
+			$prefix = $class && !(self::DUMP_LIGHT_ARRAY & $this->flags) ? $this->style('note', 'array:'.$class).' [' : '[';
+		}
 
-        $this->line .= $prefix;
+		if ($cursor->softRefCount || 0 < $cursor->softRefHandle) {
+			$prefix .= $this->style('ref', (Cursor::HASH_RESOURCE === $type ? '@' : '#').(0 < $cursor->softRefHandle ? $cursor->softRefHandle : $cursor->softRefTo), array('count' => $cursor->softRefCount));
+		} elseif ($cursor->hardRefTo && !$cursor->refIndex && $class) {
+			$prefix .= $this->style('ref', '&'.$cursor->hardRefTo, array('count' => $cursor->hardRefCount));
+		} elseif (!$hasChild && Cursor::HASH_RESOURCE === $type) {
+			$prefix = substr($prefix, 0, -1);
+		}
 
-        if ($hasChild) {
-            $this->dumpLine($cursor->depth);
-        }
-    }
+		$this->line .= $prefix;
 
-    /**
-     * {@inheritdoc}
-     */
-    public function leaveHash(Cursor $cursor, $type, $class, $hasChild, $cut)
-    {
-        $this->dumpEllipsis($cursor, $hasChild, $cut);
-        $this->line .= Cursor::HASH_OBJECT === $type ? '}' : (Cursor::HASH_RESOURCE !== $type ? ']' : ($hasChild ? '}' : ''));
-        $this->dumpLine($cursor->depth, true);
-    }
+		if ($hasChild) {
+			$this->dumpLine($cursor->depth);
+		}
+	}
 
-    /**
-     * Dumps an ellipsis for cut children.
-     *
-     * @param Cursor $cursor   The Cursor position in the dump.
-     * @param bool   $hasChild When the dump of the hash has child item.
-     * @param int    $cut      The number of items the hash has been cut by.
-     */
-    protected function dumpEllipsis(Cursor $cursor, $hasChild, $cut)
-    {
-        if ($cut) {
-            $this->line .= ' …';
-            if (0 < $cut) {
-                $this->line .= $cut;
-            }
-            if ($hasChild) {
-                $this->dumpLine($cursor->depth + 1);
-            }
-        }
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function leaveHash(Cursor $cursor, $type, $class, $hasChild, $cut)
+	{
+		$this->dumpEllipsis($cursor, $hasChild, $cut);
+		$this->line .= Cursor::HASH_OBJECT === $type ? '}' : (Cursor::HASH_RESOURCE !== $type ? ']' : ($hasChild ? '}' : ''));
+		$this->dumpLine($cursor->depth, true);
+	}
 
-    /**
-     * Dumps a key in a hash structure.
-     *
-     * @param Cursor $cursor The Cursor position in the dump.
-     */
-    protected function dumpKey(Cursor $cursor)
-    {
-        if (null !== $key = $cursor->hashKey) {
-            if ($cursor->hashKeyIsBinary) {
-                $key = $this->utf8Encode($key);
-            }
-            $attr = array('binary' => $cursor->hashKeyIsBinary);
-            $bin = $cursor->hashKeyIsBinary ? 'b' : '';
-            $style = 'key';
-            switch ($cursor->hashType) {
-                default:
-                case Cursor::HASH_INDEXED:
-                    $style = 'index';
-                case Cursor::HASH_ASSOC:
-                    if (is_int($key)) {
-                        $this->line .= $this->style($style, $key).' => ';
-                    } else {
-                        $this->line .= $bin.'"'.$this->style($style, $key).'" => ';
-                    }
-                    break;
+	/**
+	 * Dumps an ellipsis for cut children.
+	 *
+	 * @param Cursor $cursor   The Cursor position in the dump
+	 * @param bool   $hasChild When the dump of the hash has child item
+	 * @param int    $cut      The number of items the hash has been cut by
+	 */
+	protected function dumpEllipsis(Cursor $cursor, $hasChild, $cut)
+	{
+		if ($cut) {
+			$this->line .= ' …';
+			if (0 < $cut) {
+				$this->line .= $cut;
+			}
+			if ($hasChild) {
+				$this->dumpLine($cursor->depth + 1);
+			}
+		}
+	}
 
-                case Cursor::HASH_RESOURCE:
-                    $key = "\0~\0".$key;
-                    // No break;
-                case Cursor::HASH_OBJECT:
-                    if (!isset($key[0]) || "\0" !== $key[0]) {
-                        $this->line .= '+'.$bin.$this->style('public', $key).': ';
-                    } elseif (0 < strpos($key, "\0", 1)) {
-                        $key = explode("\0", substr($key, 1), 2);
+	/**
+	 * Dumps a key in a hash structure.
+	 *
+	 * @param Cursor $cursor The Cursor position in the dump
+	 */
+	protected function dumpKey(Cursor $cursor)
+	{
+		if (null !== $key = $cursor->hashKey) {
+			if ($cursor->hashKeyIsBinary) {
+				$key = $this->utf8Encode($key);
+			}
+			$attr = array('binary' => $cursor->hashKeyIsBinary);
+			$bin = $cursor->hashKeyIsBinary ? 'b' : '';
+			$style = 'key';
+			switch ($cursor->hashType) {
+				default:
+				case Cursor::HASH_INDEXED:
+					if (self::DUMP_LIGHT_ARRAY & $this->flags) {
+						break;
+					}
+					$style = 'index';
+				case Cursor::HASH_ASSOC:
+					if (is_int($key)) {
+						$this->line .= $this->style($style, $key).' => ';
+					} else {
+						$this->line .= $bin.'"'.$this->style($style, $key).'" => ';
+					}
+					break;
 
-                        switch ($key[0]) {
-                            case '+': // User inserted keys
-                                $attr['dynamic'] = true;
-                                $this->line .= '+'.$bin.'"'.$this->style('public', $key[1], $attr).'": ';
-                                break 2;
-                            case '~':
-                                $style = 'meta';
-                                break;
-                            case '*':
-                                $style = 'protected';
-                                $bin = '#'.$bin;
-                                break;
-                            default:
-                                $attr['class'] = $key[0];
-                                $style = 'private';
-                                $bin = '-'.$bin;
-                                break;
-                        }
+				case Cursor::HASH_RESOURCE:
+					$key = "\0~\0".$key;
+					// No break;
+				case Cursor::HASH_OBJECT:
+					if (!isset($key[0]) || "\0" !== $key[0]) {
+						$this->line .= '+'.$bin.$this->style('public', $key).': ';
+					} elseif (0 < strpos($key, "\0", 1)) {
+						$key = explode("\0", substr($key, 1), 2);
 
-                        $this->line .= $bin.$this->style($style, $key[1], $attr).': ';
-                    } else {
-                        // This case should not happen
-                        $this->line .= '-'.$bin.'"'.$this->style('private', $key, array('class' => '')).'": ';
-                    }
-                    break;
-            }
+						switch ($key[0][0]) {
+							case '+': // User inserted keys
+								$attr['dynamic'] = true;
+								$this->line .= '+'.$bin.'"'.$this->style('public', $key[1], $attr).'": ';
+								break 2;
+							case '~':
+								$style = 'meta';
+								if (isset($key[0][1])) {
+									parse_str(substr($key[0], 1), $attr);
+									$attr += array('binary' => $cursor->hashKeyIsBinary);
+								}
+								break;
+							case '*':
+								$style = 'protected';
+								$bin = '#'.$bin;
+								break;
+							default:
+								$attr['class'] = $key[0];
+								$style = 'private';
+								$bin = '-'.$bin;
+								break;
+						}
 
-            if ($cursor->hardRefTo) {
-                $this->line .= $this->style('ref', '&'.($cursor->hardRefCount ? $cursor->hardRefTo : ''), array('count' => $cursor->hardRefCount)).' ';
-            }
-        }
-    }
+						$this->line .= $bin.$this->style($style, $key[1], $attr).': ';
+					} else {
+						// This case should not happen
+						$this->line .= '-'.$bin.'"'.$this->style('private', $key, array('class' => '')).'": ';
+					}
+					break;
+			}
 
-    /**
-     * Decorates a value with some style.
-     *
-     * @param string $style The type of style being applied.
-     * @param string $value The value being styled.
-     * @param array  $attr  Optional context information.
-     *
-     * @return string The value with style decoration.
-     */
-    protected function style($style, $value, $attr = array())
-    {
-        if (null === $this->colors) {
-            $this->colors = $this->supportsColors();
-        }
+			if ($cursor->hardRefTo) {
+				$this->line .= $this->style('ref', '&'.($cursor->hardRefCount ? $cursor->hardRefTo : ''), array('count' => $cursor->hardRefCount)).' ';
+			}
+		}
+	}
 
-        $style = $this->styles[$style];
+	/**
+	 * Decorates a value with some style.
+	 *
+	 * @param string $style The type of style being applied
+	 * @param string $value The value being styled
+	 * @param array  $attr  Optional context information
+	 *
+	 * @return string The value with style decoration
+	 */
+	protected function style($style, $value, $attr = array())
+	{
+		if (null === $this->colors) {
+			$this->colors = $this->supportsColors();
+		}
 
-        $map = static::$controlCharsMap;
-        $startCchr = $this->colors ? "\033[m\033[{$this->styles['default']}m" : '';
-        $endCchr = $this->colors ? "\033[m\033[{$style}m" : '';
-        $value = preg_replace_callback(static::$controlCharsRx, function ($c) use ($map, $startCchr, $endCchr) {
-            $s = $startCchr;
-            $c = $c[$i = 0];
-            do {
-                $s .= isset($map[$c[$i]]) ? $map[$c[$i]] : sprintf('\x%02X', ord($c[$i]));
-            } while (isset($c[++$i]));
+		$style = $this->styles[$style];
 
-            return $s.$endCchr;
-        }, $value, -1, $cchrCount);
+		$map = static::$controlCharsMap;
+		$startCchr = $this->colors ? "\033[m\033[{$this->styles['default']}m" : '';
+		$endCchr = $this->colors ? "\033[m\033[{$style}m" : '';
+		$value = preg_replace_callback(static::$controlCharsRx, function ($c) use ($map, $startCchr, $endCchr) {
+			$s = $startCchr;
+			$c = $c[$i = 0];
+			do {
+				$s .= isset($map[$c[$i]]) ? $map[$c[$i]] : sprintf('\x%02X', ord($c[$i]));
+			} while (isset($c[++$i]));
 
-        if ($this->colors) {
-            if ($cchrCount && "\033" === $value[0]) {
-                $value = substr($value, strlen($startCchr));
-            } else {
-                $value = "\033[{$style}m".$value;
-            }
-            if ($cchrCount && $endCchr === substr($value, -strlen($endCchr))) {
-                $value = substr($value, 0, -strlen($endCchr));
-            } else {
-                $value .= "\033[{$this->styles['default']}m";
-            }
-        }
+			return $s.$endCchr;
+		}, $value, -1, $cchrCount);
 
-        return $value;
-    }
+		if ($this->colors) {
+			if ($cchrCount && "\033" === $value[0]) {
+				$value = substr($value, strlen($startCchr));
+			} else {
+				$value = "\033[{$style}m".$value;
+			}
+			if ($cchrCount && $endCchr === substr($value, -strlen($endCchr))) {
+				$value = substr($value, 0, -strlen($endCchr));
+			} else {
+				$value .= "\033[{$this->styles['default']}m";
+			}
+		}
 
-    /**
-     * @return bool Tells if the current output stream supports ANSI colors or not.
-     */
-    protected function supportsColors()
-    {
-        if ($this->outputStream !== static::$defaultOutput) {
-            return @(is_resource($this->outputStream) && function_exists('posix_isatty') && posix_isatty($this->outputStream));
-        }
-        if (null !== static::$defaultColors) {
-            return static::$defaultColors;
-        }
-        if (isset($_SERVER['argv'][1])) {
-            $colors = $_SERVER['argv'];
-            $i = count($colors);
-            while (--$i > 0) {
-                if (isset($colors[$i][5])) {
-                    switch ($colors[$i]) {
-                        case '--ansi':
-                        case '--color':
-                        case '--color=yes':
-                        case '--color=force':
-                        case '--color=always':
-                            return static::$defaultColors = true;
+		return $value;
+	}
 
-                        case '--no-ansi':
-                        case '--color=no':
-                        case '--color=none':
-                        case '--color=never':
-                            return static::$defaultColors = false;
-                    }
-                }
-            }
-        }
+	/**
+	 * @return bool Tells if the current output stream supports ANSI colors or not
+	 */
+	protected function supportsColors()
+	{
+		if ($this->outputStream !== static::$defaultOutput) {
+			return @(is_resource($this->outputStream) && function_exists('posix_isatty') && posix_isatty($this->outputStream));
+		}
+		if (null !== static::$defaultColors) {
+			return static::$defaultColors;
+		}
+		if (isset($_SERVER['argv'][1])) {
+			$colors = $_SERVER['argv'];
+			$i = count($colors);
+			while (--$i > 0) {
+				if (isset($colors[$i][5])) {
+					switch ($colors[$i]) {
+						case '--ansi':
+						case '--color':
+						case '--color=yes':
+						case '--color=force':
+						case '--color=always':
+							return static::$defaultColors = true;
 
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            static::$defaultColors = @(false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI') || 'xterm' === getenv('TERM'));
-        } elseif (function_exists('posix_isatty')) {
-            $h = stream_get_meta_data($this->outputStream) + array('wrapper_type' => null);
-            $h = 'Output' === $h['stream_type'] && 'PHP' === $h['wrapper_type'] ? fopen('php://stdout', 'wb') : $this->outputStream;
-            static::$defaultColors = @posix_isatty($h);
-        } else {
-            static::$defaultColors = false;
-        }
+						case '--no-ansi':
+						case '--color=no':
+						case '--color=none':
+						case '--color=never':
+							return static::$defaultColors = false;
+					}
+				}
+			}
+		}
 
-        return static::$defaultColors;
-    }
+		if ('\\' === DIRECTORY_SEPARATOR) {
+			static::$defaultColors = @(
+				'10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
+				|| false !== getenv('ANSICON')
+				|| 'ON' === getenv('ConEmuANSI')
+				|| 'xterm' === getenv('TERM')
+			);
+		} elseif (function_exists('posix_isatty')) {
+			$h = stream_get_meta_data($this->outputStream) + array('wrapper_type' => null);
+			$h = 'Output' === $h['stream_type'] && 'PHP' === $h['wrapper_type'] ? fopen('php://stdout', 'wb') : $this->outputStream;
+			static::$defaultColors = @posix_isatty($h);
+		} else {
+			static::$defaultColors = false;
+		}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function dumpLine($depth, $endOfValue = false)
-    {
-        if ($this->colors) {
-            $this->line = sprintf("\033[%sm%s\033[m", $this->styles['default'], $this->line);
-        }
-        parent::dumpLine($depth);
-    }
+		return static::$defaultColors;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function dumpLine($depth, $endOfValue = false)
+	{
+		if ($this->colors) {
+			$this->line = sprintf("\033[%sm%s\033[m", $this->styles['default'], $this->line);
+		}
+		parent::dumpLine($depth);
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Dumper/DataDumperInterface.php b/htdocs/includes/symfony/var-dumper/Dumper/DataDumperInterface.php
index ee6060cebf6..abaa85c19bd 100644
--- a/htdocs/includes/symfony/var-dumper/Dumper/DataDumperInterface.php
+++ b/htdocs/includes/symfony/var-dumper/Dumper/DataDumperInterface.php
@@ -20,10 +20,10 @@ use Symfony\Component\VarDumper\Cloner\Data;
  */
 interface DataDumperInterface
 {
-    /**
-     * Dumps a Data object.
-     *
-     * @param Data $data A Data object.
-     */
-    public function dump(Data $data);
+	/**
+	 * Dumps a Data object.
+	 *
+	 * @param Data $data A Data object
+	 */
+	public function dump(Data $data);
 }
diff --git a/htdocs/includes/symfony/var-dumper/Dumper/HtmlDumper.php b/htdocs/includes/symfony/var-dumper/Dumper/HtmlDumper.php
index 28af8e4cb22..10a3ffa41c0 100644
--- a/htdocs/includes/symfony/var-dumper/Dumper/HtmlDumper.php
+++ b/htdocs/includes/symfony/var-dumper/Dumper/HtmlDumper.php
@@ -21,103 +21,114 @@ use Symfony\Component\VarDumper\Cloner\Data;
  */
 class HtmlDumper extends CliDumper
 {
-    public static $defaultOutput = 'php://output';
+	public static $defaultOutput = 'php://output';
 
-    protected $dumpHeader;
-    protected $dumpPrefix = '<pre class=sf-dump id=%s data-indent-pad="%s">';
-    protected $dumpSuffix = '</pre><script>Sfdump("%s")</script>';
-    protected $dumpId = 'sf-dump';
-    protected $colors = true;
-    protected $headerIsDumped = false;
-    protected $lastDepth = -1;
-    protected $styles = array(
-        'default' => 'background-color:#18171B; color:#FF8400; line-height:1.2em; font:12px Menlo, Monaco, Consolas, monospace; word-wrap: break-word; white-space: pre-wrap; position:relative; z-index:100000; word-break: normal',
-        'num' => 'font-weight:bold; color:#1299DA',
-        'const' => 'font-weight:bold',
-        'str' => 'font-weight:bold; color:#56DB3A',
-        'note' => 'color:#1299DA',
-        'ref' => 'color:#A0A0A0',
-        'public' => 'color:#FFFFFF',
-        'protected' => 'color:#FFFFFF',
-        'private' => 'color:#FFFFFF',
-        'meta' => 'color:#B729D9',
-        'key' => 'color:#56DB3A',
-        'index' => 'color:#1299DA',
-    );
+	protected $dumpHeader;
+	protected $dumpPrefix = '<pre class=sf-dump id=%s data-indent-pad="%s">';
+	protected $dumpSuffix = '</pre><script>Sfdump(%s)</script>';
+	protected $dumpId = 'sf-dump';
+	protected $colors = true;
+	protected $headerIsDumped = false;
+	protected $lastDepth = -1;
+	protected $styles = array(
+		'default' => 'background-color:#18171B; color:#FF8400; line-height:1.2em; font:12px Menlo, Monaco, Consolas, monospace; word-wrap: break-word; white-space: pre-wrap; position:relative; z-index:99999; word-break: normal',
+		'num' => 'font-weight:bold; color:#1299DA',
+		'const' => 'font-weight:bold',
+		'str' => 'font-weight:bold; color:#56DB3A',
+		'note' => 'color:#1299DA',
+		'ref' => 'color:#A0A0A0',
+		'public' => 'color:#FFFFFF',
+		'protected' => 'color:#FFFFFF',
+		'private' => 'color:#FFFFFF',
+		'meta' => 'color:#B729D9',
+		'key' => 'color:#56DB3A',
+		'index' => 'color:#1299DA',
+		'ellipsis' => 'color:#FF8400',
+	);
 
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($output = null, $charset = null)
-    {
-        AbstractDumper::__construct($output, $charset);
-        $this->dumpId = 'sf-dump-'.mt_rand();
-    }
+	private $displayOptions = array(
+		'maxDepth' => 1,
+		'maxStringLength' => 160,
+		'fileLinkFormat' => null,
+	);
+	private $extraDisplayOptions = array();
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setOutput($output)
-    {
-        if ($output !== $prev = parent::setOutput($output)) {
-            $this->headerIsDumped = false;
-        }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function __construct($output = null, $charset = null, $flags = 0)
+	{
+		AbstractDumper::__construct($output, $charset, $flags);
+		$this->dumpId = 'sf-dump-'.mt_rand();
+		$this->displayOptions['fileLinkFormat'] = ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
+	}
 
-        return $prev;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function setStyles(array $styles)
+	{
+		$this->headerIsDumped = false;
+		$this->styles = $styles + $this->styles;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setStyles(array $styles)
-    {
-        $this->headerIsDumped = false;
-        $this->styles = $styles + $this->styles;
-    }
+	/**
+	 * Configures display options.
+	 *
+	 * @param array $displayOptions A map of display options to customize the behavior
+	 */
+	public function setDisplayOptions(array $displayOptions)
+	{
+		$this->headerIsDumped = false;
+		$this->displayOptions = $displayOptions + $this->displayOptions;
+	}
 
-    /**
-     * Sets an HTML header that will be dumped once in the output stream.
-     *
-     * @param string $header An HTML string.
-     */
-    public function setDumpHeader($header)
-    {
-        $this->dumpHeader = $header;
-    }
+	/**
+	 * Sets an HTML header that will be dumped once in the output stream.
+	 *
+	 * @param string $header An HTML string
+	 */
+	public function setDumpHeader($header)
+	{
+		$this->dumpHeader = $header;
+	}
 
-    /**
-     * Sets an HTML prefix and suffix that will encapse every single dump.
-     *
-     * @param string $prefix The prepended HTML string.
-     * @param string $suffix The appended HTML string.
-     */
-    public function setDumpBoundaries($prefix, $suffix)
-    {
-        $this->dumpPrefix = $prefix;
-        $this->dumpSuffix = $suffix;
-    }
+	/**
+	 * Sets an HTML prefix and suffix that will encapse every single dump.
+	 *
+	 * @param string $prefix The prepended HTML string
+	 * @param string $suffix The appended HTML string
+	 */
+	public function setDumpBoundaries($prefix, $suffix)
+	{
+		$this->dumpPrefix = $prefix;
+		$this->dumpSuffix = $suffix;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function dump(Data $data, $output = null)
-    {
-        parent::dump($data, $output);
-        $this->dumpId = 'sf-dump-'.mt_rand();
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function dump(Data $data, $output = null, array $extraDisplayOptions = array())
+	{
+		$this->extraDisplayOptions = $extraDisplayOptions;
+		$result = parent::dump($data, $output);
+		$this->dumpId = 'sf-dump-'.mt_rand();
 
-    /**
-     * Dumps the HTML header.
-     */
-    protected function getDumpHeader()
-    {
-        $this->headerIsDumped = true;
+		return $result;
+	}
 
-        if (null !== $this->dumpHeader) {
-            return $this->dumpHeader;
-        }
+	/**
+	 * Dumps the HTML header.
+	 */
+	protected function getDumpHeader()
+	{
+		$this->headerIsDumped = null !== $this->outputStream ? $this->outputStream : $this->lineDumper;
 
-        $line = <<<'EOHTML'
+		if (null !== $this->dumpHeader) {
+			return $this->dumpHeader;
+		}
+
+		$line = str_replace('{$options}', json_encode($this->displayOptions, JSON_FORCE_OBJECT), <<<'EOHTML'
 <script>
 Sfdump = window.Sfdump || (function (doc) {
 
@@ -173,15 +184,30 @@ function toggle(a, recursive) {
     return true;
 };
 
-return function (root) {
+return function (root, x) {
     root = doc.getElementById(root);
 
+    var indentRx = new RegExp('^('+(root.getAttribute('data-indent-pad') || '  ').replace(rxEsc, '\\$1')+')+', 'm'),
+        options = {$options},
+        elt = root.getElementsByTagName('A'),
+        len = elt.length,
+        i = 0, s, h,
+        t = [];
+
+    while (i < len) t.push(elt[i++]);
+
+    for (i in x) {
+        options[i] = x[i];
+    }
+
     function a(e, f) {
         addEventListener(root, e, function (e) {
             if ('A' == e.target.tagName) {
                 f(e.target, e);
             } else if ('A' == e.target.parentNode.tagName) {
                 f(e.target.parentNode, e);
+            } else if (e.target.nextElementSibling && 'A' == e.target.nextElementSibling.tagName) {
+                f(e.target.nextElementSibling, e, true);
             }
         });
     };
@@ -193,15 +219,17 @@ return function (root) {
             refStyle.innerHTML = '';
         }
     });
-    a('mouseover', function (a) {
-        if (a = idRx.exec(a.className)) {
+    a('mouseover', function (a, e, c) {
+        if (c) {
+            e.target.style.cursor = "pointer";
+        } else if (a = idRx.exec(a.className)) {
             try {
                 refStyle.innerHTML = 'pre.sf-dump .'+a[0]+'{background-color: #B729D9; color: #FFF !important; border-radius: 2px}';
             } catch (e) {
             }
         }
     });
-    a('click', function (a, e) {
+    a('click', function (a, e, c) {
         if (/\bsf-dump-toggle\b/.test(a.className)) {
             e.preventDefault();
             if (!toggle(a, isCtrlKey(e))) {
@@ -222,7 +250,8 @@ return function (root) {
                 }
             }
 
-            if (doc.getSelection) {
+            if (c) {
+            } else if (doc.getSelection) {
                 try {
                     doc.getSelection().removeAllRanges();
                 } catch (e) {
@@ -231,31 +260,24 @@ return function (root) {
             } else {
                 doc.selection.empty();
             }
+        } else if (/\bsf-dump-str-toggle\b/.test(a.className)) {
+            e.preventDefault();
+            e = a.parentNode.parentNode;
+            e.className = e.className.replace(/sf-dump-str-(expand|collapse)/, a.parentNode.className);
         }
     });
 
-    var indentRx = new RegExp('^('+(root.getAttribute('data-indent-pad') || '  ').replace(rxEsc, '\\$1')+')+', 'm'),
-        elt = root.getElementsByTagName('A'),
-        len = elt.length,
-        i = 0,
-        t = [];
-
-    while (i < len) t.push(elt[i++]);
-
     elt = root.getElementsByTagName('SAMP');
     len = elt.length;
     i = 0;
 
     while (i < len) t.push(elt[i++]);
-
-    root = t;
     len = t.length;
-    i = t = 0;
 
-    while (i < len) {
-        elt = root[i];
-        if ("SAMP" == elt.tagName) {
-            elt.className = "sf-dump-expanded";
+    for (i = 0; i < len; ++i) {
+        elt = t[i];
+        if ('SAMP' == elt.tagName) {
+            elt.className = 'sf-dump-expanded';
             a = elt.previousSibling || {};
             if ('A' != a.tagName) {
                 a = doc.createElement('A');
@@ -267,19 +289,24 @@ return function (root) {
             a.title = (a.title ? a.title+'\n[' : '[')+keyHint+'+click] Expand all children';
             a.innerHTML += '<span>▼</span>';
             a.className += ' sf-dump-toggle';
+            x = 1;
             if ('sf-dump' != elt.parentNode.className) {
+                x += elt.parentNode.getAttribute('data-depth')/1;
+            }
+            elt.setAttribute('data-depth', x);
+            if (x > options.maxDepth) {
                 toggle(a);
             }
-        } else if ("sf-dump-ref" == elt.className && (a = elt.getAttribute('href'))) {
+        } else if ('sf-dump-ref' == elt.className && (a = elt.getAttribute('href'))) {
             a = a.substr(1);
             elt.className += ' '+a;
 
             if (/[\[{]$/.test(elt.previousSibling.nodeValue)) {
                 a = a != elt.nextSibling.id && doc.getElementById(a);
                 try {
-                    t = a.nextSibling;
+                    s = a.nextSibling;
                     elt.appendChild(a);
-                    t.parentNode.insertBefore(a, t);
+                    s.parentNode.insertBefore(a, s);
                     if (/^[@#]/.test(elt.innerHTML)) {
                         elt.innerHTML += ' <span>▶</span>';
                     } else {
@@ -295,13 +322,38 @@ return function (root) {
                 }
             }
         }
-        ++i;
+    }
+
+    if (0 >= options.maxStringLength) {
+        return;
+    }
+    try {
+        elt = root.querySelectorAll('.sf-dump-str');
+        len = elt.length;
+        i = 0;
+        t = [];
+
+        while (i < len) t.push(elt[i++]);
+        len = t.length;
+
+        for (i = 0; i < len; ++i) {
+            elt = t[i];
+            s = elt.innerText || elt.textContent;
+            x = s.length - options.maxStringLength;
+            if (0 < x) {
+                h = elt.innerHTML;
+                elt[elt.innerText ? 'innerText' : 'textContent'] = s.substring(0, options.maxStringLength);
+                elt.className += ' sf-dump-str-collapse';
+                elt.innerHTML = '<span class=sf-dump-str-collapse>'+h+'<a class="sf-dump-ref sf-dump-str-toggle" title="Collapse"> ◀</a></span>'+
+                    '<span class=sf-dump-str-expand>'+elt.innerHTML+'<a class="sf-dump-ref sf-dump-str-toggle" title="'+x+' remaining characters"> ▶</a></span>';
+            }
+        }
+    } catch (e) {
     }
 };
 
 })(document);
-</script>
-<style>
+</script><style>
 pre.sf-dump {
     display: block;
     white-space: pre;
@@ -323,130 +375,179 @@ pre.sf-dump a {
     cursor: pointer;
     border: 0;
     outline: none;
+    color: inherit;
 }
-EOHTML;
-
-        foreach ($this->styles as $class => $style) {
-            $line .= 'pre.sf-dump'.('default' !== $class ? ' .sf-dump-'.$class : '').'{'.$style.'}';
-        }
-
-        return $this->dumpHeader = preg_replace('/\s+/', ' ', $line).'</style>'.$this->dumpHeader;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function enterHash(Cursor $cursor, $type, $class, $hasChild)
-    {
-        parent::enterHash($cursor, $type, $class, false);
-
-        if ($hasChild) {
-            if ($cursor->refIndex) {
-                $r = Cursor::HASH_OBJECT !== $type ? 1 - (Cursor::HASH_RESOURCE !== $type) : 2;
-                $r .= $r && 0 < $cursor->softRefHandle ? $cursor->softRefHandle : $cursor->refIndex;
-
-                $this->line .= sprintf('<samp id=%s-ref%s>', $this->dumpId, $r);
-            } else {
-                $this->line .= '<samp>';
-            }
-            $this->dumpLine($cursor->depth);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function leaveHash(Cursor $cursor, $type, $class, $hasChild, $cut)
-    {
-        $this->dumpEllipsis($cursor, $hasChild, $cut);
-        if ($hasChild) {
-            $this->line .= '</samp>';
-        }
-        parent::leaveHash($cursor, $type, $class, $hasChild, 0);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function style($style, $value, $attr = array())
-    {
-        if ('' === $value) {
-            return '';
-        }
-
-        $v = htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
-
-        if ('ref' === $style) {
-            if (empty($attr['count'])) {
-                return sprintf('<a class=sf-dump-ref>%s</a>', $v);
-            }
-            $r = ('#' !== $v[0] ? 1 - ('@' !== $v[0]) : 2).substr($value, 1);
-
-            return sprintf('<a class=sf-dump-ref href=#%s-ref%s title="%d occurrences">%s</a>', $this->dumpId, $r, 1 + $attr['count'], $v);
-        }
-
-        if ('const' === $style && array_key_exists('value', $attr)) {
-            $style .= sprintf(' title="%s"', htmlspecialchars(json_encode($attr['value']), ENT_QUOTES, 'UTF-8'));
-        } elseif ('public' === $style) {
-            $style .= sprintf(' title="%s"', empty($attr['dynamic']) ? 'Public property' : 'Runtime added dynamic property');
-        } elseif ('str' === $style && 1 < $attr['length']) {
-            $style .= sprintf(' title="%s%s characters"', $attr['length'], $attr['binary'] ? ' binary or non-UTF-8' : '');
-        } elseif ('note' === $style && false !== $c = strrpos($v, '\\')) {
-            return sprintf('<abbr title="%s" class=sf-dump-%s>%s</abbr>', $v, $style, substr($v, $c + 1));
-        } elseif ('protected' === $style) {
-            $style .= ' title="Protected property"';
-        } elseif ('private' === $style) {
-            $style .= sprintf(' title="Private property defined in class:&#10;`%s`"', $attr['class']);
-        }
-
-        $map = static::$controlCharsMap;
-        $style = "<span class=sf-dump-{$style}>";
-        $v = preg_replace_callback(static::$controlCharsRx, function ($c) use ($map, $style) {
-            $s = '</span>';
-            $c = $c[$i = 0];
-            do {
-                $s .= isset($map[$c[$i]]) ? $map[$c[$i]] : sprintf('\x%02X', ord($c[$i]));
-            } while (isset($c[++$i]));
-
-            return $s.$style;
-        }, $v, -1, $cchrCount);
-
-        if ($cchrCount && '<' === $v[0]) {
-            $v = substr($v, 7);
-        } else {
-            $v = $style.$v;
-        }
-        if ($cchrCount && '>' === substr($v, -1)) {
-            $v = substr($v, 0, -strlen($style));
-        } else {
-            $v .= '</span>';
-        }
-
-        return $v;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function dumpLine($depth, $endOfValue = false)
-    {
-        if (-1 === $this->lastDepth) {
-            $this->line = sprintf($this->dumpPrefix, $this->dumpId, $this->indentPad).$this->line;
-        }
-        if (!$this->headerIsDumped) {
-            $this->line = $this->getDumpHeader().$this->line;
-        }
-
-        if (-1 === $depth) {
-            $this->line .= sprintf($this->dumpSuffix, $this->dumpId);
-        }
-        $this->lastDepth = $depth;
-
-        $this->line = mb_convert_encoding($this->line, 'HTML-ENTITIES', 'UTF-8');
-
-        if (-1 === $depth) {
-            AbstractDumper::dumpLine(0);
-        }
-        AbstractDumper::dumpLine($depth);
-    }
+pre.sf-dump .sf-dump-ellipsis {
+    display: inline-block;
+    overflow: visible;
+    text-overflow: ellipsis;
+    max-width: 5em;
+    white-space: nowrap;
+    overflow: hidden;
+    vertical-align: top;
+}
+pre.sf-dump code {
+    display:inline;
+    padding:0;
+    background:none;
+}
+.sf-dump-str-collapse .sf-dump-str-collapse {
+    display: none;
+}
+.sf-dump-str-expand .sf-dump-str-expand {
+    display: none;
+}
+EOHTML
+		);
+
+		foreach ($this->styles as $class => $style) {
+			$line .= 'pre.sf-dump'.('default' === $class ? ', pre.sf-dump' : '').' .sf-dump-'.$class.'{'.$style.'}';
+		}
+
+		return $this->dumpHeader = preg_replace('/\s+/', ' ', $line).'</style>'.$this->dumpHeader;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function enterHash(Cursor $cursor, $type, $class, $hasChild)
+	{
+		parent::enterHash($cursor, $type, $class, false);
+
+		if ($hasChild) {
+			if ($cursor->refIndex) {
+				$r = Cursor::HASH_OBJECT !== $type ? 1 - (Cursor::HASH_RESOURCE !== $type) : 2;
+				$r .= $r && 0 < $cursor->softRefHandle ? $cursor->softRefHandle : $cursor->refIndex;
+
+				$this->line .= sprintf('<samp id=%s-ref%s>', $this->dumpId, $r);
+			} else {
+				$this->line .= '<samp>';
+			}
+			$this->dumpLine($cursor->depth);
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function leaveHash(Cursor $cursor, $type, $class, $hasChild, $cut)
+	{
+		$this->dumpEllipsis($cursor, $hasChild, $cut);
+		if ($hasChild) {
+			$this->line .= '</samp>';
+		}
+		parent::leaveHash($cursor, $type, $class, $hasChild, 0);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function style($style, $value, $attr = array())
+	{
+		if ('' === $value) {
+			return '';
+		}
+
+		$v = esc($value);
+
+		if ('ref' === $style) {
+			if (empty($attr['count'])) {
+				return sprintf('<a class=sf-dump-ref>%s</a>', $v);
+			}
+			$r = ('#' !== $v[0] ? 1 - ('@' !== $v[0]) : 2).substr($value, 1);
+
+			return sprintf('<a class=sf-dump-ref href=#%s-ref%s title="%d occurrences">%s</a>', $this->dumpId, $r, 1 + $attr['count'], $v);
+		}
+
+		if ('const' === $style && isset($attr['value'])) {
+			$style .= sprintf(' title="%s"', esc(is_scalar($attr['value']) ? $attr['value'] : json_encode($attr['value'])));
+		} elseif ('public' === $style) {
+			$style .= sprintf(' title="%s"', empty($attr['dynamic']) ? 'Public property' : 'Runtime added dynamic property');
+		} elseif ('str' === $style && 1 < $attr['length']) {
+			$style .= sprintf(' title="%d%s characters"', $attr['length'], $attr['binary'] ? ' binary or non-UTF-8' : '');
+		} elseif ('note' === $style && false !== $c = strrpos($v, '\\')) {
+			return sprintf('<abbr title="%s" class=sf-dump-%s>%s</abbr>', $v, $style, substr($v, $c + 1));
+		} elseif ('protected' === $style) {
+			$style .= ' title="Protected property"';
+		} elseif ('meta' === $style && isset($attr['title'])) {
+			$style .= sprintf(' title="%s"', esc($this->utf8Encode($attr['title'])));
+		} elseif ('private' === $style) {
+			$style .= sprintf(' title="Private property defined in class:&#10;`%s`"', esc($this->utf8Encode($attr['class'])));
+		}
+		$map = static::$controlCharsMap;
+
+		if (isset($attr['ellipsis'])) {
+			$label = esc(substr($value, -$attr['ellipsis']));
+			$style = str_replace(' title="', " title=\"$v\n", $style);
+			$v = sprintf('<span class=sf-dump-ellipsis>%s</span>%s', substr($v, 0, -strlen($label)), $label);
+		}
+
+		$v = "<span class=sf-dump-{$style}>".preg_replace_callback(static::$controlCharsRx, function ($c) use ($map) {
+			$s = '<span class=sf-dump-default>';
+			$c = $c[$i = 0];
+			do {
+				$s .= isset($map[$c[$i]]) ? $map[$c[$i]] : sprintf('\x%02X', ord($c[$i]));
+			} while (isset($c[++$i]));
+
+			return $s.'</span>';
+		}, $v).'</span>';
+
+		if (isset($attr['file']) && $href = $this->getSourceLink($attr['file'], isset($attr['line']) ? $attr['line'] : 0)) {
+			$attr['href'] = $href;
+		}
+		if (isset($attr['href'])) {
+			$v = sprintf('<a href="%s" target="_blank" rel="noopener noreferrer">%s</a>', esc($this->utf8Encode($attr['href'])), $v);
+		}
+		if (isset($attr['lang'])) {
+			$v = sprintf('<code class="%s">%s</code>', esc($attr['lang']), $v);
+		}
+
+		return $v;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function dumpLine($depth, $endOfValue = false)
+	{
+		if (-1 === $this->lastDepth) {
+			$this->line = sprintf($this->dumpPrefix, $this->dumpId, $this->indentPad).$this->line;
+		}
+		if ($this->headerIsDumped !== (null !== $this->outputStream ? $this->outputStream : $this->lineDumper)) {
+			$this->line = $this->getDumpHeader().$this->line;
+		}
+
+		if (-1 === $depth) {
+			$args = array('"'.$this->dumpId.'"');
+			if ($this->extraDisplayOptions) {
+				$args[] = json_encode($this->extraDisplayOptions, JSON_FORCE_OBJECT);
+			}
+			// Replace is for BC
+			$this->line .= sprintf(str_replace('"%s"', '%s', $this->dumpSuffix), implode(', ', $args));
+		}
+		$this->lastDepth = $depth;
+
+		$this->line = mb_convert_encoding($this->line, 'HTML-ENTITIES', 'UTF-8');
+
+		if (-1 === $depth) {
+			AbstractDumper::dumpLine(0);
+		}
+		AbstractDumper::dumpLine($depth);
+	}
+
+	private function getSourceLink($file, $line)
+	{
+		$options = $this->extraDisplayOptions + $this->displayOptions;
+
+		if ($fmt = $options['fileLinkFormat']) {
+			return is_string($fmt) ? strtr($fmt, array('%f' => $file, '%l' => $line)) : $fmt->format($file, $line);
+		}
+
+		return false;
+	}
+}
+
+function esc($str)
+{
+	return htmlspecialchars($str, ENT_QUOTES, 'UTF-8');
 }
diff --git a/htdocs/includes/symfony/var-dumper/LICENSE b/htdocs/includes/symfony/var-dumper/LICENSE
index ef1cde91a61..207646a052d 100644
--- a/htdocs/includes/symfony/var-dumper/LICENSE
+++ b/htdocs/includes/symfony/var-dumper/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2015 Fabien Potencier
+Copyright (c) 2014-2017 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/htdocs/includes/symfony/var-dumper/README.md b/htdocs/includes/symfony/var-dumper/README.md
index 71bff335a70..3b5d55f5f5b 100644
--- a/htdocs/includes/symfony/var-dumper/README.md
+++ b/htdocs/includes/symfony/var-dumper/README.md
@@ -1,14 +1,15 @@
-Symfony mechanism for exploring and dumping PHP variables
-=========================================================
+VarDumper Component
+===================
 
-This component provides a mechanism that allows exploring then dumping
-any PHP variable.
+The VarDumper component provides mechanisms for walking through any arbitrary
+PHP variable. Built on top, it provides a better `dump()` function that you
+can use instead of `var_dump`.
 
-It handles scalars, objects and resources properly, taking hard and soft
-references into account. More than being immune to infinite recursion
-problems, it allows dumping where references link to each other.
-It explores recursive structures using a breadth-first algorithm.
+Resources
+---------
 
-The component exposes all the parts involved in the different steps of
-cloning then dumping a PHP variable, while applying size limits and having
-specialized output formats and methods.
+  * [Documentation](https://symfony.com/doc/current/components/var_dumper/introduction.html)
+  * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+  * [Report issues](https://github.com/symfony/symfony/issues) and
+    [send Pull Requests](https://github.com/symfony/symfony/pulls)
+    in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/htdocs/includes/symfony/var-dumper/Test/VarDumperTestTrait.php b/htdocs/includes/symfony/var-dumper/Test/VarDumperTestTrait.php
index e5f6bf5b98e..b05e272d23b 100644
--- a/htdocs/includes/symfony/var-dumper/Test/VarDumperTestTrait.php
+++ b/htdocs/includes/symfony/var-dumper/Test/VarDumperTestTrait.php
@@ -19,27 +19,30 @@ use Symfony\Component\VarDumper\Dumper\CliDumper;
  */
 trait VarDumperTestTrait
 {
-    public function assertDumpEquals($dump, $data, $message = '')
-    {
-        $this->assertSame(rtrim($dump), $this->getDump($data), $message);
-    }
+	public function assertDumpEquals($dump, $data, $message = '')
+	{
+		$this->assertSame(rtrim($dump), $this->getDump($data), $message);
+	}
 
-    public function assertDumpMatchesFormat($dump, $data, $message = '')
-    {
-        $this->assertStringMatchesFormat(rtrim($dump), $this->getDump($data), $message);
-    }
+	public function assertDumpMatchesFormat($dump, $data, $message = '')
+	{
+		$this->assertStringMatchesFormat(rtrim($dump), $this->getDump($data), $message);
+	}
 
-    protected function getDump($data)
-    {
-        $h = fopen('php://memory', 'r+b');
-        $cloner = new VarCloner();
-        $cloner->setMaxItems(-1);
-        $dumper = new CliDumper($h);
-        $dumper->setColors(false);
-        $dumper->dump($cloner->cloneVar($data)->withRefHandles(false));
-        $data = stream_get_contents($h, -1, 0);
-        fclose($h);
+	protected function getDump($data, $key = null)
+	{
+		$flags = getenv('DUMP_LIGHT_ARRAY') ? CliDumper::DUMP_LIGHT_ARRAY : 0;
+		$flags |= getenv('DUMP_STRING_LENGTH') ? CliDumper::DUMP_STRING_LENGTH : 0;
 
-        return rtrim($data);
-    }
+		$cloner = new VarCloner();
+		$cloner->setMaxItems(-1);
+		$dumper = new CliDumper(null, null, $flags);
+		$dumper->setColors(false);
+		$data = $cloner->cloneVar($data)->withRefHandles(false);
+		if (null !== $key && null === $data = $data->seek($key)) {
+			return;
+		}
+
+		return rtrim($dumper->dump($data, true));
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/CasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/CasterTest.php
index 43d389ce1c0..d1f09841ea3 100644
--- a/htdocs/includes/symfony/var-dumper/Tests/Caster/CasterTest.php
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/CasterTest.php
@@ -11,170 +11,171 @@
 
 namespace Symfony\Component\VarDumper\Tests\Caster;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\VarDumper\Caster\Caster;
 use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class CasterTest extends \PHPUnit_Framework_TestCase
+class CasterTest extends TestCase
 {
-    use VarDumperTestTrait;
+	use VarDumperTestTrait;
 
-    private $referenceArray = array(
-        'null' => null,
-        'empty' => false,
-        'public' => 'pub',
-        "\0~\0virtual" => 'virt',
-        "\0+\0dynamic" => 'dyn',
-        "\0*\0protected" => 'prot',
-        "\0Foo\0private" => 'priv',
-    );
+	private $referenceArray = array(
+		'null' => null,
+		'empty' => false,
+		'public' => 'pub',
+		"\0~\0virtual" => 'virt',
+		"\0+\0dynamic" => 'dyn',
+		"\0*\0protected" => 'prot',
+		"\0Foo\0private" => 'priv',
+	);
 
-    /**
-     * @dataProvider provideFilter
-     */
-    public function testFilter($filter, $expectedDiff, $listedProperties = null)
-    {
-        if (null === $listedProperties) {
-            $filteredArray = Caster::filter($this->referenceArray, $filter);
-        } else {
-            $filteredArray = Caster::filter($this->referenceArray, $filter, $listedProperties);
-        }
+	/**
+	 * @dataProvider provideFilter
+	 */
+	public function testFilter($filter, $expectedDiff, $listedProperties = null)
+	{
+		if (null === $listedProperties) {
+			$filteredArray = Caster::filter($this->referenceArray, $filter);
+		} else {
+			$filteredArray = Caster::filter($this->referenceArray, $filter, $listedProperties);
+		}
 
-        $this->assertSame($expectedDiff, array_diff_assoc($this->referenceArray, $filteredArray));
-    }
+		$this->assertSame($expectedDiff, array_diff_assoc($this->referenceArray, $filteredArray));
+	}
 
-    public function provideFilter()
-    {
-        return array(
-            array(
-                0,
-                array(),
-            ),
-            array(
-                Caster::EXCLUDE_PUBLIC,
-                array(
-                    'null' => null,
-                    'empty' => false,
-                    'public' => 'pub',
-                ),
-            ),
-            array(
-                Caster::EXCLUDE_NULL,
-                array(
-                    'null' => null,
-                ),
-            ),
-            array(
-                Caster::EXCLUDE_EMPTY,
-                array(
-                    'null' => null,
-                    'empty' => false,
-                ),
-            ),
-            array(
-                Caster::EXCLUDE_VIRTUAL,
-                array(
-                    "\0~\0virtual" => 'virt',
-                ),
-            ),
-            array(
-                Caster::EXCLUDE_DYNAMIC,
-                array(
-                    "\0+\0dynamic" => 'dyn',
-                ),
-            ),
-            array(
-                Caster::EXCLUDE_PROTECTED,
-                array(
-                    "\0*\0protected" => 'prot',
-                ),
-            ),
-            array(
-                Caster::EXCLUDE_PRIVATE,
-                array(
-                    "\0Foo\0private" => 'priv',
-                ),
-            ),
-            array(
-                Caster::EXCLUDE_VERBOSE,
-                array(
-                    'public' => 'pub',
-                    "\0*\0protected" => 'prot',
-                ),
-                array('public', "\0*\0protected"),
-            ),
-            array(
-                Caster::EXCLUDE_NOT_IMPORTANT,
-                array(
-                    'null' => null,
-                    'empty' => false,
-                    "\0~\0virtual" => 'virt',
-                    "\0+\0dynamic" => 'dyn',
-                    "\0Foo\0private" => 'priv',
-                ),
-                array('public', "\0*\0protected"),
-            ),
-            array(
-                Caster::EXCLUDE_VIRTUAL | Caster::EXCLUDE_DYNAMIC,
-                array(
-                    "\0~\0virtual" => 'virt',
-                    "\0+\0dynamic" => 'dyn',
-                ),
-            ),
-            array(
-                Caster::EXCLUDE_NOT_IMPORTANT | Caster::EXCLUDE_VERBOSE,
-                $this->referenceArray,
-                array('public', "\0*\0protected"),
-            ),
-            array(
-                Caster::EXCLUDE_NOT_IMPORTANT | Caster::EXCLUDE_EMPTY,
-                array(
-                    'null' => null,
-                    'empty' => false,
-                    "\0~\0virtual" => 'virt',
-                    "\0+\0dynamic" => 'dyn',
-                    "\0*\0protected" => 'prot',
-                    "\0Foo\0private" => 'priv',
-                ),
-                array('public', 'empty'),
-            ),
-            array(
-                Caster::EXCLUDE_VERBOSE | Caster::EXCLUDE_EMPTY | Caster::EXCLUDE_STRICT,
-                array(
-                    'empty' => false,
-                ),
-                array('public', 'empty'),
-            ),
-        );
-    }
+	public function provideFilter()
+	{
+		return array(
+			array(
+				0,
+				array(),
+			),
+			array(
+				Caster::EXCLUDE_PUBLIC,
+				array(
+					'null' => null,
+					'empty' => false,
+					'public' => 'pub',
+				),
+			),
+			array(
+				Caster::EXCLUDE_NULL,
+				array(
+					'null' => null,
+				),
+			),
+			array(
+				Caster::EXCLUDE_EMPTY,
+				array(
+					'null' => null,
+					'empty' => false,
+				),
+			),
+			array(
+				Caster::EXCLUDE_VIRTUAL,
+				array(
+					"\0~\0virtual" => 'virt',
+				),
+			),
+			array(
+				Caster::EXCLUDE_DYNAMIC,
+				array(
+					"\0+\0dynamic" => 'dyn',
+				),
+			),
+			array(
+				Caster::EXCLUDE_PROTECTED,
+				array(
+					"\0*\0protected" => 'prot',
+				),
+			),
+			array(
+				Caster::EXCLUDE_PRIVATE,
+				array(
+					"\0Foo\0private" => 'priv',
+				),
+			),
+			array(
+				Caster::EXCLUDE_VERBOSE,
+				array(
+					'public' => 'pub',
+					"\0*\0protected" => 'prot',
+				),
+				array('public', "\0*\0protected"),
+			),
+			array(
+				Caster::EXCLUDE_NOT_IMPORTANT,
+				array(
+					'null' => null,
+					'empty' => false,
+					"\0~\0virtual" => 'virt',
+					"\0+\0dynamic" => 'dyn',
+					"\0Foo\0private" => 'priv',
+				),
+				array('public', "\0*\0protected"),
+			),
+			array(
+				Caster::EXCLUDE_VIRTUAL | Caster::EXCLUDE_DYNAMIC,
+				array(
+					"\0~\0virtual" => 'virt',
+					"\0+\0dynamic" => 'dyn',
+				),
+			),
+			array(
+				Caster::EXCLUDE_NOT_IMPORTANT | Caster::EXCLUDE_VERBOSE,
+				$this->referenceArray,
+				array('public', "\0*\0protected"),
+			),
+			array(
+				Caster::EXCLUDE_NOT_IMPORTANT | Caster::EXCLUDE_EMPTY,
+				array(
+					'null' => null,
+					'empty' => false,
+					"\0~\0virtual" => 'virt',
+					"\0+\0dynamic" => 'dyn',
+					"\0*\0protected" => 'prot',
+					"\0Foo\0private" => 'priv',
+				),
+				array('public', 'empty'),
+			),
+			array(
+				Caster::EXCLUDE_VERBOSE | Caster::EXCLUDE_EMPTY | Caster::EXCLUDE_STRICT,
+				array(
+					'empty' => false,
+				),
+				array('public', 'empty'),
+			),
+		);
+	}
 
-    /**
-     * @requires PHP 7.0
-     */
-    public function testAnonymousClass()
-    {
-        $c = eval('return new class extends stdClass { private $foo = "foo"; };');
+	/**
+	 * @requires PHP 7.0
+	 */
+	public function testAnonymousClass()
+	{
+		$c = eval('return new class extends stdClass { private $foo = "foo"; };');
 
-        $this->assertDumpMatchesFormat(
-            <<<'EOTXT'
+		$this->assertDumpMatchesFormat(
+			<<<'EOTXT'
 stdClass@anonymous {
   -foo: "foo"
 }
 EOTXT
-            , $c
-        );
+			, $c
+		);
 
-        $c = eval('return new class { private $foo = "foo"; };');
+		$c = eval('return new class { private $foo = "foo"; };');
 
-        $this->assertDumpMatchesFormat(
-            <<<'EOTXT'
+		$this->assertDumpMatchesFormat(
+			<<<'EOTXT'
 @anonymous {
   -foo: "foo"
 }
 EOTXT
-            , $c
-        );
-    }
+			, $c
+		);
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php
new file mode 100644
index 00000000000..2e348040f31
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/ExceptionCasterTest.php
@@ -0,0 +1,225 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Caster\ExceptionCaster;
+use Symfony\Component\VarDumper\Caster\FrameStub;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+class ExceptionCasterTest extends TestCase
+{
+	use VarDumperTestTrait;
+
+	private function getTestException($msg, &$ref = null)
+	{
+		return new \Exception(''.$msg);
+	}
+
+	protected function tearDown()
+	{
+		ExceptionCaster::$srcContext = 1;
+		ExceptionCaster::$traceArgs = true;
+	}
+
+	public function testDefaultSettings()
+	{
+		$ref = array('foo');
+		$e = $this->getTestException('foo', $ref);
+
+		$expectedDump = <<<'EODUMP'
+Exception {
+  #message: "foo"
+  #code: 0
+  #file: "%sExceptionCasterTest.php"
+  #line: 27
+  -trace: {
+    %sExceptionCasterTest.php:27: {
+      : {
+      :     return new \Exception(''.$msg);
+      : }
+    }
+    %sExceptionCasterTest.php:%d: {
+      : $ref = array('foo');
+      : $e = $this->getTestException('foo', $ref);
+      : 
+      arguments: {
+        $msg: "foo"
+        &$ref: array:1 [ …1]
+      }
+    }
+%A
+EODUMP;
+
+		$this->assertDumpMatchesFormat($expectedDump, $e);
+		$this->assertSame(array('foo'), $ref);
+	}
+
+	public function testSeek()
+	{
+		$e = $this->getTestException(2);
+
+		$expectedDump = <<<'EODUMP'
+{
+  %sExceptionCasterTest.php:27: {
+    : {
+    :     return new \Exception(''.$msg);
+    : }
+  }
+  %sExceptionCasterTest.php:%d: {
+    : {
+    :     $e = $this->getTestException(2);
+    : 
+    arguments: {
+      $msg: 2
+    }
+  }
+%A
+EODUMP;
+
+		$this->assertStringMatchesFormat($expectedDump, $this->getDump($e, 'trace'));
+	}
+
+	public function testNoArgs()
+	{
+		$e = $this->getTestException(1);
+		ExceptionCaster::$traceArgs = false;
+
+		$expectedDump = <<<'EODUMP'
+Exception {
+  #message: "1"
+  #code: 0
+  #file: "%sExceptionCasterTest.php"
+  #line: 27
+  -trace: {
+    %sExceptionCasterTest.php:27: {
+      : {
+      :     return new \Exception(''.$msg);
+      : }
+    }
+    %sExceptionCasterTest.php:%d: {
+      : {
+      :     $e = $this->getTestException(1);
+      :     ExceptionCaster::$traceArgs = false;
+    }
+%A
+EODUMP;
+
+		$this->assertDumpMatchesFormat($expectedDump, $e);
+	}
+
+	public function testNoSrcContext()
+	{
+		$e = $this->getTestException(1);
+		ExceptionCaster::$srcContext = -1;
+
+		$expectedDump = <<<'EODUMP'
+Exception {
+  #message: "1"
+  #code: 0
+  #file: "%sExceptionCasterTest.php"
+  #line: 27
+  -trace: {
+    %sExceptionCasterTest.php: 27
+    %sExceptionCasterTest.php: %d
+%A
+EODUMP;
+
+		$this->assertDumpMatchesFormat($expectedDump, $e);
+	}
+
+	public function testHtmlDump()
+	{
+		$e = $this->getTestException(1);
+		ExceptionCaster::$srcContext = -1;
+
+		$cloner = new VarCloner();
+		$cloner->setMaxItems(1);
+		$dumper = new HtmlDumper();
+		$dumper->setDumpHeader('<foo></foo>');
+		$dumper->setDumpBoundaries('<bar>', '</bar>');
+		$dump = $dumper->dump($cloner->cloneVar($e)->withRefHandles(false), true);
+
+		$expectedDump = <<<'EODUMP'
+<foo></foo><bar><span class=sf-dump-note>Exception</span> {<samp>
+  #<span class=sf-dump-protected title="Protected property">message</span>: "<span class=sf-dump-str>1</span>"
+  #<span class=sf-dump-protected title="Protected property">code</span>: <span class=sf-dump-num>0</span>
+  #<span class=sf-dump-protected title="Protected property">file</span>: "<span class=sf-dump-str title="%sExceptionCasterTest.php
+%d characters"><span class=sf-dump-ellipsis>%sTests</span>%eCaster%eExceptionCasterTest.php</span>"
+  #<span class=sf-dump-protected title="Protected property">line</span>: <span class=sf-dump-num>27</span>
+  -<span class=sf-dump-private title="Private property defined in class:&#10;`Exception`">trace</span>: {<samp>
+    <span class=sf-dump-meta title="%sExceptionCasterTest.php
+Stack level %d."><span class=sf-dump-ellipsis>%sVarDumper%eTests</span>%eCaster%eExceptionCasterTest.php</span>: <span class=sf-dump-num>27</span>
+     &hellip;%d
+  </samp>}
+</samp>}
+</bar>
+EODUMP;
+
+		$this->assertStringMatchesFormat($expectedDump, $dump);
+	}
+
+	/**
+	 * @requires function Twig\Template::getSourceContext
+	 */
+	public function testFrameWithTwig()
+	{
+		require_once dirname(__DIR__).'/Fixtures/Twig.php';
+
+		$f = array(
+			new FrameStub(array(
+				'file' => dirname(__DIR__).'/Fixtures/Twig.php',
+				'line' => 20,
+				'class' => '__TwigTemplate_VarDumperFixture_u75a09',
+			)),
+			new FrameStub(array(
+				'file' => dirname(__DIR__).'/Fixtures/Twig.php',
+				'line' => 21,
+				'class' => '__TwigTemplate_VarDumperFixture_u75a09',
+				'object' => new \__TwigTemplate_VarDumperFixture_u75a09(null, __FILE__),
+			)),
+		);
+
+		$expectedDump = <<<'EODUMP'
+array:2 [
+  0 => {
+    class: "__TwigTemplate_VarDumperFixture_u75a09"
+    src: {
+      %sTwig.php:1: {
+        : 
+        : foo bar
+        :   twig source
+      }
+    }
+  }
+  1 => {
+    class: "__TwigTemplate_VarDumperFixture_u75a09"
+    object: __TwigTemplate_VarDumperFixture_u75a09 {
+    %A
+    }
+    src: {
+      %sExceptionCasterTest.php:2: {
+        : foo bar
+        :   twig source
+        : 
+      }
+    }
+  }
+]
+
+EODUMP;
+
+		$this->assertDumpMatchesFormat($expectedDump, $f);
+	}
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/PdoCasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/PdoCasterTest.php
index faa65341170..31bfac7e2da 100644
--- a/htdocs/includes/symfony/var-dumper/Tests/Caster/PdoCasterTest.php
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/PdoCasterTest.php
@@ -11,47 +11,54 @@
 
 namespace Symfony\Component\VarDumper\Tests\Caster;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\VarDumper\Caster\PdoCaster;
 use Symfony\Component\VarDumper\Cloner\Stub;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class PdoCasterTest extends \PHPUnit_Framework_TestCase
+class PdoCasterTest extends TestCase
 {
-    /**
-     * @requires extension pdo_sqlite
-     */
-    public function testCastPdo()
-    {
-        $pdo = new \PDO('sqlite::memory:');
-        $pdo->setAttribute(\PDO::ATTR_STATEMENT_CLASS, array('PDOStatement', array($pdo)));
+	use VarDumperTestTrait;
 
-        $cast = PdoCaster::castPdo($pdo, array(), new Stub(), false);
+	/**
+	 * @requires extension pdo_sqlite
+	 */
+	public function testCastPdo()
+	{
+		$pdo = new \PDO('sqlite::memory:');
+		$pdo->setAttribute(\PDO::ATTR_STATEMENT_CLASS, array('PDOStatement', array($pdo)));
 
-        $this->assertInstanceOf('Symfony\Component\VarDumper\Caster\EnumStub', $cast["\0~\0attributes"]);
+		$cast = PdoCaster::castPdo($pdo, array(), new Stub(), false);
 
-        $attr = $cast["\0~\0attributes"] = $cast["\0~\0attributes"]->value;
-        $this->assertInstanceOf('Symfony\Component\VarDumper\Caster\ConstStub', $attr['CASE']);
-        $this->assertSame('NATURAL', $attr['CASE']->class);
-        $this->assertSame('BOTH', $attr['DEFAULT_FETCH_MODE']->class);
+		$this->assertInstanceOf('Symfony\Component\VarDumper\Caster\EnumStub', $cast["\0~\0attributes"]);
 
-        $xCast = array(
-            "\0~\0inTransaction" => $pdo->inTransaction(),
-            "\0~\0attributes" => array(
-                'CASE' => $attr['CASE'],
-                'ERRMODE' => $attr['ERRMODE'],
-                'PERSISTENT' => false,
-                'DRIVER_NAME' => 'sqlite',
-                'ORACLE_NULLS' => $attr['ORACLE_NULLS'],
-                'CLIENT_VERSION' => $pdo->getAttribute(\PDO::ATTR_CLIENT_VERSION),
-                'SERVER_VERSION' => $pdo->getAttribute(\PDO::ATTR_SERVER_VERSION),
-                'STATEMENT_CLASS' => array('PDOStatement'),
-                'DEFAULT_FETCH_MODE' => $attr['DEFAULT_FETCH_MODE'],
-            ),
-        );
-        unset($cast["\0~\0attributes"]['STATEMENT_CLASS'][1]);
+		$attr = $cast["\0~\0attributes"] = $cast["\0~\0attributes"]->value;
+		$this->assertInstanceOf('Symfony\Component\VarDumper\Caster\ConstStub', $attr['CASE']);
+		$this->assertSame('NATURAL', $attr['CASE']->class);
+		$this->assertSame('BOTH', $attr['DEFAULT_FETCH_MODE']->class);
 
-        $this->assertSame($xCast, $cast);
-    }
+		$xDump = <<<'EODUMP'
+array:2 [
+  "\x00~\x00inTransaction" => false
+  "\x00~\x00attributes" => array:9 [
+    "CASE" => NATURAL
+    "ERRMODE" => SILENT
+    "PERSISTENT" => false
+    "DRIVER_NAME" => "sqlite"
+    "ORACLE_NULLS" => NATURAL
+    "CLIENT_VERSION" => "%s"
+    "SERVER_VERSION" => "%s"
+    "STATEMENT_CLASS" => array:%d [
+      0 => "PDOStatement"%A
+    ]
+    "DEFAULT_FETCH_MODE" => BOTH
+  ]
+]
+EODUMP;
+
+		$this->assertDumpMatchesFormat($xDump, $cast);
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/RedisCasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/RedisCasterTest.php
new file mode 100644
index 00000000000..b096dfe7b6f
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/RedisCasterTest.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ * @requires extension redis
+ */
+class RedisCasterTest extends TestCase
+{
+	use VarDumperTestTrait;
+
+	public function testNotConnected()
+	{
+		$redis = new \Redis();
+
+		if (defined('HHVM_VERSION_ID')) {
+			$xCast = <<<'EODUMP'
+Redis {
+  #host: ""
+%A
+}
+EODUMP;
+		} else {
+			$xCast = <<<'EODUMP'
+Redis {
+  isConnected: false
+}
+EODUMP;
+		}
+
+		$this->assertDumpMatchesFormat($xCast, $redis);
+	}
+
+	public function testConnected()
+	{
+		$redis = new \Redis();
+		if (!@$redis->connect('127.0.0.1')) {
+			$e = error_get_last();
+			self::markTestSkipped($e['message']);
+		}
+
+		if (defined('HHVM_VERSION_ID')) {
+			$xCast = <<<'EODUMP'
+Redis {
+  #host: "127.0.0.1"
+%A
+}
+EODUMP;
+		} else {
+			$xCast = <<<'EODUMP'
+Redis {
+  +"socket": Redis Socket Buffer resource
+  isConnected: true
+  host: "127.0.0.1"
+  port: 6379
+  auth: null
+  dbNum: 0
+  timeout: 0.0
+  persistentId: null
+  options: {
+    READ_TIMEOUT: 0.0
+    SERIALIZER: NONE
+    PREFIX: null
+    SCAN: NORETRY
+  }
+}
+EODUMP;
+		}
+
+		$this->assertDumpMatchesFormat($xCast, $redis);
+	}
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php
index 0d7147fbcd2..63500b9ef4d 100644
--- a/htdocs/includes/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php
@@ -11,22 +11,24 @@
 
 namespace Symfony\Component\VarDumper\Tests\Caster;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
 use Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo;
+use Symfony\Component\VarDumper\Tests\Fixtures\NotLoadableClass;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class ReflectionCasterTest extends \PHPUnit_Framework_TestCase
+class ReflectionCasterTest extends TestCase
 {
-    use VarDumperTestTrait;
+	use VarDumperTestTrait;
 
-    public function testReflectionCaster()
-    {
-        $var = new \ReflectionClass('ReflectionClass');
+	public function testReflectionCaster()
+	{
+		$var = new \ReflectionClass('ReflectionClass');
 
-        $this->assertDumpMatchesFormat(
-            <<<'EOTXT'
+		$this->assertDumpMatchesFormat(
+			<<<'EOTXT'
 ReflectionClass {
   +name: "ReflectionClass"
 %Aimplements: array:%d [
@@ -49,23 +51,23 @@ ReflectionClass {
     "export" => ReflectionMethod {
       +name: "export"
       +class: "ReflectionClass"
-      parameters: {
+%A    parameters: {
         $%s: ReflectionParameter {
 %A         position: 0
 %A
 }
 EOTXT
-            , $var
-        );
-    }
+			, $var
+		);
+	}
 
-    public function testClosureCaster()
-    {
-        $a = $b = 123;
-        $var = function ($x) use ($a, &$b) {};
+	public function testClosureCaster()
+	{
+		$a = $b = 123;
+		$var = function ($x) use ($a, &$b) {};
 
-        $this->assertDumpMatchesFormat(
-            <<<EOTXT
+		$this->assertDumpMatchesFormat(
+			<<<EOTXT
 Closure {
 %Aparameters: {
     \$x: {}
@@ -75,60 +77,60 @@ Closure {
     \$b: & 123
   }
   file: "%sReflectionCasterTest.php"
-  line: "65 to 65"
+  line: "67 to 67"
 }
 EOTXT
-            , $var
-        );
-    }
+			, $var
+		);
+	}
 
-    public function testReflectionParameter()
-    {
-        $var = new \ReflectionParameter(__NAMESPACE__.'\reflectionParameterFixture', 0);
+	public function testReflectionParameter()
+	{
+		$var = new \ReflectionParameter(__NAMESPACE__.'\reflectionParameterFixture', 0);
 
-        $this->assertDumpMatchesFormat(
-            <<<'EOTXT'
+		$this->assertDumpMatchesFormat(
+			<<<'EOTXT'
 ReflectionParameter {
   +name: "arg1"
   position: 0
-  typeHint: "Symfony\Component\VarDumper\Tests\Caster\NotExistingClass"
+  typeHint: "Symfony\Component\VarDumper\Tests\Fixtures\NotLoadableClass"
   default: null
 }
 EOTXT
-            , $var
-        );
-    }
+			, $var
+		);
+	}
 
-    /**
-     * @requires PHP 7.0
-     */
-    public function testReflectionParameterScalar()
-    {
-        $f = eval('return function (int $a) {};');
-        $var = new \ReflectionParameter($f, 0);
+	/**
+	 * @requires PHP 7.0
+	 */
+	public function testReflectionParameterScalar()
+	{
+		$f = eval('return function (int $a) {};');
+		$var = new \ReflectionParameter($f, 0);
 
-        $this->assertDumpMatchesFormat(
-            <<<'EOTXT'
+		$this->assertDumpMatchesFormat(
+			<<<'EOTXT'
 ReflectionParameter {
   +name: "a"
   position: 0
   typeHint: "int"
 }
 EOTXT
-            , $var
-        );
-    }
+			, $var
+		);
+	}
 
-    /**
-     * @requires PHP 7.0
-     */
-    public function testReturnType()
-    {
-        $f = eval('return function ():int {};');
-        $line = __LINE__ - 1;
+	/**
+	 * @requires PHP 7.0
+	 */
+	public function testReturnType()
+	{
+		$f = eval('return function ():int {};');
+		$line = __LINE__ - 1;
 
-        $this->assertDumpMatchesFormat(
-            <<<EOTXT
+		$this->assertDumpMatchesFormat(
+			<<<EOTXT
 Closure {
   returnType: "int"
   class: "Symfony\Component\VarDumper\Tests\Caster\ReflectionCasterTest"
@@ -137,92 +139,97 @@ Closure {
   line: "1 to 1"
 }
 EOTXT
-            , $f
-        );
-    }
+			, $f
+		);
+	}
 
-    /**
-     * @requires PHP 7.0
-     */
-    public function testGenerator()
-    {
-        $g = new GeneratorDemo();
-        $g = $g->baz();
-        $r = new \ReflectionGenerator($g);
+	/**
+	 * @requires PHP 7.0
+	 */
+	public function testGenerator()
+	{
+		if (extension_loaded('xdebug')) {
+			$this->markTestSkipped('xdebug is active');
+		}
 
-        $xDump = <<<'EODUMP'
+		$generator = new GeneratorDemo();
+		$generator = $generator->baz();
+
+		$expectedDump = <<<'EODUMP'
 Generator {
   this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
   executing: {
     Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz(): {
-      %sGeneratorDemo.php:14: """
-        {\n
-            yield from bar();\n
-        }\n
-        """
+      %sGeneratorDemo.php:14: {
+        : {
+        :     yield from bar();
+        : }
+      }
     }
   }
+  closed: false
 }
 EODUMP;
 
-        $this->assertDumpMatchesFormat($xDump, $g);
+		$this->assertDumpMatchesFormat($expectedDump, $generator);
 
-        foreach ($g as $v) {
-            break;
-        }
+		foreach ($generator as $v) {
+			break;
+		}
 
-        $xDump = <<<'EODUMP'
+		$expectedDump = <<<'EODUMP'
 array:2 [
   0 => ReflectionGenerator {
     this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
     trace: {
-      3. Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo() ==> yield(): {
-        src: {
-          %sGeneratorDemo.php:9: """
-            {\n
-                yield 1;\n
-            }\n
-            """
-        }
+      %sGeneratorDemo.php:9: {
+        : {
+        :     yield 1;
+        : }
       }
-      2. Symfony\Component\VarDumper\Tests\Fixtures\bar() ==> Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo(): {
-        src: {
-          %sGeneratorDemo.php:20: """
-            {\n
-                yield from GeneratorDemo::foo();\n
-            }\n
-            """
-        }
+      %sGeneratorDemo.php:20: {
+        : {
+        :     yield from GeneratorDemo::foo();
+        : }
       }
-      1. Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz() ==> Symfony\Component\VarDumper\Tests\Fixtures\bar(): {
-        src: {
-          %sGeneratorDemo.php:14: """
-            {\n
-                yield from bar();\n
-            }\n
-            """
-        }
+      %sGeneratorDemo.php:14: {
+        : {
+        :     yield from bar();
+        : }
       }
     }
+    closed: false
   }
   1 => Generator {
     executing: {
       Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo(): {
-        %sGeneratorDemo.php:10: """
-                  yield 1;\n
-              }\n
-          \n
-          """
+        %sGeneratorDemo.php:10: {
+          :     yield 1;
+          : }
+          : 
+        }
       }
     }
+    closed: false
   }
 ]
 EODUMP;
 
-        $this->assertDumpMatchesFormat($xDump, array($r, $r->getExecutingGenerator()));
-    }
+		$r = new \ReflectionGenerator($generator);
+		$this->assertDumpMatchesFormat($expectedDump, array($r, $r->getExecutingGenerator()));
+
+		foreach ($generator as $v) {
+		}
+
+		$expectedDump = <<<'EODUMP'
+Generator {
+  closed: true
+}
+EODUMP;
+		$this->assertDumpMatchesFormat($expectedDump, $generator);
+	}
 }
 
-function reflectionParameterFixture(NotExistingClass $arg1 = null, $arg2)
+function reflectionParameterFixture(NotLoadableClass $arg1 = null, $arg2)
 {
 }
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/SplCasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/SplCasterTest.php
index 5d71e8d379d..04044f68100 100644
--- a/htdocs/includes/symfony/var-dumper/Tests/Caster/SplCasterTest.php
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/SplCasterTest.php
@@ -11,19 +11,20 @@
 
 namespace Symfony\Component\VarDumper\Tests\Caster;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
 
 /**
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  */
-class SplCasterTest extends \PHPUnit_Framework_TestCase
+class SplCasterTest extends TestCase
 {
-    use VarDumperTestTrait;
+	use VarDumperTestTrait;
 
-    public function getCastFileInfoTests()
-    {
-        return array(
-            array(__FILE__, <<<'EOTXT'
+	public function getCastFileInfoTests()
+	{
+		return array(
+			array(__FILE__, <<<'EOTXT'
 SplFileInfo {
 %Apath: "%sCaster"
   filename: "SplCasterTest.php"
@@ -48,8 +49,8 @@ SplFileInfo {
   link: false
 %A}
 EOTXT
-            ),
-            array('https://google.com/about', <<<'EOTXT'
+			),
+			array('https://google.com/about', <<<'EOTXT'
 SplFileInfo {
 %Apath: "https://google.com"
   filename: "about"
@@ -57,29 +58,23 @@ SplFileInfo {
   pathname: "https://google.com/about"
   extension: ""
   realPath: false
-  writable: false
-  readable: false
-  executable: false
-  file: false
-  dir: false
-  link: false
 %A}
 EOTXT
-            ),
-        );
-    }
+			),
+		);
+	}
 
-    /** @dataProvider getCastFileInfoTests */
-    public function testCastFileInfo($file, $dump)
-    {
-        $this->assertDumpMatchesFormat($dump, new \SplFileInfo($file));
-    }
+	/** @dataProvider getCastFileInfoTests */
+	public function testCastFileInfo($file, $dump)
+	{
+		$this->assertDumpMatchesFormat($dump, new \SplFileInfo($file));
+	}
 
-    public function testCastFileObject()
-    {
-        $var = new \SplFileObject(__FILE__);
-        $var->setFlags(\SplFileObject::DROP_NEW_LINE | \SplFileObject::SKIP_EMPTY);
-        $dump = <<<'EOTXT'
+	public function testCastFileObject()
+	{
+		$var = new \SplFileObject(__FILE__);
+		$var->setFlags(\SplFileObject::DROP_NEW_LINE | \SplFileObject::SKIP_EMPTY);
+		$dump = <<<'EOTXT'
 SplFileObject {
 %Apath: "%sCaster"
   filename: "SplCasterTest.php"
@@ -102,10 +97,10 @@ SplFileObject {
   file: true
   dir: false
   link: false
-%AcsvControl: array:2 [
+%AcsvControl: array:%d [
     0 => ","
     1 => """
-  ]
+%A]
   flags: DROP_NEW_LINE|SKIP_EMPTY
   maxLineLen: 0
   fstat: array:26 [
@@ -121,6 +116,32 @@ SplFileObject {
   key: 0
 }
 EOTXT;
-        $this->assertDumpMatchesFormat($dump, $var);
-    }
+		$this->assertDumpMatchesFormat($dump, $var);
+	}
+
+	/**
+	 * @dataProvider provideCastSplDoublyLinkedList
+	 */
+	public function testCastSplDoublyLinkedList($modeValue, $modeDump)
+	{
+		$var = new \SplDoublyLinkedList();
+		$var->setIteratorMode($modeValue);
+		$dump = <<<EOTXT
+SplDoublyLinkedList {
+%Amode: $modeDump
+  dllist: []
+}
+EOTXT;
+		$this->assertDumpMatchesFormat($dump, $var);
+	}
+
+	public function provideCastSplDoublyLinkedList()
+	{
+		return array(
+			array(\SplDoublyLinkedList::IT_MODE_FIFO, 'IT_MODE_FIFO | IT_MODE_KEEP'),
+			array(\SplDoublyLinkedList::IT_MODE_LIFO, 'IT_MODE_LIFO | IT_MODE_KEEP'),
+			array(\SplDoublyLinkedList::IT_MODE_FIFO | \SplDoublyLinkedList::IT_MODE_DELETE, 'IT_MODE_FIFO | IT_MODE_DELETE'),
+			array(\SplDoublyLinkedList::IT_MODE_LIFO | \SplDoublyLinkedList::IT_MODE_DELETE, 'IT_MODE_LIFO | IT_MODE_DELETE'),
+		);
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/StubCasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/StubCasterTest.php
new file mode 100644
index 00000000000..887d3d82a4f
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/StubCasterTest.php
@@ -0,0 +1,171 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Caster\ArgsStub;
+use Symfony\Component\VarDumper\Caster\ClassStub;
+use Symfony\Component\VarDumper\Caster\LinkStub;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+use Symfony\Component\VarDumper\Tests\Fixtures\FooInterface;
+
+class StubCasterTest extends TestCase
+{
+	use VarDumperTestTrait;
+
+	public function testArgsStubWithDefaults($foo = 234, $bar = 456)
+	{
+		$args = array(new ArgsStub(array(123), __FUNCTION__, __CLASS__));
+
+		$expectedDump = <<<'EODUMP'
+array:1 [
+  0 => {
+    $foo: 123
+  }
+]
+EODUMP;
+
+		$this->assertDumpMatchesFormat($expectedDump, $args);
+	}
+
+	public function testArgsStubWithExtraArgs($foo = 234)
+	{
+		$args = array(new ArgsStub(array(123, 456), __FUNCTION__, __CLASS__));
+
+		$expectedDump = <<<'EODUMP'
+array:1 [
+  0 => {
+    $foo: 123
+    ...: {
+      456
+    }
+  }
+]
+EODUMP;
+
+		$this->assertDumpMatchesFormat($expectedDump, $args);
+	}
+
+	public function testArgsStubNoParamWithExtraArgs()
+	{
+		$args = array(new ArgsStub(array(123), __FUNCTION__, __CLASS__));
+
+		$expectedDump = <<<'EODUMP'
+array:1 [
+  0 => {
+    123
+  }
+]
+EODUMP;
+
+		$this->assertDumpMatchesFormat($expectedDump, $args);
+	}
+
+	public function testArgsStubWithClosure()
+	{
+		$args = array(new ArgsStub(array(123), '{closure}', null));
+
+		$expectedDump = <<<'EODUMP'
+array:1 [
+  0 => {
+    123
+  }
+]
+EODUMP;
+
+		$this->assertDumpMatchesFormat($expectedDump, $args);
+	}
+
+	public function testLinkStub()
+	{
+		$var = array(new LinkStub(__CLASS__, 0, __FILE__));
+
+		$cloner = new VarCloner();
+		$dumper = new HtmlDumper();
+		$dumper->setDumpHeader('<foo></foo>');
+		$dumper->setDumpBoundaries('<bar>', '</bar>');
+		$dumper->setDisplayOptions(array('fileLinkFormat' => '%f:%l'));
+		$dump = $dumper->dump($cloner->cloneVar($var), true);
+
+		$expectedDump = <<<'EODUMP'
+<foo></foo><bar><span class=sf-dump-note>array:1</span> [<samp>
+  <span class=sf-dump-index>0</span> => "<a href="%sStubCasterTest.php:0" target="_blank" rel="noopener noreferrer"><span class=sf-dump-str title="55 characters">Symfony\Component\VarDumper\Tests\Caster\StubCasterTest</span></a>"
+</samp>]
+</bar>
+EODUMP;
+
+		$this->assertStringMatchesFormat($expectedDump, $dump);
+	}
+
+	public function testClassStub()
+	{
+		$var = array(new ClassStub('hello', array(FooInterface::class, 'foo')));
+
+		$cloner = new VarCloner();
+		$dumper = new HtmlDumper();
+		$dumper->setDumpHeader('<foo></foo>');
+		$dumper->setDumpBoundaries('<bar>', '</bar>');
+		$dump = $dumper->dump($cloner->cloneVar($var), true, array('fileLinkFormat' => '%f:%l'));
+
+		$expectedDump = <<<'EODUMP'
+<foo></foo><bar><span class=sf-dump-note>array:1</span> [<samp>
+  <span class=sf-dump-index>0</span> => "<a href="%sFooInterface.php:10" target="_blank" rel="noopener noreferrer"><span class=sf-dump-str title="5 characters">hello</span></a>"
+</samp>]
+</bar>
+EODUMP;
+
+		$this->assertStringMatchesFormat($expectedDump, $dump);
+	}
+
+	public function testClassStubWithNotExistingClass()
+	{
+		$var = array(new ClassStub(NotExisting::class));
+
+		$cloner = new VarCloner();
+		$dumper = new HtmlDumper();
+		$dumper->setDumpHeader('<foo></foo>');
+		$dumper->setDumpBoundaries('<bar>', '</bar>');
+		$dump = $dumper->dump($cloner->cloneVar($var), true);
+
+		$expectedDump = <<<'EODUMP'
+<foo></foo><bar><span class=sf-dump-note>array:1</span> [<samp>
+  <span class=sf-dump-index>0</span> => "<span class=sf-dump-str title="Symfony\Component\VarDumper\Tests\Caster\NotExisting
+52 characters"><span class=sf-dump-ellipsis>Symfony\Component\VarDumper\Tests\Caster</span>\NotExisting</span>"
+</samp>]
+</bar>
+EODUMP;
+
+		$this->assertStringMatchesFormat($expectedDump, $dump);
+	}
+
+	public function testClassStubWithNotExistingMethod()
+	{
+		$var = array(new ClassStub('hello', array(FooInterface::class, 'missing')));
+
+		$cloner = new VarCloner();
+		$dumper = new HtmlDumper();
+		$dumper->setDumpHeader('<foo></foo>');
+		$dumper->setDumpBoundaries('<bar>', '</bar>');
+		$dump = $dumper->dump($cloner->cloneVar($var), true, array('fileLinkFormat' => '%f:%l'));
+
+		$expectedDump = <<<'EODUMP'
+<foo></foo><bar><span class=sf-dump-note>array:1</span> [<samp>
+  <span class=sf-dump-index>0</span> => "<a href="%sFooInterface.php:5" target="_blank" rel="noopener noreferrer"><span class=sf-dump-str title="5 characters">hello</span></a>"
+</samp>]
+</bar>
+EODUMP;
+
+		$this->assertStringMatchesFormat($expectedDump, $dump);
+	}
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/XmlReaderCasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/XmlReaderCasterTest.php
new file mode 100644
index 00000000000..b324d1db9ef
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/XmlReaderCasterTest.php
@@ -0,0 +1,248 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+/**
+ * @author Baptiste Clavié <clavie.b@gmail.com>
+ */
+class XmlReaderCasterTest extends TestCase
+{
+	use VarDumperTestTrait;
+
+	/** @var \XmlReader */
+	private $reader;
+
+	protected function setUp()
+	{
+		$this->reader = new \XmlReader();
+		$this->reader->open(__DIR__.'/../Fixtures/xml_reader.xml');
+	}
+
+	protected function tearDown()
+	{
+		$this->reader->close();
+	}
+
+	public function testParserProperty()
+	{
+		$this->reader->setParserProperty(\XMLReader::SUBST_ENTITIES, true);
+
+		$expectedDump = <<<'EODUMP'
+XMLReader {
+  +nodeType: NONE
+  parserProperties: {
+    SUBST_ENTITIES: true
+     …3
+  }
+   …12
+}
+EODUMP;
+
+		$this->assertDumpMatchesFormat($expectedDump, $this->reader);
+	}
+
+	/**
+	 * @dataProvider provideNodes
+	 */
+	public function testNodes($seek, $expectedDump)
+	{
+		while ($seek--) {
+			$this->reader->read();
+		}
+		$this->assertDumpMatchesFormat($expectedDump, $this->reader);
+	}
+
+	public function provideNodes()
+	{
+		return array(
+			array(0, <<<'EODUMP'
+XMLReader {
+  +nodeType: NONE
+   …13
+}
+EODUMP
+			),
+			array(1, <<<'EODUMP'
+XMLReader {
+  +localName: "foo"
+  +nodeType: ELEMENT
+  +baseURI: "%sxml_reader.xml"
+   …11
+}
+EODUMP
+			),
+			array(2, <<<'EODUMP'
+XMLReader {
+  +localName: "#text"
+  +nodeType: SIGNIFICANT_WHITESPACE
+  +depth: 1
+  +value: """
+    \n
+        
+    """
+  +baseURI: "%sxml_reader.xml"
+   …9
+}
+EODUMP
+			),
+			array(3, <<<'EODUMP'
+XMLReader {
+  +localName: "bar"
+  +nodeType: ELEMENT
+  +depth: 1
+  +baseURI: "%sxml_reader.xml"
+   …10
+}
+EODUMP
+			),
+			array(4, <<<'EODUMP'
+XMLReader {
+  +localName: "bar"
+  +nodeType: END_ELEMENT
+  +depth: 1
+  +baseURI: "%sxml_reader.xml"
+   …10
+}
+EODUMP
+			),
+			array(6, <<<'EODUMP'
+XMLReader {
+  +localName: "bar"
+  +nodeType: ELEMENT
+  +depth: 1
+  +isEmptyElement: true
+  +baseURI: "%sxml_reader.xml"
+   …9
+}
+EODUMP
+			),
+			array(9, <<<'EODUMP'
+XMLReader {
+  +localName: "#text"
+  +nodeType: TEXT
+  +depth: 2
+  +value: "With text"
+  +baseURI: "%sxml_reader.xml"
+   …9
+}
+EODUMP
+			),
+			array(12, <<<'EODUMP'
+XMLReader {
+  +localName: "bar"
+  +nodeType: ELEMENT
+  +depth: 1
+  +attributeCount: 2
+  +baseURI: "%sxml_reader.xml"
+   …9
+}
+EODUMP
+			),
+			array(13, <<<'EODUMP'
+XMLReader {
+  +localName: "bar"
+  +nodeType: END_ELEMENT
+  +depth: 1
+  +baseURI: "%sxml_reader.xml"
+   …10
+}
+EODUMP
+			),
+			array(15, <<<'EODUMP'
+XMLReader {
+  +localName: "bar"
+  +nodeType: ELEMENT
+  +depth: 1
+  +attributeCount: 1
+  +baseURI: "%sxml_reader.xml"
+   …9
+}
+EODUMP
+			),
+			array(16, <<<'EODUMP'
+XMLReader {
+  +localName: "#text"
+  +nodeType: SIGNIFICANT_WHITESPACE
+  +depth: 2
+  +value: """
+    \n
+            
+    """
+  +baseURI: "%sxml_reader.xml"
+   …9
+}
+EODUMP
+			),
+			array(17, <<<'EODUMP'
+XMLReader {
+  +localName: "baz"
+  +prefix: "baz"
+  +nodeType: ELEMENT
+  +depth: 2
+  +namespaceURI: "http://symfony.com"
+  +baseURI: "%sxml_reader.xml"
+   …8
+}
+EODUMP
+			),
+			array(18, <<<'EODUMP'
+XMLReader {
+  +localName: "baz"
+  +prefix: "baz"
+  +nodeType: END_ELEMENT
+  +depth: 2
+  +namespaceURI: "http://symfony.com"
+  +baseURI: "%sxml_reader.xml"
+   …8
+}
+EODUMP
+			),
+			array(19, <<<'EODUMP'
+XMLReader {
+  +localName: "#text"
+  +nodeType: SIGNIFICANT_WHITESPACE
+  +depth: 2
+  +value: """
+    \n
+        
+    """
+  +baseURI: "%sxml_reader.xml"
+   …9
+}
+EODUMP
+			),
+			array(21, <<<'EODUMP'
+XMLReader {
+  +localName: "#text"
+  +nodeType: SIGNIFICANT_WHITESPACE
+  +depth: 1
+  +value: "\n"
+  +baseURI: "%sxml_reader.xml"
+   …9
+}
+EODUMP
+			),
+			array(22, <<<'EODUMP'
+XMLReader {
+  +localName: "foo"
+  +nodeType: END_ELEMENT
+  +baseURI: "%sxml_reader.xml"
+   …11
+}
+EODUMP
+			),
+		);
+	}
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/CliDumperTest.php b/htdocs/includes/symfony/var-dumper/Tests/CliDumperTest.php
index cd6d64d1c03..9a7404cea05 100644
--- a/htdocs/includes/symfony/var-dumper/Tests/CliDumperTest.php
+++ b/htdocs/includes/symfony/var-dumper/Tests/CliDumperTest.php
@@ -11,43 +11,46 @@
 
 namespace Symfony\Component\VarDumper\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Symfony\Component\VarDumper\Dumper\CliDumper;
 use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+use Twig\Environment;
+use Twig\Loader\FilesystemLoader;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class CliDumperTest extends \PHPUnit_Framework_TestCase
+class CliDumperTest extends TestCase
 {
-    use VarDumperTestTrait;
+	use VarDumperTestTrait;
 
-    public function testGet()
-    {
-        require __DIR__.'/Fixtures/dumb-var.php';
+	public function testGet()
+	{
+		require __DIR__.'/Fixtures/dumb-var.php';
 
-        $dumper = new CliDumper('php://output');
-        $dumper->setColors(false);
-        $cloner = new VarCloner();
-        $cloner->addCasters(array(
-            ':stream' => function ($res, $a) {
-                unset($a['uri'], $a['wrapper_data']);
+		$dumper = new CliDumper('php://output');
+		$dumper->setColors(false);
+		$cloner = new VarCloner();
+		$cloner->addCasters(array(
+			':stream' => function ($res, $a) {
+				unset($a['uri'], $a['wrapper_data']);
 
-                return $a;
-            },
-        ));
-        $data = $cloner->cloneVar($var);
+				return $a;
+			},
+		));
+		$data = $cloner->cloneVar($var);
 
-        ob_start();
-        $dumper->dump($data);
-        $out = ob_get_clean();
-        $out = preg_replace('/[ \t]+$/m', '', $out);
-        $intMax = PHP_INT_MAX;
-        $res = (int) $var['res'];
+		ob_start();
+		$dumper->dump($data);
+		$out = ob_get_clean();
+		$out = preg_replace('/[ \t]+$/m', '', $out);
+		$intMax = PHP_INT_MAX;
+		$res = (int) $var['res'];
 
-        $r = defined('HHVM_VERSION') ? '' : '#%d';
-        $this->assertStringMatchesFormat(
-            <<<EOTXT
+		$r = defined('HHVM_VERSION') ? '' : '#%d';
+		$this->assertStringMatchesFormat(
+			<<<EOTXT
 array:24 [
   "number" => 1
   0 => &1 null
@@ -62,15 +65,12 @@ array:24 [
   7 => b"é\\x00"
   "[]" => []
   "res" => stream resource {@{$res}
-    wrapper_type: "plainfile"
+%A  wrapper_type: "plainfile"
     stream_type: "STDIO"
     mode: "r"
     unread_bytes: 0
     seekable: true
-    timed_out: false
-    blocked: true
-    eof: false
-    options: []
+%A  options: []
   }
   "obj" => Symfony\Component\VarDumper\Tests\Fixture\DumbFoo {#%d
     +foo: "foo"
@@ -105,20 +105,20 @@ array:24 [
 ]
 
 EOTXT
-            ,
-            $out
-        );
-    }
+			,
+			$out
+		);
+	}
 
-    /**
-     * @requires extension xml
-     */
-    public function testXmlResource()
-    {
-        $var = xml_parser_create();
+	/**
+	 * @requires extension xml
+	 */
+	public function testXmlResource()
+	{
+		$var = xml_parser_create();
 
-        $this->assertDumpMatchesFormat(
-            <<<EOTXT
+		$this->assertDumpMatchesFormat(
+			<<<'EOTXT'
 xml resource {
   current_byte_index: %i
   current_column_number: %i
@@ -126,199 +126,257 @@ xml resource {
   error_code: XML_ERROR_NONE
 }
 EOTXT
-            ,
-            $var
-        );
-    }
+			,
+			$var
+		);
+	}
 
-    public function testClosedResource()
-    {
-        if (defined('HHVM_VERSION') && HHVM_VERSION_ID < 30600) {
-            $this->markTestSkipped();
-        }
+	public function testJsonCast()
+	{
+		$var = (array) json_decode('{"0":{},"1":null}');
+		foreach ($var as &$v) {
+		}
+		$var[] = &$v;
+		$var[''] = 2;
 
-        $var = fopen(__FILE__, 'r');
-        fclose($var);
+		if (\PHP_VERSION_ID >= 70200) {
+			$this->assertDumpMatchesFormat(
+				<<<'EOTXT'
+array:4 [
+  0 => {}
+  1 => &1 null
+  2 => &1 null
+  "" => 2
+]
+EOTXT
+				,
+				$var
+			);
+		} else {
+			$this->assertDumpMatchesFormat(
+				<<<'EOTXT'
+array:4 [
+  "0" => {}
+  "1" => &1 null
+  0 => &1 null
+  "" => 2
+]
+EOTXT
+				,
+				$var
+			);
+		}
+	}
 
-        $dumper = new CliDumper('php://output');
-        $dumper->setColors(false);
-        $cloner = new VarCloner();
-        $data = $cloner->cloneVar($var);
+	public function testObjectCast()
+	{
+		$var = (object) array(1 => 1);
+		$var->{1} = 2;
 
-        ob_start();
-        $dumper->dump($data);
-        $out = ob_get_clean();
-        $res = (int) $var;
+		if (\PHP_VERSION_ID >= 70200) {
+			$this->assertDumpMatchesFormat(
+				<<<'EOTXT'
+{
+  +"1": 2
+}
+EOTXT
+				,
+				$var
+			);
+		} else {
+			$this->assertDumpMatchesFormat(
+				<<<'EOTXT'
+{
+  +1: 1
+  +"1": 2
+}
+EOTXT
+				,
+				$var
+			);
+		}
+	}
 
-        $this->assertStringMatchesFormat(
-            <<<EOTXT
-Unknown resource @{$res}
+	public function testClosedResource()
+	{
+		if (defined('HHVM_VERSION') && HHVM_VERSION_ID < 30600) {
+			$this->markTestSkipped();
+		}
+
+		$var = fopen(__FILE__, 'r');
+		fclose($var);
+
+		$dumper = new CliDumper('php://output');
+		$dumper->setColors(false);
+		$cloner = new VarCloner();
+		$data = $cloner->cloneVar($var);
+
+		ob_start();
+		$dumper->dump($data);
+		$out = ob_get_clean();
+		$res = (int) $var;
+
+		$this->assertStringMatchesFormat(
+			<<<EOTXT
+Closed resource @{$res}
 
 EOTXT
-            ,
-            $out
-        );
-    }
+			,
+			$out
+		);
+	}
 
-    public function testThrowingCaster()
-    {
-        $out = fopen('php://memory', 'r+b');
+	public function testFlags()
+	{
+		putenv('DUMP_LIGHT_ARRAY=1');
+		putenv('DUMP_STRING_LENGTH=1');
 
-        require_once __DIR__.'/Fixtures/Twig.php';
-        $twig = new \__TwigTemplate_VarDumperFixture_u75a09(new \Twig_Environment(new \Twig_Loader_Filesystem()));
+		$var = array(
+			range(1, 3),
+			array('foo', 2 => 'bar'),
+		);
 
-        $dumper = new CliDumper();
-        $dumper->setColors(false);
-        $cloner = new VarCloner();
-        $cloner->addCasters(array(
-            ':stream' => function ($res, $a) {
-                unset($a['wrapper_data']);
+		$this->assertDumpEquals(
+			<<<EOTXT
+[
+  [
+    1
+    2
+    3
+  ]
+  [
+    0 => (3) "foo"
+    2 => (3) "bar"
+  ]
+]
+EOTXT
+			,
+			$var
+		);
 
-                return $a;
-            },
-        ));
-        $cloner->addCasters(array(
-            ':stream' => eval('return function () use ($twig) {
+		putenv('DUMP_LIGHT_ARRAY=');
+		putenv('DUMP_STRING_LENGTH=');
+	}
+
+	/**
+	 * @requires function Twig\Template::getSourceContext
+	 */
+	public function testThrowingCaster()
+	{
+		$out = fopen('php://memory', 'r+b');
+
+		require_once __DIR__.'/Fixtures/Twig.php';
+		$twig = new \__TwigTemplate_VarDumperFixture_u75a09(new Environment(new FilesystemLoader()));
+
+		$dumper = new CliDumper();
+		$dumper->setColors(false);
+		$cloner = new VarCloner();
+		$cloner->addCasters(array(
+			':stream' => function ($res, $a) {
+				unset($a['wrapper_data']);
+
+				return $a;
+			},
+		));
+		$cloner->addCasters(array(
+			':stream' => eval('return function () use ($twig) {
                 try {
                     $twig->render(array());
-                } catch (\Twig_Error_Runtime $e) {
+                } catch (\Twig\Error\RuntimeError $e) {
                     throw $e->getPrevious();
                 }
             };'),
-        ));
-        $line = __LINE__ - 2;
-        $ref = (int) $out;
+		));
+		$ref = (int) $out;
 
-        $data = $cloner->cloneVar($out);
-        $dumper->dump($data, $out);
-        rewind($out);
-        $out = stream_get_contents($out);
+		$data = $cloner->cloneVar($out);
+		$dumper->dump($data, $out);
+		$out = stream_get_contents($out, -1, 0);
 
-        if (method_exists($twig, 'getSource')) {
-            $twig = <<<EOTXT
-          foo.twig:2: """
-            foo bar\\n
-                twig source\\n
-            \\n
-            """
-
-EOTXT;
-        } else {
-            $twig = '';
-        }
-
-        $r = defined('HHVM_VERSION') ? '' : '#%d';
-        $this->assertStringMatchesFormat(
-            <<<EOTXT
+		$r = defined('HHVM_VERSION') ? '' : '#%d';
+		$this->assertStringMatchesFormat(
+			<<<EOTXT
 stream resource {@{$ref}
-  wrapper_type: "PHP"
+  ⚠: Symfony\Component\VarDumper\Exception\ThrowingCasterException {{$r}
+    #message: "Unexpected Exception thrown from a caster: Foobar"
+    -trace: {
+      %sTwig.php:2: {
+        : foo bar
+        :   twig source
+        : 
+      }
+      %sTemplate.php:%d: {
+        : try {
+        :     \$this->doDisplay(\$context, \$blocks);
+        : } catch (Twig%sError \$e) {
+      }
+      %sTemplate.php:%d: {
+        : {
+        :     \$this->displayWithErrorHandling(\$this->env->mergeGlobals(\$context), array_merge(\$this->blocks, \$blocks));
+        : }
+      }
+      %sTemplate.php:%d: {
+        : try {
+        :     \$this->display(\$context);
+        : } catch (%s \$e) {
+      }
+      %sCliDumperTest.php:%d: {
+%A
+      }
+    }
+  }
+%Awrapper_type: "PHP"
   stream_type: "MEMORY"
   mode: "%s+b"
   unread_bytes: 0
   seekable: true
   uri: "php://memory"
-  timed_out: false
-  blocked: true
-  eof: false
-  options: []
-  ⚠: Symfony\Component\VarDumper\Exception\ThrowingCasterException {{$r}
-    #message: "Unexpected Exception thrown from a caster: Foobar"
-    -trace: {
-      %d. __TwigTemplate_VarDumperFixture_u75a09->doDisplay() ==> new Exception(): {
-        src: {
-          %sTwig.php:19: """
-                // line 2\\n
-                throw new \Exception('Foobar');\\n
-            }\\n
-            """
-{$twig}        }
-      }
-      %d. Twig_Template->displayWithErrorHandling() ==> __TwigTemplate_VarDumperFixture_u75a09->doDisplay(): {
-        src: {
-          %sTemplate.php:%d: """
-            try {\\n
-                \$this->doDisplay(\$context, \$blocks);\\n
-            } catch (Twig_Error \$e) {\\n
-            """
-        }
-      }
-      %d. Twig_Template->display() ==> Twig_Template->displayWithErrorHandling(): {
-        src: {
-          %sTemplate.php:%d: """
-            {\\n
-                \$this->displayWithErrorHandling(\$this->env->mergeGlobals(\$context), array_merge(\$this->blocks, \$blocks));\\n
-            }\\n
-            """
-        }
-      }
-      %d. Twig_Template->render() ==> Twig_Template->display(): {
-        src: {
-          %sTemplate.php:%d: """
-            try {\\n
-                \$this->display(\$context);\\n
-            } catch (Exception \$e) {\\n
-            """
-        }
-      }
-      %d. %slosure%s() ==> Twig_Template->render(): {
-        src: {
-          %sCliDumperTest.php:{$line}: """
-                    }\\n
-                };'),\\n
-            ));\\n
-            """
-        }
-      }
-    }
-  }
+%Aoptions: []
 }
 
 EOTXT
-            ,
-            $out
-        );
-    }
+			,
+			$out
+		);
+	}
 
-    public function testRefsInProperties()
-    {
-        $var = (object) array('foo' => 'foo');
-        $var->bar = &$var->foo;
+	public function testRefsInProperties()
+	{
+		$var = (object) array('foo' => 'foo');
+		$var->bar = &$var->foo;
 
-        $dumper = new CliDumper();
-        $dumper->setColors(false);
-        $cloner = new VarCloner();
+		$dumper = new CliDumper();
+		$dumper->setColors(false);
+		$cloner = new VarCloner();
 
-        $out = fopen('php://memory', 'r+b');
-        $data = $cloner->cloneVar($var);
-        $dumper->dump($data, $out);
-        rewind($out);
-        $out = stream_get_contents($out);
+		$data = $cloner->cloneVar($var);
+		$out = $dumper->dump($data, true);
 
-        $r = defined('HHVM_VERSION') ? '' : '#%d';
-        $this->assertStringMatchesFormat(
-            <<<EOTXT
+		$r = defined('HHVM_VERSION') ? '' : '#%d';
+		$this->assertStringMatchesFormat(
+			<<<EOTXT
 {{$r}
   +"foo": &1 "foo"
   +"bar": &1 "foo"
 }
 
 EOTXT
-            ,
-            $out
-        );
-    }
+			,
+			$out
+		);
+	}
 
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     * @requires PHP 5.6
-     */
-    public function testSpecialVars56()
-    {
-        $var = $this->getSpecialVars();
+	/**
+	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
+	 * @requires PHP 5.6
+	 */
+	public function testSpecialVars56()
+	{
+		$var = $this->getSpecialVars();
 
-        $this->assertDumpEquals(
-            <<<EOTXT
+		$this->assertDumpEquals(
+			<<<'EOTXT'
 array:3 [
   0 => array:1 [
     0 => &1 array:1 [
@@ -333,38 +391,38 @@ array:3 [
   2 => &2 array:1 [&2]
 ]
 EOTXT
-            ,
-            $var
-        );
-    }
+			,
+			$var
+		);
+	}
 
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testGlobalsNoExt()
-    {
-        $var = $this->getSpecialVars();
-        unset($var[0]);
-        $out = '';
+	/**
+	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
+	 */
+	public function testGlobalsNoExt()
+	{
+		$var = $this->getSpecialVars();
+		unset($var[0]);
+		$out = '';
 
-        $dumper = new CliDumper(function ($line, $depth) use (&$out) {
-            if ($depth >= 0) {
-                $out .= str_repeat('  ', $depth).$line."\n";
-            }
-        });
-        $dumper->setColors(false);
-        $cloner = new VarCloner();
+		$dumper = new CliDumper(function ($line, $depth) use (&$out) {
+			if ($depth >= 0) {
+				$out .= str_repeat('  ', $depth).$line."\n";
+			}
+		});
+		$dumper->setColors(false);
+		$cloner = new VarCloner();
 
-        $refl = new \ReflectionProperty($cloner, 'useExt');
-        $refl->setAccessible(true);
-        $refl->setValue($cloner, false);
+		$refl = new \ReflectionProperty($cloner, 'useExt');
+		$refl->setAccessible(true);
+		$refl->setValue($cloner, false);
 
-        $data = $cloner->cloneVar($var);
-        $dumper->dump($data);
+		$data = $cloner->cloneVar($var);
+		$dumper->dump($data);
 
-        $this->assertSame(
-            <<<EOTXT
+		$this->assertSame(
+			<<<'EOTXT'
 array:2 [
   1 => array:1 [
     "GLOBALS" => &1 array:1 [
@@ -375,38 +433,38 @@ array:2 [
 ]
 
 EOTXT
-            ,
-            $out
-        );
-    }
+			,
+			$out
+		);
+	}
 
-    /**
-     * @runInSeparateProcess
-     * @preserveGlobalState disabled
-     */
-    public function testBuggyRefs()
-    {
-        if (PHP_VERSION_ID >= 50600) {
-            $this->markTestSkipped('PHP 5.6 fixed refs counting');
-        }
+	/**
+	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
+	 */
+	public function testBuggyRefs()
+	{
+		if (\PHP_VERSION_ID >= 50600) {
+			$this->markTestSkipped('PHP 5.6 fixed refs counting');
+		}
 
-        $var = $this->getSpecialVars();
-        $var = $var[0];
+		$var = $this->getSpecialVars();
+		$var = $var[0];
 
-        $dumper = new CliDumper();
-        $dumper->setColors(false);
-        $cloner = new VarCloner();
+		$dumper = new CliDumper();
+		$dumper->setColors(false);
+		$cloner = new VarCloner();
 
-        $data = $cloner->cloneVar($var)->withMaxDepth(3);
-        $out = '';
-        $dumper->dump($data, function ($line, $depth) use (&$out) {
-            if ($depth >= 0) {
-                $out .= str_repeat('  ', $depth).$line."\n";
-            }
-        });
+		$data = $cloner->cloneVar($var)->withMaxDepth(3);
+		$out = '';
+		$dumper->dump($data, function ($line, $depth) use (&$out) {
+			if ($depth >= 0) {
+				$out .= str_repeat('  ', $depth).$line."\n";
+			}
+		});
 
-        $this->assertSame(
-            <<<EOTXT
+		$this->assertSame(
+			<<<'EOTXT'
 array:1 [
   0 => array:1 [
     0 => array:1 [
@@ -416,26 +474,41 @@ array:1 [
 ]
 
 EOTXT
-            ,
-            $out
-        );
-    }
+			,
+			$out
+		);
+	}
 
-    private function getSpecialVars()
-    {
-        foreach (array_keys($GLOBALS) as $var) {
-            if ('GLOBALS' !== $var) {
-                unset($GLOBALS[$var]);
-            }
-        }
+	public function testIncompleteClass()
+	{
+		$unserializeCallbackHandler = ini_set('unserialize_callback_func', null);
+		$var = unserialize('O:8:"Foo\Buzz":0:{}');
+		ini_set('unserialize_callback_func', $unserializeCallbackHandler);
 
-        $var = function &() {
-            $var = array();
-            $var[] = &$var;
+		$this->assertDumpMatchesFormat(
+			<<<EOTXT
+__PHP_Incomplete_Class(Foo\Buzz) {}
+EOTXT
+			,
+			$var
+		);
+	}
 
-            return $var;
-        };
+	private function getSpecialVars()
+	{
+		foreach (array_keys($GLOBALS) as $var) {
+			if ('GLOBALS' !== $var) {
+				unset($GLOBALS[$var]);
+			}
+		}
 
-        return array($var(), $GLOBALS, &$GLOBALS);
-    }
+		$var = function &() {
+			$var = array();
+			$var[] = &$var;
+
+			return $var;
+		};
+
+		return array($var(), $GLOBALS, &$GLOBALS);
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Fixtures/FooInterface.php b/htdocs/includes/symfony/var-dumper/Tests/Fixtures/FooInterface.php
new file mode 100644
index 00000000000..2394f51d0d6
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Fixtures/FooInterface.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\VarDumper\Tests\Fixtures;
+
+interface FooInterface
+{
+	/**
+	 * Hello.
+	 */
+	public function foo();
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Fixtures/NotLoadableClass.php b/htdocs/includes/symfony/var-dumper/Tests/Fixtures/NotLoadableClass.php
new file mode 100644
index 00000000000..d8e0cb359f4
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Fixtures/NotLoadableClass.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\VarDumper\Tests\Fixtures;
+
+class NotLoadableClass extends NotLoadableClass
+{
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Fixtures/Twig.php b/htdocs/includes/symfony/var-dumper/Tests/Fixtures/Twig.php
index c74a2de8e60..6eff505b7c6 100644
--- a/htdocs/includes/symfony/var-dumper/Tests/Fixtures/Twig.php
+++ b/htdocs/includes/symfony/var-dumper/Tests/Fixtures/Twig.php
@@ -1,34 +1,38 @@
 <?php
 
 /* foo.twig */
-class __TwigTemplate_VarDumperFixture_u75a09 extends Twig_Template
+class __TwigTemplate_VarDumperFixture_u75a09 extends Twig\Template
 {
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
+	private $path;
 
-        $this->parent = false;
+	public function __construct(Twig\Environment $env = null, $path = null)
+	{
+		if (null !== $env) {
+			parent::__construct($env);
+		}
+		$this->parent = false;
+		$this->blocks = array();
+		$this->path = $path;
+	}
 
-        $this->blocks = array(
-        );
-    }
+	protected function doDisplay(array $context, array $blocks = array())
+	{
+		// line 2
+		throw new \Exception('Foobar');
+	}
 
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 2
-        throw new \Exception('Foobar');
-    }
+	public function getTemplateName()
+	{
+		return 'foo.twig';
+	}
 
-    public function getTemplateName()
-    {
-        return 'foo.twig';
-    }
+	public function getDebugInfo()
+	{
+		return array(20 => 1, 21 => 2);
+	}
 
-    public function getDebugInfo()
-    {
-        return array (19 => 2);
-    }
+	public function getSourceContext()
+	{
+		return new Twig\Source("   foo bar\n     twig source\n\n", 'foo.twig', $this->path ?: __FILE__);
+	}
 }
-/* foo bar*/
-/*     twig source*/
-/* */
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Fixtures/xml_reader.xml b/htdocs/includes/symfony/var-dumper/Tests/Fixtures/xml_reader.xml
new file mode 100644
index 00000000000..740c399fc44
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Fixtures/xml_reader.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<foo>
+    <bar></bar>
+    <bar />
+    <bar>With text</bar>
+    <bar foo="bar" baz="fubar"></bar>
+    <bar xmlns:baz="http://symfony.com">
+        <baz:baz></baz:baz>
+    </bar>
+</foo>
diff --git a/htdocs/includes/symfony/var-dumper/Tests/HtmlDumperTest.php b/htdocs/includes/symfony/var-dumper/Tests/HtmlDumperTest.php
index 3090435c5d4..96fcbac5b49 100644
--- a/htdocs/includes/symfony/var-dumper/Tests/HtmlDumperTest.php
+++ b/htdocs/includes/symfony/var-dumper/Tests/HtmlDumperTest.php
@@ -11,44 +11,45 @@
 
 namespace Symfony\Component\VarDumper\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Symfony\Component\VarDumper\Dumper\HtmlDumper;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class HtmlDumperTest extends \PHPUnit_Framework_TestCase
+class HtmlDumperTest extends TestCase
 {
-    public function testGet()
-    {
-        require __DIR__.'/Fixtures/dumb-var.php';
+	public function testGet()
+	{
+		require __DIR__.'/Fixtures/dumb-var.php';
 
-        $dumper = new HtmlDumper('php://output');
-        $dumper->setDumpHeader('<foo></foo>');
-        $dumper->setDumpBoundaries('<bar>', '</bar>');
-        $cloner = new VarCloner();
-        $cloner->addCasters(array(
-            ':stream' => function ($res, $a) {
-                unset($a['uri'], $a['wrapper_data']);
+		$dumper = new HtmlDumper('php://output');
+		$dumper->setDumpHeader('<foo></foo>');
+		$dumper->setDumpBoundaries('<bar>', '</bar>');
+		$cloner = new VarCloner();
+		$cloner->addCasters(array(
+			':stream' => function ($res, $a) {
+				unset($a['uri'], $a['wrapper_data']);
 
-                return $a;
-            },
-        ));
-        $data = $cloner->cloneVar($var);
+				return $a;
+			},
+		));
+		$data = $cloner->cloneVar($var);
 
-        ob_start();
-        $dumper->dump($data);
-        $out = ob_get_clean();
-        $out = preg_replace('/[ \t]+$/m', '', $out);
-        $var['file'] = htmlspecialchars($var['file'], ENT_QUOTES, 'UTF-8');
-        $intMax = PHP_INT_MAX;
-        preg_match('/sf-dump-\d+/', $out, $dumpId);
-        $dumpId = $dumpId[0];
-        $res = (int) $var['res'];
+		ob_start();
+		$dumper->dump($data);
+		$out = ob_get_clean();
+		$out = preg_replace('/[ \t]+$/m', '', $out);
+		$var['file'] = htmlspecialchars($var['file'], ENT_QUOTES, 'UTF-8');
+		$intMax = PHP_INT_MAX;
+		preg_match('/sf-dump-\d+/', $out, $dumpId);
+		$dumpId = $dumpId[0];
+		$res = (int) $var['res'];
 
-        $r = defined('HHVM_VERSION') ? '' : '<a class=sf-dump-ref>#%d</a>';
-        $this->assertStringMatchesFormat(
-            <<<EOTXT
+		$r = defined('HHVM_VERSION') ? '' : '<a class=sf-dump-ref>#%d</a>';
+		$this->assertStringMatchesFormat(
+			<<<EOTXT
 <foo></foo><bar><span class=sf-dump-note>array:24</span> [<samp>
   "<span class=sf-dump-key>number</span>" => <span class=sf-dump-num>1</span>
   <span class=sf-dump-key>0</span> => <a class=sf-dump-ref href=#{$dumpId}-ref01 title="2 occurrences">&amp;1</a> <span class=sf-dump-const>null</span>
@@ -59,26 +60,24 @@ class HtmlDumperTest extends \PHPUnit_Framework_TestCase
   <span class=sf-dump-key>4</span> => <span class=sf-dump-num>INF</span>
   <span class=sf-dump-key>5</span> => <span class=sf-dump-num>-INF</span>
   <span class=sf-dump-key>6</span> => <span class=sf-dump-num>{$intMax}</span>
-  "<span class=sf-dump-key>str</span>" => "<span class=sf-dump-str title="5 characters">d&%s;j&%s;</span>\\n"
-  <span class=sf-dump-key>7</span> => b"<span class=sf-dump-str title="2 binary or non-UTF-8 characters">&%s;</span>\\x00"
+  "<span class=sf-dump-key>str</span>" => "<span class=sf-dump-str title="5 characters">d&%s;j&%s;<span class=sf-dump-default>\\n</span></span>"
+  <span class=sf-dump-key>7</span> => b"<span class=sf-dump-str title="2 binary or non-UTF-8 characters">&%s;<span class=sf-dump-default>\\x00</span></span>"
   "<span class=sf-dump-key>[]</span>" => []
   "<span class=sf-dump-key>res</span>" => <span class=sf-dump-note>stream resource</span> <a class=sf-dump-ref>@{$res}</a><samp>
-    <span class=sf-dump-meta>wrapper_type</span>: "<span class=sf-dump-str title="9 characters">plainfile</span>"
+%A  <span class=sf-dump-meta>wrapper_type</span>: "<span class=sf-dump-str title="9 characters">plainfile</span>"
     <span class=sf-dump-meta>stream_type</span>: "<span class=sf-dump-str title="5 characters">STDIO</span>"
     <span class=sf-dump-meta>mode</span>: "<span class=sf-dump-str>r</span>"
     <span class=sf-dump-meta>unread_bytes</span>: <span class=sf-dump-num>0</span>
     <span class=sf-dump-meta>seekable</span>: <span class=sf-dump-const>true</span>
-    <span class=sf-dump-meta>timed_out</span>: <span class=sf-dump-const>false</span>
-    <span class=sf-dump-meta>blocked</span>: <span class=sf-dump-const>true</span>
-    <span class=sf-dump-meta>eof</span>: <span class=sf-dump-const>false</span>
-    <span class=sf-dump-meta>options</span>: []
+%A  <span class=sf-dump-meta>options</span>: []
   </samp>}
   "<span class=sf-dump-key>obj</span>" => <abbr title="Symfony\Component\VarDumper\Tests\Fixture\DumbFoo" class=sf-dump-note>DumbFoo</abbr> {<a class=sf-dump-ref href=#{$dumpId}-ref2%d title="2 occurrences">#%d</a><samp id={$dumpId}-ref2%d>
     +<span class=sf-dump-public title="Public property">foo</span>: "<span class=sf-dump-str title="3 characters">foo</span>"
     +"<span class=sf-dump-public title="Runtime added dynamic property">bar</span>": "<span class=sf-dump-str title="3 characters">bar</span>"
   </samp>}
   "<span class=sf-dump-key>closure</span>" => <span class=sf-dump-note>Closure</span> {{$r}<samp>
-    <span class=sf-dump-meta>class</span>: "<span class=sf-dump-str title="48 characters">Symfony\Component\VarDumper\Tests\HtmlDumperTest</span>"
+    <span class=sf-dump-meta>class</span>: "<span class=sf-dump-str title="Symfony\Component\VarDumper\Tests\HtmlDumperTest
+48 characters"><span class=sf-dump-ellipsis>Symfony\Component\VarDumper\Tests</span>\HtmlDumperTest</span>"
     <span class=sf-dump-meta>this</span>: <abbr title="Symfony\Component\VarDumper\Tests\HtmlDumperTest" class=sf-dump-note>HtmlDumperTest</abbr> {{$r} &%s;}
     <span class=sf-dump-meta>parameters</span>: {<samp>
       <span class=sf-dump-meta>\$a</span>: {}
@@ -87,7 +86,8 @@ class HtmlDumperTest extends \PHPUnit_Framework_TestCase
         <span class=sf-dump-meta>default</span>: <span class=sf-dump-const>null</span>
       </samp>}
     </samp>}
-    <span class=sf-dump-meta>file</span>: "<span class=sf-dump-str title="%d characters">{$var['file']}</span>"
+    <span class=sf-dump-meta>file</span>: "<span class=sf-dump-str title="{$var['file']}
+%d characters"><span class=sf-dump-ellipsis>%sTests</span>%eFixtures%edumb-var.php</span>"
     <span class=sf-dump-meta>line</span>: "<span class=sf-dump-str title="%d characters">{$var['line']} to {$var['line']}</span>"
   </samp>}
   "<span class=sf-dump-key>line</span>" => <span class=sf-dump-num>{$var['line']}</span>
@@ -107,36 +107,57 @@ class HtmlDumperTest extends \PHPUnit_Framework_TestCase
 </bar>
 
 EOTXT
-            ,
+			,
+			$out
+		);
+	}
 
-            $out
-        );
-    }
+	public function testCharset()
+	{
+		$var = mb_convert_encoding('Словарь', 'CP1251', 'UTF-8');
 
-    public function testCharset()
-    {
-        $var = mb_convert_encoding('Словарь', 'CP1251', 'UTF-8');
+		$dumper = new HtmlDumper('php://output', 'CP1251');
+		$dumper->setDumpHeader('<foo></foo>');
+		$dumper->setDumpBoundaries('<bar>', '</bar>');
+		$cloner = new VarCloner();
 
-        $dumper = new HtmlDumper('php://output', 'CP1251');
-        $dumper->setDumpHeader('<foo></foo>');
-        $dumper->setDumpBoundaries('<bar>', '</bar>');
-        $cloner = new VarCloner();
+		$data = $cloner->cloneVar($var);
+		$out = $dumper->dump($data, true);
 
-        $data = $cloner->cloneVar($var);
-        $out = fopen('php://memory', 'r+b');
-        $dumper->dump($data, $out);
-        rewind($out);
-        $out = stream_get_contents($out);
-
-        $this->assertStringMatchesFormat(
-            <<<EOTXT
+		$this->assertStringMatchesFormat(
+			<<<'EOTXT'
 <foo></foo><bar>b"<span class=sf-dump-str title="7 binary or non-UTF-8 characters">&#1057;&#1083;&#1086;&#1074;&#1072;&#1088;&#1100;</span>"
 </bar>
 
 EOTXT
-            ,
+			,
+			$out
+		);
+	}
 
-            $out
-        );
-    }
+	public function testAppend()
+	{
+		$out = fopen('php://memory', 'r+b');
+
+		$dumper = new HtmlDumper();
+		$dumper->setDumpHeader('<foo></foo>');
+		$dumper->setDumpBoundaries('<bar>', '</bar>');
+		$cloner = new VarCloner();
+
+		$dumper->dump($cloner->cloneVar(123), $out);
+		$dumper->dump($cloner->cloneVar(456), $out);
+
+		$out = stream_get_contents($out, -1, 0);
+
+		$this->assertSame(<<<'EOTXT'
+<foo></foo><bar><span class=sf-dump-num>123</span>
+</bar>
+<bar><span class=sf-dump-num>456</span>
+</bar>
+
+EOTXT
+			,
+			$out
+		);
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php b/htdocs/includes/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php
index 3295797179c..c76f6be4144 100644
--- a/htdocs/includes/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php
+++ b/htdocs/includes/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php
@@ -11,20 +11,21 @@
 
 namespace Symfony\Component\VarDumper\Tests\Test;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
 
-class VarDumperTestTraitTest extends \PHPUnit_Framework_TestCase
+class VarDumperTestTraitTest extends TestCase
 {
-    use VarDumperTestTrait;
+	use VarDumperTestTrait;
 
-    public function testItComparesLargeData()
-    {
-        $howMany = 700;
-        $data = array_fill_keys(range(0, $howMany), array('a', 'b', 'c', 'd'));
+	public function testItComparesLargeData()
+	{
+		$howMany = 700;
+		$data = array_fill_keys(range(0, $howMany), array('a', 'b', 'c', 'd'));
 
-        $expected = sprintf("array:%d [\n", $howMany + 1);
-        for ($i = 0; $i <= $howMany; ++$i) {
-            $expected .= <<<EODUMP
+		$expected = sprintf("array:%d [\n", $howMany + 1);
+		for ($i = 0; $i <= $howMany; ++$i) {
+			$expected .= <<<EODUMP
   $i => array:4 [
     0 => "a"
     1 => "b"
@@ -32,9 +33,9 @@ class VarDumperTestTraitTest extends \PHPUnit_Framework_TestCase
     3 => "d"
   ]\n
 EODUMP;
-        }
-        $expected .= "]\n";
+		}
+		$expected .= "]\n";
 
-        $this->assertDumpEquals($expected, $data);
-    }
+		$this->assertDumpEquals($expected, $data);
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/Tests/VarClonerTest.php b/htdocs/includes/symfony/var-dumper/Tests/VarClonerTest.php
index 31e3a40ae04..2234ba6902d 100644
--- a/htdocs/includes/symfony/var-dumper/Tests/VarClonerTest.php
+++ b/htdocs/includes/symfony/var-dumper/Tests/VarClonerTest.php
@@ -11,21 +11,22 @@
 
 namespace Symfony\Component\VarDumper\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class VarClonerTest extends \PHPUnit_Framework_TestCase
+class VarClonerTest extends TestCase
 {
-    public function testMaxIntBoundary()
-    {
-        $data = array(PHP_INT_MAX => 123);
+	public function testMaxIntBoundary()
+	{
+		$data = array(PHP_INT_MAX => 123);
 
-        $cloner = new VarCloner();
-        $clone = $cloner->cloneVar($data);
+		$cloner = new VarCloner();
+		$clone = $cloner->cloneVar($data);
 
-        $expected = <<<EOTXT
+		$expected = <<<EOTXT
 Symfony\Component\VarDumper\Cloner\Data Object
 (
     [data:Symfony\Component\VarDumper\Cloner\Data:private] => Array
@@ -41,6 +42,10 @@ Symfony\Component\VarDumper\Cloner\Data Object
                             [handle] => 0
                             [refCount] => 0
                             [position] => 1
+                            [attr] => Array
+                                (
+                                )
+
                         )
 
                 )
@@ -52,23 +57,25 @@ Symfony\Component\VarDumper\Cloner\Data Object
 
         )
 
+    [position:Symfony\Component\VarDumper\Cloner\Data:private] => 0
+    [key:Symfony\Component\VarDumper\Cloner\Data:private] => 0
     [maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
     [maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
     [useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
 )
 
 EOTXT;
-        $this->assertSame(sprintf($expected, PHP_INT_MAX), print_r($clone, true));
-    }
+		$this->assertSame(sprintf($expected, PHP_INT_MAX), print_r($clone, true));
+	}
 
-    public function testClone()
-    {
-        $json = json_decode('{"1":{"var":"val"},"2":{"var":"val"}}');
+	public function testClone()
+	{
+		$json = json_decode('{"1":{"var":"val"},"2":{"var":"val"}}');
 
-        $cloner = new VarCloner();
-        $clone = $cloner->cloneVar($json);
+		$cloner = new VarCloner();
+		$clone = $cloner->cloneVar($json);
 
-        $expected = <<<EOTXT
+		$expected = <<<EOTXT
 Symfony\Component\VarDumper\Cloner\Data Object
 (
     [data:Symfony\Component\VarDumper\Cloner\Data:private] => Array
@@ -84,6 +91,10 @@ Symfony\Component\VarDumper\Cloner\Data Object
                             [handle] => %i
                             [refCount] => 0
                             [position] => 1
+                            [attr] => Array
+                                (
+                                )
+
                         )
 
                 )
@@ -99,6 +110,10 @@ Symfony\Component\VarDumper\Cloner\Data Object
                             [handle] => %i
                             [refCount] => 0
                             [position] => 2
+                            [attr] => Array
+                                (
+                                )
+
                         )
 
                     [\000+\0002] => Symfony\Component\VarDumper\Cloner\Stub Object
@@ -110,6 +125,10 @@ Symfony\Component\VarDumper\Cloner\Data Object
                             [handle] => %i
                             [refCount] => 0
                             [position] => 3
+                            [attr] => Array
+                                (
+                                )
+
                         )
 
                 )
@@ -126,30 +145,112 @@ Symfony\Component\VarDumper\Cloner\Data Object
 
         )
 
+    [position:Symfony\Component\VarDumper\Cloner\Data:private] => 0
+    [key:Symfony\Component\VarDumper\Cloner\Data:private] => 0
     [maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
     [maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
     [useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
 )
 
 EOTXT;
-        $this->assertStringMatchesFormat($expected, print_r($clone, true));
+		$this->assertStringMatchesFormat($expected, print_r($clone, true));
+	}
+
+	public function testJsonCast()
+	{
+		if (ini_get('xdebug.overload_var_dump') == 2) {
+			$this->markTestSkipped('xdebug is active');
+		}
+
+		$data = (array) json_decode('{"1":{}}');
+
+		$cloner = new VarCloner();
+		$clone = $cloner->cloneVar($data);
+
+		$expected = <<<'EOTXT'
+object(Symfony\Component\VarDumper\Cloner\Data)#%i (6) {
+  ["data":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+  array(2) {
+    [0]=>
+    array(1) {
+      [0]=>
+      object(Symfony\Component\VarDumper\Cloner\Stub)#%i (8) {
+        ["type"]=>
+        string(5) "array"
+        ["class"]=>
+        string(5) "assoc"
+        ["value"]=>
+        int(1)
+        ["cut"]=>
+        int(0)
+        ["handle"]=>
+        int(0)
+        ["refCount"]=>
+        int(0)
+        ["position"]=>
+        int(1)
+        ["attr"]=>
+        array(0) {
+        }
+      }
     }
+    [1]=>
+    array(1) {
+      ["1"]=>
+      object(Symfony\Component\VarDumper\Cloner\Stub)#%i (8) {
+        ["type"]=>
+        string(6) "object"
+        ["class"]=>
+        string(8) "stdClass"
+        ["value"]=>
+        NULL
+        ["cut"]=>
+        int(0)
+        ["handle"]=>
+        int(%i)
+        ["refCount"]=>
+        int(0)
+        ["position"]=>
+        int(0)
+        ["attr"]=>
+        array(0) {
+        }
+      }
+    }
+  }
+  ["position":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+  int(0)
+  ["key":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+  int(0)
+  ["maxDepth":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+  int(20)
+  ["maxItemsPerDepth":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+  int(-1)
+  ["useRefHandles":"Symfony\Component\VarDumper\Cloner\Data":private]=>
+  int(-1)
+}
 
-    public function testCaster()
-    {
-        $cloner = new VarCloner(array(
-            '*' => function ($obj, $array) {
-                return array('foo' => 123);
-            },
-            __CLASS__ => function ($obj, $array) {
-                ++$array['foo'];
+EOTXT;
+		ob_start();
+		var_dump($clone);
+		$this->assertStringMatchesFormat(\PHP_VERSION_ID >= 70200 ? str_replace('"1"', '1', $expected) : $expected, ob_get_clean());
+	}
 
-                return $array;
-            },
-        ));
-        $clone = $cloner->cloneVar($this);
+	public function testCaster()
+	{
+		$cloner = new VarCloner(array(
+			'*' => function ($obj, $array) {
+				return array('foo' => 123);
+			},
+			__CLASS__ => function ($obj, $array) {
+				++$array['foo'];
 
-        $expected = <<<EOTXT
+				return $array;
+			},
+		));
+		$clone = $cloner->cloneVar($this);
+
+		$expected = <<<EOTXT
 Symfony\Component\VarDumper\Cloner\Data Object
 (
     [data:Symfony\Component\VarDumper\Cloner\Data:private] => Array
@@ -165,6 +266,10 @@ Symfony\Component\VarDumper\Cloner\Data Object
                             [handle] => %i
                             [refCount] => 0
                             [position] => 1
+                            [attr] => Array
+                                (
+                                )
+
                         )
 
                 )
@@ -176,12 +281,14 @@ Symfony\Component\VarDumper\Cloner\Data Object
 
         )
 
+    [position:Symfony\Component\VarDumper\Cloner\Data:private] => 0
+    [key:Symfony\Component\VarDumper\Cloner\Data:private] => 0
     [maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
     [maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
     [useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
 )
 
 EOTXT;
-        $this->assertStringMatchesFormat($expected, print_r($clone, true));
-    }
+		$this->assertStringMatchesFormat($expected, print_r($clone, true));
+	}
 }
diff --git a/htdocs/includes/symfony/var-dumper/composer.json b/htdocs/includes/symfony/var-dumper/composer.json
index 05955f69430..44dbdebcce2 100644
--- a/htdocs/includes/symfony/var-dumper/composer.json
+++ b/htdocs/includes/symfony/var-dumper/composer.json
@@ -20,9 +20,14 @@
         "symfony/polyfill-mbstring": "~1.0"
     },
     "require-dev": {
-        "twig/twig": "~1.20|~2.0"
+        "ext-iconv": "*",
+        "twig/twig": "~1.34|~2.4"
+    },
+    "conflict": {
+        "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
     },
     "suggest": {
+        "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
         "ext-symfony_debug": ""
     },
     "autoload": {
@@ -35,7 +40,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0-dev"
+            "dev-master": "3.2-dev"
         }
     }
 }
diff --git a/htdocs/includes/symfony/var-dumper/phpunit.xml.dist b/htdocs/includes/symfony/var-dumper/phpunit.xml.dist
index bb16a3a4ec0..4a25f42db82 100644
--- a/htdocs/includes/symfony/var-dumper/phpunit.xml.dist
+++ b/htdocs/includes/symfony/var-dumper/phpunit.xml.dist
@@ -5,9 +5,13 @@
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
+        <env name="DUMP_LIGHT_ARRAY" value="" />
+        <env name="DUMP_STRING_LENGTH" value="" />
     </php>
 
     <testsuites>
diff --git a/htdocs/includes/tcpdi/tcpdi.php b/htdocs/includes/tcpdi/tcpdi.php
index f4c0bd00391..aaa1d70c095 100644
--- a/htdocs/includes/tcpdi/tcpdi.php
+++ b/htdocs/includes/tcpdi/tcpdi.php
@@ -483,7 +483,7 @@ class TCPDI extends FPDF_TPL {
 
                 reset ($value[1]);
 
-                while (list($k, $v) = each($value[1])) {
+                foreach ($value[1] as $k => $v) {
                     $this->_straightOut($k . ' ');
                     $this->pdf_write_value($v);
                 }
diff --git a/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php
index f7540e107fd..d66ec482549 100644
--- a/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php
+++ b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php
@@ -49,7 +49,8 @@
  * @version 1.1.1
  * @author Nicola Asuni - info@tecnick.com
  */
-class TCPDF_STATIC {
+class TCPDF_STATIC
+{
 
 	/**
 	 * Current TCPDF version.
@@ -114,7 +115,8 @@ class TCPDF_STATIC {
 	 * @since 5.9.012 (2010-11-10)
 	 * @public static
 	 */
-	public static function getTCPDFVersion() {
+	public static function getTCPDFVersion()
+	{
 		return self::$tcpdf_version;
 	}
 
@@ -124,7 +126,8 @@ class TCPDF_STATIC {
 	 * @since 6.0.000 (2013-03-16)
 	 * @public static
 	 */
-	public static function getTCPDFProducer() {
+	public static function getTCPDFProducer()
+	{
 		return "\x54\x43\x50\x44\x46\x20".self::getTCPDFVersion()."\x20\x28\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67\x29";
 	}
 
@@ -134,7 +137,8 @@ class TCPDF_STATIC {
 	 * @since 4.6.025 (2009-08-17)
 	 * @public static
 	 */
-	public static function set_mqr($mqr) {
+	public static function set_mqr($mqr)
+	{
 		if (!defined('PHP_VERSION_ID')) {
 			$version = PHP_VERSION;
 			define('PHP_VERSION_ID', (($version[0] * 10000) + ($version[2] * 100) + $version[4]));
@@ -150,7 +154,8 @@ class TCPDF_STATIC {
 	 * @since 4.6.025 (2009-08-17)
 	 * @public static
 	 */
-	public static function get_mqr() {
+	public static function get_mqr()
+	{
 		if (!defined('PHP_VERSION_ID')) {
 			$version = PHP_VERSION;
 			define('PHP_VERSION_ID', (($version[0] * 10000) + ($version[2] * 100) + $version[4]));
@@ -168,9 +173,10 @@ class TCPDF_STATIC {
 	 * @since 5.9.204 (2013-01-28)
 	 * @public static
 	 */
-	public static function isValidURL($url) {
+	public static function isValidURL($url)
+	{
 		$headers = @get_headers($url);
-    	return (strpos($headers[0], '200') !== false);
+		return (strpos($headers[0], '200') !== false);
 	}
 
 	/**
@@ -190,7 +196,8 @@ class TCPDF_STATIC {
 	 * @since (4.5.019) 2009-02-28
 	 * @public static
 	 */
-	public static function removeSHY($txt='', $unicode=true) {
+	public static function removeSHY($txt = '', $unicode = true)
+	{
 		$txt = preg_replace('/([\\xc2]{1}[\\xad]{1})/', '', $txt);
 		if (!$unicode) {
 			$txt = preg_replace('/([\\xad]{1})/', '', $txt);
@@ -208,7 +215,8 @@ class TCPDF_STATIC {
 	 * @since 4.4.002 (2008-12-09)
 	 * @public static
 	 */
-	public static function getBorderMode($brd, $position='start', $opencell=true) {
+	public static function getBorderMode($brd, $position = 'start', $opencell = true)
+	{
 		if ((!$opencell) OR empty($brd)) {
 			return $brd;
 		}
@@ -280,7 +288,8 @@ class TCPDF_STATIC {
 	 * @since 4.5.044 (2009-04-16)
 	 * @public static
 	 */
-	public static function empty_string($str) {
+	public static function empty_string($str)
+	{
 		return (is_null($str) OR (is_string($str) AND (strlen($str) == 0)));
 	}
 
@@ -292,7 +301,8 @@ class TCPDF_STATIC {
 	 * @since 4.5.000 (2008-12-31)
 	 * @public static
 	 */
-	public static function getObjFilename($type='tmp', $file_id='') {
+	public static function getObjFilename($type = 'tmp', $file_id = '')
+	{
 		return tempnam(K_PATH_CACHE, '__tcpdf_'.$file_id.'_'.$type.'_'.md5(TCPDF_STATIC::getRandomSeed()).'_');
 	}
 
@@ -302,7 +312,8 @@ class TCPDF_STATIC {
 	 * @return string escaped string.
 	 * @public static
 	 */
-	public static function _escape($s) {
+	public static function _escape($s)
+	{
 		// the chr(13) substitution fixes the Bugs item #1421290.
 		return strtr($s, array(')' => '\\)', '(' => '\\(', '\\' => '\\\\', chr(13) => '\r'));
 	}
@@ -314,7 +325,8 @@ class TCPDF_STATIC {
 	* @since 5.9.121 (2011-09-28)
 	 * @public static
 	 */
-	public static function _escapeXML($str) {
+	public static function _escapeXML($str)
+	{
 		$replaceTable = array("\0" => '', '&' => '&amp;', '<' => '&lt;', '>' => '&gt;');
 		$str = strtr($str, $replaceTable);
 		return $str;
@@ -327,7 +339,8 @@ class TCPDF_STATIC {
 	 * @since 4.5.029 (2009-03-19)
 	 * @public static
 	 */
-	public static function objclone($object) {
+	public static function objclone($object)
+	{
 		if (($object instanceof Imagick) AND (version_compare(phpversion('imagick'), '3.0.1') !== 1)) {
 			// on the versions after 3.0.1 the clone() method was deprecated in favour of clone keyword
 			return @$object->clone();
@@ -342,7 +355,8 @@ class TCPDF_STATIC {
 	 * @since 5.9.086
 	 * @public static
 	 */
-	public static function sendOutputData($data, $length) {
+	public static function sendOutputData($data, $length)
+	{
 		if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']) OR empty($_SERVER['HTTP_ACCEPT_ENCODING'])) {
 			// the content length may vary if the server is using compression
 			header('Content-Length: '.$length);
@@ -358,7 +372,8 @@ class TCPDF_STATIC {
 	 * @return replaced page content and updated $diff parameter as array.
 	 * @public static
 	 */
-	public static function replacePageNumAliases($page, $replace, $diff=0) {
+	public static function replacePageNumAliases($page, $replace, $diff = 0)
+	{
 		foreach ($replace as $rep) {
 			foreach ($rep[3] as $a) {
 				if (strpos($page, $a) !== false) {
@@ -377,7 +392,8 @@ class TCPDF_STATIC {
 	 * @since 5.9.152 (2012-03-23)
 	 * @public static
 	 */
-	public static function getTimestamp($date) {
+	public static function getTimestamp($date)
+	{
 		if (($date[0] == 'D') AND ($date[1] == ':')) {
 			// remove date prefix if present
 			$date = substr($date, 2);
@@ -392,7 +408,8 @@ class TCPDF_STATIC {
 	 * @since 5.9.152 (2012-03-23)
 	 * @public static
 	 */
-	public static function getFormattedDate($time) {
+	public static function getFormattedDate($time)
+	{
 		return substr_replace(date('YmdHisO', intval($time)), '\'', (0 - 2), 0).'\'';
 	}
 
@@ -404,7 +421,8 @@ class TCPDF_STATIC {
 	 * @since 5.9.006 (2010-10-19)
 	 * @public static
 	 */
-	public static function getRandomSeed($seed='') {
+	public static function getRandomSeed($seed = '')
+	{
 		$rnd = uniqid(rand().microtime(true), true);
 		if (function_exists('posix_getpid')) {
 			$rnd .= posix_getpid();
@@ -427,7 +445,8 @@ class TCPDF_STATIC {
 	 * @since 2.0.000 (2008-01-02)
 	 * @public static
 	 */
-	public static function _md5_16($str) {
+	public static function _md5_16($str)
+	{
 		return pack('H*', md5($str));
 	}
 
@@ -441,12 +460,13 @@ class TCPDF_STATIC {
 	 * @since 5.0.005 (2010-05-11)
 	 * @public static
 	 */
-	public static function _AES($key, $text) {
+	public static function _AES($key, $text)
+	{
 		// padding (RFC 2898, PKCS #5: Password-Based Cryptography Specification Version 2.0)
 		$padding = 16 - (strlen($text) % 16);
 		$text .= str_repeat(chr($padding), $padding);
 		if (extension_loaded('openssl')) {
-			$iv = openssl_random_pseudo_bytes (openssl_cipher_iv_length('aes-256-cbc'));
+			$iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length('aes-256-cbc'));
 			$text = openssl_encrypt($text, 'aes-256-cbc', $key, OPENSSL_RAW_DATA, $iv);
 			return $iv.substr($text, 0, -16);
 		}
@@ -466,7 +486,8 @@ class TCPDF_STATIC {
 	 * @since TODO
 	 * @public static
 	 */
-	public static function _AESnopad($key, $text) {
+	public static function _AESnopad($key, $text)
+	{
 		if (extension_loaded('openssl')) {
 			$iv = str_repeat("\x00", openssl_cipher_iv_length('aes-256-cbc'));
 			$text = openssl_encrypt($text, 'aes-256-cbc', $key, OPENSSL_RAW_DATA, $iv);
@@ -489,7 +510,8 @@ class TCPDF_STATIC {
 	 * @author Klemen Vodopivec, Nicola Asuni
 	 * @public static
 	 */
-	public static function _RC4($key, $text, &$last_enc_key, &$last_enc_key_c) {
+	public static function _RC4($key, $text, &$last_enc_key, &$last_enc_key_c)
+	{
 		if (function_exists('mcrypt_encrypt') AND ($out = @mcrypt_encrypt(MCRYPT_ARCFOUR, $key, $text, MCRYPT_MODE_STREAM, ''))) {
 			// try to use mcrypt function if exist
 			return $out;
@@ -533,7 +555,8 @@ class TCPDF_STATIC {
 	 * @author Nicola Asuni
 	 * @public static
 	 */
-	public static function getUserPermissionCode($permissions, $mode=0) {
+	public static function getUserPermissionCode($permissions, $mode = 0)
+	{
 		$options = array(
 			'owner' => 2, // bit 2 -- inverted logic: cleared by default
 			'print' => 4, // bit 3
@@ -570,7 +593,8 @@ class TCPDF_STATIC {
 	 * @author Nicola Asuni
 	 * @public static
 	 */
-	public static function convertHexStringToString($bs) {
+	public static function convertHexStringToString($bs)
+	{
 		$string = ''; // string to be returned
 		$bslength = strlen($bs);
 		if (($bslength % 2) != 0) {
@@ -592,7 +616,8 @@ class TCPDF_STATIC {
 	 * @author Nicola Asuni
 	 * @public static
 	 */
-	public static function convertStringToHexString($s) {
+	public static function convertStringToHexString($s)
+	{
 		$bs = '';
 		$chars = preg_split('//', $s, -1, PREG_SPLIT_NO_EMPTY);
 		foreach ($chars as $c) {
@@ -609,7 +634,8 @@ class TCPDF_STATIC {
 	 * @author Nicola Asuni
 	 * @public static
 	 */
-	public static function getEncPermissionsString($protection) {
+	public static function getEncPermissionsString($protection)
+	{
 		$binprot = sprintf('%032b', $protection);
 		$str = chr(bindec(substr($binprot, 24, 8)));
 		$str .= chr(bindec(substr($binprot, 16, 8)));
@@ -626,7 +652,8 @@ class TCPDF_STATIC {
 	 * @since 5.9.097 (2011-06-23)
 	 * @public static
 	 */
-	public static function encodeNameObject($name) {
+	public static function encodeNameObject($name)
+	{
 		$escname = '';
 		$length = strlen($name);
 		for ($i = 0; $i < $length; ++$i) {
@@ -650,7 +677,8 @@ class TCPDF_STATIC {
 	 * @since 4.8.000 (2009-09-06)
 	 * @public static
 	 */
-	public static function getAnnotOptFromJSProp($prop, &$spot_colors, $rtl=false) {
+	public static function getAnnotOptFromJSProp($prop, &$spot_colors, $rtl = false)
+	{
 		if (isset($prop['aopt']) AND is_array($prop['aopt'])) {
 			// the annotation options area lready defined
 			return $prop['aopt'];
@@ -1016,8 +1044,9 @@ class TCPDF_STATIC {
 	 * @since 4.2.005 (2008-11-06)
 	 * @public static
 	 */
-	public static function formatPageNumber($num) {
-		return number_format((float)$num, 0, '', '.');
+	public static function formatPageNumber($num)
+	{
+		return number_format((float) $num, 0, '', '.');
 	}
 
 	/**
@@ -1028,8 +1057,9 @@ class TCPDF_STATIC {
 	 * @see addTOC(), addHTMLTOC()
 	 * @public static
 	 */
-	public static function formatTOCPageNumber($num) {
-		return number_format((float)$num, 0, '', '.');
+	public static function formatTOCPageNumber($num)
+	{
+		return number_format((float) $num, 0, '', '.');
 	}
 
 	/**
@@ -1040,7 +1070,8 @@ class TCPDF_STATIC {
 	 * @since 5.1.000 (2010-05-25)
 	 * @public static
 	 */
-	public static function extractCSSproperties($cssdata) {
+	public static function extractCSSproperties($cssdata)
+	{
 		if (empty($cssdata)) {
 			return array();
 		}
@@ -1136,7 +1167,8 @@ class TCPDF_STATIC {
 	 * @see setHtmlVSpace()
 	 * @public static
 	 */
-	public static function fixHTMLCode($html, $default_css='', $tagvs='', $tidy_options='', &$tagvspaces) {
+	public static function fixHTMLCode($html, $default_css = '', $tagvs = '', $tidy_options = '', &$tagvspaces)
+	{
 		// configure parameters for HTML Tidy
 		if ($tidy_options === '') {
 			$tidy_options = array (
@@ -1202,7 +1234,8 @@ class TCPDF_STATIC {
 	 * @since 5.1.000 (2010-05-25)
 	 * @public static
 	 */
-	public static function isValidCSSSelectorForTag($dom, $key, $selector) {
+	public static function isValidCSSSelectorForTag($dom, $key, $selector)
+	{
 		$valid = false; // value to be returned
 		$tag = $dom[$key]['value'];
 		$class = array();
@@ -1362,7 +1395,8 @@ class TCPDF_STATIC {
 	 * @since 5.1.000 (2010-05-25)
 	 * @public static
 	 */
-	public static function getCSSdataArray($dom, $key, $css) {
+	public static function getCSSdataArray($dom, $key, $css)
+	{
 		$cssarray = array(); // style to be returned
 		// get parent CSS selectors
 		$selectors = array();
@@ -1370,7 +1404,7 @@ class TCPDF_STATIC {
 			$selectors = $dom[($dom[$key]['parent'])]['csssel'];
 		}
 		// get all styles that apply
-		foreach($css as $selector => $style) {
+		foreach ($css as $selector => $style) {
 			$pos = strpos($selector, ' ');
 			// get specificity
 			$specificity = substr($selector, 0, $pos);
@@ -1407,7 +1441,8 @@ class TCPDF_STATIC {
 	 * @since 5.9.070 (2011-04-19)
 	 * @public static
 	 */
-	public static function getTagStyleFromCSSarray($css) {
+	public static function getTagStyleFromCSSarray($css)
+	{
 		$tagstyle = ''; // value to be returned
 		foreach ($css as $style) {
 			// split single css commands
@@ -1438,7 +1473,8 @@ class TCPDF_STATIC {
 	 * @since 4.4.004 (2008-12-10)
 	 * @public static
 	 */
-	public static function intToRoman($number) {
+	public static function intToRoman($number)
+	{
 		$roman = '';
 		if ($number >= 4000) {
 			// do not represent numbers above 4000 in Roman numerals
@@ -1508,7 +1544,8 @@ class TCPDF_STATIC {
 	 * @since 4.8.038 (2010-03-13)
 	 * @public static
 	 */
-	public static function revstrpos($haystack, $needle, $offset = 0) {
+	public static function revstrpos($haystack, $needle, $offset = 0)
+	{
 		$length = strlen($haystack);
 		$offset = ($offset > 0)?($length - $offset):abs($offset);
 		$pos = strpos(strrev($haystack), strrev($needle), $offset);
@@ -1523,7 +1560,8 @@ class TCPDF_STATIC {
 	 * @since 4.9.012 (2010-04-12)
 	 * @public static
 	 */
-	public static function getHyphenPatternsFromTEX($file) {
+	public static function getHyphenPatternsFromTEX($file)
+	{
 		// TEX patterns are available at:
 		// http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/
 		$data = file_get_contents($file);
@@ -1537,7 +1575,7 @@ class TCPDF_STATIC {
 		$patterns_array = preg_split('/[\s]+/', $data);
 		// create new language array of patterns
 		$patterns = array();
-		foreach($patterns_array as $val) {
+		foreach ($patterns_array as $val) {
 			if (!TCPDF_STATIC::empty_string($val)) {
 				$val = trim($val);
 				$val = str_replace('\'', '\\\'', $val);
@@ -1551,27 +1589,28 @@ class TCPDF_STATIC {
 	/**
 	 * Get the Path-Painting Operators.
 	 * @param $style (string) Style of rendering. Possible values are:
-	 * <ul>
-	 *   <li>S or D: Stroke the path.</li>
-	 *   <li>s or d: Close and stroke the path.</li>
-	 *   <li>f or F: Fill the path, using the nonzero winding number rule to determine the region to fill.</li>
-	 *   <li>f* or F*: Fill the path, using the even-odd rule to determine the region to fill.</li>
-	 *   <li>B or FD or DF: Fill and then stroke the path, using the nonzero winding number rule to determine the region to fill.</li>
-	 *   <li>B* or F*D or DF*: Fill and then stroke the path, using the even-odd rule to determine the region to fill.</li>
-	 *   <li>b or fd or df: Close, fill, and then stroke the path, using the nonzero winding number rule to determine the region to fill.</li>
-	 *   <li>b or f*d or df*: Close, fill, and then stroke the path, using the even-odd rule to determine the region to 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>
-	 *   <li>n: End the path object without filling or stroking it.</li>
-	 * </ul>
+	 *               <ul>
+	 *               <li>S or D: Stroke the path.</li>
+	 *               <li>s or d: Close and stroke the path.</li>
+	 *               <li>f or F: Fill the path, using the nonzero winding number rule to determine the region to fill.</li>
+	 *               <li>f* or F*: Fill the path, using the even-odd rule to determine the region to fill.</li>
+	 *               <li>B or FD or DF: Fill and then stroke the path, using the nonzero winding number rule to determine the region to fill.</li>
+	 *               <li>B* or F*D or DF*: Fill and then stroke the path, using the even-odd rule to determine the region to fill.</li>
+	 *               <li>b or fd or df: Close, fill, and then stroke the path, using the nonzero winding number rule to determine the region to fill.</li>
+	 *               <li>b or f*d or df*: Close, fill, and then stroke the path, using the even-odd rule to determine the region to 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>
+	 *               <li>n: End the path object without filling or stroking it.</li>
+	 *               </ul>
 	 * @param $default (string) default style
 	 * @author Nicola Asuni
 	 * @since 5.0.000 (2010-04-30)
 	 * @public static
 	 */
-	public static function getPathPaintOperator($style, $default='S') {
+	public static function getPathPaintOperator($style, $default = 'S')
+	{
 		$op = '';
-		switch($style) {
+		switch ($style) {
 			case 'S':
 			case 'D': {
 				$op = 'S';
@@ -1648,7 +1687,8 @@ class TCPDF_STATIC {
 	 * @since 5.0.000 (2010-05-02)
 	 * @public static
 	 */
-	public static function getTransformationMatrixProduct($ta, $tb) {
+	public static function getTransformationMatrixProduct($ta, $tb)
+	{
 		$tm = array();
 		$tm[0] = ($ta[0] * $tb[0]) + ($ta[2] * $tb[1]);
 		$tm[1] = ($ta[1] * $tb[0]) + ($ta[3] * $tb[1]);
@@ -1667,7 +1707,8 @@ class TCPDF_STATIC {
 	 * @since 5.0.000 (2010-05-02)
 	 * @public static
 	 */
-	public static function getSVGTransformMatrix($attribute) {
+	public static function getSVGTransformMatrix($attribute)
+	{
 		// identity matrix
 		$tm = array(1, 0, 0, 1, 0, 0);
 		$transform = array();
@@ -1764,7 +1805,8 @@ class TCPDF_STATIC {
 	 * @since 5.0.000 (2010-05-04)
 	 * @public static
 	 */
-	public static function getVectorsAngle($x1, $y1, $x2, $y2) {
+	public static function getVectorsAngle($x1, $y1, $x2, $y2)
+	{
 		$dprod = ($x1 * $x2) + ($y1 * $y2);
 		$dist1 = sqrt(($x1 * $x1) + ($y1 * $y1));
 		$dist2 = sqrt(($x2 * $x2) + ($y2 * $y2));
@@ -1791,14 +1833,15 @@ class TCPDF_STATIC {
 	 * @since 6.0.023
 	 * @public static
 	 */
-	public static function pregSplit($pattern, $modifiers, $subject, $limit=NULL, $flags=NULL) {
+	public static function pregSplit($pattern, $modifiers, $subject, $limit = null, $flags = null)
+	{
 		// the bug only happens on PHP 5.2 when using the u modifier
-		if ((strpos($modifiers, 'u') === FALSE) OR (count(preg_split('//u', "\n\t", -1, PREG_SPLIT_NO_EMPTY)) == 2)) {
+		if ((strpos($modifiers, 'u') === false) OR (count(preg_split('//u', "\n\t", -1, PREG_SPLIT_NO_EMPTY)) == 2)) {
 			return preg_split($pattern.$modifiers, $subject, $limit, $flags);
 		}
 		// preg_split is bugged - try alternative solution
 		$ret = array();
-		while (($nl = strpos($subject, "\n")) !== FALSE) {
+		while (($nl = strpos($subject, "\n")) !== false) {
 			$ret = array_merge($ret, preg_split($pattern.$modifiers, substr($subject, 0, $nl), $limit, $flags));
 			$ret[] = "\n";
 			$subject = substr($subject, ($nl + 1));
@@ -1809,28 +1852,28 @@ class TCPDF_STATIC {
 		return $ret;
 	}
 
-    /**
-     * Wrapper to use fopen only with local files
-     * @param  string $filename The full path to the file to open
-     * @param  string $mode     Acceses type for the file ('r', 'r+', 'w', 'w+', 'a', 'a+', 'x', 'x+', 'c', 'c+' or 'e')
-     * @return resource         Returns a file pointer resource on success, or FALSE on error.
-     * @public static
-     */
-    public static function fopenLocal($filename, $mode)
-    {
-        if (strpos($filename, '//') === 0) {
-            // Share folder on a (windows) server
-            // e.g.: "//[MyServerName]/[MySharedFolder]/"
-            //
-            // nothing to change
-        } elseif (strpos($filename, '://') === false) {
-            $filename = 'file://'.$filename;
-        } elseif (stream_is_local($filename) !== true) {
-            return false;
-        }
+	/**
+	 * Wrapper to use fopen only with local files
+	 * @param  string $filename The full path to the file to open
+	 * @param  string $mode     Acceses type for the file ('r', 'r+', 'w', 'w+', 'a', 'a+', 'x', 'x+', 'c', 'c+' or 'e')
+	 * @return resource         Returns a file pointer resource on success, or FALSE on error.
+	 * @public static
+	 */
+	public static function fopenLocal($filename, $mode)
+	{
+		if (strpos($filename, '//') === 0) {
+			// Share folder on a (windows) server
+			// e.g.: "//[MyServerName]/[MySharedFolder]/"
+			//
+			// nothing to change
+		} elseif (strpos($filename, '://') === false) {
+			$filename = 'file://'.$filename;
+		} elseif (stream_is_local($filename) !== true) {
+			return false;
+		}
 
-        return fopen($filename, $mode);
-    }
+		return fopen($filename, $mode);
+	}
 
 	/**
 	 * Check if the URL exist.
@@ -1838,7 +1881,8 @@ class TCPDF_STATIC {
 	 * @return Returns TRUE if the URL exists; FALSE otherwise.
 	 * @public static
 	 */
-	public static function url_exists($url) {
+	public static function url_exists($url)
+	{
 		$crs = curl_init();
 		curl_setopt($crs, CURLOPT_URL, $url);
 		curl_setopt($crs, CURLOPT_NOBODY, true);
@@ -1865,7 +1909,8 @@ class TCPDF_STATIC {
 	 * @return Returns TRUE if the file or directory specified by filename exists; FALSE otherwise.
 	 * @public static
 	 */
-	public static function file_exists($filename) {
+	public static function file_exists($filename)
+	{
 		if (preg_match('|^https?://|', $filename) == 1) {
 			return self::url_exists($filename);
 		}
@@ -1884,24 +1929,25 @@ class TCPDF_STATIC {
 	 * @since 6.0.025
 	 * @public static
 	 */
-	public static function fileGetContents($file) {
+	public static function fileGetContents($file)
+	{
 		$alt = array($file);
 		//
 		if ((strlen($file) > 1)
-		    && ($file[0] === '/')
-		    && ($file[1] !== '/')
-		    && !empty($_SERVER['DOCUMENT_ROOT'])
-		    && ($_SERVER['DOCUMENT_ROOT'] !== '/')
+			&& ($file[0] === '/')
+			&& ($file[1] !== '/')
+			&& !empty($_SERVER['DOCUMENT_ROOT'])
+			&& ($_SERVER['DOCUMENT_ROOT'] !== '/')
 		) {
-		    $findroot = strpos($file, $_SERVER['DOCUMENT_ROOT']);
-		    if (($findroot === false) || ($findroot > 1)) {
-			$alt[] = htmlspecialchars_decode(urldecode($_SERVER['DOCUMENT_ROOT'].$file));
-		    }
+			$findroot = strpos($file, $_SERVER['DOCUMENT_ROOT']);
+			if (($findroot === false) || ($findroot > 1)) {
+				$alt[] = htmlspecialchars_decode(urldecode($_SERVER['DOCUMENT_ROOT'].$file));
+			}
 		}
 		//
 		$protocol = 'http';
 		if (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS']) != 'off')) {
-		    $protocol .= 's';
+			$protocol .= 's';
 		}
 		//
 		$url = $file;
@@ -1912,26 +1958,26 @@ class TCPDF_STATIC {
 		$alt[] = $url;
 		//
 		if (preg_match('%^(https?)://%', $url)
-		    && empty($_SERVER['HTTP_HOST'])
-		    && empty($_SERVER['DOCUMENT_ROOT'])
+			&& empty($_SERVER['HTTP_HOST'])
+			&& empty($_SERVER['DOCUMENT_ROOT'])
 		) {
 			$urldata = parse_url($url);
 			if (empty($urldata['query'])) {
 				$host = $protocol.'://'.$_SERVER['HTTP_HOST'];
 				if (strpos($url, $host) === 0) {
-				    // convert URL to full server path
-				    $tmp = str_replace($host, $_SERVER['DOCUMENT_ROOT'], $url);
-				    $alt[] = htmlspecialchars_decode(urldecode($tmp));
+					// convert URL to full server path
+					$tmp = str_replace($host, $_SERVER['DOCUMENT_ROOT'], $url);
+					$alt[] = htmlspecialchars_decode(urldecode($tmp));
 				}
 			}
 		}
 		//
 		if (isset($_SERVER['SCRIPT_URI'])
-		    && !preg_match('%^(https?|ftp)://%', $file)
-		    && !preg_match('%^//%', $file)
+			&& !preg_match('%^(https?|ftp)://%', $file)
+			&& !preg_match('%^//%', $file)
 		) {
-		    $urldata = @parse_url($_SERVER['SCRIPT_URI']);
-		    $alt[] = $urldata['scheme'].'://'.$urldata['host'].(($file[0] == '/') ? '' : '/').$file;
+			$urldata = @parse_url($_SERVER['SCRIPT_URI']);
+			$alt[] = $urldata['scheme'].'://'.$urldata['host'].(($file[0] == '/') ? '' : '/').$file;
 		}
 		//
 		$alt = array_unique($alt);
@@ -1941,7 +1987,7 @@ class TCPDF_STATIC {
 			}
 			$ret = @file_get_contents($path);
 			if ( $ret != false ) {
-			    return $ret;
+				return $ret;
 			}
 			// try to use CURL for URLs
 			if (!ini_get('allow_url_fopen')
@@ -1955,7 +2001,7 @@ class TCPDF_STATIC {
 				curl_setopt($crs, CURLOPT_FAILONERROR, true);
 				curl_setopt($crs, CURLOPT_RETURNTRANSFER, true);
 				if ((ini_get('open_basedir') == '') && (!ini_get('safe_mode'))) {
-				    curl_setopt($crs, CURLOPT_FOLLOWLOCATION, true);
+					curl_setopt($crs, CURLOPT_FOLLOWLOCATION, true);
 				}
 				curl_setopt($crs, CURLOPT_CONNECTTIMEOUT, 5);
 				curl_setopt($crs, CURLOPT_TIMEOUT, 30);
@@ -1981,7 +2027,8 @@ class TCPDF_STATIC {
 	 * @since 5.2.000 (2010-06-02)
 	 * @public static
 	 */
-	public static function _getULONG($str, $offset) {
+	public static function _getULONG($str, $offset)
+	{
 		$v = unpack('Ni', substr($str, $offset, 4));
 		return $v['i'];
 	}
@@ -1995,7 +2042,8 @@ class TCPDF_STATIC {
 	 * @since 5.2.000 (2010-06-02)
 	 * @public static
 	 */
-	public static function _getUSHORT($str, $offset) {
+	public static function _getUSHORT($str, $offset)
+	{
 		$v = unpack('ni', substr($str, $offset, 2));
 		return $v['i'];
 	}
@@ -2009,7 +2057,8 @@ class TCPDF_STATIC {
 	 * @since 5.2.000 (2010-06-02)
 	 * @public static
 	 */
-	public static function _getSHORT($str, $offset) {
+	public static function _getSHORT($str, $offset)
+	{
 		$v = unpack('si', substr($str, $offset, 2));
 		return $v['i'];
 	}
@@ -2023,7 +2072,8 @@ class TCPDF_STATIC {
 	 * @since 5.9.123 (2011-09-30)
 	 * @public static
 	 */
-	public static function _getFWORD($str, $offset) {
+	public static function _getFWORD($str, $offset)
+	{
 		$v = self::_getUSHORT($str, $offset);
 		if ($v > 0x7fff) {
 			$v -= 0x10000;
@@ -2040,7 +2090,8 @@ class TCPDF_STATIC {
 	 * @since 5.9.123 (2011-09-30)
 	 * @public static
 	 */
-	public static function _getUFWORD($str, $offset) {
+	public static function _getUFWORD($str, $offset)
+	{
 		$v = self::_getUSHORT($str, $offset);
 		return $v;
 	}
@@ -2054,7 +2105,8 @@ class TCPDF_STATIC {
 	 * @since 5.9.123 (2011-09-30)
 	 * @public static
 	 */
-	public static function _getFIXED($str, $offset) {
+	public static function _getFIXED($str, $offset)
+	{
 		// mantissa
 		$m = self::_getFWORD($str, $offset);
 		// fraction
@@ -2072,7 +2124,8 @@ class TCPDF_STATIC {
 	 * @since 5.2.000 (2010-06-02)
 	 * @public static
 	 */
-	public static function _getBYTE($str, $offset) {
+	public static function _getBYTE($str, $offset)
+	{
 		$v = unpack('Ci', substr($str, $offset, 1));
 		return $v['i'];
 	}
@@ -2086,7 +2139,8 @@ class TCPDF_STATIC {
 	 * @since 4.5.027 (2009-03-16)
 	 * @public static
 	 */
-	public static function rfread($handle, $length) {
+	public static function rfread($handle, $length)
+	{
 		$data = fread($handle, $length);
 		if ($data === false) {
 			return false;
@@ -2104,7 +2158,8 @@ class TCPDF_STATIC {
 	 * @return 4-byte integer
 	 * @public static
 	 */
-	public static function _freadint($f) {
+	public static function _freadint($f)
+	{
 		$a = unpack('Ni', fread($f, 4));
 		return $a['i'];
 	}
@@ -2474,7 +2529,8 @@ class TCPDF_STATIC {
 	 * @since 5.0.010 (2010-05-17)
 	 * @public static
 	 */
-	public static function getPageSizeFromFormat($format) {
+	public static function getPageSizeFromFormat($format)
+	{
 		if (isset(self::$page_formats[$format])) {
 			return self::$page_formats[$format];
 		}
@@ -2496,7 +2552,8 @@ class TCPDF_STATIC {
 	 * @since 5.0.010 (2010-05-17)
 	 * @public static
 	 */
-	public static function setPageBoxes($page, $type, $llx, $lly, $urx, $ury, $points=false, $k, $pagedim=array()) {
+	public static function setPageBoxes($page, $type, $llx, $lly, $urx, $ury, $points = false, $k, $pagedim = array())
+	{
 		if (!isset($pagedim[$page])) {
 			// initialize array
 			$pagedim[$page] = array();
@@ -2522,7 +2579,8 @@ class TCPDF_STATIC {
 	 * @since 5.0.010 (2010-05-17)
 	 * @public static
 	 */
-	public static function swapPageBoxCoordinates($page, $pagedim) {
+	public static function swapPageBoxCoordinates($page, $pagedim)
+	{
 		foreach (self::$pageboxes as $type) {
 			// swap X and Y coordinates
 			if (isset($pagedim[$page][$type])) {
@@ -2543,7 +2601,8 @@ class TCPDF_STATIC {
 	 * @return (string) Canonical page layout name.
 	 * @public static
 	 */
-	public static function getPageLayoutMode($layout='SinglePage') {
+	public static function getPageLayoutMode($layout = 'SinglePage')
+	{
 		switch ($layout) {
 			case 'default':
 			case 'single':
@@ -2586,7 +2645,8 @@ class TCPDF_STATIC {
 	 * @return (string) Canonical page mode name.
 	 * @public static
 	 */
-	public static function getPageMode($mode='UseNone') {
+	public static function getPageMode($mode = 'UseNone')
+	{
 		switch ($mode) {
 			case 'UseNone': {
 				$page_mode = 'UseNone';
@@ -2618,8 +2678,6 @@ class TCPDF_STATIC {
 		}
 		return $page_mode;
 	}
-
-
 } // END OF TCPDF_STATIC CLASS
 
 //============================================================+
diff --git a/htdocs/index.php b/htdocs/index.php
index c4d3e5e4d78..5593eaffacf 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -26,7 +26,7 @@
  */
 
 
-define('CSRFCHECK_WITH_TOKEN', 1);	// We force need to use a token to login when making a POST
+define('CSRFCHECK_WITH_TOKEN', 1); // We force need to use a token to login when making a POST
 
 require 'main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -156,28 +156,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) && $user->rights->agenda->myactions->read) {
+	if (!empty($conf->agenda->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_AGENDA) && $user->rights->agenda->myactions->read) {
 		include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 		$board = new ActionComm($db);
 		$dashboardlines[$board->element] = $board->load_board($user);
 	}
 
 	// Number of project opened
-	if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
+	if (!empty($conf->projet->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_PROJECT) && $user->rights->projet->lire) {
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 		$board = new Project($db);
 		$dashboardlines[$board->element] = $board->load_board($user);
 	}
 
 	// Number of tasks to do (late)
-	if (!empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire) {
+	if (!empty($conf->projet->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_PROJECT) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire) {
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 		$board = new Task($db);
 		$dashboardlines[$board->element] = $board->load_board($user);
 	}
 
-	// Number of commercial proposals open (expired)
-	if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
+	// Number of commercial customer proposals open (expired)
+	if (!empty($conf->propal->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->rights->propale->lire) {
 		include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 		$board = new Propal($db);
 		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
@@ -185,8 +185,9 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 		$dashboardlines[$board->element.'_signed'] = $board->load_board($user, "signed");
 	}
 
-	// Number of commercial proposals open (expired)
-	if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
+	// Number of supplier proposals open (expired)
+	if (!empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && $user->rights->supplier_proposal->lire) {
+		$langs->load("supplier_proposal");
 		include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 		$board = new SupplierProposal($db);
 		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
@@ -195,14 +196,14 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of customer orders a deal
-	if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+	if (!empty($conf->commande->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->rights->commande->lire) {
 		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 		$board = new Commande($db);
 		$dashboardlines[$board->element] = $board->load_board($user);
 	}
 
 	// Number of suppliers orders a deal
-	if (!empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire) {
+	if (!empty($conf->supplier_order->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && $user->rights->fournisseur->commande->lire) {
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 		$board = new CommandeFournisseur($db);
 		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
@@ -210,7 +211,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of contract / services enabled (delayed)
-	if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
+	if (!empty($conf->contrat->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_CONTRACT) && $user->rights->contrat->lire) {
 		include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 		$board = new Contrat($db);
 		$dashboardlines[$board->element.'_inactive'] = $board->load_board($user, "inactive");
@@ -219,7 +220,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of tickets open
-	if (!empty($conf->ticket->enabled) && $user->rights->ticket->read) {
+	if (!empty($conf->ticket->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_TICKET) && $user->rights->ticket->read) {
 		include_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 		$board = new Ticket($db);
 		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
@@ -228,21 +229,21 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of invoices customers (paid)
-	if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
+	if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->rights->facture->lire) {
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$board = new Facture($db);
 		$dashboardlines[$board->element] = $board->load_board($user);
 	}
 
 	// Number of supplier invoices (paid)
-	if (!empty($conf->supplier_invoice->enabled) && !empty($user->rights->fournisseur->facture->lire)) {
+	if (!empty($conf->supplier_invoice->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && !empty($user->rights->fournisseur->facture->lire)) {
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 		$board = new FactureFournisseur($db);
 		$dashboardlines[$board->element] = $board->load_board($user);
 	}
 
 	// Number of transactions to conciliate
-	if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->socid) {
+	if (!empty($conf->banque->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_BANK) && $user->rights->banque->lire && !$user->socid) {
 		include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 		$board = new Account($db);
 		$nb = $board->countAccountToReconcile(); // Get nb of account to reconciliate
@@ -251,15 +252,28 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 		}
 	}
 
+
 	// Number of cheque to send
-	if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->socid && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) {
-		include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
-		$board = new RemiseCheque($db);
-		$dashboardlines[$board->element] = $board->load_board($user);
+	if (!empty($conf->banque->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_BANK) && $user->rights->banque->lire && !$user->socid) {
+		if (empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) {
+			include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
+			$board = new RemiseCheque($db);
+			$dashboardlines[$board->element] = $board->load_board($user);
+		}
+		if (!empty($conf->prelevement->enabled)) {
+			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');
+		}
+		if (!empty($conf->paymentbybanktransfer->enabled)) {
+			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');
+		}
 	}
 
 	// Number of foundation members
-	if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire && !$user->socid) {
+	if (!empty($conf->adherent->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_ADHERENT) && $user->rights->adherent->lire && !$user->socid) {
 		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 		$board = new Adherent($db);
 		$dashboardlines[$board->element.'_shift'] = $board->load_board($user, 'shift');
@@ -267,21 +281,21 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of expense reports to approve
-	if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->approve) {
+	if (!empty($conf->expensereport->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_EXPENSEREPORT) && $user->rights->expensereport->approve) {
 		include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 		$board = new ExpenseReport($db);
 		$dashboardlines[$board->element.'_toapprove'] = $board->load_board($user, 'toapprove');
 	}
 
 	// Number of expense reports to pay
-	if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid) {
+	if (!empty($conf->expensereport->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_EXPENSEREPORT) && $user->rights->expensereport->to_paid) {
 		include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 		$board = new ExpenseReport($db);
 		$dashboardlines[$board->element.'_topay'] = $board->load_board($user, 'topay');
 	}
 
 	// Number of holidays to approve
-	if (!empty($conf->holiday->enabled) && $user->rights->holiday->approve) {
+	if (!empty($conf->holiday->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_HOLIDAY) && $user->rights->holiday->approve) {
 		include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 		$board = new Holiday($db);
 		$dashboardlines[$board->element] = $board->load_board($user);
@@ -374,7 +388,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 			array(
 				'groupName' => 'BankAccount',
 				'stats' =>
-					array('bank_account', 'chequereceipt'),
+					array('bank_account', 'chequereceipt', 'widthdraw_direct_debit', 'widthdraw_credit_transfer'),
 			),
 		'member' =>
 			array(
@@ -413,7 +427,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	$totallate = $totaltodo = 0;
 
 	//Remove any invalid response
-	//load_board can return an integer if failed or WorkboardResponse if OK
+	//load_board can return an integer if failed, or WorkboardResponse if OK
 	$valid_dashboardlines = array();
 	foreach ($dashboardlines as $workboardid => $tmp) {
 		if ($tmp instanceof WorkboardResponse) {
@@ -476,6 +490,8 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 
 		foreach ($dashboardgroup as $groupKey => $groupElement) {
 			$boards = array();
+
+			// Scan $groupElement and save the one with 'stats' that lust be used for Open object dashboard
 			if (empty($conf->global->MAIN_DISABLE_NEW_OPENED_DASH_BOARD)) {
 				foreach ($groupElement['stats'] as $infoKey) {
 					if (!empty($valid_dashboardlines[$infoKey])) {
@@ -491,7 +507,6 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 				}
 				$groupName = $langs->trans($groupElement['groupName']);
 				$groupKeyLowerCase = strtolower($groupKey);
-				$nbTotalForGroup = 0;
 
 				// global stats
 				$globalStatsKey = false;
@@ -512,7 +527,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 							}
 							$groupElement['globalStats']['text'] = $langs->trans('Total').' : '.$langs->trans($titres[$keyIndex]).' ('.$groupElement['globalStats']['total'].')';
 							$groupElement['globalStats']['total'] = $nbTotal;
-							$groupElement['globalStats']['link'] = $links[$keyIndex];
+							//$groupElement['globalStats']['link'] = $links[$keyIndex];
 						}
 					}
 				}
@@ -538,9 +553,9 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 					$openedDashBoard .= '<div class="info-box-line">';
 
 					if (!empty($board->labelShort)) {
-						$infoName = '<span title="'.$board->label.'">'.$board->labelShort.'</span>';
+						$infoName = '<span class="marginrightonly" title="'.$board->label.'">'.$board->labelShort.'</span>';
 					} else {
-						$infoName = $board->label;
+						$infoName = '<span class="marginrightonly">'.$board->label.'</span>';
 					}
 
 					$textLateTitle = $langs->trans("NActionsLate", $board->nbtodolate);
@@ -560,9 +575,21 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 					$nbtodClass = '';
 					if ($board->nbtodo > 0) {
 						$nbtodClass = 'badge badge-info';
+					} else {
+						$nbtodClass = 'opacitymedium';
 					}
 
-					$openedDashBoard .= '			<a href="'.$board->url.'" class="info-box-text info-box-text-a">'.$infoName.' : <span class="'.$nbtodClass.' classfortooltip" title="'.$board->label.'" >'.$board->nbtodo.'</span>';
+					// Forge the line to show into the open object box
+					$labeltoshow = $board->label.' ('.$board->nbtodo.')';
+					if ($board->total > 0) {
+						$labeltoshow .= ' - '.price($board->total, 0, $langs, 1, -1, -1, $conf->currency);
+					}
+					$openedDashBoard .= '<a href="'.$board->url.'" class="info-box-text info-box-text-a">'.$infoName.'<span class="classfortooltip'.($nbtodClass ? ' '.$nbtodClass : '').'" title="'.$labeltoshow.'" >';
+					$openedDashBoard .= $board->nbtodo;
+					if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {
+						$openedDashBoard .= ' : '.price($board->total, 0, $langs, 1, -1, -1, $conf->currency);
+					}
+					$openedDashBoard .= '</span>';
 					if ($textLate) {
 						if ($board->url_late) {
 							$openedDashBoard .= '</a>';
@@ -573,10 +600,6 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 						$openedDashBoard .= $textLate;
 					}
 					$openedDashBoard .= '</a>'."\n";
-
-					if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {
-						$openedDashBoard .= '<a href="'.$board->url.'" class="info-box-text">'.$langs->trans('Total').' : '.price($board->total).'</a>';
-					}
 					$openedDashBoard .= '</div>'."\n";
 				}
 
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index cf7a1fd8e98..f260be4f9fb 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -93,7 +93,7 @@ if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0) {        //
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPVersion")." ".versiontostring(versionphparray());
 }
 if (empty($force_install_nophpinfo)) {
-	print ' (<a href="phpinfo.php" target="_blank">'.$langs->trans("MoreInformation").'</a>)';
+	print ' (<a href="phpinfo.php" target="_blank" rel="noopener noreferrer">'.$langs->trans("MoreInformation").'</a>)';
 }
 print "<br>\n";
 
@@ -149,11 +149,19 @@ if (!function_exists("easter_date")) {
 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";
-	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
+	// $checksok = 0; // If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "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') {
@@ -412,27 +420,26 @@ if (!file_exists($conffile)) {
 		if (GETPOST('allowupgrade')) {
 			$allowupgrade = true;
 		}
-		$migrationscript = array(array('from'=>'3.0.0', 'to'=>'3.1.0'),
-								array('from'=>'3.1.0', 'to'=>'3.2.0'),
-								array('from'=>'3.2.0', 'to'=>'3.3.0'),
-								array('from'=>'3.3.0', 'to'=>'3.4.0'),
-								array('from'=>'3.4.0', 'to'=>'3.5.0'),
-								array('from'=>'3.5.0', 'to'=>'3.6.0'),
-								array('from'=>'3.6.0', 'to'=>'3.7.0'),
-								array('from'=>'3.7.0', 'to'=>'3.8.0'),
-								array('from'=>'3.8.0', 'to'=>'3.9.0'),
-								array('from'=>'3.9.0', 'to'=>'4.0.0'),
-								array('from'=>'4.0.0', 'to'=>'5.0.0'),
-								array('from'=>'5.0.0', 'to'=>'6.0.0'),
-								array('from'=>'6.0.0', 'to'=>'7.0.0'),
-								array('from'=>'7.0.0', 'to'=>'8.0.0'),
-								array('from'=>'8.0.0', 'to'=>'9.0.0'),
-								array('from'=>'9.0.0', 'to'=>'10.0.0'),
-								array('from'=>'10.0.0', 'to'=>'11.0.0'),
-								array('from'=>'11.0.0', 'to'=>'12.0.0'),
-								array('from'=>'12.0.0', 'to'=>'13.0.0'),
-								array('from'=>'13.0.0', 'to'=>'14.0.0')
-		);
+
+		$dir = DOL_DOCUMENT_ROOT."/install/mysql/migration/";	// We use mysql migration scripts whatever is database driver
+		dolibarr_install_syslog("Scan sql files for migration files in ".$dir);
+
+		// Get files list of migration file x.y.z-a.b.c.sql into /install/mysql/migration
+		$migrationscript = array();
+		$handle = opendir($dir);
+		if (is_resource($handle)) {
+			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])) {
+						$migrationscript[] = array('from' => $reg[1], 'to' => $reg[2]);
+					}
+				}
+			}
+			$migrationscript = dol_sort_array($migrationscript, 'from', 'asc', 1);
+		} else {
+			print '<div class="error">'.$langs->trans("ErrorCanNotReadDir", $dir).'</div>';
+		}
 
 		$count = 0;
 		foreach ($migrationscript as $migarray) {
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index 96c671d1472..d18e54c0c1c 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -40,6 +40,10 @@
 	display: inline-block;	
 }
 
+.no-bottom {
+	padding-bottom: 0;	
+}
+
 .small {
 	font-size: 0.9em;	
 }
@@ -59,10 +63,12 @@ table.main-inside {
 	margin-top: 10px;
 	color: #000000;
 	border-top: 1px solid #ccc;
-	/* border-bottom: 1px solid #ccc; */
 	line-height: 22px;
 }
-
+table.main-inside-borderbottom {
+	border-bottom: 1px solid #ccc;
+}
+	
 table.main {
 	padding-left: 6px;
 	padding-right: 6px;
diff --git a/htdocs/install/lib/repair.lib.php b/htdocs/install/lib/repair.lib.php
index bd54e55ebde..aea82107d29 100644
--- a/htdocs/install/lib/repair.lib.php
+++ b/htdocs/install/lib/repair.lib.php
@@ -32,8 +32,8 @@ function checkElementExist($id, $table)
 {
 	global $db;
 
-	$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$table;
-	$sql .= ' WHERE rowid = '.((int) $id);
+	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$table;
+	$sql .= " WHERE rowid = ".((int) $id);
 	$resql = $db->query($sql);
 	if ($resql) {
 		$num = $db->num_rows($resql);
@@ -87,8 +87,8 @@ function checkLinkedElements($sourcetype, $targettype)
 
 	$out = $langs->trans('SourceType').': '.$sourcetype.' => '.$langs->trans('TargetType').': '.$targettype.' ';
 
-	$sql = 'SELECT rowid, fk_source, fk_target FROM '.MAIN_DB_PREFIX.'element_element';
-	$sql .= ' WHERE sourcetype="'.$sourcetype.'" AND targettype="'.$targettype.'"';
+	$sql = "SELECT rowid, fk_source, fk_target FROM ".MAIN_DB_PREFIX."element_element";
+	$sql .= " WHERE sourcetype = '".$db->escape($sourcetype)."' AND targettype = '".$db->escape($targettype)."'";
 	$resql = $db->query($sql);
 	if ($resql) {
 		$num = $db->num_rows($resql);
@@ -106,7 +106,7 @@ function checkLinkedElements($sourcetype, $targettype)
 		foreach ($elements as $key => $element) {
 			if (!checkElementExist($element[$sourcetype], $sourcetable) || !checkElementExist($element[$targettype], $targettable)) {
 				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'element_element';
-				$sql .= ' WHERE rowid = '.((int) $key);
+				$sql .= " WHERE rowid = ".((int) $key);
 				$resql = $db->query($sql);
 				$deleted++;
 			}
diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql
index ac8eba73a28..7217fda7d09 100644
--- a/htdocs/install/mysql/data/llx_00_c_country.sql
+++ b/htdocs/install/mysql/data/llx_00_c_country.sql
@@ -57,19 +57,19 @@ INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (25
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (26,'SA','SAU','Saudi Arabia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (27,'MC','MCO','Monaco',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (28,'AU','AUS','Australia',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (29,'SG','SGP','Singapour',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (29,'SG','SGP','Singapore',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (30,'AF','AFG','Afghanistan',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (31,'AX','ALA','Iles Aland',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (31,'AX','ALA','Åland Island',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (32,'AL','ALB','Albania',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (33,'AS','ASM','Samoa américaines',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (33,'AS','ASM','American Samoa',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (34,'AD','AND','Andorra',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (35,'AO','AGO','Angola',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (36,'AI','AIA','Anguilla',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (37,'AQ','ATA','Antarctique',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (38,'AG','ATG','Antigua-et-Barbuda',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (37,'AQ','ATA','Antarctica',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (38,'AG','ATG','Antigua and Barbuda',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (39,'AM','ARM','Armenia',1,0);
 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','Azerbaïdjan',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 (45,'BD','BGD','Bangladesh',1,0);
@@ -279,5 +279,5 @@ INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (24
 
 
 -- Set field eec
-UPDATE llx_c_country SET eec = 1 WHERE code IN ('AT','BE','BG','CY','CZ','DE','DK','EE','ES','FI','FR','GR','HR','NL','HU','IE','IM','IT','LT','LU','LV','MC','MT','PL','PT','RO','SE','SK','SI');
+UPDATE llx_c_country SET eec = 1 WHERE code IN ('AT','BE','BG','CY','CZ','DE','DK','EE','ES','FI','FR','GR','HR','NL','HU','IE','IT','LT','LU','LV','MC','MT','PL','PT','RO','SE','SK','SI');
 
diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 0a87cef039e..4fc9ec26366 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -766,16 +766,16 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 
 
 -- Panama - 10 Provinces (id country=178)
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-1', 17801, '', 0, '', 'Bocas del Toro');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-2', 17801, '', 0, '', 'Coclé');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-3', 17801, '', 0, '', 'Colón');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-4', 17801, '', 0, '', 'Chiriquí');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-5', 17801, '', 0, '', 'Darién');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-6', 17801, '', 0, '', 'Herrera');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-7', 17801, '', 0, '', 'Los Santos');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-8', 17801, '', 0, '', 'Panamá');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-9', 17801, '', 0, '', 'Veraguas');
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('PA-13', 17801, '', 0, '', 'Panamá Oeste');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-1',  '', 0, '', 'Bocas del Toro');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-2',  '', 0, '', 'Coclé');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-3',  '', 0, '', 'Colón');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-4',  '', 0, '', 'Chiriquí');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-5',  '', 0, '', 'Darién');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-6',  '', 0, '', 'Herrera');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-7',  '', 0, '', 'Los Santos');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-8',  '', 0, '', 'Panamá');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-9',  '', 0, '', 'Veraguas');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (17801, 'PA-13', '', 0, '', 'Panamá Oeste');
 
 
 -- Provinces Peru (id country=181)
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 45503449492..d039c285a3e 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -9,6 +9,7 @@
 -- Copyright (C) 2013       Cedric Gross            <c.gross@kreiz-it.fr>
 -- Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
 -- Copyright (C) 2015       Bahfir Abbes            <bafbes@gmail.com>
+-- Copyright (C) 2021-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
@@ -39,6 +40,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2);
+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 ('PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2);
@@ -46,17 +48,20 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_DELETE','Customer proposal deleted','Executed when a customer proposal is deleted','propal',2);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5);
+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 ('ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_DELETE','Customer order deleted','Executed when a customer order is deleted','commande',5);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6);
+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);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',9);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_DELETE','Customer invoice deleted','Executed when a customer invoice is deleted','facture',9);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_MODIFY','Price request modified','Executed when a commercial proposal is modified','proposal_supplier',10);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10);
@@ -64,49 +69,62 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 --insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_CREATE','Supplier order created','Executed when a supplier order is created','order_supplier',11);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',12);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',13);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_MODIFY','Supplier order request modified','Executed when a supplier order is modified','order_supplier',13);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',13);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_RECEIVE','Supplier order request received','Executed when a supplier order is received','order_supplier',13);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_CANCEL','Supplier order request canceled','Executed when a supplier order is canceled','order_supplier',13);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_CLASSIFY_BILLED','Supplier order set billed','Executed when a supplier order is set as billed','order_supplier',14);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_DELETE','Supplier order deleted','Executed when a supplier order is deleted','order_supplier',14);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_MODIFY','Supplier invoice modified','Executed when a supplier invoice is modified','invoice_supplier',15);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_UNVALIDATE','Supplier invoice unvalidated','Executed when a supplier invoice status is set back to draft','invoice_supplier',15);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_DELETE','Supplier invoice deleted','Executed when a supplier invoice is deleted','invoice_supplier',17);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_MODIFY','Contract modified','Executed when a contract is modified','contrat',18);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_DELETE','Contract deleted','Executed when a contract is deleted','contrat',18);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_MODIFY','Shipping modified','Executed when a shipping is modified','shipping',20);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_DELETE','Shipping sent is deleted','Executed when a shipping is deleted','shipping',21);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECEPTION_VALIDATE','Reception validated','Executed when a reception is validated','reception',22);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECEPTION_SENTBYMAIL','Reception sent by mail','Executed when a reception is sent by mail','reception',22);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_MODIFY','Member modified','Executed when a member is modified','member',23);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SUBSCRIPTION_CREATE','Member subscribtion recorded','Executed when a member subscribtion is deleted','member',24);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SUBSCRIPTION_DELETE','Member subscribtion deleted','Executed when a member subscribtion is deleted','member',24);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',25);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',26);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_EXCLUDE','Member excluded','Executed when a member is excluded','member',27);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',30);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modify','Executed when a intervention is modify','ficheinter',30);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',32);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',33);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',34);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',35);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_DELETE','Intervention is deleted','Executed when a intervention is deleted','ficheinter',35);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',40);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',41);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',42);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202);
+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 ('EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_PAID','Expense report billed','Executed when an expense report is set as billed','expensereport',204);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_DELETE','Expense report deleted','Executed when an expense report is deleted','expensereport',205);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',211);
+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);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',212);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CREATE','Project creation','Executed when a project is created','project',140);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_VALIDATE','Project validation','Executed when a project is validated','project',141);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_MODIFY','Project modified','Executed when a project is modified','project',142);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',143);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163);
@@ -115,11 +133,12 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_SENTBYMAIL','Ticket message sent by email','Executed when a message is sent from the ticket record','ticket',166);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',167);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_SENTBYMAIL','Email sent','Executed when an email is sent from user card','user',300);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',41);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_MODIFY','Member modified','Executed when a member is modified','member',23);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_CREATE','User created','Executed when a user is created','user',301);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_MODIFY','User update','Executed when a user is updated','user',302);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_DELETE','User update','Executed when a user is deleted','user',303);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_NEW_PASSWORD','User update','Executed when a user is change password','user',304);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_ENABLEDISABLE','User update','Executed when a user is enable or disable','user',305);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modified','Executed when a intervention is modified','ficheinter',19);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CREATE','Project creation','Executed when a project is created','project',140);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_MODIFY','Project modified','Executed when a project is modified','project',142);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_VALIDATE','BOM validated','Executed when a BOM is validated','bom',650);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_UNVALIDATE','BOM unvalidated','Executed when a BOM is unvalidated','bom',651);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652);
@@ -133,7 +152,6 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_MODIFY','Contact address update','Executed when a contact is updated','contact',51);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact address record','contact',52);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',53);
-
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_SENTBYMAIL','Mails sent from job record','Executed when you send email from job record','recruitment',7504);
@@ -148,3 +166,11 @@ 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_MODIFY','Task modified','Executed when a project task is modified','project',151);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_DELETE','Task deleted','Executed when a project task is deleted','project',152);
 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
+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);
diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql
index 47197af644d..38f09ba23d0 100644
--- a/htdocs/install/mysql/data/llx_c_actioncomm.sql
+++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql
@@ -5,6 +5,8 @@
 -- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
 -- Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@inodbox.com>
 -- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
+-- Copyright (C) 2021 	   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
@@ -21,6 +23,9 @@
 --
 --
 
+--
+-- Do not put a comment at the end of the line, this file is parsed during the
+-- install and all '--' symbols 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.
@@ -31,25 +36,29 @@
 --
 
 delete from llx_c_actioncomm where id in (1,2,3,4,5,6,8,9,10,11,30,31,40,50);
--- Code used from 3.3+ when type of event is used
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 1,'AC_TEL','system','Phone call',NULL, 1, 2);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 2,'AC_FAX','system','Send Fax',NULL, 1, 3);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 4,'AC_EMAIL','system','Send Email',NULL, 1, 4);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 5,'AC_RDV','system','Rendez-vous',NULL, 1, 1);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 6,'AC_EMAIL_IN','system','reception Email',NULL, 1, 4);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values (11,'AC_INT','system','Intervention on site',NULL, 1, 4);
--- Code kept for backward compatibility < 3.3 
---insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 3,'AC_PROP','systemauto', 'Send commercial proposal by email','propal',0,10);
---insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 8,'AC_COM','systemauto','Send customer order by email','order', 0,8);
---insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 9,'AC_FAC','systemauto', 'Send customer invoice by email','invoice',0,6);
---insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 10,'AC_SHIP','systemauto', 'Send shipping by email','shipping',0,11);
---insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 30,'AC_SUP_ORD','systemauto','Send supplier order by email','order_supplier',0,9);
---insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 31,'AC_SUP_INV','systemauto','Send supplier invoice by email','invoice_supplier',0,7);
--- Code used from 3.3+ when type of event is not used
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 40,'AC_OTH_AUTO','systemauto','Other (automatically inserted events)',NULL, 1, 20);
-insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 50,'AC_OTH','system','Other (manually inserted events)',NULL, 1, 5);
 
-INSERT INTO llx_c_actioncomm (id, code, type, libelle, module, active, position) VALUES ( 60,'AC_EO_ONLINECONF','module','Online/Virtual conference','conference@eventorganization', 1, 60);
-INSERT INTO llx_c_actioncomm (id, code, type, libelle, module, active, position) VALUES ( 61,'AC_EO_INDOORCONF','module','Indoor conference','conference@eventorganization', 1, 61);
-INSERT INTO llx_c_actioncomm (id, code, type, libelle, module, active, position) VALUES ( 62,'AC_EO_ONLINEBOOTH','module','Online/Virtual booth','booth@eventorganization', 1, 62);
-INSERT INTO llx_c_actioncomm (id, code, type, libelle, module, active, position) VALUES ( 63,'AC_EO_INDOORBOOTH','module','Indoor booth','booth@eventorganization', 1, 63);
+-- Code used from 3.3+ when type of event is used
+insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values (  1, 'AC_TEL',       'Phone call',       'system', NULL, 1, 2);
+insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values (  2, 'AC_FAX',       'Send Fax',         'system', NULL, 1, 3);
+insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values (  4, 'AC_EMAIL',     'Send Email',       'system', NULL, 1, 4);
+insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values (  5, 'AC_RDV',       'Rendez-vous',      'system', NULL, 1, 1);
+insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values (  6, 'AC_EMAIL_IN',  'reception Email',  'system', NULL, 1, 4);
+insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values ( 11, 'AC_INT',   'Intervention on site', 'system', NULL, 1, 4);
+
+-- Code kept for backward compatibility < 3.3 
+--insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values (  3, 'AC_PROP',    'Send commercial proposal by email', 'systemauto', 'propal', 0, 10);
+--insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values (  8, 'AC_COM',     'Send customer order by email',      'systemauto', 'order', 0, 8);
+--insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values (  9, 'AC_FAC',     'Send customer invoice by email',    'systemauto', 'invoice', 0, 6);
+--insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values ( 10, 'AC_SHIP',    'Send shipping by email',            'systemauto', 'shipping', 0, 11);
+--insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values ( 30, 'AC_SUP_ORD', 'Send supplier order by email',      'systemauto', 'order_supplier', 0, 9);
+--insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values ( 31, 'AC_SUP_INV', 'Send supplier invoice by email',    'systemauto', 'invoice_supplier', 0, 7);
+
+-- Code used from 3.3+ when type of event is not used
+
+insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values ( 40, 'AC_OTH_AUTO', 'Other (automatically inserted events)', 'systemauto', NULL, 1, 20);
+insert into llx_c_actioncomm (id, code, libelle, type, module, active, position) values ( 50, 'AC_OTH',      'Other (manually inserted events)',      'systemauto', NULL, 1, 5);
+
+INSERT INTO llx_c_actioncomm (id, code, libelle, type, module, active, position) VALUES ( 60, 'AC_EO_ONLINECONF',  'Online/Virtual conference', 'module', 'conference@eventorganization', 1, 60);
+INSERT INTO llx_c_actioncomm (id, code, libelle, type, module, active, position) VALUES ( 61, 'AC_EO_INDOORCONF',  'Indoor conference',         'module', 'conference@eventorganization', 1, 61);
+INSERT INTO llx_c_actioncomm (id, code, libelle, type, module, active, position) VALUES ( 62, 'AC_EO_ONLINEBOOTH', 'Online/Virtual booth',      'module', 'booth@eventorganization', 1, 62);
+INSERT INTO llx_c_actioncomm (id, code, libelle, type, module, active, position) VALUES ( 63, 'AC_EO_INDOORBOOTH', 'Indoor booth',              'module', 'booth@eventorganization', 1, 63);
diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql
index 2e06d1de8b3..7291c399da0 100644
--- a/htdocs/install/mysql/data/llx_c_availability.sql
+++ b/htdocs/install/mysql/data/llx_c_availability.sql
@@ -27,6 +27,8 @@
 
 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 (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);
+
diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
index 07a09724ed2..7af5d28df8c 100644
--- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql
+++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
@@ -356,3 +356,16 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (13, '1306','S
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (13, '1307','Société en participation');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (13, '1308','Groupe de sociétés');
 
+-- Sweden (id country=20)
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2001', 'Aktiebolag');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2002', 'Publikt aktiebolag (AB publ)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2003', 'Ekonomisk förening (ek. för.)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2004', 'Bostadsrättsförening (BRF)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2005', 'Hyresrättsförening (HRF)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2006', 'Kooperativ');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2007', 'Enskild firma (EF)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2008', 'Handelsbolag (HB)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2009', 'Kommanditbolag (KB)');
+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');
diff --git a/htdocs/install/mysql/data/llx_c_holiday_type.sql b/htdocs/install/mysql/data/llx_c_holiday_type.sql
index addd7f9942e..65f9a51b037 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, 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);
 
 -- 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, active) values ('LEAVE_PAID',    'Paid vacation', 1, 7, 0,    NULL, 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, 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);
diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql
index ffe129ec501..e29b47639f2 100644
--- a/htdocs/install/mysql/data/llx_c_paiement.sql
+++ b/htdocs/install/mysql/data/llx_c_paiement.sql
@@ -30,13 +30,18 @@
 -- Types paiement
 --
 
-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);
-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);
+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);
+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);
+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);
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 1a14967357f..7a84c622b47 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -330,7 +330,7 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (10
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (105,10,   '15','0','VAT 12% Majoré à 25% (15%)',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (106,10, '22.5','0','VAT 18% Majoré à 25% (22.5%)',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (107,10,    '6','0','VAT 6%', 1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (107,10,'18.18','0','VAT 18%+FODEC', 1, 1, '4', 0, 0);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (108,10,'18.18','0','VAT 18%+FODEC', 1, 1, '4', 0, 0);
 
 -- UKRAINE (id country=226)
 INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2261,226,   '0','0','VAT rate 0',1);
diff --git a/htdocs/install/mysql/data/llx_c_units.sql b/htdocs/install/mysql/data/llx_c_units.sql
index 3a11453c9f8..475020aabaf 100644
--- a/htdocs/install/mysql/data/llx_c_units.sql
+++ b/htdocs/install/mysql/data/llx_c_units.sql
@@ -1,10 +1,12 @@
 -- ========================================================================
--- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
--- Copyright (C) 2019           Florian Henry      <florian.henry@atm-consulitng.fr>
+-- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+-- Copyright (C) 2004           Laurent Destailleur     <eldy@users.sourceforge.net>
+-- Copyright (C) 2019           Florian Henry           <florian.henry@atm-consulitng.fr>
+-- Copyright (C) 2021           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 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
@@ -17,45 +19,45 @@
 --
 -- ========================================================================
 
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('T',  '3','WeightUnitton','T', 'weight', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('KG', '0','WeightUnitkg','kg', 'weight', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('G', '-3','WeightUnitg','g', 'weight', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('MG','-6','WeightUnitmg','mg', 'weight', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('OZ','98','WeightUnitounce','Oz', 'weight', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('LB','99','WeightUnitpound','lb', 'weight', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('T', '100', '3','WeightUnitton','T', 'weight', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('KG','110', '0','WeightUnitkg','kg', 'weight', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('G', '120','-3','WeightUnitg','g', 'weight', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('MG','130','-6','WeightUnitmg','mg', 'weight', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('OZ','140','98','WeightUnitounce','Oz', 'weight', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('LB','150','99','WeightUnitpound','lb', 'weight', 1);
 
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('M',  '0','SizeUnitm','m', 'size', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('DM','-1','SizeUnitdm','dm', 'size', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('CM','-2','SizeUnitcm','cm', 'size', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('MM','-3','SizeUnitmm','mm', 'size', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('FT','98','SizeUnitfoot','ft', 'size', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('IN','99','SizeUnitinch','in', 'size', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('M', '200', '0','SizeUnitm','m', 'size', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('DM','210','-1','SizeUnitdm','dm', 'size', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('CM','220','-2','SizeUnitcm','cm', 'size', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('MM','230','-3','SizeUnitmm','mm', 'size', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('FT','240','98','SizeUnitfoot','ft', 'size', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('IN','250','99','SizeUnitinch','in', 'size', 1);
 
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('M2',  '0','SurfaceUnitm2','m2', 'surface', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('DM2','-2','SurfaceUnitdm2','dm2', 'surface', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('CM2','-4','SurfaceUnitcm2','cm2', 'surface', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('MM2','-6','SurfaceUnitmm2','mm2', 'surface', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('FT2','98','SurfaceUnitfoot2','ft2', 'surface', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('IN2','99','SurfaceUnitinch2','in2', 'surface', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('M2', '300', '0','SurfaceUnitm2','m2', 'surface', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('DM2','310','-2','SurfaceUnitdm2','dm2', 'surface', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('CM2','320','-4','SurfaceUnitcm2','cm2', 'surface', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('MM2','330','-6','SurfaceUnitmm2','mm2', 'surface', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('FT2','340','98','SurfaceUnitfoot2','ft2', 'surface', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('IN2','350','99','SurfaceUnitinch2','in2', 'surface', 1);
 
 
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('M3',  '0','VolumeUnitm3','m3', 'volume', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('DM3','-3','VolumeUnitdm3','dm3', 'volume', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('CM3','-6','VolumeUnitcm3','cm3', 'volume', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('MM3','-9','VolumeUnitmm3','mm3', 'volume', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('FT3','88','VolumeUnitfoot3','ft3', 'volume', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('IN3','89','VolumeUnitinch3','in3', 'volume', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('OZ3','97','VolumeUnitounce','Oz', 'volume', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('L',  '98','VolumeUnitlitre','L', 'volume', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('GAL','99','VolumeUnitgallon','gal', 'volume', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('M3', '400', '0','VolumeUnitm3','m3', 'volume', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('DM3','410','-3','VolumeUnitdm3','dm3', 'volume', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('CM3','420','-6','VolumeUnitcm3','cm3', 'volume', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('MM3','430','-9','VolumeUnitmm3','mm3', 'volume', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('FT3','440','88','VolumeUnitfoot3','ft3', 'volume', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('IN3','450','89','VolumeUnitinch3','in3', 'volume', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('OZ3','460','97','VolumeUnitounce','Oz', 'volume', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('L',  '470','98','VolumeUnitlitre','L', 'volume', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('GAL','480','99','VolumeUnitgallon','gal', 'volume', 1);
 
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('P',   '0','Piece','p', 'qty', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('SET', '0','Set','set', 'qty', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('P',  '500', '0','Piece','p', 'qty', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('SET','510', '0','Set','set', 'qty', 1);
 
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('S',       '0','second','s', 'time', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('MI',     '60','minute','i', 'time', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('H',    '3600','hour','h', 'time', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('D',   '86400','day','d', 'time', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('W',  '604800','week','w', 'time', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('MO','2629800','month','m', 'time', 1);
-INSERT INTO llx_c_units (code, scale, label, short_label, unit_type, active) VALUES ('Y','31557600','year','y', 'time', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('S', '600',       '0','second','s', 'time', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('MI','610',      '60','minute','i', 'time', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('H', '620',    '3600','hour','h', 'time', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('D', '630',   '86400','day','d', 'time', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('W', '640',  '604800','week','w', 'time', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('MO','650', '2629800','month','m', 'time', 1);
+INSERT INTO llx_c_units (code, sortorder, scale, label, short_label, unit_type, active) VALUES ('Y', '660','31557600','year','y', 'time', 1);
diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index 2f2975a158c..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);
@@ -85,7 +84,7 @@ insert into llx_const (name, value, type, note, visible) values ('MAIN_DELAY_EXP
 --
 -- Mail Mailing
 --
-insert into llx_const (name, value, type, note, visible) values ('MAIN_FIX_FOR_BUGGED_MTA','1','chaine','Set constant to fix email ending from PHP with some linux ike system',1);
+--insert into llx_const (name, value, type, note, visible) values ('MAIN_FIX_FOR_BUGGED_MTA','1','chaine','Set constant to fix email ending from PHP with some linux like system',1);
 insert into llx_const (name, value, type, note, visible) values ('MAILING_EMAIL_FROM','no-reply@mydomain.com','chaine','EMail emmetteur pour les envois d emailings',0);
 
 
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 a9f1a669e52..517771ced4e 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
@@ -484,9 +484,9 @@ ALTER TABLE llx_delivery DROP FOREIGN KEY  fk_livraison_fk_user_author;
 ALTER TABLE llx_delivery DROP FOREIGN KEY  fk_livraison_fk_user_valid;
 
 -- add constraint
-ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_soc			FOREIGN KEY (fk_soc)			REFERENCES llx_societe (rowid);
-ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_author	FOREIGN KEY (fk_user_author)	REFERENCES llx_user (rowid);
-ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_valid	FOREIGN KEY (fk_user_valid)	REFERENCES llx_user (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_author FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid);
+ALTER TABLE llx_delivery ADD CONSTRAINT fk_delivery_fk_user_valid FOREIGN KEY (fk_user_valid) REFERENCES llx_user (rowid);
 
 ALTER TABLE llx_deliverydet DROP FOREIGN KEY  fk_livraisondet_fk_livraison;
 ALTER TABLE llx_deliverydet DROP INDEX idx_livraisondet_fk_expedition;
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 ac032d3541d..ab7ea0219ec 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
@@ -183,7 +183,7 @@ CREATE TABLE llx_workstation_workstation(
 	entity int DEFAULT 1,
 	note_private text,
 	date_creation datetime NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	import_key varchar(14),
@@ -201,14 +201,14 @@ ALTER TABLE llx_workstation_workstation ADD INDEX idx_workstation_workstation_st
 
 CREATE TABLE llx_workstation_workstation_resource(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_resource integer,
 	fk_workstation integer
 ) ENGINE=innodb;
 
 CREATE TABLE llx_workstation_workstation_usergroup(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_usergroup integer,
 	fk_workstation integer
 ) ENGINE=innodb;
@@ -264,7 +264,7 @@ create table llx_payment_vat
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_tva          integer,
   datec           datetime,           -- date de creation
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep           datetime,           -- payment date
   amount          double(24,8) DEFAULT 0,
   fk_typepaiement integer NOT NULL,
@@ -431,7 +431,7 @@ CREATE TABLE llx_eventorganization_conferenceorboothattendee(
     note_public text,
     note_private text,
     date_creation datetime NOT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_user_creat integer,
     fk_user_modif integer,
     last_main_doc varchar(255),
@@ -466,7 +466,7 @@ ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD UNIQUE INDEX uk_
 create table llx_eventorganization_conferenceorboothattendee_extrafields
 (
     rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-    tms                       timestamp,
+    tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_object                 integer NOT NULL,
     import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -510,7 +510,7 @@ CREATE TABLE llx_partnership(
 	reason_decline_or_cancel text NULL,
 	date_creation datetime NOT NULL, 
 	fk_user_creat integer NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_modif integer, 
 	note_private text, 
 	note_public text, 
@@ -533,7 +533,7 @@ ALTER TABLE llx_partnership ADD INDEX idx_partnership_fk_member (fk_member);
 create table llx_partnership_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -568,7 +568,7 @@ CREATE TABLE llx_knowledgemanagement_knowledgerecord(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
 	ref varchar(128) NOT NULL, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	last_main_doc varchar(255), 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
@@ -592,7 +592,7 @@ ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD COLUMN url varchar(255);
 create table llx_knowledgemanagement_knowledgerecord_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
new file mode 100644
index 00000000000..e68f0497a88
--- /dev/null
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -0,0 +1,506 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 14.0.0 or higher.
+--
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table;
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex;
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres):
+-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
+-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
+-- -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN rowid SET DEFAULT nextval('llx_table_rowid_seq');
+-- -- VPGSQL8.2 SELECT setval('llx_table_rowid_seq', MAX(rowid)) FROM llx_table;
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+-- To rebuild sequence for postgresql after insert by forcing id autoincrement fields:
+-- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
+
+
+-- Missing in v14 or lower
+
+-- 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_accounting_bookkeeping ADD COLUMN date_export datetime DEFAULT NULL;
+
+ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD COLUMN fk_project integer NOT NULL;
+ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD COLUMN fk_invoice integer NULL;
+
+ALTER TABLE llx_eventorganization_conferenceorboothattendee DROP FOREIGN KEY fx_eventorganization_conferenceorboothattendee_fk_soc;
+ALTER TABLE llx_eventorganization_conferenceorboothattendee DROP FOREIGN KEY fx_eventorganization_conferenceorboothattendee_fk_actioncomm;
+ALTER TABLE llx_eventorganization_conferenceorboothattendee DROP FOREIGN KEY fx_eventorganization_conferenceorboothattendee_fk_project;
+
+ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD INDEX idx_eventorganization_conferenceorboothattendee_rowid (rowid);
+ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD INDEX idx_eventorganization_conferenceorboothattendee_ref (ref);
+ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD INDEX idx_eventorganization_conferenceorboothattendee_fk_soc (fk_soc);
+ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD INDEX idx_eventorganization_conferenceorboothattendee_fk_actioncomm (fk_actioncomm);
+ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD INDEX idx_eventorganization_conferenceorboothattendee_email (email);
+ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD INDEX idx_eventorganization_conferenceorboothattendee_status (status);
+
+-- VMYSQL4.1 DROP INDEX uk_eventorganization_conferenceorboothattendee on llx_eventorganization_conferenceorboothattendee;
+-- VPGSQL8.2 DROP INDEX uk_eventorganization_conferenceorboothattendee;
+
+ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD UNIQUE INDEX uk_eventorganization_conferenceorboothattendee(fk_project, email, fk_actioncomm);
+
+
+-- VMYSQL4.3 ALTER TABLE llx_eventorganization_conferenceorboothattendee MODIFY COLUMN fk_actioncomm integer NULL;
+-- VPGSQL8.2 ALTER TABLE llx_eventorganization_conferenceorboothattendee ALTER COLUMN fk_actioncomm DROP NOT NULL;
+
+ALTER TABLE llx_mrp_mo ADD COLUMN last_main_doc varchar(255);
+
+UPDATE llx_extrafields SET elementtype = 'salary' WHERE elementtype = 'payment_salary';
+ALTER TABLE llx_payment_salary_extrafields RENAME TO llx_salary_extrafields;
+-- VMYSQL4.1 DROP INDEX idx_payment_salary_extrafields on llx_salary_extrafields;
+-- VPGSQL8.2 DROP INDEX idx_payment_salary_extrafields;
+ALTER TABLE llx_salary_extrafields ADD INDEX idx_salary_extrafields (fk_object);
+
+
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationEmailAskConf)',       10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__,<br /><br />__(OrganizationEventConfRequestWasReceived)__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationEmailAskBooth)',      20, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__', '__(Hello)__,<br /><br />__(OrganizationEventBoothRequestWasReceived)__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+-- TODO Add message for registration only to event  __ONLINE_PAYMENT_TEXT_AND_URL__
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationEmailBoothPayment)',  30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailBoothPayment)__', '__(Hello)__,<br /><br />__(OrganizationEventPaymentOfBoothWasReceived)__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationEmailRegistrationPayment)', 40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailRegistrationPayment)__', '__(Hello)__,<br /><br />__(OrganizationEventPaymentOfRegistrationWasReceived)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationMassEmailAttendees)', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__', '__(Hello)__,<br /><br />__(OrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'conferenceorbooth', '', 0, null, null, '(EventOrganizationMassEmailSpeakers)',  60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__,<br /><br />__(OrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+
+UPDATE llx_c_email_templates SET label = '(EventOrganizationEmailBoothPayment)' WHERE label = '(EventOrganizationEmailSubsBooth)';
+UPDATE llx_c_email_templates SET label = '(EventOrganizationEmailRegistrationPayment)' WHERE label = '(EventOrganizationEmailSubsEvent)';
+
+
+--Fix bad sign on multicompany column for customer invoice lines
+UPDATE llx_facturedet SET multicurrency_subprice = -multicurrency_subprice WHERE ((multicurrency_subprice < 0 and subprice > 0) OR (multicurrency_subprice > 0 and subprice < 0));
+UPDATE llx_facturedet SET multicurrency_total_ht = -multicurrency_total_ht WHERE ((multicurrency_total_ht < 0 and total_ht > 0) OR (multicurrency_total_ht > 0 and total_ht < 0));
+UPDATE llx_facturedet 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_facturedet 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));  
+--Fix bad sign on multicompany column for customer invoices
+UPDATE llx_facture SET multicurrency_total_ht = -multicurrency_total_ht WHERE ((multicurrency_total_ht < 0 and total_ht > 0) OR (multicurrency_total_ht > 0 and total_ht < 0));  
+UPDATE llx_facture 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 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));  
+--Fix bad sign on multicurrency column for supplier invoice lines
+UPDATE llx_facture_fourn_det SET multicurrency_subprice = -multicurrency_subprice WHERE ((multicurrency_subprice < 0 and pu_ht > 0) OR (multicurrency_subprice > 0 and pu_ht < 0));
+UPDATE llx_facture_fourn_det SET multicurrency_total_ht = -multicurrency_total_ht WHERE ((multicurrency_total_ht < 0 and total_ht > 0) OR (multicurrency_total_ht > 0 and total_ht < 0));
+UPDATE llx_facture_fourn_det SET multicurrency_total_tva = -multicurrency_total_tva WHERE ((multicurrency_total_tva < 0 and tva > 0) OR (multicurrency_total_tva > 0 and tva < 0)); 
+UPDATE llx_facture_fourn_det 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));  
+--Fix bad sign on multicompany column for customer invoices
+UPDATE llx_facture_fourn SET multicurrency_total_ht = -multicurrency_total_ht WHERE ((multicurrency_total_ht < 0 and total_ht > 0) OR (multicurrency_total_ht > 0 and total_ht < 0));  
+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));  
+
+
+-- v15
+
+ALTER TABLE llx_c_partnership_type ADD UNIQUE INDEX uk_c_partnership_type(entity, code);
+
+ALTER TABLE llx_partnership ADD COLUMN fk_type integer DEFAULT 0 NOT NULL;
+
+ALTER TABLE llx_c_holiday_types CHANGE COLUMN newByMonth newbymonth double(8,5) DEFAULT 0 NOT NULL;
+
+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;
+
+
+ALTER TABLE llx_emailcollector_emailcollectoraction MODIFY COLUMN actionparam TEXT;
+
+ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD COLUMN lang varchar(6);
+ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD COLUMN entity integer DEFAULT 1;
+
+CREATE TABLE llx_categorie_ticket
+(
+  fk_categorie  integer NOT NULL,
+  fk_ticket    integer NOT NULL,
+  import_key    varchar(14)
+) ENGINE=innodb;
+
+ALTER TABLE llx_categorie_ticket ADD PRIMARY KEY pk_categorie_ticket (fk_categorie, fk_ticket);
+ALTER TABLE llx_categorie_ticket ADD INDEX idx_categorie_ticket_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_ticket ADD INDEX idx_categorie_ticket_fk_ticket (fk_ticket);
+
+ALTER TABLE llx_categorie_ticket ADD CONSTRAINT fk_categorie_ticket_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_categorie_ticket ADD CONSTRAINT fk_categorie_ticket_ticket_rowid   FOREIGN KEY (fk_ticket) REFERENCES llx_ticket (rowid);
+ALTER TABLE llx_product_fournisseur_price MODIFY COLUMN ref_fourn varchar(128);
+ALTER TABLE llx_product_customer_price MODIFY COLUMN ref_customer varchar(128);
+ALTER TABLE llx_product_association ADD COLUMN rang integer DEFAULT 0;
+
+-- -- add action trigger
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) VALUES ('ORDER_SUPPLIER_CANCEL','Supplier order request canceled','Executed when a supplier order is canceled','order_supplier',13);
+
+ALTER TABLE llx_product ADD COLUMN fk_default_bom integer DEFAULT NULL;
+
+ALTER TABLE llx_mrp_mo ADD COLUMN mrptype integer DEFAULT 0;
+
+DELETE FROM llx_menu WHERE type = 'top' AND module = 'cashdesk' AND mainmenu = 'cashdesk';
+
+INSERT INTO llx_c_action_trigger (code, label, description, elementtype, rang) values ('MEMBER_EXCLUDE', 'Member excluded', 'Executed when a member is excluded', 'member', 27);
+
+CREATE TABLE llx_categorie_knowledgemanagement
+(
+  fk_categorie  integer NOT NULL,
+  fk_knowledgemanagement    integer NOT NULL,
+  import_key    varchar(14)
+)ENGINE=innodb;
+
+ALTER TABLE llx_categorie_knowledgemanagement ADD PRIMARY KEY pk_categorie_knowledgemanagement (fk_categorie, fk_knowledgemanagement);
+ALTER TABLE llx_categorie_knowledgemanagement ADD INDEX idx_categorie_knowledgemanagement_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_knowledgemanagement ADD INDEX idx_categorie_knowledgemanagement_fk_knowledgemanagement (fk_knowledgemanagement);
+
+ALTER TABLE llx_categorie_knowledgemanagement ADD CONSTRAINT fk_categorie_knowledgemanagement_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_categorie_knowledgemanagement ADD CONSTRAINT fk_categorie_knowledgemanagement_knowledgemanagement_rowid   FOREIGN KEY (fk_knowledgemanagement) REFERENCES llx_knowledgemanagement_knowledgerecord (rowid);
+
+ALTER TABLE llx_product_lot ADD COLUMN barcode varchar(180) DEFAULT NULL;
+ALTER TABLE llx_product_lot ADD COLUMN fk_barcode_type integer DEFAULT NULL;
+
+ALTER TABLE llx_projet ADD COLUMN max_attendees integer DEFAULT 0;
+
+ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN cost_price double(24,8) DEFAULT 0;
+
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2001', 'Aktiebolag');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2002', 'Publikt aktiebolag (AB publ)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2003', 'Ekonomisk förening (ek. för.)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2004', 'Bostadsrättsförening (BRF)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2005', 'Hyresrättsförening (HRF)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2006', 'Kooperativ');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2007', 'Enskild firma (EF)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2008', 'Handelsbolag (HB)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2009', 'Kommanditbolag (KB)');
+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');
+
+ALTER TABLE llx_c_holiday_types ADD COLUMN block_if_negative integer NOT NULL DEFAULT 0 AFTER fk_country;
+
+
+-- START  GRH/HRM MODULE
+
+
+CREATE TABLE llx_hrm_evaluation
+(
+    rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    ref varchar(128) DEFAULT '(PROV)' 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 smallint NOT NULL,
+    date_eval date,
+    fk_user integer NOT NULL,
+    fk_job integer NOT NULL
+) ENGINE=innodb;
+ALTER TABLE llx_hrm_evaluation ADD INDEX idx_hrm_evaluation_rowid (rowid);
+ALTER TABLE llx_hrm_evaluation ADD INDEX idx_hrm_evaluation_ref (ref);
+ALTER TABLE llx_hrm_evaluation ADD CONSTRAINT llx_hrm_evaluation_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_hrm_evaluation ADD INDEX idx_hrm_evaluation_status (status);
+
+
+create table llx_hrm_evaluation_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_hrm_evaluation_extrafields ADD INDEX idx_evaluation_fk_object(fk_object);
+
+
+CREATE TABLE llx_hrm_evaluationdet
+(
+    -- BEGIN MODULEBUILDER FIELDS
+    rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    date_creation datetime NOT NULL,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fk_user_creat integer NOT NULL,
+    fk_user_modif integer,
+    fk_skill integer NOT NULL,
+    fk_evaluation integer NOT NULL,
+    rankorder integer NOT NULL,
+    required_rank integer NOT NULL,
+    import_key varchar(14)
+) ENGINE=innodb;
+
+ALTER TABLE llx_hrm_evaluationdet ADD INDEX idx_hrm_evaluationdet_rowid (rowid);
+ALTER TABLE llx_hrm_evaluationdet ADD CONSTRAINT llx_hrm_evaluationdet_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_hrm_evaluationdet ADD INDEX idx_hrm_evaluationdet_fk_skill (fk_skill);
+ALTER TABLE llx_hrm_evaluationdet ADD INDEX idx_hrm_evaluationdet_fk_evaluation (fk_evaluation);
+
+
+create table llx_hrm_evaluationdet_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_hrm_evaluationdet_extrafields ADD INDEX idx_evaluationdet_fk_object(fk_object);
+
+
+
+CREATE TABLE llx_hrm_job
+(
+    rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    label varchar(255) NOT NULL,
+    description text,
+    date_creation datetime NOT NULL,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    deplacement varchar(255),
+    note_public text,
+    note_private text,
+    fk_user_creat integer,
+    fk_user_modif integer
+) ENGINE=innodb;
+
+ALTER TABLE llx_hrm_job ADD INDEX idx_hrm_job_rowid (rowid);
+ALTER TABLE llx_hrm_job ADD INDEX idx_hrm_job_label (label);
+
+
+create table llx_hrm_job_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_hrm_job_extrafields ADD INDEX idx_job_fk_object(fk_object);
+
+
+
+CREATE TABLE llx_hrm_job_user(
+    rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    -- ref varchar(128) NOT NULL,
+    description text,
+    date_creation datetime NOT NULL,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fk_contrat integer,
+    fk_user integer,
+    fk_job integer NOT NULL,
+    date_start date,
+    date_end date,
+    abort_comment varchar(255),
+    note_public text,
+    note_private text,
+    fk_user_creat integer,
+    fk_user_modif integer
+) ENGINE=innodb;
+
+ALTER TABLE llx_hrm_job_user ADD COLUMN abort_comment varchar(255);
+
+ALTER TABLE llx_hrm_job_user ADD INDEX idx_hrm_job_user_rowid (rowid);
+-- ALTER TABLE llx_hrm_job_user ADD INDEX idx_hrm_job_user_ref (ref);
+
+
+
+CREATE TABLE llx_hrm_skill
+(
+    rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    label varchar(255),
+    description 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,
+    required_level integer NOT NULL,
+    date_validite integer NOT NULL,
+    temps_theorique double(24,8) NOT NULL,
+    skill_type integer NOT NULL,
+    note_public text,
+    note_private text
+) ENGINE=innodb;
+
+ALTER TABLE llx_hrm_skill ADD INDEX idx_hrm_skill_rowid (rowid);
+ALTER TABLE llx_hrm_skill ADD CONSTRAINT llx_hrm_skill_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_hrm_skill ADD INDEX idx_hrm_skill_skill_type (skill_type);
+
+create table llx_hrm_skill_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_hrm_skill_extrafields ADD INDEX idx_skill_fk_object(fk_object);
+
+
+CREATE TABLE llx_hrm_skilldet
+(
+    rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    description text,
+    fk_user_creat integer NOT NULL,
+    fk_user_modif integer,
+    fk_skill integer NOT NULL,
+    rankorder integer
+) ENGINE=innodb;
+
+ALTER TABLE llx_hrm_skilldet ADD COLUMN rankorder integer NOT NULL DEFAULT '1';
+
+ALTER TABLE llx_hrm_skilldet ADD INDEX idx_hrm_skilldet_rowid (rowid);
+ALTER TABLE llx_hrm_skilldet ADD CONSTRAINT llx_hrm_skilldet_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+
+CREATE TABLE llx_hrm_skillrank
+(
+    rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    fk_skill integer NOT NULL,
+    rankorder integer NOT NULL,
+    fk_object integer NOT NULL,
+    date_creation datetime NOT NULL,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fk_user_creat integer NOT NULL,
+    fk_user_modif integer,
+    objecttype varchar(128) NOT NULL
+) ENGINE=innodb;
+
+ALTER TABLE llx_hrm_skillrank ADD INDEX idx_hrm_skillrank_rowid (rowid);
+ALTER TABLE llx_hrm_skillrank ADD INDEX idx_hrm_skillrank_fk_skill (fk_skill);
+ALTER TABLE llx_hrm_skillrank ADD CONSTRAINT llx_hrm_skillrank_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+
+--END  GRH/HRM MODULE
+
+ALTER TABLE llx_c_units ADD COLUMN sortorder smallint AFTER code;
+
+-- Manage accountancy auxiliary account for thirdparties per entity
+ALTER TABLE llx_societe_perentity ADD COLUMN accountancy_code_customer varchar(24) AFTER entity;    -- equivalent to code_compta in llx_societe
+ALTER TABLE llx_societe_perentity ADD COLUMN accountancy_code_supplier varchar(24) AFTER accountancy_code_customer; -- equivalent to code_compta_supplier in llx_societe
+
+ALTER TABLE llx_projet_task ADD COLUMN budget_amount double(24,8) AFTER priority;
+
+-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_graph_ticket_by_severity.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_ticket_by_severity.php' AND entity = 1);
+-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_graph_nb_ticket_last_x_days.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_nb_ticket_last_x_days.php' AND entity = 1);
+-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_graph_nb_tickets_type.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_nb_tickets_type.php' AND entity = 1);
+-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_graph_new_vs_close_ticket.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_graph_new_vs_close_ticket.php' AND entity = 1);
+
+ALTER TABLE llx_user DROP COLUMN jabberid;
+ALTER TABLE llx_user DROP COLUMN skype;
+ALTER TABLE llx_user DROP COLUMN twitter;
+ALTER TABLE llx_user DROP COLUMN facebook;
+ALTER TABLE llx_user DROP COLUMN linkedin;
+ALTER TABLE llx_user DROP COLUMN instagram;
+ALTER TABLE llx_user DROP COLUMN snapchat;
+ALTER TABLE llx_user DROP COLUMN googleplus;
+ALTER TABLE llx_user DROP COLUMN youtube;
+ALTER TABLE llx_user DROP COLUMN whatsapp;
+
+ALTER TABLE llx_adherent DROP COLUMN jabberid;
+ALTER TABLE llx_adherent DROP COLUMN skype;
+ALTER TABLE llx_adherent DROP COLUMN twitter;
+ALTER TABLE llx_adherent DROP COLUMN facebook;
+ALTER TABLE llx_adherent DROP COLUMN linkedin;
+ALTER TABLE llx_adherent DROP COLUMN instagram;
+ALTER TABLE llx_adherent DROP COLUMN snapchat;
+ALTER TABLE llx_adherent DROP COLUMN googleplus;
+ALTER TABLE llx_adherent DROP COLUMN youtube;
+ALTER TABLE llx_adherent DROP COLUMN whatsapp;
+
+ALTER TABLE llx_societe DROP COLUMN jabberid;
+ALTER TABLE llx_societe DROP COLUMN skype;
+ALTER TABLE llx_societe DROP COLUMN twitter;
+ALTER TABLE llx_societe DROP COLUMN facebook;
+ALTER TABLE llx_societe DROP COLUMN linkedin;
+ALTER TABLE llx_societe DROP COLUMN instagram;
+ALTER TABLE llx_societe DROP COLUMN snapchat;
+ALTER TABLE llx_societe DROP COLUMN googleplus;
+ALTER TABLE llx_societe DROP COLUMN youtube;
+ALTER TABLE llx_societe DROP COLUMN whatsapp;
+
+ALTER TABLE llx_socpeople DROP COLUMN jabberid;
+ALTER TABLE llx_socpeople DROP COLUMN skype;
+ALTER TABLE llx_socpeople DROP COLUMN twitter;
+ALTER TABLE llx_socpeople DROP COLUMN facebook;
+ALTER TABLE llx_socpeople DROP COLUMN linkedin;
+ALTER TABLE llx_socpeople DROP COLUMN instagram;
+ALTER TABLE llx_socpeople DROP COLUMN snapchat;
+ALTER TABLE llx_socpeople DROP COLUMN googleplus;
+ALTER TABLE llx_socpeople DROP COLUMN youtube;
+ALTER TABLE llx_socpeople DROP COLUMN whatsapp;
+
+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);
+
+ALTER TABLE llx_paiement_facture ADD COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_paiement_facture ADD COLUMN multicurrency_tx double(24,8) DEFAULT 1;
+ALTER TABLE llx_paiement_facture ADD COLUMN multicurrency_amount double(24,8) DEFAULT 0;
+
+ALTER TABLE llx_paiementfourn_facturefourn ADD COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_paiementfourn_facturefourn ADD COLUMN multicurrency_tx double(24,8) DEFAULT 1;
+ALTER TABLE llx_paiementfourn_facturefourn ADD COLUMN multicurrency_amount double(24,8) DEFAULT 0;
+
+
+ALTER TABLE llx_commande_fournisseur MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_commande MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_commandedet MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_contratdet MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_expensereport_det MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_expensereport MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_facture_fourn_det MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_facture_fourn MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_facture_rec MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_facture MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_facturedet_rec MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_facturedet MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_paiement_facture MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_paiementfourn_facturefourn MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_product_fournisseur_price_log MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_product_fournisseur_price MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_product_price_by_qty MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_product_price MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_propal MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_propaldet MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_societe MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_supplier_proposal MODIFY COLUMN multicurrency_code varchar(3);
+ALTER TABLE llx_supplier_proposaldet MODIFY COLUMN multicurrency_code varchar(3);
+
+ALTER TABLE llx_propal ADD COLUMN online_sign_ip varchar(48);
+ALTER TABLE llx_propal ADD COLUMN online_sign_name varchar(64);
+
+ALTER TABLE llx_entrepot ADD COLUMN warehouse_usage integer DEFAULT 1;
+
+ALTER TABLE llx_session MODIFY COLUMN user_agent VARCHAR(255) NULL;
+
+ALTER TABLE llx_inventorydet ADD COLUMN fk_movement integer NULL;
+
+ALTER TABLE llx_stock_mouvement MODIFY COLUMN origintype varchar(64);
+
+ALTER TABLE llx_intracommreport CHANGE COLUMN period periods varchar(32);
+
+UPDATE llx_rights_def SET perms = 'writeall' WHERE perms = 'writeall_advance' AND module = 'holiday';
+
+
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_CREATE','User created','Executed when a user is created','user',301);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_MODIFY','User update','Executed when a user is updated','user',302);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_DELETE','User update','Executed when a user is deleted','user',303);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_NEW_PASSWORD','User update','Executed when a user is change password','user',304);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('USER_ENABLEDISABLE','User update','Executed when a user is enable or disable','user',305);
+
+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);
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
new file mode 100644
index 00000000000..c76abb14eb1
--- /dev/null
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -0,0 +1,225 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 15.0.0 or higher.
+--
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table;
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex;
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres):
+-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
+-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
+-- -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN rowid SET DEFAULT nextval('llx_table_rowid_seq');
+-- -- VPGSQL8.2 SELECT setval('llx_table_rowid_seq', MAX(rowid)) FROM llx_table;
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+-- To rebuild sequence for postgresql after insert by forcing id autoincrement fields:
+-- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
+
+
+-- Missing in v15 or lower
+
+ALTER TABLE llx_c_availability MODIFY COLUMN label 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);
+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_reason MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_lead_status MODIFY COLUMN label 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);
+ALTER TABLE llx_c_productbatch_qcstatus MODIFY COLUMN label varchar(128);
+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_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_typent MODIFY COLUMN libelle varchar(128);
+
+UPDATE llx_rights_def SET perms = 'writeall' WHERE perms = 'writeall_advance' AND module = 'holiday';
+
+
+
+-- v16
+
+ALTER TABLE llx_projet_task_time ADD COLUMN fk_product integer NULL;
+
+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);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_MODIFY','Price request modified','Executed when a commercial proposal is modified','proposal_supplier',10);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_MODIFY','Supplier order request modified','Executed when a supplier order is modified','order_supplier',13);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_MODIFY','Supplier invoice modified','Executed when a supplier invoice is modified','invoice_supplier',15);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_MODIFY','Contract modified','Executed when a contract is modified','contrat',18);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_MODIFY','Shipping modified','Executed when a shipping is modified','shipping',20);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_MODIFY','Intervention modify','Executed when a intervention is modify','ficheinter',30);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',41);
+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;
+
+CREATE TABLE llx_stock_mouvement_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)
+)ENGINE=innodb;
+
+
+-- 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;
diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql
index 1d3a784dd74..bd74c33c688 100644
--- a/htdocs/install/mysql/tables/llx_adherent.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.sql
@@ -51,15 +51,15 @@ create table llx_adherent
   url              varchar(255) NULL,
 
   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
+  --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
 
   phone            varchar(30),
   phone_perso      varchar(30),
diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql
index a2b2dffe8a7..4ccbf4a1340 100644
--- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql
@@ -2,6 +2,7 @@
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004-2016      Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2012 		    Florian Henry        <florian.henry@open-concept.pro>
+-- Copyright (C) 2022 		    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
@@ -23,7 +24,7 @@ create table llx_c_actioncomm
   id         integer     PRIMARY KEY,
   code       varchar(50) NOT NULL,
   type       varchar(50) DEFAULT 'system' NOT NULL,
-  libelle    varchar(48) NOT NULL,
+  libelle    varchar(128) NOT NULL,
   module	 varchar(50) DEFAULT NULL,
   active     tinyint DEFAULT 1 NOT NULL,
   todo       tinyint,						-- deprecated
diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql
index 4cdc8d6203c..b36d89870b4 100644
--- a/htdocs/install/mysql/tables/llx_c_availability.sql
+++ b/htdocs/install/mysql/tables/llx_c_availability.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2011 Philippe GRAND      <philippe.grand@atoo-net.com>
 -- Copyright (C) 2020 Alexandre SPANGARO  <aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 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
@@ -21,7 +22,7 @@ create table llx_c_availability
 (
 	rowid		integer	 	AUTO_INCREMENT PRIMARY KEY,
 	code		varchar(30) NOT NULL,
-	label		varchar(60) NOT NULL,
+	label		varchar(128) NOT NULL,
 	active		tinyint 	DEFAULT 1  NOT NULL,
 	position    integer NOT NULL DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql
index fc76fab2dc9..3aaea7a5f59 100644
--- a/htdocs/install/mysql/tables/llx_c_barcode_type.sql
+++ b/htdocs/install/mysql/tables/llx_c_barcode_type.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2007-2009 Regis Houssin        <regis.houssin@inodbox.com>
 -- Copyright (C) 2008      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022      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
@@ -22,7 +23,7 @@ create table llx_c_barcode_type
   rowid    integer            AUTO_INCREMENT PRIMARY KEY,
   code     varchar(16)        NOT NULL,
   entity   integer  DEFAULT 1 NOT NULL,	-- multi company id
-  libelle  varchar(50)        NOT NULL,
+  libelle  varchar(128)        NOT NULL,
   coder    varchar(16)        NOT NULL,
   example  varchar(16)        NOT NULL
   
diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql
index 9da2976348f..78b87f95152 100644
--- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004-2009      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 		    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
@@ -20,7 +21,7 @@
 create table llx_c_chargesociales
 (
   id           integer AUTO_INCREMENT PRIMARY KEY,
-  libelle      varchar(80),
+  libelle      varchar(128),
   deductible   smallint DEFAULT 0 NOT NULL,
   active       tinyint DEFAULT 1  NOT NULL,
   code         varchar(12) NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_c_civility.sql b/htdocs/install/mysql/tables/llx_c_civility.sql
index 63fc8fca81f..9586101b254 100644
--- a/htdocs/install/mysql/tables/llx_c_civility.sql
+++ b/htdocs/install/mysql/tables/llx_c_civility.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2004 Benoit Mortier      <benoit.mortier@opensides.be>
 -- Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 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
@@ -21,7 +22,7 @@ create table llx_c_civility
 (
   rowid       integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
   code        varchar(6) NOT NULL,
-  label		  varchar(50),
+  label		  varchar(128),
   active      tinyint DEFAULT 1  NOT NULL,
   module      varchar(32) NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_country.sql b/htdocs/install/mysql/tables/llx_c_country.sql
index 7f7ba0d4113..d97c3b90371 100644
--- a/htdocs/install/mysql/tables/llx_c_country.sql
+++ b/htdocs/install/mysql/tables/llx_c_country.sql
@@ -2,6 +2,7 @@
 -- Copyright (C) 2001-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
 -- Copyright (C) 2004		Laurent Destailleur		<eldy@users.sourceforge.net>
 -- Copyright (C) 2014		Alexandre Spangaro		<aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 	    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
@@ -23,7 +24,7 @@ create table llx_c_country
   rowid    integer            PRIMARY KEY,
   code     varchar(2)         NOT NULL,
   code_iso varchar(3)         ,
-  label    varchar(50)        NOT NULL,
+  label    varchar(128)        NOT NULL,
   eec      integer            ,
   active   tinyint DEFAULT 1  NOT NULL,
   favorite tinyint DEFAULT 0  NOT NULL
diff --git a/htdocs/install/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql
index 1943fa6eb41..d2d66236016 100644
--- a/htdocs/install/mysql/tables/llx_c_currencies.sql
+++ b/htdocs/install/mysql/tables/llx_c_currencies.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2005	Laurent Destailleur	<eldy@users.sourceforge.net>
 -- Copyright (C) 2012	Regis Houssin		<regis.houssin@inodbox.com>
+-- Copyright (C) 2022 	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
@@ -20,7 +21,7 @@
 create table llx_c_currencies
 (
   code_iso		varchar(3)  PRIMARY KEY,
-  label			varchar(64) NOT NULL,
+  label			varchar(128) NOT NULL,
   unicode		varchar(32) DEFAULT NULL,
   active		tinyint		DEFAULT 1  NOT NULL
   
diff --git a/htdocs/install/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql
index 26cab5c43da..dda78304fd9 100644
--- a/htdocs/install/mysql/tables/llx_c_effectif.sql
+++ b/htdocs/install/mysql/tables/llx_c_effectif.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	        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
@@ -21,7 +22,7 @@ create table llx_c_effectif
 (
   id      integer     PRIMARY KEY,
   code    varchar(12) NOT NULL,
-  libelle varchar(30),
+  libelle varchar(128),
   active  tinyint DEFAULT 1  NOT NULL,
   module  varchar(32) NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_exp_tax_cat.sql b/htdocs/install/mysql/tables/llx_c_exp_tax_cat.sql
index 15d89c4747c..6b106caa355 100644
--- a/htdocs/install/mysql/tables/llx_c_exp_tax_cat.sql
+++ b/htdocs/install/mysql/tables/llx_c_exp_tax_cat.sql
@@ -2,10 +2,11 @@
 -- Copyright (C) 2012 Mikael Carlavan     <mcarlavan@qis-network.com>
 -- Copyright (C) 2017 ATM Consulting      <contact@atm-consulting.fr>
 -- Copyright (C) 2017 Pierre-Henry Favre  <phf@atm-consulting.fr>
+-- Copyright (C) 2022 Juanjo Menent       <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
@@ -20,7 +21,7 @@
 
 CREATE TABLE IF NOT EXISTS llx_c_exp_tax_cat (
     rowid       integer  AUTO_INCREMENT PRIMARY KEY,
-    label       varchar(48) NOT NULL, 
+    label       varchar(128) NOT NULL,
     entity      integer DEFAULT 1 NOT NULL,
     active      integer DEFAULT 1 NOT NULL	          
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_exp_tax_range.sql b/htdocs/install/mysql/tables/llx_c_exp_tax_range.sql
index e80eeb15d50..0d996df7033 100644
--- a/htdocs/install/mysql/tables/llx_c_exp_tax_range.sql
+++ b/htdocs/install/mysql/tables/llx_c_exp_tax_range.sql
@@ -5,7 +5,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
diff --git a/htdocs/install/mysql/tables/llx_c_holiday_types.sql b/htdocs/install/mysql/tables/llx_c_holiday_types.sql
index 9c09d486bec..63a6e522822 100644
--- a/htdocs/install/mysql/tables/llx_c_holiday_types.sql
+++ b/htdocs/install/mysql/tables/llx_c_holiday_types.sql
@@ -22,7 +22,8 @@ CREATE TABLE llx_c_holiday_types (
   label varchar(255) NOT NULL,
   affect integer NOT NULL,						-- a request will change sold or not
   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
+  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,
   active integer DEFAULT 1
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_hrm_department.sql b/htdocs/install/mysql/tables/llx_c_hrm_department.sql
index 13380bf03b9..fbe6c67671c 100644
--- a/htdocs/install/mysql/tables/llx_c_hrm_department.sql
+++ b/htdocs/install/mysql/tables/llx_c_hrm_department.sql
@@ -1,6 +1,7 @@
 --
 -- Copyright (C) 2013 Jean-François Ferry <jfefe@aternatik.fr>
 -- Copyright (C) 2015 Alexandre Spangaro  <aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 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
@@ -20,7 +21,7 @@ create table llx_c_hrm_department
   rowid      	integer     PRIMARY KEY,
   pos   		tinyint DEFAULT 0 NOT NULL,
   code    		varchar(16) NOT NULL,
-  label 		varchar(50),
+  label 		varchar(128),
   active  		tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_c_hrm_function.sql b/htdocs/install/mysql/tables/llx_c_hrm_function.sql
index 3d6fc37fc2b..558893ba8d6 100644
--- a/htdocs/install/mysql/tables/llx_c_hrm_function.sql
+++ b/htdocs/install/mysql/tables/llx_c_hrm_function.sql
@@ -1,6 +1,7 @@
 --
 -- Copyright (C) 2013 Jean-François Ferry <jfefe@aternatik.fr>
 -- Copyright (C) 2015 Alexandre Spangaro  <aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 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
@@ -20,7 +21,7 @@ create table llx_c_hrm_function
   rowid     integer     PRIMARY KEY,
   pos   	tinyint DEFAULT 0 NOT NULL,
   code    	varchar(16) NOT NULL,
-  label 	varchar(50),
+  label 	varchar(128),
   c_level   tinyint DEFAULT 0 NOT NULL,
   active  	tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_input_method.sql b/htdocs/install/mysql/tables/llx_c_input_method.sql
index 40ed48f8fc6..fc77566e6bd 100644
--- a/htdocs/install/mysql/tables/llx_c_input_method.sql
+++ b/htdocs/install/mysql/tables/llx_c_input_method.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	   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
@@ -21,7 +22,7 @@ create table llx_c_input_method
 (
   rowid    integer AUTO_INCREMENT PRIMARY KEY,
   code     varchar(30),
-  libelle  varchar(60),
+  libelle  varchar(128),
   active   tinyint default 1  NOT NULL,
   module   varchar(32) NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_input_reason.sql b/htdocs/install/mysql/tables/llx_c_input_reason.sql
index dba58dbbecc..f57a9a877ab 100644
--- a/htdocs/install/mysql/tables/llx_c_input_reason.sql
+++ b/htdocs/install/mysql/tables/llx_c_input_reason.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	   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
@@ -23,7 +24,7 @@ create table llx_c_input_reason
 (
   rowid		integer AUTO_INCREMENT PRIMARY KEY,
   code		varchar(30),
-  label		varchar(60),
+  label		varchar(128),
   active	tinyint default 1  NOT NULL,
   module    varchar(32) NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_lead_status.sql b/htdocs/install/mysql/tables/llx_c_lead_status.sql
index 9027c0f6ca1..7905c5b6c05 100644
--- a/htdocs/install/mysql/tables/llx_c_lead_status.sql
+++ b/htdocs/install/mysql/tables/llx_c_lead_status.sql
@@ -1,5 +1,6 @@
 -- Manage Lead
 -- Copyright (C) 2014  Florian HENRY <florian.henry@open-concept.pro>
+-- Copyright (C) 2022  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
@@ -18,7 +19,7 @@ create table llx_c_lead_status
 (
   rowid       integer AUTO_INCREMENT PRIMARY KEY,
   code 		  varchar(10),
-  label       varchar(50),
+  label       varchar(128),
   position    integer,
   percent     double(5,2),
   active      tinyint DEFAULT 1 NOT NULL
diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql
index 739d31e946d..535e5115e85 100644
--- a/htdocs/install/mysql/tables/llx_c_paiement.sql
+++ b/htdocs/install/mysql/tables/llx_c_paiement.sql
@@ -3,6 +3,7 @@
 -- Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
 -- Copyright (C) 2014		Alexandre Spangaro		<aspangaro@open-dsi.fr>
 -- Copyright (C) 2017		Regis Houssin			<regis.houssin@inodbox.com>
+-- Copyright (C) 2022 		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
@@ -24,7 +25,7 @@ create table llx_c_paiement
   id					integer AUTO_INCREMENT PRIMARY KEY,
   entity				integer	DEFAULT 1 NOT NULL,	-- multi company id
   code       		varchar(6)  NOT NULL,
-  libelle    		varchar(62),
+  libelle    		varchar(128),
   type       		smallint,	-- 0: input money, 1: output money, 2: input and output, 3: other
   active     		tinyint DEFAULT 1  NOT NULL,
   accountancy_code	varchar(32) NULL,
diff --git a/htdocs/install/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql
index 45c56ce379f..fd9fc672b68 100644
--- a/htdocs/install/mysql/tables/llx_c_paper_format.sql
+++ b/htdocs/install/mysql/tables/llx_c_paper_format.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2007 Regis Houssin <regis.houssin@inodbox.com>
+-- Copyright (C) 2022 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
@@ -20,7 +21,7 @@ create table llx_c_paper_format
 (
   rowid    integer                          AUTO_INCREMENT PRIMARY KEY,
   code     varchar(16)                      NOT NULL,
-  label    varchar(50)                      NOT NULL,
+  label    varchar(128)                      NOT NULL,
   width    float(6,2)                       DEFAULT 0,  -- Largeur du papier
   height   float(6,2)                       DEFAULT 0,  -- Hauteur du papier
   unit     varchar(5)                       NOT NULL,   -- Mesure unit
diff --git a/htdocs/install/mysql/tables/llx_c_partnership_type.key.sql b/htdocs/install/mysql/tables/llx_c_partnership_type.key.sql
new file mode 100644
index 00000000000..c4aa0c04b0a
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_partnership_type.key.sql
@@ -0,0 +1,19 @@
+-- ========================================================================
+-- Copyright (C) 2021 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_c_partnership_type ADD UNIQUE INDEX uk_c_partnership_type(entity, code);
diff --git a/htdocs/install/mysql/tables/llx_c_partnership_type.sql b/htdocs/install/mysql/tables/llx_c_partnership_type.sql
index 23d5a89e16c..99841f967cb 100644
--- a/htdocs/install/mysql/tables/llx_c_partnership_type.sql
+++ b/htdocs/install/mysql/tables/llx_c_partnership_type.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2021 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 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
@@ -29,7 +30,7 @@ create table llx_c_partnership_type
   rowid      	integer AUTO_INCREMENT PRIMARY KEY,
   entity        integer DEFAULT 1 NOT NULL,
   code          varchar(32) NOT NULL,
-  label 	    varchar(64)	NOT NULL,
-  active  	    tinyint DEFAULT 1  NOT NULL
+  label 	    varchar(128)	NOT NULL,
+  active  	    tinyint DEFAULT 1 NOT NULL
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_c_product_nature.sql b/htdocs/install/mysql/tables/llx_c_product_nature.sql
index 3c467ce7cf8..e2efdf2a981 100644
--- a/htdocs/install/mysql/tables/llx_c_product_nature.sql
+++ b/htdocs/install/mysql/tables/llx_c_product_nature.sql
@@ -1,5 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2020 Florian HENRY  <florian.henry@scopen.fr>
+-- Copyright (C) 2022 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
@@ -19,6 +21,6 @@
 CREATE TABLE llx_c_product_nature (
      rowid integer AUTO_INCREMENT PRIMARY KEY,
      code tinyint NOT NULL,
-     label varchar(100),
+     label varchar(128),
      active tinyint DEFAULT 1  NOT NULL
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
index 73daa56067a..06a2a76220d 100644
--- a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2012-2017      Noé Cendrier  <noe.cendrier@altairis.fr>
+-- Copyright (C) 2022 		    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
@@ -21,6 +22,6 @@ CREATE TABLE llx_c_productbatch_qcstatus
   rowid    integer            AUTO_INCREMENT PRIMARY KEY,
   entity 	 integer NOT NULL DEFAULT 1,
   code     varchar(16)        NOT NULL,
-  label    varchar(50)        NOT NULL,
+  label    varchar(128)        NOT NULL,
   active   integer  DEFAULT 1 NOT NULL  
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql
index 2a107b52735..7b3351a52b8 100644
--- a/htdocs/install/mysql/tables/llx_c_propalst.sql
+++ b/htdocs/install/mysql/tables/llx_c_propalst.sql
@@ -1,6 +1,7 @@
 -- ===================================================================
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 		    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
@@ -21,7 +22,7 @@ create table llx_c_propalst
 (
   id              smallint    PRIMARY KEY,
   code            varchar(12) NOT NULL,
-  label           varchar(30),
+  label           varchar(128),
   active          tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_c_prospectcontactlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectcontactlevel.sql
index 421b3452371..b9efe7967ad 100644
--- a/htdocs/install/mysql/tables/llx_c_prospectcontactlevel.sql
+++ b/htdocs/install/mysql/tables/llx_c_prospectcontactlevel.sql
@@ -1,5 +1,6 @@
 -- ===================================================================
 -- Copyright (C) 2020 	   Open-Dsi  <support@open-dsi.fr>
+-- Copyright (C) 2022 	   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
@@ -19,7 +20,7 @@
 create table llx_c_prospectcontactlevel
 (
   code            varchar(12) PRIMARY KEY,
-  label           varchar(30),
+  label           varchar(128),
   sortorder       smallint,
   active          smallint    DEFAULT 1 NOT NULL,
   module          varchar(32) NULL
diff --git a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql
index 70e26dc3a26..31d3abcb5bc 100644
--- a/htdocs/install/mysql/tables/llx_c_prospectlevel.sql
+++ b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql
@@ -1,5 +1,6 @@
 -- ===================================================================
 -- Copyright (C) 2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 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
@@ -19,7 +20,7 @@
 create table llx_c_prospectlevel
 (
   code            varchar(12) PRIMARY KEY,
-  label           varchar(30),
+  label           varchar(128),
   sortorder       smallint,
   active          smallint    DEFAULT 1 NOT NULL,
   module          varchar(32) NULL
diff --git a/htdocs/install/mysql/tables/llx_c_recruitment_origin.sql b/htdocs/install/mysql/tables/llx_c_recruitment_origin.sql
index b18f7eb383c..2d1c6682900 100644
--- a/htdocs/install/mysql/tables/llx_c_recruitment_origin.sql
+++ b/htdocs/install/mysql/tables/llx_c_recruitment_origin.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2005-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	   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
@@ -28,6 +29,6 @@ create table llx_c_recruitment_origin
 (
   rowid      	integer AUTO_INCREMENT PRIMARY KEY,
   code          varchar(32) NOT NULL,
-  label 	    varchar(64)	NOT NULL,
+  label 	    varchar(128)	NOT NULL,
   active  	    tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
index 6f49f682f24..4f0d584d6d7 100644
--- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
@@ -1,5 +1,6 @@
 -- ===================================================================
 -- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2022 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
@@ -22,7 +23,7 @@ create table llx_c_shipment_mode
   entity				   integer	DEFAULT 1 NOT NULL,	-- multi company id
   tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   code             varchar(30) NOT NULL,
-  libelle          varchar(50) NOT NULL,
+  libelle          varchar(128) NOT NULL,
   description      text,
   tracking         varchar(255) NULL,
   active           tinyint DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_c_shipment_package_type.sql b/htdocs/install/mysql/tables/llx_c_shipment_package_type.sql
index e510352eba2..92dd861fd49 100644
--- a/htdocs/install/mysql/tables/llx_c_shipment_package_type.sql
+++ b/htdocs/install/mysql/tables/llx_c_shipment_package_type.sql
@@ -2,7 +2,7 @@
 create table llx_c_shipment_package_type
 (
     rowid        integer  AUTO_INCREMENT PRIMARY KEY,
-    label        varchar(50) NOT NULL,  -- Short name
+    label        varchar(128) NOT NULL,  -- Short name
     description	 varchar(255), -- Description
     active       integer DEFAULT 1 NOT NULL, -- Active or not	
     entity       integer DEFAULT 1 NOT NULL -- Multi company id 
diff --git a/htdocs/install/mysql/tables/llx_c_socialnetworks.key.sql b/htdocs/install/mysql/tables/llx_c_socialnetworks.key.sql
index ee48185e187..3d3afb94d8a 100644
--- a/htdocs/install/mysql/tables/llx_c_socialnetworks.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_socialnetworks.key.sql
@@ -16,4 +16,4 @@
 -- ========================================================================
 
 
-ALTER TABLE llx_c_socialnetworks ADD UNIQUE INDEX idx_c_socialnetworks_code_entity (code, entity);
+ALTER TABLE llx_c_socialnetworks ADD UNIQUE INDEX idx_c_socialnetworks_code_entity (entity, code);
diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql
index 5f31666b28c..aa5d58a280f 100644
--- a/htdocs/install/mysql/tables/llx_c_stcomm.sql
+++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004-2015      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 		    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
@@ -21,7 +22,7 @@ create table llx_c_stcomm
 (
   id       integer      PRIMARY KEY,
   code     varchar(12)  NOT NULL,
-  libelle  varchar(30),
+  libelle  varchar(128),
   picto    varchar(128),
   active   tinyint default 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_stcommcontact.sql b/htdocs/install/mysql/tables/llx_c_stcommcontact.sql
index c906e4f5103..7ab74e123f6 100644
--- a/htdocs/install/mysql/tables/llx_c_stcommcontact.sql
+++ b/htdocs/install/mysql/tables/llx_c_stcommcontact.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2020 	   Open-Dsi  <support@open-dsi.fr>
+-- Copyright (C) 2022 	   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
@@ -20,7 +21,7 @@ create table llx_c_stcommcontact
 (
   id       integer      PRIMARY KEY,
   code     varchar(12)  NOT NULL,
-  libelle  varchar(30),
+  libelle  varchar(128),
   picto    varchar(128),
   active   tinyint default 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_category.key.sql b/htdocs/install/mysql/tables/llx_c_ticket_category.key.sql
index 3afa9b5be1d..d5917ce1f5d 100644
--- a/htdocs/install/mysql/tables/llx_c_ticket_category.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_ticket_category.key.sql
@@ -2,7 +2,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_category.sql b/htdocs/install/mysql/tables/llx_c_ticket_category.sql
index 57bd15f2c23..8477b455796 100644
--- a/htdocs/install/mysql/tables/llx_c_ticket_category.sql
+++ b/htdocs/install/mysql/tables/llx_c_ticket_category.sql
@@ -3,7 +3,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_resolution.key.sql b/htdocs/install/mysql/tables/llx_c_ticket_resolution.key.sql
index ac3690b70bb..472a4f4ca30 100644
--- a/htdocs/install/mysql/tables/llx_c_ticket_resolution.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_ticket_resolution.key.sql
@@ -2,7 +2,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_resolution.sql b/htdocs/install/mysql/tables/llx_c_ticket_resolution.sql
index 2f6d0d1d3da..d935d9556a4 100644
--- a/htdocs/install/mysql/tables/llx_c_ticket_resolution.sql
+++ b/htdocs/install/mysql/tables/llx_c_ticket_resolution.sql
@@ -2,7 +2,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_severity.key.sql b/htdocs/install/mysql/tables/llx_c_ticket_severity.key.sql
index a564f0059d2..fbe3e9e7de1 100644
--- a/htdocs/install/mysql/tables/llx_c_ticket_severity.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_ticket_severity.key.sql
@@ -2,7 +2,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_severity.sql b/htdocs/install/mysql/tables/llx_c_ticket_severity.sql
index b9f565c4395..c87c258faa6 100644
--- a/htdocs/install/mysql/tables/llx_c_ticket_severity.sql
+++ b/htdocs/install/mysql/tables/llx_c_ticket_severity.sql
@@ -2,7 +2,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_type.key.sql b/htdocs/install/mysql/tables/llx_c_ticket_type.key.sql
index 7a4374e35fa..c912c3da835 100644
--- a/htdocs/install/mysql/tables/llx_c_ticket_type.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_ticket_type.key.sql
@@ -2,7 +2,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_type.sql b/htdocs/install/mysql/tables/llx_c_ticket_type.sql
index 462d1a71535..3c476ff848b 100644
--- a/htdocs/install/mysql/tables/llx_c_ticket_type.sql
+++ b/htdocs/install/mysql/tables/llx_c_ticket_type.sql
@@ -2,7 +2,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql
index c222b0fe273..4b12661657e 100644
--- a/htdocs/install/mysql/tables/llx_c_type_contact.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2005     Patrick Rouillon     <patrick.rouillon.net>
 -- Copyright (C) 2005     Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	  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
@@ -32,7 +33,7 @@ create table llx_c_type_contact
   element       varchar(30) NOT NULL,
   source        varchar(8)  DEFAULT 'external' NOT NULL,
   code          varchar(32) NOT NULL,
-  libelle 	    varchar(64)	NOT NULL,
+  libelle 	    varchar(128)	NOT NULL,
   active  	    tinyint DEFAULT 1  NOT NULL,
   module        varchar(32) NULL,
   position      integer NOT NULL DEFAULT 0
diff --git a/htdocs/install/mysql/tables/llx_c_type_container.sql b/htdocs/install/mysql/tables/llx_c_type_container.sql
index 53a89fe873b..6de3d041669 100644
--- a/htdocs/install/mysql/tables/llx_c_type_container.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_container.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2018     Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	  Juanjo Menent        <jmenent@2byte.es>
 -- 
 --
 -- This program is free software; you can redistribute it and/or modify
@@ -30,7 +31,7 @@ create table llx_c_type_container
   rowid      	integer AUTO_INCREMENT PRIMARY KEY,
   code          varchar(32) NOT NULL,
   entity		integer	DEFAULT 1 NOT NULL,	-- multi company id
-  label 	    varchar(64)	NOT NULL,
+  label 	    varchar(128)	NOT NULL,
   module     	varchar(32) NULL,
   active  	    tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql
index 3f9c49c95d7..d620e38cf69 100644
--- a/htdocs/install/mysql/tables/llx_c_type_fees.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql
@@ -2,6 +2,7 @@
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2014           Alexandre Spangaro   <aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 	        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
@@ -23,7 +24,7 @@ create table llx_c_type_fees
 (
   id        		integer      AUTO_INCREMENT PRIMARY KEY,
   code      		varchar(12)  NOT NULL,
-  label				varchar(30),
+  label				varchar(128),
   type				integer DEFAULT 0,		-- 0=type product, 1=type service
   accountancy_code	varchar(32) NULL,
   active    		tinyint DEFAULT 1   NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_c_type_resource.sql b/htdocs/install/mysql/tables/llx_c_type_resource.sql
index e490755b1f7..f88f502a038 100644
--- a/htdocs/install/mysql/tables/llx_c_type_resource.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_resource.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2014     Jean-François Ferry <jfefe@aternatik.fr>
+-- Copyright (C) 2022 	  Juanjo Menent        <jmenent@2byte.es>
 -- 
 --
 -- This program is free software; you can redistribute it and/or modify
@@ -29,6 +30,6 @@ create table llx_c_type_resource
 (
   rowid      	integer AUTO_INCREMENT PRIMARY KEY,
   code          varchar(32) NOT NULL,
-  label 	    varchar(64)	NOT NULL,
+  label 	    varchar(128)	NOT NULL,
   active  	    tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql
index 0b15e70b15b..69253f98857 100644
--- a/htdocs/install/mysql/tables/llx_c_typent.sql
+++ b/htdocs/install/mysql/tables/llx_c_typent.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022 	        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
@@ -21,7 +22,7 @@ create table llx_c_typent
 (
   id         integer      PRIMARY KEY,
   code       varchar(12)  NOT NULL,
-  libelle    varchar(64),
+  libelle    varchar(128),
   fk_country integer NULL,		-- Defined only to have specific list for countries that can't use generic list (like argentina that need type A or B)
   active     tinyint DEFAULT 1   NOT NULL,
   module     varchar(32) NULL,
diff --git a/htdocs/install/mysql/tables/llx_c_units.key.sql b/htdocs/install/mysql/tables/llx_c_units.key.sql
index d3e1d40e50a..93c8b9600d2 100644
--- a/htdocs/install/mysql/tables/llx_c_units.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_units.key.sql
@@ -4,7 +4,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
diff --git a/htdocs/install/mysql/tables/llx_c_units.sql b/htdocs/install/mysql/tables/llx_c_units.sql
index d4ff78b79f1..94046d25b87 100644
--- a/htdocs/install/mysql/tables/llx_c_units.sql
+++ b/htdocs/install/mysql/tables/llx_c_units.sql
@@ -2,10 +2,11 @@
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2012           Cédric Salvador      <csalvador@gpcsolutions.fr>
+-- Copyright (C) 2022 	        Juanjo Menent        <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
@@ -19,11 +20,12 @@
 -- ========================================================================
 
 create table llx_c_units(
-	rowid integer AUTO_INCREMENT PRIMARY KEY,
-	code varchar(3),
-	scale integer,
-	label varchar(50),
-	short_label varchar(5),
-	unit_type varchar(10),
-	active tinyint DEFAULT 1 NOT NULL
+	rowid           integer AUTO_INCREMENT PRIMARY KEY,
+	code            varchar(3),
+    sortorder		smallint,
+	scale           integer,
+	label           varchar(128),
+	short_label     varchar(5),
+	unit_type       varchar(10),
+	active          tinyint DEFAULT 1 NOT NULL
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_categorie_knowledgemanagement.key.sql b/htdocs/install/mysql/tables/llx_categorie_knowledgemanagement.key.sql
new file mode 100644
index 00000000000..93222a62257
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_categorie_knowledgemanagement.key.sql
@@ -0,0 +1,21 @@
+-- Copyright (C) 2021 EOXIA <dev@eoxia.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_categorie_knowledgemanagement ADD PRIMARY KEY pk_categorie_knowledgemanagement (fk_categorie, fk_knowledgemanagement);
+ALTER TABLE llx_categorie_knowledgemanagement ADD INDEX idx_categorie_knowledgemanagement_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_knowledgemanagement ADD INDEX idx_categorie_knowledgemanagement_fk_knowledgemanagement (fk_knowledgemanagement);
+
+ALTER TABLE llx_categorie_knowledgemanagement ADD CONSTRAINT fk_categorie_knowledgemanagement_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_categorie_knowledgemanagement ADD CONSTRAINT fk_categorie_knowledgemanagement_knowledgemanagement_rowid   FOREIGN KEY (fk_knowledgemanagement) REFERENCES llx_knowledgemanagement_knowledgerecord (rowid);
diff --git a/htdocs/install/mysql/tables/llx_categorie_knowledgemanagement.sql b/htdocs/install/mysql/tables/llx_categorie_knowledgemanagement.sql
new file mode 100644
index 00000000000..a693fb19c41
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_categorie_knowledgemanagement.sql
@@ -0,0 +1,20 @@
+-- Copyright (C) 2021 EOXIA <dev@eoxia.com>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+
+create table llx_categorie_knowledgemanagement(
+  fk_categorie  integer NOT NULL,
+  fk_knowledgemanagement   integer NOT NULL,
+  import_key    varchar(14)
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_categorie_ticket.key.sql b/htdocs/install/mysql/tables/llx_categorie_ticket.key.sql
new file mode 100644
index 00000000000..012b9a9eadc
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_categorie_ticket.key.sql
@@ -0,0 +1,21 @@
+-- Copyright (C) 2021 EOXIA <dev@eoxia.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_categorie_ticket ADD PRIMARY KEY pk_categorie_ticket (fk_categorie, fk_ticket);
+ALTER TABLE llx_categorie_ticket ADD INDEX idx_categorie_ticket_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_ticket ADD INDEX idx_categorie_ticket_fk_ticket (fk_ticket);
+
+ALTER TABLE llx_categorie_ticket ADD CONSTRAINT fk_categorie_ticket_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_categorie_ticket ADD CONSTRAINT fk_categorie_ticket_ticket_rowid   FOREIGN KEY (fk_ticket) REFERENCES llx_ticket (rowid);
diff --git a/htdocs/install/mysql/tables/llx_categorie_ticket.sql b/htdocs/install/mysql/tables/llx_categorie_ticket.sql
new file mode 100644
index 00000000000..16ab92522c6
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_categorie_ticket.sql
@@ -0,0 +1,21 @@
+-- Copyright (C) 2021 EOXIA <dev@eoxia.com>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+
+create table llx_categorie_ticket
+(
+  fk_categorie  integer NOT NULL,
+  fk_ticket    integer NOT NULL,
+  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 e3a075933c2..5b8a78c7bf8 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -77,7 +77,7 @@ create table llx_commande
   extraparams				varchar(255),					-- for stock other parameters with json format
   
   fk_multicurrency			integer,
-  multicurrency_code		varchar(255),
+  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,
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
index 56486b551c8..e7d1d7b6c1d 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
@@ -70,7 +70,7 @@ create table llx_commande_fournisseur
   extraparams				varchar(255),					-- for stock other parameters with json format
 
   fk_multicurrency			integer,
-  multicurrency_code		varchar(255),
+  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,
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
index b5f85fea250..974e10c09ff 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
@@ -36,5 +36,6 @@ create table llx_commande_fournisseur_dispatch
   sellby         date DEFAULT NULL,
   status         integer,
   datec          datetime,
-  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  cost_price     double(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
index c7a7f8ecf7f..f6092bc4c74 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
@@ -29,10 +29,10 @@ create table llx_commande_fournisseurdet
   label                      varchar(255),              -- product label
   description                text,
   vat_src_code               varchar(10)  DEFAULT '',   -- Vat code used as source of vat fields. Not strict foreign key here.
-  tva_tx                     double(6,3)  DEFAULT 0,    -- taux tva
-  localtax1_tx               double(6,3)  DEFAULT 0,    -- localtax1 rate
+  tva_tx                     double(7,4)  DEFAULT 0,    -- taux tva
+  localtax1_tx               double(7,4)  DEFAULT 0,    -- localtax1 rate
   localtax1_type             varchar(10)  NULL,         -- localtax1 type
-  localtax2_tx               double(6,3)  DEFAULT 0,    -- localtax2 rate
+  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
@@ -53,7 +53,7 @@ create table llx_commande_fournisseurdet
   fk_unit                    integer      DEFAULT NULL,
   
   fk_multicurrency           integer,
-  multicurrency_code         varchar(255),
+  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,
diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql
index c7b94a46add..d269e2ddfe2 100644
--- a/htdocs/install/mysql/tables/llx_commandedet.sql
+++ b/htdocs/install/mysql/tables/llx_commandedet.sql
@@ -29,10 +29,10 @@ create table llx_commandedet
   label							varchar(255) DEFAULT NULL,
   description					text,
   vat_src_code					varchar(10)  DEFAULT '',		 -- Vat code used as source of vat fields. Not strict foreign key here.
-  tva_tx						double(6,3),	                 -- Vat rate
-  localtax1_tx					double(6,3)  DEFAULT 0,			 -- localtax1 rate
+  tva_tx						double(7,4),	                 -- Vat rate
+  localtax1_tx					double(7,4)  DEFAULT 0,			 -- localtax1 rate
   localtax1_type			 	varchar(10)  NULL, 				 -- localtax1 type
-  localtax2_tx					double(6,3)  DEFAULT 0,			 -- localtax2 rate
+  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
@@ -62,7 +62,7 @@ create table llx_commandedet
   fk_commandefourndet			integer DEFAULT NULL,            -- link to detail line of commande fourn (resplenish)
   
   fk_multicurrency				integer,
-  multicurrency_code			varchar(255),
+  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,
diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql
index bbe19955e33..075de80270d 100644
--- a/htdocs/install/mysql/tables/llx_contratdet.sql
+++ b/htdocs/install/mysql/tables/llx_contratdet.sql
@@ -38,10 +38,10 @@ create table llx_contratdet
   date_cloture          datetime,
 
   vat_src_code			varchar(10)   DEFAULT '',		   -- Vat code used as source of vat fields. Not strict foreign key here.
-  tva_tx                double(6,3)   DEFAULT 0, 	       -- taux tva
-  localtax1_tx		    double(6,3)   DEFAULT 0,           -- local tax 1 rate
+  tva_tx                double(7,4)   DEFAULT 0, 	       -- taux tva
+  localtax1_tx		    double(7,4)   DEFAULT 0,           -- local tax 1 rate
   localtax1_type		varchar(10)	  	 NULL, 		       -- localtax1 type
-  localtax2_tx		    double(6,3)   DEFAULT 0,           -- local tax 2 rate
+  localtax2_tx		    double(7,4)   DEFAULT 0,           -- local tax 2 rate
   localtax2_type		varchar(10)	  	 NULL, 			   -- localtax2 type
   qty                   real          NOT NULL,            -- quantity
   remise_percent        real          DEFAULT 0,    	   -- pourcentage de remise
@@ -66,7 +66,7 @@ create table llx_contratdet
   fk_unit               integer       DEFAULT NULL,
 
   fk_multicurrency		integer,
-  multicurrency_code			varchar(255),
+  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,
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_tag.key.sql b/htdocs/install/mysql/tables/llx_element_tag.key.sql
new file mode 100644
index 00000000000..d3a0b38afa9
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_element_tag.key.sql
@@ -0,0 +1,21 @@
+-- ============================================================================
+-- Copyright (C) 2021 Maxime Kohlhaas       <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_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);
diff --git a/htdocs/install/mysql/tables/llx_element_tag.sql b/htdocs/install/mysql/tables/llx_element_tag.sql
new file mode 100644
index 00000000000..d43ced98130
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_element_tag.sql
@@ -0,0 +1,25 @@
+-- ============================================================================
+-- Copyright (C) 2021 Maxime Kohlhaas       <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_element_tag
+(
+  rowid integer AUTO_INCREMENT PRIMARY KEY,
+  fk_categorie  integer NOT NULL,
+  fk_element  integer NOT NULL,
+  import_key    varchar(14)
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
index c45a3dcd1c4..deda90cbdcd 100644
--- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
+++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
@@ -19,7 +19,7 @@ CREATE TABLE llx_emailcollector_emailcollectoraction(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
 	fk_emailcollector INTEGER NOT NULL,
 	type varchar(128) NOT NULL, 
-	actionparam varchar(255) NULL, 
+	actionparam text NULL, 
 	date_creation datetime NOT NULL, 
 	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql
index be49978f6b7..b2e814c15c6 100644
--- a/htdocs/install/mysql/tables/llx_entrepot.sql
+++ b/htdocs/install/mysql/tables/llx_entrepot.sql
@@ -35,9 +35,10 @@ create table llx_entrepot
   fk_pays         integer DEFAULT 0,
   phone           varchar(20),                  -- phone number
   fax             varchar(20),                  -- fax number
+  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,
   model_pdf       varchar(255),
-  import_key	    varchar(14),
+  import_key	  varchar(14),
   fk_parent       integer DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee.sql b/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee.sql
index b505f8f6a31..d6139f48f21 100644
--- a/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee.sql
+++ b/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee.sql
@@ -28,7 +28,7 @@ CREATE TABLE llx_eventorganization_conferenceorboothattendee(
 	note_public text, 
 	note_private text, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer, 
 	fk_user_modif integer, 
 	last_main_doc varchar(255), 
diff --git a/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee_extrafields.sql b/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee_extrafields.sql
index 5455314ff06..98a2bc5385f 100644
--- a/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_eventorganization_conferenceorboothattendee_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_expensereport.sql b/htdocs/install/mysql/tables/llx_expensereport.sql
index 36bd5efb50c..e5c44ec0f36 100644
--- a/htdocs/install/mysql/tables/llx_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport.sql
@@ -56,7 +56,7 @@ CREATE TABLE llx_expensereport (
   last_main_doc		varchar(255),					-- relative filepath+filename of last main generated document
   
   fk_multicurrency        integer,
-  multicurrency_code      varchar(255),
+  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,
diff --git a/htdocs/install/mysql/tables/llx_expensereport_det.sql b/htdocs/install/mysql/tables/llx_expensereport_det.sql
index bd97600e2c8..7855ad16643 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_det.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_det.sql
@@ -31,10 +31,10 @@ CREATE TABLE llx_expensereport_det
    value_unit                   double(24,8) NOT NULL,          -- P.U. TTC (example 120)
    remise_percent real,
    vat_src_code					varchar(10)  DEFAULT '',		-- Vat code used as source of vat fields. Not strict foreign key here.
-   tva_tx						double(6,3),					-- Vat rate
-   localtax1_tx               	double(6,3)  DEFAULT 0,    		-- localtax1 rate
+   tva_tx						double(7,4),					-- Vat rate
+   localtax1_tx               	double(7,4)  DEFAULT 0,    		-- localtax1 rate
    localtax1_type			 	varchar(10)	  	 NULL, 			-- localtax1 type
-   localtax2_tx               	double(6,3)  DEFAULT 0,    		-- localtax2 rate
+   localtax2_tx               	double(7,4)  DEFAULT 0,    		-- localtax2 rate
    localtax2_type			 	varchar(10)	  	 NULL, 			-- localtax2 type
    total_ht double(24,8) DEFAULT 0 NOT NULL,
    total_tva double(24,8) DEFAULT 0 NOT NULL,
@@ -45,7 +45,7 @@ CREATE TABLE llx_expensereport_det
    info_bits					integer DEFAULT 0,				-- TVA NPR ou non
    special_code					integer DEFAULT 0,			    -- code for special lines
    fk_multicurrency             integer,
-   multicurrency_code           varchar(255),
+   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,
diff --git a/htdocs/install/mysql/tables/llx_expensereport_ik.sql b/htdocs/install/mysql/tables/llx_expensereport_ik.sql
index 839fbac8e9a..d2b1fd80815 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_ik.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_ik.sql
@@ -5,7 +5,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
diff --git a/htdocs/install/mysql/tables/llx_expensereport_rules.sql b/htdocs/install/mysql/tables/llx_expensereport_rules.sql
index ae8f9b09496..1892ead3500 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_rules.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_rules.sql
@@ -4,7 +4,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
index ecdc44915bb..081213868cc 100644
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -42,7 +42,7 @@ create table llx_facture
   tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,								-- last modification date
   date_closing				datetime,						-- date de cloture
   paye					smallint DEFAULT 0 NOT NULL,
-  --amount				double(24,8)     DEFAULT 0 NOT NULL,
+
   remise_percent		real     DEFAULT 0,						-- remise relative
   remise_absolue		real     DEFAULT 0,						-- remise absolue
   remise				real     DEFAULT 0,						-- remise totale calculee
@@ -100,7 +100,7 @@ create table llx_facture
   extraparams			varchar(255),							-- for other parameters with json format
   
   fk_multicurrency		integer,
-  multicurrency_code			varchar(255),
+  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,
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql
index 1b7401898ab..9ceff4e4fa9 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql
@@ -61,6 +61,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
 
@@ -83,7 +84,7 @@ create table llx_facture_fourn
   extraparams			varchar(255),					-- for stock other parameters with json format
   
   fk_multicurrency		integer,
-  multicurrency_code			varchar(255),
+  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,
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql
index 40b613d4ac5..30f57fa184b 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql
@@ -33,10 +33,10 @@ create table llx_facture_fourn_det
   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(6,3),  -- TVA taux product/service
-  localtax1_tx      double(6,3)  DEFAULT 0,    -- localtax1 rate
+  tva_tx            double(7,4),  -- TVA taux product/service
+  localtax1_tx      double(7,4)  DEFAULT 0,    -- localtax1 rate
   localtax1_type	varchar(10)	  NULL, 		-- localtax1 type
-  localtax2_tx      double(6,3)  DEFAULT 0,    -- localtax2 rate
+  localtax2_tx      double(7,4)  DEFAULT 0,    -- localtax2 rate
   localtax2_type	varchar(10)	  NULL, 		-- localtax2 type
   total_ht          double(24,8), -- Total line price of product excluding tax
   tva               double(24,8), -- Total TVA of line
@@ -54,7 +54,7 @@ create table llx_facture_fourn_det
   fk_unit         integer    DEFAULT NULL,
   
   fk_multicurrency		integer,
-  multicurrency_code			varchar(255),
+  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,
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_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_rec.extrafields.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_rec.extrafields.key.sql
new file mode 100644
index 00000000000..86dddf51624
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_rec.extrafields.key.sql
@@ -0,0 +1,19 @@
+-- ===================================================================
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- 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_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_facture_fourn_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_rec.key.sql
new file mode 100644
index 00000000000..b3065fdb5d6
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_rec.key.sql
@@ -0,0 +1,29 @@
+-- ============================================================================
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- 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 (ref, 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);
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_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql
index c3cb6aeed46..697e0bc4510 100644
--- a/htdocs/install/mysql/tables/llx_facture_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec.sql
@@ -35,7 +35,7 @@ create table llx_facture_rec
   remise_percent     real     DEFAULT 0,
   remise_absolue     real     DEFAULT 0,
   
-  vat_src_code		 varchar(10)  DEFAULT '',			-- Vat code used as source of vat fields. Not strict foreign key here.
+  vat_src_code		 varchar(10)  DEFAULT '',			-- TODO Remove this. Field is inside the table of lines
   total_tva          double(24,8)     DEFAULT 0,
   localtax1			 double(24,8)     DEFAULT 0,           -- amount localtax1
   localtax2          double(24,8)     DEFAULT 0,           -- amount localtax2
@@ -57,7 +57,7 @@ create table llx_facture_rec
   modelpdf           varchar(255),
 
   fk_multicurrency          integer,
-  multicurrency_code        varchar(255),
+  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,
diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql
index 3b1ea86cc0e..9fabf237c62 100644
--- a/htdocs/install/mysql/tables/llx_facturedet.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet.sql
@@ -31,10 +31,10 @@ create table llx_facturedet
   label							varchar(255) DEFAULT NULL,
   description					text,
   vat_src_code					varchar(10)  DEFAULT '',			-- Vat code used as source of vat fields. Not strict foreign key here.
-  tva_tx						double(6,3),						-- Vat rate (example 20%)
-  localtax1_tx               	double(6,3)  DEFAULT 0,    		 	-- localtax1 rate
+  tva_tx						double(7,4),						-- Vat rate (example 20%)
+  localtax1_tx               	double(7,4)  DEFAULT 0,    		 	-- localtax1 rate
   localtax1_type			 	varchar(10)	 NULL, 				 	-- localtax1 type
-  localtax2_tx               	double(6,3)  DEFAULT 0,    		 	-- localtax2 rate
+  localtax2_tx               	double(7,4)  DEFAULT 0,    		 	-- localtax2 rate
   localtax2_type			 	varchar(10)	 NULL, 				 	-- localtax2 type
   qty							real,								-- Quantity (exemple 2). Note: for credit note, the price is negative, not the quantity. Like for discount, price is negative, not quantity.
   remise_percent				real       DEFAULT 0,				-- % de la remise ligne (exemple 20%)
@@ -70,7 +70,7 @@ create table llx_facturedet
   fk_user_modif     integer,                						-- user making last change
 
   fk_multicurrency				integer,
-  multicurrency_code			varchar(255),
+  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,
diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.key.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.key.sql
index 2580c33a7ab..616df5ec148 100644
--- a/htdocs/install/mysql/tables/llx_facturedet_rec.key.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet_rec.key.sql
@@ -5,7 +5,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql
index a66d7ccb0c3..c84c517d390 100644
--- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql
@@ -30,10 +30,10 @@ create table llx_facturedet_rec
   label				varchar(255) DEFAULT NULL,
   description		text,
   vat_src_code					varchar(10)  DEFAULT '',			-- Vat code used as source of vat fields. Not strict foreign key here.
-  tva_tx			double(6,3),	             	-- taux tva
-  localtax1_tx      double(6,3) DEFAULT 0,    		-- localtax1 rate
+  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(6,3) DEFAULT 0,    		-- localtax2 rate
+  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
@@ -62,7 +62,7 @@ create table llx_facturedet_rec
   fk_user_modif     integer,                						-- user making last change
     
   fk_multicurrency          integer,
-  multicurrency_code        varchar(255),
+  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,
diff --git a/htdocs/install/mysql/tables/llx_holiday.sql b/htdocs/install/mysql/tables/llx_holiday.sql
index 3cd5727d867..992f9502394 100644
--- a/htdocs/install/mysql/tables/llx_holiday.sql
+++ b/htdocs/install/mysql/tables/llx_holiday.sql
@@ -33,8 +33,10 @@ 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
-fk_user_valid  integer DEFAULT NULL,			-- user approval
+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)
+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,
 fk_user_refuse integer DEFAULT NULL,
 date_cancel    DATETIME DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.key.sql b/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.key.sql
new file mode 100644
index 00000000000..804bc6b4803
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.key.sql
@@ -0,0 +1,29 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_evaluation ADD INDEX idx_hrm_evaluation_rowid (rowid);
+ALTER TABLE llx_hrm_evaluation ADD INDEX idx_hrm_evaluation_ref (ref);
+ALTER TABLE llx_hrm_evaluation ADD CONSTRAINT llx_hrm_evaluation_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_hrm_evaluation ADD INDEX idx_hrm_evaluation_status (status);
+-- END MODULEBUILDER INDEXES
+
+--ALTER TABLE llx_hrm_evaluation ADD UNIQUE INDEX uk_hrm_evaluation_fieldxy(fieldx, fieldy);
+
+--ALTER TABLE llx_hrm_evaluation ADD CONSTRAINT llx_hrm_evaluation_fk_field FOREIGN KEY (fk_field) REFERENCES llx_hrm_myotherobject(rowid);
+
diff --git a/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.sql
new file mode 100644
index 00000000000..7327d1403dc
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.sql
@@ -0,0 +1,37 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_evaluation(
+	-- BEGIN MODULEBUILDER FIELDS
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	ref varchar(128) DEFAULT '(PROV)' 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 smallint NOT NULL, 
+	date_eval date,
+	fk_user integer NOT NULL, 
+	fk_job integer NOT NULL
+    -- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_hrm_evaluation_extrafields-hrm.key.sql b/htdocs/install/mysql/tables/llx_hrm_evaluation_extrafields-hrm.key.sql
new file mode 100644
index 00000000000..ff9ba9d6cb6
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_evaluation_extrafields-hrm.key.sql
@@ -0,0 +1,21 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_evaluation_extrafields ADD INDEX idx_evaluation_fk_object(fk_object);
+-- END MODULEBUILDER INDEXES
diff --git a/htdocs/install/mysql/tables/llx_hrm_evaluation_extrafields-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_evaluation_extrafields-hrm.sql
new file mode 100644
index 00000000000..fe600797141
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_evaluation_extrafields-hrm.sql
@@ -0,0 +1,25 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_evaluation_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_hrm_evaluationdet-hrm.key.sql b/htdocs/install/mysql/tables/llx_hrm_evaluationdet-hrm.key.sql
new file mode 100644
index 00000000000..5a3bbc844c2
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_evaluationdet-hrm.key.sql
@@ -0,0 +1,29 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_evaluationdet ADD INDEX idx_hrm_evaluationdet_rowid (rowid);
+ALTER TABLE llx_hrm_evaluationdet ADD CONSTRAINT llx_hrm_evaluationdet_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_hrm_evaluationdet ADD INDEX idx_hrm_evaluationdet_fk_skill (fk_skill);
+ALTER TABLE llx_hrm_evaluationdet ADD INDEX idx_hrm_evaluationdet_fk_evaluation (fk_evaluation);
+-- END MODULEBUILDER INDEXES
+
+--ALTER TABLE llx_hrm_evaluationdet ADD UNIQUE INDEX uk_hrm_evaluationdet_fieldxy(fieldx, fieldy);
+
+ALTER TABLE llx_hrm_evaluationdet ADD CONSTRAINT llx_hrm_evaluationdet_fk_evaluation FOREIGN KEY (fk_evaluation) REFERENCES llx_hrm_evaluation(rowid);
+
diff --git a/htdocs/install/mysql/tables/llx_hrm_evaluationdet-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_evaluationdet-hrm.sql
new file mode 100644
index 00000000000..4faa0a4bb91
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_evaluationdet-hrm.sql
@@ -0,0 +1,31 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_evaluationdet
+(
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	date_creation datetime NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	fk_user_creat integer NOT NULL,
+	fk_user_modif integer,
+	fk_skill integer NOT NULL,
+	fk_evaluation integer NOT NULL,
+	rankorder integer NOT NULL,
+	required_rank integer NOT NULL,
+	import_key varchar(14)
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_hrm_evaluationdet_extrafields-hrm.key.sql b/htdocs/install/mysql/tables/llx_hrm_evaluationdet_extrafields-hrm.key.sql
new file mode 100644
index 00000000000..5072e2eb67b
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_evaluationdet_extrafields-hrm.key.sql
@@ -0,0 +1,21 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_evaluationdet_extrafields ADD INDEX idx_evaluationdet_fk_object(fk_object);
+-- END MODULEBUILDER INDEXES
diff --git a/htdocs/install/mysql/tables/llx_hrm_evaluationdet_extrafields-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_evaluationdet_extrafields-hrm.sql
new file mode 100644
index 00000000000..44151cf78d0
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_evaluationdet_extrafields-hrm.sql
@@ -0,0 +1,24 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_evaluationdet_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_hrm_job-hrm.key.sql b/htdocs/install/mysql/tables/llx_hrm_job-hrm.key.sql
new file mode 100644
index 00000000000..6fe7da6016e
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_job-hrm.key.sql
@@ -0,0 +1,27 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_job ADD INDEX idx_hrm_job_rowid (rowid);
+ALTER TABLE llx_hrm_job ADD INDEX idx_hrm_job_label (label);
+-- END MODULEBUILDER INDEXES
+
+--ALTER TABLE llx_hrm_job ADD UNIQUE INDEX uk_hrm_job_fieldxy(fieldx, fieldy);
+
+--ALTER TABLE llx_hrm_job ADD CONSTRAINT llx_hrm_job_fk_field FOREIGN KEY (fk_field) REFERENCES llx_hrm_myotherobject(rowid);
+
diff --git a/htdocs/install/mysql/tables/llx_hrm_job-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_job-hrm.sql
new file mode 100644
index 00000000000..106d847b136
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_job-hrm.sql
@@ -0,0 +1,32 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_job(
+
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    label varchar(255) NOT NULL,
+	description text, 
+	date_creation datetime NOT NULL, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
+	deplacement varchar(255),
+    note_public text,
+    note_private text,
+    fk_user_creat integer,
+    fk_user_modif integer
+
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_hrm_job_extrafields-hrm.key.sql b/htdocs/install/mysql/tables/llx_hrm_job_extrafields-hrm.key.sql
new file mode 100644
index 00000000000..b5226dc4c38
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_job_extrafields-hrm.key.sql
@@ -0,0 +1,21 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_job_extrafields ADD INDEX idx_job_fk_object(fk_object);
+-- END MODULEBUILDER INDEXES
diff --git a/htdocs/install/mysql/tables/llx_hrm_job_extrafields-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_job_extrafields-hrm.sql
new file mode 100644
index 00000000000..f580abea39e
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_job_extrafields-hrm.sql
@@ -0,0 +1,25 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_job_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_hrm_job_user-hrm.key.sql b/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.key.sql
new file mode 100644
index 00000000000..ead2f7f3b18
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.key.sql
@@ -0,0 +1,27 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_job_user ADD INDEX idx_hrm_job_user_rowid (rowid);
+-- ALTER TABLE llx_hrm_job_user ADD INDEX idx_hrm_job_user_ref (ref);
+-- END MODULEBUILDER INDEXES
+
+--ALTER TABLE llx_hrm_job_user ADD UNIQUE INDEX uk_hrm_job_user_fieldxy(fieldx, fieldy);
+
+--ALTER TABLE llx_hrm_job_user ADD CONSTRAINT llx_hrm_job_user_fk_field FOREIGN KEY (fk_field) REFERENCES llx_hrm_myotherobject(rowid);
+
diff --git a/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql
new file mode 100644
index 00000000000..4e10bf64bf8
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql
@@ -0,0 +1,36 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_job_user(
+    -- BEGIN MODULEBUILDER FIELDS
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	-- ref varchar(128) NOT NULL,
+	description text,
+	date_creation datetime NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	fk_contrat integer,
+	fk_user integer,
+	fk_job integer NOT NULL,
+	date_start datetime,
+	date_end datetime,
+	abort_comment varchar(255),
+    note_public text,
+    note_private text,
+    fk_user_creat integer,
+    fk_user_modif integer
+	-- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_hrm_skill-hrm.key.sql b/htdocs/install/mysql/tables/llx_hrm_skill-hrm.key.sql
new file mode 100644
index 00000000000..b3196bf8522
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_skill-hrm.key.sql
@@ -0,0 +1,28 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_skill ADD INDEX idx_hrm_skill_rowid (rowid);
+ALTER TABLE llx_hrm_skill ADD CONSTRAINT llx_hrm_skill_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_hrm_skill ADD INDEX idx_hrm_skill_skill_type (skill_type);
+-- END MODULEBUILDER INDEXES
+
+--ALTER TABLE llx_hrm_skill ADD UNIQUE INDEX uk_hrm_skill_fieldxy(fieldx, fieldy);
+
+--ALTER TABLE llx_hrm_skill ADD CONSTRAINT llx_hrm_skill_fk_field FOREIGN KEY (fk_field) REFERENCES llx_hrm_myotherobject(rowid);
+
diff --git a/htdocs/install/mysql/tables/llx_hrm_skill-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_skill-hrm.sql
new file mode 100644
index 00000000000..441fdcf8505
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_skill-hrm.sql
@@ -0,0 +1,35 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_skill(
+	-- BEGIN MODULEBUILDER FIELDS
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	label varchar(255), 
+	description 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, 
+	required_level integer NOT NULL, 
+	date_validite integer NOT NULL, 
+	temps_theorique double(24,8) NOT NULL, 
+	skill_type integer NOT NULL, 
+	note_public text, 
+	note_private text
+	-- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_hrm_skill_extrafields-hrm.key.sql b/htdocs/install/mysql/tables/llx_hrm_skill_extrafields-hrm.key.sql
new file mode 100644
index 00000000000..a4ae591731e
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_skill_extrafields-hrm.key.sql
@@ -0,0 +1,21 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_skill_extrafields ADD INDEX idx_skill_fk_object(fk_object);
+-- END MODULEBUILDER INDEXES
diff --git a/htdocs/install/mysql/tables/llx_hrm_skill_extrafields-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_skill_extrafields-hrm.sql
new file mode 100644
index 00000000000..15bf4da0464
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_skill_extrafields-hrm.sql
@@ -0,0 +1,25 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_skill_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_hrm_skilldet-hrm.key.sql b/htdocs/install/mysql/tables/llx_hrm_skilldet-hrm.key.sql
new file mode 100644
index 00000000000..00dd26e6817
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_skilldet-hrm.key.sql
@@ -0,0 +1,27 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_skilldet ADD INDEX idx_hrm_skilldet_rowid (rowid);
+ALTER TABLE llx_hrm_skilldet ADD CONSTRAINT llx_hrm_skilldet_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+-- END MODULEBUILDER INDEXES
+
+--ALTER TABLE llx_hrm_skilldet ADD UNIQUE INDEX uk_hrm_skilldet_fieldxy(fieldx, fieldy);
+
+ALTER TABLE llx_hrm_skilldet ADD CONSTRAINT llx_hrm_skilldet_fk_skill FOREIGN KEY (fk_skill) REFERENCES llx_hrm_skill(rowid);
+
diff --git a/htdocs/install/mysql/tables/llx_hrm_skilldet-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_skilldet-hrm.sql
new file mode 100644
index 00000000000..18a1cdcf9dc
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_skilldet-hrm.sql
@@ -0,0 +1,26 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_skilldet(
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	fk_skill integer NOT NULL,
+	rankorder integer NOT NULL DEFAULT '1',
+	description text,
+	fk_user_creat integer NOT NULL,
+	fk_user_modif integer
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_hrm_skillrank-hrm.key.sql b/htdocs/install/mysql/tables/llx_hrm_skillrank-hrm.key.sql
new file mode 100644
index 00000000000..c8cc19641b2
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_skillrank-hrm.key.sql
@@ -0,0 +1,27 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_skillrank ADD INDEX idx_hrm_skillrank_rowid (rowid);
+ALTER TABLE llx_hrm_skillrank ADD INDEX idx_hrm_skillrank_fk_skill (fk_skill);
+ALTER TABLE llx_hrm_skillrank ADD CONSTRAINT llx_hrm_skillrank_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+-- END MODULEBUILDER INDEXES
+
+--ALTER TABLE llx_hrm_skillrank ADD UNIQUE INDEX uk_hrm_skillrank_fieldxy(fieldx, fieldy);
+
+ALTER TABLE llx_hrm_skillrank ADD CONSTRAINT llx_hrm_skillrank_fk_skill FOREIGN KEY (fk_skill) REFERENCES llx_hrm_skill(rowid);
+
diff --git a/htdocs/install/mysql/tables/llx_hrm_skillrank-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_skillrank-hrm.sql
new file mode 100644
index 00000000000..4c4109ee7f7
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_hrm_skillrank-hrm.sql
@@ -0,0 +1,29 @@
+-- Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
+-- Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@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_hrm_skillrank
+(
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	fk_skill integer NOT NULL,
+	rankorder integer NOT NULL,
+	fk_object integer NOT NULL,
+	date_creation datetime NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	fk_user_creat integer NOT NULL,
+	fk_user_modif integer,
+	objecttype varchar(128) NOT NULL
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_intracommreport.sql b/htdocs/install/mysql/tables/llx_intracommreport-intracommreport.sql
similarity index 94%
rename from htdocs/install/mysql/tables/llx_intracommreport.sql
rename to htdocs/install/mysql/tables/llx_intracommreport-intracommreport.sql
index d3d2956e4ab..c12f9eb0862 100644
--- a/htdocs/install/mysql/tables/llx_intracommreport.sql
+++ b/htdocs/install/mysql/tables/llx_intracommreport-intracommreport.sql
@@ -28,5 +28,5 @@ create table llx_intracommreport
   content_xml		text,
   type_export		varchar(10),
   datec             datetime,
-  tms               timestamp
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
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 95%
rename from htdocs/install/mysql/tables/llx_inventory.sql
rename to htdocs/install/mysql/tables/llx_inventory-stock.sql
index aa35ebb0c42..c25ccb9767b 100644
--- a/htdocs/install/mysql/tables/llx_inventory.sql
+++ b/htdocs/install/mysql/tables/llx_inventory-stock.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_inventory
 ( 
   rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
   entity integer DEFAULT 0, 
-  ref varchar(48),
+  ref varchar(48),							-- We will also use this code as inventory code
   date_creation datetime DEFAULT NULL,
   tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
   fk_user_creat	integer,					-- user making creation
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 68%
rename from htdocs/install/mysql/tables/llx_inventorydet.sql
rename to htdocs/install/mysql/tables/llx_inventorydet-stock.sql
index ce23fe0f749..8b75f68460d 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet-stock.sql
@@ -25,9 +25,10 @@ CREATE TABLE llx_inventorydet
 	fk_inventory integer DEFAULT 0, 
 	fk_warehouse integer DEFAULT 0,
 	fk_product integer DEFAULT 0,  
-	batch varchar(128) DEFAULT NULL,	 -- Lot or serial number
-	qty_stock double DEFAULT NULL,   -- The targeted value. can be filled during draft edition
-	qty_view double DEFAULT NULL, 	   -- must be filled once regulation is done
-	qty_regulated double DEFAULT NULL  -- must be filled once regulation is done
+	batch varchar(128) DEFAULT NULL,   -- Lot or serial number
+	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.
+	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 86%
rename from htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
rename to htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord-knowledgemanagement.sql
index 65c8add25c4..a12c73b9cde 100644
--- a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
+++ b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord-knowledgemanagement.sql
@@ -16,11 +16,13 @@
 
 CREATE TABLE llx_knowledgemanagement_knowledgerecord(
 	-- BEGIN MODULEBUILDER FIELDS
-	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	entity integer DEFAULT 1 NOT NULL,  -- multi company id
 	ref varchar(128) NOT NULL, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	last_main_doc varchar(255), 
+	lang varchar(6),
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	fk_user_valid integer, 
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 91%
rename from htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields.sql
rename to htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields-knowledgemanagement.sql
index 6498324ed8c..5f7e09f5901 100644
--- a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields-knowledgemanagement.sql
@@ -16,7 +16,7 @@
 create table llx_knowledgemanagement_knowledgerecord_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_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.sql b/htdocs/install/mysql/tables/llx_loan_schedule-loan.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_loan_schedule.sql
rename to htdocs/install/mysql/tables/llx_loan_schedule-loan.sql
diff --git a/htdocs/install/mysql/tables/llx_mrp_mo.sql b/htdocs/install/mysql/tables/llx_mrp_mo.sql
index de1933ccfed..14cfdf36c1e 100644
--- a/htdocs/install/mysql/tables/llx_mrp_mo.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_mo.sql
@@ -17,8 +17,9 @@
 CREATE TABLE llx_mrp_mo(
 	-- BEGIN MODULEBUILDER FIELDS
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
-	ref varchar(128) DEFAULT '(PROV)' NOT NULL, 
 	entity integer DEFAULT 1 NOT NULL, 
+	ref varchar(128) DEFAULT '(PROV)' NOT NULL, 
+	mrptype integer DEFAULT 0,                  -- 0 for a manufacture MO, 1 for a dismantle MO 
 	label varchar(255), 
 	qty real NOT NULL,
 	fk_warehouse integer,
@@ -38,6 +39,8 @@ CREATE TABLE llx_mrp_mo(
 	date_start_planned datetime, 
 	date_end_planned datetime, 
 	fk_bom integer, 
-	fk_project integer
-	-- END MODULEBUILDER FIELDS
-) ENGINE=innodb;
\ No newline at end of file
+	fk_project integer,
+	last_main_doc varchar(255),
+    fk_parent_line integer
+    -- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql
index f15f651f7ae..1728b698f34 100644
--- a/htdocs/install/mysql/tables/llx_paiement_facture.sql
+++ b/htdocs/install/mysql/tables/llx_paiement_facture.sql
@@ -23,7 +23,7 @@ create table llx_paiement_facture
   fk_facture      integer,
   amount          double(24,8)     DEFAULT 0,
   
-  multicurrency_code		varchar(255),
+  multicurrency_code		varchar(3),
   multicurrency_tx		double(24,8) DEFAULT 1,
   multicurrency_amount	double(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql
index cb1b8441444..ab2e2bfa0f2 100644
--- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql
+++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql
@@ -25,7 +25,7 @@ create table llx_paiementfourn_facturefourn
   fk_facturefourn  INTEGER DEFAULT NULL,
   amount double(24,8) DEFAULT 0,
   
-  multicurrency_code	varchar(255),
+  multicurrency_code	varchar(3),
   multicurrency_tx		double(24,8) DEFAULT 1,
   multicurrency_amount	double(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_partnership.key.sql b/htdocs/install/mysql/tables/llx_partnership-partnership.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_partnership.key.sql
rename to htdocs/install/mysql/tables/llx_partnership-partnership.key.sql
diff --git a/htdocs/install/mysql/tables/llx_partnership.sql b/htdocs/install/mysql/tables/llx_partnership-partnership.sql
similarity index 93%
rename from htdocs/install/mysql/tables/llx_partnership.sql
rename to htdocs/install/mysql/tables/llx_partnership-partnership.sql
index 6ab312f8875..e3a5cb37e05 100644
--- a/htdocs/install/mysql/tables/llx_partnership.sql
+++ b/htdocs/install/mysql/tables/llx_partnership-partnership.sql
@@ -20,6 +20,7 @@ CREATE TABLE llx_partnership(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
 	ref varchar(128) DEFAULT '(PROV)' NOT NULL, 
 	status smallint NOT NULL DEFAULT '0', 
+	fk_type integer DEFAULT 0 NOT NULL,
 	fk_soc integer, 
 	fk_member integer, 
 	date_partnership_start date NOT NULL, 
@@ -28,7 +29,7 @@ CREATE TABLE llx_partnership(
 	reason_decline_or_cancel text NULL,
 	date_creation datetime NOT NULL, 
 	fk_user_creat integer NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_modif integer, 
 	note_private text, 
 	note_public text, 
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_vat.sql b/htdocs/install/mysql/tables/llx_payment_vat.sql
index 4ebb5bb4af3..6975a5d3a35 100644
--- a/htdocs/install/mysql/tables/llx_payment_vat.sql
+++ b/htdocs/install/mysql/tables/llx_payment_vat.sql
@@ -22,7 +22,7 @@ create table llx_payment_vat
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_tva          integer,
   datec           datetime,           -- date de creation
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep           datetime,           -- payment date
   amount          double(24,8) DEFAULT 0,
   fk_typepaiement integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index 4aad3393137..80e3f90b828 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -47,11 +47,11 @@ create table llx_product
   price_base_type               varchar(3)   DEFAULT 'HT',
   cost_price                    double(24,8) DEFAULT NULL,          -- Cost price without tax. Can be used for margin calculation.
   default_vat_code              varchar(10),                        -- Same code than into table llx_c_tva (but no constraints). Should be used in priority to find default vat, npr, localtaxes for product.
-  tva_tx                        double(6,3),                        -- Default VAT rate of product
+  tva_tx                        double(7,4),                        -- Default VAT rate of product
   recuperableonly               integer NOT NULL DEFAULT '0',       -- French NPR VAT
-  localtax1_tx                  double(6,3)  DEFAULT 0,
+  localtax1_tx                  double(7,4)  DEFAULT 0,
   localtax1_type                varchar(10)  NOT NULL DEFAULT '0',
-  localtax2_tx                  double(6,3)  DEFAULT 0,
+  localtax2_tx                  double(7,4)  DEFAULT 0,
   localtax2_type                varchar(10)  NOT NULL DEFAULT '0',
   fk_user_author                integer DEFAULT NULL,               -- user making creation
   fk_user_modif                 integer,                            -- user making last change
@@ -103,5 +103,8 @@ create table llx_product
   desiredstock                  float      DEFAULT 0,
   fk_unit                       integer      DEFAULT NULL,
   price_autogen                 tinyint      DEFAULT 0,
-  fk_project                    integer      DEFAULT NULL           -- Used when product was generated by a project or is specifif to a project
+  fk_project                    integer      DEFAULT NULL,           -- Used when product was generated by a project or is specifif to a project
+  mandatory_period              tinyint      DEFAULT 0,               -- is used to signal to the user that the start and end dates are mandatory for this type of product the fk_product_type == 1 (service) (non-blocking action)
+
+  fk_default_bom                integer      DEFAULT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_association.sql b/htdocs/install/mysql/tables/llx_product_association.sql
index 91cc14882f1..f97e2aa6a0b 100644
--- a/htdocs/install/mysql/tables/llx_product_association.sql
+++ b/htdocs/install/mysql/tables/llx_product_association.sql
@@ -23,6 +23,7 @@ create table llx_product_association
   fk_product_pere       integer NOT NULL DEFAULT 0, -- id du produit maitre
   fk_product_fils       integer NOT NULL DEFAULT 0, -- id du sous-produit
   qty                   double NULL,
-  incdec                integer DEFAULT 1			-- when set to 1 changing stock of product will change stock of linked product too
+  incdec                integer DEFAULT 1, -- when set to 1 changing stock of product will change stock of linked product too
+  rang                  integer DEFAULT 0
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_product_customer_price.sql b/htdocs/install/mysql/tables/llx_product_customer_price.sql
index f0d5edf9c2f..7f843a8784e 100644
--- a/htdocs/install/mysql/tables/llx_product_customer_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_customer_price.sql
@@ -28,18 +28,18 @@ create table llx_product_customer_price
   tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product			integer NOT NULL,
   fk_soc				integer NOT NULL,
-  ref_customer			varchar(30),
+  ref_customer			varchar(128),
   price						double(24,8) DEFAULT 0,
   price_ttc					double(24,8) DEFAULT 0,
   price_min					double(24,8) DEFAULT 0,
   price_min_ttc				double(24,8) DEFAULT 0,
   price_base_type			varchar(3)   DEFAULT 'HT',
   default_vat_code			varchar(10),	         		-- Same code than into table llx_c_tva (but no constraints). Should be used in priority to find default vat, npr, localtaxes for product.
-  tva_tx					double(6,3),
+  tva_tx					double(7,4),
   recuperableonly           integer NOT NULL DEFAULT '0',   -- Other NPR VAT
-  localtax1_tx				double(6,3)  DEFAULT 0,         -- Other local VAT 1 
+  localtax1_tx				double(7,4)  DEFAULT 0,         -- Other local VAT 1 
   localtax1_type            varchar(10)  NOT NULL DEFAULT '0',
-  localtax2_tx				double(6,3)  DEFAULT 0,         -- Other local VAT 2
+  localtax2_tx				double(7,4)  DEFAULT 0,         -- Other local VAT 2
   localtax2_type            varchar(10)  NOT NULL DEFAULT '0',
   fk_user				integer,
   import_key			varchar(14)                  -- Import key
diff --git a/htdocs/install/mysql/tables/llx_product_customer_price_log.sql b/htdocs/install/mysql/tables/llx_product_customer_price_log.sql
index 29906fe7ff2..cd591b41099 100644
--- a/htdocs/install/mysql/tables/llx_product_customer_price_log.sql
+++ b/htdocs/install/mysql/tables/llx_product_customer_price_log.sql
@@ -34,11 +34,11 @@ create table llx_product_customer_price_log
   price_min_ttc				double(24,8) DEFAULT 0,
   price_base_type			varchar(3)   DEFAULT 'HT',
   default_vat_code			varchar(10),	         		-- Same code than into table llx_c_tva (but no constraints). Should be used in priority to find default vat, npr, localtaxes for product.
-  tva_tx					double(6,3),
+  tva_tx					double(7,4),
   recuperableonly           integer NOT NULL DEFAULT '0',   -- Other NPR VAT
-  localtax1_tx				double(6,3)  DEFAULT 0,         -- Other local VAT 1 
+  localtax1_tx				double(7,4)  DEFAULT 0,         -- Other local VAT 1 
   localtax1_type            varchar(10)  NOT NULL DEFAULT '0',
-  localtax2_tx				double(6,3)  DEFAULT 0,         -- Other local VAT 2
+  localtax2_tx				double(7,4)  DEFAULT 0,         -- Other local VAT 2
   localtax2_type            varchar(10)  NOT NULL DEFAULT '0',
   fk_user				integer,
  import_key			varchar(14)                  -- Import key
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
index 4e1d75dd1dd..25b295ec383 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
@@ -27,22 +27,22 @@ create table llx_product_fournisseur_price
   tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product			integer,
   fk_soc				integer,
-  ref_fourn				varchar(30),
+  ref_fourn				varchar(128),
   desc_fourn            text,
   fk_availability		integer,	   
   price					double(24,8) DEFAULT 0,		-- price without tax for quantity
   quantity				double,
   remise_percent		double NOT NULL DEFAULT 0,
   remise				double NOT NULL DEFAULT 0,
-  unitprice				double(24,8) DEFAULT 0,		-- unit price without tax
+  unitprice				double(24,8) DEFAULT 0,		-- unit price without tax (discount not taken into account, so rounding of price/quantity)
   charges				double(24,8) DEFAULT 0,		-- to store transport cost. Constant PRODUCT_CHARGES must be set to see it.
   default_vat_code	    varchar(10),
   barcode                       varchar(180) DEFAULT NULL,          -- barcode
   fk_barcode_type               integer      DEFAULT NULL,          -- barcode type
-  tva_tx				double(6,3) NOT NULL,
-  localtax1_tx		    double(6,3) DEFAULT 0,
+  tva_tx				double(7,4) NOT NULL,
+  localtax1_tx		    double(7,4) DEFAULT 0,
   localtax1_type        varchar(10)  NOT NULL DEFAULT '0',
-  localtax2_tx		    double(6,3) DEFAULT 0,
+  localtax2_tx		    double(7,4) DEFAULT 0,
   localtax2_type        varchar(10)  NOT NULL DEFAULT '0',
   info_bits				integer NOT NULL DEFAULT 0,
   fk_user				integer,
@@ -53,7 +53,7 @@ create table llx_product_fournisseur_price
   packaging			    varchar(64),
   
   fk_multicurrency		integer,
-  multicurrency_code	varchar(255),
+  multicurrency_code	varchar(3),
   multicurrency_tx			double(24,8) DEFAULT 1,
   multicurrency_unitprice   double(24,8) DEFAULT NULL,		-- unit price without tax
   multicurrency_price		double(24,8) DEFAULT NULL
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql
index cb59cc78bef..fdfc4176c0a 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql
@@ -27,7 +27,7 @@ create table llx_product_fournisseur_price_log
   fk_user                     integer,
 
   fk_multicurrency			integer,
-  multicurrency_code		varchar(255),
+  multicurrency_code		varchar(3),
   multicurrency_tx			double(24,8) DEFAULT 1,
   multicurrency_unitprice	double(24,8) DEFAULT NULL,		-- unit price without tax
   multicurrency_price		double(24,8) DEFAULT NULL
diff --git a/htdocs/install/mysql/tables/llx_product_lot.sql b/htdocs/install/mysql/tables/llx_product_lot.sql
index f8d02f19ccb..162f1c6c122 100644
--- a/htdocs/install/mysql/tables/llx_product_lot.sql
+++ b/htdocs/install/mysql/tables/llx_product_lot.sql
@@ -25,8 +25,10 @@ CREATE TABLE llx_product_lot (
   eatby           date DEFAULT NULL,			-- Eatby date
   sellby          date DEFAULT NULL, 			-- Sellby date
   eol_date      datetime NULL,
-  manufacturing_date datetime NULL,
-  scrapping_date datetime NULL,
+  manufacturing_date datetime NULL,                -- date when first manufacturing of this lot has started 
+  scrapping_date datetime NULL,                    -- date when we decided to scrap all products of this lot
+  barcode       varchar(180) DEFAULT NULL,         -- barcode
+  fk_barcode_type   integer DEFAULT NULL,          -- barcode type
   datec         datetime,
   tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
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 ff862e427e0..77a00939428 100644
--- a/htdocs/install/mysql/tables/llx_product_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_price.sql
@@ -35,11 +35,11 @@ create table llx_product_price
   price_min_ttc		double(24,8) default NULL,
   price_base_type	varchar(3) DEFAULT 'HT',
   default_vat_code	varchar(10),	         		-- Same code than into table llx_c_tva (but no constraints). Should be used in priority to find default vat, npr, localtaxes for product.
-  tva_tx			double(6,3) DEFAULT 0 NOT NULL, -- Used only when option PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on (not supported) 
+  tva_tx			double(7,4) DEFAULT 0 NOT NULL, -- Used only when option PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on (not supported) 
   recuperableonly	integer NOT NULL DEFAULT '0',  
-  localtax1_tx		double(6,3) DEFAULT 0,
+  localtax1_tx		double(7,4) DEFAULT 0,
   localtax1_type    varchar(10)  NOT NULL DEFAULT '0',
-  localtax2_tx		double(6,3) DEFAULT 0,
+  localtax2_tx		double(7,4) DEFAULT 0,
   localtax2_type    varchar(10)  NOT NULL DEFAULT '0',
   fk_user_author	integer,
   tosell			tinyint DEFAULT 1,
@@ -48,7 +48,7 @@ create table llx_product_price
   import_key 		varchar(14),
   
   fk_multicurrency		integer,
-  multicurrency_code	varchar(255),
+  multicurrency_code	varchar(3),
   multicurrency_tx			double(24,8) DEFAULT 1,
   multicurrency_price	double(24,8) DEFAULT NULL,
   multicurrency_price_ttc	double(24,8) DEFAULT NULL
diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
index dc3a21bfedb..86cf28244ad 100644
--- a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
+++ b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
@@ -35,7 +35,7 @@ create table llx_product_price_by_qty
   fk_user_modif 	integer,
 
   fk_multicurrency		integer,
-  multicurrency_code	varchar(255),
+  multicurrency_code	varchar(3),
   multicurrency_tx			double(24,8) DEFAULT 1,
   multicurrency_price	double(24,8) DEFAULT NULL,
   multicurrency_price_ttc	double(24,8) DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql
index 97acc8d3411..197a92ac2be 100644
--- a/htdocs/install/mysql/tables/llx_projet.sql
+++ b/htdocs/install/mysql/tables/llx_projet.sql
@@ -47,9 +47,10 @@ create table llx_projet
   usage_opportunity    integer DEFAULT 0,		-- Set to 1 if project is used to follow an opportunity
   usage_task           integer DEFAULT 1,		-- Set to 1 if project is used to manage tasks and/or record timesheet
   usage_bill_time      integer DEFAULT 0,		-- Set to 1 if time spent must be converted into invoices
-  usage_organize_event integer DEFAULT 0,		-- Set to 1 if you want to use project to organize an event, receive attendees subscription				
+  usage_organize_event integer DEFAULT 0,		-- Set to 1 if you want to use project to organize an event or receive attendees registration				
   accept_conference_suggestions integer DEFAULT 0,		-- Set to 1 if you want to allow unknown people to suggest conferences
   accept_booth_suggestions integer DEFAULT 0,		-- Set to 1 if you want to Allow unknown people to suggest booth
+  max_attendees     integer DEFAULT 0,
   price_registration    double(24,8),
   price_booth    double(24,8),
   model_pdf        varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql
index 01edb857738..721dbf8355f 100644
--- a/htdocs/install/mysql/tables/llx_projet_task.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task.sql
@@ -35,6 +35,7 @@ create table llx_projet_task
   planned_workload		real DEFAULT 0,
   progress				integer DEFAULT 0,				-- percentage increase
   priority				integer DEFAULT 0,				-- priority
+  budget_amount         double(24,8),
   fk_user_creat			integer,						-- user who created the task
   fk_user_modif			integer,						-- user who modify the task
   fk_user_valid			integer,						-- user who validated the task
diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql
index 786d8907588..63eadb1177f 100644
--- a/htdocs/install/mysql/tables/llx_projet_task_time.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql
@@ -24,6 +24,7 @@ create table llx_projet_task_time
   task_datehour    datetime,				-- day + hour
   task_date_withhour integer DEFAULT 0,	-- 0 by default, 1 if date was entered with start hour
   task_duration    double,
+  fk_product       integer NULL,
   fk_user          integer,
   thm			   double(24,8),
   invoice_id       integer DEFAULT NULL,				-- If we need to invoice each line of timespent, we can save invoice id here
diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql
index 7c94086b3b9..3499a51e8b8 100644
--- a/htdocs/install/mysql/tables/llx_propal.sql
+++ b/htdocs/install/mysql/tables/llx_propal.sql
@@ -60,6 +60,9 @@ create table llx_propal
   fk_cond_reglement		integer,						-- condition de reglement (30 jours, fin de mois ...)
   fk_mode_reglement		integer,						-- mode de reglement (Virement, Prelevement)
  
+  online_sign_ip		varchar(48),
+  online_sign_name		varchar(64),
+  
   note_private			text,
   note_public			text,
   
@@ -78,7 +81,7 @@ create table llx_propal
   fk_delivery_address	integer,							-- delivery address (deprecated)
   
   fk_multicurrency			integer,
-  multicurrency_code		varchar(255),
+  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,
diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql
index 7156d90af2f..103118d6b77 100644
--- a/htdocs/install/mysql/tables/llx_propaldet.sql
+++ b/htdocs/install/mysql/tables/llx_propaldet.sql
@@ -29,10 +29,10 @@ create table llx_propaldet
   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(6,3)  DEFAULT 0, 	     -- Vat rate
-  localtax1_tx               		double(6,3)  DEFAULT 0,    		 -- localtax1 rate
+  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(6,3)  DEFAULT 0,    		 -- localtax2 rate
+  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
@@ -57,7 +57,7 @@ create table llx_propaldet
   fk_unit           integer      DEFAULT NULL,           -- lien vers table des unités
   
   fk_multicurrency			integer,
-  multicurrency_code			varchar(255),
+  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,
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 100%
rename from htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql
rename to htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature-recruitment.sql
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_session.sql b/htdocs/install/mysql/tables/llx_session.sql
index 5be31733c22..c466bda72dd 100644
--- a/htdocs/install/mysql/tables/llx_session.sql
+++ b/htdocs/install/mysql/tables/llx_session.sql
@@ -24,5 +24,5 @@ create table llx_session
   last_accessed datetime NOT NULL,
   fk_user integer NOT NULL,
   remote_ip varchar(64) NULL,
-  user_agent varchar(128) NULL
+  user_agent varchar(255) NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index c40a42ee0bd..c8b78d42fae 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -37,9 +37,9 @@ create table llx_societe
   status            	   tinyint 		  DEFAULT 1,			        -- cessation d'activité ( 1 -- en activité, 0 -- cessation d'activité)
 
   code_client              varchar(24),                         		-- code client
-  code_fournisseur         varchar(24),                         		-- code founisseur
-  code_compta              varchar(24),                         		-- code compta client
-  code_compta_fournisseur  varchar(24),                         		-- code compta founisseur
+  code_fournisseur         varchar(24),                         		-- code fournisseur
+  code_compta              varchar(24),                         		-- customer accountancy auxiliary account
+  code_compta_fournisseur  varchar(24),                         		-- supplier accountancy auxiliary account
   address                  varchar(255),                        		-- company address
   zip                      varchar(25),                         		-- zipcode
   town                     varchar(50),                         		-- town
@@ -52,15 +52,15 @@ 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
+  --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
@@ -99,9 +99,9 @@ create table llx_societe
   fk_shipping_method       integer,                                     -- preferred shipping method id
   tva_assuj                tinyint        DEFAULT 1,	        		-- assujeti ou non a la TVA
   localtax1_assuj          tinyint        DEFAULT 0,	        		-- assujeti ou non a local tax 1
-  localtax1_value 		   double(6,3),
+  localtax1_value 		   double(7,4),
   localtax2_assuj          tinyint        DEFAULT 0,	        		-- assujeti ou non a local tax 2
-  localtax2_value 		   double(6,3),
+  localtax2_value 		   double(7,4),
   barcode                  varchar(180),                        		-- barcode
   fk_barcode_type          integer NULL   DEFAULT 0,                    -- barcode type
   price_level              integer NULL,                        		-- level of price for multiprices
@@ -125,7 +125,7 @@ create table llx_societe
   fk_user_modif            integer,                             		-- utilisateur qui a modifie l'info
 
   fk_multicurrency		   integer,
-  multicurrency_code	   varchar(255),
+  multicurrency_code	   varchar(3),
 
   import_key               varchar(14)                          		-- import key
 )ENGINE=innodb;
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 85%
rename from htdocs/install/mysql/tables/llx_societe_perentity.sql
rename to htdocs/install/mysql/tables/llx_societe_perentity-multicompany.sql
index 408169476d9..800d4a10679 100644
--- a/htdocs/install/mysql/tables/llx_societe_perentity.sql
+++ b/htdocs/install/mysql/tables/llx_societe_perentity-multicompany.sql
@@ -21,8 +21,8 @@ create table llx_societe_perentity
   rowid         			integer AUTO_INCREMENT PRIMARY KEY,
   fk_soc        			integer,
   entity             		integer DEFAULT 1 NOT NULL,             -- multi company id
---  code_compta            	varchar(24),                         	-- code compta client
---  code_compta_fournisseur varchar(24),                         	-- code compta founisseur
+  accountancy_code_customer varchar(24),                         	-- customer accountancy auxiliary account
+  accountancy_code_supplier varchar(24),                         	-- supplier accountancy auxiliary account
   accountancy_code_sell		varchar(32),                            -- Selling accountancy code
   accountancy_code_buy		varchar(32)                             -- Buying accountancy code
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql
index 2d4e3a9c258..37746051b0b 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise.sql
@@ -27,7 +27,7 @@ create table llx_societe_remise
   tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec				datetime,							-- creation date
   fk_user_author	integer,							-- creation user
-  remise_client		double(6,3)  DEFAULT 0 NOT NULL,	-- discount
+  remise_client		double(7,4)  DEFAULT 0 NOT NULL,	-- discount
   note				text
 
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql
index 63762f8ad32..8fed65fe5f0 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql
@@ -29,7 +29,7 @@ create table llx_societe_remise_except
   amount_ht					double(24,8) NOT NULL,
   amount_tva				double(24,8) DEFAULT 0 NOT NULL,
   amount_ttc				double(24,8) DEFAULT 0 NOT NULL,
-  tva_tx					double(6,3)  DEFAULT 0 NOT NULL,
+  tva_tx					double(7,4)  DEFAULT 0 NOT NULL,
   vat_src_code				varchar(10)  DEFAULT '',				-- Vat code used as source of vat fields. Not strict foreign key here.
   fk_user					integer NOT NULL,
   fk_facture_line			integer,
diff --git a/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql b/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql
index d6dfdc20d9d..85ba8e9b7ff 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql
@@ -27,7 +27,7 @@ create table llx_societe_remise_supplier
   tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec				datetime,							-- creation date
   fk_user_author	integer,							-- creation user
-  remise_supplier	double(6,3)  DEFAULT 0 NOT NULL,	-- discount
+  remise_supplier	double(7,4)  DEFAULT 0 NOT NULL,	-- discount
   note				text
 
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql
index ece4b2edffe..9ea6ccf9188 100644
--- a/htdocs/install/mysql/tables/llx_societe_rib.sql
+++ b/htdocs/install/mysql/tables/llx_societe_rib.sql
@@ -35,8 +35,10 @@ create table llx_societe_rib
   code_guichet   varchar(6),    -- desk code
   number         varchar(255),  -- account number
   cle_rib        varchar(5),    -- key of bank account
-  bic            varchar(20),  -- 11 according to ISO 9362 (we keep 20 for backward compatibility)
+
+  bic            varchar(20),   -- 11 according to ISO 9362 (we keep 20 for backward compatibility)
   iban_prefix    varchar(34),	-- full iban. 34 according to ISO 13616
+
   domiciliation  varchar(255),
   proprio        varchar(60),
   owner_address  varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql
index 1f28534d5d3..59bd22ddfdc 100644
--- a/htdocs/install/mysql/tables/llx_socpeople.sql
+++ b/htdocs/install/mysql/tables/llx_socpeople.sql
@@ -44,16 +44,16 @@ create table llx_socpeople
   email				varchar(255),
 
   socialnetworks    text DEFAULT NULL,                          -- json with socialnetworks
-  jabberid			varchar(255),
-  skype				varchar(255),
-  twitter			varchar(255),                        		--
-  facebook			varchar(255),                        		--
-  linkedin            			varchar(255),                       		--
-  instagram                varchar(255),                        		--
-  snapchat                 varchar(255),                        		--
-  googleplus               varchar(255),                        		--
-  youtube                  varchar(255),                        		--
-  whatsapp                 varchar(255),                        		--
+  --jabberid			varchar(255),
+  --skype				varchar(255),
+  --twitter			varchar(255),                        		--
+  --facebook			varchar(255),                        		--
+  --linkedin            			varchar(255),                       		--
+  --instagram                varchar(255),                        		--
+  --snapchat                 varchar(255),                        		--
+  --googleplus               varchar(255),                        		--
+  --youtube                  varchar(255),                        		--
+  --whatsapp                 varchar(255),                        		--
 
   photo				varchar(255),
   no_email			smallint NOT NULL DEFAULT 0,				-- deprecated. Use table llx_mailing_unsubscribe instead
diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
index 2cd094c1b05..ec3465a6c2d 100644
--- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql
+++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
@@ -35,7 +35,7 @@ create table llx_stock_mouvement
   inventorycode   varchar(128),						-- Code used to group different movement line into one operation (may be an inventory, a mass picking)
   fk_project	  integer,
   fk_origin       integer,
-  origintype      varchar(32),
+  origintype      varchar(64),
   model_pdf       varchar(255),
   fk_projet       integer NOT NULL DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement_extrafields.sql b/htdocs/install/mysql/tables/llx_stock_mouvement_extrafields.sql
new file mode 100644
index 00000000000..c13218b631e
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_stock_mouvement_extrafields.sql
@@ -0,0 +1,24 @@
+-- ===================================================================
+-- Copyright (C) 2022	Salvatore Chiariello	<sal.chiariello@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/>.
+--
+-- ===================================================================
+
+CREATE TABLE llx_stock_mouvement_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)
+)ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposal.sql b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
index cf64d76d7d1..0008f08642f 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposal.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
@@ -56,7 +56,7 @@ CREATE TABLE llx_supplier_proposal (
   extraparams varchar(255) DEFAULT NULL,
   
   fk_multicurrency        integer,
-  multicurrency_code      varchar(255),
+  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,
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
index 6990bf334e5..bbf3decd7fa 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql
@@ -24,10 +24,10 @@ CREATE TABLE llx_supplier_proposaldet (
   description text,
   fk_remise_except integer DEFAULT NULL,
   vat_src_code					varchar(10) DEFAULT '',		-- Vat code used as source of vat fields. Not strict foreign key here.
-  tva_tx 						double(6,3) DEFAULT 0,		-- Vat rate
-  localtax1_tx double(6,3) DEFAULT 0,
+  tva_tx 						double(7,4) DEFAULT 0,		-- Vat rate
+  localtax1_tx double(7,4) DEFAULT 0,
   localtax1_type varchar(10) DEFAULT NULL,
-  localtax2_tx double(6,3) DEFAULT 0,
+  localtax2_tx double(7,4) DEFAULT 0,
   localtax2_type varchar(10) DEFAULT NULL,
   qty double DEFAULT NULL,
   remise_percent double DEFAULT '0',
@@ -49,7 +49,7 @@ CREATE TABLE llx_supplier_proposaldet (
   rang integer DEFAULT 0,
   ref_fourn varchar(30) DEFAULT NULL,
   fk_multicurrency        integer,
-  multicurrency_code      varchar(255),
+  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,
diff --git a/htdocs/install/mysql/tables/llx_ticket.sql b/htdocs/install/mysql/tables/llx_ticket.sql
index c053e787dfa..d079fdf3964 100644
--- a/htdocs/install/mysql/tables/llx_ticket.sql
+++ b/htdocs/install/mysql/tables/llx_ticket.sql
@@ -29,13 +29,14 @@ CREATE TABLE llx_ticket
 	message	text,
 	fk_statut integer,
 	resolution integer,
-	progress varchar(100),
+	progress integer DEFAULT 0,				-- progression 0 - 100 or null
 	timing varchar(20),
 	type_code varchar(32),
 	category_code varchar(32),
 	severity_code varchar(32),
 	datec datetime,
 	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
diff --git a/htdocs/install/mysql/tables/llx_ticket_extrafields.sql b/htdocs/install/mysql/tables/llx_ticket_extrafields.sql
index 31f82064461..5131150649a 100644
--- a/htdocs/install/mysql/tables/llx_ticket_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_ticket_extrafields.sql
@@ -2,7 +2,7 @@
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
+-- the Free Software Foundation; either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
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 94%
rename from htdocs/install/mysql/tables/llx_workstation_workstation.sql
rename to htdocs/install/mysql/tables/llx_workstation_workstation-workstation.sql
index a4d9fd4dbc8..5a8c1d90c7e 100755
--- a/htdocs/install/mysql/tables/llx_workstation_workstation.sql
+++ b/htdocs/install/mysql/tables/llx_workstation_workstation-workstation.sql
@@ -24,7 +24,7 @@ CREATE TABLE llx_workstation_workstation(
 	entity int DEFAULT 1,
 	note_private text, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14), 
diff --git a/htdocs/install/mysql/tables/llx_workstation_workstation_resource.sql b/htdocs/install/mysql/tables/llx_workstation_workstation_resource-workstation.sql
similarity index 92%
rename from htdocs/install/mysql/tables/llx_workstation_workstation_resource.sql
rename to htdocs/install/mysql/tables/llx_workstation_workstation_resource-workstation.sql
index 92463ade696..06cb9d74635 100755
--- a/htdocs/install/mysql/tables/llx_workstation_workstation_resource.sql
+++ b/htdocs/install/mysql/tables/llx_workstation_workstation_resource-workstation.sql
@@ -16,7 +16,7 @@
 
 CREATE TABLE llx_workstation_workstation_resource(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_resource integer, 
 	fk_workstation integer
 ) ENGINE=innodb;
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 92%
rename from htdocs/install/mysql/tables/llx_workstation_workstation_usergroup.sql
rename to htdocs/install/mysql/tables/llx_workstation_workstation_usergroup-workstation.sql
index 9ecccc88d82..7fa3bb5abf8 100755
--- a/htdocs/install/mysql/tables/llx_workstation_workstation_usergroup.sql
+++ b/htdocs/install/mysql/tables/llx_workstation_workstation_usergroup-workstation.sql
@@ -16,7 +16,7 @@
 
 CREATE TABLE llx_workstation_workstation_usergroup(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_usergroup integer, 
 	fk_workstation integer
 ) ENGINE=innodb;
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/repair.php b/htdocs/install/repair.php
index 9ce982cb458..8e4cc851d28 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -929,7 +929,7 @@ if ($ok && GETPOST('clean_product_stock_batch', 'alpha')) {
 								// TODO If it fails, we must make update
 								//$sql2 ="UPDATE ".MAIN_DB_PREFIX."product_batch";
 								//$sql2.=" SET ".$obj->psrowid.", '000000', ".($obj->reel - $obj->reelbatch).")";
-								//$sql2.=" WHERE fk_product_stock = ".$obj->psrowid"
+								//$sql2.=" WHERE fk_product_stock = ".((int) $obj->psrowid)
 							}
 						}
 					}
@@ -1082,7 +1082,7 @@ if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha')) {
 					$constantname = $obj->name; // Name of constant for hook or js or css declaration
 
 					print '<tr><td>';
-					print $constantname;
+					print dol_escape_htmltag($constantname);
 
 					$db->begin();
 
@@ -1106,7 +1106,8 @@ if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha')) {
 							if ($key == 'css') {
 								$value = $obj->value;
 								$valuearray = json_decode($value);
-								if ($value && count($valuearray) == 0) {
+								if ($value && (!is_array($valuearray) || count($valuearray) == 0)) {
+									$valuearray = array();
 									$valuearray[0] = $value; // If value was not a json array but a string
 								}
 								$reloffile = preg_replace('/^\//', '', $valuearray[0]);
@@ -1117,9 +1118,10 @@ if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha')) {
 								try {
 									$result = dol_buildpath($reloffile, 0, 2);
 								} catch (Exception $e) {
-									// No catch yet
-									$result = 'found'; // If error, we force lke if we found to avoid any deletion
+									$result = 'found'; // If error, we force like if we found to avoid any deletion
 								}
+							} else {
+								$result = 'found';	//
 							}
 
 							if (!$result) {
@@ -1180,7 +1182,9 @@ if ($ok && GETPOST('clean_perm_table', 'alpha')) {
 	foreach ($conf->modules as $key => $val) {
 		$listofmods .= ($listofmods ? ',' : '')."'".$db->escape($val)."'";
 	}
+
 	$sql = "SELECT id, libelle as label, module from ".MAIN_DB_PREFIX."rights_def WHERE module NOT IN (".$db->sanitize($listofmods, 1).") AND id > 100000";
+
 	$resql = $db->query($sql);
 	if ($resql) {
 		$num = $db->num_rows($resql);
@@ -1236,7 +1240,7 @@ 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';
+			$sql = "ALTER TABLE ".$table." CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci";
 			print '<!-- '.$sql.' -->';
 			if ($force_utf8_on_tables == 'confirmed') {
 				$resql = $db->query($sql);
@@ -1282,8 +1286,8 @@ if ($ok && GETPOST('force_utf8mb4_on_tables', 'alpha')) {
 
 			print '<tr><td colspan="2">';
 			print $table;
-			$sql1 = 'ALTER TABLE '.$table.' ROW_FORMAT=dynamic;';
-			$sql2 = 'ALTER TABLE '.$table.' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci';
+			$sql1 = "ALTER TABLE ".$table." ROW_FORMAT=dynamic";
+			$sql2 = "ALTER TABLE ".$table." CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci";
 			print '<!-- '.$sql1.' -->';
 			print '<!-- '.$sql2.' -->';
 			if ($force_utf8mb4_on_tables == 'confirmed') {
@@ -1407,25 +1411,25 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
 					$first_iteration = false;
 				} else {
 					$sql_attach_values = array(
-						$obj_dispatch->fk_commande,
-						$obj_dispatch->fk_product,
-						$obj_line->rowid,
-						$qty_for_line,
-						$obj_dispatch->fk_entrepot,
-						$obj_dispatch->fk_user,
-						$obj_dispatch->datec ? '"'.$db->escape($obj_dispatch->datec).'"' : 'NULL',
-						$obj_dispatch->comment ? '"'.$db->escape($obj_dispatch->comment).'"' : 'NULL',
-						$obj_dispatch->status ?: 'NULL',
-						$obj_dispatch->tms ? '"'.$db->escape($obj_dispatch->tms).'"' : 'NULL',
-						$obj_dispatch->batch ?: 'NULL',
-						$obj_dispatch->eatby ? '"'.$db->escape($obj_dispatch->eatby).'"' : 'NULL',
-						$obj_dispatch->sellby ? '"'.$db->escape($obj_dispatch->sellby).'"' : 'NULL'
+						((int) $obj_dispatch->fk_commande),
+						((int) $obj_dispatch->fk_product),
+						((int) $obj_line->rowid),
+						((float) $qty_for_line),
+						((int) $obj_dispatch->fk_entrepot),
+						((int) $obj_dispatch->fk_user),
+						$obj_dispatch->datec ? "'".$db->idate($db->jdate($obj_dispatch->datec))."'" : 'NULL',
+						$obj_dispatch->comment ? "'".$db->escape($obj_dispatch->comment)."'" : 'NULL',
+						$obj_dispatch->status ? ((int) $obj_dispatch->status) : 'NULL',
+						$obj_dispatch->tms ? "'".$db->idate($db->jdate($obj_dispatch->tms))."'" : 'NULL',
+						$obj_dispatch->batch ? "'".$db->escape($obj_dispatch->batch)."'" : 'NULL',
+						$obj_dispatch->eatby ? "'".$db->escape($obj_dispatch->eatby)."'" : 'NULL',
+						$obj_dispatch->sellby ? "'".$db->escape($obj_dispatch->sellby)."'" : 'NULL'
 					);
 					$sql_attach_values = join(', ', $sql_attach_values);
 
 					$sql_attach = 'INSERT INTO '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch';
 					$sql_attach .= ' (fk_commande, fk_product, fk_commandefourndet, qty, fk_entrepot, fk_user, datec, comment, status, tms, batch, eatby, sellby)';
-					$sql_attach .= ' VALUES ('.$sql_attach_values.')';
+					$sql_attach .= " VALUES (".$sql_attach_values.")";
 				}
 
 				if ($repair_link_dispatch_lines_supplier_order_lines == 'confirmed') {
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index b3d59b2e741..45b7d742f3e 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -141,7 +141,7 @@ if ($action == "set") {
 	$requestnb = 0;
 
 	// To disable some code, so you can call step2 with url like
-	// http://localhost/dolibarrnew/install/step2.php?action=set&createtables=0&createkeys=0&createfunctions=0&createdata=llx_20_c_departements
+	// 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;
@@ -154,8 +154,8 @@ if ($action == "set") {
 
 	/**************************************************************************************
 	 *
-	 * Chargement fichiers tables/*.sql (non *.key.sql)
-	 * A faire avant les fichiers *.key.sql
+	 * Load files tables/*.sql (not the *.key.sql). Files with '-xxx' in name are excluded (they will be loaded during activation o fmodule 'xxx').
+	 * To do before the files *.key.sql
 	 *
 	 ***************************************************************************************/
 	if ($ok && $createtables) {
@@ -169,7 +169,7 @@ if ($action == "set") {
 		$tabledata = array();
 		if (is_resource($handle)) {
 			while (($file = readdir($handle)) !== false) {
-				if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file) && !preg_match('/\.key\.sql$/i', $file)) {
+				if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file) && !preg_match('/\.key\.sql$/i', $file) && !preg_match('/\-/', $file)) {
 					$tablefound++;
 					$tabledata[] = $file;
 				}
@@ -252,8 +252,8 @@ if ($action == "set") {
 
 	/***************************************************************************************
 	 *
-	 * Chargement fichiers tables/*.key.sql
-	 * A faire apres les fichiers *.sql
+	 * Load files tables/*.key.sql. Files with '-xxx' in name are excluded (they will be loaded during activation o fmodule 'xxx').
+	 * To do after the files *.sql
 	 *
 	 ***************************************************************************************/
 	if ($ok && $createkeys) {
@@ -267,7 +267,7 @@ if ($action == "set") {
 		$tabledata = array();
 		if (is_resource($handle)) {
 			while (($file = readdir($handle)) !== false) {
-				if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file) && preg_match('/\.key\.sql$/i', $file)) {
+				if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file) && preg_match('/\.key\.sql$/i', $file) && !preg_match('/\-/', $file)) {
 					$tablefound++;
 					$tabledata[] = $file;
 				}
@@ -372,7 +372,7 @@ if ($action == "set") {
 
 	/***************************************************************************************
 	 *
-	 * Chargement fichier functions.sql
+	 * Lod the file 'functions.sql'
 	 *
 	 ***************************************************************************************/
 	if ($ok && $createfunctions) {
@@ -449,7 +449,7 @@ if ($action == "set") {
 
 	/***************************************************************************************
 	 *
-	 * Load files data/*.sql
+	 * Load files data/*.sql. Files with '-xxx' in name are excluded (they will be loaded during activation o fmodule 'xxx').
 	 *
 	 ***************************************************************************************/
 	if ($ok && $createdata) {
@@ -463,7 +463,7 @@ if ($action == "set") {
 		$tabledata = array();
 		if (is_resource($handle)) {
 			while (($file = readdir($handle)) !== false) {
-				if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file)) {
+				if (preg_match('/\.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.
 					}
diff --git a/htdocs/install/step4.php b/htdocs/install/step4.php
index 82a01f39f6a..c2f6ce2384d 100644
--- a/htdocs/install/step4.php
+++ b/htdocs/install/step4.php
@@ -82,9 +82,9 @@ 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 '<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 '<input type="password" id="pass" name="pass" autocomplete="new-password" minlength="6"></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_verif" name="pass_verif" autocomplete="new-password" minlength="6"></td></tr>';
 	print '</table>';
 
 	if (isset($_GET["error"]) && $_GET["error"] == 1) {
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index b841edb12ac..89681794aeb 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -114,7 +114,7 @@ if ($action == "set") {
 
 $morehtml = '';
 
-pHeader($langs->trans("SetupEnd"), "step5");
+pHeader($langs->trans("SetupEnd"), "step5", 'set', '', '', 'main-inside main-inside-borderbottom');
 print '<br>';
 
 // Test if we can run a first install process
@@ -166,7 +166,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 		$objMod = new $modName($db);
 		$result = $objMod->init();
 		if (!$result) {
-			print 'ERROR in activating module file='.$file;
+			print "ERROR: failed to init module file = ".$file;
 		}
 
 		if ($db->connected) {
@@ -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>';
+					setEventMessage($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>';
 				}
 			}
 
@@ -234,7 +239,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 				// Insert MAIN_VERSION_FIRST_INSTALL in a dedicated transaction. So if it fails (when first install was already done), we can do other following requests.
 				$db->begin();
 				dolibarr_install_syslog('step5: set MAIN_VERSION_FIRST_INSTALL const to '.$targetversion, LOG_DEBUG);
-				$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_FIRST_INSTALL', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version when first install',0)");
+				$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name, value, type, visible, note, entity) values(".$db->encrypt('MAIN_VERSION_FIRST_INSTALL').", ".$db->encrypt($targetversion).", 'chaine', 0, 'Dolibarr version when first install', 0)");
 				if ($resql) {
 					$conf->global->MAIN_VERSION_FIRST_INSTALL = $targetversion;
 					$db->commit();
@@ -246,11 +251,11 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 				$db->begin();
 
 				dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_INSTALL const to '.$targetversion, LOG_DEBUG);
-				$resql = $db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_INSTALL'");
+				$resql = $db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')." = 'MAIN_VERSION_LAST_INSTALL'");
 				if (!$resql) {
 					dol_print_error($db, 'Error in setup program');
 				}
-				$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version when last install',0)");
+				$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL').", ".$db->encrypt($targetversion).", 'chaine', 0, 'Dolibarr version when last install', 0)");
 				if (!$resql) {
 					dol_print_error($db, 'Error in setup program');
 				}
@@ -258,11 +263,11 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 
 				if ($useforcedwizard) {
 					dolibarr_install_syslog('step5: set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG);
-					$resql = $db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'");
+					$resql = $db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')." = 'MAIN_REMOVE_INSTALL_WARNING'");
 					if (!$resql) {
 						dol_print_error($db, 'Error in setup program');
 					}
-					$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_REMOVE_INSTALL_WARNING', 1).",".$db->encrypt(1, 1).",'chaine',1,'Disable install warnings',0)");
+					$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_REMOVE_INSTALL_WARNING').", ".$db->encrypt(1).", 'chaine', 1, 'Disable install warnings', 0)");
 					if (!$resql) {
 						dol_print_error($db, 'Error in setup program');
 					}
@@ -286,7 +291,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 
 						$res = activateModule($modtoactivatenew, 1);
 						if (!empty($res['errors'])) {
-							print 'ERROR in activating module file='.$file;
+							print 'ERROR: failed to activateModule() file='.$file;
 						}
 					}
 				}
@@ -326,11 +331,11 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 
 			if ($tagdatabase) {
 				dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_UPGRADE const to value '.$targetversion);
-				$resql = $db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_UPGRADE'");
+				$resql = $db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')." = 'MAIN_VERSION_LAST_UPGRADE'");
 				if (!$resql) {
 					dol_print_error($db, 'Error in setup program');
 				}
-				$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_VERSION_LAST_UPGRADE', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version for last upgrade',0)");
+				$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name, value, type, visible, note, entity) VALUES (".$db->encrypt('MAIN_VERSION_LAST_UPGRADE').", ".$db->encrypt($targetversion).", 'chaine', 0, 'Dolibarr version for last upgrade', 0)");
 				if (!$resql) {
 					dol_print_error($db, 'Error in setup program');
 				}
@@ -346,7 +351,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 	}
 
 	// May fail if parameter already defined
-	$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_LANG_DEFAULT', 1).",".$db->encrypt($setuplang, 1).",'chaine',0,'Default language',1)");
+	$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_LANG_DEFAULT').", ".$db->encrypt($setuplang).", 'chaine', 0, 'Default language', 1)");
 	//if (! $resql) dol_print_error($db,'Error in setup program');
 
 	$db->close();
@@ -357,54 +362,56 @@ 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
 	if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {
 		// Upgrade is finished
-		print '<img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/checklist.svg" width="20" alt="Configuration"> '.$langs->trans("SystemIsUpgraded")."<br>";
+		print '<img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/checklist.svg" width="20" alt="Configuration"> <span class="valignmiddle">'.$langs->trans("SystemIsUpgraded")."</span><br>";
 
 		$createlock = 0;
 
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 1bc372c4c00..e58ae528f97 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -102,7 +102,7 @@ if (!$versionfrom && !$versionto) {
 }
 
 
-pHeader('', "upgrade2", GETPOST('action', 'aZ09'), 'versionfrom='.$versionfrom.'&versionto='.$versionto);
+pHeader('', "upgrade2", GETPOST('action', 'aZ09'), 'versionfrom='.$versionfrom.'&versionto='.$versionto, '', 'main-inside main-inside-borderbottom');
 
 $actiondone = 0;
 
@@ -260,6 +260,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 			);
 
 			$listtables = $db->DDLListTables($conf->db->name, '');
+
 			foreach ($listtables as $val) {
 				// Database prefix filter
 				if (preg_match('/^'.MAIN_DB_PREFIX.'/', $val)) {
@@ -270,6 +271,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 						$values = $db->fetch_array($resql);
 						$i = 0;
 						$createsql = $values[1];
+						$reg = array();
 						while (preg_match('/CONSTRAINT `(0_[0-9a-zA-Z]+|[_0-9a-zA-Z]+_ibfk_[0-9]+)`/i', $createsql, $reg) && $i < 100) {
 							$sqldrop = "ALTER TABLE ".$val." DROP FOREIGN KEY ".$reg[1];
 							$resqldrop = $db->query($sqldrop);
@@ -282,7 +284,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 						$db->free($resql);
 					} else {
 						if ($db->lasterrno() != 'DB_ERROR_NOSUCHTABLE') {
-							print '<tr><td colspan="2"><span class="error">'.$sql.' : '.$db->lasterror()."</font></td></tr>\n";
+							print '<tr><td colspan="2"><span class="error">'.dol_escape_htmltag($sql).' : '.dol_escape_htmltag($db->lasterror())."</span></td></tr>\n";
 						}
 					}
 				}
@@ -348,9 +350,10 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 				print '<tr><td class="nowrap">'.$langs->trans("ChoosedMigrateScript").'</td><td class="right">'.$file.'</td></tr>'."\n";
 
 				// Run sql script
-				$ok = run_sql($dir.$file, 0, '', 1);
+				$ok = run_sql($dir.$file, 0, '', 1, '', 'default', 32768, 0, 0, 2);
 				$listoffileprocessed[$dir.$file] = $dir.$file;
 
+
 				// Scan if there is migration scripts that depends of Dolibarr version
 				// for modules htdocs/module/sql or htdocs/custom/module/sql (files called "dolibarr_x.y.z-a.b.c.sql")
 				$modulesfile = array();
@@ -369,17 +372,20 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 					}
 				}
 
-				foreach ($modulesfile as $modulefilelong => $modulefileshort) {
-					if (in_array($modulefilelong, $listoffileprocessed)) {
-						continue;
+				if (count($modulesfile)) {
+					print '<tr><td colspan="2"><hr style="border-color: #ccc; border-top-style: none;"></td></tr>';
+
+					foreach ($modulesfile as $modulefilelong => $modulefileshort) {
+						if (in_array($modulefilelong, $listoffileprocessed)) {
+							continue;
+						}
+
+						print '<tr><td class="nowrap">'.$langs->trans("ChoosedMigrateScript").' (external modules)</td><td class="right">'.$modulefileshort.'</td></tr>'."\n";
+
+						// Run sql script
+						$okmodule = run_sql($modulefilelong, 0, '', 1); // Note: Result of migration of external module should not decide if we continue migration of Dolibarr or not.
+						$listoffileprocessed[$modulefilelong] = $modulefilelong;
 					}
-
-					print '<tr><td colspan="2"><hr></td></tr>';
-					print '<tr><td class="nowrap">'.$langs->trans("ChoosedMigrateScript").' (external modules)</td><td class="right">'.$modulefileshort.'</td></tr>'."\n";
-
-					// Run sql script
-					$okmodule = run_sql($modulefilelong, 0, '', 1); // Note: Result of migration of external module should not decide if we continue migration of Dolibarr or not.
-					$listoffileprocessed[$modulefilelong] = $modulefilelong;
 				}
 			}
 		}
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 5294bdf8f11..9be3cc361a0 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -113,7 +113,7 @@ if ((!$versionfrom || preg_match('/version/', $versionfrom)) && (!$versionto ||
 	exit;
 }
 
-pHeader('', 'step5', GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'upgrade', 'versionfrom='.$versionfrom.'&versionto='.$versionto);
+pHeader('', 'step5', GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'upgrade', 'versionfrom='.$versionfrom.'&versionto='.$versionto, '', 'main-inside main-inside-borderbottom');
 
 
 if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ09'))) {
@@ -598,7 +598,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 		}
 
 		//if (!empty($conf->use_javascript_ajax)) {		// use_javascript_ajax is not defined
-		print '<script type="text/javascript" language="javascript">
+		print '<script type="text/javascript">
 		jQuery(document).ready(function() {
 			function init_trrunsql()
 			{
@@ -692,7 +692,7 @@ function migrate_paiements($db, $langs, $conf)
 				$num = count($row);
 				for ($i = 0; $i < $num; $i++) {
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount)";
-					$sql .= " VALUES (".$row[$i][1].",".$row[$i][0].",".$row[$i][2].")";
+					$sql .= " VALUES (".((int) $row[$i][1]).",".((int) $row[$i][0]).",".((float) $row[$i][2]).")";
 
 					$res += $db->query($sql);
 
@@ -803,7 +803,7 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
 						$facid = $obj->rowid;
 
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount)";
-						$sql .= " VALUES (".((int) $facid).",".((int) $row[$i]['paymentid']).",".$row[$i]['pamount'].")";
+						$sql .= " VALUES (".((int) $facid).",".((int) $row[$i]['paymentid']).", ".((float) $row[$i]['pamount']).")";
 
 						$res += $db->query($sql);
 
@@ -914,7 +914,7 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
 						$facid = $obj->rowid;
 
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount)";
-						$sql .= " VALUES (".((int) $facid).",".((int) $row[$i]['paymentid']).",".$row[$i]['pamount'].")";
+						$sql .= " VALUES (".((int) $facid).",".((int) $row[$i]['paymentid']).", ".((float) $row[$i]['pamount']).")";
 
 						$res += $db->query($sql);
 
@@ -1002,14 +1002,14 @@ function migrate_contracts_det($db, $langs, $conf)
 				$sql .= "date_ouverture_prevue, date_ouverture, date_fin_validite, tva_tx, qty,";
 				$sql .= "subprice, price_ht, fk_user_author, fk_user_ouverture)";
 				$sql .= " VALUES (";
-				$sql .= $obj->cref.", ".($obj->fk_product ? $obj->fk_product : 0).", ";
+				$sql .= ((int) $obj->cref).", ".($obj->fk_product ? ((int) $obj->fk_product) : 0).", ";
 				$sql .= "0, ";
 				$sql .= "'".$db->escape($obj->label)."', null, ";
-				$sql .= ($obj->date_contrat ? "'".$db->escape($obj->date_contrat)."'" : "null").", ";
+				$sql .= ($obj->date_contrat ? "'".$db->idate($db->jdate($obj->date_contrat))."'" : "null").", ";
 				$sql .= "null, ";
 				$sql .= "null, ";
-				$sql .= "'".$db->escape($obj->tva_tx)."' , 1, ";
-				$sql .= "'".$db->escape($obj->price)."', '".$db->escape($obj->price)."', ".$obj->fk_user_author.",";
+				$sql .= ((float) $obj->tva_tx).", 1, ";
+				$sql .= ((float) $obj->price).", ".((float) $obj->price).", ".((int) $obj->fk_user_author).",";
 				$sql .= "null";
 				$sql .= ")";
 
@@ -1087,7 +1087,7 @@ function migrate_links_transfert($db, $langs, $conf)
 				$sql .= $obj->barowid.",".$obj->bbrowid.", '/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert'";
 				$sql .= ")";
 
-				print $sql.'<br>';
+				//print $sql.'<br>';
 				dolibarr_install_syslog("migrate_links_transfert");
 
 				if (!$db->query($sql)) {
@@ -2020,7 +2020,7 @@ function migrate_commande_expedition($db, $langs, $conf)
 					$obj = $db->fetch_object($resql);
 
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."co_exp (fk_expedition,fk_commande)";
-					$sql .= " VALUES (".$obj->rowid.",".$obj->fk_commande.")";
+					$sql .= " VALUES (".((int) $obj->rowid).", ".((int) $obj->fk_commande).")";
 					$resql2 = $db->query($sql);
 
 					if (!$resql2) {
@@ -2088,16 +2088,16 @@ function migrate_commande_livraison($db, $langs, $conf)
 					$obj = $db->fetch_object($resql);
 
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."co_liv (fk_livraison,fk_commande)";
-					$sql .= " VALUES (".$obj->rowid.",".$obj->fk_commande.")";
+					$sql .= " VALUES (".((int) $obj->rowid).", ".((int) $obj->fk_commande).")";
 					$resql2 = $db->query($sql);
 
 					if ($resql2) {
 						$delivery_date = $db->jdate($obj->delivery_date);
 
 						$sqlu = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
-						$sqlu .= " ref_client='".$db->escape($obj->ref_client)."'";
-						$sqlu .= ", date_livraison='".$db->idate($delivery_date)."'";
-						$sqlu .= " WHERE rowid = ".$obj->rowid;
+						$sqlu .= " ref_client = '".$db->escape($obj->ref_client)."'";
+						$sqlu .= ", date_livraison = '".$db->idate($delivery_date)."'";
+						$sqlu .= " WHERE rowid = ".((int) $obj->rowid);
 						$resql3 = $db->query($sqlu);
 						if (!$resql3) {
 							$error++;
@@ -2170,11 +2170,11 @@ function migrate_detail_livraison($db, $langs, $conf)
 					$obj = $db->fetch_object($resql);
 
 					$sql = "UPDATE ".MAIN_DB_PREFIX."livraisondet SET";
-					$sql .= " fk_product=".$obj->fk_product;
-					$sql .= ",description='".$db->escape($obj->description)."'";
-					$sql .= ",subprice='".$db->escape($obj->subprice)."'";
-					$sql .= ",total_ht='".$db->escape($obj->total_ht)."'";
-					$sql .= " WHERE fk_commande_ligne = ".$obj->rowid;
+					$sql .= " fk_product = ".((int) $obj->fk_product);
+					$sql .= ",description = '".$db->escape($obj->description)."'";
+					$sql .= ",subprice = ".price2num($obj->subprice);
+					$sql .= ",total_ht = ".price2num($obj->total_ht);
+					$sql .= " WHERE fk_commande_ligne = ".((int) $obj->rowid);
 					$resql2 = $db->query($sql);
 
 					if ($resql2) {
@@ -2188,8 +2188,8 @@ function migrate_detail_livraison($db, $langs, $conf)
 							$total_ht = $obju->total_ht + $obj->total_ht;
 
 							$sqlu = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
-							$sqlu .= " total_ht='".$db->escape($total_ht)."'";
-							$sqlu .= " WHERE rowid=".$obj->fk_livraison;
+							$sqlu .= " total_ht = ".price2num($total_ht, 'MT');
+							$sqlu .= " WHERE rowid = ".((int) $obj->fk_livraison);
 							$resql4 = $db->query($sqlu);
 							if (!$resql4) {
 								$error++;
@@ -2266,8 +2266,8 @@ function migrate_stocks($db, $langs, $conf)
 				$obj = $db->fetch_object($resql);
 
 				$sql = "UPDATE ".MAIN_DB_PREFIX."product SET";
-				$sql .= " stock = '".$db->escape($obj->total)."'";
-				$sql .= " WHERE rowid=".$obj->fk_product;
+				$sql .= " stock = ".price2num($obj->total, 'MS');
+				$sql .= " WHERE rowid = ".((int) $obj->fk_product);
 
 				$resql2 = $db->query($sql);
 				if ($resql2) {
@@ -2330,7 +2330,7 @@ function migrate_menus($db, $langs, $conf)
 
 					$sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
 					$sql .= " enabled = '".$db->escape($obj->action)."'";
-					$sql .= " WHERE rowid=".$obj->rowid;
+					$sql .= " WHERE rowid = ".((int) $obj->rowid);
 					$sql .= " AND enabled = '1'";
 
 					$resql2 = $db->query($sql);
@@ -2400,7 +2400,7 @@ function migrate_commande_deliveryaddress($db, $langs, $conf)
 
 					$sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
 					$sql .= " fk_adresse_livraison = '".$db->escape($obj->fk_adresse_livraison)."'";
-					$sql .= " WHERE rowid=".$obj->fk_expedition;
+					$sql .= " WHERE rowid = ".((int) $obj->fk_expedition);
 
 					$resql2 = $db->query($sql);
 					if (!$resql2) {
@@ -3049,7 +3049,7 @@ function migrate_shipping_delivery($db, $langs, $conf)
 					$result = $db->query($sqlInsert);
 					if ($result) {
 						$sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."livraison SET fk_expedition = NULL";
-						$sqlUpdate .= " WHERE rowid = ".$obj->rowid;
+						$sqlUpdate .= " WHERE rowid = ".((int) $obj->rowid);
 
 						$result = $db->query($sqlUpdate);
 						if (!$result) {
@@ -3137,7 +3137,7 @@ function migrate_shipping_delivery2($db, $langs, $conf)
 				$sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
 				$sqlUpdate .= " ref_customer = '".$db->escape($obj->ref_customer)."',";
 				$sqlUpdate .= " date_delivery = ".($obj->date_delivery ? "'".$db->escape($obj->date_delivery)."'" : 'null');
-				$sqlUpdate .= " WHERE rowid = ".$obj->delivery_id;
+				$sqlUpdate .= " WHERE rowid = ".((int) $obj->delivery_id);
 
 				$result = $db->query($sqlUpdate);
 				if (!$result) {
@@ -3361,7 +3361,7 @@ function migrate_clean_association($db, $langs, $conf)
 						// And we insert only each record once
 						foreach ($couples as $key => $val) {
 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_association(fk_categorie_mere,fk_categorie_fille)";
-							$sql .= " VALUES(".$val['mere'].", ".$val['fille'].")";
+							$sql .= " VALUES(".((int) $val['mere']).", ".((int) $val['fille']).")";
 							dolibarr_install_syslog("upgrade: insert association");
 							$resqli = $db->query($sql);
 							if (!$resqli) {
@@ -3493,7 +3493,7 @@ function migrate_event_assignement($db, $langs, $conf)
 				$obj = $db->fetch_object($resql);
 
 				$sqlUpdate = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element) ";
-				$sqlUpdate .= "VALUES(".$obj->id.", 'user', ".$obj->fk_user_action.")";
+				$sqlUpdate .= "VALUES(".((int) $obj->id).", 'user', ".((int) $obj->fk_user_action).")";
 
 				$result = $db->query($sqlUpdate);
 				if (!$result) {
@@ -3559,7 +3559,7 @@ function migrate_event_assignement_contact($db, $langs, $conf)
 				$obj = $db->fetch_object($resql);
 
 				$sqlUpdate = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element) ";
-				$sqlUpdate .= "VALUES(".$obj->id.", 'socpeople', ".$obj->fk_contact.")";
+				$sqlUpdate .= "VALUES(".((int) $obj->id).", 'socpeople', ".((int) $obj->fk_contact).")";
 
 				$result = $db->query($sqlUpdate);
 				if (!$result) {
@@ -3629,7 +3629,7 @@ function migrate_reset_blocked_log($db, $langs, $conf)
 
 				print 'Process entity '.$obj->entity;
 
-				$sqlSearch = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."blockedlog WHERE action = 'MODULE_SET' and entity = ".$obj->entity;
+				$sqlSearch = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."blockedlog WHERE action = 'MODULE_SET' and entity = ".((int) $obj->entity);
 				$resqlSearch = $db->query($sqlSearch);
 				if ($resqlSearch) {
 					$objSearch = $db->fetch_object($resqlSearch);
@@ -3638,7 +3638,7 @@ function migrate_reset_blocked_log($db, $langs, $conf)
 						print ' - Record for entity must be reset...';
 
 						$sqlUpdate = "DELETE FROM ".MAIN_DB_PREFIX."blockedlog";
-						$sqlUpdate .= " WHERE entity = ".$obj->entity;
+						$sqlUpdate .= " WHERE entity = ".((int) $obj->entity);
 						$resqlUpdate = $db->query($sqlUpdate);
 						if (!$resqlUpdate) {
 							$error++;
@@ -3725,7 +3725,7 @@ function migrate_remise_entity($db, $langs, $conf)
 
 				$sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."societe_remise SET";
 				$sqlUpdate .= " entity = ".$obj->entity;
-				$sqlUpdate .= " WHERE rowid = ".$obj->rowid;
+				$sqlUpdate .= " WHERE rowid = ".((int) $obj->rowid);
 
 				$result = $db->query($sqlUpdate);
 				if (!$result) {
@@ -3810,8 +3810,8 @@ function migrate_remise_except_entity($db, $langs, $conf)
 						$obj2 = $db->fetch_object($resql2);
 
 						$sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except SET";
-						$sqlUpdate .= " entity = ".$obj2->entity;
-						$sqlUpdate .= " WHERE rowid = ".$obj->rowid;
+						$sqlUpdate .= " entity = ".((int) $obj2->entity);
+						$sqlUpdate .= " WHERE rowid = ".((int) $obj->rowid);
 
 						$result = $db->query($sqlUpdate);
 						if (!$result) {
@@ -3880,8 +3880,8 @@ function migrate_user_rights_entity($db, $langs, $conf)
 				$obj = $db->fetch_object($resql);
 
 				$sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."user_rights SET";
-				$sqlUpdate .= " entity = ".$obj->entity;
-				$sqlUpdate .= " WHERE fk_user = ".$obj->rowid;
+				$sqlUpdate .= " entity = ".((int) $obj->entity);
+				$sqlUpdate .= " WHERE fk_user = ".((int) $obj->rowid);
 
 				$result = $db->query($sqlUpdate);
 				if (!$result) {
@@ -3945,8 +3945,8 @@ function migrate_usergroup_rights_entity($db, $langs, $conf)
 				$obj = $db->fetch_object($resql);
 
 				$sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."usergroup_rights SET";
-				$sqlUpdate .= " entity = ".$obj->entity;
-				$sqlUpdate .= " WHERE fk_usergroup = ".$obj->rowid;
+				$sqlUpdate .= " entity = ".((int) $obj->entity);
+				$sqlUpdate .= " WHERE fk_usergroup = ".((int) $obj->rowid);
 
 				$result = $db->query($sqlUpdate);
 				if (!$result) {
@@ -4360,7 +4360,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 					$mod = new $classname($db);
 
 					//$mod->remove('noboxes');
-					$mod->delete_menus();	// We must delete to be sure it is inserted with new values
+					$mod->delete_menus(); // We must delete to be sure it is inserted with new values
 					$mod->init($reloadmode);
 				} else {
 					dolibarr_install_syslog('Failed to include '.DOL_DOCUMENT_ROOT.'/core/modules/mod'.$moduletoreloadshort.'.class.php');
@@ -4537,7 +4537,8 @@ and rowid in (...)
 */
 
 /**
- * Migrate users fields facebook and co to socialnetworks
+ * Migrate users fields facebook and co to socialnetworks.
+ * Can be called only when version is 10.0.* or lower. Fields does not exists after.
  *
  * @return  void
  */
@@ -4605,7 +4606,7 @@ function migrate_users_socialnetworks()
 			$sqlupd .= ', googleplus=null';
 			$sqlupd .= ', youtube=null';
 			$sqlupd .= ', whatsapp=null';
-			$sqlupd .= ' WHERE rowid='.$obj->rowid;
+			$sqlupd .= ' WHERE rowid = '.((int) $obj->rowid);
 			//print $sqlupd."<br>";
 			$resqlupd = $db->query($sqlupd);
 			if (!$resqlupd) {
@@ -4628,6 +4629,7 @@ function migrate_users_socialnetworks()
 
 /**
  * Migrate members fields facebook and co to socialnetworks
+ * Can be called only when version is 10.0.* or lower. Fields does not exists after.
  *
  * @return  void
  */
@@ -4696,7 +4698,7 @@ function migrate_members_socialnetworks()
 			$sqlupd .= ', googleplus=null';
 			$sqlupd .= ', youtube=null';
 			$sqlupd .= ', whatsapp=null';
-			$sqlupd .= ' WHERE rowid='.$obj->rowid;
+			$sqlupd .= ' WHERE rowid = '.((int) $obj->rowid);
 			//print $sqlupd."<br>";
 			$resqlupd = $db->query($sqlupd);
 			if (!$resqlupd) {
@@ -4719,6 +4721,7 @@ function migrate_members_socialnetworks()
 
 /**
  * Migrate contacts fields facebook and co to socialnetworks
+ * Can be called only when version is 10.0.* or lower. Fields does not exists after.
  *
  * @return  void
  */
@@ -4791,7 +4794,7 @@ function migrate_contacts_socialnetworks()
 			$sqlupd .= ', googleplus=null';
 			$sqlupd .= ', youtube=null';
 			$sqlupd .= ', whatsapp=null';
-			$sqlupd .= ' WHERE rowid='.$obj->rowid;
+			$sqlupd .= ' WHERE rowid = '.((int) $obj->rowid);
 			//print $sqlupd."<br>";
 			$resqlupd = $db->query($sqlupd);
 			if (!$resqlupd) {
@@ -4814,6 +4817,7 @@ function migrate_contacts_socialnetworks()
 
 /**
  * Migrate thirdparties fields facebook and co to socialnetworks
+ * Can be called only when version is 10.0.* or lower. Fields does not exists after.
  *
  * @return  void
  */
@@ -4881,7 +4885,7 @@ function migrate_thirdparties_socialnetworks()
 			$sqlupd .= ', googleplus=null';
 			$sqlupd .= ', youtube=null';
 			$sqlupd .= ', whatsapp=null';
-			$sqlupd .= ' WHERE rowid='.$obj->rowid;
+			$sqlupd .= ' WHERE rowid = '.((int) $obj->rowid);
 			//print $sqlupd."<br>";
 			$resqlupd = $db->query($sqlupd);
 			if (!$resqlupd) {
@@ -4945,7 +4949,7 @@ function migrate_export_import_profiles($mode = 'export')
 				if ($mode == 'export') {
 					$sqlupd .= ", filter = '".$db->escape($newfilter)."'";
 				}
-				$sqlupd .= ' WHERE rowid='.$obj->rowid;
+				$sqlupd .= ' WHERE rowid = '.((int) $obj->rowid);
 				$resultstring .= '<tr class="trforrunsql" style=""><td class="wordbreak" colspan="4">'.$sqlupd."</td></tr>\n";
 				$resqlupd = $db->query($sqlupd);
 				if (!$resqlupd) {
diff --git a/htdocs/intracommreport/admin/intracommreport.php b/htdocs/intracommreport/admin/intracommreport.php
index c696dddcabd..13231c43af2 100644
--- a/htdocs/intracommreport/admin/intracommreport.php
+++ b/htdocs/intracommreport/admin/intracommreport.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *      \file		htdocs/admin/intracommreport.php
+ *      \file		htdocs/intracommreport/admin/intracommreport.php
  *      \ingroup	intracommreport
  *      \brief		Page to setup the module intracomm report
  */
diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index 24b8797a670..c769b89f9b8 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -13,7 +13,7 @@
  * GNU General 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/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
@@ -21,6 +21,18 @@
  *	\ingroup    Intracomm report
  *	\brief      Page to manage intracomm report export
  */
+
+
+/** 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)
+ *
+ *  INTRACOMM: Douanes françaises (FR) = french customs (EN)  -  https://www.douane.gouv.fr/professionnels/commerce-international/import-export
+ *
+ */
+
+
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
@@ -29,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/intracommreport/class/intracommreport.class.php
 $langs->loadLangs(array("intracommreport"));
 
 $action = GETPOST('action');
-$exporttype = GETPOSTISSET('exporttype') ? GETPOST('exporttype', 'alphanohtml') : 'deb'; // DEB ou DES
+$exporttype = GETPOSTISSET('exporttype') ? GETPOST('exporttype', 'alphanohtml') : 'deb'; // DEB or DES
 $year = GETPOSTINT('year');
 $month = GETPOSTINT('month');
 $label = (string) GETPOST('label', 'alphanohtml');
@@ -166,9 +178,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 }
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index 9675d1f3860..d3f34fc149b 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -437,7 +437,7 @@ 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->exporttype.'"');
+		$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)."'");
 		if ($resql) {
 			$res = $this->db->fetch_object($resql);
 		}
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index 686bd16d5de..fa88f6f0456 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -45,8 +45,8 @@ $type = GETPOST("type", "int");
 $diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -207,7 +207,7 @@ $sql = 'SELECT DISTINCT i.rowid, i.type_declaration, i.type_export, i.periods, i
 /*
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 }
 */
 // Add fields from hooks
@@ -251,7 +251,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-$sql .= " GROUP BY i.rowid";
+$sql .= " GROUP BY i.rowid, i.type_declaration, i.type_export, i.periods, i.mode, i.entity";
 
 /*
 // Add fields from extrafields
@@ -348,7 +348,7 @@ if ($resql) {
 		print '<input type="hidden" name="search_type" value="'.dol_escape_htmltag($search_type).'">';
 	}
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, $newcardbutton, '', $limit);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'intracommreport', 0, $newcardbutton, '', $limit);
 
 	$topicmail = "Information";
 	$modelmail = "product";
diff --git a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
new file mode 100644
index 00000000000..5d26fa90137
--- /dev/null
+++ b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
@@ -0,0 +1,394 @@
+<?php
+/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2021 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/>.
+ */
+
+use Luracast\Restler\RestException;
+
+dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
+
+
+
+/**
+ * \file    knowledgemanagement/class/api_knowledgemanagement.class.php
+ * \ingroup knowledgemanagement
+ * \brief   File for API management of knowledgerecord.
+ */
+
+/**
+ * API class for knowledgemanagement knowledgerecord
+ *
+ * @access protected
+ * @class  DolibarrApiAccess {@requires user,external}
+ */
+class KnowledgeManagement extends DolibarrApi
+{
+	/**
+	 * @var KnowledgeRecord $knowledgerecord {@type KnowledgeRecord}
+	 */
+	public $knowledgerecord;
+
+	/**
+	 * Constructor
+	 *
+	 * @url     GET /
+	 *
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->knowledgerecord = new KnowledgeRecord($this->db);
+	}
+
+	/**
+	 * Get properties of a knowledgerecord object
+	 *
+	 * Return an array with knowledgerecord informations
+	 *
+	 * @param 	int 	$id ID of knowledgerecord
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url	GET knowledgerecords/{id}
+	 *
+	 * @throws RestException 401 Not allowed
+	 * @throws RestException 404 Not found
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->knowledgemanagement->knowledgerecord->read) {
+			throw new RestException(401);
+		}
+
+		$result = $this->knowledgerecord->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'KnowledgeRecord not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('knowledgerecord', $this->knowledgerecord->id, 'knowledgemanagement_knowledgerecord')) {
+			throw new RestException(401, 'Access to instance id='.$this->knowledgerecord->id.' of object not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		return $this->_cleanObjectDatas($this->knowledgerecord);
+	}
+
+
+	/**
+	 * 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')"
+	 * @return  array                               Array of order objects
+	 *
+	 * @throws RestException
+	 *
+	 * @url	GET /knowledgerecords/
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
+
+		$obj_ret = array();
+		$tmpobject = new KnowledgeRecord($this->db);
+
+		if (!DolibarrApiAccess::$user->rights->knowledgemanagement->knowledgerecord->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 KnowledgeRecord($this->db);
+				if ($tmp_object->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($tmp_object);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving knowledgerecord list: '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No knowledgerecord found');
+		}
+		return $obj_ret;
+	}
+
+	/**
+	 * Create knowledgerecord object
+	 *
+	 * @param array $request_data   Request datas
+	 * @return int  ID of knowledgerecord
+	 *
+	 * @throws RestException
+	 *
+	 * @url	POST knowledgerecords/
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->knowledgemanagement->knowledgerecord->write) {
+			throw new RestException(401);
+		}
+
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
+
+		foreach ($request_data as $field => $value) {
+			$this->knowledgerecord->$field = $this->_checkValForAPI($field, $value, $this->knowledgerecord);
+		}
+
+		// Clean data
+		// $this->knowledgerecord->abc = checkVal($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));
+		}
+		return $this->knowledgerecord->id;
+	}
+
+	/**
+	 * Update knowledgerecord
+	 *
+	 * @param int   $id             Id of knowledgerecord to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 *
+	 * @throws RestException
+	 *
+	 * @url	PUT knowledgerecords/{id}
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->knowledgemanagement->knowledgerecord->write) {
+			throw new RestException(401);
+		}
+
+		$result = $this->knowledgerecord->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'KnowledgeRecord not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('knowledgerecord', $this->knowledgerecord->id, 'knowledgemanagement_knowledgerecord')) {
+			throw new RestException(401, 'Access to instance id='.$this->knowledgerecord->id.' of object not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') {
+				continue;
+			}
+			$this->knowledgerecord->$field = $this->_checkValForAPI($field, $value, $this->knowledgerecord);
+		}
+
+		// Clean data
+		// $this->knowledgerecord->abc = checkVal($this->knowledgerecord->abc, 'alphanohtml');
+
+		if ($this->knowledgerecord->update(DolibarrApiAccess::$user, false) > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->knowledgerecord->error);
+		}
+	}
+
+	/**
+	 * Delete knowledgerecord
+	 *
+	 * @param   int     $id   KnowledgeRecord ID
+	 * @return  array
+	 *
+	 * @throws RestException
+	 *
+	 * @url	DELETE knowledgerecords/{id}
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->knowledgemanagement->knowledgerecord->delete) {
+			throw new RestException(401);
+		}
+		$result = $this->knowledgerecord->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'KnowledgeRecord not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('knowledgerecord', $this->knowledgerecord->id, 'knowledgemanagement_knowledgerecord')) {
+			throw new RestException(401, 'Access to instance id='.$this->knowledgerecord->id.' of object not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		if (!$this->knowledgerecord->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when deleting KnowledgeRecord : '.$this->knowledgerecord->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'KnowledgeRecord 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)
+	{
+		$knowledgerecord = array();
+		foreach ($this->knowledgerecord->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");
+			}
+			$knowledgerecord[$field] = $data[$field];
+		}
+		return $knowledgerecord;
+	}
+}
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index f7af4a4559f..8b1635273cd 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -1,6 +1,5 @@
 <?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
@@ -51,7 +50,7 @@ class KnowledgeRecord extends CommonObject
 	 * @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 object support extrafields ? 0=No, 1=Yes
@@ -70,7 +69,7 @@ class KnowledgeRecord extends CommonObject
 
 
 	/**
-	 *  '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')
+	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:SortField]]]', '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
@@ -91,6 +90,7 @@ class KnowledgeRecord extends CommonObject
 	 *  '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.
+	 *  '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.
 	 */
@@ -101,23 +101,26 @@ 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, 'visible'=>5, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object"),
+		'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),
+		'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'),
+		'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,),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>2,),
 		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
 		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserCreation', '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,),
 		'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>'1', 'position'=>512, 'notnull'=>0, '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,),
-		'question' => array('type'=>'text', 'label'=>'Question', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'csslist'=>'tdoverflow300'),
-		'answer' => array('type'=>'html', 'label'=>'Solution', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>3, 'csslist'=>'tdoverflow300'),
 		//'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', 'label'=>'GroupOfTicket', 'enabled'=>'$conf->ticket->enabled', 'position'=>512, 'notnull'=>0, 'visible'=>-1, 'help'=>'YouCanLinkArticleToATicketCategory'),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated'),),
+		'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;
 	public $ref;
+	public $entity;
 	public $date_creation;
 	public $tms;
 	public $last_main_doc;
@@ -130,6 +133,7 @@ class KnowledgeRecord extends CommonObject
 	public $answer;
 	public $url;
 	public $status;
+	public $lang;
 	// END MODULEBUILDER PROPERTIES
 
 
@@ -385,27 +389,27 @@ class KnowledgeRecord extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$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).'%\'';
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -454,6 +458,15 @@ class KnowledgeRecord extends CommonObject
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
+		$error = 0;
+		$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) {
+			$error++;
+			$this->error .= $this->db->lasterror();
+			$errorflag = -1;
+		}
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
 	}
@@ -814,12 +827,12 @@ class KnowledgeRecord extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("knowledgemanagement");
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated');
-			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled');
-			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated');
-			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Obsolete');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Obsolete');
 		}
 
 		$statusType = 'status'.$status;
@@ -1034,6 +1047,22 @@ class KnowledgeRecord extends CommonObject
 
 		return $error;
 	}
+
+	/**
+	 * Sets object to supplied categories.
+	 *
+	 * Deletes object from existing categories not supplied.
+	 * Adds it to non existing supplied categories.
+	 * Existing categories are left untouch.
+	 *
+	 * @param int[]|int $categories Category or categories IDs
+	 * @return void
+	 */
+	public function setCategories($categories)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		return parent::setCategoriesCommon($categories, Categorie::TYPE_KNOWLEDGEMANAGEMENT);
+	}
 }
 
 
diff --git a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
index 48efbfbc8eb..8cdbee53395 100644
--- a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
+++ b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
@@ -3,7 +3,7 @@
  * 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) 2019-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
@@ -21,7 +21,7 @@
  */
 
 /**
- * \file       htdocs/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
+ * \file       htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
  * \ingroup    knowledgemanagement
  * \brief      File containing class for advanced numbering model of KnowledgeRecord
  */
@@ -81,7 +81,7 @@ class mod_knowledgerecord_advanced extends ModeleNumRefKnowledgeRecord
 		$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="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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
diff --git a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
index 9833fa9bfb7..ba5a3c3b391 100644
--- a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
+++ b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *  \file       htdocs/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
+ *  \file       htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
  *  \ingroup    knowledgemanagement
  *  \brief      File of class to manage KnowledgeRecord numbering rules standard
  */
diff --git a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php
index 58def153c4b..edfe6beff62 100644
--- a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php
+++ b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php
@@ -23,7 +23,7 @@
  */
 
 /**
- *  \file			htdocs/core/modules/knowledgemanagement/modules_knowledgerecord.php
+ *  \file			htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php
  *  \ingroup		knowledgemanagement
  *  \brief			File that contains parent class for knowledgerecords document models and parent class for knowledgerecords numbering models
  */
diff --git a/htdocs/knowledgemanagement/knowledgemanagementindex.php b/htdocs/knowledgemanagement/knowledgemanagementindex.php
index d9b1f07e6e0..ccb3503eb2f 100644
--- a/htdocs/knowledgemanagement/knowledgemanagementindex.php
+++ b/htdocs/knowledgemanagement/knowledgemanagementindex.php
@@ -145,7 +145,7 @@ if (! empty($conf->knowledgemanagement->enabled) && $user->rights->knowledgemana
 END MODULEBUILDER DRAFT MYOBJECT */
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 $NBMAX = (empty($conf->global->MAIN_SIZE_SHORTLIST_LIMIT) ? 25 : $conf->global->MAIN_SIZE_SHORTLIST_LIMIT);
@@ -202,7 +202,7 @@ if (! empty($conf->knowledgemanagement->enabled) && $user->rights->knowledgemana
 }
 */
 
-print '</div></div></div>';
+print '</div></div>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/knowledgemanagement/knowledgerecord_agenda.php b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
index 7853aa7e2ff..81750e720c7 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_agenda.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
@@ -53,8 +53,8 @@ if (GETPOST('actioncode', 'array')) {
 $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');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -154,7 +154,7 @@ if ($object->id > 0) {
 		$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.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			}
 			$morehtmlref.=' : ';
 			if ($action == 'classify') {
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index dbab7ec0528..2fcf05a4393 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -1,6 +1,5 @@
 <?php
-/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
+/* Copyright (C) 2017-2021 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
@@ -28,8 +27,10 @@ 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.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/class/knowledgerecord.class.php';
 require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("knowledgemanagement", "ticket", "other"));
@@ -103,20 +104,25 @@ if ($reshook < 0) {
 if (empty($reshook)) {
 	$error = 0;
 
-	$backurlforlist = dol_buildpath('/knowledgemanagement/knowledgerecord_list.php', 1);
+	$backurlforlist = DOL_URL_ROOT.'/knowledgemanagement/knowledgerecord_list.php';
 
 	if (empty($backtopage) || ($cancel && empty($id))) {
 		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = dol_buildpath('/knowledgemanagement/knowledgerecord_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+				$backtopage = DOL_URL_ROOT.'/knowledgemanagement/knowledgerecord_card.php?id='.($id > 0 ? $id : '__ID__');
 			}
 		}
 	}
 
 	$triggermodname = 'KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_MODIFY'; // Name of trigger action code to execute when we modify record
 
+	// Upadate / add for lang
+	if (($action == 'update' || $action == 'add') && !empty($permissiontoadd)) {
+		$object->lang = (GETPOSTISSET('langkm') ? GETPOST('langkm', 'aZ09') : $object->lang);
+	}
+
 	// 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';
 
@@ -156,6 +162,7 @@ if ($action == 'confirm_validate') {
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproject = new FormProjets($db);
+$formadmin = new FormAdmin($db);
 
 $title = $langs->trans("KnowledgeRecord");
 $help_url = '';
@@ -168,10 +175,10 @@ 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.'">';
 	}
 
@@ -185,6 +192,17 @@ if ($action == 'create') {
 	// Common attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
 
+	if (!empty($conf->categorie->enabled)) {
+		$cate_arbo = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', 'parent', 64, 0, 1);
+
+		if (count($cate_arbo)) {
+			// Categories
+			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
+			print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+			print "</td></tr>";
+		}
+	}
+
 	// Other attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
@@ -192,11 +210,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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 $form->buttonsSaveCancel('Create');
 
 	print '</form>';
 
@@ -211,10 +225,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.'">';
 	}
 
@@ -225,6 +239,25 @@ if (($id || $ref) && $action == 'edit') {
 	// Common attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
 
+	if (!empty($conf->categorie->enabled)) {
+		$cate_arbo = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', 'parent', 64, 0, 1);
+
+		if (count($cate_arbo)) {
+			// Categories
+			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
+			$c = new Categorie($db);
+			$cats = $c->containing($object->id, Categorie::TYPE_KNOWLEDGEMANAGEMENT);
+			$arrayselected = array();
+			if (is_array($cats)) {
+				foreach ($cats as $cat) {
+					$arrayselected[] = $cat->id;
+				}
+			}
+			print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+			print "</td></tr>";
+		}
+	}
+
 	// Other attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
 
@@ -232,9 +265,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	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->buttonsSaveCancel();
 
 	print '</form>';
 }
@@ -263,6 +294,56 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
 
+	// Confirmation of action xxxx (You can use it for xxx = 'close', xxx = 'reopen', ...)
+	if ($action == 'close') {
+		$text = $langs->trans('ConfirmCloseKM', $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('MYOBJECT_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('SetObsolete'), $text, 'confirm_close', $formquestion, 0, 1, 220);
+	}
+
+	// Confirmation of action xxxx (You can use it for xxx = 'close', xxx = 'reopen', ...)
+	if ($action == 'reopen') {
+		$text = $langs->trans('ConfirmReopenKM', $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('MYOBJECT_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('Re-Open'), $text, 'confirm_reopen', $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
@@ -278,7 +359,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/knowledgemanagement/knowledgerecord_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/knowledgemanagement/knowledgerecord_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
 	/*
@@ -292,7 +373,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
 	 if ($permissiontoadd) {
-	 //if ($action != 'classify') $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
+	 //if ($action != 'classify') $morehtmlref.='<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);
@@ -332,6 +413,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
+	// Categories
+	if ($conf->categorie->enabled) {
+		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td colspan="3">';
+		print $form->showCategories($object->id, Categorie::TYPE_KNOWLEDGEMANAGEMENT, 1);
+		print "</td></tr>";
+	}
+
 	// Other attributes. Fields from hook formObjectOptions and Extrafields.
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
@@ -364,13 +452,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			if ($object->status == $object::STATUS_VALIDATED) {
 				print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes', '', $permissiontoadd);
 			}
-			if ($object->status == $object::STATUS_VALIDATED && $permissiontovalidate) {
-				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit', '', $permissiontoadd);
+			if (($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) && $permissiontovalidate) {
+				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)) && $permissiontovalidate) {
-					print dolGetButtonAction($langs->trans('ValidateReply'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', $permissiontoadd);
+					print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&token='.newToken().'&confirm=yes', '', $permissiontoadd);
 				} else {
 					$langs->load("errors");
 					//print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', 0);
@@ -379,7 +467,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 			// Clone
-			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=scrumsprint', '', $permissiontoadd);
+			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&token='.newToken().'&object=scrumsprint', '', $permissiontoadd);
 
 			/*
 			if ($permissiontoadd) {
@@ -389,17 +477,17 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$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&token='.newToken().'">'.$langs->trans("Cancel").'</a>'."\n";
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken().'">'.$langs->trans("SetObsolete").'</a>'."\n";
 				} else {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Re-Open").'</a>'."\n";
 				}
 			}
-			*/
 
 			// 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 || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+			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";
 	}
@@ -432,20 +520,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		$MAXEVENT = 10;
 
-		$morehtmlright = '<a href="'.dol_buildpath('/knowledgemanagement/knowledgerecord_agenda.php', 1).'?id='.$object->id.'">';
-		$morehtmlright .= $langs->trans("SeeAll");
-		$morehtmlright .= '</a>';
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt 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';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
+		$somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 	//Select mail models is same action as presend
diff --git a/htdocs/knowledgemanagement/knowledgerecord_contact.php b/htdocs/knowledgemanagement/knowledgerecord_contact.php
index 1eb80efafa1..c338653b840 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_contact.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_contact.php
@@ -139,7 +139,7 @@ if ($object->id) {
 	 if ($permissiontoadd)
 	 {
 	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/knowledgemanagement/knowledgerecord_document.php b/htdocs/knowledgemanagement/knowledgerecord_document.php
index 4a572ee22bb..dbffe6aa3da 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_document.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_document.php
@@ -43,8 +43,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -80,7 +80,7 @@ if ($id > 0 || !empty($ref)) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'knowledgemanagement', $object->id);
 
-$permissiontoadd = $user->rights->knowledgemanagement->knowledgerecord->write; // Used by the include of actions_addupdatedelete.inc.php
+$permissiontoadd = $user->rights->knowledgemanagement->knowledgerecord->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
 
 
 
@@ -137,7 +137,7 @@ if ($object->id) {
 	 if ($permissiontoadd)
 	 {
 	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index 4ada624f038..aed45b1db26 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
+ * 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
@@ -26,6 +26,7 @@
 require '../main.inc.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/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
@@ -88,7 +89,11 @@ $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alph
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
-		$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'));
@@ -99,7 +104,7 @@ foreach ($object->fields as $key => $val) {
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
-	if ($val['searchall']) {
+	if (!empty($val['searchall'])) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
@@ -197,12 +202,13 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 $user_temp = new User($db);
+$formadmin = new FormAdmin($db);
 
 $now = dol_now();
 
 //$help_url="EN:Module_KnowledgeRecord|FR:Module_KnowledgeRecord_FR|ES:Módulo_KnowledgeRecord";
 $help_url = '';
-$title = $langs->trans('ListOfArticles');
+$title = $langs->trans('ListKnowledgeRecord');
 $morejs = array();
 $morecss = array();
 
@@ -214,13 +220,13 @@ $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'])) {
@@ -278,7 +284,7 @@ $sql .= $hookmanager->resPrint;
 /* If a group by is required
 $sql.= " GROUP BY ";
 foreach($object->fields as $key => $val) {
-	$sql.='t.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -365,13 +371,13 @@ $param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
-	//'validate'=>$langs->trans("Validate"),
-	//'generate_doc'=>$langs->trans("ReGeneratePDF"),
-	//'builddoc'=>$langs->trans("PDFMerge"),
-	//'presend'=>$langs->trans("SendByMail"),
+	'validate'=>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'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
@@ -438,6 +444,7 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
+	$searchkey = empty($search[$key]) ? '' : $search[$key];
 	$cssforfield = (empty($val['css']) ? '' : $val['css']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
@@ -450,12 +457,11 @@ foreach ($object->fields as $key => $val) {
 	}
 	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'], $searchkey, $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, $searchkey, '', '', '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'));
@@ -463,6 +469,10 @@ 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') {
+			print $formadmin->select_language($searchkey, '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 '</td>';
 	}
@@ -513,7 +523,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 (!empty($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
@@ -592,6 +602,10 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 					}
 					print $user_temp->getNomUrl(-1);
 				}
+			} elseif ($key == 'lang') {
+				$labellang = ($object->lang ? $langs->trans('Language_'.$object->lang) : '');
+				print picto_from_langcode($object->lang, 'class="paddingrightonly saturatemedium opacitylow"');
+				print $labellang;
 			} else {
 				print $object->showOutputField($val, $key, $object->$key, '');
 			}
@@ -599,7 +613,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
diff --git a/htdocs/knowledgemanagement/knowledgerecord_note.php b/htdocs/knowledgemanagement/knowledgerecord_note.php
index a6a9974a9c8..2e58480adec 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_note.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_note.php
@@ -66,7 +66,13 @@ $permissiontoadd = $user->rights->knowledgemanagement->knowledgerecord->write; /
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$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
+}
 
 
 /*
@@ -105,7 +111,7 @@ if ($id > 0 || !empty($ref)) {
 	 if ($permissiontoadd)
 	 {
 	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php b/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
index e70b4654d19..e77439970ba 100644
--- a/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
+++ b/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) ---Put here your own copyright and developer email---
+/* 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
@@ -16,7 +16,7 @@
  */
 
 /**
- * \file    htdocs/knowledgemanagementlib/knowledgemanagement_knowledgerecord.lib.php
+ * \file    htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
  * \ingroup knowledgemanagement
  * \brief   Library files with common functions for KnowledgeRecord
  */
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/accountancy.lang b/htdocs/langs/am_ET/accountancy.lang
index c20e0a339f6..8bc4b54a090 100644
--- a/htdocs/langs/am_ET/accountancy.lang
+++ b/htdocs/langs/am_ET/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang
index 8e38468846c..d79adb1e960 100644
--- a/htdocs/langs/am_ET/admin.lang
+++ b/htdocs/langs/am_ET/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Version
 Publisher=Publisher
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/am_ET/banks.lang b/htdocs/langs/am_ET/banks.lang
index 6c770163f29..f066877f676 100644
--- a/htdocs/langs/am_ET/banks.lang
+++ b/htdocs/langs/am_ET/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/am_ET/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/am_ET/bookmarks.lang
+++ b/htdocs/langs/am_ET/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/am_ET/companies.lang b/htdocs/langs/am_ET/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/am_ET/companies.lang
+++ b/htdocs/langs/am_ET/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/am_ET/compta.lang b/htdocs/langs/am_ET/compta.lang
index 97b990f62b4..640a229b7f2 100644
--- a/htdocs/langs/am_ET/compta.lang
+++ b/htdocs/langs/am_ET/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/am_ET/errors.lang b/htdocs/langs/am_ET/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/am_ET/holiday.lang
index 0527f4c0788..3d0ae64be0f 100644
--- a/htdocs/langs/am_ET/holiday.lang
+++ b/htdocs/langs/am_ET/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/am_ET/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/am_ET/install.lang
+++ b/htdocs/langs/am_ET/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/am_ET/main.lang
index 7124b2d7b1b..2d850927782 100644
--- a/htdocs/langs/am_ET/main.lang
+++ b/htdocs/langs/am_ET/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ 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
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/am_ET/modulebuilder.lang b/htdocs/langs/am_ET/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/am_ET/modulebuilder.lang
+++ b/htdocs/langs/am_ET/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 9bc68dc3678..49ff93dd589 100644
--- a/htdocs/langs/am_ET/other.lang
+++ b/htdocs/langs/am_ET/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/am_ET/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/am_ET/partnership.lang
+++ b/htdocs/langs/am_ET/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/am_ET/productbatch.lang b/htdocs/langs/am_ET/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/am_ET/productbatch.lang
+++ b/htdocs/langs/am_ET/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/am_ET/products.lang b/htdocs/langs/am_ET/products.lang
index 205a28980a8..14715670882 100644
--- a/htdocs/langs/am_ET/products.lang
+++ b/htdocs/langs/am_ET/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/am_ET/projects.lang b/htdocs/langs/am_ET/projects.lang
index 5a2911bac0b..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,3 +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/am_ET/stocks.lang b/htdocs/langs/am_ET/stocks.lang
index a2a335be8f6..599c9649b18 100644
--- a/htdocs/langs/am_ET/stocks.lang
+++ b/htdocs/langs/am_ET/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/am_ET/stripe.lang b/htdocs/langs/am_ET/stripe.lang
index 844762040af..2c95bcfce27 100644
--- a/htdocs/langs/am_ET/stripe.lang
+++ b/htdocs/langs/am_ET/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/am_ET/withdrawals.lang b/htdocs/langs/am_ET/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/am_ET/withdrawals.lang
+++ b/htdocs/langs/am_ET/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/ar_DZ/accountancy.lang b/htdocs/langs/ar_DZ/accountancy.lang
index c20e0a339f6..8bc4b54a090 100644
--- a/htdocs/langs/ar_DZ/accountancy.lang
+++ b/htdocs/langs/ar_DZ/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/ar_DZ/admin.lang b/htdocs/langs/ar_DZ/admin.lang
index 8e38468846c..d79adb1e960 100644
--- a/htdocs/langs/ar_DZ/admin.lang
+++ b/htdocs/langs/ar_DZ/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Version
 Publisher=Publisher
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/ar_DZ/banks.lang b/htdocs/langs/ar_DZ/banks.lang
index 6c770163f29..f066877f676 100644
--- a/htdocs/langs/ar_DZ/banks.lang
+++ b/htdocs/langs/ar_DZ/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/ar_DZ/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/ar_DZ/bookmarks.lang
+++ b/htdocs/langs/ar_DZ/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/ar_DZ/companies.lang b/htdocs/langs/ar_DZ/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/ar_DZ/companies.lang
+++ b/htdocs/langs/ar_DZ/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/ar_DZ/compta.lang b/htdocs/langs/ar_DZ/compta.lang
index 97b990f62b4..640a229b7f2 100644
--- a/htdocs/langs/ar_DZ/compta.lang
+++ b/htdocs/langs/ar_DZ/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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_DZ/errors.lang b/htdocs/langs/ar_DZ/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/ar_DZ/holiday.lang
index 0527f4c0788..3d0ae64be0f 100644
--- a/htdocs/langs/ar_DZ/holiday.lang
+++ b/htdocs/langs/ar_DZ/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/ar_DZ/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/ar_DZ/install.lang
+++ b/htdocs/langs/ar_DZ/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/ar_DZ/main.lang
index 7124b2d7b1b..2d850927782 100644
--- a/htdocs/langs/ar_DZ/main.lang
+++ b/htdocs/langs/ar_DZ/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ 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
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/ar_DZ/modulebuilder.lang b/htdocs/langs/ar_DZ/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/ar_DZ/modulebuilder.lang
+++ b/htdocs/langs/ar_DZ/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 9bc68dc3678..49ff93dd589 100644
--- a/htdocs/langs/ar_DZ/other.lang
+++ b/htdocs/langs/ar_DZ/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/ar_DZ/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/ar_DZ/partnership.lang
+++ b/htdocs/langs/ar_DZ/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/ar_DZ/productbatch.lang b/htdocs/langs/ar_DZ/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/ar_DZ/productbatch.lang
+++ b/htdocs/langs/ar_DZ/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/ar_DZ/products.lang b/htdocs/langs/ar_DZ/products.lang
index 205a28980a8..14715670882 100644
--- a/htdocs/langs/ar_DZ/products.lang
+++ b/htdocs/langs/ar_DZ/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ar_DZ/projects.lang b/htdocs/langs/ar_DZ/projects.lang
index 5a2911bac0b..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,3 +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_DZ/stocks.lang b/htdocs/langs/ar_DZ/stocks.lang
index a2a335be8f6..599c9649b18 100644
--- a/htdocs/langs/ar_DZ/stocks.lang
+++ b/htdocs/langs/ar_DZ/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/ar_DZ/stripe.lang b/htdocs/langs/ar_DZ/stripe.lang
index a536ffd81e7..2c95bcfce27 100644
--- a/htdocs/langs/ar_DZ/stripe.lang
+++ b/htdocs/langs/ar_DZ/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
diff --git a/htdocs/langs/ar_DZ/withdrawals.lang b/htdocs/langs/ar_DZ/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/ar_DZ/withdrawals.lang
+++ b/htdocs/langs/ar_DZ/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
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/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/members.lang b/htdocs/langs/ar_EG/members.lang
index ac7c1067982..f8082fe9fe8 100644
--- a/htdocs/langs/ar_EG/members.lang
+++ b/htdocs/langs/ar_EG/members.lang
@@ -2,4 +2,3 @@
 MemberStatusDraft=مسودة(مطلوب الاعتماد)
 MemberStatusActiveShort=معتمد
 MemberStatusNoSubscriptionShort=معتمد
-NewSubscription=New contribution
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_IQ/accountancy.lang b/htdocs/langs/ar_IQ/accountancy.lang
deleted file mode 100644
index c20e0a339f6..00000000000
--- a/htdocs/langs/ar_IQ/accountancy.lang
+++ /dev/null
@@ -1,435 +0,0 @@
-# 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 were 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 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...
-
-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
-
-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.
-
-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=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
-
-
-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 operation lines from accounting
-DelMonth=Month to delete
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
-FinanceJournal=Finance journal
-ExpenseReportsJournal=Expense reports journal
-DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
-VATAccountNotDefined=Account for VAT not defined
-ThirdpartyAccountNotDefined=Account for third party not defined
-ProductAccountNotDefined=Account for product not defined
-FeeAccountNotDefined=Account for fee not defined
-BankAccountNotDefined=Account for bank not defined
-CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Third-party account
-NewAccountingMvt=New transaction
-NumMvts=Numero of transaction
-ListeMvts=List of movements
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-AddCompteFromBK=Add accounting accounts to the group
-ReportThirdParty=List third-party account
-DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
-ListAccounts=List of the accounting accounts
-UnknownAccountForThirdparty=Unknown third-party account. We will use %s
-UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user unknown. Blocking error.
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
-PaymentsNotLinkedToProduct=Payment not linked to any product / service
-OpeningBalance=Opening balance
-ShowOpeningBalance=Show opening balance
-HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by level
-
-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 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
-
-ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
-
-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
-
-## 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 (modification of the lines will not be possible)
-NotifiedValidationDate=Validate the exported entries (modification or deletion of the lines will not be possible)
-ConfirmExportFile=Confirmation of the generation of the accounting export file ?
-ExportDraftJournal=Export draft journal
-Modelcsv=Model of export
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export for CEGID Expert Comptabilité
-Modelcsv_COALA=Export for Sage Coala
-Modelcsv_bob50=Export for Sage BOB 50
-Modelcsv_ciel=Export for Sage50, Ciel Compta or Compta Evo. (Format XIMPORT)
-Modelcsv_quadratus=Export for Quadratus QuadraCompta
-Modelcsv_ebp=Export for EBP
-Modelcsv_cogilog=Export for Cogilog
-Modelcsv_agiris=Export for Agiris Isacompta
-Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
-Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
-Modelcsv_openconcerto=Export for OpenConcerto (Test)
-Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC
-Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
-Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
-Modelcsv_winfic=Export for Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5=Export for Gestinum (v5)
-Modelcsv_charlemagne=Export for Aplim Charlemagne
-ChartofaccountsId=Chart of accounts Id
-
-## 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.
-
-## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
-Formula=Formula
-
-## 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
-
-## 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_IQ/admin.lang b/htdocs/langs/ar_IQ/admin.lang
deleted file mode 100644
index 8e38468846c..00000000000
--- a/htdocs/langs/ar_IQ/admin.lang
+++ /dev/null
@@ -1,2211 +0,0 @@
-# Dolibarr language file - Source file is en_US - admin
-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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
-HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-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, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
-SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
-NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
-InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Browse to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-LastActivationAuthor=Latest activation author
-LastActivationIP=Latest activation IP
-UpdateServerOffline=Update server offline
-WithCounter=Manage a counter
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags 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)
-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
-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
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-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=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
-Permission20007=Approve leave requests
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
-Permission50152=Edit sales lines
-Permission50153=Edit ordered sales lines
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
-Permission50401=Bind products and invoices with accounting accounts
-Permission50411=Read operations in ledger
-Permission50412=Write/Edit operations in ledger
-Permission50414=Delete operations in ledger
-Permission50415=Delete all operations by year and journal in ledger
-Permission50418=Export operations of the ledger
-Permission50420=Report and export reports (turnover, balance, journals, ledger)
-Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
-Permission50440=Manage chart of accounts, setup of accountancy
-Permission51001=Read assets
-Permission51002=Create/Update assets
-Permission51003=Delete assets
-Permission51005=Setup types of asset
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-Permission64001=Allow direct printing
-Permission67000=Allow printing of receipts
-Permission68001=Read intracomm report
-Permission68002=Create/modify intracomm report
-Permission68004=Delete intracomm report
-Permission941601=Read receipts
-Permission941602=Create and modify receipts
-Permission941603=Validate receipts
-Permission941604=Send receipts by email
-Permission941605=Export receipts
-Permission941606=Delete receipts
-DictionaryCompanyType=Third-party types
-DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
-DictionaryCanton=States/Provinces
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Honorific titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Types of social or fiscal taxes
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of tax stamps
-DictionaryPaymentConditions=Payment Terms
-DictionaryPaymentModes=Payment Modes
-DictionaryTypeContact=Contact/Address types
-DictionaryTypeOfContainer=Website - Type of website pages/containers
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Card formats
-DictionaryFees=Expense report - Types of expense report lines
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Number of Employees
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Order methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Personalized groups for reports
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryAccountancyJournal=Accounting journals
-DictionaryEMailTemplates=Email Templates
-DictionaryUnits=Units
-DictionaryMeasuringUnits=Measuring Units
-DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Leave - Types of leave
-DictionaryOpportunityStatus=Lead status for project/lead
-DictionaryExpenseTaxCat=Expense report - Transportation categories
-DictionaryExpenseTaxRange=Expense report - Range by transportation category
-DictionaryTransportMode=Intracomm report - Transport mode
-DictionaryBatchStatus=Product lot/serial Quality Control status
-TypeOfUnit=Type of unit
-SetupSaved=Setup saved
-SetupNotSaved=Setup not saved
-BackToModuleList=Back to Module list
-BackToDictionaryList=Back to Dictionaries list
-TypeOfRevenueStamp=Type of tax stamp
-VATManagement=Sales Tax Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
-VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
-VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
-##### 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=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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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
-##### 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
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
-##### 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".
-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
-MailToTicket=Tickets
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
-ModelModulesProduct=Templates for product documents
-WarehouseModelModules=Templates for documents of warehouses
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-SeeChangeLog=See ChangeLog file (english only)
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDataTables=Add object tables
-AddDictionaries=Add dictionaries tables
-AddData=Add objects or dictionaries data
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
-ListOfAvailableAPIs=List of available APIs
-activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
-CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
-LandingPage=Landing page
-SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
-ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
-UserHasNoPermissions=This user has no permissions defined
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
-BaseCurrency=Reference currency of the company (go into setup of company to change this)
-WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
-WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
-WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
-MAIN_PDF_MARGIN_LEFT=Left margin on PDF
-MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
-MAIN_PDF_MARGIN_TOP=Top margin on PDF
-MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
-MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
-MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipent address frame
-MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
-MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
-PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
-PROPOSAL_PDF_HIDE_PAYMENTMODE=Hide payment mode
-MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
-NothingToSetup=There is no specific setup required for this module.
-SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
-SeveralLangugeVariatFound=Several language variants found
-RemoveSpecialChars=Remove special characters
-COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
-COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
-COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
-GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
-HelpOnTooltip=Help text to show on tooltip
-HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
-YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
-ChartLoaded=Chart of account loaded
-SocialNetworkSetup=Setup of module Social Networks
-EnableFeatureFor=Enable features for <strong>%s</strong>
-VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
-EmailCollector=Email collector
-EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
-NewEmailCollector=New Email Collector
-EMailHost=Host of email IMAP server
-MailboxSourceDirectory=Mailbox source directory
-MailboxTargetDirectory=Mailbox target directory
-EmailcollectorOperations=Operations to do by collector
-EmailcollectorOperationsDesc=Operations are executed from top to bottom order
-MaxEmailCollectPerCollect=Max number of emails collected per collect
-CollectNow=Collect now
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date of latest collect try
-DateLastcollectResultOk=Date of latest collect success
-LastResult=Latest result
-EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
-NoNewEmailToProcess=No new email (matching filters) to process
-NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
-CodeLastResult=Latest result code
-NbOfEmailsInInbox=Number of emails in source directory
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=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 values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-OpeningHours=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 a string 'Name: name to find' found into the body, use 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
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
-FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
-MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
-MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
-DictionaryProductNature= Nature of product
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
-CombinationsSeparator=Separator character for product combinations
-SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
-SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
-AskThisIDToYourBank=Contact your bank to get this ID
-AdvancedModeOnly=Permision available in Advanced permission mode only
-ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
-MailToSendEventOrganization=Event Organization
-MailToPartnership=Partnership
-AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
-YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-Recommended=Recommended
-NotRecommended=Not recommended
-ARestrictedPath=Some restricted path
-CheckForModuleUpdate=Check for external modules updates
-CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
-ModuleUpdateAvailable=An update is available
-NoExternalModuleWithUpdate=No updates found for external modules
-SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
-YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
-RandomlySelectedIfSeveral=Randomly selected if several pictures are available
-DatabasePasswordObfuscated=Database password is obfuscated in conf file
-DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
-APIsAreNotEnabled=APIs modules are not enabled
-YouShouldSetThisToOff=You should set this to 0 or off
-InstallAndUpgradeLockedBy=Install and upgrades are locked by the file <b>%s</b>
-OldImplementation=Old implementation
-PDF_SHOW_LINK_TO_ONLINE_PAYMENT=If some online payment modules are enabled (Paypal, Stripe, ...), add a link on the PDF to make the online payment
-DashboardDisableGlobal=Disable globally all the thumbs of open objects
-BoxstatsDisableGlobal=Disable totally box statistics
-DashboardDisableBlocks=Thumbs of open objects (to process or late) on main dashboard
-DashboardDisableBlockAgenda=Disable the thumb for agenda
-DashboardDisableBlockProject=Disable the thumb for projects
-DashboardDisableBlockCustomer=Disable the thumb for customers
-DashboardDisableBlockSupplier=Disable the thumb for suppliers
-DashboardDisableBlockContract=Disable the thumb for contracts
-DashboardDisableBlockTicket=Disable the thumb for tickets
-DashboardDisableBlockBank=Disable the thumb for banks
-DashboardDisableBlockAdherent=Disable the thumb for memberships
-DashboardDisableBlockExpenseReport=Disable the thumb for expense reports
-DashboardDisableBlockHoliday=Disable the thumb for leaves
-EnabledCondition=Condition to have field enabled (if not enabled, visibility will always be off)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
-LanguageAndPresentation=Language and presentation
-SkinAndColors=Skin and colors
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
-PDF_USE_1A=Generate PDF with PDF/A-1b format
diff --git a/htdocs/langs/ar_IQ/agenda.lang b/htdocs/langs/ar_IQ/agenda.lang
deleted file mode 100644
index db135467608..00000000000
--- a/htdocs/langs/ar_IQ/agenda.lang
+++ /dev/null
@@ -1,174 +0,0 @@
-# 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
-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
-##### 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_IQ/assets.lang b/htdocs/langs/ar_IQ/assets.lang
deleted file mode 100644
index afafc98503f..00000000000
--- a/htdocs/langs/ar_IQ/assets.lang
+++ /dev/null
@@ -1,67 +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/>.
-
-#
-# 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'
-
-# Module label 'ModuleAssetsName'
-ModuleAssetsName = Assets
-# Module description 'ModuleAssetsDesc'
-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
-
-#
-# Menu
-#
-MenuAssets = Assets
-MenuNewAsset = New asset
-MenuTypeAssets = Type assets
-MenuListAssets = List
-MenuNewTypeAssets = New
-MenuListTypeAssets = List
-
-#
-# Module
-#
-Asset=Asset
-NewAssetType=New asset type
-NewAsset=New asset
-ConfirmDeleteAsset=Are you sure you want to delete this asset ?
diff --git a/htdocs/langs/ar_IQ/banks.lang b/htdocs/langs/ar_IQ/banks.lang
deleted file mode 100644
index 6c770163f29..00000000000
--- a/htdocs/langs/ar_IQ/banks.lang
+++ /dev/null
@@ -1,185 +0,0 @@
-# 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
-SwiftVNotalid=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
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
-CreateAccount=Create account
-NewBankAccount=New account
-NewFinancialAccount=New financial account
-MenuNewFinancialAccount=New financial account
-EditFinancialAccount=Edit account
-LabelBankCashAccount=Bank or cash label
-AccountType=Account type
-BankType0=Savings account
-BankType1=Current or credit card account
-BankType2=Cash account
-AccountsArea=Accounts area
-AccountCard=Account card
-DeleteAccount=Delete account
-ConfirmDeleteAccount=Are you sure you want to delete this account?
-Account=Account
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
-RemoveFromRubrique=Remove link with category
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
-IdTransaction=Transaction ID
-BankTransactions=Bank entries
-BankTransaction=Bank entry
-ListTransactions=List entries
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
-TransactionsToConciliateShort=To reconcile
-Conciliable=Can be reconciled
-Conciliate=Reconcile
-Conciliation=Reconciliation
-SaveStatementOnly=Save statement only
-ReconciliationLate=Reconciliation late
-IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
-AccountToCredit=Account to credit
-AccountToDebit=Account to debit
-DisableConciliation=Disable reconciliation feature for this account
-ConciliationDisabled=Reconciliation feature disabled
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
-StatusAccountClosed=Closed
-AccountIdShort=Number
-LineRecord=Transaction
-AddBankRecord=Add entry
-AddBankRecordLong=Add entry manually
-Conciliated=Reconciled
-ConciliatedBy=Reconciled by
-DateConciliating=Reconcile date
-BankLineConciliated=Entry reconciled with bank receipt
-Reconciled=Reconciled
-NotReconciled=Not reconciled
-CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Vendor payment
-SubscriptionPayment=Subscription payment
-WithdrawalPayment=Debit payment order
-SocialContributionPayment=Social/fiscal tax payment
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
-MenuBankInternalTransfer=Internal transfer
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
-TransferFrom=From
-TransferTo=To
-TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Sender
-ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
-DeleteCheckReceipt=Delete this check receipt?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
-BankChecks=Bank checks
-BankChecksToReceipt=Checks awaiting deposit
-BankChecksToReceiptShort=Checks awaiting deposit
-ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=No. of check
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
-BankMovements=Movements
-PlannedTransactions=Planned entries
-Graph=Graphs
-ExportDataset_banque_1=Bank entries and account statement
-ExportDataset_banque_2=Deposit slip
-TransactionOnTheOtherAccount=Transaction on the other account
-PaymentNumberUpdateSucceeded=Payment number updated successfully
-PaymentNumberUpdateFailed=Payment number could not be updated
-PaymentDateUpdateSucceeded=Payment date updated successfully
-PaymentDateUpdateFailed=Payment date could not be updated
-Transactions=Transactions
-BankTransactionLine=Bank entry
-AllAccounts=All bank and cash accounts
-BackToAccount=Back to account
-ShowAllAccounts=Show for all accounts
-FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
-EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To reconcile?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
-DefaultRIB=Default BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record?
-RejectCheck=Check returned
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
-RejectCheckDate=Date the check was returned
-CheckRejected=Check returned
-CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
-BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payment
-VariousPayment=Miscellaneous payment
-VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payment
-AddVariousPayment=Add miscellaneous payment
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
-SEPAMandate=SEPA mandate
-YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
-AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash desk control
-NewCashFence=New cash desk opening or closing
-BankColorizeMovement=Colorize movements
-BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
-BankColorizeMovementName1=Background color for debit movement
-BankColorizeMovementName2=Background color for credit movement
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
-NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
-AlreadyOneBankAccount=Already one bank account defined
diff --git a/htdocs/langs/ar_IQ/bills.lang b/htdocs/langs/ar_IQ/bills.lang
deleted file mode 100644
index 3aaa5465ca0..00000000000
--- a/htdocs/langs/ar_IQ/bills.lang
+++ /dev/null
@@ -1,606 +0,0 @@
-# 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 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
-PaymentAmount=Payment amount
-PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
-ClassifyPaid=Classify 'Paid'
-ClassifyUnPaid=Classify 'Unpaid'
-ClassifyPaidPartially=Classify 'Paid partially'
-ClassifyCanceled=Classify 'Abandoned'
-ClassifyClosed=Classify 'Closed'
-ClassifyUnBilled=Classify 'Unbilled'
-CreateBill=Create Invoice
-CreateCreditNote=Create credit note
-AddBill=Create invoice or credit note
-AddToDraftInvoices=Add to draft invoice
-DeleteBill=Delete invoice
-SearchACustomerInvoice=Search for a customer invoice
-SearchASupplierInvoice=Search for a vendor invoice
-CancelBill=Cancel an invoice
-SendRemindByMail=Send reminder by email
-DoPayment=Enter payment
-DoPaymentBack=Enter refund
-ConvertToReduc=Mark as credit available
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
-EnterPaymentReceivedFromCustomer=Enter payment received from customer
-EnterPaymentDueToCustomer=Make payment due to customer
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Base price
-BillStatus=Invoice status
-StatusOfGeneratedInvoices=Status of generated invoices
-BillStatusDraft=Draft (needs to be validated)
-BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Paid (ready for consumption in final invoice)
-BillStatusCanceled=Abandoned
-BillStatusValidated=Validated (needs to be paid)
-BillStatusStarted=Started
-BillStatusNotPaid=Not paid
-BillStatusNotRefunded=Not refunded
-BillStatusClosedUnpaid=Closed (unpaid)
-BillStatusClosedPaidPartially=Paid (partially)
-BillShortStatusDraft=Draft
-BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refunded or converted
-Refunded=Refunded
-BillShortStatusConverted=Paid
-BillShortStatusCanceled=Abandoned
-BillShortStatusValidated=Validated
-BillShortStatusStarted=Started
-BillShortStatusNotPaid=Not paid
-BillShortStatusNotRefunded=Not refunded
-BillShortStatusClosedUnpaid=Closed
-BillShortStatusClosedPaidPartially=Paid (partially)
-PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
-ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
-ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
-ErrorDiscountAlreadyUsed=Error, discount already used
-ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
-ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
-BillFrom=From
-BillTo=To
-ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Template / Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
-NewBill=New invoice
-LastBills=Latest %s invoices
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s vendor template invoices
-LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Latest %s vendor invoices
-AllBills=All invoices
-AllCustomerTemplateInvoices=All template invoices
-OtherBills=Other invoices
-DraftBills=Draft invoices
-CustomersDraftInvoices=Customer draft invoices
-SuppliersDraftInvoices=Vendor draft invoices
-Unpaid=Unpaid
-ErrorNoPaymentDefined=Error No payment defined
-ConfirmDeleteBill=Are you sure you want to delete this invoice?
-ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
-ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
-ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
-ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
-ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
-ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
-ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
-ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
-ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
-ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
-ConfirmClassifyAbandonReasonOther=Other
-ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
-ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
-ValidateBill=Validate invoice
-UnvalidateBill=Unvalidate invoice
-NumberOfBills=No. of invoices
-NumberOfBillsByMonth=No. of invoices per month
-AmountOfBills=Amount of invoices
-AmountOfBillsHT=Amount of invoices (net of tax)
-AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-UseSituationInvoices=Allow situation invoice
-UseSituationInvoicesCreditNote=Allow situation invoice credit note
-Retainedwarranty=Retained warranty
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
-RetainedwarrantyDefaultPercent=Retained warranty default percent
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
-ToPayOn=To pay on %s
-toPayOn=to pay on %s
-RetainedWarranty=Retained Warranty
-PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
-DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
-setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
-setretainedwarranty=Set retained warranty
-setretainedwarrantyDateLimit=Set retained warranty date limit
-RetainedWarrantyDateLimit=Retained warranty date limit
-RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-AlreadyPaid=Already paid
-AlreadyPaidBack=Already paid back
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
-Abandoned=Abandoned
-RemainderToPay=Remaining unpaid
-RemainderToPayMulticurrency=Remaining unpaid, original currency
-RemainderToTake=Remaining amount to take
-RemainderToTakeMulticurrency=Remaining amount to take, original currency
-RemainderToPayBack=Remaining amount to refund
-RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
-NegativeIfExcessRefunded=negative if excess refunded
-Rest=Pending
-AmountExpected=Amount claimed
-ExcessReceived=Excess received
-ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
-ExcessPaid=Excess paid
-ExcessPaidMulticurrency=Excess paid, original currency
-EscompteOffered=Discount offered (payment before term)
-EscompteOfferedShort=Discount
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
-SendPaymentReceipt=Submission of payment receipt %s
-NoDraftBills=No draft invoices
-NoOtherDraftBills=No other draft invoices
-NoDraftInvoices=No draft invoices
-RefBill=Invoice ref
-ToBill=To bill
-RemainderToBill=Remainder to bill
-SendBillByMail=Send invoice by email
-SendReminderBillByMail=Send reminder by email
-RelatedCommercialProposals=Related commercial proposals
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
-MenuToValid=To valid
-DateMaxPayment=Payment due on
-DateInvoice=Invoice date
-DatePointOfTax=Point of tax
-NoInvoice=No invoice
-NoOpenInvoice=No open invoice
-NbOfOpenInvoices=Number of open invoices
-ClassifyBill=Classify invoice
-SupplierBillsToPay=Unpaid vendor invoices
-CustomerBillsUnpaid=Unpaid customer invoices
-NonPercuRecuperable=Non-recoverable
-SetConditions=Set Payment Terms
-SetMode=Set Payment Type
-SetRevenuStamp=Set revenue stamp
-Billed=Billed
-RecurringInvoices=Recurring invoices
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
-CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices and invoice details
-ExportDataset_invoice_2=Customer invoices and payments
-ProformaBill=Proforma Bill:
-Reduction=Reduction
-ReductionShort=Disc.
-Reductions=Reductions
-ReductionsShort=Disc.
-Discounts=Discounts
-AddDiscount=Create discount
-AddRelativeDiscount=Create relative discount
-EditRelativeDiscount=Edit relative discount
-AddGlobalDiscount=Create absolute discount
-EditGlobalDiscounts=Edit absolute discounts
-AddCreditNote=Create credit note
-ShowDiscount=Show discount
-ShowReduc=Show the discount
-ShowSourceInvoice=Show the source invoice
-RelativeDiscount=Relative discount
-GlobalDiscount=Global discount
-CreditNote=Credit note
-CreditNotes=Credit notes
-CreditNotesOrExcessReceived=Credit notes or excess received
-Deposit=Down payment
-Deposits=Down payments
-DiscountFromCreditNote=Discount from credit note %s
-DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
-AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
-CreditNoteDepositUse=Invoice must be validated to use this kind of credits
-NewGlobalDiscount=New absolute discount
-NewRelativeDiscount=New relative discount
-DiscountType=Discount type
-NoteReason=Note/Reason
-ReasonDiscount=Reason
-DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Vendors discounts
-BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
-IdSocialContribution=Social/fiscal tax payment id
-PaymentId=Payment id
-PaymentRef=Payment ref.
-InvoiceId=Invoice id
-InvoiceRef=Invoice ref.
-InvoiceDateCreation=Invoice creation date
-InvoiceStatus=Invoice status
-InvoiceNote=Invoice note
-InvoicePaid=Invoice paid
-InvoicePaidCompletely=Paid completely
-InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
-OrderBilled=Order billed
-DonationPaid=Donation paid
-PaymentNumber=Payment number
-RemoveDiscount=Remove discount
-WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
-InvoiceNotChecked=No invoice selected
-ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
-DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
-NbOfPayments=No. of payments
-SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts:
-TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
-ConfirmRemoveDiscount=Are you sure you want to remove this discount?
-RelatedBill=Related invoice
-RelatedBills=Related invoices
-RelatedCustomerInvoices=Related customer invoices
-RelatedSupplierInvoices=Related vendor invoices
-LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoices already exist
-MergingPDFTool=Merging PDF tool
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
-PaymentNote=Payment note
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-ListOfSituationInvoices=List of situation invoices
-CurrentSituationTotal=Total current situation
-DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
-RemoveSituationFromCycle=Remove this invoice from cycle
-ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
-ConfirmOuting=Confirm outing
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
-FrequencyUnit=Frequency unit
-toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-NextDateToExecutionShort=Date next gen.
-DateLastGeneration=Date of latest generation
-DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max. number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationOfRecordDone=Number of record generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
-InvoiceAutoValidate=Validate invoices automatically
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
-GeneratedFromTemplate=Generated from template invoice %s
-WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
-WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
-ViewAvailableGlobalDiscounts=View available discounts
-GroupPaymentsByModOnReports=Group payments by mode on reports
-# 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
-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
-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
-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
diff --git a/htdocs/langs/ar_IQ/blockedlog.lang b/htdocs/langs/ar_IQ/blockedlog.lang
deleted file mode 100644
index 44cb183050a..00000000000
--- a/htdocs/langs/ar_IQ/blockedlog.lang
+++ /dev/null
@@ -1,54 +0,0 @@
-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
diff --git a/htdocs/langs/ar_IQ/bookmarks.lang b/htdocs/langs/ar_IQ/bookmarks.lang
deleted file mode 100644
index d2378963a21..00000000000
--- a/htdocs/langs/ar_IQ/bookmarks.lang
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
-BookmarksManagement=Bookmarks management
-BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=No bookmarks defined
diff --git a/htdocs/langs/ar_IQ/boxes.lang b/htdocs/langs/ar_IQ/boxes.lang
deleted file mode 100644
index 710d49bfab6..00000000000
--- a/htdocs/langs/ar_IQ/boxes.lang
+++ /dev/null
@@ -1,120 +0,0 @@
-# Dolibarr language file - Source file is en_US - boxes
-BoxDolibarrStateBoard=Statistics on main business objects in database
-BoxLoginInformation=Login Information
-BoxLastRssInfos=RSS Information
-BoxLastProducts=Latest %s Products/Services
-BoxProductsAlertStock=Stock alerts for products
-BoxLastProductsInContract=Latest %s contracted products/services
-BoxLastSupplierBills=Latest Vendor invoices
-BoxLastCustomerBills=Latest Customer invoices
-BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
-BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
-BoxLastProposals=Latest commercial proposals
-BoxLastProspects=Latest modified prospects
-BoxLastCustomers=Latest modified customers
-BoxLastSuppliers=Latest modified suppliers
-BoxLastCustomerOrders=Latest sales orders
-BoxLastActions=Latest actions
-BoxLastContracts=Latest contracts
-BoxLastContacts=Latest contacts/addresses
-BoxLastMembers=Latest members
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
-BoxFicheInter=Latest interventions
-BoxCurrentAccounts=Open accounts balance
-BoxTitleMemberNextBirthdays=Birthdays of this month (members)
-BoxTitleMembersByType=Members by type
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
-BoxTitleLastRssInfos=Latest %s news from %s
-BoxTitleLastProducts=Products/Services: last %s modified
-BoxTitleProductsAlertStock=Products: stock alert
-BoxTitleLastSuppliers=Latest %s recorded suppliers
-BoxTitleLastModifiedSuppliers=Vendors: last %s modified
-BoxTitleLastModifiedCustomers=Customers: last %s modified
-BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s modified Customer invoices
-BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
-BoxTitleLastModifiedProspects=Prospects: last %s modified
-BoxTitleLastModifiedMembers=Latest %s members
-BoxTitleLastFicheInter=Latest %s modified interventions
-BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
-BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
-BoxTitleCurrentAccounts=Open Accounts: balances
-BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
-BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
-BoxMyLastBookmarks=Bookmarks: latest %s
-BoxOldestExpiredServices=Oldest active expired services
-BoxLastExpiredServices=Latest %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
-BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
-BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
-BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
-BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good customers
-BoxTitleGoodCustomers=%s Good customers
-BoxScheduledJobs=Scheduled jobs
-BoxTitleFunnelOfProspection=Lead funnel
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
-LastRefreshDate=Latest refresh date
-NoRecordedBookmarks=No bookmarks defined.
-ClickToAdd=Click here to add.
-NoRecordedCustomers=No recorded customers
-NoRecordedContacts=No recorded contacts
-NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded sales orders
-NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer invoices
-NoUnpaidCustomerBills=No unpaid customer invoices
-NoUnpaidSupplierBills=No unpaid vendor invoices
-NoModifiedSupplierBills=No recorded vendor invoices
-NoRecordedProducts=No recorded products/services
-NoRecordedProspects=No recorded prospects
-NoContractedProducts=No products/services contracted
-NoRecordedContracts=No recorded contracts
-NoRecordedInterventions=No recorded interventions
-BoxLatestSupplierOrders=Latest purchase orders
-BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
-NoSupplierOrder=No recorded purchase order
-BoxCustomersInvoicesPerMonth=Customer Invoices per month
-BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
-BoxCustomersOrdersPerMonth=Sales Orders per month
-BoxSuppliersOrdersPerMonth=Vendor Orders per month
-BoxProposalsPerMonth=Proposals per month
-NoTooLowStockProducts=No products are under the low stock limit
-BoxProductDistribution=Products/Services Distribution
-ForObject=On %s
-BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
-BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
-BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
-BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
-BoxTitleLastModifiedPropals=Latest %s modified proposals
-BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
-BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
-ForCustomersInvoices=Customers invoices
-ForCustomersOrders=Customers orders
-ForProposals=Proposals
-LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard
-BoxAdded=Widget was added in your dashboard
-BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
-NoRecordedManualEntries=No manual entries record in accountancy
-BoxSuspenseAccount=Count accountancy operation with suspense account
-BoxTitleSuspenseAccount=Number of unallocated lines
-NumberOfLinesInSuspenseAccount=Number of line in suspense account
-SuspenseAccountNotDefined=Suspense account isn't defined
-BoxLastCustomerShipments=Last customer shipments
-BoxTitleLastCustomerShipments=Latest %s customer shipments
-NoRecordedShipments=No recorded customer shipment
-BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
-# 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_IQ/cashdesk.lang b/htdocs/langs/ar_IQ/cashdesk.lang
deleted file mode 100644
index f99600c2aca..00000000000
--- a/htdocs/langs/ar_IQ/cashdesk.lang
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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
diff --git a/htdocs/langs/ar_IQ/categories.lang b/htdocs/langs/ar_IQ/categories.lang
deleted file mode 100644
index cf0de898bdb..00000000000
--- a/htdocs/langs/ar_IQ/categories.lang
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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
diff --git a/htdocs/langs/ar_IQ/commercial.lang b/htdocs/langs/ar_IQ/commercial.lang
deleted file mode 100644
index 21d282cd794..00000000000
--- a/htdocs/langs/ar_IQ/commercial.lang
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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_IQ/companies.lang b/htdocs/langs/ar_IQ/companies.lang
deleted file mode 100644
index bce0a98ea83..00000000000
--- a/htdocs/langs/ar_IQ/companies.lang
+++ /dev/null
@@ -1,483 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
-ErrorSetACountryFirst=Set the country first
-SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
-DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
-MenuNewThirdParty=New Third Party
-MenuNewCustomer=New Customer
-MenuNewProspect=New Prospect
-MenuNewSupplier=New Vendor
-MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, vendor)
-NewThirdParty=New Third Party (prospect, customer, vendor)
-CreateDolibarrThirdPartySupplier=Create a third party (vendor)
-CreateThirdPartyOnly=Create third party
-CreateThirdPartyAndContact=Create a third party + a child contact
-ProspectionArea=Prospection area
-IdThirdParty=Id third party
-IdCompany=Company Id
-IdContact=Contact Id
-ThirdPartyContacts=Third-party contacts
-ThirdPartyContact=Third-party contact/address
-Company=Company
-CompanyName=Company name
-AliasNames=Alias name (commercial, trademark, ...)
-AliasNameShort=Alias Name
-Companies=Companies
-CountryIsInEEC=Country is inside the European Economic Community
-PriceFormatInCurrentLanguage=Price display format in the current language and currency
-ThirdPartyName=Third-party name
-ThirdPartyEmail=Third-party email
-ThirdParty=Third-party
-ThirdParties=Third-parties
-ThirdPartyProspects=Prospects
-ThirdPartyProspectsStats=Prospects
-ThirdPartyCustomers=Customers
-ThirdPartyCustomersStats=Customers
-ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Vendors
-ThirdPartyType=Third-party type
-Individual=Private individual
-ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
-ParentCompany=Parent company
-Subsidiaries=Subsidiaries
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
-CivilityCode=Civility code
-RegisteredOffice=Registered office
-Lastname=Last name
-Firstname=First name
-PostOrFunction=Job position
-UserTitle=Title
-NatureOfThirdParty=Nature of Third party
-NatureOfContact=Nature of Contact
-Address=Address
-State=State/Province
-StateCode=State/Province code
-StateShort=State
-Region=Region
-Region-State=Region - State
-Country=Country
-CountryCode=Country code
-CountryId=Country id
-Phone=Phone
-PhoneShort=Phone
-Skype=Skype
-Call=Call
-Chat=Chat
-PhonePro=Bus. phone
-PhonePerso=Pers. phone
-PhoneMobile=Mobile
-No_Email=Refuse bulk emailings
-Fax=Fax
-Zip=Zip Code
-Town=City
-Web=Web
-Poste= Position
-DefaultLang=Default language
-VATIsUsed=Sales tax used
-VATIsUsedWhenSelling=This defines if this third party includes a sales tax or not when it makes an invoice to its own customers
-VATIsNotUsed=Sales tax is not used
-CopyAddressFromSoc=Copy address from third-party details
-ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
-PaymentBankAccount=Payment bank account
-OverAllProposals=Proposals
-OverAllOrders=Orders
-OverAllInvoices=Invoices
-OverAllSupplierProposals=Price requests
-##### 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=-
-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 type
-ContactForOrders=Order's contact
-ContactForOrdersOrShipments=Order's or shipment's contact
-ContactForProposals=Proposal's contact
-ContactForContracts=Contract's contact
-ContactForInvoices=Invoice's contact
-NoContactForAnyOrder=This contact is not a contact for any order
-NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
-NoContactForAnyProposal=This contact is not a contact for any commercial proposal
-NoContactForAnyContract=This contact is not a contact for any contract
-NoContactForAnyInvoice=This contact is not a contact for any invoice
-NewContact=New contact
-NewContactAddress=New Contact/Address
-MyContacts=My contacts
-Capital=Capital
-CapitalOf=Capital of %s
-EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer or vendor
-VATIntraCheck=Check
-VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
-VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%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_IQ/compta.lang b/htdocs/langs/ar_IQ/compta.lang
deleted file mode 100644
index 97b990f62b4..00000000000
--- a/htdocs/langs/ar_IQ/compta.lang
+++ /dev/null
@@ -1,297 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
-OptionMode=Option for accountancy
-OptionModeTrue=Option Incomes-Expenses
-OptionModeVirtual=Option Claims-Debts
-OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
-OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
-FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
-VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
-Param=Setup
-RemainingAmountPayment=Amount payment remaining:
-Account=Account
-Accountparent=Parent account
-Accountsparent=Parent accounts
-Income=Income
-Outcome=Expense
-MenuReportInOut=Income / Expense
-ReportInOut=Balance of income and expenses
-ReportTurnover=Turnover invoiced
-ReportTurnoverCollected=Turnover collected
-PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
-PaymentsNotLinkedToUser=Payments not linked to any user
-Profit=Profit
-AccountingResult=Accounting result
-BalanceBefore=Balance (before)
-Balance=Balance
-Debit=Debit
-Credit=Credit
-Piece=Accounting Doc.
-AmountHTVATRealReceived=Net collected
-AmountHTVATRealPaid=Net paid
-VATToPay=Tax sales
-VATReceived=Tax received
-VATToCollect=Tax purchases
-VATSummary=Tax monthly
-VATBalance=Tax Balance
-VATPaid=Tax paid
-LT1Summary=Tax 2 summary
-LT2Summary=Tax 3 summary
-LT1SummaryES=RE Balance
-LT2SummaryES=IRPF Balance
-LT1SummaryIN=CGST Balance
-LT2SummaryIN=SGST Balance
-LT1Paid=Tax 2 paid
-LT2Paid=Tax 3 paid
-LT1PaidES=RE Paid
-LT2PaidES=IRPF Paid
-LT1PaidIN=CGST Paid
-LT2PaidIN=SGST Paid
-LT1Customer=Tax 2 sales
-LT1Supplier=Tax 2 purchases
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
-LT1CustomerIN=CGST sales
-LT1SupplierIN=CGST purchases
-LT2Customer=Tax 3 sales
-LT2Supplier=Tax 3 purchases
-LT2CustomerES=IRPF sales
-LT2SupplierES=IRPF purchases
-LT2CustomerIN=SGST sales
-LT2SupplierIN=SGST purchases
-VATCollected=VAT collected
-StatusToPay=To pay
-SpecialExpensesArea=Area for all special payments
-VATExpensesArea=Area for all TVA payments
-SocialContribution=Social or fiscal tax
-SocialContributions=Social or fiscal taxes
-SocialContributionsDeductibles=Deductible social or fiscal taxes
-SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
-DateOfSocialContribution=Date of social or fiscal tax
-LabelContrib=Label contribution
-TypeContrib=Type contribution
-MenuSpecialExpenses=Special expenses
-MenuTaxAndDividends=Taxes and dividends
-MenuSocialContributions=Social/fiscal taxes
-MenuNewSocialContribution=New social/fiscal tax
-NewSocialContribution=New social/fiscal tax
-AddSocialContribution=Add social/fiscal tax
-ContributionsToPay=Social/fiscal taxes to pay
-AccountancyTreasuryArea=Billing and payment area
-NewPayment=New payment
-PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=vendor invoice payment
-PaymentSocialContribution=Social/fiscal tax payment
-PaymentVat=VAT payment
-AutomaticCreationPayment=Automatically record the payment
-ListPayment=List of payments
-ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of vendor payments
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
-newLT1Payment=New tax 2 payment
-newLT2Payment=New tax 3 payment
-LT1Payment=Tax 2 payment
-LT1Payments=Tax 2 payments
-LT2Payment=Tax 3 payment
-LT2Payments=Tax 3 payments
-newLT1PaymentES=New RE payment
-newLT2PaymentES=New IRPF payment
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
-LT2PaymentES=IRPF Payment
-LT2PaymentsES=IRPF Payments
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
-VATDeclarations=VAT declarations
-VATDeclaration=VAT declaration
-VATRefund=Sales tax refund
-NewVATPayment=New sales tax payment
-NewLocalTaxPayment=New tax %s payment
-Refund=Refund
-SocialContributionsPayments=Social/fiscal taxes payments
-ShowVatPayment=Show VAT payment
-TotalToPay=Total to pay
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
-CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Vendor accounting code
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
-AccountNumber=Account number
-NewAccountingAccount=New account
-Turnover=Turnover invoiced
-TurnoverCollected=Turnover collected
-SalesTurnoverMinimum=Minimum turnover
-ByExpenseIncome=By expenses & incomes
-ByThirdParties=By third parties
-ByUserAuthorOfInvoice=By invoice author
-CheckReceipt=Check deposit
-CheckReceiptShort=Check deposit
-LastCheckReceiptShort=Latest %s check receipts
-NewCheckReceipt=New discount
-NewCheckDeposit=New check deposit
-NewCheckDepositOn=Create receipt for deposit on account: %s
-NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check receiving date
-NbOfCheques=No. of checks
-PaySocialContribution=Pay a social/fiscal tax
-PayVAT=Pay a VAT declaration
-PaySalary=Pay a salary card
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
-ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
-ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
-DeleteSocialContribution=Delete a social or fiscal tax payment
-DeleteVAT=Delete a VAT declaration
-DeleteSalary=Delete a salary card
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
-ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
-ConfirmDeleteSalary=Are you sure you want to delete this salary?
-ExportDataset_tax_1=Social and fiscal taxes and payments
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
-CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
-CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
-AnnualByCompanies=Balance of income and expenses, by predefined groups of account
-AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
-SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
-SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
-RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
-RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
-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)
diff --git a/htdocs/langs/ar_IQ/contracts.lang b/htdocs/langs/ar_IQ/contracts.lang
deleted file mode 100644
index 1f3526bd994..00000000000
--- a/htdocs/langs/ar_IQ/contracts.lang
+++ /dev/null
@@ -1,104 +0,0 @@
-# Dolibarr language file - Source file is en_US - contracts
-ContractsArea=Contracts area
-ListOfContracts=List of contracts
-AllContracts=All contracts
-ContractCard=Contract card
-ContractStatusNotRunning=Not running
-ContractStatusDraft=Draft
-ContractStatusValidated=Validated
-ContractStatusClosed=Closed
-ServiceStatusInitial=Not running
-ServiceStatusRunning=Running
-ServiceStatusNotLate=Running, not expired
-ServiceStatusNotLateShort=Not expired
-ServiceStatusLate=Running, expired
-ServiceStatusLateShort=Expired
-ServiceStatusClosed=Closed
-ShowContractOfService=Show contract of service
-Contracts=Contracts
-ContractsSubscriptions=Contracts/Subscriptions
-ContractsAndLine=Contracts and line of contracts
-Contract=Contract
-ContractLine=Contract line
-Closing=Closing
-NoContracts=No contracts
-MenuServices=Services
-MenuInactiveServices=Services not active
-MenuRunningServices=Running services
-MenuExpiredServices=Expired services
-MenuClosedServices=Closed services
-NewContract=New contract
-NewContractSubscription=New contract or subscription
-AddContract=Create contract
-DeleteAContract=Delete a contract
-ActivateAllOnContract=Activate all services
-CloseAContract=Close a contract
-ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
-ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
-ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
-ConfirmCloseContract=This will close all services (expired or not). Are you sure you want to close this contract?
-ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
-ValidateAContract=Validate a contract
-ActivateService=Activate service
-ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
-RefContract=Contract reference
-DateContract=Contract date
-DateServiceActivate=Service activation date
-ListOfServices=List of services
-ListOfInactiveServices=List of not active services
-ListOfExpiredServices=List of expired active services
-ListOfClosedServices=List of closed services
-ListOfRunningServices=List of running services
-NotActivatedServices=Inactive services (among validated contracts)
-BoardNotActivatedServices=Services to activate among validated contracts
-BoardNotActivatedServicesShort=Services to activate
-LastContracts=Latest %s contracts
-LastModifiedServices=Latest %s modified services
-ContractStartDate=Start date
-ContractEndDate=End date
-DateStartPlanned=Planned start date
-DateStartPlannedShort=Planned start date
-DateEndPlanned=Planned end date
-DateEndPlannedShort=Planned end date
-DateStartReal=Real start date
-DateStartRealShort=Real start date
-DateEndReal=Real end date
-DateEndRealShort=Real end date
-CloseService=Close service
-BoardRunningServices=Services running
-BoardRunningServicesShort=Services running
-BoardExpiredServices=Services expired
-BoardExpiredServicesShort=Services expired
-ServiceStatus=Status of service
-DraftContracts=Drafts contracts
-CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
-ActivateAllContracts=Activate all contract lines
-CloseAllContracts=Close all contract lines
-DeleteContractLine=Delete a contract line
-ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
-MoveToAnotherContract=Move service into another contract.
-ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
-ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
-PaymentRenewContractId=Renew contract line (number %s)
-ExpiredSince=Expiration date
-NoExpiredServices=No expired active services
-ListOfServicesToExpireWithDuration=List of Services to expire in %s days
-ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
-ListOfServicesToExpire=List of Services to expire
-NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
-ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
-LowerDateEndPlannedShort=Lower planned end date of active services
-SendContractRef=Contract information __REF__
-OtherContracts=Other contracts
-##### 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
diff --git a/htdocs/langs/ar_IQ/cron.lang b/htdocs/langs/ar_IQ/cron.lang
deleted file mode 100644
index 4fd2220dea6..00000000000
--- a/htdocs/langs/ar_IQ/cron.lang
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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
-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_IQ/deliveries.lang b/htdocs/langs/ar_IQ/deliveries.lang
deleted file mode 100644
index cd8a36e6c70..00000000000
--- a/htdocs/langs/ar_IQ/deliveries.lang
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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_IQ/dict.lang b/htdocs/langs/ar_IQ/dict.lang
deleted file mode 100644
index 0524cf1ca18..00000000000
--- a/htdocs/langs/ar_IQ/dict.lang
+++ /dev/null
@@ -1,359 +0,0 @@
-# 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_IQ/donations.lang b/htdocs/langs/ar_IQ/donations.lang
deleted file mode 100644
index d512abb2eea..00000000000
--- a/htdocs/langs/ar_IQ/donations.lang
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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_IQ/ecm.lang b/htdocs/langs/ar_IQ/ecm.lang
deleted file mode 100644
index 494a6c55164..00000000000
--- a/htdocs/langs/ar_IQ/ecm.lang
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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_IQ/errors.lang b/htdocs/langs/ar_IQ/errors.lang
deleted file mode 100644
index c62940f4859..00000000000
--- a/htdocs/langs/ar_IQ/errors.lang
+++ /dev/null
@@ -1,327 +0,0 @@
-# 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.
-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...).
-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
-
-# 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
-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_IQ/eventorganization.lang b/htdocs/langs/ar_IQ/eventorganization.lang
deleted file mode 100644
index 82951892a32..00000000000
--- a/htdocs/langs/ar_IQ/eventorganization.lang
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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 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
-
-#
-# 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
-
-#
-# 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
-#
-# 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
diff --git a/htdocs/langs/ar_IQ/exports.lang b/htdocs/langs/ar_IQ/exports.lang
deleted file mode 100644
index f2f2d2cf587..00000000000
--- a/htdocs/langs/ar_IQ/exports.lang
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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_IQ/externalsite.lang b/htdocs/langs/ar_IQ/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/ar_IQ/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_IQ/ftp.lang b/htdocs/langs/ar_IQ/ftp.lang
deleted file mode 100644
index 254a2a698ce..00000000000
--- a/htdocs/langs/ar_IQ/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_IQ/help.lang b/htdocs/langs/ar_IQ/help.lang
deleted file mode 100644
index 048de16d3c0..00000000000
--- a/htdocs/langs/ar_IQ/help.lang
+++ /dev/null
@@ -1,23 +0,0 @@
-# Dolibarr language file - Source file is en_US - help
-CommunitySupport=Forum/Wiki support
-EMailSupport=Emails support
-RemoteControlSupport=Online real-time / remote support
-OtherSupport=Other support
-ToSeeListOfAvailableRessources=To contact/see available resources:
-HelpCenter=Help Center
-DolibarrHelpCenter=Dolibarr Help and Support Center
-ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
-TypeOfSupport=Type of support
-TypeSupportCommunauty=Community (free)
-TypeSupportCommercial=Commercial
-TypeOfHelp=Type
-NeedHelpCenter=Need help or support?
-Efficiency=Efficiency
-TypeHelpOnly=Help only
-TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Training
-BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
-LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
-PossibleLanguages=Supported languages
-SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/ar_IQ/holiday.lang b/htdocs/langs/ar_IQ/holiday.lang
deleted file mode 100644
index 0527f4c0788..00000000000
--- a/htdocs/langs/ar_IQ/holiday.lang
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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 is <b>%s</b> days.
-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
diff --git a/htdocs/langs/ar_IQ/hrm.lang b/htdocs/langs/ar_IQ/hrm.lang
deleted file mode 100644
index 8724bb805a6..00000000000
--- a/htdocs/langs/ar_IQ/hrm.lang
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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
-HRM_MAXRANK=Maximum rank for a skill
-HRM_DEFAULT_SKILL_DESCRIPTION=Default description of ranks when skill is created
-deplacement=Shift
-DateEval=Evaluation date
-JobCard=Job card
-Job=Job
-Jobs=Jobs
-NewSkill=New Skill
-SkillType=Skill type
-Skilldets=List of ranks for this skill
-Skilldet=Skill level
-rank=Rank
-ErrNoSkillSelected=No skill selected
-ErrSkillAlreadyAdded=This skill is already in the list
-SkillHasNoLines=This skill has no lines
-skill=Skill
-Skills=Skills
-SkillCard=Skill card
-EmployeeSkillsUpdated=Employee skills have been updated (see "Skills" tab of employee card)
-Eval=Evaluation
-Evals=Evaluations
-NewEval=New evaluation
-ValidateEvaluation=Validate evaluation
-ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with reference <b>%s</b>?
-EvaluationCard=Evaluation card
-RequiredRank=Required rank for this job
-EmployeeRank=Employee rank for this skill
-Position=Position
-Positions=Positions
-PositionCard=Position card
-EmployeesInThisPosition=Employees in this position
-group1ToCompare=Usergroup to analyze
-group2ToCompare=Second usergroup for comparison
-OrJobToCompare=Compare to job skills requirements
-difference=Difference
-CompetenceAcquiredByOneOrMore=Competence acquired by one or more users but not requested by the second comparator
-MaxlevelGreaterThan=Max level greater than the one requested
-MaxLevelEqualTo=Max level equal to that demand
-MaxLevelLowerThan=Max level lower than that demand
-MaxlevelGreaterThanShort=Employee level greater than the one requested
-MaxLevelEqualToShort=Employee level equals to that demand
-MaxLevelLowerThanShort=Employee level lower than that demand
-SkillNotAcquired=Skill not acquired by all users and requested by the second comparator
-legend=Legend
-TypeSkill=Skill type
-AddSkill=Add skills to job
-RequiredSkills=Required skills for this job
-UserRank=User Rank
-SkillList=Skill list
-SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
-AbandonmentComment=Abandonment comment
-DateLastEval=Date last evaluation
-NoEval=No evaluation done for this employee
-HowManyUserWithThisMaxNote=Number of users with this rank
-HighestRank=Highest rank
-SkillComparison=Skill comparison
diff --git a/htdocs/langs/ar_IQ/install.lang b/htdocs/langs/ar_IQ/install.lang
deleted file mode 100644
index c1ffee936d7..00000000000
--- a/htdocs/langs/ar_IQ/install.lang
+++ /dev/null
@@ -1,218 +0,0 @@
-# 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.
-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_IQ/interventions.lang b/htdocs/langs/ar_IQ/interventions.lang
deleted file mode 100644
index ef5df43e546..00000000000
--- a/htdocs/langs/ar_IQ/interventions.lang
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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
diff --git a/htdocs/langs/ar_IQ/intracommreport.lang b/htdocs/langs/ar_IQ/intracommreport.lang
deleted file mode 100644
index 93c46f112bb..00000000000
--- a/htdocs/langs/ar_IQ/intracommreport.lang
+++ /dev/null
@@ -1,40 +0,0 @@
-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_IQ/knowledgemanagement.lang b/htdocs/langs/ar_IQ/knowledgemanagement.lang
deleted file mode 100644
index 2426e0e7013..00000000000
--- a/htdocs/langs/ar_IQ/knowledgemanagement.lang
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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
diff --git a/htdocs/langs/ar_IQ/languages.lang b/htdocs/langs/ar_IQ/languages.lang
deleted file mode 100644
index 82dabbaeda2..00000000000
--- a/htdocs/langs/ar_IQ/languages.lang
+++ /dev/null
@@ -1,114 +0,0 @@
-# Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
-Language_ar_AR=Arabic
-Language_ar_DZ=Arabic (Algeria)
-Language_ar_EG=Arabic (Egypt)
-Language_ar_MA=Arabic (Moroco)
-Language_ar_SA=Arabic
-Language_ar_TN=Arabic (Tunisia)
-Language_ar_IQ=Arabic (Iraq)
-Language_as_IN=Assamese
-Language_az_AZ=Azerbaijani
-Language_bn_BD=Bengali
-Language_bn_IN=Bengali (India)
-Language_bg_BG=Bulgarian
-Language_bs_BA=Bosnian
-Language_ca_ES=Catalan
-Language_cs_CZ=Czech
-Language_da_DA=Danish
-Language_da_DK=Danish
-Language_de_DE=German
-Language_de_AT=German (Austria)
-Language_de_CH=German (Switzerland)
-Language_el_GR=Greek
-Language_el_CY=Greek (Cyprus)
-Language_en_AU=English (Australia)
-Language_en_CA=English (Canada)
-Language_en_GB=English (United Kingdom)
-Language_en_IN=English (India)
-Language_en_NZ=English (New Zealand)
-Language_en_SA=English (Saudi Arabia)
-Language_en_SG=English (Singapore)
-Language_en_US=English (United States)
-Language_en_ZA=English (South Africa)
-Language_es_ES=Spanish
-Language_es_AR=Spanish (Argentina)
-Language_es_BO=Spanish (Bolivia)
-Language_es_CL=Spanish (Chile)
-Language_es_CO=Spanish (Colombia)
-Language_es_DO=Spanish (Dominican Republic)
-Language_es_EC=Spanish (Ecuador)
-Language_es_GT=Spanish (Guatemala)
-Language_es_HN=Spanish (Honduras)
-Language_es_MX=Spanish (Mexico)
-Language_es_PA=Spanish (Panama)
-Language_es_PY=Spanish (Paraguay)
-Language_es_PE=Spanish (Peru)
-Language_es_PR=Spanish (Puerto Rico)
-Language_es_US=Spanish (USA)
-Language_es_UY=Spanish (Uruguay)
-Language_es_GT=Spanish (Guatemala)
-Language_es_VE=Spanish (Venezuela)
-Language_et_EE=Estonian
-Language_eu_ES=Basque
-Language_fa_IR=Persian
-Language_fi_FI=Finnish
-Language_fr_BE=French (Belgium)
-Language_fr_CA=French (Canada)
-Language_fr_CH=French (Switzerland)
-Language_fr_CI=French (Cost Ivory)
-Language_fr_CM=French (Cameroun)
-Language_fr_FR=French
-Language_fr_GA=French (Gabon)
-Language_fr_NC=French (New Caledonia)
-Language_fr_SN=French (Senegal)
-Language_fy_NL=Frisian
-Language_gl_ES=Galician
-Language_he_IL=Hebrew
-Language_hi_IN=Hindi (India)
-Language_hr_HR=Croatian
-Language_hu_HU=Hungarian
-Language_id_ID=Indonesian
-Language_is_IS=Icelandic
-Language_it_IT=Italian
-Language_it_CH=Italian (Switzerland)
-Language_ja_JP=Japanese
-Language_ka_GE=Georgian
-Language_kk_KZ=Kazakh
-Language_km_KH=Khmer
-Language_kn_IN=Kannada
-Language_ko_KR=Korean
-Language_lo_LA=Lao
-Language_lt_LT=Lithuanian
-Language_lv_LV=Latvian
-Language_mk_MK=Macedonian
-Language_mn_MN=Mongolian
-Language_nb_NO=Norwegian (Bokmål)
-Language_ne_NP=Nepali
-Language_nl_BE=Dutch (Belgium)
-Language_nl_NL=Dutch
-Language_pl_PL=Polish
-Language_pt_AO=Portuguese (Angola)
-Language_pt_BR=Portuguese (Brazil)
-Language_pt_PT=Portuguese
-Language_ro_MD=Romanian (Moldavia)
-Language_ro_RO=Romanian
-Language_ru_RU=Russian
-Language_ru_UA=Russian (Ukraine)
-Language_tg_TJ=Tajik
-Language_tr_TR=Turkish
-Language_sl_SI=Slovenian
-Language_sv_SV=Swedish
-Language_sv_SE=Swedish
-Language_sq_AL=Albanian
-Language_sk_SK=Slovakian
-Language_sr_RS=Serbian
-Language_sw_SW=Kiswahili
-Language_th_TH=Thai
-Language_uk_UA=Ukrainian
-Language_uz_UZ=Uzbek
-Language_vi_VN=Vietnamese
-Language_zh_CN=Chinese
-Language_zh_TW=Chinese (Traditional)
-Language_zh_HK=Chinese (Hong Kong)
-Language_bh_MY=Malay
diff --git a/htdocs/langs/ar_IQ/ldap.lang b/htdocs/langs/ar_IQ/ldap.lang
deleted file mode 100644
index 8b6f0864215..00000000000
--- a/htdocs/langs/ar_IQ/ldap.lang
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
diff --git a/htdocs/langs/ar_IQ/link.lang b/htdocs/langs/ar_IQ/link.lang
deleted file mode 100644
index 1ffcd41a18b..00000000000
--- a/htdocs/langs/ar_IQ/link.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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_IQ/loan.lang b/htdocs/langs/ar_IQ/loan.lang
deleted file mode 100644
index d271ed0c140..00000000000
--- a/htdocs/langs/ar_IQ/loan.lang
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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_IQ/mailmanspip.lang b/htdocs/langs/ar_IQ/mailmanspip.lang
deleted file mode 100644
index bab4b3576b4..00000000000
--- a/htdocs/langs/ar_IQ/mailmanspip.lang
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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_IQ/mails.lang b/htdocs/langs/ar_IQ/mails.lang
deleted file mode 100644
index 52c4d4dbf69..00000000000
--- a/htdocs/langs/ar_IQ/mails.lang
+++ /dev/null
@@ -1,180 +0,0 @@
-# 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_IQ/main.lang b/htdocs/langs/ar_IQ/main.lang
index 7124b2d7b1b..2e691473326 100644
--- a/htdocs/langs/ar_IQ/main.lang
+++ b/htdocs/langs/ar_IQ/main.lang
@@ -1,9 +1,5 @@
 # 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=.
@@ -23,1139 +19,3 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-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
-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=There is a 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 remove such notices)
-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
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-NameSlashCompany=Name / Company
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewObject=New %s
-NewValue=New value
-OldValue=Old value %s
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-DescriptionOfLine=Description of line
-DateOfLine=Date of line
-DurationOfLine=Duration of line
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Total reports by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Login
-Setup=Setup
-Alert=Alert
-MenuWarnings=Alerts
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Deadline=Deadline
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-IPCreation=Creation IP
-DateModification=Modification date
-DateModificationShort=Modif. date
-IPModification=Modification IP
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateSigning=Signing date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-RegistrationDate=Registration date
-UserCreation=Creation user
-UserModification=Modification user
-UserValidation=Validation user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-UserValidationShort=Valid. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-DaysOfWeek=Days of week
-HourShort=H
-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
-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
-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">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=Signature reset
diff --git a/htdocs/langs/ar_IQ/margins.lang b/htdocs/langs/ar_IQ/margins.lang
deleted file mode 100644
index a91b139ec7b..00000000000
--- a/htdocs/langs/ar_IQ/margins.lang
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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_IQ/members.lang b/htdocs/langs/ar_IQ/members.lang
deleted file mode 100644
index 332fe9665d2..00000000000
--- a/htdocs/langs/ar_IQ/members.lang
+++ /dev/null
@@ -1,220 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersArea=Members area
-MemberCard=Member card
-SubscriptionCard=Subscription card
-Member=Member
-Members=Members
-ShowMember=Show member card
-UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third party not linked to a member
-MembersTickets=Membership address sheet
-FundationMembers=Foundation members
-ListOfValidatedPublicMembers=List of validated public members
-ErrorThisMemberIsNotPublic=This member is not public
-ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-SetLinkToUser=Link to a Dolibarr user
-SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Business cards for members
-MembersList=List of members
-MembersListToValid=List of draft members (to be validated)
-MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up-to-date contribution
-MembersListNotUpToDate=List of valid members with out-of-date contribution
-MembersListExcluded=List of excluded members
-MembersListResiliated=List of terminated members
-MembersListQualified=List of qualified members
-MenuMembersToValidate=Draft members
-MenuMembersValidated=Validated members
-MenuMembersExcluded=Excluded members
-MenuMembersResiliated=Terminated members
-MembersWithSubscriptionToReceive=Members with contribution to receive
-MembersWithSubscriptionToReceiveShort=Contributions to receive
-DateSubscription=Date of membership
-DateEndSubscription=End date of membership
-EndSubscription=End of membership
-SubscriptionId=Contribution ID
-WithoutSubscription=Without contribution
-MemberId=Member id
-NewMember=New member
-MemberType=Member type
-MemberTypeId=Member type id
-MemberTypeLabel=Member type label
-MembersTypes=Members types
-MemberStatusDraft=Draft (needs to be validated)
-MemberStatusDraftShort=Draft
-MemberStatusActive=Validated (waiting contribution)
-MemberStatusActiveShort=Validated
-MemberStatusActiveLate=Contribution expired
-MemberStatusActiveLateShort=Expired
-MemberStatusPaid=Subscription up to date
-MemberStatusPaidShort=Up to date
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
-MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
-MembersStatusToValid=Draft members
-MembersStatusExcluded=Excluded members
-MembersStatusResiliated=Terminated members
-MemberStatusNoSubscription=Validated (no contribution required)
-MemberStatusNoSubscriptionShort=Validated
-SubscriptionNotNeeded=No contribution required
-NewCotisation=New contribution
-PaymentSubscription=New contribution payment
-SubscriptionEndDate=Subscription's end date
-MembersTypeSetup=Members type setup
-MemberTypeModified=Member type modified
-DeleteAMemberType=Delete a member type
-ConfirmDeleteMemberType=Are you sure you want to delete this member type?
-MemberTypeDeleted=Member type deleted
-MemberTypeCanNotBeDeleted=Member type can not be deleted
-NewSubscription=New contribution
-NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-Subscription=Contribution
-Subscriptions=Contributions
-SubscriptionLate=Late
-SubscriptionNotReceived=Contribution never received
-ListOfSubscriptions=List of contributions
-SendCardByMail=Send card by email
-AddMember=Create member
-NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-NewMemberType=New member type
-WelcomeEMail=Welcome email
-SubscriptionRequired=Contribution required
-DeleteType=Delete
-VoteAllowed=Vote allowed
-Physical=Individual
-Moral=Corporation
-MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
-ExcludeMember=Exclude a member
-Exclude=Exclude
-ConfirmExcludeMember=Are you sure you want to exclude this member ?
-ResiliateMember=Terminate a member
-ConfirmResiliateMember=Are you sure you want to terminate this member?
-DeleteMember=Delete a member
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his contributions)?
-DeleteSubscription=Delete a subscription
-ConfirmDeleteSubscription=Are you sure you want to delete this contribution?
-Filehtpasswd=htpasswd file
-ValidateMember=Validate a member
-ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
-PublicMemberList=Public member list
-BlankSubscriptionForm=Public self-registration form
-BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
-EnablePublicSubscriptionForm=Enable the public website with self-subscription form
-ForceMemberType=Force the member type
-ExportDataset_member_1=Members and contributions
-ImportDataset_member_1=Members
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified contributions
-String=String
-Text=Text
-Int=Int
-DateAndTime=Date and time
-PublicMemberCard=Member public card
-SubscriptionNotRecorded=Contribution not recorded
-AddSubscription=Create contribution
-ShowSubscription=Show contribution
-# 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
-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.
diff --git a/htdocs/langs/ar_IQ/modulebuilder.lang b/htdocs/langs/ar_IQ/modulebuilder.lang
deleted file mode 100644
index e479438769d..00000000000
--- a/htdocs/langs/ar_IQ/modulebuilder.lang
+++ /dev/null
@@ -1,147 +0,0 @@
-# Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
-EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
-EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
-ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
-ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
-ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
-NewModule=New module
-NewObjectInModulebuilder=New object
-ModuleKey=Module key
-ObjectKey=Object key
-ModuleInitialized=Module initialized
-FilesForObjectInitialized=Files for new object '%s' initialized
-FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
-ModuleBuilderDescdescription=Enter here all general information that describe your module.
-ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
-ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
-ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
-ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
-ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
-ModuleBuilderDeschooks=This tab is dedicated to hooks.
-ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
-ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
-DangerZone=Danger zone
-BuildPackage=Build package
-BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
-BuildDocumentation=Build documentation
-ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here
-ModuleIsLive=This module has been activated. Any change may break a current live feature.
-DescriptionLong=Long description
-EditorName=Name of editor
-EditorUrl=URL of editor
-DescriptorFile=Descriptor file of module
-ClassFile=File for PHP DAO CRUD class
-ApiClassFile=File for PHP API class
-PageForList=PHP page for list of record
-PageForCreateEditView=PHP page to create/edit/view a record
-PageForAgendaTab=PHP page for event tab
-PageForDocumentTab=PHP page for document tab
-PageForNoteTab=PHP page for note tab
-PageForContactTab=PHP page for contact tab
-PathToModulePackage=Path to zip of module/application package
-PathToModuleDocumentation=Path to file of module/application documentation (%s)
-SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
-FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Force update of .class and .sql files
-RegenerateMissingFiles=Generate missing files
-SpecificationFile=File of documentation
-LanguageFile=File for language
-ObjectProperties=Object Properties
-ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
-NotNull=Not NULL
-NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
-SearchAll=Used for 'search all'
-DatabaseIndex=Database index
-FileAlreadyExists=File %s already exists
-TriggersFile=File for triggers code
-HooksFile=File for hooks code
-ArrayOfKeyValues=Array of key-val
-ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
-WidgetFile=Widget file
-CSSFile=CSS file
-JSFile=Javascript file
-ReadmeFile=Readme file
-ChangeLog=ChangeLog file
-TestClassFile=File for PHP Unit Test class
-SqlFile=Sql file
-PageForLib=File for the common PHP library
-PageForObjLib=File for the PHP library dedicated to object
-SqlFileExtraFields=Sql file for complementary attributes
-SqlFileKey=Sql file for keys
-SqlFileKeyExtraFields=Sql file for keys of complementary attributes
-AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
-UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
-IsAMeasure=Is a measure
-DirScanned=Directory scanned
-NoTrigger=No trigger
-NoWidget=No widget
-GoToApiExplorer=API explorer
-ListOfMenusEntries=List of menu entries
-ListOfDictionariesEntries=List of dictionaries entries
-ListOfPermissionsDefined=List of defined permissions
-SeeExamples=See examples here
-EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
-DisplayOnPdf=Display on PDF
-IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
-SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
-SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
-LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module
-DictionariesDefDesc=Define here the dictionaries provided by your module
-PermissionsDefDesc=Define here the new permissions provided by your module
-MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
-DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
-PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
-HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded 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
diff --git a/htdocs/langs/ar_IQ/mrp.lang b/htdocs/langs/ar_IQ/mrp.lang
deleted file mode 100644
index 3f1aac53340..00000000000
--- a/htdocs/langs/ar_IQ/mrp.lang
+++ /dev/null
@@ -1,109 +0,0 @@
-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
diff --git a/htdocs/langs/ar_IQ/multicurrency.lang b/htdocs/langs/ar_IQ/multicurrency.lang
deleted file mode 100644
index 26313c6bfb9..00000000000
--- a/htdocs/langs/ar_IQ/multicurrency.lang
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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_IQ/oauth.lang b/htdocs/langs/ar_IQ/oauth.lang
deleted file mode 100644
index 075ff49a895..00000000000
--- a/htdocs/langs/ar_IQ/oauth.lang
+++ /dev/null
@@ -1,32 +0,0 @@
-# Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=OAuth Configuration
-OAuthServices=OAuth Services
-ManualTokenGeneration=Manual token generation
-TokenManager=Token Manager
-IsTokenGenerated=Is token generated ?
-NoAccessToken=No access token saved into local database
-HasAccessToken=A token was generated and saved into local database
-NewTokenStored=Token received and saved
-ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
-TokenDeleted=Token deleted
-RequestAccess=Click here to request/renew access and receive a new token to save
-DeleteAccess=Click here to delete token
-UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
-ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
-OAuthSetupForLogin=Page to generate an OAuth token
-SeePreviousTab=See previous tab
-OAuthIDSecret=OAuth ID and Secret
-TOKEN_REFRESH=Token Refresh Present
-TOKEN_EXPIRED=Token expired
-TOKEN_EXPIRE_AT=Token expire at
-TOKEN_DELETE=Delete saved token
-OAUTH_GOOGLE_NAME=OAuth Google service
-OAUTH_GOOGLE_ID=OAuth Google Id
-OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
-OAUTH_GITHUB_NAME=OAuth GitHub service
-OAUTH_GITHUB_ID=OAuth GitHub Id
-OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
-OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
-OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/ar_IQ/opensurvey.lang b/htdocs/langs/ar_IQ/opensurvey.lang
deleted file mode 100644
index 9fafacaf8bf..00000000000
--- a/htdocs/langs/ar_IQ/opensurvey.lang
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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_IQ/orders.lang b/htdocs/langs/ar_IQ/orders.lang
deleted file mode 100644
index 11220633d61..00000000000
--- a/htdocs/langs/ar_IQ/orders.lang
+++ /dev/null
@@ -1,196 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-OrdersArea=Customers orders area
-SuppliersOrdersArea=Purchase orders area
-OrderCard=Order card
-OrderId=Order Id
-Order=Order
-PdfOrderTitle=Order
-Orders=Orders
-OrderLine=Order line
-OrderDate=Order date
-OrderDateShort=Order date
-OrderToProcess=Order to process
-NewOrder=New order
-NewSupplierOrderShort=New order
-NewOrderSupplier=New Purchase Order
-ToOrder=Make order
-MakeOrder=Make order
-SupplierOrder=Purchase order
-SuppliersOrders=Purchase orders
-SaleOrderLines=Sales order lines
-PurchaseOrderLines=Puchase order lines
-SuppliersOrdersRunning=Current purchase orders
-CustomerOrder=Sales Order
-CustomersOrders=Sales Orders
-CustomersOrdersRunning=Current sales orders
-CustomersOrdersAndOrdersLines=Sales orders and order details
-OrdersDeliveredToBill=Sales orders delivered to bill
-OrdersToBill=Sales orders delivered
-OrdersInProcess=Sales orders in process
-OrdersToProcess=Sales orders to process
-SuppliersOrdersToProcess=Purchase orders to process
-SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
-AwaitingReception=Awaiting reception
-StatusOrderCanceledShort=Canceled
-StatusOrderDraftShort=Draft
-StatusOrderValidatedShort=Validated
-StatusOrderSentShort=In process
-StatusOrderSent=Shipment in process
-StatusOrderOnProcessShort=Ordered
-StatusOrderProcessedShort=Processed
-StatusOrderDelivered=Delivered
-StatusOrderDeliveredShort=Delivered
-StatusOrderToBillShort=Delivered
-StatusOrderApprovedShort=Approved
-StatusOrderRefusedShort=Refused
-StatusOrderToProcessShort=To process
-StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Products received
-StatusOrderCanceled=Canceled
-StatusOrderDraft=Draft (needs to be validated)
-StatusOrderValidated=Validated
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
-StatusOrderProcessed=Processed
-StatusOrderToBill=Delivered
-StatusOrderApproved=Approved
-StatusOrderRefused=Refused
-StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=All products received
-ShippingExist=A shipment exists
-QtyOrdered=Qty ordered
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
-MenuOrdersToBill=Orders delivered
-MenuOrdersToBill2=Billable orders
-ShipProduct=Ship product
-CreateOrder=Create Order
-RefuseOrder=Refuse order
-ApproveOrder=Approve order
-Approve2Order=Approve order (second level)
-ValidateOrder=Validate order
-UnvalidateOrder=Unvalidate order
-DeleteOrder=Delete order
-CancelOrder=Cancel order
-OrderReopened= Order %s re-open
-AddOrder=Create order
-AddSupplierOrderShort=Create order
-AddPurchaseOrder=Create purchase order
-AddToDraftOrders=Add to draft order
-ShowOrder=Show order
-OrdersOpened=Orders to process
-NoDraftOrders=No draft orders
-NoOrder=No order
-NoSupplierOrder=No purchase order
-LastOrders=Latest %s sales orders
-LastCustomerOrders=Latest %s sales orders
-LastSupplierOrders=Latest %s purchase orders
-LastModifiedOrders=Latest %s modified orders
-AllOrders=All orders
-NbOfOrders=Number of orders
-OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Purchase order statistics
-NumberOfOrdersByMonth=Number of orders by month
-AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
-ListOfOrders=List of orders
-CloseOrder=Close order
-ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
-ConfirmDeleteOrder=Are you sure you want to delete this order?
-ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
-ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
-ConfirmCancelOrder=Are you sure you want to cancel this order?
-ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
-GenerateBill=Generate invoice
-ClassifyShipped=Classify delivered
-DraftOrders=Draft orders
-DraftSuppliersOrders=Draft purchase orders
-OnProcessOrders=In process orders
-RefOrder=Ref. order
-RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for vendor
-RefOrderSupplierShort=Ref. order vendor
-SendOrderByMail=Send order by mail
-ActionsOnOrder=Events on order
-NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
-OrderMode=Order method
-AuthorRequest=Request author
-UserWithApproveOrderGrant=Users granted with "approve orders" permission.
-PaymentOrderRef=Payment of order %s
-ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
-DispatchSupplierOrder=Receiving purchase order %s
-FirstApprovalAlreadyDone=First approval already done
-SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
-SupplierOrderClassifiedBilled=Purchase Order %s set billed
-OtherOrders=Other orders
-SupplierOrderValidatedAndApproved=Supplier order is validated and approved : %s
-SupplierOrderValidated=Supplier order is validated : %s
-##### 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_IQ/other.lang b/htdocs/langs/ar_IQ/other.lang
deleted file mode 100644
index 9bc68dc3678..00000000000
--- a/htdocs/langs/ar_IQ/other.lang
+++ /dev/null
@@ -1,300 +0,0 @@
-# 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
-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
-
-##### 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
diff --git a/htdocs/langs/ar_IQ/partnership.lang b/htdocs/langs/ar_IQ/partnership.lang
deleted file mode 100644
index 9ae8f2366fd..00000000000
--- a/htdocs/langs/ar_IQ/partnership.lang
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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
-
-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
-
-#
-# 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_IQ/paybox.lang b/htdocs/langs/ar_IQ/paybox.lang
deleted file mode 100644
index 6f320c03181..00000000000
--- a/htdocs/langs/ar_IQ/paybox.lang
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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
-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_IQ/paypal.lang b/htdocs/langs/ar_IQ/paypal.lang
deleted file mode 100644
index 5eb5f389445..00000000000
--- a/htdocs/langs/ar_IQ/paypal.lang
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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
diff --git a/htdocs/langs/ar_IQ/printing.lang b/htdocs/langs/ar_IQ/printing.lang
deleted file mode 100644
index bd9094f213d..00000000000
--- a/htdocs/langs/ar_IQ/printing.lang
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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_IQ/productbatch.lang b/htdocs/langs/ar_IQ/productbatch.lang
deleted file mode 100644
index 71e44e8f281..00000000000
--- a/htdocs/langs/ar_IQ/productbatch.lang
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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 add 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
diff --git a/htdocs/langs/ar_IQ/products.lang b/htdocs/langs/ar_IQ/products.lang
deleted file mode 100644
index 205a28980a8..00000000000
--- a/htdocs/langs/ar_IQ/products.lang
+++ /dev/null
@@ -1,410 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-ProductRef=Product ref.
-ProductLabel=Product label
-ProductLabelTranslated=Translated product label
-ProductDescription=Product description
-ProductDescriptionTranslated=Translated product description
-ProductNoteTranslated=Translated product note
-ProductServiceCard=Products/Services card
-TMenuProducts=Products
-TMenuServices=Services
-Products=Products
-Services=Services
-Product=Product
-Service=Service
-ProductId=Product/service id
-Create=Create
-Reference=Reference
-NewProduct=New product
-NewService=New service
-ProductVatMassChange=Global VAT Update
-ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
-MassBarcodeInit=Mass barcode init
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accounting code (purchase)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
-ProductAccountancySellCode=Accounting code (sale)
-ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
-ProductAccountancySellExportCode=Accounting code (sale export)
-ProductOrService=Product or Service
-ProductsAndServices=Products and Services
-ProductsOrServices=Products or Services
-ProductsPipeServices=Products | Services
-ProductsOnSale=Products for sale
-ProductsOnPurchase=Products for purchase
-ProductsOnSaleOnly=Products for sale only
-ProductsOnPurchaseOnly=Products for purchase only
-ProductsNotOnSell=Products not for sale and not for purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSale=Services for sale
-ServicesOnPurchase=Services for purchase
-ServicesOnSaleOnly=Services for sale only
-ServicesOnPurchaseOnly=Services for purchase only
-ServicesNotOnSell=Services not for sale and not for purchase
-ServicesOnSellAndOnBuy=Services for sale and for purchase
-LastModifiedProductsAndServices=Latest %s products/services which were modified
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
-CardProduct0=Product
-CardProduct1=Service
-Stock=Stock
-MenuStocks=Stocks
-Stocks=Stocks and location (warehouse) of products
-Movements=Movements
-Sell=Sell
-Buy=Purchase
-OnSell=For sale
-OnBuy=For purchase
-NotOnSell=Not for sale
-ProductStatusOnSell=For sale
-ProductStatusNotOnSell=Not for sale
-ProductStatusOnSellShort=For sale
-ProductStatusNotOnSellShort=Not for sale
-ProductStatusOnBuy=For purchase
-ProductStatusNotOnBuy=Not for purchase
-ProductStatusOnBuyShort=For purchase
-ProductStatusNotOnBuyShort=Not for purchase
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
-UpdateLevelPrices=Update prices for each level
-AppliedPricesFrom=Applied from
-SellingPrice=Selling price
-SellingPriceHT=Selling price (excl. tax)
-SellingPriceTTC=Selling price (inc. tax)
-SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
-CostPriceUsage=This value could be used for margin calculation.
-ManufacturingPrice=Manufacturing price
-SoldAmount=Sold amount
-PurchasedAmount=Purchased amount
-NewPrice=New price
-MinPrice=Min. selling price
-EditSellingPriceLabel=Edit selling price label
-CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
-ContractStatusClosed=Closed
-ErrorProductAlreadyExists=A product with reference %s already exists.
-ErrorProductBadRefOrLabel=Wrong value for reference or label.
-ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
-Suppliers=Vendors
-SupplierRef=Vendor SKU
-ShowProduct=Show product
-ShowService=Show service
-ProductsAndServicesArea=Product and Services area
-ProductsArea=Product area
-ServicesArea=Services area
-ListOfStockMovements=List of stock movements
-BuyingPrice=Buying price
-PriceForEachProduct=Products with specific prices
-SupplierCard=Vendor card
-PriceRemoved=Price removed
-BarCode=Barcode
-BarcodeType=Barcode type
-SetDefaultBarcodeType=Set barcode type
-BarcodeValue=Barcode value
-NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
-ServiceLimitedDuration=If product is a service with limited duration:
-FillWithLastServiceDates=Fill with last service line dates
-MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
-MultiPricesNumPrices=Number of prices
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Enable Kits (set of several products)
-VariantsAbility=Enable Variants (variations of products, for example color, size)
-AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
-ParentProductsNumber=Number of parent packaging product
-ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
-KeywordFilter=Keyword filter
-CategoryFilter=Category filter
-ProductToAddSearch=Search product to add
-NoMatchFound=No match found
-ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
-ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
-DeleteProduct=Delete a product/service
-ConfirmDeleteProduct=Are you sure you want to delete this product/service?
-ProductDeleted=Product/Service "%s" deleted from database.
-ExportDataset_produit_1=Products
-ExportDataset_service_1=Services
-ImportDataset_produit_1=Products
-ImportDataset_service_1=Services
-DeleteProductLine=Delete product line
-ConfirmDeleteProductLine=Are you sure you want to delete this product line?
-ProductSpecial=Special
-QtyMin=Min. purchase quantity
-PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
-VATRateForSupplierProduct=VAT Rate (for this vendor/product)
-DiscountQtyMin=Discount for this qty.
-NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
-NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
-PredefinedItem=Predefined item
-PredefinedProductsToSell=Predefined Product
-PredefinedServicesToSell=Predefined Service
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
-NotPredefinedProducts=Not predefined products/services
-GenerateThumb=Generate thumb
-ServiceNb=Service #%s
-ListProductServiceByPopularity=List of products/services by popularity
-ListProductByPopularity=List of products by popularity
-ListServiceByPopularity=List of services by popularity
-Finished=Manufactured product
-RowMaterial=Raw Material
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of the product/service
-ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
-ProductIsUsed=This product is used
-NewRefForClone=Ref. of new product/service
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
-CustomerPrices=Customer prices
-SuppliersPrices=Vendor prices
-SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs|Commodity|HS code
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or manufactured product
-ShortLabel=Short label
-Unit=Unit
-p=u.
-set=set
-se=set
-second=second
-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=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
-
-#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=Attention periods not entered and mandatory
-mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
-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
diff --git a/htdocs/langs/ar_IQ/projects.lang b/htdocs/langs/ar_IQ/projects.lang
deleted file mode 100644
index 5a2911bac0b..00000000000
--- a/htdocs/langs/ar_IQ/projects.lang
+++ /dev/null
@@ -1,286 +0,0 @@
-# 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
-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
-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>.
diff --git a/htdocs/langs/ar_IQ/propal.lang b/htdocs/langs/ar_IQ/propal.lang
deleted file mode 100644
index db7b559a8a7..00000000000
--- a/htdocs/langs/ar_IQ/propal.lang
+++ /dev/null
@@ -1,99 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-Proposals=Commercial proposals
-Proposal=Commercial proposal
-ProposalShort=Proposal
-ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
-CommercialProposal=Commercial proposal
-PdfCommercialProposalTitle=Proposal
-ProposalCard=Proposal card
-NewProp=New commercial proposal
-NewPropal=New proposal
-Prospect=Prospect
-DeleteProp=Delete commercial proposal
-ValidateProp=Validate commercial proposal
-AddProp=Create proposal
-ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
-ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
-LastPropals=Latest %s proposals
-LastModifiedProposals=Latest %s modified proposals
-AllPropals=All proposals
-SearchAProposal=Search a proposal
-NoProposal=No proposal
-ProposalsStatistics=Commercial proposal's statistics
-NumberOfProposalsByMonth=Number by month
-AmountOfProposalsByMonthHT=Amount by month (excl. tax)
-NbOfProposals=Number of commercial proposals
-ShowPropal=Show proposal
-PropalsDraft=Drafts
-PropalsOpened=Open
-PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
-PropalStatusSigned=Signed (needs billing)
-PropalStatusNotSigned=Not signed (closed)
-PropalStatusBilled=Billed
-PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated (open)
-PropalStatusClosedShort=Closed
-PropalStatusSignedShort=Signed
-PropalStatusNotSignedShort=Not signed
-PropalStatusBilledShort=Billed
-PropalsToClose=Commercial proposals to close
-PropalsToBill=Signed commercial proposals to bill
-ListOfProposals=List of commercial proposals
-ActionsOnPropal=Events on proposal
-RefProposal=Commercial proposal ref
-SendPropalByMail=Send commercial proposal by mail
-DatePropal=Date of proposal
-DateEndPropal=Validity ending date
-ValidityDuration=Validity duration
-SetAcceptedRefused=Set accepted/refused
-ErrorPropalNotFound=Propal %s not found
-AddToDraftProposals=Add to draft proposal
-NoDraftProposals=No draft proposals
-CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposal or from list of products/services
-DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
-ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
-ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
-ProposalsAndProposalsLines=Commercial proposal and lines
-ProposalLine=Proposal line
-ProposalLines=Proposal lines
-AvailabilityPeriod=Availability delay
-SetAvailability=Set availability delay
-AfterOrder=after order
-OtherProposals=Other proposals
-##### 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
-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?
diff --git a/htdocs/langs/ar_IQ/receiptprinter.lang b/htdocs/langs/ar_IQ/receiptprinter.lang
deleted file mode 100644
index 746d175e0c6..00000000000
--- a/htdocs/langs/ar_IQ/receiptprinter.lang
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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
-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_IQ/receptions.lang b/htdocs/langs/ar_IQ/receptions.lang
deleted file mode 100644
index 46b2d689609..00000000000
--- a/htdocs/langs/ar_IQ/receptions.lang
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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
-StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
-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 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
diff --git a/htdocs/langs/ar_IQ/recruitment.lang b/htdocs/langs/ar_IQ/recruitment.lang
deleted file mode 100644
index 6b0e8117254..00000000000
--- a/htdocs/langs/ar_IQ/recruitment.lang
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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
diff --git a/htdocs/langs/ar_IQ/resource.lang b/htdocs/langs/ar_IQ/resource.lang
deleted file mode 100644
index e8574dc680f..00000000000
--- a/htdocs/langs/ar_IQ/resource.lang
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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_IQ/salaries.lang b/htdocs/langs/ar_IQ/salaries.lang
deleted file mode 100644
index c0e115a20df..00000000000
--- a/htdocs/langs/ar_IQ/salaries.lang
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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
diff --git a/htdocs/langs/ar_IQ/sendings.lang b/htdocs/langs/ar_IQ/sendings.lang
deleted file mode 100644
index 8f10b1e9404..00000000000
--- a/htdocs/langs/ar_IQ/sendings.lang
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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_IQ/sms.lang b/htdocs/langs/ar_IQ/sms.lang
deleted file mode 100644
index 055085eb16a..00000000000
--- a/htdocs/langs/ar_IQ/sms.lang
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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_IQ/stocks.lang b/htdocs/langs/ar_IQ/stocks.lang
deleted file mode 100644
index a2a335be8f6..00000000000
--- a/htdocs/langs/ar_IQ/stocks.lang
+++ /dev/null
@@ -1,266 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Warehouse card
-Warehouse=Warehouse
-Warehouses=Warehouses
-ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock Location
-WarehouseEdit=Modify warehouse
-MenuNewWarehouse=New warehouse
-WarehouseSource=Source warehouse
-WarehouseSourceNotDefined=No warehouse defined,
-AddWarehouse=Create warehouse
-AddOne=Add one
-DefaultWarehouse=Default warehouse
-WarehouseTarget=Target warehouse
-ValidateSending=Confirm shipment
-CancelSending=Cancel shipment
-DeleteSending=Delete shipment
-Stock=Stock
-Stocks=Stocks
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
-StocksByLotSerial=Stocks by lot/serial
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
-Movements=Movements
-ErrorWarehouseRefRequired=Warehouse reference name is required
-ListOfWarehouses=List of warehouses
-ListOfStockMovements=List of stock movements
-ListOfInventories=List of inventories
-MovementId=Movement ID
-StockMovementForId=Movement ID %d
-ListMouvementStockProject=List of stock movements associated to project
-StocksArea=Warehouses area
-AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
-IncludeAlsoDraftOrders=Include also draft orders
-Location=Location
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
-NumberOfProducts=Total number of products
-LastMovement=Latest movement
-LastMovements=Latest movements
-Units=Units
-Unit=Unit
-StockCorrection=Stock correction
-CorrectStock=Correct stock
-StockTransfer=Stock transfer
-TransferStock=Transfer stock
-MassStockTransferShort=Mass stock transfer
-StockMovement=Stock movement
-StockMovements=Stock movements
-NumberOfUnit=Number of units
-UnitPurchaseValue=Unit purchase price
-StockTooLow=Stock too low
-StockLowerThanLimit=Stock lower than alert limit (%s)
-EnhancedValue=Value
-EnhancedValueOfWarehouses=Warehouses value
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
-RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseOnThirparty=Set a warehouse on Third-parties
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
-WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
-UserDefaultWarehouse=Set a warehouse on Users
-MainDefaultWarehouse=Default warehouse
-MainDefaultWarehouseUser=Use a default warehouse for each user
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
-IndependantSubProductStock=Product stock and subproduct stock are independent
-QtyDispatched=Quantity dispatched
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
-OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
-DeStockOnValidateOrder=Decrease real stocks on validation of sales order
-DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
-ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
-ReStockOnValidateOrder=Increase real stocks on purchase order approval
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
-StockOnReception=Increase real stocks on validation of reception
-StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
-OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
-StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
-NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
-DispatchVerb=Dispatch
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
-PhysicalStock=Physical Stock
-RealStock=Real Stock
-RealStockDesc=Physical/real stock is the stock currently in the warehouses.
-RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
-VirtualStock=Virtual stock
-VirtualStockAtDate=Virtual stock at a future date
-VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
-AtDate=At date
-IdWarehouse=Id warehouse
-DescWareHouse=Description warehouse
-LieuWareHouse=Localisation warehouse
-WarehousesAndProducts=Warehouses and products
-WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
-SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
-EstimatedStockValueShort=Input stock value
-EstimatedStockValue=Input stock value
-DeleteAWarehouse=Delete a warehouse
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
-PersonalStock=Personal stock %s
-ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
-SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
-SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
-NoStockAction=No stock action
-DesiredStock=Desired Stock
-DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
-StockToBuy=To order
-Replenishment=Replenishment
-ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
-UseVirtualStock=Use virtual stock
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Current selection mode
-CurentlyUsingVirtualStock=Virtual stock
-CurentlyUsingPhysicalStock=Physical stock
-RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
-AlertOnly= Alerts only
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
-WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
-WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
-ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
-ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
-Replenishments=Replenishments
-NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
-NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
-MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
-RecordMovement=Record transfer
-ReceivingForSameOrder=Receipts for this order
-StockMovementRecorded=Stock movements recorded
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
-MovementLabel=Label of movement
-TypeMovement=Direction of movement
-DateMovement=Date of movement
-InventoryCode=Movement or inventory code
-IsInPackage=Contained into package
-WarehouseAllowNegativeTransfer=Stock can be negative
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
-qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
-ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
-InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
-ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAnyMovement=Open (all movement)
-OpenInternal=Open (only internal movement)
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
-OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
-ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
-ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
-ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
-AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
-InventoryDate=Inventory date
-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=Theorique qty
-TheoricalValue=Theorique 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=Fill 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
-FieldCannotBeNegative=Field "%s" cannot be negative
-ErrorWrongBarcodemode=Unknown Barcode mode
-ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
-ProductBatchDoesNotExist=Product with batch/serial does not exist
-ProductBarcodeDoesNotExist=Product with barcode does not exist
-WarehouseId=Warehouse ID
-WarehouseRef=Warehouse Ref
diff --git a/htdocs/langs/ar_IQ/stripe.lang b/htdocs/langs/ar_IQ/stripe.lang
deleted file mode 100644
index a536ffd81e7..00000000000
--- a/htdocs/langs/ar_IQ/stripe.lang
+++ /dev/null
@@ -1,71 +0,0 @@
-# Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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_IQ/supplier_proposal.lang b/htdocs/langs/ar_IQ/supplier_proposal.lang
deleted file mode 100644
index a68319fb2df..00000000000
--- a/htdocs/langs/ar_IQ/supplier_proposal.lang
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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_IQ/suppliers.lang b/htdocs/langs/ar_IQ/suppliers.lang
deleted file mode 100644
index ca9ee174d29..00000000000
--- a/htdocs/langs/ar_IQ/suppliers.lang
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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
diff --git a/htdocs/langs/ar_IQ/ticket.lang b/htdocs/langs/ar_IQ/ticket.lang
deleted file mode 100644
index 9bcdcb341fd..00000000000
--- a/htdocs/langs/ar_IQ/ticket.lang
+++ /dev/null
@@ -1,324 +0,0 @@
-# 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=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.
-#
-# 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
-
-#
-# Ticket card
-#
-Ticket=Ticket
-TicketCard=Ticket card
-CreateTicket=Create ticket
-EditTicket=Edit ticket
-TicketsManagement=Tickets Management
-CreatedBy=Created by
-NewTicket=New Ticket
-SubjectAnswerToTicket=Ticket answer
-TicketTypeRequest=Request type
-TicketCategory=Ticket categorization
-SeeTicket=See ticket
-TicketMarkedAsRead=Ticket has been marked as read
-TicketReadOn=Read on
-TicketCloseOn=Closing date
-MarkAsRead=Mark ticket as read
-TicketHistory=Ticket history
-AssignUser=Assign to user
-TicketAssigned=Ticket is now assigned
-TicketChangeType=Change type
-TicketChangeCategory=Change analytic code
-TicketChangeSeverity=Change severity
-TicketAddMessage=Add a message
-AddMessage=Add a message
-MessageSuccessfullyAdded=Ticket added
-TicketMessageSuccessfullyAdded=Message successfully added
-TicketMessagesList=Message list
-NoMsgForThisTicket=No message for this ticket
-TicketProperties=Classification
-LatestNewTickets=Latest %s newest tickets (not read)
-TicketSeverity=Severity
-ShowTicket=See ticket
-RelatedTickets=Related tickets
-TicketAddIntervention=Create intervention
-CloseTicket=Close|Solve ticket
-AbandonTicket=Abandon ticket
-CloseATicket=Close|Solve a ticket
-ConfirmCloseAticket=Confirm ticket closing
-ConfirmAbandonTicket=Do you confirm the closing of the ticket to status 'Abandonned'
-ConfirmDeleteTicket=Please confirm ticket deleting
-TicketDeletedSuccess=Ticket deleted with success
-TicketMarkedAsClosed=Ticket marked as closed
-TicketDurationAuto=Calculated duration
-TicketDurationAutoInfos=Duration calculated automatically from intervention related
-TicketUpdated=Ticket updated
-SendMessageByEmail=Send message by email
-TicketNewMessage=New message
-ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
-TicketGoIntoContactTab=Please go into "Contacts" tab to select them
-TicketMessageMailIntro=Introduction
-TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
-TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
-TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
-TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
-TicketMessageMailSignature=Signature
-TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
-TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
-TicketMessageMailSignatureLabelAdmin=Signature of response email
-TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
-TicketMessageHelp=Only this text will be saved in the message list on ticket card.
-TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
-TimeElapsedSince=Time elapsed since
-TicketTimeToRead=Time elapsed before read
-TicketTimeElapsedBeforeSince=Time elapsed before / since
-TicketContacts=Contacts ticket
-TicketDocumentsLinked=Documents linked to ticket
-ConfirmReOpenTicket=Confirm reopen this ticket ?
-TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
-TicketAssignedToYou=Ticket assigned
-TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
-MarkMessageAsPrivate=Mark message as private
-TicketMessagePrivateHelp=This message will not display to external users
-TicketEmailOriginIssuer=Issuer at origin of the tickets
-InitialMessage=Initial Message
-LinkToAContract=Link to a contract
-TicketPleaseSelectAContract=Select a contract
-UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
-TicketMailExchanges=Mail exchanges
-TicketInitialMessageModified=Initial message modified
-TicketMessageSuccesfullyUpdated=Message successfully updated
-TicketChangeStatus=Change status
-TicketConfirmChangeStatus=Confirm the status change: %s ?
-TicketLogStatusChanged=Status changed: %s to %s
-TicketNotNotifyTiersAtCreate=Not notify company at create
-Unread=Unread
-TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-ErrorTicketRefRequired=Ticket reference name is required
-
-#
-# 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 link above.
-TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
-TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
-TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
-TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
-TicketPublicMsgViewLogIn=Please enter ticket tracking ID
-TicketTrackId=Public Tracking ID
-OneOfTicketTrackId=One of your tracking ID
-ErrorTicketNotFound=Ticket with tracking ID %s not found!
-Subject=Subject
-ViewTicket=View ticket
-ViewMyTicketList=View my ticket list
-ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
-TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
-TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
-SeeThisTicketIntomanagementInterface=See ticket in management interface
-TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
-ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
-OldUser=Old user
-NewUser=New user
-NumberOfTicketsByMonth=Number of tickets per month
-NbOfTickets=Number of tickets
-# notifications
-TicketNotificationEmailSubject=Ticket %s updated
-TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
-TicketNotificationRecipient=Notification recipient
-TicketNotificationLogMessage=Log message
-TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
-TicketNotificationNumberEmailSent=Notification email sent: %s
-
-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_IQ/trips.lang b/htdocs/langs/ar_IQ/trips.lang
deleted file mode 100644
index 9210ede360c..00000000000
--- a/htdocs/langs/ar_IQ/trips.lang
+++ /dev/null
@@ -1,150 +0,0 @@
-# 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_IQ/users.lang b/htdocs/langs/ar_IQ/users.lang
deleted file mode 100644
index b6c7feb7bd2..00000000000
--- a/htdocs/langs/ar_IQ/users.lang
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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
diff --git a/htdocs/langs/ar_IQ/website.lang b/htdocs/langs/ar_IQ/website.lang
deleted file mode 100644
index dc2ec2c0b3d..00000000000
--- a/htdocs/langs/ar_IQ/website.lang
+++ /dev/null
@@ -1,147 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-Shortname=Code
-WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
-DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
-WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
-WEBSITE_PAGENAME=Page name/alias
-WEBSITE_ALIASALT=Alternative page names/aliases
-WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
-WEBSITE_CSS_URL=URL of external CSS file
-WEBSITE_CSS_INLINE=CSS file content (common to all pages)
-WEBSITE_JS_INLINE=Javascript file content (common to all pages)
-WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Website .htaccess file
-WEBSITE_MANIFEST_JSON=Website manifest.json file
-WEBSITE_README=README.md file
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
-EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
-HtmlHeaderPage=HTML header (specific to this page only)
-PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
-EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
-MediaFiles=Media library
-EditCss=Edit website properties
-EditMenu=Edit menu
-EditMedias=Edit medias
-EditPageMeta=Edit page/container properties
-EditInLine=Edit inline
-AddWebsite=Add website
-Webpage=Web page/container
-AddPage=Add page/container
-PageContainer=Page
-PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
-RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
-SiteDeleted=Web site '%s' deleted
-PageContent=Page/Contenair
-PageDeleted=Page/Contenair '%s' of website %s deleted
-PageAdded=Page/Contenair '%s' added
-ViewSiteInNewTab=View site in new tab
-ViewPageInNewTab=View page in new tab
-SetAsHomePage=Set as Home page
-RealURL=Real URL
-ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
-ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
-YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
-ReadPerm=Read
-WritePerm=Write
-TestDeployOnWeb=Test/deploy on web
-PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
-VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
-NoPageYet=No pages yet
-YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
-SyntaxHelp=Help on specific syntax tips
-YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-#YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
-ClonePage=Clone page/container
-CloneSite=Clone site
-SiteAdded=Website added
-ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
-PageIsANewTranslation=The new page is a translation of the current page ?
-LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
-ParentPageId=Parent page ID
-WebsiteId=Website ID
-CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create page from scratch or from a page template...
-FetchAndCreate=Fetch and Create
-ExportSite=Export website
-ImportSite=Import website template
-IDOfPage=Id of page
-Banner=Banner
-BlogPost=Blog post
-WebsiteAccount=Website account
-WebsiteAccounts=Website accounts
-AddWebsiteAccount=Create web site account
-BackToListForThirdParty=Back to list for the third-party
-DisableSiteFirst=Disable website first
-MyContainerTitle=My web site title
-AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
-SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
-YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
-OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
-GrabImagesInto=Grab also images found into css and page.
-ImagesShouldBeSavedInto=Images should be saved into directory
-WebsiteRootOfImages=Root directory for website images
-SubdirOfPage=Sub-directory dedicated to page
-AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
-CorporateHomePage=Corporate Home page
-EmptyPage=Empty page
-ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
-ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Show dynamic content
-InternalURLOfPage=Internal URL of page
-ThisPageIsTranslationOf=This page/container is a translation of
-ThisPageHasTranslationPages=This page/container has translation
-NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
-GoTo=Go to
-DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
-NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
-ReplaceWebsiteContent=Search or Replace website content
-DeleteAlsoJs=Delete also all javascript files specific to this website?
-DeleteAlsoMedias=Delete also all medias files specific to this website?
-MyWebsitePages=My website pages
-SearchReplaceInto=Search | Replace into
-ReplaceString=New string
-CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
-LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
-Dynamiccontent=Sample of a page with dynamic content
-ImportSite=Import website template
-EditInLineOnOff=Mode 'Edit inline' is %s
-ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
-GlobalCSSorJS=Global CSS/JS/Header file of web site
-BackToHomePage=Back to home page...
-TranslationLinks=Translation links
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
-UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
-MainLanguage=Main language
-OtherLanguages=Other languages
-UseManifest=Provide a manifest.json file
-PublicAuthorAlias=Public author alias
-AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
-ReplacementDoneInXPages=Replacement done in %s pages or containers
-RSSFeed=RSS Feed
-RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
-PagesRegenerated=%s page(s)/container(s) regenerated
-RegenerateWebsiteContent=Regenerate web site cache files
-AllowedInFrames=Allowed in Frames
-DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
-GenerateSitemaps=Generate website sitemap file
-ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
-ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap file <b>%s</b> generated
-ImportFavicon=Favicon
-ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
-FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
diff --git a/htdocs/langs/ar_IQ/withdrawals.lang b/htdocs/langs/ar_IQ/withdrawals.lang
deleted file mode 100644
index a3773a427a1..00000000000
--- a/htdocs/langs/ar_IQ/withdrawals.lang
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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
-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
-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 (all)
-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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
-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
-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
diff --git a/htdocs/langs/ar_IQ/workflow.lang b/htdocs/langs/ar_IQ/workflow.lang
deleted file mode 100644
index adfe7f69609..00000000000
--- a/htdocs/langs/ar_IQ/workflow.lang
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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)
-# 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 order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
-# Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
-AutomaticCreation=Automatic creation
-AutomaticClassification=Automatic classification
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/ar_IQ/zapier.lang b/htdocs/langs/ar_IQ/zapier.lang
deleted file mode 100644
index b4cc4ccba4a..00000000000
--- a/htdocs/langs/ar_IQ/zapier.lang
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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/ar_JO/accountancy.lang b/htdocs/langs/ar_JO/accountancy.lang
index c20e0a339f6..8bc4b54a090 100644
--- a/htdocs/langs/ar_JO/accountancy.lang
+++ b/htdocs/langs/ar_JO/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/ar_JO/admin.lang b/htdocs/langs/ar_JO/admin.lang
index 8e38468846c..c59947539f2 100644
--- a/htdocs/langs/ar_JO/admin.lang
+++ b/htdocs/langs/ar_JO/admin.lang
@@ -1,7 +1,9 @@
 # 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
+Publisher=الناشر
 VersionProgram=Version program
 VersionLastInstall=Initial install version
 VersionLastUpgrade=Latest version upgrade
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/ar_JO/banks.lang b/htdocs/langs/ar_JO/banks.lang
index 6c770163f29..f066877f676 100644
--- a/htdocs/langs/ar_JO/banks.lang
+++ b/htdocs/langs/ar_JO/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/ar_JO/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/ar_JO/bookmarks.lang
+++ b/htdocs/langs/ar_JO/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/ar_JO/companies.lang b/htdocs/langs/ar_JO/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/ar_JO/companies.lang
+++ b/htdocs/langs/ar_JO/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/ar_JO/compta.lang b/htdocs/langs/ar_JO/compta.lang
index 97b990f62b4..640a229b7f2 100644
--- a/htdocs/langs/ar_JO/compta.lang
+++ b/htdocs/langs/ar_JO/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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_JO/errors.lang b/htdocs/langs/ar_JO/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/ar_JO/holiday.lang
index 0527f4c0788..3d0ae64be0f 100644
--- a/htdocs/langs/ar_JO/holiday.lang
+++ b/htdocs/langs/ar_JO/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/ar_JO/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/ar_JO/install.lang
+++ b/htdocs/langs/ar_JO/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/ar_JO/main.lang
index 7124b2d7b1b..2d850927782 100644
--- a/htdocs/langs/ar_JO/main.lang
+++ b/htdocs/langs/ar_JO/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ 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
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/ar_JO/modulebuilder.lang b/htdocs/langs/ar_JO/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/ar_JO/modulebuilder.lang
+++ b/htdocs/langs/ar_JO/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 9bc68dc3678..49ff93dd589 100644
--- a/htdocs/langs/ar_JO/other.lang
+++ b/htdocs/langs/ar_JO/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/ar_JO/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/ar_JO/partnership.lang
+++ b/htdocs/langs/ar_JO/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/ar_JO/productbatch.lang b/htdocs/langs/ar_JO/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/ar_JO/productbatch.lang
+++ b/htdocs/langs/ar_JO/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/ar_JO/products.lang b/htdocs/langs/ar_JO/products.lang
index 205a28980a8..14715670882 100644
--- a/htdocs/langs/ar_JO/products.lang
+++ b/htdocs/langs/ar_JO/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ar_JO/projects.lang b/htdocs/langs/ar_JO/projects.lang
index 5a2911bac0b..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,3 +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_JO/stocks.lang b/htdocs/langs/ar_JO/stocks.lang
index a2a335be8f6..599c9649b18 100644
--- a/htdocs/langs/ar_JO/stocks.lang
+++ b/htdocs/langs/ar_JO/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/ar_JO/stripe.lang b/htdocs/langs/ar_JO/stripe.lang
index a536ffd81e7..2c95bcfce27 100644
--- a/htdocs/langs/ar_JO/stripe.lang
+++ b/htdocs/langs/ar_JO/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
diff --git a/htdocs/langs/ar_JO/withdrawals.lang b/htdocs/langs/ar_JO/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/ar_JO/withdrawals.lang
+++ b/htdocs/langs/ar_JO/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index 690812037fa..591cb9dccbc 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=ليس ضمن دول الاتحاد الأوروبي
 CountriesInEECExceptMe=البلدان في المجموعة الاقتصادية الأوروبية باستثناء %s
 CountriesExceptMe=جميع الدول باستثناء %s
 AccountantFiles=تصدير مستندات المصدر
-ExportAccountingSourceDocHelp=باستخدام هذه الأداة ، يمكنك تصدير الأحداث  (في شكل قائمة او بصيغة ملفات متنقلة ) التي تم استخدامها لإنشاء قيودك المحاسبية .
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
 ExportAccountingSourceDocHelp2=لتصدير دفاترك المحاسبية ، إستخدم القائمة %s - %s .
 VueByAccountAccounting=عرض حسب الحساب المحاسبي
 VueBySubAccountAccounting=عرض حسب الحساب المحاسبة الفرعي
@@ -286,7 +286,7 @@ ValidateMovements=اعتماد الحركات
 DescValidateMovements=سيتم حظر أي تعديل أو حذف للكتابة والحروف. يجب اعتماد جميع الإدخالات الخاصة بالتمرين وإلا فلن يكون الإغلاق ممكنًا
 
 ValidateHistory=ربط تلقائي
-AutomaticBindingDone=تم الربط التلقائي
+AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=خطأ، لا يمكنك حذف هذا الحساب المحاسبي لأنه مستخدم
 MvtNotCorrectlyBalanced=الحركة غير متوازنة بشكل صحيح. الخصم = %s | الائتمان = %s
@@ -387,7 +387,8 @@ 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.
 ## Dictionary
 Range=نطاق الحساب
 Calculated=تم حسابه
@@ -404,6 +405,7 @@ NoJournalDefined=لم يتم تحديد دفتر
 Binded=البنود مرتبطة
 ToBind=بنود للربط
 UseMenuToSetBindindManualy=البنود غير مرتبطة بعد ، استخدم القائمة <a href="%s"> %s </a> لإجراء الربط يدويًا
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
 
 ## Import
 ImportAccountingEntries=مداخيل حسابية
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 5d6964b2f86..7e2bcb6f6be 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=أساس
 Version=الإصدار
 Publisher=الناشر
@@ -16,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=لقد نجح فحص سلامة الملفا
 FileIntegritySomeFilesWereRemovedOrModified=فشل فحص سلامة الملفات. تم تعديل بعض الملفات أو إزالتها أو إضافتها.
 GlobalChecksum=تفحص نهائي عام
 MakeIntegrityAnalysisFrom=إجراء تحليل سلامة لملفات التطبيق من
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
+LocalSignature=توقيع محلي مضمن (أقل موثوقية)
+RemoteSignature=التوقيع عن بعد (أكثر موثوقية)
 FilesMissing=ملفات مفقودة
 FilesUpdated=ملفات محدثة
 FilesModified=ملفات معدلة
@@ -37,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=ترميز المضيف
@@ -53,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.
+RemoveLock=حذف/إعادة تسمية الملف <b>%s</b>إذا كان موجود , للسماح باستخدام أداة الرفع/التثبيت .
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
 SecuritySetup=الإعداد الأمني
-PHPSetup=PHP setup
-OSSetup=OS setup
+PHPSetup=إعدادت PHP
+OSSetup=إعدادات نظام التشغيل
 SecurityFilesDesc=حدد هنا الخيارات المتعلقة بالأمان حول تحميل الملفات.
 ErrorModuleRequirePHPVersion=خطأ ، هذا النموذج يتطلب نسخة بي إتش بي %s أو أعلى
 ErrorModuleRequireDolibarrVersion=خطأ ، هذا النموذج يتطلب نسخة دوليبار %s أو أعلى
@@ -265,8 +267,8 @@ OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=للمستخدم أو وثائق المطور (الوثيقة، أسئلة وأجوبة ...)، <br> نلقي نظرة على Dolibarr يكي: <br> <b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=عن أي أسئلة أخرى / مساعدة، يمكنك استخدام المنتدى Dolibarr: <br> <b><a href="%s" target="_blank">%s</a></b>
+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=الحالية القائمة معالج
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
 LastActivationAuthor=Latest activation author
 LastActivationIP=Latest activation IP
+LastActivationVersion=Latest activation version
 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>
@@ -753,7 +756,7 @@ Permission106=sendings التصدير
 Permission109=حذف الإرسال
 Permission111=قراءة الحسابات المالية
 Permission112=إنشاء / تعديل أو حذف ، وقارن المعاملات
-Permission113=الحسابات المالية الإعداد (إنشاء وإدارة فئات)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=صفقات التصدير وكشوفات الحساب
 Permission116=التحويلات بين الحسابات
@@ -762,6 +765,7 @@ 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=حذف جميع المشاريع والمهام (أيضا مشاريع خاصة وأنا لا اتصال لل)
@@ -889,12 +893,11 @@ Permission701=قراءة التبرعات
 Permission702=إنشاء / تعديل والهبات
 Permission703=حذف التبرعات
 Permission771=قراءة التقارير حساب (لك والمرؤوسين لديك)
-Permission772=إنشاء / تعديل التقارير حساب
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=حذف تقارير المصاريف
-Permission774=قراءة جميع التقارير حساب (حتى للمستخدم لا المرؤوسين)
 Permission775=الموافقة على التقارير حساب
 Permission776=دفع نفقة تقارير
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=تقارير حساب التصدير
 Permission1001=قراءة مخزونات
@@ -958,15 +961,11 @@ Permission2801=استخدام عميل FTP في وضع القراءة (تصفح
 Permission2802=العميل استخدام بروتوكول نقل الملفات في وضع الكتابة (حذف أو تحميل الملفات)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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=حذف طلبات الإجازة
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=طلبات الإجازة المشرف (إعداد وتحديث التوازن)
+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=قراءة مهمة مجدولة
 Permission23002=إنشاء / تحديث المجدولة وظيفة
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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=طبعة من ميدان%s
@@ -1708,8 +1707,9 @@ MailingDelay=ثواني الانتظار بعد إرسال الرسالة الت
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=مستلم
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=ارسال استلام نموذج
@@ -1725,8 +1725,8 @@ 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
+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=إنشاء \\ تعديل  تفاصيل المنتجات على طريقة الطباعة "ما تراه ستحصل عليه" لجميع المستندات (المقترحات،الاوامر،الفواتير،...) <span class="warning"> تحذير: إستخدام هذه الخاصية غير منصوح به بشدة بسبب مشاكل المحارف الخاصة وتنسيق الصفحات وذلك عند توليد ملفات بصيغة المستندات المتنقلة .</span>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 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
@@ -1916,6 +1917,8 @@ 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)
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=Text color of Page title
 LinkColor=لون الروابط
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=الرمز البريدي
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index c652f34d78f..115a17ff3e0 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -32,7 +32,7 @@ RIB=رقم الحساب المصرفي
 IBAN=رقم الآيبان
 BIC=رمز BIC / SWIFT
 SwiftValid=بيك / سويفت صالحة
-SwiftVNotalid=بيك / سويفت غير صالح
+SwiftNotValid=بيك / سويفت غير صالح
 IbanValid=بان صالحة
 IbanNotValid=بان غير صالح
 StandingOrders=أوامر الخصم المباشر
@@ -49,7 +49,6 @@ BankAccountDomiciliation=عنوان البنك
 BankAccountCountry=بلد الحساب
 BankAccountOwner=اسم صاحب الحساب
 BankAccountOwnerAddress=عنوان صاحب الحساب
-RIBControlError=فشل التحقق من سلامة القيم. هذا يعني أن المعلومات الخاصة برقم الحساب هذا ليست كاملة أو غير صحيحة (تحقق من الدولة والأرقام و IBAN).
 CreateAccount=إنشاء حساب
 NewBankAccount=حساب جديد
 NewFinancialAccount=حساب مالي جديد
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index 702c8535824..7d018917ac0 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=شروط السداد
@@ -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=إجمالي التقدم %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_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/bookmarks.lang b/htdocs/langs/ar_SA/bookmarks.lang
index c3d49acd820..a65ddf2e059 100644
--- a/htdocs/langs/ar_SA/bookmarks.lang
+++ b/htdocs/langs/ar_SA/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=العنوان
 BehaviourOnClick=السلوك عند تحديد عنوان للإشارة المرجعية
 CreateBookmark=إنشاء إشارة مرجعية
 SetHereATitleForLink=Set a name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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=إدارة الإشارات المرجعية
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index 148af6cf1ec..f1d23eb6216 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -157,6 +157,18 @@ 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=الهوية المهنية 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,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=يمكنك أيضًا التحقق يدويًا على موقع المفوضية الأوروبية <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=تحقق غير ممكن. لا يتم توفير خدمة التحقق من قبل الدولة العضو (%s).
 NorProspectNorCustomer=ليس فرصة، ولا عميل
 JuridicalStatus=نوع الكيان التجاري
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index 395bd535d56..364e6d90e70 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - compta
 MenuFinancial=الفواتير | السداد
-TaxModuleSetupToModifyRules=الذهاب إلى <a href="%s">الإعداد حدة الضرائب</a> لتعديل قواعد حساب
-TaxModuleSetupToModifyRulesLT=الذهاب إلى <a href="%s">إعداد الشركة</a> لتعديل قواعد حساب
-OptionMode=الخيار المحاسبة
-OptionModeTrue=خيار المدخلات والمخرجات
+TaxModuleSetupToModifyRules=إذهب إلى <a href="%s">إعدادات وحدة الضرائب</a> لتعديل قواعد الحساب
+TaxModuleSetupToModifyRulesLT=إذهب إلى <a href="%s">إعدادات الشركة</a> لتعديل قواعد الحساب
+OptionMode=خيار المحاسبة
+OptionModeTrue=خيار  الإيرادات والمصروفات
 OptionModeVirtual=الخيار بين اعتمادات الديون
 OptionModeTrueDesc=وفي هذا السياق ، ويحسب حجم المدفوعات (تاريخ المدفوعات). \\ nThe صحة الأرقام مضمونا إلا إذا مسك الدفاتر ومن خلال التدقيق في المدخلات والمخرجات على الحسابات عن طريق الفواتير.
 OptionModeVirtualDesc=وفي هذا السياق ، فإن أكثر من الدوران يحسب الفواتير (تاريخ التصديق). إذا كانت هذه الفواتير المستحقة ، وعما إذا كانت قد دفعت أم لا ، فهي مدرجة في حجم الانتاج.
 FeatureIsSupportedInInOutModeOnly=الميزة الوحيدة المتاحة في سداد ديون قروض المحاسبة طريقة (انظر التكوين وحدة المحاسبة)
 VATReportBuildWithOptionDefinedInModule=المبالغ المبينة هنا يتم حسابها باستخدام القواعد التي تحددها وحدة الإعداد الضرائب.
 LTReportBuildWithOptionDefinedInModule=وتحسب المبالغ المبينة هنا باستخدام القواعد التي يحددها الإعداد الشركة.
-Param=الإعداد
+Param=الإعدادات
 RemainingAmountPayment=المبلغ المتبقي:
-Account=حساب
+Account=الحساب
 Accountparent=Parent account
 Accountsparent=Parent accounts
 Income=الدخل
-Outcome=نتائج
-MenuReportInOut=دخل / نتائج
+Outcome=المصروف
+MenuReportInOut=دخل / مصروف
 ReportInOut=ميزان الايرادات والمصروفات
 ReportTurnover=Turnover invoiced
 ReportTurnoverCollected=Turnover collected
@@ -170,8 +170,9 @@ 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=- المبالغ المبينة لمع جميع الضرائب المدرجة
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- ويشمل المدفوعات الحقيقية المحرز في الفواتير والمصاريف والضريبة على القيمة المضافة والرواتب. <br> - لأنه يقوم على مواعيد دفع الفواتير والمصاريف والضريبة على القيمة المضافة والرواتب. تاريخ التبرع للتبرع.
+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.
@@ -295,3 +296,5 @@ 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_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 74f51dded9c..0b94eabbb83 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/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=رمز العميل المطلوبة
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=فشل في الحصول على آر إس إس. محا
 ErrorForbidden=تم الرفض. <br> محاولة الوصول إلى صفحة أو منطقة أو ميزة من وحدة نمطية تعطيل أو دون أن تكون في جلسة مصادقة أو الذي لا يسمح له المستخدم الخاص بك.
 ErrorForbidden2=ويمكن تعريف إذن لهذا الدخول من قبل المسؤول Dolibarr الخاص بك من القائمة %s-> %s.
 ErrorForbidden3=يبدو أن لا يتم استخدام Dolibarr خلال جلسة المصادقة. نلقي نظرة على وثائق الإعداد Dolibarr لمعرفة كيفية إدارة المصادقة (تاكيس، mod_auth أو غيرها ...).
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=لم يتم العثور على فئة Imagick في هذا PHP. لا يمكن لمعاينة تكون متاحة. يمكن للمسؤولين تعطيل هذا التبويب من إعداد القائمة - عرض.
 ErrorRecordAlreadyExists=سجل موجود بالفعل
 ErrorLabelAlreadyExists=This label already exists
@@ -271,6 +274,9 @@ 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.
@@ -312,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_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/holiday.lang b/htdocs/langs/ar_SA/holiday.lang
index 523ab75ec40..accadd28e1b 100644
--- a/htdocs/langs/ar_SA/holiday.lang
+++ b/htdocs/langs/ar_SA/holiday.lang
@@ -27,7 +27,7 @@ DescCP=وصف
 SendRequestCP=إنشاء طلب إجازة
 DelayToRequestCP=يجب أن يتم ترك طلبات في <b>اليوم</b> أقل <b>ق٪ (ق)</b> من قبلهم.
 MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=يجب تحديد تاريخ انتهاء أكبر من تاريخ البدء.
 ErrorSQLCreateCP=حدث خطأ SQL أثناء إنشاء:
 ErrorIDFicheCP=حدث خطأ غير موجود على طلب الإجازة.
@@ -134,3 +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_SA/install.lang b/htdocs/langs/ar_SA/install.lang
index 676b11d3a5d..384d4409b11 100644
--- a/htdocs/langs/ar_SA/install.lang
+++ b/htdocs/langs/ar_SA/install.lang
@@ -21,6 +21,7 @@ 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=دليل ٪ ق لا يوجد.
diff --git a/htdocs/langs/ar_SA/knowledgemanagement.lang b/htdocs/langs/ar_SA/knowledgemanagement.lang
index 958c0843b82..002cf78ddf2 100644
--- a/htdocs/langs/ar_SA/knowledgemanagement.lang
+++ b/htdocs/langs/ar_SA/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_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 5169f6e90e4..274db74a867 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=خطأ ، لم يتم تحديد معدل
 ErrorNoSocialContributionForSellerCountry=خطأ ، لم يتم تحديد نوع الضرائب الاجتماعية | المالية للبلد "%s".
 ErrorFailedToSaveFile=خطأ، فشل في حفظ الملف.
 ErrorCannotAddThisParentWarehouse=أنت تحاول إضافة مستودع رئيسي هو بالفعل تابع لمستودع موجود
+FieldCannotBeNegative=Field "%s" cannot be negative
 MaxNbOfRecordPerPage=عدد السجلات الاعلى في الصفحة الواحدة
 NotAuthorized=غير مصرح لك ان تفعل ذلك.
 SetDate=تحديد التاريخ
@@ -87,7 +88,7 @@ FileWasNotUploaded=تم تحديد ملف للإرفاق ولكن لم يتم ت
 NbOfEntries=عدد الإدخالات
 GoToWikiHelpPage=قراءة التعليمات عبر الإنترنت (يلزم الاتصال بالإنترنت)
 GoToHelpPage=قراءة المساعدة
-DedicatedPageAvailable=هناك صفحة تعليمات مخصصة تتعلق بشاشتك الحالية
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=الصفحة الرئيسية
 RecordSaved=تم حفظ سجل
 RecordDeleted=سجل محذوف
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=إرجاع الكود لأحدث خطأ في طلب
 InformationLastAccessInError=معلومات عن خطأ طلب الوصول إلى قاعدة البيانات الأخيرة
 DolibarrHasDetectedError=Dolibarr اكتشف خطأ تقني
 YouCanSetOptionDolibarrMainProdToZero=يمكنك قراءة ملف السجل أو تعيين الخيار $ dolibarr_main_prod إلى "0" في (config file) للحصول على مزيد من المعلومات.
-InformationToHelpDiagnose=يمكن أن تكون هذه المعلومات مفيدة لأغراض التشخيص (يمكنك تعيين الخيار $ dolibarr_main_prod على "1" لإزالة هذه الإشعارات)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=المزيد من المعلومات
 TechnicalInformation=المعلومات التقنية
 TechnicalID=ID الفني
@@ -211,6 +212,8 @@ User=المستعمل
 Users=المستخدمين
 Group=مجموعة
 Groups=المجموعات
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=لم يتم تحديد مجموعة مستخدمين
 Password=كلمة المرور
 PasswordRetype=أعد كتابة كلمة المرور
@@ -906,7 +909,7 @@ ViewFlatList=عرض قائمة مسطحة
 ViewAccountList=عرض دفتر الأستاذ
 ViewSubAccountList=عرض دفتر الأستاذ الفرعي
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=قد تكون بعض اللغات المعروضة مترجمة جزئيًا فقط أو قد تحتوي على أخطاء. الرجاء المساعدة في تصحيح لغتك بالتسجيل في <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> لإضافة تحسيناتك.
+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=رابط التحميل العام
 PublicDownloadLinkDesc=فقط مطلوب الرابط لتنزيل الملف
 DirectDownloadInternalLink=رابط التحميل الخاص
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=المنطقة الزمنية للعميل (المستخدم)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/ar_SA/modulebuilder.lang b/htdocs/langs/ar_SA/modulebuilder.lang
index a9350c57353..6c8ca4c75b9 100644
--- a/htdocs/langs/ar_SA/modulebuilder.lang
+++ b/htdocs/langs/ar_SA/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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/other.lang b/htdocs/langs/ar_SA/other.lang
index 28320c04453..fb7e8ef709e 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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=صادرات المنطقة
diff --git a/htdocs/langs/ar_SA/partnership.lang b/htdocs/langs/ar_SA/partnership.lang
index 8429d33d028..fb8315f25bd 100644
--- a/htdocs/langs/ar_SA/partnership.lang
+++ b/htdocs/langs/ar_SA/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=إدارة الشراكة
 PartnershipDescription=وحدة إدارة الشراكة
 PartnershipDescriptionLong= وحدة إدارة الشراكة
-
+Partnership=Partnership
 AddPartnership=Add partnership
 CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
 PartnershipCheckBacklink=Partnership: Check referring backlink
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 5800273fac8..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,25 +20,26 @@ 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 add 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
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
+LifeTime=المدة (بالأيام)
+EndOfLife=نهاية المدة
+ManufacturingDate=تاريخ التصنيع
+DestructionDate=تاريخ التدمير
+FirstUseDate=تاريخ أول استخدام
 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
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index cc2d9974733..bda51095681 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=المتوسط المرجح لسعر
 PMPValueShort=الواب
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 1266424391a..7c52187cf3d 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/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=مشاريع مع هذا العضو عن الاتصال
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=المهام الموكلة إلى هذا المستخدم
 ResourceNotAssignedToProject=لم يتم تعيين إلى المشروع
 ResourceNotAssignedToTheTask=Not assigned to the task
@@ -284,3 +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=تاريخ نهاية لا يمكن أن يكون قبل تاريخ البدء
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 0ea306b105d..5d2fbc0d6c9 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=بدأ
+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
diff --git a/htdocs/langs/ar_SA/stripe.lang b/htdocs/langs/ar_SA/stripe.lang
index 0fac9d2d553..bb3b088d1e4 100644
--- a/htdocs/langs/ar_SA/stripe.lang
+++ b/htdocs/langs/ar_SA/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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=فيما يلي عناوين المواقع المتاحة لعرض هذه الصفحة زبون لتسديد دفعة Dolibarr على الأجسام
 PaymentForm=شكل الدفع
@@ -28,7 +28,6 @@ AccountParameter=حساب المعلمات
 UsageParameter=استخدام المعلمات
 InformationToFindParameters=مساعدة للعثور على معلومات حسابك %s
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=اسم البائع
 CSSUrlForPaymentForm=عزيزي ورقة النمط المغلق للنموذج الدفع
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang
index cbf62c2b2ac..4b9a548c683 100644
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=أمر تحويل رصيد
 LatestBankTransferReceipts=أحدث %s أوامر تحويل الرصيد 
 LastWithdrawalReceipts=أحدث %s ملفات الخصم المباشر 
 WithdrawalsLine=بند أمر الخصم المباشر
+CreditTransfer=تحويل الرصيد
 CreditTransferLine=بند تحويل الرصيد
 WithdrawalsLines=بنود أوامر الخصم المباشر
 CreditTransferLines=بنود تحويل الرصيد
@@ -47,6 +48,7 @@ ThirdPartyBankCode=كود بنك الطرف الثالث
 NoInvoiceCouldBeWithdrawed=لم يتم الخصم من فاتورة بنجاح. تحقق من أن الفواتير موجودة في الشركات التي لديها رقم IBAN صالح وأن IBAN يحتوي على UMR (مرجع تفويض فريد) بالوضع <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=تم بالفعل تمييز إيصال السحب هذا على أنه مدين ؛ لا يمكن القيام بذلك مرتين ، حيث من المحتمل أن يؤدي ذلك إلى إنشاء مدفوعات وإدخالات بنكية مكررة.
 ClassCredited=تصنيف حساب
+ClassDebited=Classify debited
 ClassCreditedConfirm=هل أنت متأكد من أنك تريد تصنيف إيصال السحب هذا على أنه مقيد في حسابك المصرفي؟
 TransData=تاريخ الإرسال
 TransMetod=طريقة الإرسال
@@ -80,7 +82,7 @@ StatusMotif7=قرار قضائي
 StatusMotif8=سبب آخر
 CreateForSepaFRST=إنشاء ملف الخصم المباشر (SEPA FRST)
 CreateForSepaRCUR=إنشاء ملف الخصم المباشر (SEPA RCUR)
-CreateAll=إنشاء ملف الخصم المباشر (الكل)
+CreateAll=إنشاء ملف الخصم المباشر
 CreateFileForPaymentByBankTransfer=إنشاء ملف لتحويل الرصيد
 CreateSepaFileForPaymentByBankTransfer=إنشاء ملف تحويل رصيد (SEPA)
 CreateGuichet=فقط المكتب
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=تعذر إنشاء طلب الخصم المباش
 SepaMandate=تفويض الخصم المباشر لمنطقة الدفعات الأوروبية الموحدة (SEPA)
 SepaMandateShort=تفويض SEPA
 PleaseReturnMandate=يرجى إعادة نموذج التفويض هذا بالبريد الإلكتروني إلى %s أو بالبريد إلى
-SEPALegalText=من خلال التوقيع على نموذج التفويض هذا ، فإنك تفوض (أ) %s لإرسال تعليمات إلى البنك الخاص بك للخصم من حسابك و (ب) البنك الذي تتعامل معه للخصم من حسابك وفقًا للتعليمات الواردة من %s. كجزء من حقوقك ، يحق لك استرداد الأموال من البنك الذي تتعامل معه بموجب شروط وأحكام اتفاقيتك مع البنك الذي تتعامل معه. يجب المطالبة باسترداد الأموال في غضون 8 أسابيع بدءًا من تاريخ الخصم من حسابك. يتم توضيح حقوقك فيما يتعلق بالولاية المذكورة أعلاه في بيان يمكنك الحصول عليه من البنك الذي تتعامل معه.
+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=معرف الدائن
 CreditorName=اسم الدائن
 SEPAFillForm=(ب) الرجاء استكمال جميع الحقول المعلمة *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/az_AZ/accountancy.lang b/htdocs/langs/az_AZ/accountancy.lang
index c20e0a339f6..8bc4b54a090 100644
--- a/htdocs/langs/az_AZ/accountancy.lang
+++ b/htdocs/langs/az_AZ/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/az_AZ/admin.lang b/htdocs/langs/az_AZ/admin.lang
index 8e38468846c..d79adb1e960 100644
--- a/htdocs/langs/az_AZ/admin.lang
+++ b/htdocs/langs/az_AZ/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Version
 Publisher=Publisher
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/az_AZ/banks.lang b/htdocs/langs/az_AZ/banks.lang
index 6c770163f29..f066877f676 100644
--- a/htdocs/langs/az_AZ/banks.lang
+++ b/htdocs/langs/az_AZ/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/az_AZ/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/az_AZ/bookmarks.lang
+++ b/htdocs/langs/az_AZ/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/az_AZ/companies.lang b/htdocs/langs/az_AZ/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/az_AZ/companies.lang
+++ b/htdocs/langs/az_AZ/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/az_AZ/compta.lang b/htdocs/langs/az_AZ/compta.lang
index 97b990f62b4..640a229b7f2 100644
--- a/htdocs/langs/az_AZ/compta.lang
+++ b/htdocs/langs/az_AZ/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/az_AZ/errors.lang b/htdocs/langs/az_AZ/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/az_AZ/holiday.lang
index 0527f4c0788..3d0ae64be0f 100644
--- a/htdocs/langs/az_AZ/holiday.lang
+++ b/htdocs/langs/az_AZ/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/az_AZ/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/az_AZ/install.lang
+++ b/htdocs/langs/az_AZ/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/az_AZ/main.lang
index 7124b2d7b1b..2d850927782 100644
--- a/htdocs/langs/az_AZ/main.lang
+++ b/htdocs/langs/az_AZ/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ 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
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/az_AZ/modulebuilder.lang b/htdocs/langs/az_AZ/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/az_AZ/modulebuilder.lang
+++ b/htdocs/langs/az_AZ/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 9bc68dc3678..49ff93dd589 100644
--- a/htdocs/langs/az_AZ/other.lang
+++ b/htdocs/langs/az_AZ/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/az_AZ/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/az_AZ/partnership.lang
+++ b/htdocs/langs/az_AZ/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/az_AZ/productbatch.lang b/htdocs/langs/az_AZ/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/az_AZ/productbatch.lang
+++ b/htdocs/langs/az_AZ/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/az_AZ/products.lang b/htdocs/langs/az_AZ/products.lang
index 205a28980a8..14715670882 100644
--- a/htdocs/langs/az_AZ/products.lang
+++ b/htdocs/langs/az_AZ/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/az_AZ/projects.lang b/htdocs/langs/az_AZ/projects.lang
index 5a2911bac0b..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,3 +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/az_AZ/stocks.lang b/htdocs/langs/az_AZ/stocks.lang
index a2a335be8f6..599c9649b18 100644
--- a/htdocs/langs/az_AZ/stocks.lang
+++ b/htdocs/langs/az_AZ/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/az_AZ/stripe.lang b/htdocs/langs/az_AZ/stripe.lang
index 844762040af..2c95bcfce27 100644
--- a/htdocs/langs/az_AZ/stripe.lang
+++ b/htdocs/langs/az_AZ/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/az_AZ/withdrawals.lang b/htdocs/langs/az_AZ/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/az_AZ/withdrawals.lang
+++ b/htdocs/langs/az_AZ/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 949e1004ac0..4f2e627335a 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=Държави извън ЕИО
 CountriesInEECExceptMe=Държави в ЕИО, с изключение на %s
 CountriesExceptMe=Всички държави с изключение на %s
 AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ ValidateMovements=Валидиране на движения
 DescValidateMovements=Всякакви промени или изтриване на написаното ще бъдат забранени. Всички записи за изпълнение трябва да бъдат валидирани, в противен случай приключването няма да е възможно.
 
 ValidateHistory=Автоматично свързване
-AutomaticBindingDone=Автоматичното свързване завърши
+AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Грешка, не може да изтриете тази счетоводна сметка, защото се използва.
 MvtNotCorrectlyBalanced=Движението не е правилно балансирано. Дебит = %s | Credit = %s
@@ -387,7 +387,8 @@ SaleExport=Експортна продажба
 SaleEEC=Вътреобщностна продажба
 SaleEECWithVAT=Продажба в ЕИО с ДДС различен от нула, за която се предполага, че НЕ е вътреобщностна продажба, поради тази причина се препоръчва стандартната сметка за продукти.
 SaleEECWithoutVATNumber=Продажба в ЕИО без ДДС, но идентификационният номер по ДДС на контрагента не е определен. Ще се използва стандартната сметка за продажба на продукти. Може да въведете идентификационен номер по ДДС на контрагента или сметка на продукта, ако е необходимо.
-
+ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
+ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
 Range=Обхват на счетоводна сметка
 Calculated=Изчислено
@@ -404,6 +405,7 @@ NoJournalDefined=Няма определен журнал
 Binded=Свързани редове
 ToBind=Редове за свързване
 UseMenuToSetBindindManualy=Редовете все още не са свързани, използвайте меню <a href="%s">%s</a>, за да направите връзката ръчно
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
 
 ## Import
 ImportAccountingEntries=Счетоводни записи
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 72e180b6034..08f7a113d11 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Организация
 Version=Версия
 Publisher=Издател
@@ -265,8 +267,8 @@ OtherResources=Други ресурси
 ExternalResources=Външни ресурси
 SocialNetworks=Социални мрежи
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=За потребителска документация и такава за разработчици (документи, често задавани въпроси,...), <br> погледнете в Dolibarr Wiki: <br> <b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=За всякакви други въпроси / помощ може да използвате Dolibarr форума: <br> <b><a href="%s" target="_blank">%s</a></b>
+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=Ресурси за получаване на помощ и поддръжка относно Dolibarr
 HelpCenterDesc2=Някои от тези ресурси са достъпни само на <b>английски език</b>
 CurrentMenuHandler=Текущ манипулатор на менюто
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Последна стабилна версия
 LastActivationDate=Последна дата на активиране
 LastActivationAuthor=Последен автор на активирането
 LastActivationIP=Последно активиране от IP адрес
+LastActivationVersion=Latest activation version
 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>
@@ -753,7 +756,7 @@ Permission106=Експортиране на пратки
 Permission109=Изтриване на пратки
 Permission111=Преглед на финансови сметки
 Permission112=Създаване / променяне / изтриване и сравняване на транзакции
-Permission113=Настройка на финансови сметки (създаване, управление на категории)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Съгласуване на транзакции
 Permission115=Експортиране на транзакции и извлечения по сметка
 Permission116=Прехвърляне между сметки
@@ -762,6 +765,7 @@ Permission121=Преглед на контрагенти, свързани с п
 Permission122=Създаване / променяне на контрагенти, свързани с потребителя
 Permission125=Изтриване на контрагенти, свързани с потребителя
 Permission126=Експортиране на контрагенти
+Permission130=Create/modify third parties payment information
 Permission141=Преглед на всички проекти и задачи (включително частни проекти, в които служителя не е определен за контакт)
 Permission142=Създаване / променяне на всички проекти и задачи (включително частни проекти, в които служителя не е определен за контакт)
 Permission144=Изтриване на всички проекти и задачи (включително частни проекти, в които служителя не е определен за контакт)
@@ -889,12 +893,11 @@ Permission701=Преглед на дарения
 Permission702=Създаване / променяне на дарения
 Permission703=Изтриване на дарения
 Permission771=Преглед на разходни отчети (на служителя и неговите подчинени)
-Permission772=Създаване / променяне на разходни отчети
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Изтриване на разходни отчети
-Permission774=Преглед на всички разходни отчети (дори на служители които не са подчинени на служителя)
 Permission775=Одобряване на разходни отчети
 Permission776=Плащане на разходни отчети
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Експортиране на разходни отчети
 Permission1001=Преглед на наличности
@@ -958,15 +961,11 @@ Permission2801=Използване на FTP клиент в режим на ч
 Permission2802=Използване на FTP клиент в режим на писане (изтриване или качване на файлове)
 Permission3200=Преглед на архивирани събития и пръстови отпечатъци
 Permission3301=Generate new modules
-Permission4001=Преглед на служители
-Permission4002=Създаване на служители
-Permission4003=Изтриване на служители
-Permission4004=Експортиране на служители
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ Permission10005=Изтриване на съдържание в уебсайт
 Permission20001=Преглед на молби за отпуск (на служителя и неговите подчинени)
 Permission20002=Създаване / променяне на молби за отпуск (на служителя и неговите подчинени)
 Permission20003=Изтриване на молби за отпуск
-Permission20004=Преглед на всички молби за отпуск (дори на служители които не са подчинени на служителя)
-Permission20005=Създаване / променяне на всички молби за отпуск (дори на служители, които не са подчинени на служителя)
-Permission20006=Администриране на молби за отпуск (настройка и актуализиране на баланса)
+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=Одобряване на молби за отпуск
 Permission23001=Преглед на планирани задачи
 Permission23002=Създаване / променяне на планирани задачи
@@ -1358,9 +1357,9 @@ BrowserIsOK=Използвате уеб браузъра %s. Този брауз
 BrowserIsKO=Използвате уеб браузъра %s. Известно е, че този браузър е лош избор от гледна точка на сигурност, производителност и надеждност. Препоръчително е да използвате Firefox, Chrome, Opera или Safari.
 PHPModuleLoaded=PHP компонент %s е зареден
 PreloadOPCode=Използва се предварително зареден OPCode
-AddRefInList=Показване на кода на клиента / доставчика в списъка (select list или combobox) и повечето от хипервръзките.<br>Контрагентите ще се появят с формат на името "CC12345 - SC45678 - Голяма фирма ЕООД", вместо "Голяма фирма ЕООД"
-AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=Показване на списъка с информация за адреса на клиента / доставчика (изборен списък или комбиниран списък).<br>Контрагентите ще се появят с формат на името на "Име на фирма - Адрес Пощ. код Град - Държава", вместо "Име на фирма".
+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=Запитване към контрагенти за предпочитан начин на доставка
 FieldEdition=Издание на поле %s
@@ -1708,8 +1707,9 @@ MailingDelay=Секунди за изчакване преди изпращан
 NotificationSetup=Настройка на модул Имейл известяване
 NotificationEMailFrom=Подател на имейли (From), изпратени от модула за известяване
 FixedEmailTarget=Получател
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Настройка на модула Експедиция
 SendingsReceiptModel=Шаблони на документи за пратки
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Настройка на модул Разходни о
 ExpenseReportNumberingModules=Модул за номериране на разходни отчети
 NoModueToManageStockIncrease=Не е активиран модул, способен да управлява автоматичното увеличаване на наличности. Увеличаването на наличности ще се извършва само при ръчно въвеждане.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Може да откриете опции за известия по имейл като активирате и конфигурирате модула "Известия".
+TemplatesForNotifications=Templates for notifications
 ListOfNotificationsPerUser=Списък на автоматичните известия за потребител*
 ListOfNotificationsPerUserOrContact=Списък на възможните автоматични известия (за бизнес събитие), налични за потребител * или за контакт **
 ListOfFixedNotifications=Списък на автоматични фиксирани известия
@@ -1916,6 +1917,8 @@ ConfFileMustContainCustom=Инсталирането или създаванет
 HighlightLinesOnMouseHover=Маркиране на редове в таблица, когато мишката преминава отгоре
 HighlightLinesColor=Цвят на подчертания ред при преминаване на мишката отгоре (използвайте 'ffffff', ако не искате да се подчертава)
 HighlightLinesChecked=Цвят на подчертания ред, когато е маркиран (използвайте 'ffffff',ако не искате да се подчертава)
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=Цвят на текста в заглавието на страницата
 LinkColor=Цвят на връзките
 PressF5AfterChangingThis=Натиснете CTRL + F5 на клавиатурата или изчистете кеша на браузъра си след като промените тази стойност, за да стане ефективна.
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Искате ли да стартирате кол
 NoNewEmailToProcess=Няма нови имейли (отговарящи на заложените филтри) за обработка
 NothingProcessed=Нищо не е направено
 XEmailsDoneYActionsDone=Открити са %s имейл адреса, %s имейл адреса са успешно обработени (за %s записа / действия)
-RecordEvent=Записване на имейл събитие
-CreateLeadAndThirdParty=Създаване на възможност (и контрагент, ако е необходимо)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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=Брой имейли в директорията източник
 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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Код на меню (главно меню)
 ECMAutoTree=Показване на автоматично ECM дърво
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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=Конфигурация на модул Ресурси
@@ -2124,7 +2128,7 @@ 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 стъпки е препоръчително да създадете специална втора парола за приложението, вместо да използвате своята парола за акаунта от 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 a string 'Name: name to find' found into the body, use 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=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=Крайна точка за %s: %s
 DeleteEmailCollector=Изтриване на имейл колекционер
 ConfirmDeleteEmailCollector=Сигурни ли те, че искате да изтриете този колекционер на имейли?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang
index e5b849d870d..9ec8f4b6f26 100644
--- a/htdocs/langs/bg_BG/banks.lang
+++ b/htdocs/langs/bg_BG/banks.lang
@@ -32,7 +32,7 @@ RIB=Номер на банкова сметка
 IBAN=IBAN номер
 BIC=BIC / SWIFT код
 SwiftValid=Валиден BIC / SWIFT код
-SwiftVNotalid=Невалиден BIC / SWIFT код
+SwiftNotValid=Невалиден BIC / SWIFT код
 IbanValid=Валиден IBAN номер
 IbanNotValid=Невалиден IBAN номер
 StandingOrders=Нареждания с директен дебит
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Адрес на банката
 BankAccountCountry=Държава по местонахождение
 BankAccountOwner=Титуляр на сметката
 BankAccountOwnerAddress=Адрес на титуляра на сметката
-RIBControlError=Проверката за достоверност на стойностите е неуспешна. Това означава, че информацията за този номер на сметка не е пълна или е неправилна (проверете страната, номерата и IBAN).
 CreateAccount=Създаване на сметка
 NewBankAccount=Нова сметка
 NewFinancialAccount=Нова финансова сметка
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/bookmarks.lang b/htdocs/langs/bg_BG/bookmarks.lang
index d223e769fa1..ff678537981 100644
--- a/htdocs/langs/bg_BG/bookmarks.lang
+++ b/htdocs/langs/bg_BG/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL адрес
 BehaviourOnClick=Поведение при кликване върху URL адрес на отметка
 CreateBookmark=Създаване на отметка
 SetHereATitleForLink=Определете име на отметка
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Използвайте външен / абсолютен адрес (https://URL) или вътрешен / относителен адрес (/DOLIBARR_ROOT/htdocs/...)
+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=Изберете дали страницата да бъде отворена в текущия или в нов раздел
 BookmarksManagement=Управление на отметки
 BookmarksMenuShortCut=Ctrl + shift + M
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index 54a6c0bbcd1..465553ffb56 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ VATIntraCheck=Проверяване
 VATIntraCheckDesc=Идентификационния номер по ДДС трябва да включва префикса на държавата. Връзката <b> %s </b> използва услугата на Европейската комисия за проверка на номер по ДДС (VIES), която изисква достъп до интернет извън сървъра на Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Проверяване на вътрешно-общностния идентификационен номер по ДДС в интернет страницата на Европейската Комисия
-VATIntraManualCheck=Може да проверите също така ръчно в интернет страницата на Европейската Комисия: <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Проверка не е възможна. Услугата за проверка не се предоставя от държавата-членка (%s).
 NorProspectNorCustomer=Нито потенциален клиент, нито клиент
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index 9b03964cd0f..e781fa76474 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -170,8 +170,9 @@ 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=- Посочените суми са с включени всички данъци
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- Включва реални плащания по фактури, разходи, ДДС и заплати<br>- Основава се на дата на плащане на фактури, разходи, ДДС и заплати. Дата на дарение за дарения.
+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=- Включва всички реални плащания по фактури, получени от клиенти<br>- Основава се на дата на плащане на тези фактури<br>
 RulesCATotalSaleJournal=Включва всички кредитни линии от журнала за продажба.
@@ -295,3 +296,5 @@ 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/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 99faeb832d3..ceb6c75ae21 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Този контакт вече е 
 ErrorCashAccountAcceptsOnlyCashMoney=Тази банкова сметка е касова сметка, така че приема плащания само в брой.
 ErrorFromToAccountsMustDiffers=Източниците и целевите банкови сметки трябва да са различни.
 ErrorBadThirdPartyName=Неправилна стойност за име на контрагент
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s е задължително
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Неправилен синтаксис за клиентски код
 ErrorBadBarCodeSyntax=Неправилен синтаксис за баркод. Може би сте задали неправилен тип баркод или баркод маска за номериране, които не съответстват на сканираната стойност.
 ErrorCustomerCodeRequired=Необходим е клиентски код
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Не успее да получи RSS Feed. Опита
 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.
 ErrorNoImagickReadimage=Клас Imagick не се намира в тази PHP. Без визуализация могат да бъдат на разположение. Администраторите могат да деактивирате тази раздела от менюто Setup - Display.
 ErrorRecordAlreadyExists=Запис вече съществува
 ErrorLabelAlreadyExists=Това име вече съществува
@@ -271,6 +274,9 @@ 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=Вашата стойност на PHP параметър upload_max_filesize (%s) е по-голяма от стойността на PHP параметър post_max_size (%s). Това не е последователна настройка.
@@ -312,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/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/holiday.lang b/htdocs/langs/bg_BG/holiday.lang
index f1e21a78ad3..1262acd3b8a 100644
--- a/htdocs/langs/bg_BG/holiday.lang
+++ b/htdocs/langs/bg_BG/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Описание
 SendRequestCP=Създаване на молба за отпуск
 DelayToRequestCP=Молбите за отпуск трябва да бъдат направени най-малко <b>%s ден(а)</b> преди началната им дата.
 MenuConfCP=Баланс на отпуски
-SoldeCPUser=Баланса на отпуските е <b> %s </b> дни.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Трябва да изберете крайна дата, която е по-голяма от началната дата.
 ErrorSQLCreateCP=Възникна SQL грешка по време на създаването:
 ErrorIDFicheCP=Възникна грешка, молбата за отпуск не съществува.
@@ -134,3 +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/install.lang b/htdocs/langs/bg_BG/install.lang
index 36b35d11a51..ae71b99ab7b 100644
--- a/htdocs/langs/bg_BG/install.lang
+++ b/htdocs/langs/bg_BG/install.lang
@@ -21,6 +21,7 @@ ErrorPHPDoesNotSupportCurl=Вашата PHP инсталация не поддъ
 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 не съществува.
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 199c4f862e0..1cfcc08a9e9 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Грешка, не са дефиниран
 ErrorNoSocialContributionForSellerCountry=Грешка, не е дефиниран тип за социални / фискални данъци за държавата "%s".
 ErrorFailedToSaveFile=Грешка, неуспешно записване на файл.
 ErrorCannotAddThisParentWarehouse=Опитвате се да добавите основен склад, който вече е под-склад на съществуващ склад
+FieldCannotBeNegative=Field "%s" cannot be negative
 MaxNbOfRecordPerPage=Максимален брой записи на страница
 NotAuthorized=Не сте упълномощен да правите това.
 SetDate=Настройка на дата
@@ -87,7 +88,7 @@ FileWasNotUploaded=Избран е файл за прикачване, но вс
 NbOfEntries=Брой вписвания
 GoToWikiHelpPage=Прочетете онлайн помощта (необходим е достъп до интернет)
 GoToHelpPage=Прочетете помощната информация
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Начална страница
 RecordSaved=Записът е съхранен
 RecordDeleted=Записът е изтрит
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Върнат код за грешка при пос
 InformationLastAccessInError=Информация за грешка при последната заявка за достъп до базата данни
 DolibarrHasDetectedError=Dolibarr засече техническа грешка
 YouCanSetOptionDolibarrMainProdToZero=Можете да прочетете .log файл или да зададете опция $ dolibarr_main_prod на '0' в конфигурационния си файл, за да получите повече информация.
-InformationToHelpDiagnose=Тази информация може да бъде полезна за диагностични цели (може да зададете опция $dolibarr_main_prod на '1', за да премахнете такива известия)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Повече информация
 TechnicalInformation=Техническа информация
 TechnicalID=Технически идентификатор
@@ -211,6 +212,8 @@ User=Потребител
 Users=Потребители
 Group=Група
 Groups=Групи
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Няма дефинирана потребителска група
 Password=Парола
 PasswordRetype=Повторете паролата
@@ -906,7 +909,7 @@ ViewFlatList=Преглед на плосък списък
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Премахване на низ „%s“
-SomeTranslationAreUncomplete=Някои от предлаганите езици могат да бъдат само частично преведени или да съдържат грешки. Моля, помогнете ни да коригираме езика ви като се регистрирате на адрес <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a>, за да добавите подобренията си.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Часова зона на клиента (потребител)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/bg_BG/modulebuilder.lang b/htdocs/langs/bg_BG/modulebuilder.lang
index e436140d3fb..a07656e9b96 100644
--- a/htdocs/langs/bg_BG/modulebuilder.lang
+++ b/htdocs/langs/bg_BG/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Този инструмент трябва да се използва само от опитни потребители или разработчици. Той предоставя помощни средства за изграждане или редактиране на собствен модул. Документацията за алтернативна самостоятелна разработка е <a href="%s" target="_blank">тук</a>.
+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 файлове ще бъдат генерирани.
 ModuleBuilderDesc2=Път, където модулите се генерират / променят (главна директория за външни модули, дефинирани в %s): <strong>%s</strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Менютата, предоставени от вашия 
 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=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
+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=Вижте идентификаторите, които се използват във вашата инсталация.
 SeeReservedIDsRangeHere=Вижте обхвата от запазени идентификатори
 ToolkitForDevelopers=Инструментариум за разработчици на Dolibarr
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/other.lang b/htdocs/langs/bg_BG/other.lang
index ef4ef5552cf..a66f6c66ddb 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -258,6 +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
 YourPasswordHasBeenReset=Вашата парола е успешно възстановена.
 ApplicantIpAddress=IP адрес на заявителя
 SMSSentTo=Изпратен е SMS на %s
@@ -268,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=Секция с експортирания
diff --git a/htdocs/langs/bg_BG/partnership.lang b/htdocs/langs/bg_BG/partnership.lang
index 0ba01793798..0517f56dbe1 100644
--- a/htdocs/langs/bg_BG/partnership.lang
+++ b/htdocs/langs/bg_BG/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/bg_BG/productbatch.lang b/htdocs/langs/bg_BG/productbatch.lang
index e03612f8244..30679d3a826 100644
--- a/htdocs/langs/bg_BG/productbatch.lang
+++ b/htdocs/langs/bg_BG/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index a227f25427f..448a69e3fb0 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Средно измерена цена
 PMPValueShort=СИЦ
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 90ba19297e4..f1c73f32c82 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -197,6 +197,7 @@ InputPerMonth=За месец
 InputDetail=Детайли
 TimeAlreadyRecorded=Това отделено време е вече записано за тази задача / ден и потребител %s
 ProjectsWithThisUserAsContact=Проекти с потребител за контакт
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Задачи възложени на потребител
 ResourceNotAssignedToProject=Не е участник в проекта
 ResourceNotAssignedToTheTask=Не е участник в задачата
@@ -284,3 +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=Крайната дата не може да бъде преди началната дата
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 e8037daa741..fff80ee9a68 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Минималното количество за п
 AddNewProductStockWarehouse=Определяне на ново минимално количество за предупреждение и желана оптимална наличност
 AddStockLocationLine=Намалете количеството, след което кликнете, за да добавите друг склад за този продукт
 InventoryDate=Дата на инвентаризация
+Inventories=Инвентаризации
 NewInventory=Нова инвентаризация
 inventorySetup = Настройка на инвентаризация
 inventoryCreatePermission=Създаване на нова инвентаризация
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Движенията на нали
 inventoryChangePMPPermission=Променяне на стойността на СИЦ (средно изчислена цена) за даден продукт
 ColumnNewPMP=Нова СИЦ
 OnlyProdsInStock=Не добавяйте продукт без наличност
-TheoricalQty=Теоретично количество
-TheoricalValue=Теоретична стойност
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Последна най-добра цена
 CurrentPA=Текуща най-добра цена
 RecordedQty=Регистрирано кол.
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=Започнати
+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
diff --git a/htdocs/langs/bg_BG/stripe.lang b/htdocs/langs/bg_BG/stripe.lang
index b5cfa89acb3..c3902716951 100644
--- a/htdocs/langs/bg_BG/stripe.lang
+++ b/htdocs/langs/bg_BG/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Настройка на модула Stripe
-StripeDesc=Предлага на клиентите Stripe страница за онлайн плащане с кредитни / дебитни карти, чрез <a href="http://www.stripe.com" target="_blank">Stripe</a>. Това може да се използва, за да позволите на вашите клиенти да извършват бързи плащания или плащания, свързани с определен обект в Dolibarr (фактура, поръчка, ...).
+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=Плащане с кредитна карта или Stripe
 FollowingUrlAreAvailableToMakePayments=Следните URL адреси са налични, за да осигурят достъп на клиент, за да извърши плащане по Dolibarr обекти.
 PaymentForm=Формуляр за плащане
@@ -28,7 +28,6 @@ AccountParameter=Параметри на акаунта
 UsageParameter=Параметри за използване
 InformationToFindParameters=Помогнете, за да намерим информация за вашият %s акаунт
 STRIPE_CGI_URL_V2=URL адрес на Stripe CGI модул за плащане
-VendorName=Име на доставчик
 CSSUrlForPaymentForm=URL адрес на CSS стил с формуляр за плащане
 NewStripePaymentReceived=Получено е ново Stripe плащане
 NewStripePaymentFailed=Неуспешен опит за ново Stripe плащане
diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang
index 537c3f10244..0aaf0633ab7 100644
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Файлове с директен дебит: %s последни
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Редове за нареждане с директен дебит
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ 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=Метод на изпращане
@@ -80,7 +82,7 @@ StatusMotif7=Съдебно решение
 StatusMotif8=Друга причина
 CreateForSepaFRST=Създаване на файл с директен дебит (SEPA FRST)
 CreateForSepaRCUR=Създаване на файл с директен дебит (SEPA RCUR)
-CreateAll=Създаване на файл с директен дебит (всички)
+CreateAll=Създаване на файл с директен дебит
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Само офис
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Не може да се създаде заявл
 SepaMandate=SEPA нареждане с директен дебит
 SepaMandateShort=SEPA нареждане
 PleaseReturnMandate=Моля, върнете този формуляр за нареждане по имейл на %s или по пощата на
-SEPALegalText=С подписването на този формуляр за нареждане вие упълномощавате (A) %s да изпрати инструкции до вашата банка за дебитиране на вашата сметка и (B) вашата банка да дебитира вашата сметка в съответствие с инструкциите от %s. Като част от вашите права, имате право на възстановяване на средства от вашата банка съгласно условията и обстоятелствата на споразумението с вашата банка. Трябва да се поиска възстановяване на сумата в рамките на 8 седмици, считано от датата, на която сметката ви е дебитирана. Вашите права относно горното нареждане се обясняват в изявление, което може да получите от вашата банка.
+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=Идентификатор на кредитора
 CreditorName=Име на кредитора
 SEPAFillForm=(B) Моля, попълнете всички полета, маркирани с *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index c20e0a339f6..8bc4b54a090 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index 8e38468846c..d79adb1e960 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Version
 Publisher=Publisher
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang
index b2684bf193e..99a404bef4a 100644
--- a/htdocs/langs/bn_BD/banks.lang
+++ b/htdocs/langs/bn_BD/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/bn_BD/bookmarks.lang
index f639d1666cc..646a669af15 100644
--- a/htdocs/langs/bn_BD/bookmarks.lang
+++ b/htdocs/langs/bn_BD/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Behaviour when a URL is clicked
 CreateBookmark=Create bookmark
 SetHereATitleForLink=Set a name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index 9be7e0c7f94..cc2c1bed349 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index 97b990f62b4..640a229b7f2 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/bn_BD/holiday.lang
index 0527f4c0788..3d0ae64be0f 100644
--- a/htdocs/langs/bn_BD/holiday.lang
+++ b/htdocs/langs/bn_BD/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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 c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/bn_BD/install.lang
+++ b/htdocs/langs/bn_BD/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/bn_BD/main.lang
index be098c3447b..3bb0a52d6b3 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ 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
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/bn_BD/modulebuilder.lang b/htdocs/langs/bn_BD/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/bn_BD/modulebuilder.lang
+++ b/htdocs/langs/bn_BD/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 9bc68dc3678..49ff93dd589 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/bn_BD/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/bn_BD/partnership.lang
+++ b/htdocs/langs/bn_BD/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/bn_BD/productbatch.lang b/htdocs/langs/bn_BD/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/bn_BD/productbatch.lang
+++ b/htdocs/langs/bn_BD/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index 205a28980a8..14715670882 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index 5a2911bac0b..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,3 +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 a2a335be8f6..599c9649b18 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/bn_BD/stripe.lang b/htdocs/langs/bn_BD/stripe.lang
index 844762040af..2c95bcfce27 100644
--- a/htdocs/langs/bn_BD/stripe.lang
+++ b/htdocs/langs/bn_BD/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/bn_BD/withdrawals.lang b/htdocs/langs/bn_BD/withdrawals.lang
index d310e53a6e0..4106c74f536 100644
--- a/htdocs/langs/bn_BD/withdrawals.lang
+++ b/htdocs/langs/bn_BD/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/bn_IN/accountancy.lang b/htdocs/langs/bn_IN/accountancy.lang
index c20e0a339f6..8bc4b54a090 100644
--- a/htdocs/langs/bn_IN/accountancy.lang
+++ b/htdocs/langs/bn_IN/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/bn_IN/admin.lang b/htdocs/langs/bn_IN/admin.lang
index 8e38468846c..d79adb1e960 100644
--- a/htdocs/langs/bn_IN/admin.lang
+++ b/htdocs/langs/bn_IN/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Version
 Publisher=Publisher
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/bn_IN/banks.lang b/htdocs/langs/bn_IN/banks.lang
index 6c770163f29..f066877f676 100644
--- a/htdocs/langs/bn_IN/banks.lang
+++ b/htdocs/langs/bn_IN/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/bn_IN/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/bn_IN/bookmarks.lang
+++ b/htdocs/langs/bn_IN/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/bn_IN/companies.lang b/htdocs/langs/bn_IN/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/bn_IN/companies.lang
+++ b/htdocs/langs/bn_IN/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/bn_IN/compta.lang b/htdocs/langs/bn_IN/compta.lang
index 97b990f62b4..640a229b7f2 100644
--- a/htdocs/langs/bn_IN/compta.lang
+++ b/htdocs/langs/bn_IN/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/bn_IN/errors.lang b/htdocs/langs/bn_IN/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/bn_IN/holiday.lang
index 0527f4c0788..3d0ae64be0f 100644
--- a/htdocs/langs/bn_IN/holiday.lang
+++ b/htdocs/langs/bn_IN/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/bn_IN/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/bn_IN/install.lang
+++ b/htdocs/langs/bn_IN/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/bn_IN/main.lang
index 7124b2d7b1b..2d850927782 100644
--- a/htdocs/langs/bn_IN/main.lang
+++ b/htdocs/langs/bn_IN/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ 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
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/bn_IN/modulebuilder.lang b/htdocs/langs/bn_IN/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/bn_IN/modulebuilder.lang
+++ b/htdocs/langs/bn_IN/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 9bc68dc3678..49ff93dd589 100644
--- a/htdocs/langs/bn_IN/other.lang
+++ b/htdocs/langs/bn_IN/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/bn_IN/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/bn_IN/partnership.lang
+++ b/htdocs/langs/bn_IN/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/bn_IN/productbatch.lang b/htdocs/langs/bn_IN/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/bn_IN/productbatch.lang
+++ b/htdocs/langs/bn_IN/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/bn_IN/products.lang b/htdocs/langs/bn_IN/products.lang
index 205a28980a8..14715670882 100644
--- a/htdocs/langs/bn_IN/products.lang
+++ b/htdocs/langs/bn_IN/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/bn_IN/projects.lang b/htdocs/langs/bn_IN/projects.lang
index 5a2911bac0b..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,3 +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/bn_IN/stocks.lang b/htdocs/langs/bn_IN/stocks.lang
index a2a335be8f6..599c9649b18 100644
--- a/htdocs/langs/bn_IN/stocks.lang
+++ b/htdocs/langs/bn_IN/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/bn_IN/stripe.lang b/htdocs/langs/bn_IN/stripe.lang
index 844762040af..2c95bcfce27 100644
--- a/htdocs/langs/bn_IN/stripe.lang
+++ b/htdocs/langs/bn_IN/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/bn_IN/withdrawals.lang b/htdocs/langs/bn_IN/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/bn_IN/withdrawals.lang
+++ b/htdocs/langs/bn_IN/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index 6c39c1df270..3980b533703 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 885097df0d4..2ce6165e282 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Fondacija
 Version=Verzija
 Publisher=Izdavač
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ Permission121=Čitanje trećih stranaka vezanih za korisnika
 Permission122=Kreiranje/mijenjati trećih strana vezanih sa korisnika
 Permission125=Brisanje trećih stranaka vezanih za korisnika
 Permission126=Izvoz trećih stranaka
+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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Primalac
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index 3e755797bf0..f929e730c59 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -32,7 +32,7 @@ RIB=Broj bankovnog računa
 IBAN=IBAN broj
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valjan
-SwiftVNotalid=BIC/SWIFT nije valjan
+SwiftNotValid=BIC/SWIFT nije valjan
 IbanValid=BAN valjan
 IbanNotValid=BAN nije valjan
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Zemlja računa
 BankAccountOwner=Ime vlasnika računa
 BankAccountOwnerAddress=Adresa vlasnika računa
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Kreiraj račun
 NewBankAccount=Novi račun
 NewFinancialAccount=Novi finansijski račun
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/bookmarks.lang b/htdocs/langs/bs_BA/bookmarks.lang
index 4149fee4a0f..557c72eb2cc 100644
--- a/htdocs/langs/bs_BA/bookmarks.lang
+++ b/htdocs/langs/bs_BA/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=Link
 BehaviourOnClick=Ponašanje kada se klikne na link
 CreateBookmark=Kreiraj bookmark
 SetHereATitleForLink=Set a name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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=Upravljanje bookmark-ima
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index f7ebd56af97..d55125112f1 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ VATIntraCheck=Provjeri
 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">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Provjera nije moguća. Servis za provjeru nije naveden od stran države članice (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index e5eee1401f9..b15eb833c59 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 3097b323ab7..864a09e3e63 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/bs_BA/holiday.lang
index ee1f7d74028..76dc1b6154c 100644
--- a/htdocs/langs/bs_BA/holiday.lang
+++ b/htdocs/langs/bs_BA/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Opis
 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 is <b>%s</b> days.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Datum završetka mora biti poslije datuma početka.
 ErrorSQLCreateCP=Desila se SQL greška prilikom kreiranja:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -134,3 +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/install.lang b/htdocs/langs/bs_BA/install.lang
index 8a5391734e0..25dcf3ba9f1 100644
--- a/htdocs/langs/bs_BA/install.lang
+++ b/htdocs/langs/bs_BA/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/bs_BA/main.lang
index 875e3b8fe4f..6bbe061ed7e 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Greška, nije definirana PDV stopa za drž
 ErrorNoSocialContributionForSellerCountry=Greška, nisu definirane vrste doprinosa i poreza za državu '%s'.
 ErrorFailedToSaveFile=Greška, neuspjelo spremanje 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
 NotAuthorized=Niste ovlašteni da to uradite.
 SetDate=Postavi datum
@@ -87,7 +88,7 @@ FileWasNotUploaded=Datoteka je odabrana za prilog ali nije još postavljena. Kli
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Pročitajte online pomoć (neophodan pristup internetu)
 GoToHelpPage=Pročitaj pomoć
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Unos spremljen
 RecordDeleted=Unos obrisan
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Vraća kod za posljednju grešku pristupa bazi podat
 InformationLastAccessInError=Informacija za posljednju grešku pristupa bazi podataka
 DolibarrHasDetectedError=Dolibarr je otkrio tehničku grešku
 YouCanSetOptionDolibarrMainProdToZero=Možete pročitati datoteku zapisa ili postaviti opciju $dolibarr_main_prod to '0' u vašoj konfiguracijskoj datoteci za više informacija.
-InformationToHelpDiagnose=Ova informacija može biti korisna u dijagnostičke svrhe (možete postaviti opciju $dolibarr_main_prod to '1' da bi uklonili ovakva upozorenja)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Više informacija
 TechnicalInformation=Tehničke informacije
 TechnicalID=Tehnički ID
@@ -211,6 +212,8 @@ User=Korisnik
 Users=Korisnici
 Group=Grupa
 Groups=Grupe
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Nije definirana korisnička grupa
 Password=Šifra
 PasswordRetype=Ponovno upišite šifru
@@ -906,7 +909,7 @@ ViewFlatList=Vidi čisti spisak
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Ukloni pojam '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/bs_BA/modulebuilder.lang b/htdocs/langs/bs_BA/modulebuilder.lang
index 78fa08498e8..ee2c471e30c 100644
--- a/htdocs/langs/bs_BA/modulebuilder.lang
+++ b/htdocs/langs/bs_BA/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 e604efb98f0..4ef2a28837a 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/bs_BA/partnership.lang
index fec3204ce0d..47f0efa0b2b 100644
--- a/htdocs/langs/bs_BA/partnership.lang
+++ b/htdocs/langs/bs_BA/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/bs_BA/productbatch.lang b/htdocs/langs/bs_BA/productbatch.lang
index 76aec24f202..3ac935da17a 100644
--- a/htdocs/langs/bs_BA/productbatch.lang
+++ b/htdocs/langs/bs_BA/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 5e179719948..c8f23d7694b 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Ponderirana/vagana aritmetička sredina - PAS
 PMPValueShort=PAS
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 8bff7db86ec..ba1f4b44551 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/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,3 +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=Datum završetka ne može biti prije datuma početka
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 8fe05179d70..f9911423073 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=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
diff --git a/htdocs/langs/bs_BA/stripe.lang b/htdocs/langs/bs_BA/stripe.lang
index a1d7a15aa8b..ee0c446063e 100644
--- a/htdocs/langs/bs_BA/stripe.lang
+++ b/htdocs/langs/bs_BA/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
index 1c2e604815d..c3386daf3ac 100644
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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=Označi na potraživanja
+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
@@ -80,7 +82,7 @@ StatusMotif7=Sudske odluke
 StatusMotif8=Drugi razlog
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Samo office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index ac2ca9682ac..c2ef03783fb 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,8 +48,8 @@ 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=Amb aquesta eina, podeu exportar els esdeveniments d'origen (llista en format CSV i PDF) que s'han utilitzat per generar la vostra comptabilitat.
-ExportAccountingSourceDocHelp2=Per exportar les vostres revistes, utilitzeu l'entrada de menú %s - %s.
+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=Veure per compte comptable
 VueBySubAccountAccounting=Veure-ho per subcomptes comptables
 
@@ -203,7 +203,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
@@ -256,7 +256,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
@@ -286,7 +286,7 @@ ValidateMovements=Valida moviments
 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=Comptabilització automàtica realitzada
+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
@@ -298,7 +298,7 @@ NoNewRecordSaved=No hi ha més registres pel diari
 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
@@ -329,8 +329,8 @@ 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 (no serà possible la modificació de les línies)
+NotifiedValidationDate=Validar les entrades exportades (no serà possible modificar o eliminar les línies)
 ConfirmExportFile=Confirmació de la generació del fitxer d'exportació comptable?
 ExportDraftJournal=Exporta els esborranys del llibre
 Modelcsv=Model d'exportació
@@ -343,7 +343,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 +351,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,7 +387,8 @@ 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=Prohibit: la transacció ha estat validada i/o exportada.
+ForbiddenTransactionAlreadyValidated=Prohibit: la transacció s'ha validat.
 ## Dictionary
 Range=Rang de compte comptable
 Calculated=Calculat
@@ -404,6 +405,7 @@ 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=Ho sentim, aquest mòdul no és compatible amb la funció experimental de les factures de situació
 
 ## Import
 ImportAccountingEntries=Entrades de comptabilitat
@@ -416,7 +418,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 b7c6e27b2f3..02a196db0e8 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+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
@@ -157,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.
@@ -210,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
@@ -265,8 +267,8 @@ OtherResources=Altres recursos
 ExternalResources=Recursos externs
 SocialNetworks=Xarxes socials
 SocialNetworkId=Identificador de la xarxa social
-ForDocumentationSeeWiki=Per a la documentació d'usuari, desenvolupador o Preguntes Freqüents (FAQ), consulteu el wiki Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Per altres qüestions o realitzar les seves pròpies consultes, pot utilitzar el fòrum Dolibarr: <br><b><a href="%s" target="_blank">%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ú
@@ -279,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
@@ -341,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>
@@ -353,9 +355,10 @@ LastStableVersion=Última versió estable
 LastActivationDate=Data de l'última activació
 LastActivationAuthor=Últim autor d'activació
 LastActivationIP=Última IP d'activació
+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>
@@ -498,10 +501,10 @@ WarningPHPMail=ADVERTÈNCIA: la configuració per a enviar correus electrònics
 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
 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: %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
@@ -518,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
@@ -753,7 +756,7 @@ Permission106=Exportar expedicions
 Permission109=Eliminar expedicions
 Permission111=Consultar comptes financers (comptes bancaris, caixes)
 Permission112=Crear/modificar quantitat/eliminar registres bancaris
-Permission113=Configuració de comptes financers (crear i gestionar les categories)
+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
@@ -762,6 +765,7 @@ 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=Crear/modificar informació de pagament de tercers
 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)
@@ -889,12 +893,11 @@ Permission701=Consultar donacions
 Permission702=Crear/modificar donacions
 Permission703=Eliminar donacions
 Permission771=Consulta informes de despeses (propis i dels subordinats)
-Permission772=Crear/modificar informe de despeses
+Permission772=Crear/modificar informes de despeses (per a tu i els teus subordinats)
 Permission773=Eliminar els informes de despeses
-Permission774=Consulta tots els informes de despeses (fins i tot per a usuaris no subordinats)
 Permission775=Aprovar els informes de despeses
 Permission776=Pagar informes de despeses
-Permission777=Llegeix els informes de despeses de tothom
+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
@@ -958,18 +961,14 @@ 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=Vegeu empleats
-Permission4002=Crea empleats
-Permission4003=Suprimeix els empleats
-Permission4004=Exporta empleats
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify 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
 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.
@@ -977,9 +976,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=Consulta totes les sol·licituds de permís (fins i tot dels usuaris no subordinats)
-Permission20005=Crea/modifica sol·licituds de permís per a tothom (fins i tot per a usuaris no subordinats)
-Permission20006=Administra els dies de lliure disposició (configura i actualitza el balanç)
+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
@@ -1052,7 +1051,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
@@ -1212,7 +1211,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
@@ -1350,7 +1349,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.
@@ -1358,9 +1357,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=Mostra la llista d'informació de referència client/proveïdor (llista de selecció o llista desplegable) i la majoria d’enllaços. <br>Els tercers apareixeran amb un format de nom "CC12345 - SC45678 - Nom de l'organització". en lloc de "Nom de l'organització".
-AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=Mostra la llista d'informació de la direcció de client / proveïdor (llista de selecció o combobox) <br> Els tercers apareixeran amb un format de nom de "The Big Company corp. - 21 jump street 123456 Big town - USA" en lloc de "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
@@ -1644,7 +1643,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.
@@ -1708,8 +1707,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
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+NotificationDisableConfirmMessageContact=Amaga la llista de destinataris (subscrits com a contacte) de les notificacions al missatge de confirmació
+NotificationDisableConfirmMessageUser=Amaga la llista de destinataris (suscrits 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 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Text lliure en els rebuts de lliurament
 ##### FCKeditor #####
 AdvancedEditor=Editor avançat
 ActivateFCKeditor=Activar editor avançat per a :
-FCKeditorForNotePublic=WYSIWIG creació / edició del camp notes públiques d'elements
-FCKeditorForNotePrivate=WYSIWIG creació / edició del camp notes privades d'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>
@@ -1800,7 +1800,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,9 +1813,9 @@ 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
 StockDecreaseForPointOfSaleDisabled=La disminució d'estocs des del punt de venda està desactivat
@@ -1901,6 +1901,7 @@ 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=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
@@ -1911,11 +1912,13 @@ BackupDumpWizard=Assistent per a crear el fitxer d'exportació de la base de dad
 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 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)
+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
@@ -1941,7 +1944,7 @@ 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.
+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
@@ -2016,8 +2019,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Voleu executar ara la recol·lecció d’aquest col
 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=Registre d'esdeveniments de correu electrònic
-CreateLeadAndThirdParty=Crea Client Potencial (i tercer si és necessari)
-CreateTicketAndThirdParty=Crea un tiquet (i enllaça'l amb un tercer si es va carregar amb una operació anterior)
+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, sense cap tercer d'altra manera)
 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=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
@@ -2078,7 +2082,7 @@ CreateCandidature=Crea sol·licitud de feina
 FormatZip=Format Zip
 MainMenuCode=Codi d'entrada del menú (menú principal)
 ECMAutoTree=Mostra l'arbre ECM automàtic
-OperationParamDesc=Definiu els valors a utilitzar per a l'objecte de l'acció, o com extreure valors. Per exemple:<br>objproperty1=SET:el valor a assignar<br>objproperty2=SET:un valor amb substitució de __objproperty1__<br>objproperty3=SETIFEMPTY:valor usat si objproperty3 no ha estat definit<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:El nom de la meva empresa és\\s([^\\s]*)<br><br>Empreu ; com a separador per a extreure o definir diverses propietats alhora.
+OperationParamDesc=Definiu les regles a utilitzar per 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 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
@@ -2124,7 +2128,7 @@ 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=Podeu utilitzar aquesta acció per utilitzar el contingut del correu electrònic per trobar i carregar un tercer existent a la vostra base de dades. El tercer trobat (o creat) s'utilitzarà per seguir les accions que ho necessitin. <br> Per exemple, si voleu crear un tercer amb un nom extret de la cadena "Nom: nom per trobar" al cos, utilitzeu el correu electrònic del remitent com a correu electrònic, podeu configurar el camp del paràmetre així: ^ De: (. *); Nom = EXTRACTE: COS: Nom: \\ 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?
@@ -2141,7 +2145,7 @@ EMailsWillHaveMessageID=Els correus electrònics tindran una etiqueta "Referènc
 PDF_SHOW_PROJECT=Mostra el projecte al document
 ShowProjectLabel=Etiqueta del projecte
 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
@@ -2168,17 +2172,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 fer copies de seguretat programades 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ó.
 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
@@ -2208,4 +2212,11 @@ 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
+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
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index f032308545c..30bd9cad0b1 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -64,7 +64,7 @@ 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
 OrderCreatedInDolibarr=Comanda %s creada
 OrderValidatedInDolibarr=Comanda %s validada
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index cdef85ece43..338012f07cd 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -32,7 +32,7 @@ RIB=Compte bancari
 IBAN=Identificador IBAN
 BIC=Codi BIC/SWIFT
 SwiftValid=BIC/SWIFT vàlid
-SwiftVNotalid=BIC/SWIFT no vàlid
+SwiftNotValid=BIC/SWIFT no vàlid
 IbanValid=BAN vàlid
 IbanNotValid=BAN no vàlid
 StandingOrders=Domiciliacions
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Dades bancàries
 BankAccountCountry=País del compte
 BankAccountOwner=Nom del titular del compte
 BankAccountOwnerAddress=Direcció del titular del compte
-RIBControlError=Ha fallat la comprovació d’integritat dels valors. Això significa que la informació d’aquest número de compte no és completa o és incorrecta (comproveu el país, els números i l’IBAN).
 CreateAccount=Crear compte
 NewBankAccount=Compte nou
 NewFinancialAccount=Compte financer nou
@@ -182,4 +181,4 @@ 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
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 5340e280590..d61d7fc719f 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
@@ -192,7 +191,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 +199,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 +220,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 +234,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 +269,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,6 +279,7 @@ 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
 Repeatable=Recurrent
@@ -449,6 +449,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
@@ -578,7 +580,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)
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/ca_ES/blockedlog.lang b/htdocs/langs/ca_ES/blockedlog.lang
index dc38c2149c7..4092a8f8a1e 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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Llista de països on l'ús d'aquest mòdul
 OnlyNonValid=No vàlid
 TooManyRecordToScanRestrictFilters=Hi ha massa registres per escanejar / analitzar. Limiteu la llista amb filtres més restrictius.
 RestrictYearToExport=Restringeix el mes / any per a exportar
+BlockedLogEnabled=S'ha habilitat el sistema per fer el seguiment d'esdeveniments en registres inalterables
+BlockedLogDisabled=El sistema per fer un seguiment dels esdeveniments en registres inalterables s'ha desactivat després de fer algunes gravacions. Hem desat una empremta digital especial per fer un seguiment de la cadena com a trencada
+BlockedLogDisabledBis=S'ha desactivat el sistema per 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 c9f0dccfe69..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=Utilitzeu un enllaç extern / absolut (https://URL) o un enllaç intern / relatiu (/DOLIBARR_ROOT/htdocs/...)
+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/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index 8bc8b8b0f36..5daeefd8246 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
@@ -53,7 +53,7 @@ RealAmount=Import real
 CashFence=Tancament de caixa
 CashFenceDone=Tancament de caixa realitzat pel 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
@@ -130,7 +130,7 @@ 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
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 6cb28b88d54..0412b592ca6 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
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Registre Mercantil)
+ProfId2CM=Id. prof. 2 (núm. contribuent)
+ProfId3CM=Id. prof. 3 (Decret de creació)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Registre Mercantil
+ProfId2ShortCM=Contribuent núm.
+ProfId3ShortCM=Decret de creació
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=CIF/NIF
 ProfId2CO=-
 ProfId3CO=-
@@ -272,9 +284,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
@@ -369,7 +381,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=També podeu verificar-ho manualment al lloc web de la Comissió Europea <a href="%s" target="_blank">%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
@@ -460,7 +472,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 04255c387a2..9d3361a1b79 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -170,8 +170,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.
-RulesResultDue=- Inclou factures pendents, despeses, IVA, donacions tant si han estat pagades com si no. També inclou salaris pagats. <br> - Es basa en la data de facturació de les factures i en la data de venciment per despeses o pagaments d’impostos. Per als salaris definits amb el mòdul Salari, s’utilitza la data de valor del pagament.
-RulesResultInOut=- Inclou els pagaments reals realitzats en les factures, les despeses, l'IVA i els salaris. <br> - Es basa en les dates de pagament de les factures, les despeses, l'IVA i els salaris. La data de la donació per a la donació.
+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.
@@ -231,12 +232,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
@@ -286,12 +287,14 @@ 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)
+InvoiceLate30Days = Factures amb retard (> 30 dies)
+InvoiceLate15Days = Factures amb retard (entre 15 i 30 dies)
+InvoiceLateMinus15Days = Factures amb retard (< 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?
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 fd9cee5ddfc..9f038bdf256 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -27,7 +27,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
@@ -111,6 +113,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=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
@@ -218,7 +221,7 @@ 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.
@@ -271,6 +274,9 @@ 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=No es pot executar l'ordre "id"
+ErrorBadCharIntoLoginName=Caràcter no autoritzat al nom d'inici de sessió
+ErrorRequestTooLarge=Error, sol·licitud massa gran
 
 # 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.
@@ -312,6 +318,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..870941b0fff 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,17 @@ 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_TASK_LABELTooltip = Quan es valida un esdeveniment organitzat, es poden crear automàticament algunes tasques al projecte <br><br>Per exemple: <br> Enviar trucada de Conferència <br> Enviar trucada de estand <br> Rebre trucada de conferències <br> Rebre trucada de estand <br> Subscripcions obertes als esdeveniments pels assistents <br> Enviar recordatori de l'esdeveniment als ponents <br> Envia recordatori de l'esdeveniment a l'organitzador de l'estand <br> Envia 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_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
@@ -71,26 +71,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 +107,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 +137,10 @@ 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)
 
-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 +158,10 @@ 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 obtenir una validació manual
+ErrorSeveralCompaniesWithNameContactUs=S'han trobat diverses empreses amb aquest nom per la qual cosa no podem validar automàticament el vostre registre. Si us plau, poseu-vos en contacte amb nosaltres a %s per obtenir una validació manual
+NoPublicActionsAllowedForThisEvent=No hi ha cap acció pública oberta al públic per a aquest esdeveniment
diff --git a/htdocs/langs/ca_ES/help.lang b/htdocs/langs/ca_ES/help.lang
index d0ffcfc9b44..02b26539227 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 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 e586689ad27..845ee3ffe97 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -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=El seu saldo de dies lliures es de <b>%s dies</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,3 +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
+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..4f56f1a6c8c 100644
--- a/htdocs/langs/ca_ES/hrm.lang
+++ b/htdocs/langs/ca_ES/hrm.lang
@@ -20,62 +20,62 @@ 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
+knowHow=Saber com
+HowToBe=Com ser
+knowledge=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
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index 20bad92f124..e1143e0d0cc 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -21,6 +21,7 @@ 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=La vostra instal·lació de PHP no admet les funcions mbstring.
 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.
diff --git a/htdocs/langs/ca_ES/knowledgemanagement.lang b/htdocs/langs/ca_ES/knowledgemanagement.lang
index ef153f8da6e..4bc4ee56f66 100644
--- a/htdocs/langs/ca_ES/knowledgemanagement.lang
+++ b/htdocs/langs/ca_ES/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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)
 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..32c178e92d6 100644
--- a/htdocs/langs/ca_ES/languages.lang
+++ b/htdocs/langs/ca_ES/languages.lang
@@ -1,13 +1,13 @@
 # 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_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)
@@ -74,7 +74,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à
@@ -95,7 +95,7 @@ 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_tg_TJ=Tadjik
 Language_tr_TR=Turc
 Language_sl_SI=Eslovè
 Language_sv_SV=Suec
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/mails.lang b/htdocs/langs/ca_ES/mails.lang
index 19cd8f322cd..799c3ed0452 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -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
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 4d33ecf8c0b..2144d2ecf0a 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -67,6 +67,7 @@ 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=El camp "%s" no pot ser negatiu
 MaxNbOfRecordPerPage=Màx. nombre de registres per pàgina
 NotAuthorized=No està autoritzat per fer-ho.
 SetDate=Indica la data
@@ -87,7 +88,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=Hi ha una pàgina d’ajuda dedicada relacionada amb la pantalla actual
+DedicatedPageAvailable=Pàgina d'ajuda dedicada relacionada amb la pantalla actual
 HomePage=Pàgina d'inici
 RecordSaved=Registre guardat
 RecordDeleted=Registre eliminat
@@ -114,7 +115,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=Aquesta informació pot ser útil per a fer diagnòstics (podeu configurar l'opció $dolibarr_main_prod a '1' per a eliminar aquestes notificacions)
+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
@@ -211,6 +212,8 @@ User=Usuari
 Users=Usuaris
 Group=Grup
 Groups=Grups
+UserGroup=Grup d'usuaris
+UserGroups=Grups d'usuaris
 NoUserGroupDefined=Grup d'usuari no definit
 Password=Contrasenya
 PasswordRetype=Repetir contrasenya
@@ -438,7 +441,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ó
@@ -906,7 +909,7 @@ ViewFlatList=Veure llista plana
 ViewAccountList=Veure llibre major
 ViewSubAccountList=Vegeu el subcompte del llibre major
 RemoveString=Eliminar cadena '%s'
-SomeTranslationAreUncomplete=Alguns idiomes poden estar traduïts parcialment o poden tenir errors. Si detectes algun, pots corregir els fitxers d'idiomes registrant-te a <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
+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 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
@@ -1081,7 +1084,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
@@ -1157,5 +1160,7 @@ RecordsApproved=%s Registre(s) aprovat(s)
 Properties=Propietats
 hasBeenValidated=%s s'ha validat
 ClientTZ=Zona horària client (usuari)
-NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+NotClosedYet=Encara no tancat
+ClearSignature=Restableix la signatura
+CanceledHidden=Cancel·lat ocult
+CanceledShown=Es mostra cancel·lada
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 3fe6d64443b..9ed01b35226 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -140,12 +140,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
@@ -210,7 +210,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)
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index 01f6e197cf8..116ea41d0b1 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-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"> és aquí </a>.
+ModuleBuilderDesc=Aquesta eina només l'han d'utilitzar usuaris o desenvolupadors experimentats. Proporciona utilitats per 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ó 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.
 ModuleBuilderDesc2=Camí on es generen / editen els mòduls (primer directori per als mòduls externs definits en %s): <strong> %s </strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Els menús proporcionats pel vostre mòdul / aplicació es d
 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 recorded by other modules).
+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
diff --git a/htdocs/langs/ca_ES/mrp.lang b/htdocs/langs/ca_ES/mrp.lang
index beac2db3e6d..b15fd5c4f1e 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
@@ -104,6 +104,6 @@ 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ó
diff --git a/htdocs/langs/ca_ES/oauth.lang b/htdocs/langs/ca_ES/oauth.lang
index 95bb8384e1b..d5808930a4f 100644
--- a/htdocs/langs/ca_ES/oauth.lang
+++ b/htdocs/langs/ca_ES/oauth.lang
@@ -7,7 +7,7 @@ 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
 DeleteAccess=Feu clic aquí per a suprimir el testimoni
@@ -23,10 +23,10 @@ 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_GOOGLE_DESC=Aneu a <a class="notasortlink" href="https://console.developers.google.com/" target="_blank" rel="noopener noreferrer external">aquesta pàgina</a> i després "Credencials" per a 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_GITHUB_DESC=Aneu a <a class="notasortlink" href="https://github.com/settings/developers" target="_blank" rel="noopener noreferrer external"> aquesta pàgina </a> i després "Registreu una aplicació nova" per crear credencials OAuth
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/ca_ES/opensurvey.lang b/htdocs/langs/ca_ES/opensurvey.lang
index dc052b6f241..e81e66a4551 100644
--- a/htdocs/langs/ca_ES/opensurvey.lang
+++ b/htdocs/langs/ca_ES/opensurvey.lang
@@ -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/other.lang b/htdocs/langs/ca_ES/other.lang
index 628f1964203..4154ffc475a 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
@@ -258,6 +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=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
@@ -266,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
diff --git a/htdocs/langs/ca_ES/partnership.lang b/htdocs/langs/ca_ES/partnership.lang
index 619c81cdfc4..bd9fe10404f 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=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
@@ -58,7 +58,7 @@ 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
 
 #
 # Template Mail
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..529fe9c0b28 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,7 +26,7 @@ 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
diff --git a/htdocs/langs/ca_ES/printing.lang b/htdocs/langs/ca_ES/printing.lang
index 4d504c5de00..5691216f9a1 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 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.
diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang
index 518af06fc38..5a53b2f0281 100644
--- a/htdocs/langs/ca_ES/productbatch.lang
+++ b/htdocs/langs/ca_ES/productbatch.lang
@@ -30,15 +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=Quantitat per afegir per a cada codi de barres / lot / sèrie escanejat
+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=Substitueix
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 0631d2fa288..82eb754189e 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -75,7 +75,7 @@ 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ó.
 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
@@ -316,7 +316,7 @@ 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
@@ -398,13 +398,16 @@ 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=Attention periods not entered and mandatory
-mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+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
+Rank=Classificació
+SwitchOnSaleStatus=Canvia l'estat de venda
+SwitchOnPurchaseStatus=Activa l'estat de compra
+StockMouvementExtraFields= Camps addicionals (moviment d'existències)
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 0bfa10b6bc7..49a2835884b 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -197,6 +197,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,5 +283,7 @@ 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
diff --git a/htdocs/langs/ca_ES/propal.lang b/htdocs/langs/ca_ES/propal.lang
index 389e36bbd82..10ca43312b5 100644
--- a/htdocs/langs/ca_ES/propal.lang
+++ b/htdocs/langs/ca_ES/propal.lang
@@ -89,11 +89,11 @@ 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
+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/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 68ed93986e8..0e591c8dd1f 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
@@ -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
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=S'ha eliminat correctament el límit d'estoc per al
 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
 InventoryDate=Data d'inventari
+Inventories=Inventaris
 NewInventory=Inventari nou
 inventorySetup = Configuració de l'inventari
 inventoryCreatePermission=Crea un inventari nou
@@ -206,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=Qtat. teòrica
-TheoricalValue=Qtat. teòrica
+TheoricalQty=Quantitat teòrica
+TheoricalValue=Quantitat teòrica
 LastPA=Últim BP
 CurrentPA=Actual BP
 RecordedQty=Qtat. registrada
@@ -240,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=Empleneu la quantitat real escanejant
+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.
@@ -250,17 +251,23 @@ 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=Ompliu la quantitat real amb la quantitat esperada
+AutofillWithExpected=Substituïu la quantitat real per 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
-FieldCannotBeNegative=El camp "%s" no pot ser negatiu
 ErrorWrongBarcodemode=Mode de codi de barres desconegut
 ProductDoesNotExist=El producte no existeix
-ErrorSameBatchNumber=Es troba el mateix número de lot a la llista d’inventari
+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=Deseu primer les quantitats reals inventariades, abans de demanar la creació del moviment d'existències.
+InventoryStartedShort=Començada
+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
diff --git a/htdocs/langs/ca_ES/stripe.lang b/htdocs/langs/ca_ES/stripe.lang
index 1f519da9659..7d96342c51e 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=Ofereix als clients una pàgina de pagaments en línia de Stripe per als pagaments amb targetes de crèdit/dèbit mitjançant <a href="http://www.stripe.com" target="_blank">Stripe</a>. Es pot utilitzar per a permetre als clients fer pagaments ad-hoc o per a pagaments relacionats amb un objecte Dolibarr concret (factura, comanda, ...)
+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 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
diff --git a/htdocs/langs/ca_ES/ticket.lang b/htdocs/langs/ca_ES/ticket.lang
index 096cd88d783..7da1703c601 100644
--- a/htdocs/langs/ca_ES/ticket.lang
+++ b/htdocs/langs/ca_ES/ticket.lang
@@ -121,7 +121,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
@@ -318,7 +318,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..75151da5644 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -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/website.lang b/htdocs/langs/ca_ES/website.lang
index fa7927a9f4c..118e8e38909 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -45,7 +45,7 @@ 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>
+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
@@ -60,7 +60,7 @@ YouCanEditHtmlSourceckeditor=Podeu editar el codi font HTML usant el botó "Codi
 YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> Podeu incloure el codi PHP en aquesta font mitjançant les etiquetes <strong> &lt;? php? &gt; a0a65d071f6fc9z Estan disponibles les variables globals següents: $ conf, $ db, $ mysoc, $ user, $ lloc web, $ pàgina web, $ weblangs, $ pagelangs. <br> <br> <span class="fa fa-bug"> </span> També podeu incloure contingut d'una altra pàgina / contenidor amb la següent sintaxi: <br> <strong> a03900dfdf ? &gt; </strong> <br> <br> <span class="fa fa-bug"> </span> Vostè pot fer una redirecció a una altra pàgina / Contenidor amb la següent sintaxi (Nota: no emeten cap contingut abans d'una redirecció) :? <br> <strong> &lt; php redirectToContainer ( 'alias_of_container_to_redirect_to'); ? &gt; </strong> <br> <br> <span class="fa fa-link"> </span> Per afegir un vincle a una altra pàgina, utilitzeu la sintaxi: <br> <strong> &lt;a href = "alias_of_page_to_link_to.php" &gt;mylink&lt;a&gt; </strong> <br> <br> <span class="fa fa-download"> </span> Per incloure un enllaç per a descàrrega <strong> </strong> un arxiu emmagatzemat en els documents <strong> un directori </strong>, utilitzeu el document <strong> document.php </strong> embolcall: <br> Exemple, per a un fitxer a documents / ecm (cal registrar-se)? ] nom de fitxer.ext "&gt; </strong> <br> Per a un fitxer a documents / suports (directori obert per a accés públic), la sintaxi és: <br> <strong> a03900dfre31ecz "/document.php?modulepart=medias&file=[relative_dir/ Alanfilename.ext"&gt; </strong> <br> Per a un fitxer compartit amb un enllaç compartit (accés obert mitjançant la tecla hash compartida del fitxer), una sintaxis es0a0z0z0a009 /document.php?hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> </span> per incloure un </strong> imatge <strong> emmagatzemat en els documents <strong> </strong> directori, utilitzeu el <strong> viewimage.php </strong> embolcall: <br> exemple, per a una imatge en documents / arxius multimèdia (obert directori d’accés públic), la sintaxi és: <br> <strong> &lt;img src = "/ viewimage.php? modulepart = medias&amp;file = [relative_dir /] filename.ext" a0129
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource2=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
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 2505a6e2705..fdcbe9b1f36 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Ordre de transferència bancària
 LatestBankTransferReceipts=Les %s últimes ordres de transferència bancària
 LastWithdrawalReceipts=Últims %s fitxers per a la domiciliació bancària
 WithdrawalsLine=Línia d'ordre de domiciliació
+CreditTransfer=Transferència bancària
 CreditTransferLine=Línia de transferència bancària
 WithdrawalsLines=Línies d'ordre de domiciliació
 CreditTransferLines=Línies de transferència bancària
@@ -47,6 +48,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=Classifica els domiciliats
 ClassCreditedConfirm=Esteu segur de voler classificar aquesta domiciliació com abonada al seu compte bancari?
 TransData=Data enviament
 TransMetod=Mètode enviament
@@ -80,7 +82,7 @@ StatusMotif7=Decisió judicial
 StatusMotif8=Altre motiu
 CreateForSepaFRST=Crear un fitxer de domiciliació bancària (SEPA FRST)
 CreateForSepaRCUR=Crea un fitxer de domiciliació bancària (SEPA RCUR)
-CreateAll=Crear un fitxer de domiciliació bancària (tot)
+CreateAll=Crea un fitxer de domiciliació bancària
 CreateFileForPaymentByBankTransfer=Crea un fitxer per a transferència de crèdit
 CreateSepaFileForPaymentByBankTransfer=Crea un fitxer de transferència bancària (SEPA)
 CreateGuichet=Només oficina
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=No és possible crear una domiciliació sense impo
 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=Signant aquest formulari de mandat, autoritzes (A) %s a enviar instruccions al teu banc per a carregar al teu compte i (B) el teu banc carregarà al teu compte d'acord amb les instruccions de part de %s. Com a part dels teus drets, tu tens la capacitat de retornar el rebut des del teu banc sota els termes i condicions del teu acord amb el teu banc. Una devolució deu ser reclamada dintre de 8 setmanes comptant des de la data en que el teu compte va ser carregat. Els teus drets en referència el mandat anterior estan explicats a un comunicat que pots obtenir del teu banc.
+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 *
@@ -150,3 +152,5 @@ 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=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
diff --git a/htdocs/langs/ca_ES/workflow.lang b/htdocs/langs/ca_ES/workflow.lang
index b1296f2b280..4465cf9ca53 100644
--- a/htdocs/langs/ca_ES/workflow.lang
+++ b/htdocs/langs/ca_ES/workflow.lang
@@ -14,9 +14,13 @@ 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
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Tanca totes les intervencions vinculades quan es tanca un tiquet
diff --git a/htdocs/langs/ca_ES/zapier.lang b/htdocs/langs/ca_ES/zapier.lang
index 731820a7373..8ec34baedaf 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 fer cap configuració al costat de Dolibarr per a utilitzar Zapier. Tot i això, heu de generar i publicar un paquet a zapier per a poder utilitzar Zapier amb Dolibarr. Consulteu la documentació <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 47322a4736b..3e9c0c1d344 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Tato služba
 ThisProduct=Tento výrobek
 DefaultForService=Výchozí nastavení pro službu
 DefaultForProduct=Výchozí produkt
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
+ProductForThisThirdparty=Produkty pro tento subjekt
+ServiceForThisThirdparty=Služby pro tento subjekt
 CantSuggest=Nelze navrhnout
 AccountancySetupDoneFromAccountancyMenu=Většina nastavení účetnictví se provádí z nabídky %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,7 +48,7 @@ CountriesNotInEEC=Země, které nejsou v EHS
 CountriesInEECExceptMe=Země v EHS kromě %s
 CountriesExceptMe=Všechny země kromě %s
 AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ ValidateMovements=Ověřte pohyby
 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=Automatické vázání provedeno
+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
@@ -387,7 +387,8 @@ SaleExport=Exportní prodej
 SaleEEC=Prodej v EHS
 SaleEECWithVAT=Prodej v EHS s nulovou DPH, takže předpokládáme, že se nejedná o intrakomunitní prodej a navrhovaný účet je standardní produktový účet.
 SaleEECWithoutVATNumber=Prodej v EHS bez DPH, ale DIČ třetí strany není definováno. Pro standardní prodej jsme upadli na produktový účet. V případě potřeby můžete opravit DIČ třetí strany nebo produktový účet.
-
+ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
+ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
 Range=Řada účetních účtu
 Calculated=počítáno
@@ -404,6 +405,7 @@ NoJournalDefined=Žádný deník nebyl definován
 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
 
 ## Import
 ImportAccountingEntries=Účetní zápisy
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 3d0c9ba2b32..5934fa549c3 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Nadace
 Version=Verze
 Publisher=Vydavatel
@@ -265,8 +267,8 @@ OtherResources=jiné zdroje
 ExternalResources=Externí zdroje
 SocialNetworks=Sociální sítě
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=Pro uživatelskou nebo vývojářskou dokumentaci (Doc, FAQs ...) <br> navštivte Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
-ForAnswersSeeForum=V případě jakýchkoliv dalších dotazů nebo nápovědy použijte fórum Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
+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=Tato oblast slouží k získání nápovědy a podpory systému Dolibarr.
 HelpCenterDesc2=Některé z těchto zdrojů jsou k dispozici pouze v <b> v angličtině </b>.
 CurrentMenuHandler=Aktuální handler menu
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Poslední stabilní verze
 LastActivationDate=Nejzazší datum aktivace
 LastActivationAuthor=Poslední aktivátor autorizace
 LastActivationIP=Nejnovější IP aktivace
+LastActivationVersion=Latest activation version
 UpdateServerOffline=Aktualizace serveru v režimu offline
 WithCounter=Správa počítadlo
 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>
@@ -753,7 +756,7 @@ Permission106=Exportujte odesílání
 Permission109=Smazat odesílání
 Permission111=Přečtěte si finanční účty
 Permission112=Vytvořit/upravit/smazat a porovnat transakce
-Permission113=Nastavení finančních účtů (vytváření, správa kategorií)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Sladění transakcí
 Permission115=Exportní transakce a výpisy z účtu
 Permission116=Převody mezi účty
@@ -762,6 +765,7 @@ Permission121=Přečtěte si subjekty spojené s uživatelem
 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)
@@ -889,12 +893,11 @@ Permission701=Přečtěte si dary
 Permission702=Vytvářejte/upravujte dary
 Permission703=Odstranit dary
 Permission771=Přečtěte si přehledy výdajů (vaše a vaše podřízené)
-Permission772=Vytvářejte/upravujte výkazy výdajů
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Odstraňte přehledy výdajů
-Permission774=Přečtěte si všechny přehledy výdajů (i pro uživatele, kteří nejsou podřízenými)
 Permission775=Schvalovat zprávy o výdajích
 Permission776=Zaplatit vyúčtování výdajů
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export výkazů o výdajích
 Permission1001=Přečtěte si zásoby
@@ -958,15 +961,11 @@ Permission2801=Používejte FTP klienta v režimu čtení (pouze procházení a
 Permission2802=Použití FTP klienta v režimu zápisu (mazání nebo odesílání souborů)
 Permission3200=Přečtěte si archivované události a otisky prstů
 Permission3301=Generate new modules
-Permission4001=Viz zaměstnanci
-Permission4002=Vytvářejte zaměstnance
-Permission4003=Smazat zaměstnance
-Permission4004=Exportovat zaměstnance
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ Permission10005=Smazat obsah webových stránek
 Permission20001=Přečtěte si žádosti o dovolenou (vaše dovolená a vaše podřízené)
 Permission20002=Vytvořte / upravte své žádosti o dovolenou (vaše dovolená a vaše podřízené)
 Permission20003=Smazat žádosti o dovolenou
-Permission20004=Přečtěte si všechny požadavky na dovolenou (i u uživatelů, kteří nejsou podřízeni)
-Permission20005=Vytvářet / upravovat požadavky na dovolenou pro všechny (i pro uživatele, kteří nejsou podřízeni)
-Permission20006=Žádosti admin opuštěné požadavky (setup a aktualizovat bilance)
+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=Schvalovat žádosti o dovolenou
 Permission23001=Čtení naplánovaných úloh
 Permission23002=Vytvoření/aktualizace naplánované úlohy
@@ -1358,9 +1357,9 @@ BrowserIsOK=Používáte webový prohlížeč %s. Tento prohlížeč je v pořá
 BrowserIsKO=Používáte webový prohlížeč %s. Tento prohlížeč je znám jako špatná volba pro zabezpečení, výkon a spolehlivost. Doporučujeme používat prohlížeče Firefox, Chrome, Opera nebo Safari.
 PHPModuleLoaded=Je načtena komponenta PHP %s
 PreloadOPCode=Používá se předinstalovaný OPCode
-AddRefInList=Zobrazit číslo zákazníka / dodavatele seznam informací (vyberte seznam nebo kombinace) a většinu hypertextových odkazů. <br> Zobrazí se třetí strany s názvem formátu "CC12345 - SC45678 - The Big Company corp". místo "The Big Company corp".
-AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=Zobrazte seznam informací o adresách zákazníků / prodejců (vyberte seznam nebo kombinace) <br> Subjekty se objeví ve formátu "Big Company Corp. - 21 skokové ulici 123456 Big City - USA" namísto "The Big Company corp".
+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=Požádejte o preferovanou způsob přepravy pro subjekty.
 FieldEdition=Editace položky %s
@@ -1708,8 +1707,9 @@ MailingDelay=Sekund čekání po odeslání další zprávy
 NotificationSetup=Nastavení e-mailového oznámení
 NotificationEMailFrom=E-mail odesílatele (od) pro e-maily odeslané modulem Oznámení
 FixedEmailTarget=Příjemce
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Nastavení modulu odeslání
 SendingsReceiptModel=Odeslání stvrzenky modelu
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Volný text na potvrzení o doručení
 ##### FCKeditor #####
 AdvancedEditor=Rozšířené editor
 ActivateFCKeditor=Aktivujte pokročilý editor pro:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field public notes of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field private notes of elements
+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>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Nastavení výkazu výdajů modulu - pravidla
 ExpenseReportNumberingModules=Způsob číslování výkazů výdajů
 NoModueToManageStockIncrease=Nebyl aktivován žádný modul schopný zvládnout automatické zvýšení zásob. Zvýšení zásob bude provedeno pouze při ručním zadávání.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Možnosti upozornění na e-mail můžete najít povolením a konfigurací modulu "Oznámení".
+TemplatesForNotifications=Templates for notifications
 ListOfNotificationsPerUser=Seznam automatických oznámení na uživatele *
 ListOfNotificationsPerUserOrContact=Seznam možných automatických oznámení (na obchodní akci) dostupných pro uživatele * nebo pro kontakt **
 ListOfFixedNotifications=Seznam automatických pevných oznámení
@@ -1916,6 +1917,8 @@ 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")
+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é
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Chcete nyní spustit kolekci tohoto sběratele?
 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
-RecordEvent=Nahrávat událost e-mailu
-CreateLeadAndThirdParty=Vytvoření vedení (a případně subjekty)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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=Výstup posledního kódu
 NbOfEmailsInInbox=Počet e-mailů ve zdrojovém adresáři
 LoadThirdPartyFromName=Načíst vyhledávání subjektem na adrese %s (pouze načíst)
 LoadThirdPartyFromNameOrCreate=Načíst vyhledávání subjektů na adrese %s (vytvořit, pokud nebyly nalezeny)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Vstupní kód nabídky (hlavní menu)
 ECMAutoTree=Zobrazit automatický strom ECM
-OperationParamDesc=Definujte hodnoty, které mají být použity pro objekt akce nebo jak extrahovat hodnoty. Například: <br> objproperty1 = SET: hodnota, která se má nastavit <br> objproperty2 = SET: hodnota s nahrazením __objproperty1__ <br> objproperty3 = SETIFEMPTY: použitá hodnota, pokud objproperty3 ještě není definována<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>Použijte a; char jako oddělovač pro extrahování nebo nastavení několika vlastností.
+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=Otevírací doba
 OpeningHoursDesc=Zadejte zde běžnou pracovní dobu vaší společnosti.
 ResourceSetup=Konfigurace modulu zdrojů
@@ -2124,7 +2128,7 @@ LargerThan=Větší než
 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=Pokud jste s účtem GMail povolili ověření ve 2 - dvou krocích, doporučuje se pro aplikaci vytvořit vyhrazené druhé heslo namísto použití hesla pro vlastní účet z adresy https://myaccount.google.com/.
 EmailCollectorTargetDir=Po úspěšném zpracování může být žádoucí chování při přesunu e-mailu do jiné značky/adresáře. Chcete-li tuto funkci použít, stačí zadat název adresáře (NEPOUŽÍVEJTE v názvu speciální znaky). Musíte také použít přihlašovací účet pro čtení a zápis.
-EmailCollectorLoadThirdPartyHelp=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 a string 'Name: name to find' found into the body, use 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=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=Koncový bod pro %s: %s
 DeleteEmailCollector=Smazat sběratele e-mailu
 ConfirmDeleteEmailCollector=Opravdu chcete smazat tohoto sběratele e-mailů?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
index 640ac005735..6c12d3389c7 100644
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -32,7 +32,7 @@ RIB=Číslo bankovního účtu
 IBAN=IBAN
 BIC=BIC/SWIFT kód
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN platný
 IbanNotValid=BAN není platná
 StandingOrders=příkazy k inkasu
@@ -49,7 +49,6 @@ BankAccountDomiciliation=adresa banky
 BankAccountCountry=Účet země
 BankAccountOwner=Název majitele účtu
 BankAccountOwnerAddress=Adresa majitele účtu
-RIBControlError=Kontrola integrity hodnot selhala. To znamená, že informace pro toto číslo účtu nejsou úplné nebo jsou nesprávné (zkontrolujte zemi, čísla a IBAN).
 CreateAccount=Vytvořit účet
 NewBankAccount=Nový účet
 NewFinancialAccount=Nový finanční účet
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/bookmarks.lang b/htdocs/langs/cs_CZ/bookmarks.lang
index 04c1097c4b5..a2b893f37d4 100644
--- a/htdocs/langs/cs_CZ/bookmarks.lang
+++ b/htdocs/langs/cs_CZ/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Chování při kliknutí na URL
 CreateBookmark=Vytvořit záložku
 SetHereATitleForLink=Nastavte název záložky
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Použijte externí/absolutní odkaz (https://URL) nebo interní/ relativní odkaz (/DOLIBARR_ROOT/htdocs /...)
+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=Zvolte, zda se má odkazovaná stránka otevřít na aktuální kartě nebo na nové kartě
 BookmarksManagement=Záložky řízení
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index 664f07aa430..d9f445c958c 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ VATIntraCheck=Kontrola
 VATIntraCheckDesc=Kód DPH ID musí obsahovat předčíslí země. Odkaz <b> %s </b> používá službu European VAT Checker (VIES), která vyžaduje přístup na internet z Dolibarr serveru.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Zkontrolujte ID DPH uvnitř Společenství na webových stránkách Evropské komise
-VATIntraManualCheck=Můžete také zkontrolovat ručně na evropských stránkách <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Kontrola není možná. Služba není členským státem poskytována (%s).
 NorProspectNorCustomer=Ani cíl, ani zákazník
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index 877d27c9724..fc62ddb9e11 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -170,8 +170,9 @@ 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=- Uvedené částky jsou se všemi daněmi
-RulesResultDue=- Zahrnuje nezaplacené faktury, výdaje, DPH, dary, ať už jsou či nejsou zaplaceny. Zahrnuje také placené platy. <br> - Je založen na fakturačním datu faktur a na datu splatnosti pro výdaje nebo platby daní. U platů definovaných modulem Plat se použije datum platby.
-RulesResultInOut=- To zahrnuje skutečné platby na fakturách, nákladů, DPH a platů. <br> - Je založen na datech plateb faktur, náklady, DPH a platů. Datum daru pro dárcovství.
+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=- Zahrnuje splatné faktury zákazníka, ať už jsou zaplaceny, nebo ne. <br> - Je založeno na fakturačním datu těchto faktur. <br>
 RulesCAIn=- Zahrnuje všechny efektivní platby faktur obdržených od zákazníků. <br> - Je založeno na datu splatnosti těchto faktur <br>
 RulesCATotalSaleJournal=Zahrnuje všechny úvěrové linky z žurnálu Prodej.
@@ -295,3 +296,5 @@ 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/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index 1c897ab3ef6..e530b0dbba3 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -27,7 +27,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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Nepodařilo se získat RSS kanál. Zkuste přidat neust
 ErrorForbidden=Přístup byl odepřen. <br> Pokoušíte se získat přístup k stránce, oblasti nebo funkci modulu zakázání, aniž byste byli v autentizované relaci nebo která není uživateli povolena.
 ErrorForbidden2=Povolení pro toto přihlášení může být definováno administrátorem Dolibarr z menu %s-> %s.
 ErrorForbidden3=Zdá se, že Dolibarr není používán prostřednictvím autentizované relace. Podívejte se na instalační dokumentaci programu Dolibarr, abyste věděli, jak spravovat ověřování (htaccess, mod_auth nebo jiné ...). 
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=Třída Imagick se v tomto PHP nenachází. Není k dispozici náhled. Administrátoři mohou zakázat tuto kartu v nabídce Nastavení - Zobrazení.
 ErrorRecordAlreadyExists=Záznam již existuje
 ErrorLabelAlreadyExists=Tento štítek již existuje
@@ -271,6 +274,9 @@ 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=Váš parametr PHP upload_max_filesize (%s) je vyšší než parametr PHP post_max_size (%s). Toto není konzistentní nastavení.
@@ -312,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/cs_CZ/eventorganization.lang b/htdocs/langs/cs_CZ/eventorganization.lang
index 434298cc595..d3d9a2ad7ad 100644
--- a/htdocs/langs/cs_CZ/eventorganization.lang
+++ b/htdocs/langs/cs_CZ/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/cs_CZ/holiday.lang b/htdocs/langs/cs_CZ/holiday.lang
index 2be3bf23557..a295166d4a6 100644
--- a/htdocs/langs/cs_CZ/holiday.lang
+++ b/htdocs/langs/cs_CZ/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Popis
 SendRequestCP=Vytvořit požadavek na dovolenou
 DelayToRequestCP=Požadavek na dovolenou musí být zadán nejméně <b>%s den(y)</b> před termínem.
 MenuConfCP=Zůstatek dovolené
-SoldeCPUser=Zbývající dovolená je <b>%s</b> dnů.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Musíte vybrat koncové datum větší než datum zahájení.
 ErrorSQLCreateCP=SQL chyba při tvorbě:
 ErrorIDFicheCP=Došlo k chybě, požadavek dovolené neexistuje.
@@ -134,3 +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/install.lang b/htdocs/langs/cs_CZ/install.lang
index 598d086878f..132133eac1a 100644
--- a/htdocs/langs/cs_CZ/install.lang
+++ b/htdocs/langs/cs_CZ/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/cs_CZ/main.lang
index 8ddcaf6b5cf..6b8b2ce6f07 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Chyba, pro zemi '%s' nejsou definovány ž
 ErrorNoSocialContributionForSellerCountry=Chyba, žádný typ sociálních / fiskálních daní není definován pro zemi '%s'.
 ErrorFailedToSaveFile=Chyba, nepodařilo se uložit soubor.
 ErrorCannotAddThisParentWarehouse=Pokoušíte se přidat nadřazený sklad, který je již dítěti stávajícího skladu
+FieldCannotBeNegative=Field "%s" cannot be negative
 MaxNbOfRecordPerPage=Max. počet záznamů na stránku
 NotAuthorized=Nemáte k tomu oprávnění.
 SetDate=Nastavení datumu
@@ -87,7 +88,7 @@ FileWasNotUploaded=Soubor vybrán pro připojení, ale ještě nebyl nahrán. Kl
 NbOfEntries=Počet vstupů
 GoToWikiHelpPage=Přečtěte si online nápovědu (přístup k internetu je potřeba)
 GoToHelpPage=Přečíst nápovědu
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Domovská stránka
 RecordSaved=Záznam uložen
 RecordDeleted=Záznam smazán
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Návratový kód pro přístup k databázi v přípa
 InformationLastAccessInError=Informace pro poslední přístup do databáze v případě chyby
 DolibarrHasDetectedError=Dolibarr zjistil technickou chybu
 YouCanSetOptionDolibarrMainProdToZero=Můžete číst soubor protokolu nebo nastavit volbu $ dolibarr_main_prod na "0" ve vašem souboru konfigurace, abyste získali další informace.
-InformationToHelpDiagnose=Tyto informace mohou být užitečné pro diagnostické účely (můžete nastavit volbu $ dolibarr_main_prod na '1' pro odstranění takových upozornění)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Více informací
 TechnicalInformation=Technická informace
 TechnicalID=Technické ID
@@ -211,6 +212,8 @@ User=Uživatel
 Users=Uživatelé
 Group=Skupina
 Groups=Skupiny
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Žádná uživatelská skupina není definována
 Password=Heslo
 PasswordRetype=Zadejte znovu heslo
@@ -906,7 +909,7 @@ ViewFlatList=Zobrazit seznam plochý
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Odstraňte řetězec ‚%s‘
-SomeTranslationAreUncomplete=Některé nabízené jazyky mohou být pouze částečně přeloženy nebo mohou obsahovat chyby. Český překlad je jen základní a orientační, může být nepřesný a mimo kontext. Pomozte prosím opravit svůj jazyk registrováním na <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> a přidejte své vylepšení.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Časové pásmo klienta (uživatele)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/cs_CZ/modulebuilder.lang b/htdocs/langs/cs_CZ/modulebuilder.lang
index 7055b033d3e..c33c5f1ac88 100644
--- a/htdocs/langs/cs_CZ/modulebuilder.lang
+++ b/htdocs/langs/cs_CZ/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Tento nástroj musí používat pouze zkušení uživatelé nebo vývojáři. Poskytuje nástroje pro sestavení nebo úpravu vlastního modulu. Dokumentace pro alternativní <a href="%s" target="_blank">manuální vývoj je zde</a> .
+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.
 ModuleBuilderDesc2=Cesta, kde jsou moduly generovány/editovány (první adresář pro externí moduly definované v %s): <strong>%s</strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Nabídky poskytované modulem / aplikací jsou definovány v
 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).
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
+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=Viz ID používané ve vaší instalaci
 SeeReservedIDsRangeHere=Viz rozsah vyhrazených ID
 ToolkitForDevelopers=Toolkit pro vývojáře Dolibarr
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/other.lang b/htdocs/langs/cs_CZ/other.lang
index ce616844225..b9baa429d2f 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Kódování hesla
 PermissionsAdd=Bylo přidáno oprávnění
 PermissionsDelete=Oprávnění byla odstraněna
 YourPasswordMustHaveAtLeastXChars=Vaše heslo musí mít alespoň <strong> %s </strong> znaky
+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=Vaše heslo bylo úspěšně obnoveno
 ApplicantIpAddress=IP adresa žadatele
 SMSSentTo=SMS odeslaná na %s
@@ -268,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
diff --git a/htdocs/langs/cs_CZ/partnership.lang b/htdocs/langs/cs_CZ/partnership.lang
index dc36cda3a91..5b31b64f6ed 100644
--- a/htdocs/langs/cs_CZ/partnership.lang
+++ b/htdocs/langs/cs_CZ/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/cs_CZ/productbatch.lang b/htdocs/langs/cs_CZ/productbatch.lang
index 35452d31b39..69dd47ec21f 100644
--- a/htdocs/langs/cs_CZ/productbatch.lang
+++ b/htdocs/langs/cs_CZ/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 871659073b3..0643566beb6 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Vážená průměrná cena
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 71e5f2bee1a..c8b1ec2f289 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -197,6 +197,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,3 +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=Datum ukončení nemůže být před datem zahájení
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 14c0b9d230e..a6f36bf31fe 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Limit zásob pro výstrahu a požadovanou optimáln
 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
 InventoryDate=Datum inventáře
+Inventories=Zásoby
 NewInventory=Nový inventář
 inventorySetup = Nastavení zásob
 inventoryCreatePermission=Vytvořte nový inventář
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Pohyby akcií budou mít datum inve
 inventoryChangePMPPermission=Povolit změnu hodnoty PMP pro produkt
 ColumnNewPMP=Nová jednotka PMP
 OnlyProdsInStock=Nepřidávejte produkt bez zásoby
-TheoricalQty=Teoretické množství
-TheoricalValue=Teoretické množství
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Poslední BP
 CurrentPA=Aktuální BP
 RecordedQty=Zaznamenané množství
@@ -240,7 +241,7 @@ StockAtDatePastDesc=Zde si můžete zobrazit akcie (skutečné zásoby) k daném
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Aktuální stav
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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=Fill real quantity with expected quantity
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=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
diff --git a/htdocs/langs/cs_CZ/stripe.lang b/htdocs/langs/cs_CZ/stripe.lang
index 195611be7da..dfc420fc999 100644
--- a/htdocs/langs/cs_CZ/stripe.lang
+++ b/htdocs/langs/cs_CZ/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Nastavení modulu Stripe
-StripeDesc=Nabídněte zákazníkům Stripe online platební stránku pro platby kreditními / cebitovými kartami prostřednictvím <a href="http://www.stripe.com" target="_blank"> Stripe </a>. To může být použito k tomu, aby umožnilo vašim zákazníkům provádět ad hoc platby nebo platby související s konkrétním předmětem Dolibarr (faktura, objednávka, ...)
+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=Platba kreditní kartou nebo Stripe
 FollowingUrlAreAvailableToMakePayments=Přes URL jsou k dispozici nabízené stránky, které zákazníkovi umožní provést platbu na Dolibarr objektech
 PaymentForm=Formulář platby
@@ -28,7 +28,6 @@ AccountParameter=Parametry účtu
 UsageParameter=Použité parametry
 InformationToFindParameters=Pomozte najít %s informace o účtu
 STRIPE_CGI_URL_V2=Url modulu Stripe CGI pro platbu
-VendorName=Název dodavatele
 CSSUrlForPaymentForm=CSS styly url platebního formuláře
 NewStripePaymentReceived=Byla obdržena nová platba Stripe
 NewStripePaymentFailed=Pokus o novou Stripe platbu, ta ale selhala
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
index b2aff70562e..53775d8a6f1 100644
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Příkaz k převodu
 LatestBankTransferReceipts=Poslední příkazy k úhradě %s
 LastWithdrawalReceipts=Poslední %s soubory inkasní
 WithdrawalsLine=Řádek přímého inkasa
+CreditTransfer=Převod peněz
 CreditTransferLine=Řádek na úhradu
 WithdrawalsLines=Řádky výběrů
 CreditTransferLines=Řádky na úhradu
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Kód banky subjektu
 NoInvoiceCouldBeWithdrawed=Žádná faktura nebyla odepsána úspěšně. Zkontrolujte, zda jsou faktury u společností s platným IBAN a zda má IBAN UMR (Unique Mandate Reference) s režimem <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Označit přidání kreditu
+ClassDebited=Classify debited
 ClassCreditedConfirm=Jste si jisti, že chcete zařadit tento výběr příjmu jako připsaný na váš bankovní účet?
 TransData=Datum přenosu
 TransMetod=Způsob přenosu
@@ -80,7 +82,7 @@ StatusMotif7=Soudní rozhodnutí
 StatusMotif8=Jiný důvod
 CreateForSepaFRST=Vytvoření souboru s inkasem (SEPA FRST)
 CreateForSepaRCUR=Vytvořte soubor inkasa (SEPA RCUR)
-CreateAll=Vytvořit soubor s inkasem (všechny)
+CreateAll=Vytvořte soubor s inkasem
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Vytvoření souboru pro převod kreditů (SEPA)
 CreateGuichet=Pouze kancelář
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Nelze vytvořit inkasa Žádost o prázdnou hodnot
 SepaMandate=Mandát přímého inkasa SEPA
 SepaMandateShort=SEPA Mandát
 PleaseReturnMandate=Prosím, vraťte tento mandát formulář poštou na adresu %s nebo poštou na adresu
-SEPALegalText=Podpisem tohoto mandátu formuláře opravňujete (A) %s zaslat instrukce do své banky, aby vrub vašeho účtu a (b) vaše banka k tíži účtu v souladu s pokyny od %s. Jako součást svých práv, máte nárok na vrácení peněz od banky v souladu s podmínkami a podmínkami vaší smlouvy se svou bankou. Náhrada musí být uplatněna nejpozději do 8 týdnů od data, kdy byl váš účet odepsána. Vaše práva týkající se výše uvedeného pověření jsou vysvětleny v prohlášení, které můžete získat od své banky.
+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=Identifikátor věřitele
 CreditorName=Název věřitele
 SEPAFillForm=(B) Vyplňte prosím všechna pole označená *
@@ -150,3 +152,5 @@ ModeWarning=Volba pro reálný režim nebyl nastaven, můžeme zastavit tuto sim
 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
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index f5bfe095eac..6c8693ba013 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=Lande ikke i EU
 CountriesInEECExceptMe=Lande i EU undtagen %s
 CountriesExceptMe=Alle lande undtagen %s
 AccountantFiles=Eksporter kildedokumenter
-ExportAccountingSourceDocHelp=Med dette værktøj kan du eksportere de kildehændelser (liste i CSV og PDF-filer), der blev brugt til at generere din regnskab.
+ExportAccountingSourceDocHelp=Med dette værktøj kan du eksportere de kildebegivenheder (liste i CSV og PDF'er), der bruges til at generere dit regnskab.
 ExportAccountingSourceDocHelp2=For at eksportere dine tidsskrifter skal du bruge menuindgangen %s - %s.
 VueByAccountAccounting=Vis efter regnskabskonto
 VueBySubAccountAccounting=Vis efter regnskabsmæssig underkonto
@@ -93,8 +93,8 @@ ChangeAndLoad=Ret og indlæs
 Addanaccount=Tilføj en regnskabskonto
 AccountAccounting=Regnskabskonto
 AccountAccountingShort=Konto
-SubledgerAccount=Underleverandør konto
-SubledgerAccountLabel=Underleverandør konto etiket
+SubledgerAccount=Underkonto
+SubledgerAccountLabel=Underkonto etiket
 ShowAccountingAccount=Vis regnskabs konto
 ShowAccountingJournal=Vis kontokladde
 ShowAccountingAccountInLedger=Vis regnskabskonto i hovedbog
@@ -122,7 +122,7 @@ UpdateMvts=Rediger en transaktion
 ValidTransaction=Bekræft transaktion
 WriteBookKeeping=Registrer transaktioner i regnskab
 Bookkeeping=Hovedbog
-BookkeepingSubAccount=Underleverandør
+BookkeepingSubAccount=Underkonti
 AccountBalance=Kontobalance
 ObjectsRef=Objektreference
 CAHTF=Samlet købeleverandør før skat
@@ -212,7 +212,7 @@ NumPiece=Partsnummer
 TransactionNumShort=Transaktionsnr.
 AccountingCategory=Brugerdefineret gruppe
 GroupByAccountAccounting=Gruppér efter hovedkontokonto
-GroupBySubAccountAccounting=Gruppér efter underkonto konto
+GroupBySubAccountAccounting=Gruppér efter underkonti
 AccountingAccountGroupsDesc=Du kan definere her nogle grupper af regnskabskonto. De vil blive brugt til personlige regnskabsrapporter.
 ByAccounts=Konti
 ByPredefinedAccountGroups=Efter foruddefinerede grupper
@@ -246,9 +246,9 @@ DescThirdPartyReport=Se her listen over tredjepartskunder og leverandører og de
 ListAccounts=Liste over regnskabskonti
 UnknownAccountForThirdparty=Ukendt tredjepartskonto. Vi bruger %s
 UnknownAccountForThirdpartyBlocking=Ukendt tredjepartskonto. Blokeringsfejl
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Fremlejerkonto ikke defineret eller tredjepart eller bruger ukendt. Vi vil bruge %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Tredjeparts ukendt og subletger, der ikke er defineret på betalingen. Vi vil holde subledgerkontoen værdi tom.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Fremlejerkonto ikke defineret eller tredjepart eller bruger ukendt. Blokeringsfejl.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Underkonti ikke defineret eller tredjepart eller bruger ukendt. Vi vil bruge %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Tredjeparts ukendt og underkonto, der ikke er defineret på betalingen. Vi vil holde underkontoen værdi tom.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Underkonti ikke defineret eller tredjepart eller bruger ukendt. Blokeringsfejl.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Ukendt tredjepartskonto og ventekonto er ikke defineret. Blokeringsfejl
 PaymentsNotLinkedToProduct=Betaling er ikke knyttet til noget produkt / tjeneste
 OpeningBalance=Åbnings balance
@@ -286,7 +286,7 @@ ValidateMovements=Valider bevægelser
 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=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
@@ -301,7 +301,7 @@ Accounted=Regnskab i hovedbog
 NotYetAccounted=Endnu ikke overført til regnskab
 ShowTutorial=Vis selvstudie
 NotReconciled=Ikke afstemt
-WarningRecordWithoutSubledgerAreExcluded=Advarsel, alle handlinger uden underskrevet konto defineret filtreres og udelukkes fra denne visning
+WarningRecordWithoutSubledgerAreExcluded=Advarsel, alle handlinger uden underskrevet underkonti defineret filtreres og udelukkes fra denne visning
 
 ## Admin
 BindingOptions=Bindende muligheder
@@ -387,7 +387,8 @@ SaleExport=Eksport salg
 SaleEEC=Salg i EU
 SaleEECWithVAT=Salg i EU med en moms, der ikke er null, så vi antager, at dette IKKE er et intrakommunalt salg, og den foreslåede konto er standardproduktskontoen.
 SaleEECWithoutVATNumber=Du kan fastsætte moms nummer for tredjepart eller produktkonto om nødvendigt.
-
+ForbiddenTransactionAlreadyExported=Forbudt: Transaktionen er blevet valideret og/eller eksporteret.
+ForbiddenTransactionAlreadyValidated=Forbudt: Transaktionen er blevet valideret.
 ## Dictionary
 Range=Interval for regnskabskonto
 Calculated=Beregnet
@@ -404,6 +405,7 @@ NoJournalDefined=Ingen kladde defineret
 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
 
 ## Import
 ImportAccountingEntries=Regnskabsposter
@@ -414,8 +416,8 @@ FECFormatEntryNum=Stykke nummer (EcritureNum)
 FECFormatEntryDate=Stykkets dato (EcritureDate)
 FECFormatGeneralAccountNumber=Generelt kontonummer (CompteNum)
 FECFormatGeneralAccountLabel=Generel kontoetiket (CompteLib)
-FECFormatSubledgerAccountNumber=Undernummerets kontonummer (CompAuxNum)
-FECFormatSubledgerAccountLabel=Undernummerets kontonummer (CompAuxLib)
+FECFormatSubledgerAccountNumber=Underkonto nummer (CompAuxNum)
+FECFormatSubledgerAccountLabel=Underkonto nummer (CompAuxLib)
 FECFormatPieceRef=Stykke ref (PieceRef)
 FECFormatPieceDate=Oprettelse af stykke dato (PieceDate)
 FECFormatLabelOperation=Betjening af etiketter (EcritureLib)
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index cb3fcf2950c..0f638c2d1ab 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Udskriv reference og periode for produktvare i PDF
+BoldLabelOnPDF=Udskriv produktetiketten med fed skrift i PDF
 Foundation=Fundament
 Version=Version
 Publisher=Forlægger
@@ -9,7 +11,7 @@ VersionExperimental=Eksperimentel
 VersionDevelopment=Udvikling
 VersionUnknown=Ukendt
 VersionRecommanded=Anbefalet
-FileCheck=Fileset Integrity Checks
+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.
@@ -53,7 +55,7 @@ InternalUser=Intern bruger
 ExternalUser=Ekstern bruger
 InternalUsers=Interne brugere
 ExternalUsers=Eksterne brugere
-UserInterface=brugergrænseflade
+UserInterface=Brugergrænseflade
 GUISetup=Udseende
 SetupArea=Indstillinger
 UploadNewTemplate=Upload nye skabelon(er)
@@ -265,8 +267,8 @@ OtherResources=Andre ressourcer
 ExternalResources=Eksterne ressourcer
 SocialNetworks=Sociale netværk
 SocialNetworkId=Socialt netværk ID
-ForDocumentationSeeWiki=For brugerens eller bygherren dokumentation (doc, FAQs ...), <br> tage et kig på Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
-ForAnswersSeeForum=For alle andre spørgsmål / hjælpe, kan du bruge Dolibarr forum: <br> <a href="%s" target="_blank"><b> %s</b></a>
+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>
 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
@@ -341,7 +343,7 @@ 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>
+UnpackPackageInModulesRoot=For at implementere/installere et eksternt modul skal du udpakke/udpakke arkivfilen i serverbiblioteket 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>
@@ -353,6 +355,7 @@ LastStableVersion=Seneste stabile version
 LastActivationDate=Seneste aktiveringsdato
 LastActivationAuthor=Seneste aktiveringsforfatter
 LastActivationIP=Seneste aktivering IP
+LastActivationVersion=Seneste aktiveringsversion
 UpdateServerOffline=Opdater server offline
 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>
@@ -753,7 +756,7 @@ Permission106=Eksporter forsendelser
 Permission109=Slet forsendelser
 Permission111=Læs finanskonti
 Permission112=Opret/rediger/slet og sammenlign transaktioner
-Permission113=Opsæt finanskonti (opret, håndter kategorier)
+Permission113=Opret finansielle konti (opret, administrer kategorier af banktransaktioner)
 Permission114=Afstem transaktioner
 Permission115=Eksporttransaktioner og kontoudtog
 Permission116=Overførsler mellem konti
@@ -762,6 +765,7 @@ Permission121=Læs tredjemand knyttet til brugerens
 Permission122=Opret/rediger tredjeparter knyttet til brugeren
 Permission125=Slet tredjemand knyttet til brugerens
 Permission126=Eksporter tredjemand
+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)
@@ -889,12 +893,11 @@ Permission701=Læs donationer
 Permission702=Opret/rediger donationer
 Permission703=Slet donationer
 Permission771=Læs omkostningsrapporter (din og dine underordnede)
-Permission772=Opret / modificer omkostningsrapporter
+Permission772=Opret/rediger udgiftsrapporter (til dig og dine underordnede)
 Permission773=Slet udgiftsrapporter
-Permission774=Læs alle udgiftsrapporter (selv for brugere, der ikke er underordnede)
 Permission775=Godkendelse af udgiftsrapporter
 Permission776=Betalingsomkostningsrapporter
-Permission777=Læs udgiftsrapporter fra alle
+Permission777=Læs alle udgiftsrapporter (selv dem fra brugere, der ikke er underordnede)
 Permission778=Opret / rediger udgiftsrapporter for alle
 Permission779=Eksportudgiftsrapporter
 Permission1001=Læs bestande
@@ -958,15 +961,11 @@ Permission2801=Brug FTP-klient i læsemodus (kun gennemse og download)
 Permission2802=Brug FTP-klient i skrivefunktion (slet eller upload filer)
 Permission3200=Læs arkiverede begivenheder og fingeraftryk
 Permission3301=Generer nye moduler
-Permission4001=Se medarbejdere
-Permission4002=Opret medarbejdere
-Permission4003=Slet medarbejdere
-Permission4004=Eksporter medarbejdere
-Permission4010=Læs færdigheder/job/stilling
-Permission4011=Opret/ændre færdigheder/job/position
-Permission4012=Slet færdighed/job/stilling
-Permission4020=Læs evaluering
-Permission4021=Opret/ændre evaluering
+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=Opret/rediger din evaluering
 Permission4022=Valider evaluering
 Permission4023=Slet evaluering
 Permission4030=Se sammenligningsmenu
@@ -977,9 +976,9 @@ 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=Læs alle orlovs forespørgsler (selv om bruger ikke er underordnede)
-Permission20005=Opret / modtag anmodninger om orlov for alle (selv af bruger ikke underordnede)
-Permission20006=Forladelsesforespørgsler (opsætning og opdateringsbalance)
+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
@@ -1358,9 +1357,9 @@ 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
 PreloadOPCode=Forudindlæst OPCode bruges
-AddRefInList=Vis kunde / sælger ref. info liste (vælg liste eller combobox) og det meste af hyperlink. <br> Tredjeparter vil blive vist med et navneformat af "CC12345 - SC45678 - The Big Company corp." i stedet for "The Big Company Corp".
-AddVatInList=Vis kunde-/sælger -momsnummer. infoliste (vælg liste eller komboboks).
-AddAdressInList=Vis kunde / leverandør adresse info liste (vælg liste eller combobox) <br> Tredjeparter vil blive vist med et navneformat af "The Big Company Corp. - 21 Jump Street 123456 Big Town - USA" i stedet for "The Big Company Corp".
+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".
+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
@@ -1708,8 +1707,9 @@ MailingDelay=Sekunder for at vente efter at sende næste besked
 NotificationSetup=Opsætning af e-mail-meddelelsesmodul
 NotificationEMailFrom=Afsender-e-mail (Fra) for e-mails, der sendes af meddelelsesmodulet
 FixedEmailTarget=Modtager
-NotificationDisableConfirmMessageFix=Deaktiver notifikations oplysninger i bekræftelses meddelelse for rettelsesnotifikation
-NotificationDisableConfirmMessageUser=Deaktiver meddelelsesoplysninger i bekræftelsesmeddelelse for brugerbesked
+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
 ##### Sendings #####
 SendingsSetup=Opsætning af forsendelsesmodul
 SendingsReceiptModel=Afsendelse modtagelsen model
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Fri tekst om levering kvitteringer
 ##### FCKeditor #####
 AdvancedEditor=Avanceret tekstredigeringsværktøj
 ActivateFCKeditor=Aktivér FCKeditor for:
-FCKeditorForNotePublic=WYSIWIG oprettelse/udgave af feltets offentlige noter af elementer
-FCKeditorForNotePrivate=WYSIWIG oprettelse/udgave af feltets private noter af elementer
+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>
@@ -1901,6 +1901,7 @@ 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".
+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 **
 ListOfFixedNotifications=Liste over automatiske faste meddelelser
@@ -1916,6 +1917,8 @@ ConfFileMustContainCustom=Installation eller opbygning af et eksternt modul fra
 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)
+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
@@ -2063,13 +2066,14 @@ 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)
-RecordEvent=Optag email-begivenhed
-CreateLeadAndThirdParty=Opret ledelse (og tredjepart om nødvendigt)
-CreateTicketAndThirdParty=Opret billet (og link til tredjepart, hvis den blev indlæst af en tidligere operation)
+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
 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
 WithDolTrackingIDInMsgId=Besked sendt fra Dolibarr
@@ -2078,7 +2082,7 @@ CreateCandidature=Opret jobansøgning
 FormatZip=Postnummer
 MainMenuCode=Menu indtastningskode (hovedmenu)
 ECMAutoTree=Vis automatisk ECM-træ
-OperationParamDesc=Definer de værdier, der skal bruges til genstand for handlingen, eller hvordan man udtrækker værdier. For eksempel:<br>objproperty1=SET:den værdi, der skal indstilles<br>objproperty2=SET:en værdi med udskiftning af __objproperty1__<br>objproperty3=SETIFEMPTY:værdi brugt, 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:My company name is\\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 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.
 OpeningHours=Åbningstider
 OpeningHoursDesc=Indtast her firmaets almindelige åbningstider.
 ResourceSetup=Konfiguration af ressource modul
@@ -2124,7 +2128,7 @@ 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 at følge handlinger, der har brug for det. <br> Hvis du f.eks. vil oprette en tredjepart med et navn, der er ekstraheret en streng 'Name: name to find' fundet i kroppen, skal du bruge afsender-e-mail som e-mail, kan du indstille parameterfeltet således: <br> 'email = HEADER: ^ Fra: (. *); Navn = UDTRÆK: KROPP: Navn: \\ s ([^ \\ s] *); klient = SET: 2; ' <br>
+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>
 EndPointFor=Slutpunkt for %s: %s
 DeleteEmailCollector=Slet e-mail-indsamler
 ConfirmDeleteEmailCollector=Er du sikker på, at du vil slette denne e-mail-indsamler?
@@ -2209,3 +2213,10 @@ 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
 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.
+FillAndSaveAccountIdAndSecret=Udfyld og gem først konto-id og hemmeligkode
+PreviousHash=Tidligere hash
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index cedf83e5597..89e8350989f 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -32,7 +32,7 @@ RIB=Bankkontonummer
 IBAN=IBAN nummer
 BIC=BIC / SWIFT-kode
 SwiftValid=BIC/SWIFT gyldig
-SwiftVNotalid=BIC/SWIFT er ikke gyldig
+SwiftNotValid=BIC/SWIFT er ikke gyldig
 IbanValid=BAN gyldig
 IbanNotValid=BAN er ikke gyldigt
 StandingOrders="Direkte debit" ordre
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank adresse
 BankAccountCountry=Konto land
 BankAccountOwner=Konto ejer navn
 BankAccountOwnerAddress=Konto ejer adresse
-RIBControlError=Integritetskontrol af værdier mislykkedes. Dette betyder, at oplysningerne om dette kontonummer ikke er komplette eller er forkerte (kontroller land, numre og IBAN).
 CreateAccount=Opret konto
 NewBankAccount=Ny konto
 NewFinancialAccount=Ny finansiel konto
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index e2c1b61cb89..5cf9b6614d9 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
@@ -280,6 +279,7 @@ SetMode=Indstil betalingstype
 SetRevenuStamp=Indstil omsætningsstempel
 Billed=Billed
 RecurringInvoices=Tilbagevendende fakturaer
+RecurringInvoice=Tilbagevendende faktura
 RepeatableInvoice=Fakturaskabelon
 RepeatableInvoices=Fakturerskabelon
 Repeatable=Skabelon
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bankudkast
 PaymentTypeShortTRA=Udkast til
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
+PaymentTypeDC=Debet / Kreditkort
+PaymentTypePP=PayPal
 BankDetails=Bankoplysninger
 BankCode=Bankkode
 DeskCode=Filialkode
@@ -604,3 +606,4 @@ 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
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/bookmarks.lang b/htdocs/langs/da_DK/bookmarks.lang
index 1a830ce8aaf..69ae5554c6d 100644
--- a/htdocs/langs/da_DK/bookmarks.lang
+++ b/htdocs/langs/da_DK/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Adfærd ved klik på URL
 CreateBookmark=Opret bogmærke
 SetHereATitleForLink=Sæt et navn for dette bogmærke
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Brug et eksternt / absolut link (https://URL) eller et internt / relativt link (/DOLIBARR_ROOT/htdocs/...)
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Brug et eksternt/absolut link (https://externalurl.com) eller et internt/relativt link (/mypage.php). Du kan også bruge telefon som tel:0123456.
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Vælg om den tilknyttede side skal åbnes i den aktuelle fane eller en ny fane
 BookmarksManagement=Bogmærker forvaltning
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index 39a39716f1c..b5c2e17f1b4 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (handelsregister)
+ProfId2CM=Id. prof. 2 (skatteyder nr.)
+ProfId3CM=Id. prof. 3 (oprettelsesdekret)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Handelsregister
+ProfId2ShortCM=Skatteyder nr.
+ProfId3ShortCM=Dekret om oprettelse
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ 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.
 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"> %s </a>
+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
 JuridicalStatus=Forretningsenhedstype
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index f2e90548eab..4161b65c6f4 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -170,8 +170,9 @@ SeeReportInInputOutputMode=Se <b> %sanalyse af betalinger%s </b> for en beregnin
 SeeReportInDueDebtMode=Se <b> %sanalyse af registrerede dokumenter%s </b> for en beregning baseret på kendt <b> registrerede dokumenter </b> selvom de endnu ikke er registreret
 SeeReportInBookkeepingMode=Se <b> %sanalyse af bogholderibillede table%s </b> for en rapport baseret på <b> Bogholderibord </b>
 RulesAmountWithTaxIncluded=- De viste beløb er inkl. moms og afgifter
-RulesResultDue=- Det inkluderer udestående fakturaer, udgifter, moms, donationer, uanset om de er betalt eller ej. Indeholder også betalte lønninger.<br> - Det er baseret på faktureringens fakturadato og på forfaldsdato for udgifter eller skattebetalinger. For lønninger, der er defineret med lønningsmodulet, bruges betalingsdato.
-RulesResultInOut=- Den omfatter de reelle betalinger foretaget på fakturaer, udgifter, moms og løn. <br> - Det er baseret på betalingsdatoer for fakturaer, udgifter, moms og løn. Donationsdatoen for donation.
+RulesAmountWithTaxExcluded=- De viste fakturabeløb er med alle afgifter ekskl
+RulesResultDue=- Det inkluderer alle fakturaer, udgifter, moms, donationer, lønninger, uanset om de er betalt eller ej. <br> - Det er baseret på faktureringsdatoen for fakturaer og på forfaldsdatoen for udgifter eller skattebetalinger. For løn anvendes datoen for periodens afslutning.
+RulesResultInOut=- Det omfatter de reelle betalinger foretaget på fakturaer, udgifter, moms og lønninger. <br> - Det er baseret på betalingsdatoer for fakturaer, udgifter, moms, donationer og lønninger.
 RulesCADue=- Det inkluderer kundens forfaldne fakturaer, uanset om de er betalt eller ej.<br> - Det er baseret på faktureringsdatoen for disse fakturaer.<br>
 RulesCAIn=- Den omfatter alle effektive betalinger af fakturaer modtaget fra kunder. <br> - Det er baseret på betalingsdatoen for disse fakturaer <br>
 RulesCATotalSaleJournal=Den omfatter alle kreditlinjer fra salgslisten.
@@ -295,3 +296,5 @@ InvoiceNotLate30Days = Afhentes (> 30 dage)
 InvoiceToPay=At betale (<15 dage)
 InvoiceToPay15Days=At betale (15 til 30 dage)
 InvoiceToPay30Days=At betale (> 30 dage)
+ConfirmPreselectAccount=Forudvælg regnskabskode
+ConfirmPreselectAccountQuestion=Er du sikker på, at du vil forudvælge de %s valgte linjer med denne regnskabskode?
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index e982dd4086d..f447526798e 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -27,7 +27,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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Ikke formår at få RSS-feed. Prøv at tilføje konstan
 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=Tilladelse til dette login kan defineres af din Dolibarr administrator fra menuen %s-> %s.
 ErrorForbidden3=Det ser ud til, at Dolibarr ikke bruges gennem en godkendt session. Se på Dolibarr installationsdokumentation for at vide mere om, hvordan man administrerer godkendelser (htaccess, mod_auth eller andet ...).
+ErrorForbidden4=Bemærk: Ryd dine browsercookies for at ødelægge eksisterende sessioner for dette login.
 ErrorNoImagickReadimage=Class Imagick findes ikke i dette PHP. Ingen forhåndsvisning kan være tilgængelig. Administratorer kan deaktivere denne fane fra menuen Setup - Display.
 ErrorRecordAlreadyExists=Optag allerede findes
 ErrorLabelAlreadyExists=Denne etiket eksisterer allerede
@@ -271,6 +274,9 @@ 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
 
 # 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.
@@ -312,6 +318,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..16d1d57cf92 100644
--- a/htdocs/langs/da_DK/eventorganization.lang
+++ b/htdocs/langs/da_DK/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategori, der automatisk tilføjes til
 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
@@ -71,6 +71,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 +84,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
diff --git a/htdocs/langs/da_DK/holiday.lang b/htdocs/langs/da_DK/holiday.lang
index e8aa6f8161e..2c3f51239f5 100644
--- a/htdocs/langs/da_DK/holiday.lang
+++ b/htdocs/langs/da_DK/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Beskrivelse
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
 MenuConfCP=Udgiftsbalance
-SoldeCPUser=Forløbsbalancen er <b> %s </ b> dage.
+SoldeCPUser=Forlad saldo (i dage) <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.
@@ -134,3 +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/install.lang b/htdocs/langs/da_DK/install.lang
index 3215d065d2f..2963651117b 100644
--- a/htdocs/langs/da_DK/install.lang
+++ b/htdocs/langs/da_DK/install.lang
@@ -21,6 +21,7 @@ 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.
 ErrorPHPDoesNotSupport=Din PHP-installation understøtter ikke %s funktioner.
 ErrorDirDoesNotExists=Directory %s ikke eksisterer.
diff --git a/htdocs/langs/da_DK/knowledgemanagement.lang b/htdocs/langs/da_DK/knowledgemanagement.lang
index c819c24a45a..349c9097405 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 en artikel til en opgave gruppe (så artiklen vil blive foreslået under kvalificeringen af nye billetter)
+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/main.lang b/htdocs/langs/da_DK/main.lang
index 2d083610a76..a26ccbaf620 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Fejl, der ikke momssatser defineret for la
 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
+FieldCannotBeNegative=Feltet "%s" kan ikke være negativt
 MaxNbOfRecordPerPage=Maks. antal poster pr. side
 NotAuthorized=Du har ikke tilladelse til at gøre det.
 SetDate=Indstil dato
@@ -87,7 +88,7 @@ FileWasNotUploaded=En fil er valgt som vedhæng, men endnu ikke uploadet. Klik p
 NbOfEntries=Antal indgange
 GoToWikiHelpPage=Læs online hjælp (Adgang til Internettet er nødvendig)
 GoToHelpPage=Læs hjælp
-DedicatedPageAvailable=Der er en dedikeret hjælpeside, der er relateret til din aktuelle skærm
+DedicatedPageAvailable=Dedikeret hjælpeside relateret til din nuværende skærm
 HomePage=Hjemmeside
 RecordSaved=Data gemt
 RecordDeleted=Post slettet
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Retur kode for seneste fejl i database forspørgelse
 InformationLastAccessInError=Information efter seneste database adgang anmodning fejl
 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.
-InformationToHelpDiagnose=Denne information kan være nyttig til diagnostiske formål (du kan indstille mulighed $dolibarr_main_prod til " 1 " for at fjerne sådanne oplysninger)
+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
@@ -211,6 +212,8 @@ User=Bruger
 Users=Brugere
 Group=Gruppe
 Groups=Grupper
+UserGroup=Brugergruppe
+UserGroups=Brugergrupper
 NoUserGroupDefined=Ingen brugergruppe definéret
 Password=Kodeord
 PasswordRetype=Gentag dit kodeord
@@ -906,7 +909,7 @@ ViewFlatList=Se flad liste
 ViewAccountList=Vis hovedbog
 ViewSubAccountList=Se underkonto hovedbog
 RemoveString=Fjern streng '%s'
-SomeTranslationAreUncomplete=Nogle af de sprog, der tilbydes, kan kun oversættes eller måske indeholde fejl. Hjælp venligst med at korrigere dit sprog ved at registrere dig på <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> at tilføje dine forbedringer.
+SomeTranslationAreUncomplete=Nogle af de tilbudte sprog er muligvis kun delvist oversat eller kan indeholde fejl. Hjælp venligst med at rette dit sprog ved at registrere dig på <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/ </a> for at tilføje dine forbedringer.
 DirectDownloadLink=Offentligt downloadlink
 PublicDownloadLinkDesc=Kun linket kræves for at downloade filen
 DirectDownloadInternalLink=Privat downloadlink
@@ -1158,4 +1161,6 @@ Properties=rettigheder
 hasBeenValidated=%s er valideret
 ClientTZ=Kunden Tidszone (bruger)
 NotClosedYet=Endnu ikke lukket
-ClearSignature=Nulstil underskrift
+ClearSignature=Nulstil signatur
+CanceledHidden=Annulleret skjult
+CanceledShown=Annulleret vist
diff --git a/htdocs/langs/da_DK/modulebuilder.lang b/htdocs/langs/da_DK/modulebuilder.lang
index 630a41f08cf..c0b0333817b 100644
--- a/htdocs/langs/da_DK/modulebuilder.lang
+++ b/htdocs/langs/da_DK/modulebuilder.lang
@@ -1,5 +1,5 @@
 # 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 opbygge eller redigere dit eget modul. Dokumentation for alternativ <a href="%s" target="_blank">manuel udvikling er her</a>.
+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.
 ModuleBuilderDesc2=Sti, hvor moduler genereres / redigeres (første bibliotek for eksterne moduler defineret i %s):<strong>%s</strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Menuerne leveret af dit modul / din applikation defineres i
 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).
-TriggerDefDesc=Definer i triggerfilen den kode, som du ønsker at udføre, når en forretningsbegivenhed eksternt til dit modul udføres (hændelser optaget af andre moduler).
+TriggerDefDesc=Definer i triggerfilen den kode, som du ønsker at udføre, når en forretningsbegivenhed eksternt til dit modul udføres (hændelser udløst af andre moduler).
 SeeIDsInUse=Se ID'er i brug i din installation
 SeeReservedIDsRangeHere=Se række af reserverede id'er
 ToolkitForDevelopers=Værktøjskasse til Dolibarr-udviklere
diff --git a/htdocs/langs/da_DK/mrp.lang b/htdocs/langs/da_DK/mrp.lang
index 3ada39000a9..4a611751bf2 100644
--- a/htdocs/langs/da_DK/mrp.lang
+++ b/htdocs/langs/da_DK/mrp.lang
@@ -27,7 +27,7 @@ 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
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index 5658a4714c1..46edef7e29d 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Kodeord for kodeord
 PermissionsAdd=Tilladelser tilføjet
 PermissionsDelete=Tilladelser fjernet
 YourPasswordMustHaveAtLeastXChars=Dit kodeord skal have mindst <strong> %s </ strong> tegn
+PasswordNeedAtLeastXUpperCaseChars=Adgangskoden skal have mindst <strong> %s </strong> store bogstaver
+PasswordNeedAtLeastXDigitChars=Adgangskoden skal have mindst <strong> %s </strong> numeriske tegn
+PasswordNeedAtLeastXSpecialChars=Adgangskoden skal mindst have <strong> %s </strong> specielle tegn
+PasswordNeedNoXConsecutiveChars=Adgangskoden må ikke have <strong> %s </strong> fortløbende lignende tegn
 YourPasswordHasBeenReset=Dit kodeord er nulstillet
 ApplicantIpAddress=Ansøgerens IP-adresse
 SMSSentTo=SMS sendt til %s
@@ -268,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
diff --git a/htdocs/langs/da_DK/partnership.lang b/htdocs/langs/da_DK/partnership.lang
index 4bcc58bccd0..6e963b63f15 100644
--- a/htdocs/langs/da_DK/partnership.lang
+++ b/htdocs/langs/da_DK/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Partnerskabsledelse
 PartnershipDescription=Ledelse af modulpartnerskab
 PartnershipDescriptionLong= Ledelse af modulpartnerskab
-
+Partnership=Partnerskab
 AddPartnership=Tilføj partnerskab
 CancelPartnershipForExpiredMembers=Partnerskab: Annuller partnerskab med medlemmer med udløbne abonnementer
 PartnershipCheckBacklink=Partnerskab: Tjek henvisende backlink
diff --git a/htdocs/langs/da_DK/productbatch.lang b/htdocs/langs/da_DK/productbatch.lang
index 4b4cca22ab9..b896998f58d 100644
--- a/htdocs/langs/da_DK/productbatch.lang
+++ b/htdocs/langs/da_DK/productbatch.lang
@@ -30,7 +30,7 @@ ManageLotMask=Brugerdefineret maske
 CustomMasks=Mulighed for at definere en anden nummereringsmaske for hvert produkt
 BatchLotNumberingModules=Nummereringsregel til automatisk generering af partinummer
 BatchSerialNumberingModules=Nummereringsregel til automatisk generering af serienummer (for produkter med ejendom 1 unikt parti / serienummer for hvert produkt)
-QtyToAddAfterBarcodeScan=Mængde, der skal tilføjes for hver stregkode / parti / seriel scannet
+QtyToAddAfterBarcodeScan=Antal til %s for hver scannet stregkode/parti/serie
 LifeTime=Levetid (i dage)
 EndOfLife=udløbet på dato
 ManufacturingDate=produktionsdato
@@ -42,3 +42,4 @@ HideLots=Skjul masser
 #Traceability - qc status
 OutOfOrder=Virker ikke
 InWorkingOrder=I funktionsdygtig stand
+ToReplace=Erstatte
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index ca64b62c240..589ca8130b0 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Beløb, der skal bruges til at opdatere den vejede gennems
 PMPValue=Værdi
 PMPValueShort=WAP
 mandatoryperiod=Obligatoriske perioder
-mandatoryPeriodNeedTobeSet=Opmærksomhedsperioder ikke angivet og obligatoriske
+mandatoryPeriodNeedTobeSet=Bemærk: Periode (start- og slutdato) skal defineres
 mandatoryPeriodNeedTobeSetMsgValidate=En service kræver en start- og slutperiode
-mandatoryHelper=Besked til brugeren om behovet for at indtaste en startdato og en slutdato på en tjeneste, når der oprettes / valideres en faktura, et kommercielt forslag, en salgsordre. <br> Denne handling blokerer ikke under bekræftelsesprocessen
+mandatoryHelper=Marker dette, hvis du ønsker en besked til brugeren ved oprettelse/validering af en faktura, kommercielt forslag, salgsordre uden at indtaste en start- og slutdato på linjer med denne service. <br> Bemærk, at meddelelsen er en advarsel og ikke en blokeringsfejl.
 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
+SwitchOnSaleStatus=Slå salgsstatus til
+SwitchOnPurchaseStatus=Slå købsstatus til
+StockMouvementExtraFields= Ekstra felter (aktiebevægelse)
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 711a58d5354..83ac7d0edef 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -197,6 +197,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
@@ -284,3 +285,5 @@ 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
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/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index 5d0aa992b40..b3ef7bc27f8 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Lagergrænse for advarsel og ønsket optimal lager
 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
 InventoryDate=Lagerdato
+Inventories=Varebeholdninger
 NewInventory=Ny opgørelse
 inventorySetup = Opstilling af lager
 inventoryCreatePermission=Opret ny opgørelse
@@ -240,7 +241,7 @@ StockAtDatePastDesc=Du kan her se aktien (ægte aktier) på en given dato i fort
 StockAtDateFutureDesc=Du kan her se lager antal (virtuel lager) på en given dato i fremtiden
 CurrentStock=Aktuel lager
 InventoryRealQtyHelp=Sæt værdi til 0 for at nulstille antal <br> Hold feltet tomt, eller fjern linjen for at forblive uændret
-UpdateByScaning=Udfyld real antal ved at scanne
+UpdateByScaning=Fuldfør rigtigt antal ved at scanne
 UpdateByScaningProductBarcode=Opdatering ved scanning (produktstregkode)
 UpdateByScaningLot=Opdatering ved scanning (parti | seriel stregkode)
 DisableStockChangeOfSubProduct=Deaktiver lagerændringen for alle delprodukter i dette sæt under denne bevægelse.
@@ -253,14 +254,20 @@ 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=Fyld den virkelige mængde med den forventede mængde
+AutofillWithExpected=Erstat reel mængde med forventet mængde
 ShowAllBatchByDefault=Vis batchoplysninger som standard på produktfanen "lager"
 CollapseBatchDetailHelp=Du kan indstille standardvisning af batchdetaljer i lagermodulkonfiguration
-FieldCannotBeNegative=Feltet "%s" kan ikke være negativt
 ErrorWrongBarcodemode=Ukendt stregkode -tilstand
 ProductDoesNotExist=Produkt findes ikke
-ErrorSameBatchNumber=Samme batchnummer findes på lagerlisten
+ErrorSameBatchNumber=Der blev fundet flere registreringer for batchnummeret i inventararket. Ingen måde at vide, hvilken man skal øge.
 ProductBatchDoesNotExist=Produkt med batch/serie findes ikke
 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.
+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
diff --git a/htdocs/langs/da_DK/stripe.lang b/htdocs/langs/da_DK/stripe.lang
index f93012811d4..d34a518c46d 100644
--- a/htdocs/langs/da_DK/stripe.lang
+++ b/htdocs/langs/da_DK/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe-modul opsætning
-StripeDesc=Tilbyd kunderne en Stripe online betalingsside for betalinger med kredit- / cebit kort via <a href="http://www.stripe.com" target="_blank">Stripe</a>. Dette kan bruges til at give dine kunder mulighed for at foretage ad-hoc betalinger eller til betalinger relateret til et bestemt Dolibarr objekt (faktura, ordre, ...)
+StripeDesc=Tilbyd dine kunder en online betalingsside for betalinger med kredit-/betalingskort via <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a> . Dette kan bruges til at give dine kunder mulighed for at foretage ad hoc-betalinger eller til betalinger relateret til et bestemt Dolibarr-objekt (faktura, ordre, ...)
 StripeOrCBDoPayment=Betal med kreditkort eller stripe
 FollowingUrlAreAvailableToMakePayments=Følgende webadresser oprettet som tilbyde en side til en kunde, hvor til der kan foretage indbetalinger på Dolibarr objekter
 PaymentForm=Betalings formular
@@ -28,7 +28,6 @@ AccountParameter=Kontoparametre
 UsageParameter=Anvendelsesparametre
 InformationToFindParameters=Hjælp til at finde din %s kontooplysninger
 STRIPE_CGI_URL_V2=Url af Stripe CGI-modul til betaling
-VendorName=Navn på leverandør
 CSSUrlForPaymentForm=CSS stilark url for betalingsformular
 NewStripePaymentReceived=Ny Stripe betaling modtaget
 NewStripePaymentFailed=Ny Stripe betaling forsøgt men mislykkedes
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
index 50545680f48..5f5ab0c61f3 100644
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Kredit overførsels ordre
 LatestBankTransferReceipts=Seneste %s kredit overførsels ordrer
 LastWithdrawalReceipts=Seneste %s direkte debit-filer
 WithdrawalsLine=Linje med direkte debitering
+CreditTransfer=Kreditoverførsel
 CreditTransferLine=Kreditoverførsels linje
 WithdrawalsLines=Direkte debitordre
 CreditTransferLines=Kreditoverførsels linjer
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Tredjeparts bankkode
 NoInvoiceCouldBeWithdrawed=Ingen faktura debiteres med succes. Kontroller, at fakturaer er på virksomheder med en gyldig IBAN, og at IBAN har en UMR (Unique Mandate Reference) med tilstanden <strong> %s </ strong>.
 WithdrawalCantBeCreditedTwice=Denne kvittering for tilbagetrækning er allerede markeret som krediteret. dette kan ikke gøres to gange, da dette potentielt kan skabe dobbeltbetalinger og bankindtastninger.
 ClassCredited=Klassificere krediteres
+ClassDebited=Klassificer debiteret
 ClassCreditedConfirm=Er du sikker på at du vil klassificere denne tilbagetrækning modtagelse som krediteres på din bankkonto?
 TransData=Dato Transmission
 TransMetod=Metode Transmission
@@ -80,7 +82,7 @@ StatusMotif7=Retslig afgørelse
 StatusMotif8=Andre grunde
 CreateForSepaFRST=Opret direkte debit fil (SEPA FRST)
 CreateForSepaRCUR=Opret direkte debitering fil (SEPA RCUR)
-CreateAll=Opret direkte debitfil (alle)
+CreateAll=Opret direkte debiteringsfil
 CreateFileForPaymentByBankTransfer=Opret fil til kreditoverførsel
 CreateSepaFileForPaymentByBankTransfer=Opret kreditoverførselsfil (SEPA)
 CreateGuichet=Kun kontor
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Kunne ikke oprette direkte debitering for tomt bel
 SepaMandate=SEPA Direkte Debit Mandat
 SepaMandateShort=SEPA-mandat
 PleaseReturnMandate=Ret venligst denne mandatformular via e-mail til %s eller pr. Mail til
-SEPALegalText=Ved at underskrive denne mandatformular bemyndiger du (A) %s at sende instruktioner til din bank for at debitere din konto og (B) din bank at debitere din konto i overensstemmelse med instruktionerne fra %s. Som en del af dine rettigheder har du ret til refusion fra din bank i henhold til vilkårene for din aftale med din bank. En refusion skal kræves inden for 8 uger fra den dato, hvor din konto blev debiteret. Dine rettigheder vedrørende ovennævnte mandat forklares i en erklæring, som du kan få fra din bank.
+SEPALegalText=Ved at underskrive denne fuldmagtsformular giver du (A) %s tilladelse til at sende instruktioner til din bank om at debitere din konto og (B) din bank til at debitere din konto i overensstemmelse med instruktionerne fra %s. Som en del af dine rettigheder har du ret til refusion fra din bank i henhold til betingelserne i din aftale med din bank. Dine rettigheder vedrørende ovenstående fuldmagt er forklaret i en erklæring, som du kan få fra din bank.
 CreditorIdentifier=Kreditoridentifikator
 CreditorName=Kreditors navn
 SEPAFillForm=(B) Udfyld venligst alle felter markeret *
@@ -150,3 +152,5 @@ ModeWarning=Mulighed for real mode ikke var indstillet, vi stopper efter denne s
 ErrorCompanyHasDuplicateDefaultBAN=Virksomhed med id %s har mere end en standard bankkonto. Ingen måde at vide, hvilken man skal bruge.
 ErrorICSmissing=Mangler ICS på bankkonto %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Det samlede beløb for direkte debiteringsordre adskiller sig fra summen af linjer
+WarningSomeDirectDebitOrdersAlreadyExists=Advarsel: Der er allerede nogle afventende direkte debiteringsordrer (%s) anmodet om et beløb på %s
+WarningSomeCreditTransferAlreadyExists=Advarsel: Der er allerede en afventende kreditoverførsel (%s) anmodet om et beløb på %s
diff --git a/htdocs/langs/de_AT/accountancy.lang b/htdocs/langs/de_AT/accountancy.lang
index 2d22ff1a5ce..f2d0909a71e 100644
--- a/htdocs/langs/de_AT/accountancy.lang
+++ b/htdocs/langs/de_AT/accountancy.lang
@@ -1,4 +1,2 @@
 # Dolibarr language file - Source file is en_US - accountancy
 MenuBankAccounts=Kontonummern
-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)
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 4b336a1f986..8ceb0acdd00 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Publisher=Hausgeber
 VersionProgram=Versionsnummer
 VersionLastInstall=Erstinstallationsversion
@@ -63,8 +65,6 @@ AutoDetectLang=automatische Erkennung (Browsersprache)
 FeatureDisabledInDemo=Funktion in der Demo deaktiviert
 FeatureAvailableOnlyOnStable=Funktion nur für offiziell stabile Versionen verfügbar
 URL=URL oder Link
-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>"
 Module50Name=Produkte und Services
 Module53Name=Dienstleistung
 Module70Name=Eingriffe
@@ -114,7 +114,6 @@ Permission2411=Maßnahmen (Termine oder Aufgaben) Anderer einsehen
 Permission2412=Maßnahmen (Termine oder Aufgaben) Anderer erstellen/bearbeiten
 Permission2413=Maßnahmen (Termine oder Aufgaben) Anderer löschen
 Permission2501=Dokumente hochladen oder löschen
-DictionaryOrderMethods=Order methods
 VirtualServerName=Virtual Server Name
 PhpWebLink=Php Web-Link
 Server=Host
@@ -128,13 +127,9 @@ SummaryConst=Liste aller Systemeinstellungen
 Skin=Oberfläche
 DefaultSkin=Standardoberfläche
 CompanyCurrency=Firmenwährung
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
 WatermarkOnDraftInvoices=Wasserzeichen auf Rechnungsentwürfen (alle, falls leer)
 WatermarkOnDraftProposal=Wasserzeichen für Angebotsentwürfe (alle, falls leer)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Fragen Sie nach dem Bestimmungsort des Bankkontos der Bestellung
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
 WatermarkOnDraftOrders=Wasserzeichen zu den Auftragsentwürfen (keines wenn leer)
 InterventionsSetup=Eingriffsmoduleinstellungen
 FreeLegalTextOnInterventions=Freier Rechtstext für Eingriffe
@@ -151,15 +146,13 @@ LDAPMembersTypesSynchro=Mitgliedertypen
 LDAPSynchronization=LDAP Synchronisierung
 LDAPFunctionsNotAvailableOnPHP=LDAP Funktionen nicht verfügbar in Deinem PHP
 LDAPFieldFullname=vollständiger Name
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
 ClickToDialSetup=Click-to-Dial-Moduleinstellungen
 MailToSendShipment=Sendungen
 MailToSendIntervention=Eingriffe
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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.
-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 a string 'Name: name to find' found into the body, use 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=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=Endpunkt für %s: %s
 DeleteEmailCollector=E-Mail-Sammler löschen
 ConfirmDeleteEmailCollector=Möchten Sie diesen E-Mail-Sammler wirklich löschen?
@@ -168,6 +161,5 @@ RESTRICT_ON_IP=Erlauben Sie nur den Zugriff auf eine Host-IP (Platzhalter nicht
 FeatureNotAvailableWithReceptionModule=Funktion nicht verfügbar, wenn das Modul Empfang aktiviert ist
 EmailTemplate=Vorlage für E-Mail
 YouShouldDisablePHPFunctions=PHP Funktionen sollten deaktiviert werden
-ARestrictedPath=Some restricted path
 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/de_AT/cashdesk.lang b/htdocs/langs/de_AT/cashdesk.lang
index d7d0e8613b8..039571d9f7f 100644
--- a/htdocs/langs/de_AT/cashdesk.lang
+++ b/htdocs/langs/de_AT/cashdesk.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - cashdesk
 CashDeskProducts=Produkte und Services
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/de_AT/compta.lang b/htdocs/langs/de_AT/compta.lang
index 9da7563801f..634e970fa01 100644
--- a/htdocs/langs/de_AT/compta.lang
+++ b/htdocs/langs/de_AT/compta.lang
@@ -7,7 +7,6 @@ VATCollected=Eingehobene MwSt.
 MenuSpecialExpenses=Steuern, Sozialbeiträge und Dividenden
 AnnualSummaryDueDebtMode=Die Jahresbilanz der Einnahmen/Ausgaben im Modus<b>%sForderungen-Verbindlichkeiten%s</b> meldet <b>Kameralistik</b>.
 AnnualSummaryInputOutputMode=Die Jahresbilanz der Einnahmen/Ausgaben im Modus <b>%sEinkünfte-Ausgaben%s</b> meldet <b>Ist-Besteuerung</b>.
-VATReportByThirdParties=Sales tax report by third party
 VATReportByCustomersInInputOutputMode=Bericht zur vereinnahmten und bezahlten MwSt. nach Kunden (Steuerbeleg)
 ProposalStats=Statistik über die Vorschläge
 OrderStats=Statistiken über Bestellungen
@@ -17,9 +16,3 @@ PurchasesJournal=Käufe Journal
 DescSellsJournal=Vertrieb Journal
 DescPurchasesJournal=Käufe Journal
 LinkedOrder==> Bestellung
-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)
diff --git a/htdocs/langs/de_AT/errors.lang b/htdocs/langs/de_AT/errors.lang
index c06596be6d1..ededba208c4 100644
--- a/htdocs/langs/de_AT/errors.lang
+++ b/htdocs/langs/de_AT/errors.lang
@@ -2,4 +2,3 @@
 ErrorRecordNotFound=Eintrag nicht gefunden.
 ErrorCashAccountAcceptsOnlyCashMoney=Dies ist ein Bargeldkonto (Kassa) und akzeptiert deshalb nur Bargeldtransaktionen.
 ErrorCustomerCodeAlreadyUsed=Diese Kunden Nr. ist bereits vergeben.
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/de_AT/eventorganization.lang b/htdocs/langs/de_AT/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/de_AT/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang
index 567a0d692d3..d1b886fe6e2 100644
--- a/htdocs/langs/de_AT/main.lang
+++ b/htdocs/langs/de_AT/main.lang
@@ -86,5 +86,4 @@ SearchIntoContacts=Kontakt
 SearchIntoInterventions=Eingriffe
 AssignedTo=zugewisen an
 DateOfBirth=Geburtstdatum
-Properties=Properties
 ClientTZ=Client-Zeitzone (Benutzer)
diff --git a/htdocs/langs/de_AT/members.lang b/htdocs/langs/de_AT/members.lang
index 09f8fadabdb..828b9a69157 100644
--- a/htdocs/langs/de_AT/members.lang
+++ b/htdocs/langs/de_AT/members.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
 SetLinkToUser=Mit Benutzer verknüpfen
 SetLinkToThirdParty=Mit Partner verknüpfen
 MemberId=Mitglieds ID
@@ -8,7 +7,6 @@ MembersTypes=Mitgliedertypen
 MemberStatusActiveLateShort=abgelaufen
 MemberStatusNoSubscriptionShort=Bestätigt
 SubscriptionEndDate=Abonnementauslaufdatum
-NewSubscription=New contribution
 SubscriptionLate=Versätet
 NewMemberType=Neues Mitgliedsrt
 Filehtpasswd=htpasswd-Datei
diff --git a/htdocs/langs/de_AT/modulebuilder.lang b/htdocs/langs/de_AT/modulebuilder.lang
deleted file mode 100644
index 5db0d6ffc2c..00000000000
--- a/htdocs/langs/de_AT/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
diff --git a/htdocs/langs/de_AT/mrp.lang b/htdocs/langs/de_AT/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/de_AT/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/de_AT/orders.lang b/htdocs/langs/de_AT/orders.lang
index fff0d0f3077..9eb74a30c57 100644
--- a/htdocs/langs/de_AT/orders.lang
+++ b/htdocs/langs/de_AT/orders.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrderLine=Bestellposition
 OrderToProcess=Zu bearbeitende Bestellung
-SaleOrderLines=Sales order lines
 StatusOrderValidatedShort=Bestätigt
 StatusOrderValidated=Bestätigt
 StatusOrderOnProcess=In Arbeit
diff --git a/htdocs/langs/de_AT/printing.lang b/htdocs/langs/de_AT/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/de_AT/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/de_AT/products.lang b/htdocs/langs/de_AT/products.lang
index a49443d1041..b1d6d08721c 100644
--- a/htdocs/langs/de_AT/products.lang
+++ b/htdocs/langs/de_AT/products.lang
@@ -30,6 +30,4 @@ ListProductByPopularity=Liste der Produkte/Services nach Beliebtheit
 ListServiceByPopularity=Liste der Services nach Beliebtheit
 Finished=Eigenerzeugung
 NewRefForClone=Artikel Nr. des neuen Produkts/Services
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
 PMPValue=Warenwert
diff --git a/htdocs/langs/de_AT/receptions.lang b/htdocs/langs/de_AT/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/de_AT/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/de_AT/sendings.lang b/htdocs/langs/de_AT/sendings.lang
index 74b192883a3..c39fcda1909 100644
--- a/htdocs/langs/de_AT/sendings.lang
+++ b/htdocs/langs/de_AT/sendings.lang
@@ -3,4 +3,3 @@ Sendings=Sendungen
 Shipments=Sendungen
 StatusSendingValidatedShort=Bestätigt
 DateReceived=Datum des Warenerhalts
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/de_AT/stocks.lang b/htdocs/langs/de_AT/stocks.lang
index 0b507f8b945..fdeeecd2640 100644
--- a/htdocs/langs/de_AT/stocks.lang
+++ b/htdocs/langs/de_AT/stocks.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - stocks
 Location=Ort
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
 AverageUnitPricePMPShort=Warenwert
diff --git a/htdocs/langs/de_AT/trips.lang b/htdocs/langs/de_AT/trips.lang
index 48693d9912c..8e81ebe6709 100644
--- a/htdocs/langs/de_AT/trips.lang
+++ b/htdocs/langs/de_AT/trips.lang
@@ -1,7 +1,2 @@
 # Dolibarr language file - Source file is en_US - trips
 TF_LUNCH=Mittagessen
-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
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index e4aa597c841..84aae28a81a 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -20,6 +20,8 @@ Journalization=Journalisierung
 JournalFinancial=Finanzjournal
 BackToChartofaccounts=Zeige Kontenrahmen
 Chartofaccounts=Kontenrahmen
+ChartOfSubaccounts=Einzelkontenplan
+ChartOfIndividualAccountsOfSubsidiaryLedger=Einzelkontenplan des Nebenbuchs
 CurrentDedicatedAccountingAccount=Aktuell zugewiesenes Konto
 AssignDedicatedAccountingAccount=Neues zugewiesenes Konto
 InvoiceLabel=Rechnungsbezeichung
@@ -36,7 +38,6 @@ CountriesNotInEEC=Nicht EWR - Staaten
 CountriesInEECExceptMe=Länder im EWR ausser %s
 CountriesExceptMe=Alle Staaten, ausser %s
 AccountantFiles=Geschäftsvorgänge exportieren
-ExportAccountingSourceDocHelp=Hier kannst du die zu deinen Buchungen gehörenden Geschäftsfälle als Liste exportieren. Du hast die Wahl zwischen den Dateiformaten CSV und PDF.
 ExportAccountingSourceDocHelp2=Die Journale exportierst du im Menu %s - %s.
 VueByAccountAccounting=Anzeigen nach Buchhaltungskonto
 VueBySubAccountAccounting=Anzeigen nach Nebenbuchkonto
@@ -156,6 +157,8 @@ LabelOperation=Vorgangsbezeichnung
 LetteringCode=Beschriftung
 JournalLabel=Journalbezeichnung
 TransactionNumShort=Transaktionsnummer
+GroupByAccountAccounting=Nach Hauptbuchkonto gruppieren
+GroupBySubAccountAccounting=Nach Nebenbuchkonto gruppieren
 AccountingAccountGroupsDesc=Trage hier deine eigenen Buchhaltungs - Kontogruppen ein. Daraus kannst du spezielle Berichte erzeugen.
 ByAccounts=Nach Konto
 ByPredefinedAccountGroups=Nach Gruppe
@@ -164,8 +167,10 @@ 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.
 VATAccountNotDefined=Leider ist kein MWST - Konto definiert.
 ThirdpartyAccountNotDefined=Leider ist kein Partner definiert.
 ProductAccountNotDefined=Leider ist kein Konto für das Produkt definiert.
@@ -181,9 +186,12 @@ DescThirdPartyReport=Liste der Geschäftpartner (Kunden und Lieferanten) mit der
 ListAccounts=Liste der Buchhaltungskonten
 UnknownAccountForThirdparty=Den Partner kenne ich nicht - wir nehmen %s.
 UnknownAccountForThirdpartyBlocking=Den Partner kenne ich nicht. Zugriffsfehler.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Nebenbuchkonto nicht definiert oder Dritte oder Benutzer unbekannt. Wir verwenden %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Der Geschäftspartner und das Nebenbuch sind unbekannt. Ich mache keinen Eintrag in das Nebenbuchkonto.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Nebenbuchkonto nicht definiert oder Dritte oder Benutzer unbekannt. Fehler beim Blockieren.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Mir fehlt der Partner und das Wartestellungskonto. Zugriffsfehler.
 PaymentsNotLinkedToProduct=Die Zahlung ist mit keinem Produkt oder Service verknüpft.
+OpeningBalance=Eröffnungssaldo
 Pcgtype=Kontengruppe
 TotalMarge=Gesamtmarge Verkauf
 DescVentilCustomer=Du siehst hier die Liste der Kundenrechnungen und ob diese mit einem Buchhaltungskonto verknüpft sind, oder nicht.
@@ -199,10 +207,10 @@ DescVentilExpenseReportMore=Wenn du in den Spesenarten Buchhaltungskonten hinter
 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
 DescValidateMovements=Für den Abschluss müssen alle Kontobewegungen frei gegeben sein. Danach sind sie nicht mehr änderbar.
 ValidateHistory=Automatisch verknüpfen
-AutomaticBindingDone=Automatisches Verknüpfen abgeschlossen
 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
@@ -215,6 +223,7 @@ ChangeBinding=Verknüpfung ändern
 Accounted=Im Hauptbuch eingetragen
 ShowTutorial=Zeige die Anleitung
 NotReconciled=Nicht ausgeglichen
+BindingOptions=Bindungsoptionen
 ApplyMassCategories=Massenänderung Kategorien
 AddAccountFromBookKeepingWithNoCategories=Vorhandenes Konto, dass keiner persönlichen Gruppe zugewiesen ist.
 CategoryDeleted=Die Kategorie des Buchhaltungskonto ist jetzt entfernt.
@@ -227,8 +236,10 @@ 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
-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)
+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
 Selectmodelcsv=Wähle dein Exportformat.
@@ -241,6 +252,7 @@ Modelcsv_ebp=EBP - Format
 Modelcsv_cogilog=EBP  - Format
 Modelcsv_openconcerto=Export zu OpenConcerto (Test)
 Modelcsv_configurable=Konfigurierbares CSV  - Format
+Modelcsv_FEC2=FEC exportieren (mit Datumsgenerierung schreiben / Dokument rückgängig machen)
 Modelcsv_Sage50_Swiss=Export zu SAGE 50 - Schweiz
 ChartofaccountsId=Kontenrahmen ID
 InitAccountancy=Init Buchhaltung
@@ -251,10 +263,12 @@ OptionModeProductSell=Modus Verkauf
 OptionModeProductSellIntra=Modus Export - Verkäufe in den EWR - Raum
 OptionModeProductSellExport=Modus Export - Verkäufe in andere Länder
 OptionModeProductBuy=Modus Einkauf
+OptionModeProductBuyExport=Modus gekauft aus anderen Ländern importiert
 OptionModeProductSellDesc=Finde alle Produkte mit einem Buchhaltungskonto für Verkäufe.
 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.
+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
 PredefinedGroups=Eigene Gruppen
@@ -278,5 +292,6 @@ Binded=Verknüpfte Positionen
 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)
 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 1d4bf00047f..71fb7e04085 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Publisher=Herausgeber
 VersionLastInstall=Erste installierte Version
 VersionLastUpgrade=Version der letzten Aktualisierung
@@ -23,13 +25,18 @@ ConfirmPurgeSessions=Wollen Sie wirklich alle Sessions beenden ? Dadurch werden
 NoSessionListWithThisHandler=Wegen der aktuellen PHP-Konfiguration kann ich die aktuellen Sitzungen nicht anzeigen.
 ConfirmLockNewSessions=Bist du sicher, dass du jede neue Dolibarr - Verbindung auf dich selbst einschränken willst? Danach kann nur noch der Benutzer <b>%s</b> zugreifen.
 WebUserGroup=WebServer Benutzer/Gruppen
+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
 GUISetup=Anzeige
 UploadNewTemplate=Neue Vorlage(n) hochladen
+ModuleMustBeEnabled=Das Modul/die Anwendung <b> %s </b> muss aktiviert sein
+ModuleIsEnabled=Das Modul/die Anwendung <b> %s </b> wurde aktiviert
 RemoveLock=Um das Update- und Installationstool verwenden zu können, lösche bitte die Datei  <b>%s</b> oder benenne sie um
 RestoreLock=Damit das Update- und Installationstool gesperrt wird, stelle die Datei <b>%s</b>mit Nur-Leserechten wieder her.
 SecurityFilesDesc=Sicherheitseinstellungen für den Dateiupload definieren.
@@ -38,6 +45,7 @@ ErrorModuleRequireDolibarrVersion=Fehler: Dieses Moduls erfordert Dolibarr Versi
 DictionarySetup=Stammdaten Einstellungen
 ErrorCodeCantContainZero=Code darf keinen Wert 0 enthalten
 DisableJavascript=JavaScript - und Ajaxfunktionen ausschalten
+DisableJavascriptNote=Hinweis: Nur zu Test- oder Debugzwecken. Zur Optimierung für Blinde oder Textbrowser können Sie es vorziehen, das Setup im Profil des Benutzers zu verwenden
 UseSearchToSelectCompanyTooltip=Wenn Sie eine grosse Anzahl von Geschäftspartnern (> 100'000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante COMPANY_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 UseSearchToSelectContactTooltip=Wenn Sie eine grosse Anzahl von Kontakten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante CONTACT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 DelaiedFullListToSelectCompany=Nicht so eingängig, aber schneller geht's in der Combo List - Ansicht, wenn ich auf Tastendruck warten soll, bevor ich die Partnerliste lade.
@@ -57,6 +65,7 @@ ComptaSetup=Buchhaltungsmoduls-Einstellungen
 MultiCurrencySetup=Mehrfachwährungen konfigurieren
 MenuLimits=Genauigkeit - Toleranz
 MenuIdParent=Eltern-Menü-ID
+ParentID=Eltern ID
 DetailPosition=Reihungsnummer für definition der Menüposition
 OtherOptions=Andere Optionen
 OtherSetup=Andere Einstellungen
@@ -76,6 +85,7 @@ Language_en_US_es_MX_etc=Sprache setzen (de_CH, en_GB,...)
 SystemToolsAreaDesc=Dieser Bereich ist voll mit Administratorfunktionen - Wähle im Menu aus.
 Purge=Säubern
 PurgeAreaDesc=Hier können Sie alle vom System erzeugten und gespeicherten Dateien löschen (temporäre Dateien oder alle Dateien im Verzeichnis <b>%s</b>). Diese Funktion ist richtet sich vorwiegend an Benutzer ohne Zugriff auf das Dateisystem des Webservers (z.B. Hostingpakete)
+PurgeDeleteTemporaryFilesShort=Protokoll und temporäre Dateien löschen (kein Risiko von Datenverlust)
 PurgeDeleteAllFilesInDocumentsDir=Alle Dateien im Verzeichnis <b>%s</b> löschen. <br> Dadurch werden alle generierten Dokumente gelöscht, die sich auf Elemente (Geschäftspartner, Rechnungen usw.), Dateien, die in das ECM-Modul hochgeladen wurden, Datenbank-Backup-Dumps und temporäre Dateien beziehen.
 PurgeNDirectoriesDeleted=<b>%s</b> Dateien oder Verzeichnisse gelöscht.
 PurgeNDirectoriesFailed=Löschen von <b>%s</b> Dateien oder Verzeichnisse fehlgeschlagen.
@@ -88,10 +98,12 @@ ExportMethod=Export-Methode
 ImportMethod=Import-Methode
 ImportMySqlDesc=Erstellte MySQL - Backupdateien importierst du in deiner Hostingumgebung. Entweder über phpMyAdmin oder über die MySql - Konsole, zum Beispiel mit dem Befehl:
 FileNameToGenerate=Name der zu erstellenden Datei
+ExportUseMySQLQuickParameter=Verwenden Sie den Parameter --quick
 AddDropDatabase=DROP DATABASE Befehl hinzufügen
 AddDropTable=DROP TABLE Befehl hinzufügen
 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.
 ModulesMarketPlaceDesc=Sie finden weitere Module auf externen Websites
 ModulesDeployDesc=Hier kannst du Module und Apps von Drittanbietern in deine Umgebung einbinden. Dazu braucht es lokale Schreibrechte auf deiner Webserverumgebung. Diese Module erscheinen danach hier im Tab "<strong>%s</strong>"
 ModulesMarketPlaces=Suche externe Module
@@ -109,6 +121,7 @@ DevelopYourModuleDesc=Einige Lösungen um Ihr eigenes Modul zu entwickeln...
 BoxesAvailable=Verfügbare Boxen
 BoxesActivated=Aktivierte Boxen
 ActiveOn=Aktiviert am
+ActivatableOn=Aktivierbar ab
 DoNotStoreClearPassword=Verschlüssle die Passwörter in der Datenbank - das ist sehr empfohlen, sonst werden Sie in Klartext abgelegt.
 MainDbPasswordFileConfEncrypted=Verschlüssle die Passwörter in der Dolibarr - Konfigurationsdatei (conf.php) - das ist sehr empfohlen, sonst werden Sie in Klartext abgelegt.
 ProtectAndEncryptPdfFiles=Schütze von Dolibarr generierte PDFs - der Haken: Wenn das aktiv ist, kann ich keine Massen - PDFs mehr herstellen.
@@ -121,8 +134,7 @@ OfficialDemo=Dolibarr Offizielle Demo
 OfficialWebHostingService=Offizielle Web-Hosting-Services (Cloud Hosting)
 ReferencedPreferredPartners=Bevorzugte Geschäftspartner
 OtherResources=Andere Ressourcen
-ForDocumentationSeeWiki=Für Benutzer-und Entwickler-Dokumentation (DOC, ...), FAQs <br> Werfen Sie einen Blick auf die Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
-ForAnswersSeeForum=Für alle anderen Fragen / Hilfe, können Sie die Dolibarr Forum: <br> <a href="%s" target="_blank"><b> %s</b></a>
+SocialNetworkId=Soziale Netzwerk-ID
 HelpCenterDesc1=Hier findest du weitere Anlaufstellen für Hilfe und Unterstützung zu Dolibarr.
 HelpCenterDesc2=Einige dieser Ressourcen gibt es nur auf <b>Englisch</b>.
 MeasuringUnit=Masseinheit
@@ -131,8 +143,10 @@ TopMargin=Oberer Rand
 Orientation=Orientierung
 SpaceX=Leerraum X
 SpaceY=Leerraum Y
+ContentForLines=Inhalt, der für jedes Produkt oder jede Dienstleistung angezeigt werden soll (von Variable __LINES__ des Inhalts)
 NoticePeriod=Kündigungsfrist
 EMailsSetup=E-Mail Einstellungen
+EMailsDesc=Auf dieser Seite können Sie Parameter oder Optionen für den E-Mail-Versand einstellen.
 EmailSenderProfiles=Absenderprofil
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS - Portnummer (aktuelle Konfiguration in PHP ist: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS - Portnummer (aktuelle Konfiguration in PHP ist: <b>%s</b>)
@@ -143,6 +157,7 @@ MAIN_MAIL_ERRORS_TO=E-Mail - Antwortadresse für Versandfehler (greift die Felde
 MAIN_MAIL_AUTOCOPY_TO=Automatische Blindkopie (BCC) aller gesendeten Mails an:
 MAIN_DISABLE_ALL_MAILS=Deaktiviere alle E-Mail-Funktionen (für Test- oder Demozwecke)
 MAIN_MAIL_FORCE_SENDTO=Sende alle Emails an diese Adresse zum Test (statt an die echten Empfänger)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=E-Mails von Mitarbeitern (sofern definiert) beim Schreiben einer neuen E-Mail in die Liste der vordefinierten Empfänger vorschlagen
 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)
@@ -170,7 +185,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.
@@ -187,8 +201,8 @@ DoTestSend=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.
-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=Verstecke den Link " <b> Brauche Hilfe oder Support </b> " auf der Login-Seite
+DisableLinkToHelp=Link zur Online-Hilfe ausblenden " <b> %s </b> "
 AddCRIfTooLong=Es gibt keine automatische Textformatierung, zu langer Text wird in Dokumenten nicht angezeigt. Bitte fügen Sie bei Bedarf Zeilenumbrüche im Textfeld hinzu.
 ConfirmPurge=Möchtest du diese Aktion wirklich durchführen?\nDabei gehen alle Datein (im ECM, Attachments etc) unwiederbringlich verloren.
 ExamplesWithCurrentSetup=Beispiele mit der derzeitigen Systemkonfiguration
@@ -199,6 +213,8 @@ ThisForceAlsoTheme=Dieser Menu Manager übersteuert die Benutzereinstellung. Er
 ConnectionTimeout=Zeitüberschreitung in der Verbindung
 ResponseTimeout=Antwort Timeout
 NoSmsEngine=Es ist kein SMS Sendedienst verfügbar.\nIn der Standardinstallation ist keiner installiert, denn das gibt es bei externen Anbietern.\nFinde deinen Anbieter via %s.
+PDFDesc=Globale Optionen für die PDF-Generierung
+PDFAddressForging=Regeln für den Adressbereich
 HideAnyVATInformationOnPDF=Verstecke MWST - Informationen.
 PDFRulesForSalesTax=Regeln für die MWST
 HideDescOnPDF=Verstecke Produktbeschreibungen
@@ -206,9 +222,11 @@ HideRefOnPDF=Verstecke Produktnummern
 HideDetailsOnPDF=Verstecke Produktzeilen
 PlaceCustomerAddressToIsoLocation=ISO Position für die Kundenadresse verwenden
 GetSecuredUrl=Holen der berechneten URL
+ButtonHideUnauthorized=Verstecke nicht autorisierte Aktionsschaltflächen auch für interne Benutzer (ansonsten nur grau)
 OldVATRates=Alter MwSt. Satz
 NewVATRates=Neuer MwSt. Satz
 MassConvert=Massenkonvertierung starten
+String1Line=Zeichenfolge (1 Zeile)
 HtmlText=HTML
 Float=Gleitkommazahl
 Boolean=Boolean (Ein Kontrollkästchen)
@@ -228,12 +246,14 @@ ExtrafieldParamHelpcheckbox=Die Liste muss im Format: Schlüssel, Wert sein (wob
 ExtrafieldParamHelpradio=Die Liste muss im Format: Schlüssel, Wert sein (wobei der Schlüssel nicht '0' sein kann) <br> <br> zum Beispiel: <br> 1, Wert1 <br> 2, Wert2 <br> 3, Wert3 <br> ...
 LibraryToBuildPDF=Verwendete Bibliothek zur PDF-Erzeugung
 SetAsDefault=Als Standard definieren
+InstalledInto=Installiert im Verzeichnis %s
 BarcodeInitForThirdparties=Barcode Init. für alle Partner
 BarcodeInitForProductsOrServices=Alle Strichcodes für Produkte oder Services initialisieren oder zurücksetzen
 EraseAllCurrentBarCode=Alle aktuellen Barcode-Werte löschen
 ConfirmEraseAllCurrentBarCode=Wirklich alle aktuellen Barcode-Werte löschen?
 AllBarcodeReset=Alle Barcode-Werte wurden entfernt
 NoBarcodeNumberingTemplateDefined=Mir fehlt ein aktives Barcode - Nummernschema. Das wird im Modul "Barcodes" aktiviert.
+EnableFileCache=Dateicache aktivieren
 ShowDetailsInPDFPageFoot=Mehr Detailinfos in der Fusszeile anzeigen, wie z.B. Firmenadresse, oder Vertreternamen  (Zusätzlich zur Firmennummer, Firmenvermögen und MWST - Nummer).
 NoDetails=Keine weiteren Details in der Fusszeile
 DisplayCompanyManagers=Anzeige der Namen der Geschäftsführung
@@ -243,10 +263,13 @@ ModuleCompanyCodeSupplierAquarium=%sgefolgt von der Lieferantennummer für den K
 ModuleCompanyCodePanicum=Leeren Kontierungscode zurückgeben.
 Use3StepsApproval=Standardmässig, Einkaufsaufträge müssen durch zwei unterschiedlichen Benutzer erstellt und freigegeben werden (ein Schritt/Benutzer zum 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 einen zusätzlichen Schritt/User für die Freigabe einrichten, wenn der Betrag einen bestimmten dedizierten Wert übersteigt (wenn der Betrag höher wird, werden 3 Stufen notwendig: 1=Validierung, 2=erste Freigabe und 3=Gegenfreigabe.<br>Lassen Sie das Feld leer, wenn eine Freigabe (2 Schritte) ausreicht; tragen Sie einen sehr niedrigen Wert (0.1) ein, wenn eine zweite Freigabe notwendig ist.
 UseDoubleApproval=3-fach Verarbeitungsschritte verwenden, wenn der Betrag (ohne Steuer) höher ist als ...
+WarningPHPMail=WARNUNG: Die Einrichtung zum Senden von E-Mails von der Anwendung verwendet die allgemeine Standardeinrichtung. Aus mehreren Gründen ist es oft besser, ausgehende E-Mails so einzurichten, dass sie den E-Mail-Server Ihres E-Mail-Dienstanbieters anstelle der Standardkonfiguration verwenden:
+WarningPHPMailA=- Die Verwendung des Servers des E-Mail-Dienstanbieters erhöht die Vertrauenswürdigkeit Ihrer E-Mails, sodass die Zustellbarkeit erhöht wird, ohne als SPAM gekennzeichnet zu werden
 WarningPHPMail2=Falls dein Anbieter Mailclients auf einen IP-Adressbereich einschränkt, hier die IP deines E-Mail Benutzerprogramms hier in Dolibarr: <strong>%s</strong>.
 ClickToShowDescription=Klicken um die Beschreibung zu sehen
 DependsOn=Dieses Modul benötigt die folgenden Module
 RequiredBy=Diese Modul wird durch folgende Module verwendet
+PageUrlForDefaultValues=Sie müssen den relativen Pfad der Seiten-URL eingeben. Wenn Sie Parameter in die URL einschließen, werden die Standardwerte wirksam, wenn alle Parameter auf denselben Wert eingestellt sind.
 EnableDefaultValues=Eigene Standartwerte erlauben.
 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.
@@ -269,10 +292,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
 Module52Name=Produktbestände
+Module52Desc=Lagerverwaltung
 Module53Desc=Dienstleistungen
+Module55Desc=Barcode- oder QR-Code-Verwaltung
 Module70Name=Arbeitseinsätze
 Module70Desc=Serviceverwaltung
 Module80Name=Auslieferungen
@@ -301,6 +328,7 @@ Module1520Desc=E-Mail Kampagnendokument erstellen
 Module1780Name=Kategorien/#tags
 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.
@@ -341,6 +369,7 @@ 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
@@ -385,7 +414,6 @@ DictionaryCompanyJuridicalType=Rechtsformen von Unternehmen
 DictionaryActions=Arten von Kalenderereignissen
 DictionaryVAT=MwSt.-Sätze
 DictionaryPaperFormat=Papierformate
-DictionaryOrderMethods=Order methods
 DictionaryAccountancysystem=Kontenplan Modul
 DictionaryEMailTemplates=E-Mail Textvorlagen
 SetupSaved=Setup gespeichert
@@ -402,7 +430,6 @@ CompanyInfo=Firma / Organisation
 CompanyZip=PLZ
 CompanyCountry=Land
 DoNotSuggestPaymentMode=Nicht vorschlagen
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
 SetupDescription1=Der Setupbereich erlaubt das konfigurieren ihrer Dolibarr Installation vor der ersten Verwendung.
 InfoDolibarr=Infos Dolibarr
 InfoBrowser=Infos Browser
@@ -412,7 +439,6 @@ InfoDatabase=Infos Datenbank
 InfoPHP=Infos PHP
 BrowserName=Browser Name
 AccountantDesc=Wenn Sie einen externen Buchhalter haben, können Sie hier seine Informationen bearbeiten.
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
 TriggerDisabledByName=Trigger in dieser Datei sind durch das <b>-NORUN</b>-Suffix in ihrem Namen deaktviert.
 DictionaryDesc=Definieren Sie hier alle Defaultwerte. Sie können die vordefinierten Werte mit ihren eigenen ergänzen.
 MiscellaneousDesc=Alle anderen sicherheitsrelevanten Parameter werden hier definiert.
@@ -420,7 +446,6 @@ LimitsSetup=Limits und Genauigkeit Einstellungen
 RestoreDesc2=Stellen Sie die Sicherungsdatei (z.B. Zip-Datei) des Verzeichnisses "documents" auf einer neuen Dolibarr-Installation oder in diesem aktuellen Dokumentenverzeichnis ( <b>%s</b> ) wieder her.
 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
-MAIN_DISABLE_METEO=Disable weather thumb
 MeteoStdMod=Standard Modus
 ExtraFieldsSupplierOrdersLines=Ergänzende Attribute (in Bestellungszeile)
 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.
@@ -438,10 +463,10 @@ ProposalsNumberingModules=Angebotsnumerierungs-Module
 ProposalsPDFModules=PDF-Anbebotsmodule
 FreeLegalTextOnProposal=Freier Rechtstext für Angebote
 WatermarkOnDraftProposal=Wasserzeichen auf Angebots-Entwurf (keines, falls leer)
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
 OrdersNumberingModules=Bestellnumerierungs-Module
 OrdersModelModule=Bestellvorlagenmodule
 WatermarkOnDraftOrders=Wasserzeichen auf Bestellungs-Entwurf (keines, wenn leer)
+ShippableOrderIconInList=In Auftragsliste ein entsprechendes Icon zufügen, wenn die Bestellung versandbereit ist
 InterventionsSetup=Servicemoduleinstellungen
 FreeLegalTextOnInterventions=Freier Rechtstext auf Interventions Dokument
 FicheinterNumberingModules=Intervention Nummerierung Module
@@ -470,7 +495,6 @@ MemcachedNotAvailable=Kein Cache Anwendung gefunden. \nSie können die Leistung
 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..
 ServiceSetup=Leistungen Modul Setup
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
 SetDefaultBarcodeTypeProducts=Standard-Barcode-Typ für Produkte
 SetDefaultBarcodeTypeThirdParties=Standard-Barcode-Typ für Geschäftspartner
 UseUnits=Definieren Sie eine Masseinheit für die Menge während der Auftrags-, Auftragsbestätigungs- oder Rechnungszeilen-Ausgabe
@@ -504,6 +528,7 @@ MultiCompanySetup=Multi-Company-Moduleinstellungen
 SuppliersSetup=Modul Lieferanten einrichten
 TestGeoIPResult=Test einer Umwandlung IP -> Land
 TasksNumberingModules=Aufgaben-Nummerierungs-Modul
+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
 TemplatePDFExpenseReports=Dokumentvorlagen zur Spesenabrechnung Dokument erstellen
 ExpenseReportsRulesSetup=Modul Spesenabrechnungen (Regeln) einrichten
@@ -542,7 +567,6 @@ MAIN_PDF_MARGIN_LEFT=Linker Seitenrand im PDF.
 MAIN_PDF_MARGIN_RIGHT=Rechter Seitenrand im PDF
 MAIN_PDF_MARGIN_TOP=Oberer Seitenrand im PDF
 MAIN_PDF_MARGIN_BOTTOM=Unterer Seitenrand im PDF.
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 NothingToSetup=Dieses Modul braucht keine weiteren Einstellungen.
 HelpOnTooltip=Hilfetext, der auf dem Tooltip angezeigt werden soll
 HelpOnTooltipDesc=Legen Sie hier einen Text oder einen Übersetzungsschlüssel an, damit dieser Text im Tooltip angezeigt wird, wenn dieses Feld in einem Formular erscheint.
@@ -553,17 +577,16 @@ NewEmailCollector=Neuer E-Mail - Sammeldienst
 EMailHost=IMAP Server Host
 EmailCollectorConfirmCollectTitle=E-Mail - Sammeldienst Bestätigung
 NoNewEmailToProcess=Ich habe keinen neuen E-Mails (die zu den Filtern passen) abzuarbeiten.
-RecordEvent=E-Mail Ereignisse
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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.
 ResourceSetup=Modul Ressourcen einrichten
 UseSearchToSelectResource=Zeige eine Suchmaske für Ressourcen, statt eine Drop-down - Liste
 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 a string 'Name: name to find' found into the body, use 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=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
 DictionaryProductNature=Produktart
-ARestrictedPath=Some restricted path
 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/de_CH/banks.lang b/htdocs/langs/de_CH/banks.lang
index 0bd6a32dd79..851833d8bf9 100644
--- a/htdocs/langs/de_CH/banks.lang
+++ b/htdocs/langs/de_CH/banks.lang
@@ -14,12 +14,12 @@ AllTime=Vom start
 Reconciliation=Zahlungsabgleich
 RIB=Kontonummer
 SwiftValid=BIC/SWIFT gültig
-SwiftVNotalid=BIC/SWIFT ungültig
+SwiftNotValid=BIC/SWIFT ungültig
 IbanValid=BAN gültig
 IbanNotValid=BAN ungültig
 StandingOrder=Bankeinzug / Lastschrift
+PaymentByBankTransfer=Zahlung per Überweisung
 BankAccountDomiciliation=Bankadresse
-RIBControlError=Hoppla, die Kontoinformationen sind entweder unvollständig oder ungültig. Bitte Prüfe Land, Werte und IBAN.
 LabelBankCashAccount=Bank- oder Kassebezeichnung
 AccountType=Kontoart
 AccountCard=Konto-Karte
diff --git a/htdocs/langs/de_CH/bills.lang b/htdocs/langs/de_CH/bills.lang
index 432508afc19..a837b366b49 100644
--- a/htdocs/langs/de_CH/bills.lang
+++ b/htdocs/langs/de_CH/bills.lang
@@ -26,19 +26,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 +93,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 +104,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=%
diff --git a/htdocs/langs/de_CH/bookmarks.lang b/htdocs/langs/de_CH/bookmarks.lang
index 850b6bea770..227a9df0790 100644
--- a/htdocs/langs/de_CH/bookmarks.lang
+++ b/htdocs/langs/de_CH/bookmarks.lang
@@ -5,6 +5,5 @@ OpenANewWindow=Neuen Tab öffnen
 BookmarkTitle=Name des Lesezeichens
 BehaviourOnClick=Was soll passieren, wenn ein Lesezeichen - Link angewählt wird?
 SetHereATitleForLink=Gib dem Lesezeichen einen Namen
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Verwende einen externen Link (https://URL) oder zeige auf das lokale Verzeichnis (/DOLIBARR_ROOT/htdocs/...)
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Gib an, ob der Link im selben- oder einem neuen Fenster geladen werden soll.
 BookmarksManagement=Lesezeichen - Verwaltung
diff --git a/htdocs/langs/de_CH/cashdesk.lang b/htdocs/langs/de_CH/cashdesk.lang
index fe9b2f777eb..2c7addd512e 100644
--- a/htdocs/langs/de_CH/cashdesk.lang
+++ b/htdocs/langs/de_CH/cashdesk.lang
@@ -4,5 +4,4 @@ CashDeskBankCheque=Bankkonto(Scheckzahlung)
 TotalTicket=Gesamtanzahl Ticket
 BankToPay=Zahlungskonto
 FilterRefOrLabelOrBC=Suche (Art-Nr./Name)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
 Receipt=Beleg
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index 72c47a659e6..4917657f146 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -135,7 +135,6 @@ MyContacts=Meine Kontakte
 ThisUserIsNot=Dieser Benutzer ist weder ein Lead, Kunde, noch Lieferant
 VATIntraCheckDesc=Der Link <b>%s</b> frägt die MWST - Nummer im Europäischen Verzeichnis (VIES) ab. Deshalb muss die MWST Nummer das Länderprefix haben.
 VATIntraCheckableOnEUSite=Innergemeinschaftliche MWST Nummer überprüfen (EU Website)
-VATIntraManualCheck=MWST - Nummer manuell überprüfen lassen: <a href="%s" target="_blank">%s</a>.
 NorProspectNorCustomer=Weder Interessent noch Kunde
 ProspectLevel=Lead-Potenzial
 ContactPrivate=Privat
diff --git a/htdocs/langs/de_CH/compta.lang b/htdocs/langs/de_CH/compta.lang
index 88d66da5ec6..bd6208b3b00 100644
--- a/htdocs/langs/de_CH/compta.lang
+++ b/htdocs/langs/de_CH/compta.lang
@@ -20,7 +20,6 @@ NoWaitingChecks=Keine Schecks warten auf Einlösung.
 CalcModeVATDebt=Modus <b>%s Mwst. auf Engagement Rechnungslegung %s</b>.
 CalcModeLT2Rec=Modus <b>%sIRPF aufLieferantenrechnungen%s</b>
 LT2ReportByCustomersES=Bericht von Geschäftspartner EKSt.
-VATReportByThirdParties=Sales tax report by third party
 VATReportByCustomersInInputOutputMode=Bericht zur vereinnahmten und bezahlten MwSt. nach Kunden
 ThirdPartyMustBeEditAsCustomer=Geschäftspartner muss als Kunde definiert werden
 Pcg_type=PCG Typ
@@ -28,9 +27,3 @@ Pcg_subtype=PCG Subtyp
 InvoiceLinesToDispatch=versandbereite Rechnungszeilen
 CalculationRuleDesc=Zur Berechnung der Gesamt-MwSt. 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>
 LinkedFichinter=Mit einem Eingriff verknüpfen
-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)
diff --git a/htdocs/langs/de_CH/errors.lang b/htdocs/langs/de_CH/errors.lang
index 0588eceadf0..0e1ae0d6668 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.
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
 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...
diff --git a/htdocs/langs/de_CH/eventorganization.lang b/htdocs/langs/de_CH/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/de_CH/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index 0abad13c945..be466d08b88 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -72,7 +72,6 @@ RequestLastAccessInError=Letzter Datenbankfehler
 ReturnCodeLastAccessInError=Rückgabewert des letzten Datenbankfehlers
 InformationLastAccessInError=Informationen zum letzten Datenbankfehler
 YouCanSetOptionDolibarrMainProdToZero=Für weitere Informationen schaust du in der Logdatei nach, oder setzest in der Konfigurationsdatei die Option $dolibarr_main_prod auf '0'.
-InformationToHelpDiagnose=Diese Informationen helfen dir bei der Fehlersuche. Wenn du das nicht mehr sehen möchtest, setze in der Konfigurationsdatei die Option $dolibarr_main_prod auf '1'.
 LineID=Zeilennummer
 WarningYouHaveAtLeastOneTaskLate=Obacht, mindestens ein Element ist verspätet.
 MediaBrowser=Mediabrowser
@@ -262,6 +261,7 @@ EditHTMLSource=HTML Quelltext bearbeiten
 ByCountry=Nach Land
 ByMonthYear=Von Monat / Jahr
 AdminTools=Administratorwerkzeuge
+ModulesSystemTools=Module Hilfsprogramme
 MyDashboard=Mein Dashboard
 SelectTargetUser=Wähle den Benutzer / Mitarbeiter
 SaveUploadedFileWithMask=Datei auf dem Server speichern mit dem Namen "<strong>%s</strong>" (oder "%s")
@@ -298,7 +298,6 @@ Calendar=Kalender
 GroupBy=Sortieren nach
 ViewFlatList=Einfache Liste anzeigen
 RemoveString=Entferne die Zeichenfolge '%s'
-SomeTranslationAreUncomplete=Du siehst ungenaue Übersetzungen oder unvollständig Übersetzte Sprachen? Hilf uns, das zu verbessern und registriere dich in der <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">Dolibarr - Übersetzungsumgebung</a>, Danke!
 ActualizeCurrency=Aktualisiere Währung
 ModuleBuilder=Modul und Applikationsentwicklungsumgebung
 SetMultiCurrencyCode=Setze Währung
@@ -312,6 +311,7 @@ ConfirmSetToDraft=Bist du sicher, dass du zum Entwurf zurück willst?
 EMailTemplates=E-Mail Vorlagen
 FileNotShared=Die Datei ist nicht öffentlich geteilt.
 LeadOrProject=Lead | Projekt
+LeadsOrProjects=Leads | Projekte
 ListOpenLeads=Offene Leads
 ListOpenProjects=Offene Projekte
 NewLeadOrProject=Neuer Lead / Neues Projekt
@@ -358,6 +358,7 @@ ToApprove=Frei zu geben
 GlobalOpenedElemView=Übersicht
 NoArticlesFoundForTheKeyword=Ich habe für den Begriff '<strong>%s</strong>' nichts finden können...
 NoArticlesFoundForTheCategory=Dieser Kategorie ist nichts zugeordnet...
+ToAcceptRefuse=Zu akzeptieren | ablehnen
 ContactDefault_fichinter=Arbeitseinsatz
 ContactDefault_supplier_proposal=Partnerofferte
 ContactAddedAutomatically=Automatisch generierter Kontakt
@@ -365,4 +366,3 @@ CustomReports=Eigene Berichte
 StatisticsOn=Statistiken zu
 SelectYourGraphOptionsFirst=Wähle den Diagrammtyp
 Measures=Masseinheiten
-Properties=Properties
diff --git a/htdocs/langs/de_CH/members.lang b/htdocs/langs/de_CH/members.lang
index 2940ce947ad..5f8582fe105 100644
--- a/htdocs/langs/de_CH/members.lang
+++ b/htdocs/langs/de_CH/members.lang
@@ -3,7 +3,6 @@ MemberCard=Mitgliederkarte
 SubscriptionCard=Abo-Karte
 ShowMember=Mitgliederkarte anzeigen
 UserNotLinkedToMember=Benutzer nicht mit einem Mitglied verknüpft
-MembersTickets=Membership address sheet
 FundationMembers=Gründungsmitglieder
 ListOfValidatedPublicMembers=Liste der verifizierten öffentlichen Mitglieder
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Ein anderes Mitglied (Name: <b>%s</b>, login: <b>%s</b>) ist schon mit Partner <b>%s</b> verknüpft. Entfernen Sie zuerst die Verknüpfung, da immer nur ein Mitglied zugewiesen sein kann (und umgekehrt).
diff --git a/htdocs/langs/de_CH/modulebuilder.lang b/htdocs/langs/de_CH/modulebuilder.lang
deleted file mode 100644
index 5db0d6ffc2c..00000000000
--- a/htdocs/langs/de_CH/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
diff --git a/htdocs/langs/de_CH/mrp.lang b/htdocs/langs/de_CH/mrp.lang
index 2182dc59f3f..31bf4777657 100644
--- a/htdocs/langs/de_CH/mrp.lang
+++ b/htdocs/langs/de_CH/mrp.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - mrp
 BOMsSetup=Einstellungen Modul Materiallisten (BOM)
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
 DeleteWorkstation=Lösche Gruppe
diff --git a/htdocs/langs/de_CH/orders.lang b/htdocs/langs/de_CH/orders.lang
index af0313f7920..881a8dc7a7f 100644
--- a/htdocs/langs/de_CH/orders.lang
+++ b/htdocs/langs/de_CH/orders.lang
@@ -7,7 +7,6 @@ PdfOrderTitle=Bestellung
 OrderLine=Bestellservice
 OrderDateShort=Bestelldatum
 NewOrder=Neue Bestellung
-SaleOrderLines=Sales order lines
 CustomerOrder=Kundenbestellungen
 CustomersOrdersRunning=Aktuelle Kundenbestellungen
 CustomersOrdersAndOrdersLines=Kundenbestellungen und Details
diff --git a/htdocs/langs/de_CH/other.lang b/htdocs/langs/de_CH/other.lang
index 38836f47cf9..6ea83c112f1 100644
--- a/htdocs/langs/de_CH/other.lang
+++ b/htdocs/langs/de_CH/other.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - other
 NumberingShort=Nr
+Tools=Hilfsprogramme
+TMenuTools=Hilfsprogramme
 ToolsDesc=Alle Werkzeuge, die nicht in anderen Menüeinträgen enthalten sind, werden hier gruppiert. <br> Alle Werkzeuge können über das linke Menü aufgerufen werden.
 Notify_COMPANY_CREATE=Durch Dritte erstellt
 Notify_COMPANY_SENTBYMAIL=Von Geschäftspartner-Karte gesendete Mails
@@ -29,3 +31,4 @@ WebsiteSetup=Einstellungen des Webseitenmoduls
 WEBSITE_PAGEURL=URL für Seite
 WEBSITE_TITLE=Titel
 WEBSITE_KEYWORDS=Stichworte
+CloseDialog =Schliessen
diff --git a/htdocs/langs/de_CH/printing.lang b/htdocs/langs/de_CH/printing.lang
index ab0e4bdf50c..dd46e47f56f 100644
--- a/htdocs/langs/de_CH/printing.lang
+++ b/htdocs/langs/de_CH/printing.lang
@@ -1,10 +1,4 @@
 # 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=Konfigurationsvariablen für den Druckertreiber.
 FileWasSentToPrinter=Die Datei %s wurde an den Drucker gesendet
 ViaModule=über das Druckmodul
diff --git a/htdocs/langs/de_CH/productbatch.lang b/htdocs/langs/de_CH/productbatch.lang
index 368b9da3a4d..89dfe1391d6 100644
--- a/htdocs/langs/de_CH/productbatch.lang
+++ b/htdocs/langs/de_CH/productbatch.lang
@@ -22,7 +22,6 @@ ManageLotMask=Benutzerdefiniertes Schema
 CustomMasks=Option, um für jedes Produkt ein anderes Numerierungsschema zu verwenden
 BatchLotNumberingModules=Numerierungsschema für automatische Lot - Nr. Vergabe
 BatchSerialNumberingModules=Numerierungsschema für automatisch erzeugte Seriennummern (für Produkte mit aktivierter Option, Benutzerdefiniertes Schema)
-QtyToAddAfterBarcodeScan=Einzutragende Menge pro Strichcode / Lot / Seriennummer - Scan
 LifeTime=Gültigkeit (in Tagen)
 EndOfLife=Betriebsende (End of life)
 DestructionDate=Ablaufdatum
diff --git a/htdocs/langs/de_CH/products.lang b/htdocs/langs/de_CH/products.lang
index 0b0ae6a496b..e971ff95919 100644
--- a/htdocs/langs/de_CH/products.lang
+++ b/htdocs/langs/de_CH/products.lang
@@ -127,7 +127,6 @@ MinCustomerPrice=Mindestverkaufspreis
 NoDynamicPrice=Kein variabler Preis
 AddUpdater=Aktualisierung hinzufügen
 VariableToUpdate=Zu aktualisierende Variablen
-IncludingProductWithTag=Including products/services with the tag
 NbOfQtyInProposals=Menge in Angebot
 ClinkOnALinkOfColumn=Auf den Link in Spalte %s klicken um zu den Details zu kommen
 TranslatedLabel=Übersetzte Bezeichnung
@@ -136,4 +135,3 @@ ProductVolume=Volumen für ein Produkt
 WeightUnits=Gewichtseinheit
 VolumeUnits=Volumeneinheit
 SizeUnits=Grösseneinheit
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/de_CH/projects.lang b/htdocs/langs/de_CH/projects.lang
index 9d6d94b34ca..fc00e2d4799 100644
--- a/htdocs/langs/de_CH/projects.lang
+++ b/htdocs/langs/de_CH/projects.lang
@@ -13,6 +13,7 @@ ShowProject=Zeige Projekt
 SetProject=Projekt setzen
 TimeSpentByYou=Dein Zeitaufwand
 MyTimeSpent=Mein Zeitaufwand
+TaskDescription=Aufgaben-Beschreibung
 NewTask=Neue Aufgabe
 MyProjectsArea=Mein Projektbereich
 GoToListOfTimeConsumed=Zur Stundenaufwandsliste wechseln
@@ -27,4 +28,6 @@ InputPerDay=Eingang pro Tag
 InputPerWeek=Eingang pro Woche
 ResourceNotAssignedToProject=Zugewiesen zu Projekt
 ResourceNotAssignedToTheTask=Nicht der Aufgabe zugewiesen
+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 000e19cf02f..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
@@ -28,7 +27,6 @@ StatsOnReceptionsOnlyValidated=Statistik der frei gegebenen Lieferungen nach ihr
 SendReceptionByEMail=Lieferung per E-Mail verschicken.
 SendReceptionRef=Lieferung %s einreichen
 ActionsOnReception=Verknüpfte Ereignisse zur Lieferung
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
 ReceptionLine=Lieferposition
 ProductQtyInReceptionAlreadySent=Bereits verschickte Artikel dieser Bestellung
 ProductQtyInSuppliersReceptionAlreadyRecevied=Bereits erhaltene Artikel dieser Lieferantenbestellung
diff --git a/htdocs/langs/de_CH/sendings.lang b/htdocs/langs/de_CH/sendings.lang
index 5f3fe6c4386..409d44475a7 100644
--- a/htdocs/langs/de_CH/sendings.lang
+++ b/htdocs/langs/de_CH/sendings.lang
@@ -10,7 +10,6 @@ StatusSendingProcessedShort=Fertig
 SendingSheet=Auslieferungen
 WarningNoQtyLeftToSend=Achtung, keine Produkte für den Versand
 ClassifyReception=Lieferung klassifizieren
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
 ProductQtyInShipmentAlreadySent=Bereits verschickte Artikel dieser Bestellung
 DocumentModelTyphon=Vollständig Dokumentvorlage für die Lieferungscheine (Logo, ...)
 SumOfProductVolumes=Summe der Produktevolumen
diff --git a/htdocs/langs/de_CH/stocks.lang b/htdocs/langs/de_CH/stocks.lang
index f1b86f297a2..f3010e3fa44 100644
--- a/htdocs/langs/de_CH/stocks.lang
+++ b/htdocs/langs/de_CH/stocks.lang
@@ -4,7 +4,6 @@ NumberOfProducts=Anzahl der Produkte
 CorrectStock=Lagerbestand anpassen
 TransferStock=Lagerumbuchung
 MassStockTransferShort=Massen Lagerumbuchungen
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
 QtyDispatched=Versandmenge
 DeStockOnShipment=Verringere reale Bestände bei Bestädigung von Lieferungen
 StockOnReception=Lagerbestand anpassen, sobald Lieferung frei gegeben wird.
@@ -22,6 +21,7 @@ CurentlyUsingVirtualStock=Theoretisches Warenlager
 CurentlyUsingPhysicalStock=Physisches Warenlager
 ReceivingForSameOrder=Empfänger zu dieser Bestellung
 StockMovementRecorded=aufgezeichnete Lagerbewegungen
+MovementTransferStock=Umlagerung des Produkt %s in ein anderes Lager
 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>)
diff --git a/htdocs/langs/de_CH/trips.lang b/htdocs/langs/de_CH/trips.lang
index caf9b276e9f..33e5c61c47d 100644
--- a/htdocs/langs/de_CH/trips.lang
+++ b/htdocs/langs/de_CH/trips.lang
@@ -16,9 +16,4 @@ VALIDATOR=verantwortlicher Benutzer für Genehmigung
 AUTHOR=gespeichert von
 BrouillonnerTrip=Spesenabrechnung rückgängig, auf den Status "Entwurf"
 ExpenseReportsToPay=Spesenabrechnungen zu entrichten
-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
 ExpenseReportDateStart=Beginndatum
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 62464563a30..c04ec8771b4 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -26,7 +26,7 @@ Journals=Journale
 JournalFinancial=Finanzjournale
 BackToChartofaccounts=Zurück zum  Kontenplan
 Chartofaccounts=Kontenplan
-ChartOfSubaccounts=Plan der einzelnen Konten
+ChartOfSubaccounts=Plan der einzelnen Nebenkonten
 ChartOfIndividualAccountsOfSubsidiaryLedger=Plan der Einzelkonten des Nebenbuchs
 CurrentDedicatedAccountingAccount=Aktuelles dediziertes Konto
 AssignDedicatedAccountingAccount=Neues Konto zuweisen
@@ -48,7 +48,7 @@ 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 wurden.
+ExportAccountingSourceDocHelp=Mit diesem Tool können Sie die Quellereignisse (Liste in CSV 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
 VueBySubAccountAccounting=Ansicht nach Buchhaltungsunterkonto
@@ -56,7 +56,7 @@ VueBySubAccountAccounting=Ansicht nach Buchhaltungsunterkonto
 MainAccountForCustomersNotDefined=Standardkonto für Kunden im Setup nicht definiert
 MainAccountForSuppliersNotDefined=Standardkonto für Lieferanten die nicht im Setup definiert sind
 MainAccountForUsersNotDefined=Standardkonto für Benutzer ist im Setup nicht definiert
-MainAccountForVatPaymentNotDefined=Standardkonto für MWSt Zahlungen ist im Setup nicht definiert
+MainAccountForVatPaymentNotDefined=Standardkonto für MwSt.-Zahlungen ist im Setup nicht definiert
 MainAccountForSubscriptionPaymentNotDefined=Standardkonto für wiederkehrende Zahlungen ist im Setup nicht definiert
 
 AccountancyArea=Bereich Buchhaltung
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=automatisch zuordnen
-AutomaticBindingDone=automatische Zuordnung erledigt
+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
@@ -387,7 +387,8 @@ 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.
 ## Dictionary
 Range=Bereich von Sachkonten
 Calculated=berechnet
@@ -404,6 +405,7 @@ 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
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Dieses Modul ist leider nicht mit der experimentellen Funktion von Situationsrechnungen kompatibel
 
 ## Import
 ImportAccountingEntries=Buchaltungseinträge
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index a5e4b444618..d2dbd69dd23 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Referenz und Zeitraum des Produkts im PDF aufnehmen
+BoldLabelOnPDF=Fettgedrucktes Label des Produkts im PDF
 Foundation=Stiftung
 Version=Version
 Publisher=Verfasser
@@ -140,7 +142,7 @@ DaylingSavingTime=Sommerzeit (Benutzer)
 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.
-HoursOnThisPageAreOnServerTZ=Warnung: Im Gegensatz zu anderen Darstellungen, sind Stunden auf dieser Seite nicht in Ihrer lokalen Zeitzone, sondern in der Zeitzone des Servers.
+HoursOnThisPageAreOnServerTZ=Warnung: Im Gegensatz zu anderen Darstellungen sind Uhrzeiten auf dieser Seite nicht in Ihrer lokalen Zeitzone, sondern in der Zeitzone des Servers angegeben.
 Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Maximale Zeilenanzahl in Widgets
@@ -207,8 +209,8 @@ IgnoreDuplicateRecords=Doppelte Zeilen Fehler 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
-BoxesDesc=Widgets sind Komponenten, die komprimierte Informationen aus aktivierten Modulen anzeigen können. Mit deren Hilfe können individuelle Dashboards / Startseiten zusammengestellt werden.\nUm ein Widget zu aktivieren klicken sie auf "Aktivieren" im Bereich Verfügbare Widgets.\nUm ein Widget zu deaktivieren klicken sie auf den Papierkorb in der entsprechenden Widget-Zeile im Bereich Aktivierte Widgets.
-OnlyActiveElementsAreShown=Nur Elemente aus <a href="%s">aktiven Module</a> werden angezeigt.
+BoxesDesc=Widgets sind Komponenten, die komprimierte Informationen aus aktivierten Modulen anzeigen können. Mit deren Hilfe können individuelle Dashboards/Startseiten zusammengestellt werden.\nUm ein Widget zu aktivieren klicken sie auf "Aktivieren" im Bereich Verfügbare Widgets.\nUm ein Widget zu deaktivieren klicken sie auf den Papierkorb in der entsprechenden Widget-Zeile im Bereich Aktivierte Widgets.
+OnlyActiveElementsAreShown=Es werden nur Einstellungsmöglichkeiten für <a href="%s">aktive Module</a> angezeigt.
 ModulesDesc=Die Module/Anwendungen bestimmen, welche Funktionen in der Software verfügbar sind. Bei einigen Modulen müssen Benutzern nach Aktivierung des Moduls Berechtigungen erteilt werden. Klicken Sie auf die Ein/Aus-Schaltfläche <span class="small valignmiddle"> %s </span> jedes Moduls, um ein Modul/eine Anwendung zu aktivieren oder zu deaktivieren.
 ModulesDesc2=Klicken Sie auf die Radschaltfläche <span class="small valignmiddle"> %s </span>, um das Modul/die Anwendung zu konfigurieren.
 ModulesMarketPlaceDesc=Sie finden weitere Module auf externen Web-Sites...
@@ -265,8 +267,8 @@ OtherResources=Weitere Ressourcen
 ExternalResources=Externe Ressourcen
 SocialNetworks=Soziale Netzwerke
 SocialNetworkId=ID des sozialen Netzwerks
-ForDocumentationSeeWiki=Für Benutzer-und Entwickler-Dokumentationen und FAQs<br>werfen Sie bitte einen Blick auf die Dolibarr-Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
-ForAnswersSeeForum=Für alle anderen Fragen können Sie das Dolibarr-Forum <br> <a href="%s" target="_blank"><b> %s</b></a> benutzen.
+ForDocumentationSeeWiki=Für Benutzer- oder Entwicklerdokumentation (Doc, FAQs...), <br> schauen Sie in das Dolibarr-Wiki: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
+ForAnswersSeeForum=Für weitere Fragen/Hilfe können Sie das Dolibarr-Forum nutzen: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
 HelpCenterDesc1=In diesem Bereich finden Sie eine Übersicht an verfügbaren Quellen, bei denen Sie im Fall von Problemen und Fragen Unterstützung bekommen können.
 HelpCenterDesc2=Einige dieser Angebote sind nur in <b>Englisch</b> verfügbar. 
 CurrentMenuHandler=Aktuelle Menü-Handler
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Letzte stabile Version
 LastActivationDate=Datum der letzten Aktivierung
 LastActivationAuthor=Benutzer der letzten Aktivierung
 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>
@@ -377,7 +380,7 @@ SeeWikiForAllTeam=Werfen Sie einen Blick auf die Wiki-Seite für eine vollständ
 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
 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.
+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....).
 MinLength=Mindestlänge
 LanguageFilesCachedIntoShmopSharedMemory=.lang-Sprachdateien in gemeinsamen Cache geladen
@@ -405,10 +408,10 @@ PDF=PDF
 PDFDesc=Globale Einstellungen für die PDF-Erzeugung
 PDFOtherDesc=PDF-Option spezifisch für einige Module
 PDFAddressForging=Regeln für die Auswahl der Adressen
-HideAnyVATInformationOnPDF=Alle Informationen zu Steuern und MWSt. im generierten PDF ausblenden
+HideAnyVATInformationOnPDF=Alle Informationen zu Steuern/MwSt. im generierten PDF ausblenden
 PDFRulesForSalesTax=Regeln für Umsatzsteuer/MwSt.
 PDFLocaltax=Regeln für %s
-HideLocalTaxOnPDF=Steuersatz %s in der Spalte Verkauf Steuer / Mwst. ausblenden
+HideLocalTaxOnPDF=Steuersatz %s in der Spalte Verkauf Steuer/MwSt. ausblenden
 HideDescOnPDF=Produktbeschreibung ausblenden
 HideRefOnPDF=Artikelnummer nicht anzeigen
 HideDetailsOnPDF=Details in den Produktpositionen ausblenden
@@ -418,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 (ansonsten nur grau)
+ButtonHideUnauthorized=Verstecke nicht autorisierte Aktionsschaltflächen auch für interne Benutzer (sonst nur grau)
 OldVATRates=Alter Umsatzsteuer-Satz
 NewVATRates=Neuer Umsatzsteuer-Satz
 PriceBaseTypeToChange=Ändern Sie den Basispreis definierte nach
@@ -479,7 +482,7 @@ EraseAllCurrentBarCode=alle aktuellen Barcode-Werte löschen
 ConfirmEraseAllCurrentBarCode=Möchten Sie wirklich alle aktuellen Barcode-Werte löschen?
 AllBarcodeReset=alle Barcode-Werte wurden entfernt
 NoBarcodeNumberingTemplateDefined=Im Barcode-Modul wurde kein Numerierungs-Schema aktiviert.
-EnableFileCache=Dateicache aktivieren
+EnableFileCache=Datei-Cache aktivieren
 ShowDetailsInPDFPageFoot=Weitere Details in der PDF-Fußzeile anzeigen (bspw. Firmenadresse / Name des CEOs)
 NoDetails=Keine weiteren Details in der Fußzeile
 DisplayCompanyInfo=Firmenadresse anzeigen
@@ -636,7 +639,7 @@ Module2000Name=FCKeditor
 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 Aufträge
+Module2300Name=Geplante Aufgaben
 Module2300Desc=Verwaltung geplanter Aufgaben (Cron oder chrono Tabelle)
 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.
@@ -753,7 +756,7 @@ Permission106=Auslieferungen exportieren
 Permission109=Sendungen löschen
 Permission111=Finanzkonten einsehen
 Permission112=Transaktionen erstellen/ändern/löschen und vergleichen
-Permission113=Einstellungen Finanzkonten (erstellen, Kategorien verwalten)
+Permission113=Finanzkonten einrichten (Kategorien von Banktransaktionen erstellen und verwalten)
 Permission114=Transaktionen ausgleichen
 Permission115=Transaktionen und Kontoauszüge exportieren
 Permission116=Transfers zwischen Konten
@@ -762,6 +765,7 @@ 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)
@@ -791,7 +795,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
@@ -889,12 +893,11 @@ Permission701=Spenden anzeigen
 Permission702=Spenden erstellen/bearbeiten
 Permission703=Spenden löschen
 Permission771=Spesenabrechnungen einsehen (eigene und die der Untergebenen)
-Permission772=Spesenabrechnung erstellen/ändern
+Permission772=Spesenabrechnungen erstellen/ändern (für Sie und Ihnen unterstellte Mitarbeiter)
 Permission773=Spesenabrechnung löschen
-Permission774=Spesenabrechnungen einsehen  (Alle Benutzer auch die nicht Untergebenen)
 Permission775=Spesenabrechnung genehmigen
 Permission776=Spesenabrechnung bezahlen
-Permission777=Lesen Sie die Spesenabrechnungen aller
+Permission777=Lesen Sie alle Spesenabrechnungen (auch die von Ihnen nicht unterstellten Mitarbeitern)
 Permission778=Spesenabrechnungen aller erstellen / ändern
 Permission779=Spesenabrechnung exportieren
 Permission1001=Warenbestände einsehen
@@ -958,15 +961,11 @@ 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=Mitarbeiter anzeigen
-Permission4002=Mitarbeiter erstellen
-Permission4003=Mitarbeiter löschen
-Permission4004=Mitarbeiter exportieren
-Permission4010=Kompetenz/Job/Position lesen
-Permission4011=Kompetenz/Job/Position erstellen/ändern
-Permission4012=Kompetenz/Job/Position löschen
-Permission4020=Bewertung lesen
-Permission4021=Bewertung erstellen/ändern
+Permission4001=Kompetenz/Job/Position lesen
+Permission4002=Kompetenz/Job/Position erstellen/ändern
+Permission4003=Kompetenz/Job/Position löschen
+Permission4020=Bewertungen lesen
+Permission4021=Erstellen/ändern Sie Ihre Bewertung
 Permission4022=Bewertung validieren
 Permission4023=Bewertung löschen
 Permission4030=Siehe Vergleichsmenü
@@ -977,11 +976,11 @@ 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) 
 Permission20003=Lösche Urlaubsanträge
-Permission20004=Alle Urlaubsanträge einsehen (von allen Benutzern einschließlich der nicht Untergebenen)
-Permission20005=Urlaubsanträge anlegen/verändern (von allen Benutzern einschließlich der nicht Untergebenen)
-Permission20006=Urlaubstage Administrieren (Setup- und Aktualisierung)
+Permission20004=Alle Urlaubsanträge lesen (auch die von Ihnen nicht unterstellten Mitarbeitern)
+Permission20005=Urlaubsanträge für alle erstellen/ändern (auch für Ihnen nicht unterstellte Mitarbeiter)
+Permission20006=Urlaubsanträge verwalten (Saldo einrichten und aktualisieren)
 Permission20007=Urlaubsanträge genehmigen
-Permission23001=Geplante Aufträge anzeigen
+Permission23001=Geplante Aufgaben anzeigen
 Permission23002=Geplante Aufgaben erstellen/bearbeiten
 Permission23003=Geplante Aufgabe(n) löschen
 Permission23004=Geplante Aufgaben ausführen
@@ -1036,7 +1035,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
@@ -1076,7 +1075,7 @@ BackToModuleList=Zurück zur Modulübersicht
 BackToDictionaryList=Zurück zur Wörterbuchü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. Regelende. <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. Regelende. <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. Regelende. <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. Regelende. <br> In allen anderen Fällen lautet die vorgeschlagene Standardeinstellung Umsatzsteuer = 0. Regelende.
+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.
 VATIsNotUsedDesc=Die vorgeschlagene USt. ist standardmäßig 0 für alle Fälle wie Stiftungen, Einzelpersonen oder Kleinunternehmen.
 VATIsUsedExampleFR=In Frankreich sind damit Unternehmen oder Organisationen gemeint, die ein echtes Steuersystem haben (vereinfacht oder normal). Ein System, in dem die Mehrwertsteuer deklariert wird.
 VATIsNotUsedExampleFR=In Frankreich bedeutet es, dass keine Umsatzsteuer ausgewiesen wird oder Unternehmen, Organisationen oder Freiberufler, die als Kleinunternehmer tätig sind (Privilegiensteuer), Umsatzsteuern zahlen ohne selbst Umsatzsteuer auszuweisen.  Diese Auswahl zeigt den Hinweis "Umsatzsteuer nicht anwendbar - Artikel-293B des CGI" auf Rechnungen an.
@@ -1206,7 +1205,7 @@ Delays_MAIN_DELAY_MEMBERS=Verspäteter Mitgliedsbeitrag
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Scheckeinreichung nicht erfolgt
 Delays_MAIN_DELAY_EXPENSEREPORTS=zu genehmigende Spesenabrechnung
 Delays_MAIN_DELAY_HOLIDAYS=Zu genehmigende Urlaubsanträge
-SetupDescription1=Bevor Sie mit Dolibarr arbeiten können müssen grundlegende Einstellungen getätigt und Module freigeschalten / konfiguriert werden.
+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.
@@ -1250,7 +1249,7 @@ TriggerAlwaysActive=Trigger in dieser Datei sind unabhängig der Modulkonfigurat
 TriggerActiveAsModuleActive=Trigger in dieser Datei sind durch das übergeordnete Modul <b>%s</b> aktiviert.
 GeneratedPasswordDesc=Wählen Sie die Methode für automatisch erzeugte Passwörter.
 DictionaryDesc=Alle Standardwerte einfügen. Sie können eigene Werte zu den Standartwerten hinzufügen.
-ConstDesc=Diese Seite erlaubt es alle anderen Parameter einzustellen (überschreiben), die auf anderen Seiten nicht verfügbar sind. Diese sind meist spezielle Parameter für Entwickler oder für die erweiterte Fehlersuche.
+ConstDesc=Auf dieser Seite können Sie Parameter bearbeiten (überschreiben), die auf anderen Seiten nicht verfügbar sind. Diese Funktion ist für Entwickler und/oder die fortgeschrittene Fehlerbehebung vorgesehen.
 MiscellaneousDesc=Alle anderen sicherheitsrelevanten Parameter werden hier eingestellt.
 LimitsSetup=Einstellungen zu Dezimalstellen und Rundung
 LimitsDesc=Hier können Sie die von Dolibarr verwendeten Grenzwerte, Genauigkeiten und Optimierungen definieren
@@ -1293,10 +1292,10 @@ MeteoStdMod=Standart Modus
 MeteoStdModEnabled=Standardmodus aktiviert
 MeteoPercentageMod=Prozentmodus
 MeteoPercentageModEnabled=Prozentmodus aktiviert
-MeteoUseMod=Ancklicken um %s zu verwenden
+MeteoUseMod=Anklicken um %s zu verwenden
 TestLoginToAPI=Testen Sie sich anmelden, um API
 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 / interner Zugriff
+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_PORT=Proxyserver: Port
@@ -1358,9 +1357,9 @@ BrowserIsOK=Sie verwenden %s als Webbrowser. Dieser ist hinsichtlich Sicherheit
 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=Anzeigen der Info-Liste mit Kunden- / Lieferantenreferenz (Auswahlliste oder Combobox) und die meisten Hyperlinks. <br> Drittanbieter werden mit dem Namensformat "CC12345 - SC45678 - The Big Company corp." anstelle von "The Big Company corp" angezeigt.
-AddVatInList=Umsatzsteuer-Identifikationsnummer des Kunden/Lieferanten anzeigen. Info-Liste (Auswahlliste oder Combobox).
-AddAdressInList=Anzeigen der Info-Liste mit Kunden- / Lieferantenadressen (Auswahlliste oder Kombinationsfeld) <br> Dritte werden mit dem Namensformat "The Big Company Corp. - 21 jump street 123456 Big Town - USA" anstelle von "The Big Company Corp." angezeigt.
+AddRefInList=Kunden-/Lieferanten-Ref. in Auswahllisten anzeigen. <br> Geschäftspartner werden mit dem Namensformat "CC12345 - SC45678 - The Big Company corp." angezeigt statt "The Big Company Corp".
+AddVatInList=Umsatzsteuer-ID des Kunden/Lieferanten in Auswahllisten anzeigen.
+AddAdressInList=Kunden-/Lieferantenadresse in Auswahllisten anzeigen. <br> Geschäftspartner werden mit dem Namensformat "The Big Company corp. - 21 jump street 123456 Big town - USA" anstelle von "The Big Company corp" angezeigt.
 AddEmailPhoneTownInContactList=Kontakt-E-Mail (oder Telefone, falls nicht definiert) und Stadtinfo-Liste (Auswahlliste oder Combobox) anzeigen <br> Kontakte werden mit dem Namensformat "Dupond Durand - dupond.durand@email.com - Paris" oder "Dupond Durand - 06 07" angezeigt 59 65 66 - Paris "statt" Dupond Durand ".
 AskForPreferredShippingMethod=Nach der bevorzugten Versandart für Drittanbieter fragen.
 FieldEdition=Bearbeitung von Feld %s
@@ -1446,14 +1445,14 @@ OrdersNumberingModules=Nummernvergabe für Aufträge/Bestellungen
 OrdersModelModule=Dokumentenvorlage(n)
 FreeLegalTextOnOrders=Freier Rechtstext auf Bestellungen
 WatermarkOnDraftOrders=Wasserzeichen auf Bestellentwurf  (leerlassen wenn keines benötigt wird)
-ShippableOrderIconInList=In Auftragsliste ein entsprechendes Icon zufügen, wenn die Bestellung versandbereit ist
+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
 ##### Interventions #####
 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
@@ -1633,12 +1632,12 @@ CacheByClient=Vom Browser zwischengespeichert
 CompressionOfResources=Komprimierung von HTTP Antworten
 CompressionOfResourcesDesc=Zum Beispiel mit der Apache Anweisung "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Automatische Erkennung mit den aktuellen Browsern nicht möglich
-DefaultValuesDesc=Hier können Sie den Standardwert definieren, den Sie beim Erstellen eines neuen Datensatzes verwenden möchten, und / oder Standardfilter oder die Sortierreihenfolge beim Auflisten von Datensätzen.
+DefaultValuesDesc=Hier können Sie den Standardwert definieren, den Sie beim Erstellen eines neuen Datensatzes verwenden möchten, und/oder Standardfilter oder die Sortierreihenfolge beim Auflisten von Datensätzen.
 DefaultCreateForm=Vorgabewerte für die Verwendung in Formularen
-DefaultSearchFilters=Standard Suchfilter
+DefaultSearchFilters=Standardsuchfilter
 DefaultSortOrder=Standardsortierreihenfolge
 DefaultFocus=Standardfokusfeld
-DefaultMandatory=Formularfelder die ausgefüllt werden müssen
+DefaultMandatory=Pflichtfelder in Formularen
 ##### Products #####
 ProductSetup=Produktmoduleinstellungen
 ServiceSetup=Modul Leistungen - Einstellungen
@@ -1708,8 +1707,9 @@ MailingDelay=Wartezeit in Sekunden, bevor die nächste Nachricht gesendet wird
 NotificationSetup=E-Mail Benachrichtigungs-Einstellungen
 NotificationEMailFrom=Standard-Absender-E-Mail-Adresse des Kampagnen-Moduls
 FixedEmailTarget=Empfänger
-NotificationDisableConfirmMessageFix=Info-Anzeige zu Benachrichtigungen an festgelegte E-Mail-Adressen deaktivieren
-NotificationDisableConfirmMessageUser=Info-Anzeige zu Benachrichtigungen an Benutzer deaktivieren
+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
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Freier Rechtstext auf Empfangsbelegen
 ##### FCKeditor #####
 AdvancedEditor=Erweiterter Editor
 ActivateFCKeditor=FCKEditor aktivieren für:
-FCKeditorForNotePublic=WYSIWIG Erstellung/Bearbeitung des Feldes öffentliche Notizen von Elementen
-FCKeditorForNotePrivate=WYSIWIG Erstellung/Bearbeitung des Feldes private Notizen von Elementen
+FCKeditorForNotePublic=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>
@@ -1884,7 +1884,7 @@ DeleteFiscalYear=Buchhaltungs Periode löschen
 ConfirmDeleteFiscalYear=Möchten Sie diese Buchungsperiode wirklich löschen?
 ShowFiscalYear=Zeige Buchhaltungs Periode
 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)
+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
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Einrichtung vom Modul Spesenabrechnungen - Regeln
 ExpenseReportNumberingModules=Modul zur Nummerierung von Spesenabrechnungen
 NoModueToManageStockIncrease=Kein Modul zur automatische Bestandserhöhung ist aktiviert. Lager Bestandserhöhung kann nur durch manuelle Eingabe erfolgen.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Möglicherweise finden Sie Optionen für E-Mail-Benachrichtigungen, indem Sie das Modul "Benachrichtigung" aktivieren und konfigurieren.
+TemplatesForNotifications=Vorlagen für Benachrichtigungen
 ListOfNotificationsPerUser=Liste der automatischen Benachrichtigungen nach Benutzer*
 ListOfNotificationsPerUserOrContact=Liste möglicher automatischer Benachrichtigungen (bei Geschäftsereignissen) verfügbar pro Benutzer * oder pro Kontakt **
 ListOfFixedNotifications=Liste der automatischen festen Benachrichtigungen
@@ -1916,6 +1917,8 @@ 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)
+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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Möchten Sie den Einsammelvorgang für diesen eMail
 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)
-RecordEvent=eMail-Ereignis aufzeichnen/registrieren
-CreateLeadAndThirdParty=als potentiellen Verkaufskontakt anlegen
-CreateTicketAndThirdParty=Ticket erstellen (und mit einem Dritten verknüpfen, wenn es von einem vorherigen Vorgang geladen wurde)
+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)
 CodeLastResult=Letzter Resultatcode
 NbOfEmailsInInbox=Anzahl E-Mails im Quellverzeichnis
 LoadThirdPartyFromName=Drittanbieter-Suche auf %s laden (nur laden)
 LoadThirdPartyFromNameOrCreate=Drittanbieter-Suche auf %s laden (erstellen, wenn nicht gefunden)
+AttachJoinedDocumentsToObject=Speichern Sie angehängte Dateien als Dokumente eines Objekts, wenn die Referenz des Objekts im Betreff der E-Mail gefunden wird.
 WithDolTrackingID=Nachricht einer Unterhaltung die durch eine erste von Dolibarr gesendete E-Mail initiiert wurde 
 WithoutDolTrackingID=Nachricht einer Unterhaltung die NICHT durch eine erste von Dolibarr gesendete E-Mail initiiert wurde 
 WithDolTrackingIDInMsgId=Nachricht von Dolibarr gesendet
@@ -2078,7 +2082,7 @@ CreateCandidature=Stellen-Bewerbung erstellen
 FormatZip=Zip
 MainMenuCode=Menüpunktcode (Hauptmenü)
 ECMAutoTree=Automatischen ECM-Baum anzeigen
-OperationParamDesc=Definieren Sie die Werte, die für das Objekt der Aktion verwendet werden sollen, oder wie Werte extrahiert werden sollen. Beispiel: <br> objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Verwenden Sie a; char als Trennzeichen zum Extrahieren oder Festlegen mehrerer Eigenschaften.
+OperationParamDesc=Definieren Sie die Regeln, die zum Extrahieren oder Festlegen von Werten verwendet werden sollen. <br> Beispiel für Operationen, die einen Namen aus dem E-Mail-Betreff extrahieren: <br> name=EXTRACT:SUBJECT:Message_from_company ([^]*) <br> Beispiel für Operationen, die Objekte erstellen:<br>objproperty1=SET:der_zu_setzende_Wert <br>objproperty2=SET:ein_Wert,_der_auch__objproperty1__ enthalten_kann<br>obproperty3=SETIFEMPTY:verwendeter_Wert_wenn_objproperty3_nicht_definiert_ist<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>  object.objproperty5=EXTRACT:BODY:Mein Firmenname ist\\s( [^\\s]*)<br><br> Verwenden Sie ein ; als Trennzeichen, um mehrere Eigenschaften zu extrahieren oder festzulegen.
 OpeningHours=Öffnungszeiten
 OpeningHoursDesc=Geben sie hier die regulären Öffnungszeiten ihres Unternehmens an.
 ResourceSetup=Konfiguration vom Ressourcenmodul
@@ -2124,7 +2128,7 @@ LargerThan=Größer als
 IfTrackingIDFoundEventWillBeLinked=Beachten Sie, dass das erstellte Ereignis automatisch mit dem bekannten verwandten Objekt verknüpft wird, wenn eine Tracking-ID eines Objekts in einer E-Mail gefunden wird oder wenn die E-Mail eine Antwort auf eine E-Mail ist, die bereits gesammelt und mit einem Objekt verknüpft wurde.
 WithGMailYouCanCreateADedicatedPassword=Wenn Sie bei einem GMail-Konto die 2-stufige Validierung aktiviert haben, wird empfohlen, ein spezielles zweites Passwort für die Anwendung zu erstellen, anstatt Ihr eigenes Konto-Passwort von https://myaccount.google.com/. zu verwenden.
 EmailCollectorTargetDir=Es kann ein erwünscht sein, die E-Mail in ein anderes Tag / Verzeichnis zu verschieben, wenn sie erfolgreich verarbeitet wurde. Legen Sie hier einfach den Namen des Verzeichnisses fest, um diese Funktion zu verwenden (verwenden Sie KEINE Sonderzeichen im Namen). Beachten Sie, dass Sie auch ein Lese- / Schreib-Anmeldekonto verwenden müssen.
-EmailCollectorLoadThirdPartyHelp=Mit dieser Aktion können Sie den E-Mail-Inhalt verwenden, um einen vorhandenen Geschäftspartner in Ihrer Datenbank zu finden und zu bearbeiten. Der gefundene (oder neu erstellte) Geschäftspartner wird durch die nachfolgenden Aktionen modifiziert. <br> Wenn Sie beispielsweise aus einer empfangenen E-Mail, in der die Zeichenfolge "Name: Peter Lustig" vorkommt, einen Geschäftspartner erstellen möchten, können Sie seinen Namen und seine E-Mail-Adresse durch das entsprechende Setzen der Parameter aus der E-Mail extrahieren: <br> 'email=HEADER: ^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
+EmailCollectorLoadThirdPartyHelp=Mit dieser Aktion können Sie den E-Mail-Inhalt verwenden, um einen vorhandenen Geschäftspartner in Ihrer Datenbank zu finden und zu bearbeiten. Der gefundene (oder neu erstellte) Geschäftspartner wird durch die nachfolgenden Aktionen modifiziert. <br> Wenn Sie beispielsweise aus einer empfangenen E-Mail, in der die Zeichenfolge "Name: Max Mustermann" vorkommt, einen Geschäftspartner erstellen möchten, können Sie seinen Namen und seine E-Mail-Adresse durch das entsprechende Setzen der Parameter aus der E-Mail extrahieren: <br> 'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
 EndPointFor=Endpunkt für %s:%s
 DeleteEmailCollector=Lösche eMail-Collector
 ConfirmDeleteEmailCollector=Sind Sie sicher, dass Sie diesen eMail-Collector löschen wollen?
@@ -2209,3 +2213,10 @@ SkinAndColors=Oberfläche und Farben
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Wenn Sie eine zweite Steuer verwenden möchten, müssen Sie auch die erste Umsatzsteuer aktivieren
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Wenn Sie eine dritte Steuer verwenden möchten, müssen Sie auch die erste Umsatzsteuer aktivieren
 PDF_USE_1A=PDF im PDF/A-1b-Format generieren
+MissingTranslationForConfKey = Fehlende Übersetzung für %s
+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
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 1cf690e8154..16c4bf5700c 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Kontonummer
 IBAN=IBAN
 BIC=BIC / SWIFT-Code
 SwiftValid=BIC / SWIFT-Code gültig
-SwiftVNotalid=BIC / SWIFT-Code ungültig
+SwiftNotValid=BIC / SWIFT-Code ungültig
 IbanValid=Bankkonto gültig
 IbanNotValid=Bankkonto nicht gültig
 StandingOrders=Lastschriften
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Kontoadresse
 BankAccountCountry=Bankkonto Land
 BankAccountOwner=Kontoinhaber
 BankAccountOwnerAddress=Kontoinhaber-Adresse
-RIBControlError=Integritätsprüfung der Werte fehlgeschlagen. Dies bedeutet, dass die Informationen für diese Kontonummer nicht vollständig oder falsch sind (Land, Nummern und IBAN prüfen).
 CreateAccount=Konto erstellen
 NewBankAccount=Neues Konto
 NewFinancialAccount=Neues Finanzkonto
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 300ad42378f..6eec6f79952 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -82,10 +82,9 @@ PaymentsAlreadyDone=Bereits getätigte Zahlungen
 PaymentsBackAlreadyDone=Rückerstattungen bereits erledigt
 PaymentRule=Zahlungsregel
 PaymentMode=Zahlungsart
+PaymentModes=Zahlungsarten
 DefaultPaymentMode=Standardzahlungsart
 DefaultBankAccount=Standardbankkonto
-PaymentTypeDC=Debit- / Kreditkarte
-PaymentTypePP=PayPal
 IdPaymentMode=Zahlungsart (ID)
 CodePaymentMode=Zahlungsart (Code)
 LabelPaymentMode=Zahlungsart (Label)
@@ -280,6 +279,7 @@ SetMode=Zahlungsart definieren
 SetRevenuStamp=Steuermarke setzen
 Billed=In Rechnung gestellt
 RecurringInvoices=Wiederkehrende Rechnungen
+RecurringInvoice=Wiederkehrende Rechnung
 RepeatableInvoice=Rechnungs-Vorlage
 RepeatableInvoices=Rechnungs-Vorlagen
 Repeatable=Vorlage
@@ -344,7 +344,7 @@ InvoiceNote=Hinweis zur Rechnung
 InvoicePaid=Rechnung bezahlt
 InvoicePaidCompletely=Komplett bezahlt
 InvoicePaidCompletelyHelp=Rechnungen die komplett bezahlt sind. Davon ausgenommen sind Rechnungen, die teilweise bezahlt werden. Verwenden Sie einen Filter für den Rechnungsstatus, um eine Liste aller abgeschlossenen oder nicht abgeschlossenen Rechnungen zu erhalten.
-OrderBilled=Bestellung in Rechnung gestellt
+OrderBilled=Auftrag in Rechnung gestellt
 DonationPaid=Spende bezahlt
 PaymentNumber=ZahlungsNr.
 RemoveDiscount=Rabatt entfernen
@@ -449,6 +449,8 @@ PaymentTypeTRA=Scheck
 PaymentTypeShortTRA=Scheck
 PaymentTypeFAC=Nachnahme
 PaymentTypeShortFAC=Briefträger
+PaymentTypeDC=Debit- / Kreditkarte
+PaymentTypePP=PayPal
 BankDetails=Bankverbindung
 BankCode=Bankleitzahl
 DeskCode=Desk-Code
@@ -604,3 +606,4 @@ SituationTotalProgress=Gesamtfortschritt %d %%
 SearchUnpaidInvoicesWithDueDate=Suche unbezahlte Rechnungen mit Fälligkeitsdatum = %s
 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
diff --git a/htdocs/langs/de_DE/blockedlog.lang b/htdocs/langs/de_DE/blockedlog.lang
index a9cadcb60c7..5f02fb8ed77 100644
--- a/htdocs/langs/de_DE/blockedlog.lang
+++ b/htdocs/langs/de_DE/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Liste der Länder, in denen die Verwendung
 OnlyNonValid=Nicht-bestätigt
 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 einige Aufzeichnungen durchgeführt wurden. Wir haben einen speziellen 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/bookmarks.lang b/htdocs/langs/de_DE/bookmarks.lang
index eb9284c2544..ffd5c5d9044 100644
--- a/htdocs/langs/de_DE/bookmarks.lang
+++ b/htdocs/langs/de_DE/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=Link
 BehaviourOnClick=Öffnungsverhalten
 CreateBookmark=Lesezeichen erstellen
 SetHereATitleForLink=Erfassen Sie hier einen Namen für das Lesezeichen
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Verwenden Sie einen externen / absoluten Link (z.B.: https://URL) oder Links relativ zum Systempfad (z.B.: /DOLIBARR_ROOT/htdocs/...)
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Verwenden Sie einen externen/absoluten Link (https://externalurl.com) oder einen internen/relativen Link (/mypage.php). Sie können auch eine Telefonnummer wie tel:0123456 verwenden.
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Wählen Sie aus, ob die verlinkte Seite auf der aktuellen Registerkarte oder auf einer neuen Registerkarte geöffnet werden soll.
 BookmarksManagement=Verwalten von Lesezeichen
 BookmarksMenuShortCut=STRG + Umschalt + m
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index e6716190fe8..06a3fabd926 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -4,7 +4,7 @@ BoxLoginInformation=Anmeldeinformationen
 BoxLastRssInfos=Informationen RSS Feed
 BoxLastProducts=%s zuletzt bearbeitete Produkte/Leistungen
 BoxProductsAlertStock=Bestandeswarnungen für Produkte
-BoxLastProductsInContract=Zuletzt in Verträgen aufgenomme Produkte/Leistungen (maximal %s)
+BoxLastProductsInContract=Zuletzt in Verträgen aufgenommene Produkte/Leistungen (maximal %s)
 BoxLastSupplierBills=neueste Lieferantenrechnungen
 BoxLastCustomerBills=neueste Kundenrechnungen
 BoxOldestUnpaidCustomerBills=älteste unbezahlte Kundenrechnungen
@@ -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.
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index 760757212aa..bc54cc2f448 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -74,7 +74,7 @@ CatProdList=Liste der Produktkategorien
 CatMemberList=Liste der Mitgliederkategorien
 CatContactList=Liste der Schlagwörter / Kategorien für Kontakte
 CatProjectsList=Liste der Schlagwörter / Kategorien für Projekte
-CatUsersList=Liste der Schlagwörter/Kategorien für Benutzer
+CatUsersList=Liste der Schlagwörter / Kategorien für Benutzer
 CatSupLinks=Verknüpfungen zwischen Anbietern und Schlagwörter / Kategorien
 CatCusLinks=Verbindung zwischen Kunden-/Leads und Kategorien
 CatContactsLinks=Verknüpfungen zwischen Kontakten/Adressen und Tags/Kategorien
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index ff5e08e892d..500642bc9c8 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Prof. Id 1 (Handelsregister)
+ProfId2CM=Prof. Id 2 (Steuer-Nr./Steuer-ID)
+ProfId3CM=Prof. Id 3 (Handelsregister-Nr.)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Handelsregister
+ProfId2ShortCM=Steuer-Nr./Steuer-ID
+ProfId3ShortCM=Handelsregister-Nr.
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Prüfen
 VATIntraCheckDesc=Die Umsatzsteuer-ID muss das Länderpräfix enthalten. Der Link <b> %s </b> startet eine Anfrage am MwSt-Informationsaustauschsystem (MIAS) der Europäischen Kommission. Hierfür ist ein ein Internetzugang vom Dolibarr-Server erforderlich.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Überprüfungsergebnis des MwSt-Informationsaustauschsystems (MIAS)
-VATIntraManualCheck=Sie können die Überprüfung auch manuell auf der Internetseite der Europäische Kommission durchführen: <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=Sie können die Überprüfung auch manuell auf der Internetseite der Europäische Kommission durchführen: <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Anfrage nicht möglich. Überprüfungsdienst wird vom Mitgliedsland nicht angeboten (%s).
 NorProspectNorCustomer=kein Interessent / kein Kunde
 JuridicalStatus=Unternehmensform
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index 26aaba1ccb7..6868e1dd00d 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -170,8 +170,9 @@ SeeReportInInputOutputMode=Siehe <b> %sAnalyse der Zahlungen%s </b> für eine Be
 SeeReportInDueDebtMode=Siehe <b> %sAnalyse aufgezeichneter Dokumente%s </b> für eine Berechnung basierend auf bekannten <b> aufgezeichneten Dokumenten </b>, auch wenn diese noch nicht ins Hauptbuch übernommen wurden.
 SeeReportInBookkeepingMode=Siehe <b> %sAnalyse des Buchhaltungsbuchs-Tabelle%s </b> für einen Bericht basierend auf <b>Buchhaltungstabelle </b>
 RulesAmountWithTaxIncluded=- Angezeigte Beträge enthalten alle Steuern
-RulesResultDue=- Es beinhaltet ausstehende Rechnungen, Ausgaben, Mehrwertsteuer, Spenden, ob sie bezahlt sind oder nicht. Es sind auch bezahlte Gehälter enthalten. <br> - Es basiert auf dem Rechnungsdatum von Rechnungen und dem Fälligkeitsdatum für Ausgaben oder Steuerzahlungen. Für Gehälter, die mit dem Modul Gehalt definiert wurden, wird der Wert Datum der Zahlung verwendet.
-RulesResultInOut=- Es sind nur tatsächliche Zahlungen für Rechnungen, Kostenabrechnungen, USt und Gehälter enthalten. <br>- Bei Rechnungen, Kostenabrechnungen, USt und Gehälter gilt das Zahlugnsdatum. Bei Spenden gilt das Spendendatum.
+RulesAmountWithTaxExcluded=- Die ausgewiesenen Rechnungsbeträge verstehen sich ohne Steuern
+RulesResultDue=- Es beinhaltet alle Rechnungen, Ausgaben, Mehrwertsteuer, Spenden, Gehälter, unabhängig davon, ob sie bezahlt wurden oder nicht. <br> - Es basiert auf dem Fälligkeitsdatum von Rechnungen und dem Fälligkeitsdatum für Spesen oder Steuerzahlungen. Für Gehälter wird das Datum des Periodenendes verwendet.
+RulesResultInOut=- Es enthält die tatsächlichen Zahlungen auf Rechnungen, Ausgaben, Mehrwertsteuer und Gehälter. <br> - Es basiert auf den Zahlungsterminen der Rechnungen, Spesen, Mehrwertsteuer, Spenden und Gehälter.
 RulesCADue=- Es enthält die fälligen Rechnungen des Kunden, ob diese bezahlt sind oder nicht. <br> - Es basiert auf dem Rechnungsdatum dieser Rechnungen. <br>
 RulesCAIn=- Es umfasst alle effektiven Zahlungen von Rechnungen, die von Kunden erhalten wurden. <br> - Es basiert auf dem Zahlungsdatum dieser Rechnungen. <br>
 RulesCATotalSaleJournal=Es beinhaltet alle Gutschriftspositionen aus dem Verkaufsjournal.
@@ -295,3 +296,5 @@ InvoiceNotLate30Days = Demnächst fällig (> 30 Tage)
 InvoiceToPay=Zu zahlen (< 15 Tage)
 InvoiceToPay15Days=Zu zahlen (15 bis 30 Tage)
 InvoiceToPay30Days=Zu zahlen (> 30 Tage)
+ConfirmPreselectAccount=Buchhaltungscode vorbelegen
+ConfirmPreselectAccountQuestion=Möchten Sie die %s ausgewählten Zeilen wirklich mit diesem Buchhaltungscode vorbelegen?
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 6394ecf1842..5b7db2999ca 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -27,7 +27,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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=RSS-Feeds welche Fehler erhalten. Versuchen Sie die Kon
 ErrorForbidden=Zugriff verweigert.<br>Sie haben versucht eine Seite, Bereich oder Funktion aufzurufen die deaktiviert ist oder sie haben keine Berechtigung dazu.
 ErrorForbidden2=Die Zugriffsberechtigungen für diese Anmeldung kann Ihr Administrator unter %s->%s einstellen.
 ErrorForbidden3=Es scheint keine ordnungsgemäße 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...)
+ErrorForbidden4=Hinweis: Löschen Sie Ihre Browser-Cookies, um bestehende Sitzungen für diese Anmeldung zu löschen.
 ErrorNoImagickReadimage=Imagick_readimage Funktion in dieser PHP-Version nicht vorhanden. Vorschaubilder sind nicht möglich. Administratoren können diese Registerkarte unter Einstellungen-Display ausblenden.
 ErrorRecordAlreadyExists=Datensatz bereits vorhanden
 ErrorLabelAlreadyExists=Dieses Label existiert schon
@@ -271,6 +274,9 @@ 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ß
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ihr PHP Parameter upload_max_filesize (%s) ist größer als Parameter post_max_size (%s). Dies ist eine inkonsistente Einstellung.
@@ -312,6 +318,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..d5b08831e2b 100644
--- a/htdocs/langs/de_DE/eventorganization.lang
+++ b/htdocs/langs/de_DE/eventorganization.lang
@@ -44,10 +44,10 @@ EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Vorlage einer E-Mail, die nach Erhal
 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
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Bezahlung Ihres Standes
 EventOrganizationEmailRegistrationPayment = Anmeldung zu einer Veranstaltung
 EventOrganizationMassEmailAttendees = Kommunikation mit den Teilnehmern
 EventOrganizationMassEmailSpeakers = Kommunikation mit den Sprechern
+ToSpeakers=An Redner
 
 #
 # Event
@@ -83,14 +84,14 @@ PriceOfRegistration=Buchungskosten 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 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
+EVENTORGANIZATION_SECUREKEY = Seed, um den Schlüssel für die öffentliche Registrierungsseite zu sichern, die zum Vorschlagen eines Vortrags dient
 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
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service, der für die Rechnungszeile über eine Teilnahmebuchung einer Veranstaltung verwendet wird
 NbVotes=Anzahl der Stimmen
 #
 # Status
diff --git a/htdocs/langs/de_DE/exports.lang b/htdocs/langs/de_DE/exports.lang
index 90d1a1f9afe..4f9e5bfd08a 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
diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang
index e72e286bda8..16eb2a417bd 100644
--- a/htdocs/langs/de_DE/holiday.lang
+++ b/htdocs/langs/de_DE/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Beschreibung
 SendRequestCP=Entwurf erstellen
 DelayToRequestCP=Urlaubsanträge müssen mindestens <b>%s Tage</b> im voraus gestellt werden.
 MenuConfCP=Verwaltung Urlaubsanspruch
-SoldeCPUser=Ihr aktueller Urlaubssaldo beträgt <b>%s</b> Tag(e).
+SoldeCPUser=Urlaubssaldo (in Tagen) <b> %s </b>
 ErrorEndDateCP=Sie müssen ein Urlaubsende-Datum wählen, dass nach dem Urlaubsbeginn-Datum liegt.
 ErrorSQLCreateCP=Ein SQL Fehler trat auf bei der Erstellung von:
 ErrorIDFicheCP=Fehler aufgetreten: der Urlaubsantrag existiert nicht.
@@ -134,3 +134,6 @@ HolidaysToApprove=Urlaubstage zu genehmigen
 NobodyHasPermissionToValidateHolidays=Niemand hat die Erlaubnis, Urlaubstage zu bestätigen.
 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/install.lang b/htdocs/langs/de_DE/install.lang
index 5ef328501ed..4126c1a48d6 100644
--- a/htdocs/langs/de_DE/install.lang
+++ b/htdocs/langs/de_DE/install.lang
@@ -21,6 +21,7 @@ ErrorPHPDoesNotSupportCurl=Ihre PHP-Version unterstützt die Erweiterung Curl ni
 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.
diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang
index 5bb4fcc450d..51748b383f9 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,8 +13,8 @@ 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?
@@ -24,32 +24,32 @@ NameAndSignatureOfInternalContact=Name und Unterschrift des Mitarbeiters:
 NameAndSignatureOfExternalContact=Name und Unterschrift des Kunden:
 DocumentModelStandard=Standard-Dokumentvorlage 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
+PrintProductsOnFichinter=Auch Produktzeilen (nicht nur Leistungen) auf dem Serviceauftragsdokument drucken
+PrintProductsOnFichinterDetails=Aus Kundenaufträgen erstellte Serviceaufträge
 UseServicesDurationOnFichinter=Standard-Wert der Dauer für diesen Service aus dem Auftrag übernehmen
 UseDurationOnFichinter=Feld 'Dauer' für Einsatzeinträge 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)
+NbOfinterventions=Anzahl Dokumente für Serviceaufträge
+NumberOfInterventionsByMonth=Anzahl Dokumente 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.
 InterId=Serviceauftrag ID
 InterRef=Serviceauftrag Ref.
@@ -57,12 +57,12 @@ 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
+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
diff --git a/htdocs/langs/de_DE/knowledgemanagement.lang b/htdocs/langs/de_DE/knowledgemanagement.lang
index 2237b64d1e5..9b2f1404101 100644
--- a/htdocs/langs/de_DE/knowledgemanagement.lang
+++ b/htdocs/langs/de_DE/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+SetObsolete=Als veraltet festlegen
+ConfirmCloseKM=Bestätigen Sie das Schließen dieses Artikels als veraltet?
+ConfirmReopenKM=Möchten Sie diesen Artikel auf den Status "Validiert" zurücksetzen?
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index deb20665474..686ec747389 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Fehler, keine MwSt.-Sätze für Land  '%s'
 ErrorNoSocialContributionForSellerCountry=Fehler, Sozialabgaben/Steuerwerte für Staat '%s' nicht definiert.
 ErrorFailedToSaveFile=Fehler, konnte Datei nicht speichern.
 ErrorCannotAddThisParentWarehouse=Sie versuchen ein Hauptlager hinzuzufügen, das bereits ein Unterlager eines existierenden Lagerortes ist 
+FieldCannotBeNegative=Feld "%s" darf nicht negativ sein
 MaxNbOfRecordPerPage=Max. Anzahl der Datensätze pro Seite
 NotAuthorized=Sie haben keine Berechtigung dazu.
 SetDate=Datum
@@ -87,7 +88,7 @@ FileWasNotUploaded=Ein Dateianhang wurde gewählt aber noch nicht hochgeladen. K
 NbOfEntries=Anz. an Einträgen
 GoToWikiHelpPage=Onlinehilfe lesen (Internetzugang notwendig)
 GoToHelpPage=Hilfe lesen
-DedicatedPageAvailable=Es gibt eine spezielle Hilfeseite, die sich auf Ihren aktuellen Bildschirm bezieht
+DedicatedPageAvailable=Spezifische Hilfeseite zur aktuellen Anzeige
 HomePage=Startseite
 RecordSaved=Eintrag gespeichert
 RecordDeleted=Eintrag gelöscht
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Rückgabewert des letzten fehlerhaften Datenbankzugr
 InformationLastAccessInError=Information zum letzten fehlerhaften Datenbankzugriff
 DolibarrHasDetectedError=Das System hat einen technischen Fehler festgestellt
 YouCanSetOptionDolibarrMainProdToZero=Sie können die Protokolldatei lesen oder die Option $dolibarr_main_prod in Ihrer Konfigurationsdatei auf '0' setzen, um weitere Informationen zu erhalten.
-InformationToHelpDiagnose=Diese Informationen können bei der Fehlersuche hilfreich sein (Hinweise können entfernt werden indem $dolibarr_main_prod auf '1' gesetzt wird)
+InformationToHelpDiagnose=Diese Informationen können für Diagnosezwecke nützlich sein (Sie können die Option $dolibarr_main_prod auf '1' setzen, um sensible Informationen auszublenden)
 MoreInformation=Weitere Informationen
 TechnicalInformation=Technische Information
 TechnicalID=Technische ID
@@ -211,6 +212,8 @@ User=Benutzer
 Users=Benutzer
 Group=Gruppe
 Groups=Gruppen
+UserGroup=Benutzergruppe
+UserGroups=Benutzergruppen
 NoUserGroupDefined=Keine Benutzergruppe definiert
 Password=Passwort
 PasswordRetype=Geben Sie das Passwort noch einmal ein
@@ -416,7 +419,7 @@ HT=Netto
 TTC=Brutto
 INCVATONLY=Inkl. USt.
 INCT=Inkl. aller Steuern
-VAT=Umsatzsteuer
+VAT=USt.
 VATIN=IGST
 VATs=Mehrwertsteuern
 VATINs=IGST Steuern
@@ -603,14 +606,14 @@ MonthShort10=Okt
 MonthShort11=Nov
 MonthShort12=Dez
 MonthVeryShort01=J
-MonthVeryShort02=Fr
-MonthVeryShort03=Mo
+MonthVeryShort02=F
+MonthVeryShort03=M
 MonthVeryShort04=A
-MonthVeryShort05=Mo
+MonthVeryShort05=M
 MonthVeryShort06=J
 MonthVeryShort07=J
 MonthVeryShort08=A
-MonthVeryShort09=So
+MonthVeryShort09=S
 MonthVeryShort10=O
 MonthVeryShort11=N
 MonthVeryShort12=D
@@ -804,7 +807,7 @@ LinkToSupplierInvoice=Link zur Lieferantenrechnung
 LinkToContract=Link zum Vertrag
 LinkToIntervention=Link zu Arbeitseinsatz
 LinkToTicket=Link zu Ticket
-LinkToMo=Verknüpfung mit Mo
+LinkToMo=Verknüpfung mit Fertigungsauftrag (MO)
 CreateDraft=Entwurf erstellen
 SetToDraft=Auf Entwurf zurücksetzen
 ClickToEdit=Klicken zum Bearbeiten
@@ -825,7 +828,7 @@ LinkedToSpecificUsers=Mit Kontakt verknüpft
 NoResults=Keine Ergebnisse
 AdminTools=Admin-Tools
 SystemTools=Systemwerkzeuge
-ModulesSystemTools=Module Hilfsprogramme
+ModulesSystemTools=Module Tools
 Test=Testen
 Element=Element
 NoPhotoYet=Noch keine Bilder verfügbar
@@ -906,7 +909,7 @@ ViewFlatList=Listenansicht zeigen
 ViewAccountList=Hauptbuch anzeigen
 ViewSubAccountList=Unterkonten-Buch anzeigen
 RemoveString=Entfernen Sie die Zeichenfolge '%s'
-SomeTranslationAreUncomplete=Einige Sprachen sind nur teilweise übersetzt oder enthalten Fehler. Wenn Sie dies feststellen, können Sie die Übersetzungen unter <a href="https://www.transifex.com/dolibarr-association/dolibarr/translate/#de_DE/" target="_blank">https://www.transifex.com/dolibarr-association/dolibarr/translate/#de_DE/</a> verbessern bzw. ergänzen.
+SomeTranslationAreUncomplete=Einige der angebotenen Sprachen sind möglicherweise nur teilweise übersetzt oder können Fehler enthalten. Bitte helfen Sie mit, Ihre Sprache zu korrigieren, indem Sie sich unter <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/ </a> registrieren, um Ihre Verbesserungen hinzuzufügen.
 DirectDownloadLink=Öffentlicher Download-Link
 PublicDownloadLinkDesc=Zum Herunterladen der Datei ist nur der Link erforderlich
 DirectDownloadInternalLink=Privater Download-Link
@@ -936,12 +939,12 @@ FileNotShared=Datei nicht für die Öffentlichkeit freigegeben
 Project=Projekt
 Projects=Projekte
 LeadOrProject=Anfrage | Projekt
-LeadsOrProjects=Leads | Projekte
+LeadsOrProjects=Projekte | Leads
 Lead=Anfrage
 Leads=Anfragen
 ListOpenLeads=Liste offener Leads
 ListOpenProjects=Liste offener Projekte
-NewLeadOrProject=Neuer Lead/Projekt
+NewLeadOrProject=Neues Projekt/neuer Lead
 Rights=Berechtigungen
 LineNb=Zeilennummer
 IncotermLabel=Incoterms
@@ -1081,7 +1084,7 @@ ToApprove=Zu genehmigen
 GlobalOpenedElemView=Globale Ansicht
 NoArticlesFoundForTheKeyword=Kein Artikel zu Schlüssselwort gefunden '<strong>%s</strong>'
 NoArticlesFoundForTheCategory=Kein Artikel für Kategorie gefunden
-ToAcceptRefuse=Zu akzeptieren | ablehnen
+ToAcceptRefuse=Zu akzeptieren | abzulehnen
 ContactDefault_agenda=Ereignis
 ContactDefault_commande=Bestellung
 ContactDefault_contrat=Vertrag
@@ -1158,4 +1161,6 @@ Properties=Eigenschaften
 hasBeenValidated=%s wurde validiert
 ClientTZ=Zeitzone Kunde (Benutzer)
 NotClosedYet=Noch nicht geschlossen
-ClearSignature=Unterschrift zurücksetzen
+ClearSignature=Signatur zurücksetzen
+CanceledHidden=Stornierte ausgeblendet
+CanceledShown=Stornierte angezeigt
diff --git a/htdocs/langs/de_DE/modulebuilder.lang b/htdocs/langs/de_DE/modulebuilder.lang
index 1f916651949..a9ae8606a38 100644
--- a/htdocs/langs/de_DE/modulebuilder.lang
+++ b/htdocs/langs/de_DE/modulebuilder.lang
@@ -1,5 +1,5 @@
 # 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 zu einem alternativen <a href="%s" target="_blank">Entwicklerhandbuch ist hier</a>.
+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.
 ModuleBuilderDesc2=Pfad, in dem Module generiert / bearbeitet werden (erstes Verzeichnis für externe Module, definiert in %s): <strong> %s </strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Die von Ihrem Modul / Ihrer Anwendung bereitgestellten Menü
 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.
 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 verarbeitet 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).
 SeeIDsInUse=Zeige die ID's die in Ihrer Installation verwendet werden
 SeeReservedIDsRangeHere=Zeige die reservierten ID Bereiche
 ToolkitForDevelopers=Toolkit für Dolibarr Entwickler
diff --git a/htdocs/langs/de_DE/mrp.lang b/htdocs/langs/de_DE/mrp.lang
index 3d838cb9998..a3b0e0c1940 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
@@ -82,12 +82,12 @@ 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
-Workstation=Arbeitsstation
-Workstations=Arbeitsplätze
+Workstation=Arbeitsstationen
+Workstations=Arbeitsstationen
 WorkstationsDescription=Verwaltung der Arbeitsstationen
 WorkstationSetup = Arbeitsstationen konfigurieren
 WorkstationSetupPage = Seite zur Einrichtung von Arbeitsstationen
-WorkstationList=Liste Arbeitsplätze
+WorkstationList=Liste Arbeitsstationen
 WorkstationCreate=Neue Arbeitsstation hinzufügen
 ConfirmEnableWorkstation=Möchten Sie die Arbeitsstation <b> %s </b> aktivieren?
 EnableAWorkstation=Eine Arbeitsstation aktivieren
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index c732113e6b1..8f11e0397f4 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -64,7 +64,7 @@ ProductQtyInDraftOrWaitingApproved=Produktmenge in Bestellentwurf oder Bestellun
 MenuOrdersToBill=Bestellverrechnung
 MenuOrdersToBill2=abrechenbare Aufträge
 ShipProduct=Produkt versenden
-CreateOrder=Bestellung erstellen
+CreateOrder=Auftrag erstellen
 RefuseOrder=Bestellung ablehnen
 ApproveOrder=Bestellung genehmigen
 Approve2Order=Genehmige Bestellung (2. Bestätigung)
@@ -74,7 +74,7 @@ DeleteOrder=Bestellung löschen
 CancelOrder=Bestellung stornieren
 OrderReopened= Bestellung %s wieder geöffnet
 AddOrder=Bestellung erstellen
-AddSupplierOrderShort=Bestellung erstellen
+AddSupplierOrderShort=Auftrag erstellen
 AddPurchaseOrder=Lieferantenbestellung erstellen
 AddToDraftOrders=Zu Bestellentwurf hinzufügen
 ShowOrder=Bestellung anzeigen
@@ -88,10 +88,10 @@ LastSupplierOrders=%s neueste Lieferantenbestellungen
 LastModifiedOrders=Zuletzt bearbeitete Bestellungen (maximal %s)
 AllOrders=Alle Bestellungen
 NbOfOrders=Anzahl der Bestellungen
-OrdersStatistics=Bestellstatistik
+OrdersStatistics=Statistik Kundenaufträge
 OrdersStatisticsSuppliers=Statistik Lieferantenbestellungen
 NumberOfOrdersByMonth=Anzahl der Bestellungen pro Monat
-AmountOfOrdersByMonthHT=Gesamtbetrag der Kundenaufträge pro Monat (exkl. Steuern)
+AmountOfOrdersByMonthHT=Gesamtbetrag der Bestellungen pro Monat (exkl. Steuern)
 ListOfOrders=Liste Aufträge
 CloseOrder=Bestellung schließen
 ConfirmCloseOrder=Möchten Sie diese Bestellung wirklich auf "geliefert" setzen? Sobald eine Bestellung geliefert ist, kann sie auf "berechnet" gesetzt werden.
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index a8cd93c7e42..2c9b38fa0db 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=Sicherheitsschlüssel
 NumberingShort=Nr.
-Tools=Hilfsprogramme
-TMenuTools=Hilfsprogramme
-ToolsDesc=Hier finden Sie weitere Hilfsprogramme, die keinem anderem Menüeintrag zugeordnet werden können.<br>Diese Hilfsprogramme können über das linke Menü aufgerufen werden.
+Tools=Tools
+TMenuTools=Tools
+ToolsDesc=Hier finden Sie weitere Tools (Hilfsprogramme), die keinem anderem Menüeintrag zugeordnet werden können.<br>Diese Tools können über das linke Menü aufgerufen werden.
 Birthday=Geburtstag
 BirthdayAlertOn=Geburtstagserinnerung EIN
 BirthdayAlertOff=Geburtstagserinnerung AUS
@@ -38,8 +38,8 @@ LatestBlogPosts=Neueste Blog-Beiträge
 notiftouser=An Benutzer
 notiftofixedemail=An festgelegte E-Mail-Adresse
 notiftouserandtofixedemail=An Benutzer und an festgelegte E-Mail-Adresse
-Notify_ORDER_VALIDATE=Kundenbestellung freigegeben
-Notify_ORDER_SENTBYMAIL=Kundenbestellung per E-Mail versendet
+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_APPROVE=Lieferantenbestellung freigegeben
@@ -189,7 +189,7 @@ DolibarrDemo=Dolibarr ERP/CRM-Demo
 StatsByNumberOfUnits=Statistik zu den Totalstückzahlen Produkte/Dienstleistungen
 StatsByNumberOfEntities=Statistik über die Anzahl der verweisenden Entitäten (Anzahl der Rechnungen, Bestellungen etc.)
 NumberOfProposals=Anzahl Angebote
-NumberOfCustomerOrders=Anzahl der Kundenbestellungen
+NumberOfCustomerOrders=Anzahl der Kundenaufträge
 NumberOfCustomerInvoices=Anzahl Kundenrechnungen
 NumberOfSupplierProposals=Anzahl der Lieferantenangebote
 NumberOfSupplierOrders=Anzahl der Lieferantenbestellungen
@@ -197,7 +197,7 @@ NumberOfSupplierInvoices=Anzahl der Lieferantenrechnungen
 NumberOfContracts=Anzahl der Verträge
 NumberOfMos=Anzahl der Fertigungsaufträge
 NumberOfUnitsProposals=Anzahl von Einheiten in Angeboten
-NumberOfUnitsCustomerOrders=Anzahl von Einheiten in Kundenbestellungen
+NumberOfUnitsCustomerOrders=Anzahl von Einheiten in Kundenaufträgen
 NumberOfUnitsCustomerInvoices=Anzahl von Einheiten in Kundenrechnungen
 NumberOfUnitsSupplierProposals=Anzahl von Einheiten in Lieferantenangeboten
 NumberOfUnitsSupplierOrders=Anzahl von Einheiten in Lieferantenbestellungen
@@ -258,6 +258,10 @@ PassEncoding=Kennwort Encoding
 PermissionsAdd=Berechtigungen hinzugefügt
 PermissionsDelete=Berechtigungen entfernt
 YourPasswordMustHaveAtLeastXChars=Ihr Passwort muss mindestens <strong> %s </strong> Zeichen enthalten
+PasswordNeedAtLeastXUpperCaseChars=Das Passwort benötigt mindestens <strong> %s </strong> Großbuchstaben
+PasswordNeedAtLeastXDigitChars=Das Passwort benötigt mindestens <strong> %s </strong> numerische Zeichen
+PasswordNeedAtLeastXSpecialChars=Das Passwort benötigt mindestens <strong> %s </strong> Sonderzeichen
+PasswordNeedNoXConsecutiveChars=Das Passwort darf keine <strong> %s </strong> aufeinanderfolgenden gleichen Zeichen enthalten
 YourPasswordHasBeenReset=Ihr Passwort wurde zurückgesetzt
 ApplicantIpAddress=IP Adresse des Antragstellers
 SMSSentTo=SMS an %s gesendet
@@ -268,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
diff --git a/htdocs/langs/de_DE/partnership.lang b/htdocs/langs/de_DE/partnership.lang
index 72b780984d9..58ff8c1f987 100644
--- a/htdocs/langs/de_DE/partnership.lang
+++ b/htdocs/langs/de_DE/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Partnerschaften
 PartnershipDescription=Modul zur Parnterschafts-Verwaltung
 PartnershipDescriptionLong= Modul zur Parnterschafts-Verwaltung
-
+Partnership=Partnerschaft
 AddPartnership=Partnerschaft hinzufügen
 CancelPartnershipForExpiredMembers=Partnerschaft: Partnerschaft von Mitgliedern mit abgelaufenen Abonnements kündigen
 PartnershipCheckBacklink=Partnerschaft: Überprüfen Sie den verweisenden Backlink
diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang
index 597a1afb216..7fd43eefbbe 100644
--- a/htdocs/langs/de_DE/productbatch.lang
+++ b/htdocs/langs/de_DE/productbatch.lang
@@ -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, die für jeden gescannten Barcode / jedes Los / jede Serienummer hinzugefügt werden muss
+QtyToAddAfterBarcodeScan=Menge an %s für jeden gescannten Barcode/jede Charge/jede  Seriennummer
 LifeTime=Lebensdauer (in Tagen)
 EndOfLife=Ende der Lebensdauer
 ManufacturingDate=Herstellungsdatum
@@ -42,3 +42,4 @@ HideLots=Lose ausblenden
 #Traceability - qc status
 OutOfOrder=Außer Betrieb
 InWorkingOrder=In betriebsfähigem Zustand
+ToReplace=Ersetzen
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 77f90341954..100ffcf7213 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -17,7 +17,7 @@ Create=Speichern
 Reference=Nummer
 NewProduct=Neues Produkt
 NewService=Neue Leistung
-ProductVatMassChange=systemweite MwSt-Änderung
+ProductVatMassChange=Systemweite MwSt.-Änderung
 ProductVatMassChangeDesc=Dieses Tool aktualisiert den für <b><u>ALLE</u></b> Produkte und Dienstleistungen 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!
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Betrag, der zum Aktualisieren des gewichteten Durchschnitt
 PMPValue=Gewichteter Warenwert
 PMPValueShort=DSWP
 mandatoryperiod=Pflichtzeiträume
-mandatoryPeriodNeedTobeSet=Achtung: Pflichtzeiträume nicht eingetragen
+mandatoryPeriodNeedTobeSet=Hinweis: Zeitraum (Start- und Enddatum) muss definiert sein
 mandatoryPeriodNeedTobeSetMsgValidate=Eine Leistung  erfordert einen Start- und Endzeitraum
-mandatoryHelper=Nachricht an den Benutzer über die Notwendigkeit, ein Startdatum und ein Enddatum für eine Dienstleistung einzugeben, wenn eine Rechnung, ein Handelsangebot oder ein Kundenauftrag erstellt / validiert wird. <br> Diese Aktion blockiert nicht den Bestätigungsprozess
+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.
 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
+SwitchOnSaleStatus=Status Verkauf einschalten
+SwitchOnPurchaseStatus=Status Einkauf einschalten
+StockMouvementExtraFields= Zusatzfelder (Lagerbewegung)
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 0b62e8cff55..313cc907d4f 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -64,7 +64,7 @@ Tasks=Aufgaben
 Task=Aufgabe
 TaskDateStart=Startdatum der Aufgabe
 TaskDateEnd=Enddatum der Aufgabe
-TaskDescription=Aufgaben-Beschreibung
+TaskDescription=Aufgabenbeschreibung
 NewTask=neue Aufgabe
 AddTask=Aufgabe erstellen
 AddTimeSpent=Erfasse verwendete Zeit 
@@ -197,6 +197,7 @@ InputPerMonth=Monatsansicht
 InputDetail=Eingabedetail
 TimeAlreadyRecorded=Zeitaufwand für diese Aufgabe/Tag und Benutzer %s bereits aufgenommen
 ProjectsWithThisUserAsContact=Projekte mit diesem Anwender als Kontakt
+ProjectsWithThisContact=Projekte mit diesem Kontakt
 TasksWithThisUserAsContact=Aufgaben zugeordnet zu diesem Anwender
 ResourceNotAssignedToProject=Nicht dem Projekt zugeordnet
 ResourceNotAssignedToTheTask=nicht der Aufgabe zugewiesen
@@ -257,18 +258,18 @@ TimeSpentInvoiced=Zeitaufwand in Rechnung gestellt
 TimeSpentForIntervention=Zeitaufwand
 TimeSpentForInvoice=Zeitaufwand
 OneLinePerUser=Eine Zeile pro Benutzer
-ServiceToUseOnLines=Service für Leitungen
+ServiceToUseOnLines=Service für Leistungen
 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
+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,3 +285,5 @@ 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
diff --git a/htdocs/langs/de_DE/receptions.lang b/htdocs/langs/de_DE/receptions.lang
index 02933e6dbc2..a969383777c 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,7 +24,9 @@ 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
@@ -36,7 +39,7 @@ 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
@@ -46,3 +49,6 @@ 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/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index e73923c610a..bfe56b09605 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -164,7 +164,7 @@ qtyToTranferIsNotEnough=Sie verfügen über nicht genügend Lagerbestand im Ursp
 qtyToTranferLotIsNotEnough=Zu geringer Lagerbestand für diese Buchnummer aus dem Quelllager. Einstellungen lassen keine negativen Lagerbestände zu (Menge für Produkt '%s' mit Buch '%s' ist %s im Lager '%s').
 ShowWarehouse=Zeige Lager
 MovementCorrectStock=Lagerkorrektur für Produkt %s
-MovementTransferStock=Umlagerung des Produkt %s in ein anderes Lager
+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>) 
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Bestandeswert für Benachrichtigung und erwünschte
 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
 NewInventory=Neue Bestandsaufnahme
 inventorySetup = Inventar einrichten
 inventoryCreatePermission=Neue Inventur erstellen
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Lagerbewegungen haben das Datum der
 inventoryChangePMPPermission=Durchschnittspreis änderbar
 ColumnNewPMP=Neuer Durchschnittsstückpreis
 OnlyProdsInStock=Fügen sie kein Produkt ohne Bestand hinzu
-TheoricalQty=Sollmenge
-TheoricalValue=Sollmenge
+TheoricalQty=Theoretische Menge
+TheoricalValue=Theoretische Menge
 LastPA=Letzer Einstandpreis
 CurrentPA=Aktueller Einstandspreis
 RecordedQty=Aufgezeichnete Menge
@@ -240,7 +241,7 @@ StockAtDatePastDesc=Sie können hier den Lagerbestand (Realbestand) zu einem bes
 StockAtDateFutureDesc=Sie können hier den Bestand (virtueller Bestand) zu einem bestimmten Zeitpunkt in der Zukunft anzeigen
 CurrentStock=Aktueller Lagerbestand
 InventoryRealQtyHelp=Setze den Wert auf 0, um die Menge zurückzusetzen. <br> Feld leer lassen oder Zeile entfernen, um unverändert zu lassen
-UpdateByScaning=Füllen Sie die tatsächliche Menge durch Scannen
+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.
@@ -253,14 +254,20 @@ 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.
 ObjectNotFound=%s nicht gefunden
 MakeMovementsAndClose=Bewegungen erzeugen und schließen
-AutofillWithExpected=Füllen Sie die reale Menge mit der erwarteten Menge
+AutofillWithExpected=Ersetzen Sie die tatsächliche Menge durch die erwartete 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
-FieldCannotBeNegative=Feld "%s" darf nicht negativ sein
 ErrorWrongBarcodemode=Unbekannter Barcode-Modus
 ProductDoesNotExist=Produkt existiert nicht
-ErrorSameBatchNumber=Gleiche Chargennummer ist bereits in der Inventurliste vorhanden
+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
 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.
+InventoryStartedShort=Begonnen
+ErrorOnElementsInventory=Vorgang aus folgendem Grund abgebrochen:
+ErrorCantFindCodeInInventory=Kann den folgenden Code nicht im Inventar 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
diff --git a/htdocs/langs/de_DE/stripe.lang b/htdocs/langs/de_DE/stripe.lang
index 6975469621c..e9c2d66dcde 100644
--- a/htdocs/langs/de_DE/stripe.lang
+++ b/htdocs/langs/de_DE/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Kreditkarten Moduleinstellungen
-StripeDesc=Bietet Kunden die Möglichkeit, eine Online Zahlungsseite mit Kredit/Debit-Kartenzahlungen via <a href="http://www.stripe.com" target="_blank">Stripe</a> anzubieten. Damit können Kunden Sofort-Zahlungen oder auf Module bezogene Zahlungen in Dolibarr (Rechnung, Auftrag, ...)  vornehmen
+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:
 PaymentForm=Zahlungsformular
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index aad0578877b..d984d10d932 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -36,7 +36,7 @@ SuperAdministrator=Super-Administrator
 SuperAdministratorDesc=Administrator mit allen Rechten
 AdministratorDesc=Administrator
 DefaultRights=Standardberechtigungen
-DefaultRightsDesc=Legen Sie die <u>Standard</u>-Berechtigungen fest, die einem <u>neuen</u> Benutzer automatisch zugewiesen werden. (Um Berechtigungen von bestehenden Benutzern zu ändern, wechseln Sie in die Benutzer-Karte.)
+DefaultRightsDesc=Legen Sie die <u>Standard</u>-Berechtigungen fest, die einem <u>neuen</u> Benutzer automatisch zugewiesen werden. Um Berechtigungen von bestehenden Benutzern zu ändern, wechseln Sie in die Benutzer-Karte.
 DolibarrUsers=Benutzer
 LastName=Nachname
 FirstName=Vorname
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index a8c7d2fc1b7..cc3c0e21ee4 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Überweisungsauftrag
 LatestBankTransferReceipts=Neueste %s Überweisungsaufträge
 LastWithdrawalReceipts=Letzte %s Abbuchungsbelege
 WithdrawalsLine=Bestellposition für Lastschrift
+CreditTransfer=Überweisung
 CreditTransferLine=Überweisungspositionen
 WithdrawalsLines=Abbuchungszeilen
 CreditTransferLines=Überweisungszeilen
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Geschäftspartner Bankcode
 NoInvoiceCouldBeWithdrawed=Keine Rechnung mit Erfolg eingezogen. Überprüfen Sie, ob die Rechnungen auf Unternehmen mit einer gültigen IBAN Nummer verweisen und die IBAN Nummer eine eindeutige Mandatsreferenz besitzt <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=Dieser Widerrufsbeleg ist bereits als gutgeschrieben markiert; Dies kann nicht zweimal durchgeführt werden, da dies möglicherweise zu doppelten Zahlungen und Bankeinträgen führen würde.
 ClassCredited=Als eingegangen markieren
+ClassDebited=Abbuchungen klassifizieren
 ClassCreditedConfirm=Möchten Sie diesen Abbuchungsbeleg wirklich als auf Ihrem Konto eingegangen markieren?
 TransData=Überweisungsdatum
 TransMetod=Überweisungsart
@@ -80,7 +82,7 @@ StatusMotif7=Gerichtsbescheid
 StatusMotif8=Andere Gründe
 CreateForSepaFRST=Lastschriftdatei erstellen (SEPA FRST)
 CreateForSepaRCUR=Lastschriftdatei erstellen (SEPA RCUR)
-CreateAll=Lastschriftdatei erstellen (alle)
+CreateAll=Erstellen Sie eine Lastschriftdatei
 CreateFileForPaymentByBankTransfer=Datei für Überweisung erstellen
 CreateSepaFileForPaymentByBankTransfer=Überweisungsdatei erstellen (SEPA)
 CreateGuichet=Nur Büro
@@ -150,3 +152,5 @@ ModeWarning=Echtzeit-Modus wurde nicht aktiviert, wir stoppen nach der Simulatio
 ErrorCompanyHasDuplicateDefaultBAN=Unternehmen mit der ID %s hat mehr als ein Standardbankkonto. Keine Möglichkeit zu wissen, welches man verwenden soll.
 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
diff --git a/htdocs/langs/de_DE/workflow.lang b/htdocs/langs/de_DE/workflow.lang
index 0b5b69e7e38..9464a12aeff 100644
--- a/htdocs/langs/de_DE/workflow.lang
+++ b/htdocs/langs/de_DE/workflow.lang
@@ -6,17 +6,21 @@ ThereIsNoWorkflowToModify=Es sind keine Workflow-Änderungen möglich mit den ak
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Erstelle automatisch einen Kundenauftrag, nachdem ein Angebot auf "unterzeichnet" gesetzt wurde. Die neue Bestellung hat dann den selben Wert wie das Angebot.
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Erstellt automatisch eine Kundenrechnung, nachdem ein Angebot als "unterzeichnet" markiert wurde. Diese neue Kundenrechnung lautet über den selben Betrag wie das Angebot.
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Erstelle automatisch eine Kundenrechnung, nachdem der Vertrag bestätigt wurde.
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Erstellt automatisch eine Kundenrechnung, nachdem eine Bestellung geschlossen wurde. Die neue Kundenrechnung lautet über den selben Betrag wie die Bestellung.
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Erstellt automatisch eine Kundenrechnung, nachdem ein Kundenauftrag geschlossen wurde. Die erstellte Rechnung lautet über denselben Betrag wie der Auftrag.
 # Autoclassify customer proposal or order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Setzt das  entsprechende Angebot auf "abgerechnet", sofern der Kundenauftrag auf "abgerechnet" gesetzt wurde und sofern der Gesamtbetrag im Kundenauftrag gleich dem im Angebot ist.
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Setzt das verknüpfte Angebot auf "abgerechnet", sofern die Kundenrechnung erstellt wurde und sofern der Rechnungsbetrag identisch zur Angebotsumme ist.
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Kennzeichne die verknüpfte Kundenbestellung(en) als fakturiert ( = in Rechnung gestellt) sofern die Kundenrechnung als geprüft markiert wurde und die Beträge übereinstimmen.
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Kennzeichne den verknüpften Kundenauftrag als fakturiert ( = in Rechnung gestellt) sofern die Kundenrechnung als geprüft markiert wurde und die Beträge übereinstimmen.
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Kennzeichne verknüpfte Kundenaufträge als fakturiert ( = in Rechnung gestellt), sofern die Kundenrechnung als bezahlt markiert wurde und die Beträge übereinstimmen.
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Kennzeichne die verknüpften Aufträge als geliefert wenn die Lieferung erfolgt ist (und die Liefermenge der Bestellmenge entspricht).
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Den zugrundeliegenden Kundenauftrag als versendet kennzeichnen, wenn eine Sendung geschlossen wird (sofern die Gesamtmengen aller zugehörigen Sendungen mit denen des Kundenauftrags übereinstimmen)
-# Autoclassify purchase order
+# Autoclassify purchase proposal
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Setzt das verknüpfte Lieferantenangebot auf "abgerechnet", sofern die Lieferanrenrechnung erstellt wurde und sofern der Rechnungsbetrag identisch zur Angebotsumme ist. 
+# Autoclassify purchase order
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Kennzeichne die verknüpfte Lieferantenbestellung als abgerechnet, wenn die Lieferantenrechnung erstellt wurde und die Gesamtbeträge übereinstimmen.
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Verknüpfte Lieferantenbestellung als eingegangen klassifizieren, wenn ein Wareneingang validiert wird (und wenn die von allen Wareneingängen eingegangene Menge mit der zu aktualisierenden Lieferantenbestellung übereinstimmt)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Verknüpfte Lieferantenbestellung als eingegangen klassifizieren, wenn ein Wareneingang geschlossen wird (und wenn die von allen Wareneingängen eingegangene Menge mit der zu aktualisierenden Bestellung übereinstimmt)
+# Autoclassify purchase invoice
 descWORKFLOW_BILL_ON_RECEPTION=Klassifizieren Sie Empfänge als "in Rechnung gestellt", wenn eine verknüpfte Lieferantenbestellung validiert wird
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Schließen Sie alle mit dem Ticket verknüpften Interaktionen, wenn ein Ticket geschlossen wird
diff --git a/htdocs/langs/el_CY/admin.lang b/htdocs/langs/el_CY/admin.lang
new file mode 100644
index 00000000000..c5cc61bc110
--- /dev/null
+++ b/htdocs/langs/el_CY/admin.lang
@@ -0,0 +1,3 @@
+# 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
diff --git a/htdocs/langs/el_CY/members.lang b/htdocs/langs/el_CY/members.lang
deleted file mode 100644
index bacf210d56c..00000000000
--- a/htdocs/langs/el_CY/members.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-NewSubscription=New contribution
diff --git a/htdocs/langs/el_CY/propal.lang b/htdocs/langs/el_CY/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/el_CY/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 8c3e518bf61..e7b284ea019 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -3,15 +3,15 @@ Accountancy=Λογιστική
 Accounting=Λογιστική
 ACCOUNTING_EXPORT_SEPARATORCSV=Διαχωριστής στηλών για το αρχείο που θα εξαχθεί
 ACCOUNTING_EXPORT_DATE=Μορφή ημερομηνίας για το αρχείο που θα εξαχθεί
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
+ACCOUNTING_EXPORT_PIECE=Εξαγωγή του αριθμού τεμαχίου
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Εξαγωγή με καθολικό λογαριασμό
 ACCOUNTING_EXPORT_LABEL=Εξαγωγή ετικέτας
 ACCOUNTING_EXPORT_AMOUNT=Εξαγωγή ποσού
 ACCOUNTING_EXPORT_DEVISE=Εξαγωγή νομίσματος
 Selectformat=Επιλέξτε το φορμάτ του αρχείου
-ACCOUNTING_EXPORT_FORMAT=Select the format for the file
+ACCOUNTING_EXPORT_FORMAT=Επιλέξτε τη μορφή για το αρχείο
 ACCOUNTING_EXPORT_ENDLINE=Επιλέξτε τον τύπο επιστροφής μεταφοράς
-ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+ACCOUNTING_EXPORT_PREFIX_SPEC=Καθορίστε το πρόθεμα για το όνομα του αρχείου
 ThisService=Αυτή η υπηρεσία
 ThisProduct=Αυτό το προϊόν
 DefaultForService=Προεπιλογή για υπηρεσία
@@ -27,7 +27,7 @@ JournalFinancial=Οικονομικά ημερολόγια
 BackToChartofaccounts=Επιστροφή στο διάγραμμα των λογαριασμών
 Chartofaccounts=Διάγραμμα λογαριασμών
 ChartOfSubaccounts=Διάγραμμα μεμονωμένων λογαριασμών
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
+ChartOfIndividualAccountsOfSubsidiaryLedger=Σχέδιο μεμονωμένων λογαριασμών του δευτερεύοντος καθολικού
 CurrentDedicatedAccountingAccount=Τρέχον ειδικό λογαριασμό
 AssignDedicatedAccountingAccount=Νέος λογαριασμός προς ανάθεση
 InvoiceLabel=Ετικέτα τιμολογίου
@@ -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=Λογαριασμοί με μη μηδενικές τιμές
@@ -48,10 +48,10 @@ CountriesNotInEEC=Χώρες που δεν βρίσκονται στην ΕΟΚ
 CountriesInEECExceptMe=Χώρες στην ΕΟΚ εκτός από το %s
 CountriesExceptMe=Όλες οι χώρες εκτός από το %s
 AccountantFiles=Εξαγωγή εγγράφων προέλευσης
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were used to generate your accountancy.
-ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
+ExportAccountingSourceDocHelp=Με αυτό το εργαλείο, μπορείτε να εξαγάγετε τα συμβάντα (λίστα σε CSV και PDF) που χρησιμοποιούνται για τη δημιουργία της λογιστικής σας.
+ExportAccountingSourceDocHelp2=Για να εξαγάγετε τα ημερολόγιά σας, χρησιμοποιήστε το μενού καταχώρηση %s - %s.
 VueByAccountAccounting=Προβολή κατά λογιστικό λογαριασμό
-VueBySubAccountAccounting=View by accounting subaccount
+VueBySubAccountAccounting=Προβολή ανά λογιστικό υπολογαριασμό
 
 MainAccountForCustomersNotDefined=Κύριος λογαριασμός λογιστικής για πελάτες που δεν έχουν οριστεί στη ρύθμιση
 MainAccountForSuppliersNotDefined=Κύριος λογαριασμός λογιστικής για προμηθευτές που δεν καθορίζονται στη ρύθμιση
@@ -66,8 +66,8 @@ AccountancyAreaDescActionOnceBis=Τα επόμενα βήματα θα πρέπ
 AccountancyAreaDescActionFreq=Οι παρακάτω ενέργειες εκτελούνται συνήθως κάθε μήνα, εβδομάδα ή μέρα για πολύ μεγάλες επιχειρήσεις ...
 
 AccountancyAreaDescJournalSetup=STEP %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
+AccountancyAreaDescChartModel=ΒΗΜΑ %s: Ελέγξτε ότι υπάρχει ένα μοντέλο λογαριασμών ή δημιουργήστε ένα από το μενού %s
+AccountancyAreaDescChart=ΒΗΜΑ %s: Επιλέξτε και|ή ολοκληρώστε το λογιστικό σας σχέδιο από το μενού %s
 
 AccountancyAreaDescVat=STEP %s: Καθορίστε λογαριασμούς λογιστικής για κάθε τιμή ΦΠΑ. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescDefault=STEP %s: Καθορίστε προεπιλεγμένους λογαριασμούς λογιστικής. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
@@ -87,7 +87,7 @@ AccountancyAreaDescAnalyze=STEP %s: Προσθέστε ή επεξεργαστε
 
 AccountancyAreaDescClosePeriod=STEP %s: Κλείστε την περίοδο έτσι δεν μπορούμε να κάνουμε αλλαγές σε ένα μέλλον.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Ένα υποχρεωτικό βήμα στη ρύθμιση δεν έχει ολοκληρωθεί (το ημερολόγιο κωδικών λογιστικής δεν έχει καθοριστεί για όλους τους τραπεζικούς λογαριασμούς)
 Selectchartofaccounts=Επιλέξτε ενεργό πίνακα λογαριασμών
 ChangeAndLoad=Αλλαγή και φόρτωση
 Addanaccount=Προσθέστε ένα λογιστικό λογαριασμό
@@ -97,8 +97,8 @@ SubledgerAccount=Λογαριασμός χρέωσης
 SubledgerAccountLabel=Ετικέτα λογαριασμού
 ShowAccountingAccount=Εμφάνιση λογαριασμού λογιστικής
 ShowAccountingJournal=Εμφάνιση λογιστικού περιοδικού
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
+ShowAccountingAccountInLedger=Εμφάνιση λογιστικού λογαριασμού στο καθολικό
+ShowAccountingAccountInJournals=Εμφάνιση λογιστικού λογαριασμού στα ημερολόγια
 AccountAccountingSuggest=Λογαριασμός λογιστικής πρότεινε
 MenuDefaultAccounts=Προεπιλεγμένοι λογαριασμοί
 MenuBankAccounts=Τραπεζικοί Λογαριασμοί
@@ -114,15 +114,15 @@ ProductsBinding=Λογαριασμοί προϊόντων
 TransferInAccounting=Μεταφορά στη λογιστική
 RegistrationInAccounting=Εγγραφή στη λογιστική
 Binding=Δεσμευση λογαριασμών
-CustomersVentilation=Δεσμευτικό τιμολόγιο πελατών
+CustomersVentilation=Συνδετικό τιμολόγιο πελατών
 SuppliersVentilation=Δεσμευτικό τιμολόγιο προμηθευτή
 ExpenseReportsVentilation=Αναφορά σύνδεσης εξόδων
 CreateMvts=Δημιουργήστε μία νέα συναλλαγή
 UpdateMvts=Τροποποίηση συναλλαγής
 ValidTransaction=Επικύρωση συναλλαγής
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Καταχώρηση συναλλαγών στη λογιστική
 Bookkeeping=Καθολικό
-BookkeepingSubAccount=Subledger
+BookkeepingSubAccount=ΥποΚαθολικό
 AccountBalance=Υπόλοιπο λογαριασμού
 ObjectsRef=Αναφορά αντικειμένου προέλευσης
 CAHTF=Συνολικός προμηθευτής αγοράς προ φόρων
@@ -132,7 +132,7 @@ InvoiceLinesDone=Δεσμευμένες γραμμές τιμολογίων
 ExpenseReportLines=Γραμμές εκθέσεων δαπανών που δεσμεύουν
 ExpenseReportLinesDone=Δεσμευμένες αναφορές δαπανών
 IntoAccount=Συνδέστε τη γραμμή με τον λογαριασμό λογιστικής
-TotalForAccount=Total accounting account
+TotalForAccount=Σύνολο λογιστικού λογαριασμού
 
 
 Ventilate=Δένω
@@ -148,7 +148,7 @@ NotVentilatedinAccount=Δεν δεσμεύεται στον λογαριασμό
 XLineSuccessfullyBinded=%s προϊόντα / υπηρεσίες με επιτυχία δεσμεύεται σε λογιστικό λογαριασμό
 XLineFailedToBeBinded=%s προϊόντα / υπηρεσίες δεν δεσμεύονται σε κανένα λογιστικό λογαριασμό
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Μέγιστος αριθμός γραμμών στη λίστα και στη σελίδα δεσμεύσεων (συνιστάται: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ξεκινήστε τη διαλογή της σελίδας &quot;Δεσμευτική ενέργεια&quot; από τα πιο πρόσφατα στοιχεία
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ξεκινήστε τη διαλογή της σελίδας &quot;Δεσμευτική πραγματοποίηση&quot; από τα πιο πρόσφατα στοιχεία
 
@@ -159,9 +159,9 @@ ACCOUNTING_LENGTH_AACCOUNT=Μήκος λογαριασμών τρίτου λογ
 ACCOUNTING_MANAGE_ZERO=Να επιτρέπεται η διαχείριση διαφορετικού αριθμού μηδενικών στο τέλος ενός λογαριασμού λογιστικής. Απαιτείται από ορισμένες χώρες (όπως η Ελβετία). Εάν είναι απενεργοποιημένη (προεπιλογή), μπορείτε να ορίσετε τις ακόλουθες δύο παραμέτρους για να ζητήσετε από την εφαρμογή να προσθέσει εικονικά μηδενικά.
 BANK_DISABLE_DIRECT_INPUT=Απενεργοποιήστε την απευθείας εγγραφή συναλλαγής σε τραπεζικό λογαριασμό
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Ενεργοποιήστε το σχέδιο εξαγωγής στο περιοδικό
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
+ACCOUNTANCY_COMBO_FOR_AUX=Ενεργοποίηση σύνθετης λίστας για θυγατρικό λογαριασμό (ενδέχεται να είναι αργή εάν έχετε πολλά τρίτα μέρη, διακοπή της δυνατότητας αναζήτησης σε ένα μέρος της αξίας)
+ACCOUNTING_DATE_START_BINDING=Καθορίστε ημερομηνία έναρξης δεσμεύσεων & μεταφοράς στη λογιστική. Κάτω από αυτή την ημερομηνία, οι συναλλαγές δεν θα μεταφερθούν στο λογιστικό.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Κατά τη μεταφορά λογιστικού, επιλέξτε εμφάνιση περιόδου από προεπιλογή
 
 ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων
 ACCOUNTING_PURCHASE_JOURNAL=Ημερολόγιο αγορών
@@ -181,7 +181,7 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Λογαριασμός λογιστικής αναμ
 DONATION_ACCOUNTINGACCOUNT=Λογαριασμός λογιστικής για την εγγραφή δωρεών
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Λογαριασμός λογιστικής για την εγγραφή συνδρομών
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Λογιστικός λογαριασμός από προεπιλογή για εγγραφή κατάθεσης πελάτη
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Λογαριασμός λογιστικής από προεπιλογή για τα αγορασμένα προϊόντα (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντων)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Λογαριασμός από προεπιλογή για τα προϊόντα που αγοράστηκαν στην ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντος)
@@ -202,33 +202,33 @@ Docdate=Ημερομηνία
 Docref=Παραπομπή
 LabelAccount=Ετικέτα λογαριασμού
 LabelOperation=Λειτουργία ετικετών
-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=Κατεύθυνση
+AccountingDirectionHelp=Για έναν λογιστικό λογαριασμό πελάτη, χρησιμοποιήστε την Πίστωση για να καταγράψετε μια πληρωμή που λάβατε <br> Για έναν λογιστικό λογαριασμό ενός προμηθευτή, χρησιμοποιήστε τη Χρέωση για να καταγράψετε μια πληρωμή που κάνατε
 LetteringCode=Κωδικός γράμματος
 Lettering=Γράμματα
 Codejournal=Ημερολόγιο
 JournalLabel=Ετικέτα περιοδικών
 NumPiece=Αριθμός τεμαχίου
 TransactionNumShort=Αριθ. συναλλαγή
-AccountingCategory=Custom group
-GroupByAccountAccounting=Group by general ledger account
-GroupBySubAccountAccounting=Group by subledger account
+AccountingCategory=Προσαρμοσμένη ομάδα
+GroupByAccountAccounting=Ομαδοποίηση κατά λογαριασμό γενικού καθολικού
+GroupBySubAccountAccounting=Ομαδοποίηση ανά λογαριασμό υποκαθολικού
 AccountingAccountGroupsDesc=Μπορείτε να ορίσετε εδώ ορισμένες ομάδες λογιστικού λογαριασμού. Θα χρησιμοποιηθούν για εξατομικευμένες λογιστικές εκθέσεις.
 ByAccounts=Με λογαριασμούς
 ByPredefinedAccountGroups=Με προκαθορισμένες ομάδες
 ByPersonalizedAccountGroups=Με εξατομικευμένες ομάδες
 ByYear=Με χρόνια
 NotMatch=Δεν έχει οριστεί
-DeleteMvt=Delete some operation lines from accounting
+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=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.
+DescJournalOnlyBindedVisible=Αυτή είναι μια προβολή αρχείων που είναι δεσμευμένα σε έναν λογιστικό λογαριασμό και μπορούν να καταγραφούν στα Ημερολόγια και στο Καθολικό.
 VATAccountNotDefined=Δεν έχει οριστεί λογαριασμός για ΦΠΑ
 ThirdpartyAccountNotDefined=Ο λογαριασμός για τρίτους δεν έχει οριστεί
 ProductAccountNotDefined=Λογαριασμός για το προϊόν δεν έχει οριστεί
@@ -246,15 +246,15 @@ DescThirdPartyReport=Συμβουλευτείτε εδώ τη λίστα με τ
 ListAccounts=Λίστα των λογιστικών λογαριασμών
 UnknownAccountForThirdparty=Άγνωστο λογαριασμό τρίτων. Θα χρησιμοποιήσουμε %s
 UnknownAccountForThirdpartyBlocking=Άγνωστο λογαριασμό τρίτων. Σφάλμα αποκλεισμού
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Ο λογαριασμός υποκαθολικού δεν έχει οριστεί ή το τρίτο μέρος ή ο χρήστης είναι άγνωστος. Θα χρησιμοποιήσουμε %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Άγνωστο το Tρίτο-Mέρος και λογαριασμός Καθολικού Ημερολογίου δεν έχει οριστεί για την πληρωμή. Θα διατηρήσουμε κενή την τιμή του λογαριασμού.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Ο υποκαθοκικός λογαριασμός δεν έχει οριστεί ή το τρίτο μέρος ή ο χρήστης είναι άγνωστος. Σφάλμα αποκλεισμού.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Ο λογαριασμός λογαριασμού τρίτου μέρους και ο λογαριασμός αναμονής δεν έχουν οριστεί. Σφάλμα αποκλεισμού
 PaymentsNotLinkedToProduct=Πληρωμή που δεν συνδέεται με κανένα προϊόν / υπηρεσία
-OpeningBalance=Opening balance
+OpeningBalance=Άνοιγμα υπολοίπου
 ShowOpeningBalance=Εμφάνιση αρχικού υπολοίπου
 HideOpeningBalance=Κρύψιμο αρχικού υπολοίπου
-ShowSubtotalByGroup=Show subtotal by level
+ShowSubtotalByGroup=Εμφάνιση υποσυνόλου ανά επίπεδο
 
 Pcgtype=Ομάδα του λογαριασμού
 PcgtypeDesc=Η ομάδα λογαριασμού χρησιμοποιείται ως προκαθορισμένα κριτήρια «φίλτρου» και «ομαδοποίησης» για ορισμένες λογιστικές αναφορές. Για παράδειγμα, τα «ΕΙΣΟΔΗΜΑ» ή «ΕΞΟΔΑ» χρησιμοποιούνται ως ομάδες λογιστικών λογαριασμών προϊόντων για τη δημιουργία της αναφοράς εξόδων / εσόδων.
@@ -277,16 +277,16 @@ DescVentilExpenseReport=Συμβουλευτείτε εδώ τον κατάλο
 DescVentilExpenseReportMore=Εάν ρυθμίσετε τον λογαριασμό λογαριασμών σε γραμμές αναφοράς τύπου εξόδων, η εφαρμογή θα είναι σε θέση να κάνει όλη τη δέσμευση μεταξύ των γραμμών αναφοράς δαπανών σας και του λογαριασμού λογιστικής του λογαριασμού σας, με ένα μόνο κλικ με το κουμπί <strong>&quot;%s&quot;</strong> . Εάν ο λογαριασμός δεν έχει οριστεί σε λεξικό τελών ή αν έχετε ακόμα ορισμένες γραμμές που δεν δεσμεύονται σε κανένα λογαριασμό, θα πρέπει να κάνετε μια χειροκίνητη σύνδεση από το μενού &quot; <strong>%s</strong> &quot;.
 DescVentilDoneExpenseReport=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών των εκθέσεων δαπανών και του λογιστικού λογαριασμού τους
 
-Closure=Annual closure
+Closure=Ετήσιο κλείσιμο
 DescClosure=Συμβουλευτείτε εδώ τον αριθμό των κινήσεων ανά μήνα που δεν έχουν επικυρωθεί και τα οικονομικά έτη είναι ήδη ανοιχτά
 OverviewOfMovementsNotValidated=Βήμα 1 / Επισκόπηση των κινήσεων που δεν έχουν επικυρωθεί. (Είναι απαραίτητο να κλείσετε ένα οικονομικό έτος)
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
+AllMovementsWereRecordedAsValidated=Όλες οι κινήσεις καταγράφηκαν ως επικυρωμένες
+NotAllMovementsCouldBeRecordedAsValidated=Δεν ήταν δυνατή η καταγραφή όλων των κινήσεων ως επικυρωμένες
 ValidateMovements=Επικυρώστε τις κινήσεις
 DescValidateMovements=Απαγορεύεται οποιαδήποτε τροποποίηση ή διαγραφή γραφής, γράμματος και διαγραφής. Όλες οι καταχωρήσεις για μια άσκηση πρέπει να επικυρωθούν, διαφορετικά το κλείσιμο δεν θα είναι δυνατό
 
 ValidateHistory=Δεσμεύστε αυτόματα
-AutomaticBindingDone=Έγινε αυτόματη σύνδεση
+AutomaticBindingDone=Ολοκληρώθηκαν οι αυτόματες δεσμεύσεις (%s) - Δεν είναι δυνατή η αυτόματη δέσμευση για κάποιες εγγραφές (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Σφάλμα, δεν μπορείτε να διαγράψετε αυτόν τον λογιστικό λογαριασμό γιατί χρησιμοποιείται
 MvtNotCorrectlyBalanced=Η κίνηση δεν είναι σωστά ισορροπημένη. Χρέωση = %s | Πιστωτικό = %s
@@ -298,13 +298,13 @@ NoNewRecordSaved=Δεν υπάρχει πλέον ρεκόρ για να κάν
 ListOfProductsWithoutAccountingAccount=Κατάλογος προϊόντων που δεν δεσμεύονται σε κανένα λογιστικό λογαριασμό
 ChangeBinding=Αλλάξτε τη σύνδεση
 Accounted=Πληρώθηκε σε
-NotYetAccounted=Not yet transferred to accounting
+NotYetAccounted=Δεν έχει μεταφερθεί ακόμη στη λογιστική
 ShowTutorial=Εμφάνιση εκπαιδευτικού προγράμματος
 NotReconciled=Δεν ταιριάζουν
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+WarningRecordWithoutSubledgerAreExcluded=Προειδοποίηση, όλες οι λειτουργίες χωρίς καθορισμένο λογαριασμό υποκαθολικού φιλτράρονται και εξαιρούνται από αυτήν την προβολή
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Δεσμευτικές επιλογές
 ApplyMassCategories=Εφαρμογή κατηγοριών μάζας
 AddAccountFromBookKeepingWithNoCategories=Διαθέσιμος λογαριασμός που δεν έχει ακόμα εγγραφεί στην εξατομικευμένη ομάδα
 CategoryDeleted=Η κατηγορία για τον λογαριασμό λογιστηρίου έχει καταργηθεί
@@ -329,9 +329,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)
-ConfirmExportFile=Confirmation of the generation of the accounting export file ?
+NotifiedExportDate=Επισήμανση εξαγόμενων γραμμών ως εξαγομένες (δεν θα είναι δυνατή η τροποποίηση των γραμμών)
+NotifiedValidationDate=Επικύρωση των εξαγόμενων καταχωρήσεων (δεν θα είναι δυνατή η τροποποίηση ή η διαγραφή των γραμμών)
+ConfirmExportFile=Επιβεβαίωση δημιουργίας του λογιστικού αρχείου εξαγωγής ;
 ExportDraftJournal=Εξαγωγή σχεδίου περιοδικού
 Modelcsv=Πρότυπο εξαγωγής
 Selectmodelcsv=Επιλέξτε ένα πρότυπο από την εξαγωγή
@@ -339,22 +339,22 @@ Modelcsv_normal=Κλασική εξαγωγή
 Modelcsv_CEGID=Εξαγωγή για CEGID Expert Comptabilité
 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_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_agiris=Εξαγωγή για Agiris Isacompta
+Modelcsv_LDCompta=Εξαγωγή για LD Compta (v9) (Δοκιμή)
 Modelcsv_LDCompta10=Εξαγωγή για LD Compta (v10 και άνω)
 Modelcsv_openconcerto=Εξαγωγή για OpenConcerto (Test)
 Modelcsv_configurable=Εξαγωγή CSV εξαγωγής
 Modelcsv_FEC=Εξαγωγή FEC
-Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
+Modelcsv_FEC2=Εξαγωγή FEC (Με γραφή δημιουργίας ημερομηνιών/αντιστροφή εγγράφου)
 Modelcsv_Sage50_Swiss=Εξαγωγή για Sage 50 Ελβετία
-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=Εξαγωγή για Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Εξαγωγή για Gestinum (v3)
+Modelcsv_Gestinumv5=Εξαγωγή για Gestinum (v5)
+Modelcsv_charlemagne=Εξαγωγή για το Aplim Charlemagne
 ChartofaccountsId=Λογαριασμός Id
 
 ## Tools - Init accounting account on product / service
@@ -387,7 +387,8 @@ SaleExport=Εξαγωγή πώλησης
 SaleEEC=Πώληση στην ΕΟΚ
 SaleEECWithVAT=Πώληση σε ΕΟΚ με μηδενικό ΦΠΑ, επομένως υποθέτουμε ότι ΔΕΝ είναι ενδοκοινοτική πώληση και ο προτεινόμενος λογαριασμός είναι ο τυπικός λογαριασμός προϊόντος.
 SaleEECWithoutVATNumber=Πώληση σε ΕΟΚ χωρίς ΦΠΑ, αλλά δεν ορίζεται το ΑΦΜ τρίτου μέρους. Εφεδρικός λογαριασμός προϊόντος για τυπικές πωλήσεις. Εάν χρειαστεί, μπορείτε να διορθώσετε το αναγνωριστικό ΦΠΑ τρίτου μέρους ή τον λογαριασμό προϊόντος.
-
+ForbiddenTransactionAlreadyExported=Απαγορευμένο: Η συναλλαγή έχει επικυρωθεί ή/και έχει εξαχθεί.
+ForbiddenTransactionAlreadyValidated=Απαγορευμένο: Η συναλλαγή έχει επικυρωθεί.
 ## Dictionary
 Range=Εύρος λογιστικού λογαριασμού
 Calculated=Υπολογίστηκε
@@ -404,32 +405,33 @@ NoJournalDefined=Δεν έχει οριστεί περιοδικό
 Binded=Γραμμές δεσμευμένες
 ToBind=Γραμμές που δεσμεύουν
 UseMenuToSetBindindManualy=Οι γραμμές που δεν έχουν ακόμη δεσμευτεί, χρησιμοποιήστε το μενού <a href="%s">%s</a> για να κάνετε τη σύνδεση μη αυτόματα
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Λυπούμαστε, αυτή η ενότητα δεν είναι συμβατή με την πειραματική λειτουργία των τιμολογίων κατάστασης
 
 ## 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)
+ImportAccountingEntriesFECFormat=Λογιστικές εγγραφές - Μορφή FEC
+FECFormatJournalCode=Kώδικας ημερολογίου (JournalCode)
+FECFormatJournalLabel=Ετικέτα ημερολογίου (JournalLib)
+FECFormatEntryNum=Αριθμός τεμαχίου (EcritureNum)
+FECFormatEntryDate=Ημερομηνία τεμαχίου (EcritureDate)
+FECFormatGeneralAccountNumber=Γενικός αριθμός λογαριασμού (CompteNum)
+FECFormatGeneralAccountLabel=Γενική ετικέτα λογαριασμού (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)
+FECFormatPieceRef=Αναφορά τεμαχίου (PieceRef)
+FECFormatPieceDate=Δημιουργία ημερομηνίας τεμαχίου (PieceDate)
+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)
+FECFormatValidateDate=Ημερομηνία επικύρωσης τεμαχίου (ValidDate)
+FECFormatMulticurrencyAmount=Ποσό πολλαπλών νομισμάτων (Montantdevise)
+FECFormatMulticurrencyCode=Κωδικός πολλαπλών νομισμάτων (Idevise)
 
 DateExport=Ημερομηνία εξαγωγής
 WarningReportNotReliable=Προειδοποίηση, αυτή η αναφορά δεν βασίζεται στον Καθολικό, επομένως δεν περιέχει συναλλαγή που τροποποιείται χειροκίνητα στο Ledger. Εάν η περιοδική σας έκδοση είναι ενημερωμένη, η προβολή της λογιστικής είναι πιο ακριβής.
 ExpenseReportJournal=Ενημερωτικό Δελτίο Έκθεσης
 InventoryJournal=Απογραφή Αποθέματος
 
-NAccounts=%s accounts
+NAccounts= %s  λογαριασμός,-οί
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index fd7e4b275cc..c33cd174692 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -1,10 +1,12 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Εκτύπωση αναφοράς και περιόδου του προϊόντος σε PDF
+BoldLabelOnPDF=Εκτυπώστε την ετικέτα του προϊόντος με έντονη γραφή σε PDF
 Foundation=Οργανισμός
 Version=Έκδοση
 Publisher=Εκδότης
 VersionProgram=Έκδοση Προγράμματος
-VersionLastInstall=Αρχική έκδοση εγκατάστασης
-VersionLastUpgrade=Έκδοση Τελευταίας Ενημέρωσης
+VersionLastInstall=Έκδοση αρχικής εγκατάστασης
+VersionLastUpgrade=Αναβάθμιση τελευταίας έκδοσης
 VersionExperimental=Πειραματική
 VersionDevelopment=Υπό ανάπτυξη
 VersionUnknown=Άγνωστη
@@ -37,13 +39,13 @@ UnlockNewSessions=Κατάργηση κλειδώματος σύνδεσης
 YourSession=Η σύνοδος σας
 Sessions=Συνεδρίες χρηστών
 WebUserGroup=Χειριστής/Ομάδα Διακομιστή Web
-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=Σετ χαρακτήρων βάσης δεδομένων για ταξινόμηση δεδομένων
-HostCharset=Host charset
+HostCharset=Σύνολο χαρακτήρων κεντρικού υπολογιστή
 ClientCharset=Σύνολο χαρακτήρων του χρήστη
 ClientSortingCharset=Συγκέντρωση πελατών
 WarningModuleNotActive=Το Module <b>%s</b> πρέπει να ενεργοποιηθεί
@@ -53,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=Σημείωση: ναι, είναι αποτελεσματική μόνο αν το module <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=Λάθος, αυτό το module απαιτεί Dolibarr έκδοση %s ή μεγαλύτερη
@@ -75,21 +77,21 @@ Dictionary=Λεξικά
 ErrorReservedTypeSystemSystemAuto=Αξία «system» και «systemauto» για τον τύπο είναι κατοχυρωμένα. Μπορείτε να χρησιμοποιήσετε το «χρήστη» ως αξία για να προσθέσετε το δικό σας μητρώο
 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 στο Setup->Other. Η αναζήτηση στη συνέχεια θα περιορίζεται από την έναρξη της σειράς.
 UseSearchToSelectContactTooltip=Επίσης, αν έχετε ένα μεγάλο αριθμό Πελ./Προμ. (> 100 000), μπορείτε να αυξήσετε την ταχύτητα με τον καθορισμό της σταθερά COMPANY_DONOTSEARCH_ANYWHERE σε 1 στο Setup->Other. Η αναζήτηση στη συνέχεια θα περιορίζεται από την έναρξη της σειράς.
 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=Αριθμόςαπό Bytes
 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 (βάση δεδομένων)
@@ -104,7 +106,7 @@ NextValueForInvoices=Επόμενο (τιμολόγιο)
 NextValueForCreditNotes=Επόμενο (πιστωτικά τιμολόγια)
 NextValueForDeposit=Επόμενη τιμή (προκαταβολή)
 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
+MustBeLowerThanPHPLimit=Σημείωση: Η διαμόρφωση του PHP σας περιορίζει  το μέγιστο μέγεθος αρχείου για μεταφόρτωση<b>%s</b>%s, ανεξάρτητα από την αξία αυτής της παραμέτρου
 NoMaxSizeByPHPLimit=Σημείωση: Κανένα όριο δεν έχει οριστεί στη διαμόρφωση του PHP σας
 MaxSizeForUploadedFiles=Μέγιστο μέγεθος για μεταφόρτωση αρχείων (0 απορρίπτει οποιοδήποτε μεταφόρτωση)
 UseCaptchaCode=Χρησιμοποιήστε το γραφικό κώδικα (CAPTCHA) στη σελίδα εισόδου
@@ -160,7 +162,7 @@ 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)
+PurgeDeleteTemporaryFilesShort=Διαγραφή αρχείων καταγραφής και προσωρινών αρχείων (χωρίς κίνδυνος απώλειας δεδομένων)
 PurgeDeleteAllFilesInDocumentsDir=Διαγράψτε όλα τα αρχεία στον κατάλογο: <b>%s</b> . <br> Αυτό θα διαγράψει όλα τα παραγόμενα έγγραφα που σχετίζονται με στοιχεία (τρίτα μέρη, τιμολόγια κ.λπ.), αρχεία που έχουν φορτωθεί στη μονάδα ECM, αρχεία από αντίγραφα ασφαλείας βάσεων δεδομένων και προσωρινά αρχεία.
 PurgeRunNow=Διαγραφή τώρα
 PurgeNothingToDelete=Δεν υπάρχει κατάλογος ή αρχείο για διαγραφή.
@@ -210,7 +212,7 @@ 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.
+ModulesDesc2=Κάντε κλικ στο κουμπί τροχού <span class="small valignmiddle"> %s </span> για να διαμορφώσετε τη μονάδα/εφαρμογή.
 ModulesMarketPlaceDesc=Μπορείτε να βρείτε περισσότερες ενότητες για να κατεβάσετε σε εξωτερικές ιστοσελίδες στο Internet ...
 ModulesDeployDesc=Εάν το επιτρέπουν τα δικαιώματα στο σύστημα αρχείων σας, μπορείτε να χρησιμοποιήσετε αυτό το εργαλείο για την ανάπτυξη εξωτερικής μονάδας. Η ενότητα θα είναι στη συνέχεια ορατή στην καρτέλα <strong>%s</strong> .
 ModulesMarketPlaces=Βρείτε εξωτερική εφαρμογή / ενότητες
@@ -224,7 +226,7 @@ NotCompatible=Αυτή η ενότητα δεν φαίνεται συμβατή
 CompatibleAfterUpdate=Αυτή η ενότητα απαιτεί ενημέρωση του Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Δές στην Αγορά
 SeeSetupOfModule=Δείτε την ρύθμιση του module %s
-SetOptionTo=Set option <b>%s</b> to %s
+SetOptionTo=Ορίστε την επιλογή <b> %s </b> σε %s
 Updated=Ενημερωμένο
 AchatTelechargement=Αγόρασε / Μεταφόρτωσε
 GoModuleSetupArea=Για να ενεργοποιήσετε/εγκαταστήσετε ενα νέο module, πηγαίνετε στην περιοχή εγκατάστασης Modules/Applications: <a href="%s">%s</a>.
@@ -238,7 +240,7 @@ BoxesAvailable=Διαθέσιμα Widgets
 BoxesActivated=Ενεργοποιημένα Widgets
 ActivateOn=Ενεργοποιήστε στις
 ActiveOn=Ενεργοποιήθηκε στις
-ActivatableOn=Activatable on
+ActivatableOn=Δυνατότητα ενεργοποίησης σε
 SourceFile=Πηγαίο αρχείο
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Διαθέσιμο μόνο αν το JavaScript δεν είναι απενεργοποιημένο
 Required=Υποχρεωτικό
@@ -264,9 +266,9 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Άλλοι πόροι
 ExternalResources=Εξωτερικοί πόροι
 SocialNetworks=Κοινωνικά δίκτυα
-SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=Για την τεκμηρίωση χρήστη ή προγραμματιστή  (Doc, FAQs...),<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=Αναγνωριστικό 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>
 HelpCenterDesc1=Εδώ είναι μερικοί πόροι για να λάβετε βοήθεια και υποστήριξη με τον Dolibarr.
 HelpCenterDesc2=Μερικοί από αυτούς τους πόρους είναι διαθέσιμοι μόνο στα <b>αγγλικά</b> .
 CurrentMenuHandler=Τρέχον μενού
@@ -284,7 +286,7 @@ NoticePeriod=Περίοδος ειδοποίησης
 NewByMonth=Νέο μήνα
 Emails=Ηλεκτρονικά μηνύματα
 EMailsSetup=Ρύθμιση ηλεκτρονικού ταχυδρομείου
-EMailsDesc=This page allows you to set parameters or options for email sending.
+EMailsDesc=Αυτή η σελίδα σας επιτρέπει να ορίσετε τις παραμέτρους η επιλογές για αποστολή email.
 EmailSenderProfiles=Προφίλ αποστολέων ηλεκτρονικού ταχυδρομείου
 EMailsSenderProfileDesc=Μπορείτε να αφήσετε αυτή την ενότητα κενή. Αν εισάγετε email, εδώ θα προστεθούν στη λίστα πιθανών αποστολέων όταν γράφετε ένα νέο email. 
 MAIN_MAIL_SMTP_PORT=Θύρα SMTP / SMTPS (προεπιλεγμένη τιμή στο php.ini: <b>%s</b> )
@@ -314,7 +316,7 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Προεπιλεγμένο μήνυμα αποστο
 UserEmail=Ηλεκτρονικό ταχυδρομείο χρήστη
 CompanyEmail=Εταιρεία ηλεκτρονικού ταχυδρομείου
 FeatureNotAvailableOnLinux=Αυτή η λειτουργία δεν είναι διαθέσιμη σε συστήματα Unix like. Δοκιμάστε το πρόγραμμα sendmail τοπικά.
-FixOnTransifex=Fix the translation on the online translation platform of project
+FixOnTransifex=Διορθώστε τη μετάφραση στην ηλεκτρονική πλατφόρμα μετάφρασης του έργου
 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=Διαχείριση Αρθρώματος
@@ -341,7 +343,7 @@ StepNb=Βήμα %s
 FindPackageFromWebSite=Βρείτε ένα πακέτο που παρέχει τις λειτουργίες που χρειάζεστε (για παράδειγμα στην επίσημη ιστοσελίδα %s).
 DownloadPackageFromWebSite=Λήψη του πακέτου (για παράδειγμα από την επίσημη ιστοσελίδα %s).
 UnpackPackageInDolibarrRoot=Αποσυμπιέστε / αποσυνδέστε τα συσκευασμένα αρχεία στον κατάλογο του διακομιστή <b>Dolibarr</b> : <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, είναι δυνατό να οριστεί ένας εναλλακτικός κατάλογος ρίζας. Αυτό σας επιτρέπει να αποθηκεύετε, σε έναν ειδικό κατάλογο, plug-ins και προσαρμοσμένα πρότυπα. <br> Απλά δημιουργήστε έναν κατάλογο στη ρίζα του Dolibarr (π.χ.: custom). <br>
@@ -353,6 +355,7 @@ LastStableVersion=Τελευταία σταθερή έκδοση
 LastActivationDate=Τελευταία ημερομηνία ενεργοποίησης
 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>
@@ -375,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=Ελάχιστο μήκος
@@ -386,7 +389,7 @@ 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=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>Για να μάθετε πως να δημιουργήσετε τα δικά σας αρχεία προτύπων, πριν τα αποθηκεύσετε σε αυτούς τους φακέλους, διαβάστε την τεκμηρίωση στο wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Θέση ονόματος/επιθέτου
@@ -402,9 +405,9 @@ ModuleMustBeEnabledFirst=Το άρθρωμα <b>%s</b> πρέπει να ενε
 SecurityToken=Security Token
 NoSmsEngine=Δεν διατίθεται διαχειριστής αποστολέων SMS. Ένας διαχειριστής αποστολέα SMS δεν είναι εγκατεστημένος με την προεπιλεγμένη διανομή επειδή εξαρτάται από έναν εξωτερικό προμηθευτή, αλλά μπορείτε να βρείτε μερικούς από τους %s
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFOtherDesc=PDF Option specific to some modules
-PDFAddressForging=Rules for address section
+PDFDesc=Καθολικές επιλογές για τη δημιουργία PDF
+PDFOtherDesc=Επιλογή PDF, συγκεκριμένη για ορισμένες ενότητες
+PDFAddressForging=Κανόνες για την ενότητα διευθύνσεων
 HideAnyVATInformationOnPDF=Απόκρυψη όλων των πληροφοριών που σχετίζονται με το φόρο επί των πωλήσεων / ΦΠΑ
 PDFRulesForSalesTax=Κανόνες φόρου επί των πωλήσεων / ΦΠΑ
 PDFLocaltax=Κανόνες για %s
@@ -418,16 +421,16 @@ UrlGenerationParameters=Παράμετροι για δημιουργία ασφ
 SecurityTokenIsUnique=Χρησιμοποιήστε μια μοναδική παράμετρο securekey για κάθε διεύθυνση URL
 EnterRefToBuildUrl=Εισάγετε αναφοράς για %s αντικείμενο
 GetSecuredUrl=Πάρτε υπολογιζόμενο URL
-ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
+ButtonHideUnauthorized=Απόκρυψη κουμπιών μη εξουσιοδοτημένων ενεργειών και για εσωτερικούς χρήστες (διαφορετικά απλώς απενεργοποιημένα )
 OldVATRates=Παλιός συντελεστής ΦΠΑ
 NewVATRates=Νέος συντελεστής ΦΠΑ
 PriceBaseTypeToChange=Τροποποίηση τιμών με βάση την τιμή αναφοράς όπως ρυθμίστηκε στο
 MassConvert=Ξεκινήστε τη μαζική μετατροπή
 PriceFormatInCurrentLanguage=Μορφή τιμής στην τρέχουσα γλώσσα
 String=String
-String1Line=String (1 line)
+String1Line=Συμβολοσειρά (1 γραμμή)
 TextLong=Μεγάλο κείμενο
-TextLongNLines=Long text (n lines)
+TextLongNLines=Μεγάλο κείμενο (n γραμμές)
 HtmlText=Html κείμενο
 Int=Integer
 Float=Float
@@ -465,13 +468,13 @@ LinkToTestClickToDial=Εισάγετε έναν τηλεφωνικό αριθμ
 RefreshPhoneLink=Ανανέωση συνδέσμου
 LinkToTest=Δημιουργήθηκε σύνδεσμος για τον χρήστη <strong>%s</strong> (κάντε κλικ στον αριθμό τηλεφώνου για να τον δοκιμάσετε)
 KeepEmptyToUseDefault=Αφήστε κενό για να χρησιμοποιήσετε την προεπιλεγμένη τιμή
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+KeepThisEmptyInMostCases=Στις περισσότερες περιπτώσεις, μπορείτε να διατηρήσετε αυτό το πεδίο ελεύθερο.
 DefaultLink=Προεπιλεγμένος σύνδεσμος
 SetAsDefault=Ορισμός ως προεπιλογή
 ValueOverwrittenByUserSetup=Προσοχή, αυτή η τιμή μπορεί να αντικατασταθεί από επιλογή του χρήστη (ο κάθε χρήστης μπορεί να κάνει τον δικό του σύνδεσμο clicktodial)
 ExternalModule=Εξωτερική μονάδα
 InstalledInto=Εγκαταστάθηκε στον κατάλογο %s
-BarcodeInitForThirdparties=Mass barcode init for third-parties
+BarcodeInitForThirdparties=Μαζική έναρξη γραμμικού κώδικα για Τρίτα Μέρη 
 BarcodeInitForProductsOrServices=Όγκος barcode init ή επαναφορά για προϊόντα ή υπηρεσίες
 CurrentlyNWithoutBarCode=Επί του παρόντος, έχετε <strong>%s</strong> ρεκόρ για <strong>%s</strong> %s χωρίς barcode ορίζεται.
 InitEmptyBarCode=Init τιμή για τις επόμενες %s άδειες καταχωρήσεις
@@ -520,7 +523,7 @@ 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
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Υποχρεώστε την καταχώριση ποσών αναφοράς εξόδων πάντα σε ποσό με φόρους
 AttachMainDocByDefault=Ρυθμίστε αυτό στο 1 εάν θέλετε να επισυνάψετε το κύριο έγγραφο σε email από προεπιλογή (αν υπάρχει)
 FilesAttachedToEmail=Επισυνάψετε το αρχείο
 SendEmailsReminders=Αποστολή υπενθυμίσεων της ημερήσιας διάταξης μέσω ηλεκτρονικού ταχυδρομείου
@@ -570,7 +573,7 @@ Module53Desc=Διαχείριση Υπηρεσιών
 Module54Name=Συμβόλαια / Συνδρομές
 Module54Desc=Διαχείριση συμβολαίων (υπηρεσίες ή επαναλαμβανόμενες συνδρομές)
 Module55Name=Barcodes
-Module55Desc=Barcode or QR code management
+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
@@ -688,7 +691,7 @@ Module54000Desc=Άμεση εκτύπωση (χωρίς το άνοιγμα τω
 Module55000Name=Δημοσκόπηση, έρευνα ή ψηφοφορία
 Module55000Desc=Δημιουργήστε online δημοσκοπήσεις, έρευνες ή ψηφοφορίες (όπως Doodle, Studs, RDVz κ.λπ. ...)
 Module59000Name=Περιθώρια
-Module59000Desc=Module to follow margins
+Module59000Desc=Ενότητα για να ακολουθείτε τα περιθώρια
 Module60000Name=Προμήθειες
 Module60000Desc=Ένθεμα για τη διαχείριση των προμηθειών
 Module62000Name=Διεθνείς Εμπορικοί Όροι
@@ -714,7 +717,7 @@ Permission32=Δημιουργία / τροποποίηση προϊόντων
 Permission34=Διαγραφή προϊόντων
 Permission36=Δείτε / διαχειριστείτε κρυφά προϊόντα
 Permission38=Εξαγωγή προϊόντων
-Permission39=Ignore minimum price
+Permission39=Αγνοήστε την ελάχιστη τιμή
 Permission41=Διαβάστε τα έργα και τα καθήκοντα (κοινό σχέδιο και έργα για τα οποία είμαι υπεύθυνος). Μπορεί επίσης να εισάγει χρόνο που καταναλώνεται, για μένα ή για την ιεραρχία μου, σε εκχωρημένες εργασίες (Timesheet)
 Permission42=Δημιουργία / τροποποίηση έργων (κοινό έργο και έργα για τα οποία έχω επικοινωνία). Μπορεί επίσης να δημιουργήσει εργασίες και να εκχωρήσει τους χρήστες σε έργα και εργασίες
 Permission44=Διαγραφή έργων (κοινό έργο και έργα για τα οποία είμαι υπεύθυνος)
@@ -723,9 +726,9 @@ Permission61=Διαβάστε τις παρεμβάσεις
 Permission62=Δημιουργία / τροποποίηση παρεμβάσεων
 Permission64=Διαγραφή παρεμβάσεων
 Permission67=Εξαγωγή παρεμβάσεων
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
+Permission68=Αποστολή παρεμβάσεων με email
+Permission69=Επικύρωση παρεμβάσεων
+Permission70=Ακυρώστε τις παρεμβάσεις
 Permission71=Διάβασμα μελών
 Permission72=Δημιουργία / τροποποίηση μελών
 Permission74=Διαγραφή μελών
@@ -753,7 +756,7 @@ Permission106=Εξαγωγή αποστολών
 Permission109=Διαγραφή αποστολών
 Permission111=Διάβασμα οικονομικών λογαριασμών
 Permission112=Δημιουργία / τροποποίηση / διαγραφή και σύγκριση συναλλαγών
-Permission113=Εγκατάσταση χρηματοοικονομικών λογαριασμών (δημιουργία, διαχείριση κατηγοριών)
+Permission113=Ρύθμιση οικονομικών λογαριασμών (δημιουργία, διαχείριση κατηγοριών τραπεζικών συναλλαγών)
 Permission114=Συναλλαγή συναλλαγών
 Permission115=Εξαγωγή συναλλαγών και καταστάσεις λογαριασμών
 Permission116=Μεταφορές μεταξύ λογαριασμών
@@ -762,6 +765,7 @@ Permission121=Διάβασμα τρίτων μερών που συνδέοντα
 Permission122=Δημιουργία / τροποποίηση τρίτων μερών συνδεδεμένων με το χρήστη
 Permission125=Διαγραφή τρίτων μερών συνδεδεμένων με το χρήστη
 Permission126=Εξαγωγή τρίτων μερών
+Permission130=Δημιουργία/τροποποίηση στοιχείων πληρωμής τρίτων μερών
 Permission141=Διαβάστε όλα τα έργα και τα καθήκοντα (επίσης ιδιωτικά έργα για τα οποία δεν είμαι επαφή)
 Permission142=Δημιουργία / τροποποίηση όλων των έργων και εργασιών (επίσης ιδιωτικά έργα για τα οποία δεν είμαι επαφή)
 Permission144=Διαγράψτε όλα τα έργα και τις εργασίες (επίσης ιδιωτικά έργα για τα οποία δεν έχω επικοινωνία)
@@ -858,8 +862,8 @@ Permission403=Επικύρωση εκπτώσεων
 Permission404=Διαγραφή εκπτώσεων
 Permission430=Χρησιμοποιήστε τη γραμμή εντοπισμού σφαλμάτων
 Permission511=Read salaries and payments (yours and subordinates)
-Permission512=Create/modify salaries and payments
-Permission514=Delete salaries and payments
+Permission512=Δημιουργία/τροποποίηση μισθών και πληρωμών
+Permission514=Διαγραφή μισθών και πληρωμών
 Permission517=Read salaries and payments everybody
 Permission519=Εξαγωγή μισθών
 Permission520=Ανάγνωση δανείων
@@ -889,12 +893,11 @@ Permission701=Διαβάστε τις δωρεές
 Permission702=Δημιουργία / τροποποίηση δωρεές
 Permission703=Διαγραφή δωρεές
 Permission771=Διαβάστε τις αναφορές εξόδων (δικές σας και υφισταμένων)
-Permission772=Δημιουργία/μεταβολή σε αναφορά εξόδων
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Διαγραφή αναφοράς εξόδων
-Permission774=Διαβάστε όλες τις αναφορές δαπανών (ακόμη και για χρήστες που δεν είναι υφιστάμενοι)
 Permission775=Έγκριση σε αναφορές εξόδων
 Permission776=Πληρωμή αναφοράς εξόδων
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Εξαγωγή αναφοράς εξόδων
 Permission1001=Διαβάστε τα αποθέματα
@@ -958,15 +961,11 @@ Permission2801=Χρησιμοποίησε FTP πελάτη σε λειτουργ
 Permission2802=Χρησιμοποίησε FTP πελάτη σε λειτουργία εγγραφής (διαγραφή ή μεταφόρτωση αρχείων)
 Permission3200=Διαβάστε αρχειακά συμβάντα και δακτυλικά αποτυπώματα
 Permission3301=Generate new modules
-Permission4001=Δείτε τους υπαλλήλους
-Permission4002=Δημιουργήστε υπαλλήλους
-Permission4003=Διαγράψτε τους υπαλλήλους
-Permission4004=Εξαγωγή εργαζομένων
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,15 +976,15 @@ Permission10005=Διαγραφή περιεχομένου ιστότοπου
 Permission20001=Διαβάστε τις αιτήσεις άδειας (η άδειά σας και αυτές των υφισταμένων σας)
 Permission20002=Δημιουργήστε / τροποποιήστε τα αιτήματα άδειας (η άδειά σας και αυτά των υφισταμένων σας)
 Permission20003=Διαγραφή των αιτήσεων άδειας
-Permission20004=Διαβάστε όλα τα αιτήματα άδειας (ακόμη και για χρήστες που δεν έχουν υποτακτικούς)
-Permission20005=Δημιουργία / τροποποίηση αιτήσεων άδειας για όλους (ακόμη και για χρήστες που δεν έχουν υποτακτικούς)
-Permission20006=Αιτήσεις άδειας διαχειριστή (ισορροπία εγκατάστασης και ενημέρωσης)
+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=Έγκριση αιτημάτων άδειας
 Permission23001=Λεπτομέρειες προγραμματισμένης εργασίας
 Permission23002=Δημιουργήστε/ενημερώστε μια προγραμματισμένη εργασία
 Permission23003=Διαγράψτε μια προγραμματισμένη εργασία
 Permission23004=Εκτελέστε μια προγραμματισμένη εργασία
-Permission50101=Use Point of Sale (SimplePOS)
+Permission50101=Χρήση Σημείου Πώλησης (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
 Permission50152=Edit sales lines
 Permission50153=Edit ordered sales lines
@@ -1165,7 +1164,7 @@ LoginPage=Σελίδα σύνδεσης
 BackgroundImageLogin=Εικόνα φόντου
 PermanentLeftSearchForm=Μόνιμη φόρμα αναζήτησης στο αριστερό μενού
 DefaultLanguage=Προεπιλεγμένη γλώσσα
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=Ενεργοποιήστε την πολυγλωσσική υποστήριξη για συσχετισμούς πελατών ή προμηθευτών
 EnableShowLogo=Εμφανίστε το λογότυπο της εταιρείας στο μενού
 CompanyInfo=Εταιρεία / Οργανισμός
 CompanyIds=Ταυτότητα εταιρείας / οργανισμού
@@ -1185,7 +1184,7 @@ DoNotSuggestPaymentMode=Χωρίς πρόταση πληρωμής
 NoActiveBankAccountDefined=Δεν έχει οριστεί ενεργός λογαριασμός τράπεζας
 OwnerOfBankAccount=Ιδιοκτήτης του λογαριασμού τράπεζας %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
+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=Καθυστέρηση πριν εμφανιστεί μια ειδοποίηση προειδοποίησης για:
@@ -1236,7 +1235,7 @@ SystemAreaForAdminOnly=Αυτή η περιοχή είναι διαθέσιμη
 CompanyFundationDesc=Επεξεργαστείτε τις πληροφορίες της εταιρείας / του οργανισμού σας. Κάντε κλικ στο κουμπί "%s" στο κάτω μέρος της σελίδας όταν τελειώσετε.
 AccountantDesc=Εάν έχετε έναν εξωτερικό λογιστή / λογιστή, μπορείτε να επεξεργαστείτε εδώ τις πληροφορίες του.
 AccountantFileNumber=Λογιστικό κώδικα
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
+DisplayDesc=Οι παράμετροι που επηρεάζουν την εμφάνιση και την παρουσίαση της εφαρμογής μπορούν να τροποποιηθούν εδώ.
 AvailableModules=Διαθέσιμες εφαρμογές / ενότητες
 ToActivateModule=Για να ενεργοποιήσετε Ενθέματα, μεταβείτε στην Περιοχή εγκατάστασης (Αρχική σελίδα-> Ρυθμίσεις-> Ενθέματα).
 SessionTimeOut=Λήξη χρόνου για τη συνεδρία
@@ -1283,12 +1282,12 @@ RunningUpdateProcessMayBeRequired=Η εκτέλεση της διαδικασί
 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
+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
-ShowProfIdInAddress=Show professional ID with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number
+ShowProfIdInAddress=Εμφάνιση επαγγελματικής ταυτότητας με διευθύνσεις
+ShowVATIntaInAddress=Απόκρυψη ενδοκοινοτικού ΑΦΜ
 TranslationUncomplete=Ημιτελής μεταγλώττιση
-MAIN_DISABLE_METEO=Disable weather thumb
+MAIN_DISABLE_METEO=Απενεργοποιήστε τo εικονίδιο καιρού
 MeteoStdMod=Τυπική λειτουργία
 MeteoStdModEnabled=Τυπική λειτουργία ενεργοποιημένη
 MeteoPercentageMod=Ποσοστιαία λειτουργία
@@ -1302,7 +1301,7 @@ MAIN_PROXY_HOST=Διακομιστής μεσολάβησης: Όνομα / Δι
 MAIN_PROXY_PORT=Διακομιστής μεσολάβησης: Θύρα
 MAIN_PROXY_USER=Διακομιστής μεσολάβησης: Σύνδεση / Χρήστης
 MAIN_PROXY_PASS=Διακομιστής μεσολάβησης: Κωδικός πρόσβασης
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
+DefineHereComplementaryAttributes=Καθορίστε τυχόν πρόσθετα / προσαρμοσμένα χαρακτηριστικά που πρέπει να προστεθούν στο: %s
 ExtraFields=Συμπληρωματικά χαρακτηριστικά
 ExtraFieldsLines=Συμπληρωματικά χαρακτηριστικά (σειρές)
 ExtraFieldsLinesRec=Συμπληρωματικά χαρακτηριστικά (γραμμές τιμολογίων προτύπων)
@@ -1338,7 +1337,7 @@ NewTranslationStringToShow=Νέα συμβολοσειρά μετάφρασης
 OriginalValueWas=Η αρχική μετάφραση αντικαθίσταται. Η αρχική τιμή ήταν: <br><br> %s
 TransKeyWithoutOriginalValue=Αναγκάσθηκε μια νέα μετάφραση για το κλειδί μετάφρασης &#39; <strong>%s</strong> &#39; που δεν υπάρχει σε κανένα αρχείο γλώσσας
 TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TotalNumberOfActivatedModules=Ενεργοποιημένες μονάδες: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Η κλάση %s δεν βρέθηκε στη διαδρομή PHP
 YesInSummer=Yes in summer
@@ -1358,9 +1357,9 @@ BrowserIsOK=Χρησιμοποιείτε το πρόγραμμα περιήγη
 BrowserIsKO=Χρησιμοποιείτε το πρόγραμμα περιήγησης web %s. Αυτό το πρόγραμμα περιήγησης είναι γνωστό ότι αποτελεί κακή επιλογή για ασφάλεια, απόδοση και αξιοπιστία. Σας συνιστούμε να χρησιμοποιήσετε Firefox, Chrome, Opera ή Safari.
 PHPModuleLoaded=Το στοιχείο PHP %s έχει φορτωθεί
 PreloadOPCode=Χρησιμοποιείται προ-φορτωμένο OPCode
-AddRefInList=Εμφάνιση αναφοράς πελατών / προμηθευτή λίστα πληροφοριών (επιλέξτε κατάλογο ή combobox) και το μεγαλύτερο μέρος της υπερσύνδεσης. <br> Τα Τρίτα Μέρη θα εμφανιστούν με τη μορφή ονόματος &quot;CC12345 - SC45678 - The Big Company corp&quot;. αντί του &quot;The Big Company corp&quot;.
-AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=Εμφάνιση λίστας πληροφοριών διευθύνσεων πελατών / προμηθευτών (επιλέξτε κατάλογο ή συνδυασμός) <br> Τα Τρίτα Μέρη θα εμφανιστούν με τη μορφή ονόματι &quot;The Big Company Corp. - 21 άλμα δρόμου 123456 Μεγάλη πόλη - ΗΠΑ&quot; αντί για &quot;Το Big Company corp&quot;.
+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=Ζητήστε την προτιμώμενη μέθοδο αποστολής για τρίτους.
 FieldEdition=Έκδοση στο πεδίο %s
@@ -1369,7 +1368,7 @@ GetBarCode=Πάρτε barcode
 NumberingModules=Μοντέλα αρίθμησης
 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.
+PasswordGenerationStandard=Επιστρέφει έναν κωδικό πρόσβασης που δημιουργήθηκε σύμφωνα με τον εσωτερικό αλγόριθμο του Dolibarr: %s χαρακτήρες που περιέχουν κοινόχρηστους αριθμούς και χαρακτήρες με πεζά.
 PasswordGenerationNone=Μην προτείνετε έναν κωδικό πρόσβασης που δημιουργείται. Ο κωδικός πρόσβασης πρέπει να πληκτρολογηθεί μη αυτόματα.
 PasswordGenerationPerso=Επιστρέψτε έναν κωδικό πρόσβασης σύμφωνα με τις προσωπικές σας ρυθμίσεις.
 SetupPerso=Σύμφωνα με τη διαμόρφωσή σας
@@ -1491,10 +1490,10 @@ LDAPSynchronizeMembersTypes=Οργάνωση των τύπων μελών του
 LDAPPrimaryServer=Primary server
 LDAPSecondaryServer=Secondary server
 LDAPServerPort=Server port
-LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
+LDAPServerPortExample=Standard ή StartTLS: 389, LDAP: 636
 LDAPServerProtocolVersion=Protocol version
 LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use StartTLS
+LDAPServerUseTLSExample=Ο LDAP διακομιστής σας χρησιμοποιεί το StartTLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Διαχειριστής DN
 LDAPAdminDnExample=Ολοκλήρωση DN (ex: cn = admin, dc = παράδειγμα, dc = com ή cn = Administrator, cn = Users, dc =
@@ -1644,13 +1643,13 @@ ProductSetup=Products module setup
 ServiceSetup=Υπηρεσίες εγκατάστασης μονάδας
 ProductServiceSetup=Προϊόντα και Υπηρεσίες εγκατάστασης μονάδων
 NumberOfProductShowInSelect=Μέγιστος αριθμός προϊόντων που θα εμφανίζονται σε λίστες επιλογών συνδυασμού (0 = κανένα όριο)
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
+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 εάν το προϊόν / η υπηρεσία περιλαμβάνεται στην πρόταση
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ViewProductDescInThirdpartyLanguageAbility=Εμφάνιση περιγραφών προϊόντων σε φόρμες στη γλώσσα του τρίτου μέρους (αλλιώς στη γλώσσα του χρήστη)
 UseSearchToSelectProductTooltip=Επίσης, αν έχετε μεγάλο αριθμό προϊόντων (&gt; 100.000), μπορείτε να αυξήσετε την ταχύτητα ρυθμίζοντας σταθερά το PRODUCT_DONOTSEARCH_ANYWHERE στο 1 στο Setup-&gt; Other. Η αναζήτηση θα περιορίζεται στην αρχή της συμβολοσειράς.
 UseSearchToSelectProduct=Περιμένετε έως ότου πιέσετε ένα κλειδί πριν φορτώσετε το περιεχόμενο της λίστας σύνθετων προϊόντων (Αυτό μπορεί να αυξήσει την απόδοση εάν έχετε μεγάλο αριθμό προϊόντων, αλλά είναι λιγότερο βολικό)
 SetDefaultBarcodeTypeProducts=Προεπιλεγμένος τύπος barcode για χρήση σε προϊόντα
@@ -1667,7 +1666,7 @@ SyslogLevel=Επίπεδο
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=Μπορείτε να χρησιμοποιήσετε το DOL_DATA_ROOT / dolibarr.log για ένα αρχείο καταγραφής στον κατάλογο Dolibarr "documents". Μπορείτε να ορίσετε μια διαφορετική διαδρομή για να αποθηκεύσετε αυτό το αρχείο.
 ErrorUnknownSyslogConstant=Η σταθερά %s δεν είναι η γνωστή σταθερά Syslog
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
+OnlyWindowsLOG_USER=Στα Windows, θα υποστηρίζεται μόνο η δυνατότητα LOG_USER
 CompressSyslogs=Συμπίεση και δημιουργία αντιγράφων ασφαλείας των αρχείων καταγραφής εντοπισμού σφαλμάτων (που δημιουργούνται από την ενότητα Καταγραφή για σφάλμα)
 SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Ρυθμίστε τη διαμόρφωση της προγραμματισμένης εργασίας για να ορίσετε την εφεδρική συχνότητα καταγραφής
@@ -1708,8 +1707,9 @@ MailingDelay=Δευτερόλεπτα για να περιμένετε μετά
 NotificationSetup=Ρύθμιση λειτουργικής μονάδας ειδοποίησης ηλεκτρονικού ταχυδρομείου
 NotificationEMailFrom=Email αποστολέα (Από) για μηνύματα ηλεκτρονικού ταχυδρομείου που αποστέλλονται από τη λειτουργική μονάδα Ειδοποιήσεις
 FixedEmailTarget=Παραλήπτης
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Ρύθμιση μονάδας αποστολής
 SendingsReceiptModel=Αποστολή μοντέλου απόδειξη παραλαβής
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1739,7 +1739,7 @@ StockSetup=Ρύθμιση μονάδας αποθέματος
 IfYouUsePointOfSaleCheckModule=Εάν χρησιμοποιείτε τη μονάδα POS (Point of Sale) που παρέχεται εξ ορισμού ή μια εξωτερική μονάδα, αυτή η ρύθμιση ενδέχεται να αγνοηθεί από τη μονάδα POS. Οι περισσότερες μονάδες POS σχεδιάζονται από προεπιλογή για να δημιουργήσουν άμεσα ένα τιμολόγιο και να μειώσουν το απόθεμα ανεξάρτητα από τις επιλογές εδώ. Επομένως, εάν χρειάζεστε ή όχι να μειώσετε το απόθεμα κατά την εγγραφή μιας πώλησης από το POS σας, ελέγξτε επίσης τη ρύθμιση της μονάδας POS.
 ##### Menu #####
 MenuDeleted=Το μενού διαγράφηκε
-Menu=Menu
+Menu=Μενού
 Menus=Μενού
 TreeMenuPersonalized=Εξατομικευμένα μενού
 NotTopTreeMenuPersonalized=Εξατομικευμένα μενού που δεν συνδέονται με μια καταχώρηση κορυφαίου μενού
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Ρύθμιση εκθέσεων εξόδων για τ
 ExpenseReportNumberingModules=Μονάδα αρίθμησης αναφορών εξόδων
 NoModueToManageStockIncrease=Δεν έχει ενεργοποιηθεί καμία ενότητα ικανή να διαχειριστεί την αυτόματη αύξηση των αποθεμάτων. Η αύξηση των αποθεμάτων θα γίνεται μόνο με χειροκίνητη εισαγωγή.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Μπορείτε να βρείτε επιλογές για ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου ενεργοποιώντας και διαμορφώνοντας την ενότητα &quot;Ειδοποίηση&quot;.
+TemplatesForNotifications=Templates for notifications
 ListOfNotificationsPerUser=Λίστα αυτόματων ειδοποιήσεων ανά χρήστη *
 ListOfNotificationsPerUserOrContact=Κατάλογος πιθανών αυτόματων ειδοποιήσεων (σε επιχειρηματικό συμβάν) διαθέσιμων ανά χρήστη * ή ανά επαφή **
 ListOfFixedNotifications=Λίστα αυτόματων σταθερών ειδοποιήσεων
@@ -1916,6 +1917,8 @@ ConfFileMustContainCustom=Η εγκατάσταση ή η δημιουργία 
 HighlightLinesOnMouseHover=Επισημάνετε τις γραμμές του πινάκου όταν περνάει το ποντίκι
 HighlightLinesColor=Επισημάνετε το χρώμα της γραμμής όταν το ποντίκι περάσει (χρησιμοποιήστε το &#39;ffffff&#39; για να μην επισημανθεί)
 HighlightLinesChecked=Επισημάνετε το χρώμα της γραμμής όταν την ελέγξετε (χρησιμοποιήστε το &#39;ffffff&#39; για να μην επισημανθεί)
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=Χρώμα κειμένου του τίτλου σελίδας
 LinkColor=Χρώμα σε συνδέσμους
 PressF5AfterChangingThis=Πατήστε CTRL + F5 στο πληκτρολόγιο ή διαγράψτε την προσωρινή μνήμη του προγράμματος περιήγησής σας αφού αλλάξετε αυτήν την τιμή για να την έχετε αποτελεσματική
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Θέλετε να εκτελέσετε τη συλ
 NoNewEmailToProcess=Δεν υπάρχει νέο μήνυμα ηλεκτρονικού ταχυδρομείου (φίλτρα που ταιριάζουν) για επεξεργασία
 NothingProcessed=Τίποτα δεν έγινε
 XEmailsDoneYActionsDone=%s τα κατάλληλα μηνύματα ηλεκτρονικού ταχυδρομείου, τα emails %s υποβλήθηκαν σε επιτυχή επεξεργασία (για %s η εγγραφή / οι ενέργειες έγιναν)
-RecordEvent=Εγγραφή συμβάντος ηλεκτρονικού ταχυδρομείου
-CreateLeadAndThirdParty=Δημιουργία μολύβδου (και τρίτου εάν είναι απαραίτητο)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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=Αριθμός μηνυμάτων ηλεκτρονικού ταχυδρομείου στον κατάλογο προέλευσης
 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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Κωδικός εισόδου μενού (mainmenu)
 ECMAutoTree=Εμφάνιση αυτόματης δομής ECM
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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=Διαμόρφωση της ενότητας πόρων
@@ -2124,7 +2128,7 @@ 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 a string 'Name: name to find' found into the body, use 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=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=Σημείο τερματισμού για %s: %s
 DeleteEmailCollector=Διαγραφή συλλέκτη ηλεκτρονικού ταχυδρομείου
 ConfirmDeleteEmailCollector=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το συλλέκτη email;
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index 657e09993b1..fedbfdde118 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -4,7 +4,7 @@ Actions=Ενέργειες
 Agenda=Ημερολόγιο
 TMenuAgenda=Ημερολόγιο
 Agendas=Ημερολόγια
-LocalAgenda=Default calendar
+LocalAgenda=Προεπιλεγμένο ημερολόγιο
 ActionsOwnedBy=Το γεγονός ανήκει
 ActionsOwnedByShort=Ιδιοκτήτης
 AffectedTo=Ανάθεση σε
@@ -14,13 +14,13 @@ EventsNb=Αριθμός γεγονότων
 ListOfActions=Λίστα γεγονότων
 EventReports=Αναφορές συμβάντων
 Location=Τοποθεσία
-ToUserOfGroup=Event assigned to any user in the group
+ToUserOfGroup=Αντιστοιχισμένο συμβάν σε οποιονδήποτε χρήστη στην ομάδα
 EventOnFullDay=Ολοήμερο Γεγονός
 MenuToDoActions=Όλες οι ημιτελής ενέργειες
 MenuDoneActions=Όλες οι ολοκληρ. ενέργειες
 MenuToDoMyActions=Ημιτελής ενέργειες
 MenuDoneMyActions=Ολοκληρωμένες ενέργειες
-ListOfEvents=List of events (default calendar)
+ListOfEvents=Λίστα συμβάντων (προεπιλεγμένο ημερολόγιο)
 ActionsAskedBy=Ενέργειες που καταχωρήθηκαν από
 ActionsToDoBy=Ενέργειες που ανατέθηκαν σε
 ActionsDoneBy=Ενέργειες που ολοκληρώθηκαν από
@@ -38,7 +38,7 @@ ActionsEvents=Γεγονότα για τα οποία θα δημιουργήσ
 EventRemindersByEmailNotEnabled=Οι υπενθυμίσεις συμβάντων μέσω ηλεκτρονικού ταχυδρομείου δεν ενεργοποιήθηκαν στη ρύθμιση μονάδας %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Το τρίτο μέρος %s δημιουργήθηκε
-COMPANY_MODIFYInDolibarr=Third party %s modified
+COMPANY_MODIFYInDolibarr=Τρίτο μέρος %s τροποποιήθηκε
 COMPANY_DELETEInDolibarr=Το τρίτο μέρος %s διαγράφηκε
 ContractValidatedInDolibarr=Συμβόλαιο %s επικυρώθηκε
 CONTRACT_DELETEInDolibarr=Η σύμβαση %s διαγράφηκε
@@ -64,8 +64,8 @@ ShipmentClassifyClosedInDolibarr=Η αποστολή %s ταξινομείται
 ShipmentUnClassifyCloseddInDolibarr=Η αποστολή %s ταξινομήθηκε εκ νέου
 ShipmentBackToDraftInDolibarr=Η αποστολή %s επιστρέφει στην κατάσταση του σχεδίου
 ShipmentDeletedInDolibarr=Η αποστολή %s διαγράφηκε
-ShipmentCanceledInDolibarr=Shipment %s canceled
-ReceptionValidatedInDolibarr=Reception %s validated
+ShipmentCanceledInDolibarr=Η αποστολή %s ακυρώθηκε
+ReceptionValidatedInDolibarr=Η λήψη %s επικυρώθηκε
 OrderCreatedInDolibarr=Παραγγελία %s
 OrderValidatedInDolibarr=Η παραγγελία %s επικυρώθηκε
 OrderDeliveredInDolibarr=Παραγγελία %s κατατάσσεται παραδοτέα
@@ -88,9 +88,9 @@ ProposalDeleted=Η προσφορά διαγράφηκε
 OrderDeleted=Η παραγγελία διαγράφηκε
 InvoiceDeleted=Το τιμολόγιο διαγράφηκε
 DraftInvoiceDeleted=Το πρόχειρο τιμολόγιο διαγράφηκε
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_MODIFYInDolibarr=Contact %s modified
-CONTACT_DELETEInDolibarr=Contact %s deleted
+CONTACT_CREATEInDolibarr=Η επαφή %s δημιουργήθηκε
+CONTACT_MODIFYInDolibarr=Η επαφή %s τροποποιήθηκε
+CONTACT_DELETEInDolibarr=Η επαφή %s διαγράφηκε
 PRODUCT_CREATEInDolibarr=Το προϊόν %s δημιουργήθηκε
 PRODUCT_MODIFYInDolibarr=Το προϊόν %s τροποποιήθηκε
 PRODUCT_DELETEInDolibarr=Το προϊόν %s διαγράφηκε
@@ -118,11 +118,11 @@ BOM_CLOSEInDolibarr=Το BOM είναι απενεργοποιημένο
 BOM_REOPENInDolibarr=Ανοίξτε ξανά το BOM
 BOM_DELETEInDolibarr=Το BOM διαγράφηκε
 MRP_MO_VALIDATEInDolibarr=Το ΜΟ επικυρώθηκε
-MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
+MRP_MO_UNVALIDATEInDolibarr=Το MO ορίστηκε σε πρόχειρη κατάσταση
 MRP_MO_PRODUCEDInDolibarr=Το ΜΟ παράχθηκε
 MRP_MO_DELETEInDolibarr=Το MO διαγράφηκε
-MRP_MO_CANCELInDolibarr=MO canceled
-PAIDInDolibarr=%s paid
+MRP_MO_CANCELInDolibarr=MO ακυρώθηκε
+PAIDInDolibarr=%s πληρώθηκε
 ##### End agenda events #####
 AgendaModelModule=Πρότυπα εγγράφων για συμβάν
 DateActionStart=Ημερομηνία έναρξης
@@ -134,7 +134,7 @@ AgendaUrlOptions4=<b>logint = %s</b> για να περιορίσετε την 
 AgendaUrlOptionsProject=<b>project = __ PROJECT_ID__</b> για να περιορίσετε την έξοδο σε ενέργειες που σχετίζονται με το έργο <b>__PROJECT_ID__</b> .
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b> για την εξαίρεση αυτόματων συμβάντων.
 AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b> για να συμπεριλάβετε εκδηλώσεις διακοπών.
-AgendaShowBirthdayEvents=Birthdays of contacts
+AgendaShowBirthdayEvents=Γενέθλια επαφών
 AgendaHideBirthdayEvents=Απόκρυψη γενεθλίων των επαφών
 Busy=Απασχολ.
 ExportDataset_event1=Κατάλογος των εκδηλώσεων
@@ -156,19 +156,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/el_GR/assets.lang b/htdocs/langs/el_GR/assets.lang
index 5a6b839608a..028eca8d933 100644
--- a/htdocs/langs/el_GR/assets.lang
+++ b/htdocs/langs/el_GR/assets.lang
@@ -61,5 +61,7 @@ MenuListTypeAssets = Λίστα
 #
 # Module
 #
+Asset=Στοιχείο
 NewAssetType=Νέος τύπος παγίου
 NewAsset=Νέα εγγραφή παγίου
+ConfirmDeleteAsset=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το στοιχείο;
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index e4a6e21a685..832d2ad4da7 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -32,14 +32,14 @@ RIB=Αριθμός Τραπ. Λογαριασμού
 IBAN=IBAN
 BIC=Κωδικός BIC / SWIFT
 SwiftValid=Κωδικός BIC / SWIFT έγκυρος
-SwiftVNotalid=Κωδικός BIC / SWIFT μη έγκυρος
-IbanValid=έγκυρο IBAN
+SwiftNotValid=Κωδικός BIC / SWIFT μη έγκυρος
+IbanValid=Έγκυρο IBAN
 IbanNotValid=Μη έγκυρο IBAN
 StandingOrders=Direct debit orders
 StandingOrder=Παραγγελία άμεσης χρέωσης
-PaymentByDirectDebit=πληρωμή άμεσης χρέωσης
-PaymentByBankTransfers=πληρωμές μέσω μεταφοράς πιστώσεως
-PaymentByBankTransfer=πληρωμή μέσω μεταφοράς πιστώσεως
+PaymentByDirectDebit=Πληρωμή με άμεση χρέωση
+PaymentByBankTransfers=Πληρωμές μέσω μεταφοράς πιστώσεως
+PaymentByBankTransfer=Πληρωμή μέσω μεταφοράς πιστώσεως
 AccountStatement=Κίνηση Λογαριασμού
 AccountStatementShort=Κίνηση
 AccountStatements=Κινήσεις Λογαριασμού
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Διεύθυνση τράπεζας
 BankAccountCountry=Χώρα λογαριασμού
 BankAccountOwner=Ιδιοκτήτης Λογαριασμού
 BankAccountOwnerAddress=Διεύθυνση Ιδιοκτήτη
-RIBControlError=Ο έλεγχος ακεραιότητας αξιών απέτυχε. Αυτό σημαίνει ότι οι πληροφορίες για αυτόν τον αριθμό λογαριασμού δεν είναι πλήρεις ή είναι εσφαλμένες (ελέγξτε τη χώρα, τους αριθμούς και τον αριθμό IBAN).
 CreateAccount=Δημιουργία Λογαριασμού
 NewBankAccount=Νέος Λογαριασμός
 NewFinancialAccount=Νέος Λογιστικός Λογαριασμός
@@ -109,13 +108,13 @@ SocialContributionPayment=Σίγουρα θέλετε να μαρκάρετε α
 BankTransfer=μεταφορά πιστώσεως
 BankTransfers=μεταφορές πιστώσεως
 MenuBankInternalTransfer=Εσωτερική μεταφορά
-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=Χρησιμοποιήστε εσωτερική μεταφορά για μεταφορά από έναν λογαριασμό σε άλλο, η εφαρμογή θα γράψει δύο εγγραφές: μια χρέωση στον λογαριασμό προέλευσης και μια πίστωση στον λογαριασμό προορισμού. Το ίδιο ποσό, ετικέτα και ημερομηνία θα χρησιμοποιηθούν για αυτήν τη συναλλαγή.
 TransferFrom=Από
 TransferTo=Προς
 TransferFromToDone=Η μεταφορά από <b>%s</b> στον <b>%s</b> του <b>%s</b> %s έχει καταγραφεί.
 CheckTransmitter=Αποστολέας
 ValidateCheckReceipt=Επικύρωση αυτής της απόδειξης παραλαβής επιταγής;
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
+ConfirmValidateCheckReceipt=Είστε βέβαιοι ότι θέλετε να υποβάλετε αυτήν την απόδειξη επιταγής για επικύρωση; Καμία αλλαγή δεν θα είναι δυνατή μετά την επικύρωση.
 DeleteCheckReceipt=Διαγραφή απόδειξης παραλαβής επιταγής;
 ConfirmDeleteCheckReceipt=Είστε σίγουροι πως θέλετε να διαγράψετε αυτή την απόδειξη παραλαβής επιταγής;
 BankChecks=Τραπεζικές Επιταγές
@@ -128,7 +127,7 @@ ConfirmDeleteTransaction=Είστε βέβαιοι ότι θέλετε να δι
 ThisWillAlsoDeleteBankRecord=Αυτό θα διαγράψει επίσης την εισερχόμενη είσοδο στην τράπεζα
 BankMovements=Κινήσεις
 PlannedTransactions=Προγραμματισμένες καταχωρήσεις
-Graph=γραφήματα
+Graph=Γραφήματα
 ExportDataset_banque_1=Τραπεζικές εγγραφές και αποδείξεις κατάθεσης
 ExportDataset_banque_2=Απόδειξη κατάθεσης
 TransactionOnTheOtherAccount=Συναλλαγή σε άλλο λογαριασμό
@@ -142,7 +141,7 @@ AllAccounts=Όλοι οι τραπεζικοί και ταμιακοί λογα
 BackToAccount=Επιστροφή στον λογαριασμό
 ShowAllAccounts=Εμφάνιση Όλων των Λογαριασμών
 FutureTransaction=Μελλοντική συναλλαγή. Δεν μπορεί να συμφιλιωθεί.
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
+SelectChequeTransactionAndGenerate=Επιλέξτε/φιλτράρετε τις επιταγές που θα συμπεριληφθούν στην απόδειξη κατάθεσης επιταγών. Στη συνέχεια, κάντε κλικ στο "Δημιουργία".
 InputReceiptNumber=Επιλέξτε την κατάσταση των τραπεζών που συνδέονται με τη διαδικασία συνδιαλλαγής. Χρησιμοποιήστε μια σύντομη αριθμητική τιμή όπως: YYYYMM ή YYYYMMDD
 EventualyAddCategory=Τέλος, καθορίστε μια κατηγορία στην οποία θα ταξινομηθούν οι εγγραφές
 ToConciliate=Για να συμφιλιωθώ;
@@ -166,20 +165,20 @@ VariousPayment=Διάφορες πληρωμές
 VariousPayments=Διάφορες πληρωμές
 ShowVariousPayment=Εμφάνιση διαφόρων πληρωμών
 AddVariousPayment=Προσθήκη διαφόρων πληρωμών
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
+VariousPaymentId=Διάφορα ID πληρωμής
+VariousPaymentLabel=Διάφορες ετικέτες πληρωμής
+ConfirmCloneVariousPayment=Επιβεβαιώση του κλώνου μιας διαφορετικής πληρωμής
 SEPAMandate=Εντολές άμεσης χρέωσης
 YourSEPAMandate=Οι εντολές άμεσης χρέωσης σας.
 FindYourSEPAMandate=Αυτή είναι η εντολή ΕΧΠΕ για να εξουσιοδοτήσετε την εταιρεία μας να κάνει άμεση εντολή χρέωσης στην τράπεζά σας. Επιστρέψτε το υπογεγραμμένο (σάρωση του υπογεγραμμένου εγγράφου) ή στείλτε το ταχυδρομικώς η με mail
 AutoReportLastAccountStatement=Συμπληρώστε αυτόματα το πεδίο ' αριθμός τραπεζικού λογαριασμού ' με τον τελευταίο αριθμό τραπεζικής δήλωσης όταν κάνετε τη συμφωνία.
-CashControl=POS cash desk control
-NewCashFence=New cash desk opening or closing
+CashControl=Έλεγχος ταμείου POS
+NewCashFence=Άνοιγμα ή κλείσιμο νέου ταμείου
 BankColorizeMovement=Χρωματισμός κινήσεων
 BankColorizeMovementDesc=Εάν αυτή η λειτουργία είναι ενεργή, μπορείτε να επιλέξετε συγκεκριμένο χρώμα φόντου για χρεωστικές ή πιστωτικές κινήσεις
 BankColorizeMovementName1=Χρώμα φόντου για την κίνηση χρέωσης
 BankColorizeMovementName2=Χρώμα φόντου για την πιστωτική κίνηση
-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
+IfYouDontReconcileDisableProperty=Εάν δεν πραγματοποιήσετε τις τραπεζικές συμφωνίες σε ορισμένους τραπεζικούς λογαριασμούς, απενεργοποιήστε την ιδιότητα "%s" σε αυτούς για να καταργήσετε αυτήν την προειδοποίηση.
+NoBankAccountDefined=Δεν έχει οριστεί τραπεζικός λογαριασμός
+NoRecordFoundIBankcAccount=Δεν βρέθηκε κανένα αρχείο σε τραπεζικό λογαριασμό. Συνήθως, αυτό συμβαίνει όταν μια εγγραφή έχει διαγραφεί με χειροκίνητο τρόπο από τη λίστα συναλλαγών στον τραπεζικό λογαριασμό (για παράδειγμα κατά τη διάρκεια συμφωνίας του τραπεζικού λογαριασμού). Άλλος λόγος είναι ότι η πληρωμή καταγράφηκε όταν η ενότητα/εφαρμογή "%s" ήταν απενεργοποιημένη.
+AlreadyOneBankAccount=Έχει ήδη οριστεί ένας τραπεζικός λογαριασμός
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index d2623c9279b..7e510ba1ac2 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -55,7 +55,7 @@ CustomerInvoice=Τιμολόγιο Πελάτη
 CustomersInvoices=Τιμολόγια πελατών
 SupplierInvoice=Τιμολόγιο προμηθευτή
 SuppliersInvoices=Τιμολόγια προμηθευτή
-SupplierInvoiceLines=Vendor invoice lines
+SupplierInvoiceLines=Γραμμές τιμολογίων προμηθευτή
 SupplierBill=Τιμολόγιο προμηθευτή
 SupplierBills=Τιμολόγια προμηθευτή
 Payment=Πληρωμή
@@ -81,15 +81,14 @@ PaymentsReports=Αναφορές Πληρωμών
 PaymentsAlreadyDone=Ιστορικό Πληρωμών
 PaymentsBackAlreadyDone=Οι επιστροφές χρημάτων έχουν γίνει ήδη
 PaymentRule=Κανόνας Πληρωμής
-PaymentMode=Τρόπος πληρωμής
-DefaultPaymentMode=Default Payment Type
-DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Χρεωστική/Πιστωτική κάρτα
-PaymentTypePP=PayPal
-IdPaymentMode=Τύπος πληρωμής (id)
-CodePaymentMode=Τύπος πληρωμής (κωδικός)
-LabelPaymentMode=Είδος πληρωμής (ετικέτα)
-PaymentModeShort=Τρόπος πληρωμής
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
+DefaultBankAccount=Προεπιλεγμένος τραπεζικός λογαριασμός
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Ορος πληρωμής
 PaymentConditions=Όροι πληρωμής
 PaymentConditionsShort=Όροι πληρωμής
@@ -120,7 +119,7 @@ ConvertExcessPaidToReduc=Μετατρέψτε το επιπλέον ποσό π
 EnterPaymentReceivedFromCustomer=Εισαγωγή πληρωμής από πελάτη
 EnterPaymentDueToCustomer=Πληρωμή προς προμηθευτή
 DisabledBecauseRemainderToPayIsZero=Ανενεργό λόγο μηδενικού υπολοίπου πληρωμής
-PriceBase=Base price
+PriceBase=Βασική τιμή
 BillStatus=Κατάσταση τιμολογίου
 StatusOfGeneratedInvoices=Κατάσταση δημιουργηθέντων τιμολογίων
 BillStatusDraft=Πρόχειρο (απαιτείται επικύρωση)
@@ -192,7 +191,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Το υπόλοιπο που δεν 
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Παραμένουν απλήρωτα <b>(%s %s)</b> έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Δέχομαι να χάσω το ΦΠΑ για την έκπτωση αυτή.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Παραμένουν απλήρωτα <b>(%s %s)</b> έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Έχω την επιστροφή του ΦΠΑ για την έκπτωση αυτή χωρίς πιστωτικό τιμολόγιο.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Κακός πελάτης
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
+ConfirmClassifyPaidPartiallyReasonBankCharge=Παρακράτηση από τράπεζα (ενδιάμεσες τραπεζικές προμήθειες)
 ConfirmClassifyPaidPartiallyReasonProductReturned=Τα προϊόντα επιστράφηκαν μερικώς
 ConfirmClassifyPaidPartiallyReasonOther=Ποσό εγκαταλελειμμένο για άλλους λόγους
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Αυτή η επιλογή είναι δυνατή αν έχουν δοθεί κατάλληλα σχόλια στο τιμολόγιό σας. (Παράδειγμα «Μόνο ο φόρος που αντιστοιχεί στην πράγματι καταβληθείσα τιμή παρέχει δικαίωμα προς έκπτωση»)
@@ -200,7 +199,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Σε ορισμένες χώρ
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Επιλέξτε αυτή την επιλογή αν οι υπόλοιπες δεν ταιριάζουν
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Ένας <b>κακός πελάτης</b> είναι ένας πελάτης που αρνείται να πληρώσει το χρέος του.
 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.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Το μη καταβληθέν ποσό είναι <b> προμήθειες μεσάζουσας τράπεζας </b> , που αφαιρούνται απευθείας από το <b>σωστό ποσό </b> που κατέβαλε ο Πελάτης.
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Χρησιμοποιήστε αυτήν την επιλογή αν δεν είναι κατάλληλες όλες οι άλλες, για παράδειγμα στην ακόλουθη περίπτωση: <br> - η πληρωμή δεν ολοκληρώθηκε επειδή ορισμένα προϊόντα αποστέλλονται πίσω <br> - το ποσό που ζητήθηκε είναι πολύ σημαντικό επειδή μια έκπτωση ξεχάστηκε <br> Σε όλες τις περιπτώσεις, η υπέρμετρη αξίωση πρέπει να διορθωθεί στο λογιστικό σύστημα δημιουργώντας ένα πιστωτικό σημείωμα.
 ConfirmClassifyAbandonReasonOther=Άλλος
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
@@ -236,24 +235,24 @@ AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Ήδη πληρωμένο (χωρίς πιστώσεις ή καταθέσεις)
 Abandoned=Εγκαταλελειμμένο
 RemainderToPay=Παραμένουν απλήρωτα
-RemainderToPayMulticurrency=Remaining unpaid, original currency
+RemainderToPayMulticurrency=Παραμένει απλήρωτο, αρχικό νόμισμα
 RemainderToTake=Υπόλοιπο ποσό να ληφθεί
-RemainderToTakeMulticurrency=Remaining amount to take, original currency
+RemainderToTakeMulticurrency=Υπολειπόμενο ποσό προς λήψη, αρχικό νόμισμα
 RemainderToPayBack=Remaining amount to refund
-RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
-NegativeIfExcessRefunded=negative if excess refunded
+RemainderToPayBackMulticurrency=Υπόλοιπο ποσό για επιστροφή χρημάτων, αρχικό νόμισμα
+NegativeIfExcessRefunded=αρνητικό εάν επιστραφεί επιπλέον ποσό
 Rest=Εκκρεμής
 AmountExpected=Ποσό που ζητήθηκε
 ExcessReceived=Περίσσεια που λήφθηκε
-ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
+ExcessReceivedMulticurrency=Επιπλέον ποσό που ελήφθη, αρχικό νόμισμα
+NegativeIfExcessReceived=αρνητικό εάν ληφθεί πλεονάζων
 ExcessPaid=Πληρωμή υπέρβασης
-ExcessPaidMulticurrency=Excess paid, original currency
+ExcessPaidMulticurrency=Επιπλέον ποσό πληρωμένο, αρχικό νόμισμα
 EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Έκπτωση
 SendBillRef=Υποβολή των τιμολογίων %s
 SendReminderBillRef=Υποβολή των τιμολογίων %s (υπενθύμιση)
-SendPaymentReceipt=Submission of payment receipt %s
+SendPaymentReceipt=Υποβολή απόδειξης πληρωμής %s
 NoDraftBills=Δεν υπάρχουν προσχέδια
 NoOtherDraftBills=Δεν υπάρχουν άλλα προσχέδια
 NoDraftInvoices=Δεν υπάρχουν προσχέδια τιμολογίων
@@ -269,8 +268,8 @@ DateMaxPayment=Προθεσμία Πληρωμής
 DateInvoice=Ημερομηνία τιμολογίου
 DatePointOfTax=Point of tax
 NoInvoice=Δεν υπάρχει τιμολόγιο
-NoOpenInvoice=No open invoice
-NbOfOpenInvoices=Number of open invoices
+NoOpenInvoice=Χωρίς ανοιχτό τιμολόγιο
+NbOfOpenInvoices=Αριθμός ανοιχτών τιμολογίων
 ClassifyBill=Κατηγοριοποίηση Τιμολογίου
 SupplierBillsToPay=Μη πληρωθέντα τιμολόγια προμηθευτή
 CustomerBillsUnpaid=Ανεξόφλητα τιμολόγια πελάτη
@@ -280,6 +279,7 @@ SetMode=Ορίστε τον τύπο πληρωμής
 SetRevenuStamp=Set revenue stamp
 Billed=Τιμολογημένο
 RecurringInvoices=Επαναλαμβανόμενα τιμολόγια
+RecurringInvoice=Επαναλαμβανόμενο τιμολόγιο
 RepeatableInvoice=Πρότυπο τιμολογίου
 RepeatableInvoices=Πρότυπο τιμολόγιο
 Repeatable=Πρώτυπο
@@ -388,7 +388,7 @@ DateLastGeneration=Ημερομηνία τελευταίας δημιουργί
 DateLastGenerationShort=Ημερομηνία τελευταίας γεν.
 MaxPeriodNumber=Μέγιστη. αριθμός δημιουργίας τιμολογίου
 NbOfGenerationDone=Αριθμός γεννήσεων τιμολογίων που έχουν ήδη γίνει
-NbOfGenerationOfRecordDone=Number of record generation already done
+NbOfGenerationOfRecordDone=Αριθμός δημιουργίας εγγραφών που έχουν ήδη γίνει
 NbOfGenerationDoneShort=Αριθμός γενεάς που έγινε
 MaxGenerationReached=Ο μέγιστος αριθμός γενεών έφτασε
 InvoiceAutoValidate=Αυτόματη επικύρωση τιμολογίων
@@ -399,7 +399,7 @@ GeneratedFromTemplate=Δημιουργήθηκε από το τιμολόγιο
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 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
@@ -429,7 +429,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Σταθερό ποσό - 1 γραμμή με την ετικέτα '%s'
 VarAmount=Μεταβλητή ποσού (%% tot.)
 VarAmountOneLine=Μεταβλητή ποσότητα (%% tot.) - 1 γραμμή με την ετικέτα &#39;%s&#39;
-VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
+VarAmountAllLines=Μεταβλητό ποσό (%% συνολικά) - όλες οι γραμμές από τις αρχικές
 # PaymentType
 PaymentTypeVIR=Τραπεζική μεταφορά
 PaymentTypeShortVIR=Τραπεζική μεταφορά
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Πρόχειρο
 PaymentTypeFAC=Παράγοντας
 PaymentTypeShortFAC=Παράγοντας
+PaymentTypeDC=Χρεωστική/Πιστωτική κάρτα
+PaymentTypePP=PayPal
 BankDetails=Πληροφορίες τράπεζας
 BankCode=Κωδικός τράπεζας
 DeskCode=Κωδικός υποκαταστήματος
@@ -457,8 +459,8 @@ BankAccountNumberKey=Αθροιστικό Checksum
 Residence=Διεύθυνση
 IBANNumber=Αριθμός λογαριασμού IBAN
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=IBAN πελάτη
+SupplierIBAN=IBAN προμηθευτή
 BIC=BIC/SWIFT
 BICNumber=Κωδικός BIC / SWIFT
 ExtraInfos=Επιπρόσθετες Πληροφορίες
@@ -466,7 +468,7 @@ RegulatedOn=Ρυθμιζόμενη για
 ChequeNumber=Αριθμός Επιταγής
 ChequeOrTransferNumber=Αρ. Επιταγής/Μεταφοράς
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer sender
+ChequeMaker=Έλεγχος/Μεταφορά αποστολέα
 ChequeBank=Τράπεζα Επιταγής
 CheckBank=Επιταγή
 NetToBePaid=Φόρος προς πληρωμή
@@ -510,16 +512,16 @@ Cash=Μετρητά
 Reported=Με καθυστέρηση
 DisabledBecausePayments=Δεν είναι δυνατόν, δεδομένου ότι υπάρχουν ορισμένες πληρωμές
 CantRemovePaymentWithOneInvoicePaid=Δεν μπορείτε να καταργήσετε τη πληρωμή, δεδομένου ότι υπάρχει τουλάχιστον ένα τιμολόγιο που έχει χαρακτηριστεί σαν πληρωμένο
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
+CantRemovePaymentVATPaid=Δεν είναι δυνατή η κατάργηση της πληρωμής, καθώς η δήλωση ΦΠΑ έχει ταξινομηθεί ως πληρωμένη
+CantRemovePaymentSalaryPaid=Δεν είναι δυνατή η κατάργηση της πληρωμής, καθώς ο μισθός ταξινομήθηκε ως πληρωμένος
 ExpectedToPay=Αναμενόμενη Πληρωμή
 CantRemoveConciliatedPayment=Δεν είναι δυνατή η κατάργηση της κοινής πληρωμής
 PayedByThisPayment=Πληρωθείτε αυτό το ποσό
 ClosePaidInvoicesAutomatically=Ταξινόμηση αυτόματα όλα τα τυποποιημένα, προκαθορισμένα ή αντικαταστατικά τιμολόγια ως &quot;Πληρωμένα&quot; όταν η πληρωμή γίνει εξ ολοκλήρου.
 ClosePaidCreditNotesAutomatically=Ταξινόμηση αυτόματα όλες τις πιστωτικές σημειώσεις ως &quot;Πληρωθεί&quot; όταν η επιστροφή γίνεται εξ ολοκλήρου.
 ClosePaidContributionsAutomatically=Ταξινόμηση αυτόματα όλες τις κοινωνικές ή φορολογικές εισφορές ως &quot;Πληρωθεί&quot; όταν η πληρωμή γίνει εξ ολοκλήρου.
-ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
-ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Ταξινομήστε αυτόματα τη δήλωση ΦΠΑ ως «Εξοφλημένο» όταν η πληρωμή γίνει εξ ολοκλήρου.
+ClosePaidSalaryAutomatically=Ταξινομήστε αυτόματα τον μισθό ως "Πληρωμένο" όταν η πληρωμή γίνει εξ ολοκλήρου.
 AllCompletelyPayedInvoiceWillBeClosed=Όλα τα τιμολόγια που δεν πληρώνουν υπόλοιπο θα κλείσουν αυτόματα με την κατάσταση &quot;Πληρωμή&quot;.
 ToMakePayment=Πληρωμή
 ToMakePaymentBack=Pay back
@@ -532,10 +534,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Πρότυπο τιμολόγιο PDF Crabe. Ένα πλήρες πρότυπο τιμολογίου (παλιά εφαρμογή του προτύπου Sponge)
 PDFSpongeDescription=Τιμολόγιο πρότυπο PDF Σφουγγάρι. Ένα πλήρες πρότυπο τιμολογίου
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Επιστρέφει τη μορφή %syymm-nnnn για τυπικά τιμολόγια και %syymm-nnnn για πιστωτικές σημειώσεις όπου yy είναι έτος, mm είναι μήνας και nnnn είναι ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς διακοπή και χωρίς επιστροφή στο 0
+MarsNumRefModelDesc1=Επιστρέφει τη μορφή %syymm-nnnn για τυπικά τιμολόγια, %syymm-nnnn για τιμολόγια αντικατάστασης, %syymm-nnnn για τιμολόγια προκαταβολής και %syymm-nnnn για τιμολόγια αντικατάστασης, %syymm-nnnn για πιστωτικά τιμολόγια όπου yy είναι το έτος,mm ο μήνας και nnnn είναι ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς διακοπή και χωρίς επιστροφή στο 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=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=Αριθμός επιστροφής με τη μορφή %syymm-nnnn για τυπικά τιμολόγια, %syymm-nnnn για πιστωτικά σημειώματα και %syymm-nnnn για τιμολόγια προκαταβολής όπου το yy είναι το έτος,mm ο μήνας και nnnn ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς διακοπή χωρίς επιστροφή στο 0
 EarlyClosingReason=Πρώιμος λόγος κλεισίματος
 EarlyClosingComment=Πρώιμο σημείωμα κλεισίματος
 ##### Types de contacts #####
@@ -581,9 +583,9 @@ ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually
 ToCreateARecurringInvoiceGeneAuto=Αν χρειαστεί να δημιουργήσετε αυτομάτως τέτοιου είδους τιμολόγια, ζητήστε από τον διαχειριστή σας να ενεργοποιήσει και να ρυθμίσει την ενότητα <strong>%s</strong> . Λάβετε υπόψη ότι και οι δύο μέθοδοι (χειροκίνητες και αυτόματες) μπορούν να χρησιμοποιηθούν χωρίς να υπάρχει κίνδυνος επανάληψης.
 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
+CreateOneBillByThird=Δημιουργία ενός τιμολογίου ανά τρίτο μέρος (διαφορετικά, ένα τιμολόγιο ανά επιλεγμένο αντικείμενο)
+BillCreated=%s τιμολόγιο(α) δημιουργήθηκε(αν)
+BillXCreated=Δημιουργήθηκε το τιμολόγιο %s
 StatusOfGeneratedDocuments=Κατάσταση δημιουργίας εγγράφων
 DoNotGenerateDoc=Μην δημιουργείτε αρχείο εγγράφων
 AutogenerateDoc=Αυτόματη δημιουργία αρχείου εγγράφου
@@ -594,13 +596,14 @@ AutoFillDateToShort=Ορίστε την ημερομηνία λήξης
 MaxNumberOfGenerationReached=Μέγιστος αριθμός γονιδίων. επιτευχθεί
 BILL_DELETEInDolibarr=Το τιμολόγιο διαγράφηκε
 BILL_SUPPLIER_DELETEInDolibarr=Το τιμολόγιο προμηθευτή διαγράφηκε
-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
+UnitPriceXQtyLessDiscount=Τιμή μονάδας x Ποσότητα - Έκπτωση
+CustomersInvoicesArea=Περιοχή χρέωσης πελατών
+SupplierInvoicesArea=Περιοχή χρέωσης προμηθευτή
+FacParentLine=Γραμμή τιμολογίου Μητρική
+SituationTotalRayToRest=Υπενθύμιση πληρωμής χωρίς φόρο
+PDFSituationTitle=Κατάσταση αρ. %d
+SituationTotalProgress=Συνολική πρόοδος %d %%
+SearchUnpaidInvoicesWithDueDate=Αναζήτηση απλήρωτων τιμολογίων με ημερομηνία λήξης = %s
+NoPaymentAvailable=Δεν υπάρχει διαθέσιμη πληρωμή για %s
+PaymentRegisteredAndInvoiceSetToPaid=Η πληρωμή καταχωρήθηκε και το τιμολόγιο %s ορίστηκε ως πληρωμένο
+SendEmailsRemindersOnInvoiceDueDate=Αποστολή υπενθύμισης μέσω email για απλήρωτα τιμολόγια
diff --git a/htdocs/langs/el_GR/blockedlog.lang b/htdocs/langs/el_GR/blockedlog.lang
index b57f73838c8..f0be0bb0a68 100644
--- a/htdocs/langs/el_GR/blockedlog.lang
+++ b/htdocs/langs/el_GR/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/el_GR/bookmarks.lang b/htdocs/langs/el_GR/bookmarks.lang
index c5d8256ec92..2b89dbeed64 100644
--- a/htdocs/langs/el_GR/bookmarks.lang
+++ b/htdocs/langs/el_GR/bookmarks.lang
@@ -15,8 +15,8 @@ UrlOrLink=URL
 BehaviourOnClick=Μετάβαση σε
 CreateBookmark=Δημιουργία σελιδοδείκτη
 SetHereATitleForLink=Ορίστε ένα όνομα για το σελιδοδείκτη
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Χρησιμοποιήστε έναν εξωτερικό / απόλυτο σύνδεσμο (https: // URL) ή έναν εσωτερικό / σχετικό σύνδεσμο (/ DOLIBARR_ROOT / htdocs / ...)
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Χρησιμοποιήστε έναν εξωτερικό/απόλυτο σύνδεσμο (https://externalurl.com) ή έναν εσωτερικό/σχετικό σύνδεσμο (/mypage.php). Μπορείτε επίσης να χρησιμοποιήσετε τηλέφωνο όπως τηλ: 0123456.
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Επιλέξτε εάν η συνδεδεμένη σελίδα πρέπει να ανοίξει στην τρέχουσα καρτέλα ή σε μια νέα καρτέλα
 BookmarksManagement=Διαχείριση σελιδοδεικτών
 BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=No bookmarks defined
+NoBookmarks=Δεν έχουν οριστεί σελιδοδείκτες
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index e9b326ddb64..68f4040ed0c 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/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,12 +46,12 @@ 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
+BoxTitleLastContracts=Τα πιο πρόσφατα %s συμβόλαια που τροποποιήθηκαν
+BoxTitleLastModifiedDonations=Τελευταίες %s δωρεές  που τροποποιήθηκαν
+BoxTitleLastModifiedExpenses=Τελευταίες  %s αναφορές εξόδων που τροποποιήθηκαν
+BoxTitleLatestModifiedBoms=Τελευταία %s BOM που τροποποιήθηκαν
+BoxTitleLatestModifiedMos=Τελευταίες %s Παραγγελίες Κατασκευής που τροποποιήθηκαν
+BoxTitleLastOutstandingBillReached=Πελάτες με υπέρβαση του μέγιστου οφειλόμενου
 BoxGlobalActivity=Η γενική δραστηριότητα για (τιμολόγια, προσφορές, παραγγελίες)
 BoxGoodCustomers=Καλοί πελάτες
 BoxTitleGoodCustomers=%s καλών πελατών
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Παραγγελίες προμηθευτή
 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=Προσφορές
@@ -100,8 +100,8 @@ LastXMonthRolling=Ο τελευταίος κύλινδρος %s μήνα
 ChooseBoxToAdd=Προσθέστε widget στον πίνακα ελέγχου
 BoxAdded=Το Widget προστέθηκε στον πίνακα ελέγχου σας
 BoxTitleUserBirthdaysOfMonth=Γενέθλια αυτού του μήνα (χρήστες)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
+BoxLastManualEntries=Τελευταία εγγραφή στη λογιστική που καταχωρήθηκε χειροκίνητα ή χωρίς έγγραφο πηγής
+BoxTitleLastManualEntries=%s τελευταίες εγγραφές που έχουν εισαχθεί χειροκίνητα ή χωρίς έγγραφο προέλευσης
 NoRecordedManualEntries=Δεν καταγράφονται μη καταχωρημένα μητρώα στη λογιστική
 BoxSuspenseAccount=Αρίθμηση λογιστικής λειτουργίας με λογαριασμό αναμονής
 BoxTitleSuspenseAccount=Αριθμός μη διατεθέντων γραμμών
@@ -112,9 +112,9 @@ BoxTitleLastCustomerShipments=Τελευταίες %s αποστολές πελ
 NoRecordedShipments=Καμία καταγεγραμμένη αποστολή πελάτη
 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
+UsersHome=Αρχικοί χρήστες και ομάδες
+MembersHome=Αρχική Συνδρομή
+ThirdpartiesHome=Αρχική Τρίτοι
+TicketsHome=Αρχικά Εισιτήρια
+AccountancyHome=Αρχική Λογιστική
+ValidatedProjects=Επικυρωμένα έργα
diff --git a/htdocs/langs/el_GR/cashdesk.lang b/htdocs/langs/el_GR/cashdesk.lang
index 480c3fcb4e5..d5b6521d4e4 100644
--- a/htdocs/langs/el_GR/cashdesk.lang
+++ b/htdocs/langs/el_GR/cashdesk.lang
@@ -41,8 +41,8 @@ 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
+OrderPrinters=Προσθέστε ένα κουμπί για να στείλετε την παραγγελία σε ορισμένους εκτυπωτές, χωρίς πληρωμή (για παράδειγμα για να στείλετε μια παραγγελία σε μια κουζίνα)
+NotAvailableWithBrowserPrinter=Δεν είναι διαθέσιμο όταν ο εκτυπωτής για παραλαβή έχει ρυθμιστεί στο πρόγραμμα περιήγησης
 SearchProduct=Αναζήτηση προϊόντος
 Receipt=Παραλαβή
 Header=Επί κεφαλής
@@ -50,16 +50,16 @@ Footer=Υποσέλιδο
 AmountAtEndOfPeriod=Ποσό στο τέλος της περιόδου (ημέρα, μήνας ή έτος)
 TheoricalAmount=Θεωρητικό ποσό
 RealAmount=Πραγματικό ποσό
-CashFence=Cash desk closing
-CashFenceDone=Cash desk closing done for the period
+CashFence=Κλείσιμο ταμείου
+CashFenceDone=Το κλείσιμο του ταμείου ολοκληρώθηκε για αυτήν την περίοδο
 NbOfInvoices=Πλήθος τιμολογίων
 Paymentnumpad=Τύπος πλακέτας για να πληκτρολογήσετε την πληρωμή
 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
+TakeposNeedsCategories=Το TakePOS χρειάζεται τουλάχιστον μία κατηγορία προϊόντων για να λειτουργήσει
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=Το TakePOS χρειάζεται τουλάχιστον 1 κατηγορία προϊόντων στην κατηγορία <b> %s </b> για να λειτουργήσει
+OrderNotes=Μπορεί να προσθέσει μερικές σημειώσεις σε κάθε παραγγελία
 CashDeskBankAccountFor=Προεπιλεγμένος λογαριασμός που θα χρησιμοποιηθεί για πληρωμές σε
 NoPaimementModesDefined=Δεν έχει ρυθμιστεί η λειτουργία πρατηρίου που έχει οριστεί στη διαμόρφωση του TakePOS
 TicketVatGrouped=Ομαδικός ΦΠΑ ανά τιμή σε εισιτήρια | αποδείξεις
@@ -84,7 +84,7 @@ InvoiceIsAlreadyValidated=Το τιμολόγιο έχει ήδη επικυρω
 NoLinesToBill=Δεν υπάρχουν γραμμές που να χρεώνουν
 CustomReceipt=Προσαρμοσμένη παραλαβή
 ReceiptName=Όνομα παραλαβής
-ProductSupplements=Manage supplements of products
+ProductSupplements=Διαχειριστείτε τα συμπληρώματα προϊόντων
 SupplementCategory=Συμπλήρωμα κατηγορίας
 ColorTheme=Χρώμα θέματος
 Colorful=Πολύχρωμα
@@ -96,41 +96,41 @@ TakeposConnectorMethodDescription=Εξωτερική μονάδα με επιπ
 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).
 ByTerminal=Από τερματικό
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
-CashDeskRefNumberingModules=Numbering module for POS sales
+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
+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=Το έτος δεν ορίστηκε
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index 6ba2a0b5196..cf6188f58bb 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/categories.lang
@@ -10,16 +10,16 @@ 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
+SuppliersCategoriesArea=Περιοχή ετικετών/κατηγοριών προμηθευτή
+CustomersCategoriesArea=Περιοχή ετικετών/κατηγοριών πελατών
+MembersCategoriesArea=Περιοχή ετικετών/κατηγοριών μελών
+ContactsCategoriesArea=Περιοχή ετικετών/κατηγοριών επαφών
+AccountsCategoriesArea=Περιοχή ετικετών/κατηγοριών τραπεζικού λογαριασμού
 ProjectsCategoriesArea=Πεδίο Ετικετών/Κατηγοριών έργου
-UsersCategoriesArea=User tags/categories area
+UsersCategoriesArea=Περιοχή ετικετών/κατηγοριών χρήστη
 SubCats=Υποκατηγορίες
 CatList=Λίστα Ετικετών/Κατηγοριών
-CatListAll=List of tags/categories (all types)
+CatListAll=Λίστα ετικετών/κατηγοριών (όλοι οι τύποι)
 NewCategory=Νέα Ετικέτα/Κατηγορία
 ModifCat=Τροποποίηση Ετικέτας/Κατηγορίας
 CatCreated=Ετικέτα/Κατηγορία δημιουργήθηκε
@@ -68,33 +68,33 @@ 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
+CatSupList=Λίστα ετικετών/κατηγοριών προμηθευτών
+CatCusList=Λίστα ετικετών/κατηγοριών πελατών/υποψήφιων πελατών
 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
+CatContactList=Λίστα ετικετών/κατηγοριών επαφών
+CatProjectsList=Λίστα ετικετών/κατηγοριών έργων
+CatUsersList=Λίστα ετικετών/κατηγοριών χρηστών
+CatSupLinks=Σύνδεσμοι μεταξύ προμηθευτών και ετικετών/κατηγοριών
 CatCusLinks=Συνδέσεις μεταξύ πελατών/προοπτικών και ετικετών/κατηγοριών
 CatContactsLinks=Σύνδεσμοι μεταξύ επαφών / διευθύνσεων και ετικετών / κατηγοριών
 CatProdLinks=Συνδέσεις μεταξύ προϊόντων/υπηρεσιών και ετικετών/κατηγοριών
-CatMembersLinks=Links between members and tags/categories
+CatMembersLinks=Σύνδεσμοι μεταξύ μελών και ετικετών/κατηγοριών
 CatProjectsLinks=Links between projects and tags/categories
-CatUsersLinks=Links between users and tags/categories
+CatUsersLinks=Σύνδεσμοι μεταξύ χρηστών και ετικετών/κατηγοριών
 DeleteFromCat=Αφαίρεση αυτής της ετικέτας/κατηγορίας
 ExtraFieldsCategories=Συμπληρωματικά χαρακτηριστικά
 CategoriesSetup=Ρύθμιση ετικετών/κατηγοριών
 CategorieRecursiv=Αυτόματη σύνδεση με μητρική ετικέτα/κατηγορία
 CategorieRecursivHelp=Εάν είναι ενεργοποιημένη η επιλογή, όταν προσθέσετε ένα προϊόν σε μια υποκατηγορία, το προϊόν θα προστεθεί επίσης στην κατηγορία γονέων.
 AddProductServiceIntoCategory=Προσθέστε το ακόλουθο προϊόν/υπηρεσία
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=Εκχώρηση κατηγορίας στον πελάτη
+AddSupplierIntoCategory=Εκχώρηση κατηγορίας στον προμηθευτή
 ShowCategory=Εμφάνιση ετικέτας/κατηγορίας
 ByDefaultInList=By default in list
 ChooseCategory=Επιλέξτε κατηγορία
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
-WebsitePagesCategoriesArea=Page-Container Categories
-KnowledgemanagementsCategoriesArea=KM article Categories
-UseOrOperatorForCategories=Use 'OR' operator for categories
+StocksCategoriesArea=Κατηγορίες Αποθήκης
+ActionCommCategoriesArea=Κατηγορίες εκδηλώσεων
+WebsitePagesCategoriesArea=Κατηγορίες Σελίδας-Κοντέινερ
+KnowledgemanagementsCategoriesArea=Κατηγορίες άρθρου KM
+UseOrOperatorForCategories=Χρησιμοποιήστε τον τελεστή 'OR' για κατηγορίες
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 5a7e401cb49..358745ba199 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -43,10 +43,10 @@ Individual=Ιδιώτης
 ToCreateContactWithSameName=Θα δημιουργήσει αυτόματα μια επαφή / διεύθυνση με τις ίδιες πληροφορίες με το τρίτο μέρος στο τρίτο μέρος. Στις περισσότερες περιπτώσεις, ακόμη και αν το τρίτο σας πρόσωπο είναι φυσικό πρόσωπο, είναι αρκετό να δημιουργηθεί ένα τρίτο μέρος μόνο του.
 ParentCompany=Γονική εταιρία
 Subsidiaries=Θυγατρικές
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
+ReportByMonth=Αναφορά ανά Μήνα
+ReportByCustomers=Αναφορά ανά Πελάτη
+ReportByThirdparties=Αναφορά ανά Τρίτο Μέρος
+ReportByQuarter=Αναφορά ανά Τιμή
 CivilityCode=Προσφωνήσεις
 RegisteredOffice=Έδρα της εταιρείας
 Lastname=Επίθετο
@@ -125,7 +125,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 +137,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=Αριθμός EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -145,11 +145,11 @@ 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)
 ProfId2CL=-
@@ -157,6 +157,18 @@ 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=Καθ Id 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -167,7 +179,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)
@@ -181,7 +193,7 @@ ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
 ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
-ProfId1ShortFR=SIREN
+ProfId1ShortFR=ΣΕΙΡΗΝΑ
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
@@ -209,13 +221,13 @@ 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)
@@ -233,7 +245,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)
@@ -316,7 +328,7 @@ AddContact=Δημιουργία επαφής
 AddContactAddress=Δημιουργία επαφής/διεύθυνση
 EditContact=Επεξεργασία επαφής
 EditContactAddress=Επεξεργασία επαφής/διεύθυνσης
-Contact=Contact/Address
+Contact=Επαφή/Διεύθυνση
 Contacts=Αντιπρόσωποι
 ContactId=Contact id
 ContactsAddresses=Επαφές/Διευθύνσεις
@@ -337,15 +349,15 @@ CustomerCodeDesc=Κωδικός πελάτη, μοναδικός για κάθε
 SupplierCodeDesc=Κωδικός προμηθευτή, μοναδικό για όλους τους προμηθευτές
 RequiredIfCustomer=Απαιτείται αν το στοιχείο είναι πελάτης ή προοπτική
 RequiredIfSupplier=Απαιτείται αν κάποιος τρίτος είναι πωλητής
-ValidityControledByModule=Validity controlled by the module
+ValidityControledByModule=Η εγκυρότητα ελέγχεται από τη μονάδα
 ThisIsModuleRules=Κανόνες για αυτήν την ενότητα
 ProspectToContact=Προοπτική σε Επαφή
 CompanyDeleted="%s" διαγράφηκε από την βάση δεδομένων
 ListOfContacts=Λίστα αντιπροσώπων
 ListOfContactsAddresses=Λίστα αντιπροσώπων
 ListOfThirdParties=Κατάλογος τρίτων μερών
-ShowCompany=Third Party
-ShowContact=Contact-Address
+ShowCompany=Τρίτο Μέρος
+ShowContact=Επαφή-Διεύθυνση
 ContactsAllShort=Όλα (Χωρίς Φίλτρο)
 ContactType=Τύπος αντιπροσώπου επικοινωνίας
 ContactForOrders=Αντιπρόσωπος επικοινωνίας για παραγγελία
@@ -369,11 +381,11 @@ VATIntraCheck=Έλεγχος
 VATIntraCheckDesc=Το αναγνωριστικό ΦΠΑ πρέπει να περιλαμβάνει το πρόθεμα χώρας. Ο σύνδεσμος <b>%s</b> χρησιμοποιεί την ευρωπαϊκή υπηρεσία ελέγχου ΦΠΑ (VIES), η οποία απαιτεί πρόσβαση στο Διαδίκτυο από το διακομιστή Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Ελέγξτε το ενδοκοινοτικό αναγνωριστικό ΦΠΑ στον δικτυακό τόπο της Ευρωπαϊκής Επιτροπής
-VATIntraManualCheck=Μπορείτε επίσης να ελέγξετε χειροκίνητα στον ιστότοπο της Ευρωπαϊκής Επιτροπής <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=Μπορείτε επίσης να ελέγξετε με μη αυτόματο τρόπο στον ιστότοπο της Ευρωπαϊκής Επιτροπής <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
+Workforce=ΕΡΓΑΤΙΚΟ Δυναμικό
 Staff=Εργαζόμενοι
 ProspectLevelShort=Δυναμική
 ProspectLevel=Δυναμική προοπτικής
@@ -478,6 +490,6 @@ MulticurrencyUsed=Χρησιμοποιήστε το Πολλαπλάσιο
 MulticurrencyCurrency=Νόμισμα
 InEEC=Ευρώπη (ΕΕ)
 RestOfEurope=Υπόλοιπη Ευρώπη (ΕΕ)
-OutOfEurope=Out of Europe (EEC)
+OutOfEurope=Εκτός Ευρώπης (ΕΟΚ)
 CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Προσοχή, ανάλογα με τις ρυθμίσεις τιμής του προϊόντος σας, θα πρέπει να αλλάξετε το Τρίτο Μέρος πριν προσθέσετε το προϊόν στο POS.
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index 10b1fafc542..17136f57f5d 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -65,12 +65,12 @@ LT2SupplierIN=Οι αγορές SGST
 VATCollected=VAT collected
 StatusToPay=Προς πληρωμή
 SpecialExpensesArea=Περιοχή για όλες τις ειδικές πληρωμές
-VATExpensesArea=Area for all TVA payments
+VATExpensesArea=Περιοχή όλων των πληρωμών TVA
 SocialContribution=Κοινωνική ή φορολογική εισφορά
 SocialContributions=Κοινωνικές ή φορολογικές εισφορές
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
-DateOfSocialContribution=Date of social or fiscal tax
+DateOfSocialContribution=Ημερομηνία κοινωνικού ή φορολογικού φόρου
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Ειδικά έξοδα
@@ -86,7 +86,7 @@ PaymentCustomerInvoice=Πληρωμή τιμολογίου πελάτη
 PaymentSupplierInvoice=πληρωμή τιμολογίου προμηθευτή
 PaymentSocialContribution=Πληρωμή Κοινωνικής/Φορολογικής εισφοράς
 PaymentVat=Πληρωμή Φ.Π.Α.
-AutomaticCreationPayment=Automatically record the payment
+AutomaticCreationPayment=Αυτόματη καταγραφή πληρωμής
 ListPayment=Λίστα πληρωμών
 ListOfCustomerPayments=Λίστα πληρωμών πελατών
 ListOfSupplierPayments=Λίστα πληρωμών προμηθευτών
@@ -106,8 +106,8 @@ LT2PaymentES=IRPF Πληρωμής
 LT2PaymentsES=Πληρωμές IRPF
 VATPayment=Πληρωμή ΦΠΑ πωλήσεων
 VATPayments=Πληρωμές ΦΠΑ πωλήσεων
-VATDeclarations=VAT declarations
-VATDeclaration=VAT declaration
+VATDeclarations=Δηλώσεις ΦΠΑ
+VATDeclaration=Δήλωση ΦΠΑ
 VATRefund=Sales tax refund
 NewVATPayment=Νέα καταβολή φόρου επί των πωλήσεων
 NewLocalTaxPayment=Νέα πληρωμή φόρου %s
@@ -115,7 +115,7 @@ Refund=Refund
 SocialContributionsPayments=Πληρωμές Κοινωνικών/Φορολογικών εισφορών
 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)
+BalanceVisibilityDependsOnSortAndFilters=Το υπόλοιπο είναι ορατό σε αυτήν τη λίστα μόνο εάν ο πίνακας είναι ταξινομημένος σε %s και φιλτράρεται σε 1 τραπεζικό λογαριασμό (χωρίς άλλα φίλτρα)
 CustomerAccountancyCode=Κωδικός λογιστικής πελάτη
 SupplierAccountancyCode=Κωδικός Προμηθευτή
 CustomerAccountancyCodeShort=Cust. account. code
@@ -135,7 +135,7 @@ NewCheckReceipt=Νέα έκπτωση
 NewCheckDeposit=Νέα κατάθεση επιταγής
 NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=Δεν υπάρχουν επιταγές που αναμένουν κατάθεση.
-DateChequeReceived=Check receiving date
+DateChequeReceived=Ελέγξτε την ημερομηνία λήψης
 NbOfCheques=Αριθμός ελέγχων
 PaySocialContribution=Πληρωμή Κοινωνικής/Φορολογικής εισφοράς
 PayVAT=Pay a VAT declaration
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- Περιλαμβάνει εκκρεμή τιμολόγια, έξοδα, ΦΠΑ, δωρεές είτε πληρώνονται είτε όχι. Περιλαμβάνει επίσης πληρωμένους μισθούς. <br> - Βασίζεται στην ημερομηνία χρέωσης των τιμολογίων και στην ημερομηνία λήξης των εξόδων ή των φόρων. Για τους μισθούς που ορίζονται με την ενότητα Μισθός, χρησιμοποιείται η ημερομηνία αξίας πληρωμής.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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=- Περιλαμβάνει τα οφειλόμενα τιμολόγια του πελάτη, είτε πληρώνονται είτε όχι. <br> - Βασίζεται στην ημερομηνία χρέωσης αυτών των τιμολογίων. <br>
 RulesCAIn=- Περιλαμβάνει όλες τις πραγματικές πληρωμές τιμολογίων που εισπράττονται από πελάτες. <br> - Βασίζεται στην ημερομηνία πληρωμής αυτών των τιμολογίων <br>
 RulesCATotalSaleJournal=Περιλαμβάνει όλες τις πιστωτικές γραμμές από το περιοδικό Sale.
@@ -295,3 +296,5 @@ 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/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index f6ef12100f3..967c1b4090b 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Η επαφή αυτή έχει ήδ
 ErrorCashAccountAcceptsOnlyCashMoney=Αυτό τραπεζικός λογαριασμός είναι ένας λογαριασμός σε μετρητά, έτσι ώστε να δέχεται πληρωμές σε μετρητά τύπου μόνο.
 ErrorFromToAccountsMustDiffers=Πηγή και τους στόχους των τραπεζικών λογαριασμών πρέπει να είναι διαφορετικό.
 ErrorBadThirdPartyName=Κακή τιμή για όνομα τρίτου μέρους
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=Το %s είναι υποχρεωτικό
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Λάθος σύνταξη για τον κωδικό πελάτη
 ErrorBadBarCodeSyntax=Κακή σύνταξη για τον γραμμωτό κώδικα. Μπορεί να ορίσετε έναν κακό τύπο γραμμωτού κώδικα ή έχετε ορίσει μια μάσκα γραμμωτού κώδικα για την αρίθμηση που δεν ταιριάζει με την τιμή που σαρώθηκε.
 ErrorCustomerCodeRequired=Κωδικός πελάτη απαιτείται
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Αποτυγχάνει να πάρει RSS feed. Προ
 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=Εγγραφή υπάρχει ήδη
 ErrorLabelAlreadyExists=Αυτή η ετικέτα υπάρχει ήδη
@@ -271,6 +274,9 @@ 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=Η παράμετρος PHP upload_max_filesize (%s) είναι υψηλότερη από την παράμετρο PHP post_max_size (%s). Αυτό δεν είναι μια σταθερή ρύθμιση.
@@ -284,7 +290,7 @@ WarningConfFileMustBeReadOnly=Προειδοποίηση, config αρχείο σ
 WarningsOnXLines=Προειδοποιήσεις στα <b>%s</b> γραμμές κώδικα
 WarningNoDocumentModelActivated=Δεν έχει ενεργοποιηθεί κανένα μοντέλο για την παραγωγή εγγράφων. Ένα πρότυπο θα επιλεγεί από προεπιλογή μέχρι να ελέγξετε τη ρύθμιση της μονάδας σας.
 WarningLockFileDoesNotExists=Προειδοποίηση, αφού ολοκληρωθεί η εγκατάσταση, πρέπει να απενεργοποιήσετε τα εργαλεία εγκατάστασης / μετάβασης προσθέτοντας ένα αρχείο <b>install.lock</b> στον κατάλογο <b>%s</b> . Η παράλειψη της δημιουργίας αυτού του αρχείου αποτελεί σοβαρό κίνδυνο για την ασφάλεια.
-WarningUntilDirRemoved=Όλες οι προειδοποιήσεις ασφαλείας (ορατές μόνο από τους χρήστες διαχειριστή) θα παραμείνουν ενεργοποιημένες όσο υπάρχει ευπάθεια (ή ότι η σταθερή MAIN_REMOVE_INSTALL_WARNING προστίθεται στο Setup-&gt; Other Setup).
+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).
@@ -312,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/el_GR/eventorganization.lang b/htdocs/langs/el_GR/eventorganization.lang
index 44aa4634cbe..f239c426ec8 100644
--- a/htdocs/langs/el_GR/eventorganization.lang
+++ b/htdocs/langs/el_GR/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/el_GR/holiday.lang b/htdocs/langs/el_GR/holiday.lang
index fc4b27fdcb1..561229d411a 100644
--- a/htdocs/langs/el_GR/holiday.lang
+++ b/htdocs/langs/el_GR/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Περιγραφή
 SendRequestCP=Δημιουργήστε το αίτημα άδειας
 DelayToRequestCP=Tα αιτήματα πρέπει να γίνονται τουλάχιστον <b>%s ημέρα(ες)</b> πριν από τις.
 MenuConfCP=Ισορροπία άδειας
-SoldeCPUser=Αφήστε ισορροπία είναι <b>%s</b> ημέρες.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Πρέπει να επιλέξετε μια ημερομηνία λήξης μεγαλύτερη από την ημερομηνία έναρξης.
 ErrorSQLCreateCP=Παρουσιάστηκε σφάλμα στην SQL κατά τη διάρκεια της δημιουργίας:
 ErrorIDFicheCP=Παρουσιάστηκε σφάλμα, η αίτηση άδειας δεν υπάρχει.
@@ -134,3 +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/el_GR/install.lang b/htdocs/langs/el_GR/install.lang
index d9799c7d351..988ac413075 100644
--- a/htdocs/langs/el_GR/install.lang
+++ b/htdocs/langs/el_GR/install.lang
@@ -21,6 +21,7 @@ ErrorPHPDoesNotSupportCurl=Η εγκατάσταση της php δεν υποσ
 ErrorPHPDoesNotSupportCalendar=Η εγκατάσταση της PHP δεν υποστηρίζει επεκτάσεις του php calendar.
 ErrorPHPDoesNotSupportUTF8=Η εγκατάσταση της PHP δεν υποστηρίζει λειτουργίες UTF8. Το Dolibarr δεν μπορεί να λειτουργήσει σωστά. Επιλύστε αυτό πριν εγκαταστήσετε Dolibarr.
 ErrorPHPDoesNotSupportIntl=Η εγκατάσταση της PHP δεν υποστηρίζει τις λειτουργίες Intl.
+ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
 ErrorPHPDoesNotSupportxDebug=Η εγκατάσταση της PHP δεν υποστηρίζει επεκτάσεις εντοπισμού σφαλμάτων.
 ErrorPHPDoesNotSupport=Η εγκατάσταση της PHP σας δεν υποστηρίζει %s λειτουργίες .
 ErrorDirDoesNotExists=Κατάλογος %s δεν υπάρχει.
diff --git a/htdocs/langs/el_GR/knowledgemanagement.lang b/htdocs/langs/el_GR/knowledgemanagement.lang
index 58313c6e2b6..200d27dd5ed 100644
--- a/htdocs/langs/el_GR/knowledgemanagement.lang
+++ b/htdocs/langs/el_GR/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/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 033a5b3756a..0cccaa9741e 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Σφάλμα, δεν ορίστηκαν π
 ErrorNoSocialContributionForSellerCountry=Σφάλμα, καμία κοινωνική εισφορά / φόροι ορίζονται για τη χώρα '%s'.
 ErrorFailedToSaveFile=Σφάλμα, αποτυχία αποθήκευσης αρχείου
 ErrorCannotAddThisParentWarehouse=Προσπαθείτε να προσθέσετε μια γονική αποθήκη η οποία είναι ήδη παιδί μιας υπάρχουσας αποθήκης
+FieldCannotBeNegative=Field "%s" cannot be negative
 MaxNbOfRecordPerPage=Μέγιστος αριθμός εγγραφών ανά σελίδα
 NotAuthorized=Δεν έχετε εξουσιοδότηση για να το πραγματοποιήσετε
 SetDate=Ορισμός ημερομηνίας
@@ -87,7 +88,7 @@ FileWasNotUploaded=Επιλέχθηκε ένα αρχείο για επισύν
 NbOfEntries=Αριθ. Εγγραφών
 GoToWikiHelpPage=Online βοήθεια (απαιτείται σύνδεση στο internet)
 GoToHelpPage=Βοήθεια
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Η εγγραφή αποθηκεύτηκε
 RecordDeleted=Η εγγραφή διγραφηκε
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Επιστρεφόμενος κωδικός για 
 InformationLastAccessInError=Πληροφορίες για το σφάλμα στην αίτηση πρόσβασης της τελευταίας βάση δεδομένων
 DolibarrHasDetectedError=Το Dolibarr ανίχνευσε τεχνικό σφάλμα
 YouCanSetOptionDolibarrMainProdToZero=Μπορείτε να διαβάσετε το αρχείο καταγραφής ή να ορίσετε την επιλογή $ dolibarr_main_prod στο &#39;0&#39; στο αρχείο ρυθμίσεων για να λάβετε περισσότερες πληροφορίες.
-InformationToHelpDiagnose=Αυτές οι πληροφορίες μπορούν να είναι χρήσιμες για διαγνωστικούς σκοπούς (μπορείτε να ορίσετε την επιλογή $ dolibarr_main_prod σε &#39;1&#39; για να καταργήσετε αυτές τις ειδοποιήσεις)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Περισσότερς Πληροφορίες
 TechnicalInformation=Τεχνικές πληροφορίες
 TechnicalID=Τεχνική ταυτότητα ID
@@ -211,6 +212,8 @@ User=Χρήστης
 Users=Χρήστες
 Group=Ομάδα
 Groups=Ομάδες
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Κανένας χρήστης δεν ορίζεται στην ομάδα
 Password=Συνθηματικό
 PasswordRetype=Επαναπληκτρολόγηση κωδικού
@@ -906,7 +909,7 @@ ViewFlatList=Προβολή λίστας
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Αφαιρέστε τη συμβολοσειρά &#39;%s&#39;
-SomeTranslationAreUncomplete=Ορισμένες από τις γλώσσες που προσφέρονται μπορούν να μεταφραστούν μόνο μερικώς ή ενδέχεται να περιέχουν σφάλματα. Βοηθήστε να διορθώσετε τη γλώσσα σας, εγγραφείτε στη <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">διεύθυνση https://transifex.com/projects/p/dolibarr/</a> για να προσθέσετε τις βελτιώσεις σας.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Ζώνη Ώρας χρήστη (χρήστης)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/el_GR/modulebuilder.lang b/htdocs/langs/el_GR/modulebuilder.lang
index 7dd78b98c6b..d3d9382dc09 100644
--- a/htdocs/langs/el_GR/modulebuilder.lang
+++ b/htdocs/langs/el_GR/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Αυτό το εργαλείο πρέπει να χρησιμοποιείται μόνο από έμπειρους χρήστες ή προγραμματιστές. Παρέχει βοηθητικά προγράμματα για την κατασκευή ή την επεξεργασία της δικής σας μονάδας. Η τεκμηρίωση για την εναλλακτική <a href="%s" target="_blank">χειρωνακτική ανάπτυξη είναι εδώ</a> .
+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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Τα μενού που παρέχονται από την ε
 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 recorded by other modules).
+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=Δείτε τα αναγνωριστικά που χρησιμοποιούνται στην εγκατάσταση σας
 SeeReservedIDsRangeHere=Δείτε το φάσμα των αποκλειστικών αναγνωριστικών
 ToolkitForDevelopers=Εργαλειοθήκη για προγραμματιστές Dolibarr
diff --git a/htdocs/langs/el_GR/mrp.lang b/htdocs/langs/el_GR/mrp.lang
index c3e453965bb..ff6820785f6 100644
--- a/htdocs/langs/el_GR/mrp.lang
+++ b/htdocs/langs/el_GR/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/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index d4ddb984f3c..22d026de39d 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -258,6 +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
 YourPasswordHasBeenReset=Ο κωδικός πρόσβασής σας έχει επαναφερθεί με επιτυχία
 ApplicantIpAddress=Διεύθυνση IP του αιτούντος
 SMSSentTo=Τα SMS αποστέλλονται στο %s
@@ -268,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=Exports area
diff --git a/htdocs/langs/el_GR/partnership.lang b/htdocs/langs/el_GR/partnership.lang
index 6517f7bd8ee..6971efdf5ca 100644
--- a/htdocs/langs/el_GR/partnership.lang
+++ b/htdocs/langs/el_GR/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang
index d18b2875881..490c7345c1b 100644
--- a/htdocs/langs/el_GR/productbatch.lang
+++ b/htdocs/langs/el_GR/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)
+ProductStatusOnBatch=Ναι (απαιτείται παρτίδα)
+ProductStatusOnSerial=Ναι (απαιτείται μοναδικός σειριακός αριθμός)
 ProductStatusNotOnBatch=Όχι (δεν χρειάζεται παρτίδα/σειριακός αριθμός)
-ProductStatusOnBatchShort=Lot
-ProductStatusOnSerialShort=Serial
+ProductStatusOnBatchShort=Παρτίδα
+ProductStatusOnSerialShort=Σειριακός Αριθμός
 ProductStatusNotOnBatchShort=Όχι
 Batch=Παρτίδα/Σειριακός αριθμός
 atleast1batchfield=Ημερομηνία προθεσμίας Ανάλωσης ή Πώλησης ή Παρτίδα/Σειριακός αριθμός
@@ -24,21 +24,22 @@ ProductLotSetup=Ρύθμιση του module παρτίδας / σειριακο
 ShowCurrentStockOfLot=Εμφάνιση παρόντος αποθέματος για ζεύγος προϊόν/παρτίδα
 ShowLogOfMovementIfLot=Εμφάνιση αρχείου κινήσεων για ζεύγος προϊόν/παρτίδα
 StockDetailPerBatch=Ανάλυση αποθέματος ανά παρτίδα
-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 add for each barcode/lot/serial scanned
-LifeTime=Life span (in days)
-EndOfLife=End of life
-ManufacturingDate=Manufacturing date
-DestructionDate=Destruction date
-FirstUseDate=First use date
-QCFrequency=Quality control frequency (in days)
-ShowAllLots=Show all lots
-HideLots=Hide lots
+SerialNumberAlreadyInUse=Ο σειριακός αριθμός %s χρησιμοποιείται ήδη για το προϊόν %s
+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
+OutOfOrder=Εκτός λειτουργίας
+InWorkingOrder=Σε κατάσταση λειτουργίας
+ToReplace=Αντικατάσταση
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 56128a2c4db..6ed351723a2 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Μέση σταθμική τιμή
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index 5ec5795aa29..a31c1391fd3 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -6,23 +6,23 @@ ProjectLabel=Ετικέτα έργου
 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
+MyProjectsDesc=Αυτή η προβολή περιορίζεται στα έργα για τα οποία είστε επαφή
 ProjectsPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα σας επιτρέπεται να διαβάσετε.
 TasksOnProjectsPublicDesc=Αυτή η προβολή παρουσιάζει όλες τις εργασίες στα έργα που επιτρέπεται να διαβάσετε.
 ProjectsPublicTaskDesc=Αυτή η προβολή παρουσιάζει όλα τα έργα και τα καθήκοντα που επιτρέπεται να δείτε.
 ProjectsDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα).
 TasksOnProjectsDesc=Αυτή η προβολή παρουσιάζει όλες τις εργασίες σε όλα τα έργα (οι άδειες χρήστη σας επιτρέπουν να δείτε τα πάντα).
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
+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.
+OnlyYourTaskAreVisible=Μόνο εργασίες που σας έχουν ανατεθεί είναι ορατές. Αν χρειάζεται να εισάγετε χρόνο στην εργασία και η εργασία δεν είναι ορατή, πρέπει να αντιστοιχίσετε την εργασία στον εαυτό σας.  
 ImportDatasetTasks=Καθήκοντα έργων
 ProjectCategories=Ετικέτες / κατηγορίες έργου
 NewProject=Νέο Έργο
@@ -33,8 +33,8 @@ ConfirmDeleteAProject=Είστε βέβαιοι ότι θέλετε να δια
 ConfirmDeleteATask=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την εργασία;
 OpenedProjects=Ανοιχτά έργα
 OpenedTasks=Άνοιγμα εργασιών
-OpportunitiesStatusForOpenedProjects=Προέρχεται το ποσό των ανοιχτών έργων ανά κατάσταση
-OpportunitiesStatusForProjects=Προβάλλει το ποσό των έργων ανά κατάσταση
+OpportunitiesStatusForOpenedProjects=Ποσό προοπτικών ανοιχτών έργων ανά κατάσταση
+OpportunitiesStatusForProjects=Ποσό προοπτικών έργων ανά κατάσταση
 ShowProject=Εμφάνιση έργου
 ShowTask=Εμφάνιση Εργασίας
 SetProject=Set project
@@ -76,24 +76,24 @@ MyActivities=Οι εργασίες/δραστηρ. μου
 MyProjects=Τα έργα μου
 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
+TimeConsumed=Έχει καταναλωθεί
 ListOfTasks=Κατάλογος εργασιών
-GoToListOfTimeConsumed=Μεταβείτε στη λίστα του χρόνου που καταναλώνετε
+GoToListOfTimeConsumed=Μεταβείτε στη λίστα του χρόνου που έχει καταναλωθεί
 GanttView=Gantt View
-ListWarehouseAssociatedProject=List of warehouses associated to the project
+ListWarehouseAssociatedProject=Λίστα αποθηκών που σχετίζονται με το έργο
 ListProposalsAssociatedProject=Κατάλογος των εμπορικών προτάσεων που σχετίζονται με το έργο
 ListOrdersAssociatedProject=Κατάλογος παραγγελιών πωλήσεων που σχετίζονται με το έργο
 ListInvoicesAssociatedProject=Κατάλογος των τιμολογίων πελατών που σχετίζονται με το έργο
-ListPredefinedInvoicesAssociatedProject=Λίστα τιμολογίων προτύπου πελάτη που σχετίζονται με το έργο
+ListPredefinedInvoicesAssociatedProject=Λίστα πρότυπων τιμολογίων πελάτη που σχετίζονται με το έργο
 ListSupplierOrdersAssociatedProject=Κατάλογος εντολών αγοράς που σχετίζονται με το έργο
 ListSupplierInvoicesAssociatedProject=Λίστα τιμολογίων πωλητών που σχετίζονται με το έργο
 ListContractAssociatedProject=Κατάλογος των συμβάσεων που σχετίζονται με το έργο
@@ -117,7 +117,7 @@ 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=Επικύρωση projet
 ConfirmValidateProject=Είστε βέβαιοι ότι θέλετε να επικυρώσετε αυτό το έργο;
 CloseAProject=Κλείσιμο έργου
@@ -140,7 +140,7 @@ NoTasks=Δεν υπάρχουν εργασίες για αυτό το έργο
 LinkedToAnotherCompany=Συνδέεται με άλλο τρίτο μέρος
 TaskIsNotAssignedToUser=Εργασία δεν έχει εκχωρηθεί στο χρήστη. Χρησιμοποιήστε το κουμπί &#39; <strong>%s</strong> &#39; για να εκχωρήσετε εργασία τώρα.
 ErrorTimeSpentIsEmpty=Χρόνος που δαπανάται είναι άδειο
-TimeRecordingRestrictedToNMonthsBack=Time recording is restricted to %s months back
+TimeRecordingRestrictedToNMonthsBack=Η καταγραφή χρόνου περιορίζεται σε %s μήνες πίσω
 ThisWillAlsoRemoveTasks=Αυτή η ενέργεια θα διαγράψει επίσης όλα τα καθήκοντα του έργου <b>(%s</b> καθηκόντων προς το παρόν) και όλες οι είσοδοι του χρόνου.
 IfNeedToUseOtherObjectKeepEmpty=Εάν ορισμένα αντικείμενα (τιμολόγιο, προκειμένου, ...), που ανήκουν σε άλλο τρίτο μέρος, πρέπει να συνδέεται με το έργο να δημιουργήσει, διατηρήσει αυτό το κενό να έχει το έργο να είναι πολλαπλών τρίτους.
 CloneTasks=Clone tasks
@@ -159,20 +159,20 @@ ProjectModifiedInDolibarr=Το έργο %s τροποποιήθηκε
 TaskCreatedInDolibarr=Εργασία %s δημιουργήθηκε
 TaskModifiedInDolibarr=Εργασία %s τροποποιήθηκε
 TaskDeletedInDolibarr=Εργασία %s διαγράφηκε
-OpportunityStatus=Κατάσταση μολύβδου
-OpportunityStatusShort=Κατάσταση μολύβδου
-OpportunityProbability=Πιθανότητα μολύβδου
-OpportunityProbabilityShort=Επικεφαλής probab.
-OpportunityAmount=Ποσό μολύβδου
-OpportunityAmountShort=Ποσό μολύβδου
+OpportunityStatus=Κατάσταση προοπτικής
+OpportunityStatusShort=Κατάσταση προοπτικής
+OpportunityProbability=Πιθανότητα προοπτικής
+OpportunityProbabilityShort=Πιθαν. προοπτικής
+OpportunityAmount=Ποσό προοπτικής
+OpportunityAmountShort=Ποσό προοπτικής
 OpportunityWeightedAmount=Σταθμισμένο ποσό ευκαιρίας
 OpportunityWeightedAmountShort=Αντί. σταθμισμένο ποσό
-OpportunityAmountAverageShort=Μέσο ποσό μολύβδου
-OpportunityAmountWeigthedShort=Σταθμισμένο ποσό μολύβδου
+OpportunityAmountAverageShort=Μέσο ποσό προοπτικής
+OpportunityAmountWeigthedShort=Σταθμισμένο ποσό προοπτικής
 WonLostExcluded=Κερδισμένο / Lost αποκλεισμένο
 ##### 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=Εκτελεστική ομάδα
@@ -197,37 +197,38 @@ InputPerMonth=Είσοδος / εισαγωγή ανά μήνα
 InputDetail=Λεπτομέρειες εισόδου
 TimeAlreadyRecorded=Αυτός είναι ο χρόνος που έχει ήδη εγγραφεί για αυτήν την εργασία / ημέρα και ο χρήστης %s
 ProjectsWithThisUserAsContact=Έργα με αυτόν τον χρήστη ως επαφή
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Εργασίες που έχουν εκχωρηθεί σε αυτόν τον χρήστη
 ResourceNotAssignedToProject=Δεν έχει ανατεθεί σε έργο
 ResourceNotAssignedToTheTask=Δεν έχει ανατεθεί στην εργασία
 NoUserAssignedToTheProject=Δεν έχουν ανατεθεί χρήστες σε αυτό το έργο
 TimeSpentBy=Χρόνος που πέρασε
 TasksAssignedTo=Οι εργασίες που έχουν εκχωρηθεί στο
-AssignTaskToMe=Assign task to myself
+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
 OpenedProjectsByThirdparties=Ανοίξτε έργα από τρίτους
-OnlyOpportunitiesShort=Μόνο οδηγεί
-OpenedOpportunitiesShort=Ανοίξτε τους οδηγούς
-NotOpenedOpportunitiesShort=Δεν είναι ανοικτό μόλυβδο
-NotAnOpportunityShort=Δεν είναι μόλυβδος
-OpportunityTotalAmount=Συνολικό ποσό οδηγεί
-OpportunityPonderatedAmount=Σταθμισμένο ποσό οδηγεί
-OpportunityPonderatedAmountDesc=Το ποσό οδηγεί σταθμισμένο με πιθανότητα
+OnlyOpportunitiesShort=Μόνο προοπτικές
+OpenedOpportunitiesShort=Ανοιχτές προοπτικές
+NotOpenedOpportunitiesShort=Δεν είναι ανοιχτή προοπτική
+NotAnOpportunityShort=Δεν είναι προοπτική
+OpportunityTotalAmount=Συνολικό ποσό προοπτικών
+OpportunityPonderatedAmount=Σταθμισμένο ποσό προοπτικών
+OpportunityPonderatedAmountDesc=Ποσό προοπτικών σταθμισμένο με βάση την πιθανότητα
 OppStatusPROSP=Προοπτική
 OppStatusQUAL=Προσόν
 OppStatusPROPO=Πρόταση
@@ -236,7 +237,7 @@ OppStatusPENDING=Εκκρεμεί
 OppStatusWON=Κέρδισε
 OppStatusLOST=Χαμένος
 Budget=Προϋπολογισμός
-AllowToLinkFromOtherCompany=Επιτρέψτε τη σύνδεση του έργου με άλλη εταιρεία <br><br> <u>Υποστηριζόμενες τιμές:</u> <br> - Κρατήστε κενό: Μπορεί να συνδέσει οποιοδήποτε έργο της εταιρείας (προεπιλογή) <br> - &quot;όλα&quot;: Μπορεί να συνδέσει οποιαδήποτε έργα, ακόμα και έργα άλλων εταιρειών <br> - Μια λίστα με IDs τρίτων που χωρίζονται με κόμματα: μπορούν να συνδέσουν όλα τα έργα αυτών των τρίτων μερών (Παράδειγμα: 123,4795,53) <br>
+AllowToLinkFromOtherCompany=Επιτρέψτε τη σύνδεση του έργου με άλλη εταιρεία <br><br> <u>Υποστηριζόμενες τιμές:</u> <br> - Κρατήστε κενό: Μπορεί να συνδέσει οποιοδήποτε έργο της εταιρείας (προεπιλογή) <br> - "όλα": Μπορεί να συνδέσει οποιαδήποτε έργα, ακόμα και έργα άλλων εταιρειών <br> - Μια λίστα με IDs τρίτων που χωρίζονται με κόμματα: μπορούν να συνδέσουν όλα τα έργα αυτών των τρίτων μερών (Παράδειγμα: 123,4795,53) <br>
 LatestProjects=Τελευταία έργα %s
 LatestModifiedProjects=Τελευταία τροποποιημένα έργα %s
 OtherFilteredTasks=Άλλες φιλτραρισμένες εργασίες
@@ -249,9 +250,9 @@ AllowCommentOnTask=Επιτρέψτε στα σχόλια των χρηστών
 AllowCommentOnProject=Να επιτρέπεται στα σχόλια των χρηστών τα έργα
 DontHavePermissionForCloseProject=Δεν έχετε δικαιώματα για να κλείσετε το έργο %s
 DontHaveTheValidateStatus=Το έργο %s πρέπει να είναι ανοικτό για να κλείσει
-RecordsClosed=%s Έργα κλειστά
-SendProjectRef=Έργο πληροφοριών %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=Η ενότητα &quot;Μισθοί&quot; πρέπει να είναι ενεργοποιημένη για να καθορίζει την ωριαία τιμή του εργαζόμενου ώστε να έχει αξιοποιηθεί ο χρόνος που δαπανάται
+RecordsClosed=%s κλειστά έργα
+SendProjectRef=Πληροφορίες έργου %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Η ενότητα "Μισθοί" πρέπει να είναι ενεργοποιημένη για να καθορίζει την ωριαία τιμή του εργαζόμενου ώστε να έχει αξιοποιηθεί ο χρόνος που δαπανάται
 NewTaskRefSuggested=Η αναφορά εργασίας που έχει ήδη χρησιμοποιηθεί, απαιτείται νέα αναφορά εργασίας
 TimeSpentInvoiced=Χρόνος που δαπανήθηκε χρεώνεται
 TimeSpentForIntervention=Ο χρόνος που δαπανάται
@@ -259,10 +260,10 @@ TimeSpentForInvoice=Ο χρόνος που δαπανάται
 OneLinePerUser=Μια γραμμή ανά χρήστη
 ServiceToUseOnLines=Υπηρεσία για χρήση σε γραμμές
 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=Χρήση: Εργασίες
@@ -273,14 +274,16 @@ 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=Η ημερομηνία λήξης δεν μπορεί να είναι πριν από την ημερομηνία έναρξης
diff --git a/htdocs/langs/el_GR/receptions.lang b/htdocs/langs/el_GR/receptions.lang
index 2428ade0a31..290a1caf306 100644
--- a/htdocs/langs/el_GR/receptions.lang
+++ b/htdocs/langs/el_GR/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/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index c99f41c6630..85e3528bc6f 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Το όριο αποθεμάτων για προε
 AddNewProductStockWarehouse=Ορίστε νέο όριο για την προειδοποίηση και το επιθυμητό βέλτιστο απόθεμα
 AddStockLocationLine=Μειώστε την ποσότητα και έπειτα κάντε κλικ για να προσθέσετε μια άλλη αποθήκη για αυτό το προϊόν
 InventoryDate=Ημερομηνία απογραφής
+Inventories=Inventories
 NewInventory=Νέο απόθεμα
 inventorySetup = Ρύθμιση αποθέματος
 inventoryCreatePermission=Δημιουργία νέου αποθέματος
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Οι κινήσεις των απο
 inventoryChangePMPPermission=Επιτρέψτε να αλλάξετε την τιμή PMP για ένα προϊόν
 ColumnNewPMP=Νέα μονάδα PMP
 OnlyProdsInStock=Μην προσθέτετε προϊόν χωρίς απόθεμα
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Τελευταία BP
 CurrentPA=Τρέχουσα BP
 RecordedQty=Καταγεγραμμένη ποσότητα
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=Σε εξέλιξη
+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
diff --git a/htdocs/langs/el_GR/stripe.lang b/htdocs/langs/el_GR/stripe.lang
index 3b1466bcad6..8abb497619b 100644
--- a/htdocs/langs/el_GR/stripe.lang
+++ b/htdocs/langs/el_GR/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Ρύθμιση μονάδας ταινιών
-StripeDesc=Προσφέρετε στους πελάτες μια σελίδα Stripe online πληρωμής για πληρωμές με πιστωτικές κάρτες μέσω του <a href="http://www.stripe.com" target="_blank">Stripe</a> . Αυτό μπορεί να χρησιμοποιηθεί για να επιτρέψει στους πελάτες σας να πραγματοποιούν ad hoc πληρωμές ή για πληρωμές που σχετίζονται με ένα συγκεκριμένο αντικείμενο Dolibarr (τιμολόγιο, παραγγελία, ...)
+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=Πληρώστε με πιστωτική κάρτα ή Stripe
 FollowingUrlAreAvailableToMakePayments=Μετά από τις διευθύνσεις URL είναι διαθέσιμοι να προσφέρουν μια σελίδα σε έναν πελάτη να προβεί σε πληρωμή σε Dolibarr αντικείμενα
 PaymentForm=Έντυπο πληρωμής
@@ -28,11 +28,10 @@ AccountParameter=Παράμετροι λογαριασμού
 UsageParameter=Παράμετροι χρήσης
 InformationToFindParameters=Βοήθεια για να βρείτε %s τα στοιχεία του λογαριασμού σας
 STRIPE_CGI_URL_V2=Διεύθυνση Url της ενότητας CGI Stripe για πληρωμή
-VendorName=Όνομα του πωλητή
 CSSUrlForPaymentForm=Url CSS φύλλο στυλ για το έντυπο πληρωμής
 NewStripePaymentReceived=Πληρωμή της νέας ταινίας Stripe
 NewStripePaymentFailed=Η πληρωμή του νέου Stripe προσπάθησε αλλά απέτυχε
-FailedToChargeCard=Failed to charge card
+FailedToChargeCard=Αποτυχία χρέωσης κάρτας
 STRIPE_TEST_SECRET_KEY=Μυστικό κλειδί δοκιμής
 STRIPE_TEST_PUBLISHABLE_KEY=Κλειδί ελέγχου δοκιμαστικής έκδοσης
 STRIPE_TEST_WEBHOOK_KEY=Πλήκτρο δοκιμής Webhook
@@ -69,4 +68,4 @@ ToOfferALinkForTestWebhook=Σύνδεση με τη ρύθμιση Stripe WebHoo
 ToOfferALinkForLiveWebhook=Σύνδεση στη ρύθμιση Stripe WebHook για κλήση του IPN (ζωντανή λειτουργία)
 PaymentWillBeRecordedForNextPeriod=Η πληρωμή θα καταγραφεί για την επόμενη περίοδο.
 ClickHereToTryAgain=<a href="%s">Κάντε κλικ εδώ για να δοκιμάσετε ξανά ...</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
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Λόγω των ισχυρών κανόνων ελέγχου ταυτότητας πελατών, η δημιουργία μιας κάρτας πρέπει να γίνει από το Backe Office. Μπορείτε να κάνετε κλικ εδώ για να ενεργοποιήσετε την εγγραφή πελατών Stripe: %s
diff --git a/htdocs/langs/el_GR/ticket.lang b/htdocs/langs/el_GR/ticket.lang
index 0ca400945ce..0c66458130d 100644
--- a/htdocs/langs/el_GR/ticket.lang
+++ b/htdocs/langs/el_GR/ticket.lang
@@ -18,23 +18,23 @@
 # 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=Έργο
@@ -43,67 +43,67 @@ TicketTypeShortOTHER=Άλλο
 TicketSeverityShortLOW=Χαμηλή
 TicketSeverityShortNORMAL=Κανονικός
 TicketSeverityShortHIGH=Υψηλή
-TicketSeverityShortBLOCKING=Critical, Blocking
+TicketSeverityShortBLOCKING=Κρίσιμο, Blocking
 
 TicketCategoryShortOTHER=Άλλο
 
-ErrorBadEmailAddress=Το πεδίο &#39;%s&#39; είναι εσφαλμένο
-MenuTicketMyAssign=Τα εισιτήριά μου
-MenuTicketMyAssignNonClosed=Τα ανοιχτά μου εισιτήρια
-MenuListNonClosed=Ανοίξτε εισιτήρια
+ErrorBadEmailAddress=Το πεδίο '%s' είναι εσφαλμένο
+MenuTicketMyAssign=Τα tickets μου
+MenuTicketMyAssignNonClosed=Τα ανοιχτά tickets μου
+MenuListNonClosed=Ανοίξτε ticket
 
 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=Το κείμενο που καθορίζεται εδώ θα εισαχθεί στο μήνυμα ηλεκτρονικού ταχυδρομείου που επιβεβαιώνει τη δημιουργία νέου εισιτηρίου από το δημόσιο περιβάλλον. Οι πληροφορίες σχετικά με τη διαβούλευση με το εισιτήριο προστίθενται αυτόματα.
+TicketNewEmailBodyLabel=Μήνυμα κειμένου που αποστέλλεται μετά τη δημιουργία ενός ticket
+TicketNewEmailBodyHelp=Το κείμενο που καθορίζεται εδώ θα εισαχθεί στο μήνυμα ηλεκτρονικού ταχυδρομείου που επιβεβαιώνει τη δημιουργία νέου ticket από το δημόσιο περιβάλλον. Οι πληροφορίες σχετικά με τη διαβούλευση με το ticket προστίθενται αυτόματα.
 TicketParamPublicInterface=Ρύθμιση δημόσιας διεπαφής
-TicketsEmailMustExist=Απαιτήστε μια υπάρχουσα διεύθυνση ηλεκτρονικού ταχυδρομείου για να δημιουργήσετε ένα εισιτήριο
-TicketsEmailMustExistHelp=Στη δημόσια διεπαφή, η διεύθυνση ηλεκτρονικού ταχυδρομείου θα πρέπει ήδη να συμπληρωθεί στη βάση δεδομένων για να δημιουργηθεί ένα νέο εισιτήριο.
+TicketsEmailMustExist=Απαιτήστε μια υπάρχουσα διεύθυνση ηλεκτρονικού ταχυδρομείου για να δημιουργήσετε ένα ticket
+TicketsEmailMustExistHelp=Στη δημόσια διεπαφή, η διεύθυνση ηλεκτρονικού ταχυδρομείου θα πρέπει ήδη να συμπληρωθεί στη βάση δεδομένων για να δημιουργηθεί ένα νέο ticket.
 PublicInterface=Δημόσια διεπαφή
 TicketUrlPublicInterfaceLabelAdmin=Εναλλακτική διεύθυνση URL για δημόσια διασύνδεση
 TicketUrlPublicInterfaceHelpAdmin=Είναι δυνατόν να ορίσετε ένα ψευδώνυμο στον διακομιστή ιστού και έτσι να διαθέσετε τη δημόσια διασύνδεση με μια άλλη διεύθυνση URL (ο διακομιστής πρέπει να ενεργεί ως διακομιστής μεσολάβησης σε αυτήν τη νέα διεύθυνση URL)
 TicketPublicInterfaceTextHomeLabelAdmin=Καλωσόρισμα κειμένου της δημόσιας διασύνδεσης
-TicketPublicInterfaceTextHome=Μπορείτε να δημιουργήσετε ένα εισιτήριο υποστήριξης ή μια προβολή που υπάρχει από το εισιτήριο παρακολούθησης ταυτοποίησης.
+TicketPublicInterfaceTextHome=Μπορείτε να δημιουργήσετε ένα ticket υποστήριξης ή να προβάλετε ένα υπάρχον από το αναγνωριστικό παρακολούθησης ticket.
 TicketPublicInterfaceTextHomeHelpAdmin=Το κείμενο που ορίζεται εδώ θα εμφανιστεί στην αρχική σελίδα της δημόσιας διασύνδεσης.
 TicketPublicInterfaceTopicLabelAdmin=Τίτλος διεπαφής
 TicketPublicInterfaceTopicHelp=Αυτό το κείμενο θα εμφανιστεί ως ο τίτλος της δημόσιας διασύνδεσης.
@@ -122,16 +122,16 @@ 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=Μόνο εισιτήρια που έχουν εκχωρηθεί στον τρέχοντα χρήστη θα είναι ορατά. Δεν ισχύει για χρήστη με δικαιώματα διαχείρισης εισιτηρίων.
+TicketsLimitViewAssignedOnly=Περιορίστε την εμφάνιση σε tickets που έχουν εκχωρηθεί στον τρέχοντα χρήστη (δεν έχει εφαρμογή για εξωτερικούς χρήστες, πάντα περιορίζονται στο τρίτο μέρος από το οποίο εξαρτώνται)
+TicketsLimitViewAssignedOnlyHelp=Μόνο tickets που έχουν εκχωρηθεί στον τρέχοντα χρήστη θα είναι ορατά. Δεν ισχύει για χρήστη με δικαιώματα διαχείρισης tickets.
 TicketsActivatePublicInterface=Ενεργοποιήστε τη δημόσια διεπαφή
-TicketsActivatePublicInterfaceHelp=Η δημόσια διεπαφή επιτρέπει στους επισκέπτες να δημιουργούν εισιτήρια.
-TicketsAutoAssignTicket=Ορίστε αυτόματα τον χρήστη που δημιούργησε το εισιτήριο
-TicketsAutoAssignTicketHelp=Κατά τη δημιουργία ενός εισιτηρίου, ο χρήστης μπορεί να αντιστοιχιστεί αυτόματα στο εισιτήριο.
-TicketNumberingModules=Μονάδα αρίθμησης εισιτηρίων
-TicketsModelModule=Document templates for tickets
+TicketsActivatePublicInterfaceHelp=Η δημόσια διεπαφή επιτρέπει στους επισκέπτες να δημιουργούν tickets.
+TicketsAutoAssignTicket=Ορίστε αυτόματα τον χρήστη που δημιούργησε το ticket
+TicketsAutoAssignTicketHelp=Κατά τη δημιουργία ενός ticket, ο χρήστης μπορεί να αντιστοιχιστεί αυτόματα στο ticket.
+TicketNumberingModules=Μονάδα αρίθμησης tickets
+TicketsModelModule=Πρότυπο έγγραφο για tickets
 TicketNotifyTiersAtCreation=Ειδοποιήστε τρίτο μέρος στη δημιουργία
-TicketsDisableCustomerEmail=Πάντα να απενεργοποιείτε τα μηνύματα ηλεκτρονικού ταχυδρομείου όταν δημιουργείται ένα εισιτήριο από τη δημόσια διασύνδεση
+TicketsDisableCustomerEmail=Πάντα να απενεργοποιείτε τα μηνύματα ηλεκτρονικού ταχυδρομείου όταν δημιουργείται ένα ticket από τη δημόσια διασύνδεση
 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)
@@ -139,14 +139,14 @@ TicketPublicNotificationNewMessageDefaultEmailHelp=Send an email to this address
 #
 # Index & list page
 #
-TicketsIndex=Περιοχή εισιτηρίων
-TicketList=Λίστα εισιτηρίων
-TicketAssignedToMeInfos=Αυτή η σελίδα εμφανίζει τη λίστα εισιτηρίων που έχει δημιουργηθεί ή έχει εκχωρηθεί στον τρέχοντα χρήστη
-NoTicketsFound=Δεν βρέθηκε εισιτήριο
-NoUnreadTicketsFound=Δεν βρέθηκαν αδιάβατα εισιτήρια
-TicketViewAllTickets=Δείτε όλα τα εισιτήρια
-TicketViewNonClosedOnly=Δείτε μόνο ανοιχτά εισιτήρια
-TicketStatByStatus=Εισιτήρια ανά κατάσταση
+TicketsIndex=Περιοχή tickets
+TicketList=Λίστα tickets
+TicketAssignedToMeInfos=Αυτή η σελίδα εμφανίζει τη λίστα tickets που έχει δημιουργηθεί ή έχει εκχωρηθεί στον τρέχοντα χρήστη
+NoTicketsFound=Δεν βρέθηκε ticket
+NoUnreadTicketsFound=Δεν βρέθηκαν αδιάβατα ticket
+TicketViewAllTickets=Δείτε όλα τα tickets
+TicketViewNonClosedOnly=Δείτε μόνο ανοιχτά ticket
+TicketStatByStatus=Tickets ανά κατάσταση
 OrderByDateAsc=Ταξινόμηση κατά αύξουσα ημερομηνία
 OrderByDateDesc=Ταξινόμηση κατά φθίνουσα ημερομηνία
 ShowAsConversation=Εμφάνιση ως λίστα συνομιλιών
@@ -155,50 +155,50 @@ MessageListViewType=Εμφάνιση ως λίστα πίνακα
 #
 # Ticket card
 #
-Ticket=Εισιτήριο
-TicketCard=Κάρτα εισιτηρίων
-CreateTicket=Δημιουργήστε εισιτήριο
-EditTicket=Επεξεργασία εισιτηρίου
-TicketsManagement=Διαχείριση εισιτηρίων
+Ticket=Ticket
+TicketCard=Κάρτα ticket
+CreateTicket=Δημιουργήστε ticket
+EditTicket=Επεξεργασία ticket
+TicketsManagement=Διαχείριση tickets
 CreatedBy=Δημιουργήθηκε από
-NewTicket=Νέο εισιτήριο
-SubjectAnswerToTicket=Απάντηση εισιτηρίου
+NewTicket=Νέο ticket
+SubjectAnswerToTicket=Το ticket απαντήθηκε
 TicketTypeRequest=Τύπος αιτήματος
-TicketCategory=Ticket categorization
-SeeTicket=Δείτε εισιτήριο
-TicketMarkedAsRead=Το εισιτήριο έχει επισημανθεί ως αναγνωσμένο
+TicketCategory=Κατηγοριοποίηση ticket
+SeeTicket=Δείτε το ticket
+TicketMarkedAsRead=Το ticket έχει επισημανθεί ως αναγνωσμένο
 TicketReadOn=Συνέχισε να διαβάζεις
 TicketCloseOn=Ημερομηνία Κλεισίματος
-MarkAsRead=Μαρκάρετε το εισιτήριο ως αναγνωσμένο
-TicketHistory=Ιστορικό εισιτηρίων
+MarkAsRead=Μαρκάρετε το ticket ως αναγνωσμένο
+TicketHistory=Ιστορικό ticket
 AssignUser=Αναθέστε στον χρήστη
-TicketAssigned=Το εισιτήριο έχει πλέον εκχωρηθεί
-TicketChangeType=Τύπος αλλαγής
+TicketAssigned=Το ticket έχει πλέον εκχωρηθεί
+TicketChangeType=Αλλάξτε τον τύπο
 TicketChangeCategory=Αλλάξτε τον αναλυτικό κώδικα
 TicketChangeSeverity=Αλλάξτε τη σοβαρότητα
 TicketAddMessage=Προσθήκη μηνύματος
 AddMessage=Προσθήκη μηνύματος
-MessageSuccessfullyAdded=Το εισιτήριο προστέθηκε
+MessageSuccessfullyAdded=Το ticket προστέθηκε
 TicketMessageSuccessfullyAdded=Το μήνυμα προστέθηκε με επιτυχία
 TicketMessagesList=Λίστα μηνυμάτων
-NoMsgForThisTicket=Δεν υπάρχει μήνυμα για αυτό το εισιτήριο
+NoMsgForThisTicket=Δεν υπάρχει μήνυμα για αυτό το ticket
 TicketProperties=Classification
-LatestNewTickets=Τελευταία %s νεότερα εισιτήρια (δεν διαβάζονται)
-TicketSeverity=Δριμύτητα
-ShowTicket=Δείτε εισιτήριο
-RelatedTickets=Σχετικά εισιτήρια
+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=Το εισιτήριο ενημερώθηκε
+TicketUpdated=Το ticket ενημερώθηκε
 SendMessageByEmail=Αποστολή μηνύματος μέσω ηλεκτρονικού ταχυδρομείου
 TicketNewMessage=Νέο μήνυμα
 ErrorMailRecipientIsEmptyForSendTicketMessage=Ο παραλήπτης είναι κενός. Δεν στέλνεται μήνυμα ηλεκτρονικού ταχυδρομείου
@@ -206,27 +206,27 @@ TicketGoIntoContactTab=Μεταβείτε στην καρτέλα &quot;Επαφ
 TicketMessageMailIntro=Εισαγωγή
 TicketMessageMailIntroHelp=Αυτό το κείμενο προστίθεται μόνο στην αρχή του μηνύματος ηλεκτρονικού ταχυδρομείου και δεν θα αποθηκευτεί.
 TicketMessageMailIntroLabelAdmin=Εισαγωγή στο μήνυμα κατά την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου
-TicketMessageMailIntroText=Γεια σας, <br> Μια νέα απάντηση στάλθηκε σε ένα εισιτήριο που επικοινωνήσατε. Εδώ είναι το μήνυμα: <br>
-TicketMessageMailIntroHelpAdmin=Αυτό το κείμενο θα εισαχθεί πριν από το κείμενο της απάντησης σε ένα εισιτήριο.
+TicketMessageMailIntroText=Γεια σας, <br> Μια νέα απάντηση στάλθηκε σε ένα ticket που είστε επαφή. Εδώ είναι το μήνυμα: <br>
+TicketMessageMailIntroHelpAdmin=Αυτό το κείμενο θα εισαχθεί πριν από το κείμενο της απάντησης σε ένα ticket.
 TicketMessageMailSignature=Υπογραφή
 TicketMessageMailSignatureHelp=Αυτό το κείμενο προστίθεται μόνο στο τέλος του μηνύματος ηλεκτρονικού ταχυδρομείου και δεν θα αποθηκευτεί.
 TicketMessageMailSignatureText=<p> Με εκτιμιση, </p><p> - </p>
 TicketMessageMailSignatureLabelAdmin=Υπογραφή ηλεκτρονικού ταχυδρομείου απάντησης
 TicketMessageMailSignatureHelpAdmin=Αυτό το κείμενο θα εισαχθεί μετά το μήνυμα απάντησης.
-TicketMessageHelp=Μόνο αυτό το κείμενο θα αποθηκευτεί στη λίστα μηνυμάτων της κάρτας εισιτηρίων.
+TicketMessageHelp=Μόνο αυτό το κείμενο θα αποθηκευτεί στη λίστα μηνυμάτων της κάρτας tickets.
 TicketMessageSubstitutionReplacedByGenericValues=Οι μεταβλητές αντικατάστασης αντικαθίστανται από γενικές τιμές.
 TimeElapsedSince=Χρόνος που πέρασε από τότε
 TicketTimeToRead=Ο χρόνος που παρέμενε πριν διαβάσετε
 TicketTimeElapsedBeforeSince=Time elapsed before / since
-TicketContacts=Επαφές εισιτήριο
-TicketDocumentsLinked=Έγγραφα που συνδέονται με το εισιτήριο
-ConfirmReOpenTicket=Επιβεβαιώστε ξανανοίξτε αυτό το εισιτήριο;
-TicketMessageMailIntroAutoNewPublicMessage=Ένα νέο μήνυμα αναρτήθηκε στο εισιτήριο με το θέμα %s:
-TicketAssignedToYou=Το εισιτήριο έχει εκχωρηθεί
-TicketAssignedEmailBody=Σας έχει ανατεθεί το εισιτήριο # %s από %s
+TicketContacts=Επαφές ticket
+TicketDocumentsLinked=Έγγραφα που συνδέονται με το ticket
+ConfirmReOpenTicket=Επιβεβαιώστε ανοίγματος ξανά σε αυτό το ticket;
+TicketMessageMailIntroAutoNewPublicMessage=Ένα νέο μήνυμα αναρτήθηκε στο ticket με το θέμα %s:
+TicketAssignedToYou=Το ticket έχει ανατεθεί
+TicketAssignedEmailBody=Σας έχει ανατεθεί το ticket # %s από %s
 MarkMessageAsPrivate=Σημειώστε το μήνυμα ως ιδιωτικό
 TicketMessagePrivateHelp=Αυτό το μήνυμα δεν θα εμφανίζεται σε εξωτερικούς χρήστες
-TicketEmailOriginIssuer=Εκδότης στην αρχή των εισιτηρίων
+TicketEmailOriginIssuer=Δημιουργός στην αρχή των tickets
 InitialMessage=Αρχικό μήνυμα
 LinkToAContract=Σύνδεση με σύμβαση
 TicketPleaseSelectAContract=Επιλέξτε μια σύμβαση
@@ -245,72 +245,72 @@ ErrorTicketRefRequired=Το όνομα αναφοράς Eισιτηρίου εί
 #
 # 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 στη συγκεκριμένη διεπαφή κάνοντας κλικ στον ακόλουθο σύνδεσμο
+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>
+TicketNewEmailSubjectAdmin=Δημιουργήθηκε νέο ticket - Ref %s (δημόσιο ticket ID %s)
+TicketNewEmailBodyAdmin=<p> Το ticket μόλις δημιουργήθηκε με την ID # %s, δείτε τις πληροφορίες: </p>
 SeeThisTicketIntomanagementInterface=Δείτε το εισιτήριο στη διεπαφή διαχείρισης
-TicketPublicInterfaceForbidden=Η δημόσια διεπαφή για τα εισιτήρια δεν ήταν ενεργοποιημένη
-ErrorEmailOrTrackingInvalid=Κακή τιμή για την παρακολούθηση ταυτότητας ή ηλεκτρονικού ταχυδρομείου
+TicketPublicInterfaceForbidden=Η δημόσια διεπαφή για τα tickets δεν ήταν ενεργοποιημένη
+ErrorEmailOrTrackingInvalid=Λάθος τιμή ID παρακολούθηση ή ηλεκτρονικού ταχυδρομείου
 OldUser=Παλιός χρήστης
 NewUser=Νέος χρήστης
-NumberOfTicketsByMonth=Αριθμός εισιτηρίων ανά μήνα
-NbOfTickets=Αριθμός εισιτηρίων
+NumberOfTicketsByMonth=Αριθμός tickets ανά μήνα
+NbOfTickets=Αριθμός tickets
 # notifications
-TicketNotificationEmailSubject=Το ενημερωμένο εισιτήριο %s
-TicketNotificationEmailBody=Αυτό είναι ένα αυτόματο μήνυμα που σας ειδοποιεί ότι το εισιτήριο %s μόλις ενημερώθηκε
+TicketNotificationEmailSubject=Το ticket %s ενημερώθηκε
+TicketNotificationEmailBody=Αυτό είναι ένα αυτόματο μήνυμα που σας ειδοποιεί ότι το ticket %s μόλις ενημερώθηκε
 TicketNotificationRecipient=Αποδέκτης ειδοποίησης
 TicketNotificationLogMessage=Μηνύματα καταγραφής
-TicketNotificationEmailBodyInfosTrackUrlinternal=Προβολή εισιτηρίου σε διεπαφή
+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=Δεν υπάρχουν πρόσφατα τροποποιημένα εισιτήρια
+BoxLastModifiedTicketNoRecordedTickets=Δεν υπάρχουν πρόσφατα τροποποιημένα tickets
 BoxTicketType=Distribution of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index 70c9f967220..c0fbf0b2a1c 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Τελευταία αρχεία άμεσης χρέωσης %s
 WithdrawalsLine=Direct debit order line
+CreditTransfer=μεταφορά πιστώσεως
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Γραμμές εντολής άμεσης χρέωσης
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ 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=Μέθοδος αποστολής
@@ -80,7 +82,7 @@ StatusMotif7=Δικαστική απόφαση
 StatusMotif8=Άλλος λόγος
 CreateForSepaFRST=Δημιουργία αρχείου άμεσης χρέωσης (SEPA FRST)
 CreateForSepaRCUR=Δημιουργία αρχείου άμεσης χρέωσης (SEPA RCUR)
-CreateAll=Δημιουργία αρχείου άμεσης χρέωσης (όλα)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Μόνο το γραφείο
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Δεν είναι δυνατή η δημιουργ
 SepaMandate=Εντολή άμεσης χρέωσης SEPA
 SepaMandateShort=Εντολή SEPA
 PleaseReturnMandate=Παρακαλούμε επιστρέψτε αυτή τη φόρμα εντολής με email στο %s ή μέσω ταχυδρομείου στο
-SEPALegalText=Υπογράφοντας αυτή τη φόρμα εντολής, εξουσιοδοτείτε (A) %s να στείλετε οδηγίες στην τράπεζά σας για να χρεώσετε το λογαριασμό σας και (Β) την τράπεζά σας για να χρεώσετε το λογαριασμό σας σύμφωνα με τις οδηγίες από %s. Ως μέρος των δικαιωμάτων σας, δικαιούστε επιστροφή χρημάτων από την τράπεζά σας σύμφωνα με τους όρους και τις προϋποθέσεις της συμφωνίας σας με την τράπεζά σας. Η επιστροφή χρημάτων πρέπει να ζητηθεί εντός 8 εβδομάδων από την ημερομηνία χρέωσης του λογαριασμού σας. Τα δικαιώματά σας σχετικά με την παραπάνω εντολή εξηγούνται σε μια δήλωση που μπορείτε να προμηθευτείτε από την τράπεζά σας.
+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=Αναγνωριστικό πιστωτή
 CreditorName=Όνομα πιστωτή
 SEPAFillForm=(B) Παρακαλούμε συμπληρώστε όλα τα πεδία με την ένδειξη *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/en_AE/accountancy.lang b/htdocs/langs/en_AE/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/en_AE/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/en_AE/admin.lang b/htdocs/langs/en_AE/admin.lang
index 58a42ff6b8e..9bfd4f12f48 100644
--- a/htdocs/langs/en_AE/admin.lang
+++ b/htdocs/langs/en_AE/admin.lang
@@ -1,15 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
+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/cashdesk.lang b/htdocs/langs/en_AE/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/en_AE/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/en_AE/companies.lang b/htdocs/langs/en_AE/companies.lang
new file mode 100644
index 00000000000..40b5f885e43
--- /dev/null
+++ b/htdocs/langs/en_AE/companies.lang
@@ -0,0 +1,7 @@
+# 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
diff --git a/htdocs/langs/en_AE/compta.lang b/htdocs/langs/en_AE/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/en_AE/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/en_AE/errors.lang b/htdocs/langs/en_AE/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/en_AE/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/en_AE/eventorganization.lang b/htdocs/langs/en_AE/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/en_AE/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
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
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/en_AE/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/en_AE/modulebuilder.lang b/htdocs/langs/en_AE/modulebuilder.lang
deleted file mode 100644
index 5db0d6ffc2c..00000000000
--- a/htdocs/langs/en_AE/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
diff --git a/htdocs/langs/en_AE/mrp.lang b/htdocs/langs/en_AE/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/en_AE/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/en_AE/orders.lang b/htdocs/langs/en_AE/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/en_AE/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/en_AE/printing.lang b/htdocs/langs/en_AE/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/en_AE/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/en_AE/products.lang b/htdocs/langs/en_AE/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/en_AE/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/en_AE/propal.lang b/htdocs/langs/en_AE/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/en_AE/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
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_AE/sendings.lang b/htdocs/langs/en_AE/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/en_AE/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/en_AE/stocks.lang b/htdocs/langs/en_AE/stocks.lang
deleted file mode 100644
index eaebe0207bc..00000000000
--- a/htdocs/langs/en_AE/stocks.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
-VirtualStockAtDate=Virtual stock at a future date
diff --git a/htdocs/langs/en_AE/ticket.lang b/htdocs/langs/en_AE/ticket.lang
deleted file mode 100644
index 64a5c8d3778..00000000000
--- a/htdocs/langs/en_AE/ticket.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
diff --git a/htdocs/langs/en_AE/trips.lang b/htdocs/langs/en_AE/trips.lang
deleted file mode 100644
index dd9decdd4fe..00000000000
--- a/htdocs/langs/en_AE/trips.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-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
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
diff --git a/htdocs/langs/en_AU/accountancy.lang b/htdocs/langs/en_AU/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/en_AU/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index 957191cff52..4d2a046987c 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -1,20 +1,12 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 OldVATRates=Old GST rate
 NewVATRates=New GST rate
 DictionaryVAT=GST Rates or Sales Tax Rates
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
 OptionVatMode=GST due
 LinkColor=Colour of links
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/en_AU/cashdesk.lang
index 87a5298ff59..adbd9cf9e57 100644
--- a/htdocs/langs/en_AU/cashdesk.lang
+++ b/htdocs/langs/en_AU/cashdesk.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - cashdesk
 NoVAT=No GST for this sale
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/en_AU/companies.lang b/htdocs/langs/en_AU/companies.lang
index d744e0b1e87..ea3dd666759 100644
--- a/htdocs/langs/en_AU/companies.lang
+++ b/htdocs/langs/en_AU/companies.lang
@@ -1,2 +1,8 @@
 # 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/compta.lang b/htdocs/langs/en_AU/compta.lang
index bb8e2af8069..6eff7c4b947 100644
--- a/htdocs/langs/en_AU/compta.lang
+++ b/htdocs/langs/en_AU/compta.lang
@@ -7,13 +7,5 @@ ShowVatPayment=Show GST payment
 CheckReceipt=Cheque deposit
 CheckReceiptShort=Cheque deposit
 NewCheckDeposit=New cheque deposit
-RulesResultInOut=- It includes the real payments made on invoices, expenses, GST and salaries. <br>- It is based on the payment dates of the invoices, expenses, GST and salaries. The donation date for donation.
-VATReportByThirdParties=Sales tax report by third party
 VATReportByCustomersInInputOutputMode=Report by the customer GST collected and paid
 CalculationRuleDesc=To calculate total GST, there is two methods:<br>Method 1 is rounding GST on each line, then summing them.<br>Method 2 is summing all GST on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-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)
diff --git a/htdocs/langs/en_AU/errors.lang b/htdocs/langs/en_AU/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/en_AU/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/en_AU/eventorganization.lang b/htdocs/langs/en_AU/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/en_AU/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/en_AU/members.lang b/htdocs/langs/en_AU/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/en_AU/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/en_AU/modulebuilder.lang b/htdocs/langs/en_AU/modulebuilder.lang
deleted file mode 100644
index 5db0d6ffc2c..00000000000
--- a/htdocs/langs/en_AU/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
diff --git a/htdocs/langs/en_AU/mrp.lang b/htdocs/langs/en_AU/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/en_AU/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/en_AU/orders.lang b/htdocs/langs/en_AU/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/en_AU/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/en_AU/printing.lang b/htdocs/langs/en_AU/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/en_AU/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/en_AU/products.lang b/htdocs/langs/en_AU/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/en_AU/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/en_AU/propal.lang b/htdocs/langs/en_AU/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/en_AU/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/en_AU/receptions.lang b/htdocs/langs/en_AU/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/en_AU/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/sendings.lang b/htdocs/langs/en_AU/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/en_AU/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/en_AU/stocks.lang b/htdocs/langs/en_AU/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/en_AU/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/en_AU/ticket.lang b/htdocs/langs/en_AU/ticket.lang
deleted file mode 100644
index 64a5c8d3778..00000000000
--- a/htdocs/langs/en_AU/ticket.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
diff --git a/htdocs/langs/en_AU/trips.lang b/htdocs/langs/en_AU/trips.lang
deleted file mode 100644
index dd9decdd4fe..00000000000
--- a/htdocs/langs/en_AU/trips.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-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
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
diff --git a/htdocs/langs/en_CA/accountancy.lang b/htdocs/langs/en_CA/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/en_CA/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index be37bc8e7b5..168cecdf060 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -1,19 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
-DictionaryOrderMethods=Order methods
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 LocalTax1Management=PST Management
 CompanyZip=Postal code
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
 LDAPFieldZip=Postal code
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 FormatZip=Postal code
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/en_CA/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/en_CA/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/en_CA/companies.lang b/htdocs/langs/en_CA/companies.lang
index fb4a2125300..d6aa5f742ba 100644
--- a/htdocs/langs/en_CA/companies.lang
+++ b/htdocs/langs/en_CA/companies.lang
@@ -2,3 +2,9 @@
 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/compta.lang b/htdocs/langs/en_CA/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/en_CA/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/en_CA/errors.lang b/htdocs/langs/en_CA/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/en_CA/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/en_CA/eventorganization.lang b/htdocs/langs/en_CA/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/en_CA/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/en_CA/members.lang b/htdocs/langs/en_CA/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/en_CA/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/en_CA/modulebuilder.lang b/htdocs/langs/en_CA/modulebuilder.lang
deleted file mode 100644
index 5db0d6ffc2c..00000000000
--- a/htdocs/langs/en_CA/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
diff --git a/htdocs/langs/en_CA/mrp.lang b/htdocs/langs/en_CA/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/en_CA/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/en_CA/orders.lang b/htdocs/langs/en_CA/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/en_CA/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/en_CA/printing.lang b/htdocs/langs/en_CA/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/en_CA/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/en_CA/products.lang b/htdocs/langs/en_CA/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/en_CA/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/en_CA/propal.lang b/htdocs/langs/en_CA/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/en_CA/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/en_CA/receptions.lang b/htdocs/langs/en_CA/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/en_CA/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_CA/sendings.lang b/htdocs/langs/en_CA/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/en_CA/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/en_CA/stocks.lang b/htdocs/langs/en_CA/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/en_CA/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/en_CA/ticket.lang b/htdocs/langs/en_CA/ticket.lang
deleted file mode 100644
index 64a5c8d3778..00000000000
--- a/htdocs/langs/en_CA/ticket.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
diff --git a/htdocs/langs/en_CA/trips.lang b/htdocs/langs/en_CA/trips.lang
deleted file mode 100644
index dd9decdd4fe..00000000000
--- a/htdocs/langs/en_CA/trips.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-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
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index a0c88ed58fb..6f0fc7346d1 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -80,7 +80,6 @@ DescVentilTodoExpenseReport=Link expense report lines not already linked with a
 DescVentilExpenseReport=View here the list of expense report lines linked (or not) to a fee finance account
 DescVentilDoneExpenseReport=View here the list of the lines of expense reports and their fees account
 ValidateHistory=Link Automatically
-AutomaticBindingDone=Automatic link done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this finance account because it is used
 MvtNotCorrectlyBalanced=Transaction not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Link card
@@ -97,8 +96,6 @@ AccountingJournal=Finance journal
 NewAccountingJournal=New finance journal
 ErrorAccountingJournalIsAlreadyUse=This journal is already in use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Financial account for Sales Tax is defined in menu <b>%s</b> - <b>%s</b>
-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)
 Modelcsv=Example of export
 Selectmodelcsv=Select an example of export
 ChartofaccountsId=Chart of accounts ID
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index 0fe65e58b9f..4c86efb8c05 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Company
 VersionProgram=Program Version
 VersionLastInstall=Version Initially Installed
@@ -36,26 +38,16 @@ GenericMaskCodes4b=<u>Example of third party created on 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Example of product created on 2007-03-01:</u><br>
 GenericNumRefModelDesc=Returns a customisable number according to a defined mask.
 UMaskExplanation=This parameter allows 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.
-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>"
 ListOfDirectories=List of OpenDocument template directories
 ListOfDirectoriesForModelGenODT=List of directories containing template files in OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between each 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>.
 FollowingSubstitutionKeysCanBeUsed=<br>To learn how to create your .odt document templates, before storing them in those directories, read wiki documentation:
 Module50200Name=PayPal
-DictionaryOrderMethods=Order methods
 DictionaryAccountancyJournal=Finance journals
 CompanyZip=Postcode
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
 LDAPFieldZip=Postcode
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
 GenbarcodeLocation=Barcode 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
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 FormatZip=Postcode
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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_GB/cashdesk.lang b/htdocs/langs/en_GB/cashdesk.lang
index 4baa24d53d9..0188074370e 100644
--- a/htdocs/langs/en_GB/cashdesk.lang
+++ b/htdocs/langs/en_GB/cashdesk.lang
@@ -6,4 +6,3 @@ NewSell=New sale
 RestartSelling=Go back to sales
 NoProductFound=No product found
 NoArticle=No product
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/en_GB/companies.lang b/htdocs/langs/en_GB/companies.lang
index 505b39eb102..5b1fc1ce577 100644
--- a/htdocs/langs/en_GB/companies.lang
+++ b/htdocs/langs/en_GB/companies.lang
@@ -1,3 +1,9 @@
 # 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.
+ProfId3ShortCM=Decree of creation
 AccountancyCode=Account
diff --git a/htdocs/langs/en_GB/compta.lang b/htdocs/langs/en_GB/compta.lang
index 8db3afa02b3..28171a89614 100644
--- a/htdocs/langs/en_GB/compta.lang
+++ b/htdocs/langs/en_GB/compta.lang
@@ -6,10 +6,3 @@ NewCheckDeposit=New cheque deposit
 NewCheckDepositOn=Create receipt for deposit to account: %s
 NoWaitingChecks=No cheques awaiting deposit.
 NbOfCheques=No. of cheques
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/en_GB/errors.lang b/htdocs/langs/en_GB/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/en_GB/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/en_GB/eventorganization.lang b/htdocs/langs/en_GB/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/en_GB/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/en_GB/members.lang b/htdocs/langs/en_GB/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/en_GB/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/en_GB/modulebuilder.lang b/htdocs/langs/en_GB/modulebuilder.lang
deleted file mode 100644
index 5db0d6ffc2c..00000000000
--- a/htdocs/langs/en_GB/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
diff --git a/htdocs/langs/en_GB/mrp.lang b/htdocs/langs/en_GB/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/en_GB/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/en_GB/orders.lang b/htdocs/langs/en_GB/orders.lang
index 96775ddd3c3..da80d5089a3 100644
--- a/htdocs/langs/en_GB/orders.lang
+++ b/htdocs/langs/en_GB/orders.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
 StatusOrderCanceledShort=Cancelled
 StatusOrderCanceled=Cancelled
 StatusSupplierOrderCanceledShort=Cancelled
diff --git a/htdocs/langs/en_GB/printing.lang b/htdocs/langs/en_GB/printing.lang
index 80d45e7cc8d..257c7849c29 100644
--- a/htdocs/langs/en_GB/printing.lang
+++ b/htdocs/langs/en_GB/printing.lang
@@ -1,8 +1,2 @@
 # 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
 IPP_Color=Colour
diff --git a/htdocs/langs/en_GB/products.lang b/htdocs/langs/en_GB/products.lang
index ec2861aa520..e707e316257 100644
--- a/htdocs/langs/en_GB/products.lang
+++ b/htdocs/langs/en_GB/products.lang
@@ -1,4 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
 PrintsheetForOneBarCode=Print several labels for one barcode
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/en_GB/receptions.lang b/htdocs/langs/en_GB/receptions.lang
index 3e50d5eae72..7c2773c183f 100644
--- a/htdocs/langs/en_GB/receptions.lang
+++ b/htdocs/langs/en_GB/receptions.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - receptions
 StatusReceptionCanceled=Cancelled
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
diff --git a/htdocs/langs/en_GB/sendings.lang b/htdocs/langs/en_GB/sendings.lang
index ed0f8071684..61058b10825 100644
--- a/htdocs/langs/en_GB/sendings.lang
+++ b/htdocs/langs/en_GB/sendings.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - sendings
 StatusSendingCanceled=Cancelled
 StatusSendingCanceledShort=Cancelled
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/en_GB/stocks.lang b/htdocs/langs/en_GB/stocks.lang
index 80f018cd444..ba358dbb241 100644
--- a/htdocs/langs/en_GB/stocks.lang
+++ b/htdocs/langs/en_GB/stocks.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - stocks
 StocksArea=Warehouse area
 MassStockTransferShort=Bulk stock transfer
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
 QtyDispatchedShort=Quantity dispatched
 QtyToDispatchShort=Quantity to be dispatched
 OrderStatusNotReadyToDispatch=Order Status does not allow dispatching of products in stock warehouses.
diff --git a/htdocs/langs/en_GB/ticket.lang b/htdocs/langs/en_GB/ticket.lang
deleted file mode 100644
index 64a5c8d3778..00000000000
--- a/htdocs/langs/en_GB/ticket.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
diff --git a/htdocs/langs/en_GB/trips.lang b/htdocs/langs/en_GB/trips.lang
index 557b12bd40b..31e58b7f935 100644
--- a/htdocs/langs/en_GB/trips.lang
+++ b/htdocs/langs/en_GB/trips.lang
@@ -6,8 +6,3 @@ TF_METRO=Tube
 ErrorDoubleDeclaration=You have submitted another expense report in a similar date range.
 BrouillonnerTrip=Move expense report status back to "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report status back to "Draft"?
-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
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
diff --git a/htdocs/langs/en_GB/withdrawals.lang b/htdocs/langs/en_GB/withdrawals.lang
index b1d58194878..631f2f62900 100644
--- a/htdocs/langs/en_GB/withdrawals.lang
+++ b/htdocs/langs/en_GB/withdrawals.lang
@@ -12,5 +12,4 @@ OrderWaiting=Waiting for action
 WithdrawalFileNotCapable=Unable to generate Payment receipt file for your country %s (Your country is not supported)
 WithdrawRequestAmount=The amount of Direct Debit request:
 WithdrawRequestErrorNilAmount=Unable to create a Direct Debit request for an empty amount.
-SEPALegalText=By signing this mandate form, you authorise (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
 InfoRejectMessage=Hello,<br><br>the direct debit payment order for invoice %s related to the company %s, for an amount of %s has been refused by the bank.<br><br>--<br>%s
diff --git a/htdocs/langs/en_IN/accountancy.lang b/htdocs/langs/en_IN/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/en_IN/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index 457718a3122..1c0c06a69a2 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Module20Name=Quotations
 Module20Desc=Management of quotations
 Permission21=Read quotations
@@ -10,21 +10,13 @@ Permission25=Send quotations
 Permission26=Close quotations
 Permission27=Delete quotations
 Permission28=Export quotations
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
 PropalSetup=Quotation module setup
 ProposalsNumberingModules=Quotation numbering models
 ProposalsPDFModules=Quotation documents models
 FreeLegalTextOnProposal=Free text on quotations
 WatermarkOnDraftProposal=Watermark on draft quotations (none if empty)
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
 MailToSendProposal=Customer quotations
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/en_IN/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/en_IN/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/en_IN/companies.lang b/htdocs/langs/en_IN/companies.lang
index e33ae9aa9ff..1c2c7a6f4fb 100644
--- a/htdocs/langs/en_IN/companies.lang
+++ b/htdocs/langs/en_IN/companies.lang
@@ -1,5 +1,11 @@
 # 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/compta.lang b/htdocs/langs/en_IN/compta.lang
index 76b94b54ef2..6e6975592c2 100644
--- a/htdocs/langs/en_IN/compta.lang
+++ b/htdocs/langs/en_IN/compta.lang
@@ -1,9 +1,2 @@
 # Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
 ProposalStats=Statistics on quotations
-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)
diff --git a/htdocs/langs/en_IN/errors.lang b/htdocs/langs/en_IN/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/en_IN/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/en_IN/eventorganization.lang b/htdocs/langs/en_IN/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/en_IN/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/en_IN/members.lang b/htdocs/langs/en_IN/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/en_IN/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/en_IN/modulebuilder.lang b/htdocs/langs/en_IN/modulebuilder.lang
deleted file mode 100644
index 5db0d6ffc2c..00000000000
--- a/htdocs/langs/en_IN/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
diff --git a/htdocs/langs/en_IN/mrp.lang b/htdocs/langs/en_IN/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/en_IN/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/en_IN/orders.lang b/htdocs/langs/en_IN/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/en_IN/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/en_IN/printing.lang b/htdocs/langs/en_IN/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/en_IN/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/en_IN/products.lang b/htdocs/langs/en_IN/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/en_IN/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/en_IN/receptions.lang b/htdocs/langs/en_IN/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/en_IN/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_IN/sendings.lang b/htdocs/langs/en_IN/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/en_IN/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/en_IN/stocks.lang b/htdocs/langs/en_IN/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/en_IN/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/en_IN/ticket.lang b/htdocs/langs/en_IN/ticket.lang
deleted file mode 100644
index 64a5c8d3778..00000000000
--- a/htdocs/langs/en_IN/ticket.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
diff --git a/htdocs/langs/en_IN/trips.lang b/htdocs/langs/en_IN/trips.lang
deleted file mode 100644
index dd9decdd4fe..00000000000
--- a/htdocs/langs/en_IN/trips.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-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
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
diff --git a/htdocs/langs/en_SG/accountancy.lang b/htdocs/langs/en_SG/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/en_SG/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/en_SG/admin.lang b/htdocs/langs/en_SG/admin.lang
index 58a42ff6b8e..9bfd4f12f48 100644
--- a/htdocs/langs/en_SG/admin.lang
+++ b/htdocs/langs/en_SG/admin.lang
@@ -1,15 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
+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/cashdesk.lang b/htdocs/langs/en_SG/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/en_SG/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/en_SG/companies.lang b/htdocs/langs/en_SG/companies.lang
new file mode 100644
index 00000000000..40b5f885e43
--- /dev/null
+++ b/htdocs/langs/en_SG/companies.lang
@@ -0,0 +1,7 @@
+# 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
diff --git a/htdocs/langs/en_SG/compta.lang b/htdocs/langs/en_SG/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/en_SG/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/en_SG/errors.lang b/htdocs/langs/en_SG/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/en_SG/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/en_SG/eventorganization.lang b/htdocs/langs/en_SG/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/en_SG/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/en_SG/members.lang b/htdocs/langs/en_SG/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/en_SG/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/en_SG/modulebuilder.lang b/htdocs/langs/en_SG/modulebuilder.lang
deleted file mode 100644
index 5db0d6ffc2c..00000000000
--- a/htdocs/langs/en_SG/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
diff --git a/htdocs/langs/en_SG/mrp.lang b/htdocs/langs/en_SG/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/en_SG/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/en_SG/orders.lang b/htdocs/langs/en_SG/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/en_SG/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/en_SG/printing.lang b/htdocs/langs/en_SG/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/en_SG/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/en_SG/products.lang b/htdocs/langs/en_SG/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/en_SG/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/en_SG/propal.lang b/htdocs/langs/en_SG/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/en_SG/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/en_SG/receptions.lang b/htdocs/langs/en_SG/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/en_SG/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_SG/sendings.lang b/htdocs/langs/en_SG/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/en_SG/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/en_SG/stocks.lang b/htdocs/langs/en_SG/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/en_SG/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/en_SG/ticket.lang b/htdocs/langs/en_SG/ticket.lang
deleted file mode 100644
index 64a5c8d3778..00000000000
--- a/htdocs/langs/en_SG/ticket.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
diff --git a/htdocs/langs/en_SG/trips.lang b/htdocs/langs/en_SG/trips.lang
deleted file mode 100644
index dd9decdd4fe..00000000000
--- a/htdocs/langs/en_SG/trips.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-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
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 40c83977076..8bc4b54a090 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -329,8 +329,8 @@ 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=Notified export date (modification of the entries will not be possible)
-NotifiedValidationDate=Validation of the entries (modification or deletion of the entries will not be possible)
+NotifiedExportDate=Flag exported lines as exported (modification of the lines will not be possible)
+NotifiedValidationDate=Validate the exported entries (modification or deletion of the lines will not be possible)
 ConfirmExportFile=Confirmation of the generation of the accounting export file ?
 ExportDraftJournal=Export draft journal
 Modelcsv=Model of export
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 2e8d847ad11..74cda5437e1 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Version
 Publisher=Publisher
@@ -85,6 +87,7 @@ 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
@@ -117,6 +120,7 @@ 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
@@ -263,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -277,6 +281,7 @@ 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
@@ -338,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>
@@ -350,6 +355,7 @@ 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>
@@ -372,8 +378,8 @@ UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
-DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+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
@@ -498,6 +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
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -514,6 +521,9 @@ 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
@@ -755,6 +765,7 @@ 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)
@@ -950,10 +961,14 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
+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.
@@ -1036,7 +1051,7 @@ DictionaryFees=Expense report - Types of expense report lines
 DictionarySendingMethods=Shipping methods
 DictionaryStaff=Number of Employees
 DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
+DictionaryOrderMethods=Order methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=Models for chart of accounts
@@ -1169,7 +1184,8 @@ DoNotSuggestPaymentMode=Do not suggest
 NoActiveBankAccountDefined=No active bank account defined
 OwnerOfBankAccount=Owner of bank account %s
 BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Define the link "<strong>%s</strong>" (empty to not display this link, 'github' for the link to the Dolibarr project or define directly an url 'https://...')
+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.
@@ -1194,6 +1210,9 @@ SetupDescription2=The following two sections are mandatory (the two first entrie
 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
@@ -1216,7 +1235,7 @@ SystemAreaForAdminOnly=This area is available to administrator users only. Dolib
 CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
-DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
+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
@@ -1268,7 +1287,7 @@ SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn w
 ShowProfIdInAddress=Show professional ID with addresses
 ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable meteorological view
+MAIN_DISABLE_METEO=Disable weather thumb
 MeteoStdMod=Standard mode
 MeteoStdModEnabled=Standard mode enabled
 MeteoPercentageMod=Percentage mode
@@ -1338,8 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1419,7 +1439,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 sale order by default if not defined on the order
+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
@@ -1623,12 +1643,11 @@ 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 forms (otherwise shown in a tooltip popup)
-DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+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 
+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.
@@ -1688,6 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 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
@@ -1703,8 +1725,8 @@ 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
+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>
@@ -1879,6 +1901,7 @@ 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
@@ -1894,6 +1917,9 @@ 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=Active border 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
@@ -1994,7 +2020,14 @@ 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 picture on proposal line
+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
@@ -2034,13 +2067,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2049,7 +2083,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\s*([^\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\s([^\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2095,7 +2129,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2112,6 +2146,7 @@ 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
@@ -2143,7 +2178,7 @@ NoWritableFilesFoundIntoRootDir=No writable files or directories of the common p
 RecommendedValueIs=Recommended: %s
 Recommended=Recommended
 NotRecommended=Not recommended
-ARestrictedPath=A restricted path
+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
@@ -2156,5 +2191,33 @@ 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
\ No newline at end of file
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index bab409dd036..bc9c7dab537 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -64,6 +64,7 @@ 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
@@ -169,4 +170,5 @@ 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
\ No newline at end of file
+BrowserPush=Browser Popup Notification
+ActiveByDefault=Enabled by default
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 6c770163f29..f066877f676 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 68e01da9cf2..f7d0155f41e 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/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
@@ -192,6 +191,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+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»)
@@ -199,6 +199,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice
 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.
@@ -234,18 +235,24 @@ 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
@@ -262,6 +269,7 @@ 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
@@ -441,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
@@ -593,4 +603,7 @@ 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
\ No newline at end of file
+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/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
index 44cb183050a..a1046827559 100644
--- a/htdocs/langs/en_US/blockedlog.lang
+++ b/htdocs/langs/en_US/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.
\ No newline at end of file
diff --git a/htdocs/langs/en_US/bookmarks.lang b/htdocs/langs/en_US/bookmarks.lang
index 87466cadcfa..be0f2f7e25d 100644
--- a/htdocs/langs/en_US/bookmarks.lang
+++ b/htdocs/langs/en_US/bookmarks.lang
@@ -15,7 +15,8 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 86fdfd753a5..a5d4e9062e4 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -42,7 +42,7 @@ 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:
+NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
 SearchProduct=Search product
 Receipt=Receipt
 Header=Header
@@ -128,3 +128,11 @@ 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=Format rule "ref:NB+qu:NB+qd:NB+other:NB" where NB is the number of characters to compose a part of the barcode with : <ul><li><b>ref</b> : product reference</li><li><b>qu</b> : quantity (units)<l/i><li><b>qd</b> : quantity (decimals)</li><li><b>other</b> : others characters</li></ul>
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index 29e08f66541..cf0de898bdb 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -96,4 +96,5 @@ 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/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 7deee6a9d55..3e85f1b35f7 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -271,6 +283,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)
 ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
@@ -363,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index c5e1a58d243..640a229b7f2 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -192,7 +193,7 @@ 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 partie
+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
@@ -286,9 +287,14 @@ 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 days
-InvoiceLateMinus15Days = Invoices late
-InvoiceNotLate = To be collected < 15 days
-InvoiceNotLate15Days = To be collected in 15 days
-InvoiceNotLate30Days = To be collected in 30 days
+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 ?
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index bc18bed4a29..494a6c55164 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -45,3 +45,5 @@ 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/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 15043ce047e..98d83aa9453 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.
@@ -27,7 +28,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
@@ -83,7 +86,7 @@ ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not s
 ErrorRefAlreadyExists=Ref used for creation 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 has at least one child of type %s
+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
@@ -111,6 +114,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -270,8 +274,10 @@ ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Ev
 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.
@@ -307,3 +313,23 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 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/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 1fd767f556c..bc334fe08cf 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -19,7 +19,7 @@
 #
 ModuleEventOrganizationName = Event Organization
 EventOrganizationDescription = Event Organization through Module Project
-EventOrganizationDescriptionLong= Manage the organization of an event (conferences, attendees, speakers, with public suggestion, vote or registration pages)
+EventOrganizationDescriptionLong= Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
 #
 # Menu
 #
@@ -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
@@ -162,4 +163,5 @@ RegistrationAndPaymentWereAlreadyRecorder=A registration and a payment were alre
 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
\ No newline at end of file
+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
diff --git a/htdocs/langs/en_US/help.lang b/htdocs/langs/en_US/help.lang
index 048de16d3c0..d699cb56fd2 100644
--- a/htdocs/langs/en_US/help.lang
+++ b/htdocs/langs/en_US/help.lang
@@ -20,4 +20,4 @@ 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>
+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/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index 0a732c2ddb6..3d0ae64be0f 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -132,4 +132,8 @@ 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/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang
index da098e10bdb..c571ec6ca8a 100644
--- a/htdocs/langs/en_US/hrm.lang
+++ b/htdocs/langs/en_US/hrm.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - en_US - hrm
+
+
 # Admin
 HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
 Establishments=Establishments
@@ -17,3 +19,63 @@ 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
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -21,6 +21,7 @@ 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.
diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang
index 51079fca278..ef5df43e546 100644
--- a/htdocs/langs/en_US/interventions.lang
+++ b/htdocs/langs/en_US/interventions.lang
@@ -64,5 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
-Reopen=Reopen
 ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
+GenerateInter=Generate intervention
diff --git a/htdocs/langs/en_US/knowledgemanagement.lang b/htdocs/langs/en_US/knowledgemanagement.lang
index 757ab01fc35..ee93715a5c0 100644
--- a/htdocs/langs/en_US/knowledgemanagement.lang
+++ b/htdocs/langs/en_US/knowledgemanagement.lang
@@ -46,4 +46,9 @@ 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)
\ No newline at end of file
+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" ?
\ No newline at end of file
diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang
index ca962811831..7c2a0f8b6ec 100644
--- a/htdocs/langs/en_US/languages.lang
+++ b/htdocs/langs/en_US/languages.lang
@@ -1,7 +1,9 @@
 # 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)
@@ -21,6 +23,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)
@@ -73,6 +76,7 @@ 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
@@ -81,6 +85,7 @@ 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)
@@ -93,6 +98,8 @@ 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
@@ -103,6 +110,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/ldap.lang b/htdocs/langs/en_US/ldap.lang
index 8b6f0864215..19dd29e0a51 100644
--- a/htdocs/langs/en_US/ldap.lang
+++ b/htdocs/langs/en_US/ldap.lang
@@ -25,3 +25,7 @@ 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
\ No newline at end of file
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 44e8e7b167e..2d850927782 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ 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
@@ -804,6 +807,7 @@ 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
@@ -905,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1137,7 +1141,26 @@ 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
\ No newline at end of file
+NotClosedYet=Not yet closed
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 5285e4ecb60..9605e7a8df7 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -7,7 +7,7 @@ Members=Members
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
 ThirdpartyNotLinkedToMember=Third party not linked to a member
-MembersTickets=Members Tickets
+MembersTickets=Membership address sheet
 FundationMembers=Foundation members
 ListOfValidatedPublicMembers=List of validated public members
 ErrorThisMemberIsNotPublic=This member is not public
@@ -68,7 +68,7 @@ DeleteAMemberType=Delete a member type
 ConfirmDeleteMemberType=Are you sure you want to delete this member type?
 MemberTypeDeleted=Member type deleted
 MemberTypeCanNotBeDeleted=Member type can not be deleted
-NewSubscription=New subscription
+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
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 7ba539d3bd4..61b5c939d12 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 you want to execute for each business event executed.
+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
@@ -143,4 +143,5 @@ 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
\ No newline at end of file
+ImportExportProfiles=Import and export profiles
+ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 2414a92cefb..74bed0d9186 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -9,6 +9,7 @@ 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
@@ -26,12 +27,12 @@ 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
 ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
-ConfirmDeleteMo=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
@@ -55,6 +56,7 @@ 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%%)
@@ -72,6 +74,7 @@ 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
@@ -101,3 +104,6 @@ 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
diff --git a/htdocs/langs/en_US/oauth.lang b/htdocs/langs/en_US/oauth.lang
index d52422a194a..dda6f1bdf73 100644
--- a/htdocs/langs/en_US/oauth.lang
+++ b/htdocs/langs/en_US/oauth.lang
@@ -23,10 +23,10 @@ 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_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">this page</a> then "Register a new application" to create OAuth credentials
+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
\ No newline at end of file
diff --git a/htdocs/langs/en_US/opensurvey.lang b/htdocs/langs/en_US/opensurvey.lang
index 7d26151fa16..9fafacaf8bf 100644
--- a/htdocs/langs/en_US/opensurvey.lang
+++ b/htdocs/langs/en_US/opensurvey.lang
@@ -48,6 +48,8 @@ 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
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 9018db40a5b..11220633d61 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -17,7 +17,7 @@ ToOrder=Make order
 MakeOrder=Make order
 SupplierOrder=Purchase order
 SuppliersOrders=Purchase orders
-SaleOrderLines=Sale order lines
+SaleOrderLines=Sales order lines
 PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
@@ -124,6 +124,8 @@ 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
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index bb35099ab82..a43e97c1a02 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -35,6 +35,9 @@ OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Onl
 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
@@ -255,6 +258,10 @@ 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
@@ -265,7 +272,8 @@ 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
 AvailableFormats=Available formats
@@ -291,3 +299,7 @@ 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
diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index f5b9ebcde24..f542bfab670 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -19,7 +19,7 @@
 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
@@ -58,6 +58,7 @@ ManagePartnership=Manage partnership
 BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
 ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
 PartnershipType=Partnership type
+PartnershipRefApproved=Partnership %s approved
 
 #
 # Template Mail
diff --git a/htdocs/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang
index 6f320c03181..a2bfb1773e4 100644
--- a/htdocs/langs/en_US/paybox.lang
+++ b/htdocs/langs/en_US/paybox.lang
@@ -1,6 +1,6 @@
 # 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, ...)
+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
diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang
index 5eb5f389445..beaf9a5ea3f 100644
--- a/htdocs/langs/en_US/paypal.lang
+++ b/htdocs/langs/en_US/paypal.lang
@@ -1,6 +1,6 @@
 # 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, ...)
+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
diff --git a/htdocs/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang
index 16494583550..bd9094f213d 100644
--- a/htdocs/langs/en_US/printing.lang
+++ b/htdocs/langs/en_US/printing.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - printing
-Module64000Name=Direct Printing
-Module64000Desc=Enable Direct Printing System
-PrintingSetup=Setup of Direct Printing System
-PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer without needing to open the document in another application.
-MenuDirectPrinting=Direct Printing jobs
-DirectPrint=Direct print
+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.
diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index 763af20c6b4..dd1e0ea4027 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -30,14 +30,16 @@ 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 add for each barcode/lot/serial scanned
+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
\ No newline at end of file
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index fecbe7450c2..14715670882 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -75,6 +75,7 @@ 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
@@ -315,7 +316,7 @@ LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Include products/services with tag
+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
@@ -341,7 +342,7 @@ 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 descriptions of products defined by the vendors in addition to descriptions for customers
+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
@@ -397,5 +398,16 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
+AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 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
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 2fda7e1df0e..77eabd20221 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -140,6 +140,7 @@ 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
@@ -196,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
@@ -241,6 +243,7 @@ LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
 NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
 ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to create intervention.
 ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
@@ -252,10 +255,12 @@ 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
@@ -264,14 +269,21 @@ 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 
\ No newline at end of file
+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/en_US/propal.lang b/htdocs/langs/en_US/propal.lang
index edbc08236d3..db7b559a8a7 100644
--- a/htdocs/langs/en_US/propal.lang
+++ b/htdocs/langs/en_US/propal.lang
@@ -5,7 +5,7 @@ ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
 ProposalsOpened=Open commercial proposals
 CommercialProposal=Commercial proposal
-PdfCommercialProposalTitle=Commercial proposal
+PdfCommercialProposalTitle=Proposal
 ProposalCard=Proposal card
 NewProp=New commercial proposal
 NewPropal=New proposal
@@ -89,4 +89,11 @@ 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?
diff --git a/htdocs/langs/en_US/receptions.lang b/htdocs/langs/en_US/receptions.lang
index d60487c439f..3d69873c5fc 100644
--- a/htdocs/langs/en_US/receptions.lang
+++ b/htdocs/langs/en_US/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
@@ -38,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 order card.
+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
@@ -47,6 +48,7 @@ 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/salaries.lang b/htdocs/langs/en_US/salaries.lang
index 6397ed4c6d4..20a10694500 100644
--- a/htdocs/langs/en_US/salaries.lang
+++ b/htdocs/langs/en_US/salaries.lang
@@ -22,4 +22,6 @@ LastSalaries=Latest %s salaries
 AllSalaries=All salaries
 SalariesStatistics=Salary statistics
 SalariesAndPayments=Salaries and payments
-ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
\ No newline at end of file
+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/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index b94891d79c5..8f10b1e9404 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -53,7 +53,7 @@ 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 order card.
+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
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 16917384460..ebd67df79c9 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -62,7 +62,7 @@ AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock pe
 RuleForWarehouse=Rule for warehouses
 WarehouseAskWarehouseOnThirparty=Set a warehouse on Third-parties
 WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
+WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
 WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -96,7 +96,7 @@ 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 date
+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
@@ -241,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -254,7 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
+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
\ No newline at end of file
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 0eba2f5c286..0a376ca9fb1 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index ca9ee174d29..15da3f0638a 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -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
\ No newline at end of file
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index 0b54b1d5fa8..d38358eb74d 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -45,6 +45,8 @@ TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
 TicketSeverityShortBLOCKING=Critical, Blocking
 
+TicketCategoryShortOTHER=Other
+
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
 MenuTicketMyAssignNonClosed=My open tickets
@@ -180,7 +182,7 @@ MessageSuccessfullyAdded=Ticket added
 TicketMessageSuccessfullyAdded=Message successfully added
 TicketMessagesList=Message list
 NoMsgForThisTicket=No message for this ticket
-Properties=Classification
+TicketProperties=Classification
 LatestNewTickets=Latest %s newest tickets (not read)
 TicketSeverity=Severity
 ShowTicket=See ticket
@@ -316,6 +318,7 @@ 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 today's new tickets versus today's closed tickets
+BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
 TicketCreatedToday=Ticket created today
-TicketClosedToday=Ticket closed today
\ No newline at end of file
+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/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index 1f53a5737ff..9210ede360c 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -90,7 +90,6 @@ DATE_REFUS=Deny date
 DATE_SAVE=Validation date
 DATE_CANCEL=Cancelation date
 DATE_PAIEMENT=Payment date
-BROUILLONNER=Reopen
 ExpenseReportRef=Ref. expense report
 ValidateAndSubmit=Validate and submit for approval
 ValidatedWaitingApproval=Validated (waiting for approval)
@@ -113,7 +112,7 @@ 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 create or update any rules of calculation. This part will be used when user will create a new expense report
+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
@@ -128,19 +127,19 @@ ExpenseReportDomain=Domain to apply
 ExpenseReportLimitOn=Limit on
 ExpenseReportDateStart=Date start
 ExpenseReportDateEnd=Date end
-ExpenseReportLimitAmount=Limite amount
-ExpenseReportRestrictive=Restrictive
+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=Constraint violation id [%s]: %s  is superior to %s %s
+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=Constraint violation id [%s]: %s  is superior to %s %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)
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index cd1964ff383..b5ef14bd118 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -45,7 +45,7 @@ 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>
+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
@@ -60,7 +60,7 @@ YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" bu
 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
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index 5efc4bf8e35..eb25d563f62 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -82,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -117,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -152,3 +152,5 @@ 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  
\ No newline at end of file
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index 15fd8ef07c2..b65f8449fef 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -13,9 +13,14 @@ descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as b
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_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
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed 
diff --git a/htdocs/langs/en_ZA/accountancy.lang b/htdocs/langs/en_ZA/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/en_ZA/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/en_ZA/admin.lang b/htdocs/langs/en_ZA/admin.lang
index 58a42ff6b8e..9bfd4f12f48 100644
--- a/htdocs/langs/en_ZA/admin.lang
+++ b/htdocs/langs/en_ZA/admin.lang
@@ -1,15 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
+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/cashdesk.lang b/htdocs/langs/en_ZA/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/en_ZA/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/en_ZA/companies.lang b/htdocs/langs/en_ZA/companies.lang
new file mode 100644
index 00000000000..40b5f885e43
--- /dev/null
+++ b/htdocs/langs/en_ZA/companies.lang
@@ -0,0 +1,7 @@
+# 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
diff --git a/htdocs/langs/en_ZA/compta.lang b/htdocs/langs/en_ZA/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/en_ZA/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/en_ZA/errors.lang b/htdocs/langs/en_ZA/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/en_ZA/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/en_ZA/eventorganization.lang b/htdocs/langs/en_ZA/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/en_ZA/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/en_ZA/main.lang b/htdocs/langs/en_ZA/main.lang
index 1f6a0b9245d..2e691473326 100644
--- a/htdocs/langs/en_ZA/main.lang
+++ b/htdocs/langs/en_ZA/main.lang
@@ -4,18 +4,18 @@ FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
-FormatDateShort=%Y/%m/%d
-FormatDateShortInput=%Y/%m/%d
-FormatDateShortJava=yyy/MM/dd
-FormatDateShortJavaInput=yyyy/MM/dd
-FormatDateShortJQuery=yy/mm/dd
-FormatDateShortJQueryInput=yy/mm/dd
+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=%H:%M
+FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
-FormatDateTextShort=%d %b %Y
-FormatDateText=%d %B %Y
-FormatDateHourShort=%d/%m/%Y %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=%d %b %Y %H:%M
-FormatDateHourText=%d %B %Y %H:%M
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/en_ZA/members.lang b/htdocs/langs/en_ZA/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/en_ZA/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/en_ZA/modulebuilder.lang b/htdocs/langs/en_ZA/modulebuilder.lang
deleted file mode 100644
index 5db0d6ffc2c..00000000000
--- a/htdocs/langs/en_ZA/modulebuilder.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - modulebuilder
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
diff --git a/htdocs/langs/en_ZA/mrp.lang b/htdocs/langs/en_ZA/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/en_ZA/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/en_ZA/orders.lang b/htdocs/langs/en_ZA/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/en_ZA/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/en_ZA/printing.lang b/htdocs/langs/en_ZA/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/en_ZA/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/en_ZA/products.lang b/htdocs/langs/en_ZA/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/en_ZA/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/en_ZA/propal.lang b/htdocs/langs/en_ZA/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/en_ZA/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
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/en_ZA/sendings.lang b/htdocs/langs/en_ZA/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/en_ZA/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/en_ZA/stocks.lang b/htdocs/langs/en_ZA/stocks.lang
deleted file mode 100644
index eaebe0207bc..00000000000
--- a/htdocs/langs/en_ZA/stocks.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
-VirtualStockAtDate=Virtual stock at a future date
diff --git a/htdocs/langs/en_ZA/ticket.lang b/htdocs/langs/en_ZA/ticket.lang
deleted file mode 100644
index 64a5c8d3778..00000000000
--- a/htdocs/langs/en_ZA/ticket.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - ticket
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
diff --git a/htdocs/langs/en_ZA/trips.lang b/htdocs/langs/en_ZA/trips.lang
deleted file mode 100644
index dd9decdd4fe..00000000000
--- a/htdocs/langs/en_ZA/trips.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-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
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
diff --git a/htdocs/langs/es_AR/accountancy.lang b/htdocs/langs/es_AR/accountancy.lang
index 108bb9edb6d..96c58aaf400 100644
--- a/htdocs/langs/es_AR/accountancy.lang
+++ b/htdocs/langs/es_AR/accountancy.lang
@@ -16,5 +16,3 @@ Journals=Diarios Contables
 JournalFinancial=Diarios Financieros
 AssignDedicatedAccountingAccount=Nueva cuenta para asignar
 InvoiceLabel=Etiqueta de la factura
-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)
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 9570d8fe923..cd369333c0e 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -181,8 +181,6 @@ OfficialDemo=Demo online Dolibarr
 OfficialMarketPlace=Mercado oficial de módulos externos/complementos
 OfficialWebHostingService=Servicios de alojamiento web referenciados (alojamiento en la nube)
 ReferencedPreferredPartners=Socios preferidos
-ForDocumentationSeeWiki=Para la documentación del usuario o desarrollador (Doc, preguntas frecuentes ...), <br> consulte la Wiki de Dolibarr: <br><b> <a href="%s" target="_blank"> %s </a> </b>
-ForAnswersSeeForum=Para cualquier otra pregunta o ayuda, puede utilizar el foro de Dolibarr: <br> <b> <a href="%s" target="_blank"> %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>.
 CurrentMenuHandler=Controlador de menú actual
@@ -235,7 +233,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>
@@ -248,8 +245,6 @@ LastActivationAuthor=Autor de última activación
 LastActivationIP=IP de última activación
 UpdateServerOffline=Actualizar servidor fuera de línea
 WithCounter=Administrar un contador
-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=No hay ajuste de texto automático. El texto que es demasiado largo no será mostrado en el documento.  Por favor agregar saltos de línea en el área de texto si es necesario.
 String=Cuerda
 Module30Name=Facturas
@@ -265,7 +260,6 @@ Permission23001=Leer tarea programada
 Permission23002=Crear/actualizar tarea programada
 Permission23003=Eliminar tarea programada
 Permission23004=Ejecutar tarea programada
-DictionaryOrderMethods=Order methods
 DictionaryExpenseTaxRange=Informe de gastos - Rango categoría de transporte
 BackToModuleList=Volver a la lista de módulos
 BackToDictionaryList=Volver a la lista de diccionarios
@@ -325,9 +319,7 @@ MaxSizeList=Longitud máxima para la lista
 DefaultMaxSizeList=Longitud máxima predeterminada para listas
 CompanyInfo=Empresa / Organización
 CompanyAddress=DIrección
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
 DelaysOfToleranceBeforeWarning=Retardo antes de mostrar una alerta de advertencia por:
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
 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í
@@ -354,7 +346,6 @@ RunningUpdateProcessMayBeRequired=Parece que es necesario ejecutar el proceso de
 YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar este comando desde la línea de comandos después de iniciar sesión en un shell con el usuario <b> %s </b> o debe agregar la opción -W al final de la línea de comandos para proporcionar la contraseña de <b> %s </b>.
 YourPHPDoesNotHaveSSLSupport=Funciones SSL no disponibles en tu PHP
 DownloadMoreSkins=Más skins para descargar
-MAIN_DISABLE_METEO=Disable weather thumb
 MeteoStdMod=Modo estandar
 MeteoPercentageModEnabled=Modo porcentual habilitado
 MeteoUseMod=Haga clic para utilizar %s
@@ -405,8 +396,6 @@ YouDoNotUseBestDriver=Utiliza el controlador %s pero se recomienda el controlado
 SearchOptim=Optimización de búsqueda
 BrowserIsOK=Está utilizando el navegador web %s. Este navegador está bien para la seguridad y el rendimiento.
 BrowserIsKO=Está utilizando el navegador web %s. Se sabe que este navegador es una mala elección para la seguridad, el rendimiento y la confiabilidad. Recomendamos utilizar Firefox, Chrome, Opera o Safari.
-AddRefInList=Mostrar la lista de referencia cliente / vendedor (lista de selección o cuadro combinado) y la mayoría del hipervínculo. <br> Los terceros aparecerán con un formato de nombre de "CC12345 - SC45678 - The Big Company corp". en lugar de "The Big Company corp".
-AddAdressInList=Mostrar la lista de información de la dirección del cliente / proveedor (seleccionar lista o combobox) <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".
 AskForPreferredShippingMethod=Pregunte por el método de envío preferido para terceros.
 FillThisOnlyIfRequired=Ejemplo: +2 (rellenar solo si se experimentan problemas de compensación de zona horaria)
 PasswordGenerationNone=No sugiera una contraseña generada. La contraseña debe escribirse manualmente.
@@ -459,7 +448,6 @@ WatermarkOnDraftSupplierProposal=Marca de agua en los proveedores de solicitudes
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Pregunte por el destino de la cuenta bancaria de la solicitud de precio
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pregunte por la fuente de almacén para el pedido
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Pregunte por el destino de la cuenta bancaria de orden de compra
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
 OrdersNumberingModules=Modelos de numeración de pedidos.
 OrdersModelModule=Pedir modelos de documentos 
 WatermarkOnDraftOrders=Marca de agua en órdenes de giro (ninguna si está vacía)
@@ -520,7 +508,6 @@ LDAPGroupObjectClassListExample=Lista de atributos de registro que definen objec
 LDAPContactObjectClassListExample=Lista de atributos de registro que definen objectClass (ej: top, inetOrgPerson o top, usuario para el directorio activo)
 LDAPFieldZip=Cremallera
 LDAPFieldCompany=Compañía
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
 Target=Destino
 Sell=Vender
 PositionIntoComboList=Posición de la línea en las listas de combo
@@ -580,7 +567,6 @@ UserHasNoPermissions=Este usuario no tiene permisos definidos.
 TypeCdr=Use "Ninguno" si la fecha de pago es la fecha de la factura más un delta en días (delta es el campo "%s"). <br> Utilice "Al final del mes", si, después del delta, la fecha debe aumentarse para alcanzar. el final del mes (+ un opcional "%s" en días)<br>  Use "Actual / Siguiente" para que la fecha del plazo de pago sea el primer Nth del mes después de delta (delta es el campo "%s", N se almacena en el campo "%s")
 WarningNoteModulePOSForFrenchLaw=Este módulo %s cumple con las leyes francesas (Loi Finance 2016) porque el módulo de Registros no reversibles se activa automáticamente.
 WarningInstallationMayBecomeNotCompliantWithLaw=Está intentando instalar el módulo %s que es un módulo externo. Activar un módulo externo significa que confía en el editor de ese módulo y que está seguro de que este módulo no afecta negativamente el comportamiento de su aplicación y cumple con las leyes de su país (%s). Si el módulo introduce una característica ilegal, usted se hace responsable del uso de software ilegal.
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 NothingToSetup=No se requiere ninguna configuración específica para este módulo.
 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)
@@ -599,18 +585,15 @@ 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
-RecordEvent=Grabar evento de correo electrónico
-CreateLeadAndThirdParty=Crear plomo (y tercero si es necesario)
 CodeLastResult=Último código de resultado
 ECMAutoTree=Mostrar arbol ECM automatico
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 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 función para vincular un recurso a los usuarios
 DisabledResourceLinkContact=Deshabilitar función para vincular un recurso a contactos
 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 a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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_AR/bookmarks.lang b/htdocs/langs/es_AR/bookmarks.lang
index e6283a5823b..0bae1c8724f 100644
--- a/htdocs/langs/es_AR/bookmarks.lang
+++ b/htdocs/langs/es_AR/bookmarks.lang
@@ -12,7 +12,6 @@ BookmarkTitle=Nombre del favorito
 BehaviourOnClick=Comportamiento al seleccionar la URL de un favorito
 CreateBookmark=Crear favorito
 SetHereATitleForLink=Elegir un nombre para el favorito
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Usar un enlace externo/absoluto (https://URL) o un enlace interno/relativo (/DOLIBARR_ROOT/htdocs/...)
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Elegir si el sitio vinculado debe abrirse en la pestaña actual o en una nueva
 BookmarksManagement=Administración de favoritos
 BookmarksMenuShortCut=Ctrl+Shift+M
diff --git a/htdocs/langs/es_AR/cashdesk.lang b/htdocs/langs/es_AR/cashdesk.lang
index 25ce43d6d65..b57a3cfc4d9 100644
--- a/htdocs/langs/es_AR/cashdesk.lang
+++ b/htdocs/langs/es_AR/cashdesk.lang
@@ -2,5 +2,4 @@
 CashDeskMenu=Punto de venta
 CashDesk=Punto de venta
 CashdeskShowServices=Servicios de Venta
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
 History=Historial
diff --git a/htdocs/langs/es_AR/companies.lang b/htdocs/langs/es_AR/companies.lang
index a643e7ee06c..1e051e5382c 100644
--- a/htdocs/langs/es_AR/companies.lang
+++ b/htdocs/langs/es_AR/companies.lang
@@ -200,7 +200,6 @@ ThisUserIsNot=Este usuario no es un cliente, cliente potencial o proveedor.
 VATIntraCheck=Cheque
 VATIntraCheckDesc=El ID de IVA debe incluir el prefijo del país. El enlace <b>%s</b> utiliza el servicio de verificación de IVA europeo (VIES) que requiere acceso a Internet desde Dolibarr.
 VATIntraCheckableOnEUSite=Consulte el ID de IVA intracomunitario en el sitio web de la Comisión Europea
-VATIntraManualCheck=También puedes consultar manualmente en el sitio web de la Comisión Europea <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=No es posible comprobar. El servicio de verificación no lo proporciona el estado del miembro (%s).
 NorProspectNorCustomer=Ni cliente ni cliente potencial
 ProspectLevel=Cliente potencia
diff --git a/htdocs/langs/es_AR/compta.lang b/htdocs/langs/es_AR/compta.lang
index 2224d8e1269..81e2eda19d4 100644
--- a/htdocs/langs/es_AR/compta.lang
+++ b/htdocs/langs/es_AR/compta.lang
@@ -3,12 +3,5 @@ Param=Preparar
 PaymentsNotLinkedToInvoice=Pago no está vinculado ninguna factura por lo que no está vinculado a un tercero
 PaymentsNotLinkedToUser=Pago no está vinculado a un usuario
 ByThirdParties=Por terceros
-VATReportByThirdParties=Sales tax report by third party
 CodeNotDef=Sin definir
 LinkedOrder=Enlazar a orden
-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)
diff --git a/htdocs/langs/es_AR/errors.lang b/htdocs/langs/es_AR/errors.lang
index 5fdc35604ba..15c4f62a00a 100644
--- a/htdocs/langs/es_AR/errors.lang
+++ b/htdocs/langs/es_AR/errors.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
 ErrorThereIsSomeDeliveries=Error, no hay entregas asociadas a este envío. Eliminación rechazada.
diff --git a/htdocs/langs/es_AR/eventorganization.lang b/htdocs/langs/es_AR/eventorganization.lang
index 0f5911ef752..c17507d822f 100644
--- a/htdocs/langs/es_AR/eventorganization.lang
+++ b/htdocs/langs/es_AR/eventorganization.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
 Settings=Ajustes
 EvntOrgDone =Hecho
diff --git a/htdocs/langs/es_AR/holiday.lang b/htdocs/langs/es_AR/holiday.lang
index 7cf781c4561..b5dbbf62a77 100644
--- a/htdocs/langs/es_AR/holiday.lang
+++ b/htdocs/langs/es_AR/holiday.lang
@@ -22,7 +22,6 @@ UserForApprovalLogin=Usuario aprobador
 SendRequestCP=Crear solicitud de licencia
 DelayToRequestCP=Las solicitudes de licencias deben realizarse al menos <b>%s día(s)</b> antes.
 MenuConfCP=Saldo de licencia
-SoldeCPUser=El saldo de licencias es de <b>%s</b> días.
 ErrorEndDateCP=Debes seleccionar una fecha de finalización mayor que la fecha de inicio.
 ErrorSQLCreateCP=Se produjo un error de SQL durante la creación:
 ErrorIDFicheCP=Se ha producido un error, la solicitud de licencia no existe.
diff --git a/htdocs/langs/es_AR/main.lang b/htdocs/langs/es_AR/main.lang
index 48f768c4623..fc6c62ae66c 100644
--- a/htdocs/langs/es_AR/main.lang
+++ b/htdocs/langs/es_AR/main.lang
@@ -88,7 +88,6 @@ RequestLastAccessInError=Error en el último requerimiento de acceso a la base d
 ReturnCodeLastAccessInError=Código de respuesta para el último error al requerir acceso a la base de datos
 InformationLastAccessInError=Información del último error al requerir acceso a la base de datos
 YouCanSetOptionDolibarrMainProdToZero=Puede leer el archivo log o establecer la opción $dolibarr_main_prod a 0 en su archivo de configuración para obtener más información.
-InformationToHelpDiagnose=Esta información puede ser útil para propósitos de diagnóstico (puede poner la opción $dolibarr_main_prod a '1' para sacar dichas noticias)
 TechnicalID=ID técnico
 LineID=ID línea
 PrecisionUnitIsLimitedToXDecimals=Dolibarr fue configurada para limitar la precisión en el precio de la unidad a <b>%s</b> decimales.
@@ -507,7 +506,6 @@ NotAllExportedMovementsCouldBeRecordedAsExported=No todos los movimientos de exp
 Miscellaneous=Miscelanias
 GroupBy=Agrupar por...
 RemoveString=Quitar cadena '%s'
-SomeTranslationAreUncomplete=Alguno de los idiomas ofertados pueden estar traducidos parcialmente o pueden contener errores. Por favor ayude a corregir su idioma registrándose en  <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> para agregar sus mejoras.
 DownloadDocument=Descargar documento
 ActualizeCurrency=Actualizar tipo de cambio
 ModuleBuilder=Constructor de Módulos y Aplicaciones
@@ -583,4 +581,3 @@ CustomReports=Informes de clientes
 SelectYourGraphOptionsFirst=Elija sus opciones de gráfico para construir un gráfico
 XAxis=Eje-X
 YAxis=Eje-Y
-Properties=Properties
diff --git a/htdocs/langs/es_AR/members.lang b/htdocs/langs/es_AR/members.lang
index fced33233fd..ace0f6bb549 100644
--- a/htdocs/langs/es_AR/members.lang
+++ b/htdocs/langs/es_AR/members.lang
@@ -4,7 +4,6 @@ MemberCard=Ficha de miembro
 SubscriptionCard=Ficha de la suscripción
 ShowMember=Mostrar ficha de miembro
 ThirdpartyNotLinkedToMember=Tercero no vinculado a un miembro
-MembersTickets=Membership address sheet
 FundationMembers=Miembros de la fundación
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Otro miembro (nombre: <b>%s</b>, usuario: <b>%s</b>) está vinculado al tercero <b>%s</b>. Debes quitar primero este vínculo pues un tercero no puede estar vinculado a más de un miembro (y viceversa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por motivos de seguridad, debe tener permisos para editar todos los usuarios para poder vincular a un miembro a un usuario que no sea suyo.
diff --git a/htdocs/langs/es_AR/mrp.lang b/htdocs/langs/es_AR/mrp.lang
index 0cb9a33adfe..33ede374dad 100644
--- a/htdocs/langs/es_AR/mrp.lang
+++ b/htdocs/langs/es_AR/mrp.lang
@@ -11,5 +11,4 @@ Bom=Listas de materiales
 BOMsSetup=Configuración de módulo de BOM
 ListOfBOMs=Lista de Listas de materiales - BOM
 ListOfManufacturingOrders=Lista de Ordenes de Fabricación
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
 MenuMRP=Ordenes de Fabricación
diff --git a/htdocs/langs/es_AR/orders.lang b/htdocs/langs/es_AR/orders.lang
index 4df86cf1d72..09e82e7d3d2 100644
--- a/htdocs/langs/es_AR/orders.lang
+++ b/htdocs/langs/es_AR/orders.lang
@@ -9,7 +9,6 @@ NewSupplierOrderShort=Nueva Orden
 NewOrderSupplier=Nueva Orden de Compra
 SupplierOrder=Orden de compra
 SuppliersOrders=Ordenes de compra
-SaleOrderLines=Sales order lines
 CustomerOrder=Ordenes de venta
 StatusOrderCanceledShort=Cancelado
 StatusOrderSentShort=En proceso
diff --git a/htdocs/langs/es_AR/printing.lang b/htdocs/langs/es_AR/printing.lang
index aa5f2a967e0..05776ca59fa 100644
--- a/htdocs/langs/es_AR/printing.lang
+++ b/htdocs/langs/es_AR/printing.lang
@@ -1,10 +1,4 @@
 # 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=Configuración de variables para Driver de Impresión
 ListDrivers=Lista de drivers
 PrintTestDesc=Lista de Iimpresoras
diff --git a/htdocs/langs/es_AR/products.lang b/htdocs/langs/es_AR/products.lang
index 50430fc9d92..c06b4d9f528 100644
--- a/htdocs/langs/es_AR/products.lang
+++ b/htdocs/langs/es_AR/products.lang
@@ -72,5 +72,3 @@ PriceQtyMin=Precio para cantidad mín.
 PriceQtyMinCurrency=Precio (moneda) para esta cant. (sin descuento)
 PredefinedProductsToSell=Producto Predefinido
 SuppliersPrices=Precio de Proveedor
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/es_AR/projects.lang b/htdocs/langs/es_AR/projects.lang
index a8ae01b6bf8..c4e1e32ddc2 100644
--- a/htdocs/langs/es_AR/projects.lang
+++ b/htdocs/langs/es_AR/projects.lang
@@ -5,3 +5,5 @@ ProjectLabel=Etiqueta de Proyecto
 ProjectsArea=Area de Proyectos
 SharedProject=Todos
 OppStatusPROPO=Propuesta
+NewInter=Nueva intervención
+StartDateCannotBeAfterEndDate=La fecha de finalización no puede ser anterior a la fecha de inicio
diff --git a/htdocs/langs/es_AR/receptions.lang b/htdocs/langs/es_AR/receptions.lang
index 518e53c6978..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
@@ -21,7 +19,6 @@ StatsOnReceptionsOnlyValidated=Estadísticas realizadas sólo con recepciones va
 SendReceptionByEMail=Enviar recepción por correo
 SendReceptionRef=Envío de recepción %s
 ActionsOnReception=Eventos en recepción
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
 ProductQtyInReceptionAlreadySent=Cantidad de productos enviados de las órdenes de ventas abietras
 ProductQtyInSuppliersReceptionAlreadyRecevied=Cantidad de productos ya recibidos de las órdenes de proveedor abiertas
 ValidateOrderFirstBeforeReception=Primero debes validar la orden antes de poder hacer recepciones.
diff --git a/htdocs/langs/es_AR/sendings.lang b/htdocs/langs/es_AR/sendings.lang
index 9cad82a1cf9..56c2b6d659c 100644
--- a/htdocs/langs/es_AR/sendings.lang
+++ b/htdocs/langs/es_AR/sendings.lang
@@ -33,7 +33,6 @@ SendShippingByEMail=Enviar detalles del envío por correo
 SendShippingRef=Enviar el viaje %s
 ActionsOnShipping=Eventos del viaje
 LinkToTrackYourPackage=Vínculo al seguimiento del envío
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
 ShipmentLine=Línea del envío
 ProductQtyInCustomersOrdersRunning=Cantidad de productos de órdenes de venta abiertas
 ProductQtyInSuppliersOrdersRunning=Cantidad de productos de órdenes de compra abiertas
diff --git a/htdocs/langs/es_AR/stocks.lang b/htdocs/langs/es_AR/stocks.lang
index c404d3c0411..073b81ff3d1 100644
--- a/htdocs/langs/es_AR/stocks.lang
+++ b/htdocs/langs/es_AR/stocks.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - stocks
 Location=Ubicaciòn
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
 inventoryEdit=Editar
 inventoryDraft=Activos
 SelectCategory=Filtro por Categoría
diff --git a/htdocs/langs/es_AR/withdrawals.lang b/htdocs/langs/es_AR/withdrawals.lang
index dfd195fbf17..ee6eb013ba2 100644
--- a/htdocs/langs/es_AR/withdrawals.lang
+++ b/htdocs/langs/es_AR/withdrawals.lang
@@ -46,7 +46,7 @@ StatusMotif5=RIB inutilizable
 StatusMotif8=Otra razon
 CreateForSepaFRST=Crear archivo de débito automático (SEPA FRST)
 CreateForSepaRCUR=Crear archivo de débito automático (SEPA RCUR)
-CreateAll=Crear archivo de débito automático (todos)
+CreateAll=Crear archivo de débito automático
 OrderWaiting=A la espera de procesamiento
 NumeroNationalEmetter=Número de transmisor nacional
 WithBankUsingRIB=Para cuentas bancarias que utilizan RIB
@@ -65,7 +65,6 @@ WithdrawRequestAmount=Monto de solicitud de débito automático:
 WithdrawRequestErrorNilAmount=No se puede crear una solicitud de débito automático para un monto vacío.
 SepaMandate=Mandato de Débito Automático SEPA
 PleaseReturnMandate=Por favor, envíe este formulario de mandato por correo a %s o por correo a
-SEPALegalText=Al firmar este formulario de mandato, autorizas (A) %s a enviar instrucciones a su banco para debitar su cuenta y (B) a su banco para debitar su cuenta de acuerdo con las instrucciones de %s. Como parte de sus derechos, tiene derecho a un reembolso de su banco bajo los términos y condiciones de su acuerdo bancario. Se debe reclamar un reembolso dentro de las 8 semanas a partir de la fecha en que se realizó el débit de su cuenta. Sus derechos respecto al mandato anterior se explican en una declaración que puede obtener de su banco.
 CreditorIdentifier=Identificador del acreedor
 CreditorName=Nombre del acreedor
 SEPAFillForm=(B) Por favor complete todos los campos marcados *
diff --git a/htdocs/langs/es_BO/accountancy.lang b/htdocs/langs/es_BO/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/es_BO/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/es_BO/admin.lang b/htdocs/langs/es_BO/admin.lang
index 58a42ff6b8e..c5ab56cb8d8 100644
--- a/htdocs/langs/es_BO/admin.lang
+++ b/htdocs/langs/es_BO/admin.lang
@@ -1,15 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/es_BO/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/es_BO/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/es_BO/companies.lang b/htdocs/langs/es_BO/companies.lang
new file mode 100644
index 00000000000..40b5f885e43
--- /dev/null
+++ b/htdocs/langs/es_BO/companies.lang
@@ -0,0 +1,7 @@
+# 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
diff --git a/htdocs/langs/es_BO/compta.lang b/htdocs/langs/es_BO/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/es_BO/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/es_BO/errors.lang b/htdocs/langs/es_BO/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/es_BO/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/es_BO/eventorganization.lang b/htdocs/langs/es_BO/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/es_BO/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/es_BO/members.lang b/htdocs/langs/es_BO/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/es_BO/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/es_BO/mrp.lang b/htdocs/langs/es_BO/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/es_BO/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/es_BO/orders.lang b/htdocs/langs/es_BO/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/es_BO/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/es_BO/printing.lang b/htdocs/langs/es_BO/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/es_BO/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/es_BO/products.lang b/htdocs/langs/es_BO/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/es_BO/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/es_BO/propal.lang b/htdocs/langs/es_BO/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/es_BO/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/es_BO/receptions.lang b/htdocs/langs/es_BO/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/es_BO/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_BO/sendings.lang b/htdocs/langs/es_BO/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/es_BO/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/es_BO/stocks.lang b/htdocs/langs/es_BO/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/es_BO/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
index 2e913f371e1..807bdf2edb6 100644
--- a/htdocs/langs/es_CL/accountancy.lang
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -164,7 +164,6 @@ DescVentilDoneExpenseReport=Consulte aquí la lista de las líneas de informes d
 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
-AutomaticBindingDone=Encuadernación automática hecha
 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
@@ -186,8 +185,6 @@ AccountingJournalType1=Operaciones misceláneas
 AccountingJournalType5=Informe de gastos
 ErrorAccountingJournalIsAlreadyUse=Este diario ya es uso
 AccountingAccountForSalesTaxAreDefinedInto=Nota: La cuenta de contabilidad para el impuesto a las ventas se define en el menú <b> %s </ b> - <b> %s </ b>
-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)
 ExportDraftJournal=Exportar borrador del diario
 Selectmodelcsv=Seleccione un modelo
 Modelcsv_normal=Exportación clasica
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index e6758a24c75..5554b00bc11 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.
@@ -113,6 +115,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.
@@ -186,8 +189,6 @@ OfficialDemo=Demo en línea de Dolibarr
 OfficialMarketPlace=Lugar oficial del mercado para módulos externos / complementos
 OfficialWebHostingService=Servicios de alojamiento web a los que se hace referencia (alojamiento en la nube)
 ReferencedPreferredPartners=Socios Preferidos
-ForDocumentationSeeWiki=Para documentación del usuario o desarrollador (Doc, Preguntas frecuentes ...), <br> echa un vistazo a la Wiki de Dolibarr: <br> <b> <a href="%s" target="_blank"> %s </a></b>
-ForAnswersSeeForum=Para cualquier otra pregunta/ayuda, puede utilizar el foro de Dolibarr: <br> <b><a href="%s" target="_blank">%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> .
 CurrentMenuHandler=Manejador de menú actual
@@ -241,7 +242,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>
@@ -251,6 +251,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>
@@ -269,8 +270,6 @@ UMask=Parámetro UMask para nuevos archivos en el sistema de archivos Unix / Lin
 UMaskExplanation=Este parámetro le permite definir permisos establecidos por defecto en los archivos creados por Dolibarr en el servidor (durante la carga, por ejemplo). <br> Debe ser el valor octal (por ejemplo, 0666 significa leer y escribir para todos). <br> parámetro es inútil en un servidor de Windows.
 SeeWikiForAllTeam=Eche un vistazo a la página de Wiki para obtener una lista de colaboradores y su organización.
 UseACacheDelay=Retardo para la respuesta de exportación en caché en segundos (0 o vacío para no caché)
-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=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ás seguro de que quieres ejecutar esta purga? <br> Esto eliminará de forma permanente todos sus archivos de datos sin posibilidad de restaurarlos (archivos ECM, archivos adjuntos ...).
 MinLength=Longitud mínima
@@ -294,7 +293,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
@@ -516,7 +514,6 @@ Permission106=Exportar envíos
 Permission109=Eliminar envíos
 Permission111=Leer cuentas financieras
 Permission112=Crear/modificar / eliminar y comparar transacciones
-Permission113=Configurar cuentas financieras (crear, administrar categorías)
 Permission114=Conciliar transacciones
 Permission115=Exportar transacciones y estados de cuenta
 Permission116=Transferencias entre cuentas
@@ -613,9 +610,7 @@ Permission651=Crear / actualizar facturas de materiales
 Permission652=Eliminar listas de materiales
 Permission701=Leer donaciones
 Permission771=Lea los informes de gastos (el suyo y sus subordinados)
-Permission772=Crear/modificar informes de gastos
 Permission773=Eliminar informes de gastos
-Permission774=Lea todos los informes de gastos (incluso para usuarios no subordinados)
 Permission775=Aprobar informes de gastos
 Permission776=Pagar informes de gastos
 Permission779=Informes de gastos de exportación
@@ -657,16 +652,12 @@ Permission2503=Presentar o eliminar documentos
 Permission2515=Configurar directorios de documentos
 Permission2801=Use el cliente FTP en modo de lectura (navegue y descargue solamente)
 Permission2802=Utilice el cliente FTP en modo de escritura (eliminar o cargar archivos)
-Permission4004=Empleados de exportació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 a desarrolladores restringidos.
 Permission20001=Lea las solicitudes de licencia (su licencia y las de sus subordinados)
 Permission20002=Cree / modifique sus solicitudes de licencia (su licencia y las de sus subordinados)
 Permission20003=Eliminar solicitudes de permiso
-Permission20004=Lea todas las solicitudes de licencia (incluso del usuario no subordinado)
-Permission20005=Crear / modificar solicitudes de abandono para todos (incluso para usuarios no subordinados)
-Permission20006=Solicitudes de permiso de administrador (configuración y saldo de actualización)
 Permission20007=Aprobar solicitudes de licencia
 Permission23001=Leer trabajo programado
 Permission23002=Crear / actualizar trabajo programado
@@ -702,7 +693,6 @@ DictionaryFees=Informe de gastos: tipos de líneas de informe de gastos
 DictionarySendingMethods=Métodos de envío
 DictionaryStaff=Número de empleados
 DictionaryAvailability=Retraso en la entrega
-DictionaryOrderMethods=Order methods
 DictionarySource=Origen de las propuestas / órdenes
 DictionaryAccountancyCategory=Grupos personalizados para informes
 DictionaryAccountancysystem=Modelos para el cuadro de cuentas
@@ -782,7 +772,6 @@ DoNotSuggestPaymentMode=No sugiera
 NoActiveBankAccountDefined=No se definió una cuenta bancaria activa
 OwnerOfBankAccount=Propietario de la cuenta bancaria %s
 BankModuleNotActive=Módulo de cuentas bancarias no habilitado
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
 DelaysOfToleranceDesc=Establezca el retraso antes de que aparezca un icono de alerta %s en la pantalla para el elemento tardío.
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Orden no procesada
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Orden de compra no procesada
@@ -809,7 +798,6 @@ LogEventDesc=Habilitar el registro para eventos de seguridad específicos. Admin
 AreaForAdminOnly=Los parámetros de configuración solo pueden modificarse por <b>usuarios administradores</b>.
 SystemInfoDesc=La información del sistema es información técnica miscelánea que obtienes en modo solo lectura y visible solo para los administradores.
 AccountantDesc=Si tiene un contador / contador externo, puede editar aquí su información.
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
 AvailableModules=Aplicación / módulos disponibles
 ToActivateModule=Para activar los módulos, vaya al Área de configuración (Inicio-> Configuración-> Módulos).
 SessionTimeOut=Tiempo de espera para la sesión
@@ -846,7 +834,6 @@ ForcedToByAModule=Esta regla es forzada a <b>%s</b> por un módulo activado
 RunningUpdateProcessMayBeRequired=Parece que se requiere ejecutar el proceso de actualización (la versión del programa %s difiere de la versión de la base de datos %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar este comando desde la línea de comando después de iniciar sesión en un shell con el usuario <b>%s</b> o debe agregar la opción -W al final de la línea de comandos para proporcionar una contraseña de <b>%s</b>.
 DownloadMoreSkins=Más pieles para descargar
-MAIN_DISABLE_METEO=Disable weather thumb
 MeteoStdMod=Modo estandar
 MeteoUseMod=Haz clic para usar %s
 TestLoginToAPI=Prueba de inicio de sesión a la API
@@ -897,8 +884,6 @@ YouDoNotUseBestDriver=Utiliza el controlador %s, pero se recomienda el controlad
 SearchOptim=Optimización de búsqueda
 BrowserIsOK=Está utilizando el navegador web %s. Este navegador está bien para la seguridad y el rendimiento.
 BrowserIsKO=Está utilizando el navegador web %s. Se sabe que este navegador es una mala elección para la seguridad, el rendimiento y la confiabilidad. Recomendamos usar Firefox, Chrome, Opera o Safari.
-AddRefInList=Mostrar cliente / vendedor ref. Lista de información (lista de selección o cuadro combinado) y la mayoría de los hipervínculos. <br> Aparecerán terceros con un formato de nombre de &quot;CC12345 - SC45678 - The Big Company corp&quot;. en lugar de &quot;The Big Company corp&quot;.
-AddAdressInList=Mostrar la lista de información de la dirección del cliente / proveedor (seleccionar lista o cuadro combinado) <br> Aparecerán terceros con el formato de nombre &quot;The Big Company corp. - 21 jump street 123456 Big town - USA&quot; en lugar de &quot;The Big Company corp&quot;.
 AskForPreferredShippingMethod=Pregunte por el método de envío preferido para terceros.
 FillThisOnlyIfRequired=Ejemplo: +2 (llenar solo si se experimentan problemas de compensación de zona horaria)
 PasswordGenerationNone=No sugiera una contraseña generada. La contraseña debe escribirse manualmente.
@@ -951,7 +936,6 @@ WatermarkOnDraftSupplierProposal=Marca de agua en los proveedores de solicitudes
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Preguntar por el destino de la cuenta bancaria de la solicitud de precio
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pida la fuente de Warehouse para ordenar
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Preguntar por el destino de la cuenta bancaria de la orden de compra
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
 OrdersSetup=Configuración de gestión de órdenes de venta
 OrdersNumberingModules=Modelos de numeración de pedidos
 OrdersModelModule=Modelos de documentos de pedido
@@ -1092,7 +1076,6 @@ ProductSetup=Configuración del módulo de productos
 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 las listas de selección de combo (0 = sin límite)
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
 MergePropalProductCard=Activar en el producto / servicio pestaña Archivos adjuntos una opción para combinar el documento PDF del producto con la propuesta PDF azur si el producto / servicio figura en la propuesta
 UseSearchToSelectProductTooltip=Además, si tiene una gran cantidad de productos (&gt; 100 000), puede aumentar la velocidad configurando la constante PRODUCT_DONOTSEARCH_ANYWHERE en 1 en Configuración-&gt; Otros. La búsqueda se limitará entonces al inicio de la cadena.
 UseSearchToSelectProduct=Espere hasta que presione una tecla antes de cargar el contenido de la lista de combo de productos (esto puede aumentar el rendimiento si tiene una gran cantidad de productos, pero es menos conveniente)
@@ -1342,7 +1325,6 @@ TypeCdr=Utilice &quot;Ninguno&quot; si la fecha de pago es la fecha de la factur
 BaseCurrency=Moneda de referencia de la empresa (entre en la configuración de la empresa para cambiar esto)
 WarningNoteModulePOSForFrenchLaw=Este módulo %s cumple con las leyes francesas (Loi Finance 2016) porque el módulo de Registros no reversibles se activa automáticamente.
 WarningInstallationMayBecomeNotCompliantWithLaw=Está intentando instalar el módulo %s que es un módulo externo. Activar un módulo externo significa que confía en el editor de ese módulo y que está seguro de que este módulo no afecta negativamente el comportamiento de su aplicación y cumple con las leyes de su país (%s). Si el módulo introduce una característica ilegal, usted se hace responsable del uso de software ilegal.
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 NothingToSetup=No se requiere ninguna configuración específica para este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto en sí si este grupo es un cálculo de otros grupos
 SeveralLangugeVariatFound=Varias variantes de lenguaje encontradas
@@ -1366,14 +1348,12 @@ 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)
-RecordEvent=Grabar evento de correo electrónico
-CreateLeadAndThirdParty=Crear plomo (y tercero si es necesario)
 CodeLastResult=Código de resultado más reciente
 NbOfEmailsInInbox=Número de correos electrónicos en el directorio de origen
 LoadThirdPartyFromName=Cargar búsqueda de terceros en %s (solo carga)
 LoadThirdPartyFromNameOrCreate=Cargar búsqueda de terceros en %s (crear si no se encuentra)
 ECMAutoTree=Mostrar arbol ECM automatico
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
 OpeningHoursDesc=Introduzca aquí el horario habitual de apertura de su empresa.
 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).
@@ -1392,7 +1372,7 @@ DebugBar=Barra de debug
 WarningValueHigherSlowsDramaticalyOutput=Advertencia, los valores más altos ralentizan dramáticamente la salida.
 ModuleActivated=El módulo %s está activado y ralentiza la interfaz
 EXPORTS_SHARE_MODELS=Los modelos de exportación se comparten con todos.
-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 a string 'Name: name to find' found into the body, use 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=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=Punto final para %s: %s
 DeleteEmailCollector=Eliminar el colector de correo electrónico
 ConfirmDeleteEmailCollector=¿Estás seguro de que deseas eliminar este recopilador de correo electrónico?
@@ -1403,6 +1383,5 @@ MakeAnonymousPing=Realice un Ping anónimo &#39;+1&#39; al servidor de la base D
 FeatureNotAvailableWithReceptionModule=Función no disponible cuando la recepción del módulo está habilitada
 EmailTemplate=Plantila para email
 Recommended=Recomendado
-ARestrictedPath=Some restricted path
 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_CL/banks.lang b/htdocs/langs/es_CL/banks.lang
index 1a0a4af0766..57e85a325a3 100644
--- a/htdocs/langs/es_CL/banks.lang
+++ b/htdocs/langs/es_CL/banks.lang
@@ -22,7 +22,6 @@ AllTime=Desde el principio
 Reconciliation=Reconciliación
 RIB=Número de cuenta bancaria
 SwiftValid=BIC / SWIFT válido
-SwiftVNotalid=BIC / SWIFT no válido
 IbanValid=BAN válida
 StandingOrders=Órdenes de débito directo
 StandingOrder=Orden de débito directo
@@ -32,7 +31,6 @@ AccountStatements=Estados de cuenta
 LastAccountStatements=Últimos estados de cuenta
 IOMonthlyReporting=Informes mensuales
 BankAccountDomiciliation=Dirección del banco
-RIBControlError=Fallo en la comprobación de integridad de valores. Esto significa que la información para este número de cuenta no está completa o es incorrecta (ver país, números e IBAN).
 CreateAccount=Crear una cuenta
 MenuNewFinancialAccount=Nueva cuenta financiera
 EditFinancialAccount=Editar cuenta
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/bookmarks.lang b/htdocs/langs/es_CL/bookmarks.lang
index 8c3c7bda847..8892637999f 100644
--- a/htdocs/langs/es_CL/bookmarks.lang
+++ b/htdocs/langs/es_CL/bookmarks.lang
@@ -6,5 +6,4 @@ ShowBookmark=Mostrar marcador
 OpenANewWindow=Abre una nueva pestaña
 BehaviourOnClick=Comportamiento cuando se selecciona una URL de marcador
 SetHereATitleForLink=Establecer un nombre para el marcador
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Utilice un enlace externo / absoluto (https: // URL) o un enlace interno / relativo (/ DOLIBARR_ROOT / htdocs / ...)
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Elija si la página vinculada debería abrirse en la pestaña actual o en una nueva pestaña
diff --git a/htdocs/langs/es_CL/cashdesk.lang b/htdocs/langs/es_CL/cashdesk.lang
index b067ca7fbd5..a40760cf590 100644
--- a/htdocs/langs/es_CL/cashdesk.lang
+++ b/htdocs/langs/es_CL/cashdesk.lang
@@ -24,7 +24,6 @@ DolibarrReceiptPrinter=Impresora de recibos Dolibarr
 PointOfSale=Punto de venta
 CloseBill=Cerrar bill
 TakeposConnectorNecesary=Se requiere &#39;conector TakePOS&#39;
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
 Receipt=Recibo
 Header=Encabezamiento
 Footer=Pie de página
diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang
index 1f0ce0d284d..2b761b3d04f 100644
--- a/htdocs/langs/es_CL/companies.lang
+++ b/htdocs/langs/es_CL/companies.lang
@@ -149,7 +149,6 @@ EditCompany=Editar empresa
 VATIntraCheck=Cheque
 VATIntraCheckDesc=La identificación del IVA debe incluir el prefijo del país. El enlace <b>%s</b> utiliza el servicio europeo de verificación de IVA (VIES), que requiere acceso a Internet desde el servidor Dolibarr.
 VATIntraCheckableOnEUSite=Compruebe la identificación del IVA intracomunitaria en el sitio 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">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=No es posible comprobar. El servicio de verificación no proporcionado por el estado miembro  (%s).
 NorProspectNorCustomer=No prospecto, ni cliente
 ProspectLevel=Potencial prospectivo
diff --git a/htdocs/langs/es_CL/compta.lang b/htdocs/langs/es_CL/compta.lang
index 23868fbcdf7..42e534b97dd 100644
--- a/htdocs/langs/es_CL/compta.lang
+++ b/htdocs/langs/es_CL/compta.lang
@@ -126,7 +126,6 @@ AnnualByCompanies=Saldo de ingresos y gastos, por grupos predefinidos de cuenta
 AnnualByCompaniesDueDebtMode=Saldo de ingresos y gastos, detalle por grupos predefinidos, modo <b>%sReclamaciones-Deudas%s</b> escrito en <b>compromiso contable</b>
 AnnualByCompaniesInputOutputMode=Balance de ingresos y gastos, detalle por grupos predefinidos, modo <b>%sIngresos-Gastos%s</b> escrito en <b>contabilidad de efectivo</b>.
 RulesAmountWithTaxIncluded=- Las cantidades que se muestran son con todos los impuestos incluidos
-RulesResultInOut=- Incluye los pagos reales realizados en facturas, gastos, IVA y salarios. <br> - Se basa en las fechas de pago de las facturas, gastos, IVA y salarios. La fecha de donación para la donación.
 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.
 RulesAmountOnInOutBookkeepingRecord=Incluye registro en su Libro mayor con cuentas de contabilidad que tiene el grupo "GASTOS" o "INGRESOS"
@@ -138,7 +137,6 @@ LT1ReportByCustomers=Informe el impuesto 2 por un tercero
 LT2ReportByCustomers=Informe el impuesto 3 por un tercero
 LT1ReportByCustomersES=Informe de un tercero RE
 LT2ReportByCustomersES=Informe de un tercero IRPF
-VATReportByThirdParties=Sales tax report by third party
 VATReportByCustomersInInputOutputMode=Informe del cliente IVA recaudado y pagado
 LT1ReportByQuarters=Informe el impuesto 2 por tasa
 LT2ReportByQuarters=Informe el impuesto 3 por tasa
@@ -196,9 +194,3 @@ ByVatRate=Por tasa de impuesto a la venta
 TurnoverbyVatrate=Volumen de negocios facturado por tasa de impuesto a la venta
 TurnoverCollectedbyVatrate=Facturación recaudada por tasa de impuesto a la venta
 PurchasebyVatrate=Compra por tasa de impuestos de venta
-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)
diff --git a/htdocs/langs/es_CL/errors.lang b/htdocs/langs/es_CL/errors.lang
index 8bbeeb9bba5..a558bcdd773 100644
--- a/htdocs/langs/es_CL/errors.lang
+++ b/htdocs/langs/es_CL/errors.lang
@@ -61,7 +61,6 @@ ErrorLDAPMakeManualTest=Se ha generado un archivo .ldif en el directorio %s. Int
 ErrorCantSaveADoneUserWithZeroPercentage=No se puede guardar una acción con &quot;estado no iniciado&quot; si el campo &quot;hecho por&quot; también se llena.
 ErrorPleaseTypeBankTransactionReportName=Ingrese el nombre del extracto bancario donde se debe informar la entrada (Formato AAAAMM o AAAAMMDD)
 ErrorRecordHasChildren=Error al eliminar el registro ya que tiene algunos registros secundarios.
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
 ErrorRecordIsUsedCantDelete=No se puede borrar el registro. Ya está usado o incluido en otro objeto.
 ErrorModuleRequireJavascript=Javascript no debe deshabilitarse para que esta característica funcione. Para activar / desactivar Javascript, vaya al menú Inicio-> Configuración-> Pantalla.
 ErrorPasswordsMustMatch=Ambas contraseñas mecanografiadas deben coincidir
diff --git a/htdocs/langs/es_CL/eventorganization.lang b/htdocs/langs/es_CL/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/es_CL/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/es_CL/holiday.lang b/htdocs/langs/es_CL/holiday.lang
index b488a22eefe..5efa89e20f1 100644
--- a/htdocs/langs/es_CL/holiday.lang
+++ b/htdocs/langs/es_CL/holiday.lang
@@ -17,7 +17,6 @@ UserForApprovalID=ID de aprobación del usuario
 SendRequestCP=Crear solicitud de permiso
 DelayToRequestCP=Las solicitudes de ausencia deben hacerse al menos <b> %s día (s) </ b> antes que ellas.
 MenuConfCP=Balance de licencia
-SoldeCPUser=El saldo de la licencia es <b>%s</b> días.
 ErrorEndDateCP=Debe seleccionar una fecha de finalización mayor que la fecha de inicio.
 ErrorSQLCreateCP=Se produjo un error SQL durante la creación:
 ErrorIDFicheCP=Se ha producido un error, la solicitud de ausencia no existe.
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index 5968f9bf9e8..574af50647c 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -84,7 +84,6 @@ RequestLastAccessInError=Último error de solicitud de acceso a la base
 ReturnCodeLastAccessInError=Código de retorno para el último error de solicitud de acceso a la base de datos
 InformationLastAccessInError=Información sobre 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 eliminar dichos avisos)
 TechnicalID=ID técnico
 LineID=ID de Línea
 NotePrivate=Nota (privado)
@@ -457,7 +456,6 @@ NotAllExportedMovementsCouldBeRecordedAsExported=No todos los movimientos export
 Miscellaneous=Diverso
 GroupBy=Agrupar por...
 RemoveString=Eliminar la cadena '%s'
-SomeTranslationAreUncomplete=Algunos de los idiomas ofrecidos pueden estar solo parcialmente traducidos o pueden contener errores. Ayude a corregir su idioma registrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> para agregar sus mejoras.
 DownloadDocument=Descargar documento
 ActualizeCurrency=Actualizar la tasa de cambio
 ModuleBuilder=Módulo y generador de aplicaciones
@@ -535,4 +533,3 @@ ContactDefault_invoice_supplier=Factura del proveedor
 ContactDefault_propal=Cotización
 ContactDefault_supplier_proposal=Propuesta de proveedor
 ContactAddedAutomatically=Contacto agregado de roles de terceros de contacto
-Properties=Properties
diff --git a/htdocs/langs/es_CL/members.lang b/htdocs/langs/es_CL/members.lang
index efac17381b7..348c800fdff 100644
--- a/htdocs/langs/es_CL/members.lang
+++ b/htdocs/langs/es_CL/members.lang
@@ -4,7 +4,6 @@ MemberCard=Tarjeta de miembro
 SubscriptionCard=Tarjeta de suscripción
 ShowMember=Mostrar tarjeta de miembro
 ThirdpartyNotLinkedToMember=Tercero no vinculado a un miembro
-MembersTickets=Membership address sheet
 FundationMembers=Miembros de la fundación
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Otro miembro (nombre: <b>%s</b>, login: <b>%s</b>) ya está asignado al tercero <b>%s</b>. Primero elimine la asignación, porque un tercero no puede vincularse solo a un miembro (y viceversa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por razones de seguridad, debe tener permiso para editar a todos los usuarios para poder vincular a un miembro con un usuario que no es el suyo.
@@ -31,7 +30,6 @@ PaymentSubscription=Nuevo pago de contribución
 SubscriptionEndDate=Fecha de finalización de la suscripción
 MembersTypeSetup=Miembros tipo configuración
 ConfirmDeleteMemberType=¿Seguro que quieres eliminar este tipo de miembro?
-NewSubscription=New contribution
 NewSubscriptionDesc=Este formulario le permite registrar su suscripción como nuevo miembro de la fundación. Si desea renovar su suscripción (si ya es miembro), póngase en contacto con la junta de la fundación en su lugar por correo electrónico %s.
 SubscriptionLate=Tarde
 SendCardByMail=Enviar tarjeta por email
diff --git a/htdocs/langs/es_CL/modulebuilder.lang b/htdocs/langs/es_CL/modulebuilder.lang
index 062d82e135d..fc76fba2eb4 100644
--- a/htdocs/langs/es_CL/modulebuilder.lang
+++ b/htdocs/langs/es_CL/modulebuilder.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - modulebuilder
-ModuleBuilderDesc=Esta herramienta solo debe ser utilizada por usuarios o desarrolladores experimentados. Proporciona utilidades para construir o editar tu propio módulo. La documentación para el desarrollo manual alternativo <a href="%s" target="_blank">está aquí</a>.
 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>
@@ -74,7 +73,6 @@ MenusDefDescTooltip=Los menús proporcionados por su módulo / aplicación se de
 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).
-TriggerDefDesc=Defina en el archivo desencadenante el código que desea ejecutar para cada evento comercial ejecutado.
 SeeIDsInUse=Ver ID en uso en su instalación
 SeeReservedIDsRangeHere=Ver rango de ID reservados
 ToolkitForDevelopers=Toolkit para desarrolladores de Dolibarr
diff --git a/htdocs/langs/es_CL/mrp.lang b/htdocs/langs/es_CL/mrp.lang
index 2c58616fa2c..8bce2ae683d 100644
--- a/htdocs/langs/es_CL/mrp.lang
+++ b/htdocs/langs/es_CL/mrp.lang
@@ -19,7 +19,6 @@ WatermarkOnDraftMOs=Marca de agua de borrador MO
 ConfirmCloneMo=¿Estas seguro de que deseas clonar la Orden de Fabricación (MO) %s ?
 DeleteBillOfMaterials=Eliminar lista de materiales
 DeleteMo=Borrar Orden de Fabricación-MO
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
 QtyToProduce=Cantidad para producir
 DateStartPlannedMo=Fecha de inicio prevista
 DateEndPlannedMo=Fecha de finalización prevista
diff --git a/htdocs/langs/es_CL/orders.lang b/htdocs/langs/es_CL/orders.lang
index e00acc448ed..855b4c6cd4d 100644
--- a/htdocs/langs/es_CL/orders.lang
+++ b/htdocs/langs/es_CL/orders.lang
@@ -15,7 +15,6 @@ ToOrder=Hacer orden
 MakeOrder=Hacer orden
 SupplierOrder=Orden de compra
 SuppliersOrders=Ordenes de compra
-SaleOrderLines=Sales order lines
 SuppliersOrdersRunning=Pedidos de compra actuales
 CustomerOrder=Órdenes de venta
 CustomersOrders=Ordenes de venta
diff --git a/htdocs/langs/es_CL/printing.lang b/htdocs/langs/es_CL/printing.lang
index 04b01280f1a..0cd21f6301b 100644
--- a/htdocs/langs/es_CL/printing.lang
+++ b/htdocs/langs/es_CL/printing.lang
@@ -1,10 +1,4 @@
 # 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=Variables de configuración para imprimir el controlador.
 ListDrivers=Lista de controladores
 PrintTestDesc=Lista de impresoras.
diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
index c718e79516c..5b07f63f3a5 100644
--- a/htdocs/langs/es_CL/products.lang
+++ b/htdocs/langs/es_CL/products.lang
@@ -153,7 +153,6 @@ GlobalVariableUpdaterHelpFormat1=El formato para la solicitud es {"URL": "http:/
 CorrectlyUpdated=Correctamente actualizado
 PropalMergePdfProductActualFile=Los archivos se usan para agregar a PDF Azur son/es
 PropalMergePdfProductChooseFile=Seleccionar archivos PDF
-IncludingProductWithTag=Including products/services with the tag
 DefaultPriceRealPriceMayDependOnCustomer=El precio predeterminado, el precio real puede depender del cliente
 NbOfQtyInProposals=Cantidad en propuestas
 ClinkOnALinkOfColumn=Haga clic en un enlace de la columna %s para obtener una vista detallada ...
@@ -167,7 +166,6 @@ SurfaceUnits=Unidad de superficie
 SizeUnits=Unidad de tamaño
 ConfirmDeleteProductBuyPrice=¿Estás seguro de que deseas eliminar este precio de compra?
 SubProduct=Sub producto
-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=Descripción del vendedor para el producto.
 ProductAttributeName=Atributo de variante %s
 ProductAttributeDeleteDialog=¿Estás seguro de que deseas eliminar este atributo? Todos los valores serán eliminados
diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang
index d456e3c3ba0..d24822b69ea 100644
--- a/htdocs/langs/es_CL/projects.lang
+++ b/htdocs/langs/es_CL/projects.lang
@@ -155,6 +155,7 @@ RecordsClosed=%s proyecto (s) cerrado
 SendProjectRef=Proyecto de información %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=El módulo &#39;Salarios&#39; debe estar habilitado para definir la tarifa por hora de los empleados para que el tiempo empleado se valore
 NewTaskRefSuggested=Referencia de tarea ya utilizada, se requiere una nueva referencia de tarea
+TimeSpentForIntervention=Tiempo dedicado
 TimeSpentForInvoice=Tiempo dedicado
 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 2c3735d71c4..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?
@@ -24,7 +23,6 @@ StatsOnReceptionsOnlyValidated=Estadísticas realizadas en recepciones solo vali
 SendReceptionByEMail=Enviar recepción por correo electrónico
 SendReceptionRef=Presentación de la recepción %s
 ActionsOnReception=Eventos en recepción
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
 ProductQtyInReceptionAlreadySent=Cantidad de producto de pedido abierto ya enviado
 ProductQtyInSuppliersReceptionAlreadyRecevied=Cantidad de producto de pedido de proveedor abierto ya recibido
 ValidateOrderFirstBeforeReception=Primero debe validar el pedido antes de poder hacer recepciones.
diff --git a/htdocs/langs/es_CL/sendings.lang b/htdocs/langs/es_CL/sendings.lang
index 9463b102f58..5c62e8c326c 100644
--- a/htdocs/langs/es_CL/sendings.lang
+++ b/htdocs/langs/es_CL/sendings.lang
@@ -35,7 +35,6 @@ SendShippingByEMail=Enviar envío por correo electrónico
 SendShippingRef=Presentación del envío %s
 ActionsOnShipping=Eventos en el envío
 LinkToTrackYourPackage=Enlace para rastrear tu paquete
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
 ShipmentLine=Línea de envío
 ProductQtyInShipmentAlreadySent=Cantidad de producto de pedido abierto ya enviado
 NoProductToShipFoundIntoStock=No hay productos para enviar encontrados en el almacén <b>%s</b> . Corregir el stock o volver a elegir otro almacén.
diff --git a/htdocs/langs/es_CL/stocks.lang b/htdocs/langs/es_CL/stocks.lang
index d6a06be325b..f0add21419b 100644
--- a/htdocs/langs/es_CL/stocks.lang
+++ b/htdocs/langs/es_CL/stocks.lang
@@ -31,7 +31,6 @@ StockLowerThanLimit=Stock inferior al límite de alerta (%s)
 EnhancedValueOfWarehouses=Valor de las bodegas
 UserWarehouseAutoCreate=Crear un almacén de usuario automáticamente al crear un usuario
 AllowAddLimitStockByWarehouse=Administre también el valor del stock mínimo y deseado por emparejamiento (almacén de productos) además del valor del stock mínimo y deseado por producto
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
 IndependantSubProductStock=El stock de producto y el stock de subproducto son independientes.
 QtyDispatched=Cantidad despachada
 QtyDispatchedShort=Cantidad despachada
@@ -121,8 +120,6 @@ SelectCategory=Filtro de categoría
 SelectFournisseur=Filtro de proveedor
 inventoryChangePMPPermission=Permitir cambiar el valor de PMP para un producto
 OnlyProdsInStock=No agregue productos sin stock
-TheoricalQty=Cantidad teórica
-TheoricalValue=Cantidad teórica
 LastPA=Última BP
 RealValue=Valor real
 RegulatedQty=Cantidad regulada
@@ -141,3 +138,4 @@ StockIncrease=Aumento de existencias
 StockDecrease=Disminución de existencias
 InventoryForASpecificWarehouse=Inventario para un almacén específico
 InventoryForASpecificProduct=Inventario para un producto específico
+InventoryStartedShort=Empezado
diff --git a/htdocs/langs/es_CL/stripe.lang b/htdocs/langs/es_CL/stripe.lang
index 0930c555e3e..84e773250a6 100644
--- a/htdocs/langs/es_CL/stripe.lang
+++ b/htdocs/langs/es_CL/stripe.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Configuración del módulo de banda
-StripeDesc=Ofrezca a los clientes una página de pago en línea de Stripe para pagos con tarjetas de crédito / cebit a través de <a href="http://www.stripe.com" target="_blank">Stripe</a> . Esto se puede usar para permitir que sus clientes realicen pagos ad-hoc o para pagos relacionados con un objeto Dolibarr en particular (factura, pedido, ...)
 STRIPE_PAYONLINE_SENDEMAIL=Notificación por correo electrónico después de un intento de pago (éxito o falla)
 StripeDoPayment=Pagar con la raya
 YouWillBeRedirectedOnStripe=Se te redirigirá a la página de Banda segura para ingresar la información de tu tarjeta de crédito
diff --git a/htdocs/langs/es_CL/withdrawals.lang b/htdocs/langs/es_CL/withdrawals.lang
index ae95201deba..b7b2d3821ed 100644
--- a/htdocs/langs/es_CL/withdrawals.lang
+++ b/htdocs/langs/es_CL/withdrawals.lang
@@ -47,7 +47,6 @@ StatusMotif5=RIB inutilizable
 StatusMotif8=Otra razon
 CreateForSepaFRST=Crear un archivo de domiciliación bancaria (SEPA FRST)
 CreateForSepaRCUR=Crear un archivo de domiciliación bancaria (SEPAR RCUR)
-CreateAll=Crear un archivo de domiciliación bancaria (todos)
 CreateGuichet=Solo oficina
 CreateBanque=Solo banco
 OrderWaiting=Esperando tratamiento
@@ -68,7 +67,6 @@ WithdrawRequestAmount=Cantidad de solicitud de débito directo:
 WithdrawRequestErrorNilAmount=No se puede crear una solicitud de domiciliación bancaria para el importe vacío.
 SepaMandate=Mandato de débito directo de la SEPA
 PleaseReturnMandate=Envíe este formulario de mandato por correo electrónico al %s o por correo electrónico a
-SEPALegalText=Al firmar este formulario de mandato, usted autoriza (A) %s a enviar instrucciones a su banco para que debiten en su cuenta y (B) a que su banco cargue en su cuenta de acuerdo con las instrucciones del %s. Como parte de sus derechos, tiene derecho a un reembolso de su banco en los términos y condiciones de su acuerdo con su banco. Se debe reclamar un reembolso dentro de las 8 semanas a partir de la fecha en que se debitó su cuenta. Sus derechos con respecto al mandato anterior se explican en una declaración que puede obtener de su banco.
 CreditorIdentifier=Identificador del acreedor
 CreditorName=Nombre del acreedor
 SEPAFillForm=(B) Por favor complete todos los campos marcados *
diff --git a/htdocs/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang
index 7aa1c3f04bd..54c0ddba299 100644
--- a/htdocs/langs/es_CO/accountancy.lang
+++ b/htdocs/langs/es_CO/accountancy.lang
@@ -192,7 +192,7 @@ DescVentilDoneExpenseReport=Consulte aquí la lista de líneas de informes de ga
 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
 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=Encuadernación automática hecha
+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
@@ -268,6 +268,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 1a0033be9d5..b8c0b3f8a0d 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
@@ -60,6 +63,7 @@ NumberOfBytes=Número de bytes
 SearchString=Cadena de búsqueda
 NotAvailableWhenAjaxDisabled=No disponible con Ajax desactivado
 AllowToSelectProjectFromOtherCompany=En el documento de un tercero, puede elegir un proyecto vinculado a otro tercero
+TimesheetPreventAfterFollowingMonths=Evite el tiempo de grabación gastado después del siguiente número de meses
 JavascriptDisabled=JavaScript desactivado
 UsePreviewTabs=Use las pestañas de vista previa
 ShowPreview=Mostrar vista previa
@@ -87,6 +91,7 @@ MultiCurrencySetup=Configuración multi-moneda
 MenuLimits=Precisión y límites
 MenuIdParent=ID del menú principal
 DetailMenuIdParent=ID de un menú principal (dejar vacío para menú superior)
+ParentID=ID padre
 DetailPosition=Organizar número para definir la posición del menú
 AllMenus=Todo
 SetupShort=Configuración
@@ -118,6 +123,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.
@@ -193,8 +199,8 @@ 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 documentación del usuario o desarrollador (Doc, Preguntas frecuentes ...), <br>consulte el Wiki de Dolibarr: <br><b> <a href="%s" target="_blank"> %s </a> </b>
-ForAnswersSeeForum=Para cualquier otra pregunta o ayuda, puede utilizar el foro de Dolibarr: <br> <b> <a href="%s" target="_blank"> %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 apoyo con Dolibarr.
 HelpCenterDesc2=Algunos de estos recursos solo están disponibles en <b> inglés </b>.
 CurrentMenuHandler=Controlador de menú actual
@@ -281,6 +287,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
@@ -303,7 +311,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
@@ -375,8 +382,10 @@ 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>.
+ActualMailSPFRecordFound=Registro de SPF real encontrado: %s
 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 +401,8 @@ 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.
 DAV_ALLOW_PRIVATE_DIR=Habilite el directorio privado genérico (directorio dedicado de WebDAV llamado "privado" - es necesario iniciar sesión)
@@ -453,6 +464,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
@@ -487,6 +499,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
@@ -502,6 +515,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
@@ -552,7 +566,6 @@ Permission106=Envíos de exportación
 Permission109=Eliminar envíos
 Permission111=Leer cuentas financieras
 Permission112=Crear / modificar / borrar y comparar transacciones
-Permission113=Configurar cuentas financieras (crear, administrar categorías)
 Permission114=Conciliar transacciones
 Permission115=Transacciones de exportación y estados de cuenta
 Permission116=Transferencias entre cuentas
@@ -561,6 +574,7 @@ Permission121=Leer terceros vinculados al usuario.
 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)
@@ -621,6 +635,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
@@ -646,6 +661,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
@@ -672,9 +688,7 @@ Permission662=Eliminar orden de fabricación (MO)
 Permission701=Leer donaciones
 Permission702=Crear / modificar donaciones.
 Permission771=Lea los informes de gastos (el suyo y sus subordinados)
-Permission772=Crear / modificar informes de gastos.
 Permission773=Eliminar informes de gastos
-Permission774=Lea todos los informes de gastos (incluso para usuarios no subordinados)
 Permission775=Aprobar informes de gastos.
 Permission776=Informes de gastos de pago
 Permission778=Crear / modificar informes de gastos de todos
@@ -700,6 +714,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
@@ -727,6 +742,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.
@@ -734,18 +750,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=Lea todas las solicitudes de permiso (incluso de usuarios no subordinados)
-Permission20005=Crear / modificar solicitudes de permisos para todos (incluso de usuarios no subordinados)
-Permission20006=Solicitudes de licencia de administrador (configuración y actualización del saldo)
+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
@@ -875,6 +891,7 @@ LogoSquarredDesc=Debe ser un icono cuadrado (ancho = alto). Este logotipo se uti
 OwnerOfBankAccount=Propietario de cuenta bancaria %s
 BankModuleNotActive=Módulo de cuentas bancarias no habilitado
 ShowBugTrackLink=Mostrar el enlace "<strong> %s </strong>"
+ShowBugTrackLinkDesc=Manténgalo vacío para no mostrar este enlace, use el valor 'github' para el enlace al proyecto Dolibarr o defina directamente una URL 'https: // ...'
 DelaysOfToleranceDesc=Establezca el retraso antes de que se muestre en pantalla un icono de alerta %s para el elemento tardío.
 Delays_MAIN_DELAY_ACTIONS_TODO=Eventos planificados (eventos de la agenda) no completados
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Orden no procesada
@@ -894,6 +911,8 @@ SetupDescription1=Antes de comenzar a utilizar Dolibarr, se deben definir alguno
 SetupDescription3=<a href="%s"> %s -> %s </a> <br> <br> Parámetros básicos utilizados para personalizar el comportamiento predeterminado de su aplicación (ej., para las funciones relacionadas con el país)
 SetupDescription4=<a href="%s"> %s -> %s </a> <br> <br> Este software es un conjunto de muchos módulos/aplicaciones. Los módulos relacionados con sus necesidades deben estar habilitados y configurados. Las entradas del menú aparecerán con la activación de estos módulos.
 SetupDescription5=Otras entradas del menú de configuración administran parámetros opcionales.
+SetupDescriptionLink=<a href="%s"> %s - %s </a>
+SetupDescription4b=Este software es un conjunto de muchos módulos / aplicaciones. Los módulos relacionados con sus necesidades deben estar habilitados y configurados. Las entradas del menú aparecerán con la activación de estos módulos.
 InfoBrowser=Navegador
 InfoOS=Sistema operativo
 InfoWebServer=Servidor web
@@ -908,6 +927,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.
@@ -964,7 +984,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)
@@ -1005,20 +1024,24 @@ 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.
 BrowserIsKO=Está utilizando el navegador web %s. Se sabe que este navegador es una mala elección para la seguridad, el rendimiento y la confiabilidad. Recomendamos el uso de Firefox, Chrome, Opera o Safari.
 PHPModuleLoaded=Se cargó el componente PHP %s
 PreloadOPCode=Preloaded OPCode esta en uso.
-AddRefInList=Mostrar lista de información de referencia del cliente/proveedor (seleccione lista o cuadro combinado) y la mayor parte del hipervínculo. <br> Los terceros aparecerán con el formato de nombre "CC12345 - SC45678 - La Gran Compañia S.A.". en lugar de "La Gran Compañia S.A.".
-AddAdressInList=Mostrar lista de información de dirección de cliente/proveedor (seleccione lista o cuadro combinado) <br> Los terceros aparecerán con un formato de nombre de "La Gran Compañia S.A.. - Calle 21 #2-25 00000 Valle del Cauca - Colombia" en lugar de "La Gran Compañia S.A..
+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.
+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 correo electrónico de contacto (o teléfonos si no está definido) y lista de información de la ciudad (selecciones lista o cuadro combinado) <br> Los contactos aparecerán con un formato de nombre de "Pepito Perez - pepito.perez@email.com - Cali" o "Pepito Perez - 315 000 0000 - Cali" en lugar de "Pepito Perez".
 AskForPreferredShippingMethod=Pregunte por el método de envío preferido para terceros.
 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 +1118,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 +1252,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 +1301,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.
@@ -1287,8 +1314,8 @@ DeliveryOrderModel=Entrega de productos modelo de recibo.
 DeliveriesOrderAbility=Soporte de entrega de productos recibos.
 FreeLegalTextOnDeliveryReceipts=Texto libre en los recibos de entrega
 ActivateFCKeditor=Activar editor avanzado para:
-FCKeditorForNotePublic=Creación / edición WYSIWIG de las notas públicas de campo de los elementos
-FCKeditorForNotePrivate=WYSIWIG creación / edición del campo notas privadas de elementos
+FCKeditorForNotePublic=Creación / edición WYSIWIG del campo "notas públicas" de elementos
+FCKeditorForNotePrivate=Creación / edición WYSIWIG del campo "notas privadas" de elementos
 FCKeditorForCompany=Creación / edición WYSIWIG de la descripción de campo de elementos (excepto productos / servicios)
 FCKeditorForProduct=Creación / edición WYSIWIG de la descripción de campo de productos / servicios
 FCKeditorForProductDetails=WYSIWIG creación / edición 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>
@@ -1298,7 +1325,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ú
@@ -1520,6 +1546,9 @@ WarningNoteModulePOSForFrenchLaw=Este módulo %s cumple con las leyes francesas
 WarningInstallationMayBecomeNotCompliantWithLaw=Está intentando instalar el módulo %s que es un módulo externo. Activar un módulo externo significa que confía en el editor de ese módulo y que está seguro de que este módulo no afecta negativamente el comportamiento de su aplicación y cumple con las leyes de su país (%s). Si el módulo introduce una característica ilegal, usted se hace responsable del uso de software ilegal.
 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.
 SetToYesIfGroupIsComputationOfOtherGroups=Establézcalo en sí si este grupo es un cálculo de otros grupos
@@ -1544,24 +1573,22 @@ 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)
-RecordEvent=Grabar evento de correo electrónico
-CreateLeadAndThirdParty=Crea principal (y tercero de ser necesario)
-CreateTicketAndThirdParty=Crear ticket (y vincular a un tercero si fue cargado por una operación anterior)
+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=Defina los valores que se utilizarán para el objeto de la acción o cómo extraer los valores. Por ejemplo: <br> objproperty1 = SET: el valor para establecer <br> objproperty2 = SET: un valor con reemplazo de __objproperty1__ <br> objproperty3 = SETIFEMPTY: valor usado si no se ha 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 compañia es\\s([^\\s]*)<br> <br>Utilice el caracter  ; como separador para extraer o establecer varias propiedades.
+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
@@ -1592,9 +1619,10 @@ 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=Puede utilizar esta acción para utilizar el contenido del correo electrónico para buscar y cargar un tercero existente en su base de datos. El tercero encontrado (o creado) se utilizará para las siguientes acciones que lo necesiten. <br> Por ejemplo, si desea crear un tercero con un nombre extraído una cadena 'Nombre: nombre para encontrar' que se encuentra en el cuerpo, use el correo electrónico del remitente como correo electrónico, puede establecer el campo de parámetro de esta manera: <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?
@@ -1606,6 +1634,7 @@ FeatureNotAvailableWithReceptionModule=Característica no disponible cuando la r
 EmailTemplate=Plantilla para correo electrónico
 EMailsWillHaveMessageID=Los correos electrónicos tendrán una etiqueta 'Referencias' que coincida con esta sintaxis
 PDF_USE_ALSO_LANGUAGE_CODE=Si desea tener algunos textos en su PDF duplicados en 2 idiomas diferentes en el mismo PDF generado, debe configurar aquí este segundo idioma para que el PDF generado contenga 2 idiomas diferentes en la misma página, el elegido al generar PDF y este ( solo unas pocas plantillas PDF admiten esto). Mantener vacío para 1 idioma por PDF.
+PDF_USE_A=Gererate documentos PDF con formato PDF / A en lugar de formato PDF predeterminado
 FafaIconSocialNetworksDesc=Introduzca aquí el código de un icono de FontAwesome. Si no sabe qué es FontAwesome, puede usar el valor genérico fa-address-book.
 RssNote=Nota: Cada definición de fuente RSS proporciona un widget que debe habilitar para tenerlo disponible en el tablero.
 JumpToBoxes=Vaya a Configuración -> Widgets
@@ -1629,3 +1658,22 @@ ARestrictedPath=Algún camino restringido
 DatabasePasswordNotObfuscated=La contraseña de la base de datos NO está ofuscada en el archivo conf
 YouShouldSetThisToOff=Debes configurar esto en 0 o apagarlo
 InstallAndUpgradeLockedBy=La instalación y las actualizaciones están bloqueadas por el archivo <b> %s </b>
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Si algunos módulos de pago en línea están habilitados (Paypal, Stripe, ...), agregue un enlace en el PDF para realizar el pago en línea
+DashboardDisableGlobal=Deshabilitar globalmente todos los pulgares de objetos abiertos
+BoxstatsDisableGlobal=Desactivar totalmente las estadísticas de la caja
+DashboardDisableBlocks=Pulgares de objetos abiertos (para procesar o retrasar) en el tablero principal
+DashboardDisableBlockAgenda=Desactivar el pulgar para la agenda
+DashboardDisableBlockProject=Deshabilitar el pulgar para proyectos
+DashboardDisableBlockCustomer=Desactivar el pulgar para los clientes
+DashboardDisableBlockSupplier=Desactivar el pulgar para proveedores
+DashboardDisableBlockContract=Deshabilitar el pulgar para contratos
+DashboardDisableBlockTicket=Deshabilitar el pulgar para boletos
+DashboardDisableBlockBank=Desactivar el pulgar para bancos
+DashboardDisableBlockAdherent=Desactivar el pulgar para las membresías
+DashboardDisableBlockExpenseReport=Desactive el pulgar para los informes de gastos
+DashboardDisableBlockHoliday=Desactivar el pulgar para las hojas
+EnabledCondition=Condición para tener el campo habilitado (si no está habilitado, la visibilidad siempre estará apagada)
+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/banks.lang b/htdocs/langs/es_CO/banks.lang
index c344dc529c1..a86abeb0d5d 100644
--- a/htdocs/langs/es_CO/banks.lang
+++ b/htdocs/langs/es_CO/banks.lang
@@ -20,7 +20,7 @@ ShowAllTimeBalance=Mostrar balance desde el inicio
 AllTime=Desde el principio
 RIB=Numero de cuenta
 SwiftValid=BIC / SWIFT válido
-SwiftVNotalid=BIC / SWIFT no válido
+SwiftNotValid=BIC / SWIFT no válido
 StandingOrders=Órdenes de débito automático
 StandingOrder=Órden de débito automático
 PaymentByDirectDebit=Pago por débito automático
@@ -32,7 +32,6 @@ IOMonthlyReporting=Informes mensuales
 BankAccountDomiciliation=Dirección del banco
 BankAccountOwner=Nombre del propietario de la cuenta
 BankAccountOwnerAddress=Dirección del propietario de la cuenta
-RIBControlError=La verificación de integridad de los valores falló. Esto significa que la información de este número de cuenta no está completa o es incorrecta (verifique el país, los números y el IBAN).
 MenuNewFinancialAccount=Nueva cuenta financiera
 EditFinancialAccount=Editar cuenta
 LabelBankCashAccount=Etiqueta de banco o efectivo
diff --git a/htdocs/langs/es_CO/bills.lang b/htdocs/langs/es_CO/bills.lang
index c0c081a3a91..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
@@ -158,6 +157,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=En algunos países, esta opci
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Utilice esta opción si todos los demás no convienen
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b> cliente malo </b> es un cliente que se niega a pagar su deuda.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Esta opción se utiliza cuando el pago no está completo porque algunos de los productos fueron devueltos
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=El monto impago es <b> comisiones bancarias intermediarias </b>, deducidas directamente del <b> monto correcto </b> pagado por el cliente.
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilice esta opción si todas las demás no son adecuadas, por ejemplo, en la siguiente situación: <br> - pago no completo porque algunos productos se enviaron de regreso <br> - monto reclamado demasiado importante porque se olvidó un descuento <br> En todos los casos, el monto reclamado en exceso debe corregirse en el sistema contable mediante la creación de una nota de crédito.
 ConfirmClassifyAbandonReasonOtherDesc=Esta elección se utilizará en todos los demás casos. Por ejemplo, porque planea crear una factura de reemplazo.
 ConfirmCustomerPayment=¿Confirma esta entrada de pago para <b> %s </b> %s?
@@ -183,8 +183,11 @@ AlreadyPaidBack=Ya pagado
 AlreadyPaidNoCreditNotesNoDeposits=Ya pagado (sin notas de crédito y pagos iniciales)
 Abandoned=Abandonado
 RemainderToPay=Quedan sin pagar
+RemainderToPayMulticurrency=Moneda original pendiente de pago
 RemainderToTake=Cantidad restante a tomar
+RemainderToTakeMulticurrency=Monto restante para tomar, moneda original
 RemainderToPayBack=Importe restante a devolver
+RemainderToPayBackMulticurrency=Monto restante a reembolsar, moneda original
 AmountExpected=Cantidad reclamada
 ExcessReceived=Exceso recibido
 ExcessPaid=Exceso pagado
@@ -344,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
@@ -467,3 +471,4 @@ AutoFillDateToShort=Fijar fecha de finalización
 MaxNumberOfGenerationReached=Número máximo de gen. alcanzado
 CustomersInvoicesArea=Área de facturación de clientes
 SituationTotalRayToRest=Restante a pagar sin impuestos
+SendEmailsRemindersOnInvoiceDueDate=Enviar recordatorio por correo electrónico de facturas impagas
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 671225fc022..dc99f7b06ba 100644
--- a/htdocs/langs/es_CO/bookmarks.lang
+++ b/htdocs/langs/es_CO/bookmarks.lang
@@ -6,6 +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=Utilice un enlace externo/absoluto (https://URL) o un enlace interno/relativo (/DOLIBARR_ROOT/htdocs /...)
+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/companies.lang b/htdocs/langs/es_CO/companies.lang
index 6d4c4756a81..f740d495d5d 100644
--- a/htdocs/langs/es_CO/companies.lang
+++ b/htdocs/langs/es_CO/companies.lang
@@ -40,11 +40,16 @@ 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)
+ProfId3CM=Prueba de ID 3 (Decreto de creación)
+ProfId2ShortCM=Contribuyente No.
 ProfId2CO=Identificación (CC, NIT, CE)
 ProfId3CO=CIIU
 ProfId1ShortFR=SIRENA
 ProfId1LU=Identificación. profe. 1 (R.C.S. Luxemburgo)
 ProfId2LU=Identificación. profe. 2 (permiso comercial)
+ProfId4UA=Prof Id 4 (certificado)
 ProfId2DZ=Arte.
 VATIntra=RUT
 VATIntraShort=RUT
@@ -85,7 +90,7 @@ ThisUserIsNot=Este usuario no es un cliente potencial, cliente o proveedor.
 VATIntraCheckDesc=El número de identificación fiscal debe incluir el prefijo del país. El enlace <b> %s </b> utiliza el servicio de verificación de IVA europeo (VIES) que requiere acceso a Internet desde el servidor Dolibarr.
 VATIntraCheckURL=http://www.rues.org.co/RUES_Web/Consultas#tabs-3
 VATIntraCheckableOnEUSite=Verifique el ID de IVA intracomunitario en el sitio 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"> %s </a>
+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>
 NorProspectNorCustomer=No prospecto, ni cliente
 StatusProspect1=Para ser contactado
 ChangeToContact=Cambiar el estado a 'Para ser contactado'
diff --git a/htdocs/langs/es_CO/compta.lang b/htdocs/langs/es_CO/compta.lang
index 6d1ddbc68c1..05fa4dbd95b 100644
--- a/htdocs/langs/es_CO/compta.lang
+++ b/htdocs/langs/es_CO/compta.lang
@@ -138,8 +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 facturas pendientes, gastos, IVA, donaciones ya sean pagadas o no. También incluye salarios 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 definidos con el módulo Salario, se utiliza la fecha de pago del valor.
-RulesResultInOut=- Incluye los pagos reales realizados en facturas, gastos, IVA y salarios. <br> - Se basa en las fechas de pago de las facturas, gastos, IVA y salarios. La fecha de donación para la donación.
+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.
@@ -234,3 +234,7 @@ 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)
+InvoiceToPay=Para pagar (<15 días)
+InvoiceToPay15Days=Para pagar (15 a 30 días)
+InvoiceToPay30Days=Para pagar (> 30 días)
+ConfirmPreselectAccountQuestion=¿Está seguro de que desea preseleccionar las líneas seleccionadas %s con este código de contabilidad?
diff --git a/htdocs/langs/es_CO/errors.lang b/htdocs/langs/es_CO/errors.lang
index c2fb2532127..d7ee4fe6ffd 100644
--- a/htdocs/langs/es_CO/errors.lang
+++ b/htdocs/langs/es_CO/errors.lang
@@ -234,3 +234,11 @@ WarningProjectClosed=Proyecto cerrado. Primero debes volver a abrirlo.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Algunas transacciones bancarias se eliminaron después de que se generó el recibo que las incluía. Por lo tanto, el número de cheques y el total del recibo pueden diferir del número y el total de la lista.
 WarningFailedToAddFileIntoDatabaseIndex=Advertencia, no se pudo agregar la entrada de archivo en la tabla de índice de la base de datos de ECM
 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
+RequireValidExistingElement =Requerir un valor existente
+RequireValidBool =Requerir un booleano válido
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/help.lang b/htdocs/langs/es_CO/help.lang
index fc2607c0f94..d176d511d47 100644
--- a/htdocs/langs/es_CO/help.lang
+++ b/htdocs/langs/es_CO/help.lang
@@ -18,4 +18,3 @@ BackToHelpCenter=De lo contrario, <a href="%s"> vuelva a la página de inicio de
 LinkToGoldMember=Puede llamar a uno de los entrenadores preseleccionados por Dolibarr para su idioma (%s) haciendo clic en su Widget (el estado y el precio máximo se actualizan automáticamente):
 PossibleLanguages=Idiomas admitidos
 SubscribeToFoundation=Ayuda al proyecto Dolibarr, suscríbete a la fundación
-SeeOfficalSupport=Para soporte oficial de Dolibarr en su idioma: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
diff --git a/htdocs/langs/es_CO/holiday.lang b/htdocs/langs/es_CO/holiday.lang
index 26b94f883de..ad7bd301a26 100644
--- a/htdocs/langs/es_CO/holiday.lang
+++ b/htdocs/langs/es_CO/holiday.lang
@@ -20,7 +20,7 @@ UserForApprovalLogin=Inicio de sesión del usuario de aprobación
 SendRequestCP=Crear solicitud de licencia
 DelayToRequestCP=Las solicitudes de permiso deben realizarse al menos <b> %s día (s) </b> antes que ellas.
 MenuConfCP=Saldo de licencia
-SoldeCPUser=Dejar el saldo es <b> %s </b> días.
+SoldeCPUser=Dejar saldo (en días) <b> %s </b>
 ErrorEndDateCP=Debe seleccionar una fecha de finalización mayor que la fecha de inicio.
 ErrorSQLCreateCP=Se produjo un error de SQL durante la creación:
 ErrorIDFicheCP=Ha ocurrido un error, la solicitud de permiso no existe.
@@ -105,3 +105,4 @@ 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.
+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 781471fcea9..c39867bc755 100644
--- a/htdocs/langs/es_CO/hrm.lang
+++ b/htdocs/langs/es_CO/hrm.lang
@@ -7,3 +7,10 @@ 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
+JobCard=Tarjeta de trabajo
+JobPosition=Trabajo
+SkillCard=Tarjeta de habilidad
+EmployeeSkillsUpdated=Se actualizaron las habilidades de los empleados (consulte la pestaña "Habilidades" de la tarjeta de empleado)
+OrJobToCompare=Compare con los requisitos de habilidades laborales
+AddSkill=Agregue habilidades al trabajo
diff --git a/htdocs/langs/es_CO/knowledgemanagement.lang b/htdocs/langs/es_CO/knowledgemanagement.lang
index 9c4c99c34f2..bc5540d9bec 100644
--- a/htdocs/langs/es_CO/knowledgemanagement.lang
+++ b/htdocs/langs/es_CO/knowledgemanagement.lang
@@ -9,3 +9,4 @@ 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
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index 73d62f0b6aa..ffef2f25c5f 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -11,7 +11,7 @@ FormatDateShortJavaInput=dd/MM/yyyy
 FormatDateShortJQuery=dd/mm/yy
 FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShortJQuery=HH:MI
-FormatHourShort=%H:%M %p
+FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
@@ -62,7 +62,6 @@ RequestLastAccessInError=Último error de solicitud de acceso a la base de datos
 ReturnCodeLastAccessInError=Código de retorno 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 configurar 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 configurar la opción $ dolibarr_main_prod en '1' para eliminar dichos avisos)
 TechnicalID=Identificación técnica
 LineID=Identificación de línea
 WarningYouHaveAtLeastOneTaskLate=Advertencia, tiene al menos un elemento que ha excedido el tiempo de tolerancia.
@@ -118,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.)
@@ -211,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
@@ -219,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
@@ -254,7 +254,6 @@ AllExportedMovementsWereRecordedAsExported=Todos los movimientos exportados se r
 NotAllExportedMovementsCouldBeRecordedAsExported=No todos los movimientos exportados se pueden registrar como exportados
 Miscellaneous=Diverso
 GroupBy=Agrupar por...
-SomeTranslationAreUncomplete=Algunos de los idiomas ofrecidos pueden estar solo parcialmente traducidos o pueden contener errores. Ayude a corregir su idioma registrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/</a> para añadir tus mejoras.
 DownloadDocument=Descargar documento
 ActualizeCurrency=Tasa de cambio de moneda
 ModuleBuilder=Generador de módulos y aplicaciones
@@ -335,7 +334,24 @@ 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)?
+ConfirmMassDisablingQuestion=¿Está seguro de que desea deshabilitar los %s registro(s) seleccionado(s)?
+RecordsEnabled=%s registro (s) habilitado
+RecordsDisabled=%s registro (s) desactivado
+RecordEnabled=Registro habilitado
+RecordDisabled=Registro deshabilitado
 Currently=En la actualidad
+ConfirmMassLeaveApprovalQuestion=¿Está seguro de que desea aprobar los %s registro(s) seleccionado(s)?
+ConfirmMassLeaveApproval=Confirmación de aprobación de licencia masiva
+RecordsApproved=%s Registro (s) aprobado
 ClientTZ=Zona Horaria del Cliente (usuario)
+CanceledHidden=Cancelado oculto
+CanceledShown=Se muestra cancelada
diff --git a/htdocs/langs/es_CO/modulebuilder.lang b/htdocs/langs/es_CO/modulebuilder.lang
index f627c637ade..e66ed23363e 100644
--- a/htdocs/langs/es_CO/modulebuilder.lang
+++ b/htdocs/langs/es_CO/modulebuilder.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - modulebuilder
-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"> está aquí </a>.
 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>
@@ -77,6 +76,7 @@ MenusDefDescTooltip=Los menús proporcionados por su módulo / aplicación se de
 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
@@ -107,3 +107,4 @@ 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 ebb793d3d8c..6005bedbaf5 100644
--- a/htdocs/langs/es_CO/oauth.lang
+++ b/htdocs/langs/es_CO/oauth.lang
@@ -15,9 +15,9 @@ 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"> esta página </a> y luego "Credenciales" para crear credenciales 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"> esta página </a> y luego "Registrar una nueva aplicación" para crear credenciales 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 c95f685c6dc..6528536e60b 100644
--- a/htdocs/langs/es_CO/other.lang
+++ b/htdocs/langs/es_CO/other.lang
@@ -178,6 +178,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
@@ -199,3 +203,4 @@ PopuProp=Productos / Servicios por popularidad en Propuestas
 PopuCom=Productos / servicios por popularidad en pedidos
 ProductStatistics=Estadísticas de productos / servicios
 NbOfQtyInOrders=Cant. En pedidos
+ConfirmBtnCommonTitle =Confirma tu acción
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/paybox.lang b/htdocs/langs/es_CO/paybox.lang
index f9460c9eb45..8f962f29896 100644
--- a/htdocs/langs/es_CO/paybox.lang
+++ b/htdocs/langs/es_CO/paybox.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=Configuración del módulo PayBox
-PayBoxDesc=Este módulo ofrece páginas para permitir el pago en <a href="http://www.paybox.com" target="_blank"> Paybox </a> por parte de los clientes. Esto se puede utilizar para un pago gratuito o para un pago en un objeto Dolibarr en particular (factura, pedido, ...)
 FollowingUrlAreAvailableToMakePayments=Las siguientes URL están disponibles para ofrecer una página a un cliente para realizar un pago en objetos Dolibarr
 WelcomeOnPaymentPage=Bienvenido a nuestro servicio de pago online
 ThisScreenAllowsYouToPay=Esta pantalla le permite realizar un pago en línea a %s.
diff --git a/htdocs/langs/es_CO/paypal.lang b/htdocs/langs/es_CO/paypal.lang
index 5f33e85190e..dd517ab88d9 100644
--- a/htdocs/langs/es_CO/paypal.lang
+++ b/htdocs/langs/es_CO/paypal.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Configuración del módulo de PayPal
-PaypalDesc=Este módulo permite el pago por parte de los clientes a través de <a href="http://www.paypal.com" target="_blank"> PayPal </a>. Esto se puede utilizar para un pago ad-hoc o para un pago relacionado con un objeto Dolibarr (factura, pedido, ...)
 PaypalOrCBDoPayment=Pagar con PayPal (tarjeta o PayPal)
 PaypalDoPayment=Pagar con PayPal
 PAYPAL_API_SANDBOX=Prueba de modo / caja de arena
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 2db5cb43923..6901f598df8 100644
--- a/htdocs/langs/es_CO/products.lang
+++ b/htdocs/langs/es_CO/products.lang
@@ -239,4 +239,9 @@ ActionAvailableOnVariantProductOnly=Acción solo disponible en la variante de pr
 ProductsPricePerCustomer=Precios de productos por cliente
 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 a7e9cf03422..42fa3d7ba31 100644
--- a/htdocs/langs/es_CO/projects.lang
+++ b/htdocs/langs/es_CO/projects.lang
@@ -98,6 +98,7 @@ NoTasks=No hay tareas para este proyecto.
 LinkedToAnotherCompany=Vinculado a otro tercero
 TaskIsNotAssignedToUser=Tarea no asignada al usuario. Use el botón '<strong> %s </strong>' para asignar la tarea ahora.
 ErrorTimeSpentIsEmpty=El tiempo gastado está vacío
+TimeRecordingRestrictedToNMonthsBack=La grabación de tiempo está restringida a %s meses atrás
 ThisWillAlsoRemoveTasks=Esta acción también eliminará todas las tareas del proyecto (<b> %s </b> tareas en este momento) y todas las entradas de tiempo invertido.
 IfNeedToUseOtherObjectKeepEmpty=Si algunos objetos (factura, pedido, ...), pertenecientes a otro tercero, deben estar vinculados al proyecto a crear, déjelo vacío para que el proyecto sea de múltiples terceros.
 CloneTasks=Tareas de clonacion
@@ -184,13 +185,20 @@ SendProjectRef=Proyecto de información %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=El módulo 'Salarios' debe estar habilitado para definir la tarifa por hora del empleado para que se valore el tiempo dedicado
 NewTaskRefSuggested=La referencia de tarea ya se usó, se requiere una nueva referencia de tarea
 TimeSpentInvoiced=Tiempo invertido facturado
+TimeSpentForIntervention=Tiempo usado
 TimeSpentForInvoice=Tiempo usado
 ServiceToUseOnLines=Servicio para usar en líneas
 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.
 ProjectFollowOpportunity=Siga la oportunidad
 UsageOpportunity=Uso: oportunidad
 UsageBillTimeShort=Uso: tiempo de facturación
 InvoiceToUse=Proyecto de factura a utilizar
+InterToUse=Proyecto de intervención a utilizar
+NewInter=Nueva intervención
 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/receptions.lang b/htdocs/langs/es_CO/receptions.lang
index f39b93d8f35..fb9a67d8272 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
@@ -11,7 +11,6 @@ OtherReceptionsForSameOrder=Otras recepciones para este pedido
 ReceptionsAndReceivingForSameOrder=Recepciones y recibos de este pedido
 ReceptionsToValidate=Recepciones para validar
 StatusReceptionCanceled=Cancelado
-StatusReceptionValidated=Validado (productos para enviar o ya enviados)
 StatusReceptionProcessed=Procesado
 StatusReceptionProcessedShort=Procesado
 ConfirmDeleteReception=¿Está seguro de que desea eliminar esta recepción?
@@ -21,9 +20,10 @@ StatsOnReceptionsOnlyValidated=Estadísticas realizadas sobre recepciones valida
 SendReceptionByEMail=Enviar recepción por correo electrónico
 SendReceptionRef=Presentación de recepción %s
 ActionsOnReception=Eventos en recepción
-ReceptionCreationIsDoneFromOrder=Por el momento, la creación de una nueva recepción se realiza a partir del registro de la Orden de Compra.
 ProductQtyInReceptionAlreadySent=Cantidad de producto de la orden de venta abierta ya enviada
 ProductQtyInSuppliersReceptionAlreadyRecevied=Cantidad de producto de la orden de proveedor abierta ya recibida
 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/salaries.lang b/htdocs/langs/es_CO/salaries.lang
index 539c193c2c6..a59dad2e27c 100644
--- a/htdocs/langs/es_CO/salaries.lang
+++ b/htdocs/langs/es_CO/salaries.lang
@@ -2,7 +2,6 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Cuenta contable utilizada para usuarios de terceros
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=La cuenta de contabilidad dedicada definida en la tarjeta de usuario se usará solo para la contabilidad del libro auxiliar. Este se usará para el Libro mayor y como valor predeterminado de la contabilidad del libro auxiliar si la cuenta de contabilidad del usuario dedicada no está definida.
 CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Por defecto, deje vacía la opción "Crear automáticamente un pago total" al crear un salario.
-AddSalary=Agregar salario
 AddSalaryPayment=Agregar pago de salario
 THM=Tarifa por hora promedio
 TJM=Tarifa diaria promedio
@@ -11,3 +10,4 @@ TJMDescription=Este valor es actualmente solo para información y no se usa para
 LastSalaries=Últimos sueldos de %s
 AllSalaries=Todos los sueldos
 ConfirmDeleteSalaryPayment=¿Quieres eliminar este pago de salario?
+FillFieldFirst=Primero llene el campo de empleado
diff --git a/htdocs/langs/es_CO/stocks.lang b/htdocs/langs/es_CO/stocks.lang
index 7c87f3312fd..137e6c47dfe 100644
--- a/htdocs/langs/es_CO/stocks.lang
+++ b/htdocs/langs/es_CO/stocks.lang
@@ -41,7 +41,6 @@ UserWarehouseAutoCreate=Cree un almacén de usuarios automáticamente al crear u
 AllowAddLimitStockByWarehouse=Gestionar también el valor del stock mínimo y deseado por emparejamiento (producto-almacén) además del valor del stock mínimo y deseado por producto
 WarehouseAskWarehouseDuringPropal=Establecer un almacén en propuestas comerciales
 WarehouseAskWarehouseDuringOrder=Establecer un almacén en pedidos de venta
-WarehouseAskWarehouseDuringProject=Establecer un almacén en proyectos
 UserDefaultWarehouse=Establecer un almacén en los usuarios
 MainDefaultWarehouse=Almacén predeterminado
 MainDefaultWarehouseUser=Utilice un almacén predeterminado para cada usuario
@@ -145,8 +144,6 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Los movimientos de stock tendrán l
 inventoryChangePMPPermission=Permitir cambiar el valor de PMP de un producto
 ColumnNewPMP=Unidad nueva PMP
 OnlyProdsInStock=No agregue producto sin stock
-TheoricalQty=Cantidad teórica
-TheoricalValue=Cantidad teórica
 RealQty=Cantidad real
 RealValue=Valor real
 RegulatedQty=Cantidad regulada
@@ -164,5 +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 837025f97f6..e4412f149cc 100644
--- a/htdocs/langs/es_CO/stripe.lang
+++ b/htdocs/langs/es_CO/stripe.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeDesc=Ofrezca a los clientes una página de pago en línea de Stripe para pagos con tarjetas de crédito / cebit a través de <a href="http://www.stripe.com" target="_blank"> Stripe </a>. Esto se puede utilizar para permitir que sus clientes realicen pagos ad-hoc o para pagos relacionados con un objeto Dolibarr en particular (factura, pedido, ...)
+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/website.lang b/htdocs/langs/es_CO/website.lang
index 5e3216ab6ff..7c082941998 100644
--- a/htdocs/langs/es_CO/website.lang
+++ b/htdocs/langs/es_CO/website.lang
@@ -32,7 +32,7 @@ RealURL=URL real
 ViewWebsiteInProduction=Ver el sitio web usando URL de inicio
 SetHereVirtualHost=<u> Úselo con Apache / NGinx / ... </u> <br> Cree en su servidor web (Apache, Nginx, ...) un host virtual dedicado con PHP habilitado y un directorio raíz en <br><strong>%s</strong>
 YouCanAlsoTestWithPHPS=<u> Usar con el servidor PHP integrado </u><br> En el entorno de desarrollo, es posible que prefiera probar el sitio con el servidor web integrado PHP (se requiere PHP 5.5) ejecutando <br> <strong>php -S 0.0.0.0:8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u> Ejecute su sitio web con otro proveedor de alojamiento Dolibarr </u> <br> Si no tiene un servidor web como Apache o NGinx disponible en Internet, puede exportar e importar su sitio web a otra instancia de Dolibarr proporcionada por otro proveedor de alojamiento Dolibarr que proporcione integración con el módulo de sitio web. Puede encontrar una lista de algunos proveedores de alojamiento Dolibarr en <a href="https://saas.dolibarr.org" target="_blank"> https://saas.dolibarr.org </a>
+YouCanAlsoDeployToAnotherWHP=<u> Ejecute su sitio web con otro proveedor de alojamiento Dolibarr </u> <br> Si no tiene un servidor web como Apache o NGinx disponible en Internet, puede exportar e importar su sitio web a otra instancia de Dolibarr proporcionada por otro proveedor de alojamiento Dolibarr que proporcione integración con el módulo de sitio web. Puede encontrar una lista de algunos proveedores de alojamiento Dolibarr en <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a>
 CheckVirtualHostPerms=Compruebe también que el usuario del host virtual (por ejemplo, www-data) tiene permisos <strong> %s </strong> en archivos en <br><strong>%s</strong>
 ReadPerm=Leer
 TestDeployOnWeb=Probar / implementar en la web
@@ -44,7 +44,7 @@ SyntaxHelp=Ayuda sobre sugerencias de sintaxis específicas
 YouCanEditHtmlSourceckeditor=Puede editar el código fuente HTML usando el botón "Fuente" en el editor.
 YouCanEditHtmlSource=<br> <span class="fa fa-bug"> </span> Puede incluir código PHP en esta fuente utilizando las etiquetas <strong>&lt;?php ?&gt;</strong>. Las siguientes variables globales están disponibles: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> También puede incluir contenido de otra página/contenedor con la siguiente sintaxis: <br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> Usted puede hacer una redirección a otra página/contenedor con la siguiente sintaxis (Nota: no emiten ningún contenido antes de una redirección):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> Para añadir un vínculo a otra página, utilice la sintaxis: <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 incluir un <strong>enlace para descarga</strong> un archivo almacenado en directorio <strong>documents</strong>, utilice el  envoltorio <strong>document.php</strong>: <br> Ejemplo, para un archivo en  documents/ecm (Tiene que haber iniciado sesión), la sintaxis es:<br>  <strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br> Para un archivo en documents/medias (directorio abierto para acceso público), la sintaxis es: <br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br> Para un archivo compartido con un enlace para compartir (acceso abierto usando la clave hash de compartir del archivo), la sintaxis: <br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> Para incluir una <strong>imagen</strong>  almacenada en el directorio <strong>documents</strong>, utilice la envoltura <strong>viewimage.php</strong>:  <br>Ejemplo, para una imagen en documents/medias (directorio abierto para acceso público), la sintaxis es:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 YouCanEditHtmlSource2=Para una imagen compartida con un enlace para compartir (acceso abierto usando la clave hash para compartir del archivo), la sintaxis es: <br> <strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br> Más ejemplos de código HTML o dinámico disponibles en <a href="%s" target="_blank"> la documentación wiki </a> <br>.
+YouCanEditHtmlSourceMore=<br> Más ejemplos de código HTML o dinámico disponibles en <a href="%s" target="_blank" rel="noopener noreferrer external"> la documentación wiki </a> <br>.
 ClonePage=Clonar página / contenedor
 ConfirmClonePage=Ingrese el código / alias de la nueva página y si es una traducción de la página clonada.
 LanguageMustNotBeSameThanClonedPage=Clonas una página como traducción. El idioma de la nueva página debe ser diferente al idioma de la página de origen.
diff --git a/htdocs/langs/es_CO/withdrawals.lang b/htdocs/langs/es_CO/withdrawals.lang
index fbd95aa2fa7..38e533e6b22 100644
--- a/htdocs/langs/es_CO/withdrawals.lang
+++ b/htdocs/langs/es_CO/withdrawals.lang
@@ -65,7 +65,7 @@ StatusMotif5=RIB inutilizable
 StatusMotif8=Otra razon
 CreateForSepaFRST=Crear archivo de débito automático (SEPA FRST)
 CreateForSepaRCUR=Crear archivo de débito automático (SEPA RCUR)
-CreateAll=Crear archivo de débito automático (todos)
+CreateAll=Crear archivo de débito automático
 CreateGuichet=Solo oficina
 CreateBanque=Solo banco
 OrderWaiting=Esperando tratamiento
@@ -95,7 +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, usted autoriza a (A) %s a enviar instrucciones a su banco para debitar su cuenta y (B) a su banco para debitar 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. Se debe reclamar un reembolso dentro de las 8 semanas a partir de la fecha en que se debitó su cuenta. Sus derechos con respecto al mandato anterior se explican en una declaración que puede obtener de su banco.
+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 *
@@ -119,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_CO/workflow.lang b/htdocs/langs/es_CO/workflow.lang
index 60f75ed2ff8..326b17aadd9 100644
--- a/htdocs/langs/es_CO/workflow.lang
+++ b/htdocs/langs/es_CO/workflow.lang
@@ -11,6 +11,7 @@ descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta de origen vi
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasifique el pedido de ventas de origen vinculado como facturado cuando se valida la factura del cliente (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasifique el pedido de ventas de origen vinculado como facturado cuando la factura del cliente se establece como pagada (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasifique el pedido de ventas de origen vinculado como enviado cuando se valida un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Clasifique el pedido de venta de origen vinculado como enviado cuando se cierra un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasifique la propuesta del proveedor de origen vinculado como facturada cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasifique el pedido de compra de origen vinculado como facturado cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
 descWORKFLOW_BILL_ON_RECEPTION=Clasifique las recepciones como "facturadas" cuando un pedido de proveedor vinculado is validado
diff --git a/htdocs/langs/es_DO/accountancy.lang b/htdocs/langs/es_DO/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/es_DO/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index e967b29a616..8317eec449a 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -1,23 +1,13 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
 OldVATRates=Tasa de ITBIS antigua
 NewVATRates=Tasa de ITBIS nueva
 Permission91=Consultar impuestos e ITBIS
 Permission92=Crear/modificar impuestos e ITBIS
 Permission93=Eliminar impuestos e ITBIS
 DictionaryVAT=Tasa de ITBIS (Impuesto sobre ventas en EEUU)
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
 UnitPriceOfProduct=Precio unitario sin ITBIS de un producto
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
 OptionVatMode=Opción de carga de ITBIS
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/es_DO/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/es_DO/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/es_DO/companies.lang b/htdocs/langs/es_DO/companies.lang
new file mode 100644
index 00000000000..40b5f885e43
--- /dev/null
+++ b/htdocs/langs/es_DO/companies.lang
@@ -0,0 +1,7 @@
+# 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
diff --git a/htdocs/langs/es_DO/compta.lang b/htdocs/langs/es_DO/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/es_DO/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/es_DO/errors.lang b/htdocs/langs/es_DO/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/es_DO/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/es_DO/eventorganization.lang b/htdocs/langs/es_DO/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/es_DO/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/es_DO/members.lang b/htdocs/langs/es_DO/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/es_DO/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/es_DO/mrp.lang b/htdocs/langs/es_DO/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/es_DO/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/es_DO/orders.lang b/htdocs/langs/es_DO/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/es_DO/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/es_DO/printing.lang b/htdocs/langs/es_DO/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/es_DO/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/es_DO/products.lang b/htdocs/langs/es_DO/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/es_DO/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/es_DO/propal.lang b/htdocs/langs/es_DO/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/es_DO/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/es_DO/receptions.lang b/htdocs/langs/es_DO/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/es_DO/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_DO/sendings.lang b/htdocs/langs/es_DO/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/es_DO/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/es_DO/stocks.lang b/htdocs/langs/es_DO/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/es_DO/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/es_EC/accountancy.lang b/htdocs/langs/es_EC/accountancy.lang
index 1831f962943..6159703598d 100644
--- a/htdocs/langs/es_EC/accountancy.lang
+++ b/htdocs/langs/es_EC/accountancy.lang
@@ -169,7 +169,6 @@ DescVentilExpenseReportMore=Si configura una cuenta contable en el tipo de líne
 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
-AutomaticBindingDone=Unión automática realizada
 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
@@ -193,8 +192,6 @@ AccountingJournalType5=Informe de gastos
 AccountingJournalType9=Tiene nuevo
 ErrorAccountingJournalIsAlreadyUse=Esta revista ya utiliza
 AccountingAccountForSalesTaxAreDefinedInto=Nota: la cuenta de contabilidad para el impuesto a las ventas se define en el menú <b>%s</b> - <b>%s</b>
-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)
 ExportDraftJournal=Exportar borrador de diario
 Modelcsv_CEGID=Exportación para CEGID Expert Comptabilité
 Modelcsv_COALA=Exportación para Sage Coala
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index a3209d4fe15..266b2ae19e4 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -184,8 +184,6 @@ OfficialWebSiteLocal=Sitio web local ( %s)
 OfficialMarketPlace=Mercado oficial de módulos / complementos externos
 OfficialWebHostingService=Servicios de alojamiento web de referenciados (Cloud hosting)
 ReferencedPreferredPartners=Socios Preferidos
-ForDocumentationSeeWiki=Para la documentación del usuario o del desarrollador (Doc, Preguntas Frecuentes ...), <br> Eche un vistazo a la Wiki Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Para cualquier otra pregunta / ayuda, puede utilizar el foro Dolibarr: <br><b><a href="%s" target="_blank">%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>.
 CurrentMenuHandler=Controlador de menús actual
@@ -241,7 +239,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>
@@ -270,8 +267,6 @@ UMask=Parámetro UMask para los nuevos archivos en el sistema de archivos de Uni
 UMaskExplanation=Este es el que permite definir los permisos. Los valores de la configuración de los archivos de Dolibarr en el servidor (durante la carga, por ejemplo). Debe ser el valor octal (por ejemplo, 0666 significa leer y escribir para todos). <br> Este parámetro es inútil en un servidor Windows.
 SeeWikiForAllTeam=Eche un vistazo a la página de Wiki para obtener una lista de colaboradores y su organización.
 UseACacheDelay= Retardo para el almacenamiento en caché de la respuesta de la exportación en segundos (0 o vacío para no caché)
-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=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á de forma permanente todos sus archivos de datos sin posibilidad de restaurarlos (archivos ECM, archivos adjuntos ...).
 MinLength=Longitud mínima
@@ -527,7 +522,6 @@ Permission106=Exportar envíos
 Permission109=Eliminar envíos
 Permission111=Leer cuentas financieras
 Permission112=Crear / modificar / eliminar y comparar transacciones
-Permission113=Configuración de cuentas financieras (crear, administrar categorías)
 Permission114=Conciliar transacciones
 Permission115=Exportar transacciones y estados de cuenta
 Permission116=Transferencias entre cuentas
@@ -629,9 +623,7 @@ Permission652=Eliminar listas de materiales
 Permission701=Leer donaciones
 Permission702=Crear / modificar donaciones
 Permission771=Leer informes de gastos
-Permission772=Crear / modificar informes de gastos
 Permission773=Eliminar informes de gastos
-Permission774=Leer todos los informes de gastos
 Permission775=Aprobar informes de gastos
 Permission776=Pagar los informes de gastos
 Permission779=Exportar informes de gastos
@@ -683,9 +675,6 @@ Permission10003=Crear/modificar contenido del sitio web (código php dinámico).
 Permission20001=Lea las solicitudes de licencia (su licencia y las de sus subordinados)
 Permission20002=Cree / modifique sus solicitudes de licencia (su licencia y las de sus subordinados)
 Permission20003=Solicitudes de licencia / permiso
-Permission20004=Lea todas las solicitudes de permiso.
-Permission20005=Crear / modificar solicitudes de permiso para todos (incluso para usuarios no subordinados)
-Permission20006=Administrar solicitud de licencia / permiso
 Permission20007=Aprobar solicitudes de licencia
 Permission23001=Leer trabajo programado
 Permission23002=Crear / actualizar trabajo programado
@@ -724,7 +713,6 @@ DictionaryFees=Informe de gastos: tipos de líneas de informe de gastos
 DictionarySendingMethods=Métodos de envío
 DictionaryStaff=Número de empleados
 DictionaryAvailability=Retraso en la entrega
-DictionaryOrderMethods=Order methods
 DictionarySource=Origen de las propuestas / pedidos
 DictionaryAccountancyCategory=Grupos personalizados para informes
 DictionaryAccountancysystem=Modelos para el plan de cuentas
@@ -761,7 +749,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
@@ -810,7 +797,6 @@ LogoSquarredDesc=Debe ser un icono cuadriculado (ancho = alto). Este logotipo se
 DoNotSuggestPaymentMode=No sugiera
 OwnerOfBankAccount=Dueño de una cuenta bancaria %s
 BankModuleNotActive=Módulo Cuentas bancarias no habilitado.
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
 DelaysOfToleranceDesc=Establezca el retraso antes de que aparezca un ícono de alerta %s en la pantalla para el elemento tardío.
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Orden no procesada
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Orden de compra no procesada
@@ -836,7 +822,6 @@ LogEventDesc=Habilitar el registro para eventos de seguridad específicos. Los a
 AreaForAdminOnly=Los parámetros de configuración sólo pueden ser establecidos por <b> usuarios de administrador </b>.
 SystemInfoDesc=La información del sistema es la información técnica diversa que se obtiene en el modo de solo lectura y visible sólo para los administradores.
 AccountantDesc=Si tiene un contador/contador externo, puede editar aquí su información.
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
 AvailableModules=Aplicaciones / módulos disponibles
 ToActivateModule=Para activar los módulos, vaya a área de configuración (Inicio-> Configuración-> Módulos).
 SessionTimeOut=Tiempo de espera para la sesión
@@ -875,7 +860,6 @@ RestoreMySQL=Importación de MySQL
 ForcedToByAModule= Esta regla se ha forzado a <b>%s</b> por un módulo activado
 RunningUpdateProcessMayBeRequired=Parece que es necesario ejecutar el proceso de actualización (la versión del programa %s difiere de la versión de la base de datos %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar este comando desde la línea de comandos después de iniciar sesión en un shell con el usuario <b>%s</b> o debe agregar la opción -Al final de la línea de comandos para proporcionar la contraseña <b>%s</b>.
-MAIN_DISABLE_METEO=Disable weather thumb
 MeteoPercentageMod=Modo porcentual
 MeteoPercentageModEnabled=Modo de porcentaje habilitado
 MeteoUseMod=Haga clic para usar %s
@@ -928,8 +912,6 @@ YouDoNotUseBestDriver=Utiliza el controlador %s, pero se recomienda el controlad
 SearchOptim=Optimización de la búsqueda
 BrowserIsOK=Está utilizando el navegador web %s. Este navegador está bien para la seguridad y el rendimiento.
 BrowserIsKO=Está utilizando el navegador web %s. Se sabe que este navegador es una mala elección para la seguridad, el rendimiento y la confiabilidad. Recomendamos utilizar Firefox, Chrome, Opera o Safari.
-AddRefInList=Mostrar cliente / vendedor ref. Lista de información (lista de selección o cuadro combinado) y la mayoría del hipervínculo. <br> Los terceros aparecerán con un formato de nombre de "CC12345 - SC45678 - The Big Company corp". en lugar de "The Big Company corp".
-AddAdressInList=Mostrar la lista de información de dirección del cliente / proveedor (seleccionar lista o cuadro combinado) <br> Aparecerán terceros con el formato de nombre "The Big Company corp. - 21 jump street 123456 Big town - USA" en lugar de "The Big Company corp".
 AskForPreferredShippingMethod=Pregunte por el método de envío preferido para terceros.
 FillThisOnlyIfRequired=Ejemplo: +2 (llenar sólo si se experimentan problemas de compensación de zona horaria)
 NumberingModules=Modelos de numeración
@@ -940,6 +922,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.
@@ -984,7 +967,6 @@ WatermarkOnDraftSupplierProposal=Marca de agua en los proveedores de ofertas de
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Solicitar la cuenta bancaria en la solicitud de precio
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pregunte por la fuente del almacén para el pedido
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Preguntar por el destinatario de la cuenta bancaria en la orden de compra
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
 OrdersSetup=Configuración de gestión de pedidos de ventas
 OrdersNumberingModules=Modelos de numeración de pedidos
 WatermarkOnDraftOrders=Marca de agua en los proyectos de pedidos.
@@ -1136,7 +1118,6 @@ ProductSetup=Configuración del módulo de productos
 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 las listas de selección de combo (0
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
 MergePropalProductCard=Activar en la ficha Archivos adjuntos de producto / servicio una opción para fusionar el documento PDF del producto con 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.
 UseSearchToSelectProduct=Espere hasta que presione una tecla antes de cargar el contenido de la lista de combo de productos (esto puede aumentar el rendimiento si tiene una gran cantidad de productos, pero es menos conveniente)
@@ -1255,6 +1236,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.
@@ -1401,7 +1383,6 @@ TypeCdr=Use "Ninguno" si la fecha de pago es la fecha de la factura más un delt
 BaseCurrency=Moneda de referencia de la empresa
 WarningNoteModulePOSForFrenchLaw=Este módulo %s cumple con las leyes francesas (Loi Finance 2016) porque el módulo de Registros no reversibles se activa automáticamente.
 WarningInstallationMayBecomeNotCompliantWithLaw=Está intentando instalar el módulo %s que es un módulo externo. Activar un módulo externo significa que confía en el editor de ese módulo y que está seguro de que este módulo no afecta negativamente el comportamiento de su aplicación y cumple con las leyes de su país ( %s). Si el módulo introduce una característica ilegal, usted se hace responsable del uso de software ilegal.
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 NothingToSetup=No se requiere ninguna configuración específica para este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto en "sí" si este grupo es un cálculo de otros grupos
 SeveralLangugeVariatFound=Algunas variantes de lenguaje
@@ -1424,14 +1405,12 @@ 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)
-RecordEvent=Grabar evento de correo electrónico
-CreateLeadAndThirdParty=Crear plomo (y tercero si es necesario)
 CodeLastResult=Último código de resultado
 NbOfEmailsInInbox=Número de correos electrónicos en el directorio de origen
 LoadThirdPartyFromName=Cargue la búsqueda de terceros en %s (solo carga)
 LoadThirdPartyFromNameOrCreate=Cargue la búsqueda de terceros en %s (crear si no se encuentra)
 ECMAutoTree=Mostrar arbol ECM automatico
-OperationParamDesc=Defina los valores que se utilizarán para el objeto de la acción o cómo extraer valores. Por ejemplo: <br> objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char como separador para extraer o establecer varias propiedades.
+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.
 OpeningHoursDesc=Ingrese aquí los horarios regulares de su empresa.
 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).
@@ -1457,7 +1436,7 @@ EXPORTS_SHARE_MODELS=Los modelos de exportación se comparten con todos
 ExportSetup=Configuración del módulo Exportar
 InstanceUniqueID=ID único de la instancia
 WithGMailYouCanCreateADedicatedPassword=Con una cuenta de GMail, si habilitó la validación de 2 pasos, se recomienda crear una segunda contraseña dedicada para la aplicación en lugar de usar la contraseña de su propia cuenta de https://myaccount.google.com/.
-EmailCollectorLoadThirdPartyHelp=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 a string 'Name: name to find' found into the body, use 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=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=Punto final para %s: %s
 DeleteEmailCollector=Eliminar recopilador de correo electrónico
 ConfirmDeleteEmailCollector=¿Estás seguro de que deseas eliminar este recopilador de correo electrónico?
@@ -1470,6 +1449,5 @@ 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
-ARestrictedPath=Some restricted path
 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_EC/banks.lang b/htdocs/langs/es_EC/banks.lang
index ce6d36a87f0..f392c42bff3 100644
--- a/htdocs/langs/es_EC/banks.lang
+++ b/htdocs/langs/es_EC/banks.lang
@@ -26,7 +26,6 @@ IOMonthlyReporting=Reporte mensual
 BankAccountDomiciliation=Dirección del banco
 BankAccountOwner=Nombre del propietario de la cuenta
 BankAccountOwnerAddress=Dirección del propietario de la cuenta
-RIBControlError=La comprobación de integridad de los valores ha fallado. Esto significa que la información para este número de cuenta no está completa o es incorrecta (verifique el país, los números y el IBAN).
 NewFinancialAccount=Nueva cuenta bancaria
 MenuNewFinancialAccount=Nueva cuenta bancaria
 EditFinancialAccount=Editar cuenta
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/bookmarks.lang b/htdocs/langs/es_EC/bookmarks.lang
index 19eb00c59c9..6e2e2ea9df9 100644
--- a/htdocs/langs/es_EC/bookmarks.lang
+++ b/htdocs/langs/es_EC/bookmarks.lang
@@ -6,6 +6,5 @@ ShowBookmark=Mostrar marcador
 ReplaceWindow=Reemplazar pestaña actual
 BehaviourOnClick=Comportamiento al seleccionar una URL de marcador
 SetHereATitleForLink=Establecer un nombre para el marcador
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Utilice un enlace externo / absoluto (https://URL) o un enlace interno / relativo (/DOLIBARR_ROOT/htdocs/...)
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Elija si la página vinculada debe abrirse en la pestaña actual o en una pestaña nueva
 BookmarksManagement=Administración de marcadores
diff --git a/htdocs/langs/es_EC/cashdesk.lang b/htdocs/langs/es_EC/cashdesk.lang
index ab7d442fe74..c519dedfc0a 100644
--- a/htdocs/langs/es_EC/cashdesk.lang
+++ b/htdocs/langs/es_EC/cashdesk.lang
@@ -25,7 +25,6 @@ UserNeedPermissionToEditStockToUsePos=Solicita disminuir el stock en la creació
 DolibarrReceiptPrinter=Dolibarr Impresora de recibos
 PointOfSale=Punto de venta
 TakeposConnectorNecesary=Se requiere 'conector TakePOS'
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
 Receipt=Recibo
 Header=Encabezado
 Footer=Pie de página
diff --git a/htdocs/langs/es_EC/companies.lang b/htdocs/langs/es_EC/companies.lang
index 6b46b175261..2545618c56a 100644
--- a/htdocs/langs/es_EC/companies.lang
+++ b/htdocs/langs/es_EC/companies.lang
@@ -199,7 +199,6 @@ VATIntraCheck=Comprobar
 VATIntraCheckDesc=La identificación del IVA debe incluir el prefijo del país. El enlace <b> %s </b> utiliza el servicio de verificación de IVA europeo (VIES) que requiere acceso a Internet desde el servidor Dolibarr.
 VATIntraCheckURL=Http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Consulte el ID de IVA intracomunitario en el sitio 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">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=No es posible el chequeo. El servicio de chequeo no es proporcionado por el estado miembro (%s).
 NorProspectNorCustomer=No prospecto, ni cliente
 ProspectLevel=Prospecto potencial
diff --git a/htdocs/langs/es_EC/compta.lang b/htdocs/langs/es_EC/compta.lang
index 59f44794876..9ea4d2f1ac1 100644
--- a/htdocs/langs/es_EC/compta.lang
+++ b/htdocs/langs/es_EC/compta.lang
@@ -129,8 +129,6 @@ AnnualSummaryInputOutputMode=Balance de ingresos y gastos, resumen anual
 AnnualByCompaniesDueDebtMode=Balance de ingresos y gastos, detalle por grupos predefinidos, modo <b>%sClaims-Deudas%s </b> dicho <b> Compromiso de contabilidad </b>.
 AnnualByCompaniesInputOutputMode=Balance de ingresos y gastos, detalle por grupos predefinidos, modo <b>%sIngresos-Gastos%s </b> dicho <b> contabilidad de caja </b>.
 RulesAmountWithTaxIncluded=Los importes mostrados son con todos los impuestos incluidos
-RulesResultDue=- Incluye facturas pendientes, gastos, IVA, donaciones ya sean pagadas o no. También incluye salarios 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 definidos con el módulo Salario, se utiliza la fecha de pago del valor.
-RulesResultInOut=Incluye los pagos reales realizados en facturas, gastos, IVA y sueldos. <br> - Se basa en las fechas de pago de las facturas, gastos, IVA y salarios. la fecha de donación para la donación.
 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 Ventas.
@@ -142,7 +140,6 @@ LT1ReportByCustomers=Informe el impuesto 2 por un cliente/proveedor
 LT2ReportByCustomers=Informe el impuesto 3 por un cliente/proveedor
 LT1ReportByCustomersES=Informe de terceros RE
 LT2ReportByCustomersES=Informe de terceros IRPF
-VATReportByThirdParties=Sales tax report by third party
 VATReportByCustomersInInputOutputMode=Informe del cliente IVA cobrado y pagado
 LT1ReportByQuarters=Informe el impuesto 2 por tasa
 LT2ReportByQuarters=Informe el impuesto 3 por tasa
@@ -203,9 +200,3 @@ RulesPurchaseTurnoverDue=- Incluye las facturas vencidas del proveedor, ya sean
 RulesPurchaseTurnoverIn=- Incluye todos los pagos efectivos de facturas hechas a proveedores. <br>: se basa en la fecha de pago de estas facturas <br>
 ReportPurchaseTurnover=Factura de facturación facturada
 ReportPurchaseTurnoverCollected=Volumen de compras recogido
-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)
diff --git a/htdocs/langs/es_EC/errors.lang b/htdocs/langs/es_EC/errors.lang
index 3ef443f5c28..16ec651f406 100644
--- a/htdocs/langs/es_EC/errors.lang
+++ b/htdocs/langs/es_EC/errors.lang
@@ -57,7 +57,6 @@ ErrorLDAPMakeManualTest=Se ha generado un archivo .ldif en el directorio%s. Trat
 ErrorCantSaveADoneUserWithZeroPercentage=No se puede guardar una acción con "estado no iniciado" si el campo "hecho por" también se llena.
 ErrorPleaseTypeBankTransactionReportName=Ingrese el nombre del extracto bancario donde se debe informar la entrada (Formato AAAAMM o AAAAMMDD)
 ErrorRecordHasChildren=Error al eliminar el registro ya que tiene algunos registros secundarios.
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
 ErrorRecordIsUsedCantDelete=No se puede borrar el registro. Ya está usado o incluido en otro objeto.
 ErrorModuleRequireJavascript=Javascript no debe desactivarse para que esta función funcione. Para activar / desactivar JavaScript, vaya al menú Inicio-> Configuración-> Mostrar.
 ErrorPasswordsMustMatch=Las contraseñas escritas deben coincidir entre sí
diff --git a/htdocs/langs/es_EC/eventorganization.lang b/htdocs/langs/es_EC/eventorganization.lang
index 3e3d94a4beb..e6b8e89584c 100644
--- a/htdocs/langs/es_EC/eventorganization.lang
+++ b/htdocs/langs/es_EC/eventorganization.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
 EvntOrgDone =Hecho
diff --git a/htdocs/langs/es_EC/holiday.lang b/htdocs/langs/es_EC/holiday.lang
index 104119c25e1..cc0d5c6bdcf 100644
--- a/htdocs/langs/es_EC/holiday.lang
+++ b/htdocs/langs/es_EC/holiday.lang
@@ -19,7 +19,6 @@ UserForApprovalFirstname=Nombre del usuario de aprobación
 SendRequestCP=Crear solicitud de licencia
 DelayToRequestCP=Las solicitudes de permiso deben ser hechas al menos <b>%s día (s) </b> antes de ellas.
 MenuConfCP=Balance de licencia
-SoldeCPUser=El saldo de licencia es <b>%s</b> dias
 ErrorEndDateCP=Debe seleccionar una fecha de finalización mayor que la fecha de inicio.
 ErrorSQLCreateCP=Se produjo un error SQL durante la creación:
 ErrorIDFicheCP=Se ha producido un error, la solicitud de licencia no existe.
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index 72bd70e3864..7256f58d602 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -81,7 +81,6 @@ RequestLastAccessInError=Error de solicitud de acceso a la base de datos
 ReturnCodeLastAccessInError=Código de error de solicitud de acceso a la base de datos
 InformationLastAccessInError=Información del 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 eliminar dichos avisos)
 TechnicalID=Identificación técnico
 LineID=Identificación de línea
 NotePublic=Nota (público)
@@ -485,7 +484,6 @@ AllExportedMovementsWereRecordedAsExported=Todos los movimientos exportados se r
 NotAllExportedMovementsCouldBeRecordedAsExported=No todos los movimientos exportados pueden registrarse como exportados
 Miscellaneous=Varios
 GroupBy=Agrupar por...
-SomeTranslationAreUncomplete=Algunos de los idiomas ofrecidos pueden estar solo parcialmente traducidos o pueden contener errores. Ayude a corregir su idioma registrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> para agregar sus mejoras.
 DownloadDocument=Descargar documento
 ActualizeCurrency=Actualizar tipo de cambio
 ModuleBuilder=Módulo y generador de aplicaciones
@@ -555,5 +553,4 @@ ContactDefault_order_supplier=Orden de compra
 ContactDefault_propal=Propuesta
 ContactDefault_supplier_proposal=Propuesta de proveedor
 ContactAddedAutomatically=Contacto agregado de roles de terceros de contacto
-Properties=Properties
 ClientTZ=Zona horaria del cliente
diff --git a/htdocs/langs/es_EC/members.lang b/htdocs/langs/es_EC/members.lang
index dc89585c5a3..893efc8178d 100644
--- a/htdocs/langs/es_EC/members.lang
+++ b/htdocs/langs/es_EC/members.lang
@@ -4,7 +4,6 @@ MemberCard=Tarjeta de miembro
 SubscriptionCard=Tarjeta de suscripción
 ShowMember=Mostrar tarjeta de miembro
 ThirdpartyNotLinkedToMember=Cliente/Proveedor no vinculado a un miembro
-MembersTickets=Membership address sheet
 FundationMembers=Miembros de la Fundación
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Otro miembro (nombre: <b>%s</b>, inicio de sesión: <b>%s</b>) ya está vinculado a un tercero <b>%s</b>. Quite primero este enlace porque un tercero no puede estar vinculado a un solo miembro (y viceversa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por razones de seguridad, se le deben otorgar permisos para editar todos los usuarios para poder vincular un miembro a un usuario que no es suyo.
diff --git a/htdocs/langs/es_EC/modulebuilder.lang b/htdocs/langs/es_EC/modulebuilder.lang
index 94ea76dc5f4..dde4b0a57d5 100644
--- a/htdocs/langs/es_EC/modulebuilder.lang
+++ b/htdocs/langs/es_EC/modulebuilder.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - modulebuilder
-ModuleBuilderDesc=Esta herramienta solo debe ser utilizada por usuarios o desarrolladores experimentados. Proporciona utilidades para construir o editar su propio módulo. La documentación para el desarrollo manual alternativo <a href="%s" target="_blank"> está aquí </a>.
 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>
@@ -64,7 +63,6 @@ MenusDefDescTooltip=Los menús proporcionados por su módulo / aplicación se de
 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).
-TriggerDefDesc=Defina en el archivo de activación el código que desea ejecutar para cada evento empresarial ejecutado.
 SeeIDsInUse=Consulte ID en uso en su instalación.
 SeeReservedIDsRangeHere=Ver el rango de ID reservados
 ToolkitForDevelopers=Kit de herramientas para desarrolladores de Dolibarr
diff --git a/htdocs/langs/es_EC/mrp.lang b/htdocs/langs/es_EC/mrp.lang
index f6e049de83e..136c443a5d8 100644
--- a/htdocs/langs/es_EC/mrp.lang
+++ b/htdocs/langs/es_EC/mrp.lang
@@ -15,10 +15,8 @@ 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
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
 QtyToProduce=Cantidad para producir
 DateStartPlannedMo=Fecha de inicio prevista
 DateEndPlannedMo=Fecha de finalización prevista
diff --git a/htdocs/langs/es_EC/orders.lang b/htdocs/langs/es_EC/orders.lang
index 18207e40e2b..bccf708457d 100644
--- a/htdocs/langs/es_EC/orders.lang
+++ b/htdocs/langs/es_EC/orders.lang
@@ -15,7 +15,6 @@ ToOrder=Hacer orden
 MakeOrder=Hacer orden
 SupplierOrder=Orden de compra
 SuppliersOrders=Ordenes de compra
-SaleOrderLines=Sales order lines
 SuppliersOrdersRunning=Pedidos de compra actuales
 CustomerOrder=Pedidos
 CustomersOrders=Ordenes de venta
diff --git a/htdocs/langs/es_EC/other.lang b/htdocs/langs/es_EC/other.lang
index 7d8c9ca8f16..12d22ae617b 100644
--- a/htdocs/langs/es_EC/other.lang
+++ b/htdocs/langs/es_EC/other.lang
@@ -186,3 +186,4 @@ RequestDuration=Duración de la solicitud.
 PopuProp=Productos / Servicios por popularidad en Propuestas
 PopuCom=Productos / Servicios por popularidad en Pedidos
 ProductStatistics=Estadísticas de productos / servicios
+CloseDialog =Cerrado
diff --git a/htdocs/langs/es_EC/printing.lang b/htdocs/langs/es_EC/printing.lang
index ea833e5c6c2..39f398ef8f2 100644
--- a/htdocs/langs/es_EC/printing.lang
+++ b/htdocs/langs/es_EC/printing.lang
@@ -1,10 +1,4 @@
 # 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=Variables de configuración para el controlador de impresión.
 ListDrivers=Lista de conductores
 PrintTestDesc=Lista de impresoras.
diff --git a/htdocs/langs/es_EC/products.lang b/htdocs/langs/es_EC/products.lang
index 0f01f704ebf..9ab59f975ea 100644
--- a/htdocs/langs/es_EC/products.lang
+++ b/htdocs/langs/es_EC/products.lang
@@ -160,7 +160,6 @@ GlobalVariableUpdaterHelp1=Analiza los datos de WebService desde la URL especifi
 GlobalVariableUpdaterHelpFormat1=El formato de la solicitud es {"URL": "http://example.com/urlofws", "VALUE": "array, targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"tu": "datos", "para": "enviar"}}
 PropalMergePdfProductActualFile=Los archivos se utilizan para agregar en PDF Azur son/es
 PropalMergePdfProductChooseFile=Seleccionar archivos PDF
-IncludingProductWithTag=Including products/services with the tag
 DefaultPriceRealPriceMayDependOnCustomer=Precio predeterminado, el precio real puede depender del cliente
 NbOfQtyInProposals=Cantidad en las propuestas
 ClinkOnALinkOfColumn=Haga clic en un enlace de la columna %s para obtener una vista detallada ...
@@ -176,7 +175,6 @@ HeightUnits=Unidad de altura
 SurfaceUnits=Unidad de superficie
 SizeUnits=Unidad de tamaño
 ConfirmDeleteProductBuyPrice=¿Seguro que quieres eliminar este precio de compra?
-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=Descripción del vendedor del producto
 VariantAttributes=Atributos variantes
 ProductAttributes=Atributos variantes para los productos
diff --git a/htdocs/langs/es_EC/projects.lang b/htdocs/langs/es_EC/projects.lang
index bf86ffc8c2f..7085e7a4da2 100644
--- a/htdocs/langs/es_EC/projects.lang
+++ b/htdocs/langs/es_EC/projects.lang
@@ -164,9 +164,12 @@ SendProjectRef=Información del proyecto %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=El módulo 'Salarios' debe estar habilitado para definir la tarifa por hora de los empleados para tener el tiempo gastado valorizado
 NewTaskRefSuggested=Referencia de tarea ya utilizada, se requiere una nueva referencia de tarea
 TimeSpentInvoiced=Tiempo gastado facturado
+TimeSpentForIntervention=Tiempo usado
 TimeSpentForInvoice=Tiempo usado
 ServiceToUseOnLines=Servicio a utilizar en líneas
 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
+NewInter=Nueva intervención
 RefTaskParent=Árbitro. Tarea principal
+StartDateCannotBeAfterEndDate=La fecha de finalización no puede ser anterior a la fecha de inicio
diff --git a/htdocs/langs/es_EC/receptions.lang b/htdocs/langs/es_EC/receptions.lang
index 44a6728491f..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?
@@ -23,7 +21,6 @@ StatsOnReceptionsOnlyValidated=Estadísticas realizadas en recepciones solo vali
 SendReceptionByEMail=Enviar recepción por correo electrónico
 SendReceptionRef=Presentación de la recepción %s
 ActionsOnReception=Eventos en recepción
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
 ProductQtyInReceptionAlreadySent=Cantidad de producto de pedido abierto ya enviado
 ProductQtyInSuppliersReceptionAlreadyRecevied=Cantidad del producto de la orden de proveedor abierto ya recibida
 ValidateOrderFirstBeforeReception=Primero debe validar el pedido antes de poder hacer recepciones.
diff --git a/htdocs/langs/es_EC/sendings.lang b/htdocs/langs/es_EC/sendings.lang
index 21403048ffe..f415c98f79e 100644
--- a/htdocs/langs/es_EC/sendings.lang
+++ b/htdocs/langs/es_EC/sendings.lang
@@ -35,7 +35,6 @@ SendShippingByEMail=Enviar envío por correo electrónico
 SendShippingRef=Presentación del envío %s
 ActionsOnShipping=Eventos en el envío
 LinkToTrackYourPackage=Enlace para rastrear su paquete
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
 ShipmentLine=Línea de envío
 ProductQtyInCustomersOrdersRunning=Cantidad de producto de pedidos de venta abiertos
 ProductQtyInSuppliersOrdersRunning=Cantidad de producto de órdenes de compra abiertas
diff --git a/htdocs/langs/es_EC/stocks.lang b/htdocs/langs/es_EC/stocks.lang
index efa99810d5b..4c33e5346ad 100644
--- a/htdocs/langs/es_EC/stocks.lang
+++ b/htdocs/langs/es_EC/stocks.lang
@@ -34,7 +34,6 @@ StockLowerThanLimit=Inventario más bajo que el límite de alerta (%s)
 EnhancedValueOfWarehouses=Valor de almacenes
 UserWarehouseAutoCreate=Crear un almacén de usuario automáticamente al crear un usuario
 AllowAddLimitStockByWarehouse=Administre también el valor del stock mínimo y deseado por emparejamiento (almacén de productos) además del valor del stock mínimo y deseado por producto
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
 MainDefaultWarehouse=Almacén predeterminado
 IndependantSubProductStock=El stock de producto y el stock de subproducto son independientes.
 QtyDispatched=Cantidad despachada
@@ -134,8 +133,6 @@ SelectCategory=Filtro de categoría
 SelectFournisseur=Filtro de proveedores
 inventoryChangePMPPermission=Permitir cambiar el valor PMP de un producto
 OnlyProdsInStock=No añada producto sin inventario
-TheoricalQty=Cantidad teórica
-TheoricalValue=Cantidad teórica
 LastPA=Última BP
 RealQty=Cantidad real
 RealValue=Valor real
@@ -154,3 +151,4 @@ StockIncrease=Aumento de existencias
 StockDecrease=Disminución de existencias
 InventoryForASpecificWarehouse=Inventario para un almacén específico
 InventoryForASpecificProduct=Inventario para un producto específico
+InventoryStartedShort=Empezado
diff --git a/htdocs/langs/es_EC/stripe.lang b/htdocs/langs/es_EC/stripe.lang
index 23db07dd246..66061813b5a 100644
--- a/htdocs/langs/es_EC/stripe.lang
+++ b/htdocs/langs/es_EC/stripe.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Configuración del módulo de Stripe
-StripeDesc=Ofrezca a los clientes una página de pago en línea de Stripe para pagos con tarjetas de crédito / debito a través de <a href="http://www.stripe.com" target="_blank"> Stripe </a>. Esto se puede utilizar para permitir a sus clientes realizar pagos ad-hoc o para pagos relacionados con un objeto Dolibarr en particular (factura, pedido, ...)
 StripeOrCBDoPayment=Pague 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=Pagar con raya
diff --git a/htdocs/langs/es_EC/withdrawals.lang b/htdocs/langs/es_EC/withdrawals.lang
index ba83f5af30c..7db2ce8dfea 100644
--- a/htdocs/langs/es_EC/withdrawals.lang
+++ b/htdocs/langs/es_EC/withdrawals.lang
@@ -46,7 +46,7 @@ StatusMotif5=RIB inutilizable
 StatusMotif8=Otra razon
 CreateForSepaFRST=Crear archivo de débito directo (SEPA FRST)
 CreateForSepaRCUR=Crear archivo de débito directo (SEPA RCUR)
-CreateAll=Crear archivo de débito directo (todos)
+CreateAll=Crear un archivo de débito directo
 CreateBanque=Solo banco
 OrderWaiting=Esperando tratamiento
 NumeroNationalEmetter=Número del Transmisor Nacional
@@ -67,7 +67,6 @@ WithdrawRequestErrorNilAmount=No se puede crear una solicitud de domiciliación
 SepaMandate=Mandato de Débito Directo SEPA
 SepaMandateShort=Mandato de SEPA
 PleaseReturnMandate=Por favor devuelva este formulario de mandato por correo electrónico a %s o por correo a
-SEPALegalText=Al firmar este formulario de mandato, usted autoriza (A) %s a enviar instrucciones a su banco para débitar su cuenta y (B) a su banco a débitar su cuenta de acuerdo con las instrucciones de %s. Como parte de sus derechos, usted tiene derecho a un reembolso de su banco bajo los términos y condiciones de su acuerdo con su banco. El reembolso se debe reclamar dentro de 8 semanas a partir de la fecha en que su cuenta fue debitada. Sus derechos con respecto al mandato anterior se explican en una declaración que puede obtener de su banco.
 CreditorIdentifier=Identificador de acreedor
 CreditorName=Nombre del acreedor
 SEPAFillForm=(B) Por favor complete todos los campos marcados con *
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index b643ffbea2c..e2c4f573641 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
@@ -48,7 +48,7 @@ CountriesNotInEEC=Países no incluidos en la CEE
 CountriesInEECExceptMe=Países en la CEE excepto %s
 CountriesExceptMe=Todos los países excepto %s
 AccountantFiles=Exportar documentos de origen
-ExportAccountingSourceDocHelp=Con esta herramienta, puede exportar los eventos de origen (lista en CSV y PDF) que se utilizaron para generar su contabilidad.
+ExportAccountingSourceDocHelp=Con esta herramienta, puede exportar los eventos de origen (lista en CSV y PDF) que se utilizan para generar su contabilidad.
 ExportAccountingSourceDocHelp2=Para exportar sus diarios, use la entrada de menú %s - %s.
 VueByAccountAccounting=Ver por cuenta contable
 VueBySubAccountAccounting=Ver por subcuenta contable
@@ -286,7 +286,7 @@ ValidateMovements=Validar movimientos
 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=Vinculación automática finalizada
+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
@@ -387,7 +387,8 @@ SaleExport=Venta de exportación
 SaleEEC=Venta en CEE
 SaleEECWithVAT=Venta en CEE con un IVA no nulo, por lo que suponemos que esto NO es una venta intracomunitaria y la cuenta sugerida es la cuenta de producto estándar.
 SaleEECWithoutVATNumber=Venta en CEE sin IVA pero el ID de IVA de un tercero no está definido. Recurrimos a la cuenta del producto para ventas estándar. Puede corregir el ID de IVA de un 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.
 ## Dictionary
 Range=Rango de cuenta contable
 Calculated=Calculado
@@ -404,6 +405,7 @@ NoJournalDefined=Sin diario definido
 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.
 
 ## Import
 ImportAccountingEntries=Entradas contables
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 195b08ee34c..4e31c89e5e3 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Fundación
 Version=Versión
 Publisher=Editor
@@ -58,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
@@ -159,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
@@ -265,8 +267,8 @@ OtherResources=Otros recursos
 ExternalResources=Recursos externos
 SocialNetworks=Redes sociales
 SocialNetworkId=ID de red social
-ForDocumentationSeeWiki=Para la documentación de usuario, desarrollador o Preguntas Frecuentes (FAQ), consulte el wiki Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Para otras cuestiones o realizar sus propias consultas, puede utilizar el foro Dolibarr: <br><b><a href="%s" target="_blank">%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>.
 CurrentMenuHandler=Gestor de menú
@@ -279,7 +281,7 @@ SpaceX=Área X
 SpaceY=Área Y
 FontSize=Tamaño de fuente
 Content=Contenido
-ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
+ContentForLines=Contenido para mostrar para cada producto o servicio (de la variable __LINES__ of Content)
 NoticePeriod=Plazo de aviso
 NewByMonth=Nuevo por mes
 Emails=E-Mails
@@ -316,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
@@ -353,12 +355,13 @@ LastStableVersion=Última versión estable
 LastActivationDate=Última fecha de activación
 LastActivationAuthor=Último autor de activación
 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>
@@ -375,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
@@ -404,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
@@ -447,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
@@ -498,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=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 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 actual encontrado: %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
@@ -518,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)
@@ -577,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
@@ -610,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
@@ -656,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
@@ -688,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
@@ -748,12 +751,12 @@ 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)
 Permission112=Crear/modificar cantidad/eliminar registros bancarios
-Permission113=Configurar cuentas financieras (crear, controlar las categorías)
+Permission113=Configurar cuentas financieras (crear, administrar categorías de transacciones bancarias)
 Permission114=Reconciliar transacciones
 Permission115=Exportar transacciones y extractos
 Permission116=Captar transferencias entre cuentas
@@ -762,6 +765,7 @@ Permission121=Consultar empresas
 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)
@@ -823,8 +827,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
@@ -858,9 +862,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
@@ -876,25 +880,24 @@ 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
 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=Crear/modificar informe de gastos
+Permission772=Crear/modificar informes de gastos (para usted y sus subordinados)
 Permission773=Eliminar informe de gastos
-Permission774=Leer todos los informes de gastos (incluidos los no subordinados)
 Permission775=Aprobar informe de gastos
 Permission776=Pagar informe de gastos
-Permission777=Leer los informes de gastos de todos
+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
@@ -925,7 +928,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
@@ -943,7 +946,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
@@ -958,18 +961,14 @@ Permission2801=Utilizar el cliente FTP en modo lectura (sólo explorar y descarg
 Permission2802=Utilizar el cliente FTP en modo escritura (borrar o subir archivos)
 Permission3200=Leer eventos archivados y huellas digitales
 Permission3301=Generar nuevos módulos
-Permission4001=Ver empleados
-Permission4002=Crear empleados
-Permission4003=Eliminar empleados
-Permission4004=Exportar empleados
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=Leer habilidad/trabajo/puesto
+Permission4002=Crear/modificar habilidad/trabajo/puesto
+Permission4003=Eliminar habilidad/trabajo/puesto
+Permission4020=Leer evaluaciones
+Permission4021=Crear/modificar tu evaluación
 Permission4022=Validar evaluación
-Permission4023=Delete evaluation
-Permission4030=See comparison menu
+Permission4023=Eliminar evaluación
+Permission4030=Ver menú de comparación
 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.
@@ -977,9 +976,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=Leer todas las peticiones de días retribuidos (incluso no subordinados)
-Permission20005=Crear/modificar las peticiones de días retribuidos para todos (incluso no subordinados)
-Permission20006=Administrar días retribuidos (configuración y actualización de 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
@@ -988,10 +987,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
@@ -1019,8 +1018,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
@@ -1029,14 +1028,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)
@@ -1063,12 +1062,12 @@ 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
 TypeOfUnit=Tipo de unidad
 SetupSaved=Configuración guardada
 SetupNotSaved=Configuración no guardada
@@ -1105,7 +1104,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
@@ -1236,12 +1235,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.
@@ -1286,7 +1285,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
@@ -1302,7 +1301,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)
@@ -1348,20 +1347,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 código de cliente/proveedor en los listados (y selectores) y enlaces.<br>Los terceros aparecerán con el nombre "CC12345 - SC45678 - The big company coorp", en lugar de "The big company coorp".
-AddVatInList=Muestra el número de IVA de cliente/proveedor. lista de información (lista de selección o cuadro combinado).
-AddAdressInList=Mostrar la dirección del cliente/proveedor en los listados (y selectores) <br>Los terceros aparecerán con el nombre "The big company coorp - 21 jump street 123456 Big town - USA ", en lugar de "The big company coorp".
-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 ".
+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 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)
@@ -1369,7 +1368,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
@@ -1379,7 +1378,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 #####
@@ -1413,7 +1412,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
@@ -1425,7 +1424,7 @@ SupplierPaymentSetup=Configuración de pagos a proveedores
 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
@@ -1440,7 +1439,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
@@ -1466,7 +1465,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
@@ -1615,7 +1614,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.
@@ -1645,9 +1644,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)
@@ -1708,8 +1707,9 @@ MailingDelay=Segundos de espera después de enviar el mensaje siguiente
 NotificationSetup=Configuración del módulo notificaciones por e-mail
 NotificationEMailFrom=E-Mail emisor (From) de los e-mails enviados a través de notificaciones
 FixedEmailTarget=Destinatario
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+NotificationDisableConfirmMessageContact=Ocultar la lista de destinatarios (suscritos como contacto) de notificaciones en el mensaje de confirmación
+NotificationDisableConfirmMessageUser=Ocultar la lista de destinatarios (suscritos como usuario) de notificaciones en el mensaje de confirmación
+NotificationDisableConfirmMessageFix=Ocultar la lista de destinatarios (suscritos como correo electrónico global) de notificaciones en el mensaje de confirmación
 ##### Sendings #####
 SendingsSetup=Configuración del módulo de envíos
 SendingsReceiptModel=Modelo de notas de entrega
@@ -1725,11 +1725,11 @@ FreeLegalTextOnDeliveryReceipts=Texto libre en las notas de recepción
 ##### FCKeditor #####
 AdvancedEditor=Editor avanzado
 ActivateFCKeditor=Activar editor avanzado para :
-FCKeditorForNotePublic=Creación/edición WYSIWIG en el campo de las notas públicas de los elementos
-FCKeditorForNotePrivate=Creación/edición WYSIWIG en el campo de las notas privadas de los elementos
+FCKeditorForNotePublic=Creación/edición WYSIWIG del campo "notas públicas" de elementos
+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 +1739,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 +1821,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 +1855,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
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Configuración del módulo Informes de gastos - Reglas
 ExpenseReportNumberingModules=Módulo de numeración de informes de gastos
 NoModueToManageStockIncrease=No hay activado módulo para gestionar automáticamente el incremento de stock. El incremento de stock se realizará solamente con entrada manual
 YouMayFindNotificationsFeaturesIntoModuleNotification=Puede encontrar opciones para notificaciones de e-mail activando y configurando el módulo  "Notificaciones".
+TemplatesForNotifications=Plantillas para notificaciones
 ListOfNotificationsPerUser=Listado de notificaciones automáticas por usuario*
 ListOfNotificationsPerUserOrContact=Listado de posibles notificaciones automáticas (eventos) por usuario* o por contacto**
 ListOfFixedNotifications=Listado de notificaciones automáticas fijas
@@ -1916,6 +1917,8 @@ 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)
+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
@@ -1932,7 +1935,7 @@ 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)
@@ -2016,18 +2019,18 @@ 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)
@@ -2043,7 +2046,7 @@ 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
 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
@@ -2055,21 +2058,22 @@ 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
+DateLastCollectResult=Fecha del último intento de recolección
+DateLastcollectResultOk=Fecha de la última recolección con éxito
 LastResult=Último resultado
 EmailCollectorConfirmCollectTitle=Confirmación recolección e-mail
 EmailCollectorConfirmCollect=¿Desea ejecutar la recolección de este recolector ahora?
 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)
-RecordEvent=Registro de evento de email
-CreateLeadAndThirdParty=Crear lead (y tercero si es necesario)
-CreateTicketAndThirdParty=Crear ticket (y vincular a un tercero si ha sido cargado en una operación anterior)
+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)
 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 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
@@ -2078,7 +2082,7 @@ CreateCandidature=Crear solicitud de empleo
 FormatZip=Código postal
 MainMenuCode=Código de entrada del menú (menú principal)
 ECMAutoTree=Mostrar arbol automático GED
-OperationParamDesc=Defina valores para usar para la acción, o cómo extraer valores. Por ejemplo: <br> objproperty1=SET:valor a establecer<br>objproperty2=SET:un valor con reemplazo de __objproperty1__<br>objproperty3=SETIFEMPTY:valor utilizado si objproperty3 aún no está 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>Utilizar el carácter  ; como separador para extraer o configurar varias propiedades.
+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> name=EXTRACT:SUBJECT:Mensaje de la empresa([^\n] *) <br>Ejemplo para las operaciones que crean objetos: <br>objproperty1=SET: el valor a establecer <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 ; como separador para extraer o establecer varias propiedades.
 OpeningHours=Horario de apertura
 OpeningHoursDesc=Teclea el horario normal de apertura de tu compañía.
 ResourceSetup=Configuración del módulo Recursos
@@ -2121,10 +2125,10 @@ 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.
-EmailCollectorLoadThirdPartyHelp=Puede usar esta acción para utilizar el contenido del e-mail para buscar y cargar un tercero existente en su base de datos. El tercero encontrado (o creado) se utilizará para las siguientes acciones que lo necesiten. <br>Por ejemplo, si desea crear un tercero con un nombre extraído una cadena 'Nombre: nombre para encontrar' que se encuentra en el cuerpo, use el e-mail del remitente como e-mail, puede establecer el campo de esta manera: <br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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?
@@ -2209,3 +2213,10 @@ 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
 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
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 88439169b32..a03281116b3 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -32,7 +32,7 @@ RIB=Cuenta bancaria
 IBAN=Identificador IBAN
 BIC=Código BIC/SWIFT
 SwiftValid=BIC/SWIFT válido
-SwiftVNotalid=BIC/SWIFT no válido
+SwiftNotValid=BIC/SWIFT no válido
 IbanValid=BAN válido
 IbanNotValid=BAN no válido
 StandingOrders=Domiciliaciones
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Domiciliación de cuenta
 BankAccountCountry=País de la cuenta
 BankAccountOwner=Nombre del titular de la cuenta
 BankAccountOwnerAddress=Dirección del titular de la cuenta
-RIBControlError=El dígito de control indica que la información de esta cuenta bancaria es incompleta o incorrecta (compruebe el país, números e IBAN).
 CreateAccount=Crear cuenta
 NewBankAccount=Nueva cuenta
 NewFinancialAccount=Nueva cuenta financiera
@@ -109,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
@@ -174,12 +173,12 @@ 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
+NewCashFence=Nueva apertura o cierre de caja
 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
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 7e511f938de..6e50598e0f3 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=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 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=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Condición de pago
 PaymentConditions=Condiciones de pago
 PaymentConditionsShort=Condiciones de pago
@@ -192,7 +191,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=El resto a pagar <b>(%s%s)</b> es un
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El resto a pagar <b>(%s %s)</b> es un descuento otorgado por pronto pago. Acepto perder el IVA en este descuento.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=El resto a pagar <b>(%s %s)</b> es un descuento otorgado por pronto pago. Recuperaré el IVA sin usar un abono.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Cliente moroso
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
+ConfirmClassifyPaidPartiallyReasonBankCharge=Deducción por banco (comisiones bancarias intermediarias)
 ConfirmClassifyPaidPartiallyReasonProductReturned=Productos devueltos en parte
 ConfirmClassifyPaidPartiallyReasonOther=Por otra razón
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Esta elección es posible si su factura se proveyera de la mención adecuada. (Ejemplo: "descuento neto de impuestos")
@@ -200,7 +199,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=En algunos países, esta opci
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Esta elección es la elección que debe tomarse si las otras no son aplicables
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b>cliente moroso</b> es un cliente que no quiere regularizar su deuda.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Esta elección es posible si el caso de pago incompleto es a raíz de una devolución de parte de los productos
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=El monto impago es <b> comisiones bancarias intermediarias </b>, deducidas directamente del <b> monto correcto </b> pagado por el Cliente.
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Esta elección será posible, por ejemplo, en los casos siguiente:<br>-pago parcial ya que una partida de productos se ha devuleto.<br>- reclamado por no entregar productos de la factura <br>En todos los casos, la reclamación debe regularizarse mediante un abono
 ConfirmClassifyAbandonReasonOther=Otro
 ConfirmClassifyAbandonReasonOtherDesc=Esta elección será para cualquier otro caso. Por ejemplo a raíz de la intención de crear una factura rectificativa.
@@ -241,12 +240,12 @@ RemainderToTake=Resta por cobrar
 RemainderToTakeMulticurrency=Importe restante a cobrar, moneda original
 RemainderToPayBack=Resta por reembolsar
 RemainderToPayBackMulticurrency=Importe restante a reembolsar, moneda original
-NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessRefunded=negativo si se reembolsa el exceso
 Rest=Pendiente
 AmountExpected=Importe reclamado
 ExcessReceived=Recibido en exceso
 ExcessReceivedMulticurrency=Exceso recibido, moneda original
-NegativeIfExcessReceived=negative if excess received
+NegativeIfExcessReceived=negativo si se recibe exceso
 ExcessPaid=Pagado en exceso
 ExcessPaidMulticurrency=Exceso pagado, moneda original
 EscompteOffered=Descuento (Pronto pago)
@@ -280,6 +279,7 @@ SetMode=Definir tipo de pago
 SetRevenuStamp=Establecer sello fiscal
 Billed=Facturado
 RecurringInvoices=Facturas recurrentes
+RecurringInvoice=Factura recurrente
 RepeatableInvoice=Plantilla de factura
 RepeatableInvoices=Plantilla de facturas
 Repeatable=Plantilla
@@ -449,6 +449,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
@@ -604,3 +606,4 @@ SituationTotalProgress=Progreso total %d %%
 SearchUnpaidInvoicesWithDueDate=Buscar facturas impagas con una fecha de vencimiento = %s
 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
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 5ac92840a59..a147978b0d1 100644
--- a/htdocs/langs/es_ES/bookmarks.lang
+++ b/htdocs/langs/es_ES/bookmarks.lang
@@ -15,8 +15,8 @@ UrlOrLink=URL
 BehaviourOnClick=Comportamiento al hacer clic en la URL
 CreateBookmark=Crear marcador
 SetHereATitleForLink=Indicar un nombre para el marcador
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use un enlace externo/absoluto (https://URL) o un enlace interno/relativo (/DOLIBARR_ROOT/htdocs/...)
+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
-NoBookmarks=No bookmarks defined
+NoBookmarks=No hay marcadores definidos
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index c5440a5e8ae..e84430a5eca 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Identificación. profe. 1 (Registro Mercantil)
+ProfId2CM=Identificación. profe. 2 (Número de Identificación Fiscal )
+ProfId3CM=Identificación. profe. 3 (Decreto de creación)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Registro Mercantil
+ProfId2ShortCM=NIF (Número de Identificación Fiscal)
+ProfId3ShortCM=Decreto de creación
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=R.U.T.
 ProfId2CO=-
 ProfId3CO=-
@@ -271,12 +283,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
@@ -369,7 +381,7 @@ VATIntraCheck=Verificar
 VATIntraCheckDesc=El CIF Intracomunitario debe de incluir el prefijo del país. El enlace <b>%s</b> permite consultar al servicio europeo de control de números de IVA intracomunitario (VIES). Se requiere acceso a internet para que el servicio funcione.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Verificar el CIF/NIF intracomunitario en la web de la Comisión Europea
-VATIntraManualCheck=Puede también realizar una verificación manual en la web de la comisión europea <a href="%s" target="_blank">%s</a>
+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=Comprobación imposible. El servicio de comprobación no es prestado por el país país miembro (%s).
 NorProspectNorCustomer=Ni cliente, ni cliente potencial
 JuridicalStatus=Tipo de entidad comercial
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index 75f9ba5fad3..7211e872229 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -170,8 +170,9 @@ SeeReportInInputOutputMode=Consulte <b> %sanálisis de pagos%s </b> para obtener
 SeeReportInDueDebtMode=Consulte <b> %sanálisis de documentos registrados %s </b> para 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 %s </b> para obtener un informe basado en <b> Tabla de Libro Mayor </b>
 RulesAmountWithTaxIncluded=- Los importes mostrados son con todos los impuestos incluídos.
-RulesResultDue=- Incluye facturas pendientes, gastos, IVA, donaciones ya sean pagadas o no. También incluye salarios 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 definidos con el módulo Salario, se utiliza el valor de la fecha de pago.
-RulesResultInOut=- Incluye los pagos realizados sobre las facturas, las gastos y el IVA. <br>- Se basa en las fechas de pago de las facturas, gastos e IVA. La fecha de donación para las donaciones
+RulesAmountWithTaxExcluded=- Los montos de las facturas que se muestran son con todos los impuestos excluidos
+RulesResultDue=- Incluye todas las facturas, gastos, IVA, donaciones, sueldos, sean pagados o no. <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 finalización del período.
+RulesResultInOut=- Incluye los pagos reales realizados en 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 los pagos efectuados de las facturas a clientes.<br>- Se basa en la fecha de pago de las mismas<br>
 RulesCATotalSaleJournal=Incluye todas las líneas de crédito del diario de ventas.
@@ -295,3 +296,5 @@ InvoiceNotLate30Days = A cobrar(>30 días)
 InvoiceToPay=A pagar (<15 días)
 InvoiceToPay15Days=A pagar (de 15 a 30 días)
 InvoiceToPay30Days=A pagar (>30 días)
+ConfirmPreselectAccount=Preseleccionar el código de contabilidad
+ConfirmPreselectAccountQuestion=¿Está seguro de que desea preseleccionar las%s líneas seleccionadas  con este código de contabilidad?
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 bdbc23742c8..cba521d8f83 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -27,7 +27,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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Error en la recuperación del flujo RSS. Añada la cons
 ErrorForbidden=Acceso denegado.<br>Intenta acceder a una página, área o funcionalidad de un módulo desactivado o sin una sesión autenticada o no permitida a su usuario
 ErrorForbidden2=Los permisos para este usuario pueden ser asignados por el administrador Dolibarr mediante el menú %s-> %s.
 ErrorForbidden3=Dolibarr no parece funcionar en una sesión autentificada. Consulte la documentación de instalación de Dolibarr para saber cómo administrar las autenticaciones (htaccess, mod_auth u otro...).
+ErrorForbidden4=Nota: borre las cookies de su navegador para destruir las sesiones existentes para este inicio de sesión.
 ErrorNoImagickReadimage=La classe imagick_readimage no está presente en esta instalación de PHP. La reseña no está pues disponible. Los administradores pueden desactivar esta pestaña en el menú Configuración - Visualización.
 ErrorRecordAlreadyExists=Registro ya existente
 ErrorLabelAlreadyExists=Esta etiqueta ya existe
@@ -271,6 +274,9 @@ 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, request too large
 
 # 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.
@@ -312,6 +318,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..8ea50dc2eb1 100644
--- a/htdocs/langs/es_ES/eventorganization.lang
+++ b/htdocs/langs/es_ES/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categoría para agregar a terceros cre
 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
@@ -71,6 +71,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 +84,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
diff --git a/htdocs/langs/es_ES/help.lang b/htdocs/langs/es_ES/help.lang
index 8c1d9c59b6b..69b9adeff26 100644
--- a/htdocs/langs/es_ES/help.lang
+++ b/htdocs/langs/es_ES/help.lang
@@ -20,4 +20,4 @@ BackToHelpCenter=De lo contrario, <a href="%s">vuelva a la página de inicio del
 LinkToGoldMember=Puede llamar a uno de los formadores preseleccionados por Dolibarr para su idioma (%s) haciendo clic en su Widget (el estado y el precio máximo se actualizan automáticamente):
 PossibleLanguages=Idiomas disponibles
 SubscribeToFoundation=Ayude al proyecto Dolibarr, adhiérase a la asociación Dolibarr
-SeeOfficalSupport=Para obtener soporte oficial Dolibarr en su idioma: <br><b><a href="%s" target="_blank">%s</a></b>
+SeeOfficalSupport=Para soporte oficial Dolibarr en su idioma: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang
index 0871504bdb9..48fb8be6ac9 100644
--- a/htdocs/langs/es_ES/holiday.lang
+++ b/htdocs/langs/es_ES/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Descripción
 SendRequestCP=Enviar la petición de días libres
 DelayToRequestCP=Las peticiones de días libres deben realizarse al menos <b>%s días</b> antes.
 MenuConfCP=Balance de días libres
-SoldeCPUser=Su saldo de días libres es de <b>%s días</b>.
+SoldeCPUser=Balance de días libres (en dias) <b>%s</b>
 ErrorEndDateCP=Debe indicar una fecha de fin superior a la fecha de inicio.
 ErrorSQLCreateCP=Se ha producido un error de SQL durante la creación :
 ErrorIDFicheCP=Se produjo un error, esta solicitud de días libres no existe.
@@ -134,3 +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=Block if balance negative
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=The creation of this leave request is blocked because your balance is negative
+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 c268ee81281..722722a2f4d 100644
--- a/htdocs/langs/es_ES/hrm.lang
+++ b/htdocs/langs/es_ES/hrm.lang
@@ -20,13 +20,14 @@ Employee=Empleado
 NewEmployee=Nuevo empleado
 ListOfEmployees=Listado de empleados
 HrmSetup=Setup del módulo RRHH
-HRM_MAXRANK=Rango máximo para una habilidad
+SkillsManagement=Gestión de habilidades
+HRM_MAXRANK=Número máximo de niveles para clasificar una habilidad
 HRM_DEFAULT_SKILL_DESCRIPTION=Descripción predeterminada de los rangos cuando se crea la habilidad
 deplacement=Cambio
 DateEval=Fecha de evaluación
 JobCard=Ficha de trabajo
-Job=Tarea
-Jobs=Trabajos
+JobPosition=Tarea
+JobsPosition=Trabajos
 NewSkill=Nueva habilidad
 SkillType=Tipo de habilidad
 Skilldets=Lista de rangos para esta habilidad
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=¿Está seguro de que desea validar esta evaluación c
 EvaluationCard=Tarjeta de evaluación
 RequiredRank=Rango requerido para este trabajo
 EmployeeRank=Rango de empleado para esta habilidad
-Position=Posición
-Positions=Puesto
-PositionCard=Ficha puesto
+EmployeePosition=Puesto de empleado
+EmployeePositions=Puestos de empleados
 EmployeesInThisPosition=Empleados en este puesto
 group1ToCompare=Grupo de usuarios para analizar
 group2ToCompare=Segundo grupo de usuarios para comparación
diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
index 7132cd93342..3c85886b605 100644
--- a/htdocs/langs/es_ES/install.lang
+++ b/htdocs/langs/es_ES/install.lang
@@ -21,6 +21,7 @@ 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.
diff --git a/htdocs/langs/es_ES/knowledgemanagement.lang b/htdocs/langs/es_ES/knowledgemanagement.lang
index 2d8e10b380b..2c0c2c3797b 100644
--- a/htdocs/langs/es_ES/knowledgemanagement.lang
+++ b/htdocs/langs/es_ES/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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)
 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/ldap.lang b/htdocs/langs/es_ES/ldap.lang
index ac1b778b67e..24e7ec07010 100644
--- a/htdocs/langs/es_ES/ldap.lang
+++ b/htdocs/langs/es_ES/ldap.lang
@@ -25,3 +25,7 @@ ContactSynchronized=Contacto sincronizado
 ForceSynchronize=Forzar sincronización Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Error de la lectura del directorio LDAP. Comprobar la configuración del módulo LDAP y la accesibilidad del anuario.
 PasswordOfUserInLDAP=Contraseña del usuario en LDAP
+LDAPPasswordHashType=Tipo de hash de contraseña
+LDAPPasswordHashTypeExample=Tipo de hash de contraseña utilizado en el servidor
+SupportedForLDAPExportScriptOnly=Solo es compatible con un script de exportación ldap
+SupportedForLDAPImportScriptOnly=Solo es compatible con un script de importación ldap
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 1b2f082cb23..80bbe511acf 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, ningún tipo de IVA definido para e
 ErrorNoSocialContributionForSellerCountry=Error, ningún tipo de tasa social/fiscal definida para el país '%s'.
 ErrorFailedToSaveFile=Error, el registro del archivo falló.
 ErrorCannotAddThisParentWarehouse=Intenta añadir un almacén padre que ya es hijo del actual
+FieldCannotBeNegative=El campo "%s" no puede ser negativo
 MaxNbOfRecordPerPage=Nº máximo de registros por página
 NotAuthorized=No está autorizado para hacer esto.
 SetDate=Fijar fecha
@@ -87,7 +88,7 @@ FileWasNotUploaded=Un archivo ha sido seleccionado para adjuntarlo, pero aún no
 NbOfEntries=Nº de entradas
 GoToWikiHelpPage=Leer la ayuda en línea (es necesario acceso a Internet )
 GoToHelpPage=Consultar la ayuda
-DedicatedPageAvailable=Hay una página de ayuda dedicada relacionada con su pantalla actual
+DedicatedPageAvailable=Página de ayuda dedicada relacionada con su pantalla actual
 HomePage=Página de inicio
 RecordSaved=Registro guardado
 RecordDeleted=Registro eliminado
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Código de retorno de error para la última petició
 InformationLastAccessInError=Información del último error de petición de acceso de base de datos
 DolibarrHasDetectedError=Dolibarr ha detectado un error técnico
 YouCanSetOptionDolibarrMainProdToZero=Puede leer el archivo log o establecer la opción $dolibarr_main_prod a '0' en su archivo de configuración para obtener más información.
-InformationToHelpDiagnose=Esta información puede ser útil para el diagnóstico (puede configurar la opción $dolibarr_main_prod to '1' para eliminar estas notificaciones)
+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)
 MoreInformation=Más información
 TechnicalInformation=Información técnica
 TechnicalID=ID Técnica
@@ -211,6 +212,8 @@ User=Usuario
 Users=Usuarios
 Group=Grupo
 Groups=Grupos
+UserGroup=Grupo de usuario
+UserGroups=Grupos de Usuarios
 NoUserGroupDefined=No hay definido grupo de usuarios
 Password=Contraseña
 PasswordRetype=Repetir contraseña
@@ -362,7 +365,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
@@ -390,7 +393,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
@@ -794,7 +797,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
@@ -804,7 +807,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
@@ -848,7 +851,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
@@ -906,7 +909,7 @@ ViewFlatList=Ver lista plana
 ViewAccountList=Ver libro mayor
 ViewSubAccountList=Ver libro mayor de subcuenta
 RemoveString=Eliminar cadena '%s'
-SomeTranslationAreUncomplete=Algunos de los idiomas ofrecidos pueden estar parcialmente traducidos o pueden contener errores. Si detecta algunos, puede corregir los archivos de idiomas registrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Algunos de los idiomas ofrecidos pueden estar solo parcialmente traducidos o pueden contener errores. Ayude a corregir su idioma registrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/ </a> para agregar sus mejoras.
 DirectDownloadLink=Enlace de descarga público
 PublicDownloadLinkDesc=Solo se requiere el enlace para descargar el archivo
 DirectDownloadInternalLink=Enlace de descarga privado
@@ -1128,34 +1131,36 @@ 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)
 NotClosedYet=Aún no cerrado
 ClearSignature=Restablecer firma
+CanceledHidden=Ocultar cancelado
+CanceledShown=Mostrar cancelado
diff --git a/htdocs/langs/es_ES/modulebuilder.lang b/htdocs/langs/es_ES/modulebuilder.lang
index b328a80b4e0..b88b64d930d 100644
--- a/htdocs/langs/es_ES/modulebuilder.lang
+++ b/htdocs/langs/es_ES/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Esta herramienta debe ser usada por usuarios experimentados o desarrolladores. Te facilitará utilidades para construir o editar tu propio módulo (Documentación para un manual alternativo de desarrollo <a href="%s" target="_blank">aquí</a>).
+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.
 ModuleBuilderDesc2=Ruta donde los módulos son generados/editados (primer directorio para módulos externos definido en %s): <strong>%s</strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Los menús proporcionados por su módulo/aplicación se defi
 DictionariesDefDescTooltip=Los diccionarios proporcionados por su módulo / aplicación se definen en la matriz <strong>$this->diccionarios</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 manualmente este archivo o utilizar el editor incrustado. <br><br> Nota: Una vez definidos (y el módulo se haya reactivado), los permisos serán 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 hooks que desea administrar (puede encontrar la lista de contextos mediante una búsqueda de '<b>initHooks(</b>'  en el código del core). <br>Edite el archivo hook para agregar el código de sus funciones (las funciones se pueden encontrar mediante una búsqueda de  '<b>executeHooks</b>' en el código del 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 recorded by other modules).
+TriggerDefDesc=Defina en el archivo de activación el código que desea ejecutar cuando se ejecuta un evento comercial externo a su módulo (eventos activados por otros módulos).
 SeeIDsInUse=Ver IDs en uso en su instalación
 SeeReservedIDsRangeHere=Ver rango de IDs reservados
 ToolkitForDevelopers=Herramientas para desarrolladores de Dolibarr
diff --git a/htdocs/langs/es_ES/mrp.lang b/htdocs/langs/es_ES/mrp.lang
index 2ef74f6e4d6..030da32d5aa 100644
--- a/htdocs/langs/es_ES/mrp.lang
+++ b/htdocs/langs/es_ES/mrp.lang
@@ -104,6 +104,6 @@ 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
diff --git a/htdocs/langs/es_ES/oauth.lang b/htdocs/langs/es_ES/oauth.lang
index 25a8309d0da..5ab2c5d0e02 100644
--- a/htdocs/langs/es_ES/oauth.lang
+++ b/htdocs/langs/es_ES/oauth.lang
@@ -23,10 +23,10 @@ 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">esta página</a> y a "Credenciales" para crear credenciales 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 "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">esta página</a> y a  "Register a new application" para crear crecenciales 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 "Registrar una nueva aplicación" para crear credenciales de OAuth.
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index 574e68e0e79..7d9c4356d72 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -35,9 +35,9 @@ OnlyOneFieldForXAxisIsPossible=Actualmente solo es posible 1 campo como X-Axis.
 AtLeastOneMeasureIsRequired=Se requiere al menos 1 campo para medir
 AtLeastOneXAxisIsRequired=Se requiere al menos 1 campo para el eje X
 LatestBlogPosts=Últimas publicaciones de blog
-notiftouser=To users
-notiftofixedemail=To fixed mail
-notiftouserandtofixedemail=To user and fixed mail
+notiftouser=A los usuarios
+notiftofixedemail=Al correo fijo
+notiftouserandtofixedemail=Al usuario y correo fijo
 Notify_ORDER_VALIDATE=Validación pedido de cliente
 Notify_ORDER_SENTBYMAIL=Envío pedido de cliente por e-mail
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Envío pedido a proveedor por e-mail
@@ -258,6 +258,10 @@ PassEncoding=Cifrado de contraseña
 PermissionsAdd=Permisos añadidos
 PermissionsDelete=Permisos eliminados
 YourPasswordMustHaveAtLeastXChars=Su contraseña debe contener 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=Su contraseña ha sido restablecida con éxito
 ApplicantIpAddress=Dirección IP del solicitante
 SMSSentTo=SMS enviado a %s
@@ -268,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
diff --git a/htdocs/langs/es_ES/partnership.lang b/htdocs/langs/es_ES/partnership.lang
index 97b9341d1b0..14359e6c6ac 100644
--- a/htdocs/langs/es_ES/partnership.lang
+++ b/htdocs/langs/es_ES/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Gestión Asociaciones
 PartnershipDescription=Gestión Módulo Asociaciones
 PartnershipDescriptionLong= Gestión Módulo Asociaciones
-
+Partnership=Partner
 AddPartnership=Agregar asociación
 CancelPartnershipForExpiredMembers=Asociación: cancelar la asociación de miembros con suscripciones caducadas
 PartnershipCheckBacklink=Asociación: compruebe el vínculo de retroceso de referencia
@@ -58,7 +58,7 @@ ManagePartnership=Gestionar la asociación
 BacklinkNotFoundOnPartnerWebsite=Vínculo de retroceso no encontrado en el sitio web del socio
 ConfirmClosePartnershipAsk=¿Está seguro de que desea cancelar esta asociación?
 PartnershipType=Tipo de asociación
-PartnershipRefApproved=Partnership %s approved
+PartnershipRefApproved=Asociación %s aprobada
 
 #
 # Template Mail
diff --git a/htdocs/langs/es_ES/paybox.lang b/htdocs/langs/es_ES/paybox.lang
index d4a72e21845..098cd937aa6 100644
--- a/htdocs/langs/es_ES/paybox.lang
+++ b/htdocs/langs/es_ES/paybox.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=Configuración módulo PayBox
-PayBoxDesc=Este módulo ofrece una página  de pago a través del proveedor <a href="http://www.paybox.com" target="_blank">Paybox</a> para realizar cualquier pago o un pago en relación con un objeto Dolibarr (facturas, pedidos ...)
+PayBoxDesc=Este módulo ofrece páginas para permitir el pago en <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external"> Paybox </a> por parte de los clientes. Esto se puede utilizar para un pago gratuito o para un pago en un objeto Dolibarr en particular (factura, pedido, ...)
 FollowingUrlAreAvailableToMakePayments=Las siguientes URL están disponibles para permitir a un cliente efectuar un pago
 PaymentForm=Formulario de pago
 WelcomeOnPaymentPage=Bienvenido a nuestros servicios de pago en línea
@@ -20,7 +20,6 @@ AccountParameter=Parámetros de la cuenta
 UsageParameter=Parámetros de uso
 InformationToFindParameters=Información para encontrar a su configuración de cuenta %s
 PAYBOX_CGI_URL_V2=Url del módulo CGI Paybox de pago
-VendorName=Nombre del vendedor
 CSSUrlForPaymentForm=Url de la hoja de estilo CSS para el formulario de pago
 NewPayboxPaymentReceived=Nuevo pago Paybox recibido
 NewPayboxPaymentFailed=Nuevo intento de pago Paybox sin éxito
diff --git a/htdocs/langs/es_ES/paypal.lang b/htdocs/langs/es_ES/paypal.lang
index ab095badeb4..fe9b97d6a19 100644
--- a/htdocs/langs/es_ES/paypal.lang
+++ b/htdocs/langs/es_ES/paypal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Configuración del módulo PayPal
-PaypalDesc=Este módulo ofrece una página  de pago a través del proveedor <a href="http://www.paypal.com" target="_blank">Paypal</a> para realizar cualquier pago o un pago en relación con un objeto Dolibarr (facturas, pedidos ...)
+PaypalDesc=Este módulo permite el pago por parte de los clientes a través de <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPal </a>. Esto se puede utilizar para un pago ad-hoc o para un pago relacionado con un objeto Dolibarr (factura, pedido, ...)
 PaypalOrCBDoPayment=Pagar con Paypal (tarjeta de crédito o Paypal)
 PaypalDoPayment=Continuar el pago mediante Paypal
 PAYPAL_API_SANDBOX=Modo de pruebas (sandbox)
diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
index 7b0ff929385..a6281edf01a 100644
--- a/htdocs/langs/es_ES/productbatch.lang
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -30,7 +30,7 @@ ManageLotMask=Máscara personalizada
 CustomMasks=Opción para definir una máscara de numeración diferente para cada producto
 BatchLotNumberingModules=Regla de numeración para la generación automática de número de lote
 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 agregar para cada código de barras / lote / serie escaneado
+QtyToAddAfterBarcodeScan=Cantidad a %s para cada código de barras/lote/serie escaneado
 LifeTime=Vida útil (en días)
 EndOfLife=Fin de vida
 ManufacturingDate=Fecha de fabricación
@@ -42,3 +42,4 @@ HideLots=Ocultar lotes
 #Traceability - qc status
 OutOfOrder=Fuera de servicio
 InWorkingOrder=En orden de trabajo
+ToReplace=Reemplazar
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 7ed5d5b3a3d..c11249bb2cf 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Cantidad a utilizar para actualizar el Precio Medio Ponder
 PMPValue=Valor (PMP)
 PMPValueShort=PMP
 mandatoryperiod=Periodos obligatorios
-mandatoryPeriodNeedTobeSet=Períodos de atención no ingresados y obligatorios
+mandatoryPeriodNeedTobeSet=Nota: Se debe definir el período (fecha de inicio y finalización)
 mandatoryPeriodNeedTobeSetMsgValidate=Un servicio requiere un período de inicio y finalización
-mandatoryHelper=Mensaje al usuario sobre la necesidad de ingresar una fecha de inicio y una fecha de finalización en un servicio al crear / validar una factura, propuesta comercial, orden de venta. <br> Esta acción no bloquea el proceso de confirmació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.
 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
+SwitchOnSaleStatus=Cambiar estado de oferta
+SwitchOnPurchaseStatus=Activar el estado de la compra
+StockMouvementExtraFields= Campos adicionales (movimientos de stock)
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 54d9951485b..891363b0885 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -197,6 +197,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,3 +285,5 @@ 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
diff --git a/htdocs/langs/es_ES/receptions.lang b/htdocs/langs/es_ES/receptions.lang
index 8f51de5828e..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
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Recepciones y recibos de este pedido.
 ReceptionsToValidate=Recepciones a validar
 StatusReceptionCanceled=Anulado
 StatusReceptionDraft=Borrador
-StatusReceptionValidated=Validado (productos a enviar o enviados)
+StatusReceptionValidated=Validado (productos a recibir o ya recibidos)
+StatusReceptionValidatedToReceive=Validado (productos a recibir)
+StatusReceptionValidatedReceived=Validado (productos recibidos)
 StatusReceptionProcessed=Procesados
 StatusReceptionDraftShort=Borrador
 StatusReceptionValidatedShort=Validado
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Estadísticas realizadas únicamente sobre las re
 SendReceptionByEMail=Enviar recepción por e-mail
 SendReceptionRef=Envío de la recepción %s
 ActionsOnReception=Eventos sobre la recepción
-ReceptionCreationIsDoneFromOrder=De momento, la creación de una nueva recepción se realiza desde la fecha de pedido
+ReceptionCreationIsDoneFromOrder=Por el momento, la creación de una nueva recepción se realiza a partir de la Orden de Compra.
 ReceptionLine=Línea de recepción
 ProductQtyInReceptionAlreadySent=Ya ha sido enviada la cantidad del producto del pedido abierto
 ProductQtyInSuppliersReceptionAlreadyRecevied=Cantidad en pedidos a proveedores ya recibidos
@@ -46,3 +49,6 @@ ReceptionsReceiptModel=Modelos de documentos para recepciones.
 NoMorePredefinedProductToDispatch=No hay más productos predefinidos para enviar
 ReceptionExist=Existe una recepción
 ByingPrice=Precio de compra
+ReceptionBackToDraftInDolibarr=Recepción %s volver al borrador
+ReceptionClassifyClosedInDolibarr=Recepción %s clasificado Cerrado
+ReceptionUnClassifyCloseddInDolibarr=Recepción %s Reabrir
diff --git a/htdocs/langs/es_ES/salaries.lang b/htdocs/langs/es_ES/salaries.lang
index 469abb47e18..7e90e136877 100644
--- a/htdocs/langs/es_ES/salaries.lang
+++ b/htdocs/langs/es_ES/salaries.lang
@@ -6,7 +6,7 @@ CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=De forma predeterminada, deje vacía la o
 Salary=Salario
 Salaries=Salarios
 NewSalary=Nuevo salario
-AddSalary=Add salary
+AddSalary=Agregar salario
 NewSalaryPayment=Nueva tarjeta de salario
 AddSalaryPayment=Añadir pago de salario
 SalaryPayment=Pago de salario
@@ -24,3 +24,4 @@ SalariesStatistics=Estadísticas salariales
 SalariesAndPayments=Salarios y pagos
 ConfirmDeleteSalaryPayment=¿Está seguro de querer eliminar este pago de salario?
 FillFieldFirst=Primero rellene el campo de empleado
+UpdateAmountWithLastSalary=Fijar monto con último salario
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index b31b4014b24..e6b8c861172 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -63,7 +63,7 @@ RuleForWarehouse=Regla para almacenes
 WarehouseAskWarehouseOnThirparty=Establecer un almacén en terceros
 WarehouseAskWarehouseDuringPropal=Establecer un almacén en presupuestos comerciales
 WarehouseAskWarehouseDuringOrder=Indicar un almacén en pedidos de clientes
-WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
+WarehouseAskWarehouseDuringProject=Establecer un almacén en proyectos
 UserDefaultWarehouse=Indicar un almacén en usuarios
 MainDefaultWarehouse=Almacén por defecto
 MainDefaultWarehouseUser=Usar un almacén predeterminado para cada usuario
@@ -96,7 +96,7 @@ RealStock=Stock real
 RealStockDesc=El stock físico o real es la stock que tiene actualmente en sus almacenes.
 RealStockWillAutomaticallyWhen=El stock real cambiará automáticamente de acuerdo con esta regla (según configuración del módulo de stock):
 VirtualStock=Stock virtual
-VirtualStockAtDate=Virtual stock at a future date
+VirtualStockAtDate=Stock virtual en una fecha futura
 VirtualStockAtDateDesc=Stock virtual una vez finalizados todos los pedidos pendientes que están previstos para ser procesados antes de la fecha elegida
 VirtualStockDesc=El stock virtual es el stock que obtendrá una vez que todas las acciones abiertas/pendientes (que afecten al stock) serán cerradas (pedidos a proveedor del proveedor recibidos, pedidos de clientes enviados, ...)
 AtDate=En la fecha
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Límite stock para alertas y stock óptimo deseado
 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
 InventoryDate=Fecha inventario
+Inventories=Inventarios
 NewInventory=Nuevo inventario
 inventorySetup = Configuración inventario
 inventoryCreatePermission=Crear nuevo inventario
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Los movimientos de stock tendrán l
 inventoryChangePMPPermission=Permitir cambiar el PMP de un producto
 ColumnNewPMP=Nueva unidad PMP
 OnlyProdsInStock=No añadir producto sin stock
-TheoricalQty=Cant. teórica
-TheoricalValue=Cant. teórica
+TheoricalQty=Cantidad teórica
+TheoricalValue=Cantidad teórica
 LastPA=Último BP
 CurrentPA=BP actual
 RecordedQty=Cantidad registrada
@@ -240,7 +241,7 @@ StockAtDatePastDesc=Puede ver aquí el stock (stock real) en una fecha determina
 StockAtDateFutureDesc=Puede ver aquí el stock (stock virtual) en una fecha determinada en el futuro
 CurrentStock=Stock actual
 InventoryRealQtyHelp=Establezca el valor en 0 para restablecer la cantidad <br> Mantenga el campo vacío o elimine la línea para mantenerlo sin cambios
-UpdateByScaning=Llene la cantidad real escaneando
+UpdateByScaning=Cantidad real completa escaneando
 UpdateByScaningProductBarcode=Actualización por escaneo (código de barras del producto)
 UpdateByScaningLot=Actualización por escaneo (lote | código de barras de serie)
 DisableStockChangeOfSubProduct=Desactive el cambio de stock de todos los subproductos de este Kit durante este movimiento.
@@ -253,14 +254,20 @@ 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=Llene la cantidad real con la cantidad esperada
+AutofillWithExpected=Reemplazar 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
-FieldCannotBeNegative=El campo "%s" no puede ser negativo
 ErrorWrongBarcodemode=Modo de código de barras desconocido
 ProductDoesNotExist=El producto no existe
-ErrorSameBatchNumber=Se encontró el mismo número de lote en la lista de inventario
+ErrorSameBatchNumber=Se encontraron varios registros para el número de lote en la hoja de inventario. No hay forma de saber cuál aumentar.
 ProductBatchDoesNotExist=El producto con lote/serie no existe
 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.
+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
diff --git a/htdocs/langs/es_ES/stripe.lang b/htdocs/langs/es_ES/stripe.lang
index cf8d22d6a15..a3967805873 100644
--- a/htdocs/langs/es_ES/stripe.lang
+++ b/htdocs/langs/es_ES/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Configuración del módulo Stripe
-StripeDesc=Este módulo le ofrece páginas para permitir el pago a clientes mediante <a href="http://www.stripe.com" target="_blank">Stripe</a>. Puede usarse para un pago libre o para un pago de un objeto en concreto de Dolibarr (factura, pedido...)
+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 para pagos relacionados con un objeto Dolibarr en particular (factura, pedido, ...)
 StripeOrCBDoPayment=Pagar con tarjeta de crédito o Stripe
 FollowingUrlAreAvailableToMakePayments=Las siguientes URL están disponibles para permitir a un cliente efectuar un pago
 PaymentForm=Formulario de pago
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index b8d6f149b3f..f2c80e1f5db 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -45,7 +45,7 @@ ViewWebsiteInProduction=Ver sitio web usando la URL de inicio
 SetHereVirtualHost= <u>Usar con Apache/NGinx /...</u><br>Crea en su servidor web (Apache, Nginx, ...) de un host virtual dedicado con PHP habilitado y un directorio raíz en <br> <strong> %s </strong>
 ExampleToUseInApacheVirtualHostConfig=Ejemplo para usar en la configuración del host virtual Apache:
 YouCanAlsoTestWithPHPS=En el entorno de desarrollo, es posible que prefiera probar el sitio con el servidor web incrustado de PHP (se requiere PHP 5.5) ejecutando <br><strong> php -S 0.0.0.0:8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>Ejecute su sitio web con otro proveedor de alojamiento Dolibarr</u> <br> Si no tiene un servidor web como Apache o NGinx disponible en Internet, puede exportar e importar su sitio web a otra instancia de Dolibarr proporcionada por otro proveedor de alojamiento de Dolibarr que brinde una integración completa con el módulo del sitio web. Puede encontrar una lista de algunos proveedores de hosting Dolibarr en <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+YouCanAlsoDeployToAnotherWHP= <u>Ejecute su sitio web con otro proveedor de alojamiento Dolibarr</u> <br>Si no tiene un servidor web como Apache o NGinx disponible en Internet, puede exportar e importar su sitio web a otra instancia de Dolibarr proporcionada por otro proveedor de alojamiento Dolibarr que proporcione integración con el módulo de sitio web. Puede encontrar una lista de algunos proveedores de alojamiento Dolibarr en <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Compruebe también que el usuario del host virtual (por ejemplo, www-data) tiene <strong>%s</strong>permisos en archivos en <br><strong>%s</strong>
 ReadPerm=Leido
 WritePerm=Escribir
@@ -60,7 +60,7 @@ YouCanEditHtmlSourceckeditor=Puede editar código fuente HTML utilizando el bot
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Puede incluir código PHP en este fuente usando los tags <strong>&lt;?php ?&gt;</strong>. Dispone de estas variables globales: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> También puede incluir contenido de otra Página/Contenedor con la siguiente sintaxis:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-download"></span> Para incluir un <strong>enlace para descargar</strong> un archivo guardado en el directorio <strong>documents</strong>, use el wrapper <strong>document.php</strong> :<br>Por ejemplo, para un archivo de documents/ecm (es necesario estar logueado), la sintaxis:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Para un archivo de into documents/medias (directorio abierto para acceso público), la sintaxis es:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Para un archivo compartido mediante un enlace compartido (acceso abierto utilizando la clave hash para compartir del archivo), la sintaxis es:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> Para incluir una <strong>imagen</strong> guardada en el directorio <strong>documents</strong> , use el wrapper <strong>viewimage.php</strong> :<br>Ejemplo para una imagen de documents/medias (acceso abierto), la sintaxis es:<br><strong>&lt;a href="/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 una imagen compartida con un enlace para compartir (acceso abierto usando la clave hash para compartir del archivo), la sintaxis es: <br><strong> &lt;img src="/viewimage.php? Hashp=12345679012 ..."&gt;</strong><br>
-YouCanEditHtmlSourceMore= <br>Más ejemplos de código HTML o dinámico disponibles en <a href="%s" target="_blank">la documentación wiki </a><br>.
+YouCanEditHtmlSourceMore= <br>Más ejemplos de código HTML o dinámico disponibles en <a href="%s" target="_blank" rel="noopener noreferrer external">la documentación wiki</a><br>.
 ClonePage=Clonar página/contenedor
 CloneSite=Clonar sitio
 SiteAdded=Sitio web agregado
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index 3e38caed3fa..5352e73d433 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Orden de transferencia bancaria
 LatestBankTransferReceipts=Últimas %s órdenes de transferencia bancaria 
 LastWithdrawalReceipts=Últimas %s domiciliaciones
 WithdrawalsLine=Línea de  domiciliación bancaria
+CreditTransfer=Transferencia bancaria
 CreditTransferLine=Línea de transferencia bancaria
 WithdrawalsLines=Lineas de domiciliación
 CreditTransferLines=Líneas de transferencia bancaria
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Código banco del tercero
 NoInvoiceCouldBeWithdrawed=No se ha podido realizar la petición de domiciliación de ninguna factura. Compruebe que los terceros de las facturas relacionadas tienen una cuenta  IBAN válida y dicho IBAN tiene un RUM con modo <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=Este recibo de retiro ya está marcado como acreditado; esto no se puede hacer dos veces, ya que esto podría generar pagos y entradas bancarias duplicados.
 ClassCredited=Clasificar como "Abonada"
+ClassDebited=Clasificar debitado
 ClassCreditedConfirm=¿Está seguro de querer clasificar esta domiciliación como abonada en su cuenta bancaria?
 TransData=Fecha envío
 TransMetod=Método envío
@@ -80,7 +82,7 @@ StatusMotif7=Decisión judicial
 StatusMotif8=Otro motivo
 CreateForSepaFRST=Domiciliar (SEPA FRST)
 CreateForSepaRCUR=Domiciliar (SEPA RCUR)
-CreateAll=Domiciliar todas
+CreateAll=Crear archivo SEPA
 CreateFileForPaymentByBankTransfer=Crear archivo para transferencia bancaria
 CreateSepaFileForPaymentByBankTransfer=Crear archivo de transferencia bancaria (SEPA)
 CreateGuichet=Sólo oficina
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=No es posible crear una domiciliación sin importe
 SepaMandate=Mandato SEPA
 SepaMandateShort=Mandato SEPA
 PleaseReturnMandate=Devuelva este formulario de mandato por e-mail a %s o por correo a
-SEPALegalText=Al firmar este mandato, autoriza (A) %s a enviar instrucciones a su banco para cargar en su cuenta y (B) a su banco para cargar en su cuenta de acuerdo con las instrucciones de %s. Como parte de sus derechos, tiene derecho a una devolución en los términos y condiciones de su contrato con su banco. Una devolución debe reclamarse dentro de 8 semanas a partir de la fecha en que se hizo el cargo a su cuenta. Sus derechos con respecto al mandato anterior se explican en un comunicado que se puede obtener de su banco.
+SEPALegalText=Al firmar este formulario de mandato, usted autoriza a (A) %s a enviar instrucciones a su banco para debitar su cuenta y (B) a su banco para debitar 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 Acreedor
 CreditorName=Nombre acreedor
 SEPAFillForm=(B) Rellene todos los campos marcados c *
@@ -150,3 +152,5 @@ ModeWarning=No se ha establecido la opción de modo real, nos detendremos despu
 ErrorCompanyHasDuplicateDefaultBAN=La empresa con id %s tiene más de una cuenta bancaria predeterminada. No hay forma de saber cuál usar.
 ErrorICSmissing=Falta ICS en la cuenta bancaria %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=El monto total de la orden de domiciliación bancaria difiere de la suma de líneas
+WarningSomeDirectDebitOrdersAlreadyExists=Advertencia: ya hay algunas órdenes de domiciliación bancaria pendientes (%s) solicitadas por un monto de %s
+WarningSomeCreditTransferAlreadyExists=Advertencia: ya hay una transferencia de crédito pendiente (%s) solicitada por un monto de %s
diff --git a/htdocs/langs/es_ES/workflow.lang b/htdocs/langs/es_ES/workflow.lang
index 268b514254d..43c8d1d5241 100644
--- a/htdocs/langs/es_ES/workflow.lang
+++ b/htdocs/langs/es_ES/workflow.lang
@@ -14,9 +14,13 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificar pedido de cliente o
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasificar pedido de cliente origen como facturado cuando la factura a cliente sea marcada como pagada (y si el importe de la factura es la misma que el importe del pedido relacionado)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificar automáticamente el pedido origen como enviado cuando el envío se valide (y si la cantidad enviada por todos los envíos sea la misma que el pedido)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Clasificar el pedido de venta de origen vinculado como enviado cuando se cierra un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
-# Autoclassify purchase order
+# Autoclassify purchase proposal
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasificar automáticamente el presupuestos de proveedor como facturado cuando la factura se valide (y si el importe de la factura sea la misma que el total del presupuesto)
+# Autoclassify purchase order
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasificar automáticamente el pedido a proveedor como facturado cuando la factura se valide (y si el importe de la factura sea la misma que el total del pedido enlazado)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Clasifique la orden de compra de fuente vinculada como recibida cuando se valida una recepción (y si la cantidad recibida por todas las recepciones es la misma que en la orden de compra para actualizar)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Clasifique la orden de compra de fuente vinculada como recibida cuando una recepción está cerrada (y si la cantidad recibida por todas las recepciones es la misma que en la orden de compra para actualizar)
+# Autoclassify purchase invoice
 descWORKFLOW_BILL_ON_RECEPTION=Clasificar las recepciones como "facturadas" cuando se valida un pedido de proveedor vinculado
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Cerrar todas las intervenciones vinculadas al ticket cuando se cierra un ticket
diff --git a/htdocs/langs/es_GT/accountancy.lang b/htdocs/langs/es_GT/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/es_GT/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/es_GT/admin.lang b/htdocs/langs/es_GT/admin.lang
index 58a42ff6b8e..c5ab56cb8d8 100644
--- a/htdocs/langs/es_GT/admin.lang
+++ b/htdocs/langs/es_GT/admin.lang
@@ -1,15 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/es_GT/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/es_GT/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/es_GT/companies.lang b/htdocs/langs/es_GT/companies.lang
new file mode 100644
index 00000000000..40b5f885e43
--- /dev/null
+++ b/htdocs/langs/es_GT/companies.lang
@@ -0,0 +1,7 @@
+# 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
diff --git a/htdocs/langs/es_GT/compta.lang b/htdocs/langs/es_GT/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/es_GT/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/es_GT/errors.lang b/htdocs/langs/es_GT/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/es_GT/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/es_GT/eventorganization.lang b/htdocs/langs/es_GT/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/es_GT/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/es_GT/members.lang b/htdocs/langs/es_GT/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/es_GT/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/es_GT/mrp.lang b/htdocs/langs/es_GT/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/es_GT/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/es_GT/orders.lang b/htdocs/langs/es_GT/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/es_GT/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/es_GT/printing.lang b/htdocs/langs/es_GT/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/es_GT/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/es_GT/products.lang b/htdocs/langs/es_GT/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/es_GT/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/es_GT/propal.lang b/htdocs/langs/es_GT/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/es_GT/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/es_GT/receptions.lang b/htdocs/langs/es_GT/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/es_GT/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_GT/sendings.lang b/htdocs/langs/es_GT/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/es_GT/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/es_GT/stocks.lang b/htdocs/langs/es_GT/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/es_GT/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/es_HN/accountancy.lang b/htdocs/langs/es_HN/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/es_HN/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/es_HN/admin.lang b/htdocs/langs/es_HN/admin.lang
index 58a42ff6b8e..c5ab56cb8d8 100644
--- a/htdocs/langs/es_HN/admin.lang
+++ b/htdocs/langs/es_HN/admin.lang
@@ -1,15 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/es_HN/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/es_HN/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/es_HN/companies.lang b/htdocs/langs/es_HN/companies.lang
new file mode 100644
index 00000000000..40b5f885e43
--- /dev/null
+++ b/htdocs/langs/es_HN/companies.lang
@@ -0,0 +1,7 @@
+# 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
diff --git a/htdocs/langs/es_HN/compta.lang b/htdocs/langs/es_HN/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/es_HN/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/es_HN/errors.lang b/htdocs/langs/es_HN/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/es_HN/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/es_HN/eventorganization.lang b/htdocs/langs/es_HN/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/es_HN/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/es_HN/members.lang b/htdocs/langs/es_HN/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/es_HN/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/es_HN/mrp.lang b/htdocs/langs/es_HN/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/es_HN/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/es_HN/orders.lang b/htdocs/langs/es_HN/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/es_HN/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/es_HN/printing.lang b/htdocs/langs/es_HN/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/es_HN/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/es_HN/products.lang b/htdocs/langs/es_HN/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/es_HN/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/es_HN/propal.lang b/htdocs/langs/es_HN/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/es_HN/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/es_HN/receptions.lang b/htdocs/langs/es_HN/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/es_HN/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_HN/sendings.lang b/htdocs/langs/es_HN/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/es_HN/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/es_HN/stocks.lang b/htdocs/langs/es_HN/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/es_HN/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index 7af5a1653b9..1ae2423f16f 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -121,8 +121,6 @@ AccountingJournal=Diario de contabilidad
 AccountingJournalType5=Informe de gastos
 AccountingJournalType9=Tiene nuevo
 ErrorAccountingJournalIsAlreadyUse=Este diario ya está en uso
-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)
 ExportDraftJournal=Exportar borrador de diario
 SomeMandatoryStepsOfSetupWereNotDone=Algunos pasos obligatorios de la instalación no se realizaron, favor de completar
 ExportNotSupported=El formato de exportación configurado no se admite en esta página
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index b6486277a3c..504bddb9753 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
@@ -185,8 +185,6 @@ OfficialDemo=Dolibarr demo en línea
 OfficialMarketPlace=Tienda oficial para módulos / complementos
 OfficialWebHostingService=Servicios de alojamiento web referenciados (alojamiento en la nube)
 SocialNetworks=Redes Sociales
-ForDocumentationSeeWiki=Para la documentación del usuario o desarrollador (Doc, Preguntas frecuentes ...), <br> Echa un vistazo a la Wiki Dolibarr: <br> <b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Para cualquier otra pregunta o ayuda, puede usar el foro Dolibarr: <br> <b><a href="%s" target="_blank">%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> .
 CurrentMenuHandler=Administrador de menú actual
@@ -227,8 +225,6 @@ ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, no se puede usar la opci
 UMask=Parámetro UMask para archivos nuevos en el sistema de archivos Unix / Linux / BSD / Mac.
 UMaskExplanation=Este parámetro le permite definir permisos establecidos por defecto 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> Este parámetro es inútil en un servidor de Windows.
 SeeWikiForAllTeam=Eche un vistazo a la página Wiki para obtener una lista de colaboradores y su organización.
-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>"
 MinLength=Longitud mínima
 HideDescOnPDF=Ocultar descripción de productos
 String=Cadena
@@ -249,20 +245,15 @@ WarningSettingSortOrder=Advertencia, establecer un orden predeterminado puede re
 Module20Name=Propuestas
 Module30Name=Facturas
 Module40Name=Vendedores
+Module56Name=Pago por transferencia de crédito
 Module610Name=Variantes de producto
 Module3400Name=Redes Sociales
 Module10000Name=Páginas web
-DictionaryOrderMethods=Order methods
 DictionaryAccountancyJournal=Diarios de contabilidad
 DictionarySocialNetworks=Redes Sociales
 Upgrade=Actualizar
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
 LDAPServerUseTLS=Usar TLS
 LDAPFieldFirstName=Nombre(s)
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
 Buy=Comprar
 Sell=Vender
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en la vista de agenda
@@ -280,14 +271,12 @@ MailToSendSupplierInvoice=Facturas de proveedor
 AllPublishers=Todos los editores
 AddMenus=Añadir menús
 AddPermissions=Añadir permisos
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 CodeLastResult=Último código de resultado
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
+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>
 ShowProjectLabel=Etiqueta de proyecto
 TemplateAdded=Plantilla agregada
 MailToSendEventOrganization=Organización de Eventos
-ARestrictedPath=Some restricted path
 ModuleUpdateAvailable=Una actualización está disponible
 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_MX/banks.lang b/htdocs/langs/es_MX/banks.lang
index c8862b7df06..9e8d4a7f291 100644
--- a/htdocs/langs/es_MX/banks.lang
+++ b/htdocs/langs/es_MX/banks.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - banks
+MenuBankCash=Bancos | Dinero en efectivo
+MenuVariousPayment=Varios pagos
 BankAccount=Cuenta de banco
 BankAccounts=Cuentas de banco
 AccountRef=Ref de la cuenta financiera
@@ -12,11 +14,18 @@ ShowAllTimeBalance=Mostrar saldo desde el principio
 AllTime=Desde el principio
 Reconciliation=Reconciliación
 RIB=Número de cuenta bancaria
+SwiftValid=BIC / SWIFT válido
+SwiftNotValid=BIC / SWIFT no válido
+StandingOrders=Órdenes de domiciliación bancaria
+PaymentByDirectDebit=Pago por domiciliación bancaria
+PaymentByBankTransfers=Pagos por transferencia de crédito
+PaymentByBankTransfer=Pago por transferencia de crédito
 AccountStatement=Estado de cuenta
 AccountStatementShort=Estado
 AccountStatements=Estados de cuenta
 LastAccountStatements=Últimos estados de cuenta
 IOMonthlyReporting=Reporte mensual
+BankAccountDomiciliation=Dirección del banco
 MenuNewFinancialAccount=Nueva cuenta financiera
 EditFinancialAccount=Editar cuenta
 LabelBankCashAccount=Etiqueta de cuenta o caja
@@ -33,10 +42,13 @@ RemoveFromRubriqueConfirm=¿Seguro que deseas eliminar el vínculo entre la tran
 ListBankTransactions=Listado de transacciones
 IdTransaction=ID de transacción
 BankTransactions=Transacciones bancarias
+BankTransaction=Entrada bancaria
 ListTransactions=Listar entradas
 ListTransactionsByCategory=Listar entradas / categoría
 TransactionsToConciliate=Entradas para conciliar
+TransactionsToConciliateShort=para reconciliar
 Conciliable=Puede ser conciliado
+SaveStatementOnly=Guardar solo estado de cuenta
 OnlyOpenedAccount=Sólo las cuentas abiertas
 DisableConciliation=Desactivar función de conciliación para esta cuenta
 ConciliationDisabled=Característica conciliación deshabilitada
@@ -60,6 +72,7 @@ PaymentNumberUpdateSucceeded=Número de pago actualizado con éxito
 PaymentNumberUpdateFailed=Número de pago no se pudo actualizar
 PaymentDateUpdateSucceeded=Fecha de pago actualizada con éxito
 PaymentDateUpdateFailed=La fecha de pago no se pudo actualizar
+BankTransactionLine=Entrada bancaria
 ShowAllAccounts=Mostrar todas las cuentas
 InputReceiptNumber=Seleccione el estado de cuenta bancaria relacionado con la conciliación. Utilice un valor numérico ordenable: AAAAMM o AAAAMMDD
 EventualyAddCategory=Eventualmente, especifique una categoría en la que clasificar los registros
@@ -67,3 +80,4 @@ ThenCheckLinesAndConciliate=A continuación, compruebe las líneas presentes en
 RejectCheck=Cheque rechazado
 RejectCheckDate=Fecha en la que el cheque fue rechazado
 CheckRejected=Cheque rechazado
+VariousPayments=Varios pagos
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/bookmarks.lang b/htdocs/langs/es_MX/bookmarks.lang
index 826bd7a1ccf..9783f8a00f1 100644
--- a/htdocs/langs/es_MX/bookmarks.lang
+++ b/htdocs/langs/es_MX/bookmarks.lang
@@ -5,7 +5,6 @@ ShowBookmark=Ver marcador
 ReplaceWindow=Reemplazar pestaña actual
 BehaviourOnClick=Comportamiento cuando se selecciona una URL de marcador
 SetHereATitleForLink=Asignar nombre para el marcador
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Utilice un enlace externo/absoluto (https://URL) o un enlace interno/relativo (/DOLIBARR_ROOT/htdocs/...)
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Elija si la página vinculada debe abrirse en la pestaña actual o en una pestaña nueva
 BookmarksManagement=Gestor de marcadores
 BookmarksMenuShortCut=Ctrl + Mayús + m
diff --git a/htdocs/langs/es_MX/cashdesk.lang b/htdocs/langs/es_MX/cashdesk.lang
index 186e89b9537..4aa0c0f3e5c 100644
--- a/htdocs/langs/es_MX/cashdesk.lang
+++ b/htdocs/langs/es_MX/cashdesk.lang
@@ -11,4 +11,3 @@ ShoppingCart=Carrito de compras
 RestartSelling=Volver a vender
 SellFinished=Venta completa
 NoVAT=No hay IVA para esta venta
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
index 44b8f4a3db8..5994d9bd951 100644
--- a/htdocs/langs/es_MX/companies.lang
+++ b/htdocs/langs/es_MX/companies.lang
@@ -64,15 +64,24 @@ 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)
+ProfId3CM=Identificación prof. 3 (Decreto de creación)
+ProfId2ShortCM=Contribuyente No.
+ProfId3ShortCM=Decree of creation
 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 +97,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,7 +171,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 puedes verificar manualmente desde el sitio web de la comision europea <a href="%s" target="_blank">%s</a>
+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/compta.lang b/htdocs/langs/es_MX/compta.lang
index 7da1aba5f5c..b8c48cab211 100644
--- a/htdocs/langs/es_MX/compta.lang
+++ b/htdocs/langs/es_MX/compta.lang
@@ -7,10 +7,3 @@ OptionModeVirtual=Opción Reclamaciones-Deudas
 Param=Configuración
 PaymentSocialContribution=Pago de impuesto social/fiscal
 ByThirdParties=Por terceros
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/es_MX/errors.lang b/htdocs/langs/es_MX/errors.lang
index a6f423edea8..8ecba476ee2 100644
--- a/htdocs/langs/es_MX/errors.lang
+++ b/htdocs/langs/es_MX/errors.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
 ErrorFieldAccountNotDefinedForLine=Valor para la cuenta contable no definido para la línea (%s)
 ErrorTooManyErrorsProcessStopped=Demasiados errores. Se detuvo el proceso.
diff --git a/htdocs/langs/es_MX/eventorganization.lang b/htdocs/langs/es_MX/eventorganization.lang
index fc68f6e3143..fa8164e7168 100644
--- a/htdocs/langs/es_MX/eventorganization.lang
+++ b/htdocs/langs/es_MX/eventorganization.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - eventorganization
 ModuleEventOrganizationName =Organización de Eventos
 EventOrganizationDescription =Organización de Eventos a través el Módulo de Proyectos
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
 EventOrganizationConferenceOrBoothMenuLeft =Conferencia o Puesto
 EventOrganizationSetup=Configuración de Organización de Evento
 Settings=Configuración
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/main.lang b/htdocs/langs/es_MX/main.lang
index 99470441693..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.
@@ -299,10 +321,10 @@ SearchIntoSupplierOrders=Ordenes de compra
 SearchIntoCustomerProposals=Propuestas comerciales
 SearchIntoSupplierProposals=Presupuestos de Proveedor
 SearchIntoExpenseReports=Reporte de gastos
+SearchIntoMiscPayments=Varios pagos
 AssignedTo=Asignado a
 ToProcess=Procesar
 ContactDefault_agenda=Evento
 ContactDefault_order_supplier=Orden de compra
 ContactDefault_propal=Cotización
-Properties=Properties
 ClientTZ=Zona Horaria cliente (usuario)
diff --git a/htdocs/langs/es_MX/members.lang b/htdocs/langs/es_MX/members.lang
index 81416d55610..b22a482c7fa 100644
--- a/htdocs/langs/es_MX/members.lang
+++ b/htdocs/langs/es_MX/members.lang
@@ -1,5 +1,3 @@
 # Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
 MemberStatusDraft=Borrador (necesita ser validado)
-NewSubscription=New contribution
 SubscriptionLate=Tarde
diff --git a/htdocs/langs/es_MX/mrp.lang b/htdocs/langs/es_MX/mrp.lang
index 5a874c630d0..300d0969e7e 100644
--- a/htdocs/langs/es_MX/mrp.lang
+++ b/htdocs/langs/es_MX/mrp.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - mrp
 BOMsSetup=configuración del módulo BOM
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/es_MX/orders.lang b/htdocs/langs/es_MX/orders.lang
index f284f311826..9bd641ac3ca 100644
--- a/htdocs/langs/es_MX/orders.lang
+++ b/htdocs/langs/es_MX/orders.lang
@@ -8,7 +8,6 @@ ToOrder=Crear orden
 MakeOrder=Crear orden
 SupplierOrder=Orden de compra
 SuppliersOrders=Ordenes de compra
-SaleOrderLines=Sales order lines
 SuppliersOrdersRunning=Ordenes de compra actuales
 CustomerOrder=Pedidos
 SuppliersOrdersToProcess=Órdenes de compra a procesar
diff --git a/htdocs/langs/es_MX/printing.lang b/htdocs/langs/es_MX/printing.lang
index 938df7001e4..2f339dd2660 100644
--- a/htdocs/langs/es_MX/printing.lang
+++ b/htdocs/langs/es_MX/printing.lang
@@ -1,8 +1,2 @@
 # 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
 PRINTIPP_USER=Inicio de sesión
diff --git a/htdocs/langs/es_MX/productbatch.lang b/htdocs/langs/es_MX/productbatch.lang
index 40794f93259..7fe8c415484 100644
--- a/htdocs/langs/es_MX/productbatch.lang
+++ b/htdocs/langs/es_MX/productbatch.lang
@@ -19,5 +19,4 @@ ShowCurrentStockOfLot=Mostrar las existencias actuales para la relación product
 ShowLogOfMovementIfLot=Mostrar el registro de los movimientos para la  relación producto/lote
 StockDetailPerBatch=Detalle de las existencias por lote
 SerialNumberAlreadyInUse=El número de serie %s ya se encuentra utilizado por el producto %s
-QtyToAddAfterBarcodeScan=Cantidad a agregar para cada código de barras/lote/serie escaneado
 EndOfLife=Vida útil
diff --git a/htdocs/langs/es_MX/products.lang b/htdocs/langs/es_MX/products.lang
index 55206c1a9c2..8ade985e293 100644
--- a/htdocs/langs/es_MX/products.lang
+++ b/htdocs/langs/es_MX/products.lang
@@ -17,5 +17,3 @@ GlobalVariableUpdaterHelpFormat0=Formato de la solicitud {"URL": "http://example
 GlobalVariableUpdaterType1=Datos de WebService
 GlobalVariableUpdaterHelp1=Analiza los datos de WebService desde la URL especificada, NS especifica el espacio de nombres, VALUE especifica la ubicación del valor relevante, DATA debe contener los datos a enviar y METHOD es el método WS que llama
 GlobalVariableUpdaterHelpFormat1=El formato de la solicitud es {"URL": "http://example.com/urlofws", "VALUE": "array, targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "MyWSMethod", "DATA": {"tus": "datos", "a": "enviar"}}
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/es_MX/receptions.lang b/htdocs/langs/es_MX/receptions.lang
index 9a153b2c18a..55b566fd826 100644
--- a/htdocs/langs/es_MX/receptions.lang
+++ b/htdocs/langs/es_MX/receptions.lang
@@ -2,5 +2,4 @@
 StatusReceptionCanceled=Cancelado
 StatusReceptionProcessed=Procesada
 StatusReceptionProcessedShort=Procesada
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
 NoMorePredefinedProductToDispatch=No hay más productos solicitados pendientes por recibir
diff --git a/htdocs/langs/es_MX/sendings.lang b/htdocs/langs/es_MX/sendings.lang
index 9148151f7c3..96ffc6ab5ff 100644
--- a/htdocs/langs/es_MX/sendings.lang
+++ b/htdocs/langs/es_MX/sendings.lang
@@ -3,4 +3,3 @@ StatusSendingCanceled=Cancelado
 StatusSendingCanceledShort=Cancelado
 StatusSendingProcessed=Procesada
 StatusSendingProcessedShort=Procesada
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/es_MX/stocks.lang b/htdocs/langs/es_MX/stocks.lang
index 4dc0745536e..8e9b1e95980 100644
--- a/htdocs/langs/es_MX/stocks.lang
+++ b/htdocs/langs/es_MX/stocks.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stocks
 Location=Ubicación
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
 inventoryEdit=Editar
 inventoryDeleteLine=Borrar línea
 ListInventory=Lista
+InventoryStartedShort=Iniciado
diff --git a/htdocs/langs/es_MX/withdrawals.lang b/htdocs/langs/es_MX/withdrawals.lang
index c9da08be27e..dc89643a0c9 100644
--- a/htdocs/langs/es_MX/withdrawals.lang
+++ b/htdocs/langs/es_MX/withdrawals.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 StandingOrderToProcess=Procesar
+WithdrawalsReceipts=Órdenes de domiciliación bancaria
 WithdrawalReceipt=Orden de domiciliación bancaria
 Rejects=Rechazos
 StatusPaid=Pagado
diff --git a/htdocs/langs/es_PA/accountancy.lang b/htdocs/langs/es_PA/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/es_PA/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/es_PA/admin.lang b/htdocs/langs/es_PA/admin.lang
index 95fd972d972..7a1aa3e37f8 100644
--- a/htdocs/langs/es_PA/admin.lang
+++ b/htdocs/langs/es_PA/admin.lang
@@ -1,16 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionUnknown=Desconocido
-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>"
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/es_PA/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/es_PA/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/es_PA/companies.lang b/htdocs/langs/es_PA/companies.lang
new file mode 100644
index 00000000000..40b5f885e43
--- /dev/null
+++ b/htdocs/langs/es_PA/companies.lang
@@ -0,0 +1,7 @@
+# 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
diff --git a/htdocs/langs/es_PA/compta.lang b/htdocs/langs/es_PA/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/es_PA/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/es_PA/errors.lang b/htdocs/langs/es_PA/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/es_PA/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/es_PA/eventorganization.lang b/htdocs/langs/es_PA/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/es_PA/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/es_PA/members.lang b/htdocs/langs/es_PA/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/es_PA/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/es_PA/mrp.lang b/htdocs/langs/es_PA/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/es_PA/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/es_PA/orders.lang b/htdocs/langs/es_PA/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/es_PA/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/es_PA/printing.lang b/htdocs/langs/es_PA/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/es_PA/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/es_PA/products.lang b/htdocs/langs/es_PA/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/es_PA/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/es_PA/propal.lang b/htdocs/langs/es_PA/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/es_PA/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/es_PA/receptions.lang b/htdocs/langs/es_PA/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/es_PA/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_PA/sendings.lang b/htdocs/langs/es_PA/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/es_PA/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/es_PA/stocks.lang b/htdocs/langs/es_PA/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/es_PA/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
index 1f5a7e45917..2cc89dfcbf1 100644
--- a/htdocs/langs/es_PE/accountancy.lang
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -43,5 +43,3 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta contable de espera
 Codejournal=Periódico
 FinanceJournal=Periodo Financiero
 TotalMarge=Margen total de ventas
-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)
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index b1558281c0e..34a13d1f06f 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -1,25 +1,15 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionProgram=Versión del programa
 VersionLastInstall=Instalar versión inicial
-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>"
 Module30Name=Facturas
 Permission91=Consultar impuestos e IGV
 Permission92=Crear/modificar impuestos e IGV
 Permission93=Eliminar impuestos e IGV
 DictionaryVAT=Tasa de IGV o tasa de impuesto a las ventas
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
 UnitPriceOfProduct=Precio unitario sin IGV de un producto
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
 OptionVatMode=IGV adeudado
 MailToSendInvoice=Facturas de Clientes
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/es_PE/cashdesk.lang
index f29cf46fc12..2486b6f71de 100644
--- a/htdocs/langs/es_PE/cashdesk.lang
+++ b/htdocs/langs/es_PE/cashdesk.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - cashdesk
 CashDeskMenu=Punto de venta
 CashDesk=Punto de venta
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/es_PE/compta.lang b/htdocs/langs/es_PE/compta.lang
index 812a53c5f67..14279dceb37 100644
--- a/htdocs/langs/es_PE/compta.lang
+++ b/htdocs/langs/es_PE/compta.lang
@@ -2,11 +2,4 @@
 VATCollected=IGV recuperado
 PaymentVat=Pago IGV
 ShowVatPayment=Ver pagos IGV
-VATReportByThirdParties=Sales tax report by third party
 VATReportByCustomersInInputOutputMode=Informe por cliente del IGV repercutido y pagado (IGV pagado)
-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)
diff --git a/htdocs/langs/es_PE/errors.lang b/htdocs/langs/es_PE/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/es_PE/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/es_PE/eventorganization.lang b/htdocs/langs/es_PE/eventorganization.lang
index 74018e7285e..593178743aa 100644
--- a/htdocs/langs/es_PE/eventorganization.lang
+++ b/htdocs/langs/es_PE/eventorganization.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
 Settings=Configuración
diff --git a/htdocs/langs/es_PE/main.lang b/htdocs/langs/es_PE/main.lang
index 81869056fdb..da0ff47ca90 100644
--- a/htdocs/langs/es_PE/main.lang
+++ b/htdocs/langs/es_PE/main.lang
@@ -72,4 +72,3 @@ ContactDefault_invoice_supplier=Factura de Proveedor
 ContactDefault_order_supplier=Orden de Compra
 ContactDefault_propal=Cotización
 ContactDefault_supplier_proposal=Cotización de Proveedor
-Properties=Properties
diff --git a/htdocs/langs/es_PE/members.lang b/htdocs/langs/es_PE/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/es_PE/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/es_PE/mrp.lang b/htdocs/langs/es_PE/mrp.lang
index 20502889ea2..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,10 +23,8 @@ 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
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
 NewMO=Nueva Orden de Fabricación
 QtyToProduce=Cantidad a producir
 DateEndPlannedMo=Fecha de fin planeada
diff --git a/htdocs/langs/es_PE/orders.lang b/htdocs/langs/es_PE/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/es_PE/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/es_PE/printing.lang b/htdocs/langs/es_PE/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/es_PE/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/es_PE/products.lang b/htdocs/langs/es_PE/products.lang
index b2b81820492..e682fe300a6 100644
--- a/htdocs/langs/es_PE/products.lang
+++ b/htdocs/langs/es_PE/products.lang
@@ -5,5 +5,3 @@ ProductServiceCard=Ficha Productos/Servicios
 ProductOrService=Producto o Servicio
 ListOfStockMovements=Lista de movimientos de stock
 ExportDataset_produit_1=Productos
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/es_PE/projects.lang b/htdocs/langs/es_PE/projects.lang
index 16f080acf7c..b4ee4dfb193 100644
--- a/htdocs/langs/es_PE/projects.lang
+++ b/htdocs/langs/es_PE/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
 OppStatusPROPO=Cotización
+NewInter=Nueva intervención
diff --git a/htdocs/langs/es_PE/receptions.lang b/htdocs/langs/es_PE/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/es_PE/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_PE/sendings.lang b/htdocs/langs/es_PE/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/es_PE/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/es_PE/stocks.lang b/htdocs/langs/es_PE/stocks.lang
index ce34ccdf528..517409f5632 100644
--- a/htdocs/langs/es_PE/stocks.lang
+++ b/htdocs/langs/es_PE/stocks.lang
@@ -2,7 +2,6 @@
 MovementId=ID de Movimiento
 StockMovementForId=ID de Movimiento %d
 ListMouvementStockProject=Lista de movimientos de stock asociados al proyecto
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
 QtyDispatchedShort=Cant. despachada
 MassMovement=Movimiento masivo
 StockMovementRecorded=Movimiento de stock grabado
diff --git a/htdocs/langs/es_PY/accountancy.lang b/htdocs/langs/es_PY/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/es_PY/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/es_PY/admin.lang b/htdocs/langs/es_PY/admin.lang
index 58a42ff6b8e..c5ab56cb8d8 100644
--- a/htdocs/langs/es_PY/admin.lang
+++ b/htdocs/langs/es_PY/admin.lang
@@ -1,15 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/es_PY/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/es_PY/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/es_PY/companies.lang b/htdocs/langs/es_PY/companies.lang
new file mode 100644
index 00000000000..40b5f885e43
--- /dev/null
+++ b/htdocs/langs/es_PY/companies.lang
@@ -0,0 +1,7 @@
+# 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
diff --git a/htdocs/langs/es_PY/compta.lang b/htdocs/langs/es_PY/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/es_PY/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/es_PY/errors.lang b/htdocs/langs/es_PY/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/es_PY/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/es_PY/eventorganization.lang b/htdocs/langs/es_PY/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/es_PY/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/es_PY/members.lang b/htdocs/langs/es_PY/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/es_PY/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/es_PY/mrp.lang b/htdocs/langs/es_PY/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/es_PY/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/es_PY/orders.lang b/htdocs/langs/es_PY/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/es_PY/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/es_PY/printing.lang b/htdocs/langs/es_PY/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/es_PY/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/es_PY/products.lang b/htdocs/langs/es_PY/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/es_PY/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/es_PY/propal.lang b/htdocs/langs/es_PY/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/es_PY/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/es_PY/receptions.lang b/htdocs/langs/es_PY/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/es_PY/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_PY/sendings.lang b/htdocs/langs/es_PY/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/es_PY/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/es_PY/stocks.lang b/htdocs/langs/es_PY/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/es_PY/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/es_US/accountancy.lang b/htdocs/langs/es_US/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/es_US/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/es_US/admin.lang b/htdocs/langs/es_US/admin.lang
index 58a42ff6b8e..c5ab56cb8d8 100644
--- a/htdocs/langs/es_US/admin.lang
+++ b/htdocs/langs/es_US/admin.lang
@@ -1,15 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/es_US/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/es_US/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/es_US/companies.lang b/htdocs/langs/es_US/companies.lang
new file mode 100644
index 00000000000..40b5f885e43
--- /dev/null
+++ b/htdocs/langs/es_US/companies.lang
@@ -0,0 +1,7 @@
+# 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
diff --git a/htdocs/langs/es_US/compta.lang b/htdocs/langs/es_US/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/es_US/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/es_US/errors.lang b/htdocs/langs/es_US/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/es_US/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/es_US/eventorganization.lang b/htdocs/langs/es_US/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/es_US/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/es_US/members.lang b/htdocs/langs/es_US/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/es_US/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/es_US/mrp.lang b/htdocs/langs/es_US/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/es_US/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/es_US/orders.lang b/htdocs/langs/es_US/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/es_US/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/es_US/printing.lang b/htdocs/langs/es_US/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/es_US/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/es_US/products.lang b/htdocs/langs/es_US/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/es_US/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/es_US/propal.lang b/htdocs/langs/es_US/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/es_US/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/es_US/receptions.lang b/htdocs/langs/es_US/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/es_US/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_US/sendings.lang b/htdocs/langs/es_US/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/es_US/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/es_US/stocks.lang b/htdocs/langs/es_US/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/es_US/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/es_UY/accountancy.lang b/htdocs/langs/es_UY/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/es_UY/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/es_UY/admin.lang b/htdocs/langs/es_UY/admin.lang
index 58a42ff6b8e..c5ab56cb8d8 100644
--- a/htdocs/langs/es_UY/admin.lang
+++ b/htdocs/langs/es_UY/admin.lang
@@ -1,15 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/es_UY/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/es_UY/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/es_UY/companies.lang b/htdocs/langs/es_UY/companies.lang
new file mode 100644
index 00000000000..40b5f885e43
--- /dev/null
+++ b/htdocs/langs/es_UY/companies.lang
@@ -0,0 +1,7 @@
+# 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
diff --git a/htdocs/langs/es_UY/compta.lang b/htdocs/langs/es_UY/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/es_UY/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/es_UY/errors.lang b/htdocs/langs/es_UY/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/es_UY/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/es_UY/eventorganization.lang b/htdocs/langs/es_UY/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/es_UY/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/es_UY/members.lang b/htdocs/langs/es_UY/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/es_UY/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/es_UY/mrp.lang b/htdocs/langs/es_UY/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/es_UY/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/es_UY/orders.lang b/htdocs/langs/es_UY/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/es_UY/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/es_UY/printing.lang b/htdocs/langs/es_UY/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/es_UY/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/es_UY/products.lang b/htdocs/langs/es_UY/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/es_UY/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/es_UY/propal.lang b/htdocs/langs/es_UY/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/es_UY/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/es_UY/receptions.lang b/htdocs/langs/es_UY/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/es_UY/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_UY/sendings.lang b/htdocs/langs/es_UY/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/es_UY/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/es_UY/stocks.lang b/htdocs/langs/es_UY/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/es_UY/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/es_VE/accountancy.lang b/htdocs/langs/es_VE/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/es_VE/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 3734751a59a..059460aa02f 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -4,18 +4,13 @@ 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
-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>"
+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
 Permission256=Consultar sus permisos
 Permission1321=Exportar facturas a clientes, atributos y cobros
 Permission20003=Eliminar peticiones de días libres retribuidos
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
 ExtraFields=Atributos adicionales
 ExtraFieldsLines=Atributos adicionales (líneas)
 ExtraFieldsSupplierOrdersLines=Atributos complementarios (líneas de pedido)
@@ -33,14 +28,10 @@ SupplierProposalNumberingModules=Modelos de numeración de solicitud de precios
 SupplierProposalPDFModules=Modelos de documentos de solicitud de precios a proveedores
 FreeLegalTextOnSupplierProposal=Texto libre en solicitudes de precios a proveedores
 WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a proveedor (en caso de estar vacío)
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
 LDAPMemberObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPUserObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPContactObjectClassListExample=Lista de objectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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_VE/cashdesk.lang b/htdocs/langs/es_VE/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/es_VE/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
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..8b438adbb1d 100644
--- a/htdocs/langs/es_VE/companies.lang
+++ b/htdocs/langs/es_VE/companies.lang
@@ -1,10 +1,18 @@
 # 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.)
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=R.I.F.
+ProfId3ShortCM=Decree of creation
 ProfId1ES=CI/ RIF
 ProfId2ES=-
 ProfId3ES=-
diff --git a/htdocs/langs/es_VE/compta.lang b/htdocs/langs/es_VE/compta.lang
index d8e8db1f18b..b94bc90d190 100644
--- a/htdocs/langs/es_VE/compta.lang
+++ b/htdocs/langs/es_VE/compta.lang
@@ -22,12 +22,5 @@ CalcModeLT2Debt=Modo <b>%sISLR en facturas a clientes%s</b>
 CalcModeLT2Rec=Modo <b>%sISLR en facturas de proveedores%s</b>
 LT1ReportByCustomersES=-
 LT2ReportByCustomersES=Informe por tercero del ISLR
-VATReportByThirdParties=Sales tax report by third party
 LT1ReportByQuartersES=-
 LT2ReportByQuartersES=Informe de ISLR por tasa
-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)
diff --git a/htdocs/langs/es_VE/errors.lang b/htdocs/langs/es_VE/errors.lang
index 420423d0a0a..54642b90dab 100644
--- a/htdocs/langs/es_VE/errors.lang
+++ b/htdocs/langs/es_VE/errors.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
 ErrorForbidden=Acceso denegado.<br>Intenta acceder a una página, área o funcionalidad de un módulo desactivado o sin una sesión auntenticada o no permitida a su usuario
diff --git a/htdocs/langs/es_VE/eventorganization.lang b/htdocs/langs/es_VE/eventorganization.lang
index 1424e083944..bde5dca9705 100644
--- a/htdocs/langs/es_VE/eventorganization.lang
+++ b/htdocs/langs/es_VE/eventorganization.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
 EvntOrgDraft =A validar
diff --git a/htdocs/langs/es_VE/main.lang b/htdocs/langs/es_VE/main.lang
index 79d3a33e75b..55e67bea58a 100644
--- a/htdocs/langs/es_VE/main.lang
+++ b/htdocs/langs/es_VE/main.lang
@@ -43,4 +43,3 @@ Progress=Progresión
 Export=Exportación
 ExpenseReports=Gastos
 SearchIntoExpenseReports=Gastos
-Properties=Properties
diff --git a/htdocs/langs/es_VE/members.lang b/htdocs/langs/es_VE/members.lang
index f709a95c97a..9509a94e6af 100644
--- a/htdocs/langs/es_VE/members.lang
+++ b/htdocs/langs/es_VE/members.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
 MemberStatusDraftShort=A validar
 MemberStatusActiveShort=Validada
 MemberStatusNoSubscriptionShort=Validada
diff --git a/htdocs/langs/es_VE/mrp.lang b/htdocs/langs/es_VE/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/es_VE/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/es_VE/orders.lang b/htdocs/langs/es_VE/orders.lang
index 3377bd0db7c..f1790ff6eef 100644
--- a/htdocs/langs/es_VE/orders.lang
+++ b/htdocs/langs/es_VE/orders.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
 StatusOrderDeliveredShort=Emitido
 StatusSupplierOrderDraftShort=A validar
 StatusSupplierOrderValidatedShort=Validada
diff --git a/htdocs/langs/es_VE/printing.lang b/htdocs/langs/es_VE/printing.lang
index 8ecd2343b27..56d56e9202e 100644
--- a/htdocs/langs/es_VE/printing.lang
+++ b/htdocs/langs/es_VE/printing.lang
@@ -1,8 +1,2 @@
 # 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
 PleaseConfigureDriverfromList=Por favor configure el driver seleccionado de la lista.
diff --git a/htdocs/langs/es_VE/products.lang b/htdocs/langs/es_VE/products.lang
index 34d1450e4f7..1b3375e9970 100644
--- a/htdocs/langs/es_VE/products.lang
+++ b/htdocs/langs/es_VE/products.lang
@@ -8,6 +8,4 @@ ProductsOnPurchaseOnly=Productos solo para compra
 ProductStatusNotOnBuyShort=Fuera compra
 ExportDataset_produit_1=Productos
 PriceExpressionEditorHelp2=Puede acceder a los atributos adicionales con variables como <b>#extrafield_myextrafieldkey#</b> y variables globales con <b>#global_mycode#</b>
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
 NbProducts=Numero de productos
diff --git a/htdocs/langs/es_VE/receptions.lang b/htdocs/langs/es_VE/receptions.lang
index 2816a5a8500..aafecfb8f07 100644
--- a/htdocs/langs/es_VE/receptions.lang
+++ b/htdocs/langs/es_VE/receptions.lang
@@ -2,4 +2,3 @@
 StatusReceptionDraft=A validar
 StatusReceptionDraftShort=A validar
 StatusReceptionValidatedShort=Validada
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
diff --git a/htdocs/langs/es_VE/sendings.lang b/htdocs/langs/es_VE/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/es_VE/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/es_VE/stocks.lang b/htdocs/langs/es_VE/stocks.lang
index 3220ed8b519..21accccad2c 100644
--- a/htdocs/langs/es_VE/stocks.lang
+++ b/htdocs/langs/es_VE/stocks.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
 inventoryValidate=Validada
+InventoryStartedShort=Pagada parcialmente
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index a872644dc8e..78e4226468b 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index c928ae02685..6047e9818ff 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Sihtasutus
 Version=Versioon
 Publisher=Publisher
@@ -265,8 +267,8 @@ OtherResources=Muud ressursid
 ExternalResources=Välised ressursid
 SocialNetworks=Sotsiaalvõrgud
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=Kasutaja või arendaja dokumentatsiooni (KKK jms) võid leida<br>ametlikust Dolibarri Wikist:<br><a href="%s" target="_blank"><b>%s</b></a>
-ForAnswersSeeForum=Muude küsimuste või abi küsimise tarbeks saab kasutada Dolibarri foorumit:<br><a href="%s" target="_blank"><b>%s</b></a>
+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=Praegune menüü töötleja
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Viimane stabiilne versioon
 LastActivationDate=Viimane aktiveerimise kuupäev
 LastActivationAuthor=Viimane aktiveerimise autor
 LastActivationIP=Viimane aktiveerimise 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>
@@ -753,7 +756,7 @@ Permission106=Saatmiste ekspor
 Permission109=Saatmiste kustutamine
 Permission111=Finantskontode vaatamine
 Permission112=Tehingute loomine/muutmine/kustutamine ja võrdlemine
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Tehingute ja kontosaldode ekspor
 Permission116=Kontode vahelised kanded
@@ -762,6 +765,7 @@ Permission121=Kasutajaga seotud kolmandate isikute vaatamine
 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)
@@ -889,12 +893,11 @@ Permission701=Annetuste vaatamine
 Permission702=Annetuste loomine/muutmine
 Permission703=Annetuste kustutamine
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Laojääkide vaatamine
@@ -958,15 +961,11 @@ Permission2801=FTP kliendi kasutamine lugemisrežiimis (ainult sirvimine ja alla
 Permission2802=FTP kliendi kasutamine kirjutusrežiimis (failide kustutamine või üles laadimine)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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=Välja %s muutmine
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Vastuvõtja
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Saatekviitungi mudel
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Vaba tekst saatedokumentidel
 ##### FCKeditor #####
 AdvancedEditor=Keerulisem toimeti
 ActivateFCKeditor=Aktiveeri keerulisem toimeti järgmistel lehtedel:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field public notes of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field private notes of elements
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Postiindeks
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index caacba4bc98..9e8c476384f 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -32,7 +32,7 @@ RIB=Arvelduskonto number
 IBAN=IBAN number
 BIC=BIC / SWIFT kood
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Panga aadress
 BankAccountCountry=Konto riik
 BankAccountOwner=Konto omaniku nimi
 BankAccountOwnerAddress=Konto omaniku aadress
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Loo uus konto
 NewBankAccount=Uus konto
 NewFinancialAccount=Uus finantskonto
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/bookmarks.lang b/htdocs/langs/et_EE/bookmarks.lang
index 7951f590520..14cbbae8f6b 100644
--- a/htdocs/langs/et_EE/bookmarks.lang
+++ b/htdocs/langs/et_EE/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Käitumine URLil klõpsamise puhul
 CreateBookmark=Loo järjehoidja
 SetHereATitleForLink=Set a name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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=Järjehoidjate haldamine
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index 51c997378d0..88ea94b3e63 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ VATIntraCheck=Kontrolli
 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">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Kontrollida pole võimalik. Kontrolli, et liikmesriik (%s) võimaldab teenust kasutada.
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index 80f8f5723c3..af41d62219d 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -170,8 +170,9 @@ 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=- Näidatud summad sisaldavad kõiki makse
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index d02e293cde9..e6cb1458234 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=RSS voo saamine ebaõnnestus. Proovi konstandi MAIN_SIM
 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=Selle kasutajanime õigusi saab sinu Dolibarri administraator muuta menüüst %s->%s.
 ErrorForbidden3=Tundub, et Dolibarri ei kasutata läbi autenditud sessiooni. Loe Dolibarri seadistamise dokumentatsiooni autentimise haldamiseks (htaccess, mod_auth vms).
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=Imagick klassi ei leitud antud PHPs. Eelvaated ei ole võimalikud. Administraatorid saavad antud saki keelata menüüst Seadistamine->Kuva.
 ErrorRecordAlreadyExists=Kirje on juba olemas
 ErrorLabelAlreadyExists=This label already exists
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/et_EE/holiday.lang
index 4236d9bc8fa..275d093c939 100644
--- a/htdocs/langs/et_EE/holiday.lang
+++ b/htdocs/langs/et_EE/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Kirjeldus
 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 is <b>%s</b> days.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Lõppkuupäev peab olema alguskuupäevast suurem.
 ErrorSQLCreateCP=Loomisel tekkis SQLi viga:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -134,3 +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 05bb80c548f..dca9094b78c 100644
--- a/htdocs/langs/et_EE/install.lang
+++ b/htdocs/langs/et_EE/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/et_EE/main.lang
index 738ebfe9353..2f646ccbe3d 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Viga: riigi '%s' jaoks ei ole käibemaksum
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Viga: faili salvestamine ebaõnnestus.
 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=Maksimaalne kirjete arv ühel lehel
 NotAuthorized=Teil pole selleks õigusi.
 SetDate=Sea kuupäev
@@ -87,7 +88,7 @@ FileWasNotUploaded=Fail on valitud manustamiseks, kuid on veel üles laadimata.
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Loe abi
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Kirje salvestatud
 RecordDeleted=Kirje kustutatud
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Return code for latest database access request error
 InformationLastAccessInError=Information for latest database access request error
 DolibarrHasDetectedError=Dolibarr leidis tehnilise vea
 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 remove such notices)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Lisainformatsioon
 TechnicalInformation=Tehniline info
 TechnicalID=Technical ID
@@ -211,6 +212,8 @@ User=Kasutaja
 Users=Kasutajad
 Group=Rühm
 Groups=Rühmad
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Ühtki kasutajate gruppi pole määratletud
 Password=Parool
 PasswordRetype=Korda parooli
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Kliendi ajavöönd (kasutaja)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/et_EE/modulebuilder.lang b/htdocs/langs/et_EE/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/et_EE/modulebuilder.lang
+++ b/htdocs/langs/et_EE/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 09a83ca99f2..4fd1edbc36a 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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
diff --git a/htdocs/langs/et_EE/partnership.lang b/htdocs/langs/et_EE/partnership.lang
index f27317e813c..91e45984134 100644
--- a/htdocs/langs/et_EE/partnership.lang
+++ b/htdocs/langs/et_EE/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/et_EE/productbatch.lang b/htdocs/langs/et_EE/productbatch.lang
index b85be2de84d..7fc91568c9b 100644
--- a/htdocs/langs/et_EE/productbatch.lang
+++ b/htdocs/langs/et_EE/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 7724ca72848..5c6a29a3a15 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Kaalutud keskmine hind
 PMPValueShort=KKH
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 150bb1048c2..9e19a41c9fa 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/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,3 +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=Lõppkuupäev ei saa olla alguskuupäevast varasem
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 7c3fd24ede9..8de88ac3c69 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=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
diff --git a/htdocs/langs/et_EE/stripe.lang b/htdocs/langs/et_EE/stripe.lang
index 748df85ac20..49a74b978de 100644
--- a/htdocs/langs/et_EE/stripe.lang
+++ b/htdocs/langs/et_EE/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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=Dolibarri objektide põhjal maksete sooritamiseks on klientidele pakkuda järgnevate lehtede URLid:
 PaymentForm=Maksmise vorm
@@ -28,7 +28,6 @@ AccountParameter=Konto parameetrid
 UsageParameter=Kasutamise parameetrid
 InformationToFindParameters=Abi %s konto info leidmiseks
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Müüja nim
 CSSUrlForPaymentForm=Maksmise vormi CSS stiililehtede URL
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index ce116c1f6fe..d45f81ddee9 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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=Määra krediteerituks
+ClassDebited=Classify debited
 ClassCreditedConfirm=Kas oled kindel, et soovid selle väljamakse kviitungi liigitada pangakontole krediteerituks?
 TransData=Saatmise kuupäev
 TransMetod=Saatmise meetod
@@ -80,7 +82,7 @@ StatusMotif7=Kohtuotsus
 StatusMotif8=Muu põhjus
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Ainult kontor
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ ModeWarning=Tootmisrežiim ei olnud seadistatud, pärast seda peatatakse simulat
 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
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index c20e0a339f6..8bc4b54a090 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 9c6600fa0de..f18097cd7fc 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Fundazioa
 Version=Bertsioa
 Publisher=Publisher
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang
index b95db45a115..59842d6d325 100644
--- a/htdocs/langs/eu_ES/banks.lang
+++ b/htdocs/langs/eu_ES/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/eu_ES/bookmarks.lang
index 31cbc3453ef..b38313a0d9d 100644
--- a/htdocs/langs/eu_ES/bookmarks.lang
+++ b/htdocs/langs/eu_ES/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Behaviour when a bookmark URL is selected
 CreateBookmark=Laster-marka sortu
 SetHereATitleForLink=Set a name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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=Laster-marken kudeaketa
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index 160e2e65059..8bfbe52c104 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index 4a0e722e132..fc07cbe90f9 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/eu_ES/holiday.lang
index de3a9ced3f9..180e39ed54a 100644
--- a/htdocs/langs/eu_ES/holiday.lang
+++ b/htdocs/langs/eu_ES/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Deskribapena
 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/eu_ES/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/eu_ES/install.lang
+++ b/htdocs/langs/eu_ES/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/eu_ES/main.lang
index 414ee73026b..939f02c4873 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ User=Erabiltzailea
 Users=Erabiltzaileak
 Group=Taldea
 Groups=Taldeak
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Pasahitza
 PasswordRetype=Retype your password
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/eu_ES/modulebuilder.lang b/htdocs/langs/eu_ES/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/eu_ES/modulebuilder.lang
+++ b/htdocs/langs/eu_ES/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 13f1a831513..840ade39f60 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/eu_ES/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/eu_ES/partnership.lang
+++ b/htdocs/langs/eu_ES/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/eu_ES/productbatch.lang b/htdocs/langs/eu_ES/productbatch.lang
index dce79fda7ec..effd0a09795 100644
--- a/htdocs/langs/eu_ES/productbatch.lang
+++ b/htdocs/langs/eu_ES/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index 11be97d1b61..e66efbb8926 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 900f5b1acc0..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,3 +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/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index fa18c103009..6e4c61dbf16 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/eu_ES/stripe.lang b/htdocs/langs/eu_ES/stripe.lang
index 4696e5b8128..bd1fb9ddd09 100644
--- a/htdocs/langs/eu_ES/stripe.lang
+++ b/htdocs/langs/eu_ES/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/eu_ES/withdrawals.lang
+++ b/htdocs/langs/eu_ES/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 9cb85e2b7d0..81fa5132cf8 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=کشورهائی که در اتحادیۀ اروپا نیست
 CountriesInEECExceptMe=کشورهائی که در اتحادیۀ اروپا هستند به استثناء %s
 CountriesExceptMe=همۀ کشورها باستثناء %s
 AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=بندکردن خودکار
-AutomaticBindingDone=بندکردن خودکار انجام شد
+AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=خطا! شما نمی‌توانید این حساب حساب‌داری را حذف کنید، زیرا در حال استفاده است.
 MvtNotCorrectlyBalanced=جابجائی به درستی انجام نشد. بدهی = %s | اعتبار= %s
@@ -387,7 +387,8 @@ 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=بازۀ حساب حساب‌داری
 Calculated=محاسبه‌شده
@@ -404,6 +405,7 @@ NoJournalDefined=دفتری تعریف نشده است
 Binded=سطور بندشده
 ToBind=سطوری که باید بند شوند
 UseMenuToSetBindindManualy=سطوری که هنوز بند نشده‌اند، گزینۀ <a href="%s">%s</a> را برای ایجاد دستی بندهای مورد استفاده قرار دهید.
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
 
 ## Import
 ImportAccountingEntries=ورودی‌های حساب‌داری
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 8d460de763a..6a196bb2b3b 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=موسسه
 Version=نسخه
 Publisher=ناشر
@@ -265,8 +267,8 @@ OtherResources=سایر منابع
 ExternalResources=منابع بیرونی
 SocialNetworks=شبکه‌های اجتماعی
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=مستندات مربوط به کاربر یا برنامه‌نویس (مستندات، سوال و جواب و غیره)، <br> نگاهی به ویکی Dolibarr داشته باشید: <br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=در صورتی که سوال دارید یا به کمک نیاز دارید می‌توانید از تالارهای گفتمان Dolibarr  استفاده نمائید: <br><b><a href="%s" target="_blank">%s</a></b>
+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=در این‌جا منابعی برای دریافت کمک و پشتیبانی در خصوص Dolibarr می‌یابید:
 HelpCenterDesc2=برخی از این منابع صرفا به زبان <b>انگلیسی</b> هستند.
 CurrentMenuHandler=دستیار فهرست کنونی
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=آخرین نسخۀ پایدار
 LastActivationDate=آخرین تاریخ فعال‌سازی
 LastActivationAuthor=آخرین سازندۀ فعال‌کننده
 LastActivationIP=آخرین درگاه‌اینترنتی فعال‌کننده
+LastActivationVersion=Latest activation version
 UpdateServerOffline=به‌روز‌رسانی برون‌خطی-Offline سرویس‌دهنده
 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>
@@ -753,7 +756,7 @@ Permission106=صادرکردن ارسال‌ها
 Permission109=حذف ارسال‌ها
 Permission111=ملاحظۀ حساب‌های تجاری
 Permission112=ساخت/ویرایش/حذف و مقایسۀ تراکنش‌ها
-Permission113=برپاسازی حساب‌های تجاری (ساخت و ویرایش دسته‌ها)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=وفق‌دادن تراکنش
 Permission115=صادرکردن تراکنش‌ها و توضیحات حساب‌ها
 Permission116=انتقالات بین حساب‌ها
@@ -762,6 +765,7 @@ Permission121=ملاحظۀ اشخاص‌سوم مرتبط با یک کاربر
 Permission122=ایجاد/ویرایش اشخاص‌سوم مرتبط با یک کاربر
 Permission125=حذف اشخاص‌سوم مرتبط با یک کاربر
 Permission126=صادرات اشخاص‌سوم مرتبط با یک کاربر
+Permission130=Create/modify third parties payment information
 Permission141=ملاحظۀ همۀ طرح‌ها و وظایف (همچنین طرح‌های خصوصی که من در آن طرف نیستم)
 Permission142=ساخت/ویرایش همۀ طرح‌ها و وظایف‌کاری (همچنین طرح‌های خصوصی که من در آن طرف نیستم)
 Permission144=حذف همۀ طرح‌ها و وظایف‌کاری (همچنین طرح‌های خصوصی که من در آن طرف نیستم)
@@ -889,12 +893,11 @@ Permission701=ملاحظۀ کمک‌های‌مالی
 Permission702=ایجاد/ویرایش کمک‌های‌مالی
 Permission703=حذف کمک‌های‌مالی
 Permission771=ملاحظۀ گزارش‌های هزینه‌ها (مربوط به شما و افراد زیرنظرشما)
-Permission772=ساخت/ویرایش گزارش‌های هزینه
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=حذف گزارش‌های هزینه
-Permission774=ملاحظۀ همۀ گزارش‌های هزینه (حتی مربوط به کاربرانی که زیرنظر شما نیستند)
 Permission775=تائید گزارش‌های هزینه
 Permission776=پرداخت گزارش‌های هزینه
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=صادرکردن گزارش‌های هزینه
 Permission1001=ملاحظۀ موجودی
@@ -958,15 +961,11 @@ Permission2801=استفاده از متقاضی FTP در حالت خواندنی
 Permission2802=استفاده از متقاضی FTP در حالت نوشتنی (حذف یا ارسال فایل)
 Permission3200=خواندن روی‌دادهای بایگانی شده و اثرانگشت‌ها
 Permission3301=Generate new modules
-Permission4001=نمایش کارمندان
-Permission4002=ساخت کارمند
-Permission4003=حذف کارمند
-Permission4004=صادرکردن کارمندان
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ Permission10005=حذف محتوای وبگاه
 Permission20001=ملاحظۀ درخواست‌های مرخصی (درخواست‌های مرخصی افراد تحت مدیریت شما)
 Permission20002=ساخت/ویرایش درخواست‌های مرخصی شما (شما و افراد تحت نظر شما)
 Permission20003=حذف درخواست‌های مرخصی
-Permission20004=ملاحظۀ همۀ درخواست‌های مرخصی (حتی کاربری که تحت مدیریت شما نیست)
-Permission20005=ساخت/ویرایش درخواست مرخصی همگان (حتی کاربرانی که تحت مدیریت شما نیستند)
-Permission20006=درخواست‌های مرخصی مدیر (تنظیمات و به‌هنگام‌سازی تعادل)
+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=ملاحظۀ وظایف زمان‌بندی‌شده
 Permission23002=ساخت/ویرایش  وظایف زمان‌بندی‌شده
@@ -1358,9 +1357,9 @@ BrowserIsOK=شما از مرورگر وب %s استفاده می‌نمائید.
 BrowserIsKO=شما از مرورگر وب %s استفاده می‌نمائید. این مرورگر به‌عنوان یک انتخاب بد به نسبت امنیت، کارائی و اعتمادپذیری شناخته شده است. ما به شما پیشنهاد می‌کنیم از Firefox، Chrome، Opera و Safari استفاده نمائید.
 PHPModuleLoaded=بخش %s در PHP بارگذاری شده است
 PreloadOPCode=OPCode از پیش بارگذاری شده مورد استفاده است
-AddRefInList=نمایش فهرست اطلاعات مرجع -ref. فروشنده/مشتری (فهرست انتخابی یا ترکیبی) و اکثر ابَرپیوند. <br> نام طرف‌های سوم به شکل  " CC12345 - SC45678 - شرکت بزرگ سازمانی " به جای "شرکت بزرگ سازمانی" نمایش داده خواهد شد.
-AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=نمایش فهرست اطلاعات نشانی‌های فروشنده/مشتری (فهرست انتخابی یا ترکیبی) <br>شخص سوم‌ها به شکل "شرکت بزرگ سازمانی - شمارۀ 21 خیابان 123456 شهر بزرگ ایران" به جای "شرکت بزرگ سازمانی" نمایش داده خواهند شد.
+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=پرسش برای روش ارسال ترجیحی برای اشخاص سوم
 FieldEdition=ویرایش بخش %s
@@ -1708,8 +1707,9 @@ MailingDelay=ثانیه‌های انتظار بعد از ارسال یک رای
 NotificationSetup=برپاسازی واحد آگاه‌سازی رایانامه
 NotificationEMailFrom=رایانامۀ ارسال‌کننده (از) برای رایانامه‌هائی که توسط واحد ارسال آگاه‌سازی‌ها فرستاده می‌شوند
 FixedEmailTarget=گیرنده
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=برپاسازی واحد حمل‌ونقل
 SendingsReceiptModel=شکل فرستادن رسید
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=برپاسازی واحد گزارش هزینه‌ها
 ExpenseReportNumberingModules=واحد شماره‌گذاری گزارش هزینه‌ها
 NoModueToManageStockIncrease=هیچ واحدی که قادر به افزایش خودکار موجودی انبار باشد فعال نشده است. افزایش موجودی انبار تنها به صورت دستی انجام خواهد شد.
 YouMayFindNotificationsFeaturesIntoModuleNotification=شما می‌توانید برخی گزینه‌های مربوط به اطلاع‌رسانی از رایانامه را با فعال کردن و تنظیم واحد "آگاهی‌رسانی" تنظیم نمائید.
+TemplatesForNotifications=Templates for notifications
 ListOfNotificationsPerUser=فهرست اطلاع‌رسانی‌های خودکار بر حسب کاربر*
 ListOfNotificationsPerUserOrContact=فهرست اطلاع‌رسانی‌های خودکار قابل استفاده (مربوط به روی‌دادی تجاری) فعال برای کاربر* یا بر حسب طرف‌تماس**
 ListOfFixedNotifications=فهرست اطلاع‌رسانی‌های خودکار ثابت
@@ -1916,6 +1917,8 @@ ConfFileMustContainCustom=نصب یا ساخت یک واحد خارجی در ب
 HighlightLinesOnMouseHover=برجسته‌کردن سطور جدول در هنگام عبور نشان‌گر موش
 HighlightLinesColor=برجسته‌کردن رنگ سطر در هنگام عبور موشواره از آن (از 'ffffff' برای عدم رنگ‌دهی)
 HighlightLinesChecked=روشن‌کردن زرنگ سطر در هنگامی که کادرتائید فشرده شده است ( از 'ffffff' برای عدم روشن کردن استفاده کنید)
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=رنگ نوشتۀ عنوان صفحه
 LinkColor=رنگ پیوندها
 PressF5AfterChangingThis=کلیدهای CTRL+F5 را روی صفحه‌کلید برای پاک‌کردن میان‌گیری پس از تغییر بفشرید تا تاثیر مقداردهی دیده شود.
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=آیا می‌خواهید عملیات جمع‌آ
 NoNewEmailToProcess=رایانامۀ جدیدی (با توجه به گزینش‌ها و صافی‌ها) پیدا نشد که پردازش شود
 NothingProcessed=کاری انجام نشد
 XEmailsDoneYActionsDone=%s رایانامه دارای شرایط لازم بود، %s رایانامه با موفقیت پردازش شد ( برای %s مورد ثبت/کنش انجام شد)
-RecordEvent=ثبت رخداد رایانامه
-CreateLeadAndThirdParty=افزودن سرنخ (و شخص سوم در صورت ضرورت)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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=تعداد رایانامه‌های موجود در پوشۀ منبع
 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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=کدپستی
 MainMenuCode=کد ورودی فهرست (فهرست اصلی)
 ECMAutoTree=نمایش ساختاردرختی خودکار ECM
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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=پیکربندی واحد منابع
@@ -2124,7 +2128,7 @@ 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 گامی را انتخاب کرده باشید، پیشنهاد می‌شود یک گذرواژۀ دوم برای استفادۀ برنامه به‌جای گذرواژۀ خودتان برای حساب بسازید. این کار از 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 a string 'Name: name to find' found into the body, use 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=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=نقطۀ آخر برای %s : %s
 DeleteEmailCollector=حذف جمع‌آورندۀ رایانامه
 ConfirmDeleteEmailCollector=آیا مطمئن هستید می‌خواهید این جمع‌آورندۀ رایانامه را حذف کنید؟
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
index 5a41dc677b0..81fe35c4045 100644
--- a/htdocs/langs/fa_IR/banks.lang
+++ b/htdocs/langs/fa_IR/banks.lang
@@ -32,7 +32,7 @@ RIB=شماره حساب بانکی
 IBAN=شماره IBAN
 BIC=کد BIC/SWIFT
 SwiftValid=BIC/SWIFT معتبر است
-SwiftVNotalid=BIC/SWIFT معتبر نیست
+SwiftNotValid=BIC/SWIFT معتبر نیست
 IbanValid=BAN معتبر است
 IbanNotValid=BAN معتبر نیست
 StandingOrders=سفارش‌های برداشت مستقیم
@@ -49,7 +49,6 @@ BankAccountDomiciliation=نشانی بانک
 BankAccountCountry=کشور حساب
 BankAccountOwner=نام صاحب حساب
 BankAccountOwnerAddress=نشانی صاحب حساب
-RIBControlError=بررسی صحت مقادیر با خطا مواجه شد. این بدین معناست که اطلاعات این شماره حساب ناقص یا غلط است (کشور، اعداد و IBAN) را بررسی کنید.
 CreateAccount=ساخت حساب‌بانکی
 NewBankAccount=حساب‌بانکی جدید
 NewFinancialAccount=حساب‌مالی جدید
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/bookmarks.lang b/htdocs/langs/fa_IR/bookmarks.lang
index 8056e0bb6d9..25b6da4b668 100644
--- a/htdocs/langs/fa_IR/bookmarks.lang
+++ b/htdocs/langs/fa_IR/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=نشانی‌اینترنتی
 BehaviourOnClick=رفتار در هنگام انتخاب یک نشانی‌اینترنتی
 CreateBookmark=ساخت یک نشانه
 SetHereATitleForLink=یک نام برای نشانه انتخاب کنید
-UseAnExternalHttpLinkOrRelativeDolibarrLink=یک پیوند خارجی/مطلق  (https://URL) یا یک پیوند داخلی/نسبی (/DOLIBARR_ROOT/htdocs/...) استفاده کنید
+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=صفحۀ پیوند شده در پنجرۀ جدیدی نمایش داده شود یا همان پنچره
 BookmarksManagement=مدیریت نشانه‌ها
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index 5145f102cc5..c7200d15275 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -157,6 +157,18 @@ 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=شناسۀ کاری 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=چک
 VATIntraCheckDesc=شناسۀ م‌.ب.ا.ا. باید با پیش‌وند کشور بیاید. پیوند <b>%s</b> از خدمات European VAT checker service (VIES) استفاده می‌کند که نیاز به اتصال اینترنتی از سرور Dolibarr دارد
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=بررسی شناسۀ م.ب.ا.ا. داخل جامعه‌ای روی وبگاه کمیسیون اروپا
-VATIntraManualCheck=همچنین می‌توانید به‌طور دستی روی وبگاه کمیسیون اروپا بررسی کنید <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=بررسی مقدور نبود. خدمات بررسی برای کشور عضو (%s) ارائه نمی‌شود.
 NorProspectNorCustomer=مشتری‌احتمالی نیست/مشتری نیست
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index dbc2505ed1c..9ce3756fbdf 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -170,8 +170,9 @@ 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=- تمام مالیات‌ها در مقادیر نمایش داده شده، گنجانده شده‌اند
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- این شامل همۀ پرداخت‌های واقعی صورت‌حساب‌ها، هزینه‌ها، مالیات بر ارزش افزوده و حقوق‌ها است. <br>- بر حسب تاریخ پرداخت صورت‌حساب‌ها، هزینه‌ها، مالیات بر ارزش افزوده و حقوق‌ها می‌باشد. تاریخ کمک‌مالی برای کمک‌های مالی
+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=- شامل همۀ پرداخت‌های دریافت‌شدۀ مؤثر صورت‌حساب‌های مشتریان است. <br> -این بسته به تاریخ پرداخت این صورت‌حساب‌هاست<br>
 RulesCATotalSaleJournal=شامل همۀ سطور بستانکار دفترفروش‌روزانه است
@@ -295,3 +296,5 @@ 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/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 3aa8a9d0c5d..1231bb9e621 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=این طرف‌تماس قبلا ب
 ErrorCashAccountAcceptsOnlyCashMoney=این حساب‌بانکی نقدی است و تنها پرداخت‌های نقدی را می‌پذیرد.
 ErrorFromToAccountsMustDiffers=مبدأ و مقصد حساب‌های بانکی باید متفاوت باشد.
 ErrorBadThirdPartyName=مقدار غیرقابل‌قبول برای نام شخص‌سوم
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=بخش %s الزامی است
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=روش‌درج برای کدمشتری اشتباه است
 ErrorBadBarCodeSyntax=روش درج بارکد اشتباه است. ممکناست یک نوع بارکد اشتباه تنظیم کرده باشید یا یک پوشش-ماسک بارکد برای عددهی انتخاب کرده‌اید که با مقدار اسکن شده همخوان نیست.
 ErrorCustomerCodeRequired=کدمشتری الزامی است
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=دریافت خوراک RSS ممکن نبود. در ص
 ErrorForbidden=دسترسی بسته است. <br> شما در تلاشید به صفحه، بخش یا قابلیتی از یک واحد غیرفعال مراجعه نموده یا این‌که این تلاش برای دسترسی توسط یک نشست بدون مجوز که برای نام کاربری شما مجاز نیست انجام می‌شود.
 ErrorForbidden2=مجوزهای این کاربر از فهرست %s->%s از صفحۀ مدیر Dolibarr قابل تعیین کردن است.
 ErrorForbidden3=به نظر می‌رسد Dolibarr از طریق یک نشست تصدیق شده مورد استفاده قرار نگرفته است. نگاهی به مستندات راهنمای برپاسازی Dolibarr نموده تا چگونگی مدیریت تصدیق‌ها را بدانید (htaccess، mod_auth یا غیره...).
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=کلاس Imagick در این نسخۀ PHP یافت نشد. امکان ارائۀ پیش‌نمایش وجود ندارد. مدیران می‌توانند این زبانه را از فهرست برپاسازی - نمایش غیرفعال کنند.
 ErrorRecordAlreadyExists=این ردیف قبلا وجود داشته است
 ErrorLabelAlreadyExists=این برچسب قبلا وجود داشته است
@@ -271,6 +274,9 @@ 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.
@@ -312,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/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/holiday.lang b/htdocs/langs/fa_IR/holiday.lang
index 1c5cc1ebad9..823b4377048 100644
--- a/htdocs/langs/fa_IR/holiday.lang
+++ b/htdocs/langs/fa_IR/holiday.lang
@@ -27,7 +27,7 @@ DescCP=توضیحا
 SendRequestCP=ایجاد درخواست مرخصی
 DelayToRequestCP=درخواست مرخصی حداقل باید <b>%sروز()</b> قبل از تاریخ ترک ایجاد شود.
 MenuConfCP=تعادل مرخصی
-SoldeCPUser=تعادل مرخصی برابر با <b>%s</b> روز است
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=شما باید تاریخ پایانی، بیشتر از تاریخ شروع انتخاب کنید
 ErrorSQLCreateCP=یک خطای SQL در هنگام ساخت رخ داده:
 ErrorIDFicheCP=ک خطا رخ داد، درخواست مرخصی وجود ندارد
@@ -134,3 +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/install.lang b/htdocs/langs/fa_IR/install.lang
index 442890c4649..9ba0fde6f90 100644
--- a/htdocs/langs/fa_IR/install.lang
+++ b/htdocs/langs/fa_IR/install.lang
@@ -21,6 +21,7 @@ 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 وجود ندارد.
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 c43413f85bb..989faeb7c9f 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=خطا، نرخ م‌ب‌اا برای ک
 ErrorNoSocialContributionForSellerCountry=خطا، مالیات‌های اجتماعی/سیاست‌های مالی برای کشور "%s" تعریف نشده است.
 ErrorFailedToSaveFile=خطا، امکان ذخیرۀ فایل وجود نداشت.
 ErrorCannotAddThisParentWarehouse=شما در حال تلاش برای اضافه کردن یک انبار والد هستید که در حال حاضر مولودی از یک انبار والد دیگر است
+FieldCannotBeNegative=Field "%s" cannot be negative
 MaxNbOfRecordPerPage=حداکثر تعداد ردیف در یک صفحه
 NotAuthorized=شما برای انجام این کار مجاز نیستید.
 SetDate=تنظیم تاریخ
@@ -87,7 +88,7 @@ FileWasNotUploaded=یک فایل برای پیوست کردن انتخاب شد
 NbOfEntries=تعداد ورودی‌ه
 GoToWikiHelpPage=مطالعۀ راهنمای برخط (دسترسی به اینترنت نیاز است)
 GoToHelpPage=مطالعۀ راهنما
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=ردیف، ذخیره شد
 RecordDeleted=ردیف، حذف شد
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=کد آخرین خطای دسترسی به پایگ
 InformationLastAccessInError=اطلاعات مربوط به آخرین خطای دسترسی به پایگاه داده
 DolibarrHasDetectedError=Dolibarr با یک خطای فنی مواجه شده است
 YouCanSetOptionDolibarrMainProdToZero=شما می‌توانید فایل گزارش‌کار را مطالعه کرده یا در فایل پیکربندی گزینۀ $dolibarr_main_prod را برای دریافت اطلاعات بیشتر به '0' تغییر دهید
-InformationToHelpDiagnose=این اطلاعات برای اهداف تحلیل و بررسی قابل استفاده خواهد بود ( شما همچنان می‌توانید گزینۀ $dolibarr_main_prod را برای حذف این یادداشت‌ها به '1' تغییر دهید.
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=اطلاعات بیشتر
 TechnicalInformation=اطلاعات فنی
 TechnicalID=شناسۀ فنی
@@ -211,6 +212,8 @@ User=کاربر
 Users=کاربر
 Group=گروه
 Groups=گروه
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=هیچ گروه‌کاربری تعریف نشده است
 Password=گذرواژه
 PasswordRetype=گذرواژۀ خود را وارد نمائید
@@ -906,7 +909,7 @@ ViewFlatList=نمایش فهرست خطی
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=حذف عبارت '%s'
-SomeTranslationAreUncomplete=برخی از زبان‌های قابل انتخاب ممکن است تنها به شکل ناقص ترجمه شده باشد یا دارای خطا باشند. لطفا برای تکمیل و تصحیح زبان مورد نظر خود در <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> ثبت نام نمائید و اصلاحات مورد نظر خود را انجام دهید.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=منطقۀ زمانی مشتری (کاربر)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/fa_IR/modulebuilder.lang b/htdocs/langs/fa_IR/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/fa_IR/modulebuilder.lang
+++ b/htdocs/langs/fa_IR/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 4ba4294fb3f..6024d53da29 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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=منطقه صادرات
diff --git a/htdocs/langs/fa_IR/partnership.lang b/htdocs/langs/fa_IR/partnership.lang
index 8a800b02b29..b0f627b0c6d 100644
--- a/htdocs/langs/fa_IR/partnership.lang
+++ b/htdocs/langs/fa_IR/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/fa_IR/productbatch.lang b/htdocs/langs/fa_IR/productbatch.lang
index 5a4c6dbe5ed..c18f2b697d4 100644
--- a/htdocs/langs/fa_IR/productbatch.lang
+++ b/htdocs/langs/fa_IR/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index cd057537c34..5422a1d0aad 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=قیمت میانگین متوازن
 PMPValueShort=قیمت میانگین وزنی
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 8aa3cb26389..13df6369665 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -197,6 +197,7 @@ InputPerMonth=Input per month
 InputDetail=جزئیات ورودی
 TimeAlreadyRecorded=این زمان صرف شده قبلا برای این وظیفه/روز و کاربر %s ثبت شده است
 ProjectsWithThisUserAsContact=طرح‌های مربوط به این کاربر به‌عنوان طرف تماس
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=وظایف محول شده به این کاربر
 ResourceNotAssignedToProject=به طرح نسبت داده نشده
 ResourceNotAssignedToTheTask=به این طرح نسبت داده نشده
@@ -284,3 +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=تاریخ پایان نمی‌تواند قبل از تاریخ شروع باشد
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 2b35b8a5516..b6cffc97b0e 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=محدودیت موجودی برای هشدار و
 AddNewProductStockWarehouse=تعیین یک حد جدید موجودی و موجودی مطلوب برای هشدار 
 AddStockLocationLine=تعداد را کاهش داده و سپس برای ایجاد یک انبار جدید برای این محصول کلیک نمائید
 InventoryDate=تاریخ فهرست‌موجودی‌کالا
+Inventories=فهرست‌های‌موجودی
 NewInventory=فهرست‌موجودی جدید
 inventorySetup = برپاسازی فهرست‌موجودی
 inventoryCreatePermission=ساخت یک فهرست‌موجودی
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=اجازۀ تغییر مقدار PMP محصول
 ColumnNewPMP=واحد جدید PMP
 OnlyProdsInStock=عدم افزایش محصولات بدون موجودی
-TheoricalQty=تعداد تئوریک
-TheoricalValue=تعداد تئوریک
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=آخرین BP
 CurrentPA=BP فعلی
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=آغاز شده
+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
diff --git a/htdocs/langs/fa_IR/stripe.lang b/htdocs/langs/fa_IR/stripe.lang
index aa5ed9a19f9..eacb13233ed 100644
--- a/htdocs/langs/fa_IR/stripe.lang
+++ b/htdocs/langs/fa_IR/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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=از آدرس های زیر در دسترس است به ارائه یک صفحه به مشتریان به پرداخت در اشیاء Dolibarr است
 PaymentForm=فرم پرداخت
@@ -28,7 +28,6 @@ AccountParameter=پارامترهای حساب
 UsageParameter=پارامترهای طریقه استفاده
 InformationToFindParameters=کمک برای پیدا کردن٪ شما اطلاعات حساب
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=نام فروشنده
 CSSUrlForPaymentForm=آدرس شیوه نامه CSS برای فرم پرداخت
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
index 0ffb4b05166..0534914a826 100644
--- a/htdocs/langs/fa_IR/withdrawals.lang
+++ b/htdocs/langs/fa_IR/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=آخرین %s مستند دریافت مستقیم
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ 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=طبقه بندی اعتبار
+ClassDebited=Classify debited
 ClassCreditedConfirm=آیا مطمئن هستید که می خواهید برای طبقه بندی این دریافت و برداشت به عنوان در حساب بانکی شما اعتبار؟
 TransData=تاریخ انتقال
 TransMetod=طريقة البث
@@ -80,7 +82,7 @@ StatusMotif7=تصمیم گیری قضایی
 StatusMotif8=دلیل دیگر
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=تنها دفتر
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index 07c06e48951..d2dec29ce29 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=EU: n ulkopuoliset maat
 CountriesInEECExceptMe=EU-alueen maat, poislukien %s
 CountriesExceptMe=Kaikki maat, poislukien %s
 AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Virhe, tätä kirjanpito tiliä ei voida poistaa koska se on käytössä
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
@@ -387,7 +387,8 @@ 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=Laskettu
@@ -404,6 +405,7 @@ NoJournalDefined=No journal defined
 Binded=Rivit yhdistetty
 ToBind=Yhdistettäviä rivejä
 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index cf6d130559d..a1f177033a2 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Säätiö
 Version=Versio
 Publisher=Julkaisija
@@ -265,8 +267,8 @@ OtherResources=Muut resurssit
 ExternalResources=Ulkoiset resurssit
 SocialNetworks=Sosiaaliset verkostot
 SocialNetworkId=Sosiaalisen verkoston tunnus
-ForDocumentationSeeWiki=Käyttäjälle tai kehittäjän dokumentaatio (doc, FAQs ...), <br> katsoa, että Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
-ForAnswersSeeForum=Muita kysymyksiä / apua, voit käyttää Dolibarr foorumilla: <br> <a href="%s" target="_blank"><b> %s</b></a>
+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=Tässä on joitain resursseja, joilla saat apua ja tukea Dolibarrin kanssa.
 HelpCenterDesc2=Osa näistä resursseista on saatavana vain  <b> englanniksi </b>.
 CurrentMenuHandler=Nykyinen valikko handler
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Viimeisin vakaa versio
 LastActivationDate=Viimeisin aktivointipäivä
 LastActivationAuthor=Viimeisin taho, joka on suorittanut aktivoinnin
 LastActivationIP=Viimeinen aktiivinen IP
+LastActivationVersion=Latest activation version
 UpdateServerOffline=Palvelimen offline-päivitys
 WithCounter=Laskurin hallinta
 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Poista sendings
 Permission111=Lue tilinpäätös
 Permission112=Luoda / muuttaa / poistaa ja vertailla liiketoimet
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Vientitoimien ja tiliotteita
 Permission116=Siirrot tilien välillä
@@ -762,6 +765,7 @@ Permission121=Lue kolmannen osapuolen liittyy käyttäjän
 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)
@@ -889,12 +893,11 @@ Permission701=Lue lahjoitukset
 Permission702=Luoda / muuttaa lahjoitusten
 Permission703=Poista lahjoitukset
 Permission771=Lue kuluraportit
-Permission772=Luo/Muokkaa kuluraportteja
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Poista kuluraportit
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Hyväksy kuluraportit
 Permission776=Maksa kuluraportit
-Permission777=Lue kaikkien kuluraportit
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Luo / muokkaa kaikkien kuluraportteja
 Permission779=Kuluraporttien vienti
 Permission1001=Lue varastot
@@ -958,15 +961,11 @@ Permission2801=Käytä FTP ohjelmaa lukutilassa (vain selain ja lataukset)
 Permission2802=Käytä FTP ohjelmaa kirjoitustilassa (poista tai päivitä tiedostot)
 Permission3200=Read archived events and fingerprints
 Permission3301=Luo uusia moduuleja
-Permission4001=Selaa työntekijöitä
-Permission4002=Luo työntekijä
-Permission4003=Poista työntekijöitä
-Permission4004=Työntekijän tietojen vienti
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ Permission10005=Poista verkkosivuston sisältö
 Permission20001=Lue poissaolopyynnöt (omat ja alaisten poissaolot)
 Permission20002=Luo / muokkaa poissaolopyyntöjäsi (omat ja alaisten poissaolot)
 Permission20003=Poista poissaolopyynnöt
-Permission20004=Lue kaikki poissaolopyynnöt (myös käyttäjien, jotka eivät ole alaisiasi)
-Permission20005=Luo / muokkaa kaikkien poissaolopyyntöjä (myös käyttäjien, jotka eivät ole alaisiasi)
-Permission20006=Poissaolopyyntöjen hallinnointi (saldojen määritys ja päivitys)
+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=Hyväksy poissaolopyynnöt
 Permission23001=Selaa ajastetut työt
 Permission23002=Luo/päivitä Ajastettu työ
@@ -1358,9 +1357,9 @@ BrowserIsOK=Käytät verkkoselainta %s. Tämä selain on turvallisuuden ja suori
 BrowserIsKO=Käytät verkkoselainta %s. Tämän selaimen tiedetään olevan huono valinta turvallisuden, suorituskyvyn ja luotettavuuden kannalta. Suosittelemme Firefoxin, Chromen, Operan tai Safarin käyttöä.
 PHPModuleLoaded=PHP:n laajennus %sladattu
 PreloadOPCode=Esiladattua OPCode-koodia käytetään
-AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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=Kysy ensisijaista lähetystapaa kolmansille osapuolille.
 FieldEdition=Alalla painos %s
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Edunsaajavaltiot
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Lähetysmoduulin asetukset
 SendingsReceiptModel=Lähettävä vastaanottanut malli
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Vapaa tekstihaku toimituksen tulot
 ##### FCKeditor #####
 AdvancedEditor=Kehittynyt editori
 ActivateFCKeditor=Ota FCKeditor varten:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field public notes of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field private notes of elements
+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>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Kuluraporttien numerointimoduuli
 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=Luettelo automaattisista ilmoituksista käyttäjää kohti *
 ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
 ListOfFixedNotifications=Luettelo automaattisista kiinteistä ilmoituksista
@@ -1916,6 +1917,8 @@ 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)
+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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Haluatko suorittaa tämän keräilijän kokoelman n
 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)
-RecordEvent=Tallenna sähköpostitapahtuma
-CreateLeadAndThirdParty=Luo liidi (ja tarvittaessa kolmas osapuoli)
-CreateTicketAndThirdParty=Luo tiketti (ja linkitä kolmanteen osapuoleen, jos se on ladattu edellisellä toiminnolla)
+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=Viimeisin tuloskoodi
 NbOfEmailsInInbox=Lähdehakemistossa olevien sähköpostien määrä
 LoadThirdPartyFromName=Lataa kolmannen osapuolen haku sivustolta %s (vain lataus)
 LoadThirdPartyFromNameOrCreate=Lataa kolmannen osapuolen haku sivustolta %s (luo, jos sitä ei löydy)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Viesti keskustelusta, jonka aloitti ensimmäinen sähköposti, lähetetty Dolibarrista
 WithoutDolTrackingID=Viesti keskustelusta, jonka aloitti ensimmäinen sähköposti, EI lähetetty Dolibarrista
 WithDolTrackingIDInMsgId=Viesti lähetetty Dolibarrista
@@ -2078,7 +2082,7 @@ CreateCandidature=Luo työhakemus
 FormatZip=Postinumero
 MainMenuCode=Valikkokoodi (päävalikko)
 ECMAutoTree=Näytä automaattinen ECM-puu
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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=Aukioloajat
 OpeningHoursDesc=Yrityksen tavalliset aukioloajat
 ResourceSetup=Resurssimoduulin määritys
@@ -2124,7 +2128,7 @@ LargerThan=Suurempi kuin
 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=Jos otit käyttöön kaksivaiheisen vahvistuksen Gmail-tilillä, on suositeltavaa luoda erillinen toinen salasana sovellukselle sen sijaan, että käyttäisit omaa tilin salasanasi osoitteessa 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 a string 'Name: name to find' found into the body, use 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=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=Poista sähköpostin kerääjä
 ConfirmDeleteEmailCollector=Haluatko varmasti poistaa tämän sähköpostin kerääjän?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index 6330351f3cb..d94dde8b035 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -32,7 +32,7 @@ RIB=Pankkitilin numero
 IBAN=IBAN-numero
 BIC=BIC/SWIFT-koodi\n
 SwiftValid=BIC/SWIFT hyväksytty
-SwiftVNotalid=BIC/SWIFT virheellinen
+SwiftNotValid=BIC/SWIFT virheellinen
 IbanValid=BAN hyväksytty
 IbanNotValid=BAN virheellinen
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Tilin maa
 BankAccountOwner=Tilinomistajan nimi
 BankAccountOwnerAddress=Tilinomistajan osoite
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Luo tili
 NewBankAccount=Uusi tili
 NewFinancialAccount=New rahoitustili
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/bookmarks.lang b/htdocs/langs/fi_FI/bookmarks.lang
index 46123873ca1..71cf75d7328 100644
--- a/htdocs/langs/fi_FI/bookmarks.lang
+++ b/htdocs/langs/fi_FI/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Käyttäydy kun kirjanmerkki URL on valittu
 CreateBookmark=Luo kirjanmerkki
 SetHereATitleForLink=Set a name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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=Kirjanmerkkien hallinta
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index c4d6712e5a0..63acef2de06 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -157,6 +157,18 @@ 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=Professori Id 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Shekki
 VATIntraCheckDesc=ALV-tunnuksen täytyy sisältää maatunnus. Linkki <b>%s</b> käyttää European VAT checker service (VIES)  - palvelua ja tarvii internet-yhteyden Dolibarr-palvelimeen
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Tarkasta ALV-tunnus E.U: n sivuilta
-VATIntraManualCheck=Voit tehdä tarkastuksen myös käsin E.U: n sivuilla <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Tarkistaminen ei mahdollista. Jäsenvaltio ei toimita tarkastuspalvelua ( %s).
 NorProspectNorCustomer=Ei mahdollinen asiakas eikä asiakas
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index 9a056eddd7e..e86709e5c48 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 45c08f9ac9a..bbbace60e76 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Ei saada RSS-syötteen. Yritä lisätä jatkuvasti MAIN
 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=Lupa tämän sisäänkirjoittautumissivuksesi voidaan määritellä oma Dolibarr järjestelmänvalvoja valikkopalkki %s-> %s.
 ErrorForbidden3=Vaikuttaa siltä, että Dolibarr ei käytetä kautta autentikoitu istunnossa. Tutustu Dolibarr setup asiakirjat tietää, miten hallita authentications (htaccess, mod_auth tai muita ...).
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=Tehtävä imagick_readimage ei löydy tässä PHP. Esikatselu ei voi olla käytettävissä. Järjestelmänvalvojat voivat poistaa tämän välilehden valikosta Asetukset - Näyttö.
 ErrorRecordAlreadyExists=Record jo olemassa
 ErrorLabelAlreadyExists=This label already exists
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/fi_FI/holiday.lang
index 5b887d1fd2e..f83bf3dc4f6 100644
--- a/htdocs/langs/fi_FI/holiday.lang
+++ b/htdocs/langs/fi_FI/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Kuvaus
 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/fi_FI/install.lang
index 3429db56d18..ffca553a4f2 100644
--- a/htdocs/langs/fi_FI/install.lang
+++ b/htdocs/langs/fi_FI/install.lang
@@ -21,6 +21,7 @@ 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.
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 4b258762a6d..8e4a8be635c 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Virhe ei alv määritellään maa ' %s'.
 ErrorNoSocialContributionForSellerCountry=Virhe, ei sosiaalisia tai fiskaalisia verotyyppejä, jotka on määritelty maata "%s" varten.
 ErrorFailedToSaveFile=Virhe, ei tallenna tiedosto.
 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=Maks. tietueiden määrä sivua kohden
 NotAuthorized=Oikeutesi ei riitä tähän toimintoon
 SetDate=Aseta päivä
@@ -87,7 +88,7 @@ FileWasNotUploaded=Tiedosto on valittu liite mutta ei ollut vielä ladattu. Klik
 NbOfEntries=Merkintöjen määrä
 GoToWikiHelpPage=Lue online-ohjeet (tarvitaan Internet-yhteys)
 GoToHelpPage=Lue auttaa
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Kotisivu
 RecordSaved=Record tallennettu
 RecordDeleted=Tallennus poistettu
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Viimeisin tietokannan käyttöoikeuspyyntövirheen p
 InformationLastAccessInError=Tiedot viimeisimmän tietokannan käyttöoikeuspyynnön virheestä
 DolibarrHasDetectedError=Dolibarr on havaittu tekninen virhe
 YouCanSetOptionDolibarrMainProdToZero=Voit lukea lokitiedoston tai asettaa asetustiedoston $ dolibarr_main_prod arvoksi '0' saadaksesi lisätietoja.
-InformationToHelpDiagnose=Nämä tiedot voivat olla hyödyllisiä vianmääritystarkoituksiin (voit asettaa vaihtoehdon $ dolibarr_main_prod arvoon '1' poistamaan tällaiset ilmoitukset)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Lisätietoa
 TechnicalInformation=Tekniset tiedot
 TechnicalID=Tekninen tunniste
@@ -211,6 +212,8 @@ User=Käyttäjä
 Users=Käyttäjät
 Group=Ryhmä
 Groups=Ryhmät
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Käyttäjäryhmää ei ole määritelty
 Password=Salasana
 PasswordRetype=Kirjoitta salasana uudelleen
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Asiakasohjelman aikavyöhyke (käyttäjä)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/fi_FI/modulebuilder.lang b/htdocs/langs/fi_FI/modulebuilder.lang
index 5db07216cfa..65cb337ec6d 100644
--- a/htdocs/langs/fi_FI/modulebuilder.lang
+++ b/htdocs/langs/fi_FI/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 68c84d40182..addd43c0748 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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
diff --git a/htdocs/langs/fi_FI/partnership.lang b/htdocs/langs/fi_FI/partnership.lang
index 30821e0e13c..6a131352a07 100644
--- a/htdocs/langs/fi_FI/partnership.lang
+++ b/htdocs/langs/fi_FI/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/fi_FI/productbatch.lang b/htdocs/langs/fi_FI/productbatch.lang
index 887d4f506c8..65c30ce6109 100644
--- a/htdocs/langs/fi_FI/productbatch.lang
+++ b/htdocs/langs/fi_FI/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 9f5323556bd..b067ead47d8 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Value
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index ba6bfc4d1f3..3eec3031322 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/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,3 +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/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 27096dafdc1..e19a9593166 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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=Fill real quantity with expected quantity
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=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
diff --git a/htdocs/langs/fi_FI/stripe.lang b/htdocs/langs/fi_FI/stripe.lang
index c14c2d42860..b989a171efc 100644
--- a/htdocs/langs/fi_FI/stripe.lang
+++ b/htdocs/langs/fi_FI/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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=Seuraavat URL-osoitteet ovat käytettävissä tarjota sivu asiakas tehdä maksua Dolibarr esineitä
 PaymentForm=Maksu-muodossa
@@ -28,7 +28,6 @@ AccountParameter=Tilin parametrit
 UsageParameter=Käyttöparametrien
 InformationToFindParameters=Auta löytää %s tilitiedot
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Nimi myyjä
 CSSUrlForPaymentForm=CSS-tyylisivu url maksun muodossa
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index a3ecf66ac19..44a397de7ff 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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=Luokittele hyvitetyksi
+ClassDebited=Classify debited
 ClassCreditedConfirm=Oletko varma, että haluat luokitella tämän vetäytymisen vastaanottamisesta kuin hyvitetty pankkitilisi?
 TransData=Päivämäärä Lähetetty
 TransMetod=Menetelmä Lähetetty
@@ -80,7 +82,7 @@ StatusMotif7=Ratkaisusta
 StatusMotif8=Muu syy
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Vain toimisto
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ ModeWarning=Vaihtoehto todellista tilaa ei ole asetettu, pysähdymme jälkeen si
 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
diff --git a/htdocs/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang
index 8d96468cbf1..11b91eb3db3 100644
--- a/htdocs/langs/fr_BE/accountancy.lang
+++ b/htdocs/langs/fr_BE/accountancy.lang
@@ -4,7 +4,5 @@ Lineofinvoice=Lignes de facture
 Doctype=Type de document
 ErrorDebitCredit=Débit et crédit ne peuvent pas être non-nuls en même temps
 TotalMarge=Marge de ventes totale
-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)
 Selectmodelcsv=Sélectionnez un modèle d'export
 Modelcsv_normal=Export classique
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index 72e10111142..81e53590442 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -14,18 +14,11 @@ WarningModuleNotActive=Le module <b>%s</b> doit être activé
 WarningOnlyPermissionOfActivatedModules=Seules les permissions liées à des modules activés sont montrées ici. Vous pouvez activer d'autres modules sur la page Accueil->Configuration->Modules.
 FormToTestFileUploadForm=Formulaire pour tester l'upload de fichiers (selon la configuration)
 IfModuleEnabled=Note: oui ne fonctionne que si le module <b>%s</b> est activé
-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>"
 Module20Name=Propales
 Module30Name=Factures
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
 Target=Objectif
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
+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
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/fr_BE/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/fr_BE/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/fr_BE/compta.lang b/htdocs/langs/fr_BE/compta.lang
index 508a598d115..a4ec8230e86 100644
--- a/htdocs/langs/fr_BE/compta.lang
+++ b/htdocs/langs/fr_BE/compta.lang
@@ -1,10 +1,3 @@
 # Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
 Dispatched=Envoyé
 ToDispatch=Envoyer
-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)
diff --git a/htdocs/langs/fr_BE/errors.lang b/htdocs/langs/fr_BE/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/fr_BE/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/fr_BE/members.lang b/htdocs/langs/fr_BE/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/fr_BE/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/fr_BE/mrp.lang b/htdocs/langs/fr_BE/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/fr_BE/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/fr_BE/orders.lang b/htdocs/langs/fr_BE/orders.lang
index 00ba721c098..7995f23aae3 100644
--- a/htdocs/langs/fr_BE/orders.lang
+++ b/htdocs/langs/fr_BE/orders.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
 StatusOrderApprovedShort=Approuvé
 StatusOrderApproved=Approuvé
diff --git a/htdocs/langs/fr_BE/printing.lang b/htdocs/langs/fr_BE/printing.lang
deleted file mode 100644
index beb0f283826..00000000000
--- a/htdocs/langs/fr_BE/printing.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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
-MenuDirectPrinting=One click Printing jobs
-DirectPrint=One click Print
diff --git a/htdocs/langs/fr_BE/products.lang b/htdocs/langs/fr_BE/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/fr_BE/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/fr_BE/propal.lang b/htdocs/langs/fr_BE/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/fr_BE/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/fr_BE/receptions.lang b/htdocs/langs/fr_BE/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/fr_BE/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/fr_BE/sendings.lang b/htdocs/langs/fr_BE/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/fr_BE/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/fr_BE/stocks.lang b/htdocs/langs/fr_BE/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/fr_BE/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/fr_BE/trips.lang b/htdocs/langs/fr_BE/trips.lang
deleted file mode 100644
index 61195908177..00000000000
--- a/htdocs/langs/fr_BE/trips.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-ExpenseReportLimitAmount=Max amount
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index 7632fcaca1c..570826a2d43 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -119,7 +119,6 @@ DescVentilTodoExpenseReport=Les lignes de rapport de frais de liaison ne sont pa
 DescVentilExpenseReport=Consultez ici la liste des lignes de rapport de dépenses liées (ou non) à un compte comptable de frais
 DescVentilDoneExpenseReport=Consultez ici la liste des rapports des lignes de dépenses et de leurs comptes comptables
 ValidateMovements=Valider les écritures
-AutomaticBindingDone=Liaison automatique effectuée
 FicheVentilation=Carte de reliure
 GeneralLedgerIsWritten=Les transactions sont écrites dans le Ledger
 ChangeBinding=Changer la liaison
@@ -128,8 +127,6 @@ CategoryDeleted=La catégorie pour le compte comptable a été supprimée
 AccountingJournals=Revues comptables
 AccountingJournalType9=A-nouveau
 ErrorAccountingJournalIsAlreadyUse=Ce journal est déjà utilisé
-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)
 ChartofaccountsId=Carte comptable Id
 InitAccountancy=Compabilité initiale
 DefaultBindingDesc=Cette page peut être utilisée pour définir un compte par défaut à utiliser pour lier l'historique des transactions sur les salaires de paiement, le don, les taxes et la TVA lorsque aucun compte comptable spécifique n'a été défini.
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index 9ffea13d5f0..41812f1e821 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -62,8 +62,6 @@ LastActivationAuthor=Dernier auteur d'activation
 LastActivationIP=Dernière activation IP
 GenericMaskCodes4a=<br><u> Exemple au 99th %s du tiers TheCompany, avec la date 2007-01-31: </u>
 GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donnera <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> donnera <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> donnera <b>IN0701-0099-A</b> si le type d'entreprise est 'Responsable Inscripto' avec un code pour le type 'A_RI'
-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>"
 ListOfDirectoriesForModelGenODT=Liste des répertoires contenant des fichiers de modèles avec le format OpenDocument . <br><br> Mettez ici le chemin complet des répertoires .<br>Ajouter un retour chariot entre répertoire eah.<br> Pour ajouter un répertoire du module de GED , ajouter ici<b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> Fichiers dans ces répertoires doit se terminer par <b>.odt</b> or <b>.ods</b>.
 PlaceCustomerAddressToIsoLocation=Utilisez french standard position (La Poste) pour le client position d'adresse
 OldVATRates=Ancien taux de TPS/TVH
@@ -113,32 +111,27 @@ Permission171=Lire les déplacements et les dépenses (le vôtre et vos subordon
 Permission771=Lire les rapports de dépenses (le vôtre et vos subordonnés )
 Permission1322=Réouvrir une facture payée
 Permission2414=Exportation d'actions/tâches des autres
-Permission20006=Administration des demandes de congé (balance de configuration et de mise à jour )
 Permission23004=Exécuté Travail planifié
 Permission59001=Consulter les propositions commerciales
 Permission63002=Créer / modifier des ressources
 Permission63004=Relier les ressources aux événements de l'agenda
 DictionaryActions=Types d'événements de l'agenda
 DictionaryVAT=Taux de TPS/TVH ou de Taxes de Ventes
-DictionaryOrderMethods=Order methods
 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
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
 InfoDolibarr=À propos de Dolibarr
 InfoBrowser=À propos du navigateur
 InfoWebServer=À propos du serveur Web
 InfoPHP=À propos de PHP
 InfoPerf=À propos des performances
 AreaForAdminOnly=Les paramètres d'installation peuvent être définis par <b> utilisateurs d'administrateur </ b> uniquement.
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
 DictionaryDesc=Insérez toutes les données de référence. Vous pouvez ajouter vos valeurs par défaut.
 MiscellaneousDesc=Tous les autres paramètres liés à la sécurité sont définis ici.
 UnitPriceOfProduct=Prix unitaire (no tax) d'un produit
-MAIN_DISABLE_METEO=Disable weather thumb
 TranslationKeySearch=Rechercher une clé ou une chaîne de traduction
 TranslationOverwriteKey=Ecraser une chaîne de traduction
 TranslationOverwriteDesc=Vous pouvez également remplacer les chaînes en remplissant le tableau suivant. Choisissez votre langue dans le menu déroulant "%s", insérez la chaîne de traduction dans "%s" et votre nouvelle traduction dans "%s"
@@ -162,7 +155,6 @@ FreeLegalTextOnSupplierProposal=Texte libre sur les demandes de prix fournisseur
 WatermarkOnDraftSupplierProposal=Filigrane sur le projet de prix demande des fournisseurs (si aucun laisser vide)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Demandez compte bancaire de destination pour les demandes de prix
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Demandez une source d'entrepôt pour l'ordre
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
 ShippableOrderIconInList=Ajouter un icône dans la liste des commandes qui indique si la commande est expédiable.
 LDAPAdminDnExample=DN complet (ex: cn = admin, dc = exemple, dc = com ou cn = Administrateur, cn = Utilisateurs, dc = exemple, dc = com pour le répertoire actif)
 LDAPFieldTitle=Poste
@@ -245,9 +237,9 @@ ListOfAvailableAPIs=Liste des API disponibles
 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)
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 FormatZip=Code postal
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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 a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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_CA/banks.lang b/htdocs/langs/fr_CA/banks.lang
index f518fc82162..037950c8aca 100644
--- a/htdocs/langs/fr_CA/banks.lang
+++ b/htdocs/langs/fr_CA/banks.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - banks
 MenuBankCash=Banques | Encaisse
 SwiftValid=BIC / SWIFT valide
-SwiftVNotalid=BIC / SWIFT non valide
 IbanValid=BAN valide
 IbanNotValid=BAN non valide
 StandingOrders=Ordres de débit direct
@@ -10,7 +9,6 @@ PaymentByDirectDebit=Paiement par paiement direct
 AccountStatement=Relevé de compte
 AccountStatements=Relevés de compte
 BankAccountDomiciliation=Adresse de la banque
-RIBControlError=Échec de la vérification de l'intégrité des valeurs. Cela signifie que l'information pour ce numéro de compte est incomplète ou incorrecte (vérifier pays, numéros et IBAN)
 EditFinancialAccount=Modifier compte
 ConfirmDeleteAccount=Êtes-vous sûr de vouloir supprimer ce compte?
 BankTransactionByCategories=Entrées bancaires par catégories
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/cashdesk.lang b/htdocs/langs/fr_CA/cashdesk.lang
index f966f93f5e5..2f3da52b1f5 100644
--- a/htdocs/langs/fr_CA/cashdesk.lang
+++ b/htdocs/langs/fr_CA/cashdesk.lang
@@ -2,4 +2,3 @@
 NoVAT=Pas de TVA (TAXE) pour cette vente
 BankToPay=Compte pour le paiement
 DolibarrReceiptPrinter=Imprimante de reçu Dolibarr
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/fr_CA/compta.lang b/htdocs/langs/fr_CA/compta.lang
index f1be6c1191e..886c9020d9a 100644
--- a/htdocs/langs/fr_CA/compta.lang
+++ b/htdocs/langs/fr_CA/compta.lang
@@ -43,10 +43,8 @@ DeleteSocialContribution=Effacer charge sociale
 ExportDataset_tax_1=Charges sociales et paiements
 CalcModeVATDebt=Mode <b>%sTPS/TVH sur débit%s</b>.
 CalcModeVATEngagement=Mode <b>%s TPS/TVH sur encaissement%s</b>.
-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, des dépenses, de la TVA et des salaires. La date de donation pour le don.
 DepositsAreIncluded=- Les factures de versement sont incluses
 LT1ReportByCustomersES=Rapport par tiers des RE (TVA)
-VATReportByThirdParties=Sales tax report by third party
 LT1ReportByQuartersES=Rapport par taux de RE (TVQ)
 WarningDepositsNotIncluded=Les factures de acompte ne sont pas incluses dans cette version avec ce module de comptabilité.
 DatePaymentTermCantBeLowerThanObjectDate=La date limite de règlement ne peut être inférieure à la date de l'object
@@ -65,9 +63,3 @@ ImportDataset_tax_vat=Paiements de vat
 ErrorBankAccountNotFound=Erreur: compte bancaire introuvable
 FiscalPeriod=Période de comptabilité
 ListSocialContributionAssociatedProject=Liste des contributions sociales associées au projet
-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)
diff --git a/htdocs/langs/fr_CA/errors.lang b/htdocs/langs/fr_CA/errors.lang
index bb4e2ef50a1..86d639a66e5 100644
--- a/htdocs/langs/fr_CA/errors.lang
+++ b/htdocs/langs/fr_CA/errors.lang
@@ -48,7 +48,6 @@ ErrorBadFormatValueList=La valeur de la liste ne peut pas contenir plus d'une vi
 ErrorExportDuplicateProfil=Ce nom de profil existe déjà pour ce jeu d'exportation.
 ErrorLDAPSetupNotComplete=La correspondance Dolibarr-LDAP n'est pas complète.
 ErrorLDAPMakeManualTest=Un fichier .ldif a été généré dans le répertoire %s. Essayez de le charger manuellement à partir de la ligne de commande pour avoir plus d'informations sur les erreurs.
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
 ErrorModuleRequireJavascript=Javascript ne doit pas être désactivé pour que cette fonction fonctionne. Pour activer / désactiver Javascript, accédez au menu Accueil-> Configuration-> Affichage.
 ErrorPasswordsMustMatch=Les deux mots de passe dactylographiés doivent correspondre les uns aux autres
 ErrorFileIsInfectedWithAVirus=Le programme antivirus n'a pas pu valider le fichier (le fichier peut être infecté par un virus)
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index d1b915cea96..61ed834131a 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -143,4 +143,3 @@ SearchIntoCustomerShipments=Envois clients
 SearchIntoExpenseReports=Note de frais
 AssignedTo=Affecté à
 ToProcess=Procéder
-Properties=Properties
diff --git a/htdocs/langs/fr_CA/members.lang b/htdocs/langs/fr_CA/members.lang
index 723b281bce4..5f0471aae42 100644
--- a/htdocs/langs/fr_CA/members.lang
+++ b/htdocs/langs/fr_CA/members.lang
@@ -6,7 +6,6 @@ Member=Membre
 Members=Membres
 ShowMember=Afficher la carte membre
 UserNotLinkedToMember=L'utilisateur n'est pas lié à un membre
-MembersTickets=Membership address sheet
 FundationMembers=Membres de la Fondation
 ListOfValidatedPublicMembers=Liste des membres publics validés
 ErrorThisMemberIsNotPublic=Ce membre n'est pas public
@@ -40,7 +39,6 @@ NewCotisation=Nouvelle contribution
 PaymentSubscription=Nouveau paiement de contribution
 SubscriptionEndDate=Date de fin de l'abonnement
 MembersTypeSetup=Configuration des types de membres
-NewSubscription=New contribution
 NewSubscriptionDesc=Ce formulaire vous permet d'enregistrer votre abonnement en tant que nouveau membre de la fondation. Si vous souhaitez renouveler votre abonnement (si déjà un membre), veuillez contacter le conseil de fondation par email %s.
 SubscriptionLate=Retard
 AddMember=Créer un membre
diff --git a/htdocs/langs/fr_CA/mrp.lang b/htdocs/langs/fr_CA/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/fr_CA/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/fr_CA/orders.lang b/htdocs/langs/fr_CA/orders.lang
index 2593059be53..d94775f771e 100644
--- a/htdocs/langs/fr_CA/orders.lang
+++ b/htdocs/langs/fr_CA/orders.lang
@@ -7,7 +7,6 @@ OrderToProcess=Commander pour traiter
 NewOrder=nouvel ordre
 ToOrder=Faire une commande
 MakeOrder=Faire une commande
-SaleOrderLines=Sales order lines
 StatusOrderCanceledShort=Annulé
 StatusOrderProcessedShort=Traité
 StatusOrderDelivered=Livré
diff --git a/htdocs/langs/fr_CA/printing.lang b/htdocs/langs/fr_CA/printing.lang
index 3540c7628c2..820007d2a4e 100644
--- a/htdocs/langs/fr_CA/printing.lang
+++ b/htdocs/langs/fr_CA/printing.lang
@@ -1,9 +1,4 @@
 # 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
-MenuDirectPrinting=One click Printing jobs
-DirectPrint=One click Print
 PrintingDriverDesc=Variables de configuration pour l'impression du pilote.
 ListDrivers=Liste des conducteurs
 PrintTestDesc=Liste des imprimantes.
diff --git a/htdocs/langs/fr_CA/products.lang b/htdocs/langs/fr_CA/products.lang
index 886eac709aa..6e3f9b4042e 100644
--- a/htdocs/langs/fr_CA/products.lang
+++ b/htdocs/langs/fr_CA/products.lang
@@ -136,7 +136,6 @@ AddUpdater=Ajouter une mise à jour
 UpdateInterval=Intervalle de mise à jour (minutes)
 CorrectlyUpdated=Correctement mis à jour
 PropalMergePdfProductActualFile=Les fichiers utilisés pour ajouter au PDF Azur sont / sont
-IncludingProductWithTag=Including products/services with the tag
 NbOfQtyInProposals=Qté dans les propositions
 ClinkOnALinkOfColumn=Cliquez sur un lien de la colonne %s pour obtenir une vue détaillée ...
 TranslatedLabel=Etiquette traduite
@@ -145,7 +144,6 @@ ProductVolume=Volume pour 1 produit
 DeleteProductBuyPrice=Supprimer le prix d'achat
 ConfirmDeleteProductBuyPrice=Êtes-vous sûr de vouloir supprimer ce prix d'achat?
 ServiceSheet=Feuille de service
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
 ProductAttributeName=Attribut Variant %s
 ProductAttributeDeleteDialog=Êtes-vous sûr de vouloir supprimer cet attribut? Toutes les valeurs seront supprimées
 ProductAttributeValueDeleteDialog=Êtes-vous sûr de vouloir supprimer la valeur "%s" avec la référence "%s" de cet attribut?
diff --git a/htdocs/langs/fr_CA/projects.lang b/htdocs/langs/fr_CA/projects.lang
index 2dcbd564066..da20c99be8e 100644
--- a/htdocs/langs/fr_CA/projects.lang
+++ b/htdocs/langs/fr_CA/projects.lang
@@ -101,4 +101,5 @@ IdTaskTime=Id temps de tâche
 OpenedProjectsByThirdparties=Projets ouverts par des tiers
 OppStatusPENDING=Créance
 OppStatusWON=A gagné
+TimeSpentForIntervention=Temps passé
 TimeSpentForInvoice=Temps passé
diff --git a/htdocs/langs/fr_CA/receptions.lang b/htdocs/langs/fr_CA/receptions.lang
index d5664f4fff1..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é
@@ -16,6 +15,5 @@ ConfirmValidateReception=Êtes vous certain que vous voulez valider cette récep
 ConfirmCancelReception=Êtes-vous certain que vous voulez annuler cette réception?
 SendReceptionByEMail=Envoyer la réception par courriel
 SendReceptionRef=Envoi de la réception %s
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
 ProductQtyInReceptionAlreadySent=Quantité de produit de la commande client en cours déjà envoyée
 ProductQtyInSuppliersReceptionAlreadyRecevied=Quantité de produit de la commande fournisseur ouverte déjà reçue
diff --git a/htdocs/langs/fr_CA/sendings.lang b/htdocs/langs/fr_CA/sendings.lang
index f2130eb2192..d6280ee2414 100644
--- a/htdocs/langs/fr_CA/sendings.lang
+++ b/htdocs/langs/fr_CA/sendings.lang
@@ -35,7 +35,6 @@ DateReceived=Date de livraison reçue
 SendShippingRef=Soumission d'envoi %s
 ActionsOnShipping=Évènements à l'expédition
 LinkToTrackYourPackage=Lien pour suivre votre colis
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
 ShipmentLine=Ligne de livraison
 ProductQtyInShipmentAlreadySent=Quantité de produit de la commande client en cours déjà envoyée
 WeightVolShort=Poids / Vol.
diff --git a/htdocs/langs/fr_CA/stocks.lang b/htdocs/langs/fr_CA/stocks.lang
index bfc849c162d..0d48acac911 100644
--- a/htdocs/langs/fr_CA/stocks.lang
+++ b/htdocs/langs/fr_CA/stocks.lang
@@ -17,7 +17,6 @@ StockTooLow=Stock trop bas
 StockLowerThanLimit=Stock inférieure à la limite d'alerte (%s)
 EnhancedValue=Valeur
 EnhancedValueOfWarehouses=Valeur des entrepôts
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
 QtyDispatched=Quantité expédiée
 QtyDispatchedShort=Qté expédiée
 QtyToDispatchShort=Qté à expédier
@@ -83,8 +82,6 @@ inventorySelectWarehouse=Choix d'entrepôt
 SelectCategory=Filtre de catégorie
 inventoryChangePMPPermission=Autoriser à modifier la valeur PMP pour un produit
 OnlyProdsInStock=Ne pas ajouter de produit sans stock
-TheoricalQty=Quantité théorique
-TheoricalValue=Quantité théorique
 LastPA=Dernière BP
 RealQty=Qté réelle
 RegulatedQty=Qté réglementée
diff --git a/htdocs/langs/fr_CA/trips.lang b/htdocs/langs/fr_CA/trips.lang
index af675d9f8f6..bddc551c392 100644
--- a/htdocs/langs/fr_CA/trips.lang
+++ b/htdocs/langs/fr_CA/trips.lang
@@ -63,7 +63,6 @@ ConfirmCloneExpenseReport=Êtes-vous sûr de vouloir cloner ce rapport de dépen
 expenseReportRangeMoreThan=plus que 1%d
 expenseReportCoefUndefined=(Valeur non définie)
 ExpenseReportDateEnd=Date de fin
-ExpenseReportLimitAmount=Max amount
 byEX_DAY=par jour (limite à 1%s)
 byEX_MON=par mois (limite à 1%s)
 byEX_YEA=par année (limite à 1%s)
diff --git a/htdocs/langs/fr_CA/withdrawals.lang b/htdocs/langs/fr_CA/withdrawals.lang
index d1c2577c8d4..ef8417300e1 100644
--- a/htdocs/langs/fr_CA/withdrawals.lang
+++ b/htdocs/langs/fr_CA/withdrawals.lang
@@ -49,7 +49,6 @@ WithdrawRequestAmount=Montant de la demande de débit direct:
 WithdrawRequestErrorNilAmount=Impossible de créer une demande de débit direct pour un montant vide.
 SepaMandate=Mandat de débit direct SEPA
 PleaseReturnMandate=Veuillez renvoyer ce formulaire de mandat par courrier électronique à %s ou par courrier à
-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 pour 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 contrat avec votre banque. Un remboursement doit être demandé dans les 8 semaines à partir de la date à laquelle votre compte a été débité. Vos droits concernant le mandat ci-dessus sont expliqués dans un état que vous pouvez obtenir auprès de votre banque.
 CreditorIdentifier=Identificateur du créancier
 SEPAFillForm=(B) Veuillez compléter tous les champs marqués *
 SEPAFormYourBAN=Votre nom de compte bancaire (IBAN)
diff --git a/htdocs/langs/fr_CH/accountancy.lang b/htdocs/langs/fr_CH/accountancy.lang
index e678f80b1c7..5412d3bd3b4 100644
--- a/htdocs/langs/fr_CH/accountancy.lang
+++ b/htdocs/langs/fr_CH/accountancy.lang
@@ -14,5 +14,3 @@ InvoiceLabel=Libellé de facture
 OverviewOfAmountOfLinesNotBound=Aperçu du nombre de lignes non liées à un compte comptable
 OverviewOfAmountOfLinesBound=Aperçu du nombre de lignes déjà liées à un compte comptable
 TotalVente=Chiffre d'affaires total avant taxes
-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)
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
index 6003a8bb301..48875993c72 100644
--- a/htdocs/langs/fr_CH/admin.lang
+++ b/htdocs/langs/fr_CH/admin.lang
@@ -1,16 +1,19 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
+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
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
 LDAPMembersSynchro=Membres
 LDAPMembersTypesSynchro=Types de membres
 MailToMember=Membres
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/fr_CH/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/fr_CH/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/fr_CH/companies.lang b/htdocs/langs/fr_CH/companies.lang
new file mode 100644
index 00000000000..8d5d6e0ceb4
--- /dev/null
+++ b/htdocs/langs/fr_CH/companies.lang
@@ -0,0 +1,8 @@
+# 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
+PL_UNKNOWN=Inconnue
diff --git a/htdocs/langs/fr_CH/compta.lang b/htdocs/langs/fr_CH/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/fr_CH/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/fr_CH/errors.lang b/htdocs/langs/fr_CH/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/fr_CH/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
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 c189055ba1e..43966e73c29 100644
--- a/htdocs/langs/fr_CH/members.lang
+++ b/htdocs/langs/fr_CH/members.lang
@@ -6,7 +6,6 @@ Members=Membres
 ShowMember=Afficher la fiche membre
 UserNotLinkedToMember=Utilisateur non lié à un membre
 ThirdpartyNotLinkedToMember=Tiers non lié à un membre
-MembersTickets=Membership address sheet
 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).
diff --git a/htdocs/langs/fr_CH/mrp.lang b/htdocs/langs/fr_CH/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/fr_CH/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/fr_CH/orders.lang b/htdocs/langs/fr_CH/orders.lang
index 84def690da2..cf490d0b6dc 100644
--- a/htdocs/langs/fr_CH/orders.lang
+++ b/htdocs/langs/fr_CH/orders.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
 StatusOrderValidatedShort=Validé
 StatusOrderValidated=Validé
diff --git a/htdocs/langs/fr_CH/printing.lang b/htdocs/langs/fr_CH/printing.lang
deleted file mode 100644
index beb0f283826..00000000000
--- a/htdocs/langs/fr_CH/printing.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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
-MenuDirectPrinting=One click Printing jobs
-DirectPrint=One click Print
diff --git a/htdocs/langs/fr_CH/products.lang b/htdocs/langs/fr_CH/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/fr_CH/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/fr_CH/propal.lang b/htdocs/langs/fr_CH/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/fr_CH/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/fr_CH/receptions.lang b/htdocs/langs/fr_CH/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/fr_CH/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/fr_CH/sendings.lang b/htdocs/langs/fr_CH/sendings.lang
index 8bc284778ab..3ea92045960 100644
--- a/htdocs/langs/fr_CH/sendings.lang
+++ b/htdocs/langs/fr_CH/sendings.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - sendings
 StatusSendingValidatedShort=Validé
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/fr_CH/stocks.lang b/htdocs/langs/fr_CH/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/fr_CH/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/fr_CH/trips.lang b/htdocs/langs/fr_CH/trips.lang
deleted file mode 100644
index 61195908177..00000000000
--- a/htdocs/langs/fr_CH/trips.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-ExpenseReportLimitAmount=Max amount
diff --git a/htdocs/langs/fr_CI/accountancy.lang b/htdocs/langs/fr_CI/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/fr_CI/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/fr_CI/admin.lang b/htdocs/langs/fr_CI/admin.lang
index f22290f7dbd..c5ab56cb8d8 100644
--- a/htdocs/langs/fr_CI/admin.lang
+++ b/htdocs/langs/fr_CI/admin.lang
@@ -1,12 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/fr_CI/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/fr_CI/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/fr_CI/companies.lang b/htdocs/langs/fr_CI/companies.lang
new file mode 100644
index 00000000000..40b5f885e43
--- /dev/null
+++ b/htdocs/langs/fr_CI/companies.lang
@@ -0,0 +1,7 @@
+# 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
diff --git a/htdocs/langs/fr_CI/compta.lang b/htdocs/langs/fr_CI/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/fr_CI/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/fr_CI/errors.lang b/htdocs/langs/fr_CI/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/fr_CI/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/fr_CI/members.lang b/htdocs/langs/fr_CI/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/fr_CI/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/fr_CI/mrp.lang b/htdocs/langs/fr_CI/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/fr_CI/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/fr_CI/orders.lang b/htdocs/langs/fr_CI/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/fr_CI/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/fr_CI/printing.lang b/htdocs/langs/fr_CI/printing.lang
deleted file mode 100644
index beb0f283826..00000000000
--- a/htdocs/langs/fr_CI/printing.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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
-MenuDirectPrinting=One click Printing jobs
-DirectPrint=One click Print
diff --git a/htdocs/langs/fr_CI/products.lang b/htdocs/langs/fr_CI/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/fr_CI/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/fr_CI/propal.lang b/htdocs/langs/fr_CI/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/fr_CI/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/fr_CI/receptions.lang b/htdocs/langs/fr_CI/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/fr_CI/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/fr_CI/sendings.lang b/htdocs/langs/fr_CI/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/fr_CI/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/fr_CI/stocks.lang b/htdocs/langs/fr_CI/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/fr_CI/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/fr_CI/trips.lang b/htdocs/langs/fr_CI/trips.lang
deleted file mode 100644
index 61195908177..00000000000
--- a/htdocs/langs/fr_CI/trips.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-ExpenseReportLimitAmount=Max amount
diff --git a/htdocs/langs/fr_CM/accountancy.lang b/htdocs/langs/fr_CM/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/fr_CM/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/fr_CM/admin.lang b/htdocs/langs/fr_CM/admin.lang
index f22290f7dbd..c5ab56cb8d8 100644
--- a/htdocs/langs/fr_CM/admin.lang
+++ b/htdocs/langs/fr_CM/admin.lang
@@ -1,12 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/fr_CM/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/fr_CM/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/fr_CM/companies.lang b/htdocs/langs/fr_CM/companies.lang
new file mode 100644
index 00000000000..40b5f885e43
--- /dev/null
+++ b/htdocs/langs/fr_CM/companies.lang
@@ -0,0 +1,7 @@
+# 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
diff --git a/htdocs/langs/fr_CM/compta.lang b/htdocs/langs/fr_CM/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/fr_CM/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/fr_CM/errors.lang b/htdocs/langs/fr_CM/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/fr_CM/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/fr_CM/members.lang b/htdocs/langs/fr_CM/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/fr_CM/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/fr_CM/mrp.lang b/htdocs/langs/fr_CM/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/fr_CM/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/fr_CM/orders.lang b/htdocs/langs/fr_CM/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/fr_CM/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/fr_CM/printing.lang b/htdocs/langs/fr_CM/printing.lang
deleted file mode 100644
index beb0f283826..00000000000
--- a/htdocs/langs/fr_CM/printing.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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
-MenuDirectPrinting=One click Printing jobs
-DirectPrint=One click Print
diff --git a/htdocs/langs/fr_CM/products.lang b/htdocs/langs/fr_CM/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/fr_CM/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/fr_CM/propal.lang b/htdocs/langs/fr_CM/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/fr_CM/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/fr_CM/receptions.lang b/htdocs/langs/fr_CM/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/fr_CM/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/fr_CM/sendings.lang b/htdocs/langs/fr_CM/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/fr_CM/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/fr_CM/stocks.lang b/htdocs/langs/fr_CM/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/fr_CM/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/fr_CM/trips.lang b/htdocs/langs/fr_CM/trips.lang
deleted file mode 100644
index 61195908177..00000000000
--- a/htdocs/langs/fr_CM/trips.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-ExpenseReportLimitAmount=Max amount
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 5ac5b2b5d10..fa9e2203eea 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=Avec cet outil, vous pouvez exporter les événements sources (liste en CSV et PDF) qui ont servi à générer votre comptabilité.
+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
@@ -286,7 +286,7 @@ ValidateMovements=Valider les mouvements
 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=Liaison automatique faite
+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
@@ -329,7 +329,7 @@ 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=Date d'exportation notifiée sur les lignes exportées (la modification des enregistrements ne sera pas possible)
+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)
 ConfirmExportFile=Confirmation de la génération du fichier d'export comptable ?
 ExportDraftJournal=Exporter le journal brouillon
@@ -387,7 +387,8 @@ 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=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é
@@ -404,6 +405,7 @@ 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=Désolé ce module n'est pas compatible avec la fonctionnalité expérimentale des factures de situation
 
 ## Import
 ImportAccountingEntries=Écritures comptables
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 0b4d7aa4f10..034f105f6d8 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Association
 Version=Version
 Publisher=Editeur
@@ -265,8 +267,8 @@ OtherResources=Autres ressources
 ExternalResources=Ressources externes
 SocialNetworks=Réseaux sociaux
 SocialNetworkId=ID du réseau social
-ForDocumentationSeeWiki=Pour la documentation utilisateur, développeur ou les FAQs,<br>consultez le wiki Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Pour tout autre question/aide, vous pouvez utiliser le forum Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
+ForDocumentationSeeWiki=Pour la documentation utilisateur ou développeur (Doc, FAQ...), <br> jetez un œil au Wiki Dolibarr : <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a></b>
+ForAnswersSeeForum=Pour toute autre question/aide, vous pouvez utiliser le forum Dolibarr : <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
 HelpCenterDesc1=Voici quelques ressources pour obtenir de l’aide et du support avec Dolibarr.
 HelpCenterDesc2=Certains de ces services ne sont disponibles qu'en <b>anglais</b>.
 CurrentMenuHandler=Gestionnaire menu courant
@@ -340,8 +342,8 @@ ThisIsAlternativeProcessToFollow=Voici une procédure de configuration alternati
 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 de l'archive dans le répertoire du serveur Dolibarr dédié aux modules externes: <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>
+UnpackPackageInDolibarrRoot=Décompressez les fichiers packagés dans le répertoire de votre serveur Dolibarr : <b>%s</b>
+UnpackPackageInModulesRoot=Pour déployer/installer un module externe, vous devez décompresser/décompresser le fichier archive dans le répertoire serveur dédié aux modules externes : <br> <b> %s </b>
 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>
@@ -353,6 +355,7 @@ LastStableVersion=Dernière version stable disponible
 LastActivationDate=Date de dernière activation
 LastActivationAuthor=Auteur de la dernière activation
 LastActivationIP=Adresse IP dernière d'activation
+LastActivationVersion=Dernière version d'activation
 UpdateServerOffline=Serveur de mise à jour hors ligne
 WithCounter=Gérer un compteur
 GenericMaskCodes=Vous pouvez saisir tout masque de numérotation. Dans ce masque, les balises suivantes peuvent être utilisées:<br><b>{000000}</b> correspond à un numéro qui sera incrémenté à chaque %s. Mettre autant de zéro que la longueur désirée du compteur. Le compteur sera complété par des 0 à gauche afin d'avoir autant de zéro que dans le masque.<br><b>{000000+000}</b> idem que précédemment mais un décalage correspondant au nombre à droite du + est appliqué dès la première %s.<br><b>{000000@x}</b> idem que précédemment mais le compteur est remis à zéro le xème mois de l'année (x entre 1 et 12, ou 0 pour utiliser le mois de début d'exercice fiscal défini dans votre configuration, ou 99 pour remise à zéro chaque mois). Si cette option est utilisée et x vaut 2 ou plus, alors la séquence {yy}{mm} ou {yyyy}{mm} est obligatoire. <br><b>{dd}</b> jour (01 à 31).<br><b>{mm}</b> mois (01 à 12).<br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{y}</b> année sur 2, 4 ou 1 chiffres.<br>
@@ -753,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=Configurer les comptes financiers (créer, gérer les catégories)
+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
@@ -762,6 +765,7 @@ Permission121=Consulter les tiers (sociétés) liés à l'utilisateur
 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)
@@ -889,12 +893,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=Créer/modifier les notes de frais
+Permission772=Créer/modifier les notes de frais (pour vous et vos subordonnés)
 Permission773=Supprimer les notes de frais
-Permission774=Lire toutes les notes de frais (même pour les utilisateurs en dehors de ma hierarchie)
 Permission775=Approuver les notes de frais
 Permission776=Payer les notes de frais
-Permission777=Lire les notes de frais de tout le monde
+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
@@ -958,15 +961,11 @@ Permission2801=Utiliser un client FTP en mode lecture (parcours et téléchargem
 Permission2802=Utiliser un client FTP en mode écriture (suppression et envoi de fichiers)
 Permission3200=Lire les événements archivés et leurs empreintes
 Permission3301=Générer de nouveaux modules
-Permission4001=Voir les employés
-Permission4002=Créer/modifier les employés
-Permission4003=Supprimer les employés
-Permission4004=Exporter les employés
-Permission4010=Lire compétence/emploi/poste
-Permission4011=Créer/modifier une compétence/un emploi/un poste
-Permission4012=Supprimer compétence/emploi/poste
-Permission4020=Lire l'évaluation
-Permission4021=Créer/modifier une évaluation
+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=Créer/modifier votre évaluation
 Permission4022=Valider l'évaluation
 Permission4023=Supprimer l'évaluation
 Permission4030=Voir menu de comparaison
@@ -977,9 +976,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=Lire toutes les demandes de congé (même celle des utilisateurs non subordonnés)
-Permission20005=Créer/modifier des demandes de congé pour tout le monde (même des utilisateur non subordonnés)
-Permission20006=Administration des demandes de congés (configuration et mise à jour du solde)
+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
@@ -1047,7 +1046,7 @@ DictionaryTypeContact=Types de contacts/adresses
 DictionaryTypeOfContainer=Site internet - Type de pages de site internet
 DictionaryEcotaxe=Barèmes Eco-participation (DEEE)
 DictionaryPaperFormat=Format papiers
-DictionaryFormatCards=Formats des cartes
+DictionaryFormatCards=Formats des étiquettes
 DictionaryFees=Note de frais - Types de lignes de notes de frais
 DictionarySendingMethods=Méthodes d'expédition
 DictionaryStaff=Effectifs
@@ -1358,9 +1357,9 @@ BrowserIsOK=Vous utilisez le navigateur Web %s. Ce navigateur est correct pour l
 BrowserIsKO=Vous utilisez le navigateur %s. Ce navigateur est déconseillé pour des raisons de sécurité, performance et qualité des pages restituées. Nous vous recommandons d'utiliser Firefox, Chrome, Opera ou Safari.
 PHPModuleLoaded=Le composant PHP %s est chargé
 PreloadOPCode=Le code OP préchargé est utilisé
-AddRefInList=Afficher les références client/fournisseur dans les listes (listes déroulantes ou à autocomplétion) et les libellés des liens clicables.<br>Les tiers apparaîtront alors sous la forme "CC12345 - SC45678 - La big company coorp", au lieu de "La big company coorp".
-AddVatInList=Afficher le numéro de TVA du client/fournisseur dans les listes déroulantes.
-AddAdressInList=Affiche les informations sur l’adresse du client/fournisseur (liste de sélection ou liste déroulante) <br> Les tiers apparaîtront avec le format de nom suivant: "The Big Company corp. - 21, rue du saut 123456 Big town - USA" au lieu de "The Big Company corp".
+AddRefInList=Afficher les références Client/Fournisseur dans les listes déroulantes. <br> Les tiers apparaîtront alors sous la forme "CC12345 - SC45678 - Ma Grande Société." au lieu de "Ma Grande Société".
+AddVatInList=Afficher le numéro de TVA du client/fournisseur dans des listes déroulantes.
+AddAdressInList=Affiche les informations sur l'adresse du client/fournisseur dans les listes déroulantes. <br> Les tiers apparaîtront sous le format de nom suivant : "Ma Grande Société. - 21 rue du Jump 123456 Grande Ville - FRANCE" au lieu de "Ma Grande Société".
 AddEmailPhoneTownInContactList=Afficher l'adresse e-mail du contact (ou les téléphones si non définis) et la ville <br> Les contacts apparaîtront avec un nom au format "Dupond Durand - dupond.durand@email.com - Paris" ou "Dupond Durand - 06 07 59 65 66 - Paris" au lieu de "Dupond Durand".
 AskForPreferredShippingMethod=Demander la méthode d'expédition préférée pour les Tiers
 FieldEdition=Édition du champ %s
@@ -1708,8 +1707,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
-NotificationDisableConfirmMessageFix=Désactivez les informations sur les cibles dans le message de confirmation avant d'envoyer les notifications aux e-mails globaux
-NotificationDisableConfirmMessageUser=Désactivez les informations sur les cibles dans le message de confirmation avant d'envoyer les notifications aux e-mails d'utilisateurs
+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
@@ -1901,6 +1901,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=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
@@ -1916,6 +1917,8 @@ ConfFileMustContainCustom=Installer ou créer un module externe à partir de l'a
 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)
+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
@@ -1941,7 +1944,7 @@ 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.
 UrlTrackingDesc=Si le fournisseur ou le service de transport offrent une page ou un site Web pour vérifier l'état de l'expédition, vous pouvez l'entrer ici. Vous pouvez utiliser la clé {TRACKID} dans les paramètres d'URL afin que le système la remplace par la valeur du numéro de suivi entré sur la fiche d'expédition.
 OpportunityPercent=Lorsque vous créez une opportunité, vous pouvez ďéfinir un montant estimatif de projet/affaire. Selon le statut de l'opportunité, ce montant peut être multiplié par ce taux pour évaluer le montant probable que vos opportunités sont susceptibles de générer. La valeur est un pourcentage (entre 0 et 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=Ce modèle de mail est lié à quel type d'objet ? Un modèle d'e-mail est disponible uniquement lors de l'utilisation du bouton «Envoyer un e-mail» à partir de l'objet associé.
 TypeOfTemplate=Type de modèle
 TemplateIsVisibleByOwnerOnly=Le modèle est visible par le propriétaire seulement
 VisibleEverywhere=Visible partout
@@ -2017,10 +2020,10 @@ MAIN_PDF_MARGIN_TOP=Marge haute sur les PDF
 MAIN_PDF_MARGIN_BOTTOM=Marge bas sur les PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Hauteur du logo sur les PDFs
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Ajouter une colonne pour les images dans les propositions commerciales
-MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
+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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Voulez-vous exécuter la collecte pour ce collecteu
 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=Enregistrer événement email entrant
-CreateLeadAndThirdParty=Créer opportunité (et tiers si nécessaire)
-CreateTicketAndThirdParty=Créer un ticket (avec un lien vers un tiers s'il a été chargé par une opération précédente)
+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, sinon sans tiers)
 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=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
@@ -2078,7 +2082,7 @@ CreateCandidature=Créer une candidature
 FormatZip=Zip
 MainMenuCode=Code d'entrée du menu (mainmenu)
 ECMAutoTree=Afficher l'arborescence GED automatique
-OperationParamDesc=Définissez les valeurs à utiliser pour l'action, ou comment extraire les valeurs. Par exemple: <br> objproperty1=SET:abc <br> objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<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> Utilisez un caractère ; comme séparateur pour extraire ou définir plusieurs propriétés.
+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
@@ -2124,7 +2128,7 @@ 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=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 une chaîne 'Nom : nom à trouver' trouvée dans le corps, utilisez l'e-mail de l'expéditeur comme e-mail, vous pouvez définir le champ de paramètre comme ceci : <br> 'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'
+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 ?
@@ -2190,7 +2194,7 @@ OldImplementation=Ancienne implémentation
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Si certains modules de paiement en ligne sont activés (Paypal, Stripe, ...), ajouter un lien sur le PDF pour effectuer le paiement en ligne
 DashboardDisableGlobal=Désactiver complétement toutes les vignettes des éléments ouverts
 BoxstatsDisableGlobal=Désactiver le widget statistiques
-DashboardDisableBlocks=Thumbs of open objects (to process or late) on main dashboard
+DashboardDisableBlocks=Vignette des objets ouverts (à traiter ou en retard) sur le tableau de bord principal
 DashboardDisableBlockAgenda=Désactiver la vignette 'agenda'
 DashboardDisableBlockProject=Désactiver la vignette 'projets'
 DashboardDisableBlockCustomer=Désactiver les vignettes 'clients'
@@ -2201,11 +2205,18 @@ DashboardDisableBlockBank=Désactiver la vignette 'banque'
 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 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
+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
 LanguageAndPresentation=Langue et présentation
 SkinAndColors=Thème et couleurs
-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=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
 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=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
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 34abc97cc78..70058c87e11 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -32,7 +32,7 @@ RIB=Numéro de compte bancaire
 IBAN=Identifiant IBAN
 BIC=Code BIC/SWIFT
 SwiftValid=BIC/SWIFT valide
-SwiftVNotalid=BIC/SWIFT non valide
+SwiftNotValid=BIC/SWIFT non valide
 IbanValid=Numéro de compte valide
 IbanNotValid=Numéro de compte non valide
 StandingOrders=Ordres de prélèvements
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Domiciliation du compte
 BankAccountCountry=Pays du compte
 BankAccountOwner=Nom du propriétaire du compte
 BankAccountOwnerAddress=Adresse du propriétaire du compte
-RIBControlError=Les contrôles indiquent que les informations de ce compte bancaire sont incomplètes ou incorrectes (vérifier le pays, les numéros de compte et IBAN).
 CreateAccount=Créer compte
 NewBankAccount=Nouveau compte
 NewFinancialAccount=Nouveau compte financier
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 0d6ab150fbb..d06da508e4e 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Rapports de règlements
 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
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 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=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Condition de règlement
 PaymentConditions=Conditions de règlement
 PaymentConditionsShort=Conditions de règlement
@@ -192,7 +191,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Le reste à payer <b> (%s %s) </b> es
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Le reste à payer <b>(%s %s)</b> est un escompte accordé après facture. J'accepte de perdre la TVA sur cet escompte
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Le reste à payer <b>(%s %s)</b> est un escompte
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Mauvais payeur
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
+ConfirmClassifyPaidPartiallyReasonBankCharge=Déduction par banque (frais de banque intermédiaire)
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produits en partie retournés
 ConfirmClassifyPaidPartiallyReasonOther=Créance abandonnée pour autre raison
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Ce choix est possible si votre facture a été fournie avec les commentaires appropriés. (Exemple «Seule la taxe correspondant au prix effectivement payé donne droit à déduction»)
@@ -200,7 +199,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,19 +240,19 @@ 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)
 EscompteOfferedShort=Escompte
 SendBillRef=Envoi de la facture %s
 SendReminderBillRef=Relance de la facture %s (rappel)
-SendPaymentReceipt=Submission of payment receipt %s
+SendPaymentReceipt=Remise du reçu de paiement %s
 NoDraftBills=Pas de facture brouillon
 NoOtherDraftBills=Pas d'autre facture brouillon
 NoDraftInvoices=Pas de factures brouillons
@@ -280,6 +279,7 @@ SetMode=Définir mode de règlement
 SetRevenuStamp=Définir le timbre fiscal
 Billed=Facturé
 RecurringInvoices=Factures récurrentes
+RecurringInvoice=Facture récurrente
 RepeatableInvoice=Facture modèle
 RepeatableInvoices=Factures modèles
 Repeatable=Modèle
@@ -449,6 +449,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
@@ -604,3 +606,4 @@ SituationTotalProgress=Avancement total %d %%
 SearchUnpaidInvoicesWithDueDate=Rechercher les factures impayées avec date d'échéance = %s
 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
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 edfcfa8d074..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=Saisir une URL HTTP externe/absolue ou une URL interne/relative (/module/mapage.php...)
+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..801785a4427 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -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 052b90dc13a..c101e8c7931 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -131,6 +131,8 @@ ShowPriceHTOnReceipt = Afficher la colonne avec le prix hors taxes (sur le ticke
 CustomerDisplay=Affichage client
 SplitSale=Fractionner la vente
 PrintWithoutDetailsButton=Affiche le bouton "Générer sans les détails"
-PrintWithoutDetailsLabelDefault=Line label by default on printing without details
+PrintWithoutDetailsLabelDefault=Libellé de ligne par défaut à l'impression sans détails
 PrintWithoutDetails=Générer sans les détails
-YearNotDefined=Year is not defined
+YearNotDefined=L'année n'est pas définie
+TakeposBarcodeRuleToInsertProduct=Règle sur le code-barre pour insérer un produit
+TakeposBarcodeRuleToInsertProductDesc=Règle sous la forme "ref:NB+qu:NB+qd:NB+other:NB" où NB correpond au nombre de caractères composant la partie du code-barre avec : <ul><li><b>ref</b> : la référence du produit</li><li><b>qu</b> : la quantité (unités)<l/i><li><b>qd</b> : la quantité (décimales)</li><li><b>other</b> : autres caractères</li></ul>
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index cf549eb8670..feabfac2d3c 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
@@ -96,5 +96,5 @@ ChooseCategory=Choisissez une catégorie
 StocksCategoriesArea=Catégories d’entrepôt
 ActionCommCategoriesArea=Catégories d’événements
 WebsitePagesCategoriesArea=Catégories des pages-conteneurs
-KnowledgemanagementsCategoriesArea=KM article Categories
+KnowledgemanagementsCategoriesArea=Catégories d'articles KM
 UseOrOperatorForCategories=Utiliser l'opérateur 'ou' pour les catégories
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 78a3b043a46..6cc6efc18d7 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Identifiant. prof. 1 (Registre de Commerce)
+ProfId2CM=Identifiant. prof. 2 (numéro de contribuable)
+ProfId3CM=Identifiant. prof. 3 (Décret de création)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Registre du commerce
+ProfId2ShortCM=Numéro de contribuable
+ProfId3ShortCM=Décret de création
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -271,12 +283,12 @@ ProfId3RU=Id. prof.3 (KPP)
 ProfId4RU=Id. prof.4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
-ProfId1UA=Prof Id 1 (EDRPOU)
-ProfId2UA=Prof Id 2 (DRFO)
-ProfId3UA=Prof Id 3 (INN)
-ProfId4UA=Prof Id 4 (Certificate)
-ProfId5UA=Prof Id 5 (RNOKPP)
-ProfId6UA=Prof Id 6 (TRDPAU)
+ProfId1UA=Id Prof 1 (EDRPOU)
+ProfId2UA=Id Prof 2 (DRFO)
+ProfId3UA=Id Prof 3 (INN)
+ProfId4UA=Id Prof 4 (Certificat)
+ProfId5UA=Id Prof 5 (RNOKPP)
+ProfId6UA=Id Prof 6 (TRDPAU)
 ProfId1DZ=RC
 ProfId2DZ=Article
 ProfId3DZ=Numéro d'identification du fournisseur 
@@ -369,7 +381,7 @@ VATIntraCheck=Vérifier
 VATIntraCheckDesc=Le lien <b>%s</b> permet d'interroger le service européen de contrôle des numéro de TVA intracommunautaire. Un accès à Internet depuis le serveur est requis pour que ce service fonctionne.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Vérifier la TVA intra-communautaire sur le site de la Commission Européenne
-VATIntraManualCheck=Vous pouvez aussi vérifier manuellement via le site de la commission européenne <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=Vous pouvez également vérifier manuellement sur le site de la Commission européenne <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Vérification impossible. Le service de vérification n'est pas fourni par ce pays membre (%s).
 NorProspectNorCustomer=Ni client, ni prospect
 JuridicalStatus=Type d'entité légale
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 280069f5cf9..dc883e26c4d 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -152,7 +152,7 @@ ConfirmDeleteSalary=Êtes-vous sûr de vouloir supprimer ce salaire ?
 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>.
-CalcModeDebt=Analyse des factures enregistrées connues même si elles ne sont pas encore comptabilisées dans le Grand Livre.
+CalcModeDebt=Analyse des documents enregistrées connus même si ils ne sont pas encore comptabilisées dans le Grand Livre.
 CalcModeEngagement=Analyse des paiements enregistrés connus, même s'ils ne sont pas encore comptabilisés dans le Grand Livre.
 CalcModeBookkeeping=Analyse des données journalisées dans le Grand livre.
 CalcModeLT1= Mode <b>%sRE sur factures clients - factures fournisseurs%s<b>
@@ -170,8 +170,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
-RulesResultDue=- Il comprend les factures impayées, les dépenses, la TVA, les dons, qu'ils soient payées ou non. Il comprend également les salaires versés. <br> - Il est basé sur la date de facturation des factures et sur la date des dépenses et paiement des taxes. Pour les salaires définis avec le module Salaire, la date de valeur du paiement 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, les dépenses, la TVA et les salaires. La date du don pour le don.
+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.
@@ -289,9 +290,11 @@ 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)
-InvoiceNotLate = A recevoir (d'ici 15 jours)
-InvoiceNotLate15Days = A recevoir (dans 15 à 30 jours)
-InvoiceNotLate30Days = A recevoir (dans plus de 30 jours)
+InvoiceNotLate = A encaisser (d'ici 15 jours)
+InvoiceNotLate15Days = A encaisser (dans 15 à 30 jours)
+InvoiceNotLate30Days = A encaisser (dans plus de 30 jours)
 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=Êtes-vous sûr de vouloir présélectionner les %s lignes sélectionnées avec ce code comptable ?
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index 92c4d1f7e6e..64bf5493285 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=La date de fin ne peux être avant la date de début
 StatusAtInstall=Statut lors de l'installation du module
 CronStatusActiveBtn=Planifier
 CronStatusInactiveBtn=Désactiver
-CronTaskInactive=Ce poste est désactivé (non planifié)
+CronTaskInactive=Ce travail est désactivé (non planifié)
 CronId=Id
 CronClassFile=Nom de fichier intégrant la classe
 CronModuleHelp=Nom du répertoire du module Dolibarr (fonctionne également avec le module externe Dolibarr). <BR> Par exemple, pour appeler la méthode fetch de l'objet produit Dolibarr /htdocs/<u>product</u>/class/product.class.php, la valeur du module est <br> <i> produit </i>
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 4724762056a..80d4034a1ba 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -8,7 +8,7 @@ ErrorBadEMail=L'email '%s' est invalide
 ErrorBadMXDomain=L'email %s semble incorrect (domaine n'a pas d'enregistrement MX valide)
 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à.
+ErrorRefAlreadyExists=La référence <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 +27,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
@@ -111,6 +113,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=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à
@@ -271,6 +274,9 @@ 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=Caractère non autorisé dans le nom de connexion
+ErrorRequestTooLarge=Error, request too large
 
 # 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.
@@ -312,6 +318,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 8b7af3e6801..496afa7d9e2 100644
--- a/htdocs/langs/fr_FR/eventorganization.lang
+++ b/htdocs/langs/fr_FR/eventorganization.lang
@@ -18,15 +18,15 @@
 # Generic
 #
 ModuleEventOrganizationName = Organisation d'événements
-EventOrganizationDescription = Organisation de l’événement par le biais du module projet
-EventOrganizationDescriptionLong= Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
+EventOrganizationDescription = Organisation d’événements par le biais du module Projet
+EventOrganizationDescriptionLong= Gérer l'organisation d'un événement (spectacle, conférences, participants ou intervenants, avec des pages publiques pour suggestion, vote ou inscription)
 #
 # Menu
 #
 EventOrganizationMenuLeft = Événements organisés
 EventOrganizationConferenceOrBoothMenuLeft = Conférence ou stand
 
-PaymentEvent=Payment of event
+PaymentEvent=Paiement de l'événement
 
 #
 # Admin page
@@ -42,18 +42,18 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Catégorie à ajouter à des tiers aut
 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_EVENT = Template of email to send after a registration to an event has been paid.
-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_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 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
 #
 EventOrganizationConfOrBooth= Conférence ou stand
-ManageOrganizeEvent = Manage the organization of an event
+ManageOrganizeEvent = Gestion d'organisation d'événements
 ConferenceOrBooth = Conférence ou stand
 ConferenceOrBoothTab = Conférence ou stand
 AmountPaid = Montant payé
@@ -71,26 +71,27 @@ 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
 #
-AllowUnknownPeopleSuggestConf=Allow people to suggest conferences
-AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest a conference they want to do
+AllowUnknownPeopleSuggestConf=Autoriser les visiteurs à suggérer des conférences
+AllowUnknownPeopleSuggestConfHelp=Autoriser des inconnus à suggérer une conférence qu'ils souhaitent faire
 AllowUnknownPeopleSuggestBooth=Autoriser des personnes à postuler pour un stand
 AllowUnknownPeopleSuggestBoothHelp=Autoriser des personnes inconnues à postuler pour un stand
 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
@@ -106,19 +107,19 @@ EvntOrgCancelled = Annulé
 #
 SuggestForm = Page de suggestions
 SuggestOrVoteForConfOrBooth = Page de suggestion ou de 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.
+EvntOrgRegistrationHelpMessage = Ici, vous pouvez voter pour une conférence ou en proposer une nouvelle pour l'événement. Vous pouvez également demander à avoir un stand pendant l'événement.
+EvntOrgRegistrationConfHelpMessage = Ici, vous pouvez suggérer une nouvelle conférence à animer pendant l'événement.
 EvntOrgRegistrationBoothHelpMessage = Ici, postulez pour tenir un stand pendant l'événement
 ListOfSuggestedConferences = Liste des conférences suggérées
 ListOfSuggestedBooths = Liste des stands suggérés
-ListOfConferencesOrBooths=List of conferences or booths of event project
+ListOfConferencesOrBooths=Liste des conférences ou stands du projet événementiel
 SuggestConference = Proposer une nouvelle conférence
 SuggestBooth = Proposer un stand
 ViewAndVote = Voir et voter pour les événements suggérés
 PublicAttendeeSubscriptionGlobalPage = Lien public pour l'inscription à l'événement
 PublicAttendeeSubscriptionPage = Lien d’inscription public à un événement
 MissingOrBadSecureKey = La clé de sécurité est invalide ou manquante
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the event : <b>%s</b>
+EvntOrgWelcomeMessage = Ce formulaire vous permet de vous inscrire en tant que nouveau participant à l'événement : <b> %s </b>
 EvntOrgDuration = Cette conférence commence le %s et se termine le %s.
 ConferenceAttendeeFee = Frais de participation à la conférence pour l'événement : '%s' se produisant du %s au %s.
 BoothLocationFee = Frais de participation à l'événement : '%s' se produisant du %s au %s.
@@ -130,7 +131,7 @@ DateMustBeBeforeThan=%s doit être avant %s
 DateMustBeAfterThan=%s doit être après %s
 
 NewSubscription=Inscription
-OrganizationEventConfRequestWasReceived=Your suggestion for a conference has been received
+OrganizationEventConfRequestWasReceived=Votre suggestion de conférence a été reçue
 OrganizationEventBoothRequestWasReceived=Votre demande de stand a bien été reçue
 OrganizationEventPaymentOfBoothWasReceived=Le règlement de votre stand a été enregsitré
 OrganizationEventPaymentOfRegistrationWasReceived=Le règlement de votre participation a été enregistré
@@ -139,7 +140,7 @@ OrganizationEventBulkMailToSpeakers=Ceci est un rappel de votre participation à
 OrganizationEventLinkToThirdParty=Lier à un tiers (client, fournisseur ou partenaire)
 
 NewSuggestionOfBooth=Proposition de stand
-NewSuggestionOfConference=Application for a conference
+NewSuggestionOfConference=Candidature à une conférence
 
 #
 # Vote page
@@ -161,6 +162,6 @@ DeleteConferenceOrBoothAttendee=Supprimer le participant
 RegistrationAndPaymentWereAlreadyRecorder=Une inscription et un règlement sont déjà enregistrés pour l'e-mail <b>%s</b>
 EmailAttendee=E-mail du participant
 EmailCompanyForInvoice=E-mail de la société pour la facturation (si différent du participant)
-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
+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=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
diff --git a/htdocs/langs/fr_FR/help.lang b/htdocs/langs/fr_FR/help.lang
index 9bf855f8704..72914139b16 100644
--- a/htdocs/langs/fr_FR/help.lang
+++ b/htdocs/langs/fr_FR/help.lang
@@ -20,4 +20,4 @@ BackToHelpCenter=Sinon, cliquez ici pour <a href="%s">retourner au centre d'assi
 LinkToGoldMember=Vous pouvez appeler immédiatement un des quelques accompagnateurs présélectionnés par Dolibarr pour votre langue (%s) en cliquant son Widget (disponibilité et tarif maximum sont rafraîchis automatiquement):
 PossibleLanguages=Langues disponibles
 SubscribeToFoundation=Aidez le projet Dolibarr, adhérez à l'association Dolibarr
-SeeOfficalSupport=Pour un accompagnement officiel Dolibarr dans votre langue : <br><b><a href="%s" target="_blank">%s</a></b>
+SeeOfficalSupport=Pour un accompagnement officiel Dolibarr dans votre langue : <br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index a10ba0c41e6..061eb3b5c77 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Description
 SendRequestCP=Créer une demande de congés
 DelayToRequestCP=Les demandes de congés doivent être faites au moins <b>%s jour(s)</b> avant la date de ceux-ci.
 MenuConfCP=Solde des congés
-SoldeCPUser=Solde de congés: <b>%s jours</b>.
+SoldeCPUser=Solde des congés (en jours) <b>%s</b>
 ErrorEndDateCP=Vous devez choisir une date de fin supérieur à la date de début.
 ErrorSQLCreateCP=Une erreur SQL est survenue durant la création :
 ErrorIDFicheCP=Une erreur est survenue, cette demande de congés n'existe pas.
@@ -134,3 +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=Block if balance negative
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=The creation of this leave request is blocked because your balance is negative
+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 20eaf864871..d47596fe95e 100644
--- a/htdocs/langs/fr_FR/hrm.lang
+++ b/htdocs/langs/fr_FR/hrm.lang
@@ -20,13 +20,14 @@ Employee=Salarié
 NewEmployee=Nouveau salarié
 ListOfEmployees=List des salariés
 HrmSetup=Configuration du module GRH
-HRM_MAXRANK=Niveau maximum pour cette compétence
-HRM_DEFAULT_SKILL_DESCRIPTION=Default description of ranks when skill is created
-deplacement=Ctrl
+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
 DateEval=Date d'évaluation
 JobCard=Fiche emploi
-Job=Emploi
-Jobs=Emplois
+JobPosition=Emploi
+JobsPosition=Emplois
 NewSkill=Nouvelle compétence
 SkillType=Type de compétence
 Skilldets=Liste des niveaux pour cette compétence
@@ -47,21 +48,20 @@ ConfirmValidateEvaluation=Êtes-vous sûr de vouloir valider cette évaluation s
 EvaluationCard=Fiche évaluation
 RequiredRank=Niveau requis pour cet emploi
 EmployeeRank=Niveau de l'employée pour cette compétence
-Position=Position
-Positions=Positions
-PositionCard=Position card
-EmployeesInThisPosition=Employees in this position
+EmployeePosition=Poste d'employé
+EmployeePositions=Postes d'employés
+EmployeesInThisPosition=Employés occupant ce poste
 group1ToCompare=Groupe d'utilisateurs à analyser
-group2ToCompare=Second usergroup for comparison
-OrJobToCompare=Compare to job skills requirements
+group2ToCompare=Deuxième groupe d'utilisateurs pour comparaison
+OrJobToCompare=Comparer aux exigences en matière de compétences professionnelles
 difference=Différence
-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
+CompetenceAcquiredByOneOrMore=Compétence acquise par un ou plusieurs utilisateurs mais non demandée par le deuxième comparateur
+MaxlevelGreaterThan=Niveau max supérieur à celui demandé
+MaxLevelEqualTo=Niveau maximum égal à cette demande
+MaxLevelLowerThan=Niveau maximum inférieur à cette demande
+MaxlevelGreaterThanShort=Niveau d'employé supérieur à celui demandé
+MaxLevelEqualToShort=Le niveau d'employé est égal à cette demande
+MaxLevelLowerThanShort=Niveau d'employé inférieur à cette demande
 SkillNotAcquired=Compétences non acquises par tous les employés et requis par le second comparateur
 legend=Légende
 TypeSkill=Type de compétence
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index b47e73d169a..81122d1b5d3 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -21,6 +21,7 @@ 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=Votre installation PHP ne prend pas en charge les fonctions mbstring.
 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.
diff --git a/htdocs/langs/fr_FR/knowledgemanagement.lang b/htdocs/langs/fr_FR/knowledgemanagement.lang
index 63ee4cb1b52..28d69785450 100644
--- a/htdocs/langs/fr_FR/knowledgemanagement.lang
+++ b/htdocs/langs/fr_FR/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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)
 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 1b23305628c..75465b9118f 100644
--- a/htdocs/langs/fr_FR/languages.lang
+++ b/htdocs/langs/fr_FR/languages.lang
@@ -7,7 +7,7 @@ Language_ar_MA=Arabe (Maroc)
 Language_ar_SA=Arabe
 Language_ar_TN=Arabe (Tunisie)
 Language_ar_IQ=Arabe (Irak)
-Language_as_IN=Assamese
+Language_as_IN=Assamais
 Language_az_AZ=Azerbaïdjanais
 Language_bn_BD=Bengalais
 Language_bn_IN=Bengali (Inde)
diff --git a/htdocs/langs/fr_FR/ldap.lang b/htdocs/langs/fr_FR/ldap.lang
index 7f89075fba7..1e38215a40e 100644
--- a/htdocs/langs/fr_FR/ldap.lang
+++ b/htdocs/langs/fr_FR/ldap.lang
@@ -25,3 +25,7 @@ ContactSynchronized=Contact synchronisé
 ForceSynchronize=Forcer synchro Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Échec de la lecture de l'annuaire LDAP. Vérifier la configuration du module LDAP et l'accessibilité de l'annuaire.
 PasswordOfUserInLDAP=Mot de passe utilisateur dans LDAP
+LDAPPasswordHashType=Type de hachage du mot de passe
+LDAPPasswordHashTypeExample=Type de hachage de mot de passe utilisé sur le serveur
+SupportedForLDAPExportScriptOnly=Uniquement pris en charge par un script d'exportation LDAP
+SupportedForLDAPImportScriptOnly=Uniquement pris en charge par un script d'importation LDAP
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 448cc597a48..63c5192a01f 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Erreur, aucun taux tva défini pour le pay
 ErrorNoSocialContributionForSellerCountry=Erreur, pas de types de charges sociales/fiscales définies pour le pays '%s'.
 ErrorFailedToSaveFile=Erreur, l'enregistrement du fichier a échoué.
 ErrorCannotAddThisParentWarehouse=Vous essayez d'ajouter un entrepôt parent qui est déjà un enfant de l'entrepôt courant
+FieldCannotBeNegative=Le champ "%s" ne peut pas être négatif
 MaxNbOfRecordPerPage=Nombre max d'enregistrement par page
 NotAuthorized=Vous n'êtes pas autorisé pour cette action.
 SetDate=Définir date
@@ -87,7 +88,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=Une page d'aide dédiée à cette page existe
+DedicatedPageAvailable=Page d'aide dédiée liée à votre écran actuel
 HomePage=Page d'accueil
 RecordSaved=Enregistrement sauvegardé
 RecordDeleted=Enregistrement supprimé
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Code retour dernier accès en base en erreur
 InformationLastAccessInError=Information sur le dernier accès en base en erreur
 DolibarrHasDetectedError=Dolibarr a détecté une erreur technique
 YouCanSetOptionDolibarrMainProdToZero=Vous pouvez lire le fichier log ou définir l'option $dolibarr_main_prod sur '0' dans votre fichier de configuration pour obtenir plus d'informations.
-InformationToHelpDiagnose=Voici les informations qui pourront aider au diagnostic (Vous pouvez fixer l'option $dolibarr_main_prod sur '1' pour supprimer quelques notifications)
+InformationToHelpDiagnose=Ces informations peuvent être utiles à des fins de diagnostic (vous pouvez définir l'option $dolibarr_main_prod sur '1' pour masquer les informations sensibles)
 MoreInformation=Plus d'information
 TechnicalInformation=Informations techniques
 TechnicalID=ID technique
@@ -211,6 +212,8 @@ User=Utilisateur
 Users=Utilisateurs
 Group=Groupe
 Groups=Groupes
+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
@@ -906,7 +909,7 @@ ViewFlatList=Voir vue liste
 ViewAccountList=Voir le grand livre
 ViewSubAccountList=Voir le grand livre auxiliaire
 RemoveString=Supprimer la chaine '%s'
-SomeTranslationAreUncomplete=Certaines des langues proposées peuvent n'être traduites que partiellement ou contenir des erreurs. Aidez-nous à corriger votre langue en vous inscrivant à l'adresse <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/</a> pour ajouter vos améliorations.
+SomeTranslationAreUncomplete=Certaines des langues proposées peuvent n'être que partiellement traduites ou contenir des erreurs. Merci de nous aider à corriger votre langue en vous inscrivant sur <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external">https://transifex.com/projects/p/dolibarr/</a> pour ajouter vos améliorations.
 DirectDownloadLink=Lien de téléchargement public
 PublicDownloadLinkDesc=Seul le lien est nécessaire pour télécharger le fichier
 DirectDownloadInternalLink=Lien de téléchargement privé
@@ -1025,7 +1028,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
@@ -1158,4 +1161,6 @@ Properties=Attributs
 hasBeenValidated=%s a été validé
 ClientTZ=Fuseau horaire client (utilisateur)
 NotClosedYet=Pas encore fermé
-ClearSignature=Signature supprimée
+ClearSignature=Réinitialiser la signature
+CanceledHidden=Annulé masqué
+CanceledShown=Annulé affiché
diff --git a/htdocs/langs/fr_FR/margins.lang b/htdocs/langs/fr_FR/margins.lang
index dd1247311ff..a8a68c6599f 100644
--- a/htdocs/langs/fr_FR/margins.lang
+++ b/htdocs/langs/fr_FR/margins.lang
@@ -22,7 +22,7 @@ ProductService=Produit ou Service
 AllProducts=Tous les produits et services
 ChooseProduct/Service=Choisissez le produit ou le service
 ForceBuyingPriceIfNull=Forcer le prix d'achat au prix de vente si non renseigné
-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=Si le prix d'achat/coût n'est pas fourni lors de l'ajout d'une nouvelle ligne, et cette option est "ON", la marge sera de 0%% sur la nouvelle ligne (prix d'achat/coût = prix de vente). Si cette option est "OFF" (recommandé), la marge sera égale à la valeur suggérée par défaut (et peut être 100%% si aucune valeur par défaut ne peut être trouvée).
 MARGIN_METHODE_FOR_DISCOUNT=Méthode de gestion des remises globales
 UseDiscountAsProduct=Comme un produit
 UseDiscountAsService=Comme un service
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index 03165d13ebd..e3abfdb6210 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Cet outil ne doit être utilisé que par des utilisateurs expérimentés ou des développeurs. Il vous fournit des utilitaires pour construire ou éditer votre propre module. La documentation relative au <a href="%s" target="_blank"> développement manuel est ici </a>.
+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.
 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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Les menus fournis par votre module / application sont défin
 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 recorded 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
@@ -143,5 +143,5 @@ 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
+ImportExportProfiles=Profils d'import et d'export
 ValidateModBuilderDesc=Mettez 1 si ce champ doit être validé avec $this->validateField() ou 0 si la validation est requise
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index 1820abd2ccd..abe0a3b2e55 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
@@ -105,5 +105,5 @@ 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
diff --git a/htdocs/langs/fr_FR/oauth.lang b/htdocs/langs/fr_FR/oauth.lang
index edd9c316b67..e412ee0b9b9 100644
--- a/htdocs/langs/fr_FR/oauth.lang
+++ b/htdocs/langs/fr_FR/oauth.lang
@@ -23,10 +23,10 @@ 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">cette page</a> puis «Autorisation» pour créer les informations d'identification OAuth
+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">cette page</a> , puis "Enregistrer une nouvelle application" pour créer les informations d'identification OAuth
+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_STRIPE_TEST_NAME=OAuth Stripe Test
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 45a313401dc..87237e4acef 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -202,8 +202,8 @@ NumberOfUnitsCustomerInvoices=Quantités présentes dans les factures clients
 NumberOfUnitsSupplierProposals=Quantités présentes dans les demande de prix
 NumberOfUnitsSupplierOrders=Quantités  présentes dans les commandes fournisseurs
 NumberOfUnitsSupplierInvoices=Quantités présentes dans les factures fournisseurs
-NumberOfUnitsContracts=Nombre d'unités en contrat
-NumberOfUnitsMos=Nombre d'unités à produire dans les ordres de fabrication
+NumberOfUnitsContracts=Quantités en contrat
+NumberOfUnitsMos=Quantités à produire dans les ordres de fabrication
 EMailTextInterventionAddedContact=Une nouvelle intervention %s vous a été assignée
 EMailTextInterventionValidated=La fiche intervention %s vous concernant a été validée.
 EMailTextInvoiceValidated=La facture %s vous concernant a été validée.
@@ -258,6 +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=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
@@ -268,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
diff --git a/htdocs/langs/fr_FR/partnership.lang b/htdocs/langs/fr_FR/partnership.lang
index c93f9288407..845bf4ff36c 100644
--- a/htdocs/langs/fr_FR/partnership.lang
+++ b/htdocs/langs/fr_FR/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Gestion des partenariats
 PartnershipDescription=Module de gestion des partenariats
 PartnershipDescriptionLong= Module de gestion des partenariats
-
+Partnership=Partenariat
 AddPartnership=Ajouter un partenariat
 CancelPartnershipForExpiredMembers=Partenariat : annuler le partenariat des adhérents dont les cotisations ont expirés
 PartnershipCheckBacklink=Partenariat : Vérifiez le backlink référent
@@ -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/paybox.lang b/htdocs/langs/fr_FR/paybox.lang
index c1694526397..ffd087a6e5d 100644
--- a/htdocs/langs/fr_FR/paybox.lang
+++ b/htdocs/langs/fr_FR/paybox.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=Configuration module PayBox
-PayBoxDesc=Ce module permet d'offrir une page de paiement via le prestataire <a href="http://www.paybox.com" target="_blank">Paybox</a> pour réaliser un paiement quelconque ou un paiement par rapport à un objet Dolibarr (facture, commande…)
+PayBoxDesc=Ce module permet d'offrir une page de paiement via le prestataire <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external">Paybox</a> pour réaliser un paiement quelconque ou un paiement par rapport à un objet Dolibarr (facture, commande…)
 FollowingUrlAreAvailableToMakePayments=Les URL suivantes sont disponibles pour permettre à un client de faire un paiement
 PaymentForm=Formulaire de paiement
 WelcomeOnPaymentPage=Bienvenue sur notre service de paiement en ligne
@@ -20,7 +20,6 @@ AccountParameter=Paramètres du compte
 UsageParameter=Paramètres d'utilisation
 InformationToFindParameters=Informations pour trouver vos paramètres de compte %s
 PAYBOX_CGI_URL_V2=URL du module CGI Paybox de paiement
-VendorName=Nom du vendeur
 CSSUrlForPaymentForm=URL feuille style css pour le formulaire de paiement
 NewPayboxPaymentReceived=Nouveau paiement Paybox reçu
 NewPayboxPaymentFailed=Nouveau paiement Paybox tenté mais en échec
diff --git a/htdocs/langs/fr_FR/paypal.lang b/htdocs/langs/fr_FR/paypal.lang
index 25fe220824b..0fdb3e38d20 100644
--- a/htdocs/langs/fr_FR/paypal.lang
+++ b/htdocs/langs/fr_FR/paypal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Configuration module PayPal
-PaypalDesc=Ce module permet d'offrir aux clients une page de paiement via le prestataire <a href="http://www.paypal.com" target="_blank">Paypal</a>. Ceci peut être utiliser pour réaliser un paiement quelconque ou un paiement par rapport à un objet Dolibarr particulier (facture, commande…)
+PaypalDesc=Ce module permet d'offrir aux clients une page de paiement via le prestataire <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external">Paypal</a>. Ceci peut être utiliser pour réaliser un paiement quelconque ou un paiement par rapport à un objet Dolibarr particulier (facture, commande…)
 PaypalOrCBDoPayment=Payer avec Paypal (Carte ou solde Paypal)
 PaypalDoPayment=Payer par PayPal
 PAYPAL_API_SANDBOX=Mode test/bac à sable (sandbox)
diff --git a/htdocs/langs/fr_FR/printing.lang b/htdocs/langs/fr_FR/printing.lang
index 662b6b1a80a..19e82e3dc34 100644
--- a/htdocs/langs/fr_FR/printing.lang
+++ b/htdocs/langs/fr_FR/printing.lang
@@ -2,7 +2,7 @@
 Module64000Name=Impression en un clic
 Module64000Desc=Activer le système d'impression en 1 click
 PrintingSetup=Réglages du module Impression en 1 click
-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.
+PrintingDesc=Ce module ajoute un bouton Imprimer à divers modules pour permettre aux documents d'être imprimés directement sur une imprimante sans avoir besoin d'ouvrir le document dans une autre application.
 MenuDirectPrinting=Travaux d'impression en 1 clic
 DirectPrint=Imprimer en 1 clic
 PrintingDriverDesc=Paramètres de configuration pour le driver d'impression
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index 40c8b0be477..e1883f5bba0 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=Quantité à ajouter pour chaque code à barres/lot/série scanné
+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,3 +42,4 @@ HideLots=Masquer les lots
 #Traceability - qc status
 OutOfOrder=Hors d'usage
 InWorkingOrder=En état de marche
+ToReplace=Remplacer
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index cec5c583ac9..a9ae791ec8d 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -75,7 +75,7 @@ SellingPriceTTC=Prix de vente TTC
 SellingMinPriceTTC=Prix de vente min. (TTC)
 CostPriceDescription=Ce champ de prix (hors taxes) peut être utilisé pour saisir le montant moyen que ce produit coûte à votre société. Il peut s'agir de n'importe quel prix que vous calculez vous-même, par exemple à partir du prix d'achat moyen plus le coût moyen de production et de distribution.
 CostPriceUsage=Cette valeur peut être utilisée dans le calcul des marges.
-ManufacturingPrice=Manufacturing price
+ManufacturingPrice=Prix de fabrication
 SoldAmount=Solde
 PurchasedAmount=Montant des achats
 NewPrice=Nouveau prix
@@ -398,13 +398,16 @@ ActionAvailableOnVariantProductOnly=Action disponible uniquement sur la variante
 ProductsPricePerCustomer=Prix produit par clients
 ProductSupplierExtraFields=Attributs supplémentaires (Prix fournisseur)
 DeleteLinkedProduct=Supprimer le produit enfant lié à la combinaison
-AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
+AmountUsedToUpdateWAP=Montant à utiliser pour mettre à jour le prix moyen pondéré
 PMPValue=Prix moyen pondéré (PMP)
 PMPValueShort=PMP
 mandatoryperiod=Plage de date obligatoire
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+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=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+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=Basculer le statut En vente
+SwitchOnPurchaseStatus=Basculer le statut En achat
+StockMouvementExtraFields= Champs supplémentaires (mouvement de stock)
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index f9777898e35..d969e7472cc 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -197,6 +197,7 @@ InputPerMonth=Saisie par mois
 InputDetail=Saisir le détail
 TimeAlreadyRecorded=C'est le temps passé déjà enregistré pour cette tâche/jour et pour l'utilisateur %s
 ProjectsWithThisUserAsContact=Projets avec cet utilisateur comme contact
+ProjectsWithThisContact=Projets avec ce contact
 TasksWithThisUserAsContact=Tâches assignées à cet utilisateur
 ResourceNotAssignedToProject=Non assigné au projet
 ResourceNotAssignedToTheTask=Non assigné à la tache
@@ -254,7 +255,7 @@ SendProjectRef=A propos du projet %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Le module 'Paiement des salaires des employés' doit être activé pour définir le taux horaire des employés afin de valoriser le temps passé
 NewTaskRefSuggested=Réf de tâche déjà utilisée, une nouvelle référence de tâche est requise
 TimeSpentInvoiced=Temps passé facturé
-TimeSpentForIntervention=Temps consacré
+TimeSpentForIntervention=Temps consommé
 TimeSpentForInvoice=Temps consommés
 OneLinePerUser=Une ligne par utilisateur
 ServiceToUseOnLines=Service à utiliser sur les lignes
@@ -281,6 +282,8 @@ AddPersonToTask=Ajouter également aux tâches
 UsageOrganizeEvent=Utilisation: Organisation d'événements
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classer le projet comme étant clos lorsque toutes ses tâches sont terminées (progression 100%%)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Remarque : les projets existants avec toutes les tâches terminées à 100 %% ne seront pas affectés : vous devrez les fermer manuellement. Cette option n’affecte que les projets ouverts.
-SelectLinesOfTimeSpentToInvoice=Sélectionnez les lignes de temps consacré non facturées, puis l'action groupée "Générer la facture" pour les facturer
+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
+StartDateCannotBeAfterEndDate=La date de fin ne peux être avant la date de début
diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang
index 958fcd9827b..c32edfad8c1 100644
--- a/htdocs/langs/fr_FR/propal.lang
+++ b/htdocs/langs/fr_FR/propal.lang
@@ -92,7 +92,7 @@ LineBuyPriceHT=Prix d'achat HT de la ligne
 SignPropal=Accepter la proposition
 RefusePropal=Refuser la proposition
 Sign=Signer
-PropalAlreadySigned=Proposition déjà accetpée
+PropalAlreadySigned=Proposition déjà acceptée
 PropalAlreadyRefused=Proposition déjà refusée
 PropalSigned=Proposition acceptée
 PropalRefused=Proposition refusée
diff --git a/htdocs/langs/fr_FR/receptions.lang b/htdocs/langs/fr_FR/receptions.lang
index aa3303abae3..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
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Réceptions et reçus pour cette commande
 ReceptionsToValidate=Réceptions à valider
 StatusReceptionCanceled=Annulé
 StatusReceptionDraft=Brouillon
-StatusReceptionValidated=Validée (produits à envoyer ou envoyés)
+StatusReceptionValidated=Validée (produits à envoyer ou déjà envoyés)
+StatusReceptionValidatedToReceive=Validé (produits à recevoir)
+StatusReceptionValidatedReceived=Validé (produits reçus)
 StatusReceptionProcessed=Traités
 StatusReceptionDraftShort=Brouillon
 StatusReceptionValidatedShort=Validé
@@ -46,3 +49,6 @@ ReceptionsReceiptModel=Modèles de document pour les réceptions
 NoMorePredefinedProductToDispatch=Plus de produits prédéfinis à expédier
 ReceptionExist=Une réception existe
 ByingPrice=Prix d'achat
+ReceptionBackToDraftInDolibarr=Réception %s retourné en brouillon
+ReceptionClassifyClosedInDolibarr=Reception %s classée Fermée
+ReceptionUnClassifyCloseddInDolibarr=Réception %s ré-ouverte
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index 2ed1562caa0..51a430cc9b6 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -6,7 +6,7 @@ CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Par défaut, laissez vide l’option "Cr
 Salary=Salaire
 Salaries=Salaires
 NewSalary=Nouveau salaire
-AddSalary=Add salary
+AddSalary=Ajouter un salaire
 NewSalaryPayment=Nouveau salaire
 AddSalaryPayment=Ajouter paiement de salaire
 SalaryPayment=Règlement salaire
@@ -23,4 +23,5 @@ AllSalaries=Tous les salaires
 SalariesStatistics=Statistiques
 SalariesAndPayments=Salaires et paiements
 ConfirmDeleteSalaryPayment=Voulez-vous supprimer ce paiement de salaire ?
-FillFieldFirst=Fill employee field first
+FillFieldFirst=Remplissez d'abord le champ de l'employé
+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 27feec29992..a907598ff61 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -63,7 +63,7 @@ RuleForWarehouse=Règle pour les entrepôts
 WarehouseAskWarehouseOnThirparty=Définir un entrepôt sur les tiers
 WarehouseAskWarehouseDuringPropal=Définir un entrepôt sur les propositions commerciales
 WarehouseAskWarehouseDuringOrder=Définir un entrepôt sur les commandes clients
-WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
+WarehouseAskWarehouseDuringProject=Définir un entrepôt sur les projets
 UserDefaultWarehouse=Définir un entrepôt sur les utilisateurs
 MainDefaultWarehouse=Entrepôt par défaut
 MainDefaultWarehouseUser=Utiliser un entrepôt par défaut pour chaque utilisateur
@@ -96,7 +96,7 @@ RealStock=Stock réel
 RealStockDesc=Le stock physique ou réel est le stock présent dans les entrepôts.
 RealStockWillAutomaticallyWhen=Le stock réel sera modifié selon ces règles (voir la configuration du module Stock) :
 VirtualStock=Stock virtuel
-VirtualStockAtDate=Virtual stock at a future date
+VirtualStockAtDate=Stock virtuel à une date future
 VirtualStockAtDateDesc=Stock virtuel une fois que tous les ordres en attente, prévus d'être traités avant la date choisie, soient terminés
 VirtualStockDesc=Le stock virtuel est la quantité de produit en stock après que les opérations en cours (et qui affectent les stocks) soient terminées (réceptions de commandes fournisseurs, expéditions de commandes clients, production des ordres de fabrications, etc)
 AtDate=À date
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Alerte de limite de stock et de stock désiré supp
 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
 InventoryDate=Date d'inventaire
+Inventories=inventaires
 NewInventory=Nouvel inventaire
 inventorySetup = Paramétrage de l'inventaire
 inventoryCreatePermission=Créer un nouvel inventaire
@@ -240,7 +241,7 @@ StockAtDatePastDesc=Vous pouvez voir ici le stock (stock réel) à une date donn
 StockAtDateFutureDesc=Vous pouvez voir ici le stock (stock virtuel) à une date donnée dans le futur
 CurrentStock=Stock actuel
 InventoryRealQtyHelp=Définissez la valeur sur 0 pour réinitialiser la quantité <br> Gardez le champ vide ou supprimez la ligne pour qu'elle reste inchangé
-UpdateByScaning=Remplir la quantité réelle en scannant
+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.
@@ -253,14 +254,20 @@ 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=Remplir la quantité réelle avec la quantité prévue
+AutofillWithExpected=Remplacer la quantité réelle par la quantité attendue
 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
-FieldCannotBeNegative=Le champ "%s" ne peut pas être négatif
 ErrorWrongBarcodemode=Mode code-barres inconnu
 ProductDoesNotExist=Le produit n'existe pas
-ErrorSameBatchNumber=Même numéro de lot trouvé dans la liste d'inventaire
+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=Enregistrez d'abord les quantités réelles inventoriées, avant de demander la création du mouvement de stock.
+InventoryStartedShort=En cours
+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
diff --git a/htdocs/langs/fr_FR/stripe.lang b/htdocs/langs/fr_FR/stripe.lang
index 57b5c7e29ca..15837306612 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=Ce module offre des pages pour autoriser les paiements par carte sur <a href="http://www.stripe.com" target="_blank">Stripe</a> par les clients. Elles peuvent êtres utilisées pour un paiement libre ou un paiement sur un objet particulier de Dolibarr (facture, commande, ... )
+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
@@ -28,7 +28,6 @@ AccountParameter=Paramètres du compte
 UsageParameter=Paramètres d'utilisation
 InformationToFindParameters=Informations pour trouver vos paramètres de compte %s
 STRIPE_CGI_URL_V2=URL du module CGI Stripe de paiement
-VendorName=Nom du vendeur
 CSSUrlForPaymentForm=URL feuille style css pour le formulaire de paiement
 NewStripePaymentReceived=Nouveau paiement Stripe reçu
 NewStripePaymentFailed=Nouveau paiement Stripe tenté mais en échec
@@ -69,4 +68,4 @@ ToOfferALinkForTestWebhook=Lien pour la configuration de Stripe WebHook pour app
 ToOfferALinkForLiveWebhook=Lien pour la configuration de Stripe WebHook pour appeler l'IPN (mode actif)
 PaymentWillBeRecordedForNextPeriod=Le paiement sera enregistré pour la prochaine période.
 ClickHereToTryAgain=<a href="%s">Cliquez ici pour essayer à nouveau...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=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
+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
diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
index 0d0bf4528a5..dd5402d66ae 100644
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@@ -46,4 +46,4 @@ ReputationForThisProduct=Réputation
 BuyerName=Nom de l'acheteur
 AllProductServicePrices=Tous les prix du produits / service
 AllProductReferencesOfSupplier=Toutes les références du fournisseur
-BuyingPriceNumShort=Prix fournisseurs
+BuyingPriceNumShort=Prix fournisseurs
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index cc51d935efe..91850194533 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -19,7 +19,7 @@
 #
 
 Module56000Name=Gestionnaire de tickets
-Module56000Desc=Système de ticket pour de l'assistance ou une demande d'accompagnement
+Module56000Desc=Gestionnaire de tickets d'assistance ou de gestion de demandes internes/clients/fournisseurs
 
 Permission56001=Voir tickets
 Permission56002=Modifier des tickets
@@ -318,7 +318,7 @@ BoxTicketLastXDays=Nombre de nouveaux tickets par jour ces %s derniers jours
 BoxTicketLastXDayswidget = Nombre de nouveaux tickets par jour ces X derniers jours
 BoxNoTicketLastXDays=Aucun nouveau ticket ces %s derniers jours
 BoxNumberOfTicketByDay=Nombre de nouveaux tickets par jour
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
+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=Nous avons trouvé des sujets et des FAQ pouvant répondre à votre question, merci de les consulter avant de soumettre le ticket
diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang
index 447504764b5..8613784c1fc 100644
--- a/htdocs/langs/fr_FR/trips.lang
+++ b/htdocs/langs/fr_FR/trips.lang
@@ -112,7 +112,7 @@ ConfirmCloneExpenseReport=Êtes-vous sûr de vouloir cloner cette note de frais
 ExpenseReportsIk=Configuration des indemnités kilométriques
 ExpenseReportsRules=Règle de note de frais
 ExpenseReportIkDesc=Vous pouvez modifier le calcul des indemnités kilométriques par catégories et gammes précédemment définies. <b>d</b> est la distance en kilomètres.
-ExpenseReportRulesDesc=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=Vous pouvez définir des règles de montant maximum pour les notes de frais. Ces règles seront vérifiées lorsqu'une nouvelle dépense est ajoutée à une note de frais
 expenseReportOffset=Décalage
 expenseReportCoef=Coefficient
 expenseReportTotalForFive=Exemple avec <u>d</u> = 5
@@ -128,18 +128,18 @@ ExpenseReportLimitOn=Limite sur
 ExpenseReportDateStart=Date début
 ExpenseReportDateEnd=Date fin
 ExpenseReportLimitAmount=Montant maximum
-ExpenseReportRestrictive=Exceeding forbidden
+ExpenseReportRestrictive=Dépassement non autorisé
 AllExpenseReport=Tout type de note de frais
 OnExpense=Ligne de dépense
 ExpenseReportRuleSave=Règle de calcul enregistrée
 ExpenseReportRuleErrorOnSave=Erreur: %s
 RangeNum=Plage %d
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
+ExpenseReportConstraintViolationError=Montant max dépassé (règle %s) : %s est supérieur à %s (Dépassement interdit)
 byEX_DAY=par jour (limité à %s)
 byEX_MON=par mois (limité à%s)
 byEX_YEA=par an (limité à %s)
 byEX_EXP=par ligne (limité à %s)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
+ExpenseReportConstraintViolationWarning=Montant max dépassé (règle %s) : %s est supérieur à %s (Dépassement autorisé)
 nolimitbyEX_DAY=par jour (sans limite)
 nolimitbyEX_MON=par mois (sans limite)
 nolimitbyEX_YEA=par an (sans limite)
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 88bfa9f53e3..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
@@ -45,7 +45,7 @@ ViewWebsiteInProduction=Pré-visualiser le site web en utilisant l'URL de la pag
 SetHereVirtualHost=<u> Utilisation avec Apache/NGinx/...</u> <br> Créez sur votre serveur Web (Apache, Nginx, ...) un hôte virtuel dédié avec PHP activé et un répertoire racine sur <br> <strong> %s </strong>
 ExampleToUseInApacheVirtualHostConfig=Exemple à utiliser dans la configuration de l'hôte virtuel Apache:
 YouCanAlsoTestWithPHPS=<u> Utilisation avec un serveur PHP incorporé </u> <br> Sous environnement de développement, vous pouvez préférer tester le site avec le serveur Web PHP intégré (PHP 5.5 requis) en exécutant <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
-YouCanAlsoDeployToAnotherWHP=<u>Exécutez votre site Web avec un autre fournisseur d'hébergement Dolibarr</u> <br> Si vous ne disposez pas d'un serveur Web tel qu'Apache ou NGinx sur Internet, vous pouvez exporter et importer votre site Web vers une autre instance de Dolibarr fournie par un autre fournisseur d'hébergement Dolibarr offrant une intégration complète avec le module de site Web. Vous pouvez trouver une liste de certains hébergeurs Dolibarr sur <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+YouCanAlsoDeployToAnotherWHP= <u> Exécutez votre site web avec un autre hébergeur Dolibarr </u> <br> Si vous n'avez pas de serveur web comme Apache ou NGinx disponible sur internet, vous pouvez exporter et importer votre site web sur une autre instance de Dolibarr fournie par un autre hébergeur Dolibarr qui offre une intégration complète du module Site Web. Vous pouvez trouver une liste de certains hébergeurs Dolibarr sur <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a>
 CheckVirtualHostPerms=Vérifiez également que l'utilisateur du virtual host (par exemple www-data) a la permission <strong> %s </strong> sur les fichiers dans<br><strong> %s </strong>
 ReadPerm=Lire
 WritePerm=Écrire
@@ -60,7 +60,7 @@ YouCanEditHtmlSourceckeditor=Vous pouvez éditer le code source en activant l'é
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Vous pouvez inclure du code PHP dans cette source en utilisant les balises <strong>&lt;?php ?&gt;</strong>. Les variables globales suivantes sont disponibles: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs. <br><br><span class="fa fa-bug"></span> Vous pouvez également inclure le contenu d'une autre page / conteneur avec la syntaxe suivante: <br> <strong>&lt;?php includeContainer ('alias_of_container_to_include'); ?&gt;</strong> <br><br><span class="fa fa-bug"></span> Vous pouvez créer une redirection vers une autre page / conteneur avec la syntaxe suivante (Remarque: ne pas afficher de contenu avant une redirection): <br> <strong>&lt;?php redirectToContainer ('alias_of_container_to_redirect_to'); ?&gt;</strong> <br><br><span class="fa fa-link"></span> Pour ajouter un lien vers une autre page, utilisez la syntaxe: <br> <strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong> <br><br><span class="fa fa-download"></span> Pour inclure un <strong>lien pour télécharger</strong> un fichier stocké dans le répertoire des <strong>documents</strong> , utilisez l'encapsuleur <strong>document.php</strong> : <br> Exemple, pour un fichier dans documents/ecm (besoin d'être loggué), la syntaxe est: <br> <strong>&lt;a href="/document.php?modulepart=ecm&amp;file=[relative_dir/]filename.ext"&gt;</strong> <br> Pour un fichier dans des documents/medias (répertoire ouvert pour accès public), la syntaxe est: <br> <strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong> <br> Pour un fichier partagé avec un lien de partage (accès ouvert en utilisant la clé de partage du fichier), la syntaxe est la suivante: <br> <strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong> <br><br><span class="fa fa-picture-o"></span> Pour inclure une <strong>image</strong> stockée dans le répertoire <strong>documents</strong>, utilisez le wrapper <strong>viewimage.php</strong> : <br> Exemple, pour une image dans des documents/medias (répertoire ouvert), la syntaxe est: <br> <strong>&lt;img src = "/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource2=Pour une image partagée avec un lien de partage (accès ouvert à l'aide de la clé de partage du fichier), la syntaxe est la suivante: <br> <strong> &lt;img src = "/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br> Plus d'exemples de code HTML ou dynamique disponibles sur <a href="%s" target="_blank"> la documentation wiki </a> <br>.
+YouCanEditHtmlSourceMore= <br> Plus d'exemples de code HTML ou dynamique disponible sur <a href="%s" target="_blank" rel="noopener noreferrer external"> la documentation wiki </a> <br> .
 ClonePage=Cloner la page/container
 CloneSite=Cloner le site
 SiteAdded=Site web ajouté
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index cc3d9167966..fae9c7e2f78 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Ordre de virement
 LatestBankTransferReceipts=Les %s derniers ordres de virement bancaire
 LastWithdrawalReceipts=Les %s derniers bons de prélèvements
 WithdrawalsLine=Ligne d'ordre de prélèvement automatique
+CreditTransfer=Virement bancaire
 CreditTransferLine=Ligne de virement
 WithdrawalsLines=Lignes de prélèvements
 CreditTransferLines=Lignes de virement
@@ -47,6 +48,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=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
@@ -80,7 +82,7 @@ StatusMotif7=Décision judiciaire
 StatusMotif8=Autre motif
 CreateForSepaFRST=Créer fichier de prélèvement (SEPA FRST)
 CreateForSepaRCUR=Créer fichier de prélèvement (SEPA RCUR)
-CreateAll=Créer le fichier de prélèvement (tout)
+CreateAll=Créer fichier de prélèvement automatique
 CreateFileForPaymentByBankTransfer=Créer fichier pour les virements
 CreateSepaFileForPaymentByBankTransfer=Créer un fichier de virement (SEPA)
 CreateGuichet=Seulement guichet
@@ -115,7 +117,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=En signant ce formulaire 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 pouvez obtenir un remboursement de votre banque selon les termes et conditions de votre contrat avec votre banque. Un remboursement doit être demandé dans les 8 semaines à compter de la date à laquelle votre compte a été débité. Vos droits concernant le mandat ci-dessus sont expliqués dans une déclaration que vous pouvez obtenir auprès de votre banque.
+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 *
@@ -150,3 +152,5 @@ 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=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
diff --git a/htdocs/langs/fr_FR/workflow.lang b/htdocs/langs/fr_FR/workflow.lang
index d20027ca42b..02c641616fe 100644
--- a/htdocs/langs/fr_FR/workflow.lang
+++ b/htdocs/langs/fr_FR/workflow.lang
@@ -13,10 +13,14 @@ descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classer la/les proposition(s) commer
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classer la/les commande(s) client(s) source(s) facturée(s) à la validation de la facture client (et si le montant de la facture est le même que le montant total des commandes liées)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classer la/les commande(s) client(s) source(s) à Facturée quand une facture client est passée à Payé (et si le montant de la facture est identique à la somme des commandes sources)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classer la commande source à expédiée à la validation d'une expédition (et si les quantités expédiées dans le bon d'expédition sont les même que dans la commande mise à jour)
-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
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Fermer toutes les interventions liées au ticket lorsqu'un ticket est fermé
diff --git a/htdocs/langs/fr_GA/accountancy.lang b/htdocs/langs/fr_GA/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/fr_GA/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/fr_GA/admin.lang b/htdocs/langs/fr_GA/admin.lang
index d8687c61b69..10a19479a6e 100644
--- a/htdocs/langs/fr_GA/admin.lang
+++ b/htdocs/langs/fr_GA/admin.lang
@@ -1,14 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
 Module20Name=Devis
 Module30Name=Factures
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
+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/cashdesk.lang b/htdocs/langs/fr_GA/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/fr_GA/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/fr_GA/compta.lang b/htdocs/langs/fr_GA/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/fr_GA/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/fr_GA/errors.lang b/htdocs/langs/fr_GA/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/fr_GA/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/fr_GA/members.lang b/htdocs/langs/fr_GA/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/fr_GA/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/fr_GA/mrp.lang b/htdocs/langs/fr_GA/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/fr_GA/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/fr_GA/orders.lang b/htdocs/langs/fr_GA/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/fr_GA/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/fr_GA/printing.lang b/htdocs/langs/fr_GA/printing.lang
deleted file mode 100644
index beb0f283826..00000000000
--- a/htdocs/langs/fr_GA/printing.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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
-MenuDirectPrinting=One click Printing jobs
-DirectPrint=One click Print
diff --git a/htdocs/langs/fr_GA/products.lang b/htdocs/langs/fr_GA/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/fr_GA/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/fr_GA/propal.lang b/htdocs/langs/fr_GA/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/fr_GA/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/fr_GA/receptions.lang b/htdocs/langs/fr_GA/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/fr_GA/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/fr_GA/sendings.lang b/htdocs/langs/fr_GA/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/fr_GA/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/fr_GA/stocks.lang b/htdocs/langs/fr_GA/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/fr_GA/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/fr_GA/trips.lang b/htdocs/langs/fr_GA/trips.lang
deleted file mode 100644
index 61195908177..00000000000
--- a/htdocs/langs/fr_GA/trips.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-ExpenseReportLimitAmount=Max amount
diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang
index a0c1904ea69..b5b3a8afad6 100644
--- a/htdocs/langs/gl_ES/accountancy.lang
+++ b/htdocs/langs/gl_ES/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=Países non CEE
 CountriesInEECExceptMe=Todos os paises incluidos na CEE excepto %s
 CountriesExceptMe=Todos os países excepto %s
 AccountantFiles=Exportar documentos contables
-ExportAccountingSourceDocHelp=Con esta ferramenta, pode exportar os eventos de orixe (lista en CSV e PDF) que se empregaron para xerar a súa contabilidade. 
+ExportAccountingSourceDocHelp=Con esta ferramenta, pode exportar os eventos de orixe (listaxe en CSV e PDF) que se empregan para xerar a súa contabilidade.
 ExportAccountingSourceDocHelp2=Para exportar as súas revistas, use a entrada de menú %s - %s
 VueByAccountAccounting=Ver por conta contable
 VueBySubAccountAccounting=Ver pos subconta contable
@@ -246,10 +246,10 @@ DescThirdPartyReport=Consulte aquí o listaxe de clientes e provedores e os seus
 ListAccounts=Listaxe de contas contables
 UnknownAccountForThirdparty=Conta contable de terceiro descoñecida, usaremos %s
 UnknownAccountForThirdpartyBlocking=Conta contable de terceiro descoñecida. Erro de bloqueo.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Conta contable non definida ou descoñecido por terceiros ou usuarios. Vai se usada %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Conta contable non definida ou  terceiros ou usuarios descoñecidos. Vai ser usada %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Terceiro descoñecido e conta vinculada non definidos no pago. Manteremos o valor da conta ligada baleiro.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking= Conta contable non definida ou descoñecido por terceiros ou usuarios. Erro de bloqueo
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conta de terceiros descoñecida e conta de espera non definida. Erro de bloqueo
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Conta contable non definida ou terceiros ou usuarios descoñecidos. Erro de bloqueo
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conta de terceiros descoñecida e conta en espera non definida. Erro de bloqueo
 PaymentsNotLinkedToProduct=Pagos non ligados a un produto/servizo
 OpeningBalance=Saldo de apertura
 ShowOpeningBalance=Amosar saldo de apertura
@@ -278,15 +278,15 @@ 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)
+DescClosure=Consulte aquí o número de movementos por mes que non están validados e exercicios fiscais xa abertos
+OverviewOfMovementsNotValidated=Paso 1/ Visión xeral dos movementos non validados. (Preciso para pechar un exercicio fiscal)
 AllMovementsWereRecordedAsValidated=Todos os movementos foron rexistrados e validados
 NotAllMovementsCouldBeRecordedAsValidated=Non todos os movementos puideron ser rexistrados e validados
 ValidateMovements=Validar os movementos
 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ón automática finalizada
+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
@@ -339,7 +339,7 @@ Modelcsv_normal=Exportación clásica
 Modelcsv_CEGID=Exportar cara a CEGID Expert Comptabilité
 Modelcsv_COALA=Exportar cara a Sage Celoala
 Modelcsv_bob50=Exportar cara a Sage BOB 50
-Modelcsv_ciel=Exportar para Sage50, Ciel Compta ou Compta Evo. (Formato XIMPORT)
+Modelcsv_ciel=Exportar cara a Sage50, Ciel Compta ou Compta Evo. (Formato XIMPORT)
 Modelcsv_quadratus=Exportar cara a Quadratus QuadraCompta
 Modelcsv_ebp=Exportar a EBP
 Modelcsv_cogilog=Exportar a Cogilog
@@ -351,7 +351,7 @@ Modelcsv_configurable=Exportación CSV Configurable
 Modelcsv_FEC=Exportación FEC (Art. L47 A)
 Modelcsv_FEC2=Exportar FEC (con escritura de xeración de datas / documento inverso)
 Modelcsv_Sage50_Swiss=Exportación a Sage 50 Suiza
-Modelcsv_winfic=Exportar para Winfic - eWinfic - WinSis Compta 
+Modelcsv_winfic=Exportar cara a Winfic - eWinfic - WinSis Compta 
 Modelcsv_Gestinumv3=Exportar a Gestinum (v3)
 Modelcsv_Gestinumv5=Exportar para Gestinum (v5) 
 Modelcsv_charlemagne=Exportar para Aplim Charlemagne
@@ -387,7 +387,8 @@ SaleExport=Venda de exportación
 SaleEEC=Venda na CEE
 SaleEECWithVAT=Vendas na CEE con IVE non nulo, polo que supoñemos que isto non é unha venda intracomunitaria e a conta suxerida é a conta estandar de produto.
 SaleEECWithoutVATNumber=Venda na CEE sen IVE pero non se define o número de identificación do IVE de terceiros. Respondemos á conta do produto para as vendas estándar. Pode corrixir o ID de IVE de terceiros ou a conta do produto se é preciso.
-
+ForbiddenTransactionAlreadyExported=Prohibido: a transacción foi validada e/ou exportada. 
+ForbiddenTransactionAlreadyValidated=Prohibido: a transacción foi validada.
 ## Dictionary
 Range=Rango de conta contable
 Calculated=Calculado
@@ -404,6 +405,7 @@ NoJournalDefined=Sen diario definido
 Binded=Liñas contabilizadas
 ToBind=Liñas a contabilizar
 UseMenuToSetBindindManualy=Non é posible autodetectar, utilice o menú <a href="%s"> %s </a> para realizar o apunte manualmente
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sentímolo, este módulo non é compatible coa función experimental da situación das facturas 
 
 ## Import
 ImportAccountingEntries=Entradas contables
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index ad39e396a82..27692650270 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+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
@@ -265,8 +267,8 @@ OtherResources=Outros recursos
 ExternalResources=Recursos externos
 SocialNetworks=Redes sociais
 SocialNetworkId=ID Rede Social
-ForDocumentationSeeWiki=Para a documentación de usuario, desenvolvedor (Doc, FAQS),<br> visite o wiki Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Para calquera outra dúbida/axuda, pode facer uso do foro Dolibarr: <br><b><a href="%s" target="_blank">%s</a></b>
+ForDocumentationSeeWiki=Para a documentación de usuario, desenvolvedor (Doc, FAQS),<br> visite o wiki Dolibarr: <br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
+ForAnswersSeeForum=Para calquera outra dúbida/axuda, pode facer uso do foro Dolibarr: <br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=Aquí hai algúns recursos para obter axuda e soporte de Dolibarr
 HelpCenterDesc2=Algúns destes recursos só están dispoñibles en <b>inglés</b>.
 CurrentMenuHandler=Xestor de menú actual
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Última versión estable
 LastActivationDate=Última data de activación
 LastActivationAuthor=Último autor de activación
 LastActivationIP=Última IP activa
+LastActivationVersion=Última versión de activación 
 UpdateServerOffline=Actualizar servidor offline
 WithCounter=Con contador
 GenericMaskCodes=Pode introducir calquera máscara de numeración. Nesta máscara pódense usar as seguintes etiquetas: <br><b> {000000} </b> corresponde a un número que se incrementará en cada %s. Introduza tantos ceros como a lonxitude desexada do contador. O contador completarase con ceros desde a esquerda para ter tantos ceros como a máscara.<br><b>{000000+000}</b>igual que o anterior pero aplícase unha compensación correspondente ao número á dereita do signo + a partir do primeiro %s.<br><b> {000000@x} </b>igual que o anterior pero o contador restablécese a cero cando se alcanza o mes x (x entre 1 e 12 ou 0 para usar os primeiros meses do ano fiscal definidos na súa configuración ou 99 para restablecer a cero cada mes). Se se usa esta opción e x é 2 ou superior, entón tamén é necesaria a secuencia {yy} {mm} ou {yyyy} {mm}. <br><b>{dd} </b> días (01 a 31) .<br><b>{mm} </b>meses (01 a 12) . <br><b>{yy}</b>,<b>{yyyy}</b> ou <b>{y}</b>anos sobre 2, 4 ou 1 números.<br>
@@ -375,7 +378,7 @@ UMask=Parámetro UMask de novos ficheiros en Unix/Linux/BSD.
 UMaskExplanation=Este parámetro determina os dereitos dos ficheiros creados no servidor Dolibarr (durante a subida, por exemplo).<br>Este debe ser o valor octal (por exemplo, 0666 significa leitura / escritura para todos).<br>Este parámetro non ten ningún efecto sobre un servidor Windows.
 SeeWikiForAllTeam=Vexa o wiki para mais detalles de todos os actores e da súa organización
 UseACacheDelay= Demora en caché da exportación en segundos (0 o vacio sen caché)
-DisableLinkToHelpCenter=Agocha a ligazón "<b>Necesito axuda ou soporte</b>" na páxina de inicio de sesión 
+DisableLinkToHelpCenter=Agocha a ligazón "<b>Precisa axuda ou soporte</b>" na páxina de inicio de sesión 
 DisableLinkToHelp=Agocha a ligazón de axuda en liña "<b>%s</b>
 AddCRIfTooLong=Non hai liñas de corte automático, de tal xeito que se o texto é longo demais non será amosado nos documentos. Prégase que engada un salto de liña na área de texto se fora preciso
 ConfirmPurge=¿Está certo de querer realizar esta purga?<br>Isto borrará definitivamente todos os datos dos seus ficheiros (área GED, ficheiros axuntados...).
@@ -634,7 +637,7 @@ Module1780Name=Etiquetas/Categorías
 Module1780Desc=Crear etiquetas/categoría (produtos, clientes, provedores, contactos ou membros)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permite edictar/formatar campos de texto usando CKEditor (html)
-Module2200Name=Precios dinámicos
+Module2200Name=Prezos dinámicos
 Module2200Desc=Activar o uso de expresións matemáticas para auto xerar prezos
 Module2300Name=Tarefas programadas
 Module2300Desc=Xestión do traballo programado (alias cron ou chrono taboa)
@@ -753,7 +756,7 @@ Permission106=Exportar expedicións
 Permission109=Eliminar expedicións
 Permission111=Consultar contas financieras
 Permission112=Crear/modificar/eliminar e comparar movementos bancarios
-Permission113=Configurar contas financieras (crear, xestionar categorías)
+Permission113=Configurar contas financeiras (crear, xestionar categorías de transaccións bancarias)
 Permission114=Reconciliar transaccións
 Permission115=Exportar transaccións e extractos de conta
 Permission116=Transferencias entre contas
@@ -762,6 +765,7 @@ Permission121=Consultar empresas
 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)
@@ -860,7 +864,7 @@ Permission430=Usa barra de debug
 Permission511=Ler salarios e pagamentos (os seus e subordinados) 
 Permission512=Crear/modificar salarios e pagamentos 
 Permission514=Eliminar salarios e pagamentos
-Permission517=Ler  salarios e pagamentos de todos
+Permission517=Ler salarios e pagamentos de todos
 Permission519=Exportar salarios
 Permission520=Consultar Créditos
 Permission522=Crear/modificar Créditos
@@ -889,12 +893,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=Crear/modificar informe de gastos
+Permission772=Crear/modificar informes de gastos (para vostede e os seus subordinados)
 Permission773=Eliminar informe de gastos
-Permission774=Consultar todos os informes de gastos (incluidos os non subordinados)
 Permission775=Aprobar informe de gastos
 Permission776=Pagar informe de gastos
-Permission777=Ler informes de gastos de todos
+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
@@ -958,15 +961,11 @@ Permission2801=Utilizar o cliente FTP en modo leitura (só explorar e descargar)
 Permission2802=Utilizar o cliente FTP en modo escritura (borrar ou subir ficheiros)
 Permission3200=Consultar eventos arquivados e huellas dixitais
 Permission3301=Xerar novos módulos
-Permission4001=Ver empregados
-Permission4002=Crear empregados
-Permission4003=Eliminar empregados
-Permission4004=Exportar empregados
-Permission4010=Ler competencia/traballo/posto
-Permission4011=Crear/modificar competencia/traballo/posto
-Permission4012=Eliminar competencia/traballo/posto
-Permission4020=Ler avaliación
-Permission4021=Crear/modificar avaliación
+Permission4001=Ler competencia/traballo/posto
+Permission4002=Crear/modificar competencia/traballo/posto
+Permission4003=Eliminar competencia/traballo/posto
+Permission4020=Ler avaliacións 
+Permission4021=Crea/modifica a súa avaliación
 Permission4022=Validar avaliación
 Permission4023=Eliminar avaliación
 Permission4030=Ver menú comparativo 
@@ -977,9 +976,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=Consultar todas as peticións de días retribuidos (tamén non subordinados)
-Permission20005=Crear/modificar as peticións de días retribuidos para todos (tamén non subordinados)
-Permission20006=Administrar días retribuidos (configuración e actualización do 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
@@ -1264,8 +1263,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.
@@ -1285,7 +1284,7 @@ YourPHPDoesNotHaveSSLSupport=Funcións SSL non dispoñibles no seu PHP
 DownloadMoreSkins=Mais temas para descargar
 SimpleNumRefModelDesc=Devolve o número de referencia no formato %s yymm-nnnn onde yy é o ano, mm é o mes e nnnn é un número secuencial de incremento automático sen restablecer
 SimpleNumRefNoDateModelDesc=Devolve o número de referencia no formato %s-nnnn onde nnnn é un número con incremento automático secuencial sen restablecemento
-ShowProfIdInAddress=Amosar identificación profesional con enderezos 
+ShowProfIdInAddress=Amosar identificación profesional con enderezos
 ShowVATIntaInAddress=Ocultar o número de IVE intracomunitario
 TranslationUncomplete=Tradución parcial
 MAIN_DISABLE_METEO=Desactiva as miniaturas meteorolóxicas
@@ -1358,9 +1357,9 @@ BrowserIsOK=Usa o navegador web %s. Este navegador está optimizado para a segur
 BrowserIsKO=Usa o navegador web %s.  Este navegador é unha mala escolla para a seguridade, rendemento e fiabilidade. Aconsellamos utilizar Firefox, Chrome, Opera ou Safari.
 PHPModuleLoaded=%s de compoñente PHP está cargado
 PreloadOPCode=Pregarca de OPCode está activa
-AddRefInList=Amosar código de cliente/provedor nas listaxes (e selectores) e ligazóns.<br>Os terceiros aparecerán co nome "CC12345 - SC45678 - The big company coorp", no lugar de "The big company coorp".
-AddVatInList=Amosar o número de IVE do cliente/provedor. listaxe de información (seleccionar lista ou combobox). 
-AddAdressInList=Amosar o enderezo do cliente/provedor nas listaxes (e selectores) <br>Os terceiros aparecerán co nome "The big company coorp - 21 jump street 123456 Big town - USA ", no lugar de "The big company coorp".
+AddRefInList=Amosar código de cliente/provedor nas listaxes combinadas.<br>Os terceiros aparecerán cun formato de nome "CC12345 - SC45678 - The Big Company corp.", no lugar de "The Big Company corp".
+AddVatInList=Amosar o número de IVE do cliente/provedor en listaxes combinadas
+AddAdressInList=Amosar o enderezo do cliente/provedor nas listaxes combinadas.<br> Os terceiros aparecerán cun formato de nome "The Big Company corp - 21 jump street 123456 Big town - USA ", no lugar de "The Big Company corp".
 AddEmailPhoneTownInContactList=Amosar o correo electrónico de contacto (ou os teléfonos se non é definido) e a lista de información da cidade (seleccionar lista ou caixa de combinación) <br> Os contactos aparecerán cun formato de nome "Dupond Durand-dupond.durand@email.com-Paris" ou "Dupond" Durand - 06 07 59 65 66 - París "en lugar de" Dupond Durand ".
 AskForPreferredShippingMethod=Consultar polo método preferido de envío a terceiros.
 FieldEdition=Edición do campo %s
@@ -1440,7 +1439,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Almacén a utilizar para o pedimento
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Preguntar por conta bancaria a usar no pedimento a provedor
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Modo de pagos suxerido no pedimento de cliente por defecto se non se define no pedimento
+SuggestedPaymentModesIfNotDefinedInOrder=Modo de pagamentos suxerido no pedimento de cliente por defecto se non se define no pedimento
 OrdersSetup=Configuración da xestión de pedimentos de cliente
 OrdersNumberingModules=Modelos de numeración de pedimentos
 OrdersModelModule=Modelos de documentos de pedimentos
@@ -1708,8 +1707,9 @@ MailingDelay=Segundos que agarda despois de enviar a mensaxe seguinte
 NotificationSetup=Configuración do módulo notificacións
 NotificationEMailFrom=E-Mail emisor (From) dos correos enviados ao través de notificacións
 FixedEmailTarget=Destinatario fixo
-NotificationDisableConfirmMessageFix=Desactiva a información de notificación na mensaxe de confirmación para a notificación de corrección 
-NotificationDisableConfirmMessageUser=Desactiva a información de notificación na mensaxe de confirmación para a notificación do usuario
+NotificationDisableConfirmMessageContact=Oculta a lista de destinatarios (subscritos como contacto) das notificacións na mensaxe de confirmación
+NotificationDisableConfirmMessageUser=Oculta a lista de destinatarios (subscritos como usuario) das notificacións na mensaxe de confirmación
+NotificationDisableConfirmMessageFix=Oculta a lista de destinatarios (subscritos como correo electrónico global) das notificacións na mensaxe de confirmación
 ##### Sendings #####
 SendingsSetup=Configuración do módulo Expedicións
 SendingsReceiptModel=Modelo de notas de entrega
@@ -1725,7 +1725,7 @@ FreeLegalTextOnDeliveryReceipts=Texto libre nas notas de recepción
 ##### FCKeditor #####
 AdvancedEditor=Editor avanzado
 ActivateFCKeditor=Activar editor avanzado para :
-FCKeditorForNotePublic=WYSIWYG creación/edición do campo notas públicas de elementos 
+FCKeditorForNotePublic=WYSIWYG creación/edición do campo "notas públicas" de elementos 
 FCKeditorForNotePrivate=WYSIWYG creación/edición do campo notas privadas de elementos 
 FCKeditorForCompany=WYSIWYG creación/edición da descrición do campo de elementos (excepto produtos/servizos) 
 FCKeditorForProduct=WYSIWYG creación/edición da descrición do campo de produtos/servizos 
@@ -1843,7 +1843,7 @@ ApiKey=Chave para API
 WarningAPIExplorerDisabled=Desactivouse o explorador de API. O explorador API non está obrigado a proporcionar servizos API. É unha ferramenta para que os desenvolvedores atopen/proben as API REST. Se precisa esta ferramenta, acceda á configuración do módulo API REST para activala.
 ##### Bank #####
 BankSetupModule=Configuración do módulo Banco
-FreeLegalTextOnChequeReceipts=Texto gratuíto nos recibos do talón
+FreeLegalTextOnChequeReceipts=Texto libre nos recibos do talón
 BankOrderShow=Amosar a orde das contas bancarias dos países que usan "número bancario detallado"
 BankOrderGlobal=Xeral
 BankOrderGlobalDesc=Orde xeral de visualización
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Configuración do módulo Informes de gastos - Regras
 ExpenseReportNumberingModules=Módulo de numeración de informes de gastos
 NoModueToManageStockIncrease=Non se activou ningún módulo capaz de xestionar o aumento automático de stock. O aumento do stock farase só en entrada manual.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Pode atopar opcións para as notificacións por correo electrónico habilitando e configurando o módulo "Notificación".
+TemplatesForNotifications=Padróns para notificacións
 ListOfNotificationsPerUser=Listaxe de notificacións automáticas por usuario *
 ListOfNotificationsPerUserOrContact=Listaxe de posibles notificacións automáticas (no evento empresarial) dispoñibles por usuario * ou por contacto **
 ListOfFixedNotifications=Listaxe de notificacións fixas automáticas
@@ -1910,12 +1911,14 @@ Threshold=Límite
 BackupDumpWizard=Asistente para crear unha copia de seguridade da base de datos
 BackupZipWizard=Asistente para crear unha copia de seguridade do directorio de documentos
 SomethingMakeInstallFromWebNotPossible=A instalación do módulo externo non é posible desde a interface web polo seguinte motivo:
-SomethingMakeInstallFromWebNotPossible2=Por este motivo, o proceso de actualización descrito aquí é un proceso manual que só pode realizar un usuario privilexiado con privilexios o ficheiro <strong>%s</strong> para permitir esta función.
+SomethingMakeInstallFromWebNotPossible2=Por este motivo, o proceso de actualización descrito aquí é un proceso manual que só pode realizar un usuario con permisos
 InstallModuleFromWebHasBeenDisabledByFile=O seu administrador desactivou a instalación do módulo externo desde a aplicación. Debe pedirlle que elimine o ficheiro <strong>%s</strong> para permitir esta función.
 ConfFileMustContainCustom=A instalación ou construción dun módulo externo desde a aplicación precisa gardar os ficheiros do módulo no directorio <strong>%s</strong>. Para que Dolibarr procese este directorio, debe configurar o seu <strong>conf/conf.php</strong> para engadir as dúas liñas directivas: <br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 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)
+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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=¿Quere executar agora a recepcións deste receptor
 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)
-RecordEvent=Gravar evento de correo electrónico
-CreateLeadAndThirdParty=Crear cliente potencial (e terceiros se é preciso)
-CreateTicketAndThirdParty=Crear ticket (e ligar a terceiros se foi cargado nunha operación anterior)
+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)
 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)
 LoadThirdPartyFromNameOrCreate=Cargar a busca de terceiros en %s (crea se non se atopa)
+AttachJoinedDocumentsToObject=Garda os ficheiros axuntos en documentos de obxecto se se atopa unha referencia dun obxecto no asunto do correo electrónico.
 WithDolTrackingID=Mensaxe dunha conversa iniciada por un primeiro correo electrónico enviado desde Dolibarr
 WithoutDolTrackingID=Mensaxe dunha conversa iniciada por un primeiro correo electrónico NON enviado desde Dolibarr
 WithDolTrackingIDInMsgId=Mensaxe enviado desde Dolibarr
@@ -2078,7 +2082,7 @@ CreateCandidature=Crear solicitude de traballo
 FormatZip=Zip
 MainMenuCode=Código de entrada do menú (menú principal)
 ECMAutoTree=Amosar árbore automático GED
-OperationParamDesc=Defina os valores a empregar para o obxecto da acción, ou como extraer valores. Por exemplo: <br> objproperty1=SET: o valor a definir <br>objproperty2=SET:un valor con substitución de __objproperty1__<br>objproperty3=SETIFEMPTY: valor usado se objproperty3 non está xa definido <br> objproperty4 =EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:BODY:([^&#92;n]*)<br> object.objproperty5 = EXTRACT:BODY:O meu nome da empresa é\\s([^\\s]*) <br><br> Use a; char como separador para extraer ou establecer varias propiedades.
+OperationParamDesc=Define as regras a empregar para extraer ou establecer valores. <br> Exemplo de operacións que precisan extraer un nome do asunto do correo electrónico: <br> name=EXTRACT:SUBJECT:Mensaxe da empresa ([^\n] *) <br> Exemplo para operacións que crean obxectos: <br> objproperty1 = SET, o valor a establecer <br> objproperty2 = SET, un valor incluíndo valor de __objproperty1__ <br> objproperty3 = SETIFEMPTY: valor utilizado se objproperty3 se non foi definido <br> objproperty4 = EXTRACT: HEADER :X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:O nome da miña empresa é\\s( [^\\s]*) <br> <br> Use un ; char como separador para extraer ou establecer varias propiedades.
 OpeningHours=Horario de apertura
 OpeningHoursDesc=Introduza aquí o horario habitual da súa empresa.
 ResourceSetup=Configuración do módulo Recursos
@@ -2124,7 +2128,7 @@ LargerThan=Maior que
 IfTrackingIDFoundEventWillBeLinked=Teña conta que se se atopa no correo electrónico un ID de seguimento dun correo electrónico entrante é unha resposta dun correo electrónico xa recollido e ligado a un obxecto, o evento creado ligarase automaticamente co obxecto relacionado coñecido.
 WithGMailYouCanCreateADedicatedPassword=Cunha conta de GMail, se habilitou a validación de 2 pasos, recoméndase crear un segundo contrasinal adicado para a aplicación no lugar de usar a súa propia contrasinal de conta de https://myaccount.google.com/.
 EmailCollectorTargetDir=Pode ser un comportamento desexado mover o correo electrónico a outra etiqueta/directorio cando se procesou con éxito. Simplemente configure o nome do directorio aquí para usar esta función (NON use caracteres especiais no nome). Teña conta que tamén debe usar unha conta de inicio de sesión de lectura/escritura.
-EmailCollectorLoadThirdPartyHelp=Pode usar esta acción e usar o contido do correo electrónico para atopar e cargar un terceiro existente na base de datos. O terceiro atopado (ou creado) usarase para as seguintes accións que o precisan.<br>Por exemplo, se desexa crear un terceiro cun nome extraído nunha cadea "Nome: nome para atopar" atopado no corpo, use o correo electrónico do remitente como correo electrónico, pode establecer o campo do parámetro como este:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+EmailCollectorLoadThirdPartyHelp=Pode usar esta acción para empregar  o contido do correo electrónico e atopar e cargar un terceiro existente na súa base de datos. O terceiro atopado (ou creado) empregarase para seguir as accións que o precisen. <br> Por exemplo, se quere crear un terceiro cun nome extraído dunha cadea 'Nome: nome a procurar' presente no corpo, use o correo electrónico do remitente como correo electrónico, pode establecer o campo do parámetro así: <br> 'email= HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
 EndPointFor=Punto final de %s:%s
 DeleteEmailCollector=Eliminar o receptor de correo electrónico
 ConfirmDeleteEmailCollector=¿Está certo de que quere eliminar este receptor de correo electrónico?
@@ -2209,3 +2213,10 @@ 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 
 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
diff --git a/htdocs/langs/gl_ES/banks.lang b/htdocs/langs/gl_ES/banks.lang
index 5b3b22b6f3b..f493fb45e61 100644
--- a/htdocs/langs/gl_ES/banks.lang
+++ b/htdocs/langs/gl_ES/banks.lang
@@ -32,7 +32,7 @@ RIB=Conta bancaria
 IBAN=Número IBAN
 BIC=Código BIC/SWIFT
 SwiftValid=BIC/SWIFT válido
-SwiftVNotalid=BIC/SWIFT non válido
+SwiftNotValid=BIC/SWIFT non válido
 IbanValid=IBAN válido
 IbanNotValid=IBAN non válido
 StandingOrders=Domiciliacións
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Enderezo do Banco
 BankAccountCountry=País do Banco
 BankAccountOwner=Nome do titular da conta
 BankAccountOwnerAddress=Enderezo do titular da conta
-RIBControlError=Fallo na integridade dos datos. O número da conta é incompleto ou incorrecto (revisa o país, números e IBAN).
 CreateAccount=Crear conta
 NewBankAccount=Nova conta
 NewFinancialAccount=Nova conta financiera
@@ -172,7 +171,7 @@ ConfirmCloneVariousPayment=Confirmar a clonación de pagamentos varios
 SEPAMandate=Orde SEPA
 YourSEPAMandate=A súa orde SEPA
 FindYourSEPAMandate=Esta é a súa orde SEPA para autorizar a nosa empresa a realizar un petición de débito ao seu banco. Envíea de volta asinada (dixitalice o documento asinado) ou envíe por correo a
-AutoReportLastAccountStatement=Automaticanete cubra a etiqueta 'numero de extracto bancario' co último número de extracto de cando fixo a reconciliación
+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
 BankColorizeMovement=Colorear os movementos
diff --git a/htdocs/langs/gl_ES/bills.lang b/htdocs/langs/gl_ES/bills.lang
index 29af3dc6b1a..1e8201604fb 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
@@ -280,6 +279,7 @@ 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
 Repeatable=Padrón
@@ -449,6 +449,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
@@ -604,3 +606,4 @@ 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
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/bookmarks.lang b/htdocs/langs/gl_ES/bookmarks.lang
index 7253936e4cd..f494ca0210c 100644
--- a/htdocs/langs/gl_ES/bookmarks.lang
+++ b/htdocs/langs/gl_ES/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Comportamento cando un marcador URL é seleccionado
 CreateBookmark=Crear marcador
 SetHereATitleForLink=Indicar un nome para o marcador
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Usar unha externa/absoluta URL (https://URL) ou unha interna/relativa URL de Dolibarr (/DOLIBARR_ROOT/htdocs/...)
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use unha ligazón externa/absoluta (https://externalurl.com) ou unha ligazón interna/relativa (/mypage.php). Tamén pode usar o teléfono como tel:0123456. 
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Escolla se debe abrir a páxina nesta xanela ou nunha nova xanela
 BookmarksManagement=Xestión de marcadores
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/gl_ES/boxes.lang b/htdocs/langs/gl_ES/boxes.lang
index 66a10609a87..4f3e0c6580a 100644
--- a/htdocs/langs/gl_ES/boxes.lang
+++ b/htdocs/langs/gl_ES/boxes.lang
@@ -91,7 +91,7 @@ BoxTitleLatestModifiedSupplierOrders=Pedimentos Provedor: últimos %s modificado
 BoxTitleLastModifiedCustomerBills=Facturas Clientes: últimas %s modificadas
 BoxTitleLastModifiedCustomerOrders=Pedimentos Clientes: últimos %s pedimentos modificados
 BoxTitleLastModifiedPropals=Últimos %s orzamentos modificados
-BoxTitleLatestModifiedJobPositions=Últimos %s postos de traballo modificados 
+BoxTitleLatestModifiedJobPositions=Últimos %s postos de traballo modificados
 BoxTitleLatestModifiedCandidatures=Últimas %s solicitudes de traballo modificadas
 ForCustomersInvoices=Facturas a clientes
 ForCustomersOrders=Pedimentos de clientes
diff --git a/htdocs/langs/gl_ES/companies.lang b/htdocs/langs/gl_ES/companies.lang
index 91f5a5eee8a..cf9b5772970 100644
--- a/htdocs/langs/gl_ES/companies.lang
+++ b/htdocs/langs/gl_ES/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Rexistro Mercantil)
+ProfId2CM=Id. prof. 2 (Número de Contribuínte)
+ProfId3CM=Id. prof. 3 (Acta de creación)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Rexistro Mercantil
+ProfId2ShortCM=Contribuínte Núm.
+ProfId3ShortCM=Acta de creación
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Id Prof 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Verificar
 VATIntraCheckDesc=El enlace <b>%s</b> permite consultar no servizo europeo de control de números de IVE intracomunitario (VIES). Requírese acceso a internet dende o servidor Dolibarr para o servizo.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Verificar o CIF/NIF intracomunitario na web da Comisión Europea
-VATIntraManualCheck=Pode tamén verificar manualmente na web da Comisión Europea <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=Tamén pode comprobar manualmente no sitio web da Comisión Europea<a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Comprobación imposible. O servizo de comprobación non é fornecido polo Estado membro (%s).
 NorProspectNorCustomer=Nin cliente, nin cliente potencial
 JuridicalStatus=Forma xurídica
diff --git a/htdocs/langs/gl_ES/compta.lang b/htdocs/langs/gl_ES/compta.lang
index e7a51145370..40cdd993ded 100644
--- a/htdocs/langs/gl_ES/compta.lang
+++ b/htdocs/langs/gl_ES/compta.lang
@@ -170,8 +170,9 @@ SeeReportInInputOutputMode=Vexa  <b> %s  análise do dos pagos %s</b> para un c
 SeeReportInDueDebtMode=Vexa o <b>%s de análise de documentos gardados %s</b> para un cálculo baseado en coñecidos <b> documentos rexistrados</b> aínda que  non se contabilicen no Libro Maior
 SeeReportInBookkeepingMode=Vexa o <b>%s análise da táboa de libros de contabilidade %s</b> para un informe baseado na <b> táboa contable de Libro Maior</b>
 RulesAmountWithTaxIncluded=- Os importes amosados son con todos os impostos incluidos.
-RulesResultDue=- Incluidas as facturas pendentes, os gastos, o IVE,  as doacións pagadas ou non. También inclúe os salarios xa pagos.<br>- Baseado na data da validación das facturas e IVE e na data de vencemento ds gastos. Para os salarios definidos co módulo de Salarios, é usada a data de valor do pagamento.
-RulesResultInOut=- Inclúe os pagamentos realizados sobre as facturas, os gastos e o IVE. <br>- Basado nas datas de pagamento das facturas, gastos e IVE. A data de doación para as doacións
+RulesAmountWithTaxExcluded=- Os importes das facturas amosadas son cos impostos excluídos
+RulesResultDue=- Incuidas todas as facturas, gastos, IVE, doazóns, salarios, sexan ou non pagados.<br>Baseado na data da validación das facturas e na data de vencemento dos gastos ou pagos de impostos. Para os salarios utilízase a data de finalización do período 
+RulesResultInOut=- Incluidos os pagamentos reais realizados en facturas, gastos, IVE e salarios.<br>Baseado nas datas de pagamento das facturas, gastos, IVE, doazóns e salarios.
 RulesCADue=- Inclúe as facturas a clientes, estexan xa pagas ou non.<br>- Baseado na data de validación das mesmas.<br>
 RulesCAIn=- Inclúe os pagamentos efectuados das facturas a clientes.<br>- Baseado na data de pagamento das mesmas<br>
 RulesCATotalSaleJournal=Inclúe todas as líñas de crédito do diario de vendas.
@@ -197,7 +198,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
@@ -295,3 +296,5 @@ InvoiceNotLate30Days = A recoller 30 días
 InvoiceToPay=A pagar (<15 días)
 InvoiceToPay15Days=A pagar (15 a 30 días)
 InvoiceToPay30Days=A pagar (>30 días)
+ConfirmPreselectAccount=Preselección da conta contable 
+ConfirmPreselectAccountQuestion=Está certo de querer preseleccionar as %s liñas seleccionadas con esta conta contable?
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
index 85fda0444ce..f018fce58a5 100644
--- a/htdocs/langs/gl_ES/errors.lang
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -27,7 +27,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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Non alcanza a fonte RSS. Tente engadir a constante MAIN
 ErrorForbidden=Acceso denegado.<br> Intenta acceder a unha páxina, área ou función dun módulo desactivado ou sen estar nunha sesión autenticada ou que non está permitida ao seu usuario.
 ErrorForbidden2=O seu administrador Dolibarr pode definir o permiso para este inicio de sesión no menú %s->%s.
 ErrorForbidden3=Parece que Dolibarr non se usa a través dunha sesión autenticada. Bote unha ollada á documentación de configuración de Dolibarr para saber como xestionar as autenticacións (htaccess, mod_auth ou outro ...).
+ErrorForbidden4=Nota: borre as cookies do seu navegador para destruír as sesións existentes neste inicio de sesión. 
 ErrorNoImagickReadimage=A clase Imagick non se atopa neste PHP. Non pode estar dispoñible ningunha vista previa. Os administradores poden desactivar esta pestana no menú Configuración-Amosar
 ErrorRecordAlreadyExists=Rexistro xa existente
 ErrorLabelAlreadyExists=Etiqueta xa existente
@@ -271,6 +274,9 @@ 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
 
 # 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.
@@ -312,6 +318,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..79e60fe00d8 100644
--- a/htdocs/langs/gl_ES/eventorganization.lang
+++ b/htdocs/langs/gl_ES/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categoría para engadir a terceiros cr
 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
@@ -71,6 +71,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 +84,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
diff --git a/htdocs/langs/gl_ES/holiday.lang b/htdocs/langs/gl_ES/holiday.lang
index 37eb0438003..1478f1e5e91 100644
--- a/htdocs/langs/gl_ES/holiday.lang
+++ b/htdocs/langs/gl_ES/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Descrición
 SendRequestCP=Crear o pedimento de días libres
 DelayToRequestCP=Os pedimentos de días libres deben realizarse alo menos <b>%s días</b> antes.
 MenuConfCP=Balance de días libres
-SoldeCPUser=O seu saldo é de <b>%s días</b>.
+SoldeCPUser=Deixa o saldo (en días) <b>%s</b>
 ErrorEndDateCP=Debe indicar unha data de fin maior á data de inicio.
 ErrorSQLCreateCP=Aconteceu un erro de SQL durante a creación :
 ErrorIDFicheCP=Aconteceu un erro, esta solicitude non existe.
@@ -134,3 +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/install.lang b/htdocs/langs/gl_ES/install.lang
index 41ea0cd47fc..7289c2018af 100644
--- a/htdocs/langs/gl_ES/install.lang
+++ b/htdocs/langs/gl_ES/install.lang
@@ -21,6 +21,7 @@ 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.
diff --git a/htdocs/langs/gl_ES/knowledgemanagement.lang b/htdocs/langs/gl_ES/knowledgemanagement.lang
index 29a5ef254b4..32e2d1c05dd 100644
--- a/htdocs/langs/gl_ES/knowledgemanagement.lang
+++ b/htdocs/langs/gl_ES/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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)
 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/main.lang b/htdocs/langs/gl_ES/main.lang
index 605241d3ef6..cef85a6d8b6 100644
--- a/htdocs/langs/gl_ES/main.lang
+++ b/htdocs/langs/gl_ES/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, ningún tipo de IVE definido para o
 ErrorNoSocialContributionForSellerCountry=Erro, ningún tipo de taxa social/fiscal definida para o país '%s'.
 ErrorFailedToSaveFile=Erro, o rexistro do ficheiro fallou.
 ErrorCannotAddThisParentWarehouse=Tenta angadir un almacén pai que xa é fillo dun almacén existente
+FieldCannotBeNegative=O campo "%s" non pode ser negativo
 MaxNbOfRecordPerPage=Número máximo de rexistros por páxina
 NotAuthorized=Non estás autorizado para facer isto.
 SetDate=Fixar data
@@ -87,7 +88,7 @@ FileWasNotUploaded=Un ficheiro foi seleccionado para axuntar, pero ainda non foi
 NbOfEntries=Nº de entradas
 GoToWikiHelpPage=Ler a axuda en liña (é preciso acceso a Internet )
 GoToHelpPage=Ler a axuda
-DedicatedPageAvailable=Esta é unha páxina de axuda adicada relacionada coa pantalla actual
+DedicatedPageAvailable=Páxina de axuda específica relacionada coa súa pantalla actual
 HomePage=Páxina Inicio
 RecordSaved=Rexistro gardado
 RecordDeleted=Rexistro eliminado
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Código de retorno de acceso á base de datos con er
 InformationLastAccessInError=Información do último erro de petición de acceso de base de datos
 DolibarrHasDetectedError=Dolibarr detectou un erro técnico
 YouCanSetOptionDolibarrMainProdToZero=Pode ler o ficheiro log ou establecer a opción $dolibarr_main_prod a '0' no seu ficheiro de configuración para obter mais información.
-InformationToHelpDiagnose=Esta información pode ser útil para propstas de diagnóstico (pode configurar a opción $dolibarr_main_prod to '1' para eliminar as notificacións)
+InformationToHelpDiagnose=Esta información pode ser útil para fins  diagnósticos (pode establecer a opción $dolibarr_main_prod en '1' para ocultar información confidencial) 
 MoreInformation=Mais información
 TechnicalInformation=Información técnica
 TechnicalID=ID Técnica
@@ -211,6 +212,8 @@ User=Usuario
 Users=Usuarios
 Group=Grupo
 Groups=Grupos
+UserGroup=Grupo de usuarios
+UserGroups=Grupos de usuarios
 NoUserGroupDefined=Non hai definido grupo de usuarios
 Password=Contrasinal
 PasswordRetype=Repetir o teu contrasinal
@@ -906,7 +909,7 @@ ViewFlatList=Ver listaxe plana
 ViewAccountList=Ver Libro Maior
 ViewSubAccountList=Ver subconta Libro Maior
 RemoveString=Eliminar cadea '%s'
-SomeTranslationAreUncomplete=Algúns dos idiomas ofrecidos poden estar parcialmente traducidos ou poden conter erros. Axuda a corrixir teu idioma rexistrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Algúns dos idiomas ofrecidos poden estar parcialmente traducidos ou poden conter erros. Axude a corrixir o seu idioma rexistrándose en <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external">https://transifex.com/projects/p/dolibarr/ </a> para engadir as súas melloras.
 DirectDownloadLink=Ligazón pública de descarga
 PublicDownloadLinkDesc=Só é precisa a ligazón para descargar o ficheiro
 DirectDownloadInternalLink=Ligazón privada de descarga
@@ -1158,4 +1161,6 @@ Properties=Propiedades
 hasBeenValidated=%s foi validado
 ClientTZ=Zona Horaria Cliente (usuario)
 NotClosedYet=Aínda non pechado
-ClearSignature=Restablecemento da sinatura
+ClearSignature=Restablecer sinatura
+CanceledHidden=Cancelado oculto 
+CanceledShown=Cancelado amosar
diff --git a/htdocs/langs/gl_ES/modulebuilder.lang b/htdocs/langs/gl_ES/modulebuilder.lang
index 59d16f527db..e7aa6c9f01f 100644
--- a/htdocs/langs/gl_ES/modulebuilder.lang
+++ b/htdocs/langs/gl_ES/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Esta ferramenta só debe ser usada por usuarios ou desenvolvedores experimentados. Ofrece utilidades para construír ou editar o seu propio módulo. Aquí está a documentación para o <a href="%s" target="_blank"> desenvolvemento manual alternativo </a>.
+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.
 ModuleBuilderDesc2=Ruta onde se xeran/editan os módulos (primeiro directorio para módulos externos definidos en %s): <strong>%s </strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Os menús proporcionados polo seu módulo/aplicación están
 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).
-TriggerDefDesc=Defina no ficheiro trigger o código que quere executar cando un evento empresarial externo ao seu módulo é executado (eventos rexistrados por outros módulos)
+TriggerDefDesc=Defina no ficheiro de activación o código que quere executar cando se executa un evento empresarial externo ao seu módulo (eventos desencadeados por outros módulos). 
 SeeIDsInUse=Ver identificacións en uso na súa instalación
 SeeReservedIDsRangeHere=Ver o rango de identificacións reservadas
 ToolkitForDevelopers=Kit de ferramentas para desenvolvedores Dolibarr
diff --git a/htdocs/langs/gl_ES/mrp.lang b/htdocs/langs/gl_ES/mrp.lang
index 8d3ceafe64d..2c839edced3 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
diff --git a/htdocs/langs/gl_ES/other.lang b/htdocs/langs/gl_ES/other.lang
index d710dd12c68..5d73052ba48 100644
--- a/htdocs/langs/gl_ES/other.lang
+++ b/htdocs/langs/gl_ES/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Cifrado de contrasinal
 PermissionsAdd=Permisos engadidos
 PermissionsDelete=Permisos eliminados
 YourPasswordMustHaveAtLeastXChars=O seu contrasinal debe ter alo menos <strong>%s</strong>  caracteres
+PasswordNeedAtLeastXUpperCaseChars=O contrasinal precisa polo menos <strong> %s </strong> caracteres en maiúscula
+PasswordNeedAtLeastXDigitChars=O contrasinal precisa polo menos <strong> %s </strong> caracteres numéricos
+PasswordNeedAtLeastXSpecialChars=O contrasinal precisa polo menos <strong> %s </strong> caracteres especiais
+PasswordNeedNoXConsecutiveChars=O contrasinal non debe ter <strong> %s </strong> caracteres consecutivos similares
 YourPasswordHasBeenReset=O seu contrasinal foi restablecido con éxito
 ApplicantIpAddress=Enderezo IP do solicitante
 SMSSentTo=SMS enviado a %s
@@ -268,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
diff --git a/htdocs/langs/gl_ES/partnership.lang b/htdocs/langs/gl_ES/partnership.lang
index 74a9aed5c8b..4708c316ff8 100644
--- a/htdocs/langs/gl_ES/partnership.lang
+++ b/htdocs/langs/gl_ES/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Xestión de Asociacións
 PartnershipDescription=Módulo de xestión de Asociacións
 PartnershipDescriptionLong= Módulo de xestión de Asociacións
-
+Partnership=Asociación
 AddPartnership=Engade asociado
 CancelPartnershipForExpiredMembers=Asociación: cancela a asociación de membros con subscricións caducadas 
 PartnershipCheckBacklink=Asociación: comprobe a ligazón de retroceso referente 
diff --git a/htdocs/langs/gl_ES/productbatch.lang b/htdocs/langs/gl_ES/productbatch.lang
index e84911fc2e5..bedfed40b5c 100644
--- a/htdocs/langs/gl_ES/productbatch.lang
+++ b/htdocs/langs/gl_ES/productbatch.lang
@@ -30,7 +30,7 @@ ManageLotMask=Máscara personalizada
 CustomMasks=Opción para definir unha máscara de numeración diferente para cada produto 
 BatchLotNumberingModules=Regra de numeración para a xeración automática do número de lote 
 BatchSerialNumberingModules=Regra de numeración para a xeración automática do número de serie (para produtos con propiedade 1 lote/serie único para cada produto) 
-QtyToAddAfterBarcodeScan=Cant. a engadir por cada código de barras/lote/serie escaneado
+QtyToAddAfterBarcodeScan=Cant. a %s por cada código de barras/lote/serie escaneado
 LifeTime=Duración da vida útil (en días) 
 EndOfLife=Fin da vida útil
 ManufacturingDate=Data de fabricación
@@ -42,3 +42,4 @@ HideLots=Agochar lotes
 #Traceability - qc status
 OutOfOrder=Fora de servizo
 InWorkingOrder=En funcionamento
+ToReplace=Substituir
diff --git a/htdocs/langs/gl_ES/products.lang b/htdocs/langs/gl_ES/products.lang
index 85e664cfb90..a47ce9f04a7 100644
--- a/htdocs/langs/gl_ES/products.lang
+++ b/htdocs/langs/gl_ES/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Cantidade a usar para actualizar o Prezo Medio Ponderado
 PMPValue=Prezo medio ponderado
 PMPValueShort=PMP
 mandatoryperiod=Períodos obrigatorios 
-mandatoryPeriodNeedTobeSet=Períodos de atención non ingresados e obrigatorios 
+mandatoryPeriodNeedTobeSet=Nota: o período (data de inicio e finalización) debe estar definido 
 mandatoryPeriodNeedTobeSetMsgValidate=Un servizo require un período de inicio e fin 
-mandatoryHelper=Mensaxe ao usuario sobre a necesidade de introducir unha data de inicio e unha data de finalización nun servizo ao crear / validar unha factura, orzamento a cliente, pedimento de cliente. <br> Esta acción non se bloquea no proceso de confirmación 
+mandatoryHelper=Marque isto se quere unha mensaxe ao usuario ao crear/validar unha factura, orzamento a cliente, pedimento de cliente sen introducir a data de inicio e finalización nas liñas deste servizo.<br> Teña en conta que a mensaxe é un aviso e non un erro de bloqueo.
 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
+SwitchOnSaleStatus=Activa o estado de venda 
+SwitchOnPurchaseStatus=Activa o estado de compra
+StockMouvementExtraFields= Campos extra (movemento de stock)
diff --git a/htdocs/langs/gl_ES/projects.lang b/htdocs/langs/gl_ES/projects.lang
index dcdba12ef7d..367ab742156 100644
--- a/htdocs/langs/gl_ES/projects.lang
+++ b/htdocs/langs/gl_ES/projects.lang
@@ -197,6 +197,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,3 +285,5 @@ 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
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/stocks.lang b/htdocs/langs/gl_ES/stocks.lang
index 14210235f09..191fd19bedf 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
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Límite stock para alertas e stock óptimo desexado
 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
 InventoryDate=Data inventario
+Inventories=Inventarios
 NewInventory=Novo inventario
 inventorySetup = Configuración inventario
 inventoryCreatePermission=Crear novo inventario
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Os movementos de stock terán a dat
 inventoryChangePMPPermission=Permitir cambiar o PMP dun produto
 ColumnNewPMP=Nova unidade PMP
 OnlyProdsInStock=Non engadir produto sen stock
-TheoricalQty=Cant. teórica
-TheoricalValue=Cant. teórica
+TheoricalQty=Cant. teórica 
+TheoricalValue=Cant. teórica 
 LastPA=Último BP
 CurrentPA=BP actual
 RecordedQty=Cant. gardada
@@ -240,7 +241,7 @@ StockAtDatePastDesc=Aquí pode ver o stock (stock real) nunha data determinada n
 StockAtDateFutureDesc=Pode ver aquí o stock (stock virtual) nunha data determinada no futuro
 CurrentStock=Stock actual
 InventoryRealQtyHelp=Estableza o valor en 0 para restablecer cantidade<br> Manteña o campo baleiro ou elimine a liña para mantelo sen cambios
-UpdateByScaning=Enche a cantidade real escaneando
+UpdateByScaning=Completa a cantidade real escaneando
 UpdateByScaningProductBarcode=Actualiza por escaneo (código de barras do produto)
 UpdateByScaningLot=Actualiza por escano (código de barras lote/serie)
 DisableStockChangeOfSubProduct=Desactive o cambio de stock de todos os subprodutos deste produto composto durante este movemento.
@@ -253,14 +254,20 @@ 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=Encher a cantidade real coa cantidade agardada
+AutofillWithExpected=Substitúe a cantidade real pola 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
-FieldCannotBeNegative=O campo "%s" non pode ser negativo
 ErrorWrongBarcodemode=Modo de código de barras descoñecido
 ProductDoesNotExist=Produto non existente
-ErrorSameBatchNumber=Mesmo número de lote atopado na listaxe de inventario
+ErrorSameBatchNumber=Atopáronse varios rexistros para o número de lote na folla de inventario. Non hai xeito de saber cal aumentar.
 ProductBatchDoesNotExist=Produto con lote/serie inexistente
 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. 
+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
diff --git a/htdocs/langs/gl_ES/stripe.lang b/htdocs/langs/gl_ES/stripe.lang
index 9cd983083e0..93c5177ca4a 100644
--- a/htdocs/langs/gl_ES/stripe.lang
+++ b/htdocs/langs/gl_ES/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Configuración do módulo Stripe
-StripeDesc=Este módulo ofrecelle páxinas para permitir o pagamento a clientes mediante <a href="http://www.stripe.com" target="_blank">Stripe</a>. Podese usar para un pagamento libre ou para un pagamento dun obxecto en concreto de Dolibarr (factura, pedimento...)
+StripeDesc=Ofréza aos seus clientes unha páxina de pagamentos en liña para pagamentoss con tarxetas de crédito/débito a través de <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external">``Stripe</a>. Isto pódese usar para permitir que os seus clientes realicen pagamentos ad hoc ou para pagamentos relacionados cun obxecto Dolibarr en particular (factura, pedimento, ...) 
 StripeOrCBDoPayment=Pagar con tarxeta de crédito ou Stripe
 FollowingUrlAreAvailableToMakePayments=As seguintes URL están dispoñibles para ofrecer unha páxina a un cliente no que facer un pagamento de obxectos Dolibarr
 PaymentForm=Forma de pagamento
diff --git a/htdocs/langs/gl_ES/withdrawals.lang b/htdocs/langs/gl_ES/withdrawals.lang
index e9b748a1fc7..106dbe1da91 100644
--- a/htdocs/langs/gl_ES/withdrawals.lang
+++ b/htdocs/langs/gl_ES/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Orde de transferencia
 LatestBankTransferReceipts=Últimas %s ordes de transferencia
 LastWithdrawalReceipts=Últimos %s ficheiros de ordes de domiciliación
 WithdrawalsLine=Liña de orde de domiciliacións
+CreditTransfer=Transferencia bancaria
 CreditTransferLine=Liña de orde de transferencia
 WithdrawalsLines=Liñas de ordes de domiciliación
 CreditTransferLines=Liñas de ordes de transferencia
@@ -47,6 +48,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
 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
@@ -80,7 +82,7 @@ StatusMotif7=Decisión xudicial
 StatusMotif8=Outro motivo
 CreateForSepaFRST=Crear ficheiro de domiciliación (SEPA FRST)
 CreateForSepaRCUR=Crear ficheiro de  domiciliación (SEPA RCUR)
-CreateAll=Crear ficheiro de domiciliación (todas)
+CreateAll=Crear ficheiro de domiciliación bancaria
 CreateFileForPaymentByBankTransfer=Crear un ficheiro para a transferencia
 CreateSepaFileForPaymentByBankTransfer=Crear ficheiro de transferencia (SEPA)
 CreateGuichet=Só oficina
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Non é posible crear unha domiciliación sen impor
 SepaMandate=Mandato SEPA de domiciliación
 SepaMandateShort=Mandato SEPA
 PleaseReturnMandate=Envíe de volta este formulario de mandato por correo electrónico a %s ou por correo a
-SEPALegalText=Ao asinar este mandato, autoriza (A) %s a enviar instruccións ao seu banco para cargar na súa conta e (B) ao seu banco para cargar na súa conta en acordo coas instruccións de %s. Como parte dos seus dereitos, ten dereito a unha devolución nos termos e condicións do seu contrato co seu banco. Unha devolución debe reclamarse dentro das 8 semanas a partir da data na que foi realizado o cargo a súa conta. Os seus dereitos con respeito ao mandato anterior explícanse nun comunicado que pode obter do seu banco.
+SEPALegalText=Ao asinar este formulario de mandato, autorizas (A) a %s a enviar instrucións ao teu banco para realizar un cargo na túa conta e (B) ao teu banco a realizar un cargo na túa conta de acordo coas instrucións de %s. Como parte dos teus dereitos, tes dereito a un reembolso do teu banco segundo os termos e condicións do teu acordo co teu banco. Os seus dereitos con respecto ao mandato anterior explícanse nun comunicado que pode obter do seu banco.
 CreditorIdentifier=Identificador Acredor
 CreditorName=Nome acredor
 SEPAFillForm=(B) Cubra todos os campos marcados con *
@@ -150,3 +152,5 @@ ModeWarning=Non estableceuse a opción de modo real, deteremonos despois desta s
 ErrorCompanyHasDuplicateDefaultBAN=A empresa co identificador %s ten máis dunha conta bancaria predeterminada. Non hai xeito de saber cal usar.
 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 
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index c20e0a339f6..8bc4b54a090 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index cce968169a3..9a3360b7938 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=גרסה
 Publisher=Publisher
@@ -265,8 +267,8 @@ OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=עבור המשתמש או תיעוד של מפתח (דוק, שאלות ...) <br> תסתכל על ויקי Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
-ForAnswersSeeForum=אם יש לך שאלות נוספות / עזרה, אתה יכול להשתמש בפורום Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
+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=התפריט הנוכחי מטפל
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=מחק sendings
 Permission111=לקרוא דוחות כספיים
 Permission112=צור / לשנות / למחוק ולהשוות עסקאות
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=ייצוא עסקאות דפי מצב חשבון
 Permission116=העברות בין חשבונות
@@ -762,6 +765,7 @@ 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=Delete all projects and tasks (also private projects i am not contact for)
@@ -889,12 +893,11 @@ Permission701=לקרוא תרומות
 Permission702=צור / לשנות תרומות
 Permission703=מחק תרומות
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=לקרוא מניות
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=שליחת מודל קבלת
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=רוכסן
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index 6c770163f29..f066877f676 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/he_IL/bookmarks.lang
index b138e41ebdc..5191a357206 100644
--- a/htdocs/langs/he_IL/bookmarks.lang
+++ b/htdocs/langs/he_IL/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index a8b167570e0..f39e5b1f0a1 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index 6b9d5bc89b1..39e7813af18 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/he_IL/holiday.lang
index cdfc715fab0..c5aa045afc3 100644
--- a/htdocs/langs/he_IL/holiday.lang
+++ b/htdocs/langs/he_IL/holiday.lang
@@ -27,7 +27,7 @@ DescCP=תאור
 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/he_IL/install.lang
index 804488856d4..61fa0159978 100644
--- a/htdocs/langs/he_IL/install.lang
+++ b/htdocs/langs/he_IL/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/he_IL/main.lang
index 0c07c43803e..d1013d6c705 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ User=User
 Users=משתמשים
 Group=Group
 Groups=קבוצות
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=סיסמה
 PasswordRetype=Retype your password
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/he_IL/modulebuilder.lang b/htdocs/langs/he_IL/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/he_IL/modulebuilder.lang
+++ b/htdocs/langs/he_IL/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 3227788fdeb..1cd1c4956be 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/he_IL/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/he_IL/partnership.lang
+++ b/htdocs/langs/he_IL/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/he_IL/productbatch.lang b/htdocs/langs/he_IL/productbatch.lang
index 39a3c12b7fe..37a2d46bc1b 100644
--- a/htdocs/langs/he_IL/productbatch.lang
+++ b/htdocs/langs/he_IL/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index 2db63d96903..71b29379a26 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 676865c2fd2..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,3 +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/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index a9c29a5c029..5d40c5c58d2 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/he_IL/stripe.lang b/htdocs/langs/he_IL/stripe.lang
index 844762040af..2c95bcfce27 100644
--- a/htdocs/langs/he_IL/stripe.lang
+++ b/htdocs/langs/he_IL/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/he_IL/withdrawals.lang
+++ b/htdocs/langs/he_IL/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/hi_IN/accountancy.lang b/htdocs/langs/hi_IN/accountancy.lang
index ca5787ae0f0..13a1024d44e 100644
--- a/htdocs/langs/hi_IN/accountancy.lang
+++ b/htdocs/langs/hi_IN/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/hi_IN/admin.lang b/htdocs/langs/hi_IN/admin.lang
index a7354b8d4f8..40642f8f3ed 100644
--- a/htdocs/langs/hi_IN/admin.lang
+++ b/htdocs/langs/hi_IN/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=प्रतिष्ठान
 Version=संस्करण
 Publisher=प्रकाशक
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/hi_IN/banks.lang b/htdocs/langs/hi_IN/banks.lang
index 6c770163f29..f066877f676 100644
--- a/htdocs/langs/hi_IN/banks.lang
+++ b/htdocs/langs/hi_IN/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/hi_IN/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/hi_IN/bookmarks.lang
+++ b/htdocs/langs/hi_IN/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/hi_IN/companies.lang b/htdocs/langs/hi_IN/companies.lang
index ca4dc7af3d7..735604f81d0 100644
--- a/htdocs/langs/hi_IN/companies.lang
+++ b/htdocs/langs/hi_IN/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/hi_IN/compta.lang b/htdocs/langs/hi_IN/compta.lang
index 97b990f62b4..640a229b7f2 100644
--- a/htdocs/langs/hi_IN/compta.lang
+++ b/htdocs/langs/hi_IN/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/hi_IN/errors.lang b/htdocs/langs/hi_IN/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/hi_IN/holiday.lang
index 0527f4c0788..3d0ae64be0f 100644
--- a/htdocs/langs/hi_IN/holiday.lang
+++ b/htdocs/langs/hi_IN/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/hi_IN/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/hi_IN/install.lang
+++ b/htdocs/langs/hi_IN/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/hi_IN/main.lang
index e1b71bf2619..1378a839481 100644
--- a/htdocs/langs/hi_IN/main.lang
+++ b/htdocs/langs/hi_IN/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ 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
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/hi_IN/modulebuilder.lang b/htdocs/langs/hi_IN/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/hi_IN/modulebuilder.lang
+++ b/htdocs/langs/hi_IN/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 9bc68dc3678..49ff93dd589 100644
--- a/htdocs/langs/hi_IN/other.lang
+++ b/htdocs/langs/hi_IN/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/hi_IN/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/hi_IN/partnership.lang
+++ b/htdocs/langs/hi_IN/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/hi_IN/productbatch.lang b/htdocs/langs/hi_IN/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/hi_IN/productbatch.lang
+++ b/htdocs/langs/hi_IN/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/hi_IN/products.lang b/htdocs/langs/hi_IN/products.lang
index 205a28980a8..14715670882 100644
--- a/htdocs/langs/hi_IN/products.lang
+++ b/htdocs/langs/hi_IN/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/hi_IN/projects.lang b/htdocs/langs/hi_IN/projects.lang
index 5a2911bac0b..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,3 +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/hi_IN/stocks.lang b/htdocs/langs/hi_IN/stocks.lang
index a2a335be8f6..599c9649b18 100644
--- a/htdocs/langs/hi_IN/stocks.lang
+++ b/htdocs/langs/hi_IN/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/hi_IN/stripe.lang b/htdocs/langs/hi_IN/stripe.lang
index 844762040af..2c95bcfce27 100644
--- a/htdocs/langs/hi_IN/stripe.lang
+++ b/htdocs/langs/hi_IN/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/hi_IN/withdrawals.lang b/htdocs/langs/hi_IN/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/hi_IN/withdrawals.lang
+++ b/htdocs/langs/hi_IN/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 1a0faf2e82f..1664b5c893a 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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=Raspon obračunskog računa
 Calculated=Izračunato
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index e5559619019..ccc1bd1cd83 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Zaklada
 Version=Inačica
 Publisher=Izdavač
@@ -265,8 +267,8 @@ OtherResources=Drugi izvori
 ExternalResources=External Resources
 SocialNetworks=Social Networks
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=Za korisničku ili razvojnu dokumentciju ( DOC, FAQ...)<br> pogledajte na Dolibarr Wiki-u:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Za sva ostala pitanja/pomoć, obratite se na Dolibarr forumu:<br><b><a href="%s" target="_blank">%s</a></b>
+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=Trenutačni nositelj izbornika
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Zadnja stabilna verzija
 LastActivationDate=Latest activation date
 LastActivationAuthor=Latest activation author
 LastActivationIP=Latest activation IP
+LastActivationVersion=Latest activation version
 UpdateServerOffline=Nadogradi 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>
@@ -753,7 +756,7 @@ Permission106=Izvezi slanja
 Permission109=Obriši slanja
 Permission111=Čitanje financijskih računa
 Permission112=Izradi/izmjeni/obriši i usporedi transakcije
-Permission113=Podešavanje financijskih računa (kreiranje, upravljanje kategorijama)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Izvoz transakcija i izvodi
 Permission116=Prijenos između računa
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ 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=Izradi/izmjeni izvještaje troškova
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Obriši izvještaje troškova
-Permission774=Čitaj sve izvještaje troškova (čak i svoje i podređenih)
 Permission775=Odobri izvještaje trška
 Permission776=Isplati izvještaje troškova
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Izvezi izvještaje troškova
 Permission1001=Čitaj zalihe
@@ -958,15 +961,11 @@ Permission2801=Koristi FTP klijent u načinu čitanja (samo pregled i download)
 Permission2802=Koristi FTP klijent u načinu pisanja (brisanje ili upload)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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=Obriši zahtjeve odsutnosti
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin zahtjevi odsutnosti ( podešavanje i saldo ) 
+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=Pročitaj planirani posao
 Permission23002=Izradi/izmjeni Planirani posao
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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=Izdanje polja %s
@@ -1708,8 +1707,9 @@ MailingDelay=Čekanje u sekundama kod slanja sljedeće poruke
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Primatelj
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Model primke slanja
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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=Boja poveznica
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=PBR
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index dbe3c2ece41..9e95b4946be 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -32,7 +32,7 @@ RIB=Broj bankovnog računa
 IBAN=IBAN broj
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Država računa
 BankAccountOwner=Naziv vlasnika računa
 BankAccountOwnerAddress=Adresa vlasinka računa
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Izradi račun
 NewBankAccount=Novi račun
 NewFinancialAccount=Novi financijski račun
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index 94a626c96d1..a6667101c7f 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Izvještaji plaćanja
 PaymentsAlreadyDone=Izvršena plaćanja
 PaymentsBackAlreadyDone=Izvršeni povrati
 PaymentRule=Način plaćanja
-PaymentMode=Način plaćanja
-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=Način plaćanja (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Način plaćanja
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Rok plaćanja
 PaymentConditionsShort=Rok plaćanja
@@ -280,6 +279,7 @@ SetMode=Izaberi način plaćanja
 SetRevenuStamp=Postavi prihodovnu markicu
 Billed=Zaračunato
 RecurringInvoices=Pretplatnički računi
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Predložak računa
 RepeatableInvoices=Predlošci računa
 Repeatable=Predložak
@@ -449,6 +449,8 @@ PaymentTypeTRA=Skica banke
 PaymentTypeShortTRA=Skica
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
+PaymentTypeDC=Debitna/kreditna kartica
+PaymentTypePP=PayPal
 BankDetails=Bankovni podaci
 BankCode=Oznaka 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/hr_HR/blockedlog.lang b/htdocs/langs/hr_HR/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/hr_HR/blockedlog.lang
+++ b/htdocs/langs/hr_HR/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/hr_HR/bookmarks.lang b/htdocs/langs/hr_HR/bookmarks.lang
index 2ce1fe63a72..1c08f3e3168 100644
--- a/htdocs/langs/hr_HR/bookmarks.lang
+++ b/htdocs/langs/hr_HR/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Behaviour when a bookmark URL is selected
 CreateBookmark=Izradi zabilješku
 SetHereATitleForLink=Set a name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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=Upravljanje zabilješkama
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index 3d400e0921c..a737b20d2a8 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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.
 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">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <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
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index aa27ba865b5..d743d63e6f0 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -170,8 +170,9 @@ 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
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- Uključuje stvarne uplate po računima, troškove, PDV i plaće. <br>- Baziran je po datumu plaćanja računa, troškova, PDV-a i plaćama. Datum donacje za donacije.
+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.
@@ -295,3 +296,5 @@ 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/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 2cb4bea5bbc..ec2a653f646 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
+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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/hr_HR/eventorganization.lang b/htdocs/langs/hr_HR/eventorganization.lang
index ffd2b23e575..b9676420b74 100644
--- a/htdocs/langs/hr_HR/eventorganization.lang
+++ b/htdocs/langs/hr_HR/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/hr_HR/holiday.lang b/htdocs/langs/hr_HR/holiday.lang
index bebfd3ec2ff..3bd975ab1fe 100644
--- a/htdocs/langs/hr_HR/holiday.lang
+++ b/htdocs/langs/hr_HR/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Opis
 SendRequestCP=Izradi zahtjev odsustva
 DelayToRequestCP=Zahtjev odsustva mora biti kreiran najmanje <b>%s dan(a)</b> prije.
 MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Datum završetka mora biti veći od datuma početka.
 ErrorSQLCreateCP=Dogodila se SQL greška kod kreiranja:
 ErrorIDFicheCP=Dogosila se greška, zahtjev ne postoji.
@@ -134,3 +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/hr_HR/install.lang b/htdocs/langs/hr_HR/install.lang
index 6378b154691..6a437ac1b7b 100644
--- a/htdocs/langs/hr_HR/install.lang
+++ b/htdocs/langs/hr_HR/install.lang
@@ -21,6 +21,7 @@ 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.
diff --git a/htdocs/langs/hr_HR/knowledgemanagement.lang b/htdocs/langs/hr_HR/knowledgemanagement.lang
index 4abe0b7586a..b4540191757 100644
--- a/htdocs/langs/hr_HR/knowledgemanagement.lang
+++ b/htdocs/langs/hr_HR/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/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index ca115dc94e9..27431f7470f 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Greška, za zemlju '%s' nisu upisane stope
 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
 NotAuthorized=Niste ovlašteni da ovo učinite.
 SetDate=Upiši datum
@@ -87,7 +88,7 @@ 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=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Podatak spremljen
 RecordDeleted=Podatak obrisan
@@ -114,7 +115,7 @@ 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=Ovaj podatak može biti koristan za traženje kvara (možete namjestiti opciju $dolibarr_main_prod na '1' kako bi isključili takva upozorenja)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Više podataka
 TechnicalInformation=Tehnički podac
 TechnicalID=Tehnička iskaznica
@@ -211,6 +212,8 @@ User=Korisnik
 Users=Korisnici
 Group=Grupa
 Groups=Grupe
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Grupa korisnika nije izrađena
 Password=Zaporka
 PasswordRetype=Ponovi zaporku
@@ -906,7 +909,7 @@ ViewFlatList=Pregledaj popis bez grananja
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Ukloni redak '%s'
-SomeTranslationAreUncomplete=Neki od ponuđenih jezika možda su djelomično prevedeni ili sadrže greške. Molim vas pomozite ispraviti vaš jezik prijavom na <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>. Ne budite pizde!
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Vremenska zona klijenta (korisnik)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/hr_HR/modulebuilder.lang b/htdocs/langs/hr_HR/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/hr_HR/modulebuilder.lang
+++ b/htdocs/langs/hr_HR/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
diff --git a/htdocs/langs/hr_HR/mrp.lang b/htdocs/langs/hr_HR/mrp.lang
index 60420bc6db0..3fcf32a1fe3 100644
--- a/htdocs/langs/hr_HR/mrp.lang
+++ b/htdocs/langs/hr_HR/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/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index 085b25468dc..c56010884a2 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/hr_HR/partnership.lang b/htdocs/langs/hr_HR/partnership.lang
index 4e3455b7058..fb73da65324 100644
--- a/htdocs/langs/hr_HR/partnership.lang
+++ b/htdocs/langs/hr_HR/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/hr_HR/productbatch.lang b/htdocs/langs/hr_HR/productbatch.lang
index e2c9c14571f..abd5ae7a8f6 100644
--- a/htdocs/langs/hr_HR/productbatch.lang
+++ b/htdocs/langs/hr_HR/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 935287e17a5..13ebc7c3659 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Procjenjena prosječna cijena
 PMPValueShort=PPC
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 5596ce0a219..3c0f2c1b0b2 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -197,6 +197,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,3 +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=Datum kraja ne može biti prije datuma početka
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/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index f9cb7870a52..0540fd4ba8f 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
 MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Fill real quantity with expected quantity
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=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
diff --git a/htdocs/langs/hr_HR/stripe.lang b/htdocs/langs/hr_HR/stripe.lang
index 1aeada94d38..fb2cfbe3ba1 100644
--- a/htdocs/langs/hr_HR/stripe.lang
+++ b/htdocs/langs/hr_HR/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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=Obrazac plaćanja
@@ -28,7 +28,6 @@ AccountParameter=Parametri računa
 UsageParameter=Parametri korištenja
 InformationToFindParameters=Pomoć za pronalaženje podataka o računu %s
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Naziv pružatelja
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
index a8fb86970a7..0974eedc4aa 100644
--- a/htdocs/langs/hr_HR/withdrawals.lang
+++ b/htdocs/langs/hr_HR/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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=Označi kao kreditirano
+ClassDebited=Classify debited
 ClassCreditedConfirm=Jeste li sigurni da želite svrstati račun za isplatu kao knjiženje na svoj bankovni račun ?
 TransData=Datum prijenosa
 TransMetod=Način prijenosa
@@ -80,7 +82,7 @@ StatusMotif7=Sudska odluka
 StatusMotif8=Ostali razlog
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Samo ured
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ ModeWarning=Opcija za stvarni način nije postavljena, zaustavljamo nakon ove si
 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
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index 87767ce7832..84361955827 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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.
 ## Dictionary
 Range=Range of accounting account
 Calculated=Számított
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 581d7bae073..c818208a7b4 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Alapítvány
 Version=Verzió
 Publisher=Szerző
@@ -265,8 +267,8 @@ OtherResources=Egyéb források
 ExternalResources=Külső források
 SocialNetworks=Közösségi hálózatok
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=A felhasználó vagy fejlesztői dokumentáció (doc, GYIK ...), <br> vessünk egy pillantást a Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
-ForAnswersSeeForum=Ha bármilyen további kérdése / help, akkor használja a fórumot Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
+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=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ő
@@ -341,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=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 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>
@@ -353,6 +355,7 @@ 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
 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>
@@ -753,7 +756,7 @@ 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=Pénzügyi számlák beállítása (kategóriák létrehozása, kezelése)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Tranzakciók összehangolása
 Permission115=Export ügyletek és számlakivonatok
 Permission116=Számlák közötti átcsoportosítás
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ 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=Költségjelentések létrehozása / módosítása
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Költségjelentések törlése
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Olvassa készletek
@@ -958,15 +961,11 @@ Permission2801=FTP kliens olvasás módban való használata (csak böngészés
 Permission2802=FTP kliens írási módban való használata (fájlok törlése vagy feltöltése)
 Permission3200=Archivált események és ujjlenyomatok megtekintése
 Permission3301=Generate new modules
-Permission4001=Alkalmazottak megtekintése
-Permission4002=Alkalmazottak létrehozása
-Permission4003=Alkalmazottak törlése
-Permission4004=Alkalmazottak exportálása
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=A(z) %s webböngészőt használja. Ez a böngésző rendben van a b
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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=%s mező szerkesztése
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Címzett
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Küldése modell átvételét
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index a08523af52c..e4a27c8e6fb 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -32,7 +32,7 @@ RIB=Bankszámla száma
 IBAN=IBAN szám
 BIC=BIC/SWIFT kód
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Számla országa
 BankAccountOwner=Számlatulajdonos neve
 BankAccountOwnerAddress=Számlatulajdonos címe
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Számla létrehozás
 NewBankAccount=Új számla fiók
 NewFinancialAccount=Új pénzügyi számla
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index 5670ae7a559..205ba0efd8c 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Fizetések jelentései
 PaymentsAlreadyDone=Fizetve
 PaymentsBackAlreadyDone=A visszatérítések teljesültek
 PaymentRule=Fizetési szabály
-PaymentMode=Fizetési mód
-DefaultPaymentMode=Alapértelmezett fizetési típus
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 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)
-PaymentModeShort=Fizetési mód
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Fizetési határidő
 PaymentConditions=Fizetési feltételek
 PaymentConditionsShort=Fizetési feltételek
@@ -280,6 +279,7 @@ SetMode=Fizetési típus beállítása
 SetRevenuStamp=Set revenue stamp
 Billed=Kiszámlázott
 RecurringInvoices=Ismétlődő számlák
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Számla minta
 RepeatableInvoices=Számlaminták
 Repeatable=Minta
@@ -449,6 +449,8 @@ PaymentTypeTRA=Banki tervezet
 PaymentTypeShortTRA=Piszkozat
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Banki adatok
 BankCode=Bank kódja
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
+SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for unpaid invoices
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/bookmarks.lang b/htdocs/langs/hu_HU/bookmarks.lang
index f36fc8648e5..02b5cc1dbee 100644
--- a/htdocs/langs/hu_HU/bookmarks.lang
+++ b/htdocs/langs/hu_HU/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL elérési út
 BehaviourOnClick=Viselkedés könyvjelző URL kiválasztásakor
 CreateBookmark=Könyvjelző lértehozása
 SetHereATitleForLink=Adjon meg egy nevet a könyvjelzőnek
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Használjon külső/abszolút linket (https://URL) vagy belső/relatív linket (/DOLIBARR_ROOT/htdocs/...)
+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=Válassza ki, hogy a hivatkozott oldal az aktuális lapon vagy egy új lapon nyíljon meg
 BookmarksManagement=Könyvjelzők kezelése
 BookmarksMenuShortCut=Ctrl + Shift + m
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index 18bf0ff2550..82c665ef2dc 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -157,6 +157,18 @@ 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=Szakma ID 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ 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.
 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=Manuálisan ellenőrizheti az Európai Bizottság webhelyén <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <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
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index 2049c13fbf7..0e434db0cfc 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -170,8 +170,9 @@ 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=- A feltüntetett összegek az összes adót tartalmazzák
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 05b4cf91d5a..e097d2988db 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Ez a kapcsolat már definiálva van,
 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
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=A %s kötelezően megadandó
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 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.
 ErrorCustomerCodeRequired=Ügyfélkód szükséges
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Nem kap RSS feed. Próbálja felvenni, ha állandó MAI
 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
 ErrorLabelAlreadyExists=Ez a címke már létezik
@@ -271,6 +274,9 @@ 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.
@@ -312,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 = E-mail cím nem érvényes
 RequireMaxLength = Length must be less than %s chars
 RequireMinLength = Length must be more than %s char(s)
diff --git a/htdocs/langs/hu_HU/eventorganization.lang b/htdocs/langs/hu_HU/eventorganization.lang
index 6a9562999d8..0a859f511d2 100644
--- a/htdocs/langs/hu_HU/eventorganization.lang
+++ b/htdocs/langs/hu_HU/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/hu_HU/holiday.lang b/htdocs/langs/hu_HU/holiday.lang
index 03f950a5540..a9615c8d743 100644
--- a/htdocs/langs/hu_HU/holiday.lang
+++ b/htdocs/langs/hu_HU/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +134,6 @@ 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
+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/hu_HU/install.lang b/htdocs/langs/hu_HU/install.lang
index 0c9cef51237..2c0a5332cbd 100644
--- a/htdocs/langs/hu_HU/install.lang
+++ b/htdocs/langs/hu_HU/install.lang
@@ -21,6 +21,7 @@ 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.
 ErrorDirDoesNotExists=%s könyvtár nem létezik.
diff --git a/htdocs/langs/hu_HU/knowledgemanagement.lang b/htdocs/langs/hu_HU/knowledgemanagement.lang
index 442e50ceefb..4f8d74a2f96 100644
--- a/htdocs/langs/hu_HU/knowledgemanagement.lang
+++ b/htdocs/langs/hu_HU/knowledgemanagement.lang
@@ -48,3 +48,7 @@ KnowledgeRecordExtraFields = Extrafields for Article
 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
+
+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/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 2f39c7eccd9..152bbff480c 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Hiba '%s' számára nincs Áfa meghatároz
 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.
 NotAuthorized=Nincs jogosultsága ehhez a tevékenységhez
 SetDate=Dátum beállítása
@@ -87,7 +88,7 @@ FileWasNotUploaded=Egy fájl ki lett választva csatolásra, de még nincs felt
 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=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Kezdőlap
 RecordSaved=Rekord elmentve
 RecordDeleted=Rekord törölve
@@ -114,7 +115,7 @@ 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=Diagnosztika információk (a $dolibarr_main_prod változót '1'-re állítva eltávolíthatja ezt a figyelmeztetést)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=További információ
 TechnicalInformation=Technikai információk
 TechnicalID=Technikai azon.
@@ -211,6 +212,8 @@ User=Felhasználó
 Users=Felhasználók
 Group=Csoport
 Groups=Csoportok
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Nincs felhasználói csoport meghatározva
 Password=Jelszó
 PasswordRetype=Adja meg újra a jelszavát
@@ -906,7 +909,7 @@ ViewFlatList=Lapos 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=A felkínált nyelvek némelyike csak részben fordítható le, vagy hibákat tartalmazhat. Kérjük, segítsen nyelvének javításában az <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> címen regisztrálva.
+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=Nyilvános letöltési link
 PublicDownloadLinkDesc=Only the link is required to download the file
 DirectDownloadInternalLink=Privát letöltési link
@@ -1158,4 +1161,6 @@ Properties=Tulajdonságok
 hasBeenValidated=%sérvényesítve lett
 ClientTZ=Kliens időzónája (felhasználó)
 NotClosedYet=Még nincs lezárva
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/hu_HU/modulebuilder.lang b/htdocs/langs/hu_HU/modulebuilder.lang
index abe13d21f16..b1ea33eeb11 100644
--- a/htdocs/langs/hu_HU/modulebuilder.lang
+++ b/htdocs/langs/hu_HU/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
diff --git a/htdocs/langs/hu_HU/mrp.lang b/htdocs/langs/hu_HU/mrp.lang
index ffc5c684aee..018449c4d68 100644
--- a/htdocs/langs/hu_HU/mrp.lang
+++ b/htdocs/langs/hu_HU/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/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index dc8c8e31316..f8e59d4ee71 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,6 +272,7 @@ ProjectCreatedByEmailCollector=A projektet létrehozva az e-mail gyűjtő által
 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
+LoginWith=Login with %s
 
 ##### Export #####
 ExportsArea=Az export területén
diff --git a/htdocs/langs/hu_HU/partnership.lang b/htdocs/langs/hu_HU/partnership.lang
index ec5f68b6d21..c23a1317e03 100644
--- a/htdocs/langs/hu_HU/partnership.lang
+++ b/htdocs/langs/hu_HU/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/hu_HU/productbatch.lang b/htdocs/langs/hu_HU/productbatch.lang
index 3a3ae516b30..3fb53e553fd 100644
--- a/htdocs/langs/hu_HU/productbatch.lang
+++ b/htdocs/langs/hu_HU/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Gyártás időpontja
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 768fcb7b7a3..4863e3e29f5 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Súlyozott átlagár
 PMPValueShort=SÁÉ
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index f0289205e36..d826ba8b40b 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -197,6 +197,7 @@ 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
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=A felhasználóhoz rendelt feladatok
 ResourceNotAssignedToProject=Nincs hozzárendelve a projekthez
 ResourceNotAssignedToTheTask=Nincs hozzárendelve a feladathoz
@@ -284,3 +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=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>.
+ProjectsHavingThisContact=Projects having this contact
+StartDateCannotBeAfterEndDate=A befejezés időpontja nem lehet hamarabb mint a kezdet
diff --git a/htdocs/langs/hu_HU/receptions.lang b/htdocs/langs/hu_HU/receptions.lang
index 2abb9139df1..99207f1d856 100644
--- a/htdocs/langs/hu_HU/receptions.lang
+++ b/htdocs/langs/hu_HU/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=Recepció
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Visszavonva
 StatusReceptionDraft=Piszkozat
-StatusReceptionValidated=Hitelesítve (már szállítva)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Feldolgozott
 StatusReceptionDraftShort=Piszkozat
 StatusReceptionValidatedShort=Hitelesítetve
@@ -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=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
@@ -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/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index fb754e49828..11042e52f95 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
 inventorySetup = Készlet beállítása
 inventoryCreatePermission=Új készlet létrehozása
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=A készletmozgásoknál a készlet
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Elméleti mennyiség\n
-TheoricalValue=Elméleti mennyiség\n
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Jelenlegi készlet\n
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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=Fill real quantity with expected quantity
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Ismeretlen vonalkód mód\n
 ProductDoesNotExist=A termék nem létezik\n
-ErrorSameBatchNumber=Ugyanaz a tételszám található a készletlistában
+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
diff --git a/htdocs/langs/hu_HU/stripe.lang b/htdocs/langs/hu_HU/stripe.lang
index 27845bc9ee2..8fb23827f04 100644
--- a/htdocs/langs/hu_HU/stripe.lang
+++ b/htdocs/langs/hu_HU/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ 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
-VendorName=Neve eladó
 CSSUrlForPaymentForm=CSS stíluslapot url fizetési forma
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
index ecef7ce1f70..f1651051352 100644
--- a/htdocs/langs/hu_HU/withdrawals.lang
+++ b/htdocs/langs/hu_HU/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
 TransMetod=Átviteli módszer
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Csak az Office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ ModeWarning=Opció a valós módban nem volt beállítva, akkor hagyja abba ezt
 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
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index bad8bdd9c00..f2e882301a9 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=Negara bukan di EEC
 CountriesInEECExceptMe=Negara di EEC kecuali %s
 CountriesExceptMe=Semua negara kecuali %s
 AccountantFiles=Ekspor dokumen sumber
-ExportAccountingSourceDocHelp=Dengan alat ini, Anda dapat mengekspor sumber acara (daftar dalam CSV dan PDF) yang digunakan untuk menghasilkan akuntansi Anda.
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
 ExportAccountingSourceDocHelp2=Untuk mengekspor jurnal Anda, gunakan entri menu %s - %s.
 VueByAccountAccounting=Lihat berdasarkan akun akuntansi
 VueBySubAccountAccounting=Lihat menurut sub-akun akuntansi
@@ -286,7 +286,7 @@ ValidateMovements=Validasi gerakan
 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=Pengikatan otomatis dilakukan
+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
@@ -387,7 +387,8 @@ SaleExport=Penjualan ekspor
 SaleEEC=Dijual dalam EEC
 SaleEECWithVAT=Dijual dalam EEC dengan PPN bukan nol, jadi kami mengira ini BUKAN penjualan intracommunautary dan akun yang disarankan adalah akun produk standar.
 SaleEECWithoutVATNumber=Dijual dalam EEC tanpa PPN tetapi ID PPN pihak ketiga tidak ditentukan. Kami mundur pada akun produk untuk penjualan standar. Anda dapat memperbaiki ID PPN pihak ketiga atau akun produk jika diperlukan.
-
+ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
+ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
 Range=Rentang akun-akun akuntansi
 Calculated=Terhitung
@@ -404,6 +405,7 @@ NoJournalDefined=Tidak ada jurnal yang ditentukan
 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
 
 ## Import
 ImportAccountingEntries=Entri akuntansi
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index d73330e0bff..9892491fec2 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Yayasan
 Version=Versi
 Publisher=Penerbit
@@ -265,8 +267,8 @@ OtherResources=Sumber daya lainnya
 ExternalResources=Sumber Daya Eksternal
 SocialNetworks=Jaringan sosial
 SocialNetworkId=ID Jaringan Sosial
-ForDocumentationSeeWiki=Untuk dokumentasi pengguna atau pengembang (Doc, FAQs ...), <br> lihatlah pada Dolibarr Wiki: <br><b><a href="%s" target="_blank"> %s a0ebd08bc08bc08
-ForAnswersSeeForum=Untuk pertanyaan / bantuan lain, Anda dapat menggunakan forum Dolibarr: <br><b><a href="%s" target="_blank"> %s </a> </b>
+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=Berikut adalah beberapa sumber untuk mendapatkan bantuan dan dukungan dengan Dolibarr.
 HelpCenterDesc2=Beberapa sumber daya ini hanya tersedia di<b>bahasa inggris </b>.
 CurrentMenuHandler=Penangan menu saat ini
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Versi stabil terbaru
 LastActivationDate=Tanggal aktivasi terbaru
 LastActivationAuthor=Penulis aktivasi terbaru
 LastActivationIP=IP aktivasi terbaru
+LastActivationVersion=Latest activation version
 UpdateServerOffline=Perbarui server offline
 WithCounter=Kelola penghitung
 GenericMaskCodes=Anda dapat memasukkan topeng penomoran apa pun. Dalam topeng ini, tag berikut dapat digunakan: <br> <b> {000000} </b> sesuai dengan angka yang akan bertambah pada setiap %s. Masukkan angka nol sebanyak panjang penghitung yang diinginkan. Penghitung akan diselesaikan dengan angka nol dari kiri untuk mendapatkan angka nol sebanyak topeng. <br> <b> {000000 + 000} </b> sama dengan yang sebelumnya tetapi offset yang sesuai dengan nomor di sebelah kanan tanda + diterapkan mulai dari %s pertama. <br> <b> {000000 @ x} </b> sama dengan yang sebelumnya tetapi penghitung disetel ulang ke nol saat bulan x tercapai (x antara 1 dan 12, atau 0 untuk menggunakan bulan-bulan awal tahun fiskal yang ditentukan dalam konfigurasi Anda, atau 99 hingga reset ke nol setiap bulan). Jika opsi ini digunakan dan x adalah 2 atau lebih tinggi, maka urutan {yy} {mm} atau {yyyy} {mm} juga diperlukan. <br> <b> {dd} </b> hari (01 hingga 31). <br> <b> {mm} </b> bulan (01 hingga 12). <br> <b> {yy} </b>, <b> {yyyy} </b> atau <b> {y} a09a4b739 nomor. <br>
@@ -753,7 +756,7 @@ Permission106=Pengiriman ekspor
 Permission109=Hapus pengiriman
 Permission111=Baca akun keuangan
 Permission112=Buat / modifikasi / hapus dan bandingkan transaksi
-Permission113=Siapkan akun keuangan (buat, kelola kategori)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Rekonsiliasi transaksi
 Permission115=Transaksi ekspor dan laporan akun
 Permission116=Transfer antar akun
@@ -762,6 +765,7 @@ Permission121=Baca pihak ketiga yang tertaut ke pengguna
 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)
@@ -889,12 +893,11 @@ Permission701=Membaca Sumbangan
 Permission702=Membuat/Merubah Sumbangan
 Permission703=Menghapus Sumbangan
 Permission771=Baca laporan pengeluaran (milik Anda dan bawahan Anda)
-Permission772=Buat / ubah laporan pengeluaran
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Hapus laporan pengeluaran
-Permission774=Baca semua laporan pengeluaran (bahkan untuk pengguna bukan bawahan)
 Permission775=Menyetujui laporan pengeluaran
 Permission776=Membayar laporan pengeluaran
-Permission777=Baca laporan pengeluaran semua orang
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Buat / ubah laporan pengeluaran semua orang
 Permission779=Laporan pengeluaran ekspor
 Permission1001=Membaca Stok
@@ -902,7 +905,7 @@ Permission1002=Membuat/Merubah Gudang
 Permission1003=Menghapus Gudang
 Permission1004=Membaca pergerakan stok
 Permission1005=Buat / modifikasi pergerakan stok
-Permission1011=View inventories
+Permission1011=Lihat inventaris
 Permission1012=Create new inventory
 Permission1014=Validate inventory
 Permission1015=Allow to change PMP value for a product
@@ -958,15 +961,11 @@ Permission2801=Gunakan klien FTP dalam mode baca (hanya menjelajah dan mengunduh
 Permission2802=Gunakan klien FTP dalam mode tulis (hapus atau unggah file)
 Permission3200=Baca agenda yang diarsipkan dan sidik jari
 Permission3301=Hasilkan modul baru
-Permission4001=Lihat karyawan
-Permission4002=Buat karyawan
-Permission4003=Hapus karyawan
-Permission4004=Karyawan ekspor
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ Permission10005=Hapus konten situs web
 Permission20001=Baca permintaan cuti (cuti Anda dan bawahan Anda)
 Permission20002=Buat / modifikasi permintaan cuti Anda (cuti Anda dan bawahan Anda)
 Permission20003=Hapus permintaan cuti
-Permission20004=Baca semua permintaan cuti (bahkan pengguna bukan bawahan)
-Permission20005=Buat / modifikasi permintaan cuti untuk semua orang (bahkan pengguna bukan bawahan)
-Permission20006=Permintaan cuti admin (pengaturan dan perbarui saldo)
+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=Setujui permintaan cuti
 Permission23001=Baca pekerjaan terjadwal
 Permission23002=Buat / perbarui pekerjaan yang Dijadwalkan
@@ -1358,9 +1357,9 @@ BrowserIsOK=Anda menggunakan browser web %s. Browser ini ok untuk keamanan dan k
 BrowserIsKO=Anda menggunakan browser web %s. Browser ini dikenal sebagai pilihan yang buruk untuk keamanan, kinerja, dan keandalan. Kami merekomendasikan menggunakan Firefox, Chrome, Opera atau Safari.
 PHPModuleLoaded=Komponen PHP %s dimuat
 PreloadOPCode=OPCode preloaded digunakan
-AddRefInList=Tampilkan Pelanggan / Vendor ref. daftar info (daftar pilih atau kotak kombo) dan sebagian besar hyperlink. <br> Pihak Ketiga akan muncul dengan format nama "CC12345 - SC45678 - The Big Company corp." alih-alih "Perusahaan Besar Perusahaan".
-AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=Tampilkan daftar info alamat Pelanggan / Vendor (daftar pilih atau kotak kombo) <br> Pihak Ketiga akan muncul dengan format nama "Korporasi Perusahaan Besar - 21 lompat jalan 123456 Kota besar - AS" alih-alih "Korps Perusahaan Besar".
+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=Tampilan Kontak email (atau telepon jika tidak ditentukan) dan daftar info kota (pilih daftar atau kotak kombo) <br> Kontak akan muncul dengan format nama "Dupond Durand - dupond.durand@email.com - Paris" atau "Dupond Durand - 06 07 59 65 66 - Paris "bukan" Dupond Durand ".
 AskForPreferredShippingMethod=Mintalah metode pengiriman pilihan untuk Pihak Ketiga.
 FieldEdition=Edisi baris %s
@@ -1708,8 +1707,9 @@ MailingDelay=Detik untuk menunggu setelah mengirim pesan berikutnya
 NotificationSetup=Penyiapan modul Pemberitahuan Email
 NotificationEMailFrom=Email pengirim (Dari) untuk email yang dikirim oleh modul Notifikasi
 FixedEmailTarget=Penerima
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Pengaturan modul pengiriman
 SendingsReceiptModel=Mengirim model tanda terima
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Teks bebas pada tanda terima pengiriman
 ##### FCKeditor #####
 AdvancedEditor=Editor tingkat lanjut
 ActivateFCKeditor=Aktifkan editor lanjutan untuk:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field public notes of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field private notes of elements
+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=Pembuatan / edisi WYSIWIG baris detail produk untuk semua entitas (proposal, pesanan, faktur, dll ...). <span class="warning"> Peringatan: Menggunakan opsi ini untuk kasus ini sangat tidak disarankan karena dapat menimbulkan masalah dengan karakter khusus dan pemformatan halaman saat membuat file PDF. </span>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Penyiapan modul Laporan Biaya - Aturan
 ExpenseReportNumberingModules=Modul penomoran laporan biaya
 NoModueToManageStockIncrease=Tidak ada modul yang dapat mengelola peningkatan stok otomatis yang diaktifkan. Peningkatan stok akan dilakukan hanya dengan input manual.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Anda dapat menemukan opsi untuk pemberitahuan email dengan mengaktifkan dan mengkonfigurasi modul "Pemberitahuan".
+TemplatesForNotifications=Templates for notifications
 ListOfNotificationsPerUser=Daftar pemberitahuan otomatis per pengguna *
 ListOfNotificationsPerUserOrContact=Daftar kemungkinan pemberitahuan otomatis (pada agenda bisnis) yang tersedia per pengguna * atau per kontak **
 ListOfFixedNotifications=Daftar notifikasi tetap otomatis
@@ -1916,6 +1917,8 @@ 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)
+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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Apakah Anda ingin menjalankan koleksi untuk kolekto
 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)
-RecordEvent=Rekam agenda email
-CreateLeadAndThirdParty=Buat timbal (dan pihak ketiga jika perlu)
-CreateTicketAndThirdParty=Buat tiket (dan tautkan ke pihak ketiga jika dimuat oleh operasi sebelumnya)
+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=Kode hasil terbaru
 NbOfEmailsInInbox=Jumlah email dalam direktori sumber
 LoadThirdPartyFromName=Muat pihak ketiga yang mencari di %s (hanya memuat)
 LoadThirdPartyFromNameOrCreate=Muat pencarian pihak ketiga di %s (buat jika tidak ditemukan)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Pesan dari percakapan yang dimulai oleh email pertama yang dikirim dari Dolibarr
 WithoutDolTrackingID=Pesan dari percakapan yang dimulai dengan email pertama TIDAK dikirim dari Dolibarr
 WithDolTrackingIDInMsgId=Pesan dikirim dari Dolibarr
@@ -2078,7 +2082,7 @@ CreateCandidature=Buat lamaran kerja
 FormatZip=Kode Pos
 MainMenuCode=Kode entri menu (mainmenu)
 ECMAutoTree=Tampilkan pohon ECM otomatis
-OperationParamDesc=Tentukan nilai yang akan digunakan untuk objek tindakan, atau cara mengekstrak nilai. Sebagai contoh: <br> objproperty1 = SET: nilai untuk menetapkan<br>objproperty2 = SET: nilai dengan penggantian __objproperty1__<br>objproperty3 = SETIFEMPTY: sudah bukan properti, apakah sudah lebih baik, jika sudah lebih baik, apakah sudah lebih baik jika tidak, apakah sudah, apakah sudah, apakah sudah be ([^ \\ s] *) <br> options_myextrafield1 = EKSTRAK: SUBYEKAN: ([^ & # 92; n] *) <br> object.objproperty5 = EXTRACT: BODY: Nama perusahaan saya adalah s ([^ s] s<br>Gunakan a; char sebagai pemisah untuk mengekstrak atau mengatur beberapa properti.
+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=Jam buka
 OpeningHoursDesc=Masukkan di sini jam buka reguler perusahaan Anda.
 ResourceSetup=Modul Konfigurasi Sumber Daya
@@ -2124,7 +2128,7 @@ LargerThan=lebih besar dari
 IfTrackingIDFoundEventWillBeLinked=Perhatikan bahwa Jika ID pelacakan dari suatu objek ditemukan dalam email, atau jika email adalah jawaban dari email yang sudah dikumpulkan dan ditautkan ke suatu objek, acara yang dibuat akan secara otomatis ditautkan ke objek terkait yang diketahui.
 WithGMailYouCanCreateADedicatedPassword=Dengan akun GMail, jika Anda mengaktifkan validasi 2 langkah, disarankan untuk membuat kata sandi khusus kedua untuk aplikasi alih-alih menggunakan kata sandi akun Anda sendiri dari https://myaccount.google.com/.
 EmailCollectorTargetDir=Ini mungkin merupakan perilaku yang diinginkan untuk memindahkan email ke tag / direktori lain ketika berhasil diproses. Cukup atur nama direktori di sini untuk menggunakan fitur ini (JANGAN menggunakan karakter khusus dalam nama). Perhatikan bahwa Anda juga harus menggunakan akun login baca / tulis.
-EmailCollectorLoadThirdPartyHelp=Anda dapat menggunakan aksi ini untuk menggunakan konten email guna menemukan dan memuat pihak ketiga yang ada di database Anda. Pihak ketiga yang ditemukan (atau dibuat) akan digunakan untuk tindakan selanjutnya yang memerlukannya. <br> Misalnya, jika Anda ingin membuat pihak ketiga dengan nama yang diekstrak dari 'Nama: nama untuk ditemukan' yang ditemukan di badan, gunakan email pengirim sebagai email , Anda dapat mengatur bidang parameter seperti ini: <br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+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=Titik akhir untuk %s: %s
 DeleteEmailCollector=Hapus pengumpul email
 ConfirmDeleteEmailCollector=Anda yakin ingin menghapus pengumpul email ini?
@@ -2209,3 +2213,10 @@ 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
 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
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index df72b445da0..f4b913a5c59 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -32,7 +32,7 @@ RIB=Nomor rekening bank
 IBAN=Nomor IBAN
 BIC=Kode BIC / SWIFT
 SwiftValid=BIC / SWIFT valid
-SwiftVNotalid=BIC / SWIFT tidak valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN tidak valid
 StandingOrders=Pesanan debit langsung
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Alamat bank
 BankAccountCountry=Negara akun
 BankAccountOwner=Nama pemilik akun
 BankAccountOwnerAddress=Alamat pemilik akun
-RIBControlError=Pemeriksaan integritas nilai gagal. Ini berarti informasi untuk nomor akun ini tidak lengkap atau salah (periksa negara, nomor, dan IBAN).
 CreateAccount=Buat Akun
 NewBankAccount=Akun baru
 NewFinancialAccount=Akun keuangan baru
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index 310e24963c9..a95adcb4e93 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
@@ -280,6 +279,7 @@ SetMode=Tetapkan Jenis Pembayaran
 SetRevenuStamp=Tetapkan stempel pendapatan
 Billed=Ditagih
 RecurringInvoices=Faktur berulang
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Faktur templat
 RepeatableInvoices=Faktur templat
 Repeatable=Templat
@@ -449,6 +449,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
@@ -604,3 +606,4 @@ 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
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/bookmarks.lang b/htdocs/langs/id_ID/bookmarks.lang
index 5a08f48ff41..839d95d21a3 100644
--- a/htdocs/langs/id_ID/bookmarks.lang
+++ b/htdocs/langs/id_ID/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=Alamat
 BehaviourOnClick=Perilaku ketika alamat penanda dipilih
 CreateBookmark=Buat penanda
 SetHereATitleForLink=Tetapkan nama untuk penanda
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Gunakan tautan eksternal/tautan absolut (https://URL) atau tautan internal/tautan relatif (/DOLIBARR_ROOT/htdocs/...)
+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=Pilih jika halaman tautan harus terbuka di tab saat ini atau tab baru
 BookmarksManagement=Manajemen penanda
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 971f10da4fa..378dfe8a374 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -157,6 +157,18 @@ 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=Id Prof 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Periksa
 VATIntraCheckDesc=ID PPN harus menyertakan awalan negara. Tautan<b>%s</b>menggunakan layanan pemeriksa PPN Eropa (VIES) yang memerlukan akses internet dari server Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Periksa ID PPN intra-Komunitas di situs web Komisi Eropa
-VATIntraManualCheck=Anda juga dapat memeriksa secara manual di situs web Komisi Eropa <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Periksa tidak mungkin. Layanan cek tidak disediakan oleh negara anggota (%s).
 NorProspectNorCustomer=Bukan prospek, bukan pelanggan
 JuridicalStatus=Jenis entitas bisnis
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 9c2948ac2d5..ff998bd3746 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -170,8 +170,9 @@ SeeReportInInputOutputMode=Lihat <b> %sanalisis pembayaran%s </b> untuk penghitu
 SeeReportInDueDebtMode=Lihat <b> %sanalisis dokumen yang direkam%s </b> untuk penghitungan berdasarkan <b> dokumen tercatat yang diketahui </b> bahkan jika belum dicatat di Buku Besar
 SeeReportInBookkeepingMode=Lihat <b> %sanalisis tabel buku besar pembukuan%s </b> untuk laporan berdasarkan <b> Tabel Buku Besar Pembukuan </b>
 RulesAmountWithTaxIncluded=- Jumlah yang ditampilkan termasuk semua pajak
-RulesResultDue=- Ini termasuk faktur terutang, biaya, PPN, sumbangan apakah mereka dibayar atau tidak. Juga termasuk gaji yang dibayarkan. <br> - Ini didasarkan pada tanggal penagihan faktur dan pada tanggal jatuh tempo untuk pengeluaran atau pembayaran pajak. Untuk gaji yang ditentukan dengan modul Gaji, tanggal nilai pembayaran digunakan.
-RulesResultInOut=- Ini termasuk pembayaran nyata yang dilakukan pada faktur, biaya, PPN dan gaji. <br> - Ini didasarkan pada tanggal pembayaran faktur, biaya, PPN dan gaji. Tanggal donasi untuk donasi.
+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=- Ini termasuk tagihan pelanggan apakah mereka dibayar atau tidak. <br> - Ini didasarkan pada tanggal penagihan faktur ini. <br>
 RulesCAIn=- Ini termasuk semua pembayaran faktur yang diterima dari pelanggan. <br> - Ini didasarkan pada tanggal pembayaran faktur ini <br>
 RulesCATotalSaleJournal=Ini mencakup semua jalur kredit dari jurnal Sale.
@@ -295,3 +296,5 @@ 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/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 9e6d6acbc43..2df9104a067 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -27,7 +27,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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Gagal mendapatkan umpan RSS. Coba tambahkan MAIN_SIMPLE
 ErrorForbidden=Akses ditolak. <br> Anda mencoba mengakses halaman, area atau fitur modul yang dinonaktifkan atau tanpa sesi yang diautentikasi atau yang tidak diizinkan untuk pengguna Anda.
 ErrorForbidden2=Izin untuk login ini dapat ditentukan oleh administrator Dolibarr Anda dari menu %s-> %s.
 ErrorForbidden3=Tampaknya Dolibarr tidak digunakan melalui sesi yang diautentikasi. Lihatlah dokumentasi pengaturan Dolibarr untuk mengetahui cara mengelola otentikasi (htaccess, mod_auth atau lainnya ...).
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=Kelas Imagick tidak ditemukan di PHP ini. Pratinjau tidak tersedia. Administrator dapat menonaktifkan tab ini dari menu Pengaturan - Tampilan.
 ErrorRecordAlreadyExists=Rekor sudah ada
 ErrorLabelAlreadyExists=Label ini sudah ada
@@ -271,6 +274,9 @@ 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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parameter PHP Anda upload_max_filesize (%s) lebih tinggi dari parameter PHP post_max_size (%s). Ini bukan pengaturan yang konsisten.
@@ -312,6 +318,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/holiday.lang b/htdocs/langs/id_ID/holiday.lang
index de6a779c0e6..f03f385e2b8 100644
--- a/htdocs/langs/id_ID/holiday.lang
+++ b/htdocs/langs/id_ID/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Keterangan
 SendRequestCP=Buat permintaan cuti
 DelayToRequestCP=Permintaan cuti harus dilakukan setidaknya <b>%s day(s)</b> sebelum mereka.
 MenuConfCP=Saldo cuti
-SoldeCPUser=Saldo cuti adalah<b>%s</b>hari.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Anda harus memilih tanggal akhir lebih besar dari tanggal mulai.
 ErrorSQLCreateCP=Sebuah kesalahan SQL terjadi dalam pembuatan:
 ErrorIDFicheCP=Sebuah kesalahan telah terjadi, permintaan cuti tidak ada.
@@ -134,3 +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/install.lang b/htdocs/langs/id_ID/install.lang
index 16879314b28..ae99fe588da 100644
--- a/htdocs/langs/id_ID/install.lang
+++ b/htdocs/langs/id_ID/install.lang
@@ -21,6 +21,7 @@ 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.
diff --git a/htdocs/langs/id_ID/knowledgemanagement.lang b/htdocs/langs/id_ID/knowledgemanagement.lang
index 19750699b28..640e4c857f0 100644
--- a/htdocs/langs/id_ID/knowledgemanagement.lang
+++ b/htdocs/langs/id_ID/knowledgemanagement.lang
@@ -48,3 +48,7 @@ KnowledgeRecordExtraFields = Extrafields untuk Artikel
 GroupOfTicket=Kelompok tiket
 YouCanLinkArticleToATicketCategory=Anda dapat menautkan artikel ke grup tiket (sehingga artikel akan disarankan selama kualifikasi tiket baru)
 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/main.lang b/htdocs/langs/id_ID/main.lang
index 947bbc0dcc0..23fbd8255cb 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Kesalahan, tidak ada tarif pajak yang dite
 ErrorNoSocialContributionForSellerCountry=Kesalahan, tidak ada jenis pajak sosial / fiskal yang ditentukan untuk negara '%s'.
 ErrorFailedToSaveFile=Kesalahan, gagal menyimpan file.
 ErrorCannotAddThisParentWarehouse=Anda mencoba menambahkan gudang induk yang sudah merupakan anak dari gudang yang ada
+FieldCannotBeNegative=Bidang "%s" tidak boleh negatif
 MaxNbOfRecordPerPage=Maks. jumlah catatan per halaman
 NotAuthorized=Anda tidak berwenang melakukan itu.
 SetDate=Atur tanggal
@@ -87,7 +88,7 @@ FileWasNotUploaded=File dipilih untuk lampiran tetapi belum diunggah. Klik pada
 NbOfEntries=Jumlah entri
 GoToWikiHelpPage=Baca bantuan online (Diperlukan akses Internet)
 GoToHelpPage=Baca bantuan
-DedicatedPageAvailable=Ada halaman bantuan khusus yang terkait dengan layar Anda saat ini
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Halaman Beranda
 RecordSaved=Rekam disimpan
 RecordDeleted=Rekam dihapus
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Kembalikan kode untuk kesalahan permintaan akses dat
 InformationLastAccessInError=Informasi untuk kesalahan permintaan akses database terbaru
 DolibarrHasDetectedError=Dolibarr telah mendeteksi kesalahan teknis
 YouCanSetOptionDolibarrMainProdToZero=Anda dapat membaca file log atau mengatur opsi $ dolibarr_main_prod ke '0' di file konfigurasi Anda untuk mendapatkan informasi lebih lanjut.
-InformationToHelpDiagnose=Informasi ini dapat berguna untuk tujuan diagnostik (Anda dapat mengatur opsi $ dolibarr_main_prod ke '1' untuk menghapus pemberitahuan tersebut)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Informasi lebih lanjut
 TechnicalInformation=Informasi teknis
 TechnicalID=ID Teknis
@@ -211,6 +212,8 @@ User=Pengguna
 Users=Pengguna
 Group=Kelompok
 Groups=Grup
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Tidak ada grup pengguna yang ditentukan
 Password=Kata kunci
 PasswordRetype=Ketik ulang kata sandi Anda
@@ -906,7 +909,7 @@ ViewFlatList=Lihat daftar datar
 ViewAccountList=Lihat buku besar
 ViewSubAccountList=Lihat buku besar sub-akun
 RemoveString=Hapus string '%s'
-SomeTranslationAreUncomplete=Beberapa bahasa yang ditawarkan mungkin hanya diterjemahkan sebagian atau mengandung kesalahan. Tolong bantu untuk memperbaiki bahasa Anda dengan mendaftar di <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/</a> untuk menambahkan perbaikan dari Anda.
+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=Tautan unduhan publik
 PublicDownloadLinkDesc=Hanya tautan yang diperlukan untuk mengunduh file
 DirectDownloadInternalLink=Tautan unduhan pribadi
@@ -1158,4 +1161,6 @@ Properties=Properti
 hasBeenValidated=%s has been validated
 ClientTZ=Zona Waktu Klien (Pengguna)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/id_ID/modulebuilder.lang b/htdocs/langs/id_ID/modulebuilder.lang
index 661d8f7ffb8..f6b55d0ea74 100644
--- a/htdocs/langs/id_ID/modulebuilder.lang
+++ b/htdocs/langs/id_ID/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Alat ini harus digunakan hanya oleh pengguna atau pengembang berpengalaman. Ini menyediakan utilitas untuk membangun atau mengedit modul Anda sendiri. Dokumentasi untuk pengembangan manual <a href="%s" target="_blank"> alternatif ada di sini </a>.
+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.
 ModuleBuilderDesc2=Jalur tempat modul dihasilkan / diedit (direktori pertama untuk modul eksternal didefinisikan menjadi %s):<strong>%s </strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Menu yang disediakan oleh modul / aplikasi Anda didefinisika
 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).
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
+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=Lihat ID yang digunakan dalam instalasi Anda
 SeeReservedIDsRangeHere=Lihat berbagai ID yang dipesan
 ToolkitForDevelopers=Toolkit untuk pengembang Dolibarr
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/other.lang b/htdocs/langs/id_ID/other.lang
index 7edb0235230..477ca55a00a 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Pengodean kata sandi
 PermissionsAdd=Izin ditambahkan
 PermissionsDelete=Izin dihapus
 YourPasswordMustHaveAtLeastXChars=Kata sandi Anda harus memiliki setidaknya<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=Kata sandi Anda telah berhasil direset
 ApplicantIpAddress=Alamat IP pemohon
 SMSSentTo=SMS dikirim ke %s
@@ -268,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
diff --git a/htdocs/langs/id_ID/partnership.lang b/htdocs/langs/id_ID/partnership.lang
index 07064abb270..d801bfdd14d 100644
--- a/htdocs/langs/id_ID/partnership.lang
+++ b/htdocs/langs/id_ID/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Manajemen kemitraan
 PartnershipDescription=Modul Manajemen kemitraan
 PartnershipDescriptionLong= Modul Manajemen kemitraan
-
+Partnership=Kemitraan
 AddPartnership=Tambahkan kemitraan
 CancelPartnershipForExpiredMembers=Kemitraan: Batalkan kemitraan anggota dengan langganan yang kedaluwarsa
 PartnershipCheckBacklink=Kemitraan: Periksa tautan balik rujukan
diff --git a/htdocs/langs/id_ID/productbatch.lang b/htdocs/langs/id_ID/productbatch.lang
index ed9213136b2..f8d40f3f351 100644
--- a/htdocs/langs/id_ID/productbatch.lang
+++ b/htdocs/langs/id_ID/productbatch.lang
@@ -30,7 +30,7 @@ ManageLotMask=Masker kustom
 CustomMasks=Opsi untuk menentukan masker penomoran yang berbeda untuk setiap produk
 BatchLotNumberingModules=Aturan penomoran untuk pembuatan otomatis nomor lot
 BatchSerialNumberingModules=Aturan penomoran untuk pembuatan nomor seri secara otomatis (untuk produk dengan properti 1 lot/seri unik untuk setiap produk)
-QtyToAddAfterBarcodeScan=Qty untuk ditambahkan untuk setiap barcode/lot/serial yang di scan
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Rentang hidup (dalam hari)
 EndOfLife=Akhir Hidup
 ManufacturingDate=Tanggal pembuatan
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Diluar urutan kerja
 InWorkingOrder=Dalam urutan kerja
+ToReplace=Replace
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 9cc7348de29..d35bc34af19 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Harga rata-rata yang ditimbang
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+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=BOM bawaan
 DefaultBOMDesc=BOM default direkomendasikan untuk digunakan untuk memproduksi produk ini. Bidang ini hanya dapat disetel jika sifat produk adalah '%s'.
 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 5f4979504ca..7f70ebfff40 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -197,6 +197,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
@@ -284,3 +285,5 @@ 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
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 5e0cb8a483e..3dea2654b8d 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Batas stok untuk peringatan dan stok optimal yang d
 AddNewProductStockWarehouse=Tetapkan batas baru untuk waspada dan stok optimal yang diinginkan
 AddStockLocationLine=Kurangi kuantitas kemudian klik untuk menambahkan gudang lain untuk produk ini
 InventoryDate=Tanggal inventaris
+Inventories=Inventories
 NewInventory=Inventaris baru
 inventorySetup = Pengaturan Persediaan
 inventoryCreatePermission=Buat inventaris baru
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Pergerakan stok akan memiliki tangg
 inventoryChangePMPPermission=Izinkan untuk mengubah nilai PMP untuk suatu produk
 ColumnNewPMP=PMP unit baru
 OnlyProdsInStock=Jangan menambahkan produk tanpa stok
-TheoricalQty=Jumlah qori
-TheoricalValue=Jumlah qori
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=BP terakhir
 CurrentPA=BP saat ini
 RecordedQty=Qty yang direkam
@@ -240,7 +241,7 @@ StockAtDatePastDesc=Disini Anda dapat melihat pengadaan (pengadaan asli) pada wa
 StockAtDateFutureDesc=Anda dapat melihat di sini stok (stok virtual) pada tanggal tertentu di masa mendatang
 CurrentStock=Stok saat ini
 InventoryRealQtyHelp=Setel nilai ke 0 untuk mengatur ulang jumlah <br> Biarkan bidang kosong, atau hapus baris, agar tidak berubah
-UpdateByScaning=Isi qty nyata dengan memindai
+UpdateByScaning=Complete real qty by scaning
 UpdateByScaningProductBarcode=Perbarui dengan memindai (barcode produk)
 UpdateByScaningLot=Perbarui dengan memindai (barcode lot/serial)
 DisableStockChangeOfSubProduct=Nonaktifkan perubahan stok untuk semua subproduk Kit ini selama pergerakan ini.
@@ -253,14 +254,20 @@ 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=Isi kuantitas nyata dengan kuantitas yang diharapkan
+AutofillWithExpected=Replace real quantity with expected quantity
 ShowAllBatchByDefault=Secara default, tampilkan detail batch pada tab "stok" produk
 CollapseBatchDetailHelp=Anda dapat mengatur tampilan default detail batch dalam konfigurasi modul saham
-FieldCannotBeNegative=Bidang "%s" tidak boleh negatif
 ErrorWrongBarcodemode=Mode Kode Batang Tidak Dikenal
 ProductDoesNotExist=Produk tidak ada
-ErrorSameBatchNumber=Nomor batch yang sama ditemukan dalam daftar inventaris
+ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
 ProductBatchDoesNotExist=Produk dengan batch/serial tidak ada
 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.
+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
diff --git a/htdocs/langs/id_ID/stripe.lang b/htdocs/langs/id_ID/stripe.lang
index 3433150a474..6719ab69746 100644
--- a/htdocs/langs/id_ID/stripe.lang
+++ b/htdocs/langs/id_ID/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Pengaturan modul stripe
-StripeDesc=Menawarkan pelanggan halaman pembayaran online Stripe untuk pembayaran dengan kartu kredit / cebit melalui <a href="http://www.stripe.com" target="_blank"> Stripe </a>. Ini dapat digunakan untuk memungkinkan pelanggan Anda melakukan pembayaran ad-hoc atau untuk pembayaran yang terkait dengan objek Dolibarr tertentu (faktur, pesanan, ...)
+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=Bayar dengan kartu kredit atau Stripe
 FollowingUrlAreAvailableToMakePayments=URL berikut tersedia untuk menawarkan halaman kepada pelanggan untuk melakukan pembayaran pada objek Dolibarr
 PaymentForm=Formulir pembayaran
@@ -28,7 +28,6 @@ AccountParameter=Parameter akun
 UsageParameter=Parameter penggunaan
 InformationToFindParameters=Membantu menemukan informasi akun %s Anda
 STRIPE_CGI_URL_V2=Url modul Stripe CGI untuk pembayaran
-VendorName=Nama vendor
 CSSUrlForPaymentForm=URL style sheet CSS untuk formulir pembayaran
 NewStripePaymentReceived=Pembayaran Stripe Baru diterima
 NewStripePaymentFailed=Pembayaran Stripe baru telah dicoba tetapi gagal
diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang
index cd68c0da8e0..38d0b35743f 100644
--- a/htdocs/langs/id_ID/withdrawals.lang
+++ b/htdocs/langs/id_ID/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Pesanan transfer kredit
 LatestBankTransferReceipts=Pesanan transfer kredit %s terbaru
 LastWithdrawalReceipts=File debit langsung %s terbaru
 WithdrawalsLine=Jalur pemesanan debit langsung
+CreditTransfer=Transfer Kredit
 CreditTransferLine=Jalur transfer kredit
 WithdrawalsLines=Jalur pemesanan debit langsung
 CreditTransferLines=Jalur transfer kredit
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Kode bank pihak ketiga
 NoInvoiceCouldBeWithdrawed=Tidak ada faktur yang berhasil didebit. Periksa apakah faktur ada pada perusahaan dengan IBAN yang valid dan bahwa IBAN memiliki UMR (Referensi Mandat Unik) dengan mode<strong>%s </strong>.
 WithdrawalCantBeCreditedTwice=Tanda terima penarikan ini sudah ditandai sebagai dikreditkan; ini tidak dapat dilakukan dua kali, karena ini berpotensi membuat pembayaran duplikat dan entri bank.
 ClassCredited=Klasifikasi dikreditkan
+ClassDebited=Classify debited
 ClassCreditedConfirm=Apakah Anda yakin ingin mengklasifikasikan tanda terima penarikan ini sebagai yang dikreditkan ke rekening bank Anda?
 TransData=Tanggal transmisi
 TransMetod=Metode transmisi
@@ -80,7 +82,7 @@ StatusMotif7=Putusan Peradilan
 StatusMotif8=Alasan lain
 CreateForSepaFRST=Buat file debit langsung (SEPA FRST)
 CreateForSepaRCUR=Buat file debit langsung (SEPA RCUR)
-CreateAll=Buat file debit langsung (semua)
+CreateAll=Buat berkas debet langsung
 CreateFileForPaymentByBankTransfer=Buat file untuk transfer kredit
 CreateSepaFileForPaymentByBankTransfer=Buat file transfer kredit (SEPA)
 CreateGuichet=Hanya kantor
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Tidak dapat membuat permintaan debit langsung untu
 SepaMandate=Mandat Debit Langsung SEPA
 SepaMandateShort=Mandat SEPA
 PleaseReturnMandate=Silakan kembalikan formulir mandat ini melalui email ke %s atau melalui email ke
-SEPALegalText=Dengan menandatangani formulir mandat ini, Anda memberi otorisasi (A) %s untuk mengirim instruksi ke bank Anda untuk mendebit rekening Anda dan (B) bank Anda untuk mendebit rekening Anda sesuai dengan instruksi dari %s. Sebagai bagian dari hak Anda, Anda berhak mendapatkan pengembalian uang dari bank Anda berdasarkan syarat dan ketentuan perjanjian Anda dengan bank Anda. Pengembalian dana harus diklaim dalam waktu 8 minggu mulai dari tanggal di mana akun Anda didebit. Hak-hak Anda tentang mandat di atas dijelaskan dalam pernyataan yang dapat Anda peroleh dari bank Anda.
+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=Pengidentifikasi Kreditor
 CreditorName=Nama Kreditor
 SEPAFillForm=(B) Silakan isi semua kolom bertanda *
@@ -150,3 +152,5 @@ ModeWarning=Opsi untuk mode nyata tidak disetel, kami berhenti setelah simulasi
 ErrorCompanyHasDuplicateDefaultBAN=Perusahaan dengan id %s memiliki lebih dari satu rekening bank default. Tidak ada cara untuk mengetahui mana yang akan digunakan.
 ErrorICSmissing=ICS hilang di rekening Bank %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Jumlah total pesanan debit langsung berbeda dari jumlah baris
+WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
+WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index 43ae1aaf9fd..527cbcc8e22 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 9cd81864372..540d764bad6 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Útgáfa
 Publisher=Publisher
@@ -265,8 +267,8 @@ OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=Notandanafn eða skjölum verktaki '(Doc, FAQs ...), <br> kíkið á Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s </b></a>
-ForAnswersSeeForum=Fyrir einhverjar aðrar spurningar / hjálp, getur þú notað Dolibarr spjall: <br> <a href="%s" target="_blank"><b> %s </b></a>
+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=Núverandi valmynd dýraþjálfari
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Eyða sendings
 Permission111=Lesa fjárhagslega reikninga
 Permission112=Búa til / breyta / eyða og bera saman viðskipti
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Útflutningur fundargerðir og reikningur staðhæfing
 Permission116=Millifærslur milli reikninga
@@ -762,6 +765,7 @@ Permission121=Lesa þriðja aðila sem tengist notandi
 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)
@@ -889,12 +893,11 @@ Permission701=Lesa Fjárframlög
 Permission702=Búa til / breyta framlög
 Permission703=Eyða Fjárframlög
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Lesa fiskistofna
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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=%s viði útgáfa
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Viðtakandi
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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 kvittun líkan
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Frjáls texti á afhendingu kvittunum
 ##### FCKeditor #####
 AdvancedEditor=Ítarlegri ritstjóri
 ActivateFCKeditor=Virkja FCKeditor fyrir:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field public notes of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field private notes of elements
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
index edb36edb08c..35d47da76ab 100644
--- a/htdocs/langs/is_IS/banks.lang
+++ b/htdocs/langs/is_IS/banks.lang
@@ -32,7 +32,7 @@ RIB=Bankareikningur Fjöldi
 IBAN=IBAN númer
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Reikningur landi
 BankAccountOwner=Eigandi reiknings Nafn
 BankAccountOwnerAddress=Eigandi reiknings Heimilisfang
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Búa til reikning
 NewBankAccount=Nýr reikningur
 NewFinancialAccount=New fjármagnsjöfnuði
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/bookmarks.lang b/htdocs/langs/is_IS/bookmarks.lang
index 12cabeff543..f137f05133a 100644
--- a/htdocs/langs/is_IS/bookmarks.lang
+++ b/htdocs/langs/is_IS/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Behaviour when a bookmark URL is selected
 CreateBookmark=Búa til bókamerki
 SetHereATitleForLink=Set a name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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=Bókamerki stjórnun
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 2fad0b55c76..606eb738205 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -157,6 +157,18 @@ 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 (Rut)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Athuga
 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">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Athuga ekki hægt. Athugaðu þjónusta er ekki veitt af aðildarríki ( %s ).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index 779a926f816..eeedada04b2 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 07562c00bf0..a6d3ae56134 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Ekki til að fá RSS straum. Reyndu að bæta stöðugt
 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=Leyfi fyrir þetta notandanafn er hægt að skilgreina með Dolibarr kerfisstjóra valmynd %s -> %s .
 ErrorForbidden3=Það virðist sem Dolibarr er ekki notað í gegnum staðfesta setu. Skoðaðu Dolibarr skipulag Documentation að vita hvernig á að stjórna authentications (htaccess, mod_auth eða önnur ...).
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=Virka imagick_readimage er ekki að finna í þessari PHP. Engin sýnishorn geta verið fyrir hendi. Stjórnandi getur aftengt þennan flipa valmynd Skipulag - Skjár.
 ErrorRecordAlreadyExists=Upptaka er til nú þegar
 ErrorLabelAlreadyExists=This label already exists
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/is_IS/holiday.lang
index 4e4ce24a016..2afc9da4ad8 100644
--- a/htdocs/langs/is_IS/holiday.lang
+++ b/htdocs/langs/is_IS/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Lýsing
 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 is <b>%s</b> days.
+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.
@@ -134,3 +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 01616ccad0f..538f6d35faf 100644
--- a/htdocs/langs/is_IS/install.lang
+++ b/htdocs/langs/is_IS/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/is_IS/main.lang
index 3633f54d165..349fa522956 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Villa, enginn VSK hlutfall er skilgreind f
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Villa tókst að vista skrána.
 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=Setja dagsetningu
@@ -87,7 +88,7 @@ FileWasNotUploaded=A-skrá er valin fyrir viðhengi en var ekki enn upp. Smelltu
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Lestu hjálpina
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Upptaka vistuð
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Return code for latest database access request error
 InformationLastAccessInError=Information for latest database access request error
 DolibarrHasDetectedError=Dolibarr hefur fundist tæknilega villu
 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 remove such notices)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Meiri upplýsingar
 TechnicalInformation=Technical information
 TechnicalID=Technical ID
@@ -211,6 +212,8 @@ User=Notandi
 Users=Notendur
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Lykilorð
 PasswordRetype=Sláðu lykilorðið þitt
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/is_IS/modulebuilder.lang b/htdocs/langs/is_IS/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/is_IS/modulebuilder.lang
+++ b/htdocs/langs/is_IS/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 37387cdfd63..84da72c8bac 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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
diff --git a/htdocs/langs/is_IS/partnership.lang b/htdocs/langs/is_IS/partnership.lang
index 73c62ff3c4f..de7107a5058 100644
--- a/htdocs/langs/is_IS/partnership.lang
+++ b/htdocs/langs/is_IS/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/is_IS/productbatch.lang b/htdocs/langs/is_IS/productbatch.lang
index 6c53fd18800..e7858b8d102 100644
--- a/htdocs/langs/is_IS/productbatch.lang
+++ b/htdocs/langs/is_IS/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 10b4155eb0f..65cbfc8d55f 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Vegið meðalverð
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 5fbcab00b7e..dda11fdbe0e 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/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,3 +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/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 3300b75fe55..2c70b2404ab 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/is_IS/stripe.lang b/htdocs/langs/is_IS/stripe.lang
index 8ba78b4df1e..df404fc32eb 100644
--- a/htdocs/langs/is_IS/stripe.lang
+++ b/htdocs/langs/is_IS/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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=Eftirfarandi vefslóðir eru að bjóða upp síðu til viðskiptavina til að framkvæma greiðslu á Dolibarr mótmæla
 PaymentForm=Greiðsla mynd
@@ -28,7 +28,6 @@ AccountParameter=Skráningin breytur
 UsageParameter=Notkun breytur
 InformationToFindParameters=Hjálp til að finna %s upplýsingar reiknings þíns
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Nafn seljanda
 CSSUrlForPaymentForm=CSS stíll lak url fyrir formi greiðslu
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang
index 764c69d4d03..5feb0d97831 100644
--- a/htdocs/langs/is_IS/withdrawals.lang
+++ b/htdocs/langs/is_IS/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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=Flokka fært
+ClassDebited=Classify debited
 ClassCreditedConfirm=Ertu viss um að þú viljir að flokka þessa afturköllun berst sem lögð á bankareikning þinn?
 TransData=Date Sending
 TransMetod=Aðferð Sending
@@ -80,7 +82,7 @@ StatusMotif7=Dómstóla ákvörðun
 StatusMotif8=Aðrar ástæður
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Aðeins skrifstofa
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ ModeWarning=Valkostur fyrir alvöru ham var ekki sett, að hætta við eftir þe
 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
diff --git a/htdocs/langs/it_CH/admin.lang b/htdocs/langs/it_CH/admin.lang
index 45f91beee38..9bfd4f12f48 100644
--- a/htdocs/langs/it_CH/admin.lang
+++ b/htdocs/langs/it_CH/admin.lang
@@ -1,2 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
+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/it_CH/companies.lang b/htdocs/langs/it_CH/companies.lang
new file mode 100644
index 00000000000..40b5f885e43
--- /dev/null
+++ b/htdocs/langs/it_CH/companies.lang
@@ -0,0 +1,7 @@
+# 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
diff --git a/htdocs/langs/it_CH/compta.lang b/htdocs/langs/it_CH/compta.lang
deleted file mode 100644
index 77232f4323a..00000000000
--- a/htdocs/langs/it_CH/compta.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-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/it_CH/members.lang b/htdocs/langs/it_CH/members.lang
deleted file mode 100644
index bacf210d56c..00000000000
--- a/htdocs/langs/it_CH/members.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-NewSubscription=New contribution
diff --git a/htdocs/langs/it_CH/propal.lang b/htdocs/langs/it_CH/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/it_CH/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index 680149f8495..9e3b6ed7f2d 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
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were 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
+AccountantFiles=Esporta documenti di origine
+ExportAccountingSourceDocHelp=Con questo strumento puoi esportare gli eventi di origine (elenco in CSV e PDF) utilizzati per generare la tua contabilità.
+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
@@ -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, selezionare la visualizzazione del periodo per impostazione predefinita
 
 ACCOUNTING_SELL_JOURNAL=Giornale Vendite
 ACCOUNTING_PURCHASE_JOURNAL=Giornale Acquisti
@@ -181,7 +181,7 @@ 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
 
 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 +202,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 di operazione 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 operative della contabilità 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=Ciò cancellerà la transazione dalla contabilità (tutte le righe di operazione 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 +246,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,16 +277,16 @@ 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
+Closure=Chiusura annuale
 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
+AllMovementsWereRecordedAsValidated=Tutti i movimenti sono stati registrati come convalidati
+NotAllMovementsCouldBeRecordedAsValidated=Non tutti i movimenti possono essere registrati come convalidati
 ValidateMovements=Convalida i movimenti
 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=Collegamento automatico fatto
+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
@@ -298,13 +298,13 @@ NoNewRecordSaved=No more record to journalize
 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=Avvertenza, tutte le operazioni senza account subledger definito vengono filtrate ed escluse da questa visualizzazione
 
 ## 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 +324,14 @@ 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 (la modifica delle righe non sarà possibile)
+NotifiedValidationDate=Convalidare le voci esportate (non sarà possibile modificare o eliminare le righe)
+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 +339,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,7 +387,8 @@ 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=Vietato: la transazione è stata convalidata e/o esportata.
+ForbiddenTransactionAlreadyValidated=Vietato: la transazione è stata convalidata.
 ## Dictionary
 Range=Range of accounting account
 Calculated=Calcolato
@@ -404,32 +405,33 @@ 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=Spiacenti, questo modulo non è compatibile con la funzione sperimentale delle fatture di situazione
 
 ## 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 d6b8f82a8a8..e2632df530a 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+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
@@ -85,7 +87,7 @@ NumberOfBytes=Number of Bytes
 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
@@ -118,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
@@ -159,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.
@@ -210,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...
@@ -224,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>.
@@ -238,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
@@ -264,9 +266,9 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Altre risorse
 ExternalResources=Risorse esterne
 SocialNetworks=Social Networks
-SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=La documentazione per utenti e sviluppatori e le FAQ sono disponibili sul wiki di Dolibarr: <br/>Dai un'occhiata a <a href="%s" target="_blank"><b> %s</b></a>
-ForAnswersSeeForum=Per qualsiasi altro problema/domanda, si può utilizzare il forum di Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
+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
@@ -279,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
@@ -341,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>
@@ -353,12 +355,13 @@ LastStableVersion=Ultima versione stabile
 LastActivationDate=Ultima data di attivazione
 LastActivationAuthor=Ultimo
 LastActivationIP=Latest activation IP
+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>
@@ -375,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
@@ -386,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
@@ -403,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
@@ -418,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.
@@ -454,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)
@@ -494,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=Trovato record SPF effettivo: %s
 ClickToShowDescription=Clicca per mostrare la descrizione
 DependsOn=This module needs the module(s)
 RequiredBy=Questo modulo è richiesto dal modulo
@@ -518,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
@@ -556,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
@@ -570,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
@@ -610,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
@@ -656,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
@@ -682,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
@@ -697,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
@@ -714,7 +717,7 @@ Permission32=Creare/modificare  prodotti
 Permission34=Eliminare prodotti
 Permission36=Vedere/gestire prodotti nascosti
 Permission38=Esportare prodotti
-Permission39=Ignore minimum price
+Permission39=Ignora il prezzo minimo
 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)
@@ -723,7 +726,7 @@ 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
@@ -748,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=Imposta conti finanziari (crea, gestire le categorie)
+Permission113=Imposta conti finanziari (crea, gestisci categorie di transazioni bancarie)
 Permission114=Riconciliare transazioni
 Permission115=Operazioni di esportazione ed estratti conto
 Permission116=Trasferimenti tra conti
@@ -762,6 +765,7 @@ Permission121=Vedere soggetti terzi collegati all'utente
 Permission122=Creare/modificare terzi legati all'utente
 Permission125=Eliminare terzi legati all'utente
 Permission126=Esportare terzi
+Permission130=Crea/modifica le informazioni di pagamento di terze parti
 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)
@@ -823,8 +827,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
@@ -857,10 +861,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
@@ -872,30 +876,29 @@ 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
 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=Creare / modificare le note spese
+Permission772=Crea/modifica note spese (per te e i tuoi subordinati)
 Permission773=Eliminare le note spese
-Permission774=Vedere tutte le note spese (anche per utenti non subordinati)
 Permission775=Approvare le note spese
 Permission776=Pagare le note spese
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+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
@@ -925,9 +928,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
@@ -941,8 +944,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
@@ -957,19 +960,15 @@ Permission2515=Impostare directory documenti
 Permission2801=Client FTP in sola lettura (solo download e navigazione dei file)
 Permission2802=Client FTP in lettura e scrittura (caricamento e eliminazione dei file)
 Permission3200=Read archived events and fingerprints
-Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify 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
 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.
@@ -977,23 +976,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=Vedere tutte le richieste di ferie (anche di utenti non subordinati)
-Permission20005=Creare / modificare richieste di ferie per tutti (anche di utenti non subordinati)
-Permission20006=Amministrazione richieste di ferie/permessi  (impostazione e aggiornamento del bilancio)
+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
@@ -1017,21 +1016,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
@@ -1052,7 +1051,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
@@ -1061,15 +1060,15 @@ 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
+TypeOfUnit=Tipo di unità
 SetupSaved=Impostazioni salvate
 SetupNotSaved=Impostazioni non salvate
 BackToModuleList=Torna all'elenco dei moduli
@@ -1120,7 +1119,7 @@ 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
@@ -1165,7 +1164,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
@@ -1185,8 +1184,8 @@ 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:
 DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
@@ -1211,12 +1210,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
@@ -1224,7 +1223,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
@@ -1236,7 +1235,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
@@ -1275,7 +1274,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
@@ -1283,12 +1282,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
@@ -1302,7 +1301,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)
@@ -1348,20 +1347,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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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)
@@ -1369,7 +1368,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
@@ -1391,7 +1390,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
@@ -1440,7 +1439,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
@@ -1466,10 +1465,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
@@ -1491,10 +1490,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)
@@ -1551,7 +1550,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
@@ -1613,9 +1612,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.
@@ -1644,13 +1643,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
@@ -1667,7 +1666,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
@@ -1708,8 +1707,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
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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 +1725,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 +1786,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,6 +1901,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=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
@@ -1916,6 +1917,8 @@ 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)
+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
@@ -1931,17 +1934,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 in formato dolibarr ('image.png' se nella directory del tema corrente, 'image.png@nom_du_module' se nella directory /img/ di un modulo)
 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
@@ -1976,7 +1979,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)
@@ -2016,18 +2019,18 @@ 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)
@@ -2043,7 +2046,7 @@ 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
 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
@@ -2051,34 +2054,35 @@ 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
+DateLastCollectResult=Data dell'ultimo tentativo di ritiro
+DateLastcollectResultOk=Data dell'ultimo successo di raccolta
 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 email event
-CreateLeadAndThirdParty=Crea Opportunità (e Soggetto terzo se necessario)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+RecordEvent=Registra un evento in agenda (con tipo Email inviata o ricevuta)
+CreateLeadAndThirdParty=Crea un lead (e una terza parte se necessario)
+CreateTicketAndThirdParty=Creare un ticket (collegato a una terza parte se la terza parte è stata caricata da un'operazione precedente, altrimenti senza una 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)
-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
-OperationParamDesc=Definire i valori da utilizzare per l'oggetto dell'azione o come estrarre i valori. Ad esempio: <br> objproperty1=SET: il valore per impostare <br> objproperty2=SET: un valore con la sostituzione di __objproperty1__ <br> objproperty3=SETIFEMPTY: valore usato se objproperty3 non è già pronto <br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY: Il nome della mia azienda è\\s([^\\s]*)Usa il carattere ; come separatore per estrarre o impostare diverse proprietà.
+OperationParamDesc=Definire le regole da utilizzare per estrarre o impostare valori. <br> Esempio per operazioni che richiedono l'estrazione di un nome dall'oggetto dell'e-mail: <br> name=EXTRACT:SUBJECT:Message from company ([^\n] *) <br> Esempio di operazioni che creano oggetti: <br> objproperty1 = SET: il valore impostato <br> objproperty2 = SET: un valore compreso valore __objproperty1__ <br> objproperty3 = SETIFEMPTY: valore utilizzato se objproperty3 non è già definito <br> objproperty4 = ESTRATTO: HEADER :X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:Il nome della mia azienda è\\s( [^\\s]*) <br> <br> Usa a ; char come separatore per estrarre o impostare più proprietà.
 OpeningHours=Orari di apertura
 OpeningHoursDesc=Inserisci gli orari di apertura regolare della tua azienda.
 ResourceSetup=Configurazione del modulo Risorse
@@ -2088,7 +2092,7 @@ DisabledResourceLinkContact=Disattiva funzionalità per collegare una risorsa ai
 EnableResourceUsedInEventCheck=Abilitare la funzione per verificare se una risorsa è in uso in un evento
 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
@@ -2110,21 +2114,21 @@ 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 a string 'Name: name to find' found into the body, use 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?
@@ -2138,10 +2142,10 @@ 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_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
@@ -2150,62 +2154,69 @@ 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
+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 sulla vendita
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Se vuoi utilizzare una terza imposta, devi abilitare anche la prima imposta sulla vendita
+LanguageAndPresentation=Linguaggio e presentazione
+SkinAndColors=Pelle e colori
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Se vuoi utilizzare una seconda imposta, devi abilitare anche la prima imposta sulla vendita
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Se vuoi utilizzare una terza imposta, devi abilitare anche la prima imposta sulla vendita
+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
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index 55b6ced3f81..59afe414529 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,7 +38,7 @@ 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
@@ -64,7 +64,7 @@ ShipmentClassifyClosedInDolibarr=Spedizione %s classificata come fatturata
 ShipmentUnClassifyCloseddInDolibarr=Spedizione %s classificata come riaperta
 ShipmentBackToDraftInDolibarr=La spedizione %s torna allo stato bozza
 ShipmentDeletedInDolibarr=Spedizione %s eliminata
-ShipmentCanceledInDolibarr=Shipment %s canceled
+ShipmentCanceledInDolibarr=Spedizione %s annullata
 ReceptionValidatedInDolibarr=Ricezione %s convalidata
 OrderCreatedInDolibarr=Ordine %s creato
 OrderValidatedInDolibarr=Ordine convalidato
@@ -89,7 +89,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 +122,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 +134,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 +156,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 +165,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/assets.lang b/htdocs/langs/it_IT/assets.lang
index 5a98e34f1ef..6b3e04f6206 100644
--- a/htdocs/langs/it_IT/assets.lang
+++ b/htdocs/langs/it_IT/assets.lang
@@ -42,7 +42,7 @@ ModuleAssetsDesc = Descrizione espiti
 AssetsSetup = Configurazione cespiti
 Settings = Impostazioni
 AssetsSetupPage = Pagina configurazione cespiti
-ExtraFieldsAssetsType = Complementary attributes (Asset type)
+ExtraFieldsAssetsType = Attributi complementari (tipo di risorse)
 AssetsType=Tipo di cespite
 AssetsTypeId=Id tipo di cespite
 AssetsTypeLabel=Etichetta tipo di cespite
@@ -61,5 +61,7 @@ MenuListTypeAssets = Elenco
 #
 # Module
 #
+Asset=Cespite
 NewAssetType=Nuovo tipo cespite
 NewAsset=Nuovo cespite
+ConfirmDeleteAsset=Sei sicuro di voler eliminare questo cespite?
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index 4281bca116c..0fa9abdc08b 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -17,7 +17,7 @@ CurrentAccounts=Conti correnti
 SavingAccounts=Conti di risparmio
 ErrorBankLabelAlreadyExists=Etichetta banca già esistente
 BankBalance=Saldo
-BankBalanceBefore=Bilancio precedente
+BankBalanceBefore=Saldo precedente
 BankBalanceAfter=Saldo dopo
 BalanceMinimalAllowed=Saldo minimo consentito
 BalanceMinimalDesired=Saldo minimo voluto
@@ -32,7 +32,7 @@ RIB=Coordinate bancarie
 IBAN=Codice IBAN
 BIC=Codice BIC/SWIFT
 SwiftValid=Il codice BIC/SWIFT è valido
-SwiftVNotalid=BIC/SWIFT non valido
+SwiftNotValid=BIC/SWIFT non valido
 IbanValid=Il codice IBAN è valido
 IbanNotValid=Il codice IBAN non è valido
 StandingOrders=Ordini di addebito diretto
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Indirizzo banca
 BankAccountCountry=Paese del conto
 BankAccountOwner=Nome titolare
 BankAccountOwnerAddress=Indirizzo titolare
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Crea conto
 NewBankAccount=Nuovo conto
 NewFinancialAccount=Nuovo conto finanziario
@@ -109,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
@@ -128,7 +127,7 @@ ConfirmDeleteTransaction=Vuoi davvero eliminare questa transazione?
 ThisWillAlsoDeleteBankRecord=Questa operazione elimina anche le transazioni bancarie generate
 BankMovements=Movimenti
 PlannedTransactions=Transazioni pianificate
-Graph=Graphs
+Graph=Grafici
 ExportDataset_banque_1=Movimenti bancari e di cassa e loro rilevazioni
 ExportDataset_banque_2=Modulo di versamento
 TransactionOnTheOtherAccount=Transazione sull'altro conto
@@ -141,8 +140,8 @@ BankTransactionLine=Transazione bancaria
 AllAccounts=Tutte le banche e le casse
 BackToAccount=Torna al conto
 ShowAllAccounts=Mostra per tutti gli account
-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=Transazioni futura. Impossibile riconciliare
+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?
@@ -166,20 +165,20 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Pagamenti vari
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
+VariousPaymentId=ID pagamento vario
+VariousPaymentLabel=Etichetta pagamento vario
+ConfirmCloneVariousPayment=Conferma la clonazione di un pagamento vario
 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=Controllo cassa POS
+NewCashFence=Apertura o chiusura nuova cassa
 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.
-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
+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=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
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 54e46a3f62e..d12ff11b14b 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)
@@ -192,7 +191,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 +199,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 +235,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 +268,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,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Imposta marca da bollo
 Billed=Fatturati
 RecurringInvoices=Fatture ricorrenti
+RecurringInvoice=Fattura ricorrente
 RepeatableInvoice=Modello fattura
 RepeatableInvoices=Modello fatture
 Repeatable=Modello
@@ -388,7 +388,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 +429,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 +449,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 +468,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
@@ -510,15 +512,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 +534,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 +583,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
@@ -602,5 +604,6 @@ 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
diff --git a/htdocs/langs/it_IT/blockedlog.lang b/htdocs/langs/it_IT/blockedlog.lang
index 98846601074..23088c4dc0f 100644
--- a/htdocs/langs/it_IT/blockedlog.lang
+++ b/htdocs/langs/it_IT/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=La voce del registro archiviata non è valida. Significa che qualcuno (un hacker?) Ha modificato alcuni dati di questo record dopo che è stato registrato, o ha cancellato il record archiviato precedentemente (controlla che esista quella riga con # precedente).
+KoCheckFingerprintValidity=La voce di registro archiviata non è valida. Significa che qualcuno (un hacker?) ha modificato alcuni dati di questo record dopo che è stato registrato, o ha cancellato il precedente record archiviato (verifica che la riga con il precedente # esista) o ha modificato il checksum del record precedente.
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
@@ -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 03845e36837..88e23214ccf 100644
--- a/htdocs/langs/it_IT/bookmarks.lang
+++ b/htdocs/langs/it_IT/bookmarks.lang
@@ -15,8 +15,8 @@ UrlOrLink=URL
 BehaviourOnClick=Funzione per l'URL del segnalibro
 CreateBookmark=Crea segnalibro
 SetHereATitleForLink=Dai un titolo al segnalibro
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Usa un indirizzo http esterno o uno relativo a Dolibarr
+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
-NoBookmarks=No bookmarks defined
+NoBookmarks=Nessun segnalibro definito
diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang
index 61bf843e5d0..4f7bb3f5d3a 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
+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..0aa9f577634 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 avvenuta nel 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 contanti" 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,17 @@ 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
diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
index 8d5848a54a8..191d7d1fe51 100644
--- a/htdocs/langs/it_IT/categories.lang
+++ b/htdocs/langs/it_IT/categories.lang
@@ -3,14 +3,14 @@ Rubrique=Tag/Categoria
 Rubriques=Tag/Categorie
 RubriquesTransactions=Tag / Categorie di operazioni
 categories=tag/categorie
-NoCategoryYet=No tag/category of this type has been created
+NoCategoryYet=Nessun tag/categoria di questo tipo è stato creato
 In=In
 AddIn=Aggiungi a
 modify=modifica
 Classify=Classifica
 CategoriesArea=Area tag/categorie
 ProductsCategoriesArea=Area categorie/tag prodotti/servizi
-SuppliersCategoriesArea=Vendor tags/categories area
+SuppliersCategoriesArea=Area tag/categorie fornitore
 CustomersCategoriesArea=Area tag/categorie clienti
 MembersCategoriesArea=Area tag/categorie membri
 ContactsCategoriesArea=Area tag/categorie contatti
@@ -93,8 +93,8 @@ AddSupplierIntoCategory=Assegna la categoria al fornitore
 ShowCategory=Mostra tag/categoria
 ByDefaultInList=Default nella lista
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
+StocksCategoriesArea=Categorie di magazzino
+ActionCommCategoriesArea=Categorie di eventi
 WebsitePagesCategoriesArea=Pagina-Contenitore delle Categorie
-KnowledgemanagementsCategoriesArea=KM article Categories
-UseOrOperatorForCategories=Use 'OR' operator for categories
+KnowledgemanagementsCategoriesArea=Categorie di articoli KM
+UseOrOperatorForCategories=Usa l'operatore 'OR' per le categorie
diff --git a/htdocs/langs/it_IT/commercial.lang b/htdocs/langs/it_IT/commercial.lang
index 45304358bf6..778c71d30d6 100644
--- a/htdocs/langs/it_IT/commercial.lang
+++ b/htdocs/langs/it_IT/commercial.lang
@@ -64,10 +64,11 @@ ActionAC_SHIP=Invia spedizione per posta
 ActionAC_SUP_ORD=Invia ordine di acquisto tramite mail
 ActionAC_SUP_INV=Invia fattura fornitore tramite mail
 ActionAC_OTH=Altro
-ActionAC_OTH_AUTO=Eventi aggiunti automaticamente
+ActionAC_OTH_AUTO=Altre auto
 ActionAC_MANUAL=Eventi inseriti a mano
 ActionAC_AUTO=Eventi aggiunti automaticamente
-ActionAC_OTH_AUTOShort=Auto
+ActionAC_OTH_AUTOShort=Altro
+ActionAC_EVENTORGANIZATION=Organizzazione eventi
 Stats=Statistiche vendite
 StatusProsp=Stato del cliente potenziale
 DraftPropals=Bozze di proposte commerciali
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index 1aca7172f6b..c0a45186b90 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
@@ -43,10 +43,10 @@ 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=Rapporto al mese
+ReportByCustomers=Report per cliente
+ReportByThirdparties=Report per terze parti
+ReportByQuarter=Rapporto per tariffa
 CivilityCode=Titolo
 RegisteredOffice=Sede legale
 Lastname=Cognome
@@ -80,7 +80,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
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=ID. prof. 1 (Registro delle imprese)
+ProfId2CM=ID. prof. 2 (n. contribuente)
+ProfId3CM=ID. prof. 3 (Decreto di creazione)
+ProfId4CM=Id Professionale 6
+ProfId5CM=Id Professionale 6
+ProfId6CM=Id Professionale 6
+ProfId1ShortCM=Registro delle Imprese
+ProfId2ShortCM=contribuente n.
+ProfId3ShortCM=Decreto di creazione
+ProfId4ShortCM=Id Professionale 6
+ProfId5ShortCM=Id Professionale 6
+ProfId6ShortCM=Id Professionale 6
 ProfId1CO=RUT
 ProfId2CO=-
 ProfId3CO=-
@@ -173,15 +185,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
@@ -239,7 +251,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
@@ -263,7 +275,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
@@ -274,7 +286,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
@@ -337,7 +349,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.
@@ -369,7 +381,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=È anche possibile controllare manualmente sul sito della Commissione Europea <a href="%s" target="_blank">%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
@@ -455,12 +467,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 40bd6ae016f..c6352f9dc5e 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,24 @@ 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
+ConfirmDeleteSocialContribution=Sei sicuro di voler eliminare questo pagamento fiscale/sociale?
+ConfirmDeleteVAT=Sei sicuro di voler eliminare questa dichiarazione IVA?
+ConfirmDeleteSalary=Sei sicuro di voler eliminare questo stipendio?
 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,47 +166,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
-RulesResultDue=- Include fatture in sospeso, spese, IVA, donazioni, indipendentemente dal fatto che siano pagate o meno. Comprende anche gli stipendi pagati. <br> - Si basa sulla data di fatturazione delle fatture e sulla data di scadenza delle spese o dei pagamenti delle imposte. Per gli stipendi definiti con il modulo Salario, viene utilizzata la data valuta del pagamento.
-RulesResultInOut=- Include i pagamenti reali di fatture, spese e IVA. <br>- Si basa sulle date di pagamento di fatture, spese e IVA.
+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 di terzi
+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 i dettagli di questa tariffa
 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
@@ -231,7 +232,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
@@ -249,8 +250,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)
@@ -269,8 +270,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
@@ -281,17 +282,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 = Fatture in ritardo (> 30 giorni)
+InvoiceLate15Days = Fatture in ritardo (da 15 a 30 giorni)
+InvoiceLateMinus15Days = Fatture in ritardo (< 15 giorni)
 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)
+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 56610da67cb..1df943aee02 100644
--- a/htdocs/langs/it_IT/contracts.lang
+++ b/htdocs/langs/it_IT/contracts.lang
@@ -36,7 +36,7 @@ CloseAContract=Chiudere un contratto
 ConfirmDeleteAContract=Vuoi davvero eliminare questo contratto e tutti i suoi servizi?
 ConfirmValidateContract=Vuoi davvero convalidare questo contratto con il nome <b>%s</b>?
 ConfirmActivateAllOnContract=Questo aprirà tutti i servizi (non ancora attivi). Sei sicuro di voler aprire tutti i servizi?
-ConfirmCloseContract=This will close all services (expired or not). Are you sure you want to close this contract?
+ConfirmCloseContract=Questo chiuderà tutti i servizi (scaduti o meno). Sei sicuro di voler chiudere questo contratto?
 ConfirmCloseService=Vuoi davvero chiude questo servizio con la data <b>%s</b>?
 ValidateAContract=Convalidare un contratto
 ActivateService=Attiva il servizio
diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang
index 328ebc79189..165cc02c9c0 100644
--- a/htdocs/langs/it_IT/cron.lang
+++ b/htdocs/langs/it_IT/cron.lang
@@ -7,14 +7,14 @@ Permission23103 = Elimina processo pianificato
 Permission23104 = Esegui processo pianificato
 # Admin
 CronSetup=Impostazione delle azioni pianificate
-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 per controllare e avviare cron jobs qualificati da un browser
+OrToLaunchASpecificJob=O per controllare e avviare un job specifico da un browser
 KeyForCronAccess=Chiave di sicurezza per l'URL che lancia i processi pianificati
 FileToLaunchCronJobs=Riga di comando per controllare e lanciare i processi pianificati in cron
 CronExplainHowToRunUnix=In ambienti Unix per lanciare il comando ogni 5 minuti dovresti usare la seguente riga di crontab
 CronExplainHowToRunWin=In ambienti Microsoft(tm) Windows per lanciare il comando ogni 5 minuti dovresti usare le operazioni pianificate
 CronMethodDoesNotExists=La classe %s non contiene alcune metodo %s
-CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
+CronMethodNotAllowed=Il metodo %s della classe %s è nella lista nera dei metodi vietati
 CronJobDefDesc=I profili cron sono definiti nel file di descrizione del modulo. Quando il modulo viene attivao, vengono caricati e resi disponivbili permettendoti di amministrare i processi dal menu strumenti amministrazione %s.
 CronJobProfiles=Lista dei profili cron predefiniti
 # Menu
@@ -58,7 +58,7 @@ CronNote=Commento
 CronFieldMandatory=Il campo %s è obbligatorio
 CronErrEndDateStartDt=La data di fine non può essere precedente a quella di inizio
 StatusAtInstall=Stato all'installazione del modulo
-CronStatusActiveBtn=Schedule
+CronStatusActiveBtn=Programma
 CronStatusInactiveBtn=Disattiva
 CronTaskInactive=Questo processo è disattivo (non pianificato)
 CronId=Id
@@ -84,7 +84,7 @@ MakeLocalDatabaseDumpShort=Backup del database locale
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attenzione, per motivi di performance, qualunque sia la data della prossima esecuzione dei processi attivi, i tuoi processi possono essere ritardati di un massimo di %s ore prima di essere eseguiti
 DATAPOLICYJob=Pulizia dei dati e anonimizzatore
-JobXMustBeEnabled=Job %s must be enabled
+JobXMustBeEnabled=Il job %s deve essere abilitato
 # Cron Boxes
 LastExecutedScheduledJob=Ultimo processo pianificato eseguito
 NextScheduledJobExecute=Prossimo processo pianificato da eseguire
diff --git a/htdocs/langs/it_IT/deliveries.lang b/htdocs/langs/it_IT/deliveries.lang
index 723f46c4c0f..f4be7e29556 100644
--- a/htdocs/langs/it_IT/deliveries.lang
+++ b/htdocs/langs/it_IT/deliveries.lang
@@ -30,4 +30,4 @@ NonShippable=Non disponibile per spedizione
 ShowShippableStatus=Mostra lo stato di spedizione
 ShowReceiving=Mostra ricevuta di consegna
 NonExistentOrder=Ordine inesistente
-StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Quantità di stock già allocate su righe precedenti
diff --git a/htdocs/langs/it_IT/dict.lang b/htdocs/langs/it_IT/dict.lang
index e0660574459..058888bacef 100644
--- a/htdocs/langs/it_IT/dict.lang
+++ b/htdocs/langs/it_IT/dict.lang
@@ -21,7 +21,7 @@ CountryNL=Paesi Bassi
 CountryHU=Ungheria
 CountryRU=Russia
 CountrySE=Svezia
-CountryCI=Costa d'avorio
+CountryCI=Costa d'Avorio
 CountrySN=Senegal
 CountryAR=Argentina
 CountryCM=Camerun
diff --git a/htdocs/langs/it_IT/donations.lang b/htdocs/langs/it_IT/donations.lang
index 010fdc1eae4..541ecb27212 100644
--- a/htdocs/langs/it_IT/donations.lang
+++ b/htdocs/langs/it_IT/donations.lang
@@ -7,7 +7,6 @@ AddDonation=Crea donazione
 NewDonation=Nuova donazione
 DeleteADonation=Elimina una donazione
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Visualizza donazione
 PublicDonation=Donazione Pubblica
 DonationsArea=Area donazioni
 DonationStatusPromiseNotValidated=Promessa in bozza
@@ -33,3 +32,4 @@ 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=Utilizzare una terza parte esistente come coordinate dei donatori
diff --git a/htdocs/langs/it_IT/ecm.lang b/htdocs/langs/it_IT/ecm.lang
index 88bfbe63e52..7583353f3c0 100644
--- a/htdocs/langs/it_IT/ecm.lang
+++ b/htdocs/langs/it_IT/ecm.lang
@@ -41,9 +41,9 @@ FileNotYetIndexedInDatabase=File non indicizzato nel database (prova a caricarlo
 ExtraFieldsEcmFiles=File Ecm campi extra
 ExtraFieldsEcmDirectories=Directory Ecm campi extra
 ECMSetup=Configurazione ECM
-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=Duplica tutte le immagini con un'altra versione con formato .webp
+ConfirmGenerateImgWebp=Se confermi, genererai un'immagine in formato .webp per tutte le immagini attualmente in questa cartella (le sottocartelle non sono incluse)...
+ConfirmImgWebpCreation=Conferma la duplicazione di tutte le immagini
+SucessConvertImgWebp=Immagini duplicate con successo
+ECMDirName=nome directory
+ECMParentDirectory=Directory principale
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index cdaf4faac42..f784773bb16 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -4,14 +4,14 @@
 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à.
 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 +27,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 +50,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,7 +62,7 @@ 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
@@ -80,10 +82,10 @@ 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
@@ -111,6 +113,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=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
@@ -118,7 +121,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.
@@ -221,15 +224,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.
@@ -247,30 +250,33 @@ 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
+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=Il tipo di evento selezionato (id: %n, codice: %s) non esiste nel dizionario del tipo di evento
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -283,7 +289,7 @@ WarningPassIsEmpty=Attenzione, il database è accessibile senza password. Questa
 WarningConfFileMustBeReadOnly=Attenzione, il file di configurazione <b>htdocs/conf/conf.php</b> è scrivibile dal server web. Questa è una grave falla di sicurezza! Impostare il file in sola lettura per l'utente utilizzato dal server web. Se si utilizza Windows e il formato FAT per il disco, dovete sapere che tale filesystem non consente la gestione delle autorizzazioni sui file, quindi non può essere completamente sicuro.
 WarningsOnXLines=Warning su <b>%s</b> righe del sorgente
 WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
-WarningLockFileDoesNotExists=Attenzione, una volta terminato il setup, devi disabilitare gli strumenti di installazione/migrazione aggiungendo il file <b>install.lock</b> nella directory <b>%s</b>. Omettendo la creazione di questo file è un grave riscuio per la sicurezza.
+WarningLockFileDoesNotExists=Attenzione, una volta terminato il setup, devi disabilitare gli strumenti di installazione/migrazione aggiungendo il file <b>install.lock</b> nella directory <b>%s</b>. Omettendo la creazione di questo file è un grave rischio per la sicurezza.
 WarningUntilDirRemoved=Tutti gli avvisi di sicurezza (visibili solo dagli amministratori) rimarranno attivi fintanto che la vulnerabilità è presente (o la costante MAIN_REMOVE_INSTALL_WARNING viene aggiunta in Impostazioni->Altre impostazioni).
 WarningCloseAlways=Attenzione, la chiusura è effettiva anche se il numero degli elementi non coincide fra inizio e fine. Abilitare questa opzione con cautela.
 WarningUsingThisBoxSlowDown=Attenzione: l'uso di questo box rallenterà pesantemente tutte le pagine che lo visualizzano
@@ -299,29 +305,30 @@ 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".
 
 # 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 ba41f9dc777..127c4f93293 100644
--- a/htdocs/langs/it_IT/exports.lang
+++ b/htdocs/langs/it_IT/exports.lang
@@ -96,8 +96,8 @@ DataComeFromFileFieldNb=Il valore da inserire deriva dal numero del campo <b>%s<
 DataComeFromIdFoundFromRef=Valore che viene dal numero <b>%s</b> campo di file sorgente sarà utilizzato per trovare id del genitore oggetto da utilizzare (Così il <b>%s</b> Objet che ha il ref. Dal file sorgente deve esiste in Dolibarr).
 DataComeFromIdFoundFromCodeId=Il codice che proviene dal campo numero <b>%s</b> del file sorgente sarà usato per trovare l'id dell'oggetto principale da utilizzare (quindi il codice dal file sorgente deve esistere nel dizionario <b>%s</b>). Nota che se conosci l'id, puoi usarlo anche nel file sorgente invece del codice. L'importazione dovrebbe funzionare in entrambi i casi.
 DataIsInsertedInto=I dati provenienti dal file sorgente sarà inserito nel campo seguente:
-DataIDSourceIsInsertedInto=The id of the parent object, that was found using the data in the source file, will be inserted into the following field:
-DataCodeIDSourceIsInsertedInto=The id of the parent line, that was found from code, will be inserted into the following field:
+DataIDSourceIsInsertedInto=L'id dell'oggetto genitore, che è stato trovato utilizzando i dati nel file sorgente, verrà inserito nel seguente campo:
+DataCodeIDSourceIsInsertedInto=L'id della linea padre, che è stato trovato dal codice, verrà inserito nel seguente campo:
 SourceRequired=valore dei dati è obbligatorio
 SourceExample=Esempio di possibile valore di dati
 ExampleAnyRefFoundIntoElement=Qualsiasi ref trovati per <b>%s</b> elementi
diff --git a/htdocs/langs/it_IT/externalsite.lang b/htdocs/langs/it_IT/externalsite.lang
index 98a9f5ba9fb..8be64cda26a 100644
--- a/htdocs/langs/it_IT/externalsite.lang
+++ b/htdocs/langs/it_IT/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Imposta collegamento a sito esterno
-ExternalSiteURL=External Site URL of HTML iframe content
+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
index c1a513cc586..e641576f638 100644
--- a/htdocs/langs/it_IT/ftp.lang
+++ b/htdocs/langs/it_IT/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Impostazioni modulo FTP client
-NewFTPClient=Impostazioni nuova connessione FTP
-FTPArea=Area client FTP
-FTPAreaDesc=Questa pagina mostra il contenuto di un server FTP
-SetupOfFTPClientModuleNotComplete=Le impostazioni del modulo FTP sono errate o incomplete
-FTPFeatureNotSupportedByYourPHP=L'attuale installazione di PHP non supporta le funzioni FTP
-FailedToConnectToFTPServer=Connessione al server FTP fallita (server %s, porta %s)
-FailedToConnectToFTPServerWithCredentials=Login al server FTP fallito con le credenziali fornite (utente/password)
+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 collegamento FTP nel menu...
+ChooseAFTPEntryIntoMenu=Scegli un sito FTP/SFTP dal menu...
 FailedToGetFile=Errore nell'accesso ai file %s
diff --git a/htdocs/langs/it_IT/help.lang b/htdocs/langs/it_IT/help.lang
index e8594bd9410..d85bad4807f 100644
--- a/htdocs/langs/it_IT/help.lang
+++ b/htdocs/langs/it_IT/help.lang
@@ -20,4 +20,4 @@ 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=Lingue supportate
 SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=Per vedere le pagine ufficiali di aiuto su Dolibarr nella tua lingua: <br><b><a href="%s" target="_blank">%s</a></b>
+SeeOfficalSupport=Per il supporto ufficiale di Dolibarr nella tua lingua: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
diff --git a/htdocs/langs/it_IT/holiday.lang b/htdocs/langs/it_IT/holiday.lang
index b8536199369..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=Rimangono <b>%s</b> giorni di ferie
+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,11 +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
+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..b4028530d38 100644
--- a/htdocs/langs/it_IT/hrm.lang
+++ b/htdocs/langs/it_IT/hrm.lang
@@ -11,7 +11,7 @@ ConfirmDeleteEstablishment=Sei sicuro di voler cancellare questa azienda?
 OpenEtablishment=Apri azienda
 CloseEtablishment=Chiudi azienda
 # Dictionary
-DictionaryPublicHolidays=Leave - Public holidays
+DictionaryPublicHolidays=Congedo - Giorni festivi
 DictionaryDepartment=HRM - Lista dipartimenti
 DictionaryFunction=HRM - Posizioni di lavoro
 # Module
@@ -20,62 +20,62 @@ 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
+knowHow=Competenza
+HowToBe=Come essere
+knowledge=Conoscenza
+AbandonmentComment=Commento sull'abbandono
+DateLastEval=Data ultima valutazione
+NoEval=Nessuna valutazione effettuata per questo dipendente
+HowManyUserWithThisMaxNote=Numero di utenti con questo rango
+HighestRank=Grado più alto
+SkillComparison=Confronto delle abilità
diff --git a/htdocs/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang
index 2ef78f40953..e9f4fdbaeb1 100644
--- a/htdocs/langs/it_IT/install.lang
+++ b/htdocs/langs/it_IT/install.lang
@@ -21,6 +21,7 @@ ErrorPHPDoesNotSupportCurl=L'attuale installazione di PHP non supporta cURL.
 ErrorPHPDoesNotSupportCalendar=La tua installazione di PHP non supporta le estensioni del calendario php.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupportMbstring=La tua installazione PHP non supporta le funzioni mbstring.
 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.
@@ -206,7 +207,7 @@ MigrationUserPhotoPath=Migration of photo paths for users
 MigrationFieldsSocialNetworks=Migrazione dei social network dei campi utenti (%s)
 MigrationReloadModule=Ricarica modulo %s
 MigrationResetBlockedLog=Reset del modulo BlockedLog per l'algoritmo v7
-MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
+MigrationImportOrExportProfiles=Migrazione di profili di importazione o esportazione (%s)
 ShowNotAvailableOptions=Mostra opzioni non disponibili
 HideNotAvailableOptions=Nascondi opzioni non disponibili
 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.
diff --git a/htdocs/langs/it_IT/interventions.lang b/htdocs/langs/it_IT/interventions.lang
index 9b814bb7101..4b84ccad5c9 100644
--- a/htdocs/langs/it_IT/interventions.lang
+++ b/htdocs/langs/it_IT/interventions.lang
@@ -65,4 +65,4 @@ InterLineDesc=Line description intervention
 RepeatableIntervention=Modello di intervento
 ToCreateAPredefinedIntervention=Per creare un intervento predefinito o ricorrente, creare un intervento comune e convertirlo in modello di intervento
 ConfirmReopenIntervention=Sei sicuro di voler riaprire l'intervento <b> %s </b>?
-GenerateInter=Generate intervention
+GenerateInter=Genera intervento
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..17629ad035f 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=Puoi collegare un articolo a un gruppo di biglietti (quindi l'articolo verrà suggerito durante la qualificazione dei nuovi biglietti)
+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/languages.lang b/htdocs/langs/it_IT/languages.lang
index d8f36e04b2c..41a98a54664 100644
--- a/htdocs/langs/it_IT/languages.lang
+++ b/htdocs/langs/it_IT/languages.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_am_ET=Etiope
 Language_ar_AR=Arabo
-Language_ar_DZ=Arabic (Algeria)
+Language_ar_DZ=Arabo (Algeria)
 Language_ar_EG=Arabo (Egitto)
-Language_ar_MA=Arabic (Moroco)
+Language_ar_MA=Arabo (Marocco)
 Language_ar_SA=Arabo
-Language_ar_TN=Arabic (Tunisia)
-Language_ar_IQ=Arabic (Iraq)
-Language_as_IN=Assamese
+Language_ar_TN=Arabo (Tunisia)
+Language_ar_IQ=Arabo (Iraq)
+Language_as_IN=assamese
 Language_az_AZ=Azero
 Language_bn_BD=Bengalese
 Language_bn_IN=Bengalese (India)
@@ -74,7 +74,7 @@ Language_it_IT=Italiano
 Language_it_CH=Italiano (Svizzera)
 Language_ja_JP=Giapponese
 Language_ka_GE=Georgiano
-Language_kk_KZ=Kazakh
+Language_kk_KZ=kazako
 Language_km_KH=Khmer
 Language_kn_IN=Kannada
 Language_ko_KR=Coreano
@@ -88,14 +88,14 @@ Language_ne_NP=Nepali
 Language_nl_BE=Olandese (Belgio)
 Language_nl_NL=Olandese (Paesi Bassi) 
 Language_pl_PL=Polacco
-Language_pt_AO=Portuguese (Angola)
+Language_pt_AO=Portoghese (Angola)
 Language_pt_BR=Portoghese (Brasile)
 Language_pt_PT=Portoghese
-Language_ro_MD=Romanian (Moldavia)
+Language_ro_MD=Rumeno (Moldavia)
 Language_ro_RO=Rumeno
 Language_ru_RU=Russo
 Language_ru_UA=Russo (Ucraina)
-Language_tg_TJ=Tajik
+Language_tg_TJ=tagiko
 Language_tr_TR=Turco
 Language_sl_SI=Sloveno
 Language_sv_SV=Svedese
diff --git a/htdocs/langs/it_IT/ldap.lang b/htdocs/langs/it_IT/ldap.lang
index 6986538c5da..536d4d2635e 100644
--- a/htdocs/langs/it_IT/ldap.lang
+++ b/htdocs/langs/it_IT/ldap.lang
@@ -25,3 +25,7 @@ ContactSynchronized=Contatto sincronizzato
 ForceSynchronize=Forza la sincronizzazione Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Impossibile leggere dal database LDAP. Controlla la configurazione del modulo LDAP e l'accesso al database.
 PasswordOfUserInLDAP=Password of user in LDAP
+LDAPPasswordHashType=Tipo di hash della password
+LDAPPasswordHashTypeExample=Tipo di hash della password utilizzato sul server
+SupportedForLDAPExportScriptOnly=Supportato solo da uno script di esportazione ldap
+SupportedForLDAPImportScriptOnly=Supportato solo da uno script di importazione ldap
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index 6c9bc93b879..f732e5789e8 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=To user(s)
 MailCC=Copia carbone (CC)
 MailToCCUsers=In copia gli utenti
 MailCCC=Copia carbone cache (CCC)
-MailTopic=Email subject
+MailTopic=Oggetto dell'email
 MailText=Testo
 MailFile=Allegati
 MailMessage=Testo dell'email
@@ -60,7 +60,7 @@ EMailTestSubstitutionReplacedByGenericValues=Quando si utilizza la modalità di
 MailingAddFile=Allega questo file
 NoAttachedFiles=Nessun file allegato
 BadEMail=Bad value for Email
-EMailNotDefined=Email not defined
+EMailNotDefined=Email non definita
 ConfirmCloneEMailing=Intendi veramente clonare questo invio?
 CloneContent=Clona messaggio
 CloneReceivers=Clona destinatari
@@ -132,8 +132,8 @@ NoNotificationsWillBeSent=Non sono previste notifiche e-mail automatiche per que
 ANotificationsWillBeSent=Verrà inviata una notifica tramite email
 SomeNotificationsWillBeSent=le %s notifiche automatiche verranno inviate tramite e-mail
 AddNewNotification=Iscriviti a una nuova notifica e-mail automatica (target / evento)
-ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List of all automatic email notifications sent
+ListOfActiveNotifications=Elenco di tutti gli abbonamenti attivi (obiettivi/eventi) per la notifica e-mail automatica
+ListOfNotificationsDone=Elenco di tutte le notifiche e-mail automatiche inviate
 MailSendSetupIs=La configurazione della posta elettronica di invio è stata impostata alla modalità '%s'. Questa modalità non può essere utilizzata per inviare mail di massa.
 MailSendSetupIs2=Con un account da amministratore è necessario cliccare su %sHome -> Setup -> EMails%s e modificare il parametro <strong>'%s'</strong> per usare la modalità '%s'. Con questa modalità è possibile inserire i dati del server SMTP di elezione e usare Il "Mass Emailing"
 MailSendSetupIs3=Se hai domande su come configurare il tuo server SMTP chiedi a %s.
@@ -163,8 +163,8 @@ AdvTgtDeleteFilter=Elimina filtro
 AdvTgtSaveFilter=Slava filtro
 AdvTgtCreateFilter=Crea filtro
 AdvTgtOrCreateNewFilter=Titolo del nuovo filtro
-NoContactWithCategoryFound=No category found linked to some contacts/addresses
-NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties
+NoContactWithCategoryFound=Nessuna categoria trovata collegata ad alcuni contatti/indirizzi
+NoContactLinkedToThirdpartieWithCategoryFound=Nessuna categoria trovata collegata ad alcune terze parti
 OutGoingEmailSetup=Email in uscita
 InGoingEmailSetup=Email in entrata
 OutGoingEmailSetupForEmailing=Configurazione della posta elettronica in uscita (per il modulo %s)
@@ -176,5 +176,5 @@ Answered=Answered
 IsNotAnAnswer=Non è risposta (email iniziale)
 IsAnAnswer=È la risposta di una prima email
 RecordCreatedByEmailCollector=Record creato da Email Collector %s dall'email %s
-DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
-DefaultStatusEmptyMandatory=Empty but mandatory
+DefaultBlacklistMailingStatus=Valore predefinito per il campo '%s' durante la creazione di un nuovo contatto
+DefaultStatusEmptyMandatory=Vuoto ma obbligatorio
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 0871290bbea..8d94a066667 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -30,7 +30,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,6 +67,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=Il campo "%s" non può essere negativo
 MaxNbOfRecordPerPage=Max. numero di records per pagina
 NotAuthorized=Non sei autorizzato.
 SetDate=Imposta data
@@ -87,7 +88,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=There is a 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
@@ -114,7 +115,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=Quest'informazione può essere utile per fini diagnostici (puoi settare l'opzione $dolibarr_main_prod su "1" per rimuovere questa notifica)
+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
@@ -180,7 +181,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
@@ -211,6 +212,8 @@ User=Utente
 Users=Utenti
 Group=Gruppo
 Groups=Gruppi
+UserGroup=Gruppo di utenti
+UserGroups=Gruppi di utenti
 NoUserGroupDefined=Gruppo non definito
 Password=Password
 PasswordRetype=Ridigita la password
@@ -224,7 +227,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
@@ -246,7 +249,7 @@ 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
@@ -263,7 +266,7 @@ Cards=Schede
 Card=Scheda
 Now=Adesso
 HourStart=Ora di inizio
-Deadline=Deadline
+Deadline=Scadenza
 Date=Data
 DateAndHour=Data e ora
 DateToday=Data odierna
@@ -272,10 +275,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
@@ -330,7 +333,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
@@ -341,8 +344,8 @@ KiloBytes=Kilobyte
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=Ceated by
-UserModif=Updated by
+UserAuthor=Ceato da
+UserModif=Aggiornato da
 b=b
 Kb=Kb
 Mb=Mb
@@ -362,7 +365,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
@@ -381,7 +384,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)
@@ -390,7 +393,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
@@ -430,7 +433,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
@@ -442,7 +445,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
@@ -508,7 +511,7 @@ to=a
 To=a
 ToDate=a
 ToLocation=a
-at=at
+at=in
 and=e
 or=o
 Other=Altro
@@ -602,15 +605,15 @@ MonthShort09=set
 MonthShort10=ott
 MonthShort11=nov
 MonthShort12=dic
-MonthVeryShort01=J
-MonthVeryShort02=Ven
-MonthVeryShort03=Lun
+MonthVeryShort01=G
+MonthVeryShort02=F
+MonthVeryShort03=M
 MonthVeryShort04=A
-MonthVeryShort05=Lun
-MonthVeryShort06=J
-MonthVeryShort07=J
+MonthVeryShort05=M
+MonthVeryShort06=G
+MonthVeryShort07=L
 MonthVeryShort08=A
-MonthVeryShort09=Dom
+MonthVeryShort09=S
 MonthVeryShort10=O
 MonthVeryShort11=N
 MonthVeryShort12=D
@@ -662,7 +665,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
@@ -711,7 +714,7 @@ 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
@@ -730,8 +733,8 @@ 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
-NoFileFound=No documents uploaded
+ThisLimitIsDefinedInSetupAt=Limite Dolibarr (Menu %s): %s Kb, Limite PHP (Param %s): %s Kb
+NoFileFound=Nessun documento caricato
 CurrentUserLanguage=Lingua dell'utente
 CurrentTheme=Tema attuale
 CurrentMenuManager=Gestore dei menu attuale
@@ -804,7 +807,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
@@ -903,14 +906,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=Alcune traduzioni potrebbero essere incomplete, o contenere errori. In questi casi, registrandoti su <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">transifex.com/projects/p/dolibarr/</a>, avrai la possibilità di proporre modifiche, contribuendo così al miglioramento di Dolibarr.
-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
@@ -975,39 +978,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.
@@ -1023,7 +1026,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
@@ -1039,7 +1042,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
@@ -1060,13 +1063,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
@@ -1075,7 +1078,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
@@ -1112,50 +1115,52 @@ 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=Signature reset
+NotClosedYet=Non ancora chiuso
+ClearSignature=Reimposta firma
+CanceledHidden=Nascosto annullato
+CanceledShown=Annullato mostrato
diff --git a/htdocs/langs/it_IT/margins.lang b/htdocs/langs/it_IT/margins.lang
index 77c15b7e996..a6f0f4c3ab1 100644
--- a/htdocs/langs/it_IT/margins.lang
+++ b/htdocs/langs/it_IT/margins.lang
@@ -22,7 +22,7 @@ ProductService=Prodotto o servizio
 AllProducts=Tutti i prodotti e servizi
 ChooseProduct/Service=Scegli prodotto o servizio
 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).
+ForceBuyingPriceIfNullDetails=Se il prezzo di acquisto/costo non viene fornito quando aggiungiamo una nuova riga e questa opzione è "ON", il margine sarà 0%% sulla nuova riga (prezzo di acquisto/costo = prezzo di vendita). Se questa opzione è "OFF" (consigliata), il margine sarà uguale al valore suggerito per impostazione predefinita (e potrebbe essere 100%% se non è possibile trovare un valore predefinito).
 MARGIN_METHODE_FOR_DISCOUNT=Metodo di margine per sconti globali
 UseDiscountAsProduct=Come prodotto
 UseDiscountAsService=Come servizio
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index 29aff0aa04a..ab06eeb7f40 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,26 +15,26 @@ 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=Biglietti da visita 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
+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
 NewMember=Nuovo membro
 MemberType=Tipo membro
@@ -43,22 +43,22 @@ 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
@@ -70,66 +70,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
 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 +140,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,10 +156,10 @@ 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 al momento della registrazione 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
@@ -168,53 +168,53 @@ LinkToGeneratedPagesDesc=Questa schermata permette di generare file PDF contenen
 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
-CanEditAmount=Visitor can choose/edit amount of its contribution
+DefaultAmount=Importo predefinito del contributo
+CanEditAmount=Il visitatore può scegliere/modificare l'importo del suo contributo
 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.
diff --git a/htdocs/langs/it_IT/modulebuilder.lang b/htdocs/langs/it_IT/modulebuilder.lang
index 8e11865ae53..dc748c8c44b 100644
--- a/htdocs/langs/it_IT/modulebuilder.lang
+++ b/htdocs/langs/it_IT/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -85,7 +85,7 @@ ListOfPermissionsDefined=List of defined permissions
 SeeExamples=Vedi esempi qui
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Il campo è visibile? (Esempi: 0 = Mai visibile, 1 = Visibile su elenco e crea / aggiorna / visualizza moduli, 2 = Visibile solo su elenco, 3 = Visibile solo su crea / aggiorna / visualizza modulo (non elenco), 4 = Visibile su elenco e aggiorna / visualizza solo modulo (non crea), 5 = Visibile solo sul modulo di visualizzazione fine elenco (non crea, non aggiorna). <br> <br> L'uso di un valore negativo significa che il campo non è mostrato per impostazione predefinita nell'elenco ma può essere selezionato per la visualizzazione). <br> <br> Può essere un'espressione, ad esempio: <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=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
+DisplayOnPdfDesc=Visualizza questo campo su documenti PDF compatibili, puoi gestire la posizione con il campo "Posizione". <br> Attualmente, i modelli PDF compatibili noti sono: eratosthene (ordine), espadon (nave), sponge (fatture), cyan (propal/preventivo), cornas (ordine fornitore) <br><br><strong> Per documento: </strong><br> 0 = non visualizzato<br>1  = visualizzato <br>2 = visualizza solo se non vuoto <br><br><strong>Per le righe del documento:</strong><br>0 = non visualizzato<br> 1= visualizzato nella colonna <br>3 = visualizzato nella colonna in linea dopo la descrizione <br>4 = visualizza la descrizione dopo la colonna descrizione solo se non vuota
 DisplayOnPdf=Mostra sul PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Il campo è utilizzato per effettuare una ricerca dallo strumento di ricerca rapida? (Esempi: 1 o 0)
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 DictionariesDefDescTooltip=I dizionari forniti dal modulo / applicazione sono definiti nell'array <strong> $this->dictionaries </strong> nel file descrittore del modulo. Puoi modificare manualmente questo file o utilizzare l'editor incorporato. <br> <br> Nota: una volta definiti (e riattivato il modulo), i dizionari sono visibili nell'area di configurazione anche agli utenti amministratori su %s.
 PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
+TriggerDefDesc=Definisci nel file trigger il codice che vuoi eseguire quando viene eseguito un evento aziendale esterno al tuo modulo (eventi attivati da altri moduli).
 SeeIDsInUse=See IDs in use in your installation
 SeeReservedIDsRangeHere=See range of reserved IDs
 ToolkitForDevelopers=Toolkit for Dolibarr developers
@@ -133,9 +133,9 @@ IncludeDocGeneration=Desidero generare alcuni documenti da questo 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
-CSSClass=CSS for edit/create form
-CSSViewClass=CSS for read form
-CSSListClass=CSS for list
+CSSClass=CSS per modificare/creare modulo
+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)
@@ -143,5 +143,5 @@ 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=Import and export profiles
-ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
+ImportExportProfiles=Importa ed esporta profili
+ValidateModBuilderDesc=Metti 1 se questo campo deve essere convalidato con $this->validateField() o 0 se è richiesta la convalida
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 397a585074e..1f6d871c7ac 100644
--- a/htdocs/langs/it_IT/oauth.lang
+++ b/htdocs/langs/it_IT/oauth.lang
@@ -23,10 +23,10 @@ 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 su <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">questa pagina</a> poi su "Credenziali" per creare le credenziali Oauth
+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 su <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">questa pagina</a> poi su "Registra una nuova applicazione" per creare le credenziali Oauth
+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_STRIPE_TEST_NAME=OAuth Stripe Test
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/it_IT/opensurvey.lang b/htdocs/langs/it_IT/opensurvey.lang
index 21b53f5d55e..cd64d801c8a 100644
--- a/htdocs/langs/it_IT/opensurvey.lang
+++ b/htdocs/langs/it_IT/opensurvey.lang
@@ -48,8 +48,8 @@ AddEndHour=Aggiungi un orario di fine
 votes=voti
 NoCommentYet=In questa indagine non è stato ancora inserito alcun commento
 CanComment=I votanti posso aggiungere commenti
-YourVoteIsPrivate=This poll is private, nobody can see your vote.
-YourVoteIsPublic=This poll is public, anybody with the link can see your vote.
+YourVoteIsPrivate=Questo sondaggio è privato, nessuno può vedere il tuo voto.
+YourVoteIsPublic=Questo sondaggio è pubblico, chiunque abbia il collegamento può vedere il tuo voto.
 CanSeeOthersVote=I votanti possono vedere i voti altrui
 SelectDayDesc=Per ogni giorno selezionato, puoi scegliere gli orari di riunione nel formato seguente:<br>- vuoto,<br>-"8h", "8H" o "8:00" per definire un orario di inizio,<br>-"8-11", "8h-11h", "8H-11H" o "8:00-11:00" per definire un lasso di tempo,<br>- "8h15-11h15", "8H15-11H15" o "8:15-11:15" per la stessa cosa, ma con indicazione dei minuti.
 BackToCurrentMonth=Torna al mese in corso
diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
index a1146e1a738..1c204996953 100644
--- a/htdocs/langs/it_IT/orders.lang
+++ b/htdocs/langs/it_IT/orders.lang
@@ -17,8 +17,8 @@ ToOrder=Ordinare
 MakeOrder=Fare ordine
 SupplierOrder=Ordine d'acquisto
 SuppliersOrders=Ordini d'acquisto
-SaleOrderLines=Sales order lines
-PurchaseOrderLines=Puchase order lines
+SaleOrderLines=Righe dell'ordine di vendita
+PurchaseOrderLines=Righe d'ordine d'acquisto
 SuppliersOrdersRunning=Ordini d'acquisto in corso
 CustomerOrder=Sales Order
 CustomersOrders=Ordini Cliente
@@ -124,8 +124,8 @@ SupplierOrderReceivedInDolibarr=Ordine fornitore %s ricevuto %s
 SupplierOrderSubmitedInDolibarr=Ordine di acquisto %s inviato
 SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Altri ordini
-SupplierOrderValidatedAndApproved=Supplier order is validated and approved : %s
-SupplierOrderValidated=Supplier order is validated : %s
+SupplierOrderValidatedAndApproved=L'ordine del fornitore è convalidato e approvato: %s
+SupplierOrderValidated=L'ordine del fornitore è convalidato: %s
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsabile ordini cliente
 TypeContact_commande_internal_SHIPPING=Responsabile spedizioni cliente
@@ -153,7 +153,7 @@ PDFEdisonDescription=Un modello semplice per gli ordini
 PDFProformaDescription=Un modello completo PDF di fattura Proforma
 CreateInvoiceForThisCustomer=Ordini da fatturare
 CreateInvoiceForThisSupplier=Ordini da fatturare
-CreateInvoiceForThisReceptions=Bill receptions
+CreateInvoiceForThisReceptions=Ricevimenti di fatture
 NoOrdersToInvoice=Nessun ordine fatturabile
 CloseProcessedOrdersAutomatically=Classifica come "Lavorati" tutti gli ordini selezionati
 OrderCreation=Creazione di ordine
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index af55a95028f..7daf1c74056 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,7 +103,7 @@ 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)
@@ -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,6 +258,10 @@ PassEncoding=Codifica Password
 PermissionsAdd=Permessi aggiunti
 PermissionsDelete=Permessi rimossi
 YourPasswordMustHaveAtLeastXChars=La tua password deve contenere almeno %scaratteri
+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
@@ -267,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
@@ -293,8 +298,8 @@ 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
diff --git a/htdocs/langs/it_IT/partnership.lang b/htdocs/langs/it_IT/partnership.lang
index 7edb7071ea2..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
-
-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/paybox.lang b/htdocs/langs/it_IT/paybox.lang
index 3f398c374d0..d5b9c8d5e06 100644
--- a/htdocs/langs/it_IT/paybox.lang
+++ b/htdocs/langs/it_IT/paybox.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=Impostazioni modulo Paybox
-PayBoxDesc=Questo modulo offre pagine per consentire il pagamento attraverso <a href="http://www.paybox.com" target="_blank">Paybox</a> da parte dei clienti. Può essere usato per un pagamento qualsiasi o per il pagamento di specifici oggetti Dolibarr (fattura, ordine, ...)
+PayBoxDesc=Questo modulo offre pagine per consentire il pagamento su <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external"> Paybox </a> da parte dei clienti. Questo può essere utilizzato per un pagamento gratuito o per un pagamento su un particolare oggetto Dolibarr (fattura, ordine, ...)
 FollowingUrlAreAvailableToMakePayments=Puoi utilizzare i seguenti indirizzi per permettere ai clienti di effettuare pagamenti su Dolibarr
 PaymentForm=Forma di pagamento
 WelcomeOnPaymentPage=Welcome to our online payment service
@@ -20,7 +20,6 @@ AccountParameter=Dati account
 UsageParameter=Parametri d'uso
 InformationToFindParameters=Aiuto per trovare informazioni sul tuo account %s
 PAYBOX_CGI_URL_V2=URL del modulo CGI di Paybox per il pagamento
-VendorName=Nome del fornitore
 CSSUrlForPaymentForm=URL del foglio di stile CSS per il modulo di pagamento
 NewPayboxPaymentReceived=Nuovo pagamento Paybox ricevuto
 NewPayboxPaymentFailed=Nuovo tentativo di pagamento Paybox ma fallito
diff --git a/htdocs/langs/it_IT/paypal.lang b/htdocs/langs/it_IT/paypal.lang
index 3172ee4264c..001928baab0 100644
--- a/htdocs/langs/it_IT/paypal.lang
+++ b/htdocs/langs/it_IT/paypal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Impostazioni Paypal
-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, ...)
+PaypalDesc=Questo modulo consente il pagamento da parte dei clienti tramite <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPal </a> . Questo può essere utilizzato per un pagamento ad hoc o per un pagamento relativo ad un oggetto Dolibarr (fattura, ordine, ...)
 PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
 PaypalDoPayment=Pay with PayPal
 PAYPAL_API_SANDBOX=Modalità di test/sandbox
diff --git a/htdocs/langs/it_IT/printing.lang b/htdocs/langs/it_IT/printing.lang
index 43c1eb7b184..57e88dbba84 100644
--- a/htdocs/langs/it_IT/printing.lang
+++ b/htdocs/langs/it_IT/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=Stampa con un clic
+Module64000Desc=Abilita il sistema di stampa con un clic
+PrintingSetup=Configurazione del sistema di stampa con un clic
+PrintingDesc=Questo modulo aggiunge un pulsante Stampa a vari moduli per consentire la stampa dei documenti direttamente su una stampante senza la necessità di aprire il documento in un'altra applicazione.
+MenuDirectPrinting=job di stampa con un clic
+DirectPrint=Stampa con un clic
 PrintingDriverDesc=Credenziali per i driver di stampa
 ListDrivers=Lista dei driver
 PrintTestDesc=Lista delle stampanti
diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang
index e4ea4eabcd2..277322df786 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,21 +24,22 @@ 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 add 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
+OutOfOrder=Fuori servizio
+InWorkingOrder=Funzionante
+ToReplace=Sostituire
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index c413ebbd48d..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,13 +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=Attention periods not entered and mandatory
-mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
-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
+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 6868a856c27..7d652db4c4b 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -10,19 +10,19 @@ PrivateProject=Contatti del progetto
 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
@@ -197,6 +197,7 @@ InputPerMonth=Input per mese
 InputDetail=Dettagli di input
 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 +215,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 +260,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,19 +269,21 @@ 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
diff --git a/htdocs/langs/it_IT/propal.lang b/htdocs/langs/it_IT/propal.lang
index dbe50256efe..76d2fa597ad 100644
--- a/htdocs/langs/it_IT/propal.lang
+++ b/htdocs/langs/it_IT/propal.lang
@@ -59,7 +59,7 @@ ConfirmClonePropal=Vuoi davvero clonare il preventivo<b>%s</b>?
 ConfirmReOpenProp=Vuoi davvero riaprire il preventivo <b>%s</b>?
 ProposalsAndProposalsLines=Preventivo e righe
 ProposalLine=Riga di preventivo
-ProposalLines=Proposal lines
+ProposalLines=Linee di proposta
 AvailabilityPeriod=Tempi di consegna
 SetAvailability=Imposta i tempi di consegna
 AfterOrder=dopo ordine
@@ -89,11 +89,11 @@ IdProposal=ID proposta
 IdProduct=ID prodotto
 PrParentLine=Riga genitore proposta
 LineBuyPriceHT=Prezzo di acquisto Importo al netto delle tasse per riga
-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=Accetta proposta
+RefusePropal=Rifiuta la proposta
+Sign=Firma
+PropalAlreadySigned=Proposta già accettata
+PropalAlreadyRefused=Proposta già rifiutata
+PropalSigned=Proposta accettata
+PropalRefused=Proposta rifiutata
+ConfirmRefusePropal=Sei sicuro di voler rifiutare questa proposta commerciale?
diff --git a/htdocs/langs/it_IT/receptions.lang b/htdocs/langs/it_IT/receptions.lang
index 68de00f91ad..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
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Ricezioni per questo ordine
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Annullata
 StatusReceptionDraft=Bozza
-StatusReceptionValidated=Convalidata (prodotti per la spedizione o già spediti)
+StatusReceptionValidated=Convalidato (prodotti da ricevere o già ricevuti)
+StatusReceptionValidatedToReceive=Convalidato (prodotti da ricevere)
+StatusReceptionValidatedReceived=Convalidato (prodotti ricevuti)
 StatusReceptionProcessed=Processato
 StatusReceptionDraftShort=Bozza
 StatusReceptionValidatedShort=Convalidato
@@ -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=Per il momento, la creazione di una nuova ricezione avviene dall'Ordine di Acquisto.
 ReceptionLine=Reception line
 ProductQtyInReceptionAlreadySent=Quantità del prodotto dall'ordine cliente aperto già inviato
 ProductQtyInSuppliersReceptionAlreadyRecevied=Quantità prodotto dall'ordine fornitore aperto già ricevuto
@@ -44,5 +47,8 @@ ValidateOrderFirstBeforeReception=You must first validate the order before being
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=Non ci sono più prodotti predefiniti da spedire
-ReceptionExist=A reception exists
-ByingPrice=Bying price
+ReceptionExist=Esiste un ricevimento
+ByingPrice=Prezzo di vendita
+ReceptionBackToDraftInDolibarr=Ricevimento %s torna alla bozza
+ReceptionClassifyClosedInDolibarr=Ricevimento %s classificato Chiuso
+ReceptionUnClassifyCloseddInDolibarr=Ricevimento %s ri-aperto
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/salaries.lang b/htdocs/langs/it_IT/salaries.lang
index 229cc2a1a40..0610072266c 100644
--- a/htdocs/langs/it_IT/salaries.lang
+++ b/htdocs/langs/it_IT/salaries.lang
@@ -2,25 +2,26 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Piano dei conti usato per utenti di soggetti terzi
 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=Codice contabile predefinito per i pagamenti degli stipendi
-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=Per impostazione predefinita, lascia vuota l'opzione "Crea automaticamente un pagamento totale" quando crei uno stipendio
 Salary=Stipendio
 Salaries=Stipendi
 NewSalary=Nuovo stipendio
-AddSalary=Add salary
+AddSalary=Aggiungi stipendio
 NewSalaryPayment=Nuovo stipendio
 AddSalaryPayment=Aggiungi pagamento stipendio
 SalaryPayment=Pagamento stipendio
 SalariesPayments=Pagamento stipendi
-SalariesPaymentsOf=Salaries payments of %s
+SalariesPaymentsOf=Pagamenti degli stipendi di %s
 ShowSalaryPayment=Mostra i pagamenti stipendio
 THM=€/h
 TJM=€/g
 CurrentSalary=Stipendio attuale
 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
+LastSalaries=Ultimi %s stipendi
+AllSalaries=Tutti gli stipendi
 SalariesStatistics=Statistiche stipendi
 SalariesAndPayments=Stipendi e pagamenti
-ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
-FillFieldFirst=Fill employee field first
+ConfirmDeleteSalaryPayment=Vuoi eliminare questo pagamento di stipendio?
+FillFieldFirst=Compila prima il campo dipendente
+UpdateAmountWithLastSalary=Imposta importo con ultimo stipendio
diff --git a/htdocs/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang
index 096e22b70cc..6936e7989e5 100644
--- a/htdocs/langs/it_IT/sendings.lang
+++ b/htdocs/langs/it_IT/sendings.lang
@@ -43,7 +43,7 @@ ConfirmValidateSending=Sei sicuro di voler convalidare questa spedizioni con il
 ConfirmCancelSending=Sei sicuro di voler eliminar questa spedizione?
 DocumentModelMerou=Merou modello A5
 WarningNoQtyLeftToSend=Attenzione, non sono rimasti prodotti per la spedizione.
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
+StatsOnShipmentsOnlyValidated=Le statistiche sono solo per le spedizioni convalidate. La data utilizzata è la data di convalida della spedizione (la data di consegna pianificata non è sempre nota)
 DateDeliveryPlanned=Data prevista di consegna
 RefDeliveryReceipt=Rif. ricevuta di consegna
 StatusReceipt=Stato ricevuta di consegna
@@ -53,7 +53,7 @@ SendShippingByEMail=Invia spedizione via EMail
 SendShippingRef=Invio della spedizione %s
 ActionsOnShipping=Azioni sulla spedizione
 LinkToTrackYourPackage=Link a monitorare il tuo pacchetto
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
+ShipmentCreationIsDoneFromOrder=Per il momento, la creazione di una nuova spedizione viene eseguita dal record dell'ordine di vendita.
 ShipmentLine=Filiera di spedizione
 ProductQtyInCustomersOrdersRunning=Product quantity into open customer orders
 ProductQtyInSuppliersOrdersRunning=Quantità prodotto inserita in ordini d'acquisto in corso
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 937829f4c2b..4a1c3b32740 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,8 +168,8 @@ 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
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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=Inventari
 NewInventory=Nuovo inventario
 inventorySetup = Inventory Setup
 inventoryCreatePermission=Crea nuovo inventario
@@ -206,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=Q.tà teorica
-TheoricalValue=Q.tà teorica
+TheoricalQty=Quantità teorica
+TheoricalValue=Quantità teorica
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Qtà registrata
@@ -237,30 +238,36 @@ 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=Fill 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=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
-FieldCannotBeNegative=Field "%s" cannot be negative
-ErrorWrongBarcodemode=Unknown Barcode mode
-ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
-ProductBatchDoesNotExist=Product with batch/serial does not exist
-ProductBarcodeDoesNotExist=Product with barcode does not exist
-WarehouseId=Warehouse ID
-WarehouseRef=Warehouse Ref
+ObjectNotFound=%s non trovato
+MakeMovementsAndClose=Genera movimenti e chiudi
+AutofillWithExpected=Sostituisci la quantità reale con la quantità prevista
+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.
+InventoryStartedShort=Iniziata
+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
diff --git a/htdocs/langs/it_IT/stripe.lang b/htdocs/langs/it_IT/stripe.lang
index 63954059a36..de8144f5037 100644
--- a/htdocs/langs/it_IT/stripe.lang
+++ b/htdocs/langs/it_IT/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Impostazione modulo Stripe
-StripeDesc=Offri ai clienti una pagina di pagamento online Stripe per pagamenti con carte di credito / debito tramite <a href="http://www.stripe.com" target="_blank">Stripe</a> . Questo modulo può essere usato per consentire ai tuoi clienti di effettuare pagamenti ad-hoc o per pagamenti relativi a un particolare oggetto Dolibarr (fattura, ordine, ...)
+StripeDesc=Offri ai tuoi clienti una pagina di pagamento online per i pagamenti con carte di credito/debito tramite <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a> . Questo può essere utilizzato per consentire ai tuoi clienti di effettuare pagamenti ad hoc o per pagamenti relativi a un particolare oggetto Dolibarr (fattura, ordine, ...)
 StripeOrCBDoPayment=Paga con carta di credito o Stripe
 FollowingUrlAreAvailableToMakePayments=Puoi utilizzare i seguenti indirizzi per permettere ai clienti di effettuare pagamenti su Dolibarr
 PaymentForm=Forma di pagamento
@@ -28,7 +28,6 @@ AccountParameter=Dati account
 UsageParameter=Parametri d'uso
 InformationToFindParameters=Aiuto per trovare informazioni sul tuo account %s
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Nome del venditore
 CSSUrlForPaymentForm=URL del foglio di stile CSS per il modulo di pagamento
 NewStripePaymentReceived=Nuovo pagamento Stripe ricevuto
 NewStripePaymentFailed=Nuovo pagamento Stripe provato ma non riuscito
diff --git a/htdocs/langs/it_IT/supplier_proposal.lang b/htdocs/langs/it_IT/supplier_proposal.lang
index 6ef46f45959..8e14295043f 100644
--- a/htdocs/langs/it_IT/supplier_proposal.lang
+++ b/htdocs/langs/it_IT/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Area quotazioni fornitori
 SupplierProposalShort=Proposta fornitore
 SupplierProposals=Proposte fornitore
 SupplierProposalsShort=Proposte fornitore
+AskPrice=Richiesta quotazione
 NewAskPrice=Nuova richiesta quotazione
 ShowSupplierProposal=Mostra le richieste di quotazione
 AddSupplierProposal=Inserisci richiesta di quotazione
@@ -52,3 +53,6 @@ SupplierProposalsToClose=Proposte fornitore da chiudere
 SupplierProposalsToProcess=Proposte fornitore da elaborare
 LastSupplierProposals=Ultime %s richieste di quotazione
 AllPriceRequests=Tutte le richieste
+TypeContact_supplier_proposal_external_SHIPPING=Contatto del fornitore per la consegna
+TypeContact_supplier_proposal_external_BILLING=Contatto del fornitore per la fatturazione
+TypeContact_supplier_proposal_external_SERVICE=Responsabile del preventivo
diff --git a/htdocs/langs/it_IT/ticket.lang b/htdocs/langs/it_IT/ticket.lang
index d71c6aefebc..c49e994ca10 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
@@ -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,10 @@ 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.
 #
 # Index & list page
 #
@@ -164,7 +164,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 +188,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
@@ -217,7 +217,7 @@ TicketMessageHelp=Only this text will be saved in the message list on ticket car
 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?
@@ -311,14 +311,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/trips.lang b/htdocs/langs/it_IT/trips.lang
index 3480571edd9..93c1bbfee3f 100644
--- a/htdocs/langs/it_IT/trips.lang
+++ b/htdocs/langs/it_IT/trips.lang
@@ -33,7 +33,7 @@ ExpenseReportCanceledMessage=La nota spese %s è stata eliminata.<br> - Utente:
 ExpenseReportPaid=Una nota spese è stata pagata
 ExpenseReportPaidMessage=La nota spese %s è stata rimborsata.<br> - Utente: %s<br> - Pagata da: %s<br>Clicca qui per visualizzare la nota spese: %s
 TripId=ID nota spese
-AnyOtherInThisListCanValidate=Person to be informed for validating the request.
+AnyOtherInThisListCanValidate=Persona da informare per la convalida della richiesta.
 TripSociete=Informazioni azienda
 TripNDF=Informazioni nota spese
 PDFStandardExpenseReports=Template standard per la generazione dei PDF delle not spese
@@ -112,7 +112,7 @@ ConfirmCloneExpenseReport=Vuoi davvero clonare questa nota spese?
 ExpenseReportsIk=Configurazione del rimborso chilometrico
 ExpenseReportsRules=Regole note spese
 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
+ExpenseReportRulesDesc=È possibile definire regole di importo massimo per le note spese. Queste regole verranno applicate quando una nuova spesa viene aggiunta a una nota spese
 expenseReportOffset=Scostamento
 expenseReportCoef=Coefficient
 expenseReportTotalForFive=Example with <u>d</u> = 5
@@ -127,19 +127,19 @@ ExpenseReportDomain=Domain to apply
 ExpenseReportLimitOn=Limit on
 ExpenseReportDateStart=Data inizio
 ExpenseReportDateEnd=Data fine
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
+ExpenseReportLimitAmount=Importo massimo
+ExpenseReportRestrictive=Superamento vietato
 AllExpenseReport=All type of expense report
 OnExpense=Expense line
 ExpenseReportRuleSave=Regola note spese salvata
 ExpenseReportRuleErrorOnSave=Error: %s
 RangeNum=Raggio %d
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
+ExpenseReportConstraintViolationError=Importo massimo superato (regola %s): %s è maggiore di %s (Superamento vietato)
 byEX_DAY=per giorno (limitato a %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)
+ExpenseReportConstraintViolationWarning=Importo massimo superato (regola %s): %s è maggiore di %s (Superamento autorizzato)
 nolimitbyEX_DAY=per giorno (illimitato)
 nolimitbyEX_MON=by month (no limitation)
 nolimitbyEX_YEA=by year (no limitation)
diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang
index b07ecf82da8..c836df7bd03 100644
--- a/htdocs/langs/it_IT/users.lang
+++ b/htdocs/langs/it_IT/users.lang
@@ -62,8 +62,8 @@ ListOfUsersInGroup=Elenco utenti in questo gruppo
 ListOfGroupsForUser=Elenco gruppi per questo utente
 LinkToCompanyContact=Link al contatto del soggetto terzo
 LinkedToDolibarrMember=Link al membro
-LinkedToDolibarrUser=Link to user
-LinkedToDolibarrThirdParty=Link to third party
+LinkedToDolibarrUser=Collegamento all'utente
+LinkedToDolibarrThirdParty=Collegamento a terze parti
 CreateDolibarrLogin=Crea accesso a Dolibarr
 CreateDolibarrThirdParty=Crea soggetto terzo
 LoginAccountDisableInDolibarr=Account disattivato in Dolibarr
@@ -73,7 +73,7 @@ ExportDataset_user_1=Utenti e dettagli
 DomainUser=Utente di dominio %s
 Reactivate=Riattiva
 CreateInternalUserDesc=Questo modulo permette di creare un utente interno per la vostra Azienda/Fondazione. Per creare un utente esterno (cliente, fornitore, ...), utilizzare il pulsante "Crea utente" nella scheda soggetti terzi.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
+InternalExternalDesc=Un utente <b> interno </b> è un utente che fa parte della tua azienda/organizzazione o è un utente partner esterno alla tua organizzazione che potrebbe aver bisogno di vedere più dati rispetto ai dati relativi alla sua azienda (il sistema di autorizzazione definirà cosa può o può vedere o fare). <br> Un utente <b> esterno </b> è un cliente, venditore o altro che deve visualizzare SOLO dati relativi a se stesso (La creazione di un utente esterno per conto terzi può essere effettuata dal record contatti del terzo). <br> <br> In entrambi i casi, è necessario concedere i permessi sulle funzionalità di cui l'utente ha bisogno.
 PermissionInheritedFromAGroup=Autorizzazioni ereditate dall'appartenenza al gruppo.
 Inherited=Ereditato
 UserWillBe=L'utente creato sarà
@@ -97,8 +97,8 @@ LoginToCreate=Accedi per creare
 NameToCreate=Nome del soggetto terzo da creare
 YourRole=Il tuo ruolo
 YourQuotaOfUsersIsReached=Hai raggiunto la tua quota di utenti attivi!
-NbOfUsers=Number of users
-NbOfPermissions=Number of permissions
+NbOfUsers=numero di utenti
+NbOfPermissions=Numero di autorizzazioni
 DontDowngradeSuperAdmin=Solo un superadmin può declassare un superadmin
 HierarchicalResponsible=Supervisore
 HierarchicView=Vista gerarchica
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index edf226d0df8..df1c3006d7a 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Aggiungi sito web
 Webpage=Web page/container
 AddPage=Aggiungi pagina/contenitore
 PageContainer=Pagina
-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=L'anteprima del tuo sito web <strong> %s </strong> non è ancora disponibile. Devi prima ' <strong> Importa un modello di sito web completo </strong> ' o semplicemente ' <strong> Aggiungi una pagina/contenitore </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
@@ -45,7 +45,7 @@ ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost= <u> Usa con Apache / NGinx / ... </u> <br> Crea sul tuo server web (Apache, Nginx, ...) un host virtuale dedicato con PHP abilitato e una directory principale su <br><strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=Esempio da utilizzare nella configurazione dell'host virtuale Apache:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+YouCanAlsoDeployToAnotherWHP= <u> Esegui il tuo sito web con un altro provider di hosting Dolibarr </u> <br> Se non hai un server web come Apache o NGinx disponibile su Internet, puoi esportare e importare il tuo sito web su un'altra istanza Dolibarr fornita da un altro provider di hosting Dolibarr che fornisce integrazione con il modulo Sito web. Puoi trovare un elenco di alcuni provider di hosting Dolibarr su <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a>
 CheckVirtualHostPerms=Controlla anche che l'utente dell'host virtuale (ad esempio www-data) abbia <strong> %s </strong> le autorizzazioni sui file in <br> <strong> %s
 ReadPerm=Da leggere
 WritePerm=Write
@@ -60,7 +60,7 @@ YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" bu
 YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> Puoi includere codice PHP in questa sorgente utilizzando i tag <strong> &lt;?php ?&gt; </strong>. Sono disponibili le seguenti variabili globali: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs. <br> <br> <span class="fa fa-bug"> </span> Puoi anche includere il contenuto di un'altra Pagina / Contenitore con la seguente sintassi: <br> <strong> &lt;?php includeContainer('alias_of_container_to_include'); ?&gt; </strong> <br> <br> <span class="fa fa-bug"> </span> È possibile effettuare un redirect ad un'altra pagina / contenitore con la seguente sintassi (Nota: non emettono alcun contenuto prima di un reindirizzamento): <br> <strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt; </strong> <br> <br> <span class="fa fa-link"> </span> Per aggiungere un collegamento a un'altra pagina, utilizzare la sintassi: <br> <strong> &lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt; </strong> <br> <br> <span class="fa fa-download"> </span> Per inserire un <strong> link per il download  </strong> un file memorizzato nella cartella <strong>documenti </strong> , utilizzare il <strong> document.php </strong> wrapper: <br> esempio, per un file in documenti / ECM (necessità di effettuare il login), la sintassi è: <br> <strong> &lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt; </strong><br> Per un file in documents / medias (directory aperta per accesso pubblico), la sintassi è: <br> <strong> &lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt; </strong> <br> Per un file condiviso con un collegamento di condivisione (accesso aperto utilizzando la chiave hash di condivisione del file), la sintassi è:  <br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong> <br><br> <span class="fa fa-picture-o"> </span> per includere un<strong> immagine </strong> immagazzinata nella cartella  <strong>documenti </strong>, utilizzare la <strong> viewimage.php </strong> wrapper:  <br>Esempio, per un'immagine in documents/medias (cartella aperta per l'accesso pubblico), la sintassi è: <br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource2=Per un'immagine condivisa con un link di condivisione (accesso aperto utilizzando la chiave hash di condivisione del file), la sintassi è: <br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore= <br> Altri esempi di codice HTML o dinamico disponibili su <a href="%s" target="_blank"> la documentazione wiki </a> <br>.
+YouCanEditHtmlSourceMore= <br> Altri esempi di codice HTML o dinamico disponibili su <a href="%s" target="_blank" rel="noopener noreferrer external"> la documentazione wiki </a> <br> .
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -137,11 +137,11 @@ PagesRegenerated=%s pagina(e)/contenitore(i) rigenerato
 RegenerateWebsiteContent=Rigenera i file della cache del sito web
 AllowedInFrames=Consentito nel frame
 DefineListOfAltLanguagesInWebsiteProperties=Definisce l'elenco di tutte le lingue disponibili nelle proprietà del sito web.
-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
+GenerateSitemaps=Genera file sitemap del sito web
+ConfirmGenerateSitemaps=Se confermi, cancellerai il file sitemap esistente...
+ConfirmSitemapsCreation=Conferma la generazione del sitemap
+SitemapGenerated=File sitemap <b> %s </b> generato
 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 deve essere png
+ErrorFaviconSize=La favicon deve essere di dimensioni 16x16, 32x32 o 64x64
+FaviconTooltip=Carica un'immagine che deve essere un png (16x16, 32x32 o 64x64)
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
index e188ee9b039..9792251ccbe 100644
--- a/htdocs/langs/it_IT/withdrawals.lang
+++ b/htdocs/langs/it_IT/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Ordine di trasferimento del credito
 LatestBankTransferReceipts=Ultimi %s ordini di bonifico 
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLine=Riga ordine di addebito diretto
+CreditTransfer=Bonifico bancario
 CreditTransferLine=Linea di trasferimento del credito
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Linee di trasferimento del credito
@@ -42,11 +43,12 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Effettua una richiesta di addebito diretto
 MakeBankTransferOrder=Invia una richiesta di bonifico
 WithdrawRequestsDone=%s direct debit payment requests recorded
-BankTransferRequestsDone=%s credit transfer requests recorded
+BankTransferRequestsDone=%s richieste di bonifico registrate
 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=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
+WithdrawalCantBeCreditedTwice=Questa ricevuta di prelievo è già contrassegnata come accreditata; questa operazione non può essere eseguita due volte, poiché ciò potrebbe creare pagamenti e movimenti bancari duplicati.
 ClassCredited=Classifica come accreditata
+ClassDebited=Classifica addebito
 ClassCreditedConfirm=Vuoi davvero classificare questa ricevuta di domiciliazione come accreditata sul vostro conto bancario?
 TransData=Data di trasmissione
 TransMetod=Metodo di trasmissione
@@ -65,7 +67,7 @@ InvoiceRefused=Fattura rifiutata (Addebitare il costo al cliente)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=In attesa
 StatusTrans=Trasmesso
-StatusDebited=Debited
+StatusDebited=addebitato
 StatusCredited=Accreditato
 StatusPaid=Pagata
 StatusRefused=Rifiutato
@@ -80,14 +82,14 @@ StatusMotif7=Decisione giudiziaria
 StatusMotif8=Altri motivi
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
+CreateAll=Create direct debit file
+CreateFileForPaymentByBankTransfer=Crea file per bonifico
 CreateSepaFileForPaymentByBankTransfer=Crea file di bonifico (SEPA)
 CreateGuichet=Solo ufficio
 CreateBanque=Solo banca
 OrderWaiting=In attesa di esecuzione
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=Trasmissione file di registrazione dell'ordine
+NotifyCredit=Registra credito d'ordine
 NumeroNationalEmetter=Numero nazionale dell'inviante
 WithBankUsingRIB=Per i conti correnti bancari che utilizzano RIB
 WithBankUsingBANBIC=Per conti bancari che utilizzano IBAN/BIC/SWIFT
@@ -115,7 +117,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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -133,7 +135,7 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier - ICS
+ICS=Identificatore del creditore - ICS
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -147,6 +149,8 @@ InfoTransData=Importo: %s <br> Metodo: %s <br> Data: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Non è stata impostata la modalità reale, ci fermiamo dopo questa simulazione
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
-ErrorICSmissing=Missing ICS in Bank account %s
-TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
+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=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
diff --git a/htdocs/langs/it_IT/workflow.lang b/htdocs/langs/it_IT/workflow.lang
index 544aee9284a..03a0abc7627 100644
--- a/htdocs/langs/it_IT/workflow.lang
+++ b/htdocs/langs/it_IT/workflow.lang
@@ -13,14 +13,18 @@ descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classifica "fatturate" le proposte c
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifica "fatturato" gli ordini cliente collegati quando la fattura cliente è validata (e se l'importo della fattura è uguale all'importo totale di ordini collegati)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifica "da fatturare" gli ordini cliente collegati quando la fattura cliente è impostata su pagamento (e se l'importo della fattura è uguale all'importo totale di ordini collegati)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifica "da spedire" l'ordine cliente collegato quando una spedizione viene convalidata (e se la quantità spedita da tutte le spedizioni è la stessa dell'ordine da aggiornare)
-descWORKFLOW_ORDER_CLASSIFY_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 order
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classificare l'ordine cliente di origine collegato come spedito quando una spedizione viene chiusa (e se la quantità spedita da tutte le spedizioni è la stessa dell'ordine da aggiornare)
+# Autoclassify purchase proposal
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+# Autoclassify purchase order
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classificare l'ordine di acquisto di origine collegato come ricevuto quando viene convalidato un ricevimento (e se la quantità ricevuta da tutti i ricevimenti è la stessa dell'ordine di acquisto da aggiornare)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classificare l'ordine di acquisto di origine collegata come ricevuto alla chiusura di un ricevimento (e se la quantità ricevuta da tutti i ricevimenti è la stessa dell'ordine di acquisto da aggiornare)
+# Autoclassify purchase invoice
 descWORKFLOW_BILL_ON_RECEPTION=Classificare le ricezioni in "fatturate" quando un ordine fornitore collegato viene convalidato
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Chiudi tutti gli interventi legati al ticket quando un ticket è chiuso
 AutomaticCreation=Creazione automatica
 AutomaticClassification=Classificazione automatica
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classificare la spedizione di origine collegata come chiusa quando la fattura del cliente viene convalidata
diff --git a/htdocs/langs/it_IT/zapier.lang b/htdocs/langs/it_IT/zapier.lang
index 93f50b1fd94..d44a6c272e1 100644
--- a/htdocs/langs/it_IT/zapier.lang
+++ b/htdocs/langs/it_IT/zapier.lang
@@ -17,5 +17,5 @@ ModuleZapierForDolibarrName = Zapier per Dolibarr
 ModuleZapierForDolibarrDesc = Zapier per modulo Dolibarr
 ZapierForDolibarrSetup=Installazione di Zapier per Dolibarr
 ZapierDescription=Interfaccia con 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>.
+ZapierAbout=Informazioni sul modulo Zapier
+ZapierSetupPage=Non è necessaria una configurazione sul lato Dolibarr per utilizzare Zapier. Tuttavia, è necessario generare e pubblicare un pacchetto su zapier per poter utilizzare Zapier con Dolibarr. Vedere la documentazione su <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> questa pagina wiki </a> .
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 95fbb632e0e..28d5b7f9cc6 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=EECにない国
 CountriesInEECExceptMe=%sを除くEECの国
 CountriesExceptMe=%sを除くすべての国
 AccountantFiles=ソースドキュメントのエクスポート
-ExportAccountingSourceDocHelp=このツールを使用すると、会計の生成に使用されたソースイベント(CSVおよびPDFのリスト)をエクスポートできる。
+ExportAccountingSourceDocHelp=このツールで、会計処理を生成するために使用されるソースイベント（CSVおよびPDFのリスト）をエクスポートできる。
 ExportAccountingSourceDocHelp2=ジャーナルをエクスポートするには、メニューエントリ%s --%sを使用。
 VueByAccountAccounting=会計科目順に表示
 VueBySubAccountAccounting=アカウンティングサブアカウントで表示
@@ -83,7 +83,7 @@ AccountancyAreaDescProd=ステップ%s：製品/サービスの会計科目を
 
 AccountancyAreaDescBind=ステップ%s：既存の%s行と会計科目の間の紐付けが完了していることを確認する。これにより、アプリケーションはワンクリックで元帳のトランザクションを仕訳できるようになる。不足している紐付を完了する。これには、メニューエントリ%sを使用する。
 AccountancyAreaDescWriteRecords=ステップ%s：元帳にトランザクションを書き込む。これを行うには、メニュー<strong> %s </strong>に移動し、ボタン<strong>%s</strong>をクリックする。
-AccountancyAreaDescAnalyze=ステップ%s：既存のトランザクションを追加または編集し、レポートとエクスポートを生成する。
+AccountancyAreaDescAnalyze=ステップ%s：既存のトランザクションを追加または編集し、報告書sとエクスポートを生成する。
 
 AccountancyAreaDescClosePeriod=ステップ%s：期間を閉じて、将来変更できないようにする。
 
@@ -126,11 +126,11 @@ BookkeepingSubAccount=補助元帳
 AccountBalance=勘定残高
 ObjectsRef=ソースオブジェクト参照
 CAHTF=税引前の合計購入ベンダー
-TotalExpenseReport=総経費レポート
+TotalExpenseReport=総経費報告書
 InvoiceLines=紐付けする請求書の行
 InvoiceLinesDone=請求書の境界線
-ExpenseReportLines=紐付けする経費報告書の行
-ExpenseReportLinesDone=経費報告書の境界線
+ExpenseReportLines=紐付けする経費報告書sの行
+ExpenseReportLinesDone=経費報告書sの境界線
 IntoAccount=会計科目との紐付け行
 TotalForAccount=総会計勘定
 
@@ -213,7 +213,7 @@ TransactionNumShort=数トランザクション
 AccountingCategory=カスタムグループ
 GroupByAccountAccounting=総勘定元帳勘定によるグループ化
 GroupBySubAccountAccounting=補助元帳アカウントでグループ化
-AccountingAccountGroupsDesc=ここで、会計科目のいくつかのグループを定義できる。それらは、パーソナライズされた会計レポートに使用される。
+AccountingAccountGroupsDesc=ここで、会計科目のいくつかのグループを定義できる。それらは、パーソナライズされた会計報告書sに使用される。
 ByAccounts=科目別
 ByPredefinedAccountGroups=事前定義されたグループによる
 ByPersonalizedAccountGroups=パーソナライズされたグループによる
@@ -257,7 +257,7 @@ HideOpeningBalance=期首残高を非表示にする
 ShowSubtotalByGroup=レベルごとに小計を表示
 
 Pcgtype=勘定科目のグループ
-PcgtypeDesc=科目のグループは、一部のアカウンティングレポートの事前定義された「フィルタ」および「グループ化」基準として使用される。たとえば、「INCOME」または「EXPENSE」は、費用/収入レポートを作成するための製品の会計科目のグループとして使用される。
+PcgtypeDesc=科目のグループは、一部のアカウンティング報告書sの事前定義された「フィルタ」および「グループ化」基準として使用される。たとえば、「INCOME」または「EXPENSE」は、費用/収入報告書sを作成するための製品の会計科目のグループとして使用される。
 
 Reconcilable=調整可能
 
@@ -272,10 +272,10 @@ ChangeAccount=選択したラインの製品/サービス会計科目を次の
 Vide=-
 DescVentilSupplier=製品会計科目にバインドされている、またはまだバインドされていない仕入先請求書明細のリストをここで参照すること(会計でまだ転送されていないレコードのみが表示される)
 DescVentilDoneSupplier=ベンダーの請求書の行とその会計科目のリストをここで参照すること
-DescVentilTodoExpenseReport=まだ料金会計科目に紐付けされていない経費レポート行を紐付けする
+DescVentilTodoExpenseReport=まだ料金会計科目に紐付けされていない経費報告書行を紐付けする
 DescVentilExpenseReport=手数料会計科目にバインドされている(またはバインドされていない)経費報告行のリストをここで参照すること
 DescVentilExpenseReportMore=経費報告行の種別で会計科目を設定すると、アプリケーションは、ボタン<strong> "%s" </strong>をワンクリックするだけで、経費報告行と勘定科目表の会計科目の間のすべての紐付けを行うことができる。科目が料金辞書に設定されていない場合、または科目に紐付けされていない行がまだある場合は、メニュー「<strong>%s</strong>」から手動で紐付けする必要がある。
-DescVentilDoneExpenseReport=経費報告書の行とその手数料会計科目のリストをここで参照すること
+DescVentilDoneExpenseReport=経費報告書sの行とその手数料会計科目のリストをここで参照すること
 
 Closure=年次閉鎖
 DescClosure=検証されていない月ごとの動きの数とすでに開いている会計年度をここで参照すること
@@ -286,7 +286,7 @@ ValidateMovements=動きを検証する
 DescValidateMovements=書き込み、レタリング、削除の変更または削除は禁止される。演習のすべてのエントリを検証する必要がある。検証しないと、閉じることができない。
 
 ValidateHistory=自動的に紐付け
-AutomaticBindingDone=自動紐付けが行われた
+AutomaticBindingDone=自動バインドが実行された（%s）-一部のレコードでは自動バインド不可（%s）
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=動きのバランスが正しくない。借方= %s |クレジット= %s
@@ -326,7 +326,7 @@ NumberOfAccountancyEntries=エントリー数
 NumberOfAccountancyMovements=楽章の数
 ACCOUNTING_DISABLE_BINDING_ON_SALES=販売の会計における紐付け力と移転を無効にする(顧客の請求書は会計に考慮されない)
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=購入時の会計における紐付け力と移転を無効にする(ベンダーの請求書は会計で考慮されない)
-ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=経費報告書の会計における紐付け力と移転を無効にする(経費報告書は会計で考慮されない)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=経費報告書sの会計における紐付け力と移転を無効にする(経費報告書sは会計で考慮されない)
 
 ## Export
 NotifiedExportDate=エクスポートされた行にエクスポート済みのフラグを付ける（行の変更はできない）
@@ -385,9 +385,10 @@ AccountRemovedFromGroup=科目がグループから削除された
 SaleLocal=ローカルセール
 SaleExport=エクスポート販売
 SaleEEC=EECでの販売
-SaleEECWithVAT=VATがnullではないEECでの販売。したがって、これは共同体内販売ではなく、提案された科目は標準の製品科目であると想定する。
+SaleEECWithVAT=VATがnullではないEECでの販売。したがって、これは域内販売ではなく、提案された科目は標準の製品科目であると想定する。
 SaleEECWithoutVATNumber=VATなしのEECでの販売 が、取引先のVATIDは定義されていない。標準販売の製品科目にフォールバックする。必要に応じて、取引先または製品科目のVATIDを修正できる。
-
+ForbiddenTransactionAlreadyExported=禁止：トランザクションが検証済 かつ/または エクスポート済。
+ForbiddenTransactionAlreadyValidated=禁止：トランザクションは検証済。
 ## Dictionary
 Range=会計科目の範囲
 Calculated=計算済
@@ -404,6 +405,7 @@ NoJournalDefined=仕訳帳が定義されていない
 Binded=境界線
 ToBind=紐付けする行
 UseMenuToSetBindindManualy=まだ紐付けされていない行。メニュー<a href="%s">%s </a>を使用して、手動で紐付けする。
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=御免、このモジュールはシチュエーションインボイスの実験的機能と互換性がない
 
 ## Import
 ImportAccountingEntries=会計仕訳
@@ -428,7 +430,7 @@ FECFormatMulticurrencyAmount=多通貨額 (Montantdevise)
 FECFormatMulticurrencyCode=他通貨 コード (Idevise)
 
 DateExport=日付のエクスポート
-WarningReportNotReliable=警告、このレポートは元帳に基づいていないため、元帳で手動で変更されたトランザクションは含まれていない。仕訳帳化が最新の場合、簿記ビューはより正確。
+WarningReportNotReliable=警告、この報告書は元帳に基づいていないため、元帳で手動で変更されたトランザクションは含まれていない。仕訳帳化が最新の場合、簿記ビューはより正確。
 ExpenseReportJournal=経費報告仕訳帳
 InventoryJournal=目録日記帳
 
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 9d32e981722..11803c0dc1a 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=財団
 Version=バージョン
 Publisher=出版社
@@ -93,7 +95,7 @@ ShowHideDetails=詳細を 表示-非表示
 PreviewNotAvailable=プレビューは利用不可
 ThemeCurrentlyActive=現在有効なテーマ
 MySQLTimeZone=MySql(データベース)のタイムゾーン
-TZHasNoEffect=日付は、送信された文字列として保持されているかのように、データベースサーバーによって保存され返される。タイムゾーンは、UNIX_TIMESTAMP関数を使用する場合にのみ有効 (Dolibarrでは不使用を推奨し、そうすると、データ入力後に変更があったとしても、データベースTZの影響を受けなくなる ) 。
+TZHasNoEffect=日付は、提出された文字列として保持されているかのように、データベースサーバーによって保存され返される。タイムゾーンは、UNIX_TIMESTAMP関数を使用する場合にのみ有効 (Dolibarrでは不使用を推奨し、そうすると、データ入力後に変更があったとしても、データベースTZの影響を受けなくなる ) 。
 Space=スペース
 Table=テーブル
 Fields=フィールド
@@ -265,8 +267,8 @@ OtherResources=その他のリソース
 ExternalResources=外部リソース
 SocialNetworks=ソーシャルネットワーク
 SocialNetworkId=ソーシャルネットワークID
-ForDocumentationSeeWiki=ユーザまたは開発者のドキュメント ( DOC、よくある質問 ( FAQ ) ... ) のために、 <br> Dolibarr Wikiで見てみましょう。 <br> <a href="%s" target="_blank"><b>%s</b></a>
-ForAnswersSeeForum=他の質問/ヘルプについては、Dolibarrフォーラムを使用することができる。 <br> <a href="%s" target="_blank"><b>%s</b></a>
+ForDocumentationSeeWiki=ユーザまたは開発者向けのドキュメント (Doc, FAQs...) については、<br>DolibarrWikiを参照:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
+ForAnswersSeeForum=その他の質問/ヘルプについては、Dolibarrフォーラムを使用できる：<br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
 HelpCenterDesc1=Dolibarrのヘルプとサポートを受けるためのリソースをいくつか紹介する。
 HelpCenterDesc2=これらのリソースの一部は、<b>英語</b>でのみ利用できる。
 CurrentMenuHandler=現在のメニューハンドラ
@@ -315,8 +317,8 @@ UserEmail=ユーザのメール
 CompanyEmail=法人のメール
 FeatureNotAvailableOnLinux=システムと同様にUnix上では使用できないが備わっている。ローカルでsendmailプログラムをテストする。
 FixOnTransifex=プロジェクトのオンライン翻訳プラットフォームで翻訳を修正する
-SubmitTranslation=この言語の翻訳が完了していないか、エラーが見つかった場合は、ディレクトリ<b> langs/%s </b>のファイルを編集して、変更をwww.transifex.com/dolibarr-association/dolibarr/ に送信して修正できる。
-SubmitTranslationENUS=この言語の翻訳が完了していないか、エラーが見つかった場合は、ファイルをディレクトリ<b> langs/%s </b>に編集し、変更されたファイルをdolibarr.org/forumに送信するか、開発者の場合は github.com/Dolibarr/dolibarr のPRを使用して修正できる。
+SubmitTranslation=この言語の翻訳が完了していないか、エラーが見つかった場合は、ディレクトリ<b> langs/%s </b>のファイルを編集して、変更をwww.transifex.com/dolibarr-association/dolibarr/ に提出して修正できる。
+SubmitTranslationENUS=この言語の翻訳が完了していないか、エラーが見つかった場合は、ファイルをディレクトリ<b> langs/%s </b>に編集し、変更されたファイルをdolibarr.org/forumに提出するか、開発者の場合は github.com/Dolibarr/dolibarr のPRを使用して修正できる。
 ModuleSetup=モジュールの設定
 ModulesSetup=モジュール/アプリケーションの設定
 ModuleFamilyBase=システム
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=最新の安定バージョン
 LastActivationDate=最新のアクティベーション日
 LastActivationAuthor=最新のアクティベーション作成者
 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>
@@ -372,7 +375,7 @@ DoTestSendHTML=HTMLを送信するテスト
 ErrorCantUseRazIfNoYearInMask=エラー。シーケンス{yy}または{yyyy}がマスクされていない場合、オプション@を使用して毎年カウンターをリセットすることはできない。
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=エラー、シーケンス場合は、@オプションを使用することはできない{YY} {ミリメートル}または{探す} {mmは}マスクではない。
 UMask=のUnix / Linux / BSDのファイルシステム上に新規ファイルのumaskパラメータ。
-UMaskExplanation=このパラメータは、 ( たとえば、アップロード中に ) 、サーバー上でDolibarrによって作成されたファイルは、デフォルトで設定されているアクセス許可を定義することができる。 <br>それは、8進値 ( 例えば、0666が意味するのは全員に対して読取および書込 ) である必要がある。 <br>このパラメータは、Windowsサーバー上では役に立ちません。
+UMaskExplanation=このパラメータは、 ( たとえば、アップロード中に ) 、サーバー上でDolibarrによって作成されたファイルは、デフォルトで設定されているアクセス許可を定義することができる。 <br>それは、8進値 ( 例えば、0666が意味するのは全員に対して読取および書込 ) である必要がある。 <br>このパラメータは、Windowsサーバー上では役に立たない。
 SeeWikiForAllTeam=寄稿者とその組織のリストについては、Wikiページをご覧ください。
 UseACacheDelay= 秒単位でをエクスポート応答をキャッシュするための遅延 ( 0またはキャッシュなしの空の ) 
 DisableLinkToHelpCenter=ログインページのリンク「<b>ヘルプまたはサポートが必要</b>」を非表示にする
@@ -408,7 +411,7 @@ PDFAddressForging=アドレスセクションのルール
 HideAnyVATInformationOnPDF=消費税/ VATに関連するすべての情報を非表示にする
 PDFRulesForSalesTax=消費税/ VATのルール
 PDFLocaltax=%sのルール
-HideLocalTaxOnPDF=列SaleTax / VATで%sレートを非表示にする
+HideLocalTaxOnPDF=消費税 / VATの列で%sレートを非表示
 HideDescOnPDF=製品説明を非表示にする
 HideRefOnPDF=製品のコードを非表示にする
 HideDetailsOnPDF=製品ラインの詳細を非表示
@@ -485,7 +488,7 @@ NoDetails=フッターに追加の詳細はない
 DisplayCompanyInfo=法人の住所を表示する
 DisplayCompanyManagers=ディスプレイマネージャー名
 DisplayCompanyInfoAndManagers=法人の住所とマネージャーの名前を表示する
-EnableAndSetupModuleCron=この定期的な請求書を自動的に生成する場合は、モジュール* %s *を有効にして、正しく設定する必要がある。それ以外の場合、請求書の生成は、【作成】ボタンを使用してこのテンプレートから手動で行う必要がある。自動生成を有効にしても、手動生成を安全に起動できることに注意すること。同じ期間の重複を生成することはできない。
+EnableAndSetupModuleCron=この定期的な請求書を自動的に生成する場合は、モジュール * %s * を有効にして、正しく設定する必要がある。それ以外の場合、請求書の生成は、【作成】ボタンを使用してこのテンプレートから手動で行う必要がある。自動生成を有効にしても、手動生成を安全に起動できることに注意すること。同じ期間の重複を生成することはできない。
 ModuleCompanyCodeCustomerAquarium=%sの後に、顧客会計コードの顧客コードが続く
 ModuleCompanyCodeSupplierAquarium=%sの後に、仕入先会計コードの仕入先コードが続く
 ModuleCompanyCodePanicum=空の会計コードを返する。
@@ -516,8 +519,8 @@ GoIntoTranslationMenuToChangeThis=このコードのキーの翻訳が見つか
 WarningSettingSortOrder=警告、デフォルトのソート順を設定すると、フィールドが不明なフィールドの場合、リストページに移動するときに技術エラーが発生する可能性がある。このようなエラーが発生した場合は、このページに戻ってデフォルトの並べ替え順序を削除し、デフォルトの動作を復元すること。
 Field=フィールド
 ProductDocumentTemplates=製品ドキュメントを生成するためのドキュメントテンプレート
-FreeLegalTextOnExpenseReports=経費報告書に関する無料の法的テキスト
-WatermarkOnDraftExpenseReports=ドラフト経費報告書の透かし
+FreeLegalTextOnExpenseReports=経費報告書sに関する無料の法的テキスト
+WatermarkOnDraftExpenseReports=ドラフト経費報告書sの透かし
 ProjectIsRequiredOnExpenseReports=プロジェクトは経費報告書を入力するために必須
 PrefillExpenseReportDatesWithCurrentMonth=新規経費報告書の開始日と終了日を当月の開始日と終了日で事前に入力する
 ForceExpenseReportsLineAmountsIncludingTaxesOnly=経費報告書の金額を常に税金と同じ金額で入力するように強制する
@@ -540,7 +543,7 @@ Module1Desc=企業と連絡先の管理 ( 顧客、見込み客... )
 Module2Name=コマーシャル
 Module2Desc=商業管理
 Module10Name=会計 ( 簡略化 ) 
-Module10Desc=データベースの内容に基づく単純な会計レポート ( ジャーナル、売上高 ) 。元帳テーブルを使用しません。
+Module10Desc=データベースの内容に基づく単純な会計報告書s ( ジャーナル、売上高 ) 。元帳テーブルを使用しません。
 Module20Name=提案
 Module20Desc=商業的な提案の管理
 Module22Name=大量の電子メール
@@ -609,8 +612,8 @@ Module400Name=プロジェクトまたは引合
 Module400Desc=プロジェクト、引合/商談 および/または タスクの管理。また、任意の要素 ( 請求、注文、提案、出張など ) をプロジェクトに割り当て、プロジェクトビューから横断ビューを取得することもできる。
 Module410Name=のwebcalendar
 Module410Desc=のwebcalendar統合
-Module500Name=税金と特別経費
-Module500Desc=その他の費用の管理（消費税、社会的または財政的税、配当、...）
+Module500Name=租税および特別経費
+Module500Desc=その他の費用の管理（消費税、社会税または財政税、配当、...）
 Module510Name=給与
 Module510Desc=従業員の支払いを記録および追跡する
 Module520Name=ローン
@@ -622,8 +625,8 @@ Module610Name=製品バリエーション
 Module610Desc=製品バリエーションの作成 ( 色、サイズなど ) 
 Module700Name=寄付
 Module700Desc=寄付金の管理
-Module770Name=経費報告書
-Module770Desc=経費報告書の請求を管理する ( 輸送、食事、... ) 
+Module770Name=経費報告書s
+Module770Desc=経費報告書sの請求を管理する ( 輸送、食事、... ) 
 Module1120Name=仕入先の商業提案
 Module1120Desc=仕入先の商業提案と価格を要求する
 Module1200Name=カマキリ
@@ -715,11 +718,11 @@ Permission34=製品を削除する。
 Permission36=隠された製品を参照すること/管理
 Permission38=製品をエクスポート
 Permission39=最低価格を無視する
-Permission41=プロジェクトとタスクを読む ( 共有プロジェクトと私が連絡しているプロジェクト ) 。割り当てられたタスクで、私または私の階層に費やされた時間を入力することもできる ( タイムシート ) 
+Permission41=プロジェクトとタスクを読込む ( 共有プロジェクトと私が連絡しているプロジェクト ) 。割り当てられたタスクで、私または私の階層に費やされた時間を入力することもできる ( タイムシート ) 
 Permission42=プロジェクトを作成/変更する ( 共有プロジェクトと連絡先のプロジェクト ) 。タスクを作成し、ユーザをプロジェクトとタスクに割り当てることもできる
 Permission44=プロジェクトを削除する ( 共有プロジェクトと連絡先のプロジェクト ) 
 Permission45=プロジェクトをエクスポート
-Permission61=出張を読む
+Permission61=出張を読込む
 Permission62=出張を作成/変更
 Permission64=出張を削除する。
 Permission67=出張をエクスポート
@@ -731,7 +734,7 @@ Permission72=メンバーを作成/変更
 Permission74=メンバーを削除する
 Permission75=メンバーシップの種類を設定する
 Permission76=データをエクスポート
-Permission78=サブスクリプションを読む
+Permission78=サブスクリプションを読込む
 Permission79=サブスクリプションを作成/変更
 Permission81=お客様の注文を読み取る
 Permission82=作成/変更、顧客の注文
@@ -740,50 +743,51 @@ Permission86=お客様の注文を送る
 Permission87=顧客の注文を閉じる
 Permission88=お客様の注文を取り消す
 Permission89=お客様の注文を削除する
-Permission91=社会税または財政税と付加価値税を読む
+Permission91=社会税または財政税と付加価値税を読込む
 Permission92=社会税または財政税と付加価値税を作成/変更する
 Permission93=社会税または財政税と付加価値税を削除する
 Permission94=社会税または財政税をエクスポート
-Permission95=レポートを読む
-Permission101=sendingsを読む
+Permission95=報告書sを読込む
+Permission101=sendingsを読込む
 Permission102=sendingsを作成/変更
 Permission104=sendingsを検証する
 Permission105=メールで送信する
 Permission106=送信録をエクスポート
 Permission109=sendingsを削除する。
-Permission111=金融勘定を読む
+Permission111=金融勘定を読込む
 Permission112=作成/変更/削除して取引を比較する
-Permission113=金融勘定の設定 ( カテゴリの作成、管理 ) 
+Permission113=金融科目の設定（銀行取引のカテゴリの作成、管理）
 Permission114=トランザクションを調整する
 Permission115=取引と口座ステートメントをエクスポート
 Permission116=アカウント間の転送
 Permission117=小切手の発送を管理する
-Permission121=ユーザにリンクされている取引先を読む
+Permission121=ユーザにリンクされている取引先を読込む
 Permission122=ユーザにリンクされている取引先が作成/変更
 Permission125=ユーザにリンクされている取引先を削除する。
 Permission126=取引先をエクスポート
-Permission141=すべてのプロジェクトとタスクを読む ( 私が連絡先ではない非公開プロジェクトも ) 
+Permission130=取引先の支払情報を作成/変更する
+Permission141=すべてのプロジェクトとタスクを読込む ( 私が連絡先ではない非公開プロジェクトも ) 
 Permission142=すべてのプロジェクトとタスクを作成/変更する ( 私が連絡先ではない非公開プロジェクトも ) 
 Permission144=すべてのプロジェクトとタスクを削除する ( 私が連絡していない非公開プロジェクトも削除する ) 
-Permission146=プロバイダを読む
-Permission147=統計を読む
-Permission151=口座振替の支払い注文を読む
+Permission146=プロバイダを読込む
+Permission147=統計を読込む
+Permission151=口座振替の支払い注文を読込む
 Permission152=口座振替の支払い注文を作成/変更する
 Permission153=口座振替の支払い注文の送信/送信
 Permission154=口座振替の支払い注文のクレジット/拒否を記録する
-Permission161=契約/サブスクリプションを読む
+Permission161=契約/サブスクリプションを読込む
 Permission162=契約/サブスクリプションを作成/変更する
 Permission163=契約のサービス/サブスクリプションをアクティブ化する
 Permission164=契約のサービス/サブスクリプションを無効にする
 Permission165=契約/サブスクリプションを削除する
 Permission167=契約をエクスポート
-Permission171=旅行と経費を読む ( あなたとあなたの部下 ) 
+Permission171=旅行と経費を読込む ( あなたとあなたの部下 ) 
 Permission172=旅行と経費を作成/変更する
 Permission173=旅行と経費を削除する
-Permission174=すべての旅行と経費を読む
+Permission174=すべての旅行と経費を読込む
 Permission178=旅行と経費をエクスポート
-Permission180=仕入先を読む
-Permission181=注文書を読む
+Permission180=仕入先を読込む
+Permission181=注文書を読込む
 Permission182=注文書を作成/変更する
 Permission183=注文書を検証する
 Permission184=注文書を承認する
@@ -793,30 +797,30 @@ Permission187=注文書を閉じる
 Permission188=注文書をキャンセルする
 Permission192=線を作成する
 Permission193=線をキャンセルする
-Permission194=帯域幅の線を読む
+Permission194=帯域幅の線を読込む
 Permission202=ADSL接続を作成する
 Permission203=順序接続順序
 Permission204=順序接続
 Permission205=接続を管理する
 Permission206=接続を読み取る
-Permission211=テレフォニーを読む
+Permission211=テレフォニーを読込む
 Permission212=注文明細行
 Permission213=ラインをアクティブにする
 Permission214=設定テレフォニー
 Permission215=設定·プロバイダー
-Permission221=emailingsを読む
+Permission221=emailingsを読込む
 Permission222=作成/変更emailings ( トピック、受信... ) 
 Permission223= ( 送信できる ) emailingsを検証
 Permission229=emailingsを削除する。
 Permission237=受信者と情報を表示する
 Permission238=手動でメールを送信する
 Permission239=検証後または送信後にメーリングを削除する
-Permission241=カテゴリを読む
+Permission241=カテゴリを読込む
 Permission242=カテゴリを作成/変更
 Permission243=カテゴリを削除する。
 Permission244=隠されたカテゴリの内容を参照すること。
-Permission251=他のユーザおよびグループを読む
-PermissionAdvanced251=他のユーザを読む
+Permission251=他のユーザおよびグループを読込む
+PermissionAdvanced251=他のユーザを読込む
 Permission252=他のユーザの読み取り権限を
 Permission253=他のユーザ、グループ、権限を作成/変更する
 PermissionAdvanced253=内部/外部ユーザおよびアクセス許可を作成/変更
@@ -825,20 +829,20 @@ Permission255=他のユーザのパスワードを変更する
 Permission256=他のユーザを削除するか、または無効にする
 Permission262=すべての取引先とそのオブジェクト（ユーザが営業担当者である取引先だけでなく）へのアクセスを拡張する。 <br>外部ユーザには効果的ではない（提案、注文、請求書、契約などについては常に自分自身に限定される）。 <br>プロジェクトには効果的ではない（プロジェクトの権限、可視性、および割り当てに関するルールのみが重要）。
 Permission263=オブジェクトなしで、すべての取引先にアクセスを拡張する（ユーザが営業担当者である取引先だけでなく）。 <br>外部ユーザには効果的ではない（提案、注文、請求書、契約などについては常に自分自身に限定される）。 <br>プロジェクトには効果的ではない（プロジェクトの権限、可視性、および割り当てに関するルールのみが重要）。
-Permission271=CAを読む
+Permission271=CAを読込む
 Permission272=請求書をお読みください
 Permission273=問題の請求書
 Permission281=連絡先をお読みください
 Permission282=の作成/変更連絡先
 Permission283=連絡先を削除
 Permission286=連絡先をエクスポート
-Permission291=関税を読む
+Permission291=関税を読込む
 Permission292=関税のアクセス許可を設定する
 Permission293=顧客の料金を変更する
-Permission300=バーコードを読む
+Permission300=バーコードを読込む
 Permission301=バーコードを作成/変更する
 Permission302=バーコードを削除する
-Permission311=サービスを読む
+Permission311=サービスを読込む
 Permission312=契約にサービス/サブスクリプションを割り当てる
 Permission331=ブックマークを読み込む
 Permission332=ブックマークを作成/変更
@@ -847,12 +851,12 @@ Permission341=独自の読み取りアクセス許可を
 Permission342=自分のユーザ情報を作成/変更
 Permission343=自分のパスワードを変更する
 Permission344=独自のパーミッションを変更する
-Permission351=グループを読む
+Permission351=グループを読込む
 Permission352=グループの読み取りアクセス許可を
 Permission353=グループを作成/変更
 Permission354=グループを削除するか、または無効にする
 Permission358=ユーザをエクスポート
-Permission401=割引を読む
+Permission401=割引を読込む
 Permission402=割引を作成/変更
 Permission403=割引を検証する
 Permission404=割引を削除する。
@@ -862,12 +866,12 @@ Permission512=給与と支払いを作成/変更する
 Permission514=給与と支払いを削除する
 Permission517=全員の給料と支払いを見る
 Permission519=給与をエクスポート
-Permission520=ローンを読む
+Permission520=ローンを読込む
 Permission522=ローンの作成/変更
 Permission524=ローンを削除する
 Permission525=アクセスローン計算機
 Permission527=ローンをエクスポート
-Permission531=サービスを読む
+Permission531=サービスを読込む
 Permission532=サービスを作成/変更
 Permission534=サービスを削除する
 Permission536=隠されたサービスを参照すること/管理
@@ -876,49 +880,48 @@ Permission561=クレジット転送による支払い注文の読み取り
 Permission562=クレジット転送による支払い注文の作成/変更
 Permission563=クレジット転送による支払い注文の送信/送信
 Permission564=借方/貸方振込の拒否を記録する
-Permission601=ステッカーを読む
+Permission601=ステッカーを読込む
 Permission602=ステッカーを作成/変更する
 Permission609=ステッカーを削除する
-Permission650=部品表を読む
+Permission650=部品表を読込む
 Permission651=部品表の作成/更新
 Permission652=部品表を削除する
-Permission660=製造オーダー ( MO ) を読む
+Permission660=製造オーダー ( MO ) を読込む
 Permission661=製造指図 ( MO ) の作成/更新
 Permission662=製造オーダー ( MO ) の削除
-Permission701=寄付を読む
+Permission701=寄付を読込む
 Permission702=寄付を作成/変更
 Permission703=寄付を削除する。
-Permission771=経費報告書を読む ( あなたとあなたの部下 ) 
-Permission772=経費報告書の作成/変更
-Permission773=経費報告書を削除する
-Permission774=すべての経費報告書を読む ( 部下ではないユーザの場合でも ) 
-Permission775=経費報告書を承認する
-Permission776=経費報告書の支払い
-Permission777=みんなの経費報告書を読む
-Permission778=全員の経費報告書を作成/変更する
-Permission779=経費報告書をエクスポート
-Permission1001=株式を読む
+Permission771=経費報告書sを読込む ( あなたとあなたの部下 ) 
+Permission772=経費報告書の作成/変更（自分および部下のため）
+Permission773=経費報告書sを削除する
+Permission775=経費報告書sを承認する
+Permission776=経費報告書sの支払い
+Permission777=すべての経費報告書を読込む（部下ではないユーザの報告書も含む）
+Permission778=全員の経費報告書sを作成/変更する
+Permission779=経費報告書sをエクスポート
+Permission1001=在庫を読込む
 Permission1002=倉庫の作成/変更
 Permission1003=倉庫を削除する
-Permission1004=株式の動きを読む
-Permission1005=株式の動きを作成/変更
+Permission1004=在庫推移を読込む
+Permission1005=在庫推移を作成/変更
 Permission1011=在庫を見る
 Permission1012=新規目録を作成する
 Permission1014=目録を検証する
 Permission1015=製品のPMP値の変更を許可する
 Permission1016=目録を削除
-Permission1101=配達領収書を読む
+Permission1101=配達領収書を読込む
 Permission1102=配達領収書を作成/変更する
 Permission1104=配達領収書を検証する
 Permission1109=領収書を削除する
-Permission1121=サプライヤーの提案を読む
+Permission1121=サプライヤーの提案を読込む
 Permission1122=サプライヤー提案の作成/変更
 Permission1123=サプライヤーの提案を検証する
 Permission1124=サプライヤーの提案を送信する
 Permission1125=サプライヤー提案を削除する
 Permission1126=サプライヤーの価格要求を閉じる
-Permission1181=仕入先を読む
-Permission1182=注文書を読む
+Permission1181=仕入先を読込む
+Permission1182=注文書を読込む
 Permission1183=注文書を作成/変更する
 Permission1184=注文書を検証する
 Permission1185=注文書を承認する
@@ -930,7 +933,7 @@ Permission1190=発注書を承認 ( 2回目の承認 ) する
 Permission1191=サプライヤーの注文とその属性をエクスポート
 Permission1201=エクスポートの結果を得る
 Permission1202=エクスポートを作成/変更
-Permission1231=仕入先の請求書を読む
+Permission1231=仕入先の請求書を読込む
 Permission1232=仕入先の請求書を作成/変更する
 Permission1233=仕入先の請求書を検証する
 Permission1234=仕入先の請求書を削除する
@@ -941,47 +944,43 @@ Permission1251=データベース ( データロード ) に外部データの
 Permission1321=顧客の請求書、属性、および支払いをエクスポート
 Permission1322=支払い済の請求書を再開する
 Permission1421=受注と属性をエクスポート
-Permission1521=ドキュメントを読む
+Permission1521=ドキュメントを読込む
 Permission1522=ドキュメントを削除する
 Permission2401=ユーザアカウントにリンクされているアクション ( イベントまたはタスク ) を読み取る ( イベントの所有者または割り当てられたばかりの場合 ) 
 Permission2402=ユーザアカウントにリンクされたアクション ( イベントまたはタスク ) を作成/変更する ( イベントの所有者の場合 ) 
 Permission2403=ユーザアカウントにリンクされているアクション ( イベントまたはタスク ) を削除する ( イベントの所有者の場合 ) 
-Permission2411=他のアクション ( イベントまたはタスク ) を読む
+Permission2411=他のアクション ( イベントまたはタスク ) を読込む
 Permission2412=他のアクション ( イベントまたはタスク ) を作成/変更
 Permission2413=他のアクション ( イベントまたはタスク ) を削除
 Permission2414=他の人のアクション/タスクをエクスポート
-Permission2501=ドキュメントを読む/ダウンロード
+Permission2501=ドキュメントを読込む/ダウンロード
 Permission2502=ドキュメントをダウンロードする
 Permission2503=書類の提出または削除
 Permission2515=設定のドキュメントディレクトリ
 Permission2801=FTPクライアントを読み取りモードで使用する ( 参照およびダウンロードのみ ) 
 Permission2802=FTPクライアントを書き込みモードで使用する ( ファイルを削除またはアップロードする ) 
-Permission3200=アーカイブされたイベントとフィンガープリントを読む
+Permission3200=アーカイブされたイベントとフィンガープリントを読込む
 Permission3301=新規モジュールを生成する
-Permission4001=従業員を見る
-Permission4002=従業員を作成する
-Permission4003=従業員を削除する
-Permission4004=従業員をエクスポート
-Permission4010=技能/職種/ポジションを読む
-Permission4011=技能/職種/ポジションの作成/変更
-Permission4012=技能/職種/ポジションを削除する
-Permission4020=評価を読む
-Permission4021=評価の作成/変更
+Permission4001=技能/職種/役職を読込む
+Permission4002=技能/職種/役職の作成/変更
+Permission4003=技能/職種/役職を削除する
+Permission4020=評価を読込む
+Permission4021=評価を作成/変更する
 Permission4022=評価を検証する
 Permission4023=評価を削除する
 Permission4030=比較メニューを見る
-Permission10001=ウェブサイトのコンテンツを読む
+Permission10001=ウェブサイトのコンテンツを読込む
 Permission10002=ウェブサイトのコンテンツ ( htmlおよびjavascriptコンテンツ ) を作成/変更する
 Permission10003=Webサイトのコンテンツ ( 動的PHPコード ) を作成/変更する。危険。制限された開発者に予約する必要がある。
 Permission10005=ウェブサイトのコンテンツを削除する
-Permission20001=休暇申請書 ( あなたの休暇と部下の休暇 ) を読む
+Permission20001=休暇申請書 ( あなたの休暇と部下の休暇 ) を読込む
 Permission20002=休暇申請 ( 休暇と部下の休暇 ) を作成/変更する
 Permission20003=休暇申請を削除する
-Permission20004=すべての休暇申請を読む ( 部下ではないユーザも ) 
-Permission20005=すべての人 ( 部下ではないユーザも含む ) の休暇申請を作成/変更する
-Permission20006=休職申請 ( 残高の設定と更新 ) 
+Permission20004=すべての休暇申請を読込む（部下ではないユーザの申請も含む）
+Permission20005=すべての人（部下ではないユーザの場合でも）の休暇申請を作成/変更する
+Permission20006=休暇申請の管理（残高の設定と更新）
 Permission20007=休暇申請を承認する
-Permission23001=スケジュールされたジョブを読む
+Permission23001=スケジュールされたジョブを読込む
 Permission23002=スケジュールされたジョブの作成/更新
 Permission23003=スケジュールされたジョブを削除する
 Permission23004=スケジュールされたジョブを実行する
@@ -989,9 +988,9 @@ Permission50101=POS ( SimplePOS ) を使用する
 Permission50151=POS ( TakePOS ) を使用する
 Permission50152=販売ラインを編集する
 Permission50153=注文済販売行を編集
-Permission50201=トランザクションを読む
+Permission50201=トランザクションを読込む
 Permission50202=輸入取引
-Permission50330=Zapierのオブジェクトを読む
+Permission50330=Zapierのオブジェクトを読込む
 Permission50331=Zapierのオブジェクトを作成/更新する
 Permission50332=Zapierのオブジェクトを削除する
 Permission50401=製品と請求書を会計アカウントにバインドする
@@ -1000,28 +999,28 @@ Permission50412=元帳での書き込み/編集操作
 Permission50414=元帳の削除操作
 Permission50415=年ごとのすべての操作と元帳の仕訳を削除する
 Permission50418=元帳の操作をエクスポート
-Permission50420=レポートとエクスポートレポート ( 売上高、残高、仕訳帳、元帳 ) 
+Permission50420=報告書sとエクスポート報告書s ( 売上高、残高、仕訳帳、元帳 ) 
 Permission50430=会計期間を定義する。トランザクションを検証し、会計期間を閉じる。
 Permission50440=勘定科目表の管理、会計の設定
-Permission51001=アセットを読む
+Permission51001=アセットを読込む
 Permission51002=アセットの作成/更新
 Permission51003=アセットを削除する
 Permission51005=アセットの種類を設定する
 Permission54001=印刷
-Permission55001=世論調査を読む
+Permission55001=世論調査を読込む
 Permission55002=投票の作成/変更
-Permission59001=売上総利益を読む
+Permission59001=売上総利益を読込む
 Permission59002=売上総利益を定義する
-Permission59003=すべてのユーザ粗利を読む
-Permission63001=リソースを読む
+Permission59003=すべてのユーザ粗利を読込む
+Permission63001=リソースを読込む
 Permission63002=リソースの作成/変更
 Permission63003=リソースを削除する
 Permission63004=リソースを議題イベントにリンクする
 Permission64001=直接印刷を許可する
 Permission67000=領収書の印刷を許可する
-Permission68001=コム内レポートを読む
-Permission68002=コム内レポートの作成/変更
-Permission68004=コム内レポートを削除する
+Permission68001=域内報告書を読込む
+Permission68002=域内報告書の作成/変更
+Permission68004=域内報告書を削除する
 Permission941601=領収書を読んで
 Permission941602=領収書を作成および変更する
 Permission941603=領収書を検証する
@@ -1039,7 +1038,7 @@ DictionaryCurrency=通貨
 DictionaryCivility=敬称
 DictionaryActions=議題イベントの種類
 DictionarySocialContributions=社会税または財政税の種類
-DictionaryVAT=VATレートまたは販売税率
+DictionaryVAT=VAT率または消費税率
 DictionaryRevenueStamp=税印紙の額
 DictionaryPaymentConditions=支払い条件
 DictionaryPaymentModes=支払いモード
@@ -1054,7 +1053,7 @@ DictionaryStaff=就業者数
 DictionaryAvailability=配達遅延
 DictionaryOrderMethods=注文方法
 DictionarySource=提案/受注の起源
-DictionaryAccountancyCategory=レポート用にパーソナライズされたグループ
+DictionaryAccountancyCategory=報告書s用にパーソナライズされたグループ
 DictionaryAccountancysystem=勘定科目表のモデル
 DictionaryAccountancyJournal=会計仕訳帳
 DictionaryEMailTemplates=メールテンプレート
@@ -1067,7 +1066,7 @@ DictionaryHolidayTypes=休暇-休暇の種類
 DictionaryOpportunityStatus=プロジェクト/引合の引合ステータス
 DictionaryExpenseTaxCat=経費報告書-輸送カテゴリ
 DictionaryExpenseTaxRange=経費報告書-輸送カテゴリ別の範囲
-DictionaryTransportMode=Intracom レポート-トランスポートモード
+DictionaryTransportMode=域内報告書-トランスポートモード
 DictionaryBatchStatus=製品ロット/シリアル品質管理ステータス
 TypeOfUnit=ユニットの種類
 SetupSaved=設定が保存されました
@@ -1076,7 +1075,7 @@ BackToModuleList=モジュールリストに戻る
 BackToDictionaryList=辞書リストに戻る
 TypeOfRevenueStamp=税印紙の種類
 VATManagement=消費税管理
-VATIsUsedDesc=見込み客、請求書、注文などを作成するときのデフォルトでは、消費税率はアクティブな標準ルールに従いる。<br>売り手が消費税の対象ではない場合、消費税はデフォルトで0になる。ルールの終了。 <br> ( 販売者の国=購入者の国 ) の場合、デフォルトでは、消費税は販売者の国での製品の消費税と等しくなる。ルールの終わり。 <br>販売者と購入者の両方が欧州共同体にあり、商品が輸送関連製品 ( 運送、配送、航空法人 ) の場合、デフォルトのVATは0。このルールは販売者の国によって異なる。会計士にご相談ください。 VATは、売り手ではなく、買い手が自国の税関に支払う必要がある。ルールの終わり。 <br>売り手と買い手が両方とも欧州共同体にいて、買い手が法人ではない場合 ( コミュニティ内のVAT番号が登録されている場合 ) 、VATはデフォルトで売り手の国のVAT率になる。ルールの終わり。 <br>売り手と買い手の両方が欧州共同体にあり、買い手が法人 ( コミュニティ内のVAT番号が登録されている ) である場合、VATはデフォルトで0。ルールの終わり。 <br>その他の場合、提案されたデフォルトは消費税= 0。ルールの終わり。
+VATIsUsedDesc=見込み客、請求書、注文などを作成するときのデフォルトでは、消費税率はアクティブな標準ルールに従う。<br>売り手が消費税の対象ではない場合、消費税はデフォルトで0になる。ルール終了。 <br> ( 販売者の国=購入者の国 ) の場合、デフォルトでは、消費税は販売者の国での製品の消費税と等しくなる。ルール終了。 <br>販売者と購入者の両方が欧州共同体にあり、商品が輸送関連製品 ( 運送、配送、航空法人 ) の場合、デフォルトのVATは0。このルールは販売者の国によって異なる。会計士に相談すること。 VATは、売り手ではなく、買い手が自国の税関に支払う必要がある。ルール終了。 <br>売り手と買い手が両方とも欧州共同体にいて、買い手が法人ではない場合 ( コミュニティ内のVAT番号が登録されている場合 ) 、VATはデフォルトで売り手の国のVAT率になる。ルール終了。 <br>売り手と買い手の両方が欧州共同体にあり、買い手が法人 ( コミュニティ内のVAT番号が登録されている ) である場合、VATはデフォルトで0。ルール終了。 <br>その他の場合、提案されたデフォルトは消費税= 0。ルール終了。
 VATIsNotUsedDesc=デフォルトでは、提案された消費税は0であり、協会、個人、または中小企業などの場合に使用できる。
 VATIsUsedExampleFR=フランスでは、実際の財政システム ( 簡略化された実際または通常の実際 ) を持っている企業または組織を意味する。 VATが申告されるシステム。
 VATIsNotUsedExampleFR=フランスでは、消費税が申告されていない団体、または零細企業の財政システム ( フランチャイズの消費税 ) を選択し、消費税の申告なしでフランチャイズの消費税を支払った企業、組織、または自由業を意味する。この選択により、請求書に「該当しない消費税-CGIのart-293B」という参照が表示される。
@@ -1105,16 +1104,16 @@ LocalTax2IsUsedDescES=見込み客、請求書、注文などを作成すると
 LocalTax2IsNotUsedDescES=デフォルトでは、提案されたIRPFは0。ルールの終わり。
 LocalTax2IsUsedExampleES=スペインでは、フリーランサーとサービス業の個人事業者とモジュール税制を選択した法人。
 LocalTax2IsNotUsedExampleES=スペインでは、それらはモジュールの税制の対象とならない企業。
-RevenueStampDesc=「税印紙」または「収入印紙」は、請求書ごとの固定税  ( 請求書の金額には依存しません ) 。パーセント税にすることもできるが、税印紙はレポートを提供しないため、パーセント税には2番目または3番目の種別の税を使用する方が適している。この種の税金を使用している国はごくわずか。
+RevenueStampDesc=「税印紙」または「収入印紙」は、請求書ごとの固定税  ( 請求書の金額には依存しない ) 。パーセント税にすることもできるが、税印紙は報告を供しないため、パーセント税には2番目または3番目の種別の税を使用する方が適している。この種の税金を使用している国はごくわずか。
 UseRevenueStamp=税印紙を使用する
 UseRevenueStampExample=税印紙の値は、デフォルトで辞書の設定に定義されている ( %s --%s --%s ) 
-CalcLocaltax=地方税に関するレポート
+CalcLocaltax=地方税に関する報告書s
 CalcLocaltax1=販売-購入
-CalcLocaltax1Desc=地方税レポートは、地方税の売上と地方税の購入の差で計算される
+CalcLocaltax1Desc=地方税報告書sは、地方税の売上と地方税の購入の差で計算される
 CalcLocaltax2=購入
-CalcLocaltax2Desc=地方税レポートは、地方税の購入の合計。
+CalcLocaltax2Desc=地方税報告書sは、地方税の購入の合計。
 CalcLocaltax3=販売
-CalcLocaltax3Desc=地方税レポートは地方税の売上の合計 
+CalcLocaltax3Desc=地方税報告書sは地方税の売上の合計 
 NoLocalTaxXForThisCountry=税金の設定 ( %s --%s --%sを参照 ) によると、あなたの国はそのような種別の税金を使用する必要はない
 LabelUsedByDefault=ない翻訳がコードに見つからない場合、デフォルトで使用されるラベル
 LabelOnDocuments=ドキュメントのラベル
@@ -1324,7 +1323,7 @@ AlphaNumOnlyLowerCharsAndNoSpace=スペースのない英数字と小文字の
 SendmailOptionNotComplete=警告は、一部のLinuxシステムでは、電子メールから電子メールを送信するためには、sendmailの実行設定する必要がある含むオプション-BA ( パラメータmail.force_extra_parameters php.iniファイルに ) 。一部の受信者がメールを受信しない場合は、mail.force_extra_parameters =-BA ) と、このPHPパラメータを編集してみること。
 PathToDocuments=ドキュメントへのパス
 PathDirectory=ディレクトリ
-SendmailOptionMayHurtBuggedMTA=メソッド "PHP mail direct" を使用してメールを送信する機能は、一部の受信メールサーバーによって正しく解析されない可能性のあるメールメッセージを生成する。その結果、バグのあるプラットフォームでホストされているユーザが一部のメールを読むことができなくなる。これは一部のインターネットプロバイダーに当てはまる ( 例：フランスのOrange ) 。これは、DolibarrまたはPHPの問題ではなく、受信メールサーバーの問題。ただし、【設定】-【その他】でオプション MAIN_FIX_FOR_BUGGED_MTA を1で追加し、これを回避するようにDolibarrを変更できる。ただし、SMTP標準を厳密に使用する他のサーバーで問題が発生する可能性がある。もう1つの解決策 ( 推奨 ) は、欠点のない "SMTPソケットライブラリ" メソッドを使用すること。
+SendmailOptionMayHurtBuggedMTA=メソッド "PHP mail direct" を使用してメールを送信する機能は、一部の受信メールサーバーによって正しく解析されない可能性のあるメールメッセージを生成する。その結果、バグのあるプラットフォームでホストされているユーザが一部のメールを読込むことができなくなる。これは一部のインターネットプロバイダーに当てはまる ( 例：フランスのOrange ) 。これは、DolibarrまたはPHPの問題ではなく、受信メールサーバーの問題。ただし、【設定】-【その他】でオプション MAIN_FIX_FOR_BUGGED_MTA を1で追加し、これを回避するようにDolibarrを変更できる。ただし、SMTP標準を厳密に使用する他のサーバーで問題が発生する可能性がある。もう1つの解決策 ( 推奨 ) は、欠点のない "SMTPソケットライブラリ" メソッドを使用すること。
 TranslationSetup=翻訳の設定
 TranslationKeySearch=翻訳キーまたは文字列を検索する
 TranslationOverwriteKey=翻訳文字列を上書きする
@@ -1358,9 +1357,9 @@ BrowserIsOK=%sWebブラウザーを使用している。このブラウザは、
 BrowserIsKO=%sWebブラウザーを使用している。このブラウザは、セキュリティ、パフォーマンス、信頼性の点で悪い選択であることが知られている。 Firefox、Chrome、Opera、またはSafariの使用をお勧めする。
 PHPModuleLoaded=PHPコンポーネント%sがロードされる
 PreloadOPCode=プリロードされたOPCodeが使用される
-AddRefInList=顧客/仕入先参照を表示する。情報リスト ( 選択リストまたはコンボボックス ) およびほとんどのハイパーリンク。 <br>取引先は、「CC12345-SC45678-The BigCompanycorp。」という名前の形式で表示される。 「TheBigCompanycorp」の代わりに。
-AddVatInList=顧客/仕入先のVAT番号を表示する。情報リスト（リストまたはコンボボックスを選択）。
-AddAdressInList=顧客/仕入先の住所情報リストを表示する ( リストまたはコンボボックスを選択 ) <br>取引先は、「TheBigCompanycorp。」ではなく「TheBigCompanycorp。-21jumpstreet 123456Bigtown-USA」の名前形式で表示される。
+AddRefInList=コンボリストに、顧客/仕入先参照を表示する。 <br>取引先は、「CC12345 - SC45678 - The  Big Company corp」という名前形式で表示される。 「The Big Company corp」でなく。
+AddVatInList=顧客/仕入先のVAT番号をコンボリストに表示する。
+AddAdressInList=顧客/仕入先の住所をコンボリストに表示する。 <br>取引先は、「The Big Company corp」ではなく、「The Big Company corp. - 21 jump street 123456 Big town - -USA」の名前形式で表示される。
 AddEmailPhoneTownInContactList=連絡先の電子メール(または未定義の場合は電話)と町の情報リスト(選択リストまたはコンボボックス)を表示<br>連絡先は以下の名称と形式で表記される："Dupond Durand" の形式でなく、 "Dupond Durand - dupond.durand@email.com - Paris" または "Dupond Durand - 06 07 59 65 66 - Paris" 。
 AskForPreferredShippingMethod=取引先の優先配送方法を尋ねる。
 FieldEdition=フィールド%sのエディション
@@ -1465,7 +1464,7 @@ MembersSetup=メンバーモジュールの設定
 MemberMainOptions=主なオプション
 AdherentLoginRequired= 各メンバーのログインを管理する
 AdherentMailRequired=新規メンバーを作成するにはメールが必要 
-MemberSendInformationByMailByDefault=メンバー ( 検証や新規サブスクリプション ) にメールの確認を送信するチェックボックスはデフォルトでオンになっている
+MemberSendInformationByMailByDefault=メンバー ( 検証や新規サブスクリプション ) にメールの確定を送信するチェックボックスはデフォルトでオンになっている
 MemberCreateAnExternalUserForSubscriptionValidated=検証された新規メンバーサブスクリプションごとに外部ユーザーログインを作成する
 VisitorCanChooseItsPaymentMode=訪問者は利用可能な支払いモードから選択できる
 MEMBER_REMINDER_EMAIL=期限切れのサブスクリプションの電子メール</b>によって自動リマインダー<b>を有効にする。注：モジュール<strong> %s </strong>を有効にして、リマインダーを送信するように正しく設定する必要がある。
@@ -1593,7 +1592,7 @@ LDAPFieldCompanyExample=例：o
 LDAPFieldSid=SID
 LDAPFieldSidExample=例：objectsid
 LDAPFieldEndLastSubscription=サブスクリプション終了の日付
-LDAPFieldTitle=職位
+LDAPFieldTitle=役職
 LDAPFieldTitleExample=例：タイトル
 LDAPFieldGroupid=グループID
 LDAPFieldGroupidExample=例：gidnumber
@@ -1611,7 +1610,7 @@ LDAPDescMembers=このページでは、Dolibarrメンバーモジュールで
 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=パフォーマンスの設定/最適化レポート
+PerfDolibarr=パフォーマンスの設定/最適化報告書
 YouMayFindPerfAdviceHere=このページでは、パフォーマンスに関連するいくつかのチェックまたはアドバイスを提供する。
 NotInstalled=インストールされていない。
 NotSlowedDownByThis=これによって遅くなることはない。
@@ -1708,8 +1707,9 @@ MailingDelay=次のメッセージを送信してから待機する秒数
 NotificationSetup=電子メール通知モジュールの設定
 NotificationEMailFrom=通知モジュールによって送信された電子メールの送信者電子メール ( 差出人 ) 
 FixedEmailTarget=受信者
-NotificationDisableConfirmMessageFix=修正通知の確認メッセージで通知情報を無効にする
-NotificationDisableConfirmMessageUser=ユーザー通知の確認メッセージで通知情報を無効にする
+NotificationDisableConfirmMessageContact=通知受信者（連絡先としてサブスクライブ）のリストを確定メッセージに非表示にする
+NotificationDisableConfirmMessageUser=通知受信者（ユーザーとしてサブスクライブ）のリストを確定メッセージに非表示にする
+NotificationDisableConfirmMessageFix=通知受信者（グローバル電子メールとしてサブスクライブ）のリストを確定メッセージに非表示にする
 ##### Sendings #####
 SendingsSetup=出荷モジュールの設定
 SendingsReceiptModel=領収書のモデルを送信する
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=配達のレシートにフリーテキスト
 ##### FCKeditor #####
 AdvancedEditor=高度なエディタ
 ActivateFCKeditor=のための高度なエディタをアクティブにする。
-FCKeditorForNotePublic=WYSIWIGによる要素のフィールドパブリックノートの作成/編集
-FCKeditorForNotePrivate=WYSIWIGによる要素のフィールドプライベートノートの作成/編集
+FCKeditorForNotePublic=要素の「パブリックノート」フィールドのWYSIWIG作成/編集
+FCKeditorForNotePrivate=要素の「プライベートノート」フィールドのWYSIWIG作成/編集
 FCKeditorForCompany=要素のフィールド記述のWYSIWIG作成/エディション（製品/サービスを除く）
 FCKeditorForProduct=製品/サービスのフィールド記述のWYSIWIG作成/エディション
 FCKeditorForProductDetails=WYSIWIGによる製品の作成/編集では、すべてのエンティティ(提案、注文、請求書など)の詳細行が示される。 <span class="warning">警告：この場合にこのオプションを使用することは、PDFファイルを作成するときに特殊文字やページの書式設定で問題が発生する可能性があるため、真剣に推奨されない。 </span>
@@ -1735,8 +1735,8 @@ FCKeditorForUserSignature=WYSIWIGによるユーザ署名の作成/編集
 FCKeditorForMail=すべてのメールのWYSIWIG作成/エディション ( 【ツール】-> 【電子メール】を除く ) 
 FCKeditorForTicket=チケットのWYSIWIG作成/エディション
 ##### Stock #####
-StockSetup=在庫モジュールの設定
-IfYouUsePointOfSaleCheckModule=デフォルトで提供されているPOSモジュールまたは外部モジュールを使用する場合、この設定はPOSモジュールによって無視される可能性がある。ほとんどのPOSモジュールは、デフォルトで、ここでのオプションに関係なく、請求書をすぐに作成し、在庫を減らすように設計されている。したがって、POSから販売を登録するときに在庫を減らす必要があるかどうかにかかわらず、POSモジュールの設定も確認すること。
+StockSetup=在庫モジュール設定
+IfYouUsePointOfSaleCheckModule=デフォルトで提供されている販売時点モジュール(POS)または外部モジュールを使用する場合、この設定はPOSモジュールによって無視される可能性がある。ほとんどのPOSモジュールは、デフォルトで、ここでのオプションに関係なく、請求書をすぐに作成し、在庫を減らすように設計されている。したがって、POSから販売を登録するときに在庫を減らす必要があるかどうかにかかわらず、POSモジュールの設定も確認すること。
 ##### Menu #####
 MenuDeleted=メニューを削除
 Menu=メニュー
@@ -1792,7 +1792,7 @@ 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=アジェンダビューの検索フィルタでイベントのこのステータスを自動的に設定する
@@ -1869,9 +1869,9 @@ TestGeoIPResult=変換IPのテスト - &gt;国
 ##### Projects #####
 ProjectsNumberingModules=プロジェクトは、モジュールの番号
 ProjectsSetup=プロジェクトモジュールの設定
-ProjectsModelModule=プロジェクトの報告書ドキュメントモデル
+ProjectsModelModule=プロジェクトの報告書sドキュメントモデル
 TasksNumberingModules=タスク番号付けモジュール
-TaskModelModule=タスクレポートドキュメントモデル
+TaskModelModule=タスク報告書sドキュメントモデル
 UseSearchToSelectProject=キーが押されるまで待ってから、プロジェクトコンボリストのコンテンツをロードすること。 <br>これにより、プロジェクトの数が多い場合にパフォーマンスが向上する可能性があるが、あまり便利ではない。
 ##### ECM (GED) #####
 ##### Fiscal Year #####
@@ -1895,12 +1895,13 @@ SortOrder=並べ替え順序
 Format=フォーマット
 TypePaymentDesc=0：顧客支払い種別、1：仕入先支払い種別、2：顧客とサプライヤーの両方の支払い種別
 IncludePath=インクルードパス ( 変数%sに定義 ) 
-ExpenseReportsSetup=モジュール経費報告書の設定
+ExpenseReportsSetup=モジュール経費報告書sの設定
 TemplatePDFExpenseReports=経費報告書ドキュメントを生成するためのドキュメントテンプレート
-ExpenseReportsRulesSetup=モジュール経費報告書の設定-ルール
-ExpenseReportNumberingModules=経費報告書の番号付けモジュール
+ExpenseReportsRulesSetup=モジュール経費報告書sの設定-ルール
+ExpenseReportNumberingModules=経費報告書sの番号付けモジュール
 NoModueToManageStockIncrease=自動在庫増加を管理できるモジュールはアクティブ化されていない。在庫増加は手動入力のみで行われる。
 YouMayFindNotificationsFeaturesIntoModuleNotification=モジュール「通知」を有効にして構成することにより、電子メール通知のオプションを見つけることができる。
+TemplatesForNotifications=通知用のテンプレート
 ListOfNotificationsPerUser=ユーザごとの自動通知のリスト*
 ListOfNotificationsPerUserOrContact=ユーザごと*または連絡先ごとに利用可能な ( ビジネスイベントでの ) 可能な自動通知のリスト**
 ListOfFixedNotifications=自動固定通知のリスト
@@ -1916,6 +1917,8 @@ ConfFileMustContainCustom=アプリケーションから外部モジュールを
 HighlightLinesOnMouseHover=マウスの動きが通過したときにテーブルの行を強調表示する
 HighlightLinesColor=マウスが通過したときの線のハイライト色 ( ハイライトなしの場合は「ffffff」を使用 ) 
 HighlightLinesChecked=チェックされたときの線のハイライト色 ( ハイライトなしの場合は「ffffff」を使用 ) 
+BtnActionColor=アクションボタンの色
+TextBtnActionColor=アクションボタンのテキストの色
 TextTitleColor=ページタイトルのテキストの色
 LinkColor=リンクの色
 PressF5AfterChangingThis=キーボードのCTRL + F5を押すか、この値を変更して有効にするためにブラウザのキャッシュをクリアする
@@ -1962,7 +1965,7 @@ MailToSendSupplierRequestForQuotation=見積依頼
 MailToSendSupplierOrder=注文書
 MailToSendSupplierInvoice=仕入先の請求書
 MailToSendContract=契約
-MailToSendReception=レセプション
+MailToSendReception=受付
 MailToThirdparty=取引先
 MailToMember=メンバー
 MailToUser=ユーザ
@@ -1972,8 +1975,8 @@ 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=倉庫のドキュメントのテンプレート
@@ -2007,7 +2010,7 @@ SamePriceAlsoForSharedCompanies=複数の法人のモジュールを使用し、
 ModuleEnabledAdminMustCheckRights=モジュールがアクティブ化されました。アクティブ化されたモジュールのアクセス許可は、管理者ユーザにのみ付与されました。必要に応じて、他のユーザまたはグループに手動でアクセス許可を付与する必要がある場合がある。
 UserHasNoPermissions=このユーザには権限が定義されていない
 TypeCdr=支払い期間の日付が請求書の日付に日数のデルタを加えたものである場合は「なし」を使用する ( デルタはフィールド「%s」 ) <br>デルタの後、日付を増やして終了する必要がある場合は、「月末」を使用する月の ( +オプションの「%s」 ( 日数 )  ) <br>「現在/次」を使用して、支払い期間の日付をデルタの後の月の最初のN番目にする ( デルタはフィールド「%s」、Nはフィールド「%s」に格納される ) 
-BaseCurrency=法人の参照通貨 ( これを変更するには、法人の設定に入る ) 
+BaseCurrency=法人の参照通貨 ( これを変更するには、法人の設定に入る )
 WarningNoteModuleInvoiceForFrenchLaw=このモジュール%sは、フランスの法律 ( Loi Finance 2016 ) に準拠している。
 WarningNoteModulePOSForFrenchLaw=このモジュール%sは、モジュールNon Reversible Logsが自動的にアクティブ化されるため、フランスの法律 ( Loi Finance 2016 ) に準拠している。
 WarningInstallationMayBecomeNotCompliantWithLaw=外部モジュールであるモジュール%sをインストールしようとしている。外部モジュールをアクティブ化すると、そのモジュールの発行元を信頼し、このモジュールがアプリケーションの動作に悪影響を与えず、国の法律 ( %s ) に準拠していることを確認できる。モジュールが違法な機能を導入した場合、違法なソフトウェアの使用について責任を負うことになる。
@@ -2058,18 +2061,19 @@ ConfirmCloneEmailCollector=メールコレクター%sのクローンを作成し
 DateLastCollectResult=最新の取得試行の日付
 DateLastcollectResultOk=最新の取得成功の日付
 LastResult=最新の結果
-EmailCollectorConfirmCollectTitle=メール収集確認
+EmailCollectorConfirmCollectTitle=メール収集確定
 EmailCollectorConfirmCollect=このコレクターのコレクションを今すぐ実行するか？
 NoNewEmailToProcess=処理する新規電子メール ( 一致するフィルタ ) はない
 NothingProcessed=何もしていない
 XEmailsDoneYActionsDone=%s電子メールが修飾され、%s電子メールが正常に処理されました ( %sレコード/アクションが実行された場合 ) 
-RecordEvent=メールイベントを記録する
-CreateLeadAndThirdParty=引合 ( および必要に応じて取引先 ) を作成する
-CreateTicketAndThirdParty=チケットを作成する ( 以前の操作でロードされた場合は取引先にリンクする ) 
+RecordEvent=議題にイベントを記録する（送信または受信した電子メールの種類を使用）
+CreateLeadAndThirdParty=リード（および必要なら取引先）を作成する
+CreateTicketAndThirdParty=チケットを作成する（取引先が以前の操作によってロードされた場合は取引先にリンクされ、それ以外の場合は取引先はリンクされない）
 CodeLastResult=最新の結果コード
 NbOfEmailsInInbox=ソースディレクトリ内の電子メールの数
 LoadThirdPartyFromName=%sで検索している取引先をロードする ( ロードのみ ) 
 LoadThirdPartyFromNameOrCreate=%sで検索している取引先をロードする ( 見つからない場合は作成する ) 
+AttachJoinedDocumentsToObject=メールトピックにオブジェクトの参照が見つかった場合は、添付ファイルをオブジェクトドキュメントに保存する。
 WithDolTrackingID=Dolibarrから送信された最初の電子メールによって開始された会話からのメッセージ
 WithoutDolTrackingID=Dolibarrから送信されていない最初の電子メールによって開始された会話からのメッセージ
 WithDolTrackingIDInMsgId=Dolibarrから送信されたメッセージ
@@ -2078,7 +2082,7 @@ CreateCandidature=求人応募を作成する
 FormatZip=郵便番号
 MainMenuCode=メニュー入力コード ( メインメニュー ) 
 ECMAutoTree=自動ECMツリーを表示する
-OperationParamDesc=アクションのオブジェクトに使用する値、または値を抽出する方法を定義する。例:<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:私の法人名は\\s([^\\s]*)<br><br>プロパティを抽出または設定するための区切り文字としての 文字 ; を使う。
+OperationParamDesc=値の抽出または設定に使用するルールを定義する。<br>電子メールの件名から名前を抽出する必要がある操作の例:<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:法人名は\\s([^\\s]*)<br><br>いくつかのプロパティを抽出または設定するための区切り文字としての文字「;」を使う。
 OpeningHours=営業時間
 OpeningHoursDesc=あなたの法人の通常の営業時間をここに入力すること。
 ResourceSetup=リソースモジュールの構成
@@ -2086,7 +2090,7 @@ UseSearchToSelectResource= ( ドロップダウンリストではなく ) 検索
 DisabledResourceLinkUser=リソースをユーザにリンクする機能を無効にする
 DisabledResourceLinkContact=リソースを連絡先にリンクする機能を無効にする
 EnableResourceUsedInEventCheck=リソースがイベントで使用されているかどうかを確認する機能を有効にする
-ConfirmUnactivation=モジュールのリセットを確認する
+ConfirmUnactivation=モジュールのリセットを確定する
 OnMobileOnly=小画面 ( スマートフォン ) のみ
 DisableProspectCustomerType=「見込み客+顧客」の取引先種別を無効にする ( したがって、取引先は「見込み客」または「顧客」である必要があるが、両方にすることはできない ) 
 MAIN_OPTIMIZEFORTEXTBROWSER=目の不自由な人のためのインターフェースを簡素化する
@@ -2124,7 +2128,7 @@ LargerThan=より大きい
 IfTrackingIDFoundEventWillBeLinked=オブジェクトの追跡IDが電子メールで見つかった場合、または電子メールがすでに収集されてオブジェクトにリンクされている電子メールの回答である場合、作成されたイベントは既知の関連オブジェクトに自動的にリンクされる。
 WithGMailYouCanCreateADedicatedPassword=Gmailアカウントで、2段階検証を有効にした場合は、https://myaccount.google.com/ での自分のGoogleパスワードを使わないで、アプリケーション専用の2番目のパスワードを作成することを勧める。
 EmailCollectorTargetDir=正常に処理されたときに電子メールを別のタグ/ディレクトリに移動することが望ましい動作である可能性がある。この機能を使用するには、ここでディレクトリの名前を設定するだけ  ( 名前に特殊文字を使用しないこと ) 。読み取り/書き込みログインアカウントも使用する必要があることに注意すること。
-EmailCollectorLoadThirdPartyHelp=このアクションを使用すると、メールコンテンツを使用して、データベース内の既存の取引先を検索してロードできる。見つかった（または作成された）取引先は、それを必要とする次のアクションに使用される。 <br>たとえば、本文にて「Name: 見尽名前」という文字列から抽出した名前を使って取引先名を登録するには、送信者メールをemailと置いて、次のようにパラメータフィールドを設定できる。<br> 'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>　
+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=このメールコレクターを削除してもよいか？
@@ -2152,7 +2156,7 @@ TemplateUpdated=テンプレートを更新
 TemplateDeleted=テンプレートが削除されました
 MailToSendEventPush=イベントリマインダーメール
 SwitchThisForABetterSecurity=セキュリティを強化するために、この値を%sに切り替えることをお勧めする
-DictionaryProductNature= 製品の性質
+DictionaryProductNature= 製品目
 CountryIfSpecificToOneCountry=国 ( 特定の国に固有の場合 ) 
 YouMayFindSecurityAdviceHere=ここにセキュリティアドバイザリがある
 ModuleActivatedMayExposeInformation=このPHP拡張機能は、機密データを公開する可能性がある。不要な場合は無効にすること。
@@ -2199,7 +2203,7 @@ DashboardDisableBlockContract=契約のサムネを無効にする
 DashboardDisableBlockTicket=チケットのサムネを無効にする
 DashboardDisableBlockBank=銀行のサムネを無効にする
 DashboardDisableBlockAdherent=メンバーシップのサムネを無効にする
-DashboardDisableBlockExpenseReport=経費報告書のサムネを無効にする
+DashboardDisableBlockExpenseReport=経費報告書sのサムネを無効にする
 DashboardDisableBlockHoliday=葉のサムネを無効にする
 EnabledCondition=フィールドを有効にする条件（有効にしない場合、可視性は常にオフになる）
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=2番目の税金を使用する場合は、最初の消費税も有効にする必要がある
@@ -2209,3 +2213,10 @@ SkinAndColors=肌と色
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=2番目の税金を使用する場合は、最初の消費税も有効にする必要がある
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=3番目の税金を使用する場合は、最初の消費税も有効にする必要がある
 PDF_USE_1A=PDF / A-1b形式でPDFを生成する
+MissingTranslationForConfKey = %sの翻訳がない
+NativeModules=ネイティブモジュール
+NoDeployedModulesFoundWithThisSearchCriteria=これらの検索条件に対応するモジュールが見つからない
+API_DISABLE_COMPRESSION=API応答の圧縮を無効にする
+EachTerminalHasItsOwnCounter=各端末は独自のカウンターを使用する。
+FillAndSaveAccountIdAndSecret=最初にアカウントIDとシークレットを入力して保存する
+PreviousHash=以前のハッシュ
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index a485d5ecf6f..6ee85ac8114 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -12,7 +12,7 @@ Event=イベント
 Events=イベント
 EventsNb=イベント数
 ListOfActions=イベントのリスト
-EventReports=イベントレポート
+EventReports=イベント報告書s
 Location=場所
 ToUserOfGroup=グループ内の任意のユーザーに割り当てられたイベント
 EventOnFullDay=一日のイベント
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index 805736feb92..3dc4be416d9 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -32,7 +32,7 @@ RIB=銀行口座番号
 IBAN=IBAN番号
 BIC=BIC / SWIFTコード
 SwiftValid=BIC / SWIFTは有効
-SwiftVNotalid=BIC / SWIFTが無効
+SwiftNotValid=BIC / SWIFTが無効
 IbanValid=有効な禁止
 IbanNotValid=禁止は無効
 StandingOrders=口座振替の注文
@@ -49,7 +49,6 @@ BankAccountDomiciliation=銀行の住所
 BankAccountCountry=口座国
 BankAccountOwner=口座所有者名
 BankAccountOwnerAddress=口座所有者のアドレス
-RIBControlError=値の整合性チェックに失敗した。これは、この口座番号の情報が完全でないか、正しくないことを意味する(国、番号、およびIBANを確認)。
 CreateAccount=口座を作成
 NewBankAccount=新規口座
 NewFinancialAccount=新規金融口座
@@ -168,7 +167,7 @@ ShowVariousPayment=雑費を表示
 AddVariousPayment=その他の支払を追加
 VariousPaymentId=その他の支払ID
 VariousPaymentLabel=その他の支払ラベル
-ConfirmCloneVariousPayment=雑費のクローンを確認
+ConfirmCloneVariousPayment=雑費のクローンを確定
 SEPAMandate=SEPA指令
 YourSEPAMandate=あなたのSEPA指令
 FindYourSEPAMandate=これは、当法人が銀行に口座振替を注文することを承認するSEPA指令。署名済(署名済ドキュメントをスキャン)で返送するか、メールで送付すること
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 93a6ec7fe65..8df18ce010d 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -76,27 +76,26 @@ ReceivedPayments=受け取った支払
 ReceivedCustomersPayments=顧客から受け取った支払
 PayedSuppliersPayments=仕入先に支払われる支払
 ReceivedCustomersPaymentsToValid=検証するために受信されたお客様の支払
-PaymentsReportsForYear=%sの支払報告書
-PaymentsReports=決済レポート
+PaymentsReportsForYear=%sの支払報告書s
+PaymentsReports=決済報告書s
 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=支払条件
 PaymentAmount=支払金額
 PaymentHigherThanReminderToPay=督促状よりも高い支払
-HelpPaymentHigherThanReminderToPay=注意、1つ以上の請求書の支払額は、未払金額よりも高くなっている。 <br>エントリを編集。それ以外の場合は、過払いの請求書ごとに受け取った超過分の貸方表を作成することを確認して検討。
-HelpPaymentHigherThanReminderToPaySupplier=注意、1つ以上の請求書の支払額は、未払金額よりも高くなっている。 <br>エントリを編集。それ以外の場合は、過払いの請求書ごとに支払われた超過分の貸方表を作成することを確認して検討。
+HelpPaymentHigherThanReminderToPay=注意、1つ以上の請求書の支払額は、未払金額よりも高くなっている。 <br>エントリを編集。それ以外の場合は、過払いの請求書ごとに受け取った超過分の貸方表を作成することを確定して検討。
+HelpPaymentHigherThanReminderToPaySupplier=注意、1つ以上の請求書の支払額は、未払金額よりも高くなっている。 <br>エントリを編集。それ以外の場合は、過払いの請求書ごとに支払われた超過分の貸方表を作成することを確定して検討。
 ClassifyPaid=分類 '支払済'
 ClassifyUnPaid=分類 '未払'
 ClassifyPaidPartially=分類 '一部支払済'
@@ -204,8 +203,8 @@ ConfirmClassifyPaidPartiallyReasonBankChargeDesc=未払いの金額は<b>中間
 ConfirmClassifyPaidPartiallyReasonOtherDesc=他のすべてが適切でない場合、たとえば次の状況でこの選択を使用。<br>-一部の製品が返送されたため支払が未完了<br>-割引を忘れたため請求額が多すぎる<br>いずれにせよ、貸方表を作成することにより、会計システムで過払い金を修正。
 ConfirmClassifyAbandonReasonOther=その他
 ConfirmClassifyAbandonReasonOtherDesc=この選択は、他のすべての例で使用される。交換する請求書を作成することを計画するなどの理由で。
-ConfirmCustomerPayment=<b> %s </b> %sのこの支払入力を確認するか？
-ConfirmSupplierPayment=<b> %s </b> %sのこの支払入力を確認するか？
+ConfirmCustomerPayment=<b> %s </b> %sのこの支払入力を確定するか？
+ConfirmSupplierPayment=<b> %s </b> %sのこの支払入力を確定するか？
 ConfirmValidatePayment=この支払を確認してもよいか？支払が確認されると、変更を加えることはできない。
 ValidateBill=請求書を検証する
 UnvalidateBill=請求書を未検証に戻す
@@ -241,12 +240,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,6 +279,7 @@ SetMode=支払種別の設定
 SetRevenuStamp=収入印紙を設定する
 Billed=請求
 RecurringInvoices=定期的な請求書
+RecurringInvoice=定期的な請求書
 RepeatableInvoice=テンプレート請求書
 RepeatableInvoices=テンプレートの請求書
 Repeatable=テンプレート
@@ -376,7 +376,7 @@ CurrentSituationTotal=総現状
 DisabledBecauseNotEnouthCreditNote=シチュエーション請求書をサイクルから削除するには、この請求書の貸方表の合計がこの請求書の合計をカバーしている必要がある
 RemoveSituationFromCycle=この請求書をサイクルから削除する
 ConfirmRemoveSituationFromCycle=この請求書%sをサイクルから削除するか？
-ConfirmOuting=外出を確認する
+ConfirmOuting=外出を確定する
 FrequencyPer_d=%s日ごと
 FrequencyPer_m=%sか月ごと
 FrequencyPer_y=%s年ごと
@@ -399,7 +399,7 @@ GeneratedFromTemplate=テンプレート請求書から生成%s
 WarningInvoiceDateInFuture=警告、請求日が現在の日付よりも高くなっている
 WarningInvoiceDateTooFarInFuture=警告、請求日が現在の日付から遠すぎる
 ViewAvailableGlobalDiscounts=利用可能な割引を表示する
-GroupPaymentsByModOnReports=レポートのモードごとのグループ支払
+GroupPaymentsByModOnReports=報告書sのモードごとのグループ支払
 # PaymentConditions
 Statut=ステータス
 PaymentConditionShortRECEP=受領時
@@ -449,6 +449,8 @@ PaymentTypeTRA=銀行為替手形
 PaymentTypeShortTRA=下書き
 PaymentTypeFAC=因子
 PaymentTypeShortFAC=因子
+PaymentTypeDC=デビット/クレジットカード
+PaymentTypePP=PayPal
 BankDetails=銀行の詳細
 BankCode=銀行コード
 DeskCode=支店コード
@@ -604,3 +606,4 @@ SituationTotalProgress=総進捗状況%d%%
 SearchUnpaidInvoicesWithDueDate=期日が%sの未払請求書を検索する
 NoPaymentAvailable=%sの支払いはない
 PaymentRegisteredAndInvoiceSetToPaid=支払は登録済、請求書%sは支払済に設定
+SendEmailsRemindersOnInvoiceDueDate=未払いの請求書については、メールでリマインダーを送信する
diff --git a/htdocs/langs/ja_JP/blockedlog.lang b/htdocs/langs/ja_JP/blockedlog.lang
index 21959d6a771..afdb0876c7a 100644
--- a/htdocs/langs/ja_JP/blockedlog.lang
+++ b/htdocs/langs/ja_JP/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=このモジュールの使用が必須で
 OnlyNonValid=無効
 TooManyRecordToScanRestrictFilters=スキャン/分析するにはレコードが多すぎ。より制限の厳しいフィルタでリストを制限すること。
 RestrictYearToExport=エクスポートする月/年を制限する
+BlockedLogEnabled=イベントを追跡して変更不可ログに追加するシステムが有効化された
+BlockedLogDisabled=一部の記録が行われた後、イベントを変更不可能なログに追跡するシステムが無効になった。チェーンが壊れていることを追跡するために特別な指紋を保存した
+BlockedLogDisabledBis=イベントを追跡して変更不可ログに追加するシステムが無効化された。おそらく、まだ記録が行われていないため。
diff --git a/htdocs/langs/ja_JP/bookmarks.lang b/htdocs/langs/ja_JP/bookmarks.lang
index ffe0d30c6ad..64131eba0ec 100644
--- a/htdocs/langs/ja_JP/bookmarks.lang
+++ b/htdocs/langs/ja_JP/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=ブックマークURLを選択した場合の動作
 CreateBookmark=ブックマークを作成。
 SetHereATitleForLink=ブックマークの名前を設定 
-UseAnExternalHttpLinkOrRelativeDolibarrLink=外部/絶対リンク (https://URL) または内部/相対リンク(/DOLIBARR_ROOT/htdocs/...)を使用 
+UseAnExternalHttpLinkOrRelativeDolibarrLink=外部/絶対リンク (https://externalurl.com) または内部/相対リンク (/mypage.php) を使用する。 tel:0123456 のような電話を使用することもできる。
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=リンクされたページを現在のタブで開くか、新規タブで開くかを選択 
 BookmarksManagement=ブックマークの管理
 BookmarksMenuShortCut=Ctrl +シフト+ m
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index af4211c0f62..d21f5b0d29b 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -48,7 +48,7 @@ BoxLastExpiredServices=アクティブな期限切れのサービスを持つ最
 BoxTitleLastActionsToDo=実行する最新の%sアクション
 BoxTitleLastContracts=変更された最新の%s契約
 BoxTitleLastModifiedDonations=変更された最新の%s寄付
-BoxTitleLastModifiedExpenses=変更された最新の%s経費報告書
+BoxTitleLastModifiedExpenses=変更された最新の%s経費報告書s
 BoxTitleLatestModifiedBoms=変更された最新の%sBOM
 BoxTitleLatestModifiedMos=変更された最新の%s製造オーダー
 BoxTitleLastOutstandingBillReached=最大未払い額を超えた顧客
@@ -91,7 +91,7 @@ BoxTitleLatestModifiedSupplierOrders=仕入先の注文：最後に変更され
 BoxTitleLastModifiedCustomerBills=最近変更された請求書：%s件
 BoxTitleLastModifiedCustomerOrders=最近変更された受注：%s件
 BoxTitleLastModifiedPropals=最新の%s変更された提案
-BoxTitleLatestModifiedJobPositions=最新の%s変更された求人
+BoxTitleLatestModifiedJobPositions=最新の%s変更された役職s
 BoxTitleLatestModifiedCandidatures=最新の%s変更された求人応募
 ForCustomersInvoices=顧客の請求書
 ForCustomersOrders=顧客の注文
@@ -104,7 +104,7 @@ BoxLastManualEntries=手動またはソースドキュメントなしで入力
 BoxTitleLastManualEntries=%s手動またはソースドキュメントなしで入力された最新のレコード
 NoRecordedManualEntries=会計に手動入力の記録はない
 BoxSuspenseAccount=サスペンスアカウントで会計操作をカウントする
-BoxTitleSuspenseAccount=未割り当て回線の数
+BoxTitleSuspenseAccount=未割り当て行の数
 NumberOfLinesInSuspenseAccount=仮勘定の行数
 SuspenseAccountNotDefined=一時停止アカウントが定義されていない
 BoxLastCustomerShipments=最後の顧客の出荷
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index a3947c4d92e..7e9b4ce86fc 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -7,7 +7,7 @@ CashDeskBankCheque=銀行口座(チェック)
 CashDeskWarehouse=倉庫
 CashdeskShowServices=販売サービス
 CashDeskProducts=製品
-CashDeskStock=株式
+CashDeskStock=在庫
 CashDeskOn=上の
 CashDeskThirdParty=第三者
 ShoppingCart=ショッピングカート
@@ -66,7 +66,7 @@ TicketVatGrouped=チケットのレートでVATをグループ化|領収書
 AutoPrintTickets=チケットを自動的に印刷|領収書
 PrintCustomerOnReceipts=チケットに顧客を印刷する|領収書
 EnableBarOrRestaurantFeatures=バーまたはレストランの機能を有効にする
-ConfirmDeletionOfThisPOSSale=この現在の販売の削除を確認するか？
+ConfirmDeletionOfThisPOSSale=この現在の販売の削除を確定するか？
 ConfirmDiscardOfThisPOSSale=この現在の販売を破棄するか？
 History=履歴
 ValidateAndClose=検証して閉じる
@@ -104,7 +104,7 @@ StartAParallelSale=新規並行販売を開始する
 SaleStartedAt=%sから販売開始
 ControlCashOpening=POSを開くときに「現金の管理」ポップアップを開く
 CloseCashFence=現金出納帳制御を閉じる
-CashReport=現金レポート
+CashReport=現金報告書
 MainPrinterToUse=使用するメインプリンター
 OrderPrinterToUse=使用するプリンタを注文する
 MainTemplateToUse=使用するメインテンプレート
@@ -133,4 +133,4 @@ SplitSale=分割販売
 PrintWithoutDetailsButton=「詳細なしで印刷」ボタンを追加
 PrintWithoutDetailsLabelDefault=詳細なしで印刷する場合のデフォルトの行ラベル
 PrintWithoutDetails=詳細なしで印刷
-YearNotDefined=Year is not defined
+YearNotDefined=年は未定義
diff --git a/htdocs/langs/ja_JP/commercial.lang b/htdocs/langs/ja_JP/commercial.lang
index 8dd879e6269..9a121c41589 100644
--- a/htdocs/langs/ja_JP/commercial.lang
+++ b/htdocs/langs/ja_JP/commercial.lang
@@ -17,7 +17,7 @@ ActionOnContact=関連連絡先
 TaskRDVWith=%sとの打合せ
 ShowTask=タスクを表示
 ShowAction=イベントを表示
-ActionsReport=イベントレポート
+ActionsReport=イベント報告書
 ThirdPartiesOfSaleRepresentative=営業担当者との取引先
 SaleRepresentativesOfThirdParty=取引先の営業担当者
 SalesRepresentative=営業担当者
@@ -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=メールでの顧客の請求書を送信
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index dbcb8b6d089..83257937a61 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -43,15 +43,15 @@ Individual=個人
 ToCreateContactWithSameName=取引先の下にある取引先と同じ情報で連絡先/住所を自動作成。ほとんどの場合、取引先が実在の人物であっても、取引先を作成するだけで十分。
 ParentCompany=親会社
 Subsidiaries=子会社
-ReportByMonth=月次レポート
-ReportByCustomers=顧客ごとのレポート
-ReportByThirdparties=仕入先ごとのレポート
-ReportByQuarter=料金ごとのレポート
+ReportByMonth=月次報告書
+ReportByCustomers=顧客ごとの報告書
+ReportByThirdparties=仕入先ごとの報告書
+ReportByQuarter=料金ごとの報告書
 CivilityCode=敬称コード
 RegisteredOffice=登録事務所
 Lastname=姓
 Firstname=姓名の名
-PostOrFunction=職位
+PostOrFunction=役職
 UserTitle=役職名
 NatureOfThirdParty=取引先の性質
 NatureOfContact=連絡の性質
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id。プロフ 1（貿易登録）
+ProfId2CM=Id。プロフ 2（納税者番号）
+ProfId3CM=Id。プロフ 3（作成指令）
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=貿易登録
+ProfId2ShortCM=納税者番号
+ProfId3ShortCM=作成指令
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=プロフID 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ 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">%s</a>で手動で確認可能
+VATIntraManualCheck=欧州委員会のウェブサイト<a href="%s" target="_blank" rel="noopener noreferrer">%s</a>で手動で確認することもできる
 ErrorVATCheckMS_UNAVAILABLE=ことはできませんを確認してください。サービスは加盟国(%s)によって提供されていない確認してください。
 NorProspectNorCustomer=見込客でない、顧客でない
 JuridicalStatus=事業体種別
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index a6a8214fd9f..25691b11d55 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -168,10 +168,11 @@ AnnualByCompaniesDueDebtMode=収支差額、事前定義されたグループに
 AnnualByCompaniesInputOutputMode=収支差額、事前定義されたグループによる詳細、モード<b>%sIncomes-Expenses%s</b>は<b>現金会計</b>と言える。
 SeeReportInInputOutputMode=元帳未計上によらず、 <b>%s支払の分析%s</b> を参照すること。その対象は <b>記録済支払</b> に基づく計算。
 SeeReportInDueDebtMode=元帳未計上によらず、 <b>%s記録済文書sの分析%s</b> を参照すること。その対象は、既知の <b>記録済文書s </b> に基づく計算。
-SeeReportInBookkeepingMode=<b>%s簿記元帳テーブルの分析%s</b> を参照すること。その対象は、 <b>簿記元帳テーブル</b>基づくレポート。
+SeeReportInBookkeepingMode=<b>%s簿記元帳テーブルの分析%s</b> を参照すること。その対象は、 <b>簿記元帳テーブル</b>基づく報告書。
 RulesAmountWithTaxIncluded=-表示されている金額はすべての税金が含まれている
-RulesResultDue=-未払いの請求書、経費、VAT、支払の有無にかかわらず寄付が含まれる。給与も含まれている。 <br>-請求書の請求日と、経費または税金支払期日に基づいている。給与モジュールで定義された給与の場合、支払の起算日が使用される。
-RulesResultInOut=-これには、請求書、経費、VAT、および給与に対して行われた実際支払が含まれる。 <br>-請求書、経費、VAT、給与支払日に基づいている。寄付の寄付日。
+RulesAmountWithTaxExcluded=-表示されている請求書の金額は、すべて税抜き
+RulesResultDue=-支払済かどうかにかかわらず、すべての請求書、経費、VAT、寄付、給与が含まれる。 <br>-請求書の請求日と、費用または納税の期限日に基づいている。給与については、期末日を使用する。
+RulesResultInOut=-これには、請求書、経費、VAT、および給与に対して行われた実際の支払いが含まれる。 <br>-請求書、経費、VAT、寄付、給与の支払い日に基づいている。
 RulesCADue=-支払の有無にかかわらず、顧客の期日請求書が含まれる。 <br>-これらの請求書の請求日に基づいている。 <br>
 RulesCAIn=-これには、顧客から受け取った請求書のすべての有効な支払が含まれる。 <br>-これらの請求書支払日に基づいている<br>
 RulesCATotalSaleJournal=これには、販売仕訳帳のすべての貸方行が含まれる。
@@ -182,31 +183,31 @@ RulesResultBookkeepingPersonalized=パーソナライズされたグループ</b
 SeePageForSetup=設定については、メニュー<a href="%s"> %s</a>を参照すること。
 DepositsAreNotIncluded=-頭金の請求書は含まれていない
 DepositsAreIncluded=-頭金の請求書が含まれている
-LT1ReportByMonth=月ごとの税2レポート
-LT2ReportByMonth=月ごとの税3レポート
+LT1ReportByMonth=月ごとの税2報告書
+LT2ReportByMonth=月ごとの税3報告書
 LT1ReportByCustomers=第三者による税2の報告
 LT2ReportByCustomers=第三者による税3の報告
-LT1ReportByCustomersES=取引先REによるレポート
+LT1ReportByCustomersES=取引先REによる報告書
 LT2ReportByCustomersES=第三者IRPFによる報告
-VATReport=消費税レポート
-VATReportByPeriods=期間別の消費税レポート
-VATReportByMonth=月別の消費税レポート
-VATReportByRates=料金別の消費税レポート
-VATReportByThirdParties=取引先による消費税レポート　
-VATReportByCustomers=顧客別の消費税レポート
+VATReport=消費税報告書
+VATReportByPeriods=期間別の消費税報告書
+VATReportByMonth=月別の消費税報告書
+VATReportByRates=料金別の消費税報告書
+VATReportByThirdParties=取引先による消費税報告書　
+VATReportByCustomers=顧客別の消費税報告書
 VATReportByCustomersInInputOutputMode=収集され支払われた顧客によるVATの報告
 VATReportByQuartersInInputOutputMode=徴収され支払われた税金の消費税率による報告
 VATReportShowByRateDetails=このレートの詳細を表示する
 LT1ReportByQuarters=税率2を報告する
 LT2ReportByQuarters=税率3を報告する
-LT1ReportByQuartersES=RE率によるレポート
-LT2ReportByQuartersES=IRPF率によるレポート
-SeeVATReportInInputOutputMode=標準的な計算については、レポート<b> %sVATcollection%s</b>を参照すること。
-SeeVATReportInDueDebtMode=請求に関するオプションを使用した計算については、debit%s</b>のレポート<b>%sVATを参照すること。
-RulesVATInServices=-サービスの場合、レポートには、支払い日に基づいて実際に受領または支払われた支払いのVATが含まれる。
-RulesVATInProducts=-重要な資産の場合、レポートには支払い日に基づくVATが含まれる。
-RulesVATDueServices=-サービスの場合、レポートには、請求書の日付に基づいた、支払済みかどうかに関係なく、期日が到来した請求書のVATが含まれる。
-RulesVATDueProducts=-重要な資産の場合、レポートには、請求日に基づいた期日請求書のVATが含まれる。
+LT1ReportByQuartersES=RE率による報告書
+LT2ReportByQuartersES=IRPF率による報告書
+SeeVATReportInInputOutputMode=標準的な計算については、報告書<b> %sVATcollection%s</b>を参照すること。
+SeeVATReportInDueDebtMode=請求に関するオプションを使用した計算については、debit%s</b>の報告書<b>%sVATを参照すること。
+RulesVATInServices=-サービスの場合、報告書には、支払い日に基づいて実際に受領または支払われた支払いのVATが含まれる。
+RulesVATInProducts=-重要な資産の場合、報告書には支払い日に基づくVATが含まれる。
+RulesVATDueServices=-サービスの場合、報告書には、請求書の日付に基づいた、支払済みかどうかに関係なく、期日が到来した請求書のVATが含まれる。
+RulesVATDueProducts=-重要な資産の場合、報告書には、請求日に基づいた期日請求書のVATが含まれる。
 OptionVatInfoModuleComptabilite=注：材料の資産については、それがより公正に配信した日付を使用する必要がある。
 ThisIsAnEstimatedValue=これは、最終元帳テーブルではなくビジネスイベントに基づくプレビューであるため、最終結果はこのプレビュー値とは異なる場合がある。
 PercentOfInvoice=%%/請求書
@@ -237,8 +238,8 @@ Mode1=方法1
 Mode2=方法2
 CalculationRuleDesc=合計VATを計算するには、次の2つの方法がある。<br>方法1は、各行のバットを丸めてから合計。 <br>方法2は、各行のすべてのバットを合計してから、結果を丸める。 <br>最終結果は数円異なる場合がある。デフォルトのモードは <b> %s</b> モード。
 CalculationRuleDescSupplier=ベンダーによると、適切な方法を選択して同じ計算ルールを適用し、ベンダーが期待する同じ結果を取得する。
-TurnoverPerProductInCommitmentAccountingNotRelevant=製品ごとに回収済売上高のレポートは利用できない。このレポートは、請求済売上高に対してのみ使用できる。
-TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=売却税率ごとに回収済売上高のレポートは利用できない。このレポートは、請求済売上高に対してのみ使用できる。
+TurnoverPerProductInCommitmentAccountingNotRelevant=製品ごとに回収済売上高の報告書は利用できない。この報告書は、請求済売上高に対してのみ使用できる。
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=売却税率ごとに回収済売上高の報告書は利用できない。この報告書は、請求済売上高に対してのみ使用できる。
 CalculationMode=計算モード
 AccountancyJournal=会計コードジャーナル
 ACCOUNTING_VAT_SOLD_ACCOUNT=販売時のVATのデフォルトの会計アカウント(VATディクショナリの設定で定義されていない場合に使用)
@@ -248,15 +249,15 @@ ACCOUNTING_ACCOUNT_CUSTOMER=顧客の第三者に使用される会計アカウ
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=取引先カードで定義された専用の会計アカウントは、補助元帳の会計にのみ使用される。これは総勘定元帳に使用され、取引先の専用顧客会計勘定が定義されていない場合は補助元帳会計のデフォルト値として使用される。
 ACCOUNTING_ACCOUNT_SUPPLIER=ベンダーの取引先に使用される会計アカウント
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=取引先カードで定義された専用の会計アカウントは、補助元帳の会計にのみ使用される。これは総勘定元帳に使用され、取引先の専用仕入先会計勘定が定義されていない場合は補助元帳会計のデフォルト値として使用される。
-ConfirmCloneTax=社会税/財政税のクローンを確認する
-ConfirmCloneVAT=VAT宣言のクローンを確認する
-ConfirmCloneSalary=給与のクローンを確認する
+ConfirmCloneTax=社会税/財政税のクローンを確定する
+ConfirmCloneVAT=VAT宣言のクローンを確定する
+ConfirmCloneSalary=給与のクローンを確定する
 CloneTaxForNextMonth=来月のためにそれをクローンする
-SimpleReport=簡単なレポート
-AddExtraReport=追加レポート(海外および国内の顧客レポートを追加)
+SimpleReport=簡単な報告書
+AddExtraReport=追加報告書s(海外および国内の顧客報告書sを追加)
 OtherCountriesCustomersReport=外国の顧客の報告
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=自法人の国コードとは異なるVAT番号の最初の2文字に基づく
-SameCountryCustomersWithVAT=全国の顧客レポート
+SameCountryCustomersWithVAT=全国の顧客報告書
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=VAT番号の最初の2文字が、自法人の国コードと同じであることに基づく
 LinkedFichinter=介入へのリンク
 ImportDataset_tax_contrib=社会/財政税
@@ -272,8 +273,8 @@ ClaimedForThisPeriod=期間中請求
 PaidDuringThisPeriod=この期間に支払われた
 PaidDuringThisPeriodDesc=これは、選択した日付範囲内の期末日を持つVAT申告にリンクされたすべての支払いの合計。
 ByVatRate=売却税率
-TurnoverbyVatrate=売上税率での請求済売上高
-TurnoverCollectedbyVatrate=売上税率での回収済売上高
+TurnoverbyVatrate=消費税率別請求高
+TurnoverCollectedbyVatrate=消費税率別回収高
 PurchasebyVatrate=売却税率による購入
 LabelToShow=短縮ラベル
 PurchaseTurnover=購入売上高
@@ -284,8 +285,8 @@ RulesPurchaseTurnoverTotalPurchaseJournal=これには、購入仕訳帳から
 RulesPurchaseTurnoverOfExpenseAccounts=それには、グループEXPENSEでの製品勘定の (借方-貸方) 行が含まれる。
 ReportPurchaseTurnover=請求済購入取引高
 ReportPurchaseTurnoverCollected=回収済購入取引高
-IncludeVarpaysInResults = レポートにさまざまな支払を含める
-IncludeLoansInResults = レポートにローンを含める
+IncludeVarpaysInResults = 報告書sにさまざまな支払を含める
+IncludeLoansInResults = 報告書sにローンを含める
 InvoiceLate30Days = 請求書遅延（> 30日）
 InvoiceLate15Days = 請求書遅延（15〜30日）
 InvoiceLateMinus15Days = 請求書遅延（<15日）
@@ -295,3 +296,5 @@ InvoiceNotLate30Days = 収集予定（> 30日）
 InvoiceToPay=支払（<15日）
 InvoiceToPay15Days=支払（15〜30日）
 InvoiceToPay30Days=支払（> 30日）
+ConfirmPreselectAccount=会計コードを予備選択する
+ConfirmPreselectAccountQuestion=選択済の%s行を、この会計コードで予備選択にしてもよいか？
diff --git a/htdocs/langs/ja_JP/contracts.lang b/htdocs/langs/ja_JP/contracts.lang
index 8a55813e756..6d69bd57da5 100644
--- a/htdocs/langs/ja_JP/contracts.lang
+++ b/htdocs/langs/ja_JP/contracts.lang
@@ -73,13 +73,13 @@ ServiceStatus=サービスのステータス
 DraftContracts=下書き契約
 CloseRefusedBecauseOneServiceActive=少なくとも1つのオープンサービスがあるため、契約を閉じることはできない
 ActivateAllContracts=すべて契約行をアクティブ化する
-CloseAllContracts=すべて契約回線を閉じる
+CloseAllContracts=すべて契約行を閉じる
 DeleteContractLine=契約の行を削除する
 ConfirmDeleteContractLine=こ契約行を削除してもよいか？
 MoveToAnotherContract=別契約にサービスを移動する。
-ConfirmMoveToAnotherContract=私は、新規ターゲット契約を選びましたし、私はこ契約には、このサービスを移動することを確認する。
+ConfirmMoveToAnotherContract=私は、新規ターゲット契約を選びましたし、私はこ契約には、このサービスを移動することを確定する。
 ConfirmMoveToAnotherContractQuestion=このサービスを移動する(同じ取引先の)既存契約を選択するか？
-PaymentRenewContractId=契約回線(番号の%s)を​​更新
+PaymentRenewContractId=契約行(番号%s)を​​更新
 ExpiredSince=有効期限の日付
 NoExpiredServices=失効済アクティブサービス無し
 ListOfServicesToExpireWithDuration=%s日で失効済になるサービスリスト
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index 3ef0d3a7c88..f6215bfde2a 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = スケジュールされたジョブを読む
+Permission23101 = スケジュールされたジョブを読込む
 Permission23102 = スケジュールされたジョブの作成/更新
 Permission23103 = スケジュールされたジョブを削除する
 Permission23104 = スケジュールされたジョブを実行する
diff --git a/htdocs/langs/ja_JP/deliveries.lang b/htdocs/langs/ja_JP/deliveries.lang
index 950d219d9cb..0a6356e386b 100644
--- a/htdocs/langs/ja_JP/deliveries.lang
+++ b/htdocs/langs/ja_JP/deliveries.lang
@@ -24,7 +24,7 @@ GoodStatusDeclaration=良好な状態で上記の品物を受け取っている
 Deliverer=配送者：
 Sender=差出人
 Recipient=受領者
-ErrorStockIsNotEnough=在庫が不足
+ErrorStockIsNotEnough=在庫が不十分
 Shippable=発送可能
 NonShippable=発送不可
 ShowShippableStatus=出荷可能なステータスを表示する
diff --git a/htdocs/langs/ja_JP/ecm.lang b/htdocs/langs/ja_JP/ecm.lang
index c1b706cdcac..4452d1ba6f1 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=一部のファイルが含まれているため、削除できない
@@ -42,8 +42,8 @@ ExtraFieldsEcmFiles=ExtrafieldsEcmファイル
 ExtraFieldsEcmDirectories=ExtrafieldsEcmディレクトリ
 ECMSetup=ECM設定
 GenerateImgWebp=すべての画像を.webp形式の別のバージョンで複製する
-ConfirmGenerateImgWebp=確認すると、現在このフォルダーにあるすべての画像に対して.webp形式の画像が生成される（サブフォルダーは含まれない）...
-ConfirmImgWebpCreation=すべての画像の重複を確認する
+ConfirmGenerateImgWebp=確定すると、現在このフォルダーにあるすべての画像に対して.webp形式の画像が生成される（サブフォルダーは含まれない）...
+ConfirmImgWebpCreation=すべての画像の重複を確定する
 SucessConvertImgWebp=画像が正常に複製された
 ECMDirName=ディレクトリ名
 ECMParentDirectory=親ディレクトリ
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 1351a01c7b2..221d7673ead 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=この連絡先は既にこのタイ
 ErrorCashAccountAcceptsOnlyCashMoney=この銀行口座は現金勘定であるため、それが唯一のタイプの現金の支払を受け入れる。
 ErrorFromToAccountsMustDiffers=ソースとターゲットの銀行口座は異なっている必要がある。
 ErrorBadThirdPartyName=取引先名の値が正しくない
+ForbiddenBySetupRules=設定ルールにより禁止
 ErrorProdIdIsMandatory=%sは必須だ
+ErrorAccountancyCodeCustomerIsMandatory=顧客%sの会計コードは必須
 ErrorBadCustomerCodeSyntax=顧客コードの不正な構文
 ErrorBadBarCodeSyntax=バーコードの構文が正しくない。不正なバーコードタイプを設定したか、スキャンした値と一致しない番号付け用のバーコードマスクを定義した可能性がある。
 ErrorCustomerCodeRequired=顧客コードが必要だ
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=RSSフィードの取得に失敗した。エラーメ
 ErrorForbidden=アクセスが拒否された。 <br>無効にされたモジュールのページ、領域、または機能にアクセスしようとしたか、認証されたセッションに参加していないか、ユーザーに許可されていない。
 ErrorForbidden2=このログインの許可は、メニュー%s  - &gt; %sからDolibarr管理者によって定義することができる。
 ErrorForbidden3=そのDolibarrが認証セッションを介して使用されていないようだ。認証を(htaccessファイルは、mod_authまたは他の...)を管理する方法を知ってDolibarr設定ドキュメントを見てみよう。
+ErrorForbidden4=注：このログインの既存のセッションを破棄するには、ブラウザのCookieをクリアすること。
 ErrorNoImagickReadimage=クラスImagickが、このPHPで発見さ​​れていない。なしプレビューは利用できない。管理者は、メニューのSetupから、このタブを無効にすることができる - 表示する。
 ErrorRecordAlreadyExists=すでに登録されている
 ErrorLabelAlreadyExists=このラベルはすでに存在する
@@ -173,9 +176,9 @@ ErrorPriceExpression24=変数 '%s'は存在するが、値がない
 ErrorPriceExpressionInternal=内部エラー '%s'
 ErrorPriceExpressionUnknown=不明なエラー '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=ソースウェアハウスとターゲットウェアハウスは異なる必要がある
-ErrorTryToMakeMoveOnProductRequiringBatchData=ロット/シリアル情報を必要とする製品 '%s'で、ロット/シリアル情報なしで在庫移動を行おうとするとエラーが発生した
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=記録されたすべての受信は、このアクションを実行する前に、まず確認(承認または拒否)する必要がある
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=このアクションを実行する前に、記録されたすべての受信を最初に確認(承認)する必要がある
+ErrorTryToMakeMoveOnProductRequiringBatchData=ロット/シリアル情報を必要とする製品 '%s'で、ロット/シリアル情報なしで在庫推移を行おうとするとエラーが発生した
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=記録されたすべての受付は、このアクションを実行する前に、まず確認(承認または拒否)する必要がある
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=このアクションを実行する前に、記録されたすべての受付を最初に確認(承認)する必要がある
 ErrorGlobalVariableUpdater0=HTTPリクエストがエラー "%s" で失敗した
 ErrorGlobalVariableUpdater1=無効なJSON形式 '%s'
 ErrorGlobalVariableUpdater2=パラメータ  '%s'がない
@@ -271,6 +274,9 @@ CheckVersionFail=バージョンチェックに失敗する
 ErrorWrongFileName=ファイル名に__SOMETHING__を含めることはできない
 ErrorNotInDictionaryPaymentConditions=支払条件辞書にないので、変更すること。
 ErrorIsNotADraft=%sはドラフトではない
+ErrorExecIdFailed=コマンド「id」を実行できない
+ErrorBadCharIntoLoginName=ログイン名に含まれる不正な文字
+ErrorRequestTooLarge=Error, request too large
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHPパラメータ upload_max_filesize(%s)は、PHPパラメータ post_max_size(%s)よりも大きくなっている。これは一貫した設定ではない。
@@ -312,6 +318,7 @@ RequireAtLeastXString = 少なくとも%s文字(s)が必要
 RequireXStringMax = 最大%s文字(s)が必要
 RequireAtLeastXDigits = 少なくとも%s桁(s)が必要
 RequireXDigitsMax = 最大%s桁(s)が必要
+RequireValidNumeric = 数値が必要
 RequireValidEmail = メールアドレスが無効.
 RequireMaxLength = 長さは%s文字未満である必要がある
 RequireMinLength = 長さは%s文字(s)より長くする必要がある
diff --git a/htdocs/langs/ja_JP/eventorganization.lang b/htdocs/langs/ja_JP/eventorganization.lang
index 867cbe52756..8d39e33b2b4 100644
--- a/htdocs/langs/ja_JP/eventorganization.lang
+++ b/htdocs/langs/ja_JP/eventorganization.lang
@@ -44,10 +44,10 @@ 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
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = ブースのお支払い
 EventOrganizationEmailRegistrationPayment = イベントへの登録
 EventOrganizationMassEmailAttendees = 参加者へのコミュニケーション
 EventOrganizationMassEmailSpeakers = 話者とのコミュニケーション
+ToSpeakers=スピーカーへ
 
 #
 # Event
@@ -83,21 +84,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,7 +126,7 @@ BoothLocationFee = イベントのブース位置: '%s' で %s から %s まで
 EventType = イベント種別
 LabelOfBooth=ブースラベル
 LabelOfconference=会議ラベル
-ConferenceIsNotConfirmed=登録できません。会議はまだ確認されていない
+ConferenceIsNotConfirmed=登録できません。会議はまだ確定されていない
 DateMustBeBeforeThan=%sは必ず%sの前
 DateMustBeAfterThan=%sは必ず%sの後
 
@@ -153,7 +154,7 @@ AlreadyVoted = あなたはすでにこのイベントに投票している。
 VoteError = 投票中にエラーが発生した。もう一度やり直し願う。
 
 SubscriptionOk = 登録が検証された
-ConfAttendeeSubscriptionConfirmation = イベントへのサブスクリプションの確認
+ConfAttendeeSubscriptionConfirmation = イベントへのサブスクリプションの確定
 Attendee = 参加者
 PaymentConferenceAttendee = 会議参加者の支払い
 PaymentBoothLocation = ブースの場所の支払い
diff --git a/htdocs/langs/ja_JP/exports.lang b/htdocs/langs/ja_JP/exports.lang
index b61dad09fb0..08d9d2203f5 100644
--- a/htdocs/langs/ja_JP/exports.lang
+++ b/htdocs/langs/ja_JP/exports.lang
@@ -49,7 +49,7 @@ LineQty=線の量
 LineTotalHT=除く金額ラインの税金
 LineTotalTTC=ラインのための税の額
 LineTotalVAT=ラインの付加価値税の額
-TypeOfLineServiceOrProduct=回線の種類(0 =製品、1 =サービス)
+TypeOfLineServiceOrProduct=行の種類(0 =製品、1 =サービス)
 FileWithDataToImport=インポートするデータを持つファイル
 FileToImport=インポートするソースファイル
 FileMustHaveOneOfFollowingFormat=インポートするファイルは、次のいずれかの形式である必要がある
diff --git a/htdocs/langs/ja_JP/help.lang b/htdocs/langs/ja_JP/help.lang
index 03c8d679168..dad01341b51 100644
--- a/htdocs/langs/ja_JP/help.lang
+++ b/htdocs/langs/ja_JP/help.lang
@@ -20,4 +20,4 @@ BackToHelpCenter=それ以外の場合、<a href="%s">ヘルプセンターの
 LinkToGoldMember=彼らのウィジェットをクリックすると(状態と最高価格は自動更新され)、Dolibarrによって事前選択されたトレーナーの1人と自分の言語 (%s) で電話できるよ。
 PossibleLanguages=サポートされる言語
 SubscribeToFoundation=Dolibarrプロジェクトを支援し、財団に登録
-SeeOfficalSupport=お使いの言語での公式Dolibarrサポート: <br><b><a href="%s" target="_blank">%s</a></b>
+SeeOfficalSupport=お使いの言語での公式のDolibarrサポートの場合：<br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
diff --git a/htdocs/langs/ja_JP/holiday.lang b/htdocs/langs/ja_JP/holiday.lang
index ad0eca06734..ffdb542f460 100644
--- a/htdocs/langs/ja_JP/holiday.lang
+++ b/htdocs/langs/ja_JP/holiday.lang
@@ -27,12 +27,12 @@ DescCP=説明
 SendRequestCP=休暇申請を作成する
 DelayToRequestCP=休暇申請は、少なくとも<b>%s日(s)前に</b>で行う必要がある。
 MenuConfCP=休暇のバランス
-SoldeCPUser=休暇の残は<b>%s</b>日。
+SoldeCPUser=残額（日数）<b> %s </b>
 ErrorEndDateCP=開始日よりも大きい終了日を選択する必要がある。
 ErrorSQLCreateCP=作成中にSQLエラーが発生した：
 ErrorIDFicheCP=エラーが発生した。脱退リクエストは存在しない。
 ReturnCP=前のページに戻る
-ErrorUserViewCP=この休暇申請を読むことは許可されていない。
+ErrorUserViewCP=この休暇申請を読込むことは許可されていない。
 InfosWorkflowCP=情報ワークフロー
 RequestByCP=に要求された
 TitreRequestCP=休暇願
@@ -52,7 +52,7 @@ ActionRefuseCP=却下
 ActionCancelCP=キャンセル
 StatutCP=ステータス
 TitleDeleteCP=休暇申請を削除する
-ConfirmDeleteCP=この休暇申請の削除を確認するか？
+ConfirmDeleteCP=この休暇申請の削除を確定するか？
 ErrorCantDeleteCP=エラー この休暇申請を削除する権利がない。
 CantCreateCP=休暇申請をする権利がない。
 InvalidValidatorCP=休暇申請の承認者を選択する必要がある。
@@ -134,3 +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/ja_JP/hrm.lang b/htdocs/langs/ja_JP/hrm.lang
index d9b5ba408b7..466654da6a7 100644
--- a/htdocs/langs/ja_JP/hrm.lang
+++ b/htdocs/langs/ja_JP/hrm.lang
@@ -13,20 +13,21 @@ CloseEtablishment=事業所を閉じる
 # Dictionary
 DictionaryPublicHolidays=休暇-祝日
 DictionaryDepartment=HRM - 部門一覧
-DictionaryFunction=HRM - 職位
+DictionaryFunction=HRM - 役職
 # Module
 Employees=従業員s
 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,10 +48,9 @@ ConfirmValidateEvaluation=参照<b>%s </b>を使用してこの評価を検証
 EvaluationCard=評価カード
 RequiredRank=この仕事に必要なランク
 EmployeeRank=このスキルの従業員ランク
-Position=位置
-Positions=ポジション
-PositionCard=ポジションカード
-EmployeesInThisPosition=このポジションの従業員
+EmployeePosition=従業員の役職
+EmployeePositions=従業員の役職s
+EmployeesInThisPosition=この役職の従業員
 group1ToCompare=分析するユーザーグループ
 group2ToCompare=比較のための2番目のユーザーグループ
 OrJobToCompare=仕事のスキル要件と比較する
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index 1a40a746c65..06174cca6a6 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -21,6 +21,7 @@ ErrorPHPDoesNotSupportCurl=お使いのPHPインストールはCurlをサポー
 ErrorPHPDoesNotSupportCalendar=PHPインストールは、phpカレンダー拡張機能をサポートしない。
 ErrorPHPDoesNotSupportUTF8=PHPインストールはUTF8関数をサポートしない。 Dolibarrは正しく機能しない。 Dolibarrをインストールする前にこれを解決すること。
 ErrorPHPDoesNotSupportIntl=PHPインストールはIntl関数をサポートしない。
+ErrorPHPDoesNotSupportMbstring=このPHPインストールはmbstring関数をサポートしない。
 ErrorPHPDoesNotSupportxDebug=PHPインストールは、拡張デバッグ機能をサポートしない。
 ErrorPHPDoesNotSupport=PHPインストールは、%s関数をサポートしない。
 ErrorDirDoesNotExists=%sディレクトリが存在しません。
@@ -54,7 +55,7 @@ DatabaseName=データベース名
 DatabasePrefix=データベースのテーブル接頭辞
 DatabasePrefixDescription=データベースのテーブル接頭辞。空欄にするとデフォルトの「llx_」が設定される。
 AdminLogin=Dolibarrデータベース所有者のユーザアカウント。
-PasswordAgain=パスワード確認の再入力
+PasswordAgain=パスワード確定の再入力
 AdminPassword=Dolibarrデータベースの所有者のパスワード。
 CreateDatabase=データベースを作成する。
 CreateUser=Dolibarrデータベースでユーザアカウントを作成するか、ユーザアカウントのアクセス許可を付与する
@@ -164,7 +165,7 @@ MigrationPaymentsNothingToUpdate=これ以上実行すべきことはない
 MigrationPaymentsNothingUpdatable=訂正することができるこれ以上の支払いなし
 MigrationContractsUpdate=契約データの補正
 MigrationContractsNumberToUpdate=更新する%s契約(複数可)
-MigrationContractsLineCreation=契約のref %sの契約回線を作成する。
+MigrationContractsLineCreation=契約参照 %s の契約行を作成する。
 MigrationContractsNothingToUpdate=これ以上実行すべきことsはない
 MigrationContractsFieldDontExist=フィールドfk_factureはもう存在しません。何もすることはありません。
 MigrationContractsEmptyDatesUpdate=契約空の日付の訂正
@@ -187,7 +188,7 @@ MigrationBankTransfertsNothingToUpdate=すべてのリンクが最新のもの
 MigrationShipmentOrderMatching=Sendings領収書の更新
 MigrationDeliveryOrderMatching=配信確認メッセージの更新
 MigrationDeliveryDetail=配信のアップデート
-MigrationStockDetail=製品の在庫の値を更新
+MigrationStockDetail=製品の在庫値を更新
 MigrationMenusDetail=動的メニューのテーブルを更新
 MigrationDeliveryAddress=出荷の配送先住所を更新
 MigrationProjectTaskActors=テーブルllx_projet_task_actorsのデータ移行
diff --git a/htdocs/langs/ja_JP/intracommreport.lang b/htdocs/langs/ja_JP/intracommreport.lang
index 83b8b3f574b..b34291e0d39 100644
--- a/htdocs/langs/ja_JP/intracommreport.lang
+++ b/htdocs/langs/ja_JP/intracommreport.lang
@@ -1,7 +1,7 @@
-Module68000Name = Intracomm レポート
-Module68000Desc = Intracomm レポート管理(フランス語のDEB / DES形式のサポート)
-IntracommReportSetup = Intracommreportモジュールの設定
-IntracommReportAbout = Intracomm レポートについて
+Module68000Name = 域内報告書
+Module68000Desc = 域内報告書管理(フランス語のDEB / DES形式のサポート)
+IntracommReportSetup = 域内報告書モジュールの設定
+IntracommReportAbout = 域内報告書について
 
 # Setup
 INTRACOMMREPORT_NUM_AGREMENT=Numérod'agrément(délivréparleCISD de rattachement)
@@ -14,7 +14,7 @@ INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégoriedeservicesdetype「Fraisdeport」
 INTRACOMMREPORT_NUM_DECLARATION=Numérodedéclarant
 
 # Menu
-MenuIntracommReport=Intracomm レポート
+MenuIntracommReport=域内報告書
 MenuIntracommReportNew=新規宣言
 MenuIntracommReportList=リスト
 
diff --git a/htdocs/langs/ja_JP/knowledgemanagement.lang b/htdocs/langs/ja_JP/knowledgemanagement.lang
index a10e53cb59d..34bcc6ef39d 100644
--- a/htdocs/langs/ja_JP/knowledgemanagement.lang
+++ b/htdocs/langs/ja_JP/knowledgemanagement.lang
@@ -48,3 +48,7 @@ KnowledgeRecordExtraFields = 記事のエクストラフィールド
 GroupOfTicket=チケットのグループ
 YouCanLinkArticleToATicketCategory=記事をチケットグループにリンクできる(新規チケット認定時に記事が提案されるようになる)
 SuggestedForTicketsInGroup=チケットに対して提案されるのは、グループが
+
+SetObsolete=廃止として設定
+ConfirmCloseKM=この記事の締めくくりが廃止されたことを確定するか？
+ConfirmReopenKM=この記事をステータス「検証済み」に復元するか？
diff --git a/htdocs/langs/ja_JP/loan.lang b/htdocs/langs/ja_JP/loan.lang
index 7b09bf4ef54..fa97491403b 100644
--- a/htdocs/langs/ja_JP/loan.lang
+++ b/htdocs/langs/ja_JP/loan.lang
@@ -14,9 +14,9 @@ Term=期間
 LoanAccountancyCapitalCode=会計科目資本
 LoanAccountancyInsuranceCode=会計科目保険
 LoanAccountancyInterestCode=会計科目利息
-ConfirmDeleteLoan=このローンの削除を確認する
+ConfirmDeleteLoan=このローンの削除を確定する
 LoanDeleted=ローンが正常に削除された
-ConfirmPayLoan=分類がこのローンを支払ったことを確認する
+ConfirmPayLoan=分類がこのローンを支払ったことを確定する
 LoanPaid=ローン支払い
 ListLoanAssociatedProject=プロジェクトに関連するローンのリスト
 AddLoan=ローンを作成する
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index 01d0df7d046..1df89aa640e 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -109,7 +109,7 @@ SendMailing=メール送信送信
 SentBy=によって送信され、
 MailingNeedCommand=メールの送信はコマンドラインから実行できる。サーバー管理者に次のコマンドを起動して、すべての受信者に電子メールを送信するように依頼すること。
 MailingNeedCommand2=ただし、セッションで送信するメールの最大数の値を持つパラメータのMAILING_LIMIT_SENDBYWEBを追加することによってそれらをオンラインで送信することができる。このため、ホーム - 設定 - その他 に行くこと。
-ConfirmSendingEmailing=この画面から直接メールを送信したい場合は、ブラウザから今すぐメールを送信することを確認すること。
+ConfirmSendingEmailing=この画面から直接メールを送信したい場合は、ブラウザから今すぐメールを送信することを確定すること。
 LimitSendingEmailing=注：Webインターフェースからの電子メールの送信は、セキュリティとタイムアウトの理由から数回行われる。各送信セッションで一度に<b> %s</b>受信者が実行される。
 TargetsReset=一覧をクリアする
 ToClearAllRecipientsClickHere=このメール送信の受信者リストをクリアするにはここをクリック
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 546bc590722..f085068bfda 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=エラー、国%s 'に対して定義さ
 ErrorNoSocialContributionForSellerCountry=エラー、国 '%s'に定義された社会/財政税タイプがありません。
 ErrorFailedToSaveFile=エラー、ファイルを保存に失敗しました。
 ErrorCannotAddThisParentWarehouse=すでに既存の倉庫の子である親倉庫を追加しようとしている
+FieldCannotBeNegative=フィールド "%s" は負の値にはできない
 MaxNbOfRecordPerPage=パージ当たりの最大レコード数
 NotAuthorized=その実行には権限が不足
 SetDate=日付を設定する
@@ -85,9 +86,9 @@ FileTransferComplete=ファイルが正常にアップロードされました
 FilesDeleted=ファイルが正常に削除されました
 FileWasNotUploaded=ファイルが添付ファイルが選択されているが、まだアップロードされませんでした。このために &quot;添付ファイル&quot;をクリックしてください。
 NbOfEntries=エントリー番号
-GoToWikiHelpPage=オンラインヘルプを読む(インターネットアクセスが必要)
+GoToWikiHelpPage=オンラインヘルプを読込む(インターネットアクセスが必要)
 GoToHelpPage=ヘルプを見る
-DedicatedPageAvailable=現在の画面に関連する専用のヘルプページがある
+DedicatedPageAvailable=現在の画面に関連する専用のヘルプページ
 HomePage=ホームページ
 RecordSaved=レコード保存
 RecordDeleted=レコード削除
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=最新のデータベースアクセス要求エラ
 InformationLastAccessInError=最新のデータベースアクセス要求エラーに関する情報
 DolibarrHasDetectedError=Dolibarrで技術的なエラーを検出
 YouCanSetOptionDolibarrMainProdToZero=詳細については、ログファイルを読み取るか、構成ファイルでオプション$ dolibarr_main_prodを「0」に設定してください。
-InformationToHelpDiagnose=この情報は診断目的に役立つ(オプション$ dolibarr_main_prodを「1」に設定してそのような通知を削除できる)
+InformationToHelpDiagnose=この情報は診断目的に役立ちます（機密情報を非表示にするためにオプション$ dolibarr_main_prodを「1」に設定できる）
 MoreInformation=詳しい情報
 TechnicalInformation=技術的情報
 TechnicalID=技術ID
@@ -161,7 +162,7 @@ Update=更新
 Close=閉じる
 CloseAs=ステータスをに設定する
 CloseBox=ダッシュボードからウィジェットを削除する
-Confirm=確認する
+Confirm=確定する
 ConfirmSendCardByMail=このカードの内容を本当にメールで<b>%s </b>に送信するか？
 Delete=削除する
 Remove=削除する
@@ -211,6 +212,8 @@ User=ユーザー
 Users=ユーザー
 Group=グループ
 Groups=グループ
+UserGroup=ユーザ・グループ
+UserGroups=ユーザ・グループs
 NoUserGroupDefined=ユーザーグループが定義されていない
 Password=パスワード
 PasswordRetype=パスワードを再入力
@@ -246,7 +249,7 @@ DefaultModel=デフォルトのドキュメントテンプレート
 Action=イベント
 About=約
 Number=数
-NumberByMonth=月ごとの合計レポート
+NumberByMonth=月ごとの合計報告書s
 AmountByMonth=月別量
 Numero=数
 Limit=制限
@@ -288,7 +291,7 @@ DateOperationShort=オペラ。日付
 DateLimit=日付を制限する
 DateRequest=リクエストの日付
 DateProcess=処理日
-DateBuild=日付をビルドレポート
+DateBuild=ビルド日を報告
 DatePayment=支払日
 DateApprove=承認日
 DateApprove2=承認日(2回目の承認)
@@ -416,9 +419,9 @@ HT=税抜
 TTC=税込
 INCVATONLY=Inc. VAT
 INCT=全ての税額を含む
-VAT=売上税
+VAT=消費税
 VATIN=IGST
-VATs=売上税
+VATs=消費税s
 VATINs=IGST税
 LT1=消費税2
 LT1Type=消費税2タイプ
@@ -619,12 +622,12 @@ JoinMainDoc=主ドキュメントを結合
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH：SS
-ReportName=レポート名
-ReportPeriod=レポート期間
+ReportName=報告書名
+ReportPeriod=報告書期間
 ReportDescription=説明
-Report=レポート
+Report=報告書
 Keyword=キーワード
-Origin=原点
+Origin=原産地
 Legend=凡例
 Fill=字詰め
 Reset=リセット
@@ -679,7 +682,7 @@ SendByMail=メールで送る
 MailSentBy=によって送信される電子メール
 NotSent=送信されません
 TextUsedInTheMessageBody=電子メールの本文
-SendAcknowledgementByMail=確認メールを送信する
+SendAcknowledgementByMail=確定メールを送信する
 SendMail=メールを送る
 Email=Eメール
 NoEMail=まだメールしない
@@ -878,7 +881,7 @@ TooManyRecordForMassAction=マスアクション用に選択されたレコー
 NoRecordSelected=レコードが選択されていない
 MassFilesArea=大量アクションによって作成されたファイルの領域
 ShowTempMassFilesArea=大量アクションによって作成されたファイルの領域を表示する
-ConfirmMassDeletion=一括削除確認
+ConfirmMassDeletion=一括削除確定
 ConfirmMassDeletionQuestion=選択した%sレコード(s)を削除してもよいか？
 RelatedObjects=関連オブジェクト
 ClassifyBilled=請求分類
@@ -887,7 +890,7 @@ Progress=進捗
 ProgressShort=プログラム
 FrontOffice=フロントオフィス
 BackOffice=バックオフィス
-Submit=参加する
+Submit=提出
 View=見る
 Export=Export
 Exports=Exports
@@ -906,7 +909,7 @@ ViewFlatList=フラットリストを表示
 ViewAccountList=元帳を表示
 ViewSubAccountList=補助科目元帳を表示
 RemoveString=文字列 '%s'を削除する
-SomeTranslationAreUncomplete=提供された言語の一部において、翻訳がほんの部分的だったり誤っていたりなの。自分の言語の訂正を助けたい人は、<a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> に登録して、改善案を追加してね。
+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=非公開ダウンロードリンク
@@ -923,7 +926,7 @@ WebSite=ウェブサイト
 WebSites=ウェブサイト
 WebSiteAccounts=ウェブサイトアカウント
 ExpenseReport=経費報告書
-ExpenseReports=経費報告書
+ExpenseReports=経費報告書s
 HR=人事
 HRAndBank=人事と銀行
 AutomaticallyCalculated=自動計算
@@ -1036,7 +1039,7 @@ SearchIntoSupplierProposals=ベンダーの提案
 SearchIntoInterventions=介入
 SearchIntoContracts=契約
 SearchIntoCustomerShipments=顧客の出荷
-SearchIntoExpenseReports=経費報告書
+SearchIntoExpenseReports=経費報告書s
 SearchIntoLeaves=離れる
 SearchIntoTickets=切符売場
 SearchIntoCustomerPayments=顧客の支払い
@@ -1097,14 +1100,14 @@ ContactDefault_ticket=チケット
 ContactAddedAutomatically=連絡先の取引先の役割から追加された連絡先
 More=もっと
 ShowDetails=詳細を表示
-CustomReports=カスタムレポート
+CustomReports=カスタム報告書s
 StatisticsOn=の統計
 SelectYourGraphOptionsFirst=グラフオプションを選択してグラフを作成する
 Measures=対策
 XAxis=X軸
 YAxis=Y軸
 StatusOfRefMustBe=%sのステータスは%sである必要がある
-DeleteFileHeader=ファイル削除の確認
+DeleteFileHeader=ファイル削除の確定
 DeleteFileText=本当にこのファイルを削除するか？
 ShowOtherLanguages=他の言語を表示する
 SwitchInEditModeToAddTranslation=この言語の翻訳を追加するには、編集モードに切り替える
@@ -1140,9 +1143,9 @@ ConfirmCancel=本当にキャンセルしたいか
 EmailMsgID=メールMsgID
 SetToEnabled=有効に設定
 SetToDisabled=無効に設定
-ConfirmMassEnabling=一括有効化の確認
+ConfirmMassEnabling=一括有効化の確定
 ConfirmMassEnablingQuestion=選択した%sレコード(s)を有効にするか？
-ConfirmMassDisabling=一括無効化の確認
+ConfirmMassDisabling=一括無効化の確定
 ConfirmMassDisablingQuestion=選択した%sレコード(s)を無効にしてもよいか？
 RecordsEnabled=%sレコード(s)が有効
 RecordsDisabled=%sレコード(s)が無効
@@ -1151,11 +1154,13 @@ RecordDisabled=記録が無効
 Forthcoming=今後の予定
 Currently=現在
 ConfirmMassLeaveApprovalQuestion=%s選択レコード(s)を承認してもよい.か？
-ConfirmMassLeaveApproval=一括休暇承認確認
+ConfirmMassLeaveApproval=一括休暇承認確定
 RecordAproved=承認された記録
 RecordsApproved=%sレコード(s)承認済み
 Properties=プロパティ
 hasBeenValidated=%sが検証された
 ClientTZ=クライアントのタイムゾーン (ユーザ)
 NotClosedYet=まだ閉店していません
-ClearSignature=署名のリセット
+ClearSignature=署名をリセット
+CanceledHidden=非表示キャンセル済
+CanceledShown=表示済キャンセル済
diff --git a/htdocs/langs/ja_JP/margins.lang b/htdocs/langs/ja_JP/margins.lang
index e688edfb0ff..65aaf84dfa3 100644
--- a/htdocs/langs/ja_JP/margins.lang
+++ b/htdocs/langs/ja_JP/margins.lang
@@ -37,9 +37,9 @@ CostPrice=原価
 UnitCharges=ユニット料金
 Charges=料金
 AgentContactType=商業代理店の連絡先タイプ
-AgentContactTypeDetails=連絡先/住所ごとの利益レポートに使用される連絡先タイプ(請求書にリンクされている)を定義する。ほとんどの場合、連絡先が請求書で明示的に定義されていない可能性があるため、連絡先の統計の読み取りは信頼できないことに注意すること。
+AgentContactTypeDetails=連絡先/住所ごとの利益報告書に使用される連絡先タイプ(請求書にリンクされている)を定義する。ほとんどの場合、連絡先が請求書で明示的に定義されていない可能性があるため、連絡先の統計の読み取りは信頼できないことに注意すること。
 rateMustBeNumeric=レートは数値でなければなりません
 markRateShouldBeLesserThan100=マーク率は100未満である必要がある
 ShowMarginInfos=利益情報を表示する
 CheckMargins=利益の詳細
-MarginPerSaleRepresentativeWarning=ユーザーあたりの利益のレポートは、取引先と営業担当者の間のリンクを使用して、各営業担当者の利益を計算する。一部の取引先には専任の営業担当者がいない場合や、一部の取引先が複数にリンクされている場合があるため、一部の金額はこのレポートに含まれない場合があり(営業担当者がいない場合)、一部は異なる行に表示される場合がある(営業担当者ごとに) 。
+MarginPerSaleRepresentativeWarning=ユーザーあたりの利益の報告書は、取引先と営業担当者の間のリンクを使用して、各営業担当者の利益を計算する。一部の取引先には専任の営業担当者がいない場合や、一部の取引先が複数にリンクされている場合があるため、一部の金額はこの報告書に含まれない場合があり(営業担当者がいない場合)、一部は異なる行に表示される場合がある(営業担当者ごとに) 。
diff --git a/htdocs/langs/ja_JP/modulebuilder.lang b/htdocs/langs/ja_JP/modulebuilder.lang
index 4100a22c233..81ac79f478f 100644
--- a/htdocs/langs/ja_JP/modulebuilder.lang
+++ b/htdocs/langs/ja_JP/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=このツールは、経験豊富なユーザーまたは開発者のみが使用する必要がある。独自のモジュールを構築または編集するためのユーティリティを提供する。代替の<a href="%s" target="_blank">手動開発のドキュメントは、</a>にある。
+ModuleBuilderDesc=このツールは、経験豊富なユーザまたは開発者のみが使用する必要がある。独自のモジュールを構築または編集するためのユーティリティを提供する。代替の<a href="%s" target="_blank" rel="noopener noreferrer">手動開発のドキュメントは、ここ</a>にある。
 EnterNameOfModuleDesc=作成するモジュール/アプリケーションの名前をスペースなしで入力する。大文字を使用して単語を区切る(例：MyModule、EcommerceForShop、SyncWithMySystem ...)
 EnterNameOfObjectDesc=作成するオブジェクトの名前をスペースなしで入力する。大文字を使用して単語を区切る(例：MyObject、Student、Teacher ...)。 CRUDクラスファイルだけでなく、APIファイル、オブジェクトを一覧表示/追加/編集/削除するページ、およびSQLファイルが生成される。
 ModuleBuilderDesc2=モジュールが生成/編集されるパス(%sに定義された外部モジュールの最初のディレクトリ)：<strong> %s </strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=モジュール/アプリケーションによって提供
 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=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
+TriggerDefDesc=モジュールの外部のビジネスイベント（他のモジュールによってトリガーされるイベント）が実行されるときに実行するコードをトリガーファイルで定義する。
 SeeIDsInUse=インストールで使用されているIDを確認する
 SeeReservedIDsRangeHere=予約済IDの範囲を参照すること
 ToolkitForDevelopers=Dolibarr開発者向けのツールキット
diff --git a/htdocs/langs/ja_JP/mrp.lang b/htdocs/langs/ja_JP/mrp.lang
index 9d2d822e9e6..5fcc7bc9fae 100644
--- a/htdocs/langs/ja_JP/mrp.lang
+++ b/htdocs/langs/ja_JP/mrp.lang
@@ -14,7 +14,7 @@ BOMsSetup=モジュールBOMの設定
 ListOfBOMs=部品表のリスト - BOM
 ListOfManufacturingOrders=製造注文のリスト
 NewBOM=新規部品表
-ProductBOMHelp=このBOMで作成（または分解）する製品。 <br>注：プロパティ「製品の性質」=「原材料」を持つ製品はこのリストに表示されない。
+ProductBOMHelp=このBOMで作成（または分解）する製品。 <br>注：プロパティ「製品目」=「原材料」を持つ製品はこのリストに表示されない。
 BOMsNumberingModules=BOM番号付けテンプレート
 BOMsModelModule=BOMドキュメントテンプレート
 MOsNumberingModules=MOナンバリングテンプレート
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=部品表%sのクローンを作成してよいか
 ConfirmCloneMo=製造指図%sのクローンを作成してよいか？
 ManufacturingEfficiency=製造効率
 ConsumptionEfficiency=消費効率
-ValueOfMeansLoss=0.95の値は、生産中の平均5%%の損失を意味する。
+ValueOfMeansLoss=0.95の値は、製造中または分解中の平均5%%の損失を意味します。
 ValueOfMeansLossForProductProduced=0.95の値は、生産された製品の損失の平均5%%を意味する
 DeleteBillOfMaterials=部品表を削除
 DeleteMo=製造指図を削除
@@ -67,7 +67,7 @@ TheProductXIsAlreadyTheProductToProduce=追加する製品は、すでに生産
 ForAQuantityOf=%sの生産数量について
 ForAQuantityToConsumeOf=%sを分解する数量に対して
 ConfirmValidateMo=この製造指図を検証してよいか？
-ConfirmProductionDesc='%s'をクリックすると、設定された数量の消費および/または生産を検証する。これにより、在庫が更新され、在庫の動きが記録される。
+ConfirmProductionDesc='%s'をクリックすると、設定された数量の消費および/または生産を検証する。これにより、在庫が更新され、在庫推移が記録される。
 ProductionForRef=%sの生産
 AutoCloseMO=消費および生産する数量に達した場合、製造指図を自動的に閉じる
 NoStockChangeOnServices=サービスの在庫変更はない
diff --git a/htdocs/langs/ja_JP/oauth.lang b/htdocs/langs/ja_JP/oauth.lang
index 8a5b4de5f52..376b42a2717 100644
--- a/htdocs/langs/ja_JP/oauth.lang
+++ b/htdocs/langs/ja_JP/oauth.lang
@@ -23,10 +23,10 @@ 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">このページ</a>に移動し、次に「資格情報」に移動してOAuth資格情報を作成する
+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">このページ</a>に移動し、"新規アプリケーションを登録" してOAuth認証情報を作成する
+OAUTH_GITHUB_DESC=<a class="notasortlink" href="https://github.com/settings/developers" target="_blank" rel="noopener noreferrer external">このページ</a>に移動し、次に「新しいアプリケーションを登録する」に移動して、OAuthクレデンシャルを作成する
 OAUTH_STRIPE_TEST_NAME=OAuthストライプテスト
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
index 0c4da8923cc..c0f21bdc34f 100644
--- a/htdocs/langs/ja_JP/orders.lang
+++ b/htdocs/langs/ja_JP/orders.lang
@@ -30,7 +30,7 @@ OrdersInProcess=進行中の販売注文
 OrdersToProcess=処理する受注
 SuppliersOrdersToProcess=処理する注文書
 SuppliersOrdersAwaitingReception=受付待ちの注文書
-AwaitingReception=レセプション待ち
+AwaitingReception=受付待ち
 StatusOrderCanceledShort=キャンセル
 StatusOrderDraftShort=下書き
 StatusOrderValidatedShort=検証
@@ -49,8 +49,8 @@ StatusOrderReceivedAllShort=受け取った製品
 StatusOrderCanceled=キャンセル
 StatusOrderDraft=下書き(検証する必要がある)
 StatusOrderValidated=検証
-StatusOrderOnProcess=注文済-スタンバイ受信
-StatusOrderOnProcessWithValidation=注文済-スタンバイ受信または検証
+StatusOrderOnProcess=注文済 - 受付待機
+StatusOrderOnProcessWithValidation=注文済 - 受付または検証を待機
 StatusOrderProcessed=処理
 StatusOrderToBill=請求する
 StatusOrderApproved=承認された
@@ -99,7 +99,7 @@ ConfirmDeleteOrder=この注文を削除してもよいか？
 ConfirmValidateOrder=この注文を<b>%s </b>という名前で検証してもよいか？
 ConfirmUnvalidateOrder=注文<b>%s </b>を下書きステータスに復元してもよいか？
 ConfirmCancelOrder=この注文をキャンセルしてもよいか？
-ConfirmMakeOrder=<b> %s </b>でこの注文をしたことを確認するか？
+ConfirmMakeOrder=<b> %s </b>でこの注文をしたことを確定するか？
 GenerateBill=請求書を生成する。
 ClassifyShipped=配信された分類
 DraftOrders=下書き注文
@@ -121,7 +121,7 @@ DispatchSupplierOrder=注文書の受信%s
 FirstApprovalAlreadyDone=最初の承認はすでに行われている
 SecondApprovalAlreadyDone=2回目の承認はすでに完了している
 SupplierOrderReceivedInDolibarr=注文書%sが%sを受け取りた
-SupplierOrderSubmitedInDolibarr=注文書%sが送信された
+SupplierOrderSubmitedInDolibarr=注文書%sが提出された
 SupplierOrderClassifiedBilled=注文書%sセットの請求
 OtherOrders=他の注文
 SupplierOrderValidatedAndApproved=サプライヤーの注文は検証および承認されている：%s
@@ -153,7 +153,7 @@ PDFEdisonDescription=単純な次のモデル
 PDFProformaDescription=完全な 見積請求書 テンプレート
 CreateInvoiceForThisCustomer=請求書注文
 CreateInvoiceForThisSupplier=請求書注文
-CreateInvoiceForThisReceptions=ビルレセプション
+CreateInvoiceForThisReceptions=ビル受付
 NoOrdersToInvoice=請求可能な注文はない
 CloseProcessedOrdersAutomatically=選択したすべての注文を「処理済」に分類する。
 OrderCreation=注文の作成
@@ -166,7 +166,7 @@ OptionToSetOrderBilledNotEnabled=モジュールワークフローのオプシ
 IfValidateInvoiceIsNoOrderStayUnbilled=請求書検証が「いいえ」の場合、請求書が検証されるまで、注文はステータス「未請求」のままになる。
 CloseReceivedSupplierOrdersAutomatically=すべての製品を受け取ったら、注文を自動的にステータス「%s」に閉じる。
 SetShippingMode=配送モードを設定する
-WithReceptionFinished=レセプション終了
+WithReceptionFinished=受付終了
 #### supplier orders status
 StatusSupplierOrderCanceledShort=キャンセル
 StatusSupplierOrderDraftShort=下書き
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index caf379d67cb..99dc53f5c12 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -180,7 +180,7 @@ SizeUnitinch=インチ
 SizeUnitfoot=フィート
 SizeUnitpoint=ポイント
 BugTracker=バグトラッカー
-SendNewPasswordDesc=このフォームでは、新規パスワードをリクエストできる。それはあなたのメールアドレスに送られる。 <br>メール内の確認リンクをクリックすると、変更が有効になる。 <br>受信トレイを確認すること。
+SendNewPasswordDesc=このフォームでは、新規パスワードをリクエストできる。それはあなたのメールアドレスに送られる。 <br>メール内の確定リンクをクリックすると、変更が有効になる。 <br>受信トレイを確定すること。
 BackToLoginPage=ログインページに戻る
 AuthenticationDoesNotAllowSendNewPassword=認証モードは<b>%s</b> 。 <br>このモードではDolibarr上でパスワードの表示も変更もできません。 <br>パスワードを変更したい場合はシステム管理者に連絡して下さい。
 EnableGDLibraryDesc=このオプションを使用するには、PHPインストールでGDライブラリをインストールまたは有効にする。
@@ -249,7 +249,7 @@ NewKeyIs=これはログインするための新規キー
 NewKeyWillBe=ソフトウェアにログインするための新規キーは次のようになる
 ClickHereToGoTo=%sに移動するには、ここをクリックすること
 YouMustClickToChange=ただし、このパスワードの変更を検証するには、最初に次のリンクをクリックする必要がある
-ConfirmPasswordChange=パスワードの変更を確認する
+ConfirmPasswordChange=パスワードの変更を確定する
 ForgetIfNothing=この変更をリクエストしなかった場合は、このメールを忘れてください。あなたの資格情報は安全に保たれる。
 IfAmountHigherThan=<strong> %s</strong>よりも多い場合
 SourcesRepository=ソースのリポジトリ
@@ -258,6 +258,10 @@ 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に送信された
@@ -268,6 +272,7 @@ ProjectCreatedByEmailCollector=メールMSGID%sからメールコレクターに
 TicketCreatedByEmailCollector=メールMSGID%sからメールコレクターによって作成されたチケット
 OpeningHoursFormatDesc=-を使用して、営業時間と営業時間を区切る。 <br>スペースを使用してさまざまな範囲を入力する。 <br>例：8-12 14-18
 SuffixSessionName=セッション名のサフィックス
+LoginWith=%sでログインする
 
 ##### Export #####
 ExportsArea=輸出地域
@@ -296,5 +301,5 @@ NbOfQtyInOrders=注文数量
 SelectTheTypeOfObjectToAnalyze=オブジェクトを選択してその統計を表示する...
 
 ConfirmBtnCommonContent = 「%s」を実行してもよいか？
-ConfirmBtnCommonTitle = アクションを確認する
+ConfirmBtnCommonTitle = アクションを確定する
 CloseDialog = 閉じる
diff --git a/htdocs/langs/ja_JP/partnership.lang b/htdocs/langs/ja_JP/partnership.lang
index ecdc17fc065..9b7694c0d3b 100644
--- a/htdocs/langs/ja_JP/partnership.lang
+++ b/htdocs/langs/ja_JP/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=パートナーシップ管理
 PartnershipDescription=モジュールパートナーシップ管理
 PartnershipDescriptionLong= モジュールパートナーシップ管理
-
+Partnership=パートナーシップ
 AddPartnership=パートナーシップを追加
 CancelPartnershipForExpiredMembers=パートナーシップ: サブスクリプションの有効期限が切れた会員のパートナーシップをキャンセル
 PartnershipCheckBacklink=パートナーシップ: 参照元のバックリンクを確認する
@@ -58,7 +58,7 @@ ManagePartnership=パートナーシップを管理する
 BacklinkNotFoundOnPartnerWebsite=パートナーのウェブサイトにバックリンクが見つからない
 ConfirmClosePartnershipAsk=このパートナーシップをキャンセルしてもよいか？
 PartnershipType=パートナーシップの種類
-PartnershipRefApproved=Partnership %s approved
+PartnershipRefApproved=パートナーシップ%sは承認済
 
 #
 # Template Mail
diff --git a/htdocs/langs/ja_JP/paybox.lang b/htdocs/langs/ja_JP/paybox.lang
index 34affd809a3..e8a3e2a749a 100644
--- a/htdocs/langs/ja_JP/paybox.lang
+++ b/htdocs/langs/ja_JP/paybox.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=PayBoxモジュールの設定
-PayBoxDesc=このモジュールは、上の支払いを可能にするためにページを提供して<a href="http://www.paybox.com" target="_blank">切符売り場</a>の顧客によって。これはフリーの支払いのためにまたは特定のDolibarrオブジェクトの支払いに用いることができる(請求書、発注、...)
+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=入金確認を受信する電子メール
+YourEMail=入金確定を受信する電子メール
 Creditor=債権者
 PaymentCode=支払いコード
 PayBoxDoPayment=Payboxで支払う
 YouWillBeRedirectedOnPayBox=あなたが入力するクレジットカード情報をセキュリティで保護された切符売り場のページにリダイレクトされる。
 Continue=次の
 SetupPayBoxToHavePaymentCreatedAutomatically=Payboxによる検証時に支払いが自動的に作成されるように、URL <b> %s</b>を使用してPayboxを設定する。
-YourPaymentHasBeenRecorded=このページでは、あなたの支払が記録されていることを確認する。ありがとうございる。
+YourPaymentHasBeenRecorded=このページでは、あなたの支払が記録されていることを確定する。ありがとうございる。
 YourPaymentHasNotBeenRecorded=お支払いは記録されておらず、取引はキャンセルされている。ありがとうございる。
 AccountParameter=アカウントのパラメータ
 UsageParameter=使用パラメータ
diff --git a/htdocs/langs/ja_JP/paypal.lang b/htdocs/langs/ja_JP/paypal.lang
index 2948bff9f46..5a2e882fdab 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="http://www.paypal.com" target="_blank"> 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=モード試験/サンドボックス
@@ -19,7 +19,7 @@ NewOnlinePaymentFailed=新規オンライン支払いが試行されたが失敗
 ONLINE_PAYMENT_SENDEMAIL=各支払い試行後の通知の電子メールアドレス(成功および失敗の場合)
 ReturnURLAfterPayment=支払い後にURLを返す
 ValidationOfOnlinePaymentFailed=オンライン支払いの検証に失敗した
-PaymentSystemConfirmPaymentPageWasCalledButFailed=支払いシステムによって支払い確認ページが呼び出され、エラーが返された
+PaymentSystemConfirmPaymentPageWasCalledButFailed=支払いシステムによって支払い確定ページが呼び出され、エラーが返された
 SetExpressCheckoutAPICallFailed=SetExpressCheckoutAPI呼び出しが失敗した。
 DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPaymentAPI呼び出しが失敗した。
 DetailedErrorMessage=詳細なエラーメッセージ
diff --git a/htdocs/langs/ja_JP/productbatch.lang b/htdocs/langs/ja_JP/productbatch.lang
index 667aefd9ab7..75f5060bea6 100644
--- a/htdocs/langs/ja_JP/productbatch.lang
+++ b/htdocs/langs/ja_JP/productbatch.lang
@@ -30,7 +30,7 @@ ManageLotMask=カスタムマスク
 CustomMasks=製品ごとに異なるナンバリングマスクを定義するオプション
 BatchLotNumberingModules=ロット番号の自動生成のための附番規則
 BatchSerialNumberingModules=シリアル番号の自動生成の附番規則（製品が製品毎に一意のロット/シリアルを1個だけ持つ性質の場合）
-QtyToAddAfterBarcodeScan=スキャンされたバーコード/ロット/シリアルごとに追加する数量
+QtyToAddAfterBarcodeScan=スキャンされた各バーコード/ロット/シリアルの数量から%s
 LifeTime=寿命（日数）
 EndOfLife=製品寿命
 ManufacturingDate=製造日付
@@ -42,3 +42,4 @@ HideLots=たくさん隠す
 #Traceability - qc status
 OutOfOrder=故障中
 InWorkingOrder=正常動作中
+ToReplace=交換
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index 218e83071c1..a79d0524633 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -48,7 +48,7 @@ LastRecordedProducts=最新の%s記録された製品
 LastRecordedServices=最新の%s記録されたサービス
 CardProduct0=製品
 CardProduct1=サービス
-Stock=株式
+Stock=在庫
 MenuStocks=在庫
 Stocks=製品の在庫と場所(倉庫)
 Movements=動作
@@ -94,7 +94,7 @@ ShowService=サービスを表示
 ProductsAndServicesArea=製品とサービス部門
 ProductsArea=製品部門
 ServicesArea=サービス部門
-ListOfStockMovements=在庫変動のリスト
+ListOfStockMovements=在庫推移のリスト
 BuyingPrice=買価
 PriceForEachProduct=特定の価格の製品
 SupplierCard=仕入先カード
@@ -155,7 +155,7 @@ ServiceNb=サービス＃%s
 ListProductServiceByPopularity=人気による製品/サービスのリスト
 ListProductByPopularity=人気順製品のリスト
 ListServiceByPopularity=人気によるサービスのリスト
-Finished=工業製品
+Finished=製造品
 RowMaterial=最初の材料
 ConfirmCloneProduct=製品またはサービスの複製を作成してもよいか<b>%s </b>？
 CloneContentProduct=製品/サービスのすべての主要な情報を複製する
@@ -174,9 +174,9 @@ CustomCode=税関|商品| HSコード
 CountryOrigin=原産国
 RegionStateOrigin=原産地
 StateOrigin=州|原産地
-Nature=製品の性質（生/製造）
-NatureOfProductShort=製品の性質
-NatureOfProductDesc=原材料または製造製品
+Nature=製品目(原材料/製造品)
+NatureOfProductShort=製品目
+NatureOfProductDesc=原材料または製造品
 ShortLabel=短縮ラベル
 Unit=単位
 p=u.
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=加重平均価格の更新に使用する金額
 PMPValue=加重平均価格
 PMPValueShort=WAP
 mandatoryperiod=必須期間
-mandatoryPeriodNeedTobeSet=注意期間が未入力、必須である
+mandatoryPeriodNeedTobeSet=注：期間（開始と終了）を定義すること
 mandatoryPeriodNeedTobeSetMsgValidate=サービスには開始期間と終了期間が必要
-mandatoryHelper=請求書、売買契約提案書、販売注文署を作成/検証するときに、サービスの開始日と終了日を入力する必要があることをユーザーに通知する。 <br>このアクションは確認の過程でブロックされていない
+mandatoryHelper=このサービスで、行に開始日と終了日を入力せずに請求書、売買契約提案書、販売注文署を作成/検証する場青、もしユーザーにメッセージが必要な時は、これをチェックする。<br>メッセージは警告であり、ブロッキングエラーではないことに注意。
 DefaultBOM=デフォルトのBOM
-DefaultBOMDesc=この製品の製造に使用が推奨されるデフォルトBOM。このフィールドは、製品の性質が「%s」の場合にのみ設定できる。
+DefaultBOMDesc=この製品の製造に使用が推奨されるデフォルトBOM。このフィールドは、製品目が「%s」の場合にのみ設定できる。
 Rank=ランク
+SwitchOnSaleStatus=販売ステータスをオンにする
+SwitchOnPurchaseStatus=購入ステータスをオンにする
+StockMouvementExtraFields= エクストラフィールド（在庫移動）
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 24752e1227c..96a931acc0b 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -99,7 +99,7 @@ ListSupplierInvoicesAssociatedProject=プロジェクトに関連するベンダ
 ListContractAssociatedProject=プロジェクトに関連する契約のリスト
 ListShippingAssociatedProject=プロジェクトに関連する出荷のリスト
 ListFichinterAssociatedProject=プロジェクトに関連する介入のリスト
-ListExpenseReportsAssociatedProject=プロジェクトに関連する経費報告書のリスト
+ListExpenseReportsAssociatedProject=プロジェクトに関連する経費報告書sのリスト
 ListDonationsAssociatedProject=プロジェクトに関連する寄付のリスト
 ListVariousPaymentsAssociatedProject=プロジェクトに関連する雑費のリスト
 ListSalariesAssociatedProject=プロジェクトに関連する給与の支払いのリスト
@@ -185,7 +185,7 @@ LinkToElementShort=へのリンク
 # Documents models
 DocumentModelBeluga=リンクされたオブジェクトの概要のプロジェクトドキュメントテンプレート
 DocumentModelBaleine=タスクのプロジェクトドキュメントテンプレート
-DocumentModelTimeSpent=費やした時間のプロジェクトレポートテンプレート
+DocumentModelTimeSpent=費やした時間のプロジェクト報告書テンプレート
 PlannedWorkload=計画されたワークロード
 PlannedWorkloadShort=ワークロード
 ProjectReferers=関連項目
@@ -197,6 +197,7 @@ InputPerMonth=1か月あたりの入力
 InputDetail=詳細を入力
 TimeAlreadyRecorded=これは、このタスク/日およびユーザー%sについてすでに記録されている時間。
 ProjectsWithThisUserAsContact=このユーザーを連絡先とするプロジェクト
+ProjectsWithThisContact=この連絡先のあるプロジェクト
 TasksWithThisUserAsContact=このユーザーに割り当てられたタスク
 ResourceNotAssignedToProject=プロジェクトに割り当てられていない
 ResourceNotAssignedToTheTask=タスクに割り当てられていない
@@ -257,7 +258,7 @@ TimeSpentInvoiced=請求に費やされた時間
 TimeSpentForIntervention=に費や​​された時間は
 TimeSpentForInvoice=に費や​​された時間は
 OneLinePerUser=ユーザーごとに1行
-ServiceToUseOnLines=回線で利用するサービス
+ServiceToUseOnLines=行で利用するサービス
 InvoiceGeneratedFromTimeSpent=請求書%sは、プロジェクトに費やされた時間から生成された
 InterventionGeneratedFromTimeSpent=出張%sは、プロジェクトに費やされた時間から生成された
 ProjectBillTimeDescription=プロジェクトのタスクにタイムシートを入力し、タイムシートから請求書(s)を生成してプロジェクトの顧客に請求する予定があるかどうかを確認する(入力したタイムシートに基づかない請求書を作成する予定があるかどうかは確認しないこと)。注：請求書を生成するには、プロジェクトの"費やした時間"タブに移動し、含める行を選択する。
@@ -284,3 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=注：100%%の進行状況に
 SelectLinesOfTimeSpentToInvoice=請求されていない時間の行を選択し、「請求書の生成」を一括して請求する
 ProjectTasksWithoutTimeSpent=プロジェクトタスクで時間をかけないもの
 FormForNewLeadDesc=連絡のため、以下のフォームへの記入に対して謝意を申し上げる。また、<b> %s</b>で直接メール送信することも可能である。
+ProjectsHavingThisContact=この連絡先を持つプロジェクト
+StartDateCannotBeAfterEndDate=終了日を開始日より前にすることはできない
diff --git a/htdocs/langs/ja_JP/receptions.lang b/htdocs/langs/ja_JP/receptions.lang
index 2fd4b650257..5ed8404c11f 100644
--- a/htdocs/langs/ja_JP/receptions.lang
+++ b/htdocs/langs/ja_JP/receptions.lang
@@ -1,16 +1,17 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=製品受付の設定
+ReceptionDescription=仕入先受付管理（受付文書作成）
+ReceptionsSetup=仕入先受付設定
 RefReception=参照受付
-Reception=レセプション
+Reception=受付
 Receptions=受付
 AllReceptions=すべての受付
-Reception=レセプション
+Reception=受付
 Receptions=受付
 ShowReception=受付を表示
 ReceptionsArea=受付エリア
 ListOfReceptions=受付のリスト
 ReceptionMethod=受付方法
-LastReceptions=最新の%s受付
+LastReceptions=最新%s受付
 StatisticsOfReceptions=受付の統計
 NbOfReceptions=受付数
 NumberOfReceptionsByMonth=月別の受付数
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=この注文の領収書と領収書
 ReceptionsToValidate=検証する受付
 StatusReceptionCanceled=キャンセル
 StatusReceptionDraft=ドラフト
-StatusReceptionValidated=検証(製品が出荷する、またはすでに出荷される)
+StatusReceptionValidated=検証済み（受取り製品またはすでに受取済製品）
+StatusReceptionValidatedToReceive=検証済み（受取り製品）
+StatusReceptionValidatedReceived=検証済み（受取済製品）
 StatusReceptionProcessed=処理
 StatusReceptionDraftShort=ドラフト
 StatusReceptionValidatedShort=検証
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=受付で実施された統計は検証された
 SendReceptionByEMail=メールで受付を送信する
 SendReceptionRef=受付の提出%s
 ActionsOnReception=受付のイベント
-ReceptionCreationIsDoneFromOrder=現時点では、新しいレセプションの作成は発注書レコードから行われる。
+ReceptionCreationIsDoneFromOrder=現時点では、新しい受付の作成は発注書から行われる。
 ReceptionLine=受付ライン
 ProductQtyInReceptionAlreadySent=未処理の受注からの製品数量はすでに送信された
 ProductQtyInSuppliersReceptionAlreadyRecevied=すでに受け取ったオープンサプライヤー注文からの製品数量
@@ -44,5 +47,8 @@ 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 3b0751d47d9..951900d123c 100644
--- a/htdocs/langs/ja_JP/recruitment.lang
+++ b/htdocs/langs/ja_JP/recruitment.lang
@@ -39,19 +39,19 @@ About = 約
 RecruitmentAbout = 採用について
 RecruitmentAboutPage = 採用に関してページ
 NbOfEmployeesExpected=予想される従業員数
-JobLabel=職位のラベル
+JobLabel=役職のラベル
 WorkPlace=職場
 DateExpected=予定日
 FutureManager=将来のマネージャー
 ResponsibleOfRecruitement=採用の担当
 IfJobIsLocatedAtAPartner=仕事がパートナーの場所にある場合
-PositionToBeFilled=職位
-PositionsToBeFilled=職位
-ListOfPositionsToBeFilled=職位一覧
-NewPositionToBeFilled=新規職種
+PositionToBeFilled=役職
+PositionsToBeFilled=役職
+ListOfPositionsToBeFilled=役職一覧
+NewPositionToBeFilled=新規役職s
 
-JobOfferToBeFilled=埋められる職位
-ThisIsInformationOnJobPosition=記入する職種の情報
+JobOfferToBeFilled=募集する職務
+ThisIsInformationOnJobPosition=募集する職務の情報
 ContactForRecruitment=採用担当者
 EmailRecruiter=メール勧誘担当
 ToUseAGenericEmail=一般的な電子メールを使用するには。定義されていない場合は、採用担当者のメールが使用される
@@ -63,14 +63,14 @@ ContractProposed=提案された契約
 ContractSigned=契約締結
 ContractRefused=契約は拒否された
 RecruitmentCandidature=応用
-JobPositions=職位
+JobPositions=役職
 RecruitmentCandidatures=アプリケーション
 InterviewToDo=する面接
 AnswerCandidature=アプリケーションの回答
 YourCandidature=あなたの申請
 YourCandidatureAnswerMessage=お申し込みいただきありがとうございる。 <br>..。
-JobClosedTextCandidateFound=求人はクローズされている。ポジションが埋まった。
-JobClosedTextCanceled=求人はクローズされている。
-ExtrafieldsJobPosition=補完的な属性(職位)
+JobClosedTextCandidateFound=求人は終了した。役職が埋まった。
+JobClosedTextCanceled=求人は終了した。
+ExtrafieldsJobPosition=補完的な属性(役職)
 ExtrafieldsApplication=補完的な属性(求人応募)
 MakeOffer=申し出する
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/sms.lang b/htdocs/langs/ja_JP/sms.lang
index 8924983278c..c2ea40576c2 100644
--- a/htdocs/langs/ja_JP/sms.lang
+++ b/htdocs/langs/ja_JP/sms.lang
@@ -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 259641fbd04..74c52d0211d 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -12,11 +12,11 @@ AddWarehouse=倉庫を作成する
 AddOne=1つ追加する
 DefaultWarehouse=デフォルトの倉庫
 WarehouseTarget=ターゲット倉庫
-ValidateSending=出荷を確認する
+ValidateSending=出荷を確定する
 CancelSending=発送をキャンセルする
 DeleteSending=貨物を削除する
 Stock=在庫
-Stocks=在庫
+Stocks=在庫s
 MissingStocks=在庫がない
 StockAtDate=日付の在庫
 StockAtDateInPast=過去の日付
@@ -27,11 +27,11 @@ LotSerialList=ロット/シリアルのリスト
 Movements=移動
 ErrorWarehouseRefRequired=倉庫の参照名を指定する必要がある
 ListOfWarehouses=倉庫のリスト
-ListOfStockMovements=在庫変動のリスト
+ListOfStockMovements=在庫推移のリスト
 ListOfInventories=在庫一覧
 MovementId=移動 ID
 StockMovementForId=移動 ID%d
-ListMouvementStockProject=プロジェクトに関連する在庫移動のリスト
+ListMouvementStockProject=プロジェクトに関連する在庫推移のリスト
 StocksArea=倉庫エリア
 AllWarehouses=すべての倉庫
 IncludeEmptyDesiredStock=未定義の希望在庫で負の在庫も含める
@@ -49,8 +49,8 @@ CorrectStock=正しい在庫
 StockTransfer=在庫移転
 TransferStock=在庫移転
 MassStockTransferShort=大量在庫移転
-StockMovement=在庫移動
-StockMovements=在庫移動
+StockMovement=在庫推移
+StockMovements=在庫推移
 NumberOfUnit=ユニット数
 UnitPurchaseValue=購入単価
 StockTooLow=低すぎる在庫
@@ -74,7 +74,7 @@ QtyDispatchedShort=手配済数量
 QtyToDispatchShort=手配する数量
 OrderDispatch=アイテムの領収書
 RuleForStockManagementDecrease=自動在庫減少のルールを選択する(自動減少ルールが有効化されている場合でも、手動減少は常に可能 )
-RuleForStockManagementIncrease=自動在庫増加のルールを選択する(自動増加ルールがアクティブ化されている場合でも、手動の増加は常に可能)
+RuleForStockManagementIncrease=自動在庫増加のルールを選択する(自動増加ルールが有効化されている場合でも、手動の増加は常に可能)
 DeStockOnBill=顧客の請求書/貸方表の検証で実際の在庫を減らす
 DeStockOnValidateOrder=受注の検証時に実在庫を減らす
 DeStockOnShipment=出荷検証で実際の在庫を減らす
@@ -83,10 +83,10 @@ ReStockOnBill=仕入先の請求書/貸方表の検証で実際の在庫を増
 ReStockOnValidateOrder=注文書の承認時に実在庫を増やす
 ReStockOnDispatchOrder=商品の発注書受領後、倉庫への手動発送で実際の在庫を増やす
 StockOnReception=受信の検証で実際の在庫を増やす
-StockOnReceptionOnClosing=レセプションがクローズに設定されている場合は、実際の在庫を増やす
-OrderStatusNotReadyToDispatch=ご注文はまだないか、またはこれ以上の在庫倉庫の製品の派遣ができるステータスを持っていない。
+StockOnReceptionOnClosing=受付がクローズに設定されている場合は、実際の在庫を増やす
+OrderStatusNotReadyToDispatch=注文のステータスは、在庫倉庫にある製品の発送を、まだ許可していないか、これ以上許可できない状態。
 StockDiffPhysicTeoric=物理在庫と仮想在庫の違いの説明
-NoPredefinedProductToDispatch=このオブジェクト用に事前定義された製品がない。そうは在庫に派遣する必要はない。
+NoPredefinedProductToDispatch=このオブジェクト用に事前定義された製品なし。よって在庫発送の要なし。
 DispatchVerb=派遣
 StockLimitShort=アラートの制限
 StockLimit=アラートの在庫制限
@@ -96,7 +96,7 @@ RealStock=実在庫
 RealStockDesc=現物/実在庫は、現在倉庫にある在庫 。
 RealStockWillAutomaticallyWhen=実際の在庫は、このルールに従って変更される(在庫モジュールで定義されている)。
 VirtualStock=仮想在庫
-VirtualStockAtDate=Virtual stock at a future date
+VirtualStockAtDate=将来の仮想在庫
 VirtualStockAtDateDesc=仮想在庫、かつての保留中の注文で、 選択した日付より前に処理される予定のものが、完了となる
 VirtualStockDesc=仮想在庫は、すべてのオープン/保留アクション(在庫に影響を与える)が閉じられたときに使用可能な計算された在庫 (発注書の受領、販売注文の出荷、製造注文の作成など)。
 AtDate=日付で
@@ -111,13 +111,13 @@ SellPriceMin=販売単価
 EstimatedStockValueSellShort=販売価値
 EstimatedStockValueSell=販売価値
 EstimatedStockValueShort=入力在庫価値
-EstimatedStockValue=入力在庫価値
+EstimatedStockValue=入力在庫値
 DeleteAWarehouse=倉庫を削除する。
 ConfirmDeleteWarehouse=倉庫<b>%s </b>を削除してもよろしい か？
-PersonalStock=個人の在庫%s
-ThisWarehouseIsPersonalStock=この倉庫は%s %sの個人的な在庫を表す
-SelectWarehouseForStockDecrease=在庫の減少のために使用する倉庫を選択する
-SelectWarehouseForStockIncrease=在庫の増加に使用する倉庫を選択する。
+PersonalStock=個人在庫%s
+ThisWarehouseIsPersonalStock=この倉庫は%s %sの個人在庫を表す
+SelectWarehouseForStockDecrease=在庫減少のために使用する倉庫を選択
+SelectWarehouseForStockIncrease=在庫増加に使用する倉庫を選択
 NoStockAction=在庫アクションなし
 DesiredStock=希望在庫
 DesiredStockDesc=この在庫量は、補充機能によって在庫を埋めるために使用される値になる。
@@ -149,7 +149,7 @@ MassMovement=マス移動
 SelectProductInAndOutWareHouse=ソース倉庫とターゲット倉庫、製品と数量を選択し、「%s」をクリックする。必要なすべての動きに対してこれが完了したら、「%s」をクリックする。
 RecordMovement=レコード移転
 ReceivingForSameOrder=この注文の領収書
-StockMovementRecorded=記録された在庫移動
+StockMovementRecorded=記録された在庫推移
 RuleForStockAvailability=在庫要件に関する規則
 StockMustBeEnoughForInvoice=在庫レベルは、製品/サービスを請求書に追加するのに十分でなければなりません(自動在庫変更のルールに関係なく、請求書に行を追加するときに現在の実際の在庫に対してチェックが行われる)
 StockMustBeEnoughForOrder=在庫レベルは、注文に製品/サービスを追加するのに十分でなければなりません(自動在庫変更のルールに関係なく、注文にラインを追加するときに現在の実際の在庫でチェックが行われる)
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=アラートの在庫制限と希望する最適在
 AddNewProductStockWarehouse=アラートと望ましい最適在庫の新規制限を設定する
 AddStockLocationLine=数量を減らしてから、クリックしてこの製品の別の倉庫を追加する
 InventoryDate=目録日付
+Inventories=在庫
 NewInventory=新規目録
 inventorySetup = 目録設定
 inventoryCreatePermission=新規目録を作成する
@@ -202,12 +203,12 @@ inventoryWarningProductAlreadyExists=この製品はすでにリストに含ま
 SelectCategory=カテゴリフィルタ
 SelectFournisseur=仕入先フィルタ
 inventoryOnDate=目録
-INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=在庫移動には、(目録検証の日付ではなく) 目録の日付を付ける。
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=在庫推移には、(目録検証の日付ではなく) 目録の日付を付ける。
 inventoryChangePMPPermission=製品のPMP値の変更を許可する
 ColumnNewPMP=新規ユニットPMP
 OnlyProdsInStock=在庫のない製品は追加しないこと
-TheoricalQty=理論量
-TheoricalValue=理論量
+TheoricalQty=理論上の数量
+TheoricalValue=理論上の数量
 LastPA=最後のBP
 CurrentPA=現在のBP
 RecordedQty=記録された数量
@@ -218,7 +219,7 @@ AddInventoryProduct=製品を目録に追加する
 AddProduct=加える
 ApplyPMP=PMPを適用する
 FlushInventory=目録をフラッシュする
-ConfirmFlushInventory=このアクションを確認するか？
+ConfirmFlushInventory=このアクションを確定するか？
 InventoryFlushed=目録がフラッシュされた
 ExitEditMode=終了版
 inventoryDeleteLine=行を削除する
@@ -240,7 +241,7 @@ StockAtDatePastDesc=過去の特定の日付の在庫(実際の在庫)をここ
 StockAtDateFutureDesc=将来の特定の日付の在庫（仮想在庫）をここで表示できる
 CurrentStock=現在の在庫
 InventoryRealQtyHelp=値を0に設定して、数量をリセットする。<br>フィールドを空のままにするか、行を削除して、変更しないこと。
-UpdateByScaning=スキャンして実際の数量を入力
+UpdateByScaning=スキャンして実際の数量を完了する
 UpdateByScaningProductBarcode=スキャンによる更新(製品バーコード)
 UpdateByScaningLot=スキャンによる更新(ロット|シリアルバーコード)
 DisableStockChangeOfSubProduct=この移動中は、このキットのすべての副産物の在庫変更を無効にする。
@@ -250,17 +251,23 @@ SelectAStockMovementFileToImport=インポートする在庫品移動ファイ
 InfoTemplateImport=アップロードされたファイルは次の形式が必要 (*は必須フィールド)：<br> 元倉庫* | 先倉庫* | 製品* | 数量* | ロット/シリアル番号<br>CSV文字区切は「<b>%s</b>」であること
 LabelOfInventoryMovemement=目録%s
 ReOpen=再開 
-ConfirmFinish=目録の閉鎖を確定するか？これにより、すべての在庫移動が生成され、目録に入力した実数量で在庫が更新される。
+ConfirmFinish=目録の閉鎖を確定するか？これにより、すべての在庫推移が生成され、目録に入力した実数量で在庫が更新される。
 ObjectNotFound=%sが見つからない
 MakeMovementsAndClose=移動を生成して閉じる
-AutofillWithExpected=実際の数量を予想数量で埋める
+AutofillWithExpected=実際の数量を予想数量に置き換える
 ShowAllBatchByDefault=デフォルトでは、製品の「在庫」タブにバッチの詳細を表示する
 CollapseBatchDetailHelp=在庫モジュール構成でバッチ詳細のデフォルト表示を設定できる
-FieldCannotBeNegative=フィールド "%s" は負の値にはできない
 ErrorWrongBarcodemode=不明なバーコードモード
 ProductDoesNotExist=製品が存在しない
-ErrorSameBatchNumber=在庫リストに同じバッチ番号が見つかった
+ErrorSameBatchNumber=在庫シートにバッチ番号のレコードがいくつか見つかった。どちらを増やすかを知る方法はない。
 ProductBatchDoesNotExist=バッチ/シリアルの製品は存在しない
 ProductBarcodeDoesNotExist=バーコード付き製品は存在しない
 WarehouseId=倉庫ID
 WarehouseRef=倉庫参照
+SaveQtyFirst=在庫推移の作成を依頼する前に、最初に実際の在庫数量を保存する。
+InventoryStartedShort=開始済
+ErrorOnElementsInventory=次の理由により、操作がキャンセルされた。
+ErrorCantFindCodeInInventory=インベントリに次のコードが見つからない
+QtyWasAddedToTheScannedBarcode=成功 ！！数量は、要求されたすべてのバーコードに追加された。スキャナーツールを閉じることができる。
+StockChangeDisabled=在庫変更は無効化済
+NoWarehouseDefinedForTerminal=ターミナル用に倉庫が定義されていない
diff --git a/htdocs/langs/ja_JP/stripe.lang b/htdocs/langs/ja_JP/stripe.lang
index 17cf86478a2..ad0bb8fa8f0 100644
--- a/htdocs/langs/ja_JP/stripe.lang
+++ b/htdocs/langs/ja_JP/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe モジュールの設定
-StripeDesc=<a href="http://www.stripe.com" target="_blank"> Stripe </a>を介して、クレジット/セビットカードでの支払い用のStripeオンライン支払いページを顧客に提供する。これは、顧客が臨時の支払いを行えるようにするため、または特定のDolibarrオブジェクト(請求書、注文など)に関連する支払いのために使用できる。
+StripeDesc=<a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe</a>を介してクレジット/デビットカードで支払うためのオンライン支払いページを顧客に提供する。これを使用して、顧客が臨時の支払いや、特定のDolibarrオブジェクト（請求書、注文など）に関連する支払いの実行ができるようになる。
 StripeOrCBDoPayment=クレジットカードまたはStripeで支払う
 FollowingUrlAreAvailableToMakePayments=以下のURLはDolibarrオブジェクト上で支払いをするために顧客にページを提供するために利用可能 
 PaymentForm=支払い形態
@@ -8,7 +8,7 @@ WelcomeOnPaymentPage=オンライン決済サービスへようこそ
 ThisScreenAllowsYouToPay=この画面では、%sにオンライン決済を行うことができる。
 ThisIsInformationOnPayment=これは、実行する支払いに関する情報。
 ToComplete=完了する
-YourEMail=入金確認を受信する電子メール
+YourEMail=入金確定を受信する電子メール
 STRIPE_PAYONLINE_SENDEMAIL=支払い試行後の電子メール通知(成功または失敗)
 Creditor=債権者
 PaymentCode=支払いコード
diff --git a/htdocs/langs/ja_JP/ticket.lang b/htdocs/langs/ja_JP/ticket.lang
index 75b9b25eb6f..45f9d066fb7 100644
--- a/htdocs/langs/ja_JP/ticket.lang
+++ b/htdocs/langs/ja_JP/ticket.lang
@@ -95,7 +95,7 @@ TicketEmailNotificationFromHelp=例によるチケットメッセージの回答
 TicketEmailNotificationTo=通知メール
 TicketEmailNotificationToHelp=このアドレスに電子メール通知を送信する。
 TicketNewEmailBodyLabel=チケット作成後に送信されるテキストメッセージ
-TicketNewEmailBodyHelp=ここで指定されたテキストは、公開インターフェイスからの新規チケットの作成を確認する電子メールに挿入される。チケットの相談に関する情報は自動的に追加される。
+TicketNewEmailBodyHelp=ここで指定されたテキストは、公開インターフェイスからの新規チケットの作成を確定する電子メールに挿入される。チケットの相談に関する情報は自動的に追加される。
 TicketParamPublicInterface=公開インターフェイスの設定
 TicketsEmailMustExist=チケットを作成するには、既存のメールアドレスが必要 
 TicketsEmailMustExistHelp=公開インターフェイスでは、新規チケットを作成するために、電子メールアドレスがデータベースにすでに入力されている必要がある。
@@ -191,9 +191,9 @@ TicketAddIntervention=介入を作成する
 CloseTicket=チケットを 閉じる|解決 する
 AbandonTicket=チケットを放棄する
 CloseATicket=チケット１つを 閉じる|解決 する
-ConfirmCloseAticket=チケットの終了を確認する
+ConfirmCloseAticket=チケットの終了を確定する
 ConfirmAbandonTicket=チケットを終了し、ステータスを「放棄」に確定するか
-ConfirmDeleteTicket=チケットの削除を確認すること
+ConfirmDeleteTicket=チケットの削除を確定すること
 TicketDeletedSuccess=チケットは正常に削除された
 TicketMarkedAsClosed=チケットはクローズとしてマークされている
 TicketDurationAuto=計算された期間
@@ -220,7 +220,7 @@ TicketTimeToRead=読み取るまでの経過時間
 TicketTimeElapsedBeforeSince=前後の経過時間
 TicketContacts=連絡先チケット
 TicketDocumentsLinked=チケットにリンクされているドキュメント
-ConfirmReOpenTicket=このチケットを再度開くことを確認するか？
+ConfirmReOpenTicket=このチケットを再度開くことを確定するか？
 TicketMessageMailIntroAutoNewPublicMessage=件名が%sの新規メッセージがチケットに投稿された。
 TicketAssignedToYou=割り当てられたチケット
 TicketAssignedEmailBody=%sによってチケット＃%sが割り当てられました
@@ -235,7 +235,7 @@ TicketMailExchanges=メール交換
 TicketInitialMessageModified=最初のメッセージが変更された
 TicketMessageSuccesfullyUpdated=メッセージが正常に更新された
 TicketChangeStatus=ステータスを変更する
-TicketConfirmChangeStatus=ステータスの変更を確認する：%s？
+TicketConfirmChangeStatus=ステータスの変更を確定する：%s？
 TicketLogStatusChanged=ステータスが変更された：%sから%s
 TicketNotNotifyTiersAtCreate=作成時に法人に通知しない
 Unread=未読
@@ -262,10 +262,10 @@ 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=上のリンクをクリックすると、チケットの進行状況を確認できる。
@@ -318,7 +318,7 @@ BoxTicketLastXDays=過去%s日ごとの新規チケットの数
 BoxTicketLastXDayswidget = 過去X日間の日ごとの新規チケットの数
 BoxNoTicketLastXDays=過去%s日間に新規チケットなし
 BoxNumberOfTicketByDay=日ごとの新規チケット数
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
+BoxNewTicketVSClose=チケット数とクローズドチケット（本日）
 TicketCreatedToday=今日作成されたチケット
 TicketClosedToday=本日終息したチケット
-KMFoundForTicketGroup=質問の回答となるトピックやFAQが見つかった。チケット送信前の確認に感謝する
+KMFoundForTicketGroup=質問の回答となるトピックやFAQが見つかった。チケット提出前の確認に感謝する
diff --git a/htdocs/langs/ja_JP/trips.lang b/htdocs/langs/ja_JP/trips.lang
index a6d142b0006..ff82b6100c3 100644
--- a/htdocs/langs/ja_JP/trips.lang
+++ b/htdocs/langs/ja_JP/trips.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - trips
 ShowExpenseReport=経費報告書を表示する
-Trips=経費報告書
-TripsAndExpenses=経費報告書
-TripsAndExpensesStatistics=経費報告書の統計
+Trips=経費報告書s
+TripsAndExpenses=経費報告書s
+TripsAndExpensesStatistics=経費報告書sの統計
 TripCard=経費通知表
 AddTrip=経費報告書を作成する
-ListOfTrips=経費報告書のリスト
+ListOfTrips=経費報告書sのリスト
 ListOfFees=手数料のリスト
 TypeFees=料金の種類
 ShowTrip=経費報告書を表示する
 NewTrip=新規経費報告書
-LastExpenseReports=最新の%s経費報告書
-AllExpenseReports=すべての経費報告書
+LastExpenseReports=最新の%s経費報告書s
+AllExpenseReports=すべての経費報告書s
 CompanyVisited=訪問した法人/組織
 FeesKilometersOrAmout=金額またはキロメートル
 DeleteTrip=経費報告書を削除する
 ConfirmDeleteTrip=この経費報告書を削除してもよいか？
-ListTripsAndExpenses=経費報告書のリスト
+ListTripsAndExpenses=経費報告書sのリスト
 ListToApprove=承認待ち
 ExpensesArea=経費報告エリア
 ClassifyRefunded=分類「返金済」
@@ -32,7 +32,7 @@ ExpenseReportCanceled=経費報告がキャンセルされた
 ExpenseReportCanceledMessage=経費報告書%sはキャンセルされた。 <br>-ユーザ：%s <br>-キャンセル者：%s <br>-キャンセルの動機：%s <br>ここをクリックして経費報告書: %s を表示
 ExpenseReportPaid=経費報告書が支払われた
 ExpenseReportPaidMessage=経費報告書%sが支払われた。 <br>-ユーザ：%s <br>-支払い者：%s <br>ここをクリックして経費報告書を表示する：%s
-TripId=ID経費レポート
+TripId=ID経費報告書
 AnyOtherInThisListCanValidate=リクエストを検証するために通知される人。
 TripSociete=情報法人
 TripNDF=情報経費報告書
@@ -91,7 +91,7 @@ DATE_SAVE=検証日
 DATE_CANCEL=キャンセル日
 DATE_PAIEMENT=支払期日
 ExpenseReportRef=参照。経費報告書
-ValidateAndSubmit=検証して承認のために送信
+ValidateAndSubmit=検証して承認のために提出
 ValidatedWaitingApproval=検証済(承認待ち)
 NOT_AUTHOR=あなたはこの経費報告書の作成者ではない。操作はキャンセルされた。
 ConfirmRefuseTrip=この経費報告書を拒否してもよいか？
@@ -106,13 +106,13 @@ SaveTrip=経費報告書を検証する
 ConfirmSaveTrip=この経費報告書を検証してもよいか？
 NoTripsToExportCSV=この期間にエクスポートする経費報告書はない。
 ExpenseReportPayment=経費報告書の支払い
-ExpenseReportsToApprove=承認する経費報告書
-ExpenseReportsToPay=支払うべき経費報告書
+ExpenseReportsToApprove=承認する経費報告書s
+ExpenseReportsToPay=支払うべき経費報告書s
 ConfirmCloneExpenseReport=この経費報告書のクローンを作成してもよいか？
 ExpenseReportsIk=マイレージ料金の設定
 ExpenseReportsRules=経費報告規則
 ExpenseReportIkDesc=以前に定義したカテゴリと範囲ごとに、キロメートル費用の計算を変更できる。 <b> d </b>はキロメートル単位の距離 
-ExpenseReportRulesDesc=経費報告書の最大金額ルールを定義できる。これらのルールは、新しい経費が経費レポートに追加されたときに適用される
+ExpenseReportRulesDesc=経費報告書sの最大金額ルールを定義できる。これらのルールは、新しい経費が経費報告書sに追加されたときに適用される
 expenseReportOffset=オフセット
 expenseReportCoef=係数
 expenseReportTotalForFive=<u> d </u> = 5の例
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index c12265248a9..5c4f07b0ce5 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ユーザ
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index 9f3a0e5e1b5..5863b45a2a2 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -45,7 +45,7 @@ ViewWebsiteInProduction=ホームURLを使用してWebサイトを表示する
 SetHereVirtualHost=<u>Apache/NGinx/...で使用 </u><br>専用の仮想ホストをWEBサーバ (Apache, Nginx, ...) 上に作成し、PHP 使用可で、ルートディレクトリを以下に指定する<br><strong>%s</strong>
 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"> https：//saas.dolibarr.org</a>にある。
+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>へが可能であることをも確認する。
 ReadPerm=読む
 WritePerm=書く
@@ -60,7 +60,7 @@ YouCanEditHtmlSourceckeditor=エディタの "ソース" ボタンを使用し
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> タグ <strong>&lt;?php ?&gt;</strong> を使用して、当該ソースにPHPコードを含めることができる。次のグローバル変数が使用できる: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> 以下の構文を使用して、別のページ/コンテナーのコンテンツを含めることもできる:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> 以下の構文で別のページ/コンテナへのリダイレクトを行うことができる(注：リダイレクト前には、いかなるコンテンツも出力しないこと) :<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>ダウンロードリンク</strong> で、ファイル保管場所が <strong>documents</strong> ディレクトリなら、使うのは <strong>document.php</strong> ラッパー:<br>例、ファイルを documents/ecm (ログ記録が必須) に置くなら、構文は:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>ファイルを documents/medias (公開アクセス用のオープンディレクトリ) に置くなら、構文は:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>ファイルを共有リンク (ファイルの共有ハッシュキーを使用したオープンアクセス) で共有するなら、構文は:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> 含めるのが <strong>画像</strong> で、保管先が <strong>documents</strong> ディレクトリなら、使うのは <strong>viewimage.php</strong> ラッパー:<br>例、画像を documents/medias (公開アクセス用のオープンディレクトリ) に置くなら、構文は:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource2=画像を共有リンク (ファイルの共有ハッシュキーを使用したオープンアクセス) で共有するなら、構文は:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>HTMLまたは動的コードのその他の例は、 <a href="%s" target="_blank">the wiki documentation</a><br> で利用可能。
+YouCanEditHtmlSourceMore= <br>その他のHTMLまたは動的コードの例は<a href="%s" target="_blank" rel="noopener noreferrer external">wikiドキュメント</a>にて利用可能<br>。
 ClonePage=クローンページ/コンテナ
 CloneSite=クローンサイト
 SiteAdded=ウェブサイトを追加
@@ -139,7 +139,7 @@ AllowedInFrames=フレームで許可
 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 266b084819b..0e89c239fce 100644
--- a/htdocs/langs/ja_JP/withdrawals.lang
+++ b/htdocs/langs/ja_JP/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=クレジット転送注文
 LatestBankTransferReceipts=最新の%sクレジット転送注文
 LastWithdrawalReceipts=最新の%s口座振替ファイル
 WithdrawalsLine=口座振替注文ライン
+CreditTransfer=銀行口座振替
 CreditTransferLine=クレジット転送ライン
 WithdrawalsLines=口座振替注文明細
 CreditTransferLines=クレジット転送ライン
@@ -47,6 +48,7 @@ ThirdPartyBankCode=取引先の銀行コード
 NoInvoiceCouldBeWithdrawed=正常に引き落とされた請求書はない。請求書が有効なIBANを持つ会社のものであり、IBANにモード<strong> %s </strong>のUMR(一意の委任参照)があることを確認すること。
 WithdrawalCantBeCreditedTwice=この出金票はすでに貸方でマークされている。これは、重複した支払いと銀行エントリを作成する可能性があるため、2回実行することは不可。
 ClassCredited=入金分類
+ClassDebited=借方を分類
 ClassCreditedConfirm=あなたの銀行口座に入金、この引落しの領収書を分類してもよいか？
 TransData=日付伝送
 TransMetod=方式伝送
@@ -80,7 +82,7 @@ StatusMotif7=裁判
 StatusMotif8=他の理由
 CreateForSepaFRST=口座振替ファイルの作成(SEPA FRST)
 CreateForSepaRCUR=口座振替ファイルの作成(SEPA RCUR)
-CreateAll=口座振替ファイルの作成(すべて)
+CreateAll=自動引落ファイルを作成
 CreateFileForPaymentByBankTransfer=クレジット転送用のファイルを作成する
 CreateSepaFileForPaymentByBankTransfer=クレジット転送ファイル(SEPA)の作成
 CreateGuichet=唯一のオフィス
@@ -103,7 +105,7 @@ WithdrawalFile=デビット注文ファイル
 CreditTransferFile=クレジット転送ファイル
 SetToStatusSent=ステータス「ファイル送信済」に設定
 ThisWillAlsoAddPaymentOnInvoice=これはまた、請求書に支払を記録し、支払の残りがnullの場合、それらを「支払済」として分類する
-StatisticsByLineStatus=回線のステータスによる統計
+StatisticsByLineStatus=行のステータスによる統計
 RUM=UMR
 DateRUM=署名日を委任する
 RUMLong=独自のマンデートリファレンス
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=空の金額の口座振替リクエストを作
 SepaMandate=SEPA口座振替の委任
 SepaMandateShort=SEPAマンデート
 PleaseReturnMandate=この委任フォームを電子メールで%sに、または郵送でに返送すること。
-SEPALegalText=この委任フォームに署名することにより、(A)%sが銀行に口座から引き落とすように指示を送信し、(B)%sからの指示に従って銀行が口座から引き落とすように承認する。あなたの権利の一部として、あなたはあなたの銀行とのあなたの合意の条件の下であなたの銀行からの払い戻しを受ける権利がある。アカウントから引き落とされた日から8週間以内に払い戻しを請求する必要がある。上記の義務に関するあなたの権利は、あなたがあなたの銀行から入手できる残高明細で説明される。
+SEPALegalText=この委任フォームに署名することにより、（A）%sが銀行に口座からの引き落としを指示し、（B）銀行が%sからの指示に従って口座から引き落としを行うことを承認する。あなたの権利の一部として、あなたはあなたの銀行とのあなたの合意の条件の下であなたの銀行からの払い戻しを受ける権利がある。上記委任事項に関するあなたの権利は、あなたが銀行から入手できる明細書で説明されている。
 CreditorIdentifier=債権者識別子
 CreditorName=債権者名
 SEPAFillForm=(B)*のマークが付いているすべてのフィールドに入力すること
@@ -150,3 +152,5 @@ ModeWarning=リアルモードのオプションが設定されていない、
 ErrorCompanyHasDuplicateDefaultBAN=ID %s の法人には、複数のデフォルトの銀行口座がある。どちらを使用するかを知る方法はない。
 ErrorICSmissing=銀行口座%sにICSがない
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=口座振替の合計金額が行の合計と異なる
+WarningSomeDirectDebitOrdersAlreadyExists=警告：すでに保留中の口座振替要求 (%s) があり、金額は %s
+WarningSomeCreditTransferAlreadyExists=警告：すでに保留中の振込要求(%s) があり、その金額は %s
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index c20e0a339f6..8bc4b54a090 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 8e38468846c..d79adb1e960 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Version
 Publisher=Publisher
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang
index 6c770163f29..f066877f676 100644
--- a/htdocs/langs/ka_GE/banks.lang
+++ b/htdocs/langs/ka_GE/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/ka_GE/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/ka_GE/bookmarks.lang
+++ b/htdocs/langs/ka_GE/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
index 97b990f62b4..640a229b7f2 100644
--- a/htdocs/langs/ka_GE/compta.lang
+++ b/htdocs/langs/ka_GE/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/ka_GE/holiday.lang
index 0527f4c0788..3d0ae64be0f 100644
--- a/htdocs/langs/ka_GE/holiday.lang
+++ b/htdocs/langs/ka_GE/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/ka_GE/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/ka_GE/install.lang
+++ b/htdocs/langs/ka_GE/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/ka_GE/main.lang
index 7124b2d7b1b..2d850927782 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ 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
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/ka_GE/modulebuilder.lang b/htdocs/langs/ka_GE/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/ka_GE/modulebuilder.lang
+++ b/htdocs/langs/ka_GE/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 9bc68dc3678..49ff93dd589 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/ka_GE/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/ka_GE/partnership.lang
+++ b/htdocs/langs/ka_GE/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/ka_GE/productbatch.lang b/htdocs/langs/ka_GE/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/ka_GE/productbatch.lang
+++ b/htdocs/langs/ka_GE/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 205a28980a8..14715670882 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index 5a2911bac0b..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,3 +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/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index a2a335be8f6..599c9649b18 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/ka_GE/stripe.lang b/htdocs/langs/ka_GE/stripe.lang
index 844762040af..2c95bcfce27 100644
--- a/htdocs/langs/ka_GE/stripe.lang
+++ b/htdocs/langs/ka_GE/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/ka_GE/withdrawals.lang b/htdocs/langs/ka_GE/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/ka_GE/withdrawals.lang
+++ b/htdocs/langs/ka_GE/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/kk_KZ/accountancy.lang b/htdocs/langs/kk_KZ/accountancy.lang
index ecd004df179..eaeadc8ac44 100644
--- a/htdocs/langs/kk_KZ/accountancy.lang
+++ b/htdocs/langs/kk_KZ/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=ЕЭК -ке кірмейтін елдер
 CountriesInEECExceptMe=%s қоспағанда, ЕЭК елдері
 CountriesExceptMe=%s қоспағанда, барлық елдер
 AccountantFiles=Бастапқы құжаттарды экспорттау
-ExportAccountingSourceDocHelp=Бұл құралдың көмегімен сіз бухгалтерлік есепті құру үшін пайдаланылған бастапқы оқиғаларды (CSV және PDF форматындағы тізім) экспорттауға болады.
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
 ExportAccountingSourceDocHelp2=Журналдарды экспорттау үшін %s - %s мәзір жазбасын пайдаланыңыз.
 VueByAccountAccounting=Бухгалтерлік шот бойынша қарау
 VueBySubAccountAccounting=Бухгалтерлік қосалқы шот бойынша қарау
@@ -286,7 +286,7 @@ ValidateMovements=Қозғалыстарды растау
 DescValidateMovements=Жазуды, жазуды және жоюды кез келген өзгертуге немесе жоюға тыйым салынады. Жаттығуға арналған барлық жазбалар тексерілуі керек, әйтпесе жабу мүмкін болмайды
 
 ValidateHistory=Автоматты түрде байлау
-AutomaticBindingDone=Автоматты байланыстыру орындалды
+AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Қате, сіз бұл есептік жазбаны жоя алмайсыз, себебі ол пайдаланылады
 MvtNotCorrectlyBalanced=Қозғалыс дұрыс теңгерілмеген. Дебет = %s | Несие = %s
@@ -387,7 +387,8 @@ SaleExport=Экспорттық сату
 SaleEEC=ЕЭК -те сату
 SaleEECWithVAT=ЕЭК -те ҚҚС -мен сату нөлге тең емес, сондықтан біздің ойымызша бұл сатылымнан тыс сату емес және ұсынылған шот - бұл өнімнің стандартты шоты.
 SaleEECWithoutVATNumber=ЕЭК -те ҚҚС жоқ сату, бірақ үшінші тараптың ҚҚС идентификаторы анықталмаған. Біз стандартты сату бойынша өнім шотынан бас тартамыз. Қажет болса, үшінші тараптың ҚҚС идентификаторын немесе өнім шотын түзетуге болады.
-
+ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
+ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
 Range=Бухгалтерлік есептің диапазоны
 Calculated=Есептелген
@@ -404,6 +405,7 @@ NoJournalDefined=Журнал анықталмаған
 Binded=Жолдар байланған
 ToBind=Байланыстыратын жолдар
 UseMenuToSetBindindManualy=Сызықтар әлі байланыстырылмаған, <a href="%s"> %s </a> мәзірін қолданып байланыстыруды жасаңыз
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
 
 ## Import
 ImportAccountingEntries=Бухгалтерлік жазбалар
diff --git a/htdocs/langs/kk_KZ/admin.lang b/htdocs/langs/kk_KZ/admin.lang
index ba0294507a2..74905691d9d 100644
--- a/htdocs/langs/kk_KZ/admin.lang
+++ b/htdocs/langs/kk_KZ/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Қор
 Version=Нұсқа
 Publisher=Баспа
@@ -265,8 +267,8 @@ OtherResources=Басқа ресурстар
 ExternalResources=Сыртқы ресурстар
 SocialNetworks=Әлеуметтік желілер
 SocialNetworkId=Әлеуметтік желі идентификаторы
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Басқа сұрақтар/көмек үшін сіз Dolibarr форумын пайдалана аласыз: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
+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=Міне, Dolibarr көмегімен көмек пен қолдау алуға арналған бірнеше ресурстар.
 HelpCenterDesc2=Бұл ресурстардың кейбірі <b> ағылшын тілінде </b> қол жетімді.
 CurrentMenuHandler=Ағымдағы мәзір өңдегіші
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Соңғы тұрақты нұсқа
 LastActivationDate=Соңғы активтендіру күні
 LastActivationAuthor=Соңғы активация авторы
 LastActivationIP=Ең соңғы IP активтендіру
+LastActivationVersion=Latest activation version
 UpdateServerOffline=Серверді желіден тыс жаңарту
 WithCounter=Есептегішті басқарыңыз
 GenericMaskCodes=Сіз кез келген нөмірлеу маскасын енгізе аласыз. Бұл маскада келесі тегтерді қолдануға болады: <br> <b> {000000} </b> әр %s көбейтілетін санға сәйкес келеді. Есептегіштің қажетті ұзындығына қанша нөлді енгізіңіз. Есептегішті маска сияқты нөлге тең болу үшін сол жақтан нөлдер толтырады. <br> <b> {000000 + 000} </b> бұрынғыға ұқсас, бірақ + белгісінің оң жағындағы санға сәйкес келетін есеп бірінші %s бастап қолданылады. <br> <b> {000000@x} </b> бұрынғыға ұқсас, бірақ x айына жеткенде санауыш нөлге ысырылады (1 -ден 12 -ге дейін немесе 0 сіздің конфигурацияңызда анықталған қаржылық жылдың алғашқы айларын пайдалану үшін ай сайын нөлге қалпына келтіріңіз). Егер бұл опция қолданылса және x 2 немесе одан жоғары болса, онда {yy} {mm} немесе {yyyy} {мм} реттілігі де қажет. <br> <b> {dd} </b> күн (01 -ден 31 -ге дейін). <br> <b> {mm} </b> ай (01 -ден 12 -ге дейін). <br> <b> {yy} </b>, <b> {yyyy} </b> немесе a0aee83365837fz4 2b3 a09 a09 a09 a4 <br>
@@ -753,7 +756,7 @@ Permission106=Жіберулерді экспорттау
 Permission109=Жіберулерді жою
 Permission111=Қаржылық есептерді оқыңыз
 Permission112=Транзакция жасау/өзгерту/жою және салыстыру
-Permission113=Қаржылық шоттарды орнату (категорияларды құру, басқару)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Мәмілелерді салыстыру
 Permission115=Экспорттық операциялар мен шот бойынша үзінділер
 Permission116=Шоттар арасындағы аударымдар
@@ -762,6 +765,7 @@ Permission121=Пайдаланушымен байланыстырылған үш
 Permission122=Пайдаланушымен байланыстырылған үшінші жақтарды құру/өзгерту
 Permission125=Пайдаланушымен байланыстырылған үшінші тараптарды жою
 Permission126=Үшінші тараптарға экспорттау
+Permission130=Create/modify third parties payment information
 Permission141=Барлық жобалар мен тапсырмаларды оқу (сонымен қатар мен байланыста болмайтын жеке жобалар)
 Permission142=Барлық жобалар мен тапсырмаларды жасау/өзгерту (сонымен қатар мен байланысқа шықпайтын жеке жобалар)
 Permission144=Барлық жобалар мен тапсырмаларды жою (сонымен қатар мен байланыспайтын жеке жобалар)
@@ -889,12 +893,11 @@ Permission701=Қайырымдылықты оқыңыз
 Permission702=Қайырымдылық жасау/өзгерту
 Permission703=Қайырымдылықты жою
 Permission771=Шығыстар туралы есептерді оқыңыз (сіздікі және бағыныштыларыңыз)
-Permission772=Шығындар туралы есептерді жасаңыз/өзгертіңіз
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Шығындар туралы есептерді жою
-Permission774=Барлық шығыстар туралы есептерді оқыңыз (тіпті бағынышты емес пайдаланушылар үшін)
 Permission775=Шығындар есебін бекіту
 Permission776=Шығындар бойынша есептер
-Permission777=Барлығының шығыс есебін оқыңыз
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Барлығының шығыс есебін жасаңыз/өзгертіңіз
 Permission779=Экспорт шығындары туралы есептер
 Permission1001=Акцияларды оқу
@@ -958,15 +961,11 @@ Permission2801=FTP клиентін оқу режимінде қолданыңы
 Permission2802=Жазу режимінде FTP клиентін қолданыңыз (файлдарды жою немесе жүктеу)
 Permission3200=Мұрағатталған оқиғалар мен саусақ іздерін оқыңыз
 Permission3301=Жаңа модульдер құру
-Permission4001=Қызметкерлерді қараңыз
-Permission4002=Қызметкерлерді құру
-Permission4003=Қызметкерлерді жою
-Permission4004=Жұмысшыларды экспорттау
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ Permission10005=Веб -сайттың мазмұнын жою
 Permission20001=Демалыс туралы өтініштерді оқыңыз (сіздің және қарамағыңыздағы қызметкерлердің демалысы)
 Permission20002=Еңбек демалысы туралы өтініштерді жасаңыз/өзгертіңіз (сіздің және қарамағыңыздағы қызметкерлердің демалысы)
 Permission20003=Демалыс туралы өтініштерді жою
-Permission20004=Барлық демалыс сұрауларын оқыңыз (тіпті бағынышты емес пайдаланушылардың)
-Permission20005=Барлығына демалыс сұрауларын жасаңыз/өзгертіңіз (тіпті бағынышты емес пайдаланушылар үшін де)
-Permission20006=Әкімші кетуге сұраныс (теңгерімді орнату және жаңарту)
+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=Демалыс туралы өтініштерді мақұлдау
 Permission23001=Жоспарланған жұмысты оқу
 Permission23002=Жоспарланған тапсырманы жасаңыз/жаңартыңыз
@@ -1358,9 +1357,9 @@ BrowserIsOK=Сіз %s веб -шолғышын қолданасыз. Бұл шо
 BrowserIsKO=Сіз %s веб -шолғышын қолданасыз. Бұл шолғыш қауіпсіздіктің, өнімділіктің және сенімділіктің нашар таңдауы екені белгілі. Біз Firefox, Chrome, Opera немесе Safari қолдануды ұсынамыз.
 PHPModuleLoaded=%s PHP компоненті жүктелген
 PreloadOPCode=Алдын ала жүктелген OPCode қолданылады
-AddRefInList=Тапсырыс беруші/сатушы сілтемесін көрсету. ақпарат тізімі (таңдау тізімі немесе комбокс) және гиперсілтеменің көп бөлігі. <br> Үшінші жақтар «CC12345 - SC45678 - Үлкен компания корпорациясы» атау форматымен пайда болады. «The Big Company corp» орнына.
-AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=Тапсырыс берушінің/сатушының мекен -жайлары туралы ақпарат тізімін көрсету (таңдау тізімі немесе комбокс) <br> Үшінші тараптар «The Big Company corp.» Орнына «Big Company corp. - 21 jump street 123456 Big town - USA» атау форматымен шығады.
+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=Байланыс электрондық поштасын (немесе телефондар анықталмаса) және қала ақпаратының тізімін (тізім немесе комбоксты таңдаңыз) көрсету <br> Байланыстар «Dupond Durand - dupond.durand@email.com - Париж» немесе «Дюпонд Дюран - 06 07» атау форматында пайда болады. 59 65 66 - «Дюпон Дюранның» орнына Париж «.
 AskForPreferredShippingMethod=Үшінші тараптар үшін жөнелтудің қолайлы әдісін сұраңыз.
 FieldEdition=%s өрісінің басылымы
@@ -1708,8 +1707,9 @@ MailingDelay=Келесі хабарламаны жібергеннен кейі
 NotificationSetup=Электрондық пошта хабарландыру модулін орнату
 NotificationEMailFrom=Хабарламалар модулі жіберетін электрондық хаттар үшін жіберуші электрондық поштасы (Кімнен)
 FixedEmailTarget=Алушы
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Жеткізу модулін орнату
 SendingsReceiptModel=Түбіртек үлгісін жіберу
@@ -1725,8 +1725,8 @@ 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
+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 өнімдерінің егжей -тегжейлі желілерін құру/шығару барлық субъектілер үшін (ұсыныстар, тапсырыстар, шот -фактуралар және т.б.). <span class="warning"> Ескерту: Бұл жағдайда бұл параметрді қолдану қатаң ұсынылмайды, себебі ол PDF файлдарын құру кезінде арнайы таңбалар мен беттерді пішімдеуде қиындықтар тудыруы мүмкін. </span>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Шығыстық есептер модулін орна
 ExpenseReportNumberingModules=Шығындар бойынша есептерді нөмірлеу модулі
 NoModueToManageStockIncrease=Акциялардың автоматты түрде өсуін басқара алатын модуль іске қосылмаған. Акцияны көбейту тек қолмен енгізу арқылы жүзеге асады.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Сіз «Хабарландыру» модулін қосу және конфигурациялау арқылы электрондық пошта хабарландыруларының нұсқаларын таба аласыз.
+TemplatesForNotifications=Templates for notifications
 ListOfNotificationsPerUser=Бір пайдаланушыға автоматты хабарламалар тізімі*
 ListOfNotificationsPerUserOrContact=Мүмкін болатын автоматты хабарландырулардың тізімі (іскерлік оқиға бойынша) бір пайдаланушыға* немесе бір контактіге ** қол жетімді
 ListOfFixedNotifications=Автоматты тіркелген хабарламалардың тізімі
@@ -1916,6 +1917,8 @@ ConfFileMustContainCustom=Қолданбадан сыртқы модульді 
 HighlightLinesOnMouseHover=Тышқанды жылжыту кезінде кесте сызықтарын бөлектеңіз
 HighlightLinesColor=Тінтуір өткен кезде сызықтың түсін бөлектеңіз (ерекшелеу үшін 'ffffff' пайдаланыңыз)
 HighlightLinesChecked=Жолдың түсін тексерген кезде бөлектеңіз (ерекшелеу үшін 'ffffff' пайдаланыңыз)
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=Бет атауының мәтін түсі
 LinkColor=Сілтемелердің түсі
 PressF5AfterChangingThis=Бұл мәнді өзгерткеннен кейін пернетақтадағы CTRL+F5 пернелерін басыңыз немесе шолғыштың кэшін тазалаңыз
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Осы коллекционерге арналға
 NoNewEmailToProcess=Өңделетін жаңа электрондық пошта (сәйкес келетін сүзгілер) жоқ
 NothingProcessed=Ештеңе жасалмады
 XEmailsDoneYActionsDone=%s электрондық поштасы жарамды, %s электрондық поштасы сәтті өңделді (%s жазбасы/әрекеттері үшін)
-RecordEvent=Электрондық пошта оқиғасын жазыңыз
-CreateLeadAndThirdParty=Жетекші жасаңыз (және қажет болған жағдайда үшінші тарап)
-CreateTicketAndThirdParty=Билетті жасаңыз (және егер ол алдыңғы операциямен жүктелген болса, үшінші тарапқа сілтеме жасаңыз)
+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=Бастапқы каталогтағы электрондық пошталардың саны
 LoadThirdPartyFromName=%s бойынша іздейтін үшінші тарапты жүктеңіз (тек жүктеу үшін)
 LoadThirdPartyFromNameOrCreate=%s бойынша үшінші тарап іздеуді жүктеңіз (табылмаса жасаңыз)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Dolibarr жіберген бірінші электрондық пошта арқылы басталған сөйлесуден хабар
 WithoutDolTrackingID=Dolibarr жібермеген ЕМЕС бірінші электрондық пошта арқылы басталған сөйлесуден хабар
 WithDolTrackingIDInMsgId=Хабар Долибардан жіберілді
@@ -2078,7 +2082,7 @@ CreateCandidature=Жұмысқа өтініш жасаңыз
 FormatZip=Zip
 MainMenuCode=Мәзірді енгізу коды (негізгі мәзір)
 ECMAutoTree=ECM автоматты ағашын көрсету
-OperationParamDesc=Әрекет объектісі үшін қолданылатын мәндерді немесе мәндерді шығару жолдарын анықтаңыз. Мысалы: <br> objproperty1 = SET: <br> орнататын мән ([^\\ s]*) <br> options_myextrafield1 = EXTRACT: SUBJECT: ([^&#92; n]*) <br> object.objproperty5 = EXTRACT: BODY: Менің компаниямның атауы \\ s ([^\\ s4b2z)*) <br> a пайдаланыңыз; char бірнеше қасиеттерді алу немесе орнату үшін бөлгіш ретінде.
+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=Ресурс модулінің конфигурациясы
@@ -2124,7 +2128,7 @@ LargerThan=Одан үлкен
 IfTrackingIDFoundEventWillBeLinked=Назар аударыңыз, егер электрондық поштада объектінің бақылау идентификаторы табылса немесе электрондық пошта электрондық поштаның жауабы болса, ол жиналып, объектімен байланыстырылған болса, жасалған оқиға белгілі байланысты объектімен автоматты түрде байланыстырылады.
 WithGMailYouCanCreateADedicatedPassword=GMail тіркелгісінде, егер сіз 2 қадамды тексеруді қосқан болсаңыз, https://myaccount.google.com/ сайтынан өзіңіздің есептік жазбаңыздың құпия сөзін пайдаланудың орнына қосымша үшін арнайы екінші құпия сөзді жасау ұсынылады.
 EmailCollectorTargetDir=Сәтті өңделген кезде электрондық поштаны басқа тегке/каталогқа жылжыту қажет мінез болуы мүмкін. Бұл мүмкіндікті пайдалану үшін каталогтың атауын осында орнатыңыз (арнайы таңбаларды атауында қолдануға болмайды). Есіңізде болсын, сіз оқуға/жазуға кіру есептік жазбасын пайдалануыңыз керек.
-EmailCollectorLoadThirdPartyHelp=Сіз бұл әрекетті дерекқордағы бар үшінші тарапты табу және жүктеу үшін электрондық пошта мазмұнын пайдалану үшін пайдалана аласыз. Табылған (немесе құрылған) үшінші тарап қажет әрекеттерді орындау үшін қолданылады. <br> Мысалы, егер сіз денеде табылған 'Name: name to find' жолын шығарып алған үшінші тарап құрғыңыз келсе, жіберуші электрондық поштаны электрондық пошта ретінде қолданыңыз, келесідей параметр өрісін орнатуға болады: <br> 'email = HEADER: ^Кімнен: (.*); Аты = ШЫҒАРУ: ДЕНЕ: Аты: \\ s ([^\\ s]*); клиент = SET: 2; ' <br>
+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=%s үшін соңғы нүкте: %s
 DeleteEmailCollector=Электрондық пошта жинаушысын жою
 ConfirmDeleteEmailCollector=Бұл электрондық пошта жинаушыны шынымен жойғыңыз келе ме?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/kk_KZ/banks.lang b/htdocs/langs/kk_KZ/banks.lang
index 5b330011662..b79a99c9760 100644
--- a/htdocs/langs/kk_KZ/banks.lang
+++ b/htdocs/langs/kk_KZ/banks.lang
@@ -32,7 +32,7 @@ RIB=Банктік шот нөмірі
 IBAN=IBAN нөмірі
 BIC=BIC/SWIFT коды
 SwiftValid=BIC/SWIFT жарамды
-SwiftVNotalid=BIC/SWIFT жарамсыз
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN жарамды
 IbanNotValid=BAN жарамсыз
 StandingOrders=Тікелей дебеттік тапсырыстар
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Банк мекенжайы
 BankAccountCountry=Есептік жазба елі
 BankAccountOwner=Есептік жазба иесінің аты
 BankAccountOwnerAddress=Есептік жазба иесінің мекенжайы
-RIBControlError=Мәндердің тұтастығын тексеру сәтсіз аяқталды. Бұл шот нөмірі туралы ақпарат толық емес немесе қате екенін білдіреді (елді, нөмірлерді және IBAN кодын тексеріңіз).
 CreateAccount=Аккаунт құру
 NewBankAccount=Жаңа есептік жазба
 NewFinancialAccount=Жаңа қаржылық есеп
diff --git a/htdocs/langs/kk_KZ/bills.lang b/htdocs/langs/kk_KZ/bills.lang
index f53faf689b4..e3f9523f522 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=Төлем шарттары
@@ -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=Жалпы үлгерім %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
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/bookmarks.lang b/htdocs/langs/kk_KZ/bookmarks.lang
index d10a1e630dd..7a00e856163 100644
--- a/htdocs/langs/kk_KZ/bookmarks.lang
+++ b/htdocs/langs/kk_KZ/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Бетбелгі URL таңдалған кездегі әрекет
 CreateBookmark=Бетбелгі жасау
 SetHereATitleForLink=Бетбелгіге атау қойыңыз
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Сыртқы/абсолютті сілтемені (https: // URL) немесе ішкі/салыстырмалы сілтемені пайдаланыңыз (/DOLIBARR_ROOT/htdocs/...)
+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=Байланыстырылған бет ағымдағы қойындыда немесе жаңа қойындыда ашылатынын таңдаңыз
 BookmarksManagement=Бетбелгілерді басқару
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/kk_KZ/companies.lang b/htdocs/langs/kk_KZ/companies.lang
index 2d3ea7534b1..f162f294328 100644
--- a/htdocs/langs/kk_KZ/companies.lang
+++ b/htdocs/langs/kk_KZ/companies.lang
@@ -157,6 +157,18 @@ 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=Профессор 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Тексеру
 VATIntraCheckDesc=ҚҚС идентификаторы ел префиксін қамтуы тиіс. <b> %s </b> сілтемесі Dolibarr серверінен Интернетке қосылуды қажет ететін Еуропалық ҚҚС тексеру қызметін (VIES) қолданады.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Еуропалық комиссияның веб-сайтынан ҚҚС бойынша Қауымдастық ішіндегі идентификаторды тексеріңіз
-VATIntraManualCheck=Сіз сондай -ақ Еуропалық Комиссияның <a href="%s" target="_blank"> %s </a> веб -сайтынан қолмен тексере аласыз.
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Тексеру мүмкін емес. Тексеру қызметін мүше мемлекет көрсетпейді (%s).
 NorProspectNorCustomer=Болашақ та, клиент те емес
 JuridicalStatus=Шаруашылық субъектісінің түрі
diff --git a/htdocs/langs/kk_KZ/compta.lang b/htdocs/langs/kk_KZ/compta.lang
index b632b6c5951..1f92f7c5918 100644
--- a/htdocs/langs/kk_KZ/compta.lang
+++ b/htdocs/langs/kk_KZ/compta.lang
@@ -170,8 +170,9 @@ SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation
 SeeReportInDueDebtMode=<b> %s жазылған құжаттарды талдау %s </b> белгілі <b> жазылған құжаттарға </b> тіркелген болса да қараңыз
 SeeReportInBookkeepingMode=<b> %s бухгалтерлік кітапты талдауды қараңыз table%s </b> <b> Бухгалтерлік есеп кестесі a09a4b73
 RulesAmountWithTaxIncluded=- Көрсетілген сомалар барлық салықтарды қосқанда
-RulesResultDue=- Оған төленбеген шот -фактуралар, шығыстар, ҚҚС, қайырымдылық төленеді немесе төленбейді. Оған төленген жалақы да кіреді. <br> - Ол шот -фактуралардың есеп айырысу күніне және шығыстардың немесе салықтық төлемдердің төлеу мерзіміне негізделген. Жалақы модулімен анықталған жалақы үшін төлемнің төленген күні қолданылады.
-RulesResultInOut=- Ол шот -фактуралар, шығындар, ҚҚС және жалақы бойынша нақты төлемдерді қамтиды. <br> - Ол шот -фактураларды, шығыстарды, ҚҚС және жалақыларды төлеу күндеріне негізделген. Қайырымдылыққа берілген күн.
+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=- Бұған клиенттің төленген немесе төленбеген шоттары кіреді. <br> - Ол осы шот -фактуралардың есеп айырысу күніне негізделген. <br>
 RulesCAIn=- Ол клиенттерден алынған шот -фактуралардың барлық тиімді төлемдерін қамтиды. <br> - ол осы шот -фактуралардың төленген күніне негізделген <br>
 RulesCATotalSaleJournal=Ол сату журналының барлық несие желілерін қамтиды.
@@ -295,3 +296,5 @@ 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/kk_KZ/errors.lang b/htdocs/langs/kk_KZ/errors.lang
index 3491d2cc9fc..e10bb476fff 100644
--- a/htdocs/langs/kk_KZ/errors.lang
+++ b/htdocs/langs/kk_KZ/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Бұл контакт бұрынна
 ErrorCashAccountAcceptsOnlyCashMoney=Бұл банктік шот - бұл қолма -қол ақша шоты, сондықтан ол тек қолма -қол ақша түріндегі төлемдерді қабылдайды.
 ErrorFromToAccountsMustDiffers=Банктік шоттардың көзі мен мақсаты әр түрлі болуы керек.
 ErrorBadThirdPartyName=Үшінші тарап атауының нашар мәні
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s міндетті болып табылады
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Тұтынушы коды үшін нашар синтаксис
 ErrorBadBarCodeSyntax=Штрих -код үшін нашар синтаксис. Нашар штрих -код түрін орнатқан шығарсыз немесе нөмірленген сканерленген мәнге сәйкес келмейтін штрих -код маскасын анықтаған боларсыз.
 ErrorCustomerCodeRequired=Тұтынушы коды қажет
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=RSS арнасы алынбады. Қате турал
 ErrorForbidden=Рұқсат жоқ. <br> Сіз өшірілген модульдің бетіне, аймағына немесе мүмкіндігіне немесе аутентификацияланған сеанста болмай немесе пайдаланушыға рұқсат етілмеуге тырысасыз.
 ErrorForbidden2=Бұл кіруге рұқсатты Dolibarr әкімшісі %s-> %s мәзірінен анықтай алады.
 ErrorForbidden3=Dolibarr аутентификацияланған сеанс арқылы қолданылмайтын сияқты. Аутентификацияны (htaccess, mod_auth немесе басқа ...) қалай басқаруға болатынын білу үшін Dolibarr орнату құжаттамасын қараңыз.
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=Imagick класы бұл PHP -де жоқ. Алдын ала қарау мүмкін емес. Әкімшілер бұл қойындыны Setup - Display мәзірінен өшіре алады.
 ErrorRecordAlreadyExists=Жазба бұрыннан бар
 ErrorLabelAlreadyExists=Бұл белгі бұрыннан бар
@@ -271,6 +274,9 @@ 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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Сіздің PHP параметрі upload_max_filesize (%s) PHP параметрі post_max_size (%s) қарағанда жоғары. Бұл дәйекті орнату емес.
@@ -312,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/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/holiday.lang b/htdocs/langs/kk_KZ/holiday.lang
index c10df162f39..c6a07415bf7 100644
--- a/htdocs/langs/kk_KZ/holiday.lang
+++ b/htdocs/langs/kk_KZ/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Сипаттама
 SendRequestCP=Еңбек демалысы туралы өтініш жасаңыз
 DelayToRequestCP=Еңбек демалысына сұраныс кемінде <b> %s күн (дер) </b> болуы керек.
 MenuConfCP=Демалыс балансы
-SoldeCPUser=Демалыс балансы - <b> %s </b> күн.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Сіз басталу күнінен үлкен аяқталу күнін таңдауыңыз керек.
 ErrorSQLCreateCP=Жасау кезінде SQL қатесі пайда болды:
 ErrorIDFicheCP=Қате пайда болды, демалыс сұрауы жоқ.
@@ -134,3 +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/install.lang b/htdocs/langs/kk_KZ/install.lang
index ec0a1febbe8..3ef2aa70e41 100644
--- a/htdocs/langs/kk_KZ/install.lang
+++ b/htdocs/langs/kk_KZ/install.lang
@@ -21,6 +21,7 @@ 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 каталогы жоқ.
diff --git a/htdocs/langs/kk_KZ/knowledgemanagement.lang b/htdocs/langs/kk_KZ/knowledgemanagement.lang
index be0d33d308e..6edef9a061a 100644
--- a/htdocs/langs/kk_KZ/knowledgemanagement.lang
+++ b/htdocs/langs/kk_KZ/knowledgemanagement.lang
@@ -48,3 +48,7 @@ KnowledgeRecordExtraFields = Мақалаға арналған экстра өр
 GroupOfTicket=Билеттер тобы
 YouCanLinkArticleToATicketCategory=Сіз мақаланы билеттер тобына байланыстыра аласыз (сондықтан мақала жаңа билеттерді іріктеу кезінде ұсынылады)
 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/main.lang b/htdocs/langs/kk_KZ/main.lang
index ef9cadc91a1..83448cb7eae 100644
--- a/htdocs/langs/kk_KZ/main.lang
+++ b/htdocs/langs/kk_KZ/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Қате, '%s' елі үшін ҚҚС мө
 ErrorNoSocialContributionForSellerCountry=Қате, '%s' елі үшін анықталған әлеуметтік/фискалдық салық түрі жоқ.
 ErrorFailedToSaveFile=Қате, файл сақталмады.
 ErrorCannotAddThisParentWarehouse=Сіз бұрыннан бар қойманың баласы болып табылатын ата -аналық қойманы қосуға тырысасыз
+FieldCannotBeNegative=Field "%s" cannot be negative
 MaxNbOfRecordPerPage=Максимум бір беттегі жазбалар саны
 NotAuthorized=Сіз мұны істеуге құқығыңыз жоқ.
 SetDate=Күнді орнату
@@ -87,7 +88,7 @@ FileWasNotUploaded=Тіркеме үшін файл таңдалған, біра
 NbOfEntries=Жазбалар саны
 GoToWikiHelpPage=Интернеттегі анықтаманы оқыңыз (Интернетке кіру қажет)
 GoToHelpPage=Анықтаманы оқыңыз
-DedicatedPageAvailable=Ағымдағы экранға қатысты арнайы анықтама беті бар
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Басты бет
 RecordSaved=Жазба сақталды
 RecordDeleted=Жазба жойылды
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Дерекқорға кіруге соңғы сұр
 InformationLastAccessInError=Дерекқорға кіруге рұқсат сұрауының соңғы қатесі туралы ақпарат
 DolibarrHasDetectedError=Dolibarr техникалық қатені анықтады
 YouCanSetOptionDolibarrMainProdToZero=Қосымша ақпарат алу үшін журнал файлын оқи аласыз немесе $ dolibarr_main_prod параметрін конфигурация файлыңызда '0' мәніне қоя аласыз.
-InformationToHelpDiagnose=Бұл ақпарат диагностикалық мақсаттарда пайдалы болуы мүмкін (мұндай ескертулерді жою үшін $ dolibarr_main_prod опциясын '1' етіп орнатуға болады)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Көбірек ақпарат
 TechnicalInformation=Техникалық ақпарат
 TechnicalID=Техникалық идентификатор
@@ -211,6 +212,8 @@ User=Қолданушы
 Users=Пайдаланушылар
 Group=Топ
 Groups=Топтар
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Пайдаланушылар тобы анықталмаған
 Password=Құпия сөз
 PasswordRetype=Құпия сөзді қайта теріңіз
@@ -906,7 +909,7 @@ ViewFlatList=Тізімді қарау
 ViewAccountList=Кітапты қарау
 ViewSubAccountList=Қосалқы шотты қарау
 RemoveString='%s' жолын алып тастаңыз
-SomeTranslationAreUncomplete=Ұсынылған тілдердің кейбіреулері ішінара аударылған немесе қателер болуы мүмкін. Жақсартуларды қосу үшін <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> сайтына тіркелу арқылы тіліңізді түзетуге көмектесіңіз.
+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=Жалпыға қолжетімді жүктеу сілтемесі
 PublicDownloadLinkDesc=Файлды жүктеу үшін тек сілтеме қажет
 DirectDownloadInternalLink=Жеке жүктеу сілтемесі
@@ -1158,4 +1161,6 @@ Properties=Қасиеттер
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Әлі жабылмаған
-ClearSignature=Қолтаңбаны қалпына келтіру
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/kk_KZ/modulebuilder.lang b/htdocs/langs/kk_KZ/modulebuilder.lang
index a3c0d37a096..b64e33b2aab 100644
--- a/htdocs/langs/kk_KZ/modulebuilder.lang
+++ b/htdocs/langs/kk_KZ/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Бұл құралды тәжірибелі қолданушылар немесе әзірлеушілер ғана қолдануы керек. Ол жеке модульді құруға немесе өңдеуге арналған утилиталарды ұсынады. Балама <a href="%s" target="_blank"> қолмен әзірлеуге арналған құжаттар мұнда </a>.
+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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Сіздің модуль/қосымша ұсынған мә
 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>' бойынша іздеу арқылы табуға болады).
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
+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=Орнату кезінде пайдаланылатын идентификаторларды қараңыз
 SeeReservedIDsRangeHere=Резервтелген идентификаторлар ауқымын қараңыз
 ToolkitForDevelopers=Dolibarr әзірлеушілеріне арналған құралдар жинағы
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/other.lang b/htdocs/langs/kk_KZ/other.lang
index cffb0146c8e..8e2120e47d0 100644
--- a/htdocs/langs/kk_KZ/other.lang
+++ b/htdocs/langs/kk_KZ/other.lang
@@ -258,6 +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
 YourPasswordHasBeenReset=Құпия сөзіңіз сәтті қалпына келтірілді
 ApplicantIpAddress=Өтініш берушінің IP мекенжайы
 SMSSentTo=%s нөміріне SMS жіберілді
@@ -268,6 +272,7 @@ ProjectCreatedByEmailCollector=MSGID %s электрондық поштасын
 TicketCreatedByEmailCollector=Билетті MSGID %s электрондық поштасынан электрондық пошта жинаушы жасаған
 OpeningHoursFormatDesc=Ашылу және жабылу сағаттарын ажырату үшін - пайдаланыңыз. <br> Әр түрлі ауқымдарды енгізу үшін бос орынды пайдаланыңыз. <br> Мысал: 8-12 14-18
 SuffixSessionName=Сеанс атауының жұрнағы
+LoginWith=Login with %s
 
 ##### Export #####
 ExportsArea=Экспорттық аймақ
diff --git a/htdocs/langs/kk_KZ/partnership.lang b/htdocs/langs/kk_KZ/partnership.lang
index d7593389623..71a03ce98d9 100644
--- a/htdocs/langs/kk_KZ/partnership.lang
+++ b/htdocs/langs/kk_KZ/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Серіктестікті басқару
 PartnershipDescription=Серіктестікті басқару модулі
 PartnershipDescriptionLong= Серіктестікті басқару модулі
-
+Partnership=Partnership
 AddPartnership=Серіктестік қосу
 CancelPartnershipForExpiredMembers=Серіктестік: жазылу мерзімі өткен мүшелердің серіктестігін тоқтату
 PartnershipCheckBacklink=Серіктестік: сілтеме бойынша сілтемені тексеріңіз
diff --git a/htdocs/langs/kk_KZ/productbatch.lang b/htdocs/langs/kk_KZ/productbatch.lang
index acd39a15216..8df06ce75e4 100644
--- a/htdocs/langs/kk_KZ/productbatch.lang
+++ b/htdocs/langs/kk_KZ/productbatch.lang
@@ -30,7 +30,7 @@ ManageLotMask=Арнайы маска
 CustomMasks=Әр өнім үшін басқа нөмірлеу маскасын анықтау мүмкіндігі
 BatchLotNumberingModules=Лот нөмірін автоматты түрде шығарудың нөмірлеу ережесі
 BatchSerialNumberingModules=Сериялық нөмірді автоматты түрде құруға арналған нөмірлеу ережесі (қасиеті бар өнімдер үшін 1 өнімге бірегей лот/серия)
-QtyToAddAfterBarcodeScan=Штрихкод/лот/сериялық сканерленген әрбір қосылатын саны
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Өмір сүру ұзақтығы (күнмен)
 EndOfLife=Өмірдің соңы
 ManufacturingDate=Өндірілген күні
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Тапсырыс жоқ
 InWorkingOrder=Жұмыс тәртібінде
+ToReplace=Replace
diff --git a/htdocs/langs/kk_KZ/products.lang b/htdocs/langs/kk_KZ/products.lang
index 742485e0198..6ab839803da 100644
--- a/htdocs/langs/kk_KZ/products.lang
+++ b/htdocs/langs/kk_KZ/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Орташа баға
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/kk_KZ/projects.lang b/htdocs/langs/kk_KZ/projects.lang
index c705e08ff93..73ad960ca01 100644
--- a/htdocs/langs/kk_KZ/projects.lang
+++ b/htdocs/langs/kk_KZ/projects.lang
@@ -197,6 +197,7 @@ InputPerMonth=Айына кіріс
 InputDetail=Мәліметтерді енгізу
 TimeAlreadyRecorded=Бұл уақыт/тапсырма үшін жазылған уақыт және пайдаланушы %s
 ProjectsWithThisUserAsContact=Байланыс ретінде осы пайдаланушымен жобалар
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Бұл пайдаланушыға берілген тапсырмалар
 ResourceNotAssignedToProject=Жобаға тағайындалмаған
 ResourceNotAssignedToTheTask=Тапсырмаға тағайындалмаған
@@ -284,3 +285,5 @@ 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
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/stocks.lang b/htdocs/langs/kk_KZ/stocks.lang
index f5cba151333..ecdae9e4e8d 100644
--- a/htdocs/langs/kk_KZ/stocks.lang
+++ b/htdocs/langs/kk_KZ/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Ескертулер мен қалаған опти
 AddNewProductStockWarehouse=Ескерту мен қалаған оңтайлы қор үшін жаңа шектеу қойыңыз
 AddStockLocationLine=Саны азайтыңыз, содан кейін осы өнімге басқа қойма қосу үшін басыңыз
 InventoryDate=Түгендеу күні
+Inventories=Inventories
 NewInventory=Жаңа инвентарь
 inventorySetup = Инвентаризацияны реттеу
 inventoryCreatePermission=Жаңа инвентарь жасау
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Акциялардың қозғал
 inventoryChangePMPPermission=Өнім үшін PMP мәнін өзгертуге рұқсат етіңіз
 ColumnNewPMP=PMP жаңа қондырғысы
 OnlyProdsInStock=Өнімді қорсыз қоспаңыз
-TheoricalQty=Теориялық сан
-TheoricalValue=Теориялық сан
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Соңғы АҚ
 CurrentPA=Curent BP
 RecordedQty=Жазылған саны
@@ -240,7 +241,7 @@ StockAtDatePastDesc=Сіз мұнда акцияларды (нақты акци
 StockAtDateFutureDesc=Сіз бұл жерде болашақта акцияларды (виртуалды акциялар) көре аласыз
 CurrentStock=Ағымдағы қор
 InventoryRealQtyHelp=<br> санын қалпына келтіру үшін мәнді 0 -ге орнатыңыз, өрісті бос ұстаңыз немесе өзгеріссіз қалдыру үшін жолды алып тастаңыз.
-UpdateByScaning=Сканерлеу арқылы нақты мөлшерді толтырыңыз
+UpdateByScaning=Complete real qty by scaning
 UpdateByScaningProductBarcode=Сканерлеу арқылы жаңарту (өнімнің штрих -коды)
 UpdateByScaningLot=Сканерлеу арқылы жаңарту (лот | штрих -код)
 DisableStockChangeOfSubProduct=Осы қозғалыс кезінде осы жиынтықтың барлық қосалқы өнімдері үшін қорлардың өзгеруін өшіріңіз.
@@ -253,14 +254,20 @@ ReOpen=Қайта ашу
 ConfirmFinish=Сіз түгендеудің жабылғанын растайсыз ба? Бұл сіздің акцияңызды инвентаризацияға енгізілген нақты мөлшерге дейін жаңарту үшін барлық акция қозғалысын тудырады.
 ObjectNotFound=%s табылмады
 MakeMovementsAndClose=Қозғалыс жасаңыз және жабыңыз
-AutofillWithExpected=Нақты мөлшерді күтілетін мөлшермен толтырыңыз
+AutofillWithExpected=Replace real quantity with expected quantity
 ShowAllBatchByDefault=Әдепкі бойынша, өнімнің «қор» қойындысында пакеттік мәліметтерді көрсетіңіз
 CollapseBatchDetailHelp=Сіз пакеттер модулінің конфигурациясында пакеттік егжей -тегжейлі дисплейді орната аласыз
-FieldCannotBeNegative=«%s» өрісі теріс болуы мүмкін емес
 ErrorWrongBarcodemode=Штрихкод режимі белгісіз
 ProductDoesNotExist=Өнім жоқ
-ErrorSameBatchNumber=Тізім тізімінде бірдей партия нөмірі табылған
+ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
 ProductBatchDoesNotExist=Топтамасы/сериясы бар өнім жоқ
 ProductBarcodeDoesNotExist=Штрих -коды бар өнім жоқ
 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
diff --git a/htdocs/langs/kk_KZ/stripe.lang b/htdocs/langs/kk_KZ/stripe.lang
index 2a2bd22585f..26444a93d5a 100644
--- a/htdocs/langs/kk_KZ/stripe.lang
+++ b/htdocs/langs/kk_KZ/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Жолақ модулін орнату
-StripeDesc=Клиенттерге <a href="http://www.stripe.com" target="_blank"> Stripe </a> арқылы несие/несие карталарымен төлемдер үшін Stripe онлайн төлем бетін ұсыну. Бұл сіздің клиенттерге арнайы төлемдерді жасауға немесе белгілі бір Dolibarr объектісіне байланысты төлемдерге рұқсат беру үшін пайдаланылуы мүмкін (шот-фактура, тапсырыс, ...)
+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=Несие картасы немесе Stripe арқылы төлеңіз
 FollowingUrlAreAvailableToMakePayments=Келушілерге Dolibarr нысандары бойынша төлем жасау үшін бетті ұсыну үшін келесі URL мекенжайлары қол жетімді
 PaymentForm=Төлем формасы
diff --git a/htdocs/langs/kk_KZ/withdrawals.lang b/htdocs/langs/kk_KZ/withdrawals.lang
index 88d4973e902..7dcc0230860 100644
--- a/htdocs/langs/kk_KZ/withdrawals.lang
+++ b/htdocs/langs/kk_KZ/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Несие аудару тәртібі
 LatestBankTransferReceipts=%s несие аударымының соңғы тапсырыстары
 LastWithdrawalReceipts=Ең соңғы %s тікелей дебеттік файлдар
 WithdrawalsLine=Тікелей дебеттік тапсырыс желісі
+CreditTransfer=Credit transfer
 CreditTransferLine=Несие аудару желісі
 WithdrawalsLines=Тікелей дебеттік тапсырыс желілері
 CreditTransferLines=Несие аудару желілері
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Үшінші тараптың банк коды
 NoInvoiceCouldBeWithdrawed=Ешқандай шот -фактура сәтті дебеттелмеді. Шот -фактуралар жарамды IBAN бар компанияларда екенін және IBAN <strong> %s </strong> режимі бар UMR (бірегей мандат сілтемесі) бар екенін тексеріңіз.
 WithdrawalCantBeCreditedTwice=Бұл шығыс түбіртегі есептелген деп белгіленді; бұл екі рет жасалуы мүмкін емес, себебі бұл қайталанатын төлемдер мен банктік жазбаларды тудыруы мүмкін.
 ClassCredited=Жіктелген
+ClassDebited=Classify debited
 ClassCreditedConfirm=Сіз бұл шығынды банктік шотыңызға аударылған деп жіктегіңіз келе ме?
 TransData=Берілу күні
 TransMetod=Берілу әдісі
@@ -80,7 +82,7 @@ StatusMotif7=Сот шешімі
 StatusMotif8=Басқа себеп
 CreateForSepaFRST=Тік дебеттік файлды жасаңыз (SEPA FRST)
 CreateForSepaRCUR=Тік дебеттік файл жасау (SEPA RCUR)
-CreateAll=Тікелей дебеттік файл жасау (барлығы)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Несие аудару үшін файл жасаңыз
 CreateSepaFileForPaymentByBankTransfer=Несие аудару файлын (SEPA) жасаңыз
 CreateGuichet=Тек кеңсе
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Бос сомаға тікелей дебетті
 SepaMandate=SEPA тікелей дебеттік мандаты
 SepaMandateShort=SEPA мандаты
 PleaseReturnMandate=Бұл мандат формасын %s электрондық поштасына немесе пошта арқылы қайтарыңыз
-SEPALegalText=Бұл мандатқа қол қою арқылы сіз (A) %s -ге банкке сіздің шотыңыздан ақша алу туралы нұсқаулықтар жіберуге рұқсат бересіз және (B) %s нұсқауларына сәйкес сіздің банктен шотыңызды есептен шығаруға рұқсат бересіз. Сіздің құқықтарыңыздың бір бөлігі ретінде сіз өзіңіздің банкіңізбен келісімшарттың талаптарына сәйкес банкіңізден ақшаны қайтаруға құқығыңыз бар. Сіздің шотыңыздан ақша аударылған күннен бастап 8 апта ішінде ақшаны қайтару талап етілуі керек. Жоғарыда көрсетілген мандатқа қатысты сіздің құқықтарыңыз банктен алуға болатын мәлімдемеде түсіндірілген.
+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=Кредитор идентификаторы
 CreditorName=Кредитордың аты
 SEPAFillForm=(B) * деп белгіленген барлық өрістерді толтырыңыз.
@@ -150,3 +152,5 @@ ModeWarning=Нақты режимге опция орнатылмаған, бі
 ErrorCompanyHasDuplicateDefaultBAN=%s идентификаторы бар компанияның бірнеше банктік шоттары бар. Қайсысын қолдану керектігін білуге болмайды.
 ErrorICSmissing=%s банктік шотында ICS жоқ
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Тікелей дебеттік тапсырыстың жалпы сомасы жолдардың сомасынан өзгеше
+WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
+WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
diff --git a/htdocs/langs/km_KH/accountancy.lang b/htdocs/langs/km_KH/accountancy.lang
index c20e0a339f6..8bc4b54a090 100644
--- a/htdocs/langs/km_KH/accountancy.lang
+++ b/htdocs/langs/km_KH/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
index 8e38468846c..d79adb1e960 100644
--- a/htdocs/langs/km_KH/admin.lang
+++ b/htdocs/langs/km_KH/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Version
 Publisher=Publisher
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/km_KH/banks.lang b/htdocs/langs/km_KH/banks.lang
index 6c770163f29..f066877f676 100644
--- a/htdocs/langs/km_KH/banks.lang
+++ b/htdocs/langs/km_KH/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/km_KH/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/km_KH/bookmarks.lang
+++ b/htdocs/langs/km_KH/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/km_KH/companies.lang b/htdocs/langs/km_KH/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/km_KH/companies.lang
+++ b/htdocs/langs/km_KH/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/km_KH/compta.lang b/htdocs/langs/km_KH/compta.lang
index 97b990f62b4..640a229b7f2 100644
--- a/htdocs/langs/km_KH/compta.lang
+++ b/htdocs/langs/km_KH/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/km_KH/errors.lang b/htdocs/langs/km_KH/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/km_KH/holiday.lang
index 0527f4c0788..3d0ae64be0f 100644
--- a/htdocs/langs/km_KH/holiday.lang
+++ b/htdocs/langs/km_KH/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/km_KH/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/km_KH/install.lang
+++ b/htdocs/langs/km_KH/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/km_KH/main.lang
index bf60debf5ca..d069b719b18 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ 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
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/km_KH/modulebuilder.lang b/htdocs/langs/km_KH/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/km_KH/modulebuilder.lang
+++ b/htdocs/langs/km_KH/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 9bc68dc3678..49ff93dd589 100644
--- a/htdocs/langs/km_KH/other.lang
+++ b/htdocs/langs/km_KH/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/km_KH/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/km_KH/partnership.lang
+++ b/htdocs/langs/km_KH/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/km_KH/productbatch.lang b/htdocs/langs/km_KH/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/km_KH/productbatch.lang
+++ b/htdocs/langs/km_KH/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/km_KH/products.lang b/htdocs/langs/km_KH/products.lang
index 205a28980a8..14715670882 100644
--- a/htdocs/langs/km_KH/products.lang
+++ b/htdocs/langs/km_KH/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/km_KH/projects.lang b/htdocs/langs/km_KH/projects.lang
index 5a2911bac0b..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,3 +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/km_KH/stocks.lang b/htdocs/langs/km_KH/stocks.lang
index a2a335be8f6..599c9649b18 100644
--- a/htdocs/langs/km_KH/stocks.lang
+++ b/htdocs/langs/km_KH/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/km_KH/stripe.lang b/htdocs/langs/km_KH/stripe.lang
index 844762040af..2c95bcfce27 100644
--- a/htdocs/langs/km_KH/stripe.lang
+++ b/htdocs/langs/km_KH/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/km_KH/withdrawals.lang b/htdocs/langs/km_KH/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/km_KH/withdrawals.lang
+++ b/htdocs/langs/km_KH/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index c20e0a339f6..8bc4b54a090 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index cbdbe262038..064e4d9952e 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Version
 Publisher=Publisher
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang
index 36942025770..a12f5f511d4 100644
--- a/htdocs/langs/kn_IN/banks.lang
+++ b/htdocs/langs/kn_IN/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/kn_IN/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/kn_IN/bookmarks.lang
+++ b/htdocs/langs/kn_IN/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index 5aa91d2d000..0096c780082 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,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=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">%s</a>
+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
diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
index 97b990f62b4..640a229b7f2 100644
--- a/htdocs/langs/kn_IN/compta.lang
+++ b/htdocs/langs/kn_IN/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/kn_IN/holiday.lang
index 0527f4c0788..3d0ae64be0f 100644
--- a/htdocs/langs/kn_IN/holiday.lang
+++ b/htdocs/langs/kn_IN/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/kn_IN/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/kn_IN/install.lang
+++ b/htdocs/langs/kn_IN/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/kn_IN/main.lang
index 3e1695a8913..ff24fd1b843 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=ಗುಂಪುಗಳು
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
 PasswordRetype=Retype your password
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/kn_IN/modulebuilder.lang b/htdocs/langs/kn_IN/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/kn_IN/modulebuilder.lang
+++ b/htdocs/langs/kn_IN/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 a34a0bbffd3..78671a00aad 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/kn_IN/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/kn_IN/partnership.lang
+++ b/htdocs/langs/kn_IN/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/kn_IN/productbatch.lang b/htdocs/langs/kn_IN/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/kn_IN/productbatch.lang
+++ b/htdocs/langs/kn_IN/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index 5a80b24e665..c8ad53d543d 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index 5a2911bac0b..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,3 +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/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index a2a335be8f6..599c9649b18 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/kn_IN/stripe.lang b/htdocs/langs/kn_IN/stripe.lang
index 844762040af..2c95bcfce27 100644
--- a/htdocs/langs/kn_IN/stripe.lang
+++ b/htdocs/langs/kn_IN/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/kn_IN/withdrawals.lang b/htdocs/langs/kn_IN/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/kn_IN/withdrawals.lang
+++ b/htdocs/langs/kn_IN/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index 140f52fe583..30f9c2aa668 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index a153f5e0703..59377d0fe73 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -1,15 +1,17 @@
 # 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=버전
-Publisher=Publisher
+Publisher=배포자
 VersionProgram=버전 프로그램
-VersionLastInstall=초기설치버전
-VersionLastUpgrade=최종버전업그레이드
+VersionLastInstall=초기 설치 버전
+VersionLastUpgrade=마지막 버전 업그레이드
 VersionExperimental=실험용
 VersionDevelopment=개발
 VersionUnknown=알 수 없음
 VersionRecommanded=권장
-FileCheck=Fileset Integrity Checks
+FileCheck=파일 무결성 체크
 FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to determine if any files have been modified (e.g by a hacker).
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
 FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
@@ -18,61 +20,61 @@ 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=세션ID
-SessionSaveHandler=세션저장구동기
-SessionSavePath=Session save location
-PurgeSessions=세션제거
-ConfirmPurgeSessions=모든 세션을 제거하겠습니까? (당신을 제외한) 모든 다른 사용자의 연결이 중단됩니다. 
-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
+FilesMissing=누락된 파일
+FilesUpdated=업데이트 된 파일
+FilesModified=수정 된 파일
+FilesAdded=추가 된 파일
+FileCheckDolibarr=어플리케이션 파일 무결성 검사
+AvailableOnlyOnPackagedVersions=어플리케이션 파일 무결성 검사는 파일이 공식 패키지에서 설치된 경우에만 사용할 수 있습니다.'
+XmlNotFound=어플리케이션 파일의 XML 무결성 파일을 찾을 수 없습니다.
+SessionId=세션 ID
+SessionSaveHandler=세션 저장 핸들러
+SessionSavePath=세션 저장 위치
+PurgeSessions=세션 제거
+ConfirmPurgeSessions=모든 세션을 제거하겠습니까? (본인을 제외한) 모든 다른 사용자의 연결이 끊어집니다. 
+NoSessionListWithThisHandler=서버에 구성된 PHP의 세션 저장 핸들러에서 실행중인 모든 세션을 출력하지 못하도록 제한 하였습니다.
+LockNewSessions=새 연결 제한
+ConfirmLockNewSessions=본인의 연결을 제한하고 새로운 연결을 차단 하는 것에 동의 하십니까? 이후에는 오직 사용자 <b>%s</b>만 접속이 가능합니다. 
+UnlockNewSessions=연결 제한 해제
+YourSession=나의 세션
+Sessions=유저 세션
+WebUserGroup=웹서버 사용자/그룹
+PermissionsOnFiles=파일 접근 권한
+PermissionsOnFilesInWebRoot=최상위 Web 디렉토리 접근 권한
+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).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-HostCharset=Host charset
-ClientCharset=Client charset
+DBStoringCharset=데이터베이스에 저장된 문자셋
+DBSortingCharset=데이터베이스에 정렬된 문자셋
+HostCharset=호스트 문자셋
+ClientCharset=클라이언트 문자셋
 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=외부사용자
-InternalUsers=내부사용자\n
-ExternalUsers=외부사용자
-UserInterface=User interface
+WarningModuleNotActive=<b>%s</b> 모듈은 반드시 활성화 되어야 합니다.
+WarningOnlyPermissionOfActivatedModules=활성화 된 모듈의 권한만 여기에 표시됩니다. 홈 -> 설정 -> 모듈 페이지에서 다른 모듈을 활성화 할 수 있습니다.
+DolibarrSetup=Dolibarr 설치 또는 업그레이드
+InternalUser=내부 사용자
+ExternalUser=외부 사용자
+InternalUsers=내부 사용자
+ExternalUsers=외부 사용자
+UserInterface=사용자 인터페이스
 GUISetup=화면
 SetupArea=설정
-UploadNewTemplate=Upload new template(s)
-FormToTestFileUploadForm=파일업로드테스트용 양식
+UploadNewTemplate=새로운 탬플릿 업로드
+FormToTestFileUploadForm=파일 업로드 테스트 양식
 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
+SecuritySetup=보안 설정
+PHPSetup=PHP 설정
+OSSetup=OS 설정
+SecurityFilesDesc=업로드 제한 파일 확장자 설정
+ErrorModuleRequirePHPVersion=오류, 이 모듈은 PHP 버전이 %s 혹은 더 높아야 합니다.
+ErrorModuleRequireDolibarrVersion=오류, 이 모듈은 Dolibarr 버전이 %s 혹은 더 높아야 합니다. 
 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
+DictionarySetup=사전 설정
+Dictionary=사전
+ErrorReservedTypeSystemSystemAuto='system'과 'systemauto'는 이미 지정된 값 입니다. 'user'를 사용해 자신의 값을 추가 할 수 있습니다.
 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
@@ -81,9 +83,9 @@ 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=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
+NumberOfBytes=바이트 수
+SearchString=문자열 검색
+NotAvailableWhenAjaxDisabled=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
@@ -98,12 +100,12 @@ Space=공간
 Table=테이블
 Fields=필드
 Index=목록
-Mask=Mask
+Mask=마스크
 NextValue=다음 값
 NextValueForInvoices=다음 값(청구서)
 NextValueForCreditNotes=다음 값(크레딧 기록)
-NextValueForDeposit=Next value (down payment)
-NextValueForReplacements=Next value (replacements)
+NextValueForDeposit=다음 값(다운 페이먼트)
+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=Maximum size for uploaded files (0 to disallow any upload)
@@ -121,8 +123,8 @@ DetailMenuIdParent=ID of parent menu (empty for a top menu)
 ParentID=Parent ID
 DetailPosition=Sort number to define menu position
 AllMenus=모든
-NotConfigured=Module/Application not configured
-Active=Active
+NotConfigured=모듈/어플리케이션이 설정되지 않았습니다.
+Active=활성화
 SetupShort=설정
 OtherOptions=Other options
 OtherSetup=Other Setup
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang
index 89f9894f8d8..8ce57dff880 100644
--- a/htdocs/langs/ko_KR/banks.lang
+++ b/htdocs/langs/ko_KR/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/ko_KR/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/ko_KR/bookmarks.lang
+++ b/htdocs/langs/ko_KR/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index 3265f1c2c39..7d88a290ce1 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -157,6 +157,18 @@ 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=프로필 Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,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=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">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=확인할 수 없습니다. 수표 서비스는 회원 국가에서 제공하지 않습니다 (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index c4e5d0b3055..e85d29d232d 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/ko_KR/holiday.lang
index 6ea824810d2..fa8e500cd05 100644
--- a/htdocs/langs/ko_KR/holiday.lang
+++ b/htdocs/langs/ko_KR/holiday.lang
@@ -27,7 +27,7 @@ DescCP=기술
 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/ko_KR/install.lang
index 37c88031d49..e3faaa520ad 100644
--- a/htdocs/langs/ko_KR/install.lang
+++ b/htdocs/langs/ko_KR/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/ko_KR/main.lang
index 4557394754d..c5b9f89230a 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=오류, '%s' 국가의 부가세율이 정
 ErrorNoSocialContributionForSellerCountry=오류, 국가 '%s'에 대해 정의 된 사회 / 재정 세금 유형이 없습니다.
 ErrorFailedToSaveFile=오류, 파일을 저장할 수 없습니다.
 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=귀하는 할 수있는 권한이 없습니다.
 SetDate=날짜 설정
@@ -87,7 +88,7 @@ FileWasNotUploaded=첨부할 파일을 선택했지만 바로 업로드할 수
 NbOfEntries=No. of entries
 GoToWikiHelpPage=온라인 도움말 읽기 (인터넷 액세스 필요)
 GoToHelpPage=도움말 읽기
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=저장 레코드
 RecordDeleted=삭제 레코드
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=최근 데이터베이스 액세스 요청 오류에
 InformationLastAccessInError=최근 데이터베이스 액세스 요청 오류에 대한 정보
 DolibarrHasDetectedError=Dolibarr가 기술적인 오류를 발견했습니다.
 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 remove such notices)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=추가 정보
 TechnicalInformation=기술적 인 정보
 TechnicalID=기술 ID
@@ -211,6 +212,8 @@ User=사용자
 Users=사용자
 Group=그룹
 Groups=그룹
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=사용자 그룹이 정의되지 않았습니다.
 Password=암호
 PasswordRetype=암호를 다시 입력하십시오.
@@ -906,7 +909,7 @@ ViewFlatList=평면 목록보기
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 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">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/ko_KR/modulebuilder.lang b/htdocs/langs/ko_KR/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/ko_KR/modulebuilder.lang
+++ b/htdocs/langs/ko_KR/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 a3920306cbb..427aa9c7f15 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/ko_KR/partnership.lang
index f37f420900a..d3ed889124b 100644
--- a/htdocs/langs/ko_KR/partnership.lang
+++ b/htdocs/langs/ko_KR/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/ko_KR/productbatch.lang b/htdocs/langs/ko_KR/productbatch.lang
index 2f8b7fc03cc..b6e74b74bf6 100644
--- a/htdocs/langs/ko_KR/productbatch.lang
+++ b/htdocs/langs/ko_KR/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 548b7234d22..d5cb61ae177 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index 683c4a63435..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,3 +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/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index 7ac799ade3b..eef3c78a467 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/ko_KR/stripe.lang b/htdocs/langs/ko_KR/stripe.lang
index 5b2b5f98857..5ee2e9aa027 100644
--- a/htdocs/langs/ko_KR/stripe.lang
+++ b/htdocs/langs/ko_KR/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/ko_KR/users.lang b/htdocs/langs/ko_KR/users.lang
index 369db82c603..707e56b3577 100644
--- a/htdocs/langs/ko_KR/users.lang
+++ b/htdocs/langs/ko_KR/users.lang
@@ -68,7 +68,7 @@ CreateDolibarrLogin=Create a user
 CreateDolibarrThirdParty=Create a third party
 LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
 UsePersonalValue=Use personal value
-InternalUser=Internal user
+InternalUser=내부 사용자
 ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang
index bf64c651cf9..942f2366be2 100644
--- a/htdocs/langs/ko_KR/withdrawals.lang
+++ b/htdocs/langs/ko_KR/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index d5f1452ab78..3cc6d6d6a6f 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=ປະເທດທີ່ບໍ່ຢູ່ໃນ EEC
 CountriesInEECExceptMe=ປະເທດໃນ EEC ຍົກເວັ້ນ %s
 CountriesExceptMe=ທຸກປະເທດຍົກເວັ້ນ %s
 AccountantFiles=ສົ່ງອອກເອກະສານແຫຼ່ງທີ່ມາ
-ExportAccountingSourceDocHelp=ດ້ວຍເຄື່ອງມືນີ້, ເຈົ້າສາມາດສົ່ງອອກເຫດການຕົ້ນທາງ (ລາຍການຢູ່ໃນ CSV ແລະ PDFs) ທີ່ໄດ້ຖືກນໍາໃຊ້ເພື່ອສ້າງບັນຊີຂອງເຈົ້າ.
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
 ExportAccountingSourceDocHelp2=ເພື່ອສົ່ງອອກວາລະສານຂອງເຈົ້າ, ໃຊ້ລາຍການເມນູ %s - %s.
 VueByAccountAccounting=ເບິ່ງຕາມບັນຊີບັນຊີ
 VueBySubAccountAccounting=ເບິ່ງຕາມບັນຊີຍ່ອຍບັນຊີ
@@ -286,7 +286,7 @@ ValidateMovements=ກວດສອບການເຄື່ອນໄຫວ
 DescValidateMovements=ການດັດແກ້ຫຼືການລຶບລາຍລັກອັກສອນ, ຕົວອັກສອນແລະການລຶບໃດ will ຈະຖືກຫ້າມ. ລາຍການທັງforົດ ສຳ ລັບການອອກ ກຳ ລັງກາຍຕ້ອງຖືກກວດສອບຖ້າບໍ່ດັ່ງນັ້ນຈະປິດບໍ່ໄດ້
 
 ValidateHistory=ຜູກມັດອັດຕະໂນມັດ
-AutomaticBindingDone=ການຜູກມັດອັດຕະໂນມັດ ສຳ ເລັດແລ້ວ
+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
@@ -387,7 +387,8 @@ SaleExport=ຂາຍສົ່ງອອກ
 SaleEEC=ຂາຍໃນ EEC
 SaleEECWithVAT=ການຂາຍໃນ EEC ດ້ວຍອາກອນມູນຄ່າເພີ່ມບໍ່ແມ່ນ null, ດັ່ງນັ້ນພວກເຮົາຄິດວ່າອັນນີ້ບໍ່ແມ່ນການຂາຍພາຍໃນລະບົບສື່ສານແລະບັນຊີທີ່ແນະນໍາແມ່ນບັນຊີຜະລິດຕະພັນມາດຕະຖານ.
 SaleEECWithoutVATNumber=ຂາຍໃນ EEC ໂດຍບໍ່ມີ VAT ແຕ່ ID VAT ຂອງພາກສ່ວນທີສາມບໍ່ໄດ້ລະບຸ. ພວກເຮົາຕົກຢູ່ໃນບັນຊີຜະລິດຕະພັນສໍາລັບການຂາຍມາດຕະຖານ. ເຈົ້າສາມາດແກ້ໄຂ VAT ID ຂອງພາກສ່ວນທີສາມຫຼືບັນຊີຜະລິດຕະພັນຖ້າຈໍາເປັນ.
-
+ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
+ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
 Range=ຂອບເຂດຂອງບັນຊີບັນຊີ
 Calculated=ຄຳ ນວນແລ້ວ
@@ -404,6 +405,7 @@ NoJournalDefined=ບໍ່ໄດ້ ກຳ ນົດວາລະສານ
 Binded=ເສັ້ນຖືກຜູກມັດ
 ToBind=ສາຍເພື່ອຜູກມັດ
 UseMenuToSetBindindManualy=ເສັ້ນບໍ່ຖືກຜູກມັດເທື່ອ, ໃຊ້ເມນູ <a href="%s"> %s </a> ເພື່ອເຮັດການຜູກມັດດ້ວຍຕົນເອງ
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
 
 ## Import
 ImportAccountingEntries=ລາຍການບັນຊີ
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 7c226870a9c..95df1b8c140 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=ມູນນິທິ
 Version=ສະບັບ
 Publisher=ຜູ້ຕີພິມ
@@ -265,8 +267,8 @@ OtherResources=ຊັບພະຍາກອນອື່ນ
 ExternalResources=ຊັບພະຍາກອນພາຍນອກ
 SocialNetworks=ເຄືອຂ່າຍສັງຄົມ
 SocialNetworkId=ID ເຄືອຂ່າຍສັງຄົມ
-ForDocumentationSeeWiki=ສໍາລັບເອກະສານຂອງຜູ້ໃຊ້ຫຼືຜູ້ພັດທະນາ (Doc, FAQs ... ), <br> ເບິ່ງທີ່ວິກິພີເດຍຂອງ Dolibarr: <br> <b> <a href="%s" target="_blank"> %s a0e40dc6587789887897887887887887887887739
-ForAnswersSeeForum=ສໍາລັບຄໍາຖາມ/ຄວາມຊ່ວຍເຫຼືອອັນອື່ນ, ເຈົ້າສາມາດໃຊ້ເວທີສົນທະນາ Dolibarr: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
+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=ນີ້ແມ່ນແຫຼ່ງຂໍ້ມູນ ຈຳ ນວນ ໜຶ່ງ ເພື່ອໃຫ້ໄດ້ຮັບການຊ່ວຍເຫຼືອແລະການສະ ໜັບ ສະ ໜູນ ກັບ Dolibarr.
 HelpCenterDesc2=ບາງແຫຼ່ງຂໍ້ມູນເຫຼົ່ານີ້ມີຢູ່ໃນ <b> english </b> ເທົ່ານັ້ນ.
 CurrentMenuHandler=ຕົວຈັດການເມນູປັດຈຸບັນ
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=ລຸ້ນລ້າສຸດ
 LastActivationDate=ວັນທີເປີດໃຊ້ຫຼ້າສຸດ
 LastActivationAuthor=ຜູ້ຂຽນການເປີດ ນຳ ໃຊ້ຫຼ້າສຸດ
 LastActivationIP=IP ເປີດໃຊ້ຫຼ້າສຸດ
+LastActivationVersion=Latest activation version
 UpdateServerOffline=ອັບເດດເຊີບເວີອອບລາຍ
 WithCounter=ການຄຸ້ມຄອງວຽກງານຕ້ານການ
 GenericMaskCodes=ເຈົ້າສາມາດໃສ່ ໜ້າ ກາກຕົວເລກໄດ້. ຢູ່ໃນ ໜ້າ ກາກນີ້, ສາມາດໃຊ້ແທັກຕໍ່ໄປນີ້ໄດ້: <br> <b> {000000} </b> ກົງກັບຕົວເລກທີ່ຈະເພີ່ມຂຶ້ນໃນແຕ່ລະ %s. ໃສ່ຕົວເລກຫຼາຍເທົ່າກັບຄວາມຍາວທີ່ຕ້ອງການຂອງເຄື່ອງນັບ. ເຄື່ອງນັບຈະເຮັດ ສຳ ເລັດດ້ວຍເລກສູນຈາກຊ້າຍເພື່ອໃຫ້ມີຕົວເລກຫຼາຍເທົ່າກັບ ໜ້າ ກາກ. <br> <b> {000000 + 000} </b> ຄືກັນກັບອັນທີ່ຜ່ານມາແຕ່ມີການຊົດເຊີຍທີ່ສອດຄ້ອງກັບຕົວເລກຢູ່ເບື້ອງຂວາຂອງເຄື່ອງ+າຍ + ເຄື່ອງisາຍຖືກ ນຳ ໃຊ້ເລີ່ມຕົ້ນໃນ %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} a09a4b7 <br>
@@ -753,7 +756,7 @@ Permission106=ການສົ່ງອອກ
 Permission109=ລຶບການສົ່ງ
 Permission111=ອ່ານບັນຊີການເງິນ
 Permission112=ສ້າງ/ດັດແກ້/ລຶບແລະປຽບທຽບທຸລະກໍາ
-Permission113=ຕັ້ງບັນຊີການເງິນ (ສ້າງ, ຈັດການcategoriesວດ)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=ການເຮັດທຸລະກໍາທີ່ສົມເຫດສົມຜົນ
 Permission115=ສົ່ງອອກທຸລະ ກຳ ແລະໃບລາຍງານບັນຊີ
 Permission116=ການໂອນລະຫວ່າງບັນຊີ
@@ -762,6 +765,7 @@ Permission121=ອ່ານພາກສ່ວນທີສາມທີ່ເຊື
 Permission122=ສ້າງ/ດັດແກ້ພາກສ່ວນທີສາມທີ່ເຊື່ອມໂຍງກັບຜູ້ໃຊ້
 Permission125=ລຶບພາກສ່ວນທີສາມທີ່ເຊື່ອມໂຍງກັບຜູ້ໃຊ້
 Permission126=ສົ່ງອອກພາກສ່ວນທີສາມ
+Permission130=Create/modify third parties payment information
 Permission141=ອ່ານໂຄງການແລະ ໜ້າ ວຽກທັງ(ົດ (ນອກຈາກໂຄງການສ່ວນຕົວທີ່ຂ້ອຍບໍ່ໄດ້ເປັນຜູ້ຕິດຕໍ່)
 Permission142=ສ້າງ/ດັດແກ້ທຸກໂຄງການແລະ ໜ້າ ວຽກ (ລວມທັງໂຄງການສ່ວນຕົວທີ່ຂ້ອຍບໍ່ແມ່ນຜູ້ຕິດຕໍ່)
 Permission144=ລຶບໂຄງການແລະ ໜ້າ ວຽກທັງ(ົດອອກ (ນອກຈາກໂຄງການສ່ວນຕົວທີ່ຂ້ອຍບໍ່ໄດ້ຕິດຕໍ່ຫາ)
@@ -889,12 +893,11 @@ Permission701=ອ່ານການບໍລິຈາກ
 Permission702=ສ້າງ/ແກ້ໄຂການບໍລິຈາກ
 Permission703=ລຶບການບໍລິຈາກອອກ
 Permission771=ອ່ານບົດລາຍງານຄ່າໃຊ້ຈ່າຍ (ຂອງເຈົ້າແລະຜູ້ໃຕ້ບັງຄັບບັນຊາຂອງເຈົ້າ)
-Permission772=ສ້າງ/ດັດແກ້ລາຍງານລາຍຈ່າຍ
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=ລຶບລາຍງານລາຍຈ່າຍ
-Permission774=ອ່ານບົດລາຍງານຄ່າໃຊ້ຈ່າຍທັງ(ົດ (ແມ້ແຕ່ສໍາລັບຜູ້ໃຊ້ບໍ່ແມ່ນຜູ້ໃຕ້ບັງຄັບບັນຊາ)
 Permission775=ອະນຸມັດລາຍງານລາຍຈ່າຍ
 Permission776=ລາຍງານລາຍຈ່າຍ
-Permission777=ອ່ານບົດລາຍງານຄ່າໃຊ້ຈ່າຍຂອງທຸກຄົນ
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=ສ້າງ/ແກ້ໄຂລາຍງານຄ່າໃຊ້ຈ່າຍຂອງທຸກຄົນ
 Permission779=ລາຍງານຄ່າໃຊ້ຈ່າຍໃນການສົ່ງອອກ
 Permission1001=ອ່ານຮຸ້ນ
@@ -958,15 +961,11 @@ Permission2801=ໃຊ້ລູກຄ້າ FTP ຢູ່ໃນໂreadດອ່
 Permission2802=ໃຊ້ລູກຄ້າ FTP ໃນຮູບແບບການຂຽນ (ລຶບຫຼືອັບໂຫຼດໄຟລ)
 Permission3200=ອ່ານເຫດການທີ່ເກັບໄວ້ແລະລາຍນີ້ວມື
 Permission3301=ສ້າງໂມດູນໃ່
-Permission4001=ເບິ່ງພະນັກງານ
-Permission4002=ສ້າງພະນັກງານ
-Permission4003=ລຶບພະນັກງານ
-Permission4004=ພະນັກງານສົ່ງອອກ
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ Permission10005=ລຶບເນື້ອໃນເວັບໄຊທ
 Permission20001=ອ່ານ ຄຳ ຂໍລາພັກ (ການລາພັກຂອງເຈົ້າແລະຂອງຜູ້ໃຕ້ບັງຄັບບັນຊາຂອງເຈົ້າ)
 Permission20002=ສ້າງ/ດັດແກ້ການຮ້ອງຂໍການລາພັກຂອງເຈົ້າ (ການລາພັກຂອງເຈົ້າແລະຂອງຜູ້ໃຕ້ບັງຄັບບັນຊາຂອງເຈົ້າ)
 Permission20003=ລຶບ ຄຳ ຮ້ອງຂໍການລາພັກ
-Permission20004=ອ່ານຄໍາຮ້ອງຂໍອອກທັງ(ົດ (ແມ້ແຕ່ຜູ້ໃຊ້ບໍ່ແມ່ນຜູ້ໃຕ້ບັງຄັບບັນຊາ)
-Permission20005=ສ້າງ/ປັບປຸງແກ້ໄຂຄໍາຮ້ອງຂໍການອອກຈາກສໍາລັບທຸກຄົນ (ແມ້ແຕ່ຜູ້ໃຊ້ບໍ່ແມ່ນຜູ້ໃຕ້ບັງຄັບບັນຊາ)
-Permission20006=ຄຳ ຮ້ອງຂໍຈາກຜູ້ເບິ່ງແຍງລະບົບ (ການຕັ້ງຄ່າແລະອັບເດດຍອດເງິນ)
+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=ອະນຸມັດຄໍາຮ້ອງຂໍການລາພັກ
 Permission23001=ອ່ານວຽກທີ່ ກຳ ນົດເວລາໄວ້
 Permission23002=ສ້າງ/ອັບເດດວຽກທີ່ ກຳ ນົດເວລາໄວ້
@@ -1358,9 +1357,9 @@ BrowserIsOK=ເຈົ້າກໍາລັງໃຊ້ຕົວທ່ອງເ
 BrowserIsKO=ເຈົ້າກໍາລັງໃຊ້ຕົວທ່ອງເວັບຂອງ %s. ຕົວທ່ອງເວັບນີ້ເປັນທີ່ຮູ້ຈັກວ່າເປັນທາງເລືອກທີ່ບໍ່ດີສໍາລັບຄວາມປອດໄພ, ປະສິດທິພາບແລະຄວາມ ໜ້າ ເຊື່ອຖື. ພວກເຮົາແນະນໍາໃຫ້ໃຊ້ Firefox, Chrome, Opera ຫຼື Safari.
 PHPModuleLoaded=ອົງປະກອບ PHP %s ຖືກໂຫຼດແລ້ວ
 PreloadOPCode=ໃຊ້ OPCode ທີ່ໂຫຼດມາກ່ອນແລ້ວ
-AddRefInList=ສະແດງລູກຄ້າ/ຜູ້ຂາຍຜູ້ອ້າງອີງ. ລາຍຊື່ຂໍ້ມູນ (ເລືອກລາຍການຫຼືກ່ອງຄອມພິວເຕີ) ແລະສ່ວນໃຫຍ່ຂອງ hyperlink. <br> ພາກສ່ວນທີສາມຈະປະກົດຂຶ້ນດ້ວຍຮູບແບບຊື່ຂອງ "CC12345 - SC45678 - The Big Company corp." ແທນ "ບໍລິສັດໃຫຍ່".
-AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=ສະແດງລາຍການຂໍ້ມູນທີ່ຢູ່ຂອງລູກຄ້າ/ຜູ້ຂາຍ (ເລືອກລາຍການຫຼືຕູ້ປະສົມ) <br> ພາກສ່ວນທີສາມຈະປະກົດຂຶ້ນດ້ວຍຮູບແບບຊື່ຂອງ "ບໍລິສັດໃຫຍ່ບໍລິສັດ - 21 ຖະ ໜົນ ໂດດຈ້ອງ 123456 ເມືອງໃຫຍ່ - ອາເມລິກາ" ແທນ "ບໍລິສັດໃຫຍ່ຂອງບໍລິສັດ".
+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=ສະແດງອີເມວຕິດຕໍ່ (ຫຼືໂທລະສັບຖ້າບໍ່ໄດ້ລະບຸ) ແລະລາຍການຂໍ້ມູນຕົວເມືອງ (ເລືອກລາຍການຫຼືຫ້ອງລວມ) <br> ລາຍຊື່ຜູ້ຕິດຕໍ່ຈະປະກົດຂຶ້ນດ້ວຍຮູບແບບຊື່ຂອງ "Dupond Durand - dupond.durand@email.com - Paris" ຫຼື "Dupond Durand - 06 07 59 65 66 - ປາຣີ "ແທນ" Dupond Durand ".
 AskForPreferredShippingMethod=ຖາມຫາວິທີການຂົນສົ່ງທີ່ມັກສໍາລັບພາກສ່ວນທີສາມ.
 FieldEdition=ສະບັບຂອງຊ່ອງຂໍ້ມູນ %s
@@ -1708,8 +1707,9 @@ MailingDelay=ວິນາທີທີ່ຈະລໍຖ້າຫຼັງຈາ
 NotificationSetup=ການຕັ້ງໂມດູນແຈ້ງເຕືອນອີເມວ
 NotificationEMailFrom=ອີເມວຜູ້ສົ່ງ (ຈາກ) ສຳ ລັບອີເມວທີ່ສົ່ງໂດຍໂມດູນການແຈ້ງເຕືອນ
 FixedEmailTarget=ຜູ້ຮັບ
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=ການຕັ້ງຄ່າໂມດູນການຈັດສົ່ງ
 SendingsReceiptModel=ການສົ່ງຮູບແບບການຮັບ
@@ -1725,8 +1725,8 @@ 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
+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 ສໍາລັບທຸກຫົວ ໜ່ວຍ (ຂໍ້ສະ ເໜີ, ຄໍາສັ່ງ, ໃບຮຽກເກັບເງິນ, ແລະອື່ນ ... ... ). <span class="warning"> ຄໍາເຕືອນ: ການໃຊ້ຕົວເລືອກນີ້ສໍາລັບກໍລະນີນີ້ແມ່ນບໍ່ໄດ້ຖືກແນະນໍາຢ່າງຈິງຈັງເພາະມັນສາມາດສ້າງບັນຫາກັບຕົວອັກສອນພິເສດແລະການຈັດຮູບແບບ ໜ້າ ເວລາສ້າງໄຟລ PDF. </span>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=ການຕັ້ງຄ່າລາຍງານລາ
 ExpenseReportNumberingModules=ລາຍງານລາຍຈ່າຍໂມດູນຕົວເລກ
 NoModueToManageStockIncrease=ບໍ່ມີໂມດູນໃດສາມາດຈັດການການເພີ່ມຂຶ້ນຂອງອັດຕະໂນມັດໄດ້. ການເພີ່ມຫຼັກຊັບຈະເຮັດໄດ້ດ້ວຍການປ້ອນເຂົ້າດ້ວຍມືເທົ່ານັ້ນ.
 YouMayFindNotificationsFeaturesIntoModuleNotification=ເຈົ້າອາດຈະຊອກຫາທາງເລືອກ ສຳ ລັບການແຈ້ງເຕືອນທາງອີເມລ by ໂດຍການເປີດໃຊ້ງານແລະການຕັ້ງຄ່າໂມດູນ "ການແຈ້ງເຕືອນ".
+TemplatesForNotifications=Templates for notifications
 ListOfNotificationsPerUser=ລາຍການແຈ້ງເຕືອນອັດຕະໂນມັດຕໍ່ຜູ້ໃຊ້*
 ListOfNotificationsPerUserOrContact=ລາຍການແຈ້ງເຕືອນອັດຕະໂນມັດທີ່ເປັນໄປໄດ້ (ໃນເຫດການທຸລະກິດ) ມີໃຫ້ຜູ້ໃຊ້* ຫຼືຕໍ່ຜູ້ຕິດຕໍ່ **
 ListOfFixedNotifications=ລາຍການແຈ້ງເຕືອນຄົງທີ່ອັດຕະໂນມັດ
@@ -1916,6 +1917,8 @@ ConfFileMustContainCustom=ການຕິດຕັ້ງຫຼືສ້າງໂ
 HighlightLinesOnMouseHover=ເນັ້ນເສັ້ນຕາຕະລາງເມື່ອການເຄື່ອນຍ້າຍເມົ້າຜ່ານ
 HighlightLinesColor=ເນັ້ນສີຂອງເສັ້ນເມື່ອເມົ້າຜ່ານ (ໃຊ້ 'ffffff' ໂດຍບໍ່ມີຈຸດເດັ່ນ)
 HighlightLinesChecked=ເນັ້ນສີຂອງເສັ້ນເມື່ອມັນຖືກກວດກາ (ໃຊ້ 'ffffff' ໂດຍບໍ່ມີຈຸດເດັ່ນ)
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=ສີຂໍ້ຄວາມຂອງຫົວຂໍ້ ໜ້າ
 LinkColor=ສີຂອງການເຊື່ອມຕໍ່
 PressF5AfterChangingThis=ກົດ CTRL+F5 ຢູ່ເທິງແປ້ນພິມຫຼືລຶບ cache ຂອງ browser ຂອງເຈົ້າຫຼັງຈາກປ່ຽນຄ່ານີ້ເພື່ອໃຫ້ມັນມີຜົນ
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=ເຈົ້າຕ້ອງການແລ່ນຊ
 NoNewEmailToProcess=ບໍ່ມີອີເມວໃ(່ (ການກັ່ນຕອງທີ່ກົງກັນ) ເພື່ອປະມວນຜົນ
 NothingProcessed=ບໍ່ມີຫຍັງເຮັດ
 XEmailsDoneYActionsDone=ອີເມລ %s ມີຄຸນສົມບັດ, ອີເມລ %s ປະສົບຜົນສໍາເລັດ (ສໍາລັບບັນທຶກ/ການກະທໍາ %s ສໍາເລັດ)
-RecordEvent=ບັນທຶກເຫດການອີເມລ
-CreateLeadAndThirdParty=ສ້າງຜູ້ນໍາ (ແລະພາກສ່ວນທີສາມຖ້າຈໍາເປັນ)
-CreateTicketAndThirdParty=ສ້າງປີ້ (ແລະເຊື່ອມຕໍ່ຫາພາກສ່ວນທີສາມຖ້າມັນຖືກໂຫຼດໂດຍການ ດຳ ເນີນການຜ່ານມາ)
+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=ຈຳ ນວນອີເມວຢູ່ໃນບັນຊີລາຍຊື່ແຫຼ່ງທີ່ມາ
 LoadThirdPartyFromName=ໂຫຼດການຄົ້ນຫາຈາກພາກສ່ວນທີສາມຢູ່ໃນ %s (ໂຫຼດເທົ່ານັ້ນ)
 LoadThirdPartyFromNameOrCreate=ໂຫຼດການຄົ້ນຫາຈາກພາກສ່ວນທີສາມຢູ່ໃນ %s (ສ້າງຖ້າບໍ່ພົບ)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=ຂໍ້ຄວາມຈາກການສົນທະນາທີ່ລິເລີ່ມໂດຍອີເມວ ທຳ ອິດທີ່ສົ່ງຈາກ Dolibarr
 WithoutDolTrackingID=ຂໍ້ຄວາມຈາກການສົນທະນາທີ່ລິເລີ່ມໂດຍອີເມວ ທຳ ອິດບໍ່ໄດ້ສົ່ງຈາກ Dolibarr
 WithDolTrackingIDInMsgId=ຂໍ້ຄວາມຖືກສົ່ງຈາກ Dolibarr
@@ -2078,7 +2082,7 @@ CreateCandidature=ສ້າງໃບສະjobັກວຽກ
 FormatZip=Zip
 MainMenuCode=ລະຫັດການເຂົ້າເມນູ (ເມນູຫຼັກ)
 ECMAutoTree=ສະແດງຕົ້ນໄມ້ ECM ອັດຕະໂນມັດ
-OperationParamDesc=ກຳ ນົດຄ່າເພື່ອໃຊ້ ສຳ ລັບວັດຖຸຂອງການກະ ທຳ, ຫຼືວິທີການສະກັດເອົາຄ່າຕ່າງ. ຕົວຢ່າງ: <br> objproperty1 = SET: ຄ່າທີ່ຈະກໍານົດ <br> objproperty2 = SET: ຄ່າທີ່ມີການທົດແທນ __objproperty1__ <br> objproperty3 = SETIFEMPTY: ຄ່າທີ່ນໍາໃຊ້ຖ້າ objproperty3 ແລ້ວ = ຫົວຂໍ້ກ່ອນ ໜ້າ ນີ້ບໍ່ມີຜົນກະທົບຕໍ່ໄປເທົ່ານັ້ນ ([^\\ s**) <br> options_myextrafield1 = EXTRACT: SUBJECT: ([^&#92; n]*) <br> object.objproperty5 = EXTRACT: BODY: ຊື່ບໍລິສັດຂອງຂ້ອຍແມ່ນ \\ s ([^\\ s]*) <br> ໃຊ້ a; char ເປັນຕົວແຍກເພື່ອແຍກຫຼືກໍານົດຄຸນສົມບັດຫຼາຍອັນ.
+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=ການຕັ້ງຄ່າໂມດູນຊັບພະຍາກອນ
@@ -2124,7 +2128,7 @@ LargerThan=ໃຫຍ່ກວ່າ
 IfTrackingIDFoundEventWillBeLinked=ຈື່ໄວ້ວ່າຖ້າພົບເຫັນ ID ຕິດຕາມວັດຖຸເຂົ້າໄປໃນອີເມລ or, ຫຼືຖ້າອີເມລ is ເປັນຄໍາຕອບຂອງອີເມລ collected ທີ່ເກັບກໍາແລະເຊື່ອມໂຍງກັບວັດຖຸ, ເຫດການທີ່ສ້າງຂຶ້ນຈະຖືກເຊື່ອມຕໍ່ໂດຍອັດຕະໂນມັດກັບວັດຖຸທີ່ກ່ຽວຂ້ອງທີ່ຮູ້ຈັກ.
 WithGMailYouCanCreateADedicatedPassword=ດ້ວຍບັນຊີ GMail, ຖ້າເຈົ້າເປີດໃຊ້ການກວດສອບ 2 ຂັ້ນຕອນ, ມັນຖືກແນະນໍາໃຫ້ສ້າງລະຫັດຜ່ານທີສອງສະເພາະສໍາລັບແອັບພລິເຄຊັນແທນການໃຊ້ລະຫັດຜ່ານບັນຊີຂອງເຈົ້າເອງຈາກ https://myaccount.google.com/.
 EmailCollectorTargetDir=ມັນອາດຈະເປັນພຶດຕິກໍາທີ່ຕ້ອງການເພື່ອຍ້າຍອີເມລ into ເຂົ້າໄປໃນແທັກ/ບັນຊີລາຍການອື່ນເມື່ອມັນດໍາເນີນການສໍາເລັດ. ພຽງແຕ່ຕັ້ງຊື່ບັນຊີລາຍການທີ່ນີ້ເພື່ອໃຊ້ຄຸນສົມບັດນີ້ (ຢ່າໃຊ້ຕົວອັກສອນພິເສດຢູ່ໃນຊື່). ຈື່ໄວ້ວ່າເຈົ້າຍັງຕ້ອງໃຊ້ບັນຊີເຂົ້າສູ່ລະບົບອ່ານ/ຂຽນ.
-EmailCollectorLoadThirdPartyHelp=ເຈົ້າສາມາດໃຊ້ການກະ ທຳ ນີ້ເພື່ອໃຊ້ເນື້ອໃນອີເມລ to ເພື່ອຊອກຫາແລະໂຫຼດພາກສ່ວນທີສາມທີ່ມີຢູ່ແລ້ວຢູ່ໃນຖານຂໍ້ມູນຂອງເຈົ້າ. ພາກສ່ວນທີສາມທີ່ພົບ (ຫຼືສ້າງແລ້ວ) ຈະຖືກໃຊ້ເພື່ອປະຕິບັດຕາມສິ່ງທີ່ຕ້ອງການມັນ. <br> ຕົວຢ່າງ, ຖ້າເຈົ້າຕ້ອງການສ້າງພາກສ່ວນທີສາມທີ່ມີຊື່ສະກັດສະຕຣິງ 'ຊື່: ຊື່ເພື່ອຊອກຫາ' ຢູ່ໃນຮ່າງກາຍ, ໃຊ້ອີເມວຜູ້ສົ່ງເປັນອີເມລ you, ເຈົ້າສາມາດກໍານົດຊ່ອງຂໍ້ມູນດັ່ງນີ້: <br> 'email = HEADER: ^ຈາກ: (.*); name = EXTRACT: BODY: ຊື່: \\ ([^\\ s]*); client = SET: 2; ' <br>
+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=ຈຸດສິ້ນສຸດ ສຳ ລັບ %s: %s
 DeleteEmailCollector=ລຶບຜູ້ເກັບອີເມລ
 ConfirmDeleteEmailCollector=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການລຶບຕົວເກັບອີເມວນີ້?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index d1a9700daf3..adbdc719bff 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -32,7 +32,7 @@ RIB=ເລກບັນຊີທະນາຄານ
 IBAN=IBາຍເລກ IBAN
 BIC=ລະຫັດ BIC/SWIFT
 SwiftValid=BIC/SWIFT ຖືກຕ້ອງ
-SwiftVNotalid=BIC/SWIFT ບໍ່ຖືກຕ້ອງ
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN ຖືກຕ້ອງ
 IbanNotValid=BAN ບໍ່ຖືກຕ້ອງ
 StandingOrders=ຄໍາສັ່ງຫັກເງິນໂດຍກົງ
@@ -49,7 +49,6 @@ BankAccountDomiciliation=ທີ່ຢູ່ທະນາຄານ
 BankAccountCountry=ປະເທດບັນຊີ
 BankAccountOwner=ຊື່ເຈົ້າຂອງບັນຊີ
 BankAccountOwnerAddress=ທີ່ຢູ່ເຈົ້າຂອງບັນຊີ
-RIBControlError=ການກວດສອບຄວາມສົມບູນຂອງຄ່າບໍ່ ສຳ ເລັດ. ອັນນີ້meansາຍຄວາມວ່າຂໍ້ມູນສໍາລັບເລກບັນຊີນີ້ບໍ່ຄົບຖ້ວນຫຼືບໍ່ຖືກຕ້ອງ (ກວດເບິ່ງປະເທດ, ຕົວເລກແລະ IBAN).
 CreateAccount=ສ້າງ​ບັນ​ຊີ
 NewBankAccount=ບັນຊີໃ່
 NewFinancialAccount=ບັນຊີການເງິນໃ່
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index 261c6e37bb2..fc1f1b1cc97 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=ເງື່ອນໄຂການຊໍາລະເງິນ
@@ -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=ຄວາມຄືບ ໜ້າ ທັງ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
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/bookmarks.lang b/htdocs/langs/lo_LA/bookmarks.lang
index 7414452bee0..fb0a09fe08c 100644
--- a/htdocs/langs/lo_LA/bookmarks.lang
+++ b/htdocs/langs/lo_LA/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=ພຶດຕິ ກຳ ເມື່ອ URL ບຸກມາກຖືກເລືອກ
 CreateBookmark=ສ້າງບຸກມາກ
 SetHereATitleForLink=ຕັ້ງຊື່ໃຫ້ກັບບຸກມາກ
-UseAnExternalHttpLinkOrRelativeDolibarrLink=ໃຊ້ການເຊື່ອມຕໍ່ພາຍນອກ/ຢ່າງແທ້ຈິງ (https: // URL) ຫຼືການເຊື່ອມຕໍ່ພາຍໃນ/ພີ່ນ້ອງ (/DOLIBARR_ROOT/htdocs/... )
+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=ເລືອກວ່າ ໜ້າ ທີ່ເຊື່ອມໂຍງຄວນຈະເປີດຢູ່ໃນແຖບປັດຈຸບັນຫຼືແຖບໃnew່
 BookmarksManagement=ການຈັດການ bookmarks
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index d370807bbe0..4342af5e745 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ VATIntraCheck=ກວດສອບ
 VATIntraCheckDesc=ລະຫັດ VAT ຕ້ອງປະກອບມີ ຄຳ ນຳ ໜ້າ ປະເທດ. ລິ້ງ <b> %s </b> ໃຊ້ບໍລິການກວດ VAT ຂອງເອີຣົບ (VIES) ເຊິ່ງຕ້ອງການການເຂົ້າເຖິງອິນເຕີເນັດຈາກເຊີບເວີ Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=ກວດເບິ່ງລະຫັດ VAT ພາຍໃນຊຸມຊົນຢູ່ໃນເວັບໄຊທ Commission ຂອງຄະນະກໍາມະການເອີຣົບ
-VATIntraManualCheck=ນອກນັ້ນທ່ານຍັງສາມາດກວດເບິ່ງດ້ວຍຕົນເອງຢູ່ໃນເວັບໄຊທ Commission ຂອງຄະນະກໍາມະການເອີຣົບ <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=ກວດບໍ່ໄດ້. ການບໍລິການກວດບໍ່ໄດ້ໃຫ້ໂດຍລັດສະມາຊິກ (%s).
 NorProspectNorCustomer=ບໍ່ແມ່ນລູກຄ້າ, ບໍ່ແມ່ນລູກຄ້າ
 JuridicalStatus=ປະເພດຫົວ ໜ່ວຍ ທຸລະກິດ
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index 27eb409459a..93f5578dd8d 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -170,8 +170,9 @@ SeeReportInInputOutputMode=ເບິ່ງ <b> %s ການວິເຄາະກ
 SeeReportInDueDebtMode=ເບິ່ງ <b> %s ການວິເຄາະເອກະສານທີ່ບັນທຶກໄວ້ %s </b> ສໍາລັບການຄິດໄລ່ອີງຕາມ <b> ທີ່ຮູ້ຈັກເອກະສານທີ່ບັນທຶກໄວ້ </b> ເຖິງແມ່ນວ່າພວກເຂົາຍັງຢູ່ໃນບັນຊີ
 SeeReportInBookkeepingMode=ເບິ່ງ <b> %s ການວິເຄາະຕາຕະລາງບັນຊີ book%s </b> ສໍາລັບລາຍງານອີງຕາມ <b> ຕາຕະລາງບັນຊີ Led a09a4b739f178z
 RulesAmountWithTaxIncluded=- ຈຳ ນວນເງິນທີ່ສະແດງແມ່ນລວມທັງອາກອນທັງົດແລ້ວ
-RulesResultDue=- ມັນລວມມີໃບຮຽກເກັບເງິນທີ່ຍັງຄ້າງຄາຢູ່, ຄ່າໃຊ້ຈ່າຍ, ອາກອນມູນຄ່າເພີ່ມ, ການບໍລິຈາກບໍ່ວ່າຈະຈ່າຍຫຼືບໍ່ກໍ່ຕາມ. ຍັງລວມເຖິງເງິນເດືອນທີ່ໄດ້ຈ່າຍ. <br> - ມັນອີງໃສ່ວັນທີຮຽກເກັບເງິນຂອງໃບແຈ້ງ ໜີ້ ແລະໃນວັນຄົບກໍານົດສໍາລັບຄ່າໃຊ້ຈ່າຍຫຼືການຊໍາລະອາກອນ. ສໍາລັບເງິນເດືອນທີ່ກໍານົດໄວ້ດ້ວຍໂມດູນເງິນເດືອນ, ວັນທີຂອງການຊໍາລະແມ່ນຖືກນໍາໃຊ້.
-RulesResultInOut=- ມັນລວມເຖິງການຈ່າຍເງິນຕົວຈິງຢູ່ໃນໃບແຈ້ງ ໜີ້, ລາຍຈ່າຍ, ອາກອນມູນຄ່າເພີ່ມແລະເງິນເດືອນ. <br> - ມັນແມ່ນອີງໃສ່ວັນທີຈ່າຍເງິນຂອງໃບແຈ້ງ ໜີ້, ຄ່າໃຊ້ຈ່າຍ, ອາກອນມູນຄ່າເພີ່ມແລະເງິນເດືອນ. ວັນບໍລິຈາກເພື່ອບໍລິຈາກ.
+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=- ມັນລວມເຖິງໃບຮຽກເກັບເງິນທີ່ລູກຄ້າຕ້ອງຈ່າຍບໍ່ວ່າຈະຈ່າຍຫຼືບໍ່ກໍ່ຕາມ. <br> - ມັນອີງຕາມວັນທີຮຽກເກັບເງິນຂອງໃບຮຽກເກັບເງິນເຫຼົ່ານີ້. <br>
 RulesCAIn=- ມັນລວມເອົາການຊໍາລະທີ່ມີປະສິດທິພາບທັງofົດຂອງໃບແຈ້ງ ໜີ້ ທີ່ໄດ້ຮັບຈາກລູກຄ້າ. <br> - ມັນແມ່ນອີງໃສ່ວັນທີການຈ່າຍເງິນຂອງໃບຮຽກເກັບເງິນເຫຼົ່ານີ້ <br>
 RulesCATotalSaleJournal=ມັນລວມເອົາວົງເງິນສິນເຊື່ອທັງfromົດຈາກວາລະສານການຂາຍ.
@@ -295,3 +296,5 @@ 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/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 77c209f526c..be5f507a576 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -27,7 +27,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=ຕ້ອງການລະຫັດລູກຄ້າ
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=ລົ້ມເຫລວໃນການຮັບຟີ
 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.
 ErrorNoImagickReadimage=Class Imagick ບໍ່ພົບໃນ PHP ນີ້. ບໍ່ສາມາດເບິ່ງຕົວຢ່າງໄດ້. ຜູ້ບໍລິຫານສາມາດປິດໃຊ້ງານແຖບນີ້ໄດ້ຈາກການຕັ້ງເມນູ - ການສະແດງ.
 ErrorRecordAlreadyExists=ມີບັນທຶກຢູ່ແລ້ວ
 ErrorLabelAlreadyExists=ມີປ້າຍ ກຳ ກັບນີ້ຢູ່ແລ້ວ
@@ -271,6 +274,9 @@ 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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=ພາຣາມິເຕີ PHP ຂອງເຈົ້າ upload_max_filesize (%s) ສູງກວ່າພາລາມິເຕີ PHP post_max_size (%s). ອັນນີ້ບໍ່ແມ່ນການຕັ້ງທີ່ສອດຄ່ອງ.
@@ -312,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/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/holiday.lang b/htdocs/langs/lo_LA/holiday.lang
index 330f1f671d2..be1bfb4e23a 100644
--- a/htdocs/langs/lo_LA/holiday.lang
+++ b/htdocs/langs/lo_LA/holiday.lang
@@ -27,7 +27,7 @@ DescCP=ລາຍລະອຽດ
 SendRequestCP=ສ້າງຄໍາຮ້ອງຂໍການພັກ
 DelayToRequestCP=ການຮ້ອງຂໍການປະປ່ອຍຕ້ອງເຮັດຢ່າງ ໜ້ອຍ <b> %s ມື້ກ່ອນ </b> ກ່ອນເຂົາເຈົ້າ.
 MenuConfCP=ຍອດເຫຼືອຂອງການພັກຜ່ອນ
-SoldeCPUser=ຍອດເງິນເຫຼືອແມ່ນ <b> %s </b> ມື້.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=ທ່ານຕ້ອງເລືອກວັນທີສິ້ນສຸດທີ່ໃຫຍ່ກວ່າວັນທີເລີ່ມຕົ້ນ.
 ErrorSQLCreateCP=ເກີດຄວາມຜິດພາດ SQL ໃນລະຫວ່າງການສ້າງ:
 ErrorIDFicheCP=ເກີດຄວາມຜິດພາດຂຶ້ນ, ບໍ່ມີການຮ້ອງຂໍການລາອອກ.
@@ -134,3 +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/install.lang b/htdocs/langs/lo_LA/install.lang
index f3c30c9a983..2043f916ca3 100644
--- a/htdocs/langs/lo_LA/install.lang
+++ b/htdocs/langs/lo_LA/install.lang
@@ -21,6 +21,7 @@ ErrorPHPDoesNotSupportCurl=ການຕິດຕັ້ງ PHP ຂອງເຈົ
 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 ບໍ່ມີ.
diff --git a/htdocs/langs/lo_LA/knowledgemanagement.lang b/htdocs/langs/lo_LA/knowledgemanagement.lang
index 12eada9956d..475ddd287d8 100644
--- a/htdocs/langs/lo_LA/knowledgemanagement.lang
+++ b/htdocs/langs/lo_LA/knowledgemanagement.lang
@@ -48,3 +48,7 @@ KnowledgeRecordExtraFields = Extrafields ສໍາລັບບົດຄວາມ
 GroupOfTicket=ກຸ່ມຂອງປີ້
 YouCanLinkArticleToATicketCategory=ເຈົ້າສາມາດເຊື່ອມຕໍ່ບົດຄວາມ ໜຶ່ງ ກັບກຸ່ມປີ້ (ສະນັ້ນບົດຄວາມຈະຖືກແນະນໍາໃນລະຫວ່າງຄຸນສົມບັດຂອງປີ້ໃ)່)
 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/main.lang b/htdocs/langs/lo_LA/main.lang
index a4b74524d11..e929be052f5 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=ຜິດພາດ, ບໍ່ໄດ້ກ
 ErrorNoSocialContributionForSellerCountry=ຜິດພາດ, ບໍ່ໄດ້ກໍານົດປະເພດພາສີທາງດ້ານສັງຄົມ/ງົບປະມານສໍາລັບປະເທດ '%s'.
 ErrorFailedToSaveFile=ຜິດພາດ, ບັນທຶກໄຟລ failed ບໍ່ ສຳ ເລັດ.
 ErrorCannotAddThisParentWarehouse=ເຈົ້າ ກຳ ລັງພະຍາຍາມເພີ່ມສາງຂອງພໍ່ແມ່ເຊິ່ງເປັນລູກຂອງສາງທີ່ມີຢູ່ແລ້ວ
+FieldCannotBeNegative=Field "%s" cannot be negative
 MaxNbOfRecordPerPage=ສູງສຸດ ຈຳ ນວນບັນທຶກຕໍ່ ໜ້າ
 NotAuthorized=ເຈົ້າຍັງບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ເຮັດແນວນັ້ນ.
 SetDate=ກໍານົດວັນທີ
@@ -87,7 +88,7 @@ FileWasNotUploaded=ມີການເລືອກໄຟລ for ເພື່ອ
 NbOfEntries=ຈຳ ນວນລາຍການ
 GoToWikiHelpPage=ອ່ານຄວາມຊ່ວຍເຫຼືອທາງອິນເຕີເນັດ (ຕ້ອງການການເຂົ້າເຖິງອິນເຕີເນັດ)
 GoToHelpPage=ອ່ານຊ່ວຍ
-DedicatedPageAvailable=ມີ ໜ້າ ຊ່ວຍເຫຼືອສະເພາະທີ່ກ່ຽວຂ້ອງກັບ ໜ້າ ຈໍປະຈຸບັນຂອງເຈົ້າ
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=ໜ້າ ຫຼັກ
 RecordSaved=ບັນທຶກບັນທຶກແລ້ວ
 RecordDeleted=ບັນທຶກຖືກລຶບແລ້ວ
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=ຄືນລະຫັດສໍາລັບຄໍາ
 InformationLastAccessInError=ຂໍ້ມູນສໍາລັບຄໍາຮ້ອງຂໍການເຂົ້າຫາຖານຂໍ້ມູນຫຼ້າສຸດຜິດພາດ
 DolibarrHasDetectedError=Dolibarr ໄດ້ກວດພົບຄວາມຜິດພາດທາງເທັກນິກ
 YouCanSetOptionDolibarrMainProdToZero=ເຈົ້າສາມາດອ່ານໄຟລ log ບັນທຶກຫຼືຕັ້ງຕົວເລືອກ $ dolibarr_main_prod ເປັນ '0' ຢູ່ໃນໄຟລ config config ຂອງເຈົ້າເພື່ອເອົາຂໍ້ມູນເພີ່ມເຕີມ.
-InformationToHelpDiagnose=ຂໍ້ມູນນີ້ສາມາດເປັນປະໂຫຍດສໍາລັບຈຸດປະສົງການວິນິດໄສ (ເຈົ້າສາມາດຕັ້ງຕົວເລືອກ $ dolibarr_main_prod ເປັນ '1' ເພື່ອເອົາແຈ້ງການດັ່ງກ່າວອອກ)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=ຂໍ້ມູນເພີ່ມເຕີມ
 TechnicalInformation=ຂໍ້ມູນດ້ານວິຊາການ
 TechnicalID=ID ທາງເທັກນິກ
@@ -211,6 +212,8 @@ User=ຜູ້ໃຊ້
 Users=ຜູ້ໃຊ້
 Group=ກຸ່ມ
 Groups=ກຸ່ມ
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=ບໍ່ໄດ້ ກຳ ນົດກຸ່ມຜູ້ໃຊ້
 Password=ລະຫັດຜ່ານ
 PasswordRetype=ພິມລະຫັດຜ່ານຂອງທ່ານຄືນໃ່
@@ -906,7 +909,7 @@ ViewFlatList=ເບິ່ງບັນຊີລາຍຊື່
 ViewAccountList=ເບິ່ງບັນຊີ
 ViewSubAccountList=ເບິ່ງບັນຊີຍ່ອຍບັນຊີ
 RemoveString=ລຶບສະຕິງ '%s'
-SomeTranslationAreUncomplete=ບາງພາສາທີ່ສະ ເໜີ ໃຫ້ອາດຈະຖືກແປພຽງບາງສ່ວນຫຼືອາດຈະມີຄວາມຜິດພາດ. ກະລຸນາຊ່ວຍແກ້ໄຂພາສາຂອງເຈົ້າໂດຍການລົງທະບຽນຢູ່ທີ່ <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> ເພື່ອເພີ່ມການປັບປຸງຂອງເຈົ້າ.
+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=ລິ້ງດາວໂຫຼດສາທາລະນະ
 PublicDownloadLinkDesc=ພຽງແຕ່ຕ້ອງການການເຊື່ອມຕໍ່, ເພື່ອດາວໂຫລດໄຟລ
 DirectDownloadInternalLink=ລິ້ງດາວໂຫຼດສ່ວນຕົວ
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/lo_LA/modulebuilder.lang b/htdocs/langs/lo_LA/modulebuilder.lang
index 11869baeff6..ce7e74ff135 100644
--- a/htdocs/langs/lo_LA/modulebuilder.lang
+++ b/htdocs/langs/lo_LA/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=ເຄື່ອງມືນີ້ຕ້ອງຖືກໃຊ້ໂດຍຜູ້ໃຊ້ຫຼືຜູ້ພັດທະນາທີ່ມີປະສົບການເທົ່ານັ້ນ. ມັນສະ ໜອງ ສິ່ງ ອຳ ນວຍຄວາມສະດວກເພື່ອສ້າງຫຼືແກ້ໄຂໂມດູນຂອງເຈົ້າເອງ. ເອກະສານສໍາລັບການພັດທະນາຄູ່ມື <a href="%s" target="_blank"> ຢູ່ທີ່ນີ້ </a>.
+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 ຈະຖືກສ້າງຂຶ້ນ.
 ModuleBuilderDesc2=ເສັ້ນທາງບ່ອນທີ່ມີການສ້າງ/ແກ້ໄຂໂມດູນ (ໄດເຣັກທໍຣີ ທຳ ອິດ ສຳ ລັບໂມດູນພາຍນອກທີ່ ກຳ ນົດໄວ້ໃນ %s): <strong> %s </strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=ເມນູທີ່ສະ ໜອງ ໃຫ້ໂດຍໂ
 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>' ໃນລະຫັດຫຼັກ).
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
+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=ເບິ່ງ IDs ທີ່ໃຊ້ຢູ່ໃນການຕິດຕັ້ງຂອງເຈົ້າ
 SeeReservedIDsRangeHere=ເບິ່ງຂອບເຂດຂອງ ID ທີ່ສະຫງວນໄວ້
 ToolkitForDevelopers=ຊຸດເຄື່ອງມືສໍາລັບຜູ້ພັດທະນາ Dolibarr
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/other.lang b/htdocs/langs/lo_LA/other.lang
index 2c5ac21f1cb..26fdf397de8 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -258,6 +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
 YourPasswordHasBeenReset=ຣີເຊັດລະຫັດຜ່ານຂອງທ່ານ ສຳ ເລັດແລ້ວ
 ApplicantIpAddress=ທີ່ຢູ່ IP ຂອງຜູ້ສະັກ
 SMSSentTo=ສົ່ງ SMS ຫາ %s
@@ -268,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=ເຂດສົ່ງອອກ
diff --git a/htdocs/langs/lo_LA/partnership.lang b/htdocs/langs/lo_LA/partnership.lang
index b34bfca6d1a..d6f1cfbe552 100644
--- a/htdocs/langs/lo_LA/partnership.lang
+++ b/htdocs/langs/lo_LA/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=ການຄຸ້ມຄອງຄູ່ຮ່ວມງານ
 PartnershipDescription=ການຄຸ້ມຄອງຫຸ້ນສ່ວນໂມດູນ
 PartnershipDescriptionLong= ການຄຸ້ມຄອງຫຸ້ນສ່ວນໂມດູນ
-
+Partnership=Partnership
 AddPartnership=ເພີ່ມການຮ່ວມມື
 CancelPartnershipForExpiredMembers=ການເປັນຫຸ້ນສ່ວນ: ຍົກເລີກການເປັນຫຸ້ນສ່ວນຂອງສະມາຊິກດ້ວຍການສະັກທີ່iredົດອາຍຸ
 PartnershipCheckBacklink=ການຮ່ວມມື: ກວດເບິ່ງລິງຍ້ອນກັບ
diff --git a/htdocs/langs/lo_LA/productbatch.lang b/htdocs/langs/lo_LA/productbatch.lang
index 53a44fb0cf5..ad9163ed6d2 100644
--- a/htdocs/langs/lo_LA/productbatch.lang
+++ b/htdocs/langs/lo_LA/productbatch.lang
@@ -30,7 +30,7 @@ ManageLotMask=ຫນ້າກາກທີ່ກໍາຫນົດເອງ
 CustomMasks=ທາງເລືອກໃນການ ກຳ ນົດ ໜ້າ ກາກຕົວເລກທີ່ແຕກຕ່າງກັນ ສຳ ລັບແຕ່ລະຜະລິດຕະພັນ
 BatchLotNumberingModules=ກົດລະບຽບການໃສ່ຕົວເລກສໍາລັບການສ້າງຈໍານວນລັອດອັດຕະໂນມັດ
 BatchSerialNumberingModules=ກົດລະບຽບການໃສ່ຕົວເລກສໍາລັບການສ້າງserາຍເລກລໍາດັບອັດຕະໂນມັດ (ສໍາລັບຜະລິດຕະພັນທີ່ມີຊັບສິນ 1 ຈໍານວນທີ່ບໍ່ຊໍ້າກັນ/ຈໍານວນຕໍ່ເນື່ອງສໍາລັບແຕ່ລະຜະລິດຕະພັນ)
-QtyToAddAfterBarcodeScan=ຈໍານວນທີ່ຈະເພີ່ມສໍາລັບແຕ່ລະ barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=ຊ່ວງຊີວິດ (ເປັນມື້)
 EndOfLife=ສິ້ນສຸດຂອງຊີວິດ
 ManufacturingDate=ວັນທີຜະລິດ
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=ບໍ່ໄດ້ສັ່ງ
 InWorkingOrder=ໃນຄໍາສັ່ງເຮັດວຽກ
+ToReplace=Replace
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index 1921c4346fc..c6ccdc4adba 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=ນໍ້າ ໜັກ ລາຄາສະເລ່ຍ
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index e04f98f3365..d5660ce0082 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -197,6 +197,7 @@ InputPerMonth=ການປ້ອນຂໍ້ມູນຕໍ່ເດືອນ
 InputDetail=ລາຍລະອຽດການປ້ອນຂໍ້ມູນ
 TimeAlreadyRecorded=ນີ້ແມ່ນເວລາທີ່ໃຊ້ບັນທຶກໄວ້ແລ້ວສໍາລັບ ໜ້າ ວຽກ/ມື້ນີ້ແລະຜູ້ໃຊ້ %s
 ProjectsWithThisUserAsContact=ໂຄງການທີ່ມີຜູ້ໃຊ້ນີ້ເປັນຜູ້ຕິດຕໍ່
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=ມອບTasາຍ ໜ້າ ວຽກໃຫ້ຜູ້ໃຊ້ນີ້ແລ້ວ
 ResourceNotAssignedToProject=ບໍ່ໄດ້ມອບtoາຍໃຫ້ກັບໂຄງການ
 ResourceNotAssignedToTheTask=ບໍ່ໄດ້ມອບtoາຍ ໜ້າ ທີ່
@@ -284,3 +285,5 @@ 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
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/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index f50da0acef8..c452655f2fc 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=ຂີດຈໍາກັດຫຼັກຊັບສ
 AddNewProductStockWarehouse=ກໍານົດຂອບເຂດຈໍາກັດໃຫມ່ສໍາລັບການແຈ້ງເຕືອນແລະຕ້ອງການຫຼັກຊັບທີ່ດີທີ່ສຸດ
 AddStockLocationLine=ຫຼຸດປະລິມານລົງຈາກນັ້ນຄລິກເພື່ອເພີ່ມສາງອື່ນສໍາລັບຜະລິດຕະພັນນີ້
 InventoryDate=ວັນທີສິນຄ້າຄົງຄັງ
+Inventories=Inventories
 NewInventory=ສິນຄ້າຄົງຄັງໃຫມ່
 inventorySetup = ການຕິດຕັ້ງສາງ
 inventoryCreatePermission=ສ້າງບັນຊີລາຍການໃຫມ່
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=ການເຄື່ອນຍ້
 inventoryChangePMPPermission=ອະນຸຍາດໃຫ້ປ່ຽນຄ່າ PMP ສໍາລັບຜະລິດຕະພັນໃດນຶ່ງ
 ColumnNewPMP=ໜ່ວຍ ໃP່ PMP
 OnlyProdsInStock=ຢ່າເພີ່ມສິນຄ້າໂດຍບໍ່ມີຫຼັກຊັບ
-TheoricalQty=ຈຳ ນວນທິດສະດີ
-TheoricalValue=ຈຳ ນວນທິດສະດີ
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=BP ຫຼ້າສຸດ
 CurrentPA=ປິ່ນປົວ BP
 RecordedQty=ຈຳ ນວນທີ່ບັນທຶກໄວ້
@@ -240,7 +241,7 @@ StockAtDatePastDesc=ເຈົ້າສາມາດເບິ່ງຫຼັກຊ
 StockAtDateFutureDesc=ເຈົ້າສາມາດເບິ່ງຫຼັກຊັບ (ຫຸ້ນສະສົມ) ຢູ່ທີ່ນີ້ໃນວັນເວລາທີ່ ກຳ ນົດໄວ້ໃນອະນາຄົດ
 CurrentStock=ຫຼັກຊັບປະຈຸບັນ
 InventoryRealQtyHelp=ຕັ້ງຄ່າເປັນ 0 ເພື່ອຣີເຊັດ qty <br> ຮັກສາຊ່ອງຫວ່າງໄວ້, ຫຼືເອົາແຖວອອກ, ເພື່ອຮັກສາບໍ່ປ່ຽນແປງ.
-UpdateByScaning=ຕື່ມ ຈຳ ນວນຕົວຈິງໂດຍການສະແກນ
+UpdateByScaning=Complete real qty by scaning
 UpdateByScaningProductBarcode=ອັບເດດໂດຍການສະແກນ (ບາໂຄດສິນຄ້າ)
 UpdateByScaningLot=ອັບເດດໂດຍການສະແກນ (lot | barcode serial)
 DisableStockChangeOfSubProduct=ປິດ ນຳ ໃຊ້ການປ່ຽນແປງຫຼັກຊັບ ສຳ ລັບທຸກຜະລິດຕະພັນຍ່ອຍຂອງຊຸດນີ້ໃນລະຫວ່າງການເຄື່ອນໄຫວນີ້.
@@ -253,14 +254,20 @@ ReOpen=ເປີດຄືນໃ່
 ConfirmFinish=ເຈົ້າຢືນຢັນການປິດສາງບໍ? ອັນນີ້ຈະສ້າງການເຄື່ອນໄຫວຫຼັກຊັບທັງtoົດເພື່ອອັບເດດຫຼັກຊັບຂອງເຈົ້າໃຫ້ເປັນຈໍານວນຕົວຈິງທີ່ເຈົ້າໄດ້ເຂົ້າໄປໃນສາງ.
 ObjectNotFound=ບໍ່ພົບ %s
 MakeMovementsAndClose=ສ້າງການເຄື່ອນໄຫວແລະປິດ
-AutofillWithExpected=ຕື່ມປະລິມານຕົວຈິງດ້ວຍປະລິມານທີ່ຄາດໄວ້
+AutofillWithExpected=Replace real quantity with expected quantity
 ShowAllBatchByDefault=ຕາມຄ່າເລີ່ມຕົ້ນ, ສະແດງລາຍລະອຽດເປັນຊຸດຢູ່ໃນແຖບ "ຫຼັກຊັບ" ຂອງຜະລິດຕະພັນ
 CollapseBatchDetailHelp=ເຈົ້າສາມາດ ກຳ ນົດການສະແດງລາຍລະອຽດເປັນຊຸດໃນການຕັ້ງຄ່າໂມດູນຫຼັກຊັບ
-FieldCannotBeNegative=ຊ່ອງຂໍ້ມູນ "%s" ບໍ່ສາມາດເປັນຄ່າລົບໄດ້
 ErrorWrongBarcodemode=ບໍ່ຮູ້ຈັກໂmodeດບາໂຄດ
 ProductDoesNotExist=ບໍ່ມີຜະລິດຕະພັນ
-ErrorSameBatchNumber=ພົບຈໍານວນຊຸດດຽວກັນຢູ່ໃນລາຍການສິນຄ້າຄົງຄັງ
+ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
 ProductBatchDoesNotExist=ບໍ່ມີຜະລິດຕະພັນທີ່ມີຊຸດ/ລຳ ດັບ
 ProductBarcodeDoesNotExist=ບໍ່ມີຜະລິດຕະພັນທີ່ມີບາໂຄດ
 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
diff --git a/htdocs/langs/lo_LA/stripe.lang b/htdocs/langs/lo_LA/stripe.lang
index 0bd24182318..7db1270b5f0 100644
--- a/htdocs/langs/lo_LA/stripe.lang
+++ b/htdocs/langs/lo_LA/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=ການຕັ້ງຄ່າໂມດູນເສັ້ນດ່າງ
-StripeDesc=ສະ ເໜີ ໃຫ້ລູກຄ້າມີ ໜ້າ ຊໍາລະເງິນອອນໄລນ ri Stripe ສໍາລັບການຊໍາລະດ້ວຍບັດເຄຣດິດ/cebit ຜ່ານ <a href="http://www.stripe.com" target="_blank"> Stripe </a>. ອັນນີ້ສາມາດໃຊ້ເພື່ອອະນຸຍາດໃຫ້ລູກຄ້າຂອງເຈົ້າເຮັດການຊໍາລະສະເພາະຫຼືສໍາລັບການຊໍາລະທີ່ກ່ຽວຂ້ອງກັບວັດຖຸ Dolibarr ໂດຍສະເພາະ (ໃບເກັບເງິນ, ຄໍາສັ່ງ, ... )
+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=ຈ່າຍດ້ວຍບັດເຄຣດິດຫຼື Stripe
 FollowingUrlAreAvailableToMakePayments=URLs ຕໍ່ໄປນີ້ແມ່ນມີຢູ່ເພື່ອສະ ເໜີ ໜ້າ ໃຫ້ລູກຄ້າເພື່ອຊໍາລະເງິນກັບວັດຖຸ Dolibarr
 PaymentForm=ແບບຟອມການຊໍາລະເງິນ
diff --git a/htdocs/langs/lo_LA/withdrawals.lang b/htdocs/langs/lo_LA/withdrawals.lang
index a770370193c..f00ec20967e 100644
--- a/htdocs/langs/lo_LA/withdrawals.lang
+++ b/htdocs/langs/lo_LA/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=ໃບສັ່ງໂອນເງິນສິນເຊື່
 LatestBankTransferReceipts=ຄຳ ສັ່ງໂອນເງິນ %s ຫຼ້າສຸດ
 LastWithdrawalReceipts=ໄຟລ deb ເດບິດໂດຍກົງ %s ຫຼ້າສຸດ
 WithdrawalsLine=ເສັ້ນຄໍາສັ່ງການຫັກເງິນໂດຍກົງ
+CreditTransfer=Credit transfer
 CreditTransferLine=ສາຍການໂອນສິນເຊື່ອ
 WithdrawalsLines=ເສັ້ນຄໍາສັ່ງການຫັກເງິນໂດຍກົງ
 CreditTransferLines=ສາຍການໂອນສິນເຊື່ອ
@@ -47,6 +48,7 @@ ThirdPartyBankCode=ລະຫັດທະນາຄານພາກສ່ວນທ
 NoInvoiceCouldBeWithdrawed=ບໍ່ມີການຮຽກເກັບເງິນໃບຮຽກເກັບເງິນ ສຳ ເລັດ. ກວດເບິ່ງວ່າໃບຮຽກເກັບເງິນຢູ່ໃນບໍລິສັດທີ່ມີ IBAN ທີ່ຖືກຕ້ອງແລະ IBAN ມີ UMR (ເອກະສານການມອບMandາຍທີ່ເປັນເອກະລັກ) ທີ່ມີຮູບແບບ <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=ໃບຮັບເງິນການຖອນເງິນນີ້ໄດ້ຖືກmarkedາຍເປັນເງິນໄວ້ແລ້ວ; ອັນນີ້ບໍ່ສາມາດເຮັດໄດ້ສອງເທື່ອ, ອັນນີ້ອາດຈະສ້າງການຊໍາລະຊໍ້າກັນແລະລາຍການທະນາຄານ.
 ClassCredited=ຈັດປະເພດສິນເຊື່ອ
+ClassDebited=Classify debited
 ClassCreditedConfirm=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການຈັດປະເພດໃບຮັບເງິນຖອນເງິນນີ້ເປັນເງິນໃນບັນຊີທະນາຄານຂອງເຈົ້າ?
 TransData=ວັນທີສົ່ງ
 TransMetod=ວິທີການສົ່ງ
@@ -80,7 +82,7 @@ StatusMotif7=ການຕັດສິນຂອງສານ
 StatusMotif8=ເຫດຜົນອື່ນ
 CreateForSepaFRST=ສ້າງໄຟລ deb ເດບິດໂດຍກົງ (SEPA FRST)
 CreateForSepaRCUR=ສ້າງໄຟລ deb ເດບິດໂດຍກົງ (SEPA RCUR)
-CreateAll=ສ້າງໄຟລ deb ເດບິດໂດຍກົງ (ທັງ)ົດ)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=ສ້າງໄຟລ for ສໍາລັບການໂອນສິນເຊື່ອ
 CreateSepaFileForPaymentByBankTransfer=ສ້າງໄຟລ transfer ໂອນເງິນສິນເຊື່ອ (SEPA)
 CreateGuichet=ຫ້ອງການເທົ່ານັ້ນ
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=ບໍ່ສາມາດສ້າງຄໍາຮ
 SepaMandate=ຄໍາສັ່ງ SEPA Direct Debit
 SepaMandateShort=ຄຳ ສັ່ງ SEPA
 PleaseReturnMandate=ກະລຸນາສົ່ງຄືນແບບຟອມ ຄຳ ສັ່ງນີ້ທາງອີເມລ to ຫາ %s ຫຼືທາງໄປສະນີຫາ
-SEPALegalText=ໂດຍການເຊັນແບບຟອມຄໍາສັ່ງນີ້, ເຈົ້າອະນຸຍາດໃຫ້ (A) %s ສົ່ງຄໍາແນະນໍາໄປຫາທະນາຄານຂອງເຈົ້າເພື່ອຫັກບັນຊີຂອງເຈົ້າແລະ (B) ທະນາຄານຂອງເຈົ້າຕັດບັນຊີຂອງເຈົ້າຕາມຄໍາແນະນໍາຈາກ %s. ສ່ວນ ໜຶ່ງ ຂອງສິດທິຂອງເຈົ້າ, ເຈົ້າມີສິດໄດ້ເງິນຄືນຈາກທະນາຄານຂອງເຈົ້າພາຍໃຕ້ຂໍ້ ກຳ ນົດແລະເງື່ອນໄຂຂອງສັນຍາກັບທະນາຄານຂອງເຈົ້າ. ການຄືນເງິນຕ້ອງໄດ້ຮັບການຮ້ອງຂໍພາຍໃນ 8 ອາທິດເລີ່ມແຕ່ວັນທີທີ່ບັນຊີຂອງເຈົ້າຖືກຫັກບັນຊີ. ສິດທິຂອງເຈົ້າກ່ຽວກັບການມອບaboveາຍຂ້າງເທິງແມ່ນໄດ້ອະທິບາຍຢູ່ໃນຄໍາຖະແຫຼງທີ່ເຈົ້າສາມາດໄດ້ຮັບຈາກທະນາຄານຂອງເຈົ້າ.
+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=ຕົວລະບຸເຈົ້າ ໜີ້
 CreditorName=ຊື່ເຈົ້າ ໜີ້
 SEPAFillForm=(ຂ) ກະລຸນາຕື່ມຂໍ້ມູນໃສ່ທຸກຊ່ອງທີ່markedາຍໄວ້ *
@@ -150,3 +152,5 @@ ModeWarning=ທາງເລືອກສໍາລັບຮູບແບບທີ
 ErrorCompanyHasDuplicateDefaultBAN=ບໍລິສັດທີ່ມີ id %s ມີບັນຊີທະນາຄານເລີ່ມຕົ້ນຫຼາຍກວ່າ ໜຶ່ງ ບັນຊີ. ບໍ່ມີທາງທີ່ຈະຮູ້ວ່າອັນໃດຄວນໃຊ້.
 ErrorICSmissing=ບໍ່ມີ ICS ຢູ່ໃນບັນຊີທະນາຄານ %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=ຈໍານວນທັງofົດຂອງຄໍາສັ່ງຫັກເງິນໂດຍກົງແຕກຕ່າງຈາກຈໍານວນແຖວ
+WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
+WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index 154873a8a8d..f9ba81ed755 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ NoJournalDefined=Joks žurnalas nenustatytas
 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index ea7009545cf..4c95f955423 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Organizacija
 Version=Versija
 Publisher=Publisher
@@ -265,8 +267,8 @@ OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=Vartotojo arba kūrėjo dokumentacijos (doc, DUK ...) <br> ieškoti Dolibarr Wiki: <br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Dėl kitų klausimų/pagalbos galite kreiptis į Dolibarr forumą: <br><b><a href="%s" target="_blank">%s</a></b>
+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=Dabartinis meniu prižiūrėtojas
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
 LastActivationAuthor=Latest activation author
 LastActivationIP=Latest activation IP
+LastActivationVersion=Latest activation version
 UpdateServerOffline=Atnaujinti 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>
@@ -753,7 +756,7 @@ Permission106=Eksportuoti siuntinius
 Permission109=Ištrinti siuntinius
 Permission111=Skaityti finansines ataskaitas
 Permission112=Sukurti/keisti/trinti ir palyginti sandorius/transakcijas
-Permission113=Finansinių sąskaitų nustatymas (sukurti, valdyti kategorijas)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Eksportuoti sandorius/transakcijas ir sąskaitos išrašus
 Permission116=Pervedimai tarp sąskaitų
@@ -762,6 +765,7 @@ Permission121=Skaityti trečiąsias šalis, susijusias su vartotoju
 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)
@@ -889,12 +893,11 @@ Permission701=Skaityti aukas
 Permission702=Sukurti/keisti aukas
 Permission703=Ištrinti aukas
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Sukurti / redaguoti išlaidų ataskaitas
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Ištrinti išlaidų ataskaitas
-Permission774=Skaityti visas išlaidų ataskaitas (net nepalald-iam vartotojui)
 Permission775=Patvirtinti išlaidų ataskaitas
 Permission776=Mokamų išlaidų ataskaitos
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Eksportuoti išlaidų ataskaitas
 Permission1001=Skaityti atsargas
@@ -958,15 +961,11 @@ Permission2801=Naudokite FTP klientą skaitymo režime (tik naršyti ir parsisi
 Permission2802=Naudokite FTP klientą įrašymo režimu (ištrinti ar įkelti failus)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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=Skaityti planinį darbą
 Permission23002=sukurti / atnaujinti planinį darbą
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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=Lauko %s redagavimas
@@ -1708,8 +1707,9 @@ MailingDelay=Keletą sekundžių palaukti po sekančio pranešimo išsiuntimo
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Gavėjas
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Įplaukų siuntimo modelis
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Laisvas tekstas pristatymo kvituose
 ##### FCKeditor #####
 AdvancedEditor=Išplėstinis redaktorius
 ActivateFCKeditor=Įjungti išplėstinį redaktorių:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field public notes of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field private notes of elements
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Pašto kodas
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
index 793c685c406..da8c2baa662 100644
--- a/htdocs/langs/lt_LT/banks.lang
+++ b/htdocs/langs/lt_LT/banks.lang
@@ -32,7 +32,7 @@ RIB=Banko sąskaitos numeris
 IBAN=IBAN numeris
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Sąskaitos šalis
 BankAccountOwner=Sąskaitos savininko vardas/pavadinimas
 BankAccountOwnerAddress=Sąskaitos savininko adresas
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Sukurti sąskaitą
 NewBankAccount=Naujas sąskaita
 NewFinancialAccount=Nauja finansinė sąskaita
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/bookmarks.lang b/htdocs/langs/lt_LT/bookmarks.lang
index 36f982984cd..6d781ce9295 100644
--- a/htdocs/langs/lt_LT/bookmarks.lang
+++ b/htdocs/langs/lt_LT/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Elgsena kada pasirenkamas žymeklio URL
 CreateBookmark=Sukurti žymeklį
 SetHereATitleForLink=Set a name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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=Žymeklių valdymas
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index 64443787ffc..1dfa2f95973 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ VATIntraCheck=Patikrinti
 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">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Tikrinimas negalimas. Tikrinimo paslauga nėra teikiama valstybės narės (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index 495f61395cd..b0fecf81759 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -170,8 +170,9 @@ 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=- Sumos rodomos su įtrauktais mokesčiais
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index 717b3f09638..7155a7694df 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Nepavyksta gauti RSS feed. Pabandykite pridėti konstan
 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=Leidimas šiam prisijungimo vardui gali būti nustatomas Jūsų Dolibarr administratoriaus iš meniu %s>%s.
 ErrorForbidden3=Atrodo, kad Dolibarr nenaudojamas per patvirtintą sesiją. Pažvelkite į Dolibarr nustatymų dokumentus, norėdami sužinoti, kaip valdyti patvirtinimus (htaccess, mod_auth ar kitas ...).
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=Klasė Imagick nerasta šiame PHP. Peržiūra negalima. Administratoriai gali išjungti šią kortelę iš meniu Nustatymai - Ekranas.
 ErrorRecordAlreadyExists=Įrašas jau egzistuoja
 ErrorLabelAlreadyExists=This label already exists
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/lt_LT/holiday.lang
index c108fc38db9..9df0640e8c6 100644
--- a/htdocs/langs/lt_LT/holiday.lang
+++ b/htdocs/langs/lt_LT/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Aprašymas
 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 is <b>%s</b> days.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Turite pasirinkti pabaigos datą didesnę nei pradžios data.
 ErrorSQLCreateCP=Kuriant įvyko SQL klaida:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -134,3 +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 ce06a09c488..4eada4e4109 100644
--- a/htdocs/langs/lt_LT/install.lang
+++ b/htdocs/langs/lt_LT/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/lt_LT/main.lang
index aa7d7be9ffc..f53efe84de3 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Klaida, nėra apibrėžtų PVM tarifų ša
 ErrorNoSocialContributionForSellerCountry=Klaida, socialiniai / fiskaliniai mokesčiai neapibrėžti šaliai '%s'.
 ErrorFailedToSaveFile=Klaida, nepavyko išsaugoti failo.
 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=Nustatyti datą
@@ -87,7 +88,7 @@ FileWasNotUploaded=Failas prikabinimui pasirinktas, bet dar nebuvo įkeltas. Pas
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Skaityti pagalbą
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Įrašas išsaugotas
 RecordDeleted=Įrašas ištrintas
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Return code for latest database access request error
 InformationLastAccessInError=Information for latest database access request error
 DolibarrHasDetectedError=Dolibarr aptiko techninę klaidą
 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 remove such notices)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Daugiau informacijos
 TechnicalInformation=Techninė informacija
 TechnicalID=Technical ID
@@ -211,6 +212,8 @@ User=Vartotojas
 Users=Vartotojai
 Group=Grupė
 Groups=Grupės
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Nėra apibrėžtos vartotojų grupės
 Password=Slaptažodis
 PasswordRetype=Pakartokite slaptažodį
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Kliento Laiko Juosta (vartotojas)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/lt_LT/modulebuilder.lang b/htdocs/langs/lt_LT/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/lt_LT/modulebuilder.lang
+++ b/htdocs/langs/lt_LT/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 8b1386873c9..110ced16ac7 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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
diff --git a/htdocs/langs/lt_LT/partnership.lang b/htdocs/langs/lt_LT/partnership.lang
index 417e2cbe744..4a754ddb116 100644
--- a/htdocs/langs/lt_LT/partnership.lang
+++ b/htdocs/langs/lt_LT/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/lt_LT/productbatch.lang b/htdocs/langs/lt_LT/productbatch.lang
index fbbc446acd3..7273de7e16a 100644
--- a/htdocs/langs/lt_LT/productbatch.lang
+++ b/htdocs/langs/lt_LT/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 52216de932e..e6eda77bc6f 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Vidutinė svertinė kaina
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index 8e2946a6279..8c7a271873c 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/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=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,3 +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=Pabaigos data negali būti ankstesnė už pradžios datą
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 804309f2a1c..5524ca80de3 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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=Fill real quantity with expected quantity
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=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
diff --git a/htdocs/langs/lt_LT/stripe.lang b/htdocs/langs/lt_LT/stripe.lang
index 4efacc34103..b51dcab3bd8 100644
--- a/htdocs/langs/lt_LT/stripe.lang
+++ b/htdocs/langs/lt_LT/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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=Sekantys URL siūlo puslapį klientui Dolibarr objektų mokėjimui
 PaymentForm=Mokėjimo forma
@@ -28,7 +28,6 @@ AccountParameter=Sąskaitos parametrai
 UsageParameter=Naudojimo parametrai
 InformationToFindParameters=Padėti rasti savo %s sąskaitos informaciją
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Paravėjo vardas
 CSSUrlForPaymentForm=CSS stiliaus lapo URL mokėjimo formai
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang
index b8270a3fcff..db366dcbd1a 100644
--- a/htdocs/langs/lt_LT/withdrawals.lang
+++ b/htdocs/langs/lt_LT/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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=Priskirti įskaitytas (credited)
+ClassDebited=Classify debited
 ClassCreditedConfirm=Ar tikrai norite priskirti šias išėmimo įplaukas kaip įskaitytas (credited) į Jūsų banko sąskaitą ?
 TransData=Perdavimo data
 TransMetod=Perdavimo būdas
@@ -80,7 +82,7 @@ StatusMotif7=Teismo sprendimas
 StatusMotif8=Kita priežastis
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Tik ofisas
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ ModeWarning=Opcija realiam režimui nebuvo nustatyta, sustabdyta po šios simuli
 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
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index e4237356d3f..3ee38b2080c 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=Valstis, kas nav EEK valstīs
 CountriesInEECExceptMe=Valstis EEK, izņemot %s
 CountriesExceptMe=Visas valstis, izņemot %s
 AccountantFiles=Eksportēt pirmdokumentus
-ExportAccountingSourceDocHelp=Izmantojot šo rīku, varat eksportēt avota notikumus (sarakstu CSV un PDF formātā), kas tika izmantoti grāmatvedības ģenerēšanai.
+ExportAccountingSourceDocHelp=Izmantojot šo rīku, varat eksportēt avota notikumus (sarakstu CSV un PDF formātā), kas tiek izmantoti jūsu grāmatvedības uzskaitei.
 ExportAccountingSourceDocHelp2=Lai eksportētu žurnālus, izmantojiet izvēlnes ierakstu %s - %s.
 VueByAccountAccounting=Skatīt pēc grāmatvedības konta
 VueBySubAccountAccounting=Skatīt pēc grāmatvedības apakškonta
@@ -286,7 +286,7 @@ ValidateMovements=Apstipriniet kustības
 DescValidateMovements=Jebkādas rakstīšanas, burtu un izdzēsto tekstu izmaiņas vai dzēšana būs aizliegtas. Visi vingrinājumu ieraksti ir jāapstiprina, pretējā gadījumā aizvēršana nebūs iespējama
 
 ValidateHistory=Piesaistiet automātiski
-AutomaticBindingDone=Automātiskā piesaistīšana pabeigta
+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
@@ -387,7 +387,8 @@ SaleExport=Eksporta pārdošana
 SaleEEC=Pārdošana EEK
 SaleEECWithVAT=Pārdošana EEK ar PVN nav spēkā, tāpēc domājams, ka tā NAV iekšējā tirdzniecība, un ieteiktais konts ir standarta produkta konts.
 SaleEECWithoutVATNumber=Pārdošana EEK bez PVN, bet trešās puses PVN ID nav definēts. Mēs atteicamies no standarta produkta standarta konta. Ja nepieciešams, varat salabot trešās personas PVN ID vai produkta kontu.
-
+ForbiddenTransactionAlreadyExported=Aizliegts: darījums ir apstiprināts un/vai eksportēts.
+ForbiddenTransactionAlreadyValidated=Aizliegts: darījums ir apstiprināts.
 ## Dictionary
 Range=Grāmatvedības konta diapazons
 Calculated=Aprēķināts
@@ -404,6 +405,7 @@ NoJournalDefined=Nav definēts žurnāls
 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
 
 ## Import
 ImportAccountingEntries=Grāmatvedības ieraksti
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index d3f1baec86c..94a2b211349 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Organizācija
 Version=Versija
 Publisher=Izdevējs
@@ -265,8 +267,8 @@ OtherResources=Citi resursi
 ExternalResources=Ārējie resursi
 SocialNetworks=Sociālie tīkli
 SocialNetworkId=Sociālā tīkla ID
-ForDocumentationSeeWiki=Par lietotāju vai attīstītājs dokumentācijas (Doc, FAQ ...), <br> ieskatieties uz Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
-ForAnswersSeeForum=Par jebkuru citu jautājumu/palīdzību, jūs varat izmantot Dolibarr forumu: <br> <a href="%s" target="_blank"><b>%s</b></a>
+ForDocumentationSeeWiki=Lietotāja vai izstrādātāja dokumentācijai (Dok., FAQ...) <br> skatiet Dolibarr Wiki: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> a0ecb2ec87f6077f80 a0ecb2ec87f4077f80.
+ForAnswersSeeForum=Citu jautājumu/palīdzības gadījumā varat izmantot Dolibarr forumu: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> a090f17f733
 HelpCenterDesc1=Šeit ir daži resursi, lai iegūtu Dolibarr palīdzību un atbalstu.
 HelpCenterDesc2=Daži no šiem resursiem ir pieejami tikai <b> angliski </b>.
 CurrentMenuHandler=Pašreizējais izvēlnes apstrādātājs
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Jaunākā stabilā versija
 LastActivationDate=Jaunākais aktivizācijas datums
 LastActivationAuthor=Jaunākais aktivizētāja autors
 LastActivationIP=Jaunākā aktivizācijas IP adrese
+LastActivationVersion=Jaunākā aktivizācijas versija
 UpdateServerOffline=Atjaunināšanas serveris bezsaistē
 WithCounter=Pārvaldīt skaitītāju
 GenericMaskCodes=Jūs varat ievadīt jebkuru numerācijas masku. Šajā maskā var izmantot šādus tagus: <br> <b> {000000} </b> atbilst skaitlim, kas tiks palielināts katrā %s. Ievadiet tik daudz nulles, cik vēlamais skaitītāja garums. Skaitītāju aizpildīs ar nulli no kreisās puses, lai tajā būtu tikpat daudz nulles kā maskā. <br> <b> {000000 + 000} </b> tāds pats kā iepriekšējais, bet nobīde, kas atbilst skaitlim pa labi no zīmes +, tiek piemērota, sākot ar pirmo %s. <br> <b> {000000 @ x} </b> tāds pats kā iepriekšējais, bet skaitītājs tiek atiestatīts uz nulli, kad ir sasniegts mēnesis x (x no 1 līdz 12, vai 0, lai izmantotu jūsu konfigurācijā definētos fiskālā gada sākuma mēnešus, vai no 99 līdz katru mēnesi atiestatīt uz nulli). Ja tiek izmantota šī opcija un x ir 2 vai lielāks, ir nepieciešama arī secība {yy} {mm} vai {gggg} {mm}. <br> <b> {dd} </b> diena (no 01 līdz 31). <br> <b> {mm} </b> mēnesis (no 01 līdz 12). <br> <b> {yy} </b>, <b> {yyyy} </b> vai <b> {y} a09a4b <br>
@@ -753,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=Iestatīt finanšu kontus (izveidojiet, pārvaldiet sadaļas)
+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
@@ -762,6 +765,7 @@ Permission121=Skatīt trešās personas, kas saistītas ar lietotāju
 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)
@@ -889,12 +893,11 @@ Permission701=Lasīt ziedojumus
 Permission702=Izveidot/mainīt ziedojumus
 Permission703=Dzēst ziedojumus
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Izveidojiet/labojiet izdevumu pārskatus
+Permission772=Izveidojiet/pārveidojiet izdevumu pārskatus (jums un jūsu padotajiem)
 Permission773=Dzēst izdevumu pārskatus
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Apstiprināt izdevumu pārskatus
 Permission776=Apmaksāt izdevumu pārskatus
-Permission777=Lasiet visu izdevumu pārskatus
+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
@@ -958,15 +961,11 @@ 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=Skatīt darbiniekus
-Permission4002=Izveidot darbiniekus
-Permission4003=Dzēst darbiniekus
-Permission4004=Eksportēt darbiniekus
-Permission4010=Izlasiet prasmes/darbu/amatu
-Permission4011=Izveidot/mainīt prasmi/darbu/amatu
-Permission4012=Dzēst prasmi/darbu/amatu
-Permission4020=Izlasi vērtējumu
-Permission4021=Izveidot/mainīt novērtējumu
+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
@@ -977,9 +976,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=Lasīt visus atvaļinājuma pieprasījumus (pat lietotājs nav pakļauts)
-Permission20005=Izveidot / mainīt atvaļinājumu pieprasījumus visiem (pat lietotājam nav padotajiem)
-Permission20006=Admin 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
@@ -1358,9 +1357,9 @@ BrowserIsOK=Jūs izmantojat tīmekļa pārlūku %s. Šī pārlūkprogramma ir dr
 BrowserIsKO=Jūs izmantojat tīmekļa pārlūku %s. Šī pārlūka informācija ir slikta izvēle drošībai, veiktspējai un uzticamībai. Mēs iesakām izmantot Firefox, Chrome, Opera vai Safari.
 PHPModuleLoaded=Tiek ielādēts PHP komponents %s
 PreloadOPCode=Tiek izmantots iepriekš ielādēts OPCode
-AddRefInList=Rādīt klientu / pārdevēju ref. info saraksts (atlasiet sarakstu vai kombinēto) un lielākā daļa hipersaites. <br> Trešās puses parādīsies ar nosaukumu "CC12345 - SC45678 - Lielais uzņēmums". "Lielā uzņēmuma korpuss" vietā.
-AddVatInList=Parādīt klienta/pārdevēja PVN numuru. informācijas saraksts (atlasiet sarakstu vai kombinēto lodziņu).
-AddAdressInList=Rādīt klienta / pārdevēja adrešu sarakstu (izvēlieties sarakstu vai kombināciju) <br> Trešās puses parādīsies ar nosaukumu "Lielās kompānijas korpuss - 21 lēkt iela 123456", nevis "Lielā uzņēmuma korpuss".
+AddRefInList=Parādīt klienta/piegādātāja atsauci kombinētajos sarakstos. <br> Trešās puses tiks rādītas ar nosaukuma formātu "CC12345 - SC45678 - The Big Company corp." "The Big Company corp" vietā.
+AddVatInList=Parādiet klienta/pārdevēja PVN numuru kombinētajos sarakstos.
+AddAdressInList=Parādiet klienta/pārdevēja adresi kombinētajos sarakstos. <br> Trešās puses parādīsies ar nosaukumu "The Big Company corp. - 21 jump street 123456 Big Town - USA", nevis "The Big Company corp".
 AddEmailPhoneTownInContactList=Parādīt kontaktpersonas e-pastu (vai tālruņus, ja tie nav definēti) un pilsētas informācijas sarakstu (atlasīt sarakstu vai kombinēto lodziņu) 59 65 66 - Parīze ", nevis" Dupond Durand ".
 AskForPreferredShippingMethod=Pieprasiet vēlamo piegādes metodi trešajām pusēm.
 FieldEdition=Izdevums lauka %s
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=E-pasta paziņojumu moduļa iestatīšana
 NotificationEMailFrom=Sūtītāja e-pasts (no) e-pastiem, ko nosūtījis Paziņojumu modulis
 FixedEmailTarget=Saņēmējs
-NotificationDisableConfirmMessageFix=Atspējojiet paziņojumu informāciju apstiprinājuma ziņojumā, lai saņemtu paziņojumu par labojumu
-NotificationDisableConfirmMessageUser=Atspējojiet paziņojumu informāciju lietotāja paziņojuma apstiprināšanas ziņojumā
+NotificationDisableConfirmMessageContact=Paslēpiet paziņojumu adresātu sarakstu (abonēts kā kontaktpersona) apstiprinājuma ziņojumā
+NotificationDisableConfirmMessageUser=Apstiprinājuma ziņojumā paslēpiet paziņojumu adresātu sarakstu (abonēts kā lietotājs).
+NotificationDisableConfirmMessageFix=Apstiprinājuma ziņojumā paslēpiet paziņojumu adresātu sarakstu (abonēts kā globālais e-pasts).
 ##### Sendings #####
 SendingsSetup=Piegādes moduļa iestatīšana
 SendingsReceiptModel=Nosūtot saņemšanas modeli
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Brīvais teksts piegādes dokumentiem
 ##### FCKeditor #####
 AdvancedEditor=Uzlabotais redaktors
 ActivateFCKeditor=Aktivizēt uzlabotos redaktoru:
-FCKeditorForNotePublic=WYSIWIG lauka izveide/izdevums elementu publiskās piezīmes
-FCKeditorForNotePrivate=WYSIWIG lauka izveidošana/izdevums elementu privātas piezīmes
+FCKeditorForNotePublic=WYSIWIG elementu lauka "publiskās piezīmes" izveide/izdošana
+FCKeditorForNotePrivate=WYSIWIG elementu lauka "privātās piezīmes" izveide/izdošana
 FCKeditorForCompany=WYSIWIG elementu (izņemot produktus/pakalpojumus) lauka apraksta izveide/izdevums
 FCKeditorForProduct=WYSIWIG produktu/pakalpojumu lauka apraksta izveide/izdevums
 FCKeditorForProductDetails=WYSIWIG produktu detaļu līniju izveide / izdevums visām vienībām (priekšlikumi, pasūtījumi, rēķini utt.). <span class="warning"> Brīdinājums: Šīs opcijas izmantošana šajā gadījumā nav ieteicama, jo, veidojot PDF failus, tas var radīt problēmas ar īpašām rakstzīmēm un lapu formatēšanu. </span>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Moduļa Expense Reports iestatīšana - noteikumi
 ExpenseReportNumberingModules=Izdevumu pārskatu numerācijas modulis
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Varat atrast e-pasta paziņojumu iespējas, iespējot un konfigurējot moduli "Paziņošana".
+TemplatesForNotifications=Paziņojumu veidnes
 ListOfNotificationsPerUser=Automātisko paziņojumu saraksts katram lietotājam*
 ListOfNotificationsPerUserOrContact=Iespējamo automātisko paziņojumu (par biznesa notikumu) saraksts, kas pieejams katram lietotājam* vai kontaktam**
 ListOfFixedNotifications=Automātisko fiksēto paziņojumu saraksts
@@ -1916,6 +1917,8 @@ 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)
+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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Vai vēlaties savākt šīs kolekcijas kolekciju ta
 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=Ierakstiet e-pasta notikumu
-CreateLeadAndThirdParty=Izveidot vadību (un, ja nepieciešams, trešo personu)
-CreateTicketAndThirdParty=Izveidot biļeti (un saiti uz trešo personu, ja tā ir ielādēta iepriekšējās operācijas laikā)
+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 iepriekšējās darbības rezultātā, 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=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
@@ -2078,7 +2082,7 @@ CreateCandidature=Izveidot darba pieteikumu
 FormatZip=Pasta indekss
 MainMenuCode=Izvēlnes ievades kods (mainmenu)
 ECMAutoTree=Rādīt automātisko ECM koku
-OperationParamDesc=Definējiet vērtības, kuras jāizmanto darbības objektam, vai kā iegūt vērtības. Piemēram: <br> objproperty1 = SET: vērtība, kas noteikta <br> objproperty2 = SET: vērtība nomainot __objproperty1__ <br> objproperty3 = SETIFEMPTY: vērtība, ko izmanto, ja objproperty3 jau nav definēts <br> objproperty4 = ekstrakts: HEADER: X-Myheaderkey: \\ s * ([^ \\ s] *) <br> options_myextrafield1 = EKSTRAKTS: PRIEKŠMETS: ([^ & # 92; n] *) <br> object.objproperty5 = EXTRACT: BODY: Mana uzņēmuma nosaukums ir \\ ((^ ^ sf * *) a0342 <br> Izmantojiet a; char kā atdalītājs, lai iegūtu vai iestatītu vairākas īpašības.
+OperationParamDesc=Definējiet noteikumus, kas jāizmanto, lai iegūtu vai iestatītu vērtības. <br> Piemērs darbībām, kurām nepieciešams izvilkt nosaukumu no e-pasta tēmas: <br> name=EXTRACT:SUBJECT:Ziņojums no uzņēmuma ([^\n] *) <br> Piemērs darbībām, kas rada objekti: <br> objproperty1 = SET: vērtība, kas noteikta <br> objproperty2 = SET: vērtība, ieskaitot vērtības __objproperty1__ <br> objproperty3 = SETIFEMPTY: vērtība, ko izmanto, ja objproperty3 jau nav definēts <br> objproperty4 = ekstrakts: HEADER :X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:s(uzņēmums [^\\s]*) <br> <br> Izmantojiet ; char kā atdalītājs, lai iegūtu vai iestatītu vairākas īpašības.
 OpeningHours=Darba laiks
 OpeningHoursDesc=Ievadiet šeit sava uzņēmuma pastāvīgo darba laiku.
 ResourceSetup=Resursu moduļa konfigurēšana
@@ -2124,7 +2128,7 @@ 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=Varat izmantot šo darbību, lai izmantotu e -pasta saturu, lai atrastu un ielādētu esošu trešo personu savā datu bāzē. Atrastā (vai izveidotā) trešā puse tiks izmantota turpmākām darbībām, kurām tā nepieciešama. <br> Piemēram, ja vēlaties izveidot trešo personu ar nosaukumu, kas atrasts virknē “Vārds: vārds, ko atrast”, atrodams pamattekstā, izmantojiet sūtītāja e -pastu kā e -pastu, varat iestatīt parametru lauku šādi: <br> 'email = HEADER: ^No: (.*); 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?
@@ -2209,3 +2213,10 @@ 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
 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=Katrs terminālis izmanto savu skaitītāju.
+FillAndSaveAccountIdAndSecret=Vispirms aizpildiet un saglabājiet konta ID un noslēpumu
+PreviousHash=Iepriekšējais hash
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index d66e95ae06c..b8cdb746603 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -32,7 +32,7 @@ RIB=Bankas konta numurs
 IBAN=IBAN numurs
 BIC=BIC/SWIFT kods
 SwiftValid=BIC / SWIFT derīgs
-SwiftVNotalid=BIC/SWIFT nav derīgs
+SwiftNotValid=BIC/SWIFT nav derīgs
 IbanValid=Derīgs BAN
 IbanNotValid=BAN nav derīgs
 StandingOrders=Tiešā debeta pasūtījumi
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bankas adrese
 BankAccountCountry=Konta valsts
 BankAccountOwner=Konta īpašnieka vārds
 BankAccountOwnerAddress=Konta īpašnieka adrese
-RIBControlError=Vērtību integritātes pārbaude neizdevās. Tas nozīmē, ka informācija par šī konta numuru nav pilnīga vai ir nepareiza (pārbaudiet valsti, numurus un IBAN).
 CreateAccount=Izveidot kontu
 NewBankAccount=Jauns konts
 NewFinancialAccount=Jauns finanšu konts
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index ae3a25c39d0..c1c3116e49a 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
-DefaultPaymentMode=Noklusējuma maksājuma veids
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 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
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Maksājuma termiņš
 PaymentConditions=Maksājuma nosacījumi
 PaymentConditionsShort=Maksājuma nosacījumi
@@ -241,12 +240,12 @@ RemainderToTake=Atlikusī summa, kas jāsaņem
 RemainderToTakeMulticurrency=Atlikušā summa, kas jāņem, sākotnējā valūta
 RemainderToPayBack=Atlikušā summa atmaksai
 RemainderToPayBackMulticurrency=Atlikusī atmaksājamā summa, sākotnējā valūta
-NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessRefunded=negatīvs, ja tiek atmaksāta pārpalikuma summa
 Rest=Gaida
 AmountExpected=Pieprasītā summa
 ExcessReceived=Saņemts pārpalikums
 ExcessReceivedMulticurrency=Pārpalikums saņemts, sākotnējā valūta
-NegativeIfExcessReceived=negative if excess received
+NegativeIfExcessReceived=negatīvs, ja saņemts pārpalikums
 ExcessPaid=Pārmaksātā summa
 ExcessPaidMulticurrency=Pārmaksāta sākotnējā valūta
 EscompteOffered=Piedāvāta atlaide (maksājums pirms termiņa)
@@ -280,6 +279,7 @@ SetMode=Izvēlaties maksājuma veidu
 SetRevenuStamp=Set revenue stamp
 Billed=Samaksāts
 RecurringInvoices=Atkārtoti rēķini
+RecurringInvoice=Periodisks rēķins
 RepeatableInvoice=Rēķina paraugs
 RepeatableInvoices=Rēķinu paraugs
 Repeatable=Sagateve
@@ -449,6 +449,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
@@ -604,3 +606,4 @@ SituationTotalProgress=Kopējais progress %d %%
 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
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/bookmarks.lang b/htdocs/langs/lv_LV/bookmarks.lang
index 4d01ad354e2..6a5ed291102 100644
--- a/htdocs/langs/lv_LV/bookmarks.lang
+++ b/htdocs/langs/lv_LV/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Behaviour when a bookmark URL is selected
 CreateBookmark=Izveidot grāmatzīmi
 SetHereATitleForLink=Ierakstiet grāmatzīmes nosaukumu
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Izmantojiet ārēju/absolūtu saiti (https://URL) vai iekšējo/relatīvo saiti (/DOLIBARR_ROOT/ htdocs/...)
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Izmantojiet ārējo/absolūto saiti (https://externalurl.com) vai iekšējo/relatīvo saiti (/mypage.php). Varat arī izmantot tālruni, piemēram, tel:0123456.
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Izvēlieties, vai saistītā lapa jāatver pašreizējā cilnē vai jaunā cilnē
 BookmarksManagement=Grāmatzīmju vadība
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/lv_LV/cashdesk.lang b/htdocs/langs/lv_LV/cashdesk.lang
index 787ca226a04..c9003a48888 100644
--- a/htdocs/langs/lv_LV/cashdesk.lang
+++ b/htdocs/langs/lv_LV/cashdesk.lang
@@ -133,4 +133,4 @@ SplitSale=Sadalīta pārdošana
 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=Year is not defined
+YearNotDefined=Gads nav noteikts
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index a9fcadde45e..60de56f60d6 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Tirdzniecības reģistrs)
+ProfId2CM=Id. prof. 2 (nodokļu maksātāja Nr.)
+ProfId3CM=Id. prof. 3 (dibināšanas dekrēts)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Tirdzniecības reģistrs
+ProfId2ShortCM=Nodokļu maksātājs Nr.
+ProfId3ShortCM=Radīšanas dekrēts
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof ID 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Pārbaudīt
 VATIntraCheckDesc=PVN ID ir jāiekļauj valsts prefikss. Saite <b> %s </b> izmanto Eiropas PVN pārbaudes pakalpojumu (VIES), kas pieprasa interneta piekļuvi no Dolibarr servera.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Pārbaudiet Kopienas iekšējo PVN identifikācijas numuru Eiropas Komisijas tīmekļa vietnē
-VATIntraManualCheck=Jūs varat manuāli pārbaudīt arī Eiropas Komisijas vietnē <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=Varat arī manuāli pārbaudīt Eiropas Komisijas tīmekļa vietnē <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Pārbaude nav iespējams. Pārbaudes pakalpojums netiek nodrošināts no dalībvalsts (%s).
 NorProspectNorCustomer=Nav izredzes, ne klients
 JuridicalStatus=Uzņēmējdarbības vienības tips
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index d09bafbd74b..b6e4d087006 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -170,8 +170,9 @@ SeeReportInInputOutputMode=Skatiet <b> %s maksājumu analīzi s%s </b> aprēķin
 SeeReportInDueDebtMode=Skatiet <b> %sanalizēto dokumentu analīzi s%s </b>, lai aprēķinātu, pamatojoties uz zināmiem <b> ierakstītiem dokumentiem </b>, pat ja tie vēl nav
 SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Uzrādītās summas ir ar visiem nodokļiem
-RulesResultDue=- Tas ietver nesamaksātos rēķinus, izdevumus, PVN, ziedojumus neatkarīgi no tā, vai tie ir samaksāti. Ietver arī algas. <br> - tas ir balstīts uz rēķinu izrakstīšanas datumu un izdevumu vai nodokļu samaksas termiņu. Algām, kas noteiktas ar Algas moduli, tiek izmantots maksājuma valutēšanas datums.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+RulesAmountWithTaxExcluded=- Rēķinu summas ir norādītas ar visiem nodokļiem
+RulesResultDue=- Tas ietver visus rēķinus, izdevumus, PVN, ziedojumus, algas neatkarīgi no tā, vai tie ir vai nav samaksāti. <br> — tas ir balstīts uz rēķinu izrakstīšanas datumu un izdevumu vai nodokļu maksājumu apmaksas datumu. Algām tiek izmantots perioda beigu datums.
+RulesResultInOut=- Tas ietver reālos maksājumus par rēķiniem, izdevumus, PVN un algas. <br> — tas ir balstīts uz rēķinu, izdevumu, PVN, ziedojumu un algu apmaksas datumiem.
 RulesCADue=- Tajā ir iekļauti klienta rēķini, par kuriem ir samaksāts. <br> - tas ir balstīts uz šo rēķinu apmaksas datumu. <br>
 RulesCAIn=- Tas ietver visus no klientiem saņemto rēķinu faktiskos maksājumus. <br> - Tas ir balstīts uz šo rēķinu apmaksas datumu
 RulesCATotalSaleJournal=Tas ietver visas kredītlīnijas no pārdošanas žurnāla.
@@ -295,3 +296,5 @@ InvoiceNotLate30Days = Jāsavāc (> 30 dienas)
 InvoiceToPay=Lai samaksātu (< 15 dienas)
 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?
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index cf1906edd27..58997394f1d 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -27,7 +27,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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Nespēj iegūt RSS barotni. Centieties, lai pievienotu
 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=Atļaujas šajā lapā var definēt Dolibarr administrators no izvēlnes %s->%s.
 ErrorForbidden3=Šķiet, ka Dolibarr netiek izmantota, izmantojot autentiskums sesiju. Ieskatieties Dolibarr uzstādīšanas dokumentācijas zināt, kā pārvaldīt apstiprinājumi (Htaccess, mod_auth vai citu ...).
+ErrorForbidden4=Piezīme: notīriet pārlūkprogrammas sīkfailus, lai iznīcinātu esošās šī pieteikšanās sesijas.
 ErrorNoImagickReadimage=Klases Imagick nav atrodams šajā PHP. Priekšskatījums nav, var būt pieejamas. Administratori var atspējot šo uzlīmi no izvēlnes Setup - displejs.
 ErrorRecordAlreadyExists=Ieraksts jau eksistē
 ErrorLabelAlreadyExists=Šis nosaukums jau pastāv
@@ -271,6 +274,9 @@ 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=Neatļauta rakstzīme pieteikšanās vārdā
+ErrorRequestTooLarge=Error, request too large
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Jūsu PHP parametrs upload_max_filesize (%s) ir augstāks nekā PHP parametrs post_max_size (%s). Šī nav konsekventa iestatīšana.
@@ -312,6 +318,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..3afd7a79508 100644
--- a/htdocs/langs/lv_LV/eventorganization.lang
+++ b/htdocs/langs/lv_LV/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategorija, ko pievienot trešajām pu
 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 +71,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 +84,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
diff --git a/htdocs/langs/lv_LV/help.lang b/htdocs/langs/lv_LV/help.lang
index 0482ffc903b..b85de3a06d7 100644
--- a/htdocs/langs/lv_LV/help.lang
+++ b/htdocs/langs/lv_LV/help.lang
@@ -20,4 +20,4 @@ BackToHelpCenter=Pretējā gadījumā <a href="%s"> atveriet palīdzības centra
 LinkToGoldMember=Jūs varat piezvanīt uz vienu no Dolibarr izvēlētām instruktoru valodām (%s), noklikšķinot uz tās logrīka (statuss un maksimālā cena tiek automātiski atjaunināta):
 PossibleLanguages=Atbalstītās valodas
 SubscribeToFoundation=Palīdziet Dolibarr projektam, abonējiet fondu
-SeeOfficalSupport=Oficiālaiā Dolibarr palīdzība jūsu valodā: <br><b><a href="%s" target="_blank">%s</a></b>
+SeeOfficalSupport=Lai iegūtu oficiālu Dolibarr atbalstu jūsu valodā: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> a09a4b739f17f8z
diff --git a/htdocs/langs/lv_LV/holiday.lang b/htdocs/langs/lv_LV/holiday.lang
index 8268531c810..5b29fb9dd97 100644
--- a/htdocs/langs/lv_LV/holiday.lang
+++ b/htdocs/langs/lv_LV/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Apraksts
 SendRequestCP=Izveidot atvaļinājuma pieprasījumu
 DelayToRequestCP=Atvaļinājumu pieprasījumi jāiesniedz vismaz <b>%s dienā (-ās)</b> pirms tā.
 MenuConfCP=Atvaļinājuma atlikums
-SoldeCPUser=Atvaļinājumu līdzsvars ir <b> %s </b> dienas.
+SoldeCPUser=Atlikums (dienās) <b> %s </b>
 ErrorEndDateCP=Jums ir jāizvēlas beigu datumu lielāks par sākuma datums.
 ErrorSQLCreateCP=SQL kļūda izveides laikā:
 ErrorIDFicheCP=Kļūda, atvaļinājuma pieprasījums neeksistē.
@@ -134,3 +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=Block if balance negative
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=The creation of this leave request is blocked because your balance is negative
+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 2debdd93a95..24727d83443 100644
--- a/htdocs/langs/lv_LV/hrm.lang
+++ b/htdocs/langs/lv_LV/hrm.lang
@@ -20,13 +20,14 @@ Employee=Darbinieks
 NewEmployee=Jauns darbinieks
 ListOfEmployees=Darbinieku saraksts
 HrmSetup=HRM moduļa iestatīšana
-HRM_MAXRANK=Maksimālais vērtējums prasmēm
+SkillsManagement=Prasmju vadība
+HRM_MAXRANK=Maksimālais līmeņu skaits, lai noteiktu prasmi
 HRM_DEFAULT_SKILL_DESCRIPTION=Pakāpju noklusējuma apraksts, kad tiek izveidota prasme
 deplacement=Shift
 DateEval=Novērtēšanas datums
 JobCard=Darba karte
-Job=Darbs
-Jobs=Darbavietas
+JobPosition=Darbs
+JobsPosition=Darbavietas
 NewSkill=Jauna prasme
 SkillType=Prasmju veids
 Skilldets=Šīs prasmes kategoriju saraksts
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Vai tiešām vēlaties apstiprināt šo novērtējumu
 EvaluationCard=Novērtēšanas karte
 RequiredRank=Nepieciešamā pakāpe šim darbam
 EmployeeRank=Darbinieka pakāpe par šo prasmi
-Position=Pozīcija
-Positions=Pozīcijas
-PositionCard=Pozīcijas karte
+EmployeePosition=Darbinieka amats
+EmployeePositions=Darbinieku amati
 EmployeesInThisPosition=Darbinieki šajā amatā
 group1ToCompare=Analizējamā lietotāju grupa
 group2ToCompare=Otrā lietotāju grupa salīdzināšanai
diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang
index 0c1a618b7b3..97b89006a76 100644
--- a/htdocs/langs/lv_LV/install.lang
+++ b/htdocs/langs/lv_LV/install.lang
@@ -21,6 +21,7 @@ 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ē.
diff --git a/htdocs/langs/lv_LV/knowledgemanagement.lang b/htdocs/langs/lv_LV/knowledgemanagement.lang
index 683f695d873..007279c1986 100644
--- a/htdocs/langs/lv_LV/knowledgemanagement.lang
+++ b/htdocs/langs/lv_LV/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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ā)
 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/ldap.lang b/htdocs/langs/lv_LV/ldap.lang
index 73af7425eaf..92eaf8ac54f 100644
--- a/htdocs/langs/lv_LV/ldap.lang
+++ b/htdocs/langs/lv_LV/ldap.lang
@@ -4,24 +4,28 @@ UserMustChangePassNextLogon=Lietotājam ir jāmaina domēna %s  parole
 LDAPInformationsForThisContact=Informācija LDAP datubāzē šim kontaktam
 LDAPInformationsForThisUser=Informācija LDAP datubāzē šim lietotājam
 LDAPInformationsForThisGroup=Informācija LDAP datubāzē šai grupai
-LDAPInformationsForThisMember=Informācija LDAP datubāzē šim loceklim
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPInformationsForThisMember=Informācija LDAP datubāzē šim dalībniekam
+LDAPInformationsForThisMemberType=Informācija LDAP datubāzē šim dalībnieka veidam
 LDAPAttributes=LDAP atribūti
 LDAPCard=LDAP karte
-LDAPRecordNotFound=Ierakstīt nav atrasts LDAP datubāzē
+LDAPRecordNotFound=Ieraksts nav atrasts LDAP datubāzē
 LDAPUsers=Lietotāji LDAP datu bāzē
 LDAPFieldStatus=Statuss
 LDAPFieldFirstSubscriptionDate=Pirmais abonēšanas datums
 LDAPFieldFirstSubscriptionAmount=Pirmais parakstīšanās summu
-LDAPFieldLastSubscriptionDate=Jaunākais piereģistrēšanās datums
-LDAPFieldLastSubscriptionAmount=Latest subscription amount
+LDAPFieldLastSubscriptionDate=Jaunākais reģistrēšanas datums
+LDAPFieldLastSubscriptionAmount=Jaunākā abonēšanas summa
 LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Piemērs : skypeNosaukums
+LDAPFieldSkypeExample=Piemērs: skypeNosaukums
 UserSynchronized=Lietotājs sinhronizēts
 GroupSynchronized=Grupa sinhronizēta
 MemberSynchronized=Biedrs sinhronizēts
 MemberTypeSynchronized=Dalībnieka veids ir sinhronizēts
 ContactSynchronized=Kontakti sinhronizēti
 ForceSynchronize=Forsēt sinhronizāciju Dolibarr -> LDAP
-ErrorFailedToReadLDAP=Neizdevās nolasīt LDAP datu bāzi. Pārbaudiet LDAP modulis uzstādīšanas un datu bāzes pieejamību.
+ErrorFailedToReadLDAP=Neizdevās nolasīt LDAP datu bāzi. Pārbaudiet LDAP moduļa iestatījumus un datubāzes pieejamību.
 PasswordOfUserInLDAP=Lietotāja LDAP parole
+LDAPPasswordHashType=Paroles jaukšanas veids
+LDAPPasswordHashTypeExample=Serverī izmantotā paroles jaukšanas veids
+SupportedForLDAPExportScriptOnly=To atbalsta tikai ldap eksporta skripts
+SupportedForLDAPImportScriptOnly=To atbalsta tikai ldap importēšanas skripts
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 58aa916a008..127cfdc0446 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Kļūda, PVN likme nav definēta sekojoša
 ErrorNoSocialContributionForSellerCountry=Kļūda, sociālā/fiskālā rakstura nodokļi nav definēti valstī “%s”.
 ErrorFailedToSaveFile=Kļūda, neizdevās saglabāt failu.
 ErrorCannotAddThisParentWarehouse=Jūs mēģināt pievienot vecāku noliktavu, kas jau ir esošās noliktavas bērns
+FieldCannotBeNegative=Lauks "%s" nevar būt negatīvs
 MaxNbOfRecordPerPage=Maks. ierakstu skaits lapā
 NotAuthorized=Jums nav tiesību, lai veiktu šo darbību.
 SetDate=Iestatīt datumu
@@ -87,7 +88,7 @@ FileWasNotUploaded=Fails ir izvēlēts pielikumam,  bet vēl nav augšupielādē
 NbOfEntries=Ierakstu skaits
 GoToWikiHelpPage=Lasīt tiešsaistes palīdzību (nepieciešams interneta piekļuve)
 GoToHelpPage=Lasīt palīdzību
-DedicatedPageAvailable=Ir īpaša palīdzības lapa, kas saistīta ar jūsu pašreizējo ekrānu
+DedicatedPageAvailable=Īpaša palīdzības lapa, kas saistīta ar jūsu pašreizējo ekrānu
 HomePage=Mājas lapa
 RecordSaved=Ieraksts saglabāts
 RecordDeleted=Ieraksts dzēsts
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Atgriešanas kods jaunākās datu bāzes piekļuves
 InformationLastAccessInError=Information for latest database access request error
 DolibarrHasDetectedError=Dolibarr ir atklājis tehnisku kļūdu
 YouCanSetOptionDolibarrMainProdToZero=Jūs varat izlasīt žurnāla failu vai iestatīt opciju $ dolibarr_main_prod uz '0' savā konfigurācijas failā, lai iegūtu vairāk informācijas.
-InformationToHelpDiagnose=Šī informācija var būt noderīga diagnostikas nolūkos (jūs varat iestatīt iespēju $ dolibarr_main_prod uz "1", lai noņemtu šādus paziņojumus).
+InformationToHelpDiagnose=Šī informācija var būt noderīga diagnostikas nolūkos (varat iestatīt opciju $dolibarr_main_prod uz "1", lai paslēptu sensitīvu informāciju)
 MoreInformation=Vairāk informācijas
 TechnicalInformation=Tehniskā informācija
 TechnicalID=Tehniskais ID
@@ -211,6 +212,8 @@ User=Lietotājs
 Users=Lietotāji
 Group=Grupa
 Groups=Grupas
+UserGroup=Lietotāju grupa
+UserGroups=Lietotāju grupas
 NoUserGroupDefined=Nav definēta neviena lietotāju grupa
 Password=Parole
 PasswordRetype=PArole atkārtoti
@@ -906,7 +909,7 @@ ViewFlatList=Skatīt plakanu sarakstu
 ViewAccountList=Skatīt virsgrāmatu
 ViewSubAccountList=Skatīt apakškonta virsgrāmatu
 RemoveString=Noņemt virkni '%s'
-SomeTranslationAreUncomplete=Dažas piedāvātās valodas var būt tikai daļēji tulkotas vai var saturēt kļūdas. Lūdzu, palīdziet labot savu valodu, reģistrējoties <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a>, lai pievienotu savus uzlabojumus.
+SomeTranslationAreUncomplete=Dažas no piedāvātajām valodām var būt tikai daļēji tulkotas vai satur kļūdas. Lūdzu, palīdziet labot valodu, reģistrējoties vietnē <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/ </a>, lai pievienotu savus uzlabojumus.
 DirectDownloadLink=Publiska lejupielādes saite
 PublicDownloadLinkDesc=Lai lejupielādētu failu, nepieciešama tikai saite
 DirectDownloadInternalLink=Privāta lejupielādes saite
@@ -1158,4 +1161,6 @@ Properties=Rekvizīti
 hasBeenValidated=%s ir apstiprināts
 ClientTZ=Klienta laika zona (lietotāja)
 NotClosedYet=Vēl nav slēgts
-ClearSignature=Paraksta atiestatīšana
+ClearSignature=Atiestatīt parakstu
+CanceledHidden=Atcelts paslēpts
+CanceledShown=Parādīts atcelts
diff --git a/htdocs/langs/lv_LV/modulebuilder.lang b/htdocs/langs/lv_LV/modulebuilder.lang
index 8c24705769b..23d593acb60 100644
--- a/htdocs/langs/lv_LV/modulebuilder.lang
+++ b/htdocs/langs/lv_LV/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Šo rīku izmanto tikai pieredzējuši lietotāji vai izstrādātāji. Tas nodrošina komunālo pakalpojumu, lai izveidotu vai rediģētu savu moduli. Šeit ir dokumentācija alternatīvai <a href="%s" target="_blank">manuālai izstrādei</a> .
+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.
 ModuleBuilderDesc2=Ceļš, kurā tiek ģenerēti / rediģēti moduļi (pirmais ārējo moduļu katalogs, kas definēts %s): <strong> %s </strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Jūsu moduļa / lietojumprogrammas piedāvātās izvēlnes i
 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> ').
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
+TriggerDefDesc=Sprūda failā definējiet kodu, kuru vēlaties izpildīt, kad tiek izpildīts biznesa notikums ārpus jūsu moduļa (notikumi, ko aktivizē citi moduļi).
 SeeIDsInUse=Skatiet jūsu instalācijā izmantotos ID
 SeeReservedIDsRangeHere=Skatiet rezervēto ID diapazonu
 ToolkitForDevelopers=Dolibarr izstrādātāju rīks
diff --git a/htdocs/langs/lv_LV/mrp.lang b/htdocs/langs/lv_LV/mrp.lang
index ac9d56d7d9c..0c06f88010e 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
diff --git a/htdocs/langs/lv_LV/oauth.lang b/htdocs/langs/lv_LV/oauth.lang
index defd31b4462..ba808ac55e7 100644
--- a/htdocs/langs/lv_LV/oauth.lang
+++ b/htdocs/langs/lv_LV/oauth.lang
@@ -23,10 +23,10 @@ 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=Lai izveidotu OAuth akreditācijas datus, dodieties uz <a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> šo lapu </a> un pēc tam "Kvalifikācijas dati"
+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"> šo lapu </a> un pēc tam "Reģistrējiet jaunu pieteikumu", lai izveidotu OAuth akreditācijas datus
+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_STRIPE_TEST_NAME=OAuth svītras tests
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index b5754af5835..13b78f66cbc 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -258,6 +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=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
@@ -268,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
diff --git a/htdocs/langs/lv_LV/partnership.lang b/htdocs/langs/lv_LV/partnership.lang
index fd72bd91fc7..48427c3321d 100644
--- a/htdocs/langs/lv_LV/partnership.lang
+++ b/htdocs/langs/lv_LV/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Partnerības vadība
 PartnershipDescription=Partnerības vadības modulis
 PartnershipDescriptionLong= Partnerības vadības modulis
-
+Partnership=Partnerība
 AddPartnership=Pievienojiet partnerību
 CancelPartnershipForExpiredMembers=Partnerība: atceļ partnerību ar abonementiem, kuriem beidzies derīguma termiņš
 PartnershipCheckBacklink=Partnerība: pārbaudiet atsauces saiti
@@ -58,7 +58,7 @@ ManagePartnership=Pārvaldiet partnerību
 BacklinkNotFoundOnPartnerWebsite=Atpakaļsaite nav atrasta partnera vietnē
 ConfirmClosePartnershipAsk=Vai tiešām vēlaties atcelt šo partnerību?
 PartnershipType=Partnerības veids
-PartnershipRefApproved=Partnership %s approved
+PartnershipRefApproved=Partnerība %s apstiprināta
 
 #
 # Template Mail
diff --git a/htdocs/langs/lv_LV/paybox.lang b/htdocs/langs/lv_LV/paybox.lang
index 4577578ff66..bb989c41c1e 100644
--- a/htdocs/langs/lv_LV/paybox.lang
+++ b/htdocs/langs/lv_LV/paybox.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=PayBox moduļa iestatīšana
-PayBoxDesc=Šis modulis piedāvā lapas, lai ļautu maksājumus par <a href="http://www.paybox.com" target="_blank">Paybox</a> ar klientiem. To var izmantot par brīvu maksājumu vai maksājumu par konkrētu Dolibarr objektu (rēķins, rīkojums, ...)
+PayBoxDesc=Šis modulis piedāvā lapas, kas ļauj klientiem veikt maksājumus <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external"> Paybox </a>. To var izmantot bezmaksas maksājumam vai maksājumam par konkrētu Dolibarr objektu (rēķins, pasūtījums, ...)
 FollowingUrlAreAvailableToMakePayments=Pēc URL ir pieejami, lai piedāvātu lapu, lai klients varētu veikt maksājumu par Dolibarr objektiem
 PaymentForm=Maksājuma formu
 WelcomeOnPaymentPage=Laipni lūdzam mūsu tiešsaistes maksājumu pakalpojumu
@@ -20,7 +20,6 @@ AccountParameter=Konta parametri
 UsageParameter=Izmantošanas parametri
 InformationToFindParameters=Palīdzēt atrast savu %s konta informāciju
 PAYBOX_CGI_URL_V2=URL Paybox CGI modulis par samaksu
-VendorName=Pārdevēja nosaukums
 CSSUrlForPaymentForm=CSS stila lapas url maksājuma formu
 NewPayboxPaymentReceived=Jauns Paybox maksājums saņemts
 NewPayboxPaymentFailed=Jauns Paybox maksājums mēģināju, bet neizdevās
diff --git a/htdocs/langs/lv_LV/paypal.lang b/htdocs/langs/lv_LV/paypal.lang
index d54db74aecb..50ff6da59c2 100644
--- a/htdocs/langs/lv_LV/paypal.lang
+++ b/htdocs/langs/lv_LV/paypal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal moduļa iestatīšana
-PaypalDesc=Šis modulis ļauj klientiem veikt maksājumus, izmantojot <a href="http://www.paypal.com" target="_blank"> PayPal </a>. To var izmantot īpašam maksājumam vai maksājumam, kas saistīts ar Dolibarr objektu (rēķins, pasūtījums, ...)
+PaypalDesc=Šis modulis ļauj klientiem veikt maksājumus, izmantojot <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPal </a>. To var izmantot ad hoc maksājumam vai maksājumam, kas saistīts ar Dolibarr objektu (rēķins, pasūtījums, ...)
 PaypalOrCBDoPayment=Maksājiet ar PayPal (karti vai PayPal)
 PaypalDoPayment=Maksāt ar PayPal
 PAYPAL_API_SANDBOX=Režīma pārbaude/smilšu kaste
diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang
index 8031049dcd1..d9d60b4425b 100644
--- a/htdocs/langs/lv_LV/productbatch.lang
+++ b/htdocs/langs/lv_LV/productbatch.lang
@@ -30,7 +30,7 @@ ManageLotMask=Pielāgota maska
 CustomMasks=Iespēja katram produktam noteikt atšķirīgu numerācijas masku
 BatchLotNumberingModules=Numerācijas noteikums partijas numura automātiskai ģenerēšanai
 BatchSerialNumberingModules=Numerācijas noteikums automātiskai sērijas numura ģenerēšanai (produktiem ar īpašību 1 unikāla partija / sērija katram produktam)
-QtyToAddAfterBarcodeScan=Katram skenētajam svītrkodam / partijai / sērijai jāpievieno daudzums
+QtyToAddAfterBarcodeScan=Daudzums līdz %s par katru skenēto svītrkodu/sēriju/sēriju
 LifeTime=Mūža ilgums (dienās)
 EndOfLife=Dzīves beigas
 ManufacturingDate=Ražošanas datums
@@ -42,3 +42,4 @@ HideLots=Slēpt daudz
 #Traceability - qc status
 OutOfOrder=Nedarbojas
 InWorkingOrder=Darba kārtībā
+ToReplace=Aizvietot
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index e13e9709ac3..fb90f8b5cff 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Summa, kas jāizmanto vidējās svērtās cenas atjauninā
 PMPValue=Vidējā svērtā cena
 PMPValueShort=VSC
 mandatoryperiod=Obligātie periodi
-mandatoryPeriodNeedTobeSet=Uzmanību periodi nav ievadīti un ir obligāti
+mandatoryPeriodNeedTobeSet=Piezīme. Periods (sākuma un beigu datums) ir jādefinē
 mandatoryPeriodNeedTobeSetMsgValidate=Pakalpojumam ir nepieciešams sākuma un beigu periods
-mandatoryHelper=Ziņojums lietotājam par nepieciešamību ievadīt pakalpojuma sākuma datumu un beigu datumu, veidojot / apstiprinot rēķinu, komerciālu piedāvājumu, pārdošanas pasūtījumu. <br> Šī darbība netiek bloķēta apstiprināšanas procesā
+mandatoryHelper=Atzīmējiet šo, ja vēlaties saņemt ziņojumu lietotājam, veidojot/apstiprinot rēķinu, komerciālu piedāvājumu, pārdošanas pasūtījumu, neievadot sākuma un beigu datumu rindās ar šo pakalpojumu. <br> Ņemiet vērā, ka ziņojums ir brīdinājums, nevis bloķēšanas kļūda.
 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
+SwitchOnSaleStatus=Ieslēgt pārdošanas statusu
+SwitchOnPurchaseStatus=Ieslēdziet pirkuma statusu
+StockMouvementExtraFields= Papildu lauki (akciju kustība)
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 677dd5dec6d..fca34c7b1ac 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -197,6 +197,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
@@ -284,3 +285,5 @@ 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
diff --git a/htdocs/langs/lv_LV/receptions.lang b/htdocs/langs/lv_LV/receptions.lang
index 7a61925caac..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
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Pieņemšanas un kvīti par šo pasūtījumu
 ReceptionsToValidate=Pieņemšanas apstiprināšana
 StatusReceptionCanceled=Atcelts
 StatusReceptionDraft=Melnraksts
-StatusReceptionValidated=Apstiprinātas (produkti, uz kuģi vai jau nosūtīti)
+StatusReceptionValidated=Validēts (produkti, kas jāsaņem vai jau saņemti)
+StatusReceptionValidatedToReceive=Validēts (saņemamie produkti)
+StatusReceptionValidatedReceived=Apstiprināts (saņemti produkti)
 StatusReceptionProcessed=Apstrādāts
 StatusReceptionDraftShort=Melnraksts
 StatusReceptionValidatedShort=Apstiprināts
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistika par pieņemšanām tika apstiprināta
 SendReceptionByEMail=Sūtīt saņemšanu pa e-pastu
 SendReceptionRef=Reģistrācijas iesniegšana %s
 ActionsOnReception=Notikumi reģistratūrā
-ReceptionCreationIsDoneFromOrder=Šobrīd jaunas saņemšanas izveide tiek veikta no pirkuma pasūtījuma ieraksta.
+ReceptionCreationIsDoneFromOrder=Pagaidām jaunas pieņemšanas izveide notiek no Pasūtījuma.
 ReceptionLine=Uzņemšanas līnija
 ProductQtyInReceptionAlreadySent=Produkta daudzums no jau nosūtīta pasūtījuma
 ProductQtyInSuppliersReceptionAlreadyRecevied=Produkta daudzums no jau saņemtā pasūtījuma
@@ -46,3 +49,6 @@ ReceptionsReceiptModel=Pieņemšanas dokumentu veidnes
 NoMorePredefinedProductToDispatch=Vairs nav iepriekš nosūtītu produktu
 ReceptionExist=Reģistratūra pastāv
 ByingPrice=Pirkšanas cena
+ReceptionBackToDraftInDolibarr=Saņemšana %s atpakaļ uz melnrakstu
+ReceptionClassifyClosedInDolibarr=Reģistratūra %s klasificēta Slēgta
+ReceptionUnClassifyCloseddInDolibarr=Reģistratūra %s atkal tiek atvērta
diff --git a/htdocs/langs/lv_LV/salaries.lang b/htdocs/langs/lv_LV/salaries.lang
index 5e58ad50751..1f2a1de754e 100644
--- a/htdocs/langs/lv_LV/salaries.lang
+++ b/htdocs/langs/lv_LV/salaries.lang
@@ -24,3 +24,4 @@ SalariesStatistics=Algas statistika
 SalariesAndPayments=Algas un maksājumi
 ConfirmDeleteSalaryPayment=Vai vēlaties dzēst šo algas maksājumu?
 FillFieldFirst=Vispirms aizpildiet darbinieka lauku
+UpdateAmountWithLastSalary=Nosakiet summu ar pēdējo algu
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 4cb686a1add..536bcf9e53e 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -96,7 +96,7 @@ RealStock=Rālie krājumi
 RealStockDesc=Fiziskā / reālā krājumi ir krājumi, kas pašlaik atrodas noliktavās.
 RealStockWillAutomaticallyWhen=Reālais krājums tiks mainīts saskaņā ar šo noteikumu (kā noteikts Stock modulī):
 VirtualStock=Virtuālie krājumi
-VirtualStockAtDate=Virtual stock at a future date
+VirtualStockAtDate=Virtuālie krājumi nākotnē
 VirtualStockAtDateDesc=Virtuālais krājums, kad tiks pabeigti visi neapstiprinātie pasūtījumi, kurus plānots apstrādāt pirms izvēlētā datuma
 VirtualStockDesc=Virtuālais krājums ir aprēķinātais krājums, kas pieejams, kad visas atvērtās / neapstiprinātās darbības (kas ietekmē krājumus) ir aizvērtas (saņemti pirkumu pasūtījumi, nosūtīti pārdošanas pasūtījumi, saražoti ražošanas pasūtījumi utt.)
 AtDate=Datumā
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Brīdinājuma krājumu limits un vēlamais optimāl
 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
 InventoryDate=Inventāra datums
+Inventories=Inventāri
 NewInventory=Jauns inventārs
 inventorySetup = Inventāra iestatīšana
 inventoryCreatePermission=Izveidot jaunu inventāru
@@ -240,7 +241,7 @@ StockAtDatePastDesc=Šeit varat apskatīt krājumus (reālos krājumus) noteikt
 StockAtDateFutureDesc=Šeit varat apskatīt akcijas (virtuālās akcijas) noteiktā datumā nākotnē
 CurrentStock=Pašreizējais krājums
 InventoryRealQtyHelp=Iestatiet vērtību 0, lai atiestatītu daudzumu <br>. Saglabājiet lauku tukšu vai noņemiet līniju, lai paliktu nemainīgs
-UpdateByScaning=Aizpildiet reālo daudzumu, skenējot
+UpdateByScaning=Pabeidziet reālo daudzumu, skenējot
 UpdateByScaningProductBarcode=Atjaunināšana, skenējot (produkta svītrkods)
 UpdateByScaningLot=Atjaunināt, skenējot (partija | sērijas svītrkods)
 DisableStockChangeOfSubProduct=Deaktivizējiet krājumu maiņu visiem šī komplekta apakšproduktiem šīs kustības laikā.
@@ -253,14 +254,20 @@ 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=Aizpildiet reālo daudzumu ar paredzamo daudzumu
+AutofillWithExpected=Aizstāt 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
-FieldCannotBeNegative=Lauks "%s" nevar būt negatīvs
 ErrorWrongBarcodemode=Nezināms svītrkoda režīms
 ProductDoesNotExist=Produkts neeksistē
-ErrorSameBatchNumber=Tas pats partijas numurs, kas atrodams inventāra sarakstā
+ErrorSameBatchNumber=Inventarizācijas lapā tika atrasti vairāki ieraksti par partijas numuru. Nav iespējams zināt, kuru palielināt.
 ProductBatchDoesNotExist=Produkts ar sēriju/sēriju neeksistē
 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.
+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
diff --git a/htdocs/langs/lv_LV/stripe.lang b/htdocs/langs/lv_LV/stripe.lang
index 36d4116396d..38fac068250 100644
--- a/htdocs/langs/lv_LV/stripe.lang
+++ b/htdocs/langs/lv_LV/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Joslas moduļa iestatīšana
-StripeDesc=Piedāvājiet klientiem Stripe tiešsaistes maksājumu lapu maksājumiem ar kredītkartēm / kredītkartēm, izmantojot <a href="http://www.stripe.com" target="_blank"> Stripe </a>. To var izmantot, lai ļautu saviem klientiem veikt ad-hoc maksājumus vai maksājumus, kas saistīti ar konkrētu Dolibarr objektu (rēķins, pasūtījums, ...)
+StripeDesc=Piedāvājiet saviem klientiem tiešsaistes maksājumu lapu maksājumiem ar kredītkartēm/debetkartēm, izmantojot <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a> . To var izmantot, lai ļautu jūsu klientiem veikt ad hoc maksājumus vai maksājumus, kas saistīti ar konkrētu Dolibarr objektu (rēķins, pasūtījums, ...)
 StripeOrCBDoPayment=Maksājiet ar kredītkarti vai Stripe
 FollowingUrlAreAvailableToMakePayments=Pēc URL ir pieejami, lai piedāvātu lapu, lai klients varētu veikt maksājumu par Dolibarr objektiem
 PaymentForm=Maksājuma forma
@@ -28,11 +28,10 @@ AccountParameter=Konta parametri
 UsageParameter=Izmantošanas parametri
 InformationToFindParameters=Palīdzēt atrast savu %s konta informāciju
 STRIPE_CGI_URL_V2=CGI moduļa norēķinu URL
-VendorName=Pārdevēja nosaukums
 CSSUrlForPaymentForm=CSS stila lapas url maksājuma formu
 NewStripePaymentReceived=Saņemta jauna josla maksājums
 NewStripePaymentFailed=New Stripe maksājums tika izmēģināts, bet neizdevās
-FailedToChargeCard=Failed to charge card
+FailedToChargeCard=Neizdevās iekasēt karti
 STRIPE_TEST_SECRET_KEY=Slepena testa atslēga
 STRIPE_TEST_PUBLISHABLE_KEY=Publicējamais testa taustiņš
 STRIPE_TEST_WEBHOOK_KEY=Webhooka testa atslēga
@@ -69,4 +68,4 @@ ToOfferALinkForTestWebhook=Saite uz iestatījumu Stripe WebHook, lai izsauktu IP
 ToOfferALinkForLiveWebhook=Saite uz iestatījumu Stripe WebHook, lai izsauktu IPN (tiešraides režīms)
 PaymentWillBeRecordedForNextPeriod=Maksājums tiks reģistrēts par nākamo periodu.
 ClickHereToTryAgain=<a href="%s">Noklikšķiniet šeit, lai mēģinātu vēlreiz ...</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
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Stingro klientu autentifikācijas noteikumu dēļ karte jāizveido no Stripe biroja. Jūs varat noklikšķināt šeit, lai ieslēgtu Stripe klientu ierakstu: %s
diff --git a/htdocs/langs/lv_LV/ticket.lang b/htdocs/langs/lv_LV/ticket.lang
index 60c6a2f3129..213774c5716 100644
--- a/htdocs/langs/lv_LV/ticket.lang
+++ b/htdocs/langs/lv_LV/ticket.lang
@@ -318,7 +318,7 @@ BoxTicketLastXDays=Jauno biļešu skaits pa dienām pēdējās %s dienās
 BoxTicketLastXDayswidget = Jauno biļešu skaits pa dienām pēdējās X dienās
 BoxNoTicketLastXDays=Pēdējās %s dienās nav jaunu biļešu
 BoxNumberOfTicketByDay=Jauno biļešu skaits dienā
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
+BoxNewTicketVSClose=Biļešu skaits salīdzinājumā ar slēgtajām biļetēm (šodien)
 TicketCreatedToday=Biļete izveidota šodien
 TicketClosedToday=Biļete šodien ir slēgta
 KMFoundForTicketGroup=Mēs atradām tēmas un bieži uzdotos jautājumus, kas var atbildēt uz jūsu jautājumu, tāpēc pārbaudām tās pirms biļetes iesniegšanas
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index d6dafec86f5..fdc8ffeb8d1 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -45,7 +45,7 @@ ViewWebsiteInProduction=Apskatīt vietni, izmantojot mājas 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>
 ExampleToUseInApacheVirtualHostConfig=Piemērs izmantošanai Apache virtuālā resursdatora iestatīšanā:
 YouCanAlsoTestWithPHPS=<u> Izmantojiet ar PHP serveri. </u> <br> Izstrādājot vidi, jūs varat izvēlēties testēt vietni ar PHP tīmekļa serveri (nepieciešams PHP 5.5), palaižot <br><strong> php -S 0.0. 0.0 8080-t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>Izmantojiet savu vietni kopā ar citu Dolibarr mitināšanas pakalpojumu sniedzēju</u> <br> Ja jums nav pieejams tāds interneta serveris kā Apache vai NGinx, varat eksportēt un importēt savu vietni citā Dolibarr instancē, kuru nodrošina cits Dolibarr mitināšanas pakalpojumu sniedzējs un kas nodrošina pilnīgu integrāciju ar vietnes moduli. Dažu Dolibarr mitināšanas pakalpojumu sniedzēju sarakstu varat atrast vietnē <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+YouCanAlsoDeployToAnotherWHP= <u> Palaidiet savu vietni ar citu Dolibarr mitināšanas pakalpojumu sniedzēju </u> <br> Ja jums nav pieejams tāds tīmekļa serveris kā Apache vai NGinx, varat eksportēt un importēt savu vietni citā Dolibarr mitināšanas pakalpojumu sniedzējā, kas nodrošina pilnu Dolibarr. integrācija ar tīmekļa vietnes moduli. Dažu Dolibarr mitināšanas pakalpojumu sniedzēju sarakstu varat atrast vietnē <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=Lasīt
 WritePerm=Rakstīt
@@ -60,7 +60,7 @@ YouCanEditHtmlSourceckeditor=Jūs varat rediģēt HTML avota kodu, izmantojot re
 YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> Varat šajā avotā iekļaut PHP kodu, izmantojot tagus <strong> &lt;? php? &gt; a0a65d06. Ir pieejami šādi globālie mainīgie: $ conf, $ db, $ mysoc, $ user, $ website, $ websitepage, $ weblangs, $ pagelangs. <br> <br> <span class="fa fa-bug"> </span> Varat arī iekļaut citas lappuses / konteinera saturu ar šādu sintakse: <br> a0e7843947c0er0e03_04_03 ? &gt; </strong> <br> <br> <span class="fa fa-bug"> </span> Jūs varat veikt novirzīšanu uz citu lapu / Container ar šādu sintaksi (piezīme: nav izejas kādu saturu pirms novirzīšanas):? <br> <strong> &lt; php redirectToContainer ( "alias_of_container_to_redirect_to '); ? &gt; </strong> <br> <br> <span class="fa fa-link"> </span> Lai pievienotu saiti uz citu lapu, izmantojiet sintaksi: <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> Lai iekļautu <strong> saiti uz lejupielādēt </strong> saglabātu failu vērā <strong> dokumentos </strong> katalogs, izmantojiet <strong> document.php </strong> iesaiņojuma: <br> Piemēram, failu stāšanās dokumentu / ECM (nepieciešams pieteicies), sintakse ir:? <br> <strong> &lt;a href = "/ document.php modulepart = ECM & file = [relative_dir / ] filename.ext "&gt; </strong> <br>. Failā dokumentos / plašsaziņas līdzekļos (atvērts direktorijs publiskai piekļuvei) sintakse ir: <br> <strong> a03900df70b030000 "/document.php?modulepart=medias&file=[relative_dir/ ]faila nosaukums.ext"&gt; </strong> <br> failam, kas koplietots ar koplietošanas saiti (atvērta piekļuve, izmantojot faila koplietošanas hash atslēgu04_04_04_04_04_04_04_04_04_04 /document.php?hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> </span> Lai iekļautu <strong> attēla </strong> saglabāto vērā <strong> dokumentos </strong> direktorijā, izmantot <strong> viewimage.php </strong> iesaiņojuma: <br> Piemērs, par attēlu dokumentos / plašsaziņas (open publiskās piekļuves direktorijs), sintakse ir: <br> <strong> &lt;img src = "/ viewimage.php? modulepart = medias&amp;file = a [santykis_dir /] faila nosaukuma.ext"
 #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=Attēlam, kas tiek koplietots ar koplietošanas saiti (atvērta piekļuve, izmantojot faila koplietošanas hash atslēgu), sintakse ir: <br> <strong> &lt;img src = "/ viewimage.php? Hashp = 123456790120f0f0f0f0f0f0c0f0fcfcfcfcfcfcfcfcfcfcfcflcflcfcflcflcfl0f0flffcfcfcflflfcflflflflflflflflflflflflflflflflflflflflflflfcflflflflflflflflflflflflflrlxlrg" "
-YouCanEditHtmlSourceMore= <br>. Citi HTML vai dinamiskā koda piemēri, kas pieejami vietnē <a href="%s" target="_blank">, wiki dokumentācija </a> <br>.
+YouCanEditHtmlSourceMore= <br> Citi HTML vai dinamiskā koda piemēri ir pieejami vietnē <a href="%s" target="_blank" rel="noopener noreferrer external"> wiki dokumentācijā </a> <br> .
 ClonePage=Klonēt lapu / konteineru
 CloneSite=Klonēt vietni
 SiteAdded=Tīmekļa vietne ir pievienota
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index 336b77899aa..b0b0760088a 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Kredīta pārveduma rīkojums
 LatestBankTransferReceipts=Jaunākie kredīta pārveduma rīkojumi %s
 LastWithdrawalReceipts=Jaunākie %s tiešā debeta faili
 WithdrawalsLine=Tiešā debeta pasūtījuma līnija
+CreditTransfer=Kredīta pārvedums
 CreditTransferLine=Kredīta pārveduma līnija
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Kredīta pārveduma līnijas
@@ -47,6 +48,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=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
@@ -80,7 +82,7 @@ StatusMotif7=Juridiskais lēmums
 StatusMotif8=Cits iemesls
 CreateForSepaFRST=Izveidot tiešā debeta failu (SEPA FRST)
 CreateForSepaRCUR=Izveidojiet tiešā debeta failu (SEPA RCUR)
-CreateAll=Izveidot tiešā debeta failu (visu)
+CreateAll=Izveidojiet tiešā debeta failu
 CreateFileForPaymentByBankTransfer=Izveidojiet failu kredīta pārskaitīšanai
 CreateSepaFileForPaymentByBankTransfer=Izveidot kredīta pārveduma failu (SEPA)
 CreateGuichet=Tikai birojs
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Nevar izveidot tīrās summas tiešā debeta piepr
 SepaMandate=SEPA tiešā debeta pilnvarojums
 SepaMandateShort=SEPA mandāts
 PleaseReturnMandate=Lūdzu, atsūtiet šo pilnvaru veidlapu pa e-pastu uz adresi %s vai pa pastu uz
-SEPALegalText=Parakstot šo pilnvaru veidlapu, jūs pilnvarojat (A) %s, lai nosūtītu norādījumus savai bankai, lai debetētu jūsu kontu, un (B) savu banku, lai debetētu jūsu kontu saskaņā ar %s norādījumiem. Kā daļu no savām tiesībām jums ir tiesības saņemt atmaksu no jūsu bankas saskaņā ar jūsu līguma noteikumiem ar jūsu banku. Kompensācija ir jāpieprasa 8 nedēļu laikā, sākot no datuma, kurā no jūsu konta tika debetēts. Jūsu tiesības attiecībā uz iepriekšminēto mandātu ir izskaidrotas paziņojumā, ko varat saņemt no bankas.
+SEPALegalText=Parakstot šo pilnvaru veidlapu, jūs pilnvarojat (A) %s nosūtīt norādījumus jūsu bankai debetēt jūsu kontu un (B) savu banku debetēt jūsu kontu saskaņā ar %s norādījumiem. Kā daļu no jūsu tiesībām jums ir tiesības saņemt naudas atmaksu no bankas saskaņā ar jūsu ar banku noslēgtā līguma noteikumiem un nosacījumiem. Jūsu tiesības saistībā ar iepriekš minēto pilnvarojumu ir izskaidrotas paziņojumā, ko varat saņemt savā bankā.
 CreditorIdentifier=Kreditora identifikators
 CreditorName=Kreditora vārds
 SEPAFillForm=(B) Lūdzu, aizpildiet visus laukus ar atzīmi *
@@ -150,3 +152,5 @@ ModeWarning=Iespēja reālā režīmā nav noteikts, mēs pārtraucam pēc šīs
 ErrorCompanyHasDuplicateDefaultBAN=Uzņēmumam ar ID %s ir vairāk nekā viens noklusējuma bankas konts. Nevar uzzināt, kuru izmantot.
 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
diff --git a/htdocs/langs/lv_LV/workflow.lang b/htdocs/langs/lv_LV/workflow.lang
index ea009d5da24..e22269f5790 100644
--- a/htdocs/langs/lv_LV/workflow.lang
+++ b/htdocs/langs/lv_LV/workflow.lang
@@ -14,9 +14,13 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klasificējiet saistītā avot
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klasificējiet saistītā avota pārdošanas pasūtījumu kā rēķinu, kad klienta rēķins ir apmaksāts (un ja rēķina summa ir vienāda ar saistītā pasūtījuma kopējo summu)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klasificējiet saistīto avota pārdošanas pasūtījumu, kas nosūtīts, kad sūtījums ir apstiprināts (un ja visu sūtījumu sūtītais daudzums ir tāds pats kā atjaunināšanas rīkojumā)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Saistītā avota pārdošanas pasūtījumu klasificējiet kā nosūtītu, kad sūtījums ir aizvērts (un ja visu sūtījumu nosūtītais daudzums ir tāds pats kā atjaunināšanas pasūtījumā)
-# Autoclassify purchase order
+# Autoclassify purchase proposal
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Saistīto avotu pārdevēju priekšlikuma klasifikācija tiek apmaksāta, kad tiek apstiprināts piegādātāja rēķins (un ja rēķina summa ir tāda pati kā saistītā piedāvājuma kopējā summa)
+# Autoclassify purchase order
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Klasificēt saistīto avotu pirkuma pasūtījumu, par kuru jāmaksā, kad tiek apstiprināts piegādātāja rēķins (un ja rēķina summa ir tāda pati kā saistītā pasūtījuma summa)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Klasificēt saistītā avota pirkuma pasūtījumu kā saņemtu, kad saņemšana ir apstiprināta (un ja visu pieņemšanu saņemtais daudzums ir tāds pats kā atjaunināmajā pirkuma pasūtījumā)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Saistītā avota pirkuma pasūtījuma klasificēšana kā saņemta, kad pieņemšana ir slēgta (un ja visu pieņemšanu saņemtais daudzums ir tāds pats kā atjaunināmajā pirkuma pasūtījumā)
+# Autoclassify purchase invoice
 descWORKFLOW_BILL_ON_RECEPTION=Klasificējiet pieņemjumus uz “rēķinu”, kad ir apstiprināts saistītā piegādātāja pasūtījums
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Kad biļete ir slēgta, aizveriet visas ar biļeti saistītās darbības
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index 0eca6d85c18..c2e6f545edc 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=Земји што не се во Европска економ
 CountriesInEECExceptMe=Земји во Европската економска заедница освен %s
 CountriesExceptMe=Сите земји освен %s
 AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index e808f453ad9..ee7e4702714 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Верзија
 Publisher=Издавач
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
index d6dbd21c319..8e5a786dc0e 100644
--- a/htdocs/langs/mk_MK/banks.lang
+++ b/htdocs/langs/mk_MK/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/mk_MK/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/mk_MK/bookmarks.lang
+++ b/htdocs/langs/mk_MK/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index a998ab8a010..fda7ce0c11b 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 97b990f62b4..640a229b7f2 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/mk_MK/holiday.lang
index 0527f4c0788..3d0ae64be0f 100644
--- a/htdocs/langs/mk_MK/holiday.lang
+++ b/htdocs/langs/mk_MK/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/mk_MK/install.lang
index 03a34b0fbca..980ace38e3b 100644
--- a/htdocs/langs/mk_MK/install.lang
+++ b/htdocs/langs/mk_MK/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/mk_MK/main.lang
index aad14bc1fb6..8fac298a203 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ 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
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/mk_MK/modulebuilder.lang b/htdocs/langs/mk_MK/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/mk_MK/modulebuilder.lang
+++ b/htdocs/langs/mk_MK/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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/other.lang b/htdocs/langs/mk_MK/other.lang
index 9bc68dc3678..49ff93dd589 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/mk_MK/partnership.lang
index b6177c00fda..e6422d2b575 100644
--- a/htdocs/langs/mk_MK/partnership.lang
+++ b/htdocs/langs/mk_MK/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/mk_MK/productbatch.lang b/htdocs/langs/mk_MK/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/mk_MK/productbatch.lang
+++ b/htdocs/langs/mk_MK/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 8e175924b93..9533fb8a02e 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index 5a2911bac0b..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,3 +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/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index 7d095d3079c..59645325c37 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/mk_MK/stripe.lang b/htdocs/langs/mk_MK/stripe.lang
index 844762040af..2c95bcfce27 100644
--- a/htdocs/langs/mk_MK/stripe.lang
+++ b/htdocs/langs/mk_MK/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/mk_MK/withdrawals.lang
+++ b/htdocs/langs/mk_MK/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index c20e0a339f6..8bc4b54a090 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index 8e38468846c..d79adb1e960 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Version
 Publisher=Publisher
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/mn_MN/banks.lang b/htdocs/langs/mn_MN/banks.lang
index 6c770163f29..f066877f676 100644
--- a/htdocs/langs/mn_MN/banks.lang
+++ b/htdocs/langs/mn_MN/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/mn_MN/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/mn_MN/bookmarks.lang
+++ b/htdocs/langs/mn_MN/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/mn_MN/companies.lang b/htdocs/langs/mn_MN/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/mn_MN/companies.lang
+++ b/htdocs/langs/mn_MN/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/mn_MN/compta.lang b/htdocs/langs/mn_MN/compta.lang
index 97b990f62b4..640a229b7f2 100644
--- a/htdocs/langs/mn_MN/compta.lang
+++ b/htdocs/langs/mn_MN/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/mn_MN/holiday.lang
index 0527f4c0788..3d0ae64be0f 100644
--- a/htdocs/langs/mn_MN/holiday.lang
+++ b/htdocs/langs/mn_MN/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/mn_MN/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/mn_MN/install.lang
+++ b/htdocs/langs/mn_MN/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/mn_MN/main.lang
index 19fc5c285f8..81646ff6462 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ 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
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/mn_MN/modulebuilder.lang b/htdocs/langs/mn_MN/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/mn_MN/modulebuilder.lang
+++ b/htdocs/langs/mn_MN/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 9bc68dc3678..49ff93dd589 100644
--- a/htdocs/langs/mn_MN/other.lang
+++ b/htdocs/langs/mn_MN/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/mn_MN/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/mn_MN/partnership.lang
+++ b/htdocs/langs/mn_MN/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/mn_MN/productbatch.lang b/htdocs/langs/mn_MN/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/mn_MN/productbatch.lang
+++ b/htdocs/langs/mn_MN/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index 205a28980a8..14715670882 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index 5a2911bac0b..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,3 +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/mn_MN/stocks.lang b/htdocs/langs/mn_MN/stocks.lang
index a2a335be8f6..599c9649b18 100644
--- a/htdocs/langs/mn_MN/stocks.lang
+++ b/htdocs/langs/mn_MN/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/mn_MN/stripe.lang b/htdocs/langs/mn_MN/stripe.lang
index 844762040af..2c95bcfce27 100644
--- a/htdocs/langs/mn_MN/stripe.lang
+++ b/htdocs/langs/mn_MN/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/mn_MN/withdrawals.lang b/htdocs/langs/mn_MN/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/mn_MN/withdrawals.lang
+++ b/htdocs/langs/mn_MN/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/my_MM/accountancy.lang b/htdocs/langs/my_MM/accountancy.lang
index c20e0a339f6..8bc4b54a090 100644
--- a/htdocs/langs/my_MM/accountancy.lang
+++ b/htdocs/langs/my_MM/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/my_MM/admin.lang b/htdocs/langs/my_MM/admin.lang
index 8e38468846c..d79adb1e960 100644
--- a/htdocs/langs/my_MM/admin.lang
+++ b/htdocs/langs/my_MM/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Version
 Publisher=Publisher
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/my_MM/banks.lang b/htdocs/langs/my_MM/banks.lang
index 6c770163f29..f066877f676 100644
--- a/htdocs/langs/my_MM/banks.lang
+++ b/htdocs/langs/my_MM/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/my_MM/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/my_MM/bookmarks.lang
+++ b/htdocs/langs/my_MM/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/my_MM/companies.lang b/htdocs/langs/my_MM/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/my_MM/companies.lang
+++ b/htdocs/langs/my_MM/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/my_MM/compta.lang b/htdocs/langs/my_MM/compta.lang
index 97b990f62b4..640a229b7f2 100644
--- a/htdocs/langs/my_MM/compta.lang
+++ b/htdocs/langs/my_MM/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/my_MM/errors.lang b/htdocs/langs/my_MM/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/my_MM/holiday.lang
index 0527f4c0788..3d0ae64be0f 100644
--- a/htdocs/langs/my_MM/holiday.lang
+++ b/htdocs/langs/my_MM/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/my_MM/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/my_MM/install.lang
+++ b/htdocs/langs/my_MM/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/my_MM/main.lang
index 7124b2d7b1b..2d850927782 100644
--- a/htdocs/langs/my_MM/main.lang
+++ b/htdocs/langs/my_MM/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ 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
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/my_MM/modulebuilder.lang b/htdocs/langs/my_MM/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/my_MM/modulebuilder.lang
+++ b/htdocs/langs/my_MM/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 9bc68dc3678..49ff93dd589 100644
--- a/htdocs/langs/my_MM/other.lang
+++ b/htdocs/langs/my_MM/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/my_MM/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/my_MM/partnership.lang
+++ b/htdocs/langs/my_MM/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/my_MM/productbatch.lang b/htdocs/langs/my_MM/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/my_MM/productbatch.lang
+++ b/htdocs/langs/my_MM/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/my_MM/products.lang b/htdocs/langs/my_MM/products.lang
index 205a28980a8..14715670882 100644
--- a/htdocs/langs/my_MM/products.lang
+++ b/htdocs/langs/my_MM/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/my_MM/projects.lang b/htdocs/langs/my_MM/projects.lang
index 5a2911bac0b..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,3 +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/my_MM/stocks.lang b/htdocs/langs/my_MM/stocks.lang
index a2a335be8f6..599c9649b18 100644
--- a/htdocs/langs/my_MM/stocks.lang
+++ b/htdocs/langs/my_MM/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/my_MM/stripe.lang b/htdocs/langs/my_MM/stripe.lang
index a536ffd81e7..2c95bcfce27 100644
--- a/htdocs/langs/my_MM/stripe.lang
+++ b/htdocs/langs/my_MM/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
diff --git a/htdocs/langs/my_MM/withdrawals.lang b/htdocs/langs/my_MM/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/my_MM/withdrawals.lang
+++ b/htdocs/langs/my_MM/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 9b5767ef761..00af466fceb 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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=Vis etter regnskapskonto
 VueBySubAccountAccounting=Vis etter regnskaps-subkonto
@@ -286,7 +286,7 @@ ValidateMovements=Valider bevegelser
 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=Automatisk binding utført
+AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Feil, du kan ikke slette denne regnskapskontoen fordi den er i bruk
 MvtNotCorrectlyBalanced=Bevegelse er ikke riktig balansert. Debet = %s | Kreditt = %s
@@ -387,7 +387,8 @@ 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.
 ## Dictionary
 Range= Oversikt over regnskapskonto
 Calculated=Kalkulert
@@ -404,6 +405,7 @@ NoJournalDefined=Ingen journal definert
 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
 
 ## Import
 ImportAccountingEntries=Regnskapsposter
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index a2e1cccc315..fe8f31859c0 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Organisasjon
 Version=Versjon
 Publisher=Utgiver
@@ -265,8 +267,8 @@ OtherResources=Andre ressurser
 ExternalResources=Eksterne ressurser
 SocialNetworks=Sosiale nettverk
 SocialNetworkId=Sosialt nettverk ID
-ForDocumentationSeeWiki=For bruker- eller utviklerdokumentasjon (Doc, FAQs ...), <br> ta en titt på Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
-ForAnswersSeeForum=For andre spørsmål/hjelp, kan du bruke Dolibarr forumet: <br> <a href="%s" target="_blank"><b>%s</b></a>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Siste stabile versjon
 LastActivationDate=Siste aktiveringsdato
 LastActivationAuthor=Siste aktiveringsforfatter
 LastActivationIP=Siste aktivering IP
+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>
@@ -498,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=Faktisk SPF-post funnet: %s
 ClickToShowDescription=Klikk for å vise beskrivelse
 DependsOn=Denne modulen trenger modulen(ene)
 RequiredBy=Denne modulen er påkrevd av modul(ene)
@@ -518,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
@@ -570,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
@@ -610,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
@@ -753,7 +756,7 @@ Permission106=Eksporter forsendelser
 Permission109=Slett forsendelser
 Permission111=Vis kontoutdrag
 Permission112=Opprett/endre/slett og sammenligne transaksjoner
-Permission113=Oppsett av finanskontoer (Opprett, håndter kategorier)
+Permission113=Sett opp finansielle kontoer (opprett, administrer kategorier av banktransaksjoner)
 Permission114=Avstem transaksjoner
 Permission115=Eksportere transaksjoner og kontoutdrag
 Permission116=Overføringer mellom konti
@@ -762,6 +765,7 @@ Permission121=Les tredjeparter lenket til bruker
 Permission122=Opprett/endre tredjeparter lenket til bruker
 Permission125=Slett tredjeparter lenket til bruker
 Permission126=Eksportere tredjeparter
+Permission130=Opprett/endre betalingsinformasjon for tredjeparter
 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)
@@ -857,10 +861,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
@@ -889,12 +893,11 @@ Permission701=Vis donasjoner
 Permission702=Opprett/endre donasjoner
 Permission703=Slett donasjoner
 Permission771=Les utgiftsrapporter (dine og underordnedes)
-Permission772=Oprett/endre utgiftsrapport
+Permission772=Opprett/endre utgiftsrapporter (for deg og dine underordnede)
 Permission773=Slett utgiftsrapport
-Permission774=Les alle utgiftsrapporter (alle brukere)
 Permission775=Godkjenn utgiftsrapport
 Permission776=Betal utgift
-Permission777=Les utgiftsrapporter fra alle
+Permission777=Les alle utgiftsrapporter (selv de til brukere som ikke er underordnede)
 Permission778=Lag/endre utgiftsrapporter for alle
 Permission779=Eksporter utgiftsrapporter
 Permission1001=Vis beholdning
@@ -958,15 +961,11 @@ Permission2801=Bruk FTP-klient i lesemodus (bla gjennom og laste ned)
 Permission2802=Bruk FTP-klient i skrivemodus (slette eller laste opp filer)
 Permission3200=Les arkiverte hendelser og fingeravtrykk
 Permission3301=Generer nye moduler
-Permission4001=Se ansatte
-Permission4002=Opprett ansatte
-Permission4003=Slett ansatte
-Permission4004=Eksporter ansatte
-Permission4010=Les ferdighet/jobb/stilling
-Permission4011=Opprett/endre ferdigheter/jobb/stilling
-Permission4012=Slett ferdighet/jobb/stilling
-Permission4020=Les evaluering
-Permission4021=Opprette/endre evaluering
+Permission4001=Les ferdighet/jobb/stilling
+Permission4002=Opprett/endre ferdigheter/jobb/stilling
+Permission4003=Slett ferdighet/jobb/stilling
+Permission4020=Les evalueringer
+Permission4021=Opprett/endre evalueringen din
 Permission4022=Valider evaluering
 Permission4023=Slett evaluering
 Permission4030=Se sammenligningsmeny
@@ -977,9 +976,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=Les alle permisjonsforespørsler (selv om bruker ikke er underordnet)
-Permission20005=Opprett/endre permisjonsforespørsler for alle (selv om bruker ikke er underordnet)
-Permission20006=Administrer ferieforespørsler (oppsett og oppdatering av balanse)
+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
@@ -988,7 +987,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
@@ -1052,7 +1051,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
@@ -1063,12 +1062,12 @@ 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
 TypeOfUnit=Type enhet
 SetupSaved=Innstillinger lagret
 SetupNotSaved=Oppsettet er ikke lagret
@@ -1185,8 +1184,8 @@ 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:
 DelaysOfToleranceDesc=Angi forsinkelsen før et advarselsikon %s vises på skjermen for det forsinkede elementet.
@@ -1212,11 +1211,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
@@ -1236,7 +1235,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
@@ -1284,11 +1283,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
@@ -1348,19 +1347,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=Vis kunde/leverandør-ref i liste (velg liste eller kombinasjonsboks), og det meste av hyperkobling. Tredjepart vil vises med navnet "CC12345 - SC45678 - Stort selskap", i stedet for "Stort selskap".
-AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=Vis liste over kunde-/leverandøradresseinfo (velg liste eller kombinasjonsboks) <br> Tredjeparter vil vises med et navnformat av "The Big Company Corp." - 21 Jump Street 123456 Big Town - USA "i stedet for" 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
@@ -1391,7 +1390,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
@@ -1440,7 +1439,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
@@ -1466,7 +1465,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
@@ -1491,10 +1490,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)
@@ -1644,7 +1643,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.
@@ -1708,8 +1707,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
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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 +1725,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 +1800,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,6 +1901,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=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
@@ -1916,6 +1917,8 @@ 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)
+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
@@ -1937,11 +1940,11 @@ UnicodeCurrency=Her legger du inn en liste med Ascii-verdier, som representerer
 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)
 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
@@ -2016,15 +2019,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Vil du kjøre samlingen for denne samleren nå?
 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=Registrer e-posthendelse
-CreateLeadAndThirdParty=Opprett lead (og tredjepart om nødvendig)
-CreateTicketAndThirdParty=Opprett billett (og lenke til tredjepart hvis den ble lastet inn av en tidligere operasjon)
+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=Opprett en billett (knyttet til en tredjepart hvis tredjeparten ble lastet inn av en tidligere operasjon, ellers uten noen annen tredjepart)
 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=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
@@ -2078,7 +2082,7 @@ CreateCandidature=Opprett jobbsøknad
 FormatZip=Postnummer
 MainMenuCode=Meny-oppføringskode (hovedmeny)
 ECMAutoTree=Vis ECM-tre automatisk 
-OperationParamDesc=Definer verdiene som skal brukes til objektet for handlingen, eller hvordan du trekker ut verdier. For eksempel: <br> objproperty1=SET: verdien som skal settes <br> objproperty2=SET: en verdi med erstatning av __objproperty1__ <br> objproperty3=SETIFEMPTY: verdi brukt hvis objproperty3b ikke allerede er definert <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> Bruk semikolon som separator for å trekke ut eller angi flere egenskaper.
+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
@@ -2110,11 +2114,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
@@ -2124,7 +2128,7 @@ 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 a string 'Name: name to find' found into the body, use 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?
@@ -2138,10 +2142,10 @@ 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_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
@@ -2155,57 +2159,64 @@ 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
+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=Hvis du vil bruke en andre avgift, må du også aktivere den første avgiften
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Hvis du vil bruke en tredje avgift, må du også aktivere den første avgiften
+LanguageAndPresentation=Språk og presentasjon
+SkinAndColors=Bakgrunn og farger
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Hvis du vil bruke en andre avgift, må du også aktivere den første avgiften
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Hvis du vil bruke en tredje avgift, må du også aktivere den første avgiften
+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
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index 30926a0d0de..dd89ad3631b 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -32,7 +32,7 @@ RIB=Bankkontonummer
 IBAN=IBAN-nummer
 BIC=BIC/SWIFT-kode
 SwiftValid=BIC/SWIFT gyldig
-SwiftVNotalid=BIC/SWIFT ikke gyldig
+SwiftNotValid=BIC/SWIFT ikke gyldig
 IbanValid=BAN gyldig
 IbanNotValid=BAN ikke gyldig
 StandingOrders=Direktedebetsordre
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bankadresse
 BankAccountCountry=Konto land
 BankAccountOwner=Kontoeier
 BankAccountOwnerAddress=Kontoeiers adresse
-RIBControlError=Integritetskontroll av verdier mislyktes. Dette betyr at informasjonen for dette kontonummeret ikke er fullført eller er feil (sjekk land, tall og IBAN).
 CreateAccount=Opprett konto
 NewBankAccount=Ny konto
 NewFinancialAccount=Ny hovedbokskonto
@@ -128,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
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 81032b11a4a..6434c132de9 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=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Standard bankkonto
-PaymentTypeDC=Debet/kredit-kort
-PaymentTypePP=PayPal
-IdPaymentMode=Betalingstype (ID)
-CodePaymentMode=Betalingstype (kode)
-LabelPaymentMode=Betalingstype (etikett)
-PaymentModeShort=Betalingstype
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Betalingsbetingelser
 PaymentConditions=Betalingsbetingelser
 PaymentConditionsShort=Betalingsbetingelser
@@ -280,6 +279,7 @@ SetMode=Angi betalingsmåte
 SetRevenuStamp=Sett stempelmerke
 Billed=Fakturert
 RecurringInvoices=Gjentagende fakturaer
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Fakturamal
 RepeatableInvoices=Fakturamaler
 Repeatable=Mal
@@ -449,6 +449,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 +468,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
@@ -604,3 +606,4 @@ SituationTotalProgress=Total progresjon%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/nb_NO/blockedlog.lang b/htdocs/langs/nb_NO/blockedlog.lang
index 554c86e4f39..c4aebc4e0b3 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 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/nb_NO/bookmarks.lang b/htdocs/langs/nb_NO/bookmarks.lang
index 45be69ac16e..a0e7f1410e8 100644
--- a/htdocs/langs/nb_NO/bookmarks.lang
+++ b/htdocs/langs/nb_NO/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Oppførsel når et bokmerke-URL er valgt
 CreateBookmark=Opprett bokmerke
 SetHereATitleForLink=Angi et navn for bokmerket
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Bruk en ekstern/absolutt lenke (https://URL) eller en intern/relativ lenke (/DOLIBARR_ROOT/htdocs/...)
+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=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
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index 7e5fcadac57..191c5b93f60 100644
--- a/htdocs/langs/nb_NO/boxes.lang
+++ b/htdocs/langs/nb_NO/boxes.lang
@@ -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
diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
index 806b89f8c77..c15fc12ff30 100644
--- a/htdocs/langs/nb_NO/categories.lang
+++ b/htdocs/langs/nb_NO/categories.lang
@@ -3,13 +3,13 @@ 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
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index eee4b314cc9..d87813fa5ce 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -157,6 +157,18 @@ 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 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,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=Du kan også sjekke manuelt på den Europeiske kommisjonens nettside <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <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
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 64b795b7716..b7b006d1ef5 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -170,8 +170,9 @@ SeeReportInInputOutputMode=Se <b> %sanalyse av betalinger%s </b> for en beregnin
 SeeReportInDueDebtMode=Se <b> %sanalyse av registrerte dokumenter%s </b> for en beregning basert på kjente <b> registrerte dokumenter </b> selv om de ennå ikke er regnskapsført
 SeeReportInBookkeepingMode=Se <b> %sanalyse av hovedboktabell%s </b> for en rapport basert på <b> hovedboktabel </b>
 RulesAmountWithTaxIncluded=- Viste beløp er inkludert alle avgifter
-RulesResultDue=- Inkluderer utestående fakturaer, utgifter, mva, donasjoner enten de er betalt eller ikke. Inkluderer også innbetalt lønn. <br> - Basert på faktureringsdato for fakturaer og på forfallsdato for utgifter eller skattebetalinger. For lønn definert med Lønnsmodul brukes valuteringsdato.
-RulesResultInOut=- Inkluderer betalinger gjort mot fakturaer, utgifter, MVA og lønn. <br> Basert på betalingsdato. Donasjonsdato for donasjoner
+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=- Inkluderer kundens forfalte fakturaer enten de er betalt eller ikke. <br> - Basert på faktureringsdato for disse fakturaene. <br>
 RulesCAIn=- Inkluderer alle betalinger av fakturaer mottatt fra klienter. <br> - Er basert på betalingsdatoen for disse fakturaene <br>
 RulesCATotalSaleJournal=Den inkluderer alle kredittlinjer fra salgsjournalen.
@@ -191,9 +192,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
@@ -295,3 +296,5 @@ 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/nb_NO/contracts.lang b/htdocs/langs/nb_NO/contracts.lang
index ca3936ec42b..677f441c74c 100644
--- a/htdocs/langs/nb_NO/contracts.lang
+++ b/htdocs/langs/nb_NO/contracts.lang
@@ -36,7 +36,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
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/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 1e35c47b23f..c9842c73f67 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -4,14 +4,14 @@
 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.
 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 +27,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 +49,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
@@ -111,6 +113,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.
 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
@@ -271,6 +274,9 @@ 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
+ErrorRequestTooLarge=Error, request too large
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP-parameteren upload_max_filesize (%s) er høyere enn PHP-parameteren post_max_size (%s). Dette er ikke et konsistent oppsett.
@@ -312,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/nb_NO/eventorganization.lang b/htdocs/langs/nb_NO/eventorganization.lang
index 8d385d980d7..1550104e1a6 100644
--- a/htdocs/langs/nb_NO/eventorganization.lang
+++ b/htdocs/langs/nb_NO/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
@@ -69,28 +69,29 @@ EventOrganizationEmailAskConf = Request for conference
 EventOrganizationEmailAskBooth = Request for booth
 EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
-EventOrganizationMassEmailAttendees = Communication to attendees
+EventOrganizationMassEmailAttendees = Kommunikasjon til deltakere
 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
+AllowUnknownPeopleSuggestConf=Tillat folk å foreslå konferanser
+AllowUnknownPeopleSuggestConfHelp=Tillat ukjente personer å foreslå en konferanse de ønsker å holde
 AllowUnknownPeopleSuggestBooth=Allow people to apply for a booth
 AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to apply for a booth
-PriceOfRegistration=Price of registration
+PriceOfRegistration=Pris for registrering
 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=Deltakere
 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
@@ -98,9 +99,9 @@ NbVotes=Number of votes
 EvntOrgDraft = Kladd
 EvntOrgSuggested = Suggested
 EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
+EvntOrgNotQualified = Ikke kvalifisert
 EvntOrgDone = Utført
-EvntOrgCancelled = Cancelled
+EvntOrgCancelled = Kansellert
 #
 # Public page
 #
@@ -116,7 +117,7 @@ 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
+PublicAttendeeSubscriptionPage = Offentlig lenke for registrering kun til dette arrangementet
 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.
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 9f9b022f217..2bea6f53125 100644
--- a/htdocs/langs/nb_NO/holiday.lang
+++ b/htdocs/langs/nb_NO/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Beskrivelse
 SendRequestCP=Opprett feriesøknad
 DelayToRequestCP=Søknader må opprettes minst <b>%s dag(er)</b> før ferien skal starte
 MenuConfCP=Permisjonsbalanse
-SoldeCPUser=Permisjonssaldo er <b> %s </b> dager.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Sluttdato må være senere en startdato
 ErrorSQLCreateCP=En SQL feil oppsto under opprettelse:
 ErrorIDFicheCP=En feil oppsto. Feriesøknaden finnes ikke
@@ -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,3 +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..db7383f745d 100644
--- a/htdocs/langs/nb_NO/hrm.lang
+++ b/htdocs/langs/nb_NO/hrm.lang
@@ -20,40 +20,40 @@ 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
@@ -64,7 +64,7 @@ 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
+TypeSkill=Ferdighetstype
 AddSkill=Add skills to job
 RequiredSkills=Required skills for this job
 UserRank=User Rank
diff --git a/htdocs/langs/nb_NO/install.lang b/htdocs/langs/nb_NO/install.lang
index ac378cd1115..610a81b0135 100644
--- a/htdocs/langs/nb_NO/install.lang
+++ b/htdocs/langs/nb_NO/install.lang
@@ -21,6 +21,7 @@ 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=PHP-installasjonen din støtter ikke mbstring-funksjoner.
 ErrorPHPDoesNotSupportxDebug=PHP-installasjonen din støtter ikke utvidede feilsøkingsfunksjoner.
 ErrorPHPDoesNotSupport=PHP-installasjonen din støtter ikke %s-funksjoner.
 ErrorDirDoesNotExists=Mappen %s finnes ikke.
@@ -206,7 +207,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..70e3828eb16 100644
--- a/htdocs/langs/nb_NO/interventions.lang
+++ b/htdocs/langs/nb_NO/interventions.lang
@@ -65,4 +65,4 @@ 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
diff --git a/htdocs/langs/nb_NO/knowledgemanagement.lang b/htdocs/langs/nb_NO/knowledgemanagement.lang
index ff7a2a6c702..21668a4b710 100644
--- a/htdocs/langs/nb_NO/knowledgemanagement.lang
+++ b/htdocs/langs/nb_NO/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 62ff983992e..790be456d63 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -67,6 +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=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
@@ -87,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=Det finnes en dedikert hjelpeside relatert til din nåværende side
+DedicatedPageAvailable=Dedikert hjelpeside relatert til din nåværende skjerm
 HomePage=Hjemmeside
 RecordSaved=Posten er lagret
 RecordDeleted=Oppføring slettet
@@ -114,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=Denne informasjonen kan være nyttig for diagnostiske formål (du kan angi alternativ $dolibarr_main_prod til '1' for å fjerne slike merknader)
+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
@@ -180,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å
@@ -211,6 +212,8 @@ User=Bruker
 Users=Brukere
 Group=Gruppe
 Groups=Grupper
+UserGroup=Brukergruppe
+UserGroups=Brukergrupper
 NoUserGroupDefined=Ingen brukergrupper er definert
 Password=Passord
 PasswordRetype=Gjenta passord
@@ -246,7 +249,7 @@ 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
@@ -341,7 +344,7 @@ KiloBytes=Kilobyte
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=Ceated by
+UserAuthor=Opprettet av
 UserModif=Oppdatert av
 b=b.
 Kb=Kb
@@ -362,7 +365,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
@@ -430,7 +433,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
@@ -730,7 +733,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
@@ -804,7 +807,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
@@ -848,7 +851,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
@@ -859,8 +862,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
@@ -906,7 +909,7 @@ ViewFlatList=Vis liste
 ViewAccountList=Vis hovedbok
 ViewSubAccountList=Vis underkonto hovedbok
 RemoveString=Fjern strengen '%s'
-SomeTranslationAreUncomplete=Noen av språkene som tilbys kan bare oversettes delvis eller kan inneholde feil. Vennligst hjelp å korrigere språket ditt ved å registrere deg på <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> for å legge til forbedringene dine.
+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
@@ -1075,7 +1078,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
@@ -1130,32 +1133,34 @@ 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=Signature reset
+NotClosedYet=Ikke lukket ennå
+ClearSignature=Tilbakestill signatur
+CanceledHidden=Kansellert skjult
+CanceledShown=Kansellert vist
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/modulebuilder.lang b/htdocs/langs/nb_NO/modulebuilder.lang
index ff0168a7265..fd831ad64e0 100644
--- a/htdocs/langs/nb_NO/modulebuilder.lang
+++ b/htdocs/langs/nb_NO/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Dette verktøyet må bare brukes av erfarne brukere eller utviklere. Det gir muligheter til å bygge eller redigere din egen modul. Dokumentasjon for alternativ <a href="%s" target="_blank">manuell utvikling er her</a> .
+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 .
 ModuleBuilderDesc2=Sti hvor moduler genereres/redigeres (første katalog for eksterne moduler definert i %s): <strong> %s </strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Menyene som tilbys av modulen/applikasjonen, er definert i a
 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 recorded by other modules).
+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=Se IDer som brukes i installasjonen din
 SeeReservedIDsRangeHere=Se område av reserverte IDer
 ToolkitForDevelopers=Verktøy for Dolibarr-utviklere
diff --git a/htdocs/langs/nb_NO/mrp.lang b/htdocs/langs/nb_NO/mrp.lang
index 76472d54610..763cb48fd6f 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
diff --git a/htdocs/langs/nb_NO/oauth.lang b/htdocs/langs/nb_NO/oauth.lang
index c12bbee8939..f043acab01d 100644
--- a/htdocs/langs/nb_NO/oauth.lang
+++ b/htdocs/langs/nb_NO/oauth.lang
@@ -23,10 +23,10 @@ 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_GOOGLE_DESC=Gå til <a class="notasortlink" href="https://console.developers.google.com/" target="_blank" rel="noopener noreferrer external"> denne siden </a> og deretter "Påloggingsinformasjon" for å opprette OAuth-legitimasjon
 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_GITHUB_DESC=Gå til <a class="notasortlink" href="https://github.com/settings/developers" target="_blank" rel="noopener noreferrer external"> denne siden </a> og deretter "Registrer en ny søknad" for å opprette OAuth-legitimasjon
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
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/other.lang b/htdocs/langs/nb_NO/other.lang
index 0edffb1deb6..e41499eddea 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Passordkoding
 PermissionsAdd=Tillatelser lagt til
 PermissionsDelete=Tillatelser fjernet
 YourPasswordMustHaveAtLeastXChars=Passordet ditt må ha minst <strong> %s </strong> tegn
+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=Ditt passord er tilbakestilt
 ApplicantIpAddress=IP-adresse til søkeren
 SMSSentTo=SMS sendt til %s
@@ -268,6 +272,7 @@ ProjectCreatedByEmailCollector=Prosjekt opprettet av e-post samler fra e-post MS
 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
+LoginWith=Login with %s
 
 ##### Export #####
 ExportsArea=Eksportområde
diff --git a/htdocs/langs/nb_NO/partnership.lang b/htdocs/langs/nb_NO/partnership.lang
index 73ddf8942da..e08cf536e63 100644
--- a/htdocs/langs/nb_NO/partnership.lang
+++ b/htdocs/langs/nb_NO/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Håndtering av partnerskap
 PartnershipDescription=Modul for Partnerskapshåndtering
 PartnershipDescriptionLong= Modul for Partnerskapshåndtering
-
+Partnership=Partnerskap
 AddPartnership=Add partnership
 CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
 PartnershipCheckBacklink=Partnership: Check referring backlink
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/productbatch.lang b/htdocs/langs/nb_NO/productbatch.lang
index 64c3583d826..b78e339cb99 100644
--- a/htdocs/langs/nb_NO/productbatch.lang
+++ b/htdocs/langs/nb_NO/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 90ba2c117e7..e6fb47664dc 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Vektet gjennomsnittspris
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+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
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 042c7abecc8..03a762f1e2d 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,3 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Merk: eksisterende prosjekter m
 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=Sluttdato kan ikke være før startdato
diff --git a/htdocs/langs/nb_NO/receptions.lang b/htdocs/langs/nb_NO/receptions.lang
index 96fef6d8496..6696f50ec6a 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
@@ -46,3 +49,6 @@ ReceptionsReceiptModel=Dokumentmaler for mottak
 NoMorePredefinedProductToDispatch=Ingen flere forhåndsdefinerte varer som skal sendes
 ReceptionExist=Et mottak finnes
 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/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 9e861d5e1dd..d439487fb4e 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -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
@@ -178,6 +178,7 @@ 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
 InventoryDate=Lagerdato
+Inventories=Varetellinger
 NewInventory=Ny oversikt
 inventorySetup = Oppsett av varetelling
 inventoryCreatePermission=Opprett ny varetelling
@@ -206,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=Teoretisk antall
-TheoricalValue=Teoretisk antall
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Siste BP
 CurrentPA=Gjeldende BP
 RecordedQty=Registrert antall
@@ -240,7 +241,7 @@ StockAtDatePastDesc=Her kan du se varen (reell beholdning) på en tidligere dato
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Nåværende varebeholdning
 InventoryRealQtyHelp=Sett verdi til 0 for å tilbakestille antall <br> Hold feltet tomt, eller fjern linjen, for å holde uendret
-UpdateByScaning=Fill real qty by scaning
+UpdateByScaning=Complete real qty by scaning
 UpdateByScaningProductBarcode=Oppdater ved skanning (varestrekkode)
 UpdateByScaningLot=Oppdater ved skanning (LOT/seriell strekkode)
 DisableStockChangeOfSubProduct=Deaktiver lagerendringen for alle delvaren til dette settet under denne bevegelsen.
@@ -253,14 +254,20 @@ 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=Fill real quantity with expected quantity
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=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
diff --git a/htdocs/langs/nb_NO/stripe.lang b/htdocs/langs/nb_NO/stripe.lang
index b4e05cb5e8a..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=Tilby kundene en Stripe online betalingsside for betalinger med kredittkort/debetkort via <a href="http://www.stripe.com" target="_blank"> Stripe </a>. Dette kan brukes til å la kundene dine foreta ad hoc-betalinger eller for betalinger knyttet til et bestemt Dolibarr-objekt (faktura, bestilling, ...)
+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
@@ -28,7 +28,6 @@ AccountParameter=Kontoparametre
 UsageParameter=Parametre for bruk
 InformationToFindParameters=Hjelp til å finne din %s kontoinformasjon
 STRIPE_CGI_URL_V2=Url av Stripe CGI-modul for betaling
-VendorName=Navn på leverandøren
 CSSUrlForPaymentForm=URL til CSS-stilark for betalingsskjema
 NewStripePaymentReceived=Ny Stripe betaling mottatt
 NewStripePaymentFailed=Ny Stripe betaling prøvd men mislyktes
@@ -69,4 +68,4 @@ ToOfferALinkForTestWebhook=Link til oppsett av Stripe WebHook for oppkall av IPN
 ToOfferALinkForLiveWebhook=Link til oppsett av Stripe WebHook for oppkall av IPN (live-modus)
 PaymentWillBeRecordedForNextPeriod=Betalingen blir registrert for neste periode.
 ClickHereToTryAgain=<a href="%s">Klikk her for å prøve igjen ...</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
+CreationOfPaymentModeMustBeDoneFromStripeInterface=På grunn av sterke regler for godkjenning av kunder, må opprettelse av et kort gjøres fra Stripe backoffice. Du kan klikke her for å slå på Stripe kundeoppføring: %s
diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index 15a09524559..51afe8d773e 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -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
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index 43b071728d1..9e291c192bf 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Kredittoverføringsordre
 LatestBankTransferReceipts=Siste %s kredittoverføringsordrer
 LastWithdrawalReceipts=Siste %s direktedebetslinjer
 WithdrawalsLine=Ordrelinje for direktedebet
+CreditTransfer=Kredittoverføring
 CreditTransferLine=Kredittoverføringslinje
 WithdrawalsLines=Direktedebiter ordrelinjer
 CreditTransferLines=Kredittoverføringslinjer
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Tredjeparts bankkode
 NoInvoiceCouldBeWithdrawed=Ingen faktura debitert. Kontroller at fakturaer mot selskaper med gyldig standard BAN, og at BAN har en RUM-modus <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=Denne uttakskvitteringen er allerede merket som kreditert; dette kan ikke gjøres to ganger, da dette potensielt kan skape dupliserte betalinger og bankoppføringer.
 ClassCredited=Klassifiser som kreditert
+ClassDebited=Classify debited
 ClassCreditedConfirm=Er du sikker på at du vil klassifisere tilbakekallingen som kreditert din bankkonto?
 TransData=Dato for overføring
 TransMetod=Metode for overføring
@@ -80,7 +82,7 @@ StatusMotif7=Rettslig avgjørelse
 StatusMotif8=Annen grunn
 CreateForSepaFRST=Opprett direktedebetsfil (SEPA FRST)
 CreateForSepaRCUR=Opprett direktedebitfil (SEPA RCUR)
-CreateAll=Opprett direktedebetfil (alle)
+CreateAll=Lag direkte debitfil
 CreateFileForPaymentByBankTransfer=Opprett fil for kreditoverføring
 CreateSepaFileForPaymentByBankTransfer=Opprett kreditoverføringsfil (SEPA)
 CreateGuichet=Bare kontor
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Kan ikke opprette en tom direktedebet-betalingfore
 SepaMandate=SEPA Direktedebet mandat
 SepaMandateShort=SEPA-Mandat
 PleaseReturnMandate=Vennligst returner dette mandatskjemaet via epost til %s eller med post til
-SEPALegalText=Ved å signere dette mandatskjemaet gir du (A) %s tillatelse til å sende instruksjoner til banken for å belaste kontoen din og (B) banken din til å belaste kontoen din i samsvar med instruksene fra %s. Som en del av dine rettigheter, har du rett til refusjon fra banken din i henhold til vilkårene og betingelsene i avtalen med banken din. En refusjon må kreves innen 8 uker fra og med datoen da kontoen ble belastet. Dine rettigheter vedrørende ovennevnte mandat er forklart i en uttalelse som du kan få fra banken din.
+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=Kreditor-identifikator
 CreditorName=Kreditornavn
 SEPAFillForm=(B) Vennligst fullfør alle felt merket med *
@@ -133,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
@@ -150,3 +152,5 @@ ModeWarning=Opsjon for reell-modus ble ikke satt, så vi stopper etter denne sim
 ErrorCompanyHasDuplicateDefaultBAN=Firma med ID%s har mer enn én standard bankkonto. Ingen måte å vite hvilken du skal bruke.
 ErrorICSmissing=Mangler ICS i bankkonto %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Totalt beløp for direktedebet er ulik linjesum
+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
diff --git a/htdocs/langs/nb_NO/workflow.lang b/htdocs/langs/nb_NO/workflow.lang
index a37942ef2dd..1395daf1ac3 100644
--- a/htdocs/langs/nb_NO/workflow.lang
+++ b/htdocs/langs/nb_NO/workflow.lang
@@ -14,9 +14,13 @@ 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
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Lukk alle intervensjoner knyttet til billetten når en billett er lukket
diff --git a/htdocs/langs/ne_NP/accountancy.lang b/htdocs/langs/ne_NP/accountancy.lang
index c20e0a339f6..8bc4b54a090 100644
--- a/htdocs/langs/ne_NP/accountancy.lang
+++ b/htdocs/langs/ne_NP/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/ne_NP/admin.lang b/htdocs/langs/ne_NP/admin.lang
index 8e38468846c..d79adb1e960 100644
--- a/htdocs/langs/ne_NP/admin.lang
+++ b/htdocs/langs/ne_NP/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Version
 Publisher=Publisher
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/ne_NP/banks.lang b/htdocs/langs/ne_NP/banks.lang
index 6c770163f29..f066877f676 100644
--- a/htdocs/langs/ne_NP/banks.lang
+++ b/htdocs/langs/ne_NP/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/ne_NP/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/ne_NP/bookmarks.lang
+++ b/htdocs/langs/ne_NP/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/ne_NP/companies.lang b/htdocs/langs/ne_NP/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/ne_NP/companies.lang
+++ b/htdocs/langs/ne_NP/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/ne_NP/compta.lang b/htdocs/langs/ne_NP/compta.lang
index 97b990f62b4..640a229b7f2 100644
--- a/htdocs/langs/ne_NP/compta.lang
+++ b/htdocs/langs/ne_NP/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/ne_NP/errors.lang b/htdocs/langs/ne_NP/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/ne_NP/holiday.lang
index 0527f4c0788..3d0ae64be0f 100644
--- a/htdocs/langs/ne_NP/holiday.lang
+++ b/htdocs/langs/ne_NP/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/ne_NP/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/ne_NP/install.lang
+++ b/htdocs/langs/ne_NP/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/ne_NP/main.lang
index 7124b2d7b1b..2d850927782 100644
--- a/htdocs/langs/ne_NP/main.lang
+++ b/htdocs/langs/ne_NP/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ 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
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/ne_NP/modulebuilder.lang b/htdocs/langs/ne_NP/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/ne_NP/modulebuilder.lang
+++ b/htdocs/langs/ne_NP/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 9bc68dc3678..49ff93dd589 100644
--- a/htdocs/langs/ne_NP/other.lang
+++ b/htdocs/langs/ne_NP/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/ne_NP/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/ne_NP/partnership.lang
+++ b/htdocs/langs/ne_NP/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/ne_NP/productbatch.lang b/htdocs/langs/ne_NP/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/ne_NP/productbatch.lang
+++ b/htdocs/langs/ne_NP/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/ne_NP/products.lang b/htdocs/langs/ne_NP/products.lang
index 205a28980a8..14715670882 100644
--- a/htdocs/langs/ne_NP/products.lang
+++ b/htdocs/langs/ne_NP/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ne_NP/projects.lang b/htdocs/langs/ne_NP/projects.lang
index 5a2911bac0b..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,3 +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/ne_NP/stocks.lang b/htdocs/langs/ne_NP/stocks.lang
index a2a335be8f6..599c9649b18 100644
--- a/htdocs/langs/ne_NP/stocks.lang
+++ b/htdocs/langs/ne_NP/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/ne_NP/stripe.lang b/htdocs/langs/ne_NP/stripe.lang
index 844762040af..2c95bcfce27 100644
--- a/htdocs/langs/ne_NP/stripe.lang
+++ b/htdocs/langs/ne_NP/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/ne_NP/withdrawals.lang b/htdocs/langs/ne_NP/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/ne_NP/withdrawals.lang
+++ b/htdocs/langs/ne_NP/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
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 ff2819f4847..31f9c63429b 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
@@ -99,7 +104,6 @@ OfficialWiki=Dolibarr-documentatie / Wiki
 OtherResources=Andere bronnen
 ExternalResources=Externe Bronnen
 SocialNetworks=Sociale Netwerken
-ForDocumentationSeeWiki=Documentatie voor gebruikers of ontwikkelaars kunt u inzien door <br>te kijken op de Dolibarr Wiki-pagina's:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=Hier zijn enkele bronnen voor hulp en ondersteuning bij Dolibarr.
 HelpCenterDesc2=Sommige van deze bronnen zijn alleen beschikbaar in het <b>Engels</b> .
 MeasuringUnit=Maateenheid
@@ -141,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>
@@ -198,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
@@ -237,7 +243,7 @@ MailToSendInvoice=Klantfacturen
 MailToSendReception=Ontvangen
 MailToThirdparty=Klant
 AddBoxes=Widgets toevoegen
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 GeneralOptions=Algemene opties
 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 a string 'Name: name to find' found into the body, use 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/nl_BE/cashdesk.lang b/htdocs/langs/nl_BE/cashdesk.lang
index 33a7b1d4c41..36c3d34f642 100644
--- a/htdocs/langs/nl_BE/cashdesk.lang
+++ b/htdocs/langs/nl_BE/cashdesk.lang
@@ -8,5 +8,4 @@ BankToPay=Betalingsaccount
 ShowCompany=Toon bedrijf
 ShowStock=Toon magazijn
 DolibarrReceiptPrinter=Dolibarr Ontvangsten Printer
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
 Receipt=Ontvangst
diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang
index 83a3bfc2f08..3fac9814ad5 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
@@ -29,6 +35,10 @@ SupplierCodeModel=Leverancierscode-model
 ProfId6=Professionele ID 6
 ProfId2AR=Prof Id 2 (Inkomsten voor belastingen)
 ProfId3CH=Prof id 1 (Federaal nummer)
+ProfId1CM=Id. prof. 1 (Trade Register)
+ProfId2CM=Id. prof. 2 (Taxpayer No.)
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
 ProfId2ES=Prof Id 2 (INSZ-nummer)
 ProfId1LU=Prof. Id. 1 (R.S.C. Luxemburg)
 ProfId2LU=Prof. Id. 2 (zakelijke vergunning)
@@ -42,7 +52,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)
@@ -66,7 +78,6 @@ ContactForContracts=Contactpersoon contracten
 ContactForInvoices=Contactpersoon facturen
 NoContactForAnyOrderOrShipments=Dit contact is geen contact voor een bestelling of verzending
 NewContactAddress=Nieuw contact / adres
-VATIntraManualCheck=U kunt ook handmatig controleren op de website van de Europese Commissie <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Controle niet mogelijk. Controledienst wordt niet verleend door lidstaat (%s).
 ContactOthers=Ander
 OthersNotLinkedToThirdParty=Anderen, niet gebonden aan een Klant
diff --git a/htdocs/langs/nl_BE/compta.lang b/htdocs/langs/nl_BE/compta.lang
index 3e62ccae353..4bb99924312 100644
--- a/htdocs/langs/nl_BE/compta.lang
+++ b/htdocs/langs/nl_BE/compta.lang
@@ -22,7 +22,6 @@ DeleteSocialContribution=Verwijder betaling sociale bijdrage/belasting
 ExportDataset_tax_1=sociale bijdragen/belastingen en betalingen
 CalcModeLT1Debt=Modus <b>%sRE op afnemersfacturen%s</b>
 CalcModeLT1Rec=Modus <b>%sRE op leveranciersfacturen%s</b>
-RulesResultInOut=- Dit omvat alle betalingen van facturen, uitgaven, BTW en lonen. <br>- Dit is gebaseerd op de betalingsdata van de facturen, uitgaven, BTW en lonen. De donatiedatum voor donaties.
 PurchasesJournal=Inkoopdagboek
 DescPurchasesJournal=Inkoopdagboek
 OtherCountriesCustomersReport=Buitenlands klantenrapport
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/main.lang b/htdocs/langs/nl_BE/main.lang
index 6813c247a6f..cb91c64d6a6 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -96,5 +96,4 @@ SearchIntoProductsOrServices=Producten of diensten
 SearchIntoCustomerInvoices=Klant facturen
 SearchIntoExpenseReports=Uitgaven rapporten
 OnHold=Tijdelijk geblokkeerd
-Properties=Properties
 ClientTZ=Tijdzone van de klant (gebruiker)
diff --git a/htdocs/langs/nl_BE/products.lang b/htdocs/langs/nl_BE/products.lang
index 9e30879a2c8..5a8ab4c5bbe 100644
--- a/htdocs/langs/nl_BE/products.lang
+++ b/htdocs/langs/nl_BE/products.lang
@@ -14,4 +14,3 @@ SupplierRef=Leverancier ref
 ListOfStockMovements=Voorradenlijst
 ProductSellByQuarterHT=Bruto omzetcijfer per trimester
 ServiceSellByQuarterHT=Bruto omzetcijfer per trimester
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index 8181359c787..b6b1d9f1351 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
@@ -37,8 +37,8 @@ OtherInfo=Overige informatie
 DeleteCptCategory=Verwijder grootboekrekening uit groep
 ConfirmDeleteCptCategory=Weet u zeker dat u deze grootboekrekening wilt verwijderen uit de grootboekrekening-groep?
 JournalizationInLedgerStatus=Journaal-status
-AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+AlreadyInGeneralLedger=Reeds overgezet naar boekhoudkundige dagboeken en grootboek
+NotYetInGeneralLedger=Nog niet overgezet naar boekhoudkundige dagboeken en grootboek
 GroupIsEmptyCheckSetup=Groep is leeg. Controleer instellingen bij gepersonaliseerde rekeninggroep
 DetailByAccount=Details grootboekrekening
 AccountWithNonZeroValues=Grootboekrekeningen met niet-nulwaarden
@@ -48,8 +48,8 @@ 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 were used to generate your accountancy.
-ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
+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
 
@@ -246,9 +246,9 @@ DescThirdPartyReport=Raadpleeg hier de lijst met externe klanten en leveranciers
 ListAccounts=Grootboekrekeningen
 UnknownAccountForThirdparty=Onbekende relatie-rekening. Gebruikt wordt 1%s
 UnknownAccountForThirdpartyBlocking=Blokkeringsfout. Onbekende relatierekening. 
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subgrootboekrekening niet gedefinieerd of derde partij of gebruiker onbekend. We gebruiken %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Onbekende relatie en sub-administrator niet gedefinieerd op de betaling. Er zal geen waarde worden weggeschreven in de sub-administratierekening.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subgrootboekrekening niet gedefinieerd of derde partij of gebruiker onbekend. Blokkeringsfout.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Onbekend account van derden en wachtaccount niet gedefinieerd. Blokkeerfout
 PaymentsNotLinkedToProduct=Betaling niet gekoppeld aan een product / dienst
 OpeningBalance=Beginbalans
@@ -286,7 +286,7 @@ 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=Automatisch koppelen voltooid
+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
@@ -298,7 +298,7 @@ NoNewRecordSaved=Geen posten door te boeken
 ListOfProductsWithoutAccountingAccount=Overzicht van producten welke nog niet zijn gekoppeld aan een grootboekrekening
 ChangeBinding=Wijzig koppeling
 Accounted=Geboekt in grootboek
-NotYetAccounted=Not yet transferred to accounting
+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
@@ -329,9 +329,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=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=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)
+ConfirmExportFile=Bevestiging van het genereren van het boekhoudkundige exportbestand ?
 ExportDraftJournal=Journaal exporteren
 Modelcsv=Export model
 Selectmodelcsv=Selecteer een export model
@@ -339,11 +339,11 @@ Modelcsv_normal=Klassieke export
 Modelcsv_CEGID=Exporteren naar CEGID Expert Comptabilité
 Modelcsv_COALA=Exporteren naar Sage Coala
 Modelcsv_bob50=Exporteren naar Sage BOB 50
-Modelcsv_ciel=Export for Sage50, Ciel Compta or Compta Evo. (Format XIMPORT)
+Modelcsv_ciel=Export voor Sage50, Ciel Compta of Compta Evo. (Formaat XIMPORT)
 Modelcsv_quadratus=Exporteren naar Quadratus QuadraCompta
 Modelcsv_ebp=Exporteren naar EBP
 Modelcsv_cogilog=Exporteren naar Cogilog
-Modelcsv_agiris=Export for Agiris Isacompta
+Modelcsv_agiris=Exporteren voor Agiris Isacompta
 Modelcsv_LDCompta=Exporteren voor LD Compta (v9) (test)
 Modelcsv_LDCompta10=Exporteren voor LD Compta (v10 en hoger)
 Modelcsv_openconcerto=Exporteren voor OpenConcerto (test)
@@ -351,10 +351,10 @@ Modelcsv_configurable=Configureerbare CSV export
 Modelcsv_FEC=FEC exporteren
 Modelcsv_FEC2=FEC exporteren (met datumgeneratie schrijven / document omgekeerd)
 Modelcsv_Sage50_Swiss=Export voor Sage 50 Zwitserland
-Modelcsv_winfic=Export for Winfic - eWinfic - WinSis Compta
+Modelcsv_winfic=Exporteren voor Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Exporteren voor Gestinum (v3)
-Modelcsv_Gestinumv5=Export for Gestinum (v5)
-Modelcsv_charlemagne=Export for Aplim Charlemagne
+Modelcsv_Gestinumv5=Exporteren voor Gestinum (v5)
+Modelcsv_charlemagne=Exporteren voor Aplim Charlemagne
 ChartofaccountsId=Rekeningschema Id
 
 ## Tools - Init accounting account on product / service
@@ -387,7 +387,8 @@ 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=Niet toegestaan: De transactie is gevalideerd en/of geëxporteerd.
+ForbiddenTransactionAlreadyValidated=Niet toegestaan: De transactie is gevalideerd.
 ## Dictionary
 Range=Grootboeknummer van/tot
 Calculated=Berekend
@@ -404,6 +405,7 @@ NoJournalDefined=Geen dagboek ingesteld
 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
 
 ## Import
 ImportAccountingEntries=Boekingen
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index aaaee77e54e..ec295e41fb9 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Stichting
 Version=Versie
 Publisher=Auteur
@@ -75,7 +77,7 @@ Dictionary=Woordenboeken
 ErrorReservedTypeSystemSystemAuto=De waarde 'system' en 'systemauto' als type zijn voorbehouden aan het systeem.  Je kan 'user' als waarde gebruiken om je eigen record toe te voegen.
 ErrorCodeCantContainZero=Code mag geen 0 bevatten
 DisableJavascript=Schakel JavaScript en AJAX-functionaliteit uit
-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=Opmerking: alleen voor test- of foutopsporingsdoeleinden. Voor optimalisatie voor blinde personen of tekstbrowsers, kunt u er de voorkeur aan geven om de instellingen op het profiel van de gebruiker te gebruiken
 UseSearchToSelectCompanyTooltip=Ook als u een groot aantal relaties (> 100 000) heeft, kunt u de snelheid verhogen door in de Setup-> Overig constant COMPANY_DONOTSEARCH_ANYWHERE op 1 te zetten. Zoeken wordt dan beperkt tot het begin van de reeks.
 UseSearchToSelectContactTooltip=Ook als u een groot aantal relaties (> 100 000) heeft, kunt u de snelheid verhogen door constante CONTACT_DONOTSEARCH_ANYWHERE in Setup -> Overig op 1 te zetten. Zoeken wordt dan beperkt tot het begin van de reeks.
 DelaiedFullListToSelectCompany=Wacht tot een toets wordt ingedrukt voordat inhoud van de keuzelijst met relaties wordt geladen.<br>Dit kan de prestaties verbeteren als u een groot aantal relaties hebt, maar dit is minder handig.
@@ -160,7 +162,7 @@ Purge=Leegmaken
 PurgeAreaDesc=Op deze pagina kunt u alle bestanden verwijderen die zijn gegenereerd of opgeslagen door Dolibarr (tijdelijke bestanden of alle bestanden in de map <b>%s</b> ). Het gebruik van deze functie is normaal gesproken niet nodig. Het wordt aangeboden als een oplossing voor gebruikers van wie Dolibarr wordt gehost door een provider die geen machtigingen biedt voor het verwijderen van bestanden die zijn gegenereerd door de webserver.
 PurgeDeleteLogFile=Verwijder logbestanden <b>%s</b> aangemaakt door de Syslog module (Geen risico op verlies van gegevens)
 PurgeDeleteTemporaryFiles=Verwijder alle logbestanden en tijdelijke bestanden (geen risico op gegevensverlies). Parameter kan 'tempfilesold', 'logfiles' of beide 'tempfilesold+logfiles' zijn. Opmerking: tijdelijke bestanden worden alleen verwijderd als de tijdelijke map meer dan 24 uur geleden is gemaakt.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files (no risk of losing data)
+PurgeDeleteTemporaryFilesShort=Logboek en tijdelijke bestanden verwijderen (geen risico op gegevensverlies)
 PurgeDeleteAllFilesInDocumentsDir=Verwijder alle bestanden in de map: <b>%s</b> . <br> Hiermee worden alle gegenereerde documenten met betrekking tot elementen (relaties, facturen, enz ...), bestanden die zijn geüpload naar de ECM module, database back-up dumps en tijdelijke bestanden verwijderd.
 PurgeRunNow=Nu opschonen
 PurgeNothingToDelete=Geen directory of bestanden om te verwijderen.
@@ -265,8 +267,8 @@ OtherResources=Andere middelen
 ExternalResources=Externe bronnen
 SocialNetworks=Sociale netwerken
 SocialNetworkId=Sociale netwerk ID
-ForDocumentationSeeWiki=Documentatie voor gebruikers of ontwikkelaars kunt u inzien door <br>te kijken op de Dolibarr Wiki pagina's:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Voor alle andere vragen / hulp, kunt u gebruik maken van het Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+ForDocumentationSeeWiki=Voor gebruikers- of ontwikkelaarsdocumentatie (Doc, FAQs...), <br>, neem een kijkje op de Dolibarr Wiki: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s a0e40dc6587d87039f17a4bz0
+ForAnswersSeeForum=Voor andere vragen/hulp kunt u het Dolibarr-forum gebruiken: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
 HelpCenterDesc1=Hier enkele bronnen voor hulp en ondersteuning met Dolibarr.
 HelpCenterDesc2=Enkele bronnen zijn alleen beschikbaar in het <b>Engels</b>.
 CurrentMenuHandler=Huidige menuverwerker
@@ -279,7 +281,7 @@ SpaceX=Ruimte X
 SpaceY=Ruimte Y
 FontSize=Formaat lettertype
 Content=Inhoud
-ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
+ContentForLines=Inhoud die moet worden weergegeven voor elk product of elke service (van variabele __LINES__ van inhoud)
 NoticePeriod=Opzegtermijn
 NewByMonth=Nieuw per maand
 Emails=E-mails
@@ -341,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=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-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>
@@ -353,6 +355,7 @@ LastStableVersion=Laatste stabiele versie
 LastActivationDate=Laatste activeringsdatum
 LastActivationAuthor=Laatste activeringsauteur
 LastActivationIP=Laatste activering IP-adres
+LastActivationVersion=Latest activation version
 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>
@@ -375,8 +378,8 @@ UMask=Umask parameter voor nieuwe bestanden op een Unix- / Linux- / BSD bestands
 UMaskExplanation=Deze parameter laat u de rechten bepalen welke standaard zijn ingesteld voor de bestanden aangemaakt door Dolibarr op de server (tijdens het uploaden, bijvoorbeeld).<br>Het moet de octale waarde zijn (bijvoorbeeld, 0666 betekent lezen en schrijven voor iedereen).<br>Deze parameter wordt NIET op een Windows server gebruikt
 SeeWikiForAllTeam=Kijk op de Wiki pagina voor een lijst met bijdragers en hun organisatie
 UseACacheDelay= Ingestelde vertraging voor de cache export in secondes (0 of leeg voor geen 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=Verberg de link " <b> Hulp of ondersteuning nodig </b> " op de inlogpagina
+DisableLinkToHelp=Verberg de link naar de online help " <b> %s </b> "
 AddCRIfTooLong=Er is geen automatische tekst terugloop, tekst die te lang is, wordt niet weergegeven in documenten. Voeg zo nodig carriage returns toe in het tekstgebied.
 ConfirmPurge=Weet u zeker dat u deze opschoning wilt uitvoeren? <br> Hiermee worden al uw gegevensbestanden permanent verwijderd zonder dat ze worden teruggezet (ECM-bestanden, bijgevoegde bestanden ...).
 MinLength=Minimale lengte
@@ -498,10 +501,10 @@ WarningPHPMail=WAARSCHUWING: De instelling om e-mails te verzenden vanuit de app
 WarningPHPMailA=- Het gebruik van de server van de e-mailserviceprovider verhoogt de betrouwbaarheid van uw e-mail. Dus het verhoogt de kans te worden afgeleverd zonder te worden gemarkeerd als SPAM
 WarningPHPMailB=- Sommige e-mailproviders (zoals Yahoo) staan niet toe dat u een e-mail verzendt vanaf een andere server dan hun eigen server. Uw huidige installatie gebruikt de server van de applicatie om e-mail te verzenden en niet de server van uw e-mailprovider, dus sommige ontvangers (degene die compatibel zijn met het beperkende DMARC-protocol) zullen uw e-mailprovider vragen of zij uw e-mail kunnen accepteren en sommige e-mailproviders (zoals Yahoo) reageert mogelijk "nee" omdat de server niet van hen is, dus enkele van uw verzonden e-mails worden mogelijk niet geaccepteerd voor bezorging (let ook op de verzendquota van uw e-mailprovider).
 WarningPHPMailC=- Het gebruik van de SMTP-server van uw eigen e-mailserviceprovider om e-mails te verzenden is ook interessant, dus alle e-mails die vanuit de toepassing worden verzonden, worden ook opgeslagen in uw "Verzonden" -map van uw 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.
+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=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=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
 ClickToShowDescription=Klik voor omschrijving
 DependsOn=Deze module heeft de module(s) nodig
 RequiredBy=Deze module is vereist bij module(s)
@@ -518,9 +521,9 @@ Field=veld
 ProductDocumentTemplates=Documentsjablonen om een ​​productdocument te genereren
 FreeLegalTextOnExpenseReports=Gratis juridische tekst over onkostendeclaraties
 WatermarkOnDraftExpenseReports=Watermerk op ontwerp onkostendeclaraties
-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=Het project is verplicht voor het invoeren van een onkostennota
+PrefillExpenseReportDatesWithCurrentMonth=Vul de begin- en einddatums van de nieuwe onkostennota vooraf in met de begin- en einddatums van de huidige maand
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Forceer de invoer van onkostennotabedragen altijd in bedrag met belastingen
 AttachMainDocByDefault=Zet dit op 1 als u het hoofddocument als standaard aan e-mail wilt toevoegen (indien van toepassing)
 FilesAttachedToEmail=Voeg een bestand toe
 SendEmailsReminders=Stuur agendaherinneringen per e-mail
@@ -610,7 +613,7 @@ Module400Desc=Beheer van projecten, leads / kansen en / of taken. U kunt ook elk
 Module410Name=Webkalender
 Module410Desc=Integratie van een webkalender
 Module500Name=Belastingen en speciale uitgaven
-Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
+Module500Desc=Beheer van andere kosten (omzetbelastingen, sociale of fiscale belastingen, dividenden, ...)
 Module510Name=Salarissen
 Module510Desc=Registreer en volg betalingen van werknemers
 Module520Name=Leningen
@@ -753,7 +756,7 @@ Permission106=Export zendingen
 Permission109=Verwijder verzendingen
 Permission111=Bekijk de financiële rekeningen
 Permission112=Creëer / wijzig / verwijder en vergelijk transacties
-Permission113=Stel financiële rekeningen in (creëer, beheer, categoriseer)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Consolideer transacties
 Permission115=Exporteer transacties en rekeningafschriften
 Permission116=Overschrijvingen tussen rekeningen
@@ -762,6 +765,7 @@ Permission121=Bekijk derde partijen gelinkt aan de gebruiker
 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)
@@ -889,12 +893,11 @@ Permission701=Bekijk donaties
 Permission702=Creëren / wijzigen donaties
 Permission703=Verwijderen donaties
 Permission771=Declaraties (eigen en ondergeschikten)
-Permission772=Creëer / wijzigen onkostennota's
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Verwijderen onkostennota's
-Permission774=Lees alle onkostennota's (ook voor de gebruiker niet ondergeschikten)
 Permission775=Goedkeuren onkostennota's
 Permission776=Betalen onkostennota's
-Permission777=Lees onkostendeclaraties van iedereen
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Aanmaken/wijzigen onkostendeclaraties van iedereen
 Permission779=Export onkostennota's
 Permission1001=Bekijk voorraden
@@ -958,18 +961,14 @@ 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=Bekijk medewerkers
-Permission4002=Creëer medewerkers
-Permission4003=Verwijder werknemers
-Permission4004=Export werknemers
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
-Permission4022=Validate evaluation
-Permission4023=Delete evaluation
-Permission4030=See comparison menu
+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=Evaluatie valideren
+Permission4023=Evaluatie verwijderen
+Permission4030=Zie vergelijkingsmenu
 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.
@@ -977,9 +976,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=Alle verlofaanvragen (zelfs van gebruiker, niet ondergeschikten)
-Permission20005=Verlofaanvragen maken / wijzigen voor iedereen (zelfs van gebruikers die geen ondergeschikte zijn)
-Permission20006=Verlofaanvragen beheerder (instellen en saldo bijwerken)
+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=Verlofaanvragen goedkeuren
 Permission23001=Lees geplande taak
 Permission23002=Maak/wijzig geplande taak
@@ -1052,7 +1051,7 @@ DictionaryFees=Onkostendeclaratie - Soorten onkostendeclaratieregels
 DictionarySendingMethods=Verzendmethoden
 DictionaryStaff=Aantal werknemers
 DictionaryAvailability=Leverings vertraging
-DictionaryOrderMethods=Order methods
+DictionaryOrderMethods=Bestelmethoden:
 DictionarySource=Oorsprong van offertes / bestellingen
 DictionaryAccountancyCategory=Gepersonaliseerde groepen voor rapporten
 DictionaryAccountancysystem=Modellen voor rekeningschema
@@ -1185,8 +1184,8 @@ DoNotSuggestPaymentMode=Geen betalingswijze voorstellen
 NoActiveBankAccountDefined=Geen actieve bankrekening ingesteld
 OwnerOfBankAccount=Eigenaar van bankrekening %s
 BankModuleNotActive=Bankrekeningen module niet ingeschakeld
-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=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:
 DelaysOfToleranceDesc=Stel de vertraging in voordat een waarschuwingspictogram %s op het scherm wordt weergegeven voor het late element.
@@ -1211,9 +1210,9 @@ SetupDescription2=De volgende twee secties zijn verplicht (de twee eerste vermel
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Basisparameters die worden gebruikt om het standaardgedrag van uw toepassing aan te passen (bijvoorbeeld voor landgerelateerde functies).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Dit programma is een samenstelling van vele modules / applicaties. De modules die betrekking hebben op uw behoeften moeten worden ingeschakeld en geconfigureerd. Menu-items verschijnen met de activering van deze modules.
 SetupDescription5=Andere items in het Setup-menu beheren optionele 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.
+SetupDescriptionLink= <a href="%s"> %s - %s </a>
+SetupDescription3b=Basisparameters die worden gebruikt om het standaardgedrag van uw toepassing aan te passen (bijvoorbeeld voor landgerelateerde functies).
+SetupDescription4b=Deze software is een suite van vele modules/applicaties. De modules met betrekking tot uw behoeften moeten worden ingeschakeld en geconfigureerd. Menu-items verschijnen met de activering van deze modules.
 AuditedSecurityEvents=Beveiligingsgebeurtenissen die worden gecontroleerd
 NoSecurityEventsAreAduited=Er worden geen beveiligingsgebeurtenissen gecontroleerd. U kunt ze inschakelen via menu %s
 Audit=Beveiligingsgebeurtenissen
@@ -1236,7 +1235,7 @@ SystemAreaForAdminOnly=Dit gebied is alleen beschikbaar voor beheerders. Gebruik
 CompanyFundationDesc=Bewerk de gegevens van uw bedrijf / organisatie. Klik op de knop "%s" onderaan de pagina als u klaar bent.
 AccountantDesc=Als u een externe accountant / boekhouder hebt, kunt u hier de informatie bewerken.
 AccountantFileNumber=Accountant code
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
+DisplayDesc=Parameters die van invloed zijn op het uiterlijk en de presentatie van de applicatie kunnen hier worden gewijzigd.
 AvailableModules=Beschikbare app/modules
 ToActivateModule=Om modules te activeren, ga naar Home->Instellingen->Modules.
 SessionTimeOut=Time-out van de sessie
@@ -1288,7 +1287,7 @@ SimpleNumRefNoDateModelDesc=Retourneert het referentienummer in de notatie %s-nn
 ShowProfIdInAddress=Toon professionele ID met adressen
 ShowVATIntaInAddress=Verberg intracommunautair btw-nummer
 TranslationUncomplete=Onvolledige vertaling
-MAIN_DISABLE_METEO=Disable weather thumb
+MAIN_DISABLE_METEO=Weerduim uitschakelen
 MeteoStdMod=Standaard mode
 MeteoStdModEnabled=Standaard mode geactiveerd
 MeteoPercentageMod=Percentage modus
@@ -1358,9 +1357,9 @@ BrowserIsOK=U gebruikt de webbrowser %s. Deze browser is geschikt voor beveiligi
 BrowserIsKO=U gebruikt de webbrowser %s. Deze browser staat bekend als een slechte keuze voor beveiliging, prestaties en betrouwbaarheid. We raden aan om Firefox, Chrome, Opera of Safari te gebruiken.
 PHPModuleLoaded=PHP component %s is geladen
 PreloadOPCode=Voorgeladen OPCode wordt gebruikt
-AddRefInList=Weergave klant/leverancier ref. infolijst (selecteer lijst of combobox) en de meeste hyperlinks. <br> Derden zullen verschijnen met een naamnotatie van "CC12345 - SC45678 - The Big Company corp." in plaats van "The Big Company corp".
-AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=Toon klant / leverancier adres infolijst (selecteer lijst of combobox) <br> Derden zullen verschijnen met een naamnotatie van &quot;The Big Company corp. - 21 jump street 123456 Big town - USA&quot; in plaats van &quot;The Big Company corp&quot;.
+AddRefInList=Weergave klant/verkoper ref. in combolijsten. <br> Derden verschijnen met de naam "CC12345 - SC45678 - The Big Company corp." in plaats van "The Big Company corp".
+AddVatInList=Geef het btw-nummer van de klant/leverancier weer in combolijsten.
+AddAdressInList=Geef het adres van de klant/leverancier weer in combolijsten. <br> Derden zullen verschijnen met de naam "The Big Company corp. - 21 jump street 123456 Big Town - USA" in plaats van "The Big Company corp".
 AddEmailPhoneTownInContactList=E-mailadres van contactpersoon (of telefoons indien niet gedefinieerd) en stadsinfo-lijst (selecteer lijst of combobox) weergeven <br> Contacten worden weergegeven met de naamindeling "Dupond Durand - dupond.durand@email.com - Parijs" of "Dupond Durand - 06 07 59 65 66 - Paris "in plaats van" Dupond Durand ".
 AskForPreferredShippingMethod=Vraag de gewenste verzendmethode voor derden.
 FieldEdition=Wijziging van het veld %s
@@ -1391,7 +1390,7 @@ AccountCodeManager=Opties voor het automatisch genereren van boekhoudcodes voor
 NotificationsDesc=E-mailmeldingen kunnen automatisch worden verzonden voor sommige Dolibarr-evenementen. <br> Ontvangers van meldingen kunnen worden gedefinieerd:
 NotificationsDescUser=* per gebruiker, één gebruiker tegelijk.
 NotificationsDescContact=* per contactpersoon van derden (klanten of leveranciers), één contactpersoon tegelijk.
-NotificationsDescGlobal=* or by setting global email addresses in the setup page of the module.
+NotificationsDescGlobal=* of door algemene e-mailadressen in te stellen op de instellingenpagina van de module.
 ModelModules=Documentsjablonen
 DocumentModelOdt=Genereer documenten van OpenDocument-sjablonen (.ODT / .ODS-bestanden van LibreOffice, OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Watermerk op conceptdocumenten
@@ -1440,7 +1439,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Vraag te gebruiken magazijn bij order
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Vraag naar bankrekeningbestemming van bestelling
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Voorgestelde betalingsmodus op verkooporder standaard indien niet gedefinieerd op de bestelling
 OrdersSetup=Beheer van verkooporders
 OrdersNumberingModules=Opdrachtennummeringmodules
 OrdersModelModule=Oprachtendocumentsjablonen
@@ -1491,10 +1490,10 @@ LDAPSynchronizeMembersTypes=Organisatie van de ledentypes van de stichting in LD
 LDAPPrimaryServer=Primaire server
 LDAPSecondaryServer=Secundaire server
 LDAPServerPort=Serverpoort
-LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
+LDAPServerPortExample=Standaard of StartTLS: 389, LDAP's: 636
 LDAPServerProtocolVersion=Protocolversie
 LDAPServerUseTLS=Gebruik TLS
-LDAPServerUseTLSExample=Your LDAP server use StartTLS
+LDAPServerUseTLSExample=Uw LDAP-server gebruikt StartTLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
 LDAPAdminDnExample=Volledige DN (bijv. Cn = admin, dc = voorbeeld, dc = com of cn = Administrator, cn = Gebruikers, dc = voorbeeld, dc = com voor active directory)
@@ -1644,7 +1643,7 @@ ProductSetup=Productenmoduleinstellingen
 ServiceSetup=Services module setup
 ProductServiceSetup=Producten en Diensten modules setup
 NumberOfProductShowInSelect=Maximaal aantal producten om weer te geven in keuzelijsten met combo's (0 = geen limiet)
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
+ViewProductDescInFormAbility=Productbeschrijvingen weergeven in artikelregels (anders de beschrijving weergeven in een pop-up met knopinfo)
 OnProductSelectAddProductDesc=Hoe de beschrijving van de producten te gebruiken bij het toevoegen van een product als een regel van een document?
 AutoFillFormFieldBeforeSubmit=Vul het invoerveld voor de beschrijving automatisch in met de beschrijving van het product
 DoNotAutofillButAutoConcat=Vul het invoerveld niet automatisch in met de beschrijving van het product. Beschrijving van het product wordt automatisch aan de ingevoerde beschrijving gekoppeld.
@@ -1708,8 +1707,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
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Verzendmodule instellen
 SendingsReceiptModel=Verzendontvangstsjabloon
@@ -1725,10 +1725,10 @@ FreeLegalTextOnDeliveryReceipts=Vrije tekst op ontvangstbevestigingen
 ##### FCKeditor #####
 AdvancedEditor=Geavanceerde editor
 ActivateFCKeditor=Activeer FCKeditor voor:
-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 creatie/editie van het veld "openbare notities" van elementen
+FCKeditorForNotePrivate=WYSIWIG creatie/editie van het veld "private notes" van elementen
+FCKeditorForCompany=WYSIWIG creatie/editie van de veldbeschrijving van elementen (behalve producten/diensten)
+FCKeditorForProduct=WYSIWIG creatie/editie van de veldbeschrijving van producten/diensten
 FCKeditorForProductDetails=WYSIWIG creatie / editie van productdetails regels voor alle entiteiten (voorstellen, bestellingen, facturen, enz ...). <span class="warning"> Waarschuwing: het gebruik van deze optie in dit geval wordt serieus niet aanbevolen, aangezien het problemen kan veroorzaken met speciale tekens en paginaopmaak bij het samenstellen van PDF-bestanden. </span>
 FCKeditorForMailing= WYSIWIG creatie / bewerking van mailings
 FCKeditorForUserSignature=WYSIWIG creatie /aanpassing van ondertekening
@@ -1807,7 +1807,7 @@ ClickToDialSetup='Click-To-Dial' moduleinstellingen
 ClickToDialUrlDesc=URL gebeld wanneer een klik op het telefoonpictogram is voltooid. In URL kunt u tags gebruiken <br> <b>__PHONETO__</b> die wordt vervangen door het telefoonnummer van de persoon die moet worden gebeld <br> <b>__PHONEFROM__</b> die wordt vervangen door het telefoonnummer van de bellende persoon (die van u) <br> <b>__LOGIN__</b> die wordt vervangen door clicktodial login (gedefinieerd op gebruikerskaart) <br> <b>__PASS__</b> die wordt vervangen door clicktodial wachtwoord (gedefinieerd op gebruikerskaart).
 ClickToDialDesc=Deze module verandert telefoonnummers bij gebruik van een desktopcomputer in klikbare links. Bij een klik zal het nummer gebeld worden. Dit kan worden gebruikt om het telefoongesprek te starten wanneer u een softphone op uw bureaublad gebruikt of wanneer u bijvoorbeeld een CTI-systeem op basis van het SIP-protocol gebruikt. Let op: Bij het gebruik van een smartphone zijn telefoonnummers altijd klikbaar.
 ClickToDialUseTelLink=Gebruik alleen de link "tel:" bij telefoonnummers
-ClickToDialUseTelLinkDesc=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=Gebruik deze methode als uw gebruikers een softphone of een software-interface hebben, geïnstalleerd op dezelfde computer als de browser, en gebeld wanneer u klikt op een link die begint met "tel:" in uw browser. Als u een link nodig heeft die begint met "sip:" of een volledige serveroplossing (geen lokale software-installatie nodig), moet u deze op "Nee" zetten en het volgende veld invullen.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Verkooppunt
 CashDeskSetup=Instelling verkooppuntmodule
@@ -1901,6 +1901,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
 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
@@ -1916,6 +1917,8 @@ 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)
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 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
@@ -1937,11 +1940,11 @@ UnicodeCurrency=Voer hier tussen accolades in, lijst met byte-nummers die het va
 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)
 PositionIntoComboList=Positie van regel in combolijst
-SellTaxRate=Sales tax rate
+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.
 UrlTrackingDesc=Als de aanbieder of transportservice een pagina of website aanbiedt om de status van uw zendingen te controleren, kunt u deze hier invoeren. U kunt de sleutel {TRACKID} gebruiken in de URL-parameters, zodat het systeem deze vervangt door het trackingnummer dat de gebruiker op de verzendkaart heeft ingevoerd.
 OpportunityPercent=Wanneer u een lead aanmaakt, definieert u een geschatte hoeveelheid project / lead. Afhankelijk van de status van de lead kan dit bedrag worden vermenigvuldigd met dit tarief om een totaalbedrag te evalueren dat al uw leads kunnen genereren. Waarde is een percentage (tussen 0 en 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=Aan welk type object is deze mailtemplate gerelateerd? Een e-mailsjabloon is alleen beschikbaar bij gebruik van de knop "E-mail verzenden" van het gerelateerde object.
 TypeOfTemplate=Template soort
 TemplateIsVisibleByOwnerOnly=Sjabloon is alleen zichtbaar voor eigenaar
 VisibleEverywhere=Overal zichtbaar
@@ -2016,14 +2019,14 @@ MAIN_PDF_MARGIN_RIGHT=Rechter marge op PDF
 MAIN_PDF_MARGIN_TOP=Bovenmarge op PDF
 MAIN_PDF_MARGIN_BOTTOM=Onder-marge op PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Hoogte voor logo op PDF
-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_GENERATE_PROPOSALS_WITH_PICTURE=Kolom toevoegen voor afbeelding op voorstelregels
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Breedte van de kolom als een afbeelding op lijnen is toegevoegd
+MAIN_PDF_NO_SENDER_FRAME=Verberg randen op frame van afzenderadres
+MAIN_PDF_NO_RECIPENT_FRAME=Verberg randen op receptnt adresframe
+MAIN_PDF_HIDE_CUSTOMER_CODE=Klantcode verbergen
+MAIN_PDF_HIDE_SENDER_NAME=Verberg afzender/bedrijfsnaam in adresblok
+PROPOSAL_PDF_HIDE_PAYMENTTERM=Betalingsvoorwaarden verbergen
+PROPOSAL_PDF_HIDE_PAYMENTMODE=Betalingsmodus verbergen
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Elektronisch ondertekenen toevoegen aan PDF
 NothingToSetup=Er is geen specifieke installatie vereist voor deze module.
 SetToYesIfGroupIsComputationOfOtherGroups=Stel dit in op Ja als deze groep een berekening van andere groepen is
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Wil je de collectie voor deze verzamelaar nu runnen
 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=E-mail gebeurtenis opnemen
-CreateLeadAndThirdParty=Creëer lead (en relatie indien nodig)
-CreateTicketAndThirdParty=Maak een ticket aan (en link naar een relatie als het door een eerdere bewerking is geladen)
+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=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.
 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
@@ -2078,7 +2082,7 @@ CreateCandidature=Maak een sollicitatie
 FormatZip=Zip
 MainMenuCode=Menu toegangscode (hoofdmenu)
 ECMAutoTree=Toon automatische ECM-structuur
-OperationParamDesc=Definieer de waarden die u wilt gebruiken voor het object van de actie of hoe u waarden kunt extraheren. Bijvoorbeeld:<br>objproperty1 = SET: de waarde om<br>objproperty2 = SET in te stellen: een waarde met vervanging van __objproperty1__<br> objproperty3 = SETIFEMPTY:waarde gebruikt als objproperty3 is niet EX4: a2 = a0: ([^ \\ s] *)<br>options_myextrafield1 = EXTRACT: SUBJECT: ([^ & # 92; n] *) <br> object.objproperty5 = EXTRACT: BODY: Mijn bedrijfsnaam is \\ s ([^ \\ s] *) a0342ff <br> Gebruik het ; char als scheidingsteken om verschillende eigenschappen te extraheren of in te stellen.
+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=Openingstijden
 OpeningHoursDesc=Voer hier de reguliere openingstijden van uw bedrijf in.
 ResourceSetup=Configuratie van bronmodule
@@ -2124,7 +2128,7 @@ 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=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 geëxtraheerd een tekenreeks 'Naam: naam te vinden' gevonden in de body, gebruik afzender e-mail als e-mail, u kunt het parameterveld als volgt instellen: <br> 'email=HEADER: ^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
+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=Eindpunt voor %s: %s
 DeleteEmailCollector=E-mailverzamelaar verwijderen
 ConfirmDeleteEmailCollector=Weet je zeker dat je deze e-mailverzamelaar wilt verwijderen?
@@ -2141,7 +2145,7 @@ EMailsWillHaveMessageID=E-mails hebben een tag 'Verwijzingen' die overeenkomen m
 PDF_SHOW_PROJECT=Toon project op document
 ShowProjectLabel=Projectlabel
 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=Gererate PDF documents with format PDF/A instead of defaut format PDF
+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.
 RssNote=Opmerking: elke RSS-feeddefinitie biedt een widget die u moet inschakelen om deze beschikbaar te hebben in het dashboard
 JumpToBoxes=Ga naar Setup -> Widgets
@@ -2164,7 +2168,7 @@ AskThisIDToYourBank=Neem contact op met uw bank om deze ID te krijgen
 AdvancedModeOnly=Toestemming alleen beschikbaar in geavanceerde toestemmingsmodus
 ConfFileIsReadableOrWritableByAnyUsers=Het conf-bestand is leesbaar of beschrijfbaar door alle gebruikers. Geef alleen toestemming aan webservergebruiker en -groep.
 MailToSendEventOrganization=Evenementenorganisatie
-MailToPartnership=Partnership
+MailToPartnership=Vennootschap
 AGENDA_EVENT_DEFAULT_STATUS=Standaard gebeurtenisstatus bij het maken van een gebeurtenis vanuit het formulier
 YouShouldDisablePHPFunctions=U moet PHP-functies uitschakelen
 IfCLINotRequiredYouShouldDisablePHPFunctions=Behalve als u systeemopdrachten in aangepaste code moet uitvoeren, moet u PHP-functies uitschakelen
@@ -2173,7 +2177,7 @@ NoWritableFilesFoundIntoRootDir=Er zijn geen beschrijfbare bestanden of mappen v
 RecommendedValueIs=Aanbevolen: %s
 Recommended=Aanbevolen
 NotRecommended=Niet aangeraden
-ARestrictedPath=Some restricted path
+ARestrictedPath=Een beperkt pad
 CheckForModuleUpdate=Controleren op updates van externe modules
 CheckForModuleUpdateHelp=Deze actie maakt verbinding met editors van externe modules om te controleren of er een nieuwe versie beschikbaar is.
 ModuleUpdateAvailable=Een update is beschikbaar
@@ -2185,27 +2189,34 @@ DatabasePasswordObfuscated=Databasewachtwoord is versleuteld in conf-bestand
 DatabasePasswordNotObfuscated=Databasewachtwoord is NIET versleuteld in conf-bestand
 APIsAreNotEnabled=API-modules zijn niet ingeschakeld
 YouShouldSetThisToOff=U moet dit op 0 of uit zetten
-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
+InstallAndUpgradeLockedBy=Installatie en upgrades worden vergrendeld door het bestand <b> %s </b>
+OldImplementation=Oude implementatie
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Als sommige online betalingsmodules zijn ingeschakeld (Paypal, Stripe, ...), voeg dan een link toe aan de PDF om de online betaling uit te voeren
+DashboardDisableGlobal=Schakel globaal alle duimen van open objecten uit
+BoxstatsDisableGlobal=Statistieken volledig uitschakelen
+DashboardDisableBlocks=Duimen van open objecten (te verwerken of te laat) op hoofddashboard
+DashboardDisableBlockAgenda=Schakel de duim voor agenda uit
+DashboardDisableBlockProject=Schakel de duim uit voor projecten
+DashboardDisableBlockCustomer=Schakel de duim uit voor klanten
+DashboardDisableBlockSupplier=Schakel de duim uit voor leveranciers
+DashboardDisableBlockContract=Schakel de duim uit voor contracten
+DashboardDisableBlockTicket=Schakel de duim uit voor tickets
+DashboardDisableBlockBank=De duim voor banken uitschakelen
+DashboardDisableBlockAdherent=Schakel de duim uit voor lidmaatschappen
+DashboardDisableBlockExpenseReport=De duim uitschakelen voor onkostendeclaraties
+DashboardDisableBlockHoliday=Schakel de duim voor bladeren uit
+EnabledCondition=Voorwaarde om veld ingeschakeld te hebben (indien niet ingeschakeld, is zichtbaarheid altijd uitgeschakeld)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Als u een tweede belasting wilt gebruiken, moet u ook de eerste omzetbelasting inschakelen
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Als u een derde belasting wilt gebruiken, moet u ook de eerste omzetbelasting inschakelen
+LanguageAndPresentation=Taal en presentatie
+SkinAndColors=Huid en kleuren
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Als u een tweede belasting wilt gebruiken, moet u ook de eerste omzetbelasting inschakelen
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Als u een derde belasting wilt gebruiken, moet u ook de eerste omzetbelasting inschakelen
+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.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index 33617a640f9..10945c6fc8a 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -32,7 +32,7 @@ RIB=Bankrekeningnummer
 IBAN=IBAN nummer
 BIC=BIC/SWIFT code
 SwiftValid=BIC / SWIFT geldig
-SwiftVNotalid=BIC / SWIFT code onjuist
+SwiftNotValid=BIC / SWIFT code onjuist
 IbanValid=IBAN geldig
 IbanNotValid=IBAN onjuist
 StandingOrders=Incasso opdrachten
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Adres bank
 BankAccountCountry=Land van rekening
 BankAccountOwner=Naam rekeninghouder
 BankAccountOwnerAddress=Adres rekeninghouder
-RIBControlError=Fout in rekeningnummer. Dit kan betekenen dat de informatie incompleet of fout is (controleer land, nummers en IBAN).
 CreateAccount=Creëer rekening
 NewBankAccount=Nieuwe rekening
 NewFinancialAccount=Nieuwe financiële rekening
@@ -182,4 +181,4 @@ 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 gedefineerd
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index d26b3736feb..a38b6fc19af 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=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Standaard bankrekening
-PaymentTypeDC=Debet / Kredietkaart
-PaymentTypePP=PayPal
-IdPaymentMode=Betaalwijze (id)
-CodePaymentMode=Betaalwijze (code)
-LabelPaymentMode=Betaalwijze (label)
-PaymentModeShort=Betaalwijze
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Betaalvoorwaarde
 PaymentConditions=Betalingsvoorwaarden
 PaymentConditionsShort=Betalingsvoorwaarden
@@ -280,6 +279,7 @@ SetMode=Stel betalingstype in
 SetRevenuStamp=Instellen fiscaal stempel
 Billed=Gefactureerd
 RecurringInvoices=Terugkerende facturen
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Sjabloon factuur
 RepeatableInvoices=Sjabloon facturen
 Repeatable=Sjabloon
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bankcheque
 PaymentTypeShortTRA=Ontwerp
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debet / Kredietkaart
+PaymentTypePP=PayPal
 BankDetails=Bankgegevens
 BankCode=Bankcode
 DeskCode=Filiaalcode
@@ -604,3 +606,4 @@ 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
+SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for unpaid invoices
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/bookmarks.lang b/htdocs/langs/nl_NL/bookmarks.lang
index 0b61f7532dc..252c069af62 100644
--- a/htdocs/langs/nl_NL/bookmarks.lang
+++ b/htdocs/langs/nl_NL/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Gedrag als een favoriete URL is geselecteerd
 CreateBookmark=Maak weblink
 SetHereATitleForLink=Stel een naam in voor de bladwijzer
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Gebruik een externe / absolute link (https: // URL) of een interne / relatieve link (/ DOLIBARR_ROOT / htdocs / ...)
+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=Kies of de gekoppelde pagina moet worden geopend in het huidige tabblad of een nieuw tabblad
 BookmarksManagement=Internetfavorietenbeheer
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index c3ad737bb59..cc7e2432b00 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=KVK nummer
+ProfId2CM=BTW-id
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Handelsregister
+ProfId2ShortCM=BTW
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,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=U kunt het ook handmatig controleren op de website van de Europese Commissie <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <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 3c377f5240c..ebf78431f3b 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -170,8 +170,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
-RulesResultDue=- Het omvat openstaande facturen, uitgaven, BTW, donaties, of ze nu betaald zijn of niet. Bevat ook betaalde salarissen. <br> - Het is gebaseerd op de factuurdatum van facturen en op de vervaldatum voor uitgaven of belastingbetalingen. Voor salarissen gedefinieerd met Salaris module, wordt de valutadatum van betaling gebruikt.
-RulesResultInOut=- Het omvat de echte betalingen op facturen, uitgaven, btw en salarissen. <br> - Het is gebaseerd op de betalingsdatums van de facturen, uitgaven, btw en salarissen. De donatiedatum voor donatie.
+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=- 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.
@@ -295,3 +296,5 @@ 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/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 76f8f918d62..fe70a2010cb 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -27,7 +27,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=Forbidden by setup rules
 ErrorProdIdIsMandatory=De %s is verplicht
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 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
@@ -111,6 +113,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.
 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
@@ -271,6 +274,9 @@ 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
+ErrorRequestTooLarge=Error, request too large
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Uw PHP-parameter upload_max_filesize (%s) is hoger dan PHP-parameter post_max_size (%s). Dit is geen consistente opstelling.
@@ -312,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/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/holiday.lang b/htdocs/langs/nl_NL/holiday.lang
index 2f9bc8bff0e..6a53892fd5e 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=<b>Verlofsaldo</b> is <b>%s</b> dagen.
+SoldeCPUser=Leave balance (in days) <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.
@@ -134,3 +134,6 @@ 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
+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/nl_NL/install.lang b/htdocs/langs/nl_NL/install.lang
index 5f1eb91c66a..28841f9e4a9 100644
--- a/htdocs/langs/nl_NL/install.lang
+++ b/htdocs/langs/nl_NL/install.lang
@@ -21,6 +21,7 @@ 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.
diff --git a/htdocs/langs/nl_NL/knowledgemanagement.lang b/htdocs/langs/nl_NL/knowledgemanagement.lang
index 38ee66a1fb2..3a3a2589d96 100644
--- a/htdocs/langs/nl_NL/knowledgemanagement.lang
+++ b/htdocs/langs/nl_NL/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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/main.lang b/htdocs/langs/nl_NL/main.lang
index 21f5b0b1230..5cbc2aaf8f2 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -17,12 +17,12 @@ FormatDateShortJQueryInput=dd-mm-yy
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
-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
+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=Databaseverbinding
 NoTemplateDefined=Geen sjabloon beschikbaar voor dit e-mailtype
 AvailableVariables=Beschikbare substitutievariabelen
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Fout, geen BTW-tarieven voor land '%s'.
 ErrorNoSocialContributionForSellerCountry=Fout, geen sociale/fiscale belastingtypen gedefinieerd voor land '%s'.
 ErrorFailedToSaveFile=Fout, bestand opslaan mislukt.
 ErrorCannotAddThisParentWarehouse=U probeert een bovenliggend magazijn toe te voegen dat al een kind van een bestaand magazijn is
+FieldCannotBeNegative=Veld "%s" mag niet negatief zijn
 MaxNbOfRecordPerPage=Max. aantal records per pagina
 NotAuthorized=U bent hiervoor niet bevoegd.
 SetDate=Stel datum in
@@ -87,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=Er is een speciale help-pagina die betrekking heeft op uw huidige scherm
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Startpagina
 RecordSaved=Item opgeslagen
 RecordDeleted=Item verwijderd
@@ -114,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=Deze informatie kan nuttig zijn voor diagnostische doeleinden (u kunt optie $dolibarr_main_prod instellen op '1' om dergelijke kennisgevingen te verwijderen)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Meer informatie
 TechnicalInformation=Technische gegevens
 TechnicalID=Technische ID
@@ -211,6 +212,8 @@ User=Gebruiker
 Users=Gebruikers
 Group=Groep
 Groups=Groepen
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Geen gebruikersgroep gedefinieerd
 Password=Wachtwoord
 PasswordRetype=Herhaal uw wachtwoord
@@ -906,7 +909,7 @@ ViewFlatList=Weergeven als lijst
 ViewAccountList=Grootboek bekijken
 ViewSubAccountList=Bekijk het grootboek van de subrekening
 RemoveString='%s' string verwijderen
-SomeTranslationAreUncomplete=Sommige aangeboden talen zijn mogelijk slechts gedeeltelijk vertaald of kunnen fouten bevatten. Help ons om uw taal te corrigeren door u te registreren op <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> om uw verbeteringen toe te voegen.
+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=Openbare downloadlink
 PublicDownloadLinkDesc=Alleen de link is vereist om het bestand te downloaden
 DirectDownloadInternalLink=Privé downloadlink
@@ -1158,4 +1161,6 @@ Properties=Eigenschappen
 hasBeenValidated=%s is gevalideerd
 ClientTZ=Tijdzone van de gebruiker
 NotClosedYet=Nog niet gesloten
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/nl_NL/modulebuilder.lang b/htdocs/langs/nl_NL/modulebuilder.lang
index fc9d133cfc9..2ce00790ded 100644
--- a/htdocs/langs/nl_NL/modulebuilder.lang
+++ b/htdocs/langs/nl_NL/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Deze tool mag alleen worden gebruikt door ervaren gebruikers of ontwikkelaars. Het biedt hulpprogramma's om uw eigen module te bouwen of te bewerken. Documentatie voor alternatieve <a href="%s" target="_blank">handmatige ontwikkeling kunt u vinden op</a> .
+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.
 ModuleBuilderDesc2=Pad waar modules worden gegenereerd / bewerkt (eerste map voor externe modules gedefinieerd in %s): <strong>%s</strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=De menu&#39;s van uw module / toepassing worden gedefinieerd
 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).
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
+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=Zie ID's die in uw installatie worden gebruikt
 SeeReservedIDsRangeHere=Zie bereik van gereserveerde ID's
 ToolkitForDevelopers=Toolkit voor Dolibarr-ontwikkelaars
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/other.lang b/htdocs/langs/nl_NL/other.lang
index 6b5039bd098..975622be187 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -258,6 +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
 YourPasswordHasBeenReset=Uw wachtwoord is met succes gereset
 ApplicantIpAddress=IP-adres van aanvrager
 SMSSentTo=SMS verzonden naar %s
@@ -268,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=Login with %s
 
 ##### Export #####
 ExportsArea=Uitvoeroverzicht
diff --git a/htdocs/langs/nl_NL/partnership.lang b/htdocs/langs/nl_NL/partnership.lang
index 0552ee26c91..35dd4eae2c0 100644
--- a/htdocs/langs/nl_NL/partnership.lang
+++ b/htdocs/langs/nl_NL/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Partnerschap beheer
 PartnershipDescription=Module Partnerschap beheer
 PartnershipDescriptionLong= Module Partnerschap beheer
-
+Partnership=Partnership
 AddPartnership=Partnerschap toevoegen
 CancelPartnershipForExpiredMembers=Partnerschap: annuleer partnerschap van leden met verlopen abonnementen
 PartnershipCheckBacklink=Partnerschap: controleer verwijzende backlink
diff --git a/htdocs/langs/nl_NL/productbatch.lang b/htdocs/langs/nl_NL/productbatch.lang
index ef767b30302..e40e26e4177 100644
--- a/htdocs/langs/nl_NL/productbatch.lang
+++ b/htdocs/langs/nl_NL/productbatch.lang
@@ -30,15 +30,16 @@ ManageLotMask=Aangepast masker
 CustomMasks=Optie om voor elk product een ander soort nummer te gebruiken
 BatchLotNumberingModules=Regel voor automatische generatie van het lot nummer
 BatchSerialNumberingModules=Regel voor de automatische generatie van het serienummer (alleen voor producten met een uniek serienummer per product)
-QtyToAddAfterBarcodeScan=Aantal toe te voegen voor elke gescande barcode/lot/serie
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Levensduur (in dagen)
 EndOfLife=Einde van het leven
 ManufacturingDate=Fabricage datum
 DestructionDate=Vernietigingsdatum:
 FirstUseDate=Datum eerste gebruik
 QCFrequency=Frequentie kwaliteitscontrole (in dagen)
-ShowAllLots=Show all lots
-HideLots=Hide lots
+ShowAllLots=Toon alle kavels
+HideLots=Verberg kavels
 #Traceability - qc status
 OutOfOrder=Buiten gebruik
 InWorkingOrder=In werkende staat
+ToReplace=vervang
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 8950bd24ffe..34f85416272 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Waardering (PMP)
 PMPValueShort=Waarde
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 539e4c867b1..9d586de6b52 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -197,6 +197,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=Projects with this contact
 TasksWithThisUserAsContact=Taken toegekend aan gebruiker
 ResourceNotAssignedToProject=Niet toegewezen aan project
 ResourceNotAssignedToTheTask=Niet toegewezen aan de taak
@@ -284,3 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Opmerking: de voortgang van bes
 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>.
+ProjectsHavingThisContact=Projects having this contact
+StartDateCannotBeAfterEndDate=Einddatum kan niet vóór startdatum liggen
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 216a73f4b90..aa26e6ddf0d 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Voorraad alarm en gewenste optimale voorraad correc
 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
 InventoryDate=Datum inventarisatie
+Inventories=Inventariseringen
 NewInventory=Nieuwe inventarisatie
 inventorySetup = Setup inventarisatie
 inventoryCreatePermission=Aanmaken nieuwe inventarisatie
@@ -206,8 +207,8 @@ 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=Theoretisch aantal
-TheoricalValue=Theoretisch aantal
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Laatste BP
 CurrentPA=Curent BP
 RecordedQty=Aantal opgenomen
@@ -240,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=Vul het werkelijke aantal door te scannen
+UpdateByScaning=Complete real qty by scaning
 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.
@@ -253,14 +254,20 @@ 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=Vul de werkelijke hoeveelheid in met de verwachte hoeveelheid
+AutofillWithExpected=Replace real quantity with expected quantity
 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
-FieldCannotBeNegative=Veld "%s" mag niet negatief zijn
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=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
diff --git a/htdocs/langs/nl_NL/stripe.lang b/htdocs/langs/nl_NL/stripe.lang
index e7d3308cdfe..907a444c058 100644
--- a/htdocs/langs/nl_NL/stripe.lang
+++ b/htdocs/langs/nl_NL/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe-module instellen
-StripeDesc=Bied klanten een Stripe online betaalpagina voor betalingen met credit / cebit-kaarten via <a href="http://www.stripe.com" target="_blank">Stripe</a> . Dit kan worden gebruikt om uw klanten toe te staan ad-hocbetalingen te doen of voor betalingen met betrekking tot een bepaald Dolibarr-object (factuur, bestelling, ...)
+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=Betaal met creditcard of Stripe
 FollowingUrlAreAvailableToMakePayments=De volgende URL's zijn beschikbaar om een pagina te bieden aan afnemers voor het doen van een betaling van Dolibarr objecten
 PaymentForm=Betalingsformulier
@@ -28,7 +28,6 @@ AccountParameter=Accountwaarden
 UsageParameter=Met gebruik van de waarden
 InformationToFindParameters=Hulp om uw %s accountinformatie te vinden
 STRIPE_CGI_URL_V2=URL van Stripe CGI-module voor betaling
-VendorName=Verkopersnaam
 CSSUrlForPaymentForm=URL van het CSS-stijlbestand voor het betalingsformulier
 NewStripePaymentReceived=Nieuwe Stripe-betaling ontvangen
 NewStripePaymentFailed=Nieuwe Stripe-betaling geprobeerd, maar mislukt
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index 6d0b0e17261..dd8c76e75ee 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Betalingsopdracht
 LatestBankTransferReceipts=Laatste %s overboekingsopdrachten
 LastWithdrawalReceipts=Laatste %s incassobestanden
 WithdrawalsLine=Incasso-orderregel
+CreditTransfer=Overschrijving
 CreditTransferLine=Overschrijvingsregel
 WithdrawalsLines=Regels voor automatische incasso
 CreditTransferLines=Overschrijvingsregels
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Bankcode van derden
 NoInvoiceCouldBeWithdrawed=Geen factuur afgeschreven. Controleer of de facturen betrekking hebben op bedrijven met een geldige IBAN en dat IBAN een UMR (Unique Mandate Reference) met modus <strong>%s heeft</strong> .
 WithdrawalCantBeCreditedTwice=Dit opnamebewijs is al gemarkeerd als gecrediteerd; dit kan niet twee keer worden gedaan, omdat dit mogelijk dubbele betalingen en bankboekingen zou veroorzaken.
 ClassCredited=Classificeer creditering
+ClassDebited=Classify debited
 ClassCreditedConfirm=Weet u zeker dat u deze intrekkingsontvangst als bijgeschreven op uw bankrekening wilt classificeren?
 TransData=Datum transmissie
 TransMetod=Transmissiewijze
@@ -80,7 +82,7 @@ StatusMotif7=Gerechtelijke beslissing
 StatusMotif8=Andere reden
 CreateForSepaFRST=Maak een domiciliëringsbestand (SEPA FRST)
 CreateForSepaRCUR=Maak een domiciliëringsbestand (SEPA RCUR)
-CreateAll=Maak een domiciliëringsbestand (alles)
+CreateAll=Aanmaken incassobestand
 CreateFileForPaymentByBankTransfer=Maak bestand aan met overboekingen
 CreateSepaFileForPaymentByBankTransfer=Maak een overboekingsbestand (SEPA) aan
 CreateGuichet=Alleen kantoor
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Kan geen automatische incasso-aanvraag maken voor
 SepaMandate=Machtiging doorlopende SEPA incasso
 SepaMandateShort=SEPA-mandaat
 PleaseReturnMandate=Stuur dit machtigingsformulier per e-mail naar\n%s of per post naar:
-SEPALegalText=Door dit machtigingsformulier te ondertekenen, machtigt u (A) %s om uw bank opdracht te geven om uw rekening te belasten en (B) een bedrag van uw rekening af te schrijven overeenkomstig de instructies van %s. Als onderdeel van uw rechten heeft u recht op terugbetaling overeenkomstig de voorwaarden van uw overeenkomst met uw bank. Een stornering moet plaats vinden binnen 8 weken gerekend vanaf de datum waarop het bedrag is afgeschreven. De voorwaarden met betrekking tot de bovenstaande volmacht kunt u verkrijgen bij uw bank.
+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=Incassant id.
 CreditorName=Naam crediteur
 SEPAFillForm=(B) Alle velden met een * zijn verplicht.
@@ -150,3 +152,5 @@ ModeWarning=Optie voor echte modus was niet ingesteld, we stoppen na deze simula
 ErrorCompanyHasDuplicateDefaultBAN=Bedrijf met id %s heeft meer dan één standaard bankrekening. Er is geen manier aanwezig om te weten welke u moet gebruiken.
 ErrorICSmissing=ICS ontbreekt op bankrekening %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Totaal bedrag incasso-opdracht verschilt van som van regels
+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
diff --git a/htdocs/langs/nl_NL/workflow.lang b/htdocs/langs/nl_NL/workflow.lang
index 499a1ce0242..1fc5df1b3ad 100644
--- a/htdocs/langs/nl_NL/workflow.lang
+++ b/htdocs/langs/nl_NL/workflow.lang
@@ -13,10 +13,14 @@ descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classificeer het gekoppelde bronvoor
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classificeer gekoppelde bronverkooporder als gefactureerd wanneer klantfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van de gekoppelde bestelling)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classificeer gekoppelde bronverkooporder als gefactureerd wanneer klantfactuur is ingesteld op betaald (en als het factuurbedrag gelijk is aan het totale bedrag van de gekoppelde bestelling)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classificeer gekoppelde bronverkooporder als verzonden wanneer een zending is gevalideerd (en als de hoeveelheid die door alle zendingen is verzonden dezelfde is als in de te updaten bestelling)
-descWORKFLOW_ORDER_CLASSIFY_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 order
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classificeer gekoppelde bronverkooporder als verzonden wanneer een zending is gesloten (en als de hoeveelheid die door alle zendingen wordt verzonden hetzelfde is als in de order die moet worden bijgewerkt)
+# Autoclassify purchase proposal
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classificeer het gekoppelde bronvoorstel als gefactureerd wanneer de leveranciersfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van het gekoppelde voorstel)
+# Autoclassify purchase order
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classificeer gekoppelde inkooporder als gefactureerd wanneer leveranciersfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van de gekoppelde order)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classificeer inkooporder met gekoppelde bron als ontvangen wanneer een ontvangst is gevalideerd (en als de hoeveelheid die door alle ontvangsten is ontvangen hetzelfde is als in de inkooporder die moet worden bijgewerkt)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classificeer inkooporder met gekoppelde bron als ontvangen wanneer een ontvangst wordt gesloten (en als de hoeveelheid die door alle ontvangsten wordt ontvangen hetzelfde is als in de inkooporder die moet worden bijgewerkt)
+# Autoclassify purchase invoice
 descWORKFLOW_BILL_ON_RECEPTION=Classificeer ontvangsten als "gefactureerd" wanneer een gekoppelde inkooporder wordt gevalideerd
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Sluit alle interventies die aan het ticket zijn gekoppeld wanneer een ticket is gesloten
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index 5117f33c04e..7da1ad57bcd 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=Kraje spoza UE
 CountriesInEECExceptMe=Kraje UE oprócz %s
 CountriesExceptMe=Wszystkie kraje oprócz %s
 AccountantFiles=Eksportuj dokumenty źródłowe
-ExportAccountingSourceDocHelp=Za pomocą tego narzędzia możesz wyeksportować zdarzenia źródłowe (listę w formacie CSV i PDF), które zostały użyte do wygenerowania Twojej księgowości.
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
 ExportAccountingSourceDocHelp2=Aby wyeksportować swoje dzienniki, użyj pozycji menu %s - %s.
 VueByAccountAccounting=Wyświetl według konta księgowego
 VueBySubAccountAccounting=Wyświetl według subkonta księgowego
@@ -286,7 +286,7 @@ ValidateMovements=Zatwierdź ruchy
 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=Automatyczne dowiązanie ukończone
+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
@@ -387,7 +387,8 @@ SaleExport=Sprzedaż eksportowa
 SaleEEC=Sprzedaż w EWG
 SaleEECWithVAT=Sprzedaż w EWG z podatkiem VAT niezerowym, więc przypuszczamy, że NIE jest to sprzedaż wewnątrzwspólnotowa, a sugerowane konto to standardowe konto produktu.
 SaleEECWithoutVATNumber=Sprzedaż w EWG bez podatku VAT, ale identyfikator VAT strony trzeciej nie jest zdefiniowany. Wracamy na konto produktu dla sprzedaży standardowej. W razie potrzeby możesz poprawić identyfikator VAT strony trzeciej lub konto produktu.
-
+ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
+ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
 Range=Zakres konta księgowego
 Calculated=Przeliczone
@@ -404,6 +405,7 @@ NoJournalDefined=Nie zdefiniowano dziennika
 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
 
 ## Import
 ImportAccountingEntries=Zapisy księgowe
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index b48520c89f9..6fc8a9744cd 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Fundacja
 Version=Wersja
 Publisher=Wydawca
@@ -265,8 +267,8 @@ OtherResources=Inne zasoby
 ExternalResources=Zasoby zewnętrzne
 SocialNetworks=Sieci społecznościowe
 SocialNetworkId=Identyfikator sieci społecznościowej
-ForDocumentationSeeWiki=Aby zapoznać się z dokumentacją użytkownika lub dewelopera (Doc, FAQ ...), <br> zajrzyj do Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
-ForAnswersSeeForum=Aby znaleźć odpowiedzi na pytania / uzyskać dodatkową pomoc, możesz skorzystać z  forum Dolibarr : <br> <a href="%s" target="_blank"><b> %s</b></a>
+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=Oto niektóre zasoby pozwalające uzyskać pomoc i wsparcie z Dolibarr.
 HelpCenterDesc2=Niektóre z tych zasobów są dostępne tylko w języku <b>angielskim</b>.
 CurrentMenuHandler=Aktualne menu obsługi
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Ostatnia stabilna wersja
 LastActivationDate=Data ostatniej aktywacji
 LastActivationAuthor=Najnowszy autor aktywacji
 LastActivationIP=Numer IP ostatniej aktywacji
+LastActivationVersion=Latest activation version
 UpdateServerOffline=Aktualizacja serwera nieaktywny
 WithCounter=Zarządzaj licznikiem
 GenericMaskCodes=Możesz wprowadzić dowolną maskę numeracji. W tej masce można użyć następujących tagów: <br> <b> {000000} </b> odpowiada liczbie, która będzie zwiększana na każdym %s. Wpisz tyle zer, ile chcesz długości licznika. Licznik zostanie uzupełniony zerami od lewej, aby mieć tyle zer, ile jest w masce. <br> <b> {000000 + 000} </b> taki sam jak poprzedni, ale przesunięcie odpowiadające liczbie po prawej stronie znaku + jest stosowane począwszy od pierwszego %s. <br> <b> {000000 @ x} </b> tak samo jak poprzedni, ale licznik jest resetowany do zera po osiągnięciu miesiąca x (x między 1 a 12 lub 0, aby użyć pierwszych miesięcy roku podatkowego zdefiniowanego w konfiguracji lub zerować co miesiąc). Jeśli ta opcja jest używana, a x wynosi 2 lub więcej, to sekwencja {yy} {mm} lub {yyyy} {mm} jest również wymagana. <br> <b> {dd} </b> dzień (od 01 do 31). <br> <b> {mm} </b> miesiąc (od 01 do 12). <br> <b> {yy} </b>, <b> {yyyy} </b> lub <b> {y}</b>rok powyżej 2, 4 lub 1 numerów.<br>
@@ -753,7 +756,7 @@ Permission106=Eksportuj wysyłki
 Permission109=Usuń wysyłki
 Permission111=Czytaj raporty finansowe
 Permission112=Tworzenie / modyfikacja / usuwanie oraz porównywanie transakcji
-Permission113=Konfiguracja sprawozdań finansowych (tworzenie, zarządzanie kategoriami)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Uzgodnij transakcje
 Permission115=Eksport transakcji oraz oświadczeń obrachunkowych
 Permission116=Przelewy pomiędzy rachunkami
@@ -762,6 +765,7 @@ Permission121=Przeglądaj kontrahentów związanych z użytkownikiem
 Permission122=Tworzenie / modyfikacja stron trzecich związanych z użytkownikiem
 Permission125=Usuń kontrahentów związanych z użytkownikiem z użytkownikiem
 Permission126=Eksport stron trzecich
+Permission130=Create/modify third parties payment information
 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)
@@ -889,12 +893,11 @@ Permission701=Zobacz darowizny
 Permission702=Tworzenie / modyfikacja darowizn
 Permission703=Usuń darowizny
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Tworzenie/modyfikacja raportów kosztów
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Usuń raporty wydatków
-Permission774=Przeczytaj wszystkie raporty wydatków (nawet dla użytkowników nie podwładni)
 Permission775=Zatwierdzanie raportów wydatków
 Permission776=Zapłać raporty wydatków
-Permission777=Przeczytaj raporty wydatków wszystkich
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Twórz/modyfikuj raporty wydatków dla wszystkich
 Permission779=Eksport raportów kosztów
 Permission1001=Zobacz zasoby
@@ -958,15 +961,11 @@ Permission2801=Użyj klienta FTP w trybie odczytu (tylko przeglądanie i pobiera
 Permission2802=Użyj klienta FTP w trybie zapisu (usuwanie lub przesyłanie plików)
 Permission3200=Czytaj zarchiwizowane wydarzenia i odciski palców
 Permission3301=Wygeneruj nowe moduły
-Permission4001=Zobacz pracowników
-Permission4002=Twórz pracowników
-Permission4003=Usuń pracowników
-Permission4004=Eksportuj pracowników
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ Permission10005=Usuń zawartość witryny
 Permission20001=Przeczytaj wnioski urlopowe (Twoje i Twoich podwładnych)
 Permission20002=Twórz/modyfikuj swoje wnioski urlopowe (urlop swój i podwładnych)
 Permission20003=Delete leave requests
-Permission20004=Przeczytaj wszystkie wnioski urlopowe (nawet użytkowników, którzy nie są podwładnymi)
-Permission20005=Twórz/modyfikuj wnioski urlopowe dla wszystkich (nawet użytkowników niebędących podwładnymi)
-Permission20006=Admin leave requests (setup and update balance)
+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=Zatwierdź wnioski urlopowe
 Permission23001=Czytaj Zaplanowane zadania
 Permission23002=Tworzenie / aktualizacja Zaplanowanych zadań
@@ -1358,9 +1357,9 @@ BrowserIsOK=Używasz przeglądarki internetowej %s. Ta przeglądarka jest dobra
 BrowserIsKO=Używasz przeglądarki internetowej %s. Wiadomo, że ta przeglądarka jest złym wyborem pod względem bezpieczeństwa, wydajności i niezawodności. Zalecamy używanie przeglądarki Firefox, Chrome, Opera lub Safari.
 PHPModuleLoaded=Ładowany jest komponent PHP %s
 PreloadOPCode=Używany jest wstępnie załadowany kod OPCode
-AddRefInList=Wyświetl numer klienta/dostawcy lista informacji (lista wyboru lub pole wyboru) i większość hiperłączy. <br> Strony trzecie będą wyświetlane z nazwą w formacie „CC12345 - SC45678 - The Big Company corp”. zamiast „The Big Company corp”.
-AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=Wyświetl listę informacji o adresach klientów / dostawców (lista wyboru lub pole wyboru) <br> Osoby trzecie będą wyświetlane z nazwą w formacie „The Big Company corp. - 21 jump street 123456 Big town - USA” zamiast „The Big Company corp”.
+AddRefInList=Display Customer/Vendor ref. into combo lists.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
+AddVatInList=Display Customer/Vendor VAT number into combo lists.
+AddAdressInList=Display Customer/Vendor adress into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Wyświetl kontaktowy adres e-mail (lub telefony, jeśli nie zostały zdefiniowane) i listę informacji o mieście (lista wyboru lub pole wyboru) <br> Kontakty będą wyświetlane z nazwami w formacie „Dupond Durand - dupond.durand@email.com - Paryż” lub „Dupond Durand - 06 07 59 65 66 - Paryż "zamiast" Dupond Durand ".
 AskForPreferredShippingMethod=Zapytaj o preferowaną metodę wysyłki dla stron trzecich.
 FieldEdition=Edycja pola% s
@@ -1708,8 +1707,9 @@ MailingDelay=Sekund po wysłaniu czekać następnej wiadomości
 NotificationSetup=Konfiguracja modułu powiadomień e-mail
 NotificationEMailFrom=E-mail nadawcy (Od) dla wiadomości e-mail wysłanych przez moduł Powiadomienia
 FixedEmailTarget=Odbiorca
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Konfiguracja modułu wysyłkowego
 SendingsReceiptModel=Wysyłanie otrzymania modelu
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Dowolny tekst na dokumentach dostawy
 ##### FCKeditor #####
 AdvancedEditor=Zaawansowany edytor
 ActivateFCKeditor=Uaktywnij FCKeditor za:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field public notes of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field private notes of elements
+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 tworzenie/edycja linii szczegółów produktów dla wszystkich podmiotów (oferty, zamówienia, faktury itp.). <span class="warning"> Ostrzeżenie: Używanie tej opcji w tym przypadku zdecydowanie nie jest zalecane, ponieważ może powodować problemy ze znakami specjalnymi i formatowaniem stron podczas tworzenia plików PDF. </span>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Ustawienia modułu "Raporty wydatków" - Reguły
 ExpenseReportNumberingModules=Moduł "Numerowanie raportów wydatków"
 NoModueToManageStockIncrease=Nie Moduł stanie zarządzać automatyczny wzrost akcji zostało aktywowane. Wzrost Zdjęcie zostanie zrobione tylko na ręczne wprowadzanie.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Opcje powiadomień e-mail można znaleźć, włączając i konfigurując moduł „Powiadomienia”.
+TemplatesForNotifications=Templates for notifications
 ListOfNotificationsPerUser=Lista automatycznych powiadomień na użytkownika*
 ListOfNotificationsPerUserOrContact=Lista możliwych automatycznych powiadomień (o wydarzeniach biznesowych) dostępnych dla użytkownika* lub kontaktu**
 ListOfFixedNotifications=Lista automatycznych stałych powiadomień
@@ -1916,6 +1917,8 @@ 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ć)
+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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Czy chcesz teraz uruchomić kolekcję dla tego kole
 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)
-RecordEvent=Nagraj wydarzenie e-mail
-CreateLeadAndThirdParty=Utwórz potencjalnego klienta (i osobę trzecią, jeśli to konieczne)
-CreateTicketAndThirdParty=Utwórz bilet (i link do strony trzeciej, jeśli został załadowany przez poprzednią operację)
+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=Kod najnowszego wyniku
 NbOfEmailsInInbox=Liczba e-maili w katalogu źródłowym
 LoadThirdPartyFromName=Załaduj wyszukiwanie osób trzecich na %s (tylko ładowanie)
 LoadThirdPartyFromNameOrCreate=Załaduj wyszukiwanie osób trzecich na %s (utwórz, jeśli nie znaleziono)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Wiadomość z rozmowy zainicjowanej pierwszym e-mailem wysłanym przez Dolibarr
 WithoutDolTrackingID=Wiadomość z rozmowy zainicjowanej pierwszym e-mailem NIE wysłanym od Dolibarr
 WithDolTrackingIDInMsgId=Wiadomość wysłana przez Dolibarr
@@ -2078,7 +2082,7 @@ CreateCandidature=Utwórz podanie o pracę
 FormatZip=Paczka Zip
 MainMenuCode=Kod wejścia menu (menu główne)
 ECMAutoTree=Pokaż automatyczne drzewo ECM
-OperationParamDesc=Zdefiniuj wartości, które mają być używane dla obiektu akcji, lub sposób wyodrębniania wartości. Na przykład: <br> objproperty1 = SET: wartość do ustawienia <br> objproperty2 = SET: wartość zastępująca __objproperty1__ <br> objproperty3 = SETIFEMPTY: wartość używana, jeśli objproperty3 nie jest jeszcze zdefiniowana a0342 objproperty3: ([^ \\ s] *) <br> options_myextrafield1 = EXTRACT: SUBJECT: ([^ & # 92; n] *) <br> object.objproperty5 = WYCIĄG: BODY: Nazwa mojej firmy to \\ s ([^ \\ s] *) a0342fccfda <br> Użyj a; char jako separator, aby wyodrębnić lub ustawić kilka właściwości.
+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=Godziny otwarcia
 OpeningHoursDesc=Wpisz tutaj regularne godziny otwarcia swojej firmy.
 ResourceSetup=Konfiguracja modułu zasobów
@@ -2124,7 +2128,7 @@ LargerThan=Większy niż
 IfTrackingIDFoundEventWillBeLinked=Zwróć uwagę, że jeśli identyfikator śledzenia obiektu zostanie znaleziony w wiadomości e-mail lub jeśli wiadomość e-mail jest odpowiedzią na wiadomość e-mail, która jest już zebrana i powiązana z obiektem, utworzone zdarzenie zostanie automatycznie połączone ze znanym powiązanym obiektem.
 WithGMailYouCanCreateADedicatedPassword=W przypadku konta Gmail, jeśli włączyłeś weryfikację dwuetapową, zaleca się utworzenie dedykowanego drugiego hasła dla aplikacji zamiast używania własnego hasła do konta ze strony https://myaccount.google.com/.
 EmailCollectorTargetDir=Przeniesienie wiadomości e-mail do innego tagu / katalogu po pomyślnym przetworzeniu może być pożądanym zachowaniem. Po prostu ustaw tutaj nazwę katalogu, aby skorzystać z tej funkcji (NIE używaj znaków specjalnych w nazwie). Pamiętaj, że musisz również użyć konta logowania do odczytu / zapisu.
-EmailCollectorLoadThirdPartyHelp=Możesz użyć tej akcji, aby użyć treści wiadomości e-mail do znalezienia i załadowania istniejącej strony trzeciej w bazie danych. Znaleziona (lub utworzona) strona trzecia będzie używana do wykonywania czynności, które tego wymagają. <br> Na przykład, jeśli chcesz utworzyć osobę trzecią z nazwą wyodrębnioną w treści ciągu „Nazwa: nazwa do znalezienia”, użyj adresu e-mail nadawcy jako adresu e-mail, możesz ustawić pole parametru w następujący sposób: <br> 'email=NAGŁÓWEK: ^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
+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=Punkt końcowy dla %s: %s
 DeleteEmailCollector=Usuń moduł zbierający e-maile
 ConfirmDeleteEmailCollector=Czy na pewno chcesz usunąć tego kolektora e-maili?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index 448d3f981f0..eeb84654c7f 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -32,7 +32,7 @@ RIB=Numer konta bankowego
 IBAN=Numer IBAN
 BIC=Kod BIC / SWIFT
 SwiftValid=Ważny BIC/SWIFT
-SwiftVNotalid=Nie ważny BIC/SWIFT
+SwiftNotValid=Nie ważny BIC/SWIFT
 IbanValid=Ważny BAN
 IbanNotValid=Nie ważny BAN
 StandingOrders=Polecenia zapłaty
@@ -49,7 +49,6 @@ BankAccountDomiciliation=numer konta
 BankAccountCountry=Konto kraju
 BankAccountOwner=Nazwa właściciela konta
 BankAccountOwnerAddress=Adres właściciela konta
-RIBControlError=Sprawdzanie integralności wartości nie powiodło się. Oznacza to, że informacje dotyczące tego numeru konta są niekompletne lub nieprawidłowe (sprawdź kraj, numery i IBAN).
 CreateAccount=Załóż konto
 NewBankAccount=Nowe konto
 NewFinancialAccount=Nowy rachunek finansowy
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index f836848b28e..017df02ad28 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=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 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=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Termin płatności
 PaymentConditions=Zasady płatności
 PaymentConditionsShort=Zasady płatności
@@ -280,6 +279,7 @@ SetMode=Ustaw typ płatności
 SetRevenuStamp=Ustaw znaczek skarbowy
 Billed=Billed
 RecurringInvoices=Faktury cykliczne
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Szablon faktury
 RepeatableInvoices=Szablon faktur
 Repeatable=Szablon
@@ -293,9 +293,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 +449,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
@@ -604,3 +606,4 @@ 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
+SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for unpaid invoices
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/bookmarks.lang b/htdocs/langs/pl_PL/bookmarks.lang
index 9b9b9fcd3e1..e6af615fb24 100644
--- a/htdocs/langs/pl_PL/bookmarks.lang
+++ b/htdocs/langs/pl_PL/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Zachowanie gdy wybrana jest zakładka URL
 CreateBookmark=Stwórz zakładkę
 SetHereATitleForLink=Ustaw nazwę zakładki
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Użyj linku zewnętrznego/bezwzględnego (https://URL) lub linku wewnętrznego/względnego (/DOLIBARR_ROOT/htdocs/...)
+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=Wybierz, czy połączona strona ma otwierać się w bieżącej karcie, czy w nowej karcie
 BookmarksManagement=Zarządzanie zakładkami
 BookmarksMenuShortCut=Ctrl + Shift + M.
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 3ffb0d48f53..54dd52b18f7 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -157,6 +157,18 @@ 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 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -331,7 +343,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
@@ -369,7 +381,7 @@ VATIntraCheck=Sprawdź
 VATIntraCheckDesc=Identyfikator VAT musi zawierać prefiks kraju. Łącze <b> %s </b> korzysta z usługi europejskiego sprawdzania podatku VAT (VIES), która wymaga dostępu do Internetu z serwera Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do?locale=pl
 VATIntraCheckableOnEUSite=Sprawdź wewnątrzwspólnotowy identyfikator VAT na stronie internetowej Komisji Europejskiej
-VATIntraManualCheck=Możesz również sprawdzić ręcznie na stronie internetowej Komisji Europejskiej <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Brak możliwości sprawdzenia. Usługa nie jest dostarczana dla wybranego regionu (%s).
 NorProspectNorCustomer=Ani potencjalny klient, ani potencjalny klient
 JuridicalStatus=Typ podmiotu gospodarczego
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 301ddef8529..b99e4224bed 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -170,8 +170,9 @@ SeeReportInInputOutputMode=Zobacz <b> %sanaliza płatnościs%s </b> w celu oblic
 SeeReportInDueDebtMode=Zobacz <b> %sanalizę zapisanych dokumentów%s </b> w celu obliczenia opartego na znanych <b> zapisanych dokumentach </b>, nawet jeśli nie zostały jeszcze zaksięgowane w księdze
 SeeReportInBookkeepingMode=Zobacz <b> %sanaliza tabeli księgi rachunkowej %s </b> dla raportu opartego na <b> Tabela księgi rachunkowej </b>
 RulesAmountWithTaxIncluded=- Kwoty podane są łącznie z podatkami
-RulesResultDue=- Obejmuje zaległe faktury, wydatki, podatek VAT, darowizny, niezależnie od tego, czy zostały zapłacone, czy nie. Obejmuje również wypłacane pensje. <br> - Opiera się na dacie fakturowania faktur i terminie płatności wydatków lub podatków. W przypadku wynagrodzeń zdefiniowanych w module Wynagrodzenia stosowana jest data waluty płatności.
-RulesResultInOut=- Obejmuje rzeczywiste płatności dokonywane za faktury, koszty, podatek VAT oraz wynagrodzenia. <br> Opiera się na  datach płatności faktur, wygenerowania kosztów, podatku VAT oraz wynagrodzeń. Dla darowizn brana jest pod uwagę data przekazania darowizny.
+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=- Obejmuje należne faktury klienta, niezależnie od tego, czy są opłacone, czy nie. <br> - Opiera się na dacie rozliczenia tych faktur. <br>
 RulesCAIn=- Obejmuje wszystkie efektywne płatności faktur otrzymanych od klientów. <br> - Opiera się na dacie płatności tych faktur <br>
 RulesCATotalSaleJournal=Obejmuje wszystkie linie kredytowe z dziennika Sprzedaż.
@@ -295,3 +296,5 @@ 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/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 2d9636da330..2022a84943f 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -27,7 +27,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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Nie dostać kanału RSS. Spróbuj dodać stałą MAIN_S
 ErrorForbidden=Brak dostępu. <br> Próby uzyskania dostępu do strony, strefy lub funkcji modułu niepełnosprawnej lub bez w uwierzytelnionej sesji lub że nie jest dozwolone do użytkownika.
 ErrorForbidden2=Wykorzystanie tej nazwie może być zdefiniowana przez administratora z menu Dolibarr %s-> %s.
 ErrorForbidden3=Wydaje się, że Dolibarr nie jest używany przez uwierzytelniane sesji. Rzuć okiem na Dolibarr konfiguracji dokumentacji wiedzieć, jak zarządzać authentications (htaccess, mod_auth lub innych ...).
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=Funkcja imagick_readimage nie jest w tej PHP. Podgląd może być dostępny. Administratorzy mogą wyłączyć tę zakładkę z menu Ustawienia - Ekran.
 ErrorRecordAlreadyExists=Wpis już istnieje
 ErrorLabelAlreadyExists=Ta etykieta już istnieje
@@ -271,6 +274,9 @@ 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
 
 # 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.
@@ -312,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/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/holiday.lang b/htdocs/langs/pl_PL/holiday.lang
index b0140ba5660..213cee94d5b 100644
--- a/htdocs/langs/pl_PL/holiday.lang
+++ b/htdocs/langs/pl_PL/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Opis
 SendRequestCP=Tworzenie wniosku urlopowego
 DelayToRequestCP=Wniosek urlopowy musi być stworzony przynajmniej <b>%s dzień (i) </b> przed jego rozpoczęciem.
 MenuConfCP=Bilans urlopu
-SoldeCPUser=Saldo urlopów wynosi <b> %s </b> dni.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Musisz wybrać datę zakończenia większą niż data rozpoczęcia.
 ErrorSQLCreateCP=Wystąpił błąd SQL podczas tworzenia:
 ErrorIDFicheCP=Wystąpił błąd, wniosek urlopowy nie istnieje.
@@ -134,3 +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/install.lang b/htdocs/langs/pl_PL/install.lang
index 9fa0c4aad9b..870648cef15 100644
--- a/htdocs/langs/pl_PL/install.lang
+++ b/htdocs/langs/pl_PL/install.lang
@@ -21,6 +21,7 @@ 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.
diff --git a/htdocs/langs/pl_PL/knowledgemanagement.lang b/htdocs/langs/pl_PL/knowledgemanagement.lang
index 4d4512568ab..151ac57072a 100644
--- a/htdocs/langs/pl_PL/knowledgemanagement.lang
+++ b/htdocs/langs/pl_PL/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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)
 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/main.lang b/htdocs/langs/pl_PL/main.lang
index c4bc05dc429..88b8bc002a5 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Błąd, nie określono stawki VAT dla kraj
 ErrorNoSocialContributionForSellerCountry=Błąd, brak określonej stopy podatkowej dla kraju '%s'.
 ErrorFailedToSaveFile=Błąd, nie udało się zapisać pliku.
 ErrorCannotAddThisParentWarehouse=Próbujesz dodać magazyn nadrzędny, który jest już podrzędny w stosunku do istniejącego magazynu
+FieldCannotBeNegative=Pole „%s” nie może być ujemne
 MaxNbOfRecordPerPage=Max. ilość wierszy na stronę
 NotAuthorized=Nie masz autoryzacji aby to zrobić
 SetDate=Ustaw datę
@@ -87,7 +88,7 @@ FileWasNotUploaded=Wybrano pliku do zamontowaia, ale jeszcze nie wysłano. W tym
 NbOfEntries=Liczba wpisów
 GoToWikiHelpPage=Przeczytaj pomoc online (wymaga połączenia z internetem)
 GoToHelpPage=Przeczytaj pomoc
-DedicatedPageAvailable=Istnieje specjalna strona pomocy związana z bieżącym ekranem
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Strona główna
 RecordSaved=Rekord zapisany
 RecordDeleted=Rekord usunięty
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Kod zwrotny ostatniego błędu żądania dostępu do
 InformationLastAccessInError=Informacje o najnowszym błędzie żądania dostępu do bazy danych
 DolibarrHasDetectedError=Dolibarr wykrył błąd techniczny
 YouCanSetOptionDolibarrMainProdToZero=Możesz przeczytać plik dziennika lub ustawić opcję $ dolibarr_main_prod na „0” w pliku konfiguracyjnym, aby uzyskać więcej informacji.
-InformationToHelpDiagnose=Te informacje mogą być przydatne do celów diagnostycznych (możesz ustawić opcję $ dolibarr_main_prod na „1”, aby usunąć takie powiadomienia)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Więcej informacji
 TechnicalInformation=Informację techniczne
 TechnicalID=Techniczne ID
@@ -211,6 +212,8 @@ User=Użytkownik
 Users=Użytkownicy
 Group=Grupa
 Groups=Grupy
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Niezdefiniowano grup użytkowników
 Password=Hasło
 PasswordRetype=Powtórz hasło
@@ -399,7 +402,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)
@@ -906,7 +909,7 @@ ViewFlatList=Zobacz płaską listę
 ViewAccountList=Wyświetl księgę
 ViewSubAccountList=Wyświetl księgę subkontową
 RemoveString=Usuń ciąg '%s'
-SomeTranslationAreUncomplete=Niektóre z oferowanych języków mogą być przetłumaczone tylko częściowo lub mogą zawierać błędy. Pomóż poprawić język, rejestrując się pod adresem <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> w celu dodania ulepszeń.
+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=Publiczny link do pobrania
 PublicDownloadLinkDesc=Do pobrania pliku wymagane jest tylko łącze
 DirectDownloadInternalLink=Prywatny link do pobrania
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Strefa Czasowa Klienta (użytkownik)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/pl_PL/modulebuilder.lang b/htdocs/langs/pl_PL/modulebuilder.lang
index 10ca390035c..85965e26f1c 100644
--- a/htdocs/langs/pl_PL/modulebuilder.lang
+++ b/htdocs/langs/pl_PL/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=To narzędzie może być używane tylko przez doświadczonych użytkowników lub programistów. Udostępnia narzędzia do tworzenia lub edycji własnego modułu. Dokumentacja alternatywnego rozwoju ręcznego <a href="%s" target="_blank"> jest tutaj </a>.
+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.
 ModuleBuilderDesc2=Ścieżka, w której moduły są generowane/edytowane (pierwszy katalog dla modułów zewnętrznych zdefiniowany w %s): <strong> %s </strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Menu dostarczane przez moduł / aplikację są zdefiniowane
 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>').
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
+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=Zobacz identyfikatory używane w Twojej instalacji
 SeeReservedIDsRangeHere=Zobacz zakres zarezerwowanych identyfikatorów
 ToolkitForDevelopers=Zestaw narzędzi dla programistów Dolibarr
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/other.lang b/htdocs/langs/pl_PL/other.lang
index b8272839faa..dafac57b218 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Kodowanie hasła
 PermissionsAdd=Uprawnienia dodane
 PermissionsDelete=Uprawnienia usunięte
 YourPasswordMustHaveAtLeastXChars=Twoje hasło musi składać się z <strong>%s</strong> znaków
+PasswordNeedAtLeastXUpperCaseChars=The password need at least <strong>%s</strong> upper case chars
+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=Twoje hasło zostało zresetowane pomyślnie
 ApplicantIpAddress=Adres IP wnioskodawcy
 SMSSentTo=SMS wysłany na numer %s
@@ -268,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
diff --git a/htdocs/langs/pl_PL/partnership.lang b/htdocs/langs/pl_PL/partnership.lang
index 14498bd6285..8531e0fffb6 100644
--- a/htdocs/langs/pl_PL/partnership.lang
+++ b/htdocs/langs/pl_PL/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Zarządzanie partnerstwem
 PartnershipDescription=Moduł Zarządzania partnerstwem
 PartnershipDescriptionLong= Moduł Zarządzania partnerstwem
-
+Partnership=Partnership
 AddPartnership=Dodaj partnerstwo
 CancelPartnershipForExpiredMembers=Partnerstwo: Anuluj partnerstwo członków z wygasłymi subskrypcjami
 PartnershipCheckBacklink=Partnerstwo: Sprawdź odsyłający link zwrotny
diff --git a/htdocs/langs/pl_PL/productbatch.lang b/htdocs/langs/pl_PL/productbatch.lang
index 1d2bf23996a..78179bd07ab 100644
--- a/htdocs/langs/pl_PL/productbatch.lang
+++ b/htdocs/langs/pl_PL/productbatch.lang
@@ -3,8 +3,8 @@ ManageLotSerial=Użyj lot / numer seryjny
 ProductStatusOnBatch=Tak (wymagana partia)
 ProductStatusOnSerial=Tak (wymagany unikalny numer seryjny)
 ProductStatusNotOnBatch=Nie (lot / numer seryjny nie wykorzystany)
-ProductStatusOnBatchShort=Partia
-ProductStatusOnSerialShort=Seryjny
+ProductStatusOnBatchShort=Kod kreskowy
+ProductStatusOnSerialShort=Nr. seryjny
 ProductStatusNotOnBatchShort=Nie
 Batch=Lot/Serial
 atleast1batchfield=Data wykorzystania lub data sprzedaży lub Lot / Numer seryjny
@@ -24,21 +24,22 @@ ProductLotSetup=Konfiguracja modułu lot/seria
 ShowCurrentStockOfLot=Pokaż aktualny zapas dla pasy produkt/lot
 ShowLogOfMovementIfLot=Pokaż historię przesunięć dla pary produkt/lot
 StockDetailPerBatch=Szczegóły zapasu po locie
-SerialNumberAlreadyInUse=Numer seryjny %s jest już używany dla produktu %s
+SerialNumberAlreadyInUse=Numer seryjny %s jest już użyty dla produktu %s
 TooManyQtyForSerialNumber=Możesz mieć tylko jeden produkt %s dla numeru seryjnego %s
 ManageLotMask=Maska niestandardowa
 CustomMasks=Możliwość zdefiniowania innej maski numeracji dla każdego produktu
 BatchLotNumberingModules=Reguła numeracji do automatycznego generowania numeru partii
 BatchSerialNumberingModules=Reguła numeracji do automatycznego generowania numeru seryjnego (dla produktów o właściwości 1 unikalna partia/seria dla każdego produktu)
-QtyToAddAfterBarcodeScan=Ilość do dodania dla każdego zeskanowanego kodu kreskowego/partii/numeru seryjnego
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Żywotność (w dniach)
 EndOfLife=Koniec życia
 ManufacturingDate=Data produkcji
 DestructionDate=Data zniszczenia
 FirstUseDate=Data pierwszego użycia
 QCFrequency=Częstotliwość kontroli jakości (w dniach)
-ShowAllLots=Show all lots
-HideLots=Hide lots
+ShowAllLots=Pokaż wszystkie kody kreskowe
+HideLots=Ukryj wszystkie kody kreskowe
 #Traceability - qc status
 OutOfOrder=Niesprawny
 InWorkingOrder=Sprawny
+ToReplace=Replace
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index 4062e678c08..3e830a72f46 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Średnia ważona ceny
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 090fb575702..c79162bd334 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -197,6 +197,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
@@ -284,3 +285,5 @@ 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
diff --git a/htdocs/langs/pl_PL/propal.lang b/htdocs/langs/pl_PL/propal.lang
index 9b48305733b..af9961abea3 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
@@ -81,7 +81,7 @@ 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
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 b5df868d6b3..3f8795a5052 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Limit zapasu dla ostrzeżenia i pożądany optymaln
 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
 InventoryDate=Data inwentaryzacji
+Inventories=Inwentaryzacje
 NewInventory=Nowa inwentaryzacja
 inventorySetup = Ustawienia inwentaryzacji
 inventoryCreatePermission=Utwórz nową inwentaryzację
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Ruchy zapasów będą miały datę
 inventoryChangePMPPermission=Pozwól zmienić wartość PMP dla produktu
 ColumnNewPMP=Nowa jednostka PMP
 OnlyProdsInStock=Nie dodawaj produktu bez zapasu
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Ostatni BP
 CurrentPA=Obecny BP
 RecordedQty=Nagrana ilość
@@ -240,7 +241,7 @@ StockAtDatePastDesc=Możesz tutaj zobaczyć stan zapasów (stan rzeczywisty) w d
 StockAtDateFutureDesc=Tutaj możesz zobaczyć stan (wirtualnych) zapasów na dany dzień w przyszłości
 CurrentStock=Aktualny stan
 InventoryRealQtyHelp=Ustaw wartość na 0, aby zresetować ilość <br> Pozostaw pole puste lub usuń wiersz, aby zachować niezmienione
-UpdateByScaning=Wypełnij prawdziwą ilość skanując
+UpdateByScaning=Complete real qty by scaning
 UpdateByScaningProductBarcode=Zaktualizuj przez skanowanie (kod kreskowy produktu)
 UpdateByScaningLot=Aktualizacja przez skanowanie (lot | seryjny kod kreskowy)
 DisableStockChangeOfSubProduct=Dezaktywuj zmianę zapasów dla wszystkich podproduktów tego zestawu podczas tego ruchu.
@@ -253,14 +254,20 @@ 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=Wypełnij rzeczywistą ilość ilością oczekiwaną
+AutofillWithExpected=Replace real quantity with expected quantity
 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
-FieldCannotBeNegative=Pole „%s” nie może być ujemne
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=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
diff --git a/htdocs/langs/pl_PL/stripe.lang b/htdocs/langs/pl_PL/stripe.lang
index 2583d38db89..b0de9e9fa15 100644
--- a/htdocs/langs/pl_PL/stripe.lang
+++ b/htdocs/langs/pl_PL/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Konfiguracja modułu Stripe
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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=Zapłać przy użyciu karty lub Stripe 
 FollowingUrlAreAvailableToMakePayments=Nastepujące adresy są dostępne dla klienta, by mógł dokonać płatności za faktury zamówienia
 PaymentForm=Formularz płatności
@@ -9,64 +9,63 @@ ThisScreenAllowsYouToPay=Ten ekran pozwala na dokonanie płatności on-line do %
 ThisIsInformationOnPayment=To jest informacja o płatności do zrobienia
 ToComplete=Aby zakończyć
 YourEMail=Adres email do wysłania potwierdzenia płatności
-STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+STRIPE_PAYONLINE_SENDEMAIL=Powiadomienie e-mail po próbie płatności (powodzenie lub niepowodzenie)
 Creditor=Wierzyciel
 PaymentCode=Kod płatności
-StripeDoPayment=Pay with Stripe
+StripeDoPayment=Zapłać za pomocą Stripe
 YouWillBeRedirectedOnStripe=Zostaniesz przekierowany na bezpieczoną stronę Stripe aby podać dane karty kredytowej.
 Continue=Dalej
 ToOfferALinkForOnlinePayment=URL %s płatności
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
-ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
-ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
-ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
-ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
-YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
+ToOfferALinkForOnlinePaymentOnOrder=Adres URL oferujący stronę płatności online %s dla zamówienia sprzedaży
+ToOfferALinkForOnlinePaymentOnInvoice=Adres URL oferujący stronę płatności online %s dla faktury dla klienta
+ToOfferALinkForOnlinePaymentOnContractLine=Adres URL oferujący stronę płatności online %s dla pozycji umowy
+ToOfferALinkForOnlinePaymentOnFreeAmount=Adres URL oferujący stronę płatności online %s o dowolnej kwocie bez istniejącego obiektu
+ToOfferALinkForOnlinePaymentOnMemberSubscription=Adres URL oferujący stronę płatności online %s za subskrypcję członka
+ToOfferALinkForOnlinePaymentOnDonation=Adres URL oferujący stronę płatności online %s do wpłaty darowizny
+YouCanAddTagOnUrl=Możesz również dodać parametr adresu URL <b> & tag = <i> wartość </i> </b> do dowolnego z tych adresów URL (obowiązkowy tylko w przypadku płatności niepowiązanych z obiektem), aby dodać własny tag komentarza do płatności. <br> Dla adresu URL płatności bez istniejącego obiektu możesz również dodać parametr <strong> & noidempotency = 1 </strong>, aby ten sam link z tym samym tagiem mógł być używany kilka razy (niektóre tryby płatności mogą ograniczyć płatność do 1 za każdy link parametr)
 SetupStripeToHavePaymentCreatedAutomatically=Skonfiguruj swój Stripe z linkiem <b>z %s</b> do opłat stworzonych automatycznie, gdy są zatwierdzone przez Stripe.
 AccountParameter=Parametry konta
 UsageParameter=Parametry użytkownika
 InformationToFindParameters=Pomóż znaleźć %s informacje o koncie
 STRIPE_CGI_URL_V2=Link do modułu płatności Stripe CGI
-VendorName=Nazwa dostawcy
 CSSUrlForPaymentForm=Arkusz styli CSS dla formularza płatności
 NewStripePaymentReceived=Nowa płatność Stripe otrzymana
 NewStripePaymentFailed=Próbowano wykonać płatność Stripe, ale nie powiodła się
-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
+FailedToChargeCard=Nie udało się naładować karty
+STRIPE_TEST_SECRET_KEY=Tajny klucz testowy
+STRIPE_TEST_PUBLISHABLE_KEY=Publikowalny klucz testowy
+STRIPE_TEST_WEBHOOK_KEY=Klucz testowy webhooka
+STRIPE_LIVE_SECRET_KEY=Tajny aktywny klucz
+STRIPE_LIVE_PUBLISHABLE_KEY=Aktywny klucz do publikacji
+STRIPE_LIVE_WEBHOOK_KEY=Aktywny klucz webhooka
+ONLINE_PAYMENT_WAREHOUSE=Zapasy do wykorzystania w celu zmniejszenia zapasów po dokonaniu płatności online <br> (DO ZROBIENIA Kiedy opcja zmniejszenia zapasów jest realizowana na podstawie faktury i płatność online generuje fakturę?)
+StripeLiveEnabled=Stripe na żywo włączony (w przeciwnym razie tryb testowy / piaskownicy)
+StripeImportPayment=Importuj płatności Stripe
+ExampleOfTestCreditCard=Przykład karty kredytowej do testu: %s => ważna, %s => błąd CVC, %s => wygasła, %s => opłata nie powiodła się
+StripeGateways=Bramy Stripe
+OAUTH_STRIPE_TEST_ID=Identyfikator klienta Stripe Connect (ca _...)
+OAUTH_STRIPE_LIVE_ID=Identyfikator klienta Stripe Connect (ca _...)
+BankAccountForBankTransfer=Konto bankowe do wypłat środków
+StripeAccount=Konto Stripe
+StripeChargeList=Lista opłat Stripe
+StripeTransactionList=Lista transakcji Stripe
+StripeCustomerId=Identyfikator klienta Stripe
+StripePaymentModes=Tryby płatności Stripe
+LocalID=Lokalny identyfikator
 StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
+NameOnCard=Imię na karcie
+CardNumber=Numer karty
+ExpiryDate=Data wygaśnięcia
 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=Usuń kartę
+ConfirmDeleteCard=Czy na pewno chcesz usunąć tę kartę kredytową lub debetową?
+CreateCustomerOnStripe=Utwórz klienta w Stripe
+CreateCardOnStripe=Utwórz kartę w Stripe
+ShowInStripe=Pokaż w Stripe
+StripeUserAccountForActions=Konto użytkownika używane do powiadamiania e-mailem o niektórych wydarzeniach Stripe (wypłaty Stripe)
+StripePayoutList=Lista wypłat Stripe
+ToOfferALinkForTestWebhook=Łącze do konfiguracji Stripe WebHook w celu wywołania IPN (tryb testowy)
+ToOfferALinkForLiveWebhook=Łącze do konfiguracji Stripe WebHook w celu wywołania IPN (tryb na żywo)
+PaymentWillBeRecordedForNextPeriod=Płatność zostanie zarejestrowana za następny okres.
+ClickHereToTryAgain= <a href="%s"> Kliknij tutaj, aby spróbować ponownie ... </a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Ze względu na zasady silnego uwierzytelniania klienta, karta musi zostać utworzona z backoffice Stripe. Możesz kliknąć tutaj, aby włączyć rekord klienta Stripe: %s
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index 061fa901fa4..613a6eb67b7 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Polecenie przelewu
 LatestBankTransferReceipts=Najnowsze polecenia przelewu %s
 LastWithdrawalReceipts=Najnowsze pliki poleceń zapłaty %s
 WithdrawalsLine=Wiersz polecenia zapłaty
+CreditTransfer=Credit transfer
 CreditTransferLine=Linia polecenia przelewu
 WithdrawalsLines=Wiersze polecenia zapłaty
 CreditTransferLines=Linie polecenia przelewu
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Kod banku zewnętrznego
 NoInvoiceCouldBeWithdrawed=Żadna faktura nie została pobrana pomyślnie. Sprawdź, czy faktury dotyczą firm z prawidłowym IBAN i czy IBAN ma UMR (Unique Mandate Reference) w trybie <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=To potwierdzenie wypłaty jest już oznaczone jako zaksięgowane; nie można tego zrobić dwa razy, ponieważ mogłoby to potencjalnie spowodować zduplikowane płatności i wpisy bankowe.
 ClassCredited=Klasyfikacja zapisane
+ClassDebited=Classify debited
 ClassCreditedConfirm=Czy na pewno chcesz to wycofanie otrzymania sklasyfikowania jako wpłacone na konto bankowe?
 TransData=Data Transmission
 TransMetod=Tryb transmisji
@@ -80,7 +82,7 @@ StatusMotif7=Orzeczenia sądowego
 StatusMotif8=Inny powód
 CreateForSepaFRST=Utwórz plik polecenia zapłaty (SEPA FRST)
 CreateForSepaRCUR=Utwórz plik polecenia zapłaty (SEPA RCUR)
-CreateAll=Utwórz plik polecenia zapłaty (wszystkie)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Utwórz plik do przelewu
 CreateSepaFileForPaymentByBankTransfer=Utwórz plik polecenia przelewu (SEPA)
 CreateGuichet=Tylko biuro
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Nie można utworzyć polecenia zapłaty dla pustej
 SepaMandate=Upoważnienie do polecenia zapłaty SEPA
 SepaMandateShort=Mandat SEPA
 PleaseReturnMandate=Prosimy o przesłanie tego formularza upoważnienia pocztą elektroniczną na adres %s lub pocztą na adres
-SEPALegalText=Podpisując ten formularz upoważnienia, upoważniasz (A) %s do wysyłania instrukcji do Twojego banku w celu obciążenia Twojego rachunku oraz (B) do Twojego banku do obciążania Twojego rachunku zgodnie z instrukcjami podanymi w %s. W ramach swoich praw masz prawo do zwrotu pieniędzy z banku zgodnie z warunkami umowy z bankiem. O zwrot kosztów należy ubiegać się w ciągu 8 tygodni od daty obciążenia konta. Twoje prawa związane z powyższym upoważnieniem są wyjaśnione w oświadczeniu, które możesz uzyskać od swojego banku.
+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=Identyfikator wierzyciela
 CreditorName=Nazwa wierzyciela
 SEPAFillForm=(B) Proszę wypełnić wszystkie pola zaznaczone *
@@ -150,3 +152,5 @@ ModeWarning=Opcja dla trybu rzeczywistego nie był ustawiony, zatrzymujemy po te
 ErrorCompanyHasDuplicateDefaultBAN=Firma o identyfikatorze %s ma więcej niż jedno domyślne konto bankowe. Nie ma sposobu, aby wiedzieć, którego użyć.
 ErrorICSmissing=Brak ICS na koncie bankowym %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Całkowita kwota polecenia zapłaty różni się od sumy wierszy
+WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
+WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
diff --git a/htdocs/langs/pt_AO/members.lang b/htdocs/langs/pt_AO/members.lang
deleted file mode 100644
index bacf210d56c..00000000000
--- a/htdocs/langs/pt_AO/members.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-NewSubscription=New contribution
diff --git a/htdocs/langs/pt_AO/propal.lang b/htdocs/langs/pt_AO/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/pt_AO/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index 1572d8595a9..8300e761616 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -173,7 +173,6 @@ OverviewOfMovementsNotValidated=Etapa 1 / Visão geral dos movimentos não valid
 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
-AutomaticBindingDone=Vinculação automática realizada
 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
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index d9ddfc976a3..685f1e78aa1 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -74,6 +74,7 @@ DelaiedFullListToSelectContact=Aguarde até que uma tecla seja pressionada antes
 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
@@ -99,6 +100,7 @@ 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.
@@ -213,8 +215,6 @@ ReferencedPreferredPartners=Parceiro preferido
 ExternalResources=Fontes externas
 SocialNetworks=Redes Sociais
 SocialNetworkId=ID da rede social
-ForDocumentationSeeWiki=Documentos para usuários e desenvolvedores (Doc, FAQs...), <br>de uma olhada no Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Para outras questões/ajudas, você pode usar o forum do Dolibar:<br><b><a href="%s" target="_blank">%s</a></b>
 CurrentMenuHandler=Gestor atual de menu
 MeasuringUnit=Unidade de medida
 FontSize=Tamanho da fonte
@@ -390,6 +390,7 @@ 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.
 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
@@ -555,7 +556,6 @@ 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)
 Permission115=Exportar Transações e Extratos Bancários
 Permission116=Transferência entre Contas
 Permission117=Gerenciar cheques despachando
@@ -683,12 +683,9 @@ 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
 Permission773=Excluir relatórios de despesas
-Permission774=Leia todos os relatórios de despesas (mesmo para o utilizadores Não subordinados)
 Permission775=Aprovar os relatórios de despesas
 Permission776=Relatórios de despesas pagas
-Permission777=Ler relatórios de despesas de todos
 Permission778=Criar / alterar relatórios de despesas de todos
 Permission779=Exportar - Relatórios de despesas
 Permission1001=Ler Estoques
@@ -696,6 +693,7 @@ Permission1002=Criar/Modificar Estoques
 Permission1003=Excluir Estoques
 Permission1004=Ler Movimentação de Estoque
 Permission1005=Criar/Modificar Movimentação de Estoque
+Permission1012=Novo inventário
 Permission1016=Remover inventario
 Permission1101=Ler recibos de entrega
 Permission1102=Criar / alterar recibos de entrega
@@ -743,10 +741,6 @@ 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=Visualizar funcionários
-Permission4002=Criar funcionários
-Permission4003=Excluir funcionários
-Permission4004=Exportar funcionários
 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.
@@ -754,9 +748,6 @@ 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 todos os pedidos de licença (mesmo do usuário não subordinados)
-Permission20005=Criar / modificar pedidos de licença para todos (mesmo do usuário não subordinados)
-Permission20006=Pedidos de licença administrativas (configuração e atualização de balanço)
 Permission20007=Aprovar solicitações de licenças
 Permission23001=Ler Tarefas Agendadas
 Permission23002=Criar/Atualizar Tarefas Agendadas
@@ -913,6 +904,7 @@ LogoSquarredDesc=Deve ser um ícone quadrado (largura = altura). Este logotipo s
 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:
 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
@@ -926,6 +918,7 @@ SetupDescription2=As duas seções a seguir são obrigatórias (as duas primeira
 SetupDescription5=Outras entradas do menu de configuração gerenciam parâmetros opcionais.
 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
@@ -939,6 +932,7 @@ SystemInfoDesc=Informações do sistema está faltando informações, técnicas
 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
@@ -1021,10 +1015,9 @@ 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
+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.
 PHPModuleLoaded=O componente PHP 1 %s está carregado
 PreloadOPCode=O OPCode pré-carregado está em uso
-AddRefInList=Mostrar ref. Cliente / fornecedor lista de informações (lista de seleção ou caixa de combinação) e a maior parte do hiperlink. <br> Terceiros aparecerão com um formato de nome "CC12345 - SC45678 - Empresa X." em vez de "Empresa X.".
-AddAdressInList=Exibir lista de informações de endereço do cliente / fornecedor (lista de seleção ou caixa de combinação) <br> Terceiros aparecerão com um formato de nome de "Empresa X. -  Rua tal, n°:21, sala: 123456, Cidade/Estado - Brasil" em vez de "Empresa X".
 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
@@ -1043,6 +1036,7 @@ AccountCodeManager=Opções para geração automática de códigos contábeis de
 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
@@ -1115,6 +1109,7 @@ 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
@@ -1274,6 +1269,10 @@ 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
@@ -1321,6 +1320,7 @@ AGENDA_DEFAULT_VIEW=Qual visualização você deseja abrir por padrão ao seleci
 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).
@@ -1472,6 +1472,10 @@ 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_PDF_HIDE_CUSTOMER_CODE=Ocultar código do cliente
+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
@@ -1499,9 +1503,6 @@ EmailCollectorConfirmCollectTitle=Confirmação de recebimento de e-mail
 EmailCollectorConfirmCollect=Deseja executar a coleta deste coletor agora?
 NoNewEmailToProcess=Nenhum novo e-mail (filtros correspondentes) para processar
 XEmailsDoneYActionsDone=%s e-mails qualificados, %s e-mails processados com sucesso (para registro %s/ações executadas)
-RecordEvent=Registrar evento de e-mail
-CreateLeadAndThirdParty=Criar lead (e terceiro, se necessário)
-CreateTicketAndThirdParty=Criar ticket (e vincular a terceiros se tiver sido carregado por uma operação anterior)
 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)
@@ -1570,6 +1571,7 @@ EMailsWillHaveMessageID=Os e-mails terão a tag 'Referências' correspondente a
 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
@@ -1595,6 +1597,7 @@ 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
@@ -1605,10 +1608,22 @@ CheckForModuleUpdateHelp=Esta ação se conectará a editores de módulos extern
 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.
 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.
+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
+LanguageAndPresentation=Linguagem e apresentação
+SkinAndColors=Skin e cores
+MissingTranslationForConfKey =Tradução ausente para %s
+NativeModules=Módulos nativos
+NoDeployedModulesFoundWithThisSearchCriteria=Nenhum módulo encontrado para os critérios de pesquisa
diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
index 2ea49d184a0..70d96851a6e 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -22,6 +22,7 @@ AgendaExtSitesDesc=Essa página permite declarar calendários externos para sere
 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
@@ -66,6 +67,7 @@ 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
@@ -132,3 +134,4 @@ 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_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index 4f1ed6e84a7..13649f991dd 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -22,7 +22,7 @@ AllTime=Desde o início
 Reconciliation=Reconciliação
 RIB=Número da conta bancária
 SwiftValid=Código de identificação bancária / Sociedade para Telecomunicações Financeiras Interbancárias Internacionais válido
-SwiftVNotalid=Código de identificação bancária / Sociedade para Telecomunicações Financeiras Interbancárias Internacionais inválido
+SwiftNotValid=Código de identificação bancária / Sociedade para Telecomunicações Financeiras Interbancárias Internacionais inválido
 IbanValid=Numero de conta bancária valida
 IbanNotValid=Numero de conta bancária inválida
 StandingOrders=Pedidos com Débito direto
@@ -39,7 +39,6 @@ BankAccountDomiciliation=End. do banco
 BankAccountCountry=País da conta
 BankAccountOwner=Nome do titular da conta
 BankAccountOwnerAddress=Endereço do titular da conta
-RIBControlError=A verificação de integridade dos valores falhou. Isso significa que as informações desse número de conta não estão completas ou estão incorretas (verifique o país, números e IBAN).
 CreateAccount=Criar conta
 EditFinancialAccount=Editar conta
 LabelBankCashAccount=Rótulo do banco ou caixa
@@ -99,6 +98,7 @@ DeleteTransaction=Excluir transação
 ConfirmDeleteTransaction=Você tem certeza que deseja excluir esta transação?
 ThisWillAlsoDeleteBankRecord=Isto também excluirá as transações geradas
 PlannedTransactions=Transações planejadas
+Graph=Gráficos
 ExportDataset_banque_1=Entradas bancárias e demonstrações contábeis
 ExportDataset_banque_2=Comprovante de depósito
 TransactionOnTheOtherAccount=Transação de outra conta
@@ -143,3 +143,4 @@ BankColorizeMovementName2=Cor de fundo para movimento de crédito
 IfYouDontReconcileDisableProperty=Caso não queira fazer reconciliações bancárias em alguma conta bancária, desative a propriedade "%s" nelas para remover este aviso.
 NoBankAccountDefined=Nenhuma conta bancária definida
 NoRecordFoundIBankcAccount=Nenhum registro encontrado na conta bancária. Normalmente, isso ocorre quando um registro foi excluído manualmente da lista de transações na conta bancária (por exemplo, durante uma reconciliação da conta bancária). Outro motivo é que o pagamento foi registrado quando o módulo "%s" estava desabilitado.
+AlreadyOneBankAccount=Já existe uma conta bancária definida
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index 03c626761a4..3405b02a0d0 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -55,11 +55,6 @@ 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
 PaymentTerm=Termo de pagamento
 PaymentAmount=Valor a ser pago
 PaymentHigherThanReminderToPay=Pagamento superior ao valor a ser pago
@@ -278,6 +273,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
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/bookmarks.lang b/htdocs/langs/pt_BR/bookmarks.lang
index c5b5e77660a..89de31ef04f 100644
--- a/htdocs/langs/pt_BR/bookmarks.lang
+++ b/htdocs/langs/pt_BR/bookmarks.lang
@@ -6,7 +6,6 @@ ReplaceWindow=Substituir guia atual
 BookmarkTargetReplaceWindowShort=Guia atual
 BehaviourOnClick=Comportamento quando a URL de marcador é selecionada
 SetHereATitleForLink=Definir um nome para o marcador
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use um link externo/absoluto (https://URL) ou um link interno/relativo (/DOLIBARR_ROOT/htdocs/...)
 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_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index 6f0f7830869..57dc62f8d8a 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -27,6 +27,10 @@ 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
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index 3488998cc37..b2807b3ee61 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -118,8 +118,6 @@ 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
-RulesResultDue=- Inclui faturas pendentes, despesas, IVA, doações, sejam elas pagas ou não. Também inclui salários pagos. <br>- Baseia-se na data de cobrança das faturas e na data de vencimento de despesas ou pagamentos de impostos. Para salários definidos com o módulo Salário, é usada a data do valor do pagamento.
-RulesResultInOut=- Isto inclui os pagamentos reais feitos nas faturas, despesas, ICMS (VAT) e salários. <br>- Isto é baseado nas datas de pagamento das faturas, despesas, ICMS (VAT) e salários. A data de doação para a doação.
 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"
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 0262d342e56..9b212fefe6d 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -31,6 +31,7 @@ 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.
@@ -177,3 +178,7 @@ WarningSomeLinesWithNullHourlyRate=Algumas vezes foram registrados por alguns us
 WarningYourLoginWasModifiedPleaseLogin=O seu login foi modificado. Por questões de segurança, você terá de autenticar-se com o seu novo login antes da próxima ação.
 WarningProjectClosed=O projeto está fechado. Você deve reabri-lo primeiro.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Algumas transações bancárias foram removidas após geração do recebimento, incluindo elas. Portanto, o número de cheques e o total de recebimento podem diferir do número e do total na lista.
+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_BR/holiday.lang b/htdocs/langs/pt_BR/holiday.lang
index 65a576c32e8..756eff2a8b7 100644
--- a/htdocs/langs/pt_BR/holiday.lang
+++ b/htdocs/langs/pt_BR/holiday.lang
@@ -14,7 +14,6 @@ UserForApprovalID=Usuário para ID de aprovação
 UserForApprovalLogin=Login do usuário de aprovação
 SendRequestCP=Criar solicitação de licença
 DelayToRequestCP=Solicitações devem ser feitas pelo menos<b> %s dias (s)</b> antes.
-SoldeCPUser=Licenças saldo é <b> %s </ b> dias.
 ErrorEndDateCP=Você deve selecionar uma data final posterior à data inicial.
 ErrorSQLCreateCP=Ocorreu um erro de SQL durante a criação:
 ErrorIDFicheCP=Ocorreu um erro, a solicitação de licença não existe.
diff --git a/htdocs/langs/pt_BR/install.lang b/htdocs/langs/pt_BR/install.lang
index a36661873ec..b7d29d02045 100644
--- a/htdocs/langs/pt_BR/install.lang
+++ b/htdocs/langs/pt_BR/install.lang
@@ -121,6 +121,7 @@ MigrationUserGroupRightsEntity=Atualizar o valor do campo da entidade de llx_use
 MigrationUserPhotoPath=Migração de caminhos de foto para usuários
 MigrationFieldsSocialNetworks=Migração de redes sociais dos campos de usuários (%s)
 MigrationResetBlockedLog=Redefinir o módulo BlockedLog para o algoritmo v7
+MigrationImportOrExportProfiles=Migração de perfis de importação ou exportação (%s)
 ClickOnLinkOrRemoveManualy=Se uma atualização estiver em andamento, aguarde. Caso contrário, clique no link a seguir. Se você sempre vir esta mesma página, deverá remover / renomear o arquivo install.lock no diretório de documentos.
 Loaded=Carregado
 FunctionTest=Teste de funcionamento
diff --git a/htdocs/langs/pt_BR/knowledgemanagement.lang b/htdocs/langs/pt_BR/knowledgemanagement.lang
new file mode 100644
index 00000000000..60ad5f67608
--- /dev/null
+++ b/htdocs/langs/pt_BR/knowledgemanagement.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - knowledgemanagement
+GroupOfTicket=Grupo de Tickets
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index e5dd6a064d9..ca8a3cb6c26 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -83,7 +83,6 @@ 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=Esta informação pode ser útil para fins de diagnóstico (você pode definir a opção $ dolibarr_main_prod para '1' para remover esses avisos)
 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
@@ -340,6 +339,7 @@ YouCanSetDefaultValueInModuleSetup=Você pode definir o valor padrão usado ao c
 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
@@ -421,6 +421,8 @@ 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
@@ -455,7 +457,7 @@ Calendar=Calendário
 GroupBy=Agrupar por
 ViewFlatList=Visão da lista resumida
 RemoveString=Remover string '%s'
-SomeTranslationAreUncomplete=Alguns dos idiomas oferecidos podem ser apenas parcialmente traduzidos ou podem conter erros. Por favor, ajude a corrigir o seu idioma registrando-se em <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ < / a> para adicionar suas melhorias.
+DirectDownloadLink=Link de download público
 Download=Baixar
 DownloadDocument=Descarregar documento
 ActualizeCurrency=Atualizar taxa de câmbio
@@ -478,6 +480,7 @@ TabLetteringCustomer=Rotulação do cliente
 TabLetteringSupplier=Rotulação de fornecedor
 Saturday=Sabado
 SaturdayMin=Sab
+thirteen=treze
 SetRef=Escolher referência
 Select2ResultFoundUseArrows=Alguns resultados encontrados. Use as setas para selecionar.
 Select2Enter=Forneça
@@ -486,6 +489,7 @@ Select2LoadingMoreResults=Carregando mais resultados...
 Select2SearchInProgress=Busca em andamento...
 SearchIntoContacts=Contatos
 SearchIntoUsers=Usuários
+SearchIntoBatch=Lotes / Seriais
 SearchIntoMO=Ordens de fabricação
 SearchIntoCustomerOrders=Pedido de Venda
 SearchIntoSupplierProposals=Propostas de fornecedores
@@ -505,6 +509,7 @@ 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
@@ -533,6 +538,7 @@ SwitchInEditModeToAddTranslation=Alterne modo de edição para adicionar traduç
 NotUsedForThisCustomer=Não usado para este cliente
 AmountMustBePositive=O valor deve ser positivo
 ByStatus=Por status
+Used=Usado
 DateOfBirth=Data de nascimento
 OnHold=Em espera
 ClientTZ=Fuso Horário do cliente (usuário)
diff --git a/htdocs/langs/pt_BR/modulebuilder.lang b/htdocs/langs/pt_BR/modulebuilder.lang
index 2abf9cd2abf..239b8f2187f 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
-ModuleBuilderDesc=Esta ferramenta deve ser usada apenas por usuários experientes ou desenvolvedores. Ele fornece utilitários para construir ou editar seu próprio módulo. A documentação para o <a href="%s" target="_blank">desenvolvimento manual alternativo está aqui </a> .
 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>
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/other.lang b/htdocs/langs/pt_BR/other.lang
index e6a654c328d..54f498e002d 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -6,6 +6,8 @@ BirthdayAlertOff=Alerta de aniversário desativado
 PreviousMonthOfInvoice=Mês anterior (número 1-12) da data da fatura
 NextMonthOfInvoice=Mês seguinte (número 1-12) da data da fatura
 TextNextMonthOfInvoice=Mês seguinte (texto) da data da fatura
+PreviousMonth=Mês anterior
+CurrentMonth=Mês atual
 ZipFileGeneratedInto=Arquivo zip gerado em <b> %s </ b>.
 DocFileGeneratedInto=Arquivo doc gerado em <b> %s </ b>.
 JumpToLogin=Desconectado. Vá para a página de login ...
@@ -157,6 +159,7 @@ NewKeyIs=Estas sao as suas novas chaves de acesso
 NewKeyWillBe=Sua nova chave de acesso do software sera
 ClickHereToGoTo=Clickar aqui para ir a %s
 YouMustClickToChange=Voce tem que clickar no seguinte atalho para validar a sua troca de senha
+ConfirmPasswordChange=Confirme a alteração da senha
 ForgetIfNothing=Se voce nao pediu esta mudanca, simplismente esquece deste email. Suas credenciais estao seguras.
 IfAmountHigherThan=Se a quantia mais elevada do que <strong>%s</strong>
 SourcesRepository=Repositório de fontes
@@ -177,7 +180,10 @@ WEBSITE_IMAGEDesc=Caminho relativo da mídia de imagem. Você pode mantê-lo vaz
 LinesToImport=Linhas para importar
 MemoryUsage=Uso de memória
 RequestDuration=Duração do pedido
+ProductsPerPopularity=Produtos / serviços por popularidade
 PopuProp=Produtos / Serviços por popularidade em propostas
 PopuCom=Produtos / Serviços por popularidade em pedidos
 ProductStatistics=Estatísticas de Produtos / Serviços
 NbOfQtyInOrders=Quant. em pedidos
+SelectTheTypeOfObjectToAnalyze=Selecione um objeto para ver suas estatísticas ...
+ConfirmBtnCommonTitle =Confirme sua ação
diff --git a/htdocs/langs/pt_BR/partnership.lang b/htdocs/langs/pt_BR/partnership.lang
index b31b80f8919..74979455bdd 100644
--- a/htdocs/langs/pt_BR/partnership.lang
+++ b/htdocs/langs/pt_BR/partnership.lang
@@ -2,6 +2,7 @@
 ModulePartnershipName=Configuracoes de Parcerias
 PartnershipDescription=Módulo gerenciamento de parcerias
 PartnershipDescriptionLong=Módulo gerenciamento de parcerias
+Partnership=Parceria
 NewPartnership=Nova parceria
 PartnershipSetup=Configuracao de parcerias
 PartnershipAbout=Sobre parcerias
diff --git a/htdocs/langs/pt_BR/productbatch.lang b/htdocs/langs/pt_BR/productbatch.lang
index de94cb1f0cf..524360fb792 100644
--- a/htdocs/langs/pt_BR/productbatch.lang
+++ b/htdocs/langs/pt_BR/productbatch.lang
@@ -23,4 +23,3 @@ 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
-QtyToAddAfterBarcodeScan=Quantidade a adicionar para cada código de barras / lote / série digitalizada
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index 775c8f92217..1633cafc962 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -139,6 +139,7 @@ DontHaveTheValidateStatus=O projeto %s deve estar aberto para ser fechado
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Módulo 'Salário' deve estar habilitado para def. taxas hh, para ter o tempo gasto valorizado
 NewTaskRefSuggested=Tarefa ref.  já usada, uma nova tarefa ref. é necessária
 TimeSpentInvoiced=Tempo gasto faturado
+TimeSpentForIntervention=Dispêndio de tempo
 TimeSpentForInvoice=Dispêndio de tempo
 OneLinePerUser=Uma linha por usuário
 ServiceToUseOnLines=Serviço para usar em linhas
@@ -151,6 +152,8 @@ UsageOpportunity=Uso: Oportunidade
 UsageTasks=Uso: Tarefas
 UsageBillTimeShort=Uso: tempo da conta
 InvoiceToUse=Rascunho de fatura a ser usada
+NewInter=Nova Intervenção
 OneLinePerTask=Uma linha por tarefa
 OneLinePerPeriod=Uma linha por período
 RefTaskParent=Ref. Tarefa principal
+StartDateCannotBeAfterEndDate=A data final não pode ser anterior a data de início
diff --git a/htdocs/langs/pt_BR/receptions.lang b/htdocs/langs/pt_BR/receptions.lang
index 8ab6492fca1..ca9c55038cb 100644
--- a/htdocs/langs/pt_BR/receptions.lang
+++ b/htdocs/langs/pt_BR/receptions.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Configurar recepção do produto
 RefReception=Ref. recebimento
 Reception=Recebimento
 Receptions=Recebimentos
@@ -21,7 +20,6 @@ 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>?
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index 42e39741490..5c10bf68ee4 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -58,7 +58,6 @@ RealStock=Estoque real
 RealStockDesc=Estoque físico/real é o estoque atualmente nos depósitos.
 RealStockWillAutomaticallyWhen=O estoque real será modificado de acordo com esta regra (conforme definido no módulo Stock):
 VirtualStock=Estoque virtual
-VirtualStockAtDate=Estoque virtual na data
 VirtualStockDesc=O estoque virtual é o estoque calculado disponível uma vez que todas as ações abertas / pendentes (que afetam os estoques) são fechadas (pedidos de compra recebidos, pedidos de vendas enviados, pedidos de fabricação produzidos, etc)
 AtDate=Na data
 IdWarehouse=Id. armazenamento
@@ -105,6 +104,7 @@ ReceivingForSameOrder=Recibos para este fim
 StockMovementRecorded=Movimentações de estoque registradas
 RuleForStockAvailability=Regras sobre os requisitos de ações
 MovementLabel=Rótulo de movimentação
+TypeMovement=Direção do movimento
 InventoryCode=Código da movimentação ou do inventário
 IsInPackage=Contido em pacote
 WarehouseAllowNegativeTransfer=O estoque pode ser negativo
@@ -138,7 +138,6 @@ AlwaysShowFullArbo=Exibir a árvore completa do armazém no pop-up dos links do
 StockAtDatePastDesc=Você pode ver aqui o estoque (estoque real) em uma determinada data no passado
 CurrentStock=Estoque atual
 InventoryRealQtyHelp=Defina o valor como 0 para redefinir o campo qty <br> Keep vazio ou remova a linha para mantê-lo inalterado
-UpdateByScaning=Preencher quantidade real com escaneamento
 UpdateByScaningProductBarcode=Atualização por digitalização (código de barras do produto)
 UpdateByScaningLot=Atualizar por varredura (lote | código de barras serial)
 DisableStockChangeOfSubProduct=Desative a mudança de estoque para todos os subprodutos deste Kit durante esta movimentação.
@@ -146,4 +145,8 @@ 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
+InventoryStartedShort=Iniciado
diff --git a/htdocs/langs/pt_BR/stripe.lang b/htdocs/langs/pt_BR/stripe.lang
index fcb44212d4c..84661452168 100644
--- a/htdocs/langs/pt_BR/stripe.lang
+++ b/htdocs/langs/pt_BR/stripe.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Configuração do módulo de boleto
-StripeDesc=Ofereça aos clientes uma página de pagamento on-line do Stripe para pagamentos com cartões de crédito/cebit via <a href="http://www.stripe.com" target="_blank">Stripe</a> . Isso pode ser usado para permitir que seus clientes façam pagamentos ad-hoc ou para pagamentos relacionados a um determinado objeto Dolibarr (fatura, pedido, ...)
 StripeOrCBDoPayment=Pagar com cartão de crédito ou boleto
 STRIPE_PAYONLINE_SENDEMAIL=Notificação por e-mail após uma tentativa de pagamento (sucesso ou falha)
 StripeDoPayment=Pague com Stripe
@@ -16,6 +15,7 @@ SetupStripeToHavePaymentCreatedAutomatically=Configure seu boleto com url <b> %s
 STRIPE_CGI_URL_V2=Url de boleto CGI módulo para pagamento
 NewStripePaymentReceived=Pagamento de novo boleto recebido
 NewStripePaymentFailed=O pagamento do novo boleto tentou, mas falhou
+FailedToChargeCard=Falha ao carregar o cartão
 STRIPE_TEST_SECRET_KEY=Senha
 STRIPE_TEST_PUBLISHABLE_KEY=Senha editável
 STRIPE_LIVE_SECRET_KEY=Chave ao vivo secreta
@@ -36,3 +36,4 @@ StripePayoutList=Lista de pagamentos do Stripe
 ToOfferALinkForTestWebhook=Link para configurar o Stripe WebHook para chamar o IPN (modo de teste)
 ToOfferALinkForLiveWebhook=Link para configurar Stripe WebHook para chamar o IPN (modo ao vivo)
 PaymentWillBeRecordedForNextPeriod=O pagamento será registrado para o próximo período.
+ClickHereToTryAgain=<a href="%s"> Clique aqui para tentar novamente ... </a>
diff --git a/htdocs/langs/pt_BR/ticket.lang b/htdocs/langs/pt_BR/ticket.lang
index 18367ee91ed..147b5bb14e5 100644
--- a/htdocs/langs/pt_BR/ticket.lang
+++ b/htdocs/langs/pt_BR/ticket.lang
@@ -6,7 +6,7 @@ Permission56005=Ver tickets de todos os terceiros (não eficaz para usuários ex
 TicketDictType=Tickets - Tipos
 TicketDictCategory=Tickets - Grupos
 TicketDictSeverity=Tickets - Gravidades
-TicketDictResolution=Ticket - Resolução
+TicketDictResolution=Ticket - Solução
 TicketTypeShortHELP=Pedido de ajuda funcional
 TicketTypeShortISSUE=Problema ou erro
 TicketTypeShortPROBLEM=Problema
@@ -14,15 +14,21 @@ TicketTypeShortREQUEST=Solicitação de alteração ou aprimoramento
 TicketTypeShortOTHER=Outros
 TicketSeverityShortLOW=Baixa
 TicketSeverityShortHIGH=Alta
+TicketSeverityShortBLOCKING=Crítico, Bloqueio
+TicketCategoryShortOTHER=Outros
 MenuTicketMyAssign=Meus tickets
 MenuTicketMyAssignNonClosed=Meus tickets abertos
 MenuListNonClosed=Tickets abertos
 TypeContact_ticket_external_CONTRIBUTOR=Contribuidor externo
+OriginEmail=E-mail do solicitante
 Notify_TICKET_SENTBYMAIL=Envio do ticket por e-mail
+NeedMoreInformation=Aguardando retorno do solicitante
 NeedMoreInformationShort=Aguardando feedback
 Waiting=Aguardando
+SolvedClosed=Resolvido
 Severity=Gravidade
 TicketGroupIsPublic=Grupo é público
+TicketGroupIsPublicDesc=Se um grupo de ticket é público, ele será visível no formulário quando criar um ticket a partir de uma interface pública
 MailToSendTicketMessage=Para enviar e-mail da mensagem do ticket
 TicketSetup=Configuração do módulo de ticket
 TicketSettings=Configurações
@@ -39,14 +45,18 @@ TicketsDisableEmail=Não envie e-mails para criação de bilhetes ou gravação
 TicketsDisableEmailHelp=Por padrão, os e-mails são enviados quando novos bilhetes ou mensagens são criados. Ative esta opção para desativar * todas as notificações por e-mail
 TicketsLogEnableEmail=Ativar log por e-mail
 TicketsEmailAlsoSendToMainAddress=Adicionalmente, envie uma notificação ao endereço principal de email
+TicketsEmailAlsoSendToMainAddressHelp=Marque essa opção para enviar uma cópia do e-mail ao endereço definido na configuração "%s" (veja aba "%s")
 TicketsLimitViewAssignedOnly=Restringir a exibição aos tiquetes atribuídos ao usuário atual (não efetivo para usuários externos, sempre limitado à terceira parte da qual eles dependem)
 TicketsLimitViewAssignedOnlyHelp=Somente bilhetes atribuídos ao usuário atual ficarão visíveis. Não se aplica a um usuário com direitos de gerenciamento de bilhetes.
 TicketsActivatePublicInterfaceHelp=A interface pública permite que qualquer visitante crie bilhetes.
 TicketNumberingModules=Módulo de numeração de bilhetes
+TicketsModelModule=Modelos de documentos para tickets
 TicketNotifyTiersAtCreation=Notificar o terceiro no momento do terceiro
 TicketsDisableCustomerEmail=Sempre disabilitar e-mail quando um ticket é criado de uma interface pública
+TicketsPublicNotificationNewMessage=Enviar e-mail (s) quando uma nova mensagem / comentário for adicionado a um ticket
 TicketsPublicNotificationNewMessageHelp=Enviar e-mail (s) quando uma nova mensagem for adicionada da interface pública (para o usuário atribuído ou o e-mail de notificações para (atualizar) e / ou o e-mail de notificações para)
 TicketPublicNotificationNewMessageDefaultEmail=Email de notificações para (atualização)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Envie um e-mail para este endereço para cada nova notificação de mensagem se o ticket não tiver um usuário atribuído a ele ou se o usuário não tiver nenhum e-mail conhecido.
 TicketsIndex=Área de Tickets
 TicketList=Lista de bilhetes
 TicketAssignedToMeInfos=Esta página mostra os tíquetes criado pelo ou assinalados para o usuário corrente
@@ -60,6 +70,7 @@ MessageListViewType=Mostrar como lista de tabelas
 TicketCard=Bilhete de cartão
 TicketsManagement=Gestão de bilhetes
 NewTicket=Novo Bilhete
+TicketCategory=Categorização de tíquetes
 SeeTicket=Veja o ingresso
 TicketReadOn=Leia
 MarkAsRead=Marcar ingresso como lido
@@ -70,11 +81,17 @@ TicketAddMessage=Adiciona uma mensagem
 AddMessage=Adiciona uma mensagem
 MessageSuccessfullyAdded=Bilhete adicionado
 NoMsgForThisTicket=Nenhuma mensagem para este bilhete
+TicketProperties=Classificação
+LatestNewTickets=Últimos  %s tickets mais recentes (não lidos)
 TicketSeverity=Gravidade
 ShowTicket=Veja o ingresso
 RelatedTickets=Bilhetes relacionados
 TicketAddIntervention=Criar Intervenção
+CloseTicket=Encerrar|Solucionar
+AbandonTicket=Abandonar ticket
+CloseATicket=Encerrar|Solucionar
 ConfirmCloseAticket=Confirme o fechamento do ticket
+ConfirmAbandonTicket=Confirma o encerramento do ticket com o status 'Abandonado'
 ConfirmDeleteTicket=Por favor confirme a exclusão de ingresso
 TicketDeletedSuccess=Bilhete excluído com sucesso
 TicketMarkedAsClosed=Bilhete marcado como fechado
@@ -128,9 +145,18 @@ NbOfTickets=Número de tickets
 TicketNotificationEmailSubject=Bilhete %s atualizado
 TicketNotificationNumberEmailSent=E-mail de notificação enviado: %s
 ActionsOnTicket=Eventos no ticket
-BoxLastTicket=Últimos bilhetes criados
-BoxLastTicketDescription=Últimos %s criado bilhetes
+BoxLastTicket=Últimos tickets criados
+BoxLastTicketDescription=Últimos %s tickets criados
 BoxLastTicketNoRecordedTickets=Não há bilhetes recentes não lidos
-BoxLastModifiedTicket=Últimos bilhetes modificados
-BoxLastModifiedTicketDescription=Últimos bilhetes modificados %s
 BoxLastModifiedTicketNoRecordedTickets=Nenhum bilhete modificado recente
+BoxTicketType=Distribuição de tickets em aberto por tipo
+BoxTicketSeverity=Número de tickets abertos por gravidade
+BoxNoTicketSeverity=Nenhum Ticket aberto
+BoxTicketLastXDays=Número de novos tickets por dias nos últimos %s dias
+BoxTicketLastXDayswidget =Número de novos tickets por dias nos últimos X dias
+BoxNoTicketLastXDays=Sem novos tickets nos últimos %s dias
+BoxNumberOfTicketByDay=Número de novos Tickets por dia
+BoxNewTicketVSClose=Número de Tickets versus Tickets fechados (hoje)
+TicketCreatedToday=Ticket criado hoje
+TicketClosedToday=Ticket fechado hoje
+KMFoundForTicketGroup=Encontramos alguns tópicos e FAQs que podem resolver o seu problema. Verifique isso antes de incluir o ticket.
diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang
index dd45990f9a9..cf25c68bb59 100644
--- a/htdocs/langs/pt_BR/withdrawals.lang
+++ b/htdocs/langs/pt_BR/withdrawals.lang
@@ -6,6 +6,7 @@ StandingOrderToProcess=A Processar
 WithdrawalsReceipts=Pedidos com Débito direto
 WithdrawalReceipt=Ordem de débito direto
 LastWithdrawalReceipts=Últimos %s arquivos de Débito direto
+CreditTransfer=Transferência de crédito
 WithdrawalsLines=Linhas do pedido para Débito direto
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Ainda não é possível. Retirar o status deve ser definido como 'creditado' antes de declarar rejeitar em linhas específicas.
 NbOfInvoiceToWithdrawWithInfo=Nº. de fatura do cliente com ordens de pagamento por débito direto com informações definidas sobre a conta bancária
@@ -54,7 +55,6 @@ WithdrawMode=Modo de Débito direto (FRST ou RECUR)
 WithdrawRequestAmount=Quantidade de pedido de débito direto:
 WithdrawRequestErrorNilAmount=Não foi possível criar solicitação de débito direto para quantidade vazia.
 PleaseReturnMandate=Favor devolver este formulário de mandato por e-mail para %s ou por correio para
-SEPALegalText=Pela assinatura deste formulário de mandato, você autoriza (A) %s a enviar instruções para o seu banco efetuar débito em sua conta e (B) que o seu banco efetue débito em sua conta de acordo com as instruções de %s. Como parte dos seus direitos, você tem direito ao reembolso do seu banco sob os termos e condições do acordo com ele firmado. O reembolso deve ser solicitado dentro de 8 semanas a partir da data em que a sua conta foi debitada. Os seus direitos relativos ao mandato acima são explicados em uma declaração que você pode obter junto a seu banco.
 CreditorName=Nome do Credor
 SEPAFillForm=(B) Favor preencher todos os campos marcados com *
 SEPAFormYourName=Seu nome
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 3a3ef7004ac..0b77b76f45b 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=Países não na CEE
 CountriesInEECExceptMe=Países na CEE, exceto %s
 CountriesExceptMe=Todos os países, exceto %s
 AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Vincular automaticamente
-AutomaticBindingDone=Vinculação automática efetuada
+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
@@ -387,7 +387,8 @@ 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=Gama da conta contabilística
 Calculated=Calculado
@@ -404,6 +405,7 @@ NoJournalDefined=Nenhum diário definido
 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
 
 ## Import
 ImportAccountingEntries=Entradas contábeis
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 072518d0d93..185051f8847 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Fundação
 Version=Versão
 Publisher=Editor
@@ -265,8 +267,8 @@ OtherResources=Outros recursos
 ExternalResources=Recursos Externos
 SocialNetworks=Redes sociais
 SocialNetworkId=Id. da Rede Social
-ForDocumentationSeeWiki=Para a documentação de utilizador, programador ou Perguntas Frequentes (FAQ), consulte o wiki do Dolibarr<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Para outras questões, como efectuar as consultas, pode utilizar o forum do Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
+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=Aqui estão alguns recursos para obter ajuda e suporte com o Dolibarr.
 HelpCenterDesc2=Alguns desses recursos estão disponíveis apenas em <b> english </ b>.
 CurrentMenuHandler=Gestor de menu atual
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Última versão estável
 LastActivationDate=Última data de ativação
 LastActivationAuthor=Autor mais recente de ativação
 LastActivationIP=Último IP ativo
+LastActivationVersion=Latest activation version
 UpdateServerOffline=Atualizar servidor offline
 WithCounter=Gerir um contador
 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>
@@ -753,7 +756,7 @@ Permission106=Exportar envios
 Permission109=Eliminar envios
 Permission111=Consultar contas financeiras (contas bancárias, caixas)
 Permission112=Criar/modificar/eliminar e comparar trasações
-Permission113=Configurar as contas ficnanceiras (criar, gerir categorias)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconciliar transações
 Permission115=Exportar transacções e extractos
 Permission116=Transferências entre contas
@@ -762,6 +765,7 @@ Permission121=Consultar terceiros associados ao utilizador
 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)
@@ -889,12 +893,11 @@ Permission701=Consultar donativos
 Permission702=Criar/modificar donativos
 Permission703=Eliminar donativos
 Permission771=Consultar relatórios de despesas (seus e dos seus subordinados)
-Permission772=Criar/modificar relatórios de despesas
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Eliminar relatórios de despesas
-Permission774=Consultar todos os relatórios de despesa (mesmo para utilizadores que não são subordinados)
 Permission775=Aprovar relatórios de despesas
 Permission776=Pagar relatórios de despesas
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Exportar relatórios de despesas
 Permission1001=Consultar stocks
@@ -958,15 +961,11 @@ Permission2801=Usar cliente FTP em modo de leitura (listar e descarregar apenas)
 Permission2802=Usar o cliente FTP em modo de escrita (eliminar ou carregar ficheiros)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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=Eliminar pedidos de licença
-Permission20004=Consultar todos os pedidos de licença (incluindo os dos utilizadores não são seus subordinados)
-Permission20005=Criar/modificar pedidos de licença de todos (incluindo os dos utilizadores não são seus subordinados)
-Permission20006=Pedidos de licenças do administrador (configuração e atualização do balanço)
+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=Consultar trabalho agendado
 Permission23002=Criar/atualizar trabalho agendado
@@ -1358,9 +1357,9 @@ BrowserIsOK=Você está usando o navegador da web %s. Este navegador está ok pa
 BrowserIsKO=Você está usando o navegador da web %s. Este navegador é conhecido por ser uma má escolha para segurança, desempenho e confiabilidade. Recomendamos o uso do Firefox, Chrome, Opera ou Safari.
 PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
-AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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=Peça o método de envio preferido para terceiros.
 FieldEdition=Edição do campo %s
@@ -1708,8 +1707,9 @@ MailingDelay=Segundos a esperar antes de enviar a próxima mensagem
 NotificationSetup=Configuração do módulo de notificação por email
 NotificationEMailFrom=Email do remetente (De) para emails enviados pelo módulo Notificações
 FixedEmailTarget=Destinatario
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Configuração do módulo de envio
 SendingsReceiptModel=Modelo do recibo de expedição
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Texto livre em notas de entregas
 ##### FCKeditor #####
 AdvancedEditor=Editor avançado
 ActivateFCKeditor=Ativar editor avançado para:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field public notes of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field private notes of elements
+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>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Configuração do módulo Relatórios de despesas - Reg
 ExpenseReportNumberingModules=Módulo de numeração de relatórios de despesas
 NoModueToManageStockIncrease=Não foi ativado nenhum módulo capaz de efetuar a gestão automática do acréscimo de stock. O acrescimo de stock será efetuado manualmente.
 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
@@ -1916,6 +1917,8 @@ 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)
+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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 NoNewEmailToProcess=Nenhum novo email (filtros correspondentes) para processar
 NothingProcessed=Nada feito
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Registrar evento de email
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Código postal
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index ac7535316ff..169578e5424 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -32,7 +32,7 @@ RIB=Conta bancária
 IBAN=Número IBAN
 BIC=Código BIC / SWIFT
 SwiftValid=BIC / SWIFT válido
-SwiftVNotalid=BIC/SWIFT inválido
+SwiftNotValid=BIC/SWIFT inválido
 IbanValid=BAN válido
 IbanNotValid=BAN inválido
 StandingOrders=Encomendas de débito direto
@@ -49,7 +49,6 @@ BankAccountDomiciliation=endereço do banco
 BankAccountCountry=Conta do país
 BankAccountOwner=Nome do proprietário da Conta
 BankAccountOwnerAddress=Direcção do proprietário da Conta
-RIBControlError=Falha na verificação de integridade dos valores. Isso significa que as informações para este número de conta não estão completas ou estão incorretas (verifique o país, números e IBAN).
 CreateAccount=Criar Conta
 NewBankAccount=Nova conta
 NewFinancialAccount=Nova conta financeira
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/bookmarks.lang b/htdocs/langs/pt_PT/bookmarks.lang
index 9e4f182f53f..2671cb7d373 100644
--- a/htdocs/langs/pt_PT/bookmarks.lang
+++ b/htdocs/langs/pt_PT/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Comportamento quando um URL de marcador é selecionado
 CreateBookmark=Criar marcador
 SetHereATitleForLink=Defina um nome para o favorito
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use um link externo / absoluto (https: // URL) ou um link interno / relativo (/ DOLIBARR_ROOT / htdocs / ...)
+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=Escolha se a página vinculada deve ser aberta na guia atual ou em uma nova guia
 BookmarksManagement=Gestão de Marcadores
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index ad7259e5700..de2a743c6fb 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -157,6 +157,18 @@ 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=ID Prof. 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Verificar
 VATIntraCheckDesc=O ID do IVA deve incluir o prefixo do país. O link <b> %s </b> usa o serviço de verificador de IVA europeu (VIES) que requer acesso à Internet do servidor Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Verifique o ID do IVA intracomunitário no site da Comissão Europeia
-VATIntraManualCheck=Você também pode verificar manualmente no site da Comissão Europeia <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Verificação Impossivel. O serviço de verificação não é prestado pelo país membro (%s).
 NorProspectNorCustomer=Não é cliente potencial, nem cliente
 JuridicalStatus=Forma Jurídica
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index 73251d7fa3d..06057502259 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -170,8 +170,9 @@ 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=- Os montantes exibidos contêm todas as taxas incluídas
-RulesResultDue=- Inclui faturas pendentes, despesas, IVA, doações pagas ou não. Inclui também salários pagos. <br> - Baseia-se na data de cobrança das faturas e na data de vencimento das despesas ou pagamentos de impostos. Para salários definidos com o módulo Salários, é utilizada a data-valor de pagamento.
-RulesResultInOut=- Inclui os pagamentos reais feitos em faturas, despesas, IVA e salários. <br> - Baseia-se nas datas de pagamento das faturas, despesas, IVA e salários. A data de doação para doação.
+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=Inclui todas as linhas de crédito do diário de venda.
@@ -295,3 +296,5 @@ 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/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index fed4de28aa7..dc0eb4f58d5 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Falha ao obter feed RSS. Tente adicionar MAIN_SIMPLEXML
 ErrorForbidden=Acesso negado. <br> Você tenta acessar uma página, área ou recurso de um módulo desativado ou sem estar em uma sessão autenticada ou que não é permitido ao usuário.
 ErrorForbidden2=Os permissões para este utilizador podem ser asignados pelo o administrador Dolibarr mediante o menu %s-> %s.
 ErrorForbidden3=Dolibarr não parece funcionar numa Sessão autentificada. Consulte a documentação de Instalação de Dolibarr para saber como administrar as autenticações (htaccess, mod_auth u outro...).
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=A função imagick_readimage não está presente nesta Instalação de PHP. a revisão não está pois disponivel. Os administradores podem desactivar este separador no menu configuração - visualização.
 ErrorRecordAlreadyExists=Registo já existente
 ErrorLabelAlreadyExists=Esta etiqueta já existe
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/pt_PT/holiday.lang
index a17cf87e2f0..f310930968a 100644
--- a/htdocs/langs/pt_PT/holiday.lang
+++ b/htdocs/langs/pt_PT/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Descrição
 SendRequestCP=Criar pedido de licença
 DelayToRequestCP=Os pedidos de licença devem ser efetuados com pelo menos <b>%s dia(s)</b> de antecedência.
 MenuConfCP=Saldo de licença
-SoldeCPUser=Deixar saldo é <b> %s </ b> dias.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Você deve selecionar uma data de fim maior do que a data de início.
 ErrorSQLCreateCP=Ocorreu um erro SQL durante a criação:
 ErrorIDFicheCP=Ocorreu um erro, o pedido de licença não existe.
@@ -134,3 +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/install.lang b/htdocs/langs/pt_PT/install.lang
index 5d2e091ca1b..68df6cf5d08 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -21,6 +21,7 @@ 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.
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 054502d578b..4dcf47e511a 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de IVA definido para o p
 ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de contribuição social definida para o país %s.
 ErrorFailedToSaveFile=Erro, o registo do ficheiro falhou.
 ErrorCannotAddThisParentWarehouse=Você está a tentar adicionar um armazém "pai" que já é um armazém "filho" de um armazém já existente.
+FieldCannotBeNegative=Field "%s" cannot be negative
 MaxNbOfRecordPerPage=Número máximo de registos por página
 NotAuthorized=Não tem permissão para efetuar essa operação
 SetDate=Definir data
@@ -87,7 +88,7 @@ FileWasNotUploaded=Um ficheiro foi seleccionada para ser anexado, mas ainda não
 NbOfEntries=N.º de entradas
 GoToWikiHelpPage=Consultar ajuda online (necessita de acesso à Internet)
 GoToHelpPage=Ir para páginas de ajuda
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Página Inicial
 RecordSaved=Registo Guardado
 RecordDeleted=Registo eliminado
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Retornar o código para o último pedido incorreto d
 InformationLastAccessInError=Informação sobre o último pedido incorreto de acesso à base de dados
 DolibarrHasDetectedError=O Dolibarr detectou um erro técnico
 YouCanSetOptionDolibarrMainProdToZero=Você pode ler o ficheiro de log ou definir a opção $dolibarr_main_prod para '0' no seu ficheiro de configuração para obter mais informações.
-InformationToHelpDiagnose=Esta informação pode ser útil para diagnosticar problemas (pode definir a opção $dolibarr_main_prod para '1' se pretender remover estas notificações)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Mais Informação
 TechnicalInformation=Informação técnica
 TechnicalID=ID Técnico
@@ -211,6 +212,8 @@ User=Utilizador
 Users=Utilizadores
 Group=Grupo
 Groups=Grupos
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Nenhum grupo de utilizador definido
 Password=Senha
 PasswordRetype=Contrassenha
@@ -906,7 +909,7 @@ ViewFlatList=Vista de lista
 ViewAccountList=Ver livro-mestre
 ViewSubAccountList=Ver livro-mestre da subconta
 RemoveString=Remover texto '%s'
-SomeTranslationAreUncomplete=Alguns dos idiomas oferecidos podem estar apenas parcialmente traduzidos ou conter erros. Por favor ajude a corrigir o seu idioma registando-se em <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> para adicionar as suas melhorias.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Fuso Horário do Cliente (utilizador)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/pt_PT/modulebuilder.lang b/htdocs/langs/pt_PT/modulebuilder.lang
index 68fc08e923d..70bd8351693 100644
--- a/htdocs/langs/pt_PT/modulebuilder.lang
+++ b/htdocs/langs/pt_PT/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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).
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
+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=Veja os códigos em uso na sua instalação
 SeeReservedIDsRangeHere=Veja o intervalo de IDs reservados
 ToolkitForDevelopers=Toolkit para desenvolvedores do Dolibarr
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/other.lang b/htdocs/langs/pt_PT/other.lang
index 722de7fee1c..46c77acc4bd 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Codificação de palavra-passe
 PermissionsAdd=Permissões adicionadas
 PermissionsDelete=Permissões removidas
 YourPasswordMustHaveAtLeastXChars=A sua palavra-passe deve ter pelo menos estes caracteres: <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=A sua palavra-passe foi reposta com sucesso
 ApplicantIpAddress=Endereço IP do requerente
 SMSSentTo=SMS enviado para %s
@@ -268,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
diff --git a/htdocs/langs/pt_PT/partnership.lang b/htdocs/langs/pt_PT/partnership.lang
index 2ed1c91f364..436000c629a 100644
--- a/htdocs/langs/pt_PT/partnership.lang
+++ b/htdocs/langs/pt_PT/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Gestão de parceria
 PartnershipDescription=Módulo de gestão de parceria
 PartnershipDescriptionLong= Módulo de gestão de parceria
-
+Partnership=Partnership
 AddPartnership=Add partnership
 CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
 PartnershipCheckBacklink=Partnership: Check referring backlink
diff --git a/htdocs/langs/pt_PT/productbatch.lang b/htdocs/langs/pt_PT/productbatch.lang
index fd3006bbe0f..9348b4f4228 100644
--- a/htdocs/langs/pt_PT/productbatch.lang
+++ b/htdocs/langs/pt_PT/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index ef38f1906ed..1462cc0fe80 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Valor (PMP)
 PMPValueShort=PMP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index ca305970928..f55ae2a20f4 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -197,6 +197,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,3 +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=A data de fim não pode ser anterior à data de início
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 2dbb422877c..3751b84730c 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Limite de estoque para alerta e estoque ideal desej
 AddNewProductStockWarehouse=Definir novo limite para alerta e estoque ideal desejado
 AddStockLocationLine=Diminuir quantidade, em seguida, clique para adicionar outro armazém para este produto
 InventoryDate=Data de Inventário
+Inventories=Inventories
 NewInventory=Novo inventário
 inventorySetup = Configuração de Inventário
 inventoryCreatePermission=Criar novo inventário
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Permitir alterar o valor do PMP para um produto
 ColumnNewPMP=Nova unidade PMP
 OnlyProdsInStock=Não adicione produto sem estoque
-TheoricalQty=Teorique qty
-TheoricalValue=Teorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Último BP
 CurrentPA=PB de Curadoria
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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=Fill real quantity with expected quantity
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=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
diff --git a/htdocs/langs/pt_PT/stripe.lang b/htdocs/langs/pt_PT/stripe.lang
index ee0f48cc59a..647bbd83409 100644
--- a/htdocs/langs/pt_PT/stripe.lang
+++ b/htdocs/langs/pt_PT/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Configurar módulo de Stripe
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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=Pagar com cartão de crédito ou Stripe
 FollowingUrlAreAvailableToMakePayments=As seguintes URL estão disponiveis para permitir a um cliente efectuar um pagamento
 PaymentForm=Forma de pagamento
@@ -28,7 +28,6 @@ AccountParameter=Conta parâmetros
 UsageParameter=Parâmetros de uso
 InformationToFindParameters=Ajuda para encontrar informações de sua conta %s
 STRIPE_CGI_URL_V2=Módulo Url of Stripe CGI para pagamento
-VendorName=Nome do fornecedor
 CSSUrlForPaymentForm=CSS url folha de estilo para forma de pagamento
 NewStripePaymentReceived=Novo pagamento Stripe recebido
 NewStripePaymentFailed=Nova tentativa de pagamento Stripo, mas falhou
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index 426e2cb39e6..32fcde46473 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Últimos arquivos de débito direto %s
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Linhas de ordem de débito direto
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=Nenhuma fatura debitada com sucesso. Verifique se as faturas estão em empresas com um IBAN válido e se o IBAN tem uma UMR (Unique Mandate Reference) com o modo <strong> %s </ strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classificar como creditado
+ClassDebited=Classify debited
 ClassCreditedConfirm=Tem a certeza que quer classificar este débito direto como creditado na sua conta bancária?
 TransData=Data de Envio
 TransMetod=Método de transmissão
@@ -80,7 +82,7 @@ StatusMotif7=Decisão Judicial
 StatusMotif8=Outro motivo
 CreateForSepaFRST=Criar arquivo de débito direto (SEPA FRST)
 CreateForSepaRCUR=Criar arquivo de débito direto (SEPA RCUR)
-CreateAll=Criar arquivo de débito direto (todos)
+CreateAll=Criar ficheiro de débito direto
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Apenas escritório
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Não é possível criar um pedido de débito diret
 SepaMandate=Mandato de Débito Direto SEPA
 SepaMandateShort=Mandato SEPA
 PleaseReturnMandate=Por favor, devolva este formulário de mandato por e-mail para %s ou por e-mail para
-SEPALegalText=Ao assinar este formulário de mandato, você autoriza (A) %s a enviar instruções ao seu banco para debitar sua conta e (B) seu banco a debitar sua conta de acordo com as instruções de %s. Como parte de seus direitos, você tem direito a um reembolso de seu banco, de acordo com os termos e condições de seu contrato com seu banco. Um reembolso deve ser solicitado no prazo de oito semanas a partir da data em que sua conta foi debitada. Seus direitos em relação ao mandato acima são explicados em uma declaração que você pode obter do seu banco.
+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=Identificador do Credor
 CreditorName=Creditor Name
 SEPAFillForm=(B) Por favor, preencha todos os campos marcados com *
@@ -150,3 +152,5 @@ ModeWarning=Opção para o modo real não foi definido, nós paramos depois dest
 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
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 776683ea646..00f79f1b897 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -27,7 +27,7 @@ JournalFinancial=Jurnale financiare
 BackToChartofaccounts=Înapoi la planul de conturi
 Chartofaccounts=Plan de conturi
 ChartOfSubaccounts=Diagrama conturilor contabile individuale
-ChartOfIndividualAccountsOfSubsidiaryLedger=Diagrama conturilor contabile individuale ale registrului filialei
+ChartOfIndividualAccountsOfSubsidiaryLedger=Diagrama conturilor contabile individuale ale registrului jurnal al filialei-surcursalei
 CurrentDedicatedAccountingAccount=Cont curent dedicat
 AssignDedicatedAccountingAccount=Cont nou pentru alocare
 InvoiceLabel=Etichetă de factură
@@ -37,8 +37,8 @@ OtherInfo=Alte informații
 DeleteCptCategory=Eliminați contul contabil din grup
 ConfirmDeleteCptCategory=Sigur doriți să eliminați acest cont contabil din grupul de conturi?
 JournalizationInLedgerStatus=Stare jurnalizare
-AlreadyInGeneralLedger=Transferat deja în jurnalele contabile şi cartea mare
-NotYetInGeneralLedger=Netransferat încă în jurnalele contabile şi cartea mare
+AlreadyInGeneralLedger=Transferat deja în jurnalele contabile secundare şi Registrul jurnal
+NotYetInGeneralLedger=Netransferat încă în jurnalele secundare contabile şi Registrul Jurnal
 GroupIsEmptyCheckSetup=Grupul este gol, verificați configurarea grupului personalizat de conturi
 DetailByAccount=Afișați detalii după cont
 AccountWithNonZeroValues=Conturi cu valori nenule
@@ -48,7 +48,7 @@ CountriesNotInEEC=Țări care nu se află în CEE
 CountriesInEECExceptMe=Țările din CEE, cu excepția celor din %s
 CountriesExceptMe=Toate țările, cu excepția %s
 AccountantFiles=Export documente sursă
-ExportAccountingSourceDocHelp=Cu acest instrument, poți exporta evenimentele sursă (listă CSV și PDF) care au fost utilizate pentru generarea înregistrărilor contabile.
+ExportAccountingSourceDocHelp=Cu acest instrument, poți exporta evenimentele sursă (listă în CSV și PDF) care sunt utilizate pentru a genera operaţiunile de contabilitate.
 ExportAccountingSourceDocHelp2=Pentru export jurnale, foloseşte meniul %s - %s.
 VueByAccountAccounting=Vizualizare după contul contabil
 VueBySubAccountAccounting=Vizualizați după subcont contabil
@@ -82,7 +82,7 @@ AccountancyAreaDescBank=PASUL %s: Definire conturi contabile și codul de jurnal
 AccountancyAreaDescProd=STEP %s: Definire conturi contabile pentru produse/ servicii. Pentru aceasta, utilizați intrarea în meniu %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: Scrie tranzacţii in Cartea Mare. Pentru aceasta, accesează meniul <strong>%s</strong>, apoi fă clic pe butonul <strong>%s</strong>.
+AccountancyAreaDescWriteRecords=PASUL %s: Scriere tranzacţii în Registrul jurnal. Pentru aceasta, accesează meniul <strong>%s</strong>, apoi fă clic pe butonul <strong>%s</strong>.
 AccountancyAreaDescAnalyze=PASUL %s: Adaugă sau modifică tranzacțiile existente și generează rapoarte și exporturi.
 
 AccountancyAreaDescClosePeriod=PASUL %s: Închide perioada, astfel încât să nu se poată modifica în viitor.
@@ -93,11 +93,11 @@ ChangeAndLoad=Schimbați și încărcați
 Addanaccount=Adaugă un cont contabil
 AccountAccounting=Cont contabil
 AccountAccountingShort=Cont
-SubledgerAccount=Cont de subregistru
-SubledgerAccountLabel=Eticheta contului registrului contabil
+SubledgerAccount=Cont de jurnal secundar
+SubledgerAccountLabel=Etichetă cont jurnal contabil
 ShowAccountingAccount=Afișați contul contabil
 ShowAccountingJournal=Afişare jurnal contabil
-ShowAccountingAccountInLedger=Afişare cont contabil în registru
+ShowAccountingAccountInLedger=Afişare cont contabil în registrul jurnal
 ShowAccountingAccountInJournals=Afişează conturile contabile în jurnale
 AccountAccountingSuggest=Conturi contabile sugerate
 MenuDefaultAccounts=Conturi implicite
@@ -121,8 +121,8 @@ CreateMvts=Creați o tranzacție nouă
 UpdateMvts=Modificarea unei tranzacții
 ValidTransaction=Tranzacție validată
 WriteBookKeeping=Înregistrare tranzacţii în contabilitate
-Bookkeeping=Cartea mare
-BookkeepingSubAccount=Registru analitic
+Bookkeeping=Registru jurnal
+BookkeepingSubAccount=Registru jurnal secundar
 AccountBalance=Sold cont
 ObjectsRef=Referinţă obiect sursă
 CAHTF=Total achiziţii de la furnizor înainte de taxare
@@ -201,7 +201,7 @@ Doctype=Tipul documentului
 Docdate=Data documentului
 Docref=Referinţă
 LabelAccount=Etichetă cont
-LabelOperation=Etichetă operaţie
+LabelOperation=Etichetă operaţiune
 Sens=Direcţie
 AccountingDirectionHelp=Pentru un cont contabil de client, utilizează Credit pentru a înregistra o plată pe care ai primit-o<br> Pentru un cont contabil de furnizor, utilizează Debit pentru a înregistra o plată efectuată 
 LetteringCode=Codul de numerotare
@@ -211,8 +211,8 @@ JournalLabel=Eticheta jurnalului
 NumPiece=Număr notă contabilă
 TransactionNumShort=Nr. tranzacţie
 AccountingCategory=Grupă personalizată
-GroupByAccountAccounting=Grupare după cont registru
-GroupBySubAccountAccounting=Grupare după cont de subregistru
+GroupByAccountAccounting=Grupare după cont din registrul jurnal
+GroupBySubAccountAccounting=Grupare după cont de jurnal secundar
 AccountingAccountGroupsDesc=Puteți defini aici câteva grupe de conturi contabile. Acestea vor fi utilizate pentru rapoarte contabile personalizate.
 ByAccounts=După conturi
 ByPredefinedAccountGroups=După grupe predefinite
@@ -223,12 +223,12 @@ DeleteMvt=Ștergeți câteva linii operate 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 jurnal specific (este necesar cel puțin un criteriu). Va trebui să refolosiți caracteristica '%s' pentru a înregistra înregistrarea ștearsă în registru. 
+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)
 FinanceJournal=Jurnal Bancă
 ExpenseReportsJournal=Jurnalul rapoartelor de cheltuieli
 DescFinanceJournal=Jurnal financiar bancar, include toate tipurile de plăți efectuate prin conturile bancare
-DescJournalOnlyBindedVisible=Aceasta este o vedere a înregistrării care este legată de un cont contabil și poate fi înregistrată în Jurnale și contabilitate.
+DescJournalOnlyBindedVisible=Aceasta este o vedere a înregistrării care este legată de un cont contabil și poate fi înregistrată în jurnale și Registrul jurnal.
 VATAccountNotDefined=Contul contabil de TVA nu a fost definit
 ThirdpartyAccountNotDefined=Contul pentru terț nu este definit
 ProductAccountNotDefined=Contul pentru produs nu este definit
@@ -286,21 +286,21 @@ ValidateMovements=Vallidare trasferuri
 DescValidateMovements= Orice modificare sau ștergere a înregistrărilor va fi interzisă. Toate intrările pentru un exercițiu financiar trebuie validate, altfel închiderea nu va fi posibilă
 
 ValidateHistory=Asociază automat
-AutomaticBindingDone=Asociere automată finalizată
+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
 Balancing=în balanţă
 FicheVentilation=Fişă asociere
-GeneralLedgerIsWritten=Tranzacțiile sunt scrise în Cartea Mare
+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.
 ListOfProductsWithoutAccountingAccount=Lista produselor care nu sunt asociate unui cont contabil
 ChangeBinding=Schimbați asocierea
-Accounted=Contabilizat în jurnal - Cartea Mare
+Accounted=Contabilizat în Registrul Jurnal
 NotYetAccounted=Netransferat încă în contabilitate
 ShowTutorial=Arată tutorial
-NotReconciled=Nu este decontat
+NotReconciled=Ne-reconciliat
 WarningRecordWithoutSubledgerAreExcluded=Atenție, toate operațiunile fără cont de subregistru definit sunt filtrate și excluse din această vizualizare
 
 ## Admin
@@ -387,7 +387,8 @@ SaleExport=Vânzare la export
 SaleEEC=Vânzări în CEE
 SaleEECWithVAT=Vânzarea în CEE cu cota TVA diferită de zero, deci presupunem că aceasta NU este o vânzare intracomunitară, iar contul contabil este cel standard al produsului. 
 SaleEECWithoutVATNumber=Vânzare în CEE fără TVA, dar codul TVA al terțului nu este definit. Se va utiliza contul contabil de produs pentru vânzările standard. Completaţi codul de TVA al terțului sau contul contabil aferent produsului.
-
+ForbiddenTransactionAlreadyExported=Interzis: Tranzacţia a fost validată şi/sau exportată.
+ForbiddenTransactionAlreadyValidated=Interzis: Tranzacţia a fost validată.
 ## Dictionary
 Range=Interval cont contabil
 Calculated=Calculat 
@@ -404,6 +405,7 @@ NoJournalDefined=Nici un jurnal nu a fost definit
 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
 
 ## Import
 ImportAccountingEntries=Intrări contabile
@@ -414,8 +416,8 @@ FECFormatEntryNum=Număr notă contabilă (EcritureNum)
 FECFormatEntryDate=Dată notă contabilă (EcritureDate)
 FECFormatGeneralAccountNumber=Număr cont general (CompteNum)
 FECFormatGeneralAccountLabel=Etichetă cont general (CompteLib)
-FECFormatSubledgerAccountNumber=Număr cont subregistru (CompAuxNum)
-FECFormatSubledgerAccountLabel=Număr cont subregistru (CompAuxLib)
+FECFormatSubledgerAccountNumber=Număr cont registru jurnal secundar (CompAuxNum)
+FECFormatSubledgerAccountLabel=Număr cont registru jurnal secundar (CompAuxLib)
 FECFormatPieceRef=Ref notă contabilă (PieceRef)
 FECFormatPieceDate=Dată creare notă contabilă (PieceDate)
 FECFormatLabelOperation=Etichetă operaţiune (EcritureLib)
@@ -428,7 +430,7 @@ FECFormatMulticurrencyAmount=Sumă multi-monedă (Montantdevise)
 FECFormatMulticurrencyCode=Cod multi-monedă (Idevise)
 
 DateExport=Dată export
-WarningReportNotReliable=Atenție, acest raport nu se bazează pe registrul contabil, deci nu conține o tranzacție modificată manual în registru contabil. Dacă jurnalele sunt actualizate, vizualizarea contabilă este mai precisă.
+WarningReportNotReliable=Atenție, acest raport nu se bazează pe registrul jurnal contabil, deci nu conține o tranzacție modificată manual în registrul contabil. Dacă jurnalele sunt actualizate, vizualizarea contabilă este mai precisă.
 ExpenseReportJournal=Jurnalul raportului de cheltuieli
 InventoryJournal=Jurnal inventar
 
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index b60b80643a7..31911e48199 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+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
@@ -265,8 +267,8 @@ OtherResources=Alte resurse
 ExternalResources=Resurse externe
 SocialNetworks=Reţele sociale
 SocialNetworkId=ID reţea socială
-ForDocumentationSeeWiki=Pentru utilizator sau developer documentaţia (doc, FAQs ...), <br> este disponibilă la Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
-ForAnswersSeeForum=Pentru orice alte întrebări/ajutor, se poate utiliza Dolibarr forum: <br> <a href="%s" target="_blank"><b> %s</b></a>
+ForDocumentationSeeWiki=Pentru documentaţia de utilizare sau de dezvoltare (Doc, FAQs...),<br>consultă Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
+ForAnswersSeeForum=Pentru alte întrebări/suport, poţi utiliza forumul Dolibarr:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=Iată câteva resurse pentru a obține ajutor și asistență cu Dolibarr.
 HelpCenterDesc2=Unele dintre aceste resurse sunt disponibile numai în <b>engleză</b>.
 CurrentMenuHandler=Gestionar meniu curent
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Ultima versiune stabilă
 LastActivationDate=Ultima dată de activare
 LastActivationAuthor=Ultimul autor de activare
 LastActivationIP=Ultimul IP de activare
+LastActivationVersion=Ultima versiune activată
 UpdateServerOffline=Update server offline
 WithCounter=Gestionați un contor
 GenericMaskCodes=Puteți introduce orice mască de numerotare. În această mască, pot fi utilizate următoarele etichete: <br><b>{000000}</b> corespunde unui număr care va fi incrementat pe fiecare %s. Introduceți la fel de multe zerouri ca lungimea dorită a contorului. Contorul va fi completat de zerouri din stânga pentru a avea la fel de multe zerouri ca masca. <br><b>{000000+000}</b> la fel ca și precedentul, dar un offset corespunzător numărului din dreapta semnului + se aplică începând cu primul %s. <br><b>{000000@x}</b> la fel ca și precedentul, dar contorul este resetat la zero când se atinge luna x (x între 1 și 12 sau 0 pentru a utiliza primele luni ale anului fiscal definit în configurația ta sau 99 pentru a reveni la zero în fiecare lună). Dacă se folosește această opțiune și x este 2 sau mai mare, atunci este necesară și secvența {yy}{mm} sau {yyyy}{mm}. <br><b>{dd}</b> zi (01 până la 31). <br><b>{mm}</b> lună (01 până la 12). <br><b>{yy}</b>, <b>{aaaa}</b> sau <b>{y}</b> an peste 2, 4 sau 1 numere.<br> 
@@ -540,7 +543,7 @@ Module1Desc=Gestionarea companiilor și a contactelor (clienți, prospecţi...)
 Module2Name=Comercial
 Module2Desc=Management Comercial
 Module10Name=Contabilitate (în partidă simplă)
-Module10Desc=Rapoarte contabile simple (jurnale, cifre de afaceri) bazate pe conținutul bazei de date. Nu folosește niciun registru contabil.
+Module10Desc=Rapoarte contabile simple (jurnale, cifre de afaceri) bazate pe conținutul bazei de date. Nu folosește niciun registru jurnal contabil.
 Module20Name=Oferte comerciale
 Module20Desc=Managementul Ofertelor Comerciale
 Module22Name=Newslettere
@@ -682,7 +685,7 @@ Module50200Desc=Oferiți clienților o pagină de plată online PayPal (cont Pay
 Module50300Name=Stripe
 Module50300Desc=Oferiți clienţilor o pagină Stripe de plată online (carduri de credit/debit). Aceasta poate fi utilizată pentru a permite clienţilor să facă plăţi ad-hoc sau plăţi legate de un anumit obiect sistem (factură, comandă etc ...)
 Module50400Name=Contabilitate (partidă dublă)
-Module50400Desc=Managementul contabilității (partidă dublă, suport jurnale contabile principale şi subsidiare- de filială). Exportați registrele în mai multe alte formate utilizate de software-uri de contabilitate. 
+Module50400Desc=Management contabilitate (partidă dublă, suport registre jurnal contabile principale şi secundare - de filială). Export registre în alte formate utilizate de software-uri de contabilitate.
 Module54000Name=Print lPP
 Module54000Desc=Imprimare directă (fără a deschide documentele) utilizând interfața Cups IPP (Imprimanta trebuie să fie vizibilă pe server, şi CUPS trebuie să fie instalat pe server).
 Module55000Name=Sondaj, Chestionar sau Vot
@@ -753,15 +756,16 @@ Permission106=Export livrări
 Permission109=Şterge livrări
 Permission111=Citeşte conturi financiare
 Permission112=Creare/modificare/ştergere şi comparare tranzacţii
-Permission113=Configurare conturi financiare( creare, gestionare categorii)
-Permission114=Decontați tranzacțiile
+Permission113=Configurare conturi financiare (creare, gestionare categorii de tranzacții bancare)
+Permission114=Reconciliere tranzacții
 Permission115=Export tranzacţii şi declaraţii contabile
 Permission116=Transferuri între conturi
 Permission117=Gestionare remitere cecuri
-Permission121=Citiţi terţi asociaţi la utilizator
+Permission121=Citeşte terţi asociaţi la utilizator
 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)
@@ -889,12 +893,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=Creare/modificare rapoarte de cheltuieli
+Permission772=Creare/modificare rapoarte de cheltuieli (pentru sine şi subordonaţi)
 Permission773=Șterge rapoarte de cheltuieli
-Permission774=Citeşte toate rapoartele de cheltuieli (chiar și pentru utilizatorii care nu sunt subordonații săi)
 Permission775=Aprobă rapoarte de cheltuieli
 Permission776=Plăteşte rapoartele de cheltuieli
-Permission777=Citire rapoarte de cheltuieli ale tuturor
+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
@@ -958,15 +961,11 @@ Permission2801=Foloseşte clientul FTP în modul de citire (numai navigare și d
 Permission2802=Foloseşte clientul FTP în modul de scriere (ştergere şi încărcare fişiere)
 Permission3200=Citeşte evenimente arhivate și amprente digitale
 Permission3301=Generare module noi
-Permission4001=Vede angajații
-Permission4002=Creare angajați
-Permission4003=Șterge angajați
-Permission4004=Export angajați
-Permission4010=Citeşte abilitate/job/post
-Permission4011=Creare/modificare abilitate/job/post
-Permission4012=Şterge abilitate/job/post
-Permission4020=Citeşte evaluare
-Permission4021=Creare/modificare evaluare
+Permission4001=Citeşte abilitate/job/post
+Permission4002=Creare/modificare abilitate/job/post
+Permission4003=Şterge abilitate/job/post
+Permission4020=Citeşte evaluări
+Permission4021=Creare/modificare evaluare a ta
 Permission4022=Validare evaluare
 Permission4023=Ştergere evaluare
 Permission4030=Vede meniul de comparare
@@ -977,9 +976,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=Citeşte toate cererile de concediu (chiar și pentru utilizatorii care nu-i sunt subordonați)
-Permission20005=Creare/modificare cereri de concediu pentru toată lumea (chiar și pentru utilizatorii care nu-i sunt subordonați)
-Permission20006=Administrare cereri de concediu (configurare şi actualizare balanţă)
+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
@@ -995,11 +994,11 @@ Permission50330=Citeşte obiecte Zapier
 Permission50331=Creare/Actualizare obiecte Zapier
 Permission50332=Şterge obiecte Zapier
 Permission50401=Asociază produsele și facturile cu conturile contabile
-Permission50411=Citeşte operațiunile din cartea mare
-Permission50412=Scriere/editare operațiuni în cartea mare
-Permission50414=Șterge operațiuni în cartea mare
+Permission50411=Citeşte operațiunile din registrul jurnal
+Permission50412=Scriere/editare operațiuni în registrul jurnal
+Permission50414=Șterge operațiuni din registrul jurnal
 Permission50415=Șterge toate operațiunile după an și jurnal în cartea mare
-Permission50418=Export operațiuni din cartea mare
+Permission50418=Export operațiuni din Registrul Jurnal
 Permission50420=Rapoarte și export de rapoarte (cifră de afaceri, balanţe, jurnale, carte mare)
 Permission50430=Defineşte perioadele fiscale. Validează tranzacţiile şi perioadele fiscale.
 Permission50440=Administrează schema de conturi, configurează contabilitatea
@@ -1358,11 +1357,11 @@ BrowserIsOK=Utilizați browserul web %s. Acest browser este ok pentru securitate
 BrowserIsKO=Utilizați browserul web %s. Acest browser este cunoscut ca fiind o alegere proastă pentru securitate, fiabilitate și performanță. Vă recomandăm să utilizați Firefox, Chrome, Opera sau Safari.
 PHPModuleLoaded=Componenta PHP %seste încărcată
 PreloadOPCode=Componenta OPCode preîncărcată este utilizată
-AddRefInList=Afișează lista cu informaţii Client/Furnizor (listă de selecţie sau combo)  și cea mai mare parte a hiperlinkului.<br> Terții vor apărea în formatul "CC12345 - SC45678 - Marea companie SRL". în loc de "Marea companie SRL".
-AddVatInList=Afișează codul de TVA al clientului/furnizorului în listă (lista de selecție sau combobox). 
-AddAdressInList=Afișați adresa în lista clientului/furnizorului (listă de selecție sau combo).<br> Terții vor apărea cu numele formatat la "Big Company corp - 21 jump street 123456 Big city - USA" în loc de "Big Company corp".
+AddRefInList=Afișează ref. Client/Vânzător în listele combo.<br> Terții vor apărea în formatul "CC12345 - SC45678 - COMPANIE SRL" în loc de "COMPANIE SRL".
+AddVatInList=Afișează codul de TVA al clientului/furnizorului în listele combo.
+AddAdressInList=Afișează adresa clientului/furnizorului în listele combo.<br> Terții vor apărea în formatul "COMPANIE SRL - Strada 21 Cod poştal 123456 Judeţ  - România" în loc de "COMPANIE SRL".
 AddEmailPhoneTownInContactList=Afișați adresa de email de contact (sau telefoanele dacă nu este definită) și lista cu orașe (lista combo sau caseta combinată)<br> Contactele vor apărea cu formatul de nume "Dupond Durand - dupond.durand@email.com - Paris" sau "Dupond Durand - 06 07 59 65 66 - Paris" în loc de "Dupond Durand".
-AskForPreferredShippingMethod=Solicitați o metodă de transport agreată cu terţii.
+AskForPreferredShippingMethod=Solicitare metodă de transport agreată cu terţii.
 FieldEdition=Editarea câmpului %s
 FillThisOnlyIfRequired=Exemplu: +2 (completați numai dacă există probleme cu decalajul de fus orar)
 GetBarCode=Preia cod de bare
@@ -1708,8 +1707,9 @@ MailingDelay=Secunde de aşteptare pentru trimiterea următorului email
 NotificationSetup=Configurare modul Notificare pe email
 NotificationEMailFrom=Email expeditor (De la) pentru email-urile trimise de modulul Notificări
 FixedEmailTarget=Destinatar
-NotificationDisableConfirmMessageFix=Dezactivare informații de notificare din mesajul de confirmare pentru notificarea de remediere
-NotificationDisableConfirmMessageUser=Dezactivare informații de notificare din mesajul de confirmare pentru notificarea utilizatorului
+NotificationDisableConfirmMessageContact=Ascundei listă destinatari notificări (abonați ca contact) în mesajul de confirmare
+NotificationDisableConfirmMessageUser=Ascunde listă destinatari notificări (abonați ca utilizator) în mesajul de confirmare 
+NotificationDisableConfirmMessageFix=Ascunde listă destinatari notificări (abonați cu email global) în mesajul de confirmare
 ##### Sendings #####
 SendingsSetup=Configurare modul Livrări
 SendingsReceiptModel=Şablon notă de livrare
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Text liber pe notele de recepţie produse
 ##### FCKeditor #####
 AdvancedEditor=Editor avansat
 ActivateFCKeditor=Activaţi editorul avansat pentru:
-FCKeditorForNotePublic=Creare/editare WYSIWIG câmp notă publică a elementelor
-FCKeditorForNotePrivate=Creare/editare WYSIWIG câmp notă privată a elementelor
+FCKeditorForNotePublic=Creare/editare WYSIWIG câmp "note publice" pe elemente
+FCKeditorForNotePrivate=Creare/editare WYSIWIG câmp "note private" pe elemente
 FCKeditorForCompany=Creare/editare WYSIWIG câmp descriere elemente (cu excepția produselor/serviciilor) 
 FCKeditorForProduct=Creare/editare WYSIWIG câmp descriere produse/servicii
 FCKeditorForProductDetails=Crearea/editarea WYSIWIG a liniilor de detalii ale produselor pentru toate entitățile (propuneri, comenzi, facturi, etc.).<span class="warning"> Atenţie: Utilizarea acestei opțiuni pentru acest caz nu este serios recomandată, deoarece poate crea probleme cu caracterele speciale și formatarea paginilor atunci când creați fișiere PDF.</span>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Configurare modul Rapoarte de cheltuieli - Reguli
 ExpenseReportNumberingModules=Model de numerotare a rapoartelor de cheltuieli
 NoModueToManageStockIncrease=Nu a fost activat niciun modul capabil să gestioneze creșterea stocului automat. Creșterea stocurilor se va face doar prin introducere manuală.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Puteți găsi opțiuni pentru notificările prin email activând şi configurând modulul "Notificare".
+TemplatesForNotifications=Şabloane pentru notificări
 ListOfNotificationsPerUser=Lista notificărilor automate pentru utilizator*
 ListOfNotificationsPerUserOrContact=Lista posibilelor notificări automate (în cadrul evenimentului comercial) disponibile pentru utilizator* sau pentru contact** 
 ListOfFixedNotifications=Listă notificări automate
@@ -1916,6 +1917,8 @@ 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)
+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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Doriți să rulați acum colectarea pentru acest co
 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)
-RecordEvent=Înregistrați evenimentul de email
-CreateLeadAndThirdParty=Creați lead oportunitate (și terț, dacă este necesar)
-CreateTicketAndThirdParty=Creați tichet (și faceți legătura cu un terț dacă a fost încărcat de o operațiune anterioară)
+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)
 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)
 LoadThirdPartyFromNameOrCreate=Încărcați un terţ căutând în %s (creare dacă nu este găsit)
+AttachJoinedDocumentsToObject=Salvare fișiere atașate în documente obiect dacă o referință a unui obiect este găsită în subiectul email-ului.
 WithDolTrackingID=Mesaj dintr-o conversație inițiată de un prim e-mail trimis de la sistem
 WithoutDolTrackingID=Mesaj dintr-o conversație inițiată de un prim e-mail NU trimis din sistem
 WithDolTrackingIDInMsgId=Mesaj transmis din sistem
@@ -2078,7 +2082,7 @@ CreateCandidature=Creare aplicare la job
 FormatZip=Zip
 MainMenuCode=Codul de intrare a meniului (meniu principal)
 ECMAutoTree=Afișați arborele ECM automat
-OperationParamDesc=Definiți valorile de utilizat pentru obiectul acțiunii sau modul de extragere a valorilor. De exemplu: <br>objproperty1=SET:valoarea de setat<br>objproperty2=SET:o valoare de înlocuire a __objproperty1__<br>objproperty3=SETIFEMPTY:valoare folosită dacă objproperty3 nu este încă definită<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:Denumirea companiei mele este\\s([^\\s]*)<br><br>Folosește caracterul ; ca separator pentru a extrage sau seta mai multe proprietăți.
+OperationParamDesc=Definire reguli de utilizat pentru a extrage sau a seta valori.<br> Exemplu pentru operațiunile care trebuie să extragă un nume subiectul email-ului: <br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Exemplu pentru operațiuni de creare obiecte:<br>objproperty1=SET:valoarea de setat<br>objproperty2=SET:o valoare care include valoarea __objproperty1__<br>objproperty3=SETIFEMPTY:valoare utilizată dacă objproperty3 nu este deja definit<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>Foloseşte ; ca separator pentru a extrage sau a seta mai multe proprietăți.
 OpeningHours=Program de lucru
 OpeningHoursDesc=Introduceți aici programul de lucru normal ale companiei dvs.
 ResourceSetup=Configurarea modulului Resurse 
@@ -2124,7 +2128,7 @@ LargerThan=Mai mare decât
 IfTrackingIDFoundEventWillBeLinked=Rețineți că, dacă un identificator de urmărire al unui obiect este găsit în e-mail sau dacă e-mailul este un răspuns al unui e-mail colectat și legat de un obiect, evenimentul creat va fi legat automat de obiectul cunoscut.
 WithGMailYouCanCreateADedicatedPassword=Cu un cont GMail, dacă ați activat validarea cu 2 factori, este recomandat să creați o a doua parolă dedicată pentru aplicație, în loc să utilizați propria parolă de la https://myaccount.google.com/.
 EmailCollectorTargetDir=Poate fi de dorit să mutați email-ul într-o altă etichetă/director atunci când a fost procesat cu succes. Trebuie doar să setați numele directorului aici pentru a utiliza această caracteristică (NU folosiți caractere speciale în nume). Rețineți că, de asemenea, trebuie să utilizați un cont de autentificare pentru citire/scriere.
-EmailCollectorLoadThirdPartyHelp=Puteți utiliza această acțiune pentru a folosi conținutul emailului pentru a găsi și încărca un terț în baza de date. Terțul găsit (sau creat) va fi utilizat pentru următoarele acțiuni necesare.<br> De exemplu, dacă doreşti să creezi un terț cu un nume extras dintr-un șir 'Nume: nume căutat' găsit în conţinut, utilizează email-ul expeditorului ca email, poți seta câmpul parametru astfel:<br> 'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+EmailCollectorLoadThirdPartyHelp=Poţi folosi această acțiune pentru a utiliza conținutul email-ului pentru a găsi și încărca un terţ existent în baza de date. Terțul găsit (sau creat) va fi folosit pentru următoarele acțiuni care depind de el.<br> De exemplu, dacă vrei să creezi un terț cu un nume extras dintr-un șir 'Nume: nume de căutat' prezent în conţinut, utilizează adresa de email a expeditorului, poţi seta câmpul parametru astfel:<br> 'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 EndPointFor=End point pentru %s:%s
 DeleteEmailCollector=Şterge colectorul de email-uri
 ConfirmDeleteEmailCollector=Eşti sigur că vrei să ştergi acest colector de email-uri?
@@ -2209,3 +2213,10 @@ 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
 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
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index c030d3d77f0..27706fac7b7 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -32,7 +32,7 @@ RIB=Număr Cont Bancar
 IBAN=Cod IBAN
 BIC=Cod BIC/SWIFT 
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT invalid
+SwiftNotValid=BIC/SWIFT invalid
 IbanValid=IBAN valid
 IbanNotValid=IBAN invalid
 StandingOrders=Ordine de debit direct
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Adresa băncii
 BankAccountCountry=Ţară Cont
 BankAccountOwner=Nume deţinător cont
 BankAccountOwnerAddress=Adresă deţinător Cont
-RIBControlError=Verificarea de integritate a eșuat. Aceasta înseamnă că informațiile pentru acest număr de cont nu sunt complete sau sunt incorecte (bifați țara, numerele și IBAN).
 CreateAccount=Crează cont
 NewBankAccount=Cont nou
 NewFinancialAccount=Cont financiar nou
@@ -69,16 +68,16 @@ BankTransactionByCategories=Înregistrări bancare pe categorii
 BankTransactionForCategory=Înregistrări bancare pentru categoria <b>%s</b>
 RemoveFromRubrique=Elimină link-ul cu categoria
 RemoveFromRubriqueConfirm=Sigur doriți să eliminați legătura dintre intrare și categorie?
-ListBankTransactions=Listă de intrări bancare
+ListBankTransactions=Listă tranzacţii bancare
 IdTransaction=ID tranzacţie
-BankTransactions=Intrări bancare
+BankTransactions=Tranzacţii bancare
 BankTransaction=Intrare tranzacţie bancară
 ListTransactions=Listă înregistrări
 ListTransactionsByCategory=Listă înregistrări/categorii
-TransactionsToConciliate=Intrări pentru reconciliere
-TransactionsToConciliateShort=De compensat
-Conciliable=Poate fi decontabil
-Conciliate=Decontare
+TransactionsToConciliate=Tranzacţii de reconciliat
+TransactionsToConciliateShort=De reconciliat
+Conciliable=Poate fi reconciliat
+Conciliate=Reconciliere
 Conciliation=Reconciliere
 SaveStatementOnly=Salvați numai declarația
 ReconciliationLate=Reconciliere întârziată
@@ -96,11 +95,11 @@ LineRecord=Tranzacţie
 AddBankRecord=Adaugă intrare
 AddBankRecordLong=Adăugă intrare manuală
 Conciliated=Reconciliat
-ConciliatedBy=Decontat de
-DateConciliating=Data decontare
-BankLineConciliated=Intrare compensată cu extras bancar
+ConciliatedBy=Reconciliat de
+DateConciliating=Dată reconciliere
+BankLineConciliated=Tranzacţie reconciliată cu extras bancar
 Reconciled=Reconciliat
-NotReconciled=Nu este conciliat
+NotReconciled=Ne-reconciliat
 CustomerInvoicePayment=Plată client
 SupplierInvoicePayment=Plată furnizor
 SubscriptionPayment=Plată cotizaţie
@@ -127,7 +126,7 @@ DeleteTransaction=Șterge intrare
 ConfirmDeleteTransaction=Sigur doriți să ștergeți această intrare?
 ThisWillAlsoDeleteBankRecord=Aceasta va șterge, de asemenea, intrarea bancară generată
 BankMovements=Mişcări
-PlannedTransactions=Intrări planificate
+PlannedTransactions=Tranzacţii planificate
 Graph=Grafice
 ExportDataset_banque_1=Înregistrări bancare și extras de cont
 ExportDataset_banque_2=Formular depunere
@@ -145,7 +144,7 @@ FutureTransaction=Tranzacție viitoare. Imposibil de reconciliat.
 SelectChequeTransactionAndGenerate=Acest ecran vă arată statistici ale membrilor în funcție de regiune.
 InputReceiptNumber=Alegeți extrasul de cont privitor la conciliere. Folosiţi o valoare numerică sortabilă : YYYYMM sau YYYYMMDD
 EventualyAddCategory=În cele din urmă, specifică o categorie în care să clasezi înregistrările
-ToConciliate=Să se deconteze?
+ToConciliate=Să se reconcilieze?
 ThenCheckLinesAndConciliate=Apoi, verifică liniile prezente în extrasul bancar şi dă click
 DefaultRIB=IBAN implicit
 AllRIB=Toate IBAN-urile
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 28c5c10be64..1e1faff0685 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -22,7 +22,7 @@ InvoiceDepositAsk=Factură de plată în avans
 InvoiceDepositDesc=Acest tip de factură se face atunci când a fost primită o factură de plată în avans
 InvoiceProForma=Factură Proformă
 InvoiceProFormaAsk=Factură Proformă
-InvoiceProFormaDesc=<b>Factura Proformă </b> este o imagine a adevăratei facturi, dar nu are nici o valoare contabilă.
+InvoiceProFormaDesc=<b>Factura Proformă </b> este o imagine a unei facturi, dar nu are nici o valoare contabilă.
 InvoiceReplacement=Factură de înlocuire
 InvoiceReplacementAsk=Factură de înlocuire a altei facturi
 InvoiceReplacementDesc=<b>Factura de înlocuire</b> este folosită pentru a înlocui o factură care nu a fost achitată.<br><br>Notă: Se pot înlocui numai facturile neachitate. Dacă factura pe care o înlocuiți nu este încă închisă, aceasta va fi închisă automat la "Abandonată". 
@@ -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ă
@@ -280,6 +279,7 @@ SetMode=Setare tip de plată
 SetRevenuStamp=Timbru fiscal
 Billed=Facturat
 RecurringInvoices=Facturi recurente
+RecurringInvoice=Factură recurentă
 RepeatableInvoice=Model factura
 RepeatableInvoices=Modele facturi
 Repeatable=Model
@@ -449,6 +449,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
@@ -604,3 +606,4 @@ SituationTotalProgress=Progres total %d %%
 SearchUnpaidInvoicesWithDueDate=Căutare facturi neplătite cu o dată scadentă = %s
 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
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/bookmarks.lang b/htdocs/langs/ro_RO/bookmarks.lang
index 49f491c1e09..af716c5d751 100644
--- a/htdocs/langs/ro_RO/bookmarks.lang
+++ b/htdocs/langs/ro_RO/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Comportament atunci când este selectată o adresă URL de marcaj
 CreateBookmark=Creare marcaj
 SetHereATitleForLink=Alegeți un nume pentru marcaj
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Utilizați un link extern / absolut (https://URL) sau un link intern / relativ (/DOLIBARR_ROOT/htdocs/...)
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Foloseşte un link extern/absolut (https://externalurl.com) sau un link intern/relativ (/mypage.php). De asemenea, poți folosi un nr. de telefon precum tel:0123456.
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Alegeți dacă pagina de referinţă ar trebui să se deschidă în fila curentă sau într-o filă nouă
 BookmarksManagement=Management marcaje
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 781ba355bef..d20e2dca917 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -45,7 +45,7 @@ ParentCompany=Societatea-mamă
 Subsidiaries=Filiale - sedii
 ReportByMonth=Raport pe lună
 ReportByCustomers=Raport pe client
-ReportByThirdparties=Raport pe terţ
+ReportByThirdparties=Raport pe terţi
 ReportByQuarter=Raport pe cotă
 CivilityCode=Mod adresare
 RegisteredOffice=Sediu social
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Registrul Comerţului)
+ProfId2CM=Id. prof. 2 (Nr. contribuabil)
+ProfId3CM=Id. prof. 3 (Decret de înfiinţare)
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=Registrul Comerţului
+ProfId2ShortCM=Nr. contribuabil
+ProfId3ShortCM=Decret de înfiinţare
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof. Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Verificare VIES
 VATIntraCheckDesc=Codul TVA trebuie să includă prefixul țării. Linkul <b>%s</b> utilizează serviciul european de verificare TVA (VIES), care necesită acces la internet de pe serverul sistemului.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Verificați codul TVA intracomunitar pe site-ul web al Comisiei Europene
-VATIntraManualCheck=De asemenea, puteți verifica manual pe site-ul web al UE <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=Poţi verifica şi manual pe site-ul Comisiei Europene <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Verificare imposibilă. Verificaţi dacă serviciul este furnizat de către statul membru (%s).
 NorProspectNorCustomer=Nici prospect, nici client
 JuridicalStatus=Tipul entității comerciale
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index eee347cf10b..338aa10ddae 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -21,7 +21,7 @@ MenuReportInOut=Venituri / Cheltuieli
 ReportInOut=Soldul veniturilor și al cheltuielilor
 ReportTurnover=Cifra de afaceri facturată
 ReportTurnoverCollected=Cifra de afaceri colectată
-PaymentsNotLinkedToInvoice=Plăţile neasociate la facturi, nelegate la terţi
+PaymentsNotLinkedToInvoice=Plăţi neasociate la facturi, nelegate la terţi
 PaymentsNotLinkedToUser=Plăţi neasociate niciunui utilizator
 Profit=Profit
 AccountingResult=Rezultat contabil
@@ -152,9 +152,9 @@ ConfirmDeleteSalary=Sigur doriți să ștergeți acest salariu?
 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>
-CalcModeDebt= Analiza documentelor înregistrate cunoscute chiar dacă acestea nu sunt încă introduse în registru contabil.
-CalcModeEngagement=Analiza plăților înregistrate cunoscute, chiar dacă acestea nu sunt încă înregistrate în registru.
-CalcModeBookkeeping=Analiza datelor publicate în tabelul registrului contabil.
+CalcModeDebt= Analiza documentelor înregistrate cunoscute chiar dacă acestea nu sunt încă introduse în registrul jurnal.
+CalcModeEngagement=Analiza plăților înregistrate cunoscute, chiar dacă acestea nu sunt încă înregistrate în registrul jurnal.
+CalcModeBookkeeping=Analiza datelor publicate în Registrul Jurnal.
 CalcModeLT1= Mod <b>%sRE pe facturi clienţi - facturi furnizori %s</b>
 CalcModeLT1Debt=Mod <b>%sRE pe facturi clienţi%s</b>
 CalcModeLT1Rec= Mod <b>%sRE pe facturi furnizori%s</b>
@@ -166,19 +166,20 @@ AnnualSummaryInputOutputMode=Balanța de venituri și cheltuieli, rezumat anual
 AnnualByCompanies=Soldul veniturilor și al cheltuielilor, pe grupe predefinite de conturi
 AnnualByCompaniesDueDebtMode=Soldul veniturilor și cheltuielilor, detaliate după grupuri predefinite, modul <b>%sCreanţe-Datorii%s </b> aşa zisa <b>Contabilitate de angajament</b>.
 AnnualByCompaniesInputOutputMode=Soldul veniturilor și cheltuielilor, detaliate după grupuri predefinite, modul <b>%sVenituri-Cheltuieli%s</b> aşa zisa <b>Contabilitate numerică</b>.
-SeeReportInInputOutputMode=Consultați <b>%s analiza plăților %s</b> pentru un calcul bazat pe <b>plățile înregistrate</b> efectuate chiar dacă acestea nu sunt încă contabilizate în Registru
-SeeReportInDueDebtMode=Consultați <b>%s analiza documentelor înregistrate %s</b> pentru un calcul pe baza <b>documentelor înregistrate</b> cunoscute, chiar dacă acestea nu sunt încă contabilizate în Registru
+SeeReportInInputOutputMode=Consultați <b>%s analiza plăților %s</b> pentru un calcul bazat pe <b>plățile înregistrate</b> efectuate chiar dacă acestea nu sunt încă contabilizate în Registru jurnal
+SeeReportInDueDebtMode=Consultați <b>%s analiza documentelor înregistrate %s</b> pentru un calcul pe baza <b>documentelor înregistrate</b> cunoscute, chiar dacă acestea nu sunt încă contabilizate în Registrul jurnal
 SeeReportInBookkeepingMode=Consultați <b>%sanaliza registrului contabil%s</b> pentru un raport bazat pe <b>Registrul de contabilitate</b>
 RulesAmountWithTaxIncluded=- Valorile afişate sunt cu toate taxele incluse
-RulesResultDue=- Include facturi restante, cheltuieli, TVA, donații indiferent dacă sunt plătite sau nu. Include și salariile plătite. <br>- se bazează pe data de emitere a facturilor și data scadenței pentru cheltuieli sau plăți fiscale. Pentru salariile definite cu modulul Salarii, se utilizează data plăţii. 
-RulesResultInOut=- Include plățile efective pe facturi, cheltuieli,TVA și salarii. <br> - Se ia  în calcul data plăţii facturilor, cheltuielilor, TVA-ului  și salariilor .
+RulesAmountWithTaxExcluded=- Valorile facturiloe afişate sunt fără taxe
+RulesResultDue=- Include toate facturile, cheltuielile, TVA-ul, donațiile, salariile, fie că sunt sau nu plătite.<br>- Se bazează pe data de facturare la facturi și pe data scadenței pentru cheltuieli sau plăți fiscale. Pentru salarii se folosește data de încheiere a perioadei.
+RulesResultInOut=- Include plățile reale efectuate pe facturi, cheltuieli, TVA și salarii. <br>- Se bazează pe datele de plată ale facturilor, cheltuielilor, TVA-ului, donațiilor și salariilor.
 RulesCADue=- Include facturile client scadente indiferent dacă sunt încasate sau nu. <br>- Se bazează pe data emiterii acestor facturi.<br> 
 RulesCAIn=- include toate plățile efective ale facturilor primite de la clienți. <br> - se bazează pe data de plată a acestor facturi <br>
 RulesCATotalSaleJournal=Acesta include toate liniile de credit din jurnalul de vânzare.
 RulesSalesTurnoverOfIncomeAccounts=Include (credit - debit) linii pentru conturile de produse din grupul VENITURI
-RulesAmountOnInOutBookkeepingRecord=Acesta include înregistrarea în Registrul contabil cu conturi contabile din grupa "CHELTUIELI" sau "VENITURI"
-RulesResultBookkeepingPredefined=Acesta include înregistrarea în Registrul contabil cu conturi contabile din grupa "CHELTUIELI" sau "VENITURI"
-RulesResultBookkeepingPersonalized=Se înregistrează în registrul tău contabil cu conturile <b> grupate în grupe personalizate</b>
+RulesAmountOnInOutBookkeepingRecord=Acesta include înregistrarea în Registrul jurnal cu conturi contabile din grupa "CHELTUIELI" sau "VENITURI"
+RulesResultBookkeepingPredefined=Acesta include înregistrarea în Registrul jurnal cu conturi contabile din grupa "CHELTUIELI" sau "VENITURI"
+RulesResultBookkeepingPersonalized=Se înregistrează în Registrul Jurnal cu conturile <b> grupate în grupe personalizate</b>
 SeePageForSetup=Vezi meniul <a href="%s"> %s </a> pentru configurare
 DepositsAreNotIncluded=- Facturile de plată în avans nu sunt incluse
 DepositsAreIncluded=- Sunt incluse facturile de plată în avans
@@ -245,9 +246,9 @@ ACCOUNTING_VAT_SOLD_ACCOUNT=Contul contabil implicit pentru TVA la vânzări (ut
 ACCOUNTING_VAT_BUY_ACCOUNT=Contul contabil implicit pentru TVA la achiziții (utilizat dacă nu este definit în setarea dicționarului TVA)
 ACCOUNTING_VAT_PAY_ACCOUNT=Contul contabil implicit pentru plata TVA
 ACCOUNTING_ACCOUNT_CUSTOMER=Contul contabil utilizat pentru terți clienţi
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Contul contabil dedicat definit pe fişa terțului va fi utilizat numai pentru subregistrul contabilitate . Aceasta va fi utilizat pentru registrul general și ca valoare implicită pentru subregistru contabilldacă nu este definit contul contabil dedicat clienților de la terți.
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Contul contabil dedicat definit pe fişa terțului va fi utilizat numai pentru subregistrul contabilitate . Aceasta va fi utilizat pentru Registrul jurnal și ca valoare implicită pentru jurnalul secundar contabill dacă nu este definit contul contabil dedicat clienților de la terți.
 ACCOUNTING_ACCOUNT_SUPPLIER=Contul contabil utilizat pentru terți furnizori
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Contul contabil dedicat definit pe fişa terțului va fi utilizat numai pentru subregistrul contabil. Acesta va fi utilizat pentru Registrul general și ca valoare implicită a contabilității din subregistru dacă nu este definit contul contabil de vânzare asociat la un terț.
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Contul contabil dedicat definit pe fişa terțului va fi utilizat numai pentru registrul jurnal secundar. Acesta va fi utilizat pentru Registrul Jurnal general și ca valoare implicită pentru jurnalele secundare dacă nu este definit contul contabil de vânzare asociat la un terț.
 ConfirmCloneTax=Confirmare clonare taxă socială/fiscală
 ConfirmCloneVAT=Confirmați clonarea unei declarații de TVA
 ConfirmCloneSalary=Confirmare clonare salariu
@@ -295,3 +296,5 @@ InvoiceNotLate30Days = De încasat (> 30 zile)
 InvoiceToPay=Facturi de plătit (< 15 zile)
 InvoiceToPay15Days=Facturi de plătit (15 - 30 zile)
 InvoiceToPay30Days=Facturi de plătit (> 30 zile)
+ConfirmPreselectAccount=Preselectare cont contabil
+ConfirmPreselectAccountQuestion=Sigur vrei să preselectezi liniile selectate %s cu acest cod contabil?
diff --git a/htdocs/langs/ro_RO/dict.lang b/htdocs/langs/ro_RO/dict.lang
index 4454b749764..d12da96f8eb 100644
--- a/htdocs/langs/ro_RO/dict.lang
+++ b/htdocs/langs/ro_RO/dict.lang
@@ -4,7 +4,7 @@ CountryBE=Belgia
 CountryIT=Italia
 CountryES=Spania
 CountryDE=Germania
-CountryCH=Eleveţia
+CountryCH=Elveţia
 # Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
 CountryGB=Marea Britanie
 CountryUK=Marea Britanie
@@ -18,10 +18,10 @@ CountryCA=Canada
 CountryTG=Togo
 CountryGA=Gabon
 CountryNL=Olanda
-CountryHU=Hongria
+CountryHU=Ungaria
 CountryRU=Rusia
 CountrySE=Suedia
-CountryCI=Ivoiry Coast
+CountryCI=Coasta de Ivoire
 CountrySN=Senegal
 CountryAR=Argentina
 CountryCM=Camerun
@@ -31,7 +31,7 @@ CountryMC=Monaco
 CountryAU=Australia
 CountrySG=Singapore
 CountryAF=Afghanistan
-CountryAX=Teren Insulele
+CountryAX=Insulele Åland
 CountryAL=Albania
 CountryAS=American Samoa
 CountryAD=Andora
@@ -111,9 +111,9 @@ CountryGT=Guatemala
 CountryGN=Guinea
 CountryGW=Guineea-Bissau
 CountryGY=Guiana
-CountryHT=Hati
+CountryHT=Haiti
 CountryHM=Insula Heard şi McDonald
-CountryVA=Sfântul Scaun (Cetatea Vaticanului membru)
+CountryVA=Sfântul Scaun (Cetatea Vaticanului)
 CountryHN=Honduras
 CountryHK=Hong Kong
 CountryIS=Islanda
@@ -132,7 +132,7 @@ CountryKP=Coreea de Nord
 CountryKR=Coreea de Sud
 CountryKW=Kuweit
 CountryKG=Kârgâzstan
-CountryLA=Laoţiană
+CountryLA=Laos
 CountryLV=Letonia
 CountryLB=Liban
 CountryLS=Lesotho
@@ -142,7 +142,7 @@ CountryLI=Liechtenstein
 CountryLT=Lituania
 CountryLU=Luxemburg
 CountryMO=Macao
-CountryMK=Macedoniei, cu Fosta Republică Iugoslavă a
+CountryMK=Macedonia, fosta Republică Iugoslavă
 CountryMG=Madagascar
 CountryMW=Malawi
 CountryMY=Malaysia
@@ -177,7 +177,7 @@ CountryNO=Norvegia
 CountryOM=Oman
 CountryPK=Pakistan
 CountryPW=Palau
-CountryPS=Teritoriul Palestinian, Ocupate
+CountryPS=Palestina, Teritoriile Ocupate
 CountryPA=Panama
 CountryPG=Papua Noua Guinee
 CountryPY=Paraguay
@@ -212,7 +212,7 @@ CountrySD=Sudan
 CountrySR=Surinam
 CountrySJ=Svalbard şi Jan Mayen
 CountrySZ=Swaziland
-CountrySY=Sirian
+CountrySY=Siria
 CountryTW=Taiwan
 CountryTJ=Tadjikistan
 CountryTZ=Tanzania
@@ -256,58 +256,58 @@ CivilityMTRE=Maestru
 CivilityDR=Doctor
 ##### Currencies #####
 Currencyeuros=Euro
-CurrencyAUD=Dolar AU
-CurrencySingAUD=UA dolar
-CurrencyCAD=Dolar CAN
-CurrencySingCAD=CAN dolar
+CurrencyAUD=Dolari AU
+CurrencySingAUD=Dolar UA
+CurrencyCAD=Dolari CAN
+CurrencySingCAD=Dolar CAN
 CurrencyCHF=Franci elveţieni
-CurrencySingCHF=Francul elveţian
+CurrencySingCHF=Franc elveţian
 CurrencyEUR=Euro
 CurrencySingEUR=Euro
-CurrencyFRF=Franceză Franci
-CurrencySingFRF=Franceză franc
-CurrencyGBP=GB Lire
-CurrencySingGBP=GB Pound
+CurrencyFRF=Franci Francezi
+CurrencySingFRF=Franc Francez
+CurrencyGBP=Lire GB
+CurrencySingGBP=Liră GB
 CurrencyINR=rupii indiene
 CurrencySingINR=Rupie indiană
 CurrencyMAD=Dirham
 CurrencySingMAD=Dirham
 CurrencyMGA=Ariary
 CurrencySingMGA=Ariary
-CurrencyMUR=Mauritius rupii
+CurrencyMUR=Rupii Mauritius
 CurrencySingMUR=Rupie Mauritius
-CurrencyNOK=Krones norvegiană
+CurrencyNOK=Coroane norvegiene
 CurrencySingNOK=Coroane norvegiene
 CurrencyTND=TND
 CurrencySingTND=Dinar tunisian
 CurrencyUSD=Dolar SUA
 CurrencySingUSD=Dolari SUA
-CurrencyUAH=Grivna
-CurrencySingUAH=Grivna
-CurrencyXAF=CFA BEAC Franci
-CurrencySingXAF=CFA franc BEAC
-CurrencyXOF=CFA BCEAO Franci
+CurrencyUAH=Hryvnia
+CurrencySingUAH=Hryvnia
+CurrencyXAF=CFA Franci BEAC
+CurrencySingXAF=CFA Franc BEAC
+CurrencyXOF=CFA Franci BCEAO
 CurrencySingXOF=CFA franc BCEAO
-CurrencyXPF=PCP franci
-CurrencySingXPF=PCP franc
-CurrencyCentEUR=procente
+CurrencyXPF=Franci CFP
+CurrencySingXPF=Franc CFP
+CurrencyCentEUR=cenţi
 CurrencyCentSingEUR=cent
 CurrencyCentINR=paisa
 CurrencyCentSingINR=paise
 CurrencyThousandthSingTND=mii
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
-DemandReasonTypeSRC_CAMP_MAIL=Mailing campanie
-DemandReasonTypeSRC_CAMP_EMAIL=Corespondenţei campanie
-DemandReasonTypeSRC_CAMP_PHO=Telefon de campanie
-DemandReasonTypeSRC_CAMP_FAX=Fax campanie
-DemandReasonTypeSRC_COMM=Comercială de contact
-DemandReasonTypeSRC_SHOP=Magazin de contact
+DemandReasonTypeSRC_CAMP_MAIL=Campanie poştală
+DemandReasonTypeSRC_CAMP_EMAIL=Campanie newsletter
+DemandReasonTypeSRC_CAMP_PHO=Campanie telefonică
+DemandReasonTypeSRC_CAMP_FAX=Campanie fax
+DemandReasonTypeSRC_COMM=Contact comercial
+DemandReasonTypeSRC_SHOP=Contact magazin
 DemandReasonTypeSRC_WOM=din gură în gură
 DemandReasonTypeSRC_PARTNER=Partener
 DemandReasonTypeSRC_EMPLOYEE=Angajat
 DemandReasonTypeSRC_SPONSORING=Sponsor
-DemandReasonTypeSRC_SRC_CUSTOMER=Contact de primit de la client
+DemandReasonTypeSRC_SRC_CUSTOMER=Ne-a contactat clientul
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
@@ -321,7 +321,7 @@ PaperFormatEUA6=Format A6
 PaperFormatUSLETTER=Format Letter US
 PaperFormatUSLEGAL=Format Legal US
 PaperFormatUSEXECUTIVE=Format Executive US
-PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatUSLEDGER=Format Registru/Tabloid
 PaperFormatCAP1=Format P1 Canada
 PaperFormatCAP2=Format P2 Canada
 PaperFormatCAP3=Format P3 Canada
@@ -331,7 +331,7 @@ PaperFormatCAP6=Format P6 Canada
 #### Expense report categories ####
 ExpAutoCat=Mașină
 ExpCycloCat=Moped
-ExpMotoCat=Motorbike
+ExpMotoCat=Motocicletă
 ExpAuto3CV=3 CV
 ExpAuto4CV=4 CV
 ExpAuto5CV=5 CV
@@ -343,7 +343,7 @@ ExpAuto10CV=10 CV
 ExpAuto11CV=11 CV
 ExpAuto12CV=12 CV
 ExpAuto3PCV=3 CV si mai multe
-ExpAuto4PCV=4 CV si mai multe
+ExpAuto4PCV=4 CV şi mai multe
 ExpAuto5PCV=5 CV si mai multe
 ExpAuto6PCV=6 CV si mai multe
 ExpAuto7PCV=7 CV si mai multe
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index adc0f2c551e..bb74b86bc27 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -27,7 +27,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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Eşec la obţinerea feed-ului RSS. Încercaţi să adă
 ErrorForbidden=Acces restricționat. <De> Încercați să accesați o pagină, zonă sau caracteristică a unui modul fără a fi autentificat sau pentru care utilizatorul dvs. nu are permisiunile necesare.
 ErrorForbidden2=Permisiunea pentru acest nume de autentificare poate fi definită de către administratorul sistemului din meniul %s->%s.
 ErrorForbidden3=Se pare că sistemul nu este utilizat printr-o sesiune cu autentificare. Aruncati o privire în documentaţia de instalare pentru a şti cum să gestionaţi autentificările (htaccess, mod_auth sau altele...).
+ErrorForbidden4=Atenţie: șterge cookie-urile browserului pentru a distruge sesiunile existente aferente acestei conectări.
 ErrorNoImagickReadimage=Clasa Imagick nu a fost găsită în PHP. Nu este disponibilă previzualizarea. Administratorii pot dezactiva această filă din meniul Setări - Afişare.
 ErrorRecordAlreadyExists=Înregistrarea există deja
 ErrorLabelAlreadyExists=Această etichetă există deja
@@ -150,7 +153,7 @@ ErrorWarehouseMustDiffers=Depozitul sursă și depozitul țintă trebuie să dif
 ErrorBadFormat=Format greşit!
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Eroare, acest membru nu este încă asociat unui terț. Asociază un membru la un terț existent sau crează un terț nou înainte de a crea factura de adeziune  - cotizaţie.
 ErrorThereIsSomeDeliveries=Eroare, există unele expedieri legate de această livrare. Ștergere refuzată.
-ErrorCantDeletePaymentReconciliated=Nu se poate șterge o plată care a generat o intrare bancară care a fost reconciliată
+ErrorCantDeletePaymentReconciliated=Nu se poate șterge o plată care a generat o tranzacţie bancară reconciliată
 ErrorCantDeletePaymentSharedWithPayedInvoice=Nu se poate șterge o plată conţinută de cel puțin o factură cu starea Plătită
 ErrorPriceExpression1=Nu se poate atribui la constanta '%s'
 ErrorPriceExpression2=Nu se poate redefini funcția built-in  '%s'
@@ -271,6 +274,9 @@ 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
 
 # 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ă.
@@ -312,6 +318,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..e82c24945da 100644
--- a/htdocs/langs/ro_RO/eventorganization.lang
+++ b/htdocs/langs/ro_RO/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categorie de adăugat terților creaţ
 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
@@ -71,6 +71,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 +84,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
diff --git a/htdocs/langs/ro_RO/holiday.lang b/htdocs/langs/ro_RO/holiday.lang
index f6b4f2eb31d..1720c366c9f 100644
--- a/htdocs/langs/ro_RO/holiday.lang
+++ b/htdocs/langs/ro_RO/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Descriere
 SendRequestCP=Crează o cerere de concediu
 DelayToRequestCP=Cererile pentru concediu trebuiesc făcute cu cel puţin <b>%s zi(le)</b> înainte.
 MenuConfCP=Restul concediului
-SoldeCPUser=Restul concediului este de <b>%s</b> zile.
+SoldeCPUser=Situaţie concedii (în zile) <b>%s</b>
 ErrorEndDateCP=Trebuie să selectaţi data de sfârşit mai mare decât data de început.
 ErrorSQLCreateCP=A apărut o eroare SQL în timpul creării:
 ErrorIDFicheCP=A apărut o eroare, cererea de concediu nu există.
@@ -134,3 +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/install.lang b/htdocs/langs/ro_RO/install.lang
index 88073532227..e4d18a7c931 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -21,6 +21,7 @@ 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ă.
diff --git a/htdocs/langs/ro_RO/knowledgemanagement.lang b/htdocs/langs/ro_RO/knowledgemanagement.lang
index b6f254fbeb9..08c8ea84f27 100644
--- a/htdocs/langs/ro_RO/knowledgemanagement.lang
+++ b/htdocs/langs/ro_RO/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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)
 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/main.lang b/htdocs/langs/ro_RO/main.lang
index 6afeb0eb883..f66b50ed06a 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Eroare, nici o cotă de TVA nu este defini
 ErrorNoSocialContributionForSellerCountry=Eroare, niciun tip de taxă socială/fiscală nu este definită pentru ţara '%s'.
 ErrorFailedToSaveFile=Eroare, salvarea fişierului a eşuat.
 ErrorCannotAddThisParentWarehouse=Încercați să adăugați un depozit părinte care este deja subaltern a unui depozit existent
+FieldCannotBeNegative=Câmpul  "%s" nu poate fi negativ
 MaxNbOfRecordPerPage=Numărul maxim de înregistrări pe pagină
 NotAuthorized=Nu aveţi dreptul să faceţi asta.
 SetDate=Setează data
@@ -87,7 +88,7 @@ FileWasNotUploaded=Un fișier este selectat pentru atașament, dar nu a fost în
 NbOfEntries=Numărul de intrări
 GoToWikiHelpPage=Citeşte ajutorul online (Acces la Internet necesar)
 GoToHelpPage=Citeşte Ajutorul
-DedicatedPageAvailable=Există o pagină de ajutor dedicată legată de ecranul curent
+DedicatedPageAvailable=Pagină de ajutor dedicată pentru ecranul curent
 HomePage=Acasă
 RecordSaved=Înregistrare salvată
 RecordDeleted=Înregistrare ştearsă
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Cod returnat pentru ultima eroare de acces la baza d
 InformationLastAccessInError=Info pentru ultima eroare de acces la baza de date
 DolibarrHasDetectedError=Sistemul a întâmpinat o eroare tehnică
 YouCanSetOptionDolibarrMainProdToZero=Puteți citi fișierul jurnal sau setați opțiunea $dolibarr_main_prod la "0" din fișierul config pentru a obține mai multe informații.
-InformationToHelpDiagnose=Aceste informații pot fi utile în scopuri de diagnoză (puteți seta opțiunea $dolibarr_main_prod la '1' pentru a elimina aceste notificări)
+InformationToHelpDiagnose=Aceste informații pot fi utile în scopuri de diagnosticare (poți seta opțiunea $dolibarr_main_prod la '1' pentru a ascunde informațiile sensibile)
 MoreInformation=Mai multe informaţii
 TechnicalInformation=Informații tehnice
 TechnicalID=ID tehnic
@@ -211,6 +212,8 @@ User=Utilizator
 Users=Utilizatori
 Group=Grup
 Groups=Grupuri
+UserGroup=Grup utilizator
+UserGroups=Grupuri utilizator
 NoUserGroupDefined=Niciun grup de utilizatori definit
 Password=Parola
 PasswordRetype=Repetă parola
@@ -627,7 +630,7 @@ Keyword=Cuvânt cheie
 Origin=Origine
 Legend=Legendă
 Fill=Completează
-Reset=Resetează
+Reset=Resetare
 File=Fișier
 Files=Fişiere
 NotAllowed=Nepermis
@@ -646,7 +649,7 @@ TotalQuantity=Cantitatea totală
 DateFromTo=De la %s la %s
 DateFrom=Începând cu %s
 DateUntil=Până la %s
-Check=Bifaţi
+Check=Verificare
 Uncheck=Debifați
 Internal=Intern
 External=Extern
@@ -903,10 +906,10 @@ Miscellaneous=Diverse
 Calendar=Calendar
 GroupBy=Grupare după...
 ViewFlatList=Vizualizare listă aplatizată
-ViewAccountList=Afişare registru
+ViewAccountList=Afişare registru jurnal
 ViewSubAccountList=Afişare registru analitice
 RemoveString=Eliminați șirul '%s'
-SomeTranslationAreUncomplete=Unele dintre limbile oferite pot fi traduse numai parțial sau pot conține erori. Vă rugăm să vă corectați limba prin înscrierea în <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> pentru a îmbunătăți traducerea.
+SomeTranslationAreUncomplete=Unele dintre limbile diponibile pot fi traduse doar parțial sau pot conține erori. Vă rugăm să oferiţi ajutorul pentru a corecta limba înregistrându-vă la <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external">https://transifex.com/projects/p/dolibarr/</a> pentru a adăuga îmbunătățiri.
 DirectDownloadLink=Link de descărcare public
 PublicDownloadLinkDesc=Doar linkul este necesar pentru a descărca fișierul
 DirectDownloadInternalLink=Link de descărcare privat
@@ -1158,4 +1161,6 @@ Properties=Proprietăţi
 hasBeenValidated=%s a fost validat
 ClientTZ=Time Zone client (utilizator)
 NotClosedYet=Neînchis
-ClearSignature=Şterge semnătură
+ClearSignature=Resetare semnătură
+CanceledHidden=Ascunde anulate
+CanceledShown=Afişează anulate
diff --git a/htdocs/langs/ro_RO/modulebuilder.lang b/htdocs/langs/ro_RO/modulebuilder.lang
index acbac08e1c2..e81b9a6bf84 100644
--- a/htdocs/langs/ro_RO/modulebuilder.lang
+++ b/htdocs/langs/ro_RO/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Acest instrument poate fi folosit doar de utilizatori cu experiență sau dezvoltatori de software. Oferă facilităţi pentru a vă construi sau edita propriul modul. Documentația pentru <a href="%s" target="_blank">dezvoltare software alternativă se găsește aici</a>. 
+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.
 ModuleBuilderDesc2=Calea unde sunt generate/editate modulele (primul director pentru module externe definite în %s): <strong>%s</strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Meniurile furnizate de modulul/aplicația dvs. sunt definite
 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).
-TriggerDefDesc=Definiți în fișierul declanșator codul pe care vrei să-l execuți atunci când este executat un eveniment de afaceri extern modulului (evenimente înregistrate de alte module).
+TriggerDefDesc=Defineşte în fișierul trigger codul pe care vrei să-l execuți atunci când este executat un eveniment de afaceri extern modulului tău(evenimente declanșate de alte module).
 SeeIDsInUse=Vezi ID-urile utilizate în instalarea ta.
 SeeReservedIDsRangeHere=Vezi gama de ID-uri rezervate
 ToolkitForDevelopers=Toolkit pentru dezvoltatorii de sistem Dolibarr
diff --git a/htdocs/langs/ro_RO/mrp.lang b/htdocs/langs/ro_RO/mrp.lang
index e083bd6f664..b6473445811 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
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index ce0240b8315..9291e47bab1 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Codarea parolei
 PermissionsAdd=Au fost adăugate permisiuni
 PermissionsDelete=Permisiunile au fost eliminate
 YourPasswordMustHaveAtLeastXChars=Parola ta trebuie să aibă cel puțin <strong>%s</strong> caractere
+PasswordNeedAtLeastXUpperCaseChars=Parola trebuie să conţină cel puțin <strong>%s</strong> caractere majuscule
+PasswordNeedAtLeastXDigitChars=Parola trebuie să conţină cel puțin <strong>%s</strong> caractere numerice
+PasswordNeedAtLeastXSpecialChars=Parola trebuie să conţină cel puțin <strong>%s</strong> caractere speciale
+PasswordNeedNoXConsecutiveChars=Parola nu trebuie să aibă <strong>%s</strong> caractere similare consecutive
 YourPasswordHasBeenReset=Parola ta a fost resetată cu succes
 ApplicantIpAddress=Adresa IP a solicitantului
 SMSSentTo=SMS trimis la %s
@@ -268,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
diff --git a/htdocs/langs/ro_RO/partnership.lang b/htdocs/langs/ro_RO/partnership.lang
index 96c93ef6223..9764c43c426 100644
--- a/htdocs/langs/ro_RO/partnership.lang
+++ b/htdocs/langs/ro_RO/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Parteneriate
 PartnershipDescription=Modul Management parteneriate
 PartnershipDescriptionLong= Modul Management parteneriate
-
+Partnership=Parteneriat
 AddPartnership=Adăugare parteneriat
 CancelPartnershipForExpiredMembers=Parteneriat: Anulează parteneriatul membrilor cu adeziuni expirate
 PartnershipCheckBacklink=Parteneriat: Verificare backlink de referinţă
diff --git a/htdocs/langs/ro_RO/productbatch.lang b/htdocs/langs/ro_RO/productbatch.lang
index 6f33e560584..07b3b358a4b 100644
--- a/htdocs/langs/ro_RO/productbatch.lang
+++ b/htdocs/langs/ro_RO/productbatch.lang
@@ -30,7 +30,7 @@ ManageLotMask=Mască personalizată
 CustomMasks=Opţiunea de definire a unei măşti de numerotare diferite pentru fiecare produs
 BatchLotNumberingModules=Regulă de numerotare pentru generarea automată a numărului de lot
 BatchSerialNumberingModules=Regula de numerotare pentru generarea automată a numărului de serie (pentru produsele cu proprietatea 1 lot/serie unică pentru fiecare produs)
-QtyToAddAfterBarcodeScan=Cantitate de adăugat pentru fiecare cod de bare/lot/serie scanată
+QtyToAddAfterBarcodeScan=Cantitate de %s pentru fiecare cod de bare/lot/serie scanat
 LifeTime=Durata de viață (în zile)
 EndOfLife=Sfârşitul duratei de viaţă
 ManufacturingDate=Data de producţie
@@ -42,3 +42,4 @@ HideLots=Ascunde loturile
 #Traceability - qc status
 OutOfOrder=Indisponibil
 InWorkingOrder=În stare de funcționare
+ToReplace=De înlocuit
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 0b99f8e4955..e4f41e550e8 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Valoarea de utilizat pentru actualizarea prețului mediu p
 PMPValue=PMP
 PMPValueShort=PMP
 mandatoryperiod=Perioade obligatorii
-mandatoryPeriodNeedTobeSet=Perioadele de atenție neintroduse dar obligatorii
+mandatoryPeriodNeedTobeSet=Atenţie: Perioada (data de început si data de sfârşit) trebuie definită
 mandatoryPeriodNeedTobeSetMsgValidate=Un serviciu necesită o perioadă de început și una de sfârșit
-mandatoryHelper=Mesaj către utilizator cu privire la necesitatea introducerii unei date de începere și a unei date de încheiere pentru un serviciu la crearea/validarea unei facturi, a unei oferte comerciale, a unei comenzi de vânzare. <br>Această acțiune nu blochează procesul de confirmare
+mandatoryHelper=Bifează dacă doreşti un mesaj către utilizator la crearea/validarea unei facturi, oferte comerciale, comenzi de vânzare fără a introduce o dată de începere și de sfârșit pe liniile cu acest serviciu. <br>Reține că mesajul este un avertisment și nu o eroare blocantă.
 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
+SwitchOnSaleStatus=Comutare status vânzare
+SwitchOnPurchaseStatus=Comutare status achiziţie
+StockMouvementExtraFields= Câmpuri suplimentare (mişcare de stoc)
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index cf516eb7ea0..57416e1d619 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -135,7 +135,7 @@ ConfirmDeleteATimeSpent=Sigur doriți să ștergeți acest timp consumat?
 DoNotShowMyTasksOnly=Afişează, de asemenea, şi task-urile ce nu-mi sunt atribuite
 ShowMyTasksOnly=Afişează numai task-urile atribuite mie
 TaskRessourceLinks=Contacte task
-ProjectsDedicatedToThisThirdParty=Proiecte dedicate acestui terţ
+ProjectsDedicatedToThisThirdParty=Proiecte alocate acestui terţ
 NoTasks=Niciun task pe acest proiect
 LinkedToAnotherCompany=Asociat la un alt terţ
 TaskIsNotAssignedToUser=Task nealocat utilizatorului. Foloseşte butonul '<strong>%s</strong>' pentru a atribui task-ul acum.
@@ -197,6 +197,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,3 +285,5 @@ 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
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/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 555445e2119..68b904b148d 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Limita de stoc pentru alertă și stocul optim dori
 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
 InventoryDate=Data inventarului
+Inventories=Inventare
 NewInventory=Inventar nou
 inventorySetup = Configurare Inventar
 inventoryCreatePermission=Crează un inventar nou
@@ -207,7 +208,7 @@ inventoryChangePMPPermission=Permite modificare valoare PMP pentru un produs
 ColumnNewPMP=PMP nou
 OnlyProdsInStock=Nu adăugați produsul fără stoc
 TheoricalQty=Cantitate teoretică
-TheoricalValue=Cantitate teoretică
+TheoricalValue=Valoare teoretică
 LastPA=Ultimul PA
 CurrentPA=PA curent
 RecordedQty=Cantitate înregistrată
@@ -240,7 +241,7 @@ StockAtDatePastDesc=Poți vedea aici stocul (stoc real) la o dată prestabilită
 StockAtDateFutureDesc=Poţi vizualiza aici stocul (stocul virtual) la o dată specificată în viitor
 CurrentStock=Stoc curent
 InventoryRealQtyHelp=Setați valoarea la 0 pentru a reseta câmpul cantitate<br> Lăsaţi necompletat, sau eliminaţi linia, pentru a păstra neschimbat 
-UpdateByScaning=Completează catitatea reală prin scanare
+UpdateByScaning=Completare cantitate reală prin scanare
 UpdateByScaningProductBarcode=Actualizare prin scanare (cod de bare produs)
 UpdateByScaningLot=Actualizare prin scanare (cod de bare lot|serie)
 DisableStockChangeOfSubProduct= Dezactivare modificare de stoc pentru toate subprodusele acestui kit în timpul acestei mișcări.
@@ -253,14 +254,20 @@ 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=Completează cantitatea reală cu cantitatea așteptată
+AutofillWithExpected=Înlocuieşte cantitatea reală cu cea estimată
 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
-FieldCannotBeNegative=Câmpul  "%s" nu poate fi negativ
 ErrorWrongBarcodemode=Mod cod de bare necunoscut
 ProductDoesNotExist=Produsul nu există
-ErrorSameBatchNumber=Acelaşi număr de lot a fost găsit în lista de inventar
+ErrorSameBatchNumber=Mai multe înregistrări pentru numărul de lot au fost găsite în fişa de inventariere. Nu se poate identifica cea care trebuie majorată.
 ProductBatchDoesNotExist=Produsul cu lotul/seria nu există
 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.
+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
diff --git a/htdocs/langs/ro_RO/stripe.lang b/htdocs/langs/ro_RO/stripe.lang
index 290f8809f09..119473bef83 100644
--- a/htdocs/langs/ro_RO/stripe.lang
+++ b/htdocs/langs/ro_RO/stripe.lang
@@ -1,64 +1,63 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Modul de configurare a Stripe
-StripeDesc=Oferiți clienților o pagină de plată on-line Stripe pentru plățile cu carduri de credit / de debit prin intermediul <a href="http://www.stripe.com" target="_blank"> Stripe </a>. Aceasta poate fi utilizată pentru a permite clienților dvs. să efectueze plăți ad-hoc sau pentru plăți legate de un anumit obiect Dolibarr (factură, comandă, ...)
+StripeSetup=Configurare modul Stripe
+StripeDesc=Oferiți clienților o pagină de plată online pentru plăți cu carduri de credit/debit via <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external">Stripe</a>. Aceasta poate fi folosită pentru a permite clienților să efectueze plăți ad-hoc sau pentru plăți legate de un anumit obiect din sistem (factură, comandă, ...) 
 StripeOrCBDoPayment=Plătiți cu cardul de credit sau Stripe
-FollowingUrlAreAvailableToMakePayments=Ca urmare a URL-uri sunt disponibile pentru a oferi o pagină de la un client pentru a face o plată pe Dolibarr obiecte
-PaymentForm=Formă de plată
+FollowingUrlAreAvailableToMakePayments=Următoarele URL-uri sunt disponibile pentru a oferi clientului pagini unde poate efectua o plată pentru obiecte din sistem
+PaymentForm=Formular de plată
 WelcomeOnPaymentPage=Bine ați venit la serviciul nostru de plată online
-ThisScreenAllowsYouToPay=Acest ecran vă permite de a face o plată online pentru %s.
-ThisIsInformationOnPayment=Acest lucru este de informatii cu privire la plata de a face
-ToComplete=Pentru a completa
-YourEMail=E-mail de confirmare de plată
+ThisScreenAllowsYouToPay=Acest ecran vă permite şă efectuaţi o plată online pentru %s.
+ThisIsInformationOnPayment=Acestea sunt detaliile referitoare la plata care trebuie efectuată
+ToComplete=De completat
+YourEMail=Email de confirmare de plată
 STRIPE_PAYONLINE_SENDEMAIL=Email de notificare după o încercare de plată (succes sau eșec)
 Creditor=Creditor
-PaymentCode=Cod Plata
+PaymentCode=Cod plată
 StripeDoPayment=Plăteşte cu Stripe
-YouWillBeRedirectedOnStripe=Veți fi redirecționat pe pagina Stripe securizată pentru a vă introduce informațiile despre cardul de credit
+YouWillBeRedirectedOnStripe=Veți fi redirecționat pe pagina Stripe securizată pentru a vă introduce informațiile referitoare  la cardul de credit
 Continue=Următor
 ToOfferALinkForOnlinePayment=URL-ul pentru plata %s
-ToOfferALinkForOnlinePaymentOnOrder=URL oferit pentru %s plată online pentru o comandă de vânzare
+ToOfferALinkForOnlinePaymentOnOrder=URL oferit pentru %s pagina online pentru plata unei comenzi de vânzare
 ToOfferALinkForOnlinePaymentOnInvoice= URL oferit pentru %s plată online pentru factură client
 ToOfferALinkForOnlinePaymentOnContractLine= URL oferit pentru %s plată online pentru o linie de contract
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL oferit pentru %s plată online pentru orice sumă fără un produs/serviciu existent
 ToOfferALinkForOnlinePaymentOnMemberSubscription= URL oferit pentru %s plată online pentru o cotizaţie de membru
 ToOfferALinkForOnlinePaymentOnDonation= URL oferit pentru %s plată online pentru o achitare sau donaţie
-YouCanAddTagOnUrl=Puteți adăuga, de asemenea, parametrul url <b>& tag<i> = valoare</i></b> la oricare dintre respectivele URL (obligatoriu numai pentru plata care nu este legată de un obiect) pentru a adăuga motivul efectuării.<br> Pentru adresa URL a plăților fără obiect existent, puteți adăuga și parametrul <strong>& noidempotency = 1</strong> pentru ca aceeași legătură cu aceeași etichetă să poată fi folosită de mai multe ori (anumite moduri de plată pot plafona plata la 1 pentru fiecare link diferit fără acest parametru) 
-SetupStripeToHavePaymentCreatedAutomatically=Configurați-vă Stripe cu URL <b> %s </b> pentru a avea o plată creată automat când este validată de Stripe.
-AccountParameter=Parametri Cont
-UsageParameter=Utilizarea parametrilor
-InformationToFindParameters=Ajutor pentru a găsi informaţiile dvs. de cont %s
+YouCanAddTagOnUrl=Puteți adăuga, de asemenea, parametrul url <b>&tag<i> = valoare</i></b> la oricare dintre respectivele URL (obligatoriu numai pentru plata care nu este legată de un obiect) pentru a adăuga motivul efectuării.<br> Pentru adresa URL a plăților fără obiect existent, puteți adăuga și parametrul <strong>&noidempotency= 1</strong> pentru ca aceeași legătură cu aceeași etichetă să poată fi folosită de mai multe ori (anumite moduri de plată pot plafona plata la 1 pentru fiecare link diferit fără acest parametru) 
+SetupStripeToHavePaymentCreatedAutomatically=Configurare Stripe cu URL <b> %s </b> pentru a avea o plată creată automat când este validată de Stripe.
+AccountParameter=Parametri cont
+UsageParameter=Parametri de utilizare
+InformationToFindParameters=Ajutor pentru a găsi informaţii despre contul tău  %s
 STRIPE_CGI_URL_V2=Adresa URL a modulului CGI Stripe pentru plată
-VendorName=Numele vânzătorului
-CSSUrlForPaymentForm=CSS foaie de URL-ul de stil pentru forma de plată
-NewStripePaymentReceived=Plata noua Stripe incasata
-NewStripePaymentFailed=Plata noua Stripe incercata dar esuata
+CSSUrlForPaymentForm=URL fişier de stil CSS pentru formularul de plată
+NewStripePaymentReceived=Plată nouă Stripe încasată
+NewStripePaymentFailed=Plata nouă Stripe încercată dar eşuată
 FailedToChargeCard=Nu s-a putut încasa de pe card
-STRIPE_TEST_SECRET_KEY=Cheie de testare secreta
-STRIPE_TEST_PUBLISHABLE_KEY=Cheia de test publicabilă
-STRIPE_TEST_WEBHOOK_KEY=Cheia de test Webhook
-STRIPE_LIVE_SECRET_KEY=Cheie secreta de actiune
-STRIPE_LIVE_PUBLISHABLE_KEY=Cheie in direct publicabilă
-STRIPE_LIVE_WEBHOOK_KEY=Cheie in direct Webhook
-ONLINE_PAYMENT_WAREHOUSE=Stoc de utilizat pentru scăderea stocului atunci când se efectuează plata online <br> (TODO Când opțiunea de a reduce stocul se face printr-o acțiune pe factură, iar plata online generează factura?)
-StripeLiveEnabled=Stripe live activat (altfel test / modul sandbox)
-StripeImportPayment=Plățile pentru importul Stripe
+STRIPE_TEST_SECRET_KEY=Cheie de test secretă
+STRIPE_TEST_PUBLISHABLE_KEY=Cheie de test publicabilă
+STRIPE_TEST_WEBHOOK_KEY=Cheie de test Webhook
+STRIPE_LIVE_SECRET_KEY=Cheie live secretă
+STRIPE_LIVE_PUBLISHABLE_KEY=Cheie live publicabilă
+STRIPE_LIVE_WEBHOOK_KEY=Cheie live Webhook
+ONLINE_PAYMENT_WAREHOUSE=Stoc de utilizat pentru scădere atunci când se efectuează plata online <br> (TODO Când opțiunea de a reduce stocul se face printr-o acțiune pe factură, iar plata online generează factura?)
+StripeLiveEnabled=Stripe live activat (altfel test/modul sandbox)
+StripeImportPayment=Import plată Stripe
 ExampleOfTestCreditCard=Exemplu de card de credit pentru test: %s=> valid,%s => eroare CVC, %s=> expirat, %s=> retragere eşuată
-StripeGateways=Iesiri Stripe
+StripeGateways=Gateway-uri Stripe
 OAUTH_STRIPE_TEST_ID=ID-ul de conectare Stripe a clientului (ca _...)
 OAUTH_STRIPE_LIVE_ID=ID-ul de conectare Stripe a clientului (ca _...)
-BankAccountForBankTransfer=Contul bancar pentru plata fondurilor
+BankAccountForBankTransfer=Cont bancar pentru transfer
 StripeAccount=Contul Stripe
 StripeChargeList=Listă de comisioane Stripe
-StripeTransactionList=Lista tranzacțiilor Stripe
+StripeTransactionList=Listă de tranzacții Stripe
 StripeCustomerId=ID client Stripe
 StripePaymentModes=Moduri de plată Stripe
 LocalID=ID local
 StripeID=ID Stripe
-NameOnCard=Numele de pe card
-CardNumber=Număr de card
-ExpiryDate=Data expirarii
+NameOnCard=Numele deţinătorului de pe card
+CardNumber=Număr card
+ExpiryDate=Data expirării
 CVN=CVN
-DeleteACard=Ștergeți cardul
+DeleteACard=Șterge cardul
 ConfirmDeleteCard=Sigur doriți să ștergeți acest card de credit sau de debit?
 CreateCustomerOnStripe=Creați un client pe Stripe
 CreateCardOnStripe=Creați un card pe Stripe
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index 1700ceff151..68137b5531e 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Ordin de transfer de credit
 LatestBankTransferReceipts=Ultimile %s ordine de transfer de credit
 LastWithdrawalReceipts=Ultimele%s fișiere de debit direct
 WithdrawalsLine=Linie ordin de direct debit
+CreditTransfer=Transfer credit
 CreditTransferLine=Linie transfer de credit
 WithdrawalsLines=Linii de ordine de debitare directă
 CreditTransferLines=Linii transfer de credit
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Cod bancar terț
 NoInvoiceCouldBeWithdrawed=Nici o factură nu a fost debitată cu succes. Verificați dacă facturile sunt pe companiile cu un IBAN valabil și că IBAN are un UMR (referință unică de mandat) cu modul <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=Această chitanță de retragere este deja marcată ca fiind creditată; acest lucru nu se poate face de două ori, deoarece acest lucru ar putea crea plăți și înregistrări bancare duplicate.
 ClassCredited=Clasifică creditat
+ClassDebited=Clasifică debitat
 ClassCreditedConfirm=Sunteţi sigur că doriţi sa clasificaţi această retragere ca creditată în contul tău bancar?
 TransData=Data transmiterii
 TransMetod=Metodă de transmitere
@@ -80,7 +82,7 @@ StatusMotif7=Hotărâre judecătorească
 StatusMotif8=Alte motive
 CreateForSepaFRST=Creare fișier de debit direct (SEPA FRST)
 CreateForSepaRCUR=Creare fișier de debit direct (SEPA RCUR)
-CreateAll=Creare fișier de debit direct (toate)
+CreateAll=Creare fișier debit direct
 CreateFileForPaymentByBankTransfer=Creare fișier pentru transfer de credit
 CreateSepaFileForPaymentByBankTransfer=Creare fișier de transfer de credit (SEPA)
 CreateGuichet=Doar la caserie
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Nu se poate crea o solicitare de debit direct pent
 SepaMandate=Mandat SEPA Direct Debit
 SepaMandateShort=Mandat SEPA
 PleaseReturnMandate=Vă rugăm să returnați acest formular de mandat prin email la %s sau prin poștă la
-SEPALegalText=Prin semnarea acestui formular de mandat, autorizați pe (A) %s să trimită instrucțiuni băncii tale pentru a debita contul tău și (B) banca ta să îţi debiteze contul în conformitate cu instrucțiunile primite de la %s. Ca parte, ai dreptul la o rambursare de la bancă în termenii și condițiile acordului tău cu banca. O rambursare trebuie solicitată în termen de 8 săptămâni, începând cu data la care a fost debitat contul tău. Drepturile tale cu privire la mandatul de mai sus sunt explicate într-o declarație pe care o poţi obține de la bancă.
+SEPALegalText=Prin semnarea acestui formular de mandat, autorizezi (A) %s să trimită instrucțiuni băncii tale pentru a-ţi debita contul și (B) banca ta să-ţi debiteze contul în conformitate cu instrucțiunile primite de la %s. Ca parte a drepturilor tale, ai dreptul la o rambursare din partea băncii, în conformitate cu termenii și condițiile acordului tău cu banca. Drepturile tale cu privire la mandatul de mai sus sunt explicate într-o declarație pe care o poți obține de la bancă.
 CreditorIdentifier=Identificator creditor
 CreditorName=Numele creditorului
 SEPAFillForm=(B) Completați toate câmpurile marcate cu *
@@ -150,3 +152,5 @@ ModeWarning=Opţiunea pentru modul real, nu a fost setată, ne oprim după aceas
 ErrorCompanyHasDuplicateDefaultBAN=Compania cu id %s are mai multe conturi bancare implicite. Nu se poate determina cel care se doreşte a fi utilizat.
 ErrorICSmissing=ICS lipsă în contul bancar %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Suma totală a ordinului de debitare directă diferă de suma liniilor
+WarningSomeDirectDebitOrdersAlreadyExists=Atenţie: Sunt deja ordine de debit direct în așteptare (%s) solicitate pentru suma de %s
+WarningSomeCreditTransferAlreadyExists=Atenţie: Sunt deja transferuri de credit în așteptare (%s) solicitate pentru suma de %s
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 065ec01cdfe..a23e3c64515 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=Страны, не входящие в ЕЭС
 CountriesInEECExceptMe=Страны ЕЭС, кроме %s
 CountriesExceptMe=Все страны кроме %s
 AccountantFiles=Экспорт исходных документов
-ExportAccountingSourceDocHelp=С помощью этого инструмента вы можете экспортировать исходные события (список в CSV и PDF), которые использовались для создания вашей бухгалтерской отчетности.
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
 ExportAccountingSourceDocHelp2=Чтобы экспортировать журналы, используйте пункт меню %s - %s.
 VueByAccountAccounting=Просмотр по учетной записи
 VueBySubAccountAccounting=Просмотр по субсчету бухгалтерского учета
@@ -286,7 +286,7 @@ ValidateMovements=Подтвердить движения
 DescValidateMovements=Любое изменение или удаление надписей, надписей и удалений будет запрещено. Все записи для упражнения должны быть подтверждены, иначе закрытие будет невозможно.
 
 ValidateHistory=Связывать автоматически
-AutomaticBindingDone=Автоматическая привязка выполнена
+AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Ошибка, вы не можете удалить эту учетную запись, потому что она используется
 MvtNotCorrectlyBalanced=Движение неправильно сбалансировано. Дебет = %s | Кредит = %s
@@ -387,7 +387,8 @@ SaleExport=Продажа на экспорт
 SaleEEC=Продажа в ЕЭС
 SaleEECWithVAT=Продажа в ЕЭС с ненулевым НДС, поэтому мы предполагаем, что это НЕ внутриобщинная продажа, а предлагаемая учетная запись является стандартной учетной записью продукта.
 SaleEECWithoutVATNumber=Продажа в ЕЭС без НДС, но идентификатор плательщика НДС третьей стороны не определен. Мы возвращаемся к учетной записи продукта для стандартных продаж. При необходимости вы можете исправить идентификатор плательщика НДС третьей стороны или учетную запись продукта.
-
+ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
+ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
 Range=Диапазон учетной записи
 Calculated=Рассчитано
@@ -404,6 +405,7 @@ NoJournalDefined=Журнал не определен
 Binded=Линии связаны
 ToBind=Линии для привязки
 UseMenuToSetBindindManualy=Строки еще не связаны, используйте меню <a href="%s">%s</a>, чтобы выполнить привязку вручную
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
 
 ## Import
 ImportAccountingEntries=Бухгалтерские записи
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index eb32f0eef68..af785620da5 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Фонд
 Version=Версия
 Publisher=Издатель
@@ -265,8 +267,8 @@ OtherResources=Другие источники
 ExternalResources=Внешние Ресурсы
 SocialNetworks=Социальные сети
 SocialNetworkId=ID социальной сети
-ForDocumentationSeeWiki=Для получения документации пользователя или разработчика (документация, часто задаваемые вопросы...),<br>посетите Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Для любых других вопросов/помощи, вы можете использовать форум Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
+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=Вот некоторые ресурсы для получения помощи и поддержки с Dolibarr.
 HelpCenterDesc2=Некоторые из этих ресурсов доступны только на <b>английском языке</b> .
 CurrentMenuHandler=Обработчик текущего меню
@@ -341,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 (например: custom).<br>
@@ -353,6 +355,7 @@ LastStableVersion=Последняя стабильная версия
 LastActivationDate=Последняя дата активации
 LastActivationAuthor=Последний активированный автор
 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> год более 2, 4 или 1 числа.<br>
@@ -753,7 +756,7 @@ Permission106=Экспортировать отправки
 Permission109=Удалить отправки
 Permission111=Читать финансовую отчетность
 Permission112=Создать/изменить/удалить и сравнить сделки
-Permission113=Настройка финансовых счетов (создание, изменение категорий)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Сверить транзакции
 Permission115=Экспорт операций и выписок со счета
 Permission116=Перераспределение средств между счетами
@@ -762,6 +765,7 @@ Permission121=Просмотр контрагентов, связанных с 
 Permission122=Создать/изменить контрагентов, связанных с пользователем
 Permission125=Удалить контрагентов, связанных с пользователем
 Permission126=Экспорт контрагентов
+Permission130=Создание/изменение платежной информации третьих лиц 
 Permission141=Просмотреть все проекты и задачи (в том числе частные проекты, в которыми я не контактное лицо)
 Permission142=Создать/изменить все проекты и задачи (также частные проекты, для которых я не контактное лицо)
 Permission144=Удалить все проекты и задачи (так же частные проекты в которых я не контактное лицо)
@@ -889,12 +893,11 @@ Permission701=Просмотр пожертвований
 Permission702=Создание/изменение пожертвований
 Permission703=Удаление пожертвований
 Permission771=Прочитайте отчеты о расходах (ваши и ваши подчиненные)
-Permission772=Создание/изменение отчётов о затратах
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Удаление отчётов о затратах
-Permission774=Просмотр всех отчётов о затратах (даже для неподчинённых пользователей)
 Permission775=Утвердить отчёты о расходах
 Permission776=Оплата отчётов о затратах
-Permission777=Читайте отчеты о расходах всех
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Создавать/изменять отчеты о расходах для всех
 Permission779=Экспорт отчётов о затратах
 Permission1001=Просмотр запасов
@@ -958,15 +961,11 @@ Permission2801=Использовать FTP  клиент в режиме тол
 Permission2802=Использовать FTP клиент в режиме записи (удаление или выгрузка файлов)
 Permission3200=Просмотреть архивированные события
 Permission3301=Создавать новые модули
-Permission4001=Смотреть сотрудников
-Permission4002=Создать сотрудников
-Permission4003=Удалить сотрудников
-Permission4004=Экспорт сотрудников
-Permission4010=Прочитать навык / работу / должность
-Permission4011=Создать / изменить навык / работу / должность
-Permission4012=Удалить навык / работу / должность
-Permission4020=Прочитать оценку
-Permission4021=Создать / изменить оценку
+Permission4001=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Читать оценки
+Permission4021=Create/modify your evaluation
 Permission4022=Подтвердить оценку
 Permission4023=Удалить оценку
 Permission4030=См. Меню сравнения
@@ -977,9 +976,9 @@ Permission10005=Удалить контент сайта
 Permission20001=Просмотр запросов на отпуск (ваш отпуск и ваших подчиненных)
 Permission20002=Создайте/измените ваши запросы на отпуск (ваш отпуск и отпуск ваших подчиненных)
 Permission20003=Удалить заявления на отпуск
-Permission20004=Читайте все запросы на отпуск (даже пользователь не подчиняется)
-Permission20005=Создавать/изменять запросы на отпуск для всех (даже для пользователей, не подчиненных)
-Permission20006=Запросы на отпуск для партнеров (настройка и обновление баланса)
+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=Утвердить запросы на отпуск
 Permission23001=Просмотр Запланированных задач
 Permission23002=Создать/обновить Запланированную задачу
@@ -1358,9 +1357,9 @@ BrowserIsOK=Вы используете веб-браузер %s. Этот бр
 BrowserIsKO=Вы используете веб-браузер %s. Этот браузер, как известно, является плохим выбором по безопасности, производительности и надежности. Мы рекомендуем использовать Firefox, Chrome, Opera или Safari.
 PHPModuleLoaded=Компонент PHP %s загружен
 PreloadOPCode=Используется предварительно загруженный OPCode
-AddRefInList=Показать номер клиента/поставщика. информационный список (выберите список или поле со списком) и большую часть гиперссылок. <br> Третьи стороны будут отображаться с форматом имени "CC12345 - SC45678 - Корпорация Большая компания" вместо "Корпорация Большая Компания".
-AddVatInList=Отображение номера плательщика НДС клиента/поставщика. информационный список (выберите список или поле со списком).
-AddAdressInList=Отображение списка адресов покупателя/поставщика (список выбора или поле со списком)<br>Третьи стороны будут отображаться с форматом имени «Корпорация Большая компания - 21 прыгать по улице 123456 Большой город - USA» вместо «Корпорация Большая компания».
+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=Отображение Контактный адрес электронной почты (или телефоны, если они не определены) и список информации о городе (выберите список или поле со списком)<br>Контакты появятся с форматом имени «Дюпон Дюран - dupond.durand@email.com - Париж» или «Дюпон Дюран - 06 07». 59 65 66 - Париж» вместо «Дюпон Дюран».
 AskForPreferredShippingMethod=Запросить предпочтительный способ доставки для контрагентов.
 FieldEdition=Редакция поля %s
@@ -1708,8 +1707,9 @@ MailingDelay=Время ожидания в секундах перед отпр
 NotificationSetup=Настройка модуля Уведомления по электронной почте
 NotificationEMailFrom=Электронная почта отправителя (От кого) для писем, отправленных модулем Уведомлений
 FixedEmailTarget=Получатель
-NotificationDisableConfirmMessageFix=Отключить информацию об уведомлении в подтверждающем сообщении для уведомления об исправлении
-NotificationDisableConfirmMessageUser=Отключить информацию об уведомлении в подтверждающем сообщении для уведомления пользователя
+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=Настройка модуля доставки
 SendingsReceiptModel=Модель отправки квитанции
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Бесплатная доставка по те
 ##### FCKeditor #####
 AdvancedEditor=Расширенный редактор
 ActivateFCKeditor=Включить FCKeditor для:
-FCKeditorForNotePublic=WYSIWIG создание/редактирование поля публичных заметок элементов
-FCKeditorForNotePrivate=WYSIWIG создание/редактирование поля приватных заметок элементов
+FCKeditorForNotePublic=WYSIWIG создание/изменение поля "публичные заметки" элементов
+FCKeditorForNotePrivate=WYSIWIG создание/изменение поля "личные заметки" элементов
 FCKeditorForCompany=WYSIWIG создание/редактирование поля описания элементов (кроме продуктов/услуг)
 FCKeditorForProduct=WYSIWIG создание/редактирование поля описания продуктов/услуг
 FCKeditorForProductDetails=WYSIWIG создание/редактирование строк сведений о продуктах для всех сущностей (предложения, заказы, счета-фактуры и т.д.). <span class="warning">Предупреждение. Использование этого параметра в данном случае серьезно не рекомендуется, поскольку оно может создать проблемы со специальными символами и форматированием страниц при создании файлов PDF.</span>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Настройка модуля Отчеты о рас
 ExpenseReportNumberingModules=Модуль нумерации отчетов о расходах
 NoModueToManageStockIncrease=Был активирован модуль, способный управлять автоматическим увеличением запасов. Увеличение запасов будет производиться только вручную.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Вы можете найти опции для уведомлений по электронной почте, включив и настроив модуль «Уведомления».
+TemplatesForNotifications=Templates for notifications
 ListOfNotificationsPerUser=Список автоматических уведомлений для каждого пользователя *
 ListOfNotificationsPerUserOrContact=Список возможных автоматических уведомлений (о бизнес-мероприятии), доступных для каждого пользователя * или контакта **
 ListOfFixedNotifications=Список автоматических фиксированных уведомлений
@@ -1916,6 +1917,8 @@ ConfFileMustContainCustom=Для установки или создания вн
 HighlightLinesOnMouseHover=Выделите строки таблицы при перемещении мыши
 HighlightLinesColor=Цвет выделения строки при наведении курсора мыши (используйте 'ffffff', чтобы не выделять)
 HighlightLinesChecked=Выделите цвет строки, когда она отмечена (используйте 'ffffff', чтобы не выделять)
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=Цвет текста заголовка страницы
 LinkColor=Цвет ссылок
 PressF5AfterChangingThis=Нажмите CTRL + F5 на клавиатуре или очистите кеш браузера после изменения этого значения, чтобы оно было эффективным
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Вы хотите запустить коллекц
 NoNewEmailToProcess=Нет новых писем (соответствующие фильтры) для обработки
 NothingProcessed=Ничего не было выполнено
 XEmailsDoneYActionsDone=Письма %s квалифицированы, электронные письма %s успешно обработаны (для записи %s / выполненных действий)
-RecordEvent=Записать событие электронной почты
-CreateLeadAndThirdParty=Создайте лида (и стороннюю организацию, если необходимо)
-CreateTicketAndThirdParty=Создать тикет (и ссылку на третье лицо, если он был загружен предыдущей операцией)
+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=Количество писем в исходном каталоге
 LoadThirdPartyFromName=Загрузить сторонний поиск на %s (только загрузка)
 LoadThirdPartyFromNameOrCreate=Загрузите сторонний поиск на %s (создайте, если не найден)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Сообщение из беседы, инициированной первым письмом, отправленным от Dolibarr
 WithoutDolTrackingID=Сообщение из беседы, инициированной первым электронным письмом, НЕ отправленным от Dolibarr
 WithDolTrackingIDInMsgId=Сообщение отправлено из Dolibarr
@@ -2078,7 +2082,7 @@ CreateCandidature=Создать заявление о приеме на раб
 FormatZip=Индекс
 MainMenuCode=Код входа в меню (главное меню)
 ECMAutoTree=Показать автоматическое дерево ECM
-OperationParamDesc=Определите значения, которые будут использоваться для объекта действия, или способы извлечения значений. Например:<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:Название моей компании\\s([^\\s]*)<br><br>Использовать ; char в качестве разделителя для извлечения или установки нескольких свойств.
+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=Конфигурация  модуля Ресурсов
@@ -2124,7 +2128,7 @@ LargerThan=Больше, чем
 IfTrackingIDFoundEventWillBeLinked=Обратите внимание, что если идентификатор отслеживания объекта найден в электронном письме или если электронное письмо является ответом на электронную почту, которую собирают и связывают с объектом, созданное событие будет автоматически связано с известным связанным объектом.
 WithGMailYouCanCreateADedicatedPassword=В учетной записи GMail, если вы включили двухэтапную проверку, рекомендуется создать специальный второй пароль для приложения вместо использования пароля своей учетной записи с https://myaccount.google.com/.
 EmailCollectorTargetDir=Может оказаться желательным переместить электронное письмо в другой тег / каталог, когда оно было успешно обработано. Просто укажите здесь имя каталога, чтобы использовать эту функцию (НЕ используйте в имени специальные символы). Обратите внимание, что вы также должны использовать учетную запись для входа в систему для чтения / записи.
-EmailCollectorLoadThirdPartyHelp=Вы можете использовать это действие, чтобы использовать содержимое электронной почты для поиска и загрузки существующей третьей стороны в вашу базу данных. Найденное (или созданное) третье лицо будет использовано для следующих действий, которые в нем нуждаются. <br> Например, если вы хотите создать третью сторону с именем, извлеченным из строки «Имя: имя для поиска», найденной в теле, используйте электронную почту отправителя в качестве электронной почты, вы можете установить поле параметра следующим образом: <br> 'email = HEADER: ^ От: (. *); Name = EXTRACT: BODY: Name: \\ s ([^ \\ s] *); client = SET: 2; ' <br>
+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=Конечная точка для %s: %s
 DeleteEmailCollector=Удалить сборщик электронной почты
 ConfirmDeleteEmailCollector=Вы уверены, что хотите удалить этот сборщик электронной почты?
@@ -2209,3 +2213,10 @@ SkinAndColors=Оболочка и цвета
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Если вы хотите использовать второй налог, вы должны также включить первый налог с продаж.
 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.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index dcd048d736a..2b4adbbd4e8 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -32,7 +32,7 @@ RIB=Номер банковского счета
 IBAN=IBAN номера
 BIC=BIC/SWIFT код
 SwiftValid=BIC/SWIFT действителен
-SwiftVNotalid=BIC/SWIFT недействителен
+SwiftNotValid=BIC/SWIFT недействителен
 IbanValid=BAN действителен
 IbanNotValid=BAN недействителен
 StandingOrders=Распоряжения на прямое дебетование
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Адрес банка
 BankAccountCountry=Счет страны
 BankAccountOwner=Имя владельца счета
 BankAccountOwnerAddress=Адрес владельца счета
-RIBControlError=Не удалось проверить целостность ценностей. Это означает, что информация для этого номера счета неполна или неверна (проверьте страну, номера и IBAN).
 CreateAccount=Создать счет
 NewBankAccount=Новый счет
 NewFinancialAccount=Новые финансовые счета
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index 30fff1b747e..425821d0f0e 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/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=Условия оплаты
@@ -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=Общий прогресс %d %%
 SearchUnpaidInvoicesWithDueDate=Поиск неоплаченных счетов со сроком оплаты = %s
 NoPaymentAvailable=Нет оплаты для %s
 PaymentRegisteredAndInvoiceSetToPaid=Платеж зарегистрирован, а счет-фактура %s установлен на оплаченный
+SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for unpaid invoices
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/bookmarks.lang b/htdocs/langs/ru_RU/bookmarks.lang
index 41031f24d73..79150ecbd54 100644
--- a/htdocs/langs/ru_RU/bookmarks.lang
+++ b/htdocs/langs/ru_RU/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Поведение когда выбран URL закладки
 CreateBookmark=Создать закладку
 SetHereATitleForLink=Задать имя закладки
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Использовать внешнюю/абсолютную ссылку (https://URL) или внутреннюю/относительную ссылку (/DOLIBARR_ROOT/htdocs/...)
+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=Выберите, должна ли связанная страница открываться в текущей вкладке или в новой вкладке
 BookmarksManagement=Управление закладками
 BookmarksMenuShortCut=Ctrl + Shift + M
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index 44129d49609..aeab0651951 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -157,6 +157,18 @@ 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=Проф Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Проверить
 VATIntraCheckDesc=ID НДС должен включать префикс страны. Ссылка <b>%s</b> использует европейскую службу проверки НДС (VIES), для которой требуется доступ в Интернет с сервера Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Проверьте ID НДС на веб-сайте Европейской комиссии
-VATIntraManualCheck=Вы также можете проверить его вручную на сайте Европейской Комиссии <a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <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 4f268df2a91..73a69595e62 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -170,8 +170,9 @@ SeeReportInInputOutputMode=Просматривайте <b>%sанализ пла
 SeeReportInDueDebtMode=Просматривайте <b>%sанализ записанных документов%s</b> для расчета на основе известных <b>записанных документов</b>, даже если они еще не учтены в бухгалтерской книге
 SeeReportInBookkeepingMode=Просматривайте <b>%sанализ таблицы бухгалтерской книги%s</b> ля получения отчета на основе <b>таблицы бухгалтерской книги</b>
 RulesAmountWithTaxIncluded=- Суммы даны с учётом всех налогов
-RulesResultDue=- Сюда входят неоплаченные счета, расходы, НДС, пожертвования вне зависимости от того, оплачены они или нет. Также сюда входит выплачиваемая заработная плата.<br>- он основан на дате выставления счетов-фактур и на сроке оплаты расходов или налоговых платежей. Для заработной платы, определенной с помощью модуля Salary, используется дата валютирования платежа.
-RulesResultInOut=- Сюда входят реальные платежи по счетам, расходы, НДС и заработная плата.<br>- Он основан на датах оплаты счетов-фактур, расходах, НДС и заработной плате. Дата пожертвования для пожертвования.
+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=- Он включает в себя подлежащие оплате счета клиента независимо от того, оплачены они или нет.<br>- зависит от даты выставления счетов для этих счетов.<br>
 RulesCAIn=- Он включает в себя все действующие платежи по счетам, полученным от клиентов.<br>- он основан на дате оплаты этих счетов-фактур<br>
 RulesCATotalSaleJournal=Он включает все кредитные линии из журнала продаж.
@@ -295,3 +296,5 @@ 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 ?
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 75345361062..a5ea90335e0 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Этот контакт уже опр
 ErrorCashAccountAcceptsOnlyCashMoney=Этот банковский счет определен как счет для наличных, так что он принимает только наличные платежи.
 ErrorFromToAccountsMustDiffers=Источник и цели банковского счета должны быть разными.
 ErrorBadThirdPartyName=Неверное значение для стороннего имени
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s является обязательным
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Плохо синтаксис для заказчика код
 ErrorBadBarCodeSyntax=Неверный синтаксис штрих-кода. Возможно, вы установили неверный тип штрих-кода или определили маску штрих-кода для нумерации, которая не соответствует отсканированному значению.
 ErrorCustomerCodeRequired=Требуется код клиента
@@ -111,6 +113,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.
 ErrorNoImagickReadimage=Функция imagick_readimage не найдена в этой PHP. Нет предварительного просмотра могут быть доступны. Администраторы могут отключить эту закладку из меню Настройка - Экран.
 ErrorRecordAlreadyExists=Запись уже существует
 ErrorLabelAlreadyExists=Этот ярлык уже существует
@@ -271,6 +274,9 @@ CheckVersionFail=Ошибка проверки версии
 ErrorWrongFileName=Имя файла не может содержать __SOMETHING__
 ErrorNotInDictionaryPaymentConditions=Нет в Словаре условий оплаты, пожалуйста, измените.
 ErrorIsNotADraft=%s это не черновик
+ErrorExecIdFailed=Can't execute command "id"
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
+ErrorRequestTooLarge=Error, request too large
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ваш параметр PHP upload_max_filesize (%s) выше, чем параметр PHP post_max_size (%s). Это непоследовательная установка.
@@ -312,6 +318,7 @@ RequireAtLeastXString = Требуется не менее %s символа(о
 RequireXStringMax = Требуется не более %s символов.
 RequireAtLeastXDigits = Требуется не менее %s цифр
 RequireXDigitsMax = Требуется не более %s цифр
+RequireValidNumeric = Requires a numeric value
 RequireValidEmail = Адрес электронной почты недействителен
 RequireMaxLength = Длина не должна превышать %s символов.
 RequireMinLength = Длина должна быть больше, чем %s симв.
diff --git a/htdocs/langs/ru_RU/eventorganization.lang b/htdocs/langs/ru_RU/eventorganization.lang
index 3a4ccbc0cd4..d887083e509 100644
--- a/htdocs/langs/ru_RU/eventorganization.lang
+++ b/htdocs/langs/ru_RU/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/ru_RU/holiday.lang b/htdocs/langs/ru_RU/holiday.lang
index 38af56865d3..dec460ea8b5 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=Остаток отпуска составляет <b>%s</b> дней.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Выберите конечную дату позже чем начальную.
 ErrorSQLCreateCP=Ошибка SQL возникла во время создания:
 ErrorIDFicheCP=Возникла ошибка, заявление на отпуск отсутствует.
@@ -134,3 +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/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang
index e662fa233ca..9cb29cecb8b 100644
--- a/htdocs/langs/ru_RU/install.lang
+++ b/htdocs/langs/ru_RU/install.lang
@@ -21,6 +21,7 @@ ErrorPHPDoesNotSupportCurl=Ваша установка PHP не поддержи
 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 не существует.
diff --git a/htdocs/langs/ru_RU/knowledgemanagement.lang b/htdocs/langs/ru_RU/knowledgemanagement.lang
index 818fd3fdc69..c61b930e8f7 100644
--- a/htdocs/langs/ru_RU/knowledgemanagement.lang
+++ b/htdocs/langs/ru_RU/knowledgemanagement.lang
@@ -48,3 +48,7 @@ KnowledgeRecordExtraFields = Дополнительные поля для зап
 GroupOfTicket=Группа тикетов
 YouCanLinkArticleToATicketCategory=Вы можете привязать запись к группе тикетов (чтобы запись предлагалась во время квалификации новых тикетов)
 SuggestedForTicketsInGroup=Предлагается для тикетов, когда группа
+
+SetObsolete=Set as obsolete
+ConfirmCloseKM=Do you confirm the closing of this article as obsolete ?
+ConfirmReopenKM=Do you want to restore this article to status "Validated" ?
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 14a13a2af1d..bf508d11dc8 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Ошибка, ставки НДС не у
 ErrorNoSocialContributionForSellerCountry=Ошибка, не определен тип социальных/налоговых взносов для страны %s.
 ErrorFailedToSaveFile=Ошибка, не удалось сохранить файл.
 ErrorCannotAddThisParentWarehouse=Вы пытаетесь добавить родительский склад, который уже является дочерним по отношению к существующему складу
+FieldCannotBeNegative=Поле "%s" не может быть отрицательным
 MaxNbOfRecordPerPage=Макс. количество записей на странице
 NotAuthorized=Вы не авторизованы чтобы сделать это.
 SetDate=Установить дату
@@ -87,7 +88,7 @@ FileWasNotUploaded=Файл выбран как вложение, но пока
 NbOfEntries=Кол-во записей
 GoToWikiHelpPage=Читать интернет-справку (необходим доступ к Интернету)
 GoToHelpPage=Читать помощь
-DedicatedPageAvailable=Существует специальная страница справки, относящаяся к вашему текущему экрану
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Домашняя страница
 RecordSaved=Запись сохранена
 RecordDeleted=Запись удалена
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Код ошибки при последнем зап
 InformationLastAccessInError=Информация по ошибкам при последнем запросе доступа к базе данных
 DolibarrHasDetectedError=Dolibarr обнаружил техническую ошибку
 YouCanSetOptionDolibarrMainProdToZero=Вы можете прочитать файл журнала или установить опцию $dolibarr_main_prod в '0' в свой файл конфигурации, чтобы получить дополнительную информацию.
-InformationToHelpDiagnose=Эта информация может быть полезна для диагностических целей (вы можете установить опцию $dolibarr_main_prod на «1», чтобы удалить такие уведомления)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Подробнее
 TechnicalInformation=Техническая информация
 TechnicalID=Технический идентификатор
@@ -211,6 +212,8 @@ User=Пользователь
 Users=Пользователи
 Group=Группа
 Groups=Группы
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Не задана группа для пользователя
 Password=Пароль
 PasswordRetype=Повторите ваш пароль
@@ -906,7 +909,7 @@ ViewFlatList=Вид плоским списком
 ViewAccountList=Посмотреть бухгалтерскую книгу
 ViewSubAccountList=Просмотр книги вспомогательного счета
 RemoveString=Удалить строку '%s'
-SomeTranslationAreUncomplete=Некоторые из предлагаемых языков пакетов могут быть переведены только частично или могут содержать ошибки. Пожалуйста, помогите исправить ваш язык, зарегистрировавшись по адресу <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/,</a> чтобы добавить свои улучшения.
+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=Публичная ссылка для скачивания
 PublicDownloadLinkDesc=Для скачивания файла требуется только ссылка
 DirectDownloadInternalLink=Частная ссылка для скачивания
@@ -1158,4 +1161,6 @@ Properties=Характеристики
 hasBeenValidated=%s был проверен
 ClientTZ=Часовой пояс клиента (пользователь)
 NotClosedYet=Еще не закрыто
-ClearSignature=Сброс подписи
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/ru_RU/modulebuilder.lang b/htdocs/langs/ru_RU/modulebuilder.lang
index d63b059ccbc..00d5d6878ce 100644
--- a/htdocs/langs/ru_RU/modulebuilder.lang
+++ b/htdocs/langs/ru_RU/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Этот инструмент должен использоваться только опытными пользователями или разработчиками. Он предоставляет утилиты для создания или редактирования вашего собственного модуля. Документация по ручной разработке альтернативы <a href="%s" target="_blank">находится здесь</a>.
+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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Меню, предоставляемые вашим моду
 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 recorded by other modules).
+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=См. Идентификаторы, используемые в вашей установке
 SeeReservedIDsRangeHere=См. Диапазон зарезервированных идентификаторов
 ToolkitForDevelopers=Инструментарий для разработчиков Dolibarr
diff --git a/htdocs/langs/ru_RU/mrp.lang b/htdocs/langs/ru_RU/mrp.lang
index cf36489726b..420cd88994e 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=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/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 6fe731da0d2..62d9acc6860 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -258,6 +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
 YourPasswordHasBeenReset=Ваш пароль был успешно сброшен
 ApplicantIpAddress=IP-адрес заявителя
 SMSSentTo=SMS отправлено на %s
@@ -268,6 +272,7 @@ ProjectCreatedByEmailCollector=Проект создан сборщиком пи
 TicketCreatedByEmailCollector=Тикет создан сборщиком электронной почты из электронного адреса MSGID %s
 OpeningHoursFormatDesc=Используйте - для разделения часов открытия и закрытия.<br>Используйте пробел для ввода различных диапазонов.<br>Пример: 8-12 14-18
 SuffixSessionName=Суффикс имени сеанса
+LoginWith=Login with %s
 
 ##### Export #####
 ExportsArea=Экспорт области
diff --git a/htdocs/langs/ru_RU/partnership.lang b/htdocs/langs/ru_RU/partnership.lang
index 84fe886d606..d13fcfbae30 100644
--- a/htdocs/langs/ru_RU/partnership.lang
+++ b/htdocs/langs/ru_RU/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Управление партнерством
 PartnershipDescription=Модуль Управление партнерством
 PartnershipDescriptionLong= Модуль Управление партнерством
-
+Partnership=Партнерство
 AddPartnership=Добавить партнерство
 CancelPartnershipForExpiredMembers=Партнерство: отмените партнерство участников с истекшими подписками
 PartnershipCheckBacklink=Партнерство: проверьте ссылающуюся обратную ссылку
diff --git a/htdocs/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang
index 8a595dd0306..22d75daaf64 100644
--- a/htdocs/langs/ru_RU/productbatch.lang
+++ b/htdocs/langs/ru_RU/productbatch.lang
@@ -30,7 +30,7 @@ ManageLotMask=Пользовательская маска
 CustomMasks=Возможность определить разные маски нумерации для каждого продукта
 BatchLotNumberingModules=Правило нумерации для автоматического создания номера партии
 BatchSerialNumberingModules=Правило нумерации для автоматического создания серийного номера (для продуктов со свойством 1 уникальная партия/серия для каждого продукта)
-QtyToAddAfterBarcodeScan=Кол-во для добавления для каждого отсканированного штрих-кода/партии/серии
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Срок службы (в днях)
 EndOfLife=Конец срока службы
 ManufacturingDate=Дата производства
@@ -42,3 +42,4 @@ HideLots=Скрыть партии
 #Traceability - qc status
 OutOfOrder=Не работает
 InWorkingOrder=В рабочем порядке
+ToReplace=Replace
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index c39c2baf77d..2dd938b567f 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Сумма, используемая для обновле
 PMPValue=Средневзвешенная цена
 PMPValueShort=СВЦ
 mandatoryperiod=Обязательные периоды
-mandatoryPeriodNeedTobeSet=Периоды внимания не указаны и обязательны
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=Услуге требуются начальный и конечный периоды
-mandatoryHelper=Сообщение пользователю о необходимости ввести дату начала и дату окончания услуги при создании/проверке счета-фактуры, коммерческого предложения, заказа на продажу.<br>Это действие не блокируется в процессе подтверждения
+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=Спецификация материалов по умолчанию
 DefaultBOMDesc=Спецификация материалов по умолчанию, рекомендованная для производства этого продукта. Это поле может быть установлено только в том случае, если тип продукта - "%s".
 Rank=Ранг
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 7e4da6aca38..1a4260181ba 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -197,6 +197,7 @@ InputPerMonth=Ввод в месяц
 InputDetail=Детализация ввода
 TimeAlreadyRecorded=Это время, уже зарегистрированное для этой задачи/день, и пользователь %s
 ProjectsWithThisUserAsContact=Проекты с этим пользователем в качестве контакта
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Задачи, возложенные на этого пользователя
 ResourceNotAssignedToProject=Не привязан к проекту
 ResourceNotAssignedToTheTask=Не назначен на задачу
@@ -284,3 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Примечание: суще
 SelectLinesOfTimeSpentToInvoice=Выберите строки затраченного времени, за которые не выставлены счета, затем выполните массовое действие "Сгенерировать счет-фактуру", чтобы выставить их.
 ProjectTasksWithoutTimeSpent=Задачи проекта без затрат времени
 FormForNewLeadDesc=Спасибо, заполните следующую форму, чтобы связаться с нами. Вы также можете отправить нам электронное письмо прямо на адрес <b>%s</b>.
+ProjectsHavingThisContact=Projects having this contact
+StartDateCannotBeAfterEndDate=Дата окончания не может быть раньше даты начала
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/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index d5a420381e9..2d7be0cac75 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Правильно удален лимит запа
 AddNewProductStockWarehouse=Установите новый лимит для предупреждений и желаемый оптимальный запас
 AddStockLocationLine=Уменьшите количество, затем нажмите, чтобы добавить еще один склад для этого продукта
 InventoryDate=Дата инвентаризации
+Inventories=Inventories
 NewInventory=Новый инвентарь
 inventorySetup = Настройка инвентаря
 inventoryCreatePermission=Создать новый инвентарь
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Движение запасов б
 inventoryChangePMPPermission=Разрешить изменять значение PMP для продукта
 ColumnNewPMP=Новый агрегат ПМП
 OnlyProdsInStock=Не добавляйте товар без наличия на складе
-TheoricalQty=Теория кол-во
-TheoricalValue=Теория кол-во
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Последний БП
 CurrentPA=Текущий БП
 RecordedQty=Записанное количество
@@ -240,7 +241,7 @@ StockAtDatePastDesc=Здесь вы можете просмотреть запа
 StockAtDateFutureDesc=Здесь вы можете просмотреть акции (виртуальные акции) на определенную дату в будущем.
 CurrentStock=Текущий запас
 InventoryRealQtyHelp=Установите значение 0 для сброса количества<br>Оставьте поле пустым или удалите строку, чтобы оставить без изменений
-UpdateByScaning=Заполните реальное количество сканированием
+UpdateByScaning=Complete real qty by scaning
 UpdateByScaningProductBarcode=Обновление путем сканирования (штрих-код продукта)
 UpdateByScaningLot=Обновление сканированием (партия | серийный штрих-код)
 DisableStockChangeOfSubProduct=Деактивируйте замену запаса для всех вспомогательных продуктов этого набора во время этого движения.
@@ -253,14 +254,20 @@ ReOpen=Открыть заново
 ConfirmFinish=Вы подтверждаете закрытие инвентаря? Это будет генерировать все движения запаса, чтобы обновить ваш запас до реального количества, которое вы ввели в инвентарь.
 ObjectNotFound=%s не найден
 MakeMovementsAndClose=Создайте движения и закройте
-AutofillWithExpected=Заполните реальное количество ожидаемым количеством
+AutofillWithExpected=Replace real quantity with expected quantity
 ShowAllBatchByDefault=По умолчанию, детали партии продукта отображаются на вкладке "склад"
 CollapseBatchDetailHelp=Вы можете установить отображение деталей партии по умолчанию в конфигурации модуля запасы
-FieldCannotBeNegative=Поле "%s" не может быть отрицательным
 ErrorWrongBarcodemode=Неизвестный режим штрих-кода
 ProductDoesNotExist=Продукта не существует
-ErrorSameBatchNumber=Тот же номер партии найден в инвентарной ведомости
+ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
 ProductBatchDoesNotExist=Продукт с партией/серией не существует
 ProductBarcodeDoesNotExist=Продукт со штрих-кодом не существует
 WarehouseId=ID склада
 WarehouseRef=Ссылка на склад
+SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
+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
diff --git a/htdocs/langs/ru_RU/stripe.lang b/htdocs/langs/ru_RU/stripe.lang
index b88f42f2eea..25db139165e 100644
--- a/htdocs/langs/ru_RU/stripe.lang
+++ b/htdocs/langs/ru_RU/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Настройка модуля Stripe
-StripeDesc=Предложите клиентам страницу онлайн-платежей Stripe для платежей с помощью кредитных / cebit карт через <a href="http://www.stripe.com" target="_blank"> Stripe </a>. Это может быть использовано, чтобы позволить вашим клиентам совершать специальные платежи или для платежей, связанных с конкретным объектом Dolibarr (счет-фактура, заказ, ...)
+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=Оплата кредитной картой или Stripe
 FollowingUrlAreAvailableToMakePayments=После URL, можно предложить страницу к клиенту сделать платеж по Dolibarr объектов
 PaymentForm=Форма оплаты
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index d46cfb374b9..69c5ee6602b 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Распоряжение о переводе кредита
 LatestBankTransferReceipts=Последние заказы на кредитный перевод %s
 LastWithdrawalReceipts=Последние файлы прямого дебета %s
 WithdrawalsLine=Строка ордера на прямой дебет
+CreditTransfer=Credit transfer
 CreditTransferLine=Кредитная переводная линия
 WithdrawalsLines=Строки распоряжения о прямом дебетовании
 CreditTransferLines=Кредитные переводные линии
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Код стороннего банка
 NoInvoiceCouldBeWithdrawed=Счет-фактура не списана успешно. Убедитесь, что счета выставлены на компании с действующим IBAN и что IBAN имеет UMR (уникальный мандат) с режимом <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=Эта квитанция о снятии средств уже помечена как зачисленная; это нельзя сделать дважды, так как это потенциально может привести к дублированию платежей и банковских операций.
 ClassCredited=Классифицировать зачисленных
+ClassDebited=Classify debited
 ClassCreditedConfirm=Вы уверены, что хотите классифицировать это изъятие   как кредит на вашем счету в банке?
 TransData=Дата передачи
 TransMetod=Метод передачи
@@ -80,7 +82,7 @@ StatusMotif7=Судебное решение
 StatusMotif8=Другая причина
 CreateForSepaFRST=Создать файл прямого дебета (SEPA FRST)
 CreateForSepaRCUR=Создать файл прямого дебета (SEPA RCUR)
-CreateAll=Создать файл прямого дебета (все)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Создать файл для кредитного перевода
 CreateSepaFileForPaymentByBankTransfer=Создать файл кредитного перевода (SEPA)
 CreateGuichet=Только служба
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Невозможно создать запрос 
 SepaMandate=Мандат прямого дебета SEPA
 SepaMandateShort=Мандат SEPA
 PleaseReturnMandate=Отправьте эту форму поручения по электронной почте на адрес %s или по почте на адрес
-SEPALegalText=Подписывая эту форму поручения, вы разрешаете (A) %s отправлять инструкции в ваш банк для дебетования вашего счета и (B) ваш банк дебетовать ваш счет в соответствии с инструкциями от %s. В рамках ваших прав вы имеете право на возмещение от вашего банка в соответствии с условиями вашего соглашения с вашим банком. Возврат средств необходимо запросить в течение 8 недель с даты списания средств с вашего счета. Ваши права в отношении вышеуказанного мандата разъясняются в заявлении, которое вы можете получить в своем банке.
+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=Идентификатор кредитора
 CreditorName=Имя кредитора
 SEPAFillForm=(B) Пожалуйста, заполните все поля, отмеченные *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/ru_UA/accountancy.lang b/htdocs/langs/ru_UA/accountancy.lang
deleted file mode 100644
index fd4bce2d49b..00000000000
--- a/htdocs/langs/ru_UA/accountancy.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - accountancy
-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)
diff --git a/htdocs/langs/ru_UA/admin.lang b/htdocs/langs/ru_UA/admin.lang
index 58a42ff6b8e..e4705c82130 100644
--- a/htdocs/langs/ru_UA/admin.lang
+++ b/htdocs/langs/ru_UA/admin.lang
@@ -1,15 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-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>"
-DictionaryOrderMethods=Order methods
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-MAIN_DISABLE_METEO=Disable weather thumb
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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>
-ARestrictedPath=Some restricted path
 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/cashdesk.lang b/htdocs/langs/ru_UA/cashdesk.lang
deleted file mode 100644
index 19dc45d5847..00000000000
--- a/htdocs/langs/ru_UA/cashdesk.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
diff --git a/htdocs/langs/ru_UA/compta.lang b/htdocs/langs/ru_UA/compta.lang
deleted file mode 100644
index 21e186d2a79..00000000000
--- a/htdocs/langs/ru_UA/compta.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATReportByThirdParties=Sales tax report by third party
-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)
diff --git a/htdocs/langs/ru_UA/errors.lang b/htdocs/langs/ru_UA/errors.lang
deleted file mode 100644
index b701bac654c..00000000000
--- a/htdocs/langs/ru_UA/errors.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - errors
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
diff --git a/htdocs/langs/ru_UA/eventorganization.lang b/htdocs/langs/ru_UA/eventorganization.lang
deleted file mode 100644
index dac8822b8d7..00000000000
--- a/htdocs/langs/ru_UA/eventorganization.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - eventorganization
-EventOrganizationDescriptionLong=Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
diff --git a/htdocs/langs/ru_UA/members.lang b/htdocs/langs/ru_UA/members.lang
deleted file mode 100644
index a4efe013601..00000000000
--- a/htdocs/langs/ru_UA/members.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MembersTickets=Membership address sheet
-NewSubscription=New contribution
diff --git a/htdocs/langs/ru_UA/mrp.lang b/htdocs/langs/ru_UA/mrp.lang
deleted file mode 100644
index e0e12fc5350..00000000000
--- a/htdocs/langs/ru_UA/mrp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mrp
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
diff --git a/htdocs/langs/ru_UA/orders.lang b/htdocs/langs/ru_UA/orders.lang
deleted file mode 100644
index bed33ccde24..00000000000
--- a/htdocs/langs/ru_UA/orders.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-SaleOrderLines=Sales order lines
diff --git a/htdocs/langs/ru_UA/printing.lang b/htdocs/langs/ru_UA/printing.lang
deleted file mode 100644
index 31440f79aed..00000000000
--- a/htdocs/langs/ru_UA/printing.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
diff --git a/htdocs/langs/ru_UA/products.lang b/htdocs/langs/ru_UA/products.lang
deleted file mode 100644
index a50a97fd8db..00000000000
--- a/htdocs/langs/ru_UA/products.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-IncludingProductWithTag=Including products/services with the tag
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
diff --git a/htdocs/langs/ru_UA/propal.lang b/htdocs/langs/ru_UA/propal.lang
deleted file mode 100644
index de4e2e63224..00000000000
--- a/htdocs/langs/ru_UA/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PdfCommercialProposalTitle=Proposal
diff --git a/htdocs/langs/ru_UA/receptions.lang b/htdocs/langs/ru_UA/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/ru_UA/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/ru_UA/sendings.lang b/htdocs/langs/ru_UA/sendings.lang
deleted file mode 100644
index c4a28b980b9..00000000000
--- a/htdocs/langs/ru_UA/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
diff --git a/htdocs/langs/ru_UA/stocks.lang b/htdocs/langs/ru_UA/stocks.lang
deleted file mode 100644
index 3a3e8fa1419..00000000000
--- a/htdocs/langs/ru_UA/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
diff --git a/htdocs/langs/ru_UA/trips.lang b/htdocs/langs/ru_UA/trips.lang
deleted file mode 100644
index dd9decdd4fe..00000000000
--- a/htdocs/langs/ru_UA/trips.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - trips
-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
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 2ebfce90ceb..a7fa4cb7af8 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Priradzovať automaticky
-AutomaticBindingDone=Automatické priradenie dokončené
+AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Chyba, nemôžete odstrániť tento účtovný účet, pretože sa používa
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
@@ -387,7 +387,8 @@ 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=Rozsah účtovného účtu
 Calculated=Vypočítané
@@ -404,6 +405,7 @@ NoJournalDefined=No journal defined
 Binded=Viazané čiary
 ToBind=Linky na viazanie
 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 1f8cdfb191c..0f8bd32536e 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Nadácia
 Version=Verzia
 Publisher=Publisher
@@ -265,8 +267,8 @@ OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=Pre používateľov alebo vývojárov dokumentácie (doc, FAQs ...) <br> pozrite sa na Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
-ForAnswersSeeForum=V prípade akýchkoľvek ďalších otázok / help, môžete použiť fórum Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
+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=Aktuálna ponuka handler
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion= Najnovšia stabilná verzia
 LastActivationDate=Latest activation date
 LastActivationAuthor=Latest activation author
 LastActivationIP=Latest activation IP
+LastActivationVersion=Latest activation version
 UpdateServerOffline=Aktualizovať 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Odstrániť sendings
 Permission111=Prečítajte finančných účtov
 Permission112=Vytvoriť / upraviť / zmazať a porovnať transakcie
-Permission113=Nastavenie finančných účtov (vytvárať, spravovať kategórie)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Vývozných transakcií, a výpisy z účtov
 Permission116=Prevody medzi účtami
@@ -762,6 +765,7 @@ Permission121=Prečítajte tretej strany v súvislosti s užívateľmi
 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 )
@@ -889,12 +893,11 @@ Permission701=Prečítajte si dary
 Permission702=Vytvoriť / upraviť dary
 Permission703=Odstrániť dary
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Prečítajte si zásoby
@@ -958,15 +961,11 @@ Permission2801=Pomocou FTP klienta v režime čítania (prezerať a sťahovať i
 Permission2802=Pomocou FTP klienta v režime zápisu (odstrániť alebo vkladať)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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=Ukázať naplánovanú úlohu
 Permission23002=Vytvoriť / upraviť naplánovanú úlohu
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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=Vydanie poľných %s
@@ -1708,8 +1707,9 @@ MailingDelay=Po poslaní ďalšej správy čakať (sec)
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Príjemca
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Odoslanie potvrdenky modelu
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Voľný text na potvrdenie o doručení
 ##### FCKeditor #####
 AdvancedEditor=Rozšírené editor
 ActivateFCKeditor=Aktivácia pokročilé editor pre:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field public notes of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field private notes of elements
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,6 +1917,8 @@ 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)
+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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zips
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
index 086c8d1c41a..817948ae3f6 100644
--- a/htdocs/langs/sk_SK/banks.lang
+++ b/htdocs/langs/sk_SK/banks.lang
@@ -32,7 +32,7 @@ RIB=Číslo bankového účtu
 IBAN=IBAN
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Inkaso objednávky
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Účet krajiny
 BankAccountOwner=Majiteľ účtu Názov
 BankAccountOwnerAddress=Majiteľ účtu adresa
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Vytvoriť účet
 NewBankAccount=Nový účet
 NewFinancialAccount=Nový finančný účet
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/bookmarks.lang b/htdocs/langs/sk_SK/bookmarks.lang
index 98983aca9b4..2b993765708 100644
--- a/htdocs/langs/sk_SK/bookmarks.lang
+++ b/htdocs/langs/sk_SK/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Behaviour when a bookmark URL is selected
 CreateBookmark=Vytvoriť záložku
 SetHereATitleForLink=Set a name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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=Záložky riadenie
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index 5780a270015..f8dadfa8cfe 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -157,6 +157,18 @@ 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 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Kontrola
 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">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Skontrolujte, nie je možné. Skontrolujte, služba nie je poskytovaná členským štátom (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index 65ef5dfa57a..00f5ab4b5e8 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -170,8 +170,9 @@ 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=- Uvedené sumy sú so všetkými daňami
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 6975185d14c..cbb983f03f0 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Nedokáže dostať RSS feed. Skúste pridať konštantn
 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=Povolenie pre toto prihlásenie môže byť definovaná správcom Dolibarr z ponuky %s-&gt; %s.
 ErrorForbidden3=Zdá sa, že Dolibarr nie je využitá prostredníctvom overené relácie. Pozrite sa na dokumentáciu k nastaveniu Dolibarr vedieť, ako riadiť autentizácia (htaccess, mod_auth alebo iné ...).
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=Trieda Imagick nie je nájdený v tejto PHP. Náhľad nie je môžu byť k dispozícii. Správcovia môžu zakázať túto kartu z menu Nastavenie - Zobrazenie.
 ErrorRecordAlreadyExists=Záznam už existuje
 ErrorLabelAlreadyExists=This label already exists
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/sk_SK/holiday.lang
index bbc14e5c235..23087db2f90 100644
--- a/htdocs/langs/sk_SK/holiday.lang
+++ b/htdocs/langs/sk_SK/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Popis
 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 is <b>%s</b> days.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Musíte vybrať koncový dátum je väčší ako dátum začatia.
 ErrorSQLCreateCP=SQL chyba pri tvorbe:
 ErrorIDFicheCP=An error has occurred, the leave request does not exist.
@@ -134,3 +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 9988cb88e73..9b9b37868ad 100644
--- a/htdocs/langs/sk_SK/install.lang
+++ b/htdocs/langs/sk_SK/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/sk_SK/main.lang
index 46cde6cc572..ee1c88d1326 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Chyba, žiadne sadzby DPH stanovenej pre k
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Chyba sa nepodarilo uložiť súbor.
 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=Nastaviť dátum
@@ -87,7 +88,7 @@ FileWasNotUploaded=Súbor vybraný pre pripojenie, ale ešte nebol nahraný. Kli
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Prečítajte si pomáhať
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Záznam uložený
 RecordDeleted=Zaznamenajte zmazaný
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Return code for latest database access request error
 InformationLastAccessInError=Information for latest database access request error
 DolibarrHasDetectedError=Dolibarr zistil technickú chybu
 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 remove such notices)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Viac informácií
 TechnicalInformation=Technická informácia
 TechnicalID=Technical ID
@@ -211,6 +212,8 @@ User=Užívateľ
 Users=Užívatelia
 Group=Skupina
 Groups=Skupiny
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Nie je definovaná skupina užívateľov
 Password=Heslo
 PasswordRetype=Zadajte znovu heslo
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Časová zóna klienta (používateľ)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/sk_SK/modulebuilder.lang b/htdocs/langs/sk_SK/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/sk_SK/modulebuilder.lang
+++ b/htdocs/langs/sk_SK/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 3a63c33ab58..41e3d141a56 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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
diff --git a/htdocs/langs/sk_SK/partnership.lang b/htdocs/langs/sk_SK/partnership.lang
index d2eac86fca9..e3d7fa2ee2b 100644
--- a/htdocs/langs/sk_SK/partnership.lang
+++ b/htdocs/langs/sk_SK/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/sk_SK/productbatch.lang b/htdocs/langs/sk_SK/productbatch.lang
index 68723a3f5e6..4a4d6549f52 100644
--- a/htdocs/langs/sk_SK/productbatch.lang
+++ b/htdocs/langs/sk_SK/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index ee55f23715d..b5529fbb749 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Vážená priemerná cena
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index a6de18dc0ba..427c3d7af26 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/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,3 +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=Dátum ukončenia nemôže byť pred dátumom začatia
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 be1416f1c9f..3cf1523d363 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Limit zásob pre upozornenie a optimálne požadova
 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
 InventoryDate=Inventory date
+Inventories=Inventories
 NewInventory=New inventory
 inventorySetup = Inventory Setup
 inventoryCreatePermission=Create new inventory
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=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
diff --git a/htdocs/langs/sk_SK/stripe.lang b/htdocs/langs/sk_SK/stripe.lang
index dca68cf8cda..b4859dbdaa0 100644
--- a/htdocs/langs/sk_SK/stripe.lang
+++ b/htdocs/langs/sk_SK/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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=Nasledovné adresy URL sú k dispozícii ponúknuť stránky na zákazníka, aby platbu na Dolibarr objektov
 PaymentForm=Platba formulár
@@ -28,7 +28,6 @@ AccountParameter=Parametre účtu
 UsageParameter=Používanie parametrov
 InformationToFindParameters=Pomôžte nájsť %s informácie o účte
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Názov dodávateľa
 CSSUrlForPaymentForm=CSS štýlov url platobného formulára
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
index 39c7ed6dabe..61d034894b5 100644
--- a/htdocs/langs/sk_SK/withdrawals.lang
+++ b/htdocs/langs/sk_SK/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Najnovšie %s dokumenty bezhotovostných platieb
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Riadky inkaso objednávok
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ 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=Klasifikovať pripísaná
+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
@@ -80,7 +82,7 @@ StatusMotif7=Súdne rozhodnutia
 StatusMotif8=Iný dôvod
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Iba kancelária
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ ModeWarning=Voľba pre reálny režim nebol nastavený, môžeme zastaviť po to
 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
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index a5b661bb598..79530e63cc7 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Napaka, ne morete izbrisati to računovodsko račun, ker se uporablja
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index af7cc204fc3..6ee90a1853c 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Ustanova
 Version=Različica
 Publisher=Publisher
@@ -265,8 +267,8 @@ OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=Glede dokumentacije za uporabnike in razvojnike (Doc, FAQ...),<br>poglejte na Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Za vsa ostala vprašanja/pomoč lahko uporabite Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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=Trenutna rutina za meni
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
 LastActivationAuthor=Latest activation author
 LastActivationIP=Latest activation IP
+LastActivationVersion=Latest activation version
 UpdateServerOffline=Posodobitev strežnika brez povezave
 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>
@@ -753,7 +756,7 @@ Permission106=Izvoz pošiljk
 Permission109=Brisanje pošiljk
 Permission111=Branje finančnih postavk
 Permission112=Kreiranje/spreminjanje/brisanje in primerjava transakcij
-Permission113=Nastavitve finančnih kontov (kreiranje, upravljanje kategorij)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Izvoz transakcij in računovodskih izkazov
 Permission116=Transfer med računi
@@ -762,6 +765,7 @@ Permission121=Branje partnerjev, vezanih na uporabnika
 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)
@@ -889,12 +893,11 @@ Permission701=Branje donacij
 Permission702=Kreiranje/spreminjanje donacij
 Permission703=Delete donacij
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Kreiranje/spreminjanje stroškovnih poročil
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Brisanje stroškovnih poročil
-Permission774=Branje vseh stroškovnih poročil (tudi za nepodrejene)
 Permission775=Odobritev stroškovnih poročil
 Permission776=Plačilo stroškovnih poročil
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Izvoz stroškovnih poročil
 Permission1001=Branje zalog
@@ -958,15 +961,11 @@ Permission2801=Uporaba FTP klienta samo za branje (samo brskanje in prenašanje)
 Permission2802=Uporaba FTP klienta za pisanje (brisanje ali nalaganje datotek)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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=Brisanje zahtevkov za dopust
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Administriranje zahtevkov za dopust (nastavitve in posodobitev stanja)
+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=Preberi načrtovano delo
 Permission23002=Ustvari/posodobi načrtovano delo
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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=%s premenjenih polj
@@ -1708,8 +1707,9 @@ MailingDelay=Čakanje v sekundah po pošiljanju naslednjega sporočila
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Prejemnik
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Obrazci odpremnic
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Poljubno besedilo na odpremnici
 ##### FCKeditor #####
 AdvancedEditor=Napredni urejevalnik
 ActivateFCKeditor=Aktiviranje FCKeditor za:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field public notes of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field private notes of elements
+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>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=Noben modul za upravljanje avtomatskega povečevanja zalog ni aktiviran. Zaloge se bodo povečale samo na osnovi ročnega vnosa.
 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
@@ -1916,6 +1917,8 @@ 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)
+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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
index ee4bad6c3b4..98af72a0cf9 100644
--- a/htdocs/langs/sl_SI/banks.lang
+++ b/htdocs/langs/sl_SI/banks.lang
@@ -32,7 +32,7 @@ RIB=Transakcijski račun
 IBAN=IBAN številka
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Država računa
 BankAccountOwner=Ime lastnika računa
 BankAccountOwnerAddress=Naslov lastnika računa
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Kreiranje računa
 NewBankAccount=Nov konto
 NewFinancialAccount=Nov finančni račun
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/bookmarks.lang b/htdocs/langs/sl_SI/bookmarks.lang
index 878eca39e9a..acbd840a992 100644
--- a/htdocs/langs/sl_SI/bookmarks.lang
+++ b/htdocs/langs/sl_SI/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Behaviour when a bookmark URL is selected
 CreateBookmark=Kreiraj zaznamek
 SetHereATitleForLink=Set a name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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=Urejanje zaznamkov
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index 2a5bf9d1a10..6b689d59b9c 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -157,6 +157,18 @@ 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==
 ProfId2CO==
 ProfId3CO==
@@ -369,7 +381,7 @@ VATIntraCheck=Kontrola
 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">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Kontrola ni možna. Država članica ne zagotavlja storitve poizvedbe (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index ef6d18c6586..a00f3f59709 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -170,8 +170,9 @@ 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=- Prikazane vrednosti vključujejo vse davke
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index a82fe6fdb44..a27b6fceea6 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Ne Knjiga. Poskusite dodati stalno MAIN_SIMPLEXMLLOAD_D
 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=Dovoljenje za to prijavo se lahko opredeli skrbnik Dolibarr iz menija %s-> %s.
 ErrorForbidden3=Zdi se, da je Dolibarr ne uporablja prek overjeno sejo. Oglejte si namestitveno dokumentacijo Dolibarr vedeti, kako upravljati authentications (htaccess, mod_auth ali drugo ...).
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=Razred Imagick ni mogoče najti v tem PHP. Št Predogled je lahko na voljo. Skrbniki lahko onemogočite to kartico od Setup meniju - Display.
 ErrorRecordAlreadyExists=Zapis že obstaja
 ErrorLabelAlreadyExists=This label already exists
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/sl_SI/holiday.lang
index 578081a1397..2f664b4b125 100644
--- a/htdocs/langs/sl_SI/holiday.lang
+++ b/htdocs/langs/sl_SI/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Opis
 SendRequestCP=Ustvari zahtevek za dopust
 DelayToRequestCP=Zahtevek za dopust mora biti vložen vsaj <b>%s dan(dni)</b> prej.
 MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Končni datum mora biti večji od začetnega.
 ErrorSQLCreateCP=Pri ustvarjanju SQL je prišlo do napake
 ErrorIDFicheCP=Prišlo je do napake, zahtevek za dopust ne obstaja
@@ -134,3 +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 36ec526e467..3262c23cc1d 100644
--- a/htdocs/langs/sl_SI/install.lang
+++ b/htdocs/langs/sl_SI/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/sl_SI/main.lang
index e002743b894..9633b6caa9b 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Napaka, za državo '%s' niso definirane da
 ErrorNoSocialContributionForSellerCountry=Napaka, za državo '%s' niso definirane stopnje socialnega/fiskalnega davka.
 ErrorFailedToSaveFile=Napaka, datoteka ni bila shranjena.
 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=Nimate dovoljenja za to.
 SetDate=Nastavi datum
@@ -87,7 +88,7 @@ FileWasNotUploaded=Izbrana je bila datoteka za prilogo, vendar še ni dodana. Kl
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Preberite pomoč
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Zapis je shranjen
 RecordDeleted=Zapis je izbrisan
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Return code for latest database access request error
 InformationLastAccessInError=Information for latest database access request error
 DolibarrHasDetectedError=Dolibarr je zaznal tehnično napako
 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 remove such notices)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Več informacij
 TechnicalInformation=Tehnična informacija
 TechnicalID=Tehnični ID
@@ -211,6 +212,8 @@ User=Uporabnik
 Users=Uporabniki
 Group=Skupina
 Groups=Skupine
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Nobena skupina uporabnikov ni definirana
 Password=Geslo
 PasswordRetype=Ponoven vnos gesla
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Časovni pas klienta (uporabnika)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/sl_SI/modulebuilder.lang b/htdocs/langs/sl_SI/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/sl_SI/modulebuilder.lang
+++ b/htdocs/langs/sl_SI/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 da9972089d4..eccf4a08c37 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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
diff --git a/htdocs/langs/sl_SI/partnership.lang b/htdocs/langs/sl_SI/partnership.lang
index 79aec0ba8b8..8f0267a28c6 100644
--- a/htdocs/langs/sl_SI/partnership.lang
+++ b/htdocs/langs/sl_SI/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/sl_SI/productbatch.lang b/htdocs/langs/sl_SI/productbatch.lang
index e614166db27..32b638a7dd6 100644
--- a/htdocs/langs/sl_SI/productbatch.lang
+++ b/htdocs/langs/sl_SI/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 89da8d4d0b7..b82a8300e02 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Uravnotežena povprečna cena
 PMPValueShort=UPC
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 1884ae89f81..3b61be3bbea 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/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,3 +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/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 8714ec6211b..f0327fefdec 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=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
diff --git a/htdocs/langs/sl_SI/stripe.lang b/htdocs/langs/sl_SI/stripe.lang
index 71e190cf1fa..8978d6ad897 100644
--- a/htdocs/langs/sl_SI/stripe.lang
+++ b/htdocs/langs/sl_SI/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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=Naslednji URL naslovi so na voljo kupcem za izvedbo plačil Dolibarr postavk
 PaymentForm=Obrazec za plačilo
@@ -28,7 +28,6 @@ AccountParameter=Parametri računa
 UsageParameter=Parametri uporabe
 InformationToFindParameters=Pomoč pri iskanju informacij računa %s
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Ime prodajalca
 CSSUrlForPaymentForm=url CSS vzorca obrazca plačila
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang
index 384fe3d2a80..55f7143afcb 100644
--- a/htdocs/langs/sl_SI/withdrawals.lang
+++ b/htdocs/langs/sl_SI/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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=Označi kot prejeto
+ClassDebited=Classify debited
 ClassCreditedConfirm=Ali zares želite to potrdilo o nakazilu označiti kot »v dobro« na vašem bančnem računu ?
 TransData=Datum prenosa
 TransMetod=Metoda prenosa
@@ -80,7 +82,7 @@ StatusMotif7=Sodne odločbe
 StatusMotif8=Drugih razlogi
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Samo urad
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ ModeWarning=Opcija za delo v živo ni bila nastavljena, zato se bo sistem ustavi
 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
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 9f41b708460..190e3d67eec 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index a8f9b6615df..9ceec93e86e 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Versioni
 Publisher=Publisher
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Versioni i fundit stabёl
 LastActivationDate=Latest activation date
 LastActivationAuthor=Latest activation author
 LastActivationIP=Latest activation IP
+LastActivationVersion=Latest activation version
 UpdateServerOffline=Update server offline
 WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index e10e6c58c41..abb36493269 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/sq_AL/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/sq_AL/bookmarks.lang
+++ b/htdocs/langs/sq_AL/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index 35e138142ac..74ba7e4a819 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 82156b8b721..533fe2b92c3 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/sq_AL/holiday.lang
index 5865db9402c..184bcf2b82a 100644
--- a/htdocs/langs/sq_AL/holiday.lang
+++ b/htdocs/langs/sq_AL/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Përshkrimi
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
 MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/sq_AL/install.lang
index 08a9f949f86..df3eaf77abe 100644
--- a/htdocs/langs/sq_AL/install.lang
+++ b/htdocs/langs/sq_AL/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/sq_AL/main.lang
index b61b7ade7e1..ffad3cdd5c6 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Fjalëkalimi
 PasswordRetype=Retype your password
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Brezi orar (pёrdorues)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/sq_AL/modulebuilder.lang b/htdocs/langs/sq_AL/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/sq_AL/modulebuilder.lang
+++ b/htdocs/langs/sq_AL/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 34a479ceafa..12dafabbee8 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/sq_AL/partnership.lang
index 16961446e27..9a6ac1101c0 100644
--- a/htdocs/langs/sq_AL/partnership.lang
+++ b/htdocs/langs/sq_AL/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/sq_AL/productbatch.lang
+++ b/htdocs/langs/sq_AL/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 052d649223b..e8929189136 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 632ce803a62..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,3 +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/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index 5599b770064..2e7db31ac25 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/sq_AL/stripe.lang b/htdocs/langs/sq_AL/stripe.lang
index a40c8e67339..a3cc6e6a822 100644
--- a/htdocs/langs/sq_AL/stripe.lang
+++ b/htdocs/langs/sq_AL/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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=Mёnyra e pagesёs
@@ -28,7 +28,6 @@ AccountParameter=Parametrat e llogarisё
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
index 6d22617b3b6..1b18584b316 100644
--- a/htdocs/langs/sq_AL/withdrawals.lang
+++ b/htdocs/langs/sq_AL/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index f0e2e29b00a..ba595027daf 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Greška, ne možete opbrisati ovaj računovodstveni nalog, jer  je u upotrebi
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
@@ -387,7 +387,8 @@ 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=Opseg knjižnih računa
 Calculated=Calculated
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index a7335ff96b9..5c19513a263 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Osnova
 Version=Verzija
 Publisher=Publisher
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Pročitaj troškove (Vaše i Vašeg tima)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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=Obriši zahteve za odsustvo
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Podešavanja zahteva za odsustvo (podešavanja i ažuriranje stanja)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Primalac
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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=Boja linkova
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
index b588ca2915c..0279c350ad4 100644
--- a/htdocs/langs/sr_RS/banks.lang
+++ b/htdocs/langs/sr_RS/banks.lang
@@ -32,7 +32,7 @@ RIB=Broj bankovnog računa
 IBAN=IBAN broj
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Država računa
 BankAccountOwner=Ime vlasnika računa
 BankAccountOwnerAddress=Adresa vlasnika računa
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Kreiraj račun
 NewBankAccount=Novi račun
 NewFinancialAccount=Nov finansijski račun
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/bookmarks.lang b/htdocs/langs/sr_RS/bookmarks.lang
index d19af165983..0d47f94e3e1 100644
--- a/htdocs/langs/sr_RS/bookmarks.lang
+++ b/htdocs/langs/sr_RS/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Behaviour when a bookmark URL is selected
 CreateBookmark=Kreiraj marker
 SetHereATitleForLink=Set a name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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=Uređivanje markera
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index eeb380e7a65..f0833945290 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ VATIntraCheck=Proveri
 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">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Provera nije moguća. Servis nije dostupan za datu državu (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
index a39b8cffc44..f1b909b9fc6 100644
--- a/htdocs/langs/sr_RS/compta.lang
+++ b/htdocs/langs/sr_RS/compta.lang
@@ -170,8 +170,9 @@ 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 su bruto iznosi
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- Sadrži realne uplate računa, troškova, PDV-a i zarada.<br>- Zasniva se na datumima isplate računa, troškova, PDV-a i zarada. Za donacije se zasniva na datumu donacije.
+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.
@@ -295,3 +296,5 @@ 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/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index 4f9bd8dc78d..ce3cbc6b148 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -27,7 +27,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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Greška prilikom čitanja RSS-a. Pokušajte da dodate k
 ErrorForbidden=Zabranjen pristup.<br>Pokušali ste da pristupite sadržaju deaktiviranog modula ili Vaš korisnik nema potrebna prava za pristup.
 ErrorForbidden2=Prava za ovog korisnik mogu biti definisana od strane administratora u meniju %s->%s.
 ErrorForbidden3=Izgleda da niste pristupili Dolibarr-u preko autentifikovane sesije. Proverite dokumentaciju podešavanja da biste videli kako se podešavaju autentifikacije (htaccess, mod_auth i dr.).
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=Klasa Imagick nije nađena u PHP-u. Prikaz nije dostupan. Administratori mogu da deaktiviraju ovaj tab iz Podešavanja - Prikaz.
 ErrorRecordAlreadyExists=Linija već postoji
 ErrorLabelAlreadyExists=This label already exists
@@ -271,6 +274,9 @@ 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.
@@ -312,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/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/holiday.lang b/htdocs/langs/sr_RS/holiday.lang
index 57c9163a484..c755ad5cfac 100644
--- a/htdocs/langs/sr_RS/holiday.lang
+++ b/htdocs/langs/sr_RS/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Opis
 SendRequestCP=Kreiraj zahtev za odsustvo
 DelayToRequestCP=Zahtevi za odsustvo moraju biti kreirani makar <b>%s dan(a)</b> pre odsustva.
 MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Morate selektovati kraj posle početka.
 ErrorSQLCreateCP=Došlo je do SQL greške prilikom kreacije:
 ErrorIDFicheCP=Došlo je do greške, zahtev za odsustvo ne postoji.
@@ -134,3 +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/install.lang b/htdocs/langs/sr_RS/install.lang
index e5f60b91b6b..a209d2d65e8 100644
--- a/htdocs/langs/sr_RS/install.lang
+++ b/htdocs/langs/sr_RS/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/sr_RS/main.lang
index f89c07b15c9..93c6129c492 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Greška, PDV stopa nije definisana za zeml
 ErrorNoSocialContributionForSellerCountry=Greška, nema poreskih stopa definisanih za zemlju "%s".
 ErrorFailedToSaveFile=Greška, nemoguće sačuvati fajl.
 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=Nemate prava za tu akciju.
 SetDate=Postavi datum
@@ -87,7 +88,7 @@ FileWasNotUploaded=Fajl je selektiran za prilog, ali još uvek nije uploadovan.
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Pročitajte pomoć
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Linija sačuvana
 RecordDeleted=Linija obrisana
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Return code for latest database access request error
 InformationLastAccessInError=Information for latest database access request error
 DolibarrHasDetectedError=Dolibarr je detektovao tehničku grešku
 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 remove such notices)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Više informacija
 TechnicalInformation=Tehnički podaci
 TechnicalID=Tehnički ID
@@ -211,6 +212,8 @@ User=Korisnik
 Users=Korisnici
 Group=Grupa
 Groups=Grupe
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Korisnička grupa nije definisana
 Password=Lozinka
 PasswordRetype=Ponovo unesi lozinku
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/sr_RS/modulebuilder.lang b/htdocs/langs/sr_RS/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/sr_RS/modulebuilder.lang
+++ b/htdocs/langs/sr_RS/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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/other.lang b/htdocs/langs/sr_RS/other.lang
index 5719b9f94d4..2cff1f8384a 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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
diff --git a/htdocs/langs/sr_RS/partnership.lang b/htdocs/langs/sr_RS/partnership.lang
index ad66fc2b2ca..d1f35535d8a 100644
--- a/htdocs/langs/sr_RS/partnership.lang
+++ b/htdocs/langs/sr_RS/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/sr_RS/productbatch.lang b/htdocs/langs/sr_RS/productbatch.lang
index 103d1dd59f3..20089e90aa0 100644
--- a/htdocs/langs/sr_RS/productbatch.lang
+++ b/htdocs/langs/sr_RS/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index dd09e875db1..ce21333c0a3 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Prosecna cena
 PMPValueShort=PC
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index 8cb16e61fe2..5ee78601358 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/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=Projekti sa ovim korisnikom u kontaktima
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Zadaci ovog korisnika
 ResourceNotAssignedToProject=Nije dodeljen projektu
 ResourceNotAssignedToTheTask=Nije dodeljen zadatku
@@ -284,3 +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=Kraj ne može biti pre početka
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 7b927a693f4..eabbd6ab419 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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=Fill real quantity with expected quantity
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=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
diff --git a/htdocs/langs/sr_RS/stripe.lang b/htdocs/langs/sr_RS/stripe.lang
index a80639d92a7..de2d6beff4c 100644
--- a/htdocs/langs/sr_RS/stripe.lang
+++ b/htdocs/langs/sr_RS/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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=Sledeći URL-ovi mogu omogućiti klijentu da izvrši uplatu na Dolibarr objekte
 PaymentForm=Forma za uplatu
@@ -28,7 +28,6 @@ AccountParameter=Parametri naloga
 UsageParameter=Parametri korišćenja
 InformationToFindParameters=Pomoć za pronalaženje informacije o Vašem %s nalogu
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Ime prodavca
 CSSUrlForPaymentForm=CSS url za formu za plaćanje
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/sr_RS/withdrawals.lang b/htdocs/langs/sr_RS/withdrawals.lang
index 7f38813aa92..e1c4acc6a8b 100644
--- a/htdocs/langs/sr_RS/withdrawals.lang
+++ b/htdocs/langs/sr_RS/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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=Označi kreditirano
+ClassDebited=Classify debited
 ClassCreditedConfirm=Da li ste sigurni da želite da označite ovaj račun podizanja kao kreditiran na Vašem bankovnom računu ?
 TransData=Datum prenosa
 TransMetod=Način prenosa
@@ -80,7 +82,7 @@ StatusMotif7=Pravna odluka
 StatusMotif8=Drugi razlog
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Samo kancelarija
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ ModeWarning=Opcija za realni mod nije podešena, prekidamo posle ove simulacije.
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
 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
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index f922e50eacc..96f11653851 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=Länder inte i EEG
 CountriesInEECExceptMe=Länder i EEG förutom %s
 CountriesExceptMe=Alla länder utom %s
 AccountantFiles=Exportera källdokument
-ExportAccountingSourceDocHelp=Med det här verktyget kan du exportera källhändelserna (lista i CSV och PDF-filer) som användes för att generera din redovisning.
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
 ExportAccountingSourceDocHelp2=För att exportera verifikationer, använd menyn %s - %s
 VueByAccountAccounting=Visa baserat på redovisningskonto
 VueBySubAccountAccounting=Visa efter redovisning av underkonto
@@ -286,7 +286,7 @@ ValidateMovements=Validera rörelser
 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=Automatisk bindning gjord
+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
@@ -387,7 +387,8 @@ SaleExport=Exportförsäljning
 SaleEEC=Försäljning i EEG
 SaleEECWithVAT=Försäljning i EEG med moms som inte är null, så vi antar att detta INTE är en försäljning inom gemenskapen och det föreslagna kontot är standardproduktkontot.
 SaleEECWithoutVATNumber=Försäljning i EEG utan moms men tredjeparts moms-ID definieras inte. Vi återgår till produktkontot för standardförsäljning. Du kan fastställa tredjeparts moms-ID eller produktkonto om det behövs.
-
+ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
+ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
 Range=Räckvidd av bokföringskonto
 Calculated=Beräknad
@@ -404,6 +405,7 @@ NoJournalDefined=Ingen loggbok definierad
 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
 
 ## Import
 ImportAccountingEntries=Redovisningsposter
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 0a439ad5a7e..f9d711c0215 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Stiftelse
 Version=Version
 Publisher=Utgivare
@@ -265,8 +267,8 @@ OtherResources=Andra resurser
 ExternalResources=Externa resurser
 SocialNetworks=Sociala nätverk
 SocialNetworkId=Socialt nätverks-ID
-ForDocumentationSeeWiki=För användarens eller utvecklarens dokumentation (Doc, FAQs ...), <br> ta en titt på Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
-ForAnswersSeeForum=För alla andra frågor / hjälp, kan du använda Dolibarr forumet: <br> <a href="%s" target="_blank"><b>%s</b></a>
+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=Här finns några resurser för att få hjälp och support med Dolibarr.
 HelpCenterDesc2=Några av dessa resurser finns endast i <b> engelska </b>.
 CurrentMenuHandler=Aktuell meny handler
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Senaste stabila versionen
 LastActivationDate=Senaste aktiveringsdatum
 LastActivationAuthor=Senaste aktiveringsförfattaren
 LastActivationIP=Senaste aktivering IP
+LastActivationVersion=Latest activation version
 UpdateServerOffline=Uppdatera server offline
 WithCounter=Hantera en räknare
 GenericMaskCodes=Du kan ange valfri numreringsmask. I den här masken kan följande taggar användas: <br> <b> {000000} </b> motsvarar ett nummer som kommer att ökas på varje %s. Ange så många nollor som önskad längd på räknaren. Räknaren kompletteras med nollor från vänster för att ha lika många nollor som masken. <br> <b> {000000+000} </b> samma som den föregående men en förskjutning som motsvarar numret till höger om + -tecknet tillämpas med början på den första %s. <br> <b> {000000@x} </b> samma som föregående men räknaren återställs till noll när månad x nås (x mellan 1 och 12, eller 0 för att använda de första månaderna av räkenskapsåret som definierats i din konfiguration, eller 99 till återställs till noll varje månad). Om detta alternativ används och x är 2 eller högre krävs också sekvensen {åå} {mm} eller {åååå} {mm}. <br> <b> {dd} </b> dag (01 till 31). <br> <b> {mm} </b> månad (01 till 12). <br> <b> {yy} </b>, <b> {yyyy} </b> eller <b> {y} år över 2,4 eller 1 nummer.<br>
@@ -753,7 +756,7 @@ Permission106=Exportsend
 Permission109=Ta bort sendings
 Permission111=Läs finansiella räkenskaper
 Permission112=Skapa / ändra / radera och jämför transaktioner
-Permission113=Ställ upp finansiella konton (skapa, handha kategorier)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Förena transaktioner
 Permission115=Exporttransaktioner och kontoutdrag
 Permission116=Överföringar mellan konton
@@ -762,6 +765,7 @@ Permission121=Läs tredje part kopplad till användaren
 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)
@@ -889,12 +893,11 @@ Permission701=Läs donationer
 Permission702=Skapa / ändra donationer
 Permission703=Ta bort donationer
 Permission771=Läs utgiftsrapporter (din och dina underordnade)
-Permission772=Skapa / ändra utgiftsrapporter
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Radera räkningar
-Permission774=Läs alla utgiftsrapporter (även för användare som inte underordnade)
 Permission775=Godkänn räkningar
 Permission776=Betala räkningar
-Permission777=Läs alla utgiftsrapporter
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Skapa / modifiera utgiftsrapporter för alla
 Permission779=Export räkningar
 Permission1001=Läs lager
@@ -958,15 +961,11 @@ Permission2801=Använd FTP-klient i läsläge (bläddra och ladda endast)
 Permission2802=Använd FTP-klient i skrivläge (radera eller ladda upp filer)
 Permission3200=Läs arkiverade händelser och fingeravtryck
 Permission3301=Skapa nya moduler
-Permission4001=Se anställda
-Permission4002=Skapa anställda
-Permission4003=Ta bort anställda
-Permission4004=Exportera anställda
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ Permission10005=Ta bort webbplatsinnehåll
 Permission20001=Läs ledighetsförfrågningar (din ledighet och dina underordnade)
 Permission20002=Skapa / ändra dina förfrågningar (din ledighet och dina underordnade)
 Permission20003=Radera ledighets förfrågningar
-Permission20004=Läs alla lämnar förfrågningar (även om användare inte är underordnade)
-Permission20005=Skapa / ändra ledighetsbegäran för alla (även av användare som inte är underordnade)
-Permission20006=Admins ledighetsansökan (upprätta och uppdatera balanser)
+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=Godkänn ledighetsförfrågningar
 Permission23001=Läs Planerad jobb
 Permission23002=Skapa / uppdatera Schemalagt jobb
@@ -1358,9 +1357,9 @@ BrowserIsOK=Du använder %s webbläsaren. Den här webbläsaren är ok för säk
 BrowserIsKO=Du använder %s webbläsaren. Den här webbläsaren är känd för att vara ett dåligt val för säkerhet, prestanda och tillförlitlighet. Vi rekommenderar att du använder Firefox, Chrome, Opera eller Safari.
 PHPModuleLoaded=PHP-komponenten %s är laddad
 PreloadOPCode=Förinstallerad OPCode används
-AddRefInList=Visa kund / leverantör ref. info lista (välj lista eller combobox) och de flesta av hyperlänken. <br> Tredje part kommer att visas med ett namnformat av "CC12345 - SC45678 - The Big Company corp." istället för "The Big Company Corp".
-AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=Visa adresslista för kund / leverantörs adress (välj lista eller combobox) <br> Tredje parten kommer att visas med ett namnformat för "The Big Company Corp." - 21 Jump Street 123456 Big Town - USA "istället för" The Big Company Corp ".
+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=Visa kontakt-e-post (eller telefoner om det inte är definierat) och stadsinfo-lista (välj lista eller kombinationsruta) <br> Kontakter visas med namnformatet "Dupond Durand - dupond.durand@email.com - Paris" eller "Dupond Durand - 06 07 59 65 66 - Paris "istället för" Dupond Durand ".
 AskForPreferredShippingMethod=Be om föredragen leveransmetod för tredje parter.
 FieldEdition=Edition av fält %s
@@ -1708,8 +1707,9 @@ MailingDelay=Sekunder fördröjning efter sändning av nästa meddelande
 NotificationSetup=Anmälan för e-postmeddelandemodul
 NotificationEMailFrom=Sender-e-post (Från) för e-postmeddelanden som skickas av Notifieringsmodulen
 FixedEmailTarget=Mottagare
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Inmatning av fraktmodul
 SendingsReceiptModel=Att skicka kvitto modell
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Fri text om leverans kvitton
 ##### FCKeditor #####
 AdvancedEditor=Avancerad redaktör
 ActivateFCKeditor=Aktivera FCKeditor för:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field public notes of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field private notes of elements
+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 skapande / utgåva av produktdetaljer för alla enheter (förslag, order, fakturor, etc ...). <span class="warning"> Varning: Att använda det här alternativet i det här fallet rekommenderas på allvar inte eftersom det kan skapa problem med specialtecken och sidformatering när du bygger PDF-filer. </span>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Inställning av modul Utläggsrapportsregler
 ExpenseReportNumberingModules=Modul för utläggsrapporteringsnummer
 NoModueToManageStockIncrease=Ingen modul kunna hantera automatiska lagerökningen har aktiverats. Stock ökning kommer att ske på bara manuell inmatning.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Du kan hitta alternativ för e-postmeddelanden genom att aktivera och konfigurera modulen "Meddelande".
+TemplatesForNotifications=Templates for notifications
 ListOfNotificationsPerUser=Lista över automatiska aviseringar per användare *
 ListOfNotificationsPerUserOrContact=Lista över möjliga automatiska aviseringar (på affärshändelse) tillgängliga per användare * eller per kontakt **
 ListOfFixedNotifications=Lista över automatiska fasta aviseringar
@@ -1916,6 +1917,8 @@ 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)
+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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Vill du springa samlingen för den här samlaren nu
 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)
-RecordEvent=Spela in e-post händelse
-CreateLeadAndThirdParty=Skapa ledning (och tredje part om det behövs)
-CreateTicketAndThirdParty=Skapa biljett (och länka till tredje part om den laddades av en tidigare operation)
+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=Senaste resultatkoden
 NbOfEmailsInInbox=Antal e-postmeddelanden i källkatalogen
 LoadThirdPartyFromName=Ladda tredjepartsökning på %s (endast belastning)
 LoadThirdPartyFromNameOrCreate=Ladda tredjepartsökning på %s (skapa om ej hittad)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Meddelande från en konversation initierad av ett första e-postmeddelande skickat från Dolibarr
 WithoutDolTrackingID=Meddelande från en konversation initierad av ett första e-postmeddelande som INTE skickades från Dolibarr
 WithDolTrackingIDInMsgId=Meddelande skickat från Dolibarr
@@ -2078,7 +2082,7 @@ CreateCandidature=Skapa jobbansökan
 FormatZip=Zip
 MainMenuCode=Menyinmatningskod (huvudmeny)
 ECMAutoTree=Visa automatiskt ECM-träd
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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=Öppettider
 OpeningHoursDesc=Ange här företagets vanliga öppettider.
 ResourceSetup=Konfiguration av resursmodulen
@@ -2124,7 +2128,7 @@ LargerThan=Större än
 IfTrackingIDFoundEventWillBeLinked=Observera att om ett spårnings-ID för ett objekt hittas i e-post, eller om e-postmeddelandet är ett svar på ett e-postområde som samlas in och länkas till ett objekt, kommer den skapade händelsen automatiskt att länkas till det kända relaterade objektet.
 WithGMailYouCanCreateADedicatedPassword=Med ett GMail-konto, om du aktiverade valet av 2 steg, rekommenderas att du skapar ett dedikerat andra lösenord för programmet istället för att använda ditt eget lösenordsord från https://myaccount.google.com/.
 EmailCollectorTargetDir=Det kan vara ett önskat beteende att flytta e-postmeddelandet till en annan tagg / katalog när den bearbetades framgångsrikt. Ange bara namnet på katalogen här för att använda den här funktionen (Använd INTE specialtecken i namnet). Observera att du också måste använda ett inloggningskonto för läs / skriv.
-EmailCollectorLoadThirdPartyHelp=Du kan använda den här åtgärden för att använda e-postinnehållet för att hitta och ladda en befintlig tredje part i din databas. Den hittade (eller skapade) tredje parten kommer att användas för följande åtgärder som behöver det. <br> Om du till exempel vill skapa en tredje part med ett namn extraherat en sträng 'Namn: namn att hitta' hittat i kroppen, använd avsändarens e-post som e-post, kan du ställa in parametervältet så här: <br> 'e-post = HEADER: ^ Från: (. *); Namn = EXTRAKT: BODY: Namn: \\ s ([^ \\ s] *); klient = SET: 2; ' <br>
+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=Slutpunkt för %s: %s
 DeleteEmailCollector=Ta bort e-postsamlare
 ConfirmDeleteEmailCollector=Är du säker på att du vill ta bort denna e-postsamlare?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index 3b2348ded42..de6c498b4e7 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -32,7 +32,7 @@ RIB=Bankkontonummer
 IBAN=IBAN-nummer
 BIC=BIC / SWIFT-kod
 SwiftValid=BIC / SWIFT giltig
-SwiftVNotalid=BIC / SWIFT är ej giltigt
+SwiftNotValid=BIC / SWIFT är ej giltigt
 IbanValid=BAN giltig
 IbanNotValid=BAN är ej giltigt
 StandingOrders=Direkt debiteringsorder
@@ -49,7 +49,6 @@ BankAccountDomiciliation=bankadress
 BankAccountCountry=Konto land
 BankAccountOwner=Konto ägare namn
 BankAccountOwnerAddress=Konto ägare adress
-RIBControlError=Integritetscheck av värden misslyckades. Det betyder att informationen för detta kontonummer inte är fullständigt eller felaktigt (kontrollera land, nummer och IBAN).
 CreateAccount=Skapa konto
 NewBankAccount=Nytt konto
 NewFinancialAccount=Nya finansiella konto
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index f99badbc3c4..808c8ee481d 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
@@ -280,6 +279,7 @@ SetMode=Ange betalningstyp
 SetRevenuStamp=Ställ in intäktsstämpel
 Billed=Fakturerade
 RecurringInvoices=Återkommande fakturor
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Fakturamall
 RepeatableInvoices=Fakturamallar
 Repeatable=Mall
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bankutkast
 PaymentTypeShortTRA=Utkast
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
+PaymentTypeDC=Debet / Kreditkort
+PaymentTypePP=PayPal
 BankDetails=Bankuppgifter
 BankCode=Bankkod
 DeskCode=Gren-kod
@@ -604,3 +606,4 @@ 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
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/bookmarks.lang b/htdocs/langs/sv_SE/bookmarks.lang
index d2fb9a3bf88..a2d9ee52ab8 100644
--- a/htdocs/langs/sv_SE/bookmarks.lang
+++ b/htdocs/langs/sv_SE/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Beteende när en bokmärkes-URL är vald
 CreateBookmark=Skapa bokmärke
 SetHereATitleForLink=Ange ett namn för bokmärket
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Använd en extern / absolut länk (https: // URL) eller en intern / relativ länk (/ DOLIBARR_ROOT / htdocs / ...)
+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=Välj om den länkade sidan ska öppnas i den aktuella fliken eller en ny flik
 BookmarksManagement=Förvaltning av bokmärken förvaltning
 BookmarksMenuShortCut=Ctrl + Skift + m
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 52c48d36e0f..9e3193919f7 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -157,6 +157,18 @@ 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 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Kontrollera
 VATIntraCheckDesc=Moms-ID måste innehålla land prefix. Länken <b> %s </b> använder den europeiska mervärdesskattjänsten (VIES) som kräver internetåtkomst från Dolibarr-servern.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Kontrollera momsnumret inom gemenskapen på Europeiska kommissionens webbplats
-VATIntraManualCheck=Du kan också kontrollera manuellt på Europeiska kommissionens webbplats <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Kontroll inte möjlig. Kontrollera om tjänsten tillhandahålls av medlemsstaten (%s).
 NorProspectNorCustomer=Inte utsikter, eller kund
 JuridicalStatus=Typ av affärsenhet
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index c502c52bc67..2db0b767ed6 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -170,8 +170,9 @@ SeeReportInInputOutputMode=Se <b> %sanalys av betalningar%s </b> för en beräkn
 SeeReportInDueDebtMode=Se <b> %sanalys av registrerade dokument %s</b> för en beräkning baserad på kända <b>registrerade dokument</b> även om de ännu inte redovisas i huvudboken
 SeeReportInBookkeepingMode=Se <b> %sanalys av bokföringsboken table%s </b> för en rapport baserad på <b> Bokföringsbokstabell </b>
 RulesAmountWithTaxIncluded=- Belopp som visas är med alla skatter inkluderade
-RulesResultDue=- Det inkluderar utestående fakturor, utgifter, moms, donationer oavsett om de betalas eller inte. Inkluderar även betalda löner. <br> - Den baseras på faktureringsdatum för fakturor och på förfallodatum för kostnader eller skattebetalningar. För löner definierade med lönemodulen används betalningsdatumet.
-RulesResultInOut=- Det inkluderar de reala betalningarna på fakturor, utgifter, moms och löner. <br> - Det baseras på fakturadatum för fakturor, utgifter, moms och löner. Donationsdatum för donation.
+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=- Det inkluderar kundens förfallna fakturor, oavsett om de betalas eller inte. <br> - Det är baserat på faktureringsdatum för dessa fakturor. <br>
 RulesCAIn=- Det inkluderar alla effektiva betalningar av fakturor som mottagits från kunder. <br> - Det är baserat på betalningsdatum för dessa fakturor <br>
 RulesCATotalSaleJournal=Den innehåller alla kreditlinjer från försäljningsloggboken.
@@ -295,3 +296,5 @@ 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/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index c9653549ca7..6eac66b349a 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -27,7 +27,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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Inte få RSS-flöde. Försök att lägga konstant MAIN_
 ErrorForbidden=Tillträde beviljas ej. <br> Du försöker komma åt en sida, ett område eller en funktion av en inaktiverad modul eller utan att vara i en autentiserad session eller det är inte tillåtet för din användare.
 ErrorForbidden2=Tillstånd för den här inloggningen kan definieras av din Dolibarr administratör från menyn %s-> %s.
 ErrorForbidden3=Det verkar som Dolibarr inte används genom en bestyrkt session. Ta en titt på Dolibarr inställning dokumentation för att veta hur man ska hantera verifieringar (htaccess, mod_auth eller andra ...).
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=Funktion imagick_readimage finns inte i denna PHP. Ingen förhandsgranskning kan vara tillgängliga. Administratörer kan inaktivera den här fliken från menyn Setup - Display.
 ErrorRecordAlreadyExists=Record finns redan
 ErrorLabelAlreadyExists=Denna etikett finns redan
@@ -271,6 +274,9 @@ 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
 
 # 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.
@@ -312,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/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/holiday.lang b/htdocs/langs/sv_SE/holiday.lang
index ab3dd896220..f216ac98992 100644
--- a/htdocs/langs/sv_SE/holiday.lang
+++ b/htdocs/langs/sv_SE/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Beskrivning
 SendRequestCP=Skapa permission begäran
 DelayToRequestCP=Lämna begäran måste göras <b>minst %s dag (ar) </b> före dem.
 MenuConfCP=Lönebalans
-SoldeCPUser=Lånebalansen är <b> %s </b> dagar.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Du måste välja ett slutdatum senare än startdatum.
 ErrorSQLCreateCP=Ett SQL-fel uppstod under skapandet:
 ErrorIDFicheCP=Ett fel har uppstått, inte existerar begäran ledighet.
@@ -134,3 +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/install.lang b/htdocs/langs/sv_SE/install.lang
index a95eaa82431..b2a27d88380 100644
--- a/htdocs/langs/sv_SE/install.lang
+++ b/htdocs/langs/sv_SE/install.lang
@@ -21,6 +21,7 @@ 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.
diff --git a/htdocs/langs/sv_SE/knowledgemanagement.lang b/htdocs/langs/sv_SE/knowledgemanagement.lang
index d2519b503b9..de1b5b17445 100644
--- a/htdocs/langs/sv_SE/knowledgemanagement.lang
+++ b/htdocs/langs/sv_SE/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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)
 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/main.lang b/htdocs/langs/sv_SE/main.lang
index 508a0763793..3ab6e851b6d 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Fel, ingen moms har definierats för lande
 ErrorNoSocialContributionForSellerCountry=Fel, ingen social / skatteskatt typ definierad för land "%s".
 ErrorFailedToSaveFile=Fel, kunde inte spara filen.
 ErrorCannotAddThisParentWarehouse=Du försöker lägga till ett förälderlager som redan är ett barn i ett befintligt lager
+FieldCannotBeNegative=Fältet "%s" får inte vara negativt
 MaxNbOfRecordPerPage=Max. Antal poster per sida
 NotAuthorized=Du har inte behörighet att göra det.
 SetDate=Ställ in datum
@@ -87,7 +88,7 @@ FileWasNotUploaded=En fil är vald att bifogas, men har ännu inte laddats upp.
 NbOfEntries=Antal poster
 GoToWikiHelpPage=Läs onlinehjälp (Internet behövs)
 GoToHelpPage=Läs hjälpen
-DedicatedPageAvailable=Det finns en särskild hjälpsida relaterad till din nuvarande skärm
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Webbsida
 RecordSaved=Post sparades
 RecordDeleted=Post raderad
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Returkod för senaste databasåtkomstbegäran
 InformationLastAccessInError=Information för senaste databasåtkomstbegäran
 DolibarrHasDetectedError=Dolibarr har upptäckt ett tekniskt fel
 YouCanSetOptionDolibarrMainProdToZero=Du kan läsa loggfilen eller ange alternativ $ dolibarr_main_prod till '0' i din config-fil för att få mer information.
-InformationToHelpDiagnose=Denna information kan vara användbar för diagnostiska ändamål (du kan ange alternativ $ dolibarr_main_prod till '1' för att ta bort sådana meddelanden)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Mer information
 TechnicalInformation=Teknisk information
 TechnicalID=Tekniskt ID
@@ -211,6 +212,8 @@ User=Användare
 Users=Användare
 Group=Grupp
 Groups=Grupper
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Ingen användargrupp är definerad
 Password=Lösenord
 PasswordRetype=Ange ditt lösenord
@@ -906,7 +909,7 @@ ViewFlatList=Visa plattlista
 ViewAccountList=Visa huvudbok
 ViewSubAccountList=Visa underkontokonto
 RemoveString=Ta bort strängen '%s'
-SomeTranslationAreUncomplete=Några av de språk som erbjuds kan bara översättas delvis eller kan innehålla fel. Snälla hjälp att korrigera ditt språk genom att registrera dig på <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> för att lägga till dina förbättringar.
+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=Offentlig nedladdningslänk
 PublicDownloadLinkDesc=Endast länken krävs för att ladda ner filen
 DirectDownloadInternalLink=Privat nedladdningslänk
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Kund tidzon (användare)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/sv_SE/modulebuilder.lang b/htdocs/langs/sv_SE/modulebuilder.lang
index 8d3cb00e89e..70542db290e 100644
--- a/htdocs/langs/sv_SE/modulebuilder.lang
+++ b/htdocs/langs/sv_SE/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Detta verktyg får endast användas av erfarna användare eller utvecklare. Det ger verktyg för att bygga eller redigera din egen modul. Dokumentation för alternativ <a href="%s" target="_blank"> manuell utveckling finns här </a>.
+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.
 ModuleBuilderDesc2=Vägen där moduler genereras / redigeras (första katalogen för externa moduler definierad i %s): <strong> %s </strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Menyerna som tillhandahålls av din modul / applikation defi
 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).
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
+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=Se ID-er som används i din installation
 SeeReservedIDsRangeHere=Se utbud av reserverade ID-skivor
 ToolkitForDevelopers=Verktygssats för Dolibarr-utvecklare
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/other.lang b/htdocs/langs/sv_SE/other.lang
index 98e16ff7e9f..b7d29a856ec 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Lösenordskodning
 PermissionsAdd=Tillstånd tillagda
 PermissionsDelete=Tillstånden har tagits bort
 YourPasswordMustHaveAtLeastXChars=Ditt lösenord måste ha minst <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=Ditt lösenord har återställts framgångsrikt
 ApplicantIpAddress=Sökandens IP-adress
 SMSSentTo=SMS skickat till %s
@@ -268,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
diff --git a/htdocs/langs/sv_SE/partnership.lang b/htdocs/langs/sv_SE/partnership.lang
index e574c5a5173..18c772f1f50 100644
--- a/htdocs/langs/sv_SE/partnership.lang
+++ b/htdocs/langs/sv_SE/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Partnerskapshantering
 PartnershipDescription=Partnerskapshanteringsmodul
 PartnershipDescriptionLong= Partnerskapshanteringsmodul
-
+Partnership=Partnership
 AddPartnership=Lägg till partnerskap
 CancelPartnershipForExpiredMembers=Partnerskap: Avbryt partnerskap med inaktiva abonnemang
 PartnershipCheckBacklink=Partnerskap: Kontrollera hänvisningslänk
diff --git a/htdocs/langs/sv_SE/productbatch.lang b/htdocs/langs/sv_SE/productbatch.lang
index 32a37e56056..054285c62e2 100644
--- a/htdocs/langs/sv_SE/productbatch.lang
+++ b/htdocs/langs/sv_SE/productbatch.lang
@@ -30,7 +30,7 @@ ManageLotMask=Anpassad mask
 CustomMasks=Möjlighet att definiera en annan numreringsmask för varje produkt
 BatchLotNumberingModules=Numreringsregel för automatisk generering av partinummer
 BatchSerialNumberingModules=Numreringsregel för automatisk generering av serienummer (för produkter med egendom 1 unikt parti / serienummer för varje produkt)
-QtyToAddAfterBarcodeScan=Antal att lägga till för varje streckkod/parti/serienummer skannat
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Livslängd (i dagar)
 EndOfLife=Livslängd
 ManufacturingDate=Tillverkningsdatum
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Ej tillgänglig
 InWorkingOrder=I fungerande skick
+ToReplace=Replace
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 84e94beaba8..94f608e7855 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Vägda genomsnittliga priset
 PMPValueShort=WAP
 mandatoryperiod=Obligatoriska perioder
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=En tjänst kräver en start- och slutperiod
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+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=Standard BOM
 DefaultBOMDesc=Standard BOM som rekommenderas att använda för att tillverka denna produkt. Detta fält kan endast ställas in om produktens natur är '%s'.
 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 04e2b5e2412..2a65f8922ba 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -197,6 +197,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
@@ -284,3 +285,5 @@ 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
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 e94b8b4f669..75e2cedb2dc 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Lagergräns för varning och önskat optimalt lager
 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
 InventoryDate=Lagerdatum
+Inventories=Inventories
 NewInventory=Ny inventering
 inventorySetup = Inventory Setup
 inventoryCreatePermission=Skapa ny inventering
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Lagerrörelser kommer att ha datum
 inventoryChangePMPPermission=Tillåt att ändra PMP-värde för en produkt
 ColumnNewPMP=Ny enhet PMP
 OnlyProdsInStock=Lägg inte till produkten utan lager
-TheoricalQty=Teoretisk mängd
-TheoricalValue=Teoretisk mängd
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Senaste BP
 CurrentPA=Curent BP
 RecordedQty=Registrerad antal
@@ -240,7 +241,7 @@ StockAtDatePastDesc=Du kan se aktien (verkligt lager) vid ett visst datum tidiga
 StockAtDateFutureDesc=Du kan se aktien (virtuellt lager) vid ett visst datum i framtiden
 CurrentStock=Nuvarande lager
 InventoryRealQtyHelp=Ställ in värdet till 0 för att återställa antal <br> Håll fältet tomt eller ta bort rad för att hålla oförändrad
-UpdateByScaning=Fyll i riktigt antal genom att skanna
+UpdateByScaning=Complete real qty by scaning
 UpdateByScaningProductBarcode=Uppdatera med skanning (produktstreckkod)
 UpdateByScaningLot=Uppdatera med skanning (parti | seriell streckkod)
 DisableStockChangeOfSubProduct=Inaktivera lagerförändringen för alla delprodukter i detta kit under denna rörelse.
@@ -253,14 +254,20 @@ 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=Fyll den verkliga kvantiteten med förväntad kvantitet
+AutofillWithExpected=Replace 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
-FieldCannotBeNegative=Fältet "%s" får inte vara negativt
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=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
diff --git a/htdocs/langs/sv_SE/stripe.lang b/htdocs/langs/sv_SE/stripe.lang
index 05bc194bca8..ff0b4050f5e 100644
--- a/htdocs/langs/sv_SE/stripe.lang
+++ b/htdocs/langs/sv_SE/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe modul inställning
-StripeDesc=Erbjud kunderna en Stripe online betalningssida för betalningar med kredit- / bankkort via <a href="http://www.stripe.com" target="_blank"> Stripe </a>. Detta kan användas för att dina kunder ska kunna göra ad hoc-betalningar eller för betalningar relaterade till ett visst Dolibarr-objekt (faktura, order, ...)
+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=Betala med kreditkort eller Stripe
 FollowingUrlAreAvailableToMakePayments=Följande webbadresser finns att erbjuda en sida till en kund att göra en förskottsbetalning Dolibarr objekt
 PaymentForm=Inbetalningskort
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index ff843535c95..ce1586583eb 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Kreditöverföringsorder
 LatestBankTransferReceipts=Senaste %s kreditöverföringsorder
 LastWithdrawalReceipts=Senaste %s direkt debit-filer
 WithdrawalsLine=Direkt debiteringsorder
+CreditTransfer=Kreditöverföring
 CreditTransferLine=Kreditöverföringslinje
 WithdrawalsLines=Direktbetalningsorder
 CreditTransferLines=Kreditöverföringslinjer
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Tredjeparts bankkod
 NoInvoiceCouldBeWithdrawed=Ingen faktura debiteras framgångsrikt. Kontrollera att fakturor är på företag med en giltig IBAN och att IBAN har en UMR (Unique Mandate Reference) med läget <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=Detta uttagskvitto är redan markerat som krediterat. detta kan inte göras två gånger, eftersom detta potentiellt skulle kunna skapa dubbla betalningar och bankposter.
 ClassCredited=Märk krediterad
+ClassDebited=Classify debited
 ClassCreditedConfirm=Är du säker på att du vill märka detta tillbakadragande mottagande som krediteras på ditt bankkonto?
 TransData=Datum Transmission
 TransMetod=Metod Transmission
@@ -80,7 +82,7 @@ StatusMotif7=Rättsligt beslut
 StatusMotif8=Annan orsak
 CreateForSepaFRST=Skapa direkt debitfil (SEPA FRST)
 CreateForSepaRCUR=Skapa direkt debitfil (SEPA RCUR)
-CreateAll=Skapa direkt debitfil (alla)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Skapa fil för kreditöverföring
 CreateSepaFileForPaymentByBankTransfer=Skapa kreditöverföringsfil (SEPA)
 CreateGuichet=Endast kontor
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Det gick inte att skapa en direkt debitering för
 SepaMandate=SEPA-direkt debiteringsmandat
 SepaMandateShort=SEPA-mandat
 PleaseReturnMandate=Vänligen returnera detta mandatformulär via e-post till %s eller via mail till
-SEPALegalText=Genom att underteckna det här mandatet godkänner du (A) %s att skicka instruktioner till din bank för att debitera ditt konto och (B) din bank att debitera ditt konto i enlighet med instruktionerna från %s. Som en del av dina rättigheter har du rätt till återbetalning från din bank enligt villkoren för ditt avtal med din bank. Återbetalning måste krävas inom 8 veckor från och med det datum då ditt konto debiterades. Dina rättigheter avseende ovanstående mandat förklaras i ett uttalande som du kan få från din bank.
+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=Kreditgivarens namn
 SEPAFillForm=(B) Vänligen fyll i alla fält markerade *
@@ -150,3 +152,5 @@ ModeWarning=Alternativ på riktigt läget inte var satt, sluta vi efter denna si
 ErrorCompanyHasDuplicateDefaultBAN=Företag med id %s har mer än ett standardbankkonto. Inget sätt att veta vilken man ska använda.
 ErrorICSmissing=Saknar ICS på bankkonto %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Det totala beloppet för direktdebitering skiljer sig från summan av rader
+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
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index c20e0a339f6..8bc4b54a090 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 8e38468846c..d79adb1e960 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Version
 Publisher=Publisher
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang
index 6c770163f29..f066877f676 100644
--- a/htdocs/langs/sw_SW/banks.lang
+++ b/htdocs/langs/sw_SW/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/sw_SW/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/sw_SW/bookmarks.lang
+++ b/htdocs/langs/sw_SW/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index 97b990f62b4..640a229b7f2 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/sw_SW/holiday.lang
index 0527f4c0788..3d0ae64be0f 100644
--- a/htdocs/langs/sw_SW/holiday.lang
+++ b/htdocs/langs/sw_SW/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/sw_SW/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/sw_SW/install.lang
+++ b/htdocs/langs/sw_SW/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/sw_SW/main.lang
index 7124b2d7b1b..2d850927782 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ 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
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/sw_SW/modulebuilder.lang b/htdocs/langs/sw_SW/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/sw_SW/modulebuilder.lang
+++ b/htdocs/langs/sw_SW/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 9bc68dc3678..49ff93dd589 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/sw_SW/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/sw_SW/partnership.lang
+++ b/htdocs/langs/sw_SW/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/sw_SW/productbatch.lang b/htdocs/langs/sw_SW/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/sw_SW/productbatch.lang
+++ b/htdocs/langs/sw_SW/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 205a28980a8..14715670882 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index 5a2911bac0b..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,3 +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/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index a2a335be8f6..599c9649b18 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/sw_SW/stripe.lang b/htdocs/langs/sw_SW/stripe.lang
index 844762040af..2c95bcfce27 100644
--- a/htdocs/langs/sw_SW/stripe.lang
+++ b/htdocs/langs/sw_SW/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/sw_SW/withdrawals.lang b/htdocs/langs/sw_SW/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/sw_SW/withdrawals.lang
+++ b/htdocs/langs/sw_SW/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/ta_IN/accountancy.lang b/htdocs/langs/ta_IN/accountancy.lang
new file mode 100644
index 00000000000..29118290f60
--- /dev/null
+++ b/htdocs/langs/ta_IN/accountancy.lang
@@ -0,0 +1,437 @@
+# Dolibarr language file - en_US - Accountancy (Double entries)
+Accountancy=கணக்கியல்
+Accounting=கணக்கியல்
+ACCOUNTING_EXPORT_SEPARATORCSV=ஏற்றுமதி கோப்புக்கான நெடுவரிசை பிரிப்பான்
+ACCOUNTING_EXPORT_DATE=ஏற்றுமதி கோப்புக்கான தேதி வடிவம்
+ACCOUNTING_EXPORT_PIECE=துண்டுகளின் எண்ணிக்கையை ஏற்றுமதி செய்யவும்
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=உலகளாவிய கணக்குடன் ஏற்றுமதி செய்யுங்கள்
+ACCOUNTING_EXPORT_LABEL=ஏற்றுமதி லேபிள்
+ACCOUNTING_EXPORT_AMOUNT=ஏற்றுமதி தொகை
+ACCOUNTING_EXPORT_DEVISE=ஏற்றுமதி நாணயம்
+Selectformat=கோப்பிற்கான வடிவமைப்பைத் தேர்ந்தெடுக்கவும்
+ACCOUNTING_EXPORT_FORMAT=கோப்பிற்கான வடிவமைப்பைத் தேர்ந்தெடுக்கவும்
+ACCOUNTING_EXPORT_ENDLINE=வண்டி திரும்பும் வகையைத் தேர்ந்தெடுக்கவும்
+ACCOUNTING_EXPORT_PREFIX_SPEC=கோப்பு பெயருக்கான முன்னொட்டைக் குறிப்பிடவும்
+ThisService=இந்த சேவை
+ThisProduct=இந்த தயாரிப்பு
+DefaultForService=சேவைக்கான இயல்புநிலை
+DefaultForProduct=தயாரிப்புக்கான இயல்புநிலை
+ProductForThisThirdparty=இந்த மூன்றாம் தரப்பினருக்கான தயாரிப்பு
+ServiceForThisThirdparty=இந்த மூன்றாம் தரப்பினருக்கான சேவை
+CantSuggest=பரிந்துரைக்க முடியாது
+AccountancySetupDoneFromAccountancyMenu=கணக்குப்பதிவின் பெரும்பாலான அமைப்பு %s மெனுவில் இருந்து செய்யப்படுகிறது
+ConfigAccountingExpert=தொகுதி கணக்கியலின் கட்டமைப்பு (இரட்டை நுழைவு)
+Journalization=இதழியல்
+Journals=இதழ்கள்
+JournalFinancial=நிதி இதழ்கள்
+BackToChartofaccounts=கணக்குகளின் விளக்கப்படம் திரும்பவும்
+Chartofaccounts=கணக்குகளின் விளக்கப்படம்
+ChartOfSubaccounts=தனிப்பட்ட கணக்குகளின் விளக்கப்படம்
+ChartOfIndividualAccountsOfSubsidiaryLedger=துணை லெட்ஜரின் தனிப்பட்ட கணக்குகளின் விளக்கப்படம்
+CurrentDedicatedAccountingAccount=தற்போதைய பிரத்யேக கணக்கு
+AssignDedicatedAccountingAccount=ஒதுக்க புதிய கணக்கு
+InvoiceLabel=விலைப்பட்டியல் லேபிள்
+OverviewOfAmountOfLinesNotBound=கணக்கியல் கணக்கிற்கு கட்டுப்படாத வரிகளின் அளவு பற்றிய கண்ணோட்டம்
+OverviewOfAmountOfLinesBound=கணக்கியல் கணக்கிற்கு ஏற்கனவே பிணைக்கப்பட்ட வரிகளின் அளவு பற்றிய கண்ணோட்டம்
+OtherInfo=பிற தகவல்
+DeleteCptCategory=குழுவிலிருந்து கணக்கியல் கணக்கை அகற்றவும்
+ConfirmDeleteCptCategory=கணக்கியல் கணக்குக் குழுவிலிருந்து இந்தக் கணக்கியல் கணக்கை நிச்சயமாக அகற்ற விரும்புகிறீர்களா?
+JournalizationInLedgerStatus=பத்திரிகை நிலை
+AlreadyInGeneralLedger=ஏற்கனவே கணக்கியல் இதழ்கள் மற்றும் லெட்ஜருக்கு மாற்றப்பட்டுள்ளது
+NotYetInGeneralLedger=கணக்குப் பத்திரிக்கைகள் மற்றும் லெட்ஜருக்கு இன்னும் மாற்றப்படவில்லை
+GroupIsEmptyCheckSetup=குழு காலியாக உள்ளது, தனிப்பயனாக்கப்பட்ட கணக்கியல் குழுவின் அமைப்பைச் சரிபார்க்கவும்
+DetailByAccount=கணக்கு மூலம் விவரங்களைக் காட்டு
+AccountWithNonZeroValues=பூஜ்ஜியமற்ற மதிப்புகளைக் கொண்ட கணக்குகள்
+ListOfAccounts=கணக்குகளின் பட்டியல்
+CountriesInEEC=EEC இல் உள்ள நாடுகள்
+CountriesNotInEEC=EEC இல் இல்லாத நாடுகள்
+CountriesInEECExceptMe=%s தவிர EEC இல் உள்ள நாடுகள்
+CountriesExceptMe=%s தவிர அனைத்து நாடுகளும்
+AccountantFiles=மூல ஆவணங்களை ஏற்றுமதி செய்யவும்
+ExportAccountingSourceDocHelp=இந்தக் கருவி மூலம், உங்கள் கணக்கை உருவாக்கப் பயன்படுத்தப்படும் மூல நிகழ்வுகளை (CSV மற்றும் PDFகளில் உள்ள பட்டியல்) ஏற்றுமதி செய்யலாம்.
+ExportAccountingSourceDocHelp2=உங்கள் பத்திரிகைகளை ஏற்றுமதி செய்ய, %s - %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
+VueByAccountAccounting=கணக்கு கணக்கு மூலம் பார்க்கவும்
+VueBySubAccountAccounting=கணக்கியல் துணைக் கணக்கு மூலம் பார்க்கவும்
+
+MainAccountForCustomersNotDefined=வாடிக்கையாளர்களுக்கான முதன்மை கணக்கு கணக்கு அமைப்பில் வரையறுக்கப்படவில்லை
+MainAccountForSuppliersNotDefined=விற்பனையாளர்களுக்கான பிரதான கணக்கியல் கணக்கு அமைப்பில் வரையறுக்கப்படவில்லை
+MainAccountForUsersNotDefined=பயனர்களுக்கான பிரதான கணக்கியல் கணக்கு அமைப்பில் வரையறுக்கப்படவில்லை
+MainAccountForVatPaymentNotDefined=VAT செலுத்துதலுக்கான முதன்மை கணக்கு கணக்கு அமைப்பில் வரையறுக்கப்படவில்லை
+MainAccountForSubscriptionPaymentNotDefined=சந்தா செலுத்துதலுக்கான முதன்மை கணக்கு கணக்கு அமைப்பில் வரையறுக்கப்படவில்லை
+
+AccountancyArea=கணக்கியல் பகுதி
+AccountancyAreaDescIntro=கணக்கியல் தொகுதியின் பயன்பாடு பல படிகளில் செய்யப்படுகிறது:
+AccountancyAreaDescActionOnce=பின்வரும் செயல்கள் வழக்கமாக ஒரு முறை அல்லது வருடத்திற்கு ஒரு முறை மட்டுமே செயல்படுத்தப்படும்...
+AccountancyAreaDescActionOnceBis=ஜர்னலைசேஷன் செய்யும் போது சரியான இயல்புநிலை கணக்கியல் கணக்கை பரிந்துரைப்பதன் மூலம் எதிர்காலத்தில் உங்கள் நேரத்தை மிச்சப்படுத்த அடுத்த படிகளைச் செய்ய வேண்டும் (பத்திரிகைகள் மற்றும் பொது லெட்ஜரில் பதிவு எழுதுதல்)
+AccountancyAreaDescActionFreq=பின்வரும் செயல்கள் பொதுவாக ஒவ்வொரு மாதமும், வாரம் அல்லது நாளிலும் மிகப் பெரிய நிறுவனங்களுக்குச் செயல்படுத்தப்படும்...
+
+AccountancyAreaDescJournalSetup=படி %s: %s மெனுவிலிருந்து உங்கள் பத்திரிகை பட்டியலின் உள்ளடக்கத்தை உருவாக்கவும் அல்லது சரிபார்க்கவும்
+AccountancyAreaDescChartModel=படி %s: கணக்கு விளக்கப்படத்தின் மாதிரி உள்ளதா எனச் சரிபார்க்கவும் அல்லது %s மெனுவிலிருந்து ஒன்றை உருவாக்கவும்
+AccountancyAreaDescChart=STEP %s: %s மெனுவிலிருந்து உங்கள் கணக்கின் விளக்கப்படத்தைத் தேர்ந்தெடுத்து|அல்லது முடிக்கவும்
+
+AccountancyAreaDescVat=STEP %s: ஒவ்வொரு VAT விகிதங்களுக்கும் கணக்கியல் கணக்குகளை வரையறுக்கவும். இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
+AccountancyAreaDescDefault=STEP %s: இயல்புநிலை கணக்கியல் கணக்குகளை வரையறுக்கவும். இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
+AccountancyAreaDescExpenseReport=STEP %s: ஒவ்வொரு வகையான செலவு அறிக்கைக்கும் இயல்புநிலை கணக்கியல் கணக்குகளை வரையறுக்கவும். இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
+AccountancyAreaDescSal=STEP %s: சம்பளம் செலுத்துவதற்கான இயல்புநிலை கணக்கியல் கணக்குகளை வரையறுக்கவும். இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
+AccountancyAreaDescContrib=STEP %s: சிறப்புச் செலவுகளுக்கான இயல்புநிலை கணக்கியல் கணக்குகளை வரையறுக்கவும் (இதர வரிகள்). இதற்கு, %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 என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
+
+AccountancyAreaDescBind=STEP %s: ஏற்கனவே உள்ள %s கோடுகளுக்கு இடையே உள்ள பிணைப்பைச் சரிபார்த்து, கணக்கியல் கணக்கு முடிந்தது, எனவே ஒரே கிளிக்கில் லெட்ஜரில் பரிவர்த்தனைகளை ஜர்னலிஸ் செய்ய பயன்பாடு முடியும். விடுபட்ட பிணைப்புகளை முடிக்கவும். இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
+AccountancyAreaDescWriteRecords=STEP %s: பரிவர்த்தனைகளை லெட்ஜரில் எழுதவும். இதற்கு, <strong> %s </strong> மெனுவிற்குச் சென்று, <strong> %s a0a65d07z.
+AccountancyAreaDescAnalyze=STEP %s: ஏற்கனவே உள்ள பரிவர்த்தனைகளைச் சேர்க்கவும் அல்லது திருத்தவும் மற்றும் அறிக்கைகள் மற்றும் ஏற்றுமதிகளை உருவாக்கவும்.
+
+AccountancyAreaDescClosePeriod=STEP %s: எதிர்காலத்தில் மாற்றங்களைச் செய்ய முடியாது.
+
+TheJournalCodeIsNotDefinedOnSomeBankAccount=அமைப்பில் ஒரு கட்டாயப் படி முடிக்கப்படவில்லை (அனைத்து வங்கிக் கணக்குகளுக்கும் கணக்குக் குறியீடு ஜர்னல் வரையறுக்கப்படவில்லை)
+Selectchartofaccounts=கணக்குகளின் செயலில் உள்ள விளக்கப்படத்தைத் தேர்ந்தெடுக்கவும்
+ChangeAndLoad=மாற்றவும் மற்றும் ஏற்றவும்
+Addanaccount=கணக்கியல் கணக்கைச் சேர்க்கவும்
+AccountAccounting=கணக்கியல் கணக்கு
+AccountAccountingShort=கணக்கு
+SubledgerAccount=சப்லெட்ஜர் கணக்கு
+SubledgerAccountLabel=சப்லெட்ஜர் கணக்கு லேபிள்
+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=கட்டுதல்
+LineId=ஐடி வரி
+Processing=செயலாக்கம்
+EndProcessing=செயல்முறை நிறுத்தப்பட்டது.
+SelectedLines=தேர்ந்தெடுக்கப்பட்ட வரிகள்
+Lineofinvoice=விலைப்பட்டியல் வரி
+LineOfExpenseReport=செலவு அறிக்கையின் வரி
+NoAccountSelected=கணக்கு கணக்கு எதுவும் தேர்ந்தெடுக்கப்படவில்லை
+VentilatedinAccount=கணக்கியல் கணக்கில் வெற்றிகரமாக இணைக்கப்பட்டது
+NotVentilatedinAccount=கணக்கு கணக்குக்கு கட்டுப்படவில்லை
+XLineSuccessfullyBinded=%s தயாரிப்புகள்/சேவைகள் கணக்கியல் கணக்கில் வெற்றிகரமாக இணைக்கப்பட்டுள்ளன
+XLineFailedToBeBinded=%s தயாரிப்புகள்/சேவைகள் எந்த கணக்கியல் கணக்கிற்கும் கட்டுப்படவில்லை
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=பட்டியல் மற்றும் பைண்ட் பக்கத்தில் உள்ள வரிகளின் அதிகபட்ச எண்ணிக்கை (பரிந்துரைக்கப்பட்டது: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO="செய்ய வேண்டியதைக் கட்டுப்படுத்துதல்" பக்கத்தை மிகச் சமீபத்திய கூறுகளின்படி வரிசைப்படுத்தத் தொடங்குங்கள்
+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=கணக்கியல் கணக்கின் முடிவில் வெவ்வேறு எண்ணிக்கையிலான பூஜ்ஜியங்களை நிர்வகிக்க அனுமதிக்கவும். சில நாடுகளுக்கு (சுவிட்சர்லாந்து போன்ற) தேவை. ஆஃப் (இயல்புநிலை) என அமைக்கப்பட்டால், மெய்நிகர் பூஜ்ஜியங்களைச் சேர்க்க பயன்பாட்டைக் கேட்க பின்வரும் இரண்டு அளவுருக்களை அமைக்கலாம்.
+BANK_DISABLE_DIRECT_INPUT=வங்கிக் கணக்கில் பரிவர்த்தனையின் நேரடிப் பதிவை முடக்கு
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=ஜர்னலில் வரைவு ஏற்றுமதியை இயக்கவும்
+ACCOUNTANCY_COMBO_FOR_AUX=துணைக் கணக்கிற்கான சேர்க்கை பட்டியலை இயக்கவும் (உங்களிடம் நிறைய மூன்றாம் தரப்பினர் இருந்தால் மெதுவாக இருக்கலாம், மதிப்பின் ஒரு பகுதியை தேடும் திறனை உடைக்கவும்)
+ACCOUNTING_DATE_START_BINDING=கணக்கியலில் பிணைப்பு மற்றும் பரிமாற்றத்தைத் தொடங்குவதற்கான தேதியை வரையறுக்கவும். இந்த தேதிக்கு கீழே, பரிவர்த்தனைகள் கணக்கியலுக்கு மாற்றப்படாது.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=கணக்கியல் பரிமாற்றத்தில், இயல்புநிலையாக காலக் காட்சியைத் தேர்ந்தெடுக்கவும்
+
+ACCOUNTING_SELL_JOURNAL=பத்திரிக்கையை விற்கவும்
+ACCOUNTING_PURCHASE_JOURNAL=கொள்முதல் இதழ்
+ACCOUNTING_MISCELLANEOUS_JOURNAL=இதர இதழ்
+ACCOUNTING_EXPENSEREPORT_JOURNAL=செலவு அறிக்கை இதழ்
+ACCOUNTING_SOCIAL_JOURNAL=சமூக இதழ்
+ACCOUNTING_HAS_NEW_JOURNAL=புதிய ஜர்னல் உள்ளது
+
+ACCOUNTING_RESULT_PROFIT=முடிவு கணக்கு கணக்கு (லாபம்)
+ACCOUNTING_RESULT_LOSS=முடிவு கணக்கு கணக்கு (இழப்பு)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=மூடல் இதழ்
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=இடைநிலை வங்கி பரிமாற்றத்தின் கணக்கியல் கணக்கு
+TransitionalAccount=இடைக்கால வங்கி பரிமாற்ற கணக்கு
+
+ACCOUNTING_ACCOUNT_SUSPENSE=காத்திருப்பின் கணக்கு கணக்கு
+DONATION_ACCOUNTINGACCOUNT=நன்கொடைகளை பதிவு செய்ய கணக்கு கணக்கு
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=சந்தாக்களை பதிவு செய்ய கணக்கியல் கணக்கு
+
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=வாடிக்கையாளர் வைப்புத்தொகையை பதிவு செய்ய இயல்புநிலையாக கணக்கு கணக்கு
+
+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 இலிருந்து விற்கப்பட்ட மற்றும் ஏற்றுமதி செய்யப்பட்ட சேவைகளுக்கான இயல்புநிலை கணக்கியல் கணக்கு (சேவைத் தாளில் வரையறுக்கப்படவில்லை என்றால் பயன்படுத்தப்படும்)
+
+Doctype=ஆவணத்தின் வகை
+Docdate=தேதி
+Docref=குறிப்பு
+LabelAccount=லேபிள் கணக்கு
+LabelOperation=லேபிள் செயல்பாடு
+Sens=திசையில்
+AccountingDirectionHelp=ஒரு வாடிக்கையாளரின் கணக்கியல் கணக்கிற்கு, நீங்கள் பெற்ற பேமெண்ட்டைப் பதிவு செய்ய கிரெடிட்டைப் பயன்படுத்தவும்
+LetteringCode=எழுத்து குறியீடு
+Lettering=எழுத்து
+Codejournal=இதழ்
+JournalLabel=ஜர்னல் லேபிள்
+NumPiece=துண்டு எண்
+TransactionNumShort=எண் பரிவர்த்தனை
+AccountingCategory=தனிப்பயன் குழு
+GroupByAccountAccounting=பொதுப் பேரேடு கணக்கின்படி குழுவாக்கவும்
+GroupBySubAccountAccounting=சப்லெட்ஜர் கணக்கு மூலம் குழு
+AccountingAccountGroupsDesc=கணக்கியல் கணக்கின் சில குழுக்களை நீங்கள் இங்கே வரையறுக்கலாம். தனிப்பயனாக்கப்பட்ட கணக்கியல் அறிக்கைகளுக்கு அவை பயன்படுத்தப்படும்.
+ByAccounts=கணக்குகள் மூலம்
+ByPredefinedAccountGroups=முன் வரையறுக்கப்பட்ட குழுக்களால்
+ByPersonalizedAccountGroups=தனிப்பயனாக்கப்பட்ட குழுக்களால்
+ByYear=ஆண்டு வாரியாக
+NotMatch=அமைக்கப்படவில்லை
+DeleteMvt=கணக்கியலில் இருந்து சில செயல்பாட்டு வரிகளை நீக்கவும்
+DelMonth=நீக்க வேண்டிய மாதம்
+DelYear=நீக்க வேண்டிய வருடம்
+DelJournal=நீக்க வேண்டிய இதழ்
+ConfirmDeleteMvt=இது ஆண்டு/மாதம் மற்றும்/அல்லது ஒரு குறிப்பிட்ட இதழுக்கான கணக்கியலின் அனைத்து செயல்பாட்டு வரிகளையும் நீக்கும் (குறைந்தது ஒரு அளவுகோல் தேவை). நீக்கப்பட்ட பதிவை மீண்டும் லெட்ஜரில் வைத்திருக்க '%s' அம்சத்தை நீங்கள் மீண்டும் பயன்படுத்த வேண்டும்.
+ConfirmDeleteMvtPartial=இது கணக்கியலில் இருந்து பரிவர்த்தனையை நீக்கும் (ஒரே பரிவர்த்தனை தொடர்பான அனைத்து செயல்பாட்டு வரிகளும் நீக்கப்படும்)
+FinanceJournal=நிதி இதழ்
+ExpenseReportsJournal=செலவு அறிக்கை இதழ்
+DescFinanceJournal=வங்கிக் கணக்கின் மூலம் அனைத்து வகையான பணம் செலுத்துதல்களையும் உள்ளடக்கிய நிதி இதழ்
+DescJournalOnlyBindedVisible=இது ஒரு கணக்கியல் கணக்கிற்குக் கட்டுப்பட்டு, ஜர்னல்கள் மற்றும் லெட்ஜரில் பதிவுசெய்யக்கூடிய பதிவின் பார்வையாகும்.
+VATAccountNotDefined=VATக்கான கணக்கு வரையறுக்கப்படவில்லை
+ThirdpartyAccountNotDefined=மூன்றாம் தரப்பினருக்கான கணக்கு வரையறுக்கப்படவில்லை
+ProductAccountNotDefined=தயாரிப்புக்கான கணக்கு வரையறுக்கப்படவில்லை
+FeeAccountNotDefined=கட்டணத்திற்கான கணக்கு வரையறுக்கப்படவில்லை
+BankAccountNotDefined=வங்கிக்கான கணக்கு வரையறுக்கப்படவில்லை
+CustomerInvoicePayment=விலைப்பட்டியல் வாடிக்கையாளரின் கட்டணம்
+ThirdPartyAccount=மூன்றாம் தரப்பு கணக்கு
+NewAccountingMvt=புதிய பரிவர்த்தனை
+NumMvts=பரிவர்த்தனை எண்
+ListeMvts=இயக்கங்களின் பட்டியல்
+ErrorDebitCredit=டெபிட் மற்றும் கிரெடிட் ஒரே நேரத்தில் மதிப்பைக் கொண்டிருக்க முடியாது
+AddCompteFromBK=குழுவில் கணக்கியல் கணக்குகளைச் சேர்க்கவும்
+ReportThirdParty=மூன்றாம் தரப்பு கணக்கை பட்டியலிடுங்கள்
+DescThirdPartyReport=மூன்றாம் தரப்பு வாடிக்கையாளர்கள் மற்றும் விற்பனையாளர்கள் மற்றும் அவர்களின் கணக்கியல் கணக்குகளின் பட்டியலை இங்கே பார்க்கவும்
+ListAccounts=கணக்கியல் கணக்குகளின் பட்டியல்
+UnknownAccountForThirdparty=தெரியாத மூன்றாம் தரப்பு கணக்கு. நாங்கள் %s ஐப் பயன்படுத்துவோம்
+UnknownAccountForThirdpartyBlocking=தெரியாத மூன்றாம் தரப்பு கணக்கு. தடுப்பதில் பிழை
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=சப்லெட்ஜர் கணக்கு வரையறுக்கப்படவில்லை அல்லது மூன்றாம் தரப்பு அல்லது பயனர் தெரியவில்லை. நாங்கள் %s ஐப் பயன்படுத்துவோம்
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=மூன்றாம் தரப்பினர் அறியப்படாதவர்கள் மற்றும் சப்லெட்ஜர் பணம் செலுத்துவதில் வரையறுக்கப்படவில்லை. சப்லெட்ஜர் கணக்கு மதிப்பை காலியாக வைத்திருப்போம்.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=சப்லெட்ஜர் கணக்கு வரையறுக்கப்படவில்லை அல்லது மூன்றாம் தரப்பு அல்லது பயனர் தெரியவில்லை. தடுப்பதில் பிழை.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=தெரியாத மூன்றாம் தரப்பு கணக்கு மற்றும் காத்திருப்பு கணக்கு வரையறுக்கப்படவில்லை. தடுப்பதில் பிழை
+PaymentsNotLinkedToProduct=கட்டணம் எந்த தயாரிப்பு / சேவையுடன் இணைக்கப்படவில்லை
+OpeningBalance=ஆரம்ப இருப்பு
+ShowOpeningBalance=தொடக்க இருப்பைக் காட்டு
+HideOpeningBalance=தொடக்க இருப்பை மறை
+ShowSubtotalByGroup=துணைத்தொகையை நிலை வாரியாகக் காட்டு
+
+Pcgtype=கணக்கு குழு
+PcgtypeDesc=கணக்கின் குழு சில கணக்கியல் அறிக்கைகளுக்கு முன் வரையறுக்கப்பட்ட 'வடிகட்டி' மற்றும் 'குழுப்படுத்துதல்' அளவுகோல்களாகப் பயன்படுத்தப்படுகிறது. எடுத்துக்காட்டாக, 'வருமானம்' அல்லது 'செலவு' என்பது செலவு/வருமான அறிக்கையை உருவாக்க தயாரிப்புகளின் கணக்கு கணக்குகளுக்கு குழுக்களாகப் பயன்படுத்தப்படுகிறது.
+
+Reconcilable=சமரசம் செய்யக்கூடியது
+
+TotalVente=வரிக்கு முந்தைய மொத்த விற்றுமுதல்
+TotalMarge=மொத்த விற்பனை அளவு
+
+DescVentilCustomer=ஒரு தயாரிப்பு கணக்கியல் கணக்கிற்கு இணைக்கப்பட்ட (அல்லது இல்லை) வாடிக்கையாளர் இன்வாய்ஸ் வரிகளின் பட்டியலை இங்கே பார்க்கவும்
+DescVentilMore=பெரும்பாலான சந்தர்ப்பங்களில், நீங்கள் முன் வரையறுக்கப்பட்ட தயாரிப்புகள் அல்லது சேவைகளைப் பயன்படுத்தி, தயாரிப்பு/சேவை அட்டையில் கணக்கு எண்ணை அமைத்தால், உங்கள் இன்வாய்ஸ் வரிகளுக்கும் உங்கள் கணக்கு விளக்கப்படத்தின் கணக்கியல் கணக்கிற்கும் இடையே உள்ள அனைத்து பிணைப்புகளையும் பயன்பாட்டினால் செய்ய முடியும். <strong> "%s" </strong> பொத்தானைக் கொண்டு ஒரு கிளிக் செய்யவும். தயாரிப்பு/சேவை கார்டுகளில் கணக்கு அமைக்கப்படாமல் இருந்தாலோ அல்லது கணக்கிற்குக் கட்டுப்படாத சில வரிகள் உங்களிடம் இருந்தாலோ, " <strong> %s </strong> " மெனுவிலிருந்து கைமுறையாகப் பிணைக்க வேண்டும்.
+DescVentilDoneCustomer=இன்வாய்ஸ் வாடிக்கையாளர்கள் மற்றும் அவர்களின் தயாரிப்பு கணக்கியல் கணக்கின் வரிகளின் பட்டியலை இங்கே பார்க்கவும்
+DescVentilTodoCustomer=ஏற்கனவே தயாரிப்பு கணக்கியல் கணக்குடன் பிணைக்கப்படாத விலைப்பட்டியல் வரிகளை பிணைக்கவும்
+ChangeAccount=பின்வரும் கணக்கியல் கணக்குடன் தேர்ந்தெடுக்கப்பட்ட வரிகளுக்கான தயாரிப்பு/சேவை கணக்கியல் கணக்கை மாற்றவும்:
+Vide=-
+DescVentilSupplier=ஒரு தயாரிப்பு கணக்கியல் கணக்குடன் இணைக்கப்பட்ட அல்லது இன்னும் பிணைக்கப்படாத விற்பனையாளர் விலைப்பட்டியல் வரிகளின் பட்டியலை இங்கே பார்க்கவும் (கணக்கில் ஏற்கனவே மாற்றப்படாத பதிவு மட்டுமே தெரியும்)
+DescVentilDoneSupplier=விற்பனையாளர் விலைப்பட்டியல் மற்றும் அவர்களின் கணக்கியல் கணக்கின் வரிகளின் பட்டியலை இங்கே பார்க்கவும்
+DescVentilTodoExpenseReport=கட்டணம் கணக்கியல் கணக்குடன் ஏற்கனவே பிணைக்கப்படாத செலவு அறிக்கை வரிகளை பிணைக்கவும்
+DescVentilExpenseReport=கட்டணக் கணக்குக் கணக்கிற்குக் கட்டுப்பட்ட (அல்லது இல்லை) செலவு அறிக்கை வரிகளின் பட்டியலை இங்கே பார்க்கவும்
+DescVentilExpenseReportMore=நீங்கள் அமைப்பு இழப்பில் அறிக்கை வரிகளை வகையை கணக்கு கணக்கியல் என்றால், விண்ணப்பம் பொத்தானை <strong> "%s" </strong> மூலம் ஒரே கிளிக்கில், உங்கள் இழப்பில் அறிக்கை கோடுகள் மற்றும் கணக்குகளின் தரவரிசையில் கணக்கியல் கணக்கு இடையே கட்டாயமாக ஏற்றுக் கொள்ள வேண்டுமென்ற முடியும். கட்டண அகராதியில் கணக்கு அமைக்கப்படவில்லை என்றாலோ அல்லது எந்தக் கணக்கிற்கும் கட்டுப்படாத சில வரிகள் உங்களிடம் இருந்தாலோ, " <strong> %s </strong> " மெனுவிலிருந்து கைமுறையாகப் பிணைக்க வேண்டும்.
+DescVentilDoneExpenseReport=செலவு அறிக்கைகள் மற்றும் அவற்றின் கட்டணக் கணக்குகளின் வரிகளின் பட்டியலை இங்கே பார்க்கவும்
+
+Closure=வருடாந்திர மூடல்
+DescClosure=சரிபார்க்கப்படாத மற்றும் ஏற்கனவே தொடங்கப்பட்ட நிதியாண்டுகளின் மாத இயக்கங்களின் எண்ணிக்கையை இங்கே பார்க்கவும்
+OverviewOfMovementsNotValidated=படி 1/ இயக்கங்களின் மேலோட்டம் சரிபார்க்கப்படவில்லை. (ஒரு நிதியாண்டை மூடுவது அவசியம்)
+AllMovementsWereRecordedAsValidated=அனைத்து இயக்கங்களும் சரிபார்க்கப்பட்டதாக பதிவு செய்யப்பட்டன
+NotAllMovementsCouldBeRecordedAsValidated=அனைத்து இயக்கங்களும் சரிபார்க்கப்பட்டதாக பதிவு செய்ய முடியாது
+ValidateMovements=இயக்கங்களை சரிபார்க்கவும்
+DescValidateMovements=எழுதுதல், எழுதுதல் மற்றும் நீக்குதல் ஆகியவற்றில் ஏதேனும் மாற்றம் அல்லது நீக்குதல் தடைசெய்யப்படும். ஒரு பயிற்சிக்கான அனைத்து உள்ளீடுகளும் சரிபார்க்கப்பட வேண்டும் இல்லையெனில் மூடுவது சாத்தியமில்லை
+
+ValidateHistory=தானாக பிணைக்கவும்
+AutomaticBindingDone=தானியங்கி பிணைப்புகள் செய்யப்பட்டன (%s) - சில பதிவுகளுக்கு தானியங்கு பிணைப்பு சாத்தியமில்லை (%s)
+
+ErrorAccountancyCodeIsAlreadyUse=பிழை, இந்தக் கணக்கியல் கணக்கு பயன்படுத்தப்படுவதால் உங்களால் நீக்க முடியாது
+MvtNotCorrectlyBalanced=இயக்கம் சரியாக சமநிலையில் இல்லை. பற்று = %s | கடன் = %s
+Balancing=சமநிலைப்படுத்துதல்
+FicheVentilation=பைண்டிங் கார்டு
+GeneralLedgerIsWritten=பரிவர்த்தனைகள் லெட்ஜரில் எழுதப்பட்டுள்ளன
+GeneralLedgerSomeRecordWasNotRecorded=சில பரிவர்த்தனைகளை ஜர்னலிஸ் செய்ய முடியவில்லை. வேறு எந்த பிழைச் செய்தியும் இல்லை என்றால், அவை ஏற்கனவே ஜர்னலிஸ் செய்யப்பட்டதால் இருக்கலாம்.
+NoNewRecordSaved=பத்திரிக்கை செய்ய இனி பதிவு இல்லை
+ListOfProductsWithoutAccountingAccount=எந்தவொரு கணக்கியல் கணக்கிற்கும் கட்டுப்படாத தயாரிப்புகளின் பட்டியல்
+ChangeBinding=பிணைப்பை மாற்றவும்
+Accounted=லெட்ஜரில் கணக்கு வைக்கப்பட்டுள்ளது
+NotYetAccounted=இன்னும் கணக்கியலுக்கு மாற்றப்படவில்லை
+ShowTutorial=டுடோரியலைக் காட்டு
+NotReconciled=சமரசம் செய்யவில்லை
+WarningRecordWithoutSubledgerAreExcluded=எச்சரிக்கை, சப்லெட்ஜர் கணக்கு வரையறுக்கப்படாத அனைத்து செயல்பாடுகளும் வடிகட்டப்பட்டு இந்தக் காட்சியிலிருந்து விலக்கப்படும்
+
+## Admin
+BindingOptions=பிணைப்பு விருப்பங்கள்
+ApplyMassCategories=வெகுஜன வகைகளைப் பயன்படுத்துங்கள்
+AddAccountFromBookKeepingWithNoCategories=தனிப்பட்ட குழுவில் இன்னும் கணக்கு இல்லை
+CategoryDeleted=கணக்கியல் கணக்கிற்கான வகை அகற்றப்பட்டது
+AccountingJournals=கணக்கியல் இதழ்கள்
+AccountingJournal=கணக்கியல் இதழ்
+NewAccountingJournal=புதிய கணக்கியல் இதழ்
+ShowAccountingJournal=கணக்கியல் பத்திரிகையைக் காட்டு
+NatureOfJournal=இதழின் இயல்பு
+AccountingJournalType1=இதர செயல்பாடுகள்
+AccountingJournalType2=விற்பனை
+AccountingJournalType3=கொள்முதல்
+AccountingJournalType4=வங்கி
+AccountingJournalType5=செலவு அறிக்கை
+AccountingJournalType8=சரக்கு
+AccountingJournalType9=புதியது
+ErrorAccountingJournalIsAlreadyUse=இந்த இதழ் ஏற்கனவே பயன்பாட்டில் உள்ளது
+AccountingAccountForSalesTaxAreDefinedInto=குறிப்பு: விற்பனை வரிக்கான கணக்கு கணக்கு <b> %s </b> - <b> %s a0904
+NumberOfAccountancyEntries=உள்ளீடுகளின் எண்ணிக்கை
+NumberOfAccountancyMovements=இயக்கங்களின் எண்ணிக்கை
+ACCOUNTING_DISABLE_BINDING_ON_SALES=விற்பனையில் கணக்கியலில் பிணைப்பு மற்றும் பரிமாற்றத்தை முடக்கு (கணக்கில் வாடிக்கையாளர் விலைப்பட்டியல்கள் கணக்கில் எடுத்துக்கொள்ளப்படாது)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=வாங்குதல்களில் கணக்கியலில் பிணைப்பு & பரிமாற்றத்தை முடக்கு (கணக்கில் விற்பனையாளர் இன்வாய்ஸ்கள் கணக்கில் எடுத்துக்கொள்ளப்படாது)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=செலவு அறிக்கைகள் மீதான கணக்கியலில் பிணைப்பு மற்றும் பரிமாற்றத்தை முடக்கு (கணக்கில் செலவு அறிக்கைகள் கணக்கில் எடுத்துக்கொள்ளப்படாது)
+
+## Export
+NotifiedExportDate=ஏற்றுமதி செய்யப்பட்ட வரிகளை ஏற்றுமதி செய்ததாகக் கொடியிடவும் (வரிகளை மாற்றியமைக்க முடியாது)
+NotifiedValidationDate=ஏற்றுமதி செய்யப்பட்ட உள்ளீடுகளை சரிபார்க்கவும் (வரிகளை மாற்றுவது அல்லது நீக்குவது சாத்தியமில்லை)
+ConfirmExportFile=கணக்கியல் ஏற்றுமதி கோப்பின் தலைமுறையை உறுதிப்படுத்தவா?
+ExportDraftJournal=ஏற்றுமதி வரைவு இதழ்
+Modelcsv=ஏற்றுமதி மாதிரி
+Selectmodelcsv=ஏற்றுமதி மாதிரியைத் தேர்ந்தெடுக்கவும்
+Modelcsv_normal=கிளாசிக் ஏற்றுமதி
+Modelcsv_CEGID=CEGID நிபுணர் Comptabilité க்கான ஏற்றுமதி
+Modelcsv_COALA=முனிவர் கோலாவுக்கு ஏற்றுமதி
+Modelcsv_bob50=Sage 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 Switzerland க்கான ஏற்றுமதி
+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 கணக்கியல்
+InitAccountancyDesc=விற்பனை மற்றும் வாங்குதல்களுக்கு வரையறுக்கப்பட்ட கணக்கு கணக்கு இல்லாத தயாரிப்புகள் மற்றும் சேவைகளில் கணக்கியல் கணக்கைத் தொடங்க இந்தப் பக்கம் பயன்படுத்தப்படலாம்.
+DefaultBindingDesc=குறிப்பிட்ட கணக்கியல் கணக்கு ஏற்கனவே அமைக்கப்படாத நிலையில், கட்டணச் சம்பளம், நன்கொடை, வரி மற்றும் வாட் பற்றிய பரிவர்த்தனைகளின் பதிவை இணைக்க, இயல்புநிலை கணக்கை அமைக்க இந்தப் பக்கத்தைப் பயன்படுத்தலாம்.
+DefaultClosureDesc=கணக்கியல் மூடல்களுக்குப் பயன்படுத்தப்படும் அளவுருக்களை அமைக்க இந்தப் பக்கத்தைப் பயன்படுத்தலாம்.
+Options=விருப்பங்கள்
+OptionModeProductSell=முறை விற்பனை
+OptionModeProductSellIntra=EEC இல் ஏற்றுமதி செய்யப்படும் முறை விற்பனை
+OptionModeProductSellExport=மற்ற நாடுகளில் ஏற்றுமதி செய்யப்படும் முறை விற்பனை
+OptionModeProductBuy=முறை கொள்முதல்
+OptionModeProductBuyIntra=EEC இல் இறக்குமதி செய்யப்பட்ட பயன்முறை கொள்முதல்
+OptionModeProductBuyExport=மற்ற நாடுகளில் இருந்து இறக்குமதி செய்யப்பட்ட பயன்முறை
+OptionModeProductSellDesc=விற்பனைக்கான கணக்கியல் கணக்குடன் அனைத்து தயாரிப்புகளையும் காட்டு.
+OptionModeProductSellIntraDesc=EEC இல் விற்பனைக்கான கணக்கியல் கணக்குடன் அனைத்து தயாரிப்புகளையும் காட்டு.
+OptionModeProductSellExportDesc=பிற வெளிநாட்டு விற்பனைக்கான கணக்கியல் கணக்குடன் அனைத்து தயாரிப்புகளையும் காட்டு.
+OptionModeProductBuyDesc=வாங்குதல்களுக்கான கணக்கியல் கணக்குடன் அனைத்து தயாரிப்புகளையும் காட்டு.
+OptionModeProductBuyIntraDesc=EEC இல் வாங்குதல்களுக்கான கணக்கியல் கணக்குடன் அனைத்து தயாரிப்புகளையும் காண்பி.
+OptionModeProductBuyExportDesc=பிற வெளிநாட்டு வாங்குதல்களுக்கான கணக்கியல் கணக்குடன் அனைத்து தயாரிப்புகளையும் காட்டு.
+CleanFixHistory=கணக்கு விளக்கப்படங்களில் இல்லாத வரிகளிலிருந்து கணக்கியல் குறியீட்டை அகற்றவும்
+CleanHistory=தேர்ந்தெடுக்கப்பட்ட ஆண்டிற்கான அனைத்து பிணைப்புகளையும் மீட்டமைக்கவும்
+PredefinedGroups=முன் வரையறுக்கப்பட்ட குழுக்கள்
+WithoutValidAccount=சரியான பிரத்யேக கணக்கு இல்லாமல்
+WithValidAccount=சரியான பிரத்யேக கணக்குடன்
+ValueNotIntoChartOfAccount=கணக்கியல் கணக்கின் இந்த மதிப்பு கணக்கின் விளக்கப்படத்தில் இல்லை
+AccountRemovedFromGroup=குழுவிலிருந்து கணக்கு அகற்றப்பட்டது
+SaleLocal=உள்ளூர் விற்பனை
+SaleExport=ஏற்றுமதி விற்பனை
+SaleEEC=EEC இல் விற்பனை
+SaleEECWithVAT=EEC இல் VAT இல் விற்பனையானது பூஜ்யமாக இல்லை, எனவே இது ஒரு உள்நாடு விற்பனை அல்ல, மேலும் பரிந்துரைக்கப்பட்ட கணக்கு நிலையான தயாரிப்புக் கணக்காகும்.
+SaleEECWithoutVATNumber=VAT இல்லா EEC இல் விற்பனை ஆனால் மூன்றாம் தரப்பினரின் VAT ஐடி வரையறுக்கப்படவில்லை. நிலையான விற்பனைக்கான தயாரிப்புக் கணக்கில் நாங்கள் திரும்புவோம். தேவைப்பட்டால் மூன்றாம் தரப்பினரின் VAT ஐடி அல்லது தயாரிப்பு கணக்கை நீங்கள் சரிசெய்யலாம்.
+ForbiddenTransactionAlreadyExported=தடைசெய்யப்பட்டது: பரிவர்த்தனை சரிபார்க்கப்பட்டது மற்றும்/அல்லது ஏற்றுமதி செய்யப்பட்டது.
+ForbiddenTransactionAlreadyValidated=தடைசெய்யப்பட்டது: பரிவர்த்தனை சரிபார்க்கப்பட்டது.
+## Dictionary
+Range=கணக்கியல் கணக்கின் வரம்பு
+Calculated=கணக்கிடப்பட்டது
+Formula=சூத்திரம்
+
+## Error
+SomeMandatoryStepsOfSetupWereNotDone=அமைவுக்கான சில கட்டாயப் படிகள் செய்யப்படவில்லை, தயவுசெய்து அவற்றை முடிக்கவும்
+ErrorNoAccountingCategoryForThisCountry=%s நாட்டிற்கு கணக்கியல் கணக்குக் குழு இல்லை (முகப்பு - அமைவு - அகராதிகளைப் பார்க்கவும்)
+ErrorInvoiceContainsLinesNotYetBounded=விலைப்பட்டியல் <strong> %s </strong> இன் சில வரிகளை ஜர்னலிஸ் செய்ய முயற்சிக்கிறீர்கள், ஆனால் வேறு சில வரிகள் கணக்கியல் கணக்கிற்கு இன்னும் வரம்பில் இல்லை. இந்த விலைப்பட்டியலுக்கான அனைத்து விலைப்பட்டியல் வரிகளின் ஜர்னலைசேஷன் மறுக்கப்படுகிறது.
+ErrorInvoiceContainsLinesNotYetBoundedShort=விலைப்பட்டியலில் உள்ள சில வரிகள் கணக்கியல் கணக்குடன் பிணைக்கப்படவில்லை.
+ExportNotSupported=அமைக்கப்பட்ட ஏற்றுமதி வடிவம் இந்தப் பக்கத்தில் ஆதரிக்கப்படவில்லை
+BookeppingLineAlreayExists=கணக்கு வைப்பதில் ஏற்கனவே உள்ள கோடுகள்
+NoJournalDefined=எந்த பத்திரிகையும் வரையறுக்கப்படவில்லை
+Binded=கோடுகள் பிணைக்கப்பட்டுள்ளன
+ToBind=பிணைக்க வேண்டிய கோடுகள்
+UseMenuToSetBindindManualy=கோடுகள் இன்னும் பிணைக்கப்படவில்லை, கைமுறையாக பிணைப்பை உருவாக்க, மெனு <a href="%s"> %s </a> ஐப் பயன்படுத்தவும்
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=மன்னிக்கவும், இந்த மாட்யூல் சூழ்நிலை விலைப்பட்டியல்களின் சோதனை அம்சத்துடன் இணங்கவில்லை
+
+## Import
+ImportAccountingEntries=கணக்கு பதிவுகள்
+ImportAccountingEntriesFECFormat=கணக்கியல் உள்ளீடுகள் - FEC வடிவம்
+FECFormatJournalCode=கோட் ஜர்னல் (ஜர்னல்கோட்)
+FECFormatJournalLabel=லேபிள் ஜர்னல் (JournalLib)
+FECFormatEntryNum=துண்டு எண் (EcritureNum)
+FECFormatEntryDate=துண்டு தேதி (EcritureDate)
+FECFormatGeneralAccountNumber=பொது கணக்கு எண் (CompteNum)
+FECFormatGeneralAccountLabel=பொது கணக்கு லேபிள் (CompteLib)
+FECFormatSubledgerAccountNumber=சப்லெட்ஜர் கணக்கு எண் (CompAuxNum)
+FECFormatSubledgerAccountLabel=சப்லெட்ஜர் கணக்கு எண் (CompAuxLib)
+FECFormatPieceRef=துண்டு குறிப்பு (PieceRef)
+FECFormatPieceDate=துண்டு தேதி உருவாக்கம் (PieceDate)
+FECFormatLabelOperation=லேபிள் செயல்பாடு (EcritureLib)
+FECFormatDebit=பற்று (பற்று)
+FECFormatCredit=கடன் (கடன்)
+FECFormatReconcilableCode=சரிசெய்யக்கூடிய குறியீடு (EcritureLet)
+FECFormatReconcilableDate=சரிசெய்யக்கூடிய தேதி (DateLet)
+FECFormatValidateDate=துண்டு தேதி சரிபார்க்கப்பட்டது (செல்லுபடியாகும் தேதி)
+FECFormatMulticurrencyAmount=மல்டிகரன்சி தொகை (மாண்டன்ட் டிவைஸ்)
+FECFormatMulticurrencyCode=மல்டிகரன்சி குறியீடு (ஐடிவைஸ்)
+
+DateExport=தேதி ஏற்றுமதி
+WarningReportNotReliable=எச்சரிக்கை, இந்த அறிக்கை லெட்ஜரை அடிப்படையாகக் கொண்டது அல்ல, எனவே லெட்ஜரில் கைமுறையாக மாற்றப்பட்ட பரிவர்த்தனை இல்லை. உங்கள் ஜர்னலைசேஷன் புதுப்பித்த நிலையில் இருந்தால், புத்தக பராமரிப்பு பார்வை மிகவும் துல்லியமாக இருக்கும்.
+ExpenseReportJournal=செலவு அறிக்கை இதழ்
+InventoryJournal=சரக்கு இதழ்
+
+NAccounts=%s கணக்குகள்
diff --git a/htdocs/langs/ta_IN/admin.lang b/htdocs/langs/ta_IN/admin.lang
new file mode 100644
index 00000000000..a39ec49d666
--- /dev/null
+++ b/htdocs/langs/ta_IN/admin.lang
@@ -0,0 +1,2222 @@
+# 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=அறக்கட்டளை
+Version=பதிப்பு
+Publisher=பதிப்பகத்தார்
+VersionProgram=பதிப்பு நிரல்
+VersionLastInstall=ஆரம்ப நிறுவல் பதிப்பு
+VersionLastUpgrade=சமீபத்திய பதிப்பு மேம்படுத்தல்
+VersionExperimental=பரிசோதனை
+VersionDevelopment=வளர்ச்சி
+VersionUnknown=தெரியவில்லை
+VersionRecommanded=பரிந்துரைக்கப்படுகிறது
+FileCheck=ஃபைல்செட் ஒருமைப்பாடு சோதனைகள்
+FileCheckDesc=ஒவ்வொரு கோப்பையும் அதிகாரப்பூர்வமான கோப்புகளுடன் ஒப்பிட்டு, கோப்புகளின் ஒருமைப்பாடு மற்றும் உங்கள் பயன்பாட்டின் அமைப்பைச் சரிபார்க்க இந்தக் கருவி உங்களை அனுமதிக்கிறது. சில அமைவு மாறிலிகளின் மதிப்பும் சரிபார்க்கப்படலாம். ஏதேனும் கோப்புகள் மாற்றப்பட்டுள்ளதா என்பதைத் தீர்மானிக்க இந்தக் கருவியைப் பயன்படுத்தலாம் (எ.கா. ஹேக்கர் மூலம்).
+FileIntegrityIsStrictlyConformedWithReference=கோப்புகளின் ஒருமைப்பாடு கண்டிப்பாக குறிப்புடன் இணங்குகிறது.
+FileIntegrityIsOkButFilesWereAdded=கோப்புகளின் ஒருமைப்பாடு சரிபார்ப்பு முடிந்தது, இருப்பினும் சில புதிய கோப்புகள் சேர்க்கப்பட்டுள்ளன.
+FileIntegritySomeFilesWereRemovedOrModified=கோப்புகளின் நேர்மை சரிபார்ப்பு தோல்வியடைந்தது. சில கோப்புகள் மாற்றப்பட்டன, அகற்றப்பட்டன அல்லது சேர்க்கப்பட்டன.
+GlobalChecksum=உலகளாவிய செக்சம்
+MakeIntegrityAnalysisFrom=இதிலிருந்து பயன்பாட்டுக் கோப்புகளின் ஒருமைப்பாடு பகுப்பாய்வு செய்யுங்கள்
+LocalSignature=உட்பொதிக்கப்பட்ட உள்ளூர் கையொப்பம் (குறைவான நம்பகத்தன்மை)
+RemoteSignature=தொலைதூர கையொப்பம் (மிகவும் நம்பகமானது)
+FilesMissing=கோப்புகள் காணவில்லை
+FilesUpdated=புதுப்பிக்கப்பட்ட கோப்புகள்
+FilesModified=மாற்றியமைக்கப்பட்ட கோப்புகள்
+FilesAdded=சேர்க்கப்பட்ட கோப்புகள்
+FileCheckDolibarr=பயன்பாட்டுக் கோப்புகளின் ஒருமைப்பாட்டை சரிபார்க்கவும்
+AvailableOnlyOnPackagedVersions=உத்தியோகபூர்வ தொகுப்பிலிருந்து பயன்பாடு நிறுவப்பட்டால் மட்டுமே ஒருமைப்பாடு சரிபார்ப்புக்கான உள்ளூர் கோப்பு கிடைக்கும்
+XmlNotFound=பயன்பாட்டின் Xml ஒருமைப்பாடு கோப்பு காணப்படவில்லை
+SessionId=அமர்வு ஐடி
+SessionSaveHandler=அமர்வுகளைச் சேமிக்க ஹேண்ட்லர்
+SessionSavePath=அமர்வு சேமிப்பு இடம்
+PurgeSessions=அமர்வுகளை சுத்தப்படுத்துதல்
+ConfirmPurgeSessions=நீங்கள் உண்மையில் அனைத்து அமர்வுகளையும் அகற்ற விரும்புகிறீர்களா? இது ஒவ்வொரு பயனரையும் (உங்களைத் தவிர) துண்டிக்கும்.
+NoSessionListWithThisHandler=உங்கள் PHP இல் உள்ளமைக்கப்பட்ட சேவ் செஷன் ஹேண்ட்லர் இயங்கும் அனைத்து அமர்வுகளையும் பட்டியலிட அனுமதிக்காது.
+LockNewSessions=புதிய இணைப்புகளைப் பூட்டவும்
+ConfirmLockNewSessions=ஏதேனும் புதிய Dolibarr இணைப்பை உங்களுக்கே கண்டிப்பாக கட்டுப்படுத்த விரும்புகிறீர்களா? <b> %s </b> பயனர் மட்டுமே அதன் பிறகு இணைக்க முடியும்.
+UnlockNewSessions=இணைப்பு பூட்டை அகற்று
+YourSession=உங்கள் அமர்வு
+Sessions=பயனர் அமர்வுகள்
+WebUserGroup=வலை சேவையக பயனர்/குழு
+PermissionsOnFiles=கோப்புகளுக்கான அனுமதிகள்
+PermissionsOnFilesInWebRoot=வலை ரூட் கோப்பகத்தில் உள்ள கோப்புகளுக்கான அனுமதிகள்
+PermissionsOnFile=கோப்பு %s மீதான அனுமதிகள்
+NoSessionFound=செயலில் உள்ள அமர்வுகளின் பட்டியலை உங்கள் PHP உள்ளமைவு அனுமதிக்கவில்லை. அமர்வுகளைச் சேமிக்கப் பயன்படுத்தப்படும் கோப்பகம் (<b> %s </b> ) பாதுகாக்கப்படலாம் (உதாரணமாக OS அனுமதிகள் அல்லது PHP உத்தரவு open_basedir மூலம்).
+DBStoringCharset=தரவைச் சேமிப்பதற்கான தரவுத்தள எழுத்துக்கள்
+DBSortingCharset=தரவை வரிசைப்படுத்த டேட்டாபேஸ் சார்செட்
+HostCharset=ஹோஸ்ட் எழுத்துக்குறி
+ClientCharset=கிளையண்ட் எழுத்துக்குறி
+ClientSortingCharset=வாடிக்கையாளர் தொகுப்பு
+WarningModuleNotActive=தொகுதி <b> %s </b> இயக்கப்பட்டிருக்க வேண்டும்
+WarningOnlyPermissionOfActivatedModules=செயல்படுத்தப்பட்ட தொகுதிகள் தொடர்பான அனுமதிகள் மட்டுமே இங்கே காட்டப்படும். Home->Setup->Modules பக்கத்தில் நீங்கள் மற்ற தொகுதிகளை செயல்படுத்தலாம்.
+DolibarrSetup=Dolibarr நிறுவவும் அல்லது மேம்படுத்தவும்
+InternalUser=உள் பயனர்
+ExternalUser=வெளிப்புற பயனர்
+InternalUsers=உள் பயனர்கள்
+ExternalUsers=வெளிப்புற பயனர்கள்
+UserInterface=பயனர் இடைமுகம்
+GUISetup=காட்சி
+SetupArea=அமைவு
+UploadNewTemplate=புதிய டெம்ப்ளேட்(களை) பதிவேற்றவும்
+FormToTestFileUploadForm=கோப்பு பதிவேற்றத்தை சோதிக்கும் படிவம் (அமைப்பின் படி)
+ModuleMustBeEnabled=தொகுதி/பயன்பாடு <b> %s </b> இயக்கப்பட்டிருக்க வேண்டும்
+ModuleIsEnabled=தொகுதி/பயன்பாடு <b> %s </b> இயக்கப்பட்டது
+IfModuleEnabled=குறிப்பு: தொகுதி <b> %s </b> இயக்கப்பட்டிருந்தால் மட்டுமே ஆம் பயனுள்ளதாக இருக்கும்
+RemoveLock=கோப்பு <b> %s </b> இருந்தால் அதை அகற்று/மறுபெயரிடவும், புதுப்பித்தல்/நிறுவு கருவியைப் பயன்படுத்த அனுமதிக்கவும்.
+RestoreLock=புதுப்பித்தல்/நிறுவு கருவியின் எந்தவொரு பயன்பாட்டையும் முடக்க, வாசிப்பு அனுமதியுடன் மட்டும் <b> %s </b> கோப்பை மீட்டமைக்கவும்.
+SecuritySetup=பாதுகாப்பு அமைப்பு
+PHPSetup=PHP அமைப்பு
+OSSetup=OS அமைப்பு
+SecurityFilesDesc=கோப்புகளைப் பதிவேற்றுவது தொடர்பான பாதுகாப்பு தொடர்பான விருப்பங்களை இங்கே வரையறுக்கவும்.
+ErrorModuleRequirePHPVersion=பிழை, இந்த தொகுதிக்கு PHP பதிப்பு %s அல்லது அதற்கு மேற்பட்டது தேவை
+ErrorModuleRequireDolibarrVersion=பிழை, இந்த தொகுதிக்கு Dolibarr பதிப்பு %s அல்லது அதற்கு மேல் தேவை
+ErrorDecimalLargerThanAreForbidden=பிழை, <b> %s </b> ஐ விட அதிக துல்லியம் ஆதரிக்கப்படவில்லை.
+DictionarySetup=அகராதி அமைவு
+Dictionary=அகராதிகள்
+ErrorReservedTypeSystemSystemAuto=வகைக்கான மதிப்பு 'சிஸ்டம்' மற்றும் 'சிஸ்டமுடோ' ஒதுக்கப்பட்டுள்ளது. உங்கள் சொந்த பதிவைச் சேர்க்க, 'பயனர்' என்பதை மதிப்பாகப் பயன்படுத்தலாம்
+ErrorCodeCantContainZero=குறியீட்டில் மதிப்பு 0 இருக்கக்கூடாது
+DisableJavascript=ஜாவாஸ்கிரிப்ட் மற்றும் அஜாக்ஸ் செயல்பாடுகளை முடக்கு
+DisableJavascriptNote=குறிப்பு: சோதனை அல்லது பிழைத்திருத்த நோக்கத்திற்காக மட்டுமே. பார்வையற்ற நபர் அல்லது உரை உலாவிகளுக்கான தேர்வுமுறைக்கு, பயனரின் சுயவிவரத்தில் உள்ள அமைப்பை நீங்கள் பயன்படுத்த விரும்பலாம்
+UseSearchToSelectCompanyTooltip=உங்களிடம் அதிக எண்ணிக்கையிலான மூன்றாம் தரப்பினர் (> 100 000) இருந்தால், அமைப்பு->மற்றவற்றில் நிலையான COMPANY_DONOTSEARCH_ANYERE முதல் 1 வரை அமைப்பதன் மூலம் வேகத்தை அதிகரிக்கலாம். தேடல் சரத்தின் தொடக்கத்திற்கு வரம்பிடப்படும்.
+UseSearchToSelectContactTooltip=உங்களிடம் அதிக எண்ணிக்கையிலான மூன்றாம் தரப்பினர் (> 100 000) இருந்தால், CONTACT_DONOTSEARCH_ANYWHERE முதல் 1 வரை, Setup->Other என்பதில் நிலையானதாக அமைப்பதன் மூலம் வேகத்தை அதிகரிக்கலாம். தேடல் சரத்தின் தொடக்கத்திற்கு வரம்பிடப்படும்.
+DelaiedFullListToSelectCompany=மூன்றாம் தரப்பினரின் சேர்க்கை பட்டியலின் உள்ளடக்கத்தை ஏற்றுவதற்கு முன் ஒரு விசையை அழுத்தும் வரை காத்திருக்கவும். <br> உங்களிடம் அதிக எண்ணிக்கையிலான மூன்றாம் தரப்பினர் இருந்தால் செயல்திறனை அதிகரிக்கலாம், ஆனால் இது குறைவான வசதியாக இருக்கும்.
+DelaiedFullListToSelectContact=தொடர்பு சேர்க்கை பட்டியலின் உள்ளடக்கத்தை ஏற்றுவதற்கு முன் ஒரு விசையை அழுத்தும் வரை காத்திருக்கவும். <br> உங்களிடம் அதிக எண்ணிக்கையிலான தொடர்புகள் இருந்தால், இது செயல்திறனை அதிகரிக்கலாம், ஆனால் இது குறைவான வசதியானது.
+NumberOfKeyToSearch=தேடலைத் தூண்டுவதற்கான எழுத்துகளின் எண்ணிக்கை: %s
+NumberOfBytes=பைட்டுகளின் எண்ணிக்கை
+SearchString=தேடல் சரம்
+NotAvailableWhenAjaxDisabled=அஜாக்ஸ் முடக்கப்பட்ட போது கிடைக்காது
+AllowToSelectProjectFromOtherCompany=மூன்றாம் தரப்பினரின் ஆவணத்தில், மற்றொரு மூன்றாம் தரப்பினருடன் இணைக்கப்பட்ட திட்டத்தைத் தேர்வு செய்யலாம்
+TimesheetPreventAfterFollowingMonths=பின்வரும் மாதங்களுக்குப் பிறகு பதிவுசெய்யும் நேரத்தைத் தடுக்கவும்
+JavascriptDisabled=JavaScript முடக்கப்பட்டுள்ளது
+UsePreviewTabs=முன்னோட்ட தாவல்களைப் பயன்படுத்தவும்
+ShowPreview=முன்னோட்டத்தைக் காட்டு
+ShowHideDetails=விவரங்களைக் காட்டு-மறை
+PreviewNotAvailable=முன்னோட்டம் கிடைக்கவில்லை
+ThemeCurrentlyActive=தீம் தற்போது செயலில் உள்ளது
+MySQLTimeZone=TimeZone MySql (தரவுத்தளம்)
+TZHasNoEffect=சமர்ப்பிக்கப்பட்ட சரம் போல் தேதிகள் சேமிக்கப்பட்டு தரவுத்தள சேவையகத்தால் திருப்பி அனுப்பப்படும். UNIX_TIMESTAMP செயல்பாட்டைப் பயன்படுத்தும் போது மட்டுமே நேர மண்டலம் செயல்படும் (அதை Dolibarr பயன்படுத்தக்கூடாது, எனவே தரவுத்தளத்தில் TZ எந்த விளைவையும் ஏற்படுத்தாது, தரவு உள்ளிட்ட பிறகு மாற்றப்பட்டாலும் கூட).
+Space=விண்வெளி
+Table=மேசை
+Fields=வயல்வெளிகள்
+Index=குறியீட்டு
+Mask=முகமூடி
+NextValue=அடுத்த மதிப்பு
+NextValueForInvoices=அடுத்த மதிப்பு (இன்வாய்ஸ்கள்)
+NextValueForCreditNotes=அடுத்த மதிப்பு (கடன் குறிப்புகள்)
+NextValueForDeposit=அடுத்த மதிப்பு (டவுன் பேமெண்ட்)
+NextValueForReplacements=அடுத்த மதிப்பு (மாற்று)
+MustBeLowerThanPHPLimit=குறிப்பு: உங்கள் PHP உள்ளமைவு இந்த அளவுருவின் மதிப்பைப் பொருட்படுத்தாமல், <b> %s </b> %s க்கு பதிவேற்றுவதற்கான அதிகபட்ச கோப்பு அளவைக் கட்டுப்படுத்துகிறது.
+NoMaxSizeByPHPLimit=குறிப்பு: உங்கள் PHP உள்ளமைவில் வரம்பு எதுவும் அமைக்கப்படவில்லை
+MaxSizeForUploadedFiles=பதிவேற்றிய கோப்புகளுக்கான அதிகபட்ச அளவு (எந்தப் பதிவேற்றத்தையும் அனுமதிக்காததற்கு 0)
+UseCaptchaCode=உள்நுழைவு பக்கத்தில் வரைகலை குறியீட்டைப் (CAPTCHA) பயன்படுத்தவும்
+AntiVirusCommand=வைரஸ் தடுப்பு கட்டளைக்கான முழு பாதை
+AntiVirusCommandExample=ClamAv Daemon க்கான எடுத்துக்காட்டு (clamav-daemon தேவை): /usr/bin/clamdscan <br> ClamWin க்கான எடுத்துக்காட்டு (மிக மிக மெதுவாக): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam= கட்டளை வரியில் கூடுதல் அளவுருக்கள்
+AntiVirusParamExample=ClamAv Daemon க்கான எடுத்துக்காட்டு: --fdpass <br> ClamWin க்கான எடுத்துக்காட்டு: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=கணக்கியல் தொகுதி அமைப்பு
+UserSetup=பயனர் மேலாண்மை அமைப்பு
+MultiCurrencySetup=பல நாணய அமைப்பு
+MenuLimits=வரம்புகள் மற்றும் துல்லியம்
+MenuIdParent=பெற்றோர் மெனு ஐடி
+DetailMenuIdParent=பெற்றோர் மெனுவின் ஐடி (மேல் மெனுவிற்கு காலியாக உள்ளது)
+ParentID=பெற்றோர் ஐடி
+DetailPosition=மெனு நிலையை வரையறுக்க எண்ணை வரிசைப்படுத்தவும்
+AllMenus=அனைத்து
+NotConfigured=தொகுதி/பயன்பாடு கட்டமைக்கப்படவில்லை
+Active=செயலில்
+SetupShort=அமைவு
+OtherOptions=பிற விருப்பங்கள்
+OtherSetup=பிற அமைப்பு
+CurrentValueSeparatorDecimal=தசம பிரிப்பான்
+CurrentValueSeparatorThousand=ஆயிரம் பிரிப்பான்
+Destination=இலக்கு
+IdModule=தொகுதி ஐடி
+IdPermissions=அனுமதிகள் ஐடி
+LanguageBrowserParameter=அளவுரு %s
+LocalisationDolibarrParameters=உள்ளூர்மயமாக்கல் அளவுருக்கள்
+ClientHour=வாடிக்கையாளர் நேரம் (பயனர்)
+OSTZ=சர்வர் ஓஎஸ் நேர மண்டலம்
+PHPTZ=PHP சர்வர் நேர மண்டலம்
+DaylingSavingTime=பகல் சேமிப்பு நேரம்
+CurrentHour=PHP நேரம் (சேவையகம்)
+CurrentSessionTimeOut=தற்போதைய அமர்வு நேரம் முடிந்தது
+YouCanEditPHPTZ=வேறு PHP நேரமண்டலத்தை அமைக்க (தேவையில்லை), "SetEnv TZ Europe/Paris" போன்ற வரியுடன் .htaccess கோப்பைச் சேர்க்க முயற்சி செய்யலாம்.
+HoursOnThisPageAreOnServerTZ=எச்சரிக்கை, மற்ற திரைகளுக்கு மாறாக, இந்தப் பக்கத்தில் உள்ள மணிநேரங்கள் உங்கள் உள்ளூர் நேர மண்டலத்தில் இல்லை, ஆனால் சேவையகத்தின் நேர மண்டலத்தில் இருக்கும்.
+Box=விட்ஜெட்
+Boxes=விட்ஜெட்டுகள்
+MaxNbOfLinesForBoxes=அதிகபட்சம். விட்ஜெட்டுகளுக்கான வரிகளின் எண்ணிக்கை
+AllWidgetsWereEnabled=கிடைக்கக்கூடிய அனைத்து விட்ஜெட்களும் இயக்கப்பட்டுள்ளன
+PositionByDefault=இயல்புநிலை ஆர்டர்
+Position=பதவி
+MenusDesc=மெனு மேலாளர்கள் இரண்டு மெனு பார்களின் (கிடைமட்ட மற்றும் செங்குத்து) உள்ளடக்கத்தை அமைக்கின்றனர்.
+MenusEditorDesc=தனிப்பயன் மெனு உள்ளீடுகளை வரையறுக்க மெனு எடிட்டர் உங்களை அனுமதிக்கிறது. உறுதியற்ற தன்மை மற்றும் நிரந்தரமாக அணுக முடியாத மெனு உள்ளீடுகளைத் தவிர்க்க கவனமாகப் பயன்படுத்தவும். <br> சில தொகுதிகள் மெனு உள்ளீடுகளைச் சேர்க்கின்றன (மெனுவில் <b> அனைத்தும் </b> பெரும்பாலும்). இந்த உள்ளீடுகளில் சிலவற்றை நீங்கள் தவறுதலாக அகற்றினால், அவற்றை முடக்கி, தொகுதியை மீண்டும் இயக்குவதன் மூலம் அவற்றை மீட்டெடுக்கலாம்.
+MenuForUsers=பயனர்களுக்கான மெனு
+LangFile=.lang கோப்பு
+Language_en_US_es_MX_etc=மொழி (en_US, es_MX, ...)
+System=அமைப்பு
+SystemInfo=கணினி தகவல்
+SystemToolsArea=கணினி கருவிகள் பகுதி
+SystemToolsAreaDesc=இந்த பகுதி நிர்வாக செயல்பாடுகளை வழங்குகிறது. தேவையான அம்சத்தைத் தேர்ந்தெடுக்க மெனுவைப் பயன்படுத்தவும்.
+Purge=களையெடுப்பு
+PurgeAreaDesc=Dolibarr ஆல் உருவாக்கப்பட்ட அல்லது சேமிக்கப்பட்ட அனைத்து கோப்புகளையும் நீக்க இந்தப் பக்கம் உங்களை அனுமதிக்கிறது (தற்காலிக கோப்புகள் அல்லது <b> %s </b> கோப்பகத்தில் உள்ள அனைத்து கோப்புகளும்). இந்த அம்சத்தைப் பயன்படுத்துவது பொதுவாக அவசியமில்லை. இணைய சேவையகத்தால் உருவாக்கப்பட்ட கோப்புகளை நீக்குவதற்கான அனுமதிகளை வழங்காத வழங்குநரால் Dolibarr ஹோஸ்ட் செய்யப்பட்ட பயனர்களுக்கு இது ஒரு தீர்வாக வழங்கப்படுகிறது.
+PurgeDeleteLogFile=Syslog தொகுதிக்கு வரையறுக்கப்பட்ட <b> %s </b> உள்ளிட்ட பதிவுக் கோப்புகளை நீக்கவும் (தரவை இழக்கும் அபாயம் இல்லை)
+PurgeDeleteTemporaryFiles=அனைத்து பதிவு மற்றும் தற்காலிக கோப்புகளை நீக்கவும் (தரவை இழக்கும் ஆபத்து இல்லை). அளவுரு 'tempfilesold', 'logfiles' அல்லது 'tempfilesold+logfiles' என இரண்டும் இருக்கலாம். குறிப்பு: தற்காலிக கோப்புகளை நீக்குவது தற்காலிக கோப்பகம் 24 மணிநேரத்திற்கு முன்பு உருவாக்கப்பட்டிருந்தால் மட்டுமே செய்யப்படுகிறது.
+PurgeDeleteTemporaryFilesShort=பதிவு மற்றும் தற்காலிக கோப்புகளை நீக்கவும் (தரவை இழக்கும் ஆபத்து இல்லை)
+PurgeDeleteAllFilesInDocumentsDir=கோப்பகத்தில் உள்ள எல்லா கோப்புகளையும் நீக்கு: <b> %s </b> . <br> இது உறுப்புகள் (மூன்றாம் தரப்பினர், இன்வாய்ஸ்கள் போன்றவை...), ECM தொகுதியில் பதிவேற்றப்பட்ட கோப்புகள், தரவுத்தள காப்புப் பிரதி டம்ப்கள் மற்றும் தற்காலிக கோப்புகள் தொடர்பான அனைத்து உருவாக்கப்பட்ட ஆவணங்களையும் நீக்கும்.
+PurgeRunNow=இப்போது சுத்தப்படுத்து
+PurgeNothingToDelete=நீக்குவதற்கு அடைவு அல்லது கோப்புகள் இல்லை.
+PurgeNDirectoriesDeleted= <b> %s </b> கோப்புகள் அல்லது கோப்பகங்கள் நீக்கப்பட்டன.
+PurgeNDirectoriesFailed=<b> %s </b> கோப்புகள் அல்லது கோப்பகங்களை நீக்க முடியவில்லை.
+PurgeAuditEvents=அனைத்து பாதுகாப்பு நிகழ்வுகளையும் அகற்றவும்
+ConfirmPurgeAuditEvents=அனைத்து பாதுகாப்பு நிகழ்வுகளையும் நிச்சயமாக அகற்ற விரும்புகிறீர்களா? அனைத்து பாதுகாப்பு பதிவுகளும் நீக்கப்படும், மற்ற தரவு எதுவும் அகற்றப்படாது.
+GenerateBackup=காப்புப்பிரதியை உருவாக்கவும்
+Backup=காப்புப்பிரதி
+Restore=மீட்டமை
+RunCommandSummary=பின்வரும் கட்டளையுடன் காப்புப்பிரதி தொடங்கப்பட்டது
+BackupResult=காப்பு முடிவு
+BackupFileSuccessfullyCreated=காப்பு கோப்பு வெற்றிகரமாக உருவாக்கப்பட்டது
+YouCanDownloadBackupFile=உருவாக்கப்பட்ட கோப்பை இப்போது பதிவிறக்கம் செய்யலாம்
+NoBackupFileAvailable=காப்புப் பிரதி கோப்புகள் இல்லை.
+ExportMethod=ஏற்றுமதி முறை
+ImportMethod=இறக்குமதி முறை
+ToBuildBackupFileClickHere=காப்பு கோப்பை உருவாக்க, இங்கே <a href="%s"> ஐ கிளிக் செய்யவும் </a> .
+ImportMySqlDesc=MySQL காப்பு கோப்பை இறக்குமதி செய்ய, உங்கள் ஹோஸ்டிங் வழியாக phpMyAdmin ஐப் பயன்படுத்தலாம் அல்லது கட்டளை வரியிலிருந்து mysql கட்டளையைப் பயன்படுத்தலாம். <br> எடுத்துக்காட்டாக:
+ImportPostgreSqlDesc=காப்புப் பிரதி கோப்பை இறக்குமதி செய்ய, கட்டளை வரியிலிருந்து pg_restore கட்டளையைப் பயன்படுத்த வேண்டும்:
+ImportMySqlCommand=%s %s < mybackupfile.sql
+ImportPostgreSqlCommand=%s %s mybackupfile.sql
+FileNameToGenerate=காப்புப்பிரதிக்கான கோப்பு பெயர்:
+Compression=சுருக்கம்
+CommandsToDisableForeignKeysForImport=இறக்குமதியில் வெளிநாட்டு விசைகளை முடக்குவதற்கான கட்டளை
+CommandsToDisableForeignKeysForImportWarning=உங்கள் sql டம்பை நீங்கள் பின்னர் மீட்டெடுக்க விரும்பினால் கட்டாயம்
+ExportCompatibility=உருவாக்கப்பட்ட ஏற்றுமதி கோப்பின் இணக்கத்தன்மை
+ExportUseMySQLQuickParameter=--quick அளவுருவைப் பயன்படுத்தவும்
+ExportUseMySQLQuickParameterHelp='--விரைவு' அளவுரு பெரிய அட்டவணைகளுக்கு ரேம் பயன்பாட்டைக் கட்டுப்படுத்த உதவுகிறது.
+MySqlExportParameters=MySQL ஏற்றுமதி அளவுருக்கள்
+PostgreSqlExportParameters= PostgreSQL ஏற்றுமதி அளவுருக்கள்
+UseTransactionnalMode=பரிவர்த்தனை பயன்முறையைப் பயன்படுத்தவும்
+FullPathToMysqldumpCommand=mysqldump கட்டளைக்கான முழு பாதை
+FullPathToPostgreSQLdumpCommand=pg_dump கட்டளைக்கான முழு பாதை
+AddDropDatabase=DROP DATABASE கட்டளையைச் சேர்க்கவும்
+AddDropTable=DROP TABLE கட்டளையைச் சேர்க்கவும்
+ExportStructure=கட்டமைப்பு
+NameColumn=நெடுவரிசைகளுக்கு பெயரிடுங்கள்
+ExtendedInsert=நீட்டிக்கப்பட்ட INSERT
+NoLockBeforeInsert=INSERT ஐச் சுற்றி பூட்டு கட்டளைகள் இல்லை
+DelayedInsert=தாமதமான செருகல்
+EncodeBinariesInHexa=பைனரி தரவை ஹெக்ஸாடெசிமலில் குறியாக்கு
+IgnoreDuplicateRecords=நகல் பதிவின் பிழைகளைப் புறக்கணிக்கவும் (புறக்கணிப்பைச் செருகவும்)
+AutoDetectLang=தானாகக் கண்டறிதல் (உலாவி மொழி)
+FeatureDisabledInDemo=டெமோவில் அம்சம் முடக்கப்பட்டுள்ளது
+FeatureAvailableOnlyOnStable=அதிகாரப்பூர்வ நிலையான பதிப்புகளில் மட்டுமே அம்சம் கிடைக்கும்
+BoxesDesc=விட்ஜெட்டுகள் என்பது சில பக்கங்களைத் தனிப்பயனாக்க நீங்கள் சேர்க்கக்கூடிய சில தகவல்களைக் காட்டும் கூறுகள். இலக்குப் பக்கத்தைத் தேர்ந்தெடுத்து 'செயல்படுத்து' என்பதைக் கிளிக் செய்வதன் மூலம் அல்லது அதை முடக்க குப்பைத் தொட்டியைக் கிளிக் செய்வதன் மூலம் விட்ஜெட்டைக் காண்பிப்பதா இல்லையா என்பதை நீங்கள் தேர்வு செய்யலாம்.
+OnlyActiveElementsAreShown=<a href="%s"> இயக்கப்பட்ட தொகுதிகள் </a> இலிருந்து கூறுகள் மட்டுமே காட்டப்பட்டுள்ளன.
+ModulesDesc=மென்பொருளில் எந்த அம்சங்கள் உள்ளன என்பதை தொகுதிகள்/பயன்பாடுகள் தீர்மானிக்கின்றன. சில தொகுதிகள் தொகுதியை செயல்படுத்திய பிறகு பயனர்களுக்கு அனுமதி வழங்க வேண்டும். ஒரு தொகுதி/பயன்பாட்டை இயக்க அல்லது முடக்க, ஒவ்வொரு தொகுதியின் ஆன்/ஆஃப் பொத்தானைக் கிளிக் செய்யவும் <span class="small valignmiddle"> %s </span>.
+ModulesDesc2=தொகுதி/பயன்பாட்டை உள்ளமைக்க, வீல் பட்டனை <span class="small valignmiddle"> %s </span> கிளிக் செய்யவும்.
+ModulesMarketPlaceDesc=இணையத்தில் வெளிப்புற வலைத்தளங்களில் பதிவிறக்கம் செய்வதற்கான கூடுதல் தொகுதிகளை நீங்கள் காணலாம்...
+ModulesDeployDesc=உங்கள் கோப்பு முறைமையில் அனுமதிகள் அனுமதித்தால், வெளிப்புற தொகுதியை வரிசைப்படுத்த இந்தக் கருவியைப் பயன்படுத்தலாம். தொகுதி பின்னர் <strong> %s </strong> தாவலில் தெரியும்.
+ModulesMarketPlaces=வெளிப்புற பயன்பாடு/தொகுதிகளைக் கண்டறியவும்
+ModulesDevelopYourModule=உங்கள் சொந்த பயன்பாடு/தொகுதிகளை உருவாக்கவும்
+ModulesDevelopDesc=நீங்கள் உங்கள் சொந்த தொகுதியை உருவாக்கலாம் அல்லது உங்களுக்காக ஒன்றை உருவாக்க ஒரு கூட்டாளரைக் கண்டறியலாம்.
+DOLISTOREdescriptionLong=வெளிப்புற மாட்யூலைக் கண்டறிய <a href="https://www.dolistore.com"> www.dolistore.com </a> இணையதளத்தை இயக்குவதற்குப் பதிலாக, இந்த உட்பொதிக்கப்பட்ட கருவியைப் பயன்படுத்தலாம், இது உங்களுக்காக வெளிச் சந்தையில் தேடலைச் செய்யும் (மெதுவாக இருக்கலாம், இணைய அணுகல் தேவை)...
+NewModule=புதிய தொகுதி
+FreeModule=இலவசம்
+CompatibleUpTo=பதிப்பு %s உடன் இணக்கமானது
+NotCompatible=இந்த மாட்யூல் உங்கள் Dolibarr %s (குறைந்தபட்சம் %s - அதிகபட்சம் %s) உடன் இணக்கமாக இல்லை.
+CompatibleAfterUpdate=இந்த தொகுதிக்கு உங்கள் Dolibarr %s (குறைந்தபட்சம் %s - Max %s) புதுப்பித்தல் தேவை.
+SeeInMarkerPlace=சந்தை இடத்தில் பார்க்கவும்
+SeeSetupOfModule=தொகுதி %s அமைப்பைப் பார்க்கவும்
+SetOptionTo=விருப்பத்தை அமைக்கவும் <b> %s </b> ஆக %s
+Updated=புதுப்பிக்கப்பட்டது
+AchatTelechargement=வாங்க / பதிவிறக்கவும்
+GoModuleSetupArea=புதிய தொகுதியை வரிசைப்படுத்த/நிறுவ, தொகுதி அமைவு பகுதிக்குச் செல்லவும்: <a href="%s"> %s </a> .
+DoliStoreDesc=DoliStore, Dolibarr ERP/CRM வெளிப்புற தொகுதிகளுக்கான அதிகாரப்பூர்வ சந்தை இடம்
+DoliPartnersDesc=தனிப்பயனாக்கப்பட்ட தொகுதிகள் அல்லது அம்சங்களை வழங்கும் நிறுவனங்களின் பட்டியல். <br> குறிப்பு: டோலிபார் ஒரு ஓப்பன் சோர்ஸ் அப்ளிகேஷன் என்பதால், <i> PHP புரோகிராமிங்கில் அனுபவம் வாய்ந்த </i> ஒரு தொகுதியை உருவாக்க முடியும்.
+WebSiteDesc=கூடுதல் ஆட்-ஆன் (கோர் அல்லாத) தொகுதிகளுக்கான வெளிப்புற இணையதளங்கள்...
+DevelopYourModuleDesc=உங்கள் சொந்த தொகுதியை உருவாக்க சில தீர்வுகள்...
+URL=URL
+RelativeURL=தொடர்புடைய URL
+BoxesAvailable=விட்ஜெட்டுகள் கிடைக்கும்
+BoxesActivated=விட்ஜெட்டுகள் செயல்படுத்தப்பட்டன
+ActivateOn=இயக்கவும்
+ActiveOn=இயக்கப்பட்டது
+ActivatableOn=இயக்கக்கூடியது
+SourceFile=மூல கோப்பு
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=ஜாவாஸ்கிரிப்ட் முடக்கப்படவில்லை என்றால் மட்டுமே கிடைக்கும்
+Required=தேவை
+UsedOnlyWithTypeOption=சில நிகழ்ச்சி நிரல் விருப்பத்தால் மட்டுமே பயன்படுத்தப்படுகிறது
+Security=பாதுகாப்பு
+Passwords=கடவுச்சொற்கள்
+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:="cryptedb_pass; </b> <br> by <br> <b> $dolibarr_main_db_pass="%s"; </b>
+ProtectAndEncryptPdfFiles=உருவாக்கப்பட்ட PDF கோப்புகளைப் பாதுகாக்கவும். மொத்த PDF உருவாக்கத்தை உடைப்பதால் இது பரிந்துரைக்கப்படவில்லை.
+ProtectAndEncryptPdfFilesDesc=ஒரு PDF ஆவணத்தின் பாதுகாப்பு எந்த PDF உலாவியிலும் அதைப் படிக்கவும் அச்சிடவும் கிடைக்கும். இருப்பினும், எடிட்டிங் மற்றும் நகலெடுப்பது இனி சாத்தியமில்லை. இந்த அம்சத்தைப் பயன்படுத்தி, உலகளாவிய ஒன்றிணைக்கப்பட்ட PDFகளை உருவாக்குவது வேலை செய்யாது என்பதை நினைவில் கொள்ளவும்.
+Feature=அம்சம்
+DolibarrLicense=உரிமம்
+Developpers=டெவலப்பர்கள்/பங்களிப்பாளர்கள்
+OfficialWebSite=Dolibarr அதிகாரப்பூர்வ இணையதளம்
+OfficialWebSiteLocal=உள்ளூர் இணையதளம் (%s)
+OfficialWiki=டோலிபார் ஆவணங்கள் / விக்கி
+OfficialDemo=டோலிபார் ஆன்லைன் டெமோ
+OfficialMarketPlace=வெளிப்புற தொகுதிகள்/சேர்க்கைகளுக்கான அதிகாரப்பூர்வ சந்தை இடம்
+OfficialWebHostingService=குறிப்பிடப்பட்ட வலை ஹோஸ்டிங் சேவைகள் (கிளவுட் ஹோஸ்டிங்)
+ReferencedPreferredPartners=விருப்பமான கூட்டாளர்கள்
+OtherResources=பிற வளங்கள்
+ExternalResources=வெளி வளங்கள்
+SocialNetworks=சமுக வலைத்தளங்கள்
+SocialNetworkId=சமூக வலைப்பின்னல் ஐடி
+ForDocumentationSeeWiki=பயனர் அல்லது டெவலப்பர் ஆவணங்கள் (டாக், அடிக்கடி கேட்கப்படும் கேள்விகள் ...) இந்த <br> Dolibarr விக்கி பாருங்கள்: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
+ForAnswersSeeForum=வேறு ஏதேனும் கேள்விகள்/உதவிகளுக்கு, நீங்கள் Dolibarr மன்றத்தைப் பயன்படுத்தலாம்: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> az907
+HelpCenterDesc1=Dolibarr உடன் உதவி மற்றும் ஆதரவைப் பெறுவதற்கான சில ஆதாரங்கள் இங்கே உள்ளன.
+HelpCenterDesc2=இந்த ஆதாரங்களில் சில <b> ஆங்கிலம் </b> இல் மட்டுமே கிடைக்கும்.
+CurrentMenuHandler=தற்போதைய மெனு ஹேண்ட்லர்
+MeasuringUnit=அளவிடும் அலகு
+LeftMargin=இடது ஓரம்
+TopMargin=மேல் விளிம்பு
+PaperSize=காகித வகை
+Orientation=நோக்குநிலை
+SpaceX=ஸ்பேஸ் எக்ஸ்
+SpaceY=விண்வெளி ஒய்
+FontSize=எழுத்துரு அளவு
+Content=உள்ளடக்கம்
+ContentForLines=ஒவ்வொரு தயாரிப்பு அல்லது சேவைக்கும் காட்ட வேண்டிய உள்ளடக்கம் (மாறி __LINES__ உள்ளடக்கத்திலிருந்து)
+NoticePeriod=அறிவிப்பு காலம்
+NewByMonth=மாதம் புதியது
+Emails=மின்னஞ்சல்கள்
+EMailsSetup=மின்னஞ்சல்கள் அமைப்பு
+EMailsDesc=மின்னஞ்சல் அனுப்புவதற்கான அளவுருக்கள் அல்லது விருப்பங்களை அமைக்க இந்தப் பக்கம் உங்களை அனுமதிக்கிறது.
+EmailSenderProfiles=மின்னஞ்சல் அனுப்புநரின் சுயவிவரங்கள்
+EMailsSenderProfileDesc=இந்தப் பகுதியை காலியாக வைத்திருக்கலாம். நீங்கள் சில மின்னஞ்சல்களை இங்கே உள்ளிட்டால், நீங்கள் புதிய மின்னஞ்சலை எழுதும் போது அவை காம்போபாக்ஸில் சாத்தியமான அனுப்புநர்களின் பட்டியலில் சேர்க்கப்படும்.
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS போர்ட் (php.ini இல் இயல்புநிலை மதிப்பு: <b> %s </b> )
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS ஹோஸ்ட் (php.ini இல் இயல்புநிலை மதிப்பு: <b> %s </b> )
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS போர்ட் (யுனிக்ஸ் போன்ற கணினிகளில் PHP இல் வரையறுக்கப்படவில்லை)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS ஹோஸ்ட் (யுனிக்ஸ் போன்ற கணினிகளில் PHP என வரையறுக்கப்படவில்லை)
+MAIN_MAIL_EMAIL_FROM=தானியங்கி மின்னஞ்சல்களுக்கான மின்னஞ்சல் அனுப்புனர் (php.ini இல் இயல்புநிலை மதிப்பு: <b> %s </b> )
+MAIN_MAIL_ERRORS_TO=மின்னஞ்சல்களைப் பிழை திரும்பப் பெறுவதற்குப் பயன்படுத்தப்படும் மின்னஞ்சல் (அனுப்பப்பட்ட மின்னஞ்சல்களில் உள்ள 'பிழைகள்-செய்யும்' புலங்கள்)
+MAIN_MAIL_AUTOCOPY_TO= அனுப்பிய எல்லா மின்னஞ்சல்களையும் நகலெடுக்கவும் (Bcc).
+MAIN_DISABLE_ALL_MAILS=அனைத்து மின்னஞ்சல் அனுப்புதலையும் முடக்கு (சோதனை நோக்கங்களுக்காக அல்லது டெமோக்களுக்காக)
+MAIN_MAIL_FORCE_SENDTO=அனைத்து மின்னஞ்சல்களையும் அனுப்பவும் (உண்மையான பெறுநர்களுக்கு பதிலாக, சோதனை நோக்கங்களுக்காக)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=புதிய மின்னஞ்சலை எழுதும் போது முன் வரையறுக்கப்பட்ட பெறுநரின் பட்டியலில் பணியாளர்களின் மின்னஞ்சல்களை (வரையறுக்கப்பட்டிருந்தால்) பரிந்துரைக்கவும்
+MAIN_MAIL_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=அனைத்து SMS அனுப்புதலையும் முடக்கு (சோதனை நோக்கங்களுக்காக அல்லது டெமோக்களுக்காக)
+MAIN_SMS_SENDMODE=எஸ்எம்எஸ் அனுப்ப பயன்படுத்த வேண்டிய முறை
+MAIN_MAIL_SMS_FROM=SMS அனுப்புவதற்கான இயல்புநிலை அனுப்புநரின் தொலைபேசி எண்
+MAIN_MAIL_DEFAULT_FROMTYPE=கைமுறையாக அனுப்புவதற்கான இயல்புநிலை அனுப்புநர் மின்னஞ்சல் (பயனர் மின்னஞ்சல் அல்லது நிறுவனத்தின் மின்னஞ்சல்)
+UserEmail=பயனர் மின்னஞ்சல்
+CompanyEmail=நிறுவனத்தின் மின்னஞ்சல்
+FeatureNotAvailableOnLinux=Unix போன்ற கணினிகளில் அம்சம் இல்லை. உங்கள் அனுப்பும் அஞ்சல் திட்டத்தை உள்ளூரில் சோதிக்கவும்.
+FixOnTransifex=திட்டத்தின் ஆன்லைன் மொழிபெயர்ப்பு தளத்தில் மொழிபெயர்ப்பை சரிசெய்யவும்
+SubmitTranslation=இந்த மொழிக்கான மொழிபெயர்ப்பு முழுமையடையவில்லை அல்லது பிழைகளைக் கண்டால், <b> langs/%s </b> கோப்பகத்தில் உள்ள கோப்புகளைத் திருத்துவதன் மூலம் இதைச் சரிசெய்து, www.transifex.com/dolibarr/dolibarr-association/dolibarr-association க்கு உங்கள் மாற்றத்தைச் சமர்ப்பிக்கலாம்.
+SubmitTranslationENUS=இந்த மொழிக்கான மொழிபெயர்ப்பு முழுமையடையவில்லை அல்லது பிழைகளைக் கண்டால், கோப்புகளை <b> langs/%s </b> கோப்பகத்தில் திருத்துவதன் மூலம் இதைச் சரிசெய்யலாம் மற்றும் மாற்றியமைக்கப்பட்ட கோப்புகளை dolibarr.org/forum இல் சமர்ப்பிக்கலாம் அல்லது நீங்கள் PR டெவலப்பராக இருந்தால் .com/Dolibarr/dolibarr
+ModuleSetup=தொகுதி அமைப்பு
+ModulesSetup=தொகுதிகள்/பயன்பாட்டு அமைவு
+ModuleFamilyBase=அமைப்பு
+ModuleFamilyCrm=வாடிக்கையாளர் உறவு மேலாண்மை (CRM)
+ModuleFamilySrm=விற்பனையாளர் உறவு மேலாண்மை (VRM)
+ModuleFamilyProducts=தயாரிப்பு மேலாண்மை (PM)
+ModuleFamilyHr=மனித வள மேலாண்மை (HR)
+ModuleFamilyProjects=திட்டங்கள்/கூட்டு வேலை
+ModuleFamilyOther=மற்றவை
+ModuleFamilyTechnic=பல தொகுதிகள் கருவிகள்
+ModuleFamilyExperimental=பரிசோதனை தொகுதிகள்
+ModuleFamilyFinancial=நிதித் தொகுதிகள் (கணக்கியல்/கருவூலம்)
+ModuleFamilyECM=மின்னணு உள்ளடக்க மேலாண்மை (ECM)
+ModuleFamilyPortal=வலைத்தளங்கள் மற்றும் பிற முன்னணி பயன்பாடுகள்
+ModuleFamilyInterface=வெளிப்புற அமைப்புகளுடன் இடைமுகங்கள்
+MenuHandlers=மெனு கையாளுபவர்கள்
+MenuAdmin=மெனு எடிட்டர்
+DoNotUseInProduction=உற்பத்தியில் பயன்படுத்த வேண்டாம்
+ThisIsProcessToFollow=மேம்படுத்தல் செயல்முறை:
+ThisIsAlternativeProcessToFollow=கைமுறையாக செயலாக்க இது ஒரு மாற்று அமைப்பு:
+StepNb=படி %s
+FindPackageFromWebSite=உங்களுக்குத் தேவையான அம்சங்களை வழங்கும் தொகுப்பைக் கண்டறியவும் (உதாரணமாக %s என்ற அதிகாரப்பூர்வ இணையதளத்தில்).
+DownloadPackageFromWebSite=தொகுப்பைப் பதிவிறக்கவும் (உதாரணமாக %s அதிகாரப்பூர்வ இணையதளத்தில் இருந்து).
+UnpackPackageInDolibarrRoot=தொகுக்கப்பட்ட கோப்புகளை உங்கள் Dolibarr சர்வர் கோப்பகத்தில் திறக்கவும்/அன்சிப் செய்யவும்: <b> %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>
+InfDirExample= <br> பின்னர் கோப்பு <strong> conf.php </strong> <br> $ dolibarr_main_url_root_alt = '/ விருப்ப' <br> $ dolibarr_main_document_root_alt = '/ பாதை / / dolibarr / htdocs / மரபு ஆகியவற்றை' <br> இந்த வரிகளை "#" உடன் கருத்து என்றால், அவற்றை இயக்க அதை அறிவிக்க , "#" எழுத்தை அகற்றி கருத்துத் தெரிவிக்க வேண்டாம்.
+YouCanSubmitFile=தொகுதி தொகுப்பின் .zip கோப்பை நீங்கள் இங்கிருந்து பதிவேற்றலாம்:
+CurrentVersion=டோலிபார் தற்போதைய பதிப்பு
+CallUpdatePage=தரவுத்தள அமைப்பு மற்றும் தரவைப் புதுப்பிக்கும் பக்கத்திற்கு உலாவவும்: %s.
+LastStableVersion=சமீபத்திய நிலையான பதிப்பு
+LastActivationDate=சமீபத்திய செயல்படுத்தல் தேதி
+LastActivationAuthor=சமீபத்திய செயல்படுத்தல் ஆசிரியர்
+LastActivationIP=சமீபத்திய செயல்படுத்தல் ஐபி
+LastActivationVersion=சமீபத்திய செயல்படுத்தல் பதிப்பு
+UpdateServerOffline=சேவையகத்தை ஆஃப்லைனில் புதுப்பிக்கவும்
+WithCounter=ஒரு கவுண்டரை நிர்வகிக்கவும்
+GenericMaskCodes=நீங்கள் எந்த எண்ணும் முகமூடியையும் உள்ளிடலாம். இந்த முகமூடியில், பின்வரும் குறிச்சொற்களைப் பயன்படுத்தலாம்: <br> a0aee8365837fz0 {000000} </b> என்பது ஒவ்வொரு %s இல் அதிகரிக்கப்படும் எண்ணுக்கு ஒத்திருக்கும். கவுண்டரின் விரும்பிய நீளத்தின் அளவு பூஜ்ஜியங்களை உள்ளிடவும். முகமூடியைப் போல பல பூஜ்ஜியங்களைக் கொண்டிருப்பதற்காக, இடமிருந்து பூஜ்ஜியங்களால் கவுண்டர் முடிக்கப்படும். <br> <b> {000000+000} </b> முந்தையதைப் போலவே உள்ளது, ஆனால் + குறியின் வலதுபுறத்தில் உள்ள எண்ணுடன் தொடர்புடைய ஆஃப்செட் முதல் a0ecb2ec87f49 இலிருந்து பயன்படுத்தப்படுகிறது. <br> <b> {000000@x} </b> முந்தையதைப் போலவே உள்ளது, ஆனால் x மாதத்தை அடையும் போது கவுண்டர் பூஜ்ஜியத்திற்கு மீட்டமைக்கப்படும் (x 1 மற்றும் 12 க்கு இடையில், அல்லது 0 க்கு இடையில் 0 ஒவ்வொரு மாதமும் பூஜ்ஜியத்திற்கு மீட்டமைக்கவும்). இந்த விருப்பம் பயன்படுத்தப்பட்டு 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> அல்லது a0aee8306583901178365837 <br>
+GenericMaskCodes2= <b> {cccc} </b> கிளையன்ட் குறியீடு n எழுத்துகளில் <br> <b> {a0a20d52ea47 க்கு க்ளையன்ட் குறியீடு பின்தொடர்கிறது. வாடிக்கையாளருக்காக அர்ப்பணிக்கப்பட்ட இந்த கவுண்டர் உலகளாவிய கவுண்டரின் அதே நேரத்தில் மீட்டமைக்கப்படுகிறது. <br> <b> {tttt} </b> n எழுத்துகளில் மூன்றாம் தரப்பு வகையின் குறியீடு (மெனு முகப்பு - அமைவு - அகராதி - மூன்றாம் தரப்பினரின் வகைகளைப் பார்க்கவும்). இந்தக் குறிச்சொல்லைச் சேர்த்தால், ஒவ்வொரு மூன்றாம் தரப்பினருக்கும் கவுண்டர் வித்தியாசமாக இருக்கும். <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>
+GenericMaskCodes5= <b> ஏபிசி {YY} {மிமீ} - {000000} </b> கொடுக்கும் <b> ABC0701-000099 </b> <br> <b> {0000 நேரம் + 100 @ 1} -ZZZ / {ர்} / XXX ஐ </b> கொடுக்கும் <b> 0199-ZZZ / 31 / XXX ஐ </b> <br> <b> IN{yy}{mm}-{0000}-{t} </b> <b> IN0701-0099-A </b> இன் ஸ்கிரிப்ட் இன் ஸ்கிரிப்ட் வகையாக இருந்தால்
+GenericNumRefModelDesc=வரையறுக்கப்பட்ட முகமூடியின்படி தனிப்பயனாக்கக்கூடிய எண்ணை வழங்கும்.
+ServerAvailableOnIPOrPort=<b> %s </b> என்ற முகவரியில் சேவையகம் <b> %s </b> இல் கிடைக்கிறது
+ServerNotAvailableOnIPOrPort=<b> %s </b> என்ற முகவரியில் சேவையகம் இல்லை <b> %s a09a4b730f17f8
+DoTestServerAvailability=சர்வர் இணைப்பை சோதிக்கவும்
+DoTestSend=சோதனை அனுப்புதல்
+DoTestSendHTML=HTML அனுப்பும் சோதனை
+ErrorCantUseRazIfNoYearInMask=பிழை, வரிசை {yy} அல்லது {yyyy} முகமூடியில் இல்லையெனில், கவுண்டரை மீட்டமைக்க @ என்ற விருப்பத்தைப் பயன்படுத்த முடியாது.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=பிழை, {yy}{mm} அல்லது {yyyy}{mm} முகமூடியில் இல்லையெனில் @ விருப்பத்தைப் பயன்படுத்த முடியாது.
+UMask=Unix/Linux/BSD/Mac கோப்பு முறைமையில் புதிய கோப்புகளுக்கான UMask அளவுரு.
+UMaskExplanation=இந்த அளவுரு சேவையகத்தில் Dolibarr ஆல் உருவாக்கப்பட்ட கோப்புகளில் இயல்புநிலையாக அமைக்கப்பட்ட அனுமதிகளை வரையறுக்க உங்களை அனுமதிக்கிறது (உதாரணமாக பதிவேற்றத்தின் போது). <br> இது ஆக்டல் மதிப்பாக இருக்க வேண்டும் (உதாரணமாக, 0666 என்றால் அனைவருக்கும் படிக்கவும் எழுதவும்). <br> இந்த அளவுரு விண்டோஸ் சர்வரில் பயனற்றது.
+SeeWikiForAllTeam=பங்களிப்பாளர்கள் மற்றும் அவர்களின் நிறுவனங்களின் பட்டியலுக்கு விக்கி பக்கத்தைப் பார்க்கவும்
+UseACacheDelay= வினாடிகளில் ஏற்றுமதி பதிலை தேக்ககப்படுத்துவதில் தாமதம் (0 அல்லது கேச் இல்லாதது காலி)
+DisableLinkToHelpCenter=உள்நுழைவு பக்கத்தில் " <b> உதவி அல்லது ஆதரவு </b> " என்ற இணைப்பை மறை
+DisableLinkToHelp=ஆன்லைன் உதவிக்கான இணைப்பை மறை " <b> %s </b> "
+AddCRIfTooLong=தானியங்கி உரை மடக்குதல் இல்லை, மிக நீளமான உரை ஆவணங்களில் காட்டப்படாது. தேவைப்பட்டால், டெக்ஸ்ட் பகுதியில் கேரேஜ் ரிட்டர்ன்களைச் சேர்க்கவும்.
+ConfirmPurge=இந்த சுத்திகரிப்புச் செயலை நிச்சயமாகச் செயல்படுத்த விரும்புகிறீர்களா? <br> இது உங்கள் எல்லா தரவுக் கோப்புகளையும் மீட்டெடுக்க வழியின்றி நிரந்தரமாக நீக்கும் (ECM கோப்புகள், இணைக்கப்பட்ட கோப்புகள்...).
+MinLength=குறைந்தபட்ச நீளம்
+LanguageFilesCachedIntoShmopSharedMemory=கோப்புகள் .lang பகிரப்பட்ட நினைவகத்தில் ஏற்றப்பட்டது
+LanguageFile=மொழி கோப்பு
+ExamplesWithCurrentSetup=தற்போதைய உள்ளமைவுடன் எடுத்துக்காட்டுகள்
+ListOfDirectories=OpenDocument டெம்ப்ளேட் கோப்பகங்களின் பட்டியல்
+ListOfDirectoriesForModelGenODT=OpenDocument வடிவத்துடன் கூடிய டெம்ப்ளேட் கோப்புகளைக் கொண்ட கோப்பகங்களின் பட்டியல். <br> <br> கோப்பகங்களின் முழு பாதையை இங்கே வைக்கவும். <br> eah டைரக்டரிக்கு இடையே ஒரு கேரேஜ் ரிட்டர்னைச் சேர்க்கவும். <br> GED தொகுதியின் கோப்பகத்தைச் சேர்க்க, <b> DOL_DATA_ROOT/ecm/yourdirectoryname </b> . <br> <br> அந்த கோப்பகங்களில் உள்ள கோப்புகள் <b> .odt </b> அல்லது <b> .ods az3901
+NumberOfModelFilesFound=இந்த கோப்பகங்களில் காணப்படும் ODT/ODS டெம்ப்ளேட் கோப்புகளின் எண்ணிக்கை
+ExampleOfDirectoriesForModelGen=தொடரியல் எடுத்துக்காட்டுகள்: <br> c:\\myapp\\mydocumentdir\\mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA/ecmd/
+FollowingSubstitutionKeysCanBeUsed= <br> உங்கள் odt ஆவண டெம்ப்ளேட்களை எவ்வாறு உருவாக்குவது என்பதை அறிய, அவற்றை அந்த கோப்பகங்களில் சேமிப்பதற்கு முன், விக்கி ஆவணங்களைப் படிக்கவும்:
+FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
+FirstnameNamePosition=பெயர்/இடைப்பெயரின் நிலை
+DescWeather=தாமதமான செயல்களின் எண்ணிக்கை பின்வரும் மதிப்புகளை அடையும் போது பின்வரும் படங்கள் டாஷ்போர்டில் காண்பிக்கப்படும்:
+KeyForWebServicesAccess=இணைய சேவைகளைப் பயன்படுத்துவதற்கான திறவுகோல் (இணைய சேவைகளில் "dolibarrkey" அளவுரு)
+TestSubmitForm=உள்ளீட்டு சோதனை வடிவம்
+ThisForceAlsoTheme=இந்த மெனு மேனேஜரைப் பயன்படுத்துவது, பயனர் தேர்வு எதுவாக இருந்தாலும் அதன் சொந்த கருப்பொருளைப் பயன்படுத்தும். மேலும் ஸ்மார்ட்ஃபோன்களுக்காக பிரத்யேகமான இந்த மெனு மேனேஜர் எல்லா ஸ்மார்ட்போனிலும் வேலை செய்யாது. உங்களின் மெனு மேலாளரில் சிக்கல் ஏற்பட்டால், மற்றொரு மெனு மேலாளரைப் பயன்படுத்தவும்.
+ThemeDir=தோல்கள் அடைவு
+ConnectionTimeout=இணைப்பு நேரம் முடிந்தது
+ResponseTimeout=பதில் நேரம் முடிந்தது
+SmsTestMessage=__PHONEFROM__ இலிருந்து __PHONETO__ க்கு சோதனை செய்தி
+ModuleMustBeEnabledFirst=தொகுதி <b> %s </b> இந்த அம்சம் தேவைப்பட்டால் முதலில் இயக்கப்பட வேண்டும்.
+SecurityToken=URLகளைப் பாதுகாப்பதற்கான திறவுகோல்
+NoSmsEngine=SMS அனுப்புநர் மேலாளர் இல்லை. எஸ்எம்எஸ் அனுப்புனர் மேலாளர் இயல்புநிலை விநியோகத்துடன் நிறுவப்படவில்லை, ஏனெனில் அவர்கள் வெளிப்புற விற்பனையாளரைச் சார்ந்துள்ளனர், ஆனால் நீங்கள் சிலவற்றை %s இல் காணலாம்
+PDF=PDF
+PDFDesc=PDF உருவாக்கத்திற்கான உலகளாவிய விருப்பங்கள்
+PDFOtherDesc=சில தொகுதிகளுக்கு குறிப்பிட்ட PDF விருப்பம்
+PDFAddressForging=முகவரி பிரிவுக்கான விதிகள்
+HideAnyVATInformationOnPDF=விற்பனை வரி / VAT தொடர்பான அனைத்து தகவல்களையும் மறைக்கவும்
+PDFRulesForSalesTax=விற்பனை வரி / VAT க்கான விதிகள்
+PDFLocaltax=%s க்கான விதிகள்
+HideLocalTaxOnPDF=விற்பனை வரி / VAT நெடுவரிசையில் %s விகிதத்தை மறை
+HideDescOnPDF=தயாரிப்பு விளக்கத்தை மறை
+HideRefOnPDF=தயாரிப்புகளை மறை.
+HideDetailsOnPDF=தயாரிப்பு வரி விவரங்களை மறை
+PlaceCustomerAddressToIsoLocation=வாடிக்கையாளர் முகவரி நிலைக்கு பிரெஞ்சு நிலையான நிலையை (La Poste) பயன்படுத்தவும்
+Library=நூலகம்
+UrlGenerationParameters=URLகளைப் பாதுகாப்பதற்கான அளவுருக்கள்
+SecurityTokenIsUnique=ஒவ்வொரு URLக்கும் தனிப்பட்ட பாதுகாப்பு விசை அளவுருவைப் பயன்படுத்தவும்
+EnterRefToBuildUrl=ஆப்ஜெக்ட் %s க்கான குறிப்பை உள்ளிடவும்
+GetSecuredUrl=கணக்கிடப்பட்ட URL ஐப் பெறவும்
+ButtonHideUnauthorized=உள் பயனர்களுக்கும் அங்கீகரிக்கப்படாத செயல் பொத்தான்களை மறைக்கவும் (வேறுவிதமாக சாம்பல் நிறத்தில் உள்ளது)
+OldVATRates=பழைய VAT விகிதம்
+NewVATRates=புதிய VAT விகிதம்
+PriceBaseTypeToChange=அடிப்படை குறிப்பு மதிப்பு வரையறுக்கப்பட்ட விலையில் மாற்றவும்
+MassConvert=மொத்த மாற்றத்தைத் தொடங்கவும்
+PriceFormatInCurrentLanguage=தற்போதைய மொழியில் விலை வடிவம்
+String=லேசான கயிறு
+String1Line=சரம் (1 வரி)
+TextLong=நீண்ட உரை
+TextLongNLines=நீண்ட உரை (n கோடுகள்)
+HtmlText=Html உரை
+Int=முழு
+Float=மிதவை
+DateAndTime=தேதி மற்றும் மணிநேரம்
+Unique=தனித்துவமான
+Boolean=பூலியன் (ஒரு தேர்வுப்பெட்டி)
+ExtrafieldPhone = தொலைபேசி
+ExtrafieldPrice = விலை
+ExtrafieldMail = மின்னஞ்சல்
+ExtrafieldUrl = Url
+ExtrafieldSelect = பட்டியலைத் தேர்ந்தெடுக்கவும்
+ExtrafieldSelectList = அட்டவணையில் இருந்து தேர்ந்தெடுக்கவும்
+ExtrafieldSeparator=பிரிப்பான் (ஒரு புலம் அல்ல)
+ExtrafieldPassword=கடவுச்சொல்
+ExtrafieldRadio=ரேடியோ பொத்தான்கள் (ஒரு தேர்வு மட்டும்)
+ExtrafieldCheckBox=தேர்வுப்பெட்டிகள்
+ExtrafieldCheckBoxFromList=அட்டவணையில் இருந்து தேர்வுப்பெட்டிகள்
+ExtrafieldLink=ஒரு பொருளுக்கான இணைப்பு
+ComputedFormula=கணக்கிடப்பட்ட புலம்
+ComputedFormulaDesc=டைனமிக் கணக்கிடப்பட்ட மதிப்பைப் பெற, பொருளின் பிற பண்புகள் அல்லது ஏதேனும் PHP குறியீட்டைப் பயன்படுத்தி நீங்கள் இங்கே ஒரு சூத்திரத்தை உள்ளிடலாம். "?" உட்பட எந்த PHP இணக்கமான சூத்திரங்களையும் நீங்கள் பயன்படுத்தலாம். நிபந்தனை ஆபரேட்டர் மற்றும் பின்வரும் உலகளாவிய பொருள்: <strong> $db, $conf, $langs, $mysoc, $user, $object </strong> . <br> <strong> எச்சரிக்கை </strong> : $object இன் சில பண்புகள் மட்டுமே கிடைக்கக்கூடும். உங்களுக்கு ஏற்றப்படாத பண்புகள் தேவைப்பட்டால், இரண்டாவது எடுத்துக்காட்டில் உள்ளதைப் போல உங்கள் சூத்திரத்தில் பொருளைப் பெறுங்கள். <br> கணக்கிடப்பட்ட புலத்தைப் பயன்படுத்தினால், இடைமுகத்திலிருந்து எந்த மதிப்பையும் நீங்களே உள்ளிட முடியாது. மேலும், தொடரியல் பிழை இருந்தால், சூத்திரம் எதையும் வழங்காது. <br> <br> சூத்திரத்தின் எடுத்துக்காட்டு: <br> $object->id < 10 ? round($object-> id / 2, 2): ($object->id + 2 * $zin, 1) ) <br> <br> பொருளை மீண்டும் ஏற்றுவதற்கான எடுத்துக்காட்டு <br> (($reloadedobj = புதிய சமூகம்($db)) && ($reloadedobj->fetchNoCompute($obj->jid-$obj->jid-$obj-> >rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1' <br> <br> பொருளின் சுமை மற்றும் அதன் மூலப் பொருளை கட்டாயப்படுத்துவதற்கான சூத்திரத்தின் மற்ற எடுத்துக்காட்டு: )) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = புதிய திட்டம்($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent Project கிடைக்கவில்லை'
+Computedpersistent=கணக்கிடப்பட்ட புலத்தை சேமிக்கவும்
+ComputedpersistentDesc=கணக்கிடப்பட்ட கூடுதல் புலங்கள் தரவுத்தளத்தில் சேமிக்கப்படும், இருப்பினும், இந்த புலத்தின் பொருள் மாற்றப்படும் போது மட்டுமே மதிப்பு மீண்டும் கணக்கிடப்படும். கணக்கிடப்பட்ட புலம் மற்ற பொருள்கள் அல்லது உலகளாவிய தரவு சார்ந்து இருந்தால் இந்த மதிப்பு தவறாக இருக்கலாம்!!
+ExtrafieldParamHelpPassword=இந்த புலத்தை காலியாக விடுவது என்பது குறியாக்கம் இல்லாமல் இந்த மதிப்பு சேமிக்கப்படும் (புலம் திரையில் நட்சத்திரத்துடன் மட்டுமே மறைக்கப்பட வேண்டும்). <br> தரவுத்தளத்தில் கடவுச்சொல்லைச் சேமிக்க இயல்புநிலை குறியாக்க விதியைப் பயன்படுத்த 'தானியங்கு' அமைக்கவும் (பின்னர் மதிப்பு வாசிப்பு ஹாஷ் மட்டுமே, அசல் மதிப்பை மீட்டெடுக்க வழி இல்லை)
+ExtrafieldParamHelpselect=மதிப்புகள் பட்டியல் வடிவம் விசை வரிகளை இருக்க வேண்டும், மதிப்பு (விசையை இருக்க அங்கு முடியாது '0') <br> <br> உதாரணமாக: <br> 1, மதிப்பு 1 <br> 2, மதிப்பு 2 <br> code3, value3 <br> ... <br> <br> வேண்டும் பொருட்டு மற்றொரு நிரப்பு பண்பு பட்டியலில் பொறுத்து பட்டியல்: <br> 1, மதிப்பு 1 | options_ <i> parent_list_code </i>: parent_key <br> 2, மதிப்பு 2 | 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=மதிப்புகளின் பட்டியல் வடிவமைப்பு விசை, மதிப்பு (விசை '0' ஆக இருக்க முடியாது) கொண்ட கோடுகளாக இருக்க வேண்டும்.
+ExtrafieldParamHelpradio=மதிப்புகளின் பட்டியல் வடிவமைப்பு விசை, மதிப்பு (விசை '0' ஆக இருக்க முடியாது) கொண்ட கோடுகளாக இருக்க வேண்டும்.
+ExtrafieldParamHelpsellist=TABLE_NAME: label_field: மதிப்புகள் பட்டியல் தொடரியல் <br> ஒரு அட்டவணை இருந்து வருகிறது id_field :: filtersql <br> உதாரணம்: c_typent: libelle: ஐடி :: filtersql <br> <br> - id_field necessarly ஒரு முதன்மை எண்ணாக முக்கிய <br> உள்ளது - filtersql ஒரு SQL நிலைமையாகும். செயலில் உள்ள மதிப்பு <br> ஐ மட்டும் காட்ட இது ஒரு எளிய சோதனையாக இருக்கலாம் (எ.கா. செயலில்=1) நீங்கள் $ID$ ஐ வடிகட்டியில் பயன்படுத்தலாம், இது தற்போதைய பொருளின் தற்போதைய ஐடி <br> வடிகட்டியில் SELECT ஐப் பயன்படுத்த $SEL$ என்ற முக்கிய சொல்லைப் பயன்படுத்தவும். பைபாஸ் எதிர்ப்பு ஊசி பாதுகாப்பு. <br> நீங்கள் எக்ஸ்ட்ராஃபீல்டுகளில் வடிகட்ட விரும்பினால் தொடரியல் extra.fieldcode=... (புலம் குறியீடு என்பது எக்ஸ்ட்ராஃபீல்டின் குறியீடாக இருக்கும்) <br> <br> மற்றொரு நிரப்பு பண்புக்கூறு பட்டியல்: a0342fcfda19bz0 பட்டியல் இருக்க வேண்டும்: <i> parent_list_code </i> | parent_column: |: வடிகட்டி <br> c_typent: libelle: ஐடி parent_column <i> parent_list_code </i> மற்றொரு பட்டியல் பொறுத்து பட்டியலில் வேண்டும் பொருட்டு வடிகட்டி <br> <br>
+ExtrafieldParamHelpchkbxlst=மதிப்புகளின் பட்டியல் <br> அட்டவணையிலிருந்து வருகிறது தொடரியல்: table_name:label_field:id_field::filtersql <br> எடுத்துக்காட்டு: c_typent:libelle:id::filtersql <br> எடுத்துக்காட்டு வடிகட்டி சூனியத்தில் $ID$ ஐப் பயன்படுத்தலாம் என்பது தற்போதைய பொருளின் தற்போதைய ஐடி <br> வடிப்பானில் ஒரு SELECT செய்ய $SEL$ <br> ஐப் பயன்படுத்தவும், நீங்கள் எக்ஸ்ட்ராஃபீல்டுகளில் வடிகட்ட விரும்பினால், தொடரியல் கூடுதல்.fieldcode=... (புலம் குறியீடு என்பது இதில் உள்ளது extrafield குறியீடு) <br> <br> மற்றொரு நிரப்பு பண்பு பட்டியலில் பொறுத்து பட்டியலில் வேண்டும் அவற்றின் விவரம் வருமாறு: <br> c_typent: libelle: ஐடி: options_ <i> parent_list_code </i> | parent_column: வடிகட்டி <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 ஆக அமைக்கவும் (புதிய அமர்வுக்கு இயல்புநிலையாகச் சுருக்கப்பட்டது. ஒவ்வொரு பயனர் அமர்வுக்கும் நிலை வைக்கப்படும்)
+LibraryToBuildPDF=நூலகம் PDF உருவாக்கப் பயன்படுகிறது
+LocalTaxDesc=சில நாடுகள் ஒவ்வொரு இன்வாய்ஸ் வரியிலும் இரண்டு அல்லது மூன்று வரிகளை விதிக்கலாம். இதுபோன்றால், இரண்டாவது மற்றும் மூன்றாவது வரி மற்றும் அதன் விகிதத்திற்கான வகையைத் தேர்ந்தெடுக்கவும். சாத்தியமான வகை: <br> 1: வாட் இல்லாத பொருட்கள் மற்றும் சேவைகளுக்கு உள்ளூர் வரி விதிக்கப்படும் (உள்ளூர் வரி விதிக்கப்படாத தொகையின் அடிப்படையில் கணக்கிடப்படுகிறது) <br> 2: வாட் உட்பட பொருட்கள் மற்றும் சேவைகளுக்கு உள்ளூர் வரி விதிக்கப்படும் (உள்ளூர் வரி தொகை + முக்கிய வரியில் கணக்கிடப்படுகிறது) a0342bzccfda3 வாட் இல்லாத பொருட்களுக்கு உள்ளூர் வரி பொருந்தும் (வரி இல்லாத தொகையின் அடிப்படையில் உள்ளூர் வரி கணக்கிடப்படுகிறது) <br> 4: வாட் உள்ளிட்ட தயாரிப்புகளுக்கு உள்ளூர் வரி பொருந்தும் (லோக்கல்டாக்ஸ் தொகை + முக்கிய வாட் மீது கணக்கிடப்படுகிறது) <br> 5: வாட் இல்லாத சேவைகளுக்கு உள்ளூர் வரி விதிக்கப்படும் (உள்ளூர் வரி கணக்கிடப்படுகிறது வரி இல்லாத தொகையின் மீது) <br> 6: வாட் உள்ளிட்ட சேவைகளுக்கு உள்ளூர் வரி பொருந்தும் (உள்ளூர் வரி என்பது தொகை + வரியின் அடிப்படையில் கணக்கிடப்படுகிறது)
+SMS=எஸ்எம்எஸ்
+LinkToTestClickToDial=பயனர் <strong> %s </strong>க்கான ClickToDial urlஐச் சோதிக்க இணைப்பைக் காட்ட, அழைப்பதற்கான தொலைபேசி எண்ணை உள்ளிடவும்.
+RefreshPhoneLink=இணைப்பைப் புதுப்பிக்கவும்
+LinkToTest=<strong> %s </strong> (சோதனை செய்ய தொலைபேசி எண்ணைக் கிளிக் செய்யவும்)
+KeepEmptyToUseDefault=இயல்புநிலை மதிப்பைப் பயன்படுத்த, காலியாக வைக்கவும்
+KeepThisEmptyInMostCases=பெரும்பாலான சந்தர்ப்பங்களில், இந்த புலத்தை நீங்கள் காலியாக வைத்திருக்கலாம்.
+DefaultLink=இயல்புநிலை இணைப்பு
+SetAsDefault=இயல்புநிலைக்கு அமை
+ValueOverwrittenByUserSetup=எச்சரிக்கை, இந்த மதிப்பு பயனர் குறிப்பிட்ட அமைப்பால் மேலெழுதப்படலாம் (ஒவ்வொரு பயனரும் அவரவர் கிளிக்டோடியல் url ஐ அமைக்கலாம்)
+ExternalModule=வெளிப்புற தொகுதி
+InstalledInto=%s கோப்பகத்தில் நிறுவப்பட்டது
+BarcodeInitForThirdparties=மூன்றாம் தரப்பினருக்கான மாஸ் பார்கோடு init
+BarcodeInitForProductsOrServices=தயாரிப்புகள் அல்லது சேவைகளுக்கு பெருமளவிலான பார்கோடு துவக்கவும் அல்லது மீட்டமைக்கவும்
+CurrentlyNWithoutBarCode=தற்போது, <strong> %s a0a65d071f6fc947c06bz0 %s </strong> பதிவு உள்ளது.
+InitEmptyBarCode=அடுத்த %s வெற்றுப் பதிவுகளுக்கான தொடக்க மதிப்பு
+EraseAllCurrentBarCode=தற்போதைய பார்கோடு மதிப்புகள் அனைத்தையும் அழிக்கவும்
+ConfirmEraseAllCurrentBarCode=தற்போதைய பார்கோடு மதிப்புகள் அனைத்தையும் நிச்சயமாக அழிக்க விரும்புகிறீர்களா?
+AllBarcodeReset=அனைத்து பார்கோடு மதிப்புகளும் அகற்றப்பட்டன
+NoBarcodeNumberingTemplateDefined=பார்கோடு தொகுதி அமைப்பில் எண்ணிங் பார்கோடு டெம்ப்ளேட் எதுவும் இயக்கப்படவில்லை.
+EnableFileCache=கோப்பு தற்காலிக சேமிப்பை இயக்கு
+ShowDetailsInPDFPageFoot=நிறுவனத்தின் முகவரி அல்லது மேலாளர் பெயர்கள் (தொழில்முறை ஐடிகள், நிறுவனத்தின் மூலதனம் மற்றும் VAT எண் தவிர) போன்ற கூடுதல் விவரங்களை அடிக்குறிப்பில் சேர்க்கவும்.
+NoDetails=அடிக்குறிப்பில் கூடுதல் விவரங்கள் இல்லை
+DisplayCompanyInfo=நிறுவனத்தின் முகவரியைக் காட்டு
+DisplayCompanyManagers=காட்சி மேலாளர் பெயர்கள்
+DisplayCompanyInfoAndManagers=நிறுவனத்தின் முகவரி மற்றும் மேலாளர் பெயர்களைக் காட்டு
+EnableAndSetupModuleCron=இந்த தொடர்ச்சியான விலைப்பட்டியல் தானாக உருவாக்கப்பட வேண்டுமெனில், தொகுதி *%s* இயக்கப்பட்டு சரியாக அமைக்கப்பட வேண்டும். இல்லையெனில், *உருவாக்கு* பொத்தானைப் பயன்படுத்தி இந்த டெம்ப்ளேட்டிலிருந்து இன்வாய்ஸ்களை உருவாக்குவது கைமுறையாக செய்யப்பட வேண்டும். நீங்கள் தானியங்கு உருவாக்கத்தை இயக்கியிருந்தாலும், நீங்கள் பாதுகாப்பாக கைமுறையாக உருவாக்க முடியும் என்பதை நினைவில் கொள்ளவும். ஒரே காலகட்டத்திற்கான நகல்களை உருவாக்குவது சாத்தியமில்லை.
+ModuleCompanyCodeCustomerAquarium=%sஐத் தொடர்ந்து வாடிக்கையாளர் கணக்குக் குறியீட்டிற்கான வாடிக்கையாளர் குறியீடு
+ModuleCompanyCodeSupplierAquarium=%s தொடர்ந்து விற்பனையாளர் கணக்கியல் குறியீட்டிற்கான விற்பனையாளர் குறியீடு
+ModuleCompanyCodePanicum=வெற்று கணக்கியல் குறியீட்டை திரும்பப் பெறவும்.
+ModuleCompanyCodeDigitaria=மூன்றாம் தரப்பினரின் பெயருக்கு ஏற்ப கூட்டு கணக்கியல் குறியீட்டை வழங்கும். குறியீடு ஒரு முன்னொட்டைக் கொண்டுள்ளது, இது மூன்றாம் தரப்பு குறியீட்டில் வரையறுக்கப்பட்ட எழுத்துக்களின் எண்ணிக்கையைத் தொடர்ந்து முதல் நிலையில் வரையறுக்கப்படலாம்.
+ModuleCompanyCodeCustomerDigitaria=%s ஐத் தொடர்ந்து துண்டிக்கப்பட்ட வாடிக்கையாளரின் பெயர் எழுத்துகளின் எண்ணிக்கை: %s வாடிக்கையாளர் கணக்கியல் குறியீட்டிற்கு.
+ModuleCompanyCodeSupplierDigitaria=%s ஐத் தொடர்ந்து துண்டிக்கப்பட்ட சப்ளையர் பெயரை எழுத்துகளின் எண்ணிக்கையால்: %s சப்ளையர் கணக்கியல் குறியீட்டிற்கு.
+Use3StepsApproval=இயல்பாக, பர்ச்சேஸ் ஆர்டர்களை 2 வெவ்வேறு பயனர்கள் உருவாக்கி அங்கீகரிக்க வேண்டும் (ஒரு படி/பயனர் உருவாக்க மற்றும் ஒரு படி/பயனர் அங்கீகரிக்க வேண்டும். பயனர் உருவாக்க மற்றும் அங்கீகரிக்க இரண்டு அனுமதியும் இருந்தால், ஒரு படி/பயனர் போதுமானது என்பதை நினைவில் கொள்ளவும்) . பிரத்யேக மதிப்பை விட தொகை அதிகமாக இருந்தால், மூன்றாவது படி/பயனர் ஒப்புதலை அறிமுகப்படுத்த இந்த விருப்பத்தின் மூலம் நீங்கள் கேட்கலாம் (எனவே 3 படிகள் தேவைப்படும்: 1=சரிபார்ப்பு, 2=முதல் ஒப்புதல் மற்றும் 3=தொகை போதுமானதாக இருந்தால் இரண்டாவது ஒப்புதல்). <br> ஒரு ஒப்புதல் (2 படிகள்) போதுமானதாக இருந்தால், இதை காலியாக அமைக்கவும், இரண்டாவது ஒப்புதல் (3 படிகள்) எப்போதும் தேவைப்பட்டால் மிகக் குறைந்த மதிப்பாக (0.1) அமைக்கவும்.
+UseDoubleApproval=தொகை (வரி இல்லாமல்) அதிகமாக இருக்கும் போது 3 படிகள் அனுமதியைப் பயன்படுத்தவும்...
+WarningPHPMail=எச்சரிக்கை: பயன்பாட்டிலிருந்து மின்னஞ்சல்களை அனுப்புவதற்கான அமைப்பு இயல்புநிலை பொதுவான அமைப்பைப் பயன்படுத்துகிறது. பல காரணங்களுக்காக இயல்புநிலை அமைப்பிற்குப் பதிலாக உங்கள் மின்னஞ்சல் சேவை வழங்குநரின் மின்னஞ்சல் சேவையகத்தைப் பயன்படுத்த வெளிச்செல்லும் மின்னஞ்சல்களை அமைப்பது நல்லது:
+WarningPHPMailA=- மின்னஞ்சல் சேவை வழங்குநரின் சேவையகத்தைப் பயன்படுத்துவது உங்கள் மின்னஞ்சலின் நம்பகத்தன்மையை அதிகரிக்கிறது, எனவே இது ஸ்பேம் எனக் கொடியிடப்படாமல் விநியோகத்தை அதிகரிக்கிறது
+WarningPHPMailB=- சில மின்னஞ்சல் சேவை வழங்குநர்கள் (Yahoo போன்றவை) தங்கள் சொந்த சேவையகத்தை விட வேறொரு சேவையகத்திலிருந்து மின்னஞ்சல் அனுப்ப உங்களை அனுமதிப்பதில்லை. உங்கள் தற்போதைய அமைப்பு மின்னஞ்சலை அனுப்ப பயன்பாட்டின் சேவையகத்தைப் பயன்படுத்துகிறது, உங்கள் மின்னஞ்சல் வழங்குநரின் சேவையகத்தை அல்ல, எனவே சில பெறுநர்கள் (கட்டுப்படுத்தப்பட்ட DMARC நெறிமுறையுடன் இணக்கமானது), உங்கள் மின்னஞ்சலையும் சில மின்னஞ்சல் வழங்குநர்களையும் ஏற்க முடியுமா என்று உங்கள் மின்னஞ்சல் வழங்குநரிடம் கேட்பார்கள். (Yahoo போன்றது) "இல்லை" என்று பதிலளிக்கலாம், ஏனெனில் சேவையகம் அவர்களுடையது அல்ல, எனவே நீங்கள் அனுப்பிய சில மின்னஞ்சல்கள் டெலிவரிக்கு ஏற்றுக்கொள்ளப்படாமல் போகலாம் (உங்கள் மின்னஞ்சல் வழங்குநரின் அனுப்பும் ஒதுக்கீட்டிலும் கவனமாக இருக்கவும்).
+WarningPHPMailC=- மின்னஞ்சல்களை அனுப்ப உங்கள் சொந்த மின்னஞ்சல் சேவை வழங்குநரின் SMTP சேவையகத்தைப் பயன்படுத்துவதும் சுவாரஸ்யமானது, எனவே பயன்பாட்டிலிருந்து அனுப்பப்படும் அனைத்து மின்னஞ்சல்களும் உங்கள் அஞ்சல் பெட்டியின் "அனுப்பப்பட்ட" கோப்பகத்தில் சேமிக்கப்படும்.
+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
+ClickToShowDescription=விளக்கத்தைக் காட்ட கிளிக் செய்யவும்
+DependsOn=இந்த தொகுதிக்கு தொகுதி(கள்) தேவை
+RequiredBy=இந்த தொகுதிக்கு தொகுதி(கள்) தேவை
+TheKeyIsTheNameOfHtmlField=இது HTML புலத்தின் பெயர். புலத்தின் முக்கிய பெயரைப் பெற HTML பக்கத்தின் உள்ளடக்கத்தைப் படிக்க தொழில்நுட்ப அறிவு தேவை.
+PageUrlForDefaultValues=பக்க URL இன் தொடர்புடைய பாதையை நீங்கள் உள்ளிட வேண்டும். URL இல் அளவுருக்களைச் சேர்த்தால், எல்லா அளவுருக்களும் ஒரே மதிப்பில் அமைக்கப்பட்டால், இயல்புநிலை மதிப்புகள் பயனுள்ளதாக இருக்கும்.
+PageUrlForDefaultValuesCreate= <br> எடுத்துக்காட்டு: <br> புதிய மூன்றாம் தரப்பை உருவாக்க படிவத்திற்கு, <strong> %s </strong> . <br> தனிப்பயன் கோப்பகத்தில் நிறுவப்பட்ட வெளிப்புற தொகுதிகளின் URL க்கு, "தனிப்பயன்/" சேர்க்க வேண்டாம், எனவே <strong> mymodule/mypage.php </strong> போன்ற பாதையைப் பயன்படுத்தவும் மற்றும் custom/mymodule/mypage. <br> url இல் ஏதேனும் அளவுரு இருந்தால் மட்டுமே இயல்புநிலை மதிப்பை நீங்கள் விரும்பினால், நீங்கள் <strong> %s </strong> ஐப் பயன்படுத்தலாம்
+PageUrlForDefaultValuesList= <br> எடுத்துக்காட்டு: <br> மூன்றாம் தரப்பினரைப் பட்டியலிடும் பக்கத்திற்கு, இது <strong> %s </strong> . <br> தனிப்பயன் கோப்பகத்தில் நிறுவப்பட்ட வெளிப்புற தொகுதிகளின் URL க்கு, "தனிப்பயன்/" சேர்க்க வேண்டாம், எனவே <strong> mymodule/mypagelist.php </strong> போன்ற பாதையைப் பயன்படுத்தவும் மற்றும் custom/mymodule.ph. <br> url இல் ஏதேனும் அளவுரு இருந்தால் மட்டுமே இயல்புநிலை மதிப்பை நீங்கள் விரும்பினால், நீங்கள் <strong> %s </strong> ஐப் பயன்படுத்தலாம்
+AlsoDefaultValuesAreEffectiveForActionCreate=படிவ உருவாக்கத்திற்கான இயல்புநிலை மதிப்புகளை மேலெழுதுவது சரியாக வடிவமைக்கப்பட்ட பக்கங்களுக்கு மட்டுமே வேலை செய்யும் (அதனால் அளவுரு செயல்=உருவாக்கு அல்லது வழங்குதல்...)
+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 பிரத்யேக கோப்பகம் "பொது" - உள்நுழைவு தேவையில்லை)
+DAV_ALLOW_PUBLIC_DIRTooltip=பொதுவான பொது அடைவு என்பது ஒரு WebDAV கோப்பகமாகும் (படிக்க மற்றும் எழுதும் பயன்முறையில்), அங்கீகாரம் தேவையில்லை (உள்நுழைவு/கடவுச்சொல் கணக்கு).
+DAV_ALLOW_ECM_DIR=DMS/ECM தனிப்பட்ட கோப்பகத்தை இயக்கவும் (DMS/ECM தொகுதியின் ரூட் கோப்பகம் - உள்நுழைவு தேவை)
+DAV_ALLOW_ECM_DIRTooltip=DMS/ECM தொகுதியைப் பயன்படுத்தும் போது அனைத்து கோப்புகளும் கைமுறையாக பதிவேற்றப்படும் ரூட் கோப்பகம். இணைய இடைமுகத்திலிருந்து அணுகுவது போலவே, அதை அணுகுவதற்கு சரியான அனுமதியுடன் சரியான உள்நுழைவு/கடவுச்சொல் வேண்டும்.
+# Modules
+Module0Name=பயனர்கள் மற்றும் குழுக்கள்
+Module0Desc=பயனர்கள் / பணியாளர்கள் மற்றும் குழுக்கள் மேலாண்மை
+Module1Name=மூன்றாம் தரப்பினர்
+Module1Desc=நிறுவனங்கள் மற்றும் தொடர்பு மேலாண்மை (வாடிக்கையாளர்கள், வாய்ப்புகள்...)
+Module2Name=வணிகம்
+Module2Desc=வணிக மேலாண்மை
+Module10Name=கணக்கியல் (எளிமைப்படுத்தப்பட்டது)
+Module10Desc=தரவுத்தள உள்ளடக்கத்தின் அடிப்படையில் எளிய கணக்கியல் அறிக்கைகள் (பத்திரிகைகள், வருவாய்). எந்த லெட்ஜர் அட்டவணையையும் பயன்படுத்துவதில்லை.
+Module20Name=முன்மொழிவுகள்
+Module20Desc=வணிக முன்மொழிவு மேலாண்மை
+Module22Name=வெகுஜன மின்னஞ்சல்கள்
+Module22Desc=மொத்த மின்னஞ்சலை நிர்வகிக்கவும்
+Module23Name=ஆற்றல்
+Module23Desc=ஆற்றல் நுகர்வு கண்காணிப்பு
+Module25Name=விற்பனை ஆணைகள்
+Module25Desc=விற்பனை ஒழுங்கு மேலாண்மை
+Module30Name=இன்வாய்ஸ்கள்
+Module30Desc=வாடிக்கையாளர்களுக்கான விலைப்பட்டியல் மற்றும் கடன் குறிப்புகளின் மேலாண்மை. சப்ளையர்களுக்கான விலைப்பட்டியல் மற்றும் கடன் குறிப்புகளின் மேலாண்மை
+Module40Name=விற்பனையாளர்கள்
+Module40Desc=விற்பனையாளர்கள் மற்றும் கொள்முதல் மேலாண்மை (வாங்குதல் ஆர்டர்கள் மற்றும் சப்ளையர் இன்வாய்ஸ்களின் பில்லிங்)
+Module42Name=பிழைத்திருத்த பதிவுகள்
+Module42Desc=பதிவு செய்யும் வசதிகள் (கோப்பு, syslog, ...). இத்தகைய பதிவுகள் தொழில்நுட்ப/பிழைத்திருத்த நோக்கங்களுக்காக உள்ளன.
+Module43Name=பிழைத்திருத்த பட்டி
+Module43Desc=டெவலப்பர் உங்கள் உலாவியில் பிழைத்திருத்தப் பட்டியைச் சேர்ப்பதற்கான ஒரு கருவி.
+Module49Name=தொகுப்பாளர்கள்
+Module49Desc=ஆசிரியர் மேலாண்மை
+Module50Name=தயாரிப்புகள்
+Module50Desc=தயாரிப்புகளின் மேலாண்மை
+Module51Name=வெகுஜன அஞ்சல்கள்
+Module51Desc=வெகுஜன காகித அஞ்சல் மேலாண்மை
+Module52Name=பங்குகள்
+Module52Desc=பங்கு மேலாண்மை
+Module53Name=சேவைகள்
+Module53Desc=சேவைகளின் மேலாண்மை
+Module54Name=ஒப்பந்தங்கள்/சந்தாக்கள்
+Module54Desc=ஒப்பந்தங்களின் மேலாண்மை (சேவைகள் அல்லது தொடர் சந்தாக்கள்)
+Module55Name=பார்கோடுகள்
+Module55Desc=பார்கோடு அல்லது QR குறியீடு மேலாண்மை
+Module56Name=கடன் பரிமாற்றம் மூலம் பணம் செலுத்துதல்
+Module56Desc=கிரெடிட் டிரான்ஸ்ஃபர் ஆர்டர்கள் மூலம் சப்ளையர்களுக்கு பணம் செலுத்துவதை நிர்வகித்தல். ஐரோப்பிய நாடுகளுக்கான SEPA கோப்பு உருவாக்கம் இதில் அடங்கும்.
+Module57Name=நேரடி டெபிட் மூலம் பணம் செலுத்துதல்
+Module57Desc=நேரடி டெபிட் ஆர்டர்களின் மேலாண்மை. ஐரோப்பிய நாடுகளுக்கான SEPA கோப்பு உருவாக்கம் இதில் அடங்கும்.
+Module58Name=டயல் கிளிக் செய்யவும்
+Module58Desc=ஒரு ClickToDial அமைப்பின் ஒருங்கிணைப்பு (நட்சத்திரம், ...)
+Module60Name=ஓட்டிகள்
+Module60Desc=ஸ்டிக்கர்கள் மேலாண்மை
+Module70Name=தலையீடுகள்
+Module70Desc=தலையீடு மேலாண்மை
+Module75Name=செலவு மற்றும் பயண குறிப்புகள்
+Module75Desc=செலவு மற்றும் பயணக் குறிப்புகள் மேலாண்மை
+Module80Name=ஏற்றுமதி
+Module80Desc=ஏற்றுமதி மற்றும் விநியோக குறிப்பு மேலாண்மை
+Module85Name=வங்கிகள் & பணம்
+Module85Desc=வங்கி அல்லது பண கணக்குகளின் மேலாண்மை
+Module100Name=வெளிப்புற தளம்
+Module100Desc=வெளிப்புற இணையதளத்திற்கான இணைப்பை பிரதான மெனு ஐகானாகச் சேர்க்கவும். இணையதளம் மேல் மெனுவின் கீழ் ஒரு சட்டத்தில் காட்டப்பட்டுள்ளது.
+Module105Name=மெயில்மேன் மற்றும் SPIP
+Module105Desc=உறுப்பினர் தொகுதிக்கான Mailman அல்லது SPIP இடைமுகம்
+Module200Name=LDAP
+Module200Desc=LDAP கோப்பக ஒத்திசைவு
+Module210Name=போஸ்ட் நியூக்
+Module210Desc=PostNuke ஒருங்கிணைப்பு
+Module240Name=தரவு ஏற்றுமதி
+Module240Desc=Dolibarr தரவை ஏற்றுமதி செய்வதற்கான கருவி (உதவியுடன்)
+Module250Name=தரவு இறக்குமதி
+Module250Desc=Dolibarr இல் தரவை இறக்குமதி செய்வதற்கான கருவி (உதவியுடன்)
+Module310Name=உறுப்பினர்கள்
+Module310Desc=அறக்கட்டளை உறுப்பினர்கள் மேலாண்மை
+Module320Name=ஆர்எஸ்எஸ் ஊட்டம்
+Module320Desc=Dolibarr பக்கங்களில் RSS ஊட்டத்தைச் சேர்க்கவும்
+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=திட்டமிடப்பட்ட வேலைகள் மேலாண்மை (மாறுபெயர் கிரான் அல்லது க்ரோனோ அட்டவணை)
+Module2400Name=நிகழ்வுகள்/நிகழ்ச்சி நிரல்
+Module2400Desc=நிகழ்வுகளைக் கண்காணிக்கவும். கண்காணிப்பு நோக்கங்களுக்காக தானியங்கி நிகழ்வுகளை பதிவு செய்யவும் அல்லது கைமுறை நிகழ்வுகள் அல்லது சந்திப்புகளை பதிவு செய்யவும். நல்ல வாடிக்கையாளர் அல்லது விற்பனையாளர் உறவு மேலாண்மைக்கான முதன்மை தொகுதி இதுவாகும்.
+Module2500Name=டிஎம்எஸ் / ஈசிஎம்
+Module2500Desc=ஆவண மேலாண்மை அமைப்பு / மின்னணு உள்ளடக்க மேலாண்மை. நீங்கள் உருவாக்கிய அல்லது சேமிக்கப்பட்ட ஆவணங்களின் தானியங்கி அமைப்பு. உங்களுக்குத் தேவைப்படும்போது அவற்றைப் பகிரவும்.
+Module2600Name=API/இணைய சேவைகள் (SOAP சர்வர்)
+Module2600Desc=API சேவைகளை வழங்கும் Dolibarr SOAP சேவையகத்தை இயக்கவும்
+Module2610Name=API/இணைய சேவைகள் (REST சர்வர்)
+Module2610Desc=API சேவைகளை வழங்கும் Dolibarr REST சேவையகத்தை இயக்கவும்
+Module2660Name=இணைய சேவைகளை (SOAP கிளையன்ட்) அழைக்கவும்
+Module2660Desc=Dolibarr இணைய சேவை கிளையண்டை இயக்கு (தரவு/கோரிக்கைகளை வெளிப்புற சேவையகங்களுக்குத் தள்ளப் பயன்படுத்தலாம். கொள்முதல் ஆர்டர்கள் மட்டுமே தற்போது ஆதரிக்கப்படுகின்றன.)
+Module2700Name=கிராவதார்
+Module2700Desc=பயனர்கள்/உறுப்பினர்களின் புகைப்படத்தைக் காட்ட ஆன்லைன் Gravatar சேவையைப் (www.gravatar.com) பயன்படுத்தவும் (அவர்களின் மின்னஞ்சல்களுடன் காணப்படும்). இணைய அணுகல் தேவை
+Module2800Desc=FTP கிளையண்ட்
+Module2900Name=GeoIPMaxmind
+Module2900Desc=GeoIP Maxmind மாற்றும் திறன்கள்
+Module3200Name=மாற்ற முடியாத காப்பகங்கள்
+Module3200Desc=வணிக நிகழ்வுகளின் மாற்ற முடியாத பதிவை இயக்கவும். நிகழ்வுகள் நிகழ்நேரத்தில் காப்பகப்படுத்தப்படும். பதிவு என்பது ஏற்றுமதி செய்யக்கூடிய சங்கிலி நிகழ்வுகளின் படிக்க மட்டுமேயான அட்டவணை. இந்த தொகுதி சில நாடுகளில் கட்டாயமாக இருக்கலாம்.
+Module3400Name=சமுக வலைத்தளங்கள்
+Module3400Desc=மூன்றாம் தரப்பினர் மற்றும் முகவரிகளில் சமூக வலைப்பின்னல்கள் புலங்களை இயக்கவும் (ஸ்கைப், ட்விட்டர், பேஸ்புக், ...).
+Module4000Name=HRM
+Module4000Desc=மனித வள மேலாண்மை (துறை மேலாண்மை, பணியாளர் ஒப்பந்தங்கள் மற்றும் உணர்வுகள்)
+Module5000Name=பல நிறுவனம்
+Module5000Desc=பல நிறுவனங்களை நிர்வகிக்க உங்களை அனுமதிக்கிறது
+Module6000Name=இடை-தொகுதிகள் பணிப்பாய்வு
+Module6000Desc=வெவ்வேறு தொகுதிகளுக்கு இடையே பணிப்பாய்வு மேலாண்மை (பொருளின் தானியங்கி உருவாக்கம் மற்றும்/அல்லது தானியங்கி நிலை மாற்றம்)
+Module10000Name=இணையதளங்கள்
+Module10000Desc=WYSIWYG எடிட்டருடன் வலைத்தளங்களை (பொது) உருவாக்கவும். இது ஒரு வெப்மாஸ்டர் அல்லது டெவலப்பர் சார்ந்த CMS ஆகும் (HTML மற்றும் CSS மொழியை அறிந்து கொள்வது நல்லது). உங்கள் சொந்த டொமைன் பெயருடன் இணையத்தில் இணையத்தில் வைத்திருக்க பிரத்யேக Dolibarr கோப்பகத்தை சுட்டிக்காட்ட உங்கள் இணைய சேவையகத்தை (Apache, Nginx, ...) அமைக்கவும்.
+Module20000Name=கோரிக்கை நிர்வாகத்தை விடுங்கள்
+Module20000Desc=பணியாளர் விடுப்பு கோரிக்கைகளை வரையறுத்து கண்காணிக்கவும்
+Module39000Name=தயாரிப்பு நிறைய
+Module39000Desc=தயாரிப்புகளுக்கான நிறைய, வரிசை எண்கள், சாப்பிடும்/விற்பனை தேதி மேலாண்மை
+Module40000Name=பல நாணயம்
+Module40000Desc=விலைகள் மற்றும் ஆவணங்களில் மாற்று நாணயங்களைப் பயன்படுத்தவும்
+Module50000Name=பேபாக்ஸ்
+Module50000Desc=வாடிக்கையாளர்களுக்கு PayBox ஆன்லைன் கட்டணப் பக்கத்தை (கிரெடிட்/டெபிட் கார்டுகள்) வழங்குகிறது. குறிப்பிட்ட டோலிபார் பொருளுக்கு (விலைப்பட்டியல், ஆர்டர் போன்றவை...) தொடர்பான தற்காலிகப் பணம் அல்லது பணம் செலுத்த உங்கள் வாடிக்கையாளர்களை அனுமதிக்க இது பயன்படுத்தப்படலாம்.
+Module50100Name=POS SimplePOS
+Module50100Desc=விற்பனைத் தொகுதி SimplePOS (எளிய POS).
+Module50150Name=பிஓஎஸ் டேக்போஸ்
+Module50150Desc=பாயின்ட் ஆஃப் சேல் மாட்யூல் TakePOS (டச்ஸ்கிரீன் POS, கடைகள், பார்கள் அல்லது உணவகங்களுக்கு).
+Module50200Name=பேபால்
+Module50200Desc=வாடிக்கையாளர்களுக்கு PayPal ஆன்லைன் கட்டணப் பக்கத்தை வழங்குங்கள் (PayPal கணக்கு அல்லது கிரெடிட்/டெபிட் கார்டுகள்). ஒரு குறிப்பிட்ட டோலிபார் பொருளுக்கு (விலைப்பட்டியல், ஆர்டர் போன்றவை...) தொடர்புடைய தற்காலிகப் பணம் அல்லது பணம் செலுத்த உங்கள் வாடிக்கையாளர்களை அனுமதிக்க இது பயன்படுத்தப்படலாம்.
+Module50300Name=பட்டை
+Module50300Desc=வாடிக்கையாளர்களுக்கு ஸ்ட்ரைப் ஆன்லைன் கட்டணப் பக்கத்தை (கிரெடிட்/டெபிட் கார்டுகள்) வழங்குகிறது. குறிப்பிட்ட டோலிபார் பொருளுக்கு (விலைப்பட்டியல், ஆர்டர் போன்றவை...) தொடர்பான தற்காலிகப் பணம் அல்லது பணம் செலுத்த உங்கள் வாடிக்கையாளர்களை அனுமதிக்க இது பயன்படுத்தப்படலாம்.
+Module50400Name=கணக்கியல் (இரட்டை நுழைவு)
+Module50400Desc=கணக்கியல் மேலாண்மை (இரட்டை உள்ளீடுகள், ஆதரவு பொது மற்றும் துணை லெட்ஜர்கள்). பல கணக்கியல் மென்பொருள் வடிவங்களில் லெட்ஜரை ஏற்றுமதி செய்யவும்.
+Module54000Name=PrintIPP
+Module54000Desc=கப்ஸ் ஐபிபி இடைமுகத்தைப் பயன்படுத்தி நேரடி அச்சு (ஆவணங்களைத் திறக்காமல்) (அச்சுப்பொறி சர்வரில் இருந்து தெரிய வேண்டும், மேலும் சர்வரில் CUPS நிறுவப்பட வேண்டும்).
+Module55000Name=கருத்துக்கணிப்பு, கருத்துக்கணிப்பு அல்லது வாக்கு
+Module55000Desc=ஆன்லைன் வாக்கெடுப்புகள், கருத்துக்கணிப்புகள் அல்லது வாக்குகளை உருவாக்கவும் (Doodle, Studs, RDVz போன்றவை...)
+Module59000Name=விளிம்புகள்
+Module59000Desc=விளிம்புகளைப் பின்பற்றுவதற்கான தொகுதி
+Module60000Name=கமிஷன்கள்
+Module60000Desc=கமிஷன்களை நிர்வகிப்பதற்கான தொகுதி
+Module62000Name=Incoterms
+Module62000Desc=Incoterms ஐ நிர்வகிக்க அம்சங்களைச் சேர்க்கவும்
+Module63000Name=வளங்கள்
+Module63000Desc=நிகழ்வுகளுக்கு ஒதுக்குவதற்கான ஆதாரங்களை (அச்சுப்பொறிகள், கார்கள், அறைகள், ...) நிர்வகிக்கவும்
+Permission11=வாடிக்கையாளர் இன்வாய்ஸ்களைப் படிக்கவும்
+Permission12=வாடிக்கையாளர் இன்வாய்ஸ்களை உருவாக்கவும்/மாற்றவும்
+Permission13=வாடிக்கையாளர் இன்வாய்ஸ்களை செல்லாததாக்கு
+Permission14=வாடிக்கையாளர் இன்வாய்ஸ்களை சரிபார்க்கவும்
+Permission15=மின்னஞ்சல் மூலம் வாடிக்கையாளர் இன்வாய்ஸ்களை அனுப்பவும்
+Permission16=வாடிக்கையாளர் இன்வாய்ஸ்களுக்கான கட்டணங்களை உருவாக்கவும்
+Permission19=வாடிக்கையாளர் இன்வாய்ஸ்களை நீக்கவும்
+Permission21=வணிக முன்மொழிவுகளைப் படிக்கவும்
+Permission22=வணிக முன்மொழிவுகளை உருவாக்கவும்/மாற்றவும்
+Permission24=வணிக முன்மொழிவுகளை சரிபார்க்கவும்
+Permission25=வணிக முன்மொழிவுகளை அனுப்பவும்
+Permission26=வணிக முன்மொழிவுகளை மூடு
+Permission27=வணிக முன்மொழிவுகளை நீக்கு
+Permission28=வர்த்தக முன்மொழிவுகளை ஏற்றுமதி செய்யுங்கள்
+Permission31=தயாரிப்புகளைப் படிக்கவும்
+Permission32=தயாரிப்புகளை உருவாக்கவும் / மாற்றவும்
+Permission34=தயாரிப்புகளை நீக்கு
+Permission36=மறைக்கப்பட்ட தயாரிப்புகளைப் பார்க்கவும்/நிர்வகிக்கவும்
+Permission38=ஏற்றுமதி பொருட்கள்
+Permission39=குறைந்தபட்ச விலையை புறக்கணிக்கவும்
+Permission41=திட்டங்கள் மற்றும் பணிகளைப் படிக்கவும் (பகிரப்பட்ட திட்டம் மற்றும் நான் தொடர்பு கொண்ட திட்டங்கள்). ஒதுக்கப்பட்ட பணிகளில் எனக்கோ அல்லது எனது படிநிலைக்கோ செலவழித்த நேரத்தையும் உள்ளிடலாம் (டைம்ஷீட்)
+Permission42=திட்டங்களை உருவாக்கவும்/மாற்றவும் (பகிரப்பட்ட திட்டம் மற்றும் நான் தொடர்பு கொண்ட திட்டங்கள்). பணிகளை உருவாக்கலாம் மற்றும் திட்டப்பணி மற்றும் பணிகளுக்கு பயனர்களை ஒதுக்கலாம்
+Permission44=திட்டப்பணிகளை நீக்கு (பகிரப்பட்ட திட்டம் மற்றும் நான் தொடர்பு கொண்ட திட்டங்கள்)
+Permission45=ஏற்றுமதி திட்டங்கள்
+Permission61=தலையீடுகளைப் படிக்கவும்
+Permission62=தலையீடுகளை உருவாக்கவும்/மாற்றவும்
+Permission64=தலையீடுகளை நீக்கு
+Permission67=ஏற்றுமதி தலையீடுகள்
+Permission68=மின்னஞ்சல் மூலம் தலையீடுகளை அனுப்பவும்
+Permission69=தலையீடுகளை சரிபார்க்கவும்
+Permission70=தலையீடுகளை செல்லாததாக்கு
+Permission71=உறுப்பினர்களைப் படிக்கவும்
+Permission72=உறுப்பினர்களை உருவாக்கவும்/மாற்றவும்
+Permission74=உறுப்பினர்களை நீக்கு
+Permission75=உறுப்பினர் வகைகளை அமைக்கவும்
+Permission76=தரவு ஏற்றுமதி
+Permission78=சந்தாக்களைப் படிக்கவும்
+Permission79=சந்தாக்களை உருவாக்கவும்/மாற்றவும்
+Permission81=வாடிக்கையாளர் ஆர்டர்களைப் படிக்கவும்
+Permission82=வாடிக்கையாளர் ஆர்டர்களை உருவாக்கவும்/மாற்றவும்
+Permission84=வாடிக்கையாளர் ஆர்டர்களை சரிபார்க்கவும்
+Permission86=வாடிக்கையாளர்களுக்கு ஆர்டர்களை அனுப்பவும்
+Permission87=வாடிக்கையாளர் ஆர்டர்களை மூடு
+Permission88=வாடிக்கையாளர் ஆர்டர்களை ரத்து செய்
+Permission89=வாடிக்கையாளர் ஆர்டர்களை நீக்கவும்
+Permission91=சமூக அல்லது நிதி வரிகள் மற்றும் வாட்களைப் படிக்கவும்
+Permission92=சமூக அல்லது நிதி வரிகள் மற்றும் வாட்களை உருவாக்கவும்/மாற்றவும்
+Permission93=சமூக அல்லது நிதி வரிகள் மற்றும் வாட்களை நீக்கவும்
+Permission94=சமூக அல்லது நிதி வரிகளை ஏற்றுமதி செய்யுங்கள்
+Permission95=அறிக்கைகளைப் படிக்கவும்
+Permission101=அனுப்புதல்களைப் படிக்கவும்
+Permission102=அனுப்புதல்களை உருவாக்கவும்/மாற்றவும்
+Permission104=அனுப்புதல்களைச் சரிபார்க்கவும்
+Permission105=மின்னஞ்சல் மூலம் அனுப்புதல்களை அனுப்பவும்
+Permission106=ஏற்றுமதி அனுப்புதல்
+Permission109=அனுப்புதல்களை நீக்கு
+Permission111=நிதிக் கணக்குகளைப் படிக்கவும்
+Permission112=பரிவர்த்தனைகளை உருவாக்கவும்/மாற்றவும்/நீக்கவும் மற்றும் ஒப்பிடவும்
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
+Permission114=பரிவர்த்தனைகளை சரிசெய்யவும்
+Permission115=பரிவர்த்தனைகள் மற்றும் கணக்கு அறிக்கைகளை ஏற்றுமதி செய்யவும்
+Permission116=கணக்குகளுக்கு இடையே பரிமாற்றங்கள்
+Permission117=காசோலைகளை அனுப்புவதை நிர்வகிக்கவும்
+Permission121=பயனருடன் இணைக்கப்பட்ட மூன்றாம் தரப்பினரைப் படிக்கவும்
+Permission122=பயனருடன் இணைக்கப்பட்ட மூன்றாம் தரப்பினரை உருவாக்கவும்/மாற்றவும்
+Permission125=பயனருடன் இணைக்கப்பட்ட மூன்றாம் தரப்பினரை நீக்கு
+Permission126=மூன்றாம் தரப்பினரை ஏற்றுமதி செய்யுங்கள்
+Permission130=மூன்றாம் தரப்பினரின் கட்டணத் தகவலை உருவாக்கவும்/மாற்றவும்
+Permission141=அனைத்து திட்டப்பணிகளையும் பணிகளையும் படிக்கவும் (நான் தொடர்பில் இல்லாத தனிப்பட்ட திட்டங்களும்)
+Permission142=அனைத்து திட்டங்கள் மற்றும் பணிகளை உருவாக்கவும்/மாற்றவும் (நான் தொடர்பில் இல்லாத தனிப்பட்ட திட்டங்களும்)
+Permission144=அனைத்து திட்டங்கள் மற்றும் பணிகளை நீக்கவும் (நான் தொடர்பு கொள்ளாத தனிப்பட்ட திட்டங்களும்)
+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=ஸ்டிக்கர்களை நீக்கு
+Permission650=பொருட்களின் பில்களைப் படிக்கவும்
+Permission651=பொருட்களின் பில்களை உருவாக்கவும்/புதுப்பிக்கவும்
+Permission652=பொருட்களின் பில்களை நீக்கவும்
+Permission660=உற்பத்தி ஆணை (MO) படிக்கவும்
+Permission661=உற்பத்தி ஆணை (MO) உருவாக்கவும்/புதுப்பிக்கவும்
+Permission662=உற்பத்தி ஆர்டரை நீக்கு (MO)
+Permission701=நன்கொடைகளைப் படியுங்கள்
+Permission702=நன்கொடைகளை உருவாக்கவும்/மாற்றவும்
+Permission703=நன்கொடைகளை நீக்கவும்
+Permission771=செலவு அறிக்கைகளைப் படிக்கவும் (உங்களுடையது மற்றும் உங்கள் துணை அதிகாரிகள்)
+Permission772=Create/modify expense reports (for you and your subordinates)
+Permission773=செலவு அறிக்கைகளை நீக்கவும்
+Permission775=செலவு அறிக்கைகளை அங்கீகரிக்கவும்
+Permission776=செலவு அறிக்கைகளை செலுத்துங்கள்
+Permission777=Read all expense reports (even those of user not subordinates)
+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=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
+Permission4022=மதிப்பீட்டைச் சரிபார்க்கவும்
+Permission4023=மதிப்பீட்டை நீக்கு
+Permission4030=ஒப்பீட்டு மெனுவைப் பார்க்கவும்
+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=விடுப்பு கோரிக்கைகளை அங்கீகரிக்கவும்
+Permission23001=திட்டமிடப்பட்ட வேலையைப் படியுங்கள்
+Permission23002=திட்டமிடப்பட்ட வேலையை உருவாக்கவும்/புதுப்பிக்கவும்
+Permission23003=திட்டமிடப்பட்ட வேலையை நீக்கு
+Permission23004=திட்டமிடப்பட்ட வேலையைச் செய்யுங்கள்
+Permission50101=விற்பனை புள்ளியைப் பயன்படுத்தவும் (SimplePOS)
+Permission50151=விற்பனை புள்ளியைப் பயன்படுத்தவும் (TakePOS)
+Permission50152=விற்பனை வரிகளை திருத்தவும்
+Permission50153=ஆர்டர் செய்யப்பட்ட விற்பனை வரிகளைத் திருத்தவும்
+Permission50201=பரிவர்த்தனைகளைப் படிக்கவும்
+Permission50202=இறக்குமதி பரிவர்த்தனைகள்
+Permission50330=ஜாப்பியரின் பொருட்களைப் படியுங்கள்
+Permission50331=ஜாப்பியரின் பொருட்களை உருவாக்கவும்/புதுப்பிக்கவும்
+Permission50332=ஜாப்பியரின் பொருட்களை நீக்கு
+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=VAT விகிதங்கள் அல்லது விற்பனை வரி விகிதங்கள்
+DictionaryRevenueStamp=வரி முத்திரைகளின் அளவு
+DictionaryPaymentConditions=கட்டண வரையறைகள்
+DictionaryPaymentModes=கட்டண முறைகள்
+DictionaryTypeContact=தொடர்பு/முகவரி வகைகள்
+DictionaryTypeOfContainer=இணையதளம் - இணையதள பக்கங்கள்/கன்டெய்னர்களின் வகை
+DictionaryEcotaxe=ஈகோடாக்ஸ் (WEEE)
+DictionaryPaperFormat=காகித வடிவங்கள்
+DictionaryFormatCards=அட்டை வடிவங்கள்
+DictionaryFees=செலவு அறிக்கை - செலவு அறிக்கை வரிகளின் வகைகள்
+DictionarySendingMethods=கப்பல் முறைகள்
+DictionaryStaff=தொழிலாளிகளின் எண்ணிக்கை
+DictionaryAvailability=டெலிவரி தாமதம்
+DictionaryOrderMethods=ஆர்டர் முறைகள்
+DictionarySource=முன்மொழிவுகள்/ஆர்டர்களின் தோற்றம்
+DictionaryAccountancyCategory=அறிக்கைகளுக்கான தனிப்பயனாக்கப்பட்ட குழுக்கள்
+DictionaryAccountancysystem=கணக்குகளின் விளக்கப்படத்திற்கான மாதிரிகள்
+DictionaryAccountancyJournal=கணக்கியல் இதழ்கள்
+DictionaryEMailTemplates=மின்னஞ்சல் டெம்ப்ளேட்கள்
+DictionaryUnits=அலகுகள்
+DictionaryMeasuringUnits=அளவீட்டு அலகுகள்
+DictionarySocialNetworks=சமுக வலைத்தளங்கள்
+DictionaryProspectStatus=நிறுவனங்களுக்கான வாய்ப்பு நிலை
+DictionaryProspectContactStatus=தொடர்புகளுக்கான வாய்ப்பு நிலை
+DictionaryHolidayTypes=விடுப்பு - விடுப்பு வகைகள்
+DictionaryOpportunityStatus=திட்டம்/முன்னணிக்கான முன்னணி நிலை
+DictionaryExpenseTaxCat=செலவு அறிக்கை - போக்குவரத்து வகைகள்
+DictionaryExpenseTaxRange=செலவு அறிக்கை - போக்குவரத்து வகை வாரியாக வரம்பு
+DictionaryTransportMode=இன்ட்ராகாம் அறிக்கை - போக்குவரத்து முறை
+DictionaryBatchStatus=தயாரிப்பு நிறைய/தொடர் தரக் கட்டுப்பாடு நிலை
+TypeOfUnit=அலகு வகை
+SetupSaved=அமைவு சேமிக்கப்பட்டது
+SetupNotSaved=அமைவு சேமிக்கப்படவில்லை
+BackToModuleList=தொகுதிப் பட்டியலுக்குத் திரும்பு
+BackToDictionaryList=அகராதிகளின் பட்டியலுக்குத் திரும்பு
+TypeOfRevenueStamp=வரி முத்திரையின் வகை
+VATManagement=விற்பனை வரி மேலாண்மை
+VATIsUsedDesc=வாய்ப்புகள், இன்வாய்ஸ்கள், ஆர்டர்கள் போன்றவற்றை உருவாக்கும் போது இயல்பாக, விற்பனை வரி விகிதம் செயலில் உள்ள நிலையான விதியைப் பின்பற்றுகிறது: <br> விற்பனையாளர் விற்பனை வரிக்கு உட்பட்டவராக இல்லாவிட்டால், விற்பனை வரி 0. விதியின் முடிவு. <br> என்றால் (விற்பனையாளரின் நாடு = வாங்குபவரின் நாடு), பின்னர் விற்பனை வரியானது விற்பனையாளரின் நாட்டில் உள்ள பொருளின் விற்பனை வரிக்கு சமமாக இருக்கும். ஆட்சியின் முடிவு. <br> விற்பவர் மற்றும் வாங்குபவர் இருவரும் ஐரோப்பிய சமூகத்தில் இருந்தால் மற்றும் சரக்குகள் போக்குவரத்து தொடர்பான தயாரிப்புகளாக இருந்தால் (விநியோகம், கப்பல் போக்குவரத்து, விமானம்), இயல்புநிலை VAT 0. இந்த விதி விற்பனையாளரின் நாட்டைச் சார்ந்தது - தயவுசெய்து உங்கள் கணக்காளரிடம் ஆலோசிக்கவும். VATஐ வாங்குபவர் தங்கள் நாட்டில் உள்ள சுங்க அலுவலகத்திற்கு செலுத்த வேண்டும், விற்பனையாளருக்கு அல்ல. ஆட்சியின் முடிவு. <br> விற்பவர் மற்றும் வாங்குபவர் இருவரும் ஐரோப்பிய சமூகத்தில் இருந்தால் மற்றும் வாங்குபவர் ஒரு நிறுவனமாக இல்லாவிட்டால் (பதிவுசெய்யப்பட்ட சமூகத்திற்குள் VAT எண்ணுடன்) VAT ஆனது விற்பனையாளரின் நாட்டின் VAT விகிதத்திற்கு இயல்புநிலையாகும். ஆட்சியின் முடிவு. <br> விற்பவர் மற்றும் வாங்குபவர் இருவருமே ஐரோப்பிய சமூகத்தில் இருந்தால் மற்றும் வாங்குபவர் ஒரு நிறுவனமாக இருந்தால் (பதிவுசெய்யப்பட்ட சமூகத்திற்குள் VAT எண்ணுடன்), VAT இயல்பாக 0 ஆகும். ஆட்சியின் முடிவு. <br> வேறு எந்த சந்தர்ப்பத்திலும் முன்மொழியப்பட்ட இயல்புநிலை விற்பனை வரி=0 ஆகும். ஆட்சியின் முடிவு.
+VATIsNotUsedDesc=முன்னிருப்பாக முன்மொழியப்பட்ட விற்பனை வரி 0 ஆகும், இது சங்கங்கள், தனிநபர்கள் அல்லது சிறிய நிறுவனங்கள் போன்ற நிகழ்வுகளுக்குப் பயன்படுத்தப்படலாம்.
+VATIsUsedExampleFR=பிரான்சில், உண்மையான நிதி அமைப்பைக் கொண்ட நிறுவனங்கள் அல்லது நிறுவனங்கள் (எளிமைப்படுத்தப்பட்ட உண்மையான அல்லது சாதாரண உண்மையான) என்று பொருள். VAT அறிவிக்கப்படும் ஒரு அமைப்பு.
+VATIsNotUsedExampleFR=பிரான்சில், விற்பனை வரி அறிவிக்கப்படாத சங்கங்கள் அல்லது நிறுவனங்கள், நிறுவனங்கள் அல்லது தாராளவாத தொழில்கள், மைக்ரோ நிறுவன நிதி முறையை (உரிமையில் விற்பனை வரி) தேர்வு செய்து விற்பனை வரி அறிவிப்பு இல்லாமல் உரிமையாளர் விற்பனை வரியை செலுத்துகிறது. இந்த தேர்வு "பொருந்தாத விற்பனை வரி - ஆர்ட்-293B of CGI" என்ற குறிப்பை இன்வாய்ஸ்களில் காண்பிக்கும்.
+##### Local Taxes #####
+TypeOfSaleTaxes=விற்பனை வரி வகை
+LTRate=மதிப்பிடவும்
+LocalTax1IsNotUsed=இரண்டாவது வரியைப் பயன்படுத்த வேண்டாம்
+LocalTax1IsUsedDesc=இரண்டாவது வகை வரியைப் பயன்படுத்தவும் (முதல் ஒன்றைத் தவிர)
+LocalTax1IsNotUsedDesc=மற்ற வகை வரிகளைப் பயன்படுத்த வேண்டாம் (முதல் வரியைத் தவிர)
+LocalTax1Management=இரண்டாவது வகை வரி
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsNotUsed=மூன்றாவது வரியைப் பயன்படுத்த வேண்டாம்
+LocalTax2IsUsedDesc=மூன்றாவது வகை வரியைப் பயன்படுத்தவும் (முதல் ஒன்றைத் தவிர)
+LocalTax2IsNotUsedDesc=மற்ற வகை வரிகளைப் பயன்படுத்த வேண்டாம் (முதல் வரியைத் தவிர)
+LocalTax2Management=மூன்றாவது வகை வரி
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample=
+LocalTax1ManagementES=RE மேலாண்மை
+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=தற்போதைய/அடுத்து
+Offset=ஆஃப்செட்
+AlwaysActive=எப்போதும் சுறுசுறுப்பாக இருக்கும்
+Upgrade=மேம்படுத்தல்
+MenuUpgrade=மேம்படுத்தவும் / நீட்டிக்கவும்
+AddExtensionThemeModuleOrOther=வெளிப்புற பயன்பாடு/தொகுதியை வரிசைப்படுத்தவும் / நிறுவவும்
+WebServer=இணைய சேவையகம்
+DocumentRootServer=வலை சேவையகத்தின் மூல அடைவு
+DataRootServer=தரவு கோப்புகள் அடைவு
+IP=ஐபி
+Port=துறைமுகம்
+VirtualServerName=மெய்நிகர் சர்வர் பெயர்
+OS=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=ஜிப்
+CompanyTown=நகரம்
+CompanyCountry=நாடு
+CompanyCurrency=முக்கிய நாணயம்
+CompanyObject=நிறுவனத்தின் பொருள்
+IDCountry=அடையாள நாடு
+Logo=சின்னம்
+LogoDesc=நிறுவனத்தின் முக்கிய லோகோ. உருவாக்கப்பட்ட ஆவணங்களில் பயன்படுத்தப்படும் (PDF, ...)
+LogoSquarred=லோகோ (சதுரம்)
+LogoSquarredDesc=ஒரு சதுர ஐகானாக இருக்க வேண்டும் (அகலம் = உயரம்). இந்த லோகோ விருப்பமான ஐகானாக அல்லது மேல் மெனு பட்டியில் (காட்சி அமைப்பில் முடக்கப்படாவிட்டால்) போன்ற பிற தேவையாகப் பயன்படுத்தப்படும்.
+DoNotSuggestPaymentMode=பரிந்துரைக்க வேண்டாம்
+NoActiveBankAccountDefined=செயலில் உள்ள வங்கிக் கணக்கு எதுவும் வரையறுக்கப்படவில்லை
+OwnerOfBankAccount=%s வங்கிக் கணக்கின் உரிமையாளர்
+BankModuleNotActive=வங்கி கணக்கு தொகுதி இயக்கப்படவில்லை
+ShowBugTrackLink=இணைப்பைக் காட்டு " <strong> %s </strong> "
+ShowBugTrackLinkDesc=இந்த இணைப்பைக் காட்டாமல் இருக்க காலியாக இருங்கள், Dolibarr திட்டத்திற்கான இணைப்பிற்கு 'github' மதிப்பைப் பயன்படுத்தவும் அல்லது 'https://...' என்ற url ஐ நேரடியாக வரையறுக்கவும்.
+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> <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=OS பற்றி
+InfoWebServer=இணைய சேவையகம் பற்றி
+InfoDatabase=தரவுத்தளத்தைப் பற்றி
+InfoPHP=PHP பற்றி
+InfoPerf=நிகழ்ச்சிகள் பற்றி
+InfoSecurity=பாதுகாப்பு பற்றி
+BrowserName=உலாவி பெயர்
+BrowserOS=உலாவி OS
+ListOfSecurityEvents=டோலிபார் பாதுகாப்பு நிகழ்வுகளின் பட்டியல்
+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> குறிப்பு: வெளிப்புற அமர்வு சுத்தம் செய்யும் பொறிமுறையைக் கொண்ட சில சேவையகங்களில் (கிரான் கீழ் debian, ubuntu ...), ஒரு வெளிப்புற அமைப்பால் வரையறுக்கப்பட்ட காலத்திற்குப் பிறகு அமர்வுகள் அழிக்கப்படலாம், இங்கே உள்ளிடப்பட்ட மதிப்பு என்னவாக இருந்தாலும் சரி.
+SessionsPurgedByExternalSystem=இந்த சர்வரில் உள்ள அமர்வுகள் வெளிப்புற பொறிமுறையால் சுத்தம் செய்யப்படுவது போல் தெரிகிறது (கிரான் கீழ் டெபியன், உபுண்டு ...), அனேகமாக ஒவ்வொரு <b> %s </b> வினாடிகள் (=அளவுருவின் மதிப்பு a0aee833658, a0aee833658378336000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000. அமர்வு தாமதத்தை மாற்ற சர்வர் நிர்வாகியிடம் நீங்கள் கேட்க வேண்டும்.
+TriggersAvailable=கிடைக்கக்கூடிய தூண்டுதல்கள்
+TriggersDesc=தூண்டுதல்கள் என்பது <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...") நீள்வட்ட a0aee8365837fz0 ... </b> ஐச் சேர்க்கவும்.
+MAIN_ROUNDING_RULE_TOT=ரவுண்டிங் வரம்பின் படி (அடிப்படை 10 ஐத் தவிர வேறு ஏதாவது ஒன்றில் ரவுண்டிங் செய்யப்படும் நாடுகளுக்கு. எடுத்துக்காட்டாக, 0.05 படிகளால் ரவுண்டிங் செய்தால் 0.05 ஐ வைக்கவும்)
+UnitPriceOfProduct=ஒரு பொருளின் நிகர அலகு விலை
+TotalPriceAfterRounding=ரவுண்டிங்கிற்குப் பிறகு மொத்த விலை (வரி/வாட்/வரி உட்பட).
+ParameterActiveForNextInputOnly=அளவுரு அடுத்த உள்ளீட்டிற்கு மட்டுமே பயனுள்ளதாக இருக்கும்
+NoEventOrNoAuditSetup=பாதுகாப்பு நிகழ்வு எதுவும் பதிவு செய்யப்படவில்லை. "அமைவு - பாதுகாப்பு - நிகழ்வுகள்" பக்கத்தில் தணிக்கை இயக்கப்படவில்லை என்றால் இது இயல்பானது.
+NoEventFoundWithCriteria=இந்தத் தேடல் அளவுகோலுக்கான பாதுகாப்பு நிகழ்வு எதுவும் கண்டறியப்படவில்லை.
+SeeLocalSendMailSetup=உங்கள் உள்ளூர் அனுப்பும் அஞ்சல் அமைப்பைப் பார்க்கவும்
+BackupDesc=டோலிபார் நிறுவலின் <b> முழுமையான </b> காப்புப்பிரதிக்கு இரண்டு படிகள் தேவை.
+BackupDesc2=பதிவேற்றிய மற்றும் உருவாக்கப்பட்ட அனைத்து கோப்புகளையும் கொண்ட "ஆவணங்கள்" கோப்பகத்தின் ( <b> %s </b> ) உள்ளடக்கங்களை காப்புப் பிரதி எடுக்கவும். படி 1 இல் உருவாக்கப்பட்ட அனைத்து டம்ப் கோப்புகளும் இதில் அடங்கும். இந்தச் செயல்பாடு சில நிமிடங்கள் நீடிக்கும்.
+BackupDesc3=உங்கள் தரவுத்தளத்தின் (<b> %s </b> ) கட்டமைப்பு மற்றும் உள்ளடக்கங்களை ஒரு டம்ப் கோப்பில் காப்புப் பிரதி எடுக்கவும். இதற்கு, நீங்கள் பின்வரும் உதவியாளரைப் பயன்படுத்தலாம்.
+BackupDescX=காப்பகப்படுத்தப்பட்ட கோப்பகம் பாதுகாப்பான இடத்தில் சேமிக்கப்பட வேண்டும்.
+BackupDescY=உருவாக்கப்பட்ட டம்ப் கோப்பு பாதுகாப்பான இடத்தில் சேமிக்கப்பட வேண்டும்.
+BackupPHPWarning=இந்த முறை மூலம் காப்புப்பிரதிக்கு உத்தரவாதம் அளிக்க முடியாது. முந்தையது பரிந்துரைக்கப்பட்டது.
+RestoreDesc=Dolibarr காப்புப்பிரதியை மீட்டெடுக்க, இரண்டு படிகள் தேவை.
+RestoreDesc2="ஆவணங்கள்" கோப்பகத்தின் காப்புப் பிரதி கோப்பை (உதாரணமாக ஜிப் கோப்பு) புதிய 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> உடன் ஷெல்லில் உள்நுழைந்த பிறகு, கட்டளை வரியிலிருந்து இந்தக் கட்டளையை இயக்க வேண்டும் அல்லது <b> a0ecb2ec180 a0ecb2ec180 a0ecb2ec180 a0ecb2ec180 a0ecb2ec187080 a0ecb2ec17080 %s </b> கட்டளை வரியின் முடிவில் -W விருப்பத்தைச் சேர்க்க வேண்டும்.
+YourPHPDoesNotHaveSSLSupport=உங்கள் PHP இல் SSL செயல்பாடுகள் இல்லை
+DownloadMoreSkins=பதிவிறக்கம் செய்ய மேலும் தோல்கள்
+SimpleNumRefModelDesc=%syymm-nnnn வடிவத்தில் குறிப்பு எண்ணை வழங்குகிறது, இங்கு yy என்பது ஆண்டு, mm என்பது மாதம் மற்றும் nnnn என்பது மீட்டமைக்கப்படாத ஒரு தொடர்ச்சியான தானியங்கு-அதிகரிப்பு எண்ணாகும்.
+SimpleNumRefNoDateModelDesc=%s-nnnn வடிவத்தில் குறிப்பு எண்ணை வழங்கும்
+ShowProfIdInAddress=முகவரிகளுடன் தொழில்முறை ஐடியைக் காட்டு
+ShowVATIntaInAddress=சமூகத்திற்குள் VAT எண்ணை மறை
+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=எச்சரிக்கை, சில லினக்ஸ் கணினிகளில், உங்கள் மின்னஞ்சலில் இருந்து மின்னஞ்சலை அனுப்ப, sendmail செயல்படுத்தும் அமைப்பில் -ba விருப்பம் இருக்க வேண்டும் (உங்கள் php.ini கோப்பில் mail.force_extra_parameters அளவுரு). சில பெறுநர்கள் ஒருபோதும் மின்னஞ்சல்களைப் பெறவில்லை என்றால், இந்த PHP அளவுருவை mail.force_extra_parameters = -ba) மூலம் திருத்த முயற்சிக்கவும்.
+PathToDocuments=ஆவணங்களுக்கான பாதை
+PathDirectory=அடைவு
+SendmailOptionMayHurtBuggedMTA="PHP மெயில் டைரக்ட்" முறையைப் பயன்படுத்தி அஞ்சல்களை அனுப்பும் அம்சம், சில பெறும் அஞ்சல் சேவையகங்களால் சரியாகப் பாகுபடுத்தப்படாமல் இருக்கும் அஞ்சல் செய்தியை உருவாக்கும். இதன் விளைவாக, பிழையான இயங்குதளங்களால் ஹோஸ்ட் செய்யப்பட்டவர்களால் சில மின்னஞ்சல்களைப் படிக்க முடியாது. இது சில இணைய வழங்குநர்களின் நிலை (எ.கா: பிரான்சில் ஆரஞ்சு). இது Dolibarr அல்லது PHP இல் உள்ள பிரச்சனை அல்ல, ஆனால் பெறும் அஞ்சல் சேவையகத்தில் உள்ளது. இருப்பினும், இதைத் தவிர்க்க, Dolibarrஐ மாற்ற, அமைப்பில் MAIN_FIX_FOR_BUGGED_MTA என்ற விருப்பத்தை 1க்கு சேர்க்கலாம் - மற்றவை. இருப்பினும், SMTP தரநிலையை கண்டிப்பாகப் பயன்படுத்தும் பிற சேவையகங்களில் நீங்கள் சிக்கல்களை சந்திக்கலாம். மற்ற தீர்வு (பரிந்துரைக்கப்பட்டது) "SMTP சாக்கெட் லைப்ரரி" முறையைப் பயன்படுத்துவதாகும், இது குறைபாடுகள் இல்லை.
+TranslationSetup=மொழிபெயர்ப்பு அமைப்பு
+TranslationKeySearch=மொழிபெயர்ப்பு விசை அல்லது சரத்தைத் தேடவும்
+TranslationOverwriteKey=மொழிபெயர்ப்பு சரத்தை மேலெழுதவும்
+TranslationDesc=காட்சி மொழியைத் எப்படி அமைக்க: <br> * இயல்புநிலை / Systemwide: <strong> பட்டி முகப்பு -> அமைப்பு -> பயனர் பெர் <br> * </strong> காட்சி: திரையின் மேல் பயனர்பெயர் கிளிக் செய்து பயனர் <strong> பயனர் காட்சி அமைப்பு </strong> தாவலை மாற்ற அட்டை.
+TranslationOverwriteDesc=பின்வரும் அட்டவணையை நிரப்பும் சரங்களை நீங்கள் மேலெழுதலாம். "%s" கீழ்தோன்றலில் இருந்து உங்கள் மொழியைத் தேர்வுசெய்து, மொழிபெயர்ப்பு விசை சரத்தை "%s" மற்றும் உங்கள் புதிய மொழிபெயர்ப்பை "%s" இல் செருகவும்.
+TranslationOverwriteDesc2=எந்த மொழிபெயர்ப்பு விசையைப் பயன்படுத்த வேண்டும் என்பதை அறிய மற்ற தாவலைப் பயன்படுத்தலாம்
+TranslationString=மொழிபெயர்ப்பு சரம்
+CurrentTranslationString=தற்போதைய மொழிபெயர்ப்பு சரம்
+WarningAtLeastKeyOrTranslationRequired=விசை அல்லது மொழிபெயர்ப்பு சரத்திற்கு குறைந்தபட்சம் ஒரு தேடல் அளவுகோல் தேவை
+NewTranslationStringToShow=காண்பிக்க புதிய மொழிபெயர்ப்பு சரம்
+OriginalValueWas=அசல் மொழிபெயர்ப்பு மேலெழுதப்பட்டுள்ளது. அசல் மதிப்பு: <br> <br> %s
+TransKeyWithoutOriginalValue=எந்த மொழிக் கோப்புகளிலும் இல்லாத ' <strong> %s </strong> ' என்ற மொழிபெயர்ப்பு விசைக்கான புதிய மொழிபெயர்ப்பை நீங்கள் கட்டாயப்படுத்தியுள்ளீர்கள்
+TitleNumberOfActivatedModules=செயல்படுத்தப்பட்ட தொகுதிகள்
+TotalNumberOfActivatedModules=செயல்படுத்தப்பட்ட தொகுதிகள்: <b> %s </b> / <b> %s a09a4b730f17f8
+YouMustEnableOneModule=நீங்கள் குறைந்தபட்சம் 1 தொகுதியை இயக்க வேண்டும்
+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 உள்ளது. Home-Setup-Other இல் நிலையான %s ஐ 1க்கு சேர்க்கலாம்.
+YouHaveXObjectUseSearchOptimDesc=இது சரங்களின் தொடக்கத்தில் தேடலைக் கட்டுப்படுத்துகிறது, இது தரவுத்தளத்திற்கு குறியீடுகளைப் பயன்படுத்துவதை சாத்தியமாக்குகிறது, மேலும் நீங்கள் உடனடி பதிலைப் பெற வேண்டும்.
+YouHaveXObjectAndSearchOptimOn=உங்களிடம் தரவுத்தளத்தில் %s %s உள்ளது, மேலும் %s ஆனது Home-Setup-Other இல் %s ஆக அமைக்கப்பட்டுள்ளது.
+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=வாடிக்கையாளர்/விற்பனையாளர் VAT எண்ணை காம்போ பட்டியல்களில் காட்டவும்.
+AddAdressInList=வாடிக்கையாளர்/விற்பனையாளர் முகவரியை காம்போ பட்டியல்களில் காட்டவும். <br> மூன்றாம் தரப்பினர் "The Big Company corp" என்பதற்குப் பதிலாக "The Big Company corp. - 21 jump street 123456 Big town - USA" என்ற பெயர் வடிவத்துடன் தோன்றும்.
+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=உள் Dolibarr அல்காரிதம் படி உருவாக்கப்பட்ட கடவுச்சொல்லை திருப்பி அனுப்பவும்: %s எழுத்துகள் பகிரப்பட்ட எண்கள் மற்றும் சிறிய எழுத்துக்களில் உள்ள எழுத்துக்கள்.
+PasswordGenerationNone=உருவாக்கப்பட்ட கடவுச்சொல்லை பரிந்துரைக்க வேண்டாம். கடவுச்சொல்லை கைமுறையாக தட்டச்சு செய்ய வேண்டும்.
+PasswordGenerationPerso=உங்கள் தனிப்பட்ட முறையில் வரையறுக்கப்பட்ட உள்ளமைவின்படி கடவுச்சொல்லை திருப்பி அனுப்பவும்.
+SetupPerso=உங்கள் கட்டமைப்பின் படி
+PasswordPatternDesc=கடவுச்சொல் வடிவ விளக்கம்
+##### Users setup #####
+RuleForGeneratedPasswords=கடவுச்சொற்களை உருவாக்க மற்றும் சரிபார்க்க விதிகள்
+DisableForgetPasswordLinkOnLogonPage=உள்நுழைவு பக்கத்தில் "கடவுச்சொல் மறந்துவிட்டது" இணைப்பைக் காட்ட வேண்டாம்
+UsersSetup=பயனர் தொகுதி அமைப்பு
+UserMailRequired=புதிய பயனரை உருவாக்க மின்னஞ்சல் தேவை
+UserHideInactive=பயனர்களின் அனைத்து சேர்க்கை பட்டியல்களிலிருந்தும் செயலற்ற பயனர்களை மறை (பரிந்துரைக்கப்படவில்லை: சில பக்கங்களில் பழைய பயனர்களை வடிகட்டவோ அல்லது தேடவோ முடியாது என்று அர்த்தம்)
+UsersDocModules=பயனர் பதிவிலிருந்து உருவாக்கப்பட்ட ஆவணங்களுக்கான ஆவண வார்ப்புருக்கள்
+GroupsDocModules=குழு பதிவிலிருந்து உருவாக்கப்பட்ட ஆவணங்களுக்கான ஆவண டெம்ப்ளேட்கள்
+##### HRM setup #####
+HRMSetup=HRM தொகுதி அமைவு
+##### Company setup #####
+CompanySetup=நிறுவனங்களின் தொகுதி அமைப்பு
+CompanyCodeChecker=வாடிக்கையாளர்/விற்பனையாளர் குறியீடுகளை தானாக உருவாக்குவதற்கான விருப்பங்கள்
+AccountCodeManager=வாடிக்கையாளர்/விற்பனையாளர் கணக்கியல் குறியீடுகளை தானாக உருவாக்குவதற்கான விருப்பங்கள்
+NotificationsDesc=சில Dolibarr நிகழ்வுகளுக்கு மின்னஞ்சல் அறிவிப்புகள் தானாகவே அனுப்பப்படும். <br> அறிவிப்புகளைப் பெறுபவர்களை வரையறுக்கலாம்:
+NotificationsDescUser=* ஒரு பயனருக்கு, ஒரு நேரத்தில் ஒரு பயனர்.
+NotificationsDescContact=* ஒரு மூன்றாம் தரப்பு தொடர்புகளுக்கு (வாடிக்கையாளர்கள் அல்லது விற்பனையாளர்கள்), ஒரு நேரத்தில் ஒரு தொடர்பு.
+NotificationsDescGlobal=* அல்லது தொகுதியின் அமைவுப் பக்கத்தில் உலகளாவிய மின்னஞ்சல் முகவரிகளை அமைப்பதன் மூலம்.
+ModelModules=ஆவண வார்ப்புருக்கள்
+DocumentModelOdt=OpenDocument டெம்ப்ளேட்களிலிருந்து ஆவணங்களை உருவாக்கவும் (.ODT / .ODS கோப்புகள் LibreOffice, OpenOffice, KOffice, TextEdit,...)
+WatermarkOnDraft=வரைவு ஆவணத்தில் வாட்டர்மார்க்
+JSOnPaimentBill=கட்டணப் படிவத்தில் கட்டண வரிகளைத் தானாக நிரப்ப அம்சத்தைச் செயல்படுத்தவும்
+CompanyIdProfChecker=தொழில்முறை ஐடிகளுக்கான விதிகள்
+MustBeUnique=தனித்துவமாக இருக்க வேண்டுமா?
+MustBeMandatory=மூன்றாம் தரப்பினரை உருவாக்குவது கட்டாயமா (VAT எண் அல்லது நிறுவனத்தின் வகை வரையறுக்கப்பட்டிருந்தால்) ?
+MustBeInvoiceMandatory=இன்வாய்ஸ்களை சரிபார்க்க கட்டாயமா?
+TechnicalServicesProvided=தொழில்நுட்ப சேவைகள் வழங்கப்படும்
+#####DAV #####
+WebDAVSetupDesc=WebDAV கோப்பகத்தை அணுகுவதற்கான இணைப்பு இதுவாகும். URL (பொது கோப்பக அணுகல் அனுமதிக்கப்பட்டால்) மற்றும் அணுகலுக்கு ஏற்கனவே உள்ள உள்நுழைவு கணக்கு/கடவுச்சொல் தேவைப்படும் "தனியார்" கோப்பகத்தை அறிந்த எந்தவொரு பயனருக்கும் திறந்திருக்கும் "பொது" டைரக்டரி இதில் உள்ளது.
+WebDavServer=%s சேவையகத்தின் ரூட் URL: %s
+##### Webcal setup #####
+WebCalUrlForVCalExport=<b> %s </b> வடிவமைப்பிற்கான ஏற்றுமதி இணைப்பு பின்வரும் இணைப்பில் கிடைக்கிறது: %s
+##### Invoices #####
+BillsSetup=இன்வாய்ஸ் தொகுதி அமைவு
+BillsNumberingModule=இன்வாய்ஸ்கள் மற்றும் கிரெடிட் நோட்டுகளின் எண் மாதிரி
+BillsPDFModules=விலைப்பட்டியல் ஆவணங்களின் மாதிரிகள்
+BillsPDFModulesAccordindToInvoiceType=விலைப்பட்டியல் வகைக்கு ஏற்ப விலைப்பட்டியல் ஆவணங்கள் மாதிரிகள்
+PaymentsPDFModules=கட்டண ஆவணங்களின் மாதிரிகள்
+ForceInvoiceDate=இன்வாய்ஸ் தேதியை சரிபார்ப்பு தேதிக்கு கட்டாயப்படுத்தவும்
+SuggestedPaymentModesIfNotDefinedInInvoice=விலைப்பட்டியலில் வரையறுக்கப்படவில்லை எனில், இயல்புநிலையாக விலைப்பட்டியலில் கட்டண முறை பரிந்துரைக்கப்படுகிறது
+SuggestPaymentByRIBOnAccount=கணக்கில் திரும்பப் பெறுவதன் மூலம் பணம் செலுத்த பரிந்துரைக்கவும்
+SuggestPaymentByChequeToAddress=காசோலை மூலம் பணம் செலுத்த பரிந்துரைக்கவும்
+FreeLegalTextOnInvoices=விலைப்பட்டியல்களில் இலவச உரை
+WatermarkOnDraftInvoices=வரைவு விலைப்பட்டியல்களில் வாட்டர்மார்க் (காலியாக இருந்தால் எதுவும் இல்லை)
+PaymentsNumberingModule=கட்டண எண் மாதிரி
+SuppliersPayment=விற்பனையாளர் கொடுப்பனவுகள்
+SupplierPaymentSetup=விற்பனையாளர் கட்டண அமைப்பு
+##### Proposals #####
+PropalSetup=வணிக முன்மொழிவுகள் தொகுதி அமைவு
+ProposalsNumberingModules=வணிக முன்மொழிவு எண் மாதிரிகள்
+ProposalsPDFModules=வணிக முன்மொழிவு ஆவண மாதிரிகள்
+SuggestedPaymentModesIfNotDefinedInProposal=முன்மொழிவில் வரையறுக்கப்படவில்லை எனில் முன்னிருப்பாகப் பரிந்துரைக்கப்படும் கட்டண முறை
+FreeLegalTextOnProposal=வணிக முன்மொழிவுகளில் இலவச உரை
+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=ஆர்டருக்கு கிடங்கு மூலத்தைக் கேளுங்கள்
+##### Suppliers Orders #####
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=கொள்முதல் ஆர்டரின் வங்கிக் கணக்கின் இலக்கைக் கேட்கவும்
+##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=ஆர்டரில் வரையறுக்கப்படவில்லை என்றால், இயல்பாகவே விற்பனை ஆர்டரில் பரிந்துரைக்கப்படும் கட்டண முறை
+OrdersSetup=விற்பனை ஆணை மேலாண்மை அமைப்பு
+OrdersNumberingModules=எண் மாதிரிகளை ஆர்டர் செய்கிறது
+OrdersModelModule=ஆவண மாதிரிகளை ஆர்டர் செய்யுங்கள்
+FreeLegalTextOnOrders=ஆர்டர்களில் இலவச உரை
+WatermarkOnDraftOrders=வரைவு ஆர்டர்களில் வாட்டர்மார்க் (காலியாக இருந்தால் எதுவும் இல்லை)
+ShippableOrderIconInList=ஆர்டர்கள் பட்டியலில் ஒரு ஐகானைச் சேர்க்கவும், இது ஆர்டர் அனுப்பக்கூடியதா என்பதைக் குறிக்கும்
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=ஆர்டரின் வங்கிக் கணக்கின் இலக்கைக் கேட்கவும்
+##### Interventions #####
+InterventionsSetup=தலையீடுகள் தொகுதி அமைப்பு
+FreeLegalTextOnInterventions=தலையீட்டு ஆவணங்களில் இலவச உரை
+FicheinterNumberingModules=தலையீடு எண் மாதிரிகள்
+TemplatePDFInterventions=தலையீட்டு அட்டை ஆவணங்களின் மாதிரிகள்
+WatermarkOnDraftInterventionCards=தலையீட்டு அட்டை ஆவணங்களில் வாட்டர்மார்க் (காலியாக இருந்தால் எதுவும் இல்லை)
+##### Contracts #####
+ContractsSetup=ஒப்பந்தங்கள்/சந்தாக்கள் தொகுதி அமைவு
+ContractsNumberingModules=ஒப்பந்த எண் தொகுதிகள்
+TemplatePDFContracts=ஒப்பந்த ஆவணங்களின் மாதிரிகள்
+FreeLegalTextOnContracts=ஒப்பந்தங்கள் பற்றிய இலவச உரை
+WatermarkOnDraftContractCards=வரைவு ஒப்பந்தங்களில் வாட்டர்மார்க் (காலியாக இருந்தால் எதுவும் இல்லை)
+##### Members #####
+MembersSetup=உறுப்பினர்கள் தொகுதி அமைப்பு
+MemberMainOptions=முக்கிய விருப்பங்கள்
+AdherentLoginRequired= ஒவ்வொரு உறுப்பினருக்கும் ஒரு உள்நுழைவை நிர்வகிக்கவும்
+AdherentMailRequired=புதிய உறுப்பினரை உருவாக்க மின்னஞ்சல் தேவை
+MemberSendInformationByMailByDefault=உறுப்பினர்களுக்கு மின்னஞ்சல் உறுதிப்படுத்தலை அனுப்புவதற்கான தேர்வுப்பெட்டி (சரிபார்ப்பு அல்லது புதிய சந்தா) இயல்பாகவே இயக்கத்தில் உள்ளது
+MemberCreateAnExternalUserForSubscriptionValidated=சரிபார்க்கப்பட்ட ஒவ்வொரு புதிய உறுப்பினர் சந்தாவிற்கும் வெளிப்புற பயனர் உள்நுழைவை உருவாக்கவும்
+VisitorCanChooseItsPaymentMode=கிடைக்கக்கூடிய கட்டண முறைகளில் இருந்து பார்வையாளர் தேர்வு செய்யலாம்
+MEMBER_REMINDER_EMAIL=காலாவதியான சந்தாக்களின் </b> மின்னஞ்சல் மூலம் <b> என்ற தானியங்கி நினைவூட்டலை இயக்கவும். குறிப்பு: தொகுதி <strong> %s </strong> இயக்கப்பட்டிருக்க வேண்டும் மற்றும் நினைவூட்டல்களை அனுப்ப, சரியாக அமைக்க வேண்டும்.
+MembersDocModules=உறுப்பினர் பதிவிலிருந்து உருவாக்கப்பட்ட ஆவணங்களுக்கான ஆவண வார்ப்புருக்கள்
+##### LDAP setup #####
+LDAPSetup=LDAP அமைப்பு
+LDAPGlobalParameters=உலகளாவிய அளவுருக்கள்
+LDAPUsersSynchro=பயனர்கள்
+LDAPGroupsSynchro=குழுக்கள்
+LDAPContactsSynchro=தொடர்புகள்
+LDAPMembersSynchro=உறுப்பினர்கள்
+LDAPMembersTypesSynchro=உறுப்பினர்களின் வகைகள்
+LDAPSynchronization=LDAP ஒத்திசைவு
+LDAPFunctionsNotAvailableOnPHP=உங்கள் PHP இல் LDAP செயல்பாடுகள் இல்லை
+LDAPToDolibarr=LDAP -> Dolibarr
+DolibarrToLDAP=Dolibarr -> LDAP
+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=சர்வர் டிஎன்
+LDAPAdminDn=நிர்வாகி டி.என்
+LDAPAdminDnExample=முழு DN (எ.கா: cn=admin,dc=example,dc=com அல்லது cn=Administrator,cn=Users,dc=example,dc=com செயலில் உள்ள கோப்பகத்திற்கு)
+LDAPPassword=நிர்வாகி கடவுச்சொல்
+LDAPUserDn=பயனர்களின் டிஎன்
+LDAPUserDnExample=முழு DN (எ.கா: ou=users,dc=example,dc=com)
+LDAPGroupDn=குழுக்களின் டிஎன்
+LDAPGroupDnExample=முழு DN (எ.கா: ou=groups,dc=example,dc=com)
+LDAPServerExample=சேவையக முகவரி (எ.கா: லோக்கல் ஹோஸ்ட், 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerDnExample=முழு DN (எ.கா: dc=example,dc=com)
+LDAPDnSynchroActive=பயனர்கள் மற்றும் குழுக்கள் ஒத்திசைவு
+LDAPDnSynchroActiveExample=LDAP to Dolibarr அல்லது Dolibarr to LDAP ஒத்திசைவு
+LDAPDnContactActive=தொடர்புகளின் ஒத்திசைவு
+LDAPDnContactActiveExample=செயல்படுத்தப்பட்ட/செயல்படுத்தப்படாத ஒத்திசைவு
+LDAPDnMemberActive=உறுப்பினர்களின் ஒத்திசைவு
+LDAPDnMemberActiveExample=செயல்படுத்தப்பட்ட/செயல்படுத்தப்படாத ஒத்திசைவு
+LDAPDnMemberTypeActive=உறுப்பினர் வகைகளின் ஒத்திசைவு
+LDAPDnMemberTypeActiveExample=செயல்படுத்தப்பட்ட/செயல்படுத்தப்படாத ஒத்திசைவு
+LDAPContactDn=Dolibarr தொடர்புகளின் DN
+LDAPContactDnExample=முழு DN (எ.கா: ou=contacts,dc=example,dc=com)
+LDAPMemberDn=Dolibarr உறுப்பினர்கள் DN
+LDAPMemberDnExample=முழு DN (எ.கா: ou=members,dc=example,dc=com)
+LDAPMemberObjectClassList=பொருள் வகுப்பின் பட்டியல்
+LDAPMemberObjectClassListExample=பதிவுப் பண்புகளை வரையறுக்கும் objectClass பட்டியல் (எ.கா: top,inetOrgPerson அல்லது top,செயலில் உள்ள கோப்பகத்திற்கான பயனர்)
+LDAPMemberTypeDn=Dolibarr உறுப்பினர்கள் DN வகைகள்
+LDAPMemberTypepDnExample=முழு DN (எ.கா: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassList=பொருள் வகுப்பின் பட்டியல்
+LDAPMemberTypeObjectClassListExample=பதிவு பண்புகளை வரையறுக்கும் objectClass பட்டியல் (எ.கா: top,groupOfUniqueNames)
+LDAPUserObjectClassList=பொருள் வகுப்பின் பட்டியல்
+LDAPUserObjectClassListExample=பதிவுப் பண்புகளை வரையறுக்கும் objectClass பட்டியல் (எ.கா: top,inetOrgPerson அல்லது top,செயலில் உள்ள கோப்பகத்திற்கான பயனர்)
+LDAPGroupObjectClassList=பொருள் வகுப்பின் பட்டியல்
+LDAPGroupObjectClassListExample=பதிவு பண்புகளை வரையறுக்கும் objectClass பட்டியல் (எ.கா: top,groupOfUniqueNames)
+LDAPContactObjectClassList=பொருள் வகுப்பின் பட்டியல்
+LDAPContactObjectClassListExample=பதிவுப் பண்புகளை வரையறுக்கும் objectClass பட்டியல் (எ.கா: top,inetOrgPerson அல்லது top,செயலில் உள்ள கோப்பகத்திற்கான பயனர்)
+LDAPTestConnect=LDAP இணைப்பைச் சோதிக்கவும்
+LDAPTestSynchroContact=சோதனை தொடர்புகள் ஒத்திசைவு
+LDAPTestSynchroUser=பயனர் ஒத்திசைவைச் சோதிக்கவும்
+LDAPTestSynchroGroup=சோதனை குழு ஒத்திசைவு
+LDAPTestSynchroMember=சோதனை உறுப்பினர் ஒத்திசைவு
+LDAPTestSynchroMemberType=சோதனை உறுப்பினர் வகை ஒத்திசைவு
+LDAPTestSearch= LDAP தேடலைச் சோதிக்கவும்
+LDAPSynchroOK=ஒத்திசைவு சோதனை வெற்றியடைந்தது
+LDAPSynchroKO=ஒத்திசைவு சோதனை தோல்வியடைந்தது
+LDAPSynchroKOMayBePermissions=ஒத்திசைவு சோதனை தோல்வியடைந்தது. சேவையகத்திற்கான இணைப்பு சரியாக உள்ளமைக்கப்பட்டுள்ளதா என சரிபார்த்து LDAP புதுப்பிப்புகளை அனுமதிக்கிறது
+LDAPTCPConnectOK=LDAP சேவையகத்துடன் TCP இணைப்பு வெற்றிகரமாக உள்ளது (Server=%s, Port=%s)
+LDAPTCPConnectKO=LDAP சேவையகத்துடன் TCP இணைப்பு தோல்வியடைந்தது (Server=%s, Port=%s)
+LDAPBindOK=LDAP சேவையகத்துடன் இணைக்கவும்/அங்கீகரிக்கவும் வெற்றியடைந்தது (Server=%s, Port=%s, Admin=%s, கடவுச்சொல்=%s)
+LDAPBindKO=LDAP சேவையகத்துடன் இணைக்க/அங்கீகரிக்க முடியவில்லை (சர்வர்=%s, Port=%s, Admin=%s, கடவுச்சொல்=%s)
+LDAPSetupForVersion3=LDAP சேவையகம் பதிப்பு 3 க்காக கட்டமைக்கப்பட்டது
+LDAPSetupForVersion2=LDAP சேவையகம் பதிப்பு 2 க்காக கட்டமைக்கப்பட்டது
+LDAPDolibarrMapping=டோலிபார் மேப்பிங்
+LDAPLdapMapping=LDAP மேப்பிங்
+LDAPFieldLoginUnix=உள்நுழைவு (யூனிக்ஸ்)
+LDAPFieldLoginExample=எடுத்துக்காட்டு: uid
+LDAPFilterConnection=தேடல் வடிகட்டி
+LDAPFilterConnectionExample=எடுத்துக்காட்டு: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=எடுத்துக்காட்டு: &(objectClass=groupOfUsers)
+LDAPFieldLoginSamba=உள்நுழைவு (சம்பா, செயலில் உள்ள அடைவு)
+LDAPFieldLoginSambaExample=உதாரணம்: samaccountname
+LDAPFieldFullname=முழு பெயர்
+LDAPFieldFullnameExample=எடுத்துக்காட்டு: cn
+LDAPFieldPasswordNotCrypted=கடவுச்சொல் குறியாக்கம் செய்யப்படவில்லை
+LDAPFieldPasswordCrypted=கடவுச்சொல் குறியாக்கம் செய்யப்பட்டது
+LDAPFieldPasswordExample=எடுத்துக்காட்டு: பயனர் கடவுச்சொல்
+LDAPFieldCommonNameExample=எடுத்துக்காட்டு: cn
+LDAPFieldName=பெயர்
+LDAPFieldNameExample=எடுத்துக்காட்டு: sn
+LDAPFieldFirstName=முதல் பெயர்
+LDAPFieldFirstNameExample=எடுத்துக்காட்டு: கொடுக்கப்பட்ட பெயர்
+LDAPFieldMail=மின்னஞ்சல் முகவரி
+LDAPFieldMailExample=எடுத்துக்காட்டு: அஞ்சல்
+LDAPFieldPhone=தொழில்முறை தொலைபேசி எண்
+LDAPFieldPhoneExample=உதாரணம்: தொலைபேசி எண்
+LDAPFieldHomePhone=தனிப்பட்ட தொலைபேசி எண்
+LDAPFieldHomePhoneExample=உதாரணம்: வீட்டு தொலைபேசி
+LDAPFieldMobile=கை பேசி
+LDAPFieldMobileExample=உதாரணம்: மொபைல்
+LDAPFieldFax=தொலைநகல் எண்
+LDAPFieldFaxExample=எடுத்துக்காட்டு: தொலைநகல் தொலைபேசி எண்
+LDAPFieldAddress=தெரு
+LDAPFieldAddressExample=எடுத்துக்காட்டு: தெரு
+LDAPFieldZip=ஜிப்
+LDAPFieldZipExample=எடுத்துக்காட்டு: அஞ்சல் குறியீடு
+LDAPFieldTown=நகரம்
+LDAPFieldTownExample=எடுத்துக்காட்டு: எல்
+LDAPFieldCountry=நாடு
+LDAPFieldDescription=விளக்கம்
+LDAPFieldDescriptionExample=எடுத்துக்காட்டு: விளக்கம்
+LDAPFieldNotePublic=பொது குறிப்பு
+LDAPFieldNotePublicExample=எடுத்துக்காட்டு: பொதுக் குறிப்பு
+LDAPFieldGroupMembers= குழு உறுப்பினர்கள்
+LDAPFieldGroupMembersExample= எடுத்துக்காட்டு: தனிப்பட்ட உறுப்பினர்
+LDAPFieldBirthdate=பிறந்த தேதி
+LDAPFieldCompany=நிறுவனம்
+LDAPFieldCompanyExample=உதாரணம்: ஓ
+LDAPFieldSid=SID
+LDAPFieldSidExample=உதாரணம்: objectsid
+LDAPFieldEndLastSubscription=சந்தா முடிவு தேதி
+LDAPFieldTitle=வேலை நிலை
+LDAPFieldTitleExample=எடுத்துக்காட்டு: தலைப்பு
+LDAPFieldGroupid=குழு ஐடி
+LDAPFieldGroupidExample=உதாரணம்: ஜிட்நம்பர்
+LDAPFieldUserid=பயனர் ஐடி
+LDAPFieldUseridExample=உதாரணம்: uidnumber
+LDAPFieldHomedirectory=முகப்பு அடைவு
+LDAPFieldHomedirectoryExample=எடுத்துக்காட்டு: முகப்பு அடைவு
+LDAPFieldHomedirectoryprefix=முகப்பு அடைவு முன்னொட்டு
+LDAPSetupNotComplete=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 a09a4b739). நீங்கள் thoose மதிப்புகள் மற்றும் OpenLDAP ஐப் பயன்படுத்தினால், உங்கள் LDAP கட்டமைப்பு கோப்பை <b> slapd.conf </b> ஐ மாற்றவும்.
+ForANonAnonymousAccess=அங்கீகரிக்கப்பட்ட அணுகலுக்கு (எடுத்துக்காட்டுக்கு எழுதும் அணுகலுக்கு)
+PerfDolibarr=செயல்திறன் அமைவு/உகப்பாக்க அறிக்கை
+YouMayFindPerfAdviceHere=இந்த பக்கம் செயல்திறன் தொடர்பான சில சோதனைகள் அல்லது ஆலோசனைகளை வழங்குகிறது.
+NotInstalled=நிறுவப்படாத.
+NotSlowedDownByThis=இதனால் வேகம் குறையவில்லை.
+NotRiskOfLeakWithThis=இதனால் கசிவு அபாயம் இல்லை.
+ApplicativeCache=பயன்பாட்டு தற்காலிக சேமிப்பு
+MemcachedNotAvailable=பொருந்தக்கூடிய தற்காலிக சேமிப்பு எதுவும் இல்லை. Memcached கேச் சர்வர் மற்றும் இந்த கேச் சர்வரைப் பயன்படுத்தக்கூடிய மாட்யூலை நிறுவுவதன் மூலம் செயல்திறனை மேம்படுத்தலாம். <br> மேலும் தகவல் இங்கே <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http://wiki.dolibarr.org/index.php/Module_MemCached_EN </a> . <br> நிறைய வலை ஹோஸ்டிங் வழங்குநர்கள் அத்தகைய கேச் சேவையகத்தை வழங்கவில்லை என்பதை நினைவில் கொள்க.
+MemcachedModuleAvailableButNotSetup=பயன்பாட்டு தற்காலிக சேமிப்பிற்காக தொகுதி மெம்கேச் செய்யப்பட்டது ஆனால் தொகுதியின் அமைவு முழுமையடையவில்லை.
+MemcachedAvailableAndSetup=Memcached சேவையகத்தைப் பயன்படுத்த அர்ப்பணிக்கப்பட்ட memcached தொகுதி இயக்கப்பட்டது.
+OPCodeCache=OPCode தற்காலிக சேமிப்பு
+NoOPCodeCacheFound=OPCode கேச் எதுவும் இல்லை. ஒருவேளை நீங்கள் XCache அல்லது eAccelerator (நல்லது) தவிர வேறு OPCode தற்காலிக சேமிப்பைப் பயன்படுத்துகிறீர்கள் அல்லது உங்களிடம் OPCode கேச் இல்லாமல் இருக்கலாம் (மிக மோசமானது).
+HTTPCacheStaticResources=நிலையான ஆதாரங்களுக்கான HTTP கேச் (css, img, javascript)
+FilesOfTypeCached=%s வகை கோப்புகள் HTTP சேவையகத்தால் தற்காலிகமாக சேமிக்கப்படுகின்றன
+FilesOfTypeNotCached=%s வகை கோப்புகள் HTTP சேவையகத்தால் தேக்ககப்படுத்தப்படவில்லை
+FilesOfTypeCompressed=%s வகை கோப்புகள் HTTP சேவையகத்தால் சுருக்கப்படுகின்றன
+FilesOfTypeNotCompressed=%s வகை கோப்புகள் HTTP சேவையகத்தால் சுருக்கப்படவில்லை
+CacheByServer=சேவையகத்தின் மூலம் தற்காலிக சேமிப்பு
+CacheByServerDesc=உதாரணமாக "ExpiresByType image/gif A2592000" Apache கட்டளையைப் பயன்படுத்துதல்
+CacheByClient=உலாவி மூலம் தற்காலிக சேமிப்பு
+CompressionOfResources=HTTP பதில்களின் சுருக்கம்
+CompressionOfResourcesDesc=உதாரணமாக "AddOutputFilterByType DEFLATE" என்ற Apache கட்டளையைப் பயன்படுத்துதல்
+TestNotPossibleWithCurrentBrowsers=தற்போதைய உலாவிகளில் இத்தகைய தானியங்கி கண்டறிதல் சாத்தியமில்லை
+DefaultValuesDesc=புதிய பதிவை உருவாக்கும் போது நீங்கள் பயன்படுத்த விரும்பும் இயல்புநிலை மதிப்பை, மற்றும்/அல்லது இயல்புநிலை வடிப்பான்கள் அல்லது பதிவுகளை பட்டியலிடும்போது வரிசைப்படுத்தும் வரிசையை இங்கே நீங்கள் வரையறுக்கலாம்.
+DefaultCreateForm=இயல்புநிலை மதிப்புகள் (படிவங்களில் பயன்படுத்த)
+DefaultSearchFilters=இயல்புநிலை தேடல் வடிப்பான்கள்
+DefaultSortOrder=இயல்புநிலை வரிசை ஆர்டர்கள்
+DefaultFocus=இயல்புநிலை கவனம் புலங்கள்
+DefaultMandatory=கட்டாய படிவ புலங்கள்
+##### Products #####
+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=பதிவுகள் தொகுதி அமைப்பு
+SyslogOutput=பதிவு வெளியீடுகள்
+SyslogFacility=வசதி
+SyslogLevel=நிலை
+SyslogFilename=கோப்பு பெயர் மற்றும் பாதை
+YouCanUseDOL_DATA_ROOT=Dolibarr "ஆவணங்கள்" கோப்பகத்தில் பதிவுக் கோப்பிற்கு DOL_DATA_ROOT/dolibarr.log ஐப் பயன்படுத்தலாம். இந்தக் கோப்பைச் சேமிக்க வேறு பாதையை அமைக்கலாம்.
+ErrorUnknownSyslogConstant=நிலையான %s என்பது அறியப்பட்ட Syslog மாறிலி அல்ல
+OnlyWindowsLOG_USER=Windows இல், LOG_USER வசதி மட்டுமே ஆதரிக்கப்படும்
+CompressSyslogs=பிழைத்திருத்த பதிவு கோப்புகளின் சுருக்கம் மற்றும் காப்புப்பிரதி (தொகுதியால் உருவாக்கப்பட்ட பிழைத்திருத்தத்திற்கான பதிவு)
+SyslogFileNumberOfSaves=வைத்திருக்க வேண்டிய காப்புப் பதிவுகளின் எண்ணிக்கை
+ConfigureCleaningCronjobToSetFrequencyOfSaves=பதிவு காப்பு அதிர்வெண்ணை அமைக்க, சுத்தம் செய்ய திட்டமிடப்பட்ட வேலையை உள்ளமைக்கவும்
+##### Donations #####
+DonationsSetup=நன்கொடை தொகுதி அமைப்பு
+DonationsReceiptModel=நன்கொடை ரசீது மாதிரி
+##### Barcode #####
+BarcodeSetup=பார்கோடு அமைப்பு
+PaperFormatModule=அச்சு வடிவம் தொகுதி
+BarcodeEncodeModule=பார்கோடு குறியாக்க வகை
+CodeBarGenerator=பார்கோடு ஜெனரேட்டர்
+ChooseABarCode=ஜெனரேட்டர் வரையறுக்கப்படவில்லை
+FormatNotSupportedByGenerator=இந்த ஜெனரேட்டரால் வடிவம் ஆதரிக்கப்படவில்லை
+BarcodeDescEAN8=EAN8 வகை பார்கோடு
+BarcodeDescEAN13=EAN13 வகை பார்கோடு
+BarcodeDescUPC=UPC வகை பார்கோடு
+BarcodeDescISBN=ISBN வகை பார்கோடு
+BarcodeDescC39=C39 வகை பார்கோடு
+BarcodeDescC128=C128 வகை பார்கோடு
+BarcodeDescDATAMATRIX=டேட்டாமேட்ரிக்ஸ் வகை பார்கோடு
+BarcodeDescQRCODE=வகை QR குறியீட்டின் பார்கோடு
+GenbarcodeLocation=பார் குறியீடு உருவாக்கும் கட்டளை வரி கருவி (சில பார் குறியீடு வகைகளுக்கு உள் இயந்திரத்தால் பயன்படுத்தப்படுகிறது). "ஜென்பார்கோடு" உடன் இணக்கமாக இருக்க வேண்டும். <br> எடுத்துக்காட்டாக: /usr/local/bin/genbarcode
+BarcodeInternalEngine=உள் இயந்திரம்
+BarCodeNumberManager=பார்கோடு எண்களை தானாக வரையறுக்க மேலாளர்
+##### Prelevements #####
+WithdrawalsSetup=தொகுதி நேரடி டெபிட் கொடுப்பனவுகளை அமைத்தல்
+##### ExternalRSS #####
+ExternalRSSSetup=வெளிப்புற RSS இறக்குமதி அமைப்பு
+NewRSS=புதிய RSS ஊட்டம்
+RSSUrl=RSS URL
+RSSUrlExample=ஒரு சுவாரஸ்யமான RSS ஊட்டம்
+##### Mailing #####
+MailingSetup=மின்னஞ்சல் தொகுதி அமைவு
+MailingEMailFrom=மின்னஞ்சல் தொகுதி மூலம் அனுப்பப்படும் மின்னஞ்சல்களுக்கான அனுப்புநர் மின்னஞ்சல் (இருந்து).
+MailingEMailError=பிழைகள் உள்ள மின்னஞ்சல்களுக்கு மின்னஞ்சலை (பிழைகள்-க்கு) திருப்பி அனுப்பவும்
+MailingDelay=அடுத்த செய்தியை அனுப்பிய பிறகு சில நொடிகள் காத்திருக்க வேண்டும்
+##### Notification #####
+NotificationSetup=மின்னஞ்சல் அறிவிப்பு தொகுதி அமைப்பு
+NotificationEMailFrom=அறிவிப்புகள் தொகுதி மூலம் அனுப்பப்படும் மின்னஞ்சல்களுக்கு அனுப்புநர் மின்னஞ்சல் (இருந்து).
+FixedEmailTarget=பெறுபவர்
+NotificationDisableConfirmMessageContact=உறுதிப்படுத்தல் செய்தியில் அறிவிப்புகளின் பெறுநர்களின் பட்டியலை (தொடர்புக்கு குழுசேர்ந்த) மறைக்கவும்
+NotificationDisableConfirmMessageUser=உறுதிப்படுத்தல் செய்தியில் அறிவிப்புகளின் பெறுநர்களின் பட்டியலை (பயனராகக் குழுசேர்ந்த) மறைக்கவும்
+NotificationDisableConfirmMessageFix=உறுதிப்படுத்தல் செய்தியில் அறிவிப்புகளின் பெறுநர்களின் பட்டியலை (உலகளாவிய மின்னஞ்சலாகக் குழுசேர்ந்த) மறைக்கவும்
+##### Sendings #####
+SendingsSetup=ஷிப்பிங் தொகுதி அமைப்பு
+SendingsReceiptModel=ரசீது மாதிரியை அனுப்புகிறது
+SendingsNumberingModules=எண் தொகுதிகளை அனுப்புகிறது
+SendingsAbility=வாடிக்கையாளர் விநியோகத்திற்கான ஆதரவு ஷிப்பிங் தாள்கள்
+NoNeedForDeliveryReceipts=பெரும்பாலான சந்தர்ப்பங்களில், ஷிப்பிங் தாள்கள் வாடிக்கையாளர் விநியோகத்திற்கான தாள்களாகவும் (அனுப்ப வேண்டிய தயாரிப்புகளின் பட்டியல்) மற்றும் வாடிக்கையாளரால் பெறப்பட்டு கையொப்பமிடப்பட்ட தாள்களாகவும் பயன்படுத்தப்படுகின்றன. எனவே தயாரிப்பு டெலிவரி ரசீது நகல் அம்சம் மற்றும் அரிதாகவே செயல்படுத்தப்படுகிறது.
+FreeLegalTextOnShippings=ஏற்றுமதியில் இலவச உரை
+##### Deliveries #####
+DeliveryOrderNumberingModules=தயாரிப்புகள் டெலிவரி ரசீது எண் தொகுதி
+DeliveryOrderModel=தயாரிப்பு விநியோக ரசீது மாதிரி
+DeliveriesOrderAbility=ஆதரவு பொருட்கள் விநியோக ரசீதுகள்
+FreeLegalTextOnDeliveryReceipts=டெலிவரி ரசீதுகளில் இலவச உரை
+##### FCKeditor #####
+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=பங்கு தொகுதி அமைப்பு
+IfYouUsePointOfSaleCheckModule=இயல்புநிலையாக அல்லது வெளிப்புறத் தொகுதியாக வழங்கப்பட்ட Point of Sale தொகுதியை (POS) நீங்கள் பயன்படுத்தினால், இந்த அமைப்பு உங்கள் POS தொகுதியால் புறக்கணிக்கப்படலாம். பெரும்பாலான பிஓஎஸ் மாட்யூல்கள் இங்கே உள்ள விருப்பங்களைப் பொருட்படுத்தாமல் உடனடியாக விலைப்பட்டியல் உருவாக்கவும் பங்குகளைக் குறைக்கவும் இயல்பாகவே வடிவமைக்கப்பட்டுள்ளன. எனவே, உங்கள் பிஓஎஸ்ஸில் இருந்து விற்பனையைப் பதிவு செய்யும் போது பங்கு குறைய வேண்டும் அல்லது இல்லை என்றால், உங்கள் பிஓஎஸ் தொகுதி அமைப்பையும் சரிபார்க்கவும்.
+##### 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=வரிகள், சமூக அல்லது நிதி வரிகள் மற்றும் ஈவுத்தொகை தொகுதி அமைப்பு
+OptionVatMode=VAT செலுத்த வேண்டும்
+OptionVATDefault=நிலையான அடிப்படை
+OptionVATDebitOption=திரட்டல் அடிப்படை
+OptionVatDefaultDesc=VAT செலுத்தப்படுகிறது: <br> - சரக்குகளை டெலிவரி செய்யும் போது (விலைப்பட்டியல் தேதியின் அடிப்படையில்) <br> - சேவைகளுக்கான கொடுப்பனவுகளில்
+OptionVatDebitOptionDesc=VAT செலுத்த வேண்டியுள்ளது: <br> - சரக்குகளை டெலிவரி செய்யும் போது (விலைப்பட்டியல் தேதியின் அடிப்படையில்) <br> - சேவைகளுக்கான விலைப்பட்டியலில் (பற்று)
+OptionPaymentForProductAndServices=பொருட்கள் மற்றும் சேவைகளுக்கான பண அடிப்படை
+OptionPaymentForProductAndServicesDesc=VAT செலுத்த வேண்டியுள்ளது: <br> - பொருட்களுக்கான கட்டணம் <br> - சேவைகளுக்கான கொடுப்பனவுகளில்
+SummaryOfVatExigibilityUsedByDefault=தேர்ந்தெடுக்கப்பட்ட விருப்பத்தின்படி இயல்புநிலையாக VAT தகுதிக்கான நேரம்:
+OnDelivery=விநியோகத்தில்
+OnPayment=பணம் செலுத்தும்போது
+OnInvoice=விலைப்பட்டியலில்
+SupposedToBePaymentDate=பணம் செலுத்தும் தேதி பயன்படுத்தப்பட்டது
+SupposedToBeInvoiceDate=விலைப்பட்டியல் தேதி பயன்படுத்தப்பட்டது
+Buy=வாங்க
+Sell=விற்க
+InvoiceDateUsed=விலைப்பட்டியல் தேதி பயன்படுத்தப்பட்டது
+YourCompanyDoesNotUseVAT=உங்கள் நிறுவனம் VAT (முகப்பு - அமைவு - நிறுவனம்/நிறுவனம்) பயன்படுத்த வேண்டாம் என வரையறுக்கப்பட்டுள்ளது, எனவே அமைப்பதற்கு VAT விருப்பங்கள் எதுவும் இல்லை.
+AccountancyCode=கணக்கியல் குறியீடு
+AccountancyCodeSell=விற்பனை கணக்கு. குறியீடு
+AccountancyCodeBuy=கொள்முதல் கணக்கு. குறியீடு
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=புதிய வரியை உருவாக்கும் போது இயல்பாகவே "கட்டணத்தை தானாக உருவாக்கு" என்ற தேர்வுப்பெட்டியை காலியாக வைக்கவும்
+##### Agenda #####
+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=தொகுதி அமைப்பை டயல் செய்ய கிளிக் செய்யவும்
+ClickToDialUrlDesc=ஃபோன் பிக்டோவில் கிளிக் செய்தவுடன் URL அழைக்கப்படும். URL ஐ, நீங்கள் பயன்படுத்த முடியும் குறிச்சொற்களை <br> <b> __PHONETO__ </b> அந்த நபர் தொலைபேசி எண் மாற்றப்படும் <br> <b> __PHONEFROM__ நபர் (உங்களுடையது) அழைப்பு தொலைபேசி எண் <br> <b> __LOGIN__ </b> clicktodial மாற்றப்படும் என்று மாற்றப்படும் என்று </b> அழைக்க உள்நுழைவு (பயனர் அட்டையில் வரையறுக்கப்பட்டுள்ளது) <br> <b> __PASS__ </b> இது கிளிக்டோடியல் கடவுச்சொல் மூலம் மாற்றப்படும் (பயனர் அட்டையில் வரையறுக்கப்பட்டுள்ளது).
+ClickToDialDesc=டெஸ்க்டாப் கம்ப்யூட்டரைப் பயன்படுத்தும் போது, ஃபோன் எண்களை, கிளிக் செய்யக்கூடிய இணைப்புகளாக இந்த தொகுதி மாற்றுகிறது. ஒரு கிளிக் எண்ணை அழைக்கும். உங்கள் டெஸ்க்டாப்பில் மென்மையான தொலைபேசியைப் பயன்படுத்தும் போது அல்லது SIP நெறிமுறையின் அடிப்படையில் CTI அமைப்பைப் பயன்படுத்தும் போது தொலைபேசி அழைப்பைத் தொடங்க இது பயன்படுத்தப்படலாம். குறிப்பு: ஸ்மார்ட்போன் பயன்படுத்தும் போது, ஃபோன் எண்கள் எப்போதும் கிளிக் செய்யக்கூடியதாக இருக்கும்.
+ClickToDialUseTelLink=தொலைபேசி எண்களில் "தொலைபேசி:" என்ற இணைப்பை மட்டும் பயன்படுத்தவும்
+ClickToDialUseTelLinkDesc=உங்கள் பயனர்களுக்கு சாப்ட்ஃபோன் அல்லது மென்பொருள் இடைமுகம் இருந்தால், உலாவி இருக்கும் அதே கணினியில் நிறுவப்பட்டு, உங்கள் உலாவியில் "டெல்:" என்று தொடங்கும் இணைப்பைக் கிளிக் செய்யும் போது அழைக்கப்படும் இந்த முறையைப் பயன்படுத்தவும். உங்களுக்கு "sip:" உடன் தொடங்கும் இணைப்பு அல்லது முழு சேவையக தீர்வு (உள்ளூர் மென்பொருள் நிறுவல் தேவையில்லை) தேவைப்பட்டால், இதை "இல்லை" என அமைத்து அடுத்த புலத்தை நிரப்ப வேண்டும்.
+##### Point Of Sale (CashDesk) #####
+CashDesk=விற்பனை செய்யும் இடம்
+CashDeskSetup=விற்பனைத் தொகுதி அமைப்பு
+CashDeskThirdPartyForSell=விற்பனைக்கு பயன்படுத்த இயல்புநிலை பொதுவான மூன்றாம் தரப்பு
+CashDeskBankAccountForSell=ரொக்கப் பணம் பெறுவதற்குப் பயன்படுத்த வேண்டிய இயல்புநிலை கணக்கு
+CashDeskBankAccountForCheque=காசோலை மூலம் பணம் பெறுவதற்கு பயன்படுத்த வேண்டிய இயல்புநிலை கணக்கு
+CashDeskBankAccountForCB=கிரெடிட் கார்டுகள் மூலம் பணம் பெறுவதற்கு பயன்படுத்த வேண்டிய இயல்புநிலை கணக்கு
+CashDeskBankAccountForSumup=SumUp மூலம் பணம் பெறுவதற்கு இயல்புநிலை வங்கிக் கணக்கு பயன்படுத்தப்படும்
+CashDeskDoNotDecreaseStock=பாயின்ட் ஆஃப் சேல் ("இல்லை" எனில், மாட்யூல் ஸ்டாக்கில் அமைக்கப்பட்டுள்ள விருப்பத்தைப் பொருட்படுத்தாமல், பிஓஎஸ் மூலம் செய்யப்படும் ஒவ்வொரு விற்பனைக்கும் பங்கு குறைவு செய்யப்படுகிறது) விற்பனையின் போது பங்கு குறைவை முடக்கு.
+CashDeskIdWareHouse=கையிருப்பு குறைவதற்கு கிடங்கை கட்டாயப்படுத்தி கட்டுப்படுத்தவும்
+StockDecreaseForPointOfSaleDisabled=பாயின்ட் ஆஃப் சேல் முடக்கப்பட்டதில் இருந்து பங்கு குறைவு
+StockDecreaseForPointOfSaleDisabledbyBatch=POS இல் பங்கு குறைவு தொகுதி சீரியல்/லாட் நிர்வாகத்துடன் (தற்போது செயலில் உள்ளது) இணங்கவில்லை, எனவே பங்கு குறைப்பு முடக்கப்பட்டுள்ளது.
+CashDeskYouDidNotDisableStockDecease=பாயிண்ட் ஆஃப் சேல் மூலம் விற்பனை செய்யும் போது பங்கு குறைப்பை நீங்கள் முடக்கவில்லை. எனவே ஒரு கிடங்கு தேவை.
+CashDeskForceDecreaseStockLabel=தொகுதி தயாரிப்புகளுக்கான பங்கு குறைப்பு கட்டாயப்படுத்தப்பட்டது.
+CashDeskForceDecreaseStockDesc=பழமையான சாப்பிடும் மற்றும் விற்கும் தேதிகளால் முதலில் குறைக்கவும்.
+CashDeskReaderKeyCodeForEnter="Enter" க்கான முக்கிய குறியீடு பார்கோடு ரீடரில் வரையறுக்கப்பட்டுள்ளது (எடுத்துக்காட்டு: 13)
+##### Bookmark #####
+BookmarkSetup=புக்மார்க் தொகுதி அமைவு
+BookmarkDesc=புக்மார்க்குகளை நிர்வகிக்க இந்த தொகுதி உங்களை அனுமதிக்கிறது. உங்கள் இடது மெனுவில் உள்ள எந்த Dolibarr பக்கங்களுக்கும் அல்லது வெளிப்புற இணைய தளங்களுக்கும் குறுக்குவழிகளைச் சேர்க்கலாம்.
+NbOfBoomarkToShow=இடது மெனுவில் காட்ட வேண்டிய புக்மார்க்குகளின் அதிகபட்ச எண்ணிக்கை
+##### WebServices #####
+WebServicesSetup=Webservices தொகுதி அமைவு
+WebServicesDesc=இந்த தொகுதியை இயக்குவதன் மூலம், Dolibarr இதர இணைய சேவைகளை வழங்க இணைய சேவை சேவையகமாக மாறுகிறது.
+WSDLCanBeDownloadedHere=வழங்கப்பட்ட சேவைகளின் WSDL விளக்கக் கோப்புகளை இங்கே பதிவிறக்கம் செய்யலாம்
+EndPointIs=SOAP வாடிக்கையாளர்கள் தங்கள் கோரிக்கைகளை URL இல் உள்ள Dolibarr எண்ட்பாயிண்ட்டுக்கு அனுப்ப வேண்டும்
+##### API ####
+ApiSetup=API தொகுதி அமைவு
+ApiDesc=இந்த தொகுதியை இயக்குவதன் மூலம், Dolibarr இதர இணைய சேவைகளை வழங்க REST சேவையகமாக மாறுகிறது.
+ApiProductionMode=உற்பத்தி பயன்முறையை இயக்கு (இது சேவைகளை நிர்வகிப்பதற்கான தற்காலிக சேமிப்பைப் பயன்படுத்துவதைச் செயல்படுத்தும்)
+ApiExporerIs=நீங்கள் URL இல் APIகளை ஆராய்ந்து சோதிக்கலாம்
+OnlyActiveElementsAreExposed=இயக்கப்பட்ட தொகுதிகளின் கூறுகள் மட்டுமே வெளிப்படும்
+ApiKey=APIக்கான திறவுகோல்
+WarningAPIExplorerDisabled=API எக்ஸ்ப்ளோரர் முடக்கப்பட்டுள்ளது. API சேவைகளை வழங்க API எக்ஸ்ப்ளோரர் தேவையில்லை. டெவலப்பர் REST APIகளைக் கண்டறிய/சோதனை செய்வதற்கான ஒரு கருவியாகும். உங்களுக்கு இந்தக் கருவி தேவைப்பட்டால், அதைச் செயல்படுத்த, தொகுதி API REST அமைப்பிற்குச் செல்லவும்.
+##### Bank #####
+BankSetupModule=வங்கி தொகுதி அமைப்பு
+FreeLegalTextOnChequeReceipts=காசோலை ரசீதுகளில் இலவச உரை
+BankOrderShow="விரிவான வங்கி எண்" பயன்படுத்தும் நாடுகளுக்கான வங்கிக் கணக்குகளின் வரிசையைக் காண்பி
+BankOrderGlobal=பொது
+BankOrderGlobalDesc=பொது காட்சி வரிசை
+BankOrderES=ஸ்பானிஷ்
+BankOrderESDesc=ஸ்பானிஷ் காட்சி வரிசை
+ChequeReceiptsNumberingModule=ரசீதுகள் எண்ணும் தொகுதியைச் சரிபார்க்கவும்
+##### Multicompany #####
+MultiCompanySetup=பல நிறுவன தொகுதி அமைப்பு
+##### Suppliers #####
+SuppliersSetup=விற்பனையாளர் தொகுதி அமைப்பு
+SuppliersCommandModel=கொள்முதல் ஆர்டரின் முழுமையான டெம்ப்ளேட்
+SuppliersCommandModelMuscadet=பர்சேஸ் ஆர்டரின் முழுமையான டெம்ப்ளேட் (கார்னாஸ் டெம்ப்ளேட்டின் பழைய செயலாக்கம்)
+SuppliersInvoiceModel=விற்பனையாளர் விலைப்பட்டியலின் முழுமையான டெம்ப்ளேட்
+SuppliersInvoiceNumberingModel=விற்பனையாளர் இன்வாய்ஸ் எண் மாதிரிகள்
+IfSetToYesDontForgetPermission=பூஜ்யமற்ற மதிப்பாக அமைக்கப்பட்டால், இரண்டாவது ஒப்புதலுக்கு அனுமதிக்கப்பட்ட குழுக்கள் அல்லது பயனர்களுக்கு அனுமதிகளை வழங்க மறக்காதீர்கள்
+##### GeoIPMaxmind #####
+GeoIPMaxmindSetup=GeoIP Maxmind தொகுதி அமைப்பு
+PathToGeoIPMaxmindCountryDataFile=கோப்பிற்கான பாதை Maxmind ip to நாட்டு மொழிபெயர்ப்பு. <br> எடுத்துக்காட்டுகள்: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat a0342fccfda19bzre0342fccfda19bz0
+NoteOnPathLocation=உங்கள் IP முதல் நாடு வரையிலான தரவுக் கோப்பு உங்கள் PHP படிக்கக்கூடிய கோப்பகத்தில் இருக்க வேண்டும் என்பதை நினைவில் கொள்ளவும் (உங்கள் PHP open_basedir அமைப்பு மற்றும் கோப்பு முறைமை அனுமதிகளைச் சரிபார்க்கவும்).
+YouCanDownloadFreeDatFileTo=Maxmind GeoIP நாட்டுக் கோப்பின் <b> இலவச டெமோ பதிப்பான </b> ஐ %s இல் பதிவிறக்கம் செய்யலாம்.
+YouCanDownloadAdvancedDatFileTo=%s இல் Maxmind GeoIP நாட்டுக் கோப்பின் </b> புதுப்பிப்புகளுடன் மேலும் <b> முழுப் பதிப்பையும் பதிவிறக்கம் செய்யலாம்.
+TestGeoIPResult=மாற்று ஐபி -> நாட்டின் சோதனை
+##### Projects #####
+ProjectsNumberingModules=திட்டங்களின் எண்ணிக்கை தொகுதி
+ProjectsSetup=திட்ட தொகுதி அமைப்பு
+ProjectsModelModule=திட்ட அறிக்கை ஆவண மாதிரி
+TasksNumberingModules=பணிகளை எண்ணும் தொகுதி
+TaskModelModule=பணி அறிக்கைகள் ஆவண மாதிரி
+UseSearchToSelectProject=திட்ட சேர்க்கை பட்டியலின் உள்ளடக்கத்தை ஏற்றுவதற்கு முன் ஒரு விசையை அழுத்தும் வரை காத்திருக்கவும். <br> உங்களிடம் அதிக எண்ணிக்கையிலான திட்டங்கள் இருந்தால், இது செயல்திறனை மேம்படுத்தலாம், ஆனால் இது குறைவான வசதியாக இருக்கும்.
+##### ECM (GED) #####
+##### Fiscal Year #####
+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 ஆல் செயல்படுத்த, 2 வழிகாட்டுதல் வரிகளைச் சேர்க்க, <strong> conf/conf.php </strong> ஐ அமைக்க வேண்டும்: <br> a0e7843947cli'rto_in_barz0 $d06bz </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/custom'; </strong>
+HighlightLinesOnMouseHover=மவுஸ் நகர்த்தும்போது அட்டவணை வரிகளை முன்னிலைப்படுத்தவும்
+HighlightLinesColor=மவுஸ் கடந்து செல்லும் போது கோட்டின் நிறத்தை முன்னிலைப்படுத்தவும் (சிறப்பம்சமாக இல்லாமல் 'ffffff' ஐப் பயன்படுத்தவும்)
+HighlightLinesChecked=கோட்டின் நிறத்தை தேர்வு செய்யும்போது அதைத் தனிப்படுத்தவும் (சிறப்பம்சமாக இல்லாமல் 'ffffff' ஐப் பயன்படுத்தவும்)
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
+TextTitleColor=பக்க தலைப்பின் உரை நிறம்
+LinkColor=இணைப்புகளின் நிறம்
+PressF5AfterChangingThis=விசைப்பலகையில் CTRL+F5 ஐ அழுத்தவும் அல்லது இந்த மதிப்பை மாற்றிய பின் உங்கள் உலாவி தற்காலிக சேமிப்பை அழிக்கவும்
+NotSupportedByAllThemes=வில் முக்கிய தீம்களுடன் வேலை செய்கிறது, வெளிப்புற தீம்களால் ஆதரிக்கப்படாமல் இருக்கலாம்
+BackgroundColor=பின்னணி நிறம்
+TopMenuBackgroundColor=மேல் மெனுவிற்கான பின்னணி நிறம்
+TopMenuDisableImages=மேல் மெனுவில் படங்களை மறை
+LeftMenuBackgroundColor=இடது மெனுவிற்கான பின்னணி நிறம்
+BackgroundTableTitleColor=அட்டவணை தலைப்பு வரிக்கான பின்னணி நிறம்
+BackgroundTableTitleTextColor=அட்டவணை தலைப்பு வரிக்கான உரை வண்ணம்
+BackgroundTableTitleTextlinkColor=அட்டவணை தலைப்பு இணைப்பு வரிக்கான உரை வண்ணம்
+BackgroundTableLineOddColor=ஒற்றைப்படை அட்டவணை வரிகளுக்கான பின்னணி வண்ணம்
+BackgroundTableLineEvenColor=சமமான அட்டவணை வரிகளுக்கான பின்னணி வண்ணம்
+MinimumNoticePeriod=குறைந்தபட்ச அறிவிப்பு காலம் (உங்கள் விடுப்பு கோரிக்கை இந்த தாமதத்திற்கு முன் செய்யப்பட வேண்டும்)
+NbAddedAutomatically=ஒவ்வொரு மாதமும் பயனர்களின் கவுண்டர்களில் (தானாக) சேர்க்கப்படும் நாட்களின் எண்ணிக்கை
+EnterAnyCode=இந்த புலத்தில் கோட்டை அடையாளம் காண ஒரு குறிப்பு உள்ளது. நீங்கள் விரும்பும் எந்த மதிப்பையும் உள்ளிடவும், ஆனால் சிறப்பு எழுத்துகள் இல்லாமல்.
+Enter0or1=0 அல்லது 1 ஐ உள்ளிடவும்
+UnicodeCurrency=பிரேஸ்களுக்கு இடையில் இங்கே உள்ளிடவும், நாணயக் குறியீட்டைக் குறிக்கும் பைட் எண்ணின் பட்டியல். எடுத்துக்காட்டாக: $க்கு, [36] உள்ளிடவும் - பிரேசிலுக்கு உண்மையான R$ [82,36] - €க்கு, உள்ளிடவும் [8364]
+ColorFormat=RGB வண்ணம் HEX வடிவத்தில் உள்ளது, எ.கா: FF0000
+PictoHelp=டோலிபார் வடிவத்தில் ஐகான் பெயர் (தற்போதைய தீம் கோப்பகத்தில் இருந்தால் 'image.png', தொகுதியின் /img/ கோப்பகத்தில் இருந்தால் 'image.png@nom_du_module')
+PositionIntoComboList=சேர்க்கை பட்டியல்களில் வரியின் நிலை
+SellTaxRate=விற்பனை வரி விகிதம்
+RecuperableOnly=ஆம், பிரான்ஸில் உள்ள சில மாநிலங்களுக்காக அர்ப்பணிக்கப்பட்ட VAT "அறிந்துகொள்ளப்படவில்லை ஆனால் மீட்டெடுக்கக்கூடியது". மற்ற எல்லா நிகழ்வுகளிலும் மதிப்பை "இல்லை" ஆக வைத்திருக்கவும்.
+UrlTrackingDesc=வழங்குநர் அல்லது போக்குவரத்துச் சேவை உங்கள் ஏற்றுமதியின் நிலையைச் சரிபார்க்க ஒரு பக்கம் அல்லது இணையதளத்தை வழங்கினால், அதை நீங்கள் இங்கே உள்ளிடலாம். URL அளவுருக்களில் நீங்கள் {TRACKID} விசையைப் பயன்படுத்தலாம், எனவே ஷிப்மென்ட் கார்டில் பயனர் உள்ளிட்ட கண்காணிப்பு எண்ணுடன் கணினி அதை மாற்றும்.
+OpportunityPercent=நீங்கள் ஒரு முன்னணியை உருவாக்கும்போது, மதிப்பிடப்பட்ட திட்டம்/முன்னணியை நீங்கள் வரையறுப்பீர்கள். லீட் நிலையின்படி, உங்கள் எல்லா லீட்களும் உருவாக்கக்கூடிய மொத்தத் தொகையை மதிப்பிடுவதற்கு இந்தத் தொகையை இந்தத் தொகையால் பெருக்கலாம். மதிப்பு ஒரு சதவீதம் (0 மற்றும் 100 க்கு இடையில்).
+TemplateForElement=இந்த அஞ்சல் டெம்ப்ளேட் எந்த வகையான பொருளுடன் தொடர்புடையது? தொடர்புடைய பொருளிலிருந்து "மின்னஞ்சல் அனுப்பு" பொத்தானைப் பயன்படுத்தும் போது மட்டுமே மின்னஞ்சல் டெம்ப்ளேட் கிடைக்கும்.
+TypeOfTemplate=டெம்ப்ளேட் வகை
+TemplateIsVisibleByOwnerOnly=டெம்ப்ளேட் உரிமையாளருக்கு மட்டுமே தெரியும்
+VisibleEverywhere=எல்லா இடங்களிலும் தெரியும்
+VisibleNowhere=எங்கும் தெரியவில்லை
+FixTZ=நேர மண்டல திருத்தம்
+FillFixTZOnlyIfRequired=எடுத்துக்காட்டு: +2 (சிக்கல் ஏற்பட்டால் மட்டும் நிரப்பவும்)
+ExpectedChecksum=எதிர்பார்க்கப்படும் செக்சம்
+CurrentChecksum=தற்போதைய செக்சம்
+ExpectedSize=எதிர்பார்க்கப்படும் அளவு
+CurrentSize=தற்போதைய அளவு
+ForcedConstants=தேவையான நிலையான மதிப்புகள்
+MailToSendProposal=வாடிக்கையாளர் முன்மொழிவுகள்
+MailToSendOrder=விற்பனை ஆர்டர்கள்
+MailToSendInvoice=வாடிக்கையாளர் இன்வாய்ஸ்கள்
+MailToSendShipment=ஏற்றுமதி
+MailToSendIntervention=தலையீடுகள்
+MailToSendSupplierRequestForQuotation=மேற்கோள் கோரிக்கை
+MailToSendSupplierOrder=கொள்முதல் ஆணைகள்
+MailToSendSupplierInvoice=விற்பனையாளர் விலைப்பட்டியல்
+MailToSendContract=ஒப்பந்தங்கள்
+MailToSendReception=வரவேற்புகள்
+MailToThirdparty=மூன்றாம் தரப்பினர்
+MailToMember=உறுப்பினர்கள்
+MailToUser=பயனர்கள்
+MailToProject=திட்டங்கள்
+MailToTicket=டிக்கெட்டுகள்
+ByDefaultInList=பட்டியல் காட்சியில் இயல்பாகக் காட்டு
+YouUseLastStableVersion=நீங்கள் சமீபத்திய நிலையான பதிப்பைப் பயன்படுத்துகிறீர்கள்
+TitleExampleForMajorRelease=இந்த முக்கிய வெளியீட்டை அறிவிக்க நீங்கள் பயன்படுத்தக்கூடிய செய்தியின் எடுத்துக்காட்டு (உங்கள் வலைத்தளங்களில் இதைப் பயன்படுத்த தயங்க வேண்டாம்)
+TitleExampleForMaintenanceRelease=இந்த பராமரிப்பு வெளியீட்டை அறிவிக்க நீங்கள் பயன்படுத்தக்கூடிய செய்தியின் எடுத்துக்காட்டு (உங்கள் வலைத்தளங்களில் இதைப் பயன்படுத்த தயங்க வேண்டாம்)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s கிடைக்கிறது. பதிப்பு %s என்பது பயனர்களுக்கும் டெவலப்பர்களுக்கும் நிறைய புதிய அம்சங்களைக் கொண்ட ஒரு பெரிய வெளியீடாகும். https://www.dolibarr.org போர்ட்டலின் (துணை அடைவு நிலையான பதிப்புகள்) பதிவிறக்கப் பகுதியிலிருந்து இதைப் பதிவிறக்கலாம். மாற்றங்களின் முழுமையான பட்டியலுக்கு <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> ஐப் படிக்கலாம்.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s கிடைக்கிறது. பதிப்பு %s ஒரு பராமரிப்பு பதிப்பு, எனவே பிழை திருத்தங்கள் மட்டுமே உள்ளன. இந்த பதிப்பிற்கு மேம்படுத்த அனைத்து பயனர்களையும் பரிந்துரைக்கிறோம். பராமரிப்பு வெளியீடு புதிய அம்சங்களையோ தரவுத்தளத்தில் மாற்றங்களையோ அறிமுகப்படுத்தாது. https://www.dolibarr.org போர்ட்டலின் (துணை அடைவு நிலையான பதிப்புகள்) பதிவிறக்கப் பகுதியிலிருந்து நீங்கள் அதைப் பதிவிறக்கலாம். மாற்றங்களின் முழுமையான பட்டியலுக்கு <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> ஐப் படிக்கலாம்.
+MultiPriceRuleDesc="ஒரு தயாரிப்பு/சேவைக்கான விலைகளின் பல நிலைகள்" என்ற விருப்பம் இயக்கப்பட்டால், ஒவ்வொரு தயாரிப்புக்கும் வெவ்வேறு விலைகளை (விலை நிலைக்கு ஒன்று) வரையறுக்கலாம். உங்கள் நேரத்தைச் சேமிக்க, முதல் நிலையின் விலையின் அடிப்படையில் ஒவ்வொரு நிலைக்கும் தானாகக் கணக்கிடுவதற்கான விதியை இங்கே உள்ளிடலாம், எனவே ஒவ்வொரு தயாரிப்புக்கும் முதல் நிலைக்கான விலையை மட்டுமே உள்ளிட வேண்டும். இந்தப் பக்கம் உங்கள் நேரத்தைச் சேமிக்க வடிவமைக்கப்பட்டுள்ளது, ஆனால் ஒவ்வொரு நிலைக்கும் உங்கள் விலைகள் முதல் நிலையுடன் தொடர்புடையதாக இருந்தால் மட்டுமே பயனுள்ளதாக இருக்கும். பெரும்பாலான சந்தர்ப்பங்களில் இந்தப் பக்கத்தை நீங்கள் புறக்கணிக்கலாம்.
+ModelModulesProduct=தயாரிப்பு ஆவணங்களுக்கான வார்ப்புருக்கள்
+WarehouseModelModules=கிடங்குகளின் ஆவணங்களுக்கான வார்ப்புருக்கள்
+ToGenerateCodeDefineAutomaticRuleFirst=தானாக குறியீடுகளை உருவாக்க, முதலில் பார்கோடு எண்ணைத் தானாக வரையறுக்க மேலாளரை வரையறுக்க வேண்டும்.
+SeeSubstitutionVars=சாத்தியமான மாற்று மாறிகளின் பட்டியலுக்கு * குறிப்பைப் பார்க்கவும்
+SeeChangeLog=சேஞ்ச்லாக் கோப்பைப் பார்க்கவும் (ஆங்கிலம் மட்டும்)
+AllPublishers=அனைத்து வெளியீட்டாளர்கள்
+UnknownPublishers=அறியப்படாத வெளியீட்டாளர்கள்
+AddRemoveTabs=தாவல்களைச் சேர்க்கவும் அல்லது அகற்றவும்
+AddDataTables=பொருள் அட்டவணைகளைச் சேர்க்கவும்
+AddDictionaries=அகராதி அட்டவணைகளைச் சேர்க்கவும்
+AddData=பொருள்கள் அல்லது அகராதிகள் தரவைச் சேர்க்கவும்
+AddBoxes=விட்ஜெட்களைச் சேர்க்கவும்
+AddSheduledJobs=திட்டமிடப்பட்ட வேலைகளைச் சேர்க்கவும்
+AddHooks=கொக்கிகளைச் சேர்க்கவும்
+AddTriggers=தூண்டுதல்களைச் சேர்க்கவும்
+AddMenus=மெனுக்களை சேர்க்கவும்
+AddPermissions=அனுமதிகளைச் சேர்க்கவும்
+AddExportProfiles=ஏற்றுமதி சுயவிவரங்களைச் சேர்க்கவும்
+AddImportProfiles=இறக்குமதி சுயவிவரங்களைச் சேர்க்கவும்
+AddOtherPagesOrServices=பிற பக்கங்கள் அல்லது சேவைகளைச் சேர்க்கவும்
+AddModels=ஆவணம் அல்லது எண்ணிடும் டெம்ப்ளேட்களைச் சேர்க்கவும்
+AddSubstitutions=விசை மாற்றுகளைச் சேர்க்கவும்
+DetectionNotPossible=கண்டறிதல் சாத்தியமில்லை
+UrlToGetKeyToUseAPIs=API ஐப் பயன்படுத்த டோக்கனைப் பெறுவதற்கான Url (டோக்கன் கிடைத்ததும் அது தரவுத்தள பயனர் அட்டவணையில் சேமிக்கப்படும் மற்றும் ஒவ்வொரு API அழைப்பிலும் வழங்கப்பட வேண்டும்)
+ListOfAvailableAPIs=கிடைக்கக்கூடிய APIகளின் பட்டியல்
+activateModuleDependNotSatisfied=தொகுதி "%s" தொகுதி "%s" ஐப் பொறுத்தது, அது விடுபட்டுள்ளது, எனவே "%1$s" தொகுதி சரியாக வேலை செய்யாமல் போகலாம். "%2$s" தொகுதியை நிறுவவும் அல்லது "%1$s" தொகுதியை முடக்கவும், நீங்கள் எந்த ஆச்சரியத்திலிருந்தும் பாதுகாப்பாக இருக்க விரும்பினால்
+CommandIsNotInsideAllowedCommands=நீங்கள் இயக்க முயற்சிக்கும் கட்டளை, <strong> $dolibarr_main_restrict_os_commands <strong> conf.phdp a016506507af65d071f6fc9z0 என்ற அளவுருவில் வரையறுக்கப்பட்ட அனுமதிக்கப்பட்ட கட்டளைகளின் பட்டியலில் இல்லை.
+LandingPage=இறங்கும் பக்கம்
+SamePriceAlsoForSharedCompanies=நீங்கள் "ஒற்றை விலை" என்ற தேர்வுடன் மல்டிகம்பெனி மாட்யூலைப் பயன்படுத்தினால், சூழல்களுக்கு இடையே தயாரிப்புகள் பகிரப்பட்டால், எல்லா நிறுவனங்களுக்கும் ஒரே விலை இருக்கும்.
+ModuleEnabledAdminMustCheckRights=தொகுதி செயல்படுத்தப்பட்டது. செயல்படுத்தப்பட்ட தொகுதி(களுக்கு) அனுமதிகள் நிர்வாகி பயனர்களுக்கு மட்டுமே வழங்கப்பட்டது. தேவைப்பட்டால், நீங்கள் பிற பயனர்கள் அல்லது குழுக்களுக்கு கைமுறையாக அனுமதிகளை வழங்க வேண்டியிருக்கும்.
+UserHasNoPermissions=இந்தப் பயனருக்கு எந்த அனுமதியும் இல்லை
+TypeCdr=கட்டணம் செலுத்தும் தேதி விலைப்பட்டியல் தேதி மற்றும் டெல்டா நாட்களில் இருந்தால் "இல்லை" என்பதைப் பயன்படுத்தவும் (டெல்டா என்பது புலம் "%s") <br> "மாத இறுதியில்" என்பதைப் பயன்படுத்தவும், டெல்டாவிற்குப் பிறகு, முடிவை அடைய தேதியை அதிகரிக்க வேண்டும். மாதத்தின் (+ ஒரு விருப்பமான "%s" நாட்களில்) <br> டெல்டாவிற்குப் பிறகு மாதத்தின் முதல் Nவது பணம் செலுத்தும் காலத் தேதியைப் பெற "நடப்பு/அடுத்து" என்பதைப் பயன்படுத்தவும் (டெல்டா என்பது புலம் "%s", N ஆனது "%s", N ஆனது 2ecz4 ecb22ecz4
+BaseCurrency=நிறுவனத்தின் குறிப்பு நாணயம் (இதை மாற்ற நிறுவனத்தின் அமைப்பிற்குச் செல்லவும்)
+WarningNoteModuleInvoiceForFrenchLaw=இந்த தொகுதி %s பிரெஞ்சு சட்டங்களுக்கு இணங்குகிறது (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=இந்த தொகுதி %s பிரெஞ்சு சட்டங்களுடன் (Loi Finance 2016) இணங்குகிறது, ஏனெனில் மாட்யூல் மீளமுடியாத பதிவுகள் தானாகவே செயல்படுத்தப்படும்.
+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=ஐரோப்பிய நிறுவனங்கள்/குடிமக்கள் பற்றிய தரவை நீங்கள் சேமித்தால், பொது தரவு பாதுகாப்பு ஒழுங்குமுறைக்கு பொறுப்பான தொடர்பை நீங்கள் இங்கு குறிப்பிடலாம்
+HelpOnTooltip=உதவிக்குறிப்பில் உரையைக் காட்ட உதவும்
+HelpOnTooltipDesc=இந்தப் புலம் படிவத்தில் தோன்றும் போது, டூல்டிப்பில் உரையைக் காட்ட, உரை அல்லது மொழிபெயர்ப்பு விசையை இங்கே வைக்கவும்
+YouCanDeleteFileOnServerWith=கட்டளை வரி மூலம் இந்த கோப்பை சர்வரில் நீக்கலாம்: <br> %s
+ChartLoaded=கணக்கின் விளக்கப்படம் ஏற்றப்பட்டது
+SocialNetworkSetup=தொகுதி சமூக வலைப்பின்னல்களை அமைத்தல்
+EnableFeatureFor=<strong> %s </strong>க்கான அம்சங்களை இயக்கு
+VATIsUsedIsOff=குறிப்பு: %s - %s என்ற மெனுவில் விற்பனை வரி அல்லது VAT ஐப் பயன்படுத்துவதற்கான விருப்பம் <strong> ஆஃப் </strong> என அமைக்கப்பட்டுள்ளது, எனவே விற்பனை வரி அல்லது VAT எப்போதும் பயன்படுத்தப்படும்.
+SwapSenderAndRecipientOnPDF=PDF ஆவணங்களில் அனுப்புநர் மற்றும் பெறுநரின் முகவரி நிலையை மாற்றவும்
+FeatureSupportedOnTextFieldsOnly=எச்சரிக்கை, அம்சம் உரை புலங்கள் மற்றும் சேர்க்கை பட்டியல்களில் மட்டுமே ஆதரிக்கப்படுகிறது. மேலும் ஒரு URL அளவுரு செயல்=உருவாக்கு அல்லது செயல்=திருத்தம் அமைக்கப்பட வேண்டும் அல்லது இந்த அம்சத்தைத் தூண்டுவதற்கு பக்கத்தின் பெயர் 'new.php' உடன் முடிவடைய வேண்டும்.
+EmailCollector=மின்னஞ்சல் சேகரிப்பான்
+EmailCollectorDescription=வழக்கமான மின்னஞ்சல் பெட்டிகளை (IMAP நெறிமுறையைப் பயன்படுத்தி) ஸ்கேன் செய்ய திட்டமிடப்பட்ட வேலை மற்றும் அமைவுப் பக்கத்தைச் சேர்க்கவும் மற்றும் உங்கள் விண்ணப்பத்தில் பெறப்பட்ட மின்னஞ்சல்களை சரியான இடத்தில் பதிவு செய்யவும் மற்றும்/அல்லது சில பதிவுகளை தானாக உருவாக்கவும் (லீட்கள் போன்றவை).
+NewEmailCollector=புதிய மின்னஞ்சல் கலெக்டர்
+EMailHost=மின்னஞ்சல் IMAP சேவையகத்தின் ஹோஸ்ட்
+MailboxSourceDirectory=அஞ்சல் பெட்டி மூல அடைவு
+MailboxTargetDirectory=அஞ்சல் பெட்டி இலக்கு அடைவு
+EmailcollectorOperations=கலெக்டர் மூலம் செய்ய வேண்டிய செயல்பாடுகள்
+EmailcollectorOperationsDesc=செயல்பாடுகள் மேலிருந்து கீழ் வரிசையில் செயல்படுத்தப்படுகின்றன
+MaxEmailCollectPerCollect=ஒரு சேகரிப்புக்கு அதிகபட்ச மின்னஞ்சல்கள் சேகரிக்கப்படுகின்றன
+CollectNow=இப்போது சேகரிக்கவும்
+ConfirmCloneEmailCollector=மின்னஞ்சல் சேகரிப்பான் %s ஐ நிச்சயமாக குளோன் செய்ய விரும்புகிறீர்களா?
+DateLastCollectResult=சமீபத்திய சேகரிப்பு முயற்சியின் தேதி
+DateLastcollectResultOk=சமீபத்திய சேகரிப்பு வெற்றியின் தேதி
+LastResult=சமீபத்திய முடிவு
+EmailCollectorConfirmCollectTitle=மின்னஞ்சல் சேகரிப்பு உறுதிப்படுத்தல்
+EmailCollectorConfirmCollect=இந்த சேகரிப்பாளருக்கான சேகரிப்பை இப்போது இயக்க விரும்புகிறீர்களா?
+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)
+CodeLastResult=சமீபத்திய முடிவு குறியீடு
+NbOfEmailsInInbox=மூல கோப்பகத்தில் உள்ள மின்னஞ்சல்களின் எண்ணிக்கை
+LoadThirdPartyFromName=%s இல் மூன்றாம் தரப்பு தேடலை ஏற்றவும் (ஏற்றம் மட்டும்)
+LoadThirdPartyFromNameOrCreate=%s இல் மூன்றாம் தரப்பு தேடலை ஏற்றவும் (கண்டுபிடிக்கவில்லை என்றால் உருவாக்கவும்)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
+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=தொடக்க நேரம்
+OpeningHoursDesc=உங்கள் நிறுவனத்தின் வழக்கமான திறந்திருக்கும் நேரத்தை இங்கே உள்ளிடவும்.
+ResourceSetup=வள தொகுதியின் கட்டமைப்பு
+UseSearchToSelectResource=ஆதாரத்தைத் தேர்ந்தெடுக்க தேடல் படிவத்தைப் பயன்படுத்தவும் (கீழ்தோன்றும் பட்டியலுக்குப் பதிலாக).
+DisabledResourceLinkUser=ஒரு ஆதாரத்தை பயனர்களுடன் இணைக்க அம்சத்தை முடக்கவும்
+DisabledResourceLinkContact=ஒரு ஆதாரத்தை தொடர்புகளுடன் இணைக்க அம்சத்தை முடக்கவும்
+EnableResourceUsedInEventCheck=ஒரு நிகழ்வில் ஆதாரம் பயன்பாட்டில் உள்ளதா என்பதைச் சரிபார்க்க அம்சத்தை இயக்கவும்
+ConfirmUnactivation=தொகுதி மீட்டமைப்பை உறுதிப்படுத்தவும்
+OnMobileOnly=சிறிய திரையில் (ஸ்மார்ட்போன்) மட்டும்
+DisableProspectCustomerType="Prospect + Customer" மூன்றாம் தரப்பு வகையை முடக்கவும் (எனவே மூன்றாம் தரப்பு "Prospect" அல்லது "Customer" ஆக இருக்க வேண்டும், ஆனால் இரண்டும் இருக்க முடியாது)
+MAIN_OPTIMIZEFORTEXTBROWSER=பார்வையற்றவர்களுக்கான இடைமுகத்தை எளிதாக்குங்கள்
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=நீங்கள் பார்வையற்றவராக இருந்தால் அல்லது Lynx அல்லது Links போன்ற உரை உலாவியில் இருந்து பயன்பாட்டைப் பயன்படுத்தினால் இந்த விருப்பத்தை இயக்கவும்.
+MAIN_OPTIMIZEFORCOLORBLIND=நிற குருடர்களுக்கான இடைமுகத்தின் நிறத்தை மாற்றவும்
+MAIN_OPTIMIZEFORCOLORBLINDDesc=நீங்கள் நிறக்குருடராக இருந்தால் இந்த விருப்பத்தை இயக்கவும், சில சமயங்களில் மாறுபாட்டை அதிகரிக்க இடைமுகம் வண்ண அமைப்பை மாற்றும்.
+Protanopia=புரோட்டானோபியா
+Deuteranopes=டியூட்டரனோப்ஸ்
+Tritanopes=டிரைடானோப்ஸ்
+ThisValueCanOverwrittenOnUserLevel=இந்த மதிப்பை ஒவ்வொரு பயனரும் அதன் பயனர் பக்கத்திலிருந்து மேலெழுதலாம் - '%s'
+DefaultCustomerType="புதிய வாடிக்கையாளர்" உருவாக்கும் படிவத்திற்கான இயல்புநிலை மூன்றாம் தரப்பு வகை
+ABankAccountMustBeDefinedOnPaymentModeSetup=குறிப்பு: இந்த அம்சம் செயல்பட, ஒவ்வொரு கட்டண முறையின் தொகுதியிலும் (பேபால், ஸ்ட்ரைப், ...) வங்கிக் கணக்கு வரையறுக்கப்பட வேண்டும்.
+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=ஜிமெயில் கணக்கின் மூலம், 2 படிநிலை சரிபார்ப்பை நீங்கள் இயக்கியிருந்தால், 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>
+EndPointFor=%s க்கான முடிவுப் புள்ளி : %s
+DeleteEmailCollector=மின்னஞ்சல் சேகரிப்பாளரை நீக்கு
+ConfirmDeleteEmailCollector=இந்த மின்னஞ்சல் சேகரிப்பாளரை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+RecipientEmailsWillBeReplacedWithThisValue=பெறுநரின் மின்னஞ்சல்கள் எப்போதும் இந்த மதிப்புடன் மாற்றப்படும்
+AtLeastOneDefaultBankAccountMandatory=குறைந்தது 1 இயல்புநிலை வங்கிக் கணக்கையாவது வரையறுக்க வேண்டும்
+RESTRICT_ON_IP=சில ஹோஸ்ட் ஐபிக்கு மட்டும் அணுகலை அனுமதிக்கவும் (வைல்டு கார்டு அனுமதிக்கப்படவில்லை, மதிப்புகளுக்கு இடையில் இடைவெளியைப் பயன்படுத்தவும்). காலி என்றால் ஒவ்வொரு ஹோஸ்ட்களும் அணுக முடியும்.
+IPListExample=127.0.0.1 192.168.0.2 [::1]
+BaseOnSabeDavVersion=நூலகத்தின் SabreDAV பதிப்பின் அடிப்படையில்
+NotAPublicIp=பொது ஐபி அல்ல
+MakeAnonymousPing=டோலிபார் நிறுவலின் எண்ணிக்கையைக் கணக்கிட அடித்தளத்தை அனுமதிக்க, டோலிபார் அடித்தள சேவையகத்தில் அநாமதேய பிங் '+1' ஐ உருவாக்கவும் (நிறுவலுக்குப் பிறகு 1 முறை மட்டுமே செய்யப்படுகிறது).
+FeatureNotAvailableWithReceptionModule=தொகுதி வரவேற்பு இயக்கப்பட்டிருக்கும் போது அம்சம் கிடைக்காது
+EmailTemplate=மின்னஞ்சலுக்கான டெம்ப்ளேட்
+EMailsWillHaveMessageID=மின்னஞ்சல்களில் இந்த தொடரியல் பொருந்தும் 'குறிப்புகள்' குறிச்சொல் இருக்கும்
+PDF_SHOW_PROJECT=ஆவணத்தில் திட்டத்தைக் காட்டு
+ShowProjectLabel=திட்ட லேபிள்
+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 என்ற பொதுவான மதிப்பைப் பயன்படுத்தலாம்.
+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=தொகுதி <b> %s </b> இன் "%s" அம்சம் பயன்படுத்தப்பட்டால், ஒரு கிட்டின் துணை தயாரிப்புகளின் விவரங்களை PDF இல் காட்டவும்.
+AskThisIDToYourBank=இந்த ஐடியைப் பெற உங்கள் வங்கியைத் தொடர்புகொள்ளவும்
+AdvancedModeOnly=மேம்பட்ட அனுமதி பயன்முறையில் மட்டுமே அனுமதி கிடைக்கும்
+ConfFileIsReadableOrWritableByAnyUsers=conf கோப்பு எந்த பயனர்களாலும் படிக்கக்கூடியது அல்லது எழுதக்கூடியது. இணைய சேவையக பயனர் மற்றும் குழுவிற்கு மட்டும் அனுமதி வழங்கவும்.
+MailToSendEventOrganization=நிகழ்வு அமைப்பு
+MailToPartnership=கூட்டு
+AGENDA_EVENT_DEFAULT_STATUS=படிவத்திலிருந்து நிகழ்வை உருவாக்கும் போது இயல்புநிலை நிகழ்வு நிலை
+YouShouldDisablePHPFunctions=நீங்கள் PHP செயல்பாடுகளை முடக்க வேண்டும்
+IfCLINotRequiredYouShouldDisablePHPFunctions=தனிப்பயன் குறியீட்டில் கணினி கட்டளைகளை இயக்க வேண்டும் என்றால் தவிர, நீங்கள் PHP செயல்பாடுகளை முடக்க வேண்டும்
+PHPFunctionsRequiredForCLI=ஷெல் நோக்கத்திற்காக (திட்டமிடப்பட்ட வேலை காப்புப்பிரதி அல்லது anitivurs நிரலை இயக்குவது போன்றவை), நீங்கள் PHP செயல்பாடுகளை வைத்திருக்க வேண்டும்
+NoWritableFilesFoundIntoRootDir=உங்கள் ரூட் கோப்பகத்தில் எழுதக்கூடிய கோப்புகள் அல்லது பொதுவான நிரல்களின் கோப்பகங்கள் எதுவும் காணப்படவில்லை (நல்லது)
+RecommendedValueIs=பரிந்துரைக்கப்படுகிறது: %s
+Recommended=பரிந்துரைக்கப்படுகிறது
+NotRecommended=பரிந்துரைக்கப்படவில்லை
+ARestrictedPath=சில தடைசெய்யப்பட்ட பாதை
+CheckForModuleUpdate=வெளிப்புற தொகுதிகள் புதுப்பிப்புகளைச் சரிபார்க்கவும்
+CheckForModuleUpdateHelp=புதிய பதிப்பு உள்ளதா என்பதைச் சரிபார்க்க, இந்தச் செயல் வெளிப்புற தொகுதிகளின் எடிட்டர்களுடன் இணைக்கப்படும்.
+ModuleUpdateAvailable=ஒரு புதுப்பிப்பு கிடைக்கிறது
+NoExternalModuleWithUpdate=வெளிப்புற தொகுதிகளுக்கான புதுப்பிப்புகள் எதுவும் இல்லை
+SwaggerDescriptionFile=Swagger API விளக்கக் கோப்பு (உதாரணமாக 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/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
diff --git a/htdocs/langs/ta_IN/agenda.lang b/htdocs/langs/ta_IN/agenda.lang
new file mode 100644
index 00000000000..68475c5f142
--- /dev/null
+++ b/htdocs/langs/ta_IN/agenda.lang
@@ -0,0 +1,174 @@
+# Dolibarr language file - Source file is en_US - agenda
+IdAgenda=அடையாள நிகழ்வு
+Actions=நிகழ்வுகள்
+Agenda=நிகழ்ச்சி நிரல்
+TMenuAgenda=நிகழ்ச்சி நிரல்
+Agendas=நிகழ்ச்சி நிரல்
+LocalAgenda=இயல்பு காலண்டர்
+ActionsOwnedBy=நிகழ்வுக்கு சொந்தமானது
+ActionsOwnedByShort=உரிமையாளர்
+AffectedTo=ஒதுக்கப்படும்
+Event=நிகழ்வு
+Events=நிகழ்வுகள்
+EventsNb=நிகழ்வுகளின் எண்ணிக்கை
+ListOfActions=நிகழ்வுகளின் பட்டியல்
+EventReports=நிகழ்வு அறிக்கைகள்
+Location=இடம்
+ToUserOfGroup=குழுவில் உள்ள எந்தவொரு பயனருக்கும் ஒதுக்கப்பட்ட நிகழ்வு
+EventOnFullDay=நாள் முழுவதும் நிகழ்வு(கள்)
+MenuToDoActions=அனைத்து முழுமையற்ற நிகழ்வுகள்
+MenuDoneActions=அனைத்து நிறுத்தப்பட்ட நிகழ்வுகள்
+MenuToDoMyActions=எனது முழுமையற்ற நிகழ்வுகள்
+MenuDoneMyActions=எனது நிறுத்தப்பட்ட நிகழ்வுகள்
+ListOfEvents=நிகழ்வுகளின் பட்டியல் (இயல்பு காலண்டர்)
+ActionsAskedBy=நிகழ்வுகள் மூலம் தெரிவிக்கப்பட்டது
+ActionsToDoBy=நிகழ்வுகள் ஒதுக்கப்பட்டுள்ளன
+ActionsDoneBy=செய்த நிகழ்வுகள்
+ActionAssignedTo=நிகழ்வு ஒதுக்கப்பட்டது
+ViewCal=மாத பார்வை
+ViewDay=பகல் காட்சி
+ViewWeek=வாரப் பார்வை
+ViewPerUser=ஒரு பயனர் பார்வைக்கு
+ViewPerType=வகை பார்வைக்கு
+AutoActions= தானியங்கி நிரப்புதல்
+AgendaAutoActionDesc= நிகழ்ச்சி நிரலில் Dolibarr தானாக உருவாக்க விரும்பும் நிகழ்வுகளை இங்கே நீங்கள் வரையறுக்கலாம். எதுவும் சரிபார்க்கப்படவில்லை என்றால், கைமுறை செயல்கள் மட்டுமே பதிவுகளில் சேர்க்கப்படும் மற்றும் நிகழ்ச்சி நிரலில் காட்டப்படும். பொருள்களில் செய்யப்படும் வணிகச் செயல்களின் தானியங்கு கண்காணிப்பு (சரிபார்ப்பு, நிலை மாற்றம்) சேமிக்கப்படாது.
+AgendaSetupOtherDesc= இந்தப் பக்கம் உங்கள் Dolibarr நிகழ்வுகளை வெளிப்புற காலெண்டருக்கு ஏற்றுமதி செய்வதற்கான விருப்பங்களை வழங்குகிறது (Thunderbird, Google Calendar போன்றவை...)
+AgendaExtSitesDesc=இந்தப் பக்கம் காலெண்டர்களின் வெளிப்புற ஆதாரங்களை அவற்றின் நிகழ்வுகளை டோலிபார் நிகழ்ச்சி நிரலில் பார்க்க அனுமதிக்கிறது.
+ActionsEvents=நிகழ்ச்சி நிரலில் டோலிபார் தானாகவே ஒரு செயலை உருவாக்கும் நிகழ்வுகள்
+EventRemindersByEmailNotEnabled=மின்னஞ்சல் மூலம் நிகழ்வு நினைவூட்டல்கள் %s தொகுதி அமைப்பில் இயக்கப்படவில்லை.
+##### Agenda event labels #####
+NewCompanyToDolibarr=மூன்றாம் தரப்பு %s உருவாக்கப்பட்டது
+COMPANY_MODIFYInDolibarr=மூன்றாம் தரப்பு %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 நீக்கப்பட்டது
+ShipmentValidatedInDolibarr=ஏற்றுமதி %s சரிபார்க்கப்பட்டது
+ShipmentClassifyClosedInDolibarr=ஷிப்மென்ட் %s வகைப்படுத்தப்பட்டது
+ShipmentUnClassifyCloseddInDolibarr=ஏற்றுமதி %s வகைப்படுத்தப்பட்டது மீண்டும் திறக்கப்பட்டது
+ShipmentBackToDraftInDolibarr=ஏற்றுமதி %s வரைவு நிலைக்குத் திரும்புக
+ShipmentDeletedInDolibarr=ஏற்றுமதி %s நீக்கப்பட்டது
+ShipmentCanceledInDolibarr=ஏற்றுமதி %s ரத்துசெய்யப்பட்டது
+ReceptionValidatedInDolibarr=வரவேற்பு %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 சரிபார்க்கப்பட்டது
+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=தொடக்க தேதி
+DateActionEnd=கடைசி தேதி
+AgendaUrlOptions1=வெளியீட்டை வடிகட்ட பின்வரும் அளவுருக்களையும் நீங்கள் சேர்க்கலாம்:
+AgendaUrlOptions3= <b> logina=%s </b> ஒரு பயனருக்குச் சொந்தமான செயல்களுக்கு வெளியீட்டைக் கட்டுப்படுத்துகிறது <b> %s a0901b7.
+AgendaUrlOptionsNotAdmin= <b> logina=!%s </b> பயனருக்குச் சொந்தமில்லாத செயல்களுக்கு வெளியீட்டைக் கட்டுப்படுத்தும்.
+AgendaUrlOptions4= <b> logint=%s </b> பயனருக்கு ஒதுக்கப்பட்ட செயல்களுக்கு வெளியீட்டைக் கட்டுப்படுத்த <b> %s %s a09fowner (மற்றும் பிற)
+AgendaUrlOptionsProject= <b> project=__PROJECT_ID__ </b> திட்டத்துடன் இணைக்கப்பட்ட செயல்களுக்கு வெளியீட்டைக் கட்டுப்படுத்த, <b> __PROJECT_ID__ </b>.
+AgendaUrlOptionsNotAutoEvent= <b> notactiontype=systemauto </b> தானியங்கி நிகழ்வுகளை விலக்க.
+AgendaUrlOptionsIncludeHolidays= <b> விடுமுறை நாட்கள்=1 </b> விடுமுறை நிகழ்வுகளைச் சேர்க்க.
+AgendaShowBirthdayEvents=தொடர்புகளின் பிறந்தநாள்
+AgendaHideBirthdayEvents=தொடர்புகளின் பிறந்தநாளை மறை
+Busy=பரபரப்பு
+ExportDataset_event1=நிகழ்ச்சி நிரல் நிகழ்வுகளின் பட்டியல்
+DefaultWorkingDays=வாரத்தில் இயல்புநிலை வேலை நாட்கள் வரம்பு (எடுத்துக்காட்டு: 1-5, 1-6)
+DefaultWorkingHours=பகலில் இயல்புநிலை வேலை நேரம் (எடுத்துக்காட்டு: 9-18)
+# External Sites ical
+ExportCal=ஏற்றுமதி காலெண்டர்
+ExtSites=வெளிப்புற காலெண்டர்களை இறக்குமதி செய்யவும்
+ExtSitesEnableThisTool=நிகழ்ச்சி நிரலில் வெளிப்புற காலெண்டர்களைக் காட்டு (உலகளாவிய அமைப்பில் வரையறுக்கப்பட்டுள்ளது). பயனர்களால் வரையறுக்கப்பட்ட வெளிப்புற காலெண்டர்களைப் பாதிக்காது.
+ExtSitesNbOfAgenda=காலெண்டர்களின் எண்ணிக்கை
+AgendaExtNb=நாட்காட்டி எண். %s
+ExtSiteUrlAgenda=.ical கோப்பை அணுகுவதற்கான URL
+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/ta_IN/assets.lang b/htdocs/langs/ta_IN/assets.lang
new file mode 100644
index 00000000000..a54fa2febb5
--- /dev/null
+++ b/htdocs/langs/ta_IN/assets.lang
@@ -0,0 +1,67 @@
+# 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/>.
+
+#
+# Generic
+#
+Assets = சொத்துக்கள்
+NewAsset = புதிய சொத்து
+AccountancyCodeAsset = கணக்கியல் குறியீடு (சொத்து)
+AccountancyCodeDepreciationAsset = கணக்கியல் குறியீடு (தேய்மானச் சொத்துக் கணக்கு)
+AccountancyCodeDepreciationExpense = கணக்கியல் குறியீடு (தேய்மான செலவு கணக்கு)
+NewAssetType=புதிய சொத்து வகை
+AssetsTypeSetup=சொத்து வகை அமைப்பு
+AssetTypeModified=சொத்து வகை மாற்றப்பட்டது
+AssetType=சொத்து வகை
+AssetsLines=சொத்துக்கள்
+DeleteType=அழி
+DeleteAnAssetType=சொத்து வகையை நீக்கவும்
+ConfirmDeleteAssetType=இந்தச் சொத்து வகையை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+ShowTypeCard='%s' வகையைக் காட்டு
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName = சொத்துக்கள்
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc = சொத்து விளக்கம்
+
+#
+# Admin page
+#
+AssetsSetup = சொத்து அமைப்பு
+Settings = அமைப்புகள்
+AssetsSetupPage = சொத்துகள் அமைவு பக்கம்
+ExtraFieldsAssetsType = நிரப்பு பண்புக்கூறுகள் (சொத்து வகை)
+AssetsType=சொத்து வகை
+AssetsTypeId=சொத்து வகை ஐடி
+AssetsTypeLabel=சொத்து வகை லேபிள்
+AssetsTypes=சொத்து வகைகள்
+
+#
+# Menu
+#
+MenuAssets = சொத்துக்கள்
+MenuNewAsset = புதிய சொத்து
+MenuTypeAssets = சொத்து வகை
+MenuListAssets = பட்டியல்
+MenuNewTypeAssets = புதியது
+MenuListTypeAssets = பட்டியல்
+
+#
+# Module
+#
+Asset=சொத்து
+NewAssetType=புதிய சொத்து வகை
+NewAsset=புதிய சொத்து
+ConfirmDeleteAsset=இந்தச் சொத்தை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
diff --git a/htdocs/langs/ta_IN/banks.lang b/htdocs/langs/ta_IN/banks.lang
new file mode 100644
index 00000000000..63dd00eef35
--- /dev/null
+++ b/htdocs/langs/ta_IN/banks.lang
@@ -0,0 +1,184 @@
+# Dolibarr language file - Source file is en_US - banks
+Bank=வங்கி
+MenuBankCash=வங்கிகள் | பணம்
+MenuVariousPayment=இதர கொடுப்பனவுகள்
+MenuNewVariousPayment=புதிய இதர கட்டணம்
+BankName=வங்கி பெயர்
+FinancialAccount=கணக்கு
+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 குறியீடு
+SwiftValid=BIC/SWIFT செல்லுபடியாகும்
+SwiftNotValid=BIC/SWIFT செல்லாது
+IbanValid=தடை செல்லுபடியாகும்
+IbanNotValid=தடை செல்லாது
+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=கணக்கு
+BankTransactionByCategories=வகைகளின் அடிப்படையில் வங்கி உள்ளீடுகள்
+BankTransactionForCategory=<b> %s </b> வகைக்கான வங்கி உள்ளீடுகள்
+RemoveFromRubrique=வகையுடன் இணைப்பை அகற்று
+RemoveFromRubriqueConfirm=உள்ளீட்டிற்கும் வகைக்கும் இடையே உள்ள இணைப்பை நிச்சயமாக அகற்ற விரும்புகிறீர்களா?
+ListBankTransactions=வங்கி உள்ளீடுகளின் பட்டியல்
+IdTransaction=பரிவர்த்தனை ஐடி
+BankTransactions=வங்கி உள்ளீடுகள்
+BankTransaction=வங்கி நுழைவு
+ListTransactions=பட்டியல் உள்ளீடுகள்
+ListTransactionsByCategory=பட்டியல் உள்ளீடுகள்/வகை
+TransactionsToConciliate=சமரசம் செய்வதற்கான உள்ளீடுகள்
+TransactionsToConciliateShort=சமரசம் செய்ய
+Conciliable=சமரசம் செய்து கொள்ளலாம்
+Conciliate=சமரசம் செய்
+Conciliation=நல்லிணக்கம்
+SaveStatementOnly=அறிக்கையை மட்டும் சேமிக்கவும்
+ReconciliationLate=சமரசம் தாமதமானது
+IncludeClosedAccount=மூடப்பட்ட கணக்குகளைச் சேர்க்கவும்
+OnlyOpenedAccount=கணக்குகளை மட்டும் திறக்கவும்
+AccountToCredit=வரவு கணக்கு
+AccountToDebit=டெபிட் செய்ய கணக்கு
+DisableConciliation=இந்தக் கணக்கிற்கான சமரச அம்சத்தை முடக்கவும்
+ConciliationDisabled=நல்லிணக்க அம்சம் முடக்கப்பட்டுள்ளது
+LinkedToAConciliatedTransaction=சமரசமான நுழைவுடன் இணைக்கப்பட்டுள்ளது
+StatusAccountOpened=திற
+StatusAccountClosed=மூடப்பட்டது
+AccountIdShort=எண்
+LineRecord=பரிவர்த்தனை
+AddBankRecord=உள்ளீட்டைச் சேர்க்கவும்
+AddBankRecordLong=உள்ளீட்டை கைமுறையாகச் சேர்க்கவும்
+Conciliated=சமரசம் செய்தார்
+ConciliatedBy=மூலம் சமரசம் செய்தார்
+DateConciliating=தேதியை சரிசெய்யவும்
+BankLineConciliated=நுழைவு வங்கி ரசீதுடன் சரி செய்யப்பட்டது
+Reconciled=சமரசம் செய்தார்
+NotReconciled=சமரசம் செய்யவில்லை
+CustomerInvoicePayment=வாடிக்கையாளர் கட்டணம்
+SupplierInvoicePayment=விற்பனையாளர் கட்டணம்
+SubscriptionPayment=சந்தா செலுத்துதல்
+WithdrawalPayment=டெபிட் பேமெண்ட் ஆர்டர்
+SocialContributionPayment=சமூக/நிதி வரி செலுத்துதல்
+BankTransfer=கடன் பரிமாற்றம்
+BankTransfers=கடன் பரிமாற்றங்கள்
+MenuBankInternalTransfer=உள் பரிமாற்றம்
+TransferDesc=ஒரு கணக்கிலிருந்து மற்றொரு கணக்கிற்கு மாற்ற உள் பரிமாற்றத்தைப் பயன்படுத்தவும், பயன்பாடு இரண்டு பதிவுகளை எழுதும்: மூலக் கணக்கில் ஒரு பற்று மற்றும் இலக்கு கணக்கில் ஒரு கடன். இந்த பரிவர்த்தனைக்கும் அதே தொகை, லேபிள் மற்றும் தேதி பயன்படுத்தப்படும்.
+TransferFrom=இருந்து
+TransferTo=செய்ய
+TransferFromToDone=<b> %s </b> %s இன் <b> %s </b> செய்ய <b> %s </b> இருந்து ஒரு பரிமாற்ற பதிவு செய்யப்பட்டுள்ளது.
+CheckTransmitter=அனுப்புபவர்
+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=சமரசம் தொடர்பான வங்கி அறிக்கையைத் தேர்ந்தெடுக்கவும். வரிசைப்படுத்தக்கூடிய எண் மதிப்பைப் பயன்படுத்தவும்: YYYYMM அல்லது YYYYMMDD
+EventualyAddCategory=இறுதியில், பதிவுகளை வகைப்படுத்தும் வகையைக் குறிப்பிடவும்
+ToConciliate=சமரசம் செய்யவா?
+ThenCheckLinesAndConciliate=பின்னர், வங்கி அறிக்கையில் உள்ள வரிகளை சரிபார்த்து கிளிக் செய்யவும்
+DefaultRIB=இயல்புநிலை தடை
+AllRIB=அனைத்து தடை
+LabelRIB=தடை லேபிள்
+NoBANRecord=BAN பதிவு இல்லை
+DeleteARib=BAN பதிவை நீக்கவும்
+ConfirmDeleteRib=இந்த BAN பதிவை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+RejectCheck=காசோலை திரும்பியது
+ConfirmRejectCheck=இந்த காசோலை நிராகரிக்கப்பட்டதாக நிச்சயமாகக் குறிக்க விரும்புகிறீர்களா?
+RejectCheckDate=காசோலை திரும்பிய தேதி
+CheckRejected=காசோலை திரும்பியது
+CheckRejectedAndInvoicesReopened=காசோலை திரும்பியது மற்றும் இன்வாய்ஸ்கள் மீண்டும் திறக்கப்பட்டன
+BankAccountModelModule=வங்கிக் கணக்குகளுக்கான ஆவண வார்ப்புருக்கள்
+DocumentModelSepaMandate=SEPA கட்டளையின் வார்ப்புரு. EEC இல் ஐரோப்பிய நாடுகளுக்கு மட்டுமே பயனுள்ளதாக இருக்கும்.
+DocumentModelBan=BAN தகவலுடன் ஒரு பக்கத்தை அச்சிட டெம்ப்ளேட்.
+NewVariousPayment=புதிய இதர கட்டணம்
+VariousPayment=இதர கட்டணம்
+VariousPayments=இதர கொடுப்பனவுகள்
+ShowVariousPayment=இதர கட்டணத்தைக் காட்டு
+AddVariousPayment=இதர கட்டணத்தைச் சேர்க்கவும்
+VariousPaymentId=இதர கட்டண ஐடி
+VariousPaymentLabel=இதர பேமெண்ட் லேபிள்
+ConfirmCloneVariousPayment=இதர கட்டணத்தின் குளோனை உறுதிப்படுத்தவும்
+SEPAMandate=SEPA ஆணை
+YourSEPAMandate=உங்கள் SEPA ஆணை
+FindYourSEPAMandate=உங்கள் வங்கிக்கு நேரடி டெபிட் ஆர்டரைச் செய்ய எங்கள் நிறுவனத்தை அங்கீகரிக்க இது உங்களின் SEPA ஆணை. கையொப்பமிடப்பட்டதைத் திருப்பி அனுப்பவும் (கையொப்பமிடப்பட்ட ஆவணத்தின் ஸ்கேன்) அல்லது அஞ்சல் மூலம் அனுப்பவும்
+AutoReportLastAccountStatement=சமரசம் செய்யும் போது தானாக 'வங்கி அறிக்கையின் எண்' புலத்தை கடைசி அறிக்கை எண்ணுடன் நிரப்பவும்
+CashControl=பிஓஎஸ் பண மேசை கட்டுப்பாடு
+NewCashFence=புதிய பண மேசை திறப்பு அல்லது மூடல்
+BankColorizeMovement=இயக்கங்களை வண்ணமயமாக்குங்கள்
+BankColorizeMovementDesc=இந்த செயல்பாடு இயக்கப்பட்டால், டெபிட் அல்லது கிரெடிட் இயக்கங்களுக்கு குறிப்பிட்ட பின்னணி நிறத்தை நீங்கள் தேர்வு செய்யலாம்
+BankColorizeMovementName1=டெபிட் இயக்கத்திற்கான பின்னணி நிறம்
+BankColorizeMovementName2=கடன் இயக்கத்திற்கான பின்னணி நிறம்
+IfYouDontReconcileDisableProperty=சில வங்கிக் கணக்குகளில் நீங்கள் வங்கி சமரசம் செய்யவில்லை எனில், இந்த எச்சரிக்கையை அகற்ற, அவற்றில் உள்ள "%s" சொத்தை முடக்கவும்.
+NoBankAccountDefined=வங்கிக் கணக்கு எதுவும் வரையறுக்கப்படவில்லை
+NoRecordFoundIBankcAccount=வங்கிக் கணக்கில் பதிவு எதுவும் இல்லை. பொதுவாக, வங்கிக் கணக்கில் உள்ள பரிவர்த்தனை பட்டியலிலிருந்து ஒரு பதிவு கைமுறையாக நீக்கப்படும்போது இது நிகழ்கிறது (எடுத்துக்காட்டாக, வங்கிக் கணக்கின் சமரசத்தின் போது). மற்றொரு காரணம், "%s" தொகுதி முடக்கப்பட்டபோது கட்டணம் பதிவு செய்யப்பட்டது.
+AlreadyOneBankAccount=ஏற்கனவே ஒரு வங்கி கணக்கு வரையறுக்கப்பட்டுள்ளது
diff --git a/htdocs/langs/ta_IN/bills.lang b/htdocs/langs/ta_IN/bills.lang
new file mode 100644
index 00000000000..45c25cd6ff4
--- /dev/null
+++ b/htdocs/langs/ta_IN/bills.lang
@@ -0,0 +1,609 @@
+# Dolibarr language file - Source file is en_US - bills
+Bill=விலைப்பட்டியல்
+Bills=இன்வாய்ஸ்கள்
+BillsCustomers=வாடிக்கையாளர் இன்வாய்ஸ்கள்
+BillsCustomer=வாடிக்கையாளர் விலைப்பட்டியல்
+BillsSuppliers=விற்பனையாளர் விலைப்பட்டியல்
+BillsCustomersUnpaid=செலுத்தப்படாத வாடிக்கையாளர் இன்வாய்ஸ்கள்
+BillsCustomersUnpaidForCompany=%sக்கான பணம் செலுத்தப்படாத வாடிக்கையாளர் இன்வாய்ஸ்கள்
+BillsSuppliersUnpaid=செலுத்தப்படாத விற்பனையாளர் இன்வாய்ஸ்கள்
+BillsSuppliersUnpaidForCompany=%sக்கான செலுத்தப்படாத விற்பனையாளர்களின் விலைப்பட்டியல்
+BillsLate=தாமதமான பணம்
+BillsStatistics=வாடிக்கையாளர்கள் இன்வாய்ஸ் புள்ளிவிவரங்கள்
+BillsStatisticsSuppliers=விற்பனையாளர்கள் இன்வாய்ஸ் புள்ளிவிவரங்கள்
+DisabledBecauseDispatchedInBookkeeping=கணக்குப் பராமரிப்பில் இன்வாய்ஸ் அனுப்பப்பட்டதால் முடக்கப்பட்டது
+DisabledBecauseNotLastInvoice=விலைப்பட்டியல் அழிக்க முடியாததால் முடக்கப்பட்டது. இதற்குப் பிறகு சில இன்வாய்ஸ்கள் பதிவு செய்யப்பட்டன, அது கவுண்டரில் துளைகளை உருவாக்கும்.
+DisabledBecauseNotErasable=அழிக்க முடியாததால் முடக்கப்பட்டது
+InvoiceStandard=நிலையான விலைப்பட்டியல்
+InvoiceStandardAsk=நிலையான விலைப்பட்டியல்
+InvoiceStandardDesc=இந்த வகையான விலைப்பட்டியல் பொதுவான விலைப்பட்டியல் ஆகும்.
+InvoiceDeposit=முன்பணம் விலைப்பட்டியல்
+InvoiceDepositAsk=முன்பணம் விலைப்பட்டியல்
+InvoiceDepositDesc=முன்பணம் பெறப்பட்டவுடன் இந்த வகையான விலைப்பட்டியல் செய்யப்படுகிறது.
+InvoiceProForma=ப்ரோஃபார்மா இன்வாய்ஸ்
+InvoiceProFormaAsk=ப்ரோஃபார்மா இன்வாய்ஸ்
+InvoiceProFormaDesc= <b> ப்ரோஃபார்மா இன்வாய்ஸ் </b> என்பது உண்மையான விலைப்பட்டியலின் படம் ஆனால் கணக்கு மதிப்பு இல்லை.
+InvoiceReplacement=மாற்று விலைப்பட்டியல்
+InvoiceReplacementAsk=விலைப்பட்டியலுக்கான மாற்று விலைப்பட்டியல்
+InvoiceReplacementDesc= <b> மாற்று விலைப்பட்டியல் </b> ஆனது, ஏற்கனவே பணம் எதுவும் பெறப்படாத விலைப்பட்டியலை முழுமையாக மாற்றுவதற்குப் பயன்படுத்தப்படுகிறது. <br> <br> குறிப்பு: பணம் செலுத்தாத இன்வாய்ஸ்களை மட்டுமே மாற்ற முடியும். நீங்கள் மாற்றியமைக்கப்பட்ட விலைப்பட்டியல் இன்னும் மூடப்படவில்லை என்றால், அது தானாகவே 'கைவிடப்பட்டது' என மூடப்படும்.
+InvoiceAvoir=கடன் குறிப்பு
+InvoiceAvoirAsk=விலைப்பட்டியலை சரிசெய்ய கடன் குறிப்பு
+InvoiceAvoirDesc=<b> கிரெடிட் நோட் </b> என்பது எதிர்மறை விலைப்பட்டியல் ஆகும், இது உண்மையில் செலுத்தப்பட்ட தொகையிலிருந்து வேறுபட்ட தொகையைக் காட்டுகிறது (எ.கா. வாடிக்கையாளர் தவறுதலாக அதிகமாகச் செலுத்தினார் அல்லது சில பொருட்கள் திரும்பப் பெற்றதால் முழுத் தொகையையும் செலுத்த மாட்டார்) .
+invoiceAvoirWithLines=அசல் விலைப்பட்டியலில் இருந்து வரிகளுடன் கடன் குறிப்பை உருவாக்கவும்
+invoiceAvoirWithPaymentRestAmount=மீதமுள்ள செலுத்தப்படாத அசல் விலைப்பட்டியல் மூலம் கிரெடிட் நோட்டை உருவாக்கவும்
+invoiceAvoirLineWithPaymentRestAmount=மீதமுள்ள செலுத்தப்படாத தொகைக்கான கடன் குறிப்பு
+ReplaceInvoice=விலைப்பட்டியல் %s ஐ மாற்றவும்
+ReplacementInvoice=மாற்று விலைப்பட்டியல்
+ReplacedByInvoice=விலைப்பட்டியல் %s ஆல் மாற்றப்பட்டது
+ReplacementByInvoice=விலைப்பட்டியல் மூலம் மாற்றப்பட்டது
+CorrectInvoice=சரியான விலைப்பட்டியல் %s
+CorrectionInvoice=சரிசெய்தல் விலைப்பட்டியல்
+UsedByInvoice=விலைப்பட்டியல் %s செலுத்த பயன்படுகிறது
+ConsumedBy=மூலம் நுகரப்படும்
+NotConsumed=நுகரப்படவில்லை
+NoReplacableInvoice=மாற்றத்தக்க விலைப்பட்டியல் இல்லை
+NoInvoiceToCorrect=சரி செய்ய விலைப்பட்டியல் இல்லை
+InvoiceHasAvoir=ஒன்று அல்லது பல கடன் குறிப்புகளின் ஆதாரமாக இருந்தது
+CardBill=விலைப்பட்டியல் அட்டை
+PredefinedInvoices=முன் வரையறுக்கப்பட்ட இன்வாய்ஸ்கள்
+Invoice=விலைப்பட்டியல்
+PdfInvoiceTitle=விலைப்பட்டியல்
+Invoices=இன்வாய்ஸ்கள்
+InvoiceLine=விலைப்பட்டியல் வரி
+InvoiceCustomer=வாடிக்கையாளர் விலைப்பட்டியல்
+CustomerInvoice=வாடிக்கையாளர் விலைப்பட்டியல்
+CustomersInvoices=வாடிக்கையாளர் இன்வாய்ஸ்கள்
+SupplierInvoice=விற்பனையாளர் விலைப்பட்டியல்
+SuppliersInvoices=விற்பனையாளர் விலைப்பட்டியல்
+SupplierInvoiceLines=விற்பனையாளர் விலைப்பட்டியல் வரிகள்
+SupplierBill=விற்பனையாளர் விலைப்பட்டியல்
+SupplierBills=விற்பனையாளர் விலைப்பட்டியல்
+Payment=பணம் செலுத்துதல்
+PaymentBack=திரும்பப்பெறுதல்
+CustomerInvoicePaymentBack=திரும்பப்பெறுதல்
+Payments=கொடுப்பனவுகள்
+PaymentsBack=பணத்தைத் திரும்பப் பெறுதல்
+paymentInInvoiceCurrency=இன்வாய்ஸ் நாணயத்தில்
+PaidBack=திரும்ப செலுத்தப்பட்டது
+DeletePayment=கட்டணத்தை நீக்கு
+ConfirmDeletePayment=இந்தக் கட்டணத்தை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+ConfirmConvertToReduc=இந்த %sஐ கிடைக்கக்கூடிய கிரெடிட்டாக மாற்ற விரும்புகிறீர்களா?
+ConfirmConvertToReduc2=இந்தத் தொகை அனைத்து தள்ளுபடிகளிலும் சேமிக்கப்படும், மேலும் இந்த வாடிக்கையாளருக்கான தற்போதைய அல்லது எதிர்கால விலைப்பட்டியலுக்கான தள்ளுபடியாகப் பயன்படுத்தப்படலாம்.
+ConfirmConvertToReducSupplier=இந்த %sஐ கிடைக்கக்கூடிய கிரெடிட்டாக மாற்ற விரும்புகிறீர்களா?
+ConfirmConvertToReducSupplier2=இந்தத் தொகை அனைத்து தள்ளுபடிகளிலும் சேமிக்கப்படும், மேலும் இந்த விற்பனையாளருக்கான தற்போதைய அல்லது எதிர்கால விலைப்பட்டியலுக்கான தள்ளுபடியாகப் பயன்படுத்தப்படலாம்.
+SupplierPayments=விற்பனையாளர் கொடுப்பனவுகள்
+ReceivedPayments=பணம் பெறப்பட்டது
+ReceivedCustomersPayments=வாடிக்கையாளர்களிடமிருந்து பெறப்பட்ட பணம்
+PayedSuppliersPayments=விற்பனையாளர்களுக்கு செலுத்தப்படும் பணம்
+ReceivedCustomersPaymentsToValid=சரிபார்க்க வாடிக்கையாளர்களுக்கு பணம் கிடைத்தது
+PaymentsReportsForYear=%sக்கான கட்டண அறிக்கைகள்
+PaymentsReports=கட்டண அறிக்கைகள்
+PaymentsAlreadyDone=ஏற்கனவே பணம் செலுத்தப்பட்டது
+PaymentsBackAlreadyDone=பணத்தைத் திரும்பப்பெறுதல் ஏற்கனவே முடிந்துவிட்டது
+PaymentRule=பணம் செலுத்தும் விதி
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
+DefaultBankAccount=இயல்புநிலை வங்கி கணக்கு
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
+PaymentTerm=கட்டணம் செலுத்தும் காலம்
+PaymentConditions=கட்டண வரையறைகள்
+PaymentConditionsShort=கட்டண வரையறைகள்
+PaymentAmount=கட்டணம் செலுத்தும் தொகை
+PaymentHigherThanReminderToPay=செலுத்த வேண்டிய நினைவூட்டலை விட அதிகமாக பணம் செலுத்துதல்
+HelpPaymentHigherThanReminderToPay=கவனம், ஒன்று அல்லது அதற்கு மேற்பட்ட பில்களின் கட்டணத் தொகை செலுத்த வேண்டிய நிலுவைத் தொகையை விட அதிகமாக உள்ளது. <br> உங்கள் பதிவைத் திருத்தவும், இல்லையெனில் உறுதிசெய்து, ஒவ்வொரு ஓவர்பெய்டு இன்வாய்ஸுக்கும் அதிகமாகப் பெறப்பட்ட கடன் குறிப்பை உருவாக்கவும்.
+HelpPaymentHigherThanReminderToPaySupplier=கவனம், ஒன்று அல்லது அதற்கு மேற்பட்ட பில்களின் கட்டணத் தொகை செலுத்த வேண்டிய நிலுவைத் தொகையை விட அதிகமாக உள்ளது. <br> உங்கள் பதிவைத் திருத்தவும், இல்லையெனில் உறுதிசெய்து, ஒவ்வொரு ஓவர்பெய்டு இன்வாய்ஸுக்கும் அதிகமாகச் செலுத்தப்பட்ட கடன் குறிப்பை உருவாக்கவும்.
+ClassifyPaid='பணம்' என வகைப்படுத்தவும்
+ClassifyUnPaid='செலுத்தப்படாதது' என வகைப்படுத்தவும்
+ClassifyPaidPartially='பகுதி செலுத்தப்பட்டது' என வகைப்படுத்தவும்
+ClassifyCanceled='கைவிடப்பட்டவை' வகைப்படுத்தவும்
+ClassifyClosed='மூடப்பட்டது' என வகைப்படுத்தவும்
+ClassifyUnBilled='பில் செய்யப்படாதது'
+CreateBill=விலைப்பட்டியல் உருவாக்கவும்
+CreateCreditNote=கடன் குறிப்பை உருவாக்கவும்
+AddBill=விலைப்பட்டியல் அல்லது கடன் குறிப்பை உருவாக்கவும்
+AddToDraftInvoices=வரைவு விலைப்பட்டியலில் சேர்க்கவும்
+DeleteBill=விலைப்பட்டியலை நீக்கு
+SearchACustomerInvoice=வாடிக்கையாளர் விலைப்பட்டியலைத் தேடுங்கள்
+SearchASupplierInvoice=விற்பனையாளர் விலைப்பட்டியலைத் தேடுங்கள்
+CancelBill=விலைப்பட்டியலை ரத்துசெய்
+SendRemindByMail=மின்னஞ்சல் மூலம் நினைவூட்டல் அனுப்பவும்
+DoPayment=கட்டணத்தை உள்ளிடவும்
+DoPaymentBack=பணத்தைத் திரும்பப்பெற உள்ளிடவும்
+ConvertToReduc=கிரெடிட் கிடைக்கும் எனக் குறிக்கவும்
+ConvertExcessReceivedToReduc=பெறப்பட்ட அதிகப்படியான கிரெடிட்டாக மாற்றவும்
+ConvertExcessPaidToReduc=அதிகமாகச் செலுத்தப்பட்டதைக் கிடைக்கும் தள்ளுபடியாக மாற்றவும்
+EnterPaymentReceivedFromCustomer=வாடிக்கையாளரிடமிருந்து பெறப்பட்ட கட்டணத்தை உள்ளிடவும்
+EnterPaymentDueToCustomer=வாடிக்கையாளருக்கு பணம் செலுத்துங்கள்
+DisabledBecauseRemainderToPayIsZero=செலுத்தப்படாதது பூஜ்ஜியமாக இருப்பதால் முடக்கப்பட்டது
+PriceBase=அடிப்படை விலை
+BillStatus=விலைப்பட்டியல் நிலை
+StatusOfGeneratedInvoices=உருவாக்கப்பட்ட இன்வாய்ஸ்களின் நிலை
+BillStatusDraft=வரைவு (சரிபார்க்கப்பட வேண்டும்)
+BillStatusPaid=செலுத்தப்பட்டது
+BillStatusPaidBackOrConverted=கிரெடிட் நோட் ரீஃபண்ட் அல்லது கிரெடிட் கிடைக்கும் எனக் குறிக்கப்பட்டது
+BillStatusConverted=செலுத்தப்பட்டது (இறுதி விலைப்பட்டியலில் நுகர்வுக்குத் தயார்)
+BillStatusCanceled=கைவிடப்பட்டது
+BillStatusValidated=சரிபார்க்கப்பட்டது (பணம் செலுத்த வேண்டும்)
+BillStatusStarted=தொடங்கப்பட்டது
+BillStatusNotPaid=செலுத்தப்படவில்லை
+BillStatusNotRefunded=திருப்பித் தரப்படவில்லை
+BillStatusClosedUnpaid=மூடப்பட்டது (செலுத்தப்படாதது)
+BillStatusClosedPaidPartially=செலுத்தப்பட்டது (பகுதி)
+BillShortStatusDraft=வரைவு
+BillShortStatusPaid=செலுத்தப்பட்டது
+BillShortStatusPaidBackOrConverted=திருப்பியளிக்கப்பட்டது அல்லது மாற்றப்பட்டது
+Refunded=திருப்பி கொடுக்கப்பட்டது
+BillShortStatusConverted=செலுத்தப்பட்டது
+BillShortStatusCanceled=கைவிடப்பட்டது
+BillShortStatusValidated=சரிபார்க்கப்பட்டது
+BillShortStatusStarted=தொடங்கப்பட்டது
+BillShortStatusNotPaid=செலுத்தப்படவில்லை
+BillShortStatusNotRefunded=திருப்பித் தரப்படவில்லை
+BillShortStatusClosedUnpaid=மூடப்பட்டது
+BillShortStatusClosedPaidPartially=செலுத்தப்பட்டது (பகுதி)
+PaymentStatusToValidShort=சரிபார்க்க
+ErrorVATIntraNotConfigured=சமூகத்திற்குள் VAT எண் இன்னும் வரையறுக்கப்படவில்லை
+ErrorNoPaiementModeConfigured=இயல்புநிலை கட்டண வகை வரையறுக்கப்படவில்லை. இதைச் சரிசெய்ய விலைப்பட்டியல் தொகுதி அமைப்புக்குச் செல்லவும்.
+ErrorCreateBankAccount=பேங்க் அக்கவுண்ட்டை உருவாக்கி, பேமெண்ட் வகைகளை வரையறுக்க இன்வாய்ஸ் மாட்யூலின் அமைவு பேனலுக்குச் செல்லவும்
+ErrorBillNotFound=விலைப்பட்டியல் %s இல்லை
+ErrorInvoiceAlreadyReplaced=பிழை, விலைப்பட்டியல் %s ஐ மாற்றுவதற்கு விலைப்பட்டியலைச் சரிபார்க்க முயற்சித்தீர்கள். ஆனால் இது ஏற்கனவே இன்வாய்ஸ் %s ஆல் மாற்றப்பட்டுள்ளது.
+ErrorDiscountAlreadyUsed=பிழை, தள்ளுபடி ஏற்கனவே பயன்படுத்தப்பட்டது
+ErrorInvoiceAvoirMustBeNegative=பிழை, சரியான விலைப்பட்டியல் எதிர்மறைத் தொகையைக் கொண்டிருக்க வேண்டும்
+ErrorInvoiceOfThisTypeMustBePositive=பிழை, இந்த வகையான இன்வாய்ஸில் வரி நேர்மறை (அல்லது பூஜ்ய) தவிர ஒரு தொகை இருக்க வேண்டும்
+ErrorCantCancelIfReplacementInvoiceNotValidated=பிழை, இன்னும் வரைவு நிலையில் உள்ள மற்றொரு இன்வாய்ஸால் மாற்றப்பட்ட விலைப்பட்டியலை ரத்து செய்ய முடியாது
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=இந்தப் பகுதி அல்லது மற்றொன்று ஏற்கனவே பயன்படுத்தப்பட்டதால் தள்ளுபடித் தொடரை அகற்ற முடியாது.
+BillFrom=இருந்து
+BillTo=செய்ய
+ActionsOnBill=விலைப்பட்டியல் மீதான நடவடிக்கைகள்
+RecurringInvoiceTemplate=டெம்ப்ளேட் / தொடர் விலைப்பட்டியல்
+NoQualifiedRecurringInvoiceTemplateFound=தொடர்ச்சியான டெம்ப்ளேட் விலைப்பட்டியல் எதுவும் உருவாக்கத் தகுதிபெறவில்லை.
+FoundXQualifiedRecurringInvoiceTemplate=உருவாக்கத் தகுதியான %s தொடர் டெம்ப்ளேட் விலைப்பட்டியல்(கள்) கண்டறியப்பட்டது.
+NotARecurringInvoiceTemplate=தொடர்ச்சியான டெம்ப்ளேட் விலைப்பட்டியல் அல்ல
+NewBill=புதிய விலைப்பட்டியல்
+LastBills=சமீபத்திய %s இன்வாய்ஸ்கள்
+LatestTemplateInvoices=சமீபத்திய %s டெம்ப்ளேட் இன்வாய்ஸ்கள்
+LatestCustomerTemplateInvoices=சமீபத்திய %s வாடிக்கையாளர் டெம்ப்ளேட் இன்வாய்ஸ்கள்
+LatestSupplierTemplateInvoices=சமீபத்திய %s விற்பனையாளர் டெம்ப்ளேட் இன்வாய்ஸ்கள்
+LastCustomersBills=சமீபத்திய %s வாடிக்கையாளர் இன்வாய்ஸ்கள்
+LastSuppliersBills=சமீபத்திய %s விற்பனையாளர் இன்வாய்ஸ்கள்
+AllBills=அனைத்து விலைப்பட்டியல்கள்
+AllCustomerTemplateInvoices=அனைத்து டெம்ப்ளேட் இன்வாய்ஸ்கள்
+OtherBills=மற்ற இன்வாய்ஸ்கள்
+DraftBills=வரைவு விலைப்பட்டியல்
+CustomersDraftInvoices=வாடிக்கையாளர் வரைவு விலைப்பட்டியல்
+SuppliersDraftInvoices=விற்பனையாளர் வரைவு விலைப்பட்டியல்
+Unpaid=செலுத்தப்படாதது
+ErrorNoPaymentDefined=பிழை எந்த கட்டணமும் வரையறுக்கப்படவில்லை
+ConfirmDeleteBill=இந்த இன்வாய்ஸை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+ConfirmValidateBill=<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> என்பது காலக்கெடுவிற்கு முன் பணம் செலுத்தப்பட்டதால் வழங்கப்பட்ட தள்ளுபடியாகும். கிரெடிட் நோட்டின் மூலம் VATஐ முறைப்படுத்துகிறேன்.
+ConfirmClassifyPaidPartiallyReasonDiscount=மீதம் செலுத்தப்படாத <b> (%s %s) </b> என்பது காலக்கெடுவிற்கு முன் பணம் செலுத்தப்பட்டதால் வழங்கப்பட்ட தள்ளுபடியாகும்.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=மீதமுள்ள செலுத்தப்படாத <b> (%s %s) </b> என்பது காலக்கெடுவிற்கு முன் பணம் செலுத்தப்பட்டதால் வழங்கப்பட்ட தள்ளுபடியாகும். இந்த தள்ளுபடி மீதான VAT ஐ இழப்பதை நான் ஏற்றுக்கொள்கிறேன்.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=மீதம் செலுத்தப்படாத <b> (%s %s) </b> என்பது காலக்கெடுவிற்கு முன் பணம் செலுத்தப்பட்டதால் வழங்கப்பட்ட தள்ளுபடியாகும். கிரெடிட் குறிப்பு இல்லாமல் இந்த தள்ளுபடியின் மீதான VAT ஐ மீட்டெடுக்கிறேன்.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=மோசமான வாடிக்கையாளர்
+ConfirmClassifyPaidPartiallyReasonBankCharge=வங்கி மூலம் கழித்தல் (இடைநிலை வங்கி கட்டணம்)
+ConfirmClassifyPaidPartiallyReasonProductReturned=தயாரிப்புகள் பகுதி திரும்பியது
+ConfirmClassifyPaidPartiallyReasonOther=வேறு காரணத்திற்காக தொகை கைவிடப்பட்டது
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=உங்கள் விலைப்பட்டியல் பொருத்தமான கருத்துகளுடன் வழங்கப்பட்டிருந்தால் இந்தத் தேர்வு சாத்தியமாகும். (உதாரணம் "உண்மையில் செலுத்தப்பட்ட விலையுடன் தொடர்புடைய வரி மட்டுமே விலக்கு உரிமைகளை வழங்குகிறது")
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=சில நாடுகளில், உங்கள் இன்வாய்ஸில் சரியான குறிப்புகள் இருந்தால் மட்டுமே இந்தத் தேர்வு சாத்தியமாகும்.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=மற்ற அனைத்தும் பொருந்தவில்லை என்றால் இந்த தேர்வைப் பயன்படுத்தவும்
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b> மோசமான வாடிக்கையாளர் </b> என்பது தனது கடனைச் செலுத்த மறுக்கும் வாடிக்கையாளர்.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=சில தயாரிப்புகள் திரும்பப் பெறப்பட்டதால், கட்டணம் செலுத்த முடியாதபோது இந்தத் தேர்வு பயன்படுத்தப்படுகிறது
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=செலுத்தப்படாத தொகை <b> இடைத்தரகர் வங்கிக் கட்டணங்கள் </b> , வாடிக்கையாளர் செலுத்திய <b> சரியான தொகை </b> இலிருந்து நேரடியாகக் கழிக்கப்பட்டது.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=மற்ற அனைத்தும் பொருந்தவில்லை என்றால், எடுத்துக்காட்டாக, பின்வரும் சூழ்நிலையில் இந்த தேர்வைப் பயன்படுத்தவும்: <br> - சில தயாரிப்புகள் <br> திருப்பி அனுப்பப்பட்டதால் கட்டணம் முழுமையடையவில்லை - தள்ளுபடியை மறந்துவிட்டதால் கோரப்பட்ட தொகை மிகவும் முக்கியமானது <br> எல்லா சந்தர்ப்பங்களிலும், அதிகமாகக் கோரப்பட்ட தொகை சரியாக இருக்க வேண்டும். கடன் குறிப்பை உருவாக்குவதன் மூலம் கணக்கியல் அமைப்பில்.
+ConfirmClassifyAbandonReasonOther=மற்றவை
+ConfirmClassifyAbandonReasonOtherDesc=இந்த தேர்வு மற்ற எல்லா நிகழ்வுகளிலும் பயன்படுத்தப்படும். உதாரணமாக, நீங்கள் ஒரு மாற்று விலைப்பட்டியல் உருவாக்க திட்டமிட்டுள்ளதால்.
+ConfirmCustomerPayment=<b> %s </b> %sக்கான இந்தக் கட்டண உள்ளீட்டை உறுதிப்படுத்துகிறீர்களா?
+ConfirmSupplierPayment=<b> %s </b> %sக்கான இந்தக் கட்டண உள்ளீட்டை உறுதிப்படுத்துகிறீர்களா?
+ConfirmValidatePayment=இந்தக் கட்டணத்தைச் சரிபார்க்க விரும்புகிறீர்களா? பணம் செலுத்திய பிறகு எந்த மாற்றமும் செய்ய முடியாது.
+ValidateBill=விலைப்பட்டியல் சரிபார்க்கவும்
+UnvalidateBill=விலைப்பட்டியல் செல்லாததாக்கு
+NumberOfBills=விலைப்பட்டியல் எண்ணிக்கை
+NumberOfBillsByMonth=மாதத்திற்கு இன்வாய்ஸ் எண்ணிக்கை
+AmountOfBills=இன்வாய்ஸ்களின் அளவு
+AmountOfBillsHT=இன்வாய்ஸ்களின் அளவு (வரியின் நிகரம்)
+AmountOfBillsByMonthHT=மாத விலைப்பட்டியல் தொகை (வரி நிகர)
+UseSituationInvoices=சூழ்நிலை விலைப்பட்டியலை அனுமதிக்கவும்
+UseSituationInvoicesCreditNote=சூழ்நிலை விலைப்பட்டியல் கடன் குறிப்பை அனுமதிக்கவும்
+Retainedwarranty=தக்க உத்தரவாதம்
+AllowedInvoiceForRetainedWarranty=பின்வரும் வகையான இன்வாய்ஸ்களில் பயன்படுத்தக்கூடிய தக்க உத்தரவாதம்
+RetainedwarrantyDefaultPercent=தக்கவைக்கப்பட்ட உத்தரவாத இயல்புநிலை சதவீதம்
+RetainedwarrantyOnlyForSituation=சூழ்நிலை விலைப்பட்டியல்களுக்கு மட்டுமே "தக்கவைக்கப்பட்ட உத்தரவாதத்தை" கிடைக்கச் செய்யுங்கள்
+RetainedwarrantyOnlyForSituationFinal=சூழ்நிலை விலைப்பட்டியல்களில், உலகளாவிய "தக்க உத்திரவாதம்" கழித்தல் இறுதி சூழ்நிலையில் மட்டுமே பயன்படுத்தப்படும்
+ToPayOn=%s இல் பணம் செலுத்தவும்
+toPayOn=%s இல் செலுத்த வேண்டும்
+RetainedWarranty=தக்கவைக்கப்பட்ட உத்தரவாதம்
+PaymentConditionsShortRetainedWarranty=தக்க உத்தரவாதம் செலுத்தும் விதிமுறைகள்
+DefaultPaymentConditionsRetainedWarranty=இயல்புநிலை தக்கவைக்கப்பட்ட உத்தரவாதக் கட்டண விதிமுறைகள்
+setPaymentConditionsShortRetainedWarranty=தக்க உத்தரவாதக் கட்டண விதிமுறைகளை அமைக்கவும்
+setretainedwarranty=தக்க உத்தரவாதத்தை அமைக்கவும்
+setretainedwarrantyDateLimit=தக்க உத்தரவாத தேதி வரம்பை அமைக்கவும்
+RetainedWarrantyDateLimit=தக்கவைக்கப்பட்ட உத்தரவாத தேதி வரம்பு
+RetainedWarrantyNeed100Percent=நிலைமை விலைப்பட்டியல் PDF இல் காட்டப்பட 100%% முன்னேற்றத்தில் இருக்க வேண்டும்
+AlreadyPaid=ஏற்கனவே செலுத்தப்பட்டது
+AlreadyPaidBack=ஏற்கனவே திருப்பி செலுத்தப்பட்டது
+AlreadyPaidNoCreditNotesNoDeposits=ஏற்கனவே செலுத்தப்பட்டது (கிரெடிட் குறிப்புகள் மற்றும் முன்பணம் செலுத்தாமல்)
+Abandoned=கைவிடப்பட்டது
+RemainderToPay=மீதம் செலுத்தப்படாதது
+RemainderToPayMulticurrency=மீதம் செலுத்தப்படாத அசல் நாணயம்
+RemainderToTake=மீதமுள்ள தொகையை எடுக்க வேண்டும்
+RemainderToTakeMulticurrency=எடுக்க வேண்டிய மீதமுள்ள தொகை, அசல் நாணயம்
+RemainderToPayBack=மீதித் தொகை திரும்பப் பெற வேண்டும்
+RemainderToPayBackMulticurrency=திரும்பப்பெற மீதமுள்ள தொகை, அசல் நாணயம்
+NegativeIfExcessRefunded=அதிகமாகத் திரும்பப் பெற்றால் எதிர்மறை
+Rest=நிலுவையில் உள்ளது
+AmountExpected=கோரப்பட்ட தொகை
+ExcessReceived=அதிகமாக பெறப்பட்டது
+ExcessReceivedMulticurrency=அதிகமாக பெறப்பட்டது, அசல் நாணயம்
+NegativeIfExcessReceived=அதிகமாகப் பெற்றால் எதிர்மறை
+ExcessPaid=அதிகப்படியான பணம்
+ExcessPaidMulticurrency=அதிகப்படியான பணம், அசல் நாணயம்
+EscompteOffered=தள்ளுபடி வழங்கப்படுகிறது (காலத்திற்கு முன் பணம் செலுத்துதல்)
+EscompteOfferedShort=தள்ளுபடி
+SendBillRef=விலைப்பட்டியல் %s சமர்ப்பிப்பு
+SendReminderBillRef=விலைப்பட்டியல் %s சமர்ப்பிப்பு (நினைவூட்டல்)
+SendPaymentReceipt=கட்டண ரசீதை சமர்ப்பித்தல் %s
+NoDraftBills=வரைவு விலைப்பட்டியல் இல்லை
+NoOtherDraftBills=வேறு வரைவு விலைப்பட்டியல் இல்லை
+NoDraftInvoices=வரைவு விலைப்பட்டியல் இல்லை
+RefBill=விலைப்பட்டியல் குறிப்பு
+ToBill=ரசீதிற்க்கு
+RemainderToBill=பில் செய்ய மீதி
+SendBillByMail=மின்னஞ்சல் மூலம் விலைப்பட்டியல் அனுப்பவும்
+SendReminderBillByMail=மின்னஞ்சல் மூலம் நினைவூட்டல் அனுப்பவும்
+RelatedCommercialProposals=தொடர்புடைய வணிக முன்மொழிவுகள்
+RelatedRecurringCustomerInvoices=தொடர்புடைய தொடர்ச்சியான வாடிக்கையாளர் இன்வாய்ஸ்கள்
+MenuToValid=செல்லுபடியாகும்
+DateMaxPayment=செலுத்த வேண்டிய தேதி
+DateInvoice=விலைப்பட்டியல் தேதி
+DatePointOfTax=வரி புள்ளி
+NoInvoice=விலைப்பட்டியல் இல்லை
+NoOpenInvoice=திறந்த விலைப்பட்டியல் இல்லை
+NbOfOpenInvoices=திறந்த விலைப்பட்டியல்களின் எண்ணிக்கை
+ClassifyBill=விலைப்பட்டியல் வகைப்படுத்தவும்
+SupplierBillsToPay=செலுத்தப்படாத விற்பனையாளர் இன்வாய்ஸ்கள்
+CustomerBillsUnpaid=செலுத்தப்படாத வாடிக்கையாளர் இன்வாய்ஸ்கள்
+NonPercuRecuperable=மீட்க முடியாதது
+SetConditions=கட்டண விதிமுறைகளை அமைக்கவும்
+SetMode=கட்டண வகையை அமைக்கவும்
+SetRevenuStamp=வருவாய் முத்திரையை அமைக்கவும்
+Billed=கட்டணம் வசூலிக்கப்பட்டது
+RecurringInvoices=தொடர்ச்சியான இன்வாய்ஸ்கள்
+RecurringInvoice=தொடர்ச்சியான விலைப்பட்டியல்
+RepeatableInvoice=டெம்ப்ளேட் விலைப்பட்டியல்
+RepeatableInvoices=டெம்ப்ளேட் இன்வாய்ஸ்கள்
+Repeatable=டெம்ப்ளேட்
+Repeatables=வார்ப்புருக்கள்
+ChangeIntoRepeatableInvoice=டெம்ப்ளேட் இன்வாய்ஸாக மாற்றவும்
+CreateRepeatableInvoice=டெம்ப்ளேட் விலைப்பட்டியல் உருவாக்கவும்
+CreateFromRepeatableInvoice=டெம்ப்ளேட் விலைப்பட்டியலில் இருந்து உருவாக்கவும்
+CustomersInvoicesAndInvoiceLines=வாடிக்கையாளர் விலைப்பட்டியல் மற்றும் விலைப்பட்டியல் விவரங்கள்
+CustomersInvoicesAndPayments=வாடிக்கையாளர் விலைப்பட்டியல் மற்றும் கட்டணங்கள்
+ExportDataset_invoice_1=வாடிக்கையாளர் விலைப்பட்டியல் மற்றும் விலைப்பட்டியல் விவரங்கள்
+ExportDataset_invoice_2=வாடிக்கையாளர் விலைப்பட்டியல் மற்றும் கட்டணங்கள்
+ProformaBill=ப்ரோஃபார்மா பில்:
+Reduction=குறைப்பு
+ReductionShort=வட்டு
+Reductions=குறைப்புகள்
+ReductionsShort=வட்டு
+Discounts=தள்ளுபடிகள்
+AddDiscount=தள்ளுபடியை உருவாக்கவும்
+AddRelativeDiscount=தொடர்புடைய தள்ளுபடியை உருவாக்கவும்
+EditRelativeDiscount=தொடர்புடைய தள்ளுபடியைத் திருத்தவும்
+AddGlobalDiscount=முழுமையான தள்ளுபடியை உருவாக்கவும்
+EditGlobalDiscounts=முழுமையான தள்ளுபடிகளைத் திருத்தவும்
+AddCreditNote=கடன் குறிப்பை உருவாக்கவும்
+ShowDiscount=தள்ளுபடியைக் காட்டு
+ShowReduc=தள்ளுபடியைக் காட்டு
+ShowSourceInvoice=மூல விலைப்பட்டியலைக் காட்டு
+RelativeDiscount=தொடர்புடைய தள்ளுபடி
+GlobalDiscount=உலகளாவிய தள்ளுபடி
+CreditNote=கடன் குறிப்பு
+CreditNotes=கடன் குறிப்புகள்
+CreditNotesOrExcessReceived=கடன் குறிப்புகள் அல்லது அதிகமாக பெறப்பட்டது
+Deposit=முன்பணம்
+Deposits=முன்பணம்
+DiscountFromCreditNote=கிரெடிட் நோட்டில் இருந்து தள்ளுபடி %s
+DiscountFromDeposit=இன்வாய்ஸ் %s இலிருந்து முன்பணம் செலுத்துதல்
+DiscountFromExcessReceived=விலைப்பட்டியல் %s ஐ விட அதிகமான பணம்
+DiscountFromExcessPaid=விலைப்பட்டியல் %s ஐ விட அதிகமான பணம்
+AbsoluteDiscountUse=இந்த வகையான கிரெடிட்டை அதன் சரிபார்ப்புக்கு முன் இன்வாய்ஸில் பயன்படுத்தலாம்
+CreditNoteDepositUse=இந்த வகையான வரவுகளைப் பயன்படுத்த விலைப்பட்டியல் சரிபார்க்கப்பட வேண்டும்
+NewGlobalDiscount=புதிய முழுமையான தள்ளுபடி
+NewRelativeDiscount=புதிய உறவினர் தள்ளுபடி
+DiscountType=தள்ளுபடி வகை
+NoteReason=குறிப்பு/காரணம்
+ReasonDiscount=காரணம்
+DiscountOfferedBy=மூலம் வழங்கப்பட்டது
+DiscountStillRemaining=தள்ளுபடிகள் அல்லது கிரெடிட்கள் கிடைக்கும்
+DiscountAlreadyCounted=தள்ளுபடிகள் அல்லது கிரெடிட்கள் ஏற்கனவே நுகரப்பட்டுள்ளன
+CustomerDiscounts=வாடிக்கையாளர் தள்ளுபடிகள்
+SupplierDiscounts=விற்பனையாளர்கள் தள்ளுபடிகள்
+BillAddress=பில் முகவரி
+HelpEscompte=இந்த தள்ளுபடி என்பது வாடிக்கையாளருக்கு வழங்கப்படும் தள்ளுபடியாகும், ஏனெனில் காலத்திற்கு முன்பே பணம் செலுத்தப்பட்டது.
+HelpAbandonBadCustomer=இந்தத் தொகை கைவிடப்பட்டது (வாடிக்கையாளர் மோசமான வாடிக்கையாளர் எனக் கூறப்படுகிறது) மற்றும் விதிவிலக்கான இழப்பாகக் கருதப்படுகிறது.
+HelpAbandonOther=இந்தத் தொகையானது பிழையாக இருந்ததால் கைவிடப்பட்டது (தவறான வாடிக்கையாளர் அல்லது விலைப்பட்டியல் எடுத்துக்காட்டாக வேறொருவரால் மாற்றப்பட்டது)
+IdSocialContribution=சமூக/நிதி வரி செலுத்தும் ஐடி
+PaymentId=கட்டண ஐடி
+PaymentRef=கட்டணம் குறிப்பு.
+InvoiceId=விலைப்பட்டியல் ஐடி
+InvoiceRef=விலைப்பட்டியல் குறிப்பு.
+InvoiceDateCreation=விலைப்பட்டியல் உருவாக்கும் தேதி
+InvoiceStatus=விலைப்பட்டியல் நிலை
+InvoiceNote=விலைப்பட்டியல் குறிப்பு
+InvoicePaid=விலைப்பட்டியல் செலுத்தப்பட்டது
+InvoicePaidCompletely=முழுமையாக செலுத்தப்பட்டது
+InvoicePaidCompletelyHelp=முழுமையாக செலுத்தப்பட்ட விலைப்பட்டியல். இது ஓரளவு செலுத்தப்படும் இன்வாய்ஸ்களை விலக்குகிறது. அனைத்து 'மூடப்பட்ட' அல்லது 'மூடப்படாத' இன்வாய்ஸ்களின் பட்டியலைப் பெற, விலைப்பட்டியல் நிலையில் உள்ள வடிப்பானைப் பயன்படுத்தவும்.
+OrderBilled=ஆர்டர் பில் செய்யப்பட்டது
+DonationPaid=நன்கொடை செலுத்தப்பட்டது
+PaymentNumber=கட்டண எண்
+RemoveDiscount=தள்ளுபடியை அகற்று
+WatermarkOnDraftBill=வரைவு விலைப்பட்டியல்களில் வாட்டர்மார்க் (காலியாக இருந்தால் எதுவும் இல்லை)
+InvoiceNotChecked=விலைப்பட்டியல் எதுவும் தேர்ந்தெடுக்கப்படவில்லை
+ConfirmCloneInvoice=இந்த இன்வாய்ஸ் <b> %s </b> ஐ குளோன் செய்ய விரும்புகிறீர்களா?
+DisabledBecauseReplacedInvoice=விலைப்பட்டியல் மாற்றப்பட்டதால் செயல் முடக்கப்பட்டது
+DescTaxAndDividendsArea=சிறப்புச் செலவினங்களுக்காகச் செய்யப்படும் அனைத்துப் பணம் செலுத்துதலின் சுருக்கத்தையும் இந்தப் பகுதி வழங்குகிறது. குறிப்பிட்ட ஆண்டில் பணம் செலுத்திய பதிவுகள் மட்டுமே இங்கு சேர்க்கப்பட்டுள்ளன.
+NbOfPayments=கொடுப்பனவுகளின் எண்ணிக்கை
+SplitDiscount=தள்ளுபடியை இரண்டாகப் பிரிக்கவும்
+ConfirmSplitDiscount=<b> %s </b> %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> a0aee833658337fz0 <b> Setfs
+NextDateToExecution=அடுத்த விலைப்பட்டியல் உருவாக்கத்திற்கான தேதி
+NextDateToExecutionShort=தேதி அடுத்த தலைமுறை.
+DateLastGeneration=சமீபத்திய தலைமுறையின் தேதி
+DateLastGenerationShort=தேதி சமீபத்திய ஜென்.
+MaxPeriodNumber=அதிகபட்சம். விலைப்பட்டியல் உருவாக்கத்தின் எண்ணிக்கை
+NbOfGenerationDone=ஏற்கனவே செய்யப்பட்ட விலைப்பட்டியல் உருவாக்கத்தின் எண்ணிக்கை
+NbOfGenerationOfRecordDone=ஏற்கனவே செய்யப்பட்ட சாதனைகளின் எண்ணிக்கை
+NbOfGenerationDoneShort=செய்யப்பட்ட தலைமுறைகளின் எண்ணிக்கை
+MaxGenerationReached=தலைமுறைகளின் அதிகபட்ச எண்ணிக்கையை அடைந்தது
+InvoiceAutoValidate=இன்வாய்ஸ்களை தானாக சரிபார்க்கவும்
+GeneratedFromRecurringInvoice=டெம்ப்ளேட்டின் தொடர்ச்சியான விலைப்பட்டியல் %s இலிருந்து உருவாக்கப்பட்டது
+DateIsNotEnough=தேதி இன்னும் எட்டப்படவில்லை
+InvoiceGeneratedFromTemplate=தொடர்ச்சியான டெம்ப்ளேட் விலைப்பட்டியல் %s விலைப்பட்டியல் %s உருவாக்கப்பட்டது
+GeneratedFromTemplate=டெம்ப்ளேட் விலைப்பட்டியல் %s இலிருந்து உருவாக்கப்பட்டது
+WarningInvoiceDateInFuture=எச்சரிக்கை, இன்வாய்ஸ் தேதி தற்போதைய தேதியை விட அதிகமாக உள்ளது
+WarningInvoiceDateTooFarInFuture=எச்சரிக்கை, விலைப்பட்டியல் தேதி தற்போதைய தேதியிலிருந்து வெகு தொலைவில் உள்ளது
+ViewAvailableGlobalDiscounts=கிடைக்கும் தள்ளுபடிகளைக் காண்க
+GroupPaymentsByModOnReports=அறிக்கைகளில் முறையின்படி குழுக் கட்டணங்கள்
+# PaymentConditions
+Statut=நிலை
+PaymentConditionShortRECEP=ரசீது பெற்றவுடன்
+PaymentConditionRECEP=ரசீது பெற்றவுடன்
+PaymentConditionShort30D=30 நாட்கள்
+PaymentCondition30D=30 நாட்கள்
+PaymentConditionShort30DENDMONTH=மாத இறுதியில் 30 நாட்கள்
+PaymentCondition30DENDMONTH=மாத இறுதியில் தொடர்ந்து 30 நாட்களுக்குள்
+PaymentConditionShort60D=60 நாட்கள்
+PaymentCondition60D=60 நாட்கள்
+PaymentConditionShort60DENDMONTH=மாத இறுதியில் 60 நாட்கள்
+PaymentCondition60DENDMONTH=மாத இறுதியில் தொடர்ந்து 60 நாட்களுக்குள்
+PaymentConditionShortPT_DELIVERY=டெலிவரி
+PaymentConditionPT_DELIVERY=விநியோகத்தில்
+PaymentConditionShortPT_ORDER=ஆர்டர்
+PaymentConditionPT_ORDER=வரிசையில்
+PaymentConditionShortPT_5050=50-50
+PaymentConditionPT_5050=50%% முன்கூட்டியே, 50%% டெலிவரி
+PaymentConditionShort10D=10 நாட்கள்
+PaymentCondition10D=10 நாட்கள்
+PaymentConditionShort10DENDMONTH=மாத இறுதியில் 10 நாட்கள்
+PaymentCondition10DENDMONTH=மாத இறுதியில் தொடர்ந்து 10 நாட்களுக்குள்
+PaymentConditionShort14D=14 நாட்கள்
+PaymentCondition14D=14 நாட்கள்
+PaymentConditionShort14DENDMONTH=மாத இறுதியில் 14 நாட்கள்
+PaymentCondition14DENDMONTH=மாத இறுதியில் தொடர்ந்து 14 நாட்களுக்குள்
+FixAmount=நிலையான தொகை - '%s' லேபிளுடன் 1 வரி
+VarAmount=மாறக்கூடிய தொகை (%% tot.)
+VarAmountOneLine=மாறக்கூடிய தொகை (%% tot.) - '%s' லேபிளுடன் 1 வரி
+VarAmountAllLines=மாறக்கூடிய தொகை (%% tot.) - அனைத்து வரிகளும் மூலத்திலிருந்து
+# PaymentType
+PaymentTypeVIR=வங்கி பரிமாற்றம்
+PaymentTypeShortVIR=வங்கி பரிமாற்றம்
+PaymentTypePRE=நேரடி டெபிட் கட்டண ஆர்டர்
+PaymentTypeShortPRE=டெபிட் பேமெண்ட் ஆர்டர்
+PaymentTypeLIQ=பணம்
+PaymentTypeShortLIQ=பணம்
+PaymentTypeCB=கடன் அட்டை
+PaymentTypeShortCB=கடன் அட்டை
+PaymentTypeCHQ=காசோலை
+PaymentTypeShortCHQ=காசோலை
+PaymentTypeTIP=உதவிக்குறிப்பு (கட்டணத்திற்கு எதிரான ஆவணங்கள்)
+PaymentTypeShortTIP=உதவிக்குறிப்பு கட்டணம்
+PaymentTypeVAD=ஆன்லைன் கட்டணம்
+PaymentTypeShortVAD=ஆன்லைன் கட்டணம்
+PaymentTypeTRA=வங்கி வரைவு
+PaymentTypeShortTRA=வரைவு
+PaymentTypeFAC=காரணி
+PaymentTypeShortFAC=காரணி
+PaymentTypeDC=டெபிட்/கிரெடிட் கார்டு
+PaymentTypePP=பேபால்
+BankDetails=வங்கி விவரங்கள்
+BankCode=வங்கி குறியீடு
+DeskCode=கிளை குறியீடு
+BankAccountNumber=கணக்கு எண்
+BankAccountNumberKey=செக்சம்
+Residence=முகவரி
+IBANNumber=IBAN கணக்கு எண்
+IBAN=IBAN
+CustomerIBAN=வாடிக்கையாளரின் IBAN
+SupplierIBAN=விற்பனையாளரின் IBAN
+BIC=BIC/SWIFT
+BICNumber=BIC/SWIFT குறியீடு
+ExtraInfos=கூடுதல் தகவல்கள்
+RegulatedOn=அன்று ஒழுங்குபடுத்தப்பட்டது
+ChequeNumber=N° சரிபார்க்கவும்
+ChequeOrTransferNumber=சரிபார்க்கவும்/பரிமாற்றம் N°
+ChequeBordereau=அட்டவணையை சரிபார்க்கவும்
+ChequeMaker=அனுப்புநரைச் சரிபார்க்கவும்/பரிமாற்றம் செய்யவும்
+ChequeBank=காசோலை வங்கி
+CheckBank=காசோலை
+NetToBePaid=நிகரமாக செலுத்த வேண்டும்
+PhoneNumber=டெல்
+FullPhoneNumber=தொலைபேசி
+TeleFax=தொலைநகல்
+PrettyLittleSentence=நிதி நிர்வாகத்தால் அங்கீகரிக்கப்பட்ட கணக்கியல் சங்கத்தின் உறுப்பினராக எனது பெயரில் வழங்கப்பட்ட காசோலைகள் மூலம் செலுத்த வேண்டிய தொகையை ஏற்கவும்.
+IntracommunityVATNumber=சமூகத்திற்குள் VAT ஐடி
+PaymentByChequeOrderedTo=காசோலை செலுத்துதல்கள் (வரி உட்பட) %s க்கு செலுத்தப்படும், அனுப்பவும்
+PaymentByChequeOrderedToShort=காசோலை கொடுப்பனவுகள் (வரி உட்பட) செலுத்த வேண்டியவை
+SendTo=அனுப்பப்பட்டது
+PaymentByTransferOnThisBankAccount=பின்வரும் வங்கிக் கணக்கிற்கு மாற்றுவதன் மூலம் பணம் செலுத்துதல்
+VATIsNotUsedForInvoice=* CGI இன் பொருந்தாத VAT கலை-293B
+LawApplicationPart1=12/05/80 இன் 80.335 சட்டத்தின் பயன்பாட்டின் மூலம்
+LawApplicationPart2=பொருட்கள் சொத்தாகவே இருக்கும்
+LawApplicationPart3=முழுமையாக செலுத்தும் வரை விற்பனையாளர்
+LawApplicationPart4=அவற்றின் விலை.
+LimitedLiabilityCompanyCapital=மூலதனத்துடன் SARL
+UseLine=விண்ணப்பிக்கவும்
+UseDiscount=தள்ளுபடியைப் பயன்படுத்தவும்
+UseCredit=கடன் பயன்படுத்தவும்
+UseCreditNoteInInvoicePayment=இந்த கிரெடிட்டுடன் செலுத்த வேண்டிய தொகையை குறைக்கவும்
+MenuChequeDeposits=வைப்புகளை சரிபார்க்கவும்
+MenuCheques=காசோலைகள்
+MenuChequesReceipts=ரசீதுகளைச் சரிபார்க்கவும்
+NewChequeDeposit=புதிய வைப்பு
+ChequesReceipts=ரசீதுகளைச் சரிபார்க்கவும்
+ChequesArea=டெபாசிட் பகுதியை சரிபார்க்கவும்
+ChequeDeposits=வைப்புகளை சரிபார்க்கவும்
+Cheques=காசோலைகள்
+DepositId=அடையாள வைப்பு
+NbCheque=காசோலைகளின் எண்ணிக்கை
+CreditNoteConvertedIntoDiscount=இந்த %s %s ஆக மாற்றப்பட்டது
+UsBillingContactAsIncoiveRecipientIfExist=விலைப்பட்டியல் பெறுநராக மூன்றாம் தரப்பு முகவரிக்குப் பதிலாக 'பில்லிங் தொடர்பு' வகையுடன் தொடர்பு/முகவரியைப் பயன்படுத்தவும்
+ShowUnpaidAll=செலுத்தப்படாத அனைத்து இன்வாய்ஸ்களையும் காட்டு
+ShowUnpaidLateOnly=தாமதமாக செலுத்தப்படாத இன்வாய்ஸ்களை மட்டும் காட்டு
+PaymentInvoiceRef=கட்டண விலைப்பட்டியல் %s
+ValidateInvoice=விலைப்பட்டியல் சரிபார்க்கவும்
+ValidateInvoices=இன்வாய்ஸ்களை சரிபார்க்கவும்
+Cash=பணம்
+Reported=தாமதமாக
+DisabledBecausePayments=சில கொடுப்பனவுகள் இருப்பதால் சாத்தியமில்லை
+CantRemovePaymentWithOneInvoicePaid=குறைந்தபட்சம் ஒரு விலைப்பட்டியல் கட்டணம் செலுத்தப்பட்டிருப்பதால், கட்டணத்தை அகற்ற முடியாது
+CantRemovePaymentVATPaid=VAT அறிவிப்பு பணம் செலுத்தியதாக வகைப்படுத்தப்பட்டுள்ளதால், கட்டணத்தை அகற்ற முடியாது
+CantRemovePaymentSalaryPaid=சம்பளம் வகைப்படுத்தப்பட்டதால், கட்டணத்தை நீக்க முடியாது
+ExpectedToPay=எதிர்பார்த்த பணம்
+CantRemoveConciliatedPayment=சீரான கட்டணத்தை அகற்ற முடியாது
+PayedByThisPayment=இந்த கட்டணத்தின் மூலம் செலுத்தப்பட்டது
+ClosePaidInvoicesAutomatically=கட்டணம் முழுவதுமாக முடிந்தவுடன், அனைத்து நிலையான, முன்பணம் அல்லது மாற்று இன்வாய்ஸ்களையும் "பணம் செலுத்தியது" என தானாகவே வகைப்படுத்தவும்.
+ClosePaidCreditNotesAutomatically=பணத்தைத் திரும்பப்பெறும் போது தானாகவே அனைத்து கடன் குறிப்புகளையும் "பணம்" என வகைப்படுத்தவும்.
+ClosePaidContributionsAutomatically=பணம் முழுவதுமாக முடிந்தவுடன், அனைத்து சமூக அல்லது நிதி பங்களிப்புகளையும் தானாகவே "பணம்" என வகைப்படுத்தவும்.
+ClosePaidVATAutomatically=பணம் முழுவதுமாக முடிந்தவுடன் தானாகவே VAT அறிவிப்பை "பணம் செலுத்தப்பட்டது" என வகைப்படுத்தவும்.
+ClosePaidSalaryAutomatically=கட்டணம் முழுவதுமாகச் செலுத்தப்படும்போது, தானாகவே சம்பளத்தை "பணம்" என வகைப்படுத்தவும்.
+AllCompletelyPayedInvoiceWillBeClosed=பணம் செலுத்த மீதி இல்லாத அனைத்து இன்வாய்ஸ்களும் "பணம் செலுத்தப்பட்டது" என்ற நிலையில் தானாகவே மூடப்படும்.
+ToMakePayment=செலுத்து
+ToMakePaymentBack=திருப்பி செலுத்து
+ListOfYourUnpaidInvoices=செலுத்தப்படாத இன்வாய்ஸ்களின் பட்டியல்
+NoteListOfYourUnpaidInvoices=குறிப்பு: இந்தப் பட்டியலில் நீங்கள் விற்பனைப் பிரதிநிதியாக இணைக்கப்பட்டுள்ள மூன்றாம் தரப்பினருக்கான இன்வாய்ஸ்கள் மட்டுமே உள்ளன.
+RevenueStamp=வரி முத்திரை
+YouMustCreateInvoiceFromThird=மூன்றாம் தரப்பினரின் "வாடிக்கையாளர்" தாவலில் இருந்து விலைப்பட்டியல் உருவாக்கும் போது மட்டுமே இந்த விருப்பம் கிடைக்கும்
+YouMustCreateInvoiceFromSupplierThird=மூன்றாம் தரப்பினரின் "விற்பனையாளர்" தாவலில் இருந்து விலைப்பட்டியல் உருவாக்கும் போது மட்டுமே இந்த விருப்பம் கிடைக்கும்
+YouMustCreateStandardInvoiceFirstDesc=புதிய டெம்ப்ளேட் விலைப்பட்டியலை உருவாக்க, நீங்கள் முதலில் ஒரு நிலையான விலைப்பட்டியலை உருவாக்கி அதை "டெம்ப்ளேட்" ஆக மாற்ற வேண்டும்.
+PDFCrabeDescription=விலைப்பட்டியல் PDF டெம்ப்ளேட் க்ரேப். ஒரு முழுமையான விலைப்பட்டியல் டெம்ப்ளேட் (கடற்பாசி டெம்ப்ளேட்டின் பழைய செயலாக்கம்)
+PDFSpongeDescription=விலைப்பட்டியல் PDF டெம்ப்ளேட் கடற்பாசி. ஒரு முழுமையான விலைப்பட்டியல் டெம்ப்ளேட்
+PDFCrevetteDescription=விலைப்பட்டியல் PDF டெம்ப்ளேட் Crevette. சூழ்நிலை இன்வாய்ஸ்களுக்கான முழுமையான விலைப்பட்டியல் டெம்ப்ளேட்
+TerreNumRefModelDesc1=நிலையான விலைப்பட்டியல்களுக்கு %syymm-nnnn என்ற வடிவமைப்பிலும், கிரெடிட் குறிப்புகளுக்கு %syymm-nnnn என்ற வடிவத்திலும், yy ஆண்டு, mm என்பது மாதம் மற்றும் nnnn என்பது இடைவேளையின்றி மற்றும் 0க்கு திரும்பாத வரிசைமுறை தானியங்கு-அதிகரிப்பு எண்ணாகும்.
+MarsNumRefModelDesc1=நிலையான விலைப்பட்டியல்களுக்கு %syymm-nnnn என்ற வடிவத்தில் எண்ணை வழங்கவும், மாற்று விலைப்பட்டியல்களுக்கு %syymm-nnnn, முன்பணம் செலுத்தும் விலைப்பட்டியல்களுக்கு %syymm-nnnn மற்றும் %syymm-nnnn என்ற வடிவத்தில் கடன் எண். இடைவெளி இல்லாமல் மற்றும் 0க்கு திரும்பாமல்
+TerreNumRefModelError=$syymm உடன் தொடங்கும் பில் ஏற்கனவே உள்ளது மற்றும் இந்த மாதிரி வரிசையுடன் இணங்கவில்லை. இந்த தொகுதியை செயல்படுத்த அதை அகற்றவும் அல்லது மறுபெயரிடவும்.
+CactusNumRefModelDesc1=நிலையான விலைப்பட்டியல்களுக்கு %syymm-nnnn என்ற வடிவத்தில் எண்ணையும், கிரெடிட் குறிப்புகளுக்கு %syymm-nnnn மற்றும் முன்பணம் செலுத்தும் விலைப்பட்டியல்களுக்கு %syymm-nnnn வடிவத்திலும், yy ஆண்டு, மிமீ என்பது ஒரு மாதத்திற்குத் தானாகத் திரும்பப்பெறும் எண் மற்றும் வரிசை எண் இல்லை 0
+EarlyClosingReason=ஆரம்பகால மூடல் காரணம்
+EarlyClosingComment=ஆரம்ப இறுதிக் குறிப்பு
+##### Types de contacts #####
+TypeContact_facture_internal_SALESREPFOLL=பிரதிநிதி பின்தொடர்தல் வாடிக்கையாளர் விலைப்பட்டியல்
+TypeContact_facture_external_BILLING=வாடிக்கையாளர் இன்வாய்ஸ் தொடர்பு
+TypeContact_facture_external_SHIPPING=வாடிக்கையாளர் கப்பல் தொடர்பு
+TypeContact_facture_external_SERVICE=வாடிக்கையாளர் சேவை தொடர்பு
+TypeContact_invoice_supplier_internal_SALESREPFOLL=பிரதிநிதி பின்தொடர்தல் விற்பனையாளர் விலைப்பட்டியல்
+TypeContact_invoice_supplier_external_BILLING=விற்பனையாளர் விலைப்பட்டியல் தொடர்பு
+TypeContact_invoice_supplier_external_SHIPPING=விற்பனையாளர் கப்பல் தொடர்பு
+TypeContact_invoice_supplier_external_SERVICE=விற்பனையாளர் சேவை தொடர்பு
+# Situation invoices
+InvoiceFirstSituationAsk=முதல் சூழ்நிலை விலைப்பட்டியல்
+InvoiceFirstSituationDesc=<b> சூழ்நிலை விலைப்பட்டியல்கள் </b> ஒரு முன்னேற்றம் தொடர்பான சூழ்நிலைகளுடன் இணைக்கப்பட்டுள்ளது, எடுத்துக்காட்டாக ஒரு கட்டுமானத்தின் முன்னேற்றம். ஒவ்வொரு சூழ்நிலையும் ஒரு விலைப்பட்டியலுடன் இணைக்கப்பட்டுள்ளது.
+InvoiceSituation=சூழ்நிலை விலைப்பட்டியல்
+PDFInvoiceSituation=சூழ்நிலை விலைப்பட்டியல்
+InvoiceSituationAsk=நிலைமையைப் பின்பற்றி விலைப்பட்டியல்
+InvoiceSituationDesc=ஏற்கனவே உள்ளதைத் தொடர்ந்து புதிய சூழ்நிலையை உருவாக்கவும்
+SituationAmount=சூழ்நிலை விலைப்பட்டியல் தொகை (நிகரம்)
+SituationDeduction=சூழ்நிலை கழித்தல்
+ModifyAllLines=அனைத்து வரிகளையும் மாற்றவும்
+CreateNextSituationInvoice=அடுத்த சூழ்நிலையை உருவாக்குங்கள்
+ErrorFindNextSituationInvoice=அடுத்த சூழ்நிலை சுழற்சி ரெஃபரைக் கண்டறிய முடியவில்லை
+ErrorOutingSituationInvoiceOnUpdate=இந்த சூழ்நிலை இன்வாய்ஸை வெளியேற்ற முடியவில்லை.
+ErrorOutingSituationInvoiceCreditNote=இணைக்கப்பட்ட கிரெடிட் நோட்டை வெளியேற்ற முடியவில்லை.
+NotLastInCycle=இந்த விலைப்பட்டியல் சுழற்சியில் சமீபத்தியது அல்ல மேலும் மாற்றப்படக்கூடாது.
+DisabledBecauseNotLastInCycle=அடுத்த சூழ்நிலை ஏற்கனவே உள்ளது.
+DisabledBecauseFinal=இந்த நிலைமை இறுதியானது.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=எஸ்
+CantBeLessThanMinPercent=முந்தைய சூழ்நிலையில் அதன் மதிப்பை விட முன்னேற்றம் சிறியதாக இருக்க முடியாது.
+NoSituations=திறந்த சூழ்நிலைகள் இல்லை
+InvoiceSituationLast=இறுதி மற்றும் பொது விலைப்பட்டியல்
+PDFCrevetteSituationNumber=நிலைமை N°%s
+PDFCrevetteSituationInvoiceLineDecompte=சூழ்நிலை விலைப்பட்டியல் - COUNT
+PDFCrevetteSituationInvoiceTitle=சூழ்நிலை விலைப்பட்டியல்
+PDFCrevetteSituationInvoiceLine=சூழ்நிலை N°%s: Inv. N°%s on %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=யூனிட் விலை x Qty - தள்ளுபடி
+CustomersInvoicesArea=வாடிக்கையாளர் பில்லிங் பகுதி
+SupplierInvoicesArea=சப்ளையர் பில்லிங் பகுதி
+FacParentLine=விலைப்பட்டியல் வரி பெற்றோர்
+SituationTotalRayToRest=மீதியை வரி இல்லாமல் செலுத்த வேண்டும்
+PDFSituationTitle=நிலைமை n° %d
+SituationTotalProgress=மொத்த முன்னேற்றம் %d %%
+SearchUnpaidInvoicesWithDueDate=செலுத்தப்படாத இன்வாய்ஸ்களை நிலுவைத் தேதியுடன் தேடவும் = %s
+NoPaymentAvailable=%s க்கு கட்டணம் இல்லை
+PaymentRegisteredAndInvoiceSetToPaid=கட்டணம் பதிவுசெய்யப்பட்டது மற்றும் விலைப்பட்டியல் %s செலுத்தப்பட்டது
+SendEmailsRemindersOnInvoiceDueDate=செலுத்தப்படாத இன்வாய்ஸ்களுக்கு மின்னஞ்சல் மூலம் நினைவூட்டல் அனுப்பவும்
diff --git a/htdocs/langs/ta_IN/blockedlog.lang b/htdocs/langs/ta_IN/blockedlog.lang
new file mode 100644
index 00000000000..9641c84e0b9
--- /dev/null
+++ b/htdocs/langs/ta_IN/blockedlog.lang
@@ -0,0 +1,57 @@
+BlockedLog=மாற்ற முடியாத பதிவுகள்
+Field=களம்
+BlockedLogDesc=இந்த தொகுதி சில நிகழ்வுகளை மாற்ற முடியாத பதிவாக (ஒருமுறை பதிவு செய்தவுடன் மாற்ற முடியாது) ப்ளாக் செயினில், உண்மையான நேரத்தில் கண்காணிக்கிறது. இந்த தொகுதி சில நாடுகளின் சட்டங்களின் தேவைகளுடன் பொருந்தக்கூடிய தன்மையை வழங்குகிறது (ஃபிரான்ஸ் சட்டத்துடன் கூடிய நிதி 2016 - நார்ம் 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, ஐடி %s) இணைக்கப்படவில்லை (மாற்ற முடியாத சேமித்த தரவைப் பெற 'முழு தரவு' நெடுவரிசையைப் பார்க்கவும்)
+BlockedLogAreRequiredByYourCountryLegislation=உங்கள் நாட்டின் சட்டத்தின்படி மாற்ற முடியாத பதிவுகள் தொகுதி தேவைப்படலாம். இந்தத் தொகுதியை முடக்கினால், எதிர்காலத்தில் நடக்கும் பரிவர்த்தனைகள், சட்டப்பூர்வ மென்பொருளின் பயன்பாடு மற்றும் வரித் தணிக்கை மூலம் சரிபார்க்க முடியாததால் அவை செல்லுபடியாகாது.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=உங்கள் நாட்டின் சட்டத்தின் காரணமாக மாற்ற முடியாத பதிவுகள் தொகுதி செயல்படுத்தப்பட்டது. இந்தத் தொகுதியை முடக்கினால், எதிர்காலத்தில் நடக்கும் பரிவர்த்தனைகள் சட்டத்தின்படியும் சட்டப்பூர்வ மென்பொருளைப் பயன்படுத்தும்போதும் அவை செல்லுபடியாகாது.
+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/bookmarks.lang b/htdocs/langs/ta_IN/bookmarks.lang
new file mode 100644
index 00000000000..3218904762b
--- /dev/null
+++ b/htdocs/langs/ta_IN/bookmarks.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - marque pages
+AddThisPageToBookmarks=புக்மார்க்குகளில் தற்போதைய பக்கத்தைச் சேர்க்கவும்
+Bookmark=புத்தககுறி
+Bookmarks=புக்மார்க்குகள்
+ListOfBookmarks=புக்மார்க்குகளின் பட்டியல்
+EditBookmarks=புக்மார்க்குகளை பட்டியல்/திருத்து
+NewBookmark=புதிய புக்மார்க்
+ShowBookmark=புக்மார்க்கைக் காட்டு
+OpenANewWindow=புதிய தாவலைத் திறக்கவும்
+ReplaceWindow=தற்போதைய தாவலை மாற்றவும்
+BookmarkTargetNewWindowShort=புதிய தாவலில்
+BookmarkTargetReplaceWindowShort=தற்போதைய தாவல்
+BookmarkTitle=புக்மார்க் பெயர்
+UrlOrLink=URL
+BehaviourOnClick=புக்மார்க் URL தேர்ந்தெடுக்கப்படும் போது நடத்தை
+CreateBookmark=புக்மார்க்கை உருவாக்கவும்
+SetHereATitleForLink=புக்மார்க்கிற்கு ஒரு பெயரை அமைக்கவும்
+UseAnExternalHttpLinkOrRelativeDolibarrLink=வெளிப்புற/முழு இணைப்பு (https://externalurl.com) அல்லது உள்/உறவினர் இணைப்பை (/mypage.php) பயன்படுத்தவும். நீங்கள் தொலைபேசி: 0123456 போன்ற தொலைபேசியையும் பயன்படுத்தலாம்.
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=இணைக்கப்பட்ட பக்கம் தற்போதைய தாவலில் திறக்க வேண்டுமா அல்லது புதிய தாவலில் திறக்க வேண்டுமா என்பதைத் தேர்வுசெய்யவும்
+BookmarksManagement=புக்மார்க்ஸ் மேலாண்மை
+BookmarksMenuShortCut=Ctrl + shift + m
+NoBookmarks=புக்மார்க்குகள் எதுவும் வரையறுக்கப்படவில்லை
diff --git a/htdocs/langs/ta_IN/boxes.lang b/htdocs/langs/ta_IN/boxes.lang
new file mode 100644
index 00000000000..1205e27edfe
--- /dev/null
+++ b/htdocs/langs/ta_IN/boxes.lang
@@ -0,0 +1,120 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=தரவுத்தளத்தில் உள்ள முக்கிய வணிகப் பொருட்களின் புள்ளிவிவரங்கள்
+BoxLoginInformation=உள்நுழைவு தகவல்
+BoxLastRssInfos=ஆர்எஸ்எஸ் தகவல்
+BoxLastProducts=சமீபத்திய %s தயாரிப்புகள்/சேவைகள்
+BoxProductsAlertStock=தயாரிப்புகளுக்கான பங்கு எச்சரிக்கைகள்
+BoxLastProductsInContract=சமீபத்திய %s ஒப்பந்தம் செய்யப்பட்ட தயாரிப்புகள்/சேவைகள்
+BoxLastSupplierBills=சமீபத்திய விற்பனையாளர் இன்வாய்ஸ்கள்
+BoxLastCustomerBills=சமீபத்திய வாடிக்கையாளர் இன்வாய்ஸ்கள்
+BoxOldestUnpaidCustomerBills=பழைய பணம் செலுத்தப்படாத வாடிக்கையாளர் இன்வாய்ஸ்கள்
+BoxOldestUnpaidSupplierBills=செலுத்தப்படாத பழைய விற்பனையாளர் இன்வாய்ஸ்கள்
+BoxLastProposals=சமீபத்திய வணிக முன்மொழிவுகள்
+BoxLastProspects=சமீபத்திய மாற்றியமைக்கப்பட்ட வாய்ப்புகள்
+BoxLastCustomers=சமீபத்திய மாற்றியமைக்கப்பட்ட வாடிக்கையாளர்கள்
+BoxLastSuppliers=சமீபத்திய மாற்றியமைக்கப்பட்ட சப்ளையர்கள்
+BoxLastCustomerOrders=சமீபத்திய விற்பனை ஆர்டர்கள்
+BoxLastActions=சமீபத்திய செயல்கள்
+BoxLastContracts=சமீபத்திய ஒப்பந்தங்கள்
+BoxLastContacts=சமீபத்திய தொடர்புகள்/முகவரிகள்
+BoxLastMembers=சமீபத்திய உறுப்பினர்கள்
+BoxLastModifiedMembers=சமீபத்திய திருத்தப்பட்ட உறுப்பினர்கள்
+BoxLastMembersSubscriptions=சமீபத்திய உறுப்பினர் சந்தாக்கள்
+BoxFicheInter=சமீபத்திய தலையீடுகள்
+BoxCurrentAccounts=கணக்கு இருப்பைத் திறக்கவும்
+BoxTitleMemberNextBirthdays=இந்த மாதத்தின் பிறந்தநாள் (உறுப்பினர்கள்)
+BoxTitleMembersByType=வகை வாரியாக உறுப்பினர்கள்
+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=சமீபத்திய %s செலவு அறிக்கைகள் மாற்றப்பட்டன
+BoxTitleLatestModifiedBoms=சமீபத்திய %s BOMகள் மாற்றப்பட்டன
+BoxTitleLatestModifiedMos=மாற்றியமைக்கப்பட்ட சமீபத்திய %s உற்பத்தி ஆர்டர்கள்
+BoxTitleLastOutstandingBillReached=அதிகபட்ச நிலுவைத் தொகையைக் கொண்ட வாடிக்கையாளர்கள்
+BoxGlobalActivity=உலகளாவிய செயல்பாடு (இன்வாய்ஸ்கள், முன்மொழிவுகள், ஆர்டர்கள்)
+BoxGoodCustomers=நல்ல வாடிக்கையாளர்கள்
+BoxTitleGoodCustomers=%s நல்ல வாடிக்கையாளர்கள்
+BoxScheduledJobs=திட்டமிடப்பட்ட வேலைகள்
+BoxTitleFunnelOfProspection=ஈய புனல்
+FailedToRefreshDataInfoNotUpToDate=RSS ஃப்ளக்ஸைப் புதுப்பிக்க முடியவில்லை. சமீபத்திய வெற்றிகரமான புதுப்பிப்பு தேதி: %s
+LastRefreshDate=சமீபத்திய புதுப்பிப்பு தேதி
+NoRecordedBookmarks=புக்மார்க்குகள் எதுவும் வரையறுக்கப்படவில்லை.
+ClickToAdd=சேர்க்க இங்கே கிளிக் செய்யவும்.
+NoRecordedCustomers=பதிவுசெய்யப்பட்ட வாடிக்கையாளர்கள் இல்லை
+NoRecordedContacts=பதிவுசெய்யப்பட்ட தொடர்புகள் இல்லை
+NoActionsToDo=செய்ய எந்த நடவடிக்கையும் இல்லை
+NoRecordedOrders=பதிவு செய்யப்பட்ட விற்பனை ஆர்டர்கள் இல்லை
+NoRecordedProposals=பதிவு செய்யப்பட்ட முன்மொழிவுகள் இல்லை
+NoRecordedInvoices=பதிவுசெய்யப்பட்ட வாடிக்கையாளர் இன்வாய்ஸ்கள் இல்லை
+NoUnpaidCustomerBills=செலுத்தப்படாத வாடிக்கையாளர் இன்வாய்ஸ்கள் இல்லை
+NoUnpaidSupplierBills=செலுத்தப்படாத விற்பனையாளர் இன்வாய்ஸ்கள் இல்லை
+NoModifiedSupplierBills=பதிவுசெய்யப்பட்ட விற்பனையாளர் இன்வாய்ஸ்கள் இல்லை
+NoRecordedProducts=பதிவுசெய்யப்பட்ட தயாரிப்புகள்/சேவைகள் இல்லை
+NoRecordedProspects=பதிவுசெய்யப்பட்ட வாய்ப்புகள் இல்லை
+NoContractedProducts=தயாரிப்புகள்/சேவைகள் எதுவும் ஒப்பந்தம் செய்யப்படவில்லை
+NoRecordedContracts=பதிவுசெய்யப்பட்ட ஒப்பந்தங்கள் இல்லை
+NoRecordedInterventions=பதிவுசெய்யப்பட்ட தலையீடுகள் இல்லை
+BoxLatestSupplierOrders=சமீபத்திய கொள்முதல் ஆர்டர்கள்
+BoxLatestSupplierOrdersAwaitingReception=சமீபத்திய கொள்முதல் ஆர்டர்கள் (நிலுவையில் உள்ள வரவேற்புடன்)
+NoSupplierOrder=பதிவுசெய்யப்பட்ட கொள்முதல் ஆர்டர் இல்லை
+BoxCustomersInvoicesPerMonth=மாதத்திற்கு வாடிக்கையாளர் இன்வாய்ஸ்கள்
+BoxSuppliersInvoicesPerMonth=மாதத்திற்கு விற்பனையாளர் இன்வாய்ஸ்கள்
+BoxCustomersOrdersPerMonth=மாதத்திற்கு விற்பனை ஆர்டர்கள்
+BoxSuppliersOrdersPerMonth=மாதத்திற்கு விற்பனையாளர் ஆர்டர்கள்
+BoxProposalsPerMonth=மாதத்திற்கு முன்மொழிவுகள்
+NoTooLowStockProducts=எந்த தயாரிப்புகளும் குறைந்த இருப்பு வரம்பிற்கு கீழ் இல்லை
+BoxProductDistribution=தயாரிப்புகள்/சேவைகள் விநியோகம்
+ForObject=%s இல்
+BoxTitleLastModifiedSupplierBills=விற்பனையாளர் இன்வாய்ஸ்கள்: கடைசியாக %s மாற்றப்பட்டது
+BoxTitleLatestModifiedSupplierOrders=விற்பனையாளர் ஆர்டர்கள்: கடைசியாக %s மாற்றப்பட்டது
+BoxTitleLastModifiedCustomerBills=வாடிக்கையாளர் இன்வாய்ஸ்கள்: கடைசியாக %s மாற்றப்பட்டது
+BoxTitleLastModifiedCustomerOrders=விற்பனை ஆர்டர்கள்: கடைசியாக %s மாற்றப்பட்டது
+BoxTitleLastModifiedPropals=சமீபத்திய %s திருத்தப்பட்ட முன்மொழிவுகள்
+BoxTitleLatestModifiedJobPositions=சமீபத்திய %s மாற்றியமைக்கப்பட்ட வேலை நிலைகள்
+BoxTitleLatestModifiedCandidatures=சமீபத்திய %s மாற்றியமைக்கப்பட்ட வேலை விண்ணப்பங்கள்
+ForCustomersInvoices=வாடிக்கையாளர்கள் இன்வாய்ஸ்கள்
+ForCustomersOrders=வாடிக்கையாளர்கள் ஆர்டர்கள்
+ForProposals=முன்மொழிவுகள்
+LastXMonthRolling=சமீபத்திய %s மாத ரோலிங்
+ChooseBoxToAdd=உங்கள் டாஷ்போர்டில் விட்ஜெட்டைச் சேர்க்கவும்
+BoxAdded=உங்கள் டாஷ்போர்டில் விட்ஜெட் சேர்க்கப்பட்டது
+BoxTitleUserBirthdaysOfMonth=இந்த மாதத்தின் பிறந்தநாள் (பயனர்கள்)
+BoxLastManualEntries=கணக்கியலில் சமீபத்திய பதிவு கைமுறையாக அல்லது மூல ஆவணம் இல்லாமல் உள்ளிடப்பட்டுள்ளது
+BoxTitleLastManualEntries=%s சமீபத்திய பதிவு கைமுறையாக அல்லது மூல ஆவணம் இல்லாமல் உள்ளிடப்பட்டது
+NoRecordedManualEntries=கணக்கியலில் கையேடு பதிவுகள் இல்லை
+BoxSuspenseAccount=சஸ்பென்ஸ் கணக்குடன் கணக்கியல் செயல்பாட்டை எண்ணுங்கள்
+BoxTitleSuspenseAccount=ஒதுக்கப்படாத வரிகளின் எண்ணிக்கை
+NumberOfLinesInSuspenseAccount=சஸ்பென்ஸ் கணக்கில் உள்ள வரியின் எண்ணிக்கை
+SuspenseAccountNotDefined=சஸ்பென்ஸ் கணக்கு வரையறுக்கப்படவில்லை
+BoxLastCustomerShipments=கடைசி வாடிக்கையாளர் ஏற்றுமதி
+BoxTitleLastCustomerShipments=சமீபத்திய %s வாடிக்கையாளர் ஏற்றுமதிகள்
+NoRecordedShipments=பதிவுசெய்யப்பட்ட வாடிக்கையாளர் ஏற்றுமதி இல்லை
+BoxCustomersOutstandingBillReached=நிலுவை வரம்பை அடைந்த வாடிக்கையாளர்கள்
+# Pages
+UsersHome=வீட்டு பயனர்கள் மற்றும் குழுக்கள்
+MembersHome=வீட்டு உறுப்பினர்
+ThirdpartiesHome=முகப்பு மூன்றாம் தரப்பினர்
+TicketsHome=வீட்டு டிக்கெட்டுகள்
+AccountancyHome=வீட்டு கணக்கியல்
+ValidatedProjects=சரிபார்க்கப்பட்ட திட்டங்கள்
diff --git a/htdocs/langs/ta_IN/cashdesk.lang b/htdocs/langs/ta_IN/cashdesk.lang
new file mode 100644
index 00000000000..79d9b4a853d
--- /dev/null
+++ b/htdocs/langs/ta_IN/cashdesk.lang
@@ -0,0 +1,136 @@
+# Language file - Source file is en_US - cashdesk
+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=இந்த விற்பனைக்கு VAT இல்லை
+Change=அதிகமாக பெறப்பட்டது
+BankToPay=பணம் செலுத்துவதற்கான கணக்கு
+ShowCompany=நிறுவனத்தைக் காட்டு
+ShowStock=கிடங்கைக் காட்டு
+DeleteArticle=இந்தக் கட்டுரையை அகற்ற கிளிக் செய்யவும்
+FilterRefOrLabelOrBC=தேடல் (குறிப்பு/லேபிள்)
+UserNeedPermissionToEditStockToUsePos=விலைப்பட்டியல் உருவாக்கத்தில் இருப்பைக் குறைக்குமாறு நீங்கள் கேட்கிறீர்கள், எனவே POS ஐப் பயன்படுத்தும் பயனர் பங்குகளைத் திருத்துவதற்கு அனுமதி பெற வேண்டும்.
+DolibarrReceiptPrinter=டோலிபார் ரசீது அச்சுப்பொறி
+PointOfSale=விற்பனை செய்யும் இடம்
+PointOfSaleShort=பிஓஎஸ்
+CloseBill=பில் மூடு
+Floors=மாடிகள்
+Floor=தரை
+AddTable=அட்டவணையைச் சேர்க்கவும்
+Place=இடம்
+TakeposConnectorNecesary='TakePOS கனெக்டர்' தேவை
+OrderPrinters=கொடுக்கப்பட்ட சில அச்சுப்பொறிகளுக்குக் கட்டணம் செலுத்தாமல் ஆர்டரை அனுப்ப பொத்தானைச் சேர்க்கவும் (உதாரணமாக சமையலறைக்கு ஆர்டரை அனுப்ப)
+NotAvailableWithBrowserPrinter=ரசீதுக்கான அச்சுப்பொறி உலாவியில் அமைக்கப்படும் போது கிடைக்காது
+SearchProduct=தேடல் தயாரிப்பு
+Receipt=ரசீது
+Header=தலைப்பு
+Footer=அடிக்குறிப்பு
+AmountAtEndOfPeriod=காலத்தின் முடிவில் தொகை (நாள், மாதம் அல்லது ஆண்டு)
+TheoricalAmount=தத்துவார்த்த அளவு
+RealAmount=உண்மையான தொகை
+CashFence=பண மேசை மூடல்
+CashFenceDone=காலத்திற்கான பண மேசையை மூடுவது
+NbOfInvoices=இன்வாய்ஸ்களின் Nb
+Paymentnumpad=கட்டணத்தை உள்ளிட பேட் வகை
+Numberspad=எண்கள் பேட்
+BillsCoinsPad=நாணயங்கள் மற்றும் ரூபாய் நோட்டுகள் பேட்
+DolistorePosCategory=Dolibarr க்கான TakePOS தொகுதிகள் மற்றும் பிற POS தீர்வுகள்
+TakeposNeedsCategories=TakePOS வேலை செய்ய குறைந்தது ஒரு தயாரிப்பு வகையாவது தேவை
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS வேலை செய்ய, <b> %s </b> வகையின் கீழ் குறைந்தது 1 தயாரிப்பு வகை தேவை
+OrderNotes=ஆர்டர் செய்யப்பட்ட ஒவ்வொரு பொருட்களுக்கும் சில குறிப்புகளைச் சேர்க்கலாம்
+CashDeskBankAccountFor=பணம் செலுத்துவதற்குப் பயன்படுத்த வேண்டிய இயல்புநிலை கணக்கு
+NoPaimementModesDefined=TakePOS உள்ளமைவில் எந்த கட்டண முறையும் வரையறுக்கப்படவில்லை
+TicketVatGrouped=டிக்கெட்டுகள்|ரசீதுகளில் உள்ள விகிதத்தின்படி VATஐக் குழுவாக்கவும்
+AutoPrintTickets=டிக்கெட்டுகள்|ரசீதுகளை தானாக அச்சிடுங்கள்
+PrintCustomerOnReceipts=டிக்கெட்டுகள்|ரசீதுகளில் வாடிக்கையாளரை அச்சிடுங்கள்
+EnableBarOrRestaurantFeatures=பார் அல்லது உணவகத்திற்கான அம்சங்களை இயக்கவும்
+ConfirmDeletionOfThisPOSSale=இந்த தற்போதைய விற்பனையை நீக்குவதை உறுதிப்படுத்துகிறீர்களா?
+ConfirmDiscardOfThisPOSSale=இந்த தற்போதைய விற்பனையை நிராகரிக்க விரும்புகிறீர்களா?
+History=வரலாறு
+ValidateAndClose=சரிபார்த்து மூடவும்
+Terminal=முனையத்தில்
+NumberOfTerminals=டெர்மினல்களின் எண்ணிக்கை
+TerminalSelect=நீங்கள் பயன்படுத்த விரும்பும் முனையத்தைத் தேர்ந்தெடுக்கவும்:
+POSTicket=பிஓஎஸ் டிக்கெட்
+POSTerminal=பிஓஎஸ் டெர்மினல்
+POSModule=பிஓஎஸ் தொகுதி
+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=POS ஐ திறக்கும் போது "Control cash" பாப்அப்பைத் திறக்கவும்
+CloseCashFence=பண மேசை கட்டுப்பாட்டை மூடு
+CashReport=பண அறிக்கை
+MainPrinterToUse=பயன்படுத்த வேண்டிய முக்கிய அச்சுப்பொறி
+OrderPrinterToUse=அச்சுப்பொறியைப் பயன்படுத்த ஆர்டர் செய்யவும்
+MainTemplateToUse=பயன்படுத்த வேண்டிய முக்கிய டெம்ப்ளேட்
+OrderTemplateToUse=பயன்படுத்த ஆர்டர் டெம்ப்ளேட்
+BarRestaurant=பார் உணவகம்
+AutoOrder=வாடிக்கையாளரால் ஆர்டர் செய்யுங்கள்
+RestaurantMenu=பட்டியல்
+CustomerMenu=வாடிக்கையாளர் மெனு
+ScanToMenu=மெனுவைப் பார்க்க QR குறியீட்டை ஸ்கேன் செய்யவும்
+ScanToOrder=ஆர்டர் செய்ய QR குறியீட்டை ஸ்கேன் செய்யவும்
+Appearance=தோற்றம்
+HideCategoryImages=வகைப் படங்களை மறை
+HideProductImages=தயாரிப்பு படங்களை மறை
+NumberOfLinesToShow=காட்ட வேண்டிய படங்களின் வரிகளின் எண்ணிக்கை
+DefineTablePlan=அட்டவணை திட்டத்தை வரையறுக்கவும்
+GiftReceiptButton="பரிசு ரசீது" பொத்தானைச் சேர்க்கவும்
+GiftReceipt=பரிசு ரசீது
+ModuleReceiptPrinterMustBeEnabled=மாட்யூல் ரசீது பிரிண்டர் முதலில் இயக்கப்பட்டிருக்க வேண்டும்
+AllowDelayedPayment=தாமதமாக பணம் செலுத்த அனுமதிக்கவும்
+PrintPaymentMethodOnReceipts=டிக்கெட்டுகள்|ரசீதுகளில் கட்டண முறையை அச்சிடுங்கள்
+WeighingScale=எடை அளவு
+ShowPriceHT = வரியைத் தவிர்த்து விலையுடன் நெடுவரிசையைக் காட்டவும் (திரையில்)
+ShowPriceHTOnReceipt = வரியைத் தவிர்த்து விலையுடன் நெடுவரிசையைக் காட்டவும் (ரசீதில்)
+CustomerDisplay=வாடிக்கையாளர் காட்சி
+SplitSale=பிரித்து விற்பனை
+PrintWithoutDetailsButton="விவரங்கள் இல்லாமல் அச்சிடு" பொத்தானைச் சேர்க்கவும்
+PrintWithoutDetailsLabelDefault=விவரங்கள் இல்லாமல் அச்சிடும்போது இயல்பாக வரி லேபிள்
+PrintWithoutDetails=விவரங்கள் இல்லாமல் அச்சிடவும்
+YearNotDefined=ஆண்டு வரையறுக்கப்படவில்லை
diff --git a/htdocs/langs/ta_IN/categories.lang b/htdocs/langs/ta_IN/categories.lang
new file mode 100644
index 00000000000..3edacdba443
--- /dev/null
+++ b/htdocs/langs/ta_IN/categories.lang
@@ -0,0 +1,100 @@
+# Dolibarr language file - Source file is en_US - 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=இந்த ref உடன் இந்த வகை ஏற்கனவே உள்ளது
+ContentsVisibleByAllShort=அனைவருக்கும் தெரியும் உள்ளடக்கம்
+ContentsNotVisibleByAllShort=எல்லாராலும் பார்க்க முடியாத உள்ளடக்கம்
+DeleteCategory=குறிச்சொல்/வகையை நீக்கு
+ConfirmDeleteCategory=இந்தக் குறிச்சொல்/வகையை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+NoCategoriesDefined=குறிச்சொல்/வகை வரையறுக்கப்படவில்லை
+SuppliersCategoryShort=விற்பனையாளர்கள் குறிச்சொல்/வகை
+CustomersCategoryShort=வாடிக்கையாளர்கள் குறி/வகை
+ProductsCategoryShort=தயாரிப்புகளின் குறிச்சொல்/வகை
+MembersCategoryShort=உறுப்பினர் குறி/வகை
+SuppliersCategoriesShort=விற்பனையாளர்கள் குறிச்சொற்கள்/வகைகள்
+CustomersCategoriesShort=வாடிக்கையாளர்கள் குறிச்சொற்கள்/வகைகள்
+ProspectsCategoriesShort=வாய்ப்புகள் குறிச்சொற்கள்/வகைகள்
+CustomersProspectsCategoriesShort=Cust./Prosp. குறிச்சொற்கள்/வகைகள்
+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=சப்ளையருக்கு வகையை ஒதுக்கவும்
+ShowCategory=குறிச்சொல்/வகையைக் காட்டு
+ByDefaultInList=பட்டியலில் இயல்பாக
+ChooseCategory=வகையைத் தேர்ந்தெடுக்கவும்
+StocksCategoriesArea=கிடங்கு வகைகள்
+ActionCommCategoriesArea=நிகழ்வு வகைகள்
+WebsitePagesCategoriesArea=பக்கம்-கொள்கலன் வகைகள்
+KnowledgemanagementsCategoriesArea=KM கட்டுரை வகைகள்
+UseOrOperatorForCategories=வகைகளுக்கு 'OR' ஆபரேட்டரைப் பயன்படுத்தவும்
diff --git a/htdocs/langs/ta_IN/commercial.lang b/htdocs/langs/ta_IN/commercial.lang
new file mode 100644
index 00000000000..1772e8ef941
--- /dev/null
+++ b/htdocs/langs/ta_IN/commercial.lang
@@ -0,0 +1,81 @@
+# Dolibarr language file - Source file is en_US - commercial
+Commercial=வர்த்தகம்
+CommercialArea=வர்த்தக பகுதி
+Customer=வாடிக்கையாளர்
+Customers=வாடிக்கையாளர்கள்
+Prospect=வாய்ப்பு
+Prospects=வாய்ப்புகள்
+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=மற்ற ஆட்டோ
+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/ta_IN/companies.lang b/htdocs/langs/ta_IN/companies.lang
new file mode 100644
index 00000000000..446b7ae95ba
--- /dev/null
+++ b/htdocs/langs/ta_IN/companies.lang
@@ -0,0 +1,495 @@
+# Dolibarr language file - Source file is en_US - companies
+ErrorCompanyNameAlreadyExists=நிறுவனத்தின் பெயர் %s ஏற்கனவே உள்ளது. இன்னொன்றைத் தேர்ந்தெடுங்கள்.
+ErrorSetACountryFirst=முதலில் நாட்டை அமைக்கவும்
+SelectThirdParty=மூன்றாம் தரப்பினரைத் தேர்ந்தெடுக்கவும்
+ConfirmDeleteCompany=இந்த நிறுவனத்தையும் அது தொடர்பான அனைத்துத் தகவலையும் நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+DeleteContact=தொடர்பு/முகவரியை நீக்கவும்
+ConfirmDeleteContact=இந்தத் தொடர்பையும் தொடர்புடைய எல்லாத் தகவலையும் நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+MenuNewThirdParty=புதிய மூன்றாம் தரப்பு
+MenuNewCustomer=புது வாடிக்கையாளர்
+MenuNewProspect=புதிய வாய்ப்பு
+MenuNewSupplier=புதிய விற்பனையாளர்
+MenuNewPrivateIndividual=புதிய தனிப்பட்ட நபர்
+NewCompany=புதிய நிறுவனம் (எதிர்பார்ப்பு, வாடிக்கையாளர், விற்பனையாளர்)
+NewThirdParty=புதிய மூன்றாம் தரப்பு (எதிர்பார்ப்பு, வாடிக்கையாளர், விற்பனையாளர்)
+CreateDolibarrThirdPartySupplier=மூன்றாம் தரப்பை உருவாக்கு (விற்பனையாளர்)
+CreateThirdPartyOnly=மூன்றாம் தரப்பை உருவாக்கவும்
+CreateThirdPartyAndContact=மூன்றாம் தரப்பு + குழந்தை தொடர்பை உருவாக்கவும்
+ProspectionArea=எதிர்பார்ப்பு பகுதி
+IdThirdParty=ஐடி மூன்றாம் தரப்பு
+IdCompany=நிறுவனத்தின் ஐடி
+IdContact=தொடர்பு ஐடி
+ThirdPartyContacts=மூன்றாம் தரப்பு தொடர்புகள்
+ThirdPartyContact=மூன்றாம் தரப்பு தொடர்பு/முகவரி
+Company=நிறுவனம்
+CompanyName=நிறுவனத்தின் பெயர்
+AliasNames=மாற்றுப் பெயர் (வணிக, வர்த்தக முத்திரை, ...)
+AliasNameShort=மாற்றுப்பெயர்
+Companies=நிறுவனங்கள்
+CountryIsInEEC=நாடு ஐரோப்பிய பொருளாதார சமூகத்திற்குள் உள்ளது
+PriceFormatInCurrentLanguage=தற்போதைய மொழி மற்றும் நாணயத்தில் விலைக் காட்சி வடிவம்
+ThirdPartyName=மூன்றாம் தரப்பு பெயர்
+ThirdPartyEmail=மூன்றாம் தரப்பு மின்னஞ்சல்
+ThirdParty=மூன்றாம் தரப்பு
+ThirdParties=மூன்றாம் தரப்பினர்
+ThirdPartyProspects=வாய்ப்புகள்
+ThirdPartyProspectsStats=வாய்ப்புகள்
+ThirdPartyCustomers=வாடிக்கையாளர்கள்
+ThirdPartyCustomersStats=வாடிக்கையாளர்கள்
+ThirdPartyCustomersWithIdProf12=%s அல்லது %s உள்ள வாடிக்கையாளர்கள்
+ThirdPartySuppliers=விற்பனையாளர்கள்
+ThirdPartyType=மூன்றாம் தரப்பு வகை
+Individual=தனியார் தனிநபர்
+ToCreateContactWithSameName=மூன்றாம் தரப்பினரின் கீழ் மூன்றாம் தரப்பினரின் அதே தகவலுடன் ஒரு தொடர்பு/முகவரியை தானாகவே உருவாக்கும். பெரும்பாலான சந்தர்ப்பங்களில், உங்கள் மூன்றாம் தரப்பினர் உடல் ரீதியான நபராக இருந்தாலும், மூன்றாம் தரப்பினரை மட்டும் உருவாக்கினால் போதும்.
+ParentCompany=தாய் நிறுவனம்
+Subsidiaries=துணை நிறுவனங்கள்
+ReportByMonth=மாதத்திற்கு அறிக்கை
+ReportByCustomers=ஒரு வாடிக்கையாளருக்கு அறிக்கை
+ReportByThirdparties=மூன்றாம் தரப்புக்கான அறிக்கை
+ReportByQuarter=ஒரு விகிதத்திற்கு அறிக்கை
+CivilityCode=நாகரிகக் குறியீடு
+RegisteredOffice=பதிவுசெய்யப்பட்ட அலுவலகம்
+Lastname=கடைசி பெயர்
+Firstname=முதல் பெயர்
+PostOrFunction=வேலை நிலை
+UserTitle=தலைப்பு
+NatureOfThirdParty=மூன்றாம் தரப்பினரின் இயல்பு
+NatureOfContact=தொடர்பு இயல்பு
+Address=முகவரி
+State=மாநிலம்/மாகாணம்
+StateCode=மாநிலம்/ மாகாண குறியீடு
+StateShort=நிலை
+Region=பிராந்தியம்
+Region-State=பகுதி - மாநிலம்
+Country=நாடு
+CountryCode=நாட்டின் குறியீடு
+CountryId=நாட்டின் ஐடி
+Phone=தொலைபேசி
+PhoneShort=தொலைபேசி
+Skype=ஸ்கைப்
+Call=அழைப்பு
+Chat=அரட்டை
+PhonePro=பேருந்து. தொலைபேசி
+PhonePerso=பெர்ஸ். தொலைபேசி
+PhoneMobile=கைபேசி
+No_Email=மொத்த மின்னஞ்சல்களை மறுக்கவும்
+Fax=தொலைநகல்
+Zip=அஞ்சல் குறியீடு
+Town=நகரம்
+Web=இணையம்
+Poste= பதவி
+DefaultLang=இயல்பு மொழி
+VATIsUsed=விற்பனை வரி பயன்படுத்தப்படுகிறது
+VATIsUsedWhenSelling=இந்த மூன்றாம் தரப்பினர் தனது சொந்த வாடிக்கையாளர்களுக்கு விலைப்பட்டியல் செய்யும் போது விற்பனை வரி உள்ளதா இல்லையா என்பதை இது வரையறுக்கிறது
+VATIsNotUsed=விற்பனை வரி பயன்படுத்தப்படவில்லை
+CopyAddressFromSoc=மூன்றாம் தரப்பு விவரங்களிலிருந்து முகவரியை நகலெடுக்கவும்
+ThirdpartyNotCustomerNotSupplierSoNoRef=மூன்றாம் தரப்பு வாடிக்கையாளரோ அல்லது விற்பனையாளரோ இல்லை, குறிப்பிடும் பொருள்கள் இல்லை
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=மூன்றாம் தரப்பு வாடிக்கையாளர் அல்லது விற்பனையாளர், தள்ளுபடிகள் கிடைக்காது
+PaymentBankAccount=பேமெண்ட் வங்கி கணக்கு
+OverAllProposals=முன்மொழிவுகள்
+OverAllOrders=ஆர்டர்கள்
+OverAllInvoices=இன்வாய்ஸ்கள்
+OverAllSupplierProposals=விலை கோரிக்கைகள்
+##### Local Taxes #####
+LocalTax1IsUsed=இரண்டாவது வரியைப் பயன்படுத்தவும்
+LocalTax1IsUsedES= RE பயன்படுத்தப்படுகிறது
+LocalTax1IsNotUsedES= RE பயன்படுத்தப்படவில்லை
+LocalTax2IsUsed=மூன்றாவது வரியைப் பயன்படுத்தவும்
+LocalTax2IsUsedES= IRPF பயன்படுத்தப்படுகிறது
+LocalTax2IsNotUsedES= IRPF பயன்படுத்தப்படவில்லை
+WrongCustomerCode=வாடிக்கையாளர் குறியீடு தவறானது
+WrongSupplierCode=விற்பனையாளர் குறியீடு தவறானது
+CustomerCodeModel=வாடிக்கையாளர் குறியீடு மாதிரி
+SupplierCodeModel=விற்பனையாளர் குறியீடு மாதிரி
+Gencod=பார்கோடு
+##### Professional ID #####
+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=பேராசிரியர் ஐடி 2 (ரெவேனு ப்ரூட்ஸ்)
+ProfId3AR=-
+ProfId4AR=-
+ProfId5AR=-
+ProfId6AR=-
+ProfId1AT=பேராசிரியர் ஐடி 1 (USt.-IdNr)
+ProfId2AT=பேராசிரியர் ஐடி 2 (USt.-Nr)
+ProfId3AT=பேராசிரியர் ஐடி 3 (ஹேண்டல்ஸ்ரிஜிஸ்டர்-Nr.)
+ProfId4AT=-
+ProfId5AT=EORI எண்
+ProfId6AT=-
+ProfId1AU=பேராசிரியர் ஐடி 1 (ஏபிஎன்)
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
+ProfId5AU=-
+ProfId6AU=-
+ProfId1BE=பேராசிரியர் ஐடி 1 (தொழில்முறை எண்)
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=EORI எண்
+ProfId6BE=-
+ProfId1BR=-
+ProfId2BR=IE (Inscricao Estadual)
+ProfId3BR=IM (Inscricao நகராட்சி)
+ProfId4BR=CPF
+#ProfId5BR=CNAE
+#ProfId6BR=INSS
+ProfId1CH=UID-எண்
+ProfId2CH=-
+ProfId3CH=பேராசிரியர் ஐடி 1 (ஃபெடரல் எண்)
+ProfId4CH=பேராசிரியர் ஐடி 2 (வணிக பதிவு எண்)
+ProfId5CH=EORI எண்
+ProfId6CH=-
+ProfId1CL=பேராசிரியர் ஐடி 1 (ஆர்.யு.டி.)
+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=பேராசிரியர் ஐடி 1 (ஆர்.யு.டி.)
+ProfId2CO=-
+ProfId3CO=-
+ProfId4CO=-
+ProfId5CO=-
+ProfId6CO=-
+ProfId1DE=பேராசிரியர் ஐடி 1 (USt.-IdNr)
+ProfId2DE=பேராசிரியர் ஐடி 2 (USt.-Nr)
+ProfId3DE=பேராசிரியர் ஐடி 3 (ஹேண்டல்ஸ்ரிஜிஸ்டர்-Nr.)
+ProfId4DE=-
+ProfId5DE=EORI எண்
+ProfId6DE=-
+ProfId1ES=பேராசிரியர் ஐடி 1 (சிஐஎஃப்/என்ஐஎஃப்)
+ProfId2ES=பேராசிரியர் ஐடி 2 (சமூக பாதுகாப்பு எண்)
+ProfId3ES=பேராசிரியர் ஐடி 3 (சிஎன்ஏஇ)
+ProfId4ES=பேராசிரியர் ஐடி 4 (கல்லூரி எண்)
+ProfId5ES=பேராசிரியர் ஐடி 5 (EORI எண்)
+ProfId6ES=-
+ProfId1FR=பேராசிரியர் ஐடி 1 (SIREN)
+ProfId2FR=பேராசிரியர் ஐடி 2 (SIRET)
+ProfId3FR=பேராசிரியர் ஐடி 3 (NAF, பழைய APE)
+ProfId4FR=பேராசிரியர் ஐடி 4 (RCS/RM)
+ProfId5FR=பேராசிரியர் ஐடி 5 (எண் EORI)
+ProfId6FR=-
+ProfId1ShortFR=சைரன்
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=ஆர்.சி.எஸ்
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
+ProfId1GB=பதிவு எண்
+ProfId2GB=-
+ProfId3GB=SIC
+ProfId4GB=-
+ProfId5GB=-
+ProfId6GB=-
+ProfId1HN=ஐடி பேராசிரியர். 1 (RTN)
+ProfId2HN=-
+ProfId3HN=-
+ProfId4HN=-
+ProfId5HN=-
+ProfId6HN=-
+ProfId1IN=Prof Id 1 (TIN)
+ProfId2IN=பேராசிரியர் ஐடி 2 (PAN)
+ProfId3IN=பேராசிரியர் ஐடி 3 (SRVC TAX)
+ProfId4IN=பேராசிரியர் ஐடி 4
+ProfId5IN=பேராசிரியர் ஐடி 5
+ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI எண்
+ProfId6IT=-
+ProfId1LU=ஐடி. பேராசிரியர். 1 (ஆர்.சி.எஸ். லக்சம்பர்க்)
+ProfId2LU=ஐடி. பேராசிரியர். 2 (வணிக அனுமதி)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=EORI எண்
+ProfId6LU=-
+ProfId1MA=ஐடி பேராசிரியர். 1 (ஆர்.சி.)
+ProfId2MA=ஐடி பேராசிரியர். 2 (காப்புரிமை)
+ProfId3MA=ஐடி பேராசிரியர். 3 (ஐ.எஃப்.)
+ProfId4MA=ஐடி பேராசிரியர். 4 (சி.என்.எஸ்.எஸ்.)
+ProfId5MA=ஐடி பேராசிரியர். 5 (ஐ.சி.இ.)
+ProfId6MA=-
+ProfId1MX=பேராசிரியர் ஐடி 1 (R.F.C).
+ProfId2MX=பேராசிரியர் ஐடி 2 (ஆர்.பி. ஐஎம்எஸ்எஸ்)
+ProfId3MX=பேராசிரியர் ஐடி 3 (தொழில்முறை சாசனம்)
+ProfId4MX=-
+ProfId5MX=-
+ProfId6MX=-
+ProfId1NL=கேவிகே எண்
+ProfId2NL=-
+ProfId3NL=-
+ProfId4NL=Burgerservicenummer (BSN)
+ProfId5NL=EORI எண்
+ProfId6NL=-
+ProfId1PT=பேராசிரியர் ஐடி 1 (என்ஐபிசி)
+ProfId2PT=பேராசிரியர் ஐடி 2 (சமூக பாதுகாப்பு எண்)
+ProfId3PT=பேராசிரியர் ஐடி 3 (வணிக பதிவு எண்)
+ProfId4PT=பேராசிரியர் ஐடி 4 (கன்சர்வேட்டரி)
+ProfId5PT=பேராசிரியர் ஐடி 5 (EORI எண்)
+ProfId6PT=-
+ProfId1SN=RC
+ProfId2SN=NINEA
+ProfId3SN=-
+ProfId4SN=-
+ProfId5SN=-
+ProfId6SN=-
+ProfId1TN=பேராசிரியர் ஐடி 1 (ஆர்சி)
+ProfId2TN=பேராசிரியர் ஐடி 2 (நிதி மெட்ரிகுல்)
+ProfId3TN=பேராசிரியர் ஐடி 3 (டூவான் குறியீடு)
+ProfId4TN=பேராசிரியர் ஐடி 4 (BAN)
+ProfId5TN=-
+ProfId6TN=-
+ProfId1US=பேராசிரியர் ஐடி (FEIN)
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
+ProfId1RO=பேராசிரியர் ஐடி 1 (சியுஐ)
+ProfId2RO=பேராசிரியர் ஐடி 2 (Nr. Înmatriculare)
+ProfId3RO=பேராசிரியர் ஐடி 3 (CAEN)
+ProfId4RO=பேராசிரியர் ஐடி 5 (EUID)
+ProfId5RO=பேராசிரியர் ஐடி 5 (EORI எண்)
+ProfId6RO=-
+ProfId1RU=பேராசிரியர் ஐடி 1 (OGRN)
+ProfId2RU=பேராசிரியர் ஐடி 2 (INN)
+ProfId3RU=பேராசிரியர் ஐடி 3 (கேபிபி)
+ProfId4RU=பேராசிரியர் ஐடி 4 (OKPO)
+ProfId5RU=-
+ProfId6RU=-
+ProfId1UA=பேராசிரியர் ஐடி 1 (EDRPOU)
+ProfId2UA=பேராசிரியர் ஐடி 2 (டிஆர்எஃப்ஓ)
+ProfId3UA=பேராசிரியர் ஐடி 3 (INN)
+ProfId4UA=பேராசிரியர் ஐடி 4 (சான்றிதழ்)
+ProfId5UA=பேராசிரியர் ஐடி 5 (ஆர்என்ஓகேபிபி)
+ProfId6UA=பேராசிரியர் ஐடி 6 (டிஆர்டிபிஏயு)
+ProfId1DZ=RC
+ProfId2DZ=கலை.
+ProfId3DZ=NIF
+ProfId4DZ=என்ஐஎஸ்
+VATIntra=VAT ஐடி
+VATIntraShort=VAT ஐடி
+VATIntraSyntaxIsValid=தொடரியல் செல்லுபடியாகும்
+VATReturn=VAT வருமானம்
+ProspectCustomer=வாய்ப்பு / வாடிக்கையாளர்
+Prospect=வாய்ப்பு
+CustomerCard=வாடிக்கையாளர் அட்டை
+Customer=வாடிக்கையாளர்
+CustomerRelativeDiscount=தொடர்புடைய வாடிக்கையாளர் தள்ளுபடி
+SupplierRelativeDiscount=உறவினர் விற்பனையாளர் தள்ளுபடி
+CustomerRelativeDiscountShort=தொடர்புடைய தள்ளுபடி
+CustomerAbsoluteDiscountShort=முழுமையான தள்ளுபடி
+CompanyHasRelativeDiscount=இந்த வாடிக்கையாளருக்கு <b> %s%% </b> இயல்புநிலை தள்ளுபடி உள்ளது
+CompanyHasNoRelativeDiscount=இந்த வாடிக்கையாளருக்கு இயல்புநிலையில் தொடர்புடைய தள்ளுபடி இல்லை
+HasRelativeDiscountFromSupplier=இந்த விற்பனையாளரிடமிருந்து <b> %s%% </b> இன் இயல்புநிலை தள்ளுபடியைப் பெற்றுள்ளீர்கள்
+HasNoRelativeDiscountFromSupplier=இந்த விற்பனையாளரிடமிருந்து உங்களுக்கு இயல்புநிலை தள்ளுபடி எதுவும் இல்லை
+CompanyHasAbsoluteDiscount=இந்த வாடிக்கையாளருக்கு <b> %s </b> %sக்கான தள்ளுபடிகள் (கடன் குறிப்புகள் அல்லது முன்பணம் செலுத்துதல்) உள்ளன.
+CompanyHasDownPaymentOrCommercialDiscount=இந்த வாடிக்கையாளருக்கு <b> %s </b> %sக்கான தள்ளுபடிகள் (வணிக, முன்பணம்) உள்ளன
+CompanyHasCreditNote=இந்த வாடிக்கையாளரிடம் இன்னும் <b> %s </b> %sக்கான கடன் குறிப்புகள் உள்ளன
+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=தொடர்பை உருவாக்கவும்
+AddContactAddress=தொடர்பு/முகவரியை உருவாக்கவும்
+EditContact=தொடர்பைத் திருத்து
+EditContactAddress=தொடர்பு/முகவரியைத் திருத்தவும்
+Contact=தொடர்பு/முகவரி
+Contacts=தொடர்புகள்/முகவரிகள்
+ContactId=தொடர்பு ஐடி
+ContactsAddresses=தொடர்புகள்/முகவரிகள்
+FromContactName=பெயர்:
+NoContactDefinedForThirdParty=இந்த மூன்றாம் தரப்பினருக்கு எந்த தொடர்பும் வரையறுக்கப்படவில்லை
+NoContactDefined=தொடர்பு எதுவும் வரையறுக்கப்படவில்லை
+DefaultContact=இயல்புநிலை தொடர்பு/முகவரி
+ContactByDefaultFor=இயல்புநிலை தொடர்பு/முகவரி
+AddThirdParty=மூன்றாம் தரப்பை உருவாக்கவும்
+DeleteACompany=ஒரு நிறுவனத்தை நீக்கவும்
+PersonalInformations=தனிப்பட்ட தகவல்
+AccountancyCode=கணக்கியல் கணக்கு
+CustomerCode=வாடிக்கையாளர் குறியீடு
+SupplierCode=விற்பனையாளர் குறியீடு
+CustomerCodeShort=வாடிக்கையாளர் குறியீடு
+SupplierCodeShort=விற்பனையாளர் குறியீடு
+CustomerCodeDesc=வாடிக்கையாளர் குறியீடு, அனைத்து வாடிக்கையாளர்களுக்கும் தனிப்பட்டது
+SupplierCodeDesc=விற்பனையாளர் குறியீடு, அனைத்து விற்பனையாளர்களுக்கும் தனித்துவமானது
+RequiredIfCustomer=மூன்றாம் தரப்பினர் வாடிக்கையாளர் அல்லது வாய்ப்பு இருந்தால் அவசியம்
+RequiredIfSupplier=மூன்றாம் தரப்பினர் விற்பனையாளராக இருந்தால் அவசியம்
+ValidityControledByModule=தொகுதி மூலம் கட்டுப்படுத்தப்படும் செல்லுபடியாகும்
+ThisIsModuleRules=இந்த தொகுதிக்கான விதிகள்
+ProspectToContact=தொடர்பு கொள்ள வாய்ப்பு
+CompanyDeleted=நிறுவனம் "%s" தரவுத்தளத்திலிருந்து நீக்கப்பட்டது.
+ListOfContacts=தொடர்புகள்/முகவரிகளின் பட்டியல்
+ListOfContactsAddresses=தொடர்புகள்/முகவரிகளின் பட்டியல்
+ListOfThirdParties=மூன்றாம் தரப்பினரின் பட்டியல்
+ShowCompany=மூன்றாம் தரப்பு
+ShowContact=தொடர்பு-முகவரி
+ContactsAllShort=அனைத்தும் (வடிப்பான் இல்லை)
+ContactType=தொடர்பு வகை
+ContactForOrders=ஆர்டரின் தொடர்பு
+ContactForOrdersOrShipments=ஆர்டர் அல்லது ஏற்றுமதியின் தொடர்பு
+ContactForProposals=முன்மொழிவின் தொடர்பு
+ContactForContracts=ஒப்பந்தத்தின் தொடர்பு
+ContactForInvoices=விலைப்பட்டியல் தொடர்பு
+NoContactForAnyOrder=இந்த தொடர்பு எந்த ஆர்டருக்கான தொடர்பு அல்ல
+NoContactForAnyOrderOrShipments=இந்த தொடர்பு எந்த ஆர்டர் அல்லது ஏற்றுமதிக்கான தொடர்பு அல்ல
+NoContactForAnyProposal=இந்த தொடர்பு எந்த வணிக திட்டத்திற்கும் தொடர்பு இல்லை
+NoContactForAnyContract=இந்த தொடர்பு எந்த ஒப்பந்தத்திற்கும் தொடர்பு இல்லை
+NoContactForAnyInvoice=இந்த தொடர்பு எந்த விலைப்பட்டியலுக்கும் தொடர்பு இல்லை
+NewContact=புதிய தொடர்பு
+NewContactAddress=புதிய தொடர்பு/முகவரி
+MyContacts=எனது தொடர்புகள்
+Capital=மூலதனம்
+CapitalOf=%s இன் மூலதனம்
+EditCompany=நிறுவனத்தைத் திருத்தவும்
+ThisUserIsNot=இந்த பயனர் ஒரு வாய்ப்பு, வாடிக்கையாளர் அல்லது விற்பனையாளர் அல்ல
+VATIntraCheck=காசோலை
+VATIntraCheckDesc=VAT ஐடியில் நாட்டின் முன்னொட்டு இருக்க வேண்டும். <b> %s </b> என்ற இணைப்பு ஐரோப்பிய VAT சரிபார்ப்பு சேவையைப் (VIES) பயன்படுத்துகிறது, இதற்கு Dolibarr சேவையகத்திலிருந்து இணைய அணுகல் தேவைப்படுகிறது.
+VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckableOnEUSite=ஐரோப்பிய ஆணைய இணையதளத்தில் உள்ள சமூக VAT ஐடியைப் பார்க்கவும்
+VATIntraManualCheck=ஐரோப்பிய ஆணைய இணையதளமான <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> இல் நீங்கள் கைமுறையாகச் சரிபார்க்கலாம்.
+ErrorVATCheckMS_UNAVAILABLE=சரிபார்க்க முடியாது. காசோலை சேவை உறுப்பு நாடுகளால் வழங்கப்படவில்லை (%s).
+NorProspectNorCustomer=வாய்ப்பும் இல்லை, வாடிக்கையாளரும் அல்ல
+JuridicalStatus=வணிக நிறுவன வகை
+Workforce=தொழிலாளர்
+Staff=பணியாளர்கள்
+ProspectLevelShort=சாத்தியமான
+ProspectLevel=வாய்ப்பு சாத்தியம்
+ContactPrivate=தனியார்
+ContactPublic=பகிரப்பட்டது
+ContactVisibility=தெரிவுநிலை
+ContactOthers=மற்றவை
+OthersNotLinkedToThirdParty=மற்றவை, மூன்றாம் தரப்பினருடன் இணைக்கப்படவில்லை
+ProspectStatus=வருங்கால நிலை
+PL_NONE=இல்லை
+PL_UNKNOWN=தெரியவில்லை
+PL_LOW=குறைந்த
+PL_MEDIUM=நடுத்தர
+PL_HIGH=உயர்
+TE_UNKNOWN=-
+TE_STARTUP=தொடக்கம்
+TE_GROUP=பெரிய நிறுவனம்
+TE_MEDIUM=நடுத்தர நிறுவனம்
+TE_ADMIN=அரசு சார்ந்த
+TE_SMALL=சிறிய நிறுவனம்
+TE_RETAIL=சில்லறை விற்பனையாளர்
+TE_WHOLE=மொத்த வியாபாரி
+TE_PRIVATE=தனியார் தனிநபர்
+TE_OTHER=மற்றவை
+StatusProspect-1=தொடர்பு கொள்ள வேண்டாம்
+StatusProspect0=தொடர்பு கொள்ளவில்லை
+StatusProspect1=தொடர்பு கொள்ள வேண்டும்
+StatusProspect2=தொடர்பு செயல்பாட்டில் உள்ளது
+StatusProspect3=தொடர்பு முடிந்தது
+ChangeDoNotContact=நிலையை 'தொடர்பு கொள்ள வேண்டாம்' என மாற்றவும்
+ChangeNeverContacted=நிலையை 'தொடர்பு கொள்ளவில்லை' என மாற்றவும்
+ChangeToContact=நிலையை 'தொடர்பு கொள்ள வேண்டும்' என மாற்றவும்
+ChangeContactInProcess='தொடர்பு செயலில் உள்ளது' என நிலையை மாற்றவும்
+ChangeContactDone=நிலையை 'தொடர்பு முடிந்தது' என மாற்றவும்
+ProspectsByStatus=நிலை மூலம் வாய்ப்புகள்
+NoParentCompany=இல்லை
+ExportCardToFormat=அட்டையை வடிவமைப்பிற்கு ஏற்றுமதி செய்யவும்
+ContactNotLinkedToCompany=எந்த மூன்றாம் தரப்பினருடனும் தொடர்பு இணைக்கப்படவில்லை
+DolibarrLogin=டோலிபார் உள்நுழைவு
+NoDolibarrAccess=டோலிபார் அணுகல் இல்லை
+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=இந்தக் கோப்பை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+AllocateCommercial=விற்பனை பிரதிநிதிக்கு ஒதுக்கப்பட்டது
+Organization=அமைப்பு
+FiscalYearInformation=நிதியாண்டு
+FiscalMonthStart=நிதியாண்டின் தொடக்க மாதம்
+SocialNetworksInformation=சமுக வலைத்தளங்கள்
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=கிதுப் URL
+YouMustAssignUserMailFirst=மின்னஞ்சல் அறிவிப்பைச் சேர்ப்பதற்கு முன் இந்தப் பயனருக்கான மின்னஞ்சலை உருவாக்க வேண்டும்.
+YouMustCreateContactFirst=மின்னஞ்சல் அறிவிப்புகளைச் சேர்க்க, மூன்றாம் தரப்பினருக்கான சரியான மின்னஞ்சல்களைக் கொண்ட தொடர்புகளை முதலில் வரையறுக்க வேண்டும்
+ListSuppliersShort=விற்பனையாளர்களின் பட்டியல்
+ListProspectsShort=வாய்ப்புகளின் பட்டியல்
+ListCustomersShort=வாடிக்கையாளர்களின் பட்டியல்
+ThirdPartiesArea=மூன்றாம் தரப்பினர்/தொடர்புகள்
+LastModifiedThirdParties=சமீபத்திய %s மாற்றியமைக்கப்பட்ட மூன்றாம் தரப்பினர்
+UniqueThirdParties=மூன்றாம் தரப்பினரின் மொத்த எண்ணிக்கை
+InActivity=திற
+ActivityCeased=மூடப்பட்டது
+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=கட்டண வகை - வாடிக்கையாளர்
+PaymentTermsCustomer=கட்டண விதிமுறைகள் - வாடிக்கையாளர்
+PaymentTypeSupplier=கட்டண வகை - விற்பனையாளர்
+PaymentTermsSupplier=கட்டணம் செலுத்தும் காலம் - விற்பனையாளர்
+PaymentTypeBoth=கட்டண வகை - வாடிக்கையாளர் மற்றும் விற்பனையாளர்
+MulticurrencyUsed=மல்டிகரன்சியைப் பயன்படுத்தவும்
+MulticurrencyCurrency=நாணய
+InEEC=ஐரோப்பா (EEC)
+RestOfEurope=ஐரோப்பாவின் மற்ற பகுதிகள் (EEC)
+OutOfEurope=ஐரோப்பாவிற்கு வெளியே (EEC)
+CurrentOutstandingBillLate=தற்போதைய நிலுவைத் தொகை தாமதமானது
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=கவனமாக இருங்கள், உங்கள் தயாரிப்பு விலை அமைப்புகளைப் பொறுத்து, POS இல் தயாரிப்பைச் சேர்ப்பதற்கு முன் மூன்றாம் தரப்பை மாற்ற வேண்டும்.
diff --git a/htdocs/langs/ta_IN/compta.lang b/htdocs/langs/ta_IN/compta.lang
new file mode 100644
index 00000000000..5448e54dfa1
--- /dev/null
+++ b/htdocs/langs/ta_IN/compta.lang
@@ -0,0 +1,300 @@
+# Dolibarr language file - Source file is en_US - compta
+MenuFinancial=பில்லிங் | பணம் செலுத்துதல்
+TaxModuleSetupToModifyRules=கணக்கீட்டிற்கான விதிகளை மாற்ற, <a href="%s"> வரிகள் தொகுதி அமைப்பு </a> க்குச் செல்லவும்
+TaxModuleSetupToModifyRulesLT=கணக்கீட்டிற்கான விதிகளை மாற்ற, <a href="%s"> நிறுவன அமைப்பு </a> க்குச் செல்லவும்
+OptionMode=கணக்கியலுக்கான விருப்பம்
+OptionModeTrue=விருப்பம் வருமானம்-செலவுகள்
+OptionModeVirtual=விருப்ப உரிமைகோரல்கள்-கடன்கள்
+OptionModeTrueDesc=இந்த சூழலில், விற்றுமுதல் பணம் செலுத்துதல் (பணம் செலுத்தும் தேதி) மீது கணக்கிடப்படுகிறது. இன்வாய்ஸ்கள் மூலம் கணக்குகளில் உள்ளீடு/வெளியீடு மூலம் புக் கீப்பிங் ஆய்வு செய்யப்பட்டால் மட்டுமே புள்ளிவிவரங்களின் செல்லுபடியாகும் தன்மை உறுதி செய்யப்படும்.
+OptionModeVirtualDesc=இந்த சூழலில், விற்றுமுதல் விலைப்பட்டியல் (சரிபார்ப்பு தேதி) மூலம் கணக்கிடப்படுகிறது. இந்த இன்வாய்ஸ்கள் நிலுவையில் இருக்கும் போது, அவை செலுத்தப்பட்டிருந்தாலும் இல்லாவிட்டாலும், அவை விற்றுமுதல் வெளியீட்டில் பட்டியலிடப்படும்.
+FeatureIsSupportedInInOutModeOnly=கிரெடிட்ஸ்-டெப்ட்ஸ் கணக்கியல் முறையில் மட்டுமே அம்சம் கிடைக்கும் (கணக்கியல் தொகுதி உள்ளமைவைப் பார்க்கவும்)
+VATReportBuildWithOptionDefinedInModule=வரி தொகுதி அமைப்பால் வரையறுக்கப்பட்ட விதிகளைப் பயன்படுத்தி இங்கு காட்டப்படும் தொகைகள் கணக்கிடப்படுகின்றன.
+LTReportBuildWithOptionDefinedInModule=இங்கே காட்டப்பட்டுள்ள தொகைகள் நிறுவனத்தின் அமைப்பால் வரையறுக்கப்பட்ட விதிகளைப் பயன்படுத்தி கணக்கிடப்படுகின்றன.
+Param=அமைவு
+RemainingAmountPayment=மீதமுள்ள தொகை:
+Account=கணக்கு
+Accountparent=பெற்றோர் கணக்கு
+Accountsparent=பெற்றோர் கணக்குகள்
+Income=வருமானம்
+Outcome=செலவு
+MenuReportInOut=வருமானம் / செலவு
+ReportInOut=வருமானம் மற்றும் செலவுகளின் இருப்பு
+ReportTurnover=விற்றுமுதல் விலைப்பட்டியல்
+ReportTurnoverCollected=விற்றுமுதல் சேகரிக்கப்பட்டது
+PaymentsNotLinkedToInvoice=கட்டணங்கள் எந்த விலைப்பட்டியலுடனும் இணைக்கப்படவில்லை, எனவே எந்த மூன்றாம் தரப்பினருடனும் இணைக்கப்படவில்லை
+PaymentsNotLinkedToUser=எந்தவொரு பயனருடனும் கட்டணங்கள் இணைக்கப்படவில்லை
+Profit=லாபம்
+AccountingResult=கணக்கியல் முடிவு
+BalanceBefore=இருப்பு (முன்)
+Balance=இருப்பு
+Debit=பற்று
+Credit=கடன்
+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=VAT வசூலிக்கப்பட்டது
+StatusToPay=செலுத்த வேண்டும்
+SpecialExpensesArea=அனைத்து சிறப்பு கட்டணங்களுக்கான பகுதி
+VATExpensesArea=அனைத்து TVA கட்டணங்களுக்கான பகுதி
+SocialContribution=சமூக அல்லது நிதி வரி
+SocialContributions=சமூக அல்லது நிதி வரிகள்
+SocialContributionsDeductibles=கழிக்கக்கூடிய சமூக அல்லது நிதி வரிகள்
+SocialContributionsNondeductibles=கழிக்க முடியாத சமூக அல்லது நிதி வரிகள்
+DateOfSocialContribution=சமூக அல்லது நிதி வரி தேதி
+LabelContrib=லேபிள் பங்களிப்பு
+TypeContrib=வகை பங்களிப்பு
+MenuSpecialExpenses=சிறப்பு செலவுகள்
+MenuTaxAndDividends=வரி மற்றும் ஈவுத்தொகை
+MenuSocialContributions=சமூக/நிதி வரிகள்
+MenuNewSocialContribution=புதிய சமூக/நிதி வரி
+NewSocialContribution=புதிய சமூக/நிதி வரி
+AddSocialContribution=சமூக/நிதி வரியைச் சேர்க்கவும்
+ContributionsToPay=செலுத்த வேண்டிய சமூக/நிதி வரிகள்
+AccountancyTreasuryArea=பில்லிங் மற்றும் பணம் செலுத்தும் பகுதி
+NewPayment=புதிய கட்டணம்
+PaymentCustomerInvoice=வாடிக்கையாளர் விலைப்பட்டியல் கட்டணம்
+PaymentSupplierInvoice=விற்பனையாளர் விலைப்பட்டியல் கட்டணம்
+PaymentSocialContribution=சமூக/நிதி வரி செலுத்துதல்
+PaymentVat=VAT செலுத்துதல்
+AutomaticCreationPayment=கட்டணத்தை தானாக பதிவு செய்யவும்
+ListPayment=கொடுப்பனவுகளின் பட்டியல்
+ListOfCustomerPayments=வாடிக்கையாளர் கொடுப்பனவுகளின் பட்டியல்
+ListOfSupplierPayments=விற்பனையாளர் கொடுப்பனவுகளின் பட்டியல்
+DateStartPeriod=தேதி தொடக்க காலம்
+DateEndPeriod=தேதி முடிவு காலம்
+newLT1Payment=புதிய வரி 2 செலுத்துதல்
+newLT2Payment=புதிய வரி 3 செலுத்துதல்
+LT1Payment=வரி 2 செலுத்துதல்
+LT1Payments=வரி 2 செலுத்துதல்
+LT2Payment=வரி 3 செலுத்துதல்
+LT2Payments=வரி 3 செலுத்துதல்கள்
+newLT1PaymentES=புதிய RE கட்டணம்
+newLT2PaymentES=புதிய IRPF கட்டணம்
+LT1PaymentES=RE கட்டணம்
+LT1PaymentsES=RE கொடுப்பனவுகள்
+LT2PaymentES=IRPF கட்டணம்
+LT2PaymentsES=IRPF கொடுப்பனவுகள்
+VATPayment=விற்பனை வரி செலுத்துதல்
+VATPayments=விற்பனை வரி செலுத்துதல்
+VATDeclarations=VAT அறிவிப்புகள்
+VATDeclaration=VAT அறிவிப்பு
+VATRefund=விற்பனை வரி திரும்பப் பெறுதல்
+NewVATPayment=புதிய விற்பனை வரி செலுத்துதல்
+NewLocalTaxPayment=புதிய வரி %s செலுத்துதல்
+Refund=திரும்பப்பெறுதல்
+SocialContributionsPayments=சமூக/நிதி வரி செலுத்துதல்
+ShowVatPayment=VAT கட்டணத்தைக் காட்டு
+TotalToPay=செலுத்த வேண்டிய மொத்தம்
+BalanceVisibilityDependsOnSortAndFilters=அட்டவணை %s இல் வரிசைப்படுத்தப்பட்டு 1 வங்கிக் கணக்கில் வடிகட்டப்பட்டால் மட்டுமே இந்த பட்டியலில் இருப்பு தெரியும் (வேறு வடிப்பான்கள் இல்லாமல்)
+CustomerAccountancyCode=வாடிக்கையாளர் கணக்கியல் குறியீடு
+SupplierAccountancyCode=விற்பனையாளர் கணக்கியல் குறியீடு
+CustomerAccountancyCodeShort=கஸ்ட். கணக்கு. குறியீடு
+SupplierAccountancyCodeShort=சுப். கணக்கு. குறியீடு
+AccountNumber=கணக்கு எண்
+NewAccountingAccount=புதிய கணக்கு
+Turnover=விற்றுமுதல் விலைப்பட்டியல்
+TurnoverCollected=விற்றுமுதல் சேகரிக்கப்பட்டது
+SalesTurnoverMinimum=குறைந்தபட்ச வருவாய்
+ByExpenseIncome=செலவுகள் மற்றும் வருமானம் மூலம்
+ByThirdParties=மூன்றாம் தரப்பினரால்
+ByUserAuthorOfInvoice=விலைப்பட்டியல் ஆசிரியர் மூலம்
+CheckReceipt=டெபாசிட் சரிபார்க்கவும்
+CheckReceiptShort=டெபாசிட் சரிபார்க்கவும்
+LastCheckReceiptShort=சமீபத்திய %s காசோலை ரசீதுகள்
+NewCheckReceipt=புதிய தள்ளுபடி
+NewCheckDeposit=புதிய காசோலை வைப்பு
+NewCheckDepositOn=கணக்கில் வைப்புக்கான ரசீதை உருவாக்கவும்: %s
+NoWaitingChecks=டெபாசிட்டிற்காக காசோலைகள் எதுவும் காத்திருக்கவில்லை.
+DateChequeReceived=பெறும் தேதியைச் சரிபார்க்கவும்
+NbOfCheques=காசோலைகளின் எண்ணிக்கை
+PaySocialContribution=சமூக/நிதி வரி செலுத்துங்கள்
+PayVAT=VAT அறிவிப்பை செலுத்தவும்
+PaySalary=சம்பள அட்டையை செலுத்துங்கள்
+ConfirmPaySocialContribution=இந்த சமூக அல்லது நிதி வரியை செலுத்தியதாக நிச்சயமாக வகைப்படுத்த விரும்புகிறீர்களா?
+ConfirmPayVAT=இந்த VAT அறிவிப்பை பணம் செலுத்தியதாக நிச்சயமாக வகைப்படுத்த விரும்புகிறீர்களா?
+ConfirmPaySalary=இந்த சம்பள அட்டையை பணம் செலுத்தியதாக நிச்சயமாக வகைப்படுத்த விரும்புகிறீர்களா?
+DeleteSocialContribution=சமூக அல்லது நிதி வரி செலுத்துதலை நீக்கவும்
+DeleteVAT=VAT அறிவிப்பை நீக்கவும்
+DeleteSalary=சம்பள அட்டையை நீக்கவும்
+ConfirmDeleteSocialContribution=இந்த சமூக/நிதி வரி செலுத்துதலை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+ConfirmDeleteVAT=இந்த VAT அறிவிப்பை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+ConfirmDeleteSalary=இந்த சம்பளத்தை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+ExportDataset_tax_1=சமூக மற்றும் நிதி வரிகள் மற்றும் கொடுப்பனவுகள்
+CalcModeVATDebt=பயன்முறை <b> %sVAT மீது அர்ப்பணிப்பு கணக்கியல்0ecb2ec87f49fz0 </b> .
+CalcModeVATEngagement=வருமானத்தில் <b> %sVAT-செலவுகள்-செலவுகள்0ecb2ec87f49fz0 </b> .
+CalcModeDebt=லெட்ஜரில் இன்னும் கணக்கு வைக்கப்படாவிட்டாலும், அறியப்பட்ட பதிவு செய்யப்பட்ட ஆவணங்களின் பகுப்பாய்வு.
+CalcModeEngagement=லெட்ஜரில் இன்னும் கணக்கு வைக்கப்படாவிட்டாலும், அறியப்பட்ட பதிவுசெய்யப்பட்ட கொடுப்பனவுகளின் பகுப்பாய்வு.
+CalcModeBookkeeping=புத்தக பராமரிப்பு லெட்ஜர் அட்டவணையில் ஜர்னலிஸ் செய்யப்பட்ட தரவுகளின் பகுப்பாய்வு.
+CalcModeLT1= வாடிக்கையாளர் விலைப்பட்டியல்களில் <b> %sRE - சப்ளையர்கள் விலைப்பட்டியல் </b>
+CalcModeLT1Debt=வாடிக்கையாளர் விலைப்பட்டியலில் <b> %sRE
+CalcModeLT1Rec= சப்ளையர்களின் விலைப்பட்டியலில் <b> %sRE invoices%s </b>
+CalcModeLT2= வாடிக்கையாளர் இன்வாய்ஸ்களில் <b> %sIRPF - சப்ளையர்கள் விலைப்பட்டியல்
+CalcModeLT2Debt=வாடிக்கையாளர் விலைப்பட்டியலில் <b> %sIRPF
+CalcModeLT2Rec= சப்ளையர்களின் விலைப்பட்டியலில் <b> %sIRPF விலைப்பட்டியல் </b>
+AnnualSummaryDueDebtMode=வருமானம் மற்றும் செலவுகளின் இருப்பு, ஆண்டு சுருக்கம்
+AnnualSummaryInputOutputMode=வருமானம் மற்றும் செலவுகளின் இருப்பு, ஆண்டு சுருக்கம்
+AnnualByCompanies=கணக்கின் முன் வரையறுக்கப்பட்ட குழுக்களால் வருமானம் மற்றும் செலவுகளின் இருப்பு
+AnnualByCompaniesDueDebtMode=வருமானம் மற்றும் செலவுகளின் இருப்பு, முன் வரையறுக்கப்பட்ட குழுக்களின் விவரம், பயன்முறை <b> %sClaims-Debts%s </b> என்றார் a0aee83365837f accounting a0aee833605837f.
+AnnualByCompaniesInputOutputMode=வருமானம் மற்றும் செலவுகளின் இருப்பு, முன் வரையறுக்கப்பட்ட குழுக்களின் விவரம், பயன்முறை <b> %sIncomes-Expenses%s </b> என்றார் a0aee833605837 a0aee833605837f.
+SeeReportInInputOutputMode=<b> %sபணத்தின் பகுப்பாய்வுs%s </b>ஐப் பார்க்கவும் <b> அடிப்படையில் கணக்கீடு செய்ய
+SeeReportInDueDebtMode=<b> %sபதிவுசெய்யப்பட்ட ஆவணங்களின் பகுப்பாய்வுs%s </b> ஐப் பார்க்கவும், அறியப்பட்ட <b> கணக்கீட்டின் அடிப்படையில் கணக்கிடப்பட்டுள்ளது.
+SeeReportInBookkeepingMode=<b> %sபுக்கீப்பிங் லெட்ஜரின் பகுப்பாய்வு table%s </b> ஐப் பார்க்கவும்
+RulesAmountWithTaxIncluded=- காட்டப்படும் தொகைகள் அனைத்து வரிகளும் சேர்க்கப்பட்டுள்ளன
+RulesAmountWithTaxExcluded=- காட்டப்படும் இன்வாய்ஸ்களின் தொகைகள் அனைத்து வரிகளும் விலக்கப்பட்டுள்ளன
+RulesResultDue=- இதில் அனைத்து விலைப்பட்டியல்கள், செலவுகள், VAT, நன்கொடைகள், சம்பளம், அவை செலுத்தப்பட்டாலும் இல்லாவிட்டாலும் அடங்கும். <br> - இது விலைப்பட்டியல்களின் பில்லிங் தேதி மற்றும் செலவுகள் அல்லது வரி செலுத்துவதற்கான நிலுவைத் தேதியை அடிப்படையாகக் கொண்டது. சம்பளத்திற்கு, காலம் முடிவடையும் தேதி பயன்படுத்தப்படுகிறது.
+RulesResultInOut=- இது விலைப்பட்டியல், செலவுகள், VAT மற்றும் சம்பளம் ஆகியவற்றில் செய்யப்பட்ட உண்மையான கொடுப்பனவுகளை உள்ளடக்கியது. <br> - இது விலைப்பட்டியல்கள், செலவுகள், VAT, நன்கொடைகள் மற்றும் சம்பளங்களின் செலுத்தும் தேதிகளை அடிப்படையாகக் கொண்டது.
+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=வாடிக்கையாளரின் VAT சேகரிக்கப்பட்டு செலுத்தப்பட்ட அறிக்கை
+VATReportByQuartersInInputOutputMode=வசூலிக்கப்பட்ட மற்றும் செலுத்தப்பட்ட வரியின் விற்பனை வரி விகிதம் அறிக்கை
+VATReportShowByRateDetails=இந்த விகிதத்தின் விவரங்களைக் காட்டு
+LT1ReportByQuarters=விகிதத்தின் அடிப்படையில் வரி 2ஐப் புகாரளிக்கவும்
+LT2ReportByQuarters=விகிதத்தின் அடிப்படையில் வரி 3ஐப் புகாரளிக்கவும்
+LT1ReportByQuartersES=RE விகிதம் மூலம் அறிக்கை
+LT2ReportByQuartersES=ஐஆர்பிஎஃப் விகிதம் அறிக்கை
+SeeVATReportInInputOutputMode=நிலையான கணக்கீட்டிற்கு <b> %sVAT collection%s </b> அறிக்கையைப் பார்க்கவும்
+SeeVATReportInDueDebtMode=விலைப்பட்டியலில் விருப்பத்துடன் கணக்கிடுவதற்கு, debit%s </b> இல் <b> %sVAT அறிக்கையைப் பார்க்கவும்.
+RulesVATInServices=- சேவைகளுக்கு, உண்மையில் பெறப்பட்ட அல்லது பணம் செலுத்திய தேதியின் அடிப்படையில் செலுத்தப்பட்ட கட்டணங்களின் VAT அறிக்கையில் அடங்கும்.
+RulesVATInProducts=- பொருள் சொத்துக்களுக்கு, பணம் செலுத்திய தேதியின் அடிப்படையில் VAT அறிக்கையில் அடங்கும்.
+RulesVATDueServices=- சேவைகளுக்கு, விலைப்பட்டியல் தேதியின் அடிப்படையில் செலுத்தப்பட்ட அல்லது செலுத்தப்படாத விலைப்பட்டியல்களின் VAT அறிக்கையில் அடங்கும்.
+RulesVATDueProducts=- பொருள் சொத்துக்களுக்கு, அறிக்கையானது விலைப்பட்டியல் தேதியின் அடிப்படையில் செலுத்த வேண்டிய விலைப்பட்டியல்களின் VAT ஐ உள்ளடக்கியது.
+OptionVatInfoModuleComptabilite=குறிப்பு: பொருள் சொத்துக்களுக்கு, டெலிவரி தேதியை மிகவும் நியாயமானதாகப் பயன்படுத்த வேண்டும்.
+ThisIsAnEstimatedValue=இது வணிக நிகழ்வுகளின் அடிப்படையிலான முன்னோட்டமாகும், இறுதி லெட்ஜர் அட்டவணையில் இருந்து அல்ல, எனவே இறுதி முடிவுகள் இந்த மாதிரிக்காட்சி மதிப்புகளிலிருந்து வேறுபடலாம்
+PercentOfInvoice=%%/invoice
+NotUsedForGoods=பொருட்களில் பயன்படுத்தப்படவில்லை
+ProposalStats=முன்மொழிவுகள் பற்றிய புள்ளிவிவரங்கள்
+OrderStats=ஆர்டர்களின் புள்ளிவிவரங்கள்
+InvoiceStats=பில்களின் புள்ளிவிவரங்கள்
+Dispatch=அனுப்புகிறது
+Dispatched=அனுப்பப்பட்டது
+ToDispatch=அனுப்புவதற்கு
+ThirdPartyMustBeEditAsCustomer=மூன்றாம் தரப்பினர் வாடிக்கையாளர் என வரையறுக்கப்பட வேண்டும்
+SellsJournal=விற்பனை இதழ்
+PurchasesJournal=கொள்முதல் இதழ்
+DescSellsJournal=விற்பனை இதழ்
+DescPurchasesJournal=கொள்முதல் இதழ்
+CodeNotDef=வரையறுக்கப்படவில்லை
+WarningDepositsNotIncluded=இந்தக் கணக்கியல் தொகுதியுடன் இந்தப் பதிப்பில் டவுன் பேமெண்ட் இன்வாய்ஸ்கள் சேர்க்கப்படவில்லை.
+DatePaymentTermCantBeLowerThanObjectDate=பணம் செலுத்தும் கால தேதி, பொருள் தேதியை விட குறைவாக இருக்கக்கூடாது.
+Pcg_version=கணக்கு மாதிரிகளின் விளக்கப்படம்
+Pcg_type=பிசிஜி வகை
+Pcg_subtype=பிசிஜி துணை வகை
+InvoiceLinesToDispatch=அனுப்புவதற்கான விலைப்பட்டியல் வரிகள்
+ByProductsAndServices=தயாரிப்பு மற்றும் சேவை மூலம்
+RefExt=வெளிப்புற குறிப்பு
+ToCreateAPredefinedInvoice=டெம்ப்ளேட் விலைப்பட்டியலை உருவாக்க, நிலையான விலைப்பட்டியலை உருவாக்கவும், பின்னர் அதை சரிபார்க்காமல், "%s" பொத்தானைக் கிளிக் செய்யவும்.
+LinkedOrder=ஆர்டருக்கான இணைப்பு
+Mode1=முறை 1
+Mode2=முறை 2
+CalculationRuleDesc=மொத்த VATஐக் கணக்கிட, இரண்டு முறைகள் உள்ளன: <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=சம்பளத்தின் குளோனை உறுதிப்படுத்தவும்
+CloneTaxForNextMonth=அடுத்த மாதம் அதை குளோன் செய்யுங்கள்
+SimpleReport=எளிமையான அறிக்கை
+AddExtraReport=கூடுதல் அறிக்கைகள் (வெளிநாட்டு மற்றும் தேசிய வாடிக்கையாளர் அறிக்கையைச் சேர்க்கவும்)
+OtherCountriesCustomersReport=வெளிநாட்டு வாடிக்கையாளர்கள் தெரிவிக்கின்றனர்
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=VAT எண்ணின் இரண்டு முதல் எழுத்துக்கள் உங்கள் சொந்த நிறுவனத்தின் நாட்டின் குறியீட்டிலிருந்து வேறுபட்டிருப்பதன் அடிப்படையில்
+SameCountryCustomersWithVAT=தேசிய வாடிக்கையாளர்கள் அறிக்கை
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=VAT எண்ணின் இரண்டு முதல் எழுத்துக்கள் உங்கள் சொந்த நிறுவனத்தின் நாட்டின் குறியீட்டைப் போலவே இருக்கும்
+LinkedFichinter=ஒரு தலையீட்டிற்கான இணைப்பு
+ImportDataset_tax_contrib=சமூக/நிதி வரிகள்
+ImportDataset_tax_vat=வாட் கொடுப்பனவுகள்
+ErrorBankAccountNotFound=பிழை: வங்கி கணக்கு கிடைக்கவில்லை
+FiscalPeriod=கணக்கீட்டு காலம்
+ListSocialContributionAssociatedProject=திட்டத்துடன் தொடர்புடைய சமூக பங்களிப்புகளின் பட்டியல்
+DeleteFromCat=கணக்கியல் குழுவிலிருந்து நீக்கு
+AccountingAffectation=கணக்கியல் பணி
+LastDayTaxIsRelatedTo=காலத்தின் கடைசி நாள் வரி தொடர்புடையது
+VATDue=விற்பனை வரி கோரப்பட்டது
+ClaimedForThisPeriod=கால அவகாசம் கோரப்பட்டது
+PaidDuringThisPeriod=இந்த காலத்திற்கு பணம் செலுத்தப்பட்டது
+PaidDuringThisPeriodDesc=இது தேர்ந்தெடுக்கப்பட்ட தேதி வரம்பில் காலக்கெடு முடிவடையும் தேதியைக் கொண்ட VAT அறிவிப்புகளுடன் இணைக்கப்பட்ட அனைத்து கட்டணங்களின் கூட்டுத்தொகையாகும்.
+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/ta_IN/contracts.lang b/htdocs/langs/ta_IN/contracts.lang
new file mode 100644
index 00000000000..0cd88ad5820
--- /dev/null
+++ b/htdocs/langs/ta_IN/contracts.lang
@@ -0,0 +1,104 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractsArea=ஒப்பந்த பகுதி
+ListOfContracts=ஒப்பந்தங்களின் பட்டியல்
+AllContracts=அனைத்து ஒப்பந்தங்களும்
+ContractCard=ஒப்பந்த அட்டை
+ContractStatusNotRunning=ஓடவில்லை
+ContractStatusDraft=வரைவு
+ContractStatusValidated=சரிபார்க்கப்பட்டது
+ContractStatusClosed=மூடப்பட்டது
+ServiceStatusInitial=ஓடவில்லை
+ServiceStatusRunning=ஓடுதல்
+ServiceStatusNotLate=இயங்குகிறது, காலாவதியாகவில்லை
+ServiceStatusNotLateShort=காலாவதியாகவில்லை
+ServiceStatusLate=இயங்குகிறது, காலாவதியானது
+ServiceStatusLateShort=காலாவதியான
+ServiceStatusClosed=மூடப்பட்டது
+ShowContractOfService=சேவை ஒப்பந்தத்தைக் காட்டு
+Contracts=ஒப்பந்தங்கள்
+ContractsSubscriptions=ஒப்பந்தங்கள்/சந்தாக்கள்
+ContractsAndLine=ஒப்பந்தங்கள் மற்றும் ஒப்பந்தங்களின் வரி
+Contract=ஒப்பந்த
+ContractLine=ஒப்பந்த வரி
+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=விற்பனை பிரதிநிதி ஒப்பந்தத்தில் கையெழுத்திடுகிறார்
+TypeContact_contrat_internal_SALESREPFOLL=விற்பனை பிரதிநிதி தொடர்ந்து ஒப்பந்தம்
+TypeContact_contrat_external_BILLING=பில்லிங் வாடிக்கையாளர் தொடர்பு
+TypeContact_contrat_external_CUSTOMER=பின்தொடர்தல் வாடிக்கையாளர் தொடர்பு
+TypeContact_contrat_external_SALESREPSIGN=வாடிக்கையாளர் தொடர்பு ஒப்பந்தத்தில் கையெழுத்திடுதல்
+HideClosedServiceByDefault=மூடிய சேவைகளை இயல்பாக மறை
+ShowClosedServices=மூடிய சேவைகளைக் காட்டு
+HideClosedServices=மூடிய சேவைகளை மறை
diff --git a/htdocs/langs/ta_IN/cron.lang b/htdocs/langs/ta_IN/cron.lang
new file mode 100644
index 00000000000..29aab0a040a
--- /dev/null
+++ b/htdocs/langs/ta_IN/cron.lang
@@ -0,0 +1,91 @@
+# Dolibarr language file - Source file is en_US - cron
+# About page
+# Right
+Permission23101 = திட்டமிடப்பட்ட வேலையைப் படியுங்கள்
+Permission23102 = திட்டமிடப்பட்ட வேலையை உருவாக்கவும்/புதுப்பிக்கவும்
+Permission23103 = திட்டமிடப்பட்ட வேலையை நீக்கு
+Permission23104 = திட்டமிடப்பட்ட வேலையைச் செய்யுங்கள்
+# Admin
+CronSetup=திட்டமிடப்பட்ட வேலை மேலாண்மை அமைப்பு
+URLToLaunchCronJobs=உலாவியில் இருந்து தகுதிவாய்ந்த கிரான் வேலைகளைச் சரிபார்த்து தொடங்குவதற்கான URL
+OrToLaunchASpecificJob=அல்லது உலாவியில் இருந்து குறிப்பிட்ட வேலையைச் சரிபார்த்து தொடங்கவும்
+KeyForCronAccess=கிரான் வேலைகளைத் தொடங்க URLக்கான பாதுகாப்பு விசை
+FileToLaunchCronJobs=தகுதிவாய்ந்த கிரான் வேலைகளைச் சரிபார்த்து தொடங்குவதற்கான கட்டளை வரி
+CronExplainHowToRunUnix=யுனிக்ஸ் சூழலில் ஒவ்வொரு 5 நிமிடங்களுக்கும் கட்டளை வரியை இயக்க பின்வரும் க்ரான்டாப் உள்ளீட்டைப் பயன்படுத்த வேண்டும்
+CronExplainHowToRunWin=Microsoft(tm) Windows சூழலில் ஒவ்வொரு 5 நிமிடங்களுக்கும் கட்டளை வரியை இயக்க திட்டமிடப்பட்ட பணிக் கருவிகளைப் பயன்படுத்தலாம்
+CronMethodDoesNotExists=வகுப்பு %s எந்த முறையையும் கொண்டிருக்கவில்லை %s
+CronMethodNotAllowed=%s வகுப்பின் %s முறை தடைசெய்யப்பட்ட முறைகளின் தடுப்புப்பட்டியலில் உள்ளது
+CronJobDefDesc=கிரான் வேலை விவரங்கள் தொகுதி விளக்கக் கோப்பில் வரையறுக்கப்பட்டுள்ளன. தொகுதி செயல்படுத்தப்படும் போது, அவை ஏற்றப்பட்டு கிடைக்கும், எனவே நீங்கள் நிர்வாக கருவிகள் மெனு %s மூலம் வேலைகளை நிர்வகிக்கலாம்.
+CronJobProfiles=முன் வரையறுக்கப்பட்ட கிரான் வேலை சுயவிவரங்களின் பட்டியல்
+# Menu
+EnabledAndDisabled=இயக்கப்பட்டது மற்றும் முடக்கப்பட்டது
+# Page list
+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= வேலைகளைச் சேர்க்கவும்
+CronEvery=ஒவ்வொரு வேலையைச் செய்யுங்கள்
+CronObject=உதாரணம்/உருவாக்கும் பொருள்
+CronArgs=அளவுருக்கள்
+CronSaveSucess=வெற்றிகரமாக சேமிக்கவும்
+CronNote=கருத்து
+CronFieldMandatory=புலங்கள் %s கட்டாயம்
+CronErrEndDateStartDt=இறுதித் தேதி தொடக்கத் தேதிக்கு முன் இருக்கக்கூடாது
+StatusAtInstall=தொகுதி நிறுவலின் நிலை
+CronStatusActiveBtn=அட்டவணை
+CronStatusInactiveBtn=முடக்கு
+CronTaskInactive=இந்த வேலை முடக்கப்பட்டுள்ளது (திட்டமிடப்படவில்லை)
+CronId=ஐடி
+CronClassFile=வகுப்போடு கோப்புப்பெயர்
+CronModuleHelp=Dolibarr தொகுதி கோப்பகத்தின் பெயர் (வெளிப்புற Dolibarr தொகுதியுடன் வேலை செய்யவும்). <BR> எடுத்துக்காட்டாக, Dolibarr Product object /htdocs/ <u> தயாரிப்பு </u> /class/product.class.php இன் பெறுதல் முறையை அழைக்க, தொகுதிக்கான மதிப்பு a03492fz8cf72018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+CronClassFileHelp=ஏற்றுவதற்கான தொடர்புடைய பாதை மற்றும் கோப்பு பெயர் (பாதை வலை சேவையக ரூட் கோப்பகத்துடன் தொடர்புடையது). <BR> உதாரணமாக Dolibarr தயாரிப்பு பொருள் htdocs / தயாரிப்பு / வர்க்கம் / <u> product.class.php </u> பிணைப்பை முறை அழைக்க, கிளாஸ் கோப்பு பெயர் மதிப்பு <br> <i> தயாரிப்பு / வர்க்கம் / product.class.php </i> உள்ளது
+CronObjectHelp=ஏற்ற வேண்டிய பொருளின் பெயர். <BR> எடுத்துக்காட்டாக, Dolibarr Product object /htdocs/product/class/product.class.php இன் பெறுதல் முறையை அழைக்க, வகுப்பு கோப்பு பெயருக்கான மதிப்பு <br> a049271e8181fcz638bacz0 தயாரிப்பு a
+CronMethodHelp=தொடங்குவதற்கான பொருள் முறை. <BR> எடுத்துக்காட்டாக, Dolibarr Product object /htdocs/product/class/product.class.php இன் பெறுதல் முறையை அழைக்க, முறைக்கான மதிப்பு <br> <i> fetch a634z58bac3z50
+CronArgsHelp=முறை வாதங்கள். <BR> எடுத்துக்காட்டாக, Dolibarr Product object /htdocs/product/class/product.class.php இன் பெறுதல் முறையை அழைக்க, அளவுருக்களுக்கான மதிப்பு <br> <i>,<i>,a040,a506
+CronCommandHelp=இயக்க வேண்டிய கணினி கட்டளை வரி.
+CronCreateJob=புதிய திட்டமிடப்பட்ட வேலையை உருவாக்கவும்
+CronFrom=இருந்து
+# Info
+# Common
+CronType=வேலை வகை
+CronType_method=PHP வகுப்பின் அழைப்பு முறை
+CronType_command=ஷெல் கட்டளை
+CronCannotLoadClass=%s வகுப்பு கோப்பை ஏற்ற முடியவில்லை (வகுப்பை %s பயன்படுத்த)
+CronCannotLoadObject=வகுப்பு கோப்பு %s ஏற்றப்பட்டது, ஆனால் ஆப்ஜெக்ட் %s அதில் காணப்படவில்லை
+UseMenuModuleToolsToAddCronJobs=திட்டமிடப்பட்ட வேலைகளைப் பார்க்கவும் திருத்தவும் " <a href="%s"> முகப்பு - நிர்வாகக் கருவிகள் - திட்டமிடப்பட்ட வேலைகள் </a> " என்ற மெனுவிற்குச் செல்லவும்.
+JobDisabled=வேலை முடக்கப்பட்டது
+MakeLocalDatabaseDumpShort=உள்ளூர் தரவுத்தள காப்புப்பிரதி
+MakeLocalDatabaseDump=உள்ளூர் தரவுத்தள டம்ப்பை உருவாக்கவும். அளவுருக்கள்: சுருக்கம் ('gz' அல்லது 'bz' அல்லது 'இல்லை'), காப்புப் பிரதி வகை ('mysql', 'pgsql', 'auto'), 1, 'தானியங்கு' அல்லது உருவாக்க வேண்டிய கோப்பு பெயர், வைத்திருக்க வேண்டிய காப்பு கோப்புகளின் எண்ணிக்கை
+WarningCronDelayed=கவனம், செயல்திறன் நோக்கத்திற்காக, செயல்படுத்தப்பட்ட வேலைகளை நிறைவேற்றுவதற்கான அடுத்த தேதி எதுவாக இருந்தாலும், உங்கள் வேலைகள் இயக்கப்படுவதற்கு முன், அதிகபட்சம் %s மணிநேரம் வரை தாமதமாகலாம்.
+DATAPOLICYJob=டேட்டா கிளீனர் மற்றும் அநாமதேயர்
+JobXMustBeEnabled=வேலை %s இயக்கப்பட்டிருக்க வேண்டும்
+# Cron Boxes
+LastExecutedScheduledJob=கடைசியாக செயல்படுத்தப்பட்ட திட்டமிடப்பட்ட வேலை
+NextScheduledJobExecute=அடுத்த திட்டமிடப்பட்ட வேலை
+NumberScheduledJobError=திட்டமிடப்பட்ட வேலைகளின் எண்ணிக்கை பிழை
diff --git a/htdocs/langs/ta_IN/deliveries.lang b/htdocs/langs/ta_IN/deliveries.lang
new file mode 100644
index 00000000000..0d76566722e
--- /dev/null
+++ b/htdocs/langs/ta_IN/deliveries.lang
@@ -0,0 +1,33 @@
+# Dolibarr language file - Source file is en_US - deliveries
+Delivery=டெலிவரி
+DeliveryRef=ரெஃப் டெலிவரி
+DeliveryCard=ரசீது அட்டை
+DeliveryOrder=விநியோக ரசீது
+DeliveryDate=டெலிவரி தேதி
+CreateDeliveryOrder=விநியோக ரசீதை உருவாக்கவும்
+DeliveryStateSaved=விநியோக நிலை சேமிக்கப்பட்டது
+SetDeliveryDate=ஷிப்பிங் தேதியை அமைக்கவும்
+ValidateDeliveryReceipt=டெலிவரி ரசீதை சரிபார்க்கவும்
+ValidateDeliveryReceiptConfirm=இந்த டெலிவரி ரசீதை நிச்சயமாக சரிபார்க்க விரும்புகிறீர்களா?
+DeleteDeliveryReceipt=டெலிவரி ரசீதை நீக்கு
+DeleteDeliveryReceiptConfirm=டெலிவரி ரசீதை <b> %s </b> நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+DeliveryMethod=விநியோக முறை
+TrackingNumber=கண்காணிப்பு எண்
+DeliveryNotValidated=விநியோகம் சரிபார்க்கப்படவில்லை
+StatusDeliveryCanceled=ரத்து செய்யப்பட்டது
+StatusDeliveryDraft=வரைவு
+StatusDeliveryValidated=பெற்றது
+# merou PDF model
+NameAndSignature=பெயர் மற்றும் கையொப்பம்:
+ToAndDate=__________________________________________________________________
+GoodStatusDeclaration=மேலே உள்ள பொருட்கள் நல்ல நிலையில் கிடைத்துள்ளன,
+Deliverer=வழங்குபவர்:
+Sender=அனுப்புபவர்
+Recipient=பெறுபவர்
+ErrorStockIsNotEnough=போதிய கையிருப்பு இல்லை
+Shippable=அனுப்பக்கூடியது
+NonShippable=அனுப்ப முடியாது
+ShowShippableStatus=அனுப்பக்கூடிய நிலையைக் காட்டு
+ShowReceiving=டெலிவரி ரசீதைக் காட்டு
+NonExistentOrder=இல்லாத ஒழுங்கு
+StockQuantitiesAlreadyAllocatedOnPreviousLines = முந்தைய வரிகளில் ஏற்கனவே ஒதுக்கப்பட்ட பங்கு அளவுகள்
diff --git a/htdocs/langs/ta_IN/dict.lang b/htdocs/langs/ta_IN/dict.lang
new file mode 100644
index 00000000000..7d0ae8521fa
--- /dev/null
+++ b/htdocs/langs/ta_IN/dict.lang
@@ -0,0 +1,359 @@
+# Dolibarr language file - Source file is en_US - dict
+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=ஐக்கிய இராச்சியம்
+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=திருமதி.
+CivilityMR=திரு.
+CivilityMLE=செல்வி.
+CivilityMTRE=குரு
+CivilityDR=டாக்டர்
+##### Currencies #####
+Currencyeuros=யூரோக்கள்
+CurrencyAUD=AU டாலர்கள்
+CurrencySingAUD=AU டாலர்
+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=CFA பிராங்க்ஸ் BEAC
+CurrencySingXAF=CFA பிராங்க் BEAC
+CurrencyXOF=CFA பிராங்க்ஸ் BCEAO
+CurrencySingXOF=CFA பிராங்க் BCEAO
+CurrencyXPF=CFP பிராங்க்ஸ்
+CurrencySingXPF=CFP பிராங்க்
+CurrencyCentEUR=சென்ட்
+CurrencyCentSingEUR=சதம்
+CurrencyCentINR=பைசா
+CurrencyCentSingINR=பைசா
+CurrencyThousandthSingTND=ஆயிரமாவது
+#### Input reasons #####
+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=வடிவம் 4A0
+PaperFormatEU2A0=வடிவம் 2A0
+PaperFormatEUA0=வடிவம் A0
+PaperFormatEUA1=வடிவம் A1
+PaperFormatEUA2=வடிவம் A2
+PaperFormatEUA3=வடிவம் A3
+PaperFormatEUA4=வடிவம் A4
+PaperFormatEUA5=வடிவம் A5
+PaperFormatEUA6=வடிவம் A6
+PaperFormatUSLETTER=வடிவ கடிதம் யு.எஸ்
+PaperFormatUSLEGAL=சட்டப்பூர்வ யுஎஸ்ஸை வடிவமைக்கவும்
+PaperFormatUSEXECUTIVE=ஃபார்மேட் எக்ஸிகியூட்டிவ் யு.எஸ்
+PaperFormatUSLEDGER=லெட்ஜர்/டேப்லாய்டு வடிவமைப்பு
+PaperFormatCAP1=வடிவமைப்பு P1 கனடா
+PaperFormatCAP2=வடிவமைப்பு P2 கனடா
+PaperFormatCAP3=வடிவமைப்பு P3 கனடா
+PaperFormatCAP4=வடிவமைப்பு P4 கனடா
+PaperFormatCAP5=வடிவமைப்பு P5 கனடா
+PaperFormatCAP6=வடிவமைப்பு P6 கனடா
+#### Expense report categories ####
+ExpAutoCat=கார்
+ExpCycloCat=மொபெட்
+ExpMotoCat=மோட்டார் பைக்
+ExpAuto3CV=3 சி.வி
+ExpAuto4CV=4 சி.வி
+ExpAuto5CV=5 சி.வி
+ExpAuto6CV=6 சி.வி
+ExpAuto7CV=7 சி.வி
+ExpAuto8CV=8 சி.வி
+ExpAuto9CV=9 சி.வி
+ExpAuto10CV=10 சி.வி
+ExpAuto11CV=11 சி.வி
+ExpAuto12CV=12 சி.வி
+ExpAuto3PCV=3 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 சி.வி
+ExpMoto345CV=மோட்டார் பைக் 3, 4 அல்லது 5 CV
+ExpMoto5PCV=மோட்டார் பைக் 5 CV மற்றும் பல
diff --git a/htdocs/langs/ta_IN/donations.lang b/htdocs/langs/ta_IN/donations.lang
new file mode 100644
index 00000000000..eb5d3b58a91
--- /dev/null
+++ b/htdocs/langs/ta_IN/donations.lang
@@ -0,0 +1,35 @@
+# Dolibarr language file - Source file is en_US - donations
+Donation=தானம்
+Donations=நன்கொடைகள்
+DonationRef=நன்கொடை குறிப்பு.
+Donor=நன்கொடையாளர்
+AddDonation=நன்கொடையை உருவாக்கவும்
+NewDonation=புதிய நன்கொடை
+DeleteADonation=நன்கொடையை நீக்கவும்
+ConfirmDeleteADonation=இந்த நன்கொடையை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+PublicDonation=பொது நன்கொடை
+DonationsArea=நன்கொடை பகுதி
+DonationStatusPromiseNotValidated=வரைவு வாக்குறுதி
+DonationStatusPromiseValidated=உறுதிப்படுத்தப்பட்ட வாக்குறுதி
+DonationStatusPaid=நன்கொடை பெறப்பட்டது
+DonationStatusPromiseNotValidatedShort=வரைவு
+DonationStatusPromiseValidatedShort=சரிபார்க்கப்பட்டது
+DonationStatusPaidShort=பெற்றது
+DonationTitle=நன்கொடை ரசீது
+DonationDate=நன்கொடை தேதி
+DonationDatePayment=கட்டணம் தேதி
+ValidPromess=வாக்குறுதியை உறுதிப்படுத்தவும்
+DonationReceipt=நன்கொடை ரசீது
+DonationsModels=நன்கொடை ரசீதுகளுக்கான ஆவண மாதிரிகள்
+LastModifiedDonations=சமீபத்திய %s மாற்றியமைக்கப்பட்ட நன்கொடைகள்
+DonationRecipient=நன்கொடை பெறுபவர்
+IConfirmDonationReception=பெறுநர் பின்வரும் தொகையை நன்கொடையாக அறிவிப்பார்
+MinimumAmount=குறைந்தபட்ச தொகை %s
+FreeTextOnDonations=அடிக்குறிப்பில் காட்ட இலவச உரை
+FrenchOptions=பிரான்சுக்கான விருப்பங்கள்
+DONATION_ART200=நீங்கள் கவலைப்பட்டால், CGI இலிருந்து கட்டுரை 200ஐக் காட்டுங்கள்
+DONATION_ART238=நீங்கள் கவலைப்பட்டால், CGI இலிருந்து கட்டுரை 238ஐக் காட்டுங்கள்
+DONATION_ART885=நீங்கள் கவலைப்பட்டால், CGI இலிருந்து கட்டுரை 885 ஐக் காட்டுங்கள்
+DonationPayment=நன்கொடை செலுத்துதல்
+DonationValidated=நன்கொடை %s சரிபார்க்கப்பட்டது
+DonationUseThirdparties=ஏற்கனவே உள்ள மூன்றாம் தரப்பினரை நன்கொடையாளர்களின் ஒருங்கிணைப்புகளாகப் பயன்படுத்தவும்
diff --git a/htdocs/langs/ta_IN/ecm.lang b/htdocs/langs/ta_IN/ecm.lang
new file mode 100644
index 00000000000..e9c049ec9f0
--- /dev/null
+++ b/htdocs/langs/ta_IN/ecm.lang
@@ -0,0 +1,49 @@
+# Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=கோப்பகத்தில் உள்ள ஆவணங்களின் எண்ணிக்கை
+ECMSection=அடைவு
+ECMSectionManual=கையேடு அடைவு
+ECMSectionAuto=தானியங்கி அடைவு
+ECMSectionsManual=கையேடு மரம்
+ECMSectionsAuto=தானியங்கி மரம்
+ECMSections=அடைவுகள்
+ECMRoot=ஈசிஎம் ரூட்
+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=Extrafields Ecm கோப்பகங்கள்
+ECMSetup=ECM அமைப்பு
+GenerateImgWebp=அனைத்து படங்களையும் .webp வடிவத்துடன் மற்றொரு பதிப்பில் நகலெடுக்கவும்
+ConfirmGenerateImgWebp=நீங்கள் உறுதிசெய்தால், தற்போது இந்தக் கோப்புறையில் உள்ள அனைத்து படங்களுக்கும் .webp வடிவத்தில் ஒரு படத்தை உருவாக்குவீர்கள் (துணை கோப்புறைகள் சேர்க்கப்படவில்லை)...
+ConfirmImgWebpCreation=அனைத்து படங்களின் நகலையும் உறுதிப்படுத்தவும்
+SucessConvertImgWebp=படங்கள் வெற்றிகரமாக நகலெடுக்கப்பட்டன
+ECMDirName=பெயர்
+ECMParentDirectory=பெற்றோர் அடைவு
diff --git a/htdocs/langs/ta_IN/errors.lang b/htdocs/langs/ta_IN/errors.lang
new file mode 100644
index 00000000000..04fa1d14975
--- /dev/null
+++ b/htdocs/langs/ta_IN/errors.lang
@@ -0,0 +1,334 @@
+# Dolibarr language file - Source file is en_US - errors
+
+# No errors
+NoErrorCommitIsDone=தவறு இல்லை, நாங்கள் செய்கிறோம்
+# Errors
+ErrorButCommitIsDone=பிழைகள் கண்டறியப்பட்டன, இருப்பினும் இதை நாங்கள் சரிபார்க்கிறோம்
+ErrorBadEMail=மின்னஞ்சல் %s தவறானது
+ErrorBadMXDomain=மின்னஞ்சல் %s தவறாகத் தெரிகிறது (டொமைனில் சரியான MX பதிவு இல்லை)
+ErrorBadUrl=Url %s தவறானது
+ErrorBadValueForParamNotAString=உங்கள் அளவுருவுக்கு மோசமான மதிப்பு. மொழிபெயர்ப்பு இல்லாதபோது இது பொதுவாக இணைக்கப்படும்.
+ErrorRefAlreadyExists=குறிப்பு <b> %s </b> ஏற்கனவே உள்ளது.
+ErrorLoginAlreadyExists=உள்நுழைவு %s ஏற்கனவே உள்ளது.
+ErrorGroupAlreadyExists=குழு %s ஏற்கனவே உள்ளது.
+ErrorEmailAlreadyExists=மின்னஞ்சல் %s ஏற்கனவே உள்ளது.
+ErrorRecordNotFound=பதிவு கிடைக்கவில்லை.
+ErrorFailToCopyFile=' <b> %s </b> ' கோப்பை நகலெடுப்பதில் தோல்வி
+ErrorFailToCopyDir=' <b> %s </b> ' கோப்பகத்தை ' <b> %s a09a4b739f17 இல் நகலெடுக்க முடியவில்லை.
+ErrorFailToRenameFile=' <b> %s </b> ' என்ற கோப்பின் பெயரை ' <b> %s a09a4b739f' ஆக மாற்ற முடியவில்லை.
+ErrorFailToDeleteFile=' <b> %s </b> ' கோப்பை அகற்றுவதில் தோல்வி.
+ErrorFailToCreateFile=' <b> %s </b> ' கோப்பை உருவாக்குவதில் தோல்வி.
+ErrorFailToRenameDir=கோப்பகத்தின் பெயரை மாற்றுவதில் தோல்வி
+ErrorFailToCreateDir=' <b> %s </b> ' கோப்பகத்தை உருவாக்குவதில் தோல்வி.
+ErrorFailToDeleteDir=' <b> %s </b> ' கோப்பகத்தை நீக்குவதில் தோல்வி.
+ErrorFailToMakeReplacementInto=' <b> %s </b> ' கோப்பில் மாற்றியமைக்க முடியவில்லை.
+ErrorFailToGenerateFile=' <b> %s </b> ' கோப்பை உருவாக்க முடியவில்லை.
+ErrorThisContactIsAlreadyDefinedAsThisType=இந்த தொடர்பு இந்த வகைக்கான தொடர்பு என ஏற்கனவே வரையறுக்கப்பட்டுள்ளது.
+ErrorCashAccountAcceptsOnlyCashMoney=இந்த வங்கிக் கணக்கு ஒரு பணக் கணக்கு, எனவே இது பண வகையை மட்டுமே செலுத்தும்.
+ErrorFromToAccountsMustDiffers=வங்கிக் கணக்குகளின் மூலமும் இலக்குகளும் வேறுபட்டதாக இருக்க வேண்டும்.
+ErrorBadThirdPartyName=மூன்றாம் தரப்பு பெயருக்கு மோசமான மதிப்பு
+ForbiddenBySetupRules=Forbidden by setup rules
+ErrorProdIdIsMandatory=%s கட்டாயம்
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
+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 உடன் மின்னஞ்சல்=%s)
+ErrorUserCannotBeDelete=பயனரை நீக்க முடியாது. ஒருவேளை இது Dolibarr நிறுவனங்களுடன் தொடர்புடையதாக இருக்கலாம்.
+ErrorFieldsRequired=தேவையான சில புலங்கள் காலியாக விடப்பட்டுள்ளன.
+ErrorSubjectIsRequired=மின்னஞ்சல் பொருள் தேவை
+ErrorFailedToCreateDir=கோப்பகத்தை உருவாக்குவதில் தோல்வி. Dolibarr ஆவணங்கள் கோப்பகத்தில் எழுத இணைய சேவையக பயனருக்கு அனுமதி உள்ளதா என சரிபார்க்கவும். இந்த PHP இல் அளவுரு <b> safe_mode </b> இயக்கப்பட்டிருந்தால், Dolibarr php கோப்புகள் இணைய சேவையக பயனருக்கு (அல்லது குழுவிற்கு) சொந்தமானதா என சரிபார்க்கவும்.
+ErrorNoMailDefinedForThisUser=இந்தப் பயனருக்கு அஞ்சல் எதுவும் வரையறுக்கப்படவில்லை
+ErrorSetupOfEmailsNotComplete=மின்னஞ்சல்களின் அமைவு முழுமையடையவில்லை
+ErrorFeatureNeedJavascript=இந்த அம்சம் வேலை செய்ய ஜாவாஸ்கிரிப்ட் செயல்படுத்தப்பட வேண்டும். இதை அமைவு - காட்சியில் மாற்றவும்.
+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=முழு எண்ணாக அளவு மிக நீளமானது (அதிகபட்சம் %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=பதிவு செய்யப்பட வேண்டிய வங்கி அறிக்கையின் பெயரை உள்ளிடவும் (வடிவம் YYYYMM அல்லது YYYYMMDD)
+ErrorRecordHasChildren=சில குழந்தை பதிவுகள் இருப்பதால் பதிவை நீக்க முடியவில்லை.
+ErrorRecordHasAtLeastOneChildOfType=ஆப்ஜெக்ட் %s இல் குறைந்தது ஒரு குழந்தையாவது %s வகை உள்ளது
+ErrorRecordIsUsedCantDelete=பதிவை நீக்க முடியாது. இது ஏற்கனவே பயன்படுத்தப்பட்டது அல்லது மற்றொரு பொருளில் சேர்க்கப்பட்டுள்ளது.
+ErrorModuleRequireJavascript=இந்த அம்சம் செயல்பட ஜாவாஸ்கிரிப்ட் முடக்கப்படக்கூடாது. ஜாவாஸ்கிரிப்டை இயக்க/முடக்க, மெனு முகப்பு->அமைவு->காட்சிக்குச் செல்லவும்.
+ErrorPasswordsMustMatch=தட்டச்சு செய்யப்பட்ட இரண்டு கடவுச்சொற்களும் ஒன்றுக்கொன்று பொருந்த வேண்டும்
+ErrorContactEMail=தொழில்நுட்ப பிழை ஏற்பட்டது. தயவு செய்து, பின்வரும் மின்னஞ்சலுக்கு நிர்வாகியைத் தொடர்புகொள்ளவும் <b> %s </b> மற்றும் பிழைக் குறியீட்டை <b> %s a009a4b7
+ErrorWrongValueForField=புலம் <b> %s </b> : ' <b> %s a09a4b739f49fz0 a09a4b739f17f8365837fz0 %s a09a4b739f490 a09a4b739f490 a09a4b739f170a4b739f170a4b739f170a4b739f170a4b739f170a4b739f170a4b739f170a4b739f170a4b730
+ErrorFieldValueNotIn=களம் <b> %s </b>: '<b> %s </b>' மதிப்பின் துறையில் <b> %s </b> காணப்படும் அல்ல <b> %s </b>
+ErrorFieldRefNotIn=புலம் <b> %s </b> : ' <b> %s a09a4b739f17f8365873906878887878787887
+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=இந்த உள்நுழைவுக்கான அனுமதியை %s->%s என்ற மெனுவிலிருந்து உங்கள் Dolibarr நிர்வாகியால் வரையறுக்க முடியும்.
+ErrorForbidden3=அங்கீகரிக்கப்பட்ட அமர்வு மூலம் Dolibarr பயன்படுத்தப்படவில்லை என்று தெரிகிறது. அங்கீகாரங்களை எவ்வாறு நிர்வகிப்பது என்பதை அறிய Dolibarr அமைவு ஆவணங்களைப் பார்க்கவும் (htaccess, mod_auth அல்லது பிற...).
+ErrorForbidden4=குறிப்பு: இந்த உள்நுழைவுக்கான தற்போதைய அமர்வுகளை அழிக்க உங்கள் உலாவி குக்கீகளை அழிக்கவும்.
+ErrorNoImagickReadimage=இந்த PHP இல் Class Imagick இல்லை. முன்னோட்டம் எதுவும் கிடைக்காது. நிர்வாகிகள் இந்த தாவலை மெனு அமைப்பு - காட்சியிலிருந்து முடக்கலாம்.
+ErrorRecordAlreadyExists=பதிவு ஏற்கனவே உள்ளது
+ErrorLabelAlreadyExists=இந்த லேபிள் ஏற்கனவே உள்ளது
+ErrorCantReadFile='%s' கோப்பைப் படிக்க முடியவில்லை
+ErrorCantReadDir='%s' கோப்பகத்தைப் படிக்க முடியவில்லை
+ErrorBadLoginPassword=உள்நுழைவு அல்லது கடவுச்சொல்லுக்கான மோசமான மதிப்பு
+ErrorLoginDisabled=உங்கள் கணக்கு முடக்கப்பட்டுள்ளது
+ErrorFailedToRunExternalCommand=வெளிப்புற கட்டளையை இயக்குவதில் தோல்வி. இது உங்கள் PHP சர்வர் பயனரால் கிடைக்கிறதா மற்றும் இயக்கக்கூடியதா என சரிபார்க்கவும். ஆபரேமர் போன்ற பாதுகாப்பு அடுக்கு மூலம் கட்டளை ஷெல் மட்டத்தில் பாதுகாக்கப்படவில்லை என்பதையும் சரிபார்க்கவும்.
+ErrorFailedToChangePassword=கடவுச்சொல்லை மாற்ற முடியவில்லை
+ErrorLoginDoesNotExists=<b> %s </b> உள்ள பயனரைக் கண்டறிய முடியவில்லை.
+ErrorLoginHasNoEmail=இந்தப் பயனருக்கு மின்னஞ்சல் முகவரி இல்லை. செயல்முறை நிறுத்தப்பட்டது.
+ErrorBadValueForCode=பாதுகாப்பு குறியீட்டின் மோசமான மதிப்பு. புதிய மதிப்புடன் மீண்டும் முயற்சிக்கவும்...
+ErrorBothFieldCantBeNegative=புலங்கள் %s மற்றும் %s இரண்டும் எதிர்மறையாக இருக்க முடியாது
+ErrorFieldCantBeNegativeOnInvoice=புலம் <strong> %s </strong> இந்த வகை விலைப்பட்டியலில் எதிர்மறையாக இருக்க முடியாது. நீங்கள் தள்ளுபடி வரியைச் சேர்க்க வேண்டும் என்றால், முதலில் தள்ளுபடியை உருவாக்கவும் (மூன்றாம் தரப்பு அட்டையில் உள்ள '%s' புலத்திலிருந்து) அதை விலைப்பட்டியலில் பயன்படுத்தவும்.
+ErrorLinesCantBeNegativeForOneVATRate=கொடுக்கப்பட்ட பூஜ்ய அல்லாத VAT விகிதத்திற்கு மொத்த வரிகள் (வரியின் நிகரம்) எதிர்மறையாக இருக்க முடியாது (VAT விகிதம் <b> %s </b> %% க்கு எதிர்மறை மொத்தம் உள்ளது).
+ErrorLinesCantBeNegativeOnDeposits=டெபாசிட்டில் கோடுகள் எதிர்மறையாக இருக்கக்கூடாது. நீங்கள் அவ்வாறு செய்தால், இறுதி விலைப்பட்டியலில் வைப்புத்தொகையை உட்கொள்ள வேண்டியிருக்கும் போது நீங்கள் சிக்கல்களைச் சந்திக்க நேரிடும்.
+ErrorQtyForCustomerInvoiceCantBeNegative=வாடிக்கையாளர் இன்வாய்ஸில் உள்ள வரியின் அளவு எதிர்மறையாக இருக்கக்கூடாது
+ErrorWebServerUserHasNotPermission=இணையச் சேவையகத்தை இயக்கப் பயன்படுத்தப்படும் <b> %s </b> என்ற கணக்கிற்கு அதற்கான அனுமதி இல்லை
+ErrorNoActivatedBarcode=பார்கோடு வகை எதுவும் செயல்படுத்தப்படவில்லை
+ErrUnzipFails=ZipArchive மூலம் %s ஐ அன்சிப் செய்ய முடியவில்லை
+ErrNoZipEngine=இந்த PHPயில் %s கோப்பை ஜிப்/அன்சிப் செய்ய எஞ்சின் இல்லை
+ErrorFileMustBeADolibarrPackage=%s கோப்பு கண்டிப்பாக Dolibarr zip தொகுப்பாக இருக்க வேண்டும்
+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=OpenID அங்கீகாரத்தை அனுமதிக்க Dolibarr config கோப்பை அமைக்கிறீர்கள், ஆனால் OpenID சேவையின் URL ஆனது நிலையான %s என வரையறுக்கப்படவில்லை.
+ErrorWarehouseMustDiffers=மூல மற்றும் இலக்கு கிடங்குகள் வேறுபட்டிருக்க வேண்டும்
+ErrorBadFormat=மோசமான வடிவம்!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=பிழை, இந்த உறுப்பினர் இதுவரை எந்த மூன்றாம் தரப்பினருடனும் இணைக்கப்படவில்லை. தற்போதைய மூன்றாம் தரப்பினருடன் உறுப்பினரை இணைக்கவும் அல்லது விலைப்பட்டியலுடன் சந்தாவை உருவாக்கும் முன் புதிய மூன்றாம் தரப்பினரை உருவாக்கவும்.
+ErrorThereIsSomeDeliveries=பிழை, இந்த ஷிப்மென்ட்டுடன் சில டெலிவரிகள் இணைக்கப்பட்டுள்ளன. நீக்கம் மறுத்துவிட்டது.
+ErrorCantDeletePaymentReconciliated=சமரசம் செய்யப்பட்ட வங்கி உள்ளீட்டை உருவாக்கிய கட்டணத்தை நீக்க முடியாது
+ErrorCantDeletePaymentSharedWithPayedInvoice=கட்டணம் செலுத்தப்பட்ட நிலையுடன் குறைந்தபட்சம் ஒரு இன்வாய்ஸ் மூலம் பகிரப்பட்ட கட்டணத்தை நீக்க முடியாது
+ErrorPriceExpression1=நிலையான '%s'க்கு ஒதுக்க முடியாது
+ErrorPriceExpression2='%s' உள்ளமைக்கப்பட்ட செயல்பாட்டை மறுவரையறை செய்ய முடியாது
+ErrorPriceExpression3=செயல்பாட்டு வரையறையில் வரையறுக்கப்படாத மாறி '%s'
+ErrorPriceExpression4=சட்டவிரோத எழுத்து '%s'
+ErrorPriceExpression5=எதிர்பாராத '%s'
+ErrorPriceExpression6=தவறான எண்ணிக்கையிலான வாதங்கள் (%s கொடுக்கப்பட்டுள்ளது, %s எதிர்பார்க்கப்படுகிறது)
+ErrorPriceExpression8=எதிர்பாராத ஆபரேட்டர் '%s'
+ErrorPriceExpression9=எதிர்பாராத பிழை ஏற்பட்டது
+ErrorPriceExpression10=ஆபரேட்டர் '%s' இல் operand இல்லை
+ErrorPriceExpression11='%s' என எதிர்பார்க்கப்படுகிறது
+ErrorPriceExpression14=பூஜ்ஜியத்தால் வகுத்தல்
+ErrorPriceExpression17=வரையறுக்கப்படாத மாறி '%s'
+ErrorPriceExpression19=வெளிப்பாடு காணப்படவில்லை
+ErrorPriceExpression20=வெற்று வெளிப்பாடு
+ErrorPriceExpression21=வெற்று முடிவு '%s'
+ErrorPriceExpression22=எதிர்மறை முடிவு '%s'
+ErrorPriceExpression23=%s இல் தெரியாத அல்லது அமைக்கப்படாத மாறி '%s'
+ErrorPriceExpression24=மாறி '%s' உள்ளது ஆனால் மதிப்பு இல்லை
+ErrorPriceExpressionInternal=அகப் பிழை '%s'
+ErrorPriceExpressionUnknown=அறியப்படாத பிழை '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=மூல மற்றும் இலக்கு கிடங்குகள் வேறுபட்டிருக்க வேண்டும்
+ErrorTryToMakeMoveOnProductRequiringBatchData=நிறைய/தொடர் தகவல் தேவைப்படும் தயாரிப்பான '%s' இல், நிறைய/தொடர் தகவல் இல்லாமல் பங்குகளை நகர்த்த முயற்சிக்கும்போது பிழை
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=இந்தச் செயலைச் செய்ய அனுமதிக்கும் முன், பதிவுசெய்யப்பட்ட அனைத்து வரவேற்புகளும் முதலில் சரிபார்க்கப்பட வேண்டும் (அங்கீகரிக்கப்பட வேண்டும் அல்லது மறுக்கப்பட வேண்டும்).
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=இந்தச் செயலைச் செய்ய அனுமதிக்கும் முன், பதிவுசெய்யப்பட்ட அனைத்து வரவேற்புகளும் முதலில் சரிபார்க்கப்பட வேண்டும் (அங்கீகரிக்கப்பட வேண்டும்).
+ErrorGlobalVariableUpdater0='%s' பிழையால் HTTP கோரிக்கை தோல்வியடைந்தது
+ErrorGlobalVariableUpdater1=தவறான JSON வடிவம் '%s'
+ErrorGlobalVariableUpdater2='%s' அளவுரு இல்லை
+ErrorGlobalVariableUpdater3=கோரப்பட்ட தரவு முடிவில் கிடைக்கவில்லை
+ErrorGlobalVariableUpdater4=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=தொகுதியின் ஜிப்பில் குறைந்தது ஒரு கட்டாய கோப்பகமாவது இருக்க வேண்டும்: <strong> %s </strong> அல்லது <strong> a0ecb2ec87f4a695dc019
+ErrorFilenameDosNotMatchDolibarrPackageRules=தொகுதி தொகுப்பின் பெயர் ( <strong> %s </strong> ) எதிர்பார்க்கப்படும் பெயரின் தொடரியல் உடன் பொருந்தவில்லை: <strong> %s
+ErrorDuplicateTrigger=பிழை, நகல் தூண்டுதல் பெயர் %s. %s இலிருந்து ஏற்கனவே ஏற்றப்பட்டது.
+ErrorNoWarehouseDefined=பிழை, கிடங்குகள் வரையறுக்கப்படவில்லை.
+ErrorBadLinkSourceSetButBadValueForRef=நீங்கள் பயன்படுத்தும் இணைப்பு தவறானது. பணம் செலுத்துவதற்கான 'ஆதாரம்' வரையறுக்கப்பட்டுள்ளது, ஆனால் 'ref'க்கான மதிப்பு செல்லுபடியாகாது.
+ErrorTooManyErrorsProcessStopped=பல பிழைகள். செயல்முறை நிறுத்தப்பட்டது.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=இந்தச் செயலில் பங்குகளை அதிகரிக்க/குறைப்பதற்கான விருப்பத்தை அமைக்கும் போது பெருமளவிலான சரிபார்ப்பு சாத்தியமில்லை (நீங்கள் ஒவ்வொன்றாகச் சரிபார்க்க வேண்டும், எனவே நீங்கள் கிடங்கை அதிகரிக்க/குறைக்க வரையறுக்கலாம்)
+ErrorObjectMustHaveStatusDraftToBeValidated=ஆப்ஜெக்ட் %s சரிபார்க்கப்பட, 'வரைவு' நிலையைக் கொண்டிருக்க வேண்டும்.
+ErrorObjectMustHaveLinesToBeValidated=பொருள் %s சரிபார்க்கப்பட வேண்டிய வரிகளைக் கொண்டிருக்க வேண்டும்.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction="மின்னஞ்சல் மூலம் அனுப்பு" வெகுஜன நடவடிக்கையைப் பயன்படுத்தி சரிபார்க்கப்பட்ட இன்வாய்ஸ்களை மட்டுமே அனுப்ப முடியும்.
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=கட்டுரை முன் வரையறுக்கப்பட்ட தயாரிப்பா இல்லையா என்பதை நீங்கள் தேர்வு செய்ய வேண்டும்
+ErrorDiscountLargerThanRemainToPaySplitItBefore=நீங்கள் விண்ணப்பிக்க முயற்சிக்கும் தள்ளுபடி, செலுத்த வேண்டியதை விட அதிகமாக உள்ளது. முன் தள்ளுபடியை 2 சிறிய தள்ளுபடிகளாகப் பிரிக்கவும்.
+ErrorFileNotFoundWithSharedLink=கோப்பு கிடைக்கவில்லை. பங்கு விசை மாற்றப்பட்டிருக்கலாம் அல்லது கோப்பு சமீபத்தில் அகற்றப்பட்டிருக்கலாம்.
+ErrorProductBarCodeAlreadyExists=தயாரிப்பு பார்கோடு %s ஏற்கனவே மற்றொரு தயாரிப்பு குறிப்பில் உள்ளது.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=குறைந்த பட்சம் ஒரு துணை தயாரிப்புக்கு (அல்லது துணை தயாரிப்புகளின் துணை தயாரிப்புக்கு) வரிசை/நிறைய எண் தேவைப்படும்போது, துணை தயாரிப்புகளின் தானாக அதிகரிப்பு/குறைப்புக்கான கருவிகளைப் பயன்படுத்துவது சாத்தியமில்லை என்பதையும் கவனத்தில் கொள்ளவும்.
+ErrorDescRequiredForFreeProductLines=இலவச தயாரிப்புடன் கூடிய வரிகளுக்கு விளக்கம் கட்டாயம்
+ErrorAPageWithThisNameOrAliasAlreadyExists=நீங்கள் பயன்படுத்த முயற்சிக்கும் பக்கம்/கொள்கலன் <strong> %s </strong> அதே பெயர் அல்லது மாற்று மாற்றுப் பெயரைக் கொண்டுள்ளது
+ErrorDuringChartLoad=கணக்குகளின் விளக்கப்படத்தை ஏற்றும்போது பிழை. சில கணக்குகள் ஏற்றப்படவில்லை என்றால், நீங்கள் அவற்றை கைமுறையாக உள்ளிடலாம்.
+ErrorBadSyntaxForParamKeyForContent=பரம் விசைக்கான உள்ளடக்கத்திற்கான தவறான தொடரியல். %s அல்லது %s இல் தொடங்கும் மதிப்பு இருக்க வேண்டும்
+ErrorVariableKeyForContentMustBeSet=பிழை, %s என்ற பெயரில் மாறிலி (காண்பிக்க உரை உள்ளடக்கத்துடன்) அல்லது %s (காட்டுவதற்கு வெளிப்புற url உடன்) அமைக்கப்பட வேண்டும்.
+ErrorURLMustEndWith=URL %s கண்டிப்பாக %s
+ErrorURLMustStartWithHttp=URL %s கண்டிப்பாக http:// அல்லது https:// உடன் தொடங்க வேண்டும்
+ErrorHostMustNotStartWithHttp=ஹோஸ்ட் பெயர் %s கண்டிப்பாக http:// அல்லது https:// என்று தொடங்கக்கூடாது
+ErrorNewRefIsAlreadyUsed=பிழை, புதிய குறிப்பு ஏற்கனவே பயன்படுத்தப்பட்டது
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=பிழை, மூடப்பட்ட விலைப்பட்டியலுடன் இணைக்கப்பட்ட கட்டணத்தை நீக்குவது சாத்தியமில்லை.
+ErrorSearchCriteriaTooSmall=தேடல் அளவுகோல் மிகவும் சிறியது.
+ErrorObjectMustHaveStatusActiveToBeDisabled=ஆப்ஜெக்ட்களை முடக்குவதற்கு 'செயலில்' நிலை இருக்க வேண்டும்
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=பொருள்கள் இயக்கப்படுவதற்கு 'வரைவு' அல்லது 'முடக்கப்பட்டது' என்ற நிலையைப் பெற்றிருக்க வேண்டும்
+ErrorNoFieldWithAttributeShowoncombobox='%s' ஆப்ஜெக்ட்டின் வரையறையில் 'ஷோவான்காம்போபாக்ஸ்' எந்தப் புலத்திலும் இல்லை. காம்போலிஸ்ட்டைக் காட்ட வழி இல்லை.
+ErrorFieldRequiredForProduct=%s தயாரிப்புக்கு '%s' புலம் தேவை
+ProblemIsInSetupOfTerminal=%s முனையத்தை அமைப்பதில் சிக்கல் உள்ளது.
+ErrorAddAtLeastOneLineFirst=முதலில் ஒரு வரியையாவது சேர்க்கவும்
+ErrorRecordAlreadyInAccountingDeletionNotPossible=பிழை, கணக்கியலில் பதிவு ஏற்கனவே மாற்றப்பட்டுள்ளது, நீக்குவது சாத்தியமில்லை.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=பிழை, மற்றொரு பக்கத்தின் மொழிபெயர்ப்பாக நீங்கள் பக்கத்தை அமைத்தால் மொழி கட்டாயமாகும்.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=பிழை, மொழிபெயர்க்கப்பட்ட பக்கத்தின் மொழியும் இதையும் விட ஒன்றுதான்.
+ErrorBatchNoFoundForProductInWarehouse="%s" கிடங்கில் "%s" தயாரிப்புக்கான நிறைய/தொடர் எதுவும் இல்லை.
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse="%s" கிடங்கில் உள்ள "%s" தயாரிப்புக்கான இந்த லாட்/சீரியலுக்கு போதுமான அளவு இல்லை.
+ErrorOnlyOneFieldForGroupByIsPossible='குரூப் பை'க்கு 1 புலம் மட்டுமே சாத்தியம் (மற்றவை நிராகரிக்கப்படும்)
+ErrorTooManyDifferentValueForSelectedGroupBy='<b> %s %s %s %s a09f17b7 'Group By' புலம் அகற்றப்பட்டது. நீங்கள் அதை X-Axis ஆகப் பயன்படுத்த விரும்புகிறீர்களா?
+ErrorReplaceStringEmpty=பிழை, மாற்ற வேண்டிய சரம் காலியாக உள்ளது
+ErrorProductNeedBatchNumber=பிழை, தயாரிப்பு ' <b> %s </b> ' நிறைய/வரிசை எண் தேவை
+ErrorProductDoesNotNeedBatchNumber=பிழை, தயாரிப்பு ' <b> %s </b> ' நிறைய/வரிசை எண்ணை ஏற்கவில்லை
+ErrorFailedToReadObject=பிழை, <b> %s </b> வகைப் பொருளைப் படிக்க முடியவில்லை
+ErrorParameterMustBeEnabledToAllwoThisFeature=பிழை, அளவுரு <b> %s </b> ஆனது <b> conf/conf.php இல் செயல்படுத்தப்பட வேண்டும்.
+ErrorLoginDateValidity=பிழை, இந்த உள்நுழைவு செல்லுபடியாகும் தேதி வரம்பிற்கு வெளியே உள்ளது
+ErrorValueLength=புலத்தின் நீளம் ' <b> %s </b> ' ' <b> %s a09a4b7390 'ஐ விட அதிகமாக இருக்க வேண்டும்
+ErrorReservedKeyword='<b> %s </b>' என்ற சொல் ஒதுக்கப்பட்ட முக்கிய சொல்லாகும்
+ErrorNotAvailableWithThisDistribution=இந்த விநியோகத்தில் கிடைக்கவில்லை
+ErrorPublicInterfaceNotEnabled=பொது இடைமுகம் இயக்கப்படவில்லை
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=புதிய பக்கத்தின் மொழி வேறொரு பக்கத்தின் மொழிபெயர்ப்பாக அமைக்கப்பட்டால் அது வரையறுக்கப்பட வேண்டும்
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=புதிய பக்கத்தின் மொழி வேறொரு பக்கத்தின் மொழிபெயர்ப்பாக அமைக்கப்பட்டால் அது மூல மொழியாக இருக்கக்கூடாது
+ErrorAParameterIsRequiredForThisOperation=இந்த செயல்பாட்டிற்கு ஒரு அளவுரு கட்டாயமாகும்
+ErrorDateIsInFuture=பிழை, தேதி எதிர்காலத்தில் இருக்க முடியாது
+ErrorAnAmountWithoutTaxIsRequired=பிழை, தொகை கட்டாயம்
+ErrorAPercentIsRequired=பிழை, சதவீதத்தை சரியாக நிரப்பவும்
+ErrorYouMustFirstSetupYourChartOfAccount=முதலில் உங்கள் கணக்கின் விளக்கப்படத்தை அமைக்க வேண்டும்
+ErrorFailedToFindEmailTemplate=%s என்ற குறியீட்டுப் பெயருடன் டெம்ப்ளேட்டைக் கண்டறிய முடியவில்லை
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=சேவையில் காலம் வரையறுக்கப்படவில்லை. மணிநேர விலையை கணக்கிட வழி இல்லை.
+ErrorActionCommPropertyUserowneridNotDefined=பயனரின் உரிமையாளர் தேவை
+ErrorActionCommBadType=தேர்ந்தெடுக்கப்பட்ட நிகழ்வு வகை (ஐடி: %n, குறியீடு: %s) நிகழ்வு வகை அகராதியில் இல்லை
+CheckVersionFail=பதிப்பு சரிபார்ப்பு தோல்வி
+ErrorWrongFileName=கோப்பின் பெயரில் __சம்திங்__ இருக்கக்கூடாது
+ErrorNotInDictionaryPaymentConditions=கட்டண விதிமுறைகள் அகராதியில் இல்லை, தயவுசெய்து மாற்றவும்.
+ErrorIsNotADraft=%s ஒரு வரைவு அல்ல
+ErrorExecIdFailed="id" கட்டளையை இயக்க முடியவில்லை
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
+ErrorRequestTooLarge=Error, request too large
+
+# Warnings
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=உங்கள் PHP அளவுரு upload_max_filesize (%s) PHP அளவுரு post_max_size (%s) ஐ விட அதிகமாக உள்ளது. இது ஒரு நிலையான அமைப்பு அல்ல.
+WarningPasswordSetWithNoAccount=இந்த உறுப்பினருக்கு கடவுச்சொல் அமைக்கப்பட்டது. இருப்பினும், பயனர் கணக்கு எதுவும் உருவாக்கப்படவில்லை. எனவே இந்த கடவுச்சொல் சேமிக்கப்பட்டுள்ளது ஆனால் Dolibarr இல் உள்நுழைய பயன்படுத்த முடியாது. இது ஒரு வெளிப்புற தொகுதி/இடைமுகத்தால் பயன்படுத்தப்படலாம், ஆனால் ஒரு உறுப்பினருக்கான உள்நுழைவு அல்லது கடவுச்சொல்லை நீங்கள் வரையறுக்கத் தேவையில்லை என்றால், உறுப்பினர் தொகுதி அமைப்பிலிருந்து "ஒவ்வொரு உறுப்பினருக்கும் ஒரு உள்நுழைவை நிர்வகி" விருப்பத்தை நீங்கள் முடக்கலாம். நீங்கள் உள்நுழைவை நிர்வகிக்க வேண்டும் ஆனால் கடவுச்சொல் எதுவும் தேவையில்லை என்றால், இந்த எச்சரிக்கையைத் தவிர்க்க இந்தப் புலத்தை காலியாக வைத்திருக்கலாம். குறிப்பு: உறுப்பினர் ஒரு பயனருடன் இணைக்கப்பட்டிருந்தால், மின்னஞ்சலை உள்நுழைவாகவும் பயன்படுத்தலாம்.
+WarningMandatorySetupNotComplete=கட்டாய அளவுருக்களை அமைக்க இங்கே கிளிக் செய்யவும்
+WarningEnableYourModulesApplications=உங்கள் தொகுதிகள் மற்றும் பயன்பாடுகளை இயக்க இங்கே கிளிக் செய்யவும்
+WarningSafeModeOnCheckExecDir=எச்சரிக்கை, PHP விருப்பம் <b> safe_mode </b> இயக்கத்தில் உள்ளது, எனவே கட்டளையை php அளவுரு <b> safe_mode_exec_dir a09a4b739f 17f8z39f 17f8z390 மூலம் அறிவிக்கப்பட்ட கோப்பகத்தில் சேமிக்க வேண்டும்.
+WarningBookmarkAlreadyExists=இந்த தலைப்பு அல்லது இந்த இலக்குடன் (URL) புக்மார்க் ஏற்கனவே உள்ளது.
+WarningPassIsEmpty=எச்சரிக்கை, தரவுத்தள கடவுச்சொல் காலியாக உள்ளது. இது ஒரு பாதுகாப்பு துளை. உங்கள் தரவுத்தளத்தில் கடவுச்சொல்லைச் சேர்த்து, இதைப் பிரதிபலிக்க உங்கள் conf.php கோப்பை மாற்ற வேண்டும்.
+WarningConfFileMustBeReadOnly=எச்சரிக்கை, உங்கள் config கோப்பு ( <b> htdocs/conf/conf.php </b> ) இணைய சேவையகத்தால் மேலெழுதப்படலாம். இது ஒரு தீவிர பாதுகாப்பு துளை. வெப் சர்வரால் பயன்படுத்தப்படும் இயக்க முறைமை பயனருக்கு படிக்க மட்டும் பயன்முறையில் இருக்கும்படி கோப்பில் உள்ள அனுமதிகளை மாற்றவும். உங்கள் வட்டுக்கு Windows மற்றும் FAT வடிவமைப்பைப் பயன்படுத்தினால், கோப்பில் அனுமதிகளைச் சேர்க்க இந்தக் கோப்பு முறைமை அனுமதிக்காது என்பதை நீங்கள் அறிந்திருக்க வேண்டும், எனவே முற்றிலும் பாதுகாப்பாக இருக்க முடியாது.
+WarningsOnXLines=<b> %s </b> மூலப் பதிவு(கள்) பற்றிய எச்சரிக்கைகள்
+WarningNoDocumentModelActivated=ஆவண உருவாக்கத்திற்கான எந்த மாதிரியும் செயல்படுத்தப்படவில்லை. உங்கள் தொகுதி அமைப்பைச் சரிபார்க்கும் வரை, ஒரு மாதிரி இயல்பாகத் தேர்ந்தெடுக்கப்படும்.
+WarningLockFileDoesNotExists=எச்சரிக்கை, அமைவு முடிந்ததும், <b> install.lock </b> என்ற கோப்பகத்தை <b> %s a099a4b7083365837fz0 கோப்பைச் சேர்ப்பதன் மூலம் நிறுவல்/இடம்பெயர்வு கருவிகளை முடக்க வேண்டும். இந்தக் கோப்பை உருவாக்குவதைத் தவிர்ப்பது மிகப்பெரிய பாதுகாப்பு அபாயமாகும்.
+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=சில வங்கி பரிவர்த்தனைகள் அகற்றப்பட்டன, அதன் பிறகு அவை உட்பட ரசீது உருவாக்கப்பட்டது. எனவே காசோலைகளின் nb மற்றும் மொத்த ரசீது ஆகியவை பட்டியலில் உள்ள எண் மற்றும் மொத்தத்திலிருந்து வேறுபடலாம்.
+WarningFailedToAddFileIntoDatabaseIndex=எச்சரிக்கை, ECM தரவுத்தள அட்டவணை அட்டவணையில் கோப்பு உள்ளீட்டைச் சேர்ப்பதில் தோல்வி
+WarningTheHiddenOptionIsOn=எச்சரிக்கை, மறைக்கப்பட்ட விருப்பம் <b> %s </b> இயக்கத்தில் உள்ளது.
+WarningCreateSubAccounts=எச்சரிக்கை, நீங்கள் நேரடியாக ஒரு துணைக் கணக்கை உருவாக்க முடியாது, நீங்கள் மூன்றாம் தரப்பினரை அல்லது பயனரை உருவாக்கி, இந்தப் பட்டியலில் அவர்களைக் கண்டறிய அவர்களுக்குக் கணக்கியல் குறியீட்டை ஒதுக்க வேண்டும்.
+WarningAvailableOnlyForHTTPSServers=HTTPS பாதுகாப்பான இணைப்பைப் பயன்படுத்தினால் மட்டுமே கிடைக்கும்.
+WarningModuleXDisabledSoYouMayMissEventHere=தொகுதி %s இயக்கப்படவில்லை. எனவே நீங்கள் இங்கு பல நிகழ்வுகளை இழக்க நேரிடலாம்.
+WarningPaypalPaymentNotCompatibleWithStrict='ஸ்டிரிக்ட்' மதிப்பு, ஆன்லைன் கட்டண அம்சங்களைச் சரியாகச் செயல்படாமல் செய்கிறது. அதற்கு பதிலாக 'லாக்ஸ்' பயன்படுத்தவும்.
+
+# Validate
+RequireValidValue = மதிப்பு செல்லாது
+RequireAtLeastXString = குறைந்தது %s எழுத்து(கள்) தேவை
+RequireXStringMax = அதிகபட்சம் %s எழுத்து(கள்) தேவை
+RequireAtLeastXDigits = குறைந்தபட்சம் %s இலக்கம்(கள்) தேவை
+RequireXDigitsMax = அதிகபட்சம் %s இலக்கம்(கள்) தேவை
+RequireValidNumeric = Requires a numeric value
+RequireValidEmail = மின்னஞ்சல் முகவரி தவறானது
+RequireMaxLength = நீளம் %s எழுத்துகளுக்குக் குறைவாக இருக்க வேண்டும்
+RequireMinLength = நீளம் %s char(s) ஐ விட அதிகமாக இருக்க வேண்டும்
+RequireValidUrl = சரியான URL தேவை
+RequireValidDate = சரியான தேதி தேவை
+RequireANotEmptyValue = தேவை
+RequireValidDuration = சரியான கால அவகாசம் தேவை
+RequireValidExistingElement = ஏற்கனவே உள்ள மதிப்பு தேவை
+RequireValidBool = சரியான பூலியன் தேவை
+BadSetupOfField = புலத்தின் தவறான அமைப்பில் பிழை
+BadSetupOfFieldClassNotFoundForValidation = புலத்தின் தவறான அமைப்பில் பிழை: சரிபார்ப்புக்கு வகுப்பு கிடைக்கவில்லை
+BadSetupOfFieldFileNotFound = புலத்தின் தவறான அமைப்பில் பிழை: சேர்ப்பதற்கு கோப்பு கிடைக்கவில்லை
+BadSetupOfFieldFetchNotCallable = புலத்தின் தவறான அமைப்பில் பிழை: வகுப்பில் அழைக்க முடியாது
diff --git a/htdocs/langs/ta_IN/eventorganization.lang b/htdocs/langs/ta_IN/eventorganization.lang
new file mode 100644
index 00000000000..a8e9c41e0a9
--- /dev/null
+++ b/htdocs/langs/ta_IN/eventorganization.lang
@@ -0,0 +1,167 @@
+# 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 = நிகழ்வு அமைப்பு
+EventOrganizationDescription = தொகுதி திட்டத்தின் மூலம் நிகழ்வு அமைப்பு
+EventOrganizationDescriptionLong= ஒரு நிகழ்வின் அமைப்பை நிர்வகித்தல் (நிகழ்ச்சி, மாநாடுகள், பங்கேற்பாளர்கள் அல்லது பேச்சாளர்கள், பரிந்துரை, வாக்கு அல்லது பதிவுக்கான பொதுப் பக்கங்களுடன்)
+#
+# Menu
+#
+EventOrganizationMenuLeft = ஏற்பாடு செய்யப்பட்ட நிகழ்வுகள்
+EventOrganizationConferenceOrBoothMenuLeft = மாநாடு அல்லது சாவடி
+
+PaymentEvent=நிகழ்வின் கட்டணம்
+
+#
+# Admin page
+#
+NewRegistration=பதிவு
+EventOrganizationSetup=நிகழ்வு அமைப்பு அமைப்பு
+EventOrganization=நிகழ்வு அமைப்பு
+Settings=அமைப்புகள்
+EventOrganizationSetupPage = நிகழ்வு அமைப்பு அமைவு பக்கம்
+EVENTORGANIZATION_TASK_LABEL = திட்டம் சரிபார்க்கப்படும் போது தானாக உருவாக்க பணிகளின் லேபிள்
+EVENTORGANIZATION_TASK_LABELTooltip = நீங்கள் ஒரு ஒழுங்கமைக்கப்பட்ட நிகழ்வு மதிப்பிட போது, சில காரியங்கள் தானாக உதாரணமாக திட்டம் <br> <br> உள்ள உருவாக்க முடியும்: கான்பரன்ஸ் <br> அனுப்புக கால் <br> <br> <br> பூத் அழைப்பு பெறவும் <br> அனுப்புக பங்கேற்பாளர்கள் நிகழ்வுகளுக்கு திறந்த சந்தாக்கள் <br> மாநாடுகள் அழைப்பு பெறவும் பூத் க்கான அனுப்பவும் கால் நிகழ்வை பேச்சாளர்களுக்கு நினைவூட்டு <br> நிகழ்வை நினைவூட்டல் பூத் ஹோஸ்டருக்கு அனுப்பு <br> பங்கேற்பாளர்களுக்கு நிகழ்வை நினைவூட்டு அனுப்பு
+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_EVENT = ஒரு நிகழ்வுக்குப் பதிவுசெய்த பிறகு அனுப்ப வேண்டிய மின்னஞ்சலின் டெம்ப்ளேட் பணம் செலுத்தப்பட்டது.
+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= மாநாடு அல்லது சாவடி
+ManageOrganizeEvent = ஒரு நிகழ்வின் அமைப்பை நிர்வகிக்கவும்
+ConferenceOrBooth = மாநாடு அல்லது சாவடி
+ConferenceOrBoothTab = மாநாடு அல்லது சாவடி
+AmountPaid = பணம் செலுத்தப்பட்டது
+DateOfRegistration = பதிவு செய்யப்பட்ட தேதி
+ConferenceOrBoothAttendee = மாநாடு அல்லது பூத் பங்கேற்பாளர்
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = மாநாட்டிற்கான உங்கள் கோரிக்கை பெறப்பட்டது
+YourOrganizationEventBoothRequestWasReceived = சாவடிக்கான உங்கள் கோரிக்கை பெறப்பட்டது
+EventOrganizationEmailAskConf = மாநாட்டிற்கான கோரிக்கை
+EventOrganizationEmailAskBooth = சாவடிக்கு கோரிக்கை
+EventOrganizationEmailBoothPayment = உங்கள் சாவடியின் கட்டணம்
+EventOrganizationEmailRegistrationPayment = நிகழ்வுக்கான பதிவு
+EventOrganizationMassEmailAttendees = பங்கேற்பாளர்களுக்கான தொடர்பு
+EventOrganizationMassEmailSpeakers = பேச்சாளர்களுக்கு தொடர்பு
+ToSpeakers=To speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=மாநாடுகளைப் பரிந்துரைக்க மக்களை அனுமதிக்கவும்
+AllowUnknownPeopleSuggestConfHelp=தெரியாதவர்கள் தாங்கள் செய்ய விரும்பும் மாநாட்டை பரிந்துரைக்க அனுமதிக்கவும்
+AllowUnknownPeopleSuggestBooth=ஒரு சாவடிக்கு விண்ணப்பிக்க மக்களை அனுமதிக்கவும்
+AllowUnknownPeopleSuggestBoothHelp=தெரியாத நபர்கள் சாவடிக்கு விண்ணப்பிக்க அனுமதிக்கவும்
+PriceOfRegistration=பதிவு விலை
+PriceOfRegistrationHelp=பதிவு செய்ய அல்லது நிகழ்வில் பங்கேற்க கட்டணம் செலுத்த வேண்டும்
+PriceOfBooth=ஒரு சாவடியில் நிற்க சந்தா விலை
+PriceOfBoothHelp=ஒரு சாவடியில் நிற்க சந்தா விலை
+EventOrganizationICSLink=Link ICS for conferences
+ConferenceOrBoothInformation=மாநாடு அல்லது பூத் தகவல்கள்
+Attendees=பங்கேற்பாளர்கள்
+ListOfAttendeesOfEvent=நிகழ்ச்சித் திட்டத்தின் பங்கேற்பாளர்களின் பட்டியல்
+DownloadICSLink = ICS இணைப்பைப் பதிவிறக்கவும்
+EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
+SERVICE_BOOTH_LOCATION = ஒரு சாவடி இருப்பிடத்தைப் பற்றிய விலைப்பட்டியல் வரிசையில் பயன்படுத்தப்படும் சேவை
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
+NbVotes=வாக்குகளின் எண்ணிக்கை
+#
+# Status
+#
+EvntOrgDraft = வரைவு
+EvntOrgSuggested = பரிந்துரைக்கப்பட்டது
+EvntOrgConfirmed = உறுதி
+EvntOrgNotQualified = தகுதி இல்லை
+EvntOrgDone = முடிந்தது
+EvntOrgCancelled = ரத்து செய்யப்பட்டது
+#
+# Public page
+#
+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=பதிவு
+OrganizationEventConfRequestWasReceived=மாநாட்டிற்கான உங்கள் ஆலோசனை பெறப்பட்டது
+OrganizationEventBoothRequestWasReceived=சாவடிக்கான உங்கள் கோரிக்கை பெறப்பட்டது
+OrganizationEventPaymentOfBoothWasReceived=உங்கள் சாவடிக்கான கட்டணம் பதிவு செய்யப்பட்டுள்ளது
+OrganizationEventPaymentOfRegistrationWasReceived=உங்கள் நிகழ்வு பதிவுக்கான கட்டணம் பதிவுசெய்யப்பட்டது
+OrganizationEventBulkMailToAttendees=நிகழ்வில் பங்கேற்பாளராக நீங்கள் பங்கேற்பதைப் பற்றிய நினைவூட்டல் இது
+OrganizationEventBulkMailToSpeakers=ஒரு பேச்சாளராக நிகழ்வில் நீங்கள் பங்கேற்பதற்கான நினைவூட்டல் இது
+OrganizationEventLinkToThirdParty=மூன்றாம் தரப்பினருக்கான இணைப்பு (வாடிக்கையாளர், சப்ளையர் அல்லது பங்குதாரர்)
+
+NewSuggestionOfBooth=ஒரு சாவடிக்கான விண்ணப்பம்
+NewSuggestionOfConference=ஒரு மாநாட்டிற்கான விண்ணப்பம்
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = மாநாடு அல்லது சாவடி பரிந்துரை பக்கத்தில் வரவேற்கிறோம்.
+EvntOrgRegistrationConfWelcomeMessage = மாநாட்டு ஆலோசனை பக்கத்தில் வரவேற்கிறோம்.
+EvntOrgRegistrationBoothWelcomeMessage = சாவடி பரிந்துரை பக்கத்தில் வரவேற்கிறோம்.
+EvntOrgVoteHelpMessage = இங்கே, திட்டத்திற்கான பரிந்துரைக்கப்பட்ட நிகழ்வுகளைப் பார்க்கலாம் மற்றும் வாக்களிக்கலாம்
+VoteOk = உங்கள் வாக்கு ஏற்றுக்கொள்ளப்பட்டது.
+AlreadyVoted = இந்த நிகழ்வுக்கு நீங்கள் ஏற்கனவே வாக்களித்துள்ளீர்கள்.
+VoteError = வாக்களிப்பின் போது பிழை ஏற்பட்டது, மீண்டும் முயற்சிக்கவும்.
+
+SubscriptionOk = உங்கள் பதிவு சரிபார்க்கப்பட்டது
+ConfAttendeeSubscriptionConfirmation = நிகழ்வுக்கான உங்கள் சந்தாவை உறுதிப்படுத்துதல்
+Attendee = பங்கேற்பாளர்
+PaymentConferenceAttendee = மாநாட்டில் பங்கேற்பாளர் கட்டணம்
+PaymentBoothLocation = சாவடி இடம் கட்டணம்
+DeleteConferenceOrBoothAttendee=பங்கேற்பாளரை அகற்று
+RegistrationAndPaymentWereAlreadyRecorder=<b> %s </b> என்ற மின்னஞ்சலுக்கான பதிவும் கட்டணமும் ஏற்கனவே பதிவு செய்யப்பட்டுள்ளன.
+EmailAttendee=பங்கேற்பாளர் மின்னஞ்சல்
+EmailCompanyForInvoice=நிறுவனத்தின் மின்னஞ்சல் (விலைப்பட்டியலுக்கு, பங்கேற்பாளர் மின்னஞ்சலில் இருந்து வேறுபட்டால்)
+ErrorSeveralCompaniesWithEmailContactUs=இந்த மின்னஞ்சலைக் கொண்ட பல நிறுவனங்கள் கண்டறியப்பட்டதால், உங்கள் பதிவைத் தானாகச் சரிபார்க்க முடியாது. கைமுறை சரிபார்ப்புக்கு எங்களை %s இல் தொடர்பு கொள்ளவும்
+ErrorSeveralCompaniesWithNameContactUs=இந்தப் பெயரைக் கொண்ட பல நிறுவனங்கள் கண்டறியப்பட்டதால், உங்கள் பதிவைத் தானாகச் சரிபார்க்க முடியாது. கைமுறை சரிபார்ப்புக்கு எங்களை %s இல் தொடர்பு கொள்ளவும்
+NoPublicActionsAllowedForThisEvent=இந்த நிகழ்விற்கான பொது நடவடிக்கைகள் எதுவும் பொது மக்களுக்குத் திறக்கப்படவில்லை
diff --git a/htdocs/langs/ta_IN/exports.lang b/htdocs/langs/ta_IN/exports.lang
new file mode 100644
index 00000000000..3356784be5f
--- /dev/null
+++ b/htdocs/langs/ta_IN/exports.lang
@@ -0,0 +1,137 @@
+# Dolibarr language file - Source file is en_US - exports
+ExportsArea=ஏற்றுமதி
+ImportArea=இறக்குமதி
+NewExport=புதிய ஏற்றுமதி
+NewImport=புதிய இறக்குமதி
+ExportableDatas=ஏற்றுமதி செய்யக்கூடிய தரவுத்தொகுப்பு
+ImportableDatas=இறக்குமதி செய்யக்கூடிய தரவுத்தொகுப்பு
+SelectExportDataSet=நீங்கள் ஏற்றுமதி செய்ய விரும்பும் தரவுத்தொகுப்பைத் தேர்ந்தெடுக்கவும்...
+SelectImportDataSet=நீங்கள் இறக்குமதி செய்ய விரும்பும் தரவுத்தொகுப்பைத் தேர்ந்தெடுக்கவும்...
+SelectExportFields=நீங்கள் ஏற்றுமதி செய்ய விரும்பும் புலங்களைத் தேர்ந்தெடுக்கவும் அல்லது முன் வரையறுக்கப்பட்ட ஏற்றுமதி சுயவிவரத்தைத் தேர்ந்தெடுக்கவும்
+SelectImportFields=ஆங்கர் %s மூலம் மேலும் கீழும் நகர்த்துவதன் மூலம் தரவுத்தளத்தில் நீங்கள் இறக்குமதி செய்ய விரும்பும் மூலக் கோப்புப் புலங்களையும் அவற்றின் இலக்குப் புலத்தையும் தேர்வு செய்யவும் அல்லது முன் வரையறுக்கப்பட்ட இறக்குமதி சுயவிவரத்தைத் தேர்ந்தெடுக்கவும்:
+NotImportedFields=மூலக் கோப்பின் புலங்கள் இறக்குமதி செய்யப்படவில்லை
+SaveExportModel=உங்கள் தேர்வுகளை ஏற்றுமதி சுயவிவரம்/டெம்ப்ளேட்டாக சேமிக்கவும் (மறு பயன்பாட்டிற்கு).
+SaveImportModel=இந்த இறக்குமதி சுயவிவரத்தை சேமிக்கவும் (மறு பயன்பாட்டிற்கு) ...
+ExportModelName=சுயவிவரப் பெயரை ஏற்றுமதி செய்யவும்
+ExportModelSaved=ஏற்றுமதி சுயவிவரம் <b> %s </b> ஆக சேமிக்கப்பட்டது.
+ExportableFields=ஏற்றுமதி செய்யக்கூடிய துறைகள்
+ExportedFields=ஏற்றுமதி செய்யப்பட்ட துறைகள்
+ImportModelName=சுயவிவரப் பெயரை இறக்குமதி செய்யவும்
+ImportModelSaved=இறக்குமதி சுயவிவரம் <b> %s </b> ஆக சேமிக்கப்பட்டது.
+DatasetToExport=ஏற்றுமதி செய்வதற்கான தரவுத்தொகுப்பு
+DatasetToImport=தரவுத்தொகுப்பில் கோப்பை இறக்குமதி செய்யவும்
+ChooseFieldsOrdersAndTitle=புலங்கள் வரிசையைத் தேர்வுசெய்க...
+FieldsTitle=புலங்களின் தலைப்பு
+FieldTitle=புலத்தின் தலைப்பு
+NowClickToGenerateToBuildExportFile=இப்போது, காம்போ பாக்ஸில் கோப்பு வடிவமைப்பைத் தேர்ந்தெடுத்து, ஏற்றுமதி கோப்பை உருவாக்க "உருவாக்கு" என்பதைக் கிளிக் செய்யவும்...
+AvailableFormats=கிடைக்கக்கூடிய வடிவங்கள்
+LibraryShort=நூலகம்
+ExportCsvSeparator=Csv கேரக்டர் பிரிப்பான்
+ImportCsvSeparator=Csv கேரக்டர் பிரிப்பான்
+Step=படி
+FormatedImport=இறக்குமதி உதவியாளர்
+FormatedImportDesc1=இந்த தொகுதியானது, உதவியாளரைப் பயன்படுத்தி, தொழில்நுட்ப அறிவு இல்லாத கோப்பிலிருந்து ஏற்கனவே உள்ள தரவைப் புதுப்பிக்க அல்லது புதிய பொருட்களை தரவுத்தளத்தில் சேர்க்க உங்களை அனுமதிக்கிறது.
+FormatedImportDesc2=முதல் படி, நீங்கள் எந்த வகையான தரவை இறக்குமதி செய்ய விரும்புகிறீர்கள், பின்னர் மூலக் கோப்பின் வடிவம், பின்னர் நீங்கள் இறக்குமதி செய்ய விரும்பும் புலங்கள் ஆகியவற்றைத் தேர்ந்தெடுக்க வேண்டும்.
+FormatedExport=ஏற்றுமதி உதவியாளர்
+FormatedExportDesc1=தொழில்நுட்ப அறிவு தேவையில்லாமல் செயல்பாட்டில் உங்களுக்கு உதவ, உதவியாளரைப் பயன்படுத்தி தனிப்பயனாக்கப்பட்ட தரவை ஏற்றுமதி செய்ய இந்தக் கருவிகள் அனுமதிக்கின்றன.
+FormatedExportDesc2=முதல் படி, முன் வரையறுக்கப்பட்ட தரவுத்தொகுப்பைத் தேர்வுசெய்து, எந்தப் புலங்களை நீங்கள் ஏற்றுமதி செய்ய விரும்புகிறீர்கள், எந்த வரிசையில் இருக்க வேண்டும்.
+FormatedExportDesc3=ஏற்றுமதி செய்வதற்கான தரவு தேர்ந்தெடுக்கப்பட்டால், வெளியீட்டு கோப்பின் வடிவமைப்பை நீங்கள் தேர்வு செய்யலாம்.
+Sheet=தாள்
+NoImportableData=இறக்குமதி செய்யக்கூடிய தரவு இல்லை (தரவு இறக்குமதியை அனுமதிக்க வரையறைகளுடன் தொகுதி இல்லை)
+FileSuccessfullyBuilt=கோப்பு உருவாக்கப்பட்டது
+SQLUsedForExport=தரவைப் பிரித்தெடுக்க SQL கோரிக்கை பயன்படுத்தப்படுகிறது
+LineId=வரியின் ஐடி
+LineLabel=வரியின் லேபிள்
+LineDescription=வரியின் விளக்கம்
+LineUnitPrice=வரியின் அலகு விலை
+LineVATRate=வரியின் VAT விகிதம்
+LineQty=வரிக்கான அளவு
+LineTotalHT=தவிர தொகை. வரிக்கான வரி
+LineTotalTTC=வரியுடன் கூடிய தொகை
+LineTotalVAT=வரிக்கான VAT தொகை
+TypeOfLineServiceOrProduct=வரி வகை (0=தயாரிப்பு, 1=சேவை)
+FileWithDataToImport=இறக்குமதி செய்ய தரவு கொண்ட கோப்பு
+FileToImport=இறக்குமதி செய்வதற்கான மூலக் கோப்பு
+FileMustHaveOneOfFollowingFormat=இறக்குமதி செய்வதற்கான கோப்பு பின்வரும் வடிவங்களில் ஒன்றைக் கொண்டிருக்க வேண்டும்
+DownloadEmptyExample=புல உள்ளடக்கத் தகவலுடன் டெம்ப்ளேட் கோப்பைப் பதிவிறக்கவும்
+StarAreMandatory=* கட்டாய புலங்கள்
+ChooseFormatOfFileToImport=இறக்குமதி கோப்பு வடிவமாக பயன்படுத்த கோப்பு வடிவமைப்பைத் தேர்வுசெய்ய, அதைத் தேர்ந்தெடுக்க %s ஐகானைக் கிளிக் செய்யவும்...
+ChooseFileToImport=கோப்பைப் பதிவேற்றவும், பின்னர் கோப்பை மூல இறக்குமதி கோப்பாக தேர்ந்தெடுக்க %s ஐகானைக் கிளிக் செய்யவும்...
+SourceFileFormat=மூல கோப்பு வடிவம்
+FieldsInSourceFile=மூலக் கோப்பில் உள்ள புலங்கள்
+FieldsInTargetDatabase=டோலிபார் தரவுத்தளத்தில் இலக்கு புலங்கள் (தடித்த = கட்டாயம்)
+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> a0ecb2ec40
+DataComeFromIdFoundFromCodeId=இருந்து துறையில் எண் <b> %s </b> மூல கோப்பை வரும் குறியீடு பயன்படுத்த பெற்றோர் பொருளின் ஐடி கண்டுபிடிக்க பயன்படுத்தப்படும் (அதனால் மூல கோப்பு உள்ள குறியீட்டில் உள்ளன அகராதி <b> %s </b> வேண்டும்). ஐடி உங்களுக்குத் தெரிந்தால், குறியீட்டிற்குப் பதிலாக மூலக் கோப்பிலும் பயன்படுத்தலாம் என்பதை நினைவில் கொள்ளவும். இரண்டு சந்தர்ப்பங்களிலும் இறக்குமதி வேலை செய்ய வேண்டும்.
+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> இது சொந்த எக்செல் 95 வடிவம் (BIFF5).
+Excel2007FormatDesc= <b> Excel </b> கோப்பு வடிவம் (.xlsx) <br> இது எக்செல் 2007 இன் சொந்த வடிவம் (SpreadsheetML).
+TsvFormatDesc= <b> தாவல் பிரிக்கப்பட்ட மதிப்பு </b> கோப்பு வடிவம் (.tsv) <br> இது ஒரு உரை கோப்பு வடிவமாகும், இதில் புலங்கள் டேபுலேட்டரால் பிரிக்கப்படுகின்றன.
+ExportFieldAutomaticallyAdded=புலம் <b> %s </b> தானாகவே சேர்க்கப்பட்டது. ஒரே மாதிரியான வரிகள் நகல் பதிவாகக் கருதப்படுவதை இது தவிர்க்கும் (இந்தப் புலத்தைச் சேர்த்தால், எல்லா வரிகளும் அவற்றின் சொந்த ஐடியை வைத்திருக்கும், மேலும் அவை வேறுபடும்).
+CsvOptions=CSV வடிவமைப்பு விருப்பங்கள்
+Separator=புல பிரிப்பான்
+Enclosure=ஸ்டிரிங் டிலிமிட்டர்
+SpecialCode=சிறப்பு குறியீடு
+ExportStringFilter=%% உரையில் ஒன்று அல்லது அதற்கு மேற்பட்ட எழுத்துக்களை மாற்ற அனுமதிக்கிறது
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: ஒரு வருடம்/மாதம்/நாள் மூலம் வடிகட்டுகிறது <br> YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYMMDD+YYYMMDD: YYYMMMDD+YYYMMDD: வருடங்கள்/மாதம் பின்வரும் ஆண்டுகள்/மாதங்கள்/நாட்கள் <br> < YYYY, < YYYYMM, < YYYYMMDD: அனைத்து முந்தைய வருடங்கள்/மாதங்கள்/நாட்களில் வடிகட்டிகள்
+ExportNumericFilter=NNNNN ஒரு மதிப்பு <br> NNNNN+NNNN வடிகட்டுகிறது <br> மதிப்புகள் வரம்பில் <NNNNN வடிகட்டிகள் குறைந்த மதிப்புகள் <br> > NNNNN வடிகட்டிகள் அதிக மதிப்புகள்
+ImportFromLine=வரி எண்ணிலிருந்து தொடங்கும் இறக்குமதி
+EndAtLineNb=வரி எண்ணில் முடிக்கவும்
+ImportFromToLine=வரம்பு வரம்பு (இருந்து - வரை). எ.கா. தலைப்பு வரி(களை) தவிர்க்க
+SetThisValueTo2ToExcludeFirstLine=எடுத்துக்காட்டாக, 2 முதல் வரிகளை விலக்க இந்த மதிப்பை 3 ஆக அமைக்கவும். <br> தலைப்புக் கோடுகள் தவிர்க்கப்படாவிட்டால், இது இறக்குமதி உருவகப்படுத்துதலில் பல பிழைகளை ஏற்படுத்தும்.
+KeepEmptyToGoToEndOfFile=கோப்பின் இறுதிவரை அனைத்து வரிகளையும் செயலாக்க இந்த புலத்தை காலியாக வைக்கவும்.
+SelectPrimaryColumnsForUpdateAttempt=புதுப்பிப்பு இறக்குமதிக்கு முதன்மை விசையாகப் பயன்படுத்த நெடுவரிசை(களை) தேர்ந்தெடுக்கவும்
+UpdateNotYetSupportedForThisImport=இந்த வகை இறக்குமதிக்கு புதுப்பிப்பு ஆதரிக்கப்படவில்லை (செருகு மட்டும்)
+NoUpdateAttempt=புதுப்பிப்பு முயற்சி எதுவும் செய்யப்படவில்லை, செருக மட்டுமே
+ImportDataset_user_1=பயனர்கள் (பணியாளர்கள் அல்லது இல்லை) மற்றும் பண்புகள்
+ComputedField=கணக்கிடப்பட்ட புலம்
+## filters
+SelectFilterFields=நீங்கள் சில மதிப்புகளை வடிகட்ட விரும்பினால், மதிப்புகளை உள்ளிடவும்.
+FilteredFields=வடிகட்டப்பட்ட புலங்கள்
+FilteredFieldsValues=வடிகட்டிக்கான மதிப்பு
+FormatControlRule=வடிவமைப்பு கட்டுப்பாட்டு விதி
+## imports updates
+KeysToUseForUpdates=<b>க்கு பயன்படுத்த வேண்டிய விசை (நெடுவரிசை) </b> இருக்கும் தரவைப் புதுப்பிக்கிறது
+NbInsert=செருகப்பட்ட வரிகளின் எண்ணிக்கை: %s
+NbUpdate=புதுப்பிக்கப்பட்ட வரிகளின் எண்ணிக்கை: %s
+MultipleRecordFoundWithTheseFilters=இந்த வடிப்பான்களுடன் பல பதிவுகள் கண்டறியப்பட்டுள்ளன: %s
+StocksWithBatch=தொகுதி/வரிசை எண் கொண்ட தயாரிப்புகளின் பங்குகள் மற்றும் இடம் (கிடங்கு).
diff --git a/htdocs/langs/ta_IN/externalsite.lang b/htdocs/langs/ta_IN/externalsite.lang
new file mode 100644
index 00000000000..cc877ee68b4
--- /dev/null
+++ b/htdocs/langs/ta_IN/externalsite.lang
@@ -0,0 +1,5 @@
+# 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
new file mode 100644
index 00000000000..e05341534fd
--- /dev/null
+++ b/htdocs/langs/ta_IN/ftp.lang
@@ -0,0 +1,14 @@
+# 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/help.lang b/htdocs/langs/ta_IN/help.lang
new file mode 100644
index 00000000000..011e23e7849
--- /dev/null
+++ b/htdocs/langs/ta_IN/help.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=மன்றம்/விக்கி ஆதரவு
+EMailSupport=மின்னஞ்சல் ஆதரவு
+RemoteControlSupport=ஆன்லைன் நிகழ்நேர / தொலைநிலை ஆதரவு
+OtherSupport=மற்ற ஆதரவு
+ToSeeListOfAvailableRessources=தொடர்பு கொள்ள/கிடைக்கும் ஆதாரங்களைப் பார்க்க:
+HelpCenter=உதவி மையம்
+DolibarrHelpCenter=Dolibarr உதவி மற்றும் ஆதரவு மையம்
+ToGoBackToDolibarr=இல்லையெனில், Dolibarr </a> ஐப் பயன்படுத்த, <a href="%s"> இங்கே கிளிக் செய்யவும்.
+TypeOfSupport=ஆதரவு வகை
+TypeSupportCommunauty=சமூகம் (இலவசம்)
+TypeSupportCommercial=வணிகம்
+TypeOfHelp=வகை
+NeedHelpCenter=உதவி அல்லது ஆதரவு தேவையா?
+Efficiency=திறன்
+TypeHelpOnly=உதவி மட்டும்
+TypeHelpDev=உதவி+மேம்பாடு
+TypeHelpDevForm=உதவி+மேம்பாடு+பயிற்சி
+BackToHelpCenter=இல்லையெனில், <a href="%s"> மீண்டும் உதவி மைய முகப்புப் பக்கத்திற்குச் செல்லவும் </a> .
+LinkToGoldMember=உங்கள் மொழிக்காக (%s) Dolibarr ஆல் தேர்ந்தெடுக்கப்பட்ட பயிற்சியாளர்களில் ஒருவரை அவர்களின் விட்ஜெட்டைக் கிளிக் செய்வதன் மூலம் அழைக்கலாம் (நிலை மற்றும் அதிகபட்ச விலை தானாகவே புதுப்பிக்கப்படும்):
+PossibleLanguages=ஆதரிக்கப்படும் மொழிகள்
+SubscribeToFoundation=Dolibarr திட்டத்திற்கு உதவுங்கள், அறக்கட்டளைக்கு குழுசேரவும்
+SeeOfficalSupport=உங்கள் மொழியில் அதிகாரப்பூர்வ Dolibarr ஆதரவிற்கு: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> a09a4b739f17
diff --git a/htdocs/langs/ta_IN/holiday.lang b/htdocs/langs/ta_IN/holiday.lang
new file mode 100644
index 00000000000..cb88a2d1041
--- /dev/null
+++ b/htdocs/langs/ta_IN/holiday.lang
@@ -0,0 +1,139 @@
+# Dolibarr language file - Source file is en_US - holiday
+HRM=HRM
+Holidays=கிளம்பு
+CPTitreMenu=கிளம்பு
+MenuReportMonth=மாதாந்திர அறிக்கை
+MenuAddCP=புதிய விடுப்பு கோரிக்கை
+NotActiveModCP=இந்தப் பக்கத்தைப் பார்க்க, நீங்கள் தொகுதி வெளியேறு என்பதை இயக்க வேண்டும்.
+AddCP=விடுப்புக் கோரிக்கையை விடுங்கள்
+DateDebCP=தொடக்க தேதி
+DateFinCP=கடைசி தேதி
+DraftCP=வரைவு
+ToReviewCP=ஒப்புதலுக்காக காத்திருக்கிறது
+ApprovedCP=அங்கீகரிக்கப்பட்டது
+CancelCP=ரத்து செய்யப்பட்டது
+RefuseCP=மறுத்தார்
+ValidatorCP=ஒப்புதல் அளிப்பவர்
+ListeCP=விடுப்பு பட்டியல்
+Leave=கோரிக்கையை விடுங்கள்
+LeaveId=ஐடியை விடுங்கள்
+ReviewedByCP=மூலம் அங்கீகரிக்கப்படும்
+UserID=பயனர் ஐடி
+UserForApprovalID=ஒப்புதல் ஐடிக்கான பயனர்
+UserForApprovalFirstname=ஒப்புதல் பயனரின் முதல் பெயர்
+UserForApprovalLastname=ஒப்புதல் பயனரின் கடைசி பெயர்
+UserForApprovalLogin=ஒப்புதல் பயனரின் உள்நுழைவு
+DescCP=விளக்கம்
+SendRequestCP=விடுப்பு கோரிக்கையை உருவாக்கவும்
+DelayToRequestCP=அவற்றுக்கு முன் குறைந்தபட்சம் <b> %s நாள்(கள்) </b> விடுப்புக் கோரிக்கைகள் செய்யப்பட வேண்டும்.
+MenuConfCP=விடுப்பு இருப்பு
+SoldeCPUser=இருப்பை விடுங்கள் (நாட்களில்) <b> %s </b>
+ErrorEndDateCP=தொடக்கத் தேதியை விட பெரிய முடிவுத் தேதியைத் தேர்ந்தெடுக்க வேண்டும்.
+ErrorSQLCreateCP=உருவாக்கும் போது SQL பிழை ஏற்பட்டது:
+ErrorIDFicheCP=பிழை ஏற்பட்டது, விடுப்பு கோரிக்கை இல்லை.
+ReturnCP=முந்தைய பக்கத்திற்குத் திரும்பு
+ErrorUserViewCP=இந்த விடுப்புக் கோரிக்கையைப் படிக்க உங்களுக்கு அங்கீகாரம் இல்லை.
+InfosWorkflowCP=தகவல் பணிப்பாய்வு
+RequestByCP=கேட்டுக்கொள்ளப்பட்டதின்படி
+TitreRequestCP=கோரிக்கையை விடுங்கள்
+TypeOfLeaveId=விடுப்பு ஐடி வகை
+TypeOfLeaveCode=விடுப்புக் குறியீட்டின் வகை
+TypeOfLeaveLabel=விடுப்பு லேபிளின் வகை
+NbUseDaysCP=பயன்படுத்தப்பட்ட விடுமுறை நாட்களின் எண்ணிக்கை
+NbUseDaysCPHelp=கணக்கீடு வேலை செய்யாத நாட்கள் மற்றும் அகராதியில் வரையறுக்கப்பட்ட விடுமுறை நாட்களை கணக்கில் எடுத்துக்கொள்கிறது.
+NbUseDaysCPShort=விடுமுறை நாட்கள்
+NbUseDaysCPShortInMonth=மாதத்தில் விடுமுறை நாட்கள்
+DayIsANonWorkingDay=%s என்பது வேலை செய்யாத நாள்
+DateStartInMonth=மாதத்தில் தொடங்கும் தேதி
+DateEndInMonth=மாதத்தில் முடிவு தேதி
+EditCP=தொகு
+DeleteCP=அழி
+ActionRefuseCP=மறு
+ActionCancelCP=ரத்து செய்
+StatutCP=நிலை
+TitleDeleteCP=விடுப்பு கோரிக்கையை நீக்கவும்
+ConfirmDeleteCP=இந்த விடுப்பு கோரிக்கையை நீக்குவதை உறுதிப்படுத்தவா?
+ErrorCantDeleteCP=இந்த விடுப்பு கோரிக்கையை நீக்க உங்களுக்கு உரிமை இல்லை.
+CantCreateCP=விடுப்பு கோரிக்கைகளை வைக்க உங்களுக்கு உரிமை இல்லை.
+InvalidValidatorCP=உங்கள் விடுப்புக் கோரிக்கைக்கு நீங்கள் அனுமதியளிப்பவரைத் தேர்ந்தெடுக்க வேண்டும்.
+NoDateDebut=தொடக்கத் தேதியைத் தேர்ந்தெடுக்க வேண்டும்.
+NoDateFin=நீங்கள் முடிவுத் தேதியைத் தேர்ந்தெடுக்க வேண்டும்.
+ErrorDureeCP=உங்கள் விடுப்பு கோரிக்கையில் வேலை நாள் இல்லை.
+TitleValidCP=விடுப்பு கோரிக்கையை அங்கீகரிக்கவும்
+ConfirmValidCP=விடுப்புக் கோரிக்கையை நிச்சயமாக ஏற்க விரும்புகிறீர்களா?
+DateValidCP=அங்கீகரிக்கப்பட்ட தேதி
+TitleToValidCP=விடுப்பு கோரிக்கையை அனுப்பவும்
+ConfirmToValidCP=நிச்சயமாக விடுப்புக் கோரிக்கையை அனுப்ப விரும்புகிறீர்களா?
+TitleRefuseCP=விடுப்பு கோரிக்கையை நிராகரிக்கவும்
+ConfirmRefuseCP=விடுப்புக் கோரிக்கையை நிராகரிக்க விரும்புகிறீர்களா?
+NoMotifRefuseCP=கோரிக்கையை நிராகரிப்பதற்கான காரணத்தை நீங்கள் தேர்வு செய்ய வேண்டும்.
+TitleCancelCP=விடுப்பு கோரிக்கையை ரத்து செய்
+ConfirmCancelCP=விடுப்புக் கோரிக்கையை நிச்சயமாக ரத்துசெய்ய விரும்புகிறீர்களா?
+DetailRefusCP=மறுப்புக்கான காரணம்
+DateRefusCP=மறுப்பு தேதி
+DateCancelCP=ரத்து செய்யப்பட்ட தேதி
+DefineEventUserCP=ஒரு பயனருக்கு விதிவிலக்கான விடுமுறையை ஒதுக்குங்கள்
+addEventToUserCP=விடுப்பு ஒதுக்கவும்
+NotTheAssignedApprover=நீங்கள் ஒதுக்கப்பட்ட அங்கீகாரம் இல்லை
+MotifCP=காரணம்
+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=விடுப்பு ஒதுக்கீட்டின் கடைசி தானியங்கி புதுப்பிப்பு
+MonthOfLastMonthlyUpdate=விடுப்பு ஒதுக்கீட்டின் கடைசி தானியங்கி புதுப்பித்த மாதம்
+UpdateConfCPOK=வெற்றிகரமாக புதுப்பிக்கப்பட்டது.
+Module27130Name= விடுப்பு கோரிக்கைகளின் மேலாண்மை
+Module27130Desc= விடுப்பு கோரிக்கைகளின் மேலாண்மை
+ErrorMailNotSend=மின்னஞ்சல் அனுப்பும் போது பிழை ஏற்பட்டது:
+NoticePeriod=அறிவிப்பு காலம்
+#Messages
+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=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
new file mode 100644
index 00000000000..0a31f5cc191
--- /dev/null
+++ b/htdocs/langs/ta_IN/hrm.lang
@@ -0,0 +1,81 @@
+# Dolibarr language file - en_US - hrm
+
+
+# Admin
+HRM_EMAIL_EXTERNAL_SERVICE=HRM வெளிப்புற சேவையைத் தடுக்க மின்னஞ்சல்
+Establishments=ஸ்தாபனங்கள்
+Establishment=ஸ்தாபனம்
+NewEstablishment=புதிய ஸ்தாபனம்
+DeleteEstablishment=நிறுவனத்தை நீக்கு
+ConfirmDeleteEstablishment=இந்த நிறுவனத்தை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+OpenEtablishment=திறந்த நிறுவனம்
+CloseEtablishment=மூடு ஸ்தாபனம்
+# Dictionary
+DictionaryPublicHolidays=விடுப்பு - பொது விடுமுறை நாட்கள்
+DictionaryDepartment=HRM - துறை பட்டியல்
+DictionaryFunction=HRM - வேலை நிலைகள்
+# Module
+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=தரத்தை சேமிக்கவும்
+knowHow=எப்படி தெரியும்
+HowToBe=எப்படி இருக்க வேண்டும்
+knowledge=அறிவு
+AbandonmentComment=கைவிடுதல் கருத்து
+DateLastEval=கடைசி மதிப்பீடு தேதி
+NoEval=இந்த பணியாளருக்கு எந்த மதிப்பீடும் செய்யப்படவில்லை
+HowManyUserWithThisMaxNote=இந்த தரவரிசையில் உள்ள பயனர்களின் எண்ணிக்கை
+HighestRank=மிக உயர்ந்த பதவி
+SkillComparison=திறன் ஒப்பீடு
diff --git a/htdocs/langs/ta_IN/install.lang b/htdocs/langs/ta_IN/install.lang
new file mode 100644
index 00000000000..cc851aef05b
--- /dev/null
+++ b/htdocs/langs/ta_IN/install.lang
@@ -0,0 +1,219 @@
+# Dolibarr language file - Source file is en_US - install
+InstallEasy=படிப்படியாக வழிமுறைகளைப் பின்பற்றவும்.
+MiscellaneousChecks=முன்நிபந்தனைகள் சரிபார்க்கவும்
+ConfFileExists=உள்ளமைவு கோப்பு <b> %s </b> உள்ளது.
+ConfFileDoesNotExistsAndCouldNotBeCreated=உள்ளமைவு கோப்பு <b> %s </b> இல்லை மற்றும் உருவாக்க முடியவில்லை!
+ConfFileCouldBeCreated=உள்ளமைவு கோப்பு <b> %s </b> உருவாக்கப்படலாம்.
+ConfFileIsNotWritable=உள்ளமைவு கோப்பு <b> %s </b> எழுத முடியாது. அனுமதிகளைச் சரிபார்க்கவும். முதல் நிறுவலுக்கு, உள்ளமைவுச் செயல்பாட்டின் போது உங்கள் இணைய சேவையகம் இந்தக் கோப்பில் எழுத முடியும் ("chmod 666" எடுத்துக்காட்டாக, OS போன்ற Unix இல்).
+ConfFileIsWritable=உள்ளமைவு கோப்பு <b> %s </b> எழுதக்கூடியது.
+ConfFileMustBeAFileNotADir=உள்ளமைவு கோப்பு <b> %s </b> ஒரு கோப்பாக இருக்க வேண்டும், கோப்பகமாக இருக்கக்கூடாது.
+ConfFileReload=உள்ளமைவு கோப்பிலிருந்து அளவுருக்களை மீண்டும் ஏற்றுகிறது.
+PHPSupportPOSTGETOk=இந்த PHP ஆனது POST மற்றும் GET ஆகிய மாறிகளை ஆதரிக்கிறது.
+PHPSupportPOSTGETKo=உங்கள் PHP அமைப்பு POST மற்றும்/அல்லது GET மாறிகளை ஆதரிக்காது. php.ini இல் <b> variables_order </b> அளவுருவைச் சரிபார்க்கவும்.
+PHPSupportSessions=இந்த PHP அமர்வுகளை ஆதரிக்கிறது.
+PHPSupport=இந்த PHP %s செயல்பாடுகளை ஆதரிக்கிறது.
+PHPMemoryOK=உங்கள் PHP அதிகபட்ச அமர்வு நினைவகம் <b> %s </b> க்கு அமைக்கப்பட்டுள்ளது. இது போதுமானதாக இருக்க வேண்டும்.
+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=திரும்பிச் சென்று அளவுருக்களை சரிபார்க்கவும்/சரி செய்யவும்.
+ErrorWrongValueForParameter='%s' என்ற அளவுருவிற்கு நீங்கள் தவறான மதிப்பைத் தட்டச்சு செய்திருக்கலாம்.
+ErrorFailedToCreateDatabase='%s' தரவுத்தளத்தை உருவாக்குவதில் தோல்வி.
+ErrorFailedToConnectToDatabase='%s' தரவுத்தளத்துடன் இணைக்க முடியவில்லை.
+ErrorDatabaseVersionTooLow=தரவுத்தள பதிப்பு (%s) மிகவும் பழையது. %s அல்லது அதற்கு மேற்பட்ட பதிப்பு தேவை.
+ErrorPHPVersionTooLow=PHP பதிப்பு மிகவும் பழையது. பதிப்பு %s தேவை.
+ErrorConnectedButDatabaseNotFound=சேவையகத்திற்கான இணைப்பு வெற்றிகரமாக உள்ளது ஆனால் தரவுத்தளமான '%s' கிடைக்கவில்லை.
+ErrorDatabaseAlreadyExists=தரவுத்தளம் '%s' ஏற்கனவே உள்ளது.
+IfDatabaseNotExistsGoBackAndUncheckCreate=தரவுத்தளம் இல்லை என்றால், திரும்பிச் சென்று "தரவுத்தளத்தை உருவாக்கு" விருப்பத்தை சரிபார்க்கவும்.
+IfDatabaseExistsGoBackAndCheckCreate=தரவுத்தளம் ஏற்கனவே இருந்தால், திரும்பிச் சென்று "தரவுத்தளத்தை உருவாக்கு" விருப்பத்தைத் தேர்வுநீக்கவும்.
+WarningBrowserTooOld=உலாவியின் பதிப்பு மிகவும் பழையது. உங்கள் உலாவியை Firefox, Chrome அல்லது Opera இன் சமீபத்திய பதிப்பிற்கு மேம்படுத்துவது மிகவும் பரிந்துரைக்கப்படுகிறது.
+PHPVersion=PHP பதிப்பு
+License=உரிமத்தைப் பயன்படுத்துதல்
+ConfigurationFile=கட்டமைப்பு கோப்பு
+WebPagesDirectory=வலைப்பக்கங்கள் சேமிக்கப்படும் அடைவு
+DocumentsDirectory=பதிவேற்றிய மற்றும் உருவாக்கப்பட்ட ஆவணங்களை சேமிப்பதற்கான அடைவு
+URLRoot=URL ரூட்
+ForceHttps=பாதுகாப்பான இணைப்புகளை கட்டாயப்படுத்தவும் (https)
+CheckToForceHttps=பாதுகாப்பான இணைப்புகளை கட்டாயப்படுத்த இந்த விருப்பத்தை சரிபார்க்கவும் (https). <br> இதற்கு வலை சேவையகம் SSL சான்றிதழுடன் கட்டமைக்கப்பட வேண்டும்.
+DolibarrDatabase=டோலிபார் தரவுத்தளம்
+DatabaseType=தரவுத்தள வகை
+DriverType=இயக்கி வகை
+Server=சர்வர்
+ServerAddressDescription=தரவுத்தள சேவையகத்திற்கான பெயர் அல்லது ஐபி முகவரி. தரவுத்தள சேவையகம் இணைய சேவையகத்தின் அதே சேவையகத்தில் ஹோஸ்ட் செய்யப்படும்போது பொதுவாக 'லோக்கல் ஹோஸ்ட்'.
+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=Dolibarrக்குச் செல்லுங்கள்
+GoToSetupArea=Dolibarrக்குச் செல்லவும் (அமைவு பகுதி)
+MigrationNotFinished=தரவுத்தள பதிப்பு முற்றிலும் புதுப்பித்த நிலையில் இல்லை: மேம்படுத்தல் செயல்முறையை மீண்டும் இயக்கவும்.
+GoToUpgradePage=மீண்டும் மேம்படுத்தல் பக்கத்திற்குச் செல்லவும்
+WithNoSlashAtTheEnd=இறுதியில் "/" சாய்வு இல்லாமல்
+DirectoryRecommendation= <span class="warning"> முக்கியமானது </span> : இணையப் பக்கங்களுக்கு வெளியே உள்ள கோப்பகத்தை நீங்கள் பயன்படுத்த வேண்டும் (எனவே முந்தைய அளவுருவின் துணை அடைவுகளைப் பயன்படுத்த வேண்டாம்).
+LoginAlreadyExists=ஏற்கனவே இருக்கிறது
+DolibarrAdminLogin=டோலிபார் நிர்வாகி உள்நுழைவு
+AdminLoginAlreadyExists=Dolibarr நிர்வாகி கணக்கு ' <b> %s </b> ' ஏற்கனவே உள்ளது. நீங்கள் மற்றொன்றை உருவாக்க விரும்பினால் திரும்பிச் செல்லவும்.
+FailedToCreateAdminLogin=Dolibarr நிர்வாகி கணக்கை உருவாக்க முடியவில்லை.
+WarningRemoveInstallDir=எச்சரிக்கை, பாதுகாப்பு காரணங்களுக்காக, நிறுவல் அல்லது மேம்படுத்தல் முடிந்ததும், நிறுவல் கருவிகளை மீண்டும் தற்செயலாக/தீங்கு விளைவிக்கும் வகையில் பயன்படுத்துவதைத் தடுக்க, நீங்கள் <b> install.lock </b> என்ற கோப்பை Dolibarr ஆவணக் கோப்பகத்தில் சேர்க்க வேண்டும்.
+FunctionNotAvailableInThisPHP=இந்த PHP இல் கிடைக்கவில்லை
+ChoosedMigrateScript=இடம்பெயர்வு ஸ்கிரிப்டைத் தேர்ந்தெடுக்கவும்
+DataMigration=தரவுத்தள இடம்பெயர்வு (தரவு)
+DatabaseMigration=தரவுத்தள இடம்பெயர்வு (கட்டமைப்பு + சில தரவு)
+ProcessMigrateScript=ஸ்கிரிப்ட் செயலாக்கம்
+ChooseYourSetupMode=உங்கள் அமைவு பயன்முறையைத் தேர்ந்தெடுத்து, "தொடங்கு" என்பதைக் கிளிக் செய்யவும்...
+FreshInstall=புதிய நிறுவல்
+FreshInstallDesc=இது உங்கள் முதல் நிறுவலாக இருந்தால், இந்த பயன்முறையைப் பயன்படுத்தவும். இல்லையெனில், இந்த பயன்முறை முழுமையற்ற முந்தைய நிறுவலை சரிசெய்ய முடியும். உங்கள் பதிப்பை மேம்படுத்த விரும்பினால், "மேம்படுத்து" பயன்முறையைத் தேர்ந்தெடுக்கவும்.
+Upgrade=மேம்படுத்தல்
+UpgradeDesc=நீங்கள் பழைய Dolibarr கோப்புகளை புதிய பதிப்பில் உள்ள கோப்புகளுடன் மாற்றியிருந்தால் இந்த பயன்முறையைப் பயன்படுத்தவும். இது உங்கள் தரவுத்தளத்தையும் தரவையும் மேம்படுத்தும்.
+Start=தொடங்கு
+InstallNotAllowed=<b> conf.php </b> அனுமதிகளால் அமைவு அனுமதிக்கப்படவில்லை
+YouMustCreateWithPermission=நிறுவல் செயல்பாட்டின் போது நீங்கள் %s கோப்பை உருவாக்கி, இணைய சேவையகத்திற்கு எழுத அனுமதிகளை அமைக்க வேண்டும்.
+CorrectProblemAndReloadPage=சிக்கலைச் சரிசெய்து, பக்கத்தை மீண்டும் ஏற்ற F5ஐ அழுத்தவும்.
+AlreadyDone=ஏற்கனவே இடம் பெயர்ந்து விட்டது
+DatabaseVersion=தரவுத்தள பதிப்பு
+ServerVersion=தரவுத்தள சேவையக பதிப்பு
+YouMustCreateItAndAllowServerToWrite=நீங்கள் இந்த கோப்பகத்தை உருவாக்கி, இணைய சேவையகத்தை அதில் எழுத அனுமதிக்க வேண்டும்.
+DBSortingCollation=எழுத்து வரிசைப்படுத்தும் வரிசை
+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 a09a4b739f
+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இடம்பெயர்வு செயல்முறையைத் தொடங்க சரி என்பதைக் கிளிக் செய்யவும்...
+ErrorDatabaseVersionForbiddenForMigration=உங்கள் தரவுத்தள பதிப்பு %s. இது ஒரு முக்கியமான பிழையைக் கொண்டுள்ளது, இது உங்கள் தரவுத்தளத்தில் கட்டமைப்பு மாற்றங்களைச் செய்தால் தரவு இழப்பை சாத்தியமாக்குகிறது. அவரது காரணத்திற்காக, உங்கள் தரவுத்தளத்தை லேயர் (பேட்ச் செய்யப்பட்ட) பதிப்பிற்கு மேம்படுத்தும் வரை இடம்பெயர்வு அனுமதிக்கப்படாது (தெரிந்த பிழையான பதிப்புகளின் பட்டியல்: %s)
+KeepDefaultValuesWamp=DoliWamp இலிருந்து Dolibarr அமைவு வழிகாட்டியைப் பயன்படுத்தியுள்ளீர்கள், எனவே இங்கு முன்மொழியப்பட்ட மதிப்புகள் ஏற்கனவே மேம்படுத்தப்பட்டுள்ளன. நீங்கள் என்ன செய்கிறீர்கள் என்று உங்களுக்குத் தெரிந்தால் மட்டுமே அவற்றை மாற்றவும்.
+KeepDefaultValuesDeb=நீங்கள் Linux தொகுப்பிலிருந்து (Ubuntu, Debian, Fedora...) Dolibarr அமைவு வழிகாட்டியைப் பயன்படுத்தியுள்ளீர்கள், எனவே இங்கு முன்மொழியப்பட்ட மதிப்புகள் ஏற்கனவே உகந்ததாக உள்ளன. உருவாக்குவதற்கான தரவுத்தள உரிமையாளரின் கடவுச்சொல்லை மட்டுமே உள்ளிட வேண்டும். நீங்கள் என்ன செய்கிறீர்கள் என்று தெரிந்தால் மட்டுமே மற்ற அளவுருக்களை மாற்றவும்.
+KeepDefaultValuesMamp=நீங்கள் DoliMamp இலிருந்து Dolibarr அமைவு வழிகாட்டியைப் பயன்படுத்தியுள்ளீர்கள், எனவே இங்கு முன்மொழியப்பட்ட மதிப்புகள் ஏற்கனவே மேம்படுத்தப்பட்டுள்ளன. நீங்கள் என்ன செய்கிறீர்கள் என்று உங்களுக்குத் தெரிந்தால் மட்டுமே அவற்றை மாற்றவும்.
+KeepDefaultValuesProxmox=நீங்கள் Proxmox மெய்நிகர் சாதனத்திலிருந்து Dolibarr அமைவு வழிகாட்டியைப் பயன்படுத்தியுள்ளீர்கள், எனவே இங்கு முன்மொழியப்பட்ட மதிப்புகள் ஏற்கனவே மேம்படுத்தப்பட்டுள்ளன. நீங்கள் என்ன செய்கிறீர்கள் என்று உங்களுக்குத் தெரிந்தால் மட்டுமே அவற்றை மாற்றவும்.
+UpgradeExternalModule=வெளிப்புற தொகுதிக்கான பிரத்யேக மேம்படுத்தல் செயல்முறையை இயக்கவும்
+SetAtLeastOneOptionAsUrlParameter=URL இல் குறைந்தபட்சம் ஒரு விருப்பத்தை அளவுருவாக அமைக்கவும். உதாரணமாக: '...repair.php?standard=confirmed'
+NothingToDelete=சுத்தம்/நீக்க எதுவும் இல்லை
+NothingToDo=செய்வதற்கு ஒன்றுமில்லை
+#########
+# upgrade
+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=llx_element_contact க்கு llx_projet இன் தரவு இடம்பெயர்வு புலம் fk_user_resp
+MigrationProjectTaskTime=செலவழித்த நேரத்தை நொடிகளில் புதுப்பிக்கவும்
+MigrationActioncommElement=செயல்கள் பற்றிய தரவைப் புதுப்பிக்கவும்
+MigrationPaymentMode=கட்டண வகைக்கான தரவு இடம்பெயர்வு
+MigrationCategorieAssociation=வகைகளின் இடம்பெயர்வு
+MigrationEvents=நிகழ்வு உரிமையாளரை ஒதுக்கீட்டு அட்டவணையில் சேர்க்க நிகழ்வுகளின் இடம்பெயர்வு
+MigrationEventsContact=நிகழ்வு தொடர்பை ஒதுக்கீட்டு அட்டவணையில் சேர்க்க நிகழ்வுகளின் இடம்பெயர்வு
+MigrationRemiseEntity=llx_societe_remise இன் பொருளின் புல மதிப்பைப் புதுப்பிக்கவும்
+MigrationRemiseExceptEntity=llx_societe_remise_exception இன் பொருளின் புல மதிப்பைப் புதுப்பிக்கவும்
+MigrationUserRightsEntity=llx_user_rights இன் நிறுவன புல மதிப்பைப் புதுப்பிக்கவும்
+MigrationUserGroupRightsEntity=llx_usergroup_rights இன் நிறுவன புல மதிப்பைப் புதுப்பிக்கவும்
+MigrationUserPhotoPath=பயனர்களுக்கான புகைப்பட பாதைகளின் இடம்பெயர்வு
+MigrationFieldsSocialNetworks=பயனர்களின் இடம்பெயர்வு சமூக வலைப்பின்னல்களில் (%s)
+MigrationReloadModule=%s தொகுதியை மீண்டும் ஏற்றவும்
+MigrationResetBlockedLog=v7 அல்காரிதத்திற்கான தொகுதி BlockedLog ஐ மீட்டமைக்கவும்
+MigrationImportOrExportProfiles=இறக்குமதி அல்லது ஏற்றுமதி சுயவிவரங்களின் இடம்பெயர்வு (%s)
+ShowNotAvailableOptions=கிடைக்காத விருப்பங்களைக் காட்டு
+HideNotAvailableOptions=கிடைக்காத விருப்பங்களை மறை
+ErrorFoundDuringMigration=இடம்பெயர்வுச் செயல்பாட்டின் போது பிழை(கள்) பதிவாகியதால் அடுத்த கட்டம் கிடைக்கவில்லை. பிழைகளைப் புறக்கணிக்க, <a href="%s"> இங்கே கிளிக் செய்யலாம் </a> , ஆனால் பிழைகள் தீர்க்கப்படும் வரை பயன்பாடு அல்லது சில அம்சங்கள் சரியாக வேலை செய்யாமல் போகலாம்.
+YouTryInstallDisabledByDirLock=பயன்பாடு சுய-மேம்படுத்த முயற்சித்தது, ஆனால் பாதுகாப்புக்காக நிறுவல்/மேம்படுத்துதல் பக்கங்கள் முடக்கப்பட்டுள்ளன (அடைவு .lock பின்னொட்டு என மறுபெயரிடப்பட்டது). <br>
+YouTryInstallDisabledByFileLock=பயன்பாடு சுய-மேம்படுத்த முயற்சித்தது, ஆனால் பாதுகாப்புக்காக நிறுவல்/மேம்படுத்துதல் பக்கங்கள் முடக்கப்பட்டுள்ளன (dolibarr ஆவணங்கள் கோப்பகத்தில் <strong> install.lock </strong> என்ற பூட்டுக் கோப்பு இருப்பதால்). <br>
+ClickHereToGoToApp=உங்கள் விண்ணப்பத்திற்குச் செல்ல இங்கே கிளிக் செய்யவும்
+ClickOnLinkOrRemoveManualy=மேம்படுத்தல் செயல்பாட்டில் இருந்தால், காத்திருக்கவும். இல்லையென்றால், பின்வரும் இணைப்பைக் கிளிக் செய்யவும். நீங்கள் எப்பொழுதும் இதே பக்கத்தைப் பார்த்தால், ஆவணங்கள் கோப்பகத்தில் உள்ள install.lock கோப்பை நீக்க/மறுபெயரிட வேண்டும்.
+Loaded=ஏற்றப்பட்டது
+FunctionTest=செயல்பாட்டு சோதனை
diff --git a/htdocs/langs/ta_IN/interventions.lang b/htdocs/langs/ta_IN/interventions.lang
new file mode 100644
index 00000000000..6c773958e35
--- /dev/null
+++ b/htdocs/langs/ta_IN/interventions.lang
@@ -0,0 +1,68 @@
+# Dolibarr language file - Source file is en_US - interventions
+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=தலையீட்டின் சமர்ப்பிப்பு %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 இல் சேர்க்கவும்.
+InterId=தலையீடு ஐடி
+InterRef=தலையீடு ref.
+InterDateCreation=தேதி உருவாக்கம் தலையீடு
+InterDuration=கால தலையீடு
+InterStatus=நிலை தலையீடு
+InterNote=குறிப்பு தலையீடு
+InterLine=தலையீடு வரி
+InterLineId=வரி ஐடி தலையீடு
+InterLineDate=வரி தேதி தலையீடு
+InterLineDuration=வரி கால தலையீடு
+InterLineDesc=வரி விளக்கம் தலையீடு
+RepeatableIntervention=தலையீட்டின் வார்ப்புரு
+ToCreateAPredefinedIntervention=முன் வரையறுக்கப்பட்ட அல்லது தொடர்ச்சியான தலையீட்டை உருவாக்க, ஒரு பொதுவான தலையீட்டை உருவாக்கி அதை தலையீட்டு டெம்ப்ளேட்டாக மாற்றவும்
+ConfirmReopenIntervention=<b> %s </b> தலையீட்டைத் திரும்பப் பெற விரும்புகிறீர்களா?
+GenerateInter=தலையீட்டை உருவாக்குங்கள்
diff --git a/htdocs/langs/ta_IN/intracommreport.lang b/htdocs/langs/ta_IN/intracommreport.lang
new file mode 100644
index 00000000000..855210a684d
--- /dev/null
+++ b/htdocs/langs/ta_IN/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = இன்ட்ராகாம் அறிக்கை
+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=டைப் டி ஆக்டியர்
+INTRACOMMREPORT_ROLE_ACTEUR=ரோல் ஜோ பார் லி'ஆக்டியர்
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les அறிமுகங்கள்
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expeditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT="ஃப்ரைஸ் டி போர்ட்" வகையின் சேவைகளின் வகை
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de declarant
+
+# Menu
+MenuIntracommReport=இன்ட்ராகாம் அறிக்கை
+MenuIntracommReportNew=புதிய பிரகடனம்
+MenuIntracommReportList=பட்டியல்
+
+# View
+NewDeclaration=புதிய பிரகடனம்
+Declaration=பிரகடனம்
+AnalysisPeriod=பகுப்பாய்வு காலம்
+TypeOfDeclaration=பிரகடனத்தின் வகை
+DEB=பொருட்கள் பரிமாற்ற அறிவிப்பு (DEB)
+DES=சேவைகள் பரிமாற்ற அறிவிப்பு (DES)
+
+# Export page
+IntracommReportTitle=ProDouane வடிவத்தில் XML கோப்பைத் தயாரித்தல்
+
+# List
+IntracommReportList=உருவாக்கப்பட்ட அறிவிப்புகளின் பட்டியல்
+IntracommReportNumber=அறிவிப்பு எண்
+IntracommReportPeriod=பகுப்பாய்வு காலம்
+IntracommReportTypeDeclaration=பிரகடனத்தின் வகை
+IntracommReportDownload=XML கோப்பைப் பதிவிறக்கவும்
+
+# Invoice
+IntracommReportTransportMode=போக்குவரத்து முறை
diff --git a/htdocs/langs/ta_IN/knowledgemanagement.lang b/htdocs/langs/ta_IN/knowledgemanagement.lang
new file mode 100644
index 00000000000..414eebbea0f
--- /dev/null
+++ b/htdocs/langs/ta_IN/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 = அறிவு மேலாண்மை அமைப்பு
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=அறிவு மேலாண்மை (KM) அல்லது உதவி-மேசை தளத்தை நிர்வகிக்கவும்
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = அறிவு மேலாண்மை அமைப்பு அமைப்பு
+Settings = அமைப்புகள்
+KnowledgeManagementSetupPage = அறிவு மேலாண்மை அமைப்பு அமைப்பு பக்கம்
+
+
+#
+# About page
+#
+About = பற்றி
+KnowledgeManagementAbout = அறிவு மேலாண்மை பற்றி
+KnowledgeManagementAboutPage = பக்கத்தைப் பற்றிய அறிவு மேலாண்மை
+
+KnowledgeManagementArea = அறிவு மேலாண்மை
+MenuKnowledgeRecord = அறிவு சார்ந்த
+ListKnowledgeRecord = கட்டுரைகளின் பட்டியல்
+NewKnowledgeRecord = புதிய கட்டுரை
+ValidateReply = தீர்வு சரிபார்க்கவும்
+KnowledgeRecords = கட்டுரைகள்
+KnowledgeRecord = கட்டுரை
+KnowledgeRecordExtraFields = கட்டுரைக்கான கூடுதல் புலங்கள்
+GroupOfTicket=டிக்கெட்டுகளின் குழு
+YouCanLinkArticleToATicketCategory=நீங்கள் ஒரு கட்டுரையை டிக்கெட் குழுவுடன் இணைக்கலாம் (எனவே புதிய டிக்கெட்டுகளின் தகுதியின் போது கட்டுரை பரிந்துரைக்கப்படும்)
+SuggestedForTicketsInGroup=குழுவாக இருக்கும்போது டிக்கெட்டுகளுக்கு பரிந்துரைக்கப்படுகிறது
+
+SetObsolete=Set as obsolete
+ConfirmCloseKM=Do you confirm the closing of this article as obsolete ?
+ConfirmReopenKM=Do you want to restore this article to status "Validated" ?
diff --git a/htdocs/langs/ta_IN/languages.lang b/htdocs/langs/ta_IN/languages.lang
new file mode 100644
index 00000000000..d3de453d242
--- /dev/null
+++ b/htdocs/langs/ta_IN/languages.lang
@@ -0,0 +1,114 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_am_ET=எத்தியோப்பியன்
+Language_ar_AR=அரபு
+Language_ar_DZ=அரபு (அல்ஜீரியா)
+Language_ar_EG=அரபு (எகிப்து)
+Language_ar_MA=அரபு (மொரோகோ)
+Language_ar_SA=அரபு
+Language_ar_TN=அரபு (துனிசியா)
+Language_ar_IQ=அரபு (ஈராக்)
+Language_as_IN=ஆசாமிகள்
+Language_az_AZ=அஜர்பைஜானி
+Language_bn_BD=பெங்காலி
+Language_bn_IN=பெங்காலி (இந்தியா)
+Language_bg_BG=பல்கேரியன்
+Language_bs_BA=போஸ்னியன்
+Language_ca_ES=கற்றலான்
+Language_cs_CZ=செக்
+Language_da_DA=டேனிஷ்
+Language_da_DK=டேனிஷ்
+Language_de_DE=ஜெர்மன்
+Language_de_AT=ஜெர்மன் (ஆஸ்திரியா)
+Language_de_CH=ஜெர்மன் (சுவிட்சர்லாந்து)
+Language_el_GR=கிரேக்கம்
+Language_el_CY=கிரேக்கம் (சைப்ரஸ்)
+Language_en_AU=ஆங்கிலம் (ஆஸ்திரேலியா)
+Language_en_CA=ஆங்கிலம் (கனடா)
+Language_en_GB=ஆங்கிலம் (யுனைடெட் கிங்டம்)
+Language_en_IN=ஆங்கிலம் (இந்தியா)
+Language_en_NZ=ஆங்கிலம் (நியூசிலாந்து)
+Language_en_SA=ஆங்கிலம் (சவூதி அரேபியா)
+Language_en_SG=ஆங்கிலம் (சிங்கப்பூர்)
+Language_en_US=அமெரிக்க ஆங்கிலம்)
+Language_en_ZA=ஆங்கிலம் (தென் ஆப்பிரிக்கா)
+Language_es_ES=ஸ்பானிஷ்
+Language_es_AR=ஸ்பானிஷ் (அர்ஜென்டினா)
+Language_es_BO=ஸ்பானிஷ் (பொலிவியா)
+Language_es_CL=ஸ்பானிஷ் (சிலி)
+Language_es_CO=ஸ்பானிஷ் (கொலம்பியா)
+Language_es_DO=ஸ்பானிஷ் (டொமினிகன் குடியரசு)
+Language_es_EC=ஸ்பானிஷ் (ஈக்வடார்)
+Language_es_GT=ஸ்பானிஷ் (குவாத்தமாலா)
+Language_es_HN=ஸ்பானிஷ் (ஹோண்டுராஸ்)
+Language_es_MX=ஸ்பானிஷ் (மெக்சிகோ)
+Language_es_PA=ஸ்பானிஷ் (பனாமா)
+Language_es_PY=ஸ்பானிஷ் (பராகுவே)
+Language_es_PE=ஸ்பானிஷ் (பெரு)
+Language_es_PR=ஸ்பானிஷ் (புவேர்ட்டோ ரிக்கோ)
+Language_es_US=ஸ்பானிஷ் (அமெரிக்கா)
+Language_es_UY=ஸ்பானிஷ் (உருகுவே)
+Language_es_GT=ஸ்பானிஷ் (குவாத்தமாலா)
+Language_es_VE=ஸ்பானிஷ் (வெனிசுலா)
+Language_et_EE=எஸ்டோனியன்
+Language_eu_ES=பாஸ்க்
+Language_fa_IR=பாரசீக
+Language_fi_FI=பின்னிஷ்
+Language_fr_BE=பிரஞ்சு (பெல்ஜியம்)
+Language_fr_CA=பிரெஞ்சு (கனடா)
+Language_fr_CH=பிரஞ்சு (சுவிட்சர்லாந்து)
+Language_fr_CI=பிரஞ்சு (காஸ்ட் ஐவரி)
+Language_fr_CM=பிரஞ்சு (கேமரூன்)
+Language_fr_FR=பிரெஞ்சு
+Language_fr_GA=பிரஞ்சு (காபோன்)
+Language_fr_NC=பிரஞ்சு (நியூ கலிடோனியா)
+Language_fr_SN=பிரஞ்சு (செனகல்)
+Language_fy_NL=ஃப்ரிஷியன்
+Language_gl_ES=காலிசியன்
+Language_he_IL=ஹீப்ரு
+Language_hi_IN=இந்தி (இந்தியா)
+Language_hr_HR=குரோஷியன்
+Language_hu_HU=ஹங்கேரிய
+Language_id_ID=இந்தோனேஷியன்
+Language_is_IS=ஐஸ்லாந்து
+Language_it_IT=இத்தாலிய
+Language_it_CH=இத்தாலியன் (சுவிட்சர்லாந்து)
+Language_ja_JP=ஜப்பானியர்
+Language_ka_GE=ஜார்ஜியன்
+Language_kk_KZ=கசாக்
+Language_km_KH=கெமர்
+Language_kn_IN=கன்னடம்
+Language_ko_KR=கொரிய
+Language_lo_LA=லாவோ
+Language_lt_LT=லிதுவேனியன்
+Language_lv_LV=லாட்வியன்
+Language_mk_MK=மாசிடோனியன்
+Language_mn_MN=மங்கோலியன்
+Language_nb_NO=நார்வேஜியன் (போக்மால்)
+Language_ne_NP=நேபாளி
+Language_nl_BE=டச்சு (பெல்ஜியம்)
+Language_nl_NL=டச்சு
+Language_pl_PL=போலிஷ்
+Language_pt_AO=போர்த்துகீசியம் (அங்கோலா)
+Language_pt_BR=போர்த்துகீசியம் (பிரேசில்)
+Language_pt_PT=போர்த்துகீசியம்
+Language_ro_MD=ருமேனியன் (மால்டாவியா)
+Language_ro_RO=ரோமானியன்
+Language_ru_RU=ரஷ்யன்
+Language_ru_UA=ரஷ்யன் (உக்ரைன்)
+Language_tg_TJ=தாஜிக்
+Language_tr_TR=துருக்கிய
+Language_sl_SI=ஸ்லோவேனியன்
+Language_sv_SV=ஸ்வீடிஷ்
+Language_sv_SE=ஸ்வீடிஷ்
+Language_sq_AL=அல்பேனியன்
+Language_sk_SK=ஸ்லோவாக்கியன்
+Language_sr_RS=செர்பியன்
+Language_sw_SW=கிஸ்வாஹிலி
+Language_th_TH=தாய்
+Language_uk_UA=உக்ரைனியன்
+Language_uz_UZ=உஸ்பெக்
+Language_vi_VN=வியட்நாமியர்
+Language_zh_CN=சீன
+Language_zh_TW=சீனம் (பாரம்பரியம்)
+Language_zh_HK=சீன (ஹாங்காங்)
+Language_bh_MY=மலாய்
diff --git a/htdocs/langs/ta_IN/ldap.lang b/htdocs/langs/ta_IN/ldap.lang
new file mode 100644
index 00000000000..cdd8ef341b2
--- /dev/null
+++ b/htdocs/langs/ta_IN/ldap.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=<b> %s a09a4b730f17f டொமைனில் <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=ஸ்கைப் ஐடி
+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/ta_IN/link.lang b/htdocs/langs/ta_IN/link.lang
new file mode 100644
index 00000000000..177caf7ef14
--- /dev/null
+++ b/htdocs/langs/ta_IN/link.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=புதிய கோப்பு/ஆவணத்தை இணைக்கவும்
+LinkedFiles=இணைக்கப்பட்ட கோப்புகள் மற்றும் ஆவணங்கள்
+NoLinkFound=பதிவு செய்யப்பட்ட இணைப்புகள் இல்லை
+LinkComplete=கோப்பு வெற்றிகரமாக இணைக்கப்பட்டது
+ErrorFileNotLinked=கோப்பை இணைக்க முடியவில்லை
+LinkRemoved=%s இணைப்பு அகற்றப்பட்டது
+ErrorFailedToDeleteLink= ' <b> %s </b> ' இணைப்பை அகற்ற முடியவில்லை
+ErrorFailedToUpdateLink= ' <b> %s </b> ' இணைப்பைப் புதுப்பிக்க முடியவில்லை
+URLToLink=இணைக்க வேண்டிய URL
+OverwriteIfExists=கோப்பு இருந்தால் மேலெழுதவும்
diff --git a/htdocs/langs/ta_IN/loan.lang b/htdocs/langs/ta_IN/loan.lang
new file mode 100644
index 00000000000..da99eccc3a8
--- /dev/null
+++ b/htdocs/langs/ta_IN/loan.lang
@@ -0,0 +1,34 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=கடன்
+Loans=கடன்கள்
+NewLoan=புதிய கடன்
+ShowLoan=கடனைக் காட்டு
+PaymentLoan=கடன் செலுத்துதல்
+LoanPayment=கடன் செலுத்துதல்
+ShowLoanPayment=கடன் செலுத்துதலைக் காட்டு
+LoanCapital=மூலதனம்
+Insurance=காப்பீடு
+Interest=ஆர்வம்
+Nbterms=விதிமுறைகளின் எண்ணிக்கை
+Term=கால
+LoanAccountancyCapitalCode=கணக்கியல் கணக்கு மூலதனம்
+LoanAccountancyInsuranceCode=கணக்கியல் கணக்கு காப்பீடு
+LoanAccountancyInterestCode=கணக்கியல் கணக்கு வட்டி
+ConfirmDeleteLoan=இந்தக் கடனை நீக்குவதை உறுதிப்படுத்தவும்
+LoanDeleted=கடன் வெற்றிகரமாக நீக்கப்பட்டது
+ConfirmPayLoan=இந்த கடனை செலுத்தியதை வகைப்படுத்தவும்
+LoanPaid=கடன் செலுத்தப்பட்டது
+ListLoanAssociatedProject=திட்டத்துடன் தொடர்புடைய கடனின் பட்டியல்
+AddLoan=கடனை உருவாக்கவும்
+FinancialCommitment=நிதி அர்ப்பணிப்பு
+InterestAmount=ஆர்வம்
+CapitalRemain=மூலதனம் உள்ளது
+TermPaidAllreadyPaid = இந்த காலம் ஏற்கனவே செலுத்தப்பட்டது
+CantUseScheduleWithLoanStartedToPaid = பணம் செலுத்தத் தொடங்கியவுடன் கடனுக்காக திட்டமிடலைப் பயன்படுத்த முடியாது
+CantModifyInterestIfScheduleIsUsed = நீங்கள் அட்டவணையைப் பயன்படுத்தினால் ஆர்வத்தை மாற்ற முடியாது
+# Admin
+ConfigLoan=தொகுதி கடன் கட்டமைப்பு
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=கணக்கியல் கணக்கு மூலதனம் இயல்பாக
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=கணக்கியல் கணக்கு வட்டி இயல்பாக
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=முன்னிருப்பாக கணக்கியல் கணக்கு காப்பீடு
+CreateCalcSchedule=நிதி உறுதியைத் திருத்தவும்
diff --git a/htdocs/langs/ta_IN/mailmanspip.lang b/htdocs/langs/ta_IN/mailmanspip.lang
new file mode 100644
index 00000000000..60e339c970a
--- /dev/null
+++ b/htdocs/langs/ta_IN/mailmanspip.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanSpipSetup=Mailman மற்றும் SPIP தொகுதி அமைவு
+MailmanTitle=மெயில்மேன் அஞ்சல் பட்டியல் அமைப்பு
+TestSubscribe=மெயில்மேன் பட்டியல்களுக்கான சந்தாவை சோதிக்க
+TestUnSubscribe=Mailman பட்டியல்களில் இருந்து குழுவிலகுவதை சோதிக்க
+MailmanCreationSuccess=சந்தா சோதனை வெற்றிகரமாகச் செயல்படுத்தப்பட்டது
+MailmanDeletionSuccess=குழுவிலகல் சோதனை வெற்றிகரமாகச் செயல்படுத்தப்பட்டது
+SynchroMailManEnabled=ஒரு Mailman மேம்படுத்தல் செய்யப்படும்
+SynchroSpipEnabled=ஒரு ஸ்பிப் அப்டேட் செய்யப்படும்
+DescADHERENT_MAILMAN_ADMINPW=Mailman நிர்வாகி கடவுச்சொல்
+DescADHERENT_MAILMAN_URL=Mailman சந்தாக்களுக்கான URL
+DescADHERENT_MAILMAN_UNSUB_URL=Mailman சந்தா விலக்குக்கான URL
+DescADHERENT_MAILMAN_LISTS=புதிய உறுப்பினர்களின் தானியங்கி கல்வெட்டுக்கான பட்டியல்(கள்) (காற்புள்ளியால் பிரிக்கப்பட்டது)
+SPIPTitle=SPIP உள்ளடக்க மேலாண்மை அமைப்பு
+DescADHERENT_SPIP_SERVEUR=SPIP சேவையகம்
+DescADHERENT_SPIP_DB=SPIP தரவுத்தள பெயர்
+DescADHERENT_SPIP_USER=SPIP தரவுத்தள உள்நுழைவு
+DescADHERENT_SPIP_PASS=SPIP தரவுத்தள கடவுச்சொல்
+AddIntoSpip=SPIP இல் சேர்க்கவும்
+AddIntoSpipConfirmation=இந்த உறுப்பினரை SPIP இல் நிச்சயமாகச் சேர்க்க விரும்புகிறீர்களா?
+AddIntoSpipError=SPIP இல் பயனரைச் சேர்க்க முடியவில்லை
+DeleteIntoSpip=SPIP இலிருந்து அகற்று
+DeleteIntoSpipConfirmation=SPIP இலிருந்து இந்த உறுப்பினரை நிச்சயமாக அகற்ற விரும்புகிறீர்களா?
+DeleteIntoSpipError=SPIP இலிருந்து பயனரை அடக்குவதில் தோல்வி
+SPIPConnectionFailed=SPIP உடன் இணைப்பதில் தோல்வி
+SuccessToAddToMailmanList=%s மெயில்மேன் பட்டியலில் %s அல்லது SPIP தரவுத்தளத்தில் வெற்றிகரமாக சேர்க்கப்பட்டது
+SuccessToRemoveToMailmanList=%s மெயில்மேன் பட்டியல் %s அல்லது SPIP தரவுத்தளத்திலிருந்து வெற்றிகரமாக அகற்றப்பட்டது
diff --git a/htdocs/langs/ta_IN/mails.lang b/htdocs/langs/ta_IN/mails.lang
new file mode 100644
index 00000000000..a502549e29c
--- /dev/null
+++ b/htdocs/langs/ta_IN/mails.lang
@@ -0,0 +1,180 @@
+# Dolibarr language file - Source file is en_US - mails
+Mailing=மின்னஞ்சல் அனுப்புதல்
+EMailing=மின்னஞ்சல் அனுப்புதல்
+EMailings=மின்னஞ்சல்கள்
+AllEMailings=அனைத்து மின்னஞ்சல்களும்
+MailCard=மின்னஞ்சல் அட்டை
+MailRecipients=பெற்றவர்கள்
+MailRecipient=பெறுபவர்
+MailTitle=விளக்கம்
+MailFrom=அனுப்புபவர்
+MailErrorsTo=பிழைகள்
+MailReply=பதிலளிக்க
+MailTo=பெறுநர்(கள்)
+MailToUsers=பயனர்(களுக்கு)
+MailCC=நகலெடு
+MailToCCUsers=பயனர்களுக்கு நகலெடு
+MailCCC=க்கு கேச் செய்யப்பட்ட நகல்
+MailTopic=மின்னஞ்சல் பொருள்
+MailText=செய்தி
+MailFile=இணைக்கப்பட்ட கோப்புகள்
+MailMessage=மின்னஞ்சல் உடல்
+SubjectNotIn=பாடத்தில் இல்லை
+BodyNotIn=உடலில் இல்லை
+ShowEMailing=மின்னஞ்சலைக் காட்டு
+ListOfEMailings=மின்னஞ்சல்களின் பட்டியல்
+NewMailing=புதிய மின்னஞ்சல்
+EditMailing=மின்னஞ்சலைத் திருத்தவும்
+ResetMailing=மின்னஞ்சலை மீண்டும் அனுப்பவும்
+DeleteMailing=மின்னஞ்சலை நீக்கு
+DeleteAMailing=மின்னஞ்சலை நீக்கவும்
+PreviewMailing=மின்னஞ்சலின் முன்னோட்டம்
+CreateMailing=மின்னஞ்சலை உருவாக்கவும்
+TestMailing=சோதனை மின்னஞ்சல்
+ValidMailing=சரியான மின்னஞ்சல்
+MailingStatusDraft=வரைவு
+MailingStatusValidated=சரிபார்க்கப்பட்டது
+MailingStatusSent=அனுப்பப்பட்டது
+MailingStatusSentPartialy=பகுதியளவு அனுப்பப்பட்டது
+MailingStatusSentCompletely=முழுமையாக அனுப்பப்பட்டது
+MailingStatusError=பிழை
+MailingStatusNotSent=அனுப்பப்படவில்லை
+MailSuccessfulySent=மின்னஞ்சல் (%s இலிருந்து %s வரை) டெலிவரிக்கு வெற்றிகரமாக ஏற்றுக்கொள்ளப்பட்டது
+MailingSuccessfullyValidated=மின்னஞ்சல் அனுப்புதல் வெற்றிகரமாக சரிபார்க்கப்பட்டது
+MailUnsubcribe=குழுவிலகவும்
+MailingStatusNotContact=இனி தொடர்பு கொள்ள வேண்டாம்
+MailingStatusReadAndUnsubscribe=படித்துவிட்டு குழுவிலகவும்
+ErrorMailRecipientIsEmpty=மின்னஞ்சல் பெறுநர் காலியாக உள்ளார்
+WarningNoEMailsAdded=பெறுநரின் பட்டியலில் சேர்க்க புதிய மின்னஞ்சல் எதுவும் இல்லை.
+ConfirmValidMailing=இந்த மின்னஞ்சலை நிச்சயமாக சரிபார்க்க விரும்புகிறீர்களா?
+ConfirmResetMailing=எச்சரிக்கை, <b> %s </b> மின்னஞ்சலை மீண்டும் தொடங்குவதன் மூலம், இந்த மின்னஞ்சலை மொத்தமாக அஞ்சல் மூலம் மீண்டும் அனுப்ப அனுமதிப்பீர்கள். நிச்சயமாக இதைச் செய்ய விரும்புகிறீர்களா?
+ConfirmDeleteMailing=இந்த மின்னஞ்சலை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+NbOfUniqueEMails=தனிப்பட்ட மின்னஞ்சல்களின் எண்ணிக்கை
+NbOfEMails=மின்னஞ்சல்களின் எண்ணிக்கை
+TotalNbOfDistinctRecipients=தனித்துவமான பெறுநர்களின் எண்ணிக்கை
+NoTargetYet=இன்னும் பெறுநர்கள் வரையறுக்கப்படவில்லை ('பெறுநர்கள்' தாவலுக்குச் செல்லவும்)
+NoRecipientEmail=%s க்கு பெறுநர் மின்னஞ்சல் இல்லை
+RemoveRecipient=பெறுநரை அகற்று
+YouCanAddYourOwnPredefindedListHere=உங்கள் மின்னஞ்சல் தேர்வுக்குழு தொகுதியை உருவாக்க, htdocs/core/modules/mailings/README ஐப் பார்க்கவும்.
+EMailTestSubstitutionReplacedByGenericValues=சோதனை பயன்முறையைப் பயன்படுத்தும் போது, மாற்று மாறிகள் பொதுவான மதிப்புகளால் மாற்றப்படுகின்றன
+MailingAddFile=இந்தக் கோப்பை இணைக்கவும்
+NoAttachedFiles=இணைக்கப்பட்ட கோப்புகள் இல்லை
+BadEMail=மின்னஞ்சலுக்கு மோசமான மதிப்பு
+EMailNotDefined=மின்னஞ்சல் வரையறுக்கப்படவில்லை
+ConfirmCloneEMailing=இந்த மின்னஞ்சலை நிச்சயமாக குளோன் செய்ய விரும்புகிறீர்களா?
+CloneContent=குளோன் செய்தி
+CloneReceivers=குளோனர் பெற்றவர்கள்
+DateLastSend=சமீபத்திய அனுப்புதல் தேதி
+DateSending=அனுப்பும் தேதி
+SentTo=<b> %s </b> க்கு அனுப்பப்பட்டது
+MailingStatusRead=படி
+YourMailUnsubcribeOK=மின்னஞ்சல் <b> %s </b> அஞ்சல் பட்டியலில் இருந்து சரியாக குழுவிலகப்பட்டது
+ActivateCheckReadKey="ரீட் ரசீது" மற்றும் "குழுவிலகு" அம்சத்திற்கு பயன்படுத்தப்படும் URL ஐ குறியாக்க விசை பயன்படுத்தப்படுகிறது
+EMailSentToNRecipients=%s பெறுநர்களுக்கு மின்னஞ்சல் அனுப்பப்பட்டது.
+EMailSentForNElements=%s உறுப்புகளுக்கு மின்னஞ்சல் அனுப்பப்பட்டது.
+XTargetsAdded= <b> %s </b> பெறுநர்கள் இலக்கு பட்டியலில் சேர்க்கப்பட்டனர்
+OnlyPDFattachmentSupported=பொருள்களை அனுப்புவதற்கு 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=கோப்பில் %s வரி
+RecipientSelectionModules=பெறுநரின் தேர்வுக்கான வரையறுக்கப்பட்ட கோரிக்கைகள்
+MailSelectedRecipients=தேர்ந்தெடுக்கப்பட்ட பெறுநர்கள்
+MailingArea=மின்னஞ்சல்கள் பகுதி
+LastMailings=சமீபத்திய %s மின்னஞ்சல்கள்
+TargetsStatistics=இலக்கு புள்ளிவிவரங்கள்
+NbOfCompaniesContacts=தனிப்பட்ட தொடர்புகள்/முகவரிகள்
+MailNoChangePossible=சரிபார்க்கப்பட்ட மின்னஞ்சலுக்கான பெறுநர்களை மாற்ற முடியாது
+SearchAMailing=அஞ்சல் தேடு
+SendMailing=மின்னஞ்சல் அனுப்பவும்
+SentBy=மூலம் அனுப்பப்பட்டது
+MailingNeedCommand=மின்னஞ்சலை அனுப்புவது கட்டளை வரியிலிருந்து செய்யப்படலாம். அனைத்து பெறுநர்களுக்கும் மின்னஞ்சலை அனுப்ப பின்வரும் கட்டளையைத் தொடங்க உங்கள் சேவையக நிர்வாகியிடம் கேளுங்கள்:
+MailingNeedCommand2=இருப்பினும் MAILING_LIMIT_SENDBYWEB என்ற அளவுருவை சேர்ப்பதன் மூலம் அவற்றை ஆன்லைனில் அனுப்பலாம். இதற்கு, Home - Setup - Other என்பதற்குச் செல்லவும்.
+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=அறிவிப்புகள் தானியங்கு.
+NoNotificationsWillBeSent=இந்த நிகழ்வு வகை மற்றும் நிறுவனத்திற்கு தானியங்கி மின்னஞ்சல் அறிவிப்புகள் எதுவும் திட்டமிடப்படவில்லை
+ANotificationsWillBeSent=1 தானியங்கி அறிவிப்பு மின்னஞ்சல் மூலம் அனுப்பப்படும்
+SomeNotificationsWillBeSent=%s தானியங்கி அறிவிப்புகள் மின்னஞ்சல் மூலம் அனுப்பப்படும்
+AddNewNotification=புதிய தானியங்கி மின்னஞ்சல் அறிவிப்புக்கு குழுசேரவும் (இலக்கு/நிகழ்வு)
+ListOfActiveNotifications=தானியங்கி மின்னஞ்சல் அறிவிப்புக்கான அனைத்து செயலில் உள்ள சந்தாக்களின் பட்டியல் (இலக்குகள்/நிகழ்வுகள்).
+ListOfNotificationsDone=அனுப்பப்பட்ட அனைத்து தானியங்கி மின்னஞ்சல் அறிவிப்புகளின் பட்டியல்
+MailSendSetupIs=மின்னஞ்சல் அனுப்புவதற்கான உள்ளமைவு '%s' க்கு அமைக்கப்பட்டுள்ளது. வெகுஜன மின்னஞ்சலை அனுப்ப இந்தப் பயன்முறையைப் பயன்படுத்த முடியாது.
+MailSendSetupIs2=<strong> '%s' <strong>' a0a65fz0' a0a65fc070 இந்த பயன்முறையில், உங்கள் இணைய சேவை வழங்குநரால் வழங்கப்பட்ட SMTP சேவையகத்தின் அமைப்பை உள்ளிடலாம் மற்றும் மாஸ் மின்னஞ்சல் அம்சத்தைப் பயன்படுத்தலாம்.
+MailSendSetupIs3=உங்கள் SMTP சேவையகத்தை எவ்வாறு அமைப்பது என்பது குறித்து ஏதேனும் கேள்விகள் இருந்தால், நீங்கள் %s ஐக் கேட்கலாம்.
+YouCanAlsoUseSupervisorKeyword=பயனரின் மேற்பார்வையாளருக்கு மின்னஞ்சல் அனுப்பப்படுவதற்கு <strong> __SUPERVISOREMAIL__ </strong> என்ற முக்கிய சொல்லையும் சேர்க்கலாம் (இந்த மேற்பார்வையாளருக்கு மின்னஞ்சல் வரையறுக்கப்பட்டால் மட்டுமே வேலை செய்யும்)
+NbOfTargetedContacts=இலக்கிடப்பட்ட தொடர்பு மின்னஞ்சல்களின் தற்போதைய எண்ணிக்கை
+UseFormatFileEmailToTarget=இறக்குமதி செய்யப்பட்ட கோப்பில் <strong> மின்னஞ்சல்;பெயர்;முதல்பெயர்;மற்ற </strong> வடிவம் இருக்க வேண்டும்
+UseFormatInputEmailToTarget=<strong> மின்னஞ்சல்;பெயர்;முதல்பெயர்;மற்ற </strong> வடிவத்துடன் ஒரு சரத்தை உள்ளிடவும்
+MailAdvTargetRecipients=பெறுநர்கள் (மேம்பட்ட தேர்வு)
+AdvTgtTitle=மூன்றாம் தரப்பினரை முன்கூட்டியே தேர்வு செய்ய உள்ளீட்டு புலங்களை நிரப்பவும் அல்லது இலக்குக்கான தொடர்புகள்/முகவரிகள்
+AdvTgtSearchTextHelp=வைல்டு கார்டுகளாக %% ஐப் பயன்படுத்தவும். எடுத்துக்காட்டாக, <b> jean, joe, jim </b> போன்ற அனைத்துப் பொருட்களையும் கண்டுபிடிக்க, நீங்கள் <b> j%% a09a4b7390 ஐப் பயன்படுத்தவும்; மதிப்பு மற்றும் பயன்பாட்டிற்கான பிரிப்பானாக! இந்த மதிப்பு தவிர. உதாரணத்திற்கு <b> jean;joe;jim%%;!jimo;!jima%% </b> அனைத்து ஜீன், ஜோ, எல்லாவற்றையும் குறிவைக்கும், ஜிமோ ஜிம் உடன் தொடங்கும் ஆனால் ஜிமோ ஜிம் என்று தொடங்குவதில்லை.
+AdvTgtSearchIntHelp=int அல்லது float மதிப்பைத் தேர்ந்தெடுக்க இடைவெளியைப் பயன்படுத்தவும்
+AdvTgtMinVal=குறைந்தபட்ச மதிப்பு
+AdvTgtMaxVal=அதிகபட்ச மதிப்பு
+AdvTgtSearchDtHelp=தேதி மதிப்பைத் தேர்ந்தெடுக்க இடைவெளியைப் பயன்படுத்தவும்
+AdvTgtStartDt=டிடியைத் தொடங்கு.
+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/ta_IN/main.lang b/htdocs/langs/ta_IN/main.lang
new file mode 100644
index 00000000000..b61756b95b0
--- /dev/null
+++ b/htdocs/langs/ta_IN/main.lang
@@ -0,0 +1,1166 @@
+# 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=freemono
+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=தரவுத்தள இணைப்பு
+NoTemplateDefined=இந்த மின்னஞ்சல் வகைக்கான டெம்ப்ளேட் எதுவும் இல்லை
+AvailableVariables=கிடைக்கக்கூடிய மாற்று மாறிகள்
+NoTranslation=மொழிபெயர்ப்பு இல்லை
+Translation=மொழிபெயர்ப்பு
+CurrentTimeZone=நேர மண்டல PHP (சர்வர்)
+EmptySearchString=காலியாக இல்லாத தேடல் அளவுகோல்களை உள்ளிடவும்
+EnterADateCriteria=தேதி அளவுகோலை உள்ளிடவும்
+NoRecordFound=பதிவு எதுவும் கிடைக்கவில்லை
+NoRecordDeleted=பதிவு எதுவும் நீக்கப்படவில்லை
+NotEnoughDataYet=போதுமான தரவு இல்லை
+NoError=பிழை இல்லை
+Error=பிழை
+Errors=பிழைகள்
+ErrorFieldRequired=புலம் '%s' தேவை
+ErrorFieldFormat=புலம் '%s' மோசமான மதிப்பைக் கொண்டுள்ளது
+ErrorFileDoesNotExists=கோப்பு %s இல்லை
+ErrorFailedToOpenFile=%s கோப்பைத் திறக்க முடியவில்லை
+ErrorCanNotCreateDir=dir %s ஐ உருவாக்க முடியாது
+ErrorCanNotReadDir=dir %s ஐப் படிக்க முடியவில்லை
+ErrorConstantNotDefined=அளவுரு %s வரையறுக்கப்படவில்லை
+ErrorUnknown=அறியப்படாத பிழை
+ErrorSQL=SQL பிழை
+ErrorLogoFileNotFound=லோகோ கோப்பு '%s' கிடைக்கவில்லை
+ErrorGoToGlobalSetup=இதைச் சரிசெய்ய, 'நிறுவனம்/நிறுவனம்' அமைப்புக்குச் செல்லவும்
+ErrorGoToModuleSetup=இதைச் சரிசெய்ய, தொகுதி அமைப்புக்குச் செல்லவும்
+ErrorFailedToSendMail=அஞ்சல் அனுப்ப முடியவில்லை (அனுப்புபவர்=%s, பெறுபவர்=%s)
+ErrorFileNotUploaded=கோப்பு பதிவேற்றப்படவில்லை. அனுமதிக்கப்பட்ட அதிகபட்ச அளவை விட அதிகமாக இல்லை என்பதையும், வட்டில் இலவச இடம் உள்ளது என்பதையும், இந்த கோப்பகத்தில் ஏற்கனவே அதே பெயரில் கோப்பு இல்லை என்பதையும் சரிபார்க்கவும்.
+ErrorInternalErrorDetected=பிழை கண்டறியப்பட்டது
+ErrorWrongHostParameter=தவறான ஹோஸ்ட் அளவுரு
+ErrorYourCountryIsNotDefined=உங்கள் நாடு வரையறுக்கப்படவில்லை. Home-Setup-Edit என்பதற்குச் சென்று படிவத்தை மீண்டும் இடுகையிடவும்.
+ErrorRecordIsUsedByChild=இந்தப் பதிவை நீக்க முடியவில்லை. இந்தப் பதிவை குறைந்தபட்சம் ஒரு குழந்தைப் பதிவு பயன்படுத்துகிறது.
+ErrorWrongValue=தவறான மதிப்பு
+ErrorWrongValueForParameterX=%s அளவுருவின் தவறான மதிப்பு
+ErrorNoRequestInError=பிழையில் கோரிக்கை இல்லை
+ErrorServiceUnavailableTryLater=தற்போது சேவை கிடைக்கவில்லை. பின்னர் மீண்டும் முயற்சிக்கவும்.
+ErrorDuplicateField=தனித்துவமான புலத்தில் நகல் மதிப்பு
+ErrorSomeErrorWereFoundRollbackIsDone=சில பிழைகள் கண்டறியப்பட்டன. மாற்றங்கள் திரும்பப் பெறப்பட்டன.
+ErrorConfigParameterNotDefined=அளவுரு <b> %s </b> என்பது Dolibarr config கோப்பு <b> conf.php a09a4b730f.17f8z0 இல் வரையறுக்கப்படவில்லை
+ErrorCantLoadUserFromDolibarrDatabase=Dolibarr தரவுத்தளத்தில் <b> %s </b> பயனரைக் கண்டறிய முடியவில்லை.
+ErrorNoVATRateDefinedForSellerCountry=பிழை, '%s' நாட்டிற்கு வாட் கட்டணங்கள் எதுவும் வரையறுக்கப்படவில்லை.
+ErrorNoSocialContributionForSellerCountry=பிழை, '%s' நாட்டிற்கு சமூக/நிதி வரிகள் வகை வரையறுக்கப்படவில்லை.
+ErrorFailedToSaveFile=பிழை, கோப்பைச் சேமிப்பதில் தோல்வி.
+ErrorCannotAddThisParentWarehouse=ஏற்கனவே இருக்கும் கிடங்கின் குழந்தையாக இருக்கும் பெற்றோர் கிடங்கைச் சேர்க்க முயற்சிக்கிறீர்கள்
+FieldCannotBeNegative=புலம் "%s" எதிர்மறையாக இருக்கக்கூடாது
+MaxNbOfRecordPerPage=அதிகபட்சம். ஒரு பக்கத்திற்கான பதிவுகளின் எண்ணிக்கை
+NotAuthorized=அதைச் செய்ய உங்களுக்கு அதிகாரம் இல்லை.
+SetDate=தேதியை அமைக்கவும்
+SelectDate=ஒரு தேதியைத் தேர்ந்தெடுக்கவும்
+SeeAlso=%s ஐயும் பார்க்கவும்
+SeeHere=இங்கே பார்க்கவும்
+ClickHere=இங்கே கிளிக் செய்யவும்
+Here=இங்கே
+Apply=விண்ணப்பிக்கவும்
+BackgroundColorByDefault=இயல்புநிலை பின்னணி நிறம்
+FileRenamed=கோப்பு வெற்றிகரமாக மறுபெயரிடப்பட்டது
+FileGenerated=கோப்பு வெற்றிகரமாக உருவாக்கப்பட்டது
+FileSaved=கோப்பு வெற்றிகரமாக சேமிக்கப்பட்டது
+FileUploaded=கோப்பு வெற்றிகரமாக பதிவேற்றப்பட்டது
+FileTransferComplete=கோப்பு(கள்) பதிவேற்றம் செய்யப்பட்டது
+FilesDeleted=கோப்பு(கள்) வெற்றிகரமாக நீக்கப்பட்டன
+FileWasNotUploaded=இணைப்புக்காக ஒரு கோப்பு தேர்ந்தெடுக்கப்பட்டது ஆனால் இன்னும் பதிவேற்றப்படவில்லை. இதற்கு "கோப்பை இணைக்கவும்" என்பதைக் கிளிக் செய்யவும்.
+NbOfEntries=உள்ளீடுகளின் எண்ணிக்கை
+GoToWikiHelpPage=ஆன்லைன் உதவியைப் படிக்கவும் (இணைய அணுகல் தேவை)
+GoToHelpPage=உதவியைப் படியுங்கள்
+DedicatedPageAvailable=உங்கள் தற்போதைய திரை தொடர்பான பிரத்யேக உதவிப் பக்கம்
+HomePage=முகப்பு பக்கம்
+RecordSaved=பதிவு சேமிக்கப்பட்டது
+RecordDeleted=பதிவு நீக்கப்பட்டது
+RecordGenerated=பதிவு உருவாக்கப்பட்டது
+LevelOfFeature=அம்சங்களின் நிலை
+NotDefined=வரையறுக்கப்படவில்லை
+DolibarrInHttpAuthenticationSoPasswordUseless=டோலிபார் அங்கீகரிப்பு முறை <b> %s </b> என்ற உள்ளமைவு கோப்பில் <b> conf.php a09a4b730f17f17f17f17. <br> இதன் பொருள் கடவுச்சொல் தரவுத்தளம் Dolibarr க்கு வெளியில் உள்ளது, எனவே இந்த புலத்தை மாற்றுவது எந்த விளைவையும் ஏற்படுத்தாது.
+Administrator=நிர்வாகி
+Undefined=வரையறுக்கப்படாத
+PasswordForgotten=கடவுச்சொல் மறந்துவிட்டதா?
+NoAccount=கணக்கு இல்லையா?
+SeeAbove=மேலே பார்க்க
+HomeArea=வீடு
+LastConnexion=கடைசி உள்நுழைவு
+PreviousConnexion=முந்தைய உள்நுழைவு
+PreviousValue=முந்தைய மதிப்பு
+ConnectedOnMultiCompany=சுற்றுச்சூழலில் இணைக்கப்பட்டுள்ளது
+ConnectedSince=முதல் இணைக்கப்பட்டுள்ளது
+AuthenticationMode=அங்கீகார முறை
+RequestedUrl=கோரப்பட்ட URL
+DatabaseTypeManager=தரவுத்தள வகை மேலாளர்
+RequestLastAccessInError=சமீபத்திய தரவுத்தள அணுகல் கோரிக்கை பிழை
+ReturnCodeLastAccessInError=சமீபத்திய தரவுத்தள அணுகல் கோரிக்கை பிழைக்கான குறியீட்டை திருப்பி அனுப்பவும்
+InformationLastAccessInError=சமீபத்திய தரவுத்தள அணுகல் கோரிக்கை பிழைக்கான தகவல்
+DolibarrHasDetectedError=Dolibarr தொழில்நுட்பப் பிழையைக் கண்டறிந்துள்ளது
+YouCanSetOptionDolibarrMainProdToZero=மேலும் தகவலைப் பெற, பதிவுக் கோப்பைப் படிக்கலாம் அல்லது உங்கள் கட்டமைப்பு கோப்பில் $dolibarr_main_prod ஐ '0' ஆக அமைக்கலாம்.
+InformationToHelpDiagnose=கண்டறியும் நோக்கங்களுக்காக இந்தத் தகவல் பயனுள்ளதாக இருக்கும் (முக்கியமான தகவலை மறைக்க நீங்கள் விருப்பத்தை $dolibarr_main_prod '1' ஆக அமைக்கலாம்)
+MoreInformation=மேலும் தகவல்
+TechnicalInformation=தொழில்நுட்ப தகவல்
+TechnicalID=தொழில்நுட்ப ஐடி
+LineID=வரி ஐடி
+NotePublic=குறிப்பு (பொது)
+NotePrivate=குறிப்பு (தனிப்பட்ட)
+PrecisionUnitIsLimitedToXDecimals=யூனிட் விலைகளின் துல்லியத்தை <b> %s </b> தசமங்களுக்கு வரம்பிட டோலிபார் அமைக்கப்பட்டுள்ளது.
+DoTest=சோதனை
+ToFilter=வடிகட்டி
+NoFilter=வடிகட்டி இல்லை
+WarningYouHaveAtLeastOneTaskLate=எச்சரிக்கை, சகிப்புத்தன்மை நேரத்தை மீறிய ஒரு உறுப்பு உங்களிடம் உள்ளது.
+yes=ஆம்
+Yes=ஆம்
+no=இல்லை
+No=இல்லை
+All=அனைத்து
+Home=வீடு
+Help=உதவி
+OnlineHelp=ஆன்லைன் உதவி
+PageWiki=விக்கி பக்கம்
+MediaBrowser=மீடியா உலாவி
+Always=எப்போதும்
+Never=ஒருபோதும் இல்லை
+Under=கீழ்
+Period=காலம்
+PeriodEndDate=காலத்திற்கான இறுதி தேதி
+SelectedPeriod=தேர்ந்தெடுக்கப்பட்ட காலம்
+PreviousPeriod=முந்தைய காலம்
+Activate=செயல்படுத்த
+Activated=செயல்படுத்தப்பட்டது
+Closed=மூடப்பட்டது
+Closed2=மூடப்பட்டது
+NotClosed=மூடப்படவில்லை
+Enabled=இயக்கப்பட்டது
+Enable=இயக்கு
+Deprecated=நிராகரிக்கப்பட்டது
+Disable=முடக்கு
+Disabled=முடக்கப்பட்டது
+Add=கூட்டு
+AddLink=இணைப்பைச் சேர்க்கவும்
+RemoveLink=இணைப்பை அகற்று
+AddToDraft=வரைவில் சேர்க்கவும்
+Update=புதுப்பிக்கவும்
+Close=நெருக்கமான
+CloseAs=நிலையை அமைக்கவும்
+CloseBox=உங்கள் டாஷ்போர்டிலிருந்து விட்ஜெட்டை அகற்றவும்
+Confirm=உறுதிப்படுத்தவும்
+ConfirmSendCardByMail=இந்த அட்டையின் உள்ளடக்கத்தை <b> %s </b> க்கு அஞ்சல் மூலம் அனுப்ப விரும்புகிறீர்களா?
+Delete=அழி
+Remove=அகற்று
+Resiliate=நிறுத்து
+Cancel=ரத்து செய்
+Modify=மாற்றியமைக்கவும்
+Edit=தொகு
+Validate=சரிபார்க்கவும்
+ValidateAndApprove=சரிபார்த்து அங்கீகரிக்கவும்
+ToValidate=சரிபார்க்க
+NotValidated=சரிபார்க்கப்படவில்லை
+Save=சேமிக்கவும்
+SaveAs=என சேமி
+SaveAndStay=சேமித்து இருங்கள்
+SaveAndNew=சேமித்து புதியது
+TestConnection=சோதனை இணைப்பு
+ToClone=குளோன்
+ConfirmCloneAsk=<b> %s </b> என்ற பொருளை நிச்சயமாக குளோன் செய்ய விரும்புகிறீர்களா?
+ConfirmClone=நீங்கள் குளோன் செய்ய விரும்பும் தரவைத் தேர்ந்தெடுக்கவும்:
+NoCloneOptionsSpecified=குளோன் செய்வதற்கான தரவு எதுவும் வரையறுக்கப்படவில்லை.
+Of=இன்
+Go=போ
+Run=ஓடு
+CopyOf=நகல்
+Show=காட்டு
+Hide=மறை
+ShowCardHere=அட்டையைக் காட்டு
+Search=தேடு
+SearchOf=தேடு
+SearchMenuShortCut=Ctrl + shift + f
+QuickAdd=விரைவாகச் சேர்க்கவும்
+QuickAddMenuShortCut=Ctrl + shift + l
+Valid=செல்லுபடியாகும்
+Approve=ஒப்புதல்
+Disapprove=ஏற்கவில்லை
+ReOpen=மீண்டும் திறக்கவும்
+Upload=பதிவேற்றவும்
+ToLink=இணைப்பு
+Select=தேர்ந்தெடு
+SelectAll=அனைத்தையும் தெரிவுசெய்
+Choose=தேர்வு செய்யவும்
+Resize=அளவை மாற்றவும்
+ResizeOrCrop=அளவை மாற்றவும் அல்லது செதுக்கவும்
+Recenter=ரீசென்டர்
+Author=நூலாசிரியர்
+User=பயனர்
+Users=பயனர்கள்
+Group=குழு
+Groups=குழுக்கள்
+UserGroup=User group
+UserGroups=User groups
+NoUserGroupDefined=பயனர் குழு வரையறுக்கப்படவில்லை
+Password=கடவுச்சொல்
+PasswordRetype=உங்கள் கடவுச்சொல்லை மீண்டும் தட்டச்சு செய்யவும்
+NoteSomeFeaturesAreDisabled=இந்த ஆர்ப்பாட்டத்தில் நிறைய அம்சங்கள்/தொகுதிகள் முடக்கப்பட்டுள்ளன என்பதை நினைவில் கொள்ளவும்.
+Name=பெயர்
+NameSlashCompany=பெயர் / நிறுவனம்
+Person=நபர்
+Parameter=அளவுரு
+Parameters=அளவுருக்கள்
+Value=மதிப்பு
+PersonalValue=தனிப்பட்ட மதிப்பு
+NewObject=புதிய %s
+NewValue=புதிய மதிப்பு
+OldValue=பழைய மதிப்பு %s
+CurrentValue=தற்போதைய மதிப்பு
+Code=குறியீடு
+Type=வகை
+Language=மொழி
+MultiLanguage=பல மொழி
+Note=குறிப்பு
+Title=தலைப்பு
+Label=லேபிள்
+RefOrLabel=Ref. அல்லது முத்திரை
+Info=பதிவு
+Family=குடும்பம்
+Description=விளக்கம்
+Designation=விளக்கம்
+DescriptionOfLine=வரியின் விளக்கம்
+DateOfLine=வரியின் தேதி
+DurationOfLine=வரியின் காலம்
+Model=ஆவண டெம்ப்ளேட்
+DefaultModel=இயல்புநிலை ஆவண டெம்ப்ளேட்
+Action=நிகழ்வு
+About=பற்றி
+Number=எண்
+NumberByMonth=மாதத்தின் மொத்த அறிக்கைகள்
+AmountByMonth=மாதந்தோறும் தொகை
+Numero=எண்
+Limit=அளவு
+Limits=வரம்புகள்
+Logout=வெளியேறு
+NoLogoutProcessWithAuthMode=<b> %s </b> அங்கீகார பயன்முறையுடன் பயன்பாட்டுத் துண்டிப்பு அம்சம் இல்லை
+Connection=உள்நுழைய
+Setup=அமைவு
+Alert=எச்சரிக்கை
+MenuWarnings=எச்சரிக்கைகள்
+Previous=முந்தைய
+Next=அடுத்தது
+Cards=அட்டைகள்
+Card=அட்டை
+Now=இப்போது
+HourStart=தொடக்க நேரம்
+Deadline=காலக்கெடுவை
+Date=தேதி
+DateAndHour=தேதி மற்றும் மணிநேரம்
+DateToday=இன்றைய தேதி
+DateReference=குறிப்பு தேதி
+DateStart=தொடக்க தேதி
+DateEnd=கடைசி தேதி
+DateCreation=உருவாக்கிய தேதி
+DateCreationShort=உருவாக்கு. தேதி
+IPCreation=ஐபி உருவாக்கம்
+DateModification=மாற்றம் தேதி
+DateModificationShort=மாற்றம். தேதி
+IPModification=மாற்றம் ஐபி
+DateLastModification=சமீபத்திய திருத்தம் தேதி
+DateValidation=சரிபார்ப்பு தேதி
+DateSigning=கையெழுத்திடும் தேதி
+DateClosing=கடைசி நாள்
+DateDue=நிலுவைத் தேதி
+DateValue=மதிப்பு தேதி
+DateValueShort=மதிப்பு தேதி
+DateOperation=செயல்பாட்டு தேதி
+DateOperationShort=இயக்கு. தேதி
+DateLimit=வரம்பு தேதி
+DateRequest=கோரிக்கை தேதி
+DateProcess=செயல்முறை தேதி
+DateBuild=உருவாக்க தேதியை தெரிவிக்கவும்
+DatePayment=பணம் செலுத்தும் தேதி
+DateApprove=அங்கீகரிக்கும் தேதி
+DateApprove2=ஒப்புதல் தேதி (இரண்டாவது ஒப்புதல்)
+RegistrationDate=பதிவு தேதி
+UserCreation=உருவாக்கும் பயனர்
+UserModification=மாற்றியமைக்கும் பயனர்
+UserValidation=சரிபார்ப்பு பயனர்
+UserCreationShort=உருவாக்கு. பயனர்
+UserModificationShort=மாற்றம். பயனர்
+UserValidationShort=செல்லுபடியாகும். பயனர்
+DurationYear=ஆண்டு
+DurationMonth=மாதம்
+DurationWeek=வாரம்
+DurationDay=நாள்
+DurationYears=ஆண்டுகள்
+DurationMonths=மாதங்கள்
+DurationWeeks=வாரங்கள்
+DurationDays=நாட்களில்
+Year=ஆண்டு
+Month=மாதம்
+Week=வாரம்
+WeekShort=வாரம்
+Day=நாள்
+Hour=மணி
+Minute=நிமிடம்
+Second=இரண்டாவது
+Years=ஆண்டுகள்
+Months=மாதங்கள்
+Days=நாட்களில்
+days=நாட்களில்
+Hours=மணி
+Minutes=நிமிடங்கள்
+Seconds=நொடிகள்
+Weeks=வாரங்கள்
+Today=இன்று
+Yesterday=நேற்று
+Tomorrow=நாளை
+Morning=காலை
+Afternoon=மதியம்
+Quadri=குவாட்ரி
+MonthOfDay=நாளின் மாதம்
+DaysOfWeek=வாரத்தின் நாட்கள்
+HourShort=எச்
+MinuteShort=mn
+Rate=மதிப்பிடவும்
+CurrencyRate=நாணய மாற்று விகிதம்
+UseLocalTax=வரி அடங்கும்
+Bytes=பைட்டுகள்
+KiloBytes=கிலோபைட்டுகள்
+MegaBytes=மெகாபைட்கள்
+GigaBytes=ஜிகாபைட்கள்
+TeraBytes=டெராபைட்டுகள்
+UserAuthor=மூலம் அமைக்கப்பட்டது
+UserModif=மூலம் புதுப்பிக்கப்பட்டது
+b=பி.
+Kb=கேபி
+Mb=எம்பி
+Gb=ஜிபி
+Tb=Tb
+Cut=வெட்டு
+Copy=நகலெடுக்கவும்
+Paste=ஒட்டவும்
+Default=இயல்புநிலை
+DefaultValue=இயல்புநிலை மதிப்பு
+DefaultValues=இயல்புநிலை மதிப்புகள்/வடிப்பான்கள்/வரிசைப்படுத்துதல்
+Price=விலை
+PriceCurrency=விலை (நாணயம்)
+UnitPrice=அலகு விலை
+UnitPriceHT=யூனிட் விலை (தவிர)
+UnitPriceHTCurrency=யூனிட் விலை (விலக்கு.) (நாணயம்)
+UnitPriceTTC=அலகு விலை
+PriceU=உ.பி.
+PriceUHT=உ.பி. (நிகரம்)
+PriceUHTCurrency=U.P (நிகரம்) (நாணயம்)
+PriceUTTC=உ.பி. (இன்க். வரி)
+Amount=தொகை
+AmountInvoice=விலைப்பட்டியல் தொகை
+AmountInvoiced=இன்வாய்ஸ் செய்யப்பட்ட தொகை
+AmountInvoicedHT=இன்வாய்ஸ் செய்யப்பட்ட தொகை (வரி தவிர)
+AmountInvoicedTTC=இன்வாய்ஸ் செய்யப்பட்ட தொகை (இன்க். வரி)
+AmountPayment=செலுத்தும் தொகை
+AmountHTShort=தொகை (தவிர)
+AmountTTCShort=தொகை (இன்க். வரி)
+AmountHT=தொகை (வரி தவிர)
+AmountTTC=தொகை (இன்க். வரி)
+AmountVAT=வரி அளவு
+MulticurrencyAlreadyPaid=ஏற்கனவே செலுத்தப்பட்ட, அசல் நாணயம்
+MulticurrencyRemainderToPay=பணம் செலுத்த வேண்டும், அசல் நாணயம்
+MulticurrencyPaymentAmount=கட்டணத் தொகை, அசல் நாணயம்
+MulticurrencyAmountHT=தொகை (வரி தவிர்த்து), அசல் நாணயம்
+MulticurrencyAmountTTC=தொகை (வரி இன்க்.), அசல் நாணயம்
+MulticurrencyAmountVAT=வரி அளவு, அசல் நாணயம்
+MulticurrencySubPrice=தொகை துணை விலை பல நாணயம்
+AmountLT1=வரி அளவு 2
+AmountLT2=வரி அளவு 3
+AmountLT1ES=தொகை RE
+AmountLT2ES=ஐஆர்பிஎஃப் தொகை
+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=மொத்த ஐஆர்பிஎஃப்
+TotalLT1IN=மொத்த CGST
+TotalLT2IN=மொத்த SGST
+HT=தவிர. வரி
+TTC=இன்க். வரி
+INCVATONLY=இன்க். VAT
+INCT=Inc. அனைத்து வரிகளும்
+VAT=விற்பனை வரி
+VATIN=IGST
+VATs=விற்பனை வரிகள்
+VATINs=IGST வரிகள்
+LT1=விற்பனை வரி 2
+LT1Type=விற்பனை வரி 2 வகை
+LT2=விற்பனை வரி 3
+LT2Type=விற்பனை வரி 3 வகை
+LT1ES=RE
+LT2ES=ஐஆர்பிஎஃப்
+LT1IN=CGST
+LT2IN=எஸ்ஜிஎஸ்டி
+LT1GC=கூடுதல் சென்ட்கள்
+VATRate=வரி விகிதம்
+RateOfTaxN=வரி விகிதம் %s
+VATCode=வரி விகிதக் குறியீடு
+VATNPR=வரி விகிதம் NPR
+DefaultTaxRate=இயல்புநிலை வரி விகிதம்
+Average=சராசரி
+Sum=தொகை
+Delta=டெல்டா
+StatusToPay=செலுத்த வேண்டும்
+RemainToPay=பணம் செலுத்த வேண்டும்
+Module=தொகுதி/பயன்பாடு
+Modules=தொகுதிகள்/பயன்பாடுகள்
+Option=விருப்பம்
+Filters=வடிப்பான்கள்
+List=பட்டியல்
+FullList=முழு பட்டியல்
+FullConversation=முழு உரையாடல்
+Statistics=புள்ளிவிவரங்கள்
+OtherStatistics=பிற புள்ளிவிவரங்கள்
+Status=நிலை
+Favorite=பிடித்தது
+ShortInfo=தகவல்.
+Ref=Ref.
+ExternalRef=Ref. வெளிப்புற
+RefSupplier=Ref. விற்பனையாளர்
+RefPayment=Ref. கட்டணம்
+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=<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=செய்ய
+ToDate=செய்ய
+ToLocation=செய்ய
+at=மணிக்கு
+and=மற்றும்
+or=அல்லது
+Other=மற்றவை
+Others=மற்றவைகள்
+OtherInformations=பிற தகவல்
+Quantity=அளவு
+Qty=அளவு
+ChangedBy=மூலம் மாற்றப்பட்டது
+ApprovedBy=அங்கீகரிக்கப்பட்டது
+ApprovedBy2=ஆல் அங்கீகரிக்கப்பட்டது (இரண்டாவது ஒப்புதல்)
+Approved=அங்கீகரிக்கப்பட்டது
+Refused=மறுத்தார்
+ReCalculate=மீண்டும் கணக்கிடு
+ResultKo=தோல்வி
+Reporting=அறிக்கையிடல்
+Reportings=அறிக்கையிடல்
+Draft=வரைவு
+Drafts=வரைவுகள்
+StatusInterInvoiced=விலை விவரம்
+Validated=சரிபார்க்கப்பட்டது
+ValidatedToProduce=சரிபார்க்கப்பட்டது (உற்பத்தி செய்ய)
+Opened=திற
+OpenAll=திற (அனைத்தும்)
+ClosedAll=மூடப்பட்டது (அனைத்தும்)
+New=புதியது
+Discount=தள்ளுபடி
+Unknown=தெரியவில்லை
+General=பொது
+Size=அளவு
+OriginalSize=அசல் அளவு
+Received=பெற்றது
+Paid=செலுத்தப்பட்டது
+Topic=பொருள்
+ByCompanies=மூன்றாம் தரப்பினரால்
+ByUsers=பயனர் மூலம்
+Links=இணைப்புகள்
+Link=இணைப்பு
+Rejects=நிராகரிக்கிறது
+Preview=முன்னோட்ட
+NextStep=அடுத்த அடி
+Datas=தகவல்கள்
+None=இல்லை
+NoneF=இல்லை
+NoneOrSeveral=எதுவும் இல்லை அல்லது பல
+Late=லேட்
+LateDesc=முகப்பு - அமைவு - விழிப்பூட்டல்கள் மெனுவில் உள்ள கணினி உள்ளமைவின்படி ஒரு உருப்படி தாமதமானது என வரையறுக்கப்படுகிறது.
+NoItemLate=தாமதமான உருப்படி இல்லை
+Photo=படம்
+Photos=படங்கள்
+AddPhoto=படத்தைச் சேர்க்கவும்
+DeletePicture=படத்தை நீக்கவும்
+ConfirmDeletePicture=படத்தை நீக்குவதை உறுதிப்படுத்தவா?
+Login=உள்நுழைய
+LoginEmail=உள்நுழைவு (மின்னஞ்சல்)
+LoginOrEmail=உள்நுழையவும் அல்லது மின்னஞ்சல் செய்யவும்
+CurrentLogin=தற்போதைய உள்நுழைவு
+EnterLoginDetail=உள்நுழைவு விவரங்களை உள்ளிடவும்
+January=ஜனவரி
+February=பிப்ரவரி
+March=மார்ச்
+April=ஏப்ரல்
+May=மே
+June=ஜூன்
+July=ஜூலை
+August=ஆகஸ்ட்
+September=செப்டம்பர்
+October=அக்டோபர்
+November=நவம்பர்
+December=டிசம்பர்
+Month01=ஜனவரி
+Month02=பிப்ரவரி
+Month03=மார்ச்
+Month04=ஏப்ரல்
+Month05=மே
+Month06=ஜூன்
+Month07=ஜூலை
+Month08=ஆகஸ்ட்
+Month09=செப்டம்பர்
+Month10=அக்டோபர்
+Month11=நவம்பர்
+Month12=டிசம்பர்
+MonthShort01=ஜன
+MonthShort02=பிப்
+MonthShort03=மார்
+MonthShort04=ஏப்
+MonthShort05=மே
+MonthShort06=ஜூன்
+MonthShort07=ஜூலை
+MonthShort08=ஆக
+MonthShort09=செப்
+MonthShort10=அக்
+MonthShort11=நவ
+MonthShort12=டிச
+MonthVeryShort01=ஜே
+MonthVeryShort02=எஃப்
+MonthVeryShort03=எம்
+MonthVeryShort04=ஏ
+MonthVeryShort05=எம்
+MonthVeryShort06=ஜே
+MonthVeryShort07=ஜே
+MonthVeryShort08=ஏ
+MonthVeryShort09=எஸ்
+MonthVeryShort10=ஓ
+MonthVeryShort11=என்
+MonthVeryShort12=டி
+AttachedFiles=இணைக்கப்பட்ட கோப்புகள் மற்றும் ஆவணங்கள்
+JoinMainDoc=முக்கிய ஆவணத்தில் சேரவும்
+DateFormatYYYYMM=YYYY-MM
+DateFormatYYYYMMDD=YYYY-MM-DD
+DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
+ReportName=அறிக்கையின் பெயர்
+ReportPeriod=அறிக்கை காலம்
+ReportDescription=விளக்கம்
+Report=அறிக்கை
+Keyword=முக்கிய வார்த்தை
+Origin=தோற்றம்
+Legend=புராண
+Fill=நிரப்பவும்
+Reset=மீட்டமை
+File=கோப்பு
+Files=கோப்புகள்
+NotAllowed=அனுமதி இல்லை
+ReadPermissionNotAllowed=படிக்க அனுமதி அனுமதிக்கப்படவில்லை
+AmountInCurrency=%s நாணயத்தில் தொகை
+Example=உதாரணமாக
+Examples=எடுத்துக்காட்டுகள்
+NoExample=உதாரணம் இல்லை
+FindBug=பிழையைப் புகாரளிக்கவும்
+NbOfThirdParties=மூன்றாம் தரப்பினரின் எண்ணிக்கை
+NbOfLines=வரிகளின் எண்ணிக்கை
+NbOfObjects=பொருள்களின் எண்ணிக்கை
+NbOfObjectReferers=தொடர்புடைய பொருட்களின் எண்ணிக்கை
+Referers=சார்ந்த பொருட்கள்
+TotalQuantity=மொத்த அளவு
+DateFromTo=%s முதல் %s வரை
+DateFrom=%s இலிருந்து
+DateUntil=%s வரை
+Check=காசோலை
+Uncheck=தேர்வுநீக்கவும்
+Internal=உள்
+External=வெளி
+Internals=உள்
+Externals=வெளி
+Warning=எச்சரிக்கை
+Warnings=எச்சரிக்கைகள்
+BuildDoc=ஆவணத்தை உருவாக்கவும்
+Entity=சுற்றுச்சூழல்
+Entities=நிறுவனங்கள்
+CustomerPreview=வாடிக்கையாளர் முன்னோட்டம்
+SupplierPreview=விற்பனையாளர் முன்னோட்டம்
+ShowCustomerPreview=வாடிக்கையாளர் மாதிரிக்காட்சியைக் காட்டு
+ShowSupplierPreview=விற்பனையாளர் மாதிரிக்காட்சியைக் காட்டு
+RefCustomer=Ref. வாடிக்கையாளர்
+InternalRef=உள் குறிப்பு.
+Currency=நாணய
+InfoAdmin=நிர்வாகிகளுக்கான தகவல்
+Undo=செயல்தவிர்
+Redo=மீண்டும் செய்
+ExpandAll=எல்லாவற்றையும் விரிவாக்கு
+UndoExpandAll=விரிவாக்கத்தை செயல்தவிர்
+SeeAll=அனைத்தையும் பார்
+Reason=காரணம்
+FeatureNotYetSupported=அம்சம் இன்னும் ஆதரிக்கப்படவில்லை
+CloseWindow=சாளரத்தை மூடு
+Response=பதில்
+Priority=முன்னுரிமை
+SendByMail=மின்னஞ்சல் மூலம் அனுப்பவும்
+MailSentBy=மூலம் மின்னஞ்சல் அனுப்பப்பட்டது
+NotSent=அனுப்பப்படவில்லை
+TextUsedInTheMessageBody=மின்னஞ்சல் உடல்
+SendAcknowledgementByMail=உறுதிப்படுத்தல் மின்னஞ்சலை அனுப்பவும்
+SendMail=மின்னஞ்சல் அனுப்பு
+Email=மின்னஞ்சல்
+NoEMail=மின்னஞ்சல் இல்லை
+AlreadyRead=ஏற்கனவே படித்தது
+NotRead=படிக்காதது
+NoMobilePhone=மொபைல் போன் இல்லை
+Owner=உரிமையாளர்
+FollowingConstantsWillBeSubstituted=பின்வரும் மாறிலிகள் தொடர்புடைய மதிப்புடன் மாற்றப்படும்.
+Refresh=புதுப்பிப்பு
+BackToList=மீண்டும் பட்டியலில்
+BackToTree=மரத்திற்குத் திரும்பு
+GoBack=திரும்பி போ
+CanBeModifiedIfOk=செல்லுபடியாகும் எனில் மாற்றியமைக்கலாம்
+CanBeModifiedIfKo=செல்லுபடியாகவில்லை என்றால் மாற்றலாம்
+ValueIsValid=மதிப்பு செல்லுபடியாகும்
+ValueIsNotValid=மதிப்பு செல்லாது
+RecordCreatedSuccessfully=பதிவு வெற்றிகரமாக உருவாக்கப்பட்டது
+RecordModifiedSuccessfully=பதிவு வெற்றிகரமாக மாற்றப்பட்டது
+RecordsModified=%s பதிவு(கள்) மாற்றப்பட்டது
+RecordsDeleted=%s பதிவு(கள்) நீக்கப்பட்டன
+RecordsGenerated=%s பதிவு(கள்) உருவாக்கப்பட்டது
+AutomaticCode=தானியங்கி குறியீடு
+FeatureDisabled=அம்சம் முடக்கப்பட்டது
+MoveBox=விட்ஜெட்டை நகர்த்தவும்
+Offered=வழங்கப்பட்டது
+NotEnoughPermissions=இந்தச் செயலுக்கு உங்களிடம் அனுமதி இல்லை
+SessionName=அமர்வு பெயர்
+Method=முறை
+Receive=பெறு
+CompleteOrNoMoreReceptionExpected=முழுமையானது அல்லது எதுவும் எதிர்பார்க்கப்படவில்லை
+ExpectedValue=எதிர்பார்க்கப்படும் மதிப்பு
+ExpectedQty=எதிர்பார்க்கப்படும் அளவு
+PartialWoman=பகுதி
+TotalWoman=மொத்தம்
+NeverReceived=பெற்றதில்லை
+Canceled=ரத்து செய்யப்பட்டது
+YouCanChangeValuesForThisListFromDictionarySetup=இந்த பட்டியலுக்கான மதிப்புகளை மெனு அமைப்பு - அகராதிகளிலிருந்து மாற்றலாம்
+YouCanChangeValuesForThisListFrom=இந்தப் பட்டியலுக்கான மதிப்புகளை %s மெனுவிலிருந்து மாற்றலாம்
+YouCanSetDefaultValueInModuleSetup=தொகுதி அமைப்பில் புதிய பதிவை உருவாக்கும் போது பயன்படுத்தப்படும் இயல்புநிலை மதிப்பை நீங்கள் அமைக்கலாம்
+Color=நிறம்
+Documents=இணைக்கப்பட்ட கோப்புகள்
+Documents2=ஆவணங்கள்
+UploadDisabled=பதிவேற்றம் முடக்கப்பட்டது
+MenuAccountancy=கணக்கியல்
+MenuECM=ஆவணங்கள்
+MenuAWStats=AWStats
+MenuMembers=உறுப்பினர்கள்
+MenuAgendaGoogle=கூகுள் நிகழ்ச்சி நிரல்
+MenuTaxesAndSpecialExpenses=வரிகள் | சிறப்பு செலவுகள்
+ThisLimitIsDefinedInSetup=டோலிபார் வரம்பு (மெனு ஹோம்-அமைவு-பாதுகாப்பு): %s Kb, PHP வரம்பு: %s Kb
+ThisLimitIsDefinedInSetupAt=டோலிபார் வரம்பு (மெனு %s): %s Kb, PHP வரம்பு (Param %s): %s Kb
+NoFileFound=எந்த ஆவணங்களும் பதிவேற்றப்படவில்லை
+CurrentUserLanguage=தற்போதைய மொழி
+CurrentTheme=தற்போதைய தீம்
+CurrentMenuManager=தற்போதைய மெனு மேலாளர்
+Browser=உலாவி
+Layout=தளவமைப்பு
+Screen=திரை
+DisabledModules=முடக்கப்பட்ட தொகுதிகள்
+For=க்கு
+ForCustomer=வாடிக்கையாளருக்கு
+Signature=கையெழுத்து
+DateOfSignature=கையொப்பம் தேதி
+HidePassword=கடவுச்சொல் மறைக்கப்பட்ட கட்டளையைக் காட்டு
+UnHidePassword=தெளிவான கடவுச்சொல்லுடன் உண்மையான கட்டளையைக் காட்டு
+Root=வேர்
+RootOfMedias=பொது ஊடகங்களின் வேர் (/ஊடகங்கள்)
+Informations=தகவல்
+Page=பக்கம்
+Notes=குறிப்புகள்
+AddNewLine=புதிய வரியைச் சேர்க்கவும்
+AddFile=கோப்பைச் சேர்க்கவும்
+FreeZone=இலவச உரை தயாரிப்பு
+FreeLineOfType=இலவச உரை உருப்படி, வகை:
+CloneMainAttributes=பொருளை அதன் முக்கிய பண்புகளுடன் குளோன் செய்யவும்
+ReGeneratePDF=PDF ஐ மீண்டும் உருவாக்கவும்
+PDFMerge=PDF இணைத்தல்
+Merge=ஒன்றிணைக்கவும்
+DocumentModelStandardPDF=நிலையான PDF டெம்ப்ளேட்
+PrintContentArea=முக்கிய உள்ளடக்க பகுதியை அச்சிட பக்கத்தைக் காட்டு
+MenuManager=மெனு மேலாளர்
+WarningYouAreInMaintenanceMode=எச்சரிக்கை, நீங்கள் பராமரிப்பு பயன்முறையில் உள்ளீர்கள்: இந்த பயன்முறையில் பயன்பாட்டைப் பயன்படுத்த <b> %s </b> மட்டுமே உள்நுழைய அனுமதிக்கப்படுகிறது.
+CoreErrorTitle=கணினி பிழை
+CoreErrorMessage=மன்னிக்கவும், பிழை ஏற்பட்டது. பதிவுகளைச் சரிபார்க்க உங்கள் கணினி நிர்வாகியைத் தொடர்புகொள்ளவும் அல்லது கூடுதல் தகவலைப் பெற $dolibarr_main_prod=1 ஐ முடக்கவும்.
+CreditCard=கடன் அட்டை
+ValidatePayment=கட்டணத்தைச் சரிபார்க்கவும்
+CreditOrDebitCard=கிரெடிட் அல்லது டெபிட் கார்டு
+FieldsWithAreMandatory=<b> %s </b> உள்ள புலங்கள் கட்டாயம்
+FieldsWithIsForPublic=<b> %s </b> உள்ள புலங்கள் உறுப்பினர்களின் பொதுப் பட்டியலில் காட்டப்பட்டுள்ளன. இதை நீங்கள் விரும்பவில்லை என்றால், "பொது" பெட்டியைத் தேர்வுநீக்கவும்.
+AccordingToGeoIPDatabase=(GeoIP மாற்றத்தின் படி)
+Line=வரி
+NotSupported=ஒத்துழைக்கவில்லை
+RequiredField=தேவையான புலம்
+Result=விளைவாக
+ToTest=சோதனை
+ValidateBefore=இந்த அம்சத்தைப் பயன்படுத்துவதற்கு முன்பு உருப்படி சரிபார்க்கப்பட வேண்டும்
+Visibility=தெரிவுநிலை
+Totalizable=மொத்தமாக்கக்கூடியது
+TotalizableDesc=இந்த புலம் பட்டியலில் மொத்தமாக உள்ளது
+Private=தனியார்
+Hidden=மறைக்கப்பட்டது
+Resources=வளங்கள்
+Source=ஆதாரம்
+Prefix=முன்னொட்டு
+Before=முன்பு
+After=பிறகு
+IPAddress=ஐபி முகவரி
+Frequency=அதிர்வெண்
+IM=உடனடி செய்தி
+NewAttribute=புதிய பண்பு
+AttributeCode=பண்புக் குறியீடு
+URLPhoto=புகைப்படம்/லோகோவின் URL
+SetLinkToAnotherThirdParty=மற்றொரு மூன்றாம் தரப்பினருக்கான இணைப்பு
+LinkTo=இணைப்பு
+LinkToProposal=முன்மொழிவுக்கான இணைப்பு
+LinkToOrder=ஆர்டருக்கான இணைப்பு
+LinkToInvoice=விலைப்பட்டியலுக்கான இணைப்பு
+LinkToTemplateInvoice=டெம்ப்ளேட் விலைப்பட்டியலுக்கான இணைப்பு
+LinkToSupplierOrder=கொள்முதல் ஆர்டருக்கான இணைப்பு
+LinkToSupplierProposal=விற்பனையாளர் முன்மொழிவுக்கான இணைப்பு
+LinkToSupplierInvoice=விற்பனையாளர் விலைப்பட்டியலுக்கான இணைப்பு
+LinkToContract=ஒப்பந்தத்திற்கான இணைப்பு
+LinkToIntervention=தலையீட்டிற்கான இணைப்பு
+LinkToTicket=டிக்கெட்டுக்கான இணைப்பு
+LinkToMo=மோவிற்கான இணைப்பு
+CreateDraft=வரைவை உருவாக்கவும்
+SetToDraft=வரைவுக்குத் திரும்பு
+ClickToEdit=திருத்த கிளிக் செய்யவும்
+ClickToRefresh=புதுப்பிக்க கிளிக் செய்யவும்
+EditWithEditor=CKEditor உடன் திருத்தவும்
+EditWithTextEditor=உரை திருத்தி மூலம் திருத்தவும்
+EditHTMLSource=HTML மூலத்தைத் திருத்தவும்
+ObjectDeleted=ஆப்ஜெக்ட் %s நீக்கப்பட்டது
+ByCountry=நாடு வாரியாக
+ByTown=ஊர் வாரியாக
+ByDate=தேதிப்படி
+ByMonthYear=மாதம்/ஆண்டு வாரியாக
+ByYear=ஆண்டு வாரியாக
+ByMonth=மாதப்படி
+ByDay=பகலில்
+BySalesRepresentative=விற்பனை பிரதிநிதி மூலம்
+LinkedToSpecificUsers=குறிப்பிட்ட பயனர் தொடர்புடன் இணைக்கப்பட்டுள்ளது
+NoResults=முடிவுகள் இல்லை
+AdminTools=நிர்வாக கருவிகள்
+SystemTools=கணினி கருவிகள்
+ModulesSystemTools=தொகுதி கருவிகள்
+Test=சோதனை
+Element=உறுப்பு
+NoPhotoYet=இதுவரை படங்கள் எதுவும் கிடைக்கவில்லை
+Dashboard=டாஷ்போர்டு
+MyDashboard=எனது டாஷ்போர்டு
+Deductible=கழிக்கக்கூடியது
+from=இருந்து
+toward=நோக்கி
+Access=அணுகல்
+SelectAction=செயலைத் தேர்ந்தெடுக்கவும்
+SelectTargetUser=இலக்கு பயனர்/பணியாளரைத் தேர்ந்தெடுக்கவும்
+HelpCopyToClipboard=கிளிப்போர்டுக்கு நகலெடுக்க Ctrl+C ஐப் பயன்படுத்தவும்
+SaveUploadedFileWithMask=" <strong> %s </strong> " (இல்லையெனில் "%s") என்ற பெயரில் கோப்பை சர்வரில் சேமிக்கவும்
+OriginFileName=அசல் கோப்பு பெயர்
+SetDemandReason=மூலத்தை அமைக்கவும்
+SetBankAccount=வங்கிக் கணக்கை வரையறுக்கவும்
+AccountCurrency=கணக்கு நாணயம்
+ViewPrivateNote=குறிப்புகளைப் பார்க்கவும்
+XMoreLines=%s வரி(கள்) மறைக்கப்பட்டுள்ளது
+ShowMoreLines=அதிக/குறைவான வரிகளைக் காட்டு
+PublicUrl=பொது URL
+AddBox=பெட்டியைச் சேர்க்கவும்
+SelectElementAndClick=ஒரு உறுப்பைத் தேர்ந்தெடுத்து, %s என்பதைக் கிளிக் செய்யவும்
+PrintFile=கோப்பு %s ஐ அச்சிடவும்
+ShowTransaction=வங்கிக் கணக்கில் உள்ளீட்டைக் காட்டு
+ShowIntervention=தலையீடு காட்டு
+ShowContract=ஒப்பந்தத்தைக் காட்டு
+GoIntoSetupToChangeLogo=லோகோவை மாற்ற Home - Setup - Company என்பதற்குச் செல்லவும் அல்லது மறைப்பதற்கு Home - Setup - Display என்பதற்குச் செல்லவும்.
+Deny=மறுக்கவும்
+Denied=மறுக்கப்பட்டது
+ListOf=%s பட்டியல்
+ListOfTemplates=வார்ப்புருக்களின் பட்டியல்
+Gender=பாலினம்
+Genderman=ஆண்
+Genderwoman=பெண்
+Genderother=மற்றவை
+ViewList=பட்டியல் காட்சி
+ViewGantt=காண்ட் பார்வை
+ViewKanban=கன்பன் காட்சி
+Mandatory=கட்டாயமாகும்
+Hello=வணக்கம்
+GoodBye=பிரியாவிடை
+Sincerely=அன்புடன்
+ConfirmDeleteObject=இந்த பொருளை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+DeleteLine=வரியை நீக்கு
+ConfirmDeleteLine=இந்த வரியை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+ErrorPDFTkOutputFileNotFound=பிழை: கோப்பு உருவாக்கப்படவில்லை. $PATH சூழல் மாறியில் (linux/unix மட்டும்) சேர்க்கப்பட்டுள்ள கோப்பகத்தில் 'pdftk' கட்டளை நிறுவப்பட்டுள்ளதா என்பதைச் சரிபார்க்கவும் அல்லது உங்கள் கணினி நிர்வாகியைத் தொடர்பு கொள்ளவும்.
+NoPDFAvailableForDocGenAmongChecked=சரிபார்க்கப்பட்ட பதிவில் ஆவணத்தை உருவாக்குவதற்கு PDF எதுவும் கிடைக்கவில்லை
+TooManyRecordForMassAction=வெகுஜன செயல்பாட்டிற்காக பல பதிவுகள் தேர்ந்தெடுக்கப்பட்டுள்ளன. செயல் %s பதிவுகளின் பட்டியலுக்கு வரம்பிடப்பட்டுள்ளது.
+NoRecordSelected=பதிவு எதுவும் தேர்ந்தெடுக்கப்படவில்லை
+MassFilesArea=வெகுஜன செயல்களால் உருவாக்கப்பட்ட கோப்புகளுக்கான பகுதி
+ShowTempMassFilesArea=வெகுஜன செயல்களால் உருவாக்கப்பட்ட கோப்புகளின் பகுதியைக் காட்டு
+ConfirmMassDeletion=மொத்தமாக நீக்குதல் உறுதிப்படுத்தல்
+ConfirmMassDeletionQuestion=தேர்ந்தெடுத்த %s பதிவை(களை) நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+RelatedObjects=தொடர்புடைய பொருள்கள்
+ClassifyBilled=கட்டணத்தை வகைப்படுத்தவும்
+ClassifyUnbilled=பில் செய்யப்படாததை வகைப்படுத்தவும்
+Progress=முன்னேற்றம்
+ProgressShort=புரோகிரார்.
+FrontOffice=முன் அலுவலகம்
+BackOffice=மீண்டும் அலுவலகம்
+Submit=சமர்ப்பிக்கவும்
+View=காண்க
+Export=ஏற்றுமதி
+Exports=ஏற்றுமதிகள்
+ExportFilteredList=வடிகட்டப்பட்ட பட்டியலை ஏற்றுமதி செய்யவும்
+ExportList=ஏற்றுமதி பட்டியல்
+ExportOptions=ஏற்றுமதி விருப்பங்கள்
+IncludeDocsAlreadyExported=ஏற்கனவே ஏற்றுமதி செய்யப்பட்ட ஆவணங்களைச் சேர்க்கவும்
+ExportOfPiecesAlreadyExportedIsEnable=ஏற்கனவே ஏற்றுமதி செய்யப்பட்ட துண்டுகளின் ஏற்றுமதி இயக்கப்பட்டது
+ExportOfPiecesAlreadyExportedIsDisable=ஏற்கனவே ஏற்றுமதி செய்யப்பட்ட துண்டுகளின் ஏற்றுமதி முடக்கப்பட்டுள்ளது
+AllExportedMovementsWereRecordedAsExported=ஏற்றுமதி செய்யப்பட்ட அனைத்து இயக்கங்களும் ஏற்றுமதி செய்யப்பட்டதாக பதிவு செய்யப்பட்டன
+NotAllExportedMovementsCouldBeRecordedAsExported=ஏற்றுமதி செய்யப்பட்ட அனைத்து இயக்கங்களும் ஏற்றுமதி செய்யப்பட்டதாக பதிவு செய்ய முடியாது
+Miscellaneous=இதர
+Calendar=நாட்காட்டி
+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=பதிவிறக்க Tamil
+DownloadDocument=ஆவணத்தைப் பதிவிறக்கவும்
+ActualizeCurrency=நாணய விகிதத்தைப் புதுப்பிக்கவும்
+Fiscalyear=நிதியாண்டு
+ModuleBuilder=தொகுதி மற்றும் பயன்பாட்டு பில்டர்
+SetMultiCurrencyCode=நாணயத்தை அமைக்கவும்
+BulkActions=மொத்த செயல்பாடுகள்
+ClickToShowHelp=உதவிக்குறிப்பு உதவியைக் காட்ட கிளிக் செய்யவும்
+WebSite=இணையதளம்
+WebSites=இணையதளங்கள்
+WebSiteAccounts=இணையதள கணக்குகள்
+ExpenseReport=செலவு அறிக்கை
+ExpenseReports=செலவு அறிக்கைகள்
+HR=எச்.ஆர்
+HRAndBank=HR மற்றும் வங்கி
+AutomaticallyCalculated=தானாக கணக்கிடப்படுகிறது
+TitleSetToDraft=வரைவுக்குத் திரும்பு
+ConfirmSetToDraft=நிச்சயமாக வரைவு நிலைக்குச் செல்ல விரும்புகிறீர்களா?
+ImportId=இறக்குமதி ஐடி
+Events=நிகழ்வுகள்
+EMailTemplates=மின்னஞ்சல் டெம்ப்ளேட்கள்
+FileNotShared=கோப்பு வெளியில் பகிரப்படவில்லை
+Project=திட்டம்
+Projects=திட்டங்கள்
+LeadOrProject=முன்னணி | திட்டம்
+LeadsOrProjects=முன்னணி | திட்டங்கள்
+Lead=வழி நடத்து
+Leads=வழிநடத்துகிறது
+ListOpenLeads=திறந்த வழிகளை பட்டியலிடுங்கள்
+ListOpenProjects=திறந்த திட்டங்களை பட்டியலிடுங்கள்
+NewLeadOrProject=புதிய முன்னணி அல்லது திட்டம்
+Rights=அனுமதிகள்
+LineNb=வரி எண்.
+IncotermLabel=Incoterms
+TabLetteringCustomer=வாடிக்கையாளர் எழுத்து
+TabLetteringSupplier=விற்பனையாளர் எழுத்து
+Monday=திங்கட்கிழமை
+Tuesday=செவ்வாய்
+Wednesday=புதன்
+Thursday=வியாழன்
+Friday=வெள்ளி
+Saturday=சனிக்கிழமை
+Sunday=ஞாயிற்றுக்கிழமை
+MondayMin=மோ
+TuesdayMin=து
+WednesdayMin=நாங்கள்
+ThursdayMin=த
+FridayMin=Fr
+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=ref ஐ அமைக்கவும்
+Select2ResultFoundUseArrows=சில முடிவுகள் கிடைத்தன. தேர்ந்தெடுக்க அம்புக்குறிகளைப் பயன்படுத்தவும்.
+Select2NotFound=முடிவு எதுவும் கிடைக்கவில்லை
+Select2Enter=உள்ளிடவும்
+Select2MoreCharacter=அல்லது அதிக பாத்திரம்
+Select2MoreCharacters=அல்லது அதிக எழுத்துக்கள்
+Select2MoreCharactersMore= <strong> தொடரியல் தேடு: </strong> <br> <kbd> <strong> | </strong> </kbd> <kbd> அல்லது </kbd> (அ | ஆ) <br> <kbd> <strong> * </strong> </kbd> <kbd> எந்த பாத்திரம் </kbd> (அ * ஆ) <br> <kbd> <strong> ^ </strong> </kbd> <kbd> தொடக்கம் </kbd> கொண்டு </kbd> (^ AB) <br> <kbd> <strong> $ </strong> </kbd> <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=வாடிக்கையாளர் கொடுப்பனவுகள்
+SearchIntoVendorPayments=விற்பனையாளர் கொடுப்பனவுகள்
+SearchIntoMiscPayments=இதர கொடுப்பனவுகள்
+CommentLink=கருத்துகள்
+NbComments=கருத்துகளின் எண்ணிக்கை
+CommentPage=கருத்துகள் இடம்
+CommentAdded=கருத்து சேர்க்கப்பட்டது
+CommentDeleted=கருத்து நீக்கப்பட்டது
+Everybody=எல்லோரும்
+PayedBy=மூலம் செலுத்தப்பட்டது
+PayedTo=செலுத்தப்பட்டது
+Monthly=மாதாந்திர
+Quarterly=காலாண்டு
+Annual=ஆண்டு
+Local=உள்ளூர்
+Remote=ரிமோட்
+LocalAndRemote=உள்ளூர் மற்றும் தொலைநிலை
+KeyboardShortcut=விசைப்பலகை குறுக்குவழி
+AssignedTo=ஒதுக்கப்படும்
+Deletedraft=வரைவை நீக்கு
+ConfirmMassDraftDeletion=வரைவு வெகுஜன நீக்கம் உறுதிப்படுத்தல்
+FileSharedViaALink=பொது இணைப்புடன் கோப்பு பகிரப்பட்டது
+SelectAThirdPartyFirst=முதலில் மூன்றாம் தரப்பினரைத் தேர்ந்தெடுக்கவும்...
+YouAreCurrentlyInSandboxMode=நீங்கள் தற்போது %s "சாண்ட்பாக்ஸ்" பயன்முறையில் உள்ளீர்கள்
+Inventory=சரக்கு
+AnalyticCode=பகுப்பாய்வு குறியீடு
+TMenuMRP=எம்ஆர்பி
+ShowCompanyInfos=நிறுவனத்தின் தகவல்களைக் காட்டு
+ShowMoreInfos=மேலும் தகவல்களைக் காட்டு
+NoFilesUploadedYet=முதலில் ஒரு ஆவணத்தைப் பதிவேற்றவும்
+SeePrivateNote=தனிப்பட்ட குறிப்பைப் பார்க்கவும்
+PaymentInformation=கொடுப்பனவு தகவல்
+ValidFrom=செல்லுபடியாகும்
+ValidUntil=வரை செல்லுபடியாகும்
+NoRecordedUsers=பயனர்கள் இல்லை
+ToClose=மூடுவதற்கு
+ToRefuse=மறுக்க
+ToProcess=செயலாக்க
+ToApprove=ஒப்புதல் அளிக்க
+GlobalOpenedElemView=உலகளாவிய பார்வை
+NoArticlesFoundForTheKeyword=' <strong> %s </strong> ' என்ற முக்கிய வார்த்தைக்கான கட்டுரை எதுவும் இல்லை
+NoArticlesFoundForTheCategory=வகைக்கான கட்டுரை எதுவும் இல்லை
+ToAcceptRefuse=ஏற்க | மறு
+ContactDefault_agenda=நிகழ்வு
+ContactDefault_commande=ஆர்டர்
+ContactDefault_contrat=ஒப்பந்த
+ContactDefault_facture=விலைப்பட்டியல்
+ContactDefault_fichinter=தலையீடு
+ContactDefault_invoice_supplier=சப்ளையர் இன்வாய்ஸ்
+ContactDefault_order_supplier=கொள்முதல் ஆணை
+ContactDefault_project=திட்டம்
+ContactDefault_project_task=பணி
+ContactDefault_propal=முன்மொழிவு
+ContactDefault_supplier_proposal=சப்ளையர் முன்மொழிவு
+ContactDefault_ticket=டிக்கெட்
+ContactAddedAutomatically=தொடர்பு மூன்றாம் தரப்புப் பாத்திரங்களில் இருந்து தொடர்பு சேர்க்கப்பட்டது
+More=மேலும்
+ShowDetails=விவரங்களை காட்டு
+CustomReports=விருப்ப அறிக்கைகள்
+StatisticsOn=புள்ளி விவரங்கள்
+SelectYourGraphOptionsFirst=வரைபடத்தை உருவாக்க உங்கள் வரைபட விருப்பங்களைத் தேர்ந்தெடுக்கவும்
+Measures=நடவடிக்கைகள்
+XAxis=எக்ஸ்-அச்சு
+YAxis=ஒய்-அச்சு
+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=இன்னும் மூடவில்லை
+ClearSignature=கையொப்பத்தை மீட்டமைக்கவும்
+CanceledHidden=ரத்து செய்யப்பட்டது மறைக்கப்பட்டது
+CanceledShown=காட்டப்பட்டது ரத்து செய்யப்பட்டது
diff --git a/htdocs/langs/ta_IN/margins.lang b/htdocs/langs/ta_IN/margins.lang
new file mode 100644
index 00000000000..a8784f241a8
--- /dev/null
+++ b/htdocs/langs/ta_IN/margins.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - marges
+
+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 இன்னும் வரையறுக்கப்படவில்லை என்றால், சிறந்த விற்பனையாளர் விலை a0342fccfda * விலையில் விலை = விற்பனை விலை - தயாரிப்பு அட்டையில் வரையறுக்கப்பட்ட விலை அல்லது விலை வரையறுக்கப்படவில்லை என்றால் WAP அல்லது WAP இன்னும் வரையறுக்கப்படவில்லை என்றால் சிறந்த விற்பனையாளர் விலை
+CostPrice=விலை விலை
+UnitCharges=அலகு கட்டணம்
+Charges=கட்டணம்
+AgentContactType=வணிக முகவர் தொடர்பு வகை
+AgentContactTypeDetails=ஒரு தொடர்பு/விலாசத்திற்கு மார்ஜின் அறிக்கைக்கு என்ன தொடர்பு வகை (இன்வாய்ஸில் இணைக்கப்பட்டுள்ளது) பயன்படுத்தப்படும் என்பதை வரையறுக்கவும். ஒரு தொடர்பின் புள்ளிவிவரங்களைப் படிப்பது நம்பகமானதல்ல என்பதை நினைவில் கொள்ளவும், ஏனெனில் பெரும்பாலான சந்தர்ப்பங்களில் தொடர்பு விலைப்பட்டியல்களில் வெளிப்படையாக வரையறுக்கப்படாமல் இருக்கலாம்.
+rateMustBeNumeric=விகிதம் எண் மதிப்பாக இருக்க வேண்டும்
+markRateShouldBeLesserThan100=மதிப்பெண் விகிதம் 100க்கு குறைவாக இருக்க வேண்டும்
+ShowMarginInfos=விளிம்புத் தகவல்களைக் காட்டு
+CheckMargins=விளிம்பு விவரம்
+MarginPerSaleRepresentativeWarning=ஒவ்வொரு விற்பனைப் பிரதிநிதியின் மார்ஜினையும் கணக்கிட, ஒரு பயனருக்கான மார்ஜின் அறிக்கையானது மூன்றாம் தரப்பினருக்கும் விற்பனைப் பிரதிநிதிகளுக்கும் இடையிலான இணைப்பைப் பயன்படுத்துகிறது. சில மூன்றாம் தரப்பினருக்கு பிரத்யேக விற்பனை பிரதிநிதிகள் இல்லாமல் இருக்கலாம் மற்றும் சில மூன்றாம் தரப்பினர் பலவற்றுடன் இணைக்கப்பட்டிருக்கலாம், சில தொகைகள் இந்த அறிக்கையில் சேர்க்கப்படாமல் போகலாம் (விற்பனை பிரதிநிதி இல்லை என்றால்) மற்றும் சில வெவ்வேறு வரிகளில் (ஒவ்வொரு விற்பனை பிரதிநிதிக்கும்) .
diff --git a/htdocs/langs/ta_IN/members.lang b/htdocs/langs/ta_IN/members.lang
new file mode 100644
index 00000000000..8932a22b739
--- /dev/null
+++ b/htdocs/langs/ta_IN/members.lang
@@ -0,0 +1,220 @@
+# Dolibarr language file - Source file is en_US - members
+MembersArea=உறுப்பினர்கள் பகுதி
+MemberCard=உறுப்பினர் அட்டை
+SubscriptionCard=சந்தா அட்டை
+Member=உறுப்பினர்
+Members=உறுப்பினர்கள்
+ShowMember=உறுப்பினர் அட்டையைக் காட்டு
+UserNotLinkedToMember=ஒரு உறுப்பினருடன் பயனர் இணைக்கப்படவில்லை
+ThirdpartyNotLinkedToMember=மூன்றாம் தரப்பு உறுப்பினருடன் இணைக்கப்படவில்லை
+MembersTickets=உறுப்பினர் முகவரி தாள்
+FundationMembers=அறக்கட்டளை உறுப்பினர்கள்
+ListOfValidatedPublicMembers=சரிபார்க்கப்பட்ட பொது உறுப்பினர்களின் பட்டியல்
+ErrorThisMemberIsNotPublic=இந்த உறுப்பினர் பொது இல்லை
+ErrorMemberIsAlreadyLinkedToThisThirdParty=மற்றொரு உறுப்பினராக (பெயர்: <b> %s </b>, உள்நுழைவு: <b> %s </b>) ஏற்கனவே ஒரு மூன்றாம் தரப்பு <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=உறுப்பினர் அடையாள எண்
+NewMember=புதிய உறுப்பினர்
+MemberType=உறுப்பினர் வகை
+MemberTypeId=உறுப்பினர் வகை ஐடி
+MemberTypeLabel=உறுப்பினர் வகை லேபிள்
+MembersTypes=உறுப்பினர்களின் வகைகள்
+MemberStatusDraft=வரைவு (சரிபார்க்கப்பட வேண்டும்)
+MemberStatusDraftShort=வரைவு
+MemberStatusActive=சரிபார்க்கப்பட்டது (காத்திருப்பு பங்களிப்பு)
+MemberStatusActiveShort=சரிபார்க்கப்பட்டது
+MemberStatusActiveLate=பங்களிப்பு காலாவதியானது
+MemberStatusActiveLateShort=காலாவதியான
+MemberStatusPaid=சந்தா புதுப்பித்த நிலையில் உள்ளது
+MemberStatusPaidShort=இன்றுவரை
+MemberStatusExcluded=விலக்கப்பட்ட உறுப்பினர்
+MemberStatusExcludedShort=விலக்கப்பட்டது
+MemberStatusResiliated=நீக்கப்பட்ட உறுப்பினர்
+MemberStatusResiliatedShort=நிறுத்தப்பட்டது
+MembersStatusToValid=வரைவு உறுப்பினர்கள்
+MembersStatusExcluded=விலக்கப்பட்ட உறுப்பினர்கள்
+MembersStatusResiliated=நீக்கப்பட்ட உறுப்பினர்கள்
+MemberStatusNoSubscription=சரிபார்க்கப்பட்டது (பங்கீடு தேவையில்லை)
+MemberStatusNoSubscriptionShort=சரிபார்க்கப்பட்டது
+SubscriptionNotNeeded=பங்களிப்பு தேவையில்லை
+NewCotisation=புதிய பங்களிப்பு
+PaymentSubscription=புதிய பங்களிப்பு செலுத்துதல்
+SubscriptionEndDate=சந்தா முடிவு தேதி
+MembersTypeSetup=உறுப்பினர்கள் அமைவு வகை
+MemberTypeModified=உறுப்பினர் வகை மாற்றப்பட்டது
+DeleteAMemberType=உறுப்பினர் வகையை நீக்கு
+ConfirmDeleteMemberType=இந்த உறுப்பினர் வகையை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+MemberTypeDeleted=உறுப்பினர் வகை நீக்கப்பட்டது
+MemberTypeCanNotBeDeleted=உறுப்பினர் வகையை நீக்க முடியாது
+NewSubscription=புதிய பங்களிப்பு
+NewSubscriptionDesc=அறக்கட்டளையின் புதிய உறுப்பினராக உங்கள் சந்தாவைப் பதிவுசெய்ய இந்தப் படிவம் உங்களை அனுமதிக்கிறது. உங்கள் சந்தாவைப் புதுப்பிக்க விரும்பினால் (ஏற்கனவே உறுப்பினராக இருந்தால்), அதற்கு பதிலாக %s என்ற மின்னஞ்சல் மூலம் அடித்தள வாரியத்தைத் தொடர்பு கொள்ளவும்.
+Subscription=பங்களிப்பு
+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=உரை
+Int=Int
+DateAndTime=தேதி மற்றும் நேரம்
+PublicMemberCard=உறுப்பினர் பொது அட்டை
+SubscriptionNotRecorded=பங்களிப்பு பதிவு செய்யப்படவில்லை
+AddSubscription=பங்களிப்பை உருவாக்கவும்
+ShowSubscription=பங்களிப்பைக் காட்டு
+# Label of email templates
+SendingAnEMailToMember=உறுப்பினருக்கு தகவல் மின்னஞ்சல் அனுப்புகிறது
+SendingEmailOnAutoSubscription=தானாக பதிவு செய்ய மின்னஞ்சல் அனுப்புகிறது
+SendingEmailOnMemberValidation=புதிய உறுப்பினர் சரிபார்ப்புக்கு மின்னஞ்சல் அனுப்புகிறது
+SendingEmailOnNewSubscription=புதிய பங்களிப்புக்கு மின்னஞ்சல் அனுப்புகிறது
+SendingReminderForExpiredSubscription=காலாவதியான பங்களிப்புகளுக்கு நினைவூட்டல் அனுப்புகிறது
+SendingEmailOnCancelation=ரத்துசெய்தல் மின்னஞ்சல் அனுப்புகிறது
+SendingReminderActionComm=நிகழ்ச்சி நிரல் நிகழ்வுக்கான நினைவூட்டலை அனுப்புகிறது
+# Topic of email templates
+YourMembershipRequestWasReceived=உங்கள் உறுப்பினர் பெறப்பட்டது.
+YourMembershipWasValidated=உங்கள் உறுப்பினர் சரிபார்க்கப்பட்டது
+YourSubscriptionWasRecorded=உங்கள் புதிய பங்களிப்பு பதிவு செய்யப்பட்டது
+SubscriptionReminderEmail=பங்களிப்பு நினைவூட்டல்
+YourMembershipWasCanceled=உங்கள் உறுப்பினர் ரத்து செய்யப்பட்டது
+CardContent=உங்கள் உறுப்பினர் அட்டையின் உள்ளடக்கம்
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=உங்கள் உறுப்பினர் கோரிக்கை பெறப்பட்டது என்பதை உங்களுக்குத் தெரிவிக்க விரும்புகிறோம். <br> <br>
+ThisIsContentOfYourMembershipWasValidated=பின்வரும் தகவலுடன் உங்கள் உறுப்பினர் சரிபார்க்கப்பட்டது என்பதை உங்களுக்குத் தெரிவிக்க விரும்புகிறோம்: <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=உங்கள் புதிய சந்தா பதிவுசெய்யப்பட்டது என்பதை உங்களுக்குத் தெரிவிக்க விரும்புகிறோம். <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=உங்கள் சந்தா காலாவதியாகப் போகிறது அல்லது ஏற்கனவே காலாவதியாகிவிட்டது என்பதை உங்களுக்குத் தெரிவிக்க விரும்புகிறோம் (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). நீங்கள் அதை புதுப்பிப்பீர்கள் என்று நம்புகிறோம். <br> <br>
+ThisIsContentOfYourCard=உங்களைப் பற்றி எங்களிடம் உள்ள தகவலின் சுருக்கம் இது. ஏதேனும் தவறாக இருந்தால் எங்களை தொடர்பு கொள்ளவும். <br> <br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=விருந்தினரின் தானாகக் கல்வெட்டு ஏற்பட்டால் பெறப்பட்ட அறிவிப்பு மின்னஞ்சலின் பொருள்
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=விருந்தினரின் தானாகக் கல்வெட்டு ஏற்பட்டால் பெறப்பட்ட அறிவிப்பு மின்னஞ்சலின் உள்ளடக்கம்
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=உறுப்பினர் தானாகப் பதிவு செய்யும் போது உறுப்பினருக்கு மின்னஞ்சல் அனுப்பப் பயன்படுத்த வேண்டிய மின்னஞ்சல் டெம்ப்ளேட்
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=உறுப்பினர் சரிபார்ப்பில் உறுப்பினருக்கு மின்னஞ்சல் அனுப்ப பயன்படுத்த வேண்டிய மின்னஞ்சல் டெம்ப்ளேட்
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=புதிய பங்களிப்புப் பதிவில் உறுப்பினருக்கு மின்னஞ்சல் அனுப்பப் பயன்படுத்த வேண்டிய மின்னஞ்சல் டெம்ப்ளேட்
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=பங்களிப்பு காலாவதியாகும் போது மின்னஞ்சல் நினைவூட்டலை அனுப்ப பயன்படுத்த வேண்டிய மின்னஞ்சல் டெம்ப்ளேட்
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=உறுப்பினர் ரத்து செய்யப்பட்டபோது ஒரு உறுப்பினருக்கு மின்னஞ்சல் அனுப்ப பயன்படுத்த வேண்டிய மின்னஞ்சல் டெம்ப்ளேட்
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=உறுப்பினர் விலக்கலில் ஒரு உறுப்பினருக்கு மின்னஞ்சல் அனுப்ப பயன்படுத்த வேண்டிய மின்னஞ்சல் டெம்ப்ளேட்
+DescADHERENT_MAIL_FROM=தானியங்கி மின்னஞ்சல்களுக்கான அனுப்புநர் மின்னஞ்சல்
+DescADHERENT_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=அதன் பங்களிப்பின் அளவை பார்வையாளர் தேர்வு செய்யலாம்/திருத்தலாம்
+MEMBER_NEWFORM_PAYONLINE=ஒருங்கிணைந்த ஆன்லைன் கட்டணப் பக்கத்தில் செல்லவும்
+ByProperties=இயற்கையாகவே
+MembersStatisticsByProperties=இயல்பிலேயே உறுப்பினர்களின் புள்ளிவிவரங்கள்
+VATToUseForSubscriptions=பங்களிப்புகளுக்கு பயன்படுத்த VAT விகிதம்
+NoVatOnSubscription=பங்களிப்புகளுக்கு VAT இல்லை
+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=மூன்றாம் தரப்பினர் என்பது ஒவ்வொரு பங்களிப்பிற்கும் விலைப்பட்டியல் உருவாக்க முடிவு செய்தால், விலைப்பட்டியலில் பயன்படுத்தப்படும் சட்டப்பூர்வ நிறுவனம் ஆகும். பங்களிப்பைப் பதிவு செய்யும் போது நீங்கள் அதை உருவாக்க முடியும்.
diff --git a/htdocs/langs/ta_IN/modulebuilder.lang b/htdocs/langs/ta_IN/modulebuilder.lang
new file mode 100644
index 00000000000..02522b27ef8
--- /dev/null
+++ b/htdocs/langs/ta_IN/modulebuilder.lang
@@ -0,0 +1,147 @@
+# 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 கோப்புகள் உருவாக்கப்படும்.
+ModuleBuilderDesc2=தொகுதிகள் உருவாக்கப்படும்/திருத்தப்படும் பாதை (வெளிப்புற தொகுதிகளுக்கான முதல் அடைவு %s என வரையறுக்கப்பட்டுள்ளது): <strong> %s </strong>
+ModuleBuilderDesc3=உருவாக்கப்பட்ட/திருத்தக்கூடிய தொகுதிகள் கண்டறியப்பட்டன: <strong> %s </strong>
+ModuleBuilderDesc4=தொகுதி கோப்பகத்தின் மூலத்தில் <strong> %s </strong> கோப்பு இருக்கும்போது ஒரு தொகுதி 'எடிட் செய்யக்கூடியது' எனக் கண்டறியப்பட்டது.
+NewModule=புதிய தொகுதி
+NewObjectInModulebuilder=புதிய பொருள்
+ModuleKey=தொகுதி விசை
+ObjectKey=பொருள் விசை
+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=உங்கள் விண்ணப்பத்தின் ஜிப் தொகுப்பை நீங்கள் உருவாக்கலாம், எனவே நீங்கள் அதை எந்த டோலிபாரிலும் விநியோகிக்க தயாராக உள்ளீர்கள். நீங்கள் அதை விநியோகிக்கலாம் அல்லது <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=NULL அல்ல
+NotNullDesc=1=தரவுத்தளத்தை NULL என அமைக்கவும். -1=வெறுமையாக இருந்தால் ('' அல்லது 0) பூஜ்ய மதிப்புகள் மற்றும் கட்டாய மதிப்பை NULLக்கு அனுமதிக்கவும்.
+SearchAll='அனைத்தையும் தேட' பயன்படுத்தப்பட்டது
+DatabaseIndex=தரவுத்தள அட்டவணை
+FileAlreadyExists=கோப்பு %s ஏற்கனவே உள்ளது
+TriggersFile=தூண்டுதல் குறியீட்டிற்கான கோப்பு
+HooksFile=ஹூக்ஸ் குறியீட்டிற்கான கோப்பு
+ArrayOfKeyValues=விசை-வால் வரிசை
+ArrayOfKeyValuesDesc=புலம் என்பது நிலையான மதிப்புகளைக் கொண்ட சேர்க்கை பட்டியலாக இருந்தால் விசைகள் மற்றும் மதிப்புகளின் வரிசை
+WidgetFile=விட்ஜெட் கோப்பு
+CSSFile=CSS கோப்பு
+JSFile=ஜாவாஸ்கிரிப்ட் கோப்பு
+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=ஏபிஐ எக்ஸ்ப்ளோரர்
+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>
+DisplayOnPdfDesc=இணக்கமான PDF ஆவணங்களில் இந்தப் புலத்தைக் காண்பி, நீங்கள் "நிலை" புலத்துடன் நிலையை நிர்வகிக்கலாம். <br> தற்போது, அறியப்பட்ட இணக்கதன்மை பிடிஎப் மாதிரிகள் உள்ளன: eratosthene (ஆர்டர்), espadon (கப்பல்), கடற்பாசி (பொருள்), சியான் (propal / மேற்கோள்), cornas (சப்ளையர் ஆர்டர்) <br> <br> <strong> ஆவணம்: </strong> <br> 0 = <br> 1 காண்பிக்கப்படவில்லை = காட்சி <br> 2 = காட்ட மட்டுமே காலி இல்லை என்றால் <br> <br> <strong> பொறுத்தவரை ஆவணம் வரிகளை: </strong> <br> 0 = இல்லை <br> 1 = பிறகு விளக்கம் பத்தியில் 4 = காட்சி <br> விளக்கம் பிறகு <br> வரி விளக்கம் பத்தியில் 3 = காட்சி ஒரு பத்தியில் காட்டப்படும் காட்டப்படும் காலியாக இல்லாவிட்டால் மட்டுமே விளக்கம்
+DisplayOnPdf=PDF இல் காட்சி
+IsAMeasureDesc=புலத்தின் மதிப்பை மொத்தமாக பட்டியலில் சேர்க்க முடியுமா? (எடுத்துக்காட்டுகள்: 1 அல்லது 0)
+SearchAllDesc=விரைவு தேடல் கருவியில் இருந்து தேடுவதற்கு புலம் பயன்படுத்தப்படுகிறதா? (எடுத்துக்காட்டுகள்: 1 அல்லது 0)
+SpecDefDesc=மற்ற தாவல்களால் ஏற்கனவே வரையறுக்கப்படாத உங்கள் தொகுதியுடன் நீங்கள் வழங்க விரும்பும் அனைத்து ஆவணங்களையும் இங்கே உள்ளிடவும். நீங்கள் .md அல்லது சிறந்த, பணக்கார .asciidoc தொடரியல் பயன்படுத்தலாம்.
+LanguageDefDesc=இந்தக் கோப்புகளில், ஒவ்வொரு மொழிக் கோப்பிற்கான அனைத்து விசை மற்றும் மொழிபெயர்ப்பை உள்ளிடவும்.
+MenusDefDesc=உங்கள் தொகுதி வழங்கிய மெனுக்களை இங்கே வரையறுக்கவும்
+DictionariesDefDesc=உங்கள் தொகுதி வழங்கிய அகராதிகளை இங்கே வரையறுக்கவும்
+PermissionsDefDesc=உங்கள் தொகுதி வழங்கிய புதிய அனுமதிகளை இங்கே வரையறுக்கவும்
+MenusDefDescTooltip=உங்கள் தொகுதி/பயன்பாடு வழங்கிய மெனுக்கள் <strong> $this->மெனுக்கள் </strong> என்ற வரிசையில் தொகுதி விளக்கக் கோப்பில் வரையறுக்கப்பட்டுள்ளன. இந்தக் கோப்பை நீங்கள் கைமுறையாகத் திருத்தலாம் அல்லது உட்பொதிக்கப்பட்ட எடிட்டரைப் பயன்படுத்தலாம். <br> <br> குறிப்பு: வரையறுக்கப்பட்டதும் (மற்றும் தொகுதி மீண்டும் செயல்படுத்தப்பட்டது), %s இல் உள்ள நிர்வாகி பயனர்களுக்கு கிடைக்கும் மெனு எடிட்டரில் மெனுக்கள் தெரியும்.
+DictionariesDefDescTooltip=உங்கள் தொகுதி/பயன்பாடு வழங்கிய அகராதிகள் <strong> $this->அகராதிகள் </strong> என்ற வரிசையில் தொகுதி விளக்கக் கோப்பில் வரையறுக்கப்பட்டுள்ளன. இந்தக் கோப்பை நீங்கள் கைமுறையாகத் திருத்தலாம் அல்லது உட்பொதிக்கப்பட்ட எடிட்டரைப் பயன்படுத்தலாம். <br> <br> குறிப்பு: வரையறுக்கப்பட்டதும் (மற்றும் தொகுதி மீண்டும் செயல்படுத்தப்பட்டது), அகராதிகளும் %s இல் உள்ள நிர்வாகி பயனர்களுக்கு அமைவுப் பகுதியில் தெரியும்.
+PermissionsDefDescTooltip=உங்கள் தொகுதி/பயன்பாடு வழங்கிய அனுமதிகள் <strong> $this->உரிமைகள் </strong> என்ற வரிசையில் தொகுதி விளக்கக் கோப்பில் வரையறுக்கப்பட்டுள்ளன. இந்தக் கோப்பை நீங்கள் கைமுறையாகத் திருத்தலாம் அல்லது உட்பொதிக்கப்பட்ட எடிட்டரைப் பயன்படுத்தலாம். <br> <br> குறிப்பு: வரையறுக்கப்பட்டதும் (மற்றும் தொகுதி மீண்டும் செயல்படுத்தப்பட்டது), அனுமதிகள் இயல்புநிலை அனுமதிகள் அமைப்பில் %s இல் தெரியும்.
+HooksDefDesc=<b> module_parts['hooks'] </b> சொத்தை, தொகுதி விளக்கத்தில், நீங்கள் நிர்வகிக்க விரும்பும் கொக்கிகளின் சூழலை வரையறுக்கவும் (' a0aee83z605837f1083605837F10000083665837f108665837F1000000ae8365837FK உங்கள் ஹூக் செய்யப்பட்ட செயல்பாடுகளின் குறியீட்டைச் சேர்க்க ஹூக் கோப்பு (ஹூக் செய்யக்கூடிய செயல்பாடுகளை '<b> executeHooks </b>' இல் தேடுவதன் மூலம் கண்டறியலாம்).
+TriggerDefDesc=உங்கள் தொகுதிக்கு வெளியே ஒரு வணிக நிகழ்வு செயல்படுத்தப்படும் போது நீங்கள் செயல்படுத்த விரும்பும் குறியீட்டை தூண்டுதல் கோப்பில் வரையறுக்கவும் (பிற தொகுதிகளால் தூண்டப்படும் நிகழ்வுகள்).
+SeeIDsInUse=உங்கள் நிறுவலில் பயன்பாட்டில் உள்ள ஐடிகளைப் பார்க்கவும்
+SeeReservedIDsRangeHere=முன்பதிவு செய்யப்பட்ட ஐடிகளின் வரம்பைப் பார்க்கவும்
+ToolkitForDevelopers=டோலிபார் டெவலப்பர்களுக்கான கருவித்தொகுப்பு
+TryToUseTheModuleBuilder=உங்களுக்கு SQL மற்றும் PHP பற்றிய அறிவு இருந்தால், நீங்கள் நேட்டிவ் மாட்யூல் பில்டர் வழிகாட்டியைப் பயன்படுத்தலாம். <br> <strong> %s </strong> தொகுதியை இயக்கவும் மற்றும் <span class="fa fa-bug"> <span class="fa fa-bug"> <span class="fa fa-bug"> a014f1b5 <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=உங்கள் தொகுதியுடன் உட்பொதிக்கப்பட்ட தனிப்பயனாக்கப்பட்ட ஜாவாஸ்கிரிப்ட் கொண்ட கோப்பை இங்கே உருவாக்கி திருத்தலாம்.
+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]] ('1' என்றால், பதிவை உருவாக்க, சேர்க்கைக்குப் பிறகு ஒரு + பட்டனைச் சேர்ப்போம், 'வடிகட்டி' என்பது 'status=1 மற்றும் fk_user = __USER_ID மற்றும் IN (__SHARED_ENTITIES__)' ஆக இருக்கலாம். எடுத்துக்காட்டாக)
+AsciiToHtmlConverter=Ascii க்கு HTML மாற்றி
+AsciiToPdfConverter=Ascii to PDF மாற்றி
+TableNotEmptyDropCanceled=அட்டவணை காலியாக இல்லை. டிராப் ரத்து செய்யப்பட்டது.
+ModuleBuilderNotAllowed=மாட்யூல் பில்டர் உள்ளது ஆனால் உங்கள் பயனருக்கு அனுமதிக்கப்படவில்லை.
+ImportExportProfiles=சுயவிவரங்களை இறக்குமதி மற்றும் ஏற்றுமதி
+ValidateModBuilderDesc=இந்தப் புலத்தை $this->validateField() உடன் சரிபார்க்க வேண்டும் என்றால் 1 ஐ வைக்கவும் அல்லது சரிபார்ப்பு தேவைப்பட்டால் 0 ஐ வைக்கவும்
diff --git a/htdocs/langs/ta_IN/mrp.lang b/htdocs/langs/ta_IN/mrp.lang
new file mode 100644
index 00000000000..29c220b444b
--- /dev/null
+++ b/htdocs/langs/ta_IN/mrp.lang
@@ -0,0 +1,109 @@
+Mrp=உற்பத்தி ஆணைகள்
+MOs=உற்பத்தி ஆர்டர்கள்
+ManufacturingOrder=உற்பத்தி ஆணை
+MRPDescription=உற்பத்தி மற்றும் உற்பத்தி ஆணைகளை (MO) நிர்வகிப்பதற்கான தொகுதி.
+MRPArea=எம்ஆர்பி பகுதி
+MrpSetupPage=தொகுதி எம்ஆர்பி அமைப்பு
+MenuBOM=பொருள் பில்கள்
+LatestBOMModified=சமீபத்திய %s திருத்தப்பட்ட பொருட்களின் பில்கள்
+LatestMOModified=சமீபத்திய %s உற்பத்தி ஆர்டர்கள் மாற்றப்பட்டன
+Bom=பொருள் பில்கள்
+BillOfMaterials=பொருட்களின் அளவுக்கான ரசீது
+BillOfMaterialsLines=பொருட்கள் வரிகளின் பில்
+BOMsSetup=தொகுதி BOM அமைவு
+ListOfBOMs=பொருள் பில்கள் பட்டியல் - BOM
+ListOfManufacturingOrders=உற்பத்தி ஆணைகளின் பட்டியல்
+NewBOM=பொருட்கள் புதிய பில்
+ProductBOMHelp=இந்த BOM மூலம் உருவாக்க (அல்லது பிரிப்பதற்கான) தயாரிப்பு. <br> குறிப்பு: 'பொருளின் தன்மை' = 'மூலப் பொருள்' என்ற பண்பு கொண்ட தயாரிப்புகள் இந்தப் பட்டியலில் காணப்படாது.
+BOMsNumberingModules=BOM எண் வார்ப்புருக்கள்
+BOMsModelModule=BOM ஆவண வார்ப்புருக்கள்
+MOsNumberingModules=MO எண் வார்ப்புருக்கள்
+MOsModelModule=MO ஆவண வார்ப்புருக்கள்
+FreeLegalTextOnBOMs=BOM ஆவணத்தில் இலவச உரை
+WatermarkOnDraftBOMs=வரைவு BOM இல் வாட்டர்மார்க்
+FreeLegalTextOnMOs=MO ஆவணத்தில் இலவச உரை
+WatermarkOnDraftMOs=வரைவு MO இல் வாட்டர்மார்க்
+ConfirmCloneBillOfMaterials=%s மெட்டீரியல்களின் பில்லை நிச்சயமாக குளோன் செய்ய விரும்புகிறீர்களா?
+ConfirmCloneMo=%s உற்பத்தி ஆர்டரை நிச்சயமாக குளோன் செய்ய விரும்புகிறீர்களா?
+ManufacturingEfficiency=உற்பத்தி திறன்
+ConsumptionEfficiency=நுகர்வு திறன்
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
+ValueOfMeansLossForProductProduced=0.95 இன் மதிப்பு என்பது உற்பத்தி செய்யப்பட்ட பொருளின் சராசரி இழப்பு 5%%
+DeleteBillOfMaterials=பொருட்களின் மசோதாவை நீக்கவும்
+DeleteMo=உற்பத்தி ஆர்டரை நீக்கு
+ConfirmDeleteBillOfMaterials=இந்த பில் ஆஃப் மெட்டீரியல்களை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+ConfirmDeleteMo=இந்த உற்பத்தி ஆர்டரை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+MenuMRP=உற்பத்தி ஆணைகள்
+NewMO=புதிய உற்பத்தி ஆணை
+QtyToProduce=உற்பத்தி செய்ய Qty
+DateStartPlannedMo=திட்டமிடப்பட்ட தொடக்க தேதி
+DateEndPlannedMo=தேதி முடிவு திட்டமிடப்பட்டுள்ளது
+KeepEmptyForAsap=காலி என்றால் 'முடிந்தவரை விரைவில்'
+EstimatedDuration=மதிப்பிடப்பட்ட கால அளவு
+EstimatedDurationDesc=இந்த BOMஐப் பயன்படுத்தி இந்தத் தயாரிப்பைத் தயாரிப்பதற்கான (அல்லது பிரித்தெடுக்க) மதிப்பிடப்பட்ட காலம்
+ConfirmValidateBom=<strong> %s </strong> (புதிய உற்பத்தி ஆர்டர்களை உருவாக்க நீங்கள் இதைப் பயன்படுத்த முடியும்) உடன் BOMஐச் சரிபார்க்க விரும்புகிறீர்களா?
+ConfirmCloseBom=இந்த BOM ஐ ரத்துசெய்ய விரும்புகிறீர்களா (இனி புதிய உற்பத்தி ஆர்டர்களை உருவாக்க இதைப் பயன்படுத்த முடியாது) ?
+ConfirmReopenBom=இந்த BOM ஐ மீண்டும் திறக்க விரும்புகிறீர்களா (புதிய உற்பத்தி ஆர்டர்களை உருவாக்க நீங்கள் இதைப் பயன்படுத்த முடியும்)
+StatusMOProduced=தயாரிக்கப்பட்டது
+QtyFrozen=உறைந்த Qty
+QuantityFrozen=உறைந்த அளவு
+QuantityConsumedInvariable=இந்தக் கொடி அமைக்கப்படும் போது, நுகரப்படும் அளவு எப்போதும் வரையறுக்கப்பட்ட மதிப்பாக இருக்கும் மற்றும் உற்பத்தி செய்யப்பட்ட அளவோடு தொடர்புடையதாக இருக்காது.
+DisableStockChange=பங்கு மாற்றம் முடக்கப்பட்டது
+DisableStockChangeHelp=இந்தக் கொடி அமைக்கப்படும்போது, எந்த அளவு நுகரப்பட்டாலும், இந்தத் தயாரிப்பில் பங்கு மாற்றம் இருக்காது
+BomAndBomLines=பொருள் மற்றும் வரிகளின் பில்கள்
+BOMLine=BOM கோடு
+WarehouseForProduction=உற்பத்திக்கான கிடங்கு
+CreateMO=MO ஐ உருவாக்கவும்
+ToConsume=நுகர்வு
+ToProduce=உற்பத்தி செய்ய
+ToObtain=பெற
+QtyAlreadyConsumed=Qty ஏற்கனவே நுகரப்பட்டது
+QtyAlreadyProduced=Qty ஏற்கனவே தயாரிக்கப்பட்டது
+QtyRequiredIfNoLoss=இழப்பு இல்லை என்றால் அளவு தேவை (உற்பத்தி திறன் 100%%)
+ConsumeOrProduce=உட்கொள்ளவும் அல்லது உற்பத்தி செய்யவும்
+ConsumeAndProduceAll=அனைத்தையும் நுகர்ந்து உற்பத்தி செய்
+Manufactured=தயாரிக்கப்பட்டது
+TheProductXIsAlreadyTheProductToProduce=சேர்க்க வேண்டிய தயாரிப்பு ஏற்கனவே உற்பத்தி செய்ய வேண்டிய தயாரிப்பு ஆகும்.
+ForAQuantityOf=%s தயாரிப்பதற்கு ஒரு அளவு
+ForAQuantityToConsumeOf=%s பிரித்தெடுக்கும் அளவுக்கு
+ConfirmValidateMo=இந்த உற்பத்தி ஆர்டரை நிச்சயமாக சரிபார்க்க விரும்புகிறீர்களா?
+ConfirmProductionDesc='%s' ஐக் கிளிக் செய்வதன் மூலம், அளவுகளின் அளவுக்கான நுகர்வு மற்றும்/அல்லது உற்பத்தியை நீங்கள் சரிபார்க்கலாம். இது பங்குகளைப் புதுப்பித்து, பங்கு நகர்வுகளைப் பதிவு செய்யும்.
+ProductionForRef=%s இன் உற்பத்தி
+AutoCloseMO=நுகர்வு மற்றும் உற்பத்தி செய்ய வேண்டிய அளவுகள் எட்டப்பட்டால், உற்பத்தி ஆணை தானாக மூடவும்
+NoStockChangeOnServices=சேவைகளில் பங்கு மாற்றம் இல்லை
+ProductQtyToConsumeByMO=திறந்த MO மூலம் இன்னும் பயன்படுத்த வேண்டிய தயாரிப்பு அளவு
+ProductQtyToProduceByMO=திறந்த MO மூலம் இன்னும் உற்பத்தி செய்ய வேண்டிய தயாரிப்பு அளவு
+AddNewConsumeLines=நுகர்வதற்கு புதிய வரியைச் சேர்க்கவும்
+AddNewProduceLines=உற்பத்தி செய்ய புதிய வரியைச் சேர்க்கவும்
+ProductsToConsume=உட்கொள்ள வேண்டிய பொருட்கள்
+ProductsToProduce=உற்பத்தி செய்ய வேண்டிய பொருட்கள்
+UnitCost=அலகு விலை
+TotalCost=மொத்த செலவு
+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=தேவைப்படும் ஆபரேட்டர்களின் எண்ணிக்கை
+THMOperatorEstimated=மதிப்பிடப்பட்ட ஆபரேட்டர் THM
+THMMachineEstimated=மதிப்பிடப்பட்ட இயந்திரம் THM
+WorkstationType=பணிநிலைய வகை
+Human=மனிதன்
+Machine=இயந்திரம்
+HumanMachine=மனித / இயந்திரம்
+WorkstationArea=பணிநிலைய பகுதி
+Machines=இயந்திரங்கள்
+THMEstimatedHelp=இந்த விகிதமானது பொருளின் முன்னறிவிப்பு விலையை வரையறுக்க உதவுகிறது
+BOM=பொருட்களின் அளவுக்கான ரசீது
+CollapseBOMHelp=BOM தொகுதியின் கட்டமைப்பில் பெயரிடலின் விவரங்களின் இயல்புநிலை காட்சியை நீங்கள் வரையறுக்கலாம்
+MOAndLines=உற்பத்தி ஆர்டர்கள் மற்றும் வரிகள்
diff --git a/htdocs/langs/ta_IN/multicurrency.lang b/htdocs/langs/ta_IN/multicurrency.lang
new file mode 100644
index 00000000000..4320942b0e4
--- /dev/null
+++ b/htdocs/langs/ta_IN/multicurrency.lang
@@ -0,0 +1,38 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=பல நாணயம்
+ErrorAddRateFail=கூடுதல் விகிதத்தில் பிழை
+ErrorAddCurrencyFail=சேர்க்கப்பட்ட நாணயத்தில் பிழை
+ErrorDeleteCurrencyFail=நீக்குவதில் பிழை தோல்வி
+multicurrency_syncronize_error=ஒத்திசைவு பிழை: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=சமீபத்திய அறியப்பட்ட விகிதத்தைப் பயன்படுத்துவதற்குப் பதிலாக நாணய விகிதத்தைக் கண்டறிய ஆவணத்தின் தேதியைப் பயன்படுத்தவும்
+multicurrency_useOriginTx=ஒரு பொருள் மற்றொன்றிலிருந்து உருவாக்கப்படும் போது, மூலப் பொருளிலிருந்து அசல் விகிதத்தை வைத்திருங்கள் (இல்லையெனில் சமீபத்திய அறியப்பட்ட விகிதத்தைப் பயன்படுத்தவும்)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=இந்தச் செயல்பாட்டைப் பயன்படுத்த, நீங்கள் %s என்ற இணையதளத்தில் கணக்கை உருவாக்க வேண்டும். <br> உங்கள் <b> API விசையைப் பெறவும் </b> . <br> நீங்கள் இலவச கணக்கைப் பயன்படுத்தினால், <b> மூல நாணயத்தை </b> (இயல்புநிலையாக USD) மாற்ற முடியாது. <br> உங்கள் முக்கிய நாணயம் USD ஆக இல்லாவிட்டால், பயன்பாடு தானாகவே அதை மீண்டும் கணக்கிடும். <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/ta_IN/oauth.lang b/htdocs/langs/ta_IN/oauth.lang
new file mode 100644
index 00000000000..aa85e80f2eb
--- /dev/null
+++ b/htdocs/langs/ta_IN/oauth.lang
@@ -0,0 +1,32 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=OAuth கட்டமைப்பு
+OAuthServices=OAuth சேவைகள்
+ManualTokenGeneration=கைமுறை டோக்கன் உருவாக்கம்
+TokenManager=டோக்கன் மேலாளர்
+IsTokenGenerated=டோக்கன் உருவாக்கப்பட்டதா?
+NoAccessToken=உள்ளூர் தரவுத்தளத்தில் அணுகல் டோக்கன் எதுவும் சேமிக்கப்படவில்லை
+HasAccessToken=ஒரு டோக்கன் உருவாக்கப்பட்டு உள்ளூர் தரவுத்தளத்தில் சேமிக்கப்பட்டது
+NewTokenStored=டோக்கன் பெறப்பட்டு சேமிக்கப்பட்டது
+ToCheckDeleteTokenOnProvider=%s OAuth வழங்குநரால் சேமிக்கப்பட்ட அங்கீகாரத்தைச் சரிபார்க்க/நீக்க இங்கே கிளிக் செய்யவும்
+TokenDeleted=டோக்கன் நீக்கப்பட்டது
+RequestAccess=அணுகலைக் கோர/புதுப்பிக்க இங்கே கிளிக் செய்யவும் மற்றும் சேமிக்க புதிய டோக்கனைப் பெறவும்
+DeleteAccess=டோக்கனை நீக்க இங்கே கிளிக் செய்யவும்
+UseTheFollowingUrlAsRedirectURI=உங்கள் OAuth வழங்குனருடன் உங்கள் நற்சான்றிதழ்களை உருவாக்கும் போது, பின்வரும் URL ஐ வழிமாற்று URI ஆகப் பயன்படுத்தவும்:
+ListOfSupportedOauthProviders=உங்கள் OAuth2 வழங்குநர் வழங்கிய நற்சான்றிதழ்களை உள்ளிடவும். ஆதரிக்கப்படும் OAuth2 வழங்குநர்கள் மட்டுமே இங்கே பட்டியலிடப்பட்டுள்ளனர். OAuth2 அங்கீகாரம் தேவைப்படும் பிற தொகுதிக்கூறுகளால் இந்த சேவைகள் பயன்படுத்தப்படலாம்.
+OAuthSetupForLogin=OAuth டோக்கனை உருவாக்குவதற்கான பக்கம்
+SeePreviousTab=முந்தைய தாவலைப் பார்க்கவும்
+OAuthIDSecret=OAuth ஐடி மற்றும் ரகசியம்
+TOKEN_REFRESH=டோக்கன் புதுப்பிப்பு தற்போது
+TOKEN_EXPIRED=டோக்கன் காலாவதியானது
+TOKEN_EXPIRE_AT=டோக்கன் காலாவதியாகிறது
+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_STRIPE_TEST_NAME=OAuth ஸ்ட்ரைப் சோதனை
+OAUTH_STRIPE_LIVE_NAME=OAuth ஸ்ட்ரைப் லைவ்
diff --git a/htdocs/langs/ta_IN/opensurvey.lang b/htdocs/langs/ta_IN/opensurvey.lang
new file mode 100644
index 00000000000..b96f782081d
--- /dev/null
+++ b/htdocs/langs/ta_IN/opensurvey.lang
@@ -0,0 +1,63 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+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/ta_IN/orders.lang b/htdocs/langs/ta_IN/orders.lang
new file mode 100644
index 00000000000..b9fb97b11f4
--- /dev/null
+++ b/htdocs/langs/ta_IN/orders.lang
@@ -0,0 +1,196 @@
+# Dolibarr language file - Source file is en_US - orders
+OrdersArea=வாடிக்கையாளர்கள் ஆர்டர் செய்யும் பகுதி
+SuppliersOrdersArea=கொள்முதல் ஆர்டர்கள் பகுதி
+OrderCard=ஆர்டர் அட்டை
+OrderId=ஆர்டர் ஐடி
+Order=ஆர்டர்
+PdfOrderTitle=ஆர்டர்
+Orders=ஆர்டர்கள்
+OrderLine=ஆர்டர் வரி
+OrderDate=ஆர்டர் தேதி
+OrderDateShort=ஆர்டர் தேதி
+OrderToProcess=செயலாக்க உத்தரவு
+NewOrder=புதிய ஆர்டர்
+NewSupplierOrderShort=புதிய ஆர்டர்
+NewOrderSupplier=புதிய கொள்முதல் ஆணை
+ToOrder=ஆர்டர் செய்யுங்கள்
+MakeOrder=ஆர்டர் செய்யுங்கள்
+SupplierOrder=கொள்முதல் ஆணை
+SuppliersOrders=கொள்முதல் ஆணைகள்
+SaleOrderLines=விற்பனை ஆர்டர் கோடுகள்
+PurchaseOrderLines=ஆர்டர் வரிகளை வாங்கவும்
+SuppliersOrdersRunning=தற்போதைய கொள்முதல் ஆர்டர்கள்
+CustomerOrder=விற்பனை ஆணை
+CustomersOrders=விற்பனை ஆணைகள்
+CustomersOrdersRunning=தற்போதைய விற்பனை ஆர்டர்கள்
+CustomersOrdersAndOrdersLines=விற்பனை ஆர்டர்கள் மற்றும் ஆர்டர் விவரங்கள்
+OrdersDeliveredToBill=விற்பனை ஆர்டர்கள் பில்லுக்கு வழங்கப்படுகின்றன
+OrdersToBill=விற்பனை ஆர்டர்கள் வழங்கப்பட்டன
+OrdersInProcess=விற்பனை ஆர்டர்கள் செயல்பாட்டில் உள்ளன
+OrdersToProcess=செயலாக்கத்திற்கான விற்பனை ஆர்டர்கள்
+SuppliersOrdersToProcess=செயலாக்க ஆர்டர்களை வாங்கவும்
+SuppliersOrdersAwaitingReception=கொள்முதல் ஆர்டர்கள் வரவேற்புக்காக காத்திருக்கின்றன
+AwaitingReception=வரவேற்புக்காக காத்திருக்கிறது
+StatusOrderCanceledShort=ரத்து செய்யப்பட்டது
+StatusOrderDraftShort=வரைவு
+StatusOrderValidatedShort=சரிபார்க்கப்பட்டது
+StatusOrderSentShort=செயல்பாட்டில்
+StatusOrderSent=ஏற்றுமதி செயல்பாட்டில் உள்ளது
+StatusOrderOnProcessShort=உத்தரவிட்டார்
+StatusOrderProcessedShort=செயலாக்கப்பட்டது
+StatusOrderDelivered=வழங்கப்பட்டது
+StatusOrderDeliveredShort=வழங்கப்பட்டது
+StatusOrderToBillShort=வழங்கப்பட்டது
+StatusOrderApprovedShort=அங்கீகரிக்கப்பட்டது
+StatusOrderRefusedShort=மறுத்தார்
+StatusOrderToProcessShort=செயலாக்க
+StatusOrderReceivedPartiallyShort=ஓரளவு பெறப்பட்டது
+StatusOrderReceivedAllShort=பெறப்பட்ட தயாரிப்புகள்
+StatusOrderCanceled=ரத்து செய்யப்பட்டது
+StatusOrderDraft=வரைவு (சரிபார்க்கப்பட வேண்டும்)
+StatusOrderValidated=சரிபார்க்கப்பட்டது
+StatusOrderOnProcess=ஆர்டர் செய்யப்பட்டது - காத்திருப்பு வரவேற்பு
+StatusOrderOnProcessWithValidation=ஆர்டர் செய்யப்பட்டது - காத்திருப்பு வரவேற்பு அல்லது சரிபார்ப்பு
+StatusOrderProcessed=செயலாக்கப்பட்டது
+StatusOrderToBill=வழங்கப்பட்டது
+StatusOrderApproved=அங்கீகரிக்கப்பட்டது
+StatusOrderRefused=மறுத்தார்
+StatusOrderReceivedPartially=ஓரளவு பெறப்பட்டது
+StatusOrderReceivedAll=அனைத்து தயாரிப்புகளும் பெறப்பட்டன
+ShippingExist=ஒரு ஏற்றுமதி உள்ளது
+QtyOrdered=க்யூடி உத்தரவிட்டார்
+ProductQtyInDraft=வரைவு ஆர்டர்களில் தயாரிப்பு அளவு
+ProductQtyInDraftOrWaitingApproved=தயாரிப்பு அளவு வரைவு அல்லது அங்கீகரிக்கப்பட்ட ஆர்டர்கள், இன்னும் ஆர்டர் செய்யப்படவில்லை
+MenuOrdersToBill=ஆர்டர்கள் வழங்கப்பட்டன
+MenuOrdersToBill2=பில் செய்யக்கூடிய ஆர்டர்கள்
+ShipProduct=கப்பல் தயாரிப்பு
+CreateOrder=ஆர்டரை உருவாக்கவும்
+RefuseOrder=உத்தரவை மறுக்கவும்
+ApproveOrder=உத்தரவை அங்கீகரிக்கவும்
+Approve2Order=ஆர்டரை அங்கீகரிக்கவும் (இரண்டாம் நிலை)
+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=வகைப்படுத்தி வழங்கப்பட்டது
+DraftOrders=வரைவு உத்தரவுகள்
+DraftSuppliersOrders=வரைவு கொள்முதல் ஆர்டர்கள்
+OnProcessOrders=செயல்பாட்டில் ஆர்டர்கள்
+RefOrder=Ref. உத்தரவு
+RefCustomerOrder=Ref. வாடிக்கையாளருக்கான ஆர்டர்
+RefOrderSupplier=Ref. விற்பனையாளருக்கான உத்தரவு
+RefOrderSupplierShort=Ref. ஆர்டர் விற்பனையாளர்
+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=பிரதிநிதி தொடர்ந்து விற்பனை ஆர்டர்
+TypeContact_commande_internal_SHIPPING=பிரதிநிதி பின்தொடர்தல் ஷிப்பிங்
+TypeContact_commande_external_BILLING=வாடிக்கையாளர் இன்வாய்ஸ் தொடர்பு
+TypeContact_commande_external_SHIPPING=வாடிக்கையாளர் கப்பல் தொடர்பு
+TypeContact_commande_external_CUSTOMER=வாடிக்கையாளரைத் தொடர்புகொள்ளவும்
+TypeContact_order_supplier_internal_SALESREPFOLL=பிரதிநிதி தொடர்ந்து கொள்முதல் ஆர்டர்
+TypeContact_order_supplier_internal_SHIPPING=பிரதிநிதி பின்தொடர்தல் ஷிப்பிங்
+TypeContact_order_supplier_external_BILLING=விற்பனையாளர் விலைப்பட்டியல் தொடர்பு
+TypeContact_order_supplier_external_SHIPPING=விற்பனையாளர் ஷிப்பிங் தொடர்பு
+TypeContact_order_supplier_external_CUSTOMER=விற்பனையாளர் தொடர்ந்து ஆர்டரைத் தொடர்பு கொள்ளவும்
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=நிலையான COMMANDE_SUPPLIER_ADDON வரையறுக்கப்படவில்லை
+Error_COMMANDE_ADDON_NotDefined=நிலையான COMMANDE_ADDON வரையறுக்கப்படவில்லை
+Error_OrderNotChecked=விலைப்பட்டியலுக்கான ஆர்டர்கள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை
+# Order modes (how we receive order). Not the "why" are keys stored into dict.lang
+OrderByMail=அஞ்சல்
+OrderByFax=தொலைநகல்
+OrderByEMail=மின்னஞ்சல்
+OrderByWWW=நிகழ்நிலை
+OrderByPhone=தொலைபேசி
+# Documents models
+PDFEinsteinDescription=ஒரு முழுமையான வரிசை மாதிரி (எரடோஸ்தீன் டெம்ப்ளேட்டின் பழைய செயலாக்கம்)
+PDFEratostheneDescription=ஒரு முழுமையான ஆர்டர் மாதிரி
+PDFEdisonDescription=ஒரு எளிய ஆர்டர் மாதிரி
+PDFProformaDescription=ஒரு முழுமையான ப்ரோஃபார்மா இன்வாய்ஸ் டெம்ப்ளேட்
+CreateInvoiceForThisCustomer=பில் ஆர்டர்கள்
+CreateInvoiceForThisSupplier=பில் ஆர்டர்கள்
+CreateInvoiceForThisReceptions=பில் வரவேற்புகள்
+NoOrdersToInvoice=ஆர்டர்கள் எதுவும் பில் செய்ய முடியாது
+CloseProcessedOrdersAutomatically=தேர்ந்தெடுக்கப்பட்ட அனைத்து ஆர்டர்களையும் "செயலாக்கப்பட்டது" என்று வகைப்படுத்தவும்.
+OrderCreation=ஆர்டர் உருவாக்கம்
+Ordered=உத்தரவிட்டார்
+OrderCreated=உங்கள் ஆர்டர்கள் உருவாக்கப்பட்டன
+OrderFail=உங்கள் ஆர்டர்களை உருவாக்கும் போது பிழை ஏற்பட்டது
+CreateOrders=ஆர்டர்களை உருவாக்கவும்
+ToBillSeveralOrderSelectCustomer=பல ஆர்டர்களுக்கான விலைப்பட்டியல் உருவாக்க, முதலில் வாடிக்கையாளரைக் கிளிக் செய்து, பின்னர் "%s" என்பதைத் தேர்ந்தெடுக்கவும்.
+OptionToSetOrderBilledNotEnabled=மாட்யூல் வொர்க்ஃப்ளோவில் இருந்து, இன்வாய்ஸ் சரிபார்க்கப்படும்போது, ஆர்டரைத் தானாக 'பில்' என அமைக்க, இயக்கப்படவில்லை, எனவே விலைப்பட்டியல் உருவாக்கப்பட்ட பிறகு, ஆர்டர்களின் நிலையை கைமுறையாக 'பில்' என அமைக்க வேண்டும்.
+IfValidateInvoiceIsNoOrderStayUnbilled=விலைப்பட்டியல் சரிபார்ப்பு 'இல்லை' எனில், விலைப்பட்டியல் சரிபார்க்கப்படும் வரை ஆர்டர் 'பில் செய்யப்படாதது' என்ற நிலையிலேயே இருக்கும்.
+CloseReceivedSupplierOrdersAutomatically=அனைத்து தயாரிப்புகளும் பெறப்பட்டால், ஆர்டரை தானாகவே "%s" நிலைக்கு மூடவும்.
+SetShippingMode=ஷிப்பிங் பயன்முறையை அமைக்கவும்
+WithReceptionFinished=வரவேற்பு முடிந்ததும்
+#### supplier orders status
+StatusSupplierOrderCanceledShort=ரத்து செய்யப்பட்டது
+StatusSupplierOrderDraftShort=வரைவு
+StatusSupplierOrderValidatedShort=சரிபார்க்கப்பட்டது
+StatusSupplierOrderSentShort=செயல்பாட்டில்
+StatusSupplierOrderSent=ஏற்றுமதி செயல்பாட்டில் உள்ளது
+StatusSupplierOrderOnProcessShort=உத்தரவிட்டார்
+StatusSupplierOrderProcessedShort=செயலாக்கப்பட்டது
+StatusSupplierOrderDelivered=வழங்கப்பட்டது
+StatusSupplierOrderDeliveredShort=வழங்கப்பட்டது
+StatusSupplierOrderToBillShort=வழங்கப்பட்டது
+StatusSupplierOrderApprovedShort=அங்கீகரிக்கப்பட்டது
+StatusSupplierOrderRefusedShort=மறுத்தார்
+StatusSupplierOrderToProcessShort=செயலாக்க
+StatusSupplierOrderReceivedPartiallyShort=ஓரளவு பெறப்பட்டது
+StatusSupplierOrderReceivedAllShort=பெறப்பட்ட தயாரிப்புகள்
+StatusSupplierOrderCanceled=ரத்து செய்யப்பட்டது
+StatusSupplierOrderDraft=வரைவு (சரிபார்க்கப்பட வேண்டும்)
+StatusSupplierOrderValidated=சரிபார்க்கப்பட்டது
+StatusSupplierOrderOnProcess=ஆர்டர் செய்யப்பட்டது - காத்திருப்பு வரவேற்பு
+StatusSupplierOrderOnProcessWithValidation=ஆர்டர் செய்யப்பட்டது - காத்திருப்பு வரவேற்பு அல்லது சரிபார்ப்பு
+StatusSupplierOrderProcessed=செயலாக்கப்பட்டது
+StatusSupplierOrderToBill=வழங்கப்பட்டது
+StatusSupplierOrderApproved=அங்கீகரிக்கப்பட்டது
+StatusSupplierOrderRefused=மறுத்தார்
+StatusSupplierOrderReceivedPartially=ஓரளவு பெறப்பட்டது
+StatusSupplierOrderReceivedAll=அனைத்து தயாரிப்புகளும் பெறப்பட்டன
diff --git a/htdocs/langs/ta_IN/other.lang b/htdocs/langs/ta_IN/other.lang
new file mode 100644
index 00000000000..eb761084e38
--- /dev/null
+++ b/htdocs/langs/ta_IN/other.lang
@@ -0,0 +1,305 @@
+# Dolibarr language file - Source file is en_US - other
+SecurityCode=பாதுகாப்பு குறியீடு
+NumberingShort=N°
+Tools=கருவிகள்
+TMenuTools=கருவிகள்
+ToolsDesc=மற்ற மெனு உள்ளீடுகளில் சேர்க்கப்படாத அனைத்து கருவிகளும் இங்கே தொகுக்கப்பட்டுள்ளன. <br> இடது மெனு வழியாக அனைத்து கருவிகளையும் அணுகலாம்.
+Birthday=பிறந்தநாள்
+BirthdayAlertOn=பிறந்தநாள் எச்சரிக்கை செயலில் உள்ளது
+BirthdayAlertOff=பிறந்தநாள் எச்சரிக்கை செயலற்றது
+TransKey=விசை TransKey இன் மொழிபெயர்ப்பு
+MonthOfInvoice=விலைப்பட்டியல் தேதியின் மாதம் (எண் 1-12).
+TextMonthOfInvoice=விலைப்பட்டியல் தேதியின் மாதம் (உரை).
+PreviousMonthOfInvoice=விலைப்பட்டியல் தேதியின் முந்தைய மாதம் (எண் 1-12).
+TextPreviousMonthOfInvoice=விலைப்பட்டியல் தேதியின் முந்தைய மாதம் (உரை).
+NextMonthOfInvoice=விலைப்பட்டியல் தேதியின் அடுத்த மாதம் (எண் 1-12).
+TextNextMonthOfInvoice=விலைப்பட்டியல் தேதியின் அடுத்த மாதம் (உரை).
+PreviousMonth=சென்ற மாதம்
+CurrentMonth=நடப்பு மாதம்
+ZipFileGeneratedInto=ஜிப் கோப்பு <b> %s </b> இல் உருவாக்கப்பட்டது.
+DocFileGeneratedInto=ஆவணக் கோப்பு <b> %s </b> இல் உருவாக்கப்பட்டது.
+JumpToLogin=துண்டிக்கப்பட்டது. உள்நுழைவு பக்கத்திற்கு செல்க...
+MessageForm=ஆன்லைன் கட்டண படிவத்தில் செய்தி
+MessageOK=சரிபார்க்கப்பட்ட கட்டணத்திற்கு திரும்பும் பக்கத்தில் செய்தி அனுப்பவும்
+MessageKO=ரத்துசெய்யப்பட்ட கட்டணத்திற்கு திரும்பும் பக்கத்தில் செய்தி அனுப்பவும்
+ContentOfDirectoryIsNotEmpty=இந்த கோப்பகத்தின் உள்ளடக்கம் காலியாக இல்லை.
+DeleteAlsoContentRecursively=எல்லா உள்ளடக்கத்தையும் மீண்டும் மீண்டும் நீக்குவதைச் சரிபார்க்கவும்
+PoweredBy=மூலம் இயக்கப்படுகிறது
+YearOfInvoice=விலைப்பட்டியல் தேதியின் ஆண்டு
+PreviousYearOfInvoice=முந்தைய ஆண்டு விலைப்பட்டியல் தேதி
+NextYearOfInvoice=விலைப்பட்டியல் தேதியின் அடுத்த ஆண்டு
+DateNextInvoiceBeforeGen=அடுத்த விலைப்பட்டியல் தேதி (தலைமுறைக்கு முன்)
+DateNextInvoiceAfterGen=அடுத்த விலைப்பட்டியல் தேதி (தலைமுறைக்குப் பிறகு)
+GraphInBarsAreLimitedToNMeasures=கிராபிக்ஸ் 'பார்கள்' பயன்முறையில் %s அளவீடுகளுக்கு மட்டுமே. அதற்குப் பதிலாக 'கோடுகள்' பயன்முறை தானாகவே தேர்ந்தெடுக்கப்பட்டது.
+OnlyOneFieldForXAxisIsPossible=X-Axis ஆக தற்போது 1 புலம் மட்டுமே சாத்தியமாகும். முதலில் தேர்ந்தெடுக்கப்பட்ட புலம் மட்டுமே தேர்ந்தெடுக்கப்பட்டது.
+AtLeastOneMeasureIsRequired=அளவிடுவதற்கு குறைந்தபட்சம் 1 புலம் தேவை
+AtLeastOneXAxisIsRequired=X-Axis க்கு குறைந்தது 1 புலம் தேவை
+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=தலையீட்டில் தொடர்பு சேர்க்கப்பட்டது
+Notify_FICHINTER_SENTBYMAIL=தலையீடு அஞ்சல் மூலம் அனுப்பப்பட்டது
+Notify_SHIPPING_VALIDATE=ஷிப்பிங் சரிபார்க்கப்பட்டது
+Notify_SHIPPING_SENTBYMAIL=அஞ்சல் மூலம் அனுப்பப்படும் கப்பல்
+Notify_MEMBER_VALIDATE=உறுப்பினர் சரிபார்க்கப்பட்டது
+Notify_MEMBER_MODIFY=உறுப்பினர் மாற்றப்பட்டார்
+Notify_MEMBER_SUBSCRIPTION=உறுப்பினர் குழுசேர்ந்தார்
+Notify_MEMBER_RESILIATE=உறுப்பினர் நீக்கப்பட்டார்
+Notify_MEMBER_DELETE=உறுப்பினர் நீக்கப்பட்டார்
+Notify_PROJECT_CREATE=திட்ட உருவாக்கம்
+Notify_TASK_CREATE=பணி உருவாக்கப்பட்டது
+Notify_TASK_MODIFY=பணி மாற்றப்பட்டது
+Notify_TASK_DELETE=பணி நீக்கப்பட்டது
+Notify_EXPENSE_REPORT_VALIDATE=செலவு அறிக்கை சரிபார்க்கப்பட்டது (அனுமதி தேவை)
+Notify_EXPENSE_REPORT_APPROVE=செலவு அறிக்கை அங்கீகரிக்கப்பட்டது
+Notify_HOLIDAY_VALIDATE=விடுப்பு கோரிக்கை சரிபார்க்கப்பட்டது (அனுமதி தேவை)
+Notify_HOLIDAY_APPROVE=விடுப்பு கோரிக்கை அங்கீகரிக்கப்பட்டது
+Notify_ACTION_CREATE=நிகழ்ச்சி நிரலில் செயல் சேர்க்கப்பட்டது
+SeeModuleSetup=தொகுதி %s அமைப்பைப் பார்க்கவும்
+NbOfAttachedFiles=இணைக்கப்பட்ட கோப்புகள்/ஆவணங்களின் எண்ணிக்கை
+TotalSizeOfAttachedFiles=இணைக்கப்பட்ட கோப்புகள்/ஆவணங்களின் மொத்த அளவு
+MaxSize=அதிகபட்ச அளவு
+AttachANewFile=புதிய கோப்பு/ஆவணத்தை இணைக்கவும்
+LinkedObject=இணைக்கப்பட்ட பொருள்
+NbOfActiveNotifications=அறிவிப்புகளின் எண்ணிக்கை (பெறுநர் மின்னஞ்சல்களின் எண்ணிக்கை)
+PredefinedMailTest=__(வணக்கம்)__\nஇது __EMAIL__ க்கு அனுப்பப்பட்ட சோதனை அஞ்சல்.\nஒரு வண்டி திரும்புவதன் மூலம் கோடுகள் பிரிக்கப்படுகின்றன.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(வணக்கம்)__ <br> இது <b> சோதனை </b> அஞ்சல் __EMAIL__ க்கு அனுப்பப்பட்டது (வார்த்தை சோதனை தடிமனாக இருக்க வேண்டும்). <br> கோடுகள் ஒரு கேரேஜ் ரிட்டர்ன் மூலம் பிரிக்கப்படுகின்றன. <br> <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=பண மேசையுடன் ஒரு கடையை நிர்வகிக்கவும்
+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=மி.கி
+WeightUnitpound=பவுண்டு
+WeightUnitounce=அவுன்ஸ்
+Length=நீளம்
+LengthUnitm=மீ
+LengthUnitdm=dm
+LengthUnitcm=செ.மீ
+LengthUnitmm=மிமீ
+Surface=பகுதி
+SurfaceUnitm2=மீ²
+SurfaceUnitdm2=dm²
+SurfaceUnitcm2=செமீ²
+SurfaceUnitmm2=மிமீ²
+SurfaceUnitfoot2=அடி²
+SurfaceUnitinch2=in²
+Volume=தொகுதி
+VolumeUnitm3=m³
+VolumeUnitdm3=dm³ (L)
+VolumeUnitcm3=செமீ³ (மிலி)
+VolumeUnitmm3=mm³ (µl)
+VolumeUnitfoot3=அடி³
+VolumeUnitinch3=in³
+VolumeUnitounce=அவுன்ஸ்
+VolumeUnitlitre=லிட்டர்
+VolumeUnitgallon=கேலன்
+SizeUnitm=மீ
+SizeUnitdm=dm
+SizeUnitcm=செ.மீ
+SizeUnitmm=மிமீ
+SizeUnitinch=அங்குலம்
+SizeUnitfoot=கால்
+SizeUnitpoint=புள்ளி
+BugTracker=பிழை கண்காணிப்பான்
+SendNewPasswordDesc=இந்தப் படிவம் புதிய கடவுச்சொல்லைக் கோர உங்களை அனுமதிக்கிறது. இது உங்கள் மின்னஞ்சல் முகவரிக்கு அனுப்பப்படும். <br> மின்னஞ்சலில் உள்ள உறுதிப்படுத்தல் இணைப்பைக் கிளிக் செய்தவுடன் மாற்றம் நடைமுறைக்கு வரும். <br> உங்கள் இன்பாக்ஸைச் சரிபார்க்கவும்.
+BackToLoginPage=உள்நுழைவு பக்கத்திற்குத் திரும்பு
+AuthenticationDoesNotAllowSendNewPassword=அங்கீகார முறை <b> %s </b> . <br> இந்த பயன்முறையில், Dolibarr உங்கள் கடவுச்சொல்லை அறியவோ மாற்றவோ முடியாது. <br> உங்கள் கடவுச்சொல்லை மாற்ற விரும்பினால், உங்கள் கணினி நிர்வாகியைத் தொடர்பு கொள்ளவும்.
+EnableGDLibraryDesc=இந்த விருப்பத்தைப் பயன்படுத்த உங்கள் PHP நிறுவலில் GD நூலகத்தை நிறுவவும் அல்லது இயக்கவும்.
+ProfIdShortDesc= <b> Prof Id %s </b> என்பது மூன்றாம் தரப்பு நாட்டைச் சார்ந்தது. <br> எடுத்துக்காட்டாக, நாட்டிற்கு <b> %s </b> , இது குறியீடு <b> a0ecb2ec87f4907f49018
+DolibarrDemo=டோலிபார் ஈஆர்பி/சிஆர்எம் டெமோ
+StatsByNumberOfUnits=பொருட்கள்/சேவைகளின் qty தொகைக்கான புள்ளிவிவரங்கள்
+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=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=உங்கள் கடவுச்சொல் வெற்றிகரமாக மீட்டமைக்கப்பட்டது
+ApplicantIpAddress=விண்ணப்பதாரரின் ஐபி முகவரி
+SMSSentTo=%s க்கு SMS அனுப்பப்பட்டது
+MissingIds=ஐடிகள் இல்லை
+ThirdPartyCreatedByEmailCollector=MSGID %s மின்னஞ்சலில் இருந்து மின்னஞ்சல் சேகரிப்பாளரால் உருவாக்கப்பட்ட மூன்றாம் தரப்பு
+ContactCreatedByEmailCollector=MSGID %s மின்னஞ்சலில் இருந்து மின்னஞ்சல் சேகரிப்பாளரால் உருவாக்கப்பட்ட தொடர்பு/முகவரி
+ProjectCreatedByEmailCollector=MSGID %s என்ற மின்னஞ்சலில் இருந்து மின்னஞ்சல் சேகரிப்பாளரால் உருவாக்கப்பட்டது
+TicketCreatedByEmailCollector=MSGID %s மின்னஞ்சலில் இருந்து மின்னஞ்சல் சேகரிப்பாளரால் உருவாக்கப்பட்ட டிக்கெட்
+OpeningHoursFormatDesc=திறக்கும் மற்றும் மூடும் நேரத்தைப் பிரிக்க a - ஐப் பயன்படுத்தவும். <br> வெவ்வேறு வரம்புகளை உள்ளிட ஸ்பேஸைப் பயன்படுத்தவும். <br> எடுத்துக்காட்டு: 8-12 14-18
+SuffixSessionName=அமர்வு பெயருக்கான பின்னொட்டு
+LoginWith=Login with %s
+
+##### Export #####
+ExportsArea=ஏற்றுமதி பகுதி
+AvailableFormats=கிடைக்கக்கூடிய வடிவங்கள்
+LibraryUsed=நூலகம் பயன்படுத்தப்பட்டது
+LibraryVersion=நூலக பதிப்பு
+ExportableDatas=ஏற்றுமதி செய்யக்கூடிய தரவு
+NoExportableData=ஏற்றுமதி செய்யக்கூடிய தரவு இல்லை (ஏற்றுமதி செய்யக்கூடிய தரவு ஏற்றப்பட்ட அல்லது விடுபட்ட அனுமதிகள் கொண்ட தொகுதிகள் இல்லை)
+##### External sites #####
+WebsiteSetup=தொகுதி வலைத்தளத்தின் அமைப்பு
+WEBSITE_PAGEURL=பக்கத்தின் URL
+WEBSITE_TITLE=தலைப்பு
+WEBSITE_DESCRIPTION=விளக்கம்
+WEBSITE_IMAGE=படம்
+WEBSITE_IMAGEDesc=பட ஊடகத்தின் தொடர்புடைய பாதை. இது அரிதாகவே பயன்படுத்தப்படுவதால் இதை காலியாக வைக்கலாம் (வலைப்பதிவு இடுகைகளின் பட்டியலில் சிறுபடத்தைக் காட்ட டைனமிக் உள்ளடக்கத்தால் இதைப் பயன்படுத்தலாம்). இணையதளத்தின் பெயரைப் பொறுத்து பாதை இருந்தால், பாதையில் __WEBSITE_KEY__ ஐப் பயன்படுத்தவும் (எடுத்துக்காட்டாக: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_KEYWORDS=முக்கிய வார்த்தைகள்
+LinesToImport=இறக்குமதி செய்ய வேண்டிய கோடுகள்
+
+MemoryUsage=நினைவக பயன்பாடு
+RequestDuration=கோரிக்கையின் காலம்
+ProductsPerPopularity=பிரபலத்தின் அடிப்படையில் தயாரிப்புகள்/சேவைகள்
+PopuProp=முன்மொழிவுகளில் பிரபலமான தயாரிப்புகள்/சேவைகள்
+PopuCom=ஆர்டர்களில் பிரபலமான தயாரிப்புகள்/சேவைகள்
+ProductStatistics=தயாரிப்புகள்/சேவைகள் புள்ளிவிவரங்கள்
+NbOfQtyInOrders=ஆர்டர்களில் அளவு
+SelectTheTypeOfObjectToAnalyze=ஒரு பொருளின் புள்ளிவிவரங்களைக் காண அதைத் தேர்ந்தெடுக்கவும்...
+
+ConfirmBtnCommonContent = "%s" நிச்சயமாக விரும்புகிறீர்களா?
+ConfirmBtnCommonTitle = உங்கள் செயலை உறுதிப்படுத்தவும்
+CloseDialog = நெருக்கமான
diff --git a/htdocs/langs/ta_IN/partnership.lang b/htdocs/langs/ta_IN/partnership.lang
new file mode 100644
index 00000000000..4c3006923e1
--- /dev/null
+++ b/htdocs/langs/ta_IN/partnership.lang
@@ -0,0 +1,92 @@
+# 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=கூட்டு மேலாண்மை
+PartnershipDescription=தொகுதி கூட்டாண்மை மேலாண்மை
+PartnershipDescriptionLong= தொகுதி கூட்டாண்மை மேலாண்மை
+Partnership=கூட்டு
+AddPartnership=கூட்டாண்மையைச் சேர்க்கவும்
+CancelPartnershipForExpiredMembers=கூட்டாண்மை: காலாவதியான சந்தாக்களைக் கொண்ட உறுப்பினர்களின் கூட்டாண்மையை ரத்துசெய்யவும்
+PartnershipCheckBacklink=கூட்டாண்மை: பின்னிணைப்பைக் குறிப்பிடுவதைச் சரிபார்க்கவும்
+
+#
+# Menu
+#
+NewPartnership=புதிய கூட்டாண்மை
+ListOfPartnerships=கூட்டாண்மை பட்டியல்
+
+#
+# Admin page
+#
+PartnershipSetup=கூட்டாண்மை அமைப்பு
+PartnershipAbout=கூட்டாண்மை பற்றி
+PartnershipAboutPage=பக்கத்தைப் பற்றிய கூட்டாண்மை
+partnershipforthirdpartyormember=கூட்டாளர் நிலையை 'மூன்றாம் தரப்பினர்' அல்லது 'உறுப்பினர்' என அமைக்க வேண்டும்
+PARTNERSHIP_IS_MANAGED_FOR=கூட்டாண்மை நிர்வகிக்கப்படுகிறது
+PARTNERSHIP_BACKLINKS_TO_CHECK=சரிபார்க்க பின்னிணைப்புகள்
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=சந்தா காலாவதியாகிவிட்டால், பார்ட்னர்ஷிப்பின் நிலையை ரத்து செய்வதற்கு முந்தைய நாட்களின் Nb
+ReferingWebsiteCheck=இணையதளம் குறிப்பிடுவதை சரிபார்க்கவும்
+ReferingWebsiteCheckDesc=உங்கள் பங்குதாரர்கள் தங்கள் சொந்த இணையதளத்தில் உங்கள் இணையதள டொமைன்களில் பின்னிணைப்பைச் சேர்த்துள்ளார்களா என்பதைச் சரிபார்க்க ஒரு அம்சத்தை நீங்கள் இயக்கலாம்.
+
+#
+# Object
+#
+DeletePartnership=கூட்டாண்மையை நீக்கவும்
+PartnershipDedicatedToThisThirdParty=கூட்டு இந்த மூன்றாம் தரப்பினருக்கு அர்ப்பணிக்கப்பட்டது
+PartnershipDedicatedToThisMember=கூட்டாண்மை இந்த உறுப்பினருக்கு அர்ப்பணிக்கப்பட்டுள்ளது
+DatePartnershipStart=தொடக்க தேதி
+DatePartnershipEnd=கடைசி தேதி
+ReasonDecline=காரணம் மறுக்கவும்
+ReasonDeclineOrCancel=காரணம் மறுக்கவும்
+PartnershipAlreadyExist=கூட்டாண்மை ஏற்கனவே உள்ளது
+ManagePartnership=கூட்டாண்மையை நிர்வகிக்கவும்
+BacklinkNotFoundOnPartnerWebsite=கூட்டாளர் இணையதளத்தில் பின்னிணைப்பு இல்லை
+ConfirmClosePartnershipAsk=இந்தக் கூட்டாண்மையை நிச்சயமாக ரத்துசெய்ய விரும்புகிறீர்களா?
+PartnershipType=கூட்டு வகை
+PartnershipRefApproved=கூட்டாண்மை %s அங்கீகரிக்கப்பட்டது
+
+#
+# Template Mail
+#
+SendingEmailOnPartnershipWillSoonBeCanceled=பார்ட்னர்ஷிப் விரைவில் ரத்து செய்யப்படும்
+SendingEmailOnPartnershipRefused=கூட்டு மறுத்தது
+SendingEmailOnPartnershipAccepted=கூட்டாண்மை ஏற்றுக்கொள்ளப்பட்டது
+SendingEmailOnPartnershipCanceled=பார்ட்னர்ஷிப் ரத்து செய்யப்பட்டது
+
+YourPartnershipWillSoonBeCanceledTopic=பார்ட்னர்ஷிப் விரைவில் ரத்து செய்யப்படும்
+YourPartnershipRefusedTopic=கூட்டு மறுத்தது
+YourPartnershipAcceptedTopic=கூட்டாண்மை ஏற்றுக்கொள்ளப்பட்டது
+YourPartnershipCanceledTopic=பார்ட்னர்ஷிப் ரத்து செய்யப்பட்டது
+
+YourPartnershipWillSoonBeCanceledContent=உங்கள் பார்ட்னர்ஷிப் விரைவில் ரத்து செய்யப்படும் என்பதை உங்களுக்குத் தெரிவிக்கிறோம் (பின் இணைப்பு கிடைக்கவில்லை)
+YourPartnershipRefusedContent=உங்கள் கூட்டாண்மை கோரிக்கை நிராகரிக்கப்பட்டது என்பதை நாங்கள் உங்களுக்குத் தெரிவிக்கிறோம்.
+YourPartnershipAcceptedContent=உங்களின் கூட்டாண்மைக் கோரிக்கை ஏற்கப்பட்டது என்பதைத் தெரிவிக்கிறோம்.
+YourPartnershipCanceledContent=உங்கள் பார்ட்னர்ஷிப் ரத்துசெய்யப்பட்டதைத் தெரிவிக்கிறோம்.
+
+CountLastUrlCheckError=கடைசி URL சரிபார்ப்புக்கான பிழைகளின் எண்ணிக்கை
+LastCheckBacklink=கடைசியாக URL சரிபார்த்த தேதி
+ReasonDeclineOrCancel=காரணம் மறுக்கவும்
+
+#
+# Status
+#
+PartnershipDraft=வரைவு
+PartnershipAccepted=ஏற்றுக் கொள்ளப்பட்டது
+PartnershipRefused=மறுத்தார்
+PartnershipCanceled=ரத்து செய்யப்பட்டது
+PartnershipManagedFor=பங்குதாரர்கள்
diff --git a/htdocs/langs/ta_IN/paybox.lang b/htdocs/langs/ta_IN/paybox.lang
new file mode 100644
index 00000000000..e1fc2f3e1bb
--- /dev/null
+++ b/htdocs/langs/ta_IN/paybox.lang
@@ -0,0 +1,30 @@
+# 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=Dolibarr பொருள்களில் பணம் செலுத்த வாடிக்கையாளருக்கு ஒரு பக்கத்தை வழங்க பின்வரும் URLகள் உள்ளன
+PaymentForm=பணம் செலுத்தும் படிவம்
+WelcomeOnPaymentPage=எங்கள் ஆன்லைன் கட்டண சேவைக்கு வரவேற்கிறோம்
+ThisScreenAllowsYouToPay=%s க்கு ஆன்லைனில் பணம் செலுத்த இந்தத் திரை உங்களை அனுமதிக்கிறது.
+ThisIsInformationOnPayment=பணம் செலுத்துவது பற்றிய தகவல் இது
+ToComplete=முடிக்க
+YourEMail=கட்டண உறுதிப்படுத்தலைப் பெற மின்னஞ்சல்
+Creditor=கடன் கொடுத்தவர்
+PaymentCode=கட்டணக் குறியீடு
+PayBoxDoPayment=Paybox மூலம் பணம் செலுத்துங்கள்
+YouWillBeRedirectedOnPayBox=கிரெடிட் கார்டு தகவலை உள்ளிட, பாதுகாப்பான பேபாக்ஸ் பக்கத்தில் நீங்கள் திருப்பி விடப்படுவீர்கள்
+Continue=அடுத்தது
+SetupPayBoxToHavePaymentCreatedAutomatically=Paybox மூலம் சரிபார்க்கப்படும் போது தானாகவே பணம் உருவாக்கப்படும் வகையில் உங்கள் Paybox ஐ url <b> %s </b> உடன் அமைக்கவும்.
+YourPaymentHasBeenRecorded=உங்கள் கட்டணம் பதிவுசெய்யப்பட்டதை இந்தப் பக்கம் உறுதிப்படுத்துகிறது. நன்றி.
+YourPaymentHasNotBeenRecorded=உங்கள் பணம் பதிவு செய்யப்படவில்லை மற்றும் பரிவர்த்தனை ரத்து செய்யப்பட்டது. நன்றி.
+AccountParameter=கணக்கு அளவுருக்கள்
+UsageParameter=பயன்பாட்டு அளவுருக்கள்
+InformationToFindParameters=உங்கள் %s கணக்குத் தகவலைக் கண்டறிய உதவுங்கள்
+PAYBOX_CGI_URL_V2=பணம் செலுத்துவதற்கான Paybox CGI தொகுதியின் Url
+CSSUrlForPaymentForm=கட்டண படிவத்திற்கான CSS நடை தாள் url
+NewPayboxPaymentReceived=புதிய பேபாக்ஸ் கட்டணம் பெறப்பட்டது
+NewPayboxPaymentFailed=புதிய பேபாக்ஸ் கட்டணம் செலுத்த முயற்சிக்கப்பட்டது ஆனால் தோல்வியடைந்தது
+PAYBOX_PAYONLINE_SENDEMAIL=பணம் செலுத்தும் முயற்சிக்குப் பிறகு மின்னஞ்சல் அறிவிப்பு (வெற்றி அல்லது தோல்வி)
+PAYBOX_PBX_SITE=PBX SITEக்கான மதிப்பு
+PAYBOX_PBX_RANG=PBX Rangக்கான மதிப்பு
+PAYBOX_PBX_IDENTIFIANT=PBX ஐடிக்கான மதிப்பு
+PAYBOX_HMAC_KEY=HMAC விசை
diff --git a/htdocs/langs/ta_IN/paypal.lang b/htdocs/langs/ta_IN/paypal.lang
new file mode 100644
index 00000000000..c59295ad4e6
--- /dev/null
+++ b/htdocs/langs/ta_IN/paypal.lang
@@ -0,0 +1,36 @@
+# 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> வழியாக பணம் செலுத்த அனுமதிக்கிறது. இது தற்காலிக கட்டணத்திற்கு அல்லது டோலிபார் பொருள் தொடர்பான கட்டணத்திற்கு (விலைப்பட்டியல், ஆர்டர், ...) பயன்படுத்தப்படலாம்.
+PaypalOrCBDoPayment=பேபால் (அட்டை அல்லது பேபால்) மூலம் பணம் செலுத்துங்கள்
+PaypalDoPayment=பேபால் மூலம் பணம் செலுத்துங்கள்
+PAYPAL_API_SANDBOX=முறை சோதனை/சாண்ட்பாக்ஸ்
+PAYPAL_API_USER=API பயனர்பெயர்
+PAYPAL_API_PASSWORD=API கடவுச்சொல்
+PAYPAL_API_SIGNATURE=API கையொப்பம்
+PAYPAL_SSLVERSION=கர்ல் SSL பதிப்பு
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY="ஒருங்கிணைந்த" கட்டணம் (கிரெடிட் கார்டு+பேபால்) அல்லது "பேபால்" மட்டும்
+PaypalModeIntegral=ஒருங்கிணைந்த
+PaypalModeOnlyPaypal=பேபால் மட்டும்
+ONLINE_PAYMENT_CSS_URL=ஆன்லைன் கட்டணப் பக்கத்தில் CSS ஸ்டைல்ஷீட்டின் விருப்ப URL
+ThisIsTransactionId=இது பரிவர்த்தனையின் ஐடி: <b> %s </b>
+PAYPAL_ADD_PAYMENT_URL=மின்னஞ்சல் மூலம் ஆவணத்தை அனுப்பும்போது PayPal கட்டண urlஐச் சேர்க்கவும்
+NewOnlinePaymentReceived=புதிய ஆன்லைன் கட்டணம் பெறப்பட்டது
+NewOnlinePaymentFailed=புதிய ஆன்லைன் பேமெண்ட் முயற்சி தோல்வியடைந்தது
+ONLINE_PAYMENT_SENDEMAIL=ஒவ்வொரு கட்டண முயற்சிக்குப் பிறகும் அறிவிப்புகளுக்கான மின்னஞ்சல் முகவரி (வெற்றி மற்றும் தோல்விக்கு)
+ReturnURLAfterPayment=பணம் செலுத்திய பிறகு URL ஐத் திருப்பி அனுப்பவும்
+ValidationOfOnlinePaymentFailed=ஆன்லைன் கட்டணத்தைச் சரிபார்க்க முடியவில்லை
+PaymentSystemConfirmPaymentPageWasCalledButFailed=கட்டண முறைமையால் பேமெண்ட் உறுதிப்படுத்தல் பக்கம் அழைக்கப்பட்டது பிழை ஏற்பட்டது
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API அழைப்பு தோல்வியடைந்தது.
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API அழைப்பு தோல்வியடைந்தது.
+DetailedErrorMessage=விரிவான பிழைச் செய்தி
+ShortErrorMessage=சுருக்கமான பிழைச் செய்தி
+ErrorCode=பிழை குறியீடு
+ErrorSeverityCode=பிழை தீவிரம் குறியீடு
+OnlinePaymentSystem=ஆன்லைன் கட்டண முறை
+PaypalLiveEnabled=பேபால் "லைவ்" பயன்முறை இயக்கப்பட்டது (இல்லையெனில் சோதனை/சாண்ட்பாக்ஸ் பயன்முறை)
+PaypalImportPayment=PayPal கட்டணங்களை இறக்குமதி செய்யவும்
+PostActionAfterPayment=பணம் செலுத்திய பிறகு செயல்களை இடுகையிடவும்
+ARollbackWasPerformedOnPostActions=எல்லாப் போஸ்ட் செயல்களிலும் திரும்பப்பெறுதல் செய்யப்பட்டது. இடுகைச் செயல்கள் தேவைப்பட்டால் அவற்றை நீங்கள் கைமுறையாக முடிக்க வேண்டும்.
+ValidationOfPaymentFailed=கட்டணச் சரிபார்ப்பு தோல்வியடைந்தது
+CardOwner=அட்டை வைத்திருப்பவர்
+PayPalBalance=பேபால் கடன்
diff --git a/htdocs/langs/ta_IN/printing.lang b/htdocs/langs/ta_IN/printing.lang
new file mode 100644
index 00000000000..3c11ad4d712
--- /dev/null
+++ b/htdocs/langs/ta_IN/printing.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - printing
+Module64000Name=ஒரு கிளிக் அச்சிடுதல்
+Module64000Desc=ஒரு கிளிக் பிரிண்டிங் சிஸ்டத்தை இயக்கவும்
+PrintingSetup=ஒரு கிளிக் பிரிண்டிங் சிஸ்டத்தின் அமைவு
+PrintingDesc=இந்த தொகுதி பல்வேறு தொகுதிகளில் ஒரு அச்சு பொத்தானைச் சேர்க்கிறது, மேலும் ஆவணங்களை மற்றொரு பயன்பாட்டில் திறக்க வேண்டிய அவசியம் இல்லாமல் ஒரு பிரிண்டரில் நேரடியாக ஆவணங்களை அச்சிட அனுமதிக்கிறது.
+MenuDirectPrinting=ஒரே கிளிக்கில் அச்சிடும் வேலைகள்
+DirectPrint=ஒரே கிளிக்கில் அச்சிடவும்
+PrintingDriverDesc=இயக்கி அச்சிடுவதற்கான கட்டமைப்பு மாறிகள்.
+ListDrivers=ஓட்டுனர்களின் பட்டியல்
+PrintTestDesc=அச்சுப்பொறிகளின் பட்டியல்.
+FileWasSentToPrinter=கோப்பு %s பிரிண்டருக்கு அனுப்பப்பட்டது
+ViaModule=தொகுதி வழியாக
+NoActivePrintingModuleFound=ஆவணத்தை அச்சிட செயலில் இயக்கி இல்லை. தொகுதி %s அமைப்பைச் சரிபார்க்கவும்.
+PleaseSelectaDriverfromList=பட்டியலிலிருந்து ஒரு இயக்கியைத் தேர்ந்தெடுக்கவும்.
+PleaseConfigureDriverfromList=பட்டியலிலிருந்து தேர்ந்தெடுக்கப்பட்ட இயக்கியை உள்ளமைக்கவும்.
+SetupDriver=இயக்கி அமைப்பு
+TargetedPrinter=இலக்கு அச்சுப்பொறி
+UserConf=ஒரு பயனருக்கு அமைவு
+PRINTGCP_INFO=Google OAuth API அமைவு
+PRINTGCP_AUTHLINK=அங்கீகார
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth டோக்கன்
+PrintGCPDesc=இந்த இயக்கி Google Cloud Print ஐப் பயன்படுத்தி நேரடியாக ஒரு பிரிண்டருக்கு ஆவணங்களை அனுப்ப அனுமதிக்கிறது.
+GCP_Name=பெயர்
+GCP_displayName=காட்சி பெயர்
+GCP_Id=பிரிண்டர் ஐடி
+GCP_OwnerName=உரிமையாளரின் பெயர்
+GCP_State=அச்சுப்பொறி நிலை
+GCP_connectionStatus=ஆன்லைன் மாநிலம்
+GCP_Type=அச்சுப்பொறி வகை
+PrintIPPDesc=இந்த இயக்கி ஆவணங்களை நேரடியாக பிரிண்டருக்கு அனுப்ப அனுமதிக்கிறது. இதற்கு CUPS நிறுவப்பட்ட லினக்ஸ் அமைப்பு தேவை.
+PRINTIPP_HOST=அச்சு சர்வர்
+PRINTIPP_PORT=துறைமுகம்
+PRINTIPP_USER=உள்நுழைய
+PRINTIPP_PASSWORD=கடவுச்சொல்
+NoDefaultPrinterDefined=இயல்புநிலை அச்சுப்பொறி வரையறுக்கப்படவில்லை
+DefaultPrinter=இயல்புநிலை அச்சுப்பொறி
+Printer=அச்சுப்பொறி
+IPP_Uri=அச்சுப்பொறி உரி
+IPP_Name=அச்சுப்பொறி பெயர்
+IPP_State=அச்சுப்பொறி நிலை
+IPP_State_reason=மாநில காரணம்
+IPP_State_reason1=மாநில காரணம்1
+IPP_BW=BW
+IPP_Color=நிறம்
+IPP_Device=சாதனம்
+IPP_Media=அச்சு ஊடகம்
+IPP_Supported=ஊடக வகை
+DirectPrintingJobsDesc=கிடைக்கக்கூடிய அச்சுப்பொறிகளுக்கான அச்சிடும் வேலைகளை இந்தப் பக்கம் பட்டியலிடுகிறது.
+GoogleAuthNotConfigured=Google OAuth அமைக்கப்படவில்லை. தொகுதி OAuth ஐ இயக்கி, Google ஐடி/ரகசியத்தை அமைக்கவும்.
+GoogleAuthConfigured=OAuth தொகுதியின் அமைப்பில் Google OAuth நற்சான்றிதழ்கள் கண்டறியப்பட்டன.
+PrintingDriverDescprintgcp=இயக்கி Google Cloud Print ஐ அச்சிடுவதற்கான கட்டமைப்பு மாறிகள்.
+PrintingDriverDescprintipp=இயக்கி கோப்பைகளை அச்சிடுவதற்கான கட்டமைப்பு மாறிகள்.
+PrintTestDescprintgcp=Google Cloud Printக்கான பிரிண்டர்களின் பட்டியல்.
+PrintTestDescprintipp=கோப்பைகளுக்கான பிரிண்டர்களின் பட்டியல்.
diff --git a/htdocs/langs/ta_IN/productbatch.lang b/htdocs/langs/ta_IN/productbatch.lang
new file mode 100644
index 00000000000..97a834ca319
--- /dev/null
+++ b/htdocs/langs/ta_IN/productbatch.lang
@@ -0,0 +1,45 @@
+# ProductBATCH language file - Source file is en_US - ProductBATCH
+ManageLotSerial=நிறைய/வரிசை எண்ணைப் பயன்படுத்தவும்
+ProductStatusOnBatch=ஆம் (நிறைய தேவை)
+ProductStatusOnSerial=ஆம் (தனிப்பட்ட வரிசை எண் தேவை)
+ProductStatusNotOnBatch=இல்லை (நிறைய/தொடர் பயன்படுத்தப்படவில்லை)
+ProductStatusOnBatchShort=நிறைய
+ProductStatusOnSerialShort=தொடர்
+ProductStatusNotOnBatchShort=இல்லை
+Batch=நிறைய/தொடர்
+atleast1batchfield=உண்ணும் தேதி அல்லது விற்பனை தேதி அல்லது லாட்/வரிசை எண்
+batch_number=நிறைய/வரிசை எண்
+BatchNumberShort=நிறைய/தொடர்
+EatByDate=தேதி வாரியாக சாப்பிடுங்கள்
+SellByDate=விற்பனை தேதி
+DetailBatchNumber=நிறைய/தொடர் விவரங்கள்
+printBatch=நிறைய/தொடர்: %s
+printEatby=சாப்பிடு: %s
+printSellby=விற்பனை மூலம்: %s
+printQty=அளவு: %d
+AddDispatchBatchLine=ஷெல்ஃப் லைஃப் அனுப்புவதற்கு ஒரு வரியைச் சேர்க்கவும்
+WhenProductBatchModuleOnOptionAreForced=தொகுதி லாட்/சீரியல் இயக்கத்தில் இருக்கும்போது, தானியங்கி பங்கு குறைப்பு 'ஷிப்பிங் சரிபார்ப்பில் உண்மையான பங்குகளை குறைக்க வேண்டும்' மற்றும் தானியங்கு அதிகரிப்பு பயன்முறையானது 'கிடங்குகளுக்கு கைமுறையாக அனுப்பும் போது உண்மையான பங்குகளை அதிகரிக்க வேண்டும்' மற்றும் திருத்த முடியாது. மற்ற விருப்பங்களை நீங்கள் விரும்பியபடி வரையறுக்கலாம்.
+ProductDoesNotUseBatchSerial=இந்தத் தயாரிப்பு நிறைய/வரிசை எண்ணைப் பயன்படுத்துவதில்லை
+ProductLotSetup=தொகுதி நிறைய/தொடர் அமைப்பு
+ShowCurrentStockOfLot=ஜோடி தயாரிப்பு/லாட்டிற்கான தற்போதைய இருப்பைக் காட்டு
+ShowLogOfMovementIfLot=ஜோடி தயாரிப்பு/லாட்டிற்கான இயக்கங்களின் பதிவைக் காட்டு
+StockDetailPerBatch=லாட்டிற்கு பங்கு விவரம்
+SerialNumberAlreadyInUse=%s என்ற வரிசை எண் ஏற்கனவே தயாரிப்பு %sக்கு பயன்படுத்தப்பட்டது
+TooManyQtyForSerialNumber=%s என்ற வரிசை எண்ணுக்கு நீங்கள் ஒரே ஒரு தயாரிப்பு %s மட்டுமே வைத்திருக்க முடியும்
+ManageLotMask=தனிப்பயன் முகமூடி
+CustomMasks=ஒவ்வொரு தயாரிப்புக்கும் வெவ்வேறு எண்ணிங் முகமூடியை வரையறுக்க விருப்பம்
+BatchLotNumberingModules=லாட் எண்ணை தானாக உருவாக்குவதற்கான எண் விதி
+BatchSerialNumberingModules=வரிசை எண்ணை தானாக உருவாக்குவதற்கான எண்ணிடல் விதி (ஒவ்வொரு தயாரிப்புக்கும் 1 தனிப்பட்ட லாட்/சீரியல் சொத்து உள்ள தயாரிப்புகளுக்கு)
+QtyToAddAfterBarcodeScan=ஸ்கேன் செய்யப்பட்ட ஒவ்வொரு பார்கோடு/லாட்/சீரியலுக்கும் Qty முதல் %s வரை
+LifeTime=ஆயுட்காலம் (நாட்களில்)
+EndOfLife=வாழ்க்கையின் முடிவு
+ManufacturingDate=தயாரிக்கப்பட்ட தேதி
+DestructionDate=அழிவு தேதி
+FirstUseDate=முதல் பயன்பாட்டு தேதி
+QCFrequency=தரக் கட்டுப்பாடு அதிர்வெண் (நாட்களில்)
+ShowAllLots=அனைத்து நிறைய காட்டு
+HideLots=நிறைய மறை
+#Traceability - qc status
+OutOfOrder=ஒழுங்கற்றது
+InWorkingOrder=வேலை வரிசையில்
+ToReplace=மாற்றவும்
diff --git a/htdocs/langs/ta_IN/products.lang b/htdocs/langs/ta_IN/products.lang
new file mode 100644
index 00000000000..93368950736
--- /dev/null
+++ b/htdocs/langs/ta_IN/products.lang
@@ -0,0 +1,413 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=தயாரிப்பு குறிப்பு.
+ProductLabel=தயாரிப்பு லேபிள்
+ProductLabelTranslated=மொழிபெயர்க்கப்பட்ட தயாரிப்பு லேபிள்
+ProductDescription=தயாரிப்பு விளக்கம்
+ProductDescriptionTranslated=மொழிபெயர்க்கப்பட்ட தயாரிப்பு விளக்கம்
+ProductNoteTranslated=மொழிபெயர்க்கப்பட்ட தயாரிப்பு குறிப்பு
+ProductServiceCard=தயாரிப்புகள்/சேவைகள் அட்டை
+TMenuProducts=தயாரிப்புகள்
+TMenuServices=சேவைகள்
+Products=தயாரிப்புகள்
+Services=சேவைகள்
+Product=தயாரிப்பு
+Service=சேவை
+ProductId=தயாரிப்பு/சேவை ஐடி
+Create=உருவாக்கு
+Reference=குறிப்பு
+NewProduct=புதிய தயாரிப்பு
+NewService=புதிய சேவை
+ProductVatMassChange=உலகளாவிய VAT புதுப்பிப்பு
+ProductVatMassChangeDesc=இந்தக் கருவி <b> <u> ALL </u> </b> தயாரிப்புகள் மற்றும் சேவைகளில் வரையறுக்கப்பட்ட VAT விகிதத்தைப் புதுப்பிக்கிறது!
+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=%s குறிப்புடன் ஒரு தயாரிப்பு ஏற்கனவே உள்ளது.
+ErrorProductBadRefOrLabel=குறிப்பு அல்லது லேபிளின் தவறான மதிப்பு.
+ErrorProductClone=தயாரிப்பு அல்லது சேவையை குளோன் செய்ய முயற்சிக்கும்போது சிக்கல் ஏற்பட்டது.
+ErrorPriceCantBeLowerThanMinPrice=பிழை, குறைந்தபட்ச விலையை விட விலை குறைவாக இருக்கக்கூடாது.
+Suppliers=விற்பனையாளர்கள்
+SupplierRef=விற்பனையாளர் SKU
+ShowProduct=தயாரிப்பைக் காட்டு
+ShowService=சேவையைக் காட்டு
+ProductsAndServicesArea=தயாரிப்பு மற்றும் சேவைகள் பகுதி
+ProductsArea=தயாரிப்பு பகுதி
+ServicesArea=சேவைகள் பகுதி
+ListOfStockMovements=பங்கு இயக்கங்களின் பட்டியல்
+BuyingPrice=வாங்கும் விலை
+PriceForEachProduct=குறிப்பிட்ட விலையில் தயாரிப்புகள்
+SupplierCard=விற்பனையாளர் அட்டை
+PriceRemoved=விலை நீக்கப்பட்டது
+BarCode=பார்கோடு
+BarcodeType=பார்கோடு வகை
+SetDefaultBarcodeType=பார்கோடு வகையை அமைக்கவும்
+BarcodeValue=பார்கோடு மதிப்பு
+NoteNotVisibleOnBill=குறிப்பு (இன்வாய்ஸ்கள், முன்மொழிவுகளில் தெரியவில்லை...)
+ServiceLimitedDuration=தயாரிப்பு குறைந்த கால அளவு கொண்ட சேவையாக இருந்தால்:
+FillWithLastServiceDates=கடைசி சேவை வரி தேதிகளை நிரப்பவும்
+MultiPricesAbility=ஒரு தயாரிப்பு/சேவைக்கு பல விலைப் பிரிவுகள் (ஒவ்வொரு வாடிக்கையாளரும் ஒரு விலைப் பிரிவில்)
+MultiPricesNumPrices=விலைகளின் எண்ணிக்கை
+DefaultPriceType=புதிய விற்பனை விலைகளைச் சேர்க்கும்போது இயல்புநிலைக்கான விலைகளின் அடிப்படை (வரி இல்லாமல்).
+AssociatedProductsAbility=கருவிகளை இயக்கு (பல தயாரிப்புகளின் தொகுப்பு)
+VariantsAbility=மாறுபாடுகளை இயக்கு (தயாரிப்புகளின் மாறுபாடுகள், எடுத்துக்காட்டாக நிறம், அளவு)
+AssociatedProducts=கருவிகள்
+AssociatedProductsNumber=இந்த தொகுப்பை உருவாக்கும் தயாரிப்புகளின் எண்ணிக்கை
+ParentProductsNumber=பெற்றோர் பேக்கேஜிங் தயாரிப்புகளின் எண்ணிக்கை
+ParentProducts=பெற்றோர் தயாரிப்புகள்
+IfZeroItIsNotAVirtualProduct=0 என்றால், இந்த தயாரிப்பு ஒரு கிட் அல்ல
+IfZeroItIsNotUsedByVirtualProduct=0 என்றால், இந்த தயாரிப்பு எந்த கிட் மூலமாகவும் பயன்படுத்தப்படாது
+KeywordFilter=முக்கிய வடிப்பான்
+CategoryFilter=வகை வடிகட்டி
+ProductToAddSearch=சேர்க்க தயாரிப்பு தேடவும்
+NoMatchFound=பொருத்தம் எதுவும் இல்லை
+ListOfProductsServices=தயாரிப்புகள்/சேவைகளின் பட்டியல்
+ProductAssociationList=இந்த கிட்டின் கூறு(கள்) தயாரிப்புகள்/சேவைகளின் பட்டியல்
+ProductParentList=இந்த தயாரிப்பை ஒரு அங்கமாக கொண்ட கருவிகளின் பட்டியல்
+ErrorAssociationIsFatherOfThis=தேர்ந்தெடுக்கப்பட்ட தயாரிப்புகளில் ஒன்று தற்போதைய தயாரிப்பின் பெற்றோர் ஆகும்
+DeleteProduct=ஒரு தயாரிப்பு/சேவையை நீக்கவும்
+ConfirmDeleteProduct=இந்த தயாரிப்பு/சேவையை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+ProductDeleted=தயாரிப்பு/சேவை "%s" தரவுத்தளத்திலிருந்து நீக்கப்பட்டது.
+ExportDataset_produit_1=தயாரிப்புகள்
+ExportDataset_service_1=சேவைகள்
+ImportDataset_produit_1=தயாரிப்புகள்
+ImportDataset_service_1=சேவைகள்
+DeleteProductLine=தயாரிப்பு வரியை நீக்கு
+ConfirmDeleteProductLine=இந்தத் தயாரிப்பு வரிசையை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+ProductSpecial=சிறப்பு
+QtyMin=குறைந்தபட்சம் கொள்முதல் அளவு
+PriceQtyMin=விலை அளவு நிமிடம்.
+PriceQtyMinCurrency=இந்த qtyக்கான விலை (நாணயம்). (தள்ளுபடி இல்லை)
+VATRateForSupplierProduct=VAT விகிதம் (இந்த விற்பனையாளர்/தயாரிப்பு)
+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=Ref. புதிய தயாரிப்பு/சேவை
+SellingPrices=விற்பனை விலை
+BuyingPrices=விலைகளை வாங்குதல்
+CustomerPrices=வாடிக்கையாளர் விலைகள்
+SuppliersPrices=விற்பனையாளர் விலை
+SuppliersPricesOfProductsOrServices=விற்பனையாளர் விலைகள் (பொருட்கள் அல்லது சேவைகள்)
+CustomCode=சுங்கம்|பண்டம்|HS குறியீடு
+CountryOrigin=பிறந்த நாடு
+RegionStateOrigin=பிறப்பிடமான பகுதி
+StateOrigin=மாநிலம்|பிறந்த மாகாணம்
+Nature=பொருளின் தன்மை (பச்சை/உற்பத்தி)
+NatureOfProductShort=உற்பத்தியின் தன்மை
+NatureOfProductDesc=மூலப்பொருள் அல்லது தயாரிக்கப்பட்ட தயாரிப்பு
+ShortLabel=குறுகிய லேபிள்
+Unit=அலகு
+p=u.
+set=அமைக்கப்பட்டது
+se=அமைக்கப்பட்டது
+second=இரண்டாவது
+s=கள்
+hour=மணி
+h=ம
+day=நாள்
+d=ஈ
+kilogram=கிலோகிராம்
+kg=கி.கி
+gram=கிராம்
+g=g
+meter=மீட்டர்
+m=மீ
+lm=lm
+m2=மீ²
+m3=m³
+liter=லிட்டர்
+l=எல்
+unitP=துண்டு
+unitSET=அமைக்கவும்
+unitS=இரண்டாவது
+unitH=மணி
+unitD=நாள்
+unitG=கிராம்
+unitM=மீட்டர்
+unitLM=நேரியல் மீட்டர்
+unitM2=சதுர மீட்டர்
+unitM3=கன மீட்டர்
+unitL=லிட்டர்
+unitT=டன்
+unitKG=கிலோ
+unitG=கிராம்
+unitMG=மி.கி
+unitLB=பவுண்டு
+unitOZ=அவுன்ஸ்
+unitM=மீட்டர்
+unitDM=dm
+unitCM=செ.மீ
+unitMM=மிமீ
+unitFT=அடி
+unitIN=உள்ளே
+unitM2=சதுர மீட்டர்
+unitDM2=dm²
+unitCM2=செமீ²
+unitMM2=மிமீ²
+unitFT2=அடி²
+unitIN2=in²
+unitM3=கன மீட்டர்
+unitDM3=dm³
+unitCM3=செமீ³
+unitMM3=மிமீ³
+unitFT3=அடி³
+unitIN3=in³
+unitOZ3=அவுன்ஸ்
+unitgallon=கேலன்
+ProductCodeModel=தயாரிப்பு குறிப்பு டெம்ப்ளேட்
+ServiceCodeModel=சேவை குறிப்பு டெம்ப்ளேட்
+CurrentProductPrice=தற்போதைய விலை
+AlwaysUseNewPrice=தயாரிப்பு/சேவையின் தற்போதைய விலையை எப்போதும் பயன்படுத்தவும்
+AlwaysUseFixedPrice=நிலையான விலையைப் பயன்படுத்தவும்
+PriceByQuantity=அளவின் அடிப்படையில் வெவ்வேறு விலைகள்
+DisablePriceByQty=அளவின்படி விலைகளை முடக்கு
+PriceByQuantityRange=அளவு வரம்பு
+MultipriceRules=பிரிவுக்கான தானியங்கி விலைகள்
+UseMultipriceRules=முதல் பிரிவின்படி மற்ற எல்லாப் பிரிவுகளின் விலைகளையும் தானாகக் கணக்கிட, விலைப் பிரிவு விதிகளைப் பயன்படுத்தவும் (தயாரிப்பு தொகுதி அமைப்பில் வரையறுக்கப்பட்டுள்ளது)
+PercentVariationOver=%% மாறுபாடு %s
+PercentDiscountOver=%s மீது %% தள்ளுபடி
+KeepEmptyForAutoCalculation=எடை அல்லது தயாரிப்புகளின் அளவிலிருந்து தானாகக் கணக்கிடப்படுவதற்கு, காலியாக இருங்கள்
+VariantRefExample=எடுத்துக்காட்டுகள்: COL, SIZE
+VariantLabelExample=எடுத்துக்காட்டுகள்: நிறம், அளவு
+### composition fabrication
+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=<b> #extrafield_myextrafieldkey# </b> போன்ற மாறிகள் மூலம் ExtraFields ஐ அணுகலாம் மற்றும் <b> #global_mycode# a09a4b78zf உடன் உலகளாவிய மாறிகள்
+PriceExpressionEditorHelp3=தயாரிப்பு/சேவை மற்றும் விற்பனையாளர் விலைகள் இரண்டிலும் இந்த மாறிகள் கிடைக்கின்றன: <br> <b> #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #priceam_30901min#
+PriceExpressionEditorHelp4=தயாரிப்பு/சேவையின் விலையில் மட்டும்: <b> #supplier_min_price# </b> <br> விற்பனையாளர் விலையில் மட்டும்: <b> #supplier_quantity# andt3_zupplier# a901901
+PriceExpressionEditorHelp5=கிடைக்கக்கூடிய உலகளாவிய மதிப்புகள்:
+PriceMode=விலை முறை
+PriceNumeric=எண்
+DefaultPrice=இயல்புநிலை விலை
+DefaultPriceLog=முந்தைய இயல்புநிலை விலைகளின் பதிவு
+ComposedProductIncDecStock=பெற்றோர் மாற்றத்தில் பங்குகளை அதிகரிக்கவும்/குறைக்கவும்
+ComposedProduct=குழந்தை தயாரிப்புகள்
+MinSupplierPrice=குறைந்தபட்ச கொள்முதல் விலை
+MinCustomerPrice=குறைந்தபட்ச விற்பனை விலை
+NoDynamicPrice=டைனமிக் விலை இல்லை
+DynamicPriceConfiguration=டைனமிக் விலை கட்டமைப்பு
+DynamicPriceDesc=வாடிக்கையாளர் அல்லது விற்பனையாளர் விலைகளைக் கணக்கிட கணித சூத்திரங்களை நீங்கள் வரையறுக்கலாம். இத்தகைய சூத்திரங்கள் அனைத்து கணித ஆபரேட்டர்கள், சில மாறிலிகள் மற்றும் மாறிகள் ஆகியவற்றைப் பயன்படுத்தலாம். நீங்கள் பயன்படுத்த விரும்பும் மாறிகளை இங்கே வரையறுக்கலாம். மாறிக்கு தானியங்கி புதுப்பிப்பு தேவைப்பட்டால், மதிப்பை தானாக புதுப்பிக்க Dolibarr ஐ அனுமதிக்க வெளிப்புற URL ஐ நீங்கள் வரையறுக்கலாம்.
+AddVariable=மாறியைச் சேர்க்கவும்
+AddUpdater=புதுப்பிப்பைச் சேர்க்கவும்
+GlobalVariables=உலகளாவிய மாறிகள்
+VariableToUpdate=புதுப்பிக்க மாறக்கூடியது
+GlobalVariableUpdaters=மாறிகளுக்கான வெளிப்புற புதுப்பிப்புகள்
+GlobalVariableUpdaterType0=JSON தரவு
+GlobalVariableUpdaterHelp0=குறிப்பிட்ட URL இலிருந்து JSON தரவைப் பாகுபடுத்துகிறது, VALUE தொடர்புடைய மதிப்பின் இருப்பிடத்தைக் குறிப்பிடுகிறது,
+GlobalVariableUpdaterHelpFormat0=கோரிக்கைக்கான வடிவமைப்பு {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService தரவு
+GlobalVariableUpdaterHelp1=குறிப்பிட்ட URL இலிருந்து WebService தரவைப் பாகுபடுத்துகிறது, NS பெயர்வெளியைக் குறிப்பிடுகிறது, VALUE தொடர்புடைய மதிப்பின் இருப்பிடத்தைக் குறிப்பிடுகிறது, தரவு அனுப்புவதற்கான தரவைக் கொண்டிருக்க வேண்டும் மற்றும் METHOD என்பது WS அழைப்பு முறை
+GlobalVariableUpdaterHelpFormat1=கோரிக்கைக்கான வடிவம் {"URL": "http://example.com/urlofws", "VALUE": "array, targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+UpdateInterval=புதுப்பிப்பு இடைவெளி (நிமிடங்கள்)
+LastUpdated=சமீபத்திய புதுப்பிப்பு
+CorrectlyUpdated=சரியாக புதுப்பிக்கப்பட்டது
+PropalMergePdfProductActualFile=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=மாறுபட்ட பண்புக்கூறுகள்
+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=நிறைய மாறுபாடுகளை உருவாக்குவது அதிக CPU, நினைவக பயன்பாடு மற்றும் 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=கட்டாய காலங்கள்
+mandatoryPeriodNeedTobeSet=குறிப்பு: காலம் (தொடக்க மற்றும் முடிவு தேதி) வரையறுக்கப்பட வேண்டும்
+mandatoryPeriodNeedTobeSetMsgValidate=ஒரு சேவைக்கு தொடக்க மற்றும் முடிவு காலம் தேவை
+mandatoryHelper=இந்தச் சேவையில் தொடக்க மற்றும் இறுதித் தேதியை உள்ளிடாமல் விலைப்பட்டியல், வணிக முன்மொழிவு, விற்பனை ஆர்டரை உருவாக்கும்போது/சரிபார்க்கும்போது பயனருக்குச் செய்தி அனுப்ப வேண்டுமெனில் இதைச் சரிபார்க்கவும். <br> செய்தி ஒரு எச்சரிக்கை மற்றும் தடுக்கும் பிழை அல்ல என்பதை நினைவில் கொள்ளவும்.
+DefaultBOM=இயல்புநிலை BOM
+DefaultBOMDesc=இந்த தயாரிப்பைத் தயாரிக்க, இயல்புநிலை BOM பயன்படுத்த பரிந்துரைக்கப்படுகிறது. தயாரிப்பின் தன்மை '%s' ஆக இருந்தால் மட்டுமே இந்தப் புலத்தை அமைக்க முடியும்.
+Rank=தரவரிசை
+SwitchOnSaleStatus=விற்பனை நிலையை இயக்கவும்
+SwitchOnPurchaseStatus=கொள்முதல் நிலையை இயக்கவும்
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ta_IN/projects.lang b/htdocs/langs/ta_IN/projects.lang
new file mode 100644
index 00000000000..8072dd3b0a8
--- /dev/null
+++ b/htdocs/langs/ta_IN/projects.lang
@@ -0,0 +1,289 @@
+# Dolibarr language file - Source file is en_US - projects
+RefProject=Ref. திட்டம்
+ProjectRef=திட்ட குறிப்பு.
+ProjectId=திட்ட ஐடி
+ProjectLabel=திட்ட முத்திரை
+ProjectsArea=திட்டங்கள் பகுதி
+ProjectStatus=திட்ட நிலை
+SharedProject=எல்லோரும்
+PrivateProject=திட்ட தொடர்புகள்
+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=பணி குறிப்பு.
+LabelTask=பணி முத்திரை
+TaskTimeSpent=பணிகளில் செலவிடும் நேரம்
+TaskTimeUser=பயனர்
+TaskTimeNote=குறிப்பு
+TaskTimeDate=தேதி
+TasksOnOpenedProject=திறந்த திட்டங்களில் பணிகள்
+WorkloadNotDefined=பணிச்சுமை வரையறுக்கப்படவில்லை
+NewTimeSpent=செலவிட்ட நேரம்
+MyTimeSpent=என் நேரம் கழிந்தது
+BillTime=செலவழித்த நேரத்தை பில் செய்யுங்கள்
+BillTimeShort=பில் நேரம்
+TimeToBill=நேரம் கட்டணம் விதிக்கப்படவில்லை
+TimeBilled=நேரம் கட்டப்பட்டது
+Tasks=பணிகள்
+Task=பணி
+TaskDateStart=பணி தொடங்கும் தேதி
+TaskDateEnd=பணி முடிவு தேதி
+TaskDescription=பணி விளக்கம்
+NewTask=புதிய பணி
+AddTask=பணியை உருவாக்கவும்
+AddTimeSpent=செலவழித்த நேரத்தை உருவாக்குங்கள்
+AddHereTimeSpentForDay=இந்த நாள்/பணிக்காக செலவழித்த நேரத்தை இங்கே சேர்க்கவும்
+AddHereTimeSpentForWeek=இந்த வாரம்/பணிக்காக செலவழித்த நேரத்தை இங்கே சேர்க்கவும்
+Activity=செயல்பாடு
+Activities=பணிகள்/செயல்பாடுகள்
+MyActivities=எனது பணிகள்/செயல்பாடுகள்
+MyProjects=எனது திட்டங்கள்
+MyProjectsArea=எனது திட்டப்பணிகள் பகுதி
+DurationEffective=பயனுள்ள காலம்
+ProgressDeclared=உண்மையான முன்னேற்றத்தை அறிவித்தார்
+TaskProgressSummary=பணி முன்னேற்றம்
+CurentlyOpenedTasks=தற்போது திறந்திருக்கும் பணிகள்
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=அறிவிக்கப்பட்ட உண்மையான முன்னேற்றம் நுகர்வு முன்னேற்றத்தை விட %s குறைவாக உள்ளது
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=அறிவிக்கப்பட்ட உண்மையான முன்னேற்றம் நுகர்வு முன்னேற்றத்தை விட %s அதிகம்
+ProgressCalculated=நுகர்வில் முன்னேற்றம்
+WhichIamLinkedTo=நான் இணைக்கப்பட்டவை
+WhichIamLinkedToProject=நான் திட்டத்துடன் இணைக்கப்பட்டுள்ளேன்
+Time=நேரம்
+TimeConsumed=நுகரப்படும்
+ListOfTasks=பணிகளின் பட்டியல்
+GoToListOfTimeConsumed=செலவழித்த நேரத்தின் பட்டியலுக்குச் செல்லவும்
+GanttView=காண்ட் பார்வை
+ListWarehouseAssociatedProject=திட்டத்துடன் தொடர்புடைய கிடங்குகளின் பட்டியல்
+ListProposalsAssociatedProject=திட்டத்துடன் தொடர்புடைய வணிக முன்மொழிவுகளின் பட்டியல்
+ListOrdersAssociatedProject=திட்டத்துடன் தொடர்புடைய விற்பனை ஆர்டர்களின் பட்டியல்
+ListInvoicesAssociatedProject=திட்டத்துடன் தொடர்புடைய வாடிக்கையாளர் இன்வாய்ஸ்களின் பட்டியல்
+ListPredefinedInvoicesAssociatedProject=திட்டத்துடன் தொடர்புடைய வாடிக்கையாளர் டெம்ப்ளேட் இன்வாய்ஸ்களின் பட்டியல்
+ListSupplierOrdersAssociatedProject=திட்டத்துடன் தொடர்புடைய கொள்முதல் ஆர்டர்களின் பட்டியல்
+ListSupplierInvoicesAssociatedProject=திட்டத்துடன் தொடர்புடைய விற்பனையாளர் இன்வாய்ஸ்களின் பட்டியல்
+ListContractAssociatedProject=திட்டத்துடன் தொடர்புடைய ஒப்பந்தங்களின் பட்டியல்
+ListShippingAssociatedProject=திட்டத்துடன் தொடர்புடைய கப்பல்களின் பட்டியல்
+ListFichinterAssociatedProject=திட்டத்துடன் தொடர்புடைய தலையீடுகளின் பட்டியல்
+ListExpenseReportsAssociatedProject=திட்டத்துடன் தொடர்புடைய செலவு அறிக்கைகளின் பட்டியல்
+ListDonationsAssociatedProject=திட்டத்துடன் தொடர்புடைய நன்கொடைகளின் பட்டியல்
+ListVariousPaymentsAssociatedProject=திட்டத்துடன் தொடர்புடைய பல்வேறு கொடுப்பனவுகளின் பட்டியல்
+ListSalariesAssociatedProject=திட்டத்துடன் தொடர்புடைய சம்பளங்களின் பட்டியல்
+ListActionsAssociatedProject=திட்டத்துடன் தொடர்புடைய நிகழ்வுகளின் பட்டியல்
+ListMOAssociatedProject=திட்டத்துடன் தொடர்புடைய உற்பத்தி ஆர்டர்களின் பட்டியல்
+ListTaskTimeUserProject=திட்டத்தின் பணிகளில் செலவழிக்கப்பட்ட நேரத்தின் பட்டியல்
+ListTaskTimeForTask=பணியில் செலவழித்த நேரத்தின் பட்டியல்
+ActivityOnProjectToday=இன்று திட்டத்தின் செயல்பாடு
+ActivityOnProjectYesterday=திட்டத்தின் செயல்பாடு நேற்று
+ActivityOnProjectThisWeek=இந்த வாரம் திட்டத்தின் செயல்பாடு
+ActivityOnProjectThisMonth=இந்த மாதம் திட்டத்தின் செயல்பாடு
+ActivityOnProjectThisYear=இந்த ஆண்டு திட்டத்தின் செயல்பாடு
+ChildOfProjectTask=திட்டம்/பணியின் குழந்தை
+ChildOfTask=பணியின் குழந்தை
+TaskHasChild=பணிக்கு குழந்தை உள்ளது
+NotOwnerOfProject=இந்த தனிப்பட்ட திட்டத்தின் உரிமையாளர் அல்ல
+AffectedTo=க்கு ஒதுக்கப்பட்டது
+CantRemoveProject=வேறு சில பொருட்களால் (இன்வாய்ஸ், ஆர்டர்கள் அல்லது பிற) குறிப்பிடப்பட்டுள்ளதால், இந்தத் திட்டத்தை அகற்ற முடியாது. '%s' தாவலைப் பார்க்கவும்.
+ValidateProject=திட்டத்தை சரிபார்க்கவும்
+ConfirmValidateProject=இந்தத் திட்டத்தைச் சரிபார்க்க விரும்புகிறீர்களா?
+CloseAProject=திட்டத்தை மூடவும்
+ConfirmCloseAProject=இந்தத் திட்டத்தை நிச்சயமாக மூட விரும்புகிறீர்களா?
+AlsoCloseAProject=திட்டத்தையும் மூடவும் (நீங்கள் இன்னும் அதில் உற்பத்தி பணிகளைப் பின்பற்ற வேண்டும் என்றால், அதைத் திறந்து வைக்கவும்)
+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=எதிர் எடையுள்ள அளவு
+OpportunityAmountAverageShort=சராசரி ஈய அளவு
+OpportunityAmountWeigthedShort=எடையிடப்பட்ட ஈய அளவு
+WonLostExcluded=வெற்றி/தோல்வி விலக்கப்பட்டது
+##### Types de contacts #####
+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=இணைக்கப்பட்ட பொருள்களின் மேலோட்டத்திற்கான திட்ட ஆவண டெம்ப்ளேட்
+DocumentModelBaleine=பணிகளுக்கான திட்ட ஆவண டெம்ப்ளேட்
+DocumentModelTimeSpent=செலவழித்த நேரத்திற்கான திட்ட அறிக்கை டெம்ப்ளேட்
+PlannedWorkload=திட்டமிட்ட பணிச்சுமை
+PlannedWorkloadShort=பணிச்சுமை
+ProjectReferers=சார்ந்த பொருட்கள்
+ProjectMustBeValidatedFirst=திட்டம் முதலில் சரிபார்க்கப்பட வேண்டும்
+FirstAddRessourceToAllocateTime=நேரத்தை ஒதுக்குவதற்கு ஒரு பயனர் ஆதாரத்தை திட்டத்தின் தொடர்பாக ஒதுக்கவும்
+InputPerDay=ஒரு நாளைக்கு உள்ளீடு
+InputPerWeek=வாரத்திற்கு உள்ளீடு
+InputPerMonth=மாதத்திற்கு உள்ளீடு
+InputDetail=உள்ளீடு விவரம்
+TimeAlreadyRecorded=இந்தப் பணி/நாள் மற்றும் பயனர் %s க்காக ஏற்கனவே பதிவுசெய்யப்பட்ட நேரம் இது
+ProjectsWithThisUserAsContact=இந்தப் பயனரைத் தொடர்பு கொண்ட திட்டப்பணிகள்
+ProjectsWithThisContact=Projects with this contact
+TasksWithThisUserAsContact=இந்தப் பயனருக்கு ஒதுக்கப்பட்ட பணிகள்
+ResourceNotAssignedToProject=திட்டத்திற்கு ஒதுக்கப்படவில்லை
+ResourceNotAssignedToTheTask=பணிக்கு ஒதுக்கப்படவில்லை
+NoUserAssignedToTheProject=இந்த திட்டத்திற்கு பயனர்கள் யாரும் ஒதுக்கப்படவில்லை
+TimeSpentBy=செலவழித்த நேரம்
+TasksAssignedTo=ஒதுக்கப்பட்ட பணிகள்
+AssignTaskToMe=பணியை எனக்கே ஒதுக்குங்கள்
+AssignTaskToUser=%sக்கு பணியை ஒதுக்கவும்
+SelectTaskToAssign=ஒதுக்க பணியைத் தேர்ந்தெடுக்கவும்...
+AssignTask=ஒதுக்க
+ProjectOverview=கண்ணோட்டம்
+ManageTasks=பணிகளைப் பின்தொடர மற்றும்/அல்லது செலவழித்த நேரத்தைப் புகாரளிக்க திட்டங்களைப் பயன்படுத்தவும் (நேரத்தாள்கள்)
+ManageOpportunitiesStatus=தடங்கள்/வாய்ப்புகளைப் பின்பற்ற திட்டங்களைப் பயன்படுத்தவும்
+ProjectNbProjectByMonth=மாதவாரியாக உருவாக்கப்பட்ட திட்டங்களின் எண்ணிக்கை
+ProjectNbTaskByMonth=மாதம் மூலம் உருவாக்கப்பட்ட பணிகளின் எண்ணிக்கை
+ProjectOppAmountOfProjectsByMonth=மாதத்திற்கு லீட்களின் அளவு
+ProjectWeightedOppAmountOfProjectsByMonth=மாதந்தோறும் எடையிடப்பட்ட அளவு
+ProjectOpenedProjectByOppStatus=திற திட்டம்|முன்னணி நிலை
+ProjectsStatistics=திட்டங்கள் அல்லது வழித்தடங்களின் புள்ளிவிவரங்கள்
+TasksStatistics=திட்டங்கள் அல்லது வழித்தடங்களின் பணிகள் குறித்த புள்ளிவிவரங்கள்
+TaskAssignedToEnterTime=பணி ஒதுக்கப்பட்டது. இந்த பணியில் நேரத்தை உள்ளிடுவது சாத்தியமாக இருக்க வேண்டும்.
+IdTaskTime=ஐடி பணி நேரம்
+YouCanCompleteRef=நீங்கள் ref ஐ சில பின்னொட்டுகளுடன் முடிக்க விரும்பினால், அதை பிரிக்க ஒரு - எழுத்தைச் சேர்க்க பரிந்துரைக்கப்படுகிறது, எனவே தானியங்கு எண்கள் அடுத்த திட்டங்களுக்கு சரியாக வேலை செய்யும். உதாரணமாக %s-MYSUFFIX
+OpenedProjectsByThirdparties=மூன்றாம் தரப்பினரின் திட்டங்களைத் திறக்கவும்
+OnlyOpportunitiesShort=வழிநடத்துகிறது மட்டுமே
+OpenedOpportunitiesShort=திறந்த வழிகள்
+NotOpenedOpportunitiesShort=வெளிப்படையான முன்னணி அல்ல
+NotAnOpportunityShort=ஒரு முன்னணி அல்ல
+OpportunityTotalAmount=லீட்களின் மொத்த அளவு
+OpportunityPonderatedAmount=லீட்களின் எடையுள்ள அளவு
+OpportunityPonderatedAmountDesc=நிகழ்தகவுடன் கூடிய லீட்ஸ் அளவு
+OppStatusPROSP=எதிர்பார்ப்பு
+OppStatusQUAL=தகுதி
+OppStatusPROPO=முன்மொழிவு
+OppStatusNEGO=பேச்சுவார்த்தை
+OppStatusPENDING=நிலுவையில் உள்ளது
+OppStatusWON=வெற்றி பெற்றது
+OppStatusLOST=இழந்தது
+Budget=பட்ஜெட்
+AllowToLinkFromOtherCompany=மற்ற நிறுவனத்திலிருந்து இணைப்பை திட்டம் அனுமதி <br> <br> <u> ஆதரிக்கப்படும் மதிப்புகள்: </u> <br> - காலியாக வைத்து: நிறுவனம் (இயல்புநிலை) எந்த திட்டம் <br> இணைக்க முடியுமா - "எல்லா": எந்த திட்டங்கள், <br> பிற நிறுவனங்கள் கூட திட்டங்கள் இணைக்க முடியுமா - பட்டியல் காற்புள்ளிகளால் பிரிக்கப்பட்ட மூன்றாம் தரப்பு ஐடிகள்: இந்த மூன்றாம் தரப்பினரின் அனைத்து திட்டப்பணிகளையும் இணைக்க முடியும் (எடுத்துக்காட்டு: 123,4795,53) <br>
+LatestProjects=சமீபத்திய %s திட்டங்கள்
+LatestModifiedProjects=சமீபத்திய %s மாற்றியமைக்கப்பட்ட திட்டங்கள்
+OtherFilteredTasks=பிற வடிகட்டப்பட்ட பணிகள்
+NoAssignedTasks=ஒதுக்கப்பட்ட பணிகள் எதுவும் காணப்படவில்லை (தற்போதைய பயனருக்கு மேல் தேர்ந்தெடுக்கப்பட்ட பெட்டியில் இருந்து நேரத்தை உள்ளிடுவதற்கு திட்டம்/பணிகளை ஒதுக்கவும்)
+ThirdPartyRequiredToGenerateInvoice=மூன்றாம் தரப்பினர் திட்டத்தில் விலைப்பட்டியல் செய்ய வரையறுக்கப்பட வேண்டும்.
+ThirdPartyRequiredToGenerateInvoice=மூன்றாம் தரப்பினர் திட்டத்தில் விலைப்பட்டியல் செய்ய வரையறுக்கப்பட வேண்டும்.
+ChooseANotYetAssignedTask=இதுவரை உங்களுக்கு ஒதுக்கப்படாத பணியைத் தேர்வு செய்யவும்
+# Comments trans
+AllowCommentOnTask=பணிகளில் பயனர் கருத்துகளை அனுமதிக்கவும்
+AllowCommentOnProject=திட்டங்களில் பயனர் கருத்துகளை அனுமதிக்கவும்
+DontHavePermissionForCloseProject=திட்டம் %s ஐ மூட உங்களுக்கு அனுமதி இல்லை
+DontHaveTheValidateStatus=திட்டம் %s மூடப்படுவதற்கு திறந்திருக்க வேண்டும்
+RecordsClosed=%s திட்டம்(கள்) மூடப்பட்டது
+SendProjectRef=தகவல் திட்டம் %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled='சம்பளங்கள்' தொகுதியானது பணியாளர் மணிநேர விகிதத்தை வரையறுக்கச் செயல்படுத்தப்பட வேண்டும்.
+NewTaskRefSuggested=Task ref ஏற்கனவே பயன்படுத்தப்பட்டுள்ளது, ஒரு புதிய பணி குறிப்பு தேவை
+TimeSpentInvoiced=கட்டணம் செலுத்தப்பட்ட நேரம்
+TimeSpentForIntervention=செலவிட்ட நேரம்
+TimeSpentForInvoice=செலவிட்ட நேரம்
+OneLinePerUser=ஒரு பயனருக்கு ஒரு வரி
+ServiceToUseOnLines=வரிகளில் பயன்படுத்த வேண்டிய சேவை
+InvoiceGeneratedFromTimeSpent=திட்டத்தில் செலவழித்த நேரத்திலிருந்து விலைப்பட்டியல் %s உருவாக்கப்பட்டுள்ளது
+InterventionGeneratedFromTimeSpent=தலையீடு %s திட்டத்தில் செலவிடப்பட்ட நேரத்திலிருந்து உருவாக்கப்பட்டுள்ளது
+ProjectBillTimeDescription=திட்டத்தின் பணிகளில் டைம்ஷீட்டை உள்ளிடுகிறீர்களா என்பதைச் சரிபார்த்து, திட்டத்தின் வாடிக்கையாளருக்கு பில் பில் செய்ய டைம்ஷீட்டிலிருந்து விலைப்பட்டியல்(களை) உருவாக்க திட்டமிட்டுள்ளீர்கள் (உள்ளிடப்பட்ட டைம்ஷீட்களின் அடிப்படையில் இல்லாத விலைப்பட்டியலை உருவாக்கத் திட்டமிட்டுள்ளீர்களா எனச் சரிபார்க்க வேண்டாம்). குறிப்பு: விலைப்பட்டியலை உருவாக்க, திட்டத்தின் 'செலவிக்கப்பட்ட நேரம்' தாவலுக்குச் சென்று சேர்க்க வேண்டிய வரிகளைத் தேர்ந்தெடுக்கவும்.
+ProjectFollowOpportunity=வாய்ப்பைப் பின்பற்றுங்கள்
+ProjectFollowTasks=பணிகள் அல்லது செலவழித்த நேரத்தைப் பின்பற்றவும்
+Usage=பயன்பாடு
+UsageOpportunity=பயன்பாடு: வாய்ப்பு
+UsageTasks=பயன்பாடு: பணிகள்
+UsageBillTimeShort=பயன்பாடு: பில் நேரம்
+InvoiceToUse=பயன்படுத்த வரைவு விலைப்பட்டியல்
+InterToUse=பயன்படுத்த வரைவு தலையீடு
+NewInvoice=புதிய விலைப்பட்டியல்
+NewInter=புதிய தலையீடு
+OneLinePerTask=ஒரு பணிக்கு ஒரு வரி
+OneLinePerPeriod=ஒரு காலத்திற்கு ஒரு வரி
+OneLinePerTimeSpentLine=செலவழித்த ஒவ்வொரு முறை அறிவிப்புக்கும் ஒரு வரி
+AddDetailDateAndDuration=வரி விளக்கத்தில் தேதி மற்றும் கால அளவு
+RefTaskParent=Ref. பெற்றோர் பணி
+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=Projects having this contact
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/ta_IN/propal.lang b/htdocs/langs/ta_IN/propal.lang
new file mode 100644
index 00000000000..dd9122c71bb
--- /dev/null
+++ b/htdocs/langs/ta_IN/propal.lang
@@ -0,0 +1,99 @@
+# Dolibarr language file - Source file is en_US - propal
+Proposals=வணிக முன்மொழிவுகள்
+Proposal=வணிக முன்மொழிவு
+ProposalShort=முன்மொழிவு
+ProposalsDraft=வரைவு வணிக முன்மொழிவுகள்
+ProposalsOpened=வணிக முன்மொழிவுகளைத் திறக்கவும்
+CommercialProposal=வணிக முன்மொழிவு
+PdfCommercialProposalTitle=முன்மொழிவு
+ProposalCard=முன்மொழிவு அட்டை
+NewProp=புதிய வணிக முன்மொழிவு
+NewPropal=புதிய முன்மொழிவு
+Prospect=வாய்ப்பு
+DeleteProp=வணிக முன்மொழிவை நீக்கு
+ValidateProp=வணிக முன்மொழிவை சரிபார்க்கவும்
+AddProp=முன்மொழிவை உருவாக்கவும்
+ConfirmDeleteProp=இந்த வணிக முன்மொழிவை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+ConfirmValidateProp=<b> %s </b> என்ற பெயரில் இந்த வணிகத் திட்டத்தைச் சரிபார்க்க விரும்புகிறீர்களா?
+LastPropals=சமீபத்திய %s முன்மொழிவுகள்
+LastModifiedProposals=சமீபத்திய %s திருத்தப்பட்ட முன்மொழிவுகள்
+AllPropals=அனைத்து முன்மொழிவுகள்
+SearchAProposal=ஒரு திட்டத்தைத் தேடுங்கள்
+NoProposal=முன்மொழிவு இல்லை
+ProposalsStatistics=வணிக முன்மொழிவின் புள்ளிவிவரங்கள்
+NumberOfProposalsByMonth=மாதம் எண்
+AmountOfProposalsByMonthHT=மாதத்தின்படி தொகை (வரி தவிர)
+NbOfProposals=வணிக முன்மொழிவுகளின் எண்ணிக்கை
+ShowPropal=முன்மொழிவைக் காட்டு
+PropalsDraft=வரைவுகள்
+PropalsOpened=திற
+PropalStatusDraft=வரைவு (சரிபார்க்கப்பட வேண்டும்)
+PropalStatusValidated=சரிபார்க்கப்பட்டது (முன்மொழிவு திறக்கப்பட்டுள்ளது)
+PropalStatusSigned=கையொப்பமிடப்பட்டது (பில்லிங் தேவை)
+PropalStatusNotSigned=கையொப்பமிடவில்லை (மூடப்பட்டது)
+PropalStatusBilled=கட்டணம் வசூலிக்கப்பட்டது
+PropalStatusDraftShort=வரைவு
+PropalStatusValidatedShort=சரிபார்க்கப்பட்டது (திறந்தது)
+PropalStatusClosedShort=மூடப்பட்டது
+PropalStatusSignedShort=கையெழுத்திட்டது
+PropalStatusNotSignedShort=கையெழுத்திடவில்லை
+PropalStatusBilledShort=கட்டணம் வசூலிக்கப்பட்டது
+PropalsToClose=வணிக முன்மொழிவுகளை மூட வேண்டும்
+PropalsToBill=மசோதாவிற்கு வணிக திட்டங்களில் கையெழுத்திட்டார்
+ListOfProposals=வணிக முன்மொழிவுகளின் பட்டியல்
+ActionsOnPropal=முன்மொழிவில் நிகழ்வுகள்
+RefProposal=வணிக முன்மொழிவு ref
+SendPropalByMail=வணிக முன்மொழிவை அஞ்சல் மூலம் அனுப்பவும்
+DatePropal=முன்மொழிவு தேதி
+DateEndPropal=செல்லுபடியாகும் முடிவு தேதி
+ValidityDuration=செல்லுபடியாகும் காலம்
+SetAcceptedRefused=ஏற்கப்பட்டது/நிராகரித்தது
+ErrorPropalNotFound=Propal %s கிடைக்கவில்லை
+AddToDraftProposals=வரைவு திட்டத்தில் சேர்க்கவும்
+NoDraftProposals=வரைவு முன்மொழிவுகள் இல்லை
+CopyPropalFrom=ஏற்கனவே உள்ள முன்மொழிவை நகலெடுப்பதன் மூலம் வணிக முன்மொழிவை உருவாக்கவும்
+CreateEmptyPropal=வெற்று வணிக முன்மொழிவு அல்லது தயாரிப்புகள்/சேவைகளின் பட்டியலிலிருந்து உருவாக்கவும்
+DefaultProposalDurationValidity=இயல்புநிலை வணிக முன்மொழிவு செல்லுபடியாகும் காலம் (நாட்களில்)
+UseCustomerContactAsPropalRecipientIfExist=முன்மொழிவு பெறுநரின் முகவரியாக மூன்றாம் தரப்பு முகவரிக்கு பதிலாக 'தொடர்பு பின்தொடர்தல் முன்மொழிவு' வகையுடன் தொடர்பு/முகவரியைப் பயன்படுத்தவும்
+ConfirmClonePropal=வணிக முன்மொழிவு <b> %s </b> ஐ நிச்சயமாக குளோன் செய்ய விரும்புகிறீர்களா?
+ConfirmReOpenProp=வணிக முன்மொழிவு <b> %s </b> ஐ மீண்டும் திறக்க விரும்புகிறீர்களா?
+ProposalsAndProposalsLines=வணிக முன்மொழிவு மற்றும் வரிகள்
+ProposalLine=முன்மொழிவு வரி
+ProposalLines=முன்மொழிவு வரிகள்
+AvailabilityPeriod=கிடைப்பதில் தாமதம்
+SetAvailability=கிடைக்கும் தாமதத்தை அமைக்கவும்
+AfterOrder=உத்தரவுக்குப் பிறகு
+OtherProposals=பிற முன்மொழிவுகள்
+##### Availability #####
+AvailabilityTypeAV_NOW=உடனடியாக
+AvailabilityTypeAV_1W=1 வாரம்
+AvailabilityTypeAV_2W=2 வாரங்கள்
+AvailabilityTypeAV_3W=3 வாரங்கள்
+AvailabilityTypeAV_1M=1 மாதம்
+##### Types de contacts #####
+TypeContact_propal_internal_SALESREPFOLL=பிரதிநிதி பின்தொடர்தல் முன்மொழிவு
+TypeContact_propal_external_BILLING=வாடிக்கையாளர் இன்வாய்ஸ் தொடர்பு
+TypeContact_propal_external_CUSTOMER=வாடிக்கையாளர் தொடர்பு பின்தொடர்தல் முன்மொழிவு
+TypeContact_propal_external_SHIPPING=டெலிவரிக்கான வாடிக்கையாளர் தொடர்பு
+# Document models
+DocModelAzurDescription=ஒரு முழுமையான முன்மொழிவு மாதிரி (சியான் டெம்ப்ளேட்டின் பழைய செயலாக்கம்)
+DocModelCyanDescription=ஒரு முழுமையான முன்மொழிவு மாதிரி
+DefaultModelPropalCreate=இயல்புநிலை மாதிரி உருவாக்கம்
+DefaultModelPropalToBill=வணிக முன்மொழிவை மூடும்போது இயல்புநிலை டெம்ப்ளேட் (விலைப்பட்டியல் வேண்டும்)
+DefaultModelPropalClosed=வணிக முன்மொழிவை மூடும்போது இயல்புநிலை டெம்ப்ளேட் (கட்டணம் செலுத்தப்படாதது)
+ProposalCustomerSignature=எழுத்துப்பூர்வ ஏற்பு, நிறுவனத்தின் முத்திரை, தேதி மற்றும் கையொப்பம்
+ProposalsStatisticsSuppliers=விற்பனையாளர் முன்மொழிவுகள் புள்ளிவிவரங்கள்
+CaseFollowedBy=தொடர்ந்து வழக்கு
+SignedOnly=கையெழுத்து மட்டுமே
+IdProposal=முன்மொழிவு ஐடி
+IdProduct=தயாரிப்பு ஐடி
+PrParentLine=முன்மொழிவு பெற்றோர் வரி
+LineBuyPriceHT=வரியின் நிகர விலையை வாங்கவும்
+SignPropal=முன்மொழிவை ஏற்கவும்
+RefusePropal=முன்மொழிவை மறுக்கவும்
+Sign=கையெழுத்து
+PropalAlreadySigned=முன்மொழிவு ஏற்கனவே ஏற்றுக்கொள்ளப்பட்டது
+PropalAlreadyRefused=முன்மொழிவு ஏற்கனவே நிராகரிக்கப்பட்டது
+PropalSigned=முன்மொழிவு ஏற்கப்பட்டது
+PropalRefused=முன்மொழிவு நிராகரிக்கப்பட்டது
+ConfirmRefusePropal=இந்த வணிக முன்மொழிவை நிச்சயமாக மறுக்க விரும்புகிறீர்களா?
diff --git a/htdocs/langs/ta_IN/receiptprinter.lang b/htdocs/langs/ta_IN/receiptprinter.lang
new file mode 100644
index 00000000000..0b1ebd4aac8
--- /dev/null
+++ b/htdocs/langs/ta_IN/receiptprinter.lang
@@ -0,0 +1,82 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+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=உள்ளூர் விண்டோஸ் பிரிண்டர்
+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 பிரிண்டர் பெயர், உதாரணம்: HPRT_TP805L
+PROFILE_DEFAULT=இயல்புநிலை சுயவிவரம்
+PROFILE_SIMPLE=எளிய சுயவிவரம்
+PROFILE_EPOSTEP=எபோஸ் டெப் சுயவிவரம்
+PROFILE_P822D=P822D சுயவிவரம்
+PROFILE_STAR=நட்சத்திர சுயவிவரம்
+PROFILE_DEFAULT_HELP=எப்சன் பிரிண்டர்களுக்கு ஏற்ற இயல்புநிலை சுயவிவரம்
+PROFILE_SIMPLE_HELP=எளிய சுயவிவரம் கிராபிக்ஸ் இல்லை
+PROFILE_EPOSTEP_HELP=எபோஸ் டெப் சுயவிவரம்
+PROFILE_P822D_HELP=P822D சுயவிவரத்தில் கிராபிக்ஸ் இல்லை
+PROFILE_STAR_HELP=நட்சத்திர சுயவிவரம்
+DOL_LINE_FEED=வரியைத் தவிர்
+DOL_ALIGN_LEFT=உரையை இடப்புறம் சீரமைக்கவும்
+DOL_ALIGN_CENTER=மைய உரை
+DOL_ALIGN_RIGHT=உரையை வலது சீரமைக்கவும்
+DOL_USE_FONT_A=அச்சுப்பொறியின் எழுத்துரு A ஐப் பயன்படுத்தவும்
+DOL_USE_FONT_B=அச்சுப்பொறியின் எழுத்துரு B ஐப் பயன்படுத்தவும்
+DOL_USE_FONT_C=அச்சுப்பொறியின் எழுத்துரு 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=கடிதங்களில் அறிமுகமான நாள்
+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/ta_IN/receptions.lang b/htdocs/langs/ta_IN/receptions.lang
new file mode 100644
index 00000000000..93d4066699c
--- /dev/null
+++ b/htdocs/langs/ta_IN/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=வரவேற்பு
+Receptions=வரவேற்புகள்
+AllReceptions=அனைத்து வரவேற்புகள்
+Reception=வரவேற்பு
+Receptions=வரவேற்புகள்
+ShowReception=வரவேற்புகளைக் காட்டு
+ReceptionsArea=வரவேற்பு பகுதி
+ListOfReceptions=வரவேற்புகளின் பட்டியல்
+ReceptionMethod=வரவேற்பு முறை
+LastReceptions=சமீபத்திய %s வரவேற்புகள்
+StatisticsOfReceptions=வரவேற்புகளுக்கான புள்ளிவிவரங்கள்
+NbOfReceptions=வரவேற்புகளின் எண்ணிக்கை
+NumberOfReceptionsByMonth=மாதத்தின் வரவேற்புகளின் எண்ணிக்கை
+ReceptionCard=வரவேற்பு அட்டை
+NewReception=புதிய வரவேற்பு
+CreateReception=வரவேற்பை உருவாக்கவும்
+QtyInOtherReceptions=மற்ற வரவேற்புகளில் Qty
+OtherReceptionsForSameOrder=இந்த ஆர்டருக்கான மற்ற வரவேற்புகள்
+ReceptionsAndReceivingForSameOrder=இந்த ஆர்டருக்கான வரவேற்புகள் மற்றும் ரசீதுகள்
+ReceptionsToValidate=சரிபார்க்க வரவேற்புகள்
+StatusReceptionCanceled=ரத்து செய்யப்பட்டது
+StatusReceptionDraft=வரைவு
+StatusReceptionValidated=சரிபார்க்கப்பட்டது (பெற வேண்டிய அல்லது ஏற்கனவே பெறப்பட்ட தயாரிப்புகள்)
+StatusReceptionValidatedToReceive=சரிபார்க்கப்பட்டது (பெற வேண்டிய பொருட்கள்)
+StatusReceptionValidatedReceived=சரிபார்க்கப்பட்டது (பெறப்பட்ட தயாரிப்புகள்)
+StatusReceptionProcessed=செயலாக்கப்பட்டது
+StatusReceptionDraftShort=வரைவு
+StatusReceptionValidatedShort=சரிபார்க்கப்பட்டது
+StatusReceptionProcessedShort=செயலாக்கப்பட்டது
+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/ta_IN/recruitment.lang b/htdocs/langs/ta_IN/recruitment.lang
new file mode 100644
index 00000000000..855030e9893
--- /dev/null
+++ b/htdocs/langs/ta_IN/recruitment.lang
@@ -0,0 +1,76 @@
+# 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 = ஆட்சேர்ப்பு
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = புதிய வேலை நிலைகளுக்கான ஆட்சேர்ப்பு பிரச்சாரங்களை நிர்வகிக்கவும் பின்பற்றவும்
+
+#
+# Admin page
+#
+RecruitmentSetup = ஆட்சேர்ப்பு அமைப்பு
+Settings = அமைப்புகள்
+RecruitmentSetupPage = ஆட்சேர்ப்பு தொகுதிக்கான முக்கிய விருப்பங்களின் அமைப்பை இங்கே உள்ளிடவும்
+RecruitmentArea=ஆட்சேர்ப்பு பகுதி
+PublicInterfaceRecruitmentDesc=வேலைகளின் பொதுப் பக்கங்கள், திறந்த வேலைகளைக் காண்பிப்பதற்கும் பதிலளிப்பதற்கும் பொது URLகளாகும். ஒவ்வொரு வேலைப் பதிவிலும் காணப்படும் ஒவ்வொரு வேலைக்கும் வெவ்வேறு இணைப்புகள் உள்ளன.
+EnablePublicRecruitmentPages=திறந்த வேலைகளின் பொதுப் பக்கங்களை இயக்கவும்
+
+#
+# About page
+#
+About = பற்றி
+RecruitmentAbout = ஆட்சேர்ப்பு பற்றி
+RecruitmentAboutPage = பக்கம் பற்றிய ஆட்சேர்ப்பு
+NbOfEmployeesExpected=எதிர்பார்க்கப்படும் ஊழியர்களின் எண்ணிக்கை
+JobLabel=வேலை நிலையின் லேபிள்
+WorkPlace=வேலை இடம்
+DateExpected=எதிர்பார்க்கப்படுகிறது தேதி
+FutureManager=எதிர்கால மேலாளர்
+ResponsibleOfRecruitement=ஆட்சேர்ப்புக்கு பொறுப்பு
+IfJobIsLocatedAtAPartner=பங்குதாரர் இடத்தில் வேலை அமைந்திருந்தால்
+PositionToBeFilled=வேலை நிலை
+PositionsToBeFilled=வேலை நிலைகள்
+ListOfPositionsToBeFilled=பணியிடங்களின் பட்டியல்
+NewPositionToBeFilled=புதிய வேலை வாய்ப்புகள்
+
+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=சலுகை கொடு
diff --git a/htdocs/langs/ta_IN/resource.lang b/htdocs/langs/ta_IN/resource.lang
new file mode 100644
index 00000000000..b31ed470927
--- /dev/null
+++ b/htdocs/langs/ta_IN/resource.lang
@@ -0,0 +1,39 @@
+# Dolibarr language file - Source file is en_US - resource
+MenuResourceIndex=வளங்கள்
+MenuResourceAdd=புதிய வளம்
+DeleteResource=ஆதாரத்தை நீக்கு
+ConfirmDeleteResourceElement=இந்த உறுப்புக்கான ஆதாரத்தை நீக்குவதை உறுதிப்படுத்தவும்
+NoResourceInDatabase=தரவுத்தளத்தில் ஆதாரம் இல்லை.
+NoResourceLinked=எந்த ஆதாரமும் இணைக்கப்படவில்லை
+ActionsOnResource=இந்த வளத்தைப் பற்றிய நிகழ்வுகள்
+ResourcePageIndex=வளங்களின் பட்டியல்
+ResourceSingular=வளம்
+ResourceCard=ஆதார அட்டை
+AddResource=ஒரு வளத்தை உருவாக்கவும்
+ResourceFormLabel_ref=வளத்தின் பெயர்
+ResourceType=வள வகை
+ResourceFormLabel_description=வள விளக்கம்
+
+ResourcesLinkedToElement=உறுப்புடன் இணைக்கப்பட்ட வளங்கள்
+
+ShowResource=ஆதாரத்தைக் காட்டு
+
+ResourceElementPage=உறுப்பு வளங்கள்
+ResourceCreatedWithSuccess=வளம் வெற்றிகரமாக உருவாக்கப்பட்டது
+RessourceLineSuccessfullyDeleted=ஆதார வரி வெற்றிகரமாக நீக்கப்பட்டது
+RessourceLineSuccessfullyUpdated=ஆதார வரி வெற்றிகரமாக புதுப்பிக்கப்பட்டது
+ResourceLinkedWithSuccess=வெற்றியுடன் தொடர்புடைய வளம்
+
+ConfirmDeleteResource=இந்த ஆதாரத்தை நீக்குவதை உறுதிப்படுத்தவும்
+RessourceSuccessfullyDeleted=ஆதாரம் வெற்றிகரமாக நீக்கப்பட்டது
+DictionaryResourceType=வளங்களின் வகை
+
+SelectResource=வளத்தைத் தேர்ந்தெடுக்கவும்
+
+IdResource=ஐடி ஆதாரம்
+AssetNumber=வரிசை எண்
+ResourceTypeCode=ஆதார வகை குறியீடு
+ImportDataset_resource_1=வளங்கள்
+
+ErrorResourcesAlreadyInUse=சில ஆதாரங்கள் பயன்பாட்டில் உள்ளன
+ErrorResourceUseInEvent=%s %s நிகழ்வில் பயன்படுத்தப்பட்டது
diff --git a/htdocs/langs/ta_IN/salaries.lang b/htdocs/langs/ta_IN/salaries.lang
new file mode 100644
index 00000000000..8613af209d9
--- /dev/null
+++ b/htdocs/langs/ta_IN/salaries.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - salaries
+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=சம்பளம் செலுத்துதல்
+SalariesPaymentsOf=%s இன் சம்பளம்
+ShowSalaryPayment=சம்பளம் கொடுப்பதைக் காட்டு
+THM=சராசரி மணிநேர விகிதம்
+TJM=சராசரி தினசரி விகிதம்
+CurrentSalary=தற்போதய சம்பளம்
+THMDescription=தொகுதி திட்டம் பயன்படுத்தப்பட்டால், பயனர்கள் உள்ளிட்ட திட்டத்தில் செலவழித்த நேரத்தின் செலவைக் கணக்கிட இந்த மதிப்பு பயன்படுத்தப்படலாம்
+TJMDescription=இந்த மதிப்பு தற்போது தகவலுக்காக மட்டுமே மற்றும் எந்த கணக்கீட்டிற்கும் பயன்படுத்தப்படவில்லை
+LastSalaries=சமீபத்திய %s சம்பளம்
+AllSalaries=அனைத்து சம்பளம்
+SalariesStatistics=சம்பள புள்ளிவிவரங்கள்
+SalariesAndPayments=சம்பளம் மற்றும் கொடுப்பனவுகள்
+ConfirmDeleteSalaryPayment=இந்த சம்பளத்தை நீக்க வேண்டுமா?
+FillFieldFirst=முதலில் பணியாளர் புலத்தை நிரப்பவும்
+UpdateAmountWithLastSalary=கடைசி சம்பளத்துடன் தொகையை அமைக்கவும்
diff --git a/htdocs/langs/ta_IN/sendings.lang b/htdocs/langs/ta_IN/sendings.lang
new file mode 100644
index 00000000000..c9638243dbf
--- /dev/null
+++ b/htdocs/langs/ta_IN/sendings.lang
@@ -0,0 +1,76 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefSending=Ref. ஏற்றுமதி
+Sending=ஏற்றுமதி
+Sendings=ஏற்றுமதி
+AllSendings=அனைத்து ஏற்றுமதிகள்
+Shipment=ஏற்றுமதி
+Shipments=ஏற்றுமதி
+ShowSending=ஏற்றுமதிகளைக் காட்டு
+Receivings=டெலிவரி ரசீதுகள்
+SendingsArea=ஏற்றுமதி பகுதி
+ListOfSendings=ஏற்றுமதி பட்டியல்
+SendingMethod=கப்பல் முறை
+LastSendings=சமீபத்திய %s ஏற்றுமதிகள்
+StatisticsOfSendings=ஏற்றுமதிக்கான புள்ளிவிவரங்கள்
+NbOfSendings=ஏற்றுமதிகளின் எண்ணிக்கை
+NumberOfShipmentsByMonth=மாதத்தின் மூலம் ஏற்றுமதிகளின் எண்ணிக்கை
+SendingCard=ஏற்றுமதி அட்டை
+NewSending=புதிய ஏற்றுமதி
+CreateShipment=ஏற்றுமதியை உருவாக்கவும்
+QtyShipped=Qty அனுப்பப்பட்டது
+QtyShippedShort=அளவு கப்பல்.
+QtyPreparedOrShipped=Qty தயாரிக்கப்பட்டது அல்லது அனுப்பப்பட்டது
+QtyToShip=கப்பலுக்கு க்யூடி
+QtyToReceive=பெற வேண்டிய அளவு
+QtyReceived=Qty பெற்றது
+QtyInOtherShipments=மற்ற ஏற்றுமதிகளில் அளவு
+KeepToShip=அனுப்புவதற்கு இருக்கவும்
+KeepToShipShort=எஞ்சியிரு
+OtherSendingsForSameOrder=இந்த ஆர்டருக்கான பிற ஏற்றுமதிகள்
+SendingsAndReceivingForSameOrder=இந்த ஆர்டருக்கான ஏற்றுமதிகள் மற்றும் ரசீதுகள்
+SendingsToValidate=சரிபார்ப்பதற்கான ஏற்றுமதிகள்
+StatusSendingCanceled=ரத்து செய்யப்பட்டது
+StatusSendingCanceledShort=ரத்து செய்யப்பட்டது
+StatusSendingDraft=வரைவு
+StatusSendingValidated=சரிபார்க்கப்பட்டது (கப்பலுக்கு அனுப்பப்படும் அல்லது ஏற்கனவே அனுப்பப்பட்ட பொருட்கள்)
+StatusSendingProcessed=செயலாக்கப்பட்டது
+StatusSendingDraftShort=வரைவு
+StatusSendingValidatedShort=சரிபார்க்கப்பட்டது
+StatusSendingProcessedShort=செயலாக்கப்பட்டது
+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=டெலிவரி ரசீதுகளுக்கான முழுமையான ஆவண மாதிரி (லோகோ...)
+DocumentModelStorm=டெலிவரி ரசீதுகள் மற்றும் எக்ஸ்ட்ராஃபீல்டு இணக்கத்தன்மைக்கான முழுமையான ஆவண மாதிரி (லோகோ...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=நிலையான EXPEDITION_ADDON_NUMBER வரையறுக்கப்படவில்லை
+SumOfProductVolumes=தயாரிப்பு தொகுதிகளின் கூட்டுத்தொகை
+SumOfProductWeights=தயாரிப்பு எடைகளின் கூட்டுத்தொகை
+
+# warehouse details
+DetailWarehouseNumber= கிடங்கு விவரங்கள்
+DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/ta_IN/sms.lang b/htdocs/langs/ta_IN/sms.lang
new file mode 100644
index 00000000000..d891ee2a076
--- /dev/null
+++ b/htdocs/langs/ta_IN/sms.lang
@@ -0,0 +1,51 @@
+# Dolibarr language file - Source file is en_US - sms
+Sms=எஸ்எம்எஸ்
+SmsSetup=எஸ்எம்எஸ் அமைப்பு
+SmsDesc=SMS அம்சங்களில் உலகளாவிய விருப்பங்களை வரையறுக்க இந்தப் பக்கம் உங்களை அனுமதிக்கிறது
+SmsCard=எஸ்எம்எஸ் அட்டை
+AllSms=அனைத்து SMS பிரச்சாரங்களும்
+SmsTargets=இலக்குகள்
+SmsRecipients=இலக்குகள்
+SmsRecipient=இலக்கு
+SmsTitle=விளக்கம்
+SmsFrom=அனுப்புபவர்
+SmsTo=இலக்கு
+SmsTopic=எஸ்எம்எஸ் தலைப்பு
+SmsText=செய்தி
+SmsMessage=எஸ்எம்எஸ் செய்தி
+ShowSms=எஸ்எம்எஸ் காட்டு
+ListOfSms=எஸ்எம்எஸ் பிரச்சாரங்களைப் பட்டியலிடுங்கள்
+NewSms=புதிய SMS பிரச்சாரம்
+EditSms=எஸ்எம்எஸ் திருத்தவும்
+ResetSms=புதிய அனுப்புதல்
+DeleteSms=SMS பிரச்சாரத்தை நீக்கு
+DeleteASms=SMS பிரச்சாரத்தை அகற்று
+PreviewSms=முன்னோட்டம் எஸ்எம்எஸ்
+PrepareSms=எஸ்எம்எஸ் தயார் செய்யுங்கள்
+CreateSms=எஸ்எம்எஸ் உருவாக்கவும்
+SmsResult=எஸ்எம்எஸ் அனுப்பியதன் முடிவு
+TestSms=எஸ்எம்எஸ் சோதிக்கவும்
+ValidSms=எஸ்எம்எஸ் சரிபார்க்கவும்
+ApproveSms=SMS ஐ அங்கீகரிக்கவும்
+SmsStatusDraft=வரைவு
+SmsStatusValidated=சரிபார்க்கப்பட்டது
+SmsStatusApproved=அங்கீகரிக்கப்பட்டது
+SmsStatusSent=அனுப்பப்பட்டது
+SmsStatusSentPartialy=பகுதியளவு அனுப்பப்பட்டது
+SmsStatusSentCompletely=முழுமையாக அனுப்பப்பட்டது
+SmsStatusError=பிழை
+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/ta_IN/stocks.lang b/htdocs/langs/ta_IN/stocks.lang
new file mode 100644
index 00000000000..3e0d8a0786a
--- /dev/null
+++ b/htdocs/langs/ta_IN/stocks.lang
@@ -0,0 +1,273 @@
+# Dolibarr language file - Source file is en_US - stocks
+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=இருப்பிடத்தின் குறுகிய பெயர்
+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=Qty அனுப்பப்பட்டது
+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=qty பூஜ்யமற்ற மற்றும் விற்பனையாளருடன் குறைந்தபட்சம் ஒரு தயாரிப்பைத் தேர்ந்தெடுக்கவும்
+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=இந்த லாட் எண்ணுக்கு, உங்கள் மூலக் கிடங்கில் போதுமான அளவு இருப்பு இல்லை, மேலும் உங்கள் அமைப்பு எதிர்மறையான பங்குகளை அனுமதிக்காது (Qty's தயாரிப்பு '%s' உடன் '%s' %s கிடங்கில் உள்ளது).
+ShowWarehouse=கிடங்கைக் காட்டு
+MovementCorrectStock=தயாரிப்பு %s க்கான பங்கு திருத்தம்
+MovementTransferStock=தயாரிப்பு %s இன் பங்கு பரிமாற்றம் மற்றொரு கிடங்கிற்கு
+InventoryCodeShort=Inv./Mov. குறியீடு
+NoPendingReceptionOnSupplierOrder=திறந்த கொள்முதல் ஆர்டர் காரணமாக வரவேற்பு நிலுவையில் இல்லை
+ThisSerialAlreadyExistWithDifferentDate=இந்த நிறைய / வரிசை எண் (<strong> %s </strong>) முன்பே உள்ளது ஆனால் வெவ்வேறு eatby அல்லது sellby தேதி (<strong> %s </strong> காணப்படும் ஆனால் நீங்கள் நுழைய <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=ஓடுதல்
+inventorySelectWarehouse=கிடங்கு தேர்வு
+inventoryConfirmCreate=உருவாக்கு
+inventoryOfWarehouse=கிடங்கிற்கான இருப்பு: %s
+inventoryErrorQtyAdd=பிழை: ஒரு அளவு பூஜ்ஜியத்தை விட குறைவாக உள்ளது
+inventoryMvtStock=சரக்கு மூலம்
+inventoryWarningProductAlreadyExists=இந்த தயாரிப்பு ஏற்கனவே பட்டியலில் உள்ளது
+SelectCategory=வகை வடிகட்டி
+SelectFournisseur=விற்பனையாளர் வடிகட்டி
+inventoryOnDate=சரக்கு
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=பங்கு நகர்வுகள் சரக்கு தேதியைக் கொண்டிருக்கும் (சரக்கு சரிபார்ப்பு தேதிக்கு பதிலாக)
+inventoryChangePMPPermission=ஒரு தயாரிப்புக்கான PMP மதிப்பை மாற்ற அனுமதிக்கவும்
+ColumnNewPMP=புதிய அலகு PMP
+OnlyProdsInStock=இருப்பு இல்லாமல் தயாரிப்பு சேர்க்க வேண்டாம்
+TheoricalQty=தத்துவார்த்த அளவு
+TheoricalValue=தத்துவார்த்த அளவு
+LastPA=கடைசி பி.பி
+CurrentPA=தற்போதைய பி.பி
+RecordedQty=பதிவு செய்யப்பட்ட அளவு
+RealQty=உண்மையான அளவு
+RealValue=உண்மையான மதிப்பு
+RegulatedQty=ஒழுங்குபடுத்தப்பட்ட Qty
+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=qty <br> ஐ மீட்டமைக்க மதிப்பை 0 ஆக அமைக்கவும்
+UpdateByScaning=ஸ்கேன் செய்வதன் மூலம் உண்மையான அளவை முடிக்கவும்
+UpdateByScaningProductBarcode=ஸ்கேன் மூலம் புதுப்பிக்கவும் (தயாரிப்பு பார்கோடு)
+UpdateByScaningLot=ஸ்கேன் மூலம் புதுப்பிக்கவும் (நிறைய|தொடர் பார்கோடு)
+DisableStockChangeOfSubProduct=இந்த இயக்கத்தின் போது இந்த கிட்டின் அனைத்து துணை தயாரிப்புகளுக்கும் பங்கு மாற்றத்தை செயலிழக்கச் செய்யவும்.
+ImportFromCSV=இயக்கத்தின் CSV பட்டியலை இறக்குமதி செய்யவும்
+ChooseFileToImport=கோப்பைப் பதிவேற்றவும், பின்னர் கோப்பை மூல இறக்குமதி கோப்பாக தேர்ந்தெடுக்க %s ஐகானைக் கிளிக் செய்யவும்...
+SelectAStockMovementFileToImport=இறக்குமதி செய்ய பங்கு இயக்கக் கோப்பைத் தேர்ந்தெடுக்கவும்
+InfoTemplateImport=பதிவேற்றப்பட்ட கோப்பில் இந்த வடிவம் இருக்க வேண்டும் (* கட்டாய புலங்கள்): <br> Source Warehouse* | இலக்கு கிடங்கு* | தயாரிப்பு* | அளவு* | நிறைய/வரிசை எண் <br> CSV எழுத்துப் பிரிப்பானாக இருக்க வேண்டும் " <b> %s </b> "
+LabelOfInventoryMovemement=சரக்கு %s
+ReOpen=மீண்டும் திறக்கவும்
+ConfirmFinish=சரக்கு மூடப்படுவதை உறுதிப்படுத்துகிறீர்களா? இது உங்கள் பங்குகளை நீங்கள் சரக்குக்குள் உள்ளிட்ட உண்மையான qtyக்கு புதுப்பிக்க அனைத்து பங்கு இயக்கங்களையும் உருவாக்கும்.
+ObjectNotFound=%s கிடைக்கவில்லை
+MakeMovementsAndClose=இயக்கங்களை உருவாக்கி மூடவும்
+AutofillWithExpected=உண்மையான அளவை எதிர்பார்த்த அளவோடு மாற்றவும்
+ShowAllBatchByDefault=இயல்பாக, தயாரிப்பு "பங்கு" தாவலில் தொகுதி விவரங்களைக் காட்டு
+CollapseBatchDetailHelp=பங்குகள் தொகுதி உள்ளமைவில் தொகுதி விவரம் இயல்புநிலை காட்சியை நீங்கள் அமைக்கலாம்
+ErrorWrongBarcodemode=அறியப்படாத பார்கோடு பயன்முறை
+ProductDoesNotExist=தயாரிப்பு இல்லை
+ErrorSameBatchNumber=சரக்கு தாளில் தொகுதி எண்ணுக்கான பல பதிவுகள் காணப்பட்டன. எதை அதிகரிப்பது என்று தெரியவில்லை.
+ProductBatchDoesNotExist=தொகுதி/தொடர் கொண்ட தயாரிப்பு இல்லை
+ProductBarcodeDoesNotExist=பார்கோடு கொண்ட தயாரிப்பு இல்லை
+WarehouseId=கிடங்கு ஐடி
+WarehouseRef=கிடங்கு Ref
+SaveQtyFirst=பங்கு இயக்கத்தை உருவாக்கக் கேட்பதற்கு முன், உண்மையான கையிருப்பு அளவுகளை முதலில் சேமிக்கவும்.
+InventoryStartedShort=தொடங்கப்பட்டது
+ErrorOnElementsInventory=பின்வரும் காரணங்களுக்காக செயல்பாடு ரத்து செய்யப்பட்டது:
+ErrorCantFindCodeInInventory=சரக்குகளில் பின்வரும் குறியீட்டைக் கண்டறிய முடியவில்லை
+QtyWasAddedToTheScannedBarcode=வெற்றி!! கோரப்பட்ட அனைத்து பார்கோடுகளிலும் அளவு சேர்க்கப்பட்டது. நீங்கள் ஸ்கேனர் கருவியை மூடலாம்.
+StockChangeDisabled=பங்கு மாற்றம் முடக்கப்பட்டுள்ளது
+NoWarehouseDefinedForTerminal=டெர்மினலுக்கான கிடங்கு எதுவும் வரையறுக்கப்படவில்லை
diff --git a/htdocs/langs/ta_IN/stripe.lang b/htdocs/langs/ta_IN/stripe.lang
new file mode 100644
index 00000000000..ad4e0943249
--- /dev/null
+++ b/htdocs/langs/ta_IN/stripe.lang
@@ -0,0 +1,71 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=கோடு தொகுதி அமைப்பு
+StripeDesc=<a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a> வழியாக கிரெடிட்/டெபிட் கார்டுகள் மூலம் பணம் செலுத்த உங்கள் வாடிக்கையாளர்களுக்கு ஆன்லைன் கட்டணப் பக்கத்தை வழங்கவும். உங்கள் வாடிக்கையாளர்கள் தற்காலிகப் பணம் செலுத்துவதற்கு அல்லது குறிப்பிட்ட Dolibarr பொருளுக்கு (விலைப்பட்டியல், ஆர்டர், ...) தொடர்பான பணம் செலுத்துவதற்கு இது பயன்படுத்தப்படலாம்.
+StripeOrCBDoPayment=கிரெடிட் கார்டு அல்லது ஸ்ட்ரைப் மூலம் பணம் செலுத்துங்கள்
+FollowingUrlAreAvailableToMakePayments=Dolibarr பொருள்களில் பணம் செலுத்த வாடிக்கையாளருக்கு ஒரு பக்கத்தை வழங்க பின்வரும் URLகள் உள்ளன
+PaymentForm=பணம் செலுத்தும் படிவம்
+WelcomeOnPaymentPage=எங்கள் ஆன்லைன் கட்டண சேவைக்கு வரவேற்கிறோம்
+ThisScreenAllowsYouToPay=%s க்கு ஆன்லைனில் பணம் செலுத்த இந்தத் திரை உங்களை அனுமதிக்கிறது.
+ThisIsInformationOnPayment=பணம் செலுத்துவது பற்றிய தகவல் இது
+ToComplete=முடிக்க
+YourEMail=கட்டண உறுதிப்படுத்தலைப் பெற மின்னஞ்சல்
+STRIPE_PAYONLINE_SENDEMAIL=பணம் செலுத்தும் முயற்சிக்குப் பிறகு மின்னஞ்சல் அறிவிப்பு (வெற்றி அல்லது தோல்வி)
+Creditor=கடன் கொடுத்தவர்
+PaymentCode=கட்டணக் குறியீடு
+StripeDoPayment=பட்டையுடன் செலுத்துங்கள்
+YouWillBeRedirectedOnStripe=கிரெடிட் கார்டு தகவலை உள்ளிட, பாதுகாப்பான ஸ்ட்ரைப் பக்கத்தில் நீங்கள் திருப்பி விடப்படுவீர்கள்
+Continue=அடுத்தது
+ToOfferALinkForOnlinePayment=%s கட்டணத்திற்கான URL
+ToOfferALinkForOnlinePaymentOnOrder=விற்பனை ஆர்டருக்காக %s ஆன்லைன் கட்டணப் பக்கத்தை வழங்குவதற்கான URL
+ToOfferALinkForOnlinePaymentOnInvoice=வாடிக்கையாளர் விலைப்பட்டியலுக்கு %s ஆன்லைன் கட்டணப் பக்கத்தை வழங்குவதற்கான URL
+ToOfferALinkForOnlinePaymentOnContractLine=ஒப்பந்த வரிக்கான %s ஆன்லைன் கட்டணப் பக்கத்தை வழங்குவதற்கான URL
+ToOfferALinkForOnlinePaymentOnFreeAmount=எந்தவொரு பொருளும் இல்லாத எந்தத் தொகைக்கும் %s ஆன்லைன் கட்டணப் பக்கத்தை வழங்குவதற்கான URL
+ToOfferALinkForOnlinePaymentOnMemberSubscription=உறுப்பினர் சந்தாவிற்கு %s ஆன்லைன் கட்டணப் பக்கத்தை வழங்குவதற்கான URL
+ToOfferALinkForOnlinePaymentOnDonation=நன்கொடை செலுத்துவதற்கு %s ஆன்லைன் கட்டணப் பக்கத்தை வழங்குவதற்கான URL
+YouCanAddTagOnUrl=நீங்கள் url அளவுரு <b> &tag= <i> மதிப்பு </i> </b> ஐ அந்த URL இல் சேர்க்கலாம் (உங்கள் சொந்தக் கட்டணக் குறிச்சொல்லைச் சேர்க்க கட்டணம் செலுத்துவதற்கு மட்டும் கட்டாயம்). <br> எந்த பொருளும் இல்லாத பேமெண்ட்டுகளின் URLக்கு, <strong> &noidempotency=1 </strong> என்ற அளவுருவையும் நீங்கள் சேர்க்கலாம். எனவே ஒரே டேக் கொண்ட ஒரே இணைப்பைப் பல முறை பயன்படுத்தலாம் (சில இணைப்பு முறை இல்லாமல் ஒவ்வொரு கட்டண முறைக்கும் கட்டணம் செலுத்துவதை கட்டுப்படுத்தலாம். அளவுரு)
+SetupStripeToHavePaymentCreatedAutomatically=ஸ்ட்ரைப் மூலம் சரிபார்க்கப்படும் போது தானாகவே பணம் உருவாக்கப்படும் வகையில் உங்கள் ஸ்ட்ரைப்பை url <b> %s </b> உடன் அமைக்கவும்.
+AccountParameter=கணக்கு அளவுருக்கள்
+UsageParameter=பயன்பாட்டு அளவுருக்கள்
+InformationToFindParameters=உங்கள் %s கணக்குத் தகவலைக் கண்டறிய உதவுங்கள்
+STRIPE_CGI_URL_V2=கட்டணத்திற்கான ஸ்ட்ரைப் CGI தொகுதியின் Url
+CSSUrlForPaymentForm=கட்டண படிவத்திற்கான CSS நடை தாள் url
+NewStripePaymentReceived=புதிய ஸ்ட்ரைப் பேமெண்ட் பெறப்பட்டது
+NewStripePaymentFailed=புதிய ஸ்ட்ரைப் பேமெண்ட் முயற்சி தோல்வியடைந்தது
+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=ஸ்ட்ரைப் லைவ் இயக்கப்பட்டது (இல்லையெனில் சோதனை/சாண்ட்பாக்ஸ் பயன்முறை)
+StripeImportPayment=வரி செலுத்துதல்களை இறக்குமதி செய்யவும்
+ExampleOfTestCreditCard=சோதனைக்கான கிரெடிட் கார்டின் எடுத்துக்காட்டு: %s => செல்லுபடியாகும், %s => பிழை CVC, %s => காலாவதியானது, %s => கட்டணம் தோல்வி
+StripeGateways=கோடு நுழைவாயில்கள்
+OAUTH_STRIPE_TEST_ID=ஸ்ட்ரைப் கனெக்ட் கிளையண்ட் ஐடி (ca_...)
+OAUTH_STRIPE_LIVE_ID=ஸ்ட்ரைப் கனெக்ட் கிளையண்ட் ஐடி (ca_...)
+BankAccountForBankTransfer=பணம் செலுத்துவதற்கான வங்கி கணக்கு
+StripeAccount=கோடு கணக்கு
+StripeChargeList=ஸ்ட்ரைப் கட்டணங்களின் பட்டியல்
+StripeTransactionList=ஸ்ட்ரைப் பரிவர்த்தனைகளின் பட்டியல்
+StripeCustomerId=ஸ்ட்ரைப் வாடிக்கையாளர் ஐடி
+StripePaymentModes=வரி செலுத்தும் முறைகள்
+LocalID=உள்ளூர் ஐடி
+StripeID=கோடு ஐடி
+NameOnCard=அட்டையிலுள்ள பெயர்
+CardNumber=அட்டை எண்
+ExpiryDate=காலாவதி தேதி
+CVN=சி.வி.என்
+DeleteACard=அட்டையை நீக்கு
+ConfirmDeleteCard=இந்த கிரெடிட் அல்லது டெபிட் கார்டை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+CreateCustomerOnStripe=ஸ்ட்ரைப்பில் வாடிக்கையாளரை உருவாக்கவும்
+CreateCardOnStripe=ஸ்ட்ரைப்பில் அட்டையை உருவாக்கவும்
+ShowInStripe=கோட்டில் காட்டு
+StripeUserAccountForActions=சில ஸ்ட்ரைப் நிகழ்வுகளின் மின்னஞ்சல் அறிவிப்புக்காகப் பயன்படுத்த வேண்டிய பயனர் கணக்கு (ஸ்ட்ரைப் பேஅவுட்கள்)
+StripePayoutList=ஸ்ட்ரைப் பேஅவுட்களின் பட்டியல்
+ToOfferALinkForTestWebhook=ஐபிஎன் (சோதனை முறை) ஐ அழைக்க, ஸ்ட்ரைப் வெப்ஹூக்கை அமைப்பதற்கான இணைப்பு
+ToOfferALinkForLiveWebhook=IPN (நேரடி பயன்முறை) ஐ அழைக்க, ஸ்ட்ரைப் வெப்ஹூக்கை அமைப்பதற்கான இணைப்பு
+PaymentWillBeRecordedForNextPeriod=கட்டணம் அடுத்த காலத்திற்கு பதிவு செய்யப்படும்.
+ClickHereToTryAgain= <a href="%s"> மீண்டும் முயற்சிக்க இங்கே கிளிக் செய்யவும்... </a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=வலுவான வாடிக்கையாளர் அங்கீகார விதிகளின் காரணமாக, ஸ்ட்ரைப் பேக் ஆபீஸில் இருந்து கார்டை உருவாக்க வேண்டும். ஸ்ட்ரைப் வாடிக்கையாளர் பதிவை இயக்க நீங்கள் இங்கே கிளிக் செய்யலாம்: %s
diff --git a/htdocs/langs/ta_IN/supplier_proposal.lang b/htdocs/langs/ta_IN/supplier_proposal.lang
new file mode 100644
index 00000000000..af133d4c2f3
--- /dev/null
+++ b/htdocs/langs/ta_IN/supplier_proposal.lang
@@ -0,0 +1,58 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=விற்பனையாளர் வணிக முன்மொழிவுகள்
+supplier_proposalDESC=சப்ளையர்களுக்கான விலை கோரிக்கைகளை நிர்வகிக்கவும்
+SupplierProposalNew=புதிய விலை கோரிக்கை
+CommRequest=விலை கோரிக்கை
+CommRequests=விலை கோரிக்கைகள்
+SearchRequest=கோரிக்கையைக் கண்டறியவும்
+DraftRequests=வரைவு கோரிக்கைகள்
+SupplierProposalsDraft=வரைவு விற்பனையாளர் முன்மொழிவுகள்
+LastModifiedRequests=சமீபத்திய %s மாற்றியமைக்கப்பட்ட விலைக் கோரிக்கைகள்
+RequestsOpened=விலைக் கோரிக்கைகளைத் திறக்கவும்
+SupplierProposalArea=விற்பனையாளர் முன்மொழிவுகள் பகுதி
+SupplierProposalShort=விற்பனையாளர் முன்மொழிவு
+SupplierProposals=விற்பனையாளர் முன்மொழிவுகள்
+SupplierProposalsShort=விற்பனையாளர் முன்மொழிவுகள்
+AskPrice=விலை கோரிக்கை
+NewAskPrice=புதிய விலை கோரிக்கை
+ShowSupplierProposal=விலைக் கோரிக்கையைக் காட்டு
+AddSupplierProposal=விலை கோரிக்கையை உருவாக்கவும்
+SupplierProposalRefFourn=விற்பனையாளர் ref
+SupplierProposalDate=டெலிவரி தேதி
+SupplierProposalRefFournNotice="ஏற்றுக்கொள்ளப்பட்டது" என்பதை மூடுவதற்கு முன், சப்ளையர்களின் குறிப்புகளைப் பற்றிப் புரிந்துகொள்ளவும்.
+ConfirmValidateAsk=<b> %s </b> என்ற பெயரில் இந்த விலைக் கோரிக்கையை நிச்சயமாகச் சரிபார்க்க விரும்புகிறீர்களா?
+DeleteAsk=கோரிக்கையை நீக்கு
+ValidateAsk=கோரிக்கையை சரிபார்க்கவும்
+SupplierProposalStatusDraft=வரைவு (சரிபார்க்கப்பட வேண்டும்)
+SupplierProposalStatusValidated=சரிபார்க்கப்பட்டது (கோரிக்கை திறக்கப்பட்டுள்ளது)
+SupplierProposalStatusClosed=மூடப்பட்டது
+SupplierProposalStatusSigned=ஏற்றுக் கொள்ளப்பட்டது
+SupplierProposalStatusNotSigned=மறுத்தார்
+SupplierProposalStatusDraftShort=வரைவு
+SupplierProposalStatusValidatedShort=சரிபார்க்கப்பட்டது
+SupplierProposalStatusClosedShort=மூடப்பட்டது
+SupplierProposalStatusSignedShort=ஏற்றுக் கொள்ளப்பட்டது
+SupplierProposalStatusNotSignedShort=மறுத்தார்
+CopyAskFrom=ஏற்கனவே உள்ள கோரிக்கையை நகலெடுத்து விலை கோரிக்கையை உருவாக்கவும்
+CreateEmptyAsk=வெற்று கோரிக்கையை உருவாக்கவும்
+ConfirmCloneAsk=<b> %s </b> விலைக் கோரிக்கையை நிச்சயமாக குளோன் செய்ய விரும்புகிறீர்களா?
+ConfirmReOpenAsk=<b> %s </b> விலைக் கோரிக்கையைத் திரும்பப் பெற விரும்புகிறீர்களா?
+SendAskByMail=அஞ்சல் மூலம் விலை கோரிக்கையை அனுப்பவும்
+SendAskRef=%s விலை கோரிக்கையை அனுப்புகிறது
+SupplierProposalCard=கோரிக்கை அட்டை
+ConfirmDeleteAsk=<b> %s </b> இந்த விலைக் கோரிக்கையை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+ActionsOnSupplierProposal=விலை கோரிக்கையின் பேரில் நிகழ்வுகள்
+DocModelAuroreDescription=ஒரு முழுமையான கோரிக்கை மாதிரி (லோகோ...)
+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/ta_IN/suppliers.lang b/htdocs/langs/ta_IN/suppliers.lang
new file mode 100644
index 00000000000..1e49ea44829
--- /dev/null
+++ b/htdocs/langs/ta_IN/suppliers.lang
@@ -0,0 +1,49 @@
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=விற்பனையாளர்கள்
+SuppliersInvoice=விற்பனையாளர் விலைப்பட்டியல்
+SupplierInvoices=விற்பனையாளர் விலைப்பட்டியல்
+ShowSupplierInvoice=விற்பனையாளர் விலைப்பட்டியல் காட்டு
+NewSupplier=புதிய விற்பனையாளர்
+History=வரலாறு
+ListOfSuppliers=விற்பனையாளர்களின் பட்டியல்
+ShowSupplier=விற்பனையாளரைக் காட்டு
+OrderDate=ஆர்டர் தேதி
+BuyingPriceMin=சிறந்த கொள்முதல் விலை
+BuyingPriceMinShort=சிறந்த கொள்முதல் விலை
+TotalBuyingPriceMinShort=துணைப் பொருட்களின் மொத்த கொள்முதல் விலை
+TotalSellingPriceMinShort=துணைப் பொருட்களின் மொத்த விற்பனை விலை
+SomeSubProductHaveNoPrices=சில துணைப் பொருட்களுக்கு விலை வரையறுக்கப்படவில்லை
+AddSupplierPrice=வாங்கும் விலையைச் சேர்க்கவும்
+ChangeSupplierPrice=வாங்கும் விலையை மாற்றவும்
+SupplierPrices=விற்பனையாளர் விலை
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=இந்த விற்பனையாளர் குறிப்பு ஏற்கனவே ஒரு தயாரிப்புடன் தொடர்புடையது: %s
+NoRecordedSuppliers=விற்பனையாளர் பதிவு செய்யப்படவில்லை
+SupplierPayment=விற்பனையாளர் கட்டணம்
+SuppliersArea=விற்பனையாளர் பகுதி
+RefSupplierShort=Ref. விற்பனையாளர்
+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=விற்பனையாளர் விலை
diff --git a/htdocs/langs/ta_IN/ticket.lang b/htdocs/langs/ta_IN/ticket.lang
new file mode 100644
index 00000000000..465f6ac1ec5
--- /dev/null
+++ b/htdocs/langs/ta_IN/ticket.lang
@@ -0,0 +1,324 @@
+# 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=டிக்கெட்டுகள்
+Module56000Desc=வெளியீடு அல்லது கோரிக்கை மேலாண்மைக்கான டிக்கெட் அமைப்பு
+
+Permission56001=டிக்கெட்டுகளைப் பார்க்கவும்
+Permission56002=டிக்கெட்டுகளை மாற்றவும்
+Permission56003=டிக்கெட்டுகளை நீக்கு
+Permission56004=டிக்கெட்டுகளை நிர்வகிக்கவும்
+Permission56005=அனைத்து மூன்றாம் தரப்பினரின் டிக்கெட்டுகளையும் பார்க்கவும் (வெளிப்புற பயனர்களுக்கு பயனுள்ளதாக இல்லை, எப்போதும் அவர்கள் சார்ந்திருக்கும் மூன்றாம் தரப்பினருக்கு மட்டுமே)
+
+TicketDictType=டிக்கெட் - வகைகள்
+TicketDictCategory=டிக்கெட் - குழுக்கள்
+TicketDictSeverity=டிக்கெட் - தீவிரங்கள்
+TicketDictResolution=டிக்கெட் - தீர்மானம்
+
+TicketTypeShortCOM=வணிக கேள்வி
+TicketTypeShortHELP=செயல்பாட்டு உதவிக்கான கோரிக்கை
+TicketTypeShortISSUE=சிக்கல் அல்லது பிழை
+TicketTypeShortPROBLEM=பிரச்சனை
+TicketTypeShortREQUEST=மாற்றம் அல்லது மேம்படுத்தல் கோரிக்கை
+TicketTypeShortPROJET=திட்டம்
+TicketTypeShortOTHER=மற்றவை
+
+TicketSeverityShortLOW=குறைந்த
+TicketSeverityShortNORMAL=இயல்பானது
+TicketSeverityShortHIGH=உயர்
+TicketSeverityShortBLOCKING=விமர்சனம், தடுப்பது
+
+TicketCategoryShortOTHER=மற்றவை
+
+ErrorBadEmailAddress=புலம் '%s' தவறானது
+MenuTicketMyAssign=எனது டிக்கெட்டுகள்
+MenuTicketMyAssignNonClosed=எனது திறந்த டிக்கெட்டுகள்
+MenuListNonClosed=டிக்கெட்டுகளைத் திறக்கவும்
+
+TypeContact_ticket_internal_CONTRIBUTOR=பங்களிப்பாளர்
+TypeContact_ticket_internal_SUPPORTTEC=ஒதுக்கப்பட்ட பயனர்
+TypeContact_ticket_external_SUPPORTCLI=வாடிக்கையாளர் தொடர்பு / சம்பவம் கண்காணிப்பு
+TypeContact_ticket_external_CONTRIBUTOR=வெளி பங்களிப்பாளர்
+
+OriginEmail=நிருபர் மின்னஞ்சல்
+Notify_TICKET_SENTBYMAIL=மின்னஞ்சல் மூலம் டிக்கெட் செய்தியை அனுப்பவும்
+
+# Status
+Read=படி
+Assigned=ஒதுக்கப்படும்
+InProgress=நடந்து கொண்டிருக்கிறது
+NeedMoreInformation=நிருபர் கருத்துக்காக காத்திருக்கிறேன்
+NeedMoreInformationShort=கருத்துக்காக காத்திருக்கிறேன்
+Answered=பதிலளித்தார்
+Waiting=காத்திருக்கிறது
+SolvedClosed=தீர்க்கப்பட்டது
+Deleted=நீக்கப்பட்டது
+
+# Dict
+Type=வகை
+Severity=தீவிரம்
+TicketGroupIsPublic=குழு பொது
+TicketGroupIsPublicDesc=ஒரு டிக்கெட் குழு பொதுவில் இருந்தால், பொது இடைமுகத்திலிருந்து டிக்கெட்டை உருவாக்கும் போது அது படிவத்தில் தெரியும்
+
+# Email templates
+MailToSendTicketMessage=டிக்கெட் செய்தியிலிருந்து மின்னஞ்சல் அனுப்ப
+
+#
+# Admin page
+#
+TicketSetup=டிக்கெட் தொகுதி அமைப்பு
+TicketSettings=அமைப்புகள்
+TicketSetupPage=
+TicketPublicAccess=அடையாளம் தேவைப்படாத பொது இடைமுகம் பின்வரும் url இல் உள்ளது
+TicketSetupDictionaries=டிக்கெட்டின் வகை, தீவிரம் மற்றும் பகுப்பாய்வு குறியீடுகள் அகராதிகளிலிருந்து கட்டமைக்கப்படுகின்றன
+TicketParamModule=தொகுதி மாறி அமைவு
+TicketParamMail=மின்னஞ்சல் அமைப்பு
+TicketEmailNotificationFrom=இருந்து அறிவிப்பு மின்னஞ்சல்
+TicketEmailNotificationFromHelp=உதாரணமாக டிக்கெட் செய்தி பதில் பயன்படுத்தப்படுகிறது
+TicketEmailNotificationTo=அறிவிப்புகள் மின்னஞ்சல்
+TicketEmailNotificationToHelp=இந்த முகவரிக்கு மின்னஞ்சல் அறிவிப்புகளை அனுப்பவும்.
+TicketNewEmailBodyLabel=டிக்கெட்டை உருவாக்கிய பிறகு அனுப்பப்பட்ட குறுஞ்செய்தி
+TicketNewEmailBodyHelp=பொது இடைமுகத்திலிருந்து புதிய டிக்கெட்டை உருவாக்குவதை உறுதிப்படுத்தும் மின்னஞ்சலில் இங்கு குறிப்பிடப்பட்டுள்ள உரை செருகப்படும். டிக்கெட்டின் ஆலோசனை பற்றிய தகவல்கள் தானாகவே சேர்க்கப்படும்.
+TicketParamPublicInterface=பொது இடைமுக அமைப்பு
+TicketsEmailMustExist=டிக்கெட்டை உருவாக்க, ஏற்கனவே உள்ள மின்னஞ்சல் முகவரி தேவை
+TicketsEmailMustExistHelp=பொது இடைமுகத்தில், புதிய டிக்கெட்டை உருவாக்க தரவுத்தளத்தில் மின்னஞ்சல் முகவரி ஏற்கனவே நிரப்பப்பட்டிருக்க வேண்டும்.
+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=டிக்கெட்டில் ஒரு பயனர் நியமிக்கப்படாவிட்டாலோ அல்லது பயனருக்குத் தெரிந்த மின்னஞ்சல் ஏதும் இல்லை என்றாலோ ஒவ்வொரு புதிய செய்தி அறிவிப்புகளுக்கும் இந்த முகவரிக்கு மின்னஞ்சலை அனுப்பவும்.
+#
+# Index & list page
+#
+TicketsIndex=டிக்கெட் பகுதி
+TicketList=டிக்கெட்டுகளின் பட்டியல்
+TicketAssignedToMeInfos=இந்தப் பக்கம் தற்போதைய பயனரால் உருவாக்கப்பட்ட அல்லது ஒதுக்கப்பட்ட டிக்கெட் பட்டியலைக் காட்டுகிறது
+NoTicketsFound=டிக்கெட் கிடைக்கவில்லை
+NoUnreadTicketsFound=படிக்காத டிக்கெட் எதுவும் இல்லை
+TicketViewAllTickets=அனைத்து டிக்கெட்டுகளையும் பார்க்கவும்
+TicketViewNonClosedOnly=திறந்த டிக்கெட்டுகளை மட்டும் பார்க்கவும்
+TicketStatByStatus=நிலைப்படி டிக்கெட்டுகள்
+OrderByDateAsc=ஏறுவரிசையின்படி வரிசைப்படுத்தவும்
+OrderByDateDesc=இறங்கு தேதியின்படி வரிசைப்படுத்தவும்
+ShowAsConversation=உரையாடல் பட்டியலாகக் காட்டு
+MessageListViewType=அட்டவணைப் பட்டியலாகக் காட்டு
+
+#
+# Ticket card
+#
+Ticket=டிக்கெட்
+TicketCard=டிக்கெட் அட்டை
+CreateTicket=டிக்கெட்டை உருவாக்கவும்
+EditTicket=டிக்கெட்டை திருத்தவும்
+TicketsManagement=டிக்கெட் மேலாண்மை
+CreatedBy=உருவாக்கியது
+NewTicket=புதிய டிக்கெட்
+SubjectAnswerToTicket=டிக்கெட் பதில்
+TicketTypeRequest=கோரிக்கை வகை
+TicketCategory=டிக்கெட் வகைப்பாடு
+SeeTicket=சீட்டைப் பார்க்கவும்
+TicketMarkedAsRead=டிக்கெட் படித்ததாகக் குறிக்கப்பட்டுள்ளது
+TicketReadOn=படிக்கவும்
+TicketCloseOn=கடைசி நாள்
+MarkAsRead=டிக்கெட்டைப் படித்ததாகக் குறிக்கவும்
+TicketHistory=டிக்கெட் வரலாறு
+AssignUser=பயனருக்கு ஒதுக்கவும்
+TicketAssigned=டிக்கெட் இப்போது ஒதுக்கப்பட்டுள்ளது
+TicketChangeType=வகையை மாற்றவும்
+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=டிக்கெட்டுக்கான பதிலின் உரைக்கு முன் இந்த உரை செருகப்படும்.
+TicketMessageMailSignature=கையெழுத்து
+TicketMessageMailSignatureHelp=இந்த உரை மின்னஞ்சலின் முடிவில் மட்டுமே சேர்க்கப்படும் மற்றும் சேமிக்கப்படாது.
+TicketMessageMailSignatureText= <p> உண்மையுள்ள, </p> <p> -- </p>
+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 to %s
+TicketNotNotifyTiersAtCreate=உருவாக்கும்போது நிறுவனத்தை அறிவிக்க வேண்டாம்
+Unread=படிக்காதது
+TicketNotCreatedFromPublicInterface=கிடைக்கவில்லை. பொது இடைமுகத்திலிருந்து டிக்கெட் உருவாக்கப்படவில்லை.
+ErrorTicketRefRequired=டிக்கெட் குறிப்பு பெயர் தேவை
+
+#
+# Logs
+#
+TicketLogMesgReadBy=%s டிக்கெட்டை %s படித்தார்
+NoLogForThisTicket=இந்த டிக்கெட்டுக்கான பதிவு இன்னும் இல்லை
+TicketLogAssignedTo=%s டிக்கெட் %sக்கு ஒதுக்கப்பட்டது
+TicketLogPropertyChanged=டிக்கெட் %s மாற்றப்பட்டது: %s இலிருந்து %s என வகைப்பாடு
+TicketLogClosedBy=%s டிக்கெட்டை %s மூடியது
+TicketLogReopen=டிக்கெட் %s மீண்டும் திறக்கப்பட்டது
+
+#
+# Public pages
+#
+TicketSystem=டிக்கெட் அமைப்பு
+ShowListTicketWithTrackId=டிராக் ஐடியிலிருந்து டிக்கெட் பட்டியலைக் காண்பி
+ShowTicketWithTrackId=டிராக் ஐடியிலிருந்து டிக்கெட்டைக் காண்பி
+TicketPublicDesc=நீங்கள் ஒரு ஆதரவு டிக்கெட்டை உருவாக்கலாம் அல்லது ஏற்கனவே உள்ள ஐடியிலிருந்து சரிபார்க்கலாம்.
+YourTicketSuccessfullySaved=டிக்கெட் வெற்றிகரமாக சேமிக்கப்பட்டது!
+MesgInfosPublicTicketCreatedWithTrackId=ஐடி %s மற்றும் Ref %s உடன் புதிய டிக்கெட் உருவாக்கப்பட்டது.
+PleaseRememberThisId=நாங்கள் பின்னர் உங்களிடம் கேட்கக்கூடிய கண்காணிப்பு எண்ணை வைத்துக் கொள்ளவும்.
+TicketNewEmailSubject=டிக்கெட் உருவாக்கம் உறுதிப்படுத்தல் - Ref %s (பொது டிக்கெட் ஐடி %s)
+TicketNewEmailSubjectCustomer=புதிய ஆதரவு டிக்கெட்
+TicketNewEmailBody=நீங்கள் புதிய டிக்கெட்டைப் பதிவுசெய்துள்ளீர்கள் என்பதை உறுதிப்படுத்தும் தானியங்கி மின்னஞ்சல் இது.
+TicketNewEmailBodyCustomer=இது உங்கள் கணக்கில் புதிய டிக்கெட் உருவாக்கப்பட்டது என்பதை உறுதிப்படுத்தும் தானியங்கி மின்னஞ்சல்.
+TicketNewEmailBodyInfosTicket=டிக்கெட்டை கண்காணிப்பதற்கான தகவல்
+TicketNewEmailBodyInfosTrackId=டிக்கெட் கண்காணிப்பு எண்: %s
+TicketNewEmailBodyInfosTrackUrl=மேலே உள்ள இணைப்பைக் கிளிக் செய்வதன் மூலம் டிக்கெட்டின் முன்னேற்றத்தைக் காணலாம்.
+TicketNewEmailBodyInfosTrackUrlCustomer=பின்வரும் இணைப்பைக் கிளிக் செய்வதன் மூலம் குறிப்பிட்ட இடைமுகத்தில் டிக்கெட்டின் முன்னேற்றத்தைக் காணலாம்
+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=டிக்கெட் %s புதுப்பிக்கப்பட்டது
+TicketNotificationEmailBody=%s டிக்கெட் புதுப்பிக்கப்பட்டதைத் தெரிவிக்கும் தானியங்கி செய்தி இது
+TicketNotificationRecipient=அறிவிப்பு பெறுபவர்
+TicketNotificationLogMessage=பதிவு செய்தி
+TicketNotificationEmailBodyInfosTrackUrlinternal=இடைமுகத்தில் டிக்கெட்டைப் பார்க்கவும்
+TicketNotificationNumberEmailSent=அறிவிப்பு மின்னஞ்சல் அனுப்பப்பட்டது: %s
+
+ActionsOnTicket=டிக்கெட்டில் நிகழ்வுகள்
+
+#
+# Boxes
+#
+BoxLastTicket=சமீபத்தில் உருவாக்கப்பட்ட டிக்கெட்டுகள்
+BoxLastTicketDescription=சமீபத்திய %s டிக்கெட்டுகளை உருவாக்கியது
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=சமீபத்தில் படிக்காத டிக்கெட்டுகள் இல்லை
+BoxLastModifiedTicket=சமீபத்திய திருத்தப்பட்ட டிக்கெட்டுகள்
+BoxLastModifiedTicketDescription=சமீபத்திய %s திருத்தப்பட்ட டிக்கெட்டுகள்
+BoxLastModifiedTicketContent=
+BoxLastModifiedTicketNoRecordedTickets=சமீபத்தில் திருத்தப்பட்ட டிக்கெட்டுகள் இல்லை
+BoxTicketType=வகை மூலம் திறந்த டிக்கெட் விநியோகம்
+BoxTicketSeverity=தீவிரத்தின் அடிப்படையில் திறந்த டிக்கெட்டுகளின் எண்ணிக்கை
+BoxNoTicketSeverity=டிக்கெட் எதுவும் திறக்கப்படவில்லை
+BoxTicketLastXDays=கடந்த %s நாட்களில் புதிய டிக்கெட்டுகளின் எண்ணிக்கை
+BoxTicketLastXDayswidget = கடந்த X நாட்களின் புதிய டிக்கெட்டுகளின் எண்ணிக்கை
+BoxNoTicketLastXDays=கடந்த %s நாட்களில் புதிய டிக்கெட் இல்லை
+BoxNumberOfTicketByDay=நாளுக்கு நாள் புதிய டிக்கெட்டுகளின் எண்ணிக்கை
+BoxNewTicketVSClose=மூடப்பட்ட டிக்கெட்டுகளுக்கு எதிராக டிக்கெட்டுகளின் எண்ணிக்கை (இன்று)
+TicketCreatedToday=டிக்கெட் இன்று உருவாக்கப்பட்டது
+TicketClosedToday=இன்று டிக்கெட் முடிந்தது
+KMFoundForTicketGroup=உங்கள் கேள்விக்கு பதிலளிக்கக்கூடிய தலைப்புகள் மற்றும் அடிக்கடி கேட்கப்படும் கேள்விகளைக் கண்டறிந்துள்ளோம், டிக்கெட்டைச் சமர்ப்பிக்கும் முன் அவற்றைச் சரிபார்த்ததற்கு நன்றி
diff --git a/htdocs/langs/ta_IN/trips.lang b/htdocs/langs/ta_IN/trips.lang
new file mode 100644
index 00000000000..783e0d23e23
--- /dev/null
+++ b/htdocs/langs/ta_IN/trips.lang
@@ -0,0 +1,150 @@
+# Dolibarr language file - Source file is en_US - trips
+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> சரிபார்க்க இங்கே கிளிக் செய்யவும்: a0ecb2ec87f49f
+ExpenseReportWaitingForReApproval=மறு ஒப்புதலுக்காக செலவு அறிக்கை சமர்ப்பிக்கப்பட்டுள்ளது
+ExpenseReportWaitingForReApprovalMessage=செலவு அறிக்கை சமர்ப்பிக்கப்பட்டு, மறு ஒப்புதலுக்காகக் காத்திருக்கிறது. <br> %s, இந்த காரணத்திற்காக செலவு அறிக்கையை அங்கீகரிக்க மறுத்துவிட்டீர்கள்: %s. <br> புதிய பதிப்பு முன்மொழியப்பட்டு உங்கள் ஒப்புதலுக்காகக் காத்திருக்கிறது. <br> - பயனர்: %s <br> - காலம்: %s <br> சரிபார்க்க இங்கே கிளிக் செய்யவும்: a0ecb2ec87f49f
+ExpenseReportApproved=செலவு அறிக்கை அங்கீகரிக்கப்பட்டது
+ExpenseReportApprovedMessage=செலவு அறிக்கை %s அங்கீகரிக்கப்பட்டது. <br> - பயனர்: %s <br> - ஆல் அங்கீகரிக்கப்பட்டது: %s <br> செலவு அறிக்கையைக் காட்ட இங்கே கிளிக் செய்யவும்: a0ecb49fz807f
+ExpenseReportRefused=செலவு அறிக்கை மறுக்கப்பட்டது
+ExpenseReportRefusedMessage=செலவு அறிக்கை %s மறுக்கப்பட்டது. <br> - பயனர்: %s <br> - நிராகரித்தவர்: %s <br> - மறுப்புக்கான நோக்கம்: a0ecb2ec870 ரிப்போர்ட்: a0ecb2ecz8
+ExpenseReportCanceled=செலவு அறிக்கை ரத்து செய்யப்பட்டது
+ExpenseReportCanceledMessage=செலவு அறிக்கை %s ரத்து செய்யப்பட்டது. <br> - பயனர்: %s <br> - ரத்துசெய்தவர்: %s <br> - ரத்து செய்வதற்கான நோக்கம்: a0ecb2ecfda19bz0 - ரத்து செய்வதற்கான நோக்கம்: இங்கே கிளிக் செய்யவும்
+ExpenseReportPaid=செலவு அறிக்கை செலுத்தப்பட்டது
+ExpenseReportPaidMessage=செலவு அறிக்கை %s செலுத்தப்பட்டது. <br> - பயனர்: %s <br> - செலுத்தியவர்: %s <br> செலவு அறிக்கையைக் காட்ட இங்கே கிளிக் செய்யவும்: a0ecb2ec87f49fz87f
+TripId=ஐடி செலவு அறிக்கை
+AnyOtherInThisListCanValidate=கோரிக்கையைச் சரிபார்ப்பதற்காகத் தெரிவிக்கப்பட வேண்டிய நபர்.
+TripSociete=தகவல் நிறுவனம்
+TripNDF=தகவல் செலவு அறிக்கை
+PDFStandardExpenseReports=செலவு அறிக்கைக்கான PDF ஆவணத்தை உருவாக்குவதற்கான நிலையான டெம்ப்ளேட்
+ExpenseReportLine=செலவு அறிக்கை வரி
+TF_OTHER=மற்றவை
+TF_TRIP=போக்குவரத்து
+TF_LUNCH=மதிய உணவு
+TF_METRO=மெட்ரோ
+TF_TRAIN=தொடர்வண்டி
+TF_BUS=பேருந்து
+TF_CAR=கார்
+TF_PEAGE=டோல்
+TF_ESSENCE=எரிபொருள்
+TF_HOTEL=ஹோட்டல்
+TF_TAXI=டாக்ஸி
+EX_KME=மைலேஜ் செலவுகள்
+EX_FUE=எரிபொருள் சி.வி
+EX_HOT=ஹோட்டல்
+EX_PAR=பார்க்கிங் CV
+EX_TOL=டோல் CV
+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=எரிபொருள் பி.வி
+EX_TOL_VP=டோல் பி.வி
+EX_PAR_VP=பார்க்கிங் பி.வி
+EX_CAM_VP=PV பராமரிப்பு மற்றும் பழுது
+DefaultCategoryCar=இயல்புநிலை போக்குவரத்து முறை
+DefaultRangeNumber=இயல்பு வரம்பு எண்
+UploadANewFileNow=இப்போது ஒரு புதிய ஆவணத்தைப் பதிவேற்றவும்
+Error_EXPENSEREPORT_ADDON_NotDefined=பிழை, 'செலவு அறிக்கை' தொகுதியின் அமைப்பில் செலவு அறிக்கை எண் ref க்கான விதி வரையறுக்கப்படவில்லை
+ErrorDoubleDeclaration=இதே தேதி வரம்பில் மற்றொரு செலவு அறிக்கையை அறிவித்துள்ளீர்கள்.
+AucuneLigne=செலவு அறிக்கை இன்னும் அறிவிக்கப்படவில்லை
+ModePaiement=கட்டண முறை
+VALIDATOR=ஒப்புதலுக்குப் பயனர் பொறுப்பு
+VALIDOR=அங்கீகரிக்கப்பட்டது
+AUTHOR=பதிவு செய்தது
+AUTHORPAIEMENT=மூலம் செலுத்தப்பட்டது
+REFUSEUR=மூலம் மறுக்கப்பட்டது
+CANCEL_USER=மூலம் நீக்கப்பட்டது
+MOTIF_REFUS=காரணம்
+MOTIF_CANCEL=காரணம்
+DATE_REFUS=தேதியை மறுக்கவும்
+DATE_SAVE=சரிபார்ப்பு தேதி
+DATE_CANCEL=ரத்து தேதி
+DATE_PAIEMENT=கட்டணம் தேதி
+ExpenseReportRef=Ref. செலவு அறிக்கை
+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 coef) = %s
+ExpenseReportApplyTo=விண்ணப்பிக்க
+ExpenseReportDomain=விண்ணப்பிக்க வேண்டிய டொமைன்
+ExpenseReportLimitOn=வரம்பு
+ExpenseReportDateStart=தேதி தொடக்கம்
+ExpenseReportDateEnd=தேதி முடிவு
+ExpenseReportLimitAmount=அதிகபட்ச தொகை
+ExpenseReportRestrictive=மீறுவது தடைசெய்யப்பட்டுள்ளது
+AllExpenseReport=அனைத்து வகையான செலவு அறிக்கை
+OnExpense=செலவு வரி
+ExpenseReportRuleSave=செலவு அறிக்கை விதி சேமிக்கப்பட்டது
+ExpenseReportRuleErrorOnSave=பிழை: %s
+RangeNum=வரம்பு %d
+ExpenseReportConstraintViolationError=அதிகபட்ச தொகை மீறப்பட்டது (விதி %s): %s %s ஐ விட அதிகமாக உள்ளது (தடைசெய்யப்பட்டது)
+byEX_DAY=நாளுக்கு நாள் (%s க்கு வரம்பு)
+byEX_MON=மாதத்தின்படி (%s க்கு வரம்பு)
+byEX_YEA=ஆண்டு வாரியாக (%s க்கு வரம்பு)
+byEX_EXP=வரி மூலம் (%s க்கு வரம்பு)
+ExpenseReportConstraintViolationWarning=அதிகபட்சத் தொகை மீறப்பட்டுள்ளது (விதி %s): %s %s ஐ விட அதிகமாக உள்ளது (அங்கீகரிக்கப்பட்டது)
+nolimitbyEX_DAY=நாளுக்கு நாள் (வரம்பு இல்லை)
+nolimitbyEX_MON=மாதம் (வரம்பு இல்லை)
+nolimitbyEX_YEA=ஆண்டு வாரியாக (வரம்பு இல்லை)
+nolimitbyEX_EXP=வரி மூலம் (வரம்பு இல்லை)
+CarCategory=வாகன வகை
+ExpenseRangeOffset=ஆஃப்செட் தொகை: %s
+RangeIk=மைலேஜ் வரம்பு
+AttachTheNewLineToTheDocument=பதிவேற்றிய ஆவணத்துடன் வரியை இணைக்கவும்
diff --git a/htdocs/langs/ta_IN/users.lang b/htdocs/langs/ta_IN/users.lang
new file mode 100644
index 00000000000..535e5c03621
--- /dev/null
+++ b/htdocs/langs/ta_IN/users.lang
@@ -0,0 +1,126 @@
+# Dolibarr language file - Source file is en_US - users
+HRMArea=HRM பகுதி
+UserCard=பயனர் அட்டை
+GroupCard=குழு அட்டை
+Permission=அனுமதி
+Permissions=அனுமதிகள்
+EditPassword=கடவுச்சொல்லை திருத்தவும்
+SendNewPassword=கடவுச்சொல்லை மீண்டும் உருவாக்கி அனுப்பவும்
+SendNewPasswordLink=Send link to reset password
+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> இயல்புநிலை </u> அனுமதிகளை இங்கே வரையறுக்கவும் (தற்போதுள்ள பயனர்களுக்கான அனுமதிகளை மாற்ற, பயனர் அட்டைக்குச் செல்லவும்).
+DolibarrUsers=டோலிபார் பயனர்கள்
+LastName=கடைசி பெயர்
+FirstName=முதல் பெயர்
+ListOfGroups=குழுக்களின் பட்டியல்
+NewGroup=புதிய குழு
+CreateGroup=குழுவை உருவாக்கவும்
+RemoveFromGroup=குழுவிலிருந்து நீக்கு
+PasswordChangedAndSentTo=கடவுச்சொல் மாற்றப்பட்டு <b> %s </b> க்கு அனுப்பப்பட்டது.
+PasswordChangeRequest=<b> %s </b>க்கான கடவுச்சொல்லை மாற்ற கோரிக்கை
+PasswordChangeRequestSent=<b> %s </b>க்கான கடவுச்சொல்லை மாற்றுவதற்கான கோரிக்கை <b> %s a09a4b730f.17f8
+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=பயனர்கள் மற்றும் அவர்களின் பண்புகள்
+DomainUser=டொமைன் பயனர் %s
+Reactivate=மீண்டும் இயக்கு
+CreateInternalUserDesc=இந்தப் படிவம் உங்கள் நிறுவனம்/நிறுவனத்தில் ஒரு உள் பயனரை உருவாக்க உங்களை அனுமதிக்கிறது. வெளிப்புறப் பயனரை (வாடிக்கையாளர், விற்பனையாளர் போன்றவை..) உருவாக்க, அந்த மூன்றாம் தரப்பினரின் தொடர்பு அட்டையிலிருந்து 'டோலிபார் பயனரை உருவாக்கு' என்ற பொத்தானைப் பயன்படுத்தவும்.
+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=OpenID URL
+LoginUsingOpenID=உள்நுழைய OpenID ஐப் பயன்படுத்தவும்
+WeeklyHours=வேலை நேரம் (வாரத்திற்கு)
+ExpectedWorkedHours=வாரத்திற்கு எதிர்பார்க்கப்படும் மணிநேரம் வேலை
+ColorUser=பயனரின் நிறம்
+DisabledInMonoUserMode=பராமரிப்பு முறையில் முடக்கப்பட்டது
+UserAccountancyCode=பயனர் கணக்கியல் குறியீடு
+UserLogoff=பயனர் வெளியேறுதல்
+UserLogged=பயனர் உள்நுழைந்தார்
+DateOfEmployment=வேலை தேதி
+DateEmployment=வேலைவாய்ப்பு
+DateEmploymentstart=வேலை தொடங்கும் தேதி
+DateEmploymentEnd=வேலைவாய்ப்பு முடிவு தேதி
+RangeOfLoginValidity=அணுகல் செல்லுபடியாகும் தேதி வரம்பு
+CantDisableYourself=உங்கள் சொந்த பயனர் பதிவை முடக்க முடியாது
+ForceUserExpenseValidator=கட்டாய செலவு அறிக்கை மதிப்பீட்டாளர்
+ForceUserHolidayValidator=கட்டாய விடுப்பு கோரிக்கை வேலிடேட்டர்
+ValidatorIsSupervisorByDefault=இயல்பாக, மதிப்பீட்டாளர் பயனரின் மேற்பார்வையாளர். இந்த நடத்தையை வைத்திருக்க காலியாக இருங்கள்.
+UserPersonalEmail=தனிப்பட்ட மின்னஞ்சல்
+UserPersonalMobile=தனிப்பட்ட மொபைல் போன்
+WarningNotLangOfInterface=எச்சரிக்கை, இது பயனர் பேசும் முக்கிய மொழி, அவர் பார்க்கத் தேர்ந்தெடுத்த இடைமுகத்தின் மொழி அல்ல. இந்தப் பயனரால் காணக்கூடிய இடைமுக மொழியை மாற்ற, %s தாவலுக்குச் செல்லவும்.
diff --git a/htdocs/langs/ta_IN/website.lang b/htdocs/langs/ta_IN/website.lang
new file mode 100644
index 00000000000..15fa755fd54
--- /dev/null
+++ b/htdocs/langs/ta_IN/website.lang
@@ -0,0 +1,147 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=குறியீடு
+WebsiteSetupDesc=நீங்கள் பயன்படுத்த விரும்பும் இணையதளங்களை இங்கே உருவாக்கவும். அவற்றைத் திருத்த, மெனு இணையதளங்களுக்குச் செல்லவும்.
+DeleteWebsite=இணையதளத்தை நீக்கு
+ConfirmDeleteWebsite=இந்த இணையதளத்தை நிச்சயமாக நீக்க விரும்புகிறீர்களா? அதன் அனைத்து பக்கங்களும் உள்ளடக்கமும் அகற்றப்படும். பதிவேற்றப்பட்ட கோப்புகள் (மீடியாஸ் கோப்பகத்தில், ECM தொகுதி, ...) அப்படியே இருக்கும்.
+WEBSITE_TYPE_CONTAINER=பக்கம்/கொள்கலன் வகை
+WEBSITE_PAGE_EXAMPLE=உதாரணமாக பயன்படுத்த இணையப் பக்கம்
+WEBSITE_PAGENAME=பக்கத்தின் பெயர்/மாற்றுப்பெயர்
+WEBSITE_ALIASALT=மாற்றுப் பக்கப் பெயர்கள்/மாற்றுப்பெயர்கள்
+WEBSITE_ALIASALTDesc=மற்ற பெயர்கள்/மாற்றுப்பெயர்களின் பட்டியலை இங்கே பயன்படுத்தவும், இதன் மூலம் இந்தப் பக்கத்தை மற்ற பெயர்கள்/மாற்றுப்பெயர்களைப் பயன்படுத்தியும் அணுகலாம் (உதாரணமாக, பழைய இணைப்பு/பெயரில் பின்னிணைப்பை வைத்திருக்க மாற்றுப்பெயரை மறுபெயரிட்ட பிறகு பழைய பெயர்). தொடரியல்: <br> மாற்றுப்பெயர்1, மாற்றுப்பெயர்2, ...
+WEBSITE_CSS_URL=வெளிப்புற CSS கோப்பின் URL
+WEBSITE_CSS_INLINE=CSS கோப்பு உள்ளடக்கம் (அனைத்து பக்கங்களுக்கும் பொதுவானது)
+WEBSITE_JS_INLINE=ஜாவாஸ்கிரிப்ட் கோப்பு உள்ளடக்கம் (அனைத்து பக்கங்களுக்கும் பொதுவானது)
+WEBSITE_HTML_HEADER=HTML தலைப்பின் கீழே சேர்த்தல் (அனைத்து பக்கங்களுக்கும் பொதுவானது)
+WEBSITE_ROBOT=ரோபோ கோப்பு (robots.txt)
+WEBSITE_HTACCESS=வலைத்தளம் .htaccess கோப்பு
+WEBSITE_MANIFEST_JSON=இணையதளம் manifest.json கோப்பு
+WEBSITE_README=README.md கோப்பு
+WEBSITE_KEYWORDSDesc=மதிப்புகளைப் பிரிக்க கமாவைப் பயன்படுத்தவும்
+EnterHereLicenseInformation=README.md கோப்பை நிரப்ப இங்கே மெட்டா தரவு அல்லது உரிமத் தகவலை உள்ளிடவும். உங்கள் வலைத்தளத்தை டெம்ப்ளேட்டாக விநியோகித்தால், கோப்பு டெம்டேட் தொகுப்பில் சேர்க்கப்படும்.
+HtmlHeaderPage=HTML தலைப்பு (இந்தப் பக்கத்திற்கு மட்டும்)
+PageNameAliasHelp=பக்கத்தின் பெயர் அல்லது மாற்றுப்பெயர். <br> இணைய சேவையகத்தின் மெய்நிகர் ஹோஸ்டிலிருந்து (Apacke, Nginx, ... போன்றவை) இணையதளம் இயங்கும் போது SEO URL ஐ உருவாக்கவும் இந்த மாற்றுப்பெயர் பயன்படுத்தப்படுகிறது. இந்த மாற்றுப் பெயரைத் திருத்த, " <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=பக்கம்/கலன்
+PageDeleted=%s இணையதளத்தின் பக்கம்/Contenair '%s' நீக்கப்பட்டது
+PageAdded=பக்கம்/Contenair '%s' சேர்க்கப்பட்டது
+ViewSiteInNewTab=புதிய தாவலில் தளத்தைப் பார்க்கவும்
+ViewPageInNewTab=புதிய தாவலில் பக்கத்தைப் பார்க்கவும்
+SetAsHomePage=முகப்பு பக்கமாக ஆக்கவும்
+RealURL=உண்மையான URL
+ViewWebsiteInProduction=வீட்டு URLகளைப் பயன்படுத்தி இணையதளத்தைப் பார்க்கவும்
+SetHereVirtualHost= அப்பாச்சி கொண்ட <u> பயன்பாட்டு / Nginx / ... </u> <br> உங்கள் வலை சர்வரில் உருவாக்கவும் (அப்பாச்சி, nginx, ...) PHP ஒரு அர்ப்பணிப்பு மெய்நிகர் ஹோஸ்ட் செயல்படுத்தப்படும் மற்றும் ஒரு ரூட் டைரக்டரி <br> <strong> %s </strong>
+ExampleToUseInApacheVirtualHostConfig=Apache மெய்நிகர் ஹோஸ்ட் அமைப்பில் பயன்படுத்துவதற்கான எடுத்துக்காட்டு:
+YouCanAlsoTestWithPHPS= அன்று <br> PHP பதிக்கப்பட்ட சர்வர் </u> கொண்டு <u> பயன்பாட்டு உருவாக்க சூழல், நீங்கள் <br> <strong> PHP -S 0.0.0.0:8080 -t %s </strong> இயங்கும் மூலம் PHP பதிக்கப்பட்ட இணையதள சர்வர் தளம் (PHP 5.5, தேவை) சோதிக்க விரும்பும் அதிகப்படியான
+YouCanAlsoDeployToAnotherWHP= <u> மற்றொரு Dolibarr ஹோஸ்டிங் வழங்குநருடன் உங்கள் வலைத்தளத்தை இயக்கவும் </u> <br> இணையத்தில் Apache அல்லது NGinx போன்ற இணைய சேவையகம் உங்களிடம் இல்லையென்றால், உங்கள் இணைய தளத்தை ஏற்றுமதி மற்றும் இறக்குமதி செய்யலாம். இணையத்தள தொகுதியுடன் ஒருங்கிணைப்பு. சில Dolibarr ஹோஸ்டிங் வழங்குநர்களின் பட்டியலை <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> இல் காணலாம் https://saas.dolibarr.org </a>
+CheckVirtualHostPerms=மெய்நிகர் ஹோஸ்ட் பயனருக்கு (உதாரணமாக www-data) <br> a0e7843947cf606b6bza407cf606b6bza407cf606b06b06b06b090600606000606b06bz407c0906bz407c0906bz060060506bz06006bz0600605006bz06006bz06bz06006bz090607006bz0606bz090600605000665d071.
+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> %s ஐ புதிய தாவலில் முன்னோட்டமிடவும். </u> <br> <br> %s ஆனது Dolibarr சேவையகத்தால் வழங்கப்படும், எனவே இதற்கு எந்த கூடுதல் இணைய சேவையகமும் (Apache, Nginx, IIS போன்றவை) நிறுவப்பட வேண்டியதில்லை. <br> பக்கங்களின் URLகள் பயனர்களுக்கு ஏற்றதாக இல்லை மற்றும் உங்கள் Dolibarrன் பாதையில் தொடங்குவது சிரமமானது. <br> URL ஐ Dolibarr சேவையாற்றி: <br> <strong> %s </strong> <br> <br>, இந்த வலை தளத்தில் பணியாற்ற உங்கள் வலை சர்வரில் ஒரு மெய்நிகர் ஹோஸ்ட் உருவாக்க உங்கள் சொந்த வெளிப்புற வலை சர்வர் பயன்படுத்த என்று அடைவு புள்ளிகள் <br> <strong> %s </strong> <br> பின்னர் இந்த மெய்நிகர் சர்வர் பெயரை உள்ளிடவும் இந்த வலைத்தளத்தின் பண்புகளில் "சோதனை/இணையத்தில் வரிசைப்படுத்து" என்ற இணைப்பைக் கிளிக் செய்யவும்.
+VirtualHostUrlNotDefined=வெளிப்புற வலை சேவையகத்தால் வழங்கப்படும் மெய்நிகர் ஹோஸ்டின் URL வரையறுக்கப்படவில்லை
+NoPageYet=இன்னும் பக்கங்கள் இல்லை
+YouCanCreatePageOrImportTemplate=நீங்கள் ஒரு புதிய பக்கத்தை உருவாக்கலாம் அல்லது முழு இணையதள டெம்ப்ளேட்டை இறக்குமதி செய்யலாம்
+SyntaxHelp=குறிப்பிட்ட தொடரியல் உதவிக்குறிப்புகளில் உதவி
+YouCanEditHtmlSourceckeditor=எடிட்டரில் உள்ள "மூல" பொத்தானைப் பயன்படுத்தி HTML மூலக் குறியீட்டைத் திருத்தலாம்.
+YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> நீங்கள் குறிச்சொற்களை பயன்படுத்தி இந்த மூல ஒரு PHP குறியீடு சேர்க்க முடியும் <strong> &lt;? PHP? &gt; </strong>. பின்வரும் உலகளாவிய மாறிகள் கிடைக்கின்றன: $conf, $db, $mysoc, $user, $website, $websitepage, $weblans, $pagelangs. <br> <br> <span class="fa fa-bug"> </span> நீங்கள் பின்வரும் தொடரியல் மற்றொரு பக்கம் / கொள்கலன் உள்ளடக்கத்தை சேர்க்க முடியும்? <br> <strong> &lt; PHP includeContainer ( 'alias_of_container_to_include'); (வெளியீட்டை ஒரு திருப்பி முன் எந்த உள்ளடக்கத்தை செய்ய குறிப்பு): &gt; </strong> <br> <br> <span class="fa fa-bug"> </span> நீங்கள் பின்வரும் தொடரியல் மற்றொரு பக்கம் / கொள்கலன் ஒரு திருப்பி செய்ய முடியும்? <br> <strong> &lt; PHP redirectToContainer ( 'alias_of_container_to_redirect_to'); ? <strong> ஆவணங்கள் ஒரு சேமிக்கப்பட்ட கோப்பு </strong> பதிவிறக்க ஒரு <strong> இணைப்பை சேர்க்க <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> தொடரியல் பயன்படுத்த, மற்றொரு பக்கம் ஒரு இணைப்பை சேர்க்க </strong> அடைவு, <strong> document.php </strong> போர்வையை பயன்படுத்துகின்றன: ஆவணங்களை / ECM ஒரு கோப்பு, <br> எடுத்துக்காட்டு (தேவை வெளியேற்ற வேண்டும்), தொடரியலாகும்: <br> <strong> &lt;a, href = "/ document.php modulepart = ECM & கோப்பை = [relative_dir / கோப்பு பெயர் "/Document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt; </strong> <br> ஒரு பங்கு இணைப்பு (கோப்பு பகிர்வு ஹாஷ் முக்கிய பயன்படுத்தி திறந்தவெளி அணுகல்) பகிர்ந்த கோப்பின், தொடரியலாகும்: <br> <strong> &lt;a, href =" /document.php?hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> </span> அடைவு </strong> <strong> ஆவணங்கள் ஒரு சேமிக்கப்படும் ஒரு <strong> படத்தை </strong>, <strong> viewimage.php </strong> போர்வையை பயன்படுத்த சேர்ப்பதற்கு: ஆவணங்களை / மீடியாக்களுடன் ஒரு படத்தை, <br> எடுத்துக்காட்டாக (திறந்த பொது அணுகல் directory) தொடரியலாகும்: <br> <strong> &lt;img மூல = "? / viewimage.php modulepart = medias&amp;file = [relative_dir /] filename.ext" &gt; </strong> <br>
+#YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource2=<br> <strong> &lt;img மூல = "? / viewimage.php hashp = 12345679012 ..." &gt; </strong> <br>: (கோப்பு பகிர்வு ஹாஷ் முக்கிய பயன்படுத்தி திறந்தவெளி அணுகல்) ஒரு பங்கு இணைப்புடன் பகிர்ந்துள்ளார் ஒரு படத்திற்கு, தொடரியலாகும்
+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 பாணிகள் அல்லது முரண்பாடான ஜாவாஸ்கிரிப்டைப் பயன்படுத்தினால், இந்தப் பக்கத்தில் பணிபுரியும் போது, இணையதள எடிட்டரின் தோற்றம் அல்லது அம்சங்களை அது உடைக்கலாம். இந்த முறை ஒரு பக்கத்தை உருவாக்குவதற்கான விரைவான வழியாகும், ஆனால் உங்கள் புதிய பக்கத்தை புதிதாக அல்லது பரிந்துரைக்கப்பட்ட பக்க டெம்ப்ளேட்டிலிருந்து உருவாக்க பரிந்துரைக்கப்படுகிறது. <br> கிராப் செய்யப்பட்ட வெளிப்புறப் பக்கத்தில் பயன்படுத்தும்போது இன்லைன் எடிட்டர் சரியாக வேலை செய்யாமல் போகலாம் என்பதையும் கவனத்தில் கொள்ளவும்.
+OnlyEditionOfSourceForGrabbedContent=வெளிப்புற தளத்தில் இருந்து உள்ளடக்கம் கைப்பற்றப்பட்டால் HTML மூலத்தின் பதிப்பு மட்டுமே சாத்தியமாகும்
+GrabImagesInto=css மற்றும் பக்கத்தில் காணப்படும் படங்களையும் கைப்பற்றவும்.
+ImagesShouldBeSavedInto=படங்கள் கோப்பகத்தில் சேமிக்கப்பட வேண்டும்
+WebsiteRootOfImages=இணையதளப் படங்களுக்கான ரூட் டைரக்டரி
+SubdirOfPage=துணை அடைவு பக்கத்திற்கு அர்ப்பணிக்கப்பட்டது
+AliasPageAlreadyExists=மாற்றுப் பக்கம் <strong> %s </strong> ஏற்கனவே உள்ளது
+CorporateHomePage=கார்ப்பரேட் முகப்புப் பக்கம்
+EmptyPage=காலியான பக்கம்
+ExternalURLMustStartWithHttp=வெளிப்புற URL கண்டிப்பாக http:// அல்லது https:// உடன் தொடங்க வேண்டும்
+ZipOfWebsitePackageToImport=இணையதள டெம்ப்ளேட் தொகுப்பின் ஜிப் கோப்பை பதிவேற்றவும்
+ZipOfWebsitePackageToLoad=அல்லது கிடைக்கக்கூடிய உட்பொதிக்கப்பட்ட இணையதள டெம்ப்ளேட் தொகுப்பைத் தேர்வு செய்யவும்
+ShowSubcontainers=டைனமிக் உள்ளடக்கத்தைக் காட்டு
+InternalURLOfPage=பக்கத்தின் உள் URL
+ThisPageIsTranslationOf=இந்தப் பக்கம்/கன்டெய்னர் இன் மொழிபெயர்ப்பு
+ThisPageHasTranslationPages=இந்தப் பக்கம்/கன்டெய்னரில் மொழிபெயர்ப்பு உள்ளது
+NoWebSiteCreateOneFirst=இதுவரை எந்த இணையதளமும் உருவாக்கப்படவில்லை. முதலில் ஒன்றை உருவாக்கவும்.
+GoTo=செல்லுங்கள்
+DynamicPHPCodeContainsAForbiddenInstruction=PHP அறிவுறுத்தலைக் கொண்ட டைனமிக் PHP குறியீட்டைச் சேர்த்துள்ளீர்கள் ' <strong> %s </strong> ' இது டைனமிக் உள்ளடக்கமாக இயல்பாகவே தடைசெய்யப்பட்டுள்ளது (அனுமதிக்கப்பட்ட உள்ளடக்கத்தை அதிகரிக்க, WEBSITE_PHPxx இன் மறைக்கப்பட்ட விருப்பங்களைப் பார்க்கவும்).
+NotAllowedToAddDynamicContent=இணையதளங்களில் PHP டைனமிக் உள்ளடக்கத்தைச் சேர்க்க அல்லது திருத்த உங்களுக்கு அனுமதி இல்லை. அனுமதி கேட்கவும் அல்லது குறியீட்டை மாற்றாமல் php குறிச்சொற்களில் வைக்கவும்.
+ReplaceWebsiteContent=இணையதள உள்ளடக்கத்தைத் தேடவும் அல்லது மாற்றவும்
+DeleteAlsoJs=இந்த இணையதளத்திற்கு குறிப்பிட்ட அனைத்து ஜாவாஸ்கிரிப்ட் கோப்புகளையும் நீக்கவா?
+DeleteAlsoMedias=இந்த இணையதளத்திற்கு குறிப்பிட்ட அனைத்து மீடியாஸ் கோப்புகளையும் நீக்கவா?
+MyWebsitePages=எனது இணையதள பக்கங்கள்
+SearchReplaceInto=தேடல் | மாற்றவும்
+ReplaceString=புதிய சரம்
+CSSContentTooltipHelp=இங்கே CSS உள்ளடக்கத்தை உள்ளிடவும். பயன்பாட்டின் CSS உடன் எந்த முரண்பாட்டையும் தவிர்க்க, .bodywebsite வகுப்பில் அனைத்து அறிவிப்புகளையும் முன்கூட்டியே தயார் செய்யவும். உதாரணமாக: <br> <br> #mycssselector, input.myclass: மிதவை {...} <br> <br> குறிப்பு: மிதவை {...} <br> <br> .bodywebsite #mycssselector, .bodywebsite input.myclass இருக்க வேண்டும் நீ இல்லாமல் ஒரு பெரிய கோப்பு இருந்தால் இந்த முன்னொட்டு, எல்லா இடங்களிலும் .bodywebsite முன்னொட்டைச் சேர்க்க, 'lessc' ஐப் பயன்படுத்தி அதை மாற்றலாம்.
+LinkAndScriptsHereAreNotLoadedInEditor=எச்சரிக்கை: சேவையகத்திலிருந்து தளத்தை அணுகும்போது மட்டுமே இந்த உள்ளடக்கம் வெளிவரும். இது எடிட் பயன்முறையில் பயன்படுத்தப்படாது, எனவே நீங்கள் ஜாவாஸ்கிரிப்ட் கோப்புகளை எடிட் பயன்முறையிலும் ஏற்ற வேண்டும் என்றால், உங்கள் 'ஸ்கிரிப்ட் src=...' என்ற குறிச்சொல்லை பக்கத்தில் சேர்க்கவும்.
+Dynamiccontent=டைனமிக் உள்ளடக்கம் கொண்ட பக்கத்தின் மாதிரி
+ImportSite=இணையதள டெம்ப்ளேட்டை இறக்குமதி செய்யவும்
+EditInLineOnOff='இன்லைனைத் திருத்து' என்பது %s
+ShowSubContainersOnOff='டைனமிக் உள்ளடக்கத்தை' இயக்குவதற்கான பயன்முறை %s ஆகும்
+GlobalCSSorJS=இணையத்தளத்தின் உலகளாவிய CSS/JS/தலைப்பு கோப்பு
+BackToHomePage=முகப்புப் பக்கத்திற்குத் திரும்பு...
+TranslationLinks=மொழிபெயர்ப்பு இணைப்புகள்
+YouTryToAccessToAFileThatIsNotAWebsitePage=கிடைக்காத பக்கத்தை அணுக முயற்சிக்கிறீர்கள். <br> (ref=%s, வகை=%s, நிலை=%s)
+UseTextBetween5And70Chars=நல்ல எஸ்சிஓ நடைமுறைகளுக்கு, 5 மற்றும் 70 எழுத்துகளுக்கு இடையே உள்ள உரையைப் பயன்படுத்தவும்
+MainLanguage=முதன்மை மொழி
+OtherLanguages=பிற மொழிகள்
+UseManifest=Manifess.json கோப்பை வழங்கவும்
+PublicAuthorAlias=பொது எழுத்தாளர் மாற்றுப்பெயர்
+AvailableLanguagesAreDefinedIntoWebsiteProperties=கிடைக்கும் மொழிகள் இணையதள பண்புகளாக வரையறுக்கப்பட்டுள்ளன
+ReplacementDoneInXPages=%s பக்கங்கள் அல்லது கொள்கலன்களில் மாற்றீடு செய்யப்படுகிறது
+RSSFeed=ஆர்எஸ்எஸ் ஊட்டம்
+RSSFeedDesc=இந்த URL ஐப் பயன்படுத்தி 'blogpost' வகையுடன் சமீபத்திய கட்டுரைகளின் RSS ஊட்டத்தைப் பெறலாம்
+PagesRegenerated=%s பக்கம்(கள்)/கொள்கலன்(கள்) மீண்டும் உருவாக்கப்பட்டது
+RegenerateWebsiteContent=இணைய தள தற்காலிக சேமிப்பு கோப்புகளை மீண்டும் உருவாக்கவும்
+AllowedInFrames=ஃபிரேம்களில் அனுமதிக்கப்படுகிறது
+DefineListOfAltLanguagesInWebsiteProperties=கிடைக்கக்கூடிய அனைத்து மொழிகளின் பட்டியலை இணைய தள பண்புகளாக வரையறுக்கவும்.
+GenerateSitemaps=இணையதள தளவரைபடக் கோப்பை உருவாக்கவும்
+ConfirmGenerateSitemaps=உறுதிப்படுத்தினால், ஏற்கனவே உள்ள தளவரைபடக் கோப்பை அழிப்பீர்கள்...
+ConfirmSitemapsCreation=தளவரைபட உருவாக்கத்தை உறுதிப்படுத்தவும்
+SitemapGenerated=தளவரைபடக் கோப்பு <b> %s </b> உருவாக்கப்பட்டது
+ImportFavicon=ஃபேவிகான்
+ErrorFaviconType=ஃபேவிகான் png ஆக இருக்க வேண்டும்
+ErrorFaviconSize=ஃபேவிகான் 16x16, 32x32 அல்லது 64x64 அளவில் இருக்க வேண்டும்
+FaviconTooltip=png ஆக இருக்க வேண்டிய படத்தைப் பதிவேற்றவும் (16x16, 32x32 அல்லது 64x64)
diff --git a/htdocs/langs/ta_IN/withdrawals.lang b/htdocs/langs/ta_IN/withdrawals.lang
new file mode 100644
index 00000000000..75c7a5fb563
--- /dev/null
+++ b/htdocs/langs/ta_IN/withdrawals.lang
@@ -0,0 +1,156 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=நேரடி டெபிட் ஆர்டர்கள் மூலம் பணம் செலுத்துதல்
+SuppliersStandingOrdersArea=கடன் பரிமாற்றத்தின் மூலம் பணம் செலுத்துதல்
+StandingOrdersPayment=நேரடி டெபிட் கட்டண ஆர்டர்கள்
+StandingOrderPayment=நேரடி டெபிட் கட்டண ஆர்டர்
+NewStandingOrder=புதிய நேரடி டெபிட் ஆர்டர்
+NewPaymentByBankTransfer=கடன் பரிமாற்றத்தின் மூலம் புதிய கட்டணம்
+StandingOrderToProcess=செயலாக்க
+PaymentByBankTransferReceipts=கடன் பரிமாற்ற ஆர்டர்கள்
+PaymentByBankTransferLines=கடன் பரிமாற்ற ஆர்டர் கோடுகள்
+WithdrawalsReceipts=நேரடி டெபிட் ஆர்டர்கள்
+WithdrawalReceipt=நேரடி டெபிட் ஆர்டர்
+BankTransferReceipts=கடன் பரிமாற்ற ஆர்டர்கள்
+BankTransferReceipt=கடன் பரிமாற்ற உத்தரவு
+LatestBankTransferReceipts=சமீபத்திய %s கடன் பரிமாற்ற ஆர்டர்கள்
+LastWithdrawalReceipts=சமீபத்திய %s நேரடி டெபிட் கோப்புகள்
+WithdrawalsLine=நேரடி டெபிட் ஆர்டர் லைன்
+CreditTransfer=Credit transfer
+CreditTransferLine=கடன் பரிமாற்ற வரி
+WithdrawalsLines=நேரடி டெபிட் ஆர்டர் கோடுகள்
+CreditTransferLines=கடன் பரிமாற்ற வரிகள்
+RequestStandingOrderToTreat=செயலாக்க நேரடி டெபிட் பேமெண்ட் ஆர்டருக்கான கோரிக்கைகள்
+RequestStandingOrderTreated=நேரடி டெபிட் பேமெண்ட் ஆர்டருக்கான கோரிக்கைகள் செயலாக்கப்பட்டன
+RequestPaymentsByBankTransferToTreat=செயலாக்கத்திற்கான கடன் பரிமாற்றத்திற்கான கோரிக்கைகள்
+RequestPaymentsByBankTransferTreated=கடன் பரிமாற்றத்திற்கான கோரிக்கைகள் செயலாக்கப்பட்டன
+NotPossibleForThisStatusOfWithdrawReceiptORLine=இன்னும் முடியவில்லை. குறிப்பிட்ட வரிகளில் நிராகரிப்பை அறிவிப்பதற்கு முன், திரும்பப் பெறுதல் நிலையை 'கிரெடிட்' என அமைக்க வேண்டும்.
+NbOfInvoiceToWithdraw=காத்திருப்பு நேரடி டெபிட் ஆர்டருடன் தகுதிவாய்ந்த வாடிக்கையாளர் இன்வாய்ஸ்களின் எண்ணிக்கை
+NbOfInvoiceToWithdrawWithInfo=வரையறுக்கப்பட்ட வங்கிக் கணக்குத் தகவலைக் கொண்ட நேரடி டெபிட் கட்டண ஆர்டர்களுடன் வாடிக்கையாளர் விலைப்பட்டியல் எண்
+NbOfInvoiceToPayByBankTransfer=கடன் பரிமாற்றத்தின் மூலம் பணம் செலுத்துவதற்காக காத்திருக்கும் தகுதிவாய்ந்த சப்ளையர் இன்வாய்ஸ்களின் எண்ணிக்கை
+SupplierInvoiceWaitingWithdraw=கிரெடிட் பரிமாற்றத்தின் மூலம் பணம் செலுத்துவதற்காக விற்பனையாளர் விலைப்பட்டியல் காத்திருக்கிறது
+InvoiceWaitingWithdraw=நேரடிப் பற்றுக்காகக் காத்திருக்கும் விலைப்பட்டியல்
+InvoiceWaitingPaymentByBankTransfer=கடன் பரிமாற்றத்திற்காக காத்திருக்கும் விலைப்பட்டியல்
+AmountToWithdraw=திரும்பப் பெற வேண்டிய தொகை
+NoInvoiceToWithdraw='%s'க்கான இன்வாய்ஸ் எதுவும் திறக்கப்படவில்லை. கோரிக்கையைச் செய்ய விலைப்பட்டியல் அட்டையில் '%s' தாவலுக்குச் செல்லவும்.
+NoSupplierInvoiceToWithdraw=திறந்த 'நேரடி கடன் கோரிக்கைகள்' கொண்ட சப்ளையர் இன்வாய்ஸ் எதுவும் காத்திருக்கவில்லை. கோரிக்கையைச் செய்ய விலைப்பட்டியல் அட்டையில் '%s' தாவலுக்குச் செல்லவும்.
+ResponsibleUser=பயனர் பொறுப்பு
+WithdrawalsSetup=நேரடி டெபிட் கட்டண அமைப்பு
+CreditTransferSetup=கடன் பரிமாற்ற அமைப்பு
+WithdrawStatistics=நேரடி டெபிட் கட்டண புள்ளிவிவரங்கள்
+CreditTransferStatistics=கடன் பரிமாற்ற புள்ளிவிவரங்கள்
+Rejects=நிராகரிக்கிறது
+LastWithdrawalReceipt=சமீபத்திய %s நேரடி டெபிட் ரசீதுகள்
+MakeWithdrawRequest=நேரடி டெபிட் கட்டண கோரிக்கையை உருவாக்கவும்
+MakeBankTransferOrder=கடன் பரிமாற்ற கோரிக்கையை உருவாக்கவும்
+WithdrawRequestsDone=%s நேரடி டெபிட் கட்டண கோரிக்கைகள் பதிவு செய்யப்பட்டன
+BankTransferRequestsDone=%s கடன் பரிமாற்ற கோரிக்கைகள் பதிவு செய்யப்பட்டன
+ThirdPartyBankCode=மூன்றாம் தரப்பு வங்கிக் குறியீடு
+NoInvoiceCouldBeWithdrawed=இன்வாய்ஸ் எதுவும் டெபிட் செய்யப்படவில்லை. இன்வாய்ஸ்கள் செல்லுபடியாகும் IBAN உள்ள நிறுவனங்களில் உள்ளதா என்பதையும், <strong> %s </strong> பயன்முறையுடன் IBAN UMR (தனிப்பட்ட ஆணைக் குறிப்பு) உள்ளதா என்பதையும் சரிபார்க்கவும்.
+WithdrawalCantBeCreditedTwice=இந்த திரும்பப் பெறும் ரசீது ஏற்கனவே வரவு வைக்கப்பட்டதாகக் குறிக்கப்பட்டுள்ளது; இதை இரண்டு முறை செய்ய முடியாது, ஏனெனில் இது நகல் பணம் மற்றும் வங்கி உள்ளீடுகளை உருவாக்கும்.
+ClassCredited=வகைப்படுத்து வரவு
+ClassDebited=Classify debited
+ClassCreditedConfirm=இந்த திரும்பப் பெறும் ரசீதை உங்கள் வங்கிக் கணக்கில் கிரெடிட் செய்யப்பட்டதாக நிச்சயமாக வகைப்படுத்த விரும்புகிறீர்களா?
+TransData=பரிமாற்ற தேதி
+TransMetod=பரிமாற்ற முறை
+Send=அனுப்பு
+Lines=கோடுகள்
+StandingOrderReject=நிராகரிப்பு வெளியிடவும்
+WithdrawsRefused=நேரடிப் பற்று மறுத்துவிட்டது
+WithdrawalRefused=திரும்பப் பெற மறுத்துவிட்டது
+CreditTransfersRefused=கடன் பரிமாற்றம் நிராகரிக்கப்பட்டது
+WithdrawalRefusedConfirm=சமூகத்திற்கான திரும்பப் பெறுதல் நிராகரிப்பை உள்ளிட விரும்புகிறீர்களா?
+RefusedData=நிராகரிக்கப்பட்ட தேதி
+RefusedReason=நிராகரிப்புக்கான காரணம்
+RefusedInvoicing=நிராகரிப்பு பில்லிங்
+NoInvoiceRefused=நிராகரிப்புக்கு கட்டணம் வசூலிக்க வேண்டாம்
+InvoiceRefused=விலைப்பட்டியல் நிராகரிக்கப்பட்டது (வாடிக்கையாளரிடம் நிராகரிப்பை வசூலிக்கவும்)
+StatusDebitCredit=நிலை டெபிட்/கிரெடிட்
+StatusWaiting=காத்திருக்கிறது
+StatusTrans=அனுப்பப்பட்டது
+StatusDebited=பற்று வைக்கப்பட்டது
+StatusCredited=வரவு
+StatusPaid=செலுத்தப்பட்டது
+StatusRefused=மறுத்தார்
+StatusMotif0=குறிப்பிடப்படாதது
+StatusMotif1=போதுமான பணம் இல்லை
+StatusMotif2=கோரிக்கை போட்டியிட்டது
+StatusMotif3=நேரடி டெபிட் பேமெண்ட் ஆர்டர் இல்லை
+StatusMotif4=விற்பனை ஆணை
+StatusMotif5=RIB பயன்படுத்த முடியாதது
+StatusMotif6=இருப்பு இல்லாத கணக்கு
+StatusMotif7=நீதித்துறை முடிவு
+StatusMotif8=வேறு காரணம்
+CreateForSepaFRST=நேரடி டெபிட் கோப்பை உருவாக்கவும் (SEPA FRST)
+CreateForSepaRCUR=நேரடி டெபிட் கோப்பை உருவாக்கவும் (SEPA RCUR)
+CreateAll=நேரடி டெபிட் கோப்பை உருவாக்கவும்
+CreateFileForPaymentByBankTransfer=கடன் பரிமாற்றத்திற்கான கோப்பை உருவாக்கவும்
+CreateSepaFileForPaymentByBankTransfer=கடன் பரிமாற்ற கோப்பை உருவாக்கவும் (SEPA)
+CreateGuichet=அலுவலகம் மட்டுமே
+CreateBanque=வங்கி மட்டுமே
+OrderWaiting=சிகிச்சைக்காக காத்திருக்கிறேன்
+NotifyTransmision=ஆர்டரின் பதிவு கோப்பு பரிமாற்றம்
+NotifyCredit=ஆர்டரின் பதிவு கடன்
+NumeroNationalEmetter=தேசிய டிரான்ஸ்மிட்டர் எண்
+WithBankUsingRIB=RIB ஐப் பயன்படுத்தும் வங்கிக் கணக்குகளுக்கு
+WithBankUsingBANBIC=IBAN/BIC/SWIFTஐப் பயன்படுத்தும் வங்கிக் கணக்குகளுக்கு
+BankToReceiveWithdraw=வங்கிக் கணக்கைப் பெறுதல்
+BankToPayCreditTransfer=பணம் செலுத்துவதற்கான ஆதாரமாக வங்கி கணக்கு பயன்படுத்தப்படுகிறது
+CreditDate=அன்று கடன்
+WithdrawalFileNotCapable=உங்கள் நாடு %s க்கான திரும்பப் பெறுதல் ரசீது கோப்பை உருவாக்க முடியவில்லை (உங்கள் நாடு ஆதரிக்கப்படவில்லை)
+ShowWithdraw=நேரடி டெபிட் ஆர்டரைக் காட்டு
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=இருப்பினும், இன்வாய்ஸில் குறைந்தபட்சம் ஒரு நேரடி டெபிட் பேமெண்ட் ஆர்டராவது இன்னும் செயல்படுத்தப்படவில்லை எனில், முன் திரும்பப் பெறுதல் நிர்வாகத்தை அனுமதிக்கும் வகையில் அது செலுத்தப்பட்டதாக அமைக்கப்படாது.
+DoStandingOrdersBeforePayments=இந்த டேப் நேரடி டெபிட் பேமெண்ட் ஆர்டரைக் கோர உங்களை அனுமதிக்கிறது. முடிந்ததும், நேரடி டெபிட் ஆர்டரை உருவாக்கி நிர்வகிக்க, வங்கி->நேரடி டெபிட் மூலம் பணம் செலுத்துதல் என்ற மெனுவிற்குச் செல்லவும். நேரடி டெபிட் ஆர்டர் மூடப்பட்டால், இன்வாய்ஸ்களில் பணம் செலுத்துவது தானாகவே பதிவு செய்யப்படும், மீதமுள்ள பணம் செல்லாததாக இருந்தால் இன்வாய்ஸ்கள் மூடப்படும்.
+DoCreditTransferBeforePayments=இந்த தாவல் கிரெடிட் பரிமாற்ற ஆர்டரைக் கோர உங்களை அனுமதிக்கிறது. முடிந்ததும், கிரெடிட் டிரான்ஸ்ஃபர் ஆர்டரை உருவாக்கி நிர்வகிக்க வங்கி->கிரெடிட் டிரான்ஸ்ஃபர் மூலம் பணம் செலுத்துதல் என்ற மெனுவிற்குச் செல்லவும். கிரெடிட் டிரான்ஸ்ஃபர் ஆர்டர் மூடப்படும் போது, இன்வாய்ஸ்களில் பணம் செலுத்துவது தானாகவே பதிவு செய்யப்படும், மீதமுள்ள பணம் செல்லாததாக இருந்தால் இன்வாய்ஸ்கள் மூடப்படும்.
+WithdrawalFile=டெபிட் ஆர்டர் கோப்பு
+CreditTransferFile=கடன் பரிமாற்ற கோப்பு
+SetToStatusSent="கோப்பு அனுப்பப்பட்டது" நிலைக்கு அமைக்கவும்
+ThisWillAlsoAddPaymentOnInvoice=இது இன்வாய்ஸ்களில் பேமெண்ட்டுகளைப் பதிவு செய்யும், மேலும் பணம் செலுத்த வேண்டியது செல்லாததாக இருந்தால், "பணம்" என வகைப்படுத்தும்.
+StatisticsByLineStatus=வரிகளின் நிலையின்படி புள்ளிவிவரங்கள்
+RUM=UMR
+DateRUM=ஆணை கையொப்ப தேதி
+RUMLong=தனித்துவமான ஆணைக் குறிப்பு
+RUMWillBeGenerated=காலியாக இருந்தால், வங்கிக் கணக்குத் தகவல் சேமிக்கப்பட்டவுடன் UMR (தனிப்பட்ட ஆணைக் குறிப்பு) உருவாக்கப்படும்.
+WithdrawMode=நேரடி டெபிட் முறை (FRST அல்லது RECUR)
+WithdrawRequestAmount=நேரடிப் பற்றுக் கோரிக்கையின் அளவு:
+BankTransferAmount=கடன் பரிமாற்றக் கோரிக்கையின் அளவு:
+WithdrawRequestErrorNilAmount=வெற்றுத் தொகைக்கு நேரடிப் பற்றுக் கோரிக்கையை உருவாக்க முடியவில்லை.
+SepaMandate=SEPA நேரடி டெபிட் ஆணை
+SepaMandateShort=SEPA ஆணை
+PleaseReturnMandate=இந்த ஆணை படிவத்தை %s க்கு மின்னஞ்சல் மூலமாகவோ அல்லது அஞ்சல் மூலமாகவோ திருப்பி அனுப்பவும்
+SEPALegalText=இந்த ஆணைப் படிவத்தில் கையொப்பமிடுவதன் மூலம், %s உங்கள் கணக்கில் டெபிட் செய்வதற்கான வழிமுறைகளை (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=செயல்படுத்தும் தேதி
+CreateForSepa=நேரடி டெபிட் கோப்பை உருவாக்கவும்
+ICS=கடனாளி அடையாளங்காட்டி - ICS
+END_TO_END="EndToEndId" SEPA XML டேக் - ஒரு பரிவர்த்தனைக்கு தனிப்பட்ட ஐடி ஒதுக்கப்படும்
+USTRD="கட்டமைக்கப்படாத" SEPA XML குறிச்சொல்
+ADDDAYS=செயல்படுத்தும் தேதியில் நாட்களைச் சேர்க்கவும்
+NoDefaultIBANFound=இந்த மூன்றாம் தரப்பினருக்கு இயல்புநிலை IBAN இல்லை
+### Notifications
+InfoCreditSubject=வங்கி மூலம் நேரடி டெபிட் பேமெண்ட் ஆர்டரை %s செலுத்துதல்
+InfoCreditMessage=%s என்ற நேரடி டெபிட் பேமெண்ட் ஆர்டரை வங்கி <br> செலுத்தியது: %s
+InfoTransSubject=நேரடி டெபிட் பேமெண்ட் ஆர்டரை %s வங்கிக்கு அனுப்புதல்
+InfoTransMessage=நேரடி டெபிட் பேமெண்ட் ஆர்டர் %s வங்கிக்கு %s %s மூலம் அனுப்பப்பட்டது. <br> <br>
+InfoTransData=தொகை: %s <br> முறை: %s <br> தேதி: %s
+InfoRejectSubject=நேரடி டெபிட் பேமெண்ட் ஆர்டர் நிராகரிக்கப்பட்டது
+InfoRejectMessage=வணக்கம், %s நிறுவனத்துடன் தொடர்புடைய %s இன்வாய்ஸின் நேரடி டெபிட் பேமெண்ட் ஆர்டர் <br> <br> வங்கியால் நிராகரிக்கப்பட்டது. <br> <br> -- <br> %s
+ModeWarning=உண்மையான பயன்முறைக்கான விருப்பம் அமைக்கப்படவில்லை, இந்த உருவகப்படுத்துதலுக்குப் பிறகு நிறுத்துவோம்
+ErrorCompanyHasDuplicateDefaultBAN=%s ஐடியைக் கொண்ட நிறுவனம் ஒன்றுக்கும் மேற்பட்ட இயல்புநிலை வங்கிக் கணக்குகளைக் கொண்டுள்ளது. எது பயன்படுத்த வேண்டும் என்பதை அறிய வழி இல்லை.
+ErrorICSmissing=%s வங்கிக் கணக்கில் ICS இல்லை
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=நேரடி டெபிட் ஆர்டரின் மொத்த அளவு வரிகளின் தொகையிலிருந்து வேறுபடுகிறது
+WarningSomeDirectDebitOrdersAlreadyExists=எச்சரிக்கை: %s தொகைக்காகக் கோரப்பட்ட சில நேரடி டெபிட் ஆர்டர்கள் (%s) ஏற்கனவே நிலுவையில் உள்ளன
+WarningSomeCreditTransferAlreadyExists=எச்சரிக்கை: %s தொகைக்கு ஏற்கனவே சில கிரெடிட் டிரான்ஸ்ஃபர் (%s) கோரப்பட்டுள்ளது
diff --git a/htdocs/langs/ta_IN/workflow.lang b/htdocs/langs/ta_IN/workflow.lang
new file mode 100644
index 00000000000..71b1059c002
--- /dev/null
+++ b/htdocs/langs/ta_IN/workflow.lang
@@ -0,0 +1,30 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=பணிப்பாய்வு தொகுதி அமைப்பு
+WorkflowDesc=இந்த தொகுதி சில தானியங்கி செயல்களை வழங்குகிறது. இயல்பாக, பணிப்பாய்வு திறந்திருக்கும் (நீங்கள் விரும்பும் வரிசையில் நீங்கள் விஷயங்களைச் செய்யலாம்) ஆனால் இங்கே நீங்கள் சில தானியங்கி செயல்களைச் செயல்படுத்தலாம்.
+ThereIsNoWorkflowToModify=செயல்படுத்தப்பட்ட தொகுதிக்கூறுகளுடன் பணிப்பாய்வு மாற்றங்கள் எதுவும் இல்லை.
+# Autocreate
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=வணிக முன்மொழிவு கையொப்பமிடப்பட்ட பிறகு தானாகவே விற்பனை ஆர்டரை உருவாக்கவும் (புதிய ஆர்டரில் முன்மொழியப்பட்ட அதே தொகை இருக்கும்)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=வணிக முன்மொழிவு கையொப்பமிடப்பட்ட பிறகு தானாகவே வாடிக்கையாளர் விலைப்பட்டியலை உருவாக்கவும் (புதிய விலைப்பட்டியல் முன்மொழிவின் அதே தொகையைக் கொண்டிருக்கும்)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=ஒப்பந்தம் சரிபார்க்கப்பட்ட பிறகு தானாகவே வாடிக்கையாளர் விலைப்பட்டியலை உருவாக்கவும்
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=விற்பனை ஆர்டர் மூடப்பட்ட பிறகு தானாகவே வாடிக்கையாளர் விலைப்பட்டியலை உருவாக்கவும் (புதிய விலைப்பட்டியல் ஆர்டரின் அதே தொகையைக் கொண்டிருக்கும்)
+# Autoclassify customer proposal or order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=விற்பனை ஆர்டரை பில் செய்யும்போது பில் செய்யப்பட்டதாக இணைக்கப்பட்ட மூல முன்மொழிவை வகைப்படுத்தவும் (மற்றும் ஆர்டரின் தொகையானது கையொப்பமிடப்பட்ட இணைக்கப்பட்ட முன்மொழிவின் மொத்தத் தொகையாக இருந்தால்)
+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_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=விற்பனையாளர் விலைப்பட்டியல் சரிபார்க்கப்படும் போது இணைக்கப்பட்ட மூல கொள்முதல் ஆர்டரை பில் செய்ததாக வகைப்படுத்தவும் (மற்றும் விலைப்பட்டியல் தொகையானது இணைக்கப்பட்ட ஆர்டரின் மொத்தத் தொகையாக இருந்தால்)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=ஒரு வரவேற்பு சரிபார்க்கப்படும் போது பெறப்பட்ட இணைக்கப்பட்ட மூல கொள்முதல் ஆர்டரை வகைப்படுத்தவும் (மற்றும் அனைத்து வரவேற்புகளிலும் பெறப்பட்ட அளவு வாங்குதல் ஆர்டரில் உள்ளதைப் போலவே புதுப்பிக்கவும்)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=ஒரு வரவேற்பு மூடப்படும் போது பெறப்பட்ட இணைக்கப்பட்ட மூல கொள்முதல் ஆர்டரை வகைப்படுத்தவும் (மற்றும் அனைத்து வரவேற்புகளிலும் பெறப்பட்ட அளவு வாங்குதல் ஆர்டரில் உள்ளதைப் போலவே புதுப்பிக்கவும்)
+# Autoclassify purchase invoice
+descWORKFLOW_BILL_ON_RECEPTION=இணைக்கப்பட்ட சப்ளையர் ஆர்டர் சரிபார்க்கப்படும் போது வரவேற்புகளை "பில்" என வகைப்படுத்தவும்
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=டிக்கெட் மூடப்படும் போது, டிக்கெட்டுடன் இணைக்கப்பட்ட அனைத்து தலையீடுகளையும் மூடு
+AutomaticCreation=தானியங்கி உருவாக்கம்
+AutomaticClassification=தானியங்கி வகைப்பாடு
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=வாடிக்கையாளர் இன்வாய்ஸ் சரிபார்க்கப்படும் போது இணைக்கப்பட்ட மூல ஏற்றுமதி மூடப்பட்டதாக வகைப்படுத்தவும்
diff --git a/htdocs/langs/ta_IN/zapier.lang b/htdocs/langs/ta_IN/zapier.lang
new file mode 100644
index 00000000000..9e3aad22647
--- /dev/null
+++ b/htdocs/langs/ta_IN/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 = Dolibarr க்கான ஜாப்பியர்
+ModuleZapierForDolibarrDesc = டோலிபார் தொகுதிக்கான ஜாப்பியர்
+ZapierForDolibarrSetup=Dolibarr க்கான Zapier அமைவு
+ZapierDescription=ஜாப்பியருடன் இடைமுகம்
+ZapierAbout=தொகுதி Zapier பற்றி
+ZapierSetupPage=Zapier ஐப் பயன்படுத்த Dolibarr பக்கத்தில் ஒரு அமைப்பு தேவையில்லை. இருப்பினும், Dolibarr உடன் Zapier ஐப் பயன்படுத்துவதற்கு, zapier இல் ஒரு தொகுப்பை உருவாக்கி வெளியிட வேண்டும். <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> இந்த விக்கி பக்கம் </a> இல் உள்ள ஆவணங்களைப் பார்க்கவும்.
diff --git a/htdocs/langs/tg_TJ/accountancy.lang b/htdocs/langs/tg_TJ/accountancy.lang
index ed4fdf9af82..de99667b2fc 100644
--- a/htdocs/langs/tg_TJ/accountancy.lang
+++ b/htdocs/langs/tg_TJ/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=Кишварҳое, ки дар ИАА нестанд
 CountriesInEECExceptMe=Кишварҳо дар ЕЭК ба истиснои %s
 CountriesExceptMe=Ҳама кишварҳо ба истиснои %s
 AccountantFiles=Ҳуҷҷатҳои манбаъро содир кунед
-ExportAccountingSourceDocHelp=Бо ин асбоб, шумо метавонед рӯйдодҳои манбаъро (рӯйхат дар CSV ва PDF), ки барои тавлиди ҳисобдории шумо истифода шудаанд, содир кунед.
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
 ExportAccountingSourceDocHelp2=Барои содироти маҷаллаҳои худ, вуруди менюи %s - %s -ро истифода баред.
 VueByAccountAccounting=Аз ҳисоби ҳисоби баҳисобгирӣ дидан кунед
 VueBySubAccountAccounting=Бо зерсохтори баҳисобгирӣ дидан кунед
@@ -286,7 +286,7 @@ ValidateMovements=Ҳаракатҳоро тасдиқ кунед
 DescValidateMovements=Ҳама гуна тағир ё нест кардани навиштан, навиштан ва нест кардан манъ карда мешавад. Ҳама сабтҳо барои машқ бояд тасдиқ карда шаванд, вагарна пӯшида намешавад
 
 ValidateHistory=Ба таври худкор пайваст кунед
-AutomaticBindingDone=Пайвасткунии автоматӣ анҷом дода шуд
+AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Хато, шумо наметавонед ин ҳисоби баҳисобгириро нест кунед, зеро он истифода мешавад
 MvtNotCorrectlyBalanced=Ҳаракат дуруст тавозун нашудааст. Дебет = %s | Кредит = %s
@@ -387,7 +387,8 @@ SaleExport=Фурӯши содирот
 SaleEEC=Фурӯш дар EEC
 SaleEECWithVAT=Фурӯш дар ИАА бо арзиши иловашуда бо арзиши иловашуда бекор нест, бинобар ин мо фикр мекунем, ки ин фурӯши дохилиидоравӣ нест ва ҳисоби пешниҳодшуда ҳисоби стандартии маҳсулот аст.
 SaleEECWithoutVATNumber=Фурӯш дар ЕЭК бидуни андоз аз арзиши иловашуда, аммо ID -и ААИ аз тарафи сеюм муайян карда нашудааст. Мо аз ҳисоби маҳсулот барои фурӯши стандартӣ бармегардем. Агар лозим бошад, шумо метавонед ID ААИ -и тарафи сеюм ё ҳисоби маҳсулотро ислоҳ кунед.
-
+ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
+ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
 Range=Меъёри ҳисоби баҳисобгирӣ
 Calculated=Ҳисоб карда шудааст
@@ -404,6 +405,7 @@ NoJournalDefined=Ягон маҷалла муайян карда нашудаа
 Binded=Хатҳо баста шудаанд
 ToBind=Хатҳо барои пайвастан
 UseMenuToSetBindindManualy=Сатрҳо ҳанӯз баста нашудаанд, барои дастӣ бастани пайванд аз менюи <a href="%s"> %s </a> истифода баред
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
 
 ## Import
 ImportAccountingEntries=Сабтҳои баҳисобгирӣ
diff --git a/htdocs/langs/tg_TJ/admin.lang b/htdocs/langs/tg_TJ/admin.lang
index 68170d9f436..5c70912b20e 100644
--- a/htdocs/langs/tg_TJ/admin.lang
+++ b/htdocs/langs/tg_TJ/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Бунёд
 Version=Версия
 Publisher=Ношир
@@ -265,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">%s</a></b>
-ForAnswersSeeForum=Барои ҳама гуна саволҳо/кӯмаки дигар, шумо метавонед форуми Dolibarr -ро истифода баред: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
+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=Инҳоянд чанд манбаъ барои гирифтани кӯмак ва дастгирӣ бо Dolibarr.
 HelpCenterDesc2=Баъзе аз ин захираҳо танҳо дар <b> англисӣ </b> дастрасанд.
 CurrentMenuHandler=Корбари менюи ҷорӣ
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Версияи охирини устувор
 LastActivationDate=Санаи охирини фаъолкунӣ
 LastActivationAuthor=Муаллифи охирини фаъолсозӣ
 LastActivationIP=Охирин фаъолсозии IP
+LastActivationVersion=Latest activation version
 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> or <b> 2 y3 a09 a09 a09 a4 <br>
@@ -753,7 +756,7 @@ Permission106=Паёмҳои содиротӣ
 Permission109=Паёмҳоро нест кунед
 Permission111=Ҳисобҳои молиявиро хонед
 Permission112=Транзаксияҳоро эҷод/тағир диҳед/нест кунед ва муқоиса кунед
-Permission113=Танзими ҳисобҳои молиявӣ (эҷод, идора кардани категорияҳо)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Муомилоти оштӣ
 Permission115=Амалиётҳои содиротӣ ва изҳороти суратҳисоб
 Permission116=Интиқоли байни ҳисобҳо
@@ -762,6 +765,7 @@ Permission121=Шахсони сеюмеро, ки ба корбар пайван
 Permission122=Эҷод/тағир додани шахсони сеюм, ки ба корбар пайванданд
 Permission125=Шахсони сеюмеро, ки ба корбар пайванданд, нест кунед
 Permission126=Ба шахсони сеюм содирот кунед
+Permission130=Create/modify third parties payment information
 Permission141=Ҳама лоиҳаҳо ва вазифаҳоро хонед (инчунин лоиҳаҳои хусусие, ки ман бо онҳо тамос намегирам)
 Permission142=Ҳама лоиҳаҳо ва вазифаҳоро эҷод/тағир диҳед (инчунин лоиҳаҳои хусусие, ки ман бо онҳо тамос намегирам)
 Permission144=Ҳама лоиҳаҳо ва вазифаҳоро нест кунед (инчунин лоиҳаҳои хусусие, ки ман бо онҳо тамос намегирам)
@@ -889,12 +893,11 @@ Permission701=Хайрияҳоро хонед
 Permission702=Эҷод/тағир додани хайрияҳо
 Permission703=Хайрияҳоро нест кунед
 Permission771=Ҳисоботи хароҷотро хонед (шумо ва зердастонатон)
-Permission772=Ҳисоботи хароҷотро эҷод/тағир диҳед
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Ҳисоботи хароҷотро нест кунед
-Permission774=Ҳама ҳисоботи хароҷотро хонед (ҳатто барои корбароне, ки тобеъ нестанд)
 Permission775=Ҳисоботи хароҷотро тасдиқ кунед
 Permission776=Ҳисоботи хароҷотро пардохт кунед
-Permission777=Ҳисоботи хароҷоти ҳамаро хонед
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Ҳисоботи хароҷоти ҳамаро эҷод/тағир диҳед
 Permission779=Ҳисоботи хароҷоти содирот
 Permission1001=Захираҳоро хонед
@@ -958,15 +961,11 @@ Permission2801=Мизоҷи FTP -ро дар ҳолати хондан исти
 Permission2802=Мизоҷи FTP -ро дар ҳолати навиштан истифода баред (нест кардан ё бор кардани файлҳо)
 Permission3200=Воқеаҳои бойгонишуда ва изҳои ангуштро хонед
 Permission3301=Модулҳои нав эҷод кунед
-Permission4001=Ба кормандон нигаред
-Permission4002=Эҷоди кормандон
-Permission4003=Кормандонро нест кунед
-Permission4004=Кормандони содирот
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ Permission10005=Мундариҷаи вебсайтро нест кунед
 Permission20001=Дархостҳои рухсатиро хонед (рухсатии шумо ва рухсатии зердастонатон)
 Permission20002=Дархости рухсатии худро эҷод/тағир диҳед (рухсатии шумо ва рухсатии зердастонатон)
 Permission20003=Дархостҳои рухсатиро нест кунед
-Permission20004=Ҳама дархостҳои рухсатиро хонед (ҳатто корбароне, ки тобеъ нестанд)
-Permission20005=Барои ҳама дархостҳои рухсатӣ эҷод/тағир диҳед (ҳатто корбароне, ки тобеъ нестанд)
-Permission20006=Дархостҳои тарк кардани администратор (танзим ва навсозии тавозун)
+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=Дархостҳои рухсатиро тасдиқ кунед
 Permission23001=Кори банақшагирифтаро хонед
 Permission23002=Эҷод/навсозии кори ба нақша гирифташуда
@@ -1358,9 +1357,9 @@ 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=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=Рӯйхати иттилооти мизоҷон/фурӯшандагонро нишон диҳед (рӯйхати интихобшуда ё combobox) <br> Тарафҳои сеюм бо формати номи "The Big Company corp. - 21 jump street 123456 Big Town - USA" ба ҷои "The Big Company corp" пайдо мешаванд.
+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=Намоиши почтаи электронии тамос (ё телефонҳо, агар муайян нашуда бошад) ва рӯйхати иттилооти шаҳр (рӯйхати интихобшуда ё комбокс) <br> Тамос бо формати номи "Dupond Durand - dupond.durand@email.com - Париж" ё "Dupond Durand - 06 07 59 65 66 - Париж "ба ҷои" Дюпонд Дуранд ".
 AskForPreferredShippingMethod=Усули афзалиятноки интиқолро барои шахсони сеюм дархост кунед.
 FieldEdition=Нашри майдони %s
@@ -1708,8 +1707,9 @@ MailingDelay=Пас аз фиристодани паёми навбатӣ, со
 NotificationSetup=Танзими модули огоҳиномаи почтаи электронӣ
 NotificationEMailFrom=Почтаи ирсолкунанда (Аз) барои мактубҳое, ки модули Огоҳномаҳо фиристодаанд
 FixedEmailTarget=Гиранда
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Танзими модули интиқол
 SendingsReceiptModel=Фиристодани модели квитансия
@@ -1725,8 +1725,8 @@ 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
+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 хатҳои тафсилоти маҳсулот барои ҳама субъектҳо (пешниҳодҳо, фармоишҳо, фактураҳо ва ғайра). <span class="warning"> Огоҳӣ: Истифодаи ин хосият барои ин ҳолат ба таври ҷиддӣ тавсия дода намешавад, зеро он метавонад ҳангоми сохтани файлҳои PDF бо аломатҳои махсус ва форматкунии саҳифа мушкилот эҷод кунад. </span>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Танзими ҳисоботи хароҷоти мод
 ExpenseReportNumberingModules=Модули рақамгузории ҳисоботҳои хароҷот
 NoModueToManageStockIncrease=Ягон модули қодир ба афзоиши автоматии саҳмияҳо фаъол карда нашудааст. Афзоиши саҳмия танҳо бо воридкунии дастӣ сурат мегирад.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Шумо метавонед имконоти огоҳиномаҳои почтаро тавассути фаъол ва танзим кардани модули "Огоҳинома" пайдо кунед.
+TemplatesForNotifications=Templates for notifications
 ListOfNotificationsPerUser=Рӯйхати огоҳиҳои автоматӣ барои як корбар*
 ListOfNotificationsPerUserOrContact=Рӯйхати огоҳиҳои имконпазири автоматӣ (дар бораи чорабинии корӣ) барои ҳар як корбар* ё барои тамос **
 ListOfFixedNotifications=Рӯйхати огоҳиҳои худкори собит
@@ -1916,6 +1917,8 @@ ConfFileMustContainCustom=Насб кардан ё сохтани модули 
 HighlightLinesOnMouseHover=Ҳангоми гузаштан аз болои муш хатҳои ҷадвалро равшан кунед
 HighlightLinesColor=Ҳангоми гузаштани муш ранги сатрро равшан кунед ('ffffff' -ро истифода баред, то равшан набошад)
 HighlightLinesChecked=Ҳангоме ки он тафтиш карда мешавад, ранги хатро қайд кунед ('ffffff' -ро истифода баред, то равшан накунед)
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=Ранги матни сарлавҳаи саҳифа
 LinkColor=Ранги пайвандҳо
 PressF5AfterChangingThis=CTRL+F5 -ро дар клавиатура пахш кунед ё кэши браузери худро пас аз тағир додани ин арзиш барои самаранокӣ тоза кунед
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Оё мехоҳед, ки ҳозир коллекс
 NoNewEmailToProcess=Барои коркарди почтаи нав (филтрҳои мувофиқ) нест
 NothingProcessed=Ҳеҷ коре накардааст
 XEmailsDoneYActionsDone=%s мактубҳои мувофиқ, %s бомуваффақият коркард карда шуданд (барои сабт/амалҳои %s)
-RecordEvent=Ҳодисаи почтаи электрониро сабт кунед
-CreateLeadAndThirdParty=Пешво эҷод кунед (ва агар лозим бошад, тарафи сеюм)
-CreateTicketAndThirdParty=Эҷоди чипта (ва истинод ба тарафи сеюм, агар он бо амалиёти қаблӣ бор карда шуда бошад)
+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=Шумораи мактубҳо дар феҳристи манбаъҳо
 LoadThirdPartyFromName=Ҷустуҷӯи тарафи сеюмро дар %s бор кунед (танҳо бор)
 LoadThirdPartyFromNameOrCreate=Ҷустуҷӯи тарафи сеюмро дар %s бор кунед (эҷод кунед, агар наёбад)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Паём аз сӯҳбате, ки бо аввалин почтаи электронӣ аз Dolibarr фиристода шудааст
 WithoutDolTrackingID=Паём аз сӯҳбате, ки бо почтаи аввал оғоз шудааст, аз Dolibarr фиристода нашудааст
 WithDolTrackingIDInMsgId=Паём аз Dolibarr фиристода шудааст
@@ -2078,7 +2082,7 @@ CreateCandidature=Эҷоди аризаи корӣ
 FormatZip=Zip
 MainMenuCode=Рамзи вуруд ба меню (менюи асосӣ)
 ECMAutoTree=Нишон додани дарахти автоматии ECM
-OperationParamDesc=Арзишҳоро барои объекти амал ё тарзи истихроҷи арзишҳо муайян кунед. Масалан: <br> objproperty1 = SET: арзиш барои гузоштани <br> objproperty2 = SET: арзиш бо иваз кардани __objproperty1__ <br> objproperty3 = SETIFdaPTpro2 a93 ([^\\ s]*) <br> options_myextrafield1 = ИСТИСНО: МАВЗӮ: ([^&#92; n]*) <br> object.objproperty5 = EXTRACT: BODY: Номи ширкати ман \\ s ([^\\ s4b2f) a) <br> Истифодаи a; char ҳамчун ҷудокунанда барои истихроҷ ё гузоштани якчанд хосият.
+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=Танзимоти модули захираҳо
@@ -2124,7 +2128,7 @@ LargerThan=Калонтар аз
 IfTrackingIDFoundEventWillBeLinked=Дар хотир доред, ки агар дар почтаи электронӣ ID -и пайгирии объект пайдо шуда бошад ё агар ин почтаи электронӣ ҷавоби почтаи электронӣ бошад ва он ба ягон объект пайваст карда шуда бошад, ҳодисаи офаридашуда ба таври худкор ба объекти марбутаи алоқаманд пайваст карда мешавад.
 WithGMailYouCanCreateADedicatedPassword=Бо ҳисоби GMail, агар шумо тасдиқи 2 қадамро фаъол карда бошед, тавсия дода мешавад, ки ба ҷои истифодаи пароли ҳисоби шахсии худ аз https://myaccount.google.com/ гузарвожаи махсуси дуюмро барои барнома эҷод кунед.
 EmailCollectorTargetDir=Ҳангоми бомуваффақият коркард кардани почтаи электронӣ ба дигар тег/директория метавонад рафтори дилхоҳ бошад. Барои истифодаи ин хусусият танҳо номи феҳристро таъин кунед (Ба ном аломатҳои махсусро истифода Набаред). Дар хотир доред, ки шумо инчунин бояд ҳисоби воридшавӣ/навиштанро истифода баред.
-EmailCollectorLoadThirdPartyHelp=Шумо метавонед ин амалро барои мундариҷаи почтаи электронӣ барои дарёфт ва бор кардани як шахси сеюми мавҷуда дар пойгоҳи худ истифода баред. Тарафи сеюми ёфтшуда (ё сохташуда) барои амалҳои зерин, ки ба он ниёз доранд, истифода мешавад. <br> Масалан, агар шумо хоҳед, ки як шахси сеюмро бо номи сатри "Ном: ном барои ёфтан" дар бадан ёфтшуда эҷод кунед, почтаи ирсолкунандаро ҳамчун почтаи электронӣ истифода баред, шумо метавонед майдони параметрро чунин танзим кунед: <br> 'email = HEADER: ^Аз: (.*); Ном = ИСТИРОҲ: БАДАН: Ном: \\ с ([^\\ s]*); муштарӣ = SET: 2; ' <br>
+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=Нуқтаи ниҳоӣ барои %s: %s
 DeleteEmailCollector=Коллекторҳои почтаи электрониро нест кунед
 ConfirmDeleteEmailCollector=Шумо мутмаин ҳастед, ки ин коллектори почтаи электрониро нест кардан мехоҳед?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/tg_TJ/banks.lang b/htdocs/langs/tg_TJ/banks.lang
index 1eac051a7c8..b8bc3545abf 100644
--- a/htdocs/langs/tg_TJ/banks.lang
+++ b/htdocs/langs/tg_TJ/banks.lang
@@ -32,7 +32,7 @@ RIB=Рақами суратҳисоби бонкӣ
 IBAN=Рақами IBAN
 BIC=Рамзи BIC/SWIFT
 SwiftValid=BIC/SWIFT эътибор дорад
-SwiftVNotalid=BIC/SWIFT эътибор надорад
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=БАН эътибор дорад
 IbanNotValid=БАН эътибор надорад
 StandingOrders=Фармоишҳои дебети мустақим
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Суроғаи бонк
 BankAccountCountry=Кишвари ҳисоб
 BankAccountOwner=Номи соҳиби ҳисоб
 BankAccountOwnerAddress=Суроғаи соҳиби суратҳисоб
-RIBControlError=Тафтиши беайбии арзишҳо ноком шуд. Ин маънои онро дорад, ки маълумот барои ин рақами суратҳисоб пурра нест ё нодуруст аст (кишвар, рақамҳо ва IBAN -ро санҷед).
 CreateAccount=Ҳисоб кушоед
 NewBankAccount=Ҳисоби нав
 NewFinancialAccount=Ҳисоби нави молиявӣ
diff --git a/htdocs/langs/tg_TJ/bills.lang b/htdocs/langs/tg_TJ/bills.lang
index 3b278b66565..ff02ada6a16 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=Шартҳои пардохт
@@ -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=Пешравии куллӣ %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
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/bookmarks.lang b/htdocs/langs/tg_TJ/bookmarks.lang
index 9d0548643cd..5c2c124efb7 100644
--- a/htdocs/langs/tg_TJ/bookmarks.lang
+++ b/htdocs/langs/tg_TJ/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Рафтори ҳангоми интихоби URL -и хатчӯб
 CreateBookmark=Эҷоди хатчӯб
 SetHereATitleForLink=Номи хатчӯбро таъин кунед
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Истиноди беруна/мутлақ (https: // URL) ё пайванди дохилӣ/нисбиро (/DOLIBARR_ROOT/htdocs/...) истифода баред
+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=Интихоб кунед, ки оё саҳифаи пайвандшуда бояд дар ҷадвали ҷорӣ ё ҷадвали нав кушода шавад
 BookmarksManagement=Идоракунии хатчӯбҳо
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/tg_TJ/companies.lang b/htdocs/langs/tg_TJ/companies.lang
index 1047ecca42a..756174c002a 100644
--- a/htdocs/langs/tg_TJ/companies.lang
+++ b/htdocs/langs/tg_TJ/companies.lang
@@ -157,6 +157,18 @@ 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=Профессор 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=Санҷед
 VATIntraCheckDesc=ID ААИ бояд префикси кишварро дар бар гирад. Истиноди <b> %s </b> аз хидмати Аврупо оид ба андоз аз арзиши иловашуда (VIES) истифода мебарад, ки дастрасии интернетро аз сервери Dolibarr талаб мекунад.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Дар вебсайти Комиссияи Аврупо шиносномаи андоз аз арзиши иловашударо дар дохили ҷомеа санҷед
-VATIntraManualCheck=Шумо инчунин метавонед дар сайти Комиссияи Аврупо <a href="%s" target="_blank"> %s </a> дастӣ тафтиш кунед
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Санҷиш имконнопазир аст. Хидмати чекро давлати узв таъмин намекунад (%s).
 NorProspectNorCustomer=На дурнамо, на муштарӣ
 JuridicalStatus=Навъи субъекти соҳибкорӣ
diff --git a/htdocs/langs/tg_TJ/compta.lang b/htdocs/langs/tg_TJ/compta.lang
index fbe6e592fba..ed976aa97f6 100644
--- a/htdocs/langs/tg_TJ/compta.lang
+++ b/htdocs/langs/tg_TJ/compta.lang
@@ -170,8 +170,9 @@ 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=Ба <b> %sанализи дафтари баҳисобгирии ҷадвал нигаред table%s </b> барои гузориш дар асоси <b> Ҷадвали баҳисобгирии дафтар a09a4b73
 RulesAmountWithTaxIncluded=- Маблағҳои нишон додашуда бо ҳама андозҳо дохил карда шудаанд
-RulesResultDue=- Ба он ҳисобнома -фактураҳои барнагардида, хароҷот, ААИ, хайрияҳо сарфи назар аз пардохт ё не. Он инчунин маоши пардохтшударо дар бар мегирад. <br> - Он ба санаи ҳисоббаробаркунии ҳисобнома -фактураҳо ва санаи мӯҳлати хароҷот ё пардохти андоз асос ёфтааст. Барои маоше, ки бо модули музди меҳнат муайян карда шудааст, санаи арзиши пардохт истифода мешавад.
-RulesResultInOut=- Он пардохтҳои воқеиро дар ҳисобнома -фактура, хароҷот, ААИ ва маош дар бар мегирад. <br> - Он ба санаи пардохти фактураҳо, хароҷот, ААИ ва маош асос ёфтааст. Санаи хайрия барои хайрия.
+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=- Ба он ҳисобнома -фактураҳои фармоишгар, новобаста аз он ки онҳо пардохта мешаванд ё не. <br> - Он ба санаи ҳисобкунии ин фактураҳо асос ёфтааст. <br>
 RulesCAIn=- Он ҳама пардохтҳои муассири ҳисобномаҳои аз мизоҷон гирифтаро дар бар мегирад. <br> - Он ба санаи пардохти ин фактураҳо асос ёфтааст <br>
 RulesCATotalSaleJournal=Он ҳама хатҳои кредитии маҷаллаи Sale -ро дар бар мегирад.
@@ -295,3 +296,5 @@ 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/tg_TJ/errors.lang b/htdocs/langs/tg_TJ/errors.lang
index b904cfdb488..b861ec4b276 100644
--- a/htdocs/langs/tg_TJ/errors.lang
+++ b/htdocs/langs/tg_TJ/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Ин тамос аллакай ҳам
 ErrorCashAccountAcceptsOnlyCashMoney=Ин суратҳисоби бонкӣ суратҳисоби нақдӣ мебошад, аз ин рӯ он танҳо намудҳои пули нақдро қабул мекунад.
 ErrorFromToAccountsMustDiffers=Манбаъ ва ҳадафҳои суратҳисобҳои бонкӣ бояд гуногун бошанд.
 ErrorBadThirdPartyName=Арзиши бад барои номи шахси сеюм
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s ҳатмӣ аст
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Синтаксиси бад барои коди муштарӣ
 ErrorBadBarCodeSyntax=Синтаксиси бад барои штрих -код. Шояд шумо як намуди штрих -кодро муқаррар кардаед ё барои рақамгузорӣ ниқоби штрих -кодро муайян кардаед, ки ба арзиши сканшуда мувофиқат намекунад.
 ErrorCustomerCodeRequired=Рамзи муштарӣ лозим аст
@@ -111,6 +113,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.
 ErrorNoImagickReadimage=Синфи Imagick дар ин PHP ёфт намешавад. Ҳеҷ гуна пешнамоиш дастрас нест. Администраторҳо метавонанд ин ҷадвалро аз менюи Setup - Display намоиш диҳанд.
 ErrorRecordAlreadyExists=Сабт аллакай вуҷуд дорад
 ErrorLabelAlreadyExists=Ин нишона аллакай вуҷуд дорад
@@ -271,6 +274,9 @@ 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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Параметри PHP -и шумо upload_max_filesize (%s) аз параметрҳои PHP post_max_size (%s) баландтар аст. Ин танзимоти пайдарпай нест.
@@ -312,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/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/holiday.lang b/htdocs/langs/tg_TJ/holiday.lang
index a2658d86557..0b03fd4cea4 100644
--- a/htdocs/langs/tg_TJ/holiday.lang
+++ b/htdocs/langs/tg_TJ/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Тавсиф
 SendRequestCP=Эҷоди дархости рухсатӣ
 DelayToRequestCP=Дархостҳои рухсатӣ бояд ҳадди ақал <b> %s рӯз (ҳо) </b> пеш аз онҳо дода шаванд.
 MenuConfCP=Тавозуни рухсатӣ
-SoldeCPUser=Тавозуни рухсатӣ <b> %s </b> рӯз аст.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Шумо бояд санаи анҷоми бузургтар аз санаи оғозро интихоб кунед.
 ErrorSQLCreateCP=Ҳангоми сохтан хатои SQL рух дод:
 ErrorIDFicheCP=Хатогӣ рух дод, дархости рухсатӣ вуҷуд надорад.
@@ -134,3 +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/install.lang b/htdocs/langs/tg_TJ/install.lang
index 3597ebff8d8..307da23e3cd 100644
--- a/htdocs/langs/tg_TJ/install.lang
+++ b/htdocs/langs/tg_TJ/install.lang
@@ -21,6 +21,7 @@ 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 вуҷуд надорад.
diff --git a/htdocs/langs/tg_TJ/knowledgemanagement.lang b/htdocs/langs/tg_TJ/knowledgemanagement.lang
index 601642f0ed9..6d40f2f2022 100644
--- a/htdocs/langs/tg_TJ/knowledgemanagement.lang
+++ b/htdocs/langs/tg_TJ/knowledgemanagement.lang
@@ -48,3 +48,7 @@ KnowledgeRecordExtraFields = Майдони экзотикӣ барои мақо
 GroupOfTicket=Гурӯҳи чиптаҳо
 YouCanLinkArticleToATicketCategory=Шумо метавонед мақоларо ба гурӯҳи чиптаҳо пайваст кунед (аз ин рӯ мақола ҳангоми тахассуси чиптаҳои нав пешниҳод карда мешавад)
 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/main.lang b/htdocs/langs/tg_TJ/main.lang
index 97d3bc2d98c..470a718cd60 100644
--- a/htdocs/langs/tg_TJ/main.lang
+++ b/htdocs/langs/tg_TJ/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Хатогӣ, барои кишвар '%s'
 ErrorNoSocialContributionForSellerCountry=Хато, ягон намуди андозҳои иҷтимоӣ/молиявӣ барои кишвар '%s' муайян карда нашудааст.
 ErrorFailedToSaveFile=Хатогӣ, захира кардани файл ноком шуд.
 ErrorCannotAddThisParentWarehouse=Шумо мекӯшед, ки анбори волидайнро, ки аллакай фарзанди анбори мавҷуда аст, илова кунед
+FieldCannotBeNegative=Field "%s" cannot be negative
 MaxNbOfRecordPerPage=Макс. шумораи сабтҳо дар як саҳифа
 NotAuthorized=Шумо ба ин кор ваколатдор нестед.
 SetDate=Сана таъин кунед
@@ -87,7 +88,7 @@ FileWasNotUploaded=Файл барои замима интихоб шудаас
 NbOfEntries=Шумораи сабтҳо
 GoToWikiHelpPage=Хонда шуд кӯмаки онлайн (дастрасӣ ба интернет лозим аст)
 GoToHelpPage=Кӯмакро хонед
-DedicatedPageAvailable=Саҳифаи ёрирасони марбут ба экрани ҳозираи шумо мавҷуд аст
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Саҳифаи асосӣ
 RecordSaved=Сабт захира карда шуд
 RecordDeleted=Сабт нест карда шуд
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Рамзи бозгашт барои хатои да
 InformationLastAccessInError=Маълумот дар бораи хатогии дархости дастрасӣ ба пойгоҳи додаҳо
 DolibarrHasDetectedError=Dolibarr хатои техникиро ошкор кард
 YouCanSetOptionDolibarrMainProdToZero=Шумо метавонед файли гузоришро хонед ё имконоти $ dolibarr_main_prod -ро дар файли танзимоти худ ба '0' таъин кунед, то маълумоти бештар гиред.
-InformationToHelpDiagnose=Ин маълумот метавонад барои мақсадҳои ташхис муфид бошад (шумо метавонед интихоби $ dolibarr_main_prod -ро ба '1' барои нест кардани чунин огоҳиҳо гузоред)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Маълумоти бештар
 TechnicalInformation=Маълумоти техникӣ
 TechnicalID=Шиносномаи техникӣ
@@ -211,6 +212,8 @@ User=Истифодабаранда
 Users=Истифодабарандагон
 Group=Гурӯҳ
 Groups=Гурӯҳҳо
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Ягон гурӯҳи корбарон муайян нашудааст
 Password=Рамз
 PasswordRetype=Пароли худро дубора ворид кунед
@@ -906,7 +909,7 @@ ViewFlatList=Дидани рӯйхати ҳамвор
 ViewAccountList=Намоиши дафтар
 ViewSubAccountList=Дидани дафтарчаи зерсохтор
 RemoveString=Силсилаи '%s' -ро хориҷ кунед
-SomeTranslationAreUncomplete=Баъзе забонҳои пешниҳодшуда метавонанд танҳо қисман тарҷума карда шаванд ё хатогиҳо дошта бошанд. Лутфан бо сабти ном дар <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> барои илова кардани такмилоти худ, барои ислоҳи забони худ кумак кунед.
+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=Истиноди зеркашии оммавӣ
 PublicDownloadLinkDesc=Барои зеркашии файл танҳо истинод лозим аст
 DirectDownloadInternalLink=Истиноди зеркашии хусусӣ
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/tg_TJ/modulebuilder.lang b/htdocs/langs/tg_TJ/modulebuilder.lang
index 760cbc28311..3316cd3f116 100644
--- a/htdocs/langs/tg_TJ/modulebuilder.lang
+++ b/htdocs/langs/tg_TJ/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Ин восита бояд танҳо аз ҷониби корбарони ботаҷриба ё таҳиягарон истифода шавад. Он хидматрасониҳоро барои сохтан ё таҳрир кардани модули худ таъмин мекунад. Ҳуҷҷатҳо барои таҳияи дастии алтернативии <a href="%s" target="_blank"> дар ин ҷо </a> ҳастанд.
+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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Менюҳое, ки модул/замимаи шумо пе
 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>' дар коди аслӣ ёфтан мумкин аст).
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
+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=Бингар, ки ID -ҳои дар насби шумо истифодашаванда
 SeeReservedIDsRangeHere=Ба доираи ID -ҳои ҳифзшуда нигаред
 ToolkitForDevelopers=Маҷмӯи асбобҳо барои таҳиягарони Dolibarr
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/other.lang b/htdocs/langs/tg_TJ/other.lang
index 7dc4656789f..45f11e07cc9 100644
--- a/htdocs/langs/tg_TJ/other.lang
+++ b/htdocs/langs/tg_TJ/other.lang
@@ -258,6 +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
 YourPasswordHasBeenReset=Пароли шумо бомуваффақият барқарор карда шуд
 ApplicantIpAddress=Суроғаи IP -и довталаб
 SMSSentTo=SMS ба %s фиристода шуд
@@ -268,6 +272,7 @@ ProjectCreatedByEmailCollector=Лоиҳа аз ҷониби коллекторҳ
 TicketCreatedByEmailCollector=Чипта аз ҷониби коллекторҳои почтаи электронӣ аз почтаи MSGID %s сохта шудааст
 OpeningHoursFormatDesc=Барои ҷудо кардани соатҳои кушодан ва пӯшидани a - истифода баред. <br> Барои ворид кардани диапазонҳои гуногун фосила истифода баред. <br> Мисол: 8-12 14-18
 SuffixSessionName=Суффикс барои номи сессия
+LoginWith=Login with %s
 
 ##### Export #####
 ExportsArea=Минтақаи содирот
diff --git a/htdocs/langs/tg_TJ/partnership.lang b/htdocs/langs/tg_TJ/partnership.lang
index e5097bcb8e0..b63a863aa53 100644
--- a/htdocs/langs/tg_TJ/partnership.lang
+++ b/htdocs/langs/tg_TJ/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Идоракунии шарикӣ
 PartnershipDescription=Идоракунии шарикии модул
 PartnershipDescriptionLong= Идоракунии шарикии модул
-
+Partnership=Partnership
 AddPartnership=Иловаи шарикӣ
 CancelPartnershipForExpiredMembers=Шарикӣ: Ҳамкории аъзоёнро бо обунаҳои ба охир расидаро бекор кунед
 PartnershipCheckBacklink=Ҳамкорӣ: Истиноди истинод ба истинодро тафтиш кунед
diff --git a/htdocs/langs/tg_TJ/productbatch.lang b/htdocs/langs/tg_TJ/productbatch.lang
index 98af45ea762..ccb7d68c85d 100644
--- a/htdocs/langs/tg_TJ/productbatch.lang
+++ b/htdocs/langs/tg_TJ/productbatch.lang
@@ -30,7 +30,7 @@ ManageLotMask=Ниқоби фармоишӣ
 CustomMasks=Опсия барои муайян кардани ниқоби рақамгузории гуногун барои ҳар як маҳсулот
 BatchLotNumberingModules=Қоидаи рақамгузорӣ барои тавлиди худкори рақами лот
 BatchSerialNumberingModules=Қоидаи рақамгузорӣ барои тавлиди худкори рақами силсилавӣ (барои маҳсулоти дорои моликият 1 лот/силсилаи беназир барои ҳар як маҳсулот)
-QtyToAddAfterBarcodeScan=Миқдори илова кардан барои ҳар як штрих -код/лот/силсилавии скан
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Давомнокии умр (бо рӯзҳо)
 EndOfLife=Поёни умр
 ManufacturingDate=Санаи истеҳсол
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Аз кор баромадан
 InWorkingOrder=Дар ҳолати корӣ
+ToReplace=Replace
diff --git a/htdocs/langs/tg_TJ/products.lang b/htdocs/langs/tg_TJ/products.lang
index aedcf56653c..b93148d333a 100644
--- a/htdocs/langs/tg_TJ/products.lang
+++ b/htdocs/langs/tg_TJ/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Нархи миёнаи вазн
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/tg_TJ/projects.lang b/htdocs/langs/tg_TJ/projects.lang
index 753cf6e61be..74c0be54a7b 100644
--- a/htdocs/langs/tg_TJ/projects.lang
+++ b/htdocs/langs/tg_TJ/projects.lang
@@ -197,6 +197,7 @@ InputPerMonth=Воридшавӣ дар як моҳ
 InputDetail=Тафсилоти вуруд
 TimeAlreadyRecorded=Ин вақти сарфшудаест, ки барои ин вазифа/рӯз сабт шудааст ва корбар %s
 ProjectsWithThisUserAsContact=Лоиҳаҳо бо ин корбар ҳамчун тамос
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Вазифаҳое, ки ба ин корбар таъин шудаанд
 ResourceNotAssignedToProject=Ба лоиҳа таъин нашудааст
 ResourceNotAssignedToTheTask=Ба вазифа таъин нашудааст
@@ -284,3 +285,5 @@ 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
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/stocks.lang b/htdocs/langs/tg_TJ/stocks.lang
index 5bced11c808..03fe4d7059f 100644
--- a/htdocs/langs/tg_TJ/stocks.lang
+++ b/htdocs/langs/tg_TJ/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Маҳдудияти саҳҳомӣ барои са
 AddNewProductStockWarehouse=Маҳдудияти навро барои саҳмияҳои оптималӣ ва дилхоҳ муқаррар кунед
 AddStockLocationLine=Миқдорро кам кунед ва клик кунед, то анбори дигари ин маҳсулотро илова кунед
 InventoryDate=Санаи инвентаризатсия
+Inventories=Inventories
 NewInventory=Инвентаризатсияи нав
 inventorySetup = Танзими инвентаризатсия
 inventoryCreatePermission=Эҷоди инвентаризатсияи нав
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Ҳаракати саҳмияҳо 
 inventoryChangePMPPermission=Иҷозат диҳед тағир додани арзиши PMP барои маҳсулот
 ColumnNewPMP=Воҳиди нави PMP
 OnlyProdsInStock=Маҳсулотро бе захира илова накунед
-TheoricalQty=Миқдори назариявӣ
-TheoricalValue=Миқдори назариявӣ
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Охирин BP
 CurrentPA=Ширкати BP
 RecordedQty=Миқдори сабтшуда
@@ -240,7 +241,7 @@ StockAtDatePastDesc=Шумо метавонед дар ин ҷо саҳмияҳ
 StockAtDateFutureDesc=Шумо метавонед дар ин ҷо саҳмияҳоро (саҳмияҳои виртуалӣ) дар санаи муайян дар оянда дидан кунед
 CurrentStock=Захираи ҷорӣ
 InventoryRealQtyHelp=Барои аз нав танзим кардани qty <br> арзиши 0 -ро таъин кунед
-UpdateByScaning=Миқдори воқеиро тавассути скан пур кунед
+UpdateByScaning=Complete real qty by scaning
 UpdateByScaningProductBarcode=Навсозӣ тавассути скан (штрих -кодҳои маҳсулот)
 UpdateByScaningLot=Навсозӣ тавассути скан (лот | штрих -код)
 DisableStockChangeOfSubProduct=Дар давоми ин ҳаракат тағироти саҳмияҳоро барои ҳама зермаҳсулоти ин маҷмӯа ғайрифаъол кунед.
@@ -253,14 +254,20 @@ ReOpen=Боз кардан
 ConfirmFinish=Оё шумо бастани инвентаризатсияро тасдиқ мекунед? Ин ҳама ҳаракатҳои саҳҳомиро ба вуҷуд меорад, то саҳмияҳои худро ба миқдори воқеии ба инвентаризатсия воридшуда навсозӣ кунанд.
 ObjectNotFound=%s ёфт нашуд
 MakeMovementsAndClose=Ҳаракатҳоро эҷод кунед ва пӯшед
-AutofillWithExpected=Миқдори воқеиро бо миқдори пешбинишуда пур кунед
+AutofillWithExpected=Replace real quantity with expected quantity
 ShowAllBatchByDefault=Бо нобаёнӣ, тафсилоти партияро дар ҷадвали "саҳмия" -и маҳсулот нишон диҳед
 CollapseBatchDetailHelp=Шумо метавонед намоиши пешфарзии тафсилоти партияро дар конфигуратсияи модули саҳмияҳо таъин кунед
-FieldCannotBeNegative=Майдони "%s" манфӣ буда наметавонад
 ErrorWrongBarcodemode=Ҳолати штрих -кодҳои номаълум
 ProductDoesNotExist=Маҳсулот вуҷуд надорад
-ErrorSameBatchNumber=Рақами якхелаи партия дар рӯйхати инвентаризатсия ёфт шудааст
+ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
 ProductBatchDoesNotExist=Маҳсулот бо партия/серия вуҷуд надорад
 ProductBarcodeDoesNotExist=Маҳсулот бо штрих -код вуҷуд надорад
 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
diff --git a/htdocs/langs/tg_TJ/stripe.lang b/htdocs/langs/tg_TJ/stripe.lang
index ee35ff313d0..603a5ec47c1 100644
--- a/htdocs/langs/tg_TJ/stripe.lang
+++ b/htdocs/langs/tg_TJ/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Танзими модули Stripe
-StripeDesc=Ба мизоҷон як саҳифаи пардохти онлайнии Stripe барои пардохт бо кортҳои кредитӣ/cebit тавассути <a href="http://www.stripe.com" target="_blank"> Stripe </a> пешниҳод кунед. Ин метавонад барои фароҳам овардани мизоҷони шумо барои пардохти муваққатӣ ё барои пардохти марбут ба объекти мушаххаси Dolibarr истифода шавад (фактура, фармоиш, ...)
+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=Бо корти кредитӣ ё Stripe пардохт кунед
 FollowingUrlAreAvailableToMakePayments=URL -ҳои зерин барои пешниҳоди саҳифа ба муштарӣ барои пардохт дар объектҳои Dolibarr дастрасанд
 PaymentForm=Шакли пардохт
diff --git a/htdocs/langs/tg_TJ/withdrawals.lang b/htdocs/langs/tg_TJ/withdrawals.lang
index 9ecd0c45c6e..99a56d0c634 100644
--- a/htdocs/langs/tg_TJ/withdrawals.lang
+++ b/htdocs/langs/tg_TJ/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Тартиби интиқоли қарз
 LatestBankTransferReceipts=Охирин фармоишҳои интиқоли қарзии %s
 LastWithdrawalReceipts=Охирин файлҳои %s
 WithdrawalsLine=Хати фармоиши дебети мустақим
+CreditTransfer=Credit transfer
 CreditTransferLine=Хатти интиқоли қарз
 WithdrawalsLines=Хатҳои фармоиши дебети мустақим
 CreditTransferLines=Хатҳои интиқоли қарз
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Рамзи бонкии шахсони сеюм
 NoInvoiceCouldBeWithdrawed=Ҳисобнома -фактура муваффақ нашуд. Санҷед, ки фактураҳо дар ширкатҳои дорои IBAN -и эътибор доранд ва IBAN дорои UMR (истинод ба мандати беназир) бо режими <strong> %s </strong> мебошад.
 WithdrawalCantBeCreditedTwice=Ин квитансияи бозпас гирифтан аллакай ҳамчун ҳисоб карда шудааст; ин корро ду маротиба иҷро кардан мумкин нест, зеро ин эҳтимолан метавонад пардохтҳои такрорӣ ва сабтҳои бонкиро эҷод кунад.
 ClassCredited=Тасниф карда шудааст
+ClassDebited=Classify debited
 ClassCreditedConfirm=Шумо мутмаин ҳастед, ки ин квитансияро дар суратҳисоби бонкии худ тасниф кардан мехоҳед?
 TransData=Санаи интиқол
 TransMetod=Усули интиқол
@@ -80,7 +82,7 @@ StatusMotif7=Қарори судӣ
 StatusMotif8=Сабаби дигар
 CreateForSepaFRST=Файли дебетии мустақим эҷод кунед (SEPA FRST)
 CreateForSepaRCUR=Файли дебетии мустақим эҷод кунед (SEPA RCUR)
-CreateAll=Файли дебети мустақим эҷод кунед (ҳама)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Барои интиқоли кредит файл эҷод кунед
 CreateSepaFileForPaymentByBankTransfer=Эҷоди файли интиқоли қарз (SEPA)
 CreateGuichet=Фақат офис
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Эҷоди дархости дебети муст
 SepaMandate=Мандати қарзи мустақими SEPA
 SepaMandateShort=Мандати SEPA
 PleaseReturnMandate=Лутфан ин шакли мандатро тавассути почтаи электронӣ ба %s ё тавассути почта ба
-SEPALegalText=Бо имзои ин варақаи мандат, шумо (A) %s -ро иҷозат медиҳед, ки ба бонкатон барои аз суратҳисоби шумо ҳисобот фиристодан ва (B) бонки шумо мувофиқи дастурҳои %s аз суратҳисоби шумо ҳисобот фиристад. Ҳамчун як қисми ҳуқуқҳои худ, шумо ҳуқуқ доред аз бонки худ тибқи шартҳо ва шартҳои шартномаи худ бо бонки худ баргардонед. Баргардонидани маблағ бояд дар давоми 8 ҳафта аз санаи дебети суратҳисоби шумо талаб карда шавад. Ҳуқуқҳои шумо вобаста ба мандати дар боло овардашуда дар изҳороте шарҳ дода шудаанд, ки шумо метавонед аз бонки худ дастрас кунед.
+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=Муайянкунандаи кредитор
 CreditorName=Номи кредитор
 SEPAFillForm=(B) Лутфан ҳамаи майдонҳои ишорашударо пур кунед *
@@ -150,3 +152,5 @@ ModeWarning=Опсия барои ҳолати воқеӣ таъин нашуд
 ErrorCompanyHasDuplicateDefaultBAN=Ширкати дорои id %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
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index a96a60d16b5..dae9c62f384 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=ข้อผิดพลาดที่คุณไม่สามารถลบบัญชีบัญชีนี้เพราะมันถูกนำมาใช้
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index f090d3f558f..e4311437a46 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=มูลนิธิ
 Version=เวอร์ชั่น
 Publisher=ผู้เผยแพร่
@@ -49,7 +51,7 @@ ClientSortingCharset=Client collation
 WarningModuleNotActive=โมดูล <b>%s</b> ต้องเปิดใช้งาน
 WarningOnlyPermissionOfActivatedModules=สิทธิ์เฉพาะที่เกี่ยวข้องกับการเปิดใช้งานโมดูลจะแสดงที่นี่ คุณสามารถเปิดใช้งานโมดูลอื่น ๆ ในหน้าแรก> Setup-> หน้าโมดูล
 DolibarrSetup=ติดตั้ง Dolibarr หรืออัพเกรด
-InternalUser=ผู้ใช้งานภายใน
+InternalUser=ผู้ใช้ภายใน
 ExternalUser=ผู้ใช้ภายนอก
 InternalUsers=ผู้ใช้ภายใน
 ExternalUsers=ผู้ใช้ภายนอก
@@ -88,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=รูปแบบที่ใช้งานอยู่ในปัจจุบัน
@@ -129,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=คำเตือน ตรงกันข้ามกับหน้าจออื่นๆ ชั่วโมงในหน้านี้ไม่ได้อยู่ในเขตเวลาท้องถิ่นของคุณ แต่เป็นเขตเวลาของเซิร์ฟเวอร์
@@ -184,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 คำสั่ง
@@ -225,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.
@@ -265,8 +267,8 @@ OtherResources=Other resources
 ExternalResources=External Resources
 SocialNetworks=Social Networks
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=สำหรับผู้ใช้หรือเอกสารพัฒนา (หมอคำถามที่พบบ่อย ... ), <br> ดูที่วิกิพีเดีย Dolibarr: <br> <a href="%s" target="_blank"><b>% s</b></a>
-ForAnswersSeeForum=สำหรับคำถามใด ๆ / ความช่วยเหลือคุณสามารถใช้ฟอรั่ม Dolibarr: <br> <a href="%s" target="_blank"><b>% s</b></a>
+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=จัดการเมนูปัจจุบัน
@@ -282,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.
@@ -311,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/
@@ -324,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=โมดูลทดลอง
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Latest stable version
 LastActivationDate=Latest activation date
 LastActivationAuthor=Latest activation author
 LastActivationIP=Latest activation IP
+LastActivationVersion=Latest activation version
 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>
@@ -436,7 +439,7 @@ Unique=เป็นเอกลักษณ์
 Boolean=Boolean (one checkbox)
 ExtrafieldPhone = โทรศัพท์
 ExtrafieldPrice = ราคา
-ExtrafieldMail = อีเมล์
+ExtrafieldMail = อีเมล
 ExtrafieldUrl = Url
 ExtrafieldSelect = เลือกรายการ
 ExtrafieldSelectList = เลือกจากตาราง
@@ -467,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 บาร์โค้ดมวลหรือตั้งค่าสำหรับผลิตภัณฑ์หรือบริการ
@@ -563,7 +566,7 @@ Module50Name=ผลิตภัณฑ์
 Module50Desc=Management of Products
 Module51Name=จดหมายจำนวนมาก
 Module51Desc=กระดาษมวลจัดการทางไปรษณีย์
-Module52Name=หุ้น
+Module52Name=สต็อก
 Module52Desc=Stock management
 Module53Name=บริการ
 Module53Desc=Management of Services
@@ -575,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
@@ -585,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.
@@ -601,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
@@ -667,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...)
@@ -709,7 +712,7 @@ Permission25=ส่งข้อเสนอในเชิงพาณิชย
 Permission26=ข้อเสนอในเชิงพาณิชย์ปิด
 Permission27=ลบข้อเสนอในเชิงพาณิชย์
 Permission28=ข้อเสนอในเชิงพาณิชย์เพื่อการส่งออก
-Permission31=อ่านผลิตภัณฑ์
+Permission31=ดูผลิตภัณฑ์
 Permission32=สร้าง / แก้ไขผลิตภัณฑ์
 Permission34=ลบผลิตภัณฑ์
 Permission36=ดู / จัดการผลิตภัณฑ์ที่ซ่อน
@@ -726,7 +729,7 @@ Permission67=การแทรกแซงการส่งออก
 Permission68=Send interventions by email
 Permission69=Validate interventions
 Permission70=Invalidate interventions
-Permission71=อ่านสมาชิก
+Permission71=ดูสมาชิก
 Permission72=สร้าง / แก้ไขสมาชิก
 Permission74=ลบสมาชิก
 Permission75=ชนิดติดตั้งของการเป็นสมาชิก
@@ -744,16 +747,16 @@ Permission91=อ่านภาษีทางสังคมหรือทา
 Permission92=สร้าง / แก้ไขภาษีทางสังคมหรือทางการคลังและภาษีมูลค่าเพิ่ม
 Permission93=ลบภาษีทางสังคมหรือทางการคลังและภาษีมูลค่าเพิ่ม
 Permission94=ส่งออกสังคมหรือภาษีการคลัง
-Permission95=อ่านรายงาน
+Permission95=ดูรายงาน
 Permission101=อ่านตอบรับ
 Permission102=สร้าง / แก้ไขตอบรับ
 Permission104=ตรวจสอบตอบรับ
 Permission105=Send sendings by email
 Permission106=ตอบรับการส่งออก
 Permission109=ลบตอบรับ
-Permission111=อ่านบัญชีการเงิน
+Permission111=ดูบัญชีการเงิน
 Permission112=สร้าง / แก้ไข / ลบและเปรียบเทียบการทำธุรกรรม
-Permission113=การตั้งค่าบัญชีการเงิน (สร้างจัดการหมวดหมู่)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=การทำธุรกรรมการส่งออกและงบบัญชี
 Permission116=โอนเงินระหว่างบัญชี
@@ -762,11 +765,12 @@ 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=ลบทุกโครงการและงาน (ยังเป็นโครงการส่วนตัวฉันไม่ได้ติดต่อเพื่อขอ)
-Permission146=อ่านให้บริการ
-Permission147=อ่านสถิติ
+Permission144=ลบทุกโปรเจคและงาน (รวมถึงโปรเจคส่วนตัวที่ฉันไม่ได้รับการติดต่อ)
+Permission146=ดูผู้ให้บริการ
+Permission147=ดูสถิติ
 Permission151=Read direct debit payment orders
 Permission152=Create/modify a direct debit payment orders
 Permission153=Send/Transmit direct debit payment orders
@@ -780,9 +784,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
@@ -815,8 +819,8 @@ Permission241=อ่านประเภท
 Permission242=สร้าง / แก้ไขประเภท
 Permission243=ลบประเภท
 Permission244=ดูเนื้อหาของหมวดหมู่ที่ซ่อนอยู่
-Permission251=อ่านผู้ใช้และกลุ่มอื่น ๆ
-PermissionAdvanced251=อ่านผู้ใช้อื่น ๆ
+Permission251=ดูผู้ใช้และกลุ่มอื่น ๆ
+PermissionAdvanced251=ดูผู้ใช้อื่น ๆ
 Permission252=อ่านสิทธิ์ของผู้อื่น
 Permission253=Create/modify other users, groups and permissions
 PermissionAdvanced253=สร้าง / แก้ไขผู้ใช้ภายใน / ภายนอกและการอนุญาต
@@ -826,29 +830,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=ผู้ใช้ส่งออก
@@ -862,12 +866,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=ดู / จัดการบริการซ่อน
@@ -889,12 +893,11 @@ Permission701=อ่านบริจาค
 Permission702=สร้าง / แก้ไขการบริจาค
 Permission703=ลบบริจาค
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=สร้าง / แก้ไขรายงานค่าใช้จ่าย
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=ลบรายงานค่าใช้จ่าย
-Permission774=อ่านรายงานค่าใช้จ่ายทั้งหมด (แม้จะไม่ได้สำหรับผู้ใช้ผู้ใต้บังคับบัญชา)
 Permission775=อนุมัติรายงานค่าใช้จ่าย
 Permission776=จ่ายรายงานค่าใช้จ่าย
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=รายงานค่าใช้จ่ายส่งออก
 Permission1001=อ่านหุ้น
@@ -950,7 +953,7 @@ Permission2411=อ่านการกระทำ (เหตุการณ์
 Permission2412=สร้าง / แก้ไขการกระทำ (เหตุการณ์หรืองาน) ของบุคคลอื่น
 Permission2413=ลบการกระทำ (เหตุการณ์หรืองาน) ของบุคคลอื่น
 Permission2414=Export actions/tasks of others
-Permission2501=อ่าน / ดาวน์โหลดเอกสาร
+Permission2501=ดู/ดาวน์โหลด เอกสาร
 Permission2502=ดาวน์โหลดเอกสาร
 Permission2503=ส่งเอกสารหรือลบ
 Permission2515=ไดเรกทอรีเอกสารการติดตั้ง
@@ -958,15 +961,11 @@ Permission2801=ใช้โปรแกรม FTP ในโหมดอ่าน
 Permission2802=ใช้โปรแกรม FTP ในโหมดเขียน (ลบหรืออัปโหลดไฟล์)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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=ลบออกจากการร้องขอ
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=ธุรการร้องขอลา (การติดตั้งและการปรับปรุงความสมดุล)
+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=อ่านงานที่กำหนดเวลาไว้
 Permission23002=สร้าง / การปรับปรุงกำหนดเวลางาน
@@ -1007,8 +1006,8 @@ Permission51001=Read assets
 Permission51002=Create/Update assets
 Permission51003=Delete assets
 Permission51005=Setup types of asset
-Permission54001=พิมพ์
-Permission55001=อ่านโพลล์
+Permission54001=ปริ้นท์
+Permission55001=ดูโพลล์
 Permission55002=สร้าง / แก้ไขโพลล์
 Permission59001=อ่านอัตรากำไรขั้นต้นในเชิงพาณิชย์
 Permission59002=กำหนดอัตรากำไรขั้นต้นในเชิงพาณิชย์
@@ -1028,7 +1027,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
@@ -1041,8 +1040,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)
@@ -1050,7 +1049,7 @@ DictionaryPaperFormat=รูปแบบกระดาษ
 DictionaryFormatCards=Card formats
 DictionaryFees=Expense report - Types of expense report lines
 DictionarySendingMethods=วิธีการจัดส่งสินค้า
-DictionaryStaff=Number of Employees
+DictionaryStaff=จำนวนพนักงาน
 DictionaryAvailability=ความล่าช้าในการจัดส่งสินค้า
 DictionaryOrderMethods=Order methods
 DictionarySource=แหล่งที่มาของข้อเสนอ / การสั่งซื้อ
@@ -1069,9 +1068,9 @@ 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
+TypeOfUnit=ประเภทของหน่วย
 SetupSaved=การตั้งค่าที่บันทึกไว้
-SetupNotSaved=Setup not saved
+SetupNotSaved=ยังไม่ได้บันทึกการตั้งค่า
 BackToModuleList=Back to Module list
 BackToDictionaryList=Back to Dictionaries list
 TypeOfRevenueStamp=Type of tax stamp
@@ -1082,17 +1081,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=การบริหารจัดการเรื่อง
@@ -1148,21 +1147,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
@@ -1171,8 +1170,8 @@ CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
 CompanyName=ชื่อ
 CompanyAddress=ที่อยู่
-CompanyZip=ไปรษณีย์
-CompanyTown=ตัวเมือง
+CompanyZip=รหัสไปรษณีย์
+CompanyTown=เมือง
 CompanyCountry=ประเทศ
 CompanyCurrency=สกุลเงินหลัก
 CompanyObject=เป้าหมายของ บริษัท
@@ -1181,7 +1180,7 @@ 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=โมดูลบัญชีธนาคารไม่ได้เปิดใช้
@@ -1316,7 +1315,7 @@ ExtraFieldsCustomerInvoices=คุณลักษณะเสริม (ใบ
 ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
 ExtraFieldsSupplierOrders=คุณลักษณะเสริม (คำสั่งซื้อ)
 ExtraFieldsSupplierInvoices=คุณลักษณะเสริม (ใบแจ้งหนี้)
-ExtraFieldsProject=คุณลักษณะเสริม (โครงการ)
+ExtraFieldsProject=คุณลักษณะเสริม (โปรเจค)
 ExtraFieldsProjectTask=คุณลักษณะเสริม (งาน)
 ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=s Attribute% มีค่าที่ไม่ถูกต้อง
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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=ฉบับของสนาม% s
@@ -1708,8 +1707,9 @@ MailingDelay=วินาทีที่จะรอหลังจากที
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=ผู้รับ
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=รูปแบบการส่งใบเสร็จรับเงิน
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1867,8 +1867,8 @@ YouCanDownloadFreeDatFileTo=<b>คุณสามารถดาวน์โห
 YouCanDownloadAdvancedDatFileTo=<b>นอกจากนี้คุณยังสามารถดาวน์โหลดรุ่นที่สมบูรณ์มากขึ้นมีการปรับปรุงของ</b> Maxmind GeoIP ประเทศที่ไฟล์% s
 TestGeoIPResult=ทดสอบการแปลง IP -> ประเทศ
 ##### Projects #####
-ProjectsNumberingModules=จำนวนโมดูลโครงการ
-ProjectsSetup=โครงการติดตั้งโมดูล
+ProjectsNumberingModules=โมดูลการรันเลขโปรเจค
+ProjectsSetup=การตั้งค่าโมดูลโปรเจค
 ProjectsModelModule=โครงการรายงานรูปแบบเอกสาร
 TasksNumberingModules=งานจำนวนโมดูล
 TaskModelModule=รายงานงานรูปแบบเอกสาร
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 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
@@ -1916,6 +1917,8 @@ 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)
+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
@@ -1966,7 +1969,7 @@ MailToSendReception=Receptions
 MailToThirdparty=บุคคลที่สาม
 MailToMember=สมาชิก
 MailToUser=ผู้ใช้
-MailToProject=โครงการ
+MailToProject=โปรเจค
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -2063,23 +2066,24 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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=ไปรษณีย์
+FormatZip=รหัสไปรษณีย์
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-OpeningHours=Opening hours
+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=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).
@@ -2119,12 +2123,12 @@ 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.
-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 a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index 08cb60547f3..b0fea7ef5ad 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -32,7 +32,7 @@ RIB=หมายเลขบัญชีธนาคาร
 IBAN=IBAN จำนวน
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=ประเทศบัญชี
 BankAccountOwner=ชื่อเจ้าของบัญชี
 BankAccountOwnerAddress=ที่อยู่เจ้าของบัญชี
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=สร้างบัญชี
 NewBankAccount=บัญชีใหม่
 NewFinancialAccount=บัญชีทางการเงินใหม่
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/bookmarks.lang b/htdocs/langs/th_TH/bookmarks.lang
index 5b5e5e242d8..5503cf0ebcd 100644
--- a/htdocs/langs/th_TH/bookmarks.lang
+++ b/htdocs/langs/th_TH/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Behaviour when a bookmark URL is selected
 CreateBookmark=สร้างที่คั่นหน้า
 SetHereATitleForLink=Set a name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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=การจัดการที่คั่นหน้า
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index 3c502c2b6e2..b0595b818de 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -157,6 +157,18 @@ 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=ศหมายเลข 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,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=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">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=ตรวจสอบไม่ได้ บริการตรวจสอบไม่ได้ให้โดยรัฐสมาชิก (% s)
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index ab3a9c8eecc..d40ca6a332b 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -170,8 +170,9 @@ 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=- จํานวนเงินที่แสดงเป็นกับภาษีรวมทั้งหมด
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 11c28c57e46..43200416193 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=รหัสลูกค้าจำเป็นต้องใช้
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=ล้มเหลวที่จะได้รับ
 ErrorForbidden=ปฏิเสธการเข้าใช้ <br> คุณพยายามที่จะเข้าถึงพื้นที่หน้าหรือคุณสมบัติของโมดูลพิการหรือไม่มีอยู่ในเซสชั่นหรือรับรองความถูกต้องที่ไม่ได้รับอนุญาตให้ผู้ใช้ของคุณ
 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=บันทึกที่มีอยู่แล้ว
 ErrorLabelAlreadyExists=This label already exists
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/th_TH/holiday.lang
index 8615a182474..17f16cda631 100644
--- a/htdocs/langs/th_TH/holiday.lang
+++ b/htdocs/langs/th_TH/holiday.lang
@@ -27,7 +27,7 @@ DescCP=ลักษณะ
 SendRequestCP=สร้างการร้องขอลา
 DelayToRequestCP=<b>ออกจากการร้องขอจะต้องทำอย่างน้อย% s วัน (s)</b> ก่อนหน้าพวกเขา
 MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=คุณต้องเลือกวันที่สิ้นสุดมากกว่าวันที่เริ่มต้น
 ErrorSQLCreateCP=ข้อผิดพลาดที่เกิดขึ้นในช่วง SQL สร้าง:
 ErrorIDFicheCP=เกิดข้อผิดพลาดขอลาไม่อยู่
@@ -134,3 +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 ee91c108d9a..79c67fbb0b9 100644
--- a/htdocs/langs/th_TH/install.lang
+++ b/htdocs/langs/th_TH/install.lang
@@ -21,6 +21,7 @@ ErrorPHPDoesNotSupportCurl=การติดตั้ง PHP ของคุณ
 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 ไม่มีอยู่
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/main.lang b/htdocs/langs/th_TH/main.lang
index 6d4b16d2756..ac7fce2ff2a 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=ข้อผิดพลาดอัตร
 ErrorNoSocialContributionForSellerCountry=ข้อผิดพลาดที่ไม่มีทางสังคม / ประเภทภาษีทางการคลังที่กำหนดไว้สำหรับประเทศ '% s'
 ErrorFailedToSaveFile=ข้อผิดพลาดล้มเหลวที่จะบันทึกไฟล์
 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=วันที่ตั้ง
@@ -87,7 +88,7 @@ FileWasNotUploaded=ไฟล์ที่ถูกเลือกสำหรั
 NbOfEntries=No. of entries
 GoToWikiHelpPage=อ่านความช่วยเหลือออนไลน์ (อินเทอร์เน็ตจำเป็น)
 GoToHelpPage=อ่านความช่วยเหลือ
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=บันทึกที่บันทึกไว้
 RecordDeleted=บันทึกลบ
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Return code for latest database access request error
 InformationLastAccessInError=Information for latest database access request error
 DolibarrHasDetectedError=Dolibarr ตรวจพบข้อผิดพลาดทางเทคนิค
 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 remove such notices)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=ข้อมูลเพิ่มเติม
 TechnicalInformation=ข้อมูลด้านเทคนิค
 TechnicalID=Technical ID
@@ -211,6 +212,8 @@ User=ผู้ใช้งาน
 Users=ผู้ใช้
 Group=กลุ่ม
 Groups=กลุ่ม
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=ไม่มีกลุ่มผู้ใช้ที่กำหนดไว้
 Password=รหัสผ่าน
 PasswordRetype=พิมพ์รหัสผ่านของคุณ
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=โซนเวลาไคลเอ็นต์ (ผู้ใช้)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/th_TH/modulebuilder.lang b/htdocs/langs/th_TH/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/th_TH/modulebuilder.lang
+++ b/htdocs/langs/th_TH/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 d2e0b972e26..b903a2571ac 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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=พื้นที่การส่งออก
diff --git a/htdocs/langs/th_TH/partnership.lang b/htdocs/langs/th_TH/partnership.lang
index afee675864e..e69ecbaaabb 100644
--- a/htdocs/langs/th_TH/partnership.lang
+++ b/htdocs/langs/th_TH/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/th_TH/productbatch.lang b/htdocs/langs/th_TH/productbatch.lang
index 72bf86672bf..67516596246 100644
--- a/htdocs/langs/th_TH/productbatch.lang
+++ b/htdocs/langs/th_TH/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 45169834aa9..186300a6afe 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=ราคาเฉลี่ยถ่วงน้ำหนัก
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index 299fc542581..8c7db9c4d61 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/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=โครงการที่มีผู้ใช้เป็นการติดต่อนี้
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Tasks ได้รับมอบหมายให้ผู้ใช้รายนี้
 ResourceNotAssignedToProject=ไม่ได้กำหนดโครงการ
 ResourceNotAssignedToTheTask=Not assigned to the task
@@ -284,3 +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=วันที่สิ้นสุดไม่สามารถก่อนวันเริ่มต้น
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 1ef3773c52c..a1ff3eff301 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=เริ่มต้น
+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
diff --git a/htdocs/langs/th_TH/stripe.lang b/htdocs/langs/th_TH/stripe.lang
index 4da17697604..ef79b6c51ee 100644
--- a/htdocs/langs/th_TH/stripe.lang
+++ b/htdocs/langs/th_TH/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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=URL ต่อไปนี้จะพร้อมที่จะให้หน้าให้กับลูกค้าที่จะทำให้การชำระเงินบนวัตถุ Dolibarr
 PaymentForm=รูปแบบการชำระเงิน
@@ -28,7 +28,6 @@ AccountParameter=พารามิเตอร์บัญชี
 UsageParameter=พารามิเตอร์การใช้งาน
 InformationToFindParameters=ช่วยในการหาข้อมูลเกี่ยวกับบัญชีของคุณ s%
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=ชื่อของผู้ขาย
 CSSUrlForPaymentForm=รูปแบบ CSS url ของแผ่นสำหรับรูปแบบการชำระเงิน
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
index 9d602fe680c..871ec4eab79 100644
--- a/htdocs/langs/th_TH/withdrawals.lang
+++ b/htdocs/langs/th_TH/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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=จำแนกเครดิต
+ClassDebited=Classify debited
 ClassCreditedConfirm=คุณแน่ใจว่าคุณต้องการที่จะจำแนกได้รับการถอนนี้เป็นเครดิตในบัญชีธนาคารของคุณ?
 TransData=วันที่ส่ง
 TransMetod=วิธีการส่ง
@@ -80,7 +82,7 @@ StatusMotif7=การตัดสินใจการพิจารณาค
 StatusMotif8=เหตุผลอื่น ๆ
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=สำนักงานเท่านั้น
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 7119bbe77ca..e80213cdfac 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=Avrupa Ekonomi Topluluğu'nda Olmayan Ülkeler
 CountriesInEECExceptMe=%s hariç Avrupa Ekonomi Topluluğu ülkeleri
 CountriesExceptMe=%s hariç tüm ülkeler
 AccountantFiles=Kaynak belgeleri dışa aktar
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ ValidateMovements=Hareketleri doğrula
 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
-AutomaticBindingDone=Otomatik bağlama bitti
+AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Hata, kullanıldığı için bu muhasebe hesabını silemezsiniz
 MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
@@ -387,7 +387,8 @@ 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=Muhasebe hesabı aralığı
 Calculated=Hesaplanmış
@@ -395,7 +396,7 @@ Formula=Formül
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Kurulumun bazı zorunlu adımları tamamlanmadı, lütfen onları tamamlayın.
-ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorNoAccountingCategoryForThisCountry=%s ülkesi için muhasebe hesap grubu yok (Giriş - Ayarlar - Sözlükler kısmına bakın)
 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=Ayarlanan dışa aktarım biçimi bu sayfada desteklenmiyor
@@ -404,6 +405,7 @@ NoJournalDefined=No journal defined
 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
 
 ## Import
 ImportAccountingEntries=Muhasebe girişleri
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 752a9292228..890b8e15648 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Dernek
 Version=Sürüm
 Publisher=Yayıncı
@@ -265,8 +267,8 @@ OtherResources=Diğer kaynaklar
 ExternalResources=Dış Kaynaklar
 SocialNetworks=Sosyal Ağlar
 SocialNetworkId=Sosyal Ağ Kimliği
-ForDocumentationSeeWiki=Kullanıcıların ve geliştiricilerin belgeleri (Doc, FAQs…), <br>Dolibarr Wiki ye bir göz atın:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Herhangi bir başka soru/yardım için Dolibarr forumunu kullanabilirsiniz:<br><b><a href="%s" target="_blank">%s</a></b>
+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=Burada Dolibar ile ilgili yardım ve destek almak için bazı kaynaklar bulabilirsiniz.
 HelpCenterDesc2=Bazı kaynaklar sadece <b>İngilizce</b> dilinde mevcuttur.
 CurrentMenuHandler=Geçerli menü işlemcisi
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Son kararlı sürüm
 LastActivationDate=En son aktivasyon tarihi
 LastActivationAuthor=En son aktivasyon yazarı
 LastActivationIP=En son aktivasyon IP'si
+LastActivationVersion=Latest activation version
 UpdateServerOffline=Güncelleme sunucusu çevrimdışı
 WithCounter=Bir sayacı yönet
 GenericMaskCodes=Herhangi bir numaralandırma maskesi girebilirsiniz. Bu maskede, aşağıdaki etiketler kullanılabilir:<br><b> {000000} </b>, her %s'de artırılacak bir sayıya karşılık gelir. Sayacın istenen uzunluğu kadar sıfır girin. Sayaç, maske kadar sıfıra sahip olmak için soldan sıfırlarla tamamlanacaktır.<br><b> {000000 + 000} </b> öncekiyle aynı, ancak + işaretinin sağındaki sayıya karşılık gelen ofset ilk %s'den başlayarak uygulandı.<br><b> {000000 @ x} </b> öncekiyle aynı ancak x ayına ulaşıldığında sayaç sıfırlanır (x 1 ile 12 arasında veya tanımlanan mali yılın ilk aylarını kullanmak için 0) yapılandırmanızda veya her ay sıfıra sıfırlamak için 99). Bu seçenek kullanılırsa ve x 2 veya daha yüksekse, {yy} {aa} veya {yyyy} {aa} dizisi de gereklidir.<br><b> {gg} </b> gün (01 - 31).<br><b> {aa} </b> ay (01 - 12).<br><b> {yy} </b>, <b> {yyyy} </b> veya <b> {y} </b> 2, 4 veya 1 sayıdan fazla. <br>
@@ -375,8 +378,8 @@ UMask=Unix/Linux/BSD dosya sisteminde yeni dosyalar için Umask parametresi.
 UMaskExplanation=Bu parametre Dolibarr tarafından sunucuda oluşturulan dosyaların izinlerini varsayılan olarak tanımlamanıza (örneğin yükleme sırasında) izin verir.<br>Bu sekizli değer olmalıdır (örneğin, 0666 herkes için okuma ve yazma anlamına gelir).<br>Bu parametre Windows sunucusunda kullanılmaz.
 SeeWikiForAllTeam=Katkıda bulunanlar ve kuruluşlarının bir listesi için Wiki sayfasına göz atın
 UseACacheDelay= Saniye olarak önbellek aktarması tepki gecikmesi (hiç önbellek yoksa 0 ya da boş)
-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=Oturum açma sayfasında "<b>Yardım ya da destek gerekli</b>" bağlantısını gizle
+DisableLinkToHelp=Çevrimiçi yardım "<b>%s</b>" bağlantısını gizle
 AddCRIfTooLong=Otomatik metin kaydırma özelliği olmadığı çok uzun metinlerdeki taşmalar belgeler üzerinde gösterilmeyecektir. Lütfen gerekirse metin alanına satır başı ekleyin.
 ConfirmPurge=Bu temizleme işlemini çalıştırmak istediğinizden emin misiniz?<br>Bu işlem tüm veri dosyalarınızı bir daha geri alınamayacak şekilde kalıcı olarak silecektir (ECM dosyaları, ekli dosyalar…).
 MinLength=Enaz uzunluk
@@ -570,7 +573,7 @@ Module53Desc=Hizmet Yönetimi
 Module54Name=Sözleşmeler/Abonelikler
 Module54Desc=Sözleşmelerin yönetimi (hizmetler veya yinelenen abonelikler)
 Module55Name=Barkodlar
-Module55Desc=Barcode or QR code management
+Module55Desc=Barkod veya QR kod yönetimi
 Module56Name=Kredi transferiyle ödeme
 Module56Desc=Kredi Transferi siparişleri ile tedarikçilerin ödemelerinin yönetimi. Avrupa ülkeleri için SEPA dosyası oluşturmayı içerir.
 Module57Name=Otomatik Ödeme ile Ödemeler
@@ -753,7 +756,7 @@ Permission106=Gönderilenleri dışa aktar
 Permission109=Gönderilenleri sil
 Permission111=Finansal tabloları oku
 Permission112=İşlem oluştur/düzenle/sil ve karşılaştır
-Permission113=Mali hesapları ayarla (kategoriler oluştur, yönet)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Uzlaştırma işlemleri
 Permission115=İşlemleri ve hesap tablolarını dışa aktar
 Permission116=Hesaplar arasında aktarım
@@ -762,6 +765,7 @@ Permission121=Kullanıcıya bağlı üçüncü partileri oku
 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)
@@ -889,12 +893,11 @@ Permission701=Bağış oluştur/değiştir
 Permission702=Bağış sil
 Permission703=Bağış sil
 Permission771=Gider raporlarını oku (kendinin veya astlarının)
-Permission772=Gider raporu oluştur/değiştir
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Gider raporu sil
-Permission774=Bütün gider raporlarını oku (emrinde olmayanlarınkini de)
 Permission775=Gider raporu onayla
 Permission776=Ödeme gider raporu
-Permission777=Herkesin gider raporlarını okuyun
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Herkesin gider raporlarını oluşturun/değiştirin
 Permission779=Gider raporlarını dışa aktar
 Permission1001=Stok oku
@@ -958,15 +961,11 @@ Permission2801=Okuma modunda FTP istemcisi kullan (yalnızca tara ve indir)
 Permission2802=Yazma modunda FTP istemcisi kullan (sil ya da dosya yükle)
 Permission3200=Arşivlenmiş olayları ve parmak izlerini okuyun
 Permission3301=Yeni modüller oluşturun
-Permission4001=Çalışanları gör
-Permission4002=Çalışan oluştur
-Permission4003=Çalışan sil
-Permission4004=Çalışanları dışa aktar
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ Permission10005=Web sitesi içeriğini silin
 Permission20001=İzin taleplerini okuyun (izniniz ve astlarınızın izinleri)
 Permission20002=İzin isteklerinizi oluşturun/değiştirin (izinleriniz ve astlarınızın izinleri)
 Permission20003=İzin isteği sil
-Permission20004=Tüm izin isteklerini okuyun (ast olmayan kullanıcıların bile)
-Permission20005=Herkes için izin istekleri oluşturun/değiştirin (ast olmayan kullanıcılar için bile)
-Permission20006=Yönetici izin istekleri (ayarla ve bakiye güncelle)
+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=İzin isteklerini onaylayın
 Permission23001=Planlı iş oku
 Permission23002=Planlı iş oluştur/güncelle
@@ -1019,9 +1018,9 @@ Permission63003=Kaynak sil
 Permission63004=Gündem etkinliklerine kaynak bağlantıla
 Permission64001=Doğrudan yazdırmaya izin ver
 Permission67000=Makbuzların yazdırılmasına izin ver
-Permission68001=Şirket içi raporu okuyun
-Permission68002=Şirket içi rapor oluştur/değiştir
-Permission68004=Topluluk içi raporu sil
+Permission68001=Dahili iletişim raporunu okuyun
+Permission68002=Dahili iletişim raporu oluştur/değiştir
+Permission68004=Dahili iletişim raporunu sil
 Permission941601=Makbuzları oku
 Permission941602=Makbuz oluşturma ve değiştirme
 Permission941603=Makbuzları doğrula
@@ -1040,7 +1039,7 @@ DictionaryCivility=Onursal unvanlar
 DictionaryActions=Gündem etkinlik türleri
 DictionarySocialContributions=Sosyal veya mali vergi türleri
 DictionaryVAT=KDV Oranları veya Satış Vergisi Oranları
-DictionaryRevenueStamp=Damga vergisi tutarları
+DictionaryRevenueStamp=Damga pulu tutarları
 DictionaryPaymentConditions=Ödeme Koşulları
 DictionaryPaymentModes=Ödeme Türleri
 DictionaryTypeContact=Kişi/Adres türleri
@@ -1067,14 +1066,14 @@ DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Proje/potansiyel müşteri için potansiyel müşteri durumu
 DictionaryExpenseTaxCat=Gider raporu - Ulaşım kategorileri
 DictionaryExpenseTaxRange=Gider raporu - Ulaşım kategorisine göre menzil
-DictionaryTransportMode=Intracomm raporu - Taşıma modu
+DictionaryTransportMode=Dahili iletişim raporu - Taşıma modu
 DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Ünite türü
 SetupSaved=Kurulum kaydedildi
 SetupNotSaved=Kurulum kaydedilmedi
 BackToModuleList=Modül listesine dön
-BackToDictionaryList=Tanımlar listesine dön
-TypeOfRevenueStamp=Damga vergisi türü
+BackToDictionaryList=Sözlük listesine dön
+TypeOfRevenueStamp=Damga pulu türü
 VATManagement=Satış Vergisi Yönetimi
 VATIsUsedDesc=Potansiyel müşteriler, faturalar, siparişler vb. oluştururken KDV oranı varsayılan olarak aktif standart kuralı izler:<br>Eğer satıcı taraf vergiye tabi değilse KDV oranı 0 olacaktır. Kuralın sonu.<br>Eğer satıcı ve alıcının ülkesi aynı ise (satıcı ülkesi=alıcı ülkesi), KDV oranı varsayılan olarak ürünün satıcı ülkesindeki KDV oranına eşittir. Kuralın sonu.<br>Hem satıcı hem de alıcı taraf Avrupa Topluluğu'nda yer alıyorsa ve mallar taşımayla ilgili (taşıma, nakliye, havayolu) ürünler ise varsayılan KDV 0 olacaktır. Bu kural satıcının ülkesine bağlıdır - lütfen muhasebecinize danışın. KDV alıcı tarafından satıcıya değil, ülkesindeki gümrük idaresine ödenmelidir. Kuralın sonu.<br>Hem satıcı hem de alıcı taraf Avrupa Topluluğu'nda yer alıyorsa ve alıcı taraf bir şirket değil ise (kayıtlı bir Topluluk içi Vergi numarasına sahip), KDV oranı varsayılan olarak satıcının ülkesinin KDV oranına eşit olacaktır. Kuralın sonu.<br>Hem satıcı hem de alıcı taraf Avrupa Topluluğu'nda yer alıyorsa ve alıcı taraf bir şirketse (kayıtlı bir Topluluk içi Vergi numarasına sahip), KDV oranı varsayılan olarak 0 olacaktır. Kuralın sonu.<br>Bunların dışındaki durumlarda KDV oranı için önerilen varsayılan değer 0'dır. Kuralın sonu.
 VATIsNotUsedDesc=Dernekler, şahıslar veya küçük şirketler söz konusu olduğunda varsayılan olarak önerilen KDV oranı 0 olacaktır.
@@ -1106,8 +1105,8 @@ LocalTax2IsNotUsedDescES=Varsayılan olarak önerilen IRPF 0. Kural sonu.
 LocalTax2IsUsedExampleES=İspanya'da, hizmet işleri yapan serbest meslek sahipleri ve bağımsız uzmanlar ile bu vergi sistemini seçen firmalardır.
 LocalTax2IsNotUsedExampleES=İspanya'da bunlar, modüllerin vergi sistemine tabi olmayan işletmelerdir.
 RevenueStampDesc="Vergi pulu" veya "gelir pulu", fatura başına sabit bir vergidir (Fatura miktarına bağlı değildir). Yüzde vergi de olabilir, ancak ikinci veya üçüncü vergi türünü kullanmak yüzde vergiler için daha iyidir çünkü vergi pulları herhangi bir raporlama sağlamaz. Yalnızca birkaç ülke bu tür vergileri kullanır.
-UseRevenueStamp=Vergi damgası kullanın
-UseRevenueStampExample=Vergi damgasının değeri varsayılan olarak sözlük ayarlarında tanımlanır (%s - %s - %s)
+UseRevenueStamp=Vergi pulu kullanın
+UseRevenueStampExample=Vergi pulunun değeri varsayılan olarak sözlük ayarlarında tanımlanır (%s - %s - %s)
 CalcLocaltax=Yerel vergi raporları
 CalcLocaltax1=Satışlar - Alışlar
 CalcLocaltax1Desc=Yerel Vergi raporları, yerel satış vergileri ile yerel alış vergileri farkı olarak hesaplanır
@@ -1185,7 +1184,7 @@ DoNotSuggestPaymentMode=Önerme
 NoActiveBankAccountDefined=Tanımlı etkin banka hesabı yok
 OwnerOfBankAccount=Banka hesabı sahibi %s
 BankModuleNotActive=Banka hesapları modülü etkin değil
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
+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:
@@ -1216,7 +1215,7 @@ SetupDescription3b=Basic parameters used to customize the default behavior of yo
 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=Denetlenen güvenlik olayları
 NoSecurityEventsAreAduited=Hiçbir güvenlik olayı denetlenmez. Bunları %s menüsünden etkinleştirebilirsiniz
-Audit=Security events
+Audit=Güvenlik Etkinlikleri
 InfoDolibarr=Dolibarr Bilgileri
 InfoBrowser=Tarayıcı Bilgileri
 InfoOS=İşletim Sistemi Bilgileri
@@ -1358,9 +1357,9 @@ BrowserIsOK=%s web tarayıcısını kullanıyorsunuz. Bu tarayıcı güvenlik ve
 BrowserIsKO=%s web tarayıcısını kullanıyorsunuz. Bu tarayıcının güvenlik, performans ve güvenilirlik açısından kötü bir seçim olduğu bilinmektedir. Firefox, Chrome, Opera veya Safari kullanmanızı öneririz.
 PHPModuleLoaded=%s PHP bileşeni yüklendi
 PreloadOPCode=Önceden yüklenmiş OPCode kullanılır
-AddRefInList=Müşteri/Satıcı referans bilgi listesi ve hiperlinklerin çoğu.<br>Cariler "Şirket adımız A.Ş." yerine "CC12345 - SC45678 - Şirket adımız A.Ş." şeklinde görünecektir.
-AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=Müşteri/Satıcı adres bilgisi listesini görüntüleyin <br>Cariler, "Şirket adımız A.Ş." yerine "Şirket adımız A.Ş. - Esentepe Cad. Mecidiyeköy - İstanbul - Türkiye" şeklinde görünecektir.
+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=İletişim e-postasını (veya tanımlanmamışsa telefonları) ve şehir bilgi listesini görüntüleyin <br>Kişiler "Ali Koç - ali.koc@email.com - Istanbul" veya "Ali Koç - ad biçiminde görünecektir.
 AskForPreferredShippingMethod=Cariler için tercih edilen gönderme yöntemini isteyin.
 FieldEdition=%s Alanının düzenlenmesi
@@ -1708,8 +1707,9 @@ MailingDelay=Sonraki mesajı göndermek için beklenecek saniyeler
 NotificationSetup=E-posta Bildirimi modülü kurulumu
 NotificationEMailFrom=Bildirimler modülü tarafından gönderilen e-postalar için gönderici e-posta (gönderen)
 FixedEmailTarget=Alıcı
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Sevkiyat modülü ayarları
 SendingsReceiptModel=Makbuz gönderme modeli
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Teslimat fişlerinde serbest metin
 ##### FCKeditor #####
 AdvancedEditor=Gelişmiş editör
 ActivateFCKeditor=Gelişmiş düzenleyiciyi şunun için etkinleştir:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field public notes of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field private notes of elements
+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=Tüm varlıklar (teklifler, siparişler, faturalar, vb.) İçin ürün ayrıntı satırlarının WYSIWIG oluşturulması/baskısı. <span class = "warning"> Uyarı: Bu durumda bu seçeneğin kullanılması, PDF dosyalarını oluştururken özel karakterler ve sayfa biçimlendirmeyle ilgili sorunlar yaratabileceğinden, kesinlikle önerilmez. </span>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Gider Raporları modülü kurulumu - Kurallar
 ExpenseReportNumberingModules=Gider raporları numaralandırma modülü
 NoModueToManageStockIncrease=Otomatik stok arttırılması yapabilecek hiçbir modül etkinleştirilmemiş. Stok arttırılması yalnızca elle girişle yapılacaktır.
 YouMayFindNotificationsFeaturesIntoModuleNotification="Bildirim" modülünü etkinleştirip yapılandırarak e-posta bildirimleri için seçenekler bulabilirsiniz.
+TemplatesForNotifications=Templates for notifications
 ListOfNotificationsPerUser=Kullanıcı başına otomatik bildirimlerin listesi *
 ListOfNotificationsPerUserOrContact=Kullanıcı başına * veya kişi başına ** mevcut olan olası otomatik bildirimlerin listesi (iş etkinliğinde)
 ListOfFixedNotifications=Otomatik sabit bildirimlerin listesi
@@ -1916,6 +1917,8 @@ 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)
+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
@@ -1984,8 +1987,8 @@ AllPublishers=Bütün yayıncılar
 UnknownPublishers=Bilinmeyen yayıncılar
 AddRemoveTabs=Sekme ekle ya da sil
 AddDataTables=Nesne tabloları ekle
-AddDictionaries=Tanım tabloları ekleyin
-AddData=Nesne veya tanım verileri ekle
+AddDictionaries=Sözlük tabloları ekleyin
+AddData=Nesne veya sözlük verileri ekle
 AddBoxes=Ekran etiketi ekle
 AddSheduledJobs=Planlı görev ekle
 AddHooks=Kanca ekle
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Bu koleksiyoncu için koleksiyonu şimdi çalışt
 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)
-RecordEvent=E-posta olayını kaydet
-CreateLeadAndThirdParty=Aday oluştur (ve gerekirse cari)
-CreateTicketAndThirdParty=Bilet oluşturun (ve önceki bir işlemle yüklenmişse cariye bağlantı verin)
+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=En son sonuç kodu
 NbOfEmailsInInbox=Kaynak dizindeki e-postaların sayısı
 LoadThirdPartyFromName=%s üzerinde cari aramasını yükle (yalnızca yükle)
 LoadThirdPartyFromNameOrCreate=%s üzerinde cari aramasını yükle (bulunamazsa oluşturun)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
 WithDolTrackingID=Dolibarr'dan gönderilen ilk e-postayla başlatılan bir görüşmeden gelen mesaj
 WithoutDolTrackingID=Dolibarr'dan GÖNDERİLMEYEN ilk e-posta ile başlatılan bir görüşmeden gelen mesaj
 WithDolTrackingIDInMsgId=Dolibarr'dan gönderilen mesaj
@@ -2078,7 +2082,7 @@ CreateCandidature=İş başvurusu oluştur
 FormatZip=Posta Kodu
 MainMenuCode=Menü giriş kodu (ana menü)
 ECMAutoTree=Otomatik ECM ağacını göster
-OperationParamDesc=Eylemin nesnesi için kullanılacak değerleri veya değerlerin nasıl çıkarılacağını tanımlayın. Örneğin:<br>objproperty1=SET: ayarlanacak değer <br>objproperty2=SET:__objproperty1__ yerine geçen bir değer <br>objproperty3=SETIFEMPTY:objproperty3 önceden tanımlanmamışsa kullanılan değer <br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br> object.objproperty5=EXTRACT:BODY:Şirket adı\\s([^\\s]*)<br><br> a kullanın; Birkaç özelliği ayıklamak veya ayarlamak için ayırıcı olarak karakter.
+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=Açılış saatleri
 OpeningHoursDesc=Buraya firmanızın normal çalışma saatlerini girin.
 ResourceSetup=Kaynak modülünün yapılandırılması
@@ -2124,7 +2128,7 @@ LargerThan=Şundan daha büyük
 IfTrackingIDFoundEventWillBeLinked=Bir nesnenin izleme kimliği e-postada bulunursa veya e-posta bir e-postanın hemen toplanan ve bir nesneye bağlanan bir cevabıysa, oluşturulan olayın otomatik olarak bilinen ilgili nesneye bağlanacağını unutmayın.
 WithGMailYouCanCreateADedicatedPassword=Bir GMail hesabıyla, 2 adımlı doğrulamayı etkinleştirdiyseniz, https://myaccount.google.com/ adresinden kendi hesap şifrenizi kullanmak yerine uygulama için özel bir ikinci şifre oluşturmanız önerilir.
 EmailCollectorTargetDir=Başarıyla işlendiğinde e-postayı başka bir etikete/dizine taşımak istenen bir davranış olabilir. Bu özelliği kullanmak için burada dizinin adını ayarlamanız yeterlidir (isimde özel karakterler KULLANMAYIN). Ayrıca bir okuma/yazma oturum açma hesabı kullanmanız gerektiğini unutmayın.
-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 a string 'Name: name to find' found into the body, use 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=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=%s için bitiş noktası: %s
 DeleteEmailCollector=E-posta toplayıcıyı sil
 ConfirmDeleteEmailCollector=Bu e-posta toplayıcıyı silmek istediğinizden emin misiniz?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index e657eb48ba6..c4736e5e5f5 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -32,7 +32,7 @@ RIB=Banka Hesap Numarası
 IBAN=IBAN numarası
 BIC=BIC/SWIFT kodu
 SwiftValid=BIC/SWIFT geçerli
-SwiftVNotalid=BIC/SWIFT geçerli değil
+SwiftNotValid=BIC/SWIFT geçerli değil
 IbanValid=BAN geçerli
 IbanNotValid=BAN geçerli değil
 StandingOrders=Otomatik ödeme talimatları
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Banka adresi
 BankAccountCountry=Hesap ülkesi
 BankAccountOwner=Hesap sahibi adı
 BankAccountOwnerAddress=Hesap sahibi adresi
-RIBControlError=Değerlerin bütünlük kontrolü başarısız oldu. Bu da, bu hesap numarası bilgilerinin tamamlanmamış veya yanlış olduğu anlamına gelir (ülkeyi, numaraları ve IBAN'ı kontrol edin).
 CreateAccount=Hesap oluştur
 NewBankAccount=Yeni hesap
 NewFinancialAccount=Yeni ticari hesap
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index 79b13d534ef..bcd6e03332f 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -81,15 +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ı
-PaymentTypeDC=Banka/Kredi Kartı
-PaymentTypePP=PayPal
-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ı
@@ -266,7 +265,7 @@ RelatedCommercialProposals=İlgili teklifler
 RelatedRecurringCustomerInvoices=İlişkili yinelenen müşteri faturaları
 MenuToValid=Doğrulanacak
 DateMaxPayment=Ödeme vadesi
-DateInvoice=Fatura tarihi
+DateInvoice=Fatura Tarihi
 DatePointOfTax=Vergi noktası
 NoInvoice=Fatura yok
 NoOpenInvoice=No open invoice
@@ -280,6 +279,7 @@ SetMode=Ödeme Türünü Ayarla
 SetRevenuStamp=Damga pulu ayarı
 Billed=Faturalanmış
 RecurringInvoices=Yinelenen faturalar
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Fatura şablonu
 RepeatableInvoices=Fatura şablonları
 Repeatable=Şablon
@@ -449,6 +449,8 @@ PaymentTypeTRA=Banka ödeme emri
 PaymentTypeShortTRA=Ödeme emri
 PaymentTypeFAC=Faktör
 PaymentTypeShortFAC=Faktör
+PaymentTypeDC=Banka/Kredi Kartı
+PaymentTypePP=PayPal
 BankDetails=Banka ayrıntıları
 BankCode=Banka kodu
 DeskCode=Şube kodu
@@ -525,7 +527,7 @@ ToMakePayment=Öde
 ToMakePaymentBack=Geri öde
 ListOfYourUnpaidInvoices=Ödenmemiş fatura listesi
 NoteListOfYourUnpaidInvoices=Not: Bu liste, satış temsilcisi olarak bağlı olduğunuz üçüncü partilere ait faturaları içerir.
-RevenueStamp=Tax stamp
+RevenueStamp=Damga pulu
 YouMustCreateInvoiceFromThird=Bu seçenek yalnızca üçüncü partinin "Müşteri" sekmesinden bir fatura oluştururken kullanılabilir
 YouMustCreateInvoiceFromSupplierThird=Bu seçenek yalnızca üçüncü partinin "Tedarikçi" sekmesinden bir fatura oluştururken kullanılabilir
 YouMustCreateStandardInvoiceFirstDesc=Yeni bir fatura şablonu oluşturmak için önce bir standart fatura oluşturmalı ve onu "şablona" dönüştürmelisiniz
@@ -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/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/bookmarks.lang b/htdocs/langs/tr_TR/bookmarks.lang
index fdcb9d868c2..3f64c63da5b 100644
--- a/htdocs/langs/tr_TR/bookmarks.lang
+++ b/htdocs/langs/tr_TR/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Bir yer imi URL'si seçildiğindeki davranış
 CreateBookmark=Yer imi oluştur
 SetHereATitleForLink=Yer imi için bir ad belirleyin
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Harici/mutlak bir bağlantı (https://URL) veya dahili/göreceli bir bağlantı (/DOLIBARR_ROOT/htdocs/...) kullanın
+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=Bağlantı verilen sayfanın mevcut sekmede mi yoksa yeni sekmede mi açılacağını seçin
 BookmarksManagement=Yer imi yönetimi
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index ad38b93b093..6ff23b98f79 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -3,7 +3,7 @@ Rubrique=Etiket/Kategori
 Rubriques=Etiketler/Kategoriler
 RubriquesTransactions=İşlem Etiketleri/Kategorileri
 categories=etiketler/kategoriler
-NoCategoryYet=No tag/category of this type has been created
+NoCategoryYet=Bu türde oluşturulmuş etiket/kategori yok
 In=İçinde
 AddIn=Eklenti
 modify=değiştir
@@ -16,7 +16,7 @@ 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
+UsersCategoriesArea=Kullanıcı etiketleri/kategorileri alanı
 SubCats=Alt kategoriler
 CatList= Etiketler/kategoriler listesi
 CatListAll=List of tags/categories (all types)
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 7f32f4844a2..8ba4746193d 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -71,7 +71,7 @@ Call=Ara
 Chat=Sohbet
 PhonePro=İş telefonu
 PhonePerso=Dahili numarası
-PhoneMobile=Cep telefonu
+PhoneMobile=Cep Telefonu
 No_Email=Toplu e-postaları reddet
 Fax=Faks
 Zip=Posta Kodu
@@ -157,6 +157,18 @@ 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 (RUT)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,10 +381,10 @@ VATIntraCheck=Denetle
 VATIntraCheckDesc=Bu Vergi Numarası ülke önekini içermelidir. <b>%s</b> linki, Dolibarr sunucusundan internet erişimi gerektiren Avrupa KDV kontrol hizmetini (VIES) kullanır.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Avrupa Komisyonu web sitesinden topluluk içi Vergi Numarasını kontrol edin
-VATIntraManualCheck=Avrupa Komisyonu'nun <a href="%s" target="_blank">%s</a> web adresinden de manuel olarak kontrol edebilirsiniz
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Denetlemiyor. Denetim hizmeti üye ülke (%s) tarafından sağlanmıyor.
 NorProspectNorCustomer=Ne aday ne de müşteri
-JuridicalStatus=Business entity type
+JuridicalStatus=Ticari varlık türü
 Workforce=Workforce
 Staff=Çalışan sayısı
 ProspectLevelShort=Potansiyel
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index c19b10c5821..637809ac0e1 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -170,8 +170,9 @@ 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=- Gösterilen tutarlara tüm vergiler dahildir
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- Faturalarda, giderlerde, KDV inde ve maaşlarda yapılan gerçek ödemeleri içerir. <br>- Faturaların, giderleri, KDV nin ve maaşların ödeme tarihleri baz alınır. Bağışlar için bağış tarihi.
+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=- Müşterilerden alınan tüm geçerli fatura ödemelerini içerir. <br> - Faturaların ödeme tarihi temellidir <br>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
@@ -295,3 +296,5 @@ 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/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 9053230e732..37622276db8 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -27,7 +27,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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=RSS beslemesi alınamıyor. Eğer hata mesajları yeter
 ErrorForbidden=Erişim reddedildi. <br>Devre dışı bir modül alanına ya da özelliğine veya kimlik doğrulaması yapmadan ya da kullanıcınızın izini olmadan bir sayfaya erişmek istediniz.
 ErrorForbidden2=Bu oturum açma için izin Dolibarr yöneticiniz tarafından %s->%s menüsünden tanımlanabilir.
 ErrorForbidden3=Dolibarr bir kimlik doğrulama oturumu üzerinden kullanılmamış gibi görünüyor. Kimlik doğrulama nasıl yönetileceğini öğrenmek Dolibarr kurulum belgelerine bir göz atın (htaccess, mod_auth veya diğer ...).
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=Bu PHP Class Imagick yok. Önizleme kullanılır olmayabilir. Yöneticiler Kurulum - Ekran menüsünde bu sekmeyi devre dışı bırakabilir.
 ErrorRecordAlreadyExists=Kayıt zaten var
 ErrorLabelAlreadyExists=Bu etiket zaten var
@@ -271,6 +274,9 @@ 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=PHP'nizdeki upload_max_filesize (%s) parametresi, post_max_size (%s) PHP parametresinden daha yüksek. Bu tutarlı bir kurulum değil.
@@ -312,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/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/holiday.lang b/htdocs/langs/tr_TR/holiday.lang
index 0b50bc05051..45bd42c217c 100644
--- a/htdocs/langs/tr_TR/holiday.lang
+++ b/htdocs/langs/tr_TR/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Açıklama
 SendRequestCP=İzin isteği oluştur
 DelayToRequestCP=İzin istekleri enaz <b>%s gün</b> önce yapolmalıdır.
 MenuConfCP=İzin dengesi
-SoldeCPUser=İzin bakiye <b> %s </b> gündür.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Başlama tarihinden büyük bir bitiş tarihi seçmelisiniz.
 ErrorSQLCreateCP=Oluşturma sırasında bir SQL hatası oluştu:
 ErrorIDFicheCP=Bir hata oluştu, izin isteği yok.
@@ -134,3 +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/install.lang b/htdocs/langs/tr_TR/install.lang
index 0456df5b134..7d9b674fbac 100644
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -21,6 +21,7 @@ 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.
diff --git a/htdocs/langs/tr_TR/intracommreport.lang b/htdocs/langs/tr_TR/intracommreport.lang
index 69850cd0bf0..4302a378571 100644
--- a/htdocs/langs/tr_TR/intracommreport.lang
+++ b/htdocs/langs/tr_TR/intracommreport.lang
@@ -1,7 +1,7 @@
-Module68000Name = Intracomm report
-Module68000Desc = Intracomm report management (Support for French DEB/DES format)
-IntracommReportSetup = Intracommreport module setup
-IntracommReportAbout = About intracommreport
+Module68000Name = Dahili iletişim raporu
+Module68000Desc = Dahili iletişim raporu yönetimi (Fransız DEB/DES formatı desteği)
+IntracommReportSetup = Dahili iletişim raporu modül ayarları
+IntracommReportAbout = Dahili iletişim raporu hakkında
 
 # Setup
 INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
@@ -14,7 +14,7 @@ INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
 INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
 
 # Menu
-MenuIntracommReport=Intracomm report
+MenuIntracommReport=Dahili iletişim raporu
 MenuIntracommReportNew=New declaration
 MenuIntracommReportList=Liste
 
@@ -32,7 +32,7 @@ IntracommReportTitle=Preparation of an XML file in ProDouane format
 # List
 IntracommReportList=List of generated declarations
 IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of nalysis
+IntracommReportPeriod=Period of analysis
 IntracommReportTypeDeclaration=Type of declaration
 IntracommReportDownload=download XML file
 
diff --git a/htdocs/langs/tr_TR/knowledgemanagement.lang b/htdocs/langs/tr_TR/knowledgemanagement.lang
index 5987c658f5b..57c9563dad8 100644
--- a/htdocs/langs/tr_TR/knowledgemanagement.lang
+++ b/htdocs/langs/tr_TR/knowledgemanagement.lang
@@ -18,16 +18,16 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = Bilgi Yönetim Sistemi
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=Bir Bilgi Yönetimi (BY) veya Yardım-Masası tabanını yönetin
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = Bilgi Yönetim Sistemi Kurulumu
 Settings = Ayarlar
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetupPage = Bilgi Yönetim Sistemi Kurulum Sayfası
 
 
 #
@@ -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/main.lang b/htdocs/langs/tr_TR/main.lang
index c704ca9e616..f9a71e2c878 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Hata, ülke '%s' için herhangi bir KDV or
 ErrorNoSocialContributionForSellerCountry=Hata, '%s' ülkesi için sosyal/mali vergi tipi tanımlanmamış.
 ErrorFailedToSaveFile=Hata, dosya kaydedilemedi.
 ErrorCannotAddThisParentWarehouse=Zaten mevcut bir deponun alt deposu olan bir üst depo eklemeye çalışıyorsunuz
+FieldCannotBeNegative=Field "%s" cannot be negative
 MaxNbOfRecordPerPage=Sayfa başına maksimum kayıt sayısı
 NotAuthorized=Bunu yapmak için yetkiniz yok.
 SetDate=Ayar tarihi
@@ -87,7 +88,7 @@ FileWasNotUploaded=Bu ekleme için bir dosya seçildi ama henüz gönderilmedi.
 NbOfEntries=Kayıt sayısı
 GoToWikiHelpPage=Çevrimiçi yardım oku (Internet erişimi gerekir)
 GoToHelpPage=Yardım oku
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Ana Sayfa
 RecordSaved=Kayıt kaydedildi
 RecordDeleted=Kayıt silindi
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Son veritabanı erişim isteği hata kodunu göster
 InformationLastAccessInError=Son veritabanı erişim isteği hatası bilgisi
 DolibarrHasDetectedError=Dolibarr teknik bir hata algıladı
 YouCanSetOptionDolibarrMainProdToZero=Daha fazla bilgi almak için log dosyasını okuyabilir veya $dolibarr_main_prod seçeneğini '0' olarak ayarlayabilirsiniz.
-InformationToHelpDiagnose=Bu bilgi sorun tespiti amaçları için yararlı olabilir (bu tür bildirimleri kapatmak için $dolibarr_main_prod seçeneğini '1' olarak ayarlayabilirsiniz)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Daha fazla bilgi
 TechnicalInformation=Teknik bilgi
 TechnicalID=Teknik Kimlik
@@ -211,6 +212,8 @@ User=Kullanıcı
 Users=Kullanıcılar
 Group=Grup
 Groups=Gruplar
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Tanımlı kullanıcı grubu yok
 Password=Parola
 PasswordRetype=Parolanızı yeniden yazın
@@ -271,7 +274,7 @@ DateReference=Referans tarihi
 DateStart=Başlangıç tarihi
 DateEnd=Bitiş tarihi
 DateCreation=Oluşturma tarihi
-DateCreationShort=Oluşt. tarihi
+DateCreationShort=Oluşturulma tarihi
 IPCreation=Creation IP
 DateModification=Değiştirme tarihi
 DateModificationShort=Değiş. tarihi
@@ -906,7 +909,7 @@ ViewFlatList=Düz listeyi incele
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString='%s' dizisini kaldır
-SomeTranslationAreUncomplete=Sunulan dillerden bazıları sadece kısmen çevrilmiş olabilir veya çeviri hatalarına sahip olabilir. Lütfen <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> adresi üzerinden kayıt yaparak dilinizdeki çeviri hatalarını düzeltmeye yardımcı olun ve yazılımın gelişimine katkıda bulunun.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=İstemci Saat Dilimi (kullanıcı)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/tr_TR/modulebuilder.lang b/htdocs/langs/tr_TR/modulebuilder.lang
index 56aa8f5010d..8a7a9583310 100644
--- a/htdocs/langs/tr_TR/modulebuilder.lang
+++ b/htdocs/langs/tr_TR/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Bu araç yalnızca deneyimli kullanıcılar veya geliştiriciler tarafından kullanılmalıdır. Kendi modülünüzü oluşturmak veya düzenlemek için yardımcı programlar sağlar. Alternatif <a href="%s" target="_blank"> manuel geliştirme belgeleri burada </a>.
+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.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -92,13 +92,13 @@ SearchAllDesc=Is the field used to make a search from the quick search tool? (Ex
 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=Modülünüz tarafından sunulan menüleri burada tanımlayın
-DictionariesDefDesc=Define here the dictionaries provided by your module
+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.
 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 recorded by other modules).
+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=Dolibarr geliştiricileri için araç seti
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/other.lang b/htdocs/langs/tr_TR/other.lang
index bd0c1f9aef5..5bb258a0921 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Şifre kodlama
 PermissionsAdd=İzinler eklendi
 PermissionsDelete=İzinler kaldırıldı
 YourPasswordMustHaveAtLeastXChars=Şifreniz en az <strong>%s</strong> karakter içermelidir
+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=Şifreniz başarılı bir şekilde sıfırlandı
 ApplicantIpAddress=Başvuru sahibinin IP adresi
 SMSSentTo=SMS şuna gönderildi: %s
@@ -268,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ı
diff --git a/htdocs/langs/tr_TR/partnership.lang b/htdocs/langs/tr_TR/partnership.lang
index 2b01aee4ec5..4cfdb8a5653 100644
--- a/htdocs/langs/tr_TR/partnership.lang
+++ b/htdocs/langs/tr_TR/partnership.lang
@@ -19,7 +19,7 @@
 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
@@ -51,8 +51,8 @@ PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
 PartnershipDedicatedToThisMember=Partnership dedicated to this member
 DatePartnershipStart=Başlangıç tarihi
 DatePartnershipEnd=Bitiş tarihi
-ReasonDecline=Decline reason
-ReasonDeclineOrCancel=Decline reason
+ReasonDecline=Reddetme nedeni
+ReasonDeclineOrCancel=Reddetme nedeni
 PartnershipAlreadyExist=Partnership already exist
 ManagePartnership=Manage partnership
 BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
@@ -78,9 +78,9 @@ YourPartnershipRefusedContent=We inform you that your partnership request has be
 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
+CountLastUrlCheckError=Son URL kontrolü için hataların sayısı
+LastCheckBacklink=Son URL kontrolünün tarihi
+ReasonDeclineOrCancel=Reddetme nedeni
 
 #
 # Status
diff --git a/htdocs/langs/tr_TR/printing.lang b/htdocs/langs/tr_TR/printing.lang
index c2b3fce7394..3c76f79ce4f 100644
--- a/htdocs/langs/tr_TR/printing.lang
+++ b/htdocs/langs/tr_TR/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
+Module64000Desc=Tek Tıkla Yazdırma Sistemini Etkinleştir
 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=Tek Tıkla Yazdırma işleri
+DirectPrint=Tek Tıkla Yazdırma
 PrintingDriverDesc=Yazıcı sürücüsü değişkenlerinin ayarları
 ListDrivers=Sürücü listesi
 PrintTestDesc=Yazıcı Listesi
diff --git a/htdocs/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang
index 7537f98c75a..59f0409e523 100644
--- a/htdocs/langs/tr_TR/productbatch.lang
+++ b/htdocs/langs/tr_TR/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 52f34595c25..f64d49a2c5e 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Ağırlıklı ortalama fiyat
 PMPValueShort=AOF
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index b562e99f382..c1528c0ede8 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -197,6 +197,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,3 +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=Bitiş tarihi başlama tarihinden önce olamaz
diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang
index 0ba8dd91140..a5d294ec373 100644
--- a/htdocs/langs/tr_TR/propal.lang
+++ b/htdocs/langs/tr_TR/propal.lang
@@ -44,7 +44,7 @@ ListOfProposals=Teklif listesi
 ActionsOnPropal=Teklifteki etkinlikler
 RefProposal=Teklif ref
 SendPropalByMail=Teklifi e-posta ile gönder
-DatePropal=Teklif tarihi
+DatePropal=Teklif Tarihi
 DateEndPropal=Teklif son geçerlilik tarihi
 ValidityDuration=Geçerlilik süresi
 SetAcceptedRefused=Kabul edildi/reddedildi ayarla
diff --git a/htdocs/langs/tr_TR/receiptprinter.lang b/htdocs/langs/tr_TR/receiptprinter.lang
index ba94839c094..9addf56fb2c 100644
--- a/htdocs/langs/tr_TR/receiptprinter.lang
+++ b/htdocs/langs/tr_TR/receiptprinter.lang
@@ -54,9 +54,9 @@ DOL_DOUBLE_WIDTH=Double width size
 DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
 DOL_UNDERLINE=Enable underline
 DOL_UNDERLINE_DISABLED=Disable underline
-DOL_BEEP=Beed sound
+DOL_BEEP=Beep sound
 DOL_PRINT_TEXT=Print text
-DateInvoiceWithTime=Invoice date and time
+DateInvoiceWithTime=Fatura tarihi ve saati
 YearInvoice=Invoice year
 DOL_VALUE_MONTH_LETTERS=Invoice month in letters
 DOL_VALUE_MONTH=Invoice month
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 c1cd8d2ada0..d633833926d 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
 AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
 InventoryDate=Envanter tarihi
+Inventories=Envanterler
 NewInventory=Yeni envanter
 inventorySetup = Envanter Kurulumu
 inventoryCreatePermission=Yeni envanter oluştur
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Stoksız ürün ekleme
-TheoricalQty=Teorik adet
-TheoricalValue=Teorik adet
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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=Fill real quantity with expected quantity
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Ürün mevcut değil
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=Depo Kimlik Numarası
 WarehouseRef=Depo Referansı
+SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
+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
diff --git a/htdocs/langs/tr_TR/stripe.lang b/htdocs/langs/tr_TR/stripe.lang
index faabde173b6..338511ce85b 100644
--- a/htdocs/langs/tr_TR/stripe.lang
+++ b/htdocs/langs/tr_TR/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe modülü kurulumu
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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=Kredi kartı veya Stripe ile ödeme yapın
 FollowingUrlAreAvailableToMakePayments=Aşağıdaki URL'ler bir müşteriye Dolibarr nesnelerine bir ödeme yapmak için bir sayfa sunmak için kullanılabilir
 PaymentForm=Ödeme Formu
@@ -28,7 +28,6 @@ AccountParameter=Hesap parametreleri
 UsageParameter=Kullanım parametreleri
 InformationToFindParameters=%s Hesap bilgilerinizi bulmanız için yardım
 STRIPE_CGI_URL_V2=Ödeme için Stripe CGI modülü URL'si
-VendorName=Satıcının Adı
 CSSUrlForPaymentForm=Ödeme formu için CSS stil sayfası url'si
 NewStripePaymentReceived=Yeni Stripe ödemesi alındı
 NewStripePaymentFailed=Yeni Stripe ödemesi denendi ancak başarısız oldu
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index 78a44dfe08c..c6fbe54dcde 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -97,8 +97,8 @@ LoginToCreate=Oluşturulacak kullanıcı adı
 NameToCreate=Oluşturulacak Üçüncü Parti Adı
 YourRole=Sizin rolünüz
 YourQuotaOfUsersIsReached=Aktif kullanıcı kotanıza ulaşıldı!
-NbOfUsers=Number of users
-NbOfPermissions=Number of permissions
+NbOfUsers=Kullanıcı sayısı
+NbOfPermissions=İzin sayısı
 DontDowngradeSuperAdmin=Yalnızca bir SuperAdmin, bir SuperAdmin’inin derecesini düşürebilir
 HierarchicalResponsible=Yönetici
 HierarchicView=Sıradüzeni Görünümü
@@ -112,11 +112,11 @@ DisabledInMonoUserMode=Bakım modunda devre dışıdır
 UserAccountancyCode=Kullanıcı muhasebe kodu
 UserLogoff=Kullanıcı çıkış yaptı
 UserLogged=Kullanıcı giriş yaptı
-DateOfEmployment=Employment date
-DateEmployment=Employment
+DateOfEmployment=Çalışma Tarihi
+DateEmployment=Çalışma
 DateEmploymentstart=İşe Başlama Tarihi
 DateEmploymentEnd=İşi Bırakma Tarihi
-RangeOfLoginValidity=Access validity date range
+RangeOfLoginValidity=Erişim geçerliliği tarih aralığı
 CantDisableYourself=Kendi kullanıcı kaydınızı devre dışı bırakamazsınız
 ForceUserExpenseValidator=Gider raporu doğrulayıcısını zorla
 ForceUserHolidayValidator=İzin isteği doğrulayıcısını zorla
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index 546e415e917..3dd5b4b9b3a 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Son %s otomatik ödeme dosyaları
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Otomatik ödeme talimatı satırları
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Üçüncü parti banka kodu
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Alacak olarak sınıflandır
+ClassDebited=Classify debited
 ClassCreditedConfirm=Bu para çekme makbuzunu bankanıza alacak olarak sınıflandırmak istediğinizden emin misiniz?
 TransData=Havale tarihi
 TransMetod=Havale yöntemi
@@ -80,7 +82,7 @@ StatusMotif7=Mahkeme kararıyla
 StatusMotif8=Başka bir nedenle
 CreateForSepaFRST=Otomatik ödeme dosyası oluşturun (SEPA FRST)
 CreateForSepaRCUR=Otomatik ödeme dosyası oluşturun (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateAll=Otomatik ödeme dosyası oluşturun
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Sadece ofis
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ ModeWarning=Gerçek mod için seçenek ayarlanmamış, bu simülasyondan sonra d
 ErrorCompanyHasDuplicateDefaultBAN=%s kimlik numaralı şirket birden fazla varsayılan banka hesabına sahip. Hangisini kullanacağını bilme imkanı yok.
 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
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index 80bf41a52cf..4ff8d35ff33 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index d0cf3c546b3..23782246b85 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Установа
 Version=Версія
 Publisher=Видавець
@@ -265,8 +267,8 @@ OtherResources=Інші ресурси
 ExternalResources=Додаткові ресурси
 SocialNetworks=Соціальні мережі
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=Для перегляду довідки користувача або документації розробника (Doc, FAQ...), <br> перейдіть на Dolibarr Wiki: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
-ForAnswersSeeForum=Для будь-яких інших питань/допомоги ви можете скористатися форумом Dolibarr: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
+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=Ось деякі ресурси для отримання допомоги та підтримки з Dolibarr.
 HelpCenterDesc2=Деякі з цих ресурсів доступні лише <b>англійською</b> мовою.
 CurrentMenuHandler=Поточний обробник меню
@@ -341,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 (наприклад: custom). <br>
@@ -353,6 +355,7 @@ LastStableVersion=Остання стабільна версія
 LastActivationDate=Дата останньої активації
 LastActivationAuthor=Автор останньої активації
 LastActivationIP=IP останньої активації
+LastActivationVersion=Latest activation version
 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index d54baa30ce9..a839dbc638b 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=Номер IBAN
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 7c8c5a28c5c..613b8129e81 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/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=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=Виставлений
 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/uk_UA/blockedlog.lang b/htdocs/langs/uk_UA/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/uk_UA/blockedlog.lang
+++ b/htdocs/langs/uk_UA/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/uk_UA/bookmarks.lang b/htdocs/langs/uk_UA/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/uk_UA/bookmarks.lang
+++ b/htdocs/langs/uk_UA/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index 7eaeb6c4346..7abc1832bca 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,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=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">%s</a>
+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
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index 2d88cdded64..41fab413159 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index c62940f4859..e05f9dc7a2a 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/uk_UA/eventorganization.lang b/htdocs/langs/uk_UA/eventorganization.lang
index 8fa4b94bf82..0d43ff770a7 100644
--- a/htdocs/langs/uk_UA/eventorganization.lang
+++ b/htdocs/langs/uk_UA/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/uk_UA/holiday.lang b/htdocs/langs/uk_UA/holiday.lang
index a8dca3ca09e..33b266ce272 100644
--- a/htdocs/langs/uk_UA/holiday.lang
+++ b/htdocs/langs/uk_UA/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/uk_UA/install.lang b/htdocs/langs/uk_UA/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/uk_UA/install.lang
+++ b/htdocs/langs/uk_UA/install.lang
@@ -21,6 +21,7 @@ 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.
diff --git a/htdocs/langs/uk_UA/knowledgemanagement.lang b/htdocs/langs/uk_UA/knowledgemanagement.lang
index 6ccdee13b2f..e838c2d1c83 100644
--- a/htdocs/langs/uk_UA/knowledgemanagement.lang
+++ b/htdocs/langs/uk_UA/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/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index c639dd8a1db..ba1fc97659e 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ User=User
 Users=Users
 Group=Group
 Groups=Groups
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Пароль
 PasswordRetype=Retype your password
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Клієнтський часовий пояс (користувач)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/uk_UA/modulebuilder.lang b/htdocs/langs/uk_UA/modulebuilder.lang
index 4f62d2da120..a7824146cde 100644
--- a/htdocs/langs/uk_UA/modulebuilder.lang
+++ b/htdocs/langs/uk_UA/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
diff --git a/htdocs/langs/uk_UA/mrp.lang b/htdocs/langs/uk_UA/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/uk_UA/mrp.lang
+++ b/htdocs/langs/uk_UA/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/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index 3bbdc1488f5..8353ab79931 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/uk_UA/partnership.lang b/htdocs/langs/uk_UA/partnership.lang
index 9d166ba92d7..6c30d4aed7b 100644
--- a/htdocs/langs/uk_UA/partnership.lang
+++ b/htdocs/langs/uk_UA/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang
index aa0e8a85a81..d6f38736aae 100644
--- a/htdocs/langs/uk_UA/productbatch.lang
+++ b/htdocs/langs/uk_UA/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index 4a2c7797ba6..500157307e1 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 71993ebb094..9965dbf4c88 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/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,3 +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/uk_UA/receptions.lang b/htdocs/langs/uk_UA/receptions.lang
index 5f90a854e5f..40d87c6e986 100644
--- a/htdocs/langs/uk_UA/receptions.lang
+++ b/htdocs/langs/uk_UA/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=Проект
-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=Оброблений
 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/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index 72b35cd5dec..0b878cef31c 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=Розпочатий
+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
diff --git a/htdocs/langs/uk_UA/stripe.lang b/htdocs/langs/uk_UA/stripe.lang
index 844762040af..2c95bcfce27 100644
--- a/htdocs/langs/uk_UA/stripe.lang
+++ b/htdocs/langs/uk_UA/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
index 95a52f15a41..1af2f477108 100644
--- a/htdocs/langs/uk_UA/withdrawals.lang
+++ b/htdocs/langs/uk_UA/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/ur_PK/accountancy.lang b/htdocs/langs/ur_PK/accountancy.lang
new file mode 100644
index 00000000000..b3b1b7daf08
--- /dev/null
+++ b/htdocs/langs/ur_PK/accountancy.lang
@@ -0,0 +1,437 @@
+# Dolibarr language file - en_US - Accountancy (Double entries)
+Accountancy=اکاؤنٹنسی
+Accounting=حساب کتاب
+ACCOUNTING_EXPORT_SEPARATORCSV=برآمد فائل کے لیے کالم الگ کرنے والا
+ACCOUNTING_EXPORT_DATE=برآمد فائل کے لیے تاریخ کی شکل
+ACCOUNTING_EXPORT_PIECE=ٹکڑے کی تعداد برآمد کریں۔
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=عالمی اکاؤنٹ کے ساتھ برآمد کریں۔
+ACCOUNTING_EXPORT_LABEL=ایکسپورٹ لیبل
+ACCOUNTING_EXPORT_AMOUNT=برآمد کی رقم
+ACCOUNTING_EXPORT_DEVISE=کرنسی برآمد کریں۔
+Selectformat=فائل کے لیے فارمیٹ منتخب کریں۔
+ACCOUNTING_EXPORT_FORMAT=فائل کے لیے فارمیٹ منتخب کریں۔
+ACCOUNTING_EXPORT_ENDLINE=گاڑی کی واپسی کی قسم منتخب کریں۔
+ACCOUNTING_EXPORT_PREFIX_SPEC=فائل کے نام کے لیے سابقہ کی وضاحت کریں۔
+ThisService=یہ سروس
+ThisProduct=یہ مصنوعات
+DefaultForService=سروس کے لیے ڈیفالٹ
+DefaultForProduct=پروڈکٹ کے لیے ڈیفالٹ
+ProductForThisThirdparty=اس تھرڈ پارٹی کے لیے پروڈکٹ
+ServiceForThisThirdparty=اس تھرڈ پارٹی کے لیے سروس
+CantSuggest=تجویز نہیں کر سکتے
+AccountancySetupDoneFromAccountancyMenu=اکاؤنٹنسی کا زیادہ تر سیٹ اپ مینو %s سے کیا جاتا ہے
+ConfigAccountingExpert=ماڈیول اکاؤنٹنگ کی ترتیب (ڈبل اندراج)
+Journalization=جرنلائزیشن
+Journals=روزنامچے
+JournalFinancial=مالیاتی جریدے
+BackToChartofaccounts=کھاتوں کا ریٹرن چارٹ
+Chartofaccounts=کھاتوں کا چارٹ
+ChartOfSubaccounts=انفرادی کھاتوں کا چارٹ
+ChartOfIndividualAccountsOfSubsidiaryLedger=ذیلی لیجر کے انفرادی کھاتوں کا چارٹ
+CurrentDedicatedAccountingAccount=موجودہ وقف اکاؤنٹ
+AssignDedicatedAccountingAccount=تفویض کرنے کے لیے نیا اکاؤنٹ
+InvoiceLabel=انوائس لیبل
+OverviewOfAmountOfLinesNotBound=لائنوں کی مقدار کا جائزہ اکاؤنٹنگ اکاؤنٹ کے پابند نہیں ہے۔
+OverviewOfAmountOfLinesBound=اکاؤنٹنگ اکاؤنٹ میں پہلے سے ہی پابند لائنوں کی مقدار کا جائزہ
+OtherInfo=دوسری معلومات
+DeleteCptCategory=اکاؤنٹنگ اکاؤنٹ کو گروپ سے ہٹا دیں۔
+ConfirmDeleteCptCategory=کیا آپ واقعی اس اکاؤنٹنگ اکاؤنٹ کو اکاؤنٹنگ اکاؤنٹنگ گروپ سے ہٹانا چاہتے ہیں؟
+JournalizationInLedgerStatus=جرنلائزیشن کی حیثیت
+AlreadyInGeneralLedger=پہلے ہی اکاؤنٹنگ جرنلز اور لیجر میں منتقل کر دیا گیا ہے۔
+NotYetInGeneralLedger=ابھی تک اکاؤٹنگ جرنلز اور لیجر میں منتقل نہیں کیا گیا ہے۔
+GroupIsEmptyCheckSetup=گروپ خالی ہے، ذاتی اکاؤنٹنگ گروپ کا سیٹ اپ چیک کریں۔
+DetailByAccount=اکاؤنٹ کے حساب سے تفصیل دکھائیں۔
+AccountWithNonZeroValues=غیر صفر اقدار والے اکاؤنٹس
+ListOfAccounts=اکاؤنٹس کی فہرست
+CountriesInEEC=ای ای سی میں ممالک
+CountriesNotInEEC=وہ ممالک جو EEC میں نہیں ہیں۔
+CountriesInEECExceptMe=ای ای سی میں شامل ممالک سوائے %s کے
+CountriesExceptMe=%s کے علاوہ تمام ممالک
+AccountantFiles=ماخذ کی دستاویزات برآمد کریں۔
+ExportAccountingSourceDocHelp=اس ٹول کے ساتھ، آپ ان سورس ایونٹس کو ایکسپورٹ کر سکتے ہیں (CSV اور PDFs میں فہرست) جو آپ کی اکاؤنٹنسی بنانے کے لیے استعمال ہوتے ہیں۔
+ExportAccountingSourceDocHelp2=اپنے جریدے برآمد کرنے کے لیے، مینو اندراج %s - %s استعمال کریں۔
+VueByAccountAccounting=حساب کتاب کے حساب سے دیکھیں
+VueBySubAccountAccounting=اکاؤنٹنگ ذیلی اکاؤنٹ کے ذریعہ دیکھیں
+
+MainAccountForCustomersNotDefined=صارفین کے لیے مین اکاؤنٹنگ اکاؤنٹ سیٹ اپ میں بیان نہیں کیا گیا ہے۔
+MainAccountForSuppliersNotDefined=وینڈرز کے لیے مین اکاؤنٹنگ اکاؤنٹ سیٹ اپ میں بیان نہیں کیا گیا ہے۔
+MainAccountForUsersNotDefined=صارفین کے لیے مرکزی اکاؤنٹنگ اکاؤنٹ سیٹ اپ میں بیان نہیں کیا گیا ہے۔
+MainAccountForVatPaymentNotDefined=VAT ادائیگی کے لیے مرکزی اکاؤنٹنگ اکاؤنٹ سیٹ اپ میں بیان نہیں کیا گیا ہے۔
+MainAccountForSubscriptionPaymentNotDefined=رکنیت کی ادائیگی کے لیے مرکزی اکاؤنٹنگ اکاؤنٹ سیٹ اپ میں بیان نہیں کیا گیا ہے۔
+
+AccountancyArea=اکاؤنٹنگ ایریا
+AccountancyAreaDescIntro=اکاؤنٹنسی ماڈیول کا استعمال کئی مراحل میں کیا جاتا ہے:
+AccountancyAreaDescActionOnce=درج ذیل اعمال عام طور پر صرف ایک بار، یا سال میں ایک بار کیے جاتے ہیں...
+AccountancyAreaDescActionOnceBis=جرنلائزیشن کرتے وقت آپ کو صحیح ڈیفالٹ اکاؤنٹنگ اکاؤنٹ تجویز کرکے مستقبل میں آپ کا وقت بچانے کے لیے اگلے اقدامات کیے جائیں (جرائد اور جنرل لیجر میں ریکارڈ لکھنا)
+AccountancyAreaDescActionFreq=درج ذیل کارروائیاں عام طور پر بہت بڑی کمپنیوں کے لیے ہر مہینے، ہفتے یا دن کی جاتی ہیں...
+
+AccountancyAreaDescJournalSetup=STEP %s: مینو %s سے اپنے جریدے کی فہرست کا مواد بنائیں یا چیک کریں۔
+AccountancyAreaDescChartModel=STEP %s: چیک کریں کہ اکاؤنٹ کے چارٹ کا ماڈل موجود ہے یا مینو سے ایک بنائیں %s
+AccountancyAreaDescChart=STEP %s: منتخب کریں اور|یا اپنے اکاؤنٹ کا چارٹ مینو %s سے مکمل کریں
+
+AccountancyAreaDescVat=STEP %s: ہر VAT کی شرح کے لیے اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescDefault=STEP %s: پہلے سے طے شدہ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescExpenseReport=STEP %s: ہر قسم کے اخراجات کی رپورٹ کے لیے ڈیفالٹ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescSal=STEP %s: تنخواہوں کی ادائیگی کے لیے پہلے سے طے شدہ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescContrib=STEP %s: خصوصی اخراجات (متفرق ٹیکس) کے لیے پہلے سے طے شدہ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %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 استعمال کریں۔
+
+AccountancyAreaDescBind=STEP %s: موجودہ %s لائنوں کے درمیان بائنڈنگ کو چیک کریں اور اکاؤنٹنگ اکاؤنٹ مکمل ہو گیا ہے، لہذا ایپلیکیشن ایک کلک میں لیجر میں لین دین کو جرنلائز کر سکے گی۔ مکمل گمشدہ پابندیاں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescWriteRecords=STEP %s: لیجر میں لین دین لکھیں۔ اس کے لیے، مینو میں جائیں <strong> %s </strong>، اور بٹن پر کلک کریں <strong> %s a0a65d07z.
+AccountancyAreaDescAnalyze=STEP %s: موجودہ لین دین کو شامل کریں یا ان میں ترمیم کریں اور رپورٹیں اور برآمدات بنائیں۔
+
+AccountancyAreaDescClosePeriod=STEP %s: مدت بند کریں تاکہ ہم مستقبل میں ترمیم نہ کر سکیں۔
+
+TheJournalCodeIsNotDefinedOnSomeBankAccount=سیٹ اپ میں ایک لازمی مرحلہ مکمل نہیں ہوا ہے (اکاؤنٹنگ کوڈ جرنل تمام بینک اکاؤنٹس کے لیے متعین نہیں ہے)
+Selectchartofaccounts=اکاؤنٹس کا فعال چارٹ منتخب کریں۔
+ChangeAndLoad=تبدیل کریں اور لوڈ کریں۔
+Addanaccount=اکاؤنٹنگ اکاؤنٹ شامل کریں۔
+AccountAccounting=حساب کتاب
+AccountAccountingShort=کھاتہ
+SubledgerAccount=سبلیجر اکاؤنٹ
+SubledgerAccountLabel=سبلیجر اکاؤنٹ کا لیبل
+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=باندھنا
+LineId=آئی ڈی لائن
+Processing=پروسیسنگ
+EndProcessing=عمل ختم ہو گیا۔
+SelectedLines=منتخب لائنیں
+Lineofinvoice=انوائس کی لائن
+LineOfExpenseReport=اخراجات کی رپورٹ کی لائن
+NoAccountSelected=کوئی اکاؤنٹنگ اکاؤنٹ منتخب نہیں کیا گیا۔
+VentilatedinAccount=اکاؤنٹنگ اکاؤنٹ میں کامیابی کے ساتھ پابند ہو گیا۔
+NotVentilatedinAccount=حساب کتاب کا پابند نہیں۔
+XLineSuccessfullyBinded=%s مصنوعات/خدمات کامیابی کے ساتھ اکاؤنٹنگ اکاؤنٹ سے منسلک
+XLineFailedToBeBinded=%s مصنوعات/خدمات کسی بھی اکاؤنٹنگ اکاؤنٹ کے پابند نہیں تھے
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=فہرست اور پابند صفحہ پر لائنوں کی زیادہ سے زیادہ تعداد (تجویز کردہ: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=تازہ ترین عناصر کے ذریعے صفحہ "بائنڈنگ ٹو ڈو" کی چھانٹی شروع کریں۔
+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=اکاؤنٹنگ اکاؤنٹ کے آخر میں زیرو کی مختلف تعداد کا نظم کرنے کی اجازت دیں۔ کچھ ممالک (جیسے سوئٹزرلینڈ) کی ضرورت ہے۔ اگر آف (پہلے سے طے شدہ) پر سیٹ ہے، تو آپ ایپلیکیشن کو ورچوئل زیرو شامل کرنے کے لیے کہنے کے لیے درج ذیل دو پیرامیٹرز سیٹ کر سکتے ہیں۔
+BANK_DISABLE_DIRECT_INPUT=بینک اکاؤنٹ میں لین دین کی براہ راست ریکارڈنگ کو غیر فعال کریں۔
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=جرنل پر ڈرافٹ ایکسپورٹ کو فعال کریں۔
+ACCOUNTANCY_COMBO_FOR_AUX=ذیلی اکاؤنٹ کے لیے کومبو لسٹ کو فعال کریں (اگر آپ کے پاس بہت سارے فریق ثالث ہیں تو سست ہو سکتے ہیں، قدر کے کسی حصے پر تلاش کرنے کی صلاحیت کو توڑ دیں)
+ACCOUNTING_DATE_START_BINDING=اکاؤنٹنسی میں بائنڈنگ اور ٹرانسفر شروع کرنے کے لیے تاریخ کی وضاحت کریں۔ اس تاریخ کے نیچے، لین دین کو اکاؤنٹنگ میں منتقل نہیں کیا جائے گا۔
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=اکاؤنٹنسی ٹرانسفر پر، ڈیفالٹ کے مطابق مدت شو کو منتخب کریں۔
+
+ACCOUNTING_SELL_JOURNAL=جریدہ فروخت کریں۔
+ACCOUNTING_PURCHASE_JOURNAL=جریدہ خریدیں۔
+ACCOUNTING_MISCELLANEOUS_JOURNAL=متفرق جریدہ
+ACCOUNTING_EXPENSEREPORT_JOURNAL=اخراجات کی رپورٹ جرنل
+ACCOUNTING_SOCIAL_JOURNAL=سماجی جریدہ
+ACCOUNTING_HAS_NEW_JOURNAL=نیا جریدہ ہے۔
+
+ACCOUNTING_RESULT_PROFIT=نتیجہ اکاؤنٹنگ اکاؤنٹ (منافع)
+ACCOUNTING_RESULT_LOSS=نتیجہ اکاؤنٹنگ اکاؤنٹ (نقصان)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=بندش کا جریدہ
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=عبوری بینک ٹرانسفر کا اکاؤنٹنگ اکاؤنٹ
+TransitionalAccount=عبوری بینک ٹرانسفر اکاؤنٹ
+
+ACCOUNTING_ACCOUNT_SUSPENSE=انتظار کا حساب کتاب
+DONATION_ACCOUNTINGACCOUNT=عطیات کو رجسٹر کرنے کے لیے اکاؤنٹنگ اکاؤنٹ
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=سبسکرپشنز کو رجسٹر کرنے کے لیے اکاؤنٹنگ اکاؤنٹ
+
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=کسٹمر ڈپازٹ کو رجسٹر کرنے کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ
+
+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 سے فروخت اور برآمد کی جانے والی خدمات کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر سروس شیٹ میں وضاحت نہ کی گئی ہو تو استعمال کیا جاتا ہے)
+
+Doctype=دستاویز کی قسم
+Docdate=تاریخ
+Docref=حوالہ
+LabelAccount=لیبل اکاؤنٹ
+LabelOperation=لیبل آپریشن
+Sens=سمت
+AccountingDirectionHelp=کسی صارف کے اکاؤنٹنگ اکاؤنٹ کے لیے، آپ کو موصول ہونے والی ادائیگی کو ریکارڈ کرنے کے لیے کریڈٹ کا استعمال کریں
+LetteringCode=لیٹرنگ کوڈ
+Lettering=حروف تہجی
+Codejournal=جرنل
+JournalLabel=جرنل لیبل
+NumPiece=ٹکڑا نمبر
+TransactionNumShort=نمبر لین دین
+AccountingCategory=حسب ضرورت گروپ
+GroupByAccountAccounting=عام لیجر اکاؤنٹ کے لحاظ سے گروپ کریں۔
+GroupBySubAccountAccounting=سبلیجر اکاؤنٹ کے لحاظ سے گروپ کریں۔
+AccountingAccountGroupsDesc=آپ یہاں اکاؤنٹنگ اکاؤنٹ کے کچھ گروپس کی وضاحت کر سکتے ہیں۔ وہ ذاتی اکاؤنٹنگ رپورٹس کے لیے استعمال کیے جائیں گے۔
+ByAccounts=حسابات سے
+ByPredefinedAccountGroups=پہلے سے طے شدہ گروپوں کے ذریعے
+ByPersonalizedAccountGroups=ذاتی نوعیت کے گروپوں کے ذریعے
+ByYear=سال کے حساب سے
+NotMatch=سیٹ نہیں ہے
+DeleteMvt=اکاؤنٹنگ سے کچھ آپریشن لائنوں کو حذف کریں۔
+DelMonth=حذف کرنے کا مہینہ
+DelYear=حذف کرنے کا سال
+DelJournal=حذف کرنے کے لیے جرنل
+ConfirmDeleteMvt=یہ سال/ماہ اور/یا کسی مخصوص جریدے کے لیے اکاؤنٹنگ کی تمام آپریشن لائنوں کو حذف کر دے گا (کم از کم ایک معیار درکار ہے)۔ حذف شدہ ریکارڈ کو لیجر میں واپس لانے کے لیے آپ کو '%s' فیچر کو دوبارہ استعمال کرنا ہوگا۔
+ConfirmDeleteMvtPartial=یہ اکاؤنٹنگ سے لین دین کو حذف کر دے گا (اسی لین دین سے متعلق تمام آپریشن لائنوں کو حذف کر دیا جائے گا)
+FinanceJournal=فنانس جرنل
+ExpenseReportsJournal=اخراجات کی رپورٹ کا جریدہ
+DescFinanceJournal=فنانس جرنل بشمول بینک اکاؤنٹ کے ذریعے ادائیگیوں کی تمام اقسام
+DescJournalOnlyBindedVisible=یہ ریکارڈ کا ایک منظر ہے جو اکاؤنٹنگ اکاؤنٹ کے پابند ہیں اور اسے جرنلز اور لیجر میں ریکارڈ کیا جا سکتا ہے۔
+VATAccountNotDefined=VAT کے لیے اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+ThirdpartyAccountNotDefined=تیسرے فریق کے اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+ProductAccountNotDefined=پروڈکٹ کے اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+FeeAccountNotDefined=فیس کے اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+BankAccountNotDefined=بینک کے لیے اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+CustomerInvoicePayment=انوائس کسٹمر کی ادائیگی
+ThirdPartyAccount=تھرڈ پارٹی اکاؤنٹ
+NewAccountingMvt=نیا لین دین
+NumMvts=لین دین کی تعداد
+ListeMvts=تحریکوں کی فہرست
+ErrorDebitCredit=ڈیبٹ اور کریڈٹ کی ایک ہی وقت میں قدر نہیں ہو سکتی
+AddCompteFromBK=گروپ میں اکاؤنٹنگ اکاؤنٹس شامل کریں۔
+ReportThirdParty=تیسرے فریق کے اکاؤنٹ کی فہرست بنائیں
+DescThirdPartyReport=یہاں تیسرے فریق کے صارفین اور دکانداروں کی فہرست اور ان کے اکاؤنٹنگ اکاؤنٹس سے مشورہ کریں۔
+ListAccounts=اکاؤنٹنگ اکاؤنٹس کی فہرست
+UnknownAccountForThirdparty=نامعلوم تھرڈ پارٹی اکاؤنٹ۔ ہم %s استعمال کریں گے۔
+UnknownAccountForThirdpartyBlocking=نامعلوم تھرڈ پارٹی اکاؤنٹ۔ مسدود کرنے کی خرابی۔
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger اکاؤنٹ کی وضاحت نہیں کی گئی ہے یا فریق ثالث یا صارف نامعلوم ہے۔ ہم %s استعمال کریں گے۔
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=فریق ثالث نامعلوم اور ادائیگی پر متعین نہیں ہے۔ ہم ذیلی اکاؤنٹ کی قیمت کو خالی رکھیں گے۔
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger اکاؤنٹ کی وضاحت نہیں کی گئی ہے یا فریق ثالث یا صارف نامعلوم ہے۔ مسدود کرنے کی خرابی۔
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=نامعلوم تھرڈ پارٹی اکاؤنٹ اور ویٹنگ اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔ مسدود کرنے کی خرابی۔
+PaymentsNotLinkedToProduct=ادائیگی کسی پروڈکٹ/سروس سے منسلک نہیں ہے۔
+OpeningBalance=اوپننگ بیلنس
+ShowOpeningBalance=اوپننگ بیلنس دکھائیں۔
+HideOpeningBalance=اوپننگ بیلنس چھپائیں۔
+ShowSubtotalByGroup=سطح کے لحاظ سے ذیلی کل دکھائیں۔
+
+Pcgtype=اکاؤنٹ کا گروپ
+PcgtypeDesc=اکاؤنٹ کے گروپ کو کچھ اکاؤنٹنگ رپورٹس کے لیے پہلے سے طے شدہ 'فلٹر' اور 'گروپنگ' کے معیار کے طور پر استعمال کیا جاتا ہے۔ مثال کے طور پر، 'انکم' یا 'خرچ' کو اخراجات/آمدنی کی رپورٹ بنانے کے لیے مصنوعات کے اکاؤنٹنگ اکاؤنٹس کے لیے بطور گروپ استعمال کیا جاتا ہے۔
+
+Reconcilable=قابلِ مصالحت
+
+TotalVente=ٹیکس سے پہلے کل کاروبار
+TotalMarge=فروخت کا کل مارجن
+
+DescVentilCustomer=پروڈکٹ اکاؤنٹنگ اکاؤنٹ سے منسلک (یا نہیں) کسٹمر انوائس لائنوں کی فہرست یہاں دیکھیں
+DescVentilMore=زیادہ تر معاملات میں، اگر آپ پہلے سے طے شدہ مصنوعات یا خدمات استعمال کرتے ہیں اور آپ پروڈکٹ/سروس کارڈ پر اکاؤنٹ نمبر سیٹ کرتے ہیں، تو ایپلیکیشن آپ کے انوائس لائنوں اور آپ کے اکاؤنٹس کے چارٹ کے اکاؤنٹنگ اکاؤنٹ کے درمیان تمام پابندیاں لگانے کے قابل ہو جائے گی۔ بٹن کے ساتھ ایک کلک <strong> "%s" </strong> ۔ اگر اکاؤنٹ کو پروڈکٹ/سروس کارڈز پر سیٹ نہیں کیا گیا تھا یا اگر آپ کے پاس اب بھی کچھ لائنیں ہیں جو اکاؤنٹ سے منسلک نہیں ہیں، تو آپ کو مینو "<strong> %s </strong>" مینو سے دستی بائنڈنگ کرنا ہوگی۔
+DescVentilDoneCustomer=یہاں انوائس کے صارفین کی لائنوں کی فہرست اور ان کے پروڈکٹ اکاؤنٹنگ اکاؤنٹ سے مشورہ کریں۔
+DescVentilTodoCustomer=انوائس لائنوں کو باندھیں جو پہلے سے پروڈکٹ اکاؤنٹنگ اکاؤنٹ کے ساتھ پابند نہیں ہیں۔
+ChangeAccount=درج ذیل اکاؤنٹنگ اکاؤنٹ کے ساتھ منتخب لائنوں کے لیے پروڈکٹ/سروس اکاؤنٹنگ اکاؤنٹ تبدیل کریں:
+Vide=-
+DescVentilSupplier=یہاں وینڈر انوائس لائنوں کی فہرست سے مشورہ کریں جو کسی پروڈکٹ اکاؤنٹنگ اکاؤنٹ سے منسلک ہیں یا ابھی تک پابند نہیں ہیں (صرف اکاؤنٹنسی میں پہلے سے منتقل نہیں کیا گیا ریکارڈ نظر آتا ہے)
+DescVentilDoneSupplier=یہاں وینڈر انوائس کی لائنوں کی فہرست اور ان کے اکاؤنٹنگ اکاؤنٹ سے مشورہ کریں۔
+DescVentilTodoExpenseReport=اخراجات کی رپورٹ لائنوں کو باندھیں جو فیس اکاؤنٹنگ اکاؤنٹ کے ساتھ پہلے سے پابند نہیں ہیں۔
+DescVentilExpenseReport=فیس اکاؤنٹنگ اکاؤنٹ سے منسلک (یا نہیں) اخراجات کی رپورٹ لائنوں کی فہرست یہاں دیکھیں
+DescVentilExpenseReportMore=اگر آپ اکاؤنٹنگ اکاؤنٹ کو اخراجات کی رپورٹ لائنوں کی قسم پر ترتیب دیتے ہیں، تو ایپلیکیشن آپ کے اخراجات کی رپورٹ لائنوں اور آپ کے اکاؤنٹس کے چارٹ کے اکاؤنٹنگ اکاؤنٹ کے درمیان تمام پابندیاں کرنے کے قابل ہو جائے گی، بٹن <strong> "%s" a0a65d0919 کے ساتھ صرف ایک کلک میں۔ اگر اکاؤنٹ فیس لغت پر سیٹ نہیں کیا گیا تھا یا اگر آپ کے پاس اب بھی کچھ لائنیں ہیں جو کسی اکاؤنٹ سے منسلک نہیں ہیں، تو آپ کو مینو "<strong> %s </strong>" مینو سے دستی بائنڈنگ کرنا ہوگی۔
+DescVentilDoneExpenseReport=یہاں اخراجات کی رپورٹوں کی فہرست اور ان کے فیس اکاؤنٹنگ اکاؤنٹ سے مشورہ کریں۔
+
+Closure=سالانہ بندش
+DescClosure=یہاں ماہ کے لحاظ سے نقل و حرکت کی تعداد سے مشورہ کریں جن کی توثیق نہیں ہوئی اور مالی سال پہلے ہی کھلے ہیں۔
+OverviewOfMovementsNotValidated=مرحلہ 1/ نقل و حرکت کا جائزہ درست نہیں ہے۔ (مالی سال بند کرنا ضروری ہے)
+AllMovementsWereRecordedAsValidated=تمام نقل و حرکت کو توثیق کے طور پر ریکارڈ کیا گیا تھا۔
+NotAllMovementsCouldBeRecordedAsValidated=تمام حرکات کو توثیق کے طور پر ریکارڈ نہیں کیا جا سکتا
+ValidateMovements=نقل و حرکت کی توثیق کریں۔
+DescValidateMovements=تحریر، حروف اور حذف میں کسی قسم کی ترمیم یا حذف ممنوع ہو گا۔ مشق کے لیے تمام اندراجات کی توثیق ہونی چاہیے ورنہ بند کرنا ممکن نہیں ہوگا۔
+
+ValidateHistory=خودکار طور پر باندھیں۔
+AutomaticBindingDone=خودکار بائنڈنگ ہو گئی (%s) - کچھ ریکارڈ کے لیے خودکار بائنڈنگ ممکن نہیں ہے (%s)
+
+ErrorAccountancyCodeIsAlreadyUse=خرابی، آپ اس اکاؤنٹنگ اکاؤنٹ کو حذف نہیں کر سکتے کیونکہ یہ استعمال کیا گیا ہے۔
+MvtNotCorrectlyBalanced=نقل و حرکت درست طریقے سے متوازن نہیں ہے۔ ڈیبٹ = %s | کریڈٹ = %s
+Balancing=توازن
+FicheVentilation=بائنڈنگ کارڈ
+GeneralLedgerIsWritten=لین دین لیجر میں لکھا جاتا ہے۔
+GeneralLedgerSomeRecordWasNotRecorded=کچھ لین دین کو جرنلائز نہیں کیا جا سکا۔ اگر کوئی اور غلطی کا پیغام نہیں ہے، تو شاید اس کی وجہ یہ ہے کہ وہ پہلے ہی جرنلائز ہو چکے تھے۔
+NoNewRecordSaved=جرنلائز کرنے کے لیے مزید کوئی ریکارڈ نہیں۔
+ListOfProductsWithoutAccountingAccount=پروڈکٹس کی فہرست کسی اکاؤنٹنگ اکاؤنٹ کے پابند نہیں ہے۔
+ChangeBinding=بائنڈنگ کو تبدیل کریں۔
+Accounted=لیجر میں حساب
+NotYetAccounted=ابھی تک اکاؤنٹنگ میں منتقل نہیں ہوا ہے۔
+ShowTutorial=ٹیوٹوریل دکھائیں۔
+NotReconciled=صلح نہیں ہوئی۔
+WarningRecordWithoutSubledgerAreExcluded=انتباہ، سبلیجر اکاؤنٹ کے بغیر تمام آپریشنز کو فلٹر کیا گیا ہے اور اس منظر سے خارج کر دیا گیا ہے۔
+
+## Admin
+BindingOptions=بائنڈنگ کے اختیارات
+ApplyMassCategories=بڑے پیمانے پر زمرہ جات کا اطلاق کریں۔
+AddAccountFromBookKeepingWithNoCategories=دستیاب اکاؤنٹ ابھی تک ذاتی نوعیت کے گروپ میں نہیں ہے۔
+CategoryDeleted=اکاؤنٹنگ اکاؤنٹ کے زمرے کو ہٹا دیا گیا ہے۔
+AccountingJournals=اکاؤنٹنگ جرائد
+AccountingJournal=اکاؤنٹنگ جرنل
+NewAccountingJournal=نیا اکاؤنٹنگ جریدہ
+ShowAccountingJournal=اکاؤنٹنگ جرنل دکھائیں۔
+NatureOfJournal=جرنل کی نوعیت
+AccountingJournalType1=متفرق آپریشنز
+AccountingJournalType2=سیلز
+AccountingJournalType3=خریداری
+AccountingJournalType4=بینک
+AccountingJournalType5=اخراجات کی رپورٹ
+AccountingJournalType8=انوینٹری
+AccountingJournalType9=نیا ہے۔
+ErrorAccountingJournalIsAlreadyUse=یہ جریدہ پہلے ہی استعمال میں ہے۔
+AccountingAccountForSalesTaxAreDefinedInto=نوٹ: سیلز ٹیکس کے اکاؤنٹنگ اکاؤنٹ کی وضاحت مینو میں <b> %s </b> - <b> %s a097fz0 a09784a میں کی گئی ہے۔
+NumberOfAccountancyEntries=اندراجات کی تعداد
+NumberOfAccountancyMovements=نقل و حرکت کی تعداد
+ACCOUNTING_DISABLE_BINDING_ON_SALES=سیلز پر اکاؤنٹنسی میں بائنڈنگ اور ٹرانسفر کو غیر فعال کریں (کسٹمر انوائس کو اکاؤنٹنگ میں مدنظر نہیں رکھا جائے گا)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=خریداری پر اکاؤنٹنسی میں بائنڈنگ اور ٹرانسفر کو غیر فعال کریں (وینڈر انوائس کو اکاؤنٹنگ میں مدنظر نہیں رکھا جائے گا)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=اخراجات کی رپورٹوں پر اکاؤنٹنسی میں بائنڈنگ اور ٹرانسفر کو غیر فعال کریں (اکاؤنٹنگ میں اخراجات کی رپورٹوں کو مدنظر نہیں رکھا جائے گا)
+
+## Export
+NotifiedExportDate=برآمد شدہ لائنوں کو ایکسپورٹ کے طور پر جھنڈا لگائیں (لائنوں میں ترمیم ممکن نہیں ہوگی)
+NotifiedValidationDate=برآمد شدہ اندراجات کی توثیق کریں (لائنوں میں ترمیم یا حذف کرنا ممکن نہیں ہوگا)
+ConfirmExportFile=اکاؤنٹنگ برآمد فائل کی نسل کی تصدیق؟
+ExportDraftJournal=ڈرافٹ جرنل برآمد کریں۔
+Modelcsv=ایکسپورٹ کا ماڈل
+Selectmodelcsv=برآمد کا ایک ماڈل منتخب کریں۔
+Modelcsv_normal=کلاسیکی برآمد
+Modelcsv_CEGID=CEGID ماہر 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=ایف ای سی برآمد کریں۔
+Modelcsv_FEC2=ایف ای سی برآمد کریں (تاریخ جنریشن تحریر/دستاویز الٹ کے ساتھ)
+Modelcsv_Sage50_Swiss=سیج 50 سوئٹزرلینڈ کے لیے برآمد کریں۔
+Modelcsv_winfic=Winfic - eWinfic - WinSis Compta کے لیے برآمد کریں۔
+Modelcsv_Gestinumv3=Gestinum کے لیے برآمد کریں (v3)
+Modelcsv_Gestinumv5=Gestinum کے لیے برآمد کریں (v5)
+Modelcsv_charlemagne=Aplim Charlemagne کے لیے برآمد کریں۔
+ChartofaccountsId=اکاؤنٹس کی شناخت کا چارٹ
+
+## Tools - Init accounting account on product / service
+InitAccountancy=اکاؤنٹنسی شروع کریں۔
+InitAccountancyDesc=اس صفحہ کو ان مصنوعات اور خدمات پر اکاؤنٹنگ اکاؤنٹ شروع کرنے کے لیے استعمال کیا جا سکتا ہے جن میں سیلز اور خریداریوں کے لیے اکاؤنٹنگ اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+DefaultBindingDesc=اس صفحہ کو پہلے سے طے شدہ اکاؤنٹ سیٹ کرنے کے لیے استعمال کیا جا سکتا ہے تاکہ ادائیگی کی تنخواہوں، عطیہ، ٹیکسوں اور وٹ کے بارے میں لین دین کے ریکارڈ کو جوڑنے کے لیے استعمال کیا جا سکے جب کوئی مخصوص اکاؤنٹنگ اکاؤنٹ پہلے سے سیٹ نہ ہو۔
+DefaultClosureDesc=یہ صفحہ اکاؤنٹنگ بند کرنے کے لیے استعمال ہونے والے پیرامیٹرز کو سیٹ کرنے کے لیے استعمال کیا جا سکتا ہے۔
+Options=اختیارات
+OptionModeProductSell=موڈ سیلز
+OptionModeProductSellIntra=موڈ سیلز EEC میں برآمد کیا گیا۔
+OptionModeProductSellExport=موڈ کی فروخت دوسرے ممالک میں برآمد کی جاتی ہے۔
+OptionModeProductBuy=موڈ خریداری
+OptionModeProductBuyIntra=EEC میں درآمد شدہ موڈ خریداری
+OptionModeProductBuyExport=موڈ دوسرے ممالک سے درآمد شدہ خریدا
+OptionModeProductSellDesc=فروخت کے لیے اکاؤنٹنگ اکاؤنٹ کے ساتھ تمام مصنوعات دکھائیں۔
+OptionModeProductSellIntraDesc=ای ای سی میں فروخت کے لیے اکاؤنٹنگ اکاؤنٹ والی تمام مصنوعات دکھائیں۔
+OptionModeProductSellExportDesc=دیگر غیر ملکی فروخت کے لیے اکاؤنٹنگ اکاؤنٹ کے ساتھ تمام مصنوعات دکھائیں۔
+OptionModeProductBuyDesc=خریداری کے لیے اکاؤنٹنگ اکاؤنٹ کے ساتھ تمام پروڈکٹس دکھائیں۔
+OptionModeProductBuyIntraDesc=EEC میں خریداریوں کے لیے اکاؤنٹنگ اکاؤنٹ والے تمام پروڈکٹس دکھائیں۔
+OptionModeProductBuyExportDesc=دیگر غیر ملکی خریداریوں کے لیے اکاؤنٹنگ اکاؤنٹ کے ساتھ تمام پروڈکٹس دکھائیں۔
+CleanFixHistory=اکاؤنٹنگ کوڈ کو ان لائنوں سے ہٹا دیں جو اکاؤنٹ کے چارٹ میں موجود نہیں ہیں۔
+CleanHistory=منتخب سال کے لیے تمام پابندیاں دوبارہ ترتیب دیں۔
+PredefinedGroups=پہلے سے طے شدہ گروپس
+WithoutValidAccount=درست وقف اکاؤنٹ کے بغیر
+WithValidAccount=درست وقف اکاؤنٹ کے ساتھ
+ValueNotIntoChartOfAccount=اکاؤنٹنگ اکاؤنٹ کی یہ قیمت اکاؤنٹ کے چارٹ میں موجود نہیں ہے۔
+AccountRemovedFromGroup=اکاؤنٹ گروپ سے ہٹا دیا گیا۔
+SaleLocal=مقامی فروخت
+SaleExport=برآمد کی فروخت
+SaleEEC=ای ای سی میں فروخت
+SaleEECWithVAT=VAT کے ساتھ EEC میں فروخت کالعدم نہیں، لہذا ہم سمجھتے ہیں کہ یہ انٹرا کمیونٹری سیل نہیں ہے اور تجویز کردہ اکاؤنٹ معیاری پروڈکٹ اکاؤنٹ ہے۔
+SaleEECWithoutVATNumber=بغیر VAT کے EEC میں فروخت لیکن تیسرے فریق کی VAT ID کی وضاحت نہیں کی گئی ہے۔ ہم معیاری فروخت کے لیے پروڈکٹ اکاؤنٹ پر فال بیک کرتے ہیں۔ اگر ضرورت ہو تو آپ فریق ثالث کی VAT ID یا پروڈکٹ اکاؤنٹ کو ٹھیک کر سکتے ہیں۔
+ForbiddenTransactionAlreadyExported=ممنوع: لین دین کی توثیق اور/یا برآمد کی گئی ہے۔
+ForbiddenTransactionAlreadyValidated=ممنوع: لین دین کی توثیق کر دی گئی ہے۔
+## Dictionary
+Range=اکاؤنٹنگ اکاؤنٹ کی حد
+Calculated=حساب لگایا
+Formula=فارمولا
+
+## Error
+SomeMandatoryStepsOfSetupWereNotDone=سیٹ اپ کے کچھ لازمی اقدامات نہیں کیے گئے، براہ کرم انہیں مکمل کریں۔
+ErrorNoAccountingCategoryForThisCountry=ملک %s کے لیے کوئی اکاؤنٹنگ اکاؤنٹ گروپ دستیاب نہیں (دیکھیں ہوم - سیٹ اپ - ڈکشنریز)
+ErrorInvoiceContainsLinesNotYetBounded=آپ انوائس کی کچھ لائنوں کو جرنلائز کرنے کی کوشش کرتے ہیں <strong> %s </strong>، لیکن کچھ دوسری لائنیں ابھی تک اکاؤنٹنگ اکاؤنٹ کے پابند نہیں ہیں۔ اس انوائس کے لیے تمام انوائس لائنوں کی جرنلائزیشن سے انکار کر دیا گیا ہے۔
+ErrorInvoiceContainsLinesNotYetBoundedShort=انوائس پر کچھ لائنیں اکاؤنٹنگ اکاؤنٹ کے پابند نہیں ہیں۔
+ExportNotSupported=ایکسپورٹ فارمیٹ سیٹ اپ اس صفحہ میں تعاون یافتہ نہیں ہے۔
+BookeppingLineAlreayExists=بک کیپنگ میں لائنیں پہلے سے موجود ہیں۔
+NoJournalDefined=کسی جریدے کی وضاحت نہیں کی گئی۔
+Binded=لکیریں جڑی ہوئی ہیں۔
+ToBind=باندھنے کے لیے لکیریں۔
+UseMenuToSetBindindManualy=لائنیں ابھی تک پابند نہیں ہیں، دستی طور پر بائنڈنگ بنانے کے لیے مینو <a href="%s"> %s </a> استعمال کریں۔
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=معذرت کے ساتھ یہ ماڈیول حالات کی رسیدوں کی تجرباتی خصوصیت سے مطابقت نہیں رکھتا
+
+## Import
+ImportAccountingEntries=اکاؤنٹنگ اندراجات
+ImportAccountingEntriesFECFormat=اکاؤنٹنگ اندراجات - FEC فارمیٹ
+FECFormatJournalCode=کوڈ جرنل (جرنل کوڈ)
+FECFormatJournalLabel=لیبل جرنل (JournalLib)
+FECFormatEntryNum=ٹکڑا نمبر (EcritureNum)
+FECFormatEntryDate=ٹکڑا تاریخ (EcritureDate)
+FECFormatGeneralAccountNumber=جنرل اکاؤنٹ نمبر (CompteNum)
+FECFormatGeneralAccountLabel=جنرل اکاؤنٹ لیبل (CompteLib)
+FECFormatSubledgerAccountNumber=سبلیجر اکاؤنٹ نمبر (CompAuxNum)
+FECFormatSubledgerAccountLabel=سبلیجر اکاؤنٹ نمبر (CompAuxLib)
+FECFormatPieceRef=پیس ریف (پیس ریف)
+FECFormatPieceDate=ٹکڑا تاریخ تخلیق (PieceDate)
+FECFormatLabelOperation=لیبل آپریشن (EcritureLib)
+FECFormatDebit=ڈیبٹ (ڈیبٹ)
+FECFormatCredit=کریڈٹ (کریڈٹ)
+FECFormatReconcilableCode=قابل مصالحت کوڈ (EcritureLet)
+FECFormatReconcilableDate=قابل تجدید تاریخ (DateLet)
+FECFormatValidateDate=ٹکڑا کی توثیق کی تاریخ (درست تاریخ)
+FECFormatMulticurrencyAmount=ملٹی کرنسی کی رقم (Montantdevise)
+FECFormatMulticurrencyCode=ملٹی کرنسی کوڈ (آئیڈیوائز)
+
+DateExport=تاریخ برآمد
+WarningReportNotReliable=انتباہ، یہ رپورٹ لیجر پر مبنی نہیں ہے، لہذا اس میں لیجر میں دستی طور پر ترمیم شدہ لین دین شامل نہیں ہے۔ اگر آپ کی جرنلائزیشن اپ ٹو ڈیٹ ہے، تو بک کیپنگ کا نظریہ زیادہ درست ہے۔
+ExpenseReportJournal=اخراجات کی رپورٹ جرنل
+InventoryJournal=انوینٹری جرنل
+
+NAccounts=%s اکاؤنٹس
diff --git a/htdocs/langs/ur_PK/admin.lang b/htdocs/langs/ur_PK/admin.lang
new file mode 100644
index 00000000000..5f76e6cef5b
--- /dev/null
+++ b/htdocs/langs/ur_PK/admin.lang
@@ -0,0 +1,2222 @@
+# 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=فاؤنڈیشن
+Version=ورژن
+Publisher=پبلشر
+VersionProgram=ورژن پروگرام
+VersionLastInstall=ابتدائی انسٹال ورژن
+VersionLastUpgrade=تازہ ترین ورژن اپ گریڈ
+VersionExperimental=تجرباتی
+VersionDevelopment=ترقی
+VersionUnknown=نامعلوم
+VersionRecommanded=تجویز کردہ
+FileCheck=فائل سیٹ انٹیگریٹی چیک کرتا ہے۔
+FileCheckDesc=یہ ٹول آپ کو ہر فائل کا آفیشل فائل سے موازنہ کرتے ہوئے فائلوں کی سالمیت اور آپ کی ایپلیکیشن کے سیٹ اپ کو چیک کرنے کی اجازت دیتا ہے۔ کچھ سیٹ اپ کنسٹینٹس کی قدر بھی چیک کی جا سکتی ہے۔ آپ اس ٹول کا استعمال اس بات کا تعین کرنے کے لیے کر سکتے ہیں کہ آیا کسی فائل میں ترمیم کی گئی ہے (جیسے ہیکر کے ذریعے)۔
+FileIntegrityIsStrictlyConformedWithReference=فائلوں کی سالمیت حوالہ کے ساتھ سختی سے مطابقت رکھتی ہے۔
+FileIntegrityIsOkButFilesWereAdded=فائلوں کی سالمیت کی جانچ گزر چکی ہے، تاہم کچھ نئی فائلیں شامل کی گئی ہیں۔
+FileIntegritySomeFilesWereRemovedOrModified=فائلوں کی سالمیت کی جانچ ناکام ہوگئی ہے۔ کچھ فائلوں میں ترمیم، ہٹایا یا شامل کیا گیا تھا۔
+GlobalChecksum=عالمی چیکسم
+MakeIntegrityAnalysisFrom=سے درخواست فائلوں کی سالمیت کا تجزیہ کریں۔
+LocalSignature=ایمبیڈڈ مقامی دستخط (کم قابل اعتماد)
+RemoteSignature=دور دراز کے دستخط (زیادہ قابل اعتماد)
+FilesMissing=مسنگ فائلز
+FilesUpdated=اپ ڈیٹ شدہ فائلیں۔
+FilesModified=ترمیم شدہ فائلیں۔
+FilesAdded=فائلیں شامل کی گئیں۔
+FileCheckDolibarr=ایپلی کیشن فائلوں کی سالمیت کی جانچ کریں۔
+AvailableOnlyOnPackagedVersions=سالمیت کی جانچ کے لیے مقامی فائل صرف اس وقت دستیاب ہوتی ہے جب ایپلیکیشن کسی آفیشل پیکج سے انسٹال ہو۔
+XmlNotFound=درخواست کی XML انٹیگریٹی فائل نہیں ملی
+SessionId=سیشن ID
+SessionSaveHandler=سیشن کو بچانے کے لیے ہینڈلر
+SessionSavePath=سیشن محفوظ کریں مقام
+PurgeSessions=سیشنوں کو صاف کرنا
+ConfirmPurgeSessions=کیا آپ واقعی تمام سیشنز کو صاف کرنا چاہتے ہیں؟ یہ ہر صارف (سوائے اپنے آپ کو) منقطع کر دے گا۔
+NoSessionListWithThisHandler=آپ کے پی ایچ پی میں تشکیل شدہ سیشن ہینڈلر کو محفوظ کریں تمام چلنے والے سیشنوں کی فہرست کی اجازت نہیں دیتا ہے۔
+LockNewSessions=نئے کنکشن لاک کریں۔
+ConfirmLockNewSessions=کیا آپ واقعی کسی بھی نئے Dolibarr کنکشن کو اپنے تک محدود کرنا چاہتے ہیں؟ اس کے بعد صرف صارف <b> %s </b> رابطہ کر سکے گا۔
+UnlockNewSessions=کنکشن لاک کو ہٹا دیں۔
+YourSession=آپ کا سیشن
+Sessions=صارفین کے سیشنز
+WebUserGroup=ویب سرور صارف/گروپ
+PermissionsOnFiles=فائلوں پر اجازت
+PermissionsOnFilesInWebRoot=ویب روٹ ڈائرکٹری میں فائلوں پر اجازت
+PermissionsOnFile=فائل %s پر اجازتیں۔
+NoSessionFound=ایسا لگتا ہے کہ آپ کی پی ایچ پی ترتیب فعال سیشنز کی فہرست سازی کی اجازت نہیں دیتی ہے۔ سیشنز کو محفوظ کرنے کے لیے استعمال ہونے والی ڈائرکٹری ( <b> %s </b> ) محفوظ ہو سکتی ہے (مثال کے طور پر OS کی اجازتوں کے ذریعے یا PHP کی ہدایت کے ذریعے open_basedir)۔
+DBStoringCharset=ڈیٹا کو ذخیرہ کرنے کے لیے ڈیٹا بیس کا چارسیٹ
+DBSortingCharset=ڈیٹا کو ترتیب دینے کے لیے ڈیٹا بیس کا چارسیٹ
+HostCharset=میزبان چارسیٹ
+ClientCharset=کلائنٹ چارسیٹ
+ClientSortingCharset=کلائنٹ کولیشن
+WarningModuleNotActive=ماڈیول <b> %s </b> فعال ہونا ضروری ہے
+WarningOnlyPermissionOfActivatedModules=یہاں صرف فعال ماڈیولز سے متعلق اجازتیں دکھائی گئی ہیں۔ آپ ہوم-> سیٹ اپ-> ماڈیولز صفحہ میں دوسرے ماڈیولز کو چالو کر سکتے ہیں۔
+DolibarrSetup=Dolibarr انسٹال یا اپ گریڈ کریں۔
+InternalUser=اندرونی صارف
+ExternalUser=بیرونی صارف
+InternalUsers=اندرونی صارفین
+ExternalUsers=بیرونی صارفین
+UserInterface=یوزر انٹرفیس
+GUISetup=ڈسپلے
+SetupArea=سیٹ اپ
+UploadNewTemplate=نئی ٹیمپلیٹ اپ لوڈ کریں
+FormToTestFileUploadForm=فائل اپ لوڈ کی جانچ کے لیے فارم (سیٹ اپ کے مطابق)
+ModuleMustBeEnabled=ماڈیول/ایپلی کیشن <b> %s </b> فعال ہونا ضروری ہے
+ModuleIsEnabled=ماڈیول/ایپلی کیشن <b> %s </b> کو فعال کر دیا گیا ہے۔
+IfModuleEnabled=نوٹ: ہاں صرف اس صورت میں مؤثر ہے جب ماڈیول <b> %s </b> فعال ہو
+RemoveLock=فائل کو ہٹائیں/اس کا نام تبدیل کریں
+RestoreLock=اپ ڈیٹ/انسٹال ٹول کے مزید کسی بھی استعمال کو غیر فعال کرنے کے لیے، فائل کو بحال کریں
+SecuritySetup=سیکیورٹی سیٹ اپ
+PHPSetup=پی ایچ پی سیٹ اپ
+OSSetup=OS سیٹ اپ
+SecurityFilesDesc=فائلوں کو اپ لوڈ کرنے کے بارے میں سیکورٹی سے متعلق یہاں اختیارات کی وضاحت کریں۔
+ErrorModuleRequirePHPVersion=خرابی، اس ماڈیول کے لیے پی ایچ پی ورژن %s یا اس سے زیادہ کی ضرورت ہے
+ErrorModuleRequireDolibarrVersion=خرابی، اس ماڈیول کو Dolibarr ورژن %s یا اس سے اوپر کی ضرورت ہے
+ErrorDecimalLargerThanAreForbidden=خرابی، <b> %s </b> سے زیادہ درستگی تعاون یافتہ نہیں ہے۔
+DictionarySetup=ڈکشنری سیٹ اپ
+Dictionary=لغتیں
+ErrorReservedTypeSystemSystemAuto=قسم کے لیے 'system' اور 'systemauto' کی قدر محفوظ ہے۔ آپ اپنا ریکارڈ شامل کرنے کے لیے 'صارف' کو بطور قدر استعمال کر سکتے ہیں۔
+ErrorCodeCantContainZero=کوڈ میں قدر 0 نہیں ہو سکتی
+DisableJavascript=جاوا اسکرپٹ اور ایجیکس فنکشنز کو غیر فعال کریں۔
+DisableJavascriptNote=نوٹ: صرف ٹیسٹ یا ڈیبگ مقصد کے لیے۔ نابینا افراد یا ٹیکسٹ براؤزرز کے لیے اصلاح کے لیے، آپ صارف کے پروفائل پر سیٹ اپ استعمال کرنے کو ترجیح دے سکتے ہیں۔
+UseSearchToSelectCompanyTooltip=اس کے علاوہ اگر آپ کے پاس تیسرے فریق (> 100 000) کی ایک بڑی تعداد ہے، تو آپ سیٹ اپ-> دیگر میں مستقل COMPANY_DONOTSEARCH_ANYWHERE کو 1 پر سیٹ کرکے رفتار بڑھا سکتے ہیں۔ تلاش پھر سٹرنگ کے آغاز تک محدود ہو جائے گی۔
+UseSearchToSelectContactTooltip=اس کے علاوہ اگر آپ کے پاس تیسرے فریق (> 100 000) کی بڑی تعداد ہے، تو آپ سیٹ اپ-> دیگر میں مسلسل CONTACT_DONOTSEARCH_ANYWHERE کو 1 پر سیٹ کرکے رفتار بڑھا سکتے ہیں۔ تلاش پھر سٹرنگ کے آغاز تک محدود ہو جائے گی۔
+DelaiedFullListToSelectCompany=تھرڈ پارٹیز کومبو لسٹ کا مواد لوڈ کرنے سے پہلے ایک کلید دبانے تک انتظار کریں۔ <br> اگر آپ کے پاس تیسرے فریق کی بڑی تعداد ہے تو یہ کارکردگی میں اضافہ کر سکتا ہے، لیکن یہ کم آسان ہے۔
+DelaiedFullListToSelectContact=رابطہ کامبو لسٹ کا مواد لوڈ کرنے سے پہلے ایک کلید دبانے تک انتظار کریں۔ <br> اگر آپ کے پاس بہت زیادہ رابطے ہیں تو یہ کارکردگی کو بڑھا سکتا ہے، لیکن یہ کم آسان ہے۔
+NumberOfKeyToSearch=تلاش کو متحرک کرنے کے لیے حروف کی تعداد: %s
+NumberOfBytes=بائٹس کی تعداد
+SearchString=تلاش کی تار
+NotAvailableWhenAjaxDisabled=Ajax کے غیر فعال ہونے پر دستیاب نہیں ہے۔
+AllowToSelectProjectFromOtherCompany=تیسرے فریق کی دستاویز پر، کسی دوسرے تیسرے فریق سے منسلک پروجیکٹ کا انتخاب کر سکتے ہیں۔
+TimesheetPreventAfterFollowingMonths=درج ذیل مہینوں کے بعد گزارے گئے ریکارڈنگ کے وقت کو روکیں۔
+JavascriptDisabled=جاوا اسکرپٹ غیر فعال ہے۔
+UsePreviewTabs=پیش نظارہ ٹیبز استعمال کریں۔
+ShowPreview=پیش نظارہ دکھائیں۔
+ShowHideDetails=تفصیلات دکھائیں-چھپائیں۔
+PreviewNotAvailable=پیش نظارہ دستیاب نہیں ہے۔
+ThemeCurrentlyActive=تھیم فی الحال فعال ہے۔
+MySQLTimeZone=ٹائم زون MySql (ڈیٹا بیس)
+TZHasNoEffect=تاریخوں کو ڈیٹا بیس سرور کے ذریعہ ذخیرہ کیا جاتا ہے اور واپس کیا جاتا ہے گویا وہ جمع کردہ سٹرنگ کے طور پر رکھی گئی ہیں۔ ٹائم زون کا اثر صرف اس وقت ہوتا ہے جب UNIX_TIMESTAMP فنکشن استعمال کیا جائے (جو Dolibarr کو استعمال نہیں کرنا چاہیے، اس لیے ڈیٹا بیس TZ کا کوئی اثر نہیں ہونا چاہیے، چاہے ڈیٹا داخل کرنے کے بعد تبدیل ہو جائے)۔
+Space=خلا
+Table=ٹیبل
+Fields=فیلڈز
+Index=انڈیکس
+Mask=ماسک
+NextValue=اگلی قیمت
+NextValueForInvoices=اگلی قیمت (انوائسز)
+NextValueForCreditNotes=اگلی قیمت (کریڈٹ نوٹس)
+NextValueForDeposit=اگلی قیمت (نیچے ادائیگی)
+NextValueForReplacements=اگلی قدر (متبادل)
+MustBeLowerThanPHPLimit=نوٹ: آپ کی PHP کنفیگریشن فی الحال <b> %s </b> %s پر اپ لوڈ کرنے کے لیے زیادہ سے زیادہ فائل سائز کو محدود کرتی ہے، اس پیرامیٹر کی قدر سے قطع نظر
+NoMaxSizeByPHPLimit=نوٹ: آپ کی پی ایچ پی کی ترتیب میں کوئی حد مقرر نہیں ہے۔
+MaxSizeForUploadedFiles=اپ لوڈ کردہ فائلوں کے لیے زیادہ سے زیادہ سائز (0 کسی بھی اپ لوڈ کی اجازت نہ دینے کے لیے)
+UseCaptchaCode=لاگ ان پیج پر گرافیکل کوڈ (کیپچا) استعمال کریں۔
+AntiVirusCommand=اینٹی وائرس کمانڈ کا مکمل راستہ
+AntiVirusCommandExample=ClamAv ڈیمون کی مثال (کلاماو ڈیمون کی ضرورت ہے): /usr/bin/clamdscan <br> کلیم ون کی مثال (بہت سست): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam= کمانڈ لائن پر مزید پیرامیٹرز
+AntiVirusParamExample=ClamAv ڈیمون کے لئے مثال: --fdpass <br> ClamWin کے لئے مثال: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=اکاؤنٹنگ ماڈیول سیٹ اپ
+UserSetup=یوزر مینجمنٹ سیٹ اپ
+MultiCurrencySetup=ملٹی کرنسی سیٹ اپ
+MenuLimits=حدود اور درستگی
+MenuIdParent=پیرنٹ مینو ID
+DetailMenuIdParent=پیرنٹ مینو کی ID (ٹاپ مینو کے لیے خالی)
+ParentID=والدین کی شناخت
+DetailPosition=مینو پوزیشن کی وضاحت کے لیے نمبر ترتیب دیں۔
+AllMenus=تمام
+NotConfigured=ماڈیول/ایپلی کیشن کنفیگر نہیں ہے۔
+Active=فعال
+SetupShort=سیٹ اپ
+OtherOptions=دوسرے اختیارات
+OtherSetup=دیگر سیٹ اپ
+CurrentValueSeparatorDecimal=اعشاریہ الگ کرنے والا
+CurrentValueSeparatorThousand=ہزار الگ کرنے والا
+Destination=منزل
+IdModule=ماڈیول ID
+IdPermissions=اجازتوں کی شناخت
+LanguageBrowserParameter=پیرامیٹر %s
+LocalisationDolibarrParameters=لوکلائزیشن کے پیرامیٹرز
+ClientHour=کلائنٹ کا وقت (صارف)
+OSTZ=سرور OS ٹائم زون
+PHPTZ=پی ایچ پی سرور ٹائم زون
+DaylingSavingTime=دن کی روشنی کی بچت کا وقت
+CurrentHour=پی ایچ پی ٹائم (سرور)
+CurrentSessionTimeOut=موجودہ سیشن کا ٹائم آؤٹ
+YouCanEditPHPTZ=ایک مختلف پی ایچ پی ٹائم زون سیٹ کرنے کے لیے (ضروری نہیں)، آپ .htaccess فائل کو "SetEnv TZ Europe/Paris" جیسی لائن کے ساتھ شامل کرنے کی کوشش کر سکتے ہیں۔
+HoursOnThisPageAreOnServerTZ=وارننگ، دوسری اسکرینوں کے برعکس، اس صفحہ پر گھنٹے آپ کے مقامی ٹائم زون میں نہیں ہیں، بلکہ سرور کے ٹائم زون میں ہیں۔
+Box=ویجیٹ
+Boxes=وجیٹس
+MaxNbOfLinesForBoxes=زیادہ سے زیادہ ویجٹ کے لیے لائنوں کی تعداد
+AllWidgetsWereEnabled=تمام دستیاب وجیٹس فعال ہیں۔
+PositionByDefault=پہلے سے طے شدہ آرڈر
+Position=پوزیشن
+MenusDesc=مینو مینیجر دو مینو بارز (افقی اور عمودی) کا مواد سیٹ کرتے ہیں۔
+MenusEditorDesc=مینو ایڈیٹر آپ کو اپنی مرضی کے مینو اندراجات کی وضاحت کرنے کی اجازت دیتا ہے۔ عدم استحکام اور مستقل طور پر ناقابل رسائی مینو اندراجات سے بچنے کے لیے اسے احتیاط سے استعمال کریں۔ <br> کچھ ماڈیولز مینو اندراجات شامل کرتے ہیں (مینو میں <b> All </b> زیادہ تر)۔ اگر آپ غلطی سے ان میں سے کچھ اندراجات کو ہٹا دیتے ہیں، تو آپ ماڈیول کو غیر فعال اور دوبارہ فعال کر کے انہیں بحال کر سکتے ہیں۔
+MenuForUsers=صارفین کے لیے مینو
+LangFile=.lang فائل
+Language_en_US_es_MX_etc=زبان (en_US, es_MX, ...)
+System=سسٹم
+SystemInfo=سسٹم کی معلومات
+SystemToolsArea=سسٹم ٹولز ایریا
+SystemToolsAreaDesc=یہ علاقہ انتظامیہ کے افعال فراہم کرتا ہے۔ مطلوبہ خصوصیت کو منتخب کرنے کے لیے مینو کا استعمال کریں۔
+Purge=صاف کرنا
+PurgeAreaDesc=یہ صفحہ آپ کو Dolibarr (عارضی فائلیں یا <b> %s </b> ڈائرکٹری میں موجود تمام فائلیں) کی تخلیق یا ذخیرہ کردہ تمام فائلوں کو حذف کرنے کی اجازت دیتا ہے۔ اس خصوصیت کا استعمال عام طور پر ضروری نہیں ہے۔ یہ ان صارفین کے لیے ایک کام کے طور پر فراہم کیا گیا ہے جن کے ڈولیبار کو ایک ایسے فراہم کنندہ کے ذریعے میزبانی کی گئی ہے جو ویب سرور کے ذریعے تیار کردہ فائلوں کو حذف کرنے کی اجازت نہیں دیتا ہے۔
+PurgeDeleteLogFile=لاگ فائلوں کو حذف کریں، بشمول <b> %s </b> Syslog ماڈیول کے لیے بیان کردہ (ڈیٹا کھونے کا کوئی خطرہ نہیں)
+PurgeDeleteTemporaryFiles=تمام لاگ اور عارضی فائلوں کو حذف کریں (ڈیٹا کھونے کا کوئی خطرہ نہیں)۔ پیرامیٹر 'tempfilesold'، 'logfiles' یا دونوں 'tempfilesold+logfiles' ہو سکتا ہے۔ نوٹ: عارضی فائلوں کو حذف کرنا صرف اس صورت میں کیا جاتا ہے جب عارضی ڈائریکٹری 24 گھنٹے سے زیادہ پہلے بنائی گئی ہو۔
+PurgeDeleteTemporaryFilesShort=لاگ اور عارضی فائلوں کو حذف کریں (ڈیٹا کھونے کا کوئی خطرہ نہیں)
+PurgeDeleteAllFilesInDocumentsDir=ڈائریکٹری میں موجود تمام فائلوں کو حذف کریں: <b> %s </b> ۔ <br> یہ عناصر سے متعلق تمام تیار کردہ دستاویزات (تیسرے فریق، انوائسز وغیرہ...)، ECM ماڈیول میں اپ لوڈ کردہ فائلیں، ڈیٹا بیس بیک اپ ڈمپ اور عارضی فائلوں کو حذف کر دے گا۔
+PurgeRunNow=ابھی صاف کریں۔
+PurgeNothingToDelete=حذف کرنے کے لیے کوئی ڈائریکٹری یا فائلیں نہیں ہیں۔
+PurgeNDirectoriesDeleted= <b> %s </b> فائلیں یا ڈائریکٹریز حذف کردی گئیں۔
+PurgeNDirectoriesFailed=<b> %s </b> فائلوں یا ڈائریکٹریز کو حذف کرنے میں ناکام۔
+PurgeAuditEvents=تمام حفاظتی واقعات کو صاف کریں۔
+ConfirmPurgeAuditEvents=کیا آپ واقعی تمام سیکیورٹی ایونٹس کو صاف کرنا چاہتے ہیں؟ تمام سیکورٹی لاگز کو حذف کر دیا جائے گا، کوئی دوسرا ڈیٹا نہیں ہٹایا جائے گا۔
+GenerateBackup=بیک اپ بنائیں
+Backup=بیک اپ
+Restore=بحال کریں۔
+RunCommandSummary=بیک اپ کو درج ذیل کمانڈ کے ساتھ لانچ کیا گیا ہے۔
+BackupResult=بیک اپ نتیجہ
+BackupFileSuccessfullyCreated=بیک اپ فائل کامیابی کے ساتھ تیار ہو گئی۔
+YouCanDownloadBackupFile=تیار کردہ فائل کو اب ڈاؤن لوڈ کیا جا سکتا ہے۔
+NoBackupFileAvailable=کوئی بیک اپ فائلیں دستیاب نہیں ہیں۔
+ExportMethod=برآمد کا طریقہ
+ImportMethod=درآمد کا طریقہ
+ToBuildBackupFileClickHere=بیک اپ فائل بنانے کے لیے، <a href="%s"> یہاں </a> پر کلک کریں۔
+ImportMySqlDesc=MySQL بیک اپ فائل درآمد کرنے کے لیے، آپ اپنی ہوسٹنگ کے ذریعے phpMyAdmin استعمال کر سکتے ہیں یا کمانڈ لائن سے mysql کمانڈ استعمال کر سکتے ہیں۔ <br> مثال کے طور پر:
+ImportPostgreSqlDesc=بیک اپ فائل درآمد کرنے کے لیے، آپ کو کمانڈ لائن سے pg_restore کمانڈ استعمال کرنا ہوگی۔
+ImportMySqlCommand=%s %s < mybackupfile.sql
+ImportPostgreSqlCommand=%s %s mybackupfile.sql
+FileNameToGenerate=بیک اپ کے لیے فائل کا نام:
+Compression=کمپریشن
+CommandsToDisableForeignKeysForImport=درآمد پر غیر ملکی کلیدوں کو غیر فعال کرنے کا حکم
+CommandsToDisableForeignKeysForImportWarning=لازمی ہے اگر آپ بعد میں اپنے ایس کیو ایل ڈمپ کو بحال کرنے کے قابل ہونا چاہتے ہیں۔
+ExportCompatibility=تیار کردہ برآمد فائل کی مطابقت
+ExportUseMySQLQuickParameter=--quick پیرامیٹر استعمال کریں۔
+ExportUseMySQLQuickParameterHelp='--quick' پیرامیٹر بڑی میزوں کے لیے RAM کی کھپت کو محدود کرنے میں مدد کرتا ہے۔
+MySqlExportParameters=MySQL برآمدی پیرامیٹرز
+PostgreSqlExportParameters= PostgreSQL برآمدی پیرامیٹرز
+UseTransactionnalMode=لین دین کا موڈ استعمال کریں۔
+FullPathToMysqldumpCommand=mysqldump کمانڈ کا مکمل راستہ
+FullPathToPostgreSQLdumpCommand=pg_dump کمانڈ کا مکمل راستہ
+AddDropDatabase=ڈراپ ڈیٹا بیس کمانڈ شامل کریں۔
+AddDropTable=ڈراپ ٹیبل کمانڈ شامل کریں۔
+ExportStructure=ساخت
+NameColumn=کالموں کو نام دیں۔
+ExtendedInsert=توسیعی INSERT
+NoLockBeforeInsert=INSERT کے ارد گرد کوئی لاک کمانڈ نہیں ہے۔
+DelayedInsert=تاخیر سے داخل کرنا
+EncodeBinariesInHexa=بائنری ڈیٹا کو ہیکساڈیسیمل میں انکوڈ کریں۔
+IgnoreDuplicateRecords=ڈپلیکیٹ ریکارڈ کی غلطیوں کو نظر انداز کریں (INSERT IGNORE)
+AutoDetectLang=آٹو ڈیٹیکٹ (براؤزر کی زبان)
+FeatureDisabledInDemo=ڈیمو میں خصوصیت غیر فعال ہے۔
+FeatureAvailableOnlyOnStable=خصوصیت صرف سرکاری مستحکم ورژن پر دستیاب ہے۔
+BoxesDesc=وجیٹس وہ اجزاء ہوتے ہیں جو کچھ معلومات دکھاتے ہیں جنہیں آپ کچھ صفحات کو ذاتی بنانے کے لیے شامل کر سکتے ہیں۔ آپ ٹارگٹ پیج کو منتخب کرکے اور 'ایکٹیویٹ' پر کلک کرکے، یا اسے غیر فعال کرنے کے لیے کوڑے دان پر کلک کرکے ویجیٹ کو دکھانے یا نہ دکھانے کے درمیان انتخاب کرسکتے ہیں۔
+OnlyActiveElementsAreShown=صرف <a href="%s"> فعال ماڈیولز </a> کے عناصر دکھائے گئے ہیں۔
+ModulesDesc=ماڈیولز/ایپلی کیشنز اس بات کا تعین کرتے ہیں کہ سافٹ ویئر میں کون سی خصوصیات دستیاب ہیں۔ کچھ ماڈیولز کو ماڈیول کو چالو کرنے کے بعد صارفین کو اجازت دینے کی ضرورت ہوتی ہے۔ کسی ماڈیول/ایپلی کیشن کو فعال یا غیر فعال کرنے کے لیے ہر ماڈیول کے آن/آف بٹن <span class="small valignmiddle"> %s </span> پر کلک کریں۔
+ModulesDesc2=ماڈیول/ایپلی کیشن کو ترتیب دینے کے لیے وہیل بٹن <span class="small valignmiddle"> %s </span> پر کلک کریں۔
+ModulesMarketPlaceDesc=آپ انٹرنیٹ پر بیرونی ویب سائٹس پر ڈاؤن لوڈ کرنے کے لیے مزید ماڈیولز تلاش کر سکتے ہیں...
+ModulesDeployDesc=اگر آپ کے فائل سسٹم پر اجازتیں اس کی اجازت دیتی ہیں، تو آپ اس ٹول کو ایک بیرونی ماڈیول تعینات کرنے کے لیے استعمال کر سکتے ہیں۔ اس کے بعد ماڈیول <strong> %s </strong> ٹیب پر نظر آئے گا۔
+ModulesMarketPlaces=بیرونی ایپ/ماڈیولز تلاش کریں۔
+ModulesDevelopYourModule=اپنی خود کی ایپ/ماڈیول تیار کریں۔
+ModulesDevelopDesc=آپ اپنا ماڈیول بھی تیار کر سکتے ہیں یا آپ کے لیے تیار کرنے کے لیے کوئی پارٹنر تلاش کر سکتے ہیں۔
+DOLISTOREdescriptionLong=بیرونی ماڈیول تلاش کرنے کے لیے <a href="https://www.dolistore.com"> www.dolistore.com </a> ویب سائٹ پر سوئچ کرنے کے بجائے، آپ اس ایمبیڈڈ ٹول کا استعمال کر سکتے ہیں جو آپ کے لیے بیرونی بازار کی جگہ پر تلاش کرے گا (سست ہو سکتا ہے، انٹرنیٹ تک رسائی کی ضرورت ہے)...
+NewModule=نیا ماڈیول
+FreeModule=مفت
+CompatibleUpTo=ورژن %s کے ساتھ ہم آہنگ
+NotCompatible=یہ ماڈیول آپ کے Dolibarr %s (Min %s - Max %s) کے ساتھ مطابقت نہیں رکھتا۔
+CompatibleAfterUpdate=اس ماڈیول کو آپ کے Dolibarr %s (Min %s - زیادہ سے زیادہ %s) میں اپ ڈیٹ کی ضرورت ہے۔
+SeeInMarkerPlace=بازار میں دیکھیں
+SeeSetupOfModule=ماڈیول %s کا سیٹ اپ دیکھیں
+SetOptionTo=آپشن <b> %s </b> کو %s پر سیٹ کریں
+Updated=اپ ڈیٹ
+AchatTelechargement=خریدیں / ڈاؤن لوڈ کریں۔
+GoModuleSetupArea=ایک نیا ماڈیول تعینات/انسٹال کرنے کے لیے، ماڈیول سیٹ اپ ایریا پر جائیں: <a href="%s"> %s </a> ۔
+DoliStoreDesc=DoliStore، Dolibarr ERP/CRM بیرونی ماڈیولز کے لیے آفیشل مارکیٹ پلیس
+DoliPartnersDesc=اپنی مرضی کے مطابق تیار کردہ ماڈیولز یا خصوصیات فراہم کرنے والی کمپنیوں کی فہرست۔ <br> نوٹ: چونکہ Dolibarr ایک اوپن سورس ایپلی کیشن ہے، <i> کوئی بھی </i> جو PHP پروگرامنگ میں تجربہ کار ہے ماڈیول تیار کرنے کے قابل ہونا چاہیے۔
+WebSiteDesc=مزید ایڈ آن (نان کور) ماڈیولز کے لیے بیرونی ویب سائٹس...
+DevelopYourModuleDesc=اپنے ماڈیول کو تیار کرنے کے لیے کچھ حل...
+URL=URL
+RelativeURL=متعلقہ URL
+BoxesAvailable=وجیٹس دستیاب ہیں۔
+BoxesActivated=وجیٹس چالو ہو گئے۔
+ActivateOn=چالو کریں۔
+ActiveOn=کو چالو کیا گیا۔
+ActivatableOn=چالو کرنے کے قابل
+SourceFile=بنیادی فائل
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=صرف اس صورت میں دستیاب ہے جب JavaScript غیر فعال نہ ہو۔
+Required=درکار ہے۔
+UsedOnlyWithTypeOption=صرف کچھ ایجنڈا آپشن کے ذریعہ استعمال کیا جاتا ہے۔
+Security=سیکورٹی
+Passwords=پاس ورڈز
+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:"c... </b> <br> by <br> <b> $dolibarr_main_db_pass="%s"؛ </b>
+ProtectAndEncryptPdfFiles=تیار کردہ پی ڈی ایف فائلوں کی حفاظت کریں۔ اس کی سفارش نہیں کی جاتی ہے کیونکہ یہ پی ڈی ایف کی بڑی تعداد کو توڑ دیتا ہے۔
+ProtectAndEncryptPdfFilesDesc=پی ڈی ایف دستاویز کا تحفظ اسے کسی بھی پی ڈی ایف براؤزر کے ساتھ پڑھنے اور پرنٹ کرنے کے لیے دستیاب رکھتا ہے۔ تاہم، اب ترمیم اور نقل ممکن نہیں ہے۔ نوٹ کریں کہ اس خصوصیت کو استعمال کرنے سے عالمی ضم شدہ PDFs کی تعمیر کام نہیں کر رہی ہے۔
+Feature=فیچر
+DolibarrLicense=لائسنس
+Developpers=ڈویلپرز / تعاون کنندگان
+OfficialWebSite=Dolibarr سرکاری ویب سائٹ
+OfficialWebSiteLocal=مقامی ویب سائٹ (%s)
+OfficialWiki=Dolibarr دستاویزات / Wiki
+OfficialDemo=Dolibarr آن لائن ڈیمو
+OfficialMarketPlace=بیرونی ماڈیولز/ایڈونز کے لیے آفیشل مارکیٹ پلیس
+OfficialWebHostingService=حوالہ شدہ ویب ہوسٹنگ سروسز (کلاؤڈ ہوسٹنگ)
+ReferencedPreferredPartners=ترجیحی شراکت دار
+OtherResources=دیگر وسائل
+ExternalResources=بیرونی وسائل
+SocialNetworks=سوشل نیٹ ورک
+SocialNetworkId=سوشل نیٹ ورک ID
+ForDocumentationSeeWiki=صارف یا ڈویلپر دستاویزات (دستاویز، اکثر پوچھے گئے سوالات...)، <br> پر ایک نظر ڈالیں Dolibarr Wiki: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> a0ecb2ecz87f4087f4087f49bz0
+ForAnswersSeeForum=کسی بھی دوسرے سوال/مدد کے لیے، آپ Dolibarr فورم استعمال کر سکتے ہیں: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> a09f714a
+HelpCenterDesc1=Dolibarr کے ساتھ مدد اور مدد حاصل کرنے کے لیے کچھ وسائل یہ ہیں۔
+HelpCenterDesc2=ان میں سے کچھ وسائل صرف <b> انگریزی </b> میں دستیاب ہیں۔
+CurrentMenuHandler=موجودہ مینو ہینڈلر
+MeasuringUnit=پیمائش کرنے والا یونٹ
+LeftMargin=بائیں مارجن
+TopMargin=اوپر مارجن
+PaperSize=کاغذ کی قسم
+Orientation=واقفیت
+SpaceX=اسپیس ایکس
+SpaceY=خلائی Y
+FontSize=حرف کا سائز
+Content=مواد
+ContentForLines=ہر پروڈکٹ یا سروس کے لیے ڈسپلے کرنے کے لیے مواد (مواد کے متغیر __LINES__ سے)
+NoticePeriod=نوٹس کی مدت
+NewByMonth=ماہ کے لحاظ سے نیا
+Emails=ای میلز
+EMailsSetup=ای میلز کا سیٹ اپ
+EMailsDesc=یہ صفحہ آپ کو ای میل بھیجنے کے لیے پیرامیٹرز یا اختیارات سیٹ کرنے کی اجازت دیتا ہے۔
+EmailSenderProfiles=ای میل بھیجنے والے پروفائلز
+EMailsSenderProfileDesc=آپ اس حصے کو خالی رکھ سکتے ہیں۔ اگر آپ یہاں کچھ ای میلز درج کرتے ہیں، تو وہ ممکنہ ارسال کنندگان کی فہرست میں شامل کر دی جائیں گی جب آپ نیا ای میل لکھیں گے۔
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS پورٹ (php.ini میں پہلے سے طے شدہ قدر: <b> %s </b> )
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS میزبان (php.ini میں پہلے سے طے شدہ قدر: <b> %s </b> )
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS پورٹ (یونکس جیسے سسٹمز پر پی ایچ پی میں بیان نہیں کیا گیا)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS میزبان (یونکس جیسے سسٹمز پر پی ایچ پی میں بیان نہیں کیا گیا)
+MAIN_MAIL_EMAIL_FROM=خودکار ای میلز کے لیے بھیجنے والا ای میل (php.ini میں ڈیفالٹ ویلیو: <b> %s </b> )
+MAIN_MAIL_ERRORS_TO=غلطی کے لیے استعمال ہونے والی ای میل ای میلز واپس کرتی ہے (بھیجے گئے ای میلز میں فیلڈز 'Errors-To')
+MAIN_MAIL_AUTOCOPY_TO= تمام بھیجی گئی ای میلز کو کاپی (Bcc) کریں۔
+MAIN_DISABLE_ALL_MAILS=تمام ای میل بھیجنے کو غیر فعال کریں (ٹیسٹ کے مقاصد یا ڈیمو کے لیے)
+MAIN_MAIL_FORCE_SENDTO=تمام ای میلز کو بھیجیں (حقیقی وصول کنندگان کے بجائے، آزمائشی مقاصد کے لیے)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=نیا ای میل لکھتے وقت پہلے سے طے شدہ وصول کنندہ کی فہرست میں ملازمین کی ای میلز (اگر وضاحت کی گئی ہو) تجویز کریں۔
+MAIN_MAIL_SENDMODE=ای میل بھیجنے کا طریقہ
+MAIN_MAIL_SMTPS_ID=SMTP ID (اگر سرور بھیجنے کے لیے تصدیق کی ضرورت ہو)
+MAIN_MAIL_SMTPS_PW=SMTP پاس ورڈ (اگر سرور بھیجنے کے لیے تصدیق کی ضرورت ہے)
+MAIN_MAIL_EMAIL_TLS=TLS (SSL) انکرپشن استعمال کریں۔
+MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) انکرپشن استعمال کریں۔
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=les سرٹیفکیٹس کو خودکار دستخطوں کی اجازت دیں۔
+MAIN_MAIL_EMAIL_DKIM_ENABLED=ای میل دستخط بنانے کے لیے DKIM استعمال کریں۔
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=dkim کے ساتھ استعمال کے لیے ای میل ڈومین
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=dkim سلیکٹر کا نام
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=dkim پر دستخط کرنے کے لیے نجی کلید
+MAIN_DISABLE_ALL_SMS=تمام ایس ایم ایس بھیجنے کو غیر فعال کریں (ٹیسٹ کے مقاصد یا ڈیمو کے لیے)
+MAIN_SMS_SENDMODE=SMS بھیجنے کے لیے استعمال کرنے کا طریقہ
+MAIN_MAIL_SMS_FROM=ایس ایم ایس بھیجنے کے لیے ڈیفالٹ بھیجنے والے کا فون نمبر
+MAIN_MAIL_DEFAULT_FROMTYPE=دستی بھیجنے کے لیے ڈیفالٹ بھیجنے والا ای میل (صارف کا ای میل یا کمپنی کا ای میل)
+UserEmail=صارف کا ای میل
+CompanyEmail=کمپنی کا ای میل
+FeatureNotAvailableOnLinux=فیچر یونکس جیسے سسٹمز پر دستیاب نہیں ہے۔ مقامی طور پر اپنے بھیجے گئے میل پروگرام کی جانچ کریں۔
+FixOnTransifex=پروجیکٹ کے آن لائن ترجمہ پلیٹ فارم پر ترجمہ کو درست کریں۔
+SubmitTranslation=اگر اس زبان کا ترجمہ مکمل نہیں ہے یا آپ کو غلطیاں نظر آتی ہیں، تو آپ ڈائرکٹری میں فائلوں میں ترمیم کر کے اسے درست کر سکتے ہیں
+SubmitTranslationENUS=اگر اس زبان کا ترجمہ مکمل نہیں ہے یا آپ کو غلطیاں نظر آتی ہیں، تو آپ فائلوں کو ڈائرکٹری <b> langs/%s </b> میں ترمیم کر کے اسے درست کر سکتے ہیں اور ترمیم شدہ فائلیں dolibarr.org/forum پر جمع کر سکتے ہیں یا، اگر آپ gPR کے ساتھ ہیں .com/Dolibarr/dolibarr
+ModuleSetup=ماڈیول سیٹ اپ
+ModulesSetup=ماڈیولز/ایپلیکیشن سیٹ اپ
+ModuleFamilyBase=سسٹم
+ModuleFamilyCrm=کسٹمر ریلیشن شپ مینجمنٹ (CRM)
+ModuleFamilySrm=وینڈر ریلیشنشپ مینجمنٹ (VRM)
+ModuleFamilyProducts=پروڈکٹ مینجمنٹ (PM)
+ModuleFamilyHr=ہیومن ریسورس مینجمنٹ (HR)
+ModuleFamilyProjects=پروجیکٹس/باہمی تعاون کا کام
+ModuleFamilyOther=دیگر
+ModuleFamilyTechnic=ملٹی ماڈیول ٹولز
+ModuleFamilyExperimental=تجرباتی ماڈیولز
+ModuleFamilyFinancial=مالیاتی ماڈیولز (اکاؤنٹنگ/ٹریژری)
+ModuleFamilyECM=الیکٹرانک مواد کا انتظام (ECM)
+ModuleFamilyPortal=ویب سائٹس اور دیگر فرنٹل ایپلیکیشن
+ModuleFamilyInterface=بیرونی نظاموں کے ساتھ انٹرفیس
+MenuHandlers=مینو ہینڈلرز
+MenuAdmin=مینو ایڈیٹر
+DoNotUseInProduction=پیداوار میں استعمال نہ کریں۔
+ThisIsProcessToFollow=اپ گریڈ کا طریقہ کار:
+ThisIsAlternativeProcessToFollow=یہ دستی طور پر کارروائی کرنے کے لیے ایک متبادل سیٹ اپ ہے:
+StepNb=مرحلہ %s
+FindPackageFromWebSite=ایک ایسا پیکیج تلاش کریں جو آپ کو مطلوبہ خصوصیات فراہم کرتا ہو (مثال کے طور پر سرکاری ویب سائٹ %s پر)۔
+DownloadPackageFromWebSite=پیکیج ڈاؤن لوڈ کریں (مثال کے طور پر سرکاری ویب سائٹ %s سے)۔
+UnpackPackageInDolibarrRoot=پیک شدہ فائلوں کو اپنی ڈولیبر سرور ڈائرکٹری میں کھولیں/ان زپ کریں: <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>
+InfDirExample= <br> پھر فائل <strong> دیں conf.php </strong> <br> $ dolibarr_main_url_root_alt = '/ اپنی مرضی کے مطابق' <br> $ dolibarr_main_document_root_alt = '/ راہ / / dolibarr / htdocs / اپنی مرضی کی' <br> ان لائنوں کے ساتھ "#" تبصرہ کر رہے ہیں تو، انہیں فعال کرنے کے لیے اس کا اعلان ، صرف "#" کریکٹر کو ہٹا کر غیر تبصرہ کریں۔
+YouCanSubmitFile=آپ ماڈیول پیکج کی زپ فائل یہاں سے اپ لوڈ کر سکتے ہیں:
+CurrentVersion=Dolibarr موجودہ ورژن
+CallUpdatePage=اس صفحہ پر براؤز کریں جو ڈیٹا بیس کی ساخت اور ڈیٹا کو اپ ڈیٹ کرتا ہے: %s۔
+LastStableVersion=تازہ ترین مستحکم ورژن
+LastActivationDate=تازہ ترین ایکٹیویشن کی تاریخ
+LastActivationAuthor=تازہ ترین ایکٹیویشن مصنف
+LastActivationIP=تازہ ترین ایکٹیویشن آئی پی
+LastActivationVersion=ایکٹیویشن کا تازہ ترین ورژن
+UpdateServerOffline=سرور کو آف لائن اپ ڈیٹ کریں۔
+WithCounter=کاؤنٹر کا انتظام کریں۔
+GenericMaskCodes=آپ کوئی بھی نمبرنگ ماسک درج کر سکتے ہیں۔ اس ماسک میں، درج ذیل ٹیگز استعمال کیے جا سکتے ہیں: <br> <b> {000000} </b> ایک ایسے نمبر سے مطابقت رکھتا ہے جسے ہر %s پر بڑھایا جائے گا۔ کاؤنٹر کی مطلوبہ لمبائی کے طور پر زیادہ سے زیادہ صفر درج کریں۔ کاؤنٹر کو بائیں طرف سے زیرو سے مکمل کیا جائے گا تاکہ ماسک جتنے زیرو ہوں۔ <br> <b> {000000+000} </b> پچھلے والے جیسا ہی ہے لیکن + نشان کے دائیں جانب نمبر کے مطابق ایک آفسیٹ پہلے a0ecb2ecz847 سے شروع ہوتا ہے۔ <br> <b> {000000@x} </b> پچھلے والے جیسا ہی ہے لیکن جب مہینہ x تک پہنچ جاتا ہے تو کاؤنٹر صفر پر ری سیٹ ہو جاتا ہے (x 1 اور 12 کے درمیان، یا 0 آپ کے سال کے ابتدائی مہینوں کو کنفیگر کرنے کے لیے، یا 9 کے ابتدائی مہینوں کو استعمال کرنے کے لیے ہر ماہ صفر پر ری سیٹ کریں)۔ اگر یہ اختیار استعمال کیا جاتا ہے اور 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> یا a0aee8336587 سال سے زیادہ کا نمبر <br>
+GenericMaskCodes2= <b> {cccc} </b> n حروف پر کلائنٹ کا کوڈ گاہک کے لیے وقف یہ کاؤنٹر عالمی کاؤنٹر کے ساتھ ہی دوبارہ ترتیب دیا جاتا ہے۔ <br> <b> {tttt} </b> n حروف پر تیسری پارٹی کی قسم کا کوڈ (مینیو دیکھیں ہوم - سیٹ اپ - ڈکشنری - تھرڈ پارٹیز کی اقسام)۔ اگر آپ یہ ٹیگ شامل کرتے ہیں، تو کاؤنٹر ہر قسم کے تیسرے فریق کے لیے مختلف ہوگا۔ <br>
+GenericMaskCodes3=ماسک میں باقی تمام کردار برقرار رہیں گے۔ <br> خالی جگہوں کی اجازت نہیں ہے۔ <br>
+GenericMaskCodes3EAN=ماسک میں باقی تمام حروف برقرار رہیں گے (سوائے * یا ? EAN13 میں 13ویں پوزیشن پر)۔ <br> خالی جگہوں کی اجازت نہیں ہے۔ <br> EAN13 میں، 13ویں پوزیشن میں آخری } کے بعد آخری حرف * یا ؟ . اسے کیلکولیٹڈ کلید سے بدل دیا جائے گا۔ <br>
+GenericMaskCodes4a= <u> تیسری پارٹی TheCompany کی 99th %s پر مثال، تاریخ 2007-01-31 کے ساتھ: </u> <br>
+GenericMaskCodes4b= <u> تیسری پارٹی کی مثال جو 01-03-2007 کو بنائی گئی: </u> <br>
+GenericMaskCodes4c= <u> 2007-03-01 کو تخلیق کردہ پروڈکٹ کی مثال: </u> <br>
+GenericMaskCodes5= <b> ABC {YY} {میٹر} - {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 a09a4b739f17f17f17f8z0 کے لئے کوڈ کی قسم' کے ساتھ 'کوڈ' کے ساتھ اسکرپٹ کے قابل ہے
+GenericNumRefModelDesc=ایک متعین ماسک کے مطابق حسب ضرورت نمبر لوٹاتا ہے۔
+ServerAvailableOnIPOrPort=سرور <b> <b> %s </b> پورٹ <b> %s a09a4b739f17f80 پر دستیاب ہے۔
+ServerNotAvailableOnIPOrPort=پورٹ <b> <b> %s </b> پر سرور دستیاب نہیں ہے <b> %s a09a4b739f178
+DoTestServerAvailability=سرور کنیکٹیویٹی کی جانچ کریں۔
+DoTestSend=ٹیسٹ بھیجنا
+DoTestSendHTML=HTML بھیجنے کی جانچ کریں۔
+ErrorCantUseRazIfNoYearInMask=خرابی، اگر ترتیب {yy} یا {yyyy} ماسک میں نہیں ہے تو ہر سال کاؤنٹر کو دوبارہ ترتیب دینے کے لیے @ آپشن کا استعمال نہیں کر سکتے۔
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=خرابی، اگر ترتیب {yy}{mm} یا {yyyy}{mm} ماسک میں نہیں ہے تو @ آپشن استعمال نہیں کر سکتے۔
+UMask=Unix/Linux/BSD/Mac فائل سسٹم پر نئی فائلوں کے لیے UMask پیرامیٹر۔
+UMaskExplanation=یہ پیرامیٹر آپ کو سرور پر Dolibarr کی طرف سے بنائی گئی فائلوں پر بطور ڈیفالٹ سیٹ اجازتوں کی وضاحت کرنے کی اجازت دیتا ہے (مثال کے طور پر اپ لوڈ کے دوران)۔ <br> یہ آکٹل قدر ہونی چاہیے (مثال کے طور پر، 0666 کا مطلب ہے سب کے لیے پڑھنا اور لکھنا)۔ <br> یہ پیرامیٹر ونڈوز سرور پر بیکار ہے۔
+SeeWikiForAllTeam=شراکت داروں اور ان کی تنظیم کی فہرست کے لیے وکی صفحہ پر ایک نظر ڈالیں۔
+UseACacheDelay= ایکسپورٹ رسپانس کو سیکنڈ میں کیش کرنے میں تاخیر (0 یا بغیر کیشے کے خالی)
+DisableLinkToHelpCenter=لاگ ان پیج پر لنک کو چھپائیں "<b> مدد کی ضرورت ہے یا </b>"
+DisableLinkToHelp=آن لائن مدد کا لنک چھپائیں "<b> %s </b>"
+AddCRIfTooLong=کوئی خودکار ٹیکسٹ ریپنگ نہیں ہے، بہت لمبا متن دستاویزات پر ظاہر نہیں ہوگا۔ اگر ضرورت ہو تو ٹیکسٹ ایریا میں کیریج ریٹرن شامل کریں۔
+ConfirmPurge=کیا آپ واقعی اس پرج کو انجام دینا چاہتے ہیں؟ <br> یہ آپ کی تمام ڈیٹا فائلوں کو مستقل طور پر حذف کر دے گا جس کو بحال کرنے کا کوئی طریقہ نہیں ہے (ECM فائلیں، منسلک فائلیں...)
+MinLength=کم از کم لمبائی
+LanguageFilesCachedIntoShmopSharedMemory=فائلیں .lang مشترکہ میموری میں بھری ہوئی ہیں۔
+LanguageFile=زبان کی فائل
+ExamplesWithCurrentSetup=موجودہ ترتیب کے ساتھ مثالیں۔
+ListOfDirectories=OpenDocument ٹیمپلیٹس ڈائریکٹریز کی فہرست
+ListOfDirectoriesForModelGenODT=OpenDocument فارمیٹ کے ساتھ ٹیمپلیٹس فائلوں پر مشتمل ڈائریکٹریز کی فہرست۔ <br> <br> یہاں ڈائریکٹریز کا پورا راستہ رکھیں۔ <br> eah ڈائریکٹری کے درمیان کیریج ریٹرن شامل کریں۔ <br> GED ماڈیول کی ڈائرکٹری شامل کرنے کے لیے، یہاں شامل کریں <b> DOL_DATA_ROOT/ecm/yourdirectoryname </b> ۔ <br> <br> ان ڈائرکٹریز میں فائلوں کا اختتام <b> .odt </b> یا <b> .ods a09fzb74a.
+NumberOfModelFilesFound=ان ڈائریکٹریوں میں پائی جانے والی ODT/ODS ٹیمپلیٹ فائلوں کی تعداد
+ExampleOfDirectoriesForModelGen=نحو کی مثالیں: <br> c:\\myapp\\mydocumentdir\\mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/Mydocumentdir
+FollowingSubstitutionKeysCanBeUsed= <br> اپنے odt دستاویز کے سانچوں کو بنانے کا طریقہ جاننے کے لیے، ان ڈائریکٹریوں میں ذخیرہ کرنے سے پہلے، ویکی دستاویزات پڑھیں:
+FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
+FirstnameNamePosition=نام/آخری نام کی پوزیشن
+DescWeather=درج ذیل تصاویر ڈیش بورڈ پر دکھائی جائیں گی جب دیر سے ہونے والی کارروائیوں کی تعداد درج ذیل اقدار تک پہنچ جائے گی۔
+KeyForWebServicesAccess=ویب سروسز استعمال کرنے کی کلید (ویب سروسز میں پیرامیٹر "ڈولیبارکی")
+TestSubmitForm=ان پٹ ٹیسٹ فارم
+ThisForceAlsoTheme=اس مینو مینیجر کو استعمال کرنے سے اس کی اپنی تھیم بھی استعمال ہو گی جو بھی صارف کی پسند ہے۔ اس کے علاوہ اسمارٹ فونز کے لیے مخصوص یہ مینو مینیجر تمام اسمارٹ فونز پر کام نہیں کرتا ہے۔ اگر آپ کو اپنے مینو مینیجر کے ساتھ مسائل کا سامنا ہے تو دوسرا مینو مینیجر استعمال کریں۔
+ThemeDir=کھالوں کی ڈائرکٹری
+ConnectionTimeout=رابطے کا وقت ختم
+ResponseTimeout=جواب کا ٹائم آؤٹ
+SmsTestMessage=ٹیسٹ پیغام __PHONEFROM__ سے __PHONETO__ تک
+ModuleMustBeEnabledFirst=اگر آپ کو اس خصوصیت کی ضرورت ہو تو پہلے ماڈیول <b> %s </b> کو فعال کرنا ضروری ہے۔
+SecurityToken=یو آر ایل کو محفوظ کرنے کی کلید
+NoSmsEngine=کوئی SMS بھیجنے والا مینیجر دستیاب نہیں ہے۔ ایس ایم ایس بھیجنے والا مینیجر ڈیفالٹ ڈسٹری بیوشن کے ساتھ انسٹال نہیں ہوتا ہے کیونکہ وہ کسی بیرونی وینڈر پر منحصر ہوتا ہے، لیکن آپ کو کچھ %s پر مل سکتے ہیں۔
+PDF=PDF
+PDFDesc=پی ڈی ایف نسل کے لیے عالمی اختیارات
+PDFOtherDesc=کچھ ماڈیولز کے لیے مخصوص پی ڈی ایف آپشن
+PDFAddressForging=ایڈریس سیکشن کے قواعد
+HideAnyVATInformationOnPDF=سیلز ٹیکس / VAT سے متعلق تمام معلومات چھپائیں۔
+PDFRulesForSalesTax=سیلز ٹیکس / VAT کے قواعد
+PDFLocaltax=%s کے قواعد
+HideLocalTaxOnPDF=کالم سیل ٹیکس / VAT میں %s کی شرح چھپائیں
+HideDescOnPDF=مصنوعات کی تفصیل چھپائیں۔
+HideRefOnPDF=مصنوعات کا حوالہ چھپائیں۔
+HideDetailsOnPDF=پروڈکٹ لائنز کی تفصیلات چھپائیں۔
+PlaceCustomerAddressToIsoLocation=کسٹمر ایڈریس پوزیشن کے لیے فرانسیسی معیاری پوزیشن (لا پوسٹ) کا استعمال کریں۔
+Library=کتب خانہ
+UrlGenerationParameters=URLs کو محفوظ کرنے کے لیے پیرامیٹر
+SecurityTokenIsUnique=ہر یو آر ایل کے لیے ایک منفرد سیکیورکی پیرامیٹر استعمال کریں۔
+EnterRefToBuildUrl=آبجیکٹ %s کے لیے حوالہ درج کریں۔
+GetSecuredUrl=حسابی یو آر ایل حاصل کریں۔
+ButtonHideUnauthorized=اندرونی صارفین کے لیے بھی غیر مجاز ایکشن بٹن چھپائیں (بصورت دیگر صرف خاکستری)
+OldVATRates=VAT کی پرانی شرح
+NewVATRates=VAT کی نئی شرح
+PriceBaseTypeToChange=پر بیان کردہ بنیادی حوالہ قدر کے ساتھ قیمتوں میں ترمیم کریں۔
+MassConvert=بلک تبادلوں کا آغاز کریں۔
+PriceFormatInCurrentLanguage=موجودہ زبان میں قیمت کی شکل
+String=تار
+String1Line=سٹرنگ (1 لائن)
+TextLong=لمبا متن
+TextLongNLines=لمبا متن (n لائنز)
+HtmlText=ایچ ٹی ایم ایل متن
+Int=انٹیجر
+Float=تیرنا
+DateAndTime=تاریخ اور گھنٹہ
+Unique=منفرد
+Boolean=بولین (ایک چیک باکس)
+ExtrafieldPhone = فون
+ExtrafieldPrice = قیمت
+ExtrafieldMail = ای میل
+ExtrafieldUrl = یو آر ایل
+ExtrafieldSelect = فہرست منتخب کریں۔
+ExtrafieldSelectList = ٹیبل سے منتخب کریں۔
+ExtrafieldSeparator=الگ کرنے والا (فیلڈ نہیں)
+ExtrafieldPassword=پاس ورڈ
+ExtrafieldRadio=ریڈیو بٹن (صرف ایک انتخاب)
+ExtrafieldCheckBox=چیک باکسز
+ExtrafieldCheckBoxFromList=میز سے چیک باکسز
+ExtrafieldLink=کسی چیز سے لنک کریں۔
+ComputedFormula=شمار شدہ فیلڈ
+ComputedFormulaDesc=ڈائنامک کمپیوٹیڈ ویلیو حاصل کرنے کے لیے آپ یہاں آبجیکٹ کی دیگر خصوصیات یا کسی بھی پی ایچ پی کوڈنگ کا استعمال کرتے ہوئے ایک فارمولا درج کر سکتے ہیں۔ آپ کسی بھی پی ایچ پی کے موافق فارمولے استعمال کر سکتے ہیں بشمول "؟" حالت آپریٹر، اور مندرجہ ذیل عالمی آبجیکٹ: <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->, oct (subject)) ) <br> <br> آبجیکٹ کو دوبارہ لوڈ کرنے کی مثال >rowid: $object->id)) > 0))؟ $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1' <br> <br> آبجیکٹ اور اس کے بنیادی آبجیکٹ کو زبردستی لوڈ کرنے کے فارمولے کی دوسری مثال ((a031b$dskf=f$d9b0$bload )) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'پیرنٹ پروجیکٹ نہیں ملا'
+Computedpersistent=حسابی فیلڈ اسٹور کریں۔
+ComputedpersistentDesc=کمپیوٹ شدہ اضافی فیلڈز کو ڈیٹا بیس میں اسٹور کیا جائے گا، تاہم، اس فیلڈ کی آبجیکٹ کو تبدیل کرنے پر ہی قدر کی دوبارہ گنتی کی جائے گی۔ اگر کمپیوٹنگ فیلڈ دیگر اشیاء یا عالمی ڈیٹا پر منحصر ہے تو یہ قدر غلط ہو سکتی ہے!!
+ExtrafieldParamHelpPassword=اس فیلڈ کو خالی چھوڑنے کا مطلب ہے کہ اس قدر کو بغیر خفیہ کاری کے محفوظ کیا جائے گا (فیلڈ صرف اسکرین پر ستارے کے ساتھ چھپا ہوا ہونا چاہیے)۔ <br> ڈیٹا بیس میں پاس ورڈ کو محفوظ کرنے کے لیے ڈیفالٹ انکرپشن رول کو استعمال کرنے کے لیے 'آٹو' سیٹ کریں (پھر ویلیو ریڈ صرف ہیش ہوگی، اصل قدر کو بازیافت کرنے کا کوئی طریقہ نہیں)
+ExtrafieldParamHelpselect=اقدار کی فہرست شکل کلید کے ساتھ لائنوں کا ہونا لازمی ہے، قدر (جہاں چابی نہیں ہو سکتا '0') مثال کے <br> <br>: <br> 1، VALUE1 <br> 2، VALUE2 <br> code3، value3 <br> ... <br> <br> ہے کرنے کے لئے فہرست ایک اور اعزازی وصف فہرست پر منحصر: <br> 1، VALUE1 | options_ <i> parent_list_code </i>: parent_key <br> 2، VALUE2 | options_ <i> parent_list_code </i>: parent_key <br> <br> واسطے ایک اور فہرست کے لحاظ فہرست ہے کرنا: <br> 1، VALUE1 | <i> parent_list_code </i> :parent_key <br> 2,value2| <i> parent_list_code </i> :parent_key
+ExtrafieldParamHelpcheckbox=اقدار کی فہرست فارمیٹ کلید کے ساتھ لائنوں میں ہونی چاہیے، ویلیو (جہاں کلید '0' نہیں ہو سکتی) <br> <br> مثال کے طور پر: <br> 1,value1 <br> <br> a0342fda19bz0 2,342fdavalue...
+ExtrafieldParamHelpradio=اقدار کی فہرست فارمیٹ کلید کے ساتھ لائنوں میں ہونی چاہیے، ویلیو (جہاں کلید '0' نہیں ہو سکتی) <br> <br> مثال کے طور پر: <br> 1,value1 <br> <br> a0342fda19bz0 2,342fdavalue...
+ExtrafieldParamHelpsellist=table_name: label_field: اقدار کی فہرست نحو <br> ایک میز سے آتا id_field :: filtersql <br> مثال: c_typent: libelle: ID :: filtersql <br> <br> - id_field necessarly ایک بنیادی INT چابی <br> ہے - filtersql ایک SQL شرط ہے. صرف ایکٹیو ویلیو <br> ظاہر کرنے کے لیے یہ ایک سادہ ٹیسٹ (مثلاً فعال=1) ہو سکتا ہے آپ فلٹر میں $ID$ بھی استعمال کر سکتے ہیں جو کہ موجودہ آبجیکٹ <br> کی موجودہ آئی ڈی ہے فلٹر میں SELECT استعمال کرنے کے لیے مطلوبہ لفظ $SEL$ کا استعمال کریں۔ بائی پاس اینٹی انجکشن تحفظ. <br> اگر آپ ایکسٹرا فیلڈز پر فلٹر کرنا چاہتے ہیں تو نحو کا استعمال کریں extra.fieldcode=... (جہاں فیلڈ کوڈ ایکسٹرا فیلڈ کا کوڈ ہوتا ہے) <br> <br> ایک اور تکمیلی وصف کی فہرست پر منحصر فہرست رکھنے کے لیے: <br> <i> parent_list_code </i> | parent_column: |: فلٹر <br> c_typent: libelle: ID parent_column <i> parent_list_code </i> ایک اور فہرست کے لحاظ فہرست حاصل کرنے کے لیے فلٹر <br> <br>
+ExtrafieldParamHelpchkbxlst=اقدار کی فہرست ایک ٹیبل سے آتی ہے فلٹر ڈائن میں $ID$ بھی استعمال کر سکتے ہیں موجودہ آبجیکٹ <br> کی موجودہ آئی ڈی ہے 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
+ExtrafieldParamHelplink=پیرامیٹرز کا ہونا ضروری ہے ObjectName:Classpath <br> نحو: ObjectName:Classpath
+ExtrafieldParamHelpSeparator=ایک سادہ سیپریٹر کے لیے خالی رکھیں اسٹیٹس کو ہر صارف کے سیشن کے لیے رکھا جاتا ہے)
+LibraryToBuildPDF=لائبریری PDF جنریشن کے لیے استعمال ہوتی ہے۔
+LocalTaxDesc=کچھ ممالک ہر انوائس لائن پر دو یا تین ٹیکس لگا سکتے ہیں۔ اگر ایسا ہے تو، دوسرے اور تیسرے ٹیکس اور اس کی شرح کے لیے قسم کا انتخاب کریں۔ ممکنہ قسمیں ہیں: <br> 1: مقامی ٹیکس بغیر ویٹ کے مصنوعات اور خدمات پر لاگو ہوتا ہے (لوکل ٹیکس بغیر ٹیکس کے رقم پر لگایا جاتا ہے) <br> 2: مصنوعات اور خدمات پر لوکل ٹیکس لاگو ہوتا ہے بشمول وٹ (لوکل ٹیکس کا حساب رقم + اہم ٹیکس پر ہوتا ہے) <br> مقامی ٹیکس بغیر ویٹ کے مصنوعات پر لاگو ہوتا ہے (لوکل ٹیکس بغیر ٹیکس کے رقم پر لگایا جاتا ہے) <br> 4: مصنوعات پر لوکل ٹیکس لاگو ہوتا ہے بشمول vat (لوکل ٹیکس کا حساب رقم + مین وٹ پر ہوتا ہے) <br> 5: بغیر وٹ کے خدمات پر لوکل ٹیکس لاگو ہوتا ہے (لوکلٹیکس بغیر ٹیکس کے رقم پر) <br> 6: لوکل ٹیکس کا اطلاق وٹ سمیت خدمات پر ہوتا ہے (مقامی ٹیکس کا حساب رقم + ٹیکس پر ہوتا ہے)
+SMS=پیغام
+LinkToTestClickToDial=صارف <strong> %s </strong> کے لیے ClickToDial url کی جانچ کرنے کے لیے ایک لنک دکھانے کے لیے کال کرنے کے لیے ایک فون نمبر درج کریں۔
+RefreshPhoneLink=لنک ریفریش کریں۔
+LinkToTest=صارف <strong> %s </strong> کے لیے قابل کلک لنک تیار کیا گیا (ٹیسٹ کرنے کے لیے فون نمبر پر کلک کریں)
+KeepEmptyToUseDefault=ڈیفالٹ قدر استعمال کرنے کے لیے خالی رکھیں
+KeepThisEmptyInMostCases=زیادہ تر معاملات میں، آپ اس فیلڈ کو خالی رکھ سکتے ہیں۔
+DefaultLink=پہلے سے طے شدہ لنک
+SetAsDefault=ڈیفالٹ کے طور پر مقرر
+ValueOverwrittenByUserSetup=انتباہ، یہ قدر صارف کے مخصوص سیٹ اپ کے ذریعے اوور رائٹ ہو سکتی ہے (ہر صارف اپنا کلک ٹوڈیل یو آر ایل سیٹ کر سکتا ہے)
+ExternalModule=بیرونی ماڈیول
+InstalledInto=ڈائرکٹری %s میں انسٹال ہے۔
+BarcodeInitForThirdparties=فریق ثالث کے لیے بڑے پیمانے پر بارکوڈ init
+BarcodeInitForProductsOrServices=بڑے پیمانے پر بارکوڈ شروع کریں یا مصنوعات یا خدمات کے لیے دوبارہ ترتیب دیں۔
+CurrentlyNWithoutBarCode=فی الحال، آپ کے پاس <strong> %s </strong> ریکارڈ ہے
+InitEmptyBarCode=اگلے %s خالی ریکارڈز کے لیے ابتدائی قدر
+EraseAllCurrentBarCode=تمام موجودہ بارکوڈ اقدار کو مٹا دیں۔
+ConfirmEraseAllCurrentBarCode=کیا آپ واقعی بارکوڈ کی تمام موجودہ اقدار کو مٹانا چاہتے ہیں؟
+AllBarcodeReset=بارکوڈ کی تمام اقدار کو ہٹا دیا گیا ہے۔
+NoBarcodeNumberingTemplateDefined=بارکوڈ ماڈیول سیٹ اپ میں نمبرنگ بارکوڈ ٹیمپلیٹ فعال نہیں ہے۔
+EnableFileCache=فائل کیشے کو فعال کریں۔
+ShowDetailsInPDFPageFoot=فوٹر میں مزید تفصیلات شامل کریں، جیسے کمپنی کا پتہ یا مینیجر کے نام (پیشہ ورانہ آئی ڈی، کمپنی کیپٹل اور VAT نمبر کے علاوہ)۔
+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 پتوں تک محدود کرنے کی ضرورت ہے (بہت کم)، یہ آپ کی ERP CRM درخواست کے لیے میل صارف ایجنٹ (MUA) کا IP پتہ ہے: <strong> %s </strong>۔
+WarningPHPMailSPF=اگر آپ کے بھیجنے والے کے ای میل ایڈریس میں موجود ڈومین کا نام SPF ریکارڈ کے ذریعے محفوظ ہے (اپنے ڈومین نام کے رجسٹرار سے پوچھیں)، تو آپ کو اپنے ڈومین کے DNS کے SPF ریکارڈ میں درج ذیل آئی پیز کو شامل کرنا ہوگا: <strong> %s a0a65d071f6f6fz0.
+ActualMailSPFRecordFound=اصل SPF ریکارڈ ملا: %s
+ClickToShowDescription=تفصیل دکھانے کے لیے کلک کریں۔
+DependsOn=اس ماڈیول کو ماڈیول کی ضرورت ہے
+RequiredBy=یہ ماڈیول ماڈیول (زبانوں) کو درکار ہے
+TheKeyIsTheNameOfHtmlField=یہ HTML فیلڈ کا نام ہے۔ کسی فیلڈ کا کلیدی نام حاصل کرنے کے لیے HTML صفحہ کے مواد کو پڑھنے کے لیے تکنیکی علم کی ضرورت ہوتی ہے۔
+PageUrlForDefaultValues=آپ کو صفحہ کے URL کا رشتہ دار راستہ درج کرنا ہوگا۔ اگر آپ URL میں پیرامیٹرز کو شامل کرتے ہیں، تو ڈیفالٹ قدریں مؤثر ہوں گی اگر تمام پیرامیٹرز ایک ہی قدر پر سیٹ ہوں۔
+PageUrlForDefaultValuesCreate= <br> مثال: <br> ایک نیا فریق ثالث بنانے کے لیے، یہ ہے <strong> %s </strong> ۔ <br> کسٹم ڈائرکٹری میں نصب بیرونی ماڈیولز کے URL کے لیے، "کسٹم/" شامل نہ کریں، اس لیے <strong> mymodule/mypage.php </strong> جیسا راستہ استعمال کریں نہ کہ custom/mymodule/mypage.php۔ <br> اگر آپ صرف اس صورت میں ڈیفالٹ قدر چاہتے ہیں جب url میں کچھ پیرامیٹر ہو تو آپ <strong> %s </strong> استعمال کرسکتے ہیں۔
+PageUrlForDefaultValuesList= <br> مثال: <br> تیسرے فریقوں کی فہرست والے صفحہ کے لیے، یہ <strong> %s </strong> ہے۔ <br> کسٹم ڈائرکٹری میں نصب بیرونی ماڈیولز کے URL کے لیے، "کسٹم/" شامل نہ کریں اس لیے <strong> mymodule/mypagelist.php </strong> جیسا راستہ استعمال کریں نہ کہ custom/mymodule/mypage.list. <br> اگر آپ صرف اس صورت میں ڈیفالٹ قدر چاہتے ہیں جب url میں کچھ پیرامیٹر ہو تو آپ <strong> %s </strong> استعمال کرسکتے ہیں۔
+AlsoDefaultValuesAreEffectiveForActionCreate=یہ بھی نوٹ کریں کہ فارم بنانے کے لیے پہلے سے طے شدہ اقدار کو اوور رائٹنگ کرنا صرف ان صفحات کے لیے کام کرتا ہے جو درست طریقے سے ڈیزائن کیے گئے تھے (لہذا پیرامیٹر ایکشن = تخلیق یا پیش کریں...)
+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=عام پرائیویٹ ڈائرکٹری کو فعال کریں (ویب ڈی اے وی ڈیڈیکیٹڈ ڈائرکٹری جس کا نام "پرائیویٹ" ہے - لاگ ان درکار ہے)
+DAV_ALLOW_PRIVATE_DIRTooltip=عام پرائیویٹ ڈائرکٹری ایک WebDAV ڈائرکٹری ہے جس تک کوئی بھی اس کے ایپلیکیشن لاگ ان/پاس سے رسائی حاصل کرسکتا ہے۔
+DAV_ALLOW_PUBLIC_DIR=عام پبلک ڈائرکٹری کو فعال کریں (ویب ڈی اے وی کی سرشار ڈائریکٹری جس کا نام "عوامی" ہے - لاگ ان کی ضرورت نہیں ہے)
+DAV_ALLOW_PUBLIC_DIRTooltip=عام پبلک ڈائرکٹری ایک WebDAV ڈائرکٹری ہے جو کوئی بھی رسائی کر سکتا ہے (پڑھنے اور لکھنے کے موڈ میں)، بغیر کسی اجازت کے (لاگ ان/پاس ورڈ اکاؤنٹ)۔
+DAV_ALLOW_ECM_DIR=DMS/ECM نجی ڈائریکٹری کو فعال کریں (DMS/ECM ماڈیول کی روٹ ڈائرکٹری - لاگ ان درکار ہے)
+DAV_ALLOW_ECM_DIRTooltip=روٹ ڈائرکٹری جہاں DMS/ECM ماڈیول استعمال کرتے وقت تمام فائلیں دستی طور پر اپ لوڈ کی جاتی ہیں۔ اسی طرح ویب انٹرفیس سے رسائی کے طور پر، آپ کو اس تک رسائی کے لیے مناسب اجازت کے ساتھ ایک درست لاگ ان/پاس ورڈ کی ضرورت ہوگی۔
+# Modules
+Module0Name=صارفین اور گروپس
+Module0Desc=صارفین / ملازمین اور گروپوں کا انتظام
+Module1Name=تیسرے فریقوں
+Module1Desc=کمپنیاں اور رابطوں کا انتظام (گاہک، امکانات...)
+Module2Name=کمرشل
+Module2Desc=کمرشل مینجمنٹ
+Module10Name=اکاؤنٹنگ (آسان)
+Module10Desc=ڈیٹا بیس کے مواد پر مبنی سادہ اکاؤنٹنگ رپورٹس (جرائد، کاروبار)۔ کوئی لیجر ٹیبل استعمال نہیں کرتا ہے۔
+Module20Name=تجاویز
+Module20Desc=تجارتی تجویز کا انتظام
+Module22Name=بڑے پیمانے پر ای میلز
+Module22Desc=بلک ای میل کا نظم کریں۔
+Module23Name=توانائی
+Module23Desc=توانائی کی کھپت کی نگرانی
+Module25Name=سیلز آرڈرز
+Module25Desc=سیلز آرڈر مینجمنٹ
+Module30Name=رسیدیں
+Module30Desc=صارفین کے لیے رسیدوں اور کریڈٹ نوٹوں کا انتظام۔ سپلائرز کے لیے رسیدوں اور کریڈٹ نوٹوں کا انتظام
+Module40Name=فروش
+Module40Desc=وینڈرز اور پرچیز مینجمنٹ (پرچیز آرڈرز اور سپلائر انوائس کی بلنگ)
+Module42Name=ڈیبگ لاگز
+Module42Desc=لاگنگ کی سہولیات (فائل، syslog، ...) اس طرح کے لاگز تکنیکی/ڈیبگ مقاصد کے لیے ہیں۔
+Module43Name=ڈیبگ بار
+Module43Desc=آپ کے براؤزر میں ڈیبگ بار شامل کرنے والے ڈویلپر کے لیے ایک ٹول۔
+Module49Name=ایڈیٹرز
+Module49Desc=ایڈیٹر مینجمنٹ
+Module50Name=مصنوعات
+Module50Desc=مصنوعات کا انتظام
+Module51Name=بڑے پیمانے پر میلنگز
+Module51Desc=ماس پیپر میلنگ کا انتظام
+Module52Name=اسٹاکس
+Module52Desc=اسٹاک مینجمنٹ
+Module53Name=خدمات
+Module53Desc=خدمات کا انتظام
+Module54Name=معاہدے/سبسکرپشنز
+Module54Desc=معاہدوں کا انتظام (خدمات یا بار بار چلنے والی سبسکرپشنز)
+Module55Name=بارکوڈز
+Module55Desc=بارکوڈ یا کیو آر کوڈ کا انتظام
+Module56Name=کریڈٹ ٹرانسفر کے ذریعے ادائیگی
+Module56Desc=کریڈٹ ٹرانسفر آرڈرز کے ذریعے سپلائرز کی ادائیگی کا انتظام۔ اس میں یورپی ممالک کے لیے SEPA فائل کی جنریشن شامل ہے۔
+Module57Name=براہ راست ڈیبٹ کے ذریعے ادائیگیاں
+Module57Desc=ڈائریکٹ ڈیبٹ آرڈرز کا انتظام۔ اس میں یورپی ممالک کے لیے SEPA فائل کی جنریشن شامل ہے۔
+Module58Name=کلک ٹو ڈائل
+Module58Desc=ClickToDial سسٹم کا انضمام (Asterisk, ...)
+Module60Name=اسٹیکرز
+Module60Desc=اسٹیکرز کا انتظام
+Module70Name=مداخلتیں
+Module70Desc=مداخلت کا انتظام
+Module75Name=اخراجات اور سفر کے نوٹ
+Module75Desc=اخراجات اور سفر کے نوٹس کا انتظام
+Module80Name=شپمنٹس
+Module80Desc=ترسیل اور ترسیل کے نوٹ کا انتظام
+Module85Name=بینک اور کیش
+Module85Desc=بینک یا نقد کھاتوں کا انتظام
+Module100Name=بیرونی سائٹ
+Module100Desc=مین مینو آئیکن کے طور پر کسی بیرونی ویب سائٹ کا لنک شامل کریں۔ ویب سائٹ کو اوپر والے مینو کے نیچے ایک فریم میں دکھایا گیا ہے۔
+Module105Name=میل مین اور SPIP
+Module105Desc=ممبر ماڈیول کے لیے میل مین یا SPIP انٹرفیس
+Module200Name=ایل ڈی اے پی
+Module200Desc=LDAP ڈائریکٹری ہم وقت سازی
+Module210Name=پوسٹ نیوک
+Module210Desc=پوسٹ نیوک انضمام
+Module240Name=ڈیٹا ایکسپورٹ
+Module240Desc=Dolibarr ڈیٹا برآمد کرنے کا ٹول (مدد کے ساتھ)
+Module250Name=ڈیٹا کی درآمدات
+Module250Desc=Dolibarr میں ڈیٹا درآمد کرنے کا ٹول (مدد کے ساتھ)
+Module310Name=ممبران
+Module310Desc=فاؤنڈیشن کے اراکین کا انتظام
+Module320Name=آر ایس ایس فیڈ
+Module320Desc=Dolibarr صفحات پر RSS فیڈ شامل کریں۔
+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=Mantis انضمام
+Module1520Name=دستاویز کی تخلیق
+Module1520Desc=بڑے پیمانے پر ای میل دستاویز تیار کرنا
+Module1780Name=ٹیگز/زمرہیں۔
+Module1780Desc=ٹیگ/زمرہ بنائیں (مصنوعات، گاہک، سپلائرز، رابطے یا اراکین)
+Module2000Name=WYSIWYG ایڈیٹر
+Module2000Desc=CKEditor (html) کا استعمال کرتے ہوئے ٹیکسٹ فیلڈز میں ترمیم/فارمیٹ کرنے کی اجازت دیں
+Module2200Name=متحرک قیمتیں
+Module2200Desc=قیمتوں کی خودکار تخلیق کے لیے ریاضی کے تاثرات استعمال کریں۔
+Module2300Name=طے شدہ ملازمتیں۔
+Module2300Desc=طے شدہ ملازمتوں کا انتظام (عرف کرون یا کرونو ٹیبل)
+Module2400Name=تقریبات/ایجنڈا
+Module2400Desc=واقعات کو ٹریک کریں۔ ٹریکنگ کے مقاصد کے لیے خودکار ایونٹس کو لاگ کریں یا دستی ایونٹس یا میٹنگز کو ریکارڈ کریں۔ یہ اچھے کسٹمر یا وینڈر ریلیشن شپ مینجمنٹ کے لیے پرنسپل ماڈیول ہے۔
+Module2500Name=ڈی ایم ایس / ای سی ایم
+Module2500Desc=دستاویز مینجمنٹ سسٹم / الیکٹرانک مواد کا انتظام۔ آپ کے تیار کردہ یا ذخیرہ شدہ دستاویزات کی خودکار تنظیم۔ جب آپ کو ضرورت ہو تو ان کا اشتراک کریں۔
+Module2600Name=API/ویب خدمات (SOAP سرور)
+Module2600Desc=API خدمات فراہم کرنے والے Dolibarr SOAP سرور کو فعال کریں۔
+Module2610Name=API/ویب خدمات (REST سرور)
+Module2610Desc=API خدمات فراہم کرنے والے Dolibarr REST سرور کو فعال کریں۔
+Module2660Name=ویب سروسز کو کال کریں (SOAP کلائنٹ)
+Module2660Desc=Dolibarr ویب سروسز کلائنٹ کو فعال کریں (ڈیٹا/درخواستوں کو بیرونی سرورز تک پہنچانے کے لیے استعمال کیا جا سکتا ہے۔ فی الحال صرف پرچیز آرڈرز سپورٹ ہیں۔)
+Module2700Name=Gravatar
+Module2700Desc=صارفین/ممبران کی تصویر دکھانے کے لیے آن لائن Gravatar سروس (www.gravatar.com) استعمال کریں (ان کے ای میلز کے ساتھ ملیں)۔ انٹرنیٹ تک رسائی کی ضرورت ہے۔
+Module2800Desc=ایف ٹی پی کلائنٹ
+Module2900Name=GeoIPMaxmind
+Module2900Desc=GeoIP میکس مائنڈ تبادلوں کی صلاحیتیں۔
+Module3200Name=ناقابل تبدیلی آرکائیوز
+Module3200Desc=کاروباری واقعات کا ایک غیر تبدیل شدہ لاگ کو فعال کریں۔ واقعات کو حقیقی وقت میں محفوظ کیا جاتا ہے۔ لاگ ان زنجیروں سے جڑے واقعات کی صرف پڑھنے کے لیے جدول ہے جسے برآمد کیا جا سکتا ہے۔ یہ ماڈیول کچھ ممالک کے لیے لازمی ہو سکتا ہے۔
+Module3400Name=سوشل نیٹ ورک
+Module3400Desc=سوشل نیٹ ورکس فیلڈز کو تھرڈ پارٹیز اور ایڈریسز (سکائپ، ٹویٹر، فیس بک، ...) میں فعال کریں۔
+Module4000Name=HRM
+Module4000Desc=انسانی وسائل کا انتظام (محکمہ کا انتظام، ملازمین کے معاہدے اور احساسات)
+Module5000Name=ملٹی کمپنی
+Module5000Desc=آپ کو متعدد کمپنیوں کا انتظام کرنے کی اجازت دیتا ہے۔
+Module6000Name=انٹر ماڈیول ورک فلو
+Module6000Desc=مختلف ماڈیولز کے درمیان ورک فلو کا انتظام (آبجیکٹ کی خودکار تخلیق اور/یا خودکار حیثیت کی تبدیلی)
+Module10000Name=ویب سائٹس
+Module10000Desc=WYSIWYG ایڈیٹر کے ساتھ ویب سائٹس (عوامی) بنائیں۔ یہ ویب ماسٹر یا ڈویلپر پر مبنی CMS ہے (HTML اور CSS کی زبان جاننا بہتر ہے)۔ بس اپنے ویب سرور (Apache, Nginx, ...) کو اپنے ڈومین نام کے ساتھ انٹرنیٹ پر آن لائن رکھنے کے لیے وقف شدہ Dolibarr ڈائریکٹری کی طرف اشارہ کرنے کے لیے سیٹ اپ کریں۔
+Module20000Name=درخواست کا انتظام چھوڑ دیں۔
+Module20000Desc=ملازم کی چھٹی کی درخواستوں کی وضاحت اور ٹریک کریں۔
+Module39000Name=پروڈکٹ لاٹ
+Module39000Desc=پروڈکٹس کے لیے لاٹ، سیریل نمبرز، کھانے کے لحاظ سے/فروخت کے لحاظ سے تاریخ کا انتظام
+Module40000Name=ملٹی کرنسی
+Module40000Desc=قیمتوں اور دستاویزات میں متبادل کرنسیوں کا استعمال کریں۔
+Module50000Name=پے باکس
+Module50000Desc=صارفین کو ایک PayBox آن لائن ادائیگی کا صفحہ (کریڈٹ/ڈیبٹ کارڈ) پیش کریں۔ اس کا استعمال آپ کے صارفین کو ایڈہاک ادائیگیوں یا کسی مخصوص Dolibarr آبجیکٹ (انوائس، آرڈر وغیرہ...) سے متعلق ادائیگی کرنے کی اجازت دینے کے لیے کیا جا سکتا ہے۔
+Module50100Name=POS SimplePOS
+Module50100Desc=پوائنٹ آف سیل ماڈیول SimplePOS (سادہ POS)۔
+Module50150Name=POS TakePOS
+Module50150Desc=پوائنٹ آف سیل ماڈیول TakePOS (ٹچ اسکرین POS، دکانوں، باروں یا ریستوراں کے لیے)۔
+Module50200Name=پے پال
+Module50200Desc=صارفین کو ایک پے پال آن لائن ادائیگی کا صفحہ پیش کریں (پے پال اکاؤنٹ یا کریڈٹ/ڈیبٹ کارڈز)۔ اس کا استعمال آپ کے صارفین کو ایڈہاک ادائیگیوں یا کسی مخصوص Dolibarr آبجیکٹ (انوائس، آرڈر وغیرہ...) سے متعلق ادائیگی کرنے کی اجازت دینے کے لیے کیا جا سکتا ہے۔
+Module50300Name=پٹی
+Module50300Desc=صارفین کو سٹرائپ آن لائن ادائیگی کا صفحہ (کریڈٹ/ڈیبٹ کارڈ) پیش کریں۔ اس کا استعمال آپ کے صارفین کو ایڈہاک ادائیگیوں یا کسی مخصوص Dolibarr آبجیکٹ (انوائس، آرڈر وغیرہ...) سے متعلق ادائیگی کرنے کی اجازت دینے کے لیے کیا جا سکتا ہے۔
+Module50400Name=اکاؤنٹنگ (ڈبل انٹری)
+Module50400Desc=اکاؤنٹنگ مینجمنٹ (ڈبل اندراجات، سپورٹ جنرل اور سبسڈیری لیجرز)۔ لیجر کو کئی دوسرے اکاؤنٹنگ سافٹ ویئر فارمیٹس میں برآمد کریں۔
+Module54000Name=پرنٹ آئی پی پی
+Module54000Desc=کپ IPP انٹرفیس کا استعمال کرتے ہوئے براہ راست پرنٹ (دستاویزات کھولے بغیر) (پرنٹر سرور سے نظر آنا چاہیے، اور CUPS سرور پر انسٹال ہونا چاہیے)۔
+Module55000Name=رائے شماری، سروے یا ووٹ
+Module55000Desc=آن لائن پولز، سروے یا ووٹ بنائیں (جیسے Doodle، Studs، RDVz وغیرہ...)
+Module59000Name=حاشیہ
+Module59000Desc=مارجن کی پیروی کرنے کے لیے ماڈیول
+Module60000Name=کمیشن
+Module60000Desc=کمیشن کے انتظام کے لیے ماڈیول
+Module62000Name=انکوٹرمز
+Module62000Desc=Incoterms کا نظم کرنے کے لیے خصوصیات شامل کریں۔
+Module63000Name=حوالہ جات
+Module63000Desc=ایونٹس کو مختص کرنے کے لیے وسائل (پرنٹرز، کاریں، کمرے، ...) کا نظم کریں۔
+Permission11=کسٹمر کی رسیدیں پڑھیں
+Permission12=کسٹمر انوائس بنائیں/ترمیم کریں۔
+Permission13=گاہک کی رسیدیں باطل کریں۔
+Permission14=کسٹمر انوائس کی توثیق کریں۔
+Permission15=ای میل کے ذریعے کسٹمر انوائس بھیجیں۔
+Permission16=کسٹمر انوائس کے لیے ادائیگیاں بنائیں
+Permission19=کسٹمر کی رسیدیں حذف کریں۔
+Permission21=تجارتی تجاویز پڑھیں
+Permission22=تجارتی تجاویز بنائیں/ترمیم کریں۔
+Permission24=تجارتی تجاویز کی توثیق کریں۔
+Permission25=تجارتی تجاویز بھیجیں۔
+Permission26=تجارتی تجاویز بند کریں۔
+Permission27=تجارتی تجاویز کو حذف کریں۔
+Permission28=تجارتی تجاویز برآمد کریں۔
+Permission31=مصنوعات پڑھیں
+Permission32=مصنوعات بنائیں/ترمیم کریں۔
+Permission34=مصنوعات کو حذف کریں۔
+Permission36=پوشیدہ پروڈکٹس دیکھیں/ان کا نظم کریں۔
+Permission38=مصنوعات برآمد کریں۔
+Permission39=کم از کم قیمت کو نظر انداز کریں۔
+Permission41=پروجیکٹس اور ٹاسک پڑھیں (مشترکہ پروجیکٹ اور پروجیکٹس جن کے لیے میں رابطہ کر رہا ہوں)۔ تفویض کردہ کاموں (ٹائم شیٹ) پر، میرے یا میرے درجہ بندی کے لیے استعمال شدہ وقت بھی درج کر سکتے ہیں۔
+Permission42=پروجیکٹ بنائیں/ترمیم کریں (مشترکہ پروجیکٹ اور پروجیکٹس جن کے لیے میں رابطہ کر رہا ہوں)۔ ٹاسک بھی بنا سکتے ہیں اور صارفین کو پروجیکٹ اور ٹاسک تفویض کر سکتے ہیں۔
+Permission44=پروجیکٹس کو حذف کریں (مشترکہ پروجیکٹ اور پروجیکٹس جن کے لیے میں رابطہ کر رہا ہوں)
+Permission45=ایکسپورٹ پروجیکٹس
+Permission61=مداخلتیں پڑھیں
+Permission62=مداخلتیں بنائیں/ترمیم کریں۔
+Permission64=مداخلتوں کو حذف کریں۔
+Permission67=مداخلتیں برآمد کریں۔
+Permission68=ای میل کے ذریعے مداخلتیں بھیجیں۔
+Permission69=مداخلتوں کی توثیق کریں۔
+Permission70=مداخلتوں کو باطل کریں۔
+Permission71=ممبرز پڑھیں
+Permission72=ممبرز بنائیں/ترمیم کریں۔
+Permission74=اراکین کو حذف کریں۔
+Permission75=رکنیت کی قسمیں ترتیب دیں۔
+Permission76=ڈیٹا ایکسپورٹ کریں۔
+Permission78=سبسکرپشنز پڑھیں
+Permission79=سبسکرپشنز بنائیں/ترمیم کریں۔
+Permission81=گاہکوں کے احکامات پڑھیں
+Permission82=صارفین کے آرڈرز بنائیں/ترمیم کریں۔
+Permission84=صارفین کے آرڈرز کی توثیق کریں۔
+Permission86=صارفین کو آرڈر بھیجیں۔
+Permission87=گاہکوں کے احکامات کو بند کریں۔
+Permission88=صارفین کے آرڈرز منسوخ کریں۔
+Permission89=صارفین کے آرڈرز کو حذف کریں۔
+Permission91=سماجی یا مالی ٹیکس اور وٹ پڑھیں
+Permission92=سماجی یا مالیاتی ٹیکس اور وٹ بنائیں/ترمیم کریں۔
+Permission93=سماجی یا مالی ٹیکس اور وٹ کو حذف کریں۔
+Permission94=سماجی یا مالی ٹیکس برآمد کریں۔
+Permission95=رپورٹس پڑھیں
+Permission101=بھیجیں پڑھیں
+Permission102=بھیجیں بنائیں/ترمیم کریں۔
+Permission104=بھیجنے کی توثیق کریں۔
+Permission105=ای میل کے ذریعے بھیجیں
+Permission106=بھیجیں برآمد کریں۔
+Permission109=بھیجیں حذف کریں۔
+Permission111=مالی اکاؤنٹس پڑھیں
+Permission112=لین دین بنائیں/ترمیم کریں/حذف کریں اور موازنہ کریں۔
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
+Permission114=لین دین کو ہم آہنگ کریں۔
+Permission115=لین دین اور اکاؤنٹ کے بیانات برآمد کریں۔
+Permission116=اکاؤنٹس کے درمیان منتقلی
+Permission117=چیک بھیجنے کا انتظام کریں۔
+Permission121=صارف سے منسلک تیسرے فریق کو پڑھیں
+Permission122=صارف سے منسلک تیسرے فریق بنائیں/ترمیم کریں۔
+Permission125=صارف سے منسلک تیسرے فریق کو حذف کریں۔
+Permission126=تیسرے فریق کو برآمد کریں۔
+Permission130=تیسرے فریق کی ادائیگی کی معلومات بنائیں/ترمیم کریں۔
+Permission141=تمام منصوبوں اور کاموں کو پڑھیں (نجی منصوبے بھی جن کے لیے میں رابطہ نہیں ہوں)
+Permission142=تمام پروجیکٹس اور ٹاسک بنائیں/ترمیم کریں (نجی پروجیکٹ بھی جن کے لیے میں رابطہ نہیں ہوں)
+Permission144=تمام منصوبوں اور کاموں کو حذف کریں (نجی پروجیکٹس جن کے لیے میں رابطہ نہیں کر رہا ہوں)
+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=اسٹیکرز کو حذف کریں۔
+Permission650=مواد کے بل پڑھیں
+Permission651=مواد کے بل بنائیں/اپ ڈیٹ کریں۔
+Permission652=مواد کے بلز کو حذف کریں۔
+Permission660=مینوفیکچرنگ آرڈر (MO) پڑھیں
+Permission661=مینوفیکچرنگ آرڈر بنائیں/اپ ڈیٹ کریں (MO)
+Permission662=مینوفیکچرنگ آرڈر (MO) کو حذف کریں
+Permission701=عطیات پڑھیں
+Permission702=عطیات بنائیں/ترمیم کریں۔
+Permission703=عطیات کو حذف کریں۔
+Permission771=اخراجات کی رپورٹیں پڑھیں (آپ کی اور آپ کے ماتحت)
+Permission772=Create/modify expense reports (for you and your subordinates)
+Permission773=اخراجات کی رپورٹیں حذف کریں۔
+Permission775=اخراجات کی رپورٹوں کو منظور کریں۔
+Permission776=اخراجات کی رپورٹیں ادا کریں۔
+Permission777=Read all expense reports (even those of user not subordinates)
+Permission778=ہر ایک کے اخراجات کی رپورٹیں بنائیں/ترمیم کریں۔
+Permission779=اخراجات کی رپورٹیں برآمد کریں۔
+Permission1001=اسٹاک پڑھیں
+Permission1002=گودام بنائیں/ترمیم کریں۔
+Permission1003=گوداموں کو حذف کریں۔
+Permission1004=اسٹاک کی نقل و حرکت پڑھیں
+Permission1005=اسٹاک کی نقل و حرکت بنائیں/ترمیم کریں۔
+Permission1011=انوینٹری دیکھیں
+Permission1012=نئی انوینٹری بنائیں
+Permission1014=انوینٹری کی توثیق کریں۔
+Permission1015=کسی پروڈکٹ کے لیے پی ایم پی ویلیو کو تبدیل کرنے کی اجازت دیں۔
+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=Read skill/job/position
+Permission4002=Create/modify skill/job/position
+Permission4003=Delete skill/job/position
+Permission4020=Read evaluations
+Permission4021=Create/modify your evaluation
+Permission4022=تشخیص کی توثیق کریں۔
+Permission4023=تشخیص کو حذف کریں۔
+Permission4030=موازنہ کا مینو دیکھیں
+Permission10001=ویب سائٹ کا مواد پڑھیں
+Permission10002=ویب سائٹ کا مواد بنائیں/ترمیم کریں (HTML اور جاوا اسکرپٹ مواد)
+Permission10003=ویب سائٹ کا مواد بنائیں/ترمیم کریں (متحرک پی ایچ پی کوڈ)۔ خطرناک، محدود ڈویلپرز کے لیے محفوظ ہونا چاہیے۔
+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=چھٹی کی درخواستیں منظور کریں۔
+Permission23001=طے شدہ کام پڑھیں
+Permission23002=شیڈول شدہ جاب بنائیں/اپ ڈیٹ کریں۔
+Permission23003=طے شدہ کام کو حذف کریں۔
+Permission23004=طے شدہ کام کو انجام دیں۔
+Permission50101=پوائنٹ آف سیل کا استعمال کریں (SimplePOS)
+Permission50151=پوائنٹ آف سیل (TakePOS) کا استعمال کریں
+Permission50152=سیلز لائنوں میں ترمیم کریں۔
+Permission50153=آرڈر شدہ سیلز لائنوں میں ترمیم کریں۔
+Permission50201=لین دین پڑھیں
+Permission50202=لین دین درآمد کریں۔
+Permission50330=زپیئر کی اشیاء پڑھیں
+Permission50331=Zapier کی اشیاء بنائیں/اپ ڈیٹ کریں۔
+Permission50332=زپیئر کی اشیاء کو حذف کریں۔
+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=VAT کی شرح یا سیلز ٹیکس کی شرح
+DictionaryRevenueStamp=ٹیکس ڈاک ٹکٹوں کی رقم
+DictionaryPaymentConditions=ادائیگی کی شرائط
+DictionaryPaymentModes=ادائیگی کے طریقے
+DictionaryTypeContact=رابطہ/پتہ کی اقسام
+DictionaryTypeOfContainer=ویب سائٹ - ویب سائٹ کے صفحات/کنٹینرز کی قسم
+DictionaryEcotaxe=Ecotax (WEEE)
+DictionaryPaperFormat=کاغذی شکلیں
+DictionaryFormatCards=کارڈ فارمیٹس
+DictionaryFees=اخراجات کی رپورٹ - اخراجات کی رپورٹ لائنوں کی اقسام
+DictionarySendingMethods=شپنگ کے طریقے
+DictionaryStaff=ملازمین کی تعداد
+DictionaryAvailability=ترسیل میں تاخیر
+DictionaryOrderMethods=آرڈر کے طریقے
+DictionarySource=تجاویز / احکامات کی اصل
+DictionaryAccountancyCategory=رپورٹس کے لیے ذاتی نوعیت کے گروپس
+DictionaryAccountancysystem=اکاؤنٹس کے چارٹ کے لیے ماڈل
+DictionaryAccountancyJournal=اکاؤنٹنگ جرائد
+DictionaryEMailTemplates=ای میل ٹیمپلیٹس
+DictionaryUnits=یونٹس
+DictionaryMeasuringUnits=پیمائش کی اکائیاں
+DictionarySocialNetworks=سوشل نیٹ ورک
+DictionaryProspectStatus=کمپنیوں کے لئے امکانی حیثیت
+DictionaryProspectContactStatus=رابطوں کے لیے امکانی حیثیت
+DictionaryHolidayTypes=چھٹی - چھٹی کی اقسام
+DictionaryOpportunityStatus=پروجیکٹ/لیڈ کے لیے لیڈ کی حیثیت
+DictionaryExpenseTaxCat=اخراجات کی رپورٹ - نقل و حمل کے زمرے
+DictionaryExpenseTaxRange=اخراجات کی رپورٹ - نقل و حمل کے زمرے کے لحاظ سے حد
+DictionaryTransportMode=انٹرا کام رپورٹ - ٹرانسپورٹ موڈ
+DictionaryBatchStatus=پروڈکٹ لاٹ/سیریل کوالٹی کنٹرول کی حیثیت
+TypeOfUnit=یونٹ کی قسم
+SetupSaved=سیٹ اپ محفوظ ہو گیا۔
+SetupNotSaved=سیٹ اپ محفوظ نہیں ہوا۔
+BackToModuleList=ماڈیول کی فہرست پر واپس جائیں۔
+BackToDictionaryList=لغت کی فہرست پر واپس جائیں۔
+TypeOfRevenueStamp=ٹیکس سٹیمپ کی قسم
+VATManagement=سیلز ٹیکس مینجمنٹ
+VATIsUsedDesc=امکانات، رسیدیں، آرڈرز وغیرہ بناتے وقت پہلے سے طے شدہ طور پر سیلز ٹیکس کی شرح فعال معیاری اصول کی پیروی کرتی ہے: <br> اگر بیچنے والا سیلز ٹیکس کے تابع نہیں ہے، تو سیلز ٹیکس ڈیفالٹ 0 پر ہوتا ہے۔ اصول کا اختتام۔ <br> اگر (بیچنے والے کا ملک = خریدار کا ملک)، تو سیلز ٹیکس بطور ڈیفالٹ بیچنے والے کے ملک میں پروڈکٹ کے سیلز ٹیکس کے برابر ہے۔ حکمرانی کا خاتمہ۔ <br> اگر بیچنے والا اور خریدار دونوں یورپی کمیونٹی میں ہیں اور سامان نقل و حمل سے متعلق مصنوعات ہیں (ہولیج، شپنگ، ایئر لائن) تو پہلے سے طے شدہ VAT 0 ہے۔ یہ اصول بیچنے والے کے ملک پر منحصر ہے - براہ کرم اپنے اکاؤنٹنٹ سے مشورہ کریں۔ VAT خریدار کو اپنے ملک کے کسٹم آفس کو ادا کرنا چاہیے نہ کہ بیچنے والے کو۔ حکمرانی کا خاتمہ۔ <br> اگر بیچنے والا اور خریدار دونوں یورپی کمیونٹی میں ہیں اور خریدار کمپنی نہیں ہے (ایک رجسٹرڈ انٹرا کمیونٹی VAT نمبر کے ساتھ) تو VAT بیچنے والے کے ملک کی VAT شرح سے ڈیفالٹ ہو جاتا ہے۔ حکمرانی کا خاتمہ۔ <br> اگر بیچنے والا اور خریدار دونوں یورپی کمیونٹی میں ہیں اور خریدار ایک کمپنی ہے (ایک رجسٹرڈ انٹرا کمیونٹی VAT نمبر کے ساتھ)، تو VAT بطور ڈیفالٹ 0 ہے۔ حکمرانی کا خاتمہ۔ <br> کسی بھی دوسری صورت میں مجوزہ ڈیفالٹ سیلز ٹیکس = 0 ہے۔ حکمرانی کا خاتمہ۔
+VATIsNotUsedDesc=پہلے سے طے شدہ طور پر مجوزہ سیلز ٹیکس 0 ہے جسے ایسوسی ایشنز، افراد یا چھوٹی کمپنیوں جیسے معاملات کے لیے استعمال کیا جا سکتا ہے۔
+VATIsUsedExampleFR=فرانس میں، اس کا مطلب ہے حقیقی مالیاتی نظام رکھنے والی کمپنیاں یا تنظیمیں (آسان اصلی یا نارمل اصلی)۔ ایک ایسا نظام جس میں VAT کا اعلان کیا جاتا ہے۔
+VATIsNotUsedExampleFR=فرانس میں، اس سے مراد ایسی انجمنیں ہیں جو کہ غیر سیلز ٹیکس کا اعلان کر رہی ہیں یا ایسی کمپنیاں، تنظیمیں یا لبرل پیشے جنہوں نے مائیکرو انٹرپرائز مالیاتی نظام (فرنچائز میں سیلز ٹیکس) کا انتخاب کیا ہے اور بغیر کسی سیلز ٹیکس کے اعلان کے فرنچائز سیلز ٹیکس ادا کیا ہے۔ یہ انتخاب رسیدوں پر حوالہ "غیر قابل اطلاق سیلز ٹیکس - آرٹ -293B آف CGI" ظاہر کرے گا۔
+##### Local Taxes #####
+TypeOfSaleTaxes=سیلز ٹیکس کی قسم
+LTRate=شرح
+LocalTax1IsNotUsed=دوسرا ٹیکس استعمال نہ کریں۔
+LocalTax1IsUsedDesc=دوسری قسم کا ٹیکس استعمال کریں (پہلے ٹیکس کے علاوہ)
+LocalTax1IsNotUsedDesc=دوسری قسم کا ٹیکس استعمال نہ کریں (پہلے ٹیکس کے علاوہ)
+LocalTax1Management=ٹیکس کی دوسری قسم
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsNotUsed=تیسرا ٹیکس استعمال نہ کریں۔
+LocalTax2IsUsedDesc=تیسری قسم کا ٹیکس استعمال کریں (پہلے ٹیکس کے علاوہ)
+LocalTax2IsNotUsedDesc=دوسری قسم کا ٹیکس استعمال نہ کریں (پہلے ٹیکس کے علاوہ)
+LocalTax2Management=ٹیکس کی تیسری قسم
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample=
+LocalTax1ManagementES=RE مینجمنٹ
+LocalTax1IsUsedDescES=امکانات، انوائسز، آرڈرز وغیرہ بناتے وقت ڈیفالٹ RE کی شرح فعال معیاری اصول پر عمل کریں: <br> اگر خریدار پر RE، RE بذریعہ ڈیفالٹ = 0 نہیں ہے۔ حکمرانی کا خاتمہ۔ <br> اگر خریدار کو RE کا نشانہ بنایا جاتا ہے تو RE بطور ڈیفالٹ۔ حکمرانی کا خاتمہ۔ <br>
+LocalTax1IsNotUsedDescES=پہلے سے طے شدہ طور پر مجوزہ RE 0 ہے۔ اصول کا اختتام۔
+LocalTax1IsUsedExampleES=اسپین میں وہ پیشہ ور افراد ہیں جو ہسپانوی IAE کے کچھ مخصوص حصوں کے تابع ہیں۔
+LocalTax1IsNotUsedExampleES=اسپین میں وہ پیشہ ور اور معاشرے ہیں اور ہسپانوی IAE کے بعض حصوں کے تابع ہیں۔
+LocalTax2ManagementES=آئی آر پی ایف مینجمنٹ
+LocalTax2IsUsedDescES=امکانات، رسیدیں، آرڈرز وغیرہ بناتے وقت پہلے سے طے شدہ IRPF کی شرح فعال معیاری اصول پر عمل کریں: <br> اگر بیچنے والا IRPF کے تابع نہیں ہے، تو IRPF بذریعہ ڈیفالٹ=0۔ حکمرانی کا خاتمہ۔ <br> اگر بیچنے والے کو IRPF کا نشانہ بنایا جاتا ہے تو IRPF بطور ڈیفالٹ۔ حکمرانی کا خاتمہ۔ <br>
+LocalTax2IsNotUsedDescES=پہلے سے طے شدہ طور پر مجوزہ IRPF 0 ہے۔ اصول کا خاتمہ۔
+LocalTax2IsUsedExampleES=اسپین میں، فری لانسرز اور آزاد پیشہ ور افراد جو خدمات فراہم کرتے ہیں اور کمپنیاں جنہوں نے ماڈیولز کے ٹیکس نظام کا انتخاب کیا ہے۔
+LocalTax2IsNotUsedExampleES=اسپین میں وہ کاروبار ہیں جو ماڈیولز کے ٹیکس نظام کے تابع نہیں ہیں۔
+RevenueStampDesc="ٹیکس سٹیمپ" یا "ریونیو سٹیمپ" ایک مقررہ ٹیکس ہے جو آپ فی انوائس (یہ انوائس کی رقم پر منحصر نہیں ہے)۔ یہ فیصد ٹیکس بھی ہو سکتا ہے لیکن دوسری یا تیسری قسم کا ٹیکس استعمال کرنا فیصد ٹیکس کے لیے بہتر ہے کیونکہ ٹیکس سٹیمپ کوئی رپورٹنگ فراہم نہیں کرتے۔ صرف چند ممالک اس قسم کا ٹیکس استعمال کرتے ہیں۔
+UseRevenueStamp=ٹیکس سٹیمپ استعمال کریں۔
+UseRevenueStampExample=ٹیکس سٹیمپ کی قدر ڈیفالٹ کے طور پر لغات کے سیٹ اپ میں بیان کی جاتی ہے (%s - %s - %s)
+CalcLocaltax=مقامی ٹیکس سے متعلق رپورٹس
+CalcLocaltax1=فروخت - خریداری
+CalcLocaltax1Desc=لوکل ٹیکسز کی رپورٹس کا حساب لوکل ٹیکسز سیلز اور لوکل ٹیکس کی خریداری کے درمیان فرق کے ساتھ کیا جاتا ہے۔
+CalcLocaltax2=خریداری
+CalcLocaltax2Desc=لوکل ٹیکس کی رپورٹیں لوکل ٹیکس کی خریداریوں کی کل ہیں۔
+CalcLocaltax3=سیلز
+CalcLocaltax3Desc=مقامی ٹیکس کی رپورٹیں لوکل ٹیکسز کی فروخت کی کل ہیں۔
+NoLocalTaxXForThisCountry=ٹیکسوں کے سیٹ اپ کے مطابق (دیکھیں %s - %s - %s)، آپ کے ملک کو اس قسم کے ٹیکس استعمال کرنے کی ضرورت نہیں ہے۔
+LabelUsedByDefault=کوڈ کے لیے کوئی ترجمہ نہ ملنے کی صورت میں بطور ڈیفالٹ استعمال شدہ لیبل
+LabelOnDocuments=دستاویزات پر لیبل لگائیں۔
+LabelOrTranslationKey=لیبل یا ترجمہ کلید
+ValueOfConstantKey=کنفیگریشن مستقل کی قدر
+ConstantIsOn=آپشن %s آن ہے۔
+NbOfDays=دنوں کی تعداد
+AtEndOfMonth=مہینے کے آخر میں
+CurrentNext=موجودہ/اگلا
+Offset=آفسیٹ
+AlwaysActive=ہمیشہ متحرک
+Upgrade=اپ گریڈ
+MenuUpgrade=اپ گریڈ / توسیع
+AddExtensionThemeModuleOrOther=بیرونی ایپ/ماڈیول تعینات/انسٹال کریں۔
+WebServer=ویب سرور
+DocumentRootServer=ویب سرور کی روٹ ڈائرکٹری
+DataRootServer=ڈیٹا فائلوں کی ڈائرکٹری
+IP=آئی پی
+Port=بندرگاہ
+VirtualServerName=ورچوئل سرور کا نام
+OS=OS
+PhpWebLink=ویب پی ایچ پی لنک
+Server=سرور
+Database=ڈیٹا بیس
+DatabaseServer=ڈیٹا بیس ہوسٹ
+DatabaseName=ڈیٹا بیس کا نام
+DatabasePort=ڈیٹا بیس پورٹ
+DatabaseUser=ڈیٹا بیس صارف
+DatabasePassword=ڈیٹا بیس پاس ورڈ
+Tables=میزیں
+TableName=ٹیبل کا نام
+NbOfRecord=ریکارڈز کی تعداد
+Host=سرور
+DriverType=ڈرائیور کی قسم
+SummarySystem=سسٹم کی معلومات کا خلاصہ
+SummaryConst=Dolibarr سیٹ اپ کے تمام پیرامیٹرز کی فہرست
+MenuCompanySetup=کمپنی/تنظیم
+DefaultMenuManager= معیاری مینو مینیجر
+DefaultMenuSmartphoneManager=اسمارٹ فون مینو مینیجر
+Skin=جلد کی تھیم
+DefaultSkin=پہلے سے طے شدہ جلد کی تھیم
+MaxSizeList=فہرست کے لیے زیادہ سے زیادہ لمبائی
+DefaultMaxSizeList=فہرستوں کے لیے پہلے سے طے شدہ زیادہ سے زیادہ لمبائی
+DefaultMaxSizeShortList=مختصر فہرستوں کے لیے پہلے سے طے شدہ زیادہ سے زیادہ لمبائی (یعنی کسٹمر کارڈ میں)
+MessageOfDay=دن کا پیغام
+MessageLogin=لاگ ان پیج پیغام
+LoginPage=لاگ ان صفحہ
+BackgroundImageLogin=پس منظر کی تصویر
+PermanentLeftSearchForm=بائیں مینو پر مستقل تلاش کا فارم
+DefaultLanguage=پہلے سے طے شدہ زبان
+EnableMultilangInterface=گاہک یا وینڈر تعلقات کے لیے کثیر زبانی تعاون کو فعال کریں۔
+EnableShowLogo=مینو میں کمپنی کا لوگو دکھائیں۔
+CompanyInfo=کمپنی/تنظیم
+CompanyIds=کمپنی/تنظیم کی شناخت
+CompanyName=نام
+CompanyAddress=پتہ
+CompanyZip=زپ
+CompanyTown=شہر
+CompanyCountry=ملک
+CompanyCurrency=اہم کرنسی
+CompanyObject=کمپنی کا اعتراض
+IDCountry=شناختی ملک
+Logo=لوگو
+LogoDesc=کمپنی کا مرکزی لوگو۔ تیار کردہ دستاویزات میں استعمال کیا جائے گا (پی ڈی ایف، ...)
+LogoSquarred=لوگو (مربع)
+LogoSquarredDesc=چوکور آئیکن (چوڑائی = اونچائی) ہونا چاہیے۔ اس لوگو کو پسندیدہ آئیکن کے طور پر استعمال کیا جائے گا یا دیگر ضرورتوں جیسا کہ ٹاپ مینو بار کے لیے (اگر ڈسپلے سیٹ اپ میں غیر فعال نہیں کیا گیا ہے)۔
+DoNotSuggestPaymentMode=تجویز نہ کریں۔
+NoActiveBankAccountDefined=کوئی فعال بینک اکاؤنٹ متعین نہیں ہے۔
+OwnerOfBankAccount=بینک اکاؤنٹ %s کا مالک
+BankModuleNotActive=بینک اکاؤنٹس ماڈیول فعال نہیں ہے۔
+ShowBugTrackLink=لنک دکھائیں "<strong> %s </strong>"
+ShowBugTrackLinkDesc=اس لنک کو ظاہر نہ کرنے کے لیے خالی رکھیں، Dolibarr پروجیکٹ کے لنک کے لیے ویلیو 'github' استعمال کریں یا براہ راست ایک url 'https://...' کی وضاحت کریں۔
+Alerts=انتباہات
+DelaysOfToleranceBeforeWarning=انتباہی انتباہ ظاہر کرنے سے پہلے تاخیر:
+DelaysOfToleranceDesc=تاخیر کو سیٹ کریں اس سے پہلے کہ الرٹ آئیکن %s دیر کے عنصر کے لیے اسکرین پر دکھایا جائے۔
+Delays_MAIN_DELAY_ACTIONS_TODO=منصوبہ بند واقعات (ایجنڈا ایونٹس) مکمل نہیں ہوئے۔
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=پروجیکٹ وقت پر بند نہیں ہوا۔
+Delays_MAIN_DELAY_TASKS_TODO=منصوبہ بند کام (پروجیکٹ ٹاسک) مکمل نہیں ہوئے۔
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=آرڈر پر کارروائی نہیں ہوئی۔
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=خریداری کے آرڈر پر کارروائی نہیں ہوئی۔
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=تجویز بند نہیں ہوئی۔
+Delays_MAIN_DELAY_PROPALS_TO_BILL=تجویز کا بل نہیں دیا گیا۔
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=چالو کرنے کے لیے سروس
+Delays_MAIN_DELAY_RUNNING_SERVICES=میعاد ختم ہونے والی سروس
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=غیر ادا شدہ وینڈر انوائس
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=بلا معاوضہ کسٹمر انوائس
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=زیر التواء بینک مفاہمت
+Delays_MAIN_DELAY_MEMBERS=تاخیر سے رکنیت کی فیس
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=چیک ڈپازٹ نہیں ہوا۔
+Delays_MAIN_DELAY_EXPENSEREPORTS=منظوری کے لیے اخراجات کی رپورٹ
+Delays_MAIN_DELAY_HOLIDAYS=منظوری کے لیے درخواستیں چھوڑ دیں۔
+SetupDescription1=Dolibarr کا استعمال شروع کرنے سے پہلے کچھ ابتدائی پیرامیٹرز کی وضاحت اور ماڈیولز کو فعال/کنفیگر کرنا ضروری ہے۔
+SetupDescription2=درج ذیل دو حصے لازمی ہیں (سیٹ اپ مینو میں دو پہلی اندراجات):
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> <br> (آپ کے بنیادی پیرامیٹرز کو اپنی مرضی کے مطابق طرز عمل کے لیے استعمال کیا جاتا ہے ملک کی مخصوص خصوصیات کے لیے استعمال کیا جاتا ہے)۔
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> یہ سافٹ ویئر بہت سے molic/du ایپس کا مجموعہ ہے۔ آپ کی ضروریات سے متعلق ماڈیولز کو فعال اور ترتیب دیا جانا چاہیے۔ ان ماڈیولز کے ایکٹیویشن کے ساتھ مینو اندراجات ظاہر ہوں گے۔
+SetupDescription5=دیگر سیٹ اپ مینو اندراجات اختیاری پیرامیٹرز کا نظم کرتی ہیں۔
+SetupDescriptionLink= <a href="%s"> %s - %s </a>
+SetupDescription3b=بنیادی پیرامیٹرز جو آپ کی درخواست کے پہلے سے طے شدہ رویے کو حسب ضرورت بنانے کے لیے استعمال کیے جاتے ہیں (مثلاً ملک سے متعلقہ خصوصیات کے لیے)۔
+SetupDescription4b=یہ سافٹ ویئر بہت سے ماڈیولز/ایپلی کیشنز کا مجموعہ ہے۔ آپ کی ضروریات سے متعلق ماڈیولز کو فعال اور ترتیب دیا جانا چاہیے۔ ان ماڈیولز کے ایکٹیویشن کے ساتھ مینو اندراجات ظاہر ہوں گے۔
+AuditedSecurityEvents=سیکیورٹی کے واقعات جن کا آڈٹ کیا جاتا ہے۔
+NoSecurityEventsAreAduited=سیکیورٹی کے کوئی واقعات کا آڈٹ نہیں کیا جاتا ہے۔ آپ انہیں مینو %s سے فعال کر سکتے ہیں۔
+Audit=سیکیورٹی کے واقعات
+InfoDolibarr=Dolibarr کے بارے میں
+InfoBrowser=براؤزر کے بارے میں
+InfoOS=OS کے بارے میں
+InfoWebServer=ویب سرور کے بارے میں
+InfoDatabase=ڈیٹا بیس کے بارے میں
+InfoPHP=پی ایچ پی کے بارے میں
+InfoPerf=پرفارمنس کے بارے میں
+InfoSecurity=سیکیورٹی کے بارے میں
+BrowserName=براؤزر کا نام
+BrowserOS=براؤزر OS
+ListOfSecurityEvents=Dolibarr سیکورٹی کے واقعات کی فہرست
+SecurityEventsPurged=سیکورٹی کے واقعات کو صاف کیا
+LogEventDesc=مخصوص سیکیورٹی ایونٹس کے لیے لاگنگ کو فعال کریں۔ منتظمین لاگ ان مینو کے ذریعے <b> %s - %s </b> ۔ وارننگ، یہ فیچر ڈیٹا بیس میں بڑی مقدار میں ڈیٹا تیار کر سکتا ہے۔
+AreaForAdminOnly=سیٹ اپ پیرامیٹرز صرف <b> ایڈمنسٹریٹر صارفین </b> کے ذریعے سیٹ کیے جا سکتے ہیں۔
+SystemInfoDesc=سسٹم کی معلومات متفرق تکنیکی معلومات ہیں جو آپ کو صرف پڑھنے کے موڈ میں ملتی ہیں اور صرف منتظمین کے لیے دکھائی دیتی ہیں۔
+SystemAreaForAdminOnly=یہ علاقہ صرف منتظم صارفین کے لیے دستیاب ہے۔ Dolibarr صارف کی اجازت اس پابندی کو تبدیل نہیں کر سکتی۔
+CompanyFundationDesc=اپنی کمپنی/تنظیم کی معلومات میں ترمیم کریں۔ مکمل ہونے پر صفحہ کے نیچے "%s" بٹن پر کلک کریں۔
+AccountantDesc=اگر آپ کے پاس ایک بیرونی اکاؤنٹنٹ/بک کیپر ہے، تو آپ یہاں اس کی معلومات میں ترمیم کر سکتے ہیں۔
+AccountantFileNumber=اکاؤنٹنٹ کوڈ
+DisplayDesc=درخواست کی شکل اور پیشکش کو متاثر کرنے والے پیرامیٹرز کو یہاں تبدیل کیا جا سکتا ہے۔
+AvailableModules=دستیاب ایپ/ماڈیولز
+ToActivateModule=ماڈیولز کو چالو کرنے کے لیے، سیٹ اپ ایریا (ہوم-> سیٹ اپ-> ماڈیولز) پر جائیں۔
+SessionTimeOut=سیشن کے لیے وقت ختم
+SessionExplanation=یہ نمبر اس بات کی ضمانت دیتا ہے کہ سیشن اس تاخیر سے پہلے کبھی ختم نہیں ہوگا، اگر سیشن کلینر اندرونی پی ایچ پی سیشن کلینر کے ذریعے کیا جاتا ہے (اور کچھ نہیں)۔ اندرونی پی ایچ پی سیشن کلینر اس بات کی ضمانت نہیں دیتا کہ اس تاخیر کے بعد سیشن ختم ہو جائے گا۔ اس کی میعاد ختم ہو جائے گی، اس تاخیر کے بعد، اور جب سیشن کلینر چلایا جائے گا، لہذا ہر <b> %s/%s </b> رسائی، لیکن صرف دوسرے سیشنز کے ذریعے کی جانے والی رسائی کے دوران، اگر اس کا مطلب ہے کہ سیشن کی قیمت صرف 0 کے ذریعے واضح ہو جائے گی عمل)۔ <br> نوٹ: بیرونی سیشن کلیننگ میکانزم کے ساتھ کچھ سرورز پر (کرون انڈر ڈیبین، اوبنٹو...)، سیشنز کو خارجی سیٹ اپ کے ذریعے متعین مدت کے بعد تباہ کیا جا سکتا ہے، چاہے یہاں درج کی گئی قدر ہی کیوں نہ ہو۔
+SessionsPurgedByExternalSystem=ایسا لگتا ہے کہ اس سرور پر سیشنز ایک بیرونی میکانزم کے ذریعے صاف کیے گئے ہیں (cron under debian, ubuntu ...)، شاید ہر <b> %s </b> سیکنڈ (= پیرامیٹر کی قدر a0aee83f8z0700007007007000000000007_75_life) سیشن کی قیمت کو تبدیل کرنے کا وقت۔ آپ کو سرور ایڈمنسٹریٹر سے سیشن میں تاخیر کو تبدیل کرنے کے لیے کہنا چاہیے۔
+TriggersAvailable=دستیاب محرکات
+TriggersDesc=ٹرگرز وہ فائلیں ہیں جو ڈائرکٹری میں کاپی ہونے کے بعد Dolibarr ورک فلو کے رویے میں ترمیم کریں گی <b> htdocs/core/triggers </b> ۔ وہ نئی کارروائیوں کا احساس کرتے ہیں، جو Dolibarr ایونٹس (نئی کمپنی کی تخلیق، انوائس کی توثیق، ...) پر فعال ہوتے ہیں۔
+TriggerDisabledByName=اس فائل میں محرکات کو ان کے نام میں <b> -NORUN </b> لاحقہ سے غیر فعال کر دیا گیا ہے۔
+TriggerDisabledAsModuleDisabled=اس فائل میں محرکات غیر فعال ہیں کیونکہ ماڈیول <b> %s </b> غیر فعال ہے۔
+TriggerAlwaysActive=اس فائل میں محرکات ہمیشہ فعال رہتے ہیں، چاہے جو بھی ڈولیبر ماڈیولز چالو ہوں۔
+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> پر دکھایا گیا ہے۔ اس پیرامیٹر کے بعد ایک ellipsis <b> ... </b> شامل کریں (جیسے "2...") اگر آپ "<b> ... </b>" کو tr کے ساتھ لاحقہ قیمت دیکھنا چاہتے ہیں۔
+MAIN_ROUNDING_RULE_TOT=راؤنڈنگ رینج کا مرحلہ (ان ممالک کے لیے جہاں بیس 10 کے علاوہ کسی اور چیز پر راؤنڈنگ کی جاتی ہے۔ مثال کے طور پر، اگر راؤنڈنگ 0.05 مراحل سے کی جاتی ہے تو 0.05 ڈالیں)
+UnitPriceOfProduct=کسی پروڈکٹ کی خالص یونٹ قیمت
+TotalPriceAfterRounding=راؤنڈنگ کے بعد کل قیمت (بغیر ٹیکس/وایٹ/ٹیکس)
+ParameterActiveForNextInputOnly=پیرامیٹر صرف اگلے ان پٹ کے لیے موثر ہے۔
+NoEventOrNoAuditSetup=کوئی سیکورٹی ایونٹ لاگ ان نہیں کیا گیا ہے۔ اگر "سیٹ اپ - سیکیورٹی - ایونٹس" صفحہ میں آڈٹ کو فعال نہیں کیا گیا ہے تو یہ معمول ہے۔
+NoEventFoundWithCriteria=اس تلاش کے معیار کے لیے کوئی سیکیورٹی ایونٹ نہیں ملا ہے۔
+SeeLocalSendMailSetup=اپنے مقامی ارسال میل کا سیٹ اپ دیکھیں
+BackupDesc=Dolibarr انسٹالیشن کے <b> مکمل </b> بیک اپ کے لیے دو مراحل کی ضرورت ہوتی ہے۔
+BackupDesc2="دستاویزات" ڈائرکٹری کے مواد کا بیک اپ لیں ( <b> %s </b> ) جس میں تمام اپ لوڈ اور تیار کردہ فائلیں ہیں۔ اس میں مرحلہ 1 میں تیار کردہ تمام ڈمپ فائلیں بھی شامل ہوں گی۔ یہ آپریشن کئی منٹ تک جاری رہ سکتا ہے۔
+BackupDesc3=اپنے ڈیٹا بیس ( <b> %s </b> ) کے ڈھانچے اور مواد کو ڈمپ فائل میں بیک اپ کریں۔ اس کے لیے آپ درج ذیل اسسٹنٹ استعمال کر سکتے ہیں۔
+BackupDescX=محفوظ شدہ ڈائرکٹری کو محفوظ جگہ پر محفوظ کیا جانا چاہیے۔
+BackupDescY=تیار کردہ ڈمپ فائل کو محفوظ جگہ پر محفوظ کیا جانا چاہئے۔
+BackupPHPWarning=اس طریقے سے بیک اپ کی ضمانت نہیں دی جا سکتی۔ پچھلا تجویز کردہ۔
+RestoreDesc=Dolibarr بیک اپ کو بحال کرنے کے لیے، دو مراحل درکار ہیں۔
+RestoreDesc2="دستاویزات" ڈائرکٹری کی بیک اپ فائل (مثال کے طور پر زپ فائل) کو ایک نئی Dolibarr انسٹالیشن میں یا اس موجودہ دستاویزات کی ڈائرکٹری ( <b> %s </b> ) میں بحال کریں۔
+RestoreDesc3=ڈیٹا بیس کی ساخت اور ڈیٹا کو بیک اپ ڈمپ فائل سے نئی ڈولیبر انسٹالیشن کے ڈیٹا بیس میں یا اس موجودہ انسٹالیشن کے ڈیٹا بیس میں بحال کریں ( <b> %s </b> )۔ تنبیہ، بحالی مکمل ہونے کے بعد، آپ کو دوبارہ جڑنے کے لیے ایک لاگ ان/پاس ورڈ استعمال کرنا چاہیے، جو بیک اپ ٹائم/انسٹالیشن سے موجود تھا۔ <br> اس موجودہ انسٹالیشن میں بیک اپ ڈیٹا بیس کو بحال کرنے کے لیے، آپ اس اسسٹنٹ کی پیروی کر سکتے ہیں۔
+RestoreMySQL=MySQL درآمد
+ForcedToByAModule=اس اصول کو ایک فعال ماڈیول کے ذریعے <b> %s </b> پر مجبور کیا جاتا ہے۔
+ValueIsForcedBySystem=یہ قیمت نظام کے ذریعہ مجبور ہے۔ آپ اسے تبدیل نہیں کر سکتے۔
+PreviousDumpFiles=موجودہ بیک اپ فائلیں۔
+PreviousArchiveFiles=موجودہ آرکائیو فائلز
+WeekStartOnDay=ہفتے کا پہلا دن
+RunningUpdateProcessMayBeRequired=اپ گریڈ کے عمل کو چلانے کی ضرورت محسوس ہوتی ہے (پروگرام ورژن %s ڈیٹا بیس ورژن %s سے مختلف ہے)
+YouMustRunCommandFromCommandLineAfterLoginToUser=آپ کو صارف <b> %s </b> کے ساتھ شیل میں لاگ ان کرنے کے بعد کمانڈ لائن سے اس کمانڈ کو چلانا ہوگا یا <b> <b> <b> %s </b> آپ کو کمانڈ لائن کے آخر میں -W آپشن شامل کرنا ہوگا۔
+YourPHPDoesNotHaveSSLSupport=ایس ایس ایل فنکشنز آپ کے پی ایچ پی میں دستیاب نہیں ہیں۔
+DownloadMoreSkins=ڈاؤن لوڈ کرنے کے لیے مزید کھالیں۔
+SimpleNumRefModelDesc=حوالہ نمبر %syymm-nnnn فارمیٹ میں لوٹاتا ہے جہاں yy سال ہے، mm مہینہ ہے اور nnnn ایک ترتیب وار خود بخود بڑھنے والا نمبر ہے بغیر کسی ری سیٹ کے
+SimpleNumRefNoDateModelDesc=حوالہ نمبر %s-nnnn فارمیٹ میں لوٹاتا ہے جہاں nnnn ایک ترتیب وار خود بخود بڑھنے والا نمبر ہے بغیر کسی ری سیٹ کے
+ShowProfIdInAddress=ایڈریس کے ساتھ پروفیشنل آئی ڈی دکھائیں۔
+ShowVATIntaInAddress=انٹرا کمیونٹی VAT نمبر چھپائیں۔
+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=وارننگ، کچھ لینکس سسٹمز پر، آپ کے ای میل سے ای میل بھیجنے کے لیے، sendmail ایگزیکیوشن سیٹ اپ میں آپشن -ba (پیرامیٹر mail.force_extra_parameters آپ کی php.ini فائل میں) ہونا چاہیے۔ اگر کچھ وصول کنندگان کو کبھی بھی ای میلز موصول نہیں ہوتیں، تو mail.force_extra_parameters = -ba) کے ساتھ اس پی ایچ پی پیرامیٹر میں ترمیم کرنے کی کوشش کریں۔
+PathToDocuments=دستاویزات کا راستہ
+PathDirectory=ڈائرکٹری
+SendmailOptionMayHurtBuggedMTA=طریقہ "PHP میل ڈائریکٹ" کا استعمال کرتے ہوئے میل بھیجنے کی خصوصیت ایک میل پیغام تیار کرے گی جس کا شاید کچھ وصول کرنے والے میل سرورز کے ذریعے درست طریقے سے تجزیہ نہ کیا جائے۔ نتیجہ یہ ہے کہ کچھ میل ان بگڈ پلیٹ فارمز کی میزبانی والے لوگ نہیں پڑھ سکتے ہیں۔ یہ معاملہ کچھ انٹرنیٹ فراہم کنندگان کے لیے ہے (سابق: فرانس میں اورنج)۔ یہ Dolibarr یا PHP کے ساتھ مسئلہ نہیں ہے بلکہ وصول کرنے والے میل سرور کے ساتھ ہے۔ تاہم آپ سیٹ اپ میں ایک آپشن MAIN_FIX_FOR_BUGGED_MTA کو 1 میں شامل کر سکتے ہیں - اس سے بچنے کے لیے Dolibarr میں ترمیم کرنے کے لیے دوسرا۔ تاہم، آپ کو دوسرے سرورز کے ساتھ مسائل کا سامنا ہو سکتا ہے جو SMTP معیار کو سختی سے استعمال کرتے ہیں۔ دوسرا حل (تجویز کردہ) طریقہ "SMTP ساکٹ لائبریری" استعمال کرنا ہے جس کا کوئی نقصان نہیں ہے۔
+TranslationSetup=ترجمہ کا سیٹ اپ
+TranslationKeySearch=ترجمہ کلید یا تار تلاش کریں۔
+TranslationOverwriteKey=ترجمے کی تار کو اوور رائٹ کریں۔
+TranslationDesc=<br> * پہلے سے طے شدہ / Systemwide: ڈسپلے زبان سیٹ کرنے کے لئے کس طرح -> سیٹ اپ - گھر <strong> مینو فی صارف <br> * </strong>> دکھائیں: سکرین کے سب سے اوپر صارف نام پر کلک کریں اور صارف پر <strong> یوزر ڈسپلے سیٹ اپ </strong> ٹیب پر نظر ثانی کارڈ
+TranslationOverwriteDesc=آپ درج ذیل ٹیبل کو بھرنے والی تاروں کو بھی اوور رائڈ کر سکتے ہیں۔ "%s" ڈراپ ڈاؤن سے اپنی زبان کا انتخاب کریں، "%s" میں ترجمہ کی کلید اور اپنا نیا ترجمہ "%s" میں داخل کریں۔
+TranslationOverwriteDesc2=آپ یہ جاننے میں مدد کے لیے دوسرے ٹیب کا استعمال کر سکتے ہیں کہ کون سی ترجمے کی کلید استعمال کرنی ہے۔
+TranslationString=ترجمے کی تار
+CurrentTranslationString=موجودہ ترجمے کی تار
+WarningAtLeastKeyOrTranslationRequired=کم از کم کلید یا ترجمے کی تار کے لیے تلاش کا معیار درکار ہے۔
+NewTranslationStringToShow=دکھانے کے لیے ترجمہ کی نئی تار
+OriginalValueWas=اصل ترجمہ اوور رائٹ ہے۔ اصل قیمت یہ تھی: <br> <br> %s
+TransKeyWithoutOriginalValue=آپ نے ترجمہ کلید '<strong> %s </strong>' کے لیے ایک نیا ترجمہ مجبور کیا جو کسی بھی زبان کی فائلوں میں موجود نہیں ہے۔
+TitleNumberOfActivatedModules=چالو ماڈیولز
+TotalNumberOfActivatedModules=چالو ماڈیولز: <b> %s </b> / <b> %s a09a4b739f17f80
+YouMustEnableOneModule=آپ کو کم از کم 1 ماڈیول کو فعال کرنا ہوگا۔
+ClassNotFoundIntoPathWarning=کلاس %s پی ایچ پی پاتھ میں نہیں ملی
+YesInSummer=ہاں گرمیوں میں
+OnlyFollowingModulesAreOpenedToExternalUsers=نوٹ کریں، صرف مندرجہ ذیل ماڈیولز بیرونی صارفین کے لیے دستیاب ہیں (اس طرح کے صارفین کی اجازتوں سے قطع نظر) اور صرف اس صورت میں جب اجازت دی گئی ہو: <br>
+SuhosinSessionEncrypt=سیشن اسٹوریج کو سحوسین کے ذریعے خفیہ کردہ
+ConditionIsCurrently=حالت فی الحال %s ہے۔
+YouUseBestDriver=آپ ڈرائیور %s استعمال کرتے ہیں جو اس وقت دستیاب بہترین ڈرائیور ہے۔
+YouDoNotUseBestDriver=آپ ڈرائیور %s استعمال کرتے ہیں لیکن ڈرائیور %s کی سفارش کی جاتی ہے۔
+NbOfObjectIsLowerThanNoPb=آپ کے پاس ڈیٹا بیس میں صرف %s %s ہے۔ اس کے لیے کسی خاص اصلاح کی ضرورت نہیں ہے۔
+ComboListOptim=کومبو لسٹ لوڈنگ آپٹیمائزیشن
+SearchOptim=تلاش کی اصلاح
+YouHaveXObjectUseComboOptim=آپ کے پاس ڈیٹا بیس میں %s %s ہے۔ آپ کلیدی پریسڈ ایونٹ پر کومبو لسٹ کی لوڈنگ کو فعال کرنے کے لیے ماڈیول کے سیٹ اپ میں جا سکتے ہیں۔
+YouHaveXObjectUseSearchOptim=آپ کے پاس ڈیٹا بیس میں %s %s ہے۔ آپ Home-Setup-Other میں مستقل %s کو 1 میں شامل کر سکتے ہیں۔
+YouHaveXObjectUseSearchOptimDesc=یہ تلاش کو تاروں کے آغاز تک محدود کر دیتا ہے جس سے ڈیٹا بیس کے لیے اشاریہ جات کا استعمال ممکن ہو جاتا ہے اور آپ کو فوری جواب ملنا چاہیے۔
+YouHaveXObjectAndSearchOptimOn=آپ کے پاس ڈیٹا بیس میں %s %s ہے اور مستقل %s ہوم سیٹ اپ-دیگر میں %s پر سیٹ ہے۔
+BrowserIsOK=آپ %s ویب براؤزر استعمال کر رہے ہیں۔ یہ براؤزر سیکورٹی اور کارکردگی کے لیے ٹھیک ہے۔
+BrowserIsKO=آپ %s ویب براؤزر استعمال کر رہے ہیں۔ یہ براؤزر سیکورٹی، کارکردگی اور قابل اعتماد کے لیے ایک برا انتخاب کے طور پر جانا جاتا ہے۔ ہم Firefox، Chrome، Opera یا Safari استعمال کرنے کی تجویز کرتے ہیں۔
+PHPModuleLoaded=پی ایچ پی کا جزو %s لوڈ ہے۔
+PreloadOPCode=پہلے سے لوڈ شدہ اوپکوڈ استعمال کیا جاتا ہے۔
+AddRefInList=کسٹمر/وینڈر ریفری ڈسپلے کریں۔ کومبو فہرستوں میں۔ <br> فریق ثالث "CC12345 - SC45678 - The Big Company corp" کے نام کی شکل کے ساتھ ظاہر ہوں گے۔ "The Big Company corp" کے بجائے۔
+AddVatInList=کسٹمر/وینڈر VAT نمبر کومبو لسٹوں میں دکھائیں۔
+AddAdressInList=کومبو لسٹوں میں کسٹمر/وینڈر کا پتہ دکھائیں۔ <br> فریق ثالث "The Big Company corp." کے بجائے "The Big Company corp. - 21 jump street 123456 Big town - USA" کے نام کی شکل کے ساتھ ظاہر ہوں گے۔
+AddEmailPhoneTownInContactList=رابطہ ای میل (یا فونز کی اگر وضاحت نہیں کی گئی ہے) اور شہر کی معلومات کی فہرست (منتخب فہرست یا کومبو باکس) <br> رابطے "Dupond Durand - dupond.durand@email.com - پیرس" یا "Dupond Durand - 06 07" کے نام کی شکل کے ساتھ ظاہر ہوں گے۔ 59 65 66 - "ڈوپونڈ ڈیورنڈ" کی بجائے پیرس۔
+AskForPreferredShippingMethod=فریق ثالث کے لیے ترسیل کا ترجیحی طریقہ پوچھیں۔
+FieldEdition=فیلڈ کا ایڈیشن %s
+FillThisOnlyIfRequired=مثال: +2 (صرف اس صورت میں بھریں جب ٹائم زون آفسیٹ کے مسائل کا سامنا ہو)
+GetBarCode=بارکوڈ حاصل کریں۔
+NumberingModules=نمبر دینے والے ماڈل
+DocumentModules=دستاویزی ماڈلز
+##### Module password generation
+PasswordGenerationStandard=اندرونی Dolibarr الگورتھم کے مطابق تیار کردہ پاس ورڈ واپس کریں: %s حروف جس میں مشترکہ نمبر اور چھوٹے حروف شامل ہوں۔
+PasswordGenerationNone=تیار کردہ پاس ورڈ تجویز نہ کریں۔ پاس ورڈ کو دستی طور پر ٹائپ کرنا ضروری ہے۔
+PasswordGenerationPerso=اپنی ذاتی طور پر طے شدہ ترتیب کے مطابق پاس ورڈ واپس کریں۔
+SetupPerso=آپ کی ترتیب کے مطابق
+PasswordPatternDesc=پاس ورڈ پیٹرن کی تفصیل
+##### Users setup #####
+RuleForGeneratedPasswords=پاس ورڈ بنانے اور ان کی توثیق کرنے کے اصول
+DisableForgetPasswordLinkOnLogonPage=لاگ ان صفحہ پر "پاس ورڈ بھول گئے" کا لنک مت دکھائیں۔
+UsersSetup=صارفین کا ماڈیول سیٹ اپ
+UserMailRequired=نیا صارف بنانے کے لیے ای میل درکار ہے۔
+UserHideInactive=غیر فعال صارفین کو صارفین کی تمام کومبو فہرستوں سے چھپائیں (تجویز نہیں کی گئی: اس کا مطلب یہ ہو سکتا ہے کہ آپ کچھ صفحات پر پرانے صارفین کو فلٹر یا تلاش نہیں کر سکیں گے)
+UsersDocModules=صارف کے ریکارڈ سے تیار کردہ دستاویزات کے لیے دستاویزی ٹیمپلیٹس
+GroupsDocModules=ایک گروپ ریکارڈ سے تیار کردہ دستاویزات کے لیے دستاویزی ٹیمپلیٹس
+##### HRM setup #####
+HRMSetup=HRM ماڈیول سیٹ اپ
+##### Company setup #####
+CompanySetup=کمپنیاں ماڈیول سیٹ اپ
+CompanyCodeChecker=کسٹمر/وینڈر کوڈز کی خودکار تخلیق کے اختیارات
+AccountCodeManager=کسٹمر/وینڈر اکاؤنٹنگ کوڈز کی خودکار تخلیق کے لیے اختیارات
+NotificationsDesc=کچھ Dolibarr واقعات کے لیے ای میل اطلاعات خود بخود بھیجی جا سکتی ہیں۔ <br> اطلاعات کے وصول کنندگان کی تعریف کی جا سکتی ہے:
+NotificationsDescUser=* فی صارف، ایک وقت میں ایک صارف۔
+NotificationsDescContact=* فی تھرڈ پارٹی رابطے (گاہک یا دکاندار)، ایک وقت میں ایک رابطہ۔
+NotificationsDescGlobal=* یا ماڈیول کے سیٹ اپ صفحہ میں عالمی ای میل پتوں کو ترتیب دے کر۔
+ModelModules=دستاویز کے سانچے
+DocumentModelOdt=OpenDocument ٹیمپلیٹس سے دستاویزات تیار کریں (LibreOffice، OpenOffice، KOffice، TextEdit،... سے ODT / .ODS فائلیں)
+WatermarkOnDraft=مسودہ دستاویز پر واٹر مارک
+JSOnPaimentBill=ادائیگی کے فارم پر ادائیگی کی لائنوں کو خود سے بھرنے کے لیے خصوصیت کو فعال کریں۔
+CompanyIdProfChecker=پروفیشنل آئی ڈی کے لیے قواعد
+MustBeUnique=منفرد ہونا ضروری ہے؟
+MustBeMandatory=تیسرے فریق بنانا لازمی ہے (اگر VAT نمبر یا کمپنی کی قسم کی وضاحت کی گئی ہے)؟
+MustBeInvoiceMandatory=انوائس کی توثیق کرنا لازمی ہے؟
+TechnicalServicesProvided=تکنیکی خدمات فراہم کی گئیں۔
+#####DAV #####
+WebDAVSetupDesc=یہ WebDAV ڈائریکٹری تک رسائی کا لنک ہے۔ اس میں ایک "عوامی" ڈائرکٹری ہے جو کسی بھی صارف کے لیے کھلا ہے جو یو آر ایل کو جانتا ہے (اگر عوامی ڈائریکٹری تک رسائی کی اجازت ہے) اور ایک "نجی" ڈائریکٹری ہے جس تک رسائی کے لیے موجودہ لاگ ان اکاؤنٹ/ پاس ورڈ کی ضرورت ہے۔
+WebDavServer=%s سرور کا روٹ URL: %s
+##### Webcal setup #####
+WebCalUrlForVCalExport=<b> %s </b> فارمیٹ کا ایکسپورٹ لنک درج ذیل لنک پر دستیاب ہے: %s
+##### Invoices #####
+BillsSetup=انوائس ماڈیول سیٹ اپ
+BillsNumberingModule=انوائسز اور کریڈٹ نوٹس نمبرنگ ماڈل
+BillsPDFModules=انوائس دستاویزات کے ماڈل
+BillsPDFModulesAccordindToInvoiceType=انوائس کی قسم کے مطابق انوائس دستاویزات کے ماڈل
+PaymentsPDFModules=ادائیگی کے دستاویزات کے ماڈل
+ForceInvoiceDate=انوائس کی تاریخ کو توثیق کی تاریخ پر مجبور کریں۔
+SuggestedPaymentModesIfNotDefinedInInvoice=انوائس پر تجویز کردہ ادائیگیوں کا موڈ بطور ڈیفالٹ اگر انوائس پر بیان نہیں کیا گیا ہے۔
+SuggestPaymentByRIBOnAccount=اکاؤنٹ پر رقم نکال کر ادائیگی کی تجویز کریں۔
+SuggestPaymentByChequeToAddress=چیک کے ذریعے ادائیگی کی تجویز کریں۔
+FreeLegalTextOnInvoices=رسیدوں پر مفت متن
+WatermarkOnDraftInvoices=ڈرافٹ رسیدوں پر واٹر مارک (اگر خالی نہ ہو)
+PaymentsNumberingModule=ادائیگیوں کا نمبر دینے والا ماڈل
+SuppliersPayment=وینڈر کی ادائیگی
+SupplierPaymentSetup=وینڈر ادائیگیوں کا سیٹ اپ
+##### Proposals #####
+PropalSetup=تجارتی تجاویز ماڈیول سیٹ اپ
+ProposalsNumberingModules=تجارتی تجویز نمبر دینے والے ماڈل
+ProposalsPDFModules=تجارتی تجویز کے دستاویزات کے ماڈل
+SuggestedPaymentModesIfNotDefinedInProposal=تجویز کردہ ادائیگیوں کا موڈ بطور ڈیفالٹ اگر تجویز پر بیان نہیں کیا گیا ہے۔
+FreeLegalTextOnProposal=تجارتی تجاویز پر مفت متن
+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=آرڈر کے لیے گودام کے ماخذ سے پوچھیں۔
+##### Suppliers Orders #####
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=پرچیز آرڈر کے بینک اکاؤنٹ کی منزل کے لیے پوچھیں۔
+##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=سیلز آرڈر پر تجویز کردہ ادائیگی کا موڈ بذریعہ ڈیفالٹ اگر آرڈر پر بیان نہ کیا گیا ہو۔
+OrdersSetup=سیلز آرڈر مینجمنٹ سیٹ اپ
+OrdersNumberingModules=نمبر دینے والے ماڈلز کا آرڈر دیں۔
+OrdersModelModule=دستاویزات کے ماڈل آرڈر کریں۔
+FreeLegalTextOnOrders=آرڈر پر مفت متن
+WatermarkOnDraftOrders=ڈرافٹ آرڈرز پر واٹر مارک (اگر خالی نہ ہو)
+ShippableOrderIconInList=آرڈرز کی فہرست میں ایک آئیکن شامل کریں جو اس بات کی نشاندہی کرتا ہے کہ آیا آرڈر قابل ترسیل ہے۔
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=آرڈر کی منزل کے لیے بینک اکاؤنٹ سے پوچھیں۔
+##### Interventions #####
+InterventionsSetup=مداخلت ماڈیول سیٹ اپ
+FreeLegalTextOnInterventions=مداخلتی دستاویزات پر مفت متن
+FicheinterNumberingModules=مداخلت کے نمبر دینے والے ماڈل
+TemplatePDFInterventions=مداخلت کارڈ کے دستاویزات کے ماڈل
+WatermarkOnDraftInterventionCards=انٹروینشن کارڈ دستاویزات پر واٹر مارک (اگر خالی نہ ہو)
+##### Contracts #####
+ContractsSetup=کنٹریکٹس/سبسکرپشنز ماڈیول سیٹ اپ
+ContractsNumberingModules=کنٹریکٹ نمبرنگ ماڈیولز
+TemplatePDFContracts=معاہدہ دستاویزات کے ماڈلز
+FreeLegalTextOnContracts=معاہدوں پر مفت متن
+WatermarkOnDraftContractCards=مسودہ معاہدوں پر واٹر مارک (اگر خالی نہ ہو)
+##### Members #####
+MembersSetup=ممبران ماڈیول سیٹ اپ
+MemberMainOptions=اہم اختیارات
+AdherentLoginRequired= ہر ممبر کے لیے لاگ ان کا انتظام کریں۔
+AdherentMailRequired=نیا رکن بنانے کے لیے ای میل درکار ہے۔
+MemberSendInformationByMailByDefault=اراکین کو میل کی تصدیق بھیجنے کے لیے چیک باکس (توثیق یا نئی رکنیت) بطور ڈیفالٹ آن ہے۔
+MemberCreateAnExternalUserForSubscriptionValidated=ہر نئے رکن کی توثیق شدہ رکنیت کے لیے ایک بیرونی صارف لاگ ان بنائیں
+VisitorCanChooseItsPaymentMode=وزیٹر دستیاب ادائیگی کے طریقوں میں سے انتخاب کر سکتا ہے۔
+MEMBER_REMINDER_EMAIL=میعاد ختم ہونے والی سبسکرپشنز کی ای میل </b> کے ذریعے خودکار یاد دہانی <b> کو فعال کریں۔ نوٹ: یاد دہانی بھیجنے کے لیے ماڈیول <strong> %s </strong> فعال اور درست طریقے سے سیٹ اپ ہونا چاہیے۔
+MembersDocModules=ممبر کے ریکارڈ سے تیار کردہ دستاویزات کے لیے دستاویزی ٹیمپلیٹس
+##### LDAP setup #####
+LDAPSetup=LDAP سیٹ اپ
+LDAPGlobalParameters=عالمی پیرامیٹرز
+LDAPUsersSynchro=صارفین
+LDAPGroupsSynchro=گروپس
+LDAPContactsSynchro=رابطے
+LDAPMembersSynchro=ممبران
+LDAPMembersTypesSynchro=اراکین کی اقسام
+LDAPSynchronization=LDAP مطابقت پذیری
+LDAPFunctionsNotAvailableOnPHP=LDAP فنکشنز آپ کے PHP پر دستیاب نہیں ہیں۔
+LDAPToDolibarr=LDAP -> Dolibarr
+DolibarrToLDAP=Dolibarr -> LDAP
+LDAPNamingAttribute=LDAP میں کلید
+LDAPSynchronizeUsers=LDAP میں صارفین کی تنظیم
+LDAPSynchronizeGroups=LDAP میں گروپوں کی تنظیم
+LDAPSynchronizeContacts=LDAP میں رابطوں کی تنظیم
+LDAPSynchronizeMembers=LDAP میں فاؤنڈیشن کے اراکین کی تنظیم
+LDAPSynchronizeMembersTypes=LDAP میں فاؤنڈیشن کے اراکین کی اقسام کی تنظیم
+LDAPPrimaryServer=بنیادی سرور
+LDAPSecondaryServer=ثانوی سرور
+LDAPServerPort=سرور پورٹ
+LDAPServerPortExample=معیاری یا StartTLS: 389، LDAPs: 636
+LDAPServerProtocolVersion=پروٹوکول ورژن
+LDAPServerUseTLS=TLS استعمال کریں۔
+LDAPServerUseTLSExample=آپ کا LDAP سرور StartTLS استعمال کرتا ہے۔
+LDAPServerDn=سرور DN
+LDAPAdminDn=ایڈمنسٹریٹر ڈی این
+LDAPAdminDnExample=مکمل DN (مثال کے طور پر: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com فعال ڈائریکٹری کے لیے)
+LDAPPassword=ایڈمنسٹریٹر پاس ورڈ
+LDAPUserDn=صارفین کا ڈی این
+LDAPUserDnExample=مکمل DN (مثال کے طور پر: ou=users,dc=example,dc=com)
+LDAPGroupDn=گروپس کا ڈی این
+LDAPGroupDnExample=مکمل DN (مثال کے طور پر: ou=groups,dc=example,dc=com)
+LDAPServerExample=سرور کا پتہ (مثال کے طور پر: لوکل ہوسٹ، 192.168.0.2، ldaps://ldap.example.com/)
+LDAPServerDnExample=مکمل DN (مثال کے طور پر: dc=example,dc=com)
+LDAPDnSynchroActive=صارفین اور گروپس کی مطابقت پذیری
+LDAPDnSynchroActiveExample=LDAP سے Dolibarr یا Dolibarr سے LDAP مطابقت پذیری
+LDAPDnContactActive=رابطوں کی مطابقت پذیری
+LDAPDnContactActiveExample=فعال/غیر فعال مطابقت پذیری
+LDAPDnMemberActive=اراکین کی ہم آہنگی۔
+LDAPDnMemberActiveExample=فعال/غیر فعال مطابقت پذیری
+LDAPDnMemberTypeActive=اراکین کی اقسام کی مطابقت پذیری۔
+LDAPDnMemberTypeActiveExample=فعال/غیر فعال مطابقت پذیری
+LDAPContactDn=Dolibarr رابطے 'DN
+LDAPContactDnExample=مکمل DN (مثال کے طور پر: ou=contacts,dc=example,dc=com)
+LDAPMemberDn=Dolibarr کے ارکان DN
+LDAPMemberDnExample=مکمل DN (مثال کے طور پر: ou=members,dc=example,dc=com)
+LDAPMemberObjectClassList=آبجیکٹ کلاس کی فہرست
+LDAPMemberObjectClassListExample=آبجیکٹ کلاس کی وضاحت کرنے والے ریکارڈ کے اوصاف کی فہرست (مثال کے طور پر: ٹاپ، انیٹ آرگ پرسن یا ٹاپ، ایکٹو ڈائریکٹری کے لیے صارف)
+LDAPMemberTypeDn=Dolibarr کے ارکان DN کی قسمیں
+LDAPMemberTypepDnExample=مکمل DN (مثال کے طور پر: ou=membertypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassList=آبجیکٹ کلاس کی فہرست
+LDAPMemberTypeObjectClassListExample=آبجیکٹ کلاس کی وضاحت کرنے والے ریکارڈ کی خصوصیات کی فہرست (مثال کے طور پر: ٹاپ، گروپ آف یونیک نام)
+LDAPUserObjectClassList=آبجیکٹ کلاس کی فہرست
+LDAPUserObjectClassListExample=آبجیکٹ کلاس کی وضاحت کرنے والے ریکارڈ کے اوصاف کی فہرست (مثال کے طور پر: ٹاپ، انیٹ آرگ پرسن یا ٹاپ، ایکٹو ڈائریکٹری کے لیے صارف)
+LDAPGroupObjectClassList=آبجیکٹ کلاس کی فہرست
+LDAPGroupObjectClassListExample=آبجیکٹ کلاس کی وضاحت کرنے والے ریکارڈ کی خصوصیات کی فہرست (مثال کے طور پر: ٹاپ، گروپ آف یونیک نام)
+LDAPContactObjectClassList=آبجیکٹ کلاس کی فہرست
+LDAPContactObjectClassListExample=آبجیکٹ کلاس کی وضاحت کرنے والے ریکارڈ کے اوصاف کی فہرست (مثال کے طور پر: ٹاپ، انیٹ آرگ پرسن یا ٹاپ، ایکٹو ڈائریکٹری کے لیے صارف)
+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 سرور سے جڑیں/ تصدیق کریں کامیاب (Server=%s, Port=%s, Admin=%s, پاس ورڈ=%s)
+LDAPBindKO=LDAP سرور سے جڑنا/تصدیق کرنا ناکام ہو گیا (Server=%s, Port=%s, Admin=%s, پاس ورڈ=%s)
+LDAPSetupForVersion3=LDAP سرور ورژن 3 کے لیے ترتیب دیا گیا ہے۔
+LDAPSetupForVersion2=LDAP سرور ورژن 2 کے لیے ترتیب دیا گیا ہے۔
+LDAPDolibarrMapping=ڈولیبر میپنگ
+LDAPLdapMapping=LDAP میپنگ
+LDAPFieldLoginUnix=لاگ ان (یونکس)
+LDAPFieldLoginExample=مثال: uid
+LDAPFilterConnection=فلٹر تلاش کریں۔
+LDAPFilterConnectionExample=مثال: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=مثال: &(objectClass=groupOfUsers)
+LDAPFieldLoginSamba=لاگ ان (سامبا، ایکٹو ڈائرکٹری)
+LDAPFieldLoginSambaExample=مثال: samaccountname
+LDAPFieldFullname=پورا نام
+LDAPFieldFullnameExample=مثال: cn
+LDAPFieldPasswordNotCrypted=پاس ورڈ کو خفیہ نہیں کیا گیا۔
+LDAPFieldPasswordCrypted=پاس ورڈ کو خفیہ کر دیا گیا۔
+LDAPFieldPasswordExample=مثال: یوزر پاس ورڈ
+LDAPFieldCommonNameExample=مثال: cn
+LDAPFieldName=نام
+LDAPFieldNameExample=مثال: sn
+LDAPFieldFirstName=پہلا نام
+LDAPFieldFirstNameExample=مثال: دیا ہوا نام
+LDAPFieldMail=ای میل اڈریس
+LDAPFieldMailExample=مثال: میل
+LDAPFieldPhone=پیشہ ورانہ فون نمبر
+LDAPFieldPhoneExample=مثال: ٹیلی فون نمبر
+LDAPFieldHomePhone=ذاتی فون نمبر
+LDAPFieldHomePhoneExample=مثال: ہوم فون
+LDAPFieldMobile=موبائل فون
+LDAPFieldMobileExample=مثال: موبائل
+LDAPFieldFax=فیکس نمبر
+LDAPFieldFaxExample=مثال: نقلی ٹیلی فون نمبر
+LDAPFieldAddress=گلی
+LDAPFieldAddressExample=مثال: گلی
+LDAPFieldZip=زپ
+LDAPFieldZipExample=مثال: پوسٹل کوڈ
+LDAPFieldTown=شہر
+LDAPFieldTownExample=مثال: ایل
+LDAPFieldCountry=ملک
+LDAPFieldDescription=تفصیل
+LDAPFieldDescriptionExample=مثال: وضاحت
+LDAPFieldNotePublic=عوامی نوٹ
+LDAPFieldNotePublicExample=مثال: عوامی نوٹ
+LDAPFieldGroupMembers= گروپ کے اراکین
+LDAPFieldGroupMembersExample= مثال: uniqueMember
+LDAPFieldBirthdate=تاریخ پیدائش
+LDAPFieldCompany=کمپنی
+LDAPFieldCompanyExample=مثال: o
+LDAPFieldSid=ایس آئی ڈی
+LDAPFieldSidExample=مثال: آبجیکٹس
+LDAPFieldEndLastSubscription=سبسکرپشن ختم ہونے کی تاریخ
+LDAPFieldTitle=عہدہ
+LDAPFieldTitleExample=مثال: عنوان
+LDAPFieldGroupid=گروپ آئی ڈی
+LDAPFieldGroupidExample=مثال: gidnumber
+LDAPFieldUserid=صارف کی شناخت
+LDAPFieldUseridExample=مثال: uidnumber
+LDAPFieldHomedirectory=ہوم ڈائریکٹری
+LDAPFieldHomedirectoryExample=مثال: ہوم ڈائریکٹری
+LDAPFieldHomedirectoryprefix=ہوم ڈائریکٹری کا سابقہ
+LDAPSetupNotComplete=LDAP سیٹ اپ مکمل نہیں ہوا (دوسرے ٹیبز پر جائیں)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=کوئی ایڈمنسٹریٹر یا پاس ورڈ فراہم نہیں کیا گیا۔ LDAP رسائی گمنام اور صرف پڑھنے کے موڈ میں ہوگی۔
+LDAPDescContact=یہ صفحہ آپ کو Dolibarr رابطوں پر پائے جانے والے ہر ڈیٹا کے لیے LDAP ٹری میں LDAP انتساب کے نام کی وضاحت کرنے کی اجازت دیتا ہے۔
+LDAPDescUsers=یہ صفحہ آپ کو Dolibarr صارفین پر پائے جانے والے ہر ڈیٹا کے لیے LDAP ٹری میں LDAP انتساب کے نام کی وضاحت کرنے کی اجازت دیتا ہے۔
+LDAPDescGroups=یہ صفحہ آپ کو Dolibarr گروپس پر پائے جانے والے ہر ڈیٹا کے لیے LDAP ٹری میں LDAP انتساب کے نام کی وضاحت کرنے کی اجازت دیتا ہے۔
+LDAPDescMembers=یہ صفحہ آپ کو ڈولیبر ممبرز ماڈیول پر پائے جانے والے ہر ڈیٹا کے لیے LDAP ٹری میں LDAP انتساب کے نام کی وضاحت کرنے کی اجازت دیتا ہے۔
+LDAPDescMembersTypes=یہ صفحہ آپ کو LDAP ٹری میں LDAP انتسابات کے نام کی وضاحت کرنے کی اجازت دیتا ہے جو Dolibarr ممبرز کی اقسام پر پائے جاتے ہیں۔
+LDAPDescValues=مثال کی قدریں <b> OpenLDAP </b> کے لیے درج ذیل بھری ہوئی اسکیموں کے ساتھ ڈیزائن کی گئی ہیں: <b> core.schema, cosine.schema, inetorgperson.schema a09a4b7789)۔ اگر آپ وہ اقدار اور OpenLDAP استعمال کرتے ہیں، تو اپنی LDAP کنفگ فائل <b> slapd.conf </b> میں ترمیم کریں تاکہ تمام اسکیموں کو لوڈ کیا جاسکے۔
+ForANonAnonymousAccess=ایک مستند رسائی کے لیے (مثال کے طور پر تحریری رسائی کے لیے)
+PerfDolibarr=کارکردگی کا سیٹ اپ/آپٹیمائزنگ رپورٹ
+YouMayFindPerfAdviceHere=یہ صفحہ کارکردگی سے متعلق کچھ چیک یا مشورہ فراہم کرتا ہے۔
+NotInstalled=انسٹال نہیں ہے۔
+NotSlowedDownByThis=اس سے سست نہیں ہوا۔
+NotRiskOfLeakWithThis=اس کے ساتھ لیک ہونے کا خطرہ نہیں۔
+ApplicativeCache=قابل اطلاق کیشے
+MemcachedNotAvailable=کوئی قابل اطلاق کیش نہیں ملا۔ آپ کیش سرور Memcached اور اس کیش سرور کو استعمال کرنے کے قابل ایک ماڈیول انسٹال کرکے کارکردگی کو بڑھا سکتے ہیں۔ <br> مزید معلومات یہاں <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http://wiki.dolibarr.org/index.php/Module_MemCached_EN </a> ۔ <br> نوٹ کریں کہ بہت سارے ویب ہوسٹنگ فراہم کنندہ ایسے کیش سرور فراہم نہیں کرتے ہیں۔
+MemcachedModuleAvailableButNotSetup=اطلاقی کیشے کے لیے ماڈیول میم کیچ مل گیا لیکن ماڈیول کا سیٹ اپ مکمل نہیں ہے۔
+MemcachedAvailableAndSetup=memcached سرور کو استعمال کرنے کے لیے وقف کردہ ماڈیول میم کیش فعال ہے۔
+OPCodeCache=اوپکوڈ کیشے
+NoOPCodeCacheFound=کوئی OPCode کیشے نہیں ملا۔ ہو سکتا ہے کہ آپ XCache یا eAccelerator (اچھا) کے علاوہ کوئی OPCode کیشے استعمال کر رہے ہوں، یا ہو سکتا ہے کہ آپ کے پاس OPCode کیش نہ ہو (بہت خراب)۔
+HTTPCacheStaticResources=جامد وسائل کے لیے HTTP کیشے (css، img، javascript)
+FilesOfTypeCached=%s قسم کی فائلیں HTTP سرور کے ذریعہ کیش کی جاتی ہیں۔
+FilesOfTypeNotCached=%s قسم کی فائلیں HTTP سرور کے ذریعہ کیش نہیں ہوتی ہیں۔
+FilesOfTypeCompressed=%s قسم کی فائلوں کو HTTP سرور کے ذریعے کمپریس کیا جاتا ہے۔
+FilesOfTypeNotCompressed=%s قسم کی فائلیں HTTP سرور کے ذریعہ کمپریس نہیں ہوتی ہیں۔
+CacheByServer=کیش بذریعہ سرور
+CacheByServerDesc=مثال کے طور پر اپاچی ہدایت کا استعمال کرتے ہوئے "ExpiresByType image/gif A2592000"
+CacheByClient=براؤزر کے ذریعہ کیش
+CompressionOfResources=HTTP ردعمل کا کمپریشن
+CompressionOfResourcesDesc=مثال کے طور پر اپاچی ہدایت کا استعمال کرتے ہوئے "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=موجودہ براؤزرز کے ساتھ اس طرح کا خودکار پتہ لگانا ممکن نہیں ہے۔
+DefaultValuesDesc=یہاں آپ ڈیفالٹ ویلیو کی وضاحت کر سکتے ہیں جسے آپ نیا ریکارڈ بناتے وقت استعمال کرنا چاہتے ہیں، اور/یا ڈیفالٹ فلٹرز یا ترتیب کی ترتیب جب آپ ریکارڈ کی فہرست بناتے ہیں۔
+DefaultCreateForm=پہلے سے طے شدہ اقدار (فارم پر استعمال کرنے کے لیے)
+DefaultSearchFilters=پہلے سے طے شدہ تلاش کے فلٹرز
+DefaultSortOrder=پہلے سے طے شدہ ترتیب کے احکامات
+DefaultFocus=پہلے سے طے شدہ فوکس فیلڈز
+DefaultMandatory=لازمی فارم فیلڈز
+##### Products #####
+ProductSetup=مصنوعات ماڈیول سیٹ اپ
+ServiceSetup=سروسز ماڈیول سیٹ اپ
+ProductServiceSetup=مصنوعات اور خدمات کے ماڈیول سیٹ اپ
+NumberOfProductShowInSelect=کومبو سلیکٹ لسٹ میں دکھانے کے لیے مصنوعات کی زیادہ سے زیادہ تعداد (0=کوئی حد نہیں)
+ViewProductDescInFormAbility=مصنوعات کی تفصیل آئٹمز کی لائنوں میں دکھائیں (بصورت دیگر ٹول ٹپ پاپ اپ میں تفصیل دکھائیں)
+OnProductSelectAddProductDesc=کسی پروڈکٹ کو دستاویز کی لائن کے طور پر شامل کرتے وقت مصنوعات کی تفصیل کا استعمال کیسے کریں۔
+AutoFillFormFieldBeforeSubmit=پروڈکٹ کی تفصیل کے ساتھ ڈسکرپشن ان پٹ فیلڈ کو خود بخود بھریں۔
+DoNotAutofillButAutoConcat=پروڈکٹ کی تفصیل کے ساتھ ان پٹ فیلڈ کو آٹو فل نہ کریں۔ پروڈکٹ کی تفصیل خود بخود درج کی گئی تفصیل سے مربوط ہو جائے گی۔
+DoNotUseDescriptionOfProdut=پروڈکٹ کی تفصیل کو کبھی بھی دستاویزات کی لائنوں کی تفصیل میں شامل نہیں کیا جائے گا۔
+MergePropalProductCard=اگر پروڈکٹ/سروس تجویز میں ہے تو پروڈکٹ/سروس اٹیچڈ فائلز ٹیب میں پروڈکٹ پی ڈی ایف دستاویز کو پی ڈی ایف ایزور کی تجویز میں ضم کرنے کا آپشن میں ایکٹیویٹ کریں۔
+ViewProductDescInThirdpartyLanguageAbility=مصنوعات کی تفصیل کو فریق ثالث کی زبان میں فارم میں دکھائیں (بصورت دیگر صارف کی زبان میں)
+UseSearchToSelectProductTooltip=اس کے علاوہ اگر آپ کے پاس پروڈکٹس کی ایک بڑی تعداد ہے (> 100 000)، تو آپ سیٹ اپ->دیگر میں مسلسل PRODUCT_DONOTSEARCH_ANYWHERE کو 1 پر سیٹ کرکے رفتار بڑھا سکتے ہیں۔ تلاش پھر سٹرنگ کے آغاز تک محدود ہو جائے گی۔
+UseSearchToSelectProduct=اس وقت تک انتظار کریں جب تک کہ آپ پروڈکٹ کومبو لسٹ کے مواد کو لوڈ کرنے سے پہلے ایک کلید کو دبائیں (اگر آپ کے پاس پروڈکٹس کی ایک بڑی تعداد ہے تو اس سے کارکردگی بڑھ سکتی ہے، لیکن یہ کم آسان ہے)
+SetDefaultBarcodeTypeProducts=مصنوعات کے لیے استعمال کرنے کے لیے ڈیفالٹ بار کوڈ کی قسم
+SetDefaultBarcodeTypeThirdParties=تیسرے فریق کے لیے استعمال کرنے کے لیے ڈیفالٹ بار کوڈ کی قسم
+UseUnits=آرڈر، تجویز یا انوائس لائنز ایڈیشن کے دوران مقدار کے لیے پیمائش کی اکائی کی وضاحت کریں۔
+ProductCodeChecker= پروڈکٹ کوڈ جنریشن اور چیکنگ کے لیے ماڈیول (پروڈکٹ یا سروس)
+ProductOtherConf= پروڈکٹ/سروس کنفیگریشن
+IsNotADir=ڈائریکٹری نہیں ہے!
+##### Syslog #####
+SyslogSetup=لاگز ماڈیول سیٹ اپ
+SyslogOutput=لاگ آؤٹ پٹس
+SyslogFacility=سہولت
+SyslogLevel=سطح
+SyslogFilename=فائل کا نام اور راستہ
+YouCanUseDOL_DATA_ROOT=آپ Dolibarr "دستاویزات" ڈائریکٹری میں لاگ فائل کے لیے DOL_DATA_ROOT/dolibarr.log استعمال کر سکتے ہیں۔ آپ اس فائل کو ذخیرہ کرنے کے لیے ایک مختلف راستہ ترتیب دے سکتے ہیں۔
+ErrorUnknownSyslogConstant=مستقل %s ایک معروف Syslog مستقل نہیں ہے۔
+OnlyWindowsLOG_USER=ونڈوز پر، صرف LOG_USER سہولت کو سپورٹ کیا جائے گا۔
+CompressSyslogs=ڈیبگ لاگ فائلوں کا کمپریشن اور بیک اپ (ڈیبگ کے لیے ماڈیول لاگ کے ذریعے تیار کردہ)
+SyslogFileNumberOfSaves=رکھنے کے لیے بیک اپ لاگز کی تعداد
+ConfigureCleaningCronjobToSetFrequencyOfSaves=لاگ بیک اپ فریکوئنسی سیٹ کرنے کے لیے صفائی کے شیڈول کردہ کام کو ترتیب دیں۔
+##### Donations #####
+DonationsSetup=عطیہ ماڈیول سیٹ اپ
+DonationsReceiptModel=عطیہ کی رسید کا سانچہ
+##### Barcode #####
+BarcodeSetup=بارکوڈ سیٹ اپ
+PaperFormatModule=پرنٹ فارمیٹ ماڈیول
+BarcodeEncodeModule=بارکوڈ انکوڈنگ کی قسم
+CodeBarGenerator=بارکوڈ جنریٹر
+ChooseABarCode=کوئی جنریٹر متعین نہیں ہے۔
+FormatNotSupportedByGenerator=فارمیٹ اس جنریٹر کے ذریعہ تعاون یافتہ نہیں ہے۔
+BarcodeDescEAN8=EAN8 قسم کا بارکوڈ
+BarcodeDescEAN13=EAN13 قسم کا بارکوڈ
+BarcodeDescUPC=UPC قسم کا بارکوڈ
+BarcodeDescISBN=ISBN قسم کا بارکوڈ
+BarcodeDescC39=C39 قسم کا بارکوڈ
+BarcodeDescC128=C128 قسم کا بارکوڈ
+BarcodeDescDATAMATRIX=ڈیٹا میٹرکس کی قسم کا بارکوڈ
+BarcodeDescQRCODE=بار کوڈ قسم کیو آر کوڈ
+GenbarcodeLocation=بار کوڈ جنریشن کمانڈ لائن ٹول (کچھ بار کوڈ کی اقسام کے لیے اندرونی انجن کے ذریعے استعمال کیا جاتا ہے)۔ "genbarcode" کے ساتھ ہم آہنگ ہونا ضروری ہے۔ <br> مثال کے طور پر: /usr/local/bin/genbarcode
+BarcodeInternalEngine=اندرونی انجن
+BarCodeNumberManager=بار کوڈ نمبروں کی خود بخود وضاحت کرنے کا مینیجر
+##### Prelevements #####
+WithdrawalsSetup=ماڈیول ڈائریکٹ ڈیبٹ ادائیگیوں کا سیٹ اپ
+##### ExternalRSS #####
+ExternalRSSSetup=بیرونی آر ایس ایس درآمدات کا سیٹ اپ
+NewRSS=نئی آر ایس ایس فیڈ
+RSSUrl=آر ایس ایس یو آر ایل
+RSSUrlExample=ایک دلچسپ RSS فیڈ
+##### Mailing #####
+MailingSetup=ای میلنگ ماڈیول سیٹ اپ
+MailingEMailFrom=ای میل کرنے والے ماڈیول کے ذریعے بھیجی گئی ای میلز کے لیے بھیجنے والا ای میل (منجانب)
+MailingEMailError=غلطیوں والی ای میلز کے لیے ای میل (Errors-to) واپس کریں۔
+MailingDelay=اگلا پیغام بھیجنے کے بعد انتظار کرنے کے لیے سیکنڈ
+##### Notification #####
+NotificationSetup=ای میل نوٹیفکیشن ماڈیول سیٹ اپ
+NotificationEMailFrom=اطلاعات کے ماڈیول کے ذریعے بھیجی گئی ای میلز کے لیے بھیجنے والا ای میل (منجانب)
+FixedEmailTarget=وصول کنندہ
+NotificationDisableConfirmMessageContact=تصدیقی پیغام میں اطلاعات کے وصول کنندگان کی فہرست (بطور رابطہ سبسکرائب شدہ) چھپائیں۔
+NotificationDisableConfirmMessageUser=تصدیقی پیغام میں اطلاعات کے وصول کنندگان کی فہرست (بطور صارف سبسکرائب شدہ) چھپائیں۔
+NotificationDisableConfirmMessageFix=تصدیقی پیغام میں اطلاعات کے وصول کنندگان کی فہرست (عالمی ای میل کے بطور سبسکرائب کردہ) چھپائیں۔
+##### Sendings #####
+SendingsSetup=شپنگ ماڈیول سیٹ اپ
+SendingsReceiptModel=رسید کا ماڈل بھیجنا
+SendingsNumberingModules=نمبرنگ ماڈیول بھیج رہا ہے۔
+SendingsAbility=کسٹمر کی ترسیل کے لیے شپنگ شیٹس کی حمایت کریں۔
+NoNeedForDeliveryReceipts=زیادہ تر معاملات میں، شپنگ شیٹس کو کسٹمر کی ڈیلیوری کے لیے شیٹ کے طور پر استعمال کیا جاتا ہے (بھیجنے کے لیے پروڈکٹس کی فہرست) اور وہ شیٹس جو گاہک کے ذریعے موصول ہوتی ہیں اور ان پر دستخط کیے جاتے ہیں۔ لہذا مصنوعات کی ترسیل کی رسید ایک نقل شدہ خصوصیت ہے اور شاذ و نادر ہی چالو ہوتی ہے۔
+FreeLegalTextOnShippings=ترسیل پر مفت متن
+##### Deliveries #####
+DeliveryOrderNumberingModules=پروڈکٹس کی ترسیل کی رسید نمبرنگ ماڈیول
+DeliveryOrderModel=مصنوعات کی ترسیل کی رسید کا ماڈل
+DeliveriesOrderAbility=سپورٹ مصنوعات کی ترسیل کی رسیدیں
+FreeLegalTextOnDeliveryReceipts=ترسیل کی رسیدوں پر مفت متن
+##### FCKeditor #####
+AdvancedEditor=ایڈوانس ایڈیٹر
+ActivateFCKeditor=اعلی درجے کے ایڈیٹر کو فعال کریں:
+FCKeditorForNotePublic=WYSIWIG عناصر کے "عوامی نوٹس" فیلڈ کا تخلیق/ایڈیشن
+FCKeditorForNotePrivate=WYSIWIG عناصر کے "نجی نوٹ" فیلڈ کی تخلیق/ایڈیشن
+FCKeditorForCompany=WYSIWIG عناصر کی فیلڈ تفصیل کا تخلیق/ایڈیشن (سوائے پروڈکٹس/سروسز)
+FCKeditorForProduct=WYSIWIG مصنوعات/خدمات کی فیلڈ تفصیل کا تخلیق/ایڈیشن
+FCKeditorForProductDetails=WYSIWIG تمام اداروں (تجاویز، آرڈرز، انوائسز وغیرہ...) کے لیے مصنوعات کی تفصیلات کی لائنز کی تخلیق/ایڈیشن۔ <span class="warning"> تنبیہ: اس کیس کے لیے اس اختیار کو استعمال کرنے کی سنجیدگی سے سفارش نہیں کی جاتی ہے کیونکہ یہ پی ڈی ایف فائلز بناتے وقت خصوصی حروف اور صفحہ کی فارمیٹنگ میں مسائل پیدا کر سکتا ہے۔ </span>
+FCKeditorForMailing= بڑے پیمانے پر ای میلنگ کے لیے WYSIWIG تخلیق/ایڈیشن (ٹولز-> ای میلنگ)
+FCKeditorForUserSignature=WYSIWIG تخلیق/صارف کے دستخط کا ایڈیشن
+FCKeditorForMail=تمام میل کے لیے WYSIWIG تخلیق/ایڈیشن (سوائے ٹولز-> ای میلنگ)
+FCKeditorForTicket=ٹکٹوں کے لیے WYSIWIG تخلیق/ایڈیشن
+##### Stock #####
+StockSetup=اسٹاک ماڈیول سیٹ اپ
+IfYouUsePointOfSaleCheckModule=اگر آپ ڈیفالٹ کے ذریعہ فراہم کردہ پوائنٹ آف سیل ماڈیول (POS) یا کسی بیرونی ماڈیول کا استعمال کرتے ہیں، تو اس سیٹ اپ کو آپ کے POS ماڈیول کے ذریعے نظر انداز کیا جا سکتا ہے۔ زیادہ تر POS ماڈیولز کو بطور ڈیفالٹ فوری طور پر انوائس بنانے اور یہاں کے اختیارات سے قطع نظر اسٹاک کو کم کرنے کے لیے ڈیزائن کیا گیا ہے۔ لہذا اگر آپ کو اپنے POS سے سیل رجسٹر کرتے وقت اسٹاک میں کمی کی ضرورت ہے یا نہیں، تو اپنے POS ماڈیول سیٹ اپ کو بھی چیک کریں۔
+##### Menu #####
+MenuDeleted=مینو حذف کر دیا گیا۔
+Menu=مینو
+Menus=مینو
+TreeMenuPersonalized=ذاتی نوعیت کے مینو
+NotTopTreeMenuPersonalized=ذاتی نوعیت کے مینو ٹاپ مینو اندراج سے منسلک نہیں ہیں۔
+NewMenu=نیا مینو
+MenuHandler=مینو ہینڈلر
+MenuModule=ماخذ ماڈیول
+HideUnauthorizedMenu=اندرونی صارفین کے لیے بھی غیر مجاز مینو چھپائیں (بصورت دیگر صرف خاکستری)
+DetailId=آئی ڈی مینو
+DetailMenuHandler=مینو ہینڈلر جہاں نیا مینو دکھانا ہے۔
+DetailMenuModule=ماڈیول کا نام اگر مینو اندراج ماڈیول سے آتا ہے۔
+DetailType=مینو کی قسم (اوپر یا بائیں)
+DetailTitre=ترجمہ کے لیے مینو لیبل یا لیبل کوڈ
+DetailUrl=URL جہاں مینو آپ کو بھیجتا ہے (مطلق URL لنک یا http:// کے ساتھ بیرونی لنک)
+DetailEnabled=اندراج دکھانے یا نہ کرنے کی شرط
+DetailRight=غیر مجاز گرے مینو ڈسپلے کرنے کی حالت
+DetailLangs=لیبل کوڈ کے ترجمہ کے لیے Lang فائل کا نام
+DetailUser=اندرونی / بیرونی / تمام
+Target=ہدف
+DetailTarget=لنکس کے لیے ہدف (_خالی اوپر ایک نئی ونڈو کھولتا ہے)
+DetailLevel=سطح (-1: ٹاپ مینو، 0: ہیڈر مینو، >0 مینو اور سب مینو)
+ModifMenu=مینو میں تبدیلی
+DeleteMenu=مینو اندراج کو حذف کریں۔
+ConfirmDeleteMenu=کیا آپ واقعی مینو انٹری <b> %s </b> کو حذف کرنا چاہتے ہیں؟
+FailedToInitializeMenu=مینو شروع کرنے میں ناکام
+##### Tax #####
+TaxSetup=ٹیکس، سماجی یا مالی ٹیکس اور ڈیویڈنڈ ماڈیول سیٹ اپ
+OptionVatMode=واجب الادا VAT
+OptionVATDefault=معیاری بنیاد
+OptionVATDebitOption=جمع کی بنیاد
+OptionVatDefaultDesc=VAT واجب الادا ہے: <br> - سامان کی ترسیل پر (انوائس کی تاریخ کی بنیاد پر) <br> - خدمات کی ادائیگی پر
+OptionVatDebitOptionDesc=VAT واجب الادا ہے: <br> - سامان کی ترسیل پر (انوائس کی تاریخ پر مبنی) <br> - خدمات کے انوائس (ڈیبٹ) پر
+OptionPaymentForProductAndServices=مصنوعات اور خدمات کے لیے نقد کی بنیاد
+OptionPaymentForProductAndServicesDesc=VAT واجب الادا ہے: <br> - سامان کی ادائیگی پر <br> - خدمات کی ادائیگی پر
+SummaryOfVatExigibilityUsedByDefault=منتخب کردہ اختیار کے مطابق پہلے سے طے شدہ VAT اہلیت کا وقت:
+OnDelivery=پہنچانے پر
+OnPayment=ادائیگی پر
+OnInvoice=رسید پر
+SupposedToBePaymentDate=ادائیگی کی تاریخ استعمال کی گئی۔
+SupposedToBeInvoiceDate=انوائس کی تاریخ استعمال کی گئی۔
+Buy=خریدنے
+Sell=بیچنا
+InvoiceDateUsed=انوائس کی تاریخ استعمال کی گئی۔
+YourCompanyDoesNotUseVAT=آپ کی کمپنی کو VAT (ہوم - سیٹ اپ - کمپنی/تنظیم) استعمال نہ کرنے کی تعریف کی گئی ہے، لہذا سیٹ اپ کے لیے کوئی VAT اختیارات نہیں ہیں۔
+AccountancyCode=اکاؤنٹنگ کوڈ
+AccountancyCodeSell=سیل اکاؤنٹ۔ کوڈ
+AccountancyCodeBuy=خریداری اکاؤنٹ۔ کوڈ
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=نیا ٹیکس بناتے وقت چیک باکس "خودکار طور پر ادائیگی بنائیں" کو بطور ڈیفالٹ خالی رکھیں
+##### Agenda #####
+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> پر ایونٹ کی یاد دہانی کو فعال کریں
+AGENDA_REMINDER_BROWSER_SOUND=آواز کی اطلاع کو فعال کریں۔
+AGENDA_REMINDER_EMAIL=ای میلز </b> کے ذریعے ایونٹ کی یاد دہانی کو فعال کریں
+AGENDA_REMINDER_EMAIL_NOTE=نوٹ: طے شدہ کام %s کی فریکوئنسی اس بات کا یقین کرنے کے لیے کافی ہونی چاہیے کہ یاد دہانی صحیح وقت پر بھیجی گئی ہے۔
+AGENDA_SHOW_LINKED_OBJECT=ایجنڈا ویو میں منسلک آبجیکٹ دکھائیں۔
+##### Clicktodial #####
+ClickToDialSetup=ماڈیول سیٹ اپ ڈائل کرنے کے لیے کلک کریں۔
+ClickToDialUrlDesc=فون پکٹو پر کلک کرنے پر یو آر ایل کو کال کیا جاتا ہے۔ URL میں، آپ استعمال کر سکتے ہیں ٹیگز <br> <b> __PHONETO__ </b> کہ <br> <b> __PHONEFROM__ </b> clicktodial کے ساتھ تبدیل کیا جائے گا کہ وہ شخص (تمہارا) بلا کے فون نمبر سے ہمیں <br> <b> __LOGIN__ </b> کے ساتھ تبدیل کیا جائے گا کہ کال کرنے کے لئے اس شخص کا فون نمبر کے ساتھ تبدیل کیا جائے گا لاگ ان (صارف کارڈ پر بیان کردہ) <br> <b> __PASS__ </b> جسے کلک ٹوڈیل پاس ورڈ (یوزر کارڈ پر بیان کردہ) سے تبدیل کیا جائے گا۔
+ClickToDialDesc=یہ ماڈیول ڈیسک ٹاپ کمپیوٹر کا استعمال کرتے وقت فون نمبروں کو کلک کے قابل لنکس میں تبدیل کرتا ہے۔ ایک کلک نمبر پر کال کرے گا۔ یہ آپ کے ڈیسک ٹاپ پر سافٹ فون استعمال کرتے وقت یا مثال کے طور پر SIP پروٹوکول پر مبنی CTI سسٹم استعمال کرتے وقت فون کال شروع کرنے کے لیے استعمال کیا جا سکتا ہے۔ نوٹ: اسمارٹ فون استعمال کرتے وقت، فون نمبرز ہمیشہ کلک کے قابل ہوتے ہیں۔
+ClickToDialUseTelLink=فون نمبرز پر صرف ایک لنک "tel:" استعمال کریں۔
+ClickToDialUseTelLinkDesc=یہ طریقہ استعمال کریں اگر آپ کے صارفین کے پاس سافٹ فون یا سافٹ ویئر انٹرفیس ہے، جو براؤزر والے کمپیوٹر پر انسٹال ہے، اور جب آپ اپنے براؤزر میں "tel:" سے شروع ہونے والے لنک پر کلک کرتے ہیں تو اسے کال کیا جاتا ہے۔ اگر آپ کو کسی ایسے لنک کی ضرورت ہے جو "sip:" سے شروع ہو یا ایک مکمل سرور حل (مقامی سافٹ ویئر انسٹالیشن کی ضرورت نہیں)، آپ کو اسے "نہیں" پر سیٹ کرنا ہوگا اور اگلا فیلڈ بھرنا ہوگا۔
+##### Point Of Sale (CashDesk) #####
+CashDesk=پوائنٹ آف سیل
+CashDeskSetup=پوائنٹ آف سیلز ماڈیول سیٹ اپ
+CashDeskThirdPartyForSell=فروخت کے لیے استعمال کرنے کے لیے ڈیفالٹ عام تھرڈ پارٹی
+CashDeskBankAccountForSell=نقد ادائیگی حاصل کرنے کے لیے استعمال کرنے کے لیے ڈیفالٹ اکاؤنٹ
+CashDeskBankAccountForCheque=چیک کے ذریعے ادائیگیاں وصول کرنے کے لیے استعمال کرنے کے لیے ڈیفالٹ اکاؤنٹ
+CashDeskBankAccountForCB=کریڈٹ کارڈز کے ذریعے ادائیگیاں وصول کرنے کے لیے استعمال کرنے کے لیے ڈیفالٹ اکاؤنٹ
+CashDeskBankAccountForSumup=SumUp کے ذریعے ادائیگیاں وصول کرنے کے لیے استعمال کرنے کے لیے ڈیفالٹ بینک اکاؤنٹ
+CashDeskDoNotDecreaseStock=پوائنٹ آف سیل سے فروخت ہونے پر اسٹاک میں کمی کو غیر فعال کریں (اگر "نہیں"، تو اسٹاک میں کمی POS سے کی گئی ہر فروخت کے لیے کی جاتی ہے، ماڈیول اسٹاک میں سیٹ کردہ آپشن سے قطع نظر)۔
+CashDeskIdWareHouse=سٹاک میں کمی کے لیے گودام کو استعمال کرنے پر مجبور کریں اور اسے محدود کریں۔
+StockDecreaseForPointOfSaleDisabled=پوائنٹ آف سیل سے اسٹاک میں کمی کو غیر فعال کر دیا گیا۔
+StockDecreaseForPointOfSaleDisabledbyBatch=POS میں اسٹاک میں کمی ماڈیول سیریل/لاٹ مینجمنٹ (فی الحال فعال) کے ساتھ مطابقت نہیں رکھتی ہے لہذا اسٹاک میں کمی کو غیر فعال کردیا گیا ہے۔
+CashDeskYouDidNotDisableStockDecease=آپ نے پوائنٹ آف سیل سے سیل کرتے وقت اسٹاک میں کمی کو غیر فعال نہیں کیا۔ اس لیے گودام کی ضرورت ہے۔
+CashDeskForceDecreaseStockLabel=بیچ کی مصنوعات کے اسٹاک میں کمی کو مجبور کیا گیا تھا۔
+CashDeskForceDecreaseStockDesc=سب سے پہلے سب سے پرانے کھانے اور فروخت کی تاریخوں سے کم کریں۔
+CashDeskReaderKeyCodeForEnter=بار کوڈ ریڈر میں بیان کردہ "Enter" کے لیے کلیدی کوڈ (مثال: 13)
+##### Bookmark #####
+BookmarkSetup=بک مارک ماڈیول سیٹ اپ
+BookmarkDesc=یہ ماڈیول آپ کو بک مارکس کا انتظام کرنے کی اجازت دیتا ہے۔ آپ اپنے بائیں مینو میں کسی بھی Dolibarr صفحات یا بیرونی ویب سائٹس میں شارٹ کٹس بھی شامل کر سکتے ہیں۔
+NbOfBoomarkToShow=بائیں مینو میں دکھانے کے لیے بک مارکس کی زیادہ سے زیادہ تعداد
+##### WebServices #####
+WebServicesSetup=ویب سروسز ماڈیول سیٹ اپ
+WebServicesDesc=اس ماڈیول کو فعال کرنے سے، Dolibarr متفرق ویب سروسز فراہم کرنے کے لیے ایک ویب سروس سرور بن جاتا ہے۔
+WSDLCanBeDownloadedHere=فراہم کردہ خدمات کی WSDL ڈسکرپٹر فائلیں یہاں ڈاؤن لوڈ کی جا سکتی ہیں۔
+EndPointIs=SOAP کلائنٹس کو اپنی درخواستیں URL پر دستیاب Dolibarr endpoint پر بھیجنی چاہئیں
+##### API ####
+ApiSetup=API ماڈیول سیٹ اپ
+ApiDesc=اس ماڈیول کو فعال کرنے سے، Dolibarr متفرق ویب سروسز فراہم کرنے کے لیے ایک REST سرور بن جاتا ہے۔
+ApiProductionMode=پروڈکشن موڈ کو فعال کریں (یہ خدمات کے انتظام کے لیے کیشے کے استعمال کو چالو کر دے گا)
+ApiExporerIs=آپ URL پر APIs کو دریافت اور جانچ کر سکتے ہیں۔
+OnlyActiveElementsAreExposed=صرف فعال ماڈیولز کے عناصر سامنے آئے ہیں۔
+ApiKey=API کے لیے کلید
+WarningAPIExplorerDisabled=API ایکسپلورر کو غیر فعال کر دیا گیا ہے۔ API ایکسپلورر کو API خدمات فراہم کرنے کی ضرورت نہیں ہے۔ یہ ڈیولپر کے لیے REST APIs کو تلاش کرنے/ٹیسٹ کرنے کا ایک ٹول ہے۔ اگر آپ کو اس ٹول کی ضرورت ہے تو اسے فعال کرنے کے لیے ماڈیول API REST کے سیٹ اپ میں جائیں۔
+##### Bank #####
+BankSetupModule=بینک ماڈیول سیٹ اپ
+FreeLegalTextOnChequeReceipts=چیک کی رسیدوں پر مفت متن
+BankOrderShow="تفصیلی بینک نمبر" استعمال کرنے والے ممالک کے لیے بینک اکاؤنٹس کا آرڈر ڈسپلے کریں
+BankOrderGlobal=جنرل
+BankOrderGlobalDesc=عام ڈسپلے آرڈر
+BankOrderES=ہسپانوی
+BankOrderESDesc=ہسپانوی ڈسپلے آرڈر
+ChequeReceiptsNumberingModule=رسیدیں نمبرنگ ماڈیول چیک کریں۔
+##### Multicompany #####
+MultiCompanySetup=ملٹی کمپنی ماڈیول سیٹ اپ
+##### Suppliers #####
+SuppliersSetup=وینڈر ماڈیول سیٹ اپ
+SuppliersCommandModel=پرچیز آرڈر کا مکمل سانچہ
+SuppliersCommandModelMuscadet=پرچیز آرڈر کا مکمل سانچہ (کارناس ٹیمپلیٹ کا پرانا نفاذ)
+SuppliersInvoiceModel=وینڈر انوائس کی مکمل ٹیمپلیٹ
+SuppliersInvoiceNumberingModel=وینڈر انوائسز نمبرنگ ماڈلز
+IfSetToYesDontForgetPermission=اگر غیر null قدر پر سیٹ ہے تو، دوسری منظوری کے لیے اجازت یافتہ گروپوں یا صارفین کو اجازت دینا نہ بھولیں۔
+##### GeoIPMaxmind #####
+GeoIPMaxmindSetup=GeoIP Maxmind ماڈیول سیٹ اپ
+PathToGeoIPMaxmindCountryDataFile=میکس مائنڈ آئی پی ٹو کنٹری ترجمہ پر مشتمل فائل کا راستہ۔ <br> مثالیں: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat a0342fccfda19bz/Cousr/Cosme/Couser
+NoteOnPathLocation=نوٹ کریں کہ آپ کی آئی پی ٹو کنٹری ڈیٹا فائل ایک ڈائرکٹری کے اندر ہونی چاہیے جسے آپ کا پی ایچ پی پڑھ سکتا ہے (اپنا پی ایچ پی اوپن_بیسڈر سیٹ اپ اور فائل سسٹم کی اجازتوں کو چیک کریں)۔
+YouCanDownloadFreeDatFileTo=آپ %s پر Maxmind GeoIP کنٹری فائل کا <b> مفت ڈیمو ورژن </b> ڈاؤن لوڈ کرسکتے ہیں۔
+YouCanDownloadAdvancedDatFileTo=آپ %s پر Maxmind GeoIP کنٹری فائل کے </b> اپ ڈیٹس کے ساتھ مزید <b> مکمل ورژن بھی ڈاؤن لوڈ کر سکتے ہیں۔
+TestGeoIPResult=تبادلوں کے آئی پی -> ملک کا ٹیسٹ
+##### Projects #####
+ProjectsNumberingModules=پروجیکٹس نمبرنگ ماڈیول
+ProjectsSetup=پروجیکٹ ماڈیول سیٹ اپ
+ProjectsModelModule=پروجیکٹ رپورٹس دستاویز کا ماڈل
+TasksNumberingModules=ٹاسک نمبرنگ ماڈیول
+TaskModelModule=ٹاسک رپورٹس دستاویز ماڈل
+UseSearchToSelectProject=پروجیکٹ کومبو لسٹ کا مواد لوڈ کرنے سے پہلے ایک کلید دبانے تک انتظار کریں۔ <br> اگر آپ کے پاس بڑی تعداد میں پروجیکٹس ہیں تو یہ کارکردگی کو بہتر بنا سکتا ہے، لیکن یہ کم آسان ہے۔
+##### ECM (GED) #####
+##### Fiscal Year #####
+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> <strong>_c06bz0. </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/custom'; </strong>
+HighlightLinesOnMouseHover=جب ماؤس کی حرکت گزر جاتی ہے تو ٹیبل لائنوں کو نمایاں کریں۔
+HighlightLinesColor=ماؤس کے اوپر سے گزرنے پر لائن کا رنگ نمایاں کریں (کسی ہائی لائٹ کے لیے 'ffffff' استعمال کریں)
+HighlightLinesChecked=جب لائن کو چیک کیا جائے تو اس کے رنگ کو ہائی لائٹ کریں (کسی ہائی لائٹ کے لیے 'ffffff' استعمال کریں)
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
+TextTitleColor=صفحہ کے عنوان کا متن کا رنگ
+LinkColor=لنکس کا رنگ
+PressF5AfterChangingThis=کی بورڈ پر CTRL+F5 دبائیں یا اس قدر کو تبدیل کرنے کے بعد اپنا براؤزر کیش صاف کریں تاکہ اسے موثر بنایا جاسکے
+NotSupportedByAllThemes=ول بنیادی تھیمز کے ساتھ کام کرتا ہے، ہو سکتا ہے کہ بیرونی تھیمز کی حمایت نہ ہو۔
+BackgroundColor=پس منظر کا رنگ
+TopMenuBackgroundColor=ٹاپ مینو کے لیے پس منظر کا رنگ
+TopMenuDisableImages=ٹاپ مینو میں تصاویر چھپائیں۔
+LeftMenuBackgroundColor=بائیں مینو کے لیے پس منظر کا رنگ
+BackgroundTableTitleColor=ٹیبل ٹائٹل لائن کے لیے پس منظر کا رنگ
+BackgroundTableTitleTextColor=ٹیبل ٹائٹل لائن کے لیے متن کا رنگ
+BackgroundTableTitleTextlinkColor=ٹیبل ٹائٹل لنک لائن کے لیے متن کا رنگ
+BackgroundTableLineOddColor=طاق ٹیبل لائنوں کے لیے پس منظر کا رنگ
+BackgroundTableLineEvenColor=یکساں ٹیبل لائنوں کے لیے پس منظر کا رنگ
+MinimumNoticePeriod=نوٹس کی کم از کم مدت (آپ کی چھٹی کی درخواست اس تاخیر سے پہلے کی جانی چاہیے)
+NbAddedAutomatically=ہر مہینے صارفین کے کاؤنٹرز میں شامل دنوں کی تعداد (خود بخود)
+EnterAnyCode=یہ فیلڈ لائن کی شناخت کے لیے ایک حوالہ پر مشتمل ہے۔ اپنی پسند کی کوئی بھی قیمت درج کریں، لیکن خصوصی حروف کے بغیر۔
+Enter0or1=0 یا 1 درج کریں۔
+UnicodeCurrency=یہاں منحنی خطوط وحدانی کے درمیان درج کریں، بائٹ نمبر کی فہرست جو کرنسی کی علامت کی نمائندگی کرتی ہے۔ مثال کے طور پر: $ کے لیے، درج کریں [36] - برازیل اصلی R$ [82,36] کے لیے - € کے لیے، [8364] درج کریں
+ColorFormat=RGB رنگ HEX فارمیٹ میں ہے، جیسے: FF0000
+PictoHelp=ڈولیبر فارمیٹ میں آئیکن کا نام ('image.png' اگر موجودہ تھیم ڈائرکٹری میں ہے، 'image.png@nom_du_module' اگر کسی ماڈیول کی ڈائرکٹری /img/ میں ہے)
+PositionIntoComboList=کومبو فہرستوں میں لائن کی پوزیشن
+SellTaxRate=سیلز ٹیکس کی شرح
+RecuperableOnly=جی ہاں فرانس کی کسی ریاست کے لیے مختص VAT کے لیے "معلوم نہیں ہوا لیکن قابل بازیافت"۔ دیگر تمام معاملات میں قدر کو "نہیں" پر رکھیں۔
+UrlTrackingDesc=اگر فراہم کنندہ یا ٹرانسپورٹ سروس آپ کی ترسیل کی حالت کو جانچنے کے لیے کوئی صفحہ یا ویب سائٹ پیش کرتی ہے، تو آپ اسے یہاں درج کر سکتے ہیں۔ آپ URL پیرامیٹرز میں کلید {TRACKID} استعمال کر سکتے ہیں تاکہ سسٹم اسے اس ٹریکنگ نمبر سے بدل دے جو صارف نے شپمنٹ کارڈ میں درج کیا ہے۔
+OpportunityPercent=جب آپ لیڈ بناتے ہیں، تو آپ پروجیکٹ/لیڈ کی تخمینی مقدار کی وضاحت کریں گے۔ لیڈ کی حیثیت کے مطابق، اس رقم کو اس شرح سے ضرب دیا جا سکتا ہے تاکہ آپ کی تمام لیڈز کی مجموعی رقم کا اندازہ لگایا جا سکے۔ قدر ایک فیصد ہے (0 اور 100 کے درمیان)۔
+TemplateForElement=یہ میل ٹیمپلیٹ کس قسم کی چیز سے متعلق ہے؟ ای میل ٹیمپلیٹ صرف اس وقت دستیاب ہوتا ہے جب متعلقہ آبجیکٹ سے "ای میل بھیجیں" بٹن استعمال کیا جائے۔
+TypeOfTemplate=ٹیمپلیٹ کی قسم
+TemplateIsVisibleByOwnerOnly=ٹیمپلیٹ صرف مالک کو نظر آتا ہے۔
+VisibleEverywhere=ہر جگہ نظر آتا ہے۔
+VisibleNowhere=کہیں نظر نہیں آتا
+FixTZ=ٹائم زون درست کریں۔
+FillFixTZOnlyIfRequired=مثال: +2 (صرف اس صورت میں بھریں جب مسئلہ ہو)
+ExpectedChecksum=متوقع چیکسم
+CurrentChecksum=موجودہ چیکسم
+ExpectedSize=متوقع سائز
+CurrentSize=موجودہ سائز
+ForcedConstants=مطلوبہ مستقل اقدار
+MailToSendProposal=گاہک کی تجاویز
+MailToSendOrder=سیلز آرڈرز
+MailToSendInvoice=کسٹمر کی رسیدیں
+MailToSendShipment=شپمنٹس
+MailToSendIntervention=مداخلتیں
+MailToSendSupplierRequestForQuotation=حوالے کی درخواست
+MailToSendSupplierOrder=خریداری کے احکامات
+MailToSendSupplierInvoice=وینڈر کی رسیدیں
+MailToSendContract=معاہدے
+MailToSendReception=استقبالیہ
+MailToThirdparty=تیسرے فریقوں
+MailToMember=ممبران
+MailToUser=صارفین
+MailToProject=پروجیکٹس
+MailToTicket=ٹکٹ
+ByDefaultInList=لسٹ ویو پر بطور ڈیفالٹ دکھائیں۔
+YouUseLastStableVersion=آپ تازہ ترین مستحکم ورژن استعمال کرتے ہیں۔
+TitleExampleForMajorRelease=پیغام کی مثال جسے آپ اس بڑے ریلیز کا اعلان کرنے کے لیے استعمال کر سکتے ہیں (اسے اپنی ویب سائٹس پر بلا جھجھک استعمال کریں)
+TitleExampleForMaintenanceRelease=پیغام کی مثال جو آپ اس مینٹیننس ریلیز کا اعلان کرنے کے لیے استعمال کر سکتے ہیں (اسے اپنی ویب سائٹس پر بلا جھجھک استعمال کریں)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP اور CRM %s دستیاب ہے۔ ورژن %s صارفین اور ڈویلپرز دونوں کے لیے بہت ساری نئی خصوصیات کے ساتھ ایک بڑی ریلیز ہے۔ آپ اسے https://www.dolibarr.org پورٹل (سب ڈائرکٹری اسٹیبل ورژن) کے ڈاؤن لوڈ ایریا سے ڈاؤن لوڈ کر سکتے ہیں۔ تبدیلیوں کی مکمل فہرست کے لیے آپ <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> پڑھ سکتے ہیں۔
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP اور CRM %s دستیاب ہے۔ ورژن %s ایک مینٹیننس ورژن ہے، لہذا اس میں صرف بگ فکسز شامل ہیں۔ ہم تمام صارفین کو اس ورژن میں اپ گریڈ کرنے کی تجویز کرتے ہیں۔ بحالی کی ریلیز ڈیٹا بیس میں نئی خصوصیات یا تبدیلیاں متعارف نہیں کرواتی ہے۔ آپ اسے https://www.dolibarr.org پورٹل (سب ڈائرکٹری سٹیبل ورژن) کے ڈاؤن لوڈ ایریا سے ڈاؤن لوڈ کر سکتے ہیں۔ تبدیلیوں کی مکمل فہرست کے لیے آپ <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> پڑھ سکتے ہیں۔
+MultiPriceRuleDesc=جب آپشن "قیمتوں کی کئی سطحیں فی پروڈکٹ/سروس" کو فعال کیا جاتا ہے، تو آپ ہر پروڈکٹ کے لیے مختلف قیمتیں (ایک فی قیمت کی سطح) کی وضاحت کر سکتے ہیں۔ آپ کا وقت بچانے کے لیے، یہاں آپ پہلے درجے کی قیمت کی بنیاد پر ہر سطح کے لیے قیمت کا خودکار حساب لگانے کے لیے ایک اصول درج کر سکتے ہیں، اس لیے آپ کو ہر پروڈکٹ کے لیے صرف پہلے درجے کی قیمت درج کرنی ہوگی۔ یہ صفحہ آپ کا وقت بچانے کے لیے ڈیزائن کیا گیا ہے لیکن صرف اس صورت میں مفید ہے جب ہر سطح کے لیے آپ کی قیمتیں پہلے درجے کی نسبت ہوں۔ آپ زیادہ تر معاملات میں اس صفحہ کو نظر انداز کر سکتے ہیں۔
+ModelModulesProduct=پروڈکٹ دستاویزات کے لیے ٹیمپلیٹس
+WarehouseModelModules=گوداموں کی دستاویزات کے سانچے
+ToGenerateCodeDefineAutomaticRuleFirst=خود بخود کوڈز بنانے کے قابل ہونے کے لیے، آپ کو بار کوڈ نمبر کی خود بخود وضاحت کرنے کے لیے پہلے مینیجر کی وضاحت کرنی چاہیے۔
+SeeSubstitutionVars=ممکنہ متبادل متغیرات کی فہرست کے لیے *نوٹ دیکھیں
+SeeChangeLog=ChangeLog فائل دیکھیں (صرف انگریزی)
+AllPublishers=تمام پبلشرز
+UnknownPublishers=نامعلوم پبلشرز
+AddRemoveTabs=ٹیبز شامل کریں یا ہٹا دیں۔
+AddDataTables=آبجیکٹ ٹیبلز شامل کریں۔
+AddDictionaries=لغات کی میزیں شامل کریں۔
+AddData=اشیاء یا لغات کا ڈیٹا شامل کریں۔
+AddBoxes=ویجٹ شامل کریں۔
+AddSheduledJobs=طے شدہ ملازمتیں شامل کریں۔
+AddHooks=ہکس شامل کریں۔
+AddTriggers=محرکات شامل کریں۔
+AddMenus=مینو شامل کریں۔
+AddPermissions=اجازتیں شامل کریں۔
+AddExportProfiles=ایکسپورٹ پروفائلز شامل کریں۔
+AddImportProfiles=درآمدی پروفائلز شامل کریں۔
+AddOtherPagesOrServices=دوسرے صفحات یا خدمات شامل کریں۔
+AddModels=دستاویز یا نمبری ٹیمپلیٹس شامل کریں۔
+AddSubstitutions=چابیاں کے متبادل شامل کریں۔
+DetectionNotPossible=پتہ لگانا ممکن نہیں۔
+UrlToGetKeyToUseAPIs=API استعمال کرنے کے لیے ٹوکن حاصل کرنے کے لیے یو آر ایل (ٹوکن موصول ہونے کے بعد اسے ڈیٹا بیس یوزر ٹیبل میں محفوظ کر لیا جاتا ہے اور ہر API کال پر فراہم کرنا ضروری ہے)
+ListOfAvailableAPIs=دستیاب APIs کی فہرست
+activateModuleDependNotSatisfied=ماڈیول "%s" ماڈیول "%s" پر منحصر ہے، جو غائب ہے، لہذا ماڈیول "%1$s" درست طریقے سے کام نہیں کر سکتا۔ اگر آپ کسی حیرت سے محفوظ رہنا چاہتے ہیں تو براہ کرم ماڈیول "%2$s" انسٹال کریں یا ماڈیول "%1$s" کو غیر فعال کریں۔
+CommandIsNotInsideAllowedCommands=آپ جس کمانڈ کو چلانے کی کوشش کر رہے ہیں وہ <strong> $dolibarr_main_restrict_os_commands </strong> پیرامیٹر میں بیان کردہ اجازت شدہ کمانڈز کی فہرست میں نہیں ہے
+LandingPage=لینڈنگ پیج
+SamePriceAlsoForSharedCompanies=اگر آپ ایک ملٹی کمپنی ماڈیول استعمال کرتے ہیں، انتخاب "سنگل قیمت" کے ساتھ، قیمت بھی تمام کمپنیوں کے لیے یکساں ہوگی اگر مصنوعات ماحول کے درمیان شیئر کی جائیں
+ModuleEnabledAdminMustCheckRights=ماڈیول کو چالو کر دیا گیا ہے۔ فعال ماڈیول (زبانیں) کی اجازت صرف منتظم صارفین کو دی گئی تھی۔ اگر ضروری ہو تو آپ کو دوسرے صارفین یا گروپس کو دستی طور پر اجازت دینے کی ضرورت پڑسکتی ہے۔
+UserHasNoPermissions=اس صارف کے پاس کوئی اجازت نہیں ہے۔
+TypeCdr="کوئی نہیں" کا استعمال کریں اگر ادائیگی کی تاریخ انوائس کی تاریخ کے علاوہ دنوں میں ڈیلٹا ہے (ڈیلٹا فیلڈ "%s" ہے) <br> "مہینے کے آخر میں" کا استعمال کریں، اگر ڈیلٹا کے بعد، اختتام تک پہنچنے کے لیے تاریخ کو بڑھانا ضروری ہے۔ مہینے کا (+ ایک اختیاری "%s" دنوں میں) <br> ادائیگی کی مدت کی تاریخ ڈیلٹا کے بعد مہینے کی پہلی Nth ہونے کے لیے "موجودہ/اگلا" استعمال کریں (ڈیلٹا فیلڈ "%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=پروپوزل لائنز پر تصویر کے لیے کالم شامل کریں۔
+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=پی ڈی ایف میں الیکٹرانک سائن شامل کریں۔
+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=ڈیٹا پروٹیکشن آفیسر (ڈی پی او، ڈیٹا پرائیویسی یا جی ڈی پی آر رابطہ)
+GDPRContactDesc=اگر آپ یورپی کمپنیوں/شہریوں کے بارے میں ڈیٹا ذخیرہ کرتے ہیں، تو آپ یہاں اس رابطہ کا نام دے سکتے ہیں جو جنرل ڈیٹا پروٹیکشن ریگولیشن کا ذمہ دار ہے۔
+HelpOnTooltip=ٹول ٹپ پر دکھانے کے لیے متن کی مدد کریں۔
+HelpOnTooltipDesc=جب یہ فیلڈ فارم میں ظاہر ہوتا ہے تو ٹول ٹپ میں متن دکھانے کے لیے متن یا ترجمہ کی کلید یہاں رکھیں
+YouCanDeleteFileOnServerWith=آپ اس فائل کو سرور پر کمانڈ لائن کے ساتھ حذف کر سکتے ہیں: <br> %s
+ChartLoaded=اکاؤنٹ کا چارٹ لوڈ ہو گیا۔
+SocialNetworkSetup=ماڈیول سوشل نیٹ ورکس کا سیٹ اپ
+EnableFeatureFor=<strong> %s </strong> کے لیے خصوصیات کو فعال کریں
+VATIsUsedIsOff=نوٹ: مینو %s - %s میں سیلز ٹیکس یا VAT استعمال کرنے کا اختیار <strong> آف </strong> پر سیٹ کیا گیا ہے، لہذا سیلز ٹیکس یا VAT ہمیشہ سیلز کے لیے استعمال ہوگا۔
+SwapSenderAndRecipientOnPDF=پی ڈی ایف دستاویزات پر بھیجنے والے اور وصول کنندہ کے پتے کی پوزیشن کو تبدیل کریں۔
+FeatureSupportedOnTextFieldsOnly=تنبیہ، خصوصیت صرف ٹیکسٹ فیلڈز اور کومبو لسٹوں پر معاون ہے۔ نیز ایک URL پیرامیٹر ایکشن=create or action=edit سیٹ ہونا چاہیے یا اس فیچر کو متحرک کرنے کے لیے صفحہ کا نام 'new.php' کے ساتھ ختم ہونا چاہیے۔
+EmailCollector=ای میل کلکٹر
+EmailCollectorDescription=باقاعدگی سے ای میل باکسز (IMAP پروٹوکول کا استعمال کرتے ہوئے) اسکین کرنے کے لیے ایک طے شدہ جاب اور سیٹ اپ صفحہ شامل کریں اور اپنی درخواست میں موصول ہونے والی ای میلز کو صحیح جگہ پر ریکارڈ کریں اور/یا کچھ ریکارڈ خود بخود بنائیں (جیسے لیڈز)۔
+NewEmailCollector=نیا ای میل کلکٹر
+EMailHost=ای میل IMAP سرور کا میزبان
+MailboxSourceDirectory=میل باکس سورس ڈائرکٹری
+MailboxTargetDirectory=میل باکس ٹارگٹ ڈائرکٹری
+EmailcollectorOperations=کلیکٹر کے ذریعہ کرنے کے لئے آپریشن
+EmailcollectorOperationsDesc=اوپر سے نیچے کے حکم تک آپریشنز کیے جاتے ہیں۔
+MaxEmailCollectPerCollect=فی جمع کردہ ای میلز کی زیادہ سے زیادہ تعداد
+CollectNow=ابھی جمع کریں۔
+ConfirmCloneEmailCollector=کیا آپ واقعی ای میل کلکٹر %s کو کلون کرنا چاہتے ہیں؟
+DateLastCollectResult=جمع کرنے کی تازہ ترین کوشش کی تاریخ
+DateLastcollectResultOk=جمع کرنے کی تازہ ترین کامیابی کی تاریخ
+LastResult=تازہ ترین نتیجہ
+EmailCollectorConfirmCollectTitle=ای میل جمع تصدیق
+EmailCollectorConfirmCollect=کیا آپ ابھی اس کلکٹر کے لیے کلیکشن چلانا چاہتے ہیں؟
+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)
+CodeLastResult=تازہ ترین نتیجہ کوڈ
+NbOfEmailsInInbox=سورس ڈائرکٹری میں ای میلز کی تعداد
+LoadThirdPartyFromName=%s پر تیسرے فریق کی تلاش کو لوڈ کریں (صرف لوڈ)
+LoadThirdPartyFromNameOrCreate=%s پر تیسرے فریق کی تلاش کو لوڈ کریں (اگر نہیں ملا تو بنائیں)
+AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
+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=ابتدائی گھنٹے
+OpeningHoursDesc=اپنی کمپنی کے باقاعدہ کھلنے کے اوقات یہاں درج کریں۔
+ResourceSetup=وسائل کے ماڈیول کی ترتیب
+UseSearchToSelectResource=وسائل کا انتخاب کرنے کے لیے سرچ فارم کا استعمال کریں (ڈراپ ڈاؤن فہرست کے بجائے)۔
+DisabledResourceLinkUser=کسی وسائل کو صارفین سے منسلک کرنے کے لیے خصوصیت کو غیر فعال کریں۔
+DisabledResourceLinkContact=کسی وسائل کو رابطوں سے جوڑنے کے لیے خصوصیت کو غیر فعال کریں۔
+EnableResourceUsedInEventCheck=یہ چیک کرنے کے لیے فیچر کو فعال کریں کہ آیا کسی ایونٹ میں کوئی وسیلہ استعمال میں ہے۔
+ConfirmUnactivation=ماڈیول ری سیٹ کی تصدیق کریں۔
+OnMobileOnly=صرف چھوٹی اسکرین (اسمارٹ فون) پر
+DisableProspectCustomerType="Prospect + Customer" تیسرے فریق کی قسم کو غیر فعال کریں (لہذا فریق ثالث کو "Prospect" یا "Customer" ہونا چاہیے، لیکن دونوں نہیں ہو سکتے)
+MAIN_OPTIMIZEFORTEXTBROWSER=نابینا افراد کے لیے انٹرفیس کو آسان بنائیں
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=اس اختیار کو فعال کریں اگر آپ نابینا ہیں، یا اگر آپ Lynx یا Links جیسے ٹیکسٹ براؤزر سے ایپلیکیشن استعمال کرتے ہیں۔
+MAIN_OPTIMIZEFORCOLORBLIND=رنگ نابینا شخص کے لیے انٹرفیس کا رنگ تبدیل کریں۔
+MAIN_OPTIMIZEFORCOLORBLINDDesc=اگر آپ کلر بلائنڈ ہیں تو اس آپشن کو فعال کریں، بعض صورتوں میں انٹرفیس کنٹراسٹ بڑھانے کے لیے رنگ سیٹ اپ کو تبدیل کر دے گا۔
+Protanopia=پروٹانوپیا
+Deuteranopes=Deuteranopes
+Tritanopes=ٹریٹانوپس
+ThisValueCanOverwrittenOnUserLevel=اس قدر کو ہر صارف اپنے صارف صفحہ - ٹیب '%s' سے اوور رائٹ کر سکتا ہے۔
+DefaultCustomerType="نئے گاہک" تخلیق فارم کے لیے پہلے سے طے شدہ تیسری پارٹی کی قسم
+ABankAccountMustBeDefinedOnPaymentModeSetup=نوٹ: اس خصوصیت کو کام کرنے کے لیے بینک اکاؤنٹ کو ادائیگی کے ہر موڈ (Paypal، Stripe، ...) کے ماڈیول پر بیان کیا جانا چاہیے۔
+RootCategoryForProductsToSell=فروخت کرنے کے لئے مصنوعات کی جڑ زمرہ
+RootCategoryForProductsToSellDesc=اگر وضاحت کی گئی ہے تو، صرف اس زمرے کے اندر کی مصنوعات یا اس زمرے کے بچے ہی پوائنٹ آف سیل میں دستیاب ہوں گے۔
+DebugBar=ڈیبگ بار
+DebugBarDesc=ٹول بار جو ڈیبگنگ کو آسان بنانے کے لیے بہت سارے ٹولز کے ساتھ آتا ہے۔
+DebugBarSetup=ڈیبگ بار سیٹ اپ
+GeneralOptions=عمومی اختیارات
+LogsLinesNumber=لاگز ٹیب پر دکھانے کے لیے لائنوں کی تعداد
+UseDebugBar=ڈیبگ بار استعمال کریں۔
+DEBUGBAR_LOGS_LINES_NUMBER=کنسول میں رکھنے کے لیے آخری لاگ لائنوں کی تعداد
+WarningValueHigherSlowsDramaticalyOutput=انتباہ، اعلی قدریں ڈرامائی طور پر آؤٹ پٹ کو سست کر دیتی ہیں۔
+ModuleActivated=ماڈیول %s چالو ہے اور انٹرفیس کو سست کرتا ہے
+ModuleActivatedWithTooHighLogLevel=ماڈیول %s بہت زیادہ لاگنگ لیول کے ساتھ چالو کیا جاتا ہے (بہتر پرفارمنس اور سیکیورٹی کے لیے کم لیول استعمال کرنے کی کوشش کریں)
+ModuleSyslogActivatedButLevelNotTooVerbose=ماڈیول %s فعال ہے اور لاگ لیول (%s) درست ہے (زیادہ لفظی نہیں)
+IfYouAreOnAProductionSetThis=اگر آپ پیداواری ماحول پر ہیں، تو آپ کو اس پراپرٹی کو %s پر سیٹ کرنا چاہیے۔
+AntivirusEnabledOnUpload=اپ لوڈ کردہ فائلوں پر اینٹی وائرس فعال ہے۔
+SomeFilesOrDirInRootAreWritable=کچھ فائلیں یا ڈائریکٹریاں صرف پڑھنے کے موڈ میں نہیں ہیں۔
+EXPORTS_SHARE_MODELS=ایکسپورٹ ماڈل سب کے ساتھ شیئر کیے جاتے ہیں۔
+ExportSetup=ماڈیول ایکسپورٹ کا سیٹ اپ
+ImportSetup=ماڈیول درآمد کا سیٹ اپ
+InstanceUniqueID=مثال کی منفرد ID
+SmallerThan=سے چھوٹا
+LargerThan=سے بڑا
+IfTrackingIDFoundEventWillBeLinked=نوٹ کریں کہ اگر ای میل میں کسی آبجیکٹ کی ٹریکنگ آئی ڈی پائی جاتی ہے، یا اگر ای میل کسی ای میل کا جواب ہے جو کسی شے سے جمع اور منسلک ہے، تو تخلیق شدہ واقعہ خود بخود معلوم متعلقہ آبجیکٹ سے منسلک ہو جائے گا۔
+WithGMailYouCanCreateADedicatedPassword=جی میل اکاؤنٹ کے ساتھ، اگر آپ نے 2 مراحل کی توثیق کو فعال کیا ہے، تو یہ سفارش کی جاتی ہے کہ 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>
+EndPointFor=%s کے لیے اختتامی نقطہ : %s
+DeleteEmailCollector=ای میل کلیکٹر کو حذف کریں۔
+ConfirmDeleteEmailCollector=کیا آپ واقعی اس ای میل کلیکٹر کو حذف کرنا چاہتے ہیں؟
+RecipientEmailsWillBeReplacedWithThisValue=وصول کنندہ کے ای میلز کو ہمیشہ اس قدر سے بدل دیا جائے گا۔
+AtLeastOneDefaultBankAccountMandatory=کم از کم 1 ڈیفالٹ بینک اکاؤنٹ کی وضاحت ہونی چاہیے۔
+RESTRICT_ON_IP=صرف کچھ میزبان IP تک رسائی کی اجازت دیں (وائلڈ کارڈ کی اجازت نہیں ہے، اقدار کے درمیان جگہ استعمال کریں)۔ خالی کا مطلب ہے کہ ہر میزبان رسائی کر سکتا ہے۔
+IPListExample=127.0.0.1 192.168.0.2 [::1]
+BaseOnSabeDavVersion=لائبریری SabreDAV ورژن پر مبنی
+NotAPublicIp=عوامی IP نہیں ہے۔
+MakeAnonymousPing=Dolibarr فاؤنڈیشن سرور پر ایک گمنام پنگ '+1' بنائیں (صرف 1 بار انسٹالیشن کے بعد)
+FeatureNotAvailableWithReceptionModule=ماڈیول ریسپشن فعال ہونے پر فیچر دستیاب نہیں ہے۔
+EmailTemplate=ای میل کے لیے ٹیمپلیٹ
+EMailsWillHaveMessageID=ای میلز میں اس نحو سے مماثل ٹیگ 'حوالہ جات' ہوگا۔
+PDF_SHOW_PROJECT=دستاویز پر پروجیکٹ دکھائیں۔
+ShowProjectLabel=پروجیکٹ لیبل
+PDF_USE_ALSO_LANGUAGE_CODE=اگر آپ چاہتے ہیں کہ آپ کی پی ڈی ایف میں کچھ متن ایک ہی جنریٹڈ پی ڈی ایف میں 2 مختلف زبانوں میں ڈپلیکیٹ ہوں، تو آپ کو یہاں یہ دوسری زبان سیٹ کرنی ہوگی تاکہ جنریٹ کی گئی پی ڈی ایف ایک ہی صفحہ میں 2 مختلف زبانوں پر مشتمل ہو، جو پی ڈی ایف بنانے کے وقت منتخب کی گئی ہو اور یہ ( صرف چند پی ڈی ایف ٹیمپلیٹس اس کی حمایت کرتے ہیں)۔ فی پی ڈی ایف 1 زبان کے لیے خالی رکھیں۔
+PDF_USE_A=ڈیفالٹ فارمیٹ پی ڈی ایف کے بجائے PDF/A فارمیٹ کے ساتھ پی ڈی ایف دستاویزات تیار کریں۔
+FafaIconSocialNetworksDesc=یہاں ایک FontAwesome آئیکن کا کوڈ درج کریں۔ اگر آپ نہیں جانتے کہ FontAwesome کیا ہے، تو آپ عام قدر fa-address-book استعمال کر سکتے ہیں۔
+RssNote=نوٹ: ہر آر ایس ایس فیڈ کی تعریف ایک ویجیٹ فراہم کرتی ہے جسے ڈیش بورڈ میں دستیاب رکھنے کے لیے آپ کو اسے فعال کرنا ہوگا۔
+JumpToBoxes=سیٹ اپ پر جائیں -> وجیٹس
+MeasuringUnitTypeDesc=یہاں ایک قدر استعمال کریں جیسے "سائز"، "سطح"، "حجم"، "وزن"، "وقت"
+MeasuringScaleDesc=پیمانہ ان جگہوں کی تعداد ہے جو آپ کو ڈیفالٹ ریفرنس یونٹ سے ملنے کے لیے اعشاریہ کے حصے کو منتقل کرنا ہے۔ "وقت" یونٹ کی قسم کے لیے، یہ سیکنڈوں کی تعداد ہے۔ 80 اور 99 کے درمیان کی قدریں محفوظ اقدار ہیں۔
+TemplateAdded=ٹیمپلیٹ شامل کیا گیا۔
+TemplateUpdated=ٹیمپلیٹ اپ ڈیٹ ہو گیا۔
+TemplateDeleted=سانچہ حذف کر دیا گیا۔
+MailToSendEventPush=ایونٹ کی یاد دہانی ای میل
+SwitchThisForABetterSecurity=مزید سیکیورٹی کے لیے اس قدر کو %s میں تبدیل کرنے کی سفارش کی جاتی ہے۔
+DictionaryProductNature= مصنوعات کی نوعیت
+CountryIfSpecificToOneCountry=ملک (اگر مخصوص ملک کے لیے مخصوص ہے)
+YouMayFindSecurityAdviceHere=آپ کو یہاں سیکورٹی ایڈوائزری مل سکتی ہے۔
+ModuleActivatedMayExposeInformation=یہ پی ایچ پی ایکسٹینشن حساس ڈیٹا کو بے نقاب کر سکتی ہے۔ اگر آپ کو اس کی ضرورت نہیں ہے تو اسے غیر فعال کریں۔
+ModuleActivatedDoNotUseInProduction=ترقی کے لیے ڈیزائن کردہ ایک ماڈیول کو فعال کر دیا گیا ہے۔ اسے پیداواری ماحول پر فعال نہ کریں۔
+CombinationsSeparator=پروڈکٹ کے امتزاج کے لیے الگ کرنے والا کریکٹر
+SeeLinkToOnlineDocumentation=مثالوں کے لیے ٹاپ مینو پر آن لائن دستاویزات کا لنک دیکھیں
+SHOW_SUBPRODUCT_REF_IN_PDF=اگر ماڈیول <b> %s </b> کی خصوصیت "%s" استعمال کی گئی ہے تو، PDF پر کٹ کے ذیلی مصنوعات کی تفصیلات دکھائیں۔
+AskThisIDToYourBank=یہ ID حاصل کرنے کے لیے اپنے بینک سے رابطہ کریں۔
+AdvancedModeOnly=اجازت صرف اعلیٰ اجازت کے موڈ میں دستیاب ہے۔
+ConfFileIsReadableOrWritableByAnyUsers=conf فائل کسی بھی صارف کے ذریعہ پڑھنے کے قابل یا قابل تحریر ہے۔ صرف ویب سرور صارف اور گروپ کو اجازت دیں۔
+MailToSendEventOrganization=ایونٹ آرگنائزیشن
+MailToPartnership=شراکت داری
+AGENDA_EVENT_DEFAULT_STATUS=فارم سے ایونٹ بناتے وقت ڈیفالٹ ایونٹ کی حیثیت
+YouShouldDisablePHPFunctions=آپ کو پی ایچ پی کے افعال کو غیر فعال کرنا چاہئے۔
+IfCLINotRequiredYouShouldDisablePHPFunctions=سوائے اس کے کہ اگر آپ کو کسٹم کوڈ میں سسٹم کمانڈ چلانے کی ضرورت ہو، تو آپ کو پی ایچ پی فنکشنز کو غیر فعال کرنا چاہیے۔
+PHPFunctionsRequiredForCLI=شیل مقصد کے لیے (جیسا کہ طے شدہ جاب بیک اپ کرنا یا اینی ٹیوورس پروگرام چلانا)، آپ کو پی ایچ پی کے افعال کو برقرار رکھنا چاہیے۔
+NoWritableFilesFoundIntoRootDir=آپ کی روٹ ڈائرکٹری (اچھی) میں عام پروگراموں کی کوئی قابل تحریر فائل یا ڈائرکٹری نہیں ملی
+RecommendedValueIs=تجویز کردہ: %s
+Recommended=تجویز کردہ
+NotRecommended=تجویز کردہ نہیں
+ARestrictedPath=کچھ محدود راستہ
+CheckForModuleUpdate=بیرونی ماڈیولز کی تازہ کاریوں کی جانچ کریں۔
+CheckForModuleUpdateHelp=یہ عمل بیرونی ماڈیولز کے ایڈیٹرز سے رابطہ کرے گا تاکہ یہ چیک کیا جا سکے کہ آیا کوئی نیا ورژن دستیاب ہے۔
+ModuleUpdateAvailable=ایک اپ ڈیٹ دستیاب ہے۔
+NoExternalModuleWithUpdate=بیرونی ماڈیولز کے لیے کوئی اپ ڈیٹ نہیں ملا
+SwaggerDescriptionFile=سویگر API تفصیل فائل (مثال کے طور پر redoc کے ساتھ استعمال کے لیے)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=آپ نے فرسودہ WS API کو فعال کیا۔ اس کے بجائے آپ کو REST API استعمال کرنا چاہیے۔
+RandomlySelectedIfSeveral=اگر متعدد تصاویر دستیاب ہوں تو تصادفی طور پر منتخب کریں۔
+DatabasePasswordObfuscated=ڈیٹا بیس کا پاس ورڈ conf فائل میں مبہم ہے۔
+DatabasePasswordNotObfuscated=ڈیٹا بیس کا پاس ورڈ conf فائل میں مبہم نہیں ہے۔
+APIsAreNotEnabled=APIs ماڈیولز فعال نہیں ہیں۔
+YouShouldSetThisToOff=آپ کو اسے 0 یا آف پر سیٹ کرنا چاہیے۔
+InstallAndUpgradeLockedBy=انسٹال اور اپ گریڈ فائل <b> %s </b> کے ذریعہ مقفل ہیں۔
+OldImplementation=پرانا عمل درآمد
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=اگر آن لائن ادائیگی کے کچھ ماڈیولز فعال ہیں (پے پال، پٹی، ...)، آن لائن ادائیگی کرنے کے لیے پی ڈی ایف پر ایک لنک شامل کریں۔
+DashboardDisableGlobal=کھلی اشیاء کے تمام انگوٹھوں کو عالمی سطح پر غیر فعال کریں۔
+BoxstatsDisableGlobal=مکمل طور پر باکس کے اعدادوشمار کو غیر فعال کریں۔
+DashboardDisableBlocks=مین ڈیش بورڈ پر کھلی اشیاء کے انگوٹھوں (کارروائی کے لیے یا دیر سے)
+DashboardDisableBlockAgenda=ایجنڈے کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockProject=منصوبوں کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockCustomer=صارفین کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockSupplier=سپلائرز کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockContract=معاہدوں کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockTicket=ٹکٹوں کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockBank=بینکوں کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockAdherent=رکنیت کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockExpenseReport=اخراجات کی رپورٹ کے لیے انگوٹھے کو غیر فعال کریں۔
+DashboardDisableBlockHoliday=پتیوں کے لیے انگوٹھے کو غیر فعال کریں۔
+EnabledCondition=فیلڈ کو فعال کرنے کی شرط (اگر فعال نہیں ہے تو، مرئیت ہمیشہ بند رہے گی)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=اگر آپ دوسرا ٹیکس استعمال کرنا چاہتے ہیں، تو آپ کو پہلا سیل ٹیکس بھی فعال کرنا ہوگا۔
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=اگر آپ تیسرا ٹیکس استعمال کرنا چاہتے ہیں تو آپ کو پہلا سیل ٹیکس بھی فعال کرنا ہوگا۔
+LanguageAndPresentation=زبان اور پیشکش
+SkinAndColors=جلد اور رنگ
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=اگر آپ دوسرا ٹیکس استعمال کرنا چاہتے ہیں، تو آپ کو پہلا سیل ٹیکس بھی فعال کرنا ہوگا۔
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=اگر آپ تیسرا ٹیکس استعمال کرنا چاہتے ہیں تو آپ کو پہلا سیل ٹیکس بھی فعال کرنا ہوگا۔
+PDF_USE_1A=PDF/A-1b فارمیٹ کے ساتھ پی ڈی ایف بنائیں
+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
diff --git a/htdocs/langs/ur_PK/agenda.lang b/htdocs/langs/ur_PK/agenda.lang
new file mode 100644
index 00000000000..b1e31be983f
--- /dev/null
+++ b/htdocs/langs/ur_PK/agenda.lang
@@ -0,0 +1,174 @@
+# Dolibarr language file - Source file is en_US - agenda
+IdAgenda=شناختی واقعہ
+Actions=تقریبات
+Agenda=ایجنڈا
+TMenuAgenda=ایجنڈا
+Agendas=ایجنڈا
+LocalAgenda=ڈیفالٹ کیلنڈر
+ActionsOwnedBy=ایونٹ کی ملکیت
+ActionsOwnedByShort=مالک
+AffectedTo=مقرر کیا، مقرر کرنا
+Event=تقریب
+Events=تقریبات
+EventsNb=واقعات کی تعداد
+ListOfActions=واقعات کی فہرست
+EventReports=واقعہ کی رپورٹس
+Location=مقام
+ToUserOfGroup=گروپ میں کسی بھی صارف کو تفویض کردہ ایونٹ
+EventOnFullDay=پورے دن کا واقعہ
+MenuToDoActions=تمام نامکمل واقعات
+MenuDoneActions=تمام ختم شدہ واقعات
+MenuToDoMyActions=میرے نامکمل واقعات
+MenuDoneMyActions=میرے ختم شدہ واقعات
+ListOfEvents=واقعات کی فہرست (پہلے سے طے شدہ کیلنڈر)
+ActionsAskedBy=واقعات کی اطلاع بذریعہ
+ActionsToDoBy=ایونٹس تفویض کیے گئے۔
+ActionsDoneBy=کے ذریعہ کئے گئے واقعات
+ActionAssignedTo=تقریب تفویض کی گئی۔
+ViewCal=مہینے کا نظارہ
+ViewDay=دن کا نظارہ
+ViewWeek=ہفتہ کا نظارہ
+ViewPerUser=فی صارف منظر
+ViewPerType=فی قسم کا نظارہ
+AutoActions= خودکار بھرنا
+AgendaAutoActionDesc= یہاں آپ ان واقعات کی وضاحت کر سکتے ہیں جو آپ چاہتے ہیں کہ ڈولیبر ایجنڈے میں خود بخود تخلیق کرے۔ اگر کچھ بھی چیک نہیں کیا گیا ہے، تو لاگز میں صرف دستی کارروائیاں شامل ہوں گی اور ایجنڈا میں دکھائی جائیں گی۔ اشیاء پر کی جانے والی کاروباری کارروائیوں کی خودکار ٹریکنگ (توثیق، حیثیت کی تبدیلی) کو محفوظ نہیں کیا جائے گا۔
+AgendaSetupOtherDesc= یہ صفحہ آپ کے Dolibarr ایونٹس کو بیرونی کیلنڈر (تھنڈر برڈ، گوگل کیلنڈر وغیرہ...) میں برآمد کرنے کی اجازت دینے کے اختیارات فراہم کرتا ہے۔
+AgendaExtSitesDesc=یہ صفحہ کیلنڈرز کے بیرونی ذرائع کا اعلان کرنے کی اجازت دیتا ہے تاکہ ان کے واقعات کو Dolibarr ایجنڈے میں دیکھا جا سکے۔
+ActionsEvents=ایسے واقعات جن کے لیے Dolibarr خود بخود ایجنڈے میں ایک ایکشن تشکیل دے گا۔
+EventRemindersByEmailNotEnabled=ای میل کے ذریعے ایونٹ کی یاد دہانیوں کو %s ماڈیول سیٹ اپ میں فعال نہیں کیا گیا تھا۔
+##### Agenda event labels #####
+NewCompanyToDolibarr=تیسری پارٹی %s بنائی گئی۔
+COMPANY_MODIFYInDolibarr=فریق ثالث %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 کو حذف کر دیا گیا
+ShipmentValidatedInDolibarr=کھیپ %s کی توثیق کر دی گئی۔
+ShipmentClassifyClosedInDolibarr=کھیپ %s درجہ بند بل
+ShipmentUnClassifyCloseddInDolibarr=کھیپ %s دوبارہ کھولنے کی درجہ بندی
+ShipmentBackToDraftInDolibarr=کھیپ %s ڈرافٹ اسٹیٹس پر واپس جائیں۔
+ShipmentDeletedInDolibarr=کھیپ %s حذف کر دی گئی۔
+ShipmentCanceledInDolibarr=کھیپ %s منسوخ کر دی گئی۔
+ReceptionValidatedInDolibarr=استقبالیہ %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 کی تصدیق ہو گئی۔
+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=شروع کرنے کی تاریخ
+DateActionEnd=آخری تاریخ
+AgendaUrlOptions1=آپ فلٹر آؤٹ پٹ میں درج ذیل پیرامیٹرز بھی شامل کر سکتے ہیں:
+AgendaUrlOptions3= <b> logina=%s </b> آؤٹ پٹ کو کسی صارف کی ملکیت والی کارروائیوں تک محدود کرنے کے لیے
+AgendaUrlOptionsNotAdmin= <b> logina=!%s </b> آؤٹ پٹ کو ان کارروائیوں تک محدود کرنے کے لیے جو صارف کی ملکیت نہیں ہیں
+AgendaUrlOptions4= <b> logint=%s </b> صارف کو تفویض کردہ کارروائیوں تک آؤٹ پٹ کو محدود کرنے کے لیے
+AgendaUrlOptionsProject= <b> پروجیکٹ=__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=کیلنڈر برآمد کریں۔
+ExtSites=بیرونی کیلنڈرز درآمد کریں۔
+ExtSitesEnableThisTool=ایجنڈا میں بیرونی کیلنڈرز (عالمی سیٹ اپ میں بیان کردہ) دکھائیں۔ صارفین کے ذریعہ بیان کردہ بیرونی کیلنڈرز کو متاثر نہیں کرتا ہے۔
+ExtSitesNbOfAgenda=کیلنڈرز کی تعداد
+AgendaExtNb=کیلنڈر نمبر %s
+ExtSiteUrlAgenda=.ical فائل تک رسائی کے لیے URL
+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/ur_PK/assets.lang b/htdocs/langs/ur_PK/assets.lang
new file mode 100644
index 00000000000..7babde2f017
--- /dev/null
+++ b/htdocs/langs/ur_PK/assets.lang
@@ -0,0 +1,67 @@
+# 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/>.
+
+#
+# Generic
+#
+Assets = اثاثے
+NewAsset = نیا اثاثہ
+AccountancyCodeAsset = اکاؤنٹنگ کوڈ (اثاثہ)
+AccountancyCodeDepreciationAsset = اکاؤنٹنگ کوڈ (فرسودگی اثاثہ اکاؤنٹ)
+AccountancyCodeDepreciationExpense = اکاؤنٹنگ کوڈ (فرسودگی کے اخراجات کا اکاؤنٹ)
+NewAssetType=اثاثہ کی نئی قسم
+AssetsTypeSetup=اثاثہ کی قسم کا سیٹ اپ
+AssetTypeModified=اثاثہ کی قسم میں ترمیم کی گئی۔
+AssetType=اثاثہ کی قسم
+AssetsLines=اثاثے
+DeleteType=حذف کریں۔
+DeleteAnAssetType=اثاثہ کی قسم کو حذف کریں۔
+ConfirmDeleteAssetType=کیا آپ واقعی اس اثاثہ کی قسم کو حذف کرنا چاہتے ہیں؟
+ShowTypeCard=قسم '%s' دکھائیں
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName = اثاثے
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc = اثاثوں کی تفصیل
+
+#
+# Admin page
+#
+AssetsSetup = اثاثوں کا سیٹ اپ
+Settings = ترتیبات
+AssetsSetupPage = اثاثوں کا سیٹ اپ صفحہ
+ExtraFieldsAssetsType = تکمیلی صفات (اثاثہ کی قسم)
+AssetsType=اثاثہ کی قسم
+AssetsTypeId=اثاثہ کی قسم کی شناخت
+AssetsTypeLabel=اثاثہ کی قسم کا لیبل
+AssetsTypes=اثاثوں کی اقسام
+
+#
+# Menu
+#
+MenuAssets = اثاثے
+MenuNewAsset = نیا اثاثہ
+MenuTypeAssets = اثاثوں کی قسم
+MenuListAssets = فہرست
+MenuNewTypeAssets = نئی
+MenuListTypeAssets = فہرست
+
+#
+# Module
+#
+Asset=اثاثہ
+NewAssetType=اثاثہ کی نئی قسم
+NewAsset=نیا اثاثہ
+ConfirmDeleteAsset=کیا آپ واقعی اس اثاثہ کو حذف کرنا چاہتے ہیں؟
diff --git a/htdocs/langs/ur_PK/banks.lang b/htdocs/langs/ur_PK/banks.lang
new file mode 100644
index 00000000000..03be017e754
--- /dev/null
+++ b/htdocs/langs/ur_PK/banks.lang
@@ -0,0 +1,184 @@
+# Dolibarr language file - Source file is en_US - banks
+Bank=بینک
+MenuBankCash=بینک | نقد
+MenuVariousPayment=متفرق ادائیگیاں
+MenuNewVariousPayment=نئی متفرق ادائیگی
+BankName=بینک کا نام
+FinancialAccount=کھاتہ
+BankAccount=بینک اکاؤنٹ
+BankAccounts=بینک اکاؤنٹ
+BankAccountsAndGateways=بینک اکاؤنٹس | گیٹ ویز
+ShowAccount=اکاؤنٹ دکھائیں۔
+AccountRef=مالیاتی اکاؤنٹ کا حوالہ
+AccountLabel=مالیاتی اکاؤنٹ کا لیبل
+CashAccount=کیش اکاؤنٹ
+CashAccounts=کیش اکاؤنٹس
+CurrentAccounts=موجودہ کھاتہ
+SavingAccounts=بچت اکاؤنٹس
+ErrorBankLabelAlreadyExists=مالیاتی اکاؤنٹ کا لیبل پہلے سے موجود ہے۔
+BankBalance=بقیہ
+BankBalanceBefore=پہلے بیلنس
+BankBalanceAfter=کے بعد بیلنس
+BalanceMinimalAllowed=کم از کم اجازت شدہ بیلنس
+BalanceMinimalDesired=کم از کم مطلوبہ بیلنس
+InitialBankBalance=ابتدائی بیلنس
+EndBankBalance=بیلنس ختم کریں۔
+CurrentBalance=موجودہ توازن
+FutureBalance=مستقبل کا توازن
+ShowAllTimeBalance=شروع سے توازن دکھائیں۔
+AllTime=شروع سے
+Reconciliation=مفاہمت
+RIB=بینک اکاؤنٹ نمبر
+IBAN=IBAN نمبر
+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=کھاتہ
+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=نمبر
+LineRecord=لین دین
+AddBankRecord=اندراج شامل کریں۔
+AddBankRecordLong=دستی طور پر اندراج شامل کریں۔
+Conciliated=صلح کر لی
+ConciliatedBy=کی طرف سے مصالحت
+DateConciliating=مصالحت کی تاریخ
+BankLineConciliated=اندراج بینک کی رسید کے ساتھ ہم آہنگ
+Reconciled=صلح کر لی
+NotReconciled=صلح نہیں ہوئی۔
+CustomerInvoicePayment=گاہک کی ادائیگی
+SupplierInvoicePayment=وینڈر کی ادائیگی
+SubscriptionPayment=رکنیت کی ادائیگی
+WithdrawalPayment=ڈیبٹ ادائیگی کا آرڈر
+SocialContributionPayment=سماجی/مالیاتی ٹیکس کی ادائیگی
+BankTransfer=کریڈٹ ٹرانسفر
+BankTransfers=کریڈٹ ٹرانسفر
+MenuBankInternalTransfer=اندرونی منتقلی
+TransferDesc=ایک اکاؤنٹ سے دوسرے اکاؤنٹ میں منتقلی کے لیے اندرونی منتقلی کا استعمال کریں، ایپلیکیشن دو ریکارڈ لکھے گی: سورس اکاؤنٹ میں ڈیبٹ اور ہدف اکاؤنٹ میں کریڈٹ۔ اس لین دین کے لیے ایک ہی رقم، لیبل اور تاریخ استعمال کی جائے گی۔
+TransferFrom=سے
+TransferTo=کو
+TransferFromToDone=<b> %s </b> %s کے <b> %s </b> کرنے <b> %s </b> سے منتقلی ریکارڈ کیا گیا ہے.
+CheckTransmitter=بھیجنے والا
+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=مفاہمت سے متعلق بینک اسٹیٹمنٹ کا انتخاب کریں۔ ترتیب دینے والی عددی قدر استعمال کریں: YYYYMM یا YYYYMMDD
+EventualyAddCategory=آخر کار، ایک زمرہ کی وضاحت کریں جس میں ریکارڈز کی درجہ بندی کی جائے۔
+ToConciliate=صلح کرنے کے لیے؟
+ThenCheckLinesAndConciliate=پھر، بینک اسٹیٹمنٹ میں موجود لائنوں کو چیک کریں اور کلک کریں۔
+DefaultRIB=پہلے سے طے شدہ پابندی
+AllRIB=تمام BAN
+LabelRIB=BAN لیبل
+NoBANRecord=کوئی BAN ریکارڈ نہیں ہے۔
+DeleteARib=BAN ریکارڈ کو حذف کریں۔
+ConfirmDeleteRib=کیا آپ واقعی اس BAN ریکارڈ کو حذف کرنا چاہتے ہیں؟
+RejectCheck=چیک واپس آ گیا۔
+ConfirmRejectCheck=کیا آپ واقعی اس چیک کو مسترد شدہ کے بطور نشان زد کرنا چاہتے ہیں؟
+RejectCheckDate=چیک کی واپسی کی تاریخ
+CheckRejected=چیک واپس آ گیا۔
+CheckRejectedAndInvoicesReopened=چیک واپس آ گیا اور رسیدیں دوبارہ کھلیں۔
+BankAccountModelModule=بینک اکاؤنٹس کے لیے دستاویزی ٹیمپلیٹس
+DocumentModelSepaMandate=SEPA مینڈیٹ کا سانچہ۔ EEC میں صرف یورپی ممالک کے لیے مفید ہے۔
+DocumentModelBan=BAN کی معلومات کے ساتھ صفحہ پرنٹ کرنے کے لیے ٹیمپلیٹ۔
+NewVariousPayment=نئی متفرق ادائیگی
+VariousPayment=متفرق ادائیگی
+VariousPayments=متفرق ادائیگیاں
+ShowVariousPayment=متفرق ادائیگی دکھائیں۔
+AddVariousPayment=متفرق ادائیگی شامل کریں۔
+VariousPaymentId=متفرق ادائیگی ID
+VariousPaymentLabel=متفرق ادائیگی کا لیبل
+ConfirmCloneVariousPayment=متفرق ادائیگی کے کلون کی تصدیق کریں۔
+SEPAMandate=SEPA مینڈیٹ
+YourSEPAMandate=آپ کا SEPA مینڈیٹ
+FindYourSEPAMandate=یہ آپ کا SEPA مینڈیٹ ہے کہ وہ ہماری کمپنی کو آپ کے بینک کو براہ راست ڈیبٹ آرڈر کرنے کی اجازت دیتا ہے۔ اسے دستخط شدہ واپس کریں (دستخط شدہ دستاویز کو اسکین کریں) یا اسے بذریعہ ڈاک بھیجیں۔
+AutoReportLastAccountStatement=مفاہمت کرتے وقت آخری سٹیٹمنٹ نمبر کے ساتھ فیلڈ 'بینک اسٹیٹمنٹ کا نمبر' خودکار طور پر پُر کریں۔
+CashControl=POS کیش ڈیسک کنٹرول
+NewCashFence=نیا کیش ڈیسک کھلنا یا بند کرنا
+BankColorizeMovement=حرکات کو رنگین کریں۔
+BankColorizeMovementDesc=اگر یہ فنکشن فعال ہے، تو آپ ڈیبٹ یا کریڈٹ کی نقل و حرکت کے لیے مخصوص پس منظر کا رنگ منتخب کر سکتے ہیں۔
+BankColorizeMovementName1=ڈیبٹ حرکت کے لیے پس منظر کا رنگ
+BankColorizeMovementName2=کریڈٹ موومنٹ کے لیے پس منظر کا رنگ
+IfYouDontReconcileDisableProperty=اگر آپ کچھ بینک اکاؤنٹس پر بینک مفاہمت نہیں کرتے ہیں، تو اس وارننگ کو ہٹانے کے لیے ان پر موجود پراپرٹی "%s" کو غیر فعال کر دیں۔
+NoBankAccountDefined=کوئی بینک اکاؤنٹ متعین نہیں ہے۔
+NoRecordFoundIBankcAccount=بینک اکاؤنٹ میں کوئی ریکارڈ نہیں ملا۔ عام طور پر، ایسا اس وقت ہوتا ہے جب بینک اکاؤنٹ میں لین دین کی فہرست سے ریکارڈ کو دستی طور پر حذف کر دیا جاتا ہے (مثال کے طور پر بینک اکاؤنٹ کی مصالحت کے دوران)۔ دوسری وجہ یہ ہے کہ ادائیگی اس وقت ریکارڈ کی گئی تھی جب ماڈیول "%s" غیر فعال تھا۔
+AlreadyOneBankAccount=پہلے ہی ایک بینک اکاؤنٹ کی وضاحت کی گئی ہے۔
diff --git a/htdocs/langs/ur_PK/bills.lang b/htdocs/langs/ur_PK/bills.lang
new file mode 100644
index 00000000000..159c25a8a47
--- /dev/null
+++ b/htdocs/langs/ur_PK/bills.lang
@@ -0,0 +1,609 @@
+# Dolibarr language file - Source file is en_US - bills
+Bill=رسید
+Bills=رسیدیں
+BillsCustomers=کسٹمر کی رسیدیں
+BillsCustomer=گاہک کی رسید
+BillsSuppliers=وینڈر انوائسز
+BillsCustomersUnpaid=بلا معاوضہ کسٹمر انوائس
+BillsCustomersUnpaidForCompany=%s کے لیے غیر ادا شدہ کسٹمر انوائسز
+BillsSuppliersUnpaid=غیر ادا شدہ وینڈر انوائسز
+BillsSuppliersUnpaidForCompany=%s کے لیے غیر ادا شدہ وینڈرز کی رسیدیں
+BillsLate=تاخیر سے ادائیگیاں
+BillsStatistics=صارفین کی رسیدوں کے اعدادوشمار
+BillsStatisticsSuppliers=وینڈرز انوائس کے اعدادوشمار
+DisabledBecauseDispatchedInBookkeeping=غیر فعال کیونکہ انوائس بک کیپنگ میں بھیجی گئی تھی۔
+DisabledBecauseNotLastInvoice=انوائس کو مٹانے کے قابل نہ ہونے کی وجہ سے غیر فعال ہے۔ اس کے بعد کچھ رسیدیں ریکارڈ کی گئیں اور اس سے کاؤنٹر میں سوراخ ہو جائیں گے۔
+DisabledBecauseNotErasable=غیر فعال کیونکہ مٹایا نہیں جا سکتا
+InvoiceStandard=معیاری رسید
+InvoiceStandardAsk=معیاری رسید
+InvoiceStandardDesc=اس قسم کی رسید عام رسید ہے۔
+InvoiceDeposit=ڈاون پیمنٹ انوائس
+InvoiceDepositAsk=ڈاون پیمنٹ انوائس
+InvoiceDepositDesc=اس قسم کی رسید اس وقت کی جاتی ہے جب ڈاؤن پیمنٹ موصول ہو جاتی ہے۔
+InvoiceProForma=پروفارما رسید
+InvoiceProFormaAsk=پروفارما رسید
+InvoiceProFormaDesc= <b> پروفارما انوائس </b> ایک حقیقی انوائس کی تصویر ہے لیکن اس کی کوئی اکاؤنٹنسی ویلیو نہیں ہے۔
+InvoiceReplacement=متبادل رسید
+InvoiceReplacementAsk=انوائس کے بدلے انوائس
+InvoiceReplacementDesc= <b> تبدیلی کی رسید </b> کو مکمل طور پر انوائس کو تبدیل کرنے کے لیے استعمال کیا جاتا ہے جس میں پہلے سے کوئی ادائیگی موصول نہیں ہوئی ہے۔ <br> <br> نوٹ: صرف ان انوائسز کو تبدیل کیا جا سکتا ہے جن پر کوئی ادائیگی نہ ہو۔ اگر آپ جو انوائس تبدیل کرتے ہیں وہ ابھی تک بند نہیں ہوا ہے، تو یہ خود بخود 'متروک' پر بند ہو جائے گا۔
+InvoiceAvoir=کریڈٹ نوٹ
+InvoiceAvoirAsk=انوائس درست کرنے کے لیے کریڈٹ نوٹ
+InvoiceAvoirDesc=<b> کریڈٹ نوٹ </b> ایک منفی انوائس ہے جس کا استعمال اس حقیقت کو درست کرنے کے لیے کیا جاتا ہے کہ انوائس ایک ایسی رقم دکھاتی ہے جو اصل میں ادا کی گئی رقم سے مختلف ہوتی ہے (مثلاً صارف نے غلطی سے بہت زیادہ ادائیگی کی، یا مکمل رقم ادا نہیں کرے گا کیونکہ کچھ مصنوعات واپس کردی گئی ہیں) .
+invoiceAvoirWithLines=اصل انوائس سے لائنوں کے ساتھ کریڈٹ نوٹ بنائیں
+invoiceAvoirWithPaymentRestAmount=اصل انوائس کے بقایا بغیر ادائیگی کے ساتھ کریڈٹ نوٹ بنائیں
+invoiceAvoirLineWithPaymentRestAmount=بقیہ غیر ادا شدہ رقم کے لیے کریڈٹ نوٹ
+ReplaceInvoice=انوائس %s کو تبدیل کریں۔
+ReplacementInvoice=متبادل رسید
+ReplacedByInvoice=انوائس %s سے تبدیل کیا گیا۔
+ReplacementByInvoice=انوائس سے بدل دیا گیا۔
+CorrectInvoice=درست انوائس %s
+CorrectionInvoice=تصحیح کی رسید
+UsedByInvoice=انوائس %s ادا کرنے کے لیے استعمال کیا جاتا ہے۔
+ConsumedBy=کی طرف سے کھپت
+NotConsumed=استعمال نہیں کیا گیا۔
+NoReplacableInvoice=کوئی قابل تبدیلی رسید نہیں۔
+NoInvoiceToCorrect=درست کرنے کے لیے کوئی رسید نہیں۔
+InvoiceHasAvoir=ایک یا متعدد کریڈٹ نوٹوں کا ذریعہ تھا۔
+CardBill=انوائس کارڈ
+PredefinedInvoices=پہلے سے طے شدہ رسیدیں
+Invoice=رسید
+PdfInvoiceTitle=رسید
+Invoices=رسیدیں
+InvoiceLine=انوائس لائن
+InvoiceCustomer=گاہک کی رسید
+CustomerInvoice=گاہک کی رسید
+CustomersInvoices=کسٹمر کی رسیدیں
+SupplierInvoice=وینڈر رسید
+SuppliersInvoices=وینڈر انوائسز
+SupplierInvoiceLines=وینڈر انوائس لائنز
+SupplierBill=وینڈر رسید
+SupplierBills=وینڈر کی رسیدیں
+Payment=ادائیگی
+PaymentBack=واپس کرنا
+CustomerInvoicePaymentBack=واپس کرنا
+Payments=ادائیگیاں
+PaymentsBack=ریفنڈز
+paymentInInvoiceCurrency=انوائس کرنسی میں
+PaidBack=واپس ادائیگی
+DeletePayment=ادائیگی کو حذف کریں۔
+ConfirmDeletePayment=کیا آپ واقعی اس ادائیگی کو حذف کرنا چاہتے ہیں؟
+ConfirmConvertToReduc=کیا آپ اس %s کو دستیاب کریڈٹ میں تبدیل کرنا چاہتے ہیں؟
+ConfirmConvertToReduc2=رقم تمام رعایتوں میں محفوظ ہو جائے گی اور اس صارف کے لیے موجودہ یا مستقبل کے انوائس کے لیے رعایت کے طور پر استعمال ہو سکتی ہے۔
+ConfirmConvertToReducSupplier=کیا آپ اس %s کو دستیاب کریڈٹ میں تبدیل کرنا چاہتے ہیں؟
+ConfirmConvertToReducSupplier2=رقم تمام رعایتوں میں محفوظ ہو جائے گی اور اس وینڈر کے لیے موجودہ یا مستقبل کے انوائس کے لیے رعایت کے طور پر استعمال کی جا سکتی ہے۔
+SupplierPayments=وینڈر کی ادائیگی
+ReceivedPayments=ادائیگیاں موصول ہوئیں
+ReceivedCustomersPayments=صارفین سے ادائیگیاں موصول ہوئیں
+PayedSuppliersPayments=دکانداروں کو ادائیگی کی ادائیگی
+ReceivedCustomersPaymentsToValid=تصدیق کرنے کے لیے صارفین کی ادائیگیاں موصول ہوئیں
+PaymentsReportsForYear=%s کے لیے ادائیگیوں کی رپورٹ
+PaymentsReports=ادائیگی کی رپورٹس
+PaymentsAlreadyDone=ادائیگیاں ہو چکی ہیں۔
+PaymentsBackAlreadyDone=ریفنڈز پہلے ہی ہو چکے ہیں۔
+PaymentRule=ادائیگی کا اصول
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
+DefaultBankAccount=ڈیفالٹ بینک اکاؤنٹ
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
+PaymentTerm=ادائیگی کی شرط
+PaymentConditions=ادائیگی کی شرائط
+PaymentConditionsShort=ادائیگی کی شرائط
+PaymentAmount=ادائیگی کی رقم
+PaymentHigherThanReminderToPay=ادائیگی کی یاد دہانی سے زیادہ ادائیگی
+HelpPaymentHigherThanReminderToPay=توجہ فرمائیں، ایک یا زیادہ بلوں کی ادائیگی کی رقم ادا کی جانی والی بقایا رقم سے زیادہ ہے۔ <br> اپنے اندراج میں ترمیم کریں، بصورت دیگر تصدیق کریں اور ہر زائد ادائیگی شدہ رسید کے لیے موصول ہونے والے اضافی کے لیے ایک کریڈٹ نوٹ بنانے پر غور کریں۔
+HelpPaymentHigherThanReminderToPaySupplier=توجہ فرمائیں، ایک یا زیادہ بلوں کی ادائیگی کی رقم ادا کی جانی والی بقایا رقم سے زیادہ ہے۔ <br> اپنے اندراج میں ترمیم کریں، بصورت دیگر تصدیق کریں اور ہر زائد ادائیگی شدہ انوائس کے لیے اضافی ادائیگی کے لیے کریڈٹ نوٹ بنانے پر غور کریں۔
+ClassifyPaid='ادائیگی' کی درجہ بندی کریں
+ClassifyUnPaid='غیر ادا شدہ' کی درجہ بندی کریں
+ClassifyPaidPartially=درجہ بندی 'جزوی طور پر ادا شدہ'
+ClassifyCanceled='ترک' کی درجہ بندی کریں
+ClassifyClosed='بند' کی درجہ بندی کریں
+ClassifyUnBilled='غیر بل' کی درجہ بندی کریں
+CreateBill=انوائس بنائیں
+CreateCreditNote=کریڈٹ نوٹ بنائیں
+AddBill=انوائس یا کریڈٹ نوٹ بنائیں
+AddToDraftInvoices=ڈرافٹ انوائس میں شامل کریں۔
+DeleteBill=رسید حذف کریں۔
+SearchACustomerInvoice=کسٹمر انوائس تلاش کریں۔
+SearchASupplierInvoice=وینڈر انوائس تلاش کریں۔
+CancelBill=انوائس منسوخ کریں۔
+SendRemindByMail=ای میل کے ذریعے یاد دہانی بھیجیں۔
+DoPayment=ادائیگی درج کریں۔
+DoPaymentBack=رقم کی واپسی درج کریں۔
+ConvertToReduc=کریڈٹ دستیاب کے بطور نشان زد کریں۔
+ConvertExcessReceivedToReduc=حاصل شدہ اضافی کو دستیاب کریڈٹ میں تبدیل کریں۔
+ConvertExcessPaidToReduc=اضافی ادائیگی کو دستیاب رعایت میں تبدیل کریں۔
+EnterPaymentReceivedFromCustomer=کسٹمر سے موصول ہونے والی ادائیگی درج کریں۔
+EnterPaymentDueToCustomer=گاہک کی وجہ سے ادائیگی کریں۔
+DisabledBecauseRemainderToPayIsZero=غیرفعال ہے کیونکہ بقیہ غیر ادا شدہ صفر ہے۔
+PriceBase=بنیادی قیمت
+BillStatus=رسید کی حیثیت
+StatusOfGeneratedInvoices=تیار کردہ رسیدوں کی حیثیت
+BillStatusDraft=مسودہ (توثیق کرنے کی ضرورت ہے)
+BillStatusPaid=ادا کیا
+BillStatusPaidBackOrConverted=کریڈٹ نوٹ کی واپسی یا کریڈٹ دستیاب کے بطور نشان زد
+BillStatusConverted=ادا شدہ (حتمی انوائس میں استعمال کے لیے تیار)
+BillStatusCanceled=چھوڑ دیا
+BillStatusValidated=تصدیق شدہ (ادائیگی کی ضرورت ہے)
+BillStatusStarted=شروع
+BillStatusNotPaid=ادائیگی نہیں کی
+BillStatusNotRefunded=واپس نہیں کیا گیا۔
+BillStatusClosedUnpaid=بند (بغیر ادا شدہ)
+BillStatusClosedPaidPartially=ادا شدہ (جزوی طور پر)
+BillShortStatusDraft=مسودہ
+BillShortStatusPaid=ادا کیا
+BillShortStatusPaidBackOrConverted=رقم کی واپسی یا تبدیل شدہ
+Refunded=رقم کی واپسی
+BillShortStatusConverted=ادا کیا
+BillShortStatusCanceled=چھوڑ دیا
+BillShortStatusValidated=تصدیق شدہ
+BillShortStatusStarted=شروع
+BillShortStatusNotPaid=ادائیگی نہیں کی
+BillShortStatusNotRefunded=واپس نہیں کیا گیا۔
+BillShortStatusClosedUnpaid=بند
+BillShortStatusClosedPaidPartially=ادا شدہ (جزوی طور پر)
+PaymentStatusToValidShort=تصدیق کرنا
+ErrorVATIntraNotConfigured=انٹرا کمیونٹی VAT نمبر کی ابھی تک وضاحت نہیں کی گئی ہے۔
+ErrorNoPaiementModeConfigured=ادائیگی کی کوئی ڈیفالٹ قسم کی وضاحت نہیں کی گئی ہے۔ اسے ٹھیک کرنے کے لیے انوائس ماڈیول سیٹ اپ پر جائیں۔
+ErrorCreateBankAccount=ایک بینک اکاؤنٹ بنائیں، پھر ادائیگی کی اقسام کی وضاحت کرنے کے لیے انوائس ماڈیول کے سیٹ اپ پینل پر جائیں۔
+ErrorBillNotFound=انوائس %s موجود نہیں ہے۔
+ErrorInvoiceAlreadyReplaced=خرابی، آپ نے انوائس %s کو تبدیل کرنے کے لیے انوائس کی توثیق کرنے کی کوشش کی۔ لیکن اسے پہلے ہی انوائس %s سے تبدیل کر دیا گیا ہے۔
+ErrorDiscountAlreadyUsed=خرابی، ڈسکاؤنٹ پہلے ہی استعمال ہو چکا ہے۔
+ErrorInvoiceAvoirMustBeNegative=خرابی، درست انوائس میں منفی رقم ہونی چاہیے۔
+ErrorInvoiceOfThisTypeMustBePositive=خرابی، اس قسم کی رسید میں ٹیکس مثبت (یا کالعدم) کے علاوہ رقم ہونی چاہیے
+ErrorCantCancelIfReplacementInvoiceNotValidated=خرابی، ایک انوائس کو منسوخ نہیں کیا جا سکتا جس کی جگہ کسی اور انوائس نے لے لی ہو جو ابھی بھی مسودہ کی حالت میں ہے
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=یہ حصہ یا دوسرا حصہ پہلے ہی استعمال ہو چکا ہے لہذا ڈسکاؤنٹ سیریز کو ہٹایا نہیں جا سکتا۔
+BillFrom=سے
+BillTo=کو
+ActionsOnBill=انوائس پر کارروائیاں
+RecurringInvoiceTemplate=ٹیمپلیٹ / بار بار چلنے والی رسید
+NoQualifiedRecurringInvoiceTemplateFound=کوئی اعادی ٹیمپلیٹ انوائس جنریشن کے لیے اہل نہیں ہے۔
+FoundXQualifiedRecurringInvoiceTemplate=%s اعادی ٹیمپلیٹ انوائس جنریشن کے لیے اہل ملا۔
+NotARecurringInvoiceTemplate=اعادی ٹیمپلیٹ انوائس نہیں ہے۔
+NewBill=نئی رسید
+LastBills=تازہ ترین %s رسیدیں۔
+LatestTemplateInvoices=تازہ ترین %s ٹیمپلیٹ انوائسز
+LatestCustomerTemplateInvoices=تازہ ترین %s کسٹمر ٹیمپلیٹ انوائسز
+LatestSupplierTemplateInvoices=تازہ ترین %s وینڈر ٹیمپلیٹ انوائسز
+LastCustomersBills=تازہ ترین %s کسٹمر انوائسز
+LastSuppliersBills=تازہ ترین %s وینڈر انوائسز
+AllBills=تمام رسیدیں
+AllCustomerTemplateInvoices=تمام ٹیمپلیٹ رسیدیں
+OtherBills=دیگر رسیدیں
+DraftBills=رسیدوں کا مسودہ
+CustomersDraftInvoices=کسٹمر ڈرافٹ انوائس
+SuppliersDraftInvoices=وینڈر ڈرافٹ انوائس
+Unpaid=بلا معاوضہ
+ErrorNoPaymentDefined=خرابی کوئی ادائیگی کی وضاحت نہیں کی گئی ہے۔
+ConfirmDeleteBill=کیا آپ واقعی اس رسید کو حذف کرنا چاہتے ہیں؟
+ConfirmValidateBill=کیا آپ واقعی <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> دی گئی رعایت ہے کیونکہ ادائیگی مدت سے پہلے کی گئی تھی۔ میں ایک کریڈٹ نوٹ کے ساتھ VAT کو ریگولرائز کرتا ہوں۔
+ConfirmClassifyPaidPartiallyReasonDiscount=بقیہ بلا معاوضہ <b> (%s %s) </b> دی گئی رعایت ہے کیونکہ ادائیگی مدت سے پہلے کی گئی تھی۔
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=بقیہ بلا معاوضہ <b> (%s %s) </b> دی گئی رعایت ہے کیونکہ ادائیگی مدت سے پہلے کی گئی تھی۔ میں اس رعایت پر VAT کھونا قبول کرتا ہوں۔
+ConfirmClassifyPaidPartiallyReasonDiscountVat=بقیہ بلا معاوضہ <b> (%s %s) </b> دی گئی رعایت ہے کیونکہ ادائیگی مدت سے پہلے کی گئی تھی۔ میں بغیر کریڈٹ نوٹ کے اس رعایت پر VAT وصول کرتا ہوں۔
+ConfirmClassifyPaidPartiallyReasonBadCustomer=برا گاہک
+ConfirmClassifyPaidPartiallyReasonBankCharge=بینک کی طرف سے کٹوتی (درمیانی بینک کی فیس)
+ConfirmClassifyPaidPartiallyReasonProductReturned=مصنوعات جزوی طور پر واپس آ گئیں۔
+ConfirmClassifyPaidPartiallyReasonOther=دوسری وجہ سے چھوڑ دی گئی رقم
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=یہ انتخاب ممکن ہے اگر آپ کی رسید مناسب تبصروں کے ساتھ فراہم کی گئی ہو۔ (مثال کے طور پر "صرف اس قیمت کے مطابق ٹیکس جو اصل میں ادا کیا گیا ہے، کٹوتی کے حقوق دیتا ہے")
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=کچھ ممالک میں، یہ انتخاب صرف اس صورت میں ممکن ہو سکتا ہے جب آپ کی رسید میں درست نوٹ ہوں۔
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=اس انتخاب کا استعمال کریں اگر باقی سب مناسب نہیں ہے۔
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b> برا گاہک </b> وہ صارف ہے جو اپنا قرض ادا کرنے سے انکار کرتا ہے۔
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=یہ انتخاب اس وقت استعمال کیا جاتا ہے جب ادائیگی مکمل نہیں ہوتی ہے کیونکہ کچھ مصنوعات واپس کردی گئی تھیں۔
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=غیر ادا شدہ رقم <b> انٹرمیڈیری بینک فیس ہے
+ConfirmClassifyPaidPartiallyReasonOtherDesc=اس انتخاب کو استعمال کریں اگر باقی سب موزوں نہیں ہیں، مثال کے طور پر درج ذیل صورت حال میں: <br> - ادائیگی مکمل نہیں ہوئی کیونکہ کچھ پروڈکٹس واپس بھیجے گئے تھے ایک کریڈٹ نوٹ بنا کر اکاؤنٹنسی سسٹم میں۔
+ConfirmClassifyAbandonReasonOther=دیگر
+ConfirmClassifyAbandonReasonOtherDesc=یہ انتخاب دیگر تمام معاملات میں استعمال کیا جائے گا۔ مثال کے طور پر کیونکہ آپ ایک بدلی انوائس بنانے کا ارادہ رکھتے ہیں۔
+ConfirmCustomerPayment=کیا آپ <b> %s </b> %s کے لیے اس ادائیگی کے ان پٹ کی تصدیق کرتے ہیں؟
+ConfirmSupplierPayment=کیا آپ <b> %s </b> %s کے لیے اس ادائیگی کے ان پٹ کی تصدیق کرتے ہیں؟
+ConfirmValidatePayment=کیا آپ واقعی اس ادائیگی کی توثیق کرنا چاہتے ہیں؟ ادائیگی کی توثیق ہونے کے بعد کوئی تبدیلی نہیں کی جا سکتی۔
+ValidateBill=رسید کی توثیق کریں۔
+UnvalidateBill=انوائس کو غیر درست کریں۔
+NumberOfBills=رسیدوں کی تعداد
+NumberOfBillsByMonth=ماہانہ رسیدوں کی تعداد
+AmountOfBills=رسیدوں کی رقم
+AmountOfBillsHT=رسیدوں کی رقم (ٹیکس کا خالص)
+AmountOfBillsByMonthHT=ماہ کے حساب سے رسیدوں کی رقم (ٹیکس کا خالص)
+UseSituationInvoices=صورتحال کی رسید کی اجازت دیں۔
+UseSituationInvoicesCreditNote=صورتحال انوائس کریڈٹ نوٹ کی اجازت دیں۔
+Retainedwarranty=برقرار رکھی وارنٹی
+AllowedInvoiceForRetainedWarranty=درج ذیل قسم کی رسیدوں پر قابل استعمال وارنٹی برقرار رکھی گئی ہے۔
+RetainedwarrantyDefaultPercent=وارنٹی ڈیفالٹ فیصد برقرار رکھا
+RetainedwarrantyOnlyForSituation="برقرار وارنٹی" صرف صورت حال کی رسیدوں کے لیے دستیاب کرائیں۔
+RetainedwarrantyOnlyForSituationFinal=صورتحال کی رسیدوں پر عالمی "برقرار وارنٹی" کی کٹوتی صرف حتمی صورت حال پر لاگو ہوتی ہے۔
+ToPayOn=%s پر ادائیگی کرنے کے لیے
+toPayOn=%s پر ادائیگی کریں۔
+RetainedWarranty=برقرار رکھی وارنٹی
+PaymentConditionsShortRetainedWarranty=وارنٹی ادائیگی کی شرائط کو برقرار رکھا
+DefaultPaymentConditionsRetainedWarranty=پہلے سے طے شدہ وارنٹی ادائیگی کی شرائط
+setPaymentConditionsShortRetainedWarranty=برقرار رکھی گئی وارنٹی ادائیگی کی شرائط طے کریں۔
+setretainedwarranty=برقرار رکھی وارنٹی مقرر کریں
+setretainedwarrantyDateLimit=برقرار رکھنے والی وارنٹی کی تاریخ کی حد مقرر کریں۔
+RetainedWarrantyDateLimit=وارنٹی کی تاریخ کی حد برقرار ہے۔
+RetainedWarrantyNeed100Percent=پی ڈی ایف پر ظاہر کرنے کے لیے صورتحال کی رسید 100%% پر ہونی چاہیے۔
+AlreadyPaid=پہلے ہی ادا کر دیا ہے۔
+AlreadyPaidBack=پہلے ہی واپس ادا کر دیا ہے۔
+AlreadyPaidNoCreditNotesNoDeposits=پہلے سے ادا شدہ (بغیر کریڈٹ نوٹ اور نیچے ادائیگیوں کے)
+Abandoned=چھوڑ دیا
+RemainderToPay=باقی بلا معاوضہ
+RemainderToPayMulticurrency=بقایا بلا معاوضہ، اصل کرنسی
+RemainderToTake=لینے کے لیے باقی رقم
+RemainderToTakeMulticurrency=لینے کے لیے باقی رقم، اصل کرنسی
+RemainderToPayBack=ریفنڈ کے لیے باقی رقم
+RemainderToPayBackMulticurrency=ریفنڈ کے لیے باقی رقم، اصل کرنسی
+NegativeIfExcessRefunded=اضافی رقم کی واپسی کی صورت میں منفی
+Rest=زیر التواء
+AmountExpected=دعوی کردہ رقم
+ExcessReceived=ضرورت سے زیادہ موصول ہوئی۔
+ExcessReceivedMulticurrency=اضافی موصول ہوئی، اصل کرنسی
+NegativeIfExcessReceived=اضافی موصول ہونے پر منفی
+ExcessPaid=زائد ادائیگی
+ExcessPaidMulticurrency=اضافی ادا شدہ، اصل کرنسی
+EscompteOffered=رعایت کی پیشکش (مدت سے پہلے ادائیگی)
+EscompteOfferedShort=رعایت
+SendBillRef=رسید جمع کرانا %s
+SendReminderBillRef=رسید جمع کرانا %s (یاد دہانی)
+SendPaymentReceipt=ادائیگی کی رسید جمع کروانا %s
+NoDraftBills=کوئی مسودہ رسید نہیں ہے۔
+NoOtherDraftBills=کوئی دوسرا مسودہ رسید نہیں ہے۔
+NoDraftInvoices=کوئی مسودہ رسید نہیں ہے۔
+RefBill=انوائس کا حوالہ
+ToBill=بل کرنا
+RemainderToBill=بل کے لیے باقی ہے۔
+SendBillByMail=ای میل کے ذریعے رسید بھیجیں۔
+SendReminderBillByMail=ای میل کے ذریعے یاد دہانی بھیجیں۔
+RelatedCommercialProposals=متعلقہ تجارتی تجاویز
+RelatedRecurringCustomerInvoices=متعلقہ بار بار آنے والے کسٹمر انوائسز
+MenuToValid=درست کرنا
+DateMaxPayment=ادائیگی واجب الادا ہے۔
+DateInvoice=رسید کی تاریخ
+DatePointOfTax=ٹیکس کا نقطہ
+NoInvoice=کوئی رسید نہیں۔
+NoOpenInvoice=کوئی کھلا رسید نہیں۔
+NbOfOpenInvoices=کھلی رسیدوں کی تعداد
+ClassifyBill=انوائس کی درجہ بندی کریں۔
+SupplierBillsToPay=غیر ادا شدہ وینڈر انوائسز
+CustomerBillsUnpaid=بلا معاوضہ کسٹمر انوائس
+NonPercuRecuperable=ناقابل بازیافت
+SetConditions=ادائیگی کی شرائط طے کریں۔
+SetMode=ادائیگی کی قسم سیٹ کریں۔
+SetRevenuStamp=ریونیو سٹیمپ سیٹ کریں۔
+Billed=بل کیا گیا۔
+RecurringInvoices=بار بار چلنے والی رسیدیں
+RecurringInvoice=بار بار چلنے والی رسید
+RepeatableInvoice=ٹیمپلیٹ رسید
+RepeatableInvoices=ٹیمپلیٹ رسیدیں
+Repeatable=سانچے
+Repeatables=ٹیمپلیٹس
+ChangeIntoRepeatableInvoice=ٹیمپلیٹ انوائس میں تبدیل کریں۔
+CreateRepeatableInvoice=ٹیمپلیٹ انوائس بنائیں
+CreateFromRepeatableInvoice=ٹیمپلیٹ انوائس سے بنائیں
+CustomersInvoicesAndInvoiceLines=کسٹمر انوائس اور انوائس کی تفصیلات
+CustomersInvoicesAndPayments=کسٹمر کی رسیدیں اور ادائیگیاں
+ExportDataset_invoice_1=کسٹمر انوائس اور انوائس کی تفصیلات
+ExportDataset_invoice_2=کسٹمر کی رسیدیں اور ادائیگیاں
+ProformaBill=پروفارما بل:
+Reduction=کمی
+ReductionShort=ڈسک
+Reductions=کمی
+ReductionsShort=ڈسک
+Discounts=چھوٹ
+AddDiscount=رعایت بنائیں
+AddRelativeDiscount=رشتہ دار رعایت بنائیں
+EditRelativeDiscount=متعلقہ رعایت میں ترمیم کریں۔
+AddGlobalDiscount=مطلق رعایت بنائیں
+EditGlobalDiscounts=مطلق چھوٹ میں ترمیم کریں۔
+AddCreditNote=کریڈٹ نوٹ بنائیں
+ShowDiscount=رعایت دکھائیں۔
+ShowReduc=رعایت دکھائیں۔
+ShowSourceInvoice=سورس انوائس دکھائیں۔
+RelativeDiscount=متعلقہ رعایت
+GlobalDiscount=عالمی رعایت
+CreditNote=کریڈٹ نوٹ
+CreditNotes=قرضے کی پرچیان
+CreditNotesOrExcessReceived=کریڈٹ نوٹس یا زائد وصول ہوئے۔
+Deposit=بیعانہ
+Deposits=نیچے ادائیگیاں
+DiscountFromCreditNote=کریڈٹ نوٹ %s سے رعایت
+DiscountFromDeposit=انوائس %s سے نیچے ادائیگی
+DiscountFromExcessReceived=انوائس %s سے زیادہ ادائیگی
+DiscountFromExcessPaid=انوائس %s سے زیادہ ادائیگی
+AbsoluteDiscountUse=اس قسم کا کریڈٹ انوائس پر اس کی توثیق سے پہلے استعمال کیا جا سکتا ہے۔
+CreditNoteDepositUse=اس قسم کے کریڈٹ استعمال کرنے کے لیے انوائس کی توثیق ہونی چاہیے۔
+NewGlobalDiscount=نیا مطلق رعایت
+NewRelativeDiscount=نیا رشتہ دار رعایت
+DiscountType=ڈسکاؤنٹ کی قسم
+NoteReason=نوٹ/ وجہ
+ReasonDiscount=وجہ
+DiscountOfferedBy=کی طرف سے عطا کیا
+DiscountStillRemaining=چھوٹ یا کریڈٹ دستیاب ہیں۔
+DiscountAlreadyCounted=چھوٹ یا کریڈٹ پہلے ہی استعمال ہو چکے ہیں۔
+CustomerDiscounts=گاہک کی چھوٹ
+SupplierDiscounts=دکانداروں کی چھوٹ
+BillAddress=بل کا پتہ
+HelpEscompte=یہ رعایت گاہک کو دی گئی رعایت ہے کیونکہ ادائیگی مدت سے پہلے کی گئی تھی۔
+HelpAbandonBadCustomer=اس رقم کو چھوڑ دیا گیا ہے (کسٹمر کو برا گاہک کہا جاتا ہے) اور اسے ایک غیر معمولی نقصان سمجھا جاتا ہے۔
+HelpAbandonOther=اس رقم کو چھوڑ دیا گیا ہے کیونکہ یہ ایک غلطی تھی (مثال کے طور پر غلط صارف یا انوائس کی جگہ کسی اور نے لے لی)
+IdSocialContribution=سماجی/مالیاتی ٹیکس ادائیگی کی شناخت
+PaymentId=ادائیگی کی شناخت
+PaymentRef=ادائیگی کا حوالہ
+InvoiceId=انوائس آئی ڈی
+InvoiceRef=انوائس کا حوالہ
+InvoiceDateCreation=انوائس بنانے کی تاریخ
+InvoiceStatus=رسید کی حیثیت
+InvoiceNote=انوائس نوٹ
+InvoicePaid=بل کی ادائیگی ھو چکی ہے
+InvoicePaidCompletely=مکمل طور پر ادا کیا
+InvoicePaidCompletelyHelp=رسید جو مکمل طور پر ادا کی جاتی ہے۔ اس میں وہ رسیدیں شامل نہیں ہیں جن کی ادائیگی جزوی طور پر کی جاتی ہے۔ تمام 'بند' یا غیر 'بند' رسیدوں کی فہرست حاصل کرنے کے لیے، انوائس کی حیثیت پر فلٹر استعمال کرنے کو ترجیح دیں۔
+OrderBilled=آرڈر کا بل دیا گیا۔
+DonationPaid=عطیہ ادا کیا گیا۔
+PaymentNumber=ادائیگی نمبر
+RemoveDiscount=رعایت کو ہٹا دیں۔
+WatermarkOnDraftBill=ڈرافٹ رسیدوں پر واٹر مارک (خالی ہونے پر کچھ نہیں)
+InvoiceNotChecked=کوئی رسید منتخب نہیں کی گئی۔
+ConfirmCloneInvoice=کیا آپ واقعی اس رسید <b> %s </b> کلون کرنا چاہتے ہیں؟
+DisabledBecauseReplacedInvoice=کارروائی غیر فعال ہے کیونکہ انوائس کو تبدیل کر دیا گیا ہے۔
+DescTaxAndDividendsArea=یہ علاقہ خصوصی اخراجات کے لیے کی گئی تمام ادائیگیوں کا خلاصہ پیش کرتا ہے۔ یہاں صرف مقررہ سال کے دوران ادائیگیوں کے ریکارڈ شامل ہیں۔
+NbOfPayments=ادائیگیوں کی تعداد
+SplitDiscount=رعایت کو دو حصوں میں تقسیم کریں۔
+ConfirmSplitDiscount=کیا آپ واقعی <b> %s </b> %s کی اس رعایت کو دو چھوٹی رعایتوں میں تقسیم کرنا چاہتے ہیں؟
+TypeAmountOfEachNewDiscount=دو حصوں میں سے ہر ایک کے لیے ان پٹ کی رقم:
+TotalOfTwoDiscountMustEqualsOriginal=دو نئی رعایتوں کا کل اصل رعایت کی رقم کے برابر ہونا چاہیے۔
+ConfirmRemoveDiscount=کیا آپ واقعی اس رعایت کو ہٹانا چاہتے ہیں؟
+RelatedBill=متعلقہ رسید
+RelatedBills=متعلقہ رسیدیں
+RelatedCustomerInvoices=متعلقہ کسٹمر انوائس
+RelatedSupplierInvoices=متعلقہ وینڈر انوائسز
+LatestRelatedBill=تازہ ترین متعلقہ رسید
+WarningBillExist=انتباہ، ایک یا زیادہ رسیدیں پہلے سے موجود ہیں۔
+MergingPDFTool=پی ڈی ایف ٹول کو ضم کرنا
+AmountPaymentDistributedOnInvoice=ادائیگی کی رقم انوائس پر تقسیم کی جاتی ہے۔
+PaymentOnDifferentThirdBills=مختلف فریق ثالث کے بلوں پر ادائیگی کی اجازت دیں لیکن ایک ہی پیرنٹ کمپنی
+PaymentNote=ادائیگی کا نوٹ
+ListOfPreviousSituationInvoices=پچھلی صورتحال کی رسیدوں کی فہرست
+ListOfNextSituationInvoices=اگلی صورتحال کے رسیدوں کی فہرست
+ListOfSituationInvoices=صورتحال کی رسیدوں کی فہرست
+CurrentSituationTotal=کل موجودہ صورتحال
+DisabledBecauseNotEnouthCreditNote=کسی صورت حال کی رسید کو سائیکل سے ہٹانے کے لیے، اس انوائس کے کریڈٹ نوٹ کی کل کو اس انوائس کے کل کا احاطہ کرنا چاہیے
+RemoveSituationFromCycle=اس انوائس کو سائیکل سے ہٹا دیں۔
+ConfirmRemoveSituationFromCycle=اس انوائس %s کو سائیکل سے ہٹا دیں؟
+ConfirmOuting=باہر جانے کی تصدیق کریں۔
+FrequencyPer_d=ہر %s دن
+FrequencyPer_m=ہر %s ماہ بعد
+FrequencyPer_y=ہر %s سال
+FrequencyUnit=تعدد یونٹ
+toolTipFrequency=مثالیں: <br> <b> سیٹ 7، دن </b> : ہر 7 دن بعد ایک نیا انوائس دیں
+NextDateToExecution=اگلی انوائس جنریشن کی تاریخ
+NextDateToExecutionShort=اگلی نسل کی تاریخ۔
+DateLastGeneration=تازہ ترین نسل کی تاریخ
+DateLastGenerationShort=تازہ ترین جنرل کی تاریخ۔
+MaxPeriodNumber=زیادہ سے زیادہ انوائس نسل کی تعداد
+NbOfGenerationDone=انوائس جنریشن کی تعداد پہلے ہی ہو چکی ہے۔
+NbOfGenerationOfRecordDone=ریکارڈ جنریشن کی تعداد پہلے ہی ہو چکی ہے۔
+NbOfGenerationDoneShort=مکمل ہونے والی نسل کی تعداد
+MaxGenerationReached=نسلوں کی زیادہ سے زیادہ تعداد تک پہنچ گئی۔
+InvoiceAutoValidate=انوائسز کی خود بخود توثیق کریں۔
+GeneratedFromRecurringInvoice=ٹیمپلیٹ ریکرنگ انوائس %s سے تیار کردہ
+DateIsNotEnough=ابھی تک تاریخ نہیں پہنچی۔
+InvoiceGeneratedFromTemplate=انوائس %s بار بار چلنے والی ٹیمپلیٹ انوائس %s سے تیار کیا گیا
+GeneratedFromTemplate=ٹیمپلیٹ انوائس %s سے تیار کردہ
+WarningInvoiceDateInFuture=وارننگ، انوائس کی تاریخ موجودہ تاریخ سے زیادہ ہے۔
+WarningInvoiceDateTooFarInFuture=وارننگ، انوائس کی تاریخ موجودہ تاریخ سے بہت دور ہے۔
+ViewAvailableGlobalDiscounts=دستیاب چھوٹ دیکھیں
+GroupPaymentsByModOnReports=رپورٹس پر موڈ کے لحاظ سے گروپ ادائیگی
+# PaymentConditions
+Statut=حالت
+PaymentConditionShortRECEP=وصولی پر واجب الادا
+PaymentConditionRECEP=وصولی پر واجب الادا
+PaymentConditionShort30D=30 یوم
+PaymentCondition30D=30 یوم
+PaymentConditionShort30DENDMONTH=مہینے کے اختتام کے 30 دن
+PaymentCondition30DENDMONTH=مہینے کے اختتام کے بعد 30 دنوں کے اندر
+PaymentConditionShort60D=60 دن
+PaymentCondition60D=60 دن
+PaymentConditionShort60DENDMONTH=مہینے کے اختتام کے 60 دن
+PaymentCondition60DENDMONTH=مہینے کے اختتام کے بعد 60 دنوں کے اندر
+PaymentConditionShortPT_DELIVERY=ترسیل
+PaymentConditionPT_DELIVERY=پہنچانے پر
+PaymentConditionShortPT_ORDER=ترتیب
+PaymentConditionPT_ORDER=حکم پر
+PaymentConditionShortPT_5050=50-50
+PaymentConditionPT_5050=50%% پیشگی، 50%% ڈیلیوری پر
+PaymentConditionShort10D=10 دن
+PaymentCondition10D=10 دن
+PaymentConditionShort10DENDMONTH=مہینے کے اختتام کے 10 دن
+PaymentCondition10DENDMONTH=مہینے کے اختتام کے بعد 10 دنوں کے اندر
+PaymentConditionShort14D=14 دن
+PaymentCondition14D=14 دن
+PaymentConditionShort14DENDMONTH=مہینے کے اختتام کے 14 دن
+PaymentCondition14DENDMONTH=مہینے کے اختتام کے بعد 14 دنوں کے اندر
+FixAmount=مقررہ رقم - '%s' لیبل کے ساتھ 1 لائن
+VarAmount=متغیر رقم (%% tot.)
+VarAmountOneLine=متغیر رقم (%% tot.) - '%s' لیبل کے ساتھ 1 لائن
+VarAmountAllLines=متغیر رقم (%% tot.) - اصل سے تمام لائنیں
+# PaymentType
+PaymentTypeVIR=بینک ٹرانسفر
+PaymentTypeShortVIR=بینک ٹرانسفر
+PaymentTypePRE=براہ راست ڈیبٹ ادائیگی کا آرڈر
+PaymentTypeShortPRE=ڈیبٹ ادائیگی کا آرڈر
+PaymentTypeLIQ=نقد
+PaymentTypeShortLIQ=نقد
+PaymentTypeCB=کریڈٹ کارڈ
+PaymentTypeShortCB=کریڈٹ کارڈ
+PaymentTypeCHQ=چیک کریں۔
+PaymentTypeShortCHQ=چیک کریں۔
+PaymentTypeTIP=TIP (ادائیگی کے خلاف دستاویزات)
+PaymentTypeShortTIP=TIP ادائیگی
+PaymentTypeVAD=آن لائن ادائیگی
+PaymentTypeShortVAD=آن لائن ادائیگی
+PaymentTypeTRA=بینک ڈرافٹ
+PaymentTypeShortTRA=مسودہ
+PaymentTypeFAC=عنصر
+PaymentTypeShortFAC=عنصر
+PaymentTypeDC=ڈیبٹ/کریڈٹ کارڈ
+PaymentTypePP=پے پال
+BankDetails=بینک کی تفصیلات
+BankCode=بینک کوڈ
+DeskCode=برانچ کوڈ
+BankAccountNumber=اکاؤنٹ نمبر
+BankAccountNumberKey=چیکسم
+Residence=پتہ
+IBANNumber=IBAN اکاؤنٹ نمبر
+IBAN=IBAN
+CustomerIBAN=گاہک کا IBAN
+SupplierIBAN=وینڈر کا IBAN
+BIC=BIC/SWIFT
+BICNumber=BIC/SWIFT کوڈ
+ExtraInfos=اضافی معلومات
+RegulatedOn=پر ریگولیٹڈ
+ChequeNumber=N° چیک کریں۔
+ChequeOrTransferNumber=چیک/منتقلی N°
+ChequeBordereau=شیڈول چیک کریں۔
+ChequeMaker=بھیجنے والے کو چیک/منتقل کریں۔
+ChequeBank=بینک آف چیک
+CheckBank=چیک کریں۔
+NetToBePaid=ادا کرنے کے لیے خالص
+PhoneNumber=ٹیلی فون
+FullPhoneNumber=ٹیلی فون
+TeleFax=فیکس
+PrettyLittleSentence=مالیاتی انتظامیہ کی طرف سے منظور شدہ اکاؤنٹنگ ایسوسی ایشن کے ممبر کی حیثیت سے میرے نام پر جاری کردہ چیکس کے ذریعے واجب الادا ادائیگیوں کی رقم کو قبول کریں۔
+IntracommunityVATNumber=انٹرا کمیونٹی VAT ID
+PaymentByChequeOrderedTo=چیک کی ادائیگیاں (بشمول ٹیکس) %s کو قابل ادائیگی ہیں، بھیجیں
+PaymentByChequeOrderedToShort=چیک کی ادائیگیاں (ٹیکس سمیت) قابل ادائیگی ہیں۔
+SendTo=کو بھیجا
+PaymentByTransferOnThisBankAccount=درج ذیل بینک اکاؤنٹ میں ٹرانسفر کے ذریعے ادائیگی
+VATIsNotUsedForInvoice=* CGI کا غیر قابل اطلاق VAT آرٹ-293B
+LawApplicationPart1=قانون 80.335 از 12/05/80 کے اطلاق سے
+LawApplicationPart2=سامان کی ملکیت رہتی ہے
+LawApplicationPart3=کی مکمل ادائیگی تک بیچنے والے
+LawApplicationPart4=ان کی قیمت.
+LimitedLiabilityCompanyCapital=کیپٹل کے ساتھ SARL
+UseLine=درخواست دیں
+UseDiscount=ڈسکاؤنٹ استعمال کریں۔
+UseCredit=کریڈٹ استعمال کریں۔
+UseCreditNoteInInvoicePayment=اس کریڈٹ کے ساتھ ادائیگی کے لیے رقم کم کریں۔
+MenuChequeDeposits=چیک ڈپازٹس
+MenuCheques=چیک کرتا ہے۔
+MenuChequesReceipts=رسیدیں چیک کریں۔
+NewChequeDeposit=نیا ڈپازٹ
+ChequesReceipts=رسیدیں چیک کریں۔
+ChequesArea=ڈپازٹ ایریا چیک کریں۔
+ChequeDeposits=چیک ڈپازٹس
+Cheques=چیک کرتا ہے۔
+DepositId=آئی ڈی ڈپازٹ
+NbCheque=چیکوں کی تعداد
+CreditNoteConvertedIntoDiscount=اس %s کو %s میں تبدیل کر دیا گیا ہے۔
+UsBillingContactAsIncoiveRecipientIfExist=انوائس کے وصول کنندہ کے طور پر فریق ثالث کے پتے کی بجائے 'بلنگ رابطہ' ٹائپ کے ساتھ رابطہ/پتہ استعمال کریں
+ShowUnpaidAll=تمام غیر ادا شدہ رسیدیں دکھائیں۔
+ShowUnpaidLateOnly=صرف تاخیر سے ادا شدہ رسیدیں دکھائیں۔
+PaymentInvoiceRef=ادائیگی کی رسید %s
+ValidateInvoice=رسید کی توثیق کریں۔
+ValidateInvoices=رسیدوں کی تصدیق کریں۔
+Cash=نقد
+Reported=تاخیر
+DisabledBecausePayments=ممکن نہیں کیونکہ کچھ ادائیگیاں ہیں۔
+CantRemovePaymentWithOneInvoicePaid=ادائیگی کو ہٹایا نہیں جا سکتا کیونکہ کم از کم ایک انوائس کلاسیفائیڈ ادا شدہ ہے۔
+CantRemovePaymentVATPaid=ادائیگی کو ہٹایا نہیں جا سکتا کیونکہ VAT ڈیکلریشن کی درجہ بندی ادا کی گئی ہے۔
+CantRemovePaymentSalaryPaid=ادائیگی کو ختم نہیں کیا جا سکتا کیونکہ تنخواہ کی درجہ بندی ادا کی جاتی ہے۔
+ExpectedToPay=متوقع ادائیگی
+CantRemoveConciliatedPayment=مصالحت شدہ ادائیگی کو ہٹایا نہیں جا سکتا
+PayedByThisPayment=اس ادائیگی سے ادا کیا گیا۔
+ClosePaidInvoicesAutomatically=ادائیگی مکمل ہونے پر تمام معیاری، ڈاؤن پیمنٹ یا متبادل رسیدوں کو خود بخود "ادائیگی" کے طور پر درجہ بندی کریں۔
+ClosePaidCreditNotesAutomatically=جب ریفنڈ مکمل ہو جائے تو خود بخود تمام کریڈٹ نوٹ کو "ادائیگی" کے طور پر درجہ بندی کریں۔
+ClosePaidContributionsAutomatically=جب ادائیگی مکمل ہو جائے تو خود بخود تمام سماجی یا مالی تعاون کو "ادائیگی" کے طور پر درجہ بندی کریں۔
+ClosePaidVATAutomatically=جب ادائیگی مکمل ہو جائے تو خود بخود VAT کے اعلان کو "ادائیگی" کے طور پر درجہ بندی کریں۔
+ClosePaidSalaryAutomatically=جب ادائیگی مکمل ہو جائے تو خود بخود تنخواہ کو "ادائیگی" کے طور پر درجہ بندی کریں۔
+AllCompletelyPayedInvoiceWillBeClosed=تمام انوائسز جن میں ادائیگی کرنا باقی نہیں ہے خود بخود "ادائیگی" کی حیثیت کے ساتھ بند ہو جائے گی۔
+ToMakePayment=ادا کریں۔
+ToMakePaymentBack=واپس ادا کریں۔
+ListOfYourUnpaidInvoices=غیر ادا شدہ رسیدوں کی فہرست
+NoteListOfYourUnpaidInvoices=نوٹ: اس فہرست میں صرف تیسرے فریق کی رسیدیں شامل ہیں جن سے آپ بطور سیلز نمائندہ منسلک ہیں۔
+RevenueStamp=ٹیکس سٹیمپ
+YouMustCreateInvoiceFromThird=یہ اختیار صرف اس وقت دستیاب ہوتا ہے جب فریق ثالث کے ٹیب "کسٹمر" سے انوائس بناتے ہوں۔
+YouMustCreateInvoiceFromSupplierThird=یہ اختیار صرف اس وقت دستیاب ہوتا ہے جب فریق ثالث کے ٹیب "وینڈر" سے انوائس بناتے ہوں۔
+YouMustCreateStandardInvoiceFirstDesc=آپ کو سب سے پہلے ایک معیاری انوائس بنانا ہوگی اور اسے "ٹیمپلیٹ" میں تبدیل کرکے ایک نیا ٹیمپلیٹ انوائس بنانا ہوگا۔
+PDFCrabeDescription=انوائس پی ڈی ایف ٹیمپلیٹ کریب۔ ایک مکمل انوائس ٹیمپلیٹ (سپنج ٹیمپلیٹ کا پرانا نفاذ)
+PDFSpongeDescription=انوائس پی ڈی ایف ٹیمپلیٹ سپنج۔ ایک مکمل انوائس ٹیمپلیٹ
+PDFCrevetteDescription=انوائس پی ڈی ایف ٹیمپلیٹ کریویٹ۔ صورت حال کی رسیدوں کے لیے ایک مکمل انوائس ٹیمپلیٹ
+TerreNumRefModelDesc1=معیاری رسیدوں کے لیے %syymm-nnnn فارمیٹ میں واپسی نمبر اور کریڈٹ نوٹ کے لیے %syymm-nnnn جہاں yy سال ہے، mm مہینہ ہے اور nnnn ایک ترتیب وار خود بخود بڑھنے والا نمبر ہے جس میں کوئی وقفہ نہیں ہے اور 0 پر واپس نہیں آتا ہے۔
+MarsNumRefModelDesc1=معیاری رسیدوں کے لیے %syymm-nnnn فارمیٹ میں واپسی کا نمبر، متبادل رسیدوں کے لیے %syymm-nnnn، ڈاؤن پیمنٹ انوائسز کے لیے %syymm-nnnn اور %syymm-nnnn کے لیے %syymm-nnnn سال کے لیے کریڈٹ نمبر ہے، اور a0ecb2ec87mm-90000000000000 سال کے لیے خودکار نمبر ہے۔ بغیر کسی وقفے اور 0 پر واپسی کے بغیر
+TerreNumRefModelError=$syymm سے شروع ہونے والا بل پہلے سے موجود ہے اور ترتیب کے اس ماڈل کے ساتھ مطابقت نہیں رکھتا ہے۔ اس ماڈیول کو فعال کرنے کے لیے اسے ہٹا دیں یا اس کا نام تبدیل کریں۔
+CactusNumRefModelDesc1=معیاری رسیدوں کے لیے %syymm-nnnn فارمیٹ میں واپسی کا نمبر، کریڈٹ نوٹس کے لیے %syymm-nnnn اور ڈاؤن پیمنٹ انوائسز کے لیے %syymm-nnnn جہاں yy سال ہے، mm ایک مہینہ ہے اور نمبر کے ساتھ کوئی وقفہ نہیں ہے 0
+EarlyClosingReason=ابتدائی بندش کی وجہ
+EarlyClosingComment=ابتدائی اختتامی نوٹ
+##### Types de contacts #####
+TypeContact_facture_internal_SALESREPFOLL=نمائندہ پیروی کرنے والا کسٹمر انوائس
+TypeContact_facture_external_BILLING=کسٹمر انوائس رابطہ
+TypeContact_facture_external_SHIPPING=کسٹمر شپنگ رابطہ
+TypeContact_facture_external_SERVICE=کسٹمر سروس سے رابطہ کریں۔
+TypeContact_invoice_supplier_internal_SALESREPFOLL=نمائندہ فالو اپ وینڈر انوائس
+TypeContact_invoice_supplier_external_BILLING=وینڈر انوائس رابطہ
+TypeContact_invoice_supplier_external_SHIPPING=وینڈر شپنگ رابطہ
+TypeContact_invoice_supplier_external_SERVICE=وینڈر سروس سے رابطہ کریں۔
+# Situation invoices
+InvoiceFirstSituationAsk=پہلی صورت حال کی رسید
+InvoiceFirstSituationDesc=<b> صورتحال کی رسیدیں </b> کسی پیشرفت سے متعلق حالات سے منسلک ہیں، مثال کے طور پر تعمیر کی ترقی۔ ہر صورت حال ایک انوائس سے منسلک ہے.
+InvoiceSituation=صورتحال رسید
+PDFInvoiceSituation=صورتحال رسید
+InvoiceSituationAsk=صورت حال کے بعد رسید
+InvoiceSituationDesc=پہلے سے موجود صورتحال کے بعد ایک نئی صورتحال پیدا کریں۔
+SituationAmount=صورت حال رسید کی رقم (خالص)
+SituationDeduction=صورتحال گھٹاؤ
+ModifyAllLines=تمام لائنوں میں ترمیم کریں۔
+CreateNextSituationInvoice=اگلی صورتحال بنائیں
+ErrorFindNextSituationInvoice=اگلی صورتحال سائیکل ریف کو تلاش کرنے میں خرابی
+ErrorOutingSituationInvoiceOnUpdate=اس صورتحال کے انوائس کو آؤٹ کرنے سے قاصر ہے۔
+ErrorOutingSituationInvoiceCreditNote=منسلک کریڈٹ نوٹ کو باہر کرنے سے قاصر ہے۔
+NotLastInCycle=یہ انوائس سائیکل میں تازہ ترین نہیں ہے اور اس میں ترمیم نہیں کی جانی چاہیے۔
+DisabledBecauseNotLastInCycle=اگلی صورتحال پہلے سے موجود ہے۔
+DisabledBecauseFinal=یہ صورتحال حتمی ہے۔
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=ایس
+CantBeLessThanMinPercent=ترقی پچھلی صورت حال میں اس کی قدر سے کم نہیں ہو سکتی۔
+NoSituations=کھلے حالات نہیں۔
+InvoiceSituationLast=حتمی اور عام رسید
+PDFCrevetteSituationNumber=صورتحال N°%s
+PDFCrevetteSituationInvoiceLineDecompte=صورتحال رسید - COUNT
+PDFCrevetteSituationInvoiceTitle=صورتحال رسید
+PDFCrevetteSituationInvoiceLine=صورتحال N°%s: Inv. N°%s پر %s
+TotalSituationInvoice=کل صورتحال
+invoiceLineProgressError=انوائس لائن کی پیشرفت اگلی انوائس لائن سے زیادہ یا اس کے برابر نہیں ہو سکتی
+updatePriceNextInvoiceErrorUpdateline=خرابی: انوائس لائن پر قیمت کو اپ ڈیٹ کریں: %s
+ToCreateARecurringInvoice=اس معاہدے کے لیے بار بار چلنے والی انوائس بنانے کے لیے، پہلے یہ ڈرافٹ انوائس بنائیں، پھر اسے انوائس ٹیمپلیٹ میں تبدیل کریں اور مستقبل کے انوائسز کی نسل کے لیے تعدد کی وضاحت کریں۔
+ToCreateARecurringInvoiceGene=مستقبل کی رسیدیں باقاعدگی سے اور دستی طور پر بنانے کے لیے، صرف مینو <strong> %s - %s - %s a0a65d071f6fc90z پر جائیں۔
+ToCreateARecurringInvoiceGeneAuto=اگر آپ کو ایسی رسیدیں خود بخود تیار کرنے کی ضرورت ہے تو، اپنے منتظم کو فعال کرنے اور ماڈیول ترتیب دینے کے لیے کہیں <strong> %s </strong> ۔ نوٹ کریں کہ دونوں طریقوں (دستی اور خودکار) کو ایک ساتھ استعمال کیا جا سکتا ہے جس میں نقل کا کوئی خطرہ نہیں ہے۔
+DeleteRepeatableInvoice=ٹیمپلیٹ انوائس کو حذف کریں۔
+ConfirmDeleteRepeatableInvoice=کیا آپ واقعی ٹیمپلیٹ انوائس کو حذف کرنا چاہتے ہیں؟
+CreateOneBillByThird=فی تھرڈ پارٹی ایک انوائس بنائیں (بصورت دیگر، فی منتخب آبجیکٹ ایک انوائس)
+BillCreated=%s انوائس تیار کی گئی۔
+BillXCreated=انوائس %s تیار ہوا۔
+StatusOfGeneratedDocuments=دستاویز کی تیاری کی حیثیت
+DoNotGenerateDoc=دستاویز فائل نہ بنائیں
+AutogenerateDoc=دستاویز فائل کو خود بخود تیار کریں۔
+AutoFillDateFrom=انوائس کی تاریخ کے ساتھ سروس لائن کے لیے آغاز کی تاریخ مقرر کریں۔
+AutoFillDateFromShort=آغاز کی تاریخ مقرر کریں۔
+AutoFillDateTo=اگلی انوائس تاریخ کے ساتھ سروس لائن کے لیے اختتامی تاریخ مقرر کریں۔
+AutoFillDateToShort=اختتامی تاریخ مقرر کریں۔
+MaxNumberOfGenerationReached=جین کی زیادہ سے زیادہ تعداد۔ پہنچ گئے
+BILL_DELETEInDolibarr=رسید حذف کر دی گئی۔
+BILL_SUPPLIER_DELETEInDolibarr=فراہم کنندہ کی رسید حذف کر دی گئی۔
+UnitPriceXQtyLessDiscount=یونٹ کی قیمت x مقدار - ڈسکاؤنٹ
+CustomersInvoicesArea=کسٹمر بلنگ ایریا
+SupplierInvoicesArea=سپلائر بلنگ ایریا
+FacParentLine=انوائس لائن والدین
+SituationTotalRayToRest=ٹیکس کے بغیر ادا کرنے کے لیے باقی ہے۔
+PDFSituationTitle=صورتحال n° %d
+SituationTotalProgress=کل پیش رفت %d %%
+SearchUnpaidInvoicesWithDueDate=مقررہ تاریخ = %s کے ساتھ بلا معاوضہ رسیدیں تلاش کریں۔
+NoPaymentAvailable=%s کے لیے کوئی ادائیگی دستیاب نہیں ہے۔
+PaymentRegisteredAndInvoiceSetToPaid=ادائیگی رجسٹرڈ اور انوائس %s ادا کرنے پر سیٹ ہے۔
+SendEmailsRemindersOnInvoiceDueDate=بلا معاوضہ رسیدوں کے لیے ای میل کے ذریعے یاد دہانی بھیجیں۔
diff --git a/htdocs/langs/ur_PK/blockedlog.lang b/htdocs/langs/ur_PK/blockedlog.lang
new file mode 100644
index 00000000000..261c4985240
--- /dev/null
+++ b/htdocs/langs/ur_PK/blockedlog.lang
@@ -0,0 +1,57 @@
+BlockedLog=ناقابل تبدیلی لاگز
+Field=میدان
+BlockedLogDesc=یہ ماڈیول کچھ واقعات کو ایک ناقابل تبدیلی لاگ میں ٹریک کرتا ہے (جس کو آپ ایک بار ریکارڈ کرنے کے بعد تبدیل نہیں کر سکتے ہیں) ایک بلاک چین میں، حقیقی وقت میں۔ یہ ماڈیول کچھ ممالک کے قوانین کی ضروریات کے ساتھ مطابقت فراہم کرتا ہے (جیسے فرانس کے ساتھ قانون فنانس 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=Module BlockedLog کو غیر فعال کر دیا گیا تھا۔
+logMODULE_SET=Module 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=آپ کے ملک کی قانون سازی کے ذریعہ ناقابل تبدیلی لاگس ماڈیول کی ضرورت ہوسکتی ہے۔ اس ماڈیول کو غیر فعال کرنے سے مستقبل کے کسی بھی لین دین کو قانون اور قانونی سافٹ ویئر کے استعمال کے حوالے سے غلط قرار دیا جا سکتا ہے کیونکہ ٹیکس آڈٹ کے ذریعے ان کی توثیق نہیں کی جا سکتی ہے۔
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=آپ کے ملک کی قانون سازی کی وجہ سے ناقابل تبدیلی لاگز ماڈیول کو چالو کیا گیا تھا۔ اس ماڈیول کو غیر فعال کرنے سے مستقبل کے کسی بھی لین دین کو قانون اور قانونی سافٹ ویئر کے استعمال کے حوالے سے غلط قرار دیا جا سکتا ہے کیونکہ ٹیکس آڈٹ کے ذریعے ان کی توثیق نہیں کی جا سکتی ہے۔
+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/bookmarks.lang b/htdocs/langs/ur_PK/bookmarks.lang
new file mode 100644
index 00000000000..c34c4bc2399
--- /dev/null
+++ b/htdocs/langs/ur_PK/bookmarks.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - marque pages
+AddThisPageToBookmarks=موجودہ صفحہ کو بُک مارکس میں شامل کریں۔
+Bookmark=بک مارک
+Bookmarks=بک مارکس
+ListOfBookmarks=بک مارکس کی فہرست
+EditBookmarks=بُک مارکس کی فہرست/ترمیم کریں۔
+NewBookmark=نیا بک مارک
+ShowBookmark=بُک مارک دکھائیں۔
+OpenANewWindow=ایک نیا ٹیب کھولیں۔
+ReplaceWindow=موجودہ ٹیب کو تبدیل کریں۔
+BookmarkTargetNewWindowShort=نیا ٹیب
+BookmarkTargetReplaceWindowShort=موجودہ ٹیب
+BookmarkTitle=بک مارک نام
+UrlOrLink=URL
+BehaviourOnClick=ایک بک مارک URL منتخب ہونے پر برتاؤ
+CreateBookmark=بک مارک بنائیں
+SetHereATitleForLink=بک مارک کے لیے ایک نام سیٹ کریں۔
+UseAnExternalHttpLinkOrRelativeDolibarrLink=ایک بیرونی/مطلق لنک (https://externalurl.com) یا اندرونی/رشتہ دار لنک (/mypage.php) استعمال کریں۔ آپ tel:0123456 کی طرح فون بھی استعمال کر سکتے ہیں۔
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=منتخب کریں کہ منسلک صفحہ موجودہ ٹیب میں کھلنا چاہیے یا نئے ٹیب میں
+BookmarksManagement=بُک مارکس کا انتظام
+BookmarksMenuShortCut=Ctrl + shift + m
+NoBookmarks=کوئی بک مارکس کی وضاحت نہیں کی گئی ہے۔
diff --git a/htdocs/langs/ur_PK/boxes.lang b/htdocs/langs/ur_PK/boxes.lang
new file mode 100644
index 00000000000..e641e138f71
--- /dev/null
+++ b/htdocs/langs/ur_PK/boxes.lang
@@ -0,0 +1,120 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=ڈیٹا بیس میں اہم کاروباری اشیاء کے اعدادوشمار
+BoxLoginInformation=لاگ ان کی معلومات
+BoxLastRssInfos=آر ایس ایس کی معلومات
+BoxLastProducts=تازہ ترین %s مصنوعات/خدمات
+BoxProductsAlertStock=مصنوعات کے لیے اسٹاک الرٹس
+BoxLastProductsInContract=تازہ ترین %s معاہدہ شدہ مصنوعات/خدمات
+BoxLastSupplierBills=تازہ ترین وینڈر انوائسز
+BoxLastCustomerBills=تازہ ترین کسٹمر انوائسز
+BoxOldestUnpaidCustomerBills=سب سے پرانی بلا معاوضہ کسٹمر انوائس
+BoxOldestUnpaidSupplierBills=سب سے پرانی بلا معاوضہ وینڈر انوائس
+BoxLastProposals=تازہ ترین تجارتی تجاویز
+BoxLastProspects=تازہ ترین ترمیم شدہ امکانات
+BoxLastCustomers=تازہ ترین ترمیم شدہ صارفین
+BoxLastSuppliers=تازہ ترین ترمیم شدہ سپلائرز
+BoxLastCustomerOrders=تازہ ترین سیلز آرڈرز
+BoxLastActions=تازہ ترین اقدامات
+BoxLastContracts=تازہ ترین معاہدے
+BoxLastContacts=تازہ ترین رابطے/پتے
+BoxLastMembers=تازہ ترین ممبران
+BoxLastModifiedMembers=تازہ ترین ترمیم شدہ ممبران
+BoxLastMembersSubscriptions=تازہ ترین ممبر سبسکرپشنز
+BoxFicheInter=تازہ ترین مداخلت
+BoxCurrentAccounts=کھاتوں کا بیلنس کھولیں۔
+BoxTitleMemberNextBirthdays=اس مہینے کی سالگرہ (ممبران)
+BoxTitleMembersByType=قسم کے لحاظ سے اراکین
+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=تازہ ترین %s اخراجات کی رپورٹس جن میں ترمیم کی گئی تھی۔
+BoxTitleLatestModifiedBoms=تازہ ترین %s 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=تازہ ترین %s تبدیل شدہ ملازمت کی پوزیشنیں۔
+BoxTitleLatestModifiedCandidatures=تازہ ترین %s تبدیل شدہ ملازمت کی درخواستیں۔
+ForCustomersInvoices=صارفین کی رسیدیں
+ForCustomersOrders=صارفین کے احکامات
+ForProposals=تجاویز
+LastXMonthRolling=تازہ ترین %s مہینہ رولنگ
+ChooseBoxToAdd=اپنے ڈیش بورڈ میں ویجیٹ شامل کریں۔
+BoxAdded=ویجیٹ آپ کے ڈیش بورڈ میں شامل کیا گیا تھا۔
+BoxTitleUserBirthdaysOfMonth=اس مہینے کی سالگرہ (صارفین)
+BoxLastManualEntries=اکاؤنٹنسی میں تازہ ترین ریکارڈ دستی طور پر یا ماخذ دستاویز کے بغیر درج کیا گیا ہے۔
+BoxTitleLastManualEntries=%s تازہ ترین ریکارڈ دستی طور پر یا ماخذ دستاویز کے بغیر درج کیا گیا۔
+NoRecordedManualEntries=اکاؤنٹنسی میں کوئی دستی اندراجات کا ریکارڈ نہیں ہے۔
+BoxSuspenseAccount=سسپنس اکاؤنٹ کے ساتھ اکاؤنٹنسی آپریشن کو شمار کریں۔
+BoxTitleSuspenseAccount=غیر مختص لائنوں کی تعداد
+NumberOfLinesInSuspenseAccount=سسپنس اکاؤنٹ میں لائن کی تعداد
+SuspenseAccountNotDefined=سسپنس اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+BoxLastCustomerShipments=آخری کسٹمر کی ترسیل
+BoxTitleLastCustomerShipments=تازہ ترین %s کسٹمر کی ترسیل
+NoRecordedShipments=کوئی ریکارڈ شدہ کسٹمر شپمنٹ نہیں۔
+BoxCustomersOutstandingBillReached=واجب الادا گاہک کی حد تک پہنچ گئی۔
+# Pages
+UsersHome=گھریلو صارفین اور گروپس
+MembersHome=ہوم ممبرشپ
+ThirdpartiesHome=ہوم تھرڈ پارٹیز
+TicketsHome=ہوم ٹکٹس
+AccountancyHome=ہوم اکاؤنٹنسی
+ValidatedProjects=تصدیق شدہ منصوبے
diff --git a/htdocs/langs/ur_PK/cashdesk.lang b/htdocs/langs/ur_PK/cashdesk.lang
new file mode 100644
index 00000000000..9b07a7e47f7
--- /dev/null
+++ b/htdocs/langs/ur_PK/cashdesk.lang
@@ -0,0 +1,136 @@
+# Language file - Source file is en_US - cashdesk
+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=اس فروخت کے لیے کوئی VAT نہیں ہے۔
+Change=ضرورت سے زیادہ موصول ہوئی۔
+BankToPay=ادائیگی کے لیے اکاؤنٹ
+ShowCompany=کمپنی دکھائیں۔
+ShowStock=گودام دکھائیں۔
+DeleteArticle=اس مضمون کو ہٹانے کے لیے کلک کریں۔
+FilterRefOrLabelOrBC=تلاش کریں (حوالہ/لیبل)
+UserNeedPermissionToEditStockToUsePos=آپ انوائس بنانے پر اسٹاک کو کم کرنے کے لیے کہتے ہیں، اس لیے POS استعمال کرنے والے صارف کو اسٹاک میں ترمیم کرنے کی اجازت کی ضرورت ہوتی ہے۔
+DolibarrReceiptPrinter=Dolibarr رسید پرنٹر
+PointOfSale=پوائنٹ آف سیل
+PointOfSaleShort=پی او ایس
+CloseBill=بل بند کریں۔
+Floors=فرش
+Floor=فرش
+AddTable=ٹیبل شامل کریں۔
+Place=جگہ
+TakeposConnectorNecesary='TakePOS کنیکٹر' درکار ہے۔
+OrderPrinters=کچھ پرنٹرز کو آرڈر بھیجنے کے لیے بٹن شامل کریں، بغیر ادائیگی کے (مثال کے طور پر کچن میں آرڈر بھیجنے کے لیے)
+NotAvailableWithBrowserPrinter=رسید کے لیے پرنٹر براؤزر پر سیٹ ہونے پر دستیاب نہیں ہے۔
+SearchProduct=پروڈکٹ تلاش کریں۔
+Receipt=رسید
+Header=ہیڈر
+Footer=فوٹر
+AmountAtEndOfPeriod=مدت کے اختتام پر رقم (دن، مہینہ یا سال)
+TheoricalAmount=نظریاتی رقم
+RealAmount=اصلی رقم
+CashFence=کیش ڈیسک بند ہو رہا ہے۔
+CashFenceDone=کیش ڈیسک کی بندش مدت کے لیے ہو گئی۔
+NbOfInvoices=رسیدوں کا نمبر
+Paymentnumpad=ادائیگی داخل کرنے کے لیے پیڈ کی قسم
+Numberspad=نمبرز پیڈ
+BillsCoinsPad=سکے اور بینک نوٹ پیڈ
+DolistorePosCategory=Dolibarr کے لیے TakePOS ماڈیولز اور دیگر POS حل
+TakeposNeedsCategories=TakePOS کو کام کرنے کے لیے کم از کم ایک پروڈکٹ کیٹیگری کی ضرورت ہے۔
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS کو کام کرنے کے لیے <b> %s </b> زمرہ کے تحت کم از کم 1 پروڈکٹ کیٹیگری کی ضرورت ہے۔
+OrderNotes=ہر آرڈر شدہ اشیاء میں کچھ نوٹ شامل کر سکتے ہیں۔
+CashDeskBankAccountFor=میں ادائیگیوں کے لیے استعمال کرنے کے لیے ڈیفالٹ اکاؤنٹ
+NoPaimementModesDefined=TakePOS کنفیگریشن میں پیمنٹ موڈ کی وضاحت نہیں کی گئی ہے۔
+TicketVatGrouped=ٹکٹوں میں شرح کے لحاظ سے گروپ VAT | رسیدیں
+AutoPrintTickets=خودکار طور پر ٹکٹیں | رسیدیں پرنٹ کریں۔
+PrintCustomerOnReceipts=ٹکٹوں پر کسٹمر پرنٹ کریں | رسیدیں
+EnableBarOrRestaurantFeatures=بار یا ریستوراں کے لیے خصوصیات کو فعال کریں۔
+ConfirmDeletionOfThisPOSSale=کیا آپ اس موجودہ فروخت کو حذف کرنے کی تصدیق کرتے ہیں؟
+ConfirmDiscardOfThisPOSSale=کیا آپ اس موجودہ فروخت کو مسترد کرنا چاہتے ہیں؟
+History=تاریخ
+ValidateAndClose=توثیق کریں اور بند کریں۔
+Terminal=ٹرمینل
+NumberOfTerminals=ٹرمینلز کی تعداد
+TerminalSelect=ٹرمینل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں:
+POSTicket=POS ٹکٹ
+POSTerminal=پی او ایس ٹرمینل
+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=POS کھولتے وقت "کنٹرول کیش" پاپ اپ کھولیں۔
+CloseCashFence=کیش ڈیسک کنٹرول بند کریں۔
+CashReport=کیش رپورٹ
+MainPrinterToUse=استعمال کرنے کے لیے مین پرنٹر
+OrderPrinterToUse=پرنٹر کو استعمال کرنے کا آرڈر دیں۔
+MainTemplateToUse=استعمال کرنے کے لیے اہم ٹیمپلیٹ
+OrderTemplateToUse=آرڈر ٹیمپلیٹ استعمال کرنے کے لیے
+BarRestaurant=بار ریستوراں
+AutoOrder=گاہک خود آرڈر کریں۔
+RestaurantMenu=مینو
+CustomerMenu=کسٹمر مینو
+ScanToMenu=مینو دیکھنے کے لیے QR کوڈ اسکین کریں۔
+ScanToOrder=آرڈر کرنے کے لیے کیو آر کوڈ اسکین کریں۔
+Appearance=ظہور
+HideCategoryImages=زمرہ کی تصاویر چھپائیں۔
+HideProductImages=پروڈکٹ کی تصاویر چھپائیں۔
+NumberOfLinesToShow=دکھانے کے لیے تصاویر کی لائنوں کی تعداد
+DefineTablePlan=ٹیبل پلان کی وضاحت کریں۔
+GiftReceiptButton=ایک "تحفے کی رسید" بٹن شامل کریں۔
+GiftReceipt=تحفے کی رسید
+ModuleReceiptPrinterMustBeEnabled=ماڈیول رسید پرنٹر کو پہلے فعال کیا گیا ہوگا۔
+AllowDelayedPayment=تاخیر سے ادائیگی کی اجازت دیں۔
+PrintPaymentMethodOnReceipts=ٹکٹوں پر ادائیگی کا طریقہ پرنٹ کریں | رسیدیں
+WeighingScale=وزن کا پیمانہ
+ShowPriceHT = ٹیکس کو چھوڑ کر قیمت کے ساتھ کالم دکھائیں (اسکرین پر)
+ShowPriceHTOnReceipt = ٹیکس کو چھوڑ کر قیمت کے ساتھ کالم دکھائیں (رسید پر)
+CustomerDisplay=کسٹمر ڈسپلے
+SplitSale=تقسیم فروخت
+PrintWithoutDetailsButton="تفصیلات کے بغیر پرنٹ کریں" بٹن شامل کریں۔
+PrintWithoutDetailsLabelDefault=بغیر تفصیلات کے پرنٹنگ پر بطور ڈیفالٹ لائن لیبل
+PrintWithoutDetails=تفصیلات کے بغیر پرنٹ کریں۔
+YearNotDefined=سال کی تعریف نہیں ہے۔
diff --git a/htdocs/langs/ur_PK/categories.lang b/htdocs/langs/ur_PK/categories.lang
new file mode 100644
index 00000000000..51a89cb8a61
--- /dev/null
+++ b/htdocs/langs/ur_PK/categories.lang
@@ -0,0 +1,100 @@
+# Dolibarr language file - Source file is en_US - 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=Cust./Prosp. ٹیگز/زمرے
+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=سپلائر کو زمرہ تفویض کریں۔
+ShowCategory=ٹیگ/زمرہ دکھائیں۔
+ByDefaultInList=فہرست میں بطور ڈیفالٹ
+ChooseCategory=زمرہ منتخب کریں۔
+StocksCategoriesArea=گودام کے زمرے
+ActionCommCategoriesArea=ایونٹ کے زمرے
+WebsitePagesCategoriesArea=صفحہ کنٹینر زمرہ جات
+KnowledgemanagementsCategoriesArea=KM مضمون کے زمرے
+UseOrOperatorForCategories=زمرہ جات کے لیے 'OR' آپریٹر استعمال کریں۔
diff --git a/htdocs/langs/ur_PK/commercial.lang b/htdocs/langs/ur_PK/commercial.lang
new file mode 100644
index 00000000000..2d111025699
--- /dev/null
+++ b/htdocs/langs/ur_PK/commercial.lang
@@ -0,0 +1,81 @@
+# Dolibarr language file - Source file is en_US - commercial
+Commercial=کامرس
+CommercialArea=کامرس ایریا
+Customer=صارف
+Customers=گاہکوں
+Prospect=امکان
+Prospects=امکانات
+DeleteAction=ایک واقعہ حذف کریں۔
+NewAction=نیا واقعہ
+AddAction=ایونٹ بنائیں
+AddAnAction=ایک ایونٹ بنائیں
+AddActionRendezVous=ایک Rendez-vous ایونٹ بنائیں
+ConfirmDeleteAction=کیا آپ واقعی اس ایونٹ کو حذف کرنا چاہتے ہیں؟
+CardAction=ایونٹ کارڈ
+ActionOnCompany=متعلقہ کمپنی
+ActionOnContact=متعلقہ رابطہ
+TaskRDVWith=%s کے ساتھ ملاقات
+ShowTask=کام دکھائیں۔
+ShowAction=واقعہ دکھائیں۔
+ActionsReport=واقعات کی رپورٹ
+ThirdPartiesOfSaleRepresentative=فروخت کے نمائندے کے ساتھ تیسرے فریق
+SaleRepresentativesOfThirdParty=تیسرے فریق کے سیلز نمائندے۔
+SalesRepresentative=سیلز نمائندہ
+SalesRepresentatives=فروخت کرنے والے نمائندے
+SalesRepresentativeFollowUp=سیلز نمائندہ (فالو اپ)
+SalesRepresentativeSignature=سیلز نمائندہ (دستخط)
+NoSalesRepresentativeAffected=کوئی خاص سیلز نمائندہ تفویض نہیں کیا گیا ہے۔
+ShowCustomer=گاہک دکھائیں۔
+ShowProspect=امکان دکھائیں۔
+ListOfProspects=امکانات کی فہرست
+ListOfCustomers=صارفین کی فہرست
+LastDoneTasks=تازہ ترین %s مکمل کارروائیاں
+LastActionsToDo=قدیم ترین %s مکمل نہیں ہوئی کارروائیاں
+DoneAndToDoActions=مکمل اور کرنے کے واقعات
+DoneActions=مکمل واقعات
+ToDoActions=نامکمل واقعات
+SendPropalRef=تجارتی تجویز %s جمع کروانا
+SendOrderRef=آرڈر %s جمع کروانا
+StatusNotApplicable=قابل اطلاق نہیں۔
+StatusActionToDo=ایسا کرنے کے لئے
+StatusActionDone=مکمل
+StatusActionInProcess=اس عمل میں
+TasksHistoryForThisContact=اس رابطے کے لیے تقریبات
+LastProspectDoNotContact=رابطہ نہ کریں۔
+LastProspectNeverContacted=کبھی رابطہ نہیں کیا۔
+LastProspectToContact=رابطہ کرنا
+LastProspectContactInProcess=رابطہ عمل میں ہے۔
+LastProspectContactDone=رابطہ ہو گیا۔
+ActionAffectedTo=تقریب تفویض کی گئی۔
+ActionDoneBy=تقریب کی طرف سے کیا گیا
+ActionAC_TEL=فون کال
+ActionAC_FAX=فیکس بھیجیں۔
+ActionAC_PROP=بذریعہ ڈاک تجویز بھیجیں۔
+ActionAC_EMAIL=ای میل بھیجیں
+ActionAC_EMAIL_IN=ای میل کا استقبال
+ActionAC_RDV=ملاقاتیں
+ActionAC_INT=سائٹ پر مداخلت
+ActionAC_FAC=میل کے ذریعے کسٹمر انوائس بھیجیں۔
+ActionAC_REL=میل کے ذریعے کسٹمر انوائس بھیجیں (یاد دہانی)
+ActionAC_CLO=بند کریں
+ActionAC_EMAILING=بڑے پیمانے پر ای میل بھیجیں۔
+ActionAC_COM=میل کے ذریعے سیلز آرڈر بھیجیں۔
+ActionAC_SHIP=میل کے ذریعے شپنگ بھیجیں۔
+ActionAC_SUP_ORD=خریداری کا آرڈر بذریعہ ڈاک بھیجیں۔
+ActionAC_SUP_INV=وینڈر انوائس بذریعہ ڈاک بھیجیں۔
+ActionAC_OTH=دیگر
+ActionAC_OTH_AUTO=دیگر آٹو
+ActionAC_MANUAL=دستی طور پر داخل کردہ واقعات
+ActionAC_AUTO=خودکار طور پر شامل واقعات
+ActionAC_OTH_AUTOShort=دیگر
+ActionAC_EVENTORGANIZATION=تقریب کی تنظیم کے واقعات
+Stats=فروخت کے اعدادوشمار
+StatusProsp=امکانی حیثیت
+DraftPropals=تجارتی تجاویز کا مسودہ
+NoLimit=کوئی حد نہیں
+ToOfferALinkForOnlineSignature=آن لائن دستخط کے لیے لنک
+WelcomeOnOnlineSignaturePage=%s سے تجارتی تجاویز قبول کرنے کے لیے صفحہ پر خوش آمدید
+ThisScreenAllowsYouToSignDocFrom=یہ اسکرین آپ کو ایک اقتباس/تجارتی تجویز کو قبول کرنے اور اس پر دستخط کرنے، یا انکار کرنے کی اجازت دیتی ہے۔
+ThisIsInformationOnDocumentToSign=یہ قبول کرنے یا انکار کرنے کے لیے دستاویز کی معلومات ہے۔
+SignatureProposalRef=اقتباس/تجارتی تجویز %s کے دستخط
+FeatureOnlineSignDisabled=آن لائن دستخط کرنے کی خصوصیت غیر فعال یا خصوصیت کے فعال ہونے سے پہلے تیار کردہ دستاویز
diff --git a/htdocs/langs/ur_PK/companies.lang b/htdocs/langs/ur_PK/companies.lang
new file mode 100644
index 00000000000..a6a675b79fc
--- /dev/null
+++ b/htdocs/langs/ur_PK/companies.lang
@@ -0,0 +1,495 @@
+# Dolibarr language file - Source file is en_US - companies
+ErrorCompanyNameAlreadyExists=کمپنی کا نام %s پہلے سے موجود ہے۔ ایک اور کا انتخاب کریں۔
+ErrorSetACountryFirst=پہلے ملک کو سیٹ کریں۔
+SelectThirdParty=تیسرے فریق کو منتخب کریں۔
+ConfirmDeleteCompany=کیا آپ واقعی اس کمپنی اور تمام متعلقہ معلومات کو حذف کرنا چاہتے ہیں؟
+DeleteContact=رابطہ/پتہ حذف کریں۔
+ConfirmDeleteContact=کیا آپ واقعی اس رابطہ اور تمام متعلقہ معلومات کو حذف کرنا چاہتے ہیں؟
+MenuNewThirdParty=نئی تیسری پارٹی
+MenuNewCustomer=نیا گاہک
+MenuNewProspect=نیا امکان
+MenuNewSupplier=نیا فروش
+MenuNewPrivateIndividual=نیا نجی فرد
+NewCompany=نئی کمپنی (امکان، گاہک، وینڈر)
+NewThirdParty=نئی تیسری پارٹی (امکان، گاہک، وینڈر)
+CreateDolibarrThirdPartySupplier=تیسری پارٹی بنائیں (فروش)
+CreateThirdPartyOnly=تھرڈ پارٹی بنائیں
+CreateThirdPartyAndContact=ایک فریق ثالث + بچے کا رابطہ بنائیں
+ProspectionArea=پراسپیکشن ایریا
+IdThirdParty=آئی ڈی تھرڈ پارٹی
+IdCompany=کمپنی کی شناخت
+IdContact=رابطہ کی شناخت
+ThirdPartyContacts=فریق ثالث کے رابطے
+ThirdPartyContact=فریق ثالث کا رابطہ/ پتہ
+Company=کمپنی
+CompanyName=کمپنی کا نام
+AliasNames=عرفی نام (تجارتی، ٹریڈ مارک، ...)
+AliasNameShort=عرفی نام
+Companies=کمپنیاں
+CountryIsInEEC=ملک یورپی اقتصادی برادری کے اندر ہے۔
+PriceFormatInCurrentLanguage=موجودہ زبان اور کرنسی میں قیمت ڈسپلے فارمیٹ
+ThirdPartyName=فریق ثالث کا نام
+ThirdPartyEmail=تھرڈ پارٹی ای میل
+ThirdParty=تیسری پارٹی
+ThirdParties=تیسرے فریقوں
+ThirdPartyProspects=امکانات
+ThirdPartyProspectsStats=امکانات
+ThirdPartyCustomers=گاہکوں
+ThirdPartyCustomersStats=گاہکوں
+ThirdPartyCustomersWithIdProf12=%s یا %s والے صارفین
+ThirdPartySuppliers=فروش
+ThirdPartyType=تیسری پارٹی کی قسم
+Individual=نجی فرد
+ToCreateContactWithSameName=تھرڈ پارٹی کے تحت تھرڈ پارٹی جیسی معلومات کے ساتھ خود بخود ایک رابطہ/پتہ بنائے گا۔ زیادہ تر معاملات میں، یہاں تک کہ اگر آپ کا تیسرا فریق جسمانی شخص ہے، تو اکیلے تیسرے فریق کو بنانا کافی ہے۔
+ParentCompany=پیرنٹ کمپنی
+Subsidiaries=ماتحت اداروں
+ReportByMonth=ماہانہ رپورٹ
+ReportByCustomers=رپورٹ فی گاہک
+ReportByThirdparties=رپورٹ فی تھرڈ پارٹی
+ReportByQuarter=رپورٹ فی ریٹ
+CivilityCode=شہریت کا ضابطہ
+RegisteredOffice=منظور شدہ دفتر
+Lastname=آخری نام
+Firstname=پہلا نام
+PostOrFunction=عہدہ
+UserTitle=عنوان
+NatureOfThirdParty=تیسرے فریق کی نوعیت
+NatureOfContact=رابطے کی نوعیت
+Address=پتہ
+State=ریاست/صوبہ
+StateCode=ریاست/صوبائی کوڈ
+StateShort=حالت
+Region=علاقہ
+Region-State=علاقہ - ریاست
+Country=ملک
+CountryCode=ملک کا کوڈ
+CountryId=ملک کی شناخت
+Phone=فون
+PhoneShort=فون
+Skype=سکائپ
+Call=کال کریں۔
+Chat=گپ شپ
+PhonePro=بس. فون
+PhonePerso=Pers فون
+PhoneMobile=موبائل
+No_Email=بلک ای میلز سے انکار کریں۔
+Fax=فیکس
+Zip=زپ کوڈ
+Town=شہر
+Web=ویب
+Poste= پوزیشن
+DefaultLang=پہلے سے طے شدہ زبان
+VATIsUsed=سیلز ٹیکس استعمال کیا گیا۔
+VATIsUsedWhenSelling=یہ اس بات کی وضاحت کرتا ہے کہ آیا اس تیسرے فریق میں سیلز ٹیکس شامل ہے یا نہیں جب وہ اپنے صارفین کو انوائس کرتا ہے۔
+VATIsNotUsed=سیلز ٹیکس استعمال نہیں کیا جاتا
+CopyAddressFromSoc=تیسرے فریق کی تفصیلات سے پتہ کاپی کریں۔
+ThirdpartyNotCustomerNotSupplierSoNoRef=فریق ثالث نہ تو گاہک اور نہ وینڈر، کوئی حوالہ دینے والی اشیاء دستیاب نہیں۔
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=تھرڈ پارٹی نہ تو گاہک اور نہ وینڈر، چھوٹ دستیاب نہیں ہے۔
+PaymentBankAccount=ادائیگی بینک اکاؤنٹ
+OverAllProposals=تجاویز
+OverAllOrders=احکامات
+OverAllInvoices=رسیدیں
+OverAllSupplierProposals=قیمت کی درخواستیں۔
+##### Local Taxes #####
+LocalTax1IsUsed=دوسرا ٹیکس استعمال کریں۔
+LocalTax1IsUsedES= RE استعمال کیا جاتا ہے۔
+LocalTax1IsNotUsedES= RE استعمال نہیں کیا جاتا ہے۔
+LocalTax2IsUsed=تیسرا ٹیکس استعمال کریں۔
+LocalTax2IsUsedES= IRPF استعمال کیا جاتا ہے۔
+LocalTax2IsNotUsedES= IRPF استعمال نہیں کیا جاتا ہے۔
+WrongCustomerCode=کسٹمر کوڈ غلط ہے۔
+WrongSupplierCode=وینڈر کوڈ غلط ہے۔
+CustomerCodeModel=کسٹمر کوڈ ماڈل
+SupplierCodeModel=وینڈر کوڈ ماڈل
+Gencod=بارکوڈ
+##### Professional ID #####
+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)
+ProfId2AT=Prof Id 2 (USt.-Nr)
+ProfId3AT=پروفیسر کی شناخت 3 (ہینڈل رجسٹر-Nr.)
+ProfId4AT=-
+ProfId5AT=EORI نمبر
+ProfId6AT=-
+ProfId1AU=پروفیسر Id 1 (ABN)
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
+ProfId5AU=-
+ProfId6AU=-
+ProfId1BE=پروفیسر کی شناخت 1 (پیشہ ور نمبر)
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=EORI نمبر
+ProfId6BE=-
+ProfId1BR=-
+ProfId2BR=IE (Inscricao Estadual)
+ProfId3BR=IM (Inscricao Municipal)
+ProfId4BR=سی پی ایف
+#ProfId5BR=CNAE
+#ProfId6BR=INSS
+ProfId1CH=UID-نمبر
+ProfId2CH=-
+ProfId3CH=پروفیسر کی شناخت 1 (وفاقی نمبر)
+ProfId4CH=پروفیسر کی شناخت 2 (کمرشل ریکارڈ نمبر)
+ProfId5CH=EORI نمبر
+ProfId6CH=-
+ProfId1CL=پروفیسر 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=پروفیسر Id 1 (R.U.T.)
+ProfId2CO=-
+ProfId3CO=-
+ProfId4CO=-
+ProfId5CO=-
+ProfId6CO=-
+ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId3DE=پروفیسر کی شناخت 3 (ہینڈل رجسٹر-Nr.)
+ProfId4DE=-
+ProfId5DE=EORI نمبر
+ProfId6DE=-
+ProfId1ES=پروفیسر کی شناخت 1 (CIF/NIF)
+ProfId2ES=پروفیسر آئی ڈی 2 (سوشل سیکیورٹی نمبر)
+ProfId3ES=پروفیسر آئی ڈی 3 (CNAE)
+ProfId4ES=پروفیسر کی شناخت 4 (کالج نمبر)
+ProfId5ES=پروفیسر کی شناخت 5 (EORI نمبر)
+ProfId6ES=-
+ProfId1FR=پروفیسر Id 1 (SIREN)
+ProfId2FR=پروفیسر آئی ڈی 2 (SIRET)
+ProfId3FR=Prof Id 3 (NAF, old APE)
+ProfId4FR=پروفیسر کی شناخت 4 (RCS/RM)
+ProfId5FR=پروفیسر آئی ڈی 5 (نمبر EORI)
+ProfId6FR=-
+ProfId1ShortFR=سائرن کی آواز
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=این اے ایف
+ProfId4ShortFR=آر سی ایس
+ProfId5ShortFR=ای او آر آئی
+ProfId6ShortFR=-
+ProfId1GB=رجسٹریشن نمبر
+ProfId2GB=-
+ProfId3GB=ایس آئی سی
+ProfId4GB=-
+ProfId5GB=-
+ProfId6GB=-
+ProfId1HN=آئی ڈی پروفیسر 1 (RTN)
+ProfId2HN=-
+ProfId3HN=-
+ProfId4HN=-
+ProfId5HN=-
+ProfId6HN=-
+ProfId1IN=پروفیسر کی شناخت 1 (TIN)
+ProfId2IN=پروفیسر کی شناخت 2 (PAN)
+ProfId3IN=پروفیسر کی شناخت 3 (SRVC TAX)
+ProfId4IN=پروفیسر آئی ڈی 4
+ProfId5IN=پروفیسر آئی ڈی 5
+ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI نمبر
+ProfId6IT=-
+ProfId1LU=آئی ڈی پروفیسر 1 (R.C.S. لکسمبرگ)
+ProfId2LU=آئی ڈی پروفیسر 2 (کاروباری اجازت نامہ)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=EORI نمبر
+ProfId6LU=-
+ProfId1MA=آئی ڈی پروفیسر 1 (R.C.)
+ProfId2MA=آئی ڈی پروفیسر 2 (پیٹنٹ)
+ProfId3MA=آئی ڈی پروفیسر 3 (آئی ایف)
+ProfId4MA=آئی ڈی پروفیسر 4 (C.N.S.S.)
+ProfId5MA=آئی ڈی پروفیسر 5 (I.C.E.)
+ProfId6MA=-
+ProfId1MX=پروفیسر Id 1 (R.F.C)۔
+ProfId2MX=پروفیسر Id 2 (R.P. IMSS)
+ProfId3MX=Prof Id 3 (پروفیشنل چارٹر)
+ProfId4MX=-
+ProfId5MX=-
+ProfId6MX=-
+ProfId1NL=KVK نمبر
+ProfId2NL=-
+ProfId3NL=-
+ProfId4NL=برگر سروس نمبر (BSN)
+ProfId5NL=EORI نمبر
+ProfId6NL=-
+ProfId1PT=پروفیسر Id 1 (NIPC)
+ProfId2PT=پروفیسر آئی ڈی 2 (سوشل سیکیورٹی نمبر)
+ProfId3PT=پروفیسر آئی ڈی 3 (کمرشل ریکارڈ نمبر)
+ProfId4PT=پروفیسر آئی ڈی 4 (کنزرویٹری)
+ProfId5PT=پروفیسر کی شناخت 5 (EORI نمبر)
+ProfId6PT=-
+ProfId1SN=آر سی
+ProfId2SN=نینا
+ProfId3SN=-
+ProfId4SN=-
+ProfId5SN=-
+ProfId6SN=-
+ProfId1TN=پروفیسر Id 1 (RC)
+ProfId2TN=پروفیسر کی شناخت 2 (مالی میٹرک)
+ProfId3TN=Prof Id 3 (Douane code)
+ProfId4TN=پروفیسر Id 4 (BAN)
+ProfId5TN=-
+ProfId6TN=-
+ProfId1US=پروفیسر کی شناخت (FEIN)
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
+ProfId1RO=پروفیسر کی شناخت 1 (CUI)
+ProfId2RO=پروفیسر Id 2 (Nr. Înmatriculare)
+ProfId3RO=پروفیسر ID 3 (CAEN)
+ProfId4RO=پروفیسر کی شناخت 5 (EUID)
+ProfId5RO=پروفیسر کی شناخت 5 (EORI نمبر)
+ProfId6RO=-
+ProfId1RU=پروفیسر آئی ڈی 1 (OGRN)
+ProfId2RU=پروفیسر کی شناخت 2 (INN)
+ProfId3RU=پروفیسر Id 3 (KPP)
+ProfId4RU=پروفیسر آئی ڈی 4 (OKPO)
+ProfId5RU=-
+ProfId6RU=-
+ProfId1UA=پروفیسر کی شناخت 1 (EDRPOU)
+ProfId2UA=پروفیسر آئی ڈی 2 (DRFO)
+ProfId3UA=پروفیسر کی شناخت 3 (INN)
+ProfId4UA=پروفیسر کی شناخت 4 (سرٹیفکیٹ)
+ProfId5UA=پروفیسر کی شناخت 5 (RNOKPP)
+ProfId6UA=Prof Id 6 (TRDPAU)
+ProfId1DZ=آر سی
+ProfId2DZ=فن
+ProfId3DZ=این آئی ایف
+ProfId4DZ=این آئی ایس
+VATIntra=VAT ID
+VATIntraShort=VAT ID
+VATIntraSyntaxIsValid=نحو درست ہے۔
+VATReturn=VAT کی واپسی۔
+ProspectCustomer=امکان / گاہک
+Prospect=امکان
+CustomerCard=کسٹمر کارڈ
+Customer=صارف
+CustomerRelativeDiscount=متعلقہ کسٹمر رعایت
+SupplierRelativeDiscount=متعلقہ وینڈر ڈسکاؤنٹ
+CustomerRelativeDiscountShort=متعلقہ رعایت
+CustomerAbsoluteDiscountShort=مطلق رعایت
+CompanyHasRelativeDiscount=اس صارف کے پاس <b> %s%% </b> کی ڈیفالٹ رعایت ہے۔
+CompanyHasNoRelativeDiscount=اس صارف کو بطور ڈیفالٹ کوئی رشتہ دار رعایت نہیں ہے۔
+HasRelativeDiscountFromSupplier=آپ کے پاس اس وینڈر سے <b> %s%% </b> کی ڈیفالٹ رعایت ہے۔
+HasNoRelativeDiscountFromSupplier=آپ کے پاس اس وینڈر سے کوئی ڈیفالٹ رشتہ دار رعایت نہیں ہے۔
+CompanyHasAbsoluteDiscount=اس صارف کے پاس <b> %s </b> %s کے لیے رعایتیں دستیاب ہیں (کریڈٹ نوٹس یا ڈاؤن پیمنٹس)
+CompanyHasDownPaymentOrCommercialDiscount=اس صارف کے پاس <b> %s </b> %s کے لیے چھوٹ دستیاب ہے (تجارتی، نیچے ادائیگیاں)
+CompanyHasCreditNote=اس صارف کے پاس ابھی بھی <b> %s </b> %s کے لیے کریڈٹ نوٹ موجود ہیں۔
+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=رابطہ بنائیں
+AddContactAddress=رابطہ/پتہ بنائیں
+EditContact=رابطے میں ترمیم کریں۔
+EditContactAddress=رابطہ/پتہ میں ترمیم کریں۔
+Contact=رابطہ/ پتہ
+Contacts=رابطے/پتے
+ContactId=رابطہ آئی ڈی
+ContactsAddresses=رابطے/پتے
+FromContactName=نام:
+NoContactDefinedForThirdParty=اس تیسرے فریق کے لیے کوئی رابطہ متعین نہیں ہے۔
+NoContactDefined=کوئی رابطہ متعین نہیں ہے۔
+DefaultContact=پہلے سے طے شدہ رابطہ/پتہ
+ContactByDefaultFor=پہلے سے طے شدہ رابطہ/پتہ برائے
+AddThirdParty=تھرڈ پارٹی بنائیں
+DeleteACompany=کمپنی کو حذف کریں۔
+PersonalInformations=ذاتی مواد
+AccountancyCode=حساب کتاب
+CustomerCode=کسٹمر کوڈ
+SupplierCode=وینڈر کوڈ
+CustomerCodeShort=کسٹمر کوڈ
+SupplierCodeShort=وینڈر کوڈ
+CustomerCodeDesc=کسٹمر کوڈ، تمام صارفین کے لیے منفرد
+SupplierCodeDesc=وینڈر کوڈ، تمام دکانداروں کے لیے منفرد
+RequiredIfCustomer=اگر تیسرا فریق گاہک یا امکان ہے۔
+RequiredIfSupplier=اگر تھرڈ پارٹی وینڈر ہے تو درکار ہے۔
+ValidityControledByModule=موزونیت ماڈیول کے ذریعے کنٹرول کی جاتی ہے۔
+ThisIsModuleRules=اس ماڈیول کے لیے قواعد
+ProspectToContact=رابطہ کرنے کا امکان
+CompanyDeleted=کمپنی "%s" کو ڈیٹا بیس سے حذف کر دیا گیا۔
+ListOfContacts=رابطوں/ پتوں کی فہرست
+ListOfContactsAddresses=رابطوں/ پتوں کی فہرست
+ListOfThirdParties=تیسرے فریق کی فہرست
+ShowCompany=تیسری پارٹی
+ShowContact=رابطہ کا پتہ
+ContactsAllShort=تمام (کوئی فلٹر نہیں)
+ContactType=رابطے کی قسم
+ContactForOrders=آرڈر کا رابطہ
+ContactForOrdersOrShipments=آرڈر یا شپمنٹ کا رابطہ
+ContactForProposals=تجویز کا رابطہ
+ContactForContracts=معاہدہ کا رابطہ
+ContactForInvoices=انوائس کا رابطہ
+NoContactForAnyOrder=یہ رابطہ کسی آرڈر کے لیے رابطہ نہیں ہے۔
+NoContactForAnyOrderOrShipments=یہ رابطہ کسی آرڈر یا شپمنٹ کے لیے رابطہ نہیں ہے۔
+NoContactForAnyProposal=یہ رابطہ کسی تجارتی تجویز کے لیے رابطہ نہیں ہے۔
+NoContactForAnyContract=یہ رابطہ کسی معاہدے کے لیے رابطہ نہیں ہے۔
+NoContactForAnyInvoice=یہ رابطہ کسی رسید کے لیے رابطہ نہیں ہے۔
+NewContact=نیا رابطہ
+NewContactAddress=نیا رابطہ/پتہ
+MyContacts=میرے رابطے
+Capital=سرمایہ
+CapitalOf=%s کا سرمایہ
+EditCompany=کمپنی میں ترمیم کریں۔
+ThisUserIsNot=یہ صارف کوئی امکان، گاہک یا وینڈر نہیں ہے۔
+VATIntraCheck=چیک کریں۔
+VATIntraCheckDesc=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) کی طرف سے فراہم نہیں کی جاتی ہے۔
+NorProspectNorCustomer=نہ امکان، نہ گاہک
+JuridicalStatus=کاروباری ادارے کی قسم
+Workforce=افرادی قوت
+Staff=ملازمین
+ProspectLevelShort=ممکنہ، استعداد
+ProspectLevel=امکانی امکان
+ContactPrivate=نجی
+ContactPublic=مشترکہ
+ContactVisibility=مرئیت
+ContactOthers=دیگر
+OthersNotLinkedToThirdParty=دوسرے، کسی تیسرے فریق سے منسلک نہیں ہیں۔
+ProspectStatus=امکانی حیثیت
+PL_NONE=کوئی نہیں۔
+PL_UNKNOWN=نامعلوم
+PL_LOW=کم
+PL_MEDIUM=درمیانہ
+PL_HIGH=اعلی
+TE_UNKNOWN=-
+TE_STARTUP=شروع
+TE_GROUP=بڑی کمپنی
+TE_MEDIUM=درمیانی کمپنی
+TE_ADMIN=حکومتی
+TE_SMALL=چھوٹی کمپنی
+TE_RETAIL=خوردہ فروش
+TE_WHOLE=تھوک فروش
+TE_PRIVATE=نجی فرد
+TE_OTHER=دیگر
+StatusProspect-1=رابطہ نہ کریں۔
+StatusProspect0=کبھی رابطہ نہیں کیا۔
+StatusProspect1=رابطہ کیا جائے۔
+StatusProspect2=رابطہ عمل میں ہے۔
+StatusProspect3=رابطہ ہو گیا۔
+ChangeDoNotContact=اسٹیٹس کو 'رابطہ نہ کریں' میں تبدیل کریں
+ChangeNeverContacted=اسٹیٹس کو 'کبھی رابطہ نہیں ہوا' میں تبدیل کریں
+ChangeToContact=حیثیت کو 'رابطہ کرنے کے لیے' میں تبدیل کریں
+ChangeContactInProcess=حالت کو 'رابطہ جاری ہے' میں تبدیل کریں
+ChangeContactDone=حالت کو 'رابطہ ہو گیا' میں تبدیل کریں
+ProspectsByStatus=حیثیت کے لحاظ سے امکانات
+NoParentCompany=کوئی نہیں۔
+ExportCardToFormat=فارمیٹ میں کارڈ برآمد کریں۔
+ContactNotLinkedToCompany=رابطہ کسی تیسرے فریق سے منسلک نہیں ہے۔
+DolibarrLogin=Dolibarr لاگ ان
+NoDolibarrAccess=Dolibarr تک رسائی نہیں ہے۔
+ExportDataset_company_1=فریق ثالث (کمپنیاں/فاؤنڈیشنز/جسمانی لوگ) اور ان کی خصوصیات
+ExportDataset_company_2=رابطے اور ان کی خصوصیات
+ImportDataset_company_1=فریق ثالث اور ان کی خصوصیات
+ImportDataset_company_2=فریق ثالث کے اضافی رابطے/پتے اور صفات
+ImportDataset_company_3=فریق ثالث کے بینک اکاؤنٹس
+ImportDataset_company_4=فریق ثالث کے سیلز نمائندے (کمپنیوں کو سیلز کے نمائندے/صارفین تفویض کریں)
+PriceLevel=قیمت کی سطح
+PriceLevelLabels=قیمت کی سطح کے لیبلز
+DeliveryAddress=ترسیل کا پتہ
+AddAddress=ایڈریس شامل کریں۔
+SupplierCategory=وینڈر کیٹیگری
+JuridicalStatus200=آزاد
+DeleteFile=فائل کو ڈیلیٹ کریں
+ConfirmDeleteFile=کیا آپ واقعی اس فائل کو حذف کرنا چاہتے ہیں؟
+AllocateCommercial=سیلز کے نمائندے کو تفویض کیا گیا۔
+Organization=تنظیم
+FiscalYearInformation=مالی سال
+FiscalMonthStart=مالی سال کا شروع ہونے والا مہینہ
+SocialNetworksInformation=سوشل نیٹ ورک
+SocialNetworksFacebookURL=فیس بک یو آر ایل
+SocialNetworksTwitterURL=ٹویٹر یو آر ایل
+SocialNetworksLinkedinURL=لنکڈ یو آر ایل
+SocialNetworksInstagramURL=انسٹاگرام یو آر ایل
+SocialNetworksYoutubeURL=یوٹیوب یو آر ایل
+SocialNetworksGithubURL=گیتھب یو آر ایل
+YouMustAssignUserMailFirst=ای میل اطلاع شامل کرنے کے قابل ہونے سے پہلے آپ کو اس صارف کے لیے ایک ای میل بنانا چاہیے۔
+YouMustCreateContactFirst=ای میل اطلاعات شامل کرنے کے قابل ہونے کے لیے، آپ کو پہلے فریق ثالث کے لیے درست ای میلز کے ساتھ رابطوں کی وضاحت کرنی چاہیے
+ListSuppliersShort=دکانداروں کی فہرست
+ListProspectsShort=امکانات کی فہرست
+ListCustomersShort=صارفین کی فہرست
+ThirdPartiesArea=تیسرے فریق/رابطے۔
+LastModifiedThirdParties=تازہ ترین %s فریق ثالث جن میں ترمیم کی گئی تھی۔
+UniqueThirdParties=تیسرے فریق کی کل تعداد
+InActivity=کھولیں۔
+ActivityCeased=بند
+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=ادائیگی کی قسم - گاہک
+PaymentTermsCustomer=ادائیگی کی شرائط - گاہک
+PaymentTypeSupplier=ادائیگی کی قسم - فروش
+PaymentTermsSupplier=ادائیگی کی مدت - فروش
+PaymentTypeBoth=ادائیگی کی قسم - گاہک اور وینڈر
+MulticurrencyUsed=ملٹی کرنسی استعمال کریں۔
+MulticurrencyCurrency=کرنسی
+InEEC=یورپ (EEC)
+RestOfEurope=باقی یورپ (EEC)
+OutOfEurope=یورپ سے باہر (EEC)
+CurrentOutstandingBillLate=موجودہ بقایا بل دیر سے
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=ہوشیار رہیں، آپ کی پروڈکٹ کی قیمت کی ترتیبات کے مطابق، آپ کو POS میں پروڈکٹ شامل کرنے سے پہلے فریق ثالث کو تبدیل کرنا چاہیے۔
diff --git a/htdocs/langs/ur_PK/compta.lang b/htdocs/langs/ur_PK/compta.lang
new file mode 100644
index 00000000000..1ead4c31257
--- /dev/null
+++ b/htdocs/langs/ur_PK/compta.lang
@@ -0,0 +1,300 @@
+# Dolibarr language file - Source file is en_US - compta
+MenuFinancial=بلنگ | ادائیگی
+TaxModuleSetupToModifyRules=حساب کے قواعد میں ترمیم کرنے کے لیے <a href="%s"> ٹیکسز ماڈیول سیٹ اپ </a> پر جائیں
+TaxModuleSetupToModifyRulesLT=حساب کے قواعد میں ترمیم کرنے کے لیے <a href="%s"> کمپنی کے سیٹ اپ </a> پر جائیں
+OptionMode=اکاؤنٹنسی کے لیے آپشن
+OptionModeTrue=آپشن آمدنی-اخراجات
+OptionModeVirtual=اختیاری دعوے-قرض
+OptionModeTrueDesc=اس تناظر میں، ٹرن اوور کا حساب ادائیگیوں (ادائیگی کی تاریخ) پر کیا جاتا ہے۔ اعداد و شمار کی درستگی کی یقین دہانی صرف اس صورت میں کی جاتی ہے جب انوائس کے ذریعے اکاؤنٹس پر ان پٹ/آؤٹ پٹ کے ذریعے بک کیپنگ کی چھان بین کی جاتی ہے۔
+OptionModeVirtualDesc=اس تناظر میں، ٹرن اوور کا حساب انوائسز (توثیق کی تاریخ) پر کیا جاتا ہے۔ جب یہ رسیدیں واجب الادا ہوں، چاہے ان کی ادائیگی کی گئی ہو یا نہ ہو، وہ ٹرن اوور آؤٹ پٹ میں درج ہیں۔
+FeatureIsSupportedInInOutModeOnly=خصوصیت صرف کریڈٹس-ڈیبیٹس اکاؤنٹنسی موڈ میں دستیاب ہے (دیکھیں اکاؤنٹنسی ماڈیول کنفیگریشن)
+VATReportBuildWithOptionDefinedInModule=یہاں دکھائی گئی رقم کا حساب ٹیکس ماڈیول سیٹ اپ کے ذریعے بیان کردہ اصولوں کا استعمال کرتے ہوئے کیا جاتا ہے۔
+LTReportBuildWithOptionDefinedInModule=یہاں دکھائی گئی رقوم کا حساب کمپنی کے سیٹ اپ کے ذریعے بیان کردہ اصولوں کے ذریعے کیا جاتا ہے۔
+Param=سیٹ اپ
+RemainingAmountPayment=باقی ادائیگی کی رقم:
+Account=کھاتہ
+Accountparent=والدین کا اکاؤنٹ
+Accountsparent=والدین کے اکاؤنٹس
+Income=آمدنی
+Outcome=خرچہ
+MenuReportInOut=آمدنی/خرچ
+ReportInOut=آمدنی اور اخراجات کا توازن
+ReportTurnover=ٹرن اوور انوائس
+ReportTurnoverCollected=ٹرن اوور جمع ہوا۔
+PaymentsNotLinkedToInvoice=ادائیگیاں کسی انوائس سے منسلک نہیں ہیں، لہذا کسی تیسرے فریق سے منسلک نہیں ہیں۔
+PaymentsNotLinkedToUser=ادائیگیاں کسی صارف سے منسلک نہیں ہیں۔
+Profit=منافع
+AccountingResult=اکاؤنٹنگ نتیجہ
+BalanceBefore=توازن (پہلے)
+Balance=بقیہ
+Debit=ڈیبٹ
+Credit=کریڈٹ
+Piece=اکاؤنٹنگ ڈاکٹر
+AmountHTVATRealReceived=نیٹ جمع
+AmountHTVATRealPaid=خالص ادائیگی
+VATToPay=ٹیکس کی فروخت
+VATReceived=ٹیکس وصول کیا۔
+VATToCollect=ٹیکس کی خریداری
+VATSummary=ماہانہ ٹیکس
+VATBalance=ٹیکس بیلنس
+VATPaid=ٹیکس ادا کیا۔
+LT1Summary=ٹیکس 2 کا خلاصہ
+LT2Summary=ٹیکس 3 کا خلاصہ
+LT1SummaryES=RE بیلنس
+LT2SummaryES=IRPF بیلنس
+LT1SummaryIN=سی جی ایس ٹی بیلنس
+LT2SummaryIN=ایس جی ایس ٹی بیلنس
+LT1Paid=ٹیکس 2 ادا کیا گیا۔
+LT2Paid=ٹیکس 3 ادا کیا گیا۔
+LT1PaidES=RE ادا کیا گیا۔
+LT2PaidES=آئی آر پی ایف ادا کیا گیا۔
+LT1PaidIN=CGST ادا کیا
+LT2PaidIN=ایس جی ایس ٹی ادا کیا گیا۔
+LT1Customer=ٹیکس 2 سیلز
+LT1Supplier=ٹیکس 2 خریداری
+LT1CustomerES=RE فروخت
+LT1SupplierES=RE خریداریاں
+LT1CustomerIN=سی جی ایس ٹی کی فروخت
+LT1SupplierIN=سی جی ایس ٹی خریداری
+LT2Customer=ٹیکس 3 سیلز
+LT2Supplier=ٹیکس 3 خریداری
+LT2CustomerES=آئی آر پی ایف کی فروخت
+LT2SupplierES=آئی آر پی ایف کی خریداری
+LT2CustomerIN=ایس جی ایس ٹی کی فروخت
+LT2SupplierIN=SGST خریداری
+VATCollected=VAT جمع کیا گیا۔
+StatusToPay=قیمت ادا کرنا
+SpecialExpensesArea=تمام خصوصی ادائیگیوں کا علاقہ
+VATExpensesArea=TVA کی تمام ادائیگیوں کا علاقہ
+SocialContribution=سماجی یا مالی ٹیکس
+SocialContributions=سماجی یا مالی ٹیکس
+SocialContributionsDeductibles=کٹوتی کے قابل سماجی یا مالی ٹیکس
+SocialContributionsNondeductibles=غیر منقطع سماجی یا مالی ٹیکس
+DateOfSocialContribution=سماجی یا مالی ٹیکس کی تاریخ
+LabelContrib=لیبل شراکت
+TypeContrib=شراکت کی قسم
+MenuSpecialExpenses=خصوصی اخراجات
+MenuTaxAndDividends=ٹیکس اور منافع
+MenuSocialContributions=سماجی/مالیاتی ٹیکس
+MenuNewSocialContribution=نیا سماجی/مالیاتی ٹیکس
+NewSocialContribution=نیا سماجی/مالیاتی ٹیکس
+AddSocialContribution=سماجی/مالیاتی ٹیکس شامل کریں۔
+ContributionsToPay=ادا کرنے کے لیے سماجی/مالیاتی ٹیکس
+AccountancyTreasuryArea=بلنگ اور ادائیگی کا علاقہ
+NewPayment=نئی ادائیگی
+PaymentCustomerInvoice=کسٹمر انوائس کی ادائیگی
+PaymentSupplierInvoice=وینڈر انوائس کی ادائیگی
+PaymentSocialContribution=سماجی/مالیاتی ٹیکس کی ادائیگی
+PaymentVat=VAT ادائیگی
+AutomaticCreationPayment=ادائیگی کو خود بخود ریکارڈ کریں۔
+ListPayment=ادائیگیوں کی فہرست
+ListOfCustomerPayments=صارفین کی ادائیگیوں کی فہرست
+ListOfSupplierPayments=وینڈر کی ادائیگیوں کی فہرست
+DateStartPeriod=تاریخ شروع ہونے کی مدت
+DateEndPeriod=تاریخ ختم ہونے کی مدت
+newLT1Payment=نیا ٹیکس 2 ادائیگی
+newLT2Payment=نیا ٹیکس 3 ادائیگی
+LT1Payment=ٹیکس 2 ادائیگی
+LT1Payments=ٹیکس 2 ادائیگیاں
+LT2Payment=ٹیکس 3 ادائیگی
+LT2Payments=ٹیکس 3 ادائیگیاں
+newLT1PaymentES=نئی RE ادائیگی
+newLT2PaymentES=نئی IRPF ادائیگی
+LT1PaymentES=RE ادائیگی
+LT1PaymentsES=RE ادائیگیاں
+LT2PaymentES=IRPF ادائیگی
+LT2PaymentsES=IRPF ادائیگیاں
+VATPayment=سیلز ٹیکس کی ادائیگی
+VATPayments=سیلز ٹیکس کی ادائیگی
+VATDeclarations=VAT کے اعلانات
+VATDeclaration=VAT کا اعلان
+VATRefund=سیلز ٹیکس کی واپسی
+NewVATPayment=سیلز ٹیکس کی نئی ادائیگی
+NewLocalTaxPayment=نیا ٹیکس %s ادائیگی
+Refund=واپس کرنا
+SocialContributionsPayments=سماجی/مالیاتی ٹیکس کی ادائیگی
+ShowVatPayment=VAT ادائیگی دکھائیں۔
+TotalToPay=ادا کرنے کے لیے کل
+BalanceVisibilityDependsOnSortAndFilters=اس فہرست میں بیلنس صرف اس صورت میں نظر آتا ہے جب ٹیبل کو %s پر ترتیب دیا گیا ہو اور 1 بینک اکاؤنٹ پر فلٹر کیا گیا ہو (کسی دوسرے فلٹر کے بغیر)
+CustomerAccountancyCode=کسٹمر اکاؤنٹنگ کوڈ
+SupplierAccountancyCode=وینڈر اکاؤنٹنگ کوڈ
+CustomerAccountancyCodeShort=کسٹم. کھاتہ. کوڈ
+SupplierAccountancyCodeShort=سڑکنا. کھاتہ. کوڈ
+AccountNumber=اکاؤنٹ نمبر
+NewAccountingAccount=نیا کھاتہ
+Turnover=ٹرن اوور رسید
+TurnoverCollected=ٹرن اوور جمع ہوا۔
+SalesTurnoverMinimum=کم سے کم کاروبار
+ByExpenseIncome=اخراجات اور آمدنی سے
+ByThirdParties=تیسرے فریق کے ذریعہ
+ByUserAuthorOfInvoice=انوائس مصنف کے ذریعہ
+CheckReceipt=چیک ڈپازٹ
+CheckReceiptShort=چیک ڈپازٹ
+LastCheckReceiptShort=تازہ ترین %s چیک کی رسیدیں
+NewCheckReceipt=نئی رعایت
+NewCheckDeposit=نیا چیک ڈپازٹ
+NewCheckDepositOn=اکاؤنٹ پر جمع کرنے کے لیے رسید بنائیں: %s
+NoWaitingChecks=کوئی چیک ڈپازٹ کے منتظر نہیں۔
+DateChequeReceived=وصول کرنے کی تاریخ چیک کریں۔
+NbOfCheques=چیکوں کی تعداد
+PaySocialContribution=سماجی/مالیاتی ٹیکس ادا کریں۔
+PayVAT=VAT اعلامیہ ادا کریں۔
+PaySalary=تنخواہ کارڈ ادا کریں۔
+ConfirmPaySocialContribution=کیا آپ واقعی اس سماجی یا مالی ٹیکس کو بطور ادا شدہ درجہ بندی کرنا چاہتے ہیں؟
+ConfirmPayVAT=کیا آپ واقعی اس VAT ڈیکلریشن کو بطور ادا شدہ درجہ بندی کرنا چاہتے ہیں؟
+ConfirmPaySalary=کیا آپ واقعی اس تنخواہ کارڈ کو بطور ادا شدہ درجہ بندی کرنا چاہتے ہیں؟
+DeleteSocialContribution=سماجی یا مالی ٹیکس کی ادائیگی کو حذف کریں۔
+DeleteVAT=VAT اعلامیہ حذف کریں۔
+DeleteSalary=تنخواہ کارڈ حذف کریں۔
+ConfirmDeleteSocialContribution=کیا آپ واقعی اس سماجی/مالیاتی ٹیکس کی ادائیگی کو حذف کرنا چاہتے ہیں؟
+ConfirmDeleteVAT=کیا آپ واقعی اس VAT ڈیکلریشن کو حذف کرنا چاہتے ہیں؟
+ConfirmDeleteSalary=کیا آپ واقعی اس تنخواہ کو حذف کرنا چاہتے ہیں؟
+ExportDataset_tax_1=سماجی اور مالیاتی ٹیکس اور ادائیگیاں
+CalcModeVATDebt=موڈ <b> %sVAT پر عزم accounting%s </b> ۔
+CalcModeVATEngagement=موڈ <b> %sVAT آمدنی-خرچوں0ecb2ec87f49fz0 </b>
+CalcModeDebt=معلوم ریکارڈ شدہ دستاویزات کا تجزیہ یہاں تک کہ اگر وہ ابھی تک لیجر میں شمار نہ ہوں۔
+CalcModeEngagement=معلوم ریکارڈ شدہ ادائیگیوں کا تجزیہ، چاہے وہ ابھی تک لیجر میں شمار نہ ہوں۔
+CalcModeBookkeeping=بک کیپنگ لیجر ٹیبل میں جرنلائزڈ ڈیٹا کا تجزیہ۔
+CalcModeLT1= موڈ <b> %sRE کسٹمر انوائس پر - سپلائرز invoices%s </b>
+CalcModeLT1Debt=موڈ <b> %sRE کسٹمر انوائس پر موڈ
+CalcModeLT1Rec= موڈ <b> %sRE سپلائرز انوائس پر
+CalcModeLT2= موڈ <b> %sIRPF کسٹمر انوائس پر - سپلائرز invoices%s </b>
+CalcModeLT2Debt=موڈ <b> %sIRPF کسٹمر انوائس پر
+CalcModeLT2Rec= موڈ <b> %sIRPF سپلائرز انوائس پر انوائس
+AnnualSummaryDueDebtMode=آمدنی اور اخراجات کا توازن، سالانہ خلاصہ
+AnnualSummaryInputOutputMode=آمدنی اور اخراجات کا توازن، سالانہ خلاصہ
+AnnualByCompanies=اکاؤنٹ کے پہلے سے طے شدہ گروپوں کے ذریعہ آمدنی اور اخراجات کا توازن
+AnnualByCompaniesDueDebtMode=آمدنی اور اخراجات کا توازن، پہلے سے طے شدہ گروپس کے ذریعے تفصیل، موڈ <b> %sClaims-Debts%s </b> نے کہا
+AnnualByCompaniesInputOutputMode=آمدنی اور اخراجات کا توازن، پہلے سے طے شدہ گروپوں کے لحاظ سے تفصیل، موڈ <b> %sIncomes-Expenses%s </b> نے کہا a0aee83365837fz4701917fz
+SeeReportInInputOutputMode=دیکھیں <b> %sادائیگیوں کا تجزیہ
+SeeReportInDueDebtMode=دیکھیں <b> %s ریکارڈ شدہ دستاویزات کا تجزیہ.
+SeeReportInBookkeepingMode=دیکھیں <b> %s بک کیپنگ لیجر ٹیبل کا تجزیہ
+RulesAmountWithTaxIncluded=- دکھائی گئی رقم تمام ٹیکسوں کے ساتھ ہے۔
+RulesAmountWithTaxExcluded=- دکھائے گئے انوائسز کی رقم تمام ٹیکسوں کو چھوڑ کر ہے۔
+RulesResultDue=- اس میں تمام رسیدیں، اخراجات، VAT، عطیات، تنخواہیں، چاہے وہ ادا کیے جائیں یا نہ ہوں۔ <br> - یہ انوائسز کی بلنگ کی تاریخ اور اخراجات یا ٹیکس کی ادائیگیوں کی مقررہ تاریخ پر مبنی ہے۔ تنخواہوں کے لیے، مدت کے اختتام کی تاریخ استعمال کی جاتی ہے۔
+RulesResultInOut=- اس میں رسیدیں، اخراجات، VAT اور تنخواہوں پر کی گئی حقیقی ادائیگیاں شامل ہیں۔ <br> - یہ رسیدوں، اخراجات، VAT، عطیات اور تنخواہوں کی ادائیگی کی تاریخوں پر مبنی ہے۔
+RulesCADue=- اس میں گاہک کی واجب الادا رسیدیں شامل ہیں چاہے انہیں ادائیگی کی گئی ہو یا نہیں۔ <br> - یہ ان رسیدوں کی بلنگ تاریخ پر مبنی ہے۔ <br>
+RulesCAIn=- اس میں صارفین سے موصول ہونے والی رسیدوں کی تمام موثر ادائیگیاں شامل ہیں۔ <br> - یہ ان رسیدوں کی ادائیگی کی تاریخ پر مبنی ہے <br>
+RulesCATotalSaleJournal=اس میں سیل جرنل کی تمام کریڈٹ لائنیں شامل ہیں۔
+RulesSalesTurnoverOfIncomeAccounts=اس میں گروپ انکم میں پروڈکٹ اکاؤنٹس کے لیے لائنوں کی (کریڈٹ - ڈیبٹ) شامل ہوتی ہے۔
+RulesAmountOnInOutBookkeepingRecord=اس میں آپ کے لیجر میں اکاؤنٹنگ اکاؤنٹس کے ساتھ ریکارڈ شامل ہے جس میں گروپ "EXPENSE" یا "INCOME" ہے
+RulesResultBookkeepingPredefined=اس میں آپ کے لیجر میں اکاؤنٹنگ اکاؤنٹس کا ریکارڈ شامل ہے جس میں گروپ "خرچ" یا "آمدنی" ہے۔
+RulesResultBookkeepingPersonalized=یہ آپ کے لیجر میں اکاؤنٹنگ اکاؤنٹس کے ساتھ ریکارڈ دکھاتا ہے <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=جمع کردہ اور ادا کردہ کسٹمر VAT کی رپورٹ
+VATReportByQuartersInInputOutputMode=جمع کیے گئے اور ادا کیے گئے ٹیکس کی سیلز ٹیکس کی شرح کے حساب سے رپورٹ
+VATReportShowByRateDetails=اس شرح کی تفصیلات دکھائیں۔
+LT1ReportByQuarters=شرح کے لحاظ سے ٹیکس 2 کی اطلاع دیں۔
+LT2ReportByQuarters=شرح کے لحاظ سے ٹیکس 3 کی اطلاع دیں۔
+LT1ReportByQuartersES=RE کی شرح کی طرف سے رپورٹ
+LT2ReportByQuartersES=IRPF کی شرح کی طرف سے رپورٹ
+SeeVATReportInInputOutputMode=معیاری حساب کتاب کے لیے رپورٹ دیکھیں
+SeeVATReportInDueDebtMode=انوائسنگ پر اختیار کے ساتھ حساب کے لیے debit%s </b> پر <b> %sVAT رپورٹ دیکھیں
+RulesVATInServices=- خدمات کے لیے، رپورٹ میں ادائیگی کی تاریخ کی بنیاد پر درحقیقت موصول یا ادا کی گئی ادائیگیوں کا VAT شامل ہوتا ہے۔
+RulesVATInProducts=- مادی اثاثوں کے لیے، رپورٹ میں ادائیگی کی تاریخ کی بنیاد پر VAT شامل ہوتا ہے۔
+RulesVATDueServices=- خدمات کے لیے، رپورٹ میں انوائس کی تاریخ کی بنیاد پر واجب الادا انوائسز کا VAT شامل ہے، ادا کیا گیا یا نہیں۔
+RulesVATDueProducts=- مادی اثاثوں کے لیے، رپورٹ میں انوائس کی تاریخ کی بنیاد پر واجب الادا انوائسز کا VAT شامل ہوتا ہے۔
+OptionVatInfoModuleComptabilite=نوٹ: مادی اثاثوں کے لیے، اسے ترسیل کی تاریخ کو زیادہ منصفانہ بنانے کے لیے استعمال کرنا چاہیے۔
+ThisIsAnEstimatedValue=یہ ایک پیش نظارہ ہے، کاروباری واقعات پر مبنی ہے نہ کہ حتمی لیجر ٹیبل سے، لہذا حتمی نتائج اس پیش نظارہ اقدار سے مختلف ہو سکتے ہیں۔
+PercentOfInvoice=%%/انوائس
+NotUsedForGoods=سامان پر استعمال نہیں ہوتا
+ProposalStats=تجاویز پر اعدادوشمار
+OrderStats=آرڈرز کے اعدادوشمار
+InvoiceStats=بلوں کے اعدادوشمار
+Dispatch=بھیجنا
+Dispatched=روانہ کر دیا گیا۔
+ToDispatch=بھیجنے کے لیے
+ThirdPartyMustBeEditAsCustomer=تیسری پارٹی کو گاہک کے طور پر بیان کیا جانا چاہیے۔
+SellsJournal=سیلز جرنل
+PurchasesJournal=جرنل کی خریداری
+DescSellsJournal=سیلز جرنل
+DescPurchasesJournal=جرنل کی خریداری
+CodeNotDef=متعین نہیں۔
+WarningDepositsNotIncluded=اس اکاؤنٹنسی ماڈیول کے ساتھ اس ورژن میں ڈاؤن پیمنٹ انوائسز شامل نہیں ہیں۔
+DatePaymentTermCantBeLowerThanObjectDate=ادائیگی کی مدت کی تاریخ اعتراض کی تاریخ سے کم نہیں ہو سکتی۔
+Pcg_version=اکاؤنٹس ماڈلز کا چارٹ
+Pcg_type=پی سی جی کی قسم
+Pcg_subtype=پی سی جی ذیلی قسم
+InvoiceLinesToDispatch=بھیجنے کے لیے انوائس لائنز
+ByProductsAndServices=مصنوعات اور خدمت کے لحاظ سے
+RefExt=بیرونی حوالہ
+ToCreateAPredefinedInvoice=ٹیمپلیٹ انوائس بنانے کے لیے، ایک معیاری انوائس بنائیں، پھر، اس کی توثیق کیے بغیر، بٹن "%s" پر کلک کریں۔
+LinkedOrder=آرڈر کے لیے لنک
+Mode1=طریقہ 1
+Mode2=طریقہ 2
+CalculationRuleDesc=کل VAT کا حساب لگانے کے لیے، دو طریقے ہیں: <br> طریقہ 1 ہر لائن پر vat کو گول کر رہا ہے، پھر ان کا خلاصہ کر رہا ہے۔ <br> طریقہ 2 ہر لائن پر تمام vat کو جمع کر رہا ہے، پھر نتیجہ کو گول کر رہا ہے۔ <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=تھرڈ پارٹی کارڈ پر بیان کردہ وقف اکاؤنٹنگ اکاؤنٹ صرف Subledger اکاؤنٹنگ کے لیے استعمال کیا جائے گا۔ یہ جنرل لیجر کے لیے اور سبلیجر اکاؤنٹنگ کی ڈیفالٹ ویلیو کے طور پر استعمال کیا جائے گا اگر تھرڈ پارٹی پر مخصوص کسٹمر اکاؤنٹنگ اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+ACCOUNTING_ACCOUNT_SUPPLIER=وینڈر تھرڈ پارٹیز کے لیے اکاؤنٹنگ اکاؤنٹ استعمال کیا جاتا ہے۔
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=تھرڈ پارٹی کارڈ پر بیان کردہ وقف اکاؤنٹنگ اکاؤنٹ صرف Subledger اکاؤنٹنگ کے لیے استعمال کیا جائے گا۔ یہ جنرل لیجر کے لیے اور سبلیجر اکاؤنٹنگ کی ڈیفالٹ ویلیو کے طور پر استعمال کیا جائے گا اگر تیسرے فریق پر ڈیڈیکیٹڈ وینڈر اکاؤنٹنگ اکاؤنٹ کی وضاحت نہیں کی گئی ہے۔
+ConfirmCloneTax=سماجی/مالیاتی ٹیکس کے کلون کی تصدیق کریں۔
+ConfirmCloneVAT=VAT ڈیکلریشن کے کلون کی تصدیق کریں۔
+ConfirmCloneSalary=تنخواہ کے کلون کی تصدیق کریں۔
+CloneTaxForNextMonth=اسے اگلے مہینے کے لیے کلون کریں۔
+SimpleReport=سادہ رپورٹ
+AddExtraReport=اضافی رپورٹیں (غیر ملکی اور قومی کسٹمر رپورٹ شامل کریں)
+OtherCountriesCustomersReport=غیر ملکی صارفین کی رپورٹ
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=VAT نمبر کے دو پہلے حروف کی بنیاد پر جو آپ کی اپنی کمپنی کے ملک کے کوڈ سے مختلف ہیں۔
+SameCountryCustomersWithVAT=قومی صارفین کی رپورٹ
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=VAT نمبر کے دو پہلے حروف کی بنیاد پر جو آپ کی اپنی کمپنی کے ملک کے کوڈ کے برابر ہیں۔
+LinkedFichinter=مداخلت سے لنک کریں۔
+ImportDataset_tax_contrib=سماجی/مالیاتی ٹیکس
+ImportDataset_tax_vat=Vat ادائیگیاں
+ErrorBankAccountNotFound=خرابی: بینک اکاؤنٹ نہیں ملا
+FiscalPeriod=اکاؤنٹنگ مدت
+ListSocialContributionAssociatedProject=پروجیکٹ سے وابستہ سماجی شراکت کی فہرست
+DeleteFromCat=اکاؤنٹنگ گروپ سے ہٹا دیں۔
+AccountingAffectation=اکاؤنٹنگ اسائنمنٹ
+LastDayTaxIsRelatedTo=مدت کے آخری دن ٹیکس سے متعلق ہے۔
+VATDue=سیلز ٹیکس کا دعویٰ کیا گیا۔
+ClaimedForThisPeriod=مدت کے لیے دعویٰ کیا گیا۔
+PaidDuringThisPeriod=اس مدت کے لیے ادائیگی کی گئی۔
+PaidDuringThisPeriodDesc=یہ VAT ڈیکلریشنز سے منسلک تمام ادائیگیوں کا مجموعہ ہے جن کی منتخب تاریخ کی حد میں مدت کے اختتام کی تاریخ ہوتی ہے۔
+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/ur_PK/contracts.lang b/htdocs/langs/ur_PK/contracts.lang
new file mode 100644
index 00000000000..f5008da9565
--- /dev/null
+++ b/htdocs/langs/ur_PK/contracts.lang
@@ -0,0 +1,104 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractsArea=معاہدوں کا علاقہ
+ListOfContracts=معاہدوں کی فہرست
+AllContracts=تمام معاہدے
+ContractCard=معاہدہ کارڈ
+ContractStatusNotRunning=نہیں چل رہا ہے۔
+ContractStatusDraft=مسودہ
+ContractStatusValidated=تصدیق شدہ
+ContractStatusClosed=بند
+ServiceStatusInitial=نہیں چل رہا ہے۔
+ServiceStatusRunning=چل رہا ہے۔
+ServiceStatusNotLate=چل رہا ہے، میعاد ختم نہیں ہوا۔
+ServiceStatusNotLateShort=میعاد ختم نہیں ہوئی۔
+ServiceStatusLate=چل رہا ہے، میعاد ختم ہو گیا ہے۔
+ServiceStatusLateShort=میعاد ختم
+ServiceStatusClosed=بند
+ShowContractOfService=سروس کا معاہدہ دکھائیں۔
+Contracts=معاہدے
+ContractsSubscriptions=معاہدے/سبسکرپشنز
+ContractsAndLine=معاہدے اور معاہدے کی لائن
+Contract=معاہدہ
+ContractLine=معاہدہ لائن
+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=صرف "Service" کی قسم والی لائنوں کو کلون کیا جائے گا۔
+ConfirmCloneContract=کیا آپ واقعی <b> %s </b> معاہدہ کلون کرنا چاہتے ہیں؟
+LowerDateEndPlannedShort=فعال خدمات کی کم منصوبہ بند اختتامی تاریخ
+SendContractRef=معاہدے کی معلومات __REF__
+OtherContracts=دوسرے معاہدے
+##### Types de contacts #####
+TypeContact_contrat_internal_SALESREPSIGN=سیلز کا نمائندہ معاہدہ پر دستخط کرتا ہے۔
+TypeContact_contrat_internal_SALESREPFOLL=سیلز کے نمائندے فالو اپ معاہدہ
+TypeContact_contrat_external_BILLING=بلنگ کسٹمر رابطہ
+TypeContact_contrat_external_CUSTOMER=فالو اپ کسٹمر رابطہ
+TypeContact_contrat_external_SALESREPSIGN=کنٹریکٹ پر دستخط کرنا کسٹمر رابطہ
+HideClosedServiceByDefault=بند خدمات کو بطور ڈیفالٹ چھپائیں۔
+ShowClosedServices=بند خدمات دکھائیں۔
+HideClosedServices=بند خدمات کو چھپائیں۔
diff --git a/htdocs/langs/ur_PK/cron.lang b/htdocs/langs/ur_PK/cron.lang
new file mode 100644
index 00000000000..432b56a5362
--- /dev/null
+++ b/htdocs/langs/ur_PK/cron.lang
@@ -0,0 +1,91 @@
+# Dolibarr language file - Source file is en_US - cron
+# About page
+# Right
+Permission23101 = طے شدہ کام پڑھیں
+Permission23102 = شیڈول شدہ جاب بنائیں/اپ ڈیٹ کریں۔
+Permission23103 = طے شدہ کام کو حذف کریں۔
+Permission23104 = طے شدہ کام کو انجام دیں۔
+# Admin
+CronSetup=شیڈول جاب مینجمنٹ سیٹ اپ
+URLToLaunchCronJobs=براؤزر سے کوالیفائیڈ کرون جابز کو چیک کرنے اور لانچ کرنے کے لیے URL
+OrToLaunchASpecificJob=یا براؤزر سے کسی مخصوص کام کو چیک کرنا اور لانچ کرنا
+KeyForCronAccess=کرون جابز شروع کرنے کے لیے URL کے لیے سیکیورٹی کلید
+FileToLaunchCronJobs=کوالیفائیڈ کرون جابز کو چیک کرنے اور لانچ کرنے کے لیے کمانڈ لائن
+CronExplainHowToRunUnix=یونکس ماحول پر آپ کو ہر 5 منٹ میں کمانڈ لائن چلانے کے لیے درج ذیل کرونٹاب انٹری کا استعمال کرنا چاہیے۔
+CronExplainHowToRunWin=مائیکروسافٹ (ٹی ایم) ونڈوز ماحول پر آپ ہر 5 منٹ میں کمانڈ لائن چلانے کے لیے شیڈول ٹاسک ٹولز استعمال کر سکتے ہیں۔
+CronMethodDoesNotExists=کلاس %s میں کوئی طریقہ نہیں ہے %s
+CronMethodNotAllowed=کلاس %s کا طریقہ %s حرام طریقوں کی بلیک لسٹ میں ہے
+CronJobDefDesc=کرون جاب پروفائلز کی وضاحت ماڈیول ڈسکرپٹر فائل میں کی گئی ہے۔ جب ماڈیول فعال ہو جاتا ہے، تو وہ لوڈ اور دستیاب ہو جاتے ہیں تاکہ آپ ایڈمن ٹولز مینو %s سے جابز کا انتظام کر سکیں۔
+CronJobProfiles=پہلے سے طے شدہ کرون جاب پروفائلز کی فہرست
+# Menu
+EnabledAndDisabled=فعال اور غیر فعال
+# Page list
+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= ملازمتیں شامل کریں۔
+CronEvery=ہر ایک کا کام انجام دیں۔
+CronObject=مثال/تخلیق کے لیے آبجیکٹ
+CronArgs=پیرامیٹرز
+CronSaveSucess=کامیابی سے محفوظ کریں۔
+CronNote=تبصرہ
+CronFieldMandatory=فیلڈز %s لازمی ہے۔
+CronErrEndDateStartDt=اختتامی تاریخ تاریخ آغاز سے پہلے کی نہیں ہو سکتی
+StatusAtInstall=ماڈیول کی تنصیب کی حالت
+CronStatusActiveBtn=شیڈول
+CronStatusInactiveBtn=غیر فعال کریں۔
+CronTaskInactive=یہ کام غیر فعال ہے (شیڈول نہیں ہے)
+CronId=آئی ڈی
+CronClassFile=کلاس کے ساتھ فائل کا نام
+CronModuleHelp=Dolibarr ماڈیول ڈائرکٹری کا نام (بیرونی Dolibarr ماڈیول کے ساتھ بھی کام کرتا ہے)۔ <BR> مثال کے طور پر Dolibarr پروڈکٹ آبجیکٹ /htdocs/ <u> پروڈکٹ کے حاصل کرنے کے طریقہ کو کال کرنے کے لیے
+CronClassFileHelp=لوڈ کرنے کے لیے متعلقہ راستہ اور فائل کا نام (راستہ ویب سرور روٹ ڈائرکٹری سے متعلق ہے)۔ <BR> مثال کے طور پر Dolibarr پروڈکٹ آبجیکٹ کے بازیافت کے طریقہ کار کو کال کرنے کے لیے
+CronObjectHelp=لوڈ کرنے کے لیے آبجیکٹ کا نام۔ <BR> مثال کے طور پر Dolibarr پروڈکٹ آبجیکٹ /htdocs/product/class/product.class.php کے بازیافت طریقہ کو کال کرنے کے لئے، کلاس فائل کے نام کی قدر <br> <i> ہے
+CronMethodHelp=لانچ کرنے کا آبجیکٹ طریقہ۔ <BR> مثال کے طور پر Dolibarr پروڈکٹ آبجیکٹ /htdocs/product/class/product.class.php کے بازیافت طریقہ کو کال کرنے کے لئے، طریقہ کی قدر <br> <i> ہے
+CronArgsHelp=طریقہ کار کے دلائل۔ <BR> مثال کے طور پر Dolibarr پروڈکٹ آبجیکٹ /htdocs/product/class/product.class.php کے بازیافت کے طریقہ کو کال کرنے کے لئے، پیرامیٹرز کی قدر <br> <i> 0، ProductRef71e8181fcz0 ہو سکتی ہے
+CronCommandHelp=چلانے کے لیے سسٹم کمانڈ لائن۔
+CronCreateJob=نئی طے شدہ ملازمت بنائیں
+CronFrom=سے
+# Info
+# Common
+CronType=ملازمت کی قسم
+CronType_method=پی ایچ پی کلاس کا کال طریقہ
+CronType_command=شیل کمانڈ
+CronCannotLoadClass=کلاس فائل %s لوڈ نہیں کی جا سکتی (کلاس %s استعمال کرنے کے لیے)
+CronCannotLoadObject=کلاس فائل %s لوڈ کی گئی تھی، لیکن اس میں آبجیکٹ %s نہیں ملا
+UseMenuModuleToolsToAddCronJobs=مینو میں جائیں " <a href="%s"> ہوم - ایڈمن ٹولز - شیڈیولڈ جابز </a>" شیڈول جابز کو دیکھنے اور ان میں ترمیم کرنے کے لیے۔
+JobDisabled=ملازمت غیر فعال
+MakeLocalDatabaseDumpShort=مقامی ڈیٹا بیس کا بیک اپ
+MakeLocalDatabaseDump=ایک مقامی ڈیٹا بیس ڈمپ بنائیں۔ پیرامیٹرز ہیں: کمپریشن ('gz' یا 'bz' یا 'none')، بیک اپ کی قسم ('mysql'، 'pgsql'، 'auto')، 1، 'auto' یا فائل کا نام، رکھنے کے لیے بیک اپ فائلوں کی تعداد
+WarningCronDelayed=توجہ، کارکردگی کے مقصد کے لیے، فعال ملازمتوں کے نفاذ کی اگلی تاریخ جو بھی ہو، آپ کی ملازمتوں کو چلانے سے پہلے زیادہ سے زیادہ %s گھنٹے تک تاخیر ہو سکتی ہے۔
+DATAPOLICYJob=ڈیٹا کلینر اور گمنام
+JobXMustBeEnabled=جاب %s کا فعال ہونا ضروری ہے۔
+# Cron Boxes
+LastExecutedScheduledJob=آخری بار طے شدہ کام
+NextScheduledJobExecute=اگلا طے شدہ کام انجام دینے کے لیے
+NumberScheduledJobError=غلطی سے طے شدہ کاموں کی تعداد
diff --git a/htdocs/langs/ur_PK/deliveries.lang b/htdocs/langs/ur_PK/deliveries.lang
new file mode 100644
index 00000000000..e4226709783
--- /dev/null
+++ b/htdocs/langs/ur_PK/deliveries.lang
@@ -0,0 +1,33 @@
+# Dolibarr language file - Source file is en_US - deliveries
+Delivery=ترسیل
+DeliveryRef=حوالگی کی ترسیل
+DeliveryCard=رسید کارڈ
+DeliveryOrder=ترسیل کی رسید
+DeliveryDate=ادئیگی کی تاریخ
+CreateDeliveryOrder=ترسیل کی رسید تیار کریں۔
+DeliveryStateSaved=ڈیلیوری کی حالت محفوظ ہو گئی۔
+SetDeliveryDate=شپنگ کی تاریخ طے کریں۔
+ValidateDeliveryReceipt=ترسیل کی رسید کی توثیق کریں۔
+ValidateDeliveryReceiptConfirm=کیا آپ واقعی اس ترسیل کی رسید کی توثیق کرنا چاہتے ہیں؟
+DeleteDeliveryReceipt=ترسیل کی رسید کو حذف کریں۔
+DeleteDeliveryReceiptConfirm=کیا آپ واقعی ڈیلیوری رسید <b> %s </b> کو حذف کرنا چاہتے ہیں؟
+DeliveryMethod=ترسیل کا طریقہ
+TrackingNumber=ٹریکنگ نمبر
+DeliveryNotValidated=ڈیلیوری کی توثیق نہیں ہوئی۔
+StatusDeliveryCanceled=منسوخ
+StatusDeliveryDraft=مسودہ
+StatusDeliveryValidated=موصول ہوا۔
+# merou PDF model
+NameAndSignature=نام اور دستخط:
+ToAndDate=___________________________________ پر ________________________________
+GoodStatusDeclaration=اوپر کا سامان اچھی حالت میں ملا ہے،
+Deliverer=پہنچانے والا:
+Sender=بھیجنے والا
+Recipient=وصول کنندہ
+ErrorStockIsNotEnough=کافی اسٹاک نہیں ہے۔
+Shippable=قابل ترسیل
+NonShippable=قابل ترسیل نہیں۔
+ShowShippableStatus=قابل ترسیل حیثیت دکھائیں۔
+ShowReceiving=ترسیل کی رسید دکھائیں۔
+NonExistentOrder=غیر موجود آرڈر
+StockQuantitiesAlreadyAllocatedOnPreviousLines = اسٹاک کی مقدار پہلے ہی پچھلی لائنوں پر مختص کی گئی ہے۔
diff --git a/htdocs/langs/ur_PK/dict.lang b/htdocs/langs/ur_PK/dict.lang
new file mode 100644
index 00000000000..ce8948efbac
--- /dev/null
+++ b/htdocs/langs/ur_PK/dict.lang
@@ -0,0 +1,359 @@
+# Dolibarr language file - Source file is en_US - dict
+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=متحدہ سلطنت یونائیٹڈ کنگڈم
+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=مسز.
+CivilityMR=مسٹر.
+CivilityMLE=MS.
+CivilityMTRE=ماسٹر
+CivilityDR=ڈاکٹر
+##### Currencies #####
+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=CFA Francs BEAC
+CurrencySingXAF=CFA فرانک BEAC
+CurrencyXOF=CFA Francs BCEAO
+CurrencySingXOF=CFA فرانک BCEAO
+CurrencyXPF=CFP فرانک
+CurrencySingXPF=CFP فرانک
+CurrencyCentEUR=سینٹ
+CurrencyCentSingEUR=سینٹ
+CurrencyCentINR=پیسہ
+CurrencyCentSingINR=پیسہ
+CurrencyThousandthSingTND=ہزارواں
+#### Input reasons #####
+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=فارمیٹ 4A0
+PaperFormatEU2A0=فارمیٹ 2A0
+PaperFormatEUA0=فارمیٹ A0
+PaperFormatEUA1=فارمیٹ A1
+PaperFormatEUA2=فارمیٹ A2
+PaperFormatEUA3=فارمیٹ A3
+PaperFormatEUA4=فارمیٹ A4
+PaperFormatEUA5=فارمیٹ A5
+PaperFormatEUA6=فارمیٹ A6
+PaperFormatUSLETTER=فارمیٹ خط US
+PaperFormatUSLEGAL=فارمیٹ قانونی US
+PaperFormatUSEXECUTIVE=فارمیٹ ایگزیکٹو US
+PaperFormatUSLEDGER=فارمیٹ لیجر/ٹیبلوئڈ
+PaperFormatCAP1=فارمیٹ P1 کینیڈا
+PaperFormatCAP2=فارمیٹ P2 کینیڈا
+PaperFormatCAP3=فارمیٹ P3 کینیڈا
+PaperFormatCAP4=فارمیٹ P4 کینیڈا
+PaperFormatCAP5=فارمیٹ P5 کینیڈا
+PaperFormatCAP6=فارمیٹ P6 کینیڈا
+#### Expense report categories ####
+ExpAutoCat=گاڑی
+ExpCycloCat=موپڈ
+ExpMotoCat=موٹر سائیکل
+ExpAuto3CV=3 سی وی
+ExpAuto4CV=4 سی وی
+ExpAuto5CV=5 سی وی
+ExpAuto6CV=6 سی وی
+ExpAuto7CV=7 سی وی
+ExpAuto8CV=8 سی وی
+ExpAuto9CV=9 سی وی
+ExpAuto10CV=10 سی وی
+ExpAuto11CV=11 سی وی
+ExpAuto12CV=12 سی وی
+ExpAuto3PCV=3 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 سی وی
+ExpMoto345CV=موٹر بائیک 3، 4 یا 5 سی وی
+ExpMoto5PCV=موٹر بائیک 5 سی وی اور مزید
diff --git a/htdocs/langs/ur_PK/donations.lang b/htdocs/langs/ur_PK/donations.lang
new file mode 100644
index 00000000000..da6534254a5
--- /dev/null
+++ b/htdocs/langs/ur_PK/donations.lang
@@ -0,0 +1,35 @@
+# Dolibarr language file - Source file is en_US - donations
+Donation=عطیہ
+Donations=عطیات
+DonationRef=عطیہ کا حوالہ
+Donor=ڈونر
+AddDonation=عطیہ بنائیں
+NewDonation=نیا عطیہ
+DeleteADonation=عطیہ کو حذف کریں۔
+ConfirmDeleteADonation=کیا آپ واقعی اس عطیہ کو حذف کرنا چاہتے ہیں؟
+PublicDonation=عوامی عطیہ
+DonationsArea=عطیات کا علاقہ
+DonationStatusPromiseNotValidated=وعدہ کا مسودہ
+DonationStatusPromiseValidated=توثیق شدہ وعدہ
+DonationStatusPaid=عطیہ موصول ہوا۔
+DonationStatusPromiseNotValidatedShort=مسودہ
+DonationStatusPromiseValidatedShort=تصدیق شدہ
+DonationStatusPaidShort=موصول ہوا۔
+DonationTitle=عطیہ کی رسید
+DonationDate=عطیہ کی تاریخ
+DonationDatePayment=ادائیگی کی تاریخ
+ValidPromess=وعدے کی تصدیق کریں۔
+DonationReceipt=عطیہ کی رسید
+DonationsModels=عطیہ کی رسیدوں کے لیے دستاویزات کے ماڈل
+LastModifiedDonations=تازہ ترین %s تبدیل شدہ عطیات
+DonationRecipient=عطیہ وصول کنندہ
+IConfirmDonationReception=وصول کنندہ مندرجہ ذیل رقم کے عطیہ کے طور پر استقبالیہ کا اعلان کرتا ہے۔
+MinimumAmount=کم از کم رقم %s ہے۔
+FreeTextOnDonations=فوٹر میں دکھانے کے لیے مفت متن
+FrenchOptions=فرانس کے لیے اختیارات
+DONATION_ART200=اگر آپ فکر مند ہیں تو CGI سے آرٹیکل 200 دکھائیں۔
+DONATION_ART238=اگر آپ کو تشویش ہے تو CGI سے آرٹیکل 238 دکھائیں۔
+DONATION_ART885=اگر آپ فکر مند ہیں تو CGI سے آرٹیکل 885 دکھائیں۔
+DonationPayment=عطیہ کی ادائیگی
+DonationValidated=عطیہ %s توثیق شدہ
+DonationUseThirdparties=عطیہ دہندگان کے کوآرڈینیٹ کے طور پر موجودہ فریق ثالث کا استعمال کریں۔
diff --git a/htdocs/langs/ur_PK/ecm.lang b/htdocs/langs/ur_PK/ecm.lang
new file mode 100644
index 00000000000..cc4546ea90c
--- /dev/null
+++ b/htdocs/langs/ur_PK/ecm.lang
@@ -0,0 +1,49 @@
+# Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=ڈائریکٹری میں دستاویزات کی تعداد
+ECMSection=ڈائرکٹری
+ECMSectionManual=دستی ڈائریکٹری
+ECMSectionAuto=خودکار ڈائریکٹری
+ECMSectionsManual=دستی درخت
+ECMSectionsAuto=خودکار درخت
+ECMSections=ڈائریکٹریز
+ECMRoot=ای سی ایم روٹ
+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 ماڈیول کے باہر بنائی یا تبدیل کی گئی ہے۔ اس ڈائرکٹری کا مواد حاصل کرنے کے لیے آپ کو ڈسک اور ڈیٹابیس کو سنکرونائز کرنے کے لیے پہلے "Resync" بٹن پر کلک کرنا چاہیے۔
+ReSyncListOfDir=ڈائریکٹریز کی فہرست کو دوبارہ ہم آہنگ کریں۔
+HashOfFileContent=فائل کے مواد کی ہیش
+NoDirectoriesFound=کوئی ڈائریکٹری نہیں ملی
+FileNotYetIndexedInDatabase=فائل ابھی تک ڈیٹا بیس میں انڈیکس نہیں ہوئی ہے (اسے دوبارہ اپ لوڈ کرنے کی کوشش کریں)
+ExtraFieldsEcmFiles=Extrafields Ecm فائلیں۔
+ExtraFieldsEcmDirectories=Extrafields Ecm ڈائریکٹریز
+ECMSetup=ECM سیٹ اپ
+GenerateImgWebp=تمام تصاویر کو دوسرے ورژن کے ساتھ .webp فارمیٹ کے ساتھ ڈپلیکیٹ کریں۔
+ConfirmGenerateImgWebp=اگر آپ تصدیق کرتے ہیں، تو آپ اس فولڈر میں موجود تمام تصاویر کے لیے .webp فارمیٹ میں ایک تصویر بنائیں گے (سب فولڈرز شامل نہیں ہیں)...
+ConfirmImgWebpCreation=تمام تصاویر کی نقل کی تصدیق کریں۔
+SucessConvertImgWebp=تصاویر کامیابی کے ساتھ ڈپلیکیٹ ہو گئیں۔
+ECMDirName=دیر کا نام
+ECMParentDirectory=پیرنٹ ڈائرکٹری
diff --git a/htdocs/langs/ur_PK/errors.lang b/htdocs/langs/ur_PK/errors.lang
new file mode 100644
index 00000000000..905d70ab7fb
--- /dev/null
+++ b/htdocs/langs/ur_PK/errors.lang
@@ -0,0 +1,334 @@
+# Dolibarr language file - Source file is en_US - errors
+
+# No errors
+NoErrorCommitIsDone=کوئی غلطی نہیں، ہم ارتکاب کرتے ہیں۔
+# Errors
+ErrorButCommitIsDone=غلطیاں ملی ہیں لیکن ہم اس کے باوجود تصدیق کرتے ہیں۔
+ErrorBadEMail=ای میل %s غلط ہے۔
+ErrorBadMXDomain=ای میل %s غلط معلوم ہوتا ہے (ڈومین کا کوئی درست MX ریکارڈ نہیں ہے)
+ErrorBadUrl=یو آر ایل %s غلط ہے۔
+ErrorBadValueForParamNotAString=آپ کے پیرامیٹر کی خراب قدر۔ یہ عام طور پر اس وقت شامل ہوتا ہے جب ترجمہ غائب ہو۔
+ErrorRefAlreadyExists=حوالہ <b> %s </b> پہلے سے موجود ہے۔
+ErrorLoginAlreadyExists=لاگ ان %s پہلے سے موجود ہے۔
+ErrorGroupAlreadyExists=گروپ %s پہلے سے موجود ہے۔
+ErrorEmailAlreadyExists=ای میل %s پہلے سے موجود ہے۔
+ErrorRecordNotFound=ریکارڈ نہیں ملا۔
+ErrorFailToCopyFile=فائل '<b> %s </b>' کو '<b> %s a09a4b739f18f' میں کاپی کرنے میں ناکام۔
+ErrorFailToCopyDir=ڈائرکٹری ' <b> %s </b>' کو '<b> %s a09a4b739f18f' میں کاپی کرنے میں ناکام۔
+ErrorFailToRenameFile=فائل کا نام '<b> %s </b>' کو '<b> %s a09a4b739f17' میں تبدیل کرنے میں ناکام۔
+ErrorFailToDeleteFile=فائل '<b> %s </b>' کو ہٹانے میں ناکام۔
+ErrorFailToCreateFile=فائل '<b> %s </b>' بنانے میں ناکام۔
+ErrorFailToRenameDir=ڈائریکٹری ' <b> %s </b>' کو '<b> %s a09a4b739f17' میں تبدیل کرنے میں ناکام۔
+ErrorFailToCreateDir=ڈائریکٹری ' <b> %s </b>' بنانے میں ناکام۔
+ErrorFailToDeleteDir=ڈائریکٹری '<b> %s </b>' کو حذف کرنے میں ناکام۔
+ErrorFailToMakeReplacementInto=فائل '<b> %s </b>' میں تبدیل کرنے میں ناکام۔
+ErrorFailToGenerateFile=فائل '<b> %s </b>' بنانے میں ناکام۔
+ErrorThisContactIsAlreadyDefinedAsThisType=یہ رابطہ پہلے ہی اس قسم کے رابطے کے طور پر بیان کیا گیا ہے۔
+ErrorCashAccountAcceptsOnlyCashMoney=یہ بینک اکاؤنٹ ایک کیش اکاؤنٹ ہے، اس لیے یہ صرف قسم کی نقدی کی ادائیگی قبول کرتا ہے۔
+ErrorFromToAccountsMustDiffers=ذرائع اور اہداف کے بینک اکاؤنٹس مختلف ہونے چاہئیں۔
+ErrorBadThirdPartyName=فریق ثالث کے نام کی خراب قدر
+ForbiddenBySetupRules=Forbidden by setup rules
+ErrorProdIdIsMandatory=%s لازمی ہے۔
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
+ErrorBadCustomerCodeSyntax=کسٹمر کوڈ کے لیے خراب نحو
+ErrorBadBarCodeSyntax=بارکوڈ کے لیے خراب نحو۔ ہوسکتا ہے کہ آپ نے برا کوڈ کی قسم سیٹ کی ہو یا آپ نے نمبرنگ کے لیے بارکوڈ ماسک کی وضاحت کی ہو جو اسکین کردہ ویلیو سے مماثل نہ ہو۔
+ErrorCustomerCodeRequired=کسٹمر کوڈ درکار ہے۔
+ErrorBarCodeRequired=بارکوڈ درکار ہے۔
+ErrorCustomerCodeAlreadyUsed=گاہک کوڈ پہلے ہی استعمال ہو چکا ہے۔
+ErrorBarCodeAlreadyUsed=بارکوڈ پہلے سے استعمال کیا گیا ہے۔
+ErrorPrefixRequired=سابقہ مطلوب ہے۔
+ErrorBadSupplierCodeSyntax=وینڈر کوڈ کے لیے خراب نحو
+ErrorSupplierCodeRequired=وینڈر کوڈ درکار ہے۔
+ErrorSupplierCodeAlreadyUsed=وینڈر کوڈ پہلے ہی استعمال ہو چکا ہے۔
+ErrorBadParameters=خراب پیرامیٹرز
+ErrorWrongParameters=غلط یا غائب پیرامیٹرز
+ErrorBadValueForParameter=پیرامیٹر '%s' کے لیے غلط قدر '%s'
+ErrorBadImageFormat=امیج فائل میں معاون فارمیٹ نہیں ہے (آپ کا پی ایچ پی اس فارمیٹ کی تصاویر کو تبدیل کرنے کے فنکشنز کو سپورٹ نہیں کرتا ہے)
+ErrorBadDateFormat=قدر '%s' کی تاریخ کی شکل غلط ہے۔
+ErrorWrongDate=تاریخ درست نہیں ہے!
+ErrorFailedToWriteInDir=ڈائریکٹری %s میں لکھنے میں ناکام
+ErrorFoundBadEmailInFile=فائل میں %s لائنوں کے لیے غلط ای میل نحو ملا (مثال کی لائن %s with email=%s)
+ErrorUserCannotBeDelete=صارف کو حذف نہیں کیا جا سکتا۔ ہوسکتا ہے کہ اس کا تعلق Dolibarr اداروں سے ہو۔
+ErrorFieldsRequired=کچھ مطلوبہ فیلڈز کو خالی چھوڑ دیا گیا ہے۔
+ErrorSubjectIsRequired=ای میل کا مضمون درکار ہے۔
+ErrorFailedToCreateDir=ڈائریکٹری بنانے میں ناکام۔ چیک کریں کہ ویب سرور صارف کو Dolibarr دستاویزات کی ڈائرکٹری میں لکھنے کی اجازت ہے۔ اگر اس پی ایچ پی پر پیرامیٹر <b> safe_mode </b> فعال ہے تو چیک کریں کہ Dolibarr php فائلیں ویب سرور صارف (یا گروپ) کی ملکیت ہیں۔
+ErrorNoMailDefinedForThisUser=اس صارف کے لیے کوئی میل متعین نہیں ہے۔
+ErrorSetupOfEmailsNotComplete=ای میلز کا سیٹ اپ مکمل نہیں ہے۔
+ErrorFeatureNeedJavascript=اس فیچر کو کام کرنے کے لیے جاوا اسکرپٹ کو چالو کرنے کی ضرورت ہے۔ اسے سیٹ اپ - ڈسپلے میں تبدیل کریں۔
+ErrorTopMenuMustHaveAParentWithId0='ٹاپ' قسم کے مینو میں پیرنٹ مینو نہیں ہو سکتا۔ پیرنٹ مینو میں 0 ڈالیں یا 'بائیں' قسم کا مینو منتخب کریں۔
+ErrorLeftMenuMustHaveAParentId='بائیں' قسم کے مینو میں والدین کی شناخت ہونی چاہیے۔
+ErrorFileNotFound=فائل <b> %s </b> نہیں ملی (خراب راستہ، غلط اجازت یا رسائی پی ایچ پی کے اوپن بیسڈیر یا سیف_موڈ پیرامیٹر کے ذریعہ مسترد)
+ErrorDirNotFound=ڈائرکٹری <b> %s </b> نہیں ملی (خراب راستہ، غلط اجازت یا رسائی پی ایچ پی کے اوپن بیسڈیر یا سیف موڈ پیرامیٹر سے انکار)
+ErrorFunctionNotAvailableInPHP=فنکشن <b> %s </b> اس خصوصیت کے لیے درکار ہے لیکن پی ایچ پی کے اس ورژن/سیٹ اپ میں دستیاب نہیں ہے۔
+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=ایک .ldif فائل ڈائرکٹری %s میں تیار کی گئی ہے۔ غلطیوں کے بارے میں مزید معلومات حاصل کرنے کے لیے اسے کمانڈ لائن سے دستی طور پر لوڈ کرنے کی کوشش کریں۔
+ErrorCantSaveADoneUserWithZeroPercentage="اسٹیٹس ناٹ اسٹارٹ" کے ساتھ کسی ایکشن کو محفوظ نہیں کیا جا سکتا اگر فیلڈ "ڈون بائے" بھی بھری ہو۔
+ErrorRefAlreadyExists=حوالہ <b> %s </b> پہلے سے موجود ہے۔
+ErrorPleaseTypeBankTransactionReportName=براہ کرم بینک اسٹیٹمنٹ کا نام درج کریں جہاں اندراج کی اطلاع دی جانی ہے (فارمیٹ YYYYMM یا YYYYMMDD)
+ErrorRecordHasChildren=ریکارڈ کو حذف کرنے میں ناکام کیونکہ اس میں کچھ چائلڈ ریکارڈز ہیں۔
+ErrorRecordHasAtLeastOneChildOfType=آبجیکٹ %s میں %s قسم کا کم از کم ایک بچہ ہے
+ErrorRecordIsUsedCantDelete=ریکارڈ کو حذف نہیں کیا جا سکتا۔ یہ پہلے ہی کسی اور چیز میں استعمال یا شامل ہے۔
+ErrorModuleRequireJavascript=اس فیچر کو کام کرنے کے لیے جاوا اسکرپٹ کو غیر فعال نہیں کیا جانا چاہیے۔ جاوا اسکرپٹ کو فعال/غیر فعال کرنے کے لیے، مینو ہوم-> سیٹ اپ-> ڈسپلے پر جائیں۔
+ErrorPasswordsMustMatch=دونوں ٹائپ شدہ پاس ورڈ ایک دوسرے سے مماثل ہونے چاہئیں
+ErrorContactEMail=ایک تکنیکی خرابی پیش آگئی۔ براہ کرم، درج ذیل ای میل کے لیے منتظم سے رابطہ کریں
+ErrorWrongValueForField=فیلڈ <b> %s </b> : '<b> %s a09a4b739f17f8zec0839f17f8zec083839f17f8zexa83fz39fz7839f49fz083839f49fz0839fz7839f49fz0839fz7fz19 سے مماثل ہے
+ErrorFieldValueNotIn=فیلڈ <b> %s </b>: '<b> %s </b>' ایک قیمت میدان <b> %s </b> میں پائے کا نہیں ہے <b> %s </b>
+ErrorFieldRefNotIn=فیلڈ <b> %s </b> : '<b> %s </b>839f17f8z080839f739f17fz087839fz08739fz087fz0839fz087fz39fz087fz087fz087fz07fz087f49fz07fz09fz0839f17fz087fz087fz07fz07fz0839f17fz07fz087fz0839f17fz087fz.
+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=نوٹ: اس لاگ ان کے لیے موجودہ سیشنز کو تباہ کرنے کے لیے اپنے براؤزر کی کوکیز کو صاف کریں۔
+ErrorNoImagickReadimage=کلاس امیجک اس پی ایچ پی میں نہیں ملتی ہے۔ کوئی پیش نظارہ دستیاب نہیں ہوسکتا ہے۔ منتظمین مینو سیٹ اپ - ڈسپلے سے اس ٹیب کو غیر فعال کر سکتے ہیں۔
+ErrorRecordAlreadyExists=ریکارڈ پہلے سے موجود ہے۔
+ErrorLabelAlreadyExists=یہ لیبل پہلے سے موجود ہے۔
+ErrorCantReadFile=فائل '%s' پڑھنے میں ناکام
+ErrorCantReadDir=ڈائریکٹری '%s' پڑھنے میں ناکام
+ErrorBadLoginPassword=لاگ ان یا پاس ورڈ کی خراب قدر
+ErrorLoginDisabled=آپ کا اکاؤنٹ غیر فعال کر دیا گیا ہے۔
+ErrorFailedToRunExternalCommand=بیرونی کمانڈ چلانے میں ناکام۔ چیک کریں کہ یہ آپ کے پی ایچ پی سرور صارف کے ذریعہ دستیاب اور چلانے کے قابل ہے۔ یہ بھی چیک کریں کہ کمانڈ شیل کی سطح پر حفاظتی پرت جیسے اپارمر کے ذریعہ محفوظ نہیں ہے۔
+ErrorFailedToChangePassword=پاس ورڈ تبدیل کرنے میں ناکام
+ErrorLoginDoesNotExists=لاگ ان <b> %s </b> والا صارف نہیں مل سکا۔
+ErrorLoginHasNoEmail=اس صارف کا کوئی ای میل پتہ نہیں ہے۔ عمل روک دیا گیا۔
+ErrorBadValueForCode=سیکیورٹی کوڈ کی خراب قدر۔ نئی قدر کے ساتھ دوبارہ کوشش کریں...
+ErrorBothFieldCantBeNegative=فیلڈز %s اور %s دونوں منفی نہیں ہو سکتے
+ErrorFieldCantBeNegativeOnInvoice=فیلڈ <strong> %s </strong> اس قسم کے انوائس پر منفی نہیں ہو سکتا۔ اگر آپ کو ڈسکاؤنٹ لائن شامل کرنے کی ضرورت ہے تو پہلے رعایت بنائیں (تیسرے فریق کارڈ میں '%s' فیلڈ سے) اور اسے انوائس پر لاگو کریں۔
+ErrorLinesCantBeNegativeForOneVATRate=لائنوں کی کل (ٹیکس کا خالص) دی گئی غیر صفر VAT کی شرح کے لیے منفی نہیں ہو سکتا (VAT کی شرح <b> %s </b> %% کے لیے منفی ٹوٹل ملا)۔
+ErrorLinesCantBeNegativeOnDeposits=ڈپازٹ میں لائنیں منفی نہیں ہو سکتیں۔ اگر آپ ایسا کرتے ہیں تو آپ کو اس وقت مسائل کا سامنا کرنا پڑے گا جب آپ کو حتمی انوائس میں ڈپازٹ استعمال کرنے کی ضرورت ہوگی۔
+ErrorQtyForCustomerInvoiceCantBeNegative=کسٹمر انوائس میں لائن کی مقدار منفی نہیں ہو سکتی
+ErrorWebServerUserHasNotPermission=ویب سرور کو چلانے کے لیے استعمال ہونے والے صارف اکاؤنٹ <b> %s </b> کو اس کی اجازت نہیں ہے۔
+ErrorNoActivatedBarcode=بار کوڈ کی کوئی قسم فعال نہیں ہے۔
+ErrUnzipFails=ZipArchive کے ساتھ %s کو ان زپ کرنے میں ناکام
+ErrNoZipEngine=اس پی ایچ پی میں %s فائل کو زپ/انزپ کرنے کے لیے کوئی انجن نہیں ہے
+ErrorFileMustBeADolibarrPackage=فائل %s Dolibarr zip پیکیج ہونی چاہیے۔
+ErrorModuleFileRequired=آپ کو ایک Dolibarr ماڈیول پیکیج فائل کو منتخب کرنا ہوگا۔
+ErrorPhpCurlNotInstalled=PHP CURL انسٹال نہیں ہے، یہ Paypal کے ساتھ بات کرنے کے لیے ضروری ہے۔
+ErrorFailedToAddToMailmanList=میل مین لسٹ %s یا SPIP بیس میں ریکارڈ %s شامل کرنے میں ناکام
+ErrorFailedToRemoveToMailmanList=میل مین لسٹ %s یا SPIP بیس سے ریکارڈ %s کو ہٹانے میں ناکام
+ErrorNewValueCantMatchOldValue=نئی قدر پرانی کے برابر نہیں ہو سکتی
+ErrorFailedToValidatePasswordReset=پاس ورڈ دوبارہ شروع کرنے میں ناکام۔ ہو سکتا ہے دوبارہ شروع کر دیا گیا ہو (یہ لنک صرف ایک بار استعمال کیا جا سکتا ہے)۔ اگر نہیں، تو دوبارہ شروع کرنے کے عمل کو دوبارہ شروع کرنے کی کوشش کریں۔
+ErrorToConnectToMysqlCheckInstance=ڈیٹا بیس سے جڑنا ناکام ہوجاتا ہے۔ چیک کریں کہ ڈیٹا بیس سرور چل رہا ہے (مثال کے طور پر، mysql/mariadb کے ساتھ، آپ اسے 'sudo service mysql start' کے ساتھ کمانڈ لائن سے لانچ کر سکتے ہیں)۔
+ErrorFailedToAddContact=رابطہ شامل کرنے میں ناکام
+ErrorDateMustBeBeforeToday=تاریخ آج سے کم ہونی چاہیے۔
+ErrorDateMustBeInFuture=تاریخ آج سے زیادہ ہونی چاہیے۔
+ErrorPaymentModeDefinedToWithoutSetup=ادائیگی کا موڈ %s ٹائپ کرنے کے لیے سیٹ کیا گیا تھا لیکن اس ادائیگی کے موڈ کے لیے ظاہر کرنے کے لیے معلومات کی وضاحت کرنے کے لیے ماڈیول انوائس کا سیٹ اپ مکمل نہیں کیا گیا تھا۔
+ErrorPHPNeedModule=خرابی، اس خصوصیت کو استعمال کرنے کے لیے آپ کے پی ایچ پی میں ماڈیول <b> %s </b> انسٹال ہونا چاہیے۔
+ErrorOpenIDSetupNotComplete=آپ OpenID کی توثیق کی اجازت دینے کے لیے Dolibarr config فائل ترتیب دیتے ہیں، لیکن OpenID سروس کے URL کو مستقل %s میں بیان نہیں کیا گیا ہے۔
+ErrorWarehouseMustDiffers=ماخذ اور ہدف کے گوداموں میں فرق ہونا چاہیے۔
+ErrorBadFormat=خراب فارمیٹ!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=خرابی، یہ رکن ابھی تک کسی تیسرے فریق سے منسلک نہیں ہے۔ انوائس کے ساتھ سبسکرپشن بنانے سے پہلے ممبر کو کسی موجودہ تھرڈ پارٹی سے لنک کریں یا ایک نیا تھرڈ پارٹی بنائیں۔
+ErrorThereIsSomeDeliveries=خرابی، اس شپمنٹ سے کچھ ڈیلیوری منسلک ہیں۔ حذف کرنے سے انکار کر دیا۔
+ErrorCantDeletePaymentReconciliated=ایسی ادائیگی کو حذف نہیں کیا جا سکتا جس نے ایک بینک اندراج تیار کیا تھا جس کا مفاہمت کیا گیا تھا۔
+ErrorCantDeletePaymentSharedWithPayedInvoice=ادائیگی کی حیثیت کے ساتھ کم از کم ایک انوائس کے ذریعے اشتراک کردہ ادائیگی کو حذف نہیں کیا جا سکتا
+ErrorPriceExpression1=مستقل '%s' کو تفویض نہیں کیا جا سکتا
+ErrorPriceExpression2=بلٹ ان فنکشن '%s' کی دوبارہ وضاحت نہیں کی جا سکتی
+ErrorPriceExpression3=فنکشن کی تعریف میں غیر متعینہ متغیر '%s'
+ErrorPriceExpression4=غیر قانونی کردار '%s'
+ErrorPriceExpression5=غیر متوقع '%s'
+ErrorPriceExpression6=دلائل کی غلط تعداد (%s دیا گیا، %s متوقع)
+ErrorPriceExpression8=غیر متوقع آپریٹر '%s'
+ErrorPriceExpression9=ایک غیر متوقع خرابی پیش آگئی
+ErrorPriceExpression10=آپریٹر '%s' میں آپرینڈ کی کمی ہے۔
+ErrorPriceExpression11='%s' کی توقع
+ErrorPriceExpression14=صفر سے تقسیم
+ErrorPriceExpression17=غیر متعینہ متغیر '%s'
+ErrorPriceExpression19=اظہار نہیں ملا
+ErrorPriceExpression20=خالی اظہار
+ErrorPriceExpression21=خالی نتیجہ '%s'
+ErrorPriceExpression22=منفی نتیجہ '%s'
+ErrorPriceExpression23=نامعلوم یا غیر سیٹ متغیر '%s' %s میں
+ErrorPriceExpression24=متغیر '%s' موجود ہے لیکن اس کی کوئی قدر نہیں ہے۔
+ErrorPriceExpressionInternal=اندرونی خرابی '%s'
+ErrorPriceExpressionUnknown=نامعلوم خرابی '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=ماخذ اور ہدف کے گوداموں میں فرق ہونا چاہیے۔
+ErrorTryToMakeMoveOnProductRequiringBatchData=پروڈکٹ '%s' پر لاٹ/سیریل معلومات کے بغیر اسٹاک موومنٹ کرنے کی کوشش میں خرابی
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=اس کارروائی کی اجازت دینے سے پہلے تمام ریکارڈ شدہ استقبالیہ کی تصدیق (منظور یا مسترد) ہونی چاہیے
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=اس کارروائی کی اجازت دینے سے پہلے تمام ریکارڈ شدہ استقبالیہ کی تصدیق (منظور شدہ) ہونی چاہیے۔
+ErrorGlobalVariableUpdater0=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=اکاؤنٹنگ اکاؤنٹ کی قدر سورس لائن id %s (%s) کے لیے متعین نہیں ہے
+ErrorFieldAccountNotDefinedForInvoiceLine=انوائس id %s (%s) کے لیے اکاؤنٹنگ اکاؤنٹ کی قدر کی وضاحت نہیں کی گئی
+ErrorFieldAccountNotDefinedForLine=اکاؤنٹنگ اکاؤنٹ کی قدر لائن کے لیے متعین نہیں ہے (%s)
+ErrorBankStatementNameMustFollowRegex=خرابی، بینک اسٹیٹمنٹ کا نام درج ذیل نحوی اصول %s کی پیروی کرنا چاہیے
+ErrorPhpMailDelivery=چیک کریں کہ آپ وصول کنندگان کی بہت زیادہ تعداد کا استعمال نہیں کرتے ہیں اور یہ کہ آپ کا ای میل مواد اسپام جیسا نہیں ہے۔ مزید مکمل معلومات کے لیے اپنے ایڈمنسٹریٹر سے فائر وال اور سرور لاگ فائلوں کو چیک کرنے کے لیے بھی کہیں۔
+ErrorUserNotAssignedToTask=استعمال شدہ وقت میں داخل ہونے کے قابل ہونے کے لیے صارف کو کام کے لیے تفویض کیا جانا چاہیے۔
+ErrorTaskAlreadyAssigned=کام پہلے ہی صارف کو تفویض کیا گیا ہے۔
+ErrorModuleFileSeemsToHaveAWrongFormat=ایسا لگتا ہے کہ ماڈیول پیکیج کا فارمیٹ غلط ہے۔
+ErrorModuleFileSeemsToHaveAWrongFormat2=ماڈیول کی زپ میں کم از کم ایک لازمی ڈائرکٹری کا ہونا ضروری ہے: <strong> %s </strong> یا <strong> a0ecb2ec87f49fzfz506010
+ErrorFilenameDosNotMatchDolibarrPackageRules=ماڈیول پیکج کا نام ( <strong> %s </strong> ) متوقع نام کے نحو سے مماثل نہیں ہے: <strong> a0ecb2ec87f49fza606019fz
+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=param keyforcontent کے لیے خراب نحو۔ %s یا %s سے شروع ہونے والی قدر ہونی چاہیے
+ErrorVariableKeyForContentMustBeSet=خرابی، نام کے ساتھ مستقل %s (دکھانے کے لیے متنی مواد کے ساتھ) یا %s (دکھانے کے لیے بیرونی یو آر ایل کے ساتھ) سیٹ ہونا ضروری ہے۔
+ErrorURLMustEndWith=URL %s %s ختم ہونا ضروری ہے
+ErrorURLMustStartWithHttp=URL %s http:// یا https:// سے شروع ہونا چاہیے
+ErrorHostMustNotStartWithHttp=میزبان کا نام %s http:// یا https:// سے شروع نہیں ہونا چاہیے
+ErrorNewRefIsAlreadyUsed=خرابی، نیا حوالہ پہلے ہی استعمال ہو چکا ہے۔
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=خرابی، بند انوائس سے منسلک ادائیگی کو حذف کرنا ممکن نہیں ہے۔
+ErrorSearchCriteriaTooSmall=تلاش کا معیار بہت چھوٹا ہے۔
+ErrorObjectMustHaveStatusActiveToBeDisabled=آبجیکٹ کو غیر فعال کرنے کے لیے 'فعال' حیثیت کا ہونا ضروری ہے۔
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=آبجیکٹ کو فعال کرنے کے لیے 'ڈرافٹ' یا 'غیر فعال' کی حیثیت ہونی چاہیے۔
+ErrorNoFieldWithAttributeShowoncombobox=آبجیکٹ '%s' کی تعریف میں کسی بھی فیلڈ میں 'showoncombobox' پراپرٹی نہیں ہے۔ کامبولسٹ کو دکھانے کا کوئی طریقہ نہیں ہے۔
+ErrorFieldRequiredForProduct=پروڈکٹ %s کے لیے فیلڈ '%s' درکار ہے
+ProblemIsInSetupOfTerminal=ٹرمینل %s کے سیٹ اپ میں مسئلہ ہے۔
+ErrorAddAtLeastOneLineFirst=پہلے کم از کم ایک لائن شامل کریں۔
+ErrorRecordAlreadyInAccountingDeletionNotPossible=غلطی، ریکارڈ پہلے ہی اکاؤنٹنگ میں منتقل ہو چکا ہے، حذف کرنا ممکن نہیں ہے۔
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=اگر آپ صفحہ کو کسی اور کے ترجمہ کے طور پر سیٹ کرتے ہیں تو غلطی، زبان لازمی ہے۔
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=خرابی، ترجمہ شدہ صفحہ کی زبان اس سے ایک جیسی ہے۔
+ErrorBatchNoFoundForProductInWarehouse=گودام "%s" میں پروڈکٹ "%s" کے لیے کوئی لاٹ/سیریل نہیں ملا۔
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=گودام "%s" میں پروڈکٹ "%s" کے لیے اس لاٹ/سیریل کے لیے کافی مقدار نہیں ہے۔
+ErrorOnlyOneFieldForGroupByIsPossible='گروپ بذریعہ' کے لیے صرف 1 فیلڈ ممکن ہے (دوسرے کو مسترد کر دیا گیا ہے)
+ErrorTooManyDifferentValueForSelectedGroupBy=فیلڈ ' <b> %s a09a4b73' کے لیے 'a09a4b73' کے بطور گراف استعمال کر سکتے ہیں کے لیے بہت زیادہ مختلف ویلیو (<b> %s </b> سے زیادہ ) ملی۔ فیلڈ 'گروپ از' ہٹا دیا گیا ہے۔ ہوسکتا ہے کہ آپ اسے X-Axis کے طور پر استعمال کرنا چاہتے ہوں؟
+ErrorReplaceStringEmpty=خرابی، جس سٹرنگ کو تبدیل کرنا ہے وہ خالی ہے۔
+ErrorProductNeedBatchNumber=خرابی، پروڈکٹ '<b> %s </b>' بہت زیادہ/سیریل نمبر کی ضرورت ہے
+ErrorProductDoesNotNeedBatchNumber=خرابی، پروڈکٹ '<b> %s </b>' لاٹ/سیریل نمبر قبول نہیں کرتا
+ErrorFailedToReadObject=خرابی، <b> %s </b> قسم کے آبجیکٹ کو پڑھنے میں ناکام
+ErrorParameterMustBeEnabledToAllwoThisFeature=خرابی، پیرامیٹر <b> %s </b> کو <b> conf/conf.php میں فعال ہونا ضروری ہے
+ErrorLoginDateValidity=خرابی، یہ لاگ ان درست تاریخ کی حد سے باہر ہے۔
+ErrorValueLength=فیلڈ کی لمبائی '<b> %s </b>' '<b> %s a09a4b739f' سے زیادہ ہونی چاہیے۔
+ErrorReservedKeyword=لفظ '<b> %s </b>' ایک محفوظ مطلوبہ لفظ ہے۔
+ErrorNotAvailableWithThisDistribution=اس تقسیم کے ساتھ دستیاب نہیں ہے۔
+ErrorPublicInterfaceNotEnabled=عوامی انٹرفیس فعال نہیں تھا۔
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=نئے صفحہ کی زبان کی وضاحت ضروری ہے اگر اسے کسی دوسرے صفحہ کے ترجمہ کے طور پر سیٹ کیا گیا ہو۔
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=نئے صفحہ کی زبان ماخذ کی زبان نہیں ہونی چاہیے اگر اسے کسی دوسرے صفحہ کے ترجمہ کے طور پر سیٹ کیا گیا ہو۔
+ErrorAParameterIsRequiredForThisOperation=اس آپریشن کے لیے ایک پیرامیٹر لازمی ہے۔
+ErrorDateIsInFuture=خرابی، تاریخ مستقبل میں نہیں ہو سکتی
+ErrorAnAmountWithoutTaxIsRequired=غلطی، رقم لازمی ہے۔
+ErrorAPercentIsRequired=غلطی، براہ کرم فیصد درست طریقے سے پُر کریں۔
+ErrorYouMustFirstSetupYourChartOfAccount=آپ کو پہلے اپنے اکاؤنٹ کا چارٹ ترتیب دینا ہوگا۔
+ErrorFailedToFindEmailTemplate=کوڈ نام %s کے ساتھ ٹیمپلیٹ تلاش کرنے میں ناکام
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=سروس پر مدت کی وضاحت نہیں کی گئی ہے۔ فی گھنٹہ قیمت کا حساب لگانے کا کوئی طریقہ نہیں ہے۔
+ErrorActionCommPropertyUserowneridNotDefined=صارف کا مالک درکار ہے۔
+ErrorActionCommBadType=ایونٹ کی قسم کی منتخب کردہ (id: %n، کوڈ: %s) ایونٹ کی قسم ڈکشنری میں موجود نہیں ہے۔
+CheckVersionFail=ورژن کی جانچ ناکام
+ErrorWrongFileName=فائل کے نام میں __SOMETHING__ نہیں ہو سکتا
+ErrorNotInDictionaryPaymentConditions=ادائیگی کی شرائط ڈکشنری میں نہیں ہے، براہ کرم ترمیم کریں۔
+ErrorIsNotADraft=%s ڈرافٹ نہیں ہے۔
+ErrorExecIdFailed=کمانڈ "id" پر عمل نہیں کیا جا سکتا
+ErrorBadCharIntoLoginName=Unauthorized character in the login name
+ErrorRequestTooLarge=Error, request too large
+
+# Warnings
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=آپ کا پی ایچ پی پیرامیٹر upload_max_filesize (%s) PHP پیرامیٹر post_max_size (%s) سے زیادہ ہے۔ یہ ایک مستقل سیٹ اپ نہیں ہے۔
+WarningPasswordSetWithNoAccount=اس ممبر کے لیے پاس ورڈ سیٹ کیا گیا تھا۔ تاہم، کوئی صارف اکاؤنٹ نہیں بنایا گیا تھا۔ لہذا یہ پاس ورڈ محفوظ ہے لیکن اسے Dolibarr میں لاگ ان کرنے کے لیے استعمال نہیں کیا جا سکتا۔ اسے کسی بیرونی ماڈیول/انٹرفیس کے ذریعے استعمال کیا جا سکتا ہے لیکن اگر آپ کو کسی رکن کے لیے کوئی لاگ ان یا پاس ورڈ متعین کرنے کی ضرورت نہیں ہے، تو آپ ممبر ماڈیول سیٹ اپ سے "ہر ممبر کے لیے لاگ ان کا انتظام کریں" کے آپشن کو غیر فعال کر سکتے ہیں۔ اگر آپ کو لاگ ان کا انتظام کرنے کی ضرورت ہے لیکن کسی پاس ورڈ کی ضرورت نہیں ہے، تو آپ اس انتباہ سے بچنے کے لیے اس فیلڈ کو خالی رکھ سکتے ہیں۔ نوٹ: اگر ممبر کسی صارف سے منسلک ہے تو ای میل کو لاگ ان کے طور پر بھی استعمال کیا جا سکتا ہے۔
+WarningMandatorySetupNotComplete=لازمی پیرامیٹرز ترتیب دینے کے لیے یہاں کلک کریں۔
+WarningEnableYourModulesApplications=اپنے ماڈیولز اور ایپلیکیشنز کو فعال کرنے کے لیے یہاں کلک کریں۔
+WarningSafeModeOnCheckExecDir=وارننگ، PHP آپشن <b> safe_mode </b> آن ہے لہذا کمانڈ کو php پیرامیٹر <b> safe_mode_exec_dir a09a4b739f80f17 کے ذریعہ اعلان کردہ ڈائریکٹری کے اندر ذخیرہ کرنا ضروری ہے۔
+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 a049fz0a49fz7f8z0 میں شامل کرکے انسٹالیشن/مائیگریشن ٹولز کو غیر فعال کرنا ہوگا۔ اس فائل کی تخلیق کو چھوڑنا ایک سنگین سیکیورٹی رسک ہے۔
+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=قدر 'سخت' آن لائن ادائیگی کی خصوصیات کو صحیح طریقے سے کام نہیں کرتی ہے۔ اس کے بجائے 'Lax' استعمال کریں۔
+
+# Validate
+RequireValidValue = قدر درست نہیں ہے۔
+RequireAtLeastXString = کم از کم %s حروف کی ضرورت ہے
+RequireXStringMax = زیادہ سے زیادہ %s حروف کی ضرورت ہے۔
+RequireAtLeastXDigits = کم از کم %s ہندسوں کی ضرورت ہے
+RequireXDigitsMax = زیادہ سے زیادہ %s ہندسوں کی ضرورت ہے۔
+RequireValidNumeric = Requires a numeric value
+RequireValidEmail = ای میل ایڈریس درست نہیں ہے۔
+RequireMaxLength = لمبائی %s حروف سے کم ہونی چاہیے۔
+RequireMinLength = لمبائی %s char(s) سے زیادہ ہونی چاہیے
+RequireValidUrl = درست URL درکار ہے۔
+RequireValidDate = ایک درست تاریخ درکار ہے۔
+RequireANotEmptyValue = مطلوب ہے۔
+RequireValidDuration = ایک درست مدت درکار ہے۔
+RequireValidExistingElement = ایک موجودہ قدر درکار ہے۔
+RequireValidBool = ایک درست بولین کی ضرورت ہے۔
+BadSetupOfField = فیلڈ کے خراب سیٹ اپ میں خرابی۔
+BadSetupOfFieldClassNotFoundForValidation = فیلڈ کے سیٹ اپ میں خرابی: توثیق کے لیے کلاس نہیں ملی
+BadSetupOfFieldFileNotFound = فیلڈ کے خراب سیٹ اپ میں خرابی: شمولیت کے لیے فائل نہیں ملی
+BadSetupOfFieldFetchNotCallable = فیلڈ کے خراب سیٹ اپ میں خرابی: کلاس پر کال کے قابل نہیں بازیافت کریں۔
diff --git a/htdocs/langs/ur_PK/eventorganization.lang b/htdocs/langs/ur_PK/eventorganization.lang
new file mode 100644
index 00000000000..8229da5d7ab
--- /dev/null
+++ b/htdocs/langs/ur_PK/eventorganization.lang
@@ -0,0 +1,167 @@
+# 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 = ایونٹ آرگنائزیشن
+EventOrganizationDescription = ماڈیول پروجیکٹ کے ذریعے ایونٹ آرگنائزیشن
+EventOrganizationDescriptionLong= کسی پروگرام کی تنظیم کا نظم کریں (شو، کانفرنسز، شرکاء یا مقررین، تجویز، ووٹ یا رجسٹریشن کے لیے عوامی صفحات کے ساتھ)
+#
+# Menu
+#
+EventOrganizationMenuLeft = منظم تقریبات
+EventOrganizationConferenceOrBoothMenuLeft = کانفرنس یا بوتھ
+
+PaymentEvent=تقریب کی ادائیگی
+
+#
+# Admin page
+#
+NewRegistration=اندراج
+EventOrganizationSetup=ایونٹ آرگنائزیشن سیٹ اپ
+EventOrganization=تقریب کی تنظیم
+Settings=ترتیبات
+EventOrganizationSetupPage = ایونٹ آرگنائزیشن سیٹ اپ صفحہ
+EVENTORGANIZATION_TASK_LABEL = پروجیکٹ کی توثیق ہونے پر خود بخود تخلیق کرنے کے لیے کاموں کا لیبل
+EVENTORGANIZATION_TASK_LABELTooltip = آپ ایک منظم واقعہ کی توثیق کرتے ہیں، بعض کاموں کو خود کار طریقے سے مثال کے منصوبے <br> <br> میں پیدا کیا جا سکتا ہے: کانفرنس کے <br> بھیجیں کال <br> کانفرنسوں <br> بوتھ کے لئے کال وصول بھیجیں <br> شرکاء کے لئے واقعات کو کھولیں سبسکرپشنز <br> لئے کال وصول بوتھ کے لئے کال ارسال <br> مقررین کو ایونٹ کی یاد دلائیں <br> بوتھ ہوسٹر کو ایونٹ کی یاد دہانی بھیجیں
+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_EVENT = کسی تقریب میں رجسٹریشن کے بعد بھیجنے کے لیے ای میل کا ٹیمپلیٹ ادا ہو چکا ہے۔
+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= کانفرنس یا بوتھ
+ManageOrganizeEvent = ایونٹ کی تنظیم کا نظم کریں۔
+ConferenceOrBooth = کانفرنس یا بوتھ
+ConferenceOrBoothTab = کانفرنس یا بوتھ
+AmountPaid = رقم ادا کر دی
+DateOfRegistration = رجسٹریشن کی تاریخ
+ConferenceOrBoothAttendee = کانفرنس یا بوتھ اٹینڈی
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = کانفرنس کے لیے آپ کی درخواست موصول ہو گئی۔
+YourOrganizationEventBoothRequestWasReceived = بوتھ کے لیے آپ کی درخواست موصول ہوئی تھی۔
+EventOrganizationEmailAskConf = کانفرنس کی درخواست
+EventOrganizationEmailAskBooth = بوتھ کی درخواست
+EventOrganizationEmailBoothPayment = اپنے بوتھ کی ادائیگی
+EventOrganizationEmailRegistrationPayment = ایک تقریب کے لیے رجسٹریشن
+EventOrganizationMassEmailAttendees = شرکاء کے لیے مواصلت
+EventOrganizationMassEmailSpeakers = مقررین سے مواصلت
+ToSpeakers=To speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=لوگوں کو کانفرنسیں تجویز کرنے دیں۔
+AllowUnknownPeopleSuggestConfHelp=نامعلوم لوگوں کو ایک کانفرنس تجویز کرنے کی اجازت دیں جو وہ کرنا چاہتے ہیں۔
+AllowUnknownPeopleSuggestBooth=لوگوں کو بوتھ کے لیے درخواست دینے کی اجازت دیں۔
+AllowUnknownPeopleSuggestBoothHelp=نامعلوم افراد کو بوتھ کے لیے درخواست دینے کی اجازت دیں۔
+PriceOfRegistration=رجسٹریشن کی قیمت
+PriceOfRegistrationHelp=رجسٹر کرنے یا ایونٹ میں شرکت کے لیے ادا کرنے کی قیمت
+PriceOfBooth=ایک بوتھ کھڑا کرنے کے لیے سبسکرپشن کی قیمت
+PriceOfBoothHelp=ایک بوتھ کھڑے کرنے کے لئے سبسکرپشن کی قیمت
+EventOrganizationICSLink=Link ICS for conferences
+ConferenceOrBoothInformation=کانفرنس یا بوتھ کی معلومات
+Attendees=حاضرین
+ListOfAttendeesOfEvent=ایونٹ پروجیکٹ کے شرکاء کی فہرست
+DownloadICSLink = ICS لنک ڈاؤن لوڈ کریں۔
+EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
+SERVICE_BOOTH_LOCATION = بوتھ کے مقام کے بارے میں انوائس قطار کے لیے استعمال کی جانے والی سروس
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
+NbVotes=ووٹوں کی تعداد
+#
+# Status
+#
+EvntOrgDraft = مسودہ
+EvntOrgSuggested = تجویز کردہ
+EvntOrgConfirmed = تصدیق شدہ
+EvntOrgNotQualified = نا اہل
+EvntOrgDone = ہو گیا
+EvntOrgCancelled = منسوخ
+#
+# Public page
+#
+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=اندراج
+OrganizationEventConfRequestWasReceived=کانفرنس کے لیے آپ کی تجویز موصول ہوئی ہے۔
+OrganizationEventBoothRequestWasReceived=بوتھ کے لیے آپ کی درخواست موصول ہو گئی ہے۔
+OrganizationEventPaymentOfBoothWasReceived=آپ کے بوتھ کے لیے آپ کی ادائیگی ریکارڈ کی گئی ہے۔
+OrganizationEventPaymentOfRegistrationWasReceived=آپ کے ایونٹ کے رجسٹریشن کے لیے آپ کی ادائیگی ریکارڈ کر لی گئی ہے۔
+OrganizationEventBulkMailToAttendees=یہ ایک حاضری کے طور پر ایونٹ میں آپ کی شرکت کے بارے میں ایک یاد دہانی ہے۔
+OrganizationEventBulkMailToSpeakers=یہ ایک مقرر کی حیثیت سے تقریب میں آپ کی شرکت کی یاد دہانی ہے۔
+OrganizationEventLinkToThirdParty=فریق ثالث سے لنک کریں (کسٹمر، سپلائر یا پارٹنر)
+
+NewSuggestionOfBooth=بوتھ کے لیے درخواست
+NewSuggestionOfConference=کانفرنس کے لیے درخواست
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = کانفرنس یا بوتھ تجویز کے صفحے پر خوش آمدید۔
+EvntOrgRegistrationConfWelcomeMessage = کانفرنس کے تجویز والے صفحے پر خوش آمدید۔
+EvntOrgRegistrationBoothWelcomeMessage = بوتھ تجویز کے صفحے پر خوش آمدید۔
+EvntOrgVoteHelpMessage = یہاں، آپ پروجیکٹ کے لیے تجویز کردہ ایونٹس کو دیکھ اور ووٹ دے سکتے ہیں۔
+VoteOk = آپ کا ووٹ قبول کر لیا گیا ہے۔
+AlreadyVoted = آپ پہلے ہی اس ایونٹ کے لیے ووٹ دے چکے ہیں۔
+VoteError = ووٹنگ کے دوران ایک خرابی پیش آگئی، براہ کرم دوبارہ کوشش کریں۔
+
+SubscriptionOk = آپ کی رجسٹریشن کی توثیق کر دی گئی ہے۔
+ConfAttendeeSubscriptionConfirmation = کسی تقریب میں آپ کی رکنیت کی تصدیق
+Attendee = حاضری
+PaymentConferenceAttendee = کانفرنس کے شرکاء کی ادائیگی
+PaymentBoothLocation = بوتھ کے مقام کی ادائیگی
+DeleteConferenceOrBoothAttendee=شرکت کنندہ کو ہٹا دیں۔
+RegistrationAndPaymentWereAlreadyRecorder=ای میل <b> %s </b> کے لیے رجسٹریشن اور ادائیگی پہلے ہی ریکارڈ کی گئی تھی۔
+EmailAttendee=حاضری کا ای میل
+EmailCompanyForInvoice=کمپنی کا ای میل (انوائس کے لیے، اگر حاضری کے ای میل سے مختلف ہو)
+ErrorSeveralCompaniesWithEmailContactUs=اس ای میل کے ساتھ کئی کمپنیاں مل گئی ہیں لہذا ہم آپ کی رجسٹریشن کو خودکار طور پر درست نہیں کر سکتے۔ براہ کرم دستی توثیق کے لیے ہم سے %s پر رابطہ کریں۔
+ErrorSeveralCompaniesWithNameContactUs=اس نام کی کئی کمپنیاں ملی ہیں اس لیے ہم آپ کی رجسٹریشن کو خودکار طور پر درست نہیں کر سکتے۔ براہ کرم دستی توثیق کے لیے ہم سے %s پر رابطہ کریں۔
+NoPublicActionsAllowedForThisEvent=اس تقریب کے لیے عوام کے لیے کوئی عوامی کارروائی نہیں ہے۔
diff --git a/htdocs/langs/ur_PK/exports.lang b/htdocs/langs/ur_PK/exports.lang
new file mode 100644
index 00000000000..ba8d192060d
--- /dev/null
+++ b/htdocs/langs/ur_PK/exports.lang
@@ -0,0 +1,137 @@
+# Dolibarr language file - Source file is en_US - exports
+ExportsArea=برآمدات
+ImportArea=درآمد کریں۔
+NewExport=نئی ایکسپورٹ
+NewImport=نئی درآمد
+ExportableDatas=قابل برآمد ڈیٹاسیٹ
+ImportableDatas=قابل درآمد ڈیٹاسیٹ
+SelectExportDataSet=ڈیٹا سیٹ کا انتخاب کریں جسے آپ برآمد کرنا چاہتے ہیں...
+SelectImportDataSet=ڈیٹا سیٹ کا انتخاب کریں جسے آپ درآمد کرنا چاہتے ہیں...
+SelectExportFields=وہ فیلڈز منتخب کریں جنہیں آپ ایکسپورٹ کرنا چاہتے ہیں، یا پہلے سے طے شدہ ایکسپورٹ پروفائل منتخب کریں۔
+SelectImportFields=اینکر %s کے ساتھ اوپر اور نیچے منتقل کرکے ڈیٹا بیس میں ان سورس فائل فیلڈز اور ان کے ٹارگٹ فیلڈ کو منتخب کریں جنہیں آپ امپورٹ کرنا چاہتے ہیں، یا پہلے سے طے شدہ امپورٹ پروفائل منتخب کریں:
+NotImportedFields=سورس فائل کے فیلڈز درآمد نہیں کیے گئے۔
+SaveExportModel=اپنے انتخاب کو ایکسپورٹ پروفائل/ٹیمپلیٹ کے طور پر محفوظ کریں (دوبارہ استعمال کے لیے)۔
+SaveImportModel=اس درآمدی پروفائل کو محفوظ کریں (دوبارہ استعمال کے لیے)...
+ExportModelName=پروفائل کا نام برآمد کریں۔
+ExportModelSaved=ایکسپورٹ پروفائل کو <b> %s </b> کے بطور محفوظ کیا گیا۔
+ExportableFields=قابل برآمد فیلڈز
+ExportedFields=برآمد شدہ فیلڈز
+ImportModelName=پروفائل کا نام درآمد کریں۔
+ImportModelSaved=امپورٹ پروفائل کو <b> %s </b> کے بطور محفوظ کیا گیا۔
+DatasetToExport=برآمد کرنے کے لیے ڈیٹا سیٹ
+DatasetToImport=ڈیٹاسیٹ میں فائل درآمد کریں۔
+ChooseFieldsOrdersAndTitle=فیلڈز آرڈر کا انتخاب کریں...
+FieldsTitle=فیلڈز کا عنوان
+FieldTitle=فیلڈ ٹائٹل
+NowClickToGenerateToBuildExportFile=اب، کومبو باکس میں فائل فارمیٹ کو منتخب کریں اور ایکسپورٹ فائل بنانے کے لیے "جنریٹ" پر کلک کریں۔
+AvailableFormats=دستیاب فارمیٹس
+LibraryShort=کتب خانہ
+ExportCsvSeparator=Csv کریکٹر الگ کرنے والا
+ImportCsvSeparator=Csv کریکٹر الگ کرنے والا
+Step=قدم
+FormatedImport=اسسٹنٹ درآمد کریں۔
+FormatedImportDesc1=یہ ماڈیول آپ کو اسسٹنٹ کا استعمال کرتے ہوئے، تکنیکی معلومات کے بغیر فائل سے موجودہ ڈیٹا کو اپ ڈیٹ کرنے یا ڈیٹا بیس میں نئی اشیاء شامل کرنے کی اجازت دیتا ہے۔
+FormatedImportDesc2=پہلا قدم یہ ہے کہ آپ جس قسم کے ڈیٹا کو درآمد کرنا چاہتے ہیں اس کا انتخاب کریں، پھر سورس فائل کا فارمیٹ، پھر وہ فیلڈز جو آپ درآمد کرنا چاہتے ہیں۔
+FormatedExport=ایکسپورٹ اسسٹنٹ
+FormatedExportDesc1=یہ ٹولز اسسٹنٹ کا استعمال کرتے ہوئے ذاتی ڈیٹا برآمد کرنے کی اجازت دیتے ہیں، تاکہ تکنیکی معلومات کی ضرورت کے بغیر آپ کو اس عمل میں مدد ملے۔
+FormatedExportDesc2=پہلا قدم پہلے سے طے شدہ ڈیٹاسیٹ کا انتخاب کرنا ہے، پھر آپ کن فیلڈز کو ایکسپورٹ کرنا چاہتے ہیں، اور کس ترتیب میں۔
+FormatedExportDesc3=جب برآمد کرنے کے لیے ڈیٹا منتخب کیا جاتا ہے، تو آپ آؤٹ پٹ فائل کا فارمیٹ منتخب کر سکتے ہیں۔
+Sheet=چادر
+NoImportableData=کوئی درآمدی ڈیٹا نہیں (ڈیٹا کی درآمد کی اجازت دینے کے لیے تعریفوں والا کوئی ماڈیول نہیں)
+FileSuccessfullyBuilt=فائل تیار کی گئی۔
+SQLUsedForExport=ڈیٹا نکالنے کے لیے استعمال ہونے والی SQL درخواست
+LineId=لائن کی شناخت
+LineLabel=لائن کا لیبل
+LineDescription=لائن کی تفصیل
+LineUnitPrice=لائن کی یونٹ قیمت
+LineVATRate=لائن کی VAT شرح
+LineQty=لائن کے لئے مقدار
+LineTotalHT=رقم کے علاوہ لائن کے لئے ٹیکس
+LineTotalTTC=لائن کے لیے ٹیکس کے ساتھ رقم
+LineTotalVAT=لائن کے لیے VAT کی رقم
+TypeOfLineServiceOrProduct=لائن کی قسم (0=پروڈکٹ، 1=سروس)
+FileWithDataToImport=درآمد کرنے کے لیے ڈیٹا کے ساتھ فائل کریں۔
+FileToImport=درآمد کرنے کے لیے سورس فائل
+FileMustHaveOneOfFollowingFormat=درآمد کرنے کے لیے فائل میں درج ذیل فارمیٹس میں سے ایک ہونا ضروری ہے۔
+DownloadEmptyExample=فیلڈ مواد کی معلومات کے ساتھ ٹیمپلیٹ فائل ڈاؤن لوڈ کریں۔
+StarAreMandatory=* لازمی فیلڈز ہیں۔
+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=درآمد شدہ ڈیٹا میں اس درآمدی id کے ساتھ ہر ڈیٹابیس ٹیبل میں ایک اضافی فیلڈ ہوگی: <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> سے آنے والی قدر کو استعمال کرنے کے لیے پیرنٹ آبجیکٹ کی id تلاش کرنے کے لیے استعمال کیا جائے گا (لہذا آبجیکٹ <b> a0ecb2ec87f49f49f77fz کے پاس موجود فائل میں موجود ڈیٹا ہے)۔
+DataComeFromIdFoundFromCodeId=کوڈ جو ماخذ فائل کے فیلڈ نمبر <b> %s </b> سے آتا ہے استعمال کرنے کے لیے پیرنٹ آبجیکٹ کی شناخت تلاش کرنے کے لیے استعمال کیا جائے گا (لہذا ماخذ فائل کا کوڈ لغت میں موجود ہونا چاہیے نوٹ کریں کہ اگر آپ کو آئی ڈی معلوم ہے تو آپ اسے کوڈ کے بجائے سورس فائل میں بھی استعمال کر سکتے ہیں۔ درآمد دونوں صورتوں میں کام کرنا چاہئے.
+DataIsInsertedInto=سورس فائل سے آنے والا ڈیٹا درج ذیل فیلڈ میں داخل کیا جائے گا:
+DataIDSourceIsInsertedInto=پیرنٹ آبجیکٹ کی آئی ڈی، جو سورس فائل میں ڈیٹا کا استعمال کرتے ہوئے پائی گئی تھی، درج ذیل فیلڈ میں ڈالی جائے گی:
+DataCodeIDSourceIsInsertedInto=پیرنٹ لائن کی آئی ڈی، جو کوڈ سے ملی تھی، درج ذیل فیلڈ میں ڈالی جائے گی:
+SourceRequired=ڈیٹا ویلیو لازمی ہے۔
+SourceExample=ممکنہ ڈیٹا ویلیو کی مثال
+ExampleAnyRefFoundIntoElement=عنصر <b> %s </b> کے لیے کوئی بھی حوالہ ملا
+ExampleAnyCodeOrIdFoundIntoDictionary=ڈکشنری <b> %s </b> میں کوئی کوڈ (یا id) ملا
+CSVFormatDesc= <b> کوما سے الگ کردہ قدر </b> فائل فارمیٹ (.csv)۔ <br> یہ ایک ٹیکسٹ فائل فارمیٹ ہے جہاں فیلڈز کو الگ کرنے والے کے ذریعے الگ کیا جاتا ہے [ %s ]۔ اگر الگ کرنے والا کسی فیلڈ کے مواد کے اندر پایا جاتا ہے، تو فیلڈ کو گول کریکٹر [ %s ] سے گول کیا جاتا ہے۔ گول کریکٹر سے بچنے کے لیے Escape کریکٹر ہے [ %s ]۔
+Excel95FormatDesc= <b> Excel </b> فائل فارمیٹ (.xls) <br> یہ مقامی Excel 95 فارمیٹ (BIFF5) ہے۔
+Excel2007FormatDesc= <b> Excel </b> فائل فارمیٹ (.xlsx) <br> یہ مقامی Excel 2007 فارمیٹ (SpreadsheetML) ہے۔
+TsvFormatDesc= <b> ٹیب الگ شدہ قدر </b> فائل فارمیٹ (.tsv) <br> یہ ایک ٹیکسٹ فائل فارمیٹ ہے جہاں فیلڈز کو ٹیبلیٹر [ٹیب] کے ذریعے الگ کیا جاتا ہے۔
+ExportFieldAutomaticallyAdded=فیلڈ <b> %s </b> خود بخود شامل ہو گیا۔ یہ آپ کو ڈپلیکیٹ ریکارڈ کے طور پر ماننے کے لیے ایک جیسی لائنیں رکھنے سے گریز کرے گا (اس فیلڈ کو شامل کرنے کے ساتھ، تمام لائنیں اپنی شناخت کی مالک ہوں گی اور مختلف ہوں گی)۔
+CsvOptions=CSV فارمیٹ کے اختیارات
+Separator=فیلڈ الگ کرنے والا
+Enclosure=سٹرنگ ڈیلیمیٹر
+SpecialCode=خصوصی کوڈ
+ExportStringFilter=%% متن میں ایک یا زیادہ حروف کو تبدیل کرنے کی اجازت دیتا ہے
+ExportDateFilter=YYYY، YYYYMM، YYYYMMDD: فلٹرز ایک سال/ماہ/دن کے حساب سے اگلے سال/مہینے/دن
+ExportNumericFilter=NNNNN فلٹرز ایک قدر کے لحاظ سے
+ImportFromLine=لائن نمبر سے شروع ہونے والی درآمد
+EndAtLineNb=لائن نمبر پر ختم کریں۔
+ImportFromToLine=حد کی حد (سے - تک)۔ مثلاً ہیڈر لائن کو چھوڑنے کے لیے۔
+SetThisValueTo2ToExcludeFirstLine=مثال کے طور پر، 2 پہلی لائنوں کو خارج کرنے کے لیے اس قدر کو 3 پر سیٹ کریں۔ <br> اگر ہیڈر لائنوں کو نہیں چھوڑا جاتا ہے، تو اس کے نتیجے میں امپورٹ سمولیشن میں متعدد خرابیاں پیدا ہوں گی۔
+KeepEmptyToGoToEndOfFile=فائل کے آخر تک تمام لائنوں پر کارروائی کرنے کے لیے اس فیلڈ کو خالی رکھیں۔
+SelectPrimaryColumnsForUpdateAttempt=اپ ڈیٹ درآمد کے لیے بنیادی کلید کے طور پر استعمال کرنے کے لیے کالم منتخب کریں۔
+UpdateNotYetSupportedForThisImport=اس قسم کی درآمد کے لیے اپ ڈیٹ تعاون یافتہ نہیں ہے (صرف داخل کریں)
+NoUpdateAttempt=اپ ڈیٹ کی کوئی کوشش نہیں کی گئی، صرف داخل کریں۔
+ImportDataset_user_1=صارفین (ملازمین یا نہیں) اور خصوصیات
+ComputedField=شمار شدہ فیلڈ
+## filters
+SelectFilterFields=اگر آپ کچھ قدروں پر فلٹر کرنا چاہتے ہیں، تو یہاں صرف اقدار درج کریں۔
+FilteredFields=فلٹر شدہ فیلڈز
+FilteredFieldsValues=فلٹر کی قدر
+FormatControlRule=فارمیٹ کنٹرول اصول
+## imports updates
+KeysToUseForUpdates=<b> </b> موجودہ ڈیٹا کو اپ ڈیٹ کرنے کے لیے استعمال کرنے کے لیے کلید (کالم)
+NbInsert=داخل کردہ لائنوں کی تعداد: %s
+NbUpdate=اپ ڈیٹ کردہ لائنوں کی تعداد: %s
+MultipleRecordFoundWithTheseFilters=ان فلٹرز کے ساتھ متعدد ریکارڈز ملے ہیں: %s
+StocksWithBatch=بیچ/سیریل نمبر والی مصنوعات کا اسٹاک اور مقام (گودام)
diff --git a/htdocs/langs/ur_PK/externalsite.lang b/htdocs/langs/ur_PK/externalsite.lang
new file mode 100644
index 00000000000..6663e35aa30
--- /dev/null
+++ b/htdocs/langs/ur_PK/externalsite.lang
@@ -0,0 +1,5 @@
+# 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
new file mode 100644
index 00000000000..26c4647aa20
--- /dev/null
+++ b/htdocs/langs/ur_PK/ftp.lang
@@ -0,0 +1,14 @@
+# 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/help.lang b/htdocs/langs/ur_PK/help.lang
new file mode 100644
index 00000000000..d0408469009
--- /dev/null
+++ b/htdocs/langs/ur_PK/help.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=فورم/وکی سپورٹ
+EMailSupport=ای میلز سپورٹ
+RemoteControlSupport=آن لائن ریئل ٹائم / ریموٹ سپورٹ
+OtherSupport=دیگر سپورٹ
+ToSeeListOfAvailableRessources=دستیاب وسائل سے رابطہ کرنے/دیکھنے کے لیے:
+HelpCenter=مدداور تعاون کا مرکز
+DolibarrHelpCenter=ڈولیبر ہیلپ اینڈ سپورٹ سینٹر
+ToGoBackToDolibarr=دوسری صورت میں، <a href="%s"> Dolibarr </a> استعمال کرنا جاری رکھنے کے لیے یہاں کلک کریں۔
+TypeOfSupport=سپورٹ کی قسم
+TypeSupportCommunauty=کمیونٹی (مفت)
+TypeSupportCommercial=کمرشل
+TypeOfHelp=قسم
+NeedHelpCenter=مدد یا مدد کی ضرورت ہے؟
+Efficiency=کارکردگی
+TypeHelpOnly=صرف مدد کریں۔
+TypeHelpDev=مدد + ترقی
+TypeHelpDevForm=مدد + ترقی + تربیت
+BackToHelpCenter=بصورت دیگر، <a href="%s"> ہیلپ سنٹر کے ہوم پیج پر واپس جائیں </a>۔
+LinkToGoldMember=آپ اپنی زبان (%s) کے لیے Dolibarr کے منتخب کردہ ٹرینرز میں سے کسی ایک کو ان کے ویجیٹ پر کلک کر کے کال کر سکتے ہیں (اسٹیٹس اور زیادہ سے زیادہ قیمت خود بخود اپ ڈیٹ ہو جاتی ہے):
+PossibleLanguages=معاون زبانیں۔
+SubscribeToFoundation=Dolibarr پروجیکٹ میں مدد کریں، فاؤنڈیشن کو سبسکرائب کریں۔
+SeeOfficalSupport=آپ کی زبان میں آفیشل ڈولیبر سپورٹ کے لیے: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> a09a4b739f170f
diff --git a/htdocs/langs/ur_PK/holiday.lang b/htdocs/langs/ur_PK/holiday.lang
new file mode 100644
index 00000000000..da01ba7ce46
--- /dev/null
+++ b/htdocs/langs/ur_PK/holiday.lang
@@ -0,0 +1,139 @@
+# Dolibarr language file - Source file is en_US - holiday
+HRM=HRM
+Holidays=چھوڑو
+CPTitreMenu=چھوڑو
+MenuReportMonth=ماہانہ بیان
+MenuAddCP=چھٹی کی نئی درخواست
+NotActiveModCP=اس صفحہ کو دیکھنے کے لیے آپ کو ماڈیول Leave کو فعال کرنا ہوگا۔
+AddCP=چھٹی کی درخواست کریں۔
+DateDebCP=شروع کرنے کی تاریخ
+DateFinCP=آخری تاریخ
+DraftCP=مسودہ
+ToReviewCP=منظوری کا انتظار ہے۔
+ApprovedCP=منظورشدہ
+CancelCP=منسوخ
+RefuseCP=انکار کر دیا
+ValidatorCP=منظور کرنے والا
+ListeCP=رخصت کی فہرست
+Leave=درخواست چھوڑ دیں۔
+LeaveId=ID چھوڑ دیں۔
+ReviewedByCP=کی طرف سے منظور کیا جائے گا
+UserID=صارف کی شناخت
+UserForApprovalID=منظوری ID کے لیے صارف
+UserForApprovalFirstname=منظوری صارف کا پہلا نام
+UserForApprovalLastname=منظوری صارف کا آخری نام
+UserForApprovalLogin=منظوری صارف کا لاگ ان
+DescCP=تفصیل
+SendRequestCP=چھٹی کی درخواست بنائیں
+DelayToRequestCP=چھٹی کی درخواستیں کم از کم <b> %s دن (s) </b> سے پہلے کی جانی چاہئیں۔
+MenuConfCP=چھٹی کا توازن
+SoldeCPUser=بیلنس چھوڑیں (دنوں میں) <b> %s </b>
+ErrorEndDateCP=آپ کو ایک اختتامی تاریخ منتخب کرنا ہوگی جو تاریخ آغاز سے بڑی ہو۔
+ErrorSQLCreateCP=تخلیق کے دوران ایک ایس کیو ایل کی خرابی واقع ہوئی:
+ErrorIDFicheCP=ایک خرابی پیش آ گئی ہے، چھٹی کی درخواست موجود نہیں ہے۔
+ReturnCP=پچھلے صفحے پر واپس جائیں
+ErrorUserViewCP=آپ اس چھٹی کی درخواست کو پڑھنے کے مجاز نہیں ہیں۔
+InfosWorkflowCP=انفارمیشن ورک فلو
+RequestByCP=کی طرف سے درخواست
+TitreRequestCP=درخواست چھوڑ دیں۔
+TypeOfLeaveId=چھٹی کی شناخت کی قسم
+TypeOfLeaveCode=چھٹی کوڈ کی قسم
+TypeOfLeaveLabel=چھٹی کے لیبل کی قسم
+NbUseDaysCP=استعمال شدہ چھٹی کے دنوں کی تعداد
+NbUseDaysCPHelp=حساب کتاب غیر کام کے دنوں اور لغت میں بیان کردہ تعطیلات کو مدنظر رکھتا ہے۔
+NbUseDaysCPShort=چھٹی کے دن
+NbUseDaysCPShortInMonth=مہینے میں چھٹی کے دن
+DayIsANonWorkingDay=%s ایک غیر کام کا دن ہے۔
+DateStartInMonth=مہینے میں شروع ہونے کی تاریخ
+DateEndInMonth=مہینے میں اختتامی تاریخ
+EditCP=ترمیم
+DeleteCP=حذف کریں۔
+ActionRefuseCP=انکار
+ActionCancelCP=منسوخ کریں۔
+StatutCP=حالت
+TitleDeleteCP=چھٹی کی درخواست کو حذف کریں۔
+ConfirmDeleteCP=اس چھٹی کی درخواست کو حذف کرنے کی تصدیق کریں؟
+ErrorCantDeleteCP=غلطی آپ کو اس چھٹی کی درخواست کو حذف کرنے کا حق نہیں ہے۔
+CantCreateCP=آپ کو چھٹی کی درخواستیں کرنے کا حق نہیں ہے۔
+InvalidValidatorCP=آپ کو اپنی چھٹی کی درخواست کے لیے منظور کنندہ کا انتخاب کرنا چاہیے۔
+NoDateDebut=آپ کو شروع کی تاریخ کا انتخاب کرنا ہوگا۔
+NoDateFin=آپ کو ایک اختتامی تاریخ منتخب کرنی ہوگی۔
+ErrorDureeCP=آپ کی چھٹی کی درخواست میں کام کا دن شامل نہیں ہے۔
+TitleValidCP=چھٹی کی درخواست منظور کریں۔
+ConfirmValidCP=کیا آپ واقعی چھٹی کی درخواست کو منظور کرنا چاہتے ہیں؟
+DateValidCP=منظور شدہ تاریخ
+TitleToValidCP=چھٹی کی درخواست بھیجیں۔
+ConfirmToValidCP=کیا آپ واقعی چھٹی کی درخواست بھیجنا چاہتے ہیں؟
+TitleRefuseCP=چھٹی کی درخواست کو مسترد کریں۔
+ConfirmRefuseCP=کیا آپ واقعی چھٹی کی درخواست کو مسترد کرنا چاہتے ہیں؟
+NoMotifRefuseCP=آپ کو درخواست کو مسترد کرنے کی وجہ کا انتخاب کرنا ہوگا۔
+TitleCancelCP=چھٹی کی درخواست منسوخ کریں۔
+ConfirmCancelCP=کیا آپ واقعی چھٹی کی درخواست منسوخ کرنا چاہتے ہیں؟
+DetailRefusCP=انکار کی وجہ
+DateRefusCP=انکار کی تاریخ
+DateCancelCP=منسوخی کی تاریخ
+DefineEventUserCP=کسی صارف کے لیے غیر معمولی چھٹی تفویض کریں۔
+addEventToUserCP=چھٹی تفویض کریں۔
+NotTheAssignedApprover=آپ تفویض کردہ منظور کنندہ نہیں ہیں۔
+MotifCP=وجہ
+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=چھٹی مختص کی آخری خودکار اپ ڈیٹ
+MonthOfLastMonthlyUpdate=چھٹی مختص کی آخری خودکار اپ ڈیٹ کا مہینہ
+UpdateConfCPOK=کامیابی سے اپ ڈیٹ ہو گیا۔
+Module27130Name= چھٹی کی درخواستوں کا انتظام
+Module27130Desc= چھٹی کی درخواستوں کا انتظام
+ErrorMailNotSend=ای میل بھیجتے وقت ایک خرابی پیش آگئی:
+NoticePeriod=نوٹس کی مدت
+#Messages
+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=پی ڈی ایف پر مفت متن
+WatermarkOnDraftHolidayCards=ڈرافٹ چھٹی کی درخواستوں پر واٹر مارکس
+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
new file mode 100644
index 00000000000..dd5c8e817cd
--- /dev/null
+++ b/htdocs/langs/ur_PK/hrm.lang
@@ -0,0 +1,81 @@
+# Dolibarr language file - en_US - hrm
+
+
+# Admin
+HRM_EMAIL_EXTERNAL_SERVICE=HRM بیرونی سروس کو روکنے کے لیے ای میل
+Establishments=اسٹیبلشمنٹس
+Establishment=اسٹیبلشمنٹ
+NewEstablishment=نئی اسٹیبلشمنٹ
+DeleteEstablishment=اسٹیبلشمنٹ کو حذف کریں۔
+ConfirmDeleteEstablishment=کیا آپ واقعی اس اسٹیبلشمنٹ کو حذف کرنا چاہتے ہیں؟
+OpenEtablishment=کھلی اسٹیبلشمنٹ
+CloseEtablishment=بند اسٹیبلشمنٹ
+# Dictionary
+DictionaryPublicHolidays=چھٹی - عوامی تعطیلات
+DictionaryDepartment=HRM - محکمہ کی فہرست
+DictionaryFunction=HRM - ملازمت کی پوزیشنیں۔
+# Module
+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=رینک محفوظ کریں۔
+knowHow=جانتے ہیں کہ کس طرح
+HowToBe=کیسے بننا ہے۔
+knowledge=علم
+AbandonmentComment=ترک تبصرہ
+DateLastEval=آخری تشخیص کی تاریخ
+NoEval=اس ملازم کی کوئی تشخیص نہیں کی گئی۔
+HowManyUserWithThisMaxNote=اس رینک والے صارفین کی تعداد
+HighestRank=اعلیٰ ترین عہدہ
+SkillComparison=مہارت کا موازنہ
diff --git a/htdocs/langs/ur_PK/install.lang b/htdocs/langs/ur_PK/install.lang
new file mode 100644
index 00000000000..e8847af94c0
--- /dev/null
+++ b/htdocs/langs/ur_PK/install.lang
@@ -0,0 +1,219 @@
+# Dolibarr language file - Source file is en_US - install
+InstallEasy=صرف قدم بہ قدم ہدایات پر عمل کریں۔
+MiscellaneousChecks=پیشگی شرائط چیک کریں۔
+ConfFileExists=کنفیگریشن فائل <b> %s </b> موجود ہے۔
+ConfFileDoesNotExistsAndCouldNotBeCreated=کنفیگریشن فائل <b> %s </b> موجود نہیں ہے اور اسے بنایا نہیں جا سکتا!
+ConfFileCouldBeCreated=کنفیگریشن فائل <b> %s </b> بنائی جا سکتی ہے۔
+ConfFileIsNotWritable=کنفیگریشن فائل <b> %s </b> قابل تحریر نہیں ہے۔ اجازتیں چیک کریں۔ پہلے انسٹال کرنے کے لیے، آپ کے ویب سرور کو کنفیگریشن کے عمل کے دوران اس فائل میں لکھنے کے قابل ہونا چاہیے ("chmod 666" مثال کے طور پر OS جیسے Unix پر)۔
+ConfFileIsWritable=کنفیگریشن فائل <b> %s </b> قابل تحریر ہے۔
+ConfFileMustBeAFileNotADir=کنفیگریشن فائل <b> %s </b> فائل ہونی چاہیے، ڈائریکٹری نہیں۔
+ConfFileReload=کنفیگریشن فائل سے پیرامیٹرز کو دوبارہ لوڈ کرنا۔
+PHPSupportPOSTGETOk=یہ پی ایچ پی متغیر POST اور GET کو سپورٹ کرتا ہے۔
+PHPSupportPOSTGETKo=یہ ممکن ہے کہ آپ کا پی ایچ پی سیٹ اپ متغیرات POST اور/یا GET کو سپورٹ نہ کرے۔ php.ini میں <b> variables_order </b> پیرامیٹر چیک کریں۔
+PHPSupportSessions=یہ پی ایچ پی سیشن کو سپورٹ کرتا ہے۔
+PHPSupport=یہ پی ایچ پی %s فنکشنز کو سپورٹ کرتا ہے۔
+PHPMemoryOK=آپ کی پی ایچ پی کی زیادہ سے زیادہ سیشن میموری <b> %s </b> پر سیٹ ہے۔ یہ کافی ہونا چاہئے۔
+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=واپس جائیں اور پیرامیٹرز کو چیک/درست کریں۔
+ErrorWrongValueForParameter=ہو سکتا ہے آپ نے پیرامیٹر '%s' کے لیے غلط ویلیو ٹائپ کی ہو۔
+ErrorFailedToCreateDatabase=ڈیٹا بیس '%s' بنانے میں ناکام۔
+ErrorFailedToConnectToDatabase=ڈیٹا بیس '%s' سے جڑنے میں ناکام۔
+ErrorDatabaseVersionTooLow=ڈیٹا بیس ورژن (%s) بہت پرانا ہے۔ ورژن %s یا اس سے زیادہ درکار ہے۔
+ErrorPHPVersionTooLow=پی ایچ پی ورژن بہت پرانا ہے۔ ورژن %s درکار ہے۔
+ErrorConnectedButDatabaseNotFound=سرور سے کنکشن کامیاب لیکن ڈیٹا بیس '%s' نہیں ملا۔
+ErrorDatabaseAlreadyExists=ڈیٹا بیس '%s' پہلے سے موجود ہے۔
+IfDatabaseNotExistsGoBackAndUncheckCreate=اگر ڈیٹا بیس موجود نہیں ہے تو واپس جائیں اور "Create database" کے آپشن کو چیک کریں۔
+IfDatabaseExistsGoBackAndCheckCreate=اگر ڈیٹا بیس پہلے سے موجود ہے تو واپس جائیں اور "ڈیٹا بیس بنائیں" کے آپشن کو غیر چیک کریں۔
+WarningBrowserTooOld=براؤزر کا ورژن بہت پرانا ہے۔ اپنے براؤزر کو Firefox، Chrome یا Opera کے حالیہ ورژن میں اپ گریڈ کرنے کی انتہائی سفارش کی جاتی ہے۔
+PHPVersion=پی ایچ پی ورژن
+License=لائسنس کا استعمال
+ConfigurationFile=کنفیگریشن فائل
+WebPagesDirectory=ڈائریکٹری جہاں ویب صفحات کو محفوظ کیا جاتا ہے۔
+DocumentsDirectory=اپ لوڈ کردہ اور تیار کردہ دستاویزات کو ذخیرہ کرنے کی ڈائرکٹری
+URLRoot=یو آر ایل روٹ
+ForceHttps=زبردستی محفوظ کنکشن (https)
+CheckToForceHttps=محفوظ کنکشنز (https) پر مجبور کرنے کے لیے اس اختیار کو چیک کریں۔ <br> اس کے لیے ضروری ہے کہ ویب سرور SSL سرٹیفکیٹ کے ساتھ کنفیگر ہو۔
+DolibarrDatabase=ڈولیبر ڈیٹا بیس
+DatabaseType=ڈیٹا بیس کی قسم
+DriverType=ڈرائیور کی قسم
+Server=سرور
+ServerAddressDescription=ڈیٹا بیس سرور کے لیے نام یا آئی پی ایڈریس۔ عام طور پر 'لوکل ہوسٹ' جب ڈیٹا بیس سرور اسی سرور پر ہوسٹ کیا جاتا ہے جس پر ویب سرور ہوتا ہے۔
+ServerPortDescription=ڈیٹا بیس سرور پورٹ۔ اگر نامعلوم ہو تو خالی رکھیں۔
+DatabaseServer=ڈیٹا بیس سرور
+DatabaseName=ڈیٹا بیس کا نام
+DatabasePrefix=ڈیٹا بیس ٹیبل کا سابقہ
+DatabasePrefixDescription=ڈیٹا بیس ٹیبل کا سابقہ۔ اگر خالی ہے تو، llx_ پر ڈیفالٹ۔
+AdminLogin=Dolibarr ڈیٹا بیس کے مالک کے لیے صارف کا اکاؤنٹ۔
+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=اس پی ایچ پی میں دستیاب نہیں ہے۔
+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=آپ کے ڈیٹا بیس <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>"، یا ڈیٹا بیس کے پاس غلط ہو سکتے ہیں یا پی ایچ پی کلائنٹ ورژن ڈیٹا بیس ورژن کے مقابلے میں بہت بوڑھا ہو سکتا ہے.
+InstallChoiceRecommanded=آپ کے موجودہ ورژن سے <b> %s </b> ورژن انسٹال کرنے کا تجویز کردہ انتخاب
+InstallChoiceSuggested= <b> انسٹالر کی طرف سے تجویز کردہ انتخاب انسٹال کریں </b>۔
+MigrateIsDoneStepByStep=ٹارگٹڈ ورژن (%s) میں کئی ورژنز کا فرق ہے۔ انسٹال کرنے والا وزرڈ واپس آ جائے گا تاکہ یہ مکمل ہو جانے کے بعد مزید منتقلی کی تجویز کرے۔
+CheckThatDatabasenameIsCorrect=چیک کریں کہ ڈیٹا بیس کا نام "<b> %s </b>" درست ہے۔
+IfAlreadyExistsCheckOption=اگر یہ نام درست ہے اور وہ ڈیٹا بیس ابھی تک موجود نہیں ہے تو آپ کو "Create database" کے آپشن کو چیک کرنا ہوگا۔
+OpenBaseDir=پی ایچ پی اوپن بیسڈیر پیرامیٹر
+YouAskToCreateDatabaseSoRootRequired=آپ نے "ڈیٹا بیس بنائیں" کے باکس کو نشان زد کیا۔ اس کے لیے، آپ کو سپر یوزر (فارم کے نیچے) کا لاگ ان/پاس ورڈ فراہم کرنا ہوگا۔
+YouAskToCreateDatabaseUserSoRootRequired=آپ نے "ڈیٹا بیس مالک بنائیں" والے باکس کو نشان زد کیا۔ اس کے لیے، آپ کو سپر یوزر (فارم کے نیچے) کا لاگ ان/پاس ورڈ فراہم کرنا ہوگا۔
+NextStepMightLastALongTime=موجودہ قدم میں کئی منٹ لگ سکتے ہیں۔ جاری رکھنے سے پہلے براہ کرم اگلی اسکرین کے مکمل طور پر ظاہر ہونے تک انتظار کریں۔
+MigrationCustomerOrderShipping=سیلز آرڈرز اسٹوریج کے لیے نقل مکانی کریں۔
+MigrationShippingDelivery=شپنگ کے اسٹوریج کو اپ گریڈ کریں۔
+MigrationShippingDelivery2=شپنگ 2 کے اسٹوریج کو اپ گریڈ کریں۔
+MigrationFinished=ہجرت ختم
+LastStepDesc= <strong> آخری مرحلہ </strong> : یہاں لاگ ان اور پاس ورڈ کی وضاحت کریں جسے آپ Dolibarr سے منسلک کرنے کے لیے استعمال کرنا چاہتے ہیں۔ <b> اسے ضائع نہ کریں کیونکہ یہ تمام دوسرے/اضافی صارف اکاؤنٹس کا انتظام کرنے کا ماسٹر اکاؤنٹ ہے۔ </b>
+ActivateModule=ماڈیول %s کو چالو کریں۔
+ShowEditTechnicalParameters=اعلی درجے کے پیرامیٹرز کو دکھانے/ترمیم کرنے کے لیے یہاں کلک کریں (ماہر موڈ)
+WarningUpgrade=انتباہ:\nکیا آپ نے پہلے ڈیٹا بیس کا بیک اپ چلایا؟\nیہ انتہائی سفارش کی جاتی ہے۔ ڈیٹا کا نقصان (مثال کے طور پر mysql ورژن 5.5.40/41/42/43 میں بگ کی وجہ سے) اس عمل کے دوران ممکن ہو سکتا ہے، اس لیے کسی بھی منتقلی کو شروع کرنے سے پہلے اپنے ڈیٹا بیس کا مکمل ڈمپ لینا ضروری ہے۔\n\nمنتقلی کا عمل شروع کرنے کے لیے ٹھیک ہے پر کلک کریں...
+ErrorDatabaseVersionForbiddenForMigration=آپ کا ڈیٹا بیس ورژن %s ہے۔ اس میں ایک اہم بگ ہے، اگر آپ اپنے ڈیٹا بیس میں ساختی تبدیلیاں کرتے ہیں، جیسا کہ منتقلی کے عمل کے لیے ضروری ہوتا ہے تو ڈیٹا کا نقصان ممکن ہو جاتا ہے۔ اس کی وجہ سے، اس وقت تک منتقلی کی اجازت نہیں دی جائے گی جب تک کہ آپ اپنے ڈیٹا بیس کو پرت (پیچ شدہ) ورژن میں اپ گریڈ نہیں کرتے (معلوم بگی ورژنز کی فہرست: %s)
+KeepDefaultValuesWamp=آپ نے DoliWamp سے Dolibarr سیٹ اپ وزرڈ استعمال کیا ہے، لہذا یہاں تجویز کردہ اقدار پہلے سے ہی بہتر ہیں۔ انہیں صرف اس صورت میں تبدیل کریں جب آپ جانتے ہوں کہ آپ کیا کر رہے ہیں۔
+KeepDefaultValuesDeb=آپ نے لینکس پیکیج (Ubuntu, Debian, Fedora...) سے Dolibarr سیٹ اپ وزرڈ استعمال کیا، اس لیے یہاں تجویز کردہ اقدار پہلے سے ہی آپٹمائز ہیں۔ بنانے کے لیے صرف ڈیٹابیس کے مالک کا پاس ورڈ درج کرنا ضروری ہے۔ دوسرے پیرامیٹرز کو صرف اس صورت میں تبدیل کریں جب آپ جانتے ہوں کہ آپ کیا کر رہے ہیں۔
+KeepDefaultValuesMamp=آپ نے DoliMamp سے Dolibarr سیٹ اپ وزرڈ استعمال کیا، اس لیے یہاں تجویز کردہ اقدار پہلے سے ہی آپٹمائز ہیں۔ انہیں صرف اس صورت میں تبدیل کریں جب آپ جانتے ہوں کہ آپ کیا کر رہے ہیں۔
+KeepDefaultValuesProxmox=آپ نے Dolibarr سیٹ اپ وزرڈ کو Proxmox ورچوئل ایپلائینس سے استعمال کیا، اس لیے یہاں تجویز کردہ اقدار پہلے سے ہی آپٹمائز ہو چکی ہیں۔ انہیں صرف اس صورت میں تبدیل کریں جب آپ جانتے ہوں کہ آپ کیا کر رہے ہیں۔
+UpgradeExternalModule=بیرونی ماڈیول کے سرشار اپ گریڈ کے عمل کو چلائیں۔
+SetAtLeastOneOptionAsUrlParameter=URL میں پیرامیٹر کے طور پر کم از کم ایک آپشن سیٹ کریں۔ مثال کے طور پر: '...repair.php?standard=confirmed'
+NothingToDelete=صاف کرنے / حذف کرنے کے لئے کچھ نہیں ہے۔
+NothingToDo=کرنے کیلئے کچھ نہیں
+#########
+# upgrade
+MigrationFixData=غیر معمولی ڈیٹا کے لیے درست کریں۔
+MigrationOrder=گاہک کے آرڈرز کے لیے ڈیٹا کی منتقلی
+MigrationSupplierOrder=وینڈر کے آرڈرز کے لیے ڈیٹا کی منتقلی
+MigrationProposal=تجارتی تجاویز کے لیے ڈیٹا کی منتقلی
+MigrationInvoice=گاہک کی رسیدوں کے لیے ڈیٹا کی منتقلی
+MigrationContract=معاہدوں کے لیے ڈیٹا کی منتقلی
+MigrationSuccessfullUpdate=اپ گریڈ کامیاب
+MigrationUpdateFailed=اپ گریڈ کرنے کا عمل ناکام ہو گیا۔
+MigrationRelationshipTables=تعلقات کی میزوں کے لیے ڈیٹا کی منتقلی (%s)
+MigrationPaymentsUpdate=ادائیگی کے ڈیٹا کی اصلاح
+MigrationPaymentsNumberToUpdate=%s ادائیگی(زبانیں) اپ ڈیٹ کرنے کے لیے
+MigrationProcessPaymentUpdate=ادائیگی(ز) کو اپ ڈیٹ کریں %s
+MigrationPaymentsNothingToUpdate=کرنے کے لیے مزید چیزیں نہیں ہیں۔
+MigrationPaymentsNothingUpdatable=مزید ادائیگیوں کو درست نہیں کیا جاسکتا
+MigrationContractsUpdate=معاہدہ ڈیٹا کی اصلاح
+MigrationContractsNumberToUpdate=اپ ڈیٹ کرنے کے لیے %s معاہدہ
+MigrationContractsLineCreation=معاہدہ ریف %s کے لئے معاہدہ لائن بنائیں
+MigrationContractsNothingToUpdate=کرنے کے لیے مزید چیزیں نہیں ہیں۔
+MigrationContractsFieldDontExist=فیلڈ fk_facture اب موجود نہیں ہے۔ کرنے کیلئے کچھ نہیں.
+MigrationContractsEmptyDatesUpdate=معاہدہ خالی تاریخ کی اصلاح
+MigrationContractsEmptyDatesUpdateSuccess=معاہدے کی خالی تاریخ کی اصلاح کامیابی سے ہو گئی۔
+MigrationContractsEmptyDatesNothingToUpdate=درست کرنے کے لیے کوئی معاہدہ خالی تاریخ نہیں ہے۔
+MigrationContractsEmptyCreationDatesNothingToUpdate=درست کرنے کے لیے کوئی معاہدہ تخلیق کی تاریخ نہیں ہے۔
+MigrationContractsInvalidDatesUpdate=خراب قیمت کی تاریخ کے معاہدے کی اصلاح
+MigrationContractsInvalidDateFix=درست معاہدہ %s (معاہدے کی تاریخ=%s، سروس شروع ہونے کی تاریخ min=%s)
+MigrationContractsInvalidDatesNumber=%s معاہدوں میں ترمیم کی گئی۔
+MigrationContractsInvalidDatesNothingToUpdate=درست کرنے کے لیے خراب قدر والی کوئی تاریخ نہیں۔
+MigrationContractsIncoherentCreationDateUpdate=خراب قدر کے معاہدے کی تخلیق کی تاریخ کی اصلاح
+MigrationContractsIncoherentCreationDateUpdateSuccess=خراب قدر کے معاہدے کی تخلیق کی تاریخ کی اصلاح کامیابی کے ساتھ ہو گئی۔
+MigrationContractsIncoherentCreationDateNothingToUpdate=ٹھیک کرنے کے لیے معاہدہ تخلیق کی تاریخ کے لیے کوئی بری قدر نہیں۔
+MigrationReopeningContracts=کھلا معاہدہ غلطی سے بند ہوگیا۔
+MigrationReopenThisContract=معاہدہ %s دوبارہ کھولیں۔
+MigrationReopenedContractsNumber=%s معاہدوں میں ترمیم کی گئی۔
+MigrationReopeningContractsNothingToUpdate=کھولنے کے لیے کوئی بند معاہدہ نہیں ہے۔
+MigrationBankTransfertsUpdate=بینک انٹری اور بینک ٹرانسفر کے درمیان روابط کو اپ ڈیٹ کریں۔
+MigrationBankTransfertsNothingToUpdate=تمام لنکس اپ ٹو ڈیٹ ہیں۔
+MigrationShipmentOrderMatching=رسید کی تازہ کاری بھیج رہا ہے۔
+MigrationDeliveryOrderMatching=ترسیل کی رسید کی تازہ کاری
+MigrationDeliveryDetail=ڈیلیوری اپ ڈیٹ
+MigrationStockDetail=مصنوعات کی اسٹاک ویلیو کو اپ ڈیٹ کریں۔
+MigrationMenusDetail=ڈائنامک مینو ٹیبلز کو اپ ڈیٹ کریں۔
+MigrationDeliveryAddress=ترسیل کا پتہ ترسیل میں اپ ڈیٹ کریں۔
+MigrationProjectTaskActors=ٹیبل llx_projet_task_actors کے لیے ڈیٹا کی منتقلی
+MigrationProjectUserResp=llx_projet سے llx_element_contact پر ڈیٹا کی منتقلی کی فیلڈ fk_user_resp
+MigrationProjectTaskTime=سیکنڈوں میں گزارے گئے وقت کو اپ ڈیٹ کریں۔
+MigrationActioncommElement=اعمال پر ڈیٹا کو اپ ڈیٹ کریں۔
+MigrationPaymentMode=ادائیگی کی قسم کے لیے ڈیٹا کی منتقلی
+MigrationCategorieAssociation=زمروں کی منتقلی
+MigrationEvents=ایونٹ کے مالک کو اسائنمنٹ ٹیبل میں شامل کرنے کے لیے ایونٹس کی منتقلی
+MigrationEventsContact=اسائنمنٹ ٹیبل میں ایونٹ کا رابطہ شامل کرنے کے لیے واقعات کی منتقلی
+MigrationRemiseEntity=llx_societe_remise کی entity فیلڈ ویلیو کو اپ ڈیٹ کریں۔
+MigrationRemiseExceptEntity=llx_societe_remise_except کی entity فیلڈ ویلیو کو اپ ڈیٹ کریں۔
+MigrationUserRightsEntity=llx_user_rights کی entity فیلڈ ویلیو کو اپ ڈیٹ کریں۔
+MigrationUserGroupRightsEntity=llx_usergroup_rights کی entity فیلڈ ویلیو کو اپ ڈیٹ کریں۔
+MigrationUserPhotoPath=صارفین کے لیے تصویری راستوں کی منتقلی۔
+MigrationFieldsSocialNetworks=صارفین کی منتقلی فیلڈز سوشل نیٹ ورکس (%s)
+MigrationReloadModule=ماڈیول %s کو دوبارہ لوڈ کریں۔
+MigrationResetBlockedLog=V7 الگورتھم کے لیے BlockedLog ماڈیول کو دوبارہ ترتیب دیں۔
+MigrationImportOrExportProfiles=امپورٹ یا ایکسپورٹ پروفائلز کی منتقلی (%s)
+ShowNotAvailableOptions=غیر دستیاب اختیارات دکھائیں۔
+HideNotAvailableOptions=غیر دستیاب اختیارات چھپائیں۔
+ErrorFoundDuringMigration=نقل مکانی کے عمل کے دوران خرابیوں کی اطلاع دی گئی تھی لہذا اگلا مرحلہ دستیاب نہیں ہے۔ غلطیوں کو نظر انداز کرنے کے لیے، آپ <a href="%s"> یہاں کلک کر سکتے ہیں </a>، لیکن ہو سکتا ہے ایپلیکیشن یا کچھ فیچرز درست طریقے سے کام نہ کریں جب تک کہ غلطیاں حل نہ ہو جائیں۔
+YouTryInstallDisabledByDirLock=ایپلیکیشن نے خود اپ گریڈ کرنے کی کوشش کی، لیکن انسٹال/اپ گریڈ پیجز کو سیکیورٹی کے لیے غیر فعال کر دیا گیا ہے (ڈائریکٹری کا نام .lock لاحقہ سے تبدیل کر دیا گیا ہے)۔ <br>
+YouTryInstallDisabledByFileLock=ایپلیکیشن نے خود اپ گریڈ کرنے کی کوشش کی، لیکن انسٹال/اپ گریڈ پیجز کو سیکیورٹی کے لیے غیر فعال کر دیا گیا ہے (ڈولیبر دستاویزات کی ڈائرکٹری میں ایک لاک فائل <strong> install.lock </strong> کی موجودگی سے)۔ <br>
+ClickHereToGoToApp=اپنی درخواست پر جانے کے لیے یہاں کلک کریں۔
+ClickOnLinkOrRemoveManualy=اگر اپ گریڈ جاری ہے تو براہ کرم انتظار کریں۔ اگر نہیں تو درج ذیل لنک پر کلک کریں۔ اگر آپ ہمیشہ یہی صفحہ دیکھتے ہیں، تو آپ کو دستاویزات کی ڈائرکٹری میں install.lock فائل کو ہٹانا/اس کا نام تبدیل کرنا ہوگا۔
+Loaded=بھری ہوئی
+FunctionTest=فنکشن ٹیسٹ
diff --git a/htdocs/langs/ur_PK/interventions.lang b/htdocs/langs/ur_PK/interventions.lang
new file mode 100644
index 00000000000..f6302271d88
--- /dev/null
+++ b/htdocs/langs/ur_PK/interventions.lang
@@ -0,0 +1,68 @@
+# Dolibarr language file - Source file is en_US - interventions
+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=مداخلت کا عرضی %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=مداخلت کی رقم پہلے سے طے شدہ طور پر منافع میں شامل نہیں ہوتی ہے (زیادہ تر معاملات میں، ٹائم شیٹس کا استعمال وقت کی گنتی کے لیے کیا جاتا ہے)۔ ہوم سیٹ اپ میں 1 میں PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT اختیار شامل کریں-دوسرے کو شامل کرنے کے لیے۔
+InterId=مداخلت کی شناخت
+InterRef=مداخلت کا حوالہ
+InterDateCreation=تاریخ تخلیق مداخلت
+InterDuration=دورانیہ کی مداخلت
+InterStatus=حیثیت کی مداخلت
+InterNote=مداخلت نوٹ کریں۔
+InterLine=مداخلت کی لائن
+InterLineId=لائن آئی ڈی کی مداخلت
+InterLineDate=لائن کی تاریخ مداخلت
+InterLineDuration=لائن دورانیہ کی مداخلت
+InterLineDesc=لائن کی وضاحت مداخلت
+RepeatableIntervention=مداخلت کا سانچہ
+ToCreateAPredefinedIntervention=پہلے سے طے شدہ یا بار بار چلنے والی مداخلت بنانے کے لیے، ایک مشترکہ مداخلت بنائیں اور اسے مداخلت کے سانچے میں تبدیل کریں۔
+ConfirmReopenIntervention=کیا آپ واقعی مداخلت <b> %s </b> کو کھولنا چاہتے ہیں؟
+GenerateInter=مداخلت پیدا کریں۔
diff --git a/htdocs/langs/ur_PK/intracommreport.lang b/htdocs/langs/ur_PK/intracommreport.lang
new file mode 100644
index 00000000000..43a3163f653
--- /dev/null
+++ b/htdocs/langs/ur_PK/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = انٹرا کام رپورٹ
+Module68000Desc = انٹرا کام رپورٹ مینجمنٹ (فرانسیسی DEB/DES فارمیٹ کے لیے سپورٹ)
+IntracommReportSetup = انٹرا کامرپورٹ ماڈیول سیٹ اپ
+IntracommReportAbout = انٹرا کامرپورٹ کے بارے میں
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+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="Frais de port" کی قسم کی خدمات کی زمرہ
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=انٹرا کام رپورٹ
+MenuIntracommReportNew=نیا اعلان
+MenuIntracommReportList=فہرست
+
+# View
+NewDeclaration=نیا اعلان
+Declaration=اعلامیہ
+AnalysisPeriod=تجزیہ کی مدت
+TypeOfDeclaration=اعلان کی قسم
+DEB=گڈز ایکسچینج ڈیکلریشن (DEB)
+DES=خدمات کے تبادلے کا اعلان (DES)
+
+# Export page
+IntracommReportTitle=ProDouane فارمیٹ میں XML فائل کی تیاری
+
+# List
+IntracommReportList=تیار کردہ اعلانات کی فہرست
+IntracommReportNumber=اعلان کی تعداد
+IntracommReportPeriod=تجزیہ کی مدت
+IntracommReportTypeDeclaration=اعلان کی قسم
+IntracommReportDownload=XML فائل ڈاؤن لوڈ کریں۔
+
+# Invoice
+IntracommReportTransportMode=ٹرانسپورٹ موڈ
diff --git a/htdocs/langs/ur_PK/knowledgemanagement.lang b/htdocs/langs/ur_PK/knowledgemanagement.lang
new file mode 100644
index 00000000000..edcaf0493cc
--- /dev/null
+++ b/htdocs/langs/ur_PK/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 = نالج مینجمنٹ سسٹم
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=نالج مینجمنٹ (KM) یا ہیلپ ڈیسک بیس کا نظم کریں۔
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = نالج مینجمنٹ سسٹم سیٹ اپ
+Settings = ترتیبات
+KnowledgeManagementSetupPage = نالج مینجمنٹ سسٹم سیٹ اپ صفحہ
+
+
+#
+# About page
+#
+About = کے بارے میں
+KnowledgeManagementAbout = نالج مینجمنٹ کے بارے میں
+KnowledgeManagementAboutPage = صفحہ کے بارے میں علم کا انتظام
+
+KnowledgeManagementArea = نالج مینجمنٹ
+MenuKnowledgeRecord = علم کی بنیاد
+ListKnowledgeRecord = مضامین کی فہرست
+NewKnowledgeRecord = نیا مضمون
+ValidateReply = حل کی توثیق کریں۔
+KnowledgeRecords = مضامین
+KnowledgeRecord = مضمون
+KnowledgeRecordExtraFields = آرٹیکل کے لیے ایکسٹرا فیلڈز
+GroupOfTicket=ٹکٹوں کا گروپ
+YouCanLinkArticleToATicketCategory=آپ کسی مضمون کو ٹکٹ گروپ سے جوڑ سکتے ہیں (لہذا نئے ٹکٹوں کی اہلیت کے دوران مضمون تجویز کیا جائے گا)
+SuggestedForTicketsInGroup=جب گروپ ہوتا ہے تو ٹکٹوں کے لیے تجویز کیا جاتا ہے۔
+
+SetObsolete=Set as obsolete
+ConfirmCloseKM=Do you confirm the closing of this article as obsolete ?
+ConfirmReopenKM=Do you want to restore this article to status "Validated" ?
diff --git a/htdocs/langs/ur_PK/languages.lang b/htdocs/langs/ur_PK/languages.lang
new file mode 100644
index 00000000000..1cdbfe54d37
--- /dev/null
+++ b/htdocs/langs/ur_PK/languages.lang
@@ -0,0 +1,114 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_am_ET=ایتھوپیا
+Language_ar_AR=عربی
+Language_ar_DZ=عربی (الجیریا)
+Language_ar_EG=عربی (مصر)
+Language_ar_MA=عربی (مراکو)
+Language_ar_SA=عربی
+Language_ar_TN=عربی (تیونس)
+Language_ar_IQ=عربی (عراق)
+Language_as_IN=آسامی
+Language_az_AZ=آذربائیجانی
+Language_bn_BD=بنگالی
+Language_bn_IN=بنگالی (بھارت)
+Language_bg_BG=بلغاریائی
+Language_bs_BA=بوسنیائی
+Language_ca_ES=کاتالان
+Language_cs_CZ=چیک
+Language_da_DA=ڈینش
+Language_da_DK=ڈینش
+Language_de_DE=جرمن
+Language_de_AT=جرمن (آسٹریا)
+Language_de_CH=جرمن (سوئٹزرلینڈ)
+Language_el_GR=یونانی
+Language_el_CY=یونانی (قبرص)
+Language_en_AU=انگریزی (آسٹریلیا)
+Language_en_CA=انگریزی (کینیڈا)
+Language_en_GB=انگریزی (برطانیہ)
+Language_en_IN=انگریزی (انڈیا)
+Language_en_NZ=انگریزی (نیوزی لینڈ)
+Language_en_SA=انگریزی (سعودی عرب)
+Language_en_SG=انگریزی (سنگاپور)
+Language_en_US=امریکی انگریزی)
+Language_en_ZA=انگریزی (جنوبی افریقہ)
+Language_es_ES=ہسپانوی
+Language_es_AR=ہسپانوی (ارجنٹینا)
+Language_es_BO=ہسپانوی (بولیویا)
+Language_es_CL=ہسپانوی (چلی)
+Language_es_CO=ہسپانوی (کولمبیا)
+Language_es_DO=ہسپانوی (ڈومینیکن ریپبلک)
+Language_es_EC=ہسپانوی (ایکواڈور)
+Language_es_GT=ہسپانوی (گوئٹے مالا)
+Language_es_HN=ہسپانوی (ہنڈراس)
+Language_es_MX=ہسپانوی (میکسیکو)
+Language_es_PA=ہسپانوی (پاناما)
+Language_es_PY=ہسپانوی (پیراگوئے)
+Language_es_PE=ہسپانوی (پیرو)
+Language_es_PR=ہسپانوی (پورٹو ریکو)
+Language_es_US=ہسپانوی (امریکہ)
+Language_es_UY=ہسپانوی (یوروگوئے)
+Language_es_GT=ہسپانوی (گوئٹے مالا)
+Language_es_VE=ہسپانوی (وینزویلا)
+Language_et_EE=اسٹونین
+Language_eu_ES=باسکی
+Language_fa_IR=فارسی
+Language_fi_FI=فنش
+Language_fr_BE=فرانسیسی (بیلجیم)
+Language_fr_CA=فرانسیسی (کینیڈا)
+Language_fr_CH=فرانسیسی (سوئٹزرلینڈ)
+Language_fr_CI=فرانسیسی (لاگت آئیوری)
+Language_fr_CM=فرانسیسی (کیمرون)
+Language_fr_FR=فرانسیسی
+Language_fr_GA=فرانسیسی (گیبون)
+Language_fr_NC=فرانسیسی (نیو کیلیڈونیا)
+Language_fr_SN=فرانسیسی (سینیگال)
+Language_fy_NL=فریسیئن
+Language_gl_ES=گالیشین
+Language_he_IL=عبرانی
+Language_hi_IN=ہندی (بھارت)
+Language_hr_HR=کروشین
+Language_hu_HU=ہنگری
+Language_id_ID=انڈونیشین
+Language_is_IS=آئس لینڈی
+Language_it_IT=اطالوی
+Language_it_CH=اطالوی (سوئٹزرلینڈ)
+Language_ja_JP=جاپانی
+Language_ka_GE=جارجیائی
+Language_kk_KZ=قازق
+Language_km_KH=خمیر
+Language_kn_IN=کنڑ
+Language_ko_KR=کورین
+Language_lo_LA=لاؤ
+Language_lt_LT=لتھوینیائی
+Language_lv_LV=لیٹوین
+Language_mk_MK=مقدونیائی
+Language_mn_MN=منگول
+Language_nb_NO=نارویجن (Bokmål)
+Language_ne_NP=نیپالی
+Language_nl_BE=ڈچ (بیلجیم)
+Language_nl_NL=ڈچ
+Language_pl_PL=پولش
+Language_pt_AO=پرتگالی (انگولا)
+Language_pt_BR=پرتگالی (برازیل)
+Language_pt_PT=پرتگالی
+Language_ro_MD=رومانیہ (مولداویا)
+Language_ro_RO=رومانیہ
+Language_ru_RU=روسی
+Language_ru_UA=روسی (یوکرین)
+Language_tg_TJ=تاجک
+Language_tr_TR=ترکی
+Language_sl_SI=سلووینیائی
+Language_sv_SV=سویڈش
+Language_sv_SE=سویڈش
+Language_sq_AL=البانوی
+Language_sk_SK=سلوواکین
+Language_sr_RS=سربیائی
+Language_sw_SW=کسوہلی
+Language_th_TH=تھائی
+Language_uk_UA=یوکرینی
+Language_uz_UZ=ازبک
+Language_vi_VN=ویتنامی
+Language_zh_CN=چینی
+Language_zh_TW=چینی (روایتی)
+Language_zh_HK=چینی (ہانگ کانگ)
+Language_bh_MY=مالائی
diff --git a/htdocs/langs/ur_PK/ldap.lang b/htdocs/langs/ur_PK/ldap.lang
new file mode 100644
index 00000000000..e668872e8ae
--- /dev/null
+++ b/htdocs/langs/ur_PK/ldap.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=<b> %s </b> ڈومین <b> %s a09a4b739f170z8 پر پاس ورڈ تبدیل کرنا ضروری ہے۔
+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=اسکائپ آئی ڈی
+LDAPFieldSkypeExample=مثال: اسکائپ نام
+UserSynchronized=صارف مطابقت پذیر
+GroupSynchronized=گروپ مطابقت پذیر
+MemberSynchronized=ممبر مطابقت پذیر
+MemberTypeSynchronized=ممبر کی قسم مطابقت پذیر
+ContactSynchronized=رابطہ مطابقت پذیر
+ForceSynchronize=Dolibarr -> LDAP کو زبردستی ہم آہنگ کریں۔
+ErrorFailedToReadLDAP=LDAP ڈیٹا بیس کو پڑھنے میں ناکام۔ LDAP ماڈیول سیٹ اپ اور ڈیٹا بیس کی رسائی کو چیک کریں۔
+PasswordOfUserInLDAP=LDAP میں صارف کا پاس ورڈ
+LDAPPasswordHashType=پاس ورڈ ہیش کی قسم
+LDAPPasswordHashTypeExample=سرور پر استعمال ہونے والے پاس ورڈ ہیش کی قسم
+SupportedForLDAPExportScriptOnly=صرف ایل ڈی اے پی ایکسپورٹ اسکرپٹ سے تعاون یافتہ ہے۔
+SupportedForLDAPImportScriptOnly=صرف ایک ldap امپورٹ اسکرپٹ سے تعاون یافتہ ہے۔
diff --git a/htdocs/langs/ur_PK/link.lang b/htdocs/langs/ur_PK/link.lang
new file mode 100644
index 00000000000..256f4dc462b
--- /dev/null
+++ b/htdocs/langs/ur_PK/link.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=ایک نئی فائل/دستاویز سے لنک کریں۔
+LinkedFiles=منسلک فائلیں اور دستاویزات
+NoLinkFound=کوئی رجسٹرڈ لنکس نہیں۔
+LinkComplete=فائل کو کامیابی سے جوڑ دیا گیا ہے۔
+ErrorFileNotLinked=فائل کو لنک نہیں کیا جا سکا
+LinkRemoved=لنک %s ہٹا دیا گیا ہے۔
+ErrorFailedToDeleteLink= لنک '<b> %s </b>' کو ہٹانے میں ناکام
+ErrorFailedToUpdateLink= لنک '<b> %s </b>' کو اپ ڈیٹ کرنے میں ناکام
+URLToLink=لنک کرنے کے لیے URL
+OverwriteIfExists=اگر موجود ہو تو فائل کو اوور رائٹ کریں۔
diff --git a/htdocs/langs/ur_PK/loan.lang b/htdocs/langs/ur_PK/loan.lang
new file mode 100644
index 00000000000..0bfd57d77e7
--- /dev/null
+++ b/htdocs/langs/ur_PK/loan.lang
@@ -0,0 +1,34 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=قرض
+Loans=قرضے
+NewLoan=نیا قرض
+ShowLoan=قرض دکھائیں۔
+PaymentLoan=قرض کی ادائیگی
+LoanPayment=قرض کی ادائیگی
+ShowLoanPayment=قرض کی ادائیگی دکھائیں۔
+LoanCapital=سرمایہ
+Insurance=انشورنس
+Interest=دلچسپی
+Nbterms=شرائط کی تعداد
+Term=مدت
+LoanAccountancyCapitalCode=اکاؤنٹنگ اکاؤنٹ کیپٹل
+LoanAccountancyInsuranceCode=اکاؤنٹنگ اکاؤنٹ انشورنس
+LoanAccountancyInterestCode=اکاؤنٹنگ اکاؤنٹنگ سود
+ConfirmDeleteLoan=اس قرض کو حذف کرنے کی تصدیق کریں۔
+LoanDeleted=قرض کامیابی سے حذف ہو گیا۔
+ConfirmPayLoan=اس قرض کی ادائیگی کی درجہ بندی کی تصدیق کریں۔
+LoanPaid=ادا شدہ قرض
+ListLoanAssociatedProject=منصوبے سے وابستہ قرض کی فہرست
+AddLoan=قرض بنائیں
+FinancialCommitment=مالی وابستگی
+InterestAmount=دلچسپی
+CapitalRemain=سرمایہ باقی ہے۔
+TermPaidAllreadyPaid = یہ اصطلاح پہلے سے ادا کی جاتی ہے۔
+CantUseScheduleWithLoanStartedToPaid = ادائیگی شروع ہونے کے ساتھ قرض کے لیے شیڈیولر استعمال نہیں کر سکتے
+CantModifyInterestIfScheduleIsUsed = اگر آپ شیڈول استعمال کرتے ہیں تو آپ دلچسپی میں ترمیم نہیں کر سکتے
+# Admin
+ConfigLoan=ماڈیول قرض کی ترتیب
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=ڈیفالٹ کے حساب سے اکاؤنٹنگ کا سرمایہ
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=ڈیفالٹ کے حساب سے اکاؤنٹنگ سود
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=اکاؤنٹنگ اکاؤنٹ انشورنس بطور ڈیفالٹ
+CreateCalcSchedule=مالی وابستگی میں ترمیم کریں۔
diff --git a/htdocs/langs/ur_PK/mailmanspip.lang b/htdocs/langs/ur_PK/mailmanspip.lang
new file mode 100644
index 00000000000..966c6d94059
--- /dev/null
+++ b/htdocs/langs/ur_PK/mailmanspip.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanSpipSetup=میل مین اور SPIP ماڈیول سیٹ اپ
+MailmanTitle=میل مین میلنگ لسٹ سسٹم
+TestSubscribe=میل مین کی فہرستوں کی رکنیت کی جانچ کرنے کے لیے
+TestUnSubscribe=میل مین کی فہرستوں سے رکنیت ختم کرنے کی جانچ کرنے کے لیے
+MailmanCreationSuccess=سبسکرپشن ٹیسٹ کامیابی کے ساتھ انجام دیا گیا۔
+MailmanDeletionSuccess=ان سبسکرپشن ٹیسٹ کو کامیابی کے ساتھ انجام دیا گیا۔
+SynchroMailManEnabled=میل مین اپ ڈیٹ کیا جائے گا۔
+SynchroSpipEnabled=ایک سپپ اپ ڈیٹ کیا جائے گا۔
+DescADHERENT_MAILMAN_ADMINPW=میل مین ایڈمنسٹریٹر کا پاس ورڈ
+DescADHERENT_MAILMAN_URL=میل مین سبسکرپشنز کے لیے URL
+DescADHERENT_MAILMAN_UNSUB_URL=میل مین کی رکنیت ختم کرنے کے لیے URL
+DescADHERENT_MAILMAN_LISTS=نئے اراکین کی خودکار تحریر کے لیے فہرست (کوما سے الگ)
+SPIPTitle=SPIP کنٹینٹ مینجمنٹ سسٹم
+DescADHERENT_SPIP_SERVEUR=SPIP سرور
+DescADHERENT_SPIP_DB=SPIP ڈیٹا بیس کا نام
+DescADHERENT_SPIP_USER=SPIP ڈیٹا بیس لاگ ان
+DescADHERENT_SPIP_PASS=SPIP ڈیٹا بیس پاس ورڈ
+AddIntoSpip=SPIP میں شامل کریں۔
+AddIntoSpipConfirmation=کیا آپ واقعی اس ممبر کو SPIP میں شامل کرنا چاہتے ہیں؟
+AddIntoSpipError=صارف کو SPIP میں شامل کرنے میں ناکام
+DeleteIntoSpip=SPIP سے ہٹا دیں۔
+DeleteIntoSpipConfirmation=کیا آپ واقعی اس ممبر کو SPIP سے ہٹانا چاہتے ہیں؟
+DeleteIntoSpipError=SPIP سے صارف کو دبانے میں ناکام
+SPIPConnectionFailed=SPIP سے جڑنے میں ناکام
+SuccessToAddToMailmanList=%s میل مین کی فہرست %s یا SPIP ڈیٹا بیس میں کامیابی کے ساتھ شامل کیا گیا
+SuccessToRemoveToMailmanList=%s میل مین کی فہرست %s یا SPIP ڈیٹا بیس سے کامیابی کے ساتھ ہٹا دیا گیا
diff --git a/htdocs/langs/ur_PK/mails.lang b/htdocs/langs/ur_PK/mails.lang
new file mode 100644
index 00000000000..978752c091a
--- /dev/null
+++ b/htdocs/langs/ur_PK/mails.lang
@@ -0,0 +1,180 @@
+# Dolibarr language file - Source file is en_US - mails
+Mailing=ای میل کرنا
+EMailing=ای میل کرنا
+EMailings=ای میلز
+AllEMailings=تمام ای میلز
+MailCard=ای میل کارڈ
+MailRecipients=وصول کنندگان
+MailRecipient=وصول کنندہ
+MailTitle=تفصیل
+MailFrom=بھیجنے والا
+MailErrorsTo=کی خرابیاں
+MailReply=کا جواب دیں
+MailTo=وصول کنندہ
+MailToUsers=صارف (صارفین) کو
+MailCC=میں کاپی کریں۔
+MailToCCUsers=صارفین کو کاپی کریں
+MailCCC=میں کیش شدہ کاپی
+MailTopic=ای میل کے موضوع
+MailText=پیغام
+MailFile=منسلک فائلوں
+MailMessage=ای میل باڈی
+SubjectNotIn=سبجیکٹ میں نہیں۔
+BodyNotIn=جسم میں نہیں۔
+ShowEMailing=ای میل دکھائیں۔
+ListOfEMailings=ای میلز کی فہرست
+NewMailing=نئی ای میلنگ
+EditMailing=ای میل میں ترمیم کریں۔
+ResetMailing=ای میل دوبارہ بھیجیں۔
+DeleteMailing=ای میل کو حذف کریں۔
+DeleteAMailing=ایک ای میل کو حذف کریں۔
+PreviewMailing=ای میل کا پیش نظارہ کریں۔
+CreateMailing=ای میل بنائیں
+TestMailing=ای میل کی جانچ کریں۔
+ValidMailing=درست ای میلنگ
+MailingStatusDraft=مسودہ
+MailingStatusValidated=تصدیق شدہ
+MailingStatusSent=بھیجا
+MailingStatusSentPartialy=جزوی طور پر بھیجا گیا۔
+MailingStatusSentCompletely=مکمل طور پر بھیج دیا گیا۔
+MailingStatusError=خرابی
+MailingStatusNotSent=بھیجا نہیں۔
+MailSuccessfulySent=ای میل (%s سے %s تک) ڈیلیوری کے لیے کامیابی کے ساتھ قبول کر لی گئی
+MailingSuccessfullyValidated=ای میل کی توثیق کامیابی سے ہو گئی۔
+MailUnsubcribe=ان سبسکرائب کریں۔
+MailingStatusNotContact=اب رابطہ مت کرنا
+MailingStatusReadAndUnsubscribe=پڑھیں اور ان سبسکرائب کریں۔
+ErrorMailRecipientIsEmpty=ای میل وصول کنندہ خالی ہے۔
+WarningNoEMailsAdded=وصول کنندہ کی فہرست میں شامل کرنے کے لیے کوئی نیا ای میل نہیں ہے۔
+ConfirmValidMailing=کیا آپ واقعی اس ای میل کی توثیق کرنا چاہتے ہیں؟
+ConfirmResetMailing=انتباہ، <b> %s </b> ای میل کو دوبارہ شروع کرکے، آپ اس ای میل کو بلک میلنگ میں دوبارہ بھیجنے کی اجازت دیں گے۔ کیا آپ واقعی یہ کرنا چاہتے ہیں؟
+ConfirmDeleteMailing=کیا آپ واقعی اس ای میل کو حذف کرنا چاہتے ہیں؟
+NbOfUniqueEMails=منفرد ای میلز کی تعداد
+NbOfEMails=ای میلز کی تعداد
+TotalNbOfDistinctRecipients=مختلف وصول کنندگان کی تعداد
+NoTargetYet=ابھی تک کوئی وصول کنندگان کی وضاحت نہیں کی گئی (ٹیب 'وصول کنندگان' پر جائیں)
+NoRecipientEmail=%s کے لیے کوئی وصول کنندہ ای میل نہیں ہے۔
+RemoveRecipient=وصول کنندہ کو ہٹا دیں۔
+YouCanAddYourOwnPredefindedListHere=اپنا ای میل سلیکٹر ماڈیول بنانے کے لیے، htdocs/core/modules/mailings/README دیکھیں۔
+EMailTestSubstitutionReplacedByGenericValues=ٹیسٹ موڈ استعمال کرتے وقت، متبادل متغیرات کو عام اقدار سے بدل دیا جاتا ہے۔
+MailingAddFile=اس فائل کو منسلک کریں۔
+NoAttachedFiles=کوئی منسلک فائلیں نہیں۔
+BadEMail=ای میل کے لیے خراب قدر
+EMailNotDefined=ای میل کی وضاحت نہیں کی گئی۔
+ConfirmCloneEMailing=کیا آپ واقعی اس ای میل کو کلون کرنا چاہتے ہیں؟
+CloneContent=کلون پیغام
+CloneReceivers=کلونر وصول کنندگان
+DateLastSend=تازہ ترین بھیجنے کی تاریخ
+DateSending=بھیجنے کی تاریخ
+SentTo=<b> %s </b> پر بھیجا
+MailingStatusRead=پڑھیں
+YourMailUnsubcribeOK=ای میل <b> %s </b> درست طریقے سے میلنگ لسٹ سے ان سبسکرائب کیا گیا ہے
+ActivateCheckReadKey="ریڈ رسید" اور "ان سبسکرائب" خصوصیت کے لیے استعمال ہونے والی یو آر ایل کو خفیہ کرنے کے لیے استعمال ہونے والی کلید
+EMailSentToNRecipients=%s وصول کنندگان کو ای میل بھیجی گئی۔
+EMailSentForNElements=%s عناصر کے لیے ای میل بھیجی گئی۔
+XTargetsAdded= <b> %s </b> وصول کنندگان کو ہدف کی فہرست میں شامل کیا گیا
+OnlyPDFattachmentSupported=اگر پی ڈی ایف دستاویزات اشیاء کو بھیجنے کے لیے پہلے ہی تیار کی گئی ہیں، تو وہ ای میل کے ساتھ منسلک کر دی جائیں گی۔ اگر نہیں، تو کوئی ای میل نہیں بھیجا جائے گا (یہ بھی نوٹ کریں کہ اس ورژن میں بڑے پیمانے پر بھیجنے میں صرف پی ڈی ایف دستاویزات ہی منسلکات کے طور پر معاون ہیں)۔
+AllRecipientSelected=%s ریکارڈ کے وصول کنندگان نے منتخب کیا (اگر ان کا ای میل معلوم ہو)۔
+GroupEmails=گروپ ای میلز
+OneEmailPerRecipient=فی وصول کنندہ ایک ای میل (بطور ڈیفالٹ، ایک ای میل فی ریکارڈ منتخب)
+WarningIfYouCheckOneRecipientPerEmail=وارننگ، اگر آپ اس باکس کو نشان زد کرتے ہیں، تو اس کا مطلب ہے کہ منتخب کردہ کئی مختلف ریکارڈز کے لیے صرف ایک ای میل بھیجی جائے گی، اس لیے، اگر آپ کے پیغام میں متبادل متغیرات ہیں جو ریکارڈ کے ڈیٹا کا حوالہ دیتے ہیں، تو ان کو تبدیل کرنا ممکن نہیں ہوگا۔
+ResultOfMailSending=بڑے پیمانے پر ای میل بھیجنے کا نتیجہ
+NbSelected=نمبر منتخب کیا گیا۔
+NbIgnored=نمبر نظر انداز کر دیا گیا۔
+NbSent=نمبر بھیجا گیا۔
+SentXXXmessages=%s پیغام بھیجے گئے۔
+ConfirmUnvalidateEmailing=کیا آپ واقعی ای میل <b> %s </b> کو ڈرافٹ اسٹیٹس میں تبدیل کرنا چاہتے ہیں؟
+MailingModuleDescContactsWithThirdpartyFilter=کسٹمر فلٹرز سے رابطہ کریں۔
+MailingModuleDescContactsByCompanyCategory=تیسرے فریق کے زمرے کے لحاظ سے رابطے
+MailingModuleDescContactsByCategory=زمرے کے لحاظ سے رابطے
+MailingModuleDescContactsByFunction=پوزیشن کے لحاظ سے رابطے
+MailingModuleDescEmailsFromFile=فائل سے ای میلز
+MailingModuleDescEmailsFromUser=صارف کے ذریعے ای میلز کا ان پٹ
+MailingModuleDescDolibarrUsers=ای میلز والے صارفین
+MailingModuleDescThirdPartiesByCategories=تیسرے فریق (زمرے کے لحاظ سے)
+SendingFromWebInterfaceIsNotAllowed=ویب انٹرفیس سے بھیجنے کی اجازت نہیں ہے۔
+EmailCollectorFilterDesc=ای میل جمع کرنے کے لیے تمام فلٹرز کا مماثل ہونا چاہیے۔
+
+# Libelle des modules de liste de destinataires mailing
+LineInFile=فائل میں لائن %s
+RecipientSelectionModules=وصول کنندہ کے انتخاب کے لیے وضاحتی درخواستیں۔
+MailSelectedRecipients=منتخب وصول کنندگان
+MailingArea=ای میلنگ ایریا
+LastMailings=تازہ ترین %s ای میلز
+TargetsStatistics=اہداف کے اعدادوشمار
+NbOfCompaniesContacts=منفرد رابطے/پتے
+MailNoChangePossible=تصدیق شدہ ای میل کے وصول کنندگان کو تبدیل نہیں کیا جا سکتا
+SearchAMailing=میلنگ تلاش کریں۔
+SendMailing=ای میل بھیجیں۔
+SentBy=کی طرف سے بھیجا
+MailingNeedCommand=ای میل بھیجنا کمانڈ لائن سے انجام دیا جاسکتا ہے۔ اپنے سرور کے منتظم سے تمام وصول کنندگان کو ای میل بھیجنے کے لیے درج ذیل کمانڈ شروع کرنے کو کہیں۔
+MailingNeedCommand2=تاہم آپ MAILING_LIMIT_SENDBYWEB پیرامیٹر شامل کرکے انہیں آن لائن بھیج سکتے ہیں جس کی قیمت آپ سیشن کے ذریعے بھیجنا چاہتے ہیں۔ اس کے لیے ہوم - سیٹ اپ - دیگر پر جائیں۔
+ConfirmSendingEmailing=اگر آپ اس اسکرین سے براہ راست ای میل بھیجنا چاہتے ہیں، تو براہ کرم تصدیق کریں کہ آپ کو یقین ہے کہ آپ ابھی اپنے براؤزر سے ای میل بھیجنا چاہتے ہیں؟
+LimitSendingEmailing=نوٹ: ویب انٹرفیس سے ای میل بھیجنا سیکیورٹی اور ٹائم آؤٹ وجوہات کی بناء پر کئی بار کیا جاتا ہے، <b> %s </b> وصول کنندگان ہر بھیجنے والے سیشن کے لیے ایک وقت میں۔
+TargetsReset=فہرست صاف کریں۔
+ToClearAllRecipientsClickHere=اس ای میل کے لیے وصول کنندگان کی فہرست کو صاف کرنے کے لیے یہاں کلک کریں۔
+ToAddRecipientsChooseHere=فہرستوں میں سے انتخاب کرکے وصول کنندگان کو شامل کریں۔
+NbOfEMailingsReceived=بڑے پیمانے پر ای میلز موصول ہوئیں
+NbOfEMailingsSend=بڑے پیمانے پر ای میلز بھیجی گئیں۔
+IdRecord=شناختی ریکارڈ
+DeliveryReceipt=ڈیلیوری Ack.
+YouCanUseCommaSeparatorForSeveralRecipients=آپ متعدد وصول کنندگان کی وضاحت کرنے کے لیے <b> کوما </b> الگ کرنے والا استعمال کر سکتے ہیں۔
+TagCheckMail=میل کھولنے کو ٹریک کریں۔
+TagUnsubscribe=لنک ان سبسکرائب کریں۔
+TagSignature=بھیجنے والے صارف کے دستخط
+EMailRecipient=وصول کنندہ کا ای میل
+TagMailtoEmail=وصول کنندہ کا ای میل (بشمول html "mailto:" لنک)
+NoEmailSentBadSenderOrRecipientEmail=کوئی ای میل نہیں بھیجی گئی۔ برا بھیجنے والا یا وصول کنندہ کا ای میل۔ صارف کے پروفائل کی تصدیق کریں۔
+# Module Notifications
+Notifications=اطلاعات
+NotificationsAuto=اطلاعات آٹو۔
+NoNotificationsWillBeSent=اس ایونٹ کی قسم اور کمپنی کے لیے کوئی خودکار ای میل اطلاعات کا منصوبہ نہیں ہے۔
+ANotificationsWillBeSent=1 خودکار اطلاع بذریعہ ای میل بھیجی جائے گی۔
+SomeNotificationsWillBeSent=%s خودکار اطلاعات بذریعہ ای میل بھیجی جائیں گی۔
+AddNewNotification=ایک نئے خودکار ای میل نوٹیفکیشن کو سبسکرائب کریں (ٹارگٹ/ایونٹ)
+ListOfActiveNotifications=خودکار ای میل اطلاع کے لیے تمام فعال سبسکرپشنز (اہداف/ایونٹس) کی فہرست
+ListOfNotificationsDone=بھیجے گئے تمام خودکار ای میل اطلاعات کی فہرست
+MailSendSetupIs=ای میل بھیجنے کی ترتیب کو '%s' پر ترتیب دیا گیا ہے۔ یہ موڈ بڑے پیمانے پر ای میل بھیجنے کے لیے استعمال نہیں کیا جا سکتا۔
+MailSendSetupIs2=آپ کو پہلے ایڈمن اکاؤنٹ کے ساتھ مینو میں جانا چاہیے اس موڈ کے ساتھ، آپ اپنے انٹرنیٹ سروس پرووائیڈر کی طرف سے فراہم کردہ SMTP سرور کا سیٹ اپ درج کر سکتے ہیں اور ماس ای میلنگ فیچر استعمال کر سکتے ہیں۔
+MailSendSetupIs3=اگر آپ کے پاس اپنے SMTP سرور کو سیٹ اپ کرنے کے بارے میں کوئی سوال ہے، تو آپ %s سے پوچھ سکتے ہیں۔
+YouCanAlsoUseSupervisorKeyword=صارف کے نگران کو ای میل بھیجنے کے لیے آپ کلیدی لفظ <strong> __SUPERVISOREMAIL__ </strong> بھی شامل کر سکتے ہیں (صرف اس صورت میں کام کرتا ہے جب اس سپروائزر کے لیے ای میل کی وضاحت کی گئی ہو)
+NbOfTargetedContacts=ھدف بنائے گئے رابطہ ای میلز کی موجودہ تعداد
+UseFormatFileEmailToTarget=درآمد شدہ فائل میں <strong> ای میل؛ نام؛ پہلا نام؛ دیگر </strong> فارمیٹ ہونا ضروری ہے
+UseFormatInputEmailToTarget=فارمیٹ <strong> ای میل؛ نام؛ پہلا نام؛ دیگر </strong> کے ساتھ ایک سٹرنگ درج کریں
+MailAdvTargetRecipients=وصول کنندگان (جدید انتخاب)
+AdvTgtTitle=تیسرے فریقوں یا رابطوں/پتے کو ہدف بنانے کے لیے پہلے سے منتخب کرنے کے لیے ان پٹ فیلڈز کو پُر کریں۔
+AdvTgtSearchTextHelp=%% کو وائلڈ کارڈ کے طور پر استعمال کریں۔ مثال کے طور پر <b> jean, joe, jim </b> جیسے تمام آئٹم کو تلاش کرنے کے لیے، آپ <b> j%% a09a4b739f17f18 بھی ان پٹ کر سکتے ہیں؛ قدر کے لیے جداکار کے طور پر، اور استعمال کریں! اس قدر کے علاوہ۔ مثال کے طور پر <b> jean;joe;jim%%;!jimo;!jima%% </b> تمام جین کو نشانہ بنائے گا، جو، جم سے شروع کرے گا لیکن ہر چیز کو جی سے شروع نہیں کرے گا۔
+AdvTgtSearchIntHelp=int یا فلوٹ ویلیو کو منتخب کرنے کے لیے وقفہ استعمال کریں۔
+AdvTgtMinVal=کم از کم قدر
+AdvTgtMaxVal=زیادہ سے زیادہ قدر
+AdvTgtSearchDtHelp=تاریخ کی قدر منتخب کرنے کے لیے وقفہ استعمال کریں۔
+AdvTgtStartDt=تاریخ شروع کریں۔
+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/ur_PK/main.lang b/htdocs/langs/ur_PK/main.lang
new file mode 100644
index 00000000000..8e3147fb32f
--- /dev/null
+++ b/htdocs/langs/ur_PK/main.lang
@@ -0,0 +1,1166 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=rtl
+# 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=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
+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=ڈیٹا بیس کنکشن
+NoTemplateDefined=اس ای میل کی قسم کے لیے کوئی ٹیمپلیٹ دستیاب نہیں ہے۔
+AvailableVariables=دستیاب متبادل متغیرات
+NoTranslation=کوئی ترجمہ نہیں
+Translation=ترجمہ
+CurrentTimeZone=ٹائم زون پی ایچ پی (سرور)
+EmptySearchString=غیر خالی تلاش کے معیارات درج کریں۔
+EnterADateCriteria=تاریخ کا معیار درج کریں۔
+NoRecordFound=کوئی ریکارڈ نہیں ملا
+NoRecordDeleted=کوئی ریکارڈ حذف نہیں ہوا۔
+NotEnoughDataYet=کافی ڈیٹا نہیں ہے۔
+NoError=کوئی غلطی نہیں۔
+Error=خرابی
+Errors=غلطیاں
+ErrorFieldRequired=فیلڈ '%s' درکار ہے۔
+ErrorFieldFormat=فیلڈ '%s' کی قدر خراب ہے۔
+ErrorFileDoesNotExists=فائل %s موجود نہیں ہے۔
+ErrorFailedToOpenFile=فائل %s کھولنے میں ناکام
+ErrorCanNotCreateDir=dir %s نہیں بنا سکتے
+ErrorCanNotReadDir=dir %s نہیں پڑھ سکتا
+ErrorConstantNotDefined=پیرامیٹر %s کی وضاحت نہیں کی گئی ہے۔
+ErrorUnknown=نامعلوم خامی
+ErrorSQL=ایس کیو ایل کی خرابی۔
+ErrorLogoFileNotFound=لوگو فائل '%s' نہیں ملی
+ErrorGoToGlobalSetup=اسے ٹھیک کرنے کے لیے 'کمپنی/تنظیم' سیٹ اپ پر جائیں۔
+ErrorGoToModuleSetup=اسے ٹھیک کرنے کے لیے ماڈیول سیٹ اپ پر جائیں۔
+ErrorFailedToSendMail=میل بھیجنے میں ناکام (بھیجنے والا=%s, وصول کنندہ=%s)
+ErrorFileNotUploaded=فائل اپ لوڈ نہیں ہوئی تھی۔ چیک کریں کہ سائز زیادہ سے زیادہ اجازت سے زیادہ نہیں ہے، وہ خالی جگہ ڈسک پر دستیاب ہے اور یہ کہ اس ڈائرکٹری میں پہلے سے ہی اسی نام کی کوئی فائل موجود نہیں ہے۔
+ErrorInternalErrorDetected=خرابی کا پتہ چلا
+ErrorWrongHostParameter=غلط میزبان پیرامیٹر
+ErrorYourCountryIsNotDefined=آپ کا ملک متعین نہیں ہے۔ Home-Setup-Edit پر جائیں اور فارم کو دوبارہ پوسٹ کریں۔
+ErrorRecordIsUsedByChild=اس ریکارڈ کو حذف کرنے میں ناکام۔ یہ ریکارڈ کم از کم ایک بچے کے ریکارڈ کے ذریعے استعمال کیا جاتا ہے۔
+ErrorWrongValue=غلط قدر
+ErrorWrongValueForParameterX=پیرامیٹر %s کے لیے غلط قدر
+ErrorNoRequestInError=غلطی سے کوئی درخواست نہیں۔
+ErrorServiceUnavailableTryLater=سروس اس وقت دستیاب نہیں ہے۔ بعد میں دوبارہ کوشش کریں۔
+ErrorDuplicateField=ایک منفرد فیلڈ میں ڈپلیکیٹ قدر
+ErrorSomeErrorWereFoundRollbackIsDone=کچھ غلطیاں پائی گئیں۔ تبدیلیاں واپس کر دی گئی ہیں۔
+ErrorConfigParameterNotDefined=پیرامیٹر <b> %s </b> Dolibarr کنفگ فائل <b> conf.php </b> میں بیان نہیں کیا گیا ہے۔
+ErrorCantLoadUserFromDolibarrDatabase=Dolibarr ڈیٹا بیس میں <b> %s </b> صارف کو تلاش کرنے میں ناکام۔
+ErrorNoVATRateDefinedForSellerCountry=خرابی، ملک '%s' کے لیے کوئی وٹ ریٹ متعین نہیں ہے۔
+ErrorNoSocialContributionForSellerCountry=خرابی، ملک '%s' کے لیے سماجی/مالیاتی ٹیکس کی قسم کی وضاحت نہیں کی گئی ہے۔
+ErrorFailedToSaveFile=خرابی، فائل کو محفوظ کرنے میں ناکام۔
+ErrorCannotAddThisParentWarehouse=آپ پیرنٹ گودام کو شامل کرنے کی کوشش کر رہے ہیں جو پہلے سے موجود گودام کا بچہ ہے۔
+FieldCannotBeNegative=فیلڈ "%s" منفی نہیں ہو سکتی
+MaxNbOfRecordPerPage=زیادہ سے زیادہ فی صفحہ ریکارڈز کی تعداد
+NotAuthorized=آپ ایسا کرنے کے مجاز نہیں ہیں۔
+SetDate=تاریخ مقرر کریں۔
+SelectDate=ایک تاریخ منتخب کریں۔
+SeeAlso=%s بھی دیکھیں
+SeeHere=یہاں دیکھیں
+ClickHere=یہاں کلک کریں
+Here=یہاں
+Apply=درخواست دیں
+BackgroundColorByDefault=پہلے سے طے شدہ پس منظر کا رنگ
+FileRenamed=فائل کا نام کامیابی کے ساتھ بدل دیا گیا۔
+FileGenerated=فائل کامیابی کے ساتھ تیار ہو گئی۔
+FileSaved=فائل کامیابی کے ساتھ محفوظ ہو گئی۔
+FileUploaded=فائل کامیابی کے ساتھ اپ لوڈ ہو گئی۔
+FileTransferComplete=فائل (فائلیں) کامیابی کے ساتھ اپ لوڈ ہو گئیں۔
+FilesDeleted=فائل (فائلیں) کامیابی کے ساتھ حذف ہو گئیں۔
+FileWasNotUploaded=منسلکہ کے لیے ایک فائل کا انتخاب کیا گیا ہے لیکن ابھی تک اپ لوڈ نہیں کیا گیا تھا۔ اس کے لیے "اٹیچ فائل" پر کلک کریں۔
+NbOfEntries=اندراج کی تعداد
+GoToWikiHelpPage=آن لائن مدد پڑھیں (انٹرنیٹ تک رسائی درکار ہے)
+GoToHelpPage=مدد پڑھیں
+DedicatedPageAvailable=آپ کی موجودہ اسکرین سے متعلق سرشار مدد کا صفحہ
+HomePage=ہوم پیج
+RecordSaved=ریکارڈ محفوظ ہو گیا۔
+RecordDeleted=ریکارڈ حذف کر دیا گیا۔
+RecordGenerated=ریکارڈ بنایا
+LevelOfFeature=خصوصیات کی سطح
+NotDefined=متعین نہیں۔
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr توثیق کا موڈ <b> %s </b> کنفیگریشن فائل میں <b> conf.php a09a4b739f17f17f پر سیٹ ہے۔ <br> اس کا مطلب ہے کہ پاس ورڈ ڈیٹا بیس Dolibarr سے باہر ہے، اس لیے اس فیلڈ کو تبدیل کرنے کا کوئی اثر نہیں ہو سکتا۔
+Administrator=ایڈمنسٹریٹر
+Undefined=غیر متعینہ
+PasswordForgotten=پاس ورڈ بھول گئے؟
+NoAccount=کوئی اکاؤنٹ نہیں؟
+SeeAbove=اوپر ملاحظہ کریں
+HomeArea=گھر
+LastConnexion=آخری لاگ ان
+PreviousConnexion=پچھلا لاگ ان
+PreviousValue=پچھلی قدر
+ConnectedOnMultiCompany=ماحولیات سے جڑا ہوا ہے۔
+ConnectedSince=تب سے جڑا ہوا ہے۔
+AuthenticationMode=توثیق کا موڈ
+RequestedUrl=درخواست کردہ URL
+DatabaseTypeManager=ڈیٹا بیس ٹائپ مینیجر
+RequestLastAccessInError=تازہ ترین ڈیٹا بیس تک رسائی کی درخواست کی خرابی۔
+ReturnCodeLastAccessInError=تازہ ترین ڈیٹا بیس تک رسائی کی درخواست کی خرابی کے لیے واپسی کوڈ
+InformationLastAccessInError=تازہ ترین ڈیٹا بیس تک رسائی کی درخواست کی خرابی کی معلومات
+DolibarrHasDetectedError=Dolibarr کو تکنیکی خرابی کا پتہ چلا ہے۔
+YouCanSetOptionDolibarrMainProdToZero=آپ لاگ فائل پڑھ سکتے ہیں یا مزید معلومات حاصل کرنے کے لیے اپنی کنفگ فائل میں آپشن $dolibarr_main_prod کو '0' پر سیٹ کر سکتے ہیں۔
+InformationToHelpDiagnose=یہ معلومات تشخیصی مقاصد کے لیے کارآمد ہو سکتی ہے (حساس معلومات کو چھپانے کے لیے آپ اختیار $dolibarr_main_prod کو '1' پر سیٹ کر سکتے ہیں)
+MoreInformation=مزید معلومات
+TechnicalInformation=تکنیکی معلومات
+TechnicalID=تکنیکی ID
+LineID=لائن ID
+NotePublic=نوٹ (عوامی)
+NotePrivate=نوٹ (نجی)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr کو یونٹ کی قیمتوں کی درستگی کو <b> %s </b> اعشاریہ تک محدود کرنے کے لیے ترتیب دیا گیا تھا۔
+DoTest=پرکھ
+ToFilter=فلٹر
+NoFilter=کوئی فلٹر نہیں۔
+WarningYouHaveAtLeastOneTaskLate=تنبیہ، آپ کے پاس کم از کم ایک عنصر ہے جو برداشت کے وقت سے تجاوز کر گیا ہے۔
+yes=جی ہاں
+Yes=جی ہاں
+no=نہیں
+No=نہیں
+All=تمام
+Home=گھر
+Help=مدد
+OnlineHelp=آن لائن مدد
+PageWiki=ویکی پیج
+MediaBrowser=میڈیا براؤزر
+Always=ہمیشہ
+Never=کبھی نہیں
+Under=کے تحت
+Period=مدت
+PeriodEndDate=مدت کے لیے آخری تاریخ
+SelectedPeriod=منتخب مدت
+PreviousPeriod=پچھلی مدت
+Activate=محرک کریں
+Activated=چالو
+Closed=بند
+Closed2=بند
+NotClosed=بند نہیں ہوا۔
+Enabled=فعال
+Enable=فعال
+Deprecated=فرسودہ
+Disable=غیر فعال کریں۔
+Disabled=معذور
+Add=شامل کریں۔
+AddLink=لنک شامل کریں۔
+RemoveLink=لنک ہٹا دیں۔
+AddToDraft=مسودے میں شامل کریں۔
+Update=اپ ڈیٹ
+Close=بند کریں
+CloseAs=اسٹیٹس کو سیٹ کریں۔
+CloseBox=اپنے ڈیش بورڈ سے ویجیٹ کو ہٹا دیں۔
+Confirm=تصدیق کریں۔
+ConfirmSendCardByMail=کیا آپ واقعی اس کارڈ کا مواد بذریعہ ڈاک <b> %s </b> پر بھیجنا چاہتے ہیں؟
+Delete=حذف کریں۔
+Remove=دور
+Resiliate=ختم کرنا
+Cancel=منسوخ کریں۔
+Modify=ترمیم کریں۔
+Edit=ترمیم
+Validate=تصدیق کریں۔
+ValidateAndApprove=توثیق کریں اور منظور کریں۔
+ToValidate=توثیق کرنا
+NotValidated=تصدیق شدہ نہیں۔
+Save=محفوظ کریں۔
+SaveAs=ایسے محفوظ کریں
+SaveAndStay=محفوظ کریں اور رہیں
+SaveAndNew=محفوظ کریں اور نیا
+TestConnection=ٹیسٹ کنکشن
+ToClone=کلون
+ConfirmCloneAsk=کیا آپ واقعی <b> %s </b> آبجیکٹ کلون کرنا چاہتے ہیں؟
+ConfirmClone=وہ ڈیٹا منتخب کریں جسے آپ کلون کرنا چاہتے ہیں:
+NoCloneOptionsSpecified=کلون کرنے کے لیے کوئی ڈیٹا متعین نہیں ہے۔
+Of=کی
+Go=جاؤ
+Run=رن
+CopyOf=کی کاپی
+Show=دکھائیں۔
+Hide=چھپائیں
+ShowCardHere=کارڈ دکھائیں۔
+Search=تلاش کریں۔
+SearchOf=تلاش کریں۔
+SearchMenuShortCut=Ctrl + shift + f
+QuickAdd=جلدی شامل کریں۔
+QuickAddMenuShortCut=Ctrl + shift + l
+Valid=درست
+Approve=منظور کرو
+Disapprove=نامنظور کرنا
+ReOpen=دوبارہ کھولیں۔
+Upload=اپ لوڈ کریں۔
+ToLink=لنک
+Select=منتخب کریں۔
+SelectAll=تمام منتخب کریں
+Choose=منتخب کریں۔
+Resize=سائز تبدیل کریں۔
+ResizeOrCrop=سائز تبدیل کریں یا کاٹیں۔
+Recenter=دوبارہ مرکز کرنا
+Author=مصنف
+User=صارف
+Users=صارفین
+Group=گروپ
+Groups=گروپس
+UserGroup=User group
+UserGroups=User groups
+NoUserGroupDefined=کسی صارف گروپ کی وضاحت نہیں کی گئی۔
+Password=پاس ورڈ
+PasswordRetype=اپنا پاس ورڈ دوبارہ ٹائپ کریں۔
+NoteSomeFeaturesAreDisabled=نوٹ کریں کہ اس مظاہرے میں بہت ساری خصوصیات/ماڈیولز غیر فعال ہیں۔
+Name=نام
+NameSlashCompany=نام / کمپنی
+Person=شخص
+Parameter=پیرامیٹر
+Parameters=پیرامیٹرز
+Value=قدر
+PersonalValue=ذاتی قدر
+NewObject=نیا %s
+NewValue=نئی قدر
+OldValue=پرانی قدر %s
+CurrentValue=موجودہ قیمت
+Code=کوڈ
+Type=قسم
+Language=زبان
+MultiLanguage=کثیر زبان
+Note=نوٹ
+Title=عنوان
+Label=لیبل
+RefOrLabel=حوالہ یا لیبل
+Info=لاگ
+Family=خاندان
+Description=تفصیل
+Designation=تفصیل
+DescriptionOfLine=لائن کی تفصیل
+DateOfLine=لائن کی تاریخ
+DurationOfLine=لائن کا دورانیہ
+Model=دستاویز ٹیمپلیٹ
+DefaultModel=ڈیفالٹ دستاویز ٹیمپلیٹ
+Action=تقریب
+About=کے بارے میں
+Number=نمبر
+NumberByMonth=ماہ کے لحاظ سے کل رپورٹس
+AmountByMonth=ماہ کے حساب سے رقم
+Numero=نمبر
+Limit=حد
+Limits=حدود
+Logout=لاگ آوٹ
+NoLogoutProcessWithAuthMode=تصدیق موڈ کے ساتھ کوئی قابل اطلاق منقطع خصوصیت <b> %s </b>
+Connection=لاگ ان کریں
+Setup=سیٹ اپ
+Alert=الرٹ
+MenuWarnings=انتباہات
+Previous=پچھلا
+Next=اگلے
+Cards=کارڈز
+Card=کارڈ
+Now=ابھی
+HourStart=آغاز کا وقت
+Deadline=ڈیڈ لائن
+Date=تاریخ
+DateAndHour=تاریخ اور گھنٹہ
+DateToday=آج کی تاریخ
+DateReference=حوالہ تاریخ
+DateStart=شروع کرنے کی تاریخ
+DateEnd=آخری تاریخ
+DateCreation=بنانے کی تاریخ
+DateCreationShort=بنائیں۔ تاریخ
+IPCreation=تخلیق آئی پی
+DateModification=ترمیم کی تاریخ
+DateModificationShort=موڈیف تاریخ
+IPModification=ترمیم آئی پی
+DateLastModification=تازہ ترین ترمیم کی تاریخ
+DateValidation=توثیق کی تاریخ
+DateSigning=دستخط کرنے کی تاریخ
+DateClosing=آخری تاریخ
+DateDue=واجب الادا تاریخ
+DateValue=قیمت کی تاریخ
+DateValueShort=قیمت کی تاریخ
+DateOperation=آپریشن کی تاریخ
+DateOperationShort=اوپری تاریخ
+DateLimit=حد کی تاریخ
+DateRequest=درخواست کی تاریخ
+DateProcess=عمل کی تاریخ
+DateBuild=تعمیر کی تاریخ کی اطلاع دیں۔
+DatePayment=ادائیگی کی تاریخ
+DateApprove=منظوری کی تاریخ
+DateApprove2=منظوری کی تاریخ (دوسری منظوری)
+RegistrationDate=رجسٹریشن کی تاریخ
+UserCreation=تخلیق صارف
+UserModification=ترمیم کرنے والا صارف
+UserValidation=توثیق کرنے والا صارف
+UserCreationShort=بنائیں۔ صارف
+UserModificationShort=موڈیف صارف
+UserValidationShort=درست صارف
+DurationYear=سال
+DurationMonth=مہینہ
+DurationWeek=ہفتہ
+DurationDay=دن
+DurationYears=سال
+DurationMonths=مہینے
+DurationWeeks=ہفتے
+DurationDays=دن
+Year=سال
+Month=مہینہ
+Week=ہفتہ
+WeekShort=ہفتہ
+Day=دن
+Hour=گھنٹہ
+Minute=منٹ
+Second=دوسرا
+Years=سال
+Months=مہینے
+Days=دن
+days=دن
+Hours=گھنٹے
+Minutes=منٹ
+Seconds=سیکنڈز
+Weeks=ہفتے
+Today=آج
+Yesterday=کل
+Tomorrow=کل
+Morning=صبح
+Afternoon=دوپہر
+Quadri=قادری
+MonthOfDay=دن کا مہینہ
+DaysOfWeek=ہفتے کے دن
+HourShort=ایچ
+MinuteShort=mn
+Rate=شرح
+CurrencyRate=کرنسی کی تبدیلی کی شرح
+UseLocalTax=ٹیکس شامل کریں۔
+Bytes=بائٹس
+KiloBytes=کلو بائٹس
+MegaBytes=میگا بائٹس
+GigaBytes=گیگا بائٹس
+TeraBytes=ٹیرا بائٹس
+UserAuthor=کی طرف سے مقرر
+UserModif=کی طرف سے اپ ڈیٹ
+b=ب
+Kb=Kb
+Mb=ایم بی
+Gb=جی بی
+Tb=ٹی بی
+Cut=کاٹنا
+Copy=کاپی کریں۔
+Paste=چسپاں کریں۔
+Default=طے شدہ
+DefaultValue=پہلے سے طے شدہ قیمت
+DefaultValues=پہلے سے طے شدہ اقدار/فلٹرز/چھانٹنا
+Price=قیمت
+PriceCurrency=قیمت (کرنسی)
+UnitPrice=اکائی قیمت
+UnitPriceHT=یونٹ کی قیمت (سوائے)
+UnitPriceHTCurrency=یونٹ کی قیمت (ماسوائے) (کرنسی)
+UnitPriceTTC=اکائی قیمت
+PriceU=U.P
+PriceUHT=U.P (جال)
+PriceUHTCurrency=U.P (نیٹ) (کرنسی)
+PriceUTTC=U.P (inc. ٹیکس)
+Amount=رقم
+AmountInvoice=بل کی رقم
+AmountInvoiced=رسید کی رقم
+AmountInvoicedHT=انوائس کی رقم (ٹیکس کے علاوہ)
+AmountInvoicedTTC=انوائس کی رقم (انک ٹیکس)
+AmountPayment=ادائیگی کی رقم
+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=کل آئی آر پی ایف
+TotalLT1IN=کل CGST
+TotalLT2IN=کل SGST
+HT=Excl. ٹیکس
+TTC=Inc. ٹیکس
+INCVATONLY=Inc. VAT
+INCT=Inc. تمام ٹیکس
+VAT=سیلز ٹیکس
+VATIN=آئی جی ایس ٹی
+VATs=سیلز ٹیکس
+VATINs=IGST ٹیکس
+LT1=سیلز ٹیکس 2
+LT1Type=سیلز ٹیکس 2 قسم
+LT2=سیلز ٹیکس 3
+LT2Type=سیلز ٹیکس 3 قسم
+LT1ES=RE
+LT2ES=آئی آر پی ایف
+LT1IN=سی جی ایس ٹی
+LT2IN=ایس جی ایس ٹی
+LT1GC=اضافی سینٹ
+VATRate=ٹیکس کی شرح
+RateOfTaxN=ٹیکس کی شرح %s
+VATCode=ٹیکس کی شرح کوڈ
+VATNPR=ٹیکس کی شرح این پی آر
+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=تلاش کا معیار '<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=کو
+ToDate=کو
+ToLocation=کو
+at=پر
+and=اور
+or=یا
+Other=دیگر
+Others=دوسرے
+OtherInformations=دوسری معلومات
+Quantity=مقدار
+Qty=مقدار
+ChangedBy=کی طرف سے تبدیل
+ApprovedBy=کی طرف سے منظور
+ApprovedBy2=منظور شدہ (دوسری منظوری)
+Approved=منظورشدہ
+Refused=انکار کر دیا
+ReCalculate=دوبارہ حساب لگانا
+ResultKo=ناکامی
+Reporting=رپورٹنگ
+Reportings=رپورٹنگ
+Draft=مسودہ
+Drafts=ڈرافٹ
+StatusInterInvoiced=انوائس
+Validated=تصدیق شدہ
+ValidatedToProduce=تصدیق شدہ (پیدا کرنے کے لئے)
+Opened=کھولیں۔
+OpenAll=کھولیں (تمام)
+ClosedAll=بند (تمام)
+New=نئی
+Discount=رعایت
+Unknown=نامعلوم
+General=جنرل
+Size=سائز
+OriginalSize=اصل سائز
+Received=موصول ہوا۔
+Paid=ادا کیا
+Topic=مضمون
+ByCompanies=تیسرے فریق کے ذریعہ
+ByUsers=صارف کے ذریعہ
+Links=لنکس
+Link=لنک
+Rejects=رد کرتا ہے۔
+Preview=پیش نظارہ
+NextStep=اگلا قدم
+Datas=ڈیٹا
+None=کوئی نہیں۔
+NoneF=کوئی نہیں۔
+NoneOrSeveral=کوئی نہیں یا کئی
+Late=دیر
+LateDesc=مینو ہوم - سیٹ اپ - الرٹس میں سسٹم کنفیگریشن کے مطابق ایک آئٹم کو Delayed کے طور پر بیان کیا گیا ہے۔
+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=مرکزی دستاویز میں شامل ہوں۔
+DateFormatYYYYMM=YYYY-MM
+DateFormatYYYYMMDD=YYYY-MM-DD
+DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
+ReportName=رپورٹ کا نام
+ReportPeriod=رپورٹ کی مدت
+ReportDescription=تفصیل
+Report=رپورٹ
+Keyword=کلیدی لفظ
+Origin=اصل
+Legend=لیجنڈ
+Fill=بھرنا
+Reset=دوبارہ ترتیب دیں۔
+File=فائل
+Files=فائلوں
+NotAllowed=اجازت نہیں ہے
+ReadPermissionNotAllowed=پڑھنے کی اجازت نہیں ہے۔
+AmountInCurrency=%s کرنسی میں رقم
+Example=مثال
+Examples=مثالیں
+NoExample=کوئی مثال نہیں۔
+FindBug=ایک بگ کی اطلاع دیں۔
+NbOfThirdParties=تیسرے فریق کی تعداد
+NbOfLines=لائنوں کی تعداد
+NbOfObjects=اشیاء کی تعداد
+NbOfObjectReferers=متعلقہ اشیاء کی تعداد
+Referers=متعلقہ اشیاء
+TotalQuantity=کل مقدار
+DateFromTo=%s سے %s تک
+DateFrom=%s سے
+DateUntil=%s تک
+Check=چیک کریں۔
+Uncheck=غیر چیک کریں۔
+Internal=اندرونی
+External=بیرونی
+Internals=اندرونی
+Externals=بیرونی
+Warning=وارننگ
+Warnings=انتباہات
+BuildDoc=دستاویز بنائیں
+Entity=ماحولیات
+Entities=ادارے
+CustomerPreview=کسٹمر کا پیش نظارہ
+SupplierPreview=وینڈر کا پیش نظارہ
+ShowCustomerPreview=کسٹمر کا پیش نظارہ دکھائیں۔
+ShowSupplierPreview=وینڈر کا پیش نظارہ دکھائیں۔
+RefCustomer=حوالہ صارف
+InternalRef=اندرونی حوالہ۔
+Currency=کرنسی
+InfoAdmin=منتظمین کے لیے معلومات
+Undo=کالعدم
+Redo=دوبارہ کریں۔
+ExpandAll=سبھی کو پھیلائیں۔
+UndoExpandAll=توسیع کو کالعدم کریں۔
+SeeAll=تمام دیکھیں
+Reason=وجہ
+FeatureNotYetSupported=فیچر ابھی تک تعاون یافتہ نہیں ہے۔
+CloseWindow=بند کھڑکی
+Response=جواب
+Priority=ترجیح
+SendByMail=بذریعہ ای میل بھیجین
+MailSentBy=ای میل بھیجی گئی۔
+NotSent=بھیجا نہیں۔
+TextUsedInTheMessageBody=ای میل باڈی
+SendAcknowledgementByMail=تصدیقی ای میل بھیجیں۔
+SendMail=ای میل بھیجیں
+Email=ای میل
+NoEMail=کوئی ای میل نہیں۔
+AlreadyRead=پہلے ہی پڑھ چکے ہیں۔
+NotRead=ان پڑھ
+NoMobilePhone=کوئی موبائل فون نہیں۔
+Owner=مالک
+FollowingConstantsWillBeSubstituted=درج ذیل کنسٹینٹس کو متعلقہ قدر سے بدل دیا جائے گا۔
+Refresh=تازہ دم کریں۔
+BackToList=فہرست پر واپس جائیں۔
+BackToTree=واپس درخت پر
+GoBack=واپس جاو
+CanBeModifiedIfOk=اگر درست ہو تو ترمیم کی جا سکتی ہے۔
+CanBeModifiedIfKo=درست نہ ہونے کی صورت میں ترمیم کی جا سکتی ہے۔
+ValueIsValid=قدر درست ہے۔
+ValueIsNotValid=قدر درست نہیں ہے۔
+RecordCreatedSuccessfully=ریکارڈ کامیابی کے ساتھ بنایا گیا۔
+RecordModifiedSuccessfully=ریکارڈ میں کامیابی کے ساتھ ترمیم کی گئی۔
+RecordsModified=%s ریکارڈ (ریکارڈز) میں ترمیم کی گئی۔
+RecordsDeleted=%s ریکارڈ حذف کر دیا گیا۔
+RecordsGenerated=%s ریکارڈ تیار کیا گیا۔
+AutomaticCode=خودکار کوڈ
+FeatureDisabled=خصوصیت غیر فعال ہے۔
+MoveBox=ویجیٹ کو منتقل کریں۔
+Offered=کی پیشکش کی
+NotEnoughPermissions=آپ کو اس کارروائی کی اجازت نہیں ہے۔
+SessionName=سیشن کا نام
+Method=طریقہ
+Receive=وصول کریں۔
+CompleteOrNoMoreReceptionExpected=مکمل یا کچھ زیادہ متوقع نہیں۔
+ExpectedValue=متوقع قدر
+ExpectedQty=متوقع مقدار
+PartialWoman=جزوی
+TotalWoman=کل
+NeverReceived=کبھی موصول نہیں ہوا۔
+Canceled=منسوخ
+YouCanChangeValuesForThisListFromDictionarySetup=آپ مینو سیٹ اپ - ڈکشنریوں سے اس فہرست کے لیے اقدار کو تبدیل کر سکتے ہیں۔
+YouCanChangeValuesForThisListFrom=آپ مینو %s سے اس فہرست کی قدریں تبدیل کر سکتے ہیں۔
+YouCanSetDefaultValueInModuleSetup=آپ ماڈیول سیٹ اپ میں نیا ریکارڈ بناتے وقت استعمال ہونے والی ڈیفالٹ ویلیو سیٹ کر سکتے ہیں۔
+Color=رنگ
+Documents=منسلک فائلیں۔
+Documents2=دستاویزات
+UploadDisabled=اپ لوڈ غیر فعال ہے۔
+MenuAccountancy=حساب کتاب
+MenuECM=دستاویزات
+MenuAWStats=AWStats
+MenuMembers=ممبران
+MenuAgendaGoogle=گوگل ایجنڈا
+MenuTaxesAndSpecialExpenses=ٹیکسز | خصوصی اخراجات
+ThisLimitIsDefinedInSetup=Dolibarr کی حد (مینو ہوم سیٹ اپ-سیکیورٹی): %s Kb، PHP کی حد: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr کی حد (مینو %s): %s Kb، PHP کی حد (Param %s): %s Kb
+NoFileFound=کوئی دستاویزات اپ لوڈ نہیں کی گئیں۔
+CurrentUserLanguage=موجودہ زبان
+CurrentTheme=موجودہ تھیم
+CurrentMenuManager=موجودہ مینو مینیجر
+Browser=براؤزر
+Layout=ترتیب
+Screen=سکرین
+DisabledModules=غیر فعال ماڈیولز
+For=کے لیے
+ForCustomer=گاہک کے لیے
+Signature=دستخط
+DateOfSignature=دستخط کی تاریخ
+HidePassword=پوشیدہ پاس ورڈ کے ساتھ کمانڈ دکھائیں۔
+UnHidePassword=واضح پاس ورڈ کے ساتھ اصلی کمانڈ دکھائیں۔
+Root=جڑ
+RootOfMedias=عوامی میڈیا کی جڑ (/میڈیا)
+Informations=معلومات
+Page=صفحہ
+Notes=نوٹس
+AddNewLine=نئی لائن شامل کریں۔
+AddFile=فائل شامل کریں
+FreeZone=مفت ٹیکسٹ پروڈکٹ
+FreeLineOfType=مفت ٹیکسٹ آئٹم، قسم:
+CloneMainAttributes=کلون آبجیکٹ کو اس کی اہم صفات کے ساتھ
+ReGeneratePDF=پی ڈی ایف دوبارہ بنائیں
+PDFMerge=پی ڈی ایف ضم کریں۔
+Merge=ضم
+DocumentModelStandardPDF=معیاری پی ڈی ایف ٹیمپلیٹ
+PrintContentArea=مرکزی مواد کے علاقے کو پرنٹ کرنے کے لیے صفحہ دکھائیں۔
+MenuManager=مینو مینیجر
+WarningYouAreInMaintenanceMode=وارننگ، آپ مینٹیننس موڈ میں ہیں: صرف لاگ ان <b> %s </b> کو اس موڈ میں ایپلیکیشن استعمال کرنے کی اجازت ہے۔
+CoreErrorTitle=سسٹم کی خرابی۔
+CoreErrorMessage=معذرت، ایک خرابی پیش آگئی۔ لاگز کو چیک کرنے کے لیے اپنے سسٹم ایڈمنسٹریٹر سے رابطہ کریں یا مزید معلومات حاصل کرنے کے لیے $dolibarr_main_prod=1 کو غیر فعال کریں۔
+CreditCard=کریڈٹ کارڈ
+ValidatePayment=ادائیگی کی توثیق کریں۔
+CreditOrDebitCard=کریڈٹ یا ڈیبٹ کارڈ
+FieldsWithAreMandatory=<b> %s </b> والے فیلڈز لازمی ہیں
+FieldsWithIsForPublic=<b> %s </b> والے فیلڈز کو اراکین کی عوامی فہرست میں دکھایا گیا ہے۔ اگر آپ یہ نہیں چاہتے ہیں، تو "عوامی" باکس سے نشان ہٹا دیں۔
+AccordingToGeoIPDatabase=(جیو آئی پی کی تبدیلی کے مطابق)
+Line=لائن
+NotSupported=سہولت مہیا نہیں
+RequiredField=مطلوب خانہ
+Result=نتیجہ
+ToTest=پرکھ
+ValidateBefore=اس خصوصیت کو استعمال کرنے سے پہلے آئٹم کی تصدیق ہونی چاہیے۔
+Visibility=مرئیت
+Totalizable=مکمل طور پر قابل
+TotalizableDesc=یہ فیلڈ فہرست میں مکمل ہے۔
+Private=نجی
+Hidden=پوشیدہ
+Resources=حوالہ جات
+Source=ذریعہ
+Prefix=سابقہ
+Before=اس سے پہلے
+After=کے بعد
+IPAddress=IP پتہ
+Frequency=تعدد
+IM=فوری پیغام رسانی
+NewAttribute=نئی صفت
+AttributeCode=انتساب کوڈ
+URLPhoto=تصویر/لوگو کا URL
+SetLinkToAnotherThirdParty=کسی اور تیسرے فریق سے لنک کریں۔
+LinkTo=سے لنک کریں۔
+LinkToProposal=تجویز کا لنک
+LinkToOrder=آرڈر کے لیے لنک
+LinkToInvoice=انوائس سے لنک کریں۔
+LinkToTemplateInvoice=ٹیمپلیٹ انوائس کا لنک
+LinkToSupplierOrder=خریداری کے آرڈر کے لیے لنک
+LinkToSupplierProposal=وینڈر کی تجویز کا لنک
+LinkToSupplierInvoice=وینڈر انوائس سے لنک کریں۔
+LinkToContract=معاہدہ سے لنک کریں۔
+LinkToIntervention=مداخلت کا لنک
+LinkToTicket=ٹکٹ کا لنک
+LinkToMo=مو سے لنک کریں۔
+CreateDraft=ڈرافٹ بنائیں
+SetToDraft=ڈرافٹ پر واپس جائیں۔
+ClickToEdit=ترمیم کرنے کے لیے کلک کریں۔
+ClickToRefresh=ریفریش کرنے کے لیے کلک کریں۔
+EditWithEditor=CKEditor کے ساتھ ترمیم کریں۔
+EditWithTextEditor=ٹیکسٹ ایڈیٹر کے ساتھ ترمیم کریں۔
+EditHTMLSource=HTML ماخذ میں ترمیم کریں۔
+ObjectDeleted=آبجیکٹ %s حذف کر دیا گیا۔
+ByCountry=ملک کے لحاظ سے
+ByTown=شہر سے
+ByDate=تاریخ کے لحاظ سے
+ByMonthYear=ماہ/سال کے حساب سے
+ByYear=سال کے حساب سے
+ByMonth=مہینے کے حساب سے
+ByDay=دن کی طرف سے
+BySalesRepresentative=سیلز کے نمائندے کے ذریعہ
+LinkedToSpecificUsers=کسی خاص صارف کے رابطے سے منسلک
+NoResults=کوئی نتیجہ نہیں نکلا۔
+AdminTools=ایڈمن ٹولز
+SystemTools=نظام کے اوزار
+ModulesSystemTools=ماڈیولز ٹولز
+Test=پرکھ
+Element=عنصر
+NoPhotoYet=ابھی تک کوئی تصویر دستیاب نہیں ہے۔
+Dashboard=ڈیش بورڈ
+MyDashboard=میرا ڈیش بورڈ
+Deductible=قابل کٹوتی
+from=سے
+toward=کی طرف
+Access=رسائی
+SelectAction=عمل کو منتخب کریں۔
+SelectTargetUser=ہدف صارف/ملازم کو منتخب کریں۔
+HelpCopyToClipboard=کلپ بورڈ پر کاپی کرنے کے لیے Ctrl+C استعمال کریں۔
+SaveUploadedFileWithMask=سرور پر فائل کو "<strong> %s </strong>" کے ساتھ محفوظ کریں (بصورت دیگر "%s")
+OriginFileName=اصل فائل کا نام
+SetDemandReason=ذریعہ مقرر کریں۔
+SetBankAccount=بینک اکاؤنٹ کی وضاحت کریں۔
+AccountCurrency=اکاؤنٹ کی کرنسی
+ViewPrivateNote=نوٹس دیکھیں
+XMoreLines=%s لائن (لائنیں) چھپی ہوئی ہیں۔
+ShowMoreLines=زیادہ/کم لائنیں دکھائیں۔
+PublicUrl=عوامی URL
+AddBox=باکس شامل کریں۔
+SelectElementAndClick=ایک عنصر منتخب کریں اور %s پر کلک کریں۔
+PrintFile=پرنٹ فائل %s
+ShowTransaction=بینک اکاؤنٹ پر اندراج دکھائیں۔
+ShowIntervention=مداخلت دکھائیں۔
+ShowContract=معاہدہ دکھائیں۔
+GoIntoSetupToChangeLogo=ہوم - سیٹ اپ - کمپنی کا لوگو تبدیل کرنے کے لیے جائیں یا ہوم - سیٹ اپ - چھپانے کے لیے ڈسپلے پر جائیں۔
+Deny=انکار کرنا
+Denied=انکار کر دیا۔
+ListOf=%s کی فہرست
+ListOfTemplates=ٹیمپلیٹس کی فہرست
+Gender=صنف
+Genderman=مرد
+Genderwoman=عورت
+Genderother=دیگر
+ViewList=فہرست دیکھیں
+ViewGantt=گانٹ کا نظارہ
+ViewKanban=کنبن کا منظر
+Mandatory=لازمی
+Hello=ہیلو
+GoodBye=خدا حافظ
+Sincerely=مخلص
+ConfirmDeleteObject=کیا آپ واقعی اس آبجیکٹ کو حذف کرنا چاہتے ہیں؟
+DeleteLine=لائن کو حذف کریں۔
+ConfirmDeleteLine=کیا آپ واقعی اس لائن کو حذف کرنا چاہتے ہیں؟
+ErrorPDFTkOutputFileNotFound=خرابی: فائل تیار نہیں ہوئی تھی۔ براہ کرم چیک کریں کہ 'pdftk' کمانڈ $PATH ماحولیاتی متغیر (صرف linux/unix) میں شامل ڈائریکٹری میں انسٹال ہے یا اپنے سسٹم ایڈمنسٹریٹر سے رابطہ کریں۔
+NoPDFAvailableForDocGenAmongChecked=چیک شدہ ریکارڈ کے درمیان دستاویز کی تیاری کے لیے کوئی پی ڈی ایف دستیاب نہیں تھی۔
+TooManyRecordForMassAction=بڑے پیمانے پر کارروائی کے لیے بہت سارے ریکارڈ منتخب کیے گئے ہیں۔ کارروائی %s ریکارڈز کی فہرست تک محدود ہے۔
+NoRecordSelected=کوئی ریکارڈ منتخب نہیں کیا گیا۔
+MassFilesArea=بڑے پیمانے پر کارروائیوں کے ذریعے بنائی گئی فائلوں کا علاقہ
+ShowTempMassFilesArea=بڑے پیمانے پر کارروائیوں سے بنی فائلوں کا علاقہ دکھائیں۔
+ConfirmMassDeletion=بلک ڈیلیٹ کی تصدیق
+ConfirmMassDeletionQuestion=کیا آپ واقعی %s منتخب کردہ ریکارڈ (ریکارڈز) کو حذف کرنا چاہتے ہیں؟
+RelatedObjects=متعلقہ اشیاء
+ClassifyBilled=بل کی درجہ بندی کریں۔
+ClassifyUnbilled=بغیر بل کی درجہ بندی کریں۔
+Progress=پیش رفت
+ProgressShort=پروگرام
+FrontOffice=سامنے والا دفتر
+BackOffice=واپس دفتر
+Submit=جمع کرائیں
+View=دیکھیں
+Export=برآمد کریں۔
+Exports=برآمدات
+ExportFilteredList=فلٹر شدہ فہرست برآمد کریں۔
+ExportList=برآمد کی فہرست
+ExportOptions=برآمد کے اختیارات
+IncludeDocsAlreadyExported=پہلے سے برآمد شدہ دستاویزات شامل کریں۔
+ExportOfPiecesAlreadyExportedIsEnable=پہلے سے برآمد شدہ ٹکڑوں کی برآمد قابل ہے۔
+ExportOfPiecesAlreadyExportedIsDisable=پہلے سے برآمد شدہ ٹکڑوں کی برآمد غیر فعال ہے۔
+AllExportedMovementsWereRecordedAsExported=تمام برآمد شدہ نقل و حرکت بطور برآمد ریکارڈ کی گئیں۔
+NotAllExportedMovementsCouldBeRecordedAsExported=تمام برآمد شدہ نقل و حرکت کو برآمد کے طور پر ریکارڈ نہیں کیا جا سکتا
+Miscellaneous=متفرق
+Calendar=کیلنڈر
+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 اور بینک
+AutomaticallyCalculated=خود بخود حساب لگایا جاتا ہے۔
+TitleSetToDraft=ڈرافٹ پر واپس جائیں۔
+ConfirmSetToDraft=کیا آپ واقعی ڈرافٹ اسٹیٹس پر واپس جانا چاہتے ہیں؟
+ImportId=آئی ڈی درآمد کریں۔
+Events=تقریبات
+EMailTemplates=ای میل ٹیمپلیٹس
+FileNotShared=فائل بیرونی عوام کے ساتھ شیئر نہیں کی گئی۔
+Project=پروجیکٹ
+Projects=پروجیکٹس
+LeadOrProject=لیڈ | پروجیکٹ
+LeadsOrProjects=لیڈز | پروجیکٹس
+Lead=لیڈ
+Leads=لیڈز
+ListOpenLeads=کھلی لیڈز کی فہرست بنائیں
+ListOpenProjects=کھلے منصوبوں کی فہرست بنائیں
+NewLeadOrProject=نئی لیڈ یا پروجیکٹ
+Rights=اجازتیں
+LineNb=لائن نمبر
+IncotermLabel=انکوٹرمز
+TabLetteringCustomer=گاہک کا خط
+TabLetteringSupplier=وینڈر کا خط
+Monday=پیر
+Tuesday=منگل
+Wednesday=بدھ
+Thursday=جمعرات
+Friday=جمعہ
+Saturday=ہفتہ
+Sunday=اتوار
+MondayMin=مو
+TuesdayMin=ٹو
+WednesdayMin=ہم
+ThursdayMin=ویں
+FridayMin=Fr
+SaturdayMin=ص
+SundayMin=ایس یو
+Day1=پیر
+Day2=منگل
+Day3=بدھ
+Day4=جمعرات
+Day5=جمعہ
+Day6=ہفتہ
+Day0=اتوار
+ShortMonday=ایم
+ShortTuesday=ٹی
+ShortWednesday=ڈبلیو
+ShortThursday=ٹی
+ShortFriday=ایف
+ShortSaturday=ایس
+ShortSunday=ایس
+one=ایک
+two=دو
+three=تین
+four=چار
+five=پانچ
+six=چھ
+seven=سات
+eight=آٹھ
+nine=نو
+ten=دس
+eleven=گیارہ
+twelve=بارہ
+thirteen=تیسرا
+fourteen=چودہ
+fifteen=پندرہ
+sixteen=سولہ
+seventeen=سترہ
+eighteen=اٹھارہ
+nineteen=انیس
+twenty=بیس
+thirty=تیس
+forty=چالیس
+fifty=پچاس
+sixty=ساٹھ
+seventy=ستر
+eighty=اسی
+ninety=نوے
+hundred=سو
+thousand=ہزار
+million=دس لاکھ
+billion=ارب
+trillion=ٹریلین
+quadrillion=quadrillion
+SelectMailModel=ایک ای میل ٹیمپلیٹ منتخب کریں۔
+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> کوئی کردار </kbd> (ایک * ب) <br> <kbd> <strong> ^ </strong> </kbd> <kbd> شروع کریں </kbd> </kbd> ساتھ (^ AB) <br> <kbd> <strong> $ </strong> </kbd> <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=گاہک کی ادائیگی
+SearchIntoVendorPayments=وینڈر کی ادائیگی
+SearchIntoMiscPayments=متفرق ادائیگیاں
+CommentLink=تبصرے
+NbComments=تبصروں کی تعداد
+CommentPage=تبصرے کی جگہ
+CommentAdded=تبصرہ شامل کیا گیا۔
+CommentDeleted=تبصرہ حذف کر دیا گیا۔
+Everybody=ہر کوئی
+PayedBy=کی طرف سے ادا کیا
+PayedTo=کو ادائیگی
+Monthly=ماہانہ
+Quarterly=سہ ماہی
+Annual=سالانہ
+Local=مقامی
+Remote=دور دراز
+LocalAndRemote=مقامی اور دور دراز
+KeyboardShortcut=کی بورڈ شارٹ کٹ
+AssignedTo=مقرر کیا، مقرر کرنا
+Deletedraft=مسودہ حذف کریں۔
+ConfirmMassDraftDeletion=ڈرافٹ بڑے پیمانے پر حذف کرنے کی تصدیق
+FileSharedViaALink=فائل عوامی لنک کے ساتھ شیئر کی گئی۔
+SelectAThirdPartyFirst=پہلے کسی تیسرے فریق کو منتخب کریں...
+YouAreCurrentlyInSandboxMode=آپ فی الحال %s "سینڈ باکس" موڈ میں ہیں۔
+Inventory=انوینٹری
+AnalyticCode=تجزیاتی کوڈ
+TMenuMRP=ایم آر پی
+ShowCompanyInfos=کمپنی کی معلومات دکھائیں۔
+ShowMoreInfos=مزید معلومات دکھائیں۔
+NoFilesUploadedYet=براہ کرم پہلے ایک دستاویز اپ لوڈ کریں۔
+SeePrivateNote=نجی نوٹ دیکھیں
+PaymentInformation=ادائیگی کی معلومات
+ValidFrom=سے درست
+ValidUntil=قابل قبول جب تک
+NoRecordedUsers=کوئی صارف نہیں۔
+ToClose=بہت کریب
+ToRefuse=انکار کرنا
+ToProcess=عمل کے لئے
+ToApprove=منظور کرنے
+GlobalOpenedElemView=عالمی منظر
+NoArticlesFoundForTheKeyword=کلیدی لفظ '<strong> %s </strong>' کے لیے کوئی مضمون نہیں ملا۔
+NoArticlesFoundForTheCategory=زمرہ کے لیے کوئی مضمون نہیں ملا
+ToAcceptRefuse=قبول کرنا | انکار
+ContactDefault_agenda=تقریب
+ContactDefault_commande=ترتیب
+ContactDefault_contrat=معاہدہ
+ContactDefault_facture=رسید
+ContactDefault_fichinter=مداخلت
+ContactDefault_invoice_supplier=سپلائر انوائس
+ContactDefault_order_supplier=خریداری کے آرڈر
+ContactDefault_project=پروجیکٹ
+ContactDefault_project_task=کام
+ContactDefault_propal=تجویز
+ContactDefault_supplier_proposal=سپلائر کی تجویز
+ContactDefault_ticket=ٹکٹ
+ContactAddedAutomatically=رابطہ تیسرے فریق کے کرداروں سے شامل کیا گیا۔
+More=مزید
+ShowDetails=تفصیلات دکھائیں
+CustomReports=حسب ضرورت رپورٹس
+StatisticsOn=اعدادوشمار آن
+SelectYourGraphOptionsFirst=گراف بنانے کے لیے اپنے گراف کے اختیارات منتخب کریں۔
+Measures=اقدامات
+XAxis=ایکس محور
+YAxis=Y-Axis
+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=ابھی بند نہیں ہوا۔
+ClearSignature=دستخط دوبارہ ترتیب دیں۔
+CanceledHidden=چھپا ہوا منسوخ کر دیا گیا۔
+CanceledShown=منسوخ شدہ دکھایا گیا ہے۔
diff --git a/htdocs/langs/ur_PK/margins.lang b/htdocs/langs/ur_PK/margins.lang
new file mode 100644
index 00000000000..47cef686608
--- /dev/null
+++ b/htdocs/langs/ur_PK/margins.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - marges
+
+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/ur_PK/members.lang b/htdocs/langs/ur_PK/members.lang
new file mode 100644
index 00000000000..990e0431813
--- /dev/null
+++ b/htdocs/langs/ur_PK/members.lang
@@ -0,0 +1,220 @@
+# Dolibarr language file - Source file is en_US - members
+MembersArea=ممبران کا علاقہ
+MemberCard=ممبر کارڈ
+SubscriptionCard=سبسکرپشن کارڈ
+Member=رکن
+Members=ممبران
+ShowMember=ممبر کارڈ دکھائیں۔
+UserNotLinkedToMember=صارف کسی رکن سے منسلک نہیں ہے۔
+ThirdpartyNotLinkedToMember=تھرڈ پارٹی کسی ممبر سے منسلک نہیں ہے۔
+MembersTickets=ممبرشپ ایڈریس شیٹ
+FundationMembers=فاؤنڈیشن کے اراکین
+ListOfValidatedPublicMembers=توثیق شدہ عوامی اراکین کی فہرست
+ErrorThisMemberIsNotPublic=یہ رکن عوامی نہیں ہے۔
+ErrorMemberIsAlreadyLinkedToThisThirdParty=ایک اور رکن (نام: <b> %s </b>، لاگ ان: <b> %s </b>) پہلے ہی ایک تیسری پارٹی <b> %s </b> سے منسلک ہے. پہلے اس لنک کو ہٹا دیں کیونکہ تھرڈ پارٹی کو صرف ممبر سے نہیں جوڑا جا سکتا (اور اس کے برعکس)۔
+ErrorUserPermissionAllowsToLinksToItselfOnly=حفاظتی وجوہات کی بناء پر، آپ کو تمام صارفین میں ترمیم کرنے کی اجازت دی جانی چاہیے تاکہ کسی رکن کو کسی ایسے صارف سے جوڑ سکیں جو آپ کا نہیں ہے۔
+SetLinkToUser=Dolibarr صارف سے لنک کریں۔
+SetLinkToThirdParty=ڈولیبر تھرڈ پارٹی سے لنک کریں۔
+MembersCards=ممبروں کے لیے بزنس کارڈ
+MembersList=ممبران کی فہرست
+MembersListToValid=مسودہ کے ارکان کی فہرست (توثیق کی جائے گی)
+MembersListValid=درست اراکین کی فہرست
+MembersListUpToDate=تازہ ترین شراکت کے ساتھ درست اراکین کی فہرست
+MembersListNotUpToDate=پرانی شراکت کے ساتھ درست اراکین کی فہرست
+MembersListExcluded=خارج کیے گئے اراکین کی فہرست
+MembersListResiliated=برطرف اراکین کی فہرست
+MembersListQualified=اہل اراکین کی فہرست
+MenuMembersToValidate=ڈرافٹ ممبران
+MenuMembersValidated=تصدیق شدہ ممبران
+MenuMembersExcluded=خارج کیے گئے اراکین
+MenuMembersResiliated=برطرف اراکین
+MembersWithSubscriptionToReceive=وصول کرنے کے لئے شراکت کے ساتھ اراکین
+MembersWithSubscriptionToReceiveShort=وصول کرنے کے لیے تعاون
+DateSubscription=رکنیت کی تاریخ
+DateEndSubscription=رکنیت کی آخری تاریخ
+EndSubscription=رکنیت کا خاتمہ
+SubscriptionId=تعاون کی شناخت
+WithoutSubscription=شراکت کے بغیر
+MemberId=رکن کی شناخت
+NewMember=نیا رکن
+MemberType=ممبر کی قسم
+MemberTypeId=ممبر کی قسم کی شناخت
+MemberTypeLabel=ممبر کی قسم کا لیبل
+MembersTypes=اراکین کی اقسام
+MemberStatusDraft=مسودہ (توثیق کرنے کی ضرورت ہے)
+MemberStatusDraftShort=مسودہ
+MemberStatusActive=تصدیق شدہ (انتظار میں شراکت)
+MemberStatusActiveShort=تصدیق شدہ
+MemberStatusActiveLate=شراکت کی میعاد ختم ہو گئی۔
+MemberStatusActiveLateShort=میعاد ختم
+MemberStatusPaid=سبسکرپشن اپ ٹو ڈیٹ
+MemberStatusPaidShort=سب سے نیا
+MemberStatusExcluded=خارج شدہ ممبر
+MemberStatusExcludedShort=خارج
+MemberStatusResiliated=ختم شدہ رکن
+MemberStatusResiliatedShort=ختم
+MembersStatusToValid=ڈرافٹ ممبران
+MembersStatusExcluded=خارج کیے گئے اراکین
+MembersStatusResiliated=برطرف اراکین
+MemberStatusNoSubscription=تصدیق شدہ (کوئی شراکت درکار نہیں)
+MemberStatusNoSubscriptionShort=تصدیق شدہ
+SubscriptionNotNeeded=کوئی شراکت درکار نہیں۔
+NewCotisation=نئی شراکت
+PaymentSubscription=نئی شراکت کی ادائیگی
+SubscriptionEndDate=سبسکرپشن کی آخری تاریخ
+MembersTypeSetup=ممبران ٹائپ سیٹ اپ
+MemberTypeModified=ممبر کی قسم میں ترمیم کی گئی۔
+DeleteAMemberType=ممبر کی قسم کو حذف کریں۔
+ConfirmDeleteMemberType=کیا آپ واقعی اس رکن کی قسم کو حذف کرنا چاہتے ہیں؟
+MemberTypeDeleted=رکن کی قسم حذف کر دی گئی۔
+MemberTypeCanNotBeDeleted=ممبر کی قسم کو حذف نہیں کیا جا سکتا
+NewSubscription=نئی شراکت
+NewSubscriptionDesc=یہ فارم آپ کو فاؤنڈیشن کے نئے رکن کے طور پر اپنی رکنیت کو ریکارڈ کرنے کی اجازت دیتا ہے۔ اگر آپ اپنی سبسکرپشن کی تجدید کرنا چاہتے ہیں (اگر پہلے ہی ممبر ہیں)، تو براہ کرم اس کے بجائے فاؤنڈیشن بورڈ سے ای میل %s سے رابطہ کریں۔
+Subscription=شراکت
+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=متن
+Int=انٹر
+DateAndTime=تاریخ اور وقت
+PublicMemberCard=ممبر پبلک کارڈ
+SubscriptionNotRecorded=شراکت ریکارڈ نہیں کی گئی۔
+AddSubscription=شراکت بنائیں
+ShowSubscription=شراکت دکھائیں۔
+# Label of email templates
+SendingAnEMailToMember=ممبر کو معلوماتی ای میل بھیجنا
+SendingEmailOnAutoSubscription=آٹو رجسٹریشن پر ای میل بھیج رہا ہے۔
+SendingEmailOnMemberValidation=نئے ممبر کی توثیق پر ای میل بھیجنا
+SendingEmailOnNewSubscription=نئی شراکت پر ای میل بھیج رہا ہے۔
+SendingReminderForExpiredSubscription=میعاد ختم ہونے والے تعاون کے لیے یاد دہانی بھیجنا
+SendingEmailOnCancelation=منسوخی پر ای میل بھیج رہا ہے۔
+SendingReminderActionComm=ایجنڈا ایونٹ کے لیے یاد دہانی بھیج رہا ہے۔
+# Topic of email templates
+YourMembershipRequestWasReceived=آپ کی رکنیت موصول ہو گئی۔
+YourMembershipWasValidated=آپ کی رکنیت کی توثیق کر دی گئی تھی۔
+YourSubscriptionWasRecorded=آپ کا نیا تعاون ریکارڈ کیا گیا۔
+SubscriptionReminderEmail=شراکت کی یاد دہانی
+YourMembershipWasCanceled=آپ کی رکنیت منسوخ کر دی گئی تھی۔
+CardContent=آپ کے ممبر کارڈ کا مواد
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=ہم آپ کو بتانا چاہتے ہیں کہ آپ کی رکنیت کی درخواست موصول ہو گئی ہے۔ <br> <br>
+ThisIsContentOfYourMembershipWasValidated=ہم آپ کو بتانا چاہتے ہیں کہ آپ کی رکنیت کی توثیق درج ذیل معلومات کے ساتھ کی گئی تھی: <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=ہم آپ کو بتانا چاہتے ہیں کہ آپ کی نئی رکنیت ریکارڈ کی گئی تھی۔ <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=ہم آپ کو بتانا چاہتے ہیں کہ آپ کی رکنیت ختم ہونے والی ہے یا پہلے ہی ختم ہو چکی ہے (__MEMBER_LAST_SUBSCRIPTION_DATE_END__)۔ ہمیں امید ہے کہ آپ اس کی تجدید کریں گے۔ <br> <br>
+ThisIsContentOfYourCard=یہ آپ کے بارے میں ہمارے پاس موجود معلومات کا خلاصہ ہے۔ اگر کچھ غلط ہے تو براہ کرم ہم سے رابطہ کریں۔ <br> <br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=کسی مہمان کے خودکار تحریر کی صورت میں موصول ہونے والی اطلاعی ای میل کا موضوع
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=کسی مہمان کے خودکار تحریر کی صورت میں موصول ہونے والی اطلاعی ای میل کا مواد
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=ممبر آٹو رجسٹریشن پر ممبر کو ای میل بھیجنے کے لیے استعمال کرنے کے لیے ای میل ٹیمپلیٹ
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=ممبر کی توثیق پر ممبر کو ای میل بھیجنے کے لیے استعمال کرنے کے لیے ای میل ٹیمپلیٹ
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=ای میل ٹیمپلیٹ جسے نئے شراکت کی ریکارڈنگ پر ممبر کو ای میل بھیجنے کے لیے استعمال کیا جائے۔
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=ای میل ٹیمپلیٹ ای میل یاد دہانی بھیجنے کے لیے استعمال کیا جائے جب شراکت کی میعاد ختم ہونے والی ہو۔
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=رکن کی منسوخی پر ممبر کو ای میل بھیجنے کے لیے استعمال کرنے کے لیے ای میل ٹیمپلیٹ
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=ای میل ٹیمپلیٹ جو ممبر کو خارج کرنے پر ممبر کو ای میل بھیجنے کے لیے استعمال کیا جائے۔
+DescADHERENT_MAIL_FROM=خودکار ای میلز کے لیے بھیجنے والا ای میل
+DescADHERENT_ETIQUETTE_TYPE=لیبل صفحہ کی شکل
+DescADHERENT_ETIQUETTE_TEXT=ممبر ایڈریس شیٹس پر چھپی ہوئی عبارت
+DescADHERENT_CARD_TYPE=کارڈز کے صفحے کی شکل
+DescADHERENT_CARD_HEADER_TEXT=ممبر کارڈز کے اوپر چھپی ہوئی عبارت
+DescADHERENT_CARD_TEXT=ممبر کارڈز پر پرنٹ شدہ متن (بائیں طرف سیدھ میں کریں)
+DescADHERENT_CARD_TEXT_RIGHT=ممبر کارڈز پر پرنٹ شدہ متن (دائیں طرف سیدھ میں کریں)
+DescADHERENT_CARD_FOOTER_TEXT=ممبر کارڈز کے نیچے چھپی ہوئی عبارت
+ShowTypeCard=قسم '%s' دکھائیں
+HTPasswordExport=htpassword فائل جنریشن
+NoThirdPartyAssociatedToMember=اس رکن کے ساتھ کوئی تیسرا فریق وابستہ نہیں ہے۔
+MembersAndSubscriptions=اراکین اور تعاون
+MoreActions=ریکارڈنگ پر تکمیلی کارروائی
+MoreActionsOnSubscription=کسی شراکت کو ریکارڈ کرتے وقت بطور ڈیفالٹ تجویز کردہ تکمیلی کارروائی
+MoreActionBankDirect=بینک اکاؤنٹ پر براہ راست اندراج بنائیں
+MoreActionBankViaInvoice=ایک انوائس بنائیں، اور بینک اکاؤنٹ پر ادائیگی کریں۔
+MoreActionInvoiceOnly=بغیر ادائیگی کے ایک رسید بنائیں
+LinkToGeneratedPages=وزٹ کارڈز بنائیں
+LinkToGeneratedPagesDesc=یہ اسکرین آپ کو اپنے تمام ممبران یا کسی خاص ممبر کے لیے بزنس کارڈ کے ساتھ پی ڈی ایف فائلیں بنانے کی اجازت دیتی ہے۔
+DocForAllMembersCards=تمام اراکین کے لیے بزنس کارڈ بنائیں
+DocForOneMemberCards=کسی خاص ممبر کے لیے بزنس کارڈ بنائیں
+DocForLabels=ایڈریس شیٹس بنائیں
+SubscriptionPayment=شراکت کی ادائیگی
+LastSubscriptionDate=تازہ ترین شراکت کی ادائیگی کی تاریخ
+LastSubscriptionAmount=تازہ ترین تعاون کی رقم
+LastMemberType=آخری ممبر کی قسم
+MembersStatisticsByCountries=اراکین کے اعداد و شمار بلحاظ ملک
+MembersStatisticsByState=ریاست/صوبے کے لحاظ سے اراکین کے اعداد و شمار
+MembersStatisticsByTown=اراکین کے اعدادوشمار بلحاظ شہر
+MembersStatisticsByRegion=علاقے کے لحاظ سے اراکین کے اعدادوشمار
+NbOfMembers=اراکین کی کل تعداد
+NbOfActiveMembers=موجودہ فعال اراکین کی کل تعداد
+NoValidatedMemberYet=کوئی توثیق شدہ اراکین نہیں ملے
+MembersByCountryDesc=یہ اسکرین آپ کو ممالک کے لحاظ سے اراکین کے اعدادوشمار دکھاتی ہے۔ گراف اور چارٹس گوگل کی آن لائن گراف سروس کی دستیابی کے ساتھ ساتھ کام کرنے والے انٹرنیٹ کنکشن کی دستیابی پر منحصر ہیں۔
+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 کی شرح
+NoVatOnSubscription=شراکت کے لیے کوئی VAT نہیں ہے۔
+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=فریق ثالث قانونی ادارہ ہے جو انوائس پر استعمال کیا جائے گا اگر آپ ہر شراکت کے لیے انوائس بنانے کا فیصلہ کرتے ہیں۔ آپ شراکت کو ریکارڈ کرنے کے عمل کے دوران بعد میں اسے تخلیق کر سکیں گے۔
diff --git a/htdocs/langs/ur_PK/modulebuilder.lang b/htdocs/langs/ur_PK/modulebuilder.lang
new file mode 100644
index 00000000000..d5ebc19f4a4
--- /dev/null
+++ b/htdocs/langs/ur_PK/modulebuilder.lang
@@ -0,0 +1,147 @@
+# 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 فائلیں تیار کی جائیں گی۔
+ModuleBuilderDesc2=وہ راستہ جہاں ماڈیولز تیار/ترمیم کیے جاتے ہیں (بیرونی ماڈیولز کے لیے پہلی ڈائریکٹری %s میں بیان کی گئی ہے): <strong> %s </strong>
+ModuleBuilderDesc3=تیار کردہ/ قابل تدوین ماڈیولز ملے: <strong> %s </strong>
+ModuleBuilderDesc4=جب فائل <strong> %s </strong> ماڈیول ڈائرکٹری کے روٹ میں موجود ہوتی ہے تو ایک ماڈیول کو 'ایڈیٹ ایبل' کے طور پر پایا جاتا ہے۔
+NewModule=نیا ماڈیول
+NewObjectInModulebuilder=نیا اعتراض
+ModuleKey=ماڈیول کلید
+ObjectKey=آبجیکٹ کلید
+ModuleInitialized=ماڈیول شروع کر دیا گیا۔
+FilesForObjectInitialized=نئی آبجیکٹ '%s' کے لیے فائلیں شروع کی گئیں۔
+FilesForObjectUpdated=آبجیکٹ '%s' کے لیے فائلیں اپ ڈیٹ ہو گئیں (.sql فائلیں اور .class.php فائل)
+ModuleBuilderDescdescription=یہاں تمام عمومی معلومات درج کریں جو آپ کے ماڈیول کی وضاحت کرتی ہیں۔
+ModuleBuilderDescspecifications=آپ یہاں اپنے ماڈیول کی خصوصیات کی تفصیلی وضاحت درج کر سکتے ہیں جو پہلے سے دوسرے ٹیبز میں تشکیل نہیں دی گئی ہے۔ لہذا آپ کو ترقی کے تمام اصولوں تک آسانی سے رسائی حاصل ہے۔ نیز یہ متن مواد تیار کردہ دستاویزات میں شامل کیا جائے گا (آخری ٹیب دیکھیں)۔ آپ مارک ڈاؤن فارمیٹ استعمال کر سکتے ہیں، لیکن Asciidoc فارمیٹ استعمال کرنے کی سفارش کی جاتی ہے (.md اور .asciidoc کے درمیان موازنہ: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)۔
+ModuleBuilderDescobjects=یہاں ان اشیاء کی وضاحت کریں جن کا آپ اپنے ماڈیول کے ساتھ انتظام کرنا چاہتے ہیں۔ ایک CRUD DAO کلاس، SQL فائلیں، اشیاء کے ریکارڈ کی فہرست کے لیے صفحہ، ریکارڈ بنانے/ترمیم کرنے/دیکھنے کے لیے اور ایک API تیار کیا جائے گا۔
+ModuleBuilderDescmenus=یہ ٹیب آپ کے ماڈیول کے ذریعہ فراہم کردہ مینو اندراجات کی وضاحت کے لیے وقف ہے۔
+ModuleBuilderDescpermissions=یہ ٹیب ان نئی اجازتوں کی وضاحت کے لیے وقف ہے جو آپ اپنے ماڈیول کے ساتھ فراہم کرنا چاہتے ہیں۔
+ModuleBuilderDesctriggers=یہ آپ کے ماڈیول کے ذریعہ فراہم کردہ محرکات کا منظر ہے۔ کوڈ کو شامل کرنے کے لیے جب ایک ٹرگرڈ بزنس ایونٹ شروع ہوتا ہے، بس اس فائل میں ترمیم کریں۔
+ModuleBuilderDeschooks=یہ ٹیب ہکس کے لیے وقف ہے۔
+ModuleBuilderDescwidgets=یہ ٹیب ویجٹ کے انتظام/تعمیر کے لیے وقف ہے۔
+ModuleBuilderDescbuildpackage=آپ یہاں اپنے ماڈیول کی "تقسیم کرنے کے لیے تیار" پیکیج فائل (ایک نارملائزڈ .zip فائل) اور "تقسیم کے لیے تیار" دستاویزی فائل بنا سکتے ہیں۔ پیکیج یا دستاویزات کی فائل بنانے کے لیے بس بٹن پر کلک کریں۔
+EnterNameOfModuleToDeleteDesc=آپ اپنے ماڈیول کو حذف کر سکتے ہیں۔ انتباہ: ماڈیول کی تمام کوڈنگ فائلیں (دستی طور پر تیار کردہ یا تخلیق کردہ) اور سٹرکچرڈ ڈیٹا اور دستاویزات کو حذف کر دیا جائے گا!
+EnterNameOfObjectToDeleteDesc=آپ کسی چیز کو حذف کر سکتے ہیں۔ انتباہ: آبجیکٹ سے متعلق تمام کوڈنگ فائلز (دستی طور پر تیار کردہ یا تخلیق کردہ) حذف کر دی جائیں گی!
+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=پی ایچ پی API کلاس کے لیے فائل
+PageForList=ریکارڈ کی فہرست کے لیے پی ایچ پی کا صفحہ
+PageForCreateEditView=ریکارڈ بنانے/ترمیم کرنے/دیکھنے کے لیے پی ایچ پی کا صفحہ
+PageForAgendaTab=ایونٹ ٹیب کے لیے پی ایچ پی کا صفحہ
+PageForDocumentTab=دستاویز کے ٹیب کے لیے پی ایچ پی کا صفحہ
+PageForNoteTab=نوٹ ٹیب کے لیے پی ایچ پی کا صفحہ
+PageForContactTab=رابطہ ٹیب کے لیے پی ایچ پی کا صفحہ
+PathToModulePackage=ماڈیول/ایپلی کیشن پیکج کی زپ کا راستہ
+PathToModuleDocumentation=ماڈیول/ایپلی کیشن دستاویزات کی فائل کا راستہ (%s)
+SpaceOrSpecialCharAreNotAllowed=خالی جگہوں یا خصوصی حروف کی اجازت نہیں ہے۔
+FileNotYetGenerated=فائل ابھی تک تیار نہیں ہوئی۔
+RegenerateClassAndSql=کلاس اور .sql فائلوں کو زبردستی اپ ڈیٹ کریں۔
+RegenerateMissingFiles=گمشدہ فائلیں بنائیں
+SpecificationFile=دستاویزات کی فائل
+LanguageFile=زبان کے لیے فائل
+ObjectProperties=آبجیکٹ پراپرٹیز
+ConfirmDeleteProperty=کیا آپ واقعی <strong> %s </strong> پراپرٹی کو حذف کرنا چاہتے ہیں؟ یہ پی ایچ پی کلاس میں کوڈ کو تبدیل کرے گا لیکن آبجیکٹ کی ٹیبل تعریف سے کالم کو بھی ہٹا دے گا۔
+NotNull=NULL نہیں۔
+NotNullDesc=1= ڈیٹا بیس کو NOT NULL پر سیٹ کریں۔ -1=نل ویلیوز کی اجازت دیں اور اگر خالی ہو تو NULL (''یا 0) پر مجبور کریں۔
+SearchAll='تمام تلاش کریں' کے لیے استعمال کیا جاتا ہے
+DatabaseIndex=ڈیٹا بیس انڈیکس
+FileAlreadyExists=فائل %s پہلے سے موجود ہے۔
+TriggersFile=ٹرگرز کوڈ کے لیے فائل
+HooksFile=ہکس کوڈ کے لیے فائل
+ArrayOfKeyValues=کلیدی ویل کی صف
+ArrayOfKeyValuesDesc=کلیدوں اور اقدار کی صف اگر فیلڈ مقررہ اقدار کے ساتھ ایک کومبو فہرست ہے۔
+WidgetFile=ویجیٹ فائل
+CSSFile=سی ایس ایس فائل
+JSFile=جاوا اسکرپٹ فائل
+ReadmeFile=ریڈمی فائل
+ChangeLog=تبدیلی لاگ فائل
+TestClassFile=پی ایچ پی یونٹ ٹیسٹ کلاس کے لیے فائل
+SqlFile=ایس کیو ایل فائل
+PageForLib=عام پی ایچ پی لائبریری کے لیے فائل
+PageForObjLib=اعتراض کے لیے وقف پی ایچ پی لائبریری کے لیے فائل
+SqlFileExtraFields=تکمیلی صفات کے لیے ایس کیو ایل فائل
+SqlFileKey=چابیاں کے لیے ایس کیو ایل فائل
+SqlFileKeyExtraFields=تکمیلی صفات کی کلیدوں کے لیے ایس کیو ایل فائل
+AnObjectAlreadyExistWithThisNameAndDiffCase=اس نام کے ساتھ ایک شے پہلے سے موجود ہے اور ایک مختلف کیس
+UseAsciiDocFormat=آپ مارک ڈاؤن فارمیٹ استعمال کر سکتے ہیں، لیکن Asciidoc فارمیٹ استعمال کرنے کی سفارش کی جاتی ہے (.md اور .asciidoc کے درمیان موازنہ: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=ایک پیمانہ ہے۔
+DirScanned=ڈائرکٹری اسکین کی گئی۔
+NoTrigger=کوئی محرک نہیں۔
+NoWidget=کوئی ویجیٹ نہیں۔
+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>>
+DisplayOnPdfDesc=اس فیلڈ کو مطابقت پذیر پی ڈی ایف دستاویزات پر ڈسپلے کریں، آپ "پوزیشن" فیلڈ کے ساتھ پوزیشن کا نظم کر سکتے ہیں۔ <br> فی الحال، نام سے جانا جاتا پر compatibles PDF ماڈل ہیں: eratosthene (کے حکم) espadon (جہاز)، سپنج (رسید)، لاجوردی (propal / کوٹیشن)، cornas (سپلائر حکم) <br> <br> <strong> دستاویز کے طور پر: </strong> <br> 0 = <br> 1 دکھایا = ڈسپلے <br> 2 = ڈسپلے صرف خالی نہیں ہے تو <br> <br> <strong> لئے دستاویز لائنز: </strong> <br> 0 = نہیں دکھایا <br> 1 = بعد تفصیل کالم میں <br> 4 = ڈسپلے وضاحت کے بعد <br> لائن کی تفصیل کالم میں 3 = ڈسپلے ایک کالم میں دکھائے تفصیل صرف اس صورت میں جب خالی نہ ہو۔
+DisplayOnPdf=پی ڈی ایف پر ڈسپلے کریں۔
+IsAMeasureDesc=کیا فہرست میں کل حاصل کرنے کے لیے فیلڈ کی قدر کو جمع کیا جا سکتا ہے؟ (مثالیں: 1 یا 0)
+SearchAllDesc=کیا کوئیک سرچ ٹول سے تلاش کرنے کے لیے فیلڈ کا استعمال کیا جاتا ہے؟ (مثالیں: 1 یا 0)
+SpecDefDesc=یہاں وہ تمام دستاویزات درج کریں جو آپ اپنے ماڈیول کے ساتھ فراہم کرنا چاہتے ہیں جو پہلے سے دوسرے ٹیبز کے ذریعہ بیان نہیں کیے گئے ہیں۔ آپ .md یا اس سے بہتر، امیر .asciidoc نحو استعمال کر سکتے ہیں۔
+LanguageDefDesc=اس فائل میں درج کریں، تمام کلید اور ہر زبان کی فائل کا ترجمہ۔
+MenusDefDesc=اپنے ماڈیول کے ذریعہ فراہم کردہ مینو کی وضاحت یہاں کریں۔
+DictionariesDefDesc=یہاں آپ کے ماڈیول کے ذریعہ فراہم کردہ لغات کی وضاحت کریں۔
+PermissionsDefDesc=یہاں آپ کے ماڈیول کے ذریعہ فراہم کردہ نئی اجازتوں کی وضاحت کریں۔
+MenusDefDescTooltip=آپ کے ماڈیول/ایپلی کیشن کے ذریعہ فراہم کردہ مینو کی تعریف <strong> $this->مینوز </strong> میں ماڈیول ڈسکرپٹر فائل میں کی گئی ہے۔ آپ اس فائل کو دستی طور پر ترمیم کرسکتے ہیں یا ایمبیڈڈ ایڈیٹر استعمال کرسکتے ہیں۔ <br> <br> نوٹ: ایک بار وضاحت (اور ماڈیول دوبارہ چالو) ہو جانے کے بعد، مینیو ایڈمنسٹریٹر صارفین کے لیے %s پر دستیاب مینیو ایڈیٹر میں بھی نظر آتے ہیں۔
+DictionariesDefDescTooltip=آپ کے ماڈیول/ایپلی کیشن کے ذریعے فراہم کردہ لغات کی تعریف <strong> $this->ڈکشنریز </strong> میں ماڈیول ڈسکرپٹر فائل میں کی گئی ہے۔ آپ اس فائل کو دستی طور پر ایڈٹ کرسکتے ہیں یا ایمبیڈڈ ایڈیٹر استعمال کرسکتے ہیں۔ <br> <br> نوٹ: ایک بار وضاحت (اور ماڈیول دوبارہ چالو) ہونے کے بعد، لغات بھی سیٹ اپ ایریا میں %s پر ایڈمنسٹریٹر صارفین کو دکھائی دیتی ہیں۔
+PermissionsDefDescTooltip=آپ کے ماڈیول/ایپلی کیشن کے ذریعے فراہم کردہ اجازتوں کی تعریف <strong> $this->Rights </strong> میں ماڈیول ڈسکرپٹر فائل میں کی گئی ہے۔ آپ اس فائل کو دستی طور پر ترمیم کرسکتے ہیں یا ایمبیڈڈ ایڈیٹر استعمال کرسکتے ہیں۔ <br> <br> نوٹ: ایک بار وضاحت (اور ماڈیول دوبارہ چالو) ہونے کے بعد، اجازتیں پہلے سے طے شدہ اجازت سیٹ اپ %s میں نظر آتی ہیں۔
+HooksDefDesc=<b> module_parts['hooks'] </b> پراپرٹی میں وضاحت کریں، ماڈیول ڈسکرپٹر میں، ہکس کا سیاق و سباق جس کا آپ نظم کرنا چاہتے ہیں (سیاق و سباق کی فہرست '<b>' کوڈ <b> کوڈ میں تلاش کرکے تلاش کی جاسکتی ہے ہک فائل آپ کے ہکڈ فنکشنز کا کوڈ شامل کرنے کے لیے (ہک ایبل فنکشنز کو کور کوڈ میں '<b> executeHooks </b>' پر تلاش کرکے تلاش کیا جاسکتا ہے)۔
+TriggerDefDesc=ٹرگر فائل میں اس کوڈ کی وضاحت کریں جسے آپ اس وقت انجام دینا چاہتے ہیں جب آپ کے ماڈیول سے باہر کوئی کاروباری واقعہ انجام دیا جاتا ہے (دوسرے ماڈیولز کے ذریعے متحرک ہونے والے واقعات)۔
+SeeIDsInUse=اپنی انسٹالیشن میں استعمال میں آئی آئی ڈی دیکھیں
+SeeReservedIDsRangeHere=مخصوص IDs کی رینج دیکھیں
+ToolkitForDevelopers=Dolibarr ڈویلپرز کے لیے ٹول کٹ
+TryToUseTheModuleBuilder=اگر آپ کو SQL اور PHP کا علم ہے تو آپ مقامی ماڈیول بلڈر وزرڈ استعمال کر سکتے ہیں۔ <br> ماڈیول <strong> %s </strong> کو فعال کریں اور <span class="fa fa-bug"> a014f17 کے اوپری دائیں پر کلک کرکے وزرڈ کا استعمال کریں۔ <br> انتباہ: یہ ایک اعلی درجے کی ڈویلپر خصوصیت ہے، اپنی پروڈکشن سائٹ پر <b> نہیں </b> تجربہ کریں!
+SeeTopRightMenu=اوپر دائیں مینو میں <span class="fa fa-bug"> </span> دیکھیں
+AddLanguageFile=زبان کی فائل شامل کریں۔
+YouCanUseTranslationKey=آپ یہاں ایک کلید استعمال کر سکتے ہیں جو کہ زبان کی فائل میں پائی جانے والی ترجمے کی کلید ہے (ٹیب "Languages" دیکھیں)
+DropTableIfEmpty=(اگر خالی ہو تو میز کو تباہ کر دیں)
+TableDoesNotExists=ٹیبل %s موجود نہیں ہے۔
+TableDropped=ٹیبل %s حذف کر دیا گیا۔
+InitStructureFromExistingTable=موجودہ ٹیبل کے ڈھانچے کی صف کی سٹرنگ بنائیں
+UseAboutPage=کے بارے میں صفحہ کو غیر فعال کریں۔
+UseDocFolder=دستاویزات کے فولڈر کو غیر فعال کریں۔
+UseSpecificReadme=ایک مخصوص ReadMe استعمال کریں۔
+ContentOfREADMECustomized=نوٹ: README.md فائل کے مواد کو ModuleBuilder کے سیٹ اپ میں بیان کردہ مخصوص قدر سے تبدیل کر دیا گیا ہے۔
+RealPathOfModule=ماڈیول کا حقیقی راستہ
+ContentCantBeEmpty=فائل کا مواد خالی نہیں ہو سکتا
+WidgetDesc=آپ یہاں وہ وجیٹس تیار اور ترمیم کرسکتے ہیں جو آپ کے ماڈیول کے ساتھ سرایت کیے جائیں گے۔
+CSSDesc=آپ یہاں اپنے ماڈیول کے ساتھ ایمبیڈڈ پرسنلائزڈ سی ایس ایس کے ساتھ فائل بنا اور اس میں ترمیم کر سکتے ہیں۔
+JSDesc=آپ اپنے ماڈیول کے ساتھ ایمبیڈڈ پرسنلائزڈ جاوا اسکرپٹ کے ساتھ یہاں ایک فائل بنا اور اس میں ترمیم کر سکتے ہیں۔
+CLIDesc=آپ یہاں کچھ کمانڈ لائن اسکرپٹس بنا سکتے ہیں جو آپ اپنے ماڈیول کے ساتھ فراہم کرنا چاہتے ہیں۔
+CLIFile=CLI فائل
+NoCLIFile=کوئی CLI فائلیں نہیں ہیں۔
+UseSpecificEditorName = ایک مخصوص ایڈیٹر کا نام استعمال کریں۔
+UseSpecificEditorURL = ایک مخصوص ایڈیٹر URL استعمال کریں۔
+UseSpecificFamily = ایک مخصوص خاندان کا استعمال کریں
+UseSpecificAuthor = کسی مخصوص مصنف کا استعمال کریں۔
+UseSpecificVersion = ایک مخصوص ابتدائی ورژن استعمال کریں۔
+IncludeRefGeneration=آبجیکٹ کا حوالہ خود بخود تیار ہونا چاہیے۔
+IncludeRefGenerationHelp=اگر آپ حوالہ کے خودکار طور پر جنریشن کا نظم کرنے کے لیے کوڈ شامل کرنا چاہتے ہیں تو اسے چیک کریں۔
+IncludeDocGeneration=میں آبجیکٹ سے کچھ دستاویزات بنانا چاہتا ہوں۔
+IncludeDocGenerationHelp=اگر آپ اسے چیک کرتے ہیں تو ریکارڈ پر "دستاویز تیار کریں" کے باکس کو شامل کرنے کے لیے کچھ کوڈ تیار کیا جائے گا۔
+ShowOnCombobox=کومبو باکس میں قدر دکھائیں۔
+KeyForTooltip=ٹول ٹپ کے لیے کلید
+CSSClass=فارم میں ترمیم/تخلیق کے لیے CSS
+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__)' ہو سکتا ہے مثال کے طور پر)
+AsciiToHtmlConverter=Ascii سے HTML کنورٹر
+AsciiToPdfConverter=Ascii سے پی ڈی ایف کنورٹر
+TableNotEmptyDropCanceled=ٹیبل خالی نہیں ہے۔ ڈراپ منسوخ کر دیا گیا ہے۔
+ModuleBuilderNotAllowed=ماڈیول بلڈر دستیاب ہے لیکن آپ کے صارف کو اس کی اجازت نہیں ہے۔
+ImportExportProfiles=پروفائلز درآمد اور برآمد کریں۔
+ValidateModBuilderDesc=اگر اس فیلڈ کو $this->validateField() یا 0 سے توثیق کرنے کی ضرورت ہو تو 1 ڈالیں
diff --git a/htdocs/langs/ur_PK/mrp.lang b/htdocs/langs/ur_PK/mrp.lang
new file mode 100644
index 00000000000..5da87a94d0c
--- /dev/null
+++ b/htdocs/langs/ur_PK/mrp.lang
@@ -0,0 +1,109 @@
+Mrp=مینوفیکچرنگ آرڈرز
+MOs=مینوفیکچرنگ آرڈرز
+ManufacturingOrder=مینوفیکچرنگ آرڈر
+MRPDescription=پیداوار اور مینوفیکچرنگ آرڈرز (MO) کو منظم کرنے کے لیے ماڈیول۔
+MRPArea=ایم آر پی ایریا
+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 نمبری ٹیمپلیٹس
+MOsModelModule=MO دستاویز کے سانچے
+FreeLegalTextOnBOMs=BOM کی دستاویز پر مفت متن
+WatermarkOnDraftBOMs=ڈرافٹ BOM پر واٹر مارک
+FreeLegalTextOnMOs=ایم او کی دستاویز پر مفت متن
+WatermarkOnDraftMOs=ڈرافٹ MO پر واٹر مارک
+ConfirmCloneBillOfMaterials=کیا آپ واقعی مواد کے بل کو کلون کرنا چاہتے ہیں %s؟
+ConfirmCloneMo=کیا آپ واقعی مینوفیکچرنگ آرڈر %s کو کلون کرنا چاہتے ہیں؟
+ManufacturingEfficiency=مینوفیکچرنگ کی کارکردگی
+ConsumptionEfficiency=کھپت کی کارکردگی
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
+ValueOfMeansLossForProductProduced=0.95 کی قدر کا مطلب ہے پیدا شدہ مصنوعات کے نقصان کا اوسط 5%%
+DeleteBillOfMaterials=مواد کا بل حذف کریں۔
+DeleteMo=مینوفیکچرنگ آرڈر کو حذف کریں۔
+ConfirmDeleteBillOfMaterials=کیا آپ واقعی اس بل آف میٹریلز کو حذف کرنا چاہتے ہیں؟
+ConfirmDeleteMo=کیا آپ واقعی اس مینوفیکچرنگ آرڈر کو حذف کرنا چاہتے ہیں؟
+MenuMRP=مینوفیکچرنگ آرڈرز
+NewMO=نیا مینوفیکچرنگ آرڈر
+QtyToProduce=پیدا کرنے کے لئے مقدار
+DateStartPlannedMo=تاریخ شروع کرنے کا منصوبہ ہے۔
+DateEndPlannedMo=تاریخ کے اختتام کا منصوبہ ہے۔
+KeepEmptyForAsap=خالی کا مطلب ہے 'جتنا جلد ممکن ہو'
+EstimatedDuration=متوقع دورانیہ
+EstimatedDurationDesc=اس BOM کا استعمال کرتے ہوئے اس پروڈکٹ کو تیار کرنے (یا جدا کرنے) کی تخمینی مدت
+ConfirmValidateBom=کیا آپ واقعی BOM کی تصدیق <strong> %s </strong> کے ساتھ کرنا چاہتے ہیں (آپ اسے نئے مینوفیکچرنگ آرڈرز بنانے کے لیے استعمال کر سکیں گے)
+ConfirmCloseBom=کیا آپ واقعی اس BOM کو منسوخ کرنا چاہتے ہیں (اب آپ اسے نئے مینوفیکچرنگ آرڈرز بنانے کے لیے استعمال نہیں کر سکیں گے)؟
+ConfirmReopenBom=کیا آپ واقعی اس BOM کو دوبارہ کھولنا چاہتے ہیں (آپ اسے نئے مینوفیکچرنگ آرڈرز بنانے کے لیے استعمال کر سکیں گے)
+StatusMOProduced=پیدا کیا
+QtyFrozen=منجمد مقدار
+QuantityFrozen=منجمد مقدار
+QuantityConsumedInvariable=جب یہ جھنڈا سیٹ کیا جاتا ہے، استعمال کی جانے والی مقدار ہمیشہ متعین قدر ہوتی ہے اور پیدا شدہ مقدار سے متعلق نہیں ہوتی ہے۔
+DisableStockChange=اسٹاک کی تبدیلی غیر فعال ہے۔
+DisableStockChangeHelp=جب یہ جھنڈا سیٹ ہو جاتا ہے، تو اس پراڈکٹ پر کوئی بھی سٹاک تبدیلی نہیں ہوتی، چاہے جو بھی مقدار استعمال کی گئی ہو۔
+BomAndBomLines=مواد اور لائنوں کے بل
+BOMLine=BOM کی لائن
+WarehouseForProduction=پیداوار کے لیے گودام
+CreateMO=MO بنائیں
+ToConsume=استعمال کرنا
+ToProduce=پیدا کرنے کے لئے
+ToObtain=حاصل کرنے کے لئے
+QtyAlreadyConsumed=مقدار پہلے ہی استعمال ہو چکی ہے۔
+QtyAlreadyProduced=مقدار پہلے ہی تیار کی گئی ہے۔
+QtyRequiredIfNoLoss=اگر کوئی نقصان نہ ہو تو مقدار درکار ہے (مینوفیکچرنگ کی کارکردگی 100%% ہے)
+ConsumeOrProduce=استعمال کریں یا پیدا کریں۔
+ConsumeAndProduceAll=استعمال کریں اور سب پیدا کریں۔
+Manufactured=تیار کردہ
+TheProductXIsAlreadyTheProductToProduce=جو پروڈکٹ شامل کرنا ہے وہ پہلے سے ہی پیدا کرنے والی پروڈکٹ ہے۔
+ForAQuantityOf=%s کی پیداوار کی مقدار کے لیے
+ForAQuantityToConsumeOf=%s کو جدا کرنے کی مقدار کے لیے
+ConfirmValidateMo=کیا آپ واقعی اس مینوفیکچرنگ آرڈر کی توثیق کرنا چاہتے ہیں؟
+ConfirmProductionDesc='%s' پر کلک کرنے سے، آپ سیٹ کی مقدار کے لیے کھپت اور/یا پیداوار کی توثیق کریں گے۔ یہ اسٹاک کو بھی اپ ڈیٹ کرے گا اور اسٹاک کی نقل و حرکت کو ریکارڈ کرے گا۔
+ProductionForRef=%s کی پیداوار
+AutoCloseMO=مینوفیکچرنگ آرڈر کو خود بخود بند کر دیں اگر استعمال کرنے اور پیدا کرنے کی مقدار پوری ہو جائے۔
+NoStockChangeOnServices=خدمات پر اسٹاک میں کوئی تبدیلی نہیں۔
+ProductQtyToConsumeByMO=پروڈکٹ کی مقدار ابھی بھی اوپن ایم او کے ذریعے استعمال کرنا ہے۔
+ProductQtyToProduceByMO=پروڈکٹ کی مقدار ابھی بھی اوپن ایم او کے ذریعہ تیار کرنا ہے۔
+AddNewConsumeLines=استعمال کرنے کے لیے نئی لائن شامل کریں۔
+AddNewProduceLines=پیدا کرنے کے لیے نئی لائن شامل کریں۔
+ProductsToConsume=استعمال کرنے کے لیے مصنوعات
+ProductsToProduce=پیدا کرنے کے لئے مصنوعات
+UnitCost=یونٹ لاگت
+TotalCost=کل لاگت
+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=آپریٹرز کی تعداد درکار ہے۔
+THMOperatorEstimated=تخمینہ شدہ آپریٹر THM
+THMMachineEstimated=تخمینہ شدہ مشین THM
+WorkstationType=ورک سٹیشن کی قسم
+Human=انسان
+Machine=آلہ
+HumanMachine=انسان/مشین
+WorkstationArea=ورک سٹیشن کا علاقہ
+Machines=مشینیں
+THMEstimatedHelp=یہ شرح آئٹم کی پیشن گوئی کی قیمت کی وضاحت کرنا ممکن بناتی ہے۔
+BOM=سامان کا بل
+CollapseBOMHelp=آپ BOM ماڈیول کی ترتیب میں نام کی تفصیلات کے پہلے سے طے شدہ ڈسپلے کی وضاحت کر سکتے ہیں
+MOAndLines=مینوفیکچرنگ آرڈرز اور لائنز
diff --git a/htdocs/langs/ur_PK/multicurrency.lang b/htdocs/langs/ur_PK/multicurrency.lang
new file mode 100644
index 00000000000..797b70ac74a
--- /dev/null
+++ b/htdocs/langs/ur_PK/multicurrency.lang
@@ -0,0 +1,38 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=کثیر کرنسی
+ErrorAddRateFail=اضافی شرح میں خرابی۔
+ErrorAddCurrencyFail=شامل کرنسی میں خرابی۔
+ErrorDeleteCurrencyFail=خرابی حذف کرنے میں ناکام
+multicurrency_syncronize_error=مطابقت پذیری کی خرابی: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=کرنسی کی شرح معلوم کرنے کے لیے دستاویز کی تاریخ کا استعمال کریں، بجائے اس کے کہ تازہ ترین معلوم شرح استعمال کریں۔
+multicurrency_useOriginTx=جب کوئی چیز کسی دوسرے سے بنائی جائے تو اصل شرح کو ماخذ آبجیکٹ سے رکھیں (ورنہ تازہ ترین معلوم شرح کا استعمال کریں)
+CurrencyLayerAccount=کرنسی لیئر API
+CurrencyLayerAccount_help_to_synchronize=اس فعالیت کو استعمال کرنے کے لیے آپ کو ویب سائٹ %s پر ایک اکاؤنٹ بنانا ہوگا۔ <br> اپنی <b> API کلید </b> حاصل کریں۔ <br> اگر آپ مفت اکاؤنٹ استعمال کرتے ہیں، تو آپ <b> سورس کرنسی </b> (USD بذریعہ ڈیفالٹ) تبدیل نہیں کر سکتے۔ <br> اگر آپ کی اصل کرنسی USD نہیں ہے تو ایپلیکیشن خود بخود اس کا دوبارہ حساب کرے گی۔ <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/ur_PK/oauth.lang b/htdocs/langs/ur_PK/oauth.lang
new file mode 100644
index 00000000000..229279e4a47
--- /dev/null
+++ b/htdocs/langs/ur_PK/oauth.lang
@@ -0,0 +1,32 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=OAuth کنفیگریشن
+OAuthServices=OAuth سروسز
+ManualTokenGeneration=دستی ٹوکن جنریشن
+TokenManager=ٹوکن مینیجر
+IsTokenGenerated=کیا ٹوکن تیار ہوتا ہے؟
+NoAccessToken=مقامی ڈیٹا بیس میں رسائی کا کوئی ٹوکن محفوظ نہیں ہے۔
+HasAccessToken=ایک ٹوکن تیار کیا گیا اور مقامی ڈیٹا بیس میں محفوظ کیا گیا۔
+NewTokenStored=ٹوکن موصول ہوا اور محفوظ کیا گیا۔
+ToCheckDeleteTokenOnProvider=%s OAuth فراہم کنندہ کے ذریعہ محفوظ کردہ اجازت کو چیک کرنے / حذف کرنے کے لیے یہاں کلک کریں
+TokenDeleted=ٹوکن حذف ہو گیا۔
+RequestAccess=رسائی کی درخواست/ تجدید کے لیے یہاں کلک کریں اور محفوظ کرنے کے لیے ایک نیا ٹوکن وصول کریں۔
+DeleteAccess=ٹوکن کو حذف کرنے کے لیے یہاں کلک کریں۔
+UseTheFollowingUrlAsRedirectURI=اپنے OAuth فراہم کنندہ کے ساتھ اپنی اسناد بناتے وقت درج ذیل URL کو ری ڈائریکٹ URI کے بطور استعمال کریں:
+ListOfSupportedOauthProviders=اپنے OAuth2 فراہم کنندہ کے ذریعہ فراہم کردہ اسناد درج کریں۔ صرف تعاون یافتہ OAuth2 فراہم کنندگان یہاں درج ہیں۔ یہ خدمات دوسرے ماڈیولز کے ذریعہ استعمال کی جا سکتی ہیں جن کو OAuth2 کی توثیق کی ضرورت ہے۔
+OAuthSetupForLogin=OAuth ٹوکن بنانے کے لیے صفحہ
+SeePreviousTab=پچھلا ٹیب دیکھیں
+OAuthIDSecret=OAuth ID اور خفیہ
+TOKEN_REFRESH=ٹوکن ریفریش پیش کریں۔
+TOKEN_EXPIRED=ٹوکن کی میعاد ختم ہو گئی۔
+TOKEN_EXPIRE_AT=ٹوکن کی میعاد ختم ہونے پر
+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_STRIPE_TEST_NAME=OAuth اسٹرائپ ٹیسٹ
+OAUTH_STRIPE_LIVE_NAME=OAuth اسٹرائپ لائیو
diff --git a/htdocs/langs/ur_PK/opensurvey.lang b/htdocs/langs/ur_PK/opensurvey.lang
new file mode 100644
index 00000000000..ab75ec29902
--- /dev/null
+++ b/htdocs/langs/ur_PK/opensurvey.lang
@@ -0,0 +1,63 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+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/ur_PK/orders.lang b/htdocs/langs/ur_PK/orders.lang
new file mode 100644
index 00000000000..b67979e0f18
--- /dev/null
+++ b/htdocs/langs/ur_PK/orders.lang
@@ -0,0 +1,196 @@
+# Dolibarr language file - Source file is en_US - orders
+OrdersArea=صارفین کے آرڈر کے علاقے
+SuppliersOrdersArea=خریداری کے آرڈر کا علاقہ
+OrderCard=آرڈر کارڈ
+OrderId=آرڈر کی شناخت
+Order=ترتیب
+PdfOrderTitle=ترتیب
+Orders=احکامات
+OrderLine=آرڈر لائن
+OrderDate=آرڈر کی تاریخ
+OrderDateShort=آرڈر کی تاریخ
+OrderToProcess=عمل کرنے کا حکم
+NewOrder=نیا حکم
+NewSupplierOrderShort=نیا حکم
+NewOrderSupplier=نیا پرچیز آرڈر
+ToOrder=آرڈر کریں۔
+MakeOrder=آرڈر کریں۔
+SupplierOrder=خریداری کے آرڈر
+SuppliersOrders=خریداری کے احکامات
+SaleOrderLines=سیلز آرڈر لائنز
+PurchaseOrderLines=آرڈر لائنیں خریدیں۔
+SuppliersOrdersRunning=موجودہ خریداری کے آرڈر
+CustomerOrder=سیلز آرڈر
+CustomersOrders=سیلز آرڈرز
+CustomersOrdersRunning=موجودہ سیلز آرڈرز
+CustomersOrdersAndOrdersLines=سیلز آرڈرز اور آرڈر کی تفصیلات
+OrdersDeliveredToBill=سیلز آرڈر بل میں بھیجے گئے۔
+OrdersToBill=سیلز آرڈرز کی فراہمی
+OrdersInProcess=سیلز آرڈرز عمل میں ہیں۔
+OrdersToProcess=کارروائی کرنے کے لئے فروخت کے احکامات
+SuppliersOrdersToProcess=کارروائی کے لیے آرڈرز خریدیں۔
+SuppliersOrdersAwaitingReception=خریداری کے آرڈرز استقبال کے منتظر ہیں۔
+AwaitingReception=استقبال کے منتظر
+StatusOrderCanceledShort=منسوخ
+StatusOrderDraftShort=مسودہ
+StatusOrderValidatedShort=تصدیق شدہ
+StatusOrderSentShort=اس عمل میں
+StatusOrderSent=کھیپ عمل میں ہے۔
+StatusOrderOnProcessShort=حکم دیا
+StatusOrderProcessedShort=پروسیس شدہ
+StatusOrderDelivered=پہنچایا
+StatusOrderDeliveredShort=پہنچایا
+StatusOrderToBillShort=پہنچایا
+StatusOrderApprovedShort=منظورشدہ
+StatusOrderRefusedShort=انکار کر دیا
+StatusOrderToProcessShort=عمل کے لئے
+StatusOrderReceivedPartiallyShort=جزوی طور پر موصول ہوا۔
+StatusOrderReceivedAllShort=مصنوعات موصول ہوئیں
+StatusOrderCanceled=منسوخ
+StatusOrderDraft=مسودہ (توثیق کرنے کی ضرورت ہے)
+StatusOrderValidated=تصدیق شدہ
+StatusOrderOnProcess=آرڈر کیا گیا - اسٹینڈ بائی استقبالیہ
+StatusOrderOnProcessWithValidation=آرڈر کیا گیا - اسٹینڈ بائی استقبالیہ یا توثیق
+StatusOrderProcessed=پروسیس شدہ
+StatusOrderToBill=پہنچایا
+StatusOrderApproved=منظورشدہ
+StatusOrderRefused=انکار کر دیا
+StatusOrderReceivedPartially=جزوی طور پر موصول ہوا۔
+StatusOrderReceivedAll=تمام مصنوعات موصول ہوئیں
+ShippingExist=ایک کھیپ موجود ہے۔
+QtyOrdered=مقدار کا حکم دیا۔
+ProductQtyInDraft=ڈرافٹ آرڈرز میں پروڈکٹ کی مقدار
+ProductQtyInDraftOrWaitingApproved=پروڈکٹ کی مقدار مسودہ یا منظور شدہ آرڈرز میں، ابھی تک آرڈر نہیں کیا گیا ہے۔
+MenuOrdersToBill=آرڈرز کی فراہمی
+MenuOrdersToBill2=قابل بل آرڈرز
+ShipProduct=جہاز کی مصنوعات
+CreateOrder=آرڈر بنائیں
+RefuseOrder=حکم سے انکار
+ApproveOrder=آرڈر منظور کریں۔
+Approve2Order=آرڈر منظور کریں (دوسری سطح)
+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=درجہ بندی کی فراہمی
+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=نمائندہ مندرجہ ذیل سیلز آرڈر
+TypeContact_commande_internal_SHIPPING=نمائندہ فالو اپ شپنگ
+TypeContact_commande_external_BILLING=کسٹمر انوائس رابطہ
+TypeContact_commande_external_SHIPPING=کسٹمر شپنگ رابطہ
+TypeContact_commande_external_CUSTOMER=کسٹمر رابطہ فالو اپ آرڈر
+TypeContact_order_supplier_internal_SALESREPFOLL=نمائندہ پیروی اپ خریداری آرڈر
+TypeContact_order_supplier_internal_SHIPPING=نمائندہ فالو اپ شپنگ
+TypeContact_order_supplier_external_BILLING=وینڈر انوائس رابطہ
+TypeContact_order_supplier_external_SHIPPING=وینڈر شپنگ رابطہ
+TypeContact_order_supplier_external_CUSTOMER=فروش سے رابطہ کریں فالو اپ آرڈر
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=مستقل COMMANDE_SUPPLIER_ADDON کی وضاحت نہیں کی گئی ہے۔
+Error_COMMANDE_ADDON_NotDefined=مستقل COMMANDE_ADDON کی وضاحت نہیں کی گئی ہے۔
+Error_OrderNotChecked=انوائس کے لیے کوئی آرڈر نہیں منتخب کیا گیا۔
+# Order modes (how we receive order). Not the "why" are keys stored into dict.lang
+OrderByMail=میل
+OrderByFax=فیکس
+OrderByEMail=ای میل
+OrderByWWW=آن لائن
+OrderByPhone=فون
+# Documents models
+PDFEinsteinDescription=ایک مکمل آرڈر ماڈل (Eratosthene ٹیمپلیٹ کا پرانا نفاذ)
+PDFEratostheneDescription=ایک مکمل آرڈر ماڈل
+PDFEdisonDescription=ایک سادہ آرڈر ماڈل
+PDFProformaDescription=ایک مکمل پروفارما انوائس ٹیمپلیٹ
+CreateInvoiceForThisCustomer=بل کے احکامات
+CreateInvoiceForThisSupplier=بل کے احکامات
+CreateInvoiceForThisReceptions=بل ریسپشنز
+NoOrdersToInvoice=کوئی آرڈر قابل بل نہیں ہے۔
+CloseProcessedOrdersAutomatically=تمام منتخب کردہ آرڈرز کو "پروسیسڈ" کی درجہ بندی کریں۔
+OrderCreation=ترتیب تخلیق
+Ordered=حکم دیا
+OrderCreated=آپ کے آرڈرز بن چکے ہیں۔
+OrderFail=آپ کے آرڈرز بنانے کے دوران ایک خرابی پیش آگئی
+CreateOrders=آرڈرز بنائیں
+ToBillSeveralOrderSelectCustomer=کئی آرڈرز کے لیے انوائس بنانے کے لیے، پہلے کسٹمر پر کلک کریں، پھر "%s" کو منتخب کریں۔
+OptionToSetOrderBilledNotEnabled=ماڈیول ورک فلو سے آپشن، انوائس کی توثیق ہونے پر آرڈر کو خود بخود 'بلڈ' پر سیٹ کرنے کے لیے، فعال نہیں ہے، لہذا آپ کو انوائس تیار ہونے کے بعد دستی طور پر آرڈرز کی حیثیت 'بلڈ' پر سیٹ کرنی ہوگی۔
+IfValidateInvoiceIsNoOrderStayUnbilled=اگر انوائس کی توثیق 'نہیں' ہے، تو انوائس کی توثیق ہونے تک آرڈر 'بغیر بل' کا درجہ برقرار رہے گا۔
+CloseReceivedSupplierOrdersAutomatically=تمام پروڈکٹس موصول ہونے کی صورت میں خود بخود "%s" کی حیثیت کا آرڈر بند کریں۔
+SetShippingMode=شپنگ موڈ سیٹ کریں۔
+WithReceptionFinished=استقبالیہ ختم ہونے کے ساتھ
+#### supplier orders status
+StatusSupplierOrderCanceledShort=منسوخ
+StatusSupplierOrderDraftShort=مسودہ
+StatusSupplierOrderValidatedShort=تصدیق شدہ
+StatusSupplierOrderSentShort=اس عمل میں
+StatusSupplierOrderSent=کھیپ عمل میں ہے۔
+StatusSupplierOrderOnProcessShort=حکم دیا
+StatusSupplierOrderProcessedShort=پروسیس شدہ
+StatusSupplierOrderDelivered=پہنچایا
+StatusSupplierOrderDeliveredShort=پہنچایا
+StatusSupplierOrderToBillShort=پہنچایا
+StatusSupplierOrderApprovedShort=منظورشدہ
+StatusSupplierOrderRefusedShort=انکار کر دیا
+StatusSupplierOrderToProcessShort=عمل کے لئے
+StatusSupplierOrderReceivedPartiallyShort=جزوی طور پر موصول ہوا۔
+StatusSupplierOrderReceivedAllShort=مصنوعات موصول ہوئیں
+StatusSupplierOrderCanceled=منسوخ
+StatusSupplierOrderDraft=مسودہ (توثیق کرنے کی ضرورت ہے)
+StatusSupplierOrderValidated=تصدیق شدہ
+StatusSupplierOrderOnProcess=آرڈر کیا گیا - اسٹینڈ بائی استقبالیہ
+StatusSupplierOrderOnProcessWithValidation=آرڈر کیا گیا - اسٹینڈ بائی استقبالیہ یا توثیق
+StatusSupplierOrderProcessed=پروسیس شدہ
+StatusSupplierOrderToBill=پہنچایا
+StatusSupplierOrderApproved=منظورشدہ
+StatusSupplierOrderRefused=انکار کر دیا
+StatusSupplierOrderReceivedPartially=جزوی طور پر موصول ہوا۔
+StatusSupplierOrderReceivedAll=تمام مصنوعات موصول ہوئیں
diff --git a/htdocs/langs/ur_PK/other.lang b/htdocs/langs/ur_PK/other.lang
new file mode 100644
index 00000000000..8ea3e43b1cb
--- /dev/null
+++ b/htdocs/langs/ur_PK/other.lang
@@ -0,0 +1,305 @@
+# Dolibarr language file - Source file is en_US - other
+SecurityCode=سیکیورٹی کوڈ
+NumberingShort=N°
+Tools=اوزار
+TMenuTools=اوزار
+ToolsDesc=دیگر مینو اندراجات میں شامل نہیں تمام ٹولز کو یہاں گروپ کیا گیا ہے۔ <br> تمام ٹولز تک بائیں مینو سے رسائی حاصل کی جا سکتی ہے۔
+Birthday=سالگرہ
+BirthdayAlertOn=سالگرہ کا الرٹ فعال
+BirthdayAlertOff=سالگرہ کا الرٹ غیر فعال
+TransKey=کلیدی TransKey کا ترجمہ
+MonthOfInvoice=انوائس کی تاریخ کا مہینہ (نمبر 1-12)
+TextMonthOfInvoice=انوائس کی تاریخ کا مہینہ (متن)
+PreviousMonthOfInvoice=انوائس کی تاریخ کا پچھلا مہینہ (نمبر 1-12)
+TextPreviousMonthOfInvoice=انوائس کی تاریخ کا پچھلا مہینہ (متن)
+NextMonthOfInvoice=انوائس کی تاریخ کے بعد کا مہینہ (نمبر 1-12)
+TextNextMonthOfInvoice=انوائس کی تاریخ کے بعد کا مہینہ (متن)
+PreviousMonth=پچھلے مہینے
+CurrentMonth=موجودہ مہینہ
+ZipFileGeneratedInto=زپ فائل <b> %s </b> میں تیار کی گئی۔
+DocFileGeneratedInto=دستاویز فائل <b> %s </b> میں تیار کی گئی۔
+JumpToLogin=منقطع لاگ ان پیج پر جائیں...
+MessageForm=آن لائن ادائیگی کے فارم پر پیغام
+MessageOK=تصدیق شدہ ادائیگی کے لیے واپسی کے صفحے پر پیغام بھیجیں۔
+MessageKO=منسوخ شدہ ادائیگی کے لیے واپسی کے صفحے پر پیغام بھیجیں۔
+ContentOfDirectoryIsNotEmpty=اس ڈائریکٹری کا مواد خالی نہیں ہے۔
+DeleteAlsoContentRecursively=تمام مواد کو بار بار حذف کرنے کے لیے چیک کریں۔
+PoweredBy=کی طرف سے طاقت
+YearOfInvoice=رسید کی تاریخ کا سال
+PreviousYearOfInvoice=انوائس کی تاریخ کے پچھلے سال
+NextYearOfInvoice=انوائس کی تاریخ کے بعد کا سال
+DateNextInvoiceBeforeGen=اگلی انوائس کی تاریخ (جنریشن سے پہلے)
+DateNextInvoiceAfterGen=اگلی رسید کی تاریخ (جنریشن کے بعد)
+GraphInBarsAreLimitedToNMeasures=گرافکس 'بارز' موڈ میں %s اقدامات تک محدود ہیں۔ اس کی بجائے موڈ 'لائنز' خود بخود منتخب ہو گیا تھا۔
+OnlyOneFieldForXAxisIsPossible=X-Axis کے طور پر فی الحال صرف 1 فیلڈ ممکن ہے۔ صرف پہلا منتخب فیلڈ منتخب کیا گیا ہے۔
+AtLeastOneMeasureIsRequired=پیمائش کے لیے کم از کم 1 فیلڈ درکار ہے۔
+AtLeastOneXAxisIsRequired=X-Axis کے لیے کم از کم 1 فیلڈ درکار ہے۔
+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=مداخلت میں رابطہ شامل کیا گیا۔
+Notify_FICHINTER_SENTBYMAIL=مداخلت بذریعہ ڈاک بھیجی گئی۔
+Notify_SHIPPING_VALIDATE=شپنگ کی توثیق کر دی گئی۔
+Notify_SHIPPING_SENTBYMAIL=شپنگ بذریعہ ڈاک بھیجی گئی۔
+Notify_MEMBER_VALIDATE=ممبر نے تصدیق کر دی۔
+Notify_MEMBER_MODIFY=ممبر میں ترمیم کی گئی۔
+Notify_MEMBER_SUBSCRIPTION=ممبر نے سبسکرائب کیا۔
+Notify_MEMBER_RESILIATE=رکن ختم کر دیا گیا۔
+Notify_MEMBER_DELETE=رکن کو حذف کر دیا گیا۔
+Notify_PROJECT_CREATE=پروجیکٹ کی تخلیق
+Notify_TASK_CREATE=ٹاسک بنایا گیا۔
+Notify_TASK_MODIFY=کام میں ترمیم کی گئی۔
+Notify_TASK_DELETE=ٹاسک حذف کر دیا گیا۔
+Notify_EXPENSE_REPORT_VALIDATE=اخراجات کی رپورٹ کی توثیق (منظوری درکار)
+Notify_EXPENSE_REPORT_APPROVE=اخراجات کی رپورٹ منظور کر لی گئی۔
+Notify_HOLIDAY_VALIDATE=چھوڑنے کی درخواست کی توثیق ہو گئی (منظوری درکار ہے)
+Notify_HOLIDAY_APPROVE=چھٹی کی درخواست منظور کر لی گئی۔
+Notify_ACTION_CREATE=ایجنڈے میں کارروائی شامل کی گئی۔
+SeeModuleSetup=ماڈیول %s کا سیٹ اپ دیکھیں
+NbOfAttachedFiles=منسلک فائلوں/دستاویزات کی تعداد
+TotalSizeOfAttachedFiles=منسلک فائلوں/دستاویزات کا کل سائز
+MaxSize=زیادہ سے زیادہ سائز
+AttachANewFile=ایک نئی فائل/دستاویز منسلک کریں۔
+LinkedObject=منسلک آبجیکٹ
+NbOfActiveNotifications=اطلاعات کی تعداد (وصول کنندگان کی ای میلز کی تعداد)
+PredefinedMailTest=__(ہیلو)__\nیہ ایک ٹیسٹ میل ہے جسے __EMAIL__ پر بھیجا گیا ہے۔\nلائنوں کو گاڑی کی واپسی کے ذریعے الگ کیا جاتا ہے۔\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(ہیلو)__ <br> یہ <b> ٹیسٹ ہے <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_DATE__ کو __EVENT_DATE__ کو __EVENT_TIME__ <br> <br> یہ ایک خودکار پیغام ہے، براہ کرم جواب نہ دیں۔
+DemoDesc=Dolibarr ایک کمپیکٹ ERP/CRM ہے جو کئی کاروباری ماڈیولز کو سپورٹ کرتا ہے۔ تمام ماڈیولز کی نمائش کرنے والا ڈیمو کوئی معنی نہیں رکھتا کیونکہ یہ منظر کبھی نہیں ہوتا (کئی سو دستیاب)۔ لہذا، کئی ڈیمو پروفائلز دستیاب ہیں۔
+ChooseYourDemoProfil=ڈیمو پروفائل کا انتخاب کریں جو آپ کی ضروریات کے مطابق ہو...
+ChooseYourDemoProfilMore=یا اپنا پروفائل بنائیں <br> (دستی ماڈیول کا انتخاب)
+DemoFundation=فاؤنڈیشن کے ممبروں کا نظم کریں۔
+DemoFundation2=فاؤنڈیشن کے ممبران اور بینک اکاؤنٹ کا نظم کریں۔
+DemoCompanyServiceOnly=صرف کمپنی یا فری لانس سیلنگ سروس
+DemoCompanyShopWithCashDesk=کیش ڈیسک کے ساتھ دکان کا انتظام کریں۔
+DemoCompanyProductAndStocks=پوائنٹ آف سیلز کے ساتھ مصنوعات کی فروخت کی خریداری کریں۔
+DemoCompanyManufacturing=کمپنی کی تیاری کی مصنوعات
+DemoCompanyAll=متعدد سرگرمیوں والی کمپنی (تمام اہم ماڈیولز)
+CreatedBy=%s کے ذریعہ تخلیق کیا گیا۔
+ModifiedBy=ترمیم شدہ بذریعہ %s
+ValidatedBy=%s سے تصدیق شدہ
+SignedBy=%s کے ذریعے دستخط شدہ
+ClosedBy=%s کے ذریعہ بند
+CreatedById=یوزر آئی ڈی جس نے بنایا
+ModifiedById=صارف کی شناخت جس نے تازہ ترین تبدیلی کی ہے۔
+ValidatedById=یوزر آئی ڈی جس نے تصدیق کی۔
+CanceledById=یوزر آئی ڈی جس نے منسوخ کیا۔
+ClosedById=یوزر آئی ڈی جس نے بند کیا۔
+CreatedByLogin=صارف لاگ ان جس نے بنایا
+ModifiedByLogin=صارف لاگ ان جس نے تازہ ترین تبدیلی کی۔
+ValidatedByLogin=صارف لاگ ان جس نے توثیق کی۔
+CanceledByLogin=صارف لاگ ان جس نے منسوخ کیا۔
+ClosedByLogin=صارف لاگ ان جس نے بند کیا۔
+FileWasRemoved=فائل %s کو ہٹا دیا گیا تھا۔
+DirWasRemoved=ڈائرکٹری %s کو ہٹا دیا گیا تھا۔
+FeatureNotYetAvailable=فیچر ابھی موجودہ ورژن میں دستیاب نہیں ہے۔
+FeatureNotAvailableOnDevicesWithoutMouse=خصوصیت ماؤس کے بغیر آلات پر دستیاب نہیں ہے۔
+FeaturesSupported=تائید شدہ خصوصیات
+Width=چوڑائی
+Height=اونچائی
+Depth=گہرائی
+Top=اوپر
+Bottom=نیچے
+Left=بائیں
+Right=صحیح
+CalculatedWeight=حساب شدہ وزن
+CalculatedVolume=حساب شدہ حجم
+Weight=وزن
+WeightUnitton=ٹن
+WeightUnitkg=کلو
+WeightUnitg=جی
+WeightUnitmg=ملی گرام
+WeightUnitpound=پونڈ
+WeightUnitounce=اونس
+Length=لمبائی
+LengthUnitm=m
+LengthUnitdm=ڈی ایم
+LengthUnitcm=سینٹی میٹر
+LengthUnitmm=ملی میٹر
+Surface=رقبہ
+SurfaceUnitm2=m²
+SurfaceUnitdm2=dm²
+SurfaceUnitcm2=cm²
+SurfaceUnitmm2=mm²
+SurfaceUnitfoot2=ft²
+SurfaceUnitinch2=میں²
+Volume=حجم
+VolumeUnitm3=m³
+VolumeUnitdm3=dm³ (L)
+VolumeUnitcm3=cm³ (ml)
+VolumeUnitmm3=mm³ (µl)
+VolumeUnitfoot3=ft³
+VolumeUnitinch3=in³
+VolumeUnitounce=اونس
+VolumeUnitlitre=لیٹر
+VolumeUnitgallon=گیلن
+SizeUnitm=m
+SizeUnitdm=ڈی ایم
+SizeUnitcm=سینٹی میٹر
+SizeUnitmm=ملی میٹر
+SizeUnitinch=انچ
+SizeUnitfoot=پاؤں
+SizeUnitpoint=نقطہ
+BugTracker=بگ ٹریکر
+SendNewPasswordDesc=یہ فارم آپ کو نئے پاس ورڈ کی درخواست کرنے کی اجازت دیتا ہے۔ یہ آپ کے ای میل ایڈریس پر بھیجا جائے گا۔ <br> ای میل میں تصدیقی لنک پر کلک کرنے کے بعد تبدیلی موثر ہو جائے گی۔ <br> اپنا ان باکس چیک کریں۔
+BackToLoginPage=لاگ ان صفحہ پر واپس جائیں۔
+AuthenticationDoesNotAllowSendNewPassword=توثیق کا موڈ <b> %s </b> ہے۔ <br> اس موڈ میں، Dolibarr آپ کا پاس ورڈ نہ جان سکتا ہے اور نہ ہی تبدیل کر سکتا ہے۔ <br> اگر آپ اپنا پاس ورڈ تبدیل کرنا چاہتے ہیں تو اپنے سسٹم ایڈمنسٹریٹر سے رابطہ کریں۔
+EnableGDLibraryDesc=اس اختیار کو استعمال کرنے کے لیے اپنی پی ایچ پی کی تنصیب پر جی ڈی لائبریری کو انسٹال یا فعال کریں۔
+ProfIdShortDesc= <b> Prof Id %s </b> تیسری پارٹی کے ملک پر منحصر ایک معلومات ہے۔ <br> مثال کے طور پر، ملک کے لیے <b> %s </b>، اس کا کوڈ <b> a0ecb2ec87f4987f49fz0a07f49fz0 ہے۔
+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=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=آپ کا پاس ورڈ کامیابی سے دوبارہ ترتیب دیا گیا ہے۔
+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=Login with %s
+
+##### Export #####
+ExportsArea=برآمدات کا علاقہ
+AvailableFormats=دستیاب فارمیٹس
+LibraryUsed=لائبریری استعمال کی گئی۔
+LibraryVersion=لائبریری ورژن
+ExportableDatas=قابل برآمد ڈیٹا
+NoExportableData=کوئی قابل برآمد ڈیٹا نہیں (برآمد کے قابل ڈیٹا کے ساتھ کوئی ماڈیول لوڈ نہیں، یا اجازتیں غائب ہیں)
+##### External sites #####
+WebsiteSetup=ماڈیول ویب سائٹ کا سیٹ اپ
+WEBSITE_PAGEURL=صفحہ کا URL
+WEBSITE_TITLE=عنوان
+WEBSITE_DESCRIPTION=تفصیل
+WEBSITE_IMAGE=تصویر
+WEBSITE_IMAGEDesc=تصویری میڈیا کا رشتہ دار راستہ۔ آپ اسے خالی رکھ سکتے ہیں کیونکہ یہ شاذ و نادر ہی استعمال ہوتا ہے (بلاگ پوسٹس کی فہرست میں تھمب نیل دکھانے کے لیے اسے متحرک مواد کے ذریعے استعمال کیا جا سکتا ہے)۔ اگر راستہ ویب سائٹ کے نام پر منحصر ہے تو راستے میں __WEBSITE_KEY__ استعمال کریں (مثال کے طور پر: image/__WEBSITE_KEY__/stories/myimage.png)۔
+WEBSITE_KEYWORDS=مطلوبہ الفاظ
+LinesToImport=درآمد کرنے کے لیے لائنیں
+
+MemoryUsage=استعمال یاد داشت
+RequestDuration=درخواست کی مدت
+ProductsPerPopularity=مقبولیت کے لحاظ سے مصنوعات/خدمات
+PopuProp=پروپوزل میں مقبولیت کے لحاظ سے پروڈکٹس/سروسز
+PopuCom=آرڈرز میں مقبولیت کے لحاظ سے پروڈکٹس/سروسز
+ProductStatistics=مصنوعات/خدمات کے اعدادوشمار
+NbOfQtyInOrders=آرڈرز میں مقدار
+SelectTheTypeOfObjectToAnalyze=اس کے اعدادوشمار دیکھنے کے لیے کسی چیز کو منتخب کریں...
+
+ConfirmBtnCommonContent = کیا آپ واقعی "%s" کرنا چاہتے ہیں؟
+ConfirmBtnCommonTitle = اپنے عمل کی تصدیق کریں۔
+CloseDialog = بند کریں
diff --git a/htdocs/langs/ur_PK/partnership.lang b/htdocs/langs/ur_PK/partnership.lang
new file mode 100644
index 00000000000..5bfffcb9200
--- /dev/null
+++ b/htdocs/langs/ur_PK/partnership.lang
@@ -0,0 +1,92 @@
+# 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=شراکت داری کا انتظام
+PartnershipDescription=ماڈیول پارٹنرشپ مینجمنٹ
+PartnershipDescriptionLong= ماڈیول پارٹنرشپ مینجمنٹ
+Partnership=شراکت داری
+AddPartnership=شراکت داری شامل کریں۔
+CancelPartnershipForExpiredMembers=شراکت: میعاد ختم ہونے والی سبسکرپشنز والے ممبران کی شراکت کو منسوخ کریں۔
+PartnershipCheckBacklink=شراکت: حوالہ دینے والے بیک لنک کو چیک کریں۔
+
+#
+# Menu
+#
+NewPartnership=نئی شراکت داری
+ListOfPartnerships=شراکت کی فہرست
+
+#
+# Admin page
+#
+PartnershipSetup=پارٹنرشپ سیٹ اپ
+PartnershipAbout=شراکت داری کے بارے میں
+PartnershipAboutPage=صفحہ کے بارے میں شراکت داری
+partnershipforthirdpartyormember=پارٹنر کی حیثیت 'تھرڈ پارٹی' یا 'ممبر' پر سیٹ ہونی چاہیے
+PARTNERSHIP_IS_MANAGED_FOR=شراکت داری کا انتظام کیا گیا۔
+PARTNERSHIP_BACKLINKS_TO_CHECK=چیک کرنے کے لیے بیک لنکس
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=سبسکرپشن کی میعاد ختم ہونے پر شراکت کی حیثیت کو منسوخ کرنے سے پہلے دن کا نوٹ
+ReferingWebsiteCheck=ویب سائٹ کا حوالہ دیتے ہوئے چیک کریں۔
+ReferingWebsiteCheckDesc=آپ یہ چیک کرنے کے لیے ایک خصوصیت کو فعال کر سکتے ہیں کہ آپ کے شراکت داروں نے اپنی ویب سائٹ پر آپ کی ویب سائٹ کے ڈومینز میں بیک لنک شامل کیا ہے۔
+
+#
+# Object
+#
+DeletePartnership=شراکت کو حذف کریں۔
+PartnershipDedicatedToThisThirdParty=شراکت داری اس تیسرے فریق کے لیے وقف ہے۔
+PartnershipDedicatedToThisMember=شراکت داری اس رکن کے لیے وقف ہے۔
+DatePartnershipStart=شروع کرنے کی تاریخ
+DatePartnershipEnd=آخری تاریخ
+ReasonDecline=انکار کی وجہ
+ReasonDeclineOrCancel=انکار کی وجہ
+PartnershipAlreadyExist=شراکت داری پہلے سے موجود ہے۔
+ManagePartnership=شراکت کا انتظام کریں۔
+BacklinkNotFoundOnPartnerWebsite=بیک لنک پارٹنر ویب سائٹ پر نہیں ملا
+ConfirmClosePartnershipAsk=کیا آپ واقعی اس شراکت کو منسوخ کرنا چاہتے ہیں؟
+PartnershipType=شراکت کی قسم
+PartnershipRefApproved=شراکت %s کی منظوری دے دی گئی۔
+
+#
+# Template Mail
+#
+SendingEmailOnPartnershipWillSoonBeCanceled=شراکت جلد ہی منسوخ کر دی جائے گی۔
+SendingEmailOnPartnershipRefused=شراکت سے انکار کر دیا۔
+SendingEmailOnPartnershipAccepted=شراکت قبول کر لی
+SendingEmailOnPartnershipCanceled=شراکت منسوخ کر دی گئی۔
+
+YourPartnershipWillSoonBeCanceledTopic=شراکت جلد ہی منسوخ کر دی جائے گی۔
+YourPartnershipRefusedTopic=شراکت سے انکار کر دیا۔
+YourPartnershipAcceptedTopic=شراکت قبول کر لی
+YourPartnershipCanceledTopic=شراکت منسوخ کر دی گئی۔
+
+YourPartnershipWillSoonBeCanceledContent=ہم آپ کو مطلع کرتے ہیں کہ آپ کی شراکت جلد ہی منسوخ کر دی جائے گی (بیک لنک نہیں ملا)
+YourPartnershipRefusedContent=ہم آپ کو مطلع کرتے ہیں کہ آپ کی شراکت کی درخواست مسترد کر دی گئی ہے۔
+YourPartnershipAcceptedContent=ہم آپ کو مطلع کرتے ہیں کہ آپ کی شراکت کی درخواست قبول کر لی گئی ہے۔
+YourPartnershipCanceledContent=ہم آپ کو مطلع کرتے ہیں کہ آپ کی شراکت منسوخ کر دی گئی ہے۔
+
+CountLastUrlCheckError=آخری URL چیک کے لیے غلطیوں کی تعداد
+LastCheckBacklink=آخری URL چیک کی تاریخ
+ReasonDeclineOrCancel=انکار کی وجہ
+
+#
+# Status
+#
+PartnershipDraft=مسودہ
+PartnershipAccepted=قبول کر لیا
+PartnershipRefused=انکار کر دیا
+PartnershipCanceled=منسوخ
+PartnershipManagedFor=شراکت دار ہیں۔
diff --git a/htdocs/langs/ur_PK/paybox.lang b/htdocs/langs/ur_PK/paybox.lang
new file mode 100644
index 00000000000..b534a5041cb
--- /dev/null
+++ b/htdocs/langs/ur_PK/paybox.lang
@@ -0,0 +1,30 @@
+# Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=پے باکس ماڈیول سیٹ اپ
+PayBoxDesc=یہ ماڈیول صارفین کو <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external"> Paybox </a> پر ادائیگی کی اجازت دینے کے لیے صفحات پیش کرتا ہے۔ اسے مفت ادائیگی کے لیے یا کسی خاص Dolibarr چیز (انوائس، آرڈر، ...) پر ادائیگی کے لیے استعمال کیا جا سکتا ہے۔
+FollowingUrlAreAvailableToMakePayments=Dolibarr اشیاء پر ادائیگی کرنے کے لیے صارف کو صفحہ پیش کرنے کے لیے درج ذیل URLs دستیاب ہیں۔
+PaymentForm=ادائیگی کا فارم
+WelcomeOnPaymentPage=ہماری آن لائن ادائیگی کی خدمت میں خوش آمدید
+ThisScreenAllowsYouToPay=یہ اسکرین آپ کو %s پر آن لائن ادائیگی کرنے کی اجازت دیتی ہے۔
+ThisIsInformationOnPayment=یہ ادائیگی کے بارے میں معلومات ہے۔
+ToComplete=مکمل کرنا
+YourEMail=ادائیگی کی تصدیق حاصل کرنے کے لیے ای میل کریں۔
+Creditor=قرض دینے والا
+PaymentCode=ادائیگی کا کوڈ
+PayBoxDoPayment=پے باکس کے ساتھ ادائیگی کریں۔
+YouWillBeRedirectedOnPayBox=آپ کو کریڈٹ کارڈ کی معلومات داخل کرنے کے لیے محفوظ پے باکس صفحہ پر بھیج دیا جائے گا۔
+Continue=اگلے
+SetupPayBoxToHavePaymentCreatedAutomatically=اپنے پے باکس کو url <b> %s </b> کے ساتھ سیٹ اپ کریں تاکہ پے باکس کی توثیق ہونے پر ادائیگی خود بخود بن جائے۔
+YourPaymentHasBeenRecorded=یہ صفحہ تصدیق کرتا ہے کہ آپ کی ادائیگی ریکارڈ کی گئی ہے۔ شکریہ
+YourPaymentHasNotBeenRecorded=آپ کی ادائیگی ریکارڈ نہیں کی گئی ہے اور لین دین منسوخ کر دیا گیا ہے۔ شکریہ
+AccountParameter=اکاؤنٹ کے پیرامیٹرز
+UsageParameter=استعمال کے پیرامیٹرز
+InformationToFindParameters=اپنے %s اکاؤنٹ کی معلومات تلاش کرنے میں مدد کریں۔
+PAYBOX_CGI_URL_V2=ادائیگی کے لیے پے باکس سی جی آئی ماڈیول کا یو آر ایل
+CSSUrlForPaymentForm=ادائیگی کے فارم کے لیے سی ایس ایس اسٹائل شیٹ یو آر ایل
+NewPayboxPaymentReceived=نئی پے باکس ادائیگی موصول ہوئی۔
+NewPayboxPaymentFailed=نئی پے باکس ادائیگی کی کوشش کی لیکن ناکام ہوگئی
+PAYBOX_PAYONLINE_SENDEMAIL=ادائیگی کی کوشش کے بعد ای میل اطلاع (کامیابی یا ناکام)
+PAYBOX_PBX_SITE=PBX SITE کے لیے قدر
+PAYBOX_PBX_RANG=PBX رنگ کی قدر
+PAYBOX_PBX_IDENTIFIANT=PBX ID کی قدر
+PAYBOX_HMAC_KEY=HMAC کلید
diff --git a/htdocs/langs/ur_PK/paypal.lang b/htdocs/langs/ur_PK/paypal.lang
new file mode 100644
index 00000000000..b268339fcd5
--- /dev/null
+++ b/htdocs/langs/ur_PK/paypal.lang
@@ -0,0 +1,36 @@
+# 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 آبجیکٹ (انوائس، آرڈر، ...) سے متعلق ادائیگی کے لیے استعمال کیا جا سکتا ہے۔
+PaypalOrCBDoPayment=پے پال (کارڈ یا پے پال) سے ادائیگی کریں
+PaypalDoPayment=پے پال کے ساتھ ادائیگی کریں۔
+PAYPAL_API_SANDBOX=موڈ ٹیسٹ/سینڈ باکس
+PAYPAL_API_USER=API صارف نام
+PAYPAL_API_PASSWORD=API پاس ورڈ
+PAYPAL_API_SIGNATURE=API دستخط
+PAYPAL_SSLVERSION=کرل SSL ورژن
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY="انٹیگرل" ادائیگی (کریڈٹ کارڈ+پے پال) یا صرف "پے پال" پیش کریں۔
+PaypalModeIntegral=لازمی
+PaypalModeOnlyPaypal=صرف پے پال
+ONLINE_PAYMENT_CSS_URL=آن لائن ادائیگی کے صفحے پر CSS اسٹائل شیٹ کا اختیاری URL
+ThisIsTransactionId=یہ ٹرانزیکشن کی شناخت ہے: <b> %s </b>
+PAYPAL_ADD_PAYMENT_URL=جب آپ ای میل کے ذریعے کوئی دستاویز بھیجیں تو پے پال کی ادائیگی کا یو آر ایل شامل کریں۔
+NewOnlinePaymentReceived=نئی آن لائن ادائیگی موصول ہوئی۔
+NewOnlinePaymentFailed=نئی آن لائن ادائیگی کی کوشش کی لیکن ناکام ہوگئی
+ONLINE_PAYMENT_SENDEMAIL=ہر ادائیگی کی کوشش کے بعد اطلاعات کے لیے ای میل ایڈریس (کامیابی اور ناکامی کے لیے)
+ReturnURLAfterPayment=ادائیگی کے بعد URL واپس کریں۔
+ValidationOfOnlinePaymentFailed=آن لائن ادائیگی کی توثیق ناکام ہوگئی
+PaymentSystemConfirmPaymentPageWasCalledButFailed=ادائیگی کی تصدیق کے صفحے کو ادائیگی کے نظام کی طرف سے بلایا گیا تھا ایک خرابی واپس آ گئی
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API کال ناکام ہوگئی۔
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API کال ناکام ہوگئی۔
+DetailedErrorMessage=خرابی کا تفصیلی پیغام
+ShortErrorMessage=شارٹ ایرر میسج
+ErrorCode=غلط کوڈ
+ErrorSeverityCode=خرابی کی شدت کا کوڈ
+OnlinePaymentSystem=آن لائن ادائیگی کا نظام
+PaypalLiveEnabled=پے پال "لائیو" موڈ فعال ہے (بصورت دیگر ٹیسٹ/سینڈ باکس موڈ)
+PaypalImportPayment=پے پال کی ادائیگی درآمد کریں۔
+PostActionAfterPayment=ادائیگی کے بعد کارروائیاں پوسٹ کریں۔
+ARollbackWasPerformedOnPostActions=تمام پوسٹ ایکشنز پر ایک رول بیک کیا گیا تھا۔ اگر ضروری ہو تو آپ کو پوسٹ کے اعمال کو دستی طور پر مکمل کرنا چاہیے۔
+ValidationOfPaymentFailed=ادائیگی کی توثیق ناکام ہوگئی ہے۔
+CardOwner=کارڈ ہولڈر
+PayPalBalance=پے پال کریڈٹ
diff --git a/htdocs/langs/ur_PK/printing.lang b/htdocs/langs/ur_PK/printing.lang
new file mode 100644
index 00000000000..a59e357a6b4
--- /dev/null
+++ b/htdocs/langs/ur_PK/printing.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - printing
+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 ٹوکن
+PrintGCPDesc=یہ ڈرائیور گوگل کلاؤڈ پرنٹ کا استعمال کرتے ہوئے دستاویزات کو براہ راست پرنٹر پر بھیجنے کی اجازت دیتا ہے۔
+GCP_Name=نام
+GCP_displayName=ڈسپلے کا نام
+GCP_Id=پرنٹر کی شناخت
+GCP_OwnerName=مالک کا نام
+GCP_State=پرنٹر اسٹیٹ
+GCP_connectionStatus=آن لائن ریاست
+GCP_Type=پرنٹر کی قسم
+PrintIPPDesc=یہ ڈرائیور دستاویزات کو براہ راست پرنٹر پر بھیجنے کی اجازت دیتا ہے۔ اس کے لیے ایک لینکس سسٹم کی ضرورت ہے جس میں CUPS انسٹال ہو۔
+PRINTIPP_HOST=پرنٹ سرور
+PRINTIPP_PORT=بندرگاہ
+PRINTIPP_USER=لاگ ان کریں
+PRINTIPP_PASSWORD=پاس ورڈ
+NoDefaultPrinterDefined=کوئی ڈیفالٹ پرنٹر متعین نہیں ہے۔
+DefaultPrinter=ڈیفالٹ پرنٹر
+Printer=پرنٹر
+IPP_Uri=پرنٹر Uri
+IPP_Name=پرنٹر کا نام
+IPP_State=پرنٹر اسٹیٹ
+IPP_State_reason=ریاستی وجہ
+IPP_State_reason1=ریاستی وجہ 1
+IPP_BW=بی ڈبلیو
+IPP_Color=رنگ
+IPP_Device=ڈیوائس
+IPP_Media=پرنٹر میڈیا
+IPP_Supported=میڈیا کی قسم
+DirectPrintingJobsDesc=یہ صفحہ دستیاب پرنٹرز کے لیے دستیاب پرنٹنگ جابز کی فہرست دیتا ہے۔
+GoogleAuthNotConfigured=Google OAuth سیٹ اپ نہیں کیا گیا ہے۔ ماڈیول OAuth کو فعال کریں اور ایک Google ID/Secret سیٹ کریں۔
+GoogleAuthConfigured=Google OAuth کی اسناد ماڈیول OAuth کے سیٹ اپ میں پائی گئیں۔
+PrintingDriverDescprintgcp=پرنٹنگ ڈرائیور گوگل کلاؤڈ پرنٹ کے لیے کنفیگریشن متغیر۔
+PrintingDriverDescprintipp=ڈرائیور کپ پرنٹ کرنے کے لیے کنفیگریشن متغیر۔
+PrintTestDescprintgcp=گوگل کلاؤڈ پرنٹ کے لیے پرنٹرز کی فہرست۔
+PrintTestDescprintipp=کپ کے لیے پرنٹرز کی فہرست۔
diff --git a/htdocs/langs/ur_PK/productbatch.lang b/htdocs/langs/ur_PK/productbatch.lang
new file mode 100644
index 00000000000..f70edc0c12c
--- /dev/null
+++ b/htdocs/langs/ur_PK/productbatch.lang
@@ -0,0 +1,45 @@
+# ProductBATCH language file - Source file is en_US - ProductBATCH
+ManageLotSerial=لاٹ/سیریل نمبر استعمال کریں۔
+ProductStatusOnBatch=ہاں (بہت ضرورت ہے)
+ProductStatusOnSerial=ہاں (منفرد سیریل نمبر درکار ہے)
+ProductStatusNotOnBatch=نہیں (لاٹ/سیریل استعمال نہیں کیا گیا)
+ProductStatusOnBatchShort=لاٹ
+ProductStatusOnSerialShort=سیریل
+ProductStatusNotOnBatchShort=نہیں
+Batch=لاٹ/سیریل
+atleast1batchfield=تاریخ کے حساب سے کھائیں یا تاریخ کے حساب سے فروخت کریں یا لاٹ/سیریل نمبر
+batch_number=لاٹ/سیریل نمبر
+BatchNumberShort=لاٹ/سیریل
+EatByDate=تاریخ کے حساب سے کھائیں۔
+SellByDate=تاریخ کے لحاظ سے فروخت کریں۔
+DetailBatchNumber=لاٹ/سیریل کی تفصیلات
+printBatch=لاٹ/سیریل: %s
+printEatby=Eat-by: %s
+printSellby=بذریعہ فروخت: %s
+printQty=مقدار: %d
+AddDispatchBatchLine=شیلف لائف ڈسپیچنگ کے لیے ایک لائن شامل کریں۔
+WhenProductBatchModuleOnOptionAreForced=جب ماڈیول لاٹ/سیریل آن ہوتا ہے، تو خودکار سٹاک کمی کو مجبور کیا جاتا ہے کہ 'شپنگ کی توثیق پر حقیقی اسٹاک کو کم کریں' اور خودکار اضافہ موڈ کو 'گوداموں میں دستی بھیجنے پر حقیقی اسٹاک میں اضافہ' کرنے پر مجبور کیا جاتا ہے اور اس میں ترمیم نہیں کی جا سکتی ہے۔ دوسرے آپشنز کی تعریف آپ کی مرضی کے مطابق کی جا سکتی ہے۔
+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=حکم سے باہر
+InWorkingOrder=ورکنگ آرڈر میں
+ToReplace=بدل دیں۔
diff --git a/htdocs/langs/ur_PK/products.lang b/htdocs/langs/ur_PK/products.lang
new file mode 100644
index 00000000000..4f65a215f19
--- /dev/null
+++ b/htdocs/langs/ur_PK/products.lang
@@ -0,0 +1,413 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=پروڈکٹ کا حوالہ
+ProductLabel=پروڈکٹ کا لیبل
+ProductLabelTranslated=ترجمہ شدہ پروڈکٹ لیبل
+ProductDescription=مصنوعات کی وضاحت
+ProductDescriptionTranslated=ترجمہ شدہ مصنوعات کی تفصیل
+ProductNoteTranslated=ترجمہ شدہ پروڈکٹ نوٹ
+ProductServiceCard=پروڈکٹس/سروسز کارڈ
+TMenuProducts=مصنوعات
+TMenuServices=خدمات
+Products=مصنوعات
+Services=خدمات
+Product=پروڈکٹ
+Service=سروس
+ProductId=پروڈکٹ/سروس آئی ڈی
+Create=بنانا
+Reference=حوالہ
+NewProduct=نئی بنائی گئی چیز
+NewService=نئی سروس
+ProductVatMassChange=عالمی VAT اپ ڈیٹ
+ProductVatMassChangeDesc=یہ ٹول <b> <u> ALL </u> </b> مصنوعات اور خدمات پر بیان کردہ VAT کی شرح کو اپ ڈیٹ کرتا ہے!
+MassBarcodeInit=بڑے پیمانے پر بارکوڈ init
+MassBarcodeInitDesc=اس صفحہ کو ان اشیاء پر بار کوڈ شروع کرنے کے لیے استعمال کیا جا سکتا ہے جن میں بار کوڈ کی وضاحت نہیں کی گئی ہے۔ ماڈیول بارکوڈ کا سیٹ اپ مکمل ہونے سے پہلے چیک کریں۔
+ProductAccountancyBuyCode=اکاؤنٹنگ کوڈ (خریداری)
+ProductAccountancyBuyIntraCode=اکاؤنٹنگ کوڈ (انٹرا کمیونٹی خریدیں)
+ProductAccountancyBuyExportCode=اکاؤنٹنگ کوڈ (خرید درآمد)
+ProductAccountancySellCode=اکاؤنٹنگ کوڈ (فروخت)
+ProductAccountancySellIntraCode=اکاؤنٹنگ کوڈ (فروخت انٹرا کمیونٹی)
+ProductAccountancySellExportCode=اکاؤنٹنگ کوڈ (فروخت کی برآمد)
+ProductOrService=پروڈکٹ یا سروس
+ProductsAndServices=مصنوعات اور خدمات
+ProductsOrServices=مصنوعات یا خدمات
+ProductsPipeServices=مصنوعات | خدمات
+ProductsOnSale=مصنوعات برائے فروخت
+ProductsOnPurchase=خریداری کے لیے مصنوعات
+ProductsOnSaleOnly=صرف فروخت کے لیے مصنوعات
+ProductsOnPurchaseOnly=صرف خریداری کے لیے مصنوعات
+ProductsNotOnSell=مصنوعات برائے فروخت اور نہ ہی خریداری کے لیے
+ProductsOnSellAndOnBuy=مصنوعات برائے فروخت اور خریداری
+ServicesOnSale=خدمات برائے فروخت
+ServicesOnPurchase=خریداری کے لیے خدمات
+ServicesOnSaleOnly=خدمات صرف فروخت کے لیے
+ServicesOnPurchaseOnly=خدمات صرف خریداری کے لیے
+ServicesNotOnSell=خدمات فروخت کے لیے نہیں اور نہ ہی خریداری کے لیے
+ServicesOnSellAndOnBuy=فروخت اور خریداری کے لیے خدمات
+LastModifiedProductsAndServices=تازہ ترین %s مصنوعات/خدمات جن میں ترمیم کی گئی تھی۔
+LastRecordedProducts=تازہ ترین %s ریکارڈ شدہ مصنوعات
+LastRecordedServices=تازہ ترین %s ریکارڈ شدہ خدمات
+CardProduct0=پروڈکٹ
+CardProduct1=سروس
+Stock=اسٹاک
+MenuStocks=اسٹاکس
+Stocks=مصنوعات کا ذخیرہ اور مقام (گودام)
+Movements=حرکتیں
+Sell=بیچنا
+Buy=خریداری
+OnSell=فروخت کے لئے
+OnBuy=خریداری کے لیے
+NotOnSell=فروخت کے لئے نہیں
+ProductStatusOnSell=فروخت کے لئے
+ProductStatusNotOnSell=فروخت کے لئے نہیں
+ProductStatusOnSellShort=فروخت کے لئے
+ProductStatusNotOnSellShort=فروخت کے لئے نہیں
+ProductStatusOnBuy=خریداری کے لیے
+ProductStatusNotOnBuy=خریداری کے لیے نہیں۔
+ProductStatusOnBuyShort=خریداری کے لیے
+ProductStatusNotOnBuyShort=خریداری کے لیے نہیں۔
+UpdateVAT=vat کو اپ ڈیٹ کریں۔
+UpdateDefaultPrice=پہلے سے طے شدہ قیمت کو اپ ڈیٹ کریں۔
+UpdateLevelPrices=ہر سطح کے لیے قیمتیں اپ ڈیٹ کریں۔
+AppliedPricesFrom=سے اپلائی کیا گیا۔
+SellingPrice=قیمت فروخت
+SellingPriceHT=فروخت کی قیمت (ٹیکس کے علاوہ)
+SellingPriceTTC=فروخت کی قیمت (انک ٹیکس)
+SellingMinPriceTTC=کم از کم فروخت کی قیمت (انک ٹیکس)
+CostPriceDescription=اس پرائس فیلڈ (ٹیکس کے علاوہ) کا استعمال آپ کی کمپنی کے لیے اس پروڈکٹ کی اوسط رقم کو حاصل کرنے کے لیے کیا جا سکتا ہے۔ یہ کوئی بھی قیمت ہو سکتی ہے جس کا آپ خود حساب لگاتے ہیں، مثال کے طور پر، خرید کی اوسط قیمت کے علاوہ اوسط پیداوار اور تقسیم کی لاگت سے۔
+CostPriceUsage=اس قدر کو مارجن کے حساب کتاب کے لیے استعمال کیا جا سکتا ہے۔
+ManufacturingPrice=مینوفیکچرنگ کی قیمت
+SoldAmount=فروخت شدہ رقم
+PurchasedAmount=خریدی ہوئی رقم
+NewPrice=نئی قیمت
+MinPrice=کم سے کم قیمت فروخت
+EditSellingPriceLabel=فروخت کی قیمت کے لیبل میں ترمیم کریں۔
+CantBeLessThanMinPrice=فروخت کی قیمت اس پروڈکٹ کے لیے اجازت شدہ کم از کم سے کم نہیں ہو سکتی (بغیر ٹیکس کے %s)۔ اگر آپ بہت اہم رعایت ٹائپ کرتے ہیں تو یہ پیغام بھی ظاہر ہو سکتا ہے۔
+ContractStatusClosed=بند
+ErrorProductAlreadyExists=حوالہ %s کے ساتھ ایک پروڈکٹ پہلے سے موجود ہے۔
+ErrorProductBadRefOrLabel=حوالہ یا لیبل کے لیے غلط قدر۔
+ErrorProductClone=پروڈکٹ یا سروس کو کلون کرنے کی کوشش کرتے وقت ایک مسئلہ تھا۔
+ErrorPriceCantBeLowerThanMinPrice=خرابی، قیمت کم از کم قیمت سے کم نہیں ہو سکتی۔
+Suppliers=فروش
+SupplierRef=وینڈر SKU
+ShowProduct=پروڈکٹ دکھائیں۔
+ShowService=سروس دکھائیں۔
+ProductsAndServicesArea=مصنوعات اور خدمات کا علاقہ
+ProductsArea=پروڈکٹ کا علاقہ
+ServicesArea=خدمات کا علاقہ
+ListOfStockMovements=اسٹاک کی نقل و حرکت کی فہرست
+BuyingPrice=قیمت خریدنا
+PriceForEachProduct=مخصوص قیمتوں کے ساتھ مصنوعات
+SupplierCard=وینڈر کارڈ
+PriceRemoved=قیمت ہٹا دی گئی۔
+BarCode=بارکوڈ
+BarcodeType=بارکوڈ کی قسم
+SetDefaultBarcodeType=بارکوڈ کی قسم سیٹ کریں۔
+BarcodeValue=بارکوڈ ویلیو
+NoteNotVisibleOnBill=نوٹ (انوائسز، تجاویز پر نظر نہیں آتا...)
+ServiceLimitedDuration=اگر پروڈکٹ محدود مدت کے ساتھ سروس ہے:
+FillWithLastServiceDates=آخری سروس لائن کی تاریخوں کے ساتھ پُر کریں۔
+MultiPricesAbility=ایک سے زیادہ قیمت کے حصے فی پروڈکٹ/سروس (ہر صارف ایک قیمت کے حصے میں ہے)
+MultiPricesNumPrices=قیمتوں کی تعداد
+DefaultPriceType=نئی فروخت کی قیمتیں شامل کرتے وقت فی ڈیفالٹ قیمتوں کی بنیاد (بمقابلہ ٹیکس کے ساتھ)
+AssociatedProductsAbility=کٹس کو فعال کریں (متعدد مصنوعات کا سیٹ)
+VariantsAbility=متغیرات کو فعال کریں (مصنوعات کی مختلف حالتیں، مثال کے طور پر رنگ، سائز)
+AssociatedProducts=کٹس
+AssociatedProductsNumber=اس کٹ کو بنانے والی مصنوعات کی تعداد
+ParentProductsNumber=پیرنٹ پیکیجنگ پروڈکٹ کی تعداد
+ParentProducts=والدین کی مصنوعات
+IfZeroItIsNotAVirtualProduct=اگر 0، تو یہ پروڈکٹ کٹ نہیں ہے۔
+IfZeroItIsNotUsedByVirtualProduct=اگر 0، تو یہ پروڈکٹ کسی بھی کٹ کے ذریعے استعمال نہیں ہوتی ہے۔
+KeywordFilter=مطلوبہ الفاظ کا فلٹر
+CategoryFilter=زمرہ فلٹر
+ProductToAddSearch=شامل کرنے کے لیے پروڈکٹ تلاش کریں۔
+NoMatchFound=کوئی مماثلت نہیں ملی
+ListOfProductsServices=مصنوعات/خدمات کی فہرست
+ProductAssociationList=پروڈکٹس/سروسز کی فہرست جو اس کٹ کے جزو(زبانیں) ہیں۔
+ProductParentList=ایک جزو کے طور پر اس پروڈکٹ کے ساتھ کٹس کی فہرست
+ErrorAssociationIsFatherOfThis=منتخب کردہ پروڈکٹ میں سے ایک موجودہ پروڈکٹ کا پیرنٹ ہے۔
+DeleteProduct=ایک پروڈکٹ/سروس کو حذف کریں۔
+ConfirmDeleteProduct=کیا آپ واقعی اس پروڈکٹ/سروس کو حذف کرنا چاہتے ہیں؟
+ProductDeleted=پروڈکٹ/سروس "%s" کو ڈیٹا بیس سے حذف کر دیا گیا۔
+ExportDataset_produit_1=مصنوعات
+ExportDataset_service_1=خدمات
+ImportDataset_produit_1=مصنوعات
+ImportDataset_service_1=خدمات
+DeleteProductLine=پروڈکٹ لائن کو حذف کریں۔
+ConfirmDeleteProductLine=کیا آپ واقعی اس پروڈکٹ لائن کو حذف کرنا چاہتے ہیں؟
+ProductSpecial=خاص
+QtyMin=کم از کم خریداری کی مقدار
+PriceQtyMin=قیمت کی مقدار کم از کم
+PriceQtyMinCurrency=اس مقدار کے لیے قیمت (کرنسی)۔ (کوئی رعایت نہیں)
+VATRateForSupplierProduct=VAT کی شرح (اس وینڈر/پروڈکٹ کے لیے)
+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=کسٹمز|کموڈٹی|HS کوڈ
+CountryOrigin=پیدائشی ملک
+RegionStateOrigin=اصل کا علاقہ
+StateOrigin=ریاست | اصل کا صوبہ
+Nature=مصنوعات کی نوعیت (خام / تیار شدہ)
+NatureOfProductShort=مصنوعات کی نوعیت
+NatureOfProductDesc=خام مال یا تیار کردہ مصنوعات
+ShortLabel=مختصر لیبل
+Unit=یونٹ
+p=u
+set=سیٹ
+se=سیٹ
+second=دوسرا
+s=s
+hour=گھنٹہ
+h=h
+day=دن
+d=d
+kilogram=کلوگرام
+kg=کلو
+gram=چنا
+g=جی
+meter=میٹر
+m=m
+lm=lm
+m2=m²
+m3=m³
+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=dm²
+unitCM2=cm²
+unitMM2=mm²
+unitFT2=ft²
+unitIN2=میں²
+unitM3=کیوبک میٹر
+unitDM3=dm³
+unitCM3=cm³
+unitMM3=mm³
+unitFT3=ft³
+unitIN3=in³
+unitOZ3=اونس
+unitgallon=گیلن
+ProductCodeModel=پروڈکٹ ریف ٹیمپلیٹ
+ServiceCodeModel=سروس ریف ٹیمپلیٹ
+CurrentProductPrice=موجودہ قیمت
+AlwaysUseNewPrice=ہمیشہ پروڈکٹ/سروس کی موجودہ قیمت استعمال کریں۔
+AlwaysUseFixedPrice=مقررہ قیمت استعمال کریں۔
+PriceByQuantity=مقدار کے لحاظ سے مختلف قیمتیں۔
+DisablePriceByQty=مقدار کے لحاظ سے قیمتوں کو غیر فعال کریں۔
+PriceByQuantityRange=مقدار کی حد
+MultipriceRules=سیگمنٹ کے لیے خودکار قیمتیں۔
+UseMultipriceRules=پہلے سیگمنٹ کے مطابق دیگر تمام سیگمنٹس کی قیمتوں کا خود بخود حساب لگانے کے لیے پرائس سیگمنٹ رولز (پروڈکٹ ماڈیول سیٹ اپ میں بیان کردہ) استعمال کریں۔
+PercentVariationOver=%% %s پر تغیر
+PercentDiscountOver=%% ڈسکاؤنٹ %s پر
+KeepEmptyForAutoCalculation=مصنوعات کے وزن یا حجم سے خود بخود اس کا حساب لگانے کے لیے خالی رکھیں
+VariantRefExample=مثالیں: COL، SIZE
+VariantLabelExample=مثالیں: رنگ، سائز
+### composition fabrication
+Build=پیدا کرنا
+ProductsMultiPrice=ہر قیمت والے حصے کے لیے پروڈکٹس اور قیمتیں۔
+ProductsOrServiceMultiPrice=کسٹمر کی قیمتیں (مصنوعات یا خدمات کی، کثیر قیمتیں)
+ProductSellByQuarterHT=ٹیکس سے پہلے سہ ماہی مصنوعات کا کاروبار
+ServiceSellByQuarterHT=ٹیکس سے پہلے سہ ماہی خدمات کا کاروبار
+Quarter1=1st. کوارٹر
+Quarter2=2nd کوارٹر
+Quarter3=3rd کوارٹر
+Quarter4=4th. کوارٹر
+BarCodePrintsheet=بارکوڈ پرنٹ کریں۔
+PageToGenerateBarCodeSheets=اس ٹول کے ذریعے، آپ بارکوڈ اسٹیکرز کی شیٹ پرنٹ کر سکتے ہیں۔ اپنے اسٹیکر پیج کا فارمیٹ، بارکوڈ کی قسم اور بارکوڈ کی قدر کا انتخاب کریں، پھر بٹن <b> %s </b> پر کلک کریں۔
+NumberOfStickers=صفحہ پر پرنٹ کرنے کے لیے اسٹیکرز کی تعداد
+PrintsheetForOneBarCode=ایک بار کوڈ کے لیے کئی اسٹیکرز پرنٹ کریں۔
+BuildPageToPrint=پرنٹ کرنے کے لیے صفحہ بنائیں
+FillBarCodeTypeAndValueManually=بار کوڈ کی قسم اور قیمت دستی طور پر پُر کریں۔
+FillBarCodeTypeAndValueFromProduct=کسی پروڈکٹ کے بارکوڈ سے بارکوڈ کی قسم اور قیمت بھریں۔
+FillBarCodeTypeAndValueFromThirdParty=کسی تیسرے فریق کے بارکوڈ سے بارکوڈ کی قسم اور قدر کو پُر کریں۔
+DefinitionOfBarCodeForProductNotComplete=بار کوڈ کی قسم یا قدر کی تعریف %s پروڈکٹ کے لیے مکمل نہیں ہے۔
+DefinitionOfBarCodeForThirdpartyNotComplete=بار کوڈ کی قسم یا قدر کی تعریف تھرڈ پارٹی %s کے لیے مکمل نہیں۔
+BarCodeDataForProduct=%s پروڈکٹ کے بارکوڈ کی معلومات:
+BarCodeDataForThirdparty=فریق ثالث کی بارکوڈ کی معلومات %s:
+ResetBarcodeForAllRecords=تمام ریکارڈ کے لیے بارکوڈ ویلیو کی وضاحت کریں (یہ بارکوڈ ویلیو کو بھی ری سیٹ کر دے گا جو پہلے سے نئی قدروں کے ساتھ بیان کی گئی ہے)
+PriceByCustomer=ہر گاہک کے لیے مختلف قیمتیں۔
+PriceCatalogue=فی پروڈکٹ/سروس ایک واحد فروخت قیمت
+PricingRule=قیمت فروخت کرنے کے قواعد
+AddCustomerPrice=گاہک کے حساب سے قیمت شامل کریں۔
+ForceUpdateChildPriceSoc=گاہک کے ذیلی اداروں پر ایک ہی قیمت مقرر کریں۔
+PriceByCustomerLog=سابقہ کسٹمر کی قیمتوں کا لاگ
+MinimumPriceLimit=کم از کم قیمت %s سے کم نہیں ہو سکتی
+MinimumRecommendedPrice=کم از کم تجویز کردہ قیمت ہے: %s
+PriceExpressionEditor=قیمت اظہار ایڈیٹر
+PriceExpressionSelected=منتخب کردہ قیمت کا اظہار
+PriceExpressionEditorHelp1=قیمت مقرر کرنے کے لیے "قیمت = 2 + 2" یا "2 + 2"۔ استعمال کریں؛ اظہار کو الگ کرنے کے لیے
+PriceExpressionEditorHelp2=آپ متغیرات جیسے <b> #extrafield_myextrafieldkey# </b> اور عالمی متغیرات کے ساتھ <b> #global_mycode# a09a4b739f17f17 کے ساتھ ExtraFields تک رسائی حاصل کر سکتے ہیں۔
+PriceExpressionEditorHelp3=پروڈکٹ/سروس اور وینڈر دونوں کی قیمتوں میں یہ متغیرات دستیاب ہیں: <br> <b> #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_19bz788#
+PriceExpressionEditorHelp4=صرف پروڈکٹ/سروس کی قیمتوں میں: <b> #supplier_min_price# </b> <br> صرف وینڈر کی قیمتوں میں: <b> #supplier_squantity_19837fz0 #supplier_squantity_19837fz0#
+PriceExpressionEditorHelp5=دستیاب عالمی اقدار:
+PriceMode=قیمت موڈ
+PriceNumeric=نمبر
+DefaultPrice=پہلے سے طے شدہ قیمت
+DefaultPriceLog=پچھلی ڈیفالٹ قیمتوں کا لاگ
+ComposedProductIncDecStock=والدین کی تبدیلی پر اسٹاک میں اضافہ/کم کریں۔
+ComposedProduct=بچوں کی مصنوعات
+MinSupplierPrice=کم از کم قیمت خرید
+MinCustomerPrice=کم از کم فروخت کی قیمت
+NoDynamicPrice=کوئی متحرک قیمت نہیں۔
+DynamicPriceConfiguration=متحرک قیمت کی ترتیب
+DynamicPriceDesc=آپ کسٹمر یا وینڈر کی قیمتوں کا حساب لگانے کے لیے ریاضی کے فارمولوں کی وضاحت کر سکتے ہیں۔ ایسے فارمولے تمام ریاضیاتی آپریٹرز، کچھ مستقل اور متغیرات استعمال کر سکتے ہیں۔ آپ یہاں ان متغیرات کی وضاحت کر سکتے ہیں جنہیں آپ استعمال کرنا چاہتے ہیں۔ اگر متغیر کو خودکار اپ ڈیٹ کی ضرورت ہے، تو آپ Dolibarr کو قدر کو خود بخود اپ ڈیٹ کرنے کی اجازت دینے کے لیے بیرونی URL کی وضاحت کر سکتے ہیں۔
+AddVariable=متغیر شامل کریں۔
+AddUpdater=اپڈیٹر شامل کریں۔
+GlobalVariables=عالمی متغیرات
+VariableToUpdate=اپ ڈیٹ کرنے کے لیے متغیر
+GlobalVariableUpdaters=متغیرات کے لیے بیرونی اپڈیٹرز
+GlobalVariableUpdaterType0=JSON ڈیٹا
+GlobalVariableUpdaterHelp0=مخصوص URL سے JSON ڈیٹا کو پارس کرتا ہے، VALUE متعلقہ قدر کا مقام بتاتا ہے،
+GlobalVariableUpdaterHelpFormat0=درخواست کے لیے فارمیٹ {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=ویب سروس ڈیٹا
+GlobalVariableUpdaterHelp1=مخصوص URL سے WebService ڈیٹا کو پارس کرتا ہے، NS نام کی جگہ بتاتا ہے، VALUE متعلقہ قدر کا مقام بتاتا ہے، DATA میں بھیجنے کے لیے ڈیٹا ہونا چاہیے اور METHOD کالنگ WS طریقہ ہے۔
+GlobalVariableUpdaterHelpFormat1=درخواست کا فارمیٹ ہے {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod"، "DATA": {"your": "data", "to": "send"}}
+UpdateInterval=اپ ڈیٹ وقفہ (منٹ)
+LastUpdated=تازہ ترین اپ ڈیٹ
+CorrectlyUpdated=درست طریقے سے اپ ڈیٹ کیا گیا۔
+PropalMergePdfProductActualFile=PDF Azur میں شامل کرنے کے لیے فائلیں استعمال ہوتی ہیں۔
+PropalMergePdfProductChooseFile=پی ڈی ایف فائلوں کو منتخب کریں۔
+IncludingProductWithTag=ٹیگ کے ساتھ پروڈکٹس/سروسز سمیت
+DefaultPriceRealPriceMayDependOnCustomer=پہلے سے طے شدہ قیمت، اصل قیمت گاہک پر منحصر ہو سکتی ہے۔
+WarningSelectOneDocument=براہ کرم کم از کم ایک دستاویز منتخب کریں۔
+DefaultUnitToShow=یونٹ
+NbOfQtyInProposals=تجاویز میں مقدار
+ClinkOnALinkOfColumn=تفصیلی نظارہ حاصل کرنے کے لیے کالم %s کے لنک پر کلک کریں۔
+ProductsOrServicesTranslations=مصنوعات/خدمات کا ترجمہ
+TranslatedLabel=ترجمہ شدہ لیبل
+TranslatedDescription=ترجمہ شدہ تفصیل
+TranslatedNote=ترجمہ شدہ نوٹس
+ProductWeight=1 پروڈکٹ کا وزن
+ProductVolume=1 پروڈکٹ کا حجم
+WeightUnits=وزن کی اکائی
+VolumeUnits=حجم یونٹ
+WidthUnits=چوڑائی یونٹ
+LengthUnits=لمبائی یونٹ
+HeightUnits=اونچائی یونٹ
+SurfaceUnits=سطح کی اکائی
+SizeUnits=سائز یونٹ
+DeleteProductBuyPrice=خرید قیمت کو حذف کریں۔
+ConfirmDeleteProductBuyPrice=کیا آپ واقعی اس خرید قیمت کو حذف کرنا چاہتے ہیں؟
+SubProduct=ذیلی مصنوعات
+ProductSheet=پروڈکٹ شیٹ
+ServiceSheet=سروس شیٹ
+PossibleValues=ممکنہ اقدار
+GoOnMenuToCreateVairants=انتساب کی قسمیں تیار کرنے کے لیے مینو %s - %s پر جائیں (جیسے رنگ، سائز، ...)
+UseProductFournDesc=صارفین کے لیے تفصیل کے علاوہ وینڈرز (ہر وینڈر کے حوالے کے لیے) کے ذریعے بیان کردہ پروڈکٹ کی تفصیل کی وضاحت کرنے کے لیے ایک خصوصیت شامل کریں۔
+ProductSupplierDescription=پروڈکٹ کے لیے وینڈر کی تفصیل
+UseProductSupplierPackaging=سپلائر کی قیمتوں پر پیکیجنگ کا استعمال کریں (سپلائر کی دستاویزات میں لائن شامل/اپ ڈیٹ کرتے وقت سپلائر کی قیمت پر سیٹ کردہ پیکیجنگ کے مطابق مقدار کا دوبارہ حساب لگائیں)
+PackagingForThisProduct=پیکیجنگ
+PackagingForThisProductDesc=سپلائر کے آرڈر پر، آپ خود بخود اس مقدار (یا اس مقدار کا ایک کثیر) آرڈر کریں گے۔ کم از کم خریداری کی مقدار سے کم نہیں ہو سکتی
+QtyRecalculatedWithPackaging=لائن کی مقدار کو سپلائر پیکیجنگ کے مطابق دوبارہ شمار کیا گیا تھا۔
+
+#Attributes
+VariantAttributes=متغیر صفات
+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=بہت ساری قسمیں پیدا کرنے کے نتیجے میں زیادہ CPU، میموری کا استعمال اور 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=لازمی ادوار
+mandatoryPeriodNeedTobeSet=نوٹ: مدت (شروع اور اختتامی تاریخ) کی وضاحت ہونی چاہیے۔
+mandatoryPeriodNeedTobeSetMsgValidate=سروس کے لیے شروع اور اختتام کی مدت درکار ہوتی ہے۔
+mandatoryHelper=اس کو چیک کریں اگر آپ انوائس، تجارتی تجویز، سیلز آرڈر بناتے وقت اس سروس کے ساتھ شروع اور اختتامی تاریخ درج کیے بغیر صارف کو کوئی پیغام دینا چاہتے ہیں۔ <br> نوٹ کریں کہ پیغام ایک انتباہ ہے نہ کہ بلاک کرنے کی غلطی۔
+DefaultBOM=ڈیفالٹ BOM
+DefaultBOMDesc=پہلے سے طے شدہ BOM اس پروڈکٹ کو تیار کرنے کے لیے استعمال کرنے کی تجویز کرتا ہے۔ یہ فیلڈ صرف اس صورت میں سیٹ کی جا سکتی ہے جب پروڈکٹ کی نوعیت '%s' ہو۔
+Rank=رینک
+SwitchOnSaleStatus=فروخت کی حالت پر سوئچ کریں۔
+SwitchOnPurchaseStatus=خریداری کی حیثیت کو آن کریں۔
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ur_PK/projects.lang b/htdocs/langs/ur_PK/projects.lang
new file mode 100644
index 00000000000..304a2e0ad22
--- /dev/null
+++ b/htdocs/langs/ur_PK/projects.lang
@@ -0,0 +1,289 @@
+# Dolibarr language file - Source file is en_US - projects
+RefProject=حوالہ پروجیکٹ
+ProjectRef=پروجیکٹ کا حوالہ
+ProjectId=پروجیکٹ کی شناخت
+ProjectLabel=پروجیکٹ لیبل
+ProjectsArea=پروجیکٹس ایریا
+ProjectStatus=پروجیکٹ کی حیثیت
+SharedProject=ہر کوئی
+PrivateProject=پروجیکٹ کے رابطے
+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=ٹاسک ID
+RefTask=ٹاسک ریف.
+LabelTask=ٹاسک لیبل
+TaskTimeSpent=کاموں میں وقت گزارا۔
+TaskTimeUser=صارف
+TaskTimeNote=نوٹ
+TaskTimeDate=تاریخ
+TasksOnOpenedProject=کھلے منصوبوں پر کام
+WorkloadNotDefined=کام کا بوجھ متعین نہیں ہے۔
+NewTimeSpent=وقت گزارا۔
+MyTimeSpent=میرا وقت گزرا۔
+BillTime=گزارے ہوئے وقت کا بل
+BillTimeShort=بل کا وقت
+TimeToBill=وقت کا بل نہیں دیا گیا۔
+TimeBilled=وقت کا بل
+Tasks=کام
+Task=کام
+TaskDateStart=کام شروع ہونے کی تاریخ
+TaskDateEnd=ٹاسک کی آخری تاریخ
+TaskDescription=کام کی تفصیل
+NewTask=نیا کام
+AddTask=کام بنائیں
+AddTimeSpent=گزارا ہوا وقت بنائیں
+AddHereTimeSpentForDay=اس دن/کام کے لیے گزارا ہوا وقت یہاں شامل کریں۔
+AddHereTimeSpentForWeek=اس ہفتے/کام کے لیے گزارا ہوا وقت یہاں شامل کریں۔
+Activity=سرگرمی
+Activities=کام / سرگرمیاں
+MyActivities=میرے کام / سرگرمیاں
+MyProjects=میرے پروجیکٹس
+MyProjectsArea=میرے پروجیکٹس کا علاقہ
+DurationEffective=مؤثر مدت
+ProgressDeclared=حقیقی پیش رفت کا اعلان کیا۔
+TaskProgressSummary=کام کی پیشرفت
+CurentlyOpenedTasks=فی الحال کھلے کام
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=اعلان کردہ حقیقی پیشرفت کھپت میں ہونے والی پیشرفت سے کم %s ہے
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=اعلان کردہ حقیقی پیشرفت کھپت میں ہونے والی پیشرفت سے زیادہ %s ہے
+ProgressCalculated=کھپت پر پیشرفت
+WhichIamLinkedTo=جس سے میں منسلک ہوں۔
+WhichIamLinkedToProject=جس کا میں پروجیکٹ سے منسلک ہوں۔
+Time=وقت
+TimeConsumed=کھایا
+ListOfTasks=کاموں کی فہرست
+GoToListOfTimeConsumed=استعمال شدہ وقت کی فہرست پر جائیں۔
+GanttView=گینٹ ویو
+ListWarehouseAssociatedProject=منصوبے سے وابستہ گوداموں کی فہرست
+ListProposalsAssociatedProject=منصوبے سے متعلق تجارتی تجاویز کی فہرست
+ListOrdersAssociatedProject=پروجیکٹ سے متعلق سیلز آرڈرز کی فہرست
+ListInvoicesAssociatedProject=پروجیکٹ سے متعلق کسٹمر انوائسز کی فہرست
+ListPredefinedInvoicesAssociatedProject=پروجیکٹ سے متعلق کسٹمر ٹیمپلیٹ انوائسز کی فہرست
+ListSupplierOrdersAssociatedProject=پراجیکٹ سے متعلق خریداری کے آرڈرز کی فہرست
+ListSupplierInvoicesAssociatedProject=پروجیکٹ سے متعلق وینڈر انوائسز کی فہرست
+ListContractAssociatedProject=منصوبے سے متعلق معاہدوں کی فہرست
+ListShippingAssociatedProject=منصوبے سے متعلق شپنگز کی فہرست
+ListFichinterAssociatedProject=منصوبے سے متعلق مداخلتوں کی فہرست
+ListExpenseReportsAssociatedProject=منصوبے سے متعلق اخراجات کی رپورٹوں کی فہرست
+ListDonationsAssociatedProject=منصوبے سے متعلق عطیات کی فہرست
+ListVariousPaymentsAssociatedProject=منصوبے سے متعلق متفرق ادائیگیوں کی فہرست
+ListSalariesAssociatedProject=منصوبے سے متعلق تنخواہوں کی ادائیگیوں کی فہرست
+ListActionsAssociatedProject=منصوبے سے متعلق واقعات کی فہرست
+ListMOAssociatedProject=منصوبے سے متعلق مینوفیکچرنگ آرڈرز کی فہرست
+ListTaskTimeUserProject=منصوبے کے کاموں پر لگنے والے وقت کی فہرست
+ListTaskTimeForTask=کام پر لگنے والے وقت کی فہرست
+ActivityOnProjectToday=پروجیکٹ پر آج کی سرگرمی
+ActivityOnProjectYesterday=کل منصوبے پر سرگرمی
+ActivityOnProjectThisWeek=اس ہفتے منصوبے پر سرگرمی
+ActivityOnProjectThisMonth=اس ماہ منصوبے پر سرگرمی
+ActivityOnProjectThisYear=اس سال منصوبے پر سرگرمی
+ChildOfProjectTask=پروجیکٹ/ٹاسک کا بچہ
+ChildOfTask=کام کا بچہ
+TaskHasChild=کام کا بچہ ہے۔
+NotOwnerOfProject=اس پرائیویٹ پروجیکٹ کا مالک نہیں ہے۔
+AffectedTo=کو مختص کیا گیا۔
+CantRemoveProject=اس پروجیکٹ کو ہٹایا نہیں جا سکتا کیونکہ اس کا حوالہ کچھ دیگر اشیاء (انوائس، آرڈرز یا دیگر) کے ذریعے دیا گیا ہے۔ ٹیب '%s' دیکھیں۔
+ValidateProject=پروجیکٹ کی توثیق کریں۔
+ConfirmValidateProject=کیا آپ واقعی اس پروجیکٹ کی توثیق کرنا چاہتے ہیں؟
+CloseAProject=پروجیکٹ بند کریں۔
+ConfirmCloseAProject=کیا آپ واقعی اس پروجیکٹ کو بند کرنا چاہتے ہیں؟
+AlsoCloseAProject=پروجیکٹ کو بھی بند کریں (اگر آپ کو ابھی بھی اس پر پیداواری کاموں کی پیروی کرنے کی ضرورت ہے تو اسے کھلا رکھیں)
+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=بالمقابل وزنی رقم
+OpportunityAmountAverageShort=لیڈ کی اوسط رقم
+OpportunityAmountWeigthedShort=وزنی لیڈ کی مقدار
+WonLostExcluded=جیت گیا/ہار دیا گیا۔
+##### Types de contacts #####
+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=منسلک آبجیکٹ کے جائزہ کے لیے پروجیکٹ دستاویز ٹیمپلیٹ
+DocumentModelBaleine=کاموں کے لیے پروجیکٹ دستاویز ٹیمپلیٹ
+DocumentModelTimeSpent=گزارے ہوئے وقت کے لیے پروجیکٹ رپورٹ ٹیمپلیٹ
+PlannedWorkload=منصوبہ بند کام کا بوجھ
+PlannedWorkloadShort=کام کا بوجھ
+ProjectReferers=متعلقہ اشیاء
+ProjectMustBeValidatedFirst=پہلے پروجیکٹ کی توثیق ہونی چاہیے۔
+FirstAddRessourceToAllocateTime=وقت مختص کرنے کے لیے صارف کے وسائل کو پروجیکٹ کے رابطے کے طور پر تفویض کریں۔
+InputPerDay=ان پٹ فی دن
+InputPerWeek=ان پٹ فی ہفتہ
+InputPerMonth=ان پٹ فی مہینہ
+InputDetail=ان پٹ کی تفصیل
+TimeAlreadyRecorded=یہ اس کام/دن اور صارف %s کے لیے پہلے ہی ریکارڈ شدہ وقت ہے
+ProjectsWithThisUserAsContact=اس صارف کے ساتھ پروجیکٹس بطور رابطہ
+ProjectsWithThisContact=Projects with this contact
+TasksWithThisUserAsContact=اس صارف کو تفویض کردہ کام
+ResourceNotAssignedToProject=پروجیکٹ کو تفویض نہیں کیا گیا۔
+ResourceNotAssignedToTheTask=کام کے لیے تفویض نہیں کیا گیا ہے۔
+NoUserAssignedToTheProject=اس پروجیکٹ کے لیے کوئی صارف تفویض نہیں کیا گیا ہے۔
+TimeSpentBy=کی طرف سے خرچ وقت
+TasksAssignedTo=تفویض کردہ کام
+AssignTaskToMe=اپنے آپ کو کام تفویض کریں۔
+AssignTaskToUser=%s کو کام تفویض کریں۔
+SelectTaskToAssign=تفویض کرنے کے لیے کام منتخب کریں...
+AssignTask=تفویض
+ProjectOverview=جائزہ
+ManageTasks=کاموں کی پیروی کرنے اور/یا گزارے ہوئے وقت کی اطلاع دینے کے لیے پروجیکٹس کا استعمال کریں (ٹائم شیٹس)
+ManageOpportunitiesStatus=لیڈز/مواقع کی پیروی کرنے کے لیے پروجیکٹس کا استعمال کریں۔
+ProjectNbProjectByMonth=ماہ کے لحاظ سے بنائے گئے پروجیکٹس کی تعداد
+ProjectNbTaskByMonth=ماہ کے لحاظ سے تخلیق کردہ کاموں کی تعداد
+ProjectOppAmountOfProjectsByMonth=ماہ کے لحاظ سے لیڈز کی مقدار
+ProjectWeightedOppAmountOfProjectsByMonth=ماہ کے لحاظ سے لیڈز کی وزنی مقدار
+ProjectOpenedProjectByOppStatus=کھولیں پروجیکٹ|لیڈ کی حیثیت سے لیڈ
+ProjectsStatistics=منصوبوں یا لیڈز کے اعدادوشمار
+TasksStatistics=منصوبوں یا لیڈز کے کاموں کے اعدادوشمار
+TaskAssignedToEnterTime=کام تفویض کر دیا گیا۔ اس کام پر وقت داخل کرنا ممکن ہونا چاہیے۔
+IdTaskTime=آئی ڈی ٹاسک ٹائم
+YouCanCompleteRef=اگر آپ ریف کو کچھ لاحقہ کے ساتھ مکمل کرنا چاہتے ہیں، تو اسے الگ کرنے کے لیے ایک - حرف شامل کرنے کی سفارش کی جاتی ہے، لہذا خودکار نمبرنگ اب بھی اگلے پروجیکٹس کے لیے صحیح طریقے سے کام کرے گی۔ مثال کے طور پر %s-MYSUFFIX
+OpenedProjectsByThirdparties=تیسرے فریق کے ذریعہ کھولیں پروجیکٹس
+OnlyOpportunitiesShort=صرف لیڈز
+OpenedOpportunitiesShort=کھلی لیڈز
+NotOpenedOpportunitiesShort=کھلی برتری نہیں۔
+NotAnOpportunityShort=لیڈ نہیں۔
+OpportunityTotalAmount=لیڈز کی کل مقدار
+OpportunityPonderatedAmount=لیڈز کی وزنی مقدار
+OpportunityPonderatedAmountDesc=امکان کے ساتھ وزنی لیڈز کی مقدار
+OppStatusPROSP=پراسپیکشن
+OppStatusQUAL=قابلیت
+OppStatusPROPO=تجویز
+OppStatusNEGO=مذاکرات
+OppStatusPENDING=زیر التواء
+OppStatusWON=جیت گیا۔
+OppStatusLOST=کھو دیا
+Budget=بجٹ
+AllowToLinkFromOtherCompany=دیگر کمپنی سے لنک منصوبے کی اجازت دیں <br> <br> <u> تائید اقدار: </u> <br> - خالی رکھیں: کمپنی (ڈیفالٹ) میں سے کسی منصوبے <br> جوڑ سکتی ہے - "تمام": کسی بھی منصوبوں، دیگر کمپنیوں کی بھی پروجیکٹس <br> جوڑ سکتی ہے - کی ایک فہرست فریق ثالث کی آئی ڈیز کو کوما سے الگ کیا گیا ہے: ان تھرڈ پارٹیز کے تمام پروجیکٹس کو لنک کر سکتے ہیں (مثال: 123,4795,53) <br>
+LatestProjects=تازہ ترین %s پروجیکٹس
+LatestModifiedProjects=تازہ ترین %s ترمیم شدہ پروجیکٹس
+OtherFilteredTasks=دیگر فلٹر شدہ کام
+NoAssignedTasks=کوئی تفویض کردہ کام نہیں ملے (موجودہ صارف کو اس پر وقت داخل کرنے کے لیے اوپر والے سلیکٹ باکس سے پروجیکٹ/ٹاسک تفویض کریں)
+ThirdPartyRequiredToGenerateInvoice=انوائس کرنے کے قابل ہونے کے لیے پروجیکٹ پر کسی تیسرے فریق کی تعریف ہونی چاہیے۔
+ThirdPartyRequiredToGenerateInvoice=انوائس کرنے کے قابل ہونے کے لیے پروجیکٹ پر کسی تیسرے فریق کی تعریف ہونی چاہیے۔
+ChooseANotYetAssignedTask=ایک کام کا انتخاب کریں جو ابھی تک آپ کو تفویض نہیں کیا گیا ہے۔
+# Comments trans
+AllowCommentOnTask=کاموں پر صارف کے تبصروں کی اجازت دیں۔
+AllowCommentOnProject=منصوبوں پر صارف کے تبصرے کی اجازت دیں۔
+DontHavePermissionForCloseProject=آپ کو پروجیکٹ %s کو بند کرنے کی اجازت نہیں ہے۔
+DontHaveTheValidateStatus=بند ہونے کے لیے پروجیکٹ %s کھلا ہونا چاہیے۔
+RecordsClosed=%s پروجیکٹ بند
+SendProjectRef=معلوماتی پروجیکٹ %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=ماڈیول 'تنخواہوں' کو ملازم کی فی گھنٹہ کی شرح کی وضاحت کرنے کے لیے فعال ہونا چاہیے
+NewTaskRefSuggested=ٹاسک ریف پہلے ہی استعمال ہوا ہے، ایک نیا ٹاسک ریف درکار ہے۔
+TimeSpentInvoiced=وقت گزارا ہوا بل
+TimeSpentForIntervention=وقت گزارا۔
+TimeSpentForInvoice=وقت گزارا۔
+OneLinePerUser=فی صارف ایک لائن
+ServiceToUseOnLines=لائنوں پر استعمال کرنے کے لیے سروس
+InvoiceGeneratedFromTimeSpent=انوائس %s پروجیکٹ پر خرچ کیے گئے وقت سے تیار کیا گیا ہے
+InterventionGeneratedFromTimeSpent=مداخلت %s پروجیکٹ پر خرچ کیے گئے وقت سے پیدا کی گئی ہے۔
+ProjectBillTimeDescription=چیک کریں کہ آیا آپ پروجیکٹ کے کاموں پر ٹائم شیٹ درج کرتے ہیں اور آپ پروجیکٹ کے کسٹمر کو بل دینے کے لیے ٹائم شیٹ سے انوائس (انوائسز) بنانے کا ارادہ رکھتے ہیں (یہ چیک نہ کریں کہ آیا آپ انوائس بنانے کا ارادہ رکھتے ہیں جو درج کردہ ٹائم شیٹ پر مبنی نہیں ہے)۔ نوٹ: انوائس بنانے کے لیے، پراجیکٹ کے 'وقت گزارا ہوا' ٹیب پر جائیں اور شامل کرنے کے لیے لائنوں کو منتخب کریں۔
+ProjectFollowOpportunity=موقع کی پیروی کریں۔
+ProjectFollowTasks=کاموں یا وقت پر عمل کریں۔
+Usage=استعمال
+UsageOpportunity=استعمال: موقع
+UsageTasks=استعمال: کام
+UsageBillTimeShort=استعمال: بل کا وقت
+InvoiceToUse=استعمال کرنے کے لیے انوائس کا مسودہ
+InterToUse=استعمال کرنے کے لئے ڈرافٹ مداخلت
+NewInvoice=نئی رسید
+NewInter=نئی مداخلت
+OneLinePerTask=فی کام ایک لائن
+OneLinePerPeriod=فی مدت ایک لائن
+OneLinePerTimeSpentLine=ہر بار خرچ کیے گئے اعلان کے لیے ایک لائن
+AddDetailDateAndDuration=لائن کی تفصیل میں تاریخ اور مدت کے ساتھ
+RefTaskParent=حوالہ والدین کا کام
+ProfitIsCalculatedWith=منافع کا استعمال کرتے ہوئے شمار کیا جاتا ہے۔
+AddPersonToTask=کاموں میں بھی شامل کریں۔
+UsageOrganizeEvent=استعمال: ایونٹ آرگنائزیشن
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=پروجیکٹ کو بند کے طور پر درجہ بندی کریں جب اس کے تمام کام مکمل ہوجائیں (100%% پیش رفت)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=نوٹ: 100%% پر تمام ٹاسک والے موجودہ پروجیکٹس پر کوئی اثر نہیں پڑے گا: آپ کو انہیں دستی طور پر بند کرنا پڑے گا۔ یہ اختیار صرف کھلے منصوبوں کو متاثر کرتا ہے۔
+SelectLinesOfTimeSpentToInvoice=گزارے گئے وقت کی لائنیں منتخب کریں جن کا بل نہیں ہے، پھر ان کو بل کرنے کے لیے بڑی تعداد میں "انوائس تیار کریں"
+ProjectTasksWithoutTimeSpent=بغیر وقت کے پروجیکٹ کے کام
+FormForNewLeadDesc=ہم سے رابطہ کرنے کے لیے درج ذیل فارم کو پُر کرنے کا شکریہ۔ آپ ہمیں براہ راست <b> %s </b> پر ای میل بھی بھیج سکتے ہیں۔
+ProjectsHavingThisContact=Projects having this contact
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/ur_PK/propal.lang b/htdocs/langs/ur_PK/propal.lang
new file mode 100644
index 00000000000..e91871ae533
--- /dev/null
+++ b/htdocs/langs/ur_PK/propal.lang
@@ -0,0 +1,99 @@
+# Dolibarr language file - Source file is en_US - propal
+Proposals=تجارتی تجاویز
+Proposal=کاروباری تجویز
+ProposalShort=تجویز
+ProposalsDraft=تجارتی تجاویز کا مسودہ
+ProposalsOpened=تجارتی تجاویز کھولیں۔
+CommercialProposal=کاروباری تجویز
+PdfCommercialProposalTitle=تجویز
+ProposalCard=تجویز کارڈ
+NewProp=نئی تجارتی تجویز
+NewPropal=نئی تجویز
+Prospect=امکان
+DeleteProp=تجارتی تجویز کو حذف کریں۔
+ValidateProp=تجارتی تجویز کی توثیق کریں۔
+AddProp=تجویز بنائیں
+ConfirmDeleteProp=کیا آپ واقعی اس تجارتی تجویز کو حذف کرنا چاہتے ہیں؟
+ConfirmValidateProp=کیا آپ واقعی <b> %s </b> کے نام سے اس تجارتی تجویز کی توثیق کرنا چاہتے ہیں؟
+LastPropals=تازہ ترین %s تجاویز
+LastModifiedProposals=تازہ ترین %s ترمیم شدہ تجاویز
+AllPropals=تمام تجاویز
+SearchAProposal=ایک تجویز تلاش کریں۔
+NoProposal=کوئی تجویز نہیں۔
+ProposalsStatistics=تجارتی تجویز کے اعدادوشمار
+NumberOfProposalsByMonth=مہینے کے حساب سے نمبر
+AmountOfProposalsByMonthHT=ماہانہ رقم (ٹیکس کے علاوہ)
+NbOfProposals=تجارتی تجاویز کی تعداد
+ShowPropal=تجویز دکھائیں۔
+PropalsDraft=ڈرافٹ
+PropalsOpened=کھولیں۔
+PropalStatusDraft=مسودہ (توثیق کرنے کی ضرورت ہے)
+PropalStatusValidated=تصدیق شدہ (تجویز کھلی ہے)
+PropalStatusSigned=دستخط شدہ (بلنگ کی ضرورت ہے)
+PropalStatusNotSigned=دستخط شدہ نہیں (بند)
+PropalStatusBilled=بل کیا گیا۔
+PropalStatusDraftShort=مسودہ
+PropalStatusValidatedShort=توثیق شدہ (کھلا)
+PropalStatusClosedShort=بند
+PropalStatusSignedShort=دستخط شدہ
+PropalStatusNotSignedShort=دستخط نہیں کئے
+PropalStatusBilledShort=بل کیا گیا۔
+PropalsToClose=بند کرنے کے لیے تجارتی تجاویز
+PropalsToBill=بل کے لیے تجارتی تجاویز پر دستخط کیے گئے۔
+ListOfProposals=تجارتی تجاویز کی فہرست
+ActionsOnPropal=تجویز پر واقعات
+RefProposal=تجارتی تجویز کا حوالہ
+SendPropalByMail=تجارتی تجویز بذریعہ ڈاک بھیجیں۔
+DatePropal=تجویز کی تاریخ
+DateEndPropal=میعاد ختم ہونے کی تاریخ
+ValidityDuration=درستگی کی مدت
+SetAcceptedRefused=سیٹ قبول / انکار
+ErrorPropalNotFound=Propal %s نہیں ملا
+AddToDraftProposals=مسودہ تجویز میں شامل کریں۔
+NoDraftProposals=کوئی مسودہ تجویز نہیں ہے۔
+CopyPropalFrom=موجودہ تجویز کو کاپی کرکے تجارتی تجویز بنائیں
+CreateEmptyPropal=خالی تجارتی تجویز یا مصنوعات/خدمات کی فہرست سے بنائیں
+DefaultProposalDurationValidity=پہلے سے طے شدہ تجارتی تجویز کی درستگی کا دورانیہ (دنوں میں)
+UseCustomerContactAsPropalRecipientIfExist=اگر تھرڈ پارٹی ایڈریس کی بجائے پروپوزل وصول کنندہ کے ایڈریس کے طور پر بیان کیا جائے تو 'رابطہ کی پیروی کی تجویز' کی قسم کے ساتھ رابطہ/پتہ استعمال کریں۔
+ConfirmClonePropal=کیا آپ واقعی تجارتی تجویز <b> %s </b> کلون کرنا چاہتے ہیں؟
+ConfirmReOpenProp=کیا آپ واقعی تجارتی تجویز <b> %s </b> کو کھولنا چاہتے ہیں؟
+ProposalsAndProposalsLines=تجارتی تجویز اور لائنیں۔
+ProposalLine=پروپوزل لائن
+ProposalLines=تجویز کی لکیریں۔
+AvailabilityPeriod=دستیابی میں تاخیر
+SetAvailability=دستیابی میں تاخیر سیٹ کریں۔
+AfterOrder=حکم کے بعد
+OtherProposals=دیگر تجاویز
+##### Availability #####
+AvailabilityTypeAV_NOW=فوری
+AvailabilityTypeAV_1W=1 ہفتہ
+AvailabilityTypeAV_2W=2 ہفتے
+AvailabilityTypeAV_3W=3 ہفتے
+AvailabilityTypeAV_1M=1 مہینہ
+##### Types de contacts #####
+TypeContact_propal_internal_SALESREPFOLL=نمائندہ پیروی کی تجویز
+TypeContact_propal_external_BILLING=کسٹمر انوائس رابطہ
+TypeContact_propal_external_CUSTOMER=کسٹمر رابطہ فالو اپ تجویز
+TypeContact_propal_external_SHIPPING=ڈیلیوری کے لیے کسٹمر رابطہ کریں۔
+# Document models
+DocModelAzurDescription=ایک مکمل تجویز ماڈل (سیان ٹیمپلیٹ کا پرانا نفاذ)
+DocModelCyanDescription=ایک مکمل تجویز ماڈل
+DefaultModelPropalCreate=پہلے سے طے شدہ ماڈل کی تخلیق
+DefaultModelPropalToBill=کاروباری تجویز کو بند کرتے وقت ڈیفالٹ ٹیمپلیٹ (انوائس کی جائے گی)
+DefaultModelPropalClosed=کاروباری تجویز کو بند کرتے وقت ڈیفالٹ ٹیمپلیٹ (بغیر بل)
+ProposalCustomerSignature=تحریری قبولیت، کمپنی کا مہر، تاریخ اور دستخط
+ProposalsStatisticsSuppliers=وینڈر کی تجویز کے اعدادوشمار
+CaseFollowedBy=اس کے بعد کیس
+SignedOnly=صرف دستخط شدہ
+IdProposal=تجویز کی شناخت
+IdProduct=پروڈکٹ کی شناخت
+PrParentLine=پروپوزل پیرنٹ لائن
+LineBuyPriceHT=لائن کے لیے ٹیکس کی قیمت کی رقم خریدیں۔
+SignPropal=تجویز قبول کریں۔
+RefusePropal=تجویز سے انکار
+Sign=دستخط
+PropalAlreadySigned=تجویز پہلے ہی قبول کر لی گئی ہے۔
+PropalAlreadyRefused=تجویز پہلے ہی مسترد کر دی گئی۔
+PropalSigned=تجویز منظور کر لی گئی۔
+PropalRefused=تجویز مسترد کر دی گئی۔
+ConfirmRefusePropal=کیا آپ واقعی اس تجارتی تجویز کو مسترد کرنا چاہتے ہیں؟
diff --git a/htdocs/langs/ur_PK/receiptprinter.lang b/htdocs/langs/ur_PK/receiptprinter.lang
new file mode 100644
index 00000000000..3bbf2a1e3fd
--- /dev/null
+++ b/htdocs/langs/ur_PK/receiptprinter.lang
@@ -0,0 +1,82 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+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=مقامی ونڈوز پرنٹر
+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 پرنٹر کا نام، مثال: HPRT_TP805L
+PROFILE_DEFAULT=ڈیفالٹ پروفائل
+PROFILE_SIMPLE=سادہ پروفائل
+PROFILE_EPOSTEP=ایپوس ٹیپ پروفائل
+PROFILE_P822D=P822D پروفائل
+PROFILE_STAR=اسٹار پروفائل
+PROFILE_DEFAULT_HELP=ایپسن پرنٹرز کے لیے ڈیفالٹ پروفائل موزوں ہے۔
+PROFILE_SIMPLE_HELP=سادہ پروفائل کوئی گرافکس نہیں۔
+PROFILE_EPOSTEP_HELP=ایپوس ٹیپ پروفائل
+PROFILE_P822D_HELP=P822D پروفائل کوئی گرافکس نہیں۔
+PROFILE_STAR_HELP=اسٹار پروفائل
+DOL_LINE_FEED=لائن کو چھوڑیں۔
+DOL_ALIGN_LEFT=متن کو بائیں طرف سیدھ کریں۔
+DOL_ALIGN_CENTER=مرکزی متن
+DOL_ALIGN_RIGHT=متن کو دائیں سیدھ میں کریں۔
+DOL_USE_FONT_A=پرنٹر کا فونٹ A استعمال کریں۔
+DOL_USE_FONT_B=پرنٹر کا فونٹ B استعمال کریں۔
+DOL_USE_FONT_C=پرنٹر کا فونٹ 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=انوائس ڈے خطوط میں
+DOL_LINE_FEED_REVERSE=لائن فیڈ ریورس
+InvoiceID=انوائس ID
+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/ur_PK/receptions.lang b/htdocs/langs/ur_PK/receptions.lang
new file mode 100644
index 00000000000..05d84f5a860
--- /dev/null
+++ b/htdocs/langs/ur_PK/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=حوالہ استقبالیہ
+Reception=استقبالیہ
+Receptions=استقبالیہ
+AllReceptions=تمام استقبالیہ
+Reception=استقبالیہ
+Receptions=استقبالیہ
+ShowReception=استقبالیہ دکھائیں۔
+ReceptionsArea=استقبالیہ علاقہ
+ListOfReceptions=استقبالیوں کی فہرست
+ReceptionMethod=استقبال کا طریقہ
+LastReceptions=تازہ ترین %s استقبالیہ
+StatisticsOfReceptions=استقبالیہ کے اعدادوشمار
+NbOfReceptions=استقبالیوں کی تعداد
+NumberOfReceptionsByMonth=مہینے کے لحاظ سے استقبالیوں کی تعداد
+ReceptionCard=استقبالیہ کارڈ
+NewReception=نیا استقبال
+CreateReception=استقبالیہ بنائیں
+QtyInOtherReceptions=دیگر استقبالیوں میں مقدار
+OtherReceptionsForSameOrder=اس آرڈر کے لیے دیگر استقبالیہ
+ReceptionsAndReceivingForSameOrder=اس آرڈر کے لیے استقبالیہ اور رسیدیں
+ReceptionsToValidate=توثیق کرنے کے لئے استقبالیہ
+StatusReceptionCanceled=منسوخ
+StatusReceptionDraft=مسودہ
+StatusReceptionValidated=توثیق شدہ (مصنوعات موصول ہونے کے لیے یا پہلے سے موصول ہوئی ہیں)
+StatusReceptionValidatedToReceive=توثیق شدہ (مصنوعات حاصل کرنے کے لیے)
+StatusReceptionValidatedReceived=تصدیق شدہ (مصنوعات موصول)
+StatusReceptionProcessed=پروسیس شدہ
+StatusReceptionDraftShort=مسودہ
+StatusReceptionValidatedShort=تصدیق شدہ
+StatusReceptionProcessedShort=پروسیس شدہ
+ReceptionSheet=استقبالیہ شیٹ
+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/ur_PK/recruitment.lang b/htdocs/langs/ur_PK/recruitment.lang
new file mode 100644
index 00000000000..29e986d3d59
--- /dev/null
+++ b/htdocs/langs/ur_PK/recruitment.lang
@@ -0,0 +1,76 @@
+# 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 = بھرتی
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = نئی ملازمت کے عہدوں کے لیے بھرتی مہم کا نظم کریں اور ان کی پیروی کریں۔
+
+#
+# Admin page
+#
+RecruitmentSetup = بھرتی سیٹ اپ
+Settings = ترتیبات
+RecruitmentSetupPage = ریکروٹمنٹ ماڈیول کے لیے مین آپشنز کا سیٹ اپ یہاں درج کریں۔
+RecruitmentArea=بھرتی کا علاقہ
+PublicInterfaceRecruitmentDesc=نوکریوں کے عوامی صفحات عوامی یو آر ایل ہیں جو نوکریوں کو دکھانے اور جواب دینے کے لیے ہیں۔ ہر اوپن جاب کے لیے ایک مختلف لنک ہوتا ہے، جو ہر جاب ریکارڈ پر پایا جاتا ہے۔
+EnablePublicRecruitmentPages=کھلی ملازمتوں کے عوامی صفحات کو فعال کریں۔
+
+#
+# About page
+#
+About = کے بارے میں
+RecruitmentAbout = بھرتی کے بارے میں
+RecruitmentAboutPage = صفحہ کے بارے میں بھرتی
+NbOfEmployeesExpected=ملازمین کی متوقع تعداد
+JobLabel=ملازمت کی پوزیشن کا لیبل
+WorkPlace=کام کی جگہ
+DateExpected=متوقع تاریخ
+FutureManager=مستقبل کے مینیجر
+ResponsibleOfRecruitement=بھرتی کے ذمہ دار
+IfJobIsLocatedAtAPartner=اگر ملازمت کسی ساتھی کی جگہ پر ہے۔
+PositionToBeFilled=عہدہ
+PositionsToBeFilled=ملازمت کے عہدے
+ListOfPositionsToBeFilled=ملازمت کے عہدوں کی فہرست
+NewPositionToBeFilled=نوکری کی نئی پوزیشنیں
+
+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=ایک پیشکش کریں۔
diff --git a/htdocs/langs/ur_PK/resource.lang b/htdocs/langs/ur_PK/resource.lang
new file mode 100644
index 00000000000..1d9c7d8ae8c
--- /dev/null
+++ b/htdocs/langs/ur_PK/resource.lang
@@ -0,0 +1,39 @@
+# Dolibarr language file - Source file is en_US - resource
+MenuResourceIndex=حوالہ جات
+MenuResourceAdd=نیا وسیلہ
+DeleteResource=وسائل کو حذف کریں۔
+ConfirmDeleteResourceElement=اس عنصر کے وسائل کو حذف کرنے کی تصدیق کریں۔
+NoResourceInDatabase=ڈیٹا بیس میں کوئی وسیلہ نہیں ہے۔
+NoResourceLinked=کوئی وسیلہ منسلک نہیں ہے۔
+ActionsOnResource=اس وسائل کے بارے میں واقعات
+ResourcePageIndex=وسائل کی فہرست
+ResourceSingular=وسیلہ
+ResourceCard=ریسورس کارڈ
+AddResource=ایک وسیلہ بنائیں
+ResourceFormLabel_ref=وسائل کا نام
+ResourceType=وسائل کی قسم
+ResourceFormLabel_description=وسائل کی تفصیل
+
+ResourcesLinkedToElement=عنصر سے منسلک وسائل
+
+ShowResource=وسائل دکھائیں۔
+
+ResourceElementPage=عنصر کے وسائل
+ResourceCreatedWithSuccess=وسیلہ کامیابی کے ساتھ بنایا گیا۔
+RessourceLineSuccessfullyDeleted=ریسورس لائن کامیابی کے ساتھ حذف کر دی گئی۔
+RessourceLineSuccessfullyUpdated=ریسورس لائن کامیابی کے ساتھ اپ ڈیٹ ہو گئی۔
+ResourceLinkedWithSuccess=کامیابی سے منسلک وسائل
+
+ConfirmDeleteResource=اس وسائل کو حذف کرنے کی تصدیق کریں۔
+RessourceSuccessfullyDeleted=وسیلہ کامیابی کے ساتھ حذف ہو گیا۔
+DictionaryResourceType=وسائل کی قسم
+
+SelectResource=وسیلہ منتخب کریں۔
+
+IdResource=آئی ڈی کا وسیلہ
+AssetNumber=سیریل نمبر
+ResourceTypeCode=ریسورس ٹائپ کوڈ
+ImportDataset_resource_1=حوالہ جات
+
+ErrorResourcesAlreadyInUse=کچھ وسائل استعمال میں ہیں۔
+ErrorResourceUseInEvent=%s %s ایونٹ میں استعمال کیا گیا
diff --git a/htdocs/langs/ur_PK/salaries.lang b/htdocs/langs/ur_PK/salaries.lang
new file mode 100644
index 00000000000..3c6e18296f4
--- /dev/null
+++ b/htdocs/langs/ur_PK/salaries.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - salaries
+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/ur_PK/sendings.lang b/htdocs/langs/ur_PK/sendings.lang
new file mode 100644
index 00000000000..c7ec10207e9
--- /dev/null
+++ b/htdocs/langs/ur_PK/sendings.lang
@@ -0,0 +1,76 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefSending=حوالہ شپمنٹ
+Sending=کھیپ
+Sendings=شپمنٹس
+AllSendings=تمام کھیپ
+Shipment=کھیپ
+Shipments=شپمنٹس
+ShowSending=کھیپ دکھائیں۔
+Receivings=ترسیل کی رسیدیں
+SendingsArea=ترسیل کے علاقے
+ListOfSendings=ترسیل کی فہرست
+SendingMethod=بھیجنے کا طریقہ
+LastSendings=تازہ ترین %s ترسیل
+StatisticsOfSendings=ترسیل کے اعدادوشمار
+NbOfSendings=ترسیل کی تعداد
+NumberOfShipmentsByMonth=ماہ کے لحاظ سے ترسیل کی تعداد
+SendingCard=شپمنٹ کارڈ
+NewSending=نئی کھیپ
+CreateShipment=شپمنٹ بنائیں
+QtyShipped=مقدار بھیج دی گئی۔
+QtyShippedShort=مقدار کا جہاز۔
+QtyPreparedOrShipped=مقدار تیار یا بھیجی گئی۔
+QtyToShip=بھیجنے کی مقدار
+QtyToReceive=وصول کرنے کی مقدار
+QtyReceived=مقدار موصول ہوئی۔
+QtyInOtherShipments=دیگر ترسیلوں میں مقدار
+KeepToShip=جہاز کے لیے رہو
+KeepToShipShort=رہو
+OtherSendingsForSameOrder=اس آرڈر کے لیے دیگر ترسیلات
+SendingsAndReceivingForSameOrder=اس آرڈر کی ترسیل اور رسیدیں
+SendingsToValidate=توثیق کرنے کے لئے ترسیل
+StatusSendingCanceled=منسوخ
+StatusSendingCanceledShort=منسوخ
+StatusSendingDraft=مسودہ
+StatusSendingValidated=توثیق شدہ (پروڈکٹس بھیجنے کے لیے یا پہلے سے بھیجے گئے)
+StatusSendingProcessed=پروسیس شدہ
+StatusSendingDraftShort=مسودہ
+StatusSendingValidatedShort=تصدیق شدہ
+StatusSendingProcessedShort=پروسیس شدہ
+SendingSheet=شپمنٹ شیٹ
+ConfirmDeleteSending=کیا آپ واقعی اس کھیپ کو حذف کرنا چاہتے ہیں؟
+ConfirmValidateSending=کیا آپ واقعی <b> %s </b> حوالہ کے ساتھ اس کھیپ کی توثیق کرنا چاہتے ہیں؟
+ConfirmCancelSending=کیا آپ واقعی اس کھیپ کو منسوخ کرنا چاہتے ہیں؟
+DocumentModelMerou=میرو 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=ترسیل کی رسیدوں کے لیے مزید مکمل دستاویز کا ماڈل (لوگو...)
+DocumentModelStorm=ترسیل کی رسیدوں اور ایکسٹرا فیلڈز کی مطابقت کے لیے مزید مکمل دستاویز کا ماڈل (لوگو...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=مستقل EXPEDITION_ADDON_NUMBER کی وضاحت نہیں کی گئی ہے۔
+SumOfProductVolumes=مصنوعات کے حجم کا مجموعہ
+SumOfProductWeights=مصنوعات کے وزن کا مجموعہ
+
+# warehouse details
+DetailWarehouseNumber= گودام کی تفصیلات
+DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/ur_PK/sms.lang b/htdocs/langs/ur_PK/sms.lang
new file mode 100644
index 00000000000..d833124d4ea
--- /dev/null
+++ b/htdocs/langs/ur_PK/sms.lang
@@ -0,0 +1,51 @@
+# Dolibarr language file - Source file is en_US - sms
+Sms=پیغام
+SmsSetup=ایس ایم ایس سیٹ اپ
+SmsDesc=یہ صفحہ آپ کو SMS کی خصوصیات پر عالمی اختیارات کی وضاحت کرنے کی اجازت دیتا ہے۔
+SmsCard=ایس ایم ایس کارڈ
+AllSms=تمام SMS مہمات
+SmsTargets=اہداف
+SmsRecipients=اہداف
+SmsRecipient=ہدف
+SmsTitle=تفصیل
+SmsFrom=بھیجنے والا
+SmsTo=ہدف
+SmsTopic=SMS کا موضوع
+SmsText=پیغام
+SmsMessage=ایس ایم ایس پیغام
+ShowSms=ایس ایم ایس دکھائیں۔
+ListOfSms=ایس ایم ایس مہمات کی فہرست بنائیں
+NewSms=نئی SMS مہم
+EditSms=ایس ایم ایس میں ترمیم کریں۔
+ResetSms=نیا بھیجنا
+DeleteSms=ایس ایم ایس مہم کو حذف کریں۔
+DeleteASms=ایس ایم ایس مہم کو ہٹا دیں۔
+PreviewSms=Previuw SMS
+PrepareSms=ایس ایم ایس تیار کریں۔
+CreateSms=ایس ایم ایس بنائیں
+SmsResult=ایس ایم ایس بھیجنے کا نتیجہ
+TestSms=ٹیسٹ ایس ایم ایس
+ValidSms=ایس ایم ایس کی توثیق کریں۔
+ApproveSms=ایس ایم ایس کو منظور کریں۔
+SmsStatusDraft=مسودہ
+SmsStatusValidated=تصدیق شدہ
+SmsStatusApproved=منظورشدہ
+SmsStatusSent=بھیجا
+SmsStatusSentPartialy=جزوی طور پر بھیجا گیا۔
+SmsStatusSentCompletely=مکمل طور پر بھیج دیا گیا۔
+SmsStatusError=خرابی
+SmsStatusNotSent=بھیجا نہیں۔
+SmsSuccessfulySent=SMS درست طریقے سے بھیجا گیا (%s سے %s تک)
+ErrorSmsRecipientIsEmpty=ہدف کی تعداد خالی ہے۔
+WarningNoSmsAdded=ہدف کی فہرست میں شامل کرنے کے لیے کوئی نیا فون نمبر نہیں۔
+ConfirmValidSms=کیا آپ اس مہم کی توثیق کی تصدیق کرتے ہیں؟
+NbOfUniqueSms=منفرد فون نمبرز کی تعداد
+NbOfSms=فون نمبرز کی تعداد
+ThisIsATestMessage=یہ ایک امتحانی پیغام ہے۔
+SendSms=ایس ایم ایس بھیجیں۔
+SmsInfoCharRemain=باقی حروف کی تعداد
+SmsInfoNumero= (بین الاقوامی شکل یعنی: +33899701761)
+DelayBeforeSending=بھیجنے سے پہلے تاخیر (منٹ)
+SmsNoPossibleSenderFound=کوئی بھیجنے والا دستیاب نہیں ہے۔ اپنے SMS فراہم کنندہ کا سیٹ اپ چیک کریں۔
+SmsNoPossibleRecipientFound=کوئی ہدف دستیاب نہیں ہے۔ اپنے SMS فراہم کنندہ کا سیٹ اپ چیک کریں۔
+DisableStopIfSupported=STOP پیغام کو غیر فعال کریں (اگر تعاون یافتہ ہو)
diff --git a/htdocs/langs/ur_PK/stocks.lang b/htdocs/langs/ur_PK/stocks.lang
new file mode 100644
index 00000000000..a776633222b
--- /dev/null
+++ b/htdocs/langs/ur_PK/stocks.lang
@@ -0,0 +1,273 @@
+# Dolibarr language file - Source file is en_US - stocks
+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=موومنٹ ID %d
+ListMouvementStockProject=پروجیکٹ سے وابستہ اسٹاک کی نقل و حرکت کی فہرست
+StocksArea=گوداموں کا علاقہ
+AllWarehouses=تمام گودام
+IncludeEmptyDesiredStock=غیر متعینہ مطلوبہ اسٹاک کے ساتھ منفی اسٹاک بھی شامل کریں۔
+IncludeAlsoDraftOrders=ڈرافٹ آرڈرز بھی شامل کریں۔
+Location=مقام
+LocationSummary=مقام کا مختصر نام
+NumberOfDifferentProducts=منفرد مصنوعات کی تعداد
+NumberOfProducts=مصنوعات کی کل تعداد
+LastMovement=تازہ ترین تحریک
+LastMovements=تازہ ترین حرکات
+Units=یونٹس
+Unit=یونٹ
+StockCorrection=اسٹاک کی اصلاح
+CorrectStock=درست اسٹاک
+StockTransfer=اسٹاک کی منتقلی
+TransferStock=اسٹاک منتقل کریں۔
+MassStockTransferShort=بڑے پیمانے پر اسٹاک کی منتقلی
+StockMovement=اسٹاک کی نقل و حرکت
+StockMovements=اسٹاک کی نقل و حرکت
+NumberOfUnit=یونٹوں کی تعداد
+UnitPurchaseValue=یونٹ کی خریداری کی قیمت
+StockTooLow=اسٹاک بہت کم ہے۔
+StockLowerThanLimit=انتباہ کی حد سے کم اسٹاک (%s)
+EnhancedValue=قدر
+EnhancedValueOfWarehouses=گوداموں کی قدر
+UserWarehouseAutoCreate=صارف بناتے وقت خود بخود صارف گودام بنائیں
+AllowAddLimitStockByWarehouse=کم از کم اور مطلوبہ سٹاک فی جوڑی (مصنوعات کے گودام) کی قیمت کے علاوہ کم از کم اور مطلوبہ سٹاک فی پروڈکٹ کی قدر کا بھی انتظام کریں۔
+RuleForWarehouse=گوداموں کے لیے اصول
+WarehouseAskWarehouseOnThirparty=فریق ثالث پر گودام سیٹ کریں۔
+WarehouseAskWarehouseDuringPropal=تجارتی تجاویز پر گودام قائم کریں۔
+WarehouseAskWarehouseDuringOrder=سیلز آرڈرز پر گودام سیٹ کریں۔
+WarehouseAskWarehouseDuringProject=پروجیکٹس پر ایک گودام سیٹ کریں۔
+UserDefaultWarehouse=صارفین پر ایک گودام سیٹ کریں۔
+MainDefaultWarehouse=پہلے سے طے شدہ گودام
+MainDefaultWarehouseUser=ہر صارف کے لیے ڈیفالٹ گودام استعمال کریں۔
+MainDefaultWarehouseUserDesc=اس آپشن کو چالو کرنے سے، پروڈکٹ کی تخلیق کے دوران، پروڈکٹ کو تفویض کردہ گودام کی اس پر تعریف کی جائے گی۔ اگر صارف پر کسی گودام کی وضاحت نہیں کی گئی ہے تو، پہلے سے طے شدہ گودام کی وضاحت کی جاتی ہے۔
+IndependantSubProductStock=پروڈکٹ اسٹاک اور ذیلی پروڈکٹ اسٹاک آزاد ہیں۔
+QtyDispatched=مقدار بھیج دی گئی۔
+QtyDispatchedShort=مقدار بھیج دی گئی۔
+QtyToDispatchShort=بھیجنے کے لیے مقدار
+OrderDispatch=آئٹم کی رسیدیں
+RuleForStockManagementDecrease=خودکار سٹاک میں کمی کے لیے قاعدہ کا انتخاب کریں (دستی کمی ہمیشہ ممکن ہے، چاہے خودکار کمی کا قاعدہ فعال ہو)
+RuleForStockManagementIncrease=خودکار سٹاک میں اضافے کے لیے اصول کا انتخاب کریں (دستی اضافہ ہمیشہ ممکن ہوتا ہے، چاہے خودکار اضافہ کا اصول فعال ہو)
+DeStockOnBill=کسٹمر انوائس/کریڈٹ نوٹ کی توثیق پر حقیقی اسٹاک کو کم کریں۔
+DeStockOnValidateOrder=سیلز آرڈر کی توثیق پر حقیقی اسٹاک کو کم کریں۔
+DeStockOnShipment=شپنگ کی توثیق پر حقیقی اسٹاک کو کم کریں۔
+DeStockOnShipmentOnClosing=جب شپنگ بند ہونے پر سیٹ ہو تو اصلی اسٹاک کو کم کریں۔
+ReStockOnBill=وینڈر انوائس/کریڈٹ نوٹ کی توثیق پر حقیقی اسٹاک میں اضافہ کریں۔
+ReStockOnValidateOrder=خریداری کے آرڈر کی منظوری پر حقیقی اسٹاک میں اضافہ کریں۔
+ReStockOnDispatchOrder=سامان کی خریداری کے آرڈر کی وصولی کے بعد، گودام میں دستی ترسیل پر حقیقی اسٹاک میں اضافہ کریں
+StockOnReception=استقبالیہ کی توثیق پر حقیقی اسٹاک میں اضافہ کریں۔
+StockOnReceptionOnClosing=استقبالیہ بند ہونے پر حقیقی اسٹاک میں اضافہ کریں۔
+OrderStatusNotReadyToDispatch=آرڈر کی ابھی تک کوئی حیثیت نہیں ہے یا کوئی ایسی حیثیت نہیں ہے جو اسٹاک گوداموں میں مصنوعات کی ترسیل کی اجازت دیتی ہو۔
+StockDiffPhysicTeoric=فزیکل اور ورچوئل اسٹاک کے درمیان فرق کی وضاحت
+NoPredefinedProductToDispatch=اس آبجیکٹ کے لیے کوئی پیش وضاحتی مصنوعات نہیں۔ لہذا اسٹاک میں بھیجنے کی ضرورت نہیں ہے۔
+DispatchVerb=ڈسپیچ
+StockLimitShort=انتباہ کی حد
+StockLimit=انتباہ کے لیے اسٹاک کی حد
+StockLimitDesc=(خالی) کا مطلب ہے کوئی انتباہ نہیں۔ <br> 0 سٹاک کے خالی ہوتے ہی وارننگ کو متحرک کرنے کے لیے استعمال کیا جا سکتا ہے۔
+PhysicalStock=فزیکل اسٹاک
+RealStock=اصلی اسٹاک
+RealStockDesc=فزیکل/اصلی اسٹاک وہ اسٹاک ہے جو فی الحال گوداموں میں ہے۔
+RealStockWillAutomaticallyWhen=اصلی اسٹاک میں اس اصول کے مطابق ترمیم کی جائے گی (جیسا کہ اسٹاک ماڈیول میں بیان کیا گیا ہے):
+VirtualStock=ورچوئل اسٹاک
+VirtualStockAtDate=مستقبل کی تاریخ پر ورچوئل اسٹاک
+VirtualStockAtDateDesc=ورچوئل اسٹاک ایک بار تمام زیر التواء آرڈرز جن پر عمل درآمد کی منصوبہ بندی کی گئی ہے منتخب تاریخ سے پہلے ختم ہو جائے گی۔
+VirtualStockDesc=ورچوئل اسٹاک وہ حسابی اسٹاک ہوتا ہے جب تمام کھلی/ زیر التواء کارروائیاں (جو اسٹاک کو متاثر کرتی ہیں) بند ہو جانے کے بعد دستیاب ہوتی ہیں (خریداری کے آرڈر موصول ہوتے ہیں، سیلز آرڈرز بھیجے جاتے ہیں، مینوفیکچرنگ آرڈرز تیار ہوتے ہیں، وغیرہ)
+AtDate=تاریخ میں
+IdWarehouse=آئی ڈی گودام
+DescWareHouse=تفصیل گودام
+LieuWareHouse=لوکلائزیشن گودام
+WarehousesAndProducts=گودام اور مصنوعات
+WarehousesAndProductsBatchDetail=گودام اور مصنوعات (تفصیل کے ساتھ فی لاٹ/سیریل)
+AverageUnitPricePMPShort=وزنی اوسط قیمت
+AverageUnitPricePMPDesc=ان پٹ اوسط یونٹ کی قیمت جو ہمیں اپنے اسٹاک میں پروڈکٹ کی 1 یونٹ حاصل کرنے کے لیے خرچ کرنا پڑتی ہے۔
+SellPriceMin=فروخت یونٹ کی قیمت
+EstimatedStockValueSellShort=قیمت برائے فروخت
+EstimatedStockValueSell=قیمت برائے فروخت
+EstimatedStockValueShort=ان پٹ اسٹاک کی قیمت
+EstimatedStockValue=ان پٹ اسٹاک کی قیمت
+DeleteAWarehouse=گودام کو حذف کریں۔
+ConfirmDeleteWarehouse=کیا آپ واقعی گودام <b> %s </b> کو حذف کرنا چاہتے ہیں؟
+PersonalStock=ذاتی اسٹاک %s
+ThisWarehouseIsPersonalStock=یہ گودام %s %s کے ذاتی اسٹاک کی نمائندگی کرتا ہے
+SelectWarehouseForStockDecrease=اسٹاک میں کمی کے لیے استعمال کرنے کے لیے گودام کا انتخاب کریں۔
+SelectWarehouseForStockIncrease=اسٹاک میں اضافے کے لیے گودام کا انتخاب کریں۔
+NoStockAction=کوئی اسٹاک ایکشن نہیں۔
+DesiredStock=مطلوبہ اسٹاک
+DesiredStockDesc=اسٹاک کی یہ رقم وہ قیمت ہوگی جو اسٹاک کو بھرنے کی خصوصیت سے بھرنے کے لیے استعمال ہوتی ہے۔
+StockToBuy=منگوانا
+Replenishment=دوبارہ بھرنا
+ReplenishmentOrders=دوبارہ بھرنے کے احکامات
+VirtualDiffersFromPhysical=اسٹاک میں اضافہ/کمی کے اختیارات کے مطابق، فزیکل اسٹاک اور ورچوئل اسٹاک (فزیکل اسٹاک + اوپن آرڈرز) مختلف ہوسکتے ہیں
+UseRealStockByDefault=دوبارہ بھرنے کی خصوصیت کے لیے ورچوئل اسٹاک کے بجائے اصلی اسٹاک استعمال کریں۔
+ReplenishmentCalculation=آرڈر کی رقم (مطلوبہ مقدار - ورچوئل اسٹاک) کے بجائے (مطلوبہ مقدار - اصلی اسٹاک) ہوگی۔
+UseVirtualStock=ورچوئل اسٹاک استعمال کریں۔
+UsePhysicalStock=فزیکل اسٹاک استعمال کریں۔
+CurentSelectionMode=موجودہ سلیکشن موڈ
+CurentlyUsingVirtualStock=ورچوئل اسٹاک
+CurentlyUsingPhysicalStock=فزیکل اسٹاک
+RuleForStockReplenishment=اسٹاک کو دوبارہ بھرنے کا اصول
+SelectProductWithNotNullQty=کم از کم ایک پروڈکٹ کا انتخاب کریں جس میں quty نہ ہو اور ایک وینڈر ہو۔
+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=Inv./Mov. کوڈ
+NoPendingReceptionOnSupplierOrder=اوپن پرچیز آرڈر کی وجہ سے کوئی زیر التواء استقبالیہ
+ThisSerialAlreadyExistWithDifferentDate=یہ بہت / سیریل نمبر (<strong> %s </strong>) پہلے سے موجود ہے لیکن مختلف eatby یا sellby تاریخ کے ساتھ (مل گیا <strong> %s </strong> لیکن آپ <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=چل رہا ہے۔
+inventorySelectWarehouse=گودام کا انتخاب
+inventoryConfirmCreate=بنانا
+inventoryOfWarehouse=گودام کے لیے انوینٹری: %s
+inventoryErrorQtyAdd=خرابی: ایک مقدار صفر سے کم ہے۔
+inventoryMvtStock=انوینٹری کے ذریعہ
+inventoryWarningProductAlreadyExists=یہ پروڈکٹ پہلے ہی فہرست میں ہے۔
+SelectCategory=زمرہ فلٹر
+SelectFournisseur=وینڈر فلٹر
+inventoryOnDate=انوینٹری
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=اسٹاک کی نقل و حرکت میں انوینٹری کی تاریخ ہوگی (انوینٹری کی توثیق کی تاریخ کے بجائے)
+inventoryChangePMPPermission=کسی پروڈکٹ کے لیے پی ایم پی ویلیو کو تبدیل کرنے کی اجازت دیں۔
+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=qty <br> کو ری سیٹ کرنے کے لیے قدر کو 0 پر سیٹ کریں فیلڈ کو خالی رکھیں یا لائن کو ہٹا دیں، کوئی تبدیلی نہیں
+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=مندرجہ ذیل وجہ سے آپریشن منسوخ کر دیا گیا:
+ErrorCantFindCodeInInventory=انوینٹری میں درج ذیل کوڈ نہیں مل سکتا
+QtyWasAddedToTheScannedBarcode=کامیابی !! مقدار کو تمام درخواست کردہ بار کوڈ میں شامل کیا گیا تھا۔ آپ سکینر ٹول کو بند کر سکتے ہیں۔
+StockChangeDisabled=اسٹاک پر تبدیلی غیر فعال ہے۔
+NoWarehouseDefinedForTerminal=ٹرمینل کے لیے کوئی گودام متعین نہیں ہے۔
diff --git a/htdocs/langs/ur_PK/stripe.lang b/htdocs/langs/ur_PK/stripe.lang
new file mode 100644
index 00000000000..0c93b87f81c
--- /dev/null
+++ b/htdocs/langs/ur_PK/stripe.lang
@@ -0,0 +1,71 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=پٹی ماڈیول سیٹ اپ
+StripeDesc=اپنے صارفین کو کریڈٹ/ڈیبٹ کارڈز کے ذریعے ادائیگیوں کے لیے ایک آن لائن ادائیگی کا صفحہ پیش کریں <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a>۔ اس کا استعمال آپ کے صارفین کو ایڈہاک ادائیگیوں کی اجازت دینے کے لیے یا کسی خاص Dolibarr آبجیکٹ (انوائس، آرڈر، ...) سے متعلق ادائیگیوں کے لیے کیا جا سکتا ہے۔
+StripeOrCBDoPayment=کریڈٹ کارڈ یا پٹی سے ادائیگی کریں۔
+FollowingUrlAreAvailableToMakePayments=Dolibarr اشیاء پر ادائیگی کرنے کے لیے صارف کو صفحہ پیش کرنے کے لیے درج ذیل URLs دستیاب ہیں۔
+PaymentForm=ادائیگی کا فارم
+WelcomeOnPaymentPage=ہماری آن لائن ادائیگی کی خدمت میں خوش آمدید
+ThisScreenAllowsYouToPay=یہ اسکرین آپ کو %s پر آن لائن ادائیگی کرنے کی اجازت دیتی ہے۔
+ThisIsInformationOnPayment=یہ ادائیگی کے بارے میں معلومات ہے۔
+ToComplete=مکمل کرنا
+YourEMail=ادائیگی کی تصدیق حاصل کرنے کے لیے ای میل کریں۔
+STRIPE_PAYONLINE_SENDEMAIL=ادائیگی کی کوشش کے بعد ای میل اطلاع (کامیابی یا ناکام)
+Creditor=قرض دینے والا
+PaymentCode=ادائیگی کا کوڈ
+StripeDoPayment=پٹی کے ساتھ ادائیگی کریں۔
+YouWillBeRedirectedOnStripe=آپ کو کریڈٹ کارڈ کی معلومات داخل کرنے کے لیے محفوظ پٹی والے صفحہ پر بھیج دیا جائے گا۔
+Continue=اگلے
+ToOfferALinkForOnlinePayment=%s ادائیگی کے لیے URL
+ToOfferALinkForOnlinePaymentOnOrder=سیلز آرڈر کے لیے %s آن لائن ادائیگی کا صفحہ پیش کرنے کے لیے URL
+ToOfferALinkForOnlinePaymentOnInvoice=کسٹمر انوائس کے لیے %s آن لائن ادائیگی کا صفحہ پیش کرنے کے لیے URL
+ToOfferALinkForOnlinePaymentOnContractLine=کنٹریکٹ لائن کے لیے %s آن لائن ادائیگی کا صفحہ پیش کرنے کے لیے URL
+ToOfferALinkForOnlinePaymentOnFreeAmount=کسی بھی رقم کا %s آن لائن ادائیگی کا صفحہ پیش کرنے کے لیے URL
+ToOfferALinkForOnlinePaymentOnMemberSubscription=ممبر کی رکنیت کے لیے %s آن لائن ادائیگی کا صفحہ پیش کرنے کے لیے URL
+ToOfferALinkForOnlinePaymentOnDonation=عطیہ کی ادائیگی کے لیے %s آن لائن ادائیگی کا صفحہ پیش کرنے کے لیے URL
+YouCanAddTagOnUrl=آپ ان میں سے کسی یو آر ایل میں url پیرامیٹر <b> &tag=<i> ویلیو </i> </b> کو بھی شامل کر سکتے ہیں (صرف ادائیگی کے لیے لازمی ہے جو کسی چیز سے منسلک نہیں ہے) اپنا پیمنٹ ٹیگ شامل کرنے کے لیے۔ <br> ادائیگیوں کے URL کے لیے جس میں کوئی شے موجود نہیں ہے، آپ <strong> &noidempotency=1 </strong> پیرامیٹر بھی شامل کر سکتے ہیں تاکہ ایک ہی ٹیگ کے ساتھ ایک ہی لنک کو کئی بار استعمال کیا جا سکے (کچھ ادائیگی کا موڈ ہر ایک لنک کے بغیر ادائیگی کو محدود کر سکتا ہے۔ پیرامیٹر)
+SetupStripeToHavePaymentCreatedAutomatically=اپنی اسٹرائپ کو url <b> %s </b> کے ساتھ سیٹ اپ کریں تاکہ اسٹرائپ کی توثیق ہونے پر ادائیگی خود بخود بن جائے۔
+AccountParameter=اکاؤنٹ کے پیرامیٹرز
+UsageParameter=استعمال کے پیرامیٹرز
+InformationToFindParameters=اپنے %s اکاؤنٹ کی معلومات تلاش کرنے میں مدد کریں۔
+STRIPE_CGI_URL_V2=ادائیگی کے لیے سٹرائپ CGI ماڈیول کا یو آر ایل
+CSSUrlForPaymentForm=ادائیگی کے فارم کے لیے سی ایس ایس اسٹائل شیٹ یو آر ایل
+NewStripePaymentReceived=نئی پٹی کی ادائیگی موصول ہوئی۔
+NewStripePaymentFailed=نئی اسٹرائپ ادائیگی کی کوشش کی لیکن ناکام ہوگئی
+FailedToChargeCard=کارڈ چارج کرنے میں ناکام
+STRIPE_TEST_SECRET_KEY=خفیہ ٹیسٹ کی کلید
+STRIPE_TEST_PUBLISHABLE_KEY=قابل اشاعت ٹیسٹ کلید
+STRIPE_TEST_WEBHOOK_KEY=ویب ہُک ٹیسٹ کلید
+STRIPE_LIVE_SECRET_KEY=خفیہ لائیو کلید
+STRIPE_LIVE_PUBLISHABLE_KEY=قابل اشاعت لائیو کلید
+STRIPE_LIVE_WEBHOOK_KEY=ویب ہُک لائیو کلید
+ONLINE_PAYMENT_WAREHOUSE=جب آن لائن ادائیگی کی جاتی ہے تو اسٹاک کو کم کرنے کے لیے استعمال کیا جائے گا
+StripeLiveEnabled=اسٹرائپ لائیو فعال (بصورت دیگر ٹیسٹ/سینڈ باکس موڈ)
+StripeImportPayment=پٹی کی ادائیگی درآمد کریں۔
+ExampleOfTestCreditCard=ٹیسٹ کے لیے کریڈٹ کارڈ کی مثال: %s => درست، %s => غلطی CVC، %s => میعاد ختم، %s => چارج ناکام
+StripeGateways=پٹی والے دروازے
+OAUTH_STRIPE_TEST_ID=اسٹرائپ کنیکٹ کلائنٹ آئی ڈی (ca_...)
+OAUTH_STRIPE_LIVE_ID=اسٹرائپ کنیکٹ کلائنٹ آئی ڈی (ca_...)
+BankAccountForBankTransfer=فنڈ کی ادائیگی کے لیے بینک اکاؤنٹ
+StripeAccount=پٹی کھاتہ
+StripeChargeList=اسٹرائپ چارجز کی فہرست
+StripeTransactionList=پٹی کے لین دین کی فہرست
+StripeCustomerId=پٹی کسٹمر آئی ڈی
+StripePaymentModes=پٹی ادائیگی کے طریقوں
+LocalID=لوکل آئی ڈی
+StripeID=پٹی کی شناخت
+NameOnCard=کارڈ پہ درج نام
+CardNumber=کارڈ نمبر
+ExpiryDate=خاتمے کی تاریخ
+CVN=سی وی این
+DeleteACard=کارڈ حذف کریں۔
+ConfirmDeleteCard=کیا آپ واقعی اس کریڈٹ یا ڈیبٹ کارڈ کو حذف کرنا چاہتے ہیں؟
+CreateCustomerOnStripe=پٹی پر گاہک بنائیں
+CreateCardOnStripe=پٹی پر کارڈ بنائیں
+ShowInStripe=پٹی میں دکھائیں۔
+StripeUserAccountForActions=کچھ اسٹرائپ ایونٹس کی ای میل اطلاع کے لیے استعمال کرنے والا صارف اکاؤنٹ (سٹرائپ ادائیگی)
+StripePayoutList=پٹی کی ادائیگیوں کی فہرست
+ToOfferALinkForTestWebhook=IPN (ٹیسٹ موڈ) کو کال کرنے کے لیے سٹرائپ ویب ہُک سیٹ اپ کرنے کا لنک
+ToOfferALinkForLiveWebhook=IPN (لائیو موڈ) کو کال کرنے کے لیے اسٹرائپ ویب ہُک کو سیٹ اپ کرنے کا لنک
+PaymentWillBeRecordedForNextPeriod=ادائیگی اگلی مدت کے لیے ریکارڈ کی جائے گی۔
+ClickHereToTryAgain= <a href="%s"> دوبارہ کوشش کرنے کے لیے یہاں کلک کریں... </a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=مضبوط کسٹمر تصدیقی اصولوں کی وجہ سے، کارڈ کی تخلیق اسٹرائپ بیک آفس سے ہونی چاہیے۔ آپ اسٹرائپ کسٹمر ریکارڈ پر سوئچ کرنے کے لیے یہاں کلک کر سکتے ہیں: %s
diff --git a/htdocs/langs/ur_PK/supplier_proposal.lang b/htdocs/langs/ur_PK/supplier_proposal.lang
new file mode 100644
index 00000000000..2d2601cc187
--- /dev/null
+++ b/htdocs/langs/ur_PK/supplier_proposal.lang
@@ -0,0 +1,58 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=وینڈر تجارتی تجاویز
+supplier_proposalDESC=سپلائرز کو قیمت کی درخواستوں کا نظم کریں۔
+SupplierProposalNew=نئی قیمت کی درخواست
+CommRequest=قیمت کی درخواست
+CommRequests=قیمت کی درخواستیں۔
+SearchRequest=ایک درخواست تلاش کریں۔
+DraftRequests=درخواستوں کا مسودہ
+SupplierProposalsDraft=ڈرافٹ وینڈر کی تجاویز
+LastModifiedRequests=تازہ ترین %s ترمیم شدہ قیمت کی درخواستیں۔
+RequestsOpened=قیمت کی درخواستیں کھولیں۔
+SupplierProposalArea=وینڈر کی تجاویز کا علاقہ
+SupplierProposalShort=وینڈر کی تجویز
+SupplierProposals=وینڈر کی تجاویز
+SupplierProposalsShort=وینڈر کی تجاویز
+AskPrice=قیمت کی درخواست
+NewAskPrice=نئی قیمت کی درخواست
+ShowSupplierProposal=قیمت کی درخواست دکھائیں۔
+AddSupplierProposal=قیمت کی درخواست بنائیں
+SupplierProposalRefFourn=وینڈر ریفری
+SupplierProposalDate=ادئیگی کی تاریخ
+SupplierProposalRefFournNotice="قبول شدہ" کو بند کرنے سے پہلے، سپلائرز کے حوالہ جات کو سمجھنے کے لیے سوچیں۔
+ConfirmValidateAsk=کیا آپ واقعی اس قیمت کی درخواست کو <b> %s </b> کے نام سے درست کرنا چاہتے ہیں؟
+DeleteAsk=درخواست کو حذف کریں۔
+ValidateAsk=درخواست کی توثیق کریں۔
+SupplierProposalStatusDraft=مسودہ (توثیق کرنے کی ضرورت ہے)
+SupplierProposalStatusValidated=تصدیق شدہ (درخواست کھلی ہے)
+SupplierProposalStatusClosed=بند
+SupplierProposalStatusSigned=قبول کر لیا
+SupplierProposalStatusNotSigned=انکار کر دیا
+SupplierProposalStatusDraftShort=مسودہ
+SupplierProposalStatusValidatedShort=تصدیق شدہ
+SupplierProposalStatusClosedShort=بند
+SupplierProposalStatusSignedShort=قبول کر لیا
+SupplierProposalStatusNotSignedShort=انکار کر دیا
+CopyAskFrom=موجودہ درخواست کو کاپی کرکے قیمت کی درخواست بنائیں
+CreateEmptyAsk=خالی درخواست بنائیں
+ConfirmCloneAsk=کیا آپ واقعی قیمت کی درخواست <b> %s </b> کلون کرنا چاہتے ہیں؟
+ConfirmReOpenAsk=کیا آپ واقعی قیمت کی درخواست <b> %s </b> کھولنا چاہتے ہیں؟
+SendAskByMail=میل کے ذریعے قیمت کی درخواست بھیجیں۔
+SendAskRef=قیمت کی درخواست %s بھیج رہا ہے۔
+SupplierProposalCard=کارڈ کی درخواست کریں۔
+ConfirmDeleteAsk=کیا آپ واقعی اس قیمت کی درخواست <b> %s </b> کو حذف کرنا چاہتے ہیں؟
+ActionsOnSupplierProposal=قیمت کی درخواست پر واقعات
+DocModelAuroreDescription=ایک مکمل درخواست ماڈل (لوگو...)
+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/ur_PK/suppliers.lang b/htdocs/langs/ur_PK/suppliers.lang
new file mode 100644
index 00000000000..c013c54d2e6
--- /dev/null
+++ b/htdocs/langs/ur_PK/suppliers.lang
@@ -0,0 +1,49 @@
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=فروش
+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=فروش کی قیمتیں۔
diff --git a/htdocs/langs/ur_PK/ticket.lang b/htdocs/langs/ur_PK/ticket.lang
new file mode 100644
index 00000000000..10ccf19600c
--- /dev/null
+++ b/htdocs/langs/ur_PK/ticket.lang
@@ -0,0 +1,324 @@
+# 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=ٹکٹ
+Module56000Desc=ایشو یا درخواست کے انتظام کے لیے ٹکٹ کا نظام
+
+Permission56001=ٹکٹیں دیکھیں
+Permission56002=ٹکٹوں میں ترمیم کریں۔
+Permission56003=ٹکٹیں حذف کریں۔
+Permission56004=ٹکٹوں کا انتظام کریں۔
+Permission56005=تمام فریق ثالث کے ٹکٹ دیکھیں (بیرونی صارفین کے لیے موثر نہیں، ہمیشہ ان تیسرے فریق تک محدود رہیں جس پر وہ انحصار کرتے ہیں)
+
+TicketDictType=ٹکٹ - اقسام
+TicketDictCategory=ٹکٹ - گروپس
+TicketDictSeverity=ٹکٹ - شدت
+TicketDictResolution=ٹکٹ - قرارداد
+
+TicketTypeShortCOM=تجارتی سوال
+TicketTypeShortHELP=فنکشنل مدد کی درخواست کریں۔
+TicketTypeShortISSUE=مسئلہ یا بگ
+TicketTypeShortPROBLEM=مسئلہ
+TicketTypeShortREQUEST=تبدیلی یا اضافہ کی درخواست
+TicketTypeShortPROJET=پروجیکٹ
+TicketTypeShortOTHER=دیگر
+
+TicketSeverityShortLOW=کم
+TicketSeverityShortNORMAL=نارمل
+TicketSeverityShortHIGH=اعلی
+TicketSeverityShortBLOCKING=تنقیدی، مسدود کرنا
+
+TicketCategoryShortOTHER=دیگر
+
+ErrorBadEmailAddress=فیلڈ '%s' غلط ہے۔
+MenuTicketMyAssign=میرے ٹکٹ
+MenuTicketMyAssignNonClosed=میرے کھلے ٹکٹ
+MenuListNonClosed=ٹکٹیں کھولیں۔
+
+TypeContact_ticket_internal_CONTRIBUTOR=تعاون کرنے والا
+TypeContact_ticket_internal_SUPPORTTEC=تفویض کردہ صارف
+TypeContact_ticket_external_SUPPORTCLI=گاہک سے رابطہ / واقعہ سے باخبر رہنا
+TypeContact_ticket_external_CONTRIBUTOR=بیرونی تعاون کرنے والا
+
+OriginEmail=رپورٹر ای میل
+Notify_TICKET_SENTBYMAIL=ٹکٹ کا پیغام بذریعہ ای میل بھیجیں۔
+
+# Status
+Read=پڑھیں
+Assigned=تفویض کردہ
+InProgress=کام جاری ہے
+NeedMoreInformation=رپورٹر کی رائے کا انتظار ہے۔
+NeedMoreInformationShort=رائے کا انتظار ہے۔
+Answered=جواب دیا۔
+Waiting=انتظار کر رہا ہے۔
+SolvedClosed=حل ہو گیا۔
+Deleted=حذف کر دیا گیا۔
+
+# Dict
+Type=قسم
+Severity=شدت
+TicketGroupIsPublic=گروپ عوامی ہے۔
+TicketGroupIsPublicDesc=اگر ٹکٹ گروپ عوامی ہے، تو عوامی انٹرفیس سے ٹکٹ بناتے وقت یہ فارم میں نظر آئے گا۔
+
+# Email templates
+MailToSendTicketMessage=ٹکٹ کے پیغام سے ای میل بھیجنے کے لیے
+
+#
+# Admin page
+#
+TicketSetup=ٹکٹ ماڈیول سیٹ اپ
+TicketSettings=ترتیبات
+TicketSetupPage=
+TicketPublicAccess=ایک عوامی انٹرفیس جس کے لیے کسی شناخت کی ضرورت نہیں ہے درج ذیل یو آر ایل پر دستیاب ہے۔
+TicketSetupDictionaries=ٹکٹ کی قسم، شدت اور تجزیاتی کوڈ لغات سے قابل ترتیب ہیں۔
+TicketParamModule=ماڈیول متغیر سیٹ اپ
+TicketParamMail=ای میل سیٹ اپ
+TicketEmailNotificationFrom=سے اطلاعی ای میل
+TicketEmailNotificationFromHelp=ٹکٹ کے پیغام کے جواب میں مثال کے طور پر استعمال کیا جاتا ہے۔
+TicketEmailNotificationTo=نوٹیفکیشنز کو ای میل کریں۔
+TicketEmailNotificationToHelp=اس ایڈریس پر ای میل اطلاعات بھیجیں۔
+TicketNewEmailBodyLabel=ٹکٹ بنانے کے بعد ٹیکسٹ میسج بھیجا گیا۔
+TicketNewEmailBodyHelp=یہاں بیان کردہ متن عوامی انٹرفیس سے ایک نیا ٹکٹ بنانے کی تصدیق کرنے والے ای میل میں داخل کیا جائے گا۔ ٹکٹ کی مشاورت سے متعلق معلومات خود بخود شامل ہوجاتی ہیں۔
+TicketParamPublicInterface=عوامی انٹرفیس سیٹ اپ
+TicketsEmailMustExist=ٹکٹ بنانے کے لیے موجودہ ای میل ایڈریس کی ضرورت ہے۔
+TicketsEmailMustExistHelp=پبلک انٹرفیس میں، نیا ٹکٹ بنانے کے لیے ڈیٹا بیس میں ای میل ایڈریس کو پہلے سے ہی بھرنا چاہیے۔
+PublicInterface=عوامی انٹرفیس
+TicketUrlPublicInterfaceLabelAdmin=عوامی انٹرفیس کے لیے متبادل URL
+TicketUrlPublicInterfaceHelpAdmin=ویب سرور کے لیے ایک عرف کی وضاحت کرنا اور اس طرح عوامی انٹرفیس کو دوسرے یو آر ایل کے ساتھ دستیاب کرنا ممکن ہے (سرور کو اس نئے یو آر ایل پر پراکسی کے طور پر کام کرنا چاہیے)
+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=ہر نئے پیغام کی اطلاع کے لیے اس پتے پر ایک ای میل بھیجیں اگر ٹکٹ کے لیے کوئی صارف تفویض نہیں کیا گیا ہے یا صارف کے پاس کوئی معلوم ای میل نہیں ہے۔
+#
+# Index & list page
+#
+TicketsIndex=ٹکٹوں کا علاقہ
+TicketList=ٹکٹوں کی فہرست
+TicketAssignedToMeInfos=یہ صفحہ ڈسپلے ٹکٹ کی فہرست موجودہ صارف کے ذریعہ تخلیق یا تفویض کی گئی ہے۔
+NoTicketsFound=کوئی ٹکٹ نہیں ملا
+NoUnreadTicketsFound=کوئی بغیر پڑھا ہوا ٹکٹ نہیں ملا
+TicketViewAllTickets=تمام ٹکٹیں دیکھیں
+TicketViewNonClosedOnly=صرف کھلی ٹکٹیں دیکھیں
+TicketStatByStatus=حیثیت کے لحاظ سے ٹکٹ
+OrderByDateAsc=صعودی تاریخ کے حساب سے ترتیب دیں۔
+OrderByDateDesc=نزولی تاریخ کے مطابق ترتیب دیں۔
+ShowAsConversation=گفتگو کی فہرست کے بطور دکھائیں۔
+MessageListViewType=ٹیبل لسٹ کے بطور دکھائیں۔
+
+#
+# Ticket card
+#
+Ticket=ٹکٹ
+TicketCard=ٹکٹ کارڈ
+CreateTicket=ٹکٹ بنائیں
+EditTicket=ٹکٹ میں ترمیم کریں۔
+TicketsManagement=ٹکٹوں کا انتظام
+CreatedBy=بنائی گئی
+NewTicket=نیا ٹکٹ
+SubjectAnswerToTicket=ٹکٹ کا جواب
+TicketTypeRequest=درخواست کی قسم
+TicketCategory=ٹکٹ کی درجہ بندی
+SeeTicket=ٹکٹ دیکھیں
+TicketMarkedAsRead=ٹکٹ کو پڑھا ہوا نشان زد کر دیا گیا ہے۔
+TicketReadOn=پڑھیں
+TicketCloseOn=آخری تاریخ
+MarkAsRead=ٹکٹ کو پڑھا ہوا نشان زد کریں۔
+TicketHistory=ٹکٹ کی تاریخ
+AssignUser=صارف کو تفویض کریں۔
+TicketAssigned=ٹکٹ اب تفویض کیا گیا ہے۔
+TicketChangeType=قسم تبدیل کریں۔
+TicketChangeCategory=تجزیاتی کوڈ کو تبدیل کریں۔
+TicketChangeSeverity=شدت کو تبدیل کریں۔
+TicketAddMessage=ایک پیغام شامل کریں۔
+AddMessage=ایک پیغام شامل کریں۔
+MessageSuccessfullyAdded=ٹکٹ شامل کیا گیا۔
+TicketMessageSuccessfullyAdded=پیغام کامیابی کے ساتھ شامل ہو گیا۔
+TicketMessagesList=پیغام کی فہرست
+NoMsgForThisTicket=اس ٹکٹ کے لیے کوئی پیغام نہیں ہے۔
+TicketProperties=درجہ بندی
+LatestNewTickets=تازہ ترین %s تازہ ترین ٹکٹ (پڑھے نہیں گئے)
+TicketSeverity=شدت
+ShowTicket=ٹکٹ دیکھیں
+RelatedTickets=متعلقہ ٹکٹ
+TicketAddIntervention=مداخلت پیدا کریں۔
+CloseTicket=بند کریں | ٹکٹ حل کریں۔
+AbandonTicket=ٹکٹ چھوڑ دیں۔
+CloseATicket=بند کریں | ٹکٹ حل کریں۔
+ConfirmCloseAticket=ٹکٹ بند ہونے کی تصدیق کریں۔
+ConfirmAbandonTicket=کیا آپ ٹکٹ کے بند ہونے کی تصدیق کرتے ہیں اسٹیٹس 'Abandonned'
+ConfirmDeleteTicket=براہ کرم ٹکٹ ڈیلیٹ کرنے کی تصدیق کریں۔
+TicketDeletedSuccess=ٹکٹ کامیابی کے ساتھ حذف کر دیا گیا۔
+TicketMarkedAsClosed=ٹکٹ کو بند کے بطور نشان زد کیا گیا ہے۔
+TicketDurationAuto=حسابی مدت
+TicketDurationAutoInfos=مداخلت سے متعلق خود بخود مدت کا حساب لگایا جاتا ہے۔
+TicketUpdated=ٹکٹ اپ ڈیٹ ہو گیا۔
+SendMessageByEmail=ای میل کے ذریعے پیغام بھیجیں۔
+TicketNewMessage=نیا پیغام
+ErrorMailRecipientIsEmptyForSendTicketMessage=وصول کنندہ خالی ہے۔ کوئی ای میل نہیں بھیجا۔
+TicketGoIntoContactTab=براہ کرم انہیں منتخب کرنے کے لیے "رابطے" ٹیب میں جائیں۔
+TicketMessageMailIntro=تعارف
+TicketMessageMailIntroHelp=یہ متن صرف ای میل کے شروع میں شامل کیا گیا ہے اور محفوظ نہیں کیا جائے گا۔
+TicketMessageMailIntroLabelAdmin=ای میل بھیجتے وقت پیغام کا تعارف
+TicketMessageMailIntroText=ہیلو، <br> ٹکٹ پر ایک نیا جواب بھیجا گیا جس سے آپ رابطہ کرتے ہیں۔ یہ پیغام ہے: <br>
+TicketMessageMailIntroHelpAdmin=یہ متن ٹکٹ کے جواب کے متن سے پہلے داخل کیا جائے گا۔
+TicketMessageMailSignature=دستخط
+TicketMessageMailSignatureHelp=یہ متن صرف ای میل کے آخر میں شامل کیا گیا ہے اور محفوظ نہیں کیا جائے گا۔
+TicketMessageMailSignatureText= <p> مخلص، </p> <p> -- </p>
+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=بنانے پر کمپنی کو مطلع نہ کریں۔
+Unread=ان پڑھ
+TicketNotCreatedFromPublicInterface=دستیاب نہیں ہے. ٹکٹ عوامی انٹرفیس سے نہیں بنایا گیا تھا۔
+ErrorTicketRefRequired=ٹکٹ کا حوالہ نام درکار ہے۔
+
+#
+# Logs
+#
+TicketLogMesgReadBy=ٹکٹ %s %s کے ذریعے پڑھا گیا
+NoLogForThisTicket=اس ٹکٹ کے لیے ابھی تک کوئی لاگ نہیں ہے۔
+TicketLogAssignedTo=ٹکٹ %s %s کو تفویض کیا گیا
+TicketLogPropertyChanged=ٹکٹ %s میں ترمیم کی گئی: %s سے %s تک درجہ بندی
+TicketLogClosedBy=ٹکٹ %s %s سے بند
+TicketLogReopen=ٹکٹ %s دوبارہ کھولیں۔
+
+#
+# Public pages
+#
+TicketSystem=ٹکٹ کا نظام
+ShowListTicketWithTrackId=ٹریک ID سے ٹکٹ کی فہرست دکھائیں۔
+ShowTicketWithTrackId=ٹریک ID سے ٹکٹ ڈسپلے کریں۔
+TicketPublicDesc=آپ سپورٹ ٹکٹ بنا سکتے ہیں یا موجودہ ID سے چیک کر سکتے ہیں۔
+YourTicketSuccessfullySaved=ٹکٹ کامیابی کے ساتھ محفوظ ہو گیا ہے!
+MesgInfosPublicTicketCreatedWithTrackId=ID %s اور Ref %s کے ساتھ ایک نیا ٹکٹ بنایا گیا ہے۔
+PleaseRememberThisId=براہ کرم ٹریکنگ نمبر رکھیں جو ہم آپ سے بعد میں پوچھ سکتے ہیں۔
+TicketNewEmailSubject=ٹکٹ بنانے کی تصدیق - Ref %s (عوامی ٹکٹ ID %s)
+TicketNewEmailSubjectCustomer=نیا سپورٹ ٹکٹ
+TicketNewEmailBody=یہ ایک خودکار ای میل ہے اس بات کی تصدیق کرنے کے لیے کہ آپ نے نیا ٹکٹ رجسٹر کیا ہے۔
+TicketNewEmailBodyCustomer=یہ ایک خودکار ای میل ہے اس بات کی تصدیق کرنے کے لیے کہ ابھی آپ کے اکاؤنٹ میں ایک نیا ٹکٹ بنایا گیا ہے۔
+TicketNewEmailBodyInfosTicket=ٹکٹ کی نگرانی کے لیے معلومات
+TicketNewEmailBodyInfosTrackId=ٹکٹ ٹریکنگ نمبر: %s
+TicketNewEmailBodyInfosTrackUrl=آپ اوپر دیے گئے لنک پر کلک کرکے ٹکٹ کی پیشرفت دیکھ سکتے ہیں۔
+TicketNewEmailBodyInfosTrackUrlCustomer=آپ درج ذیل لنک پر کلک کرکے مخصوص انٹرفیس میں ٹکٹ کی پیشرفت دیکھ سکتے ہیں۔
+TicketEmailPleaseDoNotReplyToThisEmail=براہ کرم اس ای میل کا براہ راست جواب نہ دیں! انٹرفیس میں جواب دینے کے لیے لنک کا استعمال کریں۔
+TicketPublicInfoCreateTicket=یہ فارم آپ کو ہمارے انتظامی نظام میں سپورٹ ٹکٹ ریکارڈ کرنے کی اجازت دیتا ہے۔
+TicketPublicPleaseBeAccuratelyDescribe=براہ کرم مسئلہ کی درست وضاحت کریں۔ ہمیں آپ کی درخواست کی درست شناخت کرنے کی اجازت دینے کے لیے زیادہ سے زیادہ معلومات فراہم کریں۔
+TicketPublicMsgViewLogIn=براہ کرم ٹکٹ ٹریکنگ ID درج کریں۔
+TicketTrackId=عوامی ٹریکنگ ID
+OneOfTicketTrackId=آپ کی ٹریکنگ آئی ڈی میں سے ایک
+ErrorTicketNotFound=ٹریکنگ ID %s والا ٹکٹ نہیں ملا!
+Subject=مضمون
+ViewTicket=ٹکٹ دیکھیں
+ViewMyTicketList=میری ٹکٹ کی فہرست دیکھیں
+ErrorEmailMustExistToCreateTicket=خرابی: ای میل ایڈریس ہمارے ڈیٹا بیس میں نہیں ملا
+TicketNewEmailSubjectAdmin=نیا ٹکٹ بنایا گیا - Ref %s (عوامی ٹکٹ ID %s)
+TicketNewEmailBodyAdmin= <p> ٹکٹ ابھی #%s ID کے ساتھ بنایا گیا ہے، معلومات دیکھیں: </p>
+SeeThisTicketIntomanagementInterface=مینجمنٹ انٹرفیس میں ٹکٹ دیکھیں
+TicketPublicInterfaceForbidden=ٹکٹوں کے لیے عوامی انٹرفیس فعال نہیں تھا۔
+ErrorEmailOrTrackingInvalid=ٹریکنگ ID یا ای میل کے لیے خراب قدر
+OldUser=پرانا صارف
+NewUser=نیا صارف
+NumberOfTicketsByMonth=ہر ماہ ٹکٹوں کی تعداد
+NbOfTickets=ٹکٹوں کی تعداد
+# notifications
+TicketNotificationEmailSubject=ٹکٹ %s اپ ڈیٹ ہو گیا۔
+TicketNotificationEmailBody=یہ آپ کو مطلع کرنے کے لیے ایک خودکار پیغام ہے کہ ٹکٹ %s کو ابھی اپ ڈیٹ کیا گیا ہے۔
+TicketNotificationRecipient=اطلاع وصول کنندہ
+TicketNotificationLogMessage=لاگ پیغام
+TicketNotificationEmailBodyInfosTrackUrlinternal=انٹرفیس میں ٹکٹ دیکھیں
+TicketNotificationNumberEmailSent=اطلاعی ای میل بھیجی گئی: %s
+
+ActionsOnTicket=ٹکٹ پر واقعات
+
+#
+# Boxes
+#
+BoxLastTicket=تازہ ترین تیار کردہ ٹکٹ
+BoxLastTicketDescription=تازہ ترین %s نے ٹکٹ بنائے
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=کوئی حالیہ بغیر پڑھے ہوئے ٹکٹ
+BoxLastModifiedTicket=تازہ ترین ترمیم شدہ ٹکٹ
+BoxLastModifiedTicketDescription=تازہ ترین %s ترمیم شدہ ٹکٹ
+BoxLastModifiedTicketContent=
+BoxLastModifiedTicketNoRecordedTickets=کوئی حالیہ ترمیم شدہ ٹکٹ نہیں ہے۔
+BoxTicketType=قسم کے لحاظ سے کھلے ٹکٹوں کی تقسیم
+BoxTicketSeverity=شدت کے لحاظ سے کھلے ٹکٹوں کی تعداد
+BoxNoTicketSeverity=کوئی ٹکٹ نہیں کھلا۔
+BoxTicketLastXDays=پچھلے %s دنوں کے حساب سے نئے ٹکٹوں کی تعداد
+BoxTicketLastXDayswidget = آخری X دنوں کے حساب سے نئے ٹکٹوں کی تعداد
+BoxNoTicketLastXDays=پچھلے %s دنوں میں کوئی نیا ٹکٹ نہیں ہے۔
+BoxNumberOfTicketByDay=دن میں نئے ٹکٹوں کی تعداد
+BoxNewTicketVSClose=ٹکٹوں کی تعداد بمقابلہ بند ٹکٹ (آج)
+TicketCreatedToday=ٹکٹ آج بنایا گیا۔
+TicketClosedToday=ٹکٹ آج بند ہے۔
+KMFoundForTicketGroup=ہمیں ایسے عنوانات اور اکثر پوچھے گئے سوالات ملے جو آپ کے سوال کا جواب دے سکتے ہیں، ٹکٹ جمع کرانے سے پہلے انہیں چیک کرنے کا شکریہ
diff --git a/htdocs/langs/ur_PK/trips.lang b/htdocs/langs/ur_PK/trips.lang
new file mode 100644
index 00000000000..ee3884f97cc
--- /dev/null
+++ b/htdocs/langs/ur_PK/trips.lang
@@ -0,0 +1,150 @@
+# Dolibarr language file - Source file is en_US - trips
+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> توثیق کرنے کے لیے یہاں کلک کریں: a0ecb2ecz87f
+ExpenseReportWaitingForReApproval=اخراجات کی رپورٹ دوبارہ منظوری کے لیے پیش کر دی گئی ہے۔
+ExpenseReportWaitingForReApprovalMessage=اخراجات کی رپورٹ جمع کرائی گئی ہے اور دوبارہ منظوری کا انتظار ہے۔ <br> %s، آپ نے اس وجہ سے اخراجات کی رپورٹ کو منظور کرنے سے انکار کر دیا: %s۔ <br> ایک نیا ورژن تجویز کیا گیا ہے اور آپ کی منظوری کا انتظار ہے۔ <br> - صارف: %s <br> - مدت: %s <br> توثیق کرنے کے لیے یہاں کلک کریں: a0ecb2ecz87f
+ExpenseReportApproved=اخراجات کی رپورٹ منظور کر لی گئی۔
+ExpenseReportApprovedMessage=اخراجات کی رپورٹ %s منظور کر لی گئی۔ <br> - صارف: %s <br> - منظور شدہ بذریعہ: %s <br> اخراجات کی رپورٹ دکھانے کے لیے یہاں کلک کریں: %s
+ExpenseReportRefused=اخراجات کی رپورٹ مسترد کر دی گئی۔
+ExpenseReportRefusedMessage=اخراجات کی رپورٹ %s سے انکار کر دیا گیا تھا۔ <br> - صارف: %s <br> - انکار کردہ بذریعہ: %s <br> - انکار کا محرک: a0ecb2ec87f49fz7fzf70000 یہاں پر کلک کریں۔
+ExpenseReportCanceled=اخراجات کی رپورٹ منسوخ کر دی گئی۔
+ExpenseReportCanceledMessage=اخراجات کی رپورٹ %s منسوخ کر دی گئی۔ <br> - صارف: %s <br> - منسوخ شدہ بذریعہ: %s <br> - منسوخی کا محرک: a0ecb2eczfda19bz0 کی رپورٹ:
+ExpenseReportPaid=اخراجات کی رپورٹ ادا کر دی گئی۔
+ExpenseReportPaidMessage=اخراجات کی رپورٹ %s ادا کی گئی۔ <br> - صارف: %s <br> - ادائیگی کی طرف سے: %s <br> اخراجات کی رپورٹ دکھانے کے لیے یہاں کلک کریں: a0ecb2ec9fz87
+TripId=شناختی اخراجات کی رپورٹ
+AnyOtherInThisListCanValidate=درخواست کی توثیق کے لیے مطلع کیا جائے۔
+TripSociete=انفارمیشن کمپنی
+TripNDF=معلوماتی اخراجات کی رپورٹ
+PDFStandardExpenseReports=اخراجات کی رپورٹ کے لیے پی ڈی ایف دستاویز بنانے کے لیے معیاری ٹیمپلیٹ
+ExpenseReportLine=اخراجات کی رپورٹ لائن
+TF_OTHER=دیگر
+TF_TRIP=نقل و حمل
+TF_LUNCH=دوپہر کا کھانا
+TF_METRO=میٹرو
+TF_TRAIN=ٹرین
+TF_BUS=بس
+TF_CAR=گاڑی
+TF_PEAGE=ٹول
+TF_ESSENCE=ایندھن
+TF_HOTEL=ہوٹل
+TF_TAXI=ٹیکسی
+EX_KME=مائلیج کے اخراجات
+EX_FUE=ایندھن CV
+EX_HOT=ہوٹل
+EX_PAR=پارکنگ سی وی
+EX_TOL=ٹول سی وی
+EX_TAX=مختلف ٹیکس
+EX_IND=معاوضہ ٹرانسپورٹیشن سبسکرپشن
+EX_SUM=بحالی کی فراہمی
+EX_SUO=دفتری سامان
+EX_CAR=کار کرایہ پر لینا
+EX_DOC=دستاویزی
+EX_CUR=وصول کرنے والے صارفین
+EX_OTR=دوسرے وصول کرنے والے
+EX_POS=ڈاک
+EX_CAM=CV کی دیکھ بھال اور مرمت
+EX_EMM=ملازمین کا کھانا
+EX_GUM=مہمانوں کا کھانا
+EX_BRE=ناشتہ
+EX_FUE_VP=ایندھن PV
+EX_TOL_VP=ٹول پی وی
+EX_PAR_VP=پارکنگ پی وی
+EX_CAM_VP=پی وی کی بحالی اور مرمت
+DefaultCategoryCar=ڈیفالٹ ٹرانسپورٹ موڈ
+DefaultRangeNumber=ڈیفالٹ رینج نمبر
+UploadANewFileNow=ابھی ایک نئی دستاویز اپ لوڈ کریں۔
+Error_EXPENSEREPORT_ADDON_NotDefined=خرابی، ماڈیول 'خرچ رپورٹ' کے سیٹ اپ میں اخراجات کی رپورٹ نمبرنگ ریف کے اصول کی وضاحت نہیں کی گئی تھی۔
+ErrorDoubleDeclaration=آپ نے اسی طرح کی تاریخ کی حد میں ایک اور اخراجات کی رپورٹ کا اعلان کیا ہے۔
+AucuneLigne=ابھی تک کوئی اخراجات کی رپورٹ کا اعلان نہیں کیا گیا ہے۔
+ModePaiement=ادائیگی کا طریقہ
+VALIDATOR=منظوری کے لیے ذمہ دار صارف
+VALIDOR=کی طرف سے منظور
+AUTHOR=کی طرف سے ریکارڈ کیا
+AUTHORPAIEMENT=کی طرف سے ادا کیا
+REFUSEUR=کی طرف سے انکار
+CANCEL_USER=کے ذریعے حذف کر دیا گیا۔
+MOTIF_REFUS=وجہ
+MOTIF_CANCEL=وجہ
+DATE_REFUS=تاریخ سے انکار کریں۔
+DATE_SAVE=توثیق کی تاریخ
+DATE_CANCEL=منسوخی کی تاریخ
+DATE_PAIEMENT=ادائیگی کی تاریخ
+ExpenseReportRef=حوالہ اخراجات کی رپورٹ
+ValidateAndSubmit=تصدیق کریں اور منظوری کے لیے جمع کرائیں۔
+ValidatedWaitingApproval=تصدیق شدہ (منظوری کا انتظار ہے)
+NOT_AUTHOR=آپ اس اخراجات کی رپورٹ کے مصنف نہیں ہیں۔ آپریشن منسوخ کر دیا گیا۔
+ConfirmRefuseTrip=کیا آپ واقعی اس اخراجات کی رپورٹ کو مسترد کرنا چاہتے ہیں؟
+ValideTrip=اخراجات کی رپورٹ منظور کریں۔
+ConfirmValideTrip=کیا آپ واقعی اس اخراجات کی رپورٹ کو منظور کرنا چاہتے ہیں؟
+PaidTrip=اخراجات کی رپورٹ ادا کریں۔
+ConfirmPaidTrip=کیا آپ واقعی اس اخراجات کی رپورٹ کی حیثیت کو "ادائیگی" میں تبدیل کرنا چاہتے ہیں؟
+ConfirmCancelTrip=کیا آپ واقعی اس اخراجات کی رپورٹ کو منسوخ کرنا چاہتے ہیں؟
+BrouillonnerTrip=اخراجات کی رپورٹ کو "ڈرافٹ" کی حیثیت پر واپس منتقل کریں
+ConfirmBrouillonnerTrip=کیا آپ واقعی اس اخراجات کی رپورٹ کو "ڈرافٹ" کی حیثیت میں منتقل کرنا چاہتے ہیں؟
+SaveTrip=اخراجات کی رپورٹ کی توثیق کریں۔
+ConfirmSaveTrip=کیا آپ واقعی اس اخراجات کی رپورٹ کی توثیق کرنا چاہتے ہیں؟
+NoTripsToExportCSV=اس مدت کے لیے ایکسپورٹ کرنے کے لیے کوئی اخراجات کی رپورٹ نہیں ہے۔
+ExpenseReportPayment=اخراجات کی رپورٹ کی ادائیگی
+ExpenseReportsToApprove=منظوری کے لیے اخراجات کی رپورٹ
+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 dictionay دیکھیں
+expenseReportPrintExample=آفسیٹ + (d x coef) = %s
+ExpenseReportApplyTo=پر لاگو
+ExpenseReportDomain=درخواست دینے کے لیے ڈومین
+ExpenseReportLimitOn=پر حد
+ExpenseReportDateStart=تاریخ آغاز
+ExpenseReportDateEnd=تاریخ ختم
+ExpenseReportLimitAmount=زیادہ سے زیادہ رقم
+ExpenseReportRestrictive=حد سے تجاوز کرنا
+AllExpenseReport=ہر قسم کے اخراجات کی رپورٹ
+OnExpense=اخراجات کی لکیر
+ExpenseReportRuleSave=اخراجات کی رپورٹ کا اصول محفوظ ہو گیا۔
+ExpenseReportRuleErrorOnSave=خرابی: %s
+RangeNum=رینج %d
+ExpenseReportConstraintViolationError=زیادہ سے زیادہ رقم سے تجاوز کر گیا (قاعدہ %s): %s %s سے زیادہ ہے (حد سے زیادہ)
+byEX_DAY=دن کے لحاظ سے (%s تک کی حد)
+byEX_MON=ماہ کے لحاظ سے (%s تک کی حد)
+byEX_YEA=سال کے لحاظ سے (%s تک کی حد)
+byEX_EXP=لائن کے لحاظ سے (%s تک کی حد)
+ExpenseReportConstraintViolationWarning=زیادہ سے زیادہ رقم سے تجاوز کر گیا (قاعدہ %s): %s %s سے زیادہ ہے (مجاز سے زیادہ)
+nolimitbyEX_DAY=دن کے لحاظ سے (کوئی حد نہیں)
+nolimitbyEX_MON=ماہ کے لحاظ سے (کوئی حد نہیں)
+nolimitbyEX_YEA=سال کے لحاظ سے (کوئی حد نہیں)
+nolimitbyEX_EXP=لائن کے ذریعے (کوئی حد نہیں)
+CarCategory=گاڑیوں کا زمرہ
+ExpenseRangeOffset=آفسیٹ رقم: %s
+RangeIk=مائلیج کی حد
+AttachTheNewLineToTheDocument=اپ لوڈ کردہ دستاویز کے ساتھ لائن منسلک کریں۔
diff --git a/htdocs/langs/ur_PK/users.lang b/htdocs/langs/ur_PK/users.lang
new file mode 100644
index 00000000000..9aeae4e7665
--- /dev/null
+++ b/htdocs/langs/ur_PK/users.lang
@@ -0,0 +1,126 @@
+# Dolibarr language file - Source file is en_US - users
+HRMArea=HRM کا علاقہ
+UserCard=صارف کارڈ
+GroupCard=گروپ کارڈ
+Permission=اجازت
+Permissions=اجازتیں
+EditPassword=پاس ورڈ میں ترمیم کریں۔
+SendNewPassword=دوبارہ تخلیق کریں اور پاس ورڈ بھیجیں۔
+SendNewPasswordLink=Send link to reset password
+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> نئے </u> صارف کو دی جاتی ہیں (موجودہ صارفین کی اجازتوں میں ترمیم کرنے کے لیے، صارف کارڈ پر جائیں)۔
+DolibarrUsers=Dolibarr صارفین
+LastName=آخری نام
+FirstName=پہلا نام
+ListOfGroups=گروپوں کی فہرست
+NewGroup=نیا گروپ
+CreateGroup=گروپ بنائیں
+RemoveFromGroup=گروپ سے نکال دیں۔
+PasswordChangedAndSentTo=پاس ورڈ تبدیل کر کے <b> %s </b> پر بھیج دیا گیا۔
+PasswordChangeRequest=<b> %s </b> کے لیے پاس ورڈ تبدیل کرنے کی درخواست
+PasswordChangeRequestSent=<b> کے لیے پاس ورڈ بدلنے کی درخواست
+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=صارفین اور ان کی خصوصیات
+DomainUser=ڈومین صارف %s
+Reactivate=دوبارہ فعال کریں۔
+CreateInternalUserDesc=یہ فارم آپ کو اپنی کمپنی/تنظیم میں داخلی صارف بنانے کی اجازت دیتا ہے۔ ایک بیرونی صارف (کسٹمر، وینڈر وغیرہ ..) بنانے کے لیے، اس تھرڈ پارٹی کے رابطہ کارڈ سے بٹن 'Create Dolibarr User' استعمال کریں۔
+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=OpenID URL
+LoginUsingOpenID=لاگ ان کرنے کے لیے OpenID استعمال کریں۔
+WeeklyHours=کام کے گھنٹے (فی ہفتہ)
+ExpectedWorkedHours=متوقع گھنٹے فی ہفتہ کام کیا۔
+ColorUser=صارف کا رنگ
+DisabledInMonoUserMode=دیکھ بھال کے موڈ میں غیر فعال
+UserAccountancyCode=صارف اکاؤنٹنگ کوڈ
+UserLogoff=صارف لاگ آؤٹ
+UserLogged=صارف لاگ ان
+DateOfEmployment=ملازمت کی تاریخ
+DateEmployment=روزگار
+DateEmploymentstart=ملازمت شروع ہونے کی تاریخ
+DateEmploymentEnd=ملازمت کی آخری تاریخ
+RangeOfLoginValidity=رسائی کی درستگی کی تاریخ کی حد
+CantDisableYourself=آپ اپنے صارف کے ریکارڈ کو غیر فعال نہیں کر سکتے
+ForceUserExpenseValidator=زبردستی اخراجات کی رپورٹ کی توثیق کرنے والا
+ForceUserHolidayValidator=جبری چھٹی کی درخواست کی تصدیق کنندہ
+ValidatorIsSupervisorByDefault=پہلے سے طے شدہ طور پر، تصدیق کنندہ صارف کا نگران ہوتا ہے۔ اس رویے کو برقرار رکھنے کے لیے خالی رکھیں۔
+UserPersonalEmail=ذاتی ای میل
+UserPersonalMobile=ذاتی موبائل فون
+WarningNotLangOfInterface=تنبیہ، یہ وہ مرکزی زبان ہے جو صارف بولتا ہے، نہ کہ اس انٹرفیس کی زبان جسے دیکھنے کے لیے اس نے چنا ہے۔ اس صارف کے ذریعے نظر آنے والی انٹرفیس کی زبان کو تبدیل کرنے کے لیے، %s ٹیب پر جائیں
diff --git a/htdocs/langs/ur_PK/website.lang b/htdocs/langs/ur_PK/website.lang
new file mode 100644
index 00000000000..c9cce686375
--- /dev/null
+++ b/htdocs/langs/ur_PK/website.lang
@@ -0,0 +1,147 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=کوڈ
+WebsiteSetupDesc=یہاں وہ ویب سائٹس بنائیں جو آپ استعمال کرنا چاہتے ہیں۔ پھر ان میں ترمیم کرنے کے لیے مینو ویب سائٹس میں جائیں۔
+DeleteWebsite=ویب سائٹ کو حذف کریں۔
+ConfirmDeleteWebsite=کیا آپ واقعی اس ویب سائٹ کو حذف کرنا چاہتے ہیں؟ اس کے تمام صفحات اور مواد کو بھی ہٹا دیا جائے گا۔ اپ لوڈ کی گئی فائلیں (جیسے میڈیا ڈائرکٹری، ECM ماڈیول، ...) باقی رہیں گی۔
+WEBSITE_TYPE_CONTAINER=صفحہ/کنٹینر کی قسم
+WEBSITE_PAGE_EXAMPLE=مثال کے طور پر استعمال کرنے کے لیے ویب صفحہ
+WEBSITE_PAGENAME=صفحہ کا نام/عرف
+WEBSITE_ALIASALT=صفحہ کے متبادل نام/عرف
+WEBSITE_ALIASALTDesc=یہاں دوسرے نام/عرفوں کی فہرست استعمال کریں تاکہ صفحہ تک ان دیگر ناموں/عرفوں کا استعمال کرتے ہوئے بھی رسائی حاصل کی جا سکے (مثال کے طور پر پرانے لنک/نام پر بیک لنک کو کام کرنے کے لیے عرف کا نام تبدیل کرنے کے بعد پرانا نام)۔ نحو ہے: <br> متبادل نام1، متبادل نام2، ...
+WEBSITE_CSS_URL=بیرونی CSS فائل کا URL
+WEBSITE_CSS_INLINE=CSS فائل کا مواد (تمام صفحات پر عام)
+WEBSITE_JS_INLINE=جاوا اسکرپٹ فائل کا مواد (تمام صفحات پر عام)
+WEBSITE_HTML_HEADER=HTML ہیڈر کے نیچے اضافہ (تمام صفحات پر عام)
+WEBSITE_ROBOT=روبوٹ فائل (robots.txt)
+WEBSITE_HTACCESS=ویب سائٹ .htaccess فائل
+WEBSITE_MANIFEST_JSON=ویب سائٹ manifest.json فائل
+WEBSITE_README=README.md فائل
+WEBSITE_KEYWORDSDesc=اقدار کو الگ کرنے کے لیے کوما کا استعمال کریں۔
+EnterHereLicenseInformation=README.md فائل کو بھرنے کے لیے یہاں میٹا ڈیٹا یا لائسنس کی معلومات درج کریں۔ اگر آپ اپنی ویب سائٹ کو ٹیمپلیٹ کے طور پر تقسیم کرتے ہیں، تو فائل کو آزمائشی پیکیج میں شامل کیا جائے گا۔
+HtmlHeaderPage=HTML ہیڈر (صرف اس صفحہ کے لیے مخصوص)
+PageNameAliasHelp=صفحہ کا نام یا عرف۔ <br> یہ عرف 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=id %s کے ساتھ درخواست کردہ صفحہ پر ابھی تک کوئی مواد نہیں ہے، یا کیش فائل .tpl.php کو ہٹا دیا گیا ہے۔ اس کو حل کرنے کے لیے صفحہ کے مواد میں ترمیم کریں۔
+SiteDeleted=ویب سائٹ '%s' حذف کر دی گئی۔
+PageContent=صفحہ/کونٹینیئر
+PageDeleted=ویب سائٹ %s کا صفحہ/کنٹینیئر '%s' حذف کر دیا گیا
+PageAdded=صفحہ/Contenair '%s' شامل کر دیا گیا۔
+ViewSiteInNewTab=سائٹ کو نئے ٹیب میں دیکھیں
+ViewPageInNewTab=نئے ٹیب میں صفحہ دیکھیں
+SetAsHomePage=ہوم پیج سیٹ کریں
+RealURL=اصلی URL
+ViewWebsiteInProduction=ہوم یو آر ایل کا استعمال کرتے ہوئے ویب سائٹ دیکھیں
+SetHereVirtualHost= اپاچی کے ساتھ <u> استعمال / NGinx / ... </u> <br> آپ کے ویب سرور پر تخلیق کریں (اپاچی، Nginx ...) پی ایچ پی کے ساتھ ایک سرشار مجازی میزبان فعال اور پر ایک روٹ ڈائریکٹری <br> <strong> %s </strong>
+ExampleToUseInApacheVirtualHostConfig=اپاچی ورچوئل ہوسٹ سیٹ اپ میں استعمال کرنے کی مثال:
+YouCanAlsoTestWithPHPS= پر <br> PHP سرایت سرور </u> ساتھ <u> استعمال کے ماحول کی ترقی، آپ <br> <strong> PHP -S 0.0.0.0:8080 -t %s </strong> چلا کر PHP سرایت ویب سرور کے ساتھ سائٹ (PHP 5.5 درکار) کی جانچ کے لیے پسند کر سکتے ہیں
+YouCanAlsoDeployToAnotherWHP= <u> اپنی ویب سائٹ کو کسی اور Dolibarr ہوسٹنگ فراہم کنندہ کے ساتھ چلائیں ویب سائٹ ماڈیول کے ساتھ انضمام۔ آپ کچھ ڈولیبر ہوسٹنگ فراہم کنندگان کی فہرست <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a> پر حاصل کر سکتے ہیں۔
+CheckVirtualHostPerms=یہ بھی چیک کریں کہ ورچوئل ہوسٹ صارف (مثال کے طور پر www-data) کے پاس <strong> <strong> %s </strong> فائلوں پر <br> a0e784394947c80947c08080847cfc9z0 اجازتیں ہیں۔
+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> ایک نئے ٹیب میں %s کا جائزہ لیں۔ </u> <br> <br> %s Dolibarr سرور کے ذریعہ پیش کیا جائے گا لہذا اسے انسٹال کرنے کے لئے کسی اضافی ویب سرور (جیسے Apache, Nginx, IIS) کی ضرورت نہیں ہے۔ <br> تکلیف یہ ہے کہ صفحات کے یو آر ایل صارف دوست نہیں ہیں اور آپ کے ڈولیبر کے راستے سے شروع ہوتے ہیں۔ <br> URL Dolibarr طرف سے کی خدمت: <br> <strong> %s </strong> <br> اس ویب سائٹ کی خدمت کو اپنے ویب سرور پر ایک مجازی میزبان پیدا کرنے کے لئے آپ کی اپنی بیرونی ویب سرور کا استعمال کرنے کے <br> کہ ڈائریکٹری پر پوائنٹس <br> <strong> %s </strong> <br> پھر اس مجازی سرور کا نام درج کریں اس ویب سائٹ کی خصوصیات میں اور "Test/deploy on the web" کے لنک پر کلک کریں۔
+VirtualHostUrlNotDefined=بیرونی ویب سرور کے ذریعہ پیش کردہ ورچوئل ہوسٹ کا URL متعین نہیں ہے۔
+NoPageYet=ابھی تک کوئی صفحہ نہیں ہے۔
+YouCanCreatePageOrImportTemplate=آپ ایک نیا صفحہ بنا سکتے ہیں یا مکمل ویب سائٹ ٹیمپلیٹ درآمد کر سکتے ہیں۔
+SyntaxHelp=مخصوص نحوی نکات پر مدد کریں۔
+YouCanEditHtmlSourceckeditor=آپ ایڈیٹر میں "ماخذ" بٹن کا استعمال کرتے ہوئے HTML سورس کوڈ میں ترمیم کر سکتے ہیں۔
+YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> آپ PHP کوڈ کو اس سورس میں <strong> &lt;?php ?a0010dc درج ذیل عالمی متغیر دستیاب ہیں: $conf، $db، $mysoc، $user، $website، $websitepage، $weblangs، $pagelangs۔ <br> <br> <span class="fa fa-bug"> </span> آپ مندرجہ ذیل نحو کے ساتھ ایک اور صفحہ / کنٹینر کے مواد شامل کر سکتے ہیں:؟ <br> <strong> &lt; PHP includeContainer ( 'alias_of_container_to_include')؛ ؟ &gt; </strong> <br> <br> <span class="fa fa-bug"> </span> آپ مندرجہ ذیل نحو کے ساتھ ایک اور صفحہ / کنٹینر کو ری بنا سکتے ہیں (نوٹ: نہ پیداوار ایک ری سے پہلے کسی بھی مواد کو ایسا): <br> <strong> &lt; PHP redirectToContainer ( 'alias_of_container_to_redirect_to')؛ ؟ &gt; </strong> <br> <br> <span class="fa fa-link"> </span>، ایک اور صفحے پر ایک لنک شامل کرنے کے لئے نحو کا استعمال: <strong> دستاویزات میں ذخیرہ کردہ فائل </strong> لوڈ کرنے کے لئے ایک <strong> لنک شامل کرنا <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> ڈائریکٹری، <strong> document.php </strong> چادر استعمال: دستاویزات / ECM میں ایک فائل کے لئے، <br> مثال (لاگ ان کرنے کی ضرورت ہے)، نحو ہے؟ <br> <strong> &lt;a href کی = "/ document.php modulepart = ECM & فائل = [relative_dir / فائل کا نام "/document.php؟modulepart=medias&file=[relative_dir/]filename.ext"&gt; </strong> <br> ایک حصہ لنک (فائل کے اشتراک کا ہیش کلید کا استعمال کرتے ہوئے کھلی رسائی) کے ساتھ اشتراک ایک فائل کے طور پر، نحو ہے: <br> <strong> &lt;a href کی =" (دستاویزات / میڈیاز میں ایک تصویر کے طور پر، <br> مثال کھلے: /document.php؟hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> ڈائریکٹری </strong> <strong> دستاویزات میں ذخیرہ کردہ ایک <strong> تصویر </strong> <strong> viewimage.php </strong> چادر استعمال کرتے ہیں، شامل کرنے کے لئے </span> عوامی رسائی کے لئے ڈائریکٹری)، نحو ہے: <br> <strong> &lt;img ایسآرسی = "؟ / viewimage.php modulepart = medias&amp;file = [relative_dir /] filename.ext" &gt; </strong> <br>
+#YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource2=شیئر لنک کے ساتھ شیئر کردہ تصویر کے لیے (فائل کی شیئرنگ ہیش کلید کا استعمال کرتے ہوئے کھلی رسائی)، نحو یہ ہے: <br> <strong> &lt;img src="/viewimage.php?hashp=1234256a...20120ccd07800d50d50d50d5080cd57800mg
+YouCanEditHtmlSourceMore= <br> HTML یا متحرک کوڈ کی مزید مثالیں <a href="%s" target="_blank" rel="noopener noreferrer external"> پر دستیاب ہیں ویکی دستاویزات </a> <br> ۔
+ClonePage=کلون صفحہ/کنٹینر
+CloneSite=کلون سائٹ
+SiteAdded=ویب سائٹ شامل کی گئی۔
+ConfirmClonePage=براہ کرم نئے صفحہ کا کوڈ/عرف درج کریں اور اگر یہ کلون شدہ صفحہ کا ترجمہ ہے۔
+PageIsANewTranslation=نیا صفحہ موجودہ صفحہ کا ترجمہ ہے؟
+LanguageMustNotBeSameThanClonedPage=آپ ترجمہ کے طور پر ایک صفحہ کلون کرتے ہیں۔ نئے صفحہ کی زبان ماخذ صفحہ کی زبان سے مختلف ہونی چاہیے۔
+ParentPageId=پیرنٹ پیج ID
+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=انتباہ: ایک بیرونی ویب صفحہ درآمد کرکے ویب صفحہ بنانا تجربہ کار صارفین کے لیے مخصوص ہے۔ ماخذ صفحہ کی پیچیدگی پر منحصر ہے، درآمد کا نتیجہ اصل سے مختلف ہو سکتا ہے۔ نیز اگر سورس پیج عام سی ایس ایس اسٹائلز یا متضاد جاوا اسکرپٹ استعمال کرتا ہے، تو اس صفحہ پر کام کرتے وقت یہ ویب سائٹ ایڈیٹر کی شکل یا خصوصیات کو توڑ سکتا ہے۔ یہ طریقہ صفحہ بنانے کا ایک تیز ترین طریقہ ہے لیکن یہ تجویز کیا جاتا ہے کہ آپ اپنا نیا صفحہ شروع سے یا تجویز کردہ صفحہ ٹیمپلیٹ سے بنائیں۔ <br> یہ بھی نوٹ کریں کہ جب پکڑے گئے بیرونی صفحہ پر استعمال کیا جائے تو ان لائن ایڈیٹر درست طریقے سے کام نہیں کر سکتا۔
+OnlyEditionOfSourceForGrabbedContent=HTML ماخذ کا صرف ایڈیشن ہی ممکن ہے جب مواد کسی بیرونی سائٹ سے پکڑا گیا ہو۔
+GrabImagesInto=سی ایس ایس اور صفحہ میں پائی جانے والی تصاویر کو بھی پکڑو۔
+ImagesShouldBeSavedInto=تصاویر کو ڈائریکٹری میں محفوظ کیا جانا چاہیے۔
+WebsiteRootOfImages=ویب سائٹ کی تصاویر کے لیے روٹ ڈائرکٹری
+SubdirOfPage=ذیلی ڈائرکٹری صفحہ کے لیے وقف ہے۔
+AliasPageAlreadyExists=عرفی صفحہ <strong> %s </strong> پہلے سے موجود ہے
+CorporateHomePage=کارپوریٹ ہوم پیج
+EmptyPage=خالی صفحہ
+ExternalURLMustStartWithHttp=بیرونی URL کا آغاز http:// یا https:// سے ہونا چاہیے
+ZipOfWebsitePackageToImport=ویب سائٹ ٹیمپلیٹ پیکج کی زپ فائل اپ لوڈ کریں۔
+ZipOfWebsitePackageToLoad=یا ایک دستیاب ایمبیڈڈ ویب سائٹ ٹیمپلیٹ پیکیج کا انتخاب کریں۔
+ShowSubcontainers=متحرک مواد دکھائیں۔
+InternalURLOfPage=صفحہ کا اندرونی URL
+ThisPageIsTranslationOf=یہ صفحہ/کنٹینر کا ترجمہ ہے۔
+ThisPageHasTranslationPages=اس صفحہ/کنٹینر میں ترجمہ ہے۔
+NoWebSiteCreateOneFirst=ابھی تک کوئی ویب سائٹ نہیں بنائی گئی۔ پہلے ایک بنائیں۔
+GoTo=کے پاس جاؤ
+DynamicPHPCodeContainsAForbiddenInstruction=آپ ڈائنامک پی ایچ پی کوڈ شامل کرتے ہیں جس میں پی ایچ پی انسٹرکشن '<strong> %s </strong>' شامل ہوتا ہے جو بطور ڈیفالٹ ممنوع ہوتا ہے بطور ڈائنامک مواد (دیکھیں پوشیدہ آپشنز آف کمانڈ پی ایچ پی_ایل ایکس ایکس کی اجازت دی گئی فہرست WELOBS_XX کو بڑھانے کے لیے)۔
+NotAllowedToAddDynamicContent=آپ کو ویب سائٹس میں پی ایچ پی کے متحرک مواد کو شامل یا ترمیم کرنے کی اجازت نہیں ہے۔ اجازت طلب کریں یا صرف کوڈ کو پی ایچ پی ٹیگز میں غیر ترمیم شدہ رکھیں۔
+ReplaceWebsiteContent=ویب سائٹ کا مواد تلاش کریں یا تبدیل کریں۔
+DeleteAlsoJs=اس ویب سائٹ سے متعلق تمام جاوا اسکرپٹ فائلوں کو بھی حذف کریں؟
+DeleteAlsoMedias=اس ویب سائٹ سے متعلق تمام میڈیا فائلوں کو بھی حذف کریں؟
+MyWebsitePages=میری ویب سائٹ کے صفحات
+SearchReplaceInto=تلاش کریں | میں تبدیل کریں۔
+ReplaceString=نئی تار
+CSSContentTooltipHelp=یہاں CSS مواد درج کریں۔ ایپلیکیشن کے CSS کے ساتھ کسی بھی تنازعہ سے بچنے کے لیے، تمام ڈیکلریشن کو .bodywebsite کلاس کے ساتھ شامل کرنا یقینی بنائیں۔ مثال کے طور پر: <br> <br> #mycssselector، input.myclass: ہور {...} <br> نوٹ <br>: ہور {...} <br> <br> .bodywebsite #mycssselector، .bodywebsite input.myclass ہونا ضروری ہے آپ کے بغیر ایک بڑی فائل ہے تو یہ سابقہ، آپ اسے تبدیل کرنے کے لیے 'lessc' استعمال کر سکتے ہیں تاکہ ہر جگہ .bodywebsite کا سابقہ شامل کر سکیں۔
+LinkAndScriptsHereAreNotLoadedInEditor=انتباہ: یہ مواد صرف اس وقت آؤٹ پٹ ہوتا ہے جب سرور سے سائٹ تک رسائی حاصل کی جاتی ہے۔ یہ ایڈٹ موڈ میں استعمال نہیں ہوتا ہے لہذا اگر آپ کو جاوا اسکرپٹ فائلوں کو ایڈٹ موڈ میں بھی لوڈ کرنے کی ضرورت ہے تو صرف صفحہ میں اپنا ٹیگ 'script src=...' شامل کریں۔
+Dynamiccontent=متحرک مواد والے صفحہ کا نمونہ
+ImportSite=ویب سائٹ ٹیمپلیٹ درآمد کریں۔
+EditInLineOnOff=موڈ 'ان لائن میں ترمیم کریں' %s ہے۔
+ShowSubContainersOnOff='متحرک مواد' کو انجام دینے کا طریقہ %s ہے۔
+GlobalCSSorJS=ویب سائٹ کی گلوبل CSS/JS/ہیڈر فائل
+BackToHomePage=ہوم پیج پر واپس...
+TranslationLinks=ترجمہ لنکس
+YouTryToAccessToAFileThatIsNotAWebsitePage=آپ کسی ایسے صفحہ تک رسائی حاصل کرنے کی کوشش کرتے ہیں جو دستیاب نہیں ہے۔ <br> (ref=%s, type=%s, status=%s)
+UseTextBetween5And70Chars=SEO کے اچھے طریقوں کے لیے، 5 اور 70 حروف کے درمیان متن استعمال کریں۔
+MainLanguage=مرکزی زبان
+OtherLanguages=دوسری زبانیں
+UseManifest=manifest.json فائل فراہم کریں۔
+PublicAuthorAlias=عوامی مصنف عرف
+AvailableLanguagesAreDefinedIntoWebsiteProperties=دستیاب زبانوں کو ویب سائٹ کی خصوصیات میں بیان کیا گیا ہے۔
+ReplacementDoneInXPages=تبدیلی %s صفحات یا کنٹینرز میں کی گئی ہے۔
+RSSFeed=آر ایس ایس فیڈ
+RSSFeedDesc=آپ اس URL کا استعمال کرتے ہوئے 'blogpost' کی قسم کے ساتھ تازہ ترین مضامین کی RSS فیڈ حاصل کر سکتے ہیں۔
+PagesRegenerated=%s صفحہ/کنٹینر دوبارہ تیار کیا گیا
+RegenerateWebsiteContent=ویب سائٹ کیش فائلوں کو دوبارہ تخلیق کریں۔
+AllowedInFrames=فریموں میں اجازت ہے۔
+DefineListOfAltLanguagesInWebsiteProperties=ویب سائٹ کی خصوصیات میں تمام دستیاب زبانوں کی فہرست کی وضاحت کریں۔
+GenerateSitemaps=ویب سائٹ کا نقشہ فائل بنائیں
+ConfirmGenerateSitemaps=اگر آپ تصدیق کرتے ہیں، تو آپ موجودہ سائٹ میپ فائل کو مٹا دیں گے...
+ConfirmSitemapsCreation=سائٹ کا نقشہ تیار کرنے کی تصدیق کریں۔
+SitemapGenerated=سائٹ کا نقشہ فائل <b> %s </b> تیار کیا گیا
+ImportFavicon=فیویکان
+ErrorFaviconType=Favicon png ہونا چاہیے۔
+ErrorFaviconSize=فیویکن کا سائز 16x16، 32x32 یا 64x64 ہونا چاہیے۔
+FaviconTooltip=ایک تصویر اپ لوڈ کریں جس کا png ہونا ضروری ہے (16x16، 32x32 یا 64x64)
diff --git a/htdocs/langs/ur_PK/withdrawals.lang b/htdocs/langs/ur_PK/withdrawals.lang
new file mode 100644
index 00000000000..11f9cc76b26
--- /dev/null
+++ b/htdocs/langs/ur_PK/withdrawals.lang
@@ -0,0 +1,156 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=براہ راست ڈیبٹ آرڈرز کے ذریعے ادائیگی
+SuppliersStandingOrdersArea=کریڈٹ ٹرانسفر کے ذریعے ادائیگی
+StandingOrdersPayment=براہ راست ڈیبٹ ادائیگی کے احکامات
+StandingOrderPayment=براہ راست ڈیبٹ ادائیگی کا آرڈر
+NewStandingOrder=نیا ڈائریکٹ ڈیبٹ آرڈر
+NewPaymentByBankTransfer=کریڈٹ ٹرانسفر کے ذریعے نئی ادائیگی
+StandingOrderToProcess=عمل کے لئے
+PaymentByBankTransferReceipts=کریڈٹ ٹرانسفر آرڈرز
+PaymentByBankTransferLines=کریڈٹ ٹرانسفر آرڈر لائنز
+WithdrawalsReceipts=براہ راست ڈیبٹ آرڈرز
+WithdrawalReceipt=براہ راست ڈیبٹ آرڈر
+BankTransferReceipts=کریڈٹ ٹرانسفر آرڈرز
+BankTransferReceipt=کریڈٹ ٹرانسفر آرڈر
+LatestBankTransferReceipts=تازہ ترین %s کریڈٹ ٹرانسفر آرڈرز
+LastWithdrawalReceipts=تازہ ترین %s ڈائریکٹ ڈیبٹ فائلیں۔
+WithdrawalsLine=ڈائریکٹ ڈیبٹ آرڈر لائن
+CreditTransfer=Credit transfer
+CreditTransferLine=کریڈٹ ٹرانسفر لائن
+WithdrawalsLines=ڈائریکٹ ڈیبٹ آرڈر لائنز
+CreditTransferLines=کریڈٹ ٹرانسفر لائنز
+RequestStandingOrderToTreat=کارروائی کے لیے براہ راست ڈیبٹ ادائیگی کے آرڈر کی درخواستیں۔
+RequestStandingOrderTreated=براہ راست ڈیبٹ ادائیگی کے آرڈر کی درخواستوں پر کارروائی ہو گئی۔
+RequestPaymentsByBankTransferToTreat=عمل میں کریڈٹ کی منتقلی کی درخواستیں۔
+RequestPaymentsByBankTransferTreated=کریڈٹ ٹرانسفر کی درخواستوں پر کارروائی ہو گئی۔
+NotPossibleForThisStatusOfWithdrawReceiptORLine=ابھی تک ممکن نہیں۔ مخصوص خطوط پر مسترد ہونے کا اعلان کرنے سے پہلے واپسی کی حیثیت کو 'کریڈیٹڈ' پر سیٹ کرنا ضروری ہے۔
+NbOfInvoiceToWithdraw=براہ راست ڈیبٹ آرڈر کے انتظار کے ساتھ اہل کسٹمر انوائسز کی تعداد
+NbOfInvoiceToWithdrawWithInfo=بینک اکاؤنٹ کی معلومات کے ساتھ براہ راست ڈیبٹ ادائیگی کے آرڈر کے ساتھ کسٹمر انوائس کی تعداد
+NbOfInvoiceToPayByBankTransfer=کریڈٹ ٹرانسفر کے ذریعے ادائیگی کا انتظار کرنے والے کوالیفائیڈ سپلائر انوائسز کی تعداد
+SupplierInvoiceWaitingWithdraw=وینڈر انوائس کریڈٹ ٹرانسفر کے ذریعے ادائیگی کا انتظار کر رہا ہے۔
+InvoiceWaitingWithdraw=انوائس براہ راست ڈیبٹ کا انتظار کر رہا ہے۔
+InvoiceWaitingPaymentByBankTransfer=انوائس کریڈٹ ٹرانسفر کا انتظار کر رہی ہے۔
+AmountToWithdraw=واپس لینے کی رقم
+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=Classify debited
+ClassCreditedConfirm=کیا آپ واقعی اس رقم نکلوانے کی رسید کو اپنے بینک اکاؤنٹ میں کریڈٹ کے طور پر درجہ بندی کرنا چاہتے ہیں؟
+TransData=ترسیل کی تاریخ
+TransMetod=ترسیل کا طریقہ
+Send=بھیجیں
+Lines=لکیریں
+StandingOrderReject=ایک مسترد جاری کریں۔
+WithdrawsRefused=براہ راست ڈیبٹ سے انکار کر دیا۔
+WithdrawalRefused=واپس لینے سے انکار کر دیا۔
+CreditTransfersRefused=کریڈٹ ٹرانسفر سے انکار کر دیا گیا۔
+WithdrawalRefusedConfirm=کیا آپ کو یقین ہے کہ آپ سوسائٹی کے لیے واپسی کا ردِ عمل درج کرنا چاہتے ہیں؟
+RefusedData=مسترد ہونے کی تاریخ
+RefusedReason=انکار کی وجہ
+RefusedInvoicing=مسترد کرنے کا بل دینا
+NoInvoiceRefused=مسترد ہونے کا الزام نہ لگائیں۔
+InvoiceRefused=انوائس سے انکار کر دیا گیا (کسٹمر سے مسترد ہونے کا چارج)
+StatusDebitCredit=اسٹیٹس ڈیبٹ/کریڈٹ
+StatusWaiting=انتظار کر رہا ہے۔
+StatusTrans=بھیجا
+StatusDebited=ڈیبٹ
+StatusCredited=کریڈٹ
+StatusPaid=ادا کیا
+StatusRefused=انکار کر دیا
+StatusMotif0=غیر متعینہ
+StatusMotif1=ناکافی فنڈز
+StatusMotif2=درخواست کا مقابلہ کیا گیا۔
+StatusMotif3=کوئی براہ راست ڈیبٹ ادائیگی کا آرڈر نہیں ہے۔
+StatusMotif4=سیلز آرڈر
+StatusMotif5=RIB ناقابل استعمال
+StatusMotif6=بیلنس کے بغیر اکاؤنٹ
+StatusMotif7=عدالتی فیصلہ
+StatusMotif8=دوسری وجہ
+CreateForSepaFRST=براہ راست ڈیبٹ فائل بنائیں (SEPA FRST)
+CreateForSepaRCUR=براہ راست ڈیبٹ فائل بنائیں (SEPA RCUR)
+CreateAll=ڈائریکٹ ڈیبٹ فائل بنائیں
+CreateFileForPaymentByBankTransfer=کریڈٹ ٹرانسفر کے لیے فائل بنائیں
+CreateSepaFileForPaymentByBankTransfer=کریڈٹ ٹرانسفر فائل بنائیں (SEPA)
+CreateGuichet=صرف دفتر
+CreateBanque=صرف بینک
+OrderWaiting=علاج کا انتظار ہے۔
+NotifyTransmision=آرڈر کی فائل ٹرانسمیشن کو ریکارڈ کریں۔
+NotifyCredit=آرڈر کا ریکارڈ کریڈٹ
+NumeroNationalEmetter=قومی ٹرانسمیٹر نمبر
+WithBankUsingRIB=RIB استعمال کرنے والے بینک اکاؤنٹس کے لیے
+WithBankUsingBANBIC=IBAN/BIC/SWIFT استعمال کرنے والے بینک اکاؤنٹس کے لیے
+BankToReceiveWithdraw=بینک اکاؤنٹ وصول کرنا
+BankToPayCreditTransfer=ادائیگی کے ذریعہ کے طور پر استعمال ہونے والا بینک اکاؤنٹ
+CreditDate=پر کریڈٹ
+WithdrawalFileNotCapable=آپ کے ملک %s (آپ کا ملک تعاون یافتہ نہیں ہے) کے لیے رقم نکلوانے کی رسید بنانے میں ناکام
+ShowWithdraw=براہ راست ڈیبٹ آرڈر دکھائیں۔
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=تاہم، اگر انوائس میں کم از کم ایک براہ راست ڈیبٹ ادائیگی کا آرڈر ابھی تک پروسیس نہیں ہوا ہے، تو اسے پہلے سے نکالنے کے انتظام کی اجازت دینے کے لیے بطور ادائیگی سیٹ نہیں کیا جائے گا۔
+DoStandingOrdersBeforePayments=یہ ٹیب آپ کو براہ راست ڈیبٹ ادائیگی کے آرڈر کی درخواست کرنے کی اجازت دیتا ہے۔ ایک بار مکمل ہوجانے کے بعد، مینو میں جائیں Bank->براہ راست ڈیبٹ کے ذریعے ادائیگی تاکہ ڈائریکٹ ڈیبٹ آرڈر تیار کریں اور اس کا نظم کریں۔ ڈائریکٹ ڈیبٹ آرڈر بند ہونے پر، انوائسز پر ادائیگی خود بخود ریکارڈ ہو جائے گی، اور اگر ادائیگی باقی ہے تو انوائسز بند ہو جائیں گی۔
+DoCreditTransferBeforePayments=یہ ٹیب آپ کو کریڈٹ ٹرانسفر آرڈر کی درخواست کرنے کی اجازت دیتا ہے۔ ایک بار مکمل ہوجانے کے بعد، مینو میں جائیں بینک-> کریڈٹ ٹرانسفر کے ذریعے ادائیگی کریڈٹ ٹرانسفر آرڈر تیار کرنے اور اس کا نظم کرنے کے لیے۔ جب کریڈٹ ٹرانسفر آرڈر بند ہو جائے گا، انوائس پر ادائیگی خود بخود ریکارڈ ہو جائے گی، اور اگر ادائیگی باقی ہے تو انوائسز بند ہو جائیں گی۔
+WithdrawalFile=ڈیبٹ آرڈر فائل
+CreditTransferFile=کریڈٹ ٹرانسفر فائل
+SetToStatusSent="فائل بھیجی گئی" کی حیثیت پر سیٹ کریں
+ThisWillAlsoAddPaymentOnInvoice=یہ انوائس پر ادائیگیوں کو بھی ریکارڈ کرے گا اور اگر ادائیگی کرنا باقی ہے تو اسے "ادائیگی" کے طور پر درجہ بندی کرے گا
+StatisticsByLineStatus=لائنوں کی حیثیت کے لحاظ سے اعدادوشمار
+RUM=UMR
+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=پھانسی کی تاریخ
+CreateForSepa=ڈائریکٹ ڈیبٹ فائل بنائیں
+ICS=کریڈٹ کنندہ شناخت کنندہ - ICS
+END_TO_END="EndToEndId" SEPA XML ٹیگ - فی ٹرانزیکشن تفویض کردہ منفرد شناخت
+USTRD="غیر ساختہ" SEPA XML ٹیگ
+ADDDAYS=عملدرآمد کی تاریخ میں دن شامل کریں۔
+NoDefaultIBANFound=اس تیسرے فریق کے لیے کوئی ڈیفالٹ IBAN نہیں ملا
+### Notifications
+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=id %s والی کمپنی کے پاس ایک سے زیادہ ڈیفالٹ بینک اکاؤنٹ ہیں۔ یہ جاننے کا کوئی طریقہ نہیں کہ کون سا استعمال کرنا ہے۔
+ErrorICSmissing=بینک اکاؤنٹ %s میں ICS غائب ہے۔
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=براہ راست ڈیبٹ آرڈر کی کل رقم لائنوں کے مجموعے سے مختلف ہے۔
+WarningSomeDirectDebitOrdersAlreadyExists=انتباہ: پہلے سے ہی کچھ زیر التواء ڈائریکٹ ڈیبٹ آرڈرز (%s) کی درخواست کی گئی ہے %s
+WarningSomeCreditTransferAlreadyExists=انتباہ: پہلے سے ہی کچھ زیر التواء کریڈٹ ٹرانسفر (%s) کی درخواست کی گئی ہے %s کی رقم
diff --git a/htdocs/langs/ur_PK/workflow.lang b/htdocs/langs/ur_PK/workflow.lang
new file mode 100644
index 00000000000..552890cec33
--- /dev/null
+++ b/htdocs/langs/ur_PK/workflow.lang
@@ -0,0 +1,30 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=ورک فلو ماڈیول سیٹ اپ
+WorkflowDesc=یہ ماڈیول کچھ خودکار کارروائیاں فراہم کرتا ہے۔ پہلے سے طے شدہ طور پر، ورک فلو کھلا ہے (آپ اپنی مرضی کے مطابق چیزیں کر سکتے ہیں) لیکن یہاں آپ کچھ خودکار کارروائیوں کو چالو کر سکتے ہیں۔
+ThereIsNoWorkflowToModify=فعال ماڈیولز کے ساتھ ورک فلو میں کوئی ترمیم دستیاب نہیں ہے۔
+# Autocreate
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=تجارتی تجویز پر دستخط ہونے کے بعد خودکار طور پر سیلز آرڈر بنائیں (نئے آرڈر میں پروپوزل کے برابر رقم ہوگی)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=تجارتی تجویز پر دستخط ہونے کے بعد خودکار طور پر ایک کسٹمر انوائس بنائیں (نئے انوائس میں پروپوزل کے برابر رقم ہوگی)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=معاہدے کی توثیق کے بعد خودکار طور پر ایک کسٹمر انوائس بنائیں
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=سیلز آرڈر بند ہونے کے بعد خودکار طور پر کسٹمر انوائس بنائیں (نئے انوائس میں آرڈر کے برابر رقم ہوگی)
+# Autoclassify customer proposal or order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=جب سیلز آرڈر کو بل پر سیٹ کیا جاتا ہے تو لنکڈ سورس پروپوزل کو بطور بل کی درجہ بندی کریں (اور اگر آرڈر کی رقم دستخط شدہ لنکڈ پروپوزل کی کل رقم کے برابر ہے)
+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_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=جب وینڈر انوائس کی توثیق کی جاتی ہے تو لنکڈ سورس پرچیز آرڈر کو بل کے طور پر درجہ بندی کریں (اور اگر انوائس کی رقم منسلک آرڈر کی کل رقم کے برابر ہے)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=جب کسی استقبالیہ کی توثیق ہو جاتی ہے تو منسلک ذریعہ خریداری کے آرڈر کو موصول ہونے کے مطابق درجہ بندی کریں (اور اگر تمام استقبالیوں کو موصول ہونے والی مقدار وہی ہے جو اپ ڈیٹ کرنے کے لیے خریداری آرڈر میں ہے)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=ریسیپشن بند ہونے پر موصول ہونے والے لنکڈ سورس پرچیز آرڈر کی درجہ بندی کریں (اور اگر تمام ریسپشنز کو موصول ہونے والی مقدار وہی ہے جو اپ ڈیٹ کرنے کے لیے خریداری آرڈر میں ہے)
+# Autoclassify purchase invoice
+descWORKFLOW_BILL_ON_RECEPTION=جب کسی منسلک سپلائر آرڈر کی توثیق ہو جاتی ہے تو استقبالیہ کو "بل شدہ" میں درجہ بندی کریں۔
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=ٹکٹ بند ہونے پر ٹکٹ سے منسلک تمام مداخلتوں کو بند کر دیں۔
+AutomaticCreation=خودکار تخلیق
+AutomaticClassification=خودکار درجہ بندی
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=جب کسٹمر انوائس کی توثیق ہو جائے تو لنک شدہ سورس شپمنٹ کو بند کے طور پر درجہ بندی کریں۔
diff --git a/htdocs/langs/ur_PK/zapier.lang b/htdocs/langs/ur_PK/zapier.lang
new file mode 100644
index 00000000000..e47659b3837
--- /dev/null
+++ b/htdocs/langs/ur_PK/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 = Dolibarr کے لئے Zapier
+ModuleZapierForDolibarrDesc = Dolibarr ماڈیول کے لئے Zapier
+ZapierForDolibarrSetup=Dolibarr کے لیے Zapier کا سیٹ اپ
+ZapierDescription=Zapier کے ساتھ انٹرفیس
+ZapierAbout=ماڈیول Zapier کے بارے میں
+ZapierSetupPage=Zapier استعمال کرنے کے لیے Dolibarr سائیڈ پر سیٹ اپ کی ضرورت نہیں ہے۔ تاہم، Dolibarr کے ساتھ Zapier استعمال کرنے کے قابل ہونے کے لیے آپ کو zapier پر ایک پیکیج بنانا اور شائع کرنا چاہیے۔ <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> اس ویکی پیج پر دستاویزات دیکھیں </a>۔
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index 64d727deaf0..7c04ed15532 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=EEC tarkibiga kirmagan mamlakatlar
 CountriesInEECExceptMe=%s dan tashqari EECdagi mamlakatlar
 CountriesExceptMe=%s dan tashqari barcha mamlakatlar
 AccountantFiles=Dastlabki hujjatlarni eksport qilish
-ExportAccountingSourceDocHelp=Ushbu vosita yordamida siz buxgalteriya hisobini yaratish uchun foydalanilgan manba hodisalarini (CSV va PDF-lardagi ro'yxat) eksport qilishingiz mumkin.
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
 ExportAccountingSourceDocHelp2=Jurnallaringizni eksport qilish uchun %s - %s menyu yozuvidan foydalaning.
 VueByAccountAccounting=Buxgalteriya hisobi bo'yicha ko'rish
 VueBySubAccountAccounting=Buxgalteriya subkontaji bo'yicha ko'rish
@@ -286,7 +286,7 @@ ValidateMovements=Harakatlarni tasdiqlang
 DescValidateMovements=Yozishni, xatlarni va o'chirishni har qanday o'zgartirish yoki o'chirish taqiqlanadi. Jismoniy mashqlar uchun barcha yozuvlar tasdiqlanishi kerak, aks holda yopish mumkin bo'lmaydi
 
 ValidateHistory=Avtomatik bog'lash
-AutomaticBindingDone=Avtomatik ulanish amalga oshirildi
+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=Harakat to'g'ri muvozanatlashtirilmagan. Debit = %s | Kredit = %s
@@ -387,7 +387,8 @@ 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.
 ## Dictionary
 Range=Buxgalteriya hisobi doirasi
 Calculated=Hisoblangan
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Buxgalteriya yozuvlari
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index f3c359dcd10..ad2754ae46d 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Jamg'arma
 Version=Versiya
 Publisher=Nashriyotchi
@@ -265,8 +267,8 @@ OtherResources=Boshqa manbalar
 ExternalResources=Tashqi manbalar
 SocialNetworks=Ijtimoiy tarmoqlar
 SocialNetworkId=Ijtimoiy tarmoq identifikatori
-ForDocumentationSeeWiki=<br> foydalanuvchi yoki ishlab chiquvchi hujjatlari uchun (Dolib, Savol-javoblar ...) Dolibarr Wiki-ga qarang: <br> <b> <a href="%s" target="_blank"> %s a0e40dc079cf87
-ForAnswersSeeForum=Boshqa savollar / yordam uchun siz Dolibarr forumidan foydalanishingiz mumkin: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
+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=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
@@ -341,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=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=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>
@@ -353,6 +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
 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>
@@ -753,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=Moliyaviy hisoblarni sozlash (toifalarni yaratish, boshqarish)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Tranzaktsiyalarni yarashtirish
 Permission115=Eksport operatsiyalari va hisobvaraqlar bo'yicha ko'chirmalar
 Permission116=Hisob-kitoblar o'rtasida o'tkazmalar
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,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=Xarajatlar to'g'risidagi hisobotlarni yaratish / o'zgartirish
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Xarajatlar to'g'risidagi hisobotlarni o'chirish
-Permission774=Barcha xarajatlar hisobotlarini o'qing (hatto bo'ysunuvchi bo'lmagan foydalanuvchi uchun ham)
 Permission775=Xarajatlar to'g'risidagi hisobotlarni tasdiqlash
 Permission776=Xarajatlar bo'yicha hisobotlarni to'lash
-Permission777=Hammaning hisobot hisobotini o'qing
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Hammaning xarajatlar hisobotini yarating / o'zgartiring
 Permission779=Eksport xarajatlari to'g'risidagi hisobotlar
 Permission1001=Qimmatli qog'ozlarni o'qing
@@ -958,15 +961,11 @@ 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=Xodimlarni ko'rish
-Permission4002=Xodimlarni yarating
-Permission4003=Xodimlarni o'chirish
-Permission4004=Xodimlarni eksport qilish
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,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=Barcha ta'tilga oid so'rovlarni o'qing (hatto foydalanuvchi unga bo'ysunmagan)
-Permission20005=Barchaga (hattoki tobe bo'lmagan foydalanuvchi uchun ham) ta'tilga chiqish so'rovlarini yaratish / o'zgartirish
-Permission20006=Administrator so'rovlarni qoldiradi (sozlash va balansni yangilash)
+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=Ta'til bo'yicha so'rovlarni tasdiqlash
 Permission23001=Rejalashtirilgan ishni o'qing
 Permission23002=Rejalashtirilgan ishni yaratish / yangilash
@@ -1358,9 +1357,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=Mijoz / sotuvchini ko'rsatish. ma'lumot ro'yxati (ro'yxat yoki kombinatsion qutini tanlang) va ko'prikning ko'pligi. <br> Uchinchi tomonlar "CC12345 - SC45678 - Katta kompaniya korpusi" nom formatida paydo bo'ladi. "Katta kompaniya korpusi" o'rniga.
-AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=<br> uchinchi tomonlar "Buyuk Kompaniya korpusi" o'rniga "Katta kompaniya korpusi. - 21 o'tish ko'chasi 123456 Katta shahar - AQSh" formatidagi "Uchinchi tomonlar" paydo bo'ladi.
+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=<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
@@ -1708,8 +1707,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
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Yuk tashish modulini sozlash
 SendingsReceiptModel=Qabul qilish modelini yuborish
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Yetkazib berish kvitansiyalari bo'yicha bepul ma
 ##### FCKeditor #####
 AdvancedEditor=Murakkab muharrir
 ActivateFCKeditor=Kengaytirilgan tahrirlovchini faollashtirish:
-FCKeditorForNotePublic=WYSIWIG elementlarning ochiq yozuvlarini yaratish/nashr etish
-FCKeditorForNotePrivate=WYSIWIG elementlarining shaxsiy yozuvlarini yaratish/nashr etish
+FCKeditorForNotePublic=WYSIWIG creation/edition of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWIG creation/edition of the field "private notes" of elements
 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,6 +1901,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
 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
@@ -1916,6 +1917,8 @@ 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)
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=Sahifa sarlavhasining matni rangi
 LinkColor=Havolalarning rangi
 PressF5AfterChangingThis=Klaviaturada CTRL + F5 tugmachalarini bosing yoki ushbu qiymatni o'zgartirgandan so'ng brauzer keshini tozalang
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Hozir ushbu kollektsioner uchun to'plamni boshqaris
 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=Elektron pochta hodisasini yozib oling
-CreateLeadAndThirdParty=Qo'rg'oshin yarating (va agar kerak bo'lsa, uchinchi tomon)
-CreateTicketAndThirdParty=Chiptani yarating (va oldingi operatsiya yuklangan bo'lsa, uchinchi tomon bilan bog'laning)
+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=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.
 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
@@ -2078,7 +2082,7 @@ CreateCandidature=Ishga ariza yarating
 FormatZip=Zip
 MainMenuCode=Menyu kirish kodi (asosiy menyu)
 ECMAutoTree=Avtomatik ECM daraxtini ko'rsating
-OperationParamDesc=Harakat ob'ekti uchun ishlatiladigan qiymatlarni yoki qiymatlarni qanday chiqarishni aniqlang. Masalan: <br> objproperty1 = SET: <br> objproperty2 = SET: __objproperty1__ o'rnini bosuvchi qiymat <br> objproperty3 = SETIFEMPTY: agar ishlatilgan bo'lsa objproT0: ([^ \\ s] *) <br> options_myextrafield1 = EXTRACT: SUBJECT: ([^ & # 92; n] *) <br> object.objproperty5 = EXTRACT: BODY: Mening kompaniyamning nomi \\ s ([^ \\ s] *ffz19) <br> dan foydalaning; ajratish sifatida char bir nechta xususiyatlarni ajratish yoki o'rnatish.
+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=Ish vaqti
 OpeningHoursDesc=Bu erga kompaniyangizning muntazam ish vaqtiga kiring.
 ResourceSetup=Resurs modulining konfiguratsiyasi
@@ -2124,7 +2128,7 @@ 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=Ma'lumotlar bazasida mavjud bo'lgan uchinchi tomonni topish va yuklash uchun elektron pochta tarkibidan foydalanish uchun siz ushbu harakatdan foydalanishingiz mumkin. Topilgan (yoki yaratilgan) uchinchi tomon kerak bo'lgan harakatlarni bajarish uchun ishlatiladi. <br> Misol uchun, agar siz tanada "Ism: topiladigan ism" qatorini ajratib olgan uchinchi partiya yaratmoqchi bo'lsangiz, yuboruvchi elektron pochtasini elektron pochta sifatida ishlating, siz parametr maydonini shunday o'rnatishingiz mumkin: <br> 'email = HEADER: ^Kimdan: (.*); Ism = CHIQARISH: TANI: Ism: \\ s ([^\\ s]*); mijoz = SET: 2; ' <br>
+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=%s uchun yakuniy nuqta: %s
 DeleteEmailCollector=Elektron pochta kollektorini o'chirish
 ConfirmDeleteEmailCollector=Ushbu elektron pochta kollektorini o'chirishni xohlaysizmi?
@@ -2209,3 +2213,10 @@ 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.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index 67f7a47c81e..9d27dbdd10c 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
-SwiftVNotalid=BIC / SWIFT yaroqsiz
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN amal qiladi
 IbanNotValid=BAN haqiqiy emas
 StandingOrders=To'g'ridan-to'g'ri debet buyurtmalari
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank manzili
 BankAccountCountry=Hisob qaydnomasi mamlakati
 BankAccountOwner=Hisob qaydnomasi egasining ismi
 BankAccountOwnerAddress=Hisob egasining manzili
-RIBControlError=Qiymatlarning yaxlitligini tekshirish muvaffaqiyatsiz tugadi. Bu shuni anglatadiki, ushbu hisob raqamiga oid ma'lumotlar to'liq emas yoki noto'g'ri (mamlakatni, raqamlarni va IBANni tekshiring).
 CreateAccount=Hisob yaratish
 NewBankAccount=Yangi hisob
 NewFinancialAccount=Yangi moliyaviy hisob
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index db629ba248b..c05ebdff8b1 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=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 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=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=To'lov muddati
 PaymentConditions=To'lov shartlari
 PaymentConditionsShort=To'lov shartlari
@@ -280,6 +279,7 @@ SetMode=To'lov turini o'rnating
 SetRevenuStamp=Daromad shtampini o'rnating
 Billed=Hisob-kitob
 RecurringInvoices=Takroriy hisob-fakturalar
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Shablon hisob-fakturasi
 RepeatableInvoices=Shablon hisob-fakturalari
 Repeatable=Andoza
@@ -449,6 +449,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
@@ -604,3 +606,4 @@ 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=Send reminder by email for unpaid invoices
diff --git a/htdocs/langs/uz_UZ/blockedlog.lang b/htdocs/langs/uz_UZ/blockedlog.lang
index 478a7fdc873..5ed9327f094 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=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/uz_UZ/bookmarks.lang b/htdocs/langs/uz_UZ/bookmarks.lang
index bce18ab9c81..8b621a35037 100644
--- a/htdocs/langs/uz_UZ/bookmarks.lang
+++ b/htdocs/langs/uz_UZ/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL manzili
 BehaviourOnClick=Xatcho'p URL manzili tanlanganida o'zini tutishi
 CreateBookmark=Xatcho'p yarating
 SetHereATitleForLink=Xatcho'p uchun nom o'rnating
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Tashqi / mutlaq havoladan (https: // URL) yoki ichki / nisbiy havoladan foydalaning (/ DOLIBARR_ROOT / htdocs / ...)
+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=Bog'langan sahifa joriy yorliqda yoki yangi yorliqda ochilishini tanlang
 BookmarksManagement=Xatcho'plarni boshqarish
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index c02ae302ca8..40c1038b273 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,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=Shuningdek, siz Evropa Komissiyasining veb-saytida <a href="%s" target="_blank"> %s </a>
+VATIntraManualCheck=You can also check manually on the European Commission website <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
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 26b1e9aaa7d..b8a7cb072b1 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -170,8 +170,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
-RulesResultDue=- Unda to'lamagan-to'lanmagan hisob-fakturalar, xarajatlar, QQS, xayr-ehsonlar mavjud. Shuningdek, unga to'langan ish haqi kiradi. <br> - Bu schyot-fakturalarni taqdim etish sanasiga va xarajatlar yoki soliq to'lovlarini to'lash sanasiga asoslanadi. Ish haqi moduli bilan belgilangan ish haqi uchun to'lovning sanasi qo'llaniladi.
-RulesResultInOut=- Unda fakturalar, xarajatlar, QQS va ish haqi bo'yicha amalga oshirilgan real to'lovlar mavjud. <br> - Bu hisob-fakturalar, xarajatlar, QQS va ish haqlarini to'lash sanalariga asoslanadi. Xayriya uchun xayr-ehson sanasi.
+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=- 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.
@@ -295,3 +296,5 @@ 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/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 1f573fde5bb..b337c73d0d6 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -27,7 +27,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=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s majburiydir
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 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
@@ -111,6 +113,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.
 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
@@ -271,6 +274,9 @@ 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
+ErrorRequestTooLarge=Error, request too large
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP parametringiz upload_max_filesize (%s) PHP post_max_size (%s) parametridan yuqori. Bu izchil o'rnatish emas.
@@ -312,6 +318,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 = Requires a numeric value
 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..34a3bc9eec6 100644
--- a/htdocs/langs/uz_UZ/eventorganization.lang
+++ b/htdocs/langs/uz_UZ/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kimdir konferentsiya taklif qilganda a
 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 = Template of email to send after a registration to a booth has been paid.
 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 = 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 = Stendingizning to'lovi
 EventOrganizationEmailRegistrationPayment = Tadbir uchun ro'yxatdan o'tish
 EventOrganizationMassEmailAttendees = Ishtirokchilar bilan aloqa
 EventOrganizationMassEmailSpeakers = Spikerlar bilan aloqa
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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=Link ICS for conferences
 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 = Seed to secure the key for the public registration page to suggest a conference
 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 = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Ovozlar soni
 #
 # Status
diff --git a/htdocs/langs/uz_UZ/holiday.lang b/htdocs/langs/uz_UZ/holiday.lang
index 72ba6bf9199..c604879c579 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=Dam olish qoldig'i <b> %s </b> kun.
+SoldeCPUser=Leave balance (in days) <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,3 +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
+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/uz_UZ/install.lang b/htdocs/langs/uz_UZ/install.lang
index 68a4c740280..9d153e8aead 100644
--- a/htdocs/langs/uz_UZ/install.lang
+++ b/htdocs/langs/uz_UZ/install.lang
@@ -21,6 +21,7 @@ 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.
diff --git a/htdocs/langs/uz_UZ/knowledgemanagement.lang b/htdocs/langs/uz_UZ/knowledgemanagement.lang
index 7ba41e15ab0..afee3d77e80 100644
--- a/htdocs/langs/uz_UZ/knowledgemanagement.lang
+++ b/htdocs/langs/uz_UZ/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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)
 SuggestedForTicketsInGroup=Guruh bo'lganda chiptalar taklif etiladi
+
+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/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index a587cd2e94f..690c45522f0 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -67,6 +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
 MaxNbOfRecordPerPage=Maks. bir varaqdagi yozuvlar soni
 NotAuthorized=Buning uchun sizning vakolatingiz yo'q.
 SetDate=Sana belgilang
@@ -87,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=Joriy ekraningiz bilan bog'liq maxsus yordam sahifasi mavjud
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Bosh sahifa
 RecordSaved=Yozuv saqlandi
 RecordDeleted=Yozuv o'chirildi
@@ -114,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=Ushbu ma'lumot diagnostika maqsadida foydali bo'lishi mumkin (bunday xabarnomalarni olib tashlash uchun $ dolibarr_main_prod parametrini '1' 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)
 MoreInformation=Qo'shimcha ma'lumot
 TechnicalInformation=Texnik ma'lumotlar
 TechnicalID=Texnik guvohnoma
@@ -211,6 +212,8 @@ User=Foydalanuvchi
 Users=Foydalanuvchilar
 Group=Guruh
 Groups=Guruhlar
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Hech qanday foydalanuvchi guruhi aniqlanmagan
 Password=Parol
 PasswordRetype=Parolingizni qayta kiriting
@@ -906,7 +909,7 @@ ViewFlatList=Yassi ro'yxatni ko'rish
 ViewAccountList=Hisob kitobini ko'rish
 ViewSubAccountList=Hisob osti daftarini ko'rish
 RemoveString='%s' qatorini olib tashlash
-SomeTranslationAreUncomplete=Taklif qilinadigan ba'zi tillar qisman tarjima qilinishi yoki xatolarga yo'l qo'yishi mumkin. Iltimos, yaxshilangan narsalaringizni qo'shish uchun <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/dolibarr/ </a> ro'yxatdan o'tib, tilingizni to'g'rilashga yordam bering.
+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=Umumiy yuklab olish havolasi
 PublicDownloadLinkDesc=Faylni yuklab olish uchun faqat havola kerak
 DirectDownloadInternalLink=Shaxsiy yuklab olish havolasi
@@ -1158,4 +1161,6 @@ Properties=Xususiyatlari
 hasBeenValidated=%s tasdiqlangan
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/uz_UZ/modulebuilder.lang b/htdocs/langs/uz_UZ/modulebuilder.lang
index 3e96b23a86f..ca642f252d7 100644
--- a/htdocs/langs/uz_UZ/modulebuilder.lang
+++ b/htdocs/langs/uz_UZ/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Ushbu vositadan faqat tajribali foydalanuvchilar yoki ishlab chiquvchilar foydalanishi kerak. O'zingizning modulingizni yaratish yoki tahrirlash uchun yordam dasturlarini taqdim etadi. Muqobil <a href="%s" target="_blank"> qo'lda ishlab chiqish uchun hujjatlar bu erda </a>.
+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.
 ModuleBuilderDesc2=Modullar ishlab chiqarilgan / tahrirlangan yo'l (tashqi modullar uchun birinchi katalog %s da belgilangan): <strong> %s </strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Sizning modulingiz / ilovangiz tomonidan taqdim etilgan meny
 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 recorded by other modules).
+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=O'rnatishda foydalanilayotgan identifikatorlarni ko'ring
 SeeReservedIDsRangeHere=Saqlangan identifikatorlar qatorini ko'ring
 ToolkitForDevelopers=Dolibarr dasturchilari uchun qo'llanma
diff --git a/htdocs/langs/uz_UZ/mrp.lang b/htdocs/langs/uz_UZ/mrp.lang
index df7436a345c..32a43cbc558 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=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
 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
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 5038ccf09c3..7db253ec775 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -258,6 +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
 YourPasswordHasBeenReset=Parolingiz qayta tiklandi
 ApplicantIpAddress=Ariza beruvchining IP-manzili
 SMSSentTo=%s raqamiga SMS yuborildi
@@ -268,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=Login with %s
 
 ##### Export #####
 ExportsArea=Eksport maydoni
diff --git a/htdocs/langs/uz_UZ/partnership.lang b/htdocs/langs/uz_UZ/partnership.lang
index 1bd45a101b0..84954dffc10 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
 AddPartnership=Hamkorlik qo'shing
 CancelPartnershipForExpiredMembers=Hamkorlik: muddati o'tgan obunalari bo'lgan a'zolarning sherikligini bekor qiling
 PartnershipCheckBacklink=Hamkorlik: teskari bog'lanishni tekshiring
diff --git a/htdocs/langs/uz_UZ/productbatch.lang b/htdocs/langs/uz_UZ/productbatch.lang
index 2a8e9158a79..1e505487558 100644
--- a/htdocs/langs/uz_UZ/productbatch.lang
+++ b/htdocs/langs/uz_UZ/productbatch.lang
@@ -30,7 +30,7 @@ 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=Har bir shtrix / lot / ketma-ket skanerlash uchun qo'shish uchun miqdor
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Hayot davomiyligi (kunlar ichida)
 EndOfLife=Hayotning oxiri
 ManufacturingDate=Ishlab chiqarilgan sana
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Ishdan chiqdi
 InWorkingOrder=Ish tartibida
+ToReplace=Replace
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 59c479df785..15a5592a500 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=O'rtacha o'rtacha narxni yangilash uchun ishlatiladigan mi
 PMPValue=O'rtacha narx
 PMPValueShort=WAP
 mandatoryperiod=Majburiy davrlar
-mandatoryPeriodNeedTobeSet=Diqqat davrlari kiritilmagan va majburiy emas
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=Xizmat boshlanish va tugash davrini talab qiladi
-mandatoryHelper=Hisob -fakturani, tijorat taklifini, sotish buyurtmasini tuzish / tasdiqlashda xizmatning boshlanish va tugash sanasini kiritish zarurligi to'g'risida foydalanuvchiga xabar. <br> Bu amal tasdiqlash jarayonida bloklanmagan
+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=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
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index 218a52bdc38..09f4e88dcbb 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -197,6 +197,7 @@ InputPerMonth=Oyiga kiritish
 InputDetail=Kirish tafsiloti
 TimeAlreadyRecorded=Bu allaqachon ushbu vazifa uchun yozilgan vaqt va foydalanuvchi %s
 ProjectsWithThisUserAsContact=Ushbu foydalanuvchi bilan aloqa sifatida loyihalar
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Ushbu foydalanuvchiga berilgan vazifalar
 ResourceNotAssignedToProject=Loyihaga tayinlanmagan
 ResourceNotAssignedToTheTask=Vazifaga tayinlanmagan
@@ -284,3 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Izoh: 100%% da barcha vazifalar
 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>.
+ProjectsHavingThisContact=Projects having this contact
+StartDateCannotBeAfterEndDate=End date cannot be before start date
diff --git a/htdocs/langs/uz_UZ/receptions.lang b/htdocs/langs/uz_UZ/receptions.lang
index 7550400a171..ef79361ae28 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=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 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=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 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=For the moment, creation of a new reception is done from the Purchase Order.
 ReceptionLine=Qabul qilish liniyasi
 ProductQtyInReceptionAlreadySent=Ochiq savdo buyurtmasidan mahsulot miqdori allaqachon yuborilgan
 ProductQtyInSuppliersReceptionAlreadyRecevied=Ochiq etkazib beruvchilar buyurtmasidan olingan mahsulot miqdori allaqachon qabul qilingan
@@ -46,3 +49,6 @@ ReceptionsReceiptModel=Qabul qilish uchun hujjat shablonlari
 NoMorePredefinedProductToDispatch=Yuborish uchun oldindan belgilangan mahsulotlar yo'q
 ReceptionExist=Qabulxona mavjud
 ByingPrice=Bying price
+ReceptionBackToDraftInDolibarr=Reception %s back to draft
+ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
+ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index cab4b0fd107..45c0f664dd4 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Ogohlantirish uchun kerakli limit va kerakli optima
 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
 InventoryDate=Inventarizatsiya sanasi
+Inventories=Inventories
 NewInventory=Yangi inventarizatsiya
 inventorySetup = Inventarizatsiyani sozlash
 inventoryCreatePermission=Yangi inventarizatsiya yarating
@@ -206,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=Nazariy son
-TheoricalValue=Nazariy son
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Oxirgi BP
 CurrentPA=Curent BP
 RecordedQty=Yozilgan Miqdor
@@ -240,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=Haqiqiy sonni skanerlash bilan to'ldiring
+UpdateByScaning=Complete real qty by scaning
 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.
@@ -253,14 +254,20 @@ 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=Haqiqiy miqdorni kutilgan miqdor bilan to'ldiring
+AutofillWithExpected=Replace real quantity with expected quantity
 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
-FieldCannotBeNegative="%s" maydoni salbiy bo'lishi mumkin emas
 ErrorWrongBarcodemode=Shtrix -kodning noma'lum rejimi
 ProductDoesNotExist=Mahsulot mavjud emas
-ErrorSameBatchNumber=Xuddi shu partiya raqami inventarizatsiya ro'yxatida topilgan
+ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
 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
diff --git a/htdocs/langs/uz_UZ/stripe.lang b/htdocs/langs/uz_UZ/stripe.lang
index 95a3ce10828..44466b03fab 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=<a href="http://www.stripe.com" target="_blank"> Stripe </a> orqali mijozlarga kredit / cebit kartalar bilan to'lovlarni amalga oshirish uchun Stripe onlayn to'lov sahifasini taklif eting. Bu sizning mijozlaringizga vaqtinchalik to'lovlarni amalga oshirishda yoki ma'lum bir Dolibarr ob'ekti bilan bog'liq to'lovlarda (faktura, buyurtma, ...) ruxsat berish uchun ishlatilishi mumkin.
+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=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/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index a2d87656747..17a7785f94b 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -15,6 +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
 CreditTransferLine=Kredit o'tkazish liniyasi
 WithdrawalsLines=To'g'ridan-to'g'ri debet buyurtma liniyalari
 CreditTransferLines=Kredit o'tkazish liniyalari
@@ -47,6 +48,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
 ClassCreditedConfirm=Ushbu olib qo'yilgan kvitansiyani sizning bank hisob raqamingizga kiritilgan deb tasniflashni xohlaganingizga ishonchingiz komilmi?
 TransData=Etkazish sanasi
 TransMetod=Uzatish usuli
@@ -80,7 +82,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=To'g'ridan-to'g'ri debet faylini yaratish (barchasi)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Kredit o'tkazish uchun fayl yarating
 CreateSepaFileForPaymentByBankTransfer=Kredit o'tkazish faylini yarating (SEPA)
 CreateGuichet=Faqat ofis
@@ -115,7 +117,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=Ushbu mandat formasini imzolash orqali siz (A) %s ga sizning hisob raqamingizni chiqarish bo'yicha ko'rsatmalarni yuborishingizga va (B) %s ko'rsatmalariga binoan sizning bankingiz hisobingizni o'chirish uchun ko'rsatmalar yuborishingizga ruxsat berasiz. O'z huquqlaringizning bir qismi sifatida siz o'zingizning bankingiz bilan tuzgan shartnomangiz shartlari va shartlariga binoan bankingizdan pulni qaytarib olishga haqlisiz. Hisobingizdan chiqarilgan kundan boshlab 8 hafta ichida pulni qaytarib berishni talab qilish kerak. Yuqoridagi mandat bo'yicha sizning huquqlaringiz, sizning bankingizdan olishingiz mumkin bo'lgan bayonotda bayon etilgan.
+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=Kreditor identifikatori
 CreditorName=Kreditor nomi
 SEPAFillForm=(B) * belgilangan barcha maydonlarni to'ldiring.
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 7e99acdff65..3421d5b634c 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=Các nước không thuộc EEC
 CountriesInEECExceptMe=Các quốc gia trong EEC ngoại trừ %s
 CountriesExceptMe=Tất cả các quốc gia trừ %s
 AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ ValidateMovements=Xác nhận các kết chuyển
 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=Tự động ràng buộc thực hiện xong
+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
@@ -387,7 +387,8 @@ SaleExport=Bán hàng xuất khẩu
 SaleEEC=Bán trong EEC
 SaleEECWithVAT=Bán trong EEC với VAT không phải là null, vì vậy chúng tôi cho rằng đây KHÔNG phải là bán hàng nội bộ và tài khoản được đề xuất là tài khoản sản phẩm tiêu chuẩn.
 SaleEECWithoutVATNumber=Bán trong EEC không có VAT nhưng ID VAT của bên thứ ba không được xác định. Chúng tôi dự phòng tài khoản sản phẩm để bán hàng tiêu chuẩn. Bạn có thể sửa ID VAT của bên thứ ba hoặc tài khoản sản phẩm nếu cần.
-
+ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
+ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
 Range=Phạm vi tài khoản kế toán
 Calculated=Tính toán
@@ -404,6 +405,7 @@ NoJournalDefined=Không có nhật ký được xác định
 Binded=Dòng ràng buộc
 ToBind=Dòng để ràng buộc
 UseMenuToSetBindindManualy=Các dòng chưa bị ràng buộc, sử dụng menu <a href="%s">%s</a> để tạo ràng buộc theo cách thủ công
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
 
 ## Import
 ImportAccountingEntries=Ghi sổ kế toán
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 02eb3e6a57e..c60dc0acf38 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Tổ chức
 Version=Phiên bản
 Publisher=Người xuất bản
@@ -265,8 +267,8 @@ OtherResources=Các tài nguyên khác
 ExternalResources=Tài nguyên bên ngoài
 SocialNetworks=Mạng xã hội
 SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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=Dưới đây là một số tài nguyên để nhận trợ giúp và hỗ trợ với Dolibarr.
 HelpCenterDesc2=Một số tài nguyên này chỉ có sẵn bằng <b>tiếng Anh</b> .
 CurrentMenuHandler=Điều khiển menu hiện tại
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=Phiên bản ổn định mới nhất
 LastActivationDate=Ngày kích hoạt mới nhất
 LastActivationAuthor=Tác giả kích hoạt mới nhất
 LastActivationIP=IP kích hoạt mới nhất
+LastActivationVersion=Latest activation version
 UpdateServerOffline=Cập nhật server offline
 WithCounter=Quản lý bộ đếm
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
@@ -753,7 +756,7 @@ Permission106=Xuất dữ liệu Sendings
 Permission109=Xóa sendings
 Permission111=Xem tài khoản tài chính
 Permission112=Tạo/chỉnh sửa/xóa và so sánh giao dịch
-Permission113=Cài đặt tài khoản tài chính (tạo, quản lý phân nhóm)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Các giao dịch hợp nhất
 Permission115=Xuất dữ liệu giao dịch và bảng kê tài khoản
 Permission116=Chuyển giữa các tài khoản
@@ -762,6 +765,7 @@ Permission121=Xem bên thứ ba liên quan đến người dùng
 Permission122=Tạo/chỉnh sửa bên thứ ba liên quan đến người dùng
 Permission125=Xóa bên thứ ba liên quan đến người dùng
 Permission126=Xuất dữ liệu bên thứ ba
+Permission130=Create/modify third parties payment information
 Permission141=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)
@@ -889,12 +893,11 @@ Permission701=Đọc thông tin Tài trợ
 Permission702=Tạo/sửa đổi Tài trợ
 Permission703=Xóa tài trợ
 Permission771=Xem báo cáo chi phí (của bạn và cấp dưới của bạn)
-Permission772=Tạo/chỉnh sửa báo cáo chi phí
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Xóa báo cáo chi phí
-Permission774=Đọc tất cả báo cáo chi phí (ngay cả người dùng không phụ thuộc)
 Permission775=Duyệt báo cáo chi phí
 Permission776=Báo cáo thanh toán chi phí
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=Xuất dữ liệu báo cáo chi phí
 Permission1001=Xem tồn kho
@@ -958,15 +961,11 @@ Permission2801=Sử dụng FTP client trong chế độ đọc (chỉ duyệt v
 Permission2802=Sử dụng FTP client trong chế độ ghi (xóa hoặc tải lên các tập tin)
 Permission3200=Xem các sự kiện được lưu trữ và dấu vân tay
 Permission3301=Generate new modules
-Permission4001=Xem nhân viên
-Permission4002=Tạo nhân viên
-Permission4003=Xóa nhân viên
-Permission4004=Xuất dữ liệu nhân viên
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ Permission10005=Xóa nội dung trang web
 Permission20001=Xem yêu cầu nghỉ phép (nghỉ phép của bạn và của cấp dưới)
 Permission20002=Tạo / sửa đổi yêu cầu nghỉ phép của bạn (nghỉ phép của bạn và của những người cấp dưới của bạn)
 Permission20003=Xóa yêu cầu nghỉ phép
-Permission20004=Xem tất cả các yêu cầu để lại (ngay cả người dùng không phải cấp dưới)
-Permission20005=Tạo / sửa đổi yêu cầu nghỉ phép cho mọi người (ngay cả người dùng không phải cấp dưới)
-Permission20006=Quản trị yêu cầu nghỉ phép (thiết lập và cập nhật số dư)
+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=Phê duyệt yêu cầu nghỉ phép
 Permission23001=Xem công việc theo lịch trình
 Permission23002=Tạo/cập nhật công việc theo lịch trình
@@ -1358,9 +1357,9 @@ BrowserIsOK=Bạn đang sử dụng trình duyệt web %s. Trình duyệt này l
 BrowserIsKO=Bạn đang sử dụng trình duyệt web %s. Trình duyệt này được biết đến là một lựa chọn xấu cho bảo mật, hiệu suất và độ tin cậy. Chúng tôi khuyên bạn nên sử dụng Firefox, Chrome, Opera hoặc Safari.
 PHPModuleLoaded=Thành phần PHP %s được tải
 PreloadOPCode=Tải sẵn OPCode được sử dụng
-AddRefInList=Hiển thị danh sách thông tin tham chiếu khách hàng/nhà cung cấp (chọn danh sách hoặc combobox) và hầu hết các siêu liên kết. <br> Các bên thứ ba sẽ xuất hiện với định dạng tên là "CC12345 - SC45678 - Công ty lớn." thay vì "Công ty lớn".
-AddVatInList=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=Hiển thị danh sách thông tin địa chỉ khách hàng/nhà cung cấp (chọn danh sách hoặc hộp tổ hợp) <br> Các bên thứ ba sẽ xuất hiện với định dạng tên là "The Big Company corp. - 21 jump street 123456 Big town - USA" thay vì "The Big Company corp".
+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=Yêu cầu phương thức vận chuyển ưa thích cho bên thứ ba.
 FieldEdition=Biên soạn của trường %s
@@ -1708,8 +1707,9 @@ MailingDelay=Số giây để chờ đợi sau khi gửi tin nhắn tiếp theo
 NotificationSetup=Thiết lập mô-đun thông báo email
 NotificationEMailFrom=Email người gửi (Từ) cho các email được gửi bởi mô-đun Thông báo
 FixedEmailTarget=Người nhận
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=Thiết lập mô-đun vận chuyển
 SendingsReceiptModel=Mô hình biên nhận Gửi
@@ -1725,8 +1725,8 @@ FreeLegalTextOnDeliveryReceipts=Free text trên phiếu giao nhận
 ##### FCKeditor #####
 AdvancedEditor=Trình soạn thảo nâng cao
 ActivateFCKeditor=Kích hoạt trình soạn thảo nâng cao cho:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field public notes of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field private notes of elements
+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>
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=Thiết lập mô đun Báo cáo chi phí - Quy tắc
 ExpenseReportNumberingModules=Mô đun đánh số báo cáo chi phí
 NoModueToManageStockIncrease=Không có module có thể quản lý tăng tồn kho được kích hoạt. Tăng tồn kho sẽ chỉ được thực hiện thủ công.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Bạn có thể tìm thấy các tùy chọn cho thông báo qua email bằng cách bật và định cấu hình mô-đun "Thông báo".
+TemplatesForNotifications=Templates for notifications
 ListOfNotificationsPerUser=Danh sách thông báo tự động cho mỗi người dùng *
 ListOfNotificationsPerUserOrContact=Danh sách các thông báo tự động có thể có (về sự kiện kinh doanh) có sẵn cho mỗi người dùng * hoặc mỗi liên lạc **
 ListOfFixedNotifications=Danh sách thông báo cố định tự động
@@ -1916,6 +1917,8 @@ 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)
+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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Bạn có muốn chạy trình thu thập cho thu t
 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)
-RecordEvent=Ghi lại sự kiện email
-CreateLeadAndThirdParty=Tạo khách hàng tiềm năng (và bên thứ ba nếu cần thiết)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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=Mã kết quả mới nhất
 NbOfEmailsInInbox=Số lượng email trong thư mục nguồn
 LoadThirdPartyFromName=Tải tìm kiếm bên thứ ba trên %s (chỉ tải)
 LoadThirdPartyFromNameOrCreate=Tải tìm kiếm bên thứ ba trên %s (tạo nếu không tìm thấy)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Mã mục nhập menu (mainmenu)
 ECMAutoTree=Hiển thị cây ECM tự động
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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=Giờ mở cửa
 OpeningHoursDesc=Nhập vào đây giờ mở cửa thường xuyên của công ty bạn.
 ResourceSetup=Cấu hình của mô-đun tài nguyên
@@ -2124,7 +2128,7 @@ LargerThan=Lớn hơn
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=Với tài khoản GMail, nếu bạn đã bật xác thực 2 bước, bạn nên tạo mật khẩu thứ hai dành riêng cho ứng dụng thay vì sử dụng mật khẩu tài khoản của riêng bạn từ https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. 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 a string 'Name: name to find' found into the body, use 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=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=Điểm kết thúc cho %s: %s
 DeleteEmailCollector=Xóa trình thu thập email
 ConfirmDeleteEmailCollector=Bạn có chắc chắn muốn xóa trình thu thập email này?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index e738863eef3..0c4f2c52cb1 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -32,7 +32,7 @@ RIB=Số tài khoản ngân hàng
 IBAN=Số IBAN
 BIC=Mã BIC / SWIFT
 SwiftValid=BIC/SWIFT hợp lệ
-SwiftVNotalid=BIC/SWIFT không hợp lệ
+SwiftNotValid=BIC/SWIFT không hợp lệ
 IbanValid=BAN hợp lệ
 IbanNotValid=BAN không hợp lệ
 StandingOrders=Lệnh ghi nợ trực tiếp
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Địa chỉ ngân hàng
 BankAccountCountry=Quốc gia tài khoản
 BankAccountOwner=Tên chủ tài khoản
 BankAccountOwnerAddress=Địa chỉ chủ sở hữu tài khoản
-RIBControlError=Kiểm tra tính toàn vẹn của các giá trị không thành công. Điều này có nghĩa là thông tin cho số tài khoản này không đầy đủ hoặc không chính xác (kiểm tra quốc gia, số và IBAN).
 CreateAccount=Tạo tài khoản
 NewBankAccount=Tài khoản mới
 NewFinancialAccount=Tài khoản tài chính mới
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/bookmarks.lang b/htdocs/langs/vi_VN/bookmarks.lang
index 08719e1a87c..9ec5898769c 100644
--- a/htdocs/langs/vi_VN/bookmarks.lang
+++ b/htdocs/langs/vi_VN/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Hành vi khi một URL đánh dấu trang được chọn
 CreateBookmark=Tạo dấu trang
 SetHereATitleForLink=Đặt tên cho dấu trang
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Sử dụng liên kết ngoài / tuyệt đối (https://URL) hoặc liên kết nội bộ / tương đối (/DOLIBARR_ROOT/htdocs/ ...)
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://externalurl.com) or an internal/relative link (/mypage.php). You can also use phone like tel:0123456.
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Chọn nếu trang được liên kết sẽ mở trong tab hiện tại hoặc tab mới
 BookmarksManagement=Quản lý dấu trang
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index ecb3a5ae0f0..0ad8601e12b 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ VATIntraCheck=Kiểm tra
 VATIntraCheckDesc=ID VAT phải bao gồm tiền tố quốc gia. Liên kết <b>%s</b> sử dụng dịch vụ kiểm tra VAT Châu Âu (VIES) yêu cầu truy cập internet từ máy chủ Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Kiểm tra ID VAT nội bộ cộng đồng trên trang web của Ủy ban Châu Âu
-VATIntraManualCheck=Bạn cũng có thể kiểm tra thủ công trên trang web của Ủy ban Châu Âu <a href="%s" target="_blank">%s</a>
+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=Không phải triển vọng, cũng không phải khách hàng
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index 763366fc3ef..24d6dd5c05f 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -170,8 +170,9 @@ 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=- Các khoản hiển thị là với tất cả các loại thuế bao gồm
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- Nó bao gồm các khoản thanh toán thực tế được thực hiện trên hóa đơn, chi phí, VAT và tiền lương. <br> - Nó dựa trên ngày thanh toán của hóa đơn, chi phí, VAT và tiền lương. Ngày quyên góp.
+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=- Nó bao gồm tất cả các khoản thanh toán hiệu quả của hóa đơn nhận được từ khách hàng. <br> - Nó được dựa trên ngày thanh toán của các hóa đơn này <br>
 RulesCATotalSaleJournal=Nó bao gồm tất cả các hạn mức tín dụng từ nhật ký Bán hàng.
@@ -295,3 +296,5 @@ 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/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 2e883b75630..1b8c6ca61b9 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -27,7 +27,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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Không có nguồn cấp dữ liệu RSS. Cố gắng t
 ErrorForbidden=Truy cập bị từ chối. <br> Bạn cố gắng truy cập vào một trang, khu vực hoặc tính năng của một mô-đun bị vô hiệu hóa hoặc không có trong một phiên xác thực hoặc không được phép cho người dùng của bạn.
 ErrorForbidden2=Cho phép đăng nhập này có thể được xác định bởi người quản trị Dolibarr của bạn từ trình đơn% s ->% s.
 ErrorForbidden3=Dường như Dolibarr không được sử dụng thông qua một phiên chứng thực. Hãy xem tài liệu hướng dẫn thiết lập Dolibarr biết làm thế nào để quản lý xác thực (htaccess, mod_auth hay khác ...).
+ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
 ErrorNoImagickReadimage=Lớp Imagick không tìm thấy trong PHP này. Không có xem trước có thể có sẵn. Quản trị có thể vô hiệu hóa tab này từ menu Setup - Hiển thị.
 ErrorRecordAlreadyExists=Kỷ lục đã tồn tại
 ErrorLabelAlreadyExists=Nhãn này đã tồn tại
@@ -271,6 +274,9 @@ 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=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.
@@ -312,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/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/holiday.lang b/htdocs/langs/vi_VN/holiday.lang
index ac7356b7053..a004e3a5064 100644
--- a/htdocs/langs/vi_VN/holiday.lang
+++ b/htdocs/langs/vi_VN/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Mô tả
 SendRequestCP=Tạo yêu cầu nghỉ phép
 DelayToRequestCP=Để lại yêu cầu phải được thực hiện vào <b>ngày</b> thứ nhất <b>là% s (s)</b> trước họ.
 MenuConfCP=Số dư ngày nghỉ phép
-SoldeCPUser=Số dư còn lại là <b>%s</b> ngày.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=Bạn phải chọn ngày kết thúc lớn hơn ngày bắt đầu.
 ErrorSQLCreateCP=Đã xảy ra lỗi SQL trong quá trình tạo:
 ErrorIDFicheCP=Một lỗi đã xảy ra, yêu cầu nghỉ phép không tồn tại.
@@ -134,3 +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/install.lang b/htdocs/langs/vi_VN/install.lang
index ca906feef39..33d8baf74d4 100644
--- a/htdocs/langs/vi_VN/install.lang
+++ b/htdocs/langs/vi_VN/install.lang
@@ -21,6 +21,7 @@ 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.
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 b7664f58e50..7c554f803a4 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Lỗi, không xác định tỉ lệ VAT c
 ErrorNoSocialContributionForSellerCountry=Lỗi, không có loại thuế xã hội/ tài chính được xác định cho quốc gia '%s'.
 ErrorFailedToSaveFile=Lỗi, lưu tập tin thất bại
 ErrorCannotAddThisParentWarehouse=Bạn đang cố gắng thêm một kho mẹ đã là con của một kho hiện có
+FieldCannotBeNegative=Field "%s" cannot be negative
 MaxNbOfRecordPerPage=Tối đa số lượng bản ghi trên mỗi trang
 NotAuthorized=Bạn không được phép làm điều đó.
 SetDate=Thiết lập ngày
@@ -87,7 +88,7 @@ FileWasNotUploaded=Một tập tin được chọn để đính kèm nhưng vẫ
 NbOfEntries=Số lượng các mục
 GoToWikiHelpPage=Đọc trợ giúp trực tuyến (Cần truy cập Internet)
 GoToHelpPage=Đọc giúp đỡ
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Trang chủ
 RecordSaved=Bản ghi đã lưu
 RecordDeleted=Bản ghi đã xóa
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=Trả về mã cho lỗi yêu cầu truy cập cơ s
 InformationLastAccessInError=Thông tin cho lỗi yêu cầu truy cập cơ sở dữ liệu mới nhất
 DolibarrHasDetectedError=Dolibarr đã phát hiện một lỗi kỹ thuật
 YouCanSetOptionDolibarrMainProdToZero=Để có thêm thông tin, bạn có thể đọc tệp nhật ký hoặc thiết lâp tùy chọn $ dolibarr_main_prod thành '0' trong tệp cấu hình của bạn.
-InformationToHelpDiagnose=Thông tin này có thể hữu ích cho mục đích chẩn đoán (bạn có thể đặt tùy chọn $ dolibarr_main_prod thành '1' để xóa các thông báo như vậy)
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=Thông tin chi tiết
 TechnicalInformation=Thông tin kỹ thuật
 TechnicalID=ID kỹ thuật
@@ -211,6 +212,8 @@ User=Người dùng
 Users=Người dùng
 Group=Nhóm
 Groups=Nhóm
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=Không có nhóm người dùng được xác định
 Password=Mật khẩu
 PasswordRetype=Nhập lại mật khẩu của bạn
@@ -906,7 +909,7 @@ ViewFlatList=Xem danh sách phẳng
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Xóa chuỗi '%s'
-SomeTranslationAreUncomplete=Một số ngôn ngữ được cung cấp có thể chỉ được dịch một phần hoặc có thể có lỗi. Vui lòng giúp sửa ngôn ngữ của bạn bằng cách đăng ký tại <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> để thêm các cải tiến của bạn.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Time Zone khách hàng (người sử dụng)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/vi_VN/modulebuilder.lang b/htdocs/langs/vi_VN/modulebuilder.lang
index 0d9e41a23e6..09d3deca48b 100644
--- a/htdocs/langs/vi_VN/modulebuilder.lang
+++ b/htdocs/langs/vi_VN/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Công cụ này phải chỉ được sử dụng bởi người dùng hoặc nhà phát triển có kinh nghiệm. Nó cung cấp các tiện ích để xây dựng hoặc chỉnh sửa mô-đun của riêng bạn. Tài liệu cho <a href="%s" target="_blank">phát triển thủ công ở đây </a>.
+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.
 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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=Các menu được cung cấp bởi mô-đun / ứng dụng
 DictionariesDefDescTooltip=Các từ điển được cung cấp bởi mô-đun / ứng dụng của bạn được định nghĩa trong mảng <strong>$this->dictionaries</strong> vào tệp mô tả mô-đun. Bạn có thể chỉnh sửa thủ công tệp này hoặc sử dụng trình chỉnh sửa được nhúng. <br><br> Lưu ý: Sau khi được định nghĩa (và kích hoạt lại mô-đun), từ điển cũng được hiển thị trong khu vực thiết lập cho người dùng quản trị viên trên %s.
 PermissionsDefDescTooltip=Các quyền được cung cấp bởi mô-đun / ứng dụng của bạn được định nghĩa trong mảng <strong>$this->rights</strong> vào tệp mô tả mô-đun. Bạn có thể chỉnh sửa thủ công tệp này hoặc sử dụng trình chỉnh sửa được nhúng. <br><br> Lưu ý: Sau khi được định nghĩa (và kích hoạt lại mô-đun), các quyền được hiển thị trong thiết lập quyền mặc định %s.
 HooksDefDesc=Định nghĩa trong thuộc tính <b>module_parts ['hook']</b> , trong mô tả mô-đun, ngữ cảnh của các hook bạn muốn quản lý (có thể tìm thấy danh sách các ngữ cảnh bằng cách tìm kiếm trên ' <b>initHooks (</b> ' trong mã lõi). <br> Chỉnh sửa tệp hook để thêm mã của các hàm hooked của bạn (có thể tìm thấy các hàm hookable bằng cách tìm kiếm trên ' <b>execHooks</b> ' trong mã lõi).
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
+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=Xem ID được sử dụng trong cài đặt của bạn
 SeeReservedIDsRangeHere=Xem phạm vi ID dành riêng
 ToolkitForDevelopers=Bộ công cụ dành cho nhà phát triển Dolibarr
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/other.lang b/htdocs/langs/vi_VN/other.lang
index fa7a1e81d9b..c53ba8f9928 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -258,6 +258,10 @@ PassEncoding=Mã hóa mật khẩu
 PermissionsAdd=Quyền được thêm
 PermissionsDelete=Quyền đã bị xóa
 YourPasswordMustHaveAtLeastXChars=Mật khẩu của bạn phải có ít nhất <strong>%s</strong> ký tự
+PasswordNeedAtLeastXUpperCaseChars=The password need at least <strong>%s</strong> upper case chars
+PasswordNeedAtLeastXDigitChars=The password need at least <strong>%s</strong> numeric chars
+PasswordNeedAtLeastXSpecialChars=The password need at least <strong>%s</strong> special chars
+PasswordNeedNoXConsecutiveChars=The password must not have <strong>%s</strong> consecutive similar chars
 YourPasswordHasBeenReset=Mật khẩu của bạn đã được đặt lại thành công
 ApplicantIpAddress=Địa chỉ IP của người nộp đơn
 SMSSentTo=SMS được gửi tới %s
@@ -268,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
diff --git a/htdocs/langs/vi_VN/partnership.lang b/htdocs/langs/vi_VN/partnership.lang
index 25e7c566d67..162589515a6 100644
--- a/htdocs/langs/vi_VN/partnership.lang
+++ b/htdocs/langs/vi_VN/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/vi_VN/productbatch.lang b/htdocs/langs/vi_VN/productbatch.lang
index 235daea4c17..258463526de 100644
--- a/htdocs/langs/vi_VN/productbatch.lang
+++ b/htdocs/langs/vi_VN/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 75e9f712471..a7b84c95a9f 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Giá bình quân gia quyền
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index f966f397b1e..ea0500c7c74 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -197,6 +197,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,3 +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=Ngày kết thúc không thể trước ngày bắt đầu
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 497e0d9992d..966f94237c8 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Giới hạn tồn kho để cảnh báo và tồn
 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
 InventoryDate=Ngày Kiểm kho
+Inventories=Kiểm kho
 NewInventory=Kiểm kho mới
 inventorySetup = Thiết lập kiểm kho
 inventoryCreatePermission=Tạo kiểm kho mới
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Các biến động tồn kho sẽ
 inventoryChangePMPPermission=Cho phép thay đổi giá trị PMP cho sản phẩm
 ColumnNewPMP=PMP đơn vị mới
 OnlyProdsInStock=Không thêm sản phẩm mà không có tồn kho
-TheoricalQty=Số lượng lý thuyết
-TheoricalValue=Số lượng lý thuyết
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=BP cuối cùng
 CurrentPA=BP hiện tại
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ ReOpen=Mở lại
 ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Fill real quantity with expected quantity
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=Đã 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
diff --git a/htdocs/langs/vi_VN/stripe.lang b/htdocs/langs/vi_VN/stripe.lang
index 5d18304fdef..3996aa89a2a 100644
--- a/htdocs/langs/vi_VN/stripe.lang
+++ b/htdocs/langs/vi_VN/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Thiết lập mô-đun cổng thanh toán Stripe
-StripeDesc=Cung cấp cho khách hàng một trang thanh toán trực tuyến Stripe để thanh toán bằng thẻ tín dụng / thẻ ghi nợ qua <a href="http://www.stripe.com" target="_blank">Stripe</a> . Điều này có thể được sử dụng để cho phép khách hàng của bạn thực hiện thanh toán đột xuất hoặc thanh toán liên quan đến một đối tượng Dolibarr cụ thể (hóa đơn, đơn đặt hàng, ...)
+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=Thanh toán bằng thẻ tín dụng hoặc Stripe
 FollowingUrlAreAvailableToMakePayments=Các URL sau có sẵn để cung cấp một trang cho khách hàng để thanh toán trên các đối tượng Dolibarr
 PaymentForm=Hình thức thanh toán
@@ -28,7 +28,6 @@ AccountParameter=Thông số tài khoản
 UsageParameter=Thông số sử dụng
 InformationToFindParameters=Trợ giúp tìm thông tin tài khoản %s của bạn
 STRIPE_CGI_URL_V2=Mô-đun Url của Stripe CGI để thanh toán
-VendorName=Tên nhà cung cấp
 CSSUrlForPaymentForm=CSS style sheet Url cho hình thức thanh toán
 NewStripePaymentReceived=Đã nhận thanh toán Stripe mới
 NewStripePaymentFailed=Thanh toán Stripe mới đã thử nhưng không thành công
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index 63c347dcaf2..c29bfa7d6ca 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Tệp ghi nợ trực tiếp mới nhất %s 
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Dòng lệnh ghi nợ trực tiếp
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ ThirdPartyBankCode=Mã ngân hàng của bên thứ ba
 NoInvoiceCouldBeWithdrawed=Không có hóa đơn ghi nợ thành công. Kiểm tra xem hóa đơn có trên các công ty có IBAN hợp lệ không và IBAN có UMR (Tham chiếu ủy quyền duy nhất) với chế độ <strong>%s</strong> .
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Phân loại tín dụng
+ClassDebited=Classify debited
 ClassCreditedConfirm=Bạn có chắc chắn muốn phân loại biên nhận rút tiền này là ghi có trên tài khoản ngân hàng của bạn không?
 TransData=Ngày chuyển
 TransMetod=Phương thức chuyển
@@ -80,7 +82,7 @@ StatusMotif7=Quyết định tư pháp
 StatusMotif8=Lý do khác
 CreateForSepaFRST=Tạo tệp ghi nợ trực tiếp (SEPA FRST)
 CreateForSepaRCUR=Tạo tệp ghi nợ trực tiếp (SEPA RCUR)
-CreateAll=Tạo tệp ghi nợ trực tiếp (tất cả)
+CreateAll=Tạo tập tin ghi nợ trực tiếp
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Chỉ văn phòng
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Không thể tạo yêu cầu ghi nợ trực ti
 SepaMandate=Ủy thác ghi nợ trực tiếp SEPA
 SepaMandateShort=Ủy thác SEPA
 PleaseReturnMandate=Vui lòng gửi lại mẫu ủy quyền này qua email đến %s hoặc gửi thư đến
-SEPALegalText=Bằng cách ký vào biểu mẫu ủy quyền này, bạn cho phép (A) %s gửi hướng dẫn đến ngân hàng của bạn để ghi nợ tài khoản của bạn và (B) ngân hàng của bạn ghi nợ tài khoản của bạn theo hướng dẫn từ %s. Là một phần của quyền của bạn, bạn có quyền được hoàn trả từ ngân hàng của mình theo các điều khoản và điều kiện trong thỏa thuận với ngân hàng của bạn. Khoản hoàn trả phải được yêu cầu trong vòng 8 tuần kể từ ngày tài khoản của bạn bị ghi nợ. Các quyền của bạn liên quan đến nhiệm vụ trên được giải thích trong một tuyên bố mà bạn có thể có được từ ngân hàng của mình.
+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=Định danh chủ nợ
 CreditorName=Tên chủ nợ
 SEPAFillForm=(B) Vui lòng hoàn thành tất cả các trường được đánh dấu *
@@ -150,3 +152,5 @@ ModeWarning=Tùy chọn cho chế độ thực không được đặt, chúng t
 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
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 16d14846fc5..d56193eb930 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=非欧共体国家
 CountriesInEECExceptMe=欧共体国家除了%s
 CountriesExceptMe=除%s以外的所有国家/地区
 AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=自动绑定
-AutomaticBindingDone=自动绑定完成
+AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=错误，你不能删除这个会计科目，因为正被使用。
 MvtNotCorrectlyBalanced=运动不正确平衡。借方= %s | Credit = %s
@@ -387,7 +387,8 @@ 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=会计科目范围
 Calculated=计算
@@ -404,6 +405,7 @@ NoJournalDefined=没有定义日常报表
 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
 
 ## Import
 ImportAccountingEntries=会计分录
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 56a0f63b162..4dcc33dae13 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=机构
 Version=版本
 Publisher=出版者
@@ -12,7 +14,7 @@ VersionRecommanded=推荐
 FileCheck=文件集完整性检查
 FileCheckDesc=使用此工具，您可以将文件与正式文件进行比较，以检查文件的完整性和应用程序的设置。也可以检查某些设置常数的值。您可以使用此工具来确定是否已修改任何文件（例如，被黑客入侵）。
 FileIntegrityIsStrictlyConformedWithReference=文件完整性严格符合参考。
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
+FileIntegrityIsOkButFilesWereAdded=文件完整性检查已通过，但添加了一些新文件。
 FileIntegritySomeFilesWereRemovedOrModified=文件完整性检查失败。某些文件已被修改，删除或添加。
 GlobalChecksum=全局校验和
 MakeIntegrityAnalysisFrom=对应用程序文件进行完整性分析
@@ -23,7 +25,7 @@ FilesUpdated=已更新的文件
 FilesModified=已修改的文件
 FilesAdded=增加的文件
 FileCheckDolibarr=检查应用程序文件的完整性
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when the application is installed from an official package
+AvailableOnlyOnPackagedVersions=用于完整性检查的本地文件仅在从官方包安装应用程序时可用
 XmlNotFound=找不到程序的Xml完整性文件
 SessionId=会话 ID
 SessionSaveHandler=会话保存处理程序
@@ -37,7 +39,7 @@ UnlockNewSessions=取消连接锁定
 YourSession=你的会话
 Sessions=用户会话
 WebUserGroup=Web 服务器用户/组
-PermissionsOnFiles=Permissions on files
+PermissionsOnFiles=文件权限
 PermissionsOnFilesInWebRoot=Web根目录中文件的权限
 PermissionsOnFile=文件%s的权限
 NoSessionFound=您的PHP配置似乎不允许列出活动会话。可以保护用于保存会话的目录（<b> %s </b>）（例如，通过OS权限或PHP指令open_basedir）。
@@ -53,7 +55,7 @@ InternalUser=内部员工用户
 ExternalUser=外部用户
 InternalUsers=内部员工用户
 ExternalUsers=外部用户
-UserInterface=User interface
+UserInterface=用户界面
 GUISetup=主题
 SetupArea=设置
 UploadNewTemplate=上传新模板
@@ -64,8 +66,8 @@ 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 或更高
@@ -265,8 +267,8 @@ OtherResources=其他资源
 ExternalResources=外部资源
 SocialNetworks=社交网络
 SocialNetworkId=社交网络ID
-ForDocumentationSeeWiki=用户或开发人员用文档(文档，常见问题…)，<br>参见 Dolibarr 百科：<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=您有任何其他问题/帮助，可以到 Dolibarr 论坛： <br> <b><a href="%s" target="_blank">%s</a></b>简体中文翻译可到Dolibarr爱好者交流Q群技术交流：206239089
+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=此资源的一些部分，<b>仅有英文</b> 可用。
 CurrentMenuHandler=当前菜单处理程序
@@ -341,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>
@@ -353,6 +355,7 @@ LastStableVersion=最新稳定版
 LastActivationDate=最新激活日期
 LastActivationAuthor=最新激活作者
 LastActivationIP=最新激活IP
+LastActivationVersion=Latest activation version
 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>
@@ -753,7 +756,7 @@ Permission106=导出发货单
 Permission109=删除发货单
 Permission111=读取财务帐目
 Permission112=创建/变更/删除和比较交易
-Permission113=设置财政账户 (创建和管理分类)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=导出交易和帐户报表
 Permission116=账户间转账
@@ -762,6 +765,7 @@ 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=删除所有项目和项目 (包括我未参与的项目)
@@ -889,12 +893,11 @@ Permission701=读取捐款资料
 Permission702=创建/变更捐款资料
 Permission703=删除捐款资料
 Permission771=读取费用报表(您以及您下属)
-Permission772=创建/变更费用报表
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=删除费用报表
-Permission774=读取所有费用报表(即使用户没有下属)
 Permission775=批准费用报表
 Permission776=支付费用报表
-Permission777=Read expense reports of everybody
+Permission777=Read all expense reports (even those of user not subordinates)
 Permission778=Create/modify expense reports of everybody
 Permission779=导出费用报表
 Permission1001=读取库存信息
@@ -958,15 +961,11 @@ Permission2801=允许FTP客户端读取(仅供浏览和下载)
 Permission2802=允许FTP客户端写入(删除和上传文件)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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=删除请假申请
-Permission20004=阅读所有请假申请（即使是非下属用户）
-Permission20005=为每个人创建/修改请假申请（即使是非下属用户）
-Permission20006=管理员请假申请 (setup and update balance)
+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=读取排定任务
 Permission23002=创建/更新排定任务
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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=%s 字段的编辑
@@ -1708,8 +1707,9 @@ MailingDelay=在发送下一条信息时等待几秒
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=接收方
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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=运输模板
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,6 +1917,8 @@ 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)
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=页面标题的文字颜色
 LinkColor=颜色链接
 PressF5AfterChangingThis=在键盘上按CTRL + F5或更改此值后清除浏览器缓存以使其生效
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=邮编
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index 9fb75dce9ff..26feb7ea2d5 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -32,7 +32,7 @@ RIB=银行帐号
 IBAN=IBAN号码
 BIC=BIC/SWIFT code
 SwiftValid=BIC / SWIFT有效
-SwiftVNotalid=BIC / SWIFT无效
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN有效
 IbanNotValid=BAN无效
 StandingOrders=提款收据
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=国家
 BankAccountOwner=帐户持有人姓名
 BankAccountOwnerAddress=帐户持有人地址
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=创建帐户
 NewBankAccount=新帐户
 NewFinancialAccount=新建财务账号
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/bookmarks.lang b/htdocs/langs/zh_CN/bookmarks.lang
index 81d7266d6f4..40e308d67d9 100644
--- a/htdocs/langs/zh_CN/bookmarks.lang
+++ b/htdocs/langs/zh_CN/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=网址
 BehaviourOnClick=选择书签URL时的行为
 CreateBookmark=创建书签
 SetHereATitleForLink=Set a name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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=书签管理
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 86080b4b201..1e7067fa16b 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,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=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">%s</a>
+VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=检查不可能的。检查服务是没有提供的会员国（%s）中。
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Business entity type
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index 77cdae3f7df..7da2d81ffc6 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -170,8 +170,9 @@ 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=- 所示金额均含税
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- 它包括发票，费用，增值税和工资的实际付款。 <br>  - 它基于发票，费用，增值税和工资的付款日期。捐赠的捐赠日期。
+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=它包括Sale日常报表中的所有信用额度。
@@ -295,3 +296,5 @@ 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/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index a4b7dcb4ac0..1783be09f3a 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=客户编号需要
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=未能得到RSS提要。尝试添加恒定MAIN_SIMPLEXM
 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.
 ErrorNoImagickReadimage=功能imagick_readimage是没有发现在这个PHP。没有预览可用。管理员可以从菜单中禁用此设置 - 显示选项卡。
 ErrorRecordAlreadyExists=记录已存在
 ErrorLabelAlreadyExists=此标签已存在
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/zh_CN/holiday.lang
index 80eb27aebf5..492299e752b 100644
--- a/htdocs/langs/zh_CN/holiday.lang
+++ b/htdocs/langs/zh_CN/holiday.lang
@@ -27,7 +27,7 @@ DescCP=描述
 SendRequestCP=创建请假请求
 DelayToRequestCP=超过 <b>%s 天(s)</b> 必须请假.
 MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance is <b>%s</b> days.
+SoldeCPUser=Leave balance (in days) <b>%s</b>
 ErrorEndDateCP=你选取的结束日期必须大于起始日期要不然时光逆转就说不过去啦。
 ErrorSQLCreateCP=创建过程中发生了一个SQL错误：
 ErrorIDFicheCP=出现一个错误，请假申请不存在。
@@ -134,3 +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/install.lang b/htdocs/langs/zh_CN/install.lang
index a065602c849..336e4f47558 100644
--- a/htdocs/langs/zh_CN/install.lang
+++ b/htdocs/langs/zh_CN/install.lang
@@ -21,6 +21,7 @@ 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 不存在。
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 f11c5a8f5c0..95ab4e7a0b0 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=错误，没有为国家'%s'设置增值
 ErrorNoSocialContributionForSellerCountry=错误，没有为国家'%s'定义社会/财政税类型
 ErrorFailedToSaveFile=错误，无法保存文件。
 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=您无权执行此操作。
 SetDate=设置日期
@@ -87,7 +88,7 @@ FileWasNotUploaded=一个文件被选中的附件，但还没有上传。点击
 NbOfEntries=No. of entries
 GoToWikiHelpPage=阅读在线帮助文档 (需要访问外网)
 GoToHelpPage=阅读帮助
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=记录已保存
 RecordDeleted=记录已删除
@@ -114,7 +115,7 @@ ReturnCodeLastAccessInError=返回最后数据库访问请求错误代码
 InformationLastAccessInError=最后数据库访问请求错误信息
 DolibarrHasDetectedError=Dolibarr检测到一个技术性错误
 YouCanSetOptionDolibarrMainProdToZero=您可以在配置文件中读取日志文件或将选项$ dolibarr_main_prod设置为“0”以获取更多信息。
-InformationToHelpDiagnose=此信息可用于诊断目的（您可以将选项$ dolibarr_main_prod设置为'1'以删除此类通知）
+InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
 MoreInformation=更多信息
 TechnicalInformation=技术信息
 TechnicalID=技术ID
@@ -211,6 +212,8 @@ User=用户
 Users=用户
 Group=组
 Groups=群组
+UserGroup=User group
+UserGroups=User groups
 NoUserGroupDefined=未定义用户群组
 Password=密码
 PasswordRetype=重新输入您的密码
@@ -906,7 +909,7 @@ ViewFlatList=查看全部列表
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 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">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=(用户)客户端时区
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/zh_CN/modulebuilder.lang b/htdocs/langs/zh_CN/modulebuilder.lang
index 7a320625fd6..a6df2f06431 100644
--- a/htdocs/langs/zh_CN/modulebuilder.lang
+++ b/htdocs/langs/zh_CN/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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>'找到可钩子函数）。
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events recorded by other modules).
+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=查看安装中使用的ID
 SeeReservedIDsRangeHere=查看保留ID的范围
 ToolkitForDevelopers=Dolibarr开发人员工具包
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/other.lang b/htdocs/langs/zh_CN/other.lang
index 6d51a6bbd73..ade0db35aa6 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -258,6 +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
 YourPasswordHasBeenReset=您的密码已成功重置
 ApplicantIpAddress=申请人的IP地址
 SMSSentTo=短信发送到%s
@@ -268,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=导出区
diff --git a/htdocs/langs/zh_CN/partnership.lang b/htdocs/langs/zh_CN/partnership.lang
index 0bf28d06f33..53cfd3349be 100644
--- a/htdocs/langs/zh_CN/partnership.lang
+++ b/htdocs/langs/zh_CN/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/zh_CN/productbatch.lang b/htdocs/langs/zh_CN/productbatch.lang
index 7cc2309168d..0a154a63348 100644
--- a/htdocs/langs/zh_CN/productbatch.lang
+++ b/htdocs/langs/zh_CN/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index e30c09baf8c..bd485326d4a 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=加权平均价格
 PMPValueShort=的WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index 787a1841903..03644f2a7f9 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -197,6 +197,7 @@ InputPerMonth=Input per month
 InputDetail=输入细节
 TimeAlreadyRecorded=这是此任务/日和用户%s已记录的时间
 ProjectsWithThisUserAsContact=项目的用户作为联系人
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=任务分配给这个用户
 ResourceNotAssignedToProject=未分配到项目
 ResourceNotAssignedToTheTask=未分配给任务
@@ -284,3 +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=结束日期不能早过开始日期啊，时光不能倒流呀魂淡
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 b3a5a4cb6a1..000c4ec4d04 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=正确删除警报和所需最佳库存的库存限
 AddNewProductStockWarehouse=设置警报和所需最佳库存的新限制
 AddStockLocationLine=减少数量，然后单击以添加此产品的另一个仓库
 InventoryDate=库存日期
+Inventories=Inventories
 NewInventory=新库存
 inventorySetup = 库存设置
 inventoryCreatePermission=创建新库存
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=允许更改产品的PMP值
 ColumnNewPMP=新单位PMP
 OnlyProdsInStock=不添加库存的产品
-TheoricalQty=理论数量
-TheoricalValue=理论数量
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=最后 BP
 CurrentPA=当前 BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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=开始
+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
diff --git a/htdocs/langs/zh_CN/stripe.lang b/htdocs/langs/zh_CN/stripe.lang
index 31131a72634..c3ace0f5829 100644
--- a/htdocs/langs/zh_CN/stripe.lang
+++ b/htdocs/langs/zh_CN/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe模块设置
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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=使用信用卡或Stripe付款
 FollowingUrlAreAvailableToMakePayments=以下网址可提供给客户的网页上，能够作出Dolibarr支付对象
 PaymentForm=付款方式
@@ -28,7 +28,6 @@ AccountParameter=帐户参数
 UsageParameter=使用参数
 InformationToFindParameters=帮助，找到你的%s帐户信息
 STRIPE_CGI_URL_V2=Stripe CGI模块的URL用于付款
-VendorName=供应商名称
 CSSUrlForPaymentForm=付款方式的CSS样式表的URL
 NewStripePaymentReceived=收到新Stripe付款
 NewStripePaymentFailed=新Stripe付款尝试但失败了
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
index c1dd0079b59..72dd3ffd8b9 100644
--- a/htdocs/langs/zh_CN/withdrawals.lang
+++ b/htdocs/langs/zh_CN/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=最后 %s 取款收据
 WithdrawalsLine=Direct debit order line
+CreditTransfer=Credit transfer
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=直接借记订单行
 CreditTransferLines=Credit transfer lines
@@ -47,6 +48,7 @@ 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=分类记
+ClassDebited=Classify debited
 ClassCreditedConfirm=你确定要分类这一撤离收据上记入您的银行帐户？
 TransData=数据传输
 TransMetod=传输的方法
@@ -80,7 +82,7 @@ StatusMotif7=司法判决
 StatusMotif8=其他原因
 CreateForSepaFRST=创建直接借记文件（SEPA FRST）
 CreateForSepaRCUR=创建直接借记文件（SEPA RCUR）
-CreateAll=创建直接借记文件（全部）
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=只有办公室
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=无法为空金额创建直接付款请求。
 SepaMandate=SEPA直接借记授权
 SepaMandateShort=SEPA授权
 PleaseReturnMandate=请将此任务表格通过电子邮件发送至%s或邮寄至
-SEPALegalText=通过签署此授权表格，您授权（A）%s向您的银行发送指示以从您的帐户中扣款;以及（B）您的银行根据%s的指示从您的帐户中扣款。作为您权利的一部分，您有权根据与银行协议的条款和条件从银行获得退款。必须在自您的帐户扣款之日起的8周内申领退款。您可以从银行获得的声明中解释了您对上述任务的权利。
+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=债权人标识符
 CreditorName=Creditor Name
 SEPAFillForm=（B）请填写标有*的所有字段
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/zh_HK/accountancy.lang b/htdocs/langs/zh_HK/accountancy.lang
index c20e0a339f6..8bc4b54a090 100644
--- a/htdocs/langs/zh_HK/accountancy.lang
+++ b/htdocs/langs/zh_HK/accountancy.lang
@@ -48,7 +48,7 @@ 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 were used to generate your accountancy.
+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
@@ -286,7 +286,7 @@ 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
 
 ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+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
@@ -387,7 +387,8 @@ 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
@@ -404,6 +405,7 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/zh_HK/admin.lang b/htdocs/langs/zh_HK/admin.lang
index 8e38468846c..d79adb1e960 100644
--- a/htdocs/langs/zh_HK/admin.lang
+++ b/htdocs/langs/zh_HK/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Version
 Publisher=Publisher
@@ -265,8 +267,8 @@ 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">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
+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
@@ -341,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>
@@ -353,6 +355,7 @@ 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>
@@ -753,7 +756,7 @@ Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
 Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
+Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
 Permission115=Export transactions and account statements
 Permission116=Transfers between accounts
@@ -762,6 +765,7 @@ 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)
@@ -889,12 +893,11 @@ Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
-Permission777=Read expense reports of everybody
+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
@@ -958,15 +961,11 @@ Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
 Permission3301=Generate new modules
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+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
@@ -977,9 +976,9 @@ 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 of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+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
@@ -1358,9 +1357,9 @@ BrowserIsOK=You are using the %s web browser. This browser is ok for security an
 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. info list (select list or combobox) and most of hyperlink.<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. info list (select list or combobox).
-AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<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=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
@@ -1708,8 +1707,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+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
@@ -1725,8 +1725,8 @@ 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
+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>
@@ -1901,6 +1901,7 @@ 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
@@ -1916,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
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=Do you want to run the collection for this collecto
 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 email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
+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
@@ -2078,7 +2082,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=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
@@ -2124,7 +2128,7 @@ LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
 EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted a string 'Name: name to find' found into the body, use 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=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?
@@ -2209,3 +2213,10 @@ SkinAndColors=Skin and colors
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
+MissingTranslationForConfKey = Missing translation for %s
+NativeModules=Native modules
+NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
+API_DISABLE_COMPRESSION=Disable compression of API responses
+EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
+PreviousHash=Previous hash
diff --git a/htdocs/langs/zh_HK/banks.lang b/htdocs/langs/zh_HK/banks.lang
index 6c770163f29..f066877f676 100644
--- a/htdocs/langs/zh_HK/banks.lang
+++ b/htdocs/langs/zh_HK/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank Account Number
 IBAN=IBAN number
 BIC=BIC/SWIFT code
 SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct debit orders
@@ -49,7 +49,6 @@ BankAccountDomiciliation=Bank address
 BankAccountCountry=Account country
 BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
 CreateAccount=Create account
 NewBankAccount=New account
 NewFinancialAccount=New financial account
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/bookmarks.lang b/htdocs/langs/zh_HK/bookmarks.lang
index d2378963a21..be0f2f7e25d 100644
--- a/htdocs/langs/zh_HK/bookmarks.lang
+++ b/htdocs/langs/zh_HK/bookmarks.lang
@@ -15,7 +15,7 @@ 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://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+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
diff --git a/htdocs/langs/zh_HK/companies.lang b/htdocs/langs/zh_HK/companies.lang
index bce0a98ea83..7de663ede6d 100644
--- a/htdocs/langs/zh_HK/companies.lang
+++ b/htdocs/langs/zh_HK/companies.lang
@@ -157,6 +157,18 @@ 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=-
@@ -369,7 +381,7 @@ 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">%s</a>
+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
diff --git a/htdocs/langs/zh_HK/compta.lang b/htdocs/langs/zh_HK/compta.lang
index 97b990f62b4..640a229b7f2 100644
--- a/htdocs/langs/zh_HK/compta.lang
+++ b/htdocs/langs/zh_HK/compta.lang
@@ -170,8 +170,9 @@ 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=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
+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.
@@ -295,3 +296,5 @@ 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/zh_HK/errors.lang b/htdocs/langs/zh_HK/errors.lang
index c62940f4859..e05f9dc7a2a 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
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
 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
@@ -271,6 +274,9 @@ 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.
@@ -312,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/holiday.lang b/htdocs/langs/zh_HK/holiday.lang
index 0527f4c0788..3d0ae64be0f 100644
--- a/htdocs/langs/zh_HK/holiday.lang
+++ b/htdocs/langs/zh_HK/holiday.lang
@@ -27,7 +27,7 @@ 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 is <b>%s</b> days.
+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.
@@ -134,3 +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/install.lang b/htdocs/langs/zh_HK/install.lang
index c1ffee936d7..989f6aa9793 100644
--- a/htdocs/langs/zh_HK/install.lang
+++ b/htdocs/langs/zh_HK/install.lang
@@ -21,6 +21,7 @@ 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.
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/main.lang b/htdocs/langs/zh_HK/main.lang
index 7124b2d7b1b..2d850927782 100644
--- a/htdocs/langs/zh_HK/main.lang
+++ b/htdocs/langs/zh_HK/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 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
@@ -87,7 +88,7 @@ FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. C
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=Read help
-DedicatedPageAvailable=There is a dedicated help page related to your current screen
+DedicatedPageAvailable=Dedicated help page related to your current screen
 HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
@@ -114,7 +115,7 @@ 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 remove such notices)
+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
@@ -211,6 +212,8 @@ 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
@@ -906,7 +909,7 @@ ViewFlatList=View flat list
 ViewAccountList=View ledger
 ViewSubAccountList=View subaccount ledger
 RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
+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
@@ -1158,4 +1161,6 @@ Properties=Properties
 hasBeenValidated=%s has been validated
 ClientTZ=Client Time Zone (user)
 NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+ClearSignature=Reset signature
+CanceledHidden=Canceled hidden
+CanceledShown=Canceled shown
diff --git a/htdocs/langs/zh_HK/modulebuilder.lang b/htdocs/langs/zh_HK/modulebuilder.lang
index e479438769d..61b5c939d12 100644
--- a/htdocs/langs/zh_HK/modulebuilder.lang
+++ b/htdocs/langs/zh_HK/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=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>
@@ -98,7 +98,7 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
+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
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 9bc68dc3678..49ff93dd589 100644
--- a/htdocs/langs/zh_HK/other.lang
+++ b/htdocs/langs/zh_HK/other.lang
@@ -258,6 +258,10 @@ 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
@@ -268,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/partnership.lang b/htdocs/langs/zh_HK/partnership.lang
index 9ae8f2366fd..c755ec8591d 100644
--- a/htdocs/langs/zh_HK/partnership.lang
+++ b/htdocs/langs/zh_HK/partnership.lang
@@ -19,7 +19,7 @@
 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
diff --git a/htdocs/langs/zh_HK/productbatch.lang b/htdocs/langs/zh_HK/productbatch.lang
index 71e44e8f281..ddf3eab9f3f 100644
--- a/htdocs/langs/zh_HK/productbatch.lang
+++ b/htdocs/langs/zh_HK/productbatch.lang
@@ -30,7 +30,7 @@ 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 add for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
 LifeTime=Life span (in days)
 EndOfLife=End of life
 ManufacturingDate=Manufacturing date
@@ -42,3 +42,4 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
+ToReplace=Replace
diff --git a/htdocs/langs/zh_HK/products.lang b/htdocs/langs/zh_HK/products.lang
index 205a28980a8..14715670882 100644
--- a/htdocs/langs/zh_HK/products.lang
+++ b/htdocs/langs/zh_HK/products.lang
@@ -402,9 +402,12 @@ AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Weighted average price
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
+mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+SwitchOnSaleStatus=Switch on sale status
+SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/zh_HK/projects.lang b/htdocs/langs/zh_HK/projects.lang
index 5a2911bac0b..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,3 +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_HK/stocks.lang b/htdocs/langs/zh_HK/stocks.lang
index a2a335be8f6..599c9649b18 100644
--- a/htdocs/langs/zh_HK/stocks.lang
+++ b/htdocs/langs/zh_HK/stocks.lang
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock cor
 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
@@ -206,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Theorical qty
+TheoricalValue=Theorical qty
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Recorded Qty
@@ -240,7 +241,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Fill real qty by scaning
+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.
@@ -253,14 +254,20 @@ 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
+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
-FieldCannotBeNegative=Field "%s" cannot be negative
 ErrorWrongBarcodemode=Unknown Barcode mode
 ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
+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
diff --git a/htdocs/langs/zh_HK/stripe.lang b/htdocs/langs/zh_HK/stripe.lang
index 844762040af..2c95bcfce27 100644
--- a/htdocs/langs/zh_HK/stripe.lang
+++ b/htdocs/langs/zh_HK/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=Offer customers a Stripe online payment page for payments with credit/cebit cards via <a href="http://www.stripe.com" target="_blank">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=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
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/zh_HK/withdrawals.lang b/htdocs/langs/zh_HK/withdrawals.lang
index a3773a427a1..bda987276b1 100644
--- a/htdocs/langs/zh_HK/withdrawals.lang
+++ b/htdocs/langs/zh_HK/withdrawals.lang
@@ -15,6 +15,7 @@ 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
@@ -47,6 +48,7 @@ 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
@@ -80,7 +82,7 @@ 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 (all)
+CreateAll=Create direct debit file
 CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+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 *
@@ -150,3 +152,5 @@ 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
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index 7ba71dd2281..beb44dc103c 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/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=非零值的帳戶
@@ -48,8 +48,8 @@ CountriesNotInEEC=非歐盟國家
 CountriesInEECExceptMe=除了%s以外的歐盟國家
 CountriesExceptMe=除了%s以外的所有國家
 AccountantFiles=匯出來源文件
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that were used to generate your accountancy.
-ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
+ExportAccountingSourceDocHelp=使用此工具，您可以匯出用於產生會計的來源事件（CSV 和 PDF 中的清單）。
+ExportAccountingSourceDocHelp2=要匯出您的日記帳，請使用選單條目 %s - %s。
 VueByAccountAccounting=依會計科目檢視
 VueBySubAccountAccounting=依會計子分類帳檢視
 
@@ -87,8 +87,8 @@ AccountancyAreaDescAnalyze=步驟%s：新增或編輯現有交易並生成報告
 
 AccountancyAreaDescClosePeriod=步驟%s：關帳期，因此我們之後無法進行修改。
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
-Selectchartofaccounts=選擇有效的會計科目表
+TheJournalCodeIsNotDefinedOnSomeBankAccount=設定中的強制性步驟尚未完成（未為所有銀行帳戶定義會計代碼日記帳）
+Selectchartofaccounts=會計項目表選擇有效的會計科目表
 ChangeAndLoad=修改並載入
 Addanaccount=新增會計科目
 AccountAccounting=會計科目
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=費用報表的關聯
 CreateMvts=建立新的交易
 UpdateMvts=交易的修改
 ValidTransaction=驗證交易
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=在總帳中記錄交易
 Bookkeeping=總帳
 BookkeepingSubAccount=子分類帳
 AccountBalance=帳戶餘額
@@ -148,7 +148,7 @@ NotVentilatedinAccount=不受會計項目約束
 XLineSuccessfullyBinded=%s 產品/服務成功地指定會計項目
 XLineFailedToBeBinded=%s 產品/服務沒指定任何會計項目
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=清單與綁定頁面中的最大行數（建議：50）
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=開始按最新元件對“待綁定”頁面進行排序
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=開始按最新元件對“完成綁定”頁面進行排序
 
@@ -159,7 +159,7 @@ ACCOUNTING_LENGTH_AACCOUNT=合作方會計帳戶的長度（如果在此處將
 ACCOUNTING_MANAGE_ZERO=允許在會計帳戶末尾管理不同數量的零。一些國家（例如瑞士）需要。如果設置為off（默認），則可以設置以下兩個參數來要求應用程序添加虛擬零。
 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)
+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
 
@@ -168,7 +168,7 @@ 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=結果會計科目（虧損）
@@ -211,15 +211,15 @@ JournalLabel=日記帳標籤
 NumPiece=件數
 TransactionNumShort=交易編號
 AccountingCategory=自定義群組
-GroupByAccountAccounting=Group by general ledger account
-GroupBySubAccountAccounting=Group by subledger account
+GroupByAccountAccounting=依總分類帳帳戶的群組
+GroupBySubAccountAccounting=依子分類帳帳戶的群組
 AccountingAccountGroupsDesc=您可定義某些會計科目大類。他們可以在個人化會計報表中使用。
 ByAccounts=依帳戶
 ByPredefinedAccountGroups=依大類
 ByPersonalizedAccountGroups=依個人化大類
 ByYear=依年度
 NotMatch=未設定
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=從會計中刪除一些操作行
 DelMonth=刪除月份
 DelYear=刪除年度
 DelJournal=刪除日記帳
@@ -286,7 +286,7 @@ ValidateMovements=驗證動作
 DescValidateMovements=禁止修改，刪除任何文字內容。所有條目都必須經過驗證，否則將無法結案
 
 ValidateHistory=自動關聯
-AutomaticBindingDone=自動關聯已完成
+AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=錯誤，您不能刪除此會計項目，因為已使用
 MvtNotCorrectlyBalanced=動作未正確平衡。借方= %s |貸方= %s
@@ -298,10 +298,10 @@ NoNewRecordSaved=沒有交易可記錄
 ListOfProductsWithoutAccountingAccount=清單中的產品沒有指定任何會計項目
 ChangeBinding=修改關聯性
 Accounted=計入總帳
-NotYetAccounted=Not yet transferred to accounting
+NotYetAccounted=尚未轉入會計
 ShowTutorial=顯示教程
 NotReconciled=未對帳
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+WarningRecordWithoutSubledgerAreExcluded=警告，所有未定義子分類帳帳戶的操作都將被過濾並從該檢視中排除
 
 ## Admin
 BindingOptions=綁定選項
@@ -339,7 +339,7 @@ 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
@@ -352,9 +352,9 @@ Modelcsv_FEC=匯出為FEC
 Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=匯出為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_Gestinumv3=匯出為Gestinum (v3)
+Modelcsv_Gestinumv5=匯出為Gestinum (v5)
+Modelcsv_charlemagne=匯出為Aplim Charlemagne
 ChartofaccountsId=會計項目表ID
 
 ## Tools - Init accounting account on product / service
@@ -387,7 +387,8 @@ SaleExport=出口銷售
 SaleEEC=在歐盟銷售
 SaleEECWithVAT=在EEC中具有營業稅的銷售不為空，因此我們認為這不是內部銷售，建議的帳戶是標準產品帳戶。
 SaleEECWithoutVATNumber=在EEC中銷售沒有營業稅但合作方的營業稅ID未定義。我們退回標準銷售的產品帳戶。您可以根據需要修改合作方或產品帳戶的營業稅ID。
-
+ForbiddenTransactionAlreadyExported=禁止：交易已被驗證和/或匯出。
+ForbiddenTransactionAlreadyValidated=禁止：交易已被驗證。
 ## Dictionary
 Range=會計項目範圍
 Calculated=已計算
@@ -404,32 +405,33 @@ NoJournalDefined=沒有定義的日記帳
 Binded=關聯行數
 ToBind=關聯行
 UseMenuToSetBindindManualy=尚未綁定的行，請使用選單<a href="%s">%s</a>手動進行綁定
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=抱歉此模組不相容於情況發票的實驗功能
 
 ## 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=代碼日記簿（日記簿代碼）
+FECFormatJournalLabel=標籤日記簿 (JournalLib)
+FECFormatEntryNum=件數 (EcritureNum)
+FECFormatEntryDate=記件日期 (EcritureDate)
+FECFormatGeneralAccountNumber=通用帳號 (CompteNum)
+FECFormatGeneralAccountLabel=通用帳號標籤 (CompteLib)
+FECFormatSubledgerAccountNumber=子分類帳帳號 (CompAuxNum)
+FECFormatSubledgerAccountLabel=子分類帳帳號 (CompAuxLib)
+FECFormatPieceRef=計件參考 (PieceRef)
+FECFormatPieceDate=記件日期建立 (PieceDate)
+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=可對帳日期
+FECFormatValidateDate=驗證日期
+FECFormatMulticurrencyAmount=多國幣別金額（貨幣金額）
+FECFormatMulticurrencyCode=多國幣別代碼（Idevise）
 
 DateExport=日期輸出
 WarningReportNotReliable=警告，此報表非依總帳製作的，所以不含總帳中人工修改的交易。若您日記簿是最新的日期，則記帳檢視會比較準確。
 ExpenseReportJournal=費用報表日記帳
 InventoryJournal=庫存日記帳
 
-NAccounts=%s accounts
+NAccounts=%s 個帳戶
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 74bf5f5a8b7..5cf0f3303c9 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=基金會
 Version=版本
 Publisher=發佈者
@@ -75,7 +77,7 @@ 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>如果您有大量的合作方，這可能會提高性能，但是不太方便。
@@ -160,7 +162,7 @@ Purge=清除
 PurgeAreaDesc=此頁面允許您刪除Dolibarr產生或儲存的所有文件（暫存檔案或<b>%s</b>目錄中的所有文件）。通常不需要使用此功能。此功能提供無權限刪除Web服務器產生之文件的Dolibarr用戶提供了一種解決方法。
 PurgeDeleteLogFile=刪除 log 檔案，包含Syslog 模組的 <b>%s</b> (沒有遺失資料風險)
 PurgeDeleteTemporaryFiles=刪除所有日誌與暫存檔案（沒有丟失資料的風險）。 參數可以是“tempfilesold”、“logfiles”或兩者“tempfilesold+logfiles”。 注意：只有在 24 小時之前所建立的臨時目錄，才會刪除臨時文件。
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files (no risk of losing data)
+PurgeDeleteTemporaryFilesShort=刪除紀錄和暫存檔案(沒有丟失資料的風險)
 PurgeDeleteAllFilesInDocumentsDir=刪除資料夾中的所有檔案： <b>%s</b> 。 <br>這將刪除所有與元件（合作方，發票等）相關的所有產生文件，上傳到ECM模組中的檔案，資料庫備份轉存和臨時文件。
 PurgeRunNow=立即清除
 PurgeNothingToDelete=沒有可以刪除的資料夾或檔案。
@@ -265,8 +267,8 @@ OtherResources=其他資源
 ExternalResources=外部資源
 SocialNetworks=社群網路
 SocialNetworkId=社群網路 ID
-ForDocumentationSeeWiki=有關用戶或開發人員的文件（文件，常見問題...), <br>可在Dolibarr維基查閱： <br> <a href="%s" target="_blank"><b>%s</b></a>
-ForAnswersSeeForum=有關任何其他問題/幫助，您可以使用Dolibarr論壇： <br> <a href="%s" target="_blank"><b>%s</b></a>
+ForDocumentationSeeWiki=用戶或開發人員的文件（文件，常見問題...), <br>可在Dolibarr維基查閱： <br><b> <a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
+ForAnswersSeeForum=有關任何其他問題/幫助，您可以前往Dolibarr論壇：<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=以下是獲得Dolibarr幫助和支持的一些資源。
 HelpCenterDesc2=其中一些資源僅以<b>英語提供</b> 。
 CurrentMenuHandler=目前選單處理者
@@ -279,7 +281,7 @@ 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=電子郵件
@@ -341,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>
@@ -353,12 +355,13 @@ LastStableVersion=最新穩定版本
 LastActivationDate=最新啟動日期
 LastActivationAuthor=最新啟動的作者
 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>年超過2、4或1個數字。 <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>
+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>
+GenericMaskCodes3EAN=遮罩中的所有其他字元將保持不變（EAN13 中第 13 位的 * 或 ? 除外）。 <br>不允許使用空格。 <br> 在 EAN13 中，第 13 位最後一個 } 之後的最後一個字元應該是 * 或 ? .它將被計算的金鑰替換。 <br>
 GenericMaskCodes4a=<u>在日期 2007-01-31 ,第99個%s合作方公司範例:</u><br>
 GenericMaskCodes4b=<u>位於2007-03-01 建立的合作方範例:</u><br>
 GenericMaskCodes4c=<u>位於2007-03-01 建立的產品範例:</u><br>
@@ -375,8 +378,8 @@ UMask=在 Unix/Linux/BSD/Mac 的檔案系統中新檔案的 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=沒有自動換行，太長的文字將不會顯示在文件上。如果需要，請在文字區域增加Enter符號。
 ConfirmPurge=您確定要執行此清除嗎？ <br>這將永久刪除您的所有資料檔案，而無法還原它們（ECM檔案，附件檔案...）。
 MinLength=最小長度
@@ -454,8 +457,8 @@ ExtrafieldParamHelpPassword=將欄位保留為空白表示該值將不加密地
 ExtrafieldParamHelpselect=數值清單必須為含有關鍵字的行,數值 (關鍵字不能為 '0')<br><br>例如： <br> 1，值1 <br> 2，值2 <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，值1 | <i>parent_list_code</i> ：parent_key <br> 2，值2 | <i>parent_list_code</i> ：parent_key
 ExtrafieldParamHelpcheckbox=數值清單必須為含有關鍵字的行,數值 (關鍵字不能為 '0')<br><br>範例:<br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=數值清單必須為含有關鍵字的行,數值 (關鍵字不能為 '0')<br><br>範例:<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
+ExtrafieldParamHelpsellist=數值清單來自表格<br>語法：table_name：label_field：id_field :: filter <br>範例：c_typent：libelle：id :: filter <br><br> -idfilter一定是初始關鍵字<br> -過濾器可以是一個簡單測試（例如，active = 1），僅顯示有效值<br>您還可以在過濾器中使用$ ID $作為目前項目的目前ID <br>要在過濾器中執行SELECT，請使用$ SEL $ <br>如果要過濾Extrafield，請使用語法extra.fieldcode = ...（其中欄位代碼是Extrafield的代碼） <br><br>為了使此清單依賴於另一個互補屬性清單： <br> c_typent：libelle：id：options_ <i>parent_list_code</i> | parent_column：filter <br><br>為了使清單依賴於另一個清單： <br> c_typent：libelle：id： <i>parent_list_code</i> | parent_column：filter
+ExtrafieldParamHelpchkbxlst=表單中的數值清單<br>語法： table_name:label_field:id_field::filter<br>例如：: c_typent:libelle:id::filter<br><br>篩選可以是一個簡單的測試 (例如 啟動 =1 ) 只顯示啟動的數值<br>您也可以在篩選中使用 $ID$作為目前物件的ID<br>在篩選器中執行 SELECT 則使用 $SEL$<br>若您要在額外欄位篩選使用語法 extra.fieldcode=... (extra.fileldcode為欄位的代碼)<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可折疊分隔符號（預設情況下，新程序已折疊，然後在每個用戶程序中保持狀態）
 LibraryToBuildPDF=PDF產生器程式庫
@@ -495,13 +498,13 @@ ModuleCompanyCodeSupplierDigitaria=%s依照被截斷並帶有字元數的供應
 Use3StepsApproval=預設情況下，採購訂單需要由2個不同的用戶建立和批准（一個步驟/一個用戶建立，一個步驟/一個用戶批准。請注意，如果用戶同時具有建立和批准的權限，則一個步驟/用戶就足夠了） 。如果金額高於專用值，則可以使用此選項進行三步/用戶批准（如果需要，則需要3個步驟：1 =驗證，2 =第一次批准和3 =第二次批准）。 <br>如果一個批准（2個步驟）就足夠，則將其設定為空白；如果永遠需要第二個批准（3個步驟），則將其設定為非常低的值（0.1）。
 UseDoubleApproval=當金額(未稅)大於以下金額時使用3步驟核准
 WarningPHPMail=警告: 從此應用程式寄出電子郵件的設定使用的是預設的原始設定。相較於使用預設設定用您電子郵件服務提供的電子信箱伺服器來設定寄出郵件是比較好的，理由如下:
-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.
+WarningPHPMailA=- 使用電子郵件服務提供者的伺服器可以增加您電子信箱的可信度，所以會增加寄信成功率並且不會被標記為垃圾信件
+WarningPHPMailB=- 一些電子郵件服務提供商（如雅虎）不允許您從其他伺服器而不是他們自己的伺服器發送電子郵件。您當前的設定是使用程式的伺服器而不是您的電子郵件提供商的伺服器來發送電子郵件，因此某些收件人（與限制性 DMARC 協議兼容的那個）會詢問您的電子郵件提供商他們是否可以接受您的電子郵件而某些電子郵件供應商（如雅虎）可能會回答“否”，因為伺服器不是他們的，所以您發送的電子郵件中有可能少部份不被接受（還要注意您的電子郵件供應商的發送配額）。
+WarningPHPMailC=- 使用您自己的電子郵件服務提供商的 SMTP 伺服器發送電子郵件也很好，因此從應用程式發送的所有電子郵件也將保存到您電子郵件的“已發送”資料夾中。
+WarningPHPMailD=此外，因此建議將電子郵件的發送方法更改為“SMTP”。如果您確實想保留預設的“PHP”方式來發送電子郵件，只需忽略此警告，或在 首頁 - 設定 - 其他設定 中將 MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP 數值設定為 1 來刪除它。
 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
+WarningPHPMailSPF=如果您的寄件人電子郵件地址中的網域名稱受到SPF 記錄保護（詢問您的網域名稱註冊商），您必須在您的網域 DNS 的 SPF 記錄中增加以下 IP： <strong> %s </strong> 。
+ActualMailSPFRecordFound=找到的實際 SPF 記錄：%s
 ClickToShowDescription=點選顯示描述
 DependsOn=此模組需要此模組
 RequiredBy=模組需要此模組
@@ -518,9 +521,9 @@ 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
+ProjectIsRequiredOnExpenseReports=此專案強制需要輸入費用報表
+PrefillExpenseReportDatesWithCurrentMonth=費用報表的開始和結束日期預先使用當月的開始和結束日期
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=強制以含稅金額輸入費用報表金額
 AttachMainDocByDefault=若您要預設將主要文件附加到電子郵件(若適用的話)，此值設定為 1
 FilesAttachedToEmail=附加檔案
 SendEmailsReminders=用電子郵件傳送行程提醒
@@ -572,7 +575,7 @@ Module54Desc=合約管理（服務或定期訂閱）
 Module55Name=條碼
 Module55Desc=條碼或QR code管理
 Module56Name=信用轉帳付款
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module56Desc=以信用轉帳訂單管理供應商的付款。它包括為歐洲國家生產生SEPA檔案。
 Module57Name=銀行直接轉帳付款
 Module57Desc=管理直接轉帳付款訂單。它包括為歐洲國家產生的SEPA檔案。
 Module58Name=點選撥打
@@ -610,7 +613,7 @@ Module400Desc=專案、潛在/機會及/或任務的管理。你也可指派任
 Module410Name=Webcalendar
 Module410Desc=Webcalendar 整合
 Module500Name=稅金和特殊費用
-Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
+Module500Desc=其他費用管理（營業稅，社會或財政稅，股利等）
 Module510Name=薪資
 Module510Desc=記錄並追蹤員工付款
 Module520Name=貸款
@@ -682,7 +685,7 @@ Module50200Desc=向客戶提供一個PayPal線上支付頁面（PayPal帳戶或
 Module50300Name=Stripe
 Module50300Desc=為客戶提供Stripe線上支付頁面（信用卡/金融信用卡）。這可用於允許您的客戶進行臨時付款或與特定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=直接列印(不用打開文件)使用 Cups IPP 介面(印表機可在伺服器上看到，且 CUPS 必須已安裝在伺服器上)。
 Module55000Name=問卷、調查或投票
@@ -753,7 +756,7 @@ Permission106=匯出出貨單
 Permission109=刪除出貨單
 Permission111=讀取財務帳戶
 Permission112=建立/修改/刪除及比較交易
-Permission113=設定財務帳戶(建立、管理分類)
+Permission113=設定財務帳戶(銀行交易的建立、管理分類)
 Permission114=調整交易
 Permission115=匯出交易和會計描述
 Permission116=帳戶之間的交易
@@ -762,6 +765,7 @@ Permission121=讀取已連結到用戶的合作方
 Permission122=建立/修改已連結到用戶的合作方
 Permission125=刪除已連結到用戶的合作方
 Permission126=匯出合作方資料
+Permission130=建立/修改合作方支付資訊
 Permission141=讀取全部專案及任務（也包含我不是連絡人的私人專案）
 Permission142=建立/修改全部專案及任務（也包含我不是連絡人的私人專案）
 Permission144=刪除全部專案及任務（也包含我不是連絡人的私人專案）
@@ -823,8 +827,8 @@ 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=讀取 CA
 Permission272=讀取發票
 Permission273=發票問題
@@ -889,12 +893,11 @@ Permission701=讀取捐款
 Permission702=建立/修改捐款
 Permission703=刪除捐款
 Permission771=讀取費用報表(您自己及您下屬的)
-Permission772=建立/修改費用報表
+Permission772=建立/修改費用報表（為您和您的下屬）
 Permission773=刪除費用報表
-Permission774=讀取全部費用報表(甚至非屬於用戶的下屬)
 Permission775=核准費用報表
 Permission776=支付費用報表
-Permission777=讀取每個人的費用報表
+Permission777=讀取所有費用報表（即使是非下屬的用戶）
 Permission778=建立/修改每個人的費用報表
 Permission779=匯出費用報表
 Permission1001=讀取庫存資訊
@@ -958,18 +961,14 @@ Permission2801=在唯讀模式下使用 FTP 客戶端 (僅瀏覽及下載)
 Permission2802=在寫入模式下使用 FTP 客戶端 (可刪除或上傳檔案)
 Permission3200=讀取存檔的事件和指紋
 Permission3301=產生新模組
-Permission4001=查看員工
-Permission4002=建立員工
-Permission4003=刪除員工
-Permission4004=匯出員工
-Permission4010=Read skill/job/position
-Permission4011=Create/modify skill/job/position
-Permission4012=Delete skill/job/position
-Permission4020=Read evaluation
-Permission4021=Create/modify evaluation
+Permission4001=讀取技能/工作/職位
+Permission4002=建立/修改技能/工作/職位
+Permission4003=刪除技能/工作/職位
+Permission4020=讀取評價
+Permission4021=建立/修改您的評價
 Permission4022=驗證評估
-Permission4023=Delete evaluation
-Permission4030=See comparison menu
+Permission4023=刪除評價
+Permission4030=查看比較選單
 Permission10001=讀取網站內容
 Permission10002=建立/修改網站內容（html和javascript內容）
 Permission10003=建立/修改網站內容（動態php代碼）。危險，必須留給受限開發人員使用。
@@ -978,8 +977,8 @@ Permission20001=讀取休假申請（您和您下屬的休假）
 Permission20002=建立/修改您的休假申請（您的休假和下屬的休假）
 Permission20003=刪除休假申請
 Permission20004=讀取全部休假申請 (甚至非您下屬的用戶)
-Permission20005=建立/修改全部人休假申請(甚至非您下屬的用戶)
-Permission20006=管理休假需求(設定及更新餘額)
+Permission20005=建立/修改所有人的休假申請(甚至非您下屬的用戶)
+Permission20006=管理休假申請（設定與更新餘額）
 Permission20007=批准休假申請
 Permission23001=讀取預定工作
 Permission23002=建立/更新預定工作
@@ -1052,7 +1051,7 @@ DictionaryFees=費用報表-費用報表行的類型
 DictionarySendingMethods=出貨方式
 DictionaryStaff=員工人數
 DictionaryAvailability=遲延交付
-DictionaryOrderMethods=Order methods
+DictionaryOrderMethods=訂購方式
 DictionarySource=原始提案/建議書/訂單
 DictionaryAccountancyCategory=報告的個人化組別
 DictionaryAccountancysystem=會計科目表模型
@@ -1185,8 +1184,8 @@ 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 專案的連結或直接定義一個網址'https://...'
 Alerts=警告
 DelaysOfToleranceBeforeWarning=顯示警告警報之前的延遲時間：
 DelaysOfToleranceDesc=設定延遲時間，以在螢幕上顯示延遲元件的警告圖案%s。
@@ -1211,9 +1210,9 @@ 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.
+SetupDescriptionLink= <a href="%s"> %s - %s </a>
+SetupDescription3b=用於自定義應用程式預設行為的基本參數（例如與國家/地區相關的功能）。
+SetupDescription4b=此軟體是許多模組/應用程式的套件。必須啟用和設定與您的需求相關的模組。啟用這些模組後將出現選單項目。
 AuditedSecurityEvents=已審計的安全性事件
 NoSecurityEventsAreAduited=無已審計的安全性事件。您可以啟用從選單 %s
 Audit=安全事件
@@ -1236,7 +1235,7 @@ SystemAreaForAdminOnly=此區域僅管理員可用。 Dolibarr用戶權限無法
 CompanyFundationDesc=編輯您的 公司/組織 資訊。完成後，點擊頁面底部的“ %s”按鈕。
 AccountantDesc=如果您有外部會計師/簿記員，則可以在此處編輯其資訊。
 AccountantFileNumber=會計代碼
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
+DisplayDesc=可以在此處修改影響應用程式外觀和顯示的參數。
 AvailableModules=可用的程式/模組
 ToActivateModule=為啟動模組前往設定區（首頁 -> 設定 -> 模組）。
 SessionTimeOut=程序超時
@@ -1283,12 +1282,12 @@ RunningUpdateProcessMayBeRequired=似乎需要執行升級（程式版本%s與
 YouMustRunCommandFromCommandLineAfterLoginToUser=用戶<b>%s</b>在登入終端機後您必須從命令列執行此命令，或您必須在命令列末增加 -W 選項以提供 <b>%s</b> 密碼。
 YourPHPDoesNotHaveSSLSupport=您的PHP中無法使用SSL功能
 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
+SimpleNumRefModelDesc=回傳格式為 %syymm-nnnn 的參考編號，其中 yy 是年份，mm 是月份，nnnn 是自動遞增的連續數字，無法重置
+SimpleNumRefNoDateModelDesc=回傳格式為 %s-nnnn 的參考號，其中 nnnn 是自動遞增的連續數字，無法重置
 ShowProfIdInAddress=顯示含有地址的專業 ID
 ShowVATIntaInAddress=隱藏歐盟內增值稅號
 TranslationUncomplete=部分翻譯
-MAIN_DISABLE_METEO=Disable weather thumb
+MAIN_DISABLE_METEO=停用氣象顯示
 MeteoStdMod=標準模式
 MeteoStdModEnabled=標準模式啟用
 MeteoPercentageMod=百分比模式
@@ -1302,7 +1301,7 @@ MAIN_PROXY_HOST=代理伺服器：名稱/地址
 MAIN_PROXY_PORT=代理伺服器：連接埠
 MAIN_PROXY_USER=代理伺服器：登入名稱/用戶
 MAIN_PROXY_PASS=代理伺服器：密碼
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
+DefineHereComplementaryAttributes=在此處定義您想要包括的任何其他/自定義屬性：%s
 ExtraFields=補充屬性
 ExtraFieldsLines=補充屬性(行)
 ExtraFieldsLinesRec=補充屬性 ( 範本發票行)
@@ -1352,16 +1351,16 @@ ComboListOptim=組合清單載入優化
 SearchOptim=搜尋最佳化
 YouHaveXObjectUseComboOptim=您有 %s %s 在資料庫內。您可以進入模組設定以啟用在按鍵事件上加載組合清單。
 YouHaveXObjectUseSearchOptim=您的資料庫中有%s %s。您應該在首頁-設定-其他中的%s增加常數1。
-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.
+YouHaveXObjectUseSearchOptimDesc=這將限制搜尋在字串的開頭，這使得資料庫可以使用索引，並且您應該立即得到回應。
 YouHaveXObjectAndSearchOptimOn=您在資料庫中有%s %s，並且在首頁-設定-其他中，常數%s設定為%s。
 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=Display Customer/Vendor VAT number. info list (select list or combobox).
-AddAdressInList=顯示客戶/供應商地址訊息清單（選擇清單或組合框） <br>合作方將以“ The Big Company corp。-21 jump street 123456 Big town-USA”的名稱格式出現，而不是“ 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=於組合清單中顯示客戶/供應商代號。 <br> 合作方將以“CC12345 - SC45678 - 大公司.”的名稱格式出現。而不是“大公司”。
+AddVatInList=在複合清單中顯示客戶/供應商的統一編號。
+AddAdressInList=於組合清單中顯示客戶/供應商地址。 <br> 合作方將以“大公司. - 21 jump street 123456 Big town - USA”的名稱格式出現，而不是“大公司”。
+AddEmailPhoneTownInContactList=在資訊清單中顯示聯絡人電子郵件（或電話，如果未定義）和城鎮（選擇清單或複合框） <br> 聯絡人將以“杜邦杜蘭德 - dupond.durand@email.com - 巴黎”或“杜邦杜蘭德 - 06 07”的名稱格式顯示59 65 66 - 巴黎”而不是“杜邦杜蘭德”。
 AskForPreferredShippingMethod=要求合作方使用首選的運輸方式。
 FieldEdition=欗位 %s編輯
 FillThisOnlyIfRequired=例如： +2 (若遇到時區偏移問題時才填寫)
@@ -1369,7 +1368,7 @@ 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.
+PasswordGenerationStandard=回傳根據 Dolibarr 內部算法產生的密碼：%s 個字元，包含數字和小寫字元。
 PasswordGenerationNone=不要產生建議密碼。密碼必須手動輸入。
 PasswordGenerationPerso=根據您個人定義的偏好設定返回密碼。
 SetupPerso=根據您的偏好設定
@@ -1391,7 +1390,7 @@ AccountCodeManager=自動產生客戶/供應商會計代碼的選項
 NotificationsDesc=對於某些Dolibarr事件，可以自動發送電子郵件通知。 <br>可以定義通知的收件人：
 NotificationsDescUser=*每位用戶，一次一個用戶。
 NotificationsDescContact=*對於每個合作方聯絡人（客戶或供應商），一次為一個聯絡人。
-NotificationsDescGlobal=* or by setting global email addresses in the setup page of the module.
+NotificationsDescGlobal=*或在模組設定頁面中設定全域電子郵件地址。
 ModelModules=文件範本
 DocumentModelOdt=從OpenDocument範本產生文件（來自LibreOffice，OpenOffice，KOffice，TextEdit等的.ODT / .ODS文件）
 WatermarkOnDraft=草稿文件上的浮水印
@@ -1491,10 +1490,10 @@ LDAPSynchronizeMembersTypes=在 LDAP 中基金會組織的會員類型
 LDAPPrimaryServer=主要伺服器
 LDAPSecondaryServer=次要伺服器
 LDAPServerPort=伺服器連接埠
-LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
+LDAPServerPortExample=標準或 StartTLS：389，LDAP：636
 LDAPServerProtocolVersion=通訊協議版本
 LDAPServerUseTLS=使用 TLS
-LDAPServerUseTLSExample=Your LDAP server use StartTLS
+LDAPServerUseTLSExample=您的 LDAP 伺服器使用StartTLS
 LDAPServerDn=伺服器DN
 LDAPAdminDn=管理員DN
 LDAPAdminDnExample=完整 DN ( 例如：針對啟動資料夾 cn=admin, dc=example, dc=com 或  cn=Administrator, cn=Users, dc=example, dc=com )
@@ -1644,13 +1643,13 @@ ProductSetup=產品模組設定
 ServiceSetup=服務模組設定
 ProductServiceSetup=產品和服務模組設定
 NumberOfProductShowInSelect=組合選擇清單中可顯示的最大產品數量（0 =無限制）
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
+ViewProductDescInFormAbility=在項目行中顯示產品描述（否則在工具提示彈出視窗中顯示描述）
 OnProductSelectAddProductDesc=從文件當中增加一個產品行時如何使用產品描述
 AutoFillFormFieldBeforeSubmit=自動將產品描述填入描述輸入欄位
 DoNotAutofillButAutoConcat=請不要將產品描述自動填入輸入欄位.產品描述將自動串連到整個描述
-DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
+DoNotUseDescriptionOfProdut=產品描述永遠不會包含在文件行的描述中
 MergePropalProductCard=若產品/服務在提案/建議書內，啟動產品/服務中附件檔分頁選項以將產品 PDF 文件整合成報價/建議書/提案的 azur 格式 PDF
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ViewProductDescInThirdpartyLanguageAbility=使用合作方的語言（否則使用用戶的語言）在表單中顯示產品描述
 UseSearchToSelectProductTooltip=同樣，如果您有大量產品(> 100 000)，則可以通過在設定-其他中將PRODUCT_DONOTSEARCH_ANYWHERE常數變數變為1來提高速度。然後搜尋將僅限於字串開頭的。
 UseSearchToSelectProduct=等到您按下一個鍵，然後再載入產品組合清單的內容（如果您有很多產品，這可能會提高性能，但是使用起來不太方便）
 SetDefaultBarcodeTypeProducts=產品預設條碼類型
@@ -1667,7 +1666,7 @@ SyslogLevel=層級
 SyslogFilename=檔案名稱和路徑
 YouCanUseDOL_DATA_ROOT=您可使用在 Dolibarr "文件"資料夾的日誌檔案 DOL_DATA_ROOT/dolibarr.log來紀錄 。您可以設定不同的路徑來存儲該檔案。
 ErrorUnknownSyslogConstant=常數 %s 不是一個已知的 Syslog 常數
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
+OnlyWindowsLOG_USER=在 Windows中，僅支援 LOG_USER 工具
 CompressSyslogs=除錯記錄檔案的縮壓及備份(由記錄除錯模組產生的)
 SyslogFileNumberOfSaves=要保留的備份日誌數
 ConfigureCleaningCronjobToSetFrequencyOfSaves=清除偏好設定的排程工作以設定週期備份日誌
@@ -1708,8 +1707,9 @@ MailingDelay=傳送下一則訊息前的等待秒數
 NotificationSetup=電子郵件通知模組設定
 NotificationEMailFrom=通知模組中的寄件人電子郵件（From）
 FixedEmailTarget=收件人
-NotificationDisableConfirmMessageFix=Disable notification info in confirm message for fix notification
-NotificationDisableConfirmMessageUser=Disable notification info in confirm message for user notification
+NotificationDisableConfirmMessageContact=隱藏訊息收件人(聯絡人)清單到確認訊息中
+NotificationDisableConfirmMessageUser=隱藏訊息收件人(用戶)清單到確認訊息中
+NotificationDisableConfirmMessageFix=隱藏訊息收件人(全域電子郵件)清單到確認訊息中
 ##### Sendings #####
 SendingsSetup=發貨模組設定
 SendingsReceiptModel=出貨單模型
@@ -1725,10 +1725,10 @@ 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=所見即所得編輯器建立/編輯元件欄位的“公開備註”
+FCKeditorForNotePrivate=所見即所得編輯器建立/編輯元件欄位的“不公開備註”
+FCKeditorForCompany=所見即所得編輯器建立/編輯元件欄位描述（產品/服務除外）
+FCKeditorForProduct=所見即所得建立/編輯產品/服務的欄位描述
 FCKeditorForProductDetails=所見即所得為所有項目（提案/建議書，訂單，發票等）建立/編輯產品明細行。 <font class="warning">警告：在這種情況下，強烈建議不要使用此選項，因為在產生PDF文件時，它會產生特殊字元和頁面格式的問題。</font>
 FCKeditorForMailing= 以所見即所得建立/編輯電子郵件 ( 工具 --> 電子郵件 )
 FCKeditorForUserSignature=以所見即所得建立/編輯用戶簽名檔
@@ -1746,7 +1746,7 @@ NotTopTreeMenuPersonalized=個人化選單沒有連結到頂端選單項目
 NewMenu=新選單
 MenuHandler=選單處理程式
 MenuModule=原始碼模組
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
+HideUnauthorizedMenu=也為內部用戶隱藏未經授權的選單（灰色）
 DetailId=選單編號
 DetailMenuHandler=顯示新的選單的選單處理程式
 DetailMenuModule=若選單項目來自一個模組則為模組名稱
@@ -1786,7 +1786,7 @@ 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=授權匯出連結秘鑰
@@ -1797,17 +1797,17 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=在事件建立表單中自動為事件類型設
 AGENDA_DEFAULT_FILTER_TYPE=在應辦事項視圖的搜索過濾器中自動設定此類事件
 AGENDA_DEFAULT_FILTER_STATUS=在應辦事項視圖的搜索過濾器中自動為事件設定此狀態
 AGENDA_DEFAULT_VIEW=當選擇應辦事項選單時預設要打開的分頁
-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=<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>電子郵件</b>事件提醒（可以在每個事件上定義提醒選項/延遲）。
+AGENDA_REMINDER_EMAIL_NOTE=注意：排程工作%s的頻率必須足夠以確定提醒可以在正確的時刻寄出。
 AGENDA_SHOW_LINKED_OBJECT=顯示已連結項目到行程的檢視中
 ##### Clicktodial #####
 ClickToDialSetup=點擊撥號模組設定
 ClickToDialUrlDesc=當點選電話圖示時則呼叫網址。在網址中，你可使用標籤<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.
+ClickToDialDesc=此模組在使用桌上型電腦時會將電話號碼更改為可點擊的連結。點擊將會撥打此號碼。例如，當在桌面上使用軟體電話或使用基於 SIP 協議的 CTI 系統時，這可用於啟動撥打電話。注意：使用智慧手機時，電話號碼始終是可點擊的。
 ClickToDialUseTelLink=在電話號碼中使用 "tel:" 連線
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link 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=如果您的用戶有軟體電話或軟體界面，與瀏覽器安裝在同一台電腦上，並要在您點擊瀏覽器中以“tel:”開頭的連結時撥打，請使用此方法。如果您需要以“sip:”開頭的連結或完整的服務器解決方案（無需安裝本地軟體），您必須將其設定為“否”並填寫下一個欄位。
 ##### Point Of Sale (CashDesk) #####
 CashDesk=銷售點
 CashDeskSetup=銷售點模組設定
@@ -1901,6 +1901,7 @@ ExpenseReportsRulesSetup=費用報表模組設定-規則
 ExpenseReportNumberingModules=費用報表編號模組
 NoModueToManageStockIncrease=沒有啟用能夠管理自動庫存增加的模組。庫存增加將僅能手動輸入。
 YouMayFindNotificationsFeaturesIntoModuleNotification=您可以通過啟用和設定模組“通知”來找到電子郵件通知的選項。
+TemplatesForNotifications=通知的模板
 ListOfNotificationsPerUser=每個用戶的自動通知清單*
 ListOfNotificationsPerUserOrContact=每個用戶*或每個聯絡人**的自動通知（在業務事件中）清單
 ListOfFixedNotifications=自動固定通知清單
@@ -1916,6 +1917,8 @@ ConfFileMustContainCustom=從應用程式安裝或建構外部模組需要將模
 HighlightLinesOnMouseHover=滑鼠經過時會顯示表格行
 HighlightLinesColor=滑鼠經過時突出顯示行的顏色（使用“ ffffff”表示沒有突出顯示）
 HighlightLinesChecked=選中時突出顯示行的顏色（使用"ffffff"表示不突出顯示）
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=頁面標題的文字顏色
 LinkColor=連結的顏色
 PressF5AfterChangingThis=更改此值使其生效後，按鍵盤上的CTRL + F5或清除瀏覽器暫存。
@@ -1931,17 +1934,17 @@ BackgroundTableLineOddColor=表格奇數行的背景顏色
 BackgroundTableLineEvenColor=表格偶數行的背景色
 MinimumNoticePeriod=最短通知期限（您的休假申請必須在此之前完成）
 NbAddedAutomatically=每月（自動）新增到用戶計數器的天數
-EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
+EnterAnyCode=此欄位包含用於識別行的參考。輸入您選擇的任何值，但不能包含特殊字元。
 Enter0or1=輸入0或1
 UnicodeCurrency=在括號之間輸入代表貨幣符號的字元數列表。例如：對於$，輸入[36]-對於巴西R $ [82,36]-對於€，輸入[8364]
 ColorFormat=在 HEX 格式中 RGB 顏色，例如： FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+PictoHelp=dolibarr 格式的圖標名稱（如果進入目前主題資料夾“image.png”，如果進入模組的資料夾/img/“image.png@nom_du_module”）
 PositionIntoComboList=行的位置放到組合清單中
 SellTaxRate=銷售稅率
 RecuperableOnly=在法國某些州營業稅是 “Not Perceived but Recoverable”。 在其他情況下，則將該值保持為“否”。
 UrlTrackingDesc=如果供應商或運輸服務商提供頁面或網站來檢查貨件狀態，則可以在此處輸入。您可以在網址參數中使用密鑰{TRACKID}，以便系統將其替換為用戶在發貨卡中輸入的追踪號碼。
 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.
+TemplateForElement=此郵件模板與什麼類型的項目相關？電子郵件模板僅在使用相關項目中的“發送電子郵件”按鈕時可用。
 TypeOfTemplate=範本類型
 TemplateIsVisibleByOwnerOnly=範本僅所有者可見
 VisibleEverywhere=到處可見
@@ -2016,8 +2019,8 @@ MAIN_PDF_MARGIN_RIGHT=PDF右邊邊距
 MAIN_PDF_MARGIN_TOP=PDF頂部邊距
 MAIN_PDF_MARGIN_BOTTOM=PDF底部邊距
 MAIN_DOCUMENTS_LOGO_HEIGHT=PDF上Logo的高度
-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=在提案/建議書行加入圖片欄位
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=欄位寬度-如果在行上加入圖片
 MAIN_PDF_NO_SENDER_FRAME=隱藏寄件人地址框的邊框
 MAIN_PDF_NO_RECIPENT_FRAME=隱藏收件人地址框的邊框
 MAIN_PDF_HIDE_CUSTOMER_CODE=隱藏客戶代碼
@@ -2027,7 +2030,7 @@ 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
+EnterCalculationRuleIfPreviousFieldIsYes=如果先前欄位設定為“是”，則輸入計算規則.<br>例如:<br>CODEGRP1 + CODEGRP2
 SeveralLangugeVariatFound=發現數個語言變數
 RemoveSpecialChars=刪除特殊字元
 COMPANY_AQUARIUM_CLEAN_REGEX=用正則表達式篩選器清除值（COMPANY_AQUARIUM_CLEAN_REGEX）
@@ -2063,13 +2066,14 @@ EmailCollectorConfirmCollect=您是否要立即執行此收集器的收集？
 NoNewEmailToProcess=沒有新的電子郵件（與篩選匹配）要處理
 NothingProcessed=什麼都沒做
 XEmailsDoneYActionsDone=%s電子郵件合格，%s電子郵件已成功處理（對於%s記錄/已完成操作）
-RecordEvent=記錄電子郵件事件
+RecordEvent=在行事曆中記錄事件（類型為發送或接收的電子郵件）
 CreateLeadAndThirdParty=建立潛在(必要時建立合作方)
-CreateTicketAndThirdParty=建立服務單(如果之前已執行讀取也連結至合作方)
+CreateTicketAndThirdParty=建立服務單(如果之前已執行讀取也連結至合作方,否則無合作方)
 CodeLastResult=最新結果代碼
 NbOfEmailsInInbox=來源資料夾中的電子郵件數量
 LoadThirdPartyFromName=在%s載入合作方搜尋 (僅載入)
 LoadThirdPartyFromNameOrCreate= 在%s載入合作方搜尋 (如果找不到就建立)
+AttachJoinedDocumentsToObject=如果在電子郵件主題中找到項目的引用，則將附件保存到項目文件中。
 WithDolTrackingID=來自Dolibarr寄送的第一封電子郵件發起的對話訊息
 WithoutDolTrackingID=來自第一封電子郵件發起的對話的訊息不是從 Dolibarr 發送的
 WithDolTrackingIDInMsgId=來自Dolibarr的訊息
@@ -2078,7 +2082,7 @@ CreateCandidature=建立工作應用程式
 FormatZip=Zip
 MainMenuCode=選單輸入代碼（主選單）
 ECMAutoTree=顯示自動ECM樹狀圖
-OperationParamDesc=定義用於操作的值，或如何提取值. 範例:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:我的公司名稱為\\s([^\\s]*)<br><br>使用; char作為分隔符號以提取或設定幾個屬性。
+OperationParamDesc=定義用於提取或設定數值的規則。 <br> 需要從電子郵件主題中提取名稱的操作範例：<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:我的公司名稱是\\s( [^\\s]*) <br> <br> 使用 ; char 作為分隔符來提取或設定幾個屬性。
 OpeningHours=營業時間
 OpeningHoursDesc=在此處輸入貴公司的正常營業時間。
 ResourceSetup=資源模組的設定
@@ -2124,7 +2128,7 @@ LargerThan=大於
 IfTrackingIDFoundEventWillBeLinked=請注意，如果在電子郵件中發現項目的追蹤 ID，或者如果電子郵件是已收集並連結到項目的電子郵件的回覆，則建立的事件將自動連結到已知的相關項目。
 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 a string 'Name: name to find' found into the body, use 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=您確定要刪除此電子郵件收集器嗎？
@@ -2141,10 +2145,10 @@ EMailsWillHaveMessageID=電子郵件將具有與此語法匹配的標籤“參
 PDF_SHOW_PROJECT=在文件中顯示專案
 ShowProjectLabel=專案標籤
 PDF_USE_ALSO_LANGUAGE_CODE=如果您要在生成同一的PDF中以兩種不同的語言複製一些文字，則必須在此處設置第二種語言讓生成的PDF在同一頁中包含兩種不同的語言，選擇的可以用來生成PDF跟另一種語言（只有少數PDF模板支援此功能)。PDF只有一種語言則留空。
-PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
+PDF_USE_A=產生使用PDF/A格式的PDF文件而不是預設格式的PDF
 FafaIconSocialNetworksDesc=在此處輸入FontAwesome圖示的代碼。如果您不知道什麼是FontAwesome，則可以使用通用值fa-address-book。
-RssNote=注意：每個RSS feed定義都提供一個小部件，您必須啟用該小部件才能使其在儀表板中看到
-JumpToBoxes=跳至設定 -> 小部件
+RssNote=注意：每個RSS訂閱的定義都提供一個小工具，您必須啟用該小工具才能使其在資訊板中看到
+JumpToBoxes=跳至設定 -> 小工具
 MeasuringUnitTypeDesc=使用值例如 "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=比例尺是您必須移動小數部分以匹配默認參考單位的位數。對於“時間”單位類型，它是秒數。 80到99之間的值是保留值。
 TemplateAdded=範本已增加
@@ -2173,7 +2177,7 @@ NoWritableFilesFoundIntoRootDir=在您的根目錄中找不到一般程式可寫
 RecommendedValueIs=建議：%s
 Recommended=推薦的
 NotRecommended=不建議
-ARestrictedPath=Some restricted path
+ARestrictedPath=一些受限路徑
 CheckForModuleUpdate=檢查外部模組更新
 CheckForModuleUpdateHelp=此操作將連接到外部模組的編輯器以檢查是否有新版本。
 ModuleUpdateAvailable=有可用的更新
@@ -2186,10 +2190,10 @@ DatabasePasswordNotObfuscated=資料庫密碼在conf檔案中不是加密
 APIsAreNotEnabled=未啟用 API 模組
 YouShouldSetThisToOff=您應該將此設定為 0 或off
 InstallAndUpgradeLockedBy=安裝與升級已被檔案<b>%s</b>鎖定
-OldImplementation=Old implementation
+OldImplementation=舊執行
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=如果有一些線上支付模組已啟用(Paypal, Stripe, ...),在PDF中加入一個線上支付的連結
 DashboardDisableGlobal=禁用所有開放項目縮圖
-BoxstatsDisableGlobal=Disable totally box statistics
+BoxstatsDisableGlobal=完全停用盒子統計
 DashboardDisableBlocks=位於首頁中的開放項目縮圖(執行中或已延遲)
 DashboardDisableBlockAgenda=禁用應辦事項縮圖
 DashboardDisableBlockProject=禁用專案縮圖
@@ -2208,4 +2212,11 @@ LanguageAndPresentation=語言和介紹
 SkinAndColors=外觀和顏色
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=如果您想使用第二種稅率，您仍須啟用第一種稅率
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=如果您想使用第三種稅率，您仍須啟用第一種稅率
-PDF_USE_1A=Generate PDF with PDF/A-1b format
+PDF_USE_1A=產生PDF/A-1b 格式的 PDF
+MissingTranslationForConfKey = 缺少 %s 的翻譯
+NativeModules=原生模組
+NoDeployedModulesFoundWithThisSearchCriteria=未找到符合這些搜索條件的模組
+API_DISABLE_COMPRESSION=停用API回應壓縮
+EachTerminalHasItsOwnCounter=每個終端機使用自己的櫃台。
+FillAndSaveAccountIdAndSecret=先填寫並保存帳號ID和密碼
+PreviousHash=Previous hash
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index ee78f4ad705..9d193bc3d40 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -32,7 +32,7 @@ RIB=銀行帳戶的號碼
 IBAN=IBAN 號碼
 BIC=BIC / SWIFT代碼
 SwiftValid=BIC/SWIFT 有效
-SwiftVNotalid=BIC/SWIFT 無效
+SwiftNotValid=BIC/SWIFT 無效
 IbanValid=BAN 有效
 IbanNotValid=BAN 無效
 StandingOrders=直接轉帳訂單
@@ -49,7 +49,6 @@ BankAccountDomiciliation=銀行地址
 BankAccountCountry=帳戶的國家
 BankAccountOwner=帳戶持有人姓名
 BankAccountOwnerAddress=帳戶持有人地址
-RIBControlError=值的完整性檢查失敗。這表示該帳號的信息不完整或不正確（請檢查國家，號碼和IBAN）。
 CreateAccount=建立帳戶
 NewBankAccount=新帳戶
 NewFinancialAccount=新金融帳戶
@@ -109,13 +108,13 @@ SocialContributionPayment=社會/財務稅負繳款單
 BankTransfer=銀行轉帳
 BankTransfers=銀行轉帳
 MenuBankInternalTransfer=內部轉帳
-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=使用內部轉帳從一個帳戶轉賬到另一個帳戶，程式將會寫入兩條記錄：來源帳戶中的借方和目標帳戶中的貸方。此交易將使用相同的金額、標籤和日期。
 TransferFrom=從
 TransferTo=至
 TransferFromToDone=從<b>%s</b>到<b>%s</b>的<b>%s</b>%s轉帳已記錄。
 CheckTransmitter=寄件人
 ValidateCheckReceipt=驗證此支票收據
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
+ConfirmValidateCheckReceipt=您確定要驗證這張支票收據嗎？一旦完成將無法再次更動.
 DeleteCheckReceipt=刪除支票收據？
 ConfirmDeleteCheckReceipt=您確認定您要刪除此張支票收據？
 BankChecks=銀行支票
@@ -142,7 +141,7 @@ AllAccounts=所有銀行及現金帳戶
 BackToAccount=回到帳戶
 ShowAllAccounts=顯示所有帳戶
 FutureTransaction=未來交易。無法調節。
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
+SelectChequeTransactionAndGenerate=選擇/篩選要包括在支票存款收據中的支票，然後點擊“建立”。
 InputReceiptNumber=選擇與調節相關的銀行對帳單。使用可排序的數值：YYYYMM或YYYYMMDD
 EventualyAddCategory=最後，指定要對記錄進行分類的類別
 ToConciliate=對帳嗎？
@@ -174,12 +173,12 @@ YourSEPAMandate=您的歐洲統一支付區要求
 FindYourSEPAMandate=這是您SEPA的授權，授權我們公司向您的銀行直接付款。退還已簽名（掃描已簽名文檔）或通過郵件發送至
 AutoReportLastAccountStatement=進行對帳時，自動用最後一個對帳單編號填寫“銀行對帳單編號”欄位
 CashControl=POS收銀台控制
-NewCashFence=New cash desk opening or closing
+NewCashFence=新收銀台開啟或關閉
 BankColorizeMovement=動作顏色
 BankColorizeMovementDesc=如果啟用此功能，則可以為借款方或貸款方動作選擇特定的背景顏色
 BankColorizeMovementName1=借款方動作的背景顏色
 BankColorizeMovementName2=貸款方動作的背景顏色
 IfYouDontReconcileDisableProperty=如果您不對某些銀行帳戶進行銀行對帳，請在其上禁用屬性“ %s”以刪除此警告。
 NoBankAccountDefined=未定義銀行帳戶
-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
+NoRecordFoundIBankcAccount=在銀行帳戶中沒有找到記錄。通常，當一條記錄從銀行帳戶的交易清單中手動刪除時（例如在銀行帳戶對帳期間），就會發生這種情況。另一個原因是在停用模組“%s”時記錄了付款。
+AlreadyOneBankAccount=已定義一個銀行帳戶
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 9ce7b9a2e9a..c01280f6b99 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/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=付款條件
@@ -192,7 +191,7 @@ 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=如果您的發票已提供適當的註釋，則可以選擇此選項。 （例如，“只有與實際支付的價格相對應的稅才有扣除的權利”）
@@ -200,7 +199,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=在某些國家/地區，只
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=如果其他所有條件都不適合，請使用此選項
 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.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=未付金額為 <b> 中介銀行費用 </b> ，直接從客戶支付的 <b> 正確金額 </b> 中扣除。
 ConfirmClassifyPaidPartiallyReasonOtherDesc=如果其他所有選項都不適用，請使用此選擇，例如在以下情況下: <br> - 付款不完整因為一些產品被運回<br> - 聲稱金額太重要因為忘記了折扣<br>在所有情況下，都必須建立同意折讓照會通知在會計系統中更正超額的金額。
 ConfirmClassifyAbandonReasonOther=其他
 ConfirmClassifyAbandonReasonOtherDesc=此選擇將在所有其他情況下使用。例如，因為您計劃建立替換發票。
@@ -236,24 +235,24 @@ AlreadyPaidBack=已償還
 AlreadyPaidNoCreditNotesNoDeposits=已付款 (無同意折讓照會通知及訂金）
 Abandoned=已放棄
 RemainderToPay=未付款餘額
-RemainderToPayMulticurrency=Remaining unpaid, original currency
+RemainderToPayMulticurrency=剩餘未付，原始幣別
 RemainderToTake=剩餘金額
-RemainderToTakeMulticurrency=Remaining amount to take, original currency
+RemainderToTakeMulticurrency=剩餘金額，原始幣別
 RemainderToPayBack=剩餘金額退款
-RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
-NegativeIfExcessRefunded=negative if excess refunded
+RemainderToPayBackMulticurrency=退還餘額，原始幣別
+NegativeIfExcessRefunded=如果超額退還，則為負數
 Rest=待辦中
 AmountExpected=索款額
 ExcessReceived=超額收款
-ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
+ExcessReceivedMulticurrency=超額收款，原始貨幣
+NegativeIfExcessReceived=如果超額收款，則為負
 ExcessPaid=超額付款
-ExcessPaidMulticurrency=Excess paid, original currency
+ExcessPaidMulticurrency=超額付款，原始貨幣
 EscompteOffered=已提供折扣（付款日前付款）
 EscompteOfferedShort=折扣
 SendBillRef=提交發票%s
 SendReminderBillRef=提交發票%s（提醒）
-SendPaymentReceipt=Submission of payment receipt %s
+SendPaymentReceipt=提交付款收據 %s
 NoDraftBills=沒有草稿發票
 NoOtherDraftBills=沒有其他草稿發票
 NoDraftInvoices=沒有草稿發票
@@ -270,7 +269,7 @@ DateInvoice=發票日期
 DatePointOfTax=稅點
 NoInvoice=沒有發票
 NoOpenInvoice=沒有未開發票
-NbOfOpenInvoices=Number of open invoices
+NbOfOpenInvoices=未開發票數量
 ClassifyBill=分類發票
 SupplierBillsToPay=未付款的供應商發票
 CustomerBillsUnpaid=尚未付款的客戶發票
@@ -280,6 +279,7 @@ SetMode=設定付款類型
 SetRevenuStamp=設定印花稅票
 Billed=已開發票
 RecurringInvoices=定期發票
+RecurringInvoice=經常性發票
 RepeatableInvoice=發票範本
 RepeatableInvoices=各式發票範本
 Repeatable=範本
@@ -449,6 +449,8 @@ PaymentTypeTRA=銀行匯票
 PaymentTypeShortTRA=匯票
 PaymentTypeFAC=代理
 PaymentTypeShortFAC=代理
+PaymentTypeDC=借/貸卡片
+PaymentTypePP=PayPal
 BankDetails=銀行的詳細資料
 BankCode=銀行代碼
 DeskCode=分行代碼
@@ -461,7 +463,7 @@ CustomerIBAN=客戶國際銀行帳戶號碼
 SupplierIBAN=供應商國際銀行帳戶號碼
 BIC=BIC / SWIFT
 BICNumber=BIC / SWIFT代碼
-ExtraInfos=額外信息
+ExtraInfos=其他資訊
 RegulatedOn=規範於
 ChequeNumber=支票編號
 ChequeOrTransferNumber=支票/轉移編號
@@ -477,7 +479,7 @@ PrettyLittleSentence=接受以本人名義開具的支票支付的款項，該
 IntracommunityVATNumber=歐盟營業稅ID
 PaymentByChequeOrderedTo=支票付款（含稅）應支付給%s，發送至
 PaymentByChequeOrderedToShort=支票付款（含稅）應支付給
-SendTo=發送到
+SendTo=寄送到
 PaymentByTransferOnThisBankAccount=付款轉帳到以下銀行帳戶
 VATIsNotUsedForInvoice=* CGI不適用的營業稅art-293B
 LawApplicationPart1=通過適用於12/05/80的80.335
@@ -581,7 +583,7 @@ ToCreateARecurringInvoiceGene=要定期並手動生成以後的發票，只需
 ToCreateARecurringInvoiceGeneAuto=如果需要自動生成此類發票，請要求管理員啟用和設定模組<strong>%s</strong> 。請注意，兩種方法（手動和自動）都可以一起使用，沒有重複的風險。
 DeleteRepeatableInvoice=刪除發票範本
 ConfirmDeleteRepeatableInvoice=您確定要刪除發票範本嗎？
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
+CreateOneBillByThird=為每個合作方建立一張發票（否則，為每個項目建立一張發票）
 BillCreated=已產生%s發票
 BillXCreated=已產生發票%s
 StatusOfGeneratedDocuments=文件產生狀態
@@ -602,5 +604,6 @@ SituationTotalRayToRest=剩下的不含稅
 PDFSituationTitle=情況n°%d
 SituationTotalProgress=總進度%d %%
 SearchUnpaidInvoicesWithDueDate=搜尋到期日 = %s 的未付款發票
-NoPaymentAvailable=No payment available for %s
-PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
+NoPaymentAvailable=%s 無法付款
+PaymentRegisteredAndInvoiceSetToPaid=付款已登錄並且發票 %s 設定為已付款
+SendEmailsRemindersOnInvoiceDueDate=使用電子郵件寄送未付發票提醒
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/bookmarks.lang b/htdocs/langs/zh_TW/bookmarks.lang
index 44e81918cf6..e71a491f000 100644
--- a/htdocs/langs/zh_TW/bookmarks.lang
+++ b/htdocs/langs/zh_TW/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=網址
 BehaviourOnClick=已選擇書籤網址後的行為
 CreateBookmark=建立書籤
 SetHereATitleForLink=為書籤設定名稱
-UseAnExternalHttpLinkOrRelativeDolibarrLink=使用外部/絕對連結（https：// URL）或內部/相對連結（/ DOLIBARR_ROOT / htdocs / ...）
+UseAnExternalHttpLinkOrRelativeDolibarrLink=使用外部/絕對連結（(https://externalurl.com）或內部/相對連結（/mypage.php）.您也可使用電話號碼如tel:0123456.
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=選擇已連結頁面開啟在目前分頁或是在新分頁
 BookmarksManagement=書籤管理
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index 55513ca0941..e8273f28dd3 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -95,7 +95,7 @@ BrowserMethodDescription=簡易列印收據。僅需幾個參數即可設定收
 TakeposConnectorMethodDescription=具有附加功能的外部模組。可以從雲端列印。
 PrintMethod=列印方式
 ReceiptPrinterMethodDescription=具有大量參數的強大方法。完全可定制的模板。程式的伺服器不能位於雲端當中（必須能夠使用您網路中的印表機）。
-ByTerminal=依照站台
+ByTerminal=依終端機
 TakeposNumpadUsePaymentIcon=在小鍵盤的付款按鈕上使用圖示而不是文字
 CashDeskRefNumberingModules=POS銷售編號模組
 CashDeskGenericMaskCodes6 = <br> <b> {TN} </b>標籤用於增加站台
@@ -133,4 +133,4 @@ SplitSale=拆分銷售
 PrintWithoutDetailsButton=增加"不列印詳細資訊"按鈕
 PrintWithoutDetailsLabelDefault=預設列印行標籤時不包含詳細資訊
 PrintWithoutDetails=不列印詳細資訊
-YearNotDefined=Year is not defined
+YearNotDefined=年份未定義
diff --git a/htdocs/langs/zh_TW/commercial.lang b/htdocs/langs/zh_TW/commercial.lang
index a98a82c6007..1223c7b67b5 100644
--- a/htdocs/langs/zh_TW/commercial.lang
+++ b/htdocs/langs/zh_TW/commercial.lang
@@ -73,9 +73,9 @@ Stats=銷售統計
 StatusProsp=潛在方狀態
 DraftPropals=商業提案/建議書草稿
 NoLimit=無限制
-ToOfferALinkForOnlineSignature=連結線上簽名
+ToOfferALinkForOnlineSignature=線上簽名連結
 WelcomeOnOnlineSignaturePage=歡迎來到%s的商業計劃書/提案
-ThisScreenAllowsYouToSignDocFrom=此畫面允許您接受並簽署或拒絕報價/商業計劃書/提案
-ThisIsInformationOnDocumentToSign=這是接受或拒絕文件上的信息
-SignatureProposalRef=報價單/商業計劃書/提案的簽名%s
+ThisScreenAllowsYouToSignDocFrom=此畫面可允許您接受並簽署或者是拒絕報價/商業提案/建議書
+ThisIsInformationOnDocumentToSign=此為文件資訊
+SignatureProposalRef=報價單/商業提案/建議書的簽名%s
 FeatureOnlineSignDisabled=已停用線上簽名功能或在啟用該功能之前已產生文件
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 74ee62c238c..45e91c6ae3f 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -157,6 +157,18 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
+ProfId1CM=Id. prof. 1（商業登記）
+ProfId2CM=Id. prof. 2（納稅人編號）
+ProfId3CM=Id. prof. 3（建立法令）
+ProfId4CM=-
+ProfId5CM=-
+ProfId6CM=-
+ProfId1ShortCM=商業登記
+ProfId2ShortCM=納稅人編號
+ProfId3ShortCM=建立法令
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
@@ -369,7 +381,7 @@ VATIntraCheck=確認
 VATIntraCheckDesc=營業稅ID必須包含國家/地區前綴。連結<b>%s</b>使用歐洲增值稅檢查器服務（VIES），該服務需要Dolibarr伺服器連上網路。
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=檢查在歐盟區網站內的區內營業稅
-VATIntraManualCheck=您也可在歐盟網站以人工方式確認<a href="%s" target="_blank">%s</a>
+VATIntraManualCheck=您也可以自行在歐盟委員會網站<a href="%s" target="_blank" rel="noopener noreferrer">%s</a>進行確認
 ErrorVATCheckMS_UNAVAILABLE=無法檢查。無法使用會員國家（%s）進行檢查服務。
 NorProspectNorCustomer=非潛在方或客戶
 JuridicalStatus=法人類型
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index c99e05ff8e6..5218bdf6fff 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -115,7 +115,7 @@ Refund=退款
 SocialContributionsPayments=社會/財政稅金
 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)
+BalanceVisibilityDependsOnSortAndFilters=當表格依照 %s 排序並依照 1 個銀行帳戶過濾（沒有其他過濾器）時，餘額才可顯示在此清單中
 CustomerAccountancyCode=客戶會計代碼
 SupplierAccountancyCode=供應商會計代碼
 CustomerAccountancyCodeShort=客戶帳戶代碼
@@ -152,7 +152,7 @@ ConfirmDeleteSalary=您確定要刪除此薪資嗎？
 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=分析已知並已記錄付款，即使尚未在分類帳中。
 CalcModeBookkeeping=分析記帳簿表中記錄的數據。
 CalcModeLT1= <b>客戶發票-供應商發票%s中的%sRE</b>模式
@@ -166,12 +166,13 @@ AnnualSummaryInputOutputMode=收支平衡表，年度匯總
 AnnualByCompanies=收入和支出餘額，依預定義帳戶組別
 AnnualByCompaniesDueDebtMode=收支平衡表，依預定義組別明細，模式<b>%s債權-債務%s</b>表示<b>承諾會計</b> 。
 AnnualByCompaniesInputOutputMode=收支平衡表，依預定義組別明細，方式<b>%s收入-支出%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=-顯示的金額包括所有稅費
-RulesResultDue=-包括無論是否付款的未結發票，費用，增值稅，捐贈。還包括已付款薪資。 <br>-它基於發票的開票日期以及費用或稅款的到期日。對於使用“薪資”模組定義的薪資，將使用付款的起息日。
-RulesResultInOut=-它包括發票，費用，營業稅和薪水的實際付款。 <br> -它基於發票，費用，營業稅和薪水的付款日期。捐贈的捐贈日期。
+RulesAmountWithTaxExcluded=- 顯示的發票金額不包括所有稅費
+RulesResultDue=- 它包括所有發票、費用、增值稅、捐贈、薪資，無論是否已支付。 <br> - 它基於發票的開票日期以及費用或稅款支付的到期日。對於薪資，使用期末日期。
+RulesResultInOut=- 它包括發票、費用、增值稅和薪資的實際付款。 <br> - 它基於發票、費用、增值稅、捐贈和薪資的付款日期。
 RulesCADue=-它包括客戶的到期發票，無論是否已付款。 <br>-它基於這些發票的開票日期。 <br>
 RulesCAIn=-包括從客戶收到的所有有效發票付款。 <br> -此基於這些發票的付款日期<br>
 RulesCATotalSaleJournal=它包括“銷售”日記帳中的所有信用額度。
@@ -192,7 +193,7 @@ VATReport=營業稅報告
 VATReportByPeriods=分期營業稅報告
 VATReportByMonth=每月營業稅報告
 VATReportByRates=營業稅率分類報告
-VATReportByThirdParties=Sales tax report by third party
+VATReportByThirdParties=合作方銷售營業稅報告
 VATReportByCustomers=客戶分類銷售稅報告
 VATReportByCustomersInInputOutputMode=依客戶已收繳營業稅報告
 VATReportByQuartersInInputOutputMode=依銷售稅率收取和繳納分類報告
@@ -201,12 +202,12 @@ 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.
+SeeVATReportInInputOutputMode=查看報告<b>%s裝箱營業稅%s</b>的標準計算
+SeeVATReportInDueDebtMode=請參閱 <b>借記%s 上 的 %s稅率</b>報告 以了解帶有發票選項的計算
+RulesVATInServices=- 對於服務，報告包括根據付款日期實際收到或支付之付款的增值稅。
+RulesVATInProducts=- 對於物質資產，報告包括基於付款日期的增值稅。
+RulesVATDueServices=- 對於服務，基於發票日期,無論是否支付,報告包含到期發票的稅金。
+RulesVATDueProducts=- 對於物質資產，基於發票日期,報告包含到期發票的稅金。
 OptionVatInfoModuleComptabilite=註：對於物質資產，它應該使用交貨日期以更加公平。
 ThisIsAnEstimatedValue=這是預覽，基於業務事件而非最終分類帳表格，因此最後可能與此預覽結果不同
 PercentOfInvoice=%%/發票
@@ -231,7 +232,7 @@ Pcg_subtype=Pcg子類型
 InvoiceLinesToDispatch=調度發票行
 ByProductsAndServices=依產品和服務
 RefExt=外部參考
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
+ToCreateAPredefinedInvoice=建立發票範本,建立標準發票,然後,不要驗證它,點擊按鈕"%s".
 LinkedOrder=連線到訂單
 Mode1=方法1
 Mode2=方法2
@@ -239,10 +240,10 @@ CalculationRuleDesc=要計算總營業稅，有兩種方法： <br>方法1是將
 CalculationRuleDescSupplier=根據供應商選擇適當的方法以應用相同的計算規則並獲得供應商期望的相同結果。
 TurnoverPerProductInCommitmentAccountingNotRelevant=沒有依產品收集的營業額報告。該報告僅適用於開具發票的營業額。
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=無法提供依銷售稅率收取的營業額報告。該報告僅適用於開具發票的營業額。
-CalculationMode=計算方式
+CalculationMode=計算模式
 AccountancyJournal=會計代碼日記帳
-ACCOUNTING_VAT_SOLD_ACCOUNT=預設情況下，用於銷售的營業稅會計科目（如果未在營業稅字典設定中定義，則使用）
-ACCOUNTING_VAT_BUY_ACCOUNT=預設情況下，用於購買的營業稅會計科目（如果未在增值稅字典設定中定義，則使用）
+ACCOUNTING_VAT_SOLD_ACCOUNT=預設情況下，用於銷售的營業稅會計科目（如果未在營業稅分類設定中定義，則使用）
+ACCOUNTING_VAT_BUY_ACCOUNT=預設情況下，用於購買的營業稅會計科目（如果未在增值稅分類設定中定義，則使用）
 ACCOUNTING_VAT_PAY_ACCOUNT=預設情況下，用於支付營業稅的會計科目
 ACCOUNTING_ACCOUNT_CUSTOMER=客戶合作方使用的會計科目
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=合作方卡上定義的專用會計科目將僅用於子帳會計。如果未定義合作方的專用客戶會計科目，則該科目將用於“總帳”，並作為“子帳”會計的預設值。
@@ -270,7 +271,7 @@ LastDayTaxIsRelatedTo=稅期的最後一天
 VATDue=要求營業稅
 ClaimedForThisPeriod=要求的期間
 PaidDuringThisPeriod=本期支付
-PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
+PaidDuringThisPeriodDesc=這是在選定日期範圍內有期末日期的增值稅申報相關之所有付款的總和
 ByVatRate=依營業稅率
 TurnoverbyVatrate=依營業稅率開票的營業額
 TurnoverCollectedbyVatrate=依營業稅率收取的營業額
@@ -286,12 +287,14 @@ ReportPurchaseTurnover=已開票營業額
 ReportPurchaseTurnoverCollected=採購營業額
 IncludeVarpaysInResults = 在報告中包括各種付款
 IncludeLoansInResults = 在報告中包括貸款
-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 = 延遲的發票（> 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/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 4c4e0776c1a..ef381e5ecb3 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=此聯絡人已被定義為以下類
 ErrorCashAccountAcceptsOnlyCashMoney=這是一個現金帳戶的銀行帳戶，所以只接受現金支付的類型。
 ErrorFromToAccountsMustDiffers=來源和目標的銀行帳戶必須是不同的。
 ErrorBadThirdPartyName=合作方名稱的值不正確
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s是強制性的
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=客戶代碼語法錯誤
 ErrorBadBarCodeSyntax=條碼語法錯誤。可能是您設定了錯誤的條碼類型，或者您定義了與掃描值不匹配的條碼遮罩編號。
 ErrorCustomerCodeRequired=需要客戶代碼
@@ -111,6 +113,7 @@ ErrorFailedToLoadRSSFile=無法獲取RSS訂閱. 如果錯誤訊息沒有提供
 ErrorForbidden=訪問被拒絕。 <br>您嘗試訪問已停用模組的頁面，區域或功能，或者沒經過身份驗證的程序，或者不允許用戶訪問。
 ErrorForbidden2=可以經由您的Dolibarr管理員從選單%s->%s中定義此登入權限。
 ErrorForbidden3=似乎Dolibarr被未通過身份驗證的程序使用。查看Dolibarr設定文件，以了解如何管理身份驗證（htaccess，mod_auth或其他...）。
+ErrorForbidden4=注意：清除您的瀏覽器 cookie 以銷毀此登錄的現有程序。
 ErrorNoImagickReadimage=在此 PHP 中沒有 imagick 類別，所以無法預覽。管理員可以從選單設定 - 顯示中停用此分頁。
 ErrorRecordAlreadyExists=記錄已存在
 ErrorLabelAlreadyExists=此標籤已存在
@@ -270,7 +273,10 @@ ErrorActionCommBadType=選擇的事件類型（id：%n，代碼：%s）在事件
 CheckVersionFail=版本檢查失敗
 ErrorWrongFileName=檔案名稱中不可以有__SOMETHING__
 ErrorNotInDictionaryPaymentConditions=不在支付條款類別中，請修改。
-ErrorIsNotADraft=%s is not a draft
+ErrorIsNotADraft=%s 不是草案狀態
+ErrorExecIdFailed=無法執行命令“id”
+ErrorBadCharIntoLoginName=登錄名稱中的未核准字元
+ErrorRequestTooLarge=Error, request too large
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=您的PHP參數upload_max_filesize（%s）高於PHP參數post_max_size（%s）。這不是相同的設定。
@@ -312,6 +318,7 @@ RequireAtLeastXString = 至少需要%s個字元
 RequireXStringMax = 最多 %s 個字元
 RequireAtLeastXDigits = 需要至少%s位數
 RequireXDigitsMax = 最多%s位數
+RequireValidNumeric = Requires a numeric value
 RequireValidEmail = 電子郵件地址無效
 RequireMaxLength = 長度需要小於%s個字元
 RequireMinLength = 長度必須大於%s個字元
diff --git a/htdocs/langs/zh_TW/eventorganization.lang b/htdocs/langs/zh_TW/eventorganization.lang
index cc951450b70..964b48116b1 100644
--- a/htdocs/langs/zh_TW/eventorganization.lang
+++ b/htdocs/langs/zh_TW/eventorganization.lang
@@ -19,7 +19,7 @@
 #
 ModuleEventOrganizationName = 活動組織
 EventOrganizationDescription = 使用專案模組組織活動
-EventOrganizationDescriptionLong= Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
+EventOrganizationDescriptionLong= 管理活動的組織（節目、會議、參與者或演講者，以及用於建議、投票或註冊的公共頁面）
 #
 # Menu
 #
@@ -31,33 +31,33 @@ PaymentEvent=活動的付款
 #
 # Admin page
 #
-NewRegistration=Registration
+NewRegistration=登記
 EventOrganizationSetup=活動組織設定
 EventOrganization=活動組織
 Settings=設定
 EventOrganizationSetupPage = 活動組織設定頁面
 EVENTORGANIZATION_TASK_LABEL = 當專案驗證時自動地建立任務標籤
-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_LABELTooltip = 當您驗證一個有組織的活動，有些任務可以自動在專案中建立<br> <br>例如：<br>發送會議呼叫<br>發送展位呼叫<br>接收會議呼叫<br>接收展位呼叫<br>為參與者打開訂閱活動<br>向演講者發送活動提醒 <br> 向展位主持人發送活動提醒 <br> 向與會者發送活動提醒
+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_EVENT = 支付報名費後發送的電子郵件模板。
+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= 會議或展位
-ManageOrganizeEvent = Manage the organization of an event
+ManageOrganizeEvent = 管理活動的組織
 ConferenceOrBooth = 會議或展位
 ConferenceOrBoothTab = 會議或展位
 AmountPaid = 付款金額
-DateOfRegistration = Date of registration
+DateOfRegistration = 註冊日期
 ConferenceOrBoothAttendee = 會議或展位參加者
 
 #
@@ -65,32 +65,33 @@ ConferenceOrBoothAttendee = 會議或展位參加者
 #
 YourOrganizationEventConfRequestWasReceived = 已收到您的會議請求
 YourOrganizationEventBoothRequestWasReceived = 已收到您的展位申請
-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
+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
+AllowUnknownPeopleSuggestConf=允許建議會議
+AllowUnknownPeopleSuggestConfHelp=允許不知名的人建議他們想參加的會議
+AllowUnknownPeopleSuggestBooth=允許申請展位
+AllowUnknownPeopleSuggestBoothHelp=允許不知名人士申請展位
+PriceOfRegistration=註冊價格
+PriceOfRegistrationHelp=註冊或參加活動的費用
+PriceOfBooth=展位認購價
+PriceOfBoothHelp=展位認購價
+EventOrganizationICSLink=Link ICS for conferences
+ConferenceOrBoothInformation=會議或展位資訊
+Attendees=參與者
+ListOfAttendeesOfEvent=活動項目參與者名單
+DownloadICSLink = 下載 ICS連結
+EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
+SERVICE_BOOTH_LOCATION = 關於展位位置發票行的服務
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=票數
 #
 # Status
@@ -106,61 +107,61 @@ EvntOrgCancelled = 已取消
 #
 SuggestForm = 建議頁面
 SuggestOrVoteForConfOrBooth = 建議或投票頁面
-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 = 在這裡，您可以為會議投票或為活動推薦新的會議。您也可以在活動期間申請展位。
+EvntOrgRegistrationConfHelpMessage = 在這裡，您可以在活動期間鼓勵建議一個新的會議。
+EvntOrgRegistrationBoothHelpMessage = 在這裡，您可以在活動期間申請展位。
 ListOfSuggestedConferences = 建議會議清單
 ListOfSuggestedBooths = 建議展位清單
-ListOfConferencesOrBooths=List of conferences or booths of event project
+ListOfConferencesOrBooths=活動專案的會議或展位清單
 SuggestConference = 建議召開新會議
 SuggestBooth = 建議展位
 ViewAndVote = 查看和票選建議的活動
-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
+PublicAttendeeSubscriptionGlobalPage = 活動報名公開連結
+PublicAttendeeSubscriptionPage = 僅用於報名此活動的公共連結
+MissingOrBadSecureKey = 安全金鑰無效或遺失
+EvntOrgWelcomeMessage = 此表單允許您註冊為此活動的新參與者：<b> %s </b>
+EvntOrgDuration = 本次會議從 %s 開始，到 %s 結束。
+ConferenceAttendeeFee = 活動的會議參與者費用："%s"為從%s 到%s發生的。
+BoothLocationFee = 活動展位位置："%s"為從%s 到%s發生的。
 EventType = 活動類別
 LabelOfBooth=展位標籤
 LabelOfconference=會議標籤
-ConferenceIsNotConfirmed=Registration not available, conference is not confirmed yet
+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
+EvntOrgRegistrationWelcomeMessage = 歡迎來到會議或展位建議頁面。
+EvntOrgRegistrationConfWelcomeMessage = 歡迎來到會議建議頁面。
+EvntOrgRegistrationBoothWelcomeMessage = 歡迎來到展位建議頁面。
+EvntOrgVoteHelpMessage = 在這裡，您可以查看專案的建議活動並投票
 VoteOk = 您的投票已被接受。
 AlreadyVoted = 您已經為此事件投票。
-VoteError = An error has occurred during the vote, please try again.
+VoteError = 投票時發生錯誤，請重試。
 
-SubscriptionOk = Your registration has been validated
-ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to an event
+SubscriptionOk = 您的登錄已通過驗證
+ConfAttendeeSubscriptionConfirmation = 確認您的活動訂閱
 Attendee = 參加者
 PaymentConferenceAttendee = 參與人員繳費
-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
+PaymentBoothLocation = 展位支付
+DeleteConferenceOrBoothAttendee=刪除參與者
+RegistrationAndPaymentWereAlreadyRecorder=已記錄電子郵件 <b> %s </b> 的註冊和付款
+EmailAttendee=參與者電子郵件
+EmailCompanyForInvoice=公司電子郵件（用於發票，如果與參與者電子郵件不同）
+ErrorSeveralCompaniesWithEmailContactUs=已找到幾家收到此電子郵件的公司，因此我們無法自動驗證您的註冊。請以 %s 聯繫我們進行手動驗證
+ErrorSeveralCompaniesWithNameContactUs=已找到數家具有此名稱的公司，因此我們無法自動驗證您的註冊。請以 %s 聯繫我們進行手動驗證
+NoPublicActionsAllowedForThisEvent=本次活動不對外公開任何公開活動
diff --git a/htdocs/langs/zh_TW/exports.lang b/htdocs/langs/zh_TW/exports.lang
index e12a253b1a0..2b827a7fafd 100644
--- a/htdocs/langs/zh_TW/exports.lang
+++ b/htdocs/langs/zh_TW/exports.lang
@@ -96,8 +96,8 @@ DataComeFromFileFieldNb=要插入的值來自來源檔案中的欄位編號<b>%s
 DataComeFromIdFoundFromRef=來自來源檔案的欄位編號<b>%s</b>的值將用於尋找要使用的母項目ID（因此項目<b>%s</b>參考來源必須存在於資料庫中）。
 DataComeFromIdFoundFromCodeId=來自來源檔案的欄位編號<b>%s</b>的代碼將用於尋找要使用的母項目ID（因此來源檔案中的代碼必須存在於字典<b>%s</b>中 ）。請注意，如果您知道ID，您應該在來源檔案中使用它而不是使用代碼。在兩種情況下，匯入都應該起作用。
 DataIsInsertedInto=來自來源檔案的資料將被插入到以下欄位：
-DataIDSourceIsInsertedInto=The id of the parent object, that was found using the data in the source file, will be inserted into the following field:
-DataCodeIDSourceIsInsertedInto=The id of the parent line, that was found from code, will be inserted into the following field:
+DataIDSourceIsInsertedInto=在來源檔案中的資料找到母項目ID，將插入到以下欄位：
+DataCodeIDSourceIsInsertedInto=在代碼中的找到母行ID，將插入到以下欄位：
 SourceRequired=資料值是強制性的
 SourceExample=可能資料值的範例
 ExampleAnyRefFoundIntoElement=已找到元件<b>%s</b>的所有參考
diff --git a/htdocs/langs/zh_TW/help.lang b/htdocs/langs/zh_TW/help.lang
index a662ddfb7f2..85757011540 100644
--- a/htdocs/langs/zh_TW/help.lang
+++ b/htdocs/langs/zh_TW/help.lang
@@ -20,4 +20,4 @@ BackToHelpCenter=否則， <a href="%s">請返回幫助中心首頁</a> 。
 LinkToGoldMember=您可以通過點擊他們的小工具來預先選擇語言的培訓師（%s）（狀態和最高價格會自動更新）：
 PossibleLanguages=支持的語言
 SubscribeToFoundation=幫助Dolibarr項目，訂閱基金會
-SeeOfficalSupport=使用您語言的 Dolibarr 官方支援：<br><b><a href="%s" target="_blank">%s</a></b>
+SeeOfficalSupport=使用您語言的 Dolibarr 官方支援：<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
diff --git a/htdocs/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang
index a1eda6411f9..868e06f0268 100644
--- a/htdocs/langs/zh_TW/holiday.lang
+++ b/htdocs/langs/zh_TW/holiday.lang
@@ -27,7 +27,7 @@ DescCP=描述
 SendRequestCP=建立休假申請
 DelayToRequestCP=休假申請至少必須提前<b>%s 天(s)</b>申請.
 MenuConfCP=未休假天數
-SoldeCPUser=未休假天數為<b>%s</b> 天.
+SoldeCPUser=未休假天數(天)<b>%s</b>.
 ErrorEndDateCP=您必須選擇一個大於開始日期的結束日期。
 ErrorSQLCreateCP=建立期間發生了SQL錯誤：
 ErrorIDFicheCP=發生錯誤，休假申請不存在。
@@ -134,3 +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 432961087b1..3114e075560 100644
--- a/htdocs/langs/zh_TW/hrm.lang
+++ b/htdocs/langs/zh_TW/hrm.lang
@@ -20,13 +20,14 @@ Employee=員工
 NewEmployee=新員工
 ListOfEmployees=員工名單
 HrmSetup=人資模組設定
-HRM_MAXRANK=技能的最高等級
+SkillsManagement=技能管理
+HRM_MAXRANK=對技能進行排名的最大級別
 HRM_DEFAULT_SKILL_DESCRIPTION=建立技能時的預設等級描述
 deplacement=轉移
 DateEval=評估日期
 JobCard=工作卡
-Job=工作
-Jobs=工作
+JobPosition=工作
+JobsPosition=工作
 NewSkill=新技能
 SkillType=技能類型
 Skilldets=此技能的等級清單
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=您確定想要以參考<b>%s</b>驗證此評估嗎？
 EvaluationCard=評估卡
 RequiredRank=此職位所需的等級
 EmployeeRank=此技能的員工等級
-Position=職位
-Positions=職位
-PositionCard=職位卡
+EmployeePosition=員工職位
+EmployeePositions=員工職位
 EmployeesInThisPosition=此職位的員工
 group1ToCompare=要分析的用戶組
 group2ToCompare=用於比較的第二個用戶組
diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
index 9628f63e784..a6f2aa7035d 100644
--- a/htdocs/langs/zh_TW/install.lang
+++ b/htdocs/langs/zh_TW/install.lang
@@ -21,6 +21,7 @@ ErrorPHPDoesNotSupportCurl=您的PHP安裝不支援Curl。
 ErrorPHPDoesNotSupportCalendar=您的PHP安裝不支援php日曆外掛。
 ErrorPHPDoesNotSupportUTF8=您的PHP安裝不支援UTF8函數。 Dolibarr無法正常工作。必須在安裝Dolibarr之前修復此問題。
 ErrorPHPDoesNotSupportIntl=您的PHP安裝不支援Intl函數。
+ErrorPHPDoesNotSupportMbstring=您的 PHP 不支援 mbstring 函數。
 ErrorPHPDoesNotSupportxDebug=您的PHP安裝不支援擴展除錯功能。
 ErrorPHPDoesNotSupport=您的PHP安裝不支援%s函數。
 ErrorDirDoesNotExists=資料夾%s不存在。
diff --git a/htdocs/langs/zh_TW/intracommreport.lang b/htdocs/langs/zh_TW/intracommreport.lang
index cd2cbc0b134..8bc246a5612 100644
--- a/htdocs/langs/zh_TW/intracommreport.lang
+++ b/htdocs/langs/zh_TW/intracommreport.lang
@@ -5,13 +5,13 @@ IntracommReportAbout = 關於內部通訊報告
 
 # Setup
 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
-INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
-INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+INTRACOMMREPORT_TYPE_ACTEUR=發話者類型
+INTRACOMMREPORT_ROLE_ACTEUR=發話者角色
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=介紹義務的等級
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=裝運義務水平
+INTRACOMMREPORT_CATEG_FRAISDEPORT=“Frais de port”類型的服務類別
 
-INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+INTRACOMMREPORT_NUM_DECLARATION=申報人編號
 
 # Menu
 MenuIntracommReport=內部通訊報告
@@ -27,14 +27,14 @@ DEB=貨物交換報關單（DEB）
 DES=服務交換報單(DES)
 
 # Export page
-IntracommReportTitle=Preparation of an XML file in ProDouane format
+IntracommReportTitle=準備ProDouane格式的XML檔案
 
 # List
-IntracommReportList=List of generated declarations
-IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of analysis
+IntracommReportList=已產生報單清單
+IntracommReportNumber=申報數量
+IntracommReportPeriod=分析週期
 IntracommReportTypeDeclaration=報單類型
-IntracommReportDownload=download XML file
+IntracommReportDownload=下載 XML檔案
 
 # Invoice
-IntracommReportTransportMode=Transport mode
+IntracommReportTransportMode=運輸方式
diff --git a/htdocs/langs/zh_TW/knowledgemanagement.lang b/htdocs/langs/zh_TW/knowledgemanagement.lang
index 911db235ad8..83fa3e35f01 100644
--- a/htdocs/langs/zh_TW/knowledgemanagement.lang
+++ b/htdocs/langs/zh_TW/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) 或HelpDesk
 
 #
 # 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 = 文章的補充屬性
+GroupOfTicket=服務單群組
+YouCanLinkArticleToATicketCategory=您可以將文章連結至服務單群組（因此在新服務單的有效期間將建議該文章）
+SuggestedForTicketsInGroup=為此群組服務單建議
+
+SetObsolete=Set as obsolete
+ConfirmCloseKM=Do you confirm the closing of this article as obsolete ?
+ConfirmReopenKM=Do you want to restore this article to status "Validated" ?
diff --git a/htdocs/langs/zh_TW/ldap.lang b/htdocs/langs/zh_TW/ldap.lang
index 04ac6f87472..ddbc0e2ddbf 100644
--- a/htdocs/langs/zh_TW/ldap.lang
+++ b/htdocs/langs/zh_TW/ldap.lang
@@ -1,27 +1,31 @@
 # Dolibarr language file - Source file is en_US - ldap
-YouMustChangePassNextLogon=<b>%</b>用戶密碼<b>%之S</b>必須改變對域。
-UserMustChangePassNextLogon=用戶必須更改密碼的域%s
-LDAPInformationsForThisContact=在此LDAP數據庫信息聯系
-LDAPInformationsForThisUser=LDAP數據庫中該用戶信息
-LDAPInformationsForThisGroup=在LDAP數據庫的資料本組
-LDAPInformationsForThisMember=在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=認購金額拳
+LDAPCard=LDAP卡片
+LDAPRecordNotFound=在LDAP資料庫中找不到記錄
+LDAPUsers=LDAP資料庫中的用戶
+LDAPFieldStatus=狀態
+LDAPFieldFirstSubscriptionDate=首次訂閱日期
+LDAPFieldFirstSubscriptionAmount=首次訂閱金額
 LDAPFieldLastSubscriptionDate=最新訂閱日期
-LDAPFieldLastSubscriptionAmount=Latest subscription amount
-LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example: skypeName
-UserSynchronized=用戶同步
-GroupSynchronized=集團同步
+LDAPFieldLastSubscriptionAmount=最新訂閱金額
+LDAPFieldSkype=Skype帳號
+LDAPFieldSkypeExample=範例：skypeName
+UserSynchronized=用戶已同步
+GroupSynchronized=群組已同步
 MemberSynchronized=會員已同步
 MemberTypeSynchronized=會員類型已同步
-ContactSynchronized=聯系同步
-ForceSynchronize=力同步Dolibarr - &gt;的LDAP
-ErrorFailedToReadLDAP=無法讀取LDAP資料據庫。檢查的LDAP模組設定和資料庫可存取性。
-PasswordOfUserInLDAP=Password of user in LDAP
+ContactSynchronized=聯絡人已同步
+ForceSynchronize=強制同步中Dolibarr -> LDAP
+ErrorFailedToReadLDAP=無法讀取LDAP資料庫。檢查的LDAP模組設定和資料庫可存取權限。
+PasswordOfUserInLDAP=LDAP用戶密碼
+LDAPPasswordHashType=密碼hash類型
+LDAPPasswordHashTypeExample=伺服器上使用的密碼hash類型
+SupportedForLDAPExportScriptOnly=僅支援ldap匯出腳本
+SupportedForLDAPImportScriptOnly=僅支援 ldap匯入腳本
diff --git a/htdocs/langs/zh_TW/loan.lang b/htdocs/langs/zh_TW/loan.lang
index 8f4babc0b9a..c9b1a7e0870 100644
--- a/htdocs/langs/zh_TW/loan.lang
+++ b/htdocs/langs/zh_TW/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=財務承諾
 InterestAmount=利益
 CapitalRemain=剩餘資本
 TermPaidAllreadyPaid = 這表示已付款
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
+CantUseScheduleWithLoanStartedToPaid = 無法在已開始付款的借款中使用排程器
 CantModifyInterestIfScheduleIsUsed = 如果您使用時間表，則無法修改利息
 # Admin
 ConfigLoan=貸款模組設定
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index 3eacfdfae1a..cd5b4703c34 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -60,7 +60,7 @@ EMailTestSubstitutionReplacedByGenericValues=使用測試模式時，替換變
 MailingAddFile=附加這個文件
 NoAttachedFiles=沒有附加檔案
 BadEMail=電子郵件地址不正確
-EMailNotDefined=Email not defined
+EMailNotDefined=電子郵件未定義
 ConfirmCloneEMailing=您確定要複製此電子郵件嗎？
 CloneContent=複製訊息
 CloneReceivers=複製收件人
@@ -163,8 +163,8 @@ AdvTgtDeleteFilter=刪除篩選器
 AdvTgtSaveFilter=儲存篩選器
 AdvTgtCreateFilter=建立篩選器
 AdvTgtOrCreateNewFilter=新篩選器名稱
-NoContactWithCategoryFound=No category found linked to some contacts/addresses
-NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties
+NoContactWithCategoryFound=找不到與某些聯絡人/地址相關聯的類別
+NoContactLinkedToThirdpartieWithCategoryFound=未找到與某些合作方相關的類別
 OutGoingEmailSetup=外送電子郵件
 InGoingEmailSetup=收到的電子郵件
 OutGoingEmailSetupForEmailing=外送電子郵件（用於%s模組）
@@ -176,5 +176,5 @@ Answered=已回覆
 IsNotAnAnswer=未回應（原始電子郵件）
 IsAnAnswer=是一封原始電子郵件的回應
 RecordCreatedByEmailCollector=由電子郵件收集器%s從電子郵件%s建立的記錄
-DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
+DefaultBlacklistMailingStatus=建立新聯絡人時欄位“%s”的預設值
 DefaultStatusEmptyMandatory=必填
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index e7996ee6ed5..b1b4465ec5b 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -67,6 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=錯誤，沒有定義 '%s' 國家的營業
 ErrorNoSocialContributionForSellerCountry=錯誤，在 '%s' 國家中沒有定義社會/財務稅務類別。
 ErrorFailedToSaveFile=錯誤，無法儲存檔案。
 ErrorCannotAddThisParentWarehouse=您正在嘗試加入一個已經有子倉庫的主倉庫
+FieldCannotBeNegative=欄位“%s”不能為負值
 MaxNbOfRecordPerPage=每頁最大記錄數量
 NotAuthorized=您無權這樣做。
 SetDate=設定日期
@@ -87,7 +88,7 @@ FileWasNotUploaded=所選定的檔案尚未上傳。點選 "附加檔案"。
 NbOfEntries=項目數量
 GoToWikiHelpPage=讀取線上幫助 (需要連上網路)
 GoToHelpPage=讀取幫助
-DedicatedPageAvailable=有一個與您目前畫面相關的專用幫助頁面
+DedicatedPageAvailable=與您目前畫面相關的幫助頁面
 HomePage=首頁
 RecordSaved=記錄已儲存
 RecordDeleted=記錄已刪除
@@ -211,6 +212,8 @@ User=用戶
 Users=用戶
 Group=群組
 Groups=群組
+UserGroup=用戶群組
+UserGroups=用戶群組
 NoUserGroupDefined=未定義用戶群組
 Password=密碼
 PasswordRetype=重新輸入您的密碼
@@ -281,8 +284,8 @@ DateValidation=驗證日期
 DateSigning=簽名日期
 DateClosing=關閉日期
 DateDue=截止日期
-DateValue=值的日期
-DateValueShort=值的日期
+DateValue=起息日
+DateValueShort=起息日
 DateOperation=操作日期
 DateOperationShort=操作日
 DateLimit=期限日
@@ -375,12 +378,12 @@ AmountTTCShort=金額(含稅)
 AmountHT=金額（不含稅）
 AmountTTC=金額(含稅)
 AmountVAT=稅金
-MulticurrencyAlreadyPaid=已付款，原幣別
-MulticurrencyRemainderToPay=支付餘款, 原來幣別
-MulticurrencyPaymentAmount=付款金額, 原來幣別
-MulticurrencyAmountHT=金額（不含稅），原來幣別
-MulticurrencyAmountTTC=金額(含稅), 原來幣別
-MulticurrencyAmountVAT=稅金, 原來幣別
+MulticurrencyAlreadyPaid=已付款，原始貨幣
+MulticurrencyRemainderToPay=支付餘款, 原始貨幣
+MulticurrencyPaymentAmount=付款金額, 原始貨幣
+MulticurrencyAmountHT=金額（不含稅），原始貨幣
+MulticurrencyAmountTTC=金額(含稅), 原始貨幣
+MulticurrencyAmountVAT=稅金, 原始貨幣
 MulticurrencySubPrice=金額子價格多種貨幣
 AmountLT1=稅金 2
 AmountLT2=稅金 3
@@ -1157,5 +1160,7 @@ RecordsApproved=%s 筆記錄已批准
 Properties=屬性
 hasBeenValidated=%s 已驗證
 ClientTZ=客戶時區(用戶)
-NotClosedYet=Not yet closed
-ClearSignature=Signature reset
+NotClosedYet=尚未關閉
+ClearSignature=重置簽名
+CanceledHidden=取消隱藏
+CanceledShown=已取消顯示
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index 710f55e9297..4ab25942376 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -7,7 +7,7 @@ Members=會員
 ShowMember=顯示會員卡
 UserNotLinkedToMember=用戶未與會員連結
 ThirdpartyNotLinkedToMember=合作方(客戶/供應商)未與會員連結
-MembersTickets=Membership address sheet
+MembersTickets=會員地址表單
 FundationMembers=財團會員
 ListOfValidatedPublicMembers=經過驗證的公眾會員列表
 ErrorThisMemberIsNotPublic=該會員不是公開的
@@ -19,8 +19,8 @@ MembersCards=會員名片
 MembersList=會員清單
 MembersListToValid=草案會員清單（待確認）
 MembersListValid=有效會員清單
-MembersListUpToDate=List of valid members with up-to-date contribution
-MembersListNotUpToDate=List of valid members with out-of-date contribution
+MembersListUpToDate=具有最新貢獻的有效會員清單
+MembersListNotUpToDate=貢獻已過期的有效會員清單
 MembersListExcluded=排除會員的清單
 MembersListResiliated=已被終止會員清單
 MembersListQualified=合格會員清單
@@ -28,13 +28,13 @@ MenuMembersToValidate=草案會員
 MenuMembersValidated=已驗證會員
 MenuMembersExcluded=排除會員
 MenuMembersResiliated=已終止會員
-MembersWithSubscriptionToReceive=Members with contribution to receive
-MembersWithSubscriptionToReceiveShort=Contributions to receive
+MembersWithSubscriptionToReceive=可接收有捐款的會員
+MembersWithSubscriptionToReceiveShort=收到的捐款
 DateSubscription=入會日期
 DateEndSubscription=會員終止日
 EndSubscription=終止會員
-SubscriptionId=訂閱編號
-WithoutSubscription=沒有訂閱
+SubscriptionId=捐款編號
+WithoutSubscription=沒有捐款
 MemberId=會員編號
 NewMember=新會員
 MemberType=會員類型
@@ -45,22 +45,22 @@ MemberStatusDraft=草案（等待驗證）
 MemberStatusDraftShort=草案
 MemberStatusActive=已驗證（等待訂閱）
 MemberStatusActiveShort=已驗證
-MemberStatusActiveLate=訂閱已過期
+MemberStatusActiveLate=捐款已過期
 MemberStatusActiveLateShort=已過期
-MemberStatusPaid=訂閱最新
+MemberStatusPaid=訂閱為最新
 MemberStatusPaidShort=最新
-MemberStatusExcluded=排除會員
-MemberStatusExcludedShort=排除
+MemberStatusExcluded=未包含的會員
+MemberStatusExcludedShort=未包含
 MemberStatusResiliated=已終止成員
 MemberStatusResiliatedShort=已終止
 MembersStatusToValid=草案會員
-MembersStatusExcluded=排除會員
+MembersStatusExcluded=未包含的會員
 MembersStatusResiliated=已終止會員
-MemberStatusNoSubscription=已驗證（無需訂閱）
+MemberStatusNoSubscription=已驗證（無需捐款）
 MemberStatusNoSubscriptionShort=已驗證
-SubscriptionNotNeeded=無需訂閱
-NewCotisation=新捐贈
-PaymentSubscription=新捐贈支付
+SubscriptionNotNeeded=無需捐款
+NewCotisation=新捐款
+PaymentSubscription=新捐款支付
 SubscriptionEndDate=訂閱的結束日期
 MembersTypeSetup=會員類型設定
 MemberTypeModified=會員類型已修改
@@ -68,82 +68,82 @@ DeleteAMemberType=刪除會員類型
 ConfirmDeleteMemberType=您確定要刪除此會員類型嗎？
 MemberTypeDeleted=會員類型已刪除
 MemberTypeCanNotBeDeleted=會員類型無法刪除
-NewSubscription=新捐贈
-NewSubscriptionDesc=此表單使您可以作為財團的新會員來記錄訂閱。如果要續訂（如果已經是會員），請通過電子郵件%s與財團聯繫。
-Subscription=訂閱
-Subscriptions=訂閱
+NewSubscription=新捐款
+NewSubscriptionDesc=此表單使您可以作為財團的新會員來記錄訂閱。如果要續訂（如果已經是會員），請通過電子郵件%s與基金會聯繫。
+Subscription=捐款
+Subscriptions=捐款
 SubscriptionLate=晚
-SubscriptionNotReceived=從未收到訂閱
-ListOfSubscriptions=訂閱清單
+SubscriptionNotReceived=從未收到捐款
+ListOfSubscriptions=捐款清單
 SendCardByMail=通過電子郵件發送卡片
 AddMember=建立會員
 NoTypeDefinedGoToSetup=未定義會員類型。前往選單“會員類型”
 NewMemberType=新會員類型
 WelcomeEMail=歡迎電子郵件
-SubscriptionRequired=需要訂閱
+SubscriptionRequired=需要捐款
 DeleteType=刪除
 VoteAllowed=允許投票
 Physical=個人
 Moral=公司
 MorAndPhy=公司和個人
 Reenable=重新啟用
-ExcludeMember=排除會員
+ExcludeMember=不包括會員
 Exclude=不包括
-ConfirmExcludeMember=您確定要排除此會員嗎？
+ConfirmExcludeMember=您確定要不包括此會員嗎？
 ResiliateMember=終止會員
 ConfirmResiliateMember=您確定要終止此會員嗎？
 DeleteMember=刪除會員
-ConfirmDeleteMember=您確定要刪除此會員嗎（刪除會員將刪除其所有訂閱）？
+ConfirmDeleteMember=您確定要刪除此會員嗎（刪除會員將刪除其所有捐款）？
 DeleteSubscription=刪除訂閱
-ConfirmDeleteSubscription=您確定要刪除此訂閱嗎？
-Filehtpasswd=htpasswd文件
+ConfirmDeleteSubscription=您確定要刪除此捐款嗎？
+Filehtpasswd=htpasswd檔案
 ValidateMember=驗證會員
 ConfirmValidateMember=您確定要驗證此會員嗎？
 FollowingLinksArePublic=以下連結未受任何Dolibarr權限保護的開放頁面。它們不是格式化的頁面，僅作為範例顯示如何列出會員數據庫。
-PublicMemberList=公共會員名單
-BlankSubscriptionForm=Public self-registration form
+PublicMemberList=公開會員名單
+BlankSubscriptionForm=公開的自行註冊表單
 BlankSubscriptionFormDesc=Dolibarr可以為您提供公共URL /網站，以允許外部訪問者請求訂閱財團。如果啟用了線上付款模組，則還可以自動提供付款表格。
-EnablePublicSubscriptionForm=使用自我訂閱表格啟用公共網站
+EnablePublicSubscriptionForm=啟用自行訂閱表格公共網站
 ForceMemberType=強制會員類型
-ExportDataset_member_1=Members and contributions
+ExportDataset_member_1=會員與捐款
 ImportDataset_member_1=會員
 LastMembersModified=最後%s位修改的會員
-LastSubscriptionsModified=Latest %s modified contributions
+LastSubscriptionsModified=最新%s筆修改的捐款
 String=字串
 Text=文字
 Int=整數
 DateAndTime=日期和時間
 PublicMemberCard=成員公共卡
-SubscriptionNotRecorded=Contribution not recorded
-AddSubscription=Create contribution
-ShowSubscription=Show contribution
+SubscriptionNotRecorded=捐款未記錄
+AddSubscription=建立捐款
+ShowSubscription=顯示捐款
 # Label of email templates
 SendingAnEMailToMember=發送訊息郵件給會員
 SendingEmailOnAutoSubscription=發送自動註冊的電子郵件
 SendingEmailOnMemberValidation=發送新會員驗證電子郵件
-SendingEmailOnNewSubscription=Sending email on new contribution
-SendingReminderForExpiredSubscription=Sending reminder for expired contributions
+SendingEmailOnNewSubscription=發送有關新捐款的電子郵件
+SendingReminderForExpiredSubscription=發送過期捐款提醒
 SendingEmailOnCancelation=發送取消郵件
 SendingReminderActionComm=寄送議程事件提醒
 # Topic of email templates
 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>
+ThisIsContentOfYourMembershipWasValidated=謹在此通知您，您的會員資格已通過以下資訊驗證： <br><br>
 ThisIsContentOfYourSubscriptionWasRecorded=我們想通知您，您的新訂閱已記錄。 <br><br>
 ThisIsContentOfSubscriptionReminderEmail=我們想告訴您您的訂閱即將到期或已經到期（__MEMBER_LAST_SUBSCRIPTION_DATE_END__）。希望您能繼續訂閱。 <br><br>
 ThisIsContentOfYourCard=這是我們有關您的資訊摘要。如果有任何錯誤，請與我們聯繫。 <br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=訪客自動註冊時收到的通知電子郵件主題
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=訪客自動註冊時收到的通知電子郵件的內容
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member auto-registration
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=電子郵件範本，用於會員自動捐款時向會員發送電子郵件
 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=電子郵件範本，用於新的捐款記錄時向會員發送電子郵件
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=電子郵件範本, 用於捐款即將到期時發送電子郵件提醒
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=電子郵件範本，用於在會員取消時向會員發送電子郵件
 DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=用於會員排除時向會員發出電子郵件的模板
 DescADHERENT_MAIL_FROM=自動發送電子郵件之發件人電子郵件
@@ -156,10 +156,10 @@ DescADHERENT_CARD_TEXT_RIGHT=會員卡文字（向右對齊）
 DescADHERENT_CARD_FOOTER_TEXT=會員卡底部文字
 ShowTypeCard=顯示類型'%s'
 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
+MoreActionsOnSubscription=補充動作，在記錄捐款時預設建議
 MoreActionBankDirect=在銀行帳戶上建立直接條目
 MoreActionBankViaInvoice=建立發票，並通過銀行帳戶付款
 MoreActionInvoiceOnly=建立無付款的發票
@@ -168,9 +168,9 @@ LinkToGeneratedPagesDesc=通過此畫面，您可以為所有會員或特定會
 DocForAllMembersCards=為所有會員產生名片
 DocForOneMemberCards=為特定會員產生名片
 DocForLabels=產生地址表
-SubscriptionPayment=Contribution payment
-LastSubscriptionDate=Date of latest contribution payment
-LastSubscriptionAmount=Amount of latest contribution
+SubscriptionPayment=捐款支付
+LastSubscriptionDate=最新捐款付款的日期
+LastSubscriptionAmount=最新捐款金額
 LastMemberType=最新的會員類型
 MembersStatisticsByCountries=會員統計(國家/城市)
 MembersStatisticsByState=會員統計(州/省)
@@ -187,34 +187,34 @@ MembersByRegion=此畫面依區域顯示有關會員的統計資訊。
 MembersStatisticsDesc=選擇要讀取的統計訊息...
 MenuMembersStats=統計
 LastMemberDate=最新入會日期
-LatestSubscriptionDate=Latest contribution date
+LatestSubscriptionDate=最新捐款日期
 MemberNature=會員性質
 MembersNature=會員性質
 Public=資訊是公開的
 NewMemberbyWeb=增加了新會員。等待核准
-NewMemberForm=新會員表格
-SubscriptionsStatistics=Contributions statistics
-NbOfSubscriptions=Number of contributions
-AmountOfSubscriptions=Amount collected from contributions
+NewMemberForm=新會員表單
+SubscriptionsStatistics=捐款統計
+NbOfSubscriptions=捐款數量
+AmountOfSubscriptions=從捐款中收取的金額
 TurnoverOrBudget=營業額（對於公司）或預算（對於財團）
-DefaultAmount=Default amount of contribution
-CanEditAmount=Visitor can choose/edit amount of its contribution
+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
+VATToUseForSubscriptions=用於捐款的稅率
+NoVatOnSubscription=捐款不徵收稅金
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=用於發票的捐款欄的產品：%s
 NameOrCompany=姓名或公司名稱
-SubscriptionRecorded=Contribution recorded
+SubscriptionRecorded=捐款已記錄
 NoEmailSentToMember=沒有發送電子郵件給會員
 EmailSentToMember=使用%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=以電子郵件發送過期捐款提醒
+SendReminderForExpiredSubscription=當捐款即將到期時，以電子郵件向會員發送提醒（參數是捐款終止發送提醒之前的天數。它可以是用分號分隔的天數清單，例如 '10; 5; 0; -5'）
 MembershipPaid=本期已支付的會費（直到%s）
 YouMayFindYourInvoiceInThisEmail=您可在此電子郵件中找到發票
 XMembersClosed=%s會員已關閉
 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.
+CreateDolibarrLoginDesc=為會員建立用戶登錄允許他們連接到應用程式。例如，根據授予的授權，他們將能夠自己查閱或修改他們的檔案。
+CreateDolibarrThirdPartyDesc=如果您決定為每筆捐款產生發票，合作方就是將使用在發票上的實體法人。您稍後可以在記錄捐款的過程中建立它。
diff --git a/htdocs/langs/zh_TW/modulebuilder.lang b/htdocs/langs/zh_TW/modulebuilder.lang
index 55889b9e43f..913db96eff9 100644
--- a/htdocs/langs/zh_TW/modulebuilder.lang
+++ b/htdocs/langs/zh_TW/modulebuilder.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=此工具只能由有經驗的使用者或開發人員使用。它提供了用於建構或編輯您自己模組。另個<a href="%s" target="_blank">手動開發的文件在此處</a>。
+ModuleBuilderDesc=此工具只能由有經驗的用戶或開發人員使用。它提供了構建或編輯您自己的模組的實用程序。替代 <a href="%s" target="_blank" rel="noopener noreferrer"> 手動開發的文件在此處 </a> 。
 EnterNameOfModuleDesc=輸入要新建的 模組/程式 名稱不留空白。使用大寫字母分隔單詞（例如：example: MyModule, EcommerceForShop, SyncWithMySystem...）
 EnterNameOfObjectDesc=輸入要新建的物件名稱不留空白。使用大寫字母分隔單詞（例如：MyObject, Student, Teacher...）。將生成 CRUD class 檔案，以及 API 檔案，頁面用來 列出/新增/編輯/刪除 對象及SQL的檔案將自動生成。
 ModuleBuilderDesc2=已生成/已編輯 模組的路徑（外部模組的首個目錄定義為%s）: <strong> %s </strong>
@@ -20,14 +20,14 @@ 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!
+ModuleBuilderDescbuildpackage=您可以在此處產生模組的“準備發布”封裝檔案（統一化的 .zip 文件）和“準備發布”文件檔案.只需點擊按鈕即可建構封裝或文件檔案。
+EnterNameOfModuleToDeleteDesc=您可以刪除您的模組。警告：模組的所有編碼檔案（手動產生或建立）以及結構化資料和文件都將被刪除！
+EnterNameOfObjectToDeleteDesc=您可以刪除一個項目。警告：所有與物件相關的編碼檔案（手動產生或建立）都將被刪除！
 DangerZone=危險區域
 BuildPackage=建立軟體包
-BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildPackageDesc=您可以產生應用程式的 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
+ModuleIsNotActive=此模組尚未啟用。前往 %s 使其生效或點擊此處
 ModuleIsLive=此模組已被啟動。任何更改都可能會破壞目前的即時功能。
 DescriptionLong=詳細描述
 EditorName=編輯器名稱
@@ -40,7 +40,7 @@ PageForCreateEditView=建立/編輯/檢視記錄PHP頁面
 PageForAgendaTab=事件分頁的PHP頁面
 PageForDocumentTab=文件分頁的PHP頁面
 PageForNoteTab=註記分頁的PHP頁面
-PageForContactTab=PHP page for contact tab
+PageForContactTab=聯絡人分頁的 PHP 頁面
 PathToModulePackage=模組/應用程式包的zip路徑
 PathToModuleDocumentation=模組/應用程式檔案的文件路徑(%s)
 SpaceOrSpecialCharAreNotAllowed=不允許使用空格或特殊符號。
@@ -50,47 +50,47 @@ RegenerateMissingFiles=產生遺失的檔案
 SpecificationFile=文件檔案
 LanguageFile=語言檔案
 ObjectProperties=項目屬性
-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.
+ConfirmDeleteProperty=您確定要刪除屬性 <strong> %s </strong> 嗎？這將更改 PHP 類別中的代碼，但也會從物件表格定義中刪除列。
 NotNull=非空白
-NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+NotNullDesc=1 = 將資料庫設定為 NOT NULL。 -1=如果為空（'' 或 0），則允許為空並強制值為 NULL。
 SearchAll=用於“全部搜尋”
 DatabaseIndex=資料庫索引
 FileAlreadyExists=檔案%s已存在
 TriggersFile=觸發器代碼檔案
 HooksFile=掛鉤代碼檔案
-ArrayOfKeyValues=Array of key-val
-ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
+ArrayOfKeyValues=鍵值陣列
+ArrayOfKeyValuesDesc=如果欄位是具有固定值的組合清單，則為鍵值陣列與數值
 WidgetFile=小工具檔案
 CSSFile=CSS檔案
 JSFile=Javascript檔案
 ReadmeFile=Readme檔案
 ChangeLog=ChangeLog檔案
-TestClassFile=File for PHP Unit Test class
+TestClassFile=PHP 單位測試類別檔案
 SqlFile=SQL檔案
 PageForLib=通用PHP庫的檔案
-PageForObjLib=File for the PHP library dedicated to object
-SqlFileExtraFields=Sql file for complementary attributes
+PageForObjLib=專用於物件的 PHP 庫檔案
+SqlFileExtraFields=補充屬性的 Sql 檔案
 SqlFileKey=密鑰的SQL檔案
-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
+SqlFileKeyExtraFields=補充屬性鍵的 Sql 檔案
+AnObjectAlreadyExistWithThisNameAndDiffCase=已存在具有此名稱和不同大小寫的物件
+UseAsciiDocFormat=可以使用 Markdown 格式，但建議使用 Asciidoc 格式（.md 和 .asciidoc 之間的比較：http://asciidoctor.org/docs/user-manual/#compared-to-markdown）
+IsAMeasure=是一個量測
 DirScanned=資料夾已掃描
 NoTrigger=沒有觸發器
 NoWidget=沒有小工具
-GoToApiExplorer=API explorer
+GoToApiExplorer=API 瀏覽器
 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)
+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=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=以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.
+IsAMeasureDesc=可以將可累積欄位的值以總和放入清單中嗎？ （例如：1 或 0）
+SearchAllDesc=欄位是否用於快速搜尋工具進行搜尋？ （範例：1 或 0）
+SpecDefDesc=在此處輸入您想與模組一起提供的所有尚未由其他分頁卡定義的文件。您可以使用 .md 或更好的豐富的 .asciidoc 語法。
+LanguageDefDesc=在此檔案中輸入每個語言檔案的所有密鑰和翻譯。
 MenusDefDesc=在此定義模組提供的選單
 DictionariesDefDesc=在此定義您模組提供的字典
 PermissionsDefDesc=在此定義模組提供的新權限
@@ -98,15 +98,15 @@ MenusDefDescTooltip=The menus provided by your module/application are defined in
 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 recorded by other modules).
-SeeIDsInUse=See IDs in use in your installation
-SeeReservedIDsRangeHere=See range of reserved IDs
-ToolkitForDevelopers=Toolkit for Dolibarr developers
+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>
 AddLanguageFile=增加語言檔案
 YouCanUseTranslationKey=您可以在此處使用一個key，此key是在語言檔案中找到的翻譯key（請參見“語言”分頁）
-DropTableIfEmpty=(Destroy table if empty)
+DropTableIfEmpty=（如果為空，則刪除表）
 TableDoesNotExists=表%s不存在
 TableDropped=表%s已刪除
 InitStructureFromExistingTable=建立現有表的結構數組字串
@@ -132,16 +132,16 @@ IncludeRefGenerationHelp=如果要包含代碼以自動管理參考的產生成
 IncludeDocGeneration=我想從項目產生一些文件
 IncludeDocGenerationHelp=如果選中此選項，將產生一些代碼以在記錄上增加“產生文件”框。
 ShowOnCombobox=在組合框中顯示數值
-KeyForTooltip=Key for tooltip
-CSSClass=CSS for edit/create form
-CSSViewClass=CSS for read form
-CSSListClass=CSS for list
+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)
 AsciiToHtmlConverter=ASCII到HTML轉換器
 AsciiToPdfConverter=ASCII到PDF轉換器
 TableNotEmptyDropCanceled=表不為空。刪除已被取消。
-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=模組建構器可使用，但不允許您的用戶使用。
+ImportExportProfiles=匯入和匯出設定檔
+ValidateModBuilderDesc=如果需要使用 $this->validateField() 驗證此欄位，則輸入 1；如果需要驗證，則輸入 0
diff --git a/htdocs/langs/zh_TW/mrp.lang b/htdocs/langs/zh_TW/mrp.lang
index 9da90fa90c4..1c07e85c477 100644
--- a/htdocs/langs/zh_TW/mrp.lang
+++ b/htdocs/langs/zh_TW/mrp.lang
@@ -27,12 +27,12 @@ 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=刪除製造訂單
 ConfirmDeleteBillOfMaterials=您確定要刪除此物料清單嗎？
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
+ConfirmDeleteMo=您確定要刪除此製造訂單嗎？
 MenuMRP=製造訂單
 NewMO=新製造訂單
 QtyToProduce=生產數量
@@ -104,6 +104,6 @@ HumanMachine=人員/機器
 WorkstationArea=工作站區域
 Machines=機器
 THMEstimatedHelp=此費率使得可以定義物料的預估成本
-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=材料清單
+CollapseBOMHelp=您可以在 BOM 模組的設定中定義命名法詳細資訊的預設顯示
 MOAndLines=製造訂單和生產線
diff --git a/htdocs/langs/zh_TW/oauth.lang b/htdocs/langs/zh_TW/oauth.lang
index cd34ff0e779..0e443711506 100644
--- a/htdocs/langs/zh_TW/oauth.lang
+++ b/htdocs/langs/zh_TW/oauth.lang
@@ -23,10 +23,10 @@ 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_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">此頁面</a>然後“註冊新應用程式”以建立OAuth憑證
+OAUTH_GITHUB_DESC=前往此<a class="notasortlink" href="https://github.com/settings/developers" target="_blank" rel="noopener noreferrer external">頁面</a>然後“註冊新應用程式”以建立OAuth憑證
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe測試
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/zh_TW/opensurvey.lang b/htdocs/langs/zh_TW/opensurvey.lang
index f45a2972720..5e496e32e8f 100644
--- a/htdocs/langs/zh_TW/opensurvey.lang
+++ b/htdocs/langs/zh_TW/opensurvey.lang
@@ -48,8 +48,8 @@ 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.
+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=回到目前月份
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index 6ab65fbb67d..9b7b349d31b 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -35,9 +35,9 @@ OnlyOneFieldForXAxisIsPossible=目前只能將1個欄位用作X軸。僅選擇
 AtLeastOneMeasureIsRequired=至少需要1個測量欄位
 AtLeastOneXAxisIsRequired=X軸至少需要1個欄位
 LatestBlogPosts=最新的部落格文章
-notiftouser=To users
-notiftofixedemail=To fixed mail
-notiftouserandtofixedemail=To user and fixed mail
+notiftouser=給用戶
+notiftofixedemail=給固定電子郵件
+notiftouserandtofixedemail=給用戶和固定電子郵件
 Notify_ORDER_VALIDATE=銷售訂單已驗證
 Notify_ORDER_SENTBYMAIL=使用郵件寄送的銷售訂單
 Notify_ORDER_SUPPLIER_SENTBYMAIL=使用電子郵件寄送的採購訂單
@@ -258,6 +258,10 @@ 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
@@ -268,6 +272,7 @@ ProjectCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建
 TicketCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建立的服務單
 OpeningHoursFormatDesc=使用-分隔營業開始時間和營業結束時間。 <br>使用空格輸入不同的範圍。 <br>範例：8-12 14-18
 SuffixSessionName=程序名稱的後綴
+LoginWith=使用 %s 登入
 
 ##### Export #####
 ExportsArea=出口地區
diff --git a/htdocs/langs/zh_TW/partnership.lang b/htdocs/langs/zh_TW/partnership.lang
index 2ededbdf7d8..c554f348d93 100644
--- a/htdocs/langs/zh_TW/partnership.lang
+++ b/htdocs/langs/zh_TW/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=合作夥伴關係管理
 PartnershipDescription=合作夥伴管理模組
 PartnershipDescriptionLong= 合作夥伴管理模組
-
+Partnership=合夥
 AddPartnership=增加合作夥伴
 CancelPartnershipForExpiredMembers=合作夥伴：取消訂閱過期會員的合作關係
 PartnershipCheckBacklink=合作夥伴：檢查參考反向連結
@@ -58,7 +58,7 @@ ManagePartnership=管理合作夥伴
 BacklinkNotFoundOnPartnerWebsite=在合作夥伴網站上找不到反向連結
 ConfirmClosePartnershipAsk=您確定要取消此合作關係嗎？
 PartnershipType=合作夥伴類型
-PartnershipRefApproved=Partnership %s approved
+PartnershipRefApproved=合作夥伴 %s 已核准
 
 #
 # Template Mail
@@ -78,8 +78,8 @@ YourPartnershipRefusedContent=我們通知您，您的合作請求已被拒絕
 YourPartnershipAcceptedContent=我們通知您，您的合作請求已被接受。
 YourPartnershipCanceledContent=我們通知您，您的合作夥伴關係已被取消。
 
-CountLastUrlCheckError=Number of errors for last URL check
-LastCheckBacklink=Date of last URL check
+CountLastUrlCheckError=上次檢查網址的錯誤數量
+LastCheckBacklink=上次檢查網址的日期
 ReasonDeclineOrCancel=拒絕原因
 
 #
diff --git a/htdocs/langs/zh_TW/paybox.lang b/htdocs/langs/zh_TW/paybox.lang
index 0f85b99b706..38eac80966d 100644
--- a/htdocs/langs/zh_TW/paybox.lang
+++ b/htdocs/langs/zh_TW/paybox.lang
@@ -1,9 +1,9 @@
 # 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=以下網址可提供給客戶的網頁上，能夠作出Dolibarr支付對象
 PaymentForm=付款方式
-WelcomeOnPaymentPage=歡迎使用我們的在線支付服務
+WelcomeOnPaymentPage=歡迎使用我們的線上支付服務
 ThisScreenAllowsYouToPay=這個屏幕允許你進行網上支付%s。
 ThisIsInformationOnPayment=這是在做付款信息
 ToComplete=要完成
@@ -20,7 +20,6 @@ AccountParameter=帳戶參數
 UsageParameter=使用參數
 InformationToFindParameters=幫助，找到你的%s帳戶信息
 PAYBOX_CGI_URL_V2=付款出納CGI模塊的網址
-VendorName=供應商名稱
 CSSUrlForPaymentForm=付款方式的CSS樣式表的URL
 NewPayboxPaymentReceived=收到新的Paybox付款
 NewPayboxPaymentFailed=新的Paybox付款已嘗試但已失敗
diff --git a/htdocs/langs/zh_TW/paypal.lang b/htdocs/langs/zh_TW/paypal.lang
index 3dce92149e3..810bc07e357 100644
--- a/htdocs/langs/zh_TW/paypal.lang
+++ b/htdocs/langs/zh_TW/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
-PAYPAL_API_SANDBOX=測試/沙箱模式
-PAYPAL_API_USER=API的用戶名
+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 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=這是交易編號<b>：%s</b>
-PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
-NewOnlinePaymentReceived=New online payment received
-NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfOnlinePaymentFailed=Validation of online payment failed
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
-SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
-DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
-DetailedErrorMessage=Detailed Error Message
-ShortErrorMessage=Short Error Message
-ErrorCode=Error Code
-ErrorSeverityCode=Error Severity Code
-OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import PayPal payments
-PostActionAfterPayment=Post actions after payments
-ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
-ValidationOfPaymentFailed=Validation of payment has failed
-CardOwner=Card holder
-PayPalBalance=Paypal credit
+PAYPAL_SSLVERSION=Curl SSL版本
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=提供“完整”付款（信用卡+ PayPal）或僅“ PayPal”
+PaypalModeIntegral=完整
+PaypalModeOnlyPaypal=PayPal
+ONLINE_PAYMENT_CSS_URL=線上支付頁面上CSS樣式表的可選擇網址
+ThisIsTransactionId=這是交易編號:<b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=通過電子郵件發送文件時，請包含PayPal付款網址
+NewOnlinePaymentReceived=收到新的線上付款
+NewOnlinePaymentFailed=新的線上付款已嘗試但失敗
+ONLINE_PAYMENT_SENDEMAIL=每次付款後（成功或失敗）的通知電子郵件地址
+ReturnURLAfterPayment=付款後返回網址
+ValidationOfOnlinePaymentFailed=線上付款驗證失敗
+PaymentSystemConfirmPaymentPageWasCalledButFailed=付款系統調用付款確認頁面返回錯誤
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API調用失敗。
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API調用失敗。
+DetailedErrorMessage=錯誤訊息詳細資訊
+ShortErrorMessage=簡短錯誤訊息
+ErrorCode=錯誤代碼
+ErrorSeverityCode=錯誤嚴重度代碼
+OnlinePaymentSystem=線上支付系統
+PaypalLiveEnabled=啟用PayPal“線上”模式（否則為測試/沙盒模式）
+PaypalImportPayment=匯入PayPal付款
+PostActionAfterPayment=付款後發布操作
+ARollbackWasPerformedOnPostActions=對所有Post操作執行了回滾。如果有必要，您必須手動完成發布操作。
+ValidationOfPaymentFailed=付款驗證失敗
+CardOwner=持卡人
+PayPalBalance=PayPal信用餘額
diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang
index d61d1444204..9297a806ae8 100644
--- a/htdocs/langs/zh_TW/productbatch.lang
+++ b/htdocs/langs/zh_TW/productbatch.lang
@@ -30,15 +30,16 @@ ManageLotMask=自定義遮罩
 CustomMasks=為每個產品定義不同編號遮罩的選項
 BatchLotNumberingModules=自動產生批號的編號規則
 BatchSerialNumberingModules=自動產生序號的編號規則（對每一個具有 1 個唯一批號/序號的產品）
-QtyToAddAfterBarcodeScan=每一個已掃描的條碼/批號/序號要增加的數量
+QtyToAddAfterBarcodeScan=%s每一個已掃描的條碼/批號/序號之數量
 LifeTime=有效期（天）
 EndOfLife=已到期
 ManufacturingDate=生產日期
 DestructionDate=銷毀日期
 FirstUseDate=首次使用日期
 QCFrequency=品質控制頻率（天）
-ShowAllLots=Show all lots
-HideLots=Hide lots
+ShowAllLots=顯示全部批號
+HideLots=隱藏批號
 #Traceability - qc status
 OutOfOrder=亂序
 InWorkingOrder=在生產訂單中
+ToReplace=更換
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 8a99edd053c..3df9decbaec 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -75,9 +75,9 @@ SellingPriceTTC=售價（含稅）
 SellingMinPriceTTC=最低售價（含稅）
 CostPriceDescription=此價格欄位（不含稅）可用於取得該產品給貴公司的平均價格。它可以是您自己計算的任何價格，例如，根據平均購買價格加上平均生產和分銷成本得出的價格。
 CostPriceUsage=此值可用於利潤計算。
-ManufacturingPrice=Manufacturing price
-SoldAmount=銷售數量
-PurchasedAmount=購買數量
+ManufacturingPrice=製造價格
+SoldAmount=銷售金額
+PurchasedAmount=採購金額
 NewPrice=新價格
 MinPrice=最低售價
 EditSellingPriceLabel=修改售價標籤
@@ -275,7 +275,7 @@ BarCodeDataForProduct=產品%s的條碼資訊：
 BarCodeDataForThirdparty=合作方%s的條碼資訊：
 ResetBarcodeForAllRecords=為所有記錄定義條碼值（這將重置已經用新值定義的條碼值）
 PriceByCustomer=每個客戶的價格不同
-PriceCatalogue=每個產品/服務的單次銷售價格
+PriceCatalogue=每個產品/服務的單一銷售價格
 PricingRule=售價規則
 AddCustomerPrice=依客戶新增價格
 ForceUpdateChildPriceSoc=為客戶子公司設定相同的價格
@@ -316,7 +316,7 @@ LastUpdated=最新更新
 CorrectlyUpdated=更新成功
 PropalMergePdfProductActualFile=用於增加到PDF Azur的文件是
 PropalMergePdfProductChooseFile=選擇PDF文件
-IncludingProductWithTag=Including products/services with the tag
+IncludingProductWithTag=包含有標籤的產品/服務
 DefaultPriceRealPriceMayDependOnCustomer=預設價格，實際價格可能取決於客戶
 WarningSelectOneDocument=請至少選擇一份文件
 DefaultUnitToShow=單位
@@ -398,13 +398,16 @@ ActionAvailableOnVariantProductOnly=僅對產品的變數提供操作
 ProductsPricePerCustomer=每個客戶的產品價格
 ProductSupplierExtraFields=附加屬性（供應商價格）
 DeleteLinkedProduct=刪除連結到組合的子產品
-AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
+AmountUsedToUpdateWAP=用於更新加權平均價格的金額
 PMPValue=加權平均價格
 PMPValueShort=WAP
-mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Attention periods not entered and mandatory
-mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Message to the user on the need to enter a start date and an end date on a service when creating / validating an invoice, commercial proposal, sales order. <br> This action is not blocking in the process of confirmation
-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'.
+mandatoryperiod=強制期限
+mandatoryPeriodNeedTobeSet=注意：必須定義期間（開始和結束日期）
+mandatoryPeriodNeedTobeSetMsgValidate=服務需要有開始與結束的時間
+mandatoryHelper=如果您希望在建立/驗證發票、商業提案/建議書、銷售訂單時向用戶發送訊息，而無需在此服務的行中輸入開始和結束日期，請選此項。 <br> 請注意，該消息是警告而不是封鎖錯誤。
+DefaultBOM=預設物料清單
+DefaultBOMDesc=推薦用於製造此產品的預設的物料清單。僅當產品性質為“%s”時才能設定此欄位。
 Rank=等級
+SwitchOnSaleStatus=開啟銷售狀態
+SwitchOnPurchaseStatus=開啟採購狀態
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 7e6461b961f..b89b97cd164 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -140,7 +140,7 @@ NoTasks=此專案沒有任務
 LinkedToAnotherCompany=連結到其他合作方
 TaskIsNotAssignedToUser=任務未分配給用戶。現在使用按鈕'<strong>%s</strong>'分配任務。
 ErrorTimeSpentIsEmpty=花費的時間是空的
-TimeRecordingRestrictedToNMonthsBack=Time recording is restricted to %s months back
+TimeRecordingRestrictedToNMonthsBack=時間記錄僅限於 %s 個月以前
 ThisWillAlsoRemoveTasks=此操作將刪除專案（此刻<b>%s</b>任務）的所有任務和所有輸入的花費時間。
 IfNeedToUseOtherObjectKeepEmpty=如果必須將屬於另一個合作方的某些項目（發票，訂單等）連結到要建立的專案，請將該欄位保留為空白以使此專案為多個合作方。
 CloneTasks=複製任務
@@ -197,6 +197,7 @@ InputPerMonth=每月輸入
 InputDetail=輸入詳細訊息
 TimeAlreadyRecorded=這是為此任務/天和用戶%s已經記錄的花費時間
 ProjectsWithThisUserAsContact=與此用戶聯絡人的專案
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=分配給此用戶的任務
 ResourceNotAssignedToProject=未分配給專案
 ResourceNotAssignedToTheTask=未分配給任務
@@ -259,7 +260,7 @@ TimeSpentForInvoice=花費時間
 OneLinePerUser=每位用戶一行
 ServiceToUseOnLines=行上使用的服務
 InvoiceGeneratedFromTimeSpent=根據專案花費的時間產生了發票%s
-InterventionGeneratedFromTimeSpent=Intervention %s has been generated from time spent on project
+InterventionGeneratedFromTimeSpent=干預 %s 已從專案的時間花費上產生
 ProjectBillTimeDescription=請勾選如果您輸入了有關專案任務的時間表，並計劃從此時間表中產生發票以向此專案的客戶開立帳單（不要勾選如果您打算建立不基於輸入時間表的發票）。注意：要產生發票，請前往專案的“花費時間”分頁上，並選擇要包括的行。
 ProjectFollowOpportunity=追蹤機會
 ProjectFollowTasks=追蹤任務或花費的時間
@@ -268,13 +269,13 @@ UsageOpportunity=用法：機會
 UsageTasks=用法：任務
 UsageBillTimeShort=用法：帳單時間
 InvoiceToUse=發票草稿
-InterToUse=Draft intervention to use
+InterToUse=使用干預草案
 NewInvoice=新發票
 NewInter=新干預
 OneLinePerTask=每個任務一行
 OneLinePerPeriod=每個週期一行
 OneLinePerTimeSpentLine=一行為一筆時間花費申報
-AddDetailDateAndDuration=With date and duration into line description
+AddDetailDateAndDuration=將日期和持續時間放入行的描述中
 RefTaskParent=參考上層任務
 ProfitIsCalculatedWith=利潤計算是使用
 AddPersonToTask=也增加到任務
@@ -282,5 +283,7 @@ UsageOrganizeEvent=用途：事件組織
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=當所有任務完成時將專案分類為關閉(進度100%%)
 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>.
+ProjectTasksWithoutTimeSpent=無需時間花費的專案任務
+FormForNewLeadDesc=感謝您填寫以下表單與我們聯繫。您也可以直接發送電子郵件至 <b> %s </b> 。
+ProjectsHavingThisContact=Projects having this contact
+StartDateCannotBeAfterEndDate=結束日期不能早於開始日期
diff --git a/htdocs/langs/zh_TW/propal.lang b/htdocs/langs/zh_TW/propal.lang
index 660338fcd14..9b718dad63f 100644
--- a/htdocs/langs/zh_TW/propal.lang
+++ b/htdocs/langs/zh_TW/propal.lang
@@ -89,11 +89,11 @@ IdProposal=方案/提案編號
 IdProduct=產品編號
 PrParentLine=方案/提案主行
 LineBuyPriceHT=購買價格扣除稅額
-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=接受提案/建議書
+RefusePropal=拒絕提案/建議書
+Sign=簽名
+PropalAlreadySigned=提案/建議書已被接受
+PropalAlreadyRefused=提案/建議書已被拒絕
+PropalSigned=提案/建議書已接受
+PropalRefused=提案/建議書已拒絕
+ConfirmRefusePropal=您確定您想要拒絕此商業提案/建議書?
diff --git a/htdocs/langs/zh_TW/receptions.lang b/htdocs/langs/zh_TW/receptions.lang
index 9fa94da38fc..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)
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=此訂單的收貨和收據
 ReceptionsToValidate=收貨確認
 StatusReceptionCanceled=取消
 StatusReceptionDraft=草案
-StatusReceptionValidated=驗證（產品出貨或已經出貨）
+StatusReceptionValidated=已驗證（待收到或已收到的產品）
+StatusReceptionValidatedToReceive=已驗證（要接收的產品）
+StatusReceptionValidatedReceived=已驗證（收到的產品）
 StatusReceptionProcessed=已處理
 StatusReceptionDraftShort=草案
 StatusReceptionValidatedShort=驗證
@@ -36,8 +39,8 @@ StatsOnReceptionsOnlyValidated=僅對已驗證收貨進行統計。使用的日
 SendReceptionByEMail=以電子郵件發送收貨
 SendReceptionRef=提交收貨%s
 ActionsOnReception=收貨事件
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
-ReceptionLine=收貨線
+ReceptionCreationIsDoneFromOrder=目前，新收貨的建立是從採購訂單完成的。
+ReceptionLine=收貨行
 ProductQtyInReceptionAlreadySent=未清銷售訂單中的產品數量已發送
 ProductQtyInSuppliersReceptionAlreadyRecevied=已收到未清供應商訂單中的產品數量
 ValidateOrderFirstBeforeReception=您必須先驗證訂單，然後才能進行收貨。
@@ -45,4 +48,7 @@ ReceptionsNumberingModules=收貨編號模組
 ReceptionsReceiptModel=收貨用文件範本
 NoMorePredefinedProductToDispatch=沒有更多預定義的產品要調度
 ReceptionExist=有櫃台
-ByingPrice=Bying price
+ByingPrice=依價格
+ReceptionBackToDraftInDolibarr=收貨 %s 回到草案狀態
+ReceptionClassifyClosedInDolibarr=收貨%s 分類為已關閉
+ReceptionUnClassifyCloseddInDolibarr=收貨 %s 重新開放
diff --git a/htdocs/langs/zh_TW/salaries.lang b/htdocs/langs/zh_TW/salaries.lang
index b999db2880f..1e868cf86bd 100644
--- a/htdocs/langs/zh_TW/salaries.lang
+++ b/htdocs/langs/zh_TW/salaries.lang
@@ -6,7 +6,7 @@ CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=預設,當建立薪資時將"自動建立
 Salary=薪資
 Salaries=薪資
 NewSalary=新薪資
-AddSalary=Add salary
+AddSalary=新增薪資
 NewSalaryPayment=新薪資卡
 AddSalaryPayment=新增支付薪資
 SalaryPayment=支付薪資
@@ -23,4 +23,5 @@ AllSalaries=所有薪資
 SalariesStatistics=薪資統計
 SalariesAndPayments=薪資與支付
 ConfirmDeleteSalaryPayment=您要刪除此筆薪資支付嗎?
-FillFieldFirst=Fill employee field first
+FillFieldFirst=先填寫員工欄位
+UpdateAmountWithLastSalary=使用上次薪資設定金額
diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang
index 8dfa1318f4b..583f9c228e7 100644
--- a/htdocs/langs/zh_TW/sendings.lang
+++ b/htdocs/langs/zh_TW/sendings.lang
@@ -53,7 +53,7 @@ SendShippingByEMail=通過電子郵件寄送出貨
 SendShippingRef=提交出貨%s 
 ActionsOnShipping=出貨事件
 LinkToTrackYourPackage=連結追踪您的包裹
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
+ShipmentCreationIsDoneFromOrder=目前，新裝運的建立是從銷售訂單記錄中完成的。
 ShipmentLine=出貨行
 ProductQtyInCustomersOrdersRunning=未清銷售訂單中的產品數量
 ProductQtyInSuppliersOrdersRunning=未清採購訂單中的產品數量
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index 37ffe33d636..b8f45dce406 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -12,9 +12,9 @@ AddWarehouse=新增倉庫
 AddOne=新增
 DefaultWarehouse=預設倉庫
 WarehouseTarget=目標倉庫
-ValidateSending=Confirm shipment
-CancelSending=Cancel shipment
-DeleteSending=Delete shipment
+ValidateSending=確認發貨
+CancelSending=取消發貨
+DeleteSending=刪除發貨
 Stock=庫存
 Stocks=庫存
 MissingStocks=缺少庫存
@@ -62,8 +62,8 @@ AllowAddLimitStockByWarehouse=除了每個產品的最小和期望庫存值之
 RuleForWarehouse=倉庫規則
 WarehouseAskWarehouseOnThirparty=為合作方設定倉庫
 WarehouseAskWarehouseDuringPropal=為商業提案/建議書設定一個倉庫
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
-WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
+WarehouseAskWarehouseDuringOrder=為銷售訂單設定一個倉庫
+WarehouseAskWarehouseDuringProject=為專案設定一個倉庫
 UserDefaultWarehouse=在用戶上設定一個倉庫
 MainDefaultWarehouse=預設倉庫
 MainDefaultWarehouseUser=為每個用戶設定一個預設倉庫
@@ -96,7 +96,7 @@ RealStock=實際庫存
 RealStockDesc=實體/實際庫存是目前倉庫中的庫存。
 RealStockWillAutomaticallyWhen=實際庫存將根據以下規則（在“庫存”模組中定義）進行修改：
 VirtualStock=虛擬庫存
-VirtualStockAtDate=Virtual stock at a future date
+VirtualStockAtDate=未來日期的虛擬庫存
 VirtualStockAtDateDesc=虛擬庫存將於即將執行的待辦訂單所選擇的日期前完成
 VirtualStockDesc=虛擬庫存是在所有未完成/待辦操作（影響庫存）關閉（收到採購訂單、銷售訂單發貨、生產製造訂單等）後計算出的庫存
 AtDate=目前
@@ -178,6 +178,7 @@ ProductStockWarehouseDeleted=已正確刪除庫存限制警報和需求最佳庫
 AddNewProductStockWarehouse=設定新限制警報和所需最佳庫存
 AddStockLocationLine=減少數量，然後點擊來新增此產品的另一個倉庫
 InventoryDate=庫存日期
+Inventories=庫存(s)
 NewInventory=新庫存
 inventorySetup = 庫存設定
 inventoryCreatePermission=產生新庫存
@@ -240,7 +241,7 @@ StockAtDatePastDesc=您可以在此處檢視給定之過去日期的庫存（實
 StockAtDateFutureDesc=您可以在此檢視未來某一天的庫存(虛擬庫存)
 CurrentStock=目前庫存
 InventoryRealQtyHelp=將值設定為0以重置數量<br>保持欄位為空或刪除行以保持不變
-UpdateByScaning=使用掃描填入實際數量
+UpdateByScaning=掃描完整真實數量
 UpdateByScaningProductBarcode=掃描更新（產品條碼）
 UpdateByScaningLot=掃描更新（批次|序列條碼）
 DisableStockChangeOfSubProduct=在此移動期間停止此組合所有子產品的庫存變化。
@@ -253,14 +254,20 @@ ReOpen=重新打開
 ConfirmFinish=您確定要關閉此盤點嗎？這將使得產生所有庫存移動並且更新您庫存中的真實數量。
 ObjectNotFound=未發現%s
 MakeMovementsAndClose=產生移動並關閉
-AutofillWithExpected=用預期數量填入實際數量
+AutofillWithExpected=用預期數量替換實際數量
 ShowAllBatchByDefault=預設,在產品"庫存"分頁顯示批次詳細資料
 CollapseBatchDetailHelp=您可以在庫存模組設定中設定預設顯示批次詳細資料
-FieldCannotBeNegative=欄位“%s”不能為負值
-ErrorWrongBarcodemode=Unknown Barcode mode
-ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Same batch number found in inventory list
-ProductBatchDoesNotExist=Product with batch/serial does not exist
-ProductBarcodeDoesNotExist=Product with barcode does not exist
-WarehouseId=Warehouse ID
-WarehouseRef=Warehouse Ref
+ErrorWrongBarcodemode=未知條碼模式
+ProductDoesNotExist=產品不存在
+ErrorSameBatchNumber=在庫存表中找到了幾條批號記錄。無法得知要增加哪一個。
+ProductBatchDoesNotExist=此批號/序號的產品不存在
+ProductBarcodeDoesNotExist=此條碼的產品不存在
+WarehouseId=倉庫編號
+WarehouseRef=倉庫名稱
+SaveQtyFirst=在詢問建立庫存變動之前，首先儲存實際庫存數量。
+InventoryStartedShort=已開始
+ErrorOnElementsInventory=操作因為以下原因取消：
+ErrorCantFindCodeInInventory=在庫存中找不到以下代號
+QtyWasAddedToTheScannedBarcode=成功 ！！數量已增加到所有請求的條碼中。您可以關閉掃描工具。
+StockChangeDisabled=更改庫存已停用
+NoWarehouseDefinedForTerminal=沒有為終端機定義倉庫
diff --git a/htdocs/langs/zh_TW/stripe.lang b/htdocs/langs/zh_TW/stripe.lang
index d5ca122f272..3e6691b8381 100644
--- a/htdocs/langs/zh_TW/stripe.lang
+++ b/htdocs/langs/zh_TW/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe模組設定
-StripeDesc=通過<a href="http://www.stripe.com" target="_blank"> Stripe </a>為客戶提供一個Stripe線上支付頁面，以使用信用卡/簽帳卡付款。這可允許您的客戶進行臨時付款或用於與特定Dolibarr項目（發票，訂單等）有關的付款。
+StripeDesc=通過<a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a>為客戶提供一個Stripe線上支付頁面，以使用信用卡/簽帳卡付款。這可允許您的客戶進行臨時付款或用於與特定Dolibarr項目（發票，訂單等）有關的付款。
 StripeOrCBDoPayment=用信用卡或Stripe付款
 FollowingUrlAreAvailableToMakePayments=以下網址可用於向客戶提供頁面以對Dolibarr項目進行付款
 PaymentForm=付款表單
@@ -28,7 +28,6 @@ AccountParameter=帳戶參數
 UsageParameter=使用參數
 InformationToFindParameters=尋找您%s帳戶資訊的幫助
 STRIPE_CGI_URL_V2=Stripe CGI模組的付款網址
-VendorName=供應商名稱
 CSSUrlForPaymentForm=CSS樣式付款表單網址
 NewStripePaymentReceived=收到新的Stripe付款
 NewStripePaymentFailed=已嘗試新的Stripe付款但失敗
@@ -39,7 +38,7 @@ STRIPE_TEST_WEBHOOK_KEY=Webhook測試金鑰
 STRIPE_LIVE_SECRET_KEY=秘密live金鑰
 STRIPE_LIVE_PUBLISHABLE_KEY=可發布的live金鑰
 STRIPE_LIVE_WEBHOOK_KEY=Webhook live金鑰
-ONLINE_PAYMENT_WAREHOUSE=完成線上支付時用於減少庫存的庫存<br>（待辦事項 如果針對發票操作完成了減少庫存的選項，在線支付也同時產生發票？）
+ONLINE_PAYMENT_WAREHOUSE=完成線上支付時用於減少庫存的庫存<br>（待辦事項 如果針對發票操作完成了減少庫存的選項，線上支付也同時產生發票？）
 StripeLiveEnabled=啟用Stripe live模式（否則為測試/沙盒模式）
 StripeImportPayment=匯入Stripe付款
 ExampleOfTestCreditCard=用於信用卡測試的範例：%s =>有效，%s =>錯誤CVC，%s =>已過期，%s =>加值失敗
@@ -69,4 +68,4 @@ ToOfferALinkForTestWebhook=連結到Stripe WebHook設定以呼叫IPN（測試模
 ToOfferALinkForLiveWebhook=連結到Stripe WebHook設定以呼叫IPN（live模式）
 PaymentWillBeRecordedForNextPeriod=付款將記錄在下一個期間。
 ClickHereToTryAgain=<a href="%s">點擊此處重試... </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
+CreationOfPaymentModeMustBeDoneFromStripeInterface=由於嚴格的客戶身份驗證規則，必須在Stripe後台進行卡的建立。您可以點擊此處打開Stripe客戶記錄：%s
diff --git a/htdocs/langs/zh_TW/ticket.lang b/htdocs/langs/zh_TW/ticket.lang
index 77fb51e4dbd..a8519eee662 100644
--- a/htdocs/langs/zh_TW/ticket.lang
+++ b/htdocs/langs/zh_TW/ticket.lang
@@ -318,7 +318,7 @@ BoxTicketLastXDays=最近 %s 天中依日期的新服務單數量
 BoxTicketLastXDayswidget = 最近X天中依日期的新服務單數量
 BoxNoTicketLastXDays=最近%s天沒有新服務單
 BoxNumberOfTicketByDay=每日新服務單數量
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
+BoxNewTicketVSClose=服務單與已關閉服務單（本日）
 TicketCreatedToday=今天建立的服務單
 TicketClosedToday=今日已關閉的服務單
-KMFoundForTicketGroup=We found topics and FAQs that may answers your question, thanks to check them before submitting the ticket
+KMFoundForTicketGroup=我們找到了可以回答您問題的主題和常見問題解答，感謝您在提交服務單以前檢查它們
diff --git a/htdocs/langs/zh_TW/trips.lang b/htdocs/langs/zh_TW/trips.lang
index ab27efca81c..47ade2681c9 100644
--- a/htdocs/langs/zh_TW/trips.lang
+++ b/htdocs/langs/zh_TW/trips.lang
@@ -112,7 +112,7 @@ ConfirmCloneExpenseReport=您確定要複製此費用報表嗎？
 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的範例
@@ -127,19 +127,19 @@ ExpenseReportDomain=核准區域
 ExpenseReportLimitOn=限制於
 ExpenseReportDateStart=開始日期
 ExpenseReportDateEnd=結束日期
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
+ExpenseReportLimitAmount=最高金額
+ExpenseReportRestrictive=限制性的
 AllExpenseReport=費用報表的所有類型
 OnExpense=費用行
 ExpenseReportRuleSave=費用報表規則已儲存
 ExpenseReportRuleErrorOnSave=錯誤：%s
 RangeNum=範圍%d
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
+ExpenseReportConstraintViolationError=超過最高金額（規則 %s）：%s 高於 %s（超過禁止）
 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)
+ExpenseReportConstraintViolationWarning=超過最高金額（規則 %s）：%s 高於 %s（超過授權）
 nolimitbyEX_DAY=按天（無限制）
 nolimitbyEX_MON=按月（無限制）
 nolimitbyEX_YEA=按年（無限制）
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index f88be69a5f7..c406478e70a 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -45,7 +45,7 @@ ViewWebsiteInProduction=使用家庭網址檢視網站
 SetHereVirtualHost=<u>使用Apache/NGinx/...</u><br>建立您的網頁伺服器 (Apache, Nginx, ...) 啟用了含有PHP的專用虛擬主機並且根目錄資料夾位於<br><strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=在Apache虛擬主機設定中使用的範例：
 YouCanAlsoTestWithPHPS=在開發環境中<u>使用嵌入式PHP伺服器</u><br>, 您也許想要使用<br><strong>php -S 0.0.0.0:8080 -t %s</strong> 來測試此嵌入式PHP伺服器 (需要PHP 5.5) 的網站
-YouCanAlsoDeployToAnotherWHP=<u>在其他Dolibarr網站託管供應商執行您的網站</u> <br>如果您在網路上沒有Apache或NGinx之類的Web伺服器，則可以將網站匯出並匯入到另一個由Dolibarr網站託管供應商提供且有完整整合網站模組。您可以在<a href="https://saas.dolibarr.org" target="_blank"> https://saas.dolibarr.org </a>上找到一些Dolibarr網站託管服務供應商的清單。
+YouCanAlsoDeployToAnotherWHP=<u>在其他Dolibarr網站託管供應商執行您的網站</u> <br>如果您在網路上沒有Apache或NGinx之類的Web伺服器，則可以將網站匯出並匯入到另一個由Dolibarr網站託管供應商提供且有完整整合網站模組。您可以在<a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a>上找到一些Dolibarr網站託管服務供應商的清單。
 CheckVirtualHostPerms=同時請確認虛擬主機使用者(例如www-data)擁有檔案<br><strong>%s</strong>的<strong>%s</strong>權限
 ReadPerm=閱讀
 WritePerm=寫入
@@ -60,7 +60,7 @@ YouCanEditHtmlSourceckeditor=您可以使用編輯器中的“Source”按鈕來
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> 您可以使用標籤將PHP代碼包含到此源中<strong>&lt;?php ?&gt;</strong>. 以下全域變數可用: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.<br><br><span class="fa fa-bug"></span> 您還可以使用以下語法包含另一個頁面/容器的內容:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> 您可以使用以下語法重新定向到另一個頁面/容器（注意：重新定向之前請勿輸出任何內容）:<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>連結</strong> 下載儲存到 <strong>文件</strong>資料夾, 使用<strong>document.php</strong>打包器:<br>例如, 一個檔案要儲存到documents/ecm (需要紀錄)中, 語法為:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>檔案要儲存到documents/medias (公共權限的資料夾)中, 語法為:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>對於使用共用連結共享的檔案(使用檔案的共用hash鍵進行開放訪問), 語法為:<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> 打包器:<br>例如, 儲存影像到documents/medias (公共權限的資料夾), 語法為:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>.
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource2=使用有分享連結的影像 (使用檔案的Hash key開啟), 語法為:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>您可以在<a href="%s" target="_blank">Wiki文件</a>中找到更多HTML或是動態編碼的範例<br>
+YouCanEditHtmlSourceMore=<br>您可以在<a href="%s" target="_blank" rel="noopener noreferrer external">Wiki文件</a>中找到更多HTML或是動態編碼的範例<br>
 ClonePage=複製頁面/容器
 CloneSite=複製網站
 SiteAdded=網站已增加
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index d6afa375bf5..46af748ad84 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -15,6 +15,7 @@ BankTransferReceipt=貸方轉帳訂單
 LatestBankTransferReceipts=最新%s筆信用轉帳訂單
 LastWithdrawalReceipts=最新%s個直接轉帳付款檔案
 WithdrawalsLine=直接轉帳訂單行
+CreditTransfer=銀行轉帳
 CreditTransferLine=信用轉帳行
 WithdrawalsLines=直接轉帳付款訂單行
 CreditTransferLines=信用轉帳行
@@ -47,6 +48,7 @@ ThirdPartyBankCode=合作方銀行代碼
 NoInvoiceCouldBeWithdrawed=沒有直接轉帳成功的發票。檢查發票上是否有有效IBAN的公司，以及IBAN是否具有模式為<strong> %s </strong>的UMR（唯一授權參考）。
 WithdrawalCantBeCreditedTwice=此提款收據已標記為已記入；此無法執行兩次，因為這可能會產生重複的付款和銀行分錄。
 ClassCredited=分類為已記入
+ClassDebited=分類為借方
 ClassCreditedConfirm=您確定要將此提款收據分類為銀行帳戶中的已記入嗎？
 TransData=傳送日期
 TransMetod=傳送方式
@@ -80,7 +82,7 @@ StatusMotif7=司法判決
 StatusMotif8=其他原因
 CreateForSepaFRST=建立直接轉帳付款檔案(SEPA FRST)
 CreateForSepaRCUR=建立直接轉帳付款檔案(SEPA RCUR)
-CreateAll=建立直接轉帳付款檔案(全部)
+CreateAll=建立直接轉帳付款檔案
 CreateFileForPaymentByBankTransfer=建立用於信用轉移的檔案
 CreateSepaFileForPaymentByBankTransfer=建立信用轉帳文件（SEPA）
 CreateGuichet=只有辦公室
@@ -97,8 +99,8 @@ 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.
+DoStandingOrdersBeforePayments=此分頁可讓您申請直接轉帳付款單。完成後，進入選單銀行->直接轉帳訂單以產生和管理直接轉帳付款訂單。關閉付款訂單後，將自動記錄發票付款，如果剩餘付款為空，則關閉發票。
+DoCreditTransferBeforePayments=此分頁允許您申請貸記轉帳訂單。完成後，進入選單銀行->貸記轉帳付款以產生和管理貸記轉帳訂單。當信用轉帳訂單關閉時，發票上的付款將被自動記錄，如果餘額為空，發票將被關閉。
 WithdrawalFile=直接轉帳文件
 CreditTransferFile=信用轉帳文件
 SetToStatusSent=設定狀態為“檔案已傳送”
@@ -115,7 +117,7 @@ WithdrawRequestErrorNilAmount=無法為空金額建立直接轉帳付款請求
 SepaMandate=SEPA直接轉帳付款授權
 SepaMandateShort=SEPA授權
 PleaseReturnMandate=請以電子郵件將本授權書退回至%s或郵寄至
-SEPALegalText=通過簽署此授權書，您授權（A）%s向您的銀行發送指示以從您的帳戶中扣款，並（B）您的銀行根據%s的指示向您的帳戶直接轉帳。作為您權利的一部分，您有權根據與銀行達成的協議的條款和條件從銀行退款。必須從您的帳戶扣除之日起8週內要求退款。您可以從銀行獲得的聲明中了解您對上述授權的權利。
+SEPALegalText=通過簽署本授權書，您授權 (A) %s 向您的銀行發送指令以從您的帳戶中扣款，以及 (B) 您的銀行根據 %s 的指令從您的帳戶中扣款。作為您權利的一部分，您有權根據您與銀行協議的條款和條件從銀行獲得退款。您可以從銀行獲得的聲明中解釋了您對上述授權的權利。
 CreditorIdentifier=債權人識別碼
 CreditorName=債權人名稱
 SEPAFillForm=(B)請填寫所有標有*的欄位
@@ -133,7 +135,7 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=執行日期
 CreateForSepa=建立直接轉帳付款檔案
-ICS=Creditor Identifier - ICS
+ICS=債權人識別碼 - ICS
 END_TO_END="EndToEndId" SEPA XML標籤- 每筆交易分配的唯一ID
 USTRD="Unstructured" SEPA XML標籤
 ADDDAYS=將天數加到執行日期
@@ -150,3 +152,5 @@ ModeWarning=未設定實際模式選項，我們將在此模擬後停止
 ErrorCompanyHasDuplicateDefaultBAN=ID為%s的公司擁有多個預設銀行帳戶.無法得知要使用哪一個.
 ErrorICSmissing=銀行帳戶%s遺失ICS
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=直接借記訂單總金額與行的總和不同
+WarningSomeDirectDebitOrdersAlreadyExists=警告：已經有一些待處理的直接借記訂單 (%s) 請求金額為 %s
+WarningSomeCreditTransferAlreadyExists=警告：已請求金額為 %s 的一些待處理信用轉帳 (%s)
diff --git a/htdocs/langs/zh_TW/workflow.lang b/htdocs/langs/zh_TW/workflow.lang
index 0f43b46f170..10476adf836 100644
--- a/htdocs/langs/zh_TW/workflow.lang
+++ b/htdocs/langs/zh_TW/workflow.lang
@@ -14,9 +14,13 @@ 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=驗證連結的供應商訂單後，將接收分類為“已開票”
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=關閉服務單後，關閉與服務單連結的所有干預措施
diff --git a/htdocs/langs/zh_TW/zapier.lang b/htdocs/langs/zh_TW/zapier.lang
index 83bf36a1885..62ccb760dbb 100644
--- a/htdocs/langs/zh_TW/zapier.lang
+++ b/htdocs/langs/zh_TW/zapier.lang
@@ -17,5 +17,5 @@ ModuleZapierForDolibarrName = Zapier for Dolibarr
 ModuleZapierForDolibarrDesc = Zapier的Dolibarr模組
 ZapierForDolibarrSetup=Zapier的設定
 ZapierDescription=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>.
+ZapierAbout=關於Zapier模組
+ZapierSetupPage=無需在 Dolibarr 進行設定即可使用 Zapier。但是，您必須在 zapier 上產生並發布一個封包才能將 Zapier 與 Dolibarr 一起使用。請參閱<a href="https://wiki.dolibarr.org/index.php/Module_Zapier">此 wiki 頁面 </a> 上的  文件。
diff --git a/htdocs/loan/calcmens.php b/htdocs/loan/calcmens.php
index 19763c0a924..cc6debab86c 100644
--- a/htdocs/loan/calcmens.php
+++ b/htdocs/loan/calcmens.php
@@ -5,7 +5,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index c3c08b6cf2f..88701e35166 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -380,11 +380,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-	print '</div>';
+	print $form->buttonsSaveCancel("Add");
 
 	print '</form>';
 }
@@ -433,7 +429,7 @@ if ($id > 0) {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->loan->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 .= '<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);
@@ -450,9 +446,10 @@ if ($id > 0) {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
@@ -625,7 +622,6 @@ if ($id > 0) {
 
 		print '</div>';
 		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
 
 		/*
 		 * Payments
@@ -697,7 +693,6 @@ if ($id > 0) {
 			dol_print_error($db);
 		}
 
-		print '</div>';
 		print '</div>';
 		print '</div>';
 
@@ -706,11 +701,7 @@ if ($id > 0) {
 		print dol_get_fiche_end();
 
 		if ($action == 'edit') {
-			print '<div class="center">';
-			print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-			print '</div>';
+			print $form->buttonsSaveCancel();
 
 			print '</form>';
 		}
@@ -725,22 +716,22 @@ if ($id > 0) {
 
 				// Edit
 				if (($object->paid == 0 || $object->paid == 2) && $user->rights->loan->write) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a></div>';
 				}
 
 				// Emit payment
 				if (($object->paid == 0 || $object->paid == 2) && ((price2num($object->capital) > 0 && round($staytopay) < 0) || (price2num($object->capital) > 0 && round($staytopay) > 0)) && $user->rights->loan->write) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans("DoPayment").'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&action=create&token='.newToken().'">'.$langs->trans("DoPayment").'</a></div>';
 				}
 
 				// Classify 'paid'
 				if (($object->paid == 0 || $object->paid == 2) && round($staytopay) <= 0 && $user->rights->loan->write) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=paid&amp;token='.newToken().'">'.$langs->trans("ClassifyPaid").'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&action=paid&token='.newToken().'">'.$langs->trans("ClassifyPaid").'</a></div>';
 				}
 
 				// Delete
 				if (($object->paid == 0 || $object->paid == 2) && $user->rights->loan->delete) {
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
 				}
 
 				print "</div>";
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 91f384703a9..ec9ce00b7e9 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -404,7 +404,7 @@ class Loan extends CommonObject
 	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
 		$sql .= " paid = ".$this::STATUS_PAID;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 		$return = $this->db->query($sql);
 		if ($return) {
 			return 1;
@@ -440,7 +440,7 @@ class Loan extends CommonObject
 	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
 		$sql .= " paid = ".$this::STATUS_STARTED;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 		$return = $this->db->query($sql);
 		if ($return) {
 			return 1;
@@ -475,7 +475,7 @@ class Loan extends CommonObject
 	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
 		$sql .= " paid = ".$this::STATUS_UNPAID;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 		$return = $this->db->query($sql);
 		if ($return) {
 			return 1;
@@ -517,17 +517,17 @@ class Loan extends CommonObject
 		unset($this->labelStatus); // Force to reset the array of status label, because label can change depending on parameters
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
-			$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('Unpaid');
-			$this->labelStatus[self::STATUS_PAID] = $langs->trans('Paid');
-			$this->labelStatus[self::STATUS_STARTED] = $langs->trans("BillStatusStarted");
+			$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('Unpaid');
+			$this->labelStatus[self::STATUS_PAID] = $langs->transnoentitiesnoconv('Paid');
+			$this->labelStatus[self::STATUS_STARTED] = $langs->transnoentitiesnoconv("BillStatusStarted");
 			if ($status == 0 && $alreadypaid > 0) {
-				$this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+				$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
 			}
-			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('Unpaid');
-			$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('Enabled');
-			$this->labelStatusShort[self::STATUS_STARTED] = $langs->trans("BillStatusStarted");
+			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('Unpaid');
+			$this->labelStatusShort[self::STATUS_PAID] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatusShort[self::STATUS_STARTED] = $langs->transnoentitiesnoconv("BillStatusStarted");
 			if ($status == 0 && $alreadypaid > 0) {
-				$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+				$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
 			}
 		}
 
@@ -651,7 +651,7 @@ class Loan extends CommonObject
 
 		$sql = 'SELECT sum(amount_capital) as amount';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$table;
-		$sql .= ' WHERE '.$field.' = '.$this->id;
+		$sql .= " WHERE ".$field." = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::getSumPayment", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index 126002eb47a..9beff9dd22e 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -498,7 +498,7 @@ class LoanSchedule extends CommonObject
 		$toinsert = array();
 
 		$sql = "SELECT l.rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."loan as l ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."loan as l";
 		$sql .= " WHERE l.paid = 0";
 		$resql = $this->db->query($sql);
 
@@ -511,7 +511,8 @@ class LoanSchedule extends CommonObject
 						$this->db->begin();
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_loan ";
 						$sql .= "(fk_loan,datec,tms,datep,amount_capital,amount_insurance,amount_interest,fk_typepayment,num_payment,note_private,note_public,fk_bank,fk_user_creat,fk_user_modif) ";
-						$sql .= "SELECT fk_loan,datec,tms,datep,amount_capital,amount_insurance,amount_interest,fk_typepayment,num_payment,note_private,note_public,fk_bank,fk_user_creat,fk_user_modif FROM ".MAIN_DB_PREFIX."loan_schedule WHERE rowid =".$echid;
+						$sql .= "SELECT fk_loan,datec,tms,datep,amount_capital,amount_insurance,amount_interest,fk_typepayment,num_payment,note_private,note_public,fk_bank,fk_user_creat,fk_user_modif";
+						$sql .= " FROM ".MAIN_DB_PREFIX."loan_schedule WHERE rowid =".((int) $echid);
 						$res = $this->db->query($sql);
 						if ($res) {
 							$this->db->commit();
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 97c0ea56b15..1ed3e644b7f 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -47,8 +47,8 @@ $result = restrictedArea($user, 'loan', $id, '', '');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -71,6 +71,8 @@ if ($id > 0) {
 $upload_dir = $conf->loan->dir_output.'/'.dol_sanitizeFileName($object->ref);
 $modulepart = 'loan';
 
+$permissiontoadd = $user->rights->loan->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+
 
 /*
  * Actions
@@ -106,7 +108,7 @@ if ($object->id) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 		if ($user->rights->loan->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 .= '<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.'">';
@@ -122,9 +124,10 @@ if ($object->id) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php
index 7ecc41fe4d6..3a5e95c7823 100644
--- a/htdocs/loan/info.php
+++ b/htdocs/loan/info.php
@@ -72,7 +72,7 @@ if (!empty($conf->projet->enabled)) {
 	$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 	if ($user->rights->loan->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 .= '<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.'">';
@@ -88,9 +88,10 @@ if (!empty($conf->projet->enabled)) {
 		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>';
+			$morehtmlref .= ' : '.$proj->getNomUrl(1);
+			if ($proj->title) {
+				$morehtmlref .= ' - '.$proj->title;
+			}
 		} else {
 			$morehtmlref .= '';
 		}
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index f7930b64c9a..0b982728b9e 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -41,6 +41,8 @@ $langs->loadLangs(array("loan"));
 
 // Security check
 $id = GETPOST('id', 'int');
+
+$hookmanager->initHooks(array('loannote'));
 $result = restrictedArea($user, 'loan', $id, '&loan');
 
 $object = new Loan($db);
@@ -55,7 +57,14 @@ $permissionnote = $user->rights->loan->write; // Used by the include of actions_
  *  Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+
+$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
+}
 
 
 /*
@@ -88,7 +97,7 @@ if ($id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 		if ($user->rights->loan->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 .= '<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.'">';
@@ -104,9 +113,10 @@ if ($id > 0) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 675401e34f9..198025215b7 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -156,8 +156,8 @@ $disable_delete = 0;
 $sql = 'SELECT l.rowid as id, l.label, l.paid, l.capital as capital, pl.amount_capital, pl.amount_insurance, pl.amount_interest';
 $sql .= ' FROM '.MAIN_DB_PREFIX.'payment_loan as pl,'.MAIN_DB_PREFIX.'loan as l';
 $sql .= ' WHERE pl.fk_loan = l.rowid';
-$sql .= ' AND l.entity = '.$conf->entity;
-$sql .= ' AND pl.rowid = '.$payment->id;
+$sql .= ' AND l.entity = '.((int) $conf->entity);
+$sql .= ' AND pl.rowid = '.((int) $payment->id);
 
 dol_syslog("loan/payment/card.php", LOG_DEBUG);
 $resql = $db->query($sql);
@@ -222,7 +222,7 @@ print '<div class="tabsAction">';
 
 if (empty($action) && !empty($user->rights->loan->delete)) {
 	if (!$disable_delete) {
-		print '<a class="butActionDelete" href="card.php?id='.$id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
+		print '<a class="butActionDelete" href="card.php?id='.$id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>';
 	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
 	}
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 58783be181e..47fa5b37846 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -372,11 +372,7 @@ if ($action == 'create') {
 
 		print '</table>';
 
-		print '<br><div class="center">';
-		print '<input type="submit" class="button button-save" name="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 $form->buttonsSaveCancel();
 
 		print "</form>\n";
 }
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index 67be217f0d2..62ad7519ac9 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -154,7 +154,7 @@ if (!empty($conf->projet->enabled)) {
 	$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 	if ($user->rights->loan->write) {
 		if ($action != 'classify') {
-			//$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&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> : ';
 			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.'">';
@@ -171,9 +171,10 @@ if (!empty($conf->projet->enabled)) {
 		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>';
+			$morehtmlref .= ' : '.$proj->getNomUrl(1);
+			if ($proj->title) {
+				$morehtmlref .= ' - '.$proj->title;
+			}
 		} else {
 			$morehtmlref .= '';
 		}
@@ -186,7 +187,7 @@ $morehtmlright = '';
 dol_banner_tab($object, 'loanid', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
 
 ?>
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 $(document).ready(function() {
 	$('[name^="mens"]').focusout(function() {
 		var echeance=$(this).attr('ech');
@@ -335,7 +336,7 @@ if (count($echeances->lines) == 0) {
 } else {
 	$label = $langs->trans("Save");
 }
-print '<div class="center"><input class="button" type="submit" value="'.$label.'" '.(($pay_without_schedule == 1) ? 'disabled title="'.$langs->trans('CantUseScheduleWithLoanStartedToPaid').'"' : '').'title=""></div>';
+print '<div class="center"><input type="submit" class="button button-add" value="'.$label.'" '.(($pay_without_schedule == 1) ? 'disabled title="'.$langs->trans('CantUseScheduleWithLoanStartedToPaid').'"' : '').'title=""></div>';
 print '</form>';
 
 // End of page
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index d08f6f65094..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
@@ -232,7 +213,7 @@ class MailmanSpip
 				$mydb = $this->connectSpip();
 
 				if ($mydb) {
-					$query = "DELETE FROM spip_auteurs WHERE login='".$object->login."'";
+					$query = "DELETE FROM spip_auteurs WHERE login = '".$mydb->escape($object->login)."'";
 
 					$result = $mydb->query($query);
 
@@ -271,18 +252,18 @@ class MailmanSpip
 				$mydb = $this->connectSpip();
 
 				if ($mydb) {
-					$query = "SELECT login FROM spip_auteurs WHERE login='".$object->login."'";
+					$query = "SELECT login FROM spip_auteurs WHERE login = '".$mydb->escape($object->login)."'";
 
 					$result = $mydb->query($query);
 
 					if ($result) {
 						if ($mydb->num_rows($result)) {
 							// nous avons au moins une reponse
-							$mydb->close($result);
+							$mydb->close();
 							return 1;
 						} else {
 							// nous n'avons pas de reponse => n'existe pas
-							$mydb->close($result);
+							$mydb->close();
 							return 0;
 						}
 					} else {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2e377a3571f..2d977e5a288 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -72,7 +72,7 @@ function realCharForNumericEntities($matches)
 		return chr((int) $newstringnumentity);
 	}
 
-	return '&#'.$matches[1];	// Value will be unchanged because regex was /&#(  )/
+	return '&#'.$matches[1]; // Value will be unchanged because regex was /&#(  )/
 }
 
 /**
@@ -94,7 +94,9 @@ function testSqlAndScriptInject($val, $type)
 	do {
 		$oldval = $val;
 		$val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5);
-		$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', '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";
 
@@ -246,7 +248,7 @@ if (!empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6) !
 }
 
 
-// Include the conf.php and functions.lib.php. This defined the constants like DOL_DOCUMENT_ROOT, DOL_DATA_ROOT, DOL_URL_ROOT...
+// Include the conf.php and functions.lib.php and security.lib.php. This defined the constants like DOL_DOCUMENT_ROOT, DOL_DATA_ROOT, DOL_URL_ROOT...
 require_once 'filefunc.inc.php';
 
 // If there is a POST parameter to tell to save automatically some POST parameters into cookies, we do it.
@@ -266,16 +268,16 @@ 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, false, true); // keep cookie 1 year and add tag httponly
+	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 (empty($cookievalue)) {
 		unset($_COOKIE[$cookiename]);
 	}
 }
 
-
 // Set the handler of session
-if (ini_get('session.save_handler') == 'user') {
-	require_once 'core/lib/phpsessionindb.lib.php';
+// if (ini_get('session.save_handler') == 'user')
+if (!empty($php_session_save_handler) && $php_session_save_handler == 'db') {
+	require_once 'core/lib/phpsessionin'.$php_session_save_handler.'.lib.php';
 }
 
 // Init session. Name of session is specific to Dolibarr instance.
@@ -294,14 +296,14 @@ if (!empty($_COOKIE[$sessiontimeout])) {
 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.
 	session_name($sessionname);
-	session_start();
+	session_start();	// This call the open and read of session handler
+	//exit;	// this exist generates a call to write and close
 }
 
 
 // Init the 5 global objects, this include will make the 'new Xxx()' and set properties for: $conf, $db, $langs, $user, $mysoc
 require_once 'master.inc.php';
 
-
 // If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.
 if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
 	$ok = 0;
@@ -320,7 +322,7 @@ if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
 		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
 			print 'Sorry, your application is offline.'."\n";
 			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
-			$nexturl = DOL_URL_ROOT.'/user/logout.php';
+			$nexturl = DOL_URL_ROOT.'/user/logout.php?token='.newToken();
 			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
 		} else {
 			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
@@ -363,6 +365,12 @@ if (isset($_SERVER["HTTP_USER_AGENT"])) {
 	}
 }
 
+// If theme is forced
+if (GETPOST('theme', 'aZ09')) {
+	$conf->theme = GETPOST('theme', 'aZ09');
+	$conf->css = "/theme/".$conf->theme."/style.css.php";
+}
+
 // Set global MAIN_OPTIMIZEFORTEXTBROWSER (must be before login part)
 if (GETPOST('textbrowser', 'int') || (!empty($conf->browser->name) && $conf->browser->name == 'lynxlinks')) {   // If we must enable text browser
 	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = 1;
@@ -442,7 +450,7 @@ if ((!empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VE
 }
 
 // Creation of a token against CSRF vulnerabilities
-if (!defined('NOTOKENRENEWAL')) {
+if (!defined('NOTOKENRENEWAL') && !defined('NOSESSION')) {
 	// No token renewal on .css.php, .js.php and .json.php
 	if (!preg_match('/\.(css|js|json)\.php$/', $_SERVER["PHP_SELF"])) {
 		// Rolling token at each call ($_SESSION['token'] contains token of previous page)
@@ -450,60 +458,67 @@ if (!defined('NOTOKENRENEWAL')) {
 			$_SESSION['token'] = $_SESSION['newtoken'];
 		}
 
-		// Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
-		$token = dol_hash(uniqid(mt_rand(), false), 'md5'); // Generates a hash of a random number. We don't need a secured hash, just a changing random value.
-		$_SESSION['newtoken'] = $token;
-		dol_syslog("NEW TOKEN generated by : " . $_SERVER['PHP_SELF'], LOG_DEBUG);
+		if (!isset($_SESSION['newtoken']) || getDolGlobalInt('MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL')) {
+			// Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
+			$token = dol_hash(uniqid(mt_rand(), false), 'md5'); // Generates a hash of a random number. We don't need a secured hash, just a changing random value.
+			$_SESSION['newtoken'] = $token;
+			dol_syslog("NEW TOKEN generated by : ".$_SERVER['PHP_SELF'], LOG_DEBUG);
+		}
 	}
 }
 
 //dol_syslog("aaaa - ".defined('NOCSRFCHECK')." - ".$dolibarr_nocsrfcheck." - ".$conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN." - ".$_SERVER['REQUEST_METHOD']." - ".GETPOST('token', 'alpha'));
 
 // Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set into page
-if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN)) || defined('CSRFCHECK_WITH_TOKEN')) {
+if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && getDolGlobalInt('MAIN_SECURITY_CSRF_WITH_TOKEN')) || defined('CSRFCHECK_WITH_TOKEN')) {
 	// Array of action code where CSRFCHECK with token will be forced (so token must be provided on url request)
-	$arrayofactiontoforcetokencheck = array(
-		'activate', 'add', 'addrights', 'addtimespent',
-		'confirm_create_user', 'confirm_create_thirdparty', 'confirm_purge', 'confirm_reject_check', 'confirm_deletedir', 'confirm_deletefile',
-		'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'delrights',
-		'disable',
-		'doprev', 'donext', 'dvprev', 'dvnext',
-		'enable',
-		'install',
-		'setpricelevel',
-		'update'
-	);
 	$sensitiveget = false;
-	if (in_array(GETPOST('action', 'aZ09'), $arrayofactiontoforcetokencheck)) {
+	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;
+	} elseif (getDolGlobalInt('MAIN_SECURITY_CSRF_WITH_TOKEN') >= 2) {
+		// Few GET actions coded with a &token into url are processed as sensitive.
+		$arrayofactiontoforcetokencheck = array(
+			'activate',
+			'doprev', 'donext', 'dvprev', 'dvnext',
+			'install',
+			'reopen'
+		);
+		if (in_array(GETPOST('action', 'aZ09'), $arrayofactiontoforcetokencheck)) {
+			$sensitiveget = true;
+		}
+		if (preg_match('/^(add|classify|close|confirm|copy|del|disable|enable|remove|set|unset|update|save)/', GETPOST('action', 'aZ09'))) {
+			$sensitiveget = true;
+		}
 	}
-	if (preg_match('/^(disable_|enable_|setremise)/', GETPOST('action', 'aZ09'))) {
-		$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)
 	if (
 		$_SERVER['REQUEST_METHOD'] == 'POST' ||
 		$sensitiveget ||
-		((GETPOSTISSET('actionlogin') || GETPOSTISSET('action') || GETPOSTISSET('massaction')) && defined('CSRFCHECK_WITH_TOKEN'))
+		GETPOSTISSET('massaction') ||
+		((GETPOSTISSET('actionlogin') || GETPOSTISSET('action')) && defined('CSRFCHECK_WITH_TOKEN'))
 	) {
 		// 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.");
 				$langs->loadLangs(array("errors", "install"));
 				print $langs->trans("ErrorFileSizeTooLarge").' ';
 				print $langs->trans("ErrorGoBackAndCorrectParameters");
 				die;
 			} else {
 				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);
+					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";
 				} else {
-					dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"])?'':$_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (POST method or GET with a sensible value for 'action' parameter) in main.inc.php. Token not provided.", LOG_WARNING);
+					dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (POST method or GET with a sensible value for 'action' parameter) in main.inc.php. Token not provided.", LOG_WARNING);
 					print "Access to this page this way (POST method or GET with a sensible value for 'action' parameter) is refused by CSRF protection in main.inc.php. Token not provided.\n";
-					print "If you access your server behind a proxy using url rewriting and the parameter is provided by caller, you might check that all HTTP header are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file or MAIN_SECURITY_CSRF_WITH_TOKEN to 0 into setup).\n";
+					print "If you access your server behind a proxy using url rewriting and the parameter is provided by caller, you might check that all HTTP header are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file or MAIN_SECURITY_CSRF_WITH_TOKEN to 0";
+					if (!empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN)) {
+						print " instead of ".$conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN;
+					}
+					print " into setup).\n";
 				}
 				die;
 			}
@@ -513,10 +528,9 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
 	$sessiontokenforthisurl = (empty($_SESSION['token']) ? '' : $_SESSION['token']);
 	// TODO Get the sessiontokenforthisurl into the array of session token
 	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);
+		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.
 		setEventMessages('SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry', null, 'warnings');
-		//if ($conf->global->MAIN_FEATURES_LEVEL >= 1) setEventMessages('Unset POST and GET params by CSRF protection in main.inc.php (Token provided was not generated by the previous page).'."<br>\n".'$_SERVER[REQUEST_URI] = '.$_SERVER['REQUEST_URI'].' $_SERVER[REQUEST_METHOD] = '.$_SERVER['REQUEST_METHOD'].' GETPOST(token) = '.GETPOST('token', 'alpha').' $_SESSION[token] = '.$_SESSION['token'], null, 'warnings');
 		if (isset($_POST['id'])) $savid = ((int) $_POST['id']);
 		unset($_POST);
 		//unset($_POST['action']); unset($_POST['massaction']);
@@ -647,7 +661,7 @@ if (!defined('NOLOGIN')) {
 		// Verification security graphic code
 		if ($test && GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) && !isset($_SESSION['dol_bypass_antispam'])) {
 			$sessionkey = 'dol_antispam_value';
-			$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'none'))));
+			$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'restricthtml'))));
 
 			// Check code
 			if (!$ok) {
@@ -778,7 +792,7 @@ if (!defined('NOLOGIN')) {
 		// End test login / passwords
 		if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest))) {	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
 			// No data to test login, so we show the login page.
-			dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"])?'':$_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." - action=".GETPOST('action', 'aZ09')." - actionlogin=".GETPOST('actionlogin', 'aZ09')." - showing the login form and exit", LOG_INFO);
+			dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." - action=".GETPOST('action', 'aZ09')." - actionlogin=".GETPOST('actionlogin', 'aZ09')." - showing the login form and exit", LOG_INFO);
 			if (defined('NOREDIRECTBYMAINTOLOGIN')) {
 				return 'ERROR_NOT_LOGGED';
 			} else {
@@ -920,7 +934,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]);
@@ -929,13 +943,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]);
 				}
 			}
 
@@ -1082,9 +1100,10 @@ if (!defined('NOLOGIN')) {
 	}
 }
 
+
 // Case forcing style from url
-if (GETPOST('theme', 'alpha')) {
-	$conf->theme = GETPOST('theme', 'alpha', 1);
+if (GETPOST('theme', 'aZ09')) {
+	$conf->theme = GETPOST('theme', 'aZ09', 1);
 	$conf->css = "/theme/".$conf->theme."/style.css.php";
 }
 
@@ -1159,7 +1178,7 @@ if (!defined('NOLOGIN')) {
 	// Check if user is active
 	if ($user->statut < 1) {
 		// If not active, we refuse the user
-		$langs->load("other");
+		$langs->loadLangs(array("errors", "other"));
 		dol_syslog("Authentication KO as login is disabled", LOG_NOTICE);
 		accessforbidden($langs->trans("ErrorLoginDisabled"));
 		exit;
@@ -1169,7 +1188,7 @@ if (!defined('NOLOGIN')) {
 	$user->getrights();
 }
 
-dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"])?'':$_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"].' - action='.GETPOST('action', 'aZ09').', massaction='.GETPOST('massaction', 'aZ09').(defined('NOTOKENRENEWAL') ? ' NOTOKENRENEWAL='.constant('NOTOKENRENEWAL') : ''), LOG_NOTICE);
+dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"].' - action='.GETPOST('action', 'aZ09').', massaction='.GETPOST('massaction', 'aZ09').(defined('NOTOKENRENEWAL') ? ' NOTOKENRENEWAL='.constant('NOTOKENRENEWAL') : ''), LOG_NOTICE);
 //Another call for easy debugg
 //dol_syslog("Access to ".$_SERVER["PHP_SELF"].' '.$_SERVER["HTTP_REFERER"].' GET='.join(',',array_keys($_GET)).'->'.join(',',$_GET).' POST:'.join(',',array_keys($_POST)).'->'.join(',',$_POST));
 
@@ -1389,11 +1408,11 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
  * @param 	int    	$disablehead	 Disable head output
  * @param 	array  	$arrayofjs		 Array of complementary js files
  * @param 	array  	$arrayofcss		 Array of complementary css files
- * @param 	int    	$disablejmobile	 Disable jmobile (No more used)
+ * @param 	int    	$disableforlogin Do not load heavy js and css for login pages
  * @param   int     $disablenofollow Disable no follow tag
  * @return	void
  */
-function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $disablejmobile = 0, $disablenofollow = 0)
+function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $disableforlogin = 0, $disablenofollow = 0)
 {
 	global $db, $conf, $langs, $user, $mysoc, $hookmanager;
 
@@ -1430,7 +1449,9 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		print '<meta name="robots" content="noindex'.($disablenofollow ? '' : ',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')) {
+			print '<meta name="MAIN_FEATURES_LEVEL" content="'.getDolGlobalInt('MAIN_FEATURES_LEVEL').'">'."\n";
+		}
 		// Favicon
 		$favicon = DOL_URL_ROOT.'/theme/dolibarr_256x256_color.png';
 		if (!empty($mysoc->logo_squarred_mini)) {
@@ -1495,12 +1516,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');
 		}
@@ -1624,25 +1647,21 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			} else {
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
-			/*if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
-			{
-				if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				else print '<script src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			}*/
 			if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
 				print '<script src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			} else {
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
-			if (!defined('DISABLE_JQUERY_TABLEDND')) {
-				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
-			}
 			// jQuery jnotify
 			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY')) {
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
+			// Table drag and drop lines
+			if (empty($disableforlogin) && !defined('DISABLE_JQUERY_TABLEDND')) {
+				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			}
 			// Chart
-			if ((empty($conf->global->MAIN_JS_GRAPH) || $conf->global->MAIN_JS_GRAPH == 'chart') && !defined('DISABLE_JS_GRAPH')) {
+			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";
 			}
 
@@ -1682,7 +1701,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 		if (!$disablejs && !empty($conf->use_javascript_ajax)) {
 			// CKEditor
-			if ((!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR')) {
+			if (empty($disableforlogin) && (!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR')) {
 				print '<!-- Includes JS for CKEditor -->'."\n";
 				$pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';
 				$jsckeditor = 'ckeditor.js';
@@ -1692,8 +1711,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				}
 				print '<script>';
 				print '/* enable ckeditor by main.inc.php */';
-				print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
-				print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext ? '?'.$ext : ''), 1).'\';'."\n"; // $themesubdir='' in standard usage
+				print 'var CKEDITOR_BASEPATH = \''.dol_escape_js($pathckeditor).'\';'."\n";
+				print 'var ckeditorConfig = \''.dol_escape_js(dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext ? '?'.$ext : ''), 1)).'\';'."\n"; // $themesubdir='' in standard usage
 				print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
 				print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
 				print '</script>'."\n";
@@ -1755,6 +1774,14 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			}
 		}
 
+		//If you want to load custom javascript file from your selected theme directory
+		if (!empty($conf->global->ALLOW_THEME_JS)) {
+			$theme_js = dol_buildpath('/theme/'.$conf->theme.'/'.$conf->theme.'.js', 0);
+			if (file_exists($theme_js)) {
+				print '<script src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/'.$conf->theme.'.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			}
+		}
+
 		if (!empty($head)) {
 			print $head."\n";
 		}
@@ -1796,7 +1823,6 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 	global $hookmanager, $menumanager;
 
 	$searchform = '';
-	$bookmarks = '';
 
 	// Instantiate hooks for external modules
 	$hookmanager->initHooks(array('toprightmenu'));
@@ -1821,12 +1847,12 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 
 		print "\n".'<!-- Start top horizontal -->'."\n";
 
-		print '<div class="side-nav-vert'.(GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '').'"><div id="id-top">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
+		print '<header id="id-top" class="side-nav-vert'.(GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '').'">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
 
 		// Show menu entries
 		print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT) ? '' : 'invert').'" class="tmenu">'."\n";
 		$menumanager->atarget = $target;
-		$menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks)); // This contains a \n
+		$menumanager->showmenu('top', array('searchform'=>$searchform)); // This contains a \n
 		print "</div>\n";
 
 		// Define link to login card
@@ -1844,8 +1870,8 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			$appli .= " ".DOL_VERSION;
 		}
 
-		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
-			$appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+		if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
+			$appli .= "<br>".$langs->trans("LevelOfFeature").': '.getDolGlobalInt('MAIN_FEATURES_LEVEL');
 		}
 
 		$logouttext = '';
@@ -1855,7 +1881,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') {
 				$logouthtmltext .= $langs->trans("Logout").'<br>';
 
-				$logouttext .= '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php">';
+				$logouttext .= '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php?token='.newToken().'">';
 				$logouttext .= img_picto($langs->trans('Logout'), 'sign-out', '', false, 0, 0, '', 'atoplogin');
 				$logouttext .= '</a>';
 			} else {
@@ -1891,7 +1917,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		}
 
 		// Link to print main content area
-		if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $conf->browser->layout != 'phone') {
+		if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 			$qs = dol_escape_htmltag($_SERVER["QUERY_STRING"]);
 
 			if (isset($_POST) && is_array($_POST)) {
@@ -1902,7 +1928,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 				}
 			}
 			$qs .= (($qs && $morequerystring) ? '&' : '').$morequerystring;
-			$text = '<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs ? '&' : '').'optioncss=print" target="_blank">';
+			$text = '<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs ? '&' : '').'optioncss=print" target="_blank" rel="noopener noreferrer">';
 			//$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
 			$text .= '<span class="fa fa-print atoplogin valignmiddle"></span>';
 			$text .= '</a>';
@@ -1933,16 +1959,16 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			// Link to help pages
 			if ($helpbaseurl && $helppage) {
 				$text = '';
-				$title = $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage').'...';
+				$title = $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage').', ';
 				if ($mode == 'wiki') {
-					$title .= '<br>'.$langs->trans("PageWiki").' '.dol_escape_htmltag('"'.strtr($helppage, '_', ' ').'"');
+					$title .= '<br>'.img_picto('', 'globe', 'class="pictofixedwidth"').$langs->trans("PageWiki").' '.dol_escape_htmltag('"'.strtr($helppage, '_', ' ').'"');
 					if ($helppresent) {
 						$title .= ' <span class="opacitymedium">('.$langs->trans("DedicatedPageAvailable").')</span>';
 					} else {
 						$title .= ' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';
 					}
 				}
-				$text .= '<a class="help" target="_blank" rel="noopener" href="';
+				$text .= '<a class="help" target="_blank" rel="noopener noreferrer" href="';
 				if ($mode == 'wiki') {
 					$text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
 				} else {
@@ -1950,7 +1976,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 				}
 				$text .= '">';
 				$text .= '<span class="fa fa-question-circle atoplogin valignmiddle'.($helppresent ? ' '.$helppresent : '').'"></span>';
-				$text .= '<span class="fa fa-circle helppresentcircle'.($helppresent ? '' : ' unvisible').'"></span>';
+				$text .= '<span class="fa fa-long-arrow-alt-up helppresentcircle'.($helppresent ? '' : ' unvisible').'"></span>';
 				$text .= '</a>';
 				$toprightmenu .= $form->textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);
 			}
@@ -2005,7 +2031,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 
 		print "</div>\n"; // end div class="login_block"
 
-		print '</div></div>';
+		print '</header>';
 
 		print '<div style="clear: both;"></div>';
 		print "<!-- End top horizontal menu -->\n\n";
@@ -2021,7 +2047,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
  * Build the tooltip on user login
  *
  * @param	int			$hideloginname		Hide login name. Show only the image.
- * @param	string		$urllogout			URL for logout
+ * @param	string		$urllogout			URL for logout (Will use DOL_URL_ROOT.'/user/logout.php?token=...' if empty)
  * @return  string                  		HTML content
  */
 function top_menu_user($hideloginname = 0, $urllogout = '')
@@ -2054,24 +2080,24 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	$dropdownBody .= '<div id="topmenulogincompanyinfo" >';
 
 	if ($langs->transcountry("ProfId1", $mysoc->country_code) != '-') {
-		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId1", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton(getDolGlobalString("MAIN_INFO_SIREN")).'</span>';
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId1", $mysoc->country_code).'</b>: <span>'.dol_print_profids(getDolGlobalString("MAIN_INFO_SIREN"), 1).'</span>';
 	}
 	if ($langs->transcountry("ProfId2", $mysoc->country_code) != '-') {
-		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId2", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton(getDolGlobalString("MAIN_INFO_SIRET")).'</span>';
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId2", $mysoc->country_code).'</b>: <span>'.dol_print_profids(getDolGlobalString("MAIN_INFO_SIRET"), 2).'</span>';
 	}
 	if ($langs->transcountry("ProfId3", $mysoc->country_code) != '-') {
-		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId3", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton(getDolGlobalString("MAIN_INFO_APE")).'</span>';
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId3", $mysoc->country_code).'</b>: <span>'.dol_print_profids(getDolGlobalString("MAIN_INFO_APE"), 3).'</span>';
 	}
 	if ($langs->transcountry("ProfId4", $mysoc->country_code) != '-') {
-		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId4", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton(getDolGlobalString("MAIN_INFO_RCS")).'</span>';
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId4", $mysoc->country_code).'</b>: <span>'.dol_print_profids(getDolGlobalString("MAIN_INFO_RCS"), 4).'</span>';
 	}
 	if ($langs->transcountry("ProfId5", $mysoc->country_code) != '-') {
-		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId5", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton(getDolGlobalString("MAIN_INFO_PROFID5")).'</span>';
+		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId5", $mysoc->country_code).'</b>: <span>'.dol_print_profids(getDolGlobalString("MAIN_INFO_PROFID5"), 5).'</span>';
 	}
 	if ($langs->transcountry("ProfId6", $mysoc->country_code) != '-') {
-		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId6", $mysoc->country_code).'</b>: <span>'.showValueWithClipboardCPButton(getDolGlobalString("MAIN_INFO_PROFID6")).'</span>';
+		$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>'.showValueWithClipboardCPButton(getDolGlobalString("MAIN_INFO_TVAINTRA")).'</span>';
+	$dropdownBody .= '<br><b>'.$langs->trans("VATIntraShort").'</b>: <span>'.dol_print_profids(getDolGlobalString("MAIN_INFO_TVAINTRA"), 'VAT').'</span>';
 
 	$dropdownBody .= '</div>';
 
@@ -2137,7 +2163,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	}
 
 	if (empty($urllogout)) {
-		$urllogout = DOL_URL_ROOT.'/user/logout.php';
+		$urllogout = DOL_URL_ROOT.'/user/logout.php?token='.newToken();
 	}
 	$logoutLink = '<a accesskey="l" href="'.$urllogout.'" class="button-top-menu-dropdown" ><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';
 	$profilLink = '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" ><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';
@@ -2282,7 +2308,7 @@ function top_menu_quickadd()
                 <!-- 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>
+                    '. img_picto('', 'object_company').'<br>'.$langs->trans("ThirdParty").'</a>
                 </div>
                 ';
 	}
@@ -2293,7 +2319,7 @@ function top_menu_quickadd()
                 <!-- 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>
+                    '. img_picto('', 'object_contact').'<br>'.$langs->trans("Contact").'</a>
                 </div>
                 ';
 	}
@@ -2304,7 +2330,7 @@ function top_menu_quickadd()
                 <!-- 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>
+                    '. img_picto('', 'object_propal').'<br>'.$langs->trans("Proposal").'</a>
                 </div>
                 ';
 	}
@@ -2315,7 +2341,7 @@ function top_menu_quickadd()
                 <!-- 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>
+                    '. img_picto('', 'object_order').'<br>'.$langs->trans("Order").'</a>
                 </div>
                 ';
 	}
@@ -2326,7 +2352,7 @@ function top_menu_quickadd()
                 <!-- 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>
+                    '. img_picto('', 'object_bill').'<br>'.$langs->trans("Bill").'</a>
                 </div>
                 ';
 	}
@@ -2337,7 +2363,7 @@ function top_menu_quickadd()
                 <!-- 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>
+                    '. img_picto('', 'object_contract').'<br>'.$langs->trans("Contract").'</a>
                 </div>
                 ';
 	}
@@ -2348,7 +2374,7 @@ function top_menu_quickadd()
                 <!-- 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>
+                    '. img_picto('', 'object_propal').'<br>'.$langs->trans("AskPrice").'</a>
                 </div>
                 ';
 	}
@@ -2359,7 +2385,7 @@ function top_menu_quickadd()
                 <!-- 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>
+                    '. img_picto('', 'object_order').'<br>'.$langs->trans("SupplierOrder").'</a>
                 </div>
                 ';
 	}
@@ -2370,7 +2396,7 @@ function top_menu_quickadd()
                 <!-- 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>
+                    '. img_picto('', 'object_bill').'<br>'.$langs->trans("SupplierBill").'</a>
                 </div>
                 ';
 	}
@@ -2381,7 +2407,7 @@ function top_menu_quickadd()
                 <!-- 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>
+                    '. img_picto('', 'object_product').'<br>'.$langs->trans("Product").'</a>
                 </div>
                 ';
 	}
@@ -2392,7 +2418,7 @@ function top_menu_quickadd()
                 <!-- 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>
+                    '. img_picto('', 'object_service').'<br>'.$langs->trans("Service").'</a>
                 </div>
                 ';
 	}
@@ -2403,7 +2429,7 @@ function top_menu_quickadd()
                 <!-- 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>
+                    '. img_picto('', 'object_trip').'<br>'.$langs->trans("ExpenseReport").'</a>
                 </div>
                 ';
 	}
@@ -2414,7 +2440,7 @@ function top_menu_quickadd()
                 <!-- 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>
+                    '. img_picto('', 'object_holiday').'<br>'.$langs->trans("Holidays").'</a>
                 </div>
                 ';
 	}
@@ -2713,7 +2739,6 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 	global $hookmanager, $menumanager;
 
 	$searchform = '';
-	$bookmarks = '';
 
 	if (!empty($menu_array_before)) {
 		dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
@@ -2784,7 +2809,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 		// Show left menu with other forms
 		$menumanager->menu_array = $menu_array_before;
 		$menumanager->menu_array_after = $menu_array_after;
-		$menumanager->showmenu('left', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks)); // output menu_array and menu found in database
+		$menumanager->showmenu('left', array('searchform'=>$searchform)); // output menu_array and menu found in database
 
 		// Dolibarr version + help + bug report link
 		print "\n";
@@ -2826,7 +2851,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 			}
 			print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
 			if ($doliurl) {
-				print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
+				print '<a class="help" target="_blank" rel="noopener noreferrer" href="'.$doliurl.'">';
 			} else {
 				print '<span class="help">';
 			}
@@ -2859,12 +2884,12 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 				$bugbaseurl .= urlencode("[*Short description*]\n");
 				$bugbaseurl .= urlencode("\n");
 				$bugbaseurl .= urlencode("## Environment\n");
-				$bugbaseurl .= urlencode("- **Version**: " . DOL_VERSION . "\n");
-				$bugbaseurl .= urlencode("- **OS**: " . php_uname('s') . "\n");
-				$bugbaseurl .= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
-				$bugbaseurl .= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
-				$bugbaseurl .= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
-				$bugbaseurl .= urlencode("- **URL(s)**: " . $_SERVER["REQUEST_URI"] . "\n");
+				$bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");
+				$bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");
+				$bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");
+				$bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");
+				$bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");
+				$bugbaseurl .= urlencode("- **URL(s)**: ".$_SERVER["REQUEST_URI"]."\n");
 				$bugbaseurl .= urlencode("\n");
 				$bugbaseurl .= urlencode("## Expected and actual behavior\n");
 				$bugbaseurl .= urlencode("[*Verbose description*]\n");
@@ -2894,7 +2919,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 			}
 
 			print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
-			print '<a class="help" target="_blank" rel="noopener" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a>';
+			print '<a class="help" target="_blank" rel="noopener noreferrer" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a>';
 			print '</div>';
 		}
 
@@ -2931,7 +2956,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
  */
 function main_area($title = '')
 {
-	global $conf, $langs;
+	global $conf, $langs, $hookmanager;
 
 	if (empty($conf->dol_hide_leftmenu)) {
 		print '<div id="id-right">';
@@ -2941,14 +2966,17 @@ function main_area($title = '')
 
 	print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
+	$hookmanager->initHooks(array('main'));
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printMainArea', $parameters); // Note that $action and $object may have been modified by some hooks
+	print $hookmanager->resPrint;
+
 	if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
 		print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED), 0, 0, 1, 'warning maintenancemode');
 	}
 
 	// Permit to add user company information on each printed document by setting SHOW_SOCINFO_ON_PRINT
 	if (!empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09'))) {
-		global $hookmanager;
-		$hookmanager->initHooks(array('main'));
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters);
 		if (empty($reshook)) {
@@ -3084,9 +3112,9 @@ if (!function_exists("llxFooter")) {
 	 */
 	function llxFooter($comment = '', $zone = 'private', $disabledoutputofmessages = 0)
 	{
-		global $conf, $db, $langs, $user, $mysoc, $object;
+		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);
@@ -3126,6 +3154,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;
@@ -3136,10 +3165,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
@@ -3217,7 +3250,7 @@ if (!function_exists("llxFooter")) {
 		}
 
 		// A div for the address popup
-		print "\n<!-- A div to allow dialog popup -->\n";
+		print "\n<!-- A div to allow dialog popup by jQuery('#dialogforpopup').dialog() -->\n";
 		print '<div id="dialogforpopup" style="display: none;"></div>'."\n";
 
 		// Add code for the asynchronous anonymous first ping (for telemetry)
@@ -3308,6 +3341,11 @@ if (!function_exists("llxFooter")) {
 			}
 		}
 
+		$reshook = $hookmanager->executeHooks('beforeBodyClose'); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) {
+			print $hookmanager->resPrint;
+		}
+
 		print "</body>\n";
 		print "</html>\n";
 	}
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index ca5c70f5c54..30c85197337 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -140,7 +140,7 @@ print '/> ';
 print $langs->trans('MargeType3');
 print '</td>';
 print '<td>';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" class="button">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'" class="button">';
 print '</td>';
 print '<td>'.$langs->trans('MarginTypeDesc');
 print '</td>';
@@ -155,9 +155,9 @@ if (!empty($conf->use_javascript_ajax)) {
 	print ajax_constantonoff('DISPLAY_MARGIN_RATES');
 } else {
 	if (empty($conf->global->DISPLAY_MARGIN_RATES)) {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARGIN_RATES&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARGIN_RATES&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	} else {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARGIN_RATES&amp;token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARGIN_RATES&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td>';
@@ -172,9 +172,9 @@ if (!empty($conf->use_javascript_ajax)) {
 	print ajax_constantonoff('DISPLAY_MARK_RATES');
 } else {
 	if (empty($conf->global->DISPLAY_MARK_RATES)) {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARK_RATES&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	} else {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARK_RATES&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td>';
@@ -189,9 +189,9 @@ if (!empty($conf->use_javascript_ajax)) {
 	print ajax_constantonoff('ForceBuyingPriceIfNull');
 } else {
 	if (empty($conf->global->ForceBuyingPriceIfNull)) {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ForceBuyingPriceIfNull&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ForceBuyingPriceIfNull&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	} else {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ForceBuyingPriceIfNull&amp;token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ForceBuyingPriceIfNull&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td>';
@@ -215,7 +215,7 @@ print '<td class="left">';
 print Form::selectarray('MARGIN_METHODE_FOR_DISCOUNT', $methods, $conf->global->MARGIN_METHODE_FOR_DISCOUNT);
 print '</td>';
 print '<td>';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print '</td>';
 print '<td>'.$langs->trans('MARGIN_METHODE_FOR_DISCOUNT_DETAILS').'</td>';
 print '</tr>';
@@ -233,7 +233,7 @@ $facture = new Facture($db);
 print $formcompany->selectTypeContact($facture, $conf->global->AGENT_CONTACT_TYPE, "AGENT_CONTACT_TYPE", "internal", "code", 1, "maxwidth250");
 print '</td>';
 print '<td>';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print '</td>';
 print '<td>'.$langs->trans('AgentContactTypeDetails').'</td>';
 print '</tr>';
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index d12c827cc3e..1349e02d2d8 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -106,8 +106,8 @@ if (empty($reshook)) {
 					$invoicedet_id = $tmp_array[1];
 					if (!empty($invoicedet_id)) {
 						$sql = 'UPDATE '.MAIN_DB_PREFIX.'facturedet';
-						$sql .= ' SET buy_price_ht=\''.price2num($value).'\'';
-						$sql .= ' WHERE rowid='.$invoicedet_id;
+						$sql .= " SET buy_price_ht = ".((float) price2num($value));
+						$sql .= ' WHERE rowid = '.((int) $invoicedet_id);
 						$result = $db->query($sql);
 						if (!$result) {
 							setEventMessages($db->lasterror, null, 'errors');
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 6861f67db0d..290a94908c0 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -129,8 +129,8 @@ if ($socid > 0) {
 	print '</td></tr>';
 }
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
@@ -229,14 +229,14 @@ if (!empty($TSelectedCats)) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=d.fk_product';
 }
 
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE f.fk_soc = s.rowid";
 if ($socid > 0) {
 	$sql .= ' AND s.rowid = '.((int) $socid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " AND f.fk_statut NOT IN (".$db->sanitize(implode(', ', $invoice_status_except_list)).")";
diff --git a/htdocs/margin/index.php b/htdocs/margin/index.php
index cab6dd9f0da..0dcab7435f7 100644
--- a/htdocs/margin/index.php
+++ b/htdocs/margin/index.php
@@ -32,4 +32,4 @@ if ($user->rights->produit->lire) {
 	$page = 'agentMargins';
 }
 
-header('Location: '.dol_buildpath('/margin/'.$page.'.php', 1));
+header('Location: '.DOL_URL_ROOT.'/margin/'.$page.'.php');
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 3b14f1db808..93895b01e2f 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -43,8 +43,8 @@ if (!empty($user->socid)) {
 $object = new Product($db);
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -139,7 +139,7 @@ if ($id > 0 || !empty($ref)) {
 			$sql = "SELECT s.nom as name, s.rowid as socid, s.code_client,";
 			$sql .= " f.rowid as facid, f.ref, f.total_ht,";
 			$sql .= " f.datef, f.paye, f.fk_statut as statut, f.type,";
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= " sc.fk_soc, sc.fk_user,";
 			}
 			$sql .= " sum(d.total_ht) as selling_price,"; // may be negative or positive
@@ -149,7 +149,7 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."facture as f";
 			$sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE f.fk_soc = s.rowid";
@@ -157,7 +157,7 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " AND f.entity IN (".getEntity('invoice').")";
 			$sql .= " AND d.fk_facture = f.rowid";
 			$sql .= " AND d.fk_product = ".((int) $object->id);
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if (!empty($socid)) {
@@ -170,7 +170,7 @@ if ($id > 0 || !empty($ref)) {
 				$sql .= " AND d.buy_price_ht <> 0";
 			}
 			$sql .= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.ref, f.total_ht, f.datef, f.paye, f.fk_statut, f.type";
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= ", sc.fk_soc, sc.fk_user";
 			}
 			$sql .= $db->order($sortfield, $sortorder);
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 1b3cc468e5c..c69c0443e28 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -35,8 +35,8 @@ if (!empty($user->socid)) {
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -124,7 +124,7 @@ if ($socid > 0) {
 		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client));
 		$tmpcheck = $object->check_codeclient();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+			print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
 		}
 		print '</td></tr>';
 	}
@@ -135,7 +135,7 @@ if ($socid > 0) {
 		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
 		$tmpcheck = $object->check_codefournisseur();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+			print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
 		}
 		print '</td></tr>';
 	}
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index e04adb4ee86..aa836842e71 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -32,7 +32,8 @@
  * 				This script reads the conf file, init $lang, $db and and empty $user
  */
 
-// Declaration of variables. May have been already require by main.inc.php. But may not by scripts. So, here the require_once must be kept.
+// Include the conf.php and functions.lib.php and security.lib.php. This defined the constants like DOL_DOCUMENT_ROOT, DOL_DATA_ROOT, DOL_URL_ROOT...
+// This file may have been already required by main.inc.php. But may not by scripts. So, here the require_once must be kept.
 require_once 'filefunc.inc.php';
 
 
@@ -161,9 +162,10 @@ if (!defined('NOREQUIREDB')) {
 }
 
 // Now database connexion is known, so we can forget password
-//unset($dolibarr_main_db_pass); 	// We comment this because this constant is used in a lot of pages
+//unset($dolibarr_main_db_pass); 	// We comment this because this constant is used in some other pages
 unset($conf->db->pass); // This is to avoid password to be shown in memory/swap dump
 
+
 /*
  * Object $user
  */
@@ -171,9 +173,9 @@ if (!defined('NOREQUIREUSER')) {
 	$user = new User($db);
 }
 
+
 /*
  * Load object $conf
- * After this, all parameters conf->global->CONSTANTS are loaded
  */
 
 // By default conf->entity is 1, but we change this if we ask another value.
@@ -190,15 +192,12 @@ if (session_id() && !empty($_SESSION["dol_entity"])) {
 	// For public page with MultiCompany module
 	$conf->entity = constant('DOLENTITY');
 }
-
 // Sanitize entity
 if (!is_numeric($conf->entity)) {
 	$conf->entity = 1;
 }
-
-//print "We work with data into entity instance number '".$conf->entity."'";
-
 // Here we read database (llx_const table) and define $conf->global->XXX var.
+//print "We work with data into entity instance number '".$conf->entity."'";
 $conf->setValues($db);
 
 // Create object $mysoc (A thirdparty object that contains properties of companies managed by Dolibarr.
diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php
index 62eccc5be18..e5ccb0c3966 100644
--- a/htdocs/modulebuilder/admin/setup.php
+++ b/htdocs/modulebuilder/admin/setup.php
@@ -125,9 +125,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 		print ajax_constantonoff('MODULEBUILDER_USE_ABOUT');
 	} else {
 		if (empty($conf->global->MODULEBUILDER_USE_ABOUT)) {
-			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=set_MODULEBUILDER_USE_ABOUT&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=set_MODULEBUILDER_USE_ABOUT&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		} else {
-			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=del_MODULEBUILDER_USE_ABOUT&amp;token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=del_MODULEBUILDER_USE_ABOUT&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 		}
 	}
 	print '</td></tr>';
@@ -193,7 +193,7 @@ print '</tr>';
 
 print '</table>';
 
-print '<center><input type="submit" class="button button-save" value="'.$langs->trans("Save").'" name="Button"></center>';
+print $form->buttonsSaveCancel("Save", '');
 
 if (GETPOST('withtab', 'alpha')) {
 	print dol_get_fiche_end();
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 82567e05fac..4e66e655f5e 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -262,6 +262,7 @@ if ($dirins && $action == 'initmodule' && $modulename) {
 
 		// Delete some files related to Object (because the previous dolCopyDir has copied everything)
 		dol_delete_file($destdir.'/myobject_card.php');
+		dol_delete_file($destdir.'/myobject_contact.php');
 		dol_delete_file($destdir.'/myobject_note.php');
 		dol_delete_file($destdir.'/myobject_document.php');
 		dol_delete_file($destdir.'/myobject_agenda.php');
@@ -337,6 +338,14 @@ if ($dirins && $action == 'initmodule' && $modulename) {
 		setEventMessages('ModuleInitialized', null);
 		$module = $modulename;
 		$modulename = '';
+
+		clearstatcache(true);
+		if (function_exists('opcache_invalidate')) {
+			opcache_reset();	// remove the include cache hell !
+		}
+
+		header("Location: ".$_SERVER["PHP_SELF"].'?module='.$modulename);
+		exit;
 	}
 }
 
@@ -733,9 +742,9 @@ if ($dirins && $action == 'addlanguage' && !empty($module)) {
 		// Dir for module
 		$diroflang = dol_buildpath($modulelowercase, 0);
 
-		if ($diroflang == $dirread.'/'.$modulelowercase) {
+		if ($diroflang == $dolibarr_main_document_root.'/'.$modulelowercase) {
 			// This is not a custom module, we force diroflang to htdocs root
-			$diroflang = $dirread;
+			$diroflang = $dolibarr_main_document_root;
 
 			$srcfile = $diroflang.'/langs/en_US/'.$modulelowercase.'.lang';
 			$destfile = $diroflang.'/langs/'.$newlangcode.'/'.$modulelowercase.'.lang';
@@ -758,7 +767,7 @@ if ($dirins && $action == 'addlanguage' && !empty($module)) {
 
 // remove/delete File
 if ($dirins && $action == 'confirm_removefile' && !empty($module)) {
-	$relativefilename = dol_sanitizePathName(GETPOST('file', 'none'));
+	$relativefilename = dol_sanitizePathName(GETPOST('file', 'restricthtml'));
 	if ($relativefilename) {
 		$dirnametodelete = dirname($relativefilename);
 		$filetodelete = $dirins.'/'.$relativefilename;
@@ -953,7 +962,7 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 			if ($notnull) {
 				$string .= ", 'notnull'=>".$notnull;
 			}
-			if ($fieldname == 'ref') {
+			if ($fieldname == 'ref' || $fieldname == 'code') {
 				$string .= ", 'showoncombobox'=>1";
 			}
 			$string .= ", 'position'=>".$position;
@@ -1317,6 +1326,7 @@ if ($dirins && $action == 'addproperty' && empty($cancel) && !empty($module) &&
 			'csslist'=>GETPOST('propcsslist', 'aZ09'),
 			'default'=>GETPOST('propdefault', 'restricthtml'),
 			'noteditable'=>intval(GETPOST('propnoteditable', 'int')),
+			'validate' => GETPOST('propvalidate', 'int')
 		);
 
 		if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval'])) {
@@ -1416,6 +1426,14 @@ if ($dirins && $action == 'confirm_deletemodule') {
 
 		if ($result > 0) {
 			setEventMessages($langs->trans("DirWasRemoved", $modulelowercase), null);
+
+			clearstatcache(true);
+			if (function_exists('opcache_invalidate')) {
+				opcache_reset();	// remove the include cache hell !
+			}
+
+			header("Location: ".$_SERVER["PHP_SELF"].'?module=deletemodule');
+			exit;
 		} else {
 			setEventMessages($langs->trans("PurgeNothingToDelete"), null, 'warnings');
 		}
@@ -1541,7 +1559,8 @@ if ($dirins && $action == 'generatepackage') {
 			if (!dol_is_dir($dirofmodule)) {
 				dol_mkdir($dirofmodule);
 			}
-			$result = dol_compress_dir($dir, $outputfilezip, 'zip', '', $modulelowercase);
+			// Note: We exclude /bin/ to not include the already generated zip
+			$result = dol_compress_dir($dir, $outputfilezip, 'zip', '/\/bin\//', $modulelowercase);
 		} else {
 			$result = -1;
 		}
@@ -1705,8 +1724,8 @@ 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 $textforlistofdirs;
-print '<br>';
+//print $textforlistofdirs;
+//print '<br>';
 //var_dump($listofmodules);
 
 
@@ -1731,7 +1750,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)).'</div>';
+$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>';
 
 
 // Load module descriptor
@@ -1755,6 +1774,10 @@ if (!empty($module) && $module != 'initmodule' && $module != 'deletemodule') {
 		$loadclasserrormessage = $e->getMessage()."<br>\n";
 		$loadclasserrormessage .= 'File: '.$e->getFile()."<br>\n";
 		$loadclasserrormessage .= 'Line: '.$e->getLine()."<br>\n";
+	} catch (Exception $e) {
+		$loadclasserrormessage = $e->getMessage()."<br>\n";
+		$loadclasserrormessage .= 'File: '.$e->getFile()."<br>\n";
+		$loadclasserrormessage .= 'Line: '.$e->getLine()."<br>\n";
 	}
 
 	if (class_exists($class)) {
@@ -1769,6 +1792,7 @@ if (!empty($module) && $module != 'initmodule' && $module != 'deletemodule') {
 			$error++;
 		}
 		$langs->load("errors");
+		print '<!-- ErrorFailedToLoadModuleDescriptorForXXX -->';
 		print img_warning('').' '.$langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module).'<br>';
 		print $loadclasserrormessage;
 	}
@@ -1844,9 +1868,11 @@ if (is_array($listofmodules) && count($listofmodules) > 0) {
 			$linktoenabledisable .= ' &nbsp; <a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 8px"').'</a>';
 		}
 	} else {
-		$linktoenabledisable .= '<a class="reposition asetresetmodule valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=set&token='.newToken().'&value=mod'.$module.$param.'">';
-		$linktoenabledisable .= img_picto($langs->trans("ModuleIsNotActive", $urltomodulesetup), 'switch_off', 'style="padding-right: 8px"', false, 0, 0, '', 'classfortooltip', 1);
-		$linktoenabledisable .= "</a>\n";
+		if (!empty($moduleobj)) {
+			$linktoenabledisable .= '<a class="reposition asetresetmodule valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=set&token='.newToken().'&value=mod'.$module.$param.'">';
+			$linktoenabledisable .= img_picto($langs->trans("ModuleIsNotActive", $urltomodulesetup), 'switch_off', 'style="padding-right: 8px"', false, 0, 0, '', 'classfortooltip', 1);
+			$linktoenabledisable .= "</a>\n";
+		}
 	}
 
 	// Loop to show tab of each module
@@ -2010,15 +2036,15 @@ if ($module == 'initmodule') {
 
 				print '<tr><td>';
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
-				print '</td><td><a class="editfielda" 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 '</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 '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=markdown&file='.urlencode($pathtofilereadme).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				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 '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=markdown&file='.urlencode($pathtochangelog).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				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>';
@@ -2041,8 +2067,8 @@ if ($module == 'initmodule') {
 					print $langs->trans("Numero");
 					print '</td><td>';
 					print $moduleobj->numero;
-					print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/admin/system/modules.php?mainmenu=home&leftmenu=admintools_info" target="_blank">'.$langs->trans("SeeIDsInUse").'</a>';
-					print ' - <a href="https://wiki.dolibarr.org/index.php/List_of_modules_id" target="_blank">'.$langs->trans("SeeReservedIDsRangeHere").'</a>)';
+					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 '</td></tr>';
 
 					print '<tr><td>';
@@ -2188,8 +2214,8 @@ if ($module == 'initmodule') {
 						$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&format=txt&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&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+					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 '</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>';
 				}
 				print '</table>';
@@ -2237,7 +2263,7 @@ if ($module == 'initmodule') {
 				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 ' <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> ';
@@ -2320,7 +2346,7 @@ if ($module == 'initmodule') {
 						$i++;
 					}
 				} else {
-					print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
+					print '<tr><td colspan="5"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 				}
 
 				print '</table>';
@@ -2419,8 +2445,8 @@ 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="checkbox" name="includerefgeneration" value="includerefgeneration"> '.$form->textwithpicto($langs->trans("IncludeRefGeneration"), $langs->trans("IncludeRefGenerationHelp")).'<br>';
-				print '<input type="checkbox" name="includedocgeneration" value="includedocgeneration"> '.$form->textwithpicto($langs->trans("IncludeDocGeneration"), $langs->trans("IncludeDocGenerationHelp")).'<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>';
@@ -2513,13 +2539,13 @@ if ($module == 'initmodule') {
 
 						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>';
-						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtoclass).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						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>';
 						print '<br>';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("ApiClassFile").' : <strong>'.($realpathtoapi ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtoapi).($realpathtoapi ? '' : '</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&format=php&file='.urlencode($pathtoapi).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+							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 ' ';
-							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtoapi).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&file='.urlencode($pathtoapi).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 							print ' &nbsp; ';
 							if (empty($conf->global->$const_name)) {	// If module is not activated
 								print '<a href="#" class="classfortooltip" target="apiexplorer" title="'.$langs->trans("ModuleMustBeEnabled", $module).'"><strike>'.$langs->trans("GoToApiExplorer").'</strike></a>';
@@ -2528,99 +2554,99 @@ if ($module == 'initmodule') {
 							}
 						} else {
 							//print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span> ';
-							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initapi&format=php&file='.urlencode($pathtoapi).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
+							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>';
 						if (dol_is_file($realpathtophpunit)) {
-							print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+							print ' <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&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+							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&format=php&file='.urlencode($pathtophpunit).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
+							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 ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtolib).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						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 ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtoobjlib).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						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 ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtopicto).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						//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 ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&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">'.$langs->trans("DropTableIfEmpty").'</a>';
+						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 ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=sql&file='.urlencode($pathtosqlkey).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						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>';
 						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&file='.urlencode($pathtosqlextra).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+							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 ' ';
-							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtosqlextra).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&file='.urlencode($pathtosqlextra).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 							print ' &nbsp; ';
-							print '<a class="reposition editfielda" href="'.$_SERVER["PHP_SELF"].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=droptableextrafields">'.$langs->trans("DropTableIfEmpty").'</a>';
+							print '<a class="reposition editfielda" href="'.$_SERVER["PHP_SELF"].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=droptableextrafields&token='.newToken().'">'.$langs->trans("DropTableIfEmpty").'</a>';
 						} else {
-							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initsqlextrafields&format=sql&file='.urlencode($pathtosqlextra).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
+							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initsqlextrafields&token='.newToken().'&format=sql&file='.urlencode($pathtosqlextra).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 						}
 						//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>';
 						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&format=sql&file='.urlencode($pathtosqlextrakey).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+							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 ' ';
-							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtosqlextrakey).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&file='.urlencode($pathtosqlextrakey).'">'.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=initsqlextrafields&format=sql&file='.urlencode($pathtosqlextra).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
+							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initsqlextrafields&token='.newToken().'&format=sql&file='.urlencode($pathtosqlextra).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 						}
 						print '<br>';
 						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 ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtolist).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						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 ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtocard).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						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>';
-						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtocontact).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						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&file='.urlencode($pathtocontact).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+							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>';
 						}
 						print '<br>';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForDocumentTab").' : <strong>'.($realpathtodocument ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtodocument).($realpathtodocument ? '' : '</strike>').'</strong>';
-						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtodocument).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						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&file='.urlencode($pathtodocument).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+							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>';
 						}
 						print '<br>';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForNoteTab").' : <strong>'.($realpathtonote ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtonote).($realpathtonote ? '' : '</strike>').'</strong>';
-						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtonote).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						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&file='.urlencode($pathtonote).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+							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>';
 						}
 						print '<br>';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForAgendaTab").' : <strong>'.($realpathtoagenda ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtoagenda).($realpathtoagenda ? '' : '</strike>').'</strong>';
-						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtoagenda).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						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&file='.urlencode($pathtoagenda).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+							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>';
 						}
 						print '<br>';
 						print '<br>';
@@ -2629,6 +2655,7 @@ if ($module == 'initmodule') {
 
 						print '<br><br><br>';
 
+						clearstatcache(true);
 						if (function_exists('opcache_invalidate')) {
 							opcache_invalidate($dirread.'/'.$pathtoclass, true); // remove the include cache hell !
 						}
@@ -2670,7 +2697,7 @@ if ($module == 'initmodule') {
 							print '<table class="noborder small">';
 							print '<tr class="liste_titre">';
 							print '<th>'.$langs->trans("Property");
-							print ' (<a class="" href="https://wiki.dolibarr.org/index.php/Language_and_development_rules#Table_and_fields_structures" target="_blank">'.$langs->trans("SeeExamples").'</a>)';
+							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>';
 							print $form->textwithpicto($langs->trans("Label"), $langs->trans("YouCanUseTranslationKey"));
@@ -2693,6 +2720,7 @@ if ($module == 'initmodule') {
 							print '<th>'.$langs->trans("KeyForTooltip").'</th>';
 							print '<th class="center">'.$langs->trans("ShowOnCombobox").'</th>';
 							//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 '</tr>';
@@ -2725,9 +2753,10 @@ if ($module == 'initmodule') {
 								print '<td><input type="text" size="2" name="prophelp" value="'.dol_escape_htmltag(GETPOST('prophelp', 'alpha')).'"></td>';
 								print '<td class="center"><input type="text" class="center maxwidth50" name="propshowoncombobox" value="'.dol_escape_htmltag(GETPOST('propshowoncombobox', 'alpha')).'"></td>';
 								//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 '<input class="button" type="submit" name="add" value="'.$langs->trans("Add").'">';
+								print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
 								print '</td></tr>';
 
 								// List of existing properties
@@ -2766,6 +2795,7 @@ if ($module == 'initmodule') {
 									$prophelp = $propval['help'];
 									$propshowoncombobox = $propval['showoncombobox'];
 									//$propdisabled=$propval['disabled'];
+									$propvalidate = $propval['validate'];
 									$propcomment = $propval['comment'];
 
 									print '<tr class="oddeven">';
@@ -2836,6 +2866,9 @@ if ($module == 'initmodule') {
 										print '<input class="center maxwidth50" name="propshowoncombobox" value="'.dol_escape_htmltag($propshowoncombobox).'">';
 										print '</td>';
 										print '<td>';
+										print '<input type="number" step="1" min="0" max="1" class="text maxwidth100" name="propvalidate" value="'.dol_escape_htmltag($propvalidate).'">';
+										print '</td>';
+										print '<td>';
 										print '<input class="maxwidth100" name="propcomment" value="'.dol_escape_htmltag($propcomment).'">';
 										print '</td>';
 										print '<td class="center">';
@@ -2901,6 +2934,9 @@ if ($module == 'initmodule') {
 										/*print '<td class="center">';
 										print $propdisabled?$propdisabled:'';
 										print '</td>';*/
+										print '<td class="center">';
+										print $propvalidate ? dol_escape_htmltag($propvalidate) : '';
+										print '</td>';
 										print '<td class="tdoverflowmax200">';
 										print '<span title="'.dol_escape_htmltag($propcomment).'">';
 										print dol_escape_htmltag($propcomment);
@@ -2930,7 +2966,7 @@ if ($module == 'initmodule') {
 												$format = 'markdown';
 											}
 											print '<span class="fa fa-file-o"></span> '.$langs->trans("SpecificationFile").' : <strong>'.$pathtofile.'</strong>';
-											print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+											print ' <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>';
 										}
 									} else {
@@ -3022,7 +3058,7 @@ if ($module == 'initmodule') {
 				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 ' <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>';
 
 				print '<br>';
@@ -3108,7 +3144,7 @@ if ($module == 'initmodule') {
 						print '</tr>';
 					}
 				} else {
-					print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
+					print '<tr><td colspan="5"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 				}
 
 				print '</table>';
@@ -3155,7 +3191,7 @@ if ($module == 'initmodule') {
 				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 ' <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>';
 
 				print '<br>';
@@ -3201,7 +3237,7 @@ if ($module == 'initmodule') {
 						print '</tr>';
 					}
 				} else {
-					print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
+					print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 				}
 
 				print '</table>';
@@ -3245,7 +3281,7 @@ if ($module == 'initmodule') {
 				print '<tr><td>';
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong class="">'.$pathtofile.'</strong>';
 				print '</td><td>';
-				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 '<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>';
 
 				print '<tr><td>';
@@ -3254,7 +3290,7 @@ if ($module == 'initmodule') {
 				if (dol_is_file($dirins.'/'.$pathtohook)) {
 					print '<strong>'.$pathtohook.'</strong>';
 					print '</td>';
-					print '<td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a> ';
+					print '<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>';
 				} else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
@@ -3304,7 +3340,7 @@ if ($module == 'initmodule') {
 				print '<tr><td>';
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong class="">'.$pathtofile.'</strong>';
 				print '</td><td>';
-				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 '<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>';
 
 				if (!empty($triggers)) {
@@ -3313,13 +3349,14 @@ if ($module == 'initmodule') {
 
 						print '<tr><td>';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("TriggersFile").' : <strong>'.$pathtofile.'</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($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
+						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 '</tr>';
 					}
 				} else {
 					print '<tr><td>';
-					print '<span class="fa fa-file-o"></span> '.$langs->trans("NoTrigger");
+					print '<span class="fa fa-file-o"></span> '.$langs->trans("TriggersFile");
+					print ' : <span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 					print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inittrigger&format=php">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a></td>';
 					print '<td></td>';
 					print '</tr>';
@@ -3409,11 +3446,11 @@ if ($module == 'initmodule') {
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("JSFile").' : ';
 				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 '</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=initjs&format=php&file='.urlencode($pathtohook).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a></td>';
+					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initjs&token='.newToken().'&format=php&file='.urlencode($pathtohook).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a></td>';
 				}
 				print '</tr>';
 			} else {
@@ -3457,13 +3494,13 @@ if ($module == 'initmodule') {
 						$pathtofile = $widget['relpath'];
 
 						print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("WidgetFile").' : <strong>'.$pathtofile.'</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($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&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
+						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>';
 					}
 				} else {
 					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("WidgetFile").' : <span class="opacitymedium">'.$langs->trans("NoWidget").'</span>';
-					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initwidget&format=php">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
+					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initwidget&token='.newToken().'&format=php">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 					print '</td></tr>';
 				}
 				print '</table>';
@@ -3504,7 +3541,7 @@ if ($module == 'initmodule') {
 				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 ' <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 {
 				$fullpathoffile = dol_buildpath($file, 0);
@@ -3574,13 +3611,13 @@ if ($module == 'initmodule') {
 						$pathtofile = $clifile['relpath'];
 
 						print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("CLIFile").' : <strong>'.$pathtofile.'</strong>';
-						print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&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><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>';
 					}
 				} else {
-					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("CLIFile").' : <span class="opacitymedium">'.$langs->trans("FileNotYetGenerated");'</span>';
-					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initcli&format=php">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
+					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("CLIFile").' : <span class="opacitymedium">'.$langs->trans("FileNotYetGenerated"); '</span>';
+					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initcli&token='.newToken().'&format=php">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 					print '</td></tr>';
 				}
 				print '</table>';
@@ -3620,7 +3657,7 @@ if ($module == 'initmodule') {
 				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 ' <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>';
 
 				print '<br>';
@@ -3698,7 +3735,7 @@ if ($module == 'initmodule') {
 						print '</tr>';
 					}
 				} else {
-					print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
+					print '<tr><td colspan="5"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 				}
 
 				print '</table>';
@@ -3748,14 +3785,14 @@ if ($module == 'initmodule') {
 						}
 						print '<tr><td>';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("SpecificationFile").' : <strong>'.$pathtofile.'</strong>';
-						print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&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&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
+						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>';
 					}
 				} else {
 					print '<tr><td>';
 					print '<span class="fa fa-file-o"></span> '.$langs->trans("SpecificationFile").' : <span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
-					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initdoc&format=php">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a></td>';
+					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initdoc&token='.newToken().'&format=php">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a></td>';
 					print '</tr>';
 				}
 				print '</table>';
@@ -3803,7 +3840,7 @@ if ($module == 'initmodule') {
 				print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 			} else {
 				print '<strong>';
-				print '<a href="'.$outputfiledocurl.'" target="_blank">';
+				print '<a href="'.$outputfiledocurl.'" target="_blank" rel="noopener noreferrer">';
 				print $outputfiledoc;
 				print '</a>';
 				print '</strong>';
@@ -3817,7 +3854,7 @@ if ($module == 'initmodule') {
 				print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 			} else {
 				print '<strong>';
-				print '<a href="'.$outputfiledocurlpdf.'" target="_blank">';
+				print '<a href="'.$outputfiledocurlpdf.'" target="_blank" rel="noopener noreferrer">';
 				print $outputfiledocpdf;
 				print '</a>';
 				print '</strong>';
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index f1f77b5b552..eeca8b77358 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -60,6 +60,9 @@ require_once '../lib/mymodule.lib.php';
 // Translations
 $langs->loadLangs(array("admin", "mymodule@mymodule"));
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('mymodulesetup', 'globalsetup'));
+
 // Access control
 if (!$user->admin) {
 	accessforbidden();
@@ -68,6 +71,7 @@ if (!$user->admin) {
 // 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');
@@ -88,6 +92,52 @@ $arrayofparameters = array(
 $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 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);
+}
+
+
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 
@@ -95,9 +145,7 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
  * Actions
  */
 
-if ((float) DOL_VERSION >= 6) {
-	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
-}
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
 	$maskconst = GETPOST('maskconst', 'alpha');
@@ -223,71 +271,74 @@ echo '<span class="opacitymedium">'.$langs->trans("MyModuleSetupPage").'</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">';
+	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>';
+		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>';
+		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);
+				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>';
+					$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;
 						}
-						// 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);
+					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 () {
+					$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\',
@@ -298,99 +349,109 @@ if ($action == 'edit') {
             				});
                          });
                     });';
-					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 '<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 $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");
+						print '</script>';
 					}
 				} 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");
+					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 $conf->global->{$constname};
+					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">'.$langs->trans("Modify").'</a>';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 		print '</div>';
 	} else {
 		print '<br>'.$langs->trans("NothingToSetup");
@@ -599,13 +660,13 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Active
 										if (in_array($name, $def)) {
 											print '<td class="center">'."\n";
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
+											print '<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&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+											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>";
 										}
 
@@ -615,9 +676,9 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										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&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>';
+											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&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&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>';
 
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index cb2fbda68a6..4cb50c8de2f 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -155,8 +155,9 @@ class MyModuleApi extends DolibarrApi
 			$sql .= " AND sc.fk_user = ".((int) $search_sale);
 		}
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index dd67a65238b..ca9de1cc5ab 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -70,7 +70,7 @@ class MyObject extends CommonObject
 
 
 	/**
-	 *  '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')
+	 *  '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
@@ -83,7 +83,7 @@ class MyObject extends CommonObject
 	 *  '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).
+	 *  '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
@@ -91,6 +91,8 @@ class MyObject extends CommonObject
 	 *  '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.
 	 */
@@ -102,15 +104,15 @@ class MyObject extends CommonObject
 	public $fields = array(
 		'rowid'         => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'),
 		'entity'        => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>10),
-		'ref'           => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'noteditable'=>0, 'default'=>'', 'notnull'=> 1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20, 'searchall'=>1, 'comment'=>'Reference of object'),
-		'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>'Help text', 'showoncombobox'=>2),
-		'amount'        => array('type'=>'price', 'label'=>'Amount', 'enabled'=>1, 'visible'=>1, 'default'=>'null', 'position'=>40, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount'),
-		'qty'           => array('type'=>'real', 'label'=>'Qty', 'enabled'=>1, 'visible'=>1, 'default'=>'0', 'position'=>45, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for quantity', 'css'=>'maxwidth75imp'),
-		'fk_soc' 		=> array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'picto'=>'company', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'LinkToThirparty'),
-		'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),
-		'description'   => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>3, 'position'=>60),
-		'note_public'   => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61),
-		'note_private'  => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62),
+		'ref'           => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'noteditable'=>0, 'default'=>'', 'notnull'=> 1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20, 'searchall'=>1, 'comment'=>'Reference of object', 'validate'=>1),
+		'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),
+		'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),
 		'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),
@@ -120,7 +122,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')),
+		'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),
 	);
 
 	/**
@@ -360,7 +362,7 @@ class MyObject extends CommonObject
 
 		if (!$error) {
 			// copy external contacts if same company
-			if (property_exists($this, 'fk_soc') && $this->fk_soc == $object->socid) {
+			if (!empty($object->socid) && property_exists($this, 'fk_soc') && $this->fk_soc == $object->socid) {
 				if ($this->copy_linked_contact($object, 'external') < 0) {
 					$error++;
 				}
@@ -428,40 +430,40 @@ class MyObject extends CommonObject
 
 		$records = array();
 
-		$sql = 'SELECT ';
+		$sql = "SELECT ";
 		$sql .= $this->getFieldList('t');
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as 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->table_element).")";
 		} else {
-			$sql .= ' WHERE 1 = 1';
+			$sql .= " WHERE 1 = 1";
 		}
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$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)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -765,7 +767,7 @@ class MyObject extends CommonObject
 			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
 				$add_save_lastsearch_values = 1;
 			}
-			if ($add_save_lastsearch_values) {
+			if ($url && $add_save_lastsearch_values) {
 				$url .= '&save_lastsearch_values=1';
 			}
 		}
@@ -782,13 +784,13 @@ class MyObject extends CommonObject
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
 
-		if ($option == 'nolink') {
+		if ($option == 'nolink' || empty($url)) {
 			$linkstart = '<span';
 		} else {
 			$linkstart = '<a href="'.$url.'"';
 		}
 		$linkstart .= $linkclose.'>';
-		if ($option == 'nolink') {
+		if ($option == 'nolink' || empty($url)) {
 			$linkend = '</span>';
 		} else {
 			$linkend = '</a>';
@@ -881,12 +883,12 @@ class MyObject extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule@mymodule");
-			$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');
+			$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;
@@ -906,28 +908,29 @@ class MyObject extends CommonObject
 	 */
 	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) {
+				if (!empty($obj->fk_user_author)) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
 
-				if ($obj->fk_user_valid) {
+				if (!empty($obj->fk_user_valid)) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_cloture) {
+				if (!empty($obj->fk_user_cloture)) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cluser;
diff --git a/htdocs/modulebuilder/template/core/boxes/README.md b/htdocs/modulebuilder/template/core/boxes/README.md
index b641e7136bc..3989bca5847 100644
--- a/htdocs/modulebuilder/template/core/boxes/README.md
+++ b/htdocs/modulebuilder/template/core/boxes/README.md
@@ -1 +1 @@
-Directory where widgets files are stored.
\ No newline at end of file
+# Directory where widgets files are stored
diff --git a/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php b/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
index 82632773c87..7ea4b553e71 100644
--- a/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
+++ b/htdocs/modulebuilder/template/core/boxes/mymodulewidget1.php
@@ -92,8 +92,8 @@ class mymodulewidget1 extends ModeleBoxes
 	public function __construct(DoliDB $db, $param = '')
 	{
 		global $user, $conf, $langs;
-		$langs->load("boxes");
-		$langs->load('mymodule@mymodule');
+		// Translations
+		$langs->loadLangs(array("boxes", "mymodule@mymodule"));
 
 		parent::__construct($db, $param);
 
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 dc797b99a94..b50f4acf741 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
@@ -55,9 +55,9 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
 
 
 	/**
-	 *  Affiche formulaire de filtre qui apparait dans page de selection des destinataires de mailings
+	 *  Displays the filter form that appears in the mailing recipient selection page
 	 *
-	 *  @return     string      Retourne zone select
+	 *  @return     string      Return select zone
 	 */
 	public function formFilter()
 	{
@@ -83,7 +83,7 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
 
 
 	/**
-	 *  Renvoie url lien vers fiche de la source du destinataire du mailing
+	 *  Returns url link to file of the source of the recipient of the mailing
 	 *
 	 *  @param      int         $id     ID
 	 *  @return     string              Url lien
@@ -115,7 +115,7 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
 		}
 		$sql .= " ORDER BY email";
 
-		// Stocke destinataires dans target
+		// Store recipients in target
 		$result = $this->db->query($sql);
 		if ($result) {
 			$num = $this->db->num_rows($result);
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 9db4bcb9854..13e34593bba 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -148,8 +148,8 @@ class modMyModule extends DolibarrModules
 		$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','ES'='textes'...)
-		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_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'=>'MyModuleWasAutomaticallyActivatedBecauseOfYourCountryChoice');
 		//$this->always_enabled = true;								// If true, can't be disabled
 
@@ -411,6 +411,7 @@ class modMyModule extends DolibarrModules
 	{
 		global $conf, $langs;
 
+		//$result = $this->_load_tables('/install/mysql/tables/', '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')
@@ -456,10 +457,10 @@ class modMyModule extends DolibarrModules
 				}
 
 				$sql = array_merge($sql, array(
-					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard_".strtolower($myTmpObjectKey)."' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
-					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard_".strtolower($myTmpObjectKey)."','".strtolower($myTmpObjectKey)."',".$conf->entity.")",
-					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'generic_".strtolower($myTmpObjectKey)."_odt' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
-					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('generic_".strtolower($myTmpObjectKey)."_odt', '".strtolower($myTmpObjectKey)."', ".$conf->entity.")"
+					"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/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 430f6416cf7..8040c13d606 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
@@ -122,9 +122,10 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		$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="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH">';
-		$texte .= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<table class="nobordernopadding centpercent">';
 
 		// List of directories area
 		$texte .= '<tr><td>';
@@ -158,7 +159,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" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -174,15 +175,27 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		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=mymodule_myobject/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'];
+				$texte .= ' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=mymodule_myobject/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=COMPANY_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
 
 		$texte .= '</td>';
 
+		// Add input to upload a new template file.
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <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>';
+		$texte .= '</td>';
+
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= '<span class="opacitymedium">';
 		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
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 67d506e0bc2..1a435d3763d 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
@@ -645,7 +645,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 					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);
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey, $outputlangs);
 								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
 								$nexY = max($pdf->GetY(), $nexY);
 							}
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 37689c4d7d8..0573edc6b2a 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
@@ -80,7 +80,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="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 button-edit" value="'.$langs->trans("Modify").'" name="Button"></td>';
 		$texte .= '</tr>';
 
 		$texte .= '</table>';
diff --git a/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php b/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
index 67aac8c0e98..2f0ecd06774 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 -->\n";
+print "<!-- BEGIN PHP TEMPLATE mymodule/core/tpl/linkedopjectblock_myobject.tpl.php  -->\n";
 
 
 global $user;
@@ -50,7 +50,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	<td class="center"><?php echo dol_print_date($objectlink->date, 'day'); ?></td>
 	<td class="right"><?php echo ''; ?></td>
 	<td class="right"><?php echo $objectlink->getLibStatut(7); ?></td>
-	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 </tr>
 	<?php
 }
diff --git a/htdocs/modulebuilder/template/lib/mymodule.lib.php b/htdocs/modulebuilder/template/lib/mymodule.lib.php
index 32ae980e946..ab8a647efe4 100644
--- a/htdocs/modulebuilder/template/lib/mymodule.lib.php
+++ b/htdocs/modulebuilder/template/lib/mymodule.lib.php
@@ -62,7 +62,7 @@ function mymoduleAdminPrepareHead()
 	//); // to remove a tab
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'mymodule@mymodule');
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'mymodule@mymodule', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'mymodule@mymodule', 'remove');
 
 	return $head;
 }
diff --git a/htdocs/modulebuilder/template/mymoduleindex.php b/htdocs/modulebuilder/template/mymoduleindex.php
index c0c98d88e8f..15f3d83ac54 100644
--- a/htdocs/modulebuilder/template/mymoduleindex.php
+++ b/htdocs/modulebuilder/template/mymoduleindex.php
@@ -173,7 +173,7 @@ if (! empty($conf->mymodule->enabled) && $user->rights->mymodule->read)
 END MODULEBUILDER DRAFT MYOBJECT */
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 $NBMAX = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
@@ -234,7 +234,7 @@ if (! empty($conf->mymodule->enabled) && $user->rights->mymodule->read)
 }
 */
 
-print '</div></div></div>';
+print '</div></div>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index cc49275e5f8..5eb4f6e3028 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -102,8 +102,8 @@ if (GETPOST('actioncode', 'array')) {
 $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');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -129,7 +129,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->mymodule->multidir_output[$object->entity]."/".$object->id;
+	$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
@@ -206,7 +206,7 @@ if ($object->id > 0) {
 		$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.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			}
 			$morehtmlref.=' : ';
 			if ($action == 'classify') {
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 346e9d907e6..f1ca7ce2747 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -28,7 +28,7 @@
 //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('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token).
 //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
@@ -92,7 +92,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');
+$lineid   = GETPOST('lineid', 'int');
 
 // Initialize technical objects
 $object = new MyObject($db);
@@ -158,7 +158,7 @@ if (empty($reshook)) {
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+				$backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
 			}
 		}
 	}
@@ -212,7 +212,7 @@ $help_url = '';
 llxHeader('', $title, $help_url);
 
 // Example : Adding jquery code
-// print '<script type="text/javascript" language="javascript">
+// print '<script type="text/javascript">
 // jQuery(document).ready(function() {
 // 	function init_myfunc()
 // 	{
@@ -258,11 +258,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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 $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 
@@ -298,9 +294,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	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->buttonsSaveCancel();
 
 	print '</form>';
 }
@@ -310,7 +304,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_optionals();
 
 	$head = myobjectPrepareHead($object);
-	print dol_get_fiche_head($head, 'card', $langs->trans("Workstation"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'card', $langs->trans("MyObject"), -1, $object->picto);
 
 	$formconfirm = '';
 
@@ -322,6 +316,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	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
@@ -329,8 +324,17 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
 
-	// Confirmation of action xxxx
+	// Confirmation of action xxxx (You can use it for xxx = 'close', xxx = 'reopen', ...)
 	if ($action == 'xxx') {
+		$text = $langs->trans('ConfirmActionMyObject', $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('MYOBJECT_CLOSE', $object->socid, $object);
+		}*/
+
 		$formquestion = array();
 		/*
 		$forcecombo=0;
@@ -374,7 +378,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
 	 if ($permissiontoadd) {
-	 //if ($action != 'classify') $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
+	 //if ($action != 'classify') $morehtmlref.='<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);
@@ -511,7 +515,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 			// Clone
-			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&token='.newToken(), '', $permissiontoadd);
+			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid)?'&socid='.$object->socid:'').'&action=clone&token='.newToken(), '', $permissiontoadd);
 
 			/*
 			if ($permissiontoadd) {
@@ -554,8 +558,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);
 		}
 
@@ -564,20 +568,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		$MAXEVENT = 10;
 
-		$morehtmlright = '<a href="'.dol_buildpath('/mymodule/myobject_agenda.php', 1).'?id='.$object->id.'">';
-		$morehtmlright .= $langs->trans("SeeAll");
-		$morehtmlright .= '</a>';
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt 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, '', $morehtmlright);
+		$somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 	//Select mail models is same action as presend
diff --git a/htdocs/modulebuilder/template/myobject_contact.php b/htdocs/modulebuilder/template/myobject_contact.php
index 171ef3aab1d..d2de342c861 100644
--- a/htdocs/modulebuilder/template/myobject_contact.php
+++ b/htdocs/modulebuilder/template/myobject_contact.php
@@ -171,7 +171,7 @@ if ($object->id) {
 	 if ($permissiontoadd)
 	 {
 	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 2db325b8b41..3db0271dd01 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -92,13 +92,13 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$offset = $liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) {
@@ -188,7 +188,7 @@ if ($object->id) {
 	 if ($permissiontoadd)
 	 {
 	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index a3462b99418..ee4d4b73026 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -42,6 +42,7 @@
 //if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
 //if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
+//if (! defined('NOSESSION'))                define('NOSESSION', '1');					// On CLI mode, no need to use web sessions
 
 // Load Dolibarr environment
 $res = 0;
@@ -95,7 +96,8 @@ $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
-$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode       = GETPOST('mode', 'aZ');
 
 $id = GETPOST('id', 'int');
 
@@ -173,6 +175,7 @@ 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;
@@ -189,7 +192,7 @@ 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);
+//restrictedArea($user, $object->element, 0, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
 //if (empty($conf->mymodule->enabled)) accessforbidden();
 //if (!$permissiontoread) accessforbidden();
 
@@ -265,7 +268,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
@@ -273,7 +276,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)";
 }
@@ -299,17 +304,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])."'";
 				}
 			}
 		}
@@ -329,7 +334,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'])) {
@@ -344,35 +349,53 @@ $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);
@@ -388,7 +411,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
 
 // Example : Adding jquery code
-// print '<script type="text/javascript" language="javascript">
+// print '<script type="text/javascript">
 // jQuery(document).ready(function() {
 // 	function init_myfunc()
 // 	{
@@ -405,6 +428,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);
 }
@@ -458,8 +484,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('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('/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);
 
@@ -524,8 +556,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'));
@@ -533,6 +563,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>';
 	}
@@ -544,6 +580,9 @@ 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();
@@ -551,6 +590,8 @@ print $searchpicto;
 print '</td>';
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
@@ -568,16 +609,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['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";
+print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+$totalarray['nbfield']++;
 print '</tr>'."\n";
 
 
@@ -595,9 +642,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
@@ -606,75 +654,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'])) {
+
+			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;
-	// 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['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 '<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++;
 }
@@ -690,7 +755,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/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index f5fc29a2591..6733919289b 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -98,7 +98,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->mymodule->multidir_output[$object->entity]."/".$object->id;
+	$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
@@ -117,7 +117,13 @@ $permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the incl
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$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
+}
 
 
 /*
@@ -156,7 +162,7 @@ if ($id > 0 || !empty($ref)) {
 	 if ($permissiontoadd)
 	 {
 	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/modulebuilder/template/scripts/mymodule.php b/htdocs/modulebuilder/template/scripts/mymodule.php
index f0a7ca715a4..3f117a51094 100644
--- a/htdocs/modulebuilder/template/scripts/mymodule.php
+++ b/htdocs/modulebuilder/template/scripts/mymodule.php
@@ -40,7 +40,6 @@
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
 //if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
 //if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 if (!defined('NOSESSION')) define('NOSESSION', '1');	// On CLI mode, no need to use web sessions
diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index ed17db03db6..48396025957 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -22,7 +22,7 @@ require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 
 
 /**
- * \file    mrp/class/api_mo.class.php
+ * \file    htdocs/mrp/class/api_mos.class.php
  * \ingroup mrp
  * \brief   File for API management of MO.
  */
@@ -147,8 +147,9 @@ class Mos extends DolibarrApi
 			$sql .= " AND sc.fk_user = ".((int) $search_sale);
 		}
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -353,6 +354,9 @@ class Mos extends DolibarrApi
 
 		$stockmove = new MouvementStock($this->db);
 
+		$consumptioncomplete = true;
+		$productioncomplete = true;
+
 		if (!empty($arraytoconsume) && !empty($arraytoproduce)) {
 			$pos = 0;
 			$arrayofarrayname = array("arraytoconsume","arraytoproduce");
@@ -370,19 +374,21 @@ class Mos extends DolibarrApi
 						$qtytoprocess = $value["qty"];
 						if (isset($value["fk_warehouse"])) {	// If there is a warehouse to set
 							if (!($value["fk_warehouse"] > 0)) {	// If there is no warehouse set.
-								throw new RestException(500, "Field fk_warehouse must be > 0 in ".$arrayname);
 								$error++;
+								throw new RestException(500, "Field fk_warehouse must be > 0 in ".$arrayname);
 							}
 							if ($tmpproduct->status_batch) {
-								throw new RestException(500, "Product ".$tmpproduct->ref."must be in batch");
 								$error++;
+								throw new RestException(500, "Product ".$tmpproduct->ref."must be in batch");
 							}
 						}
 						$idstockmove = 0;
 						if (!$error && $value["fk_warehouse"] > 0) {
 							// Record stock movement
 							$id_product_batch = 0;
-							$stockmove->origin = $this->mo;
+
+							$stockmove->setOrigin($this->mo->element, $this->mo->id);
+
 							if ($qtytoprocess >= 0) {
 								$moline = new MoLine($this->db);
 								$moline->fk_mo = $this->mo->id;
@@ -457,9 +463,6 @@ class Mos extends DolibarrApi
 				}
 			}
 			if (!$error) {
-				$consumptioncomplete = true;
-				$productioncomplete = true;
-
 				if ($autoclose <= 0) {
 					$consumptioncomplete = false;
 					$productioncomplete = false;
@@ -476,20 +479,21 @@ class Mos extends DolibarrApi
 						if (isset($line->fk_warehouse)) {	// If there is a warehouse to set
 							if (!($line->fk_warehouse > 0)) {	// If there is no warehouse set.
 								$langs->load("errors");
-								throw new RestException(500, $langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref));
 								$error++;
+								throw new RestException(500, $langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref));
 							}
 							if ($tmpproduct->status_batch) {
 								$langs->load("errors");
-								throw new RestException(500, $langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref));
 								$error++;
+								throw new RestException(500, $langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref));
 							}
 						}
 						$idstockmove = 0;
 						if (!$error && $line->fk_warehouse > 0) {
 							// Record stock movement
 							$id_product_batch = 0;
-							$stockmove->origin = $this->mo;
+							$stockmove->origin_type = 'mo';
+							$stockmove->origin_id = $this->mo->id;
 							if ($qtytoprocess >= 0) {
 								$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
 							} else {
@@ -535,20 +539,21 @@ class Mos extends DolibarrApi
 						if (isset($line->fk_warehouse)) {	// If there is a warehouse to set
 							if (!($line->fk_warehouse > 0)) {	// If there is no warehouse set.
 								$langs->load("errors");
-								throw new RestException(500, $langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref));
 								$error++;
+								throw new RestException(500, $langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref));
 							}
 							if ($tmpproduct->status_batch) {
 								$langs->load("errors");
-								throw new RestException(500, $langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref));
 								$error++;
+								throw new RestException(500, $langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref));
 							}
 						}
 						$idstockmove = 0;
 						if (!$error && $line->fk_warehouse > 0) {
 							// Record stock movement
 							$id_product_batch = 0;
-							$stockmove->origin = $this->mo;
+							$stockmove->origin_type = 'mo';
+							$stockmove->origin_id = $this->mo->id;
 							if ($qtytoprocess >= 0) {
 								$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
 							} else {
@@ -586,9 +591,6 @@ class Mos extends DolibarrApi
 			}
 
 			if (!$error) {
-				$consumptioncomplete = true;
-				$productioncomplete = true;
-
 				if ($autoclose > 0) {
 					foreach ($this->mo->lines as $line) {
 						if ($line->role == 'toconsume') {
@@ -620,6 +622,7 @@ class Mos extends DolibarrApi
 				}
 			}
 		}
+
 		// Update status of MO
 		dol_syslog("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
 		//var_dump("consumptioncomplete = ".$consumptioncomplete." productioncomplete = ".$productioncomplete);
@@ -716,7 +719,7 @@ class Mos extends DolibarrApi
 			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
 			}
-				$myobject[$field] = $data[$field];
+			$myobject[$field] = $data[$field];
 		}
 		return $myobject;
 	}
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index d4abe482a88..29db4bcb669 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -97,10 +97,11 @@ class Mo extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
+		'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'),
+		'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'),
 		'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'),
@@ -121,8 +122,9 @@ class Mo extends CommonObject
 		'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')),
 	);
 	public $rowid;
-	public $ref;
 	public $entity;
+	public $ref;
+	public $mrptype;
 	public $label;
 	public $qty;
 	public $fk_warehouse;
@@ -253,7 +255,7 @@ class Mo extends CommonObject
 		$this->db->begin();
 
 		// Check that product is not a kit/virtual product
-		if (empty($conf->global->ALLOW_USE_KITS_INTO_BOM_AND_MO) and $this->fk_product > 0) {
+		if (empty($conf->global->ALLOW_USE_KITS_INTO_BOM_AND_MO) && $this->fk_product > 0) {
 			include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 			$tmpproduct = new Product($this->db);
 			$tmpproduct->fetch($this->fk_product);
@@ -265,6 +267,14 @@ class Mo extends CommonObject
 			}
 		}
 
+		if ($this->fk_bom > 0) {
+			// If there is a nown BOM, we force the type of MO to the type of BOM
+			$tmpbom = new BOM($this->db);
+			$tmpbom->fetch($this->fk_bom);
+
+			$this->mrptype = $tmpbom->bomtype;
+		}
+
 		if (!$error) {
 			$idcreated = $this->createCommon($user, $notrigger);
 			if ($idcreated <= 0) {
@@ -273,7 +283,7 @@ class Mo extends CommonObject
 		}
 
 		if (!$error) {
-			$result = $this->updateProduction($user, $notrigger);
+			$result = $this->updateProduction($user, $notrigger);	// Insert lines from BOM
 			if ($result <= 0) {
 				$error++;
 			}
@@ -437,25 +447,25 @@ class Mo extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
 				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -502,7 +512,7 @@ class Mo extends CommonObject
 		if ($lineid > 0) {
 			$sql .= ' AND t.fk_mrp_production = '.((int) $lineid);
 		} else {
-			$sql .= 'AND t.fk_mo = '.$this->id;
+			$sql .= 'AND t.fk_mo = '.((int) $this->id);
 		}
 
 		$resql = $this->db->query($sql);
@@ -546,7 +556,7 @@ class Mo extends CommonObject
 		$result = 0;
 
 		$sql = 'SELECT COUNT(rowid) as nb FROM '.MAIN_DB_PREFIX.'stock_mouvement as sm';
-		$sql .= " WHERE sm.origintype = 'mo' and sm.fk_origin = ".$this->id;
+		$sql .= " WHERE sm.origintype = 'mo' and sm.fk_origin = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -615,6 +625,7 @@ class Mo extends CommonObject
 	public function updateProduction(User $user, $notrigger = true)
 	{
 		$error = 0;
+		$role = "";
 
 		if ($this->status != self::STATUS_DRAFT) {
 			$this->error = 'BadStatus';
@@ -627,7 +638,7 @@ class Mo extends CommonObject
 		if (!$error) {
 			// TODO Check that production has not started. If yes, we stop here.
 
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'mrp_production WHERE fk_mo = '.$this->id;
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'mrp_production WHERE fk_mo = '.((int) $this->id);
 			$this->db->query($sql);
 
 			$moline = new MoLine($this->db);
@@ -638,7 +649,7 @@ class Mo extends CommonObject
 			$moline->fk_product = $this->fk_product;
 			$moline->position = 1;
 
-			if ($this->fk_bom > 0) {	// If a BOM is defined, we know what to consume.
+			if ($this->fk_bom > 0) {	// If a BOM is defined, we know what to produce.
 				include_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 				$bom = new Bom($this->db);
 				$bom->fetch($this->fk_bom);
@@ -649,6 +660,12 @@ class Mo extends CommonObject
 					$role = 'toconsume';
 					$moline->role = 'toproduce';
 				}
+			} else {
+				if ($this->mrptype == 1) {
+					$moline->role = 'toconsume';
+				} else {
+					$moline->role = 'toproduce';
+				}
 			}
 
 			$resultline = $moline->create($user, false); // Never use triggers here
@@ -838,7 +855,7 @@ class Mo extends CommonObject
 		$sql .= " status = ".self::STATUS_VALIDATED.",";
 		$sql .= " date_valid='".$this->db->idate($now)."',";
 		$sql .= " fk_user_valid = ".$user->id;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1011,9 +1028,9 @@ class Mo extends CommonObject
 			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
 		}
 
-		$url = dol_buildpath('/mrp/mo_card.php', 1).'?id='.$this->id;
+		$url = DOL_URL_ROOT.'/mrp/mo_card.php?id='.$this->id;
 		if ($option == 'production') {
-			$url = dol_buildpath('/mrp/mo_production.php', 1).'?id='.$this->id;
+			$url = DOL_URL_ROOT.'/mrp/mo_production.php?id='.$this->id;
 		}
 
 		if ($option != 'nolink') {
@@ -1176,6 +1193,8 @@ class Mo extends CommonObject
 	public function initAsSpecimen()
 	{
 		$this->initAsSpecimenCommon();
+
+		$this->lines = array();
 	}
 
 	/**
@@ -1281,6 +1300,17 @@ class Mo extends CommonObject
 	{
 		global $langs, $hookmanager, $conf, $form;
 
+		$langs->load('stocks');
+		$text_stock_options = $langs->trans("RealStockDesc").'<br>';
+		$text_stock_options .= $langs->trans("RealStockWillAutomaticallyWhen").'<br>';
+		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE) ? '- '.$langs->trans("DeStockOnShipment").'<br>' : '');
+		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) ? '- '.$langs->trans("DeStockOnValidateOrder").'<br>' : '');
+		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_BILL) ? '- '.$langs->trans("DeStockOnBill").'<br>' : '');
+		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) ? '- '.$langs->trans("ReStockOnBill").'<br>' : '');
+		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) ? '- '.$langs->trans("ReStockOnValidateOrder").'<br>' : '');
+		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) ? '- '.$langs->trans("ReStockOnDispatchOrder").'<br>' : '');
+		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE) ? '- '.$langs->trans("StockOnReception").'<br>' : '');
+
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans('Ref').'</td>';
 		print '<td class="right">'.$langs->trans('Qty');
@@ -1290,6 +1320,8 @@ class Mo extends CommonObject
 			print ' <span class="opacitymedium">('.$langs->trans("ForAQuantityToConsumeOf", $this->bom->qty).')</span>';
 		}
 		print '</td>';
+		print '<td class="center">'.$form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1).'</td>';
+		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>';
@@ -1300,19 +1332,15 @@ class Mo extends CommonObject
 
 		if (!empty($this->lines)) {
 			foreach ($this->lines as $line) {
-				/*if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line)))
-				{
-					if (empty($line->fk_parent_line))
-					{
-						$parameters = array('line'=>$line, 'i'=>$i);
-						$action = '';
-						$result = $hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-					}
+				$reshook = 0;
+				if (is_object($hookmanager)) {
+					$parameters = array('line'=>$line, 'i'=>$i, 'restrictlist'=>$restrictlist, 'selectedLines'=> $selectedLines);
+					if (!empty($line->fk_parent_line)) { $parameters['fk_parent_line'] = $line->fk_parent_line; }
+					$reshook = $hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				}
-				else
-				{*/
+				if (empty($reshook)) {
 					$this->printOriginLine($line, '', $restrictlist, '/core/tpl', $selectedLines);
-				//}
+				}
 
 				$i++;
 			}
@@ -1343,6 +1371,7 @@ class Mo extends CommonObject
 		if (!empty($line->fk_product)) {
 			$productstatic = new Product($this->db);
 			$productstatic->fetch($line->fk_product);
+			$productstatic->load_virtual_stock();
 			$this->tpl['label'] .= $productstatic->getNomUrl(1);
 			//$this->tpl['label'].= ' - '.$productstatic->label;
 		} else {
@@ -1355,6 +1384,9 @@ class Mo extends CommonObject
 			$this->tpl['qty_bom'] = $this->bom->qty;
 		}
 
+		$this->tpl['stock'] = $productstatic->stock_reel;
+		$this->tpl['seuil_stock_alerte'] = $productstatic->seuil_stock_alerte;
+		$this->tpl['virtual_stock'] = $productstatic->stock_theorique;
 		$this->tpl['qty'] = $line->qty;
 		$this->tpl['qty_frozen'] = $line->qty_frozen;
 		$this->tpl['disable_stock_change'] = $line->disable_stock_change;
@@ -1546,25 +1578,25 @@ class MoLine extends CommonObjectLine
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
 				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php
index cbb7b5da305..d9ee0e39cc6 100644
--- a/htdocs/mrp/index.php
+++ b/htdocs/mrp/index.php
@@ -147,7 +147,7 @@ if ($conf->use_javascript_ajax) {
 print '<br>';
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 /*
  * Last modified BOM
@@ -155,7 +155,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 $max = 5;
 
-$sql = "SELECT a.rowid, a.status, a.ref, a.tms as datem, a.status";
+$sql = "SELECT a.rowid, a.status, a.ref, a.tms as datem, a.status, a.fk_product";
 $sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as a";
 $sql .= " WHERE a.entity IN (".getEntity('bom').")";
 $sql .= $db->order("a.tms", "DESC");
@@ -176,6 +176,7 @@ if ($resql) {
 
 			$staticbom->id = $obj->rowid;
 			$staticbom->ref = $obj->ref;
+			$staticbom->fk_product = $obj->fk_product;
 			$staticbom->date_modification = $obj->datem;
 			$staticbom->status = $obj->status;
 
@@ -245,7 +246,7 @@ if ($resql) {
 	dol_print_error($db);
 }
 
-print '</div></div></div>';
+print '</div></div>';
 
 $parameters = array(
 	//'type' => $type,
diff --git a/htdocs/mrp/js/lib_dispatch.js.php b/htdocs/mrp/js/lib_dispatch.js.php
index 8a5eef60211..e8ca84d7a4e 100644
--- a/htdocs/mrp/js/lib_dispatch.js.php
+++ b/htdocs/mrp/js/lib_dispatch.js.php
@@ -70,10 +70,18 @@ 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') {
+		var inputId = 'qtytoconsume';
+		var warehouseId = 'idwarehouse';
+	}
+	else {
+		var inputId = 'qtytoproduce';
+		var warehouseId = 'idwarehousetoproduce';
+	}
 	var nbrTrs = $("tr[name^='"+type+"_"+index+"']").length; 				// position of line for batch
 	var $row = $("tr[name='"+type+'_'+index+"_1']").clone(true); 				// clone last batch line to jQuery object
 	var	qtyOrdered = parseFloat($("#qty_ordered_"+index).val()); 	// Qty ordered is same for all rows
-	var	qty = parseFloat($("#qtytoproduce-"+index+"-"+nbrTrs).val());
+	var	qty = parseFloat($("#"+inputId+"-"+index+"-"+nbrTrs).val());
 	var	qtyDispatched;
 
 	if (mode === 'lessone')
@@ -83,7 +91,7 @@ function addDispatchLine(index, type, mode)
 	else
 	{
 		qtyDispatched = parseFloat($("#qty_dispatched_"+index).val()) + qty;
-		console.log(qty);
+		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;
@@ -103,11 +111,11 @@ function addDispatchLine(index, type, mode)
 		$row.html($row.html().replace(re1, '_'+index+'_'+(nbrTrs+1)));
 		$row.html($row.html().replace(re2, '-'+index+'-'+(nbrTrs+1)));
 		//create new select2 to avoid duplicate id of cloned one
-		$row.find("select[name='"+'idwarehousetoproduce-'+index+'-'+(nbrTrs+1)+"']").select2();
+		$row.find("select[name='"+warehouseId+'-'+index+'-'+(nbrTrs+1)+"']").select2();
 		// TODO find solution to copy selected option to new select
 		// TODO find solution to keep new tr's after page refresh
 		//clear value
-		$row.find("input[name^='qtytoproduce']").val('');
+		$row.find("input[id^='"+inputId+"']").val('');
 		//change name of new row
 		$row.attr('name',type+'_'+index+'_'+(nbrTrs+1));
 		//insert new row before last row
@@ -118,20 +126,20 @@ function addDispatchLine(index, type, mode)
 		$(".csswarehouse_"+index+"_"+(nbrTrs+1)+":first-child").parent("span.selection").parent(".select2").detach();
 
 		/*  Suffix of lines are:  index _ trs.length */
-		$("#qtytoproduce-"+index+"-"+(nbrTrs+1)).focus();
-		if ($("#qtytoproduce-"+index+"-"+(nbrTrs)).val() == 0) {
-			$("#qtytoproduce-"+index+"-"+(nbrTrs)).val(1);
+		$("#"+inputId+"-"+index+"-"+(nbrTrs+1)).focus();
+		if ($("#"+inputId+"-"+index+"-"+(nbrTrs)).val() == 0) {
+			$("#"+inputId+"-"+index+"-"+(nbrTrs)).val(1);
 		}
 		var totalonallines = 0;
 		for (let i = 1; i <= nbrTrs; i++) {
-			console.log(i+" = "+parseFloat($("#qtytoproduce-"+index+"-"+i).val()));
-			totalonallines = totalonallines + parseFloat($("#qtytoproduce-"+index+"-"+i).val());
+			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 = $("#qtytoproduce-"+index+"-"+nbrTrs).val();
-			$("#qtytoproduce-"+index+"-"+(nbrTrs)).val(1);
-			$("#qtytoproduce-"+index+"-"+(nbrTrs+1)).val(prevouslineqty - 1);
+			var prevouslineqty = $("#"+inputId+"-"+index+"-"+nbrTrs).val();
+			$("#"+inputId+"-"+index+"-"+(nbrTrs)).val(1);
+			$("#"+inputId+"-"+index+"-"+(nbrTrs+1)).val(prevouslineqty - 1);
 		}
 		$("#qty_dispatched_"+index).val(qtyDispatched);
 
@@ -145,9 +153,9 @@ function addDispatchLine(index, type, mode)
 			$("#qty_"+(nbrTrs-1)+"_"+index).val(qty);
 		}
 		// Store arbitrary data for dispatch qty input field change event
-		$("#qtytoproduce-"+index+(nbrTrs)).data('qty', qty);
-		$("#qtytoproduce-"+index+(nbrTrs)).data('type', type);
-		$("#qtytoproduce-"+index+(nbrTrs)).data('index', index);
+		$("#"+inputId+"-"+index+(nbrTrs)).data('qty', qty);
+		$("#"+inputId+"-"+index+(nbrTrs)).data('type', type);
+		$("#"+inputId+"-"+index+(nbrTrs)).data('index', index);
 	}
 }
 
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index bbd2724fb1c..e1b19d87ad0 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -55,8 +55,8 @@ if (GETPOST('actioncode', 'array')) {
 $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');
+$sortfield	= GETPOST('sortfield', 'aZ09comma');
+$sortorder	= GETPOST('sortorder', 'aZ09comma');
 $page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -158,7 +158,7 @@ if ($object->id > 0) {
 		$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 .= '<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->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 732cde2ef2f..48e36831592 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -49,6 +49,7 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 // Initialize technical objects
 $object = new Mo($db);
 $objectbom = new BOM($db);
+
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->mrp->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('mocard', 'globalcard')); // Note that conf->hooks_modules contains array
@@ -74,13 +75,14 @@ if (empty($action) && empty($id) && empty($ref)) {
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
-if (GETPOST('fk_bom', 'int')) {
+if (GETPOST('fk_bom', 'int') > 0) {
 	$objectbom->fetch(GETPOST('fk_bom', 'int'));
 
 	if ($action != 'add') {
 		// We force calling parameters if we are not in the submit of creation of MO
 		$_POST['fk_product'] = $objectbom->fk_product;
 		$_POST['qty'] = $objectbom->qty;
+		$_POST['mrptype'] = $objectbom->bomtype;
 		$_POST['fk_warehouse'] = $objectbom->fk_warehouse;
 		$_POST['note_private'] = $objectbom->note_private;
 	}
@@ -197,7 +199,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formproject = new FormProjets($db);
 
-$title = $langs->trans('Mo')." - ".$langs->trans("Card");
+$title = $langs->trans('ManufacturingOrder')." - ".$langs->trans("Card");
 
 llxHeader('', $title, '');
 
@@ -205,6 +207,13 @@ llxHeader('', $title, '');
 
 // Part to create
 if ($action == 'create') {
+	if (GETPOST('fk_bom', 'int') > 0) {
+		$titlelist = $langs->trans("ToConsume");
+		if ($objectbom->bomtype == 1) {
+			$titlelist = $langs->trans("ToObtain");
+		}
+	}
+
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Mo")), '', 'mrp');
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -245,7 +254,10 @@ if ($action == 'create') {
 						console.log(data);
 						if (typeof data.rowid != "undefined") {
 							console.log("New BOM loaded, we set values in form");
+							console.log(data);
 							$('#qty').val(data.qty);
+							$("#mrptype").val(data.bomtype);	// We set bomtype into mrptype
+							$('#mrptype').trigger('change'); // Notify any JS components that the value changed
 							$("#fk_product").val(data.fk_product);
 							$('#fk_product').trigger('change'); // Notify any JS components that the value changed
 							$('#note_private').val(data.description);
@@ -268,7 +280,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()+'&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&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('');
@@ -286,19 +298,16 @@ if ($action == 'create') {
 	</script>
 	<?php
 
-	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 $form->buttonsSaveCancel("Create");
 
-	if (GETPOST('fk_bom', 'int') > 0) {
-		print load_fiche_titre($langs->trans("ToConsume"));
+	if ($objectbom->id > 0) {
+		print load_fiche_titre($titlelist);
 
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 
 		$object->lines = $objectbom->lines;
+		$object->mrptype = $objectbom->bomtype;
 		$object->bom = $objectbom;
 
 		$object->printOriginLinesList('', array());
@@ -341,9 +350,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	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->buttonsSaveCancel();
 
 	print '</form>';
 }
@@ -445,7 +452,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$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 .= '<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->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
@@ -602,7 +609,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Modify
 			if ($object->status == $object::STATUS_DRAFT) {
 				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
+					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";
 				}
@@ -681,20 +688,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		$MAXEVENT = 10;
 
-		$morehtmlright = '<a href="'.dol_buildpath('/mrp/mo_agenda.php', 1).'?id='.$object->id.'">';
-		$morehtmlright .= $langs->trans("SeeAll");
-		$morehtmlright .= '</a>';
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt 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';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, 'mo', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+		$somethingshown = $formactions->showactions($object, $object->element, $socid, 1, '', $MAXEVENT, '', $morehtmlcenter);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 	//Select mail models is same action as presend
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 211fa897c09..acb5cb3e1c4 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -44,8 +44,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -83,12 +83,14 @@ if ($id > 0 || !empty($ref)) {
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'mrp', $object->id, 'mrp_mo', '', 'fk_soc', 'rowid', $isdraft);
 
+$permissiontoadd = $user->rights->mrp->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+
 
 /*
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
 
 
 /*
@@ -134,7 +136,7 @@ if ($object->id) {
 		$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 .= '<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->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 75398b7749b..e5648cad5f7 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -207,7 +207,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
@@ -271,12 +271,12 @@ $sql .= $hookmanager->resPrint;
 /* If a group by is required
 $sql.= " GROUP BY ";
 foreach($object->fields as $key => $val) {
-	$sql.='t.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.", " : "");
 	}
 }
 // Add where from hooks
@@ -567,7 +567,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index ca2655ae10e..10e430479cf 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -65,8 +65,8 @@ $search_type_mouvement = GETPOST('search_type_mouvement', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -332,7 +332,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$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 .= '<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->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
@@ -427,7 +427,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Add fields from extrafields
 	if (!empty($extrafields->attributes[$objectlist->table_element]['label'])) {
 		foreach ($extrafields->attributes[$objectlist->table_element]['label'] as $key => $val) {
-			$sql .= ($extrafields->attributes[$objectlist->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+			$sql .= ($extrafields->attributes[$objectlist->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 		}
 	}
 	// Add fields from hooks
@@ -812,8 +812,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// TODO Use a cache here
 			$sql = "SELECT label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-			$sql .= " WHERE fk_product=".$objp->rowid;
-			$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
+			$sql .= " WHERE fk_product = ".((int) $objp->rowid);
+			$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
 			$sql .= " LIMIT 1";
 
 			$result = $db->query($sql);
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index 6bbfc503453..6fb173c4295 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -60,7 +60,7 @@ if ($id > 0 || !empty($ref)) {
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'mrp', $object->id, 'mrp_mo', '', 'fk_soc', 'rowid', $isdraft);
 
-$permissionnote = $user->rights->mrp->write;	// Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->rights->mrp->write; // Used by the include of actions_setnotes.inc.php
 
 
 
@@ -68,7 +68,14 @@ $permissionnote = $user->rights->mrp->write;	// Used by the include of actions_s
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+
+$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
+}
 
 
 /*
@@ -105,7 +112,7 @@ if ($id > 0 || !empty($ref)) {
 		$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 .= '<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->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index ca9480eb1ae..6a5c41b77c5 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -38,7 +38,7 @@ dol_include_once('/bom/class/bom.class.php');
 dol_include_once('/mrp/lib/mrp_mo.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("mrp", "stocks", "other", "productbatch"));
+$langs->loadLangs(array("mrp", "stocks", "other", "product", "productbatch"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -149,14 +149,19 @@ if (empty($reshook)) {
 		$result = $object->setStatut($object::STATUS_INPROGRESS, 0, '', 'MRP_REOPEN');
 	}
 
-	if ($action == 'confirm_addconsumeline' && GETPOST('addconsumelinebutton') && $permissiontoadd) {
+	if (($action == 'confirm_addconsumeline' && GETPOST('addconsumelinebutton') && $permissiontoadd)
+	|| ($action == 'confirm_addproduceline' && GETPOST('addproducelinebutton') && $permissiontoadd)) {
 		$moline = new MoLine($db);
 
 		// Line to produce
 		$moline->fk_mo = $object->id;
 		$moline->qty = GETPOST('qtytoadd', 'int'); ;
 		$moline->fk_product = GETPOST('productidtoadd', 'int');
-		$moline->role = 'toconsume';
+		if (GETPOST('addconsumelinebutton')) {
+			$moline->role = 'toconsume';
+		} else {
+			$moline->role = 'toproduce';
+		}
 		$moline->origin_type = 'free'; // free consume line
 		$moline->position = 0;
 
@@ -206,7 +211,8 @@ if (empty($reshook)) {
 						if (!$error && GETPOST('idwarehouse-'.$line->id.'-'.$i) > 0) {
 							// Record stock movement
 							$id_product_batch = 0;
-							$stockmove->origin = $object;
+							$stockmove->setOrigin($object->element, $object->id);
+
 							if ($qtytoprocess >= 0) {
 								$idstockmove = $stockmove->livraison($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
 							} else {
@@ -278,7 +284,9 @@ if (empty($reshook)) {
 						if (!$error && GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) > 0) {
 							// Record stock movement
 							$id_product_batch = 0;
-							$stockmove->origin = $object;
+							$stockmove->origin_type = $object->element;
+							$stockmove->origin_id = $object->id;
+
 							$idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i), $qtytoprocess, $pricetoprocess, $labelmovement, '', '', GETPOST('batchtoproduce-'.$line->id.'-'.$i), dol_now(), $id_product_batch, $codemovement);
 							if ($idstockmove < 0) {
 								$error++;
@@ -498,9 +506,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print $formconfirm;
 
 
-	// Object card
+	// MO file
 	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/mrp/mo_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/mrp/mo_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
 	/*
@@ -515,7 +523,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$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 .= '<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->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
@@ -642,7 +650,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</div>';
 	}
 
-	if (in_array($action, array('consumeorproduce', 'consumeandproduceall', 'addconsumeline'))) {
+	if (in_array($action, array('consumeorproduce', 'consumeandproduceall', 'addconsumeline', 'addproduceline'))) {
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="confirm_'.$action.'">';
@@ -661,7 +669,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print '<span class="clearbothonsmartphone"></span>';
 			print $langs->trans("MovementLabel").': <input type="text" class="minwidth300" name="inventorylabel" value="'.$defaultstockmovementlabel.'"><br><br>';
 			print '<input type="checkbox" id="autoclose" name="autoclose" value="1"'.(GETPOSTISSET('inventorylabel') ? (GETPOST('autoclose') ? ' checked="checked"' : '') : ' checked="checked"').'> <label for="autoclose">'.$langs->trans("AutoCloseMO").'</label><br>';
-			print '<input class="button" type="submit" value="'.$langs->trans("Confirm").'" name="confirm">';
+			print '<input type="submit" class="button" value="'.$langs->trans("Confirm").'" name="confirm">';
 			print ' &nbsp; ';
 			print '<input class="button button-cancel" type="submit" value="'.$langs->trans("Cancel").'" name="cancel">';
 			print '<br><br>';
@@ -686,6 +694,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			$bom = new Bom($db);
 			$res = $bom->fetch($object->fk_bom);
 			if ($res > 0) {
+				$bom->calculateCosts();
 				$bomcost = $bom->unit_cost;
 			}
 		}
@@ -696,11 +705,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<div class="fichehalfleft">';
 		print '<div class="clearboth"></div>';
 
-		$newlinetext = '';
-		if ($object->status != $object::STATUS_PRODUCED && $object->status != $object::STATUS_CANCELED && $action != 'consumeorproduce' && $action != 'consumeandproduceall') {
-			$newlinetext = '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addconsumeline">'.$langs->trans("AddNewConsumeLines").'</a>';
+		$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';
+		$parameters = array('morecss'=>'reposition');
+
+		$newcardbutton = '';
+		if ($action != 'consumeorproduce' && $action != 'consumeandproduceall') {
+			$newcardbutton = dolGetButtonTitle($langs->trans('AddNewConsumeLines'), '', 'fa fa-plus-circle size15x', $url, '', $permissiontoaddaconsumeline, $parameters);
 		}
-		print load_fiche_titre($langs->trans('Consumption'), '', '', 0, '', '', $newlinetext);
+
+		print load_fiche_titre($langs->trans('Consumption'), $newcardbutton, '', 0, '', '', '');
 
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder noshadow centpercent nobottom">';
@@ -721,6 +735,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print $langs->trans("Warehouse");
 		}
 		print '</td>';
+		if ($conf->productbatch->enabled) {
+			// Available
+			print '<td>';
+			if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
+				print $langs->trans("Stock");
+			}
+			print '</td>';
+		}
 		// Lot - serial
 		if ($conf->productbatch->enabled) {
 			print '<td>';
@@ -739,7 +761,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print '<!-- Add line to consume -->'."\n";
 			print '<tr class="liste_titre">';
 			print '<td>';
-			print $form->select_produits('', 'productidtoadd', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300');
+			print $form->select_produits('', 'productidtoadd', '', 0, 0, -1, 2, '', 1, array(), 0, '1', 0, 'maxwidth300');
 			print '</td>';
 			// Qty
 			print '<td class="right"><input type="text" name="qtytoadd" value="1" class="width50 right"></td>';
@@ -748,11 +770,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				print '<td></td>';
 			}
 			// Qty already consumed
-			print '<td></td>';
+			print '<td colspan="2">';
 			// Warehouse
-			print '<td>';
-			print '<input type="submit" class="button buttongen" name="addconsumelinebutton" value="'.$langs->trans("Add").'">';
+			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) {
+				print '<td></td>';
+			}
 			// Lot - serial
 			if ($conf->productbatch->enabled) {
 				print '<td></td>';
@@ -805,16 +830,26 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						}
 					}
 
+					$bomcost = price2num($bomcost, 'MU');
+
 					$arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
 					$alreadyconsumed = 0;
 					foreach ($arrayoflines as $line2) {
 						$alreadyconsumed += $line2['qty'];
 					}
 
+					$suffix = '_'.$line->id;
+					print '<!-- Line to dispatch '.$suffix.' -->'."\n";
+					// hidden fields for js function
+					print '<input id="qty_ordered'.$suffix.'" type="hidden" value="'.$line->qty.'">';
+					print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.$alreadyconsumed.'">';
+
 					print '<tr>';
+					// Product
 					print '<td>'.$tmpproduct->getNomUrl(1);
 					print '<br><span class="opacitymedium small">'.$tmpproduct->label.'</span>';
 					print '</td>';
+					// Qty
 					print '<td class="right nowraponall">';
 					$help = '';
 					if ($line->qty_frozen) {
@@ -826,14 +861,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					if ($help) {
 						print $form->textwithpicto($line->qty, $help, -1);
 					} else {
-						print $line->qty;
+						print price2num($line->qty, 'MS');
 					}
 					print '</td>';
+					// Cost price
 					if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
 						print '<td class="right nowraponall">';
 						print price($linecost);
 						print '</td>';
 					}
+					// Already consumed
 					print '<td class="right">';
 					if ($alreadyconsumed) {
 						print '<script>';
@@ -860,21 +897,30 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							print '<script>jQuery("#tablelines").removeClass("nobottom");</script>';
 						}
 					}
-					print ' '.$alreadyconsumed;
+					print ' '.price2num($alreadyconsumed, 'MS');
 					print '</td>';
-					print '<td>'; // Warehouse
+					// Warehouse
+					print '<td>';
 					print '</td>';
-					if ($conf->productbatch->enabled) {
-						print '<td></td>'; // Lot
+					// Stock
+					if ($conf->stock->enabled) {
+						print '<td class="nowraponall right">';
+						if ($tmpproduct->stock_reel < ($line->qty - $alreadyconsumed)) {
+							print img_warning($langs->trans('StockTooLow')).' ';
+						}
+						print price2num($tmpproduct->stock_reel, 'MS'); // Available
+						print '</td>';
 					}
+					// Lot
+					if ($conf->productbatch->enabled) {
+						print '<td></td>';
+					}
+					// Action delete line
 					if ($permissiontodelete) {
-						$href = $_SERVER["PHP_SELF"];
-						$href .= '?id='.$object->id;
-						$href .= '&action=deleteline';
-						$href .= '&lineid='.$line->id;
+						$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line->id);
 						print '<td class="center">';
-						print '<a href="'.$href.'">';
-						print img_picto('', "delete");
+						print '<a class="reposition" href="'.$href.'">';
+						print img_picto('', 'delete');
 						print '</a>';
 						print '</td>';
 					}
@@ -883,16 +929,26 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					// Show detailed of already consumed with js code to collapse
 					foreach ($arrayoflines as $line2) {
 						print '<tr class="expanddetail'.$line->id.' hideobject opacitylow">';
+
+						// Date
 						print '<td>';
 						$tmpstockmovement->id = $line2['fk_stock_movement'];
 						print '<a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?search_ref='.$tmpstockmovement->id.'">'.img_picto($langs->trans("StockMovement"), 'movement', 'class="paddingright"').'</a>';
 						print dol_print_date($line2['date'], 'dayhour', 'tzuserrel');
 						print '</td>';
+
+						// Already consumed
 						print '<td></td>';
+
+						// Qty
 						print '<td class="right">'.$line2['qty'].'</td>';
+
+						// Cost price
 						if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
 							print '<td></td>';
 						}
+
+						// Warehouse
 						print '<td class="tdoverflowmax150">';
 						if ($line2['fk_warehouse'] > 0) {
 							$result = $tmpwarehouse->fetch($line2['fk_warehouse']);
@@ -901,6 +957,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							}
 						}
 						print '</td>';
+
+						// Stock
+						if ($conf->stock->enabled) {
+							print '<td></td>';
+						}
+
 						// Lot Batch
 						print '<td>';
 						if ($line2['batch'] != '') {
@@ -908,44 +970,82 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							print $tmpbatch->getNomUrl(1);
 						}
 						print '</td>';
+
+						// Action delete line
+						if ($permissiontodelete) {
+							print '<td></td>';
+						}
+
 						print '</tr>';
 					}
 
 					if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
 						$i = 1;
 						print '<!-- Enter line to consume -->'."\n";
-						print '<tr>';
+						print '<tr name="batch_'.$line->id.'_'.$i.'">';
 						print '<td><span class="opacitymedium">'.$langs->trans("ToConsume").'</span></td>';
 						$preselected = (GETPOSTISSET('qty-'.$line->id.'-'.$i) ? GETPOST('qty-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyconsumed));
 						if ($action == 'consumeorproduce' && !GETPOSTISSET('qty-'.$line->id.'-'.$i)) {
 							$preselected = 0;
 						}
-						print '<td class="right"><input type="text" class="width50 right" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
+
+						$disable = '';
+						if (!empty($conf->global->MRP_NEVER_CONSUME_MORE_THAN_EXPECTED) && ($line->qty - $alreadyconsumed) <= 0) {
+							$disable = 'disabled';
+						}
+
+						// Qty
+						print '<td class="right"><input type="text" class="width50 right" id="qtytoconsume-'.$line->id.'-'.$i.'" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'" '.$disable.'></td>';
+
+						// Cost
 						if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
 							print '<td></td>';
 						}
+
+						// Already consumed
 						print '<td></td>';
+
+						// Warehouse
 						print '<td>';
 						if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 							if (empty($line->disable_stock_change)) {
 								$preselected = (GETPOSTISSET('idwarehouse-'.$line->id.'-'.$i) ? GETPOST('idwarehouse-'.$line->id.'-'.$i) : ($tmpproduct->fk_default_warehouse > 0 ? $tmpproduct->fk_default_warehouse : 'ifone'));
-								print $formproduct->selectWarehouses($preselected, 'idwarehouse-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth300');
+								print $formproduct->selectWarehouses($preselected, 'idwarehouse-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth200 csswarehouse_'.$line->id.'_'.$i);
 							} else {
 								print '<span class="opacitymedium">'.$langs->trans("DisableStockChange").'</span>';
 							}
 						} else {
 							print '<span class="opacitymedium">'.$langs->trans("NoStockChangeOnServices").'</span>';
 						}
-						// Lot / Batch
 						print '</td>';
+
+						// Stock
+						if ($conf->stock->enabled) {
+							print '<td></td>';
+						}
+
+						// Lot / Batch
 						if ($conf->productbatch->enabled) {
 							print '<td>';
 							if ($tmpproduct->status_batch) {
 								$preselected = (GETPOSTISSET('batch-'.$line->id.'-'.$i) ? GETPOST('batch-'.$line->id.'-'.$i) : '');
-								print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'">';
+								print '<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>';
 						}
+
+						// Action delete line
+						if ($permissiontodelete) {
+							print '<td></td>';
+						}
+
 						print '</tr>';
 					}
 				}
@@ -962,7 +1062,22 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<div class="fichehalfright">';
 		print '<div class="clearboth"></div>';
 
-		print load_fiche_titre($langs->trans('Production'), '', '');
+		$nblinetoproduce = 0;
+		foreach ($object->lines as $line) {
+			if ($line->role == 'toproduce') {
+				$nblinetoproduce++;
+			}
+		}
+
+		$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';
+		$parameters = array('morecss'=>'reposition');
+		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, '', '');
 
 		print '<div class="div-table-responsive-no-min">';
 		print '<table id="tablelinestoproduce" class="noborder noshadow nobottom centpercent">';
@@ -972,9 +1087,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<td class="right">'.$langs->trans("Qty").'</td>';
 		if ($permissiontoupdatecost) {
 			if (empty($bomcost)) {
-				print '<td class="right">'.$langs->trans("PMPValue").'</td>';
+				print '<td class="right">'.$form->textwithpicto($langs->trans("UnitCost"), $langs->trans("AmountUsedToUpdateWAP")).'</td>';
 			} else {
-				print '<td class="right">'.$langs->trans("UnitCost").'</td>';
+				print '<td class="right">'.$form->textwithpicto($langs->trans("ManufacturingPrice"), $langs->trans("AmountUsedToUpdateWAP")).'</td>';
 			}
 		}
 		print '<td class="right">'.$langs->trans("QtyAlreadyProduced").'</td>';
@@ -993,6 +1108,34 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 		print '</tr>';
 
+		if ($action == 'addproduceline') {
+			print '<!-- Add line to produce -->'."\n";
+			print '<tr class="liste_titre">';
+			print '<td>';
+			print $form->select_produits('', 'productidtoadd', '', 0, 0, -1, 2, '', 1, array(), 0, '1', 0, 'maxwidth300');
+			print '</td>';
+			// Qty
+			print '<td class="right"><input type="text" name="qtytoadd" value="1" class="width50 right"></td>';
+			// Cost price
+			print '<td></td>';
+
+			// Qty already produced
+			print '<td colspan="2">';
+			// Warehouse
+			print '<input type="submit" class="button buttongen button-add" name="addproducelinebutton" value="'.$langs->trans("Add").'">';
+			print '<input type="submit" class="button buttongen button-cancel" name="canceladdproducelinebutton" value="'.$langs->trans("Cancel").'">';
+			print '</td>';
+			// Lot - serial
+			if ($conf->productbatch->enabled) {
+				print '<td></td>';
+			}
+			// Action
+			if ($permissiontodelete) {
+				print '<td></td>';
+			}
+			print '</tr>';
+		}
+
 		if (!empty($object->lines)) {
 			$nblinetoproduce = 0;
 			foreach ($object->lines as $line) {
@@ -1011,10 +1154,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					$tmpproduct = new Product($db);
 					$tmpproduct->fetch($line->fk_product);
 
-					if (empty($bomcost)) {
-						$bomcost = $tmpproduct->pmp;
-					}
-
 					$arrayoflines = $object->fetchLinesLinked('produced', $line->id);
 					$alreadyproduced = 0;
 					foreach ($arrayoflines as $line2) {
@@ -1033,8 +1172,19 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					print '</td>';
 					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');
+						}
+
 						print '<td class="right nowraponall">';
-						print price($bomcost);
+						if ($manufacturingcost) {
+							print price($manufacturingcost);
+						}
 						print '</td>';
 					}
 					print '<td class="right nowraponall">';
@@ -1065,7 +1215,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					print '</td>';
 					if ($conf->productbatch->enabled) {
 						print '<td></td>'; // Lot
-						print '<td></td>';
+					}
+
+					if ($permissiontodelete && $line->origin_type == 'free') {
+						$href = $_SERVER["PHP_SELF"];
+						$href .= '?id='.$object->id;
+						$href .= '&action=deleteline';
+						$href .= '&lineid='.$line->id;
+						print '<td class="center">';
+						print '<a class="reposition" href="'.$href.'">';
+						print img_picto('', "delete");
+						print '</a>';
+						print '</td>';
 					}
 					print '</tr>';
 
@@ -1115,18 +1276,27 @@ 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');
+							}
+
 							if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
-								$preselected = (GETPOSTISSET('pricetoproduce-'.$line->id.'-'.$i) ? GETPOST('pricetoproduce-'.$line->id.'-'.$i) : price($bomcost));
+								$preselected = (GETPOSTISSET('pricetoproduce-'.$line->id.'-'.$i) ? GETPOST('pricetoproduce-'.$line->id.'-'.$i) : 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="'.$bomcost.'"></td>';
+								print '<td><input type="hidden" class="width50 right" name="pricetoproduce-'.$line->id.'-'.$i.'" value="'.$manufacturingcost.'"></td>';
 							}
 						}
 						print '<td></td>';
 						print '<td>';
 						if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 							$preselected = (GETPOSTISSET('idwarehousetoproduce-'.$line->id.'-'.$i) ? GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) : ($object->fk_warehouse > 0 ? $object->fk_warehouse : 'ifone'));
-							print $formproduct->selectWarehouses($preselected, 'idwarehousetoproduce-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth300 csswarehouse_'.$line->id.'_'.$i);
+							print $formproduct->selectWarehouses($preselected, 'idwarehousetoproduce-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth200 csswarehouse_'.$line->id.'_'.$i);
 						} else {
 							print '<span class="opacitymedium">'.$langs->trans("NoStockChangeOnServices").'</span>';
 						}
diff --git a/htdocs/mrp/tpl/linkedobjectblock.tpl.php b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
new file mode 100644
index 00000000000..5dbe583fd21
--- /dev/null
+++ b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
@@ -0,0 +1,82 @@
+<?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>
+ * Copyright (C) 2013-2020	Charlene BENKE	<charlie@patas-monkey.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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 mrp/tpl/linkedopjectblock.tpl.php -->\n";
+
+global $user, $db;
+global $noMoreLinkedObjectBlockAfter;
+
+$langs = $GLOBALS['langs'];
+$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
+
+// 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) {
+	$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) {
+		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
+	}
+	echo '</td>';
+	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+
+	echo '<td class="linkedcol-ref" align="center">';
+	$result = $product_static->fetch($objectlink->fk_product);
+	if ($result < 0) {
+		setEventMessage($product_static->error, 'errors');
+	} elseif ($result > 0) {
+		$product_static->getNomUrl(1);
+	}
+	print '</td>';
+	echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date_creation, 'day').'</td>';
+	echo '<td class="linkedcol-amount right">';
+	if ($user->rights->commande->lire) {
+		$total = $total + $objectlink->total_ht;
+		echo price($objectlink->total_ht);
+	}
+	echo '</td>';
+	echo '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
+	echo '<td class="linkedcol-action right">';
+	// For now, shipments must stay linked to order, so link is not deletable
+	if ($object->element != 'shipping') {
+		echo '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a>';
+	}
+	echo '</td>';
+	echo "</tr>\n";
+}
+
+echo "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/mrp/tpl/originproductline.tpl.php b/htdocs/mrp/tpl/originproductline.tpl.php
index 478c6504979..ba1d7fccd86 100644
--- a/htdocs/mrp/tpl/originproductline.tpl.php
+++ b/htdocs/mrp/tpl/originproductline.tpl.php
@@ -39,6 +39,16 @@ $qtytoconsumeforline = price2num($qtytoconsumeforline, 'MS');
 print '<tr class="oddeven'.(empty($this->tpl['strike']) ? '' : ' strikefordisabled').'">';
 print '<td>'.$this->tpl['label'].'</td>';
 print '<td class="right">'.$this->tpl['qty'].(($this->tpl['efficiency'] > 0 && $this->tpl['efficiency'] < 1) ? ' / '.$form->textwithpicto($this->tpl['efficiency'], $langs->trans("ValueOfMeansLoss")).' = '.$qtytoconsumeforline : '').'</td>';
+print '<td class="center">'.(empty($this->tpl['stock']) ? 0 : price2num($this->tpl['stock'], 'MS'));
+if ($this->tpl['seuil_stock_alerte'] != '' && ($this->tpl['stock'] < $this->tpl['seuil_stock_alerte'])) {
+	print ' '.img_warning($langs->trans("StockLowerThanLimit", $this->tpl['seuil_stock_alerte']));
+}
+print '</td>';
+print '<td class="center">'.((empty($this->tpl['virtual_stock']) ? 0 : price2num($this->tpl['virtual_stock'], 'MS')));
+if ($this->tpl['seuil_stock_alerte'] != '' && ($this->tpl['virtual_stock'] < $this->tpl['seuil_stock_alerte'])) {
+	print ' '.img_warning($langs->trans("StockLowerThanLimit", $this->tpl['seuil_stock_alerte']));
+}
+print '</td>';
 print '<td class="center">'.($this->tpl['qty_frozen'] ? yn($this->tpl['qty_frozen']) : '').'</td>';
 print '<td class="center">'.($this->tpl['disable_stock_change'] ? yn($this->tpl['disable_stock_change']) : '').'</td>';
 //print '<td class="right">'.$this->tpl['efficiency'].'</td>';
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index 3cdcd30dd70..0dc9f7ce63a 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -130,21 +130,21 @@ class MultiCurrency extends CommonObject
 		if (empty($this->entity) || $this->entity <= 0) {
 			$this->entity = $conf->entity;
 		}
-		$now = date('Y-m-d H:i:s');
+		$now = dol_now();
 
 		// Insert request
-		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."(";
 		$sql .= ' code,';
 		$sql .= ' name,';
 		$sql .= ' entity,';
 		$sql .= ' date_create,';
 		$sql .= ' fk_user';
 		$sql .= ') VALUES (';
-		$sql .= ' \''.$this->db->escape($this->code).'\',';
-		$sql .= ' \''.$this->db->escape($this->name).'\',';
-		$sql .= ' \''.$this->entity.'\',';
-		$sql .= ' \''.$now.'\',';
-		$sql .= ' \''.$user->id.'\'';
+		$sql .= " '".$this->db->escape($this->code)."',";
+		$sql .= " '".$this->db->escape($this->name)."',";
+		$sql .= " ".((int) $this->entity).",";
+		$sql .= " '".$this->db->idate($now)."',";
+		$sql .= " ".((int) $user->id);
 		$sql .= ')';
 
 		$this->db->begin();
@@ -194,7 +194,7 @@ class MultiCurrency extends CommonObject
 
 		global $conf;
 
-		$sql = 'SELECT';
+		$sql = "SELECT";
 		$sql .= ' c.rowid, c.name, c.code, c.entity, c.date_create, c.fk_user';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' AS c';
 		if (!empty($code)) {
@@ -243,9 +243,9 @@ class MultiCurrency extends CommonObject
 	 */
 	public function fetchAllCurrencyRate()
 	{
-		$sql = 'SELECT cr.rowid';
+		$sql = "SELECT cr.rowid";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as cr';
-		$sql .= ' WHERE cr.fk_multicurrency = '.$this->id;
+		$sql .= ' WHERE cr.fk_multicurrency = '.((int) $this->id);
 		$sql .= ' ORDER BY cr.date_sync DESC';
 
 		$this->rates = array();
@@ -298,10 +298,10 @@ class MultiCurrency extends CommonObject
 		}
 
 		// Update request
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
-		$sql .= ' name=\''.$this->db->escape($this->name).'\'';
-		$sql .= ' code=\''.$this->db->escape($this->code).'\'';
-		$sql .= ' WHERE rowid='.((int) $this->id);
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= " name = '".$this->db->escape($this->name)."'";
+		$sql .= " code = '".$this->db->escape($this->code)."'";
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$this->db->begin();
 
@@ -362,8 +362,8 @@ class MultiCurrency extends CommonObject
 				dol_syslog('Currency::delete  '.join(',', $this->errors), LOG_ERR);
 			}
 
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' WHERE rowid='.((int) $this->id);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -432,17 +432,17 @@ class MultiCurrency extends CommonObject
 	 */
 	public function addRateFromDolibarr($code, $rate)
 	{
-		global $db, $user;
+		global $user;
 
 		$currency = new MultiCurrency($this->db);
 		$currency->code = $code;
 		$currency->name = $code;
 
-		$sql = 'SELECT label FROM '.MAIN_DB_PREFIX."c_currencies WHERE code_iso = '".$this->db->escape($code)."'";
+		$sql = "SELECT label FROM ".MAIN_DB_PREFIX."c_currencies WHERE code_iso = '".$this->db->escape($code)."'";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		$resql = $db->query($sql);
-		if ($resql && ($line = $db->fetch_object($resql))) {
+		$resql = $this->db->query($sql);
+		if ($resql && ($line = $this->db->fetch_object($resql))) {
 			$currency->name = $line->label;
 		}
 
@@ -477,10 +477,10 @@ class MultiCurrency extends CommonObject
 	 */
 	public function getRate()
 	{
-		$sql = 'SELECT cr.rowid';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as cr';
-		$sql .= ' WHERE cr.fk_multicurrency = '.$this->id;
-		$sql .= ' AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM '.MAIN_DB_PREFIX.$this->table_element_line.' AS cr2 WHERE cr2.fk_multicurrency = '.$this->id.')';
+		$sql = "SELECT cr.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element_line." as cr";
+		$sql .= " WHERE cr.fk_multicurrency = ".((int) $this->id);
+		$sql .= " AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM ".MAIN_DB_PREFIX.$this->table_element_line." AS cr2 WHERE cr2.fk_multicurrency = ".((int) $this->id).")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -502,7 +502,7 @@ class MultiCurrency extends CommonObject
 	{
 		global $conf;
 
-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX."multicurrency WHERE code = '".$db->escape($code)."' AND entity = ".$conf->entity;
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."multicurrency WHERE code = '".$db->escape($code)."' AND entity = ".$conf->entity;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $db->query($sql);
@@ -521,13 +521,13 @@ class MultiCurrency extends CommonObject
 	  * @param integer	$date_document	Date from document (propal, order, invoice, ...)
 	  *
 	  * @return 	array	[0] => id currency
-	  *					[1] => rate
+	  *						[1] => rate
 	  */
 	public static function getIdAndTxFromCode($db, $code, $date_document = '')
 	{
 		global $conf;
 
-		$sql1 = 'SELECT m.rowid, mc.rate FROM '.MAIN_DB_PREFIX.'multicurrency m';
+		$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)."'";
@@ -537,7 +537,7 @@ class MultiCurrency extends CommonObject
 			$tmparray = dol_getdate($date_document);
 			$sql2 .= " AND mc.date_sync <= '".$db->idate(dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['year'], true))."'";
 		}
-		$sql3 = ' ORDER BY mc.date_sync DESC LIMIT 1';
+		$sql3 = " ORDER BY mc.date_sync DESC LIMIT 1";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $db->query($sql1.$sql2.$sql3);
@@ -591,7 +591,7 @@ class MultiCurrency extends CommonObject
 	{
 		global $db;
 
-		$sql = 'SELECT multicurrency_tx FROM '.MAIN_DB_PREFIX.$table.' WHERE rowid = '.((int) $fk_facture);
+		$sql = "SELECT multicurrency_tx FROM ".MAIN_DB_PREFIX.$table." WHERE rowid = ".((int) $fk_facture);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $db->query($sql);
@@ -686,12 +686,10 @@ class MultiCurrency extends CommonObject
 	 * @param	string	$code 	current code to search
 	 * @return	boolean         True if exists, false if not exists
 	 */
-	public static function checkCodeAlreadyExists($code)
+	public function checkCodeAlreadyExists($code)
 	{
-		global $db;
-
-		$currency = new MultiCurrency($db);
-		if ($currency->fetch('', $code) > 0) {
+		$currencytmp = new MultiCurrency($this->db);
+		if ($currencytmp->fetch('', $code) > 0) {
 			return true;
 		} else {
 			return false;
@@ -774,13 +772,13 @@ class CurrencyRate extends CommonObjectLine
 		$now = empty($this->date_sync) ? dol_now() : $this->date_sync;
 
 		// Insert request
-		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."(";
 		$sql .= ' rate,';
 		$sql .= ' date_sync,';
 		$sql .= ' fk_multicurrency,';
 		$sql .= ' entity';
 		$sql .= ') VALUES (';
-		$sql .= ' '.$this->rate.',';
+		$sql .= ' '.((float) $this->rate).',';
 		$sql .= " '".$this->db->idate($now)."',";
 		$sql .= " ".((int) $fk_multicurrency).",";
 		$sql .= " ".((int) $this->entity);
@@ -830,9 +828,9 @@ class CurrencyRate extends CommonObjectLine
 	{
 		dol_syslog('CurrencyRate::fetch', LOG_DEBUG);
 
-		$sql = 'SELECT cr.rowid, cr.rate, cr.date_sync, cr.fk_multicurrency, cr.entity';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' AS cr';
-		$sql .= ' WHERE cr.rowid = '.((int) $id);
+		$sql = "SELECT cr.rowid, cr.rate, cr.date_sync, cr.fk_multicurrency, cr.entity";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." AS cr";
+		$sql .= " WHERE cr.rowid = ".((int) $id);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -879,15 +877,15 @@ class CurrencyRate extends CommonObjectLine
 		$this->rate = price2num($this->rate);
 
 		// Update request
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
-		$sql .= ' rate='.$this->rate;
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= "SET rate = ".((float) $this->rate);
 		if (!empty($this->date_sync)) {
-			$sql .= ", date_sync='".$this->db->idate($this->date_sync)."'";
+			$sql .= ", date_sync = '".$this->db->idate($this->date_sync)."'";
 		}
 		if (!empty($this->fk_multicurrency)) {
-			$sql .= ', fk_multicurrency='.$this->fk_multicurrency;
+			$sql .= ', fk_multicurrency = '.((int) $this->fk_multicurrency);
 		}
-		$sql .= ' WHERE rowid='.((int) $this->id);
+		$sql .= " WHERE rowid =".((int) $this->id);
 
 		$this->db->begin();
 
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 161513338ff..73cff1b4502 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -55,8 +55,8 @@ $dateinput 			= dol_mktime(0, 0, 0, GETPOST('dateinputmonth', 'int'), GETPOST('d
 $rateinput 			= price2num(GETPOST('rateinput', 'alpha'));
 $optioncss 			= GETPOST('optioncss', 'alpha');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield 			= GETPOST("sortfield", 'alpha');
-$sortorder 			= GETPOST("sortorder", 'alpha');
+$sortfield 			= GETPOST('sortfield', 'aZ09comma');
+$sortorder 			= GETPOST('sortorder', 'aZ09comma');
 $page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
 
 if (empty($page) || $page == -1) {
@@ -229,7 +229,7 @@ if (empty($reshook)) {
  * View
  */
 
-$htmlother = new FormOther($db);
+$form = new Form($db);
 
 $title = $langs->trans("CurrencyRate");
 $page_name = "MultiCurrencySetup";
@@ -247,12 +247,6 @@ print dol_get_fiche_head($head, 'ratelist', $langs->trans("ModuleSetup"), -1, "m
 // ACTION
 
 if (!in_array($action, array("updateRate", "deleteRate"))) {
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("FormCreateRate").'</td>'."\n";
-	print '</tr></table>';
-
-	$form = new Form($db);
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 
@@ -410,8 +404,8 @@ if ($resql) {
 		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 	}
 
-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable centpercent liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="tagtable centpercent nomarginbottom liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Lines with input filters
 	print '<tr class="liste_titre_filter">';
@@ -526,8 +520,8 @@ if ($resql) {
 				if (in_array($obj->rowid, $arrayofselected)) {
 					$selected = 1;
 				}
-				print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&amp;id_rate='.$obj->rowid.'">'.img_picto('edit', 'edit').'</a>';
-				print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&amp;id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
+				print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=updateRate&token='.newToken().'&id_rate='.$obj->rowid.'">'.img_picto('edit', 'edit').'</a>';
+				print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=deleteRate&token='.newToken().'&id_rate='.$obj->rowid.'">'.img_picto('delete', 'delete').'</a>';
 				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
 			print '</td>';
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 40e9d14adca..773571b7b1c 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -156,14 +156,16 @@ if (empty($reshook)) {
 	}
 
 	// Delete comment
-	$idcomment = GETPOST('deletecomment', 'int');
-	if ($idcomment) {
-		// Security check
-		if (!$user->rights->opensurvey->write) {
-			accessforbidden();
-		}
+	if ($action == 'deletecomment') {
+		$idcomment = GETPOST('idcomment', 'int');
+		if ($idcomment > 0) {
+			// Security check
+			if (!$user->rights->opensurvey->write) {
+				accessforbidden();
+			}
 
-		$resql = $object->deleteComment($idcomment);
+			$resql = $object->deleteComment($idcomment);
+		}
 	}
 
 	if ($action == 'edit') {
@@ -220,20 +222,21 @@ dol_banner_tab($object, 'id', $linkback, 1, 'id_sondage', 'id_sondage', $morehtm
 
 
 print '<div class="fichecenter">';
-print '<div class="underbanner clearboth"></div>';
 
+print '<div class="fichehalfleft">';
+print '<div class="underbanner clearboth"></div>';
 print '<table class="border tableforfield centpercent">';
 
 // Type
 $type = ($object->format == "A") ? 'classic' : 'date';
-print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td colspan="2">';
+print '<tr><td class="titlefieldmax45">'.$langs->trans("Type").'</td><td>';
 print img_picto('', dol_buildpath('/opensurvey/img/'.($type == 'classic' ? 'chart-32.png' : 'calendar-32.png'), 1), 'width="16"', 1);
 print ' '.$langs->trans($type == 'classic' ? "TypeClassic" : "TypeDate").'</td></tr>';
 
 // Title
 print '<tr><td>';
 $adresseadmin = $object->mail_admin;
-print $langs->trans("Title").'</td><td colspan="2">';
+print $langs->trans("Title").'</td><td>';
 if ($action == 'edit') {
 	print '<input type="text" name="nouveautitre" style="width: 95%" value="'.dol_escape_htmltag(dol_htmlentities($object->title)).'">';
 } else {
@@ -242,7 +245,7 @@ if ($action == 'edit') {
 print '</td></tr>';
 
 // Description
-print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="2">';
+print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
 if ($action == 'edit') {
 	$doleditor = new DolEditor('nouveauxcommentaires', $object->description, '', 120, 'dolibarr_notes', 'In', 1, 1, 1, ROWS_7, '90%');
 	$doleditor->Create(0, '');
@@ -252,7 +255,7 @@ if ($action == 'edit') {
 print '</td></tr>';
 
 // Receive an email with each vote
-print '<tr><td>'.$langs->trans('ToReceiveEMailForEachVote').'</td><td colspan="2">';
+print '<tr><td>'.$langs->trans('ToReceiveEMailForEachVote').'</td><td>';
 if ($action == 'edit') {
 	print '<input type="checkbox" name="mailsonde" '.($object->mailsonde ? 'checked="checked"' : '').'">';
 } else {
@@ -268,7 +271,7 @@ if ($action == 'edit') {
 print '</td></tr>';
 
 // Users can comment
-print '<tr><td>'.$langs->trans('CanComment').'</td><td colspan="2">';
+print '<tr><td>'.$langs->trans('CanComment').'</td><td>';
 if ($action == 'edit') {
 	print '<input type="checkbox" name="cancomment" '.($object->allow_comments ? 'checked="checked"' : '').'">';
 } else {
@@ -277,7 +280,7 @@ if ($action == 'edit') {
 print '</td></tr>';
 
 // Users can see others vote
-print '<tr><td>'.$langs->trans('CanSeeOthersVote').'</td><td colspan="2">';
+print '<tr><td>'.$langs->trans('CanSeeOthersVote').'</td><td>';
 if ($action == 'edit') {
 	print '<input type="checkbox" name="canseeothersvote" '.($object->allow_spy ? 'checked="checked"' : '').'">';
 } else {
@@ -285,8 +288,16 @@ if ($action == 'edit') {
 }
 print '</td></tr>';
 
+print '</table>';
+
+print '</div>';
+print '<div class="fichehalfright">';
+print '<div class="underbanner clearboth"></div>';
+
+print '<table class="border tableforfield centpercent">';
+
 // Expire date
-print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">';
+print '<tr><td>'.$langs->trans('ExpireDate').'</td><td>';
 if ($action == 'edit') {
 	print $form->selectDate($expiredate ? $expiredate : $object->date_fin, 'expire', 0, 0, 0, '', 1, 0);
 } else {
@@ -299,20 +310,20 @@ print '</td></tr>';
 
 // Author
 print '<tr><td>';
-print $langs->trans("Author").'</td><td colspan="2">';
+print $langs->trans("Author").'</td><td>';
 if ($object->fk_user_creat > 0) {
 	print $userstatic->getLoginUrl(1);
 } else {
 	if ($action == 'edit') {
 		print '<input type="text" name="nouvelleadresse" class="minwith200" value="'.$object->mail_admin.'">';
 	} else {
-		print dol_print_email($object->mail_admin, 0, 0, 1);
+		print dol_print_email($object->mail_admin, 0, 0, 1, 0, 1, 1);
 	}
 }
 print '</td></tr>';
 
 // Link
-print '<tr><td>'.img_picto('', 'globe').' '.$langs->trans("UrlForSurvey", '').'</td><td colspan="2">';
+print '<tr><td>'.$langs->trans("UrlForSurvey", '').'</td><td>';
 
 // Define $urlwithroot
 $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -320,25 +331,23 @@ $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
 
 $url = $urlwithroot.'/public/opensurvey/studs.php?sondage='.$object->id_sondage;
-print '<input type="text" style="width: 60%" '.($action == 'edit' ? 'disabled' : '').' id="opensurveyurl" name="opensurveyurl" value="'.$url.'">';
+print '<input type="text" class="quatrevingtpercent" '.($action == 'edit' ? 'disabled' : '').' id="opensurveyurl" name="opensurveyurl" value="'.$url.'">';
 if ($action != 'edit') {
-	print ajax_autoselect("opensurveyurl", $url);
+	print ajax_autoselect("opensurveyurl", $url, 'image');
 }
 
 print '</td></tr>';
 
 print '</table>';
+print '</div>';
 
 print '</div>';
+print '<div class="clearboth"></div>';
 
 print dol_get_fiche_end();
 
 if ($action == 'edit') {
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" name="save" 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 '</div>';
+	print $form->buttonsSaveCancel();
 }
 
 print '</form>'."\n";
@@ -352,32 +361,35 @@ print '<div class="tabsAction">';
 
 if ($action != 'edit' && $user->rights->opensurvey->write) {
 	//Modify button
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$numsondage.'">'.$langs->trans("Modify").'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.urlencode($numsondage).'">'.$langs->trans("Modify").'</a>';
 
 	if ($object->status == Opensurveysondage::STATUS_VALIDATED) {
 		//Close button
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=close&id='.$numsondage.'">'.$langs->trans("Close").'</a>';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=close&token='.newToken().'&id='.urlencode($numsondage).'">'.$langs->trans("Close").'</a>';
 	}
 	if ($object->status == Opensurveysondage::STATUS_CLOSED) {
 		//Opened button
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=reopen&id='.$numsondage.'">'.$langs->trans("ReOpen").'</a>';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=reopen&token='.newToken().'&id='.urlencode($numsondage).'">'.$langs->trans("ReOpen").'</a>';
 	}
 
 	//Delete button
-	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?suppressionsondage=1&id='.$numsondage.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
+	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?suppressionsondage=1&action=delete&token='.newToken().'&id='.urlencode($numsondage).'">'.$langs->trans('Delete').'</a>';
 }
 
 print '</div>';
 
 if ($action == 'delete') {
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?&id='.$numsondage, $langs->trans("RemovePoll"), $langs->trans("ConfirmRemovalOfPoll", $id), 'delete_confirm', '', '', 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?&id='.urlencode($numsondage), $langs->trans("RemovePoll"), $langs->trans("ConfirmRemovalOfPoll", $id), 'delete_confirm', '', '', 1);
 }
 
 
 
 
-print '<form name="formulaire5" action="#" method="POST">'."\n";
+print '<form name="formulaire5" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="addcomment">';
+print '<input type="hidden" name="id" value="'.urlencode($numsondage).'">';
+print '<input type="hidden" name="page_y" value="">';
 
 print load_fiche_titre($langs->trans("CommentsOfVoters"), '', '');
 
@@ -387,7 +399,7 @@ $comments = $object->getComments();
 if ($comments) {
 	foreach ($comments as $comment) {
 		if ($user->rights->opensurvey->write) {
-			print '<a href="'.dol_buildpath('/opensurvey/card.php', 1).'?deletecomment='.$comment->id_comment.'&id='.$numsondage.'"> '.img_picto('', 'delete.png', '', false, 0, 0, '', '', 0).'</a> ';
+			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> ';
 		}
 
 		print dol_htmlentities($comment->usercomment).': '.dol_nl2br(dol_htmlentities($comment->comment))." <br>";
@@ -403,10 +415,7 @@ 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 '<input type="submit" class="button" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";
-	if (isset($erreur_commentaire_vide) && $erreur_commentaire_vide == "yes") {
-		print "<font color=#FF0000>".$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name"))."</font>";
-	}
+	print '<input type="submit" class="button reposition" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";
 }
 
 print '</form>';
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index e35abff84bb..5888ddf3ec8 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -652,12 +652,12 @@ class Opensurveysondage extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Opened');
-			$this->labelStatus[self::STATUS_CLOSED] = $langs->trans('Closed');
-			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Opened');
-			$this->labelStatusShort[self::STATUS_CLOSED] = $langs->trans('Closed');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Opened');
+			$this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Opened');
+			$this->labelStatusShort[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Closed');
 		}
 
 		$statusType = 'status'.$status;
diff --git a/htdocs/opensurvey/css/style.css b/htdocs/opensurvey/css/style.css
index 409b64dddf5..e7f0d279a14 100644
--- a/htdocs/opensurvey/css/style.css
+++ b/htdocs/opensurvey/css/style.css
@@ -342,6 +342,13 @@ div.cadre table.resultats {
 td.nom {
 	min-width: 160px;
 }
+@media only screen and (max-width: 767px)
+{
+	td.nom {
+		min-width: 100px;
+	}
+}
+
 td.vide {
 	min-width: 60px;
 }
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index 3d8d76c5c1e..f844921720b 100644
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -206,7 +206,7 @@ function getUrlSondage($id, $admin = false)
 /**
  * 	Generate a random id
  *
- *	@param	string	$car	Char to generate key
+ *	@param	int		$car	Length of string to generate key
  * 	@return	string
  */
 function dol_survey_random($car)
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 3dc42def482..b05abe3fd40 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -107,7 +107,8 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 
 $permissiontoread = $user->rights->opensurvey->read;
 $permissiontoadd = $user->rights->opensurvey->write;
-$permissiontodelete = $user->rights->opensurvey->delete;
+// permission delete doesn't exists
+$permissiontodelete = $user->rights->opensurvey->write;
 
 
 /*
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index ff5198c006a..e37f9bf3de5 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -455,20 +455,21 @@ dol_banner_tab($object, 'id', $linkback, 1, 'id_sondage', 'id_sondage', $morehtm
 
 
 print '<div class="fichecenter">';
-print '<div class="underbanner clearboth"></div>';
 
+print '<div class="fichehalfleft">';
+print '<div class="underbanner clearboth"></div>';
 print '<table class="border tableforfield centpercent">';
 
 // Type
 $type = ($object->format == "A") ? 'classic' : 'date';
-print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td colspan="2">';
+print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td>';
 print img_picto('', dol_buildpath('/opensurvey/img/'.($type == 'classic' ? 'chart-32.png' : 'calendar-32.png'), 1), 'width="16"', 1);
 print ' '.$langs->trans($type == 'classic' ? "TypeClassic" : "TypeDate").'</td></tr>';
 
 // Title
 print '<tr><td>';
 $adresseadmin = $object->mail_admin;
-print $langs->trans("Title").'</td><td colspan="2">';
+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)).'">';
 } else {
@@ -476,8 +477,39 @@ if ($action == 'edit') {
 }
 print '</td></tr>';
 
+// Description
+print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
+if ($action == 'edit') {
+	$doleditor = new DolEditor('nouveauxcommentaires', $object->description, '', 120, 'dolibarr_notes', 'In', 1, 1, 1, ROWS_7, '90%');
+	$doleditor->Create(0, '');
+} else {
+	print (dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true));
+}
+print '</td></tr>';
+
+// EMail
+//If linked user, then emails are going to be sent to users' email
+if (!$object->fk_user_creat) {
+	print '<tr><td>'.$langs->trans("EMail").'</td><td>';
+	if ($action == 'edit') {
+		print '<input type="text" name="nouvelleadresse" class="minwith200" value="'.$object->mail_admin.'">';
+	} else {
+		print dol_print_email($object->mail_admin, 0, 0, 1, 0, 1, 1);
+	}
+	print '</td></tr>';
+}
+
+print '</table>';
+
+print '</div>';
+print '<div class="fichehalfright">';
+print '<div class="underbanner clearboth"></div>';
+
+print '<table class="border tableforfield centpercent">';
+
+
 // Expire date
-print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">';
+print '<tr><td>'.$langs->trans('ExpireDate').'</td><td>';
 if ($action == 'edit') {
 	print $form->selectDate($expiredate ? $expiredate : $object->date_fin, 'expire', 0, 0, 0, '', 1, 0);
 } else {
@@ -490,7 +522,7 @@ print '</td></tr>';
 
 // Author
 print '<tr><td>';
-print $langs->trans("Author").'</td><td colspan="2">';
+print $langs->trans("Author").'</td><td>';
 if ($object->fk_user_creat) {
 	print $userstatic->getLoginUrl(1);
 } else {
@@ -499,7 +531,7 @@ if ($object->fk_user_creat) {
 print '</td></tr>';
 
 // Link
-print '<tr><td>'.img_picto('', 'globe').' '.$langs->trans("UrlForSurvey", '').'</td><td colspan="2">';
+print '<tr><td>'.$langs->trans("UrlForSurvey", '').'</td><td>';
 
 // Define $urlwithroot
 $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -507,22 +539,19 @@ $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
 
 $url = $urlwithouturlroot.dol_buildpath('/public/opensurvey/studs.php', 1).'?sondage='.$object->id_sondage;
-$urllink = '<input type="text" style="width: 60%" '.($action == 'edit' ? 'disabled' : '').' id="opensurveyurl" name="opensurveyurl" value="'.$url.'">';
+$urllink = '<input type="text" class="quatrevingtpercent" '.($action == 'edit' ? 'disabled' : '').' id="opensurveyurl" name="opensurveyurl" value="'.$url.'">';
 print $urllink;
 if ($action != 'edit') {
-	print '<script type="text/javascript">
-               jQuery(document).ready(function () {
-				    jQuery("#opensurveyurl").click(function() { jQuery(this).select(); } );
-				});
-		    </script>';
-	print ' <a href="'.$url.'" target="_blank">'.$langs->trans("Link").'</a>';
+	print ajax_autoselect("opensurveyurl", $url, 'image');
 }
 
 print '</td></tr>';
 
 print '</table>';
+print '</div>';
 
 print '</div>';
+print '<div class="clearboth"></div>';
 
 print dol_get_fiche_end();
 
@@ -635,7 +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 '<div class="cadre"> '."\n";
+print '<div class="cadre div-table-responsive-no-min"> '."\n";
 
 // Start to show survey result
 print '<table class="resultats">'."\n";
@@ -1007,7 +1036,7 @@ if (empty($testligneamodifier)) {
 	print '<tr>'."\n";
 	print '<td></td>'."\n";
 	print '<td class="nom">'."\n";
-	print '<input type="text" placeholder="'.dol_escape_htmltag($langs->trans("Name")).'" name="nom" maxlength="64">'."\n";
+	print '<input type="text" class="maxwidthonsmartphone" placeholder="'.dol_escape_htmltag($langs->trans("Name")).'" name="nom" maxlength="64">'."\n";
 	print '</td>'."\n";
 
 	for ($i = 0; $i < $nbcolonnes; $i++) {
diff --git a/htdocs/partnership/admin/website.php b/htdocs/partnership/admin/website.php
new file mode 100644
index 00000000000..5fb48248280
--- /dev/null
+++ b/htdocs/partnership/admin/website.php
@@ -0,0 +1,258 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/partnership/admin/website.php
+ *		\ingroup    partnership
+ *		\brief      File of main public page for partnership module
+ */
+
+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/member.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("admin", "partnership"));
+
+$action = GETPOST('action', 'aZ09');
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+$error = 0;
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'setPARTNERSHIP_ENABLE_PUBLIC') {
+	if (GETPOST('value')) {
+		dolibarr_set_const($db, 'PARTNERSHIP_ENABLE_PUBLIC', 1, 'chaine', 0, '', $conf->entity);
+	} else {
+		dolibarr_set_const($db, 'PARTNERSHIP_ENABLE_PUBLIC', 0, 'chaine', 0, '', $conf->entity);
+	}
+}
+
+if ($action == 'update') {
+	$public = GETPOST('PARTNERSHIP_ENABLE_PUBLIC');
+
+	$res = dolibarr_set_const($db, "PARTNERSHIP_ENABLE_PUBLIC", $public, 'chaine', 0, '', $conf->entity);
+
+	if (!($res > 0)) {
+		$error++;
+	}
+
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+//$help_url = 'EN:Module_Partnership|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';
+llxHeader('', $langs->trans("PartnershipsSetup"), $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');
+
+$head = partnershipAdminPrepareHead();
+
+
+
+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');
+
+if ($conf->use_javascript_ajax) {
+	print "\n".'<script type="text/javascript" language="javascript">';
+	print 'jQuery(document).ready(function () {
+                function initemail()
+                {
+                    if (jQuery("#PARTNERSHIP_NEWFORM_PAYONLINE").val()==\'-1\')
+                    {
+                        jQuery("#tremail").hide();
+					}
+					else
+					{
+                        jQuery("#tremail").show();
+					}
+				}
+                function initfields()
+                {
+					if (jQuery("#PARTNERSHIP_ENABLE_PUBLIC").val()==\'0\')
+                    {
+                        jQuery("#trforcetype, #tramount, #tredit, #trpayment, #tremail").hide();
+                    }
+                    if (jQuery("#PARTNERSHIP_ENABLE_PUBLIC").val()==\'1\')
+                    {
+                        jQuery("#trforcetype, #tramount, #tredit, #trpayment").show();
+                        if (jQuery("#PARTNERSHIP_NEWFORM_PAYONLINE").val()==\'-1\') jQuery("#tremail").hide();
+                        else jQuery("#tremail").show();
+					}
+				}
+				initfields();
+                jQuery("#PARTNERSHIP_ENABLE_PUBLIC").change(function() { initfields(); });
+                jQuery("#PARTNERSHIP_NEWFORM_PAYONLINE").change(function() { initemail(); });
+			})';
+	print '</script>'."\n";
+}
+
+
+print '<span class="opacitymedium">'.$langs->trans("BlankSubscriptionFormDesc").'</span><br><br>';
+
+$param = '';
+
+$enabledisablehtml = $langs->trans("EnablePublicSubscriptionForm").' ';
+if (empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
+	// Button off, click to enable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setPARTNERSHIP_ENABLE_PUBLIC&token='.newToken().'&value=1'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
+	$enabledisablehtml .= '</a>';
+} else {
+	// Button on, click to disable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setPARTNERSHIP_ENABLE_PUBLIC&token='.newToken().'&value=0'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
+	$enabledisablehtml .= '</a>';
+}
+print $enabledisablehtml;
+print '<input type="hidden" id="PARTNERSHIP_ENABLE_PUBLIC" name="PARTNERSHIP_ENABLE_PUBLIC" value="'.(empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC) ? 0 : 1).'">';
+
+
+print '<br>';
+
+if (!empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
+	print '<br>';
+
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Parameter").'</td>';
+	print '<td 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");
+	print '</td><td class="right">';
+	print '<input type="text" class="right width75" id="PARTNERSHIP_NEWFORM_AMOUNT" name="PARTNERSHIP_NEWFORM_AMOUNT" value="'.(!empty($conf->global->PARTNERSHIP_NEWFORM_AMOUNT) ? $conf->global->PARTNERSHIP_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("PARTNERSHIP_NEWFORM_EDITAMOUNT", (!empty($conf->global->PARTNERSHIP_NEWFORM_EDITAMOUNT) ? $conf->global->PARTNERSHIP_NEWFORM_EDITAMOUNT : 0), 1);
+	print "</td></tr>\n";
+
+	// Jump to an online payment page
+	print '<tr class="oddeven" id="trpayment"><td>';
+	print $langs->trans("PARTNERSHIP_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("PARTNERSHIP_NEWFORM_PAYONLINE", $listofval, (!empty($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE) ? $conf->global->PARTNERSHIP_NEWFORM_PAYONLINE : ''), 0);
+	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();
+
+print '</form>';
+
+
+if (!empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
+	print '<br>';
+	//print $langs->trans('FollowingLinksArePublic').'<br>';
+	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 = '';
+	}
+
+	// Define $urlwithroot
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+	print '<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 '</div>';
+	print ajax_autoselect('publicurlmember');
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 11286c12d3d..39cf2da2b2f 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
+/* Copyright (C) 2017 Laurent Destailleur <eldy@users.sourceforge.net>
+ * 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
@@ -27,6 +27,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 for Partnership
  */
@@ -66,7 +67,7 @@ class Partnership extends CommonObject
 
 	const STATUS_DRAFT = 0;
 	const STATUS_VALIDATED = 1;		// Validate (no more draft)
-	const STATUS_ACCEPTED = 2;		// Approved
+	const STATUS_APPROVED = 2;		// Approved
 	const STATUS_REFUSED = 3;		// Refused
 	const STATUS_CANCELED = 9;
 
@@ -105,7 +106,7 @@ class Partnership 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'=>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/partnershiptype.class.php', 'label' => 'Type', 'default' => 1, 'enabled' => 1, 'visible' => 1, 'position' => 20),
+		'fk_type' => array('type' => 'integer:PartnershipType:partnership/class/partnership_type.class.php', 'label' => 'Type', 'notnull'=>1, 'enabled' => 1, 'visible' => 1, 'position' => 20),
 		'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,),
@@ -131,14 +132,14 @@ class Partnership extends CommonObject
 	 */
 	public $rowid;
 
-	public $fk_soc;
+	public $fk_soc;			// Link to thirdparty
+	public $fk_member;		// Link to member
 
 	public $tms;
 	public $fk_user_creat;
 	public $fk_user_modif;
 
 	public $status;
-	public $fk_member;
 	public $date_partnership_start;
 	public $date_partnership_end;
 	public $count_last_url_check_error;
@@ -244,6 +245,11 @@ class Partnership extends CommonObject
 	 */
 	public function create(User $user, $notrigger = false)
 	{
+		if ($this->fk_soc <= 0 && $this->fk_member <= 0) {
+			$this->error[] = "ErrorThirpdartyOrMemberidIsManadatory";
+			return -1;
+		}
+
 		$this->status = 0;
 		return $this->createCommon($user, $notrigger);
 	}
@@ -366,14 +372,15 @@ class Partnership extends CommonObject
 			return -1;
 		}
 
-		$sql = 'SELECT p.rowid, p.ref, p.fk_soc, p.fk_member, p.status';
+		$sql = 'SELECT p.rowid, p.ref, p.fk_type, p.fk_soc, p.fk_member, p.status';
 		$sql .= ', p.entity, p.date_partnership_start, p.date_partnership_end, p.date_creation';
 		$sql .= ', p.fk_user_creat, p.tms, p.fk_user_modif, p.fk_user_modif';
 		$sql .= ', p.note_private, p.note_public';
 		$sql .= ', p.last_main_doc, p.count_last_url_check_error, p.last_check_backlink, p.reason_decline_or_cancel';
 		$sql .= ', p.import_key, p.model_pdf';
-
+		$sql .= ', pt.code as type_code, pt.label as type_label';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'partnership as p';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_partnership_type as pt ON p.fk_type = pt.rowid';
 
 		if ($id) {
 			$sql .= " WHERE p.rowid=".((int) $id);
@@ -400,8 +407,12 @@ class Partnership extends CommonObject
 			if ($obj) {
 				$this->id 							= $obj->rowid;
 				$this->entity 						= $obj->entity;
-				$this->rowid 						= $obj->rowid;
 				$this->ref 							= $obj->ref;
+
+				$this->fk_type						= $obj->fk_type;
+				$this->type_code					= $obj->type_code;
+				$this->type_label					= $obj->type_label;
+
 				$this->fk_soc 						= $obj->fk_soc;
 				$this->fk_member 					= $obj->fk_member;
 				$this->status 						= $obj->status;
@@ -484,27 +495,27 @@ class Partnership extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$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)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -541,6 +552,11 @@ class Partnership extends CommonObject
 	 */
 	public function update(User $user, $notrigger = false)
 	{
+		if ($this->fk_soc <= 0 && $this->fk_member <= 0) {
+			$this->error[] = "ErrorThirpdartyOrMemberidIsManadatory";
+			return -1;
+		}
+
 		return $this->updateCommon($user, $notrigger);
 	}
 
@@ -628,7 +644,7 @@ class Partnership extends CommonObject
 			if (!empty($this->fields['fk_user_valid'])) {
 				$sql .= ", fk_user_valid = ".$user->id;
 			}
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -701,13 +717,13 @@ class Partnership extends CommonObject
 	}
 
 	/**
-	 *	Accept object
+	 *	Approve 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 accept($user, $notrigger = 0)
+	public function approve($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
@@ -716,7 +732,7 @@ class Partnership extends CommonObject
 		$error = 0;
 
 		// Protection
-		if ($this->status == self::STATUS_ACCEPTED) {
+		if ($this->status == self::STATUS_APPROVED) {
 			dol_syslog(get_class($this)."::accept action abandonned: already acceptd", LOG_WARNING);
 			return 0;
 		}
@@ -745,14 +761,14 @@ class Partnership extends CommonObject
 			// Accept
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET ref = '".$this->db->escape($num)."',";
-			$sql .= " status = ".self::STATUS_ACCEPTED;
+			$sql .= " status = ".self::STATUS_APPROVED;
 			// if (!empty($this->fields['date_validation'])) {
 			// 	$sql .= ", date_validation = '".$this->db->idate($now)."'";
 			// }
 			// if (!empty($this->fields['fk_user_valid'])) {
 			// 	$sql .= ", fk_user_valid = ".$user->id;
 			// }
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::accept()", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -812,7 +828,7 @@ class Partnership extends CommonObject
 		// Set new ref and current status
 		if (!$error) {
 			$this->ref = $num;
-			$this->status = self::STATUS_ACCEPTED;
+			$this->status = self::STATUS_APPROVED;
 		}
 
 		if (!$error) {
@@ -887,7 +903,7 @@ class Partnership extends CommonObject
 	public function cancel($user, $notrigger = 0)
 	{
 		// Protection
-		if ($this->status != self::STATUS_ACCEPTED) {
+		if ($this->status != self::STATUS_APPROVED) {
 			return 0;
 		}
 
@@ -922,7 +938,7 @@ class Partnership extends CommonObject
 		 return -1;
 		 }*/
 
-		return $this->setStatusCommon($user, self::STATUS_ACCEPTED, $notrigger, 'PARTNERSHIP_REOPEN');
+		return $this->setStatusCommon($user, self::STATUS_APPROVED, $notrigger, 'PARTNERSHIP_REOPEN');
 	}
 
 	/**
@@ -952,7 +968,7 @@ class Partnership extends CommonObject
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-		$url = dol_buildpath('/partnership/partnership_card.php', 1).'?id='.$this->id;
+		$url = DOL_URL_ROOT.'/partnership/partnership_card.php?id='.$this->id;
 
 		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
@@ -1065,20 +1081,20 @@ class Partnership extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("partnership");
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated');
-			$this->labelStatus[self::STATUS_ACCEPTED] = $langs->trans('Accepted');
-			$this->labelStatus[self::STATUS_REFUSED] = $langs->trans('Refused');
-			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
-			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated');
-			$this->labelStatusShort[self::STATUS_ACCEPTED] = $langs->trans('Accepted');
-			$this->labelStatusShort[self::STATUS_REFUSED] = $langs->trans('Refused');
-			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$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->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');
 		}
 
 		$statusType = 'status'.$status;
-		if ($status == self::STATUS_ACCEPTED) {
+		if ($status == self::STATUS_APPROVED) {
 			$statusType = 'status4';
 		}
 		if ($status == self::STATUS_REFUSED) {
diff --git a/htdocs/partnership/class/partnership_type.class.php b/htdocs/partnership/class/partnership_type.class.php
new file mode 100644
index 00000000000..6916d95e4f3
--- /dev/null
+++ b/htdocs/partnership/class/partnership_type.class.php
@@ -0,0 +1,562 @@
+<?php
+/* Copyright (C) 2002		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2008	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2017	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2016		Charlie Benke			<charlie@patas-monkey.com>
+ * Copyright (C) 2018-2019  Thibault Foucart		<support@ptibogxiv.net>
+ * Copyright (C) 2021     	Waël Almoman            <info@almoman.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/partnership/class/partnership_type.class.php
+ *	\ingroup    partnership
+ *	\brief      File of class to manage partnership types
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+
+
+/**
+ *	Class to manage partnership type
+ */
+class PartnershipType extends CommonObject
+{
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'c_partnership_type';
+
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'partnership_type';
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'generic';
+
+	/**
+	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 * @var int
+	 */
+	public $ismultientitymanaged = 1;
+
+	/**
+	 * @var string Partnership code
+	 */
+	public $code;
+
+	/**
+	 * @var string Partnership type label
+	 */
+	public $label;
+
+
+	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),
+		'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),
+	);
+
+
+
+	/**
+	 * 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->mymodule->myobject->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);
+
+		//$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;
+	}
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 *	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->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_DRAFT, $notrigger, 'PARTNERSHIPTYPE_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->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_CANCELED, $notrigger, 'PARTNERSHIPTYPE_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->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_VALIDATED, $notrigger, 'PARTNERSHIPTYPE_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("PartnershipType").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Code').':</b> '.$this->code;
+		$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
+
+		//$url = dol_buildpath('/partnership/partnership_card.php', 1).'?id='.$this->id;
+		$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 ($url && $add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
+		}
+
+		$linkclose = '';
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
+
+		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('myobjectdao'));
+		$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("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;
+		//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;
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+
+				if ($obj->fk_user_valid) {
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
+
+				if ($obj->fk_user_cloture) {
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		// Set here init that are not commonf fields
+		// $this->property1 = ...
+		// $this->property2 = ...
+
+		$this->initAsSpecimenCommon();
+	}
+}
diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index 0588b9e5df2..35b8a3b01e5 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -101,7 +101,7 @@ class PartnershipUtils
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_type as dty on (dty.rowid = d.fk_adherent_type)";
 		$sql .= " WHERE fk_member > 0";
 		$sql .= " AND (d.datefin < '".$this->db->idate($datetotest)."' AND dty.subscription = 1)";
-		$sql .= " AND p.status = ".((int) $partnership::STATUS_ACCEPTED); // Only accepted not yet canceled
+		$sql .= " AND p.status = ".((int) $partnership::STATUS_APPROVED); // Only accepted not yet canceled
 		$sql .= $this->db->order('d.rowid', 'ASC');
 		// Limit is managed into loop later
 
@@ -262,7 +262,7 @@ class PartnershipUtils
 
 		$sql .= " WHERE 1 = 1";
 		$sql .= " AND p.".$fk_partner." > 0";
-		$sql .= " AND p.status = ".((int) $partnership::STATUS_ACCEPTED); // Only accepted not yet canceled
+		$sql .= " AND p.status = ".((int) $partnership::STATUS_APPROVED); // Only accepted not yet canceled
 		$sql .= " AND (p.last_check_backlink IS NULL OR p.last_check_backlink <= '".$this->db->idate($now - 7 * 24 * 3600)."')"; // Every week, check that website contains a link to dolibarr.
 		$sql .= $this->db->order('p.rowid', 'ASC');
 		// Limit is managed into loop later
diff --git a/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php b/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php
index a536bb59600..5d348843941 100644
--- a/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php
+++ b/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php
@@ -81,7 +81,7 @@ class mod_partnership_advanced extends ModeleNumRefPartnership
 		$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="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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
diff --git a/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php b/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php
index fefcafa2350..d5a2bb326b2 100644
--- a/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php
+++ b/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php
@@ -36,7 +36,7 @@ class mod_partnership_standard extends ModeleNumRefPartnership
 	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $prefix = 'PARTNERSHIP';
+	public $prefix = 'PSHIP';
 
 	/**
 	 * @var string Error code (or message)
diff --git a/htdocs/partnership/lib/partnership.lib.php b/htdocs/partnership/lib/partnership.lib.php
index 5305f86132e..cfc54ce3134 100644
--- a/htdocs/partnership/lib/partnership.lib.php
+++ b/htdocs/partnership/lib/partnership.lib.php
@@ -46,6 +46,11 @@ function partnershipAdminPrepareHead()
 	$head[$h][2] = 'partnership_extrafields';
 	$h++;
 
+	$head[$h][0] = dol_buildpath("/partnership/admin/website.php", 1);
+	$head[$h][1] = $langs->trans("BlankSubscriptionForm");
+	$head[$h][2] = 'website';
+	$h++;
+
 	/*
 	$head[$h][0] = dol_buildpath("/partnership/admin/about.php", 1);
 	$head[$h][1] = $langs->trans("About");
@@ -116,10 +121,10 @@ function partnershipPrepareHead($object)
 	$head[$h][2] = 'document';
 	$h++;
 
-	// $head[$h][0] = dol_buildpath("/partnership/partnership_agenda.php", 1).'?id='.$object->id;
-	// $head[$h][1] = $langs->trans("Events");
-	// $head[$h][2] = 'agenda';
-	// $h++;
+	$head[$h][0] = dol_buildpath("/partnership/partnership_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/partnership/partnership_agenda.php b/htdocs/partnership/partnership_agenda.php
index 799aadd24cd..4c68a83d4e2 100644
--- a/htdocs/partnership/partnership_agenda.php
+++ b/htdocs/partnership/partnership_agenda.php
@@ -53,8 +53,8 @@ if (GETPOST('actioncode', 'array')) {
 $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');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -154,7 +154,7 @@ if ($object->id > 0) {
 		$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.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			}
 			$morehtmlref.=' : ';
 			if ($action == 'classify') {
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index e0fa5b90f4c..6afb9c88912 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -153,7 +153,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'confirm_accept' && $confirm == 'yes' && $permissiontoadd) {
-		$result = $object->accept($user);
+		$result = $object->approve($user);
 		if ($result >= 0) {
 			// Define output language
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -232,7 +232,7 @@ if (empty($reshook)) {
 	// Actions to send emails
 	$triggersendname = 'PARTNERSHIP_SENTBYMAIL';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_PARTNERSHIP_TO';
-	$trackid = 'partnership'.$object->id;
+	$trackid = 'pship'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 	if (!empty($id) && !empty(GETPOST('confirm'))) {
@@ -288,11 +288,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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 $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 
@@ -328,9 +324,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	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->buttonsSaveCancel();
 
 	print '</form>';
 }
@@ -418,7 +412,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
 	 if ($permissiontoadd) {
-	 //if ($action != 'classify') $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
+	 //if ($action != 'classify') $morehtmlref.='<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);
@@ -562,7 +556,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (empty($reshook)) {
 			// Send
 			if (empty($user->socid)) {
-				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init&token='.newToken().'#formmailbeforetitle');
+				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle');
 			}
 
 			if ($object->status == $object::STATUS_DRAFT) {
@@ -596,9 +590,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Cancel
 			if ($permissiontoadd) {
-				if ($object->status == $object::STATUS_ACCEPTED) {
+				if ($object->status == $object::STATUS_APPROVED) {
 					print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontoadd);
-				} elseif ($object->status > $object::STATUS_ACCEPTED) {
+				} 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);
 				}
@@ -606,7 +600,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Refuse
 			if ($permissiontoadd) {
-				if ($object->status != $object::STATUS_DRAFT && $object->status != $object::STATUS_ACCEPTED && $object->status != $object::STATUS_CANCELED && $object->status != $object::STATUS_REFUSED) {
+				if ($object->status != $object::STATUS_DRAFT && $object->status != $object::STATUS_APPROVED && $object->status != $object::STATUS_CANCELED && $object->status != $object::STATUS_REFUSED) {
 					print dolGetButtonAction($langs->trans('Refuse'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=refuse&token='.newToken(), '', $permissiontoadd);
 				}
 			}
@@ -645,20 +639,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		$MAXEVENT = 10;
 
-		$morehtmlright = '<a href="'.dol_buildpath('/partnership/partnership_agenda.php', 1).'?id='.$object->id.'">';
-		$morehtmlright .= $langs->trans("SeeAll");
-		$morehtmlright .= '</a>';
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt 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';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
+		$somethingshown = $formactions->showactions($object, $object->element, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 	//Select mail models is same action as presend
@@ -670,7 +662,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$modelmail = 'partnership_send';
 	$defaulttopic = 'InformationMessage';
 	$diroutput = $conf->partnership->dir_output;
-	$trackid = 'partnership'.$object->id;
+	$trackid = 'pship'.$object->id;
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
diff --git a/htdocs/partnership/partnership_contact.php b/htdocs/partnership/partnership_contact.php
index 1c416cf690c..a4a61c6e907 100644
--- a/htdocs/partnership/partnership_contact.php
+++ b/htdocs/partnership/partnership_contact.php
@@ -140,7 +140,7 @@ if ($object->id) {
 	 if ($permissiontoadd)
 	 {
 	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/partnership/partnership_document.php b/htdocs/partnership/partnership_document.php
index e7fae7ee7ff..f96eb6e58ec 100644
--- a/htdocs/partnership/partnership_document.php
+++ b/htdocs/partnership/partnership_document.php
@@ -43,8 +43,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -137,7 +137,7 @@ if ($object->id) {
 	 if ($permissiontoadd)
 	 {
 	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index e36e94d39c7..2703d431e1a 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -29,8 +29,6 @@ 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.'/adherents/class/adherent.class.php';
-
-// load partnership libraries
 require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
 
 // for other modules
@@ -158,6 +156,8 @@ if ($user->socid > 0) { // Protection if external user
  * Actions
  */
 
+$error = 0;
+
 if (GETPOST('cancel', 'alpha')) {
 	$action = 'list';
 	$massaction = '';
@@ -200,6 +200,43 @@ if (empty($reshook)) {
 	$uploaddir = $conf->partnership->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
+	// Validate and approve
+	if (!$error && $massaction == 'approve' && $permissiontoadd) {
+		$objecttmp = new Partnership($db);
+
+		$db->begin();
+		$error = 0;
+		$result = 0;
+
+		foreach ($toselect as $checked) {
+			if ($objecttmp->fetch($checked)) {
+				if ($objecttmp->status == $objecttmp::STATUS_DRAFT) {
+					//$objecttmp->date = dol_now();
+					$result = $objecttmp->validate($user);
+				}
+
+				if ($result >= 0 && $objecttmp->status == $objecttmp::STATUS_VALIDATED) {
+					$result = $objecttmp->approve($user);
+					if ($result > 0) {
+						setEventMessages($langs->trans("PartnershipRefApproved", $objecttmp->ref), null);
+					} else {
+						setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+						$error++;
+					}
+				} else {
+					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+					$error++;
+				}
+			}
+		}
+
+		if (!$error) {
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
+
 	// Cancel partnership
 	if ($massaction == 'cancel' && $permissiontoadd) {
 		$db->begin();
@@ -208,9 +245,14 @@ if (empty($reshook)) {
 		$nbok = 0;
 		foreach ($toselect as $toselectid) {
 			$result = $objecttmp->fetch($toselectid);
+			var_dump($objecttmp->status);
 			if ($result > 0) {
-				$result = $objecttmp->cancel($user, 3);
-				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++;
+				} elseif ($result <= 0) {
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
 					break;
@@ -260,7 +302,7 @@ if ($managedfor == 'member') {
 // 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
@@ -342,7 +384,7 @@ $sql .= $hookmanager->resPrint;
 /* If a group by is required
 $sql.= " GROUP BY ";
 foreach($object->fields as $key => $val) {
-	$sql.='t.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -432,7 +474,9 @@ $param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
-'cancel'=>img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel"),
+	//'validate'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate"),
+	'approve'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("ValidateAndApprove"),
+	'cancel'=>img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel"),
 	//'generate_doc'=>img_picto('', 'pdf').$langs->trans("ReGeneratePDF"),
 	//'builddoc'=>img_picto('', 'pdf').$langs->trans("PDFMerge"),
 	'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendMail"),
@@ -440,7 +484,7 @@ $arrayofmassactions = array(
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('prevalidate', 'presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -464,7 +508,7 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
 $topicmail = "SendPartnershipRef";
 $modelmail = "partnership_send";
 $objecttmp = new Partnership($db);
-$trackid = 'partnership'.$object->id;
+$trackid = 'pship'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all) {
@@ -652,7 +696,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
diff --git a/htdocs/partnership/partnership_note.php b/htdocs/partnership/partnership_note.php
index b9607e5aeb6..67f963b155e 100644
--- a/htdocs/partnership/partnership_note.php
+++ b/htdocs/partnership/partnership_note.php
@@ -65,8 +65,13 @@ $permissiontoadd = $user->rights->partnership->write; // Used by the include of
 /*
  * Actions
  */
-
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$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
+}
 
 
 /*
@@ -105,7 +110,7 @@ if ($id > 0 || !empty($ref)) {
 	 if ($permissiontoadd)
 	 {
 	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/partnership/partnershipindex.php b/htdocs/partnership/partnershipindex.php
index f1a9f8c507b..0b8a6cd33c9 100644
--- a/htdocs/partnership/partnershipindex.php
+++ b/htdocs/partnership/partnershipindex.php
@@ -133,7 +133,7 @@ if (! empty($conf->partnership->enabled) && $user->rights->partnership->read) {
 END MODULEBUILDER DRAFT MYOBJECT */
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 $NBMAX = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
@@ -190,7 +190,7 @@ if (! empty($conf->partnership->enabled) && $user->rights->partnership->read) {
 }
 */
 
-print '</div></div></div>';
+print '</div></div>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index a14729f30ef..60426e6a3b0 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 $servicename = 'PayBox';
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'other', 'paybox', 'paypal'));
+$langs->loadLangs(array('admin', 'other', 'paybox', 'paypal', 'stripe'));
 
 if (!$user->admin) {
 	accessforbidden();
@@ -261,7 +261,7 @@ $doleditor->Create();
 print '</td></tr>';
 
 
-print '<tr class="oddeven"><td>';
+print '<tr class="oddeven"><td class="fieldrequired">';
 print $langs->trans("ONLINE_PAYMENT_SENDEMAIL").'</td><td>';
 print '<input size="32" type="text" name="ONLINE_PAYMENT_SENDEMAIL" value="'.$conf->global->ONLINE_PAYMENT_SENDEMAIL.'">';
 print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': myemail@myserver.com, Payment service &lt;myemail2@myserver2.com&gt;</span>';
@@ -285,7 +285,7 @@ print '</table>';
 
 print dol_get_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+print $form->buttonsSaveCancel("Modify", '');
 
 print '</form>';
 
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index e5f53b34978..7f41d45d374 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -218,7 +218,7 @@ function print_paybox_redirect($PRICE, $CURRENCY, $EMAIL, $urlok, $urlko, $TAG)
 
 
 	print "\n";
-	print '<script type="text/javascript" language="javascript">'."\n";
+	print '<script type="text/javascript">'."\n";
 	print '	document.Submit.submit();'."\n";
 	print '</script>'."\n";
 	print "\n";
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 46877f6db8a..df5bb4161a5 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -333,7 +333,7 @@ print '</div>';
 
 print dol_get_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+print $form->buttonsSaveCancel("Modify", '');
 
 print '</form>';
 
@@ -350,7 +350,7 @@ $sandboxpaypalurl = 'developer.paypal.com';
 
 print '<div id="apidoc">';
 print 'Your API authentication information can be found with following steps. We recommend that you open a separate Web browser session when carrying out this procedure.<br>
-1. Log in to your PayPal account (on real paypal <a href="https://'.$realpaypalurl.'" target="_blank">'.$realpaypalurl.'</a> (or sandbox <a href="https://'.$sandboxpaypalurl.'" target="_blank">'.$sandboxpaypalurl.'</a>).<br>
+1. Log in to your PayPal account (on real paypal <a href="https://'.$realpaypalurl.'" target="_blank" rel="noopener noreferrer external">'.$realpaypalurl.'</a> (or sandbox <a href="https://'.$sandboxpaypalurl.'" target="_blank" rel="noopener noreferrer external">'.$sandboxpaypalurl.'</a>).<br>
 2. Click the "Profile" or "Preferencies" subtab located under the My Account heading.<br>
 3. Click the link "API Access".<br>
 4. Click the View API Certificate link in the right column.<br>
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index dee6476f773..79003956f12 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -282,7 +282,7 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
 	$_SESSION["FinalPaymentAmt"] = $paymentAmount;
 	$_SESSION["currencyCodeType"] = $currencyCodeType;
 	$_SESSION["PaymentType"] = $paymentType; // 'Mark', 'Sole'
-	$_SESSION['ipaddress'] = getUserRemoteIP();	// Payer ip
+	$_SESSION['ipaddress'] = getUserRemoteIP(); // Payer ip
 
 	//'---------------------------------------------------------------------------------------------------------------
 	//' Make the API call to PayPal
@@ -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 2b86efa507c..a0849f082e8 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -274,13 +274,13 @@ if ($mode == 'config' && $user->admin) {
 			print ajax_constantonoff($printer->active);
 		} else {
 			if (empty($conf->global->{$printer->conf})) {
-				print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;token='.newToken().'&amp;varname='.$printer->active.'&amp;value=1">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&token='.newToken().'&varname='.urlencode($printer->active).'&value=1">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 			} else {
-				print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;token='.newToken().'&amp;varname='.$printer->active.'&amp;value=0">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&token='.newToken().'&varname='.urlencode($printer->active).'&value=0">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 			}
 		}
-		print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?mode=setup&amp;driver='.$printer->name.'">'.img_picto('', 'setup').'</a></td>';
-		print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?mode=test&amp;driver='.$printer->name.'">'.img_picto('', 'setup').'</a></td>';
+		print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?mode=setup&token='.newToken().'&driver='.urlencode($printer->name).'">'.img_picto('', 'setup').'</a></td>';
+		print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?mode=test&token='.newToken().'&driver='.urlencode($printer->name).'">'.img_picto('', 'setup').'</a></td>';
 		print '</tr>'."\n";
 	}
 
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index d90ea7090f7..e1e23feac86 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -182,9 +182,9 @@ if ($action != 'create_updater' && $action != 'edit_updater') {
 			print '</tr>';
 		}
 	} else {
-		print '<tr colspan="7"><td class="opacitymedium">';
+		print '<tr colspan="7"><td><span class="opacitymedium">';
 		print $langs->trans("None");
-		print '</td></tr>';
+		print '</span></td></tr>';
 	}
 	print '</table>';
 
@@ -228,10 +228,8 @@ if ($action == 'create_variable' || $action == 'edit_variable') {
 	print '</table>';
 
 	//Form Buttons
-	print '<br><div class="center">';
-	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'"> &nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
+
 	print '</form>';
 }
 
@@ -349,10 +347,8 @@ if ($action == 'create_updater' || $action == 'edit_updater') {
 	print '</table>';
 
 	//Form Buttons
-	print '<br><div class="center">';
-	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'"> &nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
+
 	print '</form>';
 }
 
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index fa75a20277f..2d7d99a9ab3 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -46,6 +46,8 @@ if (!$user->admin || (empty($conf->product->enabled) && empty($conf->service->en
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'product';
@@ -346,7 +348,7 @@ foreach ($dirproduct as $dirroot) {
 					}
 					print '<td class="center">';
 					if (!$disabled) {
-						print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeproduct&token='.newToken().'&value='.$file.'">';
+						print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeproduct&token='.newToken().'&value='.urlencode($file).'">';
 					}
 					print img_picto($langs->trans("Disabled"), 'switch_off');
 					if (!$disabled) {
@@ -448,13 +450,13 @@ foreach ($dirmodels as $reldir) {
 								// Active
 								if (in_array($name, $def)) {
 									print '<td class="center">'."\n";
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&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&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<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>";
 								}
 
@@ -463,7 +465,7 @@ foreach ($dirmodels as $reldir) {
 								if ($conf->global->PRODUCT_ADDON_PDF == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<a 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>';
 								}
 								print '</td>';
 
@@ -762,10 +764,10 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY)) {
 						if ($conf->global->$const) {
 							print img_picto($langs->trans("Active"), 'tick');
 							print '</td><td class="right">';
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;spe='.urlencode($file).'&amp;value=0">'.$langs->trans("Disable").'</a>';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&spe='.urlencode($file).'&value=0">'.$langs->trans("Disable").'</a>';
 						} else {
 							print '&nbsp;</td><td class="right">';
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;spe='.urlencode($file).'&amp;value=1">'.$langs->trans("Activate").'</a>';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&spe='.urlencode($file).'&value=1">'.$langs->trans("Activate").'</a>';
 						}
 
 						print '</td></tr>';
diff --git a/htdocs/product/admin/product_lot.php b/htdocs/product/admin/product_lot.php
index 3f4fd636de4..24f515fa0bc 100644
--- a/htdocs/product/admin/product_lot.php
+++ b/htdocs/product/admin/product_lot.php
@@ -161,7 +161,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
 							if ($conf->global->PRODUCTBATCH_LOT_ADDON == $file) {
 								print img_picto($langs->trans("Activated"), 'switch_on');
 							} else {
-								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodlot&amp;value='.$file.'">';
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodlot&token='.newToken().'&value='.urlencode($file).'">';
 								print img_picto($langs->trans("Disabled"), 'switch_off');
 								print '</a>';
 							}
@@ -253,7 +253,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
 							if ($conf->global->PRODUCTBATCH_SN_ADDON == $file) {
 								print img_picto($langs->trans("Activated"), 'switch_on');
 							} else {
-								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodsn&amp;value='.$file.'">';
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodsn&token='.newToken().'&value='.urlencode($file).'">';
 								print img_picto($langs->trans("Disabled"), 'switch_off');
 								print '</a>';
 							}
diff --git a/htdocs/product/admin/stock_mouvement_extrafields.php b/htdocs/product/admin/stock_mouvement_extrafields.php
new file mode 100644
index 00000000000..23e5aadc9cc
--- /dev/null
+++ b/htdocs/product/admin/stock_mouvement_extrafields.php
@@ -0,0 +1,123 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-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/stock_mouvement_extrafields.php
+ *		\ingroup    stock
+ *		\brief      Page to setup extra fields of stock mouvement
+ */
+
+// 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 = 'stock_mouvement'; //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
+ */
+
+
+llxHeader('', $langs->trans("StockSetup"), $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("StockSetup"), $linkback, 'title_setup');
+
+
+$head = stock_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'stockMouvementAttributes', $langs->trans("StockMouvementExtraFields"), -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\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
+}
+
+
+/*
+ * Creation of an optional field
+ */
+if ($action == 'create') {
+	print '<br><div id="newattrib"></div>';
+	print load_fiche_titre($langs->trans('NewAttribute'));
+
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+}
+
+/*
+ * Edition of an optional field
+ */
+if ($action == 'edit' && !empty($attrname)) {
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index 815014e259f..40d451653e7 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -54,8 +54,8 @@ if ($user->socid) {
 }
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 77acafbbd55..32c4c83378c 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -47,7 +47,7 @@ if (empty($_GET['keysearch']) && !defined('NOREQUIREHTML')) {
 
 require '../../main.inc.php';
 
-$htmlname = GETPOST('htmlname', 'alpha');
+$htmlname = GETPOST('htmlname', 'aZ09');
 $socid = GETPOST('socid', 'int');
 $type = GETPOST('type', 'int');
 $mode = GETPOST('mode', 'int');
@@ -73,7 +73,7 @@ restrictedArea($user, 'produit|service', 0, 'product&product');
 // print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 // print_r($_GET);
 
-if (!empty($action) && $action == 'fetch' && !empty($id)) {
+if ($action == 'fetch' && !empty($id)) {
 	// action='fetch' is used to get product information on a product. So when action='fetch', id must be the product id.
 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -85,13 +85,18 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
 	if ($ret > 0) {
 		$outref = $object->ref;
 		$outlabel = $object->label;
-		$outlabel_trans ='';
+		$outlabel_trans = '';
 		$outdesc = $object->description;
-		$outdesc_trans ='';
+		$outdesc_trans = '';
 		$outtype = $object->type;
+		$outprice_ht = null;
+		$outprice_ttc = null;
+		$outpricebasetype = null;
+		$outtva_tx = 0;
+		$outdefault_vat_code = '';
 		$outqty = 1;
 		$outdiscount = 0;
-
+		$mandatory_period = $object->mandatory_period;
 		$found = false;
 
 		$price_level = 1;
@@ -132,19 +137,23 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
 					$found = true;
 					$outprice_ht = price($objp->unitprice);
 					$outprice_ttc = price($objp->unitprice * (1 + ($object->tva_tx / 100)));
+
 					$outpricebasetype = $object->price_base_type;
 					$outtva_tx = $object->tva_tx;
+					$outdefault_vat_code = $object->default_vat_code;
+
 					$outqty = $objp->quantity;
 					$outdiscount = $objp->remise_percent;
 				}
 			}
 		}
 
-		// Multiprice
+		// Multiprice (1 price per level)
 		if (!$found && isset($price_level) && $price_level >= 1 && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) { // If we need a particular price level (from 1 to 6)
-			$sql = "SELECT price, price_ttc, price_base_type, tva_tx";
+			$sql = "SELECT price, price_ttc, price_base_type,";
+			$sql .= " tva_tx, default_vat_code";	// Vat rate and code will be used if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on.
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_price ";
-			$sql .= " WHERE fk_product = '".$id."'";
+			$sql .= " WHERE fk_product = ".((int) $id);
 			$sql .= " AND entity IN (".getEntity('productprice').")";
 			$sql .= " AND price_level = ".((int) $price_level);
 			$sql .= " ORDER BY date_price";
@@ -158,7 +167,14 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
 					$outprice_ht = price($objp->price);
 					$outprice_ttc = price($objp->price_ttc);
 					$outpricebasetype = $objp->price_base_type;
-					$outtva_tx = $objp->tva_tx;
+					if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
+						$outtva_tx = $objp->tva_tx;
+						$outdefault_vat_code = $objp->default_vat_code;
+					} else {
+						// The common and default behaviour.
+						$outtva_tx = $object->tva_tx;
+						$outdefault_vat_code = $object->default_vat_code;
+					}
 				}
 			}
 		}
@@ -175,10 +191,11 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
 			if ($result) {
 				if (count($prodcustprice->lines) > 0) {
 					$found = true;
-					$outprice_ht = price($prodcustprice->lines [0]->price);
-					$outprice_ttc = price($prodcustprice->lines [0]->price_ttc);
-					$outpricebasetype = $prodcustprice->lines [0]->price_base_type;
-					$outtva_tx = $prodcustprice->lines [0]->tva_tx;
+					$outprice_ht = price($prodcustprice->lines[0]->price);
+					$outprice_ttc = price($prodcustprice->lines[0]->price_ttc);
+					$outpricebasetype = $prodcustprice->lines[0]->price_base_type;
+					$outtva_tx = $prodcustprice->lines[0]->tva_tx;
+					$outdefault_vat_code = $prodcustprice->lines[0]->default_vat_code;
 				}
 			}
 		}
@@ -188,6 +205,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
 			$outprice_ttc = price($object->price_ttc);
 			$outpricebasetype = $object->price_base_type;
 			$outtva_tx = $object->tva_tx;
+			$outdefault_vat_code = $object->default_vat_code;
 		}
 
 		$outjson = array(
@@ -201,8 +219,10 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
 			'price_ttc' => $outprice_ttc,
 			'pricebasetype' => $outpricebasetype,
 			'tva_tx' => $outtva_tx,
+			'default_vat_code' => $outdefault_vat_code,
 			'qty' => $outqty,
 			'discount' => $outdiscount,
+			'mandatory_period' => $mandatory_period,
 			'array_options'=>$object->array_options);
 	}
 
@@ -222,7 +242,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
 	// Filter on the product to search can be:
 	// Into an array with key $htmlname123 (we take first one found). Which page use this ?
 	// Into a var with name $htmlname can be 'prodid', 'productid', ...
-	$match = preg_grep('/('.$htmlname.'[0-9]+)/', array_keys($_GET));
+	$match = preg_grep('/('.preg_quote($htmlname, '/').'[0-9]+)/', array_keys($_GET));
 	sort($match);
 
 	$idprod = (empty($match[0]) ? '' : $match[0]);		// Take first key found into GET array with matching $htmlname123
diff --git a/htdocs/product/canvas/product/tpl/card_create.tpl.php b/htdocs/product/canvas/product/tpl/card_create.tpl.php
index 5d39b55ff76..8813e4a8d7e 100644
--- a/htdocs/product/canvas/product/tpl/card_create.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_create.tpl.php
@@ -27,7 +27,7 @@ $object = $GLOBALS['object'];
 $statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
 ?>
 
-<!-- BEGIN PHP TEMPLATE -->
+<!-- BEGIN PHP TEMPLATE product/canvas/product/tpl/card_create.tpl.php  -->
 
 <?php
 print load_fiche_titre($langs->trans("NewProduct"), '', 'product');
diff --git a/htdocs/product/canvas/product/tpl/card_edit.tpl.php b/htdocs/product/canvas/product/tpl/card_edit.tpl.php
index 2e04f660084..b21355c1c21 100644
--- a/htdocs/product/canvas/product/tpl/card_edit.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_edit.tpl.php
@@ -27,7 +27,7 @@ $object = $GLOBALS['object'];
 $statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
 ?>
 
-<!-- BEGIN PHP TEMPLATE -->
+<!-- BEGIN PHP TEMPLATE product/canvas/product/tpl/card_edit.tpl.php-->
 
 <?php
 $head = product_prepare_head($object);
diff --git a/htdocs/product/canvas/product/tpl/card_view.tpl.php b/htdocs/product/canvas/product/tpl/card_view.tpl.php
index a5f793e246d..b8e6ad19ca6 100644
--- a/htdocs/product/canvas/product/tpl/card_view.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_view.tpl.php
@@ -25,7 +25,7 @@ if (empty($conf) || !is_object($conf)) {
 $object = $GLOBALS['object'];
 ?>
 
-<!-- BEGIN PHP TEMPLATE -->
+<!-- BEGIN PHP TEMPLATE product/canvas/product/tpl/card_view.tpl.php -->
 <?php
 $head = product_prepare_head($object);
 $titre = $langs->trans("CardProduct".$object->type);
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index c4296dc63a8..b07c3d96a52 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -39,6 +39,13 @@ class ActionsCardService
 	public $field_list = array();
 	public $list_datas = array();
 
+	public $id;
+	public $ref;
+	public $description;
+	public $note;
+	public $price;
+	public $price_min;
+
 
 	/**
 	 *    Constructor
@@ -196,6 +203,7 @@ class ActionsCardService
 			}
 
 			// Duration
+			$dur = array();
 			if ($this->object->duration_value > 1) {
 				$dur = array("h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
 			} elseif ($this->object->duration_value > 0) {
@@ -286,6 +294,7 @@ class ActionsCardService
 		if ($search_categ) {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_product as cp";
 		}
+		$fourn_id = 0;
 		if (GETPOST("fourn_id", 'int') > 0) {
 			$fourn_id = GETPOST("fourn_id", 'int');
 			$sql .= ", ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index a1be8f35c29..64c6b6817bd 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -64,13 +64,12 @@ if (!empty($conf->commande->enabled)) {
 }
 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';
 }
+if (!empty($conf->bom->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'other'));
@@ -89,8 +88,8 @@ $mesg = ''; $error = 0; $errors = array();
 $refalreadyexists = 0;
 
 $id = GETPOST('id', 'int');
-$ref = GETPOST('ref', 'alpha');
-$type = (GETPOST('type', 'int') !== '') ? GETPOST('type', 'int') : Product::TYPE_PRODUCT;
+$ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'alpha') : null);
+$type = (GETPOSTISSET('type') ? GETPOST('type', 'int') : Product::TYPE_PRODUCT);
 $action = (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
@@ -106,6 +105,7 @@ $accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 $accountancy_code_buy_intra = GETPOST('accountancy_code_buy_intra', 'alpha');
 $accountancy_code_buy_export = GETPOST('accountancy_code_buy_export', 'alpha');
 
+$checkmandatory = GETPOST('accountancy_code_buy_export', 'alpha');
 // by default 'alphanohtml' (better security); hidden conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML allows basic html
 $label_security_check = empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML) ? 'alphanohtml' : 'restricthtml';
 
@@ -113,6 +113,16 @@ if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
 
+// Load object modCodeProduct
+$module = (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) ? $conf->global->PRODUCT_CODEPRODUCT_ADDON : 'mod_codeproduct_leopard');
+if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php') {
+	$module = substr($module, 0, dol_strlen($module) - 4);
+}
+$result = dol_include_once('/core/modules/product/'.$module.'.php');
+if ($result > 0) {
+	$modCodeProduct = new $module();
+}
+
 $object = new Product($db);
 $object->type = $type; // so test later to fill $usercancxxx is correct
 $extrafields = new ExtraFields($db);
@@ -122,7 +132,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 if ($id > 0 || !empty($ref)) {
 	$result = $object->fetch($id, $ref);
-
+	if ($result < 0) {
+		dol_print_error($db, $object->error, $object->errors);
+	}
 	if (!empty($conf->product->enabled)) {
 		$upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
 	} elseif (!empty($conf->service->enabled)) {
@@ -167,6 +179,9 @@ if ($object->id > 0) {
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productcard', 'globalcard'));
 
+$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));
 
 
 /*
@@ -177,9 +192,6 @@ if ($cancel) {
 	$action = '';
 }
 
-$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));
 $createbarcode = empty($conf->barcode->enabled) ? 0 : 1;
 if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->creer_advance)) {
 	$createbarcode = 0;
@@ -192,6 +204,29 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/product/list.php?type='.$type;
+
+	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.'/product/card.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 = '';
+	}
+
 	// Type
 	if ($action == 'setfk_product_type' && $usercancreate) {
 		$result = $object->setValueFrom('fk_product_type', GETPOST('fk_product_type'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
@@ -248,9 +283,11 @@ if (empty($reshook)) {
 			$error++;
 		}
 		if (empty($ref)) {
-			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Ref')), null, 'errors');
-			$action = "create";
-			$error++;
+			if (empty($conf->global->PRODUCT_GENERATE_REF_AFTER_FORM)) {
+					setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Ref')), null, 'errors');
+					$action = "create";
+					$error++;
+			}
 		}
 		if (!empty($duration_value) && empty($duration_unit)) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Unit')), null, 'errors');
@@ -264,7 +301,7 @@ if (empty($reshook)) {
 			$object->ref                   = $ref;
 			$object->label                 = GETPOST('label', $label_security_check);
 			$object->price_base_type       = GETPOST('price_base_type', 'aZ09');
-
+			$object->mandatory_period 	   = !empty(GETPOST("mandatoryperiod", 'alpha')) ? 1 : 0;
 			if ($object->price_base_type == 'TTC') {
 				$object->price_ttc = GETPOST('price');
 			} else {
@@ -432,6 +469,11 @@ if (empty($reshook)) {
 				$error++;
 			}
 
+			if (!$ref && !empty($conf->global->PRODUCT_GENERATE_REF_AFTER_FORM)) {
+				// Generate ref...
+				$ref = $modCodeProduct->getNextValue($object, $type);
+			}
+
 			if (!$error) {
 				$id = $object->create($user);
 			}
@@ -442,7 +484,7 @@ if (empty($reshook)) {
 				$object->setCategories($categories);
 
 				if (!empty($backtopage)) {
-					$backtopage = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
+					$backtopage = preg_replace('/__ID__/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
 					if (preg_match('/\?/', $backtopage)) {
 						$backtopage .= '&socid='.$object->id; // Old method
 					}
@@ -471,7 +513,9 @@ if (empty($reshook)) {
 			if ($object->id > 0) {
 				$object->oldcopy = clone $object;
 
-				$object->ref                    = $ref;
+				if (empty($conf->global->PRODUCT_GENERATE_REF_AFTER_FORM)) {
+					$object->ref                = $ref;
+				}
 				$object->label                  = GETPOST('label', $label_security_check);
 
 				$desc = dol_htmlcleanlastbr(preg_replace('/&nbsp;$/', '', GETPOST('desc', 'restricthtml')));
@@ -522,6 +566,13 @@ if (empty($reshook)) {
 					$object->finished = null;
 				}
 
+				$fk_default_bom = GETPOST('fk_default_bom', 'int');
+				if ($fk_default_bom >= 0) {
+					$object->fk_default_bom = $fk_default_bom;
+				} else {
+					$object->fk_default_bom = null;
+				}
+
 				$units = GETPOST('units', 'int');
 				if ($units > 0) {
 					$object->fk_unit = $units;
@@ -551,7 +602,7 @@ if (empty($reshook)) {
 				$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 				$accountancy_code_buy_intra = GETPOST('accountancy_code_buy_intra', 'alpha');
 				$accountancy_code_buy_export = GETPOST('accountancy_code_buy_export', 'alpha');
-
+				$checkmandatory = GETPOST('mandatoryperiod', 'alpha');
 				if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 					$object->accountancy_code_sell = '';
 				} else {
@@ -582,6 +633,11 @@ if (empty($reshook)) {
 				} else {
 					$object->accountancy_code_buy_export = $accountancy_code_buy_export;
 				}
+				if ($object->isService()) {
+					$object->mandatory_period =  (!empty($checkmandatory)) ? 1 : 0 ;
+				}
+
+
 
 				// Fill array 'array_options' with data from add form
 				$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
@@ -1073,16 +1129,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		print '<table class="border centpercent">';
 
-		print '<tr>';
-		$tmpcode = '';
-		if (!empty($modCodeProduct->code_auto)) {
-			$tmpcode = $modCodeProduct->getNextValue($object, $type);
+		if (empty($conf->global->PRODUCT_GENERATE_REF_AFTER_FORM)) {
+			print '<tr>';
+			$tmpcode = '';
+			if (!empty($modCodeProduct->code_auto)) {
+				$tmpcode = $modCodeProduct->getNextValue($object, $type);
+			}
+			print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input id="ref" name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag(GETPOSTISSET('ref') ? GETPOST('ref', 'alphanohtml') : $tmpcode).'">';
+			if ($refalreadyexists) {
+				print $langs->trans("RefAlreadyExists");
+			}
+			print '</td></tr>';
 		}
-		print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input id="ref" name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag(GETPOSTISSET('ref') ? GETPOST('ref', 'alphanohtml') : $tmpcode).'">';
-		if ($refalreadyexists) {
-			print $langs->trans("RefAlreadyExists");
-		}
-		print '</td></tr>';
 
 		// Label
 		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag(GETPOST('label', $label_security_check)).'"></td></tr>';
@@ -1114,8 +1172,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				$tooltip .= '<br>'.$langs->trans("GenericMaskCodes3");
 				$tooltip .= '<br>'.$langs->trans("GenericMaskCodes4a", $langs->transnoentities("Batch"), $langs->transnoentities("Batch"));
 				$tooltip .= '<br>'.$langs->trans("GenericMaskCodes5");
-				if (($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced')
-					|| ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced')) {
+				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;
@@ -1163,10 +1221,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if ($showbarcode) {
 			print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
 			if (GETPOSTISSET('fk_barcode_type')) {
-				$fk_barcode_type = GETPOST('fk_barcode_type');
+				$fk_barcode_type = GETPOST('fk_barcode_type')?GETPOST('fk_barcode_type'):0;
 			} else {
 				if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) {
-					$fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+					$fk_barcode_type = getDolGlobalInt("PRODUIT_DEFAULT_BARCODE_TYPE");
+				} else {
+					$fk_barcode_type=0;
 				}
 			}
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
@@ -1186,7 +1246,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Description (used in invoice, propal...)
 		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
 
-		$doleditor = new DolEditor('desc', GETPOST('desc', 'restricthtml'), '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
+		$doleditor = new DolEditor('desc', GETPOST('desc', 'restricthtml'), '', 160, 'dolibarr_details', '', false, true, getDolGlobalString('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_4, '90%');
 		$doleditor->Create();
 
 		print "</td></tr>";
@@ -1204,7 +1264,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
 			print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'class="pictofixedwidth"');
 			print $formproduct->selectWarehouses(GETPOST('fk_default_warehouse', 'int'), 'fk_default_warehouse', 'warehouseopen', 1, 0, 0, '', 0, 0, array(), 'minwidth300 widthcentpercentminusxx maxwidth500');
-			print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit').'">';
+			print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&token='.newToken().'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken()).'">';
 			print '<span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span>';
 			print '</a>';
 			print '</td>';
@@ -1234,6 +1294,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			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);
+
+			// Mandatory period
+			print ' &nbsp; &nbsp; &nbsp; ';
+			print '<input type="checkbox" id="mandatoryperiod" name="mandatoryperiod"'.($object->mandatory_period == 1 ? ' checked="checked"' : '').'>';
+			print '<label for="mandatoryperiod">';
+			$htmltooltip = $langs->trans("mandatoryHelper");
+			print $form->textwithpicto($langs->trans("mandatoryperiod"), $htmltooltip, 1, 0);
+			print '</label>';
+
 			print '</td></tr>';
 		}
 
@@ -1244,7 +1313,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print $formproduct->selectProductNature('finished', $object->finished);
 				print '</td></tr>';
 			}
+		}
 
+		if ($type != 1) {
 			if (empty($conf->global->PRODUCT_DISABLE_WEIGHT)) {
 				// Brut Weight
 				print '<tr><td>'.$langs->trans("Weight").'</td><td>';
@@ -1343,13 +1414,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td>';
 
 			// We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
-			$doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_8, '90%');
+			$doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 140, 'dolibarr_details', '', false, true, getDolGlobalString('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_8, '90%');
 			$doleditor->Create();
 
 			print "</td></tr>";
 		//}
 
-		if ($conf->categorie->enabled) {
+		if (!empty($conf->categorie->enabled)) {
 			// Categories
 			print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
@@ -1371,6 +1442,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				$defaultva = get_default_tva($mysoc, $mysoc);
 				print $form->load_tva("tva_tx", $defaultva, $mysoc, $mysoc, 0, 0, '', false, 1);
 				print '</td></tr>';
+
 				print '</table>';
 
 				print '<br>';
@@ -1534,11 +1606,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		print dol_get_fiche_end();
 
-		print '<div class="center">';
-		print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
-		print ' &nbsp; &nbsp; ';
-		print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-		print '</div>';
+		print $form->buttonsSaveCancel("Create");
 
 		print '</form>';
 	} elseif ($object->id > 0) {
@@ -1772,6 +1840,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr><td>'.$langs->trans("Duration").'</td><td>';
 				print '<input name="duration_value" size="5" value="'.$object->duration_value.'"> ';
 				print $formproduct->selectMeasuringUnits("duration_unit", "time", $object->duration_unit, 0, 1);
+
+				// Mandatory period
+				print ' &nbsp; &nbsp; &nbsp; ';
+				print '<input type="checkbox" id="mandatoryperiod" name="mandatoryperiod"'.($object->mandatory_period == 1 ? ' checked="checked"' : '').'>';
+				print '<label for="mandatoryperiod">';
+				$htmltooltip = $langs->trans("mandatoryHelper");
+				print $form->textwithpicto($langs->trans("mandatoryperiod"), $htmltooltip, 1, 0);
+				print '</label>';
+
 				print '</td></tr>';
 			} else {
 				if (empty($conf->global->PRODUCT_DISABLE_NATURE)) {
@@ -1780,44 +1857,53 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print $formproduct->selectProductNature('finished', $object->finished);
 					print '</td></tr>';
 				}
+			}
 
+			if (!$object->isService() && !empty($conf->bom->enabled)) {
+				print '<tr><td>'.$form->textwithpicto($langs->trans("DefaultBOM"), $langs->trans("DefaultBOMDesc", $langs->transnoentitiesnoconv("Finished"))).'</td><td>';
+				$bomkey = "Bom:bom/class/bom.class.php:0:t.status=1 AND t.fk_product=".((int) $object->id);
+				print $form->selectForForms($bomkey, 'fk_default_bom', $object->fk_default_bom, 1);
+				print '</td></tr>';
+			}
+
+			if (!$object->isService()) {
 				if (empty($conf->global->PRODUCT_DISABLE_WEIGHT)) {
 					// Brut Weight
 					print '<tr><td>'.$langs->trans("Weight").'</td><td>';
-					print '<input name="weight" size="5" value="'.$object->weight.'"> ';
-					print $formproduct->selectMeasuringUnits("weight_units", "weight", $object->weight_units, 0, 2);
+					print '<input name="weight" size="5" value="'.(GETPOSTISSET('weight') ? GETPOST('weight') : $object->weight).'"> ';
+					print $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOSTISSET('weight_units') ? GETPOST('weight_units') : $object->weight_units, 0, 2);
 					print '</td></tr>';
 				}
 
 				if (empty($conf->global->PRODUCT_DISABLE_SIZE)) {
 					// Brut Length
 					print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td>';
-					print '<input name="size" size="5" value="'.$object->length.'">x';
-					print '<input name="sizewidth" size="5" value="'.$object->width.'">x';
-					print '<input name="sizeheight" size="5" value="'.$object->height.'"> ';
-					print $formproduct->selectMeasuringUnits("size_units", "size", $object->length_units, 0, 2);
+					print '<input name="size" size="5" value="'.(GETPOSTISSET('size') ? GETPOST('size') : $object->length).'">x';
+					print '<input name="sizewidth" size="5" value="'.(GETPOSTISSET('sizewidth') ? GETPOST('sizewidth') : $object->width).'">x';
+					print '<input name="sizeheight" size="5" value="'.(GETPOSTISSET('sizeheight') ? GETPOST('sizeheight') : $object->height).'"> ';
+					print $formproduct->selectMeasuringUnits("size_units", "size", GETPOSTISSET('size_units') ? GETPOST('size_units') : $object->length_units, 0, 2);
 					print '</td></tr>';
 				}
 				if (empty($conf->global->PRODUCT_DISABLE_SURFACE)) {
 					// Brut Surface
 					print '<tr><td>'.$langs->trans("Surface").'</td><td>';
-					print '<input name="surface" size="5" value="'.$object->surface.'"> ';
-					print $formproduct->selectMeasuringUnits("surface_units", "surface", $object->surface_units, 0, 2);
+					print '<input name="surface" size="5" value="'.(GETPOSTISSET('surface') ? GETPOST('surface') : $object->surface).'"> ';
+					print $formproduct->selectMeasuringUnits("surface_units", "surface", GETPOSTISSET('surface_units') ? GETPOST('surface_units') : $object->surface_units, 0, 2);
 					print '</td></tr>';
 				}
 				if (empty($conf->global->PRODUCT_DISABLE_VOLUME)) {
 					// Brut Volume
 					print '<tr><td>'.$langs->trans("Volume").'</td><td>';
-					print '<input name="volume" size="5" value="'.$object->volume.'"> ';
-					print $formproduct->selectMeasuringUnits("volume_units", "volume", $object->volume_units, 0, 2);
+					print '<input name="volume" size="5" value="'.(GETPOSTISSET('volume') ? GETPOST('volume') : $object->volume).'"> ';
+					print $formproduct->selectMeasuringUnits("volume_units", "volume", GETPOSTISSET('volume_units') ? GETPOST('volume_units') : $object->volume_units, 0, 2);
 					print '</td></tr>';
 				}
 
 				if (!empty($conf->global->PRODUCT_ADD_NET_MEASURE)) {
 					// Net Measure
 					print '<tr><td>'.$langs->trans("NetMeasure").'</td><td>';
-					print '<input name="net_measure" size="5" value="'.$object->net_measure.'"> ';
-					print $formproduct->selectMeasuringUnits("net_measure_units", "", $object->net_measure_units, 0, 0);
+					print '<input name="net_measure" size="5" value="'.(GETPOSTISSET('net_measure') ? GETPOST('net_measure') : $object->net_measure).'"> ';
+					print $formproduct->selectMeasuringUnits("net_measure_units", "", GETPOSTISSET('net_measure_units') ? GETPOST('net_measure_units') : $object->net_measure_units, 0, 0);
 					print '</td></tr>';
 				}
 			}
@@ -1986,11 +2072,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			print dol_get_fiche_end();
 
-			print '<div class="center">';
-			print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-			print '</div>';
+			print $form->buttonsSaveCancel();
 
 			print '</form>';
 		} else {
@@ -2096,8 +2178,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td>';
 					print $object->getLibStatut(0, 2);
 					print '</td></tr>';
-					if ((($object->status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced')
-						|| ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS))) {
+					if ((($object->status_batch == '1' && !empty($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS) && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced')
+						|| ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced' && !empty($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS)))) {
 						print '<tr><td>'.$langs->trans("ManageLotMask").'</td><td>';
 						print $object->batch_mask;
 						print '</td></tr>';
@@ -2211,7 +2293,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Public URL
 			if (empty($conf->global->PRODUCT_DISABLE_PUBLIC_URL)) {
 				print '<tr><td>'.$langs->trans("PublicUrl").'</td><td>';
-				print dol_print_url($object->url);
+				print dol_print_url($object->url, '_blank', 128);
 				print '</td></tr>';
 			}
 
@@ -2242,20 +2324,29 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			print '</table>';
 			print '</div>';
-			print '<div class="fichehalfright"><div class="ficheaddleft">';
+			print '<div class="fichehalfright">';
 
 			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border tableforfield centpercent">';
 
 			if ($object->isService()) {
 				// Duration
-				print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td>'.$object->duration_value.'&nbsp;';
+				print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td>';
+				print $object->duration_value;
 				if ($object->duration_value > 1) {
 					$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
 				} elseif ($object->duration_value > 0) {
 					$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
 				}
-				print (!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
+				print (!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? "&nbsp;".$langs->trans($dur[$object->duration_unit])."&nbsp;" : '');
+
+				// Mandatory period
+				if ($object->duration_value > 0) {
+					print ' &nbsp; &nbsp; &nbsp; ';
+				}
+				$htmltooltip = $langs->trans("mandatoryHelper");
+				print '<input type="checkbox" class="" name="mandatoryperiod"'.($object->mandatory_period == 1 ? ' checked="checked"' : '').' disabled>';
+				print $form->textwithpicto($langs->trans("mandatoryperiod"), $htmltooltip, 1, 0);
 
 				print '</td></tr>';
 			} else {
@@ -2265,7 +2356,19 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print $object->getLibFinished();
 					print '</td></tr>';
 				}
+			}
 
+			if (!$object->isService() && !empty($conf->bom->enabled) && $object->finished) {
+				print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("DefaultBOM"), $langs->trans("DefaultBOMDesc", $langs->transnoentitiesnoconv("Finished"))).'</td><td>';
+				if ($object->fk_default_bom) {
+					$bom_static = new BOM($db);
+					$bom_static->fetch($object->fk_default_bom);
+					print $bom_static->getNomUrl(1);
+				}
+				print '</td></tr>';
+			}
+
+			if (!$object->isService()) {
 				// Brut Weight
 				if (empty($conf->global->PRODUCT_DISABLE_WEIGHT)) {
 					print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td>';
@@ -2377,7 +2480,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print "</table>\n";
 			print '</div>';
 
-			print '</div></div>';
+			print '</div>';
 			print '<div style="clear:both"></div>';
 
 			print dol_get_fiche_end();
@@ -2387,16 +2490,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	}
 }
 
-// Load object modCodeProduct
-$module = (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) ? $conf->global->PRODUCT_CODEPRODUCT_ADDON : 'mod_codeproduct_leopard');
-if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php') {
-	$module = substr($module, 0, dol_strlen($module) - 4);
-}
-$result = dol_include_once('/core/modules/product/'.$module.'.php');
-if ($result > 0) {
-	$modCodeProduct = new $module();
-}
-
 $tmpcode = '';
 if (!empty($modCodeProduct->code_auto)) {
 	$tmpcode = $modCodeProduct->getNextValue($object, $object->type);
@@ -2453,14 +2546,14 @@ 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&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a>';
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Modify").'</a>';
 			}
 
 			if (!isset($object->no_button_copy) || $object->no_button_copy <> 1) {
 				if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)) {
 					print '<span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span>'."\n";
 				} else {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&token='.newToken().'&id='.$object->id.'">'.$langs->trans("ToClone").'</a>';
 				}
 			}
 		}
@@ -2471,7 +2564,7 @@ if ($action != 'create' && $action != 'edit') {
 				if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)) {
 					print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
 				} else {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a>';
+					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="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a>';
@@ -2484,8 +2577,9 @@ if ($action != 'create' && $action != 'edit') {
 	print "\n</div>\n";
 }
 
+
 /*
- * All the "Add to" areas
+ * All the "Add to" areas if PRODUCT_ADD_FORM_ADD_TO is set
  */
 
 if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action == '' || $action == 'view') && $object->status) {
@@ -2575,7 +2669,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
 		print '</table>';
 
 		print '<div class="center">';
-		print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+		print '<input type="submit" class="button button-add" value="'.$langs->trans("Add").'">';
 		print '</div>';
 
 		print dol_get_fiche_end();
@@ -2595,7 +2689,6 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete') {
 
 	// Documents
 	$objectref = dol_sanitizeFileName($object->ref);
-	$relativepath = $comref.'/'.$objectref.'.pdf';
 	if (!empty($conf->product->multidir_output[$object->entity])) {
 		$filedir = $conf->product->multidir_output[$object->entity].'/'.$objectref; //Check repertories of current entities
 	} else {
@@ -2605,23 +2698,21 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete') {
 	$genallowed = $usercanread;
 	$delallowed = $usercancreate;
 
-	print $formfile->showdocuments($modulepart, $object->ref, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
+	print $formfile->showdocuments($modulepart, $object->ref, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $langs->getDefaultLang(), '', $object);
 	$somethingshown = $formfile->numoffiles;
 
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright">';
 
 	$MAXEVENT = 10;
 
-	$morehtmlright = '<a href="'.DOL_URL_ROOT.'/product/agenda.php?id='.$object->id.'">';
-	$morehtmlright .= $langs->trans("SeeAll");
-	$morehtmlright .= '</a>';
+	$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt 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';
 	$formactions = new FormActions($db);
-	$somethingshown = $formactions->showactions($object, 'product', 0, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for product
+	$somethingshown = $formactions->showactions($object, 'product', 0, 1, '', $MAXEVENT, '', $morehtmlcenter); // Show all action for product
 
-	print '</div></div></div>';
+	print '</div></div>';
 }
 
 // End of page
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 6283b692a28..64db556a1d6 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -172,9 +172,10 @@ class Products extends DolibarrApi
 	 * @param  bool   $ids_only   			Return only IDs of product instead of all properties (faster, above all if list is long)
 	 * @param  int    $variant_filter   	Use this param to filter list (0 = all, 1=products without variants, 2=parent of variants, 3=variants only)
 	 * @param  bool   $pagination_data   	If this parameter is set to true the response will include pagination data. Default value is false. Page starts from 0
+	 * @param  int    $includestockdata		Load also information about stock (slower)
 	 * @return array                		Array of product objects
 	 */
-	public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '', $ids_only = false, $variant_filter = 0, $pagination_data = false)
+	public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '', $ids_only = false, $variant_filter = 0, $pagination_data = false, $includestockdata = 0)
 	{
 		global $db, $conf;
 
@@ -187,21 +188,21 @@ class Products extends DolibarrApi
 		$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
 
 		$sql = "SELECT t.rowid, t.ref, t.ref_ext";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product as t";
+		$sql .= " FROM ".$this->db->prefix()."product as t";
 		if ($category > 0) {
-			$sql .= ", ".MAIN_DB_PREFIX."categorie_product as c";
+			$sql .= ", ".$this->db->prefix()."categorie_product as c";
 		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('product').')';
 
 		if ($variant_filter == 1) {
-			$sql .= ' AND t.rowid not in (select distinct fk_product_parent from '.MAIN_DB_PREFIX.'product_attribute_combination)';
-			$sql .= ' AND t.rowid not in (select distinct fk_product_child from '.MAIN_DB_PREFIX.'product_attribute_combination)';
+			$sql .= ' AND t.rowid not in (select distinct fk_product_parent from '.$this->db->prefix().'product_attribute_combination)';
+			$sql .= ' AND t.rowid not in (select distinct fk_product_child from '.$this->db->prefix().'product_attribute_combination)';
 		}
 		if ($variant_filter == 2) {
-			$sql .= ' AND t.rowid in (select distinct fk_product_parent from '.MAIN_DB_PREFIX.'product_attribute_combination)';
+			$sql .= ' AND t.rowid in (select distinct fk_product_parent from '.$this->db->prefix().'product_attribute_combination)';
 		}
 		if ($variant_filter == 3) {
-			$sql .= ' AND t.rowid in (select distinct fk_product_child from '.MAIN_DB_PREFIX.'product_attribute_combination)';
+			$sql .= ' AND t.rowid in (select distinct fk_product_child from '.$this->db->prefix().'product_attribute_combination)';
 		}
 
 		// Select products of given category
@@ -218,8 +219,9 @@ class Products extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			$errormessage = '';
+			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			//var_dump($sqlfilters);exit;
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';	// We must accept datc:<:2020-01-01 10:10:10
@@ -249,6 +251,21 @@ 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) {
+							$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)) {
+										foreach ($product_static->stock_warehouse[$keytmp]->detail_batch as $keytmp2 => $valtmp2) {
+											unset($product_static->stock_warehouse[$keytmp]->detail_batch[$keytmp2]->db);
+										}
+									}
+								}
+							}
+						}
+
+
 						$obj_ret[] = $this->_cleanObjectDatas($product_static);
 					}
 				} else {
@@ -844,11 +861,11 @@ class Products extends DolibarrApi
 		}
 
 		$sql = "SELECT t.rowid, t.ref, t.ref_ext";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product as t";
+		$sql .= " FROM ".$this->db->prefix()."product as t";
 		if ($category > 0) {
-			$sql .= ", ".MAIN_DB_PREFIX."categorie_product as c";
+			$sql .= ", ".$this->db->prefix()."categorie_product as c";
 		}
-		$sql .= ", ".MAIN_DB_PREFIX."product_fournisseur_price as s";
+		$sql .= ", ".$this->db->prefix()."product_fournisseur_price as s";
 
 		$sql .= ' WHERE t.entity IN ('.getEntity('product').')';
 
@@ -873,8 +890,9 @@ class Products extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -995,13 +1013,14 @@ class Products extends DolibarrApi
 		}
 
 		$sql = "SELECT t.rowid, t.ref, t.ref_ext, t.label, t.rang, t.entity";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_attribute as t";
+		$sql .= " FROM ".$this->db->prefix()."product_attribute as t";
 		$sql .= ' WHERE t.entity IN ('.getEntity('product').')';
 
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			$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).")";
@@ -1075,8 +1094,8 @@ class Products extends DolibarrApi
 			}
 		}
 
-		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val as pac2v";
-		$sql .= " JOIN ".MAIN_DB_PREFIX."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
+		$sql = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."product_attribute_combination2val as pac2v";
+		$sql .= " JOIN ".$this->db->prefix()."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
 		$sql .= " WHERE pac2v.fk_prod_attr = ".((int) $prodattr->id)." AND pac.entity IN (".getEntity('product').")";
 
 		$resql = $this->db->query($sql);
@@ -1103,7 +1122,7 @@ class Products extends DolibarrApi
 			throw new RestException(401);
 		}
 
-		$sql = "SELECT rowid, ref, ref_ext, label, rang, entity FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '".trim($ref)."' AND entity IN (".getEntity('product').")";
+		$sql = "SELECT rowid, ref, ref_ext, label, rang, entity FROM ".$this->db->prefix()."product_attribute WHERE ref LIKE '".trim($ref)."' AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -1121,8 +1140,8 @@ class Products extends DolibarrApi
 		$attr['rang'] = $result->rang;
 		$attr['entity'] = $result->entity;
 
-		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val as pac2v";
-		$sql .= " JOIN ".MAIN_DB_PREFIX."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
+		$sql = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."product_attribute_combination2val as pac2v";
+		$sql .= " JOIN ".$this->db->prefix()."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
 		$sql .= " WHERE pac2v.fk_prod_attr = ".((int) $result->rowid)." AND pac.entity IN (".getEntity('product').")";
 
 		$resql = $this->db->query($sql);
@@ -1150,7 +1169,7 @@ class Products extends DolibarrApi
 			throw new RestException(401);
 		}
 
-		$sql = "SELECT rowid, ref, ref_ext, label, rang, entity FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref_ext LIKE '".trim($ref_ext)."' AND entity IN (".getEntity('product').")";
+		$sql = "SELECT rowid, ref, ref_ext, label, rang, entity FROM ".$this->db->prefix()."product_attribute WHERE ref_ext LIKE '".trim($ref_ext)."' AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -1168,8 +1187,8 @@ class Products extends DolibarrApi
 		$attr['rang'] = $result->rang;
 		$attr['entity'] = $result->entity;
 
-		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination2val as pac2v";
-		$sql .= " JOIN ".MAIN_DB_PREFIX."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
+		$sql = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."product_attribute_combination2val as pac2v";
+		$sql .= " JOIN ".$this->db->prefix()."product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
 		$sql .= " WHERE pac2v.fk_prod_attr = ".((int) $result->rowid)." AND pac.entity IN (".getEntity('product').")";
 
 		$resql = $this->db->query($sql);
@@ -1303,7 +1322,7 @@ class Products extends DolibarrApi
 			throw new RestException(401);
 		}
 
-		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $id." AND entity IN (".getEntity('product').")";
+		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".$this->db->prefix()."product_attribute_value WHERE rowid = ".(int) $id." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -1346,7 +1365,7 @@ class Products extends DolibarrApi
 
 		$ref = trim($ref);
 
-		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value";
+		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".$this->db->prefix()."product_attribute_value";
 		$sql .= " WHERE ref LIKE '".$this->db->escape($ref)."' AND fk_product_attribute = ".((int) $id)." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
@@ -1389,7 +1408,7 @@ class Products extends DolibarrApi
 
 		$ref = trim($ref);
 
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_value";
+		$sql = "SELECT rowid FROM ".$this->db->prefix()."product_attribute_value";
 		$sql .= " WHERE ref LIKE '".$this->db->escape($ref)."' AND fk_product_attribute = ".((int) $id)." AND entity IN (".getEntity('product').")";
 		$query = $this->db->query($sql);
 
@@ -1465,9 +1484,9 @@ class Products extends DolibarrApi
 
 		$return = array();
 
-		$sql = 'SELECT ';
-		$sql .= 'v.fk_product_attribute, v.rowid, v.ref, v.value FROM '.MAIN_DB_PREFIX.'product_attribute_value as v';
-		$sql .= " WHERE v.fk_product_attribute IN (SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '".$this->db->escape($ref)."')";
+		$sql = "SELECT ";
+		$sql .= "v.fk_product_attribute, v.rowid, v.ref, v.value FROM ".$this->db->prefix()."product_attribute_value as v";
+		$sql .= " WHERE v.fk_product_attribute IN (SELECT rowid FROM ".$this->db->prefix()."product_attribute WHERE ref LIKE '".$this->db->escape($ref)."')";
 
 		$resql = $this->db->query($sql);
 
@@ -1948,6 +1967,7 @@ class Products extends DolibarrApi
 		if (empty(DolibarrApiAccess::$user->rights->stock->lire)) {
 			unset($object->stock_reel);
 			unset($object->stock_theorique);
+			unset($object->stock_warehouse);
 		}
 
 		return $object;
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 555bc08d03e..bac6c958d24 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -102,12 +102,12 @@ class FormProduct
 		} elseif ($sumStock) {
 			$sql .= ", sum(ps.reel) as stock";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_entrepot = e.rowid";
+		$sql .= " FROM ".$this->db->prefix()."entrepot as e";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."product_stock as ps on ps.fk_entrepot = e.rowid";
 		if (!empty($fk_product) && $fk_product > 0) {
 			$sql .= " AND ps.fk_product = ".((int) $fk_product);
 			if (!empty($batch)) {
-				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_batch as pb on pb.fk_product_stock = ps.rowid AND pb.batch = '".$this->db->escape($batch)."'";
+				$sql .= " LEFT JOIN ".$this->db->prefix()."product_batch as pb on pb.fk_product_stock = ps.rowid AND pb.batch = '".$this->db->escape($batch)."'";
 			}
 		}
 		$sql .= " WHERE e.entity IN (".getEntity('stock').")";
@@ -477,18 +477,13 @@ class FormProduct
 		$filter = array();
 		$filter['t.active'] = 1;
 
-		$result = $productNature->fetchAll(
-			'',
-			'',
-			0,
-			0,
-			$filter
-		);
+		$result = $productNature->fetchAll('', '', 0, 0, $filter);
+
 		if ($result < 0) {
 			dol_print_error($db);
 			return -1;
 		} else {
-			$return .= '<select class="flat" name="'.$name.'">';
+			$return .= '<select class="flat" name="'.$name.'" id="'.$name.'">';
 			if ($showempty || ($selected == '' || $selected == '-1')) {
 				$return .= '<option value="-1"';
 				if ($selected == '' || $selected == '-1') {
@@ -521,6 +516,8 @@ class FormProduct
 			$return .= '</select>';
 		}
 
+		$return .= ajax_combobox($name);
+
 		return $return;
 	}
 
@@ -546,7 +543,7 @@ class FormProduct
 	{
 		global $conf, $langs;
 
-		dol_syslog(get_class($this)."::selectLot $selected, $htmlname, $filterstatus, $empty, $disabled, $fk_product, $fk_entrepot, $empty_label, $forcecombo, $morecss", LOG_DEBUG);
+		dol_syslog(get_class($this)."::selectLotStock $selected, $htmlname, $filterstatus, $empty, $disabled, $fk_product, $fk_entrepot, $empty_label, $forcecombo, $morecss", LOG_DEBUG);
 
 		$out = '';
 		$productIdArray = array();
@@ -594,6 +591,7 @@ class FormProduct
 					}
 
 					$out .= '<option value="'.$id.'"';
+
 					if ($selected == $id || ($selected == 'ifone' && $nboflot == 1)) {
 						$out .= ' selected';
 					}
@@ -612,6 +610,67 @@ class FormProduct
 		return $out;
 	}
 
+
+
+	/**
+	 *  Return list of lot numbers (stock from product_batch) for product and warehouse.
+	 *
+	 *  @param  string	$htmlname		Name of key that is inside attribute "list" of an input text field.
+	 *  @param  int		$empty			1=Can be empty, 0 if not
+	 *  @param	int		$fk_product		show lot numbers of product with id fk_product. All from objectLines if 0.
+	 *  @param	int		$fk_entrepot	filter lot numbers for warehouse with id fk_entrepot. All if 0.
+	 *  @param	array	$objectLines	Only cache lot numbers for products in lines of object. If no lines only for fk_product. If no fk_product, all.
+	 *  @return	string					HTML datalist
+	 */
+	public function selectLotDataList($htmlname = 'batch_id', $empty = 0, $fk_product = 0, $fk_entrepot = 0, $objectLines = array())
+	{
+		global $conf, $langs;
+
+		dol_syslog(get_class($this)."::selectLotDataList $htmlname, $empty, $fk_product, $fk_entrepot,$objectLines", LOG_DEBUG);
+
+		$out = '';
+		$productIdArray = array();
+		if (!is_array($objectLines) || !count($objectLines)) {
+			if (!empty($fk_product) && $fk_product > 0) {
+				$productIdArray[] = (int) $fk_product;
+			}
+		} else {
+			foreach ($objectLines as $line) {
+				if ($line->fk_product) {
+					$productIdArray[] = $line->fk_product;
+				}
+			}
+		}
+
+		$nboflot = $this->loadLotStock($productIdArray);
+
+		$out .= '<datalist id="'.$htmlname.'" >';
+
+		if (!empty($fk_product) && $fk_product > 0) {
+			$productIdArray = array((int) $fk_product); // only show lot stock for product
+		} else {
+			foreach ($this->cache_lot as $key => $value) {
+				$productIdArray[] = $key;
+			}
+		}
+
+		foreach ($productIdArray as $productId) {
+			if (array_key_exists($productId, $this->cache_lot)) {
+				foreach ($this->cache_lot[$productId] as $id => $arraytypes) {
+					if (empty($fk_entrepot) || $fk_entrepot == $arraytypes['entrepot_id']) {
+						$label = $arraytypes['entrepot_label'] . ' - ';
+						$label .= $arraytypes['batch'];
+						$out .= '<option>' . $arraytypes['batch'] . '</option>';
+					}
+				}
+			}
+		}
+		$out .= '</datalist>';
+
+		return $out;
+	}
+
+
 	/**
 	 * Load in cache array list of lot available in stock from a given list of products
 	 *
@@ -642,9 +701,9 @@ class FormProduct
 			$this->cache_lot = array();
 			$productIdList = implode(',', $productIdArray);
 			$sql = "SELECT pb.batch, pb.rowid, ps.fk_entrepot, pb.qty, e.ref as label, ps.fk_product";
-			$sql .= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.rowid = pb.fk_product_stock";
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (".getEntity('stock').")";
+			$sql .= " FROM ".$this->db->prefix()."product_batch as pb";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."product_stock as ps on ps.rowid = pb.fk_product_stock";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (".getEntity('stock').")";
 			if (!empty($productIdList)) {
 				$sql .= " WHERE ps.fk_product IN (".$this->db->sanitize($productIdList).")";
 			}
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 9b36c67643d..562c622e214 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -175,6 +175,9 @@ class Product extends CommonObject
 	public $prices_by_qty_id = array();
 	public $prices_by_qty_list = array();
 
+	//! Array for multilangs
+	public $multilangs = array();
+
 	//! Default VAT code for product (link to code into llx_c_tva but without foreign keys)
 	public $default_vat_code;
 
@@ -261,6 +264,13 @@ class Product extends CommonObject
 	 */
 	public $finished;
 
+		/**
+	 * fk_default_bom indicates the default bom
+	 *
+	 * @var int
+	 */
+	public $fk_default_bom;
+
 	/**
 	 * We must manage lot/batch number, sell-by date and so on : '1':yes '0':no
 	 *
@@ -343,8 +353,6 @@ class Product extends CommonObject
 	public $stats_mrptoconsume = array();
 	public $stats_mrptoproduce = array();
 
-	public $multilangs = array();
-
 	//! Size of image
 	public $imgWidth;
 	public $imgHeight;
@@ -426,6 +434,13 @@ class Product extends CommonObject
 	public $is_object_used;
 
 
+	/**
+	 *
+	 *
+	 *
+	 */
+	 public $mandatory_period;
+
 	/**
 	 *  '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)"
@@ -476,6 +491,8 @@ 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),
+
 	);
 
 	/**
@@ -627,7 +644,7 @@ class Product extends CommonObject
 
 		// Barcode value
 		$this->barcode = trim($this->barcode);
-
+		$this->mandatory_period = empty($this->mandatory_period) ? 0 : $this->mandatory_period;
 		// Check parameters
 		if (empty($this->label)) {
 			$this->error = 'ErrorMandatoryParametersNotProvided';
@@ -672,7 +689,7 @@ class Product extends CommonObject
 
 		if ($result >= 0) {
 			$sql = "SELECT count(*) as nb";
-			$sql .= " FROM ".MAIN_DB_PREFIX."product";
+			$sql .= " FROM ".$this->db->prefix()."product";
 			$sql .= " WHERE entity IN (".getEntity('product').")";
 			$sql .= " AND ref = '".$this->db->escape($this->ref)."'";
 
@@ -681,7 +698,7 @@ class Product extends CommonObject
 				$obj = $this->db->fetch_object($result);
 				if ($obj->nb == 0) {
 					// Produit non deja existant
-					$sql = "INSERT INTO ".MAIN_DB_PREFIX."product (";
+					$sql = "INSERT INTO ".$this->db->prefix()."product (";
 					$sql .= "datec";
 					$sql .= ", entity";
 					$sql .= ", ref";
@@ -709,21 +726,22 @@ class Product extends CommonObject
 					$sql .= ", tobatch";
 					$sql .= ", batch_mask";
 					$sql .= ", fk_unit";
+					$sql .= ", mandatory_period";
 					$sql .= ") VALUES (";
 					$sql .= "'".$this->db->idate($now)."'";
-					$sql .= ", ".$conf->entity;
+					$sql .= ", ".((int) $conf->entity);
 					$sql .= ", '".$this->db->escape($this->ref)."'";
 					$sql .= ", ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
 					$sql .= ", ".price2num($price_min_ht);
 					$sql .= ", ".price2num($price_min_ttc);
 					$sql .= ", ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
-					$sql .= ", ".$user->id;
-					$sql .= ", ".$this->type;
-					$sql .= ", ".price2num($price_ht);
-					$sql .= ", ".price2num($price_ttc);
+					$sql .= ", ".((int) $user->id);
+					$sql .= ", ".((int) $this->type);
+					$sql .= ", ".price2num($price_ht, 'MT');
+					$sql .= ", ".price2num($price_ttc, 'MT');
 					$sql .= ", '".$this->db->escape($this->price_base_type)."'";
-					$sql .= ", ".$this->status;
-					$sql .= ", ".$this->status_buy;
+					$sql .= ", ".((int) $this->status);
+					$sql .= ", ".((int) $this->status_buy);
 					if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 						$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
 						$sql .= ", '".$this->db->escape($this->accountancy_code_buy_intra)."'";
@@ -733,16 +751,17 @@ class Product extends CommonObject
 						$sql .= ", '".$this->db->escape($this->accountancy_code_sell_export)."'";
 					}
 					$sql .= ", '".$this->db->escape($this->canvas)."'";
-					$sql .= ", ".((!isset($this->finished) || $this->finished < 0 || $this->finished == '') ? 'null' : (int) $this->finished);
-					$sql .= ", ".((empty($this->status_batch) || $this->status_batch < 0) ? '0' : $this->status_batch);
+					$sql .= ", ".((!isset($this->finished) || $this->finished < 0 || $this->finished == '') ? 'NULL' : (int) $this->finished);
+					$sql .= ", ".((empty($this->status_batch) || $this->status_batch < 0) ? '0' : ((int) $this->status_batch));
 					$sql .= ", '".$this->db->escape($this->batch_mask)."'";
-					$sql .= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+					$sql .= ", ".($this->fk_unit > 0 ? ((int) $this->fk_unit) : 'NULL');
+					$sql .= ", '".$this->db->escape($this->mandatory_period)."'";
 					$sql .= ")";
 
 					dol_syslog(get_class($this)."::Create", LOG_DEBUG);
 					$result = $this->db->query($sql);
 					if ($result) {
-						$id = $this->db->last_insert_id(MAIN_DB_PREFIX."product");
+						$id = $this->db->last_insert_id($this->db->prefix()."product");
 
 						if ($id > 0) {
 							$this->id = $id;
@@ -763,9 +782,9 @@ class Product extends CommonObject
 
 							// update accountancy for this entity
 							if (!$error && !empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-								$this->db->query("DELETE FROM " . MAIN_DB_PREFIX . "product_perentity WHERE fk_product = " .((int) $this->id) . " AND entity = " . ((int) $conf->entity));
+								$this->db->query("DELETE FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = " .((int) $this->id) . " AND entity = " . ((int) $conf->entity));
 
-								$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_perentity (";
+								$sql = "INSERT INTO " . $this->db->prefix() . "product_perentity (";
 								$sql .= " fk_product";
 								$sql .= ", entity";
 								$sql .= ", accountancy_code_buy";
@@ -841,6 +860,8 @@ class Product extends CommonObject
 	 */
 	public function verify()
 	{
+		global $langs;
+
 		$this->errors = array();
 
 		$result = 0;
@@ -851,6 +872,16 @@ class Product extends CommonObject
 			$result = -2;
 		}
 
+		$arrayofnonnegativevalue = array('weight'=>'Weight', 'width'=>'Width', 'height'=>'Height', 'length'=>'Length', 'surface'=>'Surface', 'volume'=>'Volume');
+		foreach ($arrayofnonnegativevalue as $key => $value) {
+			if (property_exists($this, $key) && !empty($this->$key) && ($this->$key < 0)) {
+				$langs->loadLangs(array("main", "other"));
+				$this->error = $langs->trans("FieldCannotBeNegative", $langs->transnoentitiesnoconv($value));
+				$this->errors[] = $this->error;
+				$result = -4;
+			}
+		}
+
 		$rescode = $this->check_barcode($this->barcode, $this->barcode_type_code);
 		if ($rescode) {
 			if ($rescode == -1) {
@@ -1043,7 +1074,7 @@ class Product extends CommonObject
 					foreach ($ObjW->detail_batch as $detail) {    // Each lines of detail in product_batch of the current $ObjW = product_stock
 						if ($detail->batch == $valueforundefinedlot || $detail->batch == 'Undefined') {
 							// We discard this line, we will create it later
-							$sqlclean = "DELETE FROM ".MAIN_DB_PREFIX."product_batch WHERE batch in('Undefined', '".$this->db->escape($valueforundefinedlot)."') AND fk_product_stock = ".((int) $ObjW->id);
+							$sqlclean = "DELETE FROM ".$this->db->prefix()."product_batch WHERE batch in('Undefined', '".$this->db->escape($valueforundefinedlot)."') AND fk_product_stock = ".((int) $ObjW->id);
 							$result = $this->db->query($sqlclean);
 							if (!$result) {
 								dol_print_error($this->db);
@@ -1075,7 +1106,7 @@ class Product extends CommonObject
 				$this->barcode = $this->get_barcode($this, $this->barcode_type_code);
 			}
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."product";
+			$sql = "UPDATE ".$this->db->prefix()."product";
 			$sql .= " SET label = '".$this->db->escape($this->label)."'";
 
 			if ($updatetype && ($this->isProduct() || $this->isService())) {
@@ -1101,6 +1132,7 @@ class Product extends CommonObject
 			$sql .= ", batch_mask = '".$this->db->escape($this->batch_mask)."'";
 
 			$sql .= ", finished = ".((!isset($this->finished) || $this->finished < 0 || $this->finished == '') ? "null" : (int) $this->finished);
+			$sql .= ", fk_default_bom = ".((!isset($this->fk_default_bom) || $this->fk_default_bom < 0 || $this->fk_default_bom == '') ? "null" : (int) $this->fk_default_bom);
 			$sql .= ", net_measure = ".($this->net_measure != '' ? "'".$this->db->escape($this->net_measure)."'" : 'null');
 			$sql .= ", net_measure_units = ".($this->net_measure_units != '' ? "'".$this->db->escape($this->net_measure_units)."'" : 'null');
 			$sql .= ", weight = ".($this->weight != '' ? "'".$this->db->escape($this->weight)."'" : 'null');
@@ -1140,7 +1172,7 @@ class Product extends CommonObject
 			$sql .= ", price_autogen = ".(!$this->price_autogen ? 0 : 1);
 			$sql .= ", fk_price_expression = ".($this->fk_price_expression != 0 ? (int) $this->fk_price_expression : 'NULL');
 			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id : 'NULL');
-
+			$sql .= ", mandatory_period = ".($this->mandatory_period );
 			// stock field is not here because it is a denormalized value from product_stock.
 			$sql .= " WHERE rowid = ".((int) $id);
 
@@ -1162,9 +1194,9 @@ class Product extends CommonObject
 
 				// update accountancy for this entity
 				if (!$error && !empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-					$this->db->query("DELETE FROM " . MAIN_DB_PREFIX . "product_perentity WHERE fk_product = " . ((int) $this->id) . " AND entity = " . ((int) $conf->entity));
+					$this->db->query("DELETE FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = " . ((int) $this->id) . " AND entity = " . ((int) $conf->entity));
 
-					$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_perentity (";
+					$sql = "INSERT INTO " . $this->db->prefix() . "product_perentity (";
 					$sql .= " fk_product";
 					$sql .= ", entity";
 					$sql .= ", accountancy_code_buy";
@@ -1307,9 +1339,9 @@ class Product extends CommonObject
 
 			// Delete from product_batch on product delete
 			if (!$error) {
-				$sql = "DELETE FROM ".MAIN_DB_PREFIX.'product_batch';
+				$sql = "DELETE FROM ".$this->db->prefix().'product_batch';
 				$sql .= " WHERE fk_product_stock IN (";
-				$sql .= "SELECT rowid FROM ".MAIN_DB_PREFIX.'product_stock';
+				$sql .= "SELECT rowid FROM ".$this->db->prefix().'product_stock';
 				$sql .= " WHERE fk_product = ".((int) $this->id).")";
 
 				$result = $this->db->query($sql);
@@ -1324,7 +1356,7 @@ class Product extends CommonObject
 				$elements = array('product_fournisseur_price', 'product_price', 'product_lang', 'categorie_product', 'product_stock', 'product_customer_price', 'product_lot'); // product_batch is done before
 				foreach ($elements as $table) {
 					if (!$error) {
-						$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
+						$sql = "DELETE FROM ".$this->db->prefix().$table;
 						$sql .= " WHERE fk_product = ".(int) $this->id;
 
 						$result = $this->db->query($sql);
@@ -1357,7 +1389,7 @@ class Product extends CommonObject
 
 			// Delete from product_association
 			if (!$error) {
-				$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_association";
+				$sql = "DELETE FROM ".$this->db->prefix()."product_association";
 				$sql .= " WHERE fk_product_pere = ".(int) $this->id." OR fk_product_fils = ".(int) $this->id;
 
 				$result = $this->db->query($sql);
@@ -1378,7 +1410,7 @@ class Product extends CommonObject
 
 			// Delete product
 			if (!$error) {
-				$sqlz = "DELETE FROM ".MAIN_DB_PREFIX."product";
+				$sqlz = "DELETE FROM ".$this->db->prefix()."product";
 				$sqlz .= " WHERE rowid = ".(int) $this->id;
 
 				$resultz = $this->db->query($sqlz);
@@ -1436,23 +1468,23 @@ class Product extends CommonObject
 		foreach ($langs_available as $key => $value) {
 			if ($key == $current_lang) {
 				$sql = "SELECT rowid";
-				$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-				$sql .= " WHERE fk_product=".$this->id;
-				$sql .= " AND lang='".$this->db->escape($key)."'";
+				$sql .= " FROM ".$this->db->prefix()."product_lang";
+				$sql .= " WHERE fk_product = ".((int) $this->id);
+				$sql .= " AND lang = '".$this->db->escape($key)."'";
 
 				$result = $this->db->query($sql);
 
 				if ($this->db->num_rows($result)) { // if there is already a description line for this language
-					$sql2 = "UPDATE ".MAIN_DB_PREFIX."product_lang";
+					$sql2 = "UPDATE ".$this->db->prefix()."product_lang";
 					$sql2 .= " SET ";
 					$sql2 .= " label='".$this->db->escape($this->label)."',";
 					$sql2 .= " description='".$this->db->escape($this->description)."'";
 					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
 						$sql2 .= ", note='".$this->db->escape($this->other)."'";
 					}
-					$sql2 .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
+					$sql2 .= " WHERE fk_product = ".((int) $this->id)." AND lang = '".$this->db->escape($key)."'";
 				} else {
-					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
+					$sql2 = "INSERT INTO ".$this->db->prefix()."product_lang (fk_product, lang, label, description";
 					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
 						$sql2 .= ", note";
 					}
@@ -1476,23 +1508,23 @@ class Product extends CommonObject
 				}
 
 				$sql = "SELECT rowid";
-				$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-				$sql .= " WHERE fk_product=".$this->id;
-				$sql .= " AND lang='".$this->db->escape($key)."'";
+				$sql .= " FROM ".$this->db->prefix()."product_lang";
+				$sql .= " WHERE fk_product = ".((int) $this->id);
+				$sql .= " AND lang = '".$this->db->escape($key)."'";
 
 				$result = $this->db->query($sql);
 
 				if ($this->db->num_rows($result)) { // if there is already a description line for this language
-					$sql2 = "UPDATE ".MAIN_DB_PREFIX."product_lang";
+					$sql2 = "UPDATE ".$this->db->prefix()."product_lang";
 					$sql2 .= " SET ";
-					$sql2 .= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
-					$sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
+					$sql2 .= " label = '".$this->db->escape($this->multilangs["$key"]["label"])."',";
+					$sql2 .= " description = '".$this->db->escape($this->multilangs["$key"]["description"])."'";
 					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
-						$sql2 .= ", note='".$this->db->escape($this->multilangs["$key"]["other"])."'";
+						$sql2 .= ", note = '".$this->db->escape($this->multilangs["$key"]["other"])."'";
 					}
-					$sql2 .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
+					$sql2 .= " WHERE fk_product = ".((int) $this->id)." AND lang = '".$this->db->escape($key)."'";
 				} else {
-					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
+					$sql2 = "INSERT INTO ".$this->db->prefix()."product_lang (fk_product, lang, label, description";
 					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
 						$sql2 .= ", note";
 					}
@@ -1538,8 +1570,8 @@ class Product extends CommonObject
 	 */
 	public function delMultiLangs($langtodelete, $user)
 	{
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_lang";
-		$sql .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($langtodelete)."'";
+		$sql = "DELETE FROM ".$this->db->prefix()."product_lang";
+		$sql .= " WHERE fk_product = ".((int) $this->id)." AND lang = '".$this->db->escape($langtodelete)."'";
 
 		dol_syslog(get_class($this).'::delMultiLangs', LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1592,11 +1624,11 @@ class Product extends CommonObject
 			return -1;
 		}
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ";
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element." SET ";
 		$sql .= "$field = '".$this->db->escape($value)."'";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
-		dol_syslog(__METHOD__." sql=".$sql, LOG_DEBUG);
+		dol_syslog(__METHOD__."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
@@ -1635,8 +1667,8 @@ class Product extends CommonObject
 		$current_lang = $langs->getDefaultLang();
 
 		$sql = "SELECT lang, label, description, note as other";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-		$sql .= " WHERE fk_product=".$this->id;
+		$sql .= " FROM ".$this->db->prefix()."product_lang";
+		$sql .= " WHERE fk_product = ".((int) $this->id);
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -1711,10 +1743,10 @@ class Product extends CommonObject
 		}
 
 		// Add new price
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(price_level,date_price, fk_product, fk_user_author, price, price_ttc, price_base_type,tosell, tva_tx, default_vat_code, recuperableonly,";
+		$sql = "INSERT INTO ".$this->db->prefix()."product_price(price_level,date_price, fk_product, fk_user_author, price, price_ttc, price_base_type,tosell, tva_tx, default_vat_code, recuperableonly,";
 		$sql .= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, price_min,price_min_ttc,price_by_qty,entity,fk_price_expression) ";
-		$sql .= " VALUES(".($level ? $level : 1).", '".$this->db->idate($now)."', ".$this->id.", ".$user->id.", ".price2num($this->price).", ".price2num($this->price_ttc).",'".$this->db->escape($this->price_base_type)."',".((int) $this->status).", ".price2num($this->tva_tx).", ".($this->default_vat_code ? ("'".$this->db->escape($this->default_vat_code)."'") : "null").", ".((int) $this->tva_npr).",";
-		$sql .= " ".price2num($this->localtax1_tx).", ".price2num($this->localtax2_tx).", '".$this->db->escape($this->localtax1_type)."', '".$this->db->escape($this->localtax2_type)."', ".price2num($this->price_min).", ".price2num($this->price_min_ttc).", ".price2num($this->price_by_qty).", ".$conf->entity.",".($this->fk_price_expression > 0 ? ((int) $this->fk_price_expression) : 'null');
+		$sql .= " VALUES(".($level ? ((int) $level) : 1).", '".$this->db->idate($now)."', ".((int) $this->id).", ".((int) $user->id).", ".((float) price2num($this->price)).", ".((float) price2num($this->price_ttc)).",'".$this->db->escape($this->price_base_type)."',".((int) $this->status).", ".((float) price2num($this->tva_tx)).", ".($this->default_vat_code ? ("'".$this->db->escape($this->default_vat_code)."'") : "null").", ".((int) $this->tva_npr).",";
+		$sql .= " ".price2num($this->localtax1_tx).", ".price2num($this->localtax2_tx).", '".$this->db->escape($this->localtax1_type)."', '".$this->db->escape($this->localtax2_type)."', ".price2num($this->price_min).", ".price2num($this->price_min_ttc).", ".price2num($this->price_by_qty).", ".((int) $conf->entity).",".($this->fk_price_expression > 0 ? ((int) $this->fk_price_expression) : 'null');
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::_log_price", LOG_DEBUG);
@@ -1740,11 +1772,11 @@ class Product extends CommonObject
 	public function log_price_delete($user, $rowid)
 	{
 		// phpcs:enable
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price_by_qty";
-		$sql .= " WHERE fk_product_price=".((int) $rowid);
+		$sql = "DELETE FROM ".$this->db->prefix()."product_price_by_qty";
+		$sql .= " WHERE fk_product_price = ".((int) $rowid);
 		$resql = $this->db->query($sql);
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price";
+		$sql = "DELETE FROM ".$this->db->prefix()."product_price";
 		$sql .= " WHERE rowid=".((int) $rowid);
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -1892,7 +1924,7 @@ class Product extends CommonObject
 		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 			$sql .= ", pfp.packaging";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
+		$sql .= " FROM ".$this->db->prefix()."product_fournisseur_price as pfp";
 		$sql .= " WHERE pfp.rowid = ".((int) $prodfournprice);
 		if ($qty > 0) {
 			$sql .= " AND pfp.quantity <= ".((float) $qty);
@@ -1946,7 +1978,7 @@ class Product extends CommonObject
 				$sql .= " pfp.default_vat_code,";
 				$sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code,";
 				$sql .= " pfp.packaging";
-				$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
+				$sql .= " FROM ".$this->db->prefix()."product_fournisseur_price as pfp";
 				$sql .= " WHERE pfp.fk_product = ".((int) $product_id);
 				if ($fourn_ref != 'none') {
 					$sql .= " AND pfp.ref_fourn = '".$this->db->escape($fourn_ref)."'";
@@ -2017,7 +2049,7 @@ class Product extends CommonObject
 
 
 	/**
-	 *    Modify customer price of a product/Service
+	 * Modify customer price of a product/Service
 	 *
 	 * @param  double $newprice          New price
 	 * @param  string $newpricebase      HT or TTC
@@ -2126,7 +2158,7 @@ class Product extends CommonObject
 
 			// Ne pas mettre de quote sur les numeriques decimaux.
 			// Ceci provoque des stockages avec arrondis en base au lieu des valeurs exactes.
-			$sql = "UPDATE ".MAIN_DB_PREFIX."product SET";
+			$sql = "UPDATE ".$this->db->prefix()."product SET";
 			$sql .= " price_base_type='".$this->db->escape($newpricebase)."',";
 			$sql .= " price=".$price.",";
 			$sql .= " price_ttc=".$price_ttc.",";
@@ -2219,9 +2251,9 @@ class Product extends CommonObject
 	 * @param  string $ref               Ref of product/service to load
 	 * @param  string $ref_ext           Ref ext of product/service to load
 	 * @param  string $barcode           Barcode of product/service to load
-	 * @param  int    $ignore_expression Ignores the math expression for calculating price and uses the db value instead
-	 * @param  int    $ignore_price_load Load product without loading prices arrays (when we are sure we don't need them)
-	 * @param  int    $ignore_lang_load  Load product without loading language arrays (when we are sure we don't need them)
+	 * @param  int    $ignore_expression When module dynamicprices is on, ignores the math expression for calculating price and uses the db value instead
+	 * @param  int    $ignore_price_load Load product without loading $this->multiprices... array (when we are sure we don't need them)
+	 * @param  int    $ignore_lang_load  Load product without loading $this->multilangs language arrays (when we are sure we don't need them)
 	 * @return int                       <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id = '', $ref = '', $ref_ext = '', $barcode = '', $ignore_expression = 0, $ignore_price_load = 0, $ignore_lang_load = 0)
@@ -2243,7 +2275,7 @@ class Product extends CommonObject
 		$sql .= " p.price_min, p.price_min_ttc, p.price_base_type, p.cost_price, p.default_vat_code, p.tva_tx, p.recuperableonly as tva_npr, p.localtax1_tx, p.localtax2_tx, p.localtax1_type, p.localtax2_type, p.tosell,";
 		$sql .= " p.tobuy, p.fk_product_type, p.duration, p.fk_default_warehouse, p.seuil_stock_alerte, p.canvas, p.net_measure, p.net_measure_units, p.weight, p.weight_units,";
 		$sql .= " p.length, p.length_units, p.width, p.width_units, p.height, p.height_units,";
-		$sql .= " p.surface, p.surface_units, p.volume, p.volume_units, p.barcode, p.fk_barcode_type, p.finished,";
+		$sql .= " p.surface, p.surface_units, p.volume, p.volume_units, p.barcode, p.fk_barcode_type, p.finished, p.fk_default_bom, p.mandatory_period,";
 		if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 			$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
 		} else {
@@ -2256,7 +2288,7 @@ class Product extends CommonObject
 		$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.
 		if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED)) {
 			if (!empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) {
-				$checkPMPPerEntity = $this->db->query("SELECT pmp FROM " . MAIN_DB_PREFIX . "product_perentity WHERE fk_product  = ".((int) $id)." AND entity = ".(int) $conf->entity);
+				$checkPMPPerEntity = $this->db->query("SELECT pmp FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = ".((int) $id)." AND entity = ".(int) $conf->entity);
 				if ($this->db->num_rows($checkPMPPerEntity)>0) {
 					$separatedEntityPMP = true;
 				}
@@ -2280,13 +2312,14 @@ class Product extends CommonObject
 		} else {
 			$sql .= " p.stock";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+		$sql .= " FROM ".$this->db->prefix()."product as p";
 		if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) || $separatedEntityPMP) {
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 		}
 		if ($separatedStock) {
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_stock as sp ON sp.fk_product = p.rowid AND sp.fk_entrepot IN (SELECT rowid FROM ".MAIN_DB_PREFIX."entrepot WHERE entity IN (".$this->db->sanitize($visibleWarehousesEntities)."))";
+			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_stock as sp ON sp.fk_product = p.rowid AND sp.fk_entrepot IN (SELECT rowid FROM ".$this->db->prefix()."entrepot WHERE entity IN (".$this->db->sanitize($visibleWarehousesEntities)."))";
 		}
+
 		if ($id) {
 			$sql .= " WHERE p.rowid = ".((int) $id);
 		} else {
@@ -2369,6 +2402,8 @@ class Product extends CommonObject
 				$this->localtax2_type                = $obj->localtax2_type;
 
 				$this->finished                        = $obj->finished;
+				$this->fk_default_bom                  = $obj->fk_default_bom;
+
 				$this->duration                        = $obj->duration;
 				$this->duration_value                = substr($obj->duration, 0, dol_strlen($obj->duration) - 1);
 				$this->duration_unit = substr($obj->duration, -1);
@@ -2415,6 +2450,8 @@ class Product extends CommonObject
 				$this->price_autogen = $obj->price_autogen;
 				$this->model_pdf = $obj->model_pdf;
 
+				$this->mandatory_period = $obj->mandatory_period;
+
 				$this->db->free($resql);
 
 				// fetch optionals attributes and labels
@@ -2430,12 +2467,12 @@ class Product extends CommonObject
 					for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 						$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
 						$sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";
-						$sql .= " FROM ".MAIN_DB_PREFIX."product_price";
+						$sql .= " FROM ".$this->db->prefix()."product_price";
 						$sql .= " WHERE entity IN (".getEntity('productprice').")";
 						$sql .= " AND price_level=".((int) $i);
 						$sql .= " AND fk_product = ".((int) $this->id);
-						$sql .= " ORDER BY date_price DESC, rowid DESC";
-						$sql .= " LIMIT 1";
+						$sql .= " ORDER BY date_price DESC, rowid DESC";	// Get the most recent line
+						$sql .= " LIMIT 1";									// Only the first one
 						$resql = $this->db->query($sql);
 						if ($resql) {
 							$result = $this->db->fetch_array($resql);
@@ -2457,8 +2494,8 @@ class Product extends CommonObject
 							 if ($this->prices_by_qty[$i] == 1)
 							 {
 							 $sql = "SELECT rowid, price, unitprice, quantity, remise_percent, remise, price_base_type";
-							 $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
-							 $sql.= " WHERE fk_product_price = ".$this->prices_by_qty_id[$i];
+							 $sql.= " FROM ".$this->db->prefix()."product_price_by_qty";
+							 $sql.= " WHERE fk_product_price = ".((int) $this->prices_by_qty_id[$i]);
 							 $sql.= " ORDER BY quantity ASC";
 							 $resultat=array();
 							 $resql = $this->db->query($sql);
@@ -2494,7 +2531,7 @@ class Product extends CommonObject
 				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) && empty($ignore_price_load)) {    // prices per quantity
 					$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
 					$sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid";
-					$sql .= " FROM ".MAIN_DB_PREFIX."product_price";
+					$sql .= " FROM ".$this->db->prefix()."product_price";
 					$sql .= " WHERE fk_product = ".((int) $this->id);
 					$sql .= " ORDER BY date_price DESC, rowid DESC";
 					$sql .= " LIMIT 1";
@@ -2508,7 +2545,7 @@ class Product extends CommonObject
 						// Récuperation de la liste des prix selon qty si flag positionné
 						if ($this->prices_by_qty[0] == 1) {
 							$sql = "SELECT rowid,price, unitprice, quantity, remise_percent, remise, remise, price_base_type";
-							$sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
+							$sql .= " FROM ".$this->db->prefix()."product_price_by_qty";
 							$sql .= " WHERE fk_product_price = ".((int) $this->prices_by_qty_id[0]);
 							$sql .= " ORDER BY quantity ASC";
 							$resultat = array();
@@ -2540,7 +2577,7 @@ class Product extends CommonObject
 					for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 						$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
 						$sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";
-						$sql .= " FROM ".MAIN_DB_PREFIX."product_price";
+						$sql .= " FROM ".$this->db->prefix()."product_price";
 						$sql .= " WHERE entity IN (".getEntity('productprice').")";
 						$sql .= " AND price_level=".((int) $i);
 						$sql .= " AND fk_product = ".((int) $this->id);
@@ -2565,8 +2602,8 @@ class Product extends CommonObject
 							// Récuperation de la liste des prix selon qty si flag positionné
 							if ($this->prices_by_qty[$i] == 1) {
 								$sql = "SELECT rowid, price, unitprice, quantity, remise_percent, remise, price_base_type";
-								$sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
-								$sql .= " WHERE fk_product_price = ".$this->prices_by_qty_id[$i];
+								$sql .= " FROM ".$this->db->prefix()."product_price_by_qty";
+								$sql .= " WHERE fk_product_price = ".((int) $this->prices_by_qty_id[$i]);
 								$sql .= " ORDER BY quantity ASC";
 								$resultat = array();
 								$resql = $this->db->query($sql);
@@ -2643,10 +2680,10 @@ class Product extends CommonObject
 
 			$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
 			$sql .= " SUM(mp.qty) as qty";
-			$sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as c";
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."mrp_production as mp ON mp.fk_mo=c.rowid";
+			$sql .= " FROM ".$this->db->prefix()."mrp_mo as c";
+			$sql .= " INNER JOIN ".$this->db->prefix()."mrp_production as mp ON mp.fk_mo=c.rowid";
 			if (empty($user->rights->societe->client->voir) && !$socid) {
-				$sql .= "INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=c.fk_soc AND sc.fk_user = ".((int) $user->id);
+				$sql .= "INNER JOIN ".$this->db->prefix()."societe_commerciaux as sc ON sc.fk_soc=c.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			$sql .= " WHERE ";
 			$sql .= " c.entity IN (".getEntity('mo').")";
@@ -2703,8 +2740,8 @@ class Product extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT b.rowid) as nb_toproduce,";
 		$sql .= " SUM(b.qty) as qty_toproduce";
-		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
+		$sql .= " FROM ".$this->db->prefix()."bom_bom as b";
+		$sql .= " INNER JOIN ".$this->db->prefix()."bom_bomline as bl ON bl.fk_bom=b.rowid";
 		$sql .= " WHERE ";
 		$sql .= " b.entity IN (".getEntity('bom').")";
 		$sql .= " AND b.fk_product =".((int) $this->id);
@@ -2722,8 +2759,8 @@ class Product extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT bl.rowid) as nb_toconsume,";
 		$sql .= " SUM(bl.qty) as qty_toconsume";
-		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
+		$sql .= " FROM ".$this->db->prefix()."bom_bom as b";
+		$sql .= " INNER JOIN ".$this->db->prefix()."bom_bomline as bl ON bl.fk_bom=b.rowid";
 		$sql .= " WHERE ";
 		$sql .= " b.entity IN (".getEntity('bom').")";
 		$sql .= " AND bl.fk_product =".((int) $this->id);
@@ -2765,11 +2802,11 @@ class Product extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT p.fk_soc) as nb_customers, COUNT(DISTINCT p.rowid) as nb,";
 		$sql .= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";
-		$sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pd";
-		$sql .= ", ".MAIN_DB_PREFIX."propal as p";
-		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."propaldet as pd";
+		$sql .= ", ".$this->db->prefix()."propal as p";
+		$sql .= ", ".$this->db->prefix()."societe as s";
 		if (empty($user->rights->societe->client->voir) && !$socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE p.rowid = pd.fk_propal";
 		$sql .= " AND p.fk_soc = s.rowid";
@@ -2840,11 +2877,11 @@ class Product extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT p.fk_soc) as nb_suppliers, COUNT(DISTINCT p.rowid) as nb,";
 		$sql .= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";
-		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as pd";
-		$sql .= ", ".MAIN_DB_PREFIX."supplier_proposal as p";
-		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."supplier_proposaldet as pd";
+		$sql .= ", ".$this->db->prefix()."supplier_proposal as p";
+		$sql .= ", ".$this->db->prefix()."societe as s";
 		if (empty($user->rights->societe->client->voir) && !$socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE p.rowid = pd.fk_supplier_proposal";
 		$sql .= " AND p.fk_soc = s.rowid";
@@ -2896,11 +2933,11 @@ class Product extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
 		$sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
-		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
-		$sql .= ", ".MAIN_DB_PREFIX."commande as c";
-		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."commandedet as cd";
+		$sql .= ", ".$this->db->prefix()."commande as c";
+		$sql .= ", ".$this->db->prefix()."societe as s";
 		if (empty($user->rights->societe->client->voir) && !$socid && !$forVirtualStock) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.rowid = cd.fk_commande";
 		$sql .= " AND c.fk_soc = s.rowid";
@@ -2951,10 +2988,10 @@ class Product extends CommonObject
 			if (!empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
 				if (!empty($conf->global->DECREASE_ONLY_UNINVOICEDPRODUCTS)) {
 					$adeduire = 0;
-					$sql = "SELECT sum(fd.qty) as count FROM ".MAIN_DB_PREFIX."facturedet fd ";
-					$sql .= " JOIN ".MAIN_DB_PREFIX."facture f ON fd.fk_facture = f.rowid ";
-					$sql .= " JOIN ".MAIN_DB_PREFIX."element_element el ON el.fk_target = f.rowid and el.targettype = 'facture' and sourcetype = 'commande'";
-					$sql .= " JOIN ".MAIN_DB_PREFIX."commande c ON el.fk_source = c.rowid ";
+					$sql = "SELECT sum(fd.qty) as count FROM ".$this->db->prefix()."facturedet fd ";
+					$sql .= " JOIN ".$this->db->prefix()."facture f ON fd.fk_facture = f.rowid ";
+					$sql .= " JOIN ".$this->db->prefix()."element_element el ON el.fk_target = f.rowid and el.targettype = 'facture' and sourcetype = 'commande'";
+					$sql .= " JOIN ".$this->db->prefix()."commande c ON el.fk_source = c.rowid ";
 					$sql .= " WHERE c.fk_statut IN (".$this->db->sanitize($filtrestatut).") AND c.facture = 0 AND fd.fk_product = ".((int) $this->id);
 					dol_syslog(__METHOD__.":: sql $sql", LOG_NOTICE);
 
@@ -2998,11 +3035,11 @@ class Product extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_suppliers, COUNT(DISTINCT c.rowid) as nb,";
 		$sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
-		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd";
-		$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
-		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."commande_fournisseurdet as cd";
+		$sql .= ", ".$this->db->prefix()."commande_fournisseur as c";
+		$sql .= ", ".$this->db->prefix()."societe as s";
 		if (empty($user->rights->societe->client->voir) && !$socid && !$forVirtualStock) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.rowid = cd.fk_commande";
 		$sql .= " AND c.fk_soc = s.rowid";
@@ -3056,13 +3093,13 @@ class Product extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT e.fk_soc) as nb_customers, COUNT(DISTINCT e.rowid) as nb,";
 		$sql .= " COUNT(ed.rowid) as nb_rows, SUM(ed.qty) as qty";
-		$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
-		$sql .= ", ".MAIN_DB_PREFIX."commandedet as cd";
-		$sql .= ", ".MAIN_DB_PREFIX."commande as c";
-		$sql .= ", ".MAIN_DB_PREFIX."expedition as e";
-		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."expeditiondet as ed";
+		$sql .= ", ".$this->db->prefix()."commandedet as cd";
+		$sql .= ", ".$this->db->prefix()."commande as c";
+		$sql .= ", ".$this->db->prefix()."expedition as e";
+		$sql .= ", ".$this->db->prefix()."societe as s";
 		if (empty($user->rights->societe->client->voir) && !$socid && !$forVirtualStock) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE e.rowid = ed.fk_expedition";
 		$sql .= " AND c.rowid = cd.fk_commande";
@@ -3141,11 +3178,11 @@ class Product extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT cf.fk_soc) as nb_suppliers, COUNT(DISTINCT cf.rowid) as nb,";
 		$sql .= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
-		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd";
-		$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf";
-		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."commande_fournisseur_dispatch as fd";
+		$sql .= ", ".$this->db->prefix()."commande_fournisseur as cf";
+		$sql .= ", ".$this->db->prefix()."societe as s";
 		if (empty($user->rights->societe->client->voir) && !$socid && !$forVirtualStock) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE cf.rowid = fd.fk_commande";
 		$sql .= " AND cf.fk_soc = s.rowid";
@@ -3198,11 +3235,11 @@ class Product extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT m.fk_soc) as nb_customers, COUNT(DISTINCT m.rowid) as nb,";
 		$sql .= " COUNT(mp.rowid) as nb_rows, SUM(mp.qty) as qty, role";
-		$sql .= " FROM ".MAIN_DB_PREFIX."mrp_production as mp";
-		$sql .= ", ".MAIN_DB_PREFIX."mrp_mo as m";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = m.fk_soc";
+		$sql .= " FROM ".$this->db->prefix()."mrp_production as mp";
+		$sql .= ", ".$this->db->prefix()."mrp_mo as m";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."societe as s ON s.rowid = m.fk_soc";
 		if (empty($user->rights->societe->client->voir) && !$socid && !$forVirtualStock) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE m.rowid = mp.fk_mo";
 		$sql .= " AND m.entity IN (".getEntity($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'mrp').")";
@@ -3291,11 +3328,11 @@ class Product extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
 		$sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
-		$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
-		$sql .= ", ".MAIN_DB_PREFIX."contrat as c";
-		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."contratdet as cd";
+		$sql .= ", ".$this->db->prefix()."contrat as c";
+		$sql .= ", ".$this->db->prefix()."societe as s";
 		if (empty($user->rights->societe->client->voir) && !$socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.rowid = cd.fk_contrat";
 		$sql .= " AND c.fk_soc = s.rowid";
@@ -3365,11 +3402,11 @@ class Product extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_customers, COUNT(DISTINCT f.rowid) as nb,";
 		$sql .= " COUNT(fd.rowid) as nb_rows, SUM(".$this->db->ifsql('f.type != 2', 'fd.qty', 'fd.qty * -1').") as qty";
-		$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
-		$sql .= ", ".MAIN_DB_PREFIX."facture as f";
-		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."facturedet as fd";
+		$sql .= ", ".$this->db->prefix()."facture as f";
+		$sql .= ", ".$this->db->prefix()."societe as s";
 		if (empty($user->rights->societe->client->voir) && !$socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE f.rowid = fd.fk_facture";
 		$sql .= " AND f.fk_soc = s.rowid";
@@ -3439,11 +3476,11 @@ class Product extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_suppliers, COUNT(DISTINCT f.rowid) as nb,";
 		$sql .= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
-		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as fd";
-		$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."facture_fourn_det as fd";
+		$sql .= ", ".$this->db->prefix()."facture_fourn as f";
+		$sql .= ", ".$this->db->prefix()."societe as s";
 		if (empty($user->rights->societe->client->voir) && !$socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE f.rowid = fd.fk_facture_fourn";
 		$sql .= " AND f.fk_soc = s.rowid";
@@ -3570,12 +3607,12 @@ class Product extends CommonObject
 		if ($mode == 'bynumber') {
 			$sql .= ", count(DISTINCT f.rowid)";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as d, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."facturedet as d, ".$this->db->prefix()."facture as f, ".$this->db->prefix()."societe as s";
 		if ($filteronproducttype >= 0) {
-			$sql .= ", ".MAIN_DB_PREFIX."product as p";
+			$sql .= ", ".$this->db->prefix()."product as p";
 		}
 		if (empty($user->rights->societe->client->voir) && !$socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE f.rowid = d.fk_facture";
 		if ($this->id > 0) {
@@ -3623,12 +3660,12 @@ class Product extends CommonObject
 		if ($mode == 'bynumber') {
 			$sql .= ", count(DISTINCT f.rowid)";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as d, ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."facture_fourn_det as d, ".$this->db->prefix()."facture_fourn as f, ".$this->db->prefix()."societe as s";
 		if ($filteronproducttype >= 0) {
-			$sql .= ", ".MAIN_DB_PREFIX."product as p";
+			$sql .= ", ".$this->db->prefix()."product as p";
 		}
 		if (empty($user->rights->societe->client->voir) && !$socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE f.rowid = d.fk_facture_fourn";
 		if ($this->id > 0) {
@@ -3674,12 +3711,12 @@ class Product extends CommonObject
 		if ($mode == 'bynumber') {
 			$sql .= ", count(DISTINCT p.rowid)";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."propaldet as d, ".$this->db->prefix()."propal as p, ".$this->db->prefix()."societe as s";
 		if ($filteronproducttype >= 0) {
-			$sql .= ", ".MAIN_DB_PREFIX."product as prod";
+			$sql .= ", ".$this->db->prefix()."product as prod";
 		}
 		if (empty($user->rights->societe->client->voir) && !$socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE p.rowid = d.fk_propal";
 		if ($this->id > 0) {
@@ -3726,12 +3763,12 @@ class Product extends CommonObject
 		if ($mode == 'bynumber') {
 			$sql .= ", count(DISTINCT p.rowid)";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."supplier_proposaldet as d, ".$this->db->prefix()."supplier_proposal as p, ".$this->db->prefix()."societe as s";
 		if ($filteronproducttype >= 0) {
-			$sql .= ", ".MAIN_DB_PREFIX."product as prod";
+			$sql .= ", ".$this->db->prefix()."product as prod";
 		}
 		if (empty($user->rights->societe->client->voir) && !$socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE p.rowid = d.fk_supplier_proposal";
 		if ($this->id > 0) {
@@ -3777,12 +3814,12 @@ class Product extends CommonObject
 		if ($mode == 'bynumber') {
 			$sql .= ", count(DISTINCT c.rowid)";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as d, ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."commandedet as d, ".$this->db->prefix()."commande as c, ".$this->db->prefix()."societe as s";
 		if ($filteronproducttype >= 0) {
-			$sql .= ", ".MAIN_DB_PREFIX."product as p";
+			$sql .= ", ".$this->db->prefix()."product as p";
 		}
 		if (empty($user->rights->societe->client->voir) && !$socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.rowid = d.fk_commande";
 		if ($this->id > 0) {
@@ -3828,12 +3865,12 @@ class Product extends CommonObject
 		if ($mode == 'bynumber') {
 			$sql .= ", count(DISTINCT c.rowid)";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as d, ".MAIN_DB_PREFIX."commande_fournisseur as c, ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."commande_fournisseurdet as d, ".$this->db->prefix()."commande_fournisseur as c, ".$this->db->prefix()."societe as s";
 		if ($filteronproducttype >= 0) {
-			$sql .= ", ".MAIN_DB_PREFIX."product as p";
+			$sql .= ", ".$this->db->prefix()."product as p";
 		}
 		if (empty($user->rights->societe->client->voir) && !$socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.rowid = d.fk_commande";
 		if ($this->id > 0) {
@@ -3879,12 +3916,12 @@ class Product extends CommonObject
 		if ($mode == 'bynumber') {
 			$sql .= ", count(DISTINCT c.rowid)";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as d, ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."contratdet as d, ".$this->db->prefix()."contrat as c, ".$this->db->prefix()."societe as s";
 		if ($filteronproducttype >= 0) {
-			$sql .= ", ".MAIN_DB_PREFIX."product as p";
+			$sql .= ", ".$this->db->prefix()."product as p";
 		}
 		if (empty($user->rights->societe->client->voir) && !$socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 
 		$sql .= " WHERE c.entity IN (".getEntity('contract').")";
@@ -3933,12 +3970,12 @@ class Product extends CommonObject
 		if ($mode == 'bynumber') {
 			$sql .= ", count(DISTINCT d.rowid)";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as d LEFT JOIN  ".MAIN_DB_PREFIX."societe as s ON d.fk_soc = s.rowid";
+		$sql .= " FROM ".$this->db->prefix()."mrp_mo as d LEFT JOIN  ".$this->db->prefix()."societe as s ON d.fk_soc = s.rowid";
 		if ($filteronproducttype >= 0) {
-			$sql .= ", ".MAIN_DB_PREFIX."product as p";
+			$sql .= ", ".$this->db->prefix()."product as p";
 		}
 		if (empty($user->rights->societe->client->voir) && !$socid) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 
 		$sql .= " WHERE d.entity IN (".getEntity('mo').")";
@@ -3996,28 +4033,31 @@ class Product extends CommonObject
 		}
 
 		// Check not already father of id_pere (to avoid father -> child -> father links)
-		$sql = 'SELECT fk_product_pere from '.MAIN_DB_PREFIX.'product_association';
-		$sql .= ' WHERE fk_product_pere  = '.((int) $id_fils).' AND fk_product_fils = '.((int) $id_pere);
+		$sql = "SELECT fk_product_pere from ".$this->db->prefix()."product_association";
+		$sql .= " WHERE fk_product_pere = ".((int) $id_fils)." AND fk_product_fils = ".((int) $id_pere);
 		if (!$this->db->query($sql)) {
 			dol_print_error($this->db);
 			return -1;
 		} else {
-			$result = $this->db->query($sql);
-			if ($result) {
-				$num = $this->db->num_rows($result);
-				if ($num > 0) {
-					$this->error = "isFatherOfThis";
+			//Selection of the highest row
+			$sql = "SELECT MAX(rang) as max_rank FROM ".$this->db->prefix()."product_association";
+			$sql .= " WHERE fk_product_pere  = ".((int) $id_pere);
+			$resql = $this->db->query($sql);
+			if ($resql > 0) {
+				$obj = $this->db->fetch_object($resql);
+				$rank = $obj->max_rank + 1;
+				//Addition of a product with the highest rank +1
+				$sql = "INSERT INTO ".$this->db->prefix()."product_association(fk_product_pere,fk_product_fils,qty,incdec,rang)";
+				$sql .= " VALUES (".((int) $id_pere).", ".((int) $id_fils).", ".price2num($qty, 'MS').", ".price2num($incdec, 'MS').", ".((int) $rank).")";
+				if (! $this->db->query($sql)) {
+					dol_print_error($this->db);
 					return -1;
 				} else {
-					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_association(fk_product_pere,fk_product_fils,qty,incdec)';
-					$sql .= ' VALUES ('.((int) $id_pere).', '.((int) $id_fils).', '.((float) $qty).', '.((int) $incdec).')';
-					if (!$this->db->query($sql)) {
-						dol_print_error($this->db);
-						return -1;
-					} else {
-						return 1;
-					}
+					return 1;
 				}
+			} else {
+				dol_print_error($this->db);
+				return -1;
 			}
 		}
 	}
@@ -4049,10 +4089,10 @@ class Product extends CommonObject
 			$qty = 1;
 		}
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'product_association SET ';
-		$sql .= 'qty='.$qty;
-		$sql .= ',incdec='.$incdec;
-		$sql .= ' WHERE fk_product_pere='.$id_pere.' AND fk_product_fils='.$id_fils;
+		$sql = 'UPDATE '.$this->db->prefix().'product_association SET ';
+		$sql .= 'qty = '.price2num($qty, 'MS');
+		$sql .= ',incdec = '.price2num($incdec, 'MS');
+		$sql .= ' WHERE fk_product_pere = '.((int) $id_pere).' AND fk_product_fils = '.((int) $id_fils);
 
 		if (!$this->db->query($sql)) {
 			dol_print_error($this->db);
@@ -4064,11 +4104,11 @@ class Product extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Retire le lien entre un sousproduit et un produit/service
+	 *  Remove a link between a subproduct and a parent product/service
 	 *
-	 * @param  int $fk_parent Id du produit auquel ne sera plus lie le produit lie
-	 * @param  int $fk_child  Id du produit a ne plus lie
-	 * @return int                    < 0 if KO, > 0 if OK
+	 * @param  int $fk_parent Id of parent product (child will no more be linked to it)
+	 * @param  int $fk_child  Id of child product
+	 * @return int            < 0 if KO, > 0 if OK
 	 */
 	public function del_sousproduit($fk_parent, $fk_child)
 	{
@@ -4080,7 +4120,7 @@ class Product extends CommonObject
 			$fk_child = 0;
 		}
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_association";
+		$sql = "DELETE FROM ".$this->db->prefix()."product_association";
 		$sql .= " WHERE fk_product_pere  = ".((int) $fk_parent);
 		$sql .= " AND fk_product_fils = ".((int) $fk_child);
 
@@ -4090,6 +4130,24 @@ class Product extends CommonObject
 			return -1;
 		}
 
+		// Updated ranks so that none are missing
+		$sqlrank = "SELECT rowid, rang FROM ".$this->db->prefix()."product_association";
+		$sqlrank.= " WHERE fk_product_pere = ".((int) $fk_parent);
+		$sqlrank.= " ORDER BY rang";
+		$resqlrank = $this->db->query($sqlrank);
+		if ($resqlrank) {
+			$cpt = 0;
+			while ($objrank = $this->db->fetch_object($resqlrank)) {
+				$cpt++;
+				$sql = "UPDATE ".$this->db->prefix()."product_association";
+				$sql.= " SET rang = ".((int) $cpt);
+				$sql.= " WHERE rowid = ".((int) $objrank->rowid);
+				if (! $this->db->query($sql)) {
+					dol_print_error($this->db);
+					return -1;
+				}
+			}
+		}
 		return 1;
 	}
 
@@ -4105,7 +4163,7 @@ class Product extends CommonObject
 	{
 		// phpcs:enable
 		$sql = "SELECT fk_product_pere, qty, incdec";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_association";
+		$sql .= " FROM ".$this->db->prefix()."product_association";
 		$sql .= " WHERE fk_product_pere  = ".((int) $fk_parent);
 		$sql .= " AND fk_product_fils = ".((int) $fk_child);
 
@@ -4155,7 +4213,7 @@ class Product extends CommonObject
 
 		if ($ref_fourn) {
 			$sql = "SELECT rowid, fk_product";
-			$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
+			$sql .= " FROM ".$this->db->prefix()."product_fournisseur_price";
 			$sql .= " WHERE fk_soc = ".((int) $id_fourn);
 			$sql .= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";
 			$sql .= " AND fk_product <> ".((int) $this->id);
@@ -4174,7 +4232,7 @@ class Product extends CommonObject
 		}
 
 		$sql = "SELECT rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
+		$sql .= " FROM ".$this->db->prefix()."product_fournisseur_price";
 		$sql .= " WHERE fk_soc = ".((int) $id_fourn);
 		if ($ref_fourn) {
 			$sql .= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";
@@ -4191,7 +4249,7 @@ class Product extends CommonObject
 
 			// The reference supplier does not exist, we create it for this product.
 			if (empty($obj)) {
-				$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
+				$sql = "INSERT INTO ".$this->db->prefix()."product_fournisseur_price(";
 				$sql .= "datec";
 				$sql .= ", entity";
 				$sql .= ", fk_product";
@@ -4212,7 +4270,7 @@ class Product extends CommonObject
 				$sql .= ")";
 
 				if ($this->db->query($sql)) {
-					$this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price");
+					$this->product_fourn_price_id = $this->db->last_insert_id($this->db->prefix()."product_fournisseur_price");
 					return 1;
 				} else {
 					$this->error = $this->db->lasterror();
@@ -4244,7 +4302,7 @@ class Product extends CommonObject
 		$list = array();
 
 		$sql = "SELECT DISTINCT p.fk_soc";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as p";
+		$sql .= " FROM ".$this->db->prefix()."product_fournisseur_price as p";
 		$sql .= " WHERE p.fk_product = ".((int) $this->id);
 		$sql .= " AND p.entity = ".((int) $conf->entity);
 
@@ -4279,7 +4337,7 @@ class Product extends CommonObject
 		$this->db->begin();
 
 		// prices
-		$sql  = "INSERT INTO ".MAIN_DB_PREFIX."product_price (";
+		$sql  = "INSERT INTO ".$this->db->prefix()."product_price (";
 		$sql .= " entity";
 		$sql .= ", fk_product";
 		$sql .= ", date_price";
@@ -4332,7 +4390,7 @@ class Product extends CommonObject
 		$sql .= ", multicurrency_tx";
 		$sql .= ", multicurrency_price";
 		$sql .= ", multicurrency_price_ttc";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_price";
+		$sql .= " FROM ".$this->db->prefix()."product_price";
 		$sql .= " WHERE fk_product = ".((int) $fromId);
 		$sql .= " ORDER BY date_price DESC";
 		if ($conf->global->PRODUIT_MULTIPRICES_LIMIT > 0) {
@@ -4363,8 +4421,8 @@ class Product extends CommonObject
 		// phpcs:enable
 		$this->db->begin();
 
-		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_association (fk_product_pere, fk_product_fils, qty)';
-		$sql .= " SELECT ".$toId.", fk_product_fils, qty FROM ".MAIN_DB_PREFIX."product_association";
+		$sql = 'INSERT INTO '.$this->db->prefix().'product_association (fk_product_pere, fk_product_fils, qty)';
+		$sql .= " SELECT ".$toId.", fk_product_fils, qty FROM ".$this->db->prefix()."product_association";
 		$sql .= " WHERE fk_product_pere = ".((int) $fromId);
 
 		dol_syslog(get_class($this).'::clone_association', LOG_DEBUG);
@@ -4393,10 +4451,10 @@ class Product extends CommonObject
 		$now = dol_now();
 
 		// les fournisseurs
-		/*$sql = "INSERT ".MAIN_DB_PREFIX."product_fournisseur ("
+		/*$sql = "INSERT ".$this->db->prefix()."product_fournisseur ("
 		 . " datec, fk_product, fk_soc, ref_fourn, fk_user_author )"
 		 . " SELECT '".$this->db->idate($now)."', ".$toId.", fk_soc, ref_fourn, fk_user_author"
-		 . " FROM ".MAIN_DB_PREFIX."product_fournisseur"
+		 . " FROM ".$this->db->prefix()."product_fournisseur"
 		 . " WHERE fk_product = ".((int) $fromId);
 
 		 if ( ! $this->db->query($sql ) )
@@ -4406,10 +4464,10 @@ class Product extends CommonObject
 		 }*/
 
 		// les prix de fournisseurs.
-		$sql = "INSERT ".MAIN_DB_PREFIX."product_fournisseur_price (";
+		$sql = "INSERT ".$this->db->prefix()."product_fournisseur_price (";
 		$sql .= " datec, fk_product, fk_soc, price, quantity, fk_user)";
 		$sql .= " SELECT '".$this->db->idate($now)."', ".((int) $toId).", fk_soc, price, quantity, fk_user";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
+		$sql .= " FROM ".$this->db->prefix()."product_fournisseur_price";
 		$sql .= " WHERE fk_product = ".((int) $fromId);
 
 		dol_syslog(get_class($this).'::clone_fournisseurs', LOG_DEBUG);
@@ -4527,7 +4585,7 @@ class Product extends CommonObject
 		$nb = 0;
 
 		$sql = "SELECT COUNT(pa.rowid) as nb";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_association as pa";
+		$sql .= " FROM ".$this->db->prefix()."product_association as pa";
 		if ($mode == 0) {
 			$sql .= " WHERE pa.fk_product_fils = ".((int) $this->id)." OR pa.fk_product_pere = ".((int) $this->id);
 		} elseif ($mode == -1) {
@@ -4557,7 +4615,7 @@ class Product extends CommonObject
 	public function hasVariants()
 	{
 		$nb = 0;
-		$sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".$this->id;
+		$sql = "SELECT count(rowid) as nb FROM ".$this->db->prefix()."product_attribute_combination WHERE fk_product_parent = ".((int) $this->id);
 		$sql .= " AND entity IN (".getEntity('product').")";
 
 		$resql = $this->db->query($sql);
@@ -4581,7 +4639,7 @@ class Product extends CommonObject
 	{
 		global $conf;
 		if (!empty($conf->variants->enabled)) {
-			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_child = ".$this->id." AND entity IN (".getEntity('product').")";
+			$sql = "SELECT rowid FROM ".$this->db->prefix()."product_attribute_combination WHERE fk_product_child = ".((int) $this->id)." AND entity IN (".getEntity('product').")";
 
 			$query = $this->db->query($sql);
 
@@ -4609,8 +4667,8 @@ class Product extends CommonObject
 	{
 		$sql = "SELECT p.rowid, p.label as label, p.ref as ref, pa.fk_product_pere as id, p.fk_product_type, pa.qty, pa.incdec, p.entity";
 		$sql .= ", p.tosell as status, p.tobuy as status_buy";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_association as pa,";
-		$sql .= " ".MAIN_DB_PREFIX."product as p";
+		$sql .= " FROM ".$this->db->prefix()."product_association as pa,";
+		$sql .= " ".$this->db->prefix()."product as p";
 		$sql .= " WHERE p.rowid = pa.fk_product_pere";
 		$sql .= " AND pa.fk_product_fils = ".((int) $this->id);
 
@@ -4654,12 +4712,14 @@ class Product extends CommonObject
 		}
 
 		$sql = "SELECT p.rowid, p.ref, p.label as label, p.fk_product_type,";
-		$sql .= " pa.qty as qty, pa.fk_product_fils as id, pa.incdec";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product as p,";
-		$sql .= " ".MAIN_DB_PREFIX."product_association as pa";
+		$sql .= " pa.qty as qty, pa.fk_product_fils as id, pa.incdec,";
+		$sql .= " pa.rowid as fk_association, pa.rang";
+		$sql .= " FROM ".$this->db->prefix()."product as p,";
+		$sql .= " ".$this->db->prefix()."product_association as pa";
 		$sql .= " WHERE p.rowid = pa.fk_product_fils";
 		$sql .= " AND pa.fk_product_pere = ".((int) $id);
 		$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);
 
@@ -4686,7 +4746,9 @@ class Product extends CommonObject
 					2=>$rec['fk_product_type'],
 					3=>$this->db->escape($rec['label']),
 					4=>$rec['incdec'],
-					5=>$rec['ref']
+					5=>$rec['ref'],
+					6=>$rec['fk_association'],
+					7=>$rec['rang']
 				);
 				//$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']);
@@ -4750,9 +4812,10 @@ class Product extends CommonObject
 		if (!empty($this->entity)) {
 			$tmpphoto = $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 80);
 			if ($this->nbphoto > 0) {
-				$label .= '<div class="photointooltip">';
+				$label .= '<div class="photointooltip floatright">';
 				$label .= $tmpphoto;
-				$label .= '</div><div style="clear: both;"></div>';
+				$label .= '</div>';
+				//$label .= '<div style="clear: both;"></div>';
 			}
 		}
 
@@ -4969,21 +5032,21 @@ class Product extends CommonObject
 		if ($type == 2) {
 			switch ($mode) {
 				case 0:
-					$label = ($status == 0 ? $langs->trans('ProductStatusNotOnBatch') : ($status == 1 ? $langs->trans('ProductStatusOnBatch') : $langs->trans('ProductStatusOnSerial')));
+					$label = ($status == 0 ? $langs->transnoentitiesnoconv('ProductStatusNotOnBatch') : ($status == 1 ? $langs->transnoentitiesnoconv('ProductStatusOnBatch') : $langs->transnoentitiesnoconv('ProductStatusOnSerial')));
 					return dolGetStatus($label);
 				case 1:
-					$label = ($status == 0 ? $langs->trans('ProductStatusNotOnBatchShort') : ($status == 1 ? $langs->trans('ProductStatusOnBatchShort') : $langs->trans('ProductStatusOnSerialShort')));
+					$label = ($status == 0 ? $langs->transnoentitiesnoconv('ProductStatusNotOnBatchShort') : ($status == 1 ? $langs->transnoentitiesnoconv('ProductStatusOnBatchShort') : $langs->transnoentitiesnoconv('ProductStatusOnSerialShort')));
 					return dolGetStatus($label);
 				case 2:
 					return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 1, 2);
 				case 3:
-					return dolGetStatus($langs->trans('ProductStatusNotOnBatch'), '', '', empty($status) ? 'status5' : 'status4', 3, 'dot');
+					return dolGetStatus($langs->transnoentitiesnoconv('ProductStatusNotOnBatch'), '', '', empty($status) ? 'status5' : 'status4', 3, 'dot');
 				case 4:
 					return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 0, 2);
 				case 5:
 					return $this->LibStatut($status, 1, 2).' '.$this->LibStatut($status, 3, 2);
 				default:
-					return dolGetStatus($langs->trans('Unknown'));
+					return dolGetStatus($langs->transnoentitiesnoconv('Unknown'));
 			}
 		}
 
@@ -4992,34 +5055,34 @@ class Product extends CommonObject
 		if ($status == 0) {
 			// $type   0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
 			if ($type == 0) {
-				$labelStatus = $langs->trans('ProductStatusNotOnSellShort');
-				$labelStatusShort = $langs->trans('ProductStatusNotOnSell');
+				$labelStatus = $langs->transnoentitiesnoconv('ProductStatusNotOnSellShort');
+				$labelStatusShort = $langs->transnoentitiesnoconv('ProductStatusNotOnSell');
 			} elseif ($type == 1) {
-				$labelStatus = $langs->trans('ProductStatusNotOnBuyShort');
-				$labelStatusShort = $langs->trans('ProductStatusNotOnBuy');
+				$labelStatus = $langs->transnoentitiesnoconv('ProductStatusNotOnBuyShort');
+				$labelStatusShort = $langs->transnoentitiesnoconv('ProductStatusNotOnBuy');
 			} elseif ($type == 2) {
-				$labelStatus = $langs->trans('ProductStatusNotOnBatch');
-				$labelStatusShort = $langs->trans('ProductStatusNotOnBatchShort');
+				$labelStatus = $langs->transnoentitiesnoconv('ProductStatusNotOnBatch');
+				$labelStatusShort = $langs->transnoentitiesnoconv('ProductStatusNotOnBatchShort');
 			}
 		} elseif ($status == 1) {
 			// $type   0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
 			if ($type == 0) {
-				$labelStatus = $langs->trans('ProductStatusOnSellShort');
-				$labelStatusShort = $langs->trans('ProductStatusOnSell');
+				$labelStatus = $langs->transnoentitiesnoconv('ProductStatusOnSellShort');
+				$labelStatusShort = $langs->transnoentitiesnoconv('ProductStatusOnSell');
 			} elseif ($type == 1) {
-				$labelStatus = $langs->trans('ProductStatusOnBuyShort');
-				$labelStatusShort = $langs->trans('ProductStatusOnBuy');
+				$labelStatus = $langs->transnoentitiesnoconv('ProductStatusOnBuyShort');
+				$labelStatusShort = $langs->transnoentitiesnoconv('ProductStatusOnBuy');
 			} elseif ($type == 2) {
-				$labelStatus = ($status == 1 ? $langs->trans('ProductStatusOnBatch') : $langs->trans('ProductStatusOnSerial'));
-				$labelStatusShort = ($status == 1 ? $langs->trans('ProductStatusOnBatchShort') : $langs->trans('ProductStatusOnSerialShort'));
+				$labelStatus = ($status == 1 ? $langs->transnoentitiesnoconv('ProductStatusOnBatch') : $langs->transnoentitiesnoconv('ProductStatusOnSerial'));
+				$labelStatusShort = ($status == 1 ? $langs->transnoentitiesnoconv('ProductStatusOnBatchShort') : $langs->transnoentitiesnoconv('ProductStatusOnSerialShort'));
 			}
 		} elseif ( $type == 2 && $status == 2 ) {
-			$labelStatus = $langs->trans('ProductStatusOnSerial');
-			$labelStatusShort = $langs->trans('ProductStatusOnSerialShort');
+			$labelStatus = $langs->transnoentitiesnoconv('ProductStatusOnSerial');
+			$labelStatusShort = $langs->transnoentitiesnoconv('ProductStatusOnSerialShort');
 		}
 
 		if ($mode > 6) {
-			return dolGetStatus($langs->trans('Unknown'), '', '', 'status0', 0);
+			return dolGetStatus($langs->transnoentitiesnoconv('Unknown'), '', '', 'status0', 0);
 		} else {
 			return dolGetStatus($labelStatus, $labelStatusShort, '', $statuttrans, $mode);
 		}
@@ -5037,7 +5100,7 @@ class Product extends CommonObject
 		$langs->load('products');
 
 		if (isset($this->finished) && $this->finished >= 0) {
-			$sql = 'SELECT label, code FROM '.MAIN_DB_PREFIX.'c_product_nature where code='.((int) $this->finished).' AND active=1';
+			$sql = "SELECT label, code FROM ".$this->db->prefix()."c_product_nature where code = ".((int) $this->finished)." AND active=1";
 			$resql = $this->db->query($sql);
 			if ($resql && $this->db->num_rows($resql) > 0) {
 				$res = $this->db->fetch_array($resql);
@@ -5061,7 +5124,7 @@ class Product extends CommonObject
 	 *
 	 * @param  User   $user           user asking change
 	 * @param  int    $id_entrepot    id of warehouse
-	 * @param  double $nbpiece        nb of units
+	 * @param  double $nbpiece        nb of units (should be always positive, use $movement to decide if we add or remove)
 	 * @param  int    $movement       0 = add, 1 = remove
 	 * @param  string $label          Label of stock movement
 	 * @param  double $price          Unit price HT of product, used to calculate average weighted price (PMP in french). If 0, average weighted price is not changed.
@@ -5069,9 +5132,10 @@ class Product extends CommonObject
 	 * @param  string $origin_element Origin element type
 	 * @param  int    $origin_id      Origin id of element
 	 * @param  int	  $disablestockchangeforsubproduct	Disable stock change for sub-products of kit (usefull only if product is a subproduct)
-	 * @return int                     <0 if KO, >0 if OK
+	 * @param  array  $extrafields	  Array of extrafields
+	 * @return int                    <0 if KO, >0 if OK
 	 */
-	public function correct_stock($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0)
+	public function correct_stock($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0, $extrafields = null)
 	{
 		// phpcs:enable
 		if ($id_entrepot) {
@@ -5079,14 +5143,26 @@ class Product extends CommonObject
 
 			include_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
+			if ($nbpiece < 0) {
+				if (!$movement) {
+					$movement = 1;
+				}
+				$nbpiece = abs($nbpiece);
+			}
+
 			$op[0] = "+".trim($nbpiece);
 			$op[1] = "-".trim($nbpiece);
 
 			$movementstock = new MouvementStock($this->db);
-			$movementstock->setOrigin($origin_element, $origin_id); // Set ->origin and ->origin->id
+			$movementstock->setOrigin($origin_element, $origin_id); // Set ->origin_type and ->origin_id
 			$result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode, '', '', '', '', false, 0, $disablestockchangeforsubproduct);
 
 			if ($result >= 0) {
+				if ($extrafields) {
+					$array_options = $extrafields->getOptionalsFromPost('stock_mouvement');
+					$movementstock->array_options = $array_options;
+					$movementstock->insertExtraFields();
+				}
 				$this->db->commit();
 				return 1;
 			} else {
@@ -5105,7 +5181,7 @@ class Product extends CommonObject
 	 *
 	 * @param  User     $user           user asking change
 	 * @param  int      $id_entrepot    id of warehouse
-	 * @param  double   $nbpiece        nb of units
+	 * @param  double   $nbpiece        nb of units (should be always positive, use $movement to decide if we add or remove)
 	 * @param  int      $movement       0 = add, 1 = remove
 	 * @param  string   $label          Label of stock movement
 	 * @param  double   $price          Price to use for stock eval
@@ -5116,9 +5192,10 @@ class Product extends CommonObject
 	 * @param  string   $origin_element Origin element type
 	 * @param  int      $origin_id      Origin id of element
 	 * @param  int	    $disablestockchangeforsubproduct	Disable stock change for sub-products of kit (usefull only if product is a subproduct)
+	 * @param  array    $extrafields	Array of extrafields
 	 * @return int                      <0 if KO, >0 if OK
 	 */
-	public function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $dlc = '', $dluo = '', $lot = '', $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0)
+	public function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $dlc = '', $dluo = '', $lot = '', $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0, $extrafields = null)
 	{
 		// phpcs:enable
 		if ($id_entrepot) {
@@ -5126,14 +5203,26 @@ class Product extends CommonObject
 
 			include_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
+			if ($nbpiece < 0) {
+				if (!$movement) {
+					$movement = 1;
+				}
+				$nbpiece = abs($nbpiece);
+			}
+
 			$op[0] = "+".trim($nbpiece);
 			$op[1] = "-".trim($nbpiece);
 
 			$movementstock = new MouvementStock($this->db);
-			$movementstock->setOrigin($origin_element, $origin_id);
+			$movementstock->setOrigin($origin_element, $origin_id); // Set ->origin_type and ->fk_origin
 			$result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode, '', $dlc, $dluo, $lot, false, 0, $disablestockchangeforsubproduct);
 
 			if ($result >= 0) {
+				if ($extrafields) {
+					$array_options = $extrafields->getOptionalsFromPost('stock_mouvement');
+					$movementstock->array_options = $array_options;
+					$movementstock->insertExtraFields();
+				}
 				$this->db->commit();
 				return 1;
 			} else {
@@ -5184,8 +5273,8 @@ class Product extends CommonObject
 		}
 
 		$sql = "SELECT ps.rowid, ps.reel, ps.fk_entrepot";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
-		$sql .= ", ".MAIN_DB_PREFIX."entrepot as w";
+		$sql .= " FROM ".$this->db->prefix()."product_stock as ps";
+		$sql .= ", ".$this->db->prefix()."entrepot as w";
 		$sql .= " WHERE w.entity IN (".getEntity('stock').")";
 		$sql .= " AND w.rowid = ps.fk_entrepot";
 		$sql .= " AND ps.fk_product = ".((int) $this->id);
@@ -5361,7 +5450,7 @@ class Product extends CommonObject
 	{
 		$result = array();
 
-		$sql = "SELECT pb.batch, pb.eatby, pb.sellby, SUM(pb.qty) AS qty FROM ".MAIN_DB_PREFIX."product_batch as pb, ".MAIN_DB_PREFIX."product_stock as ps";
+		$sql = "SELECT pb.batch, pb.eatby, pb.sellby, SUM(pb.qty) AS qty FROM ".$this->db->prefix()."product_batch as pb, ".$this->db->prefix()."product_stock as ps";
 		$sql .= " WHERE pb.fk_product_stock = ps.rowid AND ps.fk_product = ".((int) $this->id)." AND pb.batch = '".$this->db->escape($batch)."'";
 		$sql .= " GROUP BY pb.batch, pb.eatby, pb.sellby";
 		dol_syslog(get_class($this)."::loadBatchInfo load first entry found for lot/serial = ".$batch, LOG_DEBUG);
@@ -5595,7 +5684,7 @@ class Product extends CommonObject
 		$this->nb = array();
 
 		$sql = "SELECT count(p.rowid) as nb, fk_product_type";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+		$sql .= " FROM ".$this->db->prefix()."product as p";
 		$sql .= ' WHERE p.entity IN ('.getEntity($this->element, 1).')';
 		// Add where from hooks
 		if (is_object($hookmanager)) {
@@ -5643,6 +5732,16 @@ class Product extends CommonObject
 		return ($this->type == Product::TYPE_SERVICE ? true : false);
 	}
 
+
+	/**
+	 * Return if  object have a constraint on mandatory_period
+	 *
+	 * @return boolean     True if mandatory_period setted to 1
+	 */
+	public function isMandatoryPeriod()
+	{
+		return ($this->mandatory_period == 1 ? true : false);
+	}
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Get a barcode from the module to generate barcode values.
@@ -5743,7 +5842,8 @@ class Product extends CommonObject
 			$label_type = 'short_label';
 		}
 
-		$sql = 'select '.$label_type.', code from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
+		$sql = "SELECT ".$label_type.", code from ".$this->db->prefix()."c_units where rowid = ".((int) $this->fk_unit);
+
 		$resql = $this->db->query($sql);
 		if ($resql && $this->db->num_rows($resql) > 0) {
 			$res = $this->db->fetch_array($resql);
@@ -5751,7 +5851,7 @@ class Product extends CommonObject
 			$this->db->free($resql);
 			return $label;
 		} else {
-			$this->error = $this->db->error().' sql='.$sql;
+			$this->error = $this->db->error();
 			dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -5813,7 +5913,6 @@ class Product extends CommonObject
 	 */
 	public function setCategories($categories)
 	{
-
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		return parent::setCategoriesCommon($categories, Categorie::TYPE_PRODUCT);
 	}
@@ -5851,7 +5950,7 @@ class Product extends CommonObject
 	{
 		global $conf, $db;
 
-		$sql = "SELECT rowid, level, fk_level, var_percent, var_min_percent FROM ".MAIN_DB_PREFIX."product_pricerules";
+		$sql = "SELECT rowid, level, fk_level, var_percent, var_min_percent FROM ".$this->db->prefix()."product_pricerules";
 		$query = $this->db->query($sql);
 
 		$rules = array();
@@ -5924,7 +6023,7 @@ class Product extends CommonObject
 	{
 		$sql = "SELECT p.rowid, p.ref, p.datec as date_creation, p.tms as date_modification,";
 		$sql .= " p.fk_user_author, p.fk_user_modif";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p";
+		$sql .= " FROM ".$this->db->prefix().$this->table_element." as p";
 		$sql .= " WHERE p.rowid = ".((int) $id);
 
 		$result = $this->db->query($sql);
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index f7f604b5399..5149dd2c708 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -87,7 +87,7 @@ class Productbatch extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_batch (";
+		$sql = "INSERT INTO ".$this->db->prefix()."product_batch (";
 		$sql .= "fk_product_stock,";
 		$sql .= "sellby,";				// no more used
 		$sql .= "eatby,";				// no more used
@@ -111,7 +111,7 @@ class Productbatch extends CommonObject
 			$error++; $this->errors[] = "Error ".$this->db->lasterror();
 		}
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
+			$this->id = $this->db->last_insert_id($this->db->prefix().self::$_table_element);
 		}
 
 		// Commit or rollback
@@ -149,8 +149,8 @@ class Productbatch extends CommonObject
 		$sql .= " pl.eatby,";
 		$sql .= " pl.sellby";
 
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_batch as t INNER JOIN ".MAIN_DB_PREFIX."product_stock w on t.fk_product_stock = w.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl on pl.fk_product = w.fk_product and pl.batch = t.batch";
+		$sql .= " FROM ".$this->db->prefix()."product_batch as t INNER JOIN ".$this->db->prefix()."product_stock w on t.fk_product_stock = w.rowid";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."product_lot as pl on pl.fk_product = w.fk_product and pl.batch = t.batch";
 		$sql .= " WHERE t.rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -199,7 +199,7 @@ class Productbatch extends CommonObject
 		}
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX.self::$_table_element." SET";
+		$sql = "UPDATE ".$this->db->prefix().self::$_table_element." SET";
 		$sql .= " fk_product_stock=".(isset($this->fk_product_stock) ? $this->fk_product_stock : "null").",";
 		$sql .= " sellby=".(dol_strlen($this->sellby) != 0 ? "'".$this->db->idate($this->sellby)."'" : 'null').",";
 		$sql .= " eatby=".(dol_strlen($this->eatby) != 0 ? "'".$this->db->idate($this->eatby)."'" : 'null').",";
@@ -245,7 +245,7 @@ class Productbatch extends CommonObject
 		$this->db->begin();
 
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX.self::$_table_element."";
+			$sql = "DELETE FROM ".$this->db->prefix().self::$_table_element."";
 			$sql .= " WHERE rowid=".((int) $this->id);
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
@@ -383,7 +383,7 @@ class Productbatch extends CommonObject
 		$sql .= " t.batch,";
 		$sql .= " t.qty,";
 		$sql .= " t.import_key";
-		$sql .= " FROM ".MAIN_DB_PREFIX.self::$_table_element." as t";
+		$sql .= " FROM ".$this->db->prefix().self::$_table_element." as t";
 		$sql .= " WHERE fk_product_stock=".((int) $fk_product_stock);
 
 		if (!empty($eatby)) {
@@ -436,7 +436,8 @@ class Productbatch extends CommonObject
 	 */
 	public static function findAll($db, $fk_product_stock, $with_qty = 0, $fk_product = 0)
 	{
-		global $langs, $conf;
+		global $conf;
+
 		$ret = array();
 
 		$sql = "SELECT";
@@ -452,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 ".MAIN_DB_PREFIX."product_batch as t";
+		$sql .= " FROM ".$db->prefix()."product_batch as t";
 		if ($fk_product > 0) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON pl.fk_product = ".((int) $fk_product)." AND pl.batch = t.batch";
+			$sql .= " LEFT JOIN ".$db->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);
@@ -525,10 +526,10 @@ class Productbatch extends CommonObject
 		$sql .= ", pl.sellby";
 		$sql .= ", pl.eatby";
 		$sql .= ", pb.qty";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_lot as pl";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = pl.fk_product";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_batch AS pb ON pl.batch = pb.batch";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock AS ps ON ps.rowid = pb.fk_product_stock";
+		$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 .= " WHERE p.entity IN (".getEntity('product').")";
 		$sql .= " AND pl.fk_product = ".((int) $fk_product);
 		if ($fk_warehouse > 0) {
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 0683732d6cb..1c91c3804d2 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -188,7 +188,7 @@ class Productcustomerprice extends CommonObject
 		}
 
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_customer_price(";
+		$sql = "INSERT INTO ".$this->db->prefix()."product_customer_price(";
 		$sql .= "entity,";
 		$sql .= "datec,";
 		$sql .= "fk_product,";
@@ -240,7 +240,7 @@ class Productcustomerprice extends CommonObject
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_customer_price");
+			$this->id = $this->db->last_insert_id($this->db->prefix()."product_customer_price");
 
 			if (!$notrigger) {
 				$result = $this->call_trigger('PRODUCT_CUSTOMER_PRICE_CREATE', $user);
@@ -301,7 +301,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " t.localtax2_tx,";
 		$sql .= " t.fk_user,";
 		$sql .= " t.import_key";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_customer_price as t";
+		$sql .= " FROM ".$this->db->prefix()."product_customer_price as t";
 		$sql .= " WHERE t.rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -392,9 +392,9 @@ class Productcustomerprice extends CommonObject
 		$sql .= " t.import_key,";
 		$sql .= " soc.nom as socname,";
 		$sql .= " prod.ref as prodref";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_customer_price as t ";
-		$sql .= " ,".MAIN_DB_PREFIX."product as prod ";
-		$sql .= " ,".MAIN_DB_PREFIX."societe as soc ";
+		$sql .= " FROM ".$this->db->prefix()."product_customer_price as t,";
+		$sql .= " ".$this->db->prefix()."product as prod,";
+		$sql .= " ".$this->db->prefix()."societe as soc";
 		$sql .= " WHERE soc.rowid=t.fk_soc ";
 		$sql .= " AND prod.rowid=t.fk_product ";
 		$sql .= " AND prod.entity IN (".getEntity('product').")";
@@ -404,21 +404,21 @@ class Productcustomerprice extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) {				// To allow $filter['YEAR(s.dated)']=>$year
-					$sql .= ' AND '.$key.' = \''.$this->db->escape($value).'\'';
+					$sql .= " AND ".$key." = '".$this->db->escape($value)."'";
 				} elseif ($key == 'soc.nom') {
-					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sql .= " AND ".$key." LIKE '%".$this->db->escape($value)."%'";
 				} elseif ($key == 'prod.ref' || $key == 'prod.label') {
-					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sql .= " AND ".$key." LIKE '%".$this->db->escape($value)."%'";
 				} elseif ($key == 't.price' || $key == 't.price_ttc') {
-					$sql .= ' AND '.$key.' LIKE \'%'.price2num($value).'%\'';
+					$sql .= " AND ".$key." LIKE '%".price2num($value)."%'";
 				} else {
-					$sql .= ' AND '.$key.' = '.((int) $value);
+					$sql .= " AND ".$key." = ".((int) $value);
 				}
 			}
 		}
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit + 1, $offset);
+			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
 
 		dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
@@ -510,9 +510,9 @@ class Productcustomerprice extends CommonObject
 		$sql .= " t.import_key,";
 		$sql .= " soc.nom as socname,";
 		$sql .= " prod.ref as prodref";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_customer_price_log as t";
-		$sql .= " ,".MAIN_DB_PREFIX."product as prod";
-		$sql .= " ,".MAIN_DB_PREFIX."societe as soc";
+		$sql .= " FROM ".$this->db->prefix()."product_customer_price_log as t";
+		$sql .= " ,".$this->db->prefix()."product as prod";
+		$sql .= " ,".$this->db->prefix()."societe as soc";
 		$sql .= " WHERE soc.rowid=t.fk_soc";
 		$sql .= " AND prod.rowid=t.fk_product ";
 		$sql .= " AND prod.entity IN (".getEntity('product').")";
@@ -521,17 +521,17 @@ class Productcustomerprice extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) { 				// To allow $filter['YEAR(s.dated)']=>$year
-					$sql .= ' AND '.$key.' = \''.$value.'\'';
+					$sql .= " AND ".$key." = '".$this->db->escape($value)."'";
 				} elseif ($key == 'soc.nom') {
-					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sql .= " AND ".$key." LIKE '%".$this->db->escape($value)."%'";
 				} else {
-					$sql .= ' AND '.$key.' = '.((int) $value);
+					$sql .= " AND ".$key." = ".((int) $value);
 				}
 			}
 		}
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit + 1, $offset);
+			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
 
 		dol_syslog(get_class($this)."::fetch_all_log", LOG_DEBUG);
@@ -675,7 +675,7 @@ class Productcustomerprice extends CommonObject
 
 		// Do a copy of current record into log table
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_customer_price_log(";
+		$sql = "INSERT INTO ".$this->db->prefix()."product_customer_price_log(";
 
 		$sql .= "entity,";
 		$sql .= "datec,";
@@ -720,8 +720,8 @@ class Productcustomerprice extends CommonObject
 		$sql .= " t.fk_user,";
 		$sql .= " t.import_key";
 
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_customer_price as t";
-		$sql .= " WHERE t.rowid = ".$this->id;
+		$sql .= " FROM ".$this->db->prefix()."product_customer_price as t";
+		$sql .= " WHERE t.rowid = ".((int) $this->id);
 
 		$this->db->begin();
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -732,14 +732,14 @@ class Productcustomerprice extends CommonObject
 		}
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."product_customer_price SET";
+		$sql = "UPDATE ".$this->db->prefix()."product_customer_price SET";
 
 		$sql .= " entity=".$conf->entity.",";
 		$sql .= " datec='".$this->db->idate(dol_now())."',";
 		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
 		$sql .= " fk_product=".(isset($this->fk_product) ? $this->fk_product : "null").",";
 		$sql .= " fk_soc=".(isset($this->fk_soc) ? $this->fk_soc : "null").",";
-		$sql .= " ref_customer=".(isset($this->ref_customer) ? "'" . $this->db->escape($this->ref_customer) . "'" : "null").",";
+		$sql .= " ref_customer=".(isset($this->ref_customer) ? "'".$this->db->escape($this->ref_customer)."'" : "null").",";
 		$sql .= " price=".(isset($this->price) ? $this->price : "null").",";
 		$sql .= " price_ttc=".(isset($this->price_ttc) ? $this->price_ttc : "null").",";
 		$sql .= " price_min=".(isset($this->price_min) ? $this->price_min : "null").",";
@@ -813,7 +813,7 @@ class Productcustomerprice extends CommonObject
 
 		// Find all susidiaries
 		$sql = "SELECT s.rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " FROM ".$this->db->prefix()."societe as s";
 		$sql .= " WHERE s.parent = ".((int) $this->fk_soc);
 		$sql .= " AND s.entity IN (".getEntity('societe').")";
 
@@ -871,7 +871,7 @@ class Productcustomerprice extends CommonObject
 						$resultupd = $prodsocpricenew->create($user, 0, $forceupdateaffiliate);
 						if ($result < 0) {
 							$error++;
-							$this->error = $prodsocpriceupd->error;
+							$this->error = $prodsocpricenew->error;
 						}
 					}
 				}
@@ -911,7 +911,7 @@ class Productcustomerprice extends CommonObject
 		}
 
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_customer_price";
+			$sql = "DELETE FROM ".$this->db->prefix()."product_customer_price";
 			$sql .= " WHERE rowid=".((int) $this->id);
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index ce04df8f56f..54919ac0be6 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -316,17 +316,17 @@ class ProductFournisseurPrice extends CommonObject
 
 		$records = array();
 
-		$sql = 'SELECT ';
+		$sql = "SELECT ";
 		$sql .= $this->getFieldList();
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
-		else $sql .= ' WHERE 1 = 1';
+		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($this->element).")";
+		else $sql .= " WHERE 1 = 1";
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.' = '.((int) $value);
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
@@ -339,14 +339,14 @@ class ProductFournisseurPrice extends CommonObject
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -433,7 +433,7 @@ class ProductFournisseurPrice extends CommonObject
 
 		if (!empty($num)) {
 			// Validate
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql = "UPDATE ".$this->db->prefix().$this->table_element;
 			$sql .= " SET ref = '".$this->db->escape($num)."',";
 			$sql .= " status = ".self::STATUS_VALIDATED;
 			if (!empty($this->fields['date_validation'])) $sql .= ", date_validation = '".$this->db->idate($now)."'";
@@ -462,7 +462,7 @@ class ProductFournisseurPrice extends CommonObject
 			// 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 = 'productfournisseurprice/".$this->db->escape($this->newref)."'";
+				$sql = 'UPDATE '.$this->db->prefix()."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'productfournisseurprice/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'productfournisseurprice/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
@@ -675,12 +675,12 @@ class ProductFournisseurPrice extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("buypricehistory@buypricehistory");
-			$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');
+			$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;
@@ -698,10 +698,10 @@ class ProductFournisseurPrice extends CommonObject
 	 */
 	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 ".$this->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)) {
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
index 67c24ac37c8..00c492f91de 100644
--- a/htdocs/product/class/propalmergepdfproduct.class.php
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -104,7 +104,7 @@ class Propalmergepdfproduct extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal_merge_pdf_product(";
+		$sql = "INSERT INTO ".$this->db->prefix()."propal_merge_pdf_product(";
 		$sql .= "fk_product,";
 		$sql .= "file_name,";
 		if ($conf->global->MAIN_MULTILANGS) {
@@ -132,7 +132,7 @@ class Propalmergepdfproduct extends CommonObject
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."propal_merge_pdf_product");
+			$this->id = $this->db->last_insert_id($this->db->prefix()."propal_merge_pdf_product");
 		}
 
 		// Commit or rollback
@@ -173,7 +173,7 @@ class Propalmergepdfproduct extends CommonObject
 		$sql .= " t.import_key";
 
 
-		$sql .= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
+		$sql .= " FROM ".$this->db->prefix()."propal_merge_pdf_product as t";
 		$sql .= " WHERE t.rowid = ".((int) $id);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -231,9 +231,9 @@ class Propalmergepdfproduct extends CommonObject
 		$sql .= " t.import_key";
 
 
-		$sql .= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
+		$sql .= " FROM ".$this->db->prefix()."propal_merge_pdf_product as t";
 		$sql .= " WHERE t.fk_product = ".((int) $product_id);
-		if ($conf->global->MAIN_MULTILANGS && !empty($lang)) {
+		if (!empty($conf->global->MAIN_MULTILANGS) && !empty($lang)) {
 			$sql .= " AND t.lang = '".$this->db->escape($lang)."'";
 		}
 
@@ -248,7 +248,7 @@ class Propalmergepdfproduct extends CommonObject
 
 					$line->fk_product = $obj->fk_product;
 					$line->file_name = $obj->file_name;
-					if ($conf->global->MAIN_MULTILANGS) {
+					if (!empty($conf->global->MAIN_MULTILANGS)) {
 						$line->lang = $obj->lang;
 					}
 					$line->fk_user_author = $obj->fk_user_author;
@@ -258,7 +258,7 @@ class Propalmergepdfproduct extends CommonObject
 					$line->import_key = $obj->import_key;
 
 
-					if ($conf->global->MAIN_MULTILANGS) {
+					if (!empty($conf->global->MAIN_MULTILANGS)) {
 						$this->lines[$obj->file_name.'_'.$obj->lang] = $line;
 					} else {
 						$this->lines[$obj->file_name] = $line;
@@ -307,7 +307,7 @@ class Propalmergepdfproduct extends CommonObject
 		// Put here code to add a control on parameters values
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."propal_merge_pdf_product SET";
+		$sql = "UPDATE ".$this->db->prefix()."propal_merge_pdf_product SET";
 
 		$sql .= " fk_product=".(isset($this->fk_product) ? $this->fk_product : "null").",";
 		$sql .= " file_name=".(isset($this->file_name) ? "'".$this->db->escape($this->file_name)."'" : "null").",";
@@ -357,7 +357,7 @@ class Propalmergepdfproduct extends CommonObject
 		$this->db->begin();
 
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
+			$sql = "DELETE FROM ".$this->db->prefix()."propal_merge_pdf_product";
 			$sql .= " WHERE rowid=".((int) $this->id);
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
@@ -400,7 +400,7 @@ class Propalmergepdfproduct extends CommonObject
 		$this->db->begin();
 
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
+			$sql = "DELETE FROM ".$this->db->prefix()."propal_merge_pdf_product";
 			$sql .= " WHERE fk_product = ".((int) $product_id);
 
 			if ($conf->global->MAIN_MULTILANGS && !empty($lang_id)) {
@@ -444,8 +444,8 @@ class Propalmergepdfproduct extends CommonObject
 		$this->db->begin();
 
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
-			$sql .= " WHERE fk_product=".$this->fk_product." AND file_name='".$this->db->escape($this->file_name)."'";
+			$sql = "DELETE FROM ".$this->db->prefix()."propal_merge_pdf_product";
+			$sql .= " WHERE fk_product = ".((int) $this->fk_product)." AND file_name = '".$this->db->escape($this->file_name)."'";
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index e1250f10cb3..d5325029771 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -24,7 +24,7 @@
 /**
  *  \file       htdocs/product/composition/card.php
  *  \ingroup    product
- *  \brief      Page de la fiche produit
+ *  \brief      Page of product file
  */
 
 require '../../main.inc.php';
@@ -51,6 +51,9 @@ if (!empty($user->socid)) {
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
 $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('productcompositioncard', 'globalcard'));
+
 $object = new Product($db);
 $objectid = 0;
 if ($id > 0 || !empty($ref)) {
@@ -129,6 +132,8 @@ if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->se
 		setEventMessages('RecordSaved', null);
 	}
 	$action = '';
+	header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
+	exit;
 }
 
 
@@ -265,8 +270,18 @@ if ($id > 0 || !empty($ref)) {
 
 		$prodsfather = $object->getFather(); // Parent Products
 		$object->get_sousproduits_arbo(); // Load $object->sousprods
+		$parent_label = $object->label;
 		$prods_arbo = $object->get_arbo_each_prod();
 
+		$tmpid = $id;
+		if (! empty($conf->use_javascript_ajax)) {
+			$nboflines = $prods_arbo;
+			$table_element_line='product_association';
+
+			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+		}
+		$id = $tmpid;
+
 		$nbofsubsubproducts = count($prods_arbo); // This include sub sub product into nb
 		$prodschild = $object->getChildsArbo($id, 1);
 		$nbofsubproducts = count($prodschild); // This include only first level of childs
@@ -320,18 +335,29 @@ if ($id > 0 || !empty($ref)) {
 		print '<input type="hidden" name="action" value="save_composed_product" />';
 		print '<input type="hidden" name="id" value="'.$id.'" />';
 
-		print '<table class="liste">';
+		print '<table id="tablelines" class="ui-sortable liste nobottom">';
 
-		print '<tr class="liste_titre">';
+		print '<tr class="liste_titre nodrag nodrop">';
+		// Rank
+		print '<td>'.$langs->trans('Position').'</td>';
+		// Product ref
 		print '<td>'.$langs->trans('ComposedProduct').'</td>';
+		// Product label
 		print '<td>'.$langs->trans('Label').'</td>';
+		// Min supplier price
 		print '<td class="right" colspan="2">'.$langs->trans('MinSupplierPrice').'</td>';
+		// Min customer price
 		print '<td class="right" colspan="2">'.$langs->trans('MinCustomerPrice').'</td>';
+		// Stock
 		if (!empty($conf->stock->enabled)) {
 			print '<td class="right">'.$langs->trans('Stock').'</td>';
 		}
+		// Qty in kit
 		print '<td class="center">'.$langs->trans('Qty').'</td>';
+		// Stoc inc/dev
 		print '<td class="center">'.$langs->trans('ComposedProductIncDecStock').'</td>';
+		// Move
+		print '<td class="linecolmove" style="width: 10px"></td>';
 		print '</tr>'."\n";
 
 		$totalsell = 0;
@@ -340,12 +366,18 @@ if ($id > 0 || !empty($ref)) {
 				$productstatic->fetch($value['id']);
 
 				if ($value['level'] <= 1) {
-					print '<tr class="oddeven">';
+					print '<tr id="'.$object->sousprods[$parent_label][$value['id']][6].'" class="drag drop oddeven level1">';
+
+					// Rank
+					print '<td>'.$object->sousprods[$parent_label][$value['id']][7].'</td>';
 
 					$notdefined = 0;
 					$nb_of_subproduct = $value['nb'];
 
+					// Product ref
 					print '<td>'.$productstatic->getNomUrl(1, 'composition').'</td>';
+
+					// Product label
 					print '<td>'.$productstatic->label.'</td>';
 
 					// Best buying price
@@ -369,8 +401,8 @@ if ($id > 0 || !empty($ref)) {
 					$totalline = price2num($value['nb'] * ($fourn_unitprice * (1 - ($fourn_remise_percent / 100)) - $fourn_remise), 'MT');
 					$total += $totalline;
 
-					print '<td class="right">';
-					print ($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x' : '').price($unitline, '', '', 0, 0, -1, $conf->currency));
+					print '<td class="right nowraponall">';
+					print ($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x ' : '').'<span class="amount">'.price($unitline, '', '', 0, 0, -1, $conf->currency)).'</span>';
 					print '</td>';
 
 					// Best selling price
@@ -382,11 +414,11 @@ if ($id > 0 || !empty($ref)) {
 						$totalsell += $totallinesell;
 					}
 					print '<td class="right" colspan="2">';
-					print ($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x' : ''));
+					print ($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x ' : ''));
 					if (is_numeric($pricesell)) {
-						print price($pricesell, '', '', 0, 0, -1, $conf->currency);
+						print '<span class="amount">'.price($pricesell, '', '', 0, 0, -1, $conf->currency).'</span>';
 					} else {
-						print $langs->trans($pricesell);
+						print '<span class="opacitymedium">'.$langs->trans($pricesell).'</span>';
 					}
 					print '</td>';
 
@@ -404,6 +436,9 @@ if ($id > 0 || !empty($ref)) {
 						print '<td>'.($value['incdec'] == 1 ? 'x' : '').'</td>';
 					}
 
+					// Move action
+					print '<td class="linecolmove tdlineupdown center"></td>';
+
 					print '</tr>'."\n";
 				} else {
 					$hide = '';
@@ -411,15 +446,22 @@ if ($id > 0 || !empty($ref)) {
 						$hide = ' hideobject'; // By default, we do not show this. It makes screen very difficult to understand
 					}
 
-					print '<tr class="oddeven'.$hide.'" id="sub-'.$value['id_parent'].'">';
+					print '<tr class="oddeven'.$hide.'" id="sub-'.$value['id_parent'].'" data-ignoreidfordnd=1>';
 
 					//$productstatic->ref=$value['label'];
 					$productstatic->ref = $value['ref'];
+
+					// Rankd
+					print '<td></td>';
+
+					// Product ref
 					print '<td>';
 					for ($i = 0; $i < $value['level']; $i++) {
 						print ' &nbsp; &nbsp; '; // Add indentation
 					}
 					print $productstatic->getNomUrl(1, 'composition').'</td>';
+
+					// Product label
 					print '<td>'.$productstatic->label.'</td>';
 
 					// Best buying price
@@ -429,18 +471,36 @@ if ($id > 0 || !empty($ref)) {
 					print '<td>&nbsp;</td>';
 					print '<td>&nbsp;</td>';
 
+					// Stock
 					if (!empty($conf->stock->enabled)) {
 						print '<td></td>'; // Real stock
 					}
+
+					// Qty in kit
 					print '<td class="center">'.$value['nb'].'</td>';
+
+					// Inc/dec
+					print '<td>&nbsp;</td>';
+
+					// Action move
 					print '<td>&nbsp;</td>';
 
 					print '</tr>'."\n";
 				}
 			}
 
+
+			// Total
+
 			print '<tr class="liste_total">';
+
+			// Rank
+			print '<td></td>';
+
+			// Product ref
 			print '<td class="liste_total"></td>';
+
+			// Product label
 			print '<td class="liste_total"></td>';
 
 			// Minimum buying price
@@ -472,11 +532,16 @@ if ($id > 0 || !empty($ref)) {
 				print '<td class="liste_total right">&nbsp;</td>';
 			}
 
-			print '<td class="right" colspan="2">';
+			print '<td></td>';
+
+			print '<td class="center">';
 			if ($user->rights->produit->creer || $user->rights->service->creer) {
 				print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
 			}
 			print '</td>';
+
+			print '<td></td>';
+
 			print '</tr>'."\n";
 		} else {
 			$colspan = 8;
@@ -538,6 +603,7 @@ if ($id > 0 || !empty($ref)) {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="add_prod">';
 			print '<input type="hidden" name="id" value="'.$id.'">';
+
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre">';
 			print '<th class="liste_titre">'.$langs->trans("ComposedProduct").'</td>';
@@ -647,9 +713,8 @@ if ($id > 0 || !empty($ref)) {
 			print '<input type="hidden" name="max_prod" value="'.$i.'">';
 
 			if ($num > 0) {
-				print '<br><div class="center">';
-				print '<input type="submit" class="button" name="save" value="'.$langs->trans("Add").'/'.$langs->trans("Update").'">';
-				print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+				print '<div class="center">';
+				print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Add").'/'.$langs->trans("Update").'">';
 				print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 				print '</div>';
 			}
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 0b15ad7a85c..79ff858ba6e 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -58,8 +58,8 @@ $hookmanager->initHooks(array('productdocuments'));
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -96,8 +96,6 @@ if ($id > 0 || !empty($ref)) {
 $modulepart = 'produit';
 
 
-$permissiontoadd = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
-
 if ($object->id > 0) {
 	if ($object->type == $object::TYPE_PRODUCT) {
 		restrictedArea($user, 'produit', $object->id, 'product&product', '', '');
@@ -109,6 +107,8 @@ if ($object->id > 0) {
 	restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 }
 
+$permissiontoadd = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
+
 
 /*
  * Actions
diff --git a/htdocs/product/dynamic_price/class/price_expression.class.php b/htdocs/product/dynamic_price/class/price_expression.class.php
index db0c427c334..255908726d4 100644
--- a/htdocs/product/dynamic_price/class/price_expression.class.php
+++ b/htdocs/product/dynamic_price/class/price_expression.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
-/* Copyright (C) 2015      Ion Agorria          <ion@agorria.com>
+ * Copyright (C) 2015      Ion Agorria          <ion@agorria.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
@@ -88,7 +88,7 @@ class PriceExpression
 		}
 
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+		$sql = "INSERT INTO ".$this->db->prefix().$this->table_element." (";
 		$sql .= "title, expression";
 		$sql .= ") VALUES (";
 		$sql .= " ".(isset($this->title) ? "'".$this->db->escape($this->title)."'" : "''").",";
@@ -104,7 +104,7 @@ class PriceExpression
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);
 
 			//if (! $notrigger)
 			//{
@@ -148,7 +148,7 @@ class PriceExpression
 		}
 
 		$sql = "SELECT title, expression";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " FROM ".$this->db->prefix().$this->table_element;
 		$sql .= " WHERE rowid = ".((int) $id);
 
 		dol_syslog(__METHOD__);
@@ -179,7 +179,7 @@ class PriceExpression
 	{
 		// phpcs:enable
 		$sql = "SELECT rowid, title, expression";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " FROM ".$this->db->prefix().$this->table_element;
 		$sql .= " ORDER BY title";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -215,7 +215,7 @@ class PriceExpression
 	{
 		// phpcs:enable
 		$sql = "SELECT rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " FROM ".$this->db->prefix().$this->table_element;
 		$sql .= " WHERE title = '".$this->db->escape($title)."'";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -254,10 +254,10 @@ class PriceExpression
 		}
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element." SET";
 		$sql .= " title = ".(isset($this->title) ? "'".$this->db->escape($this->title)."'" : "''").",";
 		$sql .= " expression = ".(isset($this->expression) ? "'".$this->db->escape($this->expression)."'" : "''")."";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$this->db->begin();
 
@@ -326,7 +326,7 @@ class PriceExpression
 		//}
 
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql = "DELETE FROM ".$this->db->prefix().$this->table_element;
 			$sql .= " WHERE rowid = ".((int) $rowid);
 
 			dol_syslog(__METHOD__);
diff --git a/htdocs/product/dynamic_price/class/price_global_variable.class.php b/htdocs/product/dynamic_price/class/price_global_variable.class.php
index 87cb8dea2c5..336fb024470 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
-/* Copyright (C) 2015      Ion Agorria          <ion@agorria.com>
+ * Copyright (C) 2015      Ion Agorria          <ion@agorria.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
@@ -88,7 +88,7 @@ class PriceGlobalVariable
 		$this->checkParameters();
 
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+		$sql = "INSERT INTO ".$this->db->prefix().$this->table_element." (";
 		$sql .= "code, description, value";
 		$sql .= ") VALUES (";
 		$sql .= " ".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "''").",";
@@ -105,7 +105,7 @@ class PriceGlobalVariable
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);
 
 			if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
@@ -142,7 +142,7 @@ class PriceGlobalVariable
 	public function fetch($id)
 	{
 		$sql = "SELECT code, description, value";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " FROM ".$this->db->prefix().$this->table_element;
 		$sql .= " WHERE rowid = ".((int) $id);
 
 		dol_syslog(__METHOD__);
@@ -179,11 +179,11 @@ class PriceGlobalVariable
 		$this->checkParameters();
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element." SET";
 		$sql .= " code = ".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "''").",";
 		$sql .= " description = ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
 		$sql .= " value = ".((float) $this->value);
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$this->db->begin();
 
@@ -249,7 +249,7 @@ class PriceGlobalVariable
 		}
 
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql = "DELETE FROM ".$this->db->prefix().$this->table_element;
 			$sql .= " WHERE rowid = ".((int) $rowid);
 
 			dol_syslog(__METHOD__);
@@ -316,7 +316,7 @@ class PriceGlobalVariable
 	public function listGlobalVariables()
 	{
 		$sql = "SELECT rowid, code, description, value";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " FROM ".$this->db->prefix().$this->table_element;
 		$sql .= " ORDER BY code";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
index 331a65971b6..317bc7fb5fd 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
-/* Copyright (C) 2015      Ion Agorria          <ion@agorria.com>
+ * Copyright (C) 2015      Ion Agorria          <ion@agorria.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
@@ -100,7 +100,7 @@ class PriceGlobalVariableUpdater
 		$this->checkParameters();
 
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+		$sql = "INSERT INTO ".$this->db->prefix().$this->table_element." (";
 		$sql .= "type, description, parameters, fk_variable, update_interval, next_update, last_status";
 		$sql .= ") VALUES (";
 		$sql .= " ".((int) $this->type).",";
@@ -121,7 +121,7 @@ class PriceGlobalVariableUpdater
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);
 
 			if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
@@ -158,7 +158,7 @@ class PriceGlobalVariableUpdater
 	public function fetch($id)
 	{
 		$sql = "SELECT type, description, parameters, fk_variable, update_interval, next_update, last_status";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " FROM ".$this->db->prefix().$this->table_element;
 		$sql .= " WHERE rowid = ".((int) $id);
 
 		dol_syslog(__METHOD__);
@@ -199,7 +199,7 @@ class PriceGlobalVariableUpdater
 		$this->checkParameters();
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element." SET";
 		$sql .= " type = ".((int) $this->type).",";
 		$sql .= " description = ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
 		$sql .= " parameters = ".(isset($this->parameters) ? "'".$this->db->escape($this->parameters)."'" : "''").",";
@@ -207,7 +207,7 @@ class PriceGlobalVariableUpdater
 		$sql .= " update_interval = ".((int) $this->update_interval).",";
 		$sql .= " next_update = ".((int) $this->next_update).",";
 		$sql .= " last_status = ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$this->db->begin();
 
@@ -274,7 +274,7 @@ class PriceGlobalVariableUpdater
 		//}
 
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql = "DELETE FROM ".$this->db->prefix().$this->table_element;
 			$sql .= " WHERE rowid = ".((int) $rowid);
 
 			dol_syslog(__METHOD__);
@@ -372,7 +372,7 @@ class PriceGlobalVariableUpdater
 	public function listUpdaters()
 	{
 		$sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " FROM ".$this->db->prefix().$this->table_element;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -409,7 +409,7 @@ class PriceGlobalVariableUpdater
 	public function listPendingUpdaters()
 	{
 		$sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " FROM ".$this->db->prefix().$this->table_element;
 		$sql .= " WHERE next_update < ".dol_now();
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -568,9 +568,9 @@ class PriceGlobalVariableUpdater
 		$this->checkParameters();
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element." SET";
 		$sql .= " next_update = ".$this->next_update;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$this->db->begin();
 
@@ -612,9 +612,9 @@ class PriceGlobalVariableUpdater
 		$this->checkParameters();
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element." SET";
 		$sql .= " last_status = ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$this->db->begin();
 
diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index 3d28f4b6011..9bd986a3c73 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -263,13 +263,16 @@ class PriceParser
 			return -1;
 		} elseif ($res == 0) {
 			$supplier_min_price = 0;
+			$supplier_min_price_with_discount = 0;
 		} else {
 			 $supplier_min_price = $productFournisseur->fourn_unitprice;
+			 $supplier_min_price_with_discount = $productFournisseur->fourn_unitprice_with_discount;
 		}
 
 		//Accessible values by expressions
 		$extra_values = array_merge($extra_values, array(
 			"supplier_min_price" => $supplier_min_price,
+			"supplier_min_price_with_discount" => $supplier_min_price_with_discount,
 		));
 
 		//Parse the expression and return the price, if not error occurred check if price is higher than min
@@ -329,12 +332,13 @@ class PriceParser
 		//Values for product expressions
 		$extra_values = array_merge($extra_values, array(
 			"supplier_min_price" => 1,
+			"supplier_min_price_with_discount" => 2,
 		));
 
 		//Values for supplier product expressions
 		$extra_values = array_merge($extra_values, array(
-			"supplier_quantity" => 2,
-			"supplier_tva_tx" => 3,
+			"supplier_quantity" => 3,
+			"supplier_tva_tx" => 4,
 		));
 		return $this->parseExpression($product, $expression, $extra_values);
 	}
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index 418a71166a8..893cc654f89 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -190,7 +190,7 @@ print '<span id="back" class="butAction">'.$langs->trans("Back").'</span>';
 if ($eid == 0) {
 	print '<div class="inline-block divButAction"><span id="action-delete" class="butActionRefused classfortooltip">'.$langs->trans('Delete').'</span></div>'."\n";
 } else {
-	print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;tab='.$tab.'&amp;eid='.$eid.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
+	print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&tab='.$tab.'&eid='.$eid.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
 }
 print '</div>';
 
@@ -204,7 +204,7 @@ print '<script type="text/javascript">
 		jQuery("#expression_selection").change(on_change);
 	}
 	function on_click() {
-		window.location = "'.str_replace('dynamic_price/editor.php', $tab.'.php', $_SERVER["PHP_SELF"]).'?id='.$id.($tab == 'price' ? '&action=edit_price' : '').'";
+		window.location = "'.str_replace('dynamic_price/editor.php', $tab.'.php', $_SERVER["PHP_SELF"]).'?id='.$id.($tab == 'price' ? '&action=edit_price&token='.newToken() : '').'";
 	}
 	function on_change() {
 		window.location = "'.$_SERVER["PHP_SELF"].'?id='.$id.'&tab='.$tab.'&eid=" + $("#expression_selection").val();
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 9aaa0aa2c8c..98ab414a8c3 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -63,10 +63,9 @@ $error = 0;
 $extrafields = new ExtraFields($db);
 
 // If socid provided by ajax company selector
-if (!empty($_REQUEST['search_fourn_id'])) {
+if (GETPOST('search_fourn_id', 'int')) {
 	$_GET['id_fourn'] = GETPOST('search_fourn_id', 'int');
 	$_POST['id_fourn'] = GETPOST('search_fourn_id', 'int');
-	$_REQUEST['id_fourn'] = GETPOST('search_fourn_id', 'int');
 }
 
 // Security check
@@ -81,8 +80,8 @@ if (empty($user->rights->fournisseur->lire)) {
 }
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -290,23 +289,23 @@ if (empty($reshook)) {
 				$extralabels = $extrafields->fetch_name_optionals_label("product_fournisseur_price");
 				$extrafield_values = $extrafields->getOptionalsFromPost("product_fournisseur_price");
 				if (!empty($extrafield_values)) {
-					$resql = $db->query("SELECT fk_object FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields WHERE fk_object = ".$object->product_fourn_price_id);
+					$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 (".$object->product_fourn_price_id.", ";
+						$sql = substr($sql, 0, strlen($sql) - 2).") VALUES (".((int) $object->product_fourn_price_id).", ";
 						foreach ($extrafield_values as $key => $value) {
-							$sql .= '"'.$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).' = "'.$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);
 					}
@@ -518,7 +517,7 @@ if ($id > 0 || $ref) {
 				} else {
 					$events = array();
 					$events[] = array('method' => 'getVatRates', 'url' => dol_buildpath('/core/ajax/vatrates.php', 1), 'htmlname' => 'tva_tx', 'params' => array());
-					print $form->select_company(GETPOST("id_fourn", 'alpha'), 'id_fourn', 'fournisseur=1', 'SelectThirdParty', 0, 0, $events);
+					print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company(GETPOST("id_fourn", 'alpha'), 'id_fourn', 'fournisseur=1', 'SelectThirdParty', 0, 0, $events);
 
 					$parameters = array('filtre'=>"fournisseur=1", 'html_name'=>'id_fourn', 'selected'=>GETPOST("id_fourn"), 'showempty'=>1, 'prod_id'=>$object->id);
 					$reshook = $hookmanager->executeHooks('formCreateThirdpartyOptions', $parameters, $object, $action);
@@ -683,7 +682,7 @@ if ($id > 0 || $ref) {
 					print '</td></tr>';
 
 					$currencies = array();
-					$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE entity = '.((int) $conf->entity);
+					$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."multicurrency WHERE entity = ".((int) $conf->entity);
 					$resql = $db->query($sql);
 					if ($resql) {
 						$currency = new MultiCurrency($db);
@@ -767,11 +766,6 @@ END;
 
 				// Barcode
 				if (!empty($conf->barcode->enabled)) {
-					// Option to define a transport cost on supplier price
-					print '<tr>';
-					print '<td>'.$langs->trans('BarcodeValue').'</td>';
-					print '<td>'.img_picto('', 'barcode', 'class="pictofixedwidth"').'<input class="flat" name="barcode"  value="'.($rowid ? $object->supplier_barcode : '').'"></td>';
-					print '</tr>';
 					$formbarcode = new FormBarCode($db);
 
 					// Barcode type
@@ -781,6 +775,12 @@ END;
 					print $formbarcode->selectBarcodeType(($rowid ? $object->supplier_fk_barcode_type : $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE), 'fk_barcode_type', 1);
 					print '</td>';
 					print '</tr>';
+
+					// Barcode value
+					print '<tr>';
+					print '<td>'.$langs->trans('BarcodeValue').'</td>';
+					print '<td>'.img_picto('', 'barcode', 'class="pictofixedwidth"').'<input class="flat" name="barcode"  value="'.($rowid ? $object->supplier_barcode : '').'"></td>';
+					print '</tr>';
 				}
 
 				// Option to define a transport cost on supplier price
@@ -788,7 +788,7 @@ END;
 					if (!empty($conf->margin->enabled)) {
 						print '<tr>';
 						print '<td>'.$langs->trans("Charges").'</td>';
-						print '<td><input class="flat" name="charges" size="8" value="'.(GETPOST('charges') ?price(GETPOST('charges')) : (isset($object->fourn_charges) ?price($object->fourn_charges) : '')).'">';
+						print '<td><input class="flat width75" name="charges" value="'.(GETPOST('charges') ? price(GETPOST('charges')) : (isset($object->fourn_charges) ? price($object->fourn_charges) : '')).'">';
 						print '</td>';
 						print '</tr>';
 					}
@@ -893,7 +893,7 @@ END;
 				$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 				if (empty($reshook)) {
 					if ($usercancreate) {
-						print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/fournisseurs.php?id='.$object->id.'&amp;action=add_price">';
+						print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/fournisseurs.php?id='.$object->id.'&action=add_price&token='.newToken().'">';
 						print $langs->trans("AddSupplierPrice").'</a>';
 					}
 				}
@@ -930,25 +930,30 @@ END;
 					'pfp.fk_availability'=>array('label'=>$langs->trans("Availability"), 'enabled' => !empty($conf->global->FOURN_PRODUCT_AVAILABILITY), 'checked'=>0, 'position'=>4),
 					'pfp.quantity'=>array('label'=>$langs->trans("QtyMin"), 'checked'=>1, 'position'=>5),
 					'pfp.unitprice'=>array('label'=>$langs->trans("UnitPriceHT"), 'checked'=>1, 'position'=>9),
-					'pfp.multicurrency_unitprice'=>array('label'=>$langs->trans("UnitPriceHTCurrency"), 'enabled' => $conf->multicurrency->enabled, 'checked'=>0, 'position'=>10),
+					'pfp.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.barcode'=>array('label'=>$langs->trans("BarcodeValue"), 'enabled' => $conf->barcode->enabled, 'checked'=>0, 'position'=>15),
-					'pfp.fk_barcode_type'=>array('label'=>$langs->trans("BarcodeType"), 'enabled' => $conf->barcode->enabled, 'checked'=>0, 'position'=>16),
+					'pfp.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.packaging'=>array('label'=>$langs->trans("PackagingForThisProduct"), 'enabled' => !empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING), 'checked'=>0, 'position'=>17),
 					'pfp.tms'=>array('label'=>$langs->trans("DateModification"), 'enabled' => $conf->barcode->enabled, 'checked'=>1, 'position'=>18),
 				);
 
 				// fetch optionals attributes and labels
 				$extrafields->fetch_name_optionals_label("product_fournisseur_price");
-				$extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
+				if ($extrafields->attributes["product_fournisseur_price"] && array_key_exists('label', $extrafields->attributes["product_fournisseur_price"])) {
+					$extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
 
-				if (!empty($extralabels)) {
-					foreach ($extralabels as $key => $value) {
-						// Show field if not hidden
-						if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
-							$extratitle = $langs->trans($value);
-							$arrayfields['ef.'.$key] = array('label'=>$extratitle, 'checked'=>0, 'position'=>(end($arrayfields)['position'] + 1), 'langfile'=>$extrafields->attributes["product_fournisseur_price"]['langfile'][$key], 'help'=>$extrafields->attributes["product_fournisseur_price"]['help'][$key]);
+					if (!empty($extralabels)) {
+						foreach ($extralabels as $key => $value) {
+							// Show field if not hidden
+							if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
+								$extratitle = $langs->trans($value);
+								$arrayfields['ef.' . $key] = array('label'    => $extratitle, 'checked' => 0,
+																   'position' => (end($arrayfields)['position'] + 1),
+																   'langfile' => $extrafields->attributes["product_fournisseur_price"]['langfile'][$key],
+																   'help'     => $extrafields->attributes["product_fournisseur_price"]['help'][$key]);
+							}
 						}
 					}
 				}
@@ -1007,12 +1012,12 @@ END;
 				if (!empty($arrayfields['pfp.supplier_reputation']['checked'])) {
 					print_liste_field_titre("ReputationForThisProduct", $_SERVER["PHP_SELF"], "pfp.supplier_reputation", "", $param, '', $sortfield, $sortorder, 'center ');
 				}
-				if (!empty($arrayfields['pfp.barcode']['checked'])) {
-					print_liste_field_titre("BarcodeValue", $_SERVER["PHP_SELF"], "pfp.barcode", "", $param, '', $sortfield, $sortorder, 'center ');
-				}
 				if (!empty($arrayfields['pfp.fk_barcode_type']['checked'])) {
 					print_liste_field_titre("BarcodeType", $_SERVER["PHP_SELF"], "pfp.fk_barcode_type", "", $param, '', $sortfield, $sortorder, 'center ');
 				}
+				if (!empty($arrayfields['pfp.barcode']['checked'])) {
+					print_liste_field_titre("BarcodeValue", $_SERVER["PHP_SELF"], "pfp.barcode", "", $param, '', $sortfield, $sortorder, 'center ');
+				}
 				if (!empty($arrayfields['pfp.packaging']['checked'])) {
 					print_liste_field_titre("PackagingForThisProduct", $_SERVER["PHP_SELF"], "pfp.packaging", "", $param, 'align="center"', $sortfield, $sortorder);
 				}
@@ -1022,29 +1027,31 @@ END;
 
 				// fetch optionals attributes and labels
 				$extrafields->fetch_name_optionals_label("product_fournisseur_price");
-				$extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
+				if ($extrafields->attributes["product_fournisseur_price"] && array_key_exists('label', $extrafields->attributes["product_fournisseur_price"])) {
+					$extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
 
-				if (!empty($extralabels)) {
-					foreach ($extralabels as $key => $value) {
-						// Show field if not hidden
-						if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
-							if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) {
-								$langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
-							}
-							if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) {
-								$extratitle = $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
-							} else {
-								$extratitle = $langs->trans($value);
-							}
-							if (!empty($arrayfields['ef.'.$key]['checked'])) {
-								print_liste_field_titre($extratitle, $_SERVER["PHP_SELF"], 'ef.'.$key, '', $param, '', $sortfield, $sortorder, 'right ');
+					if (!empty($extralabels)) {
+						foreach ($extralabels as $key => $value) {
+							// Show field if not hidden
+							if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
+								if (!empty($extrafields->attributes["product_fournisseur_price"]['langfile'][$key])) {
+									$langs->load($extrafields->attributes["product_fournisseur_price"]['langfile'][$key]);
+								}
+								if (!empty($extrafields->attributes["product_fournisseur_price"]['help'][$key])) {
+									$extratitle = $form->textwithpicto($langs->trans($value), $langs->trans($extrafields->attributes["product_fournisseur_price"]['help'][$key]));
+								} else {
+									$extratitle = $langs->trans($value);
+								}
+								if (!empty($arrayfields['ef.' . $key]['checked'])) {
+									print_liste_field_titre($extratitle, $_SERVER["PHP_SELF"], 'ef.' . $key, '', $param, '', $sortfield, $sortorder, 'right ');
+								}
 							}
 						}
 					}
 				}
 
 				if (is_object($hookmanager)) {
-					$parameters = array('id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
+					$parameters = array('id_fourn'=>(!empty($id_fourn)?$id_fourn:''), 'prod_id'=>$object->id);
 					$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
 				}
 				print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
@@ -1152,13 +1159,6 @@ END;
 							print'</td>';
 						}
 
-						// Barcode
-						if (!empty($arrayfields['pfp.barcode']['checked'])) {
-							print '<td align="right">';
-							print $productfourn->supplier_barcode;
-							print '</td>';
-						}
-
 						// Barcode type
 						if (!empty($arrayfields['pfp.fk_barcode_type']['checked'])) {
 							print '<td class="center">';
@@ -1168,6 +1168,13 @@ END;
 							print '</td>';
 						}
 
+						// Barcode
+						if (!empty($arrayfields['pfp.barcode']['checked'])) {
+							print '<td align="right">';
+							print $productfourn->supplier_barcode;
+							print '</td>';
+						}
+
 						// Packaging
 						if (!empty($arrayfields['pfp.packaging']['checked'])) {
 							print '<td align="center">';
@@ -1203,7 +1210,7 @@ END;
 									$obj = $db->fetch_object($resql);
 									foreach ($extralabels as $key => $value) {
 										if (!empty($arrayfields['ef.'.$key]['checked']) && !empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
-											print '<td align="right">'.$extrafields->showOutputField($key, $obj->{$key})."</td>";
+											print '<td align="right">'.$extrafields->showOutputField($key, $obj->{$key}, '', 'product_fournisseur_price')."</td>";
 										}
 									}
 								}
@@ -1212,7 +1219,7 @@ END;
 						}
 
 						if (is_object($hookmanager)) {
-							$parameters = array('id_pfp'=>$productfourn->product_fourn_price_id, 'id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
+							$parameters = array('id_pfp'=>$productfourn->product_fourn_price_id, 'id_fourn'=>(!empty($id_fourn)?$id_fourn:''), 'prod_id'=>$object->id);
 							$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action);
 						}
 
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 7069f21e459..e4a0bfc7421 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -34,10 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 
 $type = GETPOST("type", 'int');
-if ($type == '' && !$user->rights->produit->lire) {
+if ($type == '' && empty($user->rights->produit->lire)) {
 	$type = '1'; // Force global page on service page only
 }
-if ($type == '' && !$user->rights->service->lire) {
+if ($type == '' && empty($user->rights->service->lire)) {
 	$type = '0'; // Force global page on product page only
 }
 
@@ -225,6 +225,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 	$sql .= " WHERE c.type = 0";
 	$sql .= " AND c.entity IN (".getEntity('category').")";
 	$sql .= " GROUP BY c.label";
+	$sql .= " ORDER BY nb desc";
 	$total = 0;
 	$result = $db->query($sql);
 	if ($result) {
@@ -274,7 +275,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 	print '</table>';
 	print '</div>';
 }
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 /*
@@ -341,8 +342,8 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 				if (!empty($conf->global->MAIN_MULTILANGS)) {
 					$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 .= " WHERE fk_product = ".((int) $objp->rowid);
+					$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
 
 					$resultd = $db->query($sql);
 					if ($resultd) {
@@ -355,10 +356,10 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">';
+				print '<td class="nowraponall tdoverflowmax100">';
 				print $product_static->getNomUrl(1, '', 16);
 				print "</td>\n";
-				print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($objp->label).'">'.$objp->label.'</td>';
+				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>";
@@ -416,7 +417,7 @@ if (!empty($conf->global->MAIN_SHOW_PRODUCT_ACTIVITY_TRIM)) {
 }
 
 
-print '</div></div></div>';
+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
diff --git a/htdocs/product/inventory/ajax/ajax.inventory.php b/htdocs/product/inventory/ajax/ajax.inventory.php
deleted file mode 100644
index 920607f4c1e..00000000000
--- a/htdocs/product/inventory/ajax/ajax.inventory.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-require '../../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
-
-$get = GETPOST('get', 'alpha');
-$put = GETPOST('put', 'alpha');
-
-switch ($put) {
-	case 'qty':
-		if (empty($user->rights->stock->creer)) {
-			echo -1; exit;
-		}
-
-		$fk_det_inventory = GETPOST('fk_det_inventory');
-
-		$det = new InventoryLine($db);
-		if ($det->fetch($fk_det_inventory)) {
-			$det->qty_view += GETPOST('qty');
-			$res = $det->update($user);
-
-			echo $det->qty_view;
-		} else {
-			echo -2;
-		}
-
-		break;
-
-	case 'pmp':
-		if (empty($user->rights->stock->creer) || empty($user->rights->stock->changePMP)) {
-			echo -1; exit;
-		}
-
-		$fk_det_inventory = GETPOST('fk_det_inventory');
-
-		$det = new InventoryLine($db);
-		if ($det->fetch($fk_det_inventory)) {
-			$det->new_pmp = price2num(GETPOST('pmp'));
-			$det->update($user);
-
-			echo $det->new_pmp;
-		} else {
-			echo -2;
-		}
-
-		break;
-}
diff --git a/htdocs/product/inventory/ajax/searchfrombarcode.php b/htdocs/product/inventory/ajax/searchfrombarcode.php
new file mode 100644
index 00000000000..68ffee43c23
--- /dev/null
+++ b/htdocs/product/inventory/ajax/searchfrombarcode.php
@@ -0,0 +1,135 @@
+<?php
+
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       /htdocs/product/inventory/ajax/searchfrombarcode.php
+ *	\brief      File to make Ajax action on product and stock
+ */
+
+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';
+require_once DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php";
+$warehouse = new Entrepot($db);
+
+$action = GETPOST("action", "alpha");
+$barcode = GETPOST("barcode", "aZ09");
+$product = GETPOST("product");
+$response = "";
+
+$fk_entrepot = GETPOST("fk_entrepot", "int");
+$fk_inventory = GETPOST("fk_inventory", "int");
+$fk_product = GETPOST("fk_product", "int");
+$reelqty = GETPOST("reelqty", "int");
+$batch = GETPOST("batch", "int");
+$mode = GETPOST("mode", "aZ");
+
+$warehousefound = 0;
+$warehouseid = 0;
+$objectreturn = array();
+
+if ($action == "existbarcode" && !empty($barcode)) {
+	if (!empty($mode) && $mode == "lotserial") {
+		$sql = "SELECT ps.fk_entrepot, ps.fk_product, p.barcode, ps.reel, pb.batch";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
+		$sql .= " JOIN ".MAIN_DB_PREFIX."product_stock as ps ON pb.fk_product_stock = ps.rowid JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
+		$sql .= " WHERE pb.batch = '".$db->escape($barcode)."'";
+	} else {
+		$sql = "SELECT ps.fk_entrepot, ps.fk_product, p.barcode,ps.reel";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
+		$sql .= " WHERE p.barcode = '".$db->escape($barcode)."'";
+	}
+	if (!empty($fk_entrepot)) {
+		$sql .= " AND ps.fk_entrepot = '".$db->escape($fk_entrepot)."'";
+	}
+	if (!empty($fk_product)) {
+		$sql .= " AND ps.fk_product = '".$db->escape($fk_product)."'";
+	}
+	$result = $db->query($sql);
+	if ($result) {
+		$nbline = $db->num_rows($result);
+		for ($i=0; $i < $nbline; $i++) {
+			$object = $db->fetch_object($result);
+			if (($mode == "barcode" && $barcode == $object->barcode) || ($mode == "lotserial" && $barcode == $object->batch)) {
+				$warehouse->fetch(0, $product["Warehouse"]);
+				if (!empty($object->fk_entrepot) && $warehouse->id == $object->fk_entrepot) {
+					$warehousefound++;
+					$warehouseid = $object->fk_entrepot;
+					$fk_product = $object->fk_product;
+					$reelqty = $object->reel;
+
+					$objectreturn = array('fk_warehouse'=>$warehouseid,'fk_product'=>$fk_product,'reelqty'=>$reelqty);
+				}
+			}
+		}
+		if ($warehousefound < 1) {
+			$response = array('status'=>'error','errorcode'=>'NotFound','message'=>'No warehouse found for barcode'.$barcode);
+		} elseif ($warehousefound > 1) {
+			$response = array('status'=>'error','errorcode'=>'TooManyWarehouse','message'=>'Too many warehouse found');
+		} else {
+			$response = array('status'=>'success','message'=>'Warehouse found','object'=>$objectreturn);
+		}
+	} else {
+		$response = array('status'=>'error','errorcode'=>'NotFound','message'=>"No results found for barcode");
+	}
+} else {
+	$response = array('status'=>'error','errorcode'=>'ActionError','message'=>"Error on action");
+}
+
+if ($action == "addnewlineproduct") {
+	require_once DOL_DOCUMENT_ROOT."/product/inventory/class/inventory.class.php";
+	$inventoryline = new InventoryLine($db);
+	if (!empty($fk_inventory)) {
+		$inventoryline->fk_inventory = $fk_inventory;
+
+		$inventoryline->fk_warehouse = $fk_entrepot;
+		$inventoryline->fk_product = $fk_product;
+		$inventoryline->qty_stock = $reelqty;
+		if (!empty($batch)) {
+			$inventoryline->batch = $batch;
+		}
+		$inventoryline->datec = dol_now();
+
+		$result = $inventoryline->create($user);
+		if ($result > 0) {
+			$response = array('status'=>'success','message'=>'Success on creating line','id_line'=>$result);
+		} else {
+			$response = array('status'=>'error','errorcode'=>'ErrorCreation','message'=>"Error on line creation");
+		}
+	} else {
+		$response = array('status'=>'error','errorcode'=>'NoIdForInventory','message'=>"No id for inventory");
+	}
+}
+
+$response = json_encode($response);
+echo $response;
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 067869ba5ba..23473545b11 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -109,6 +109,7 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	$savaction = $action;
 	$error = 0;
 
 	$backurlforlist = DOL_URL_ROOT.'/product/inventory/list.php';
@@ -152,6 +153,12 @@ if (empty($reshook)) {
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_INVENTORY_TO';
 	$trackid = 'stockinv'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
+	if (!$error && $savaction == 'confirm_validate' && $action == '' && $object->id > 0) {
+		// Switch to the tab inventory
+		header("Location: ".DOL_URL_ROOT.'/product/inventory/inventory.php?id='.$object->id);
+		exit;
+	}
 }
 
 
@@ -200,15 +207,13 @@ if ($action == 'create') {
 	// Other attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
+	//print '<tr><td class="titlefield fieldname_invcode">'.$langs->trans("InventoryCode").'</td><td>INV'.$object->id.'</td></tr>';
+
 	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 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 $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 
@@ -244,9 +249,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	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->buttonsSaveCancel();
 
 	print '</form>';
 }
@@ -321,7 +324,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		{
 			if ($action != 'classify')
 			{
-				$morehtmlref .= '<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref .= '<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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.'">';
@@ -457,20 +460,19 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		$MAXEVENT = 10;
 
-		$morehtmlright = '<a href="'.dol_buildpath('/product/inventory/inventory_info.php', 1).'?id='.$object->id.'">';
-		$morehtmlright .= $langs->trans("SeeAll");
-		$morehtmlright .= '</a>';
+		//$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/product/inventory/inventory_info.php?id='.$object->id);
+		$morehtmlcenter = '';
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, 'inventory', 0, 1, '', $MAXEVENT, '', $morehtmlright);
+		$somethingshown = $formactions->showactions($object, $object->element, 0, 1, '', $MAXEVENT, '', $morehtmlcenter);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 78e9e992546..92061972e60 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -26,6 +26,7 @@
 
 // Put here all includes required by your class file
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+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';
 
@@ -59,10 +60,10 @@ class Inventory extends CommonObject
 	 */
 	public $picto = 'inventory';
 
-	const STATUS_DRAFT = 0;
-	const STATUS_VALIDATED = 1;
-	const STATUS_RECORDED = 2;
-	const STATUS_CANCELED = 9;
+	const STATUS_DRAFT = 0;			// Draft
+	const STATUS_VALIDATED = 1;		// Inventory is in process
+	const STATUS_RECORDED = 2;		// Inventory is finisged. Stock movement has been recorded.
+	const STATUS_CANCELED = 9;		// Canceled
 
 	/**
 	 *  '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')
@@ -101,8 +102,7 @@ class Inventory extends CommonObject
 		'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'),
-		'date_inventory' => array('type'=>'date', 'label'=>'DateValue', 'visible'=>1, 'enabled'=>1, 'position'=>35),
-
+		'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),
 		'date_validation' => array('type'=>'datetime', 'label'=>'DateValidation', 'visible'=>-2, 'enabled'=>1, 'position'=>502),
@@ -266,7 +266,7 @@ class Inventory extends CommonObject
 
 		if ($this->status == self::STATUS_DRAFT) {
 			// Delete inventory
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'inventorydet WHERE fk_inventory = '.$this->id;
+			$sql = 'DELETE FROM '.$this->db->prefix().'inventorydet WHERE fk_inventory = '.((int) $this->id);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$this->error = $this->db->lasterror();
@@ -275,21 +275,21 @@ class Inventory extends CommonObject
 			}
 
 			// Scan existing stock to prefill the inventory
-			$sql = 'SELECT ps.rowid, ps.fk_entrepot as fk_warehouse, ps.fk_product, ps.reel,';
-			$sql .= ' pb.batch, pb.qty';
-			$sql .= ' FROM '.MAIN_DB_PREFIX.'product_stock as ps';
-			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_batch as pb ON pb.fk_product_stock = ps.rowid,';
-			$sql .= ' '.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'entrepot as e';
-			$sql .= ' WHERE p.entity IN ('.getEntity('product').')';
-			$sql .= ' AND ps.fk_product = p.rowid AND ps.fk_entrepot = e.rowid';
+			$sql = "SELECT ps.rowid, ps.fk_entrepot as fk_warehouse, ps.fk_product, ps.reel,";
+			$sql .= " pb.batch, pb.qty";
+			$sql .= " FROM ".$this->db->prefix()."product_stock as ps";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."product_batch as pb ON pb.fk_product_stock = ps.rowid,";
+			$sql .= " ".$this->db->prefix()."product as p, ".$this->db->prefix()."entrepot as e";
+			$sql .= " WHERE p.entity IN (".getEntity('product').")";
+			$sql .= " AND ps.fk_product = p.rowid AND ps.fk_entrepot = e.rowid";
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 				$sql .= " AND p.fk_product_type = 0";
 			}
 			if ($this->fk_product > 0) {
-				$sql .= ' AND ps.fk_product = '.$this->fk_product;
+				$sql .= " AND ps.fk_product = ".((int) $this->fk_product);
 			}
 			if ($this->fk_warehouse > 0) {
-				$sql .= ' AND ps.fk_entrepot = '.$this->fk_warehouse;
+				$sql .= " AND ps.fk_entrepot = ".((int) $this->fk_warehouse);
 			}
 
 			$inventoryline = new InventoryLine($this->db);
@@ -349,7 +349,7 @@ class Inventory extends CommonObject
 		$this->db->begin();
 
 		// Delete inventory
-		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'inventorydet WHERE fk_inventory = '.$this->id;
+		$sql = 'DELETE FROM '.$this->db->prefix().'inventorydet WHERE fk_inventory = '.((int) $this->id);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$this->error = $this->db->lasterror();
@@ -368,7 +368,7 @@ class Inventory extends CommonObject
 	}
 
 	/**
-	 * Set to Recorded
+	 * Set to inventory to status "Closed". It means all stock movements were recorded.
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
@@ -615,18 +615,18 @@ class Inventory extends CommonObject
 		global $langs;
 
 		$labelStatus = array();
-		$labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-		$labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated').' ('.$langs->trans('Started').')';
-		$labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
-		$labelStatus[self::STATUS_RECORDED] = $langs->trans('Closed');
-		$labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
-		$labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Started');
-		$labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled');
-		$labelStatusShort[self::STATUS_RECORDED] = $langs->trans('Closed');
+		$labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+		$labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated').' ('.$langs->transnoentitiesnoconv('InventoryStartedShort').')';
+		$labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
+		$labelStatus[self::STATUS_RECORDED] = $langs->transnoentitiesnoconv('Closed');
+		$labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+		$labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('InventoryStartedShort');
+		$labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
+		$labelStatusShort[self::STATUS_RECORDED] = $langs->transnoentitiesnoconv('Closed');
 
 		$statusType = 'status'.$status;
 		if ($status == self::STATUS_RECORDED) {
-			$statusType = 'status5';
+			$statusType = 'status6';
 		}
 
 		return dolGetStatus($labelStatus[$status], $labelStatusShort[$status], '', $statusType, $mode);
@@ -640,10 +640,10 @@ class Inventory extends CommonObject
 	 */
 	public function info($id)
 	{
-		$sql = 'SELECT rowid, date_creation as datec, tms as datem, date_validation as datev,';
-		$sql .= ' fk_user_creat, fk_user_modif, fk_user_valid';
-		$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, date_validation as datev,";
+		$sql .= " fk_user_creat, fk_user_modif, fk_user_valid";
+		$sql .= " FROM ".$this->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)) {
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 85cd0932f46..95c9e2972cb 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -103,121 +103,6 @@ if ($cancel) {
 	$action = '';
 }
 
-if ($action == 'cancel_record' && $permissiontoadd) {
-	$object->setCanceled($user);
-}
-
-if ($action == 'update' && !empty($user->rights->stock->mouvement->creer)) {
-	$stockmovment = new MouvementStock($db);
-	$stockmovment->origin = $object;
-
-	$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 .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
-	$sql .= ' WHERE id.fk_inventory = '.$object->id;
-	$resql = $db->query($sql);
-	if ($resql) {
-		$num = $db->num_rows($resql);
-		$i = 0;
-		$totalarray = array();
-		while ($i < $num) {
-			$line = $db->fetch_object($resql);
-			$qty_stock = $line->qty_stock;
-			$qty_view = $line->qty_view;		// The quantity viewed by inventorier, the qty we target
-
-			if (!is_null($qty_view)) {
-				$stock_movement_qty = price2num($qty_view - $qty_stock, 'MS');
-				if ($stock_movement_qty != 0) {
-					if ($stock_movement_qty < 0) {
-						$movement_type = 1;
-					} else {
-						$movement_type = 0;
-					}
-
-					$datemovement = '';
-
-					$idstockmove = $stockmovment->_create($user, $line->fk_product, $line->fk_warehouse, $stock_movement_qty, $movement_type, 0, $langs->trans('LabelOfInventoryMovemement', $object->id), 'INV'.$object->id, $datemovement, '', '', $line->batch);
-					if ($idstockmove < 0) {
-						$error++;
-						setEventMessages($stockmovment->error, $stockmovment->errors, 'errors');
-						break;
-					}
-				}
-			}
-			$i++;
-		}
-
-		if (!$error) {
-			$object->setRecorded($user);
-		}
-	} else {
-		setEventMessages($db->lasterror, null, 'errors');
-		$error++;
-	}
-
-	if (! $error) {
-		$db->commit();
-	} else {
-		$db->rollback();
-	}
-}
-
-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';
-	$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
-	$sql .= ' WHERE id.fk_inventory = '.$object->id;
-
-	$db->begin();
-
-	$resql = $db->query($sql);
-	if ($resql) {
-		$num = $db->num_rows($resql);
-		$i = 0;
-		$totalarray = array();
-		$inventoryline = new InventoryLine($db);
-
-		while ($i < $num) {
-			$line = $db->fetch_object($resql);
-			$lineid = $line->rowid;
-
-			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);
-				if ($qtytoupdate < 0) {
-					$result = -1;
-					setEventMessages($langs->trans("FieldCannotBeNegative", $langs->transnoentitiesnoconv("RealQty")), null, 'errors');
-				}
-				if ($result > 0) {
-					$inventoryline->qty_view = $qtytoupdate;
-					$resultupdate = $inventoryline->update($user);
-				}
-			} else {
-				// Delete record
-				$result = $inventoryline->fetch($lineid);
-				if ($result > 0) {
-					$inventoryline->qty_view = null;
-					$resultupdate = $inventoryline->update($user);
-				}
-			}
-
-			if ($result < 0 || $resultupdate < 0) {
-				$error++;
-			}
-
-			$i++;
-		}
-	}
-
-	if (!$error) {
-		$db->commit();
-	} else {
-		$db->rollback();
-	}
-}
-
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
@@ -227,6 +112,179 @@ if ($reshook < 0) {
 if (empty($reshook)) {
 	$error = 0;
 
+	if ($action == 'cancel_record' && $permissiontoadd) {
+		$object->setCanceled($user);
+	}
+
+	// Close inventory by recording the stock movements
+	if ($action == 'update' && !empty($user->rights->stock->mouvement->creer)) {
+		$stockmovment = new MouvementStock($db);
+		$stockmovment->setOrigin($object->element, $object->id);
+
+		$cacheOfProducts = array();
+
+		$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 .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
+		$sql .= ' WHERE id.fk_inventory = '.((int) $object->id);
+
+		$resql = $db->query($sql);
+		if ($resql) {
+			$num = $db->num_rows($resql);
+			$i = 0;
+			$totalarray = array();
+			while ($i < $num) {
+				$line = $db->fetch_object($resql);
+
+				$qty_stock = $line->qty_stock;
+				$qty_view = $line->qty_view;		// The quantity viewed by inventorier, the qty we target
+
+
+				// Load real stock we have now.
+				if (isset($cacheOfProducts[$line->fk_product])) {
+					$product_static = $cacheOfProducts[$line->fk_product];
+				} else {
+					$product_static = new Product($db);
+					$result = $product_static->fetch($line->fk_product, '', '', '', 1, 1, 1);
+
+					//$option = 'nobatch';
+					$option .= ',novirtual';
+					$product_static->load_stock($option); // Load stock_reel + stock_warehouse.
+
+					$cacheOfProducts[$product_static->id] = $product_static;
+				}
+
+				// Get the real quantity in stock now, but before the stock move for inventory.
+				$realqtynow = $product_static->stock_warehouse[$line->fk_warehouse]->real;
+				if ($conf->productbatch->enabled && $product_static->hasbatch()) {
+					$realqtynow = $product_static->stock_warehouse[$line->fk_warehouse]->detail_batch[$line->batch]->qty;
+				}
+
+
+				if (!is_null($qty_view)) {
+					$stock_movement_qty = price2num($qty_view - $realqtynow, 'MS');
+					if ($stock_movement_qty != 0) {
+						if ($stock_movement_qty < 0) {
+							$movement_type = 1;
+						} else {
+							$movement_type = 0;
+						}
+
+						$datemovement = '';
+						//$inventorycode = 'INV'.$object->id;
+						$inventorycode = 'INV-'.$object->ref;
+
+						$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);
+						if ($idstockmove < 0) {
+							$error++;
+							setEventMessages($stockmovment->error, $stockmovment->errors, 'errors');
+							break;
+						}
+
+						// Update line with id of stock movement (and the start quantity if it has changed this last recording)
+						$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."inventorydet";
+						$sqlupdate .= " SET fk_movement = ".((int) $idstockmove);
+						if ($qty_stock != $realqtynow) {
+							$sqlupdate .= ", qty_stock = ".((float) $realqtynow);
+						}
+						$sqlupdate .= " WHERE rowid = ".((int) $line->rowid);
+						$resqlupdate = $db->query($sqlupdate);
+						if (! $resqlupdate) {
+							$error++;
+							setEventMessages($db->lasterror(), null, 'errors');
+							break;
+						}
+					}
+				}
+				$i++;
+			}
+
+			if (!$error) {
+				$object->setRecorded($user);
+			}
+		} else {
+			setEventMessages($db->lasterror, null, 'errors');
+			$error++;
+		}
+
+		if (! $error) {
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
+
+	// Save quantity found during inventory
+	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';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
+		$sql .= ' WHERE id.fk_inventory = '.((int) $object->id);
+
+		$db->begin();
+
+		$resql = $db->query($sql);
+		if ($resql) {
+			$num = $db->num_rows($resql);
+			$i = 0;
+			$totalarray = array();
+			$inventoryline = new InventoryLine($db);
+
+			while ($i < $num) {
+				$line = $db->fetch_object($resql);
+				$lineid = $line->rowid;
+
+				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);
+					if ($qtytoupdate < 0) {
+						$result = -1;
+						setEventMessages($langs->trans("FieldCannotBeNegative", $langs->transnoentitiesnoconv("RealQty")), null, 'errors');
+					}
+					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
+						$resultupdate = $inventoryline->update($user);
+					}
+				} else {
+					// Delete record
+					$result = $inventoryline->fetch($lineid);
+					if ($result > 0) {
+						$inventoryline->qty_view = null;			// The new value we want
+						$resultupdate = $inventoryline->update($user);
+					}
+				}
+
+				if ($result < 0 || $resultupdate < 0) {
+					$error++;
+				}
+
+				$i++;
+			}
+		}
+
+		// Update line with id of stock movement (and the start quantity if it has changed this last recording)
+		if (! $error) {
+			$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."inventory";
+			$sqlupdate .= " SET fk_user_modif = ".((int) $user->id);
+			$sqlupdate .= " WHERE rowid = ".((int) $object->id);
+			$resqlupdate = $db->query($sqlupdate);
+			if (! $resqlupdate) {
+				$error++;
+				setEventMessages($db->lasterror(), null, 'errors');
+			}
+		}
+
+		if (!$error) {
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
+
+
 	$backurlforlist = DOL_URL_ROOT.'/product/inventory/list.php';
 	$backtopage = DOL_URL_ROOT.'/product/inventory/inventory.php?id='.$object->id;
 
@@ -285,10 +343,15 @@ if (empty($reshook)) {
 			$result = $tmp->create($user);
 			if ($result < 0) {
 				if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-					setEventMessages($langs->trans("DuplicateRecord"), null, 'errors');
+					$langs->load("errors");
+					setEventMessages($langs->trans("ErrorRecordAlreadyExists"), null, 'errors');
 				} else {
 					dol_print_error($db, $tmp->error, $tmp->errors);
 				}
+			} else {
+				// Clear var
+				$_POST['batch'] = '';
+				$_POST['qtytoadd'] = '';
 			}
 		}
 	}
@@ -309,20 +372,22 @@ $help_url = '';
 llxHeader('', $langs->trans('Inventory'), $help_url);
 
 
-// Disable button Generate movement if data were not saved
-print '<script type="text/javascript" language="javascript">
+// Disable button Generate movement if data were modified and not saved
+print '<script type="text/javascript">
 function disablebuttonmakemovementandclose() {
 	console.log("Disable button idbuttonmakemovementandclose until we save");
 	jQuery("#idbuttonmakemovementandclose").attr(\'disabled\',\'disabled\');
+	jQuery("#idbuttonmakemovementandclose").attr(\'title\',\''.dol_escape_js($langs->trans("SaveQtyFirst")).'\');
 	jQuery("#idbuttonmakemovementandclose").attr(\'class\',\'butActionRefused\');
 };
 
 jQuery(document).ready(function() {
-
 	jQuery(".realqty").keyup(function() {
+		console.log("keyup on realqty");
 		disablebuttonmakemovementandclose();
 	});
 	jQuery(".realqty").change(function() {
+		console.log("change on realqty");
 		disablebuttonmakemovementandclose();
 	});
 });
@@ -399,7 +464,7 @@ if ($object->id > 0) {
 		{
 			if ($action != 'classify')
 			{
-				$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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.'">';
@@ -440,6 +505,8 @@ if ($object->id > 0) {
 	// Other attributes. Fields from hook formObjectOptions and Extrafields.
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
+	//print '<tr><td class="titlefield fieldname_invcode">'.$langs->trans("InventoryCode").'</td><td>INV'.$object->id.'</td></tr>';
+
 	print '</table>';
 	print '</div>';
 	print '</div>';
@@ -449,7 +516,7 @@ if ($object->id > 0) {
 	print dol_get_fiche_end();
 
 
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<form id="formrecord" name="formrecord" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="updateinventorylines">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
@@ -479,7 +546,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("SaveQtyFirst").'">'.$langs->trans("MakeMovementsAndClose").'</a>'."\n";
+					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";
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('MakeMovementsAndClose').'</a>'."\n";
 				}
@@ -490,44 +557,45 @@ if ($object->id > 0) {
 			}
 		}
 		print '</div>'."\n";
+
+		if ($object->status != Inventory::STATUS_DRAFT && $object->status != Inventory::STATUS_VALIDATED) {
+			print '<br><br>';
+		}
 	}
 
 
 
 	if ($object->status == Inventory::STATUS_VALIDATED) {
 		print '<center>';
-		if ($permissiontoadd) {
-			/*
-			 if (!empty($conf->barcode->enabled)) {
-			 print '<a href="#" class="butAction">'.$langs->trans("UpdateByScaningProductBarcode").'</a>';
-			 }
-			 if (!empty($conf->productbatch->enabled)) {
-			 print '<a href="#" class="butAction">'.$langs->trans('UpdateByScaningLot').'</a>';
-			 }*/
-			if (!empty($conf->barcode->enabled) || !empty($conf->productbatch->enabled)) {
-				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=updatebyscaning" class="">'.img_picto('', 'barcode', 'class="paddingrightonly"').$langs->trans("UpdateByScaning").'</a>';
-			}
-		} else {
-			print '<a class="classfortooltip marginrightonly paddingright marginleftonly paddingleft" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Save").'</a>'."\n";
-		}
-		if ($permissiontoadd && $conf->use_javascript_ajax) {
-			print '<a id="fillwithexpected" class="marginrightonly paddingright marginleftonly paddingleft" href="#">'.img_picto('', 'autofill', 'class="paddingrightonly"').$langs->trans('AutofillWithExpected').'</a>';
+		if (!empty($conf->use_javascript_ajax)) {
+			if ($permissiontoadd) {
+				// Link to launch scan tool
+				if (!empty($conf->barcode->enabled) || !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>';
+				}
 
-			print '<script>';
-			print '$( document ).ready(function() {';
-			print '	$("#fillwithexpected").on("click",function fillWithExpected(){
-						$(".expectedqty").each(function(){
-							var object = $(this)[0];
-							var objecttofill = $("#"+object.id+"_input")[0];
-							objecttofill.value = object.innerText;
-						})
-						console.log("Values filled");
-						console.log("Disable button idbuttonmakemovementandclose until we save");
-						jQuery("#idbuttonmakemovementandclose").attr(\'disabled\',\'disabled\');
-						jQuery("#idbuttonmakemovementandclose").attr(\'class\',\'butActionRefused\');
-			        });';
-			print '});';
-			print '</script>';
+				// Link to autofill
+				print '<a id="fillwithexpected" class="marginrightonly paddingright marginleftonly paddingleft" href="#">'.img_picto('', 'autofill', 'class="paddingrightonly"').$langs->trans('AutofillWithExpected').'</a>';
+				print '<script>';
+				print '$( document ).ready(function() {';
+				print '	$("#fillwithexpected").on("click",function fillWithExpected(){
+							$(".expectedqty").each(function(){
+								var object = $(this)[0];
+								var objecttofill = $("#"+object.id+"_input")[0];
+								objecttofill.value = object.innerText;
+							})
+							console.log("Values filled (after click on fillwithexpected)");
+							disablebuttonmakemovementandclose();
+							return false;
+				        });';
+				print '});';
+				print '</script>';
+
+				// Link to reset qty
+				print '<a href="#" id="clearqty" class="marginrightonly paddingright marginleftonly paddingleft">'.img_picto('', 'eraser', 'class="paddingrightonly"').$langs->trans("ClearQtys").'</a>';
+			} else {
+				print '<a class="classfortooltip marginrightonly paddingright marginleftonly paddingleft" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Save").'</a>'."\n";
+			}
 		}
 		print '<br>';
 		print '<br>';
@@ -537,11 +605,242 @@ if ($object->id > 0) {
 
 	// Popup for mass barcode scanning
 	if ($action == 'updatebyscaning') {
+		if ($permissiontoadd) {
+			// Output the javascript to manage the scanner tool.
+			print '<script>';
+
+			print '
+			var errortab1 = [];
+			var errortab2 = [];
+			var errortab3 = [];
+			var errortab4 = [];
+
+			function barcodescannerjs(){
+				console.log("We catch inputs in scanner box");
+				jQuery("#scantoolmessage").text();
+
+				var selectaddorreplace = $("select[name=selectaddorreplace]").val();
+				var barcodemode = $("input[name=barcodemode]:checked").val();
+				var barcodeproductqty = $("input[name=barcodeproductqty]").val();
+				var textarea = $("textarea[name=barcodelist]").val();
+				var textarray = textarea.split(/[\s,;]+/);
+				var tabproduct = [];
+				errortab1 = [];
+				errortab2 = [];
+				errortab3 = [];
+				errortab4 = [];
+
+				textarray = textarray.filter(function(value){
+					return value != "";
+				});
+				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);
+
+						productbatchcode = $("#"+id+"_batch").text();
+						if (barcodemode != "barcodeforproduct") {
+							tabproduct.forEach(product=>{
+								if(product.Batch != "" && product.Batch == productbatchcode){
+									errortab1.push(productbatchcode);
+								}
+							})
+						}
+						productinput = $("#"+id+"_input").val();
+						if(productinput == ""){
+							productinput = 0
+						}
+						tabproduct.push({\'Id\':id,\'Warehouse\':warehouse,\'Barcode\':productbarcode,\'Batch\':productbatchcode,\'Qty\':productinput,\'fetched\':false});
+					});
+
+					textarray.forEach(function(element,index){
+						var verify_batch = false;
+						var verify_barcode = false;
+						switch(barcodemode){
+							case "barcodeforautodetect":
+								verify_barcode = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"barcode",true);
+								verify_batch = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"lotserial",true);
+								break;
+							case "barcodeforproduct":
+								verify_barcode = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"barcode");
+								break;
+							case "barcodeforlotserial":
+								verify_batch = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"lotserial");
+								break;
+							default:
+								alert("'.$langs->trans("ErrorWrongBarcodemode").' \""+barcodemode+"\"");
+								throw "'.$langs->trans('ErrorWrongBarcodemode').' \""+barcodemode+"\"";
+						}
+
+						if (verify_batch == false && verify_barcode == false) {		/* If the 2 flags are false, 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 */
+							errortab3.push(element);
+						}
+					});
+
+					if (Object.keys(errortab1).length < 1 && Object.keys(errortab2).length < 1 && Object.keys(errortab3).length < 1) {
+						tabproduct.forEach(product => {
+							if(product.Qty!=0){
+								console.log("We change #"+product.Id+"_input to match input in scanner box");
+								if(product.hasOwnProperty("reelqty")){
+									$.ajax({ url: \''.DOL_URL_ROOT.'/product/inventory/ajax/searchfrombarcode.php\',
+										data: { "token":"'.newToken().'", "action":"addnewlineproduct", "fk_entrepot":product.Warehouse, "batch":product.Batch, "fk_inventory":'.dol_escape_js($object->id).', "fk_product":product.fk_product, "reelqty":product.reelqty},
+										type: \'POST\',
+										async: false,
+										success: function(response) {
+											response = JSON.parse(response);
+											if(response.status == "success"){
+												console.log(response.message);
+												$("<input type=\'text\' value=\'"+product.Qty+"\' />")
+												.attr("id", "id_"+response.id_line+"_input")
+												.attr("name", "id_"+response.id_line)
+												.appendTo("#formrecord");
+											}else{
+												console.error(response.message);
+											}
+										},
+										error : function(output) {
+											console.error("Error on line creation function");
+										},
+									});
+								} else {
+									$("#"+product.Id+"_input").val(product.Qty);
+								}
+							}
+						});
+						jQuery("#scantoolmessage").text("'.$langs->trans("QtyWasAddedToTheScannedBarcode").'\n");
+						/* document.forms["formrecord"].submit(); */
+					} else {
+						let stringerror = "";
+						if (Object.keys(errortab1).length > 0) {
+							stringerror += "<br>'.$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').': ";
+							errortab2.forEach(element => {
+								stringerror += (element + ", ")
+							});
+							stringerror = stringerror.slice(0, -2);	/* Remove last ", " */
+						}
+						if (Object.keys(errortab3).length > 0) {
+							stringerror += "<br>'.$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').': ";
+							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);
+					}
+				}
+
+			}
+
+			/* This methode is called by parent barcodescannerjs() */
+			function barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,mode,autodetect=false){
+				BarcodeIsInProduct=0;
+				newproductrow=0
+				result=false;
+				tabproduct.forEach(product => {
+					$.ajax({ url: \''.DOL_URL_ROOT.'/product/inventory/ajax/searchfrombarcode.php\',
+						data: { "token":"'.newToken().'", "action":"existbarcode", '.(!empty($object->fk_warehouse)?'"fk_entrepot":'.$object->fk_warehouse.', ':'').(!empty($object->fk_product)?'"fk_product":'.$object->fk_product.', ':'').'"barcode":element, "product":product, "mode":mode},
+						type: \'POST\',
+						async: false,
+						success: function(response) {
+							response = JSON.parse(response);
+							if (response.status == "success"){
+								console.log(response.message);
+								if(!newproductrow){
+									newproductrow = response.object;
+								}
+							}else{
+								if (mode!="lotserial" && autodetect==false && !errortab4.includes(element)){
+									errortab4.push(element);
+									console.error(response.message);
+								}
+							}
+						},
+						error : function(output) {
+						   console.error("Error on barcodeserialforproduct function");
+						},
+				    });
+					console.log("Product "+(index+=1)+": "+element);
+					if(mode == "barcode"){
+						testonproduct = product.Barcode
+					}else if (mode == "lotserial"){
+						testonproduct = product.Batch
+					}
+					if(testonproduct == element){
+						if(selectaddorreplace == "add"){
+							productqty = parseInt(product.Qty,10);
+							product.Qty = productqty + parseInt(barcodeproductqty,10);
+						}else if(selectaddorreplace == "replace"){
+							if(product.fetched == false){
+								product.Qty = barcodeproductqty
+								product.fetched=true
+							}else{
+								productqty = parseInt(product.Qty,10);
+								product.Qty = productqty + parseInt(barcodeproductqty,10);
+							}
+						}
+						BarcodeIsInProduct+=1;
+					}
+				})
+				if(BarcodeIsInProduct==0 && newproductrow!=0){
+					tabproduct.push({\'Id\':tabproduct.length-1,\'Warehouse\':newproductrow.fk_warehouse,\'Barcode\':mode=="barcode"?element:null,\'Batch\':mode=="lotserial"?element:null,\'Qty\':barcodeproductqty,\'fetched\':true,\'reelqty\':newproductrow.reelqty,\'fk_product\':newproductrow.fk_product,\'mode\':mode});
+					result = true;
+				}
+				if(BarcodeIsInProduct > 0){
+					result = true;
+				}
+				return result;
+			}
+			';
+			print '</script>';
+		}
 		include DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 		$formother = new FormOther($db);
-		print $formother->getHTMLScannerForm();
+		print $formother->getHTMLScannerForm("barcodescannerjs", 'all');
 	}
 
+	//Call method to undo changes in real qty
+	print '<script>';
+	print 'jQuery(document).ready(function() {
+		$("#clearqty").on("click", function() {
+			console.log("Clear all values");
+			jQuery(".realqty").val("");
+			return false;	/* disable submit */
+		});
+		$(".undochangesqty").on("click", function undochangesqty() {
+			console.log("Clear value of inventory line");
+			id = this.id;
+			id = id.split("_")[1];
+			tmpvalue = $("#id_"+id+"_input_tmp").val()
+			$("#id_"+id+"_input")[0].value = tmpvalue;
+			disablebuttonmakemovementandclose();
+			return false;	/* disable submit */
+		});
+	});';
+	print '</script>';
 
 	print '<div class="fichecenter">';
 	//print '<div class="fichehalfleft">';
@@ -555,24 +854,29 @@ if ($object->id > 0) {
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Warehouse").'</td>';
 	print '<td>'.$langs->trans("Product").'</td>';
-	if ($conf->productbatch->enabled) {
+	if (!empty($conf->productbatch->enabled)) {
 		print '<td>';
 		print $langs->trans("Batch");
 		print '</td>';
 	}
 	print '<td class="right">'.$langs->trans("ExpectedQty").'</td>';
-	print '<td class="center">';
+	print '<td class="right">';
 	print $form->textwithpicto($langs->trans("RealQty"), $langs->trans("InventoryRealQtyHelp"));
 	print '</td>';
-	if ($object->status == $object::STATUS_VALIDATED) {
-		// Actions
+	if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
+		// Actions or link to stock movement
 		print '<td class="center">';
 		print '</td>';
-		print '</tr>';
+	} else {
+		// Actions or link to stock movement
+		print '<td class="right">';
+		//print $langs->trans("StockMovement");
+		print '</td>';
 	}
+	print '</tr>';
 
 	// Line to add a new line in inventory
-	if ($object->status == $object::STATUS_VALIDATED) {
+	if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
 		print '<tr>';
 		print '<td>';
 		print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? GETPOST('fk_warehouse', 'int') : $object->fk_warehouse), 'fk_warehouse', 'warehouseopen', 1, 0, 0, '', 0, 0, array(), 'maxwidth300');
@@ -580,13 +884,13 @@ if ($object->id > 0) {
 		print '<td>';
 		print $form->select_produits((GETPOSTISSET('fk_product') ? GETPOST('fk_product', 'int') : $object->fk_product), 'fk_product', '', 0, 0, -1, 2, '', 0, null, 0, '1', 0, 'maxwidth300');
 		print '</td>';
-		if ($conf->productbatch->enabled) {
+		if (!empty($conf->productbatch->enabled)) {
 			print '<td>';
 			print '<input type="text" name="batch" class="maxwidth100" value="'.(GETPOSTISSET('batch') ? GETPOST('batch') : '').'">';
 			print '</td>';
 		}
 		print '<td class="right"></td>';
-		print '<td class="center">';
+		print '<td class="right">';
 		print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
 		print '</td>';
 		// Actions
@@ -598,7 +902,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';
+	$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated, id.fk_movement';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
 	$sql .= ' WHERE id.fk_inventory = '.((int) $object->id);
 
@@ -611,7 +915,7 @@ if ($object->id > 0) {
 		$num = $db->num_rows($resql);
 
 		$i = 0;
-		$totalfound = 0;
+		$hasinput = false;
 		$totalarray = array();
 		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
@@ -625,51 +929,82 @@ if ($object->id > 0) {
 				$cacheOfWarehouses[$warehouse_static->id] = $warehouse_static;
 			}
 
+			// Load real stock we have now
+			$option = '';
 			if (isset($cacheOfProducts[$obj->fk_product])) {
 				$product_static = $cacheOfProducts[$obj->fk_product];
 			} else {
 				$product_static = new Product($db);
 				$result = $product_static->fetch($obj->fk_product, '', '', '', 1, 1, 1);
 
-				$option = 'nobatch';
+				//$option = 'nobatch';
 				$option .= ',novirtual';
-				$product_static->load_stock($option); // Load stock_reel + stock_warehouse. This can also call load_virtual_stock()
+				$product_static->load_stock($option); // Load stock_reel + stock_warehouse.
 
 				$cacheOfProducts[$product_static->id] = $product_static;
 			}
 
 			print '<tr class="oddeven">';
-			print '<td>';
+			print '<td id="id_'.$obj->rowid.'_warehouse">';
 			print $warehouse_static->getNomUrl(1);
 			print '</td>';
-			print '<td>';
-			print $product_static->getNomUrl(1);
+			print '<td id="id_'.$obj->rowid.'_product">';
+			print $product_static->getNomUrl(1).' - '.$product_static->label;
 			print '</td>';
 
-			if ($conf->productbatch->enabled) {
-				print '<td>';
+			if (!empty($conf->productbatch->enabled)) {
+				print '<td id="id_'.$obj->rowid.'_batch">';
 				print $obj->batch;
 				print '</td>';
 			}
 
-			// Expected quantity
-			print '<td class="right expectedqty" id="id_'.$obj->rowid.'">';
-			print $obj->qty_stock;
+			// Expected quantity = Quantity in stock when we start inventory
+			print '<td class="right expectedqty" id="id_'.$obj->rowid.'" title="Stock viewed at last update: '.$obj->qty_stock.'">';
+			$valuetoshow = $obj->qty_stock;
+			// For inventory not yet close, we overwrite with the real value in stock now
+			if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
+				if (!empty($conf->productbatch->enabled) && $product_static->hasbatch()) {
+					$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->detail_batch[$obj->batch]->qty;
+				} else {
+					$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->real;
+				}
+			}
+			print price2num($valuetoshow, 'MS');
+			print '<input type="hidden" name="stock_qty_'.$obj->rowid.'" value="'.$valuetoshow.'">';
 			print '</td>';
 
 			// Real quantity
-			print '<td class="center">';
-			if ($object->status == $object::STATUS_VALIDATED) {
+			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;
-				$totalfound += price2num($qty_view, 'MS');
+
+				//if (!$hasinput && $qty_view !== null && $obj->qty_stock != $qty_view) {
+				if ($qty_view != '') {
+					$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>';
+
+				// 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 '</td>';
 			} else {
-				print $obj->qty_view;
-				$totalfound += $obj->qty_view;
+				print '<td class="right nowraponall">';
+				print $obj->qty_view;	// qty found
+				print '</td>';
+				print '<td class="nowraponall right">';
+				if ($obj->fk_movement > 0) {
+					$stockmovment = new MouvementStock($db);
+					$stockmovment->fetch($obj->fk_movement);
+					print $stockmovment->getNomUrl(1, 'movements');
+				}
 				print '</td>';
 			}
 			print '</tr>';
@@ -685,15 +1020,18 @@ if ($object->id > 0) {
 	print '</div>';
 
 	if ($object->status == $object::STATUS_VALIDATED) {
-		print '<center><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'"></center>';
+		print '<center><input id="submitrecord" type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'"></center>';
 	}
 
 	print '</div>';
 
+
 	// Call method to disable the button if no qty entered yet for inventory
-	if ($object->status != $object::STATUS_VALIDATED || $totalfound == 0) {
-		print '<script type="text/javascript" language="javascript">
+
+	if ($object->status != $object::STATUS_VALIDATED || !$hasinput) {
+		print '<script type="text/javascript">
 					jQuery(document).ready(function() {
+						console.log("Call disablebuttonmakemovementandclose because status = '.((int) $object->status).' or $hasinput = '.((int) $hasinput).'");
 						disablebuttonmakemovementandclose();
 					});
 				</script>';
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 2d6b5374caa..41e43fdf433 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -205,7 +205,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
@@ -271,7 +271,7 @@ $sql .= $hookmanager->resPrint;
 $sql.= " GROUP BY ";
 foreach($object->fields as $key => $val)
 {
-	$sql.='t.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -561,7 +561,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index a975dc2c21b..778565dd2cb 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -65,7 +65,12 @@ $search_barcode = GETPOST("search_barcode", 'alpha');
 $search_label = GETPOST("search_label", 'alpha');
 $search_type = GETPOST("search_type", 'int');
 $search_vatrate = GETPOST("search_vatrate", 'alpha');
-$searchCategoryProductOperator = (GETPOST('search_category_product_operator', 'int') ? GETPOST('search_category_product_operator', 'int') : 0);
+$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');
 $search_tosell = GETPOST("search_tosell", 'int');
 $search_tobuy = GETPOST("search_tobuy", 'int');
@@ -94,8 +99,8 @@ if (!empty($conf->variants->enabled) && !empty($conf->global->PRODUIT_ATTRIBUTES
 $diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	$page = 0;
@@ -256,7 +261,7 @@ $arrayfields = array(
 
 
 // MultiPrices
-if ($conf->global->PRODUIT_MULTIPRICES) {
+if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 	for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 		$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;
 		if (!empty($conf->global->$keyforlabel)) {
@@ -355,6 +360,25 @@ if (empty($reshook)) {
 	$permissiontoadd = $user->rights->{$rightskey}->creer;
 	$uploaddir = $conf->product->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
+	if (!$error && $massaction == 'switchonsalestatus' && $permissiontoadd) {
+		$product = new Product($db);
+		foreach ($toselect as $toselectid) {
+			$result = $product->fetch($toselectid);
+			if ($result > 0 && $product->id > 0) {
+				$product->setStatut($product->status ? 0 : 1, null, 'product', 'PRODUCT_MODIFY', 'tosell');
+			}
+		}
+	}
+	if (!$error && $massaction == 'switchonpurchasestatus' && $permissiontoadd) {
+		$product = new Product($db);
+		foreach ($toselect as $toselectid) {
+			$result = $product->fetch($toselectid);
+			if ($result > 0 && $product->id > 0) {
+				$product->setStatut($product->status_buy ? 0 : 1, null, 'product', 'PRODUCT_MODIFY', 'tobuy');
+			}
+		}
+	}
 }
 
 
@@ -394,7 +418,7 @@ if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTE
 // 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
@@ -405,7 +429,7 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 }
-if (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."product_extrafields as ef on (p.rowid = ef.fk_object)";
 }
 if (!empty($searchCategoryProductList) || !empty($catid)) {
@@ -710,6 +734,8 @@ if ($resql) {
 		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 	}
 	if ($user->rights->{$rightskey}->creer) {
+		$arrayofmassactions['switchonsalestatus'] = img_picto('', 'stop-circle', 'class="pictofixedwidth"').$langs->trans("SwitchOnSaleStatus");
+		$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'))) {
@@ -793,7 +819,7 @@ if ($resql) {
 		$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 .= ' <input type="checkbox" class="valignmiddle" id="search_category_product_operator" name="search_category_product_operator" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').'/><label class="none valignmiddle" for="search_category_product_operator">'.$langs->trans('UseOrOperatorForCategories').'</label>';
 		$moreforfilter .= '</div>';
 	}
 
@@ -950,7 +976,7 @@ if ($resql) {
 	}
 
 	// Multiprice
-	if ($conf->global->PRODUIT_MULTIPRICES) {
+	if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 		foreach ($arraypricelevel as $key => $value) {
 			if (!empty($arrayfields['p.sellprice'.$key]['checked'])) {
 				print '<td class="liste_titre right">';
@@ -1156,7 +1182,7 @@ if ($resql) {
 	}
 
 	// Multiprices
-	if ($conf->global->PRODUIT_MULTIPRICES) {
+	if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 		foreach ($arraypricelevel as $key => $value) {
 			if (!empty($arrayfields['p.sellprice'.$key]['checked'])) {
 				print_liste_field_titre($arrayfields['p.sellprice'.$key]['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
@@ -1253,8 +1279,8 @@ if ($resql) {
 		if (!empty($conf->global->MAIN_MULTILANGS)) {  // If multilang is enabled
 			$sql = "SELECT label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-			$sql .= " WHERE fk_product=".$obj->rowid;
-			$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
+			$sql .= " WHERE fk_product = ".((int) $obj->rowid);
+			$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
 			$sql .= " LIMIT 1";
 
 			$result = $db->query($sql);
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index b758f414035..c54bd3637ae 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -63,11 +63,19 @@ if ($object->id > 0) {
 }
 
 
+$hookmanager->initHooks(array('productnote'));
+
+
 /*
  * Actions
  */
-
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$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
+}
 
 
 /*
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 32a2cd08cc9..707f95d2202 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -30,7 +30,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('commande', 'propal', 'bills', 'other'));
+$langs->loadLangs(array('commande', 'propal', 'bills', 'other', 'products'));
 
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
@@ -44,8 +44,8 @@ if (!empty($user->socid)) {
 }
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -212,7 +212,7 @@ if ($mode && $mode != '-1') {
 			$sql = "SELECT label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
 			$sql .= " WHERE fk_product = ".((int) $prodid);
-			$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
+			$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
 			$sql .= " LIMIT 1";
 
 			$resultp = $db->query($sql);
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index cef401bcc45..45ecbd9bafa 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -127,7 +127,7 @@ if (empty($reshook)) {
 		$reg = array();
 		$vatratecode = '';
 		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg)) {
-			$vat_src_code = $reg[1];
+			$vatratecode = $reg[1];
 			$tva_tx = preg_replace('/\s*\(.*\)/', '', $tva_tx_txt); // Remove code into vatrate.
 		}
 
@@ -143,15 +143,35 @@ if (empty($reshook)) {
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
 			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
 			$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
-			$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+			$sql .= " AND t.code = '".$db->escape($vatratecode)."'";
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				$npr = $obj->recuperableonly;
-				$localtax1 = $obj->localtax1;
-				$localtax2 = $obj->localtax2;
-				$localtax1_type = $obj->localtax1_type;
-				$localtax2_type = $obj->localtax2_type;
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
+			}
+		} else {
+			// Get record with empty code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+			$sql .= " AND t.code = ''";
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
 			}
 		}
 
@@ -172,6 +192,8 @@ if (empty($reshook)) {
 		}
 
 		if ($error) {
+			// Force the update of the price of the product to 0 if error
+
 			//$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
 			$localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retrieve them.
 			$object->updatePrice(0, $object->price_base_type, $user, $tva_tx, '', 0, $npr, 0, 0, $localtaxarray, $vatratecode);
@@ -256,11 +278,37 @@ if (empty($reshook)) {
 					$resql = $db->query($sql);
 					if ($resql) {
 						$obj = $db->fetch_object($resql);
-						$npr = $obj->recuperableonly;
-						$localtax1 = $obj->localtax1;
-						$localtax2 = $obj->localtax2;
-						$localtax1_type = $obj->localtax1_type;
-						$localtax2_type = $obj->localtax2_type;
+						if ($obj) {
+							$npr = $obj->recuperableonly;
+							$localtax1 = $obj->localtax1;
+							$localtax2 = $obj->localtax2;
+							$localtax1_type = $obj->localtax1_type;
+							$localtax2_type = $obj->localtax2_type;
+						}
+
+						// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule.
+						if (in_array($mysoc->country_code, array('ES'))) {
+							$localtax1 = get_localtax($tva_tx, 1);
+							$localtax2 = get_localtax($tva_tx, 2);
+						}
+					}
+				} else {
+					// Get record with empty code
+					$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+					$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+					$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+					$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+					$sql .= " AND t.code = ''";
+					$resql = $db->query($sql);
+					if ($resql) {
+						$obj = $db->fetch_object($resql);
+						if ($obj) {
+							$npr = $obj->recuperableonly;
+							$localtax1 = $obj->localtax1;
+							$localtax2 = $obj->localtax2;
+							$localtax1_type = $obj->localtax1_type;
+							$localtax2_type = $obj->localtax2_type;
+						}
 					}
 				}
 
@@ -309,19 +357,40 @@ if (empty($reshook)) {
 				$resql = $db->query($sql);
 				if ($resql) {
 					$obj = $db->fetch_object($resql);
-					$npr = $obj->recuperableonly;
-					$localtax1 = $obj->localtax1;
-					$localtax2 = $obj->localtax2;
-					$localtax1_type = $obj->localtax1_type;
-					$localtax2_type = $obj->localtax2_type;
+					if ($obj) {
+						$npr = $obj->recuperableonly;
+						$localtax1 = $obj->localtax1;
+						$localtax2 = $obj->localtax2;
+						$localtax1_type = $obj->localtax1_type;
+						$localtax2_type = $obj->localtax2_type;
+					}
 
-					// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule
+					// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule.
 					if (in_array($mysoc->country_code, array('ES'))) {
 						$localtax1 = get_localtax($tva_tx, 1);
 						$localtax2 = get_localtax($tva_tx, 2);
 					}
 				}
+			} else {
+				// Get record with empty code
+				$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+				$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+				$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+				$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+				$sql .= " AND t.code = ''";
+				$resql = $db->query($sql);
+				if ($resql) {
+					$obj = $db->fetch_object($resql);
+					if ($obj) {
+						$npr = $obj->recuperableonly;
+						$localtax1 = $obj->localtax1;
+						$localtax2 = $obj->localtax2;
+						$localtax1_type = $obj->localtax1_type;
+						$localtax2_type = $obj->localtax2_type;
+					}
+				}
 			}
+
 			$pricestoupdate[0] = array(
 				'price' => $newprice,
 				'price_min' => $newprice_min,
@@ -532,11 +601,37 @@ if (empty($reshook)) {
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				$npr = $obj->recuperableonly;
-				$localtax1 = $obj->localtax1;
-				$localtax2 = $obj->localtax2;
-				$localtax1_type = $obj->localtax1_type;
-				$localtax2_type = $obj->localtax2_type;
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
+
+				// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule.
+				if (in_array($mysoc->country_code, array('ES'))) {
+					$localtax1 = get_localtax($tva_tx, 1);
+					$localtax2 = get_localtax($tva_tx, 2);
+				}
+			}
+		} else {
+			// Get record with empty code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+			$sql .= " AND t.code = ''";
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
 			}
 		}
 
@@ -625,11 +720,37 @@ if (empty($reshook)) {
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				$npr = $obj->recuperableonly;
-				$localtax1 = $obj->localtax1;
-				$localtax2 = $obj->localtax2;
-				$localtax1_type = $obj->localtax1_type;
-				$localtax2_type = $obj->localtax2_type;
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
+
+				// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule.
+				if (in_array($mysoc->country_code, array('ES'))) {
+					$localtax1 = get_localtax($tva_tx, 1);
+					$localtax2 = get_localtax($tva_tx, 2);
+				}
+			}
+		} else {
+			// Get record with empty code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+			$sql .= " AND t.code = ''";
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				if ($obj) {
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
 			}
 		}
 
@@ -733,9 +854,9 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 		print '</td>';
 		print '<td colspan="2">';
 		if ($object->multiprices_base_type[$soc->price_level] == 'TTC') {
-			print price($object->multiprices_ttc[$soc->price_level]);
+			print '<span class="amount">'.price($object->multiprices_ttc[$soc->price_level]).'</span>';
 		} else {
-			print price($object->multiprices[$soc->price_level]);
+			print '<span class="amount">'.price($object->multiprices[$soc->price_level]).'</span>';
 		}
 		if ($object->multiprices_base_type[$soc->price_level]) {
 			print ' '.$langs->trans($object->multiprices_base_type[$soc->price_level]);
@@ -827,22 +948,23 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			}
 
 			// TVA
+			print '<!-- Default VAT Rate -->';
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
 			$positiverates = '';
 			if (price2num($object->tva_tx)) {
-				$positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
+				$positiverates .= ($positiverates ? '<span class="opacitymedium">/</span>' : '').price2num($object->tva_tx);
 			}
 			if (price2num($object->localtax1_type)) {
-				$positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
+				$positiverates .= ($positiverates ? '<span class="opacitymedium">/</span>' : '').price2num($object->localtax1_tx);
 			}
 			if (price2num($object->localtax2_type)) {
-				$positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
+				$positiverates .= ($positiverates ? '<span class="opacitymedium">/</span>' : '').price2num($object->localtax2_tx);
 			}
 			if (empty($positiverates)) {
 				$positiverates = '0';
 			}
-			echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
+			print vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), true, $object->tva_npr, 1);
 			/*
 			if ($object->default_vat_code)
 			{
@@ -859,7 +981,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 		print '<tr class="liste_titre"><td>';
 		print $langs->trans("PriceLevel");
 		if ($user->admin) {
-			print ' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editlabelsellingprice&amp;pricelevel='.$i.'&amp;id='.$object->id.'">'.img_edit($langs->trans('EditSellingPriceLabel'), 0).'</a>';
+			print ' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editlabelsellingprice&token='.newToken().'&pricelevel='.$i.'&id='.$object->id.'">'.img_edit($langs->trans('EditSellingPriceLabel'), 0).'</a>';
 		}
 		print '</td>';
 		print '<td style="text-align: right">'.$langs->trans("SellingPrice").'</td>';
@@ -890,15 +1012,15 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			print '</td>';
 
 			if ($object->multiprices_base_type [$i] == 'TTC') {
-				print '<td style="text-align: right">'.price($object->multiprices_ttc[$i]);
+				print '<td class="right"><span class="amount">'.price($object->multiprices_ttc[$i]);
 			} else {
-				print '<td style="text-align: right">'.price($object->multiprices[$i]);
+				print '<td class="right"><span class="amount">'.price($object->multiprices[$i]);
 			}
 
 			if ($object->multiprices_base_type[$i]) {
-				print ' '.$langs->trans($object->multiprices_base_type [$i]).'</td>';
+				print ' '.$langs->trans($object->multiprices_base_type [$i]).'</span></td>';
 			} else {
-				print ' '.$langs->trans($object->price_base_type).'</td>';
+				print ' '.$langs->trans($object->price_base_type).'</span></td>';
 			}
 
 			// Prix min
@@ -953,9 +1075,9 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 							print '<td class="right">'.price($prices['remise_percent']).' %</td>';
 							print '<td class="center">';
 							if (($user->rights->produit->creer || $user->rights->service->creer)) {
-								print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_price_by_qty&amp;rowid='.$prices["rowid"].'">';
+								print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit_price_by_qty&token='.newToken().'&rowid='.$prices["rowid"].'">';
 								print img_edit().'</a>';
-								print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete_price_by_qty&amp;token='.newToken().'&amp;rowid='.$prices["rowid"].'">';
+								print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete_price_by_qty&token='.newToken().'&rowid='.$prices["rowid"].'">';
 								print img_delete().'</a>';
 							} else {
 								print '&nbsp;';
@@ -1106,9 +1228,9 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 					print '<td class="right">'.price($prices['remise_percent']).' %</td>';
 					print '<td class="center">';
 					if (($user->rights->produit->creer || $user->rights->service->creer)) {
-						print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_price_by_qty&amp;rowid='.$prices["rowid"].'">';
+						print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit_price_by_qty&token='.newToken().'&rowid='.$prices["rowid"].'">';
 						print img_edit().'</a>';
-						print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete_price_by_qty&amp;token='.newToken().'&amp;rowid='.$prices["rowid"].'">';
+						print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete_price_by_qty&token='.newToken().'&rowid='.$prices["rowid"].'">';
 						print img_delete().'</a>';
 					} else {
 						print '&nbsp;';
@@ -1155,23 +1277,31 @@ if (!$action || $action == 'delete' || $action == 'showlog_customer_price' || $a
 		} else {
 			if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
 				if ($user->rights->produit->creer || $user->rights->service->creer) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&amp;id=' . $object->id . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>';
+				} else {
+					print '<div class="inline-block divButAction"><span class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">' . $langs->trans("UpdateDefaultPrice") . '</span></div>';
 				}
 			}
 
 			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&amp;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().'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>';
 				}
 			}
 
 			if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
 				if ($user->rights->produit->creer || $user->rights->service->creer) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_vat&amp;id=' . $object->id . '">' . $langs->trans("UpdateVAT") . '</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_vat&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("UpdateVAT") . '</a></div>';
+				} else {
+					print '<div class="inline-block divButAction"><span class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">' . $langs->trans("UpdateVAT") . '</span></div>';
 				}
 
 				if ($user->rights->produit->creer || $user->rights->service->creer) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&amp;id=' . $object->id . '">' . $langs->trans("UpdateLevelPrices") . '</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("UpdateLevelPrices") . '</a></div>';
+				} else {
+					print '<div class="inline-block divButAction"><span class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">' . $langs->trans("UpdateLevelPrices") . '</span></div>';
 				}
 			}
 		}
@@ -1207,11 +1337,7 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '<br></form><br>';
 }
@@ -1321,13 +1447,9 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
 
 		print dol_get_fiche_end();
 
-		print '<div class="center">';
-		print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
+		print $form->buttonsSaveCancel();
 
-		print '<br></form>';
+		print '</form>';
 	} else {
 		print '<!-- Edit price per level -->'."\n";
 		?>
@@ -1444,10 +1566,8 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
 
 		//print dol_get_fiche_end();
 
-		print '<div style="text-align: center">';
-		print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-		print '&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+		print $form->buttonsSaveCancel();
+
 		print '</form>';
 	}
 }
@@ -1648,7 +1768,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 
 					print '<td class="right">';
 					if ($candelete || ($db->jdate($objp->dp) >= dol_now())) {		// Test on date is to be able to delete a corrupted record with a date in future
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;id='.$object->id.'&amp;lineid='.$objp->rowid.'">';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'&lineid='.$objp->rowid.'">';
 						print img_delete();
 						print '</a>';
 					} else {
@@ -1679,8 +1799,8 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 	$prodcustprice = new Productcustomerprice($db);
 
 	$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-	$sortfield = GETPOST("sortfield", 'alpha');
-	$sortorder = GETPOST("sortorder", 'alpha');
+	$sortfield = GETPOST('sortfield', 'aZ09comma');
+	$sortorder = GETPOST('sortorder', 'aZ09comma');
 	$page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
 	if (empty($page) || $page == -1) {
 		$page = 0;
@@ -1776,10 +1896,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '<label for="updatechildprice">'.$langs->trans('ForceUpdateChildPriceSoc').'</label>';
 		print '</div>';
 
-		print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
+		print $form->buttonsSaveCancel();
 
 		print '</form>';
 	} elseif ($action == 'edit_customer_price') {
@@ -1861,10 +1978,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '<label for="updatechildprice">'.$langs->trans('ForceUpdateChildPriceSoc').'</label>';
 		print "</div>";
 
-		print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
+		print $form->buttonsSaveCancel();
 
 		print '<br></form>';
 	} elseif ($action == 'showlog_customer_price') {
@@ -2120,11 +2234,11 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '</td>';
 		if ($user->rights->produit->supprimer || $user->rights->service->supprimer) {
 			print '<td class="nowraponall">';
-			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=showlog_default_price&amp;id='.$object->id.'">';
+			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?action=showlog_default_price&token='.newToken().'&id='.$object->id.'">';
 			print img_info($langs->trans('PriceByCustomerLog'));
 			print '</a>';
 			print ' ';
-			print '<a class="marginleftonly marginrightonly editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit_price&amp;id='.$object->id.'">';
+			print '<a class="marginleftonly marginrightonly editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit_price&token='.newToken().'&id='.$object->id.'">';
 			print img_edit('default', 0, 'style="vertical-align: middle;"');
 			print '</a>';
 			print '</td>';
@@ -2205,15 +2319,15 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				// Action
 				if ($user->rights->produit->supprimer || $user->rights->service->supprimer) {
 					print '<td class="right nowraponall">';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=showlog_customer_price&amp;id='.$object->id.'&amp;socid='.$line->fk_soc.'">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=showlog_customer_price&token='.newToken().'&id='.$object->id.'&socid='.$line->fk_soc.'">';
 					print img_info($langs->trans('PriceByCustomerLog'));
 					print '</a>';
 					print ' ';
-					print '<a class="marginleftonly editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit_customer_price&amp;id='.$object->id.'&amp;lineid='.$line->id.'">';
+					print '<a class="marginleftonly editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit_customer_price&token='.newToken().'&id='.$object->id.'&lineid='.$line->id.'">';
 					print img_edit('default', 0, 'style="vertical-align: middle;"');
 					print '</a>';
 					print ' ';
-					print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?action=delete_customer_price&amp;token='.newToken().'&amp;id='.$object->id.'&amp;lineid='.$line->id.'">';
+					print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?action=delete_customer_price&token='.newToken().'&id='.$object->id.'&lineid='.$line->id.'">';
 					print img_delete('default', 'style="vertical-align: middle;"');
 					print '</a>';
 					print '</td>';
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index a711c630414..e8e7bbda3cd 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -39,16 +39,17 @@ $action = GETPOST('action', 'aZ09');
 $sref = GETPOST("sref", 'alpha');
 $snom = GETPOST("snom", 'alpha');
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$type = GETPOST("type", "int");
+$type = GETPOSTISSET('type') ? GETPOST('type', 'int') : Product::TYPE_PRODUCT;
 $search_barcode = GETPOST("search_barcode", 'alpha');
-$catid = GETPOST('catid', 'int');
 $toolowstock = GETPOST('toolowstock');
 $tosell = GETPOST("tosell");
 $tobuy = GETPOST("tobuy");
 $fourn_id = GETPOST("fourn_id", 'int');
+$sbarcode = GETPOST("sbarcode", 'int');
+$search_stock_physique = GETPOST('search_stock_physique', 'alpha');
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0) {
 	$page = 0;
@@ -67,7 +68,11 @@ $offset = $limit * $page;
 
 // Load sale and categ filters
 $search_sale = GETPOST("search_sale");
-$search_categ = GETPOST("search_categ");
+if (GETPOSTISSET('catid')) {
+	$search_categ = GETPOST('catid', 'int');
+} else {
+	$search_categ = GETPOST('search_categ', 'int');
+}
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
 $canvas = GETPOST("canvas");
@@ -110,11 +115,10 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$tobuy = "";
 	$search_sale = "";
 	$search_categ = "";
-	$type = "";
-	$catid = '';
 	$toolowstock = '';
 	$fourn_id = '';
 	$sbarcode = '';
+	$search_stock_physique = '';
 }
 
 
@@ -145,13 +149,22 @@ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as e ON s.fk_entrepot = e.rowid A
 if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_units as u on p.fk_unit = u.rowid';
 }
-// We'll need this table joined to the select in order to filter by categ
-if ($search_categ > 0) {
-	$sql .= ", ".MAIN_DB_PREFIX."categorie_product as cp";
-}
 $sql .= " WHERE p.entity IN (".getEntity('product').")";
-if ($search_categ > 0) {
-	$sql .= " AND p.rowid = cp.fk_product"; // Join for the needed table to filter by categ
+if (!empty($search_categ) && $search_categ != '-1') {
+	$sql .= " AND ";
+	if ($search_categ == -2) {
+		$sql .= " NOT EXISTS ";
+	} else {
+		$sql .= " EXISTS ";
+	}
+	$sql .= "(";
+	$sql .= " SELECT cp.fk_categorie, cp.fk_product";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "categorie_product as cp";
+	$sql .= " WHERE cp.fk_product = p.rowid"; // Join for the needed table to filter by categ
+	if ($search_categ > 0) {
+		$sql .= " AND cp.fk_categorie = " . ((int) $search_categ);
+	}
+	$sql .= ")";
 }
 if ($sall) {
 	$sql .= natural_search(array('p.ref', 'p.label', 'p.description', 'p.note'), $sall);
@@ -182,24 +195,32 @@ if (!empty($tobuy)) {
 if (!empty($canvas)) {
 	$sql .= " AND p.canvas = '".$db->escape($canvas)."'";
 }
-if ($catid > 0) {
-	$sql .= " AND cp.fk_categorie = ".((int) $catid);
-}
 if ($fourn_id > 0) {
 	$sql .= " AND p.rowid = pf.fk_product AND pf.fk_soc = ".((int) $fourn_id);
 }
-// Insert categ filter
-if ($search_categ > 0) {
-	$sql .= " AND cp.fk_categorie = ".((int) $search_categ);
-}
 $sql .= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,";
 $sql .= " p.fk_product_type, p.tms, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock";
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldSelect', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
+$sql_having = '';
 if ($toolowstock) {
-	$sql .= " HAVING SUM(".$db->ifsql('s.reel IS NULL', '0', 's.reel').") < p.seuil_stock_alerte";
+	$sql_having .= " HAVING SUM(".$db->ifsql('s.reel IS NULL', '0', 's.reel').") < p.seuil_stock_alerte";
+}
+if ($search_stock_physique != '') {
+	//$natural_search_physique = natural_search('HAVING SUM(' . $db->ifsql('s.reel IS NULL', '0', 's.reel') . ')', $search_stock_physique, 1, 1);
+	$natural_search_physique = natural_search('SUM(' . $db->ifsql('s.reel IS NULL', '0', 's.reel') . ')', $search_stock_physique, 1, 1);
+	$natural_search_physique = " " . substr($natural_search_physique, 1, -1); // remove first "(" and last ")" characters
+	if (!empty($sql_having)) {
+		$sql_having .= " AND";
+	} else {
+		$sql_having .= " HAVING";
+	}
+	$sql_having .= $natural_search_physique;
+}
+if (!empty($sql_having)) {
+	$sql .= $sql_having;
 }
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -252,7 +273,7 @@ if ($resql) {
 	if ($tobuy) {
 		$param .= "&tobuy=".urlencode($tobuy);
 	}
-	if ($type) {
+	if ($type != '') {
 		$param .= "&type=".urlencode($type);
 	}
 	if ($fourn_id) {
@@ -276,8 +297,8 @@ if ($resql) {
 	if ($sbarcode) {
 		$param .= "&sbarcode=".urlencode($sbarcode);
 	}
-	if ($catid) {
-		$param .= "&catid=".urlencode($catid);
+	if ($search_stock_physique) {
+		$param .= '&search_stock_physique=' . urlencode($search_stock_physique);
 	}
 
 	llxHeader("", $texte, $helpurl);
@@ -291,10 +312,10 @@ if ($resql) {
 
 	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'product', 0, '', '', $limit);
 
-	if (!empty($catid)) {
+	if ($search_categ > 0) {
 		print "<div id='ways'>";
 		$c = new Categorie($db);
-		$c->fetch($catid);
+		$c->fetch($search_categ);
 		$ways = $c->print_all_ways(' &gt; ', 'product/reassort.php');
 		print " &gt; ".$ways[0]."<br>\n";
 		print "</div><br>";
@@ -305,7 +326,7 @@ if ($resql) {
 	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');
+		$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1);
 		$moreforfilter .= '</div>';
 	}
 
@@ -322,32 +343,6 @@ if ($resql) {
 		print '</div>';
 	}
 
-	$param = '';
-	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 ($toolowstock) {
-		$param .= "&toolowstock=".urlencode($toolowstock);
-	}
-	if ($search_categ > 0) {
-		$param .= "&search_categ=".urlencode($search_categ);
-	}
-
 	$formProduct = new FormProduct($db);
 	$formProduct->loadWarehouses();
 	$warehouses_list = $formProduct->cache_warehouses;
@@ -377,7 +372,10 @@ if ($resql) {
 	// Stock limit
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre right">&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>';
 	if ($virtualdiffersfromphysical) {
 		print '<td class="liste_titre">&nbsp;</td>';
 	}
@@ -395,14 +393,14 @@ if ($resql) {
 
 	//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);
+	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("Duration", $_SERVER["PHP_SELF"], "p.duration", '', $param, "", $sortfield, $sortorder, 'center ');
 	}
-	print_liste_field_titre("StockLimit", $_SERVER["PHP_SELF"], "p.seuil_stock_alerte", $param, "", '', $sortfield, $sortorder, 'right ');
-	print_liste_field_titre("DesiredStock", $_SERVER["PHP_SELF"], "p.desiredstock", $param, "", '', $sortfield, $sortorder, 'right ');
-	print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stock_physique", $param, "", '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("StockLimit", $_SERVER["PHP_SELF"], "p.seuil_stock_alerte", '', $param, "", $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("DesiredStock", $_SERVER["PHP_SELF"], "p.desiredstock", '', $param, "", $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stock_physique", '', $param, "", $sortfield, $sortorder, 'right ');
 	// Details per warehouse
 	if (!empty($conf->global->STOCK_DETAIL_ON_WAREHOUSE)) {	// TODO This should be moved into the selection of fields on page product/list (page product/stock will be removed and replaced with product/list with its own context)
 		if ($nb_warehouse > 1) {
@@ -412,15 +410,15 @@ if ($resql) {
 		}
 	}
 	if ($virtualdiffersfromphysical) {
-		print_liste_field_titre("VirtualStock", $_SERVER["PHP_SELF"], "", $param, "", '', $sortfield, $sortorder, 'right ', 'VirtualStockDesc');
+		print_liste_field_titre("VirtualStock", $_SERVER["PHP_SELF"], "", '', $param, "", $sortfield, $sortorder, 'right ', 'VirtualStockDesc');
 	}
 	// Units
 	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-		print_liste_field_titre("Unit", $_SERVER["PHP_SELF"], "unit_short", $param, "", 'align="right"', $sortfield, $sortorder);
+		print_liste_field_titre("Unit", $_SERVER["PHP_SELF"], "unit_short", '', $param, 'align="right"', $sortfield, $sortorder);
 	}
 	print_liste_field_titre('');
-	print_liste_field_titre("ProductStatusOnSell", $_SERVER["PHP_SELF"], "p.tosell", $param, "", '', $sortfield, $sortorder, 'right ');
-	print_liste_field_titre("ProductStatusOnBuy", $_SERVER["PHP_SELF"], "p.tobuy", $param, "", '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("ProductStatusOnSell", $_SERVER["PHP_SELF"], "p.tosell", '', $param, "", $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("ProductStatusOnBuy", $_SERVER["PHP_SELF"], "p.tobuy", '', $param, "", $sortfield, $sortorder, 'right ');
 	// Hook fields
 	$parameters = array('param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 21bca9c4aa8..c5463e3e4e2 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -41,18 +41,19 @@ $action = GETPOST('action', 'aZ09');
 $sref = GETPOST("sref", 'alpha');
 $snom = GETPOST("snom", 'alpha');
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$type = GETPOST("type", "int");
+$type = GETPOSTISSET('type') ? GETPOST('type', 'int') : Product::TYPE_PRODUCT;
 $search_barcode = GETPOST("search_barcode", 'alpha');
 $search_warehouse = GETPOST('search_warehouse', 'alpha');
 $search_batch = GETPOST('search_batch', 'alpha');
-$catid = GETPOST('catid', 'int');
 $toolowstock = GETPOST('toolowstock');
 $tosell = GETPOST("tosell");
 $tobuy = GETPOST("tobuy");
 $fourn_id = GETPOST("fourn_id", 'int');
+$sbarcode = GETPOST("sbarcode", 'int');
+$search_stock_physique = GETPOST('search_stock_physique', 'alpha');
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0) {
 	$page = 0;
@@ -71,7 +72,11 @@ $offset = $limit * $page;
 
 // Load sale and categ filters
 $search_sale = GETPOST("search_sale");
-$search_categ = GETPOST("search_categ");
+if (GETPOSTISSET('catid')) {
+	$search_categ = GETPOST('catid', 'int');
+} else {
+	$search_categ = GETPOST('search_categ', 'int');
+}
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
 $canvas = GETPOST("canvas");
@@ -101,13 +106,12 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$tobuy = "";
 	$search_sale = "";
 	$search_categ = "";
-	$type = "";
-	$catid = '';
 	$toolowstock = '';
 	$search_batch = '';
 	$search_warehouse = '';
 	$fourn_id = '';
 	$sbarcode = '';
+	$search_stock_physique = '';
 }
 
 
@@ -134,13 +138,22 @@ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as ps on p.rowid = ps.fk_pro
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as e on ps.fk_entrepot = e.rowid'; // Link on unique key
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_batch as pb on pb.fk_product_stock = ps.rowid'; // Detail for each lot on each warehouse
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lot as pl on pl.fk_product = p.rowid AND pl.batch = pb.batch'; // Link on unique key
-// We'll need this table joined to the select in order to filter by categ
-if ($search_categ > 0) {
-	$sql .= ", ".MAIN_DB_PREFIX."categorie_product as cp";
-}
 $sql .= " WHERE p.entity IN (".getEntity('product').")";
-if ($search_categ > 0) {
-	$sql .= " AND p.rowid = cp.fk_product"; // Join for the needed table to filter by categ
+if (!empty($search_categ) && $search_categ != '-1') {
+	$sql .= " AND ";
+	if ($search_categ == -2) {
+		$sql .= " NOT EXISTS ";
+	} else {
+		$sql .= " EXISTS ";
+	}
+	$sql .= "(";
+	$sql .= " SELECT cp.fk_categorie, cp.fk_product";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "categorie_product as cp";
+	$sql .= " WHERE cp.fk_product = p.rowid"; // Join for the needed table to filter by categ
+	if ($search_categ > 0) {
+		$sql .= " AND cp.fk_categorie = " . ((int) $search_categ);
+	}
+	$sql .= ")";
 }
 if ($sall) {
 	$sql .= natural_search(array('p.ref', 'p.label', 'p.description', 'p.note'), $sall);
@@ -171,16 +184,9 @@ if (!empty($tobuy)) {
 if (!empty($canvas)) {
 	$sql .= " AND p.canvas = '".$db->escape($canvas)."'";
 }
-if ($catid > 0) {
-	$sql .= " AND cp.fk_categorie = ".((int) $catid);
-}
 if ($fourn_id > 0) {
 	$sql .= " AND p.rowid = pf.fk_product AND pf.fk_soc = ".((int) $fourn_id);
 }
-// Insert categ filter
-if ($search_categ > 0) {
-	$sql .= " AND cp.fk_categorie = ".((int) $search_categ);
-}
 if ($search_warehouse) {
 	$sql .= natural_search("e.ref", $search_warehouse);
 }
@@ -194,8 +200,22 @@ $sql .= " ps.fk_entrepot,";
 $sql .= " e.ref, e.lieu, e.fk_parent,";
 $sql .= " pb.batch, pb.eatby, pb.sellby,";
 $sql .= " pl.rowid, pl.eatby, pl.sellby";
+$sql_having = '';
 if ($toolowstock) {
-	$sql .= " HAVING SUM(".$db->ifsql('ps.reel IS NULL', '0', 'ps.reel').") < p.seuil_stock_alerte"; // Not used yet
+	$sql_having .= " HAVING SUM(".$db->ifsql('ps.reel IS NULL', '0', 'ps.reel').") < p.seuil_stock_alerte"; // Not used yet
+}
+if ($search_stock_physique != '') {
+	$natural_search_physique = natural_search('SUM(' . $db->ifsql('pb.qty IS NULL', '0', 'pb.qty') . ')', $search_stock_physique, 1, 1);
+	$natural_search_physique = " " . substr($natural_search_physique, 1, -1); // remove first "(" and last ")" characters
+	if (!empty($sql_having)) {
+		$sql_having .= " AND";
+	} else {
+		$sql_having .= " HAVING";
+	}
+	$sql_having .= $natural_search_physique;
+}
+if (!empty($sql_having)) {
+	$sql .= $sql_having;
 }
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -247,7 +267,7 @@ if ($resql) {
 	if ($tobuy) {
 		$param .= "&tobuy=".urlencode($tobuy);
 	}
-	if ($type) {
+	if ($type != '') {
 		$param .= "&type=".urlencode($type);
 	}
 	if ($fourn_id) {
@@ -268,18 +288,18 @@ if ($resql) {
 	if ($search_warehouse) {
 		$param .= "&search_warehouse=".urlencode($search_warehouse);
 	}
-	if ($catid) {
-		$param .= "&catid=".urlencode($catid);
-	}
 	if ($toolowstock) {
 		$param .= "&toolowstock=".urlencode($toolowstock);
 	}
 	if ($search_sale) {
 		$param .= "&search_sale=".urlencode($search_sale);
 	}
-	if ($search_categ > 0) {
+	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;*/
 
@@ -294,10 +314,10 @@ if ($resql) {
 	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'product', 0, '', '', $limit, 0, 0, 1);
 
 
-	if (!empty($catid)) {
+	if ($search_categ > 0) {
 		print "<div id='ways'>";
 		$c = new Categorie($db);
-		$c->fetch($catid);
+		$c->fetch($search_categ);
 		$ways = $c->print_all_ways(' &gt; ', 'product/reassortlot.php');
 		print " &gt; ".$ways[0]."<br>\n";
 		print "</div><br>";
@@ -308,7 +328,7 @@ if ($resql) {
 	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');
+		$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':'').'>';
@@ -341,14 +361,17 @@ if ($resql) {
 	}
 	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>';
-	print '<td class="liste_titre right">&nbsp;</td>';
-	print '<td class="liste_titre">&nbsp;</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).'">';
+	print '</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 maxwidthsearch">';
@@ -359,21 +382,21 @@ if ($resql) {
 
 	//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);
+	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("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("Warehouse", $_SERVER["PHP_SELF"], "e.ref", '', $param, "", $sortfield, $sortorder);
 	//print_liste_field_titre("DesiredStock", $_SERVER["PHP_SELF"], "p.desiredstock",$param,"",'',$sortfield,$sortorder, 'right );
-	print_liste_field_titre("Batch", $_SERVER["PHP_SELF"], "pb.batch", $param, "", '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("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 ');
+		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("EatByDate", $_SERVER["PHP_SELF"], "pb.eatby", '', $param, "", $sortfield, $sortorder, 'center ');
 	}
-	print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stock_physique", $param, "", '', $sortfield, $sortorder, 'right ');
+	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('');
@@ -393,8 +416,8 @@ if ($resql) {
 		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=".$objp->rowid;
-			$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
+			$sql .= " WHERE fk_product = ".((int) $objp->rowid);
+			$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
 			$sql .= " LIMIT 1";
 
 			$result = $db->query($sql);
@@ -406,7 +429,6 @@ if ($resql) {
 			}
 		}
 
-
 		$product_static->ref = $objp->ref;
 		$product_static->id = $objp->rowid;
 		$product_static->label = $objp->label;
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index 52eec409185..b7c4321dfd1 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -50,8 +50,8 @@ $option = '';
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -129,11 +129,11 @@ if ($id > 0 || !empty($ref)) {
 		//Calcul total qty and amount for global if full scan list
 		$total_qty_toconsume = 0;
 		$total_qty_toproduce = 0;
+		$product_cache=array();
 		$bom_data_result = array();
 
-
 		//Qauntity  to produce
-		$sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid,";
+		$sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid, b.fk_product,";
 		$sql .= " b.qty as qty_toproduce";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
 		$sql .= " WHERE ";
@@ -166,7 +166,20 @@ if ($id > 0 || !empty($ref)) {
 					$objp = $db->fetch_object($result);
 					$bomtmp->id = $objp->rowid;
 					$bomtmp->ref = $objp->ref;
+					$product = new Product($db);
+					if (!empty($objp->fk_product)) {
+						if (!array_key_exists($product->id, $product_cache)) {
+							$resultFetch = $product->fetch($objp->fk_product);
+							if ($resultFetch < 0) {
+								setEventMessages($product->error, $product->errors, 'errors');
+							} else {
+								$product_cache[$product->id] = $product;
+							}
+						}
+					}
+					$bomtmp->fk_product = $objp->fk_product;
 					$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
+					$bom_data_result[$objp->rowid]['product'] = (array_key_exists($objp->fk_product, $product_cache)? $product_cache[$objp->fk_product]->getNomUrl(1): '');
 					$bom_data_result[$objp->rowid]['qty_toproduce'] += ($objp->qty_toproduce > 0 ? $objp->qty_toproduce : 0);
 					$bom_data_result[$objp->rowid]['qty_toconsume'] = 0;
 					$bom_data_result[$objp->rowid]['date_valid'] = dol_print_date($db->jdate($objp->date_valid), 'dayhour');
@@ -180,7 +193,7 @@ if ($id > 0 || !empty($ref)) {
 		$db->free($result);
 
 		//Qauntity  to consume
-		$sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid,";
+		$sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid, b.fk_product,";
 		$sql .= " SUM(bl.qty) as qty_toconsume";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
@@ -214,9 +227,22 @@ if ($id > 0 || !empty($ref)) {
 					$objp = $db->fetch_object($result);
 					$bomtmp->id = $objp->rowid;
 					$bomtmp->ref = $objp->ref;
+					$product = new Product($db);
+					if (!empty($objp->fk_product)) {
+						if (!array_key_exists($product->id, $product_cache)) {
+							$resultFetch = $product->fetch($objp->fk_product);
+							if ($resultFetch < 0) {
+								setEventMessages($product->error, $product->errors, 'errors');
+							} else {
+								$product_cache[$product->id] = $product;
+							}
+						}
+					}
+					$bomtmp->fk_product = $objp->fk_product;
 
 					if (!array_key_exists($objp->rowid, $bom_data_result)) {
 						$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
+						$bom_data_result[$objp->rowid]['product'] = (array_key_exists($objp->fk_product, $product_cache)? $product_cache[$objp->fk_product]->getNomUrl(1): '');
 						$bom_data_result[$objp->rowid]['qty_toproduce'] = 0;
 						$bom_data_result[$objp->rowid]['qty_toconsume'] += ($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0);
 						$bom_data_result[$objp->rowid]['date_valid'] = dol_print_date($db->jdate($objp->date_valid), 'dayhour');
@@ -232,7 +258,6 @@ if ($id > 0 || !empty($ref)) {
 		}
 		$db->free($result);
 
-
 		if ($limit > 0 && $limit != $conf->liste_limit) {
 			$option .= '&limit='.urlencode($limit);
 		}
@@ -261,14 +286,15 @@ if ($id > 0 || !empty($ref)) {
 		}
 
 		print '<div class="div-table-responsive">';
-		print '<table class="tagtable liste listwithfilterbefore" width="100%">';
+		print '<table class="tagtable liste listwithfilterbefore centpercent">';
 
 		print '<tr class="liste_titre">';
 		print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "b.rowid", "", "&amp;id=".$product->id, '', $sortfield, $sortorder);
+		print_liste_field_titre("Product", $_SERVER["PHP_SELF"], "b.fk_product", "", "&amp;id=".$product->id, '', $sortfield, $sortorder);
 		print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "b.date_valid", "", "&amp;id=".$product->id, 'align="center"', $sortfield, $sortorder);
 		print_liste_field_titre("RowMaterial", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
 		print_liste_field_titre("Finished", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
-		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "b.status", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "b.status", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'right ');
 		print "</tr>\n";
 
 		if (!empty($bom_data_result)) {
@@ -277,11 +303,14 @@ if ($id > 0 || !empty($ref)) {
 				print '<td>';
 				print $data['link'];
 				print "</td>\n";
+				print '<td>';
+				print $data['product'];
+				print "</td>\n";
 				print "<td align=\"center\">";
 				print $data['date_valid']."</td>";
 				print '<td class="center">'.$data['qty_toconsume'].'</td>';
 				print '<td class="center">'.$data['qty_toproduce'].'</td>';
-				print '<td class="center">'.$data['status'].'</td>';
+				print '<td class="right">'.$data['status'].'</td>';
 				print "</tr>\n";
 			}
 			print '</table>';
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 6dc40ab7477..f45a851ecad 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -60,11 +60,15 @@ if (!empty($user->socid)) {
 $fieldvalue = ($id > 0 ? $id : $ref);
 $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('productstatscard', 'globalcard'));
+
 $tmp = dol_getdate(dol_now());
 $currentyear = $tmp['year'];
 if (empty($search_year)) {
 	$search_year = $currentyear;
 }
+$moreforfilter = "";
 
 $object = new Product($db);
 if ($id > 0 || !empty($ref)) {
@@ -188,20 +192,20 @@ if ($result || !($id > 0)) {
 		// Type
 		print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td>';
 		$array = array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
-		print $form->selectarray('type', $array, $type);
+		print $form->selectarray('type', $array, $type, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
 		print '</td></tr>';
 
 		// Product
 		print '<tr><td class="titlefield">'.$langs->trans("ProductOrService").'</td><td>';
 		print img_picto('', 'product', 'class="pictofixedwidth"');
-		print $form->select_produits($id, 'id', '', 0, 0, 1, 2, '', 0, array(), 0, '1', 0, 'maxwidth500');
+		print $form->select_produits($id, 'id', '', 0, 0, 1, 2, '', ($conf->dol_optimize_smallscreen ? 1 : 0), array(), 0, '1', 0, 'widthcentpercentminusx maxwidth400');
 		print '</td></tr>';
 
 		// Tag
 		if ($conf->categorie->enabled) {
 			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 maxwidth300');
+			$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1, 1, 'widthcentpercentminusx maxwidth400');
 			print $moreforfilter;
 			print '</td></tr>';
 		}
@@ -237,9 +241,9 @@ if ($result || !($id > 0)) {
 	}
 
 	if ($mode == 'bynumber') {
-		print '<a class="a-mesure-disabled" 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"].'?'.(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 : '').'">';
 	} else {
-		print '<span class="a-mesure">';
+		print '<span class="a-mesure marginleftonly marginrightonly">';
 	}
 	print $langs->trans("StatsByNumberOfUnits");
 	if ($mode == 'bynumber') {
@@ -250,14 +254,12 @@ if ($result || !($id > 0)) {
 
 	if (!empty($conf->dol_use_jmobile)) {
 		print '</div>'."\n".'<div class="nowrap">'."\n";
-	} else {
-		print ' &nbsp; ';
 	}
 
 	if ($mode == 'byunit') {
-		print '<a class="a-mesure-disabled" 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"].'?'.(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 : '').'">';
 	} else {
-		print '<span class="a-mesure">';
+		print '<span class="a-mesure marginleftonly marginrightonly">';
 	}
 	print $langs->trans("StatsByNumberOfEntities");
 	if ($mode == 'byunit') {
@@ -274,7 +276,7 @@ if ($result || !($id > 0)) {
 	print '<br>';
 
 	// Generation of graphs
-	$dir = (!empty($conf->product->multidir_temp[$object->entity]) ? $conf->product->multidir_temp[$object->entity] : $conf->service->multidir_temp[$object->entity]);
+	$dir = (!empty($conf->product->multidir_temp[$conf->entity]) ? $conf->product->multidir_temp[$conf->entity] : $conf->service->multidir_temp[$conf->entity]);
 	if ($object->id > 0) {  // We are on statistics for a dedicated product
 		if (!file_exists($dir.'/'.$object->id)) {
 			if (dol_mkdir($dir.'/'.$object->id) < 0) {
@@ -432,10 +434,10 @@ if ($result || !($id > 0)) {
 			if ($graphfiles == 'proposals_suppliers' && !$user->rights->supplier_proposal->lire) {
 				continue;
 			}
-			if ($graphfiles == 'invoices_suppliers' && !$user->rights->fournisseur->facture->lire) {
+			if ($graphfiles == 'invoices_suppliers' && empty($user->rights->fournisseur->facture->lire)) {
 				continue;
 			}
-			if ($graphfiles == 'orders_suppliers' && !$user->rights->fournisseur->commande->lire) {
+			if ($graphfiles == 'orders_suppliers' && empty($user->rights->fournisseur->commande->lire)) {
 				continue;
 			}
 			if ($graphfiles == 'mrp' && empty($user->rights->mrp->mo->read)) {
@@ -446,7 +448,7 @@ if ($result || !($id > 0)) {
 			if ($i % 2 == 0) {
 				print "\n".'<div class="fichecenter"><div class="fichehalfleft">'."\n";
 			} else {
-				print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
+				print "\n".'<div class="fichehalfright">'."\n";
 			}
 
 			// Date generation
@@ -457,13 +459,15 @@ if ($result || !($id > 0)) {
 					$dategenerated = $langs->trans("GeneratedOn", dol_print_date(dol_now(), "dayhour"));
 				}
 			} else {
-				$dategenerated = ($mesg ? '<font class="error">'.$mesg.'</font>' : $langs->trans("ChartNotGenerated"));
+				$dategenerated = ($mesg ? '<span class="error">'.$mesg.'</span>' : $langs->trans("ChartNotGenerated"));
 			}
 			$linktoregenerate = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?'.(GETPOSTISSET('id') ? 'id='.GETPOST('id', 'int') : 'id='.$object->id).(((string) $type != '' && $type != '-1') ? '&type='.((int) $type) : '').'&action=recalcul&mode='.urlencode($mode).'&search_year='.((int) $search_year).($search_categ > 0 ? '&search_categ='.((int) $search_categ) : '').'">';
 			$linktoregenerate .= img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')', 'refresh');
 			$linktoregenerate .= '</a>';
 
+
 			// Show graph
+			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder centpercent">';
 			// Label
 			print '<tr class="liste_titre"><td>';
@@ -476,11 +480,12 @@ if ($result || !($id > 0)) {
 			print $graphfiles[$key]['output'];
 			print '</td></tr>';
 			print '</table>';
+			print '</div>';
 
 			if ($i % 2 == 0) {
 				print "\n".'</div>'."\n";
 			} else {
-				print "\n".'</div></div></div>';
+				print "\n".'</div></div>';
 				print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
 			}
 
@@ -489,8 +494,8 @@ if ($result || !($id > 0)) {
 	}
 	// div not closed
 	if ($i % 2 == 1) {
-		print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
-		print "\n".'</div></div></div>';
+		print "\n".'<div class="fichehalfright">'."\n";
+		print "\n".'</div></div>';
 		print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
 	}
 }
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 623306536b7..9f38f68ee33 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -49,8 +49,8 @@ $hookmanager->initHooks(array('productstatsorder'));
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -139,13 +139,13 @@ if ($id > 0 || !empty($ref)) {
 			$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client, c.rowid, d.total_ht as total_ht, c.ref,";
 			$sql .= " c.ref_client,";
 			$sql .= " c.date_commande, c.fk_statut as statut, c.facture, c.rowid as commandeid, d.rowid, d.qty";
-			if (!$user->rights->societe->client->voir && !$socid) {
+			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."commande as c";
 			$sql .= ", ".MAIN_DB_PREFIX."commandedet as d";
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE c.fk_soc = s.rowid";
@@ -158,7 +158,7 @@ if ($id > 0 || !empty($ref)) {
 			if (!empty($search_year)) {
 				$sql .= ' AND YEAR(c.date_commande) IN ('.$db->sanitize($search_year).')';
 			}
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($socid) {
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index fd64a1c0572..d9d81ad70dc 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -140,13 +140,13 @@ if ($id > 0 || !empty($ref)) {
 			$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,";
 			$sql .= " c.rowid, d.total_ht as total_ht, c.ref,";
 			$sql .= " c.date_commande, c.fk_statut as statut, c.rowid as commandeid, d.rowid, d.qty";
-			if (!$user->rights->societe->client->voir && !$socid) {
+			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."commande_fournisseur as c";
 			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseurdet as d";
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE c.fk_soc = s.rowid";
@@ -159,7 +159,7 @@ if ($id > 0 || !empty($ref)) {
 			if (!empty($search_year)) {
 				$sql .= ' AND YEAR(c.date_commande) IN ('.$db->sanitize($search_year).')';
 			}
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($socid) {
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index cb7c84fc863..0c569d3530c 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -46,8 +46,8 @@ $hookmanager->initHooks(array('productstatscontract'));
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -127,14 +127,14 @@ if ($id > 0 || !empty($ref)) {
 		$now = dol_now();
 
 		$sql = "SELECT";
-		$sql .= ' sum('.$db->ifsql("cd.statut=0", 1, 0).') as nb_initial,';
-		$sql .= ' sum('.$db->ifsql("cd.statut=4 AND cd.date_fin_validite > '".$db->idate($now)."'", 1, 0).") as nb_running,";
-		$sql .= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= '".$db->idate($now)."')", 1, 0).') as nb_late,';
-		$sql .= ' sum('.$db->ifsql("cd.statut=5", 1, 0).') as nb_closed,';
+		$sql .= " sum(".$db->ifsql("cd.statut=0", 1, 0).') as nb_initial,';
+		$sql .= " sum(".$db->ifsql("cd.statut=4 AND cd.date_fin_validite > '".$db->idate($now)."'", 1, 0).") as nb_running,";
+		$sql .= " sum(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= '".$db->idate($now)."')", 1, 0).') as nb_late,';
+		$sql .= " sum(".$db->ifsql("cd.statut=5", 1, 0).') as nb_closed,';
 		$sql .= " c.rowid as rowid, c.ref, c.ref_customer, c.ref_supplier, c.date_contrat, c.statut as statut,";
 		$sql .= " s.nom as name, s.rowid as socid, s.code_client";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= ", ".MAIN_DB_PREFIX."contrat as c";
@@ -143,7 +143,7 @@ if ($id > 0 || !empty($ref)) {
 		$sql .= " AND c.fk_soc = s.rowid";
 		$sql .= " AND c.entity IN (".getEntity('contract').")";
 		$sql .= " AND cd.fk_product = ".((int) $product->id);
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($socid) {
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index b3e5571ac5a..13c6329b34f 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -52,8 +52,8 @@ $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -156,13 +156,13 @@ if ($id > 0 || !empty($ref)) {
 			$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,";
 			$sql .= " f.ref, f.datef, f.paye, f.type, f.fk_statut as statut, f.rowid as facid,";
 			$sql .= " d.rowid, d.total_ht as total_ht, d.qty"; // We must keep the d.rowid here to not loose record because of the distinct used to ignore duplicate line when link on societe_commerciaux is used
-			if (!$user->rights->societe->client->voir && !$socid) {
+			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 as f";
 			$sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE f.fk_soc = s.rowid";
@@ -175,7 +175,7 @@ if ($id > 0 || !empty($ref)) {
 			if (!empty($search_year)) {
 				$sql .= ' AND YEAR(f.datef) IN ('.$db->sanitize($search_year).')';
 			}
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($socid) {
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 212674582f9..9db71e92148 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -50,8 +50,8 @@ $hookmanager->initHooks(array('productstatssupplierinvoice'));
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -139,13 +139,13 @@ if ($id > 0 || !empty($ref)) {
 		if ($user->rights->fournisseur->facture->lire) {
 			$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client, d.rowid, d.total_ht as line_total_ht,";
 			$sql .= " f.rowid as facid, f.ref, f.ref_supplier, f.datef, f.libelle as label, f.total_ht, f.total_ttc, f.total_tva, f.paye, f.fk_statut as statut, d.qty";
-			if (!$user->rights->societe->client->voir && !$socid) {
+			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_fourn as f";
 			$sql .= ", ".MAIN_DB_PREFIX."facture_fourn_det as d";
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE f.fk_soc = s.rowid";
@@ -158,7 +158,7 @@ if ($id > 0 || !empty($ref)) {
 			if (!empty($search_year)) {
 				$sql .= ' AND YEAR(f.datef) IN ('.$db->sanitize($search_year).')';
 			}
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($socid) {
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index 5a5c33312ca..693f1fbae03 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -46,8 +46,8 @@ $hookmanager->initHooks(array('productstatsmo'));
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -127,10 +127,10 @@ if ($id > 0 || !empty($ref)) {
 		$now = dol_now();
 
 		$sql = "SELECT";
-		$sql .= ' sum('.$db->ifsql("cd.role='toconsume'", "cd.qty", 0).') as nb_toconsume,';
-		$sql .= ' sum('.$db->ifsql("cd.role='consumed'", "cd.qty", 0).') as nb_consumed,';
-		$sql .= ' sum('.$db->ifsql("cd.role='toproduce'", "cd.qty", 0).') as nb_toproduce,';
-		$sql .= ' sum('.$db->ifsql("cd.role='produced'", "cd.qty", 0).') as nb_produced,';
+		$sql .= " sum(".$db->ifsql("cd.role='toconsume'", "cd.qty", 0).') as nb_toconsume,';
+		$sql .= " sum(".$db->ifsql("cd.role='consumed'", "cd.qty", 0).') as nb_consumed,';
+		$sql .= " sum(".$db->ifsql("cd.role='toproduce'", "cd.qty", 0).') as nb_toproduce,';
+		$sql .= " sum(".$db->ifsql("cd.role='produced'", "cd.qty", 0).') as nb_produced,';
 		$sql .= " c.rowid as rowid, c.ref, c.date_valid, c.status";
 		//$sql .= " s.nom as name, s.rowid as socid, s.code_client";
 		$sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as c";
@@ -183,7 +183,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
 			}
 
-			print_barre_liste($langs->trans("Mos"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+			print_barre_liste($langs->trans("MOs"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
 			if (!empty($page)) {
 				$option .= '&page='.urlencode($page);
@@ -202,6 +202,7 @@ if ($id > 0 || !empty($ref)) {
 			print_liste_field_titre("QtyAlreadyConsumed", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
 			print_liste_field_titre("QtyToProduce", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
 			print_liste_field_titre("QtyAlreadyProduced", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
+			print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "b.status", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'right ');
 			print "</tr>\n";
 
 			$motmp = new Mo($db);
@@ -212,6 +213,7 @@ if ($id > 0 || !empty($ref)) {
 
 					$motmp->id = $objp->rowid;
 					$motmp->ref = $objp->ref;
+					$motmp->status = $objp->status;
 
 					print '<tr class="oddeven">';
 					print '<td>';
@@ -226,6 +228,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<td class="center">'.($objp->nb_toproduce > 0 ? $objp->nb_toproduce : '').'</td>';
 					print '<td class="center">'.($objp->nb_produced > 0 ? $objp->nb_produced : '').'</td>';
 					//$mostatic->LibStatut($objp->statut,5).'</td>';
+					print '<td class="right">'.$motmp->getLibStatut(2).'</td>';
 					print "</tr>\n";
 					$i++;
 				}
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index b83d0368b75..068184feb7e 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -141,13 +141,13 @@ if ($id > 0 || !empty($ref)) {
 			$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, p.rowid as propalid, p.ref, d.total_ht as amount,";
 			$sql .= " p.ref_client,";
 			$sql .= "p.datep, p.fk_statut as statut, d.rowid, d.qty";
-			if (!$user->rights->societe->client->voir && !$socid) {
+			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."propal as p";
 			$sql .= ", ".MAIN_DB_PREFIX."propaldet as d";
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE p.fk_soc = s.rowid";
@@ -160,7 +160,7 @@ if ($id > 0 || !empty($ref)) {
 			if (!empty($search_year)) {
 				$sql .= ' AND YEAR(p.datep) IN ('.$db->sanitize($search_year).')';
 			}
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($socid) {
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index d583d58bff8..ab02e51fa57 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -140,13 +140,13 @@ if ($id > 0 || !empty($ref)) {
 			$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, p.rowid as propalid, p.ref, d.total_ht as amount,";
 			//$sql .= " p.ref_supplier,";
 			$sql .= "p.date_valid, p.fk_statut as statut, d.rowid, d.qty";
-			if (!$user->rights->societe->client->voir && !$socid) {
+			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."supplier_proposal as p";
 			$sql .= ", ".MAIN_DB_PREFIX."supplier_proposaldet as d";
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE p.fk_soc = s.rowid";
@@ -159,7 +159,7 @@ if ($id > 0 || !empty($ref)) {
 			if (!empty($search_year)) {
 				$sql .= ' AND YEAR(p.datep) IN ('.$db->sanitize($search_year).')';
 			}
-			if (!$user->rights->societe->client->voir && !$socid) {
+			if (empty($user->rights->societe->client->voir) && !$socid) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($socid) {
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 440e082e8ff..18a394559a3 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -51,10 +51,11 @@ $confirm = GETPOST('confirm');
 $projectid = GETPOST('projectid', 'int');
 
 $id = GETPOST('id', 'int');
+$socid = GETPOST('socid', 'int');
 $ref = GETPOST('ref', 'alpha');
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 if (!$sortfield) {
 	$sortfield = "p.ref";
 }
@@ -86,6 +87,10 @@ if ($id > 0 || !empty($ref)) {
 	}
 }
 
+$usercanread = (($user->rights->stock->lire));
+$usercancreate = (($user->rights->stock->creer));
+$usercandelete = (($user->rights->stock->supprimer));
+
 
 /*
  * Actions
@@ -93,16 +98,35 @@ if ($id > 0 || !empty($ref)) {
 
 $error = 0;
 
-$usercanread = (($user->rights->stock->lire));
-$usercancreate = (($user->rights->stock->creer));
-$usercandelete = (($user->rights->stock->supprimer));
-
 $parameters = array('id'=>$id, 'ref'=>$ref);
 $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.'/product/stock/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.'/product/stock/card.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 = '';
+	}
+
 	// Ajout entrepot
 	if ($action == 'add' && $user->rights->stock->creer) {
 		$object->ref = (string) GETPOST("ref", "alpha");
@@ -288,7 +312,7 @@ if ($action == 'create') {
 		$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.'&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 '</td></tr>';
 	}
 
@@ -296,7 +320,7 @@ if ($action == 'create') {
 	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('desc', (!empty($object->description) ? $object->description : ''), '', 180, 'dolibarr_notes', 'In', false, true, $conf->fckeditor->enabled, ROWS_5, '90%');
+	$doleditor = new DolEditor('desc', (!empty($object->description) ? $object->description : ''), '', 180, 'dolibarr_notes', 'In', false, true, empty($conf->fckeditor->enabled) ? '' : $conf->fckeditor->enabled, ROWS_5, '90%');
 	$doleditor->Create();
 	print '</td></tr>';
 
@@ -347,7 +371,7 @@ if ($action == 'create') {
 	// Other attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
-	if ($conf->categorie->enabled) {
+	if (!empty($conf->categorie->enabled)) {
 		// Categories
 		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_WAREHOUSE, '', 'parent', 64, 0, 1);
@@ -358,11 +382,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-	print '</div>';
+	print $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 } else {
@@ -414,7 +434,7 @@ if ($action == 'create') {
 				$morehtmlref .= '<br>'.img_picto('', 'project').' '.$langs->trans('Project').' ';
 				if ($usercancreate) {
 					if ($action != 'classify') {
-						$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+						$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 					}
 					if ($action == 'classify') {
 						$projectid = $object->fk_project;
@@ -431,9 +451,10 @@ if ($action == 'create') {
 					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>';
+						$morehtmlref .= ' : '.$proj->getNomUrl(1);
+						if ($proj->title) {
+							$morehtmlref .= ' - '.$proj->title;
+						}
 					} else {
 						$morehtmlref .= '';
 					}
@@ -485,7 +506,6 @@ if ($action == 'create') {
 
 			print '</div>';
 			print '<div class="fichehalfright">';
-			print '<div class="ficheaddleft">';
 			print '<div class="underbanner clearboth"></div>';
 
 			print '<table class="border centpercent tableforfield">';
@@ -531,7 +551,6 @@ if ($action == 'create') {
 
 			print "</table>";
 
-			print '</div>';
 			print '</div>';
 			print '</div>';
 
@@ -666,8 +685,8 @@ if ($action == 'create') {
 					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=".$objp->rowid;
-						$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
+						$sql .= " WHERE fk_product = ".((int) $objp->rowid);
+						$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
 						$sql .= " LIMIT 1";
 
 						$result = $db->query($sql);
@@ -913,11 +932,7 @@ if ($action == 'create') {
 
 			print dol_get_fiche_end();
 
-			print '<div class="center">';
-			print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-			print '</div>';
+			print $form->buttonsSaveCancel();
 
 			print '</form>';
 		}
@@ -947,20 +962,19 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete') {
 	print $formfile->showdocuments($modulepart, $object->ref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
 	$somethingshown = $formfile->numoffiles;
 
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright">';
 
 	$MAXEVENT = 10;
 
-	$morehtmlright = '<a href="'.DOL_URL_ROOT.'/product/agenda.php?id='.$object->id.'">';
-	$morehtmlright .= $langs->trans("SeeAll");
-	$morehtmlright .= '</a>';
+	$morehtmlcenter = '';
+	//$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt 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';
 	$formactions = new FormActions($db);
-	$somethingshown = $formactions->showactions($object, 'stock', 0, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for product
+	$somethingshown = $formactions->showactions($object, 'stock', 0, 1, '', $MAXEVENT, '', $morehtmlcenter); // Show all action for product
 
-	print '</div></div></div>';
+	print '</div></div>';
 }
 
 // End of page
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 42a03a1836a..544485060af 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -104,13 +104,14 @@ class StockMovements extends DolibarrApi
 		}
 
 		$sql = "SELECT t.rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as t";
+		$sql .= " FROM ".$this->db->prefix()."stock_mouvement as t";
 		//$sql.= ' WHERE t.entity IN ('.getEntity('stock').')';
 		$sql .= ' WHERE 1 = 1';
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			$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).")";
@@ -155,21 +156,25 @@ class StockMovements extends DolibarrApi
 	 * $price Can be set to update AWP (Average Weighted Price) when you make a stock increase
 	 * $dlc Eat-by date. Will be used if lot does not exists yet and will be created.
 	 * $dluo Sell-by date. Will be used if lot does not exists yet and will be created.
-	 *
+		 *
 	 * @param int $product_id Id product id {@min 1} {@from body} {@required true}
 	 * @param int $warehouse_id Id warehouse {@min 1} {@from body} {@required true}
 	 * @param float $qty Qty to add (Use negative value for a stock decrease) {@from body} {@required true}
+	 * @param int $type Optionally specify the type of movement. 0=input (stock increase by a stock transfer), 1=output (stock decrease by a stock transfer), 2=output (stock decrease), 3=input (stock increase). {@from body} {@type int}
 	 * @param string $lot Lot {@from body}
 	 * @param string $movementcode Movement code {@example INV123} {@from body}
 	 * @param string $movementlabel Movement label {@example Inventory number 123} {@from body}
 	 * @param string $price To update AWP (Average Weighted Price) when you make a stock increase (qty must be higher then 0). {@from body}
+	 * @param string $datem Date of movement {@from body} {@type date}
 	 * @param string $dlc Eat-by date. {@from body} {@type date}
 	 * @param string $dluo Sell-by date. {@from body} {@type date}
+	 * @param string $origin_type   Origin type (Element of source object, like 'project', 'inventory', ...)
+	 * @param string $origin_id     Origin id (Id of source object)
 	 *
 	 * @return  int                         ID of stock movement
 	 * @throws RestException
 	 */
-	public function post($product_id, $warehouse_id, $qty, $lot = '', $movementcode = '', $movementlabel = '', $price = '', $dlc = '', $dluo = '')
+	public function post($product_id, $warehouse_id, $qty, $type = 2, $lot = '', $movementcode = '', $movementlabel = '', $price = '', $datem = '', $dlc = '', $dluo = '', $origin_type = '', $origin_id = 0)
 	{
 		if (!DolibarrApiAccess::$user->rights->stock->creer) {
 			throw new RestException(401);
@@ -180,16 +185,20 @@ class StockMovements extends DolibarrApi
 		}
 
 		// Type increase or decrease
-		$type = 2;
-		if ($qty >= 0) {
+		if ($type == 1 && $qty >= 0) {
+			$type = 0;
+		}
+		if ($type == 2 && $qty >= 0) {
 			$type = 3;
 		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		$eatBy = empty($dluo) ? '' : dol_stringtotime($dluo);
 		$sellBy = empty($dlc) ? '' : dol_stringtotime($dlc);
+		$dateMvt = empty($datem) ? '' : dol_stringtotime($datem);
 
-		if ($this->stockmovement->_create(DolibarrApiAccess::$user, $product_id, $warehouse_id, $qty, $type, $price, $movementlabel, $movementcode, '', $eatBy, $sellBy, $lot) <= 0) {
+		$this->stockmovement->setOrigin($origin_type, $origin_id);
+		if ($this->stockmovement->_create(DolibarrApiAccess::$user, $product_id, $warehouse_id, $qty, $type, $price, $movementlabel, $movementcode, $dateMvt, $eatBy, $sellBy, $lot) <= 0) {
 			$errormessage = $this->stockmovement->error;
 			if (empty($errormessage)) {
 				$errormessage = join(',', $this->stockmovement->errors);
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index 3bddbaff8f9..0cf0e57fe3a 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -104,9 +104,9 @@ class Warehouses extends DolibarrApi
 		}
 
 		$sql = "SELECT t.rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as t";
+		$sql .= " FROM ".$this->db->prefix()."entrepot as t";
 		if ($category > 0) {
-			$sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c";
+			$sql .= ", ".$this->db->prefix()."categorie_societe as c";
 		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('stock').')';
 		// Select warehouses of given category
@@ -116,8 +116,9 @@ class Warehouses extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 92df16fa867..8423ebdea6f 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -204,13 +204,13 @@ class Entrepot extends CommonObject
 
 		$this->db->begin();
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."entrepot (ref, entity, datec, fk_user_author, fk_parent, fk_project)";
-		$sql .= " VALUES ('".$this->db->escape($this->label)."', ".$conf->entity.", '".$this->db->idate($now)."', ".$user->id.", ".($this->fk_parent > 0 ? $this->fk_parent : "NULL").", ".($this->fk_project > 0 ? $this->fk_project : "NULL").")";
+		$sql = "INSERT INTO ".$this->db->prefix()."entrepot (ref, entity, datec, fk_user_author, fk_parent, fk_project)";
+		$sql .= " VALUES ('".$this->db->escape($this->label)."', ".((int) $conf->entity).", '".$this->db->idate($now)."', ".((int) $user->id).", ".($this->fk_parent > 0 ? ((int) $this->fk_parent) : "NULL").", ".($this->fk_project > 0 ? ((int) $this->fk_project) : "NULL").")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
-			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."entrepot");
+			$id = $this->db->last_insert_id($this->db->prefix()."entrepot");
 			if ($id > 0) {
 				$this->id = $id;
 
@@ -293,7 +293,7 @@ class Entrepot extends CommonObject
 		$this->town = trim($this->town);
 		$this->country_id = ($this->country_id > 0 ? $this->country_id : 0);
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."entrepot";
+		$sql = "UPDATE ".$this->db->prefix()."entrepot";
 		$sql .= " SET ref = '".$this->db->escape($this->label)."'";
 		$sql .= ", fk_parent = ".(($this->fk_parent > 0) ? $this->fk_parent : "NULL");
 		$sql .= ", fk_project = ".(($this->fk_project > 0) ? $this->fk_project : "NULL");
@@ -365,8 +365,8 @@ class Entrepot extends CommonObject
 		$elements = array('stock_mouvement', 'product_stock', 'product_warehouse_properties');
 		foreach ($elements as $table) {
 			if (!$error) {
-				$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
-				$sql .= " WHERE fk_entrepot = ".$this->id;
+				$sql = "DELETE FROM ".$this->db->prefix().$table;
+				$sql .= " WHERE fk_entrepot = ".((int) $this->id);
 
 				$result = $this->db->query($sql);
 				if (!$result) {
@@ -388,8 +388,8 @@ class Entrepot extends CommonObject
 		}
 
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."entrepot";
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql = "DELETE FROM ".$this->db->prefix()."entrepot";
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			$resql1 = $this->db->query($sql);
 			if (!$resql1) {
 				$error++;
@@ -400,7 +400,7 @@ class Entrepot extends CommonObject
 
 		if (!$error) {
 			// Update denormalized fields because we change content of produt_stock. Warning: Do not use "SET p.stock", does not works with pgsql
-			$sql = "UPDATE ".MAIN_DB_PREFIX."product as p SET stock = (SELECT SUM(ps.reel) FROM ".MAIN_DB_PREFIX."product_stock as ps WHERE ps.fk_product = p.rowid)";
+			$sql = "UPDATE ".$this->db->prefix()."product as p SET stock = (SELECT SUM(ps.reel) FROM ".$this->db->prefix()."product_stock as ps WHERE ps.fk_product = p.rowid)";
 			$resql2 = $this->db->query($sql);
 			if (!$resql2) {
 				$error++;
@@ -441,11 +441,11 @@ class Entrepot extends CommonObject
 
 		$sql  = "SELECT rowid, entity, fk_parent, fk_project, ref as label, description, statut, lieu, address, zip, town, fk_pays as country_id, phone, fax,";
 		$sql .= " model_pdf, import_key";
-		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot";
+		$sql .= " FROM ".$this->db->prefix()."entrepot";
 		if ($id) {
 			$sql .= " WHERE rowid = ".((int) $id);
 		} else {
-			$sql .= " WHERE entity = ".$conf->entity;
+			$sql .= " WHERE entity IN (".getEntity('stock').")";
 			if ($ref) {
 				$sql .= " AND ref = '".$this->db->escape($ref)."'";
 			}
@@ -506,7 +506,7 @@ class Entrepot extends CommonObject
 	public function info($id)
 	{
 		$sql = "SELECT e.rowid, e.datec, e.tms as datem, e.fk_user_author";
-		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e";
+		$sql .= " FROM ".$this->db->prefix()."entrepot as e";
 		$sql .= " WHERE e.rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::info", LOG_DEBUG);
@@ -553,7 +553,7 @@ class Entrepot extends CommonObject
 		$liste = array();
 
 		$sql = "SELECT rowid, ref as label";
-		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot";
+		$sql .= " FROM ".$this->db->prefix()."entrepot";
 		$sql .= " WHERE entity IN (".getEntity('stock').")";
 		$sql .= " AND statut = ".((int) $status);
 
@@ -583,9 +583,9 @@ class Entrepot extends CommonObject
 		$ret = array();
 
 		$sql = "SELECT count(distinct p.rowid) as nb";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
-		$sql .= ", ".MAIN_DB_PREFIX."product as p";
-		$sql .= " WHERE ps.fk_entrepot = ".$this->id;
+		$sql .= " FROM ".$this->db->prefix()."product_stock as ps";
+		$sql .= ", ".$this->db->prefix()."product as p";
+		$sql .= " WHERE ps.fk_entrepot = ".((int) $this->id);
 		$sql .= " AND ps.fk_product = p.rowid";
 
 		//print $sql;
@@ -625,12 +625,12 @@ class Entrepot extends CommonObject
 		} else {
 			$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * p.pmp) as value";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
-		$sql .= ", ".MAIN_DB_PREFIX."product as p";
+		$sql .= " FROM ".$this->db->prefix()."product_stock as ps";
+		$sql .= ", ".$this->db->prefix()."product as p";
 		if ($separatedPMP) {
-			$sql .= ", ".MAIN_DB_PREFIX."product_perentity as pa";
+			$sql .= ", ".$this->db->prefix()."product_perentity as pa";
 		}
-		$sql .= " WHERE ps.fk_entrepot = ".$this->id;
+		$sql .= " WHERE ps.fk_entrepot = ".((int) $this->id);
 		if ($separatedPMP) {
 			$sql .= " AND pa.fk_product = p.rowid AND pa.entity = ". (int) $conf->entity;
 		}
@@ -680,8 +680,8 @@ class Entrepot extends CommonObject
 		}
 
 		$langs->load('stocks');
-		$label = $langs->trans($this->statuts[$status]);
-		$labelshort = $langs->trans($this->statuts[$status]);
+		$label = $langs->transnoentitiesnoconv($this->statuts[$status]);
+		$labelshort = $langs->transnoentitiesnoconv($this->statuts[$status]);
 
 		return dolGetStatus($label, $labelshort, '', $statusType, $mode);
 	}
@@ -819,7 +819,7 @@ class Entrepot extends CommonObject
 		$parentid = $this->fk_parent; // If parent_id not defined on current object, we do not start consecutive searches of parents
 		$i = 0;
 		while ($parentid > 0 && $i < $protection) {
-			$sql = 'SELECT fk_parent FROM '.MAIN_DB_PREFIX.'entrepot WHERE rowid = '.((int) $parentid);
+			$sql = "SELECT fk_parent FROM ".$this->db->prefix()."entrepot WHERE rowid = ".((int) $parentid);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$objarbo = $this->db->fetch_object($resql);
@@ -852,9 +852,9 @@ class Entrepot extends CommonObject
 	{
 		// phpcs:enable
 
-		$sql = 'SELECT rowid
-				FROM '.MAIN_DB_PREFIX.'entrepot
-				WHERE fk_parent = '.((int) $id);
+		$sql = "SELECT rowid
+				FROM ".$this->db->prefix()."entrepot
+				WHERE fk_parent = ".((int) $id);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 8a66e535ca2..b53d67f1bd2 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -54,8 +54,10 @@ class MouvementStock extends CommonObject
 
 	/**
 	 * @var int Type of movement
-	 * 0=input (stock increase by a stock transfer), 1=output (stock decrease after by a stock transfer),
-	 * 2=output (stock decrease), 3=input (stock increase)
+	 * 0=input (stock increase by a manual/direct stock transfer, correction or inventory),
+	 * 1=output (stock decrease after by a manual/direct stock transfer, correction or inventory),
+	 * 2=output (stock decrease after a business event like sale, shipment or manufacturing, ...),
+	 * 3=input (stock increase after a business event like purchase, reception or manufacturing, ...)
 	 * Note that qty should be > 0 with 0 or 3, < 0 with 1 or 2.
 	 */
 	public $type;
@@ -76,18 +78,32 @@ class MouvementStock extends CommonObject
 
 	/**
 	 * @var int ID
+	 * @deprecated
+	 * @see $origin_id
 	 */
 	public $fk_origin;
 
+	/**
+	 * @var int		Origin id
+	 */
+	public $origin_id;
+
+	/**
+	 * @var	string	origintype
+	 * @deprecated
+	 * see $origin_type
+	 */
 	public $origintype;
 
+	/**
+	 * @var string Origin type ('project', ...)
+	 */
+	public $origin_type;
+
+
 	public $inventorycode;
 	public $batch;
 
-	/**
-	 * @var Object		Object set as origin before calling livraison() or reception()
-	 */
-	public $origin;
 
 	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10, 'showoncombobox'=>1),
@@ -127,7 +143,7 @@ class MouvementStock extends CommonObject
 	/**
 	 *	Add a movement of stock (in one direction only).
 	 *  This is the lowest level method to record a stock change.
-	 *  $this->origin can be also be set to save the source object of movement.
+	 *  $this->origin_type and $this->origin_id can be also be set to save the source object of movement.
 	 *
 	 *	@param		User			$user				User object
 	 *	@param		int				$fk_product			Id of product
@@ -271,7 +287,7 @@ class MouvementStock extends CommonObject
 			// If found and eatby/sellby not defined into table and provided, we update table
 			// If found and eatby/sellby not defined into table and not provided, we do nothing
 			// If not found, we add record
-			$sql = "SELECT pb.rowid, pb.batch, pb.eatby, pb.sellby FROM ".MAIN_DB_PREFIX."product_lot as pb";
+			$sql = "SELECT pb.rowid, pb.batch, pb.eatby, pb.sellby FROM ".$this->db->prefix()."product_lot as pb";
 			$sql .= " WHERE pb.fk_product = ".((int) $fk_product)." AND pb.batch = '".$this->db->escape($batch)."'";
 			dol_syslog(get_class($this)."::_create scan serial for this product to check if eatby and sellby match", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -403,32 +419,27 @@ class MouvementStock extends CommonObject
 		}
 
 		if ($movestock) {	// Change stock for current product, change for subproduct is done after
-			// Set $origintype, fk_origin, fk_project
-			$fk_project = 0;
-			if (!empty($this->origin)) {			// This is set by caller for tracking reason
-				$origintype = empty($this->origin->origin_type) ? $this->origin->element : $this->origin->origin_type;
-				$fk_origin = $this->origin->id;
-				if ($origintype == 'project') {
-					$fk_project = $fk_origin;
-				} else {
-					$res = $this->origin->fetch($fk_origin);
-					if ($res > 0) {
-						if (!empty($this->origin->fk_project)) {
-							$fk_project = $this->origin->fk_project;
-						}
-					}
+			// Set $origin_type, origin_id and fk_project
+			$fk_project = $this->fk_project;
+			if (!empty($this->origin_type)) {			// This is set by caller for tracking reason
+				$origin_type = $this->origin_type;
+				$origin_id = $this->origin_id;
+				if (empty($fk_project) && $origin_type == 'project') {
+					$fk_project = $origin_id;
+					$origin_type = '';
+					$origin_id = 0;
 				}
 			} else {
-				$origintype = '';
-				$fk_origin = 0;
 				$fk_project = 0;
+				$origin_type = '';
+				$origin_id = 0;
 			}
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."stock_mouvement(";
+			$sql = "INSERT INTO ".$this->db->prefix()."stock_mouvement(";
 			$sql .= " datem, fk_product, batch, eatby, sellby,";
 			$sql .= " fk_entrepot, value, type_mouvement, fk_user_author, label, inventorycode, price, fk_origin, origintype, fk_projet";
 			$sql .= ")";
-			$sql .= " VALUES ('".$this->db->idate($this->datem)."', ".$this->product_id.", ";
+			$sql .= " VALUES ('".$this->db->idate($this->datem)."', ".((int) $this->product_id).", ";
 			$sql .= " ".($batch ? "'".$this->db->escape($batch)."'" : "null").", ";
 			$sql .= " ".($eatby ? "'".$this->db->idate($eatby)."'" : "null").", ";
 			$sql .= " ".($sellby ? "'".$this->db->idate($sellby)."'" : "null").", ";
@@ -436,9 +447,9 @@ class MouvementStock extends CommonObject
 			$sql .= " ".((int) $user->id).",";
 			$sql .= " '".$this->db->escape($label)."',";
 			$sql .= " ".($inventorycode ? "'".$this->db->escape($inventorycode)."'" : "null").",";
-			$sql .= " ".price2num($price).",";
-			$sql .= " ".((int) $fk_origin).",";
-			$sql .= " '".$this->db->escape($origintype)."',";
+			$sql .= " ".((float) price2num($price)).",";
+			$sql .= " ".((int) $origin_id).",";
+			$sql .= " '".$this->db->escape($origin_type)."',";
 			$sql .= " ".((int) $fk_project);
 			$sql .= ")";
 
@@ -446,7 +457,7 @@ class MouvementStock extends CommonObject
 			$resql = $this->db->query($sql);
 
 			if ($resql) {
-				$mvid = $this->db->last_insert_id(MAIN_DB_PREFIX."stock_mouvement");
+				$mvid = $this->db->last_insert_id($this->db->prefix()."stock_mouvement");
 				$this->id = $mvid;
 			} else {
 				$this->error = $this->db->lasterror();
@@ -462,7 +473,7 @@ class MouvementStock extends CommonObject
 			// Test if there is already a record for couple (warehouse / product), so later we will make an update or create.
 			$alreadyarecord = 0;
 			if (!$error) {
-				$sql = "SELECT rowid, reel FROM ".MAIN_DB_PREFIX."product_stock";
+				$sql = "SELECT rowid, reel FROM ".$this->db->prefix()."product_stock";
 				$sql .= " WHERE fk_entrepot = ".((int) $entrepot_id)." AND fk_product = ".((int) $fk_product); // This is a unique key
 
 				dol_syslog(get_class($this)."::_create check if a record already exists in product_stock", LOG_DEBUG);
@@ -513,10 +524,10 @@ class MouvementStock extends CommonObject
 			// Update stock quantity
 			if (!$error) {
 				if ($alreadyarecord > 0) {
-					$sql = "UPDATE ".MAIN_DB_PREFIX."product_stock SET reel = reel + ".((float) $qty);
+					$sql = "UPDATE ".$this->db->prefix()."product_stock SET reel = reel + ".((float) $qty);
 					$sql .= " WHERE fk_entrepot = ".((int) $entrepot_id)." AND fk_product = ".((int) $fk_product);
 				} else {
-					$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_stock";
+					$sql = "INSERT INTO ".$this->db->prefix()."product_stock";
 					$sql .= " (reel, fk_entrepot, fk_product) VALUES ";
 					$sql .= " (".((float) $qty).", ".((int) $entrepot_id).", ".((int) $fk_product).")";
 				}
@@ -527,7 +538,7 @@ class MouvementStock extends CommonObject
 					$this->errors[] = $this->db->lasterror();
 					$error = -3;
 				} elseif (empty($fk_product_stock)) {
-					$fk_product_stock = $this->db->last_insert_id(MAIN_DB_PREFIX."product_stock");
+					$fk_product_stock = $this->db->last_insert_id($this->db->prefix()."product_stock");
 				}
 			}
 
@@ -548,11 +559,11 @@ class MouvementStock extends CommonObject
 			if (!$error) {
 				$newpmp = price2num($newpmp, 'MU');
 
-				// $sql = "UPDATE ".MAIN_DB_PREFIX."product SET pmp = ".$newpmp.", stock = ".$this->db->ifsql("stock IS NULL", 0, "stock") . " + ".$qty;
+				// $sql = "UPDATE ".$this->db->prefix()."product SET pmp = ".$newpmp.", stock = ".$this->db->ifsql("stock IS NULL", 0, "stock") . " + ".$qty;
 				// $sql.= " WHERE rowid = ".((int) $fk_product);
 				// Update pmp + denormalized fields because we change content of produt_stock. Warning: Do not use "SET p.stock", does not works with pgsql
-				$sql = "UPDATE ".MAIN_DB_PREFIX."product as p SET pmp = ".((float) $newpmp).",";
-				$sql .= " stock=(SELECT SUM(ps.reel) FROM ".MAIN_DB_PREFIX."product_stock as ps WHERE ps.fk_product = p.rowid)";
+				$sql = "UPDATE ".$this->db->prefix()."product as p SET pmp = ".((float) $newpmp).",";
+				$sql .= " stock=(SELECT SUM(ps.reel) FROM ".$this->db->prefix()."product_stock as ps WHERE ps.fk_product = p.rowid)";
 				$sql .= " WHERE rowid = ".((int) $fk_product);
 
 				dol_syslog(get_class($this)."::_create update AWP", LOG_DEBUG);
@@ -565,7 +576,7 @@ class MouvementStock extends CommonObject
 
 			// If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine
 			// having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot.
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)";
+			$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
 		}
@@ -615,8 +626,8 @@ class MouvementStock extends CommonObject
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
 		$sql .= " t.tms,";
 		$sql .= " t.datem,";
 		$sql .= " t.fk_product,";
@@ -626,20 +637,15 @@ class MouvementStock extends CommonObject
 		$sql .= " t.type_mouvement,";
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.label,";
-		$sql .= " t.fk_origin,";
-		$sql .= " t.origintype,";
+		$sql .= " t.fk_origin as origin_id,";
+		$sql .= " t.origintype as origin_type,";
 		$sql .= " t.inventorycode,";
 		$sql .= " t.batch,";
 		$sql .= " t.eatby,";
 		$sql .= " t.sellby,";
 		$sql .= " t.fk_projet as fk_project";
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql .= ' WHERE 1 = 1';
-		//if (null !== $ref) {
-			//$sql .= ' AND t.ref = ' . '\'' . $ref . '\'';
-		//} else {
-			$sql .= ' AND t.rowid = '.((int) $id);
-		//}
+		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
+		$sql .= " WHERE t.rowid = ".((int) $id);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -659,8 +665,10 @@ class MouvementStock extends CommonObject
 				$this->price = $obj->price;
 				$this->fk_user_author = $obj->fk_user_author;
 				$this->label = $obj->label;
-				$this->fk_origin = $obj->fk_origin;
-				$this->origintype = $obj->origintype;
+				$this->fk_origin = $obj->origin_id;		// For backward compatibility
+				$this->origintype = $obj->origin_type;	// For backward compatibility
+				$this->origin_id = $obj->origin_id;
+				$this->origin_type = $obj->origin_type;
 				$this->inventorycode = $obj->inventorycode;
 				$this->batch = $obj->batch;
 				$this->eatby = $this->db->jdate($obj->eatby);
@@ -713,7 +721,7 @@ class MouvementStock extends CommonObject
 		$pqtys = array();
 
 		$sql = "SELECT fk_product_pere, fk_product_fils, qty";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_association";
+		$sql .= " FROM ".$this->db->prefix()."product_association";
 		$sql .= " WHERE fk_product_pere = ".((int) $idProduct);
 		$sql .= " AND incdec = 1";
 
@@ -735,6 +743,7 @@ class MouvementStock extends CommonObject
 		foreach ($pids as $key => $value) {
 			if (!$error) {
 				$tmpmove = dol_clone($this, 1);
+
 				$result = $tmpmove->_create($user, $pids[$key], $entrepot_id, ($qty * $pqtys[$key]), $type, 0, $label, $inventorycode); // This will also call _createSubProduct making this recursive
 				if ($result < 0) {
 					$this->error = $tmpmove->error;
@@ -815,8 +824,8 @@ class MouvementStock extends CommonObject
 	{
 		$nb = 0;
 
-		$sql = 'SELECT SUM(value) as nb from '.MAIN_DB_PREFIX.'stock_mouvement';
-		$sql .= ' WHERE fk_product = '.((int) $productidselected);
+		$sql = "SELECT SUM(value) as nb from ".$this->db->prefix()."stock_mouvement";
+		$sql .= " WHERE fk_product = ".((int) $productidselected);
 		$sql .= " AND datem < '".$this->db->idate($datebefore)."'";
 
 		dol_syslog(get_class($this).__METHOD__.'', LOG_DEBUG);
@@ -904,16 +913,16 @@ class MouvementStock extends CommonObject
 	/**
 	 * Return Url link of origin object
 	 *
-	 * @param  int     $fk_origin      Id origin
-	 * @param  int     $origintype     Type origin
+	 * @param  int     $origin_id      Id origin
+	 * @param  int     $origin_type     Type origin
 	 * @return string
 	 */
-	public function get_origin($fk_origin, $origintype)
+	public function get_origin($origin_id, $origin_type)
 	{
 		// phpcs:enable
 		$origin = '';
 
-		switch ($origintype) {
+		switch ($origin_type) {
 			case 'commande':
 				require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 				$origin = new Commande($this->db);
@@ -956,11 +965,11 @@ class MouvementStock extends CommonObject
 				break;
 
 			default:
-				if ($origintype) {
+				if ($origin_type) {
 					// Separate originetype with "@" : left part is class name, right part is module name
-					$origintype_array = explode('@', $origintype);
-					$classname = ucfirst($origintype_array[0]);
-					$modulename = empty($origintype_array[1]) ? $classname : $origintype_array[1];
+					$origin_type_array = explode('@', $origin_type);
+					$classname = ucfirst($origin_type_array[0]);
+					$modulename = empty($origin_type_array[1]) ? $classname : $origin_type_array[1];
 					$result = dol_include_once('/'.$modulename.'/class/'.strtolower($classname).'.class.php');
 					if ($result) {
 						$classname = ucfirst($classname);
@@ -974,7 +983,7 @@ class MouvementStock extends CommonObject
 			return '';
 		}
 
-		if ($origin->fetch($fk_origin) > 0) {
+		if ($origin->fetch($origin_id) > 0) {
 			return $origin->getNomUrl(1);
 		}
 
@@ -982,29 +991,20 @@ class MouvementStock extends CommonObject
 	}
 
 	/**
-	 * Set attribute origin to object
+	 * Set attribute origin_type and fk_origin to object
 	 *
-	 * @param	string	$origin_element	type of element
-	 * @param	int		$origin_id		id of element
+	 * @param	string	$origin_element		Type of element
+	 * @param	int		$origin_id			Id of element
 	 *
 	 * @return	void
 	 */
 	public function setOrigin($origin_element, $origin_id)
 	{
-		if (!empty($origin_element) && $origin_id > 0) {
-			$origin = '';
-			if ($origin_element == 'project') {
-				if (!class_exists('Project')) {
-					require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				}
-				$origin = new Project($this->db);
-			}
-
-			if (!empty($origin)) {
-				$this->origin = $origin;
-				$this->origin->id = $origin_id;
-			}
-		}
+		$this->origin_type = $origin_element;
+		$this->origin_id = $origin_id;
+		// For backward compatibility
+		$this->origintype = $origin_element;
+		$this->fk_origin = $origin_id;
 	}
 
 
@@ -1071,7 +1071,7 @@ class MouvementStock extends CommonObject
 	 * 	Use this->id,this->lastname, this->firstname
 	 *
 	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-	 *	@param	string	$option				On what the link point to
+	 *	@param	string	$option				On what the link point to ('' = Tab of stock movement of warehouse, 'movements' = list of movements)
 	 *  @param	integer	$notooltip			1=Disable tooltip
 	 *  @param	int		$maxlen				Max length of visible user name
 	 *  @param  string  $morecss            Add more css on link
@@ -1082,16 +1082,21 @@ class MouvementStock extends CommonObject
 		global $langs, $conf, $db;
 
 		$result = '';
-		$companylink = '';
 
-		$label = '<u>'.$langs->trans("Movement").' '.$this->id.'</u>';
+		$label = img_picto('', 'stock', 'class="pictofixedwidth"').'<u>'.$langs->trans("Movement").' '.$this->id.'</u>';
 		$label .= '<div width="100%">';
 		$label .= '<b>'.$langs->trans('Label').':</b> '.$this->label;
-		$label .= '<br><b>'.$langs->trans('Qty').':</b> '.$this->qty;
+		$label .= '<br><b>'.$langs->trans('Qty').':</b> '.($this->qty > 0 ? '+' : '').$this->qty;
 		$label .= '</div>';
 
-		$link = '<a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?id='.$this->warehouse_id.'&msid='.$this->id.'"';
-		$link .= ($notooltip ? '' : ' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss ? ' '.$morecss : '').'"');
+		// Link to page of warehouse tab
+		if ($option == 'movements') {
+			$url = DOL_URL_ROOT.'/product/stock/movement_list.php?search_ref='.$this->id;
+		} else {
+			$url = DOL_URL_ROOT.'/product/stock/movement_list.php?id='.$this->warehouse_id.'&msid='.$this->id;
+		}
+
+		$link = '<a href="'.$url.'"'.($notooltip ? '' : ' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss ? ' '.$morecss : '').'"');
 		$link .= '>';
 		$linkend = '</a>';
 
@@ -1198,8 +1203,8 @@ class MouvementStock extends CommonObject
 		$cpt = 0;
 
 		$sql = "SELECT sum(pb.qty) as cpt";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."product_stock as ps ON ps.rowid = pb.fk_product_stock";
+		$sql .= " FROM ".$this->db->prefix()."product_batch as pb";
+		$sql .= " INNER JOIN ".$this->db->prefix()."product_stock as ps ON ps.rowid = pb.fk_product_stock";
 		$sql .= " WHERE ps.fk_product = " . ((int) $fk_product);
 		$sql .= " AND pb.batch = '" . $this->db->escape($batch) . "'";
 
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 360978ac736..fdb82800067 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -188,7 +188,7 @@ class Productlot extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
+		$sql = 'INSERT INTO '.$this->db->prefix().$this->table_element.'(';
 		$sql .= 'entity,';
 		$sql .= 'fk_product,';
 		$sql .= 'batch,';
@@ -230,7 +230,7 @@ class Productlot extends CommonObject
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);
 
 			// Actions on extra fields
 			if (!$error) {
@@ -279,8 +279,8 @@ class Productlot extends CommonObject
 		global $conf;
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
 		$sql .= " t.entity,";
 		$sql .= " t.fk_product,";
 		$sql .= " t.batch,";
@@ -296,11 +296,11 @@ class Productlot extends CommonObject
 		$sql .= " t.fk_user_creat,";
 		$sql .= " t.fk_user_modif,";
 		$sql .= " t.import_key";
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
 		if ($product_id > 0 && $batch != '') {
 			$sql .= " WHERE t.batch = '".$this->db->escape($batch)."' AND t.fk_product = ".((int) $product_id);
 		} else {
-			$sql .= ' WHERE t.rowid = '.((int) $id);
+			$sql .= " WHERE t.rowid = ".((int) $id);
 		}
 
 		$resql = $this->db->query($sql);
@@ -394,7 +394,7 @@ class Productlot extends CommonObject
 		}
 
 		// Update request
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
+		$sql = 'UPDATE '.$this->db->prefix().$this->table_element.' SET';
 		$sql .= ' entity = '.(isset($this->entity) ? $this->entity : "null").',';
 		$sql .= ' fk_product = '.(isset($this->fk_product) ? $this->fk_product : "null").',';
 		$sql .= ' batch = '.(isset($this->batch) ? "'".$this->db->escape($this->batch)."'" : "null").',';
@@ -479,7 +479,7 @@ class Productlot extends CommonObject
 		//}
 
 		if (!$error) {
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;
+			$sql = 'DELETE FROM '.$this->db->prefix().$this->table_element;
 			$sql .= ' WHERE rowid='.((int) $this->id);
 
 			$resql = $this->db->query($sql);
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index d8138c7f149..95da65cd540 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -113,7 +113,7 @@ class ProductStockEntrepot extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
+		$sql = 'INSERT INTO '.$this->db->prefix().$this->table_element.'(';
 
 		$sql .= 'fk_product,';
 		$sql .= 'fk_entrepot,';
@@ -143,7 +143,7 @@ class ProductStockEntrepot extends CommonObject
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);
 
 			//if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
@@ -184,19 +184,19 @@ class ProductStockEntrepot extends CommonObject
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
 		$sql .= " t.tms,";
 		$sql .= " t.fk_product,";
 		$sql .= " t.fk_entrepot,";
 		$sql .= " t.seuil_stock_alerte,";
 		$sql .= " t.desiredstock,";
 		$sql .= " t.import_key";
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
 		if (!empty($id)) {
-			$sql .= ' WHERE t.rowid = '.((int) $id);
+			$sql .= " WHERE t.rowid = ".((int) $id);
 		} else {
-			$sql .= ' WHERE t.fk_product = '.((int) $fk_product).' AND t.fk_entrepot = '.((int) $fk_entrepot);
+			$sql .= " WHERE t.fk_product = ".((int) $fk_product)." AND t.fk_entrepot = ".((int) $fk_entrepot);
 		}
 
 		$resql = $this->db->query($sql);
@@ -254,8 +254,8 @@ class ProductStockEntrepot extends CommonObject
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
 
 		$sql .= " t.tms,";
 		$sql .= " t.fk_product,";
@@ -265,25 +265,25 @@ class ProductStockEntrepot extends CommonObject
 		$sql .= " t.import_key";
 
 
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
 
-		$sql .= ' WHERE 1=1';
+		$sql .= " WHERE 1=1";
 
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				$sqlwhere [] = $key." LIKE '%".$this->db->escape($value)."%'";
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
+			$sql .= " AND ".implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
 		}
 
 		if (!empty($fk_product) && $fk_product > 0) {
-			$sql .= ' AND fk_product = '.((int) $fk_product);
+			$sql .= " AND fk_product = ".((int) $fk_product);
 		} elseif (!empty($fk_entrepot) && $fk_entrepot > 0) {
-			$sql .= ' AND fk_entrepot = '.((int) $fk_entrepot);
+			$sql .= " AND fk_entrepot = ".((int) $fk_entrepot);
 		}
 		// "elseif" used instead of "if" because getting list with specified fk_product and specified fk_entrepot would be the same as doing a fetch
 
@@ -291,7 +291,7 @@ class ProductStockEntrepot extends CommonObject
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$lines = array();
@@ -355,7 +355,7 @@ class ProductStockEntrepot extends CommonObject
 		// Put here code to add a control on parameters values
 
 		// Update request
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
+		$sql = 'UPDATE '.$this->db->prefix().$this->table_element.' SET';
 
 		$sql .= ' tms = '.(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : "'".$this->db->idate(dol_now())."'").',';
 		$sql .= ' fk_product = '.(isset($this->fk_product) ? $this->fk_product : "null").',';
@@ -425,7 +425,7 @@ class ProductStockEntrepot extends CommonObject
 		//}
 
 		if (!$error) {
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;
+			$sql = 'DELETE FROM '.$this->db->prefix().$this->table_element;
 			$sql .= ' WHERE rowid='.((int) $this->id);
 
 			$resql = $this->db->query($sql);
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index b64068df48b..9aad5f382cc 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -134,8 +134,7 @@ if ($result) {
 }
 
 
-//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 // Latest movements
@@ -235,8 +234,7 @@ if ($resql) {
 	dol_print_error($db);
 }
 
-//print '</td></tr></table>';
-print '</div></div></div>';
+print '</div></div>';
 
 $parameters = array('user' => $user);
 $reshook = $hookmanager->executeHooks('dashboardWarehouse', $parameters, $object); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php
index 9fc4e81075a..db6560a9970 100644
--- a/htdocs/product/stock/info.php
+++ b/htdocs/product/stock/info.php
@@ -64,7 +64,7 @@ if (!empty($conf->projet->enabled)) {
 	$morehtmlref .= '<br>'.img_picto('', 'project').' '.$langs->trans('Project').' ';
 	if ($usercancreate) {
 		if ($action != 'classify') {
-			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 		}
 		if ($action == 'classify') {
 			$projectid = $object->fk_project;
@@ -81,9 +81,10 @@ if (!empty($conf->projet->enabled)) {
 		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>';
+			$morehtmlref .= ' : '.$proj->getNomUrl(1);
+			if ($proj->title) {
+				$morehtmlref .= ' - '.$proj->title;
+			}
 		} else {
 			$morehtmlref .= '';
 		}
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 8125e5d3cf3..8f24fb9c110 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -78,7 +78,7 @@ if (!$sortorder) {
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new Entrepot($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction = $conf->inventory->dir_output.'/temp/massgeneration/'.$user->id;
+$diroutputmassaction = $conf->stock->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('stocklist'));
 
 // Fetch optionals attributes and labels
@@ -196,17 +196,18 @@ $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
 $title = $langs->trans("ListOfWarehouses");
 
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
 foreach ($object->fields as $key => $val) {
-	$sql .= 't.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key." as options_".$key.', ' : '');
 	}
 }
 
@@ -228,7 +229,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 if (!empty($conf->categorie->enabled)) {
 	$sql .= Categorie::getFilterJoinQuery(Categorie::TYPE_WAREHOUSE, "t.rowid");
 }
-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)";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON t.rowid = ps.fk_entrepot";
@@ -260,7 +261,7 @@ foreach ($search as $key => $val) {
 		$mode_search = 2;
 	}
 	if ($search[$key] != '') {
-		$sql .= natural_search((($key == 'ref') ? 't.ref' : 't.'.$class_key), $search[$key], (($key == 'status') ? 2 : $mode_search));
+		$sql .= natural_search((($key == "ref") ? "t.ref" : "t.".$class_key), $search[$key], (($key == 'status') ? 2 : $mode_search));
 	}
 }
 if ($search_all) {
@@ -274,7 +275,7 @@ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $objec
 $sql .= $hookmanager->resPrint;
 $sql .= " GROUP BY ";
 foreach ($object->fields as $key => $val) {
-	$sql .= 't.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -473,7 +474,7 @@ foreach ($object->fields as $key => $val) {
 		} 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)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(!empty($search[$key])?$search[$key]:'').'">';
 		}
 		print '</td>';
 	}
@@ -624,7 +625,7 @@ while ($i < min($num, $limit)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index ed7095473ea..781f2037dba 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -486,28 +486,36 @@ if (!empty($conf->global->MAIN_UPLOAD_DOC)) {
 	$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
@@ -633,7 +641,7 @@ foreach ($listofdata as $key => $val) {
 			print '</td>';
 		}
 		print '<td class="center">'.$val['qty'].'</td>';
-		print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=delline&idline='.$val['id'].'">'.img_delete($langs->trans("Remove")).'</a></td>';
+		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>';
 	}
 }
@@ -663,7 +671,7 @@ if (count($listofdata)) {
 	print '<input type="text" name="label" class="minwidth300" value="'.dol_escape_htmltag($labelmovement).'"><br>';
 	print '<br>';
 
-	print '<div class="center"><input class="button" type="submit" name="valid" value="'.dol_escape_htmltag($buttonrecord).'"></div>';
+	print '<div class="center"><input type="submit" class="button" name="valid" value="'.dol_escape_htmltag($buttonrecord).'"></div>';
 
 	print '<br>';
 	print '</div>';
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index c4316e981a0..ebe8f0552ce 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -75,8 +75,8 @@ $search_type_mouvement = GETPOST('search_type_mouvement', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -439,7 +439,7 @@ $sql .= " u.login, u.photo, u.lastname, u.firstname";
 // 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
@@ -605,7 +605,6 @@ if ($resql) {
 
 		print '</div>';
 		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border centpercent">';
@@ -637,7 +636,6 @@ if ($resql) {
 
 		print "</table>";
 
-		print '</div>';
 		print '</div>';
 		print '</div>';
 
@@ -1205,20 +1203,18 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete' && $id > 0)
 	print $formfile->showdocuments($modulepart, $objectref, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
 	$somethingshown = $formfile->numoffiles;
 
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright">';
 
 	$MAXEVENT = 10;
 
-	$morehtmlright = '<a href="'.DOL_URL_ROOT.'/product/agenda.php?id='.$object->id.'">';
-	$morehtmlright .= $langs->trans("SeeAll");
-	$morehtmlright .= '</a>';
+	$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt 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';
 	$formactions = new FormActions($db);
-	$somethingshown = $formactions->showactions($object, 'mouvement', 0, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for product
+	$somethingshown = $formactions->showactions($object, 'mouvement', 0, 1, '', $MAXEVENT, '', $morehtmlcenter); // Show all action for product
 
-	print '</div></div></div>';
+	print '</div></div>';
 }
 
 
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 952ac662310..73c6751262a 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -49,9 +49,6 @@ if (!empty($conf->productbatch->enabled)) {
 	$langs->load("productbatch");
 }
 
-// Security check
-$result = restrictedArea($user, 'stock');
-
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $msid = GETPOST('msid', 'int');
@@ -63,11 +60,8 @@ $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
 
-// Security check
-//$result=restrictedArea($user, 'stock', $id, 'entrepot&stock');
-$result = restrictedArea($user, 'stock');
-
 $idproduct = GETPOST('idproduct', 'int');
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_date_startday = GETPOST('search_date_startday', 'int');
 $search_date_startmonth = GETPOST('search_date_startmonth', 'int');
 $search_date_startyear = GETPOST('search_date_startyear', 'int');
@@ -87,15 +81,22 @@ $search_batch = trim(GETPOST("search_batch"));
 $search_qty = trim(GETPOST("search_qty"));
 $search_type_mouvement = GETPOST('search_type_mouvement', 'int');
 $search_fk_projet=GETPOST("search_fk_projet", 'int');
+$optioncss = GETPOST('optioncss', 'alpha');
+$type = GETPOST("type", "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');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-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;
+
 if (!$sortfield) {
 	$sortfield = "m.datem";
 }
@@ -107,8 +108,10 @@ $pdluoid = GETPOST('pdluoid', 'int');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new MouvementStock($db);
-$hookmanager->initHooks(array('movementlist'));
 $extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->stock->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('movementlist'));
+
 $formfile = new FormFile($db);
 
 // fetch optionals attributes and labels
@@ -132,10 +135,13 @@ $arrayfields = array(
 	'origin'=>array('label'=>"Origin", 'checked'=>1, 'position'=>155),
 	'm.fk_projet'=>array('label'=>'Project', 'checked'=>0, 'position'=>180),
 	'm.value'=>array('label'=>"Qty", 'checked'=>1, 'position'=>200),
-	'm.price'=>array('label'=>"UnitPurchaseValue", 'checked'=>0, 'position'=>210)
+	'm.price'=>array('label'=>"UnitPurchaseValue", 'checked'=>0, 'position'=>210, 'enabled'=>empty($conf->global->STOCK_MOVEMENT_LIST_HIDE_UNIT_PRICE))
 	//'m.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	//'m.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500)
 );
+
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 if (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 	unset($arrayfields['pl.sellby']);
 }
@@ -143,11 +149,25 @@ if (!empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 	unset($arrayfields['pl.eatby']);
 }
 
+
+$tmpwarehouse = new Entrepot($db);
+if ($id > 0 || !empty($ref)) {
+	$tmpwarehouse->fetch($id, $ref);
+	$id = $tmpwarehouse->id;
+}
+
+
+// Security check
+//$result=restrictedArea($user, 'stock', $id, 'entrepot&stock');
+$result = restrictedArea($user, 'stock');
+
 // Security check
 if (!$user->rights->stock->mouvement->lire) {
 	accessforbidden();
 }
 
+$uploaddir = $conf->stock->dir_output.'/movements';
+
 $permissiontoread = $user->rights->stock->mouvement->lire;
 $permissiontoadd = $user->rights->stock->mouvement->creer;
 $permissiontodelete = $user->rights->stock->mouvement->creer; // There is no deletion permission for stock movement as we shoul dnever delete
@@ -164,7 +184,8 @@ $error = 0;
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -177,9 +198,10 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	// Do we click on purge search criteria ?
+	// Purge search criteria
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // Both test are required to be compatible with all browsers
 		$search_date_startday = '';
 		$search_date_startmonth = '';
@@ -204,18 +226,96 @@ if (empty($reshook)) {
 		$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 = 'MouvementStock';
 	$objectlabel = 'MouvementStock';
-	$uploaddir = $conf->stock->dir_output;
+
+	if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('button_search')) {
+		if (empty($diroutputmassaction)) {
+			dol_print_error(null, 'include of actions_massactions.inc.php is done but var $diroutputmassaction was not defined');
+			exit;
+		}
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+		$objecttmp = new $objectclass($db);
+		$listofobjectid = array();
+		foreach ($toselect as $toselectid) {
+			$objecttmp = new $objectclass($db); // must create new instance because instance is saved into $listofobjectref array for future use
+			$result = $objecttmp->fetch($toselectid);
+			if ($result > 0) {
+				$listofobjectid[$toselectid] = $toselectid;
+			}
+		}
+
+		$arrayofinclusion = array();
+		foreach ($listofobjectref as $tmppdf) {
+			$arrayofinclusion[] = '^'.preg_quote(dol_sanitizeFileName($tmppdf), '/').'\.pdf$';
+		}
+		foreach ($listofobjectref as $tmppdf) {
+			$arrayofinclusion[] = '^'.preg_quote(dol_sanitizeFileName($tmppdf), '/').'_[a-zA-Z0-9-_]+\.pdf$'; // To include PDF generated from ODX files
+		}
+		$listoffiles = dol_dir_list($uploaddir, 'all', 1, implode('|', $arrayofinclusion), '\.meta$|\.png', 'date', SORT_DESC, 0, true);
+
+		// Define output language (Here it is not used because we do only merging existing PDF)
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+			$newlang = GETPOST('lang_id', 'aZ09');
+		}
+		//elseif ($conf->global->MAIN_MULTILANGS && empty($newlang) && is_object($objecttmp->thirdparty)) {		// On massaction, we can have several values for $objecttmp->thirdparty
+		//	$newlang = $objecttmp->thirdparty->default_lang;
+		//}
+		if (!empty($newlang)) {
+			$outputlangs = new Translate("", $conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
+
+		// Create output dir if not exists
+		dol_mkdir($diroutputmassaction);
+
+		// Defined name of merged file
+		$filename = strtolower(dol_sanitizeFileName($langs->transnoentities($objectlabel)));
+		$filename = preg_replace('/\s/', '_', $filename);
+
+		// Save merged file
+		/*
+		 if ($year) {
+		 $filename .= '_'.$year;
+		 }
+		 if ($month) {
+		 $filename .= '_'.$month;
+		 }
+		 */
+		$now = dol_now();
+		$file = $diroutputmassaction.'/'.$filename.'_'.dol_print_date($now, 'dayhourlog').'.pdf';
+
+
+		// Create PDF
+		// TODO Create the pdf including list of movement ids found into $listofobjectid
+		// ...
+
+
+		if (!$error) {
+			$langs->load("exports");
+			setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
+		}
+
+		$massaction = '';
+		$action = '';
+	}
+
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 if ($action == 'update_extras') {
-	$tmpwarehouse = new Entrepot($db);
-	$tmpwarehouse->fetch($id);
-
 	$tmpwarehouse->oldcopy = dol_clone($tmpwarehouse);
 
 	// Fill array 'array_options' with data from update form
@@ -276,27 +376,31 @@ if ($action == "correct_stock") {
 				$user,
 				$id,
 				GETPOST("nbpiece", 'int'),
-				GETPOST("mouvement"),
-				GETPOST("label", 'san_alpha'),
-				GETPOST('unitprice'),
+				GETPOST("mouvement", 'int'),
+				GETPOST("label", 'alphanohtml'),
+				price2num(GETPOST('unitprice'), 'MT'),
 				$eatby,
 				$sellby,
 				$batch,
 				GETPOST('inventorycode', 'alphanohtml'),
 				$origin_element,
-				$origin_id
+				$origin_id,
+				0,
+				$extrafields
 			); // We do not change value of stock for a correction
 		} else {
 			$result = $product->correct_stock(
 				$user,
 				$id,
 				GETPOST("nbpiece", 'int'),
-				GETPOST("mouvement"),
-				GETPOST("label", 'san_alpha'),
-				GETPOST('unitprice'),
+				GETPOST("mouvement", "int"),
+				GETPOST("label", 'alphanohtml'),
+				price2num(GETPOST('unitprice'), 'MT'),
 				GETPOST('inventorycode', 'alphanohtml'),
 				$origin_element,
-				$origin_id
+				$origin_id,
+				0,
+				$extrafields
 			); // We do not change value of stock for a correction
 		}
 
@@ -403,7 +507,11 @@ if ($action == "transfert_stock" && !$cancel) {
 						$eatby,
 						$sellby,
 						$batch,
-						GETPOST('inventorycode')
+						GETPOST('inventorycode'),
+						'',
+						null,
+						0,
+						$extrafields
 					);
 					// Add stock
 					$result2 = $product->correct_stock_batch(
@@ -416,7 +524,11 @@ if ($action == "transfert_stock" && !$cancel) {
 						$eatby,
 						$sellby,
 						$batch,
-						GETPOST('inventorycode', 'alphanohtml')
+						GETPOST('inventorycode', 'alphanohtml'),
+						'',
+						null,
+						0,
+						$extrafields
 					);
 				}
 			} else {
@@ -428,7 +540,11 @@ if ($action == "transfert_stock" && !$cancel) {
 					1,
 					GETPOST("label", 'san_alpha'),
 					$pricesrc,
-					GETPOST('inventorycode', 'alphanohtml')
+					GETPOST('inventorycode', 'alphanohtml'),
+					'',
+					null,
+					0,
+					$extrafields
 				);
 
 				// Add stock
@@ -439,7 +555,11 @@ if ($action == "transfert_stock" && !$cancel) {
 					0,
 					GETPOST("label", 'san_alpha'),
 					$pricedest,
-					GETPOST('inventorycode', 'alphanohtml')
+					GETPOST('inventorycode', 'alphanohtml'),
+					'',
+					null,
+					0,
+					$extrafields
 				);
 			}
 			if (!$error && $result1 >= 0 && $result2 >= 0) {
@@ -477,6 +597,8 @@ if (!empty($conf->projet->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
+// Build and execute select
+// --------------------------------------------------------------------
 $sql = "SELECT p.rowid, p.ref as product_ref, p.label as produit, p.tosell, p.tobuy, p.tobatch, p.fk_product_type as type, p.entity,";
 $sql .= " e.ref as warehouse_ref, e.rowid as entrepot_id, e.lieu, e.fk_parent, e.statut,";
 $sql .= " m.rowid as mid, m.value as qty, m.datem, m.fk_user_author, m.label, m.inventorycode, m.fk_origin, m.origintype,";
@@ -488,17 +610,18 @@ $sql .= " u.login, u.photo, u.lastname, u.firstname, u.email as user_email, u.st
 // 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
-$sql .= $hookmanager->resPrint;
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
 $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 (!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 (m.rowid = ef.fk_object)";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON m.fk_user_author = u.rowid";
@@ -548,7 +671,7 @@ if (!empty($search_user)) {
 if (!empty($search_batch)) {
 	$sql .= natural_search('m.batch', $search_batch);
 }
-if (!empty($product_id)) {
+if (!empty($product_id) && $product_id != '-1') {
 	$sql .= natural_search('p.rowid', $product_id);
 }
 if (!empty($search_fk_projet) && $search_fk_projet != '-1') {
@@ -566,782 +689,855 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 $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);
 
+/* 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)) {
-	$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 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);
 }
 
-$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) {
+	dol_print_error($db);
+	exit;
+}
 
-if ($resql) {
-	$product = new Product($db);
-	$object = new Entrepot($db);
+$product = new Product($db);
+$object = new Entrepot($db);
 
-	if ($idproduct > 0) {
-		$product->fetch($idproduct);
+if ($idproduct > 0) {
+	$product->fetch($idproduct);
+}
+if ($id > 0 || $ref) {
+	$result = $object->fetch($id, $ref);
+	if ($result < 0) {
+		dol_print_error($db);
 	}
-	if ($id > 0 || $ref) {
-		$result = $object->fetch($id, $ref);
-		if ($result < 0) {
-			dol_print_error($db);
-		}
+}
+
+$num = $db->num_rows($resql);
+
+
+// Output page
+// --------------------------------------------------------------------
+
+$i = 0;
+$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
+if ($msid) {
+	$title = $langs->trans('StockMovementForId', $msid);
+} else {
+	$title = $langs->trans("ListOfStockMovements");
+	if ($id) {
+		$title .= ' ('.$langs->trans("ForThisWarehouse").')';
 	}
+}
 
-	$num = $db->num_rows($resql);
+llxHeader('', $title, $help_url);
 
-	$arrayofselected = is_array($toselect) ? $toselect : array();
+$arrayofselected = is_array($toselect) ? $toselect : array();
+
+/*
+ * Show tab only if we ask a particular warehouse
+ */
+if ($object->id > 0) {
+	$head = stock_prepare_head($object);
+
+	print dol_get_fiche_head($head, 'movements', $langs->trans("Warehouse"), -1, 'stock');
 
 
-	$i = 0;
-	$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
-	if ($msid) {
-		$texte = $langs->trans('StockMovementForId', $msid);
-	} else {
-		$texte = $langs->trans("ListOfStockMovements");
-		if ($id) {
-			$texte .= ' ('.$langs->trans("ForThisWarehouse").')';
-		}
-	}
-	llxHeader("", $texte, $help_url);
+	$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	/*
-	 * Show tab only if we ask a particular warehouse
-	 */
-	if ($object->id > 0) {
-		$head = stock_prepare_head($object);
+	$morehtmlref = '<div class="refidno">';
+	$morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
 
-		print dol_get_fiche_head($head, 'movements', $langs->trans("Warehouse"), -1, 'stock');
-
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-
-		$morehtmlref = '<div class="refidno">';
-		$morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
-
-		// Project
-		if (!empty($conf->projet->enabled)) {
-			$langs->load("projects");
-			$morehtmlref .= '<br>'.img_picto('', 'project').' '.$langs->trans('Project').' ';
-			if ($usercancreate && 1 == 2) {
-				if ($action != 'classify') {
-					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-				}
-				if ($action == 'classify') {
-					$projectid = $object->fk_project;
-					$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(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
-					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-					$morehtmlref .= '</form>';
-				} else {
-					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	// Project
+	if (!empty($conf->projet->enabled)) {
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.img_picto('', 'project').' '.$langs->trans('Project').' ';
+		if ($usercancreate && 1 == 2) {
+			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') {
+				$projectid = $object->fk_project;
+				$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(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
 				}
 			} 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 .= '';
 			}
 		}
-		$morehtmlref .= '</div>';
+	}
+	$morehtmlref .= '</div>';
 
-		$shownav = 1;
-		if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
-			$shownav = 0;
-		}
-
-		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', 'ref', $morehtmlref);
-
-
-		print '<div class="fichecenter">';
-		print '<div class="fichehalfleft">';
-		print '<div class="underbanner clearboth"></div>';
-
-		print '<table class="border centpercent tableforfield">';
-
-		print '<tr>';
-
-		// Description
-		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>'.dol_htmlentitiesbr($object->description).'</td></tr>';
-
-		$calcproductsunique = $object->nb_different_products();
-		$calcproducts = $object->nb_products();
-
-		// Total nb of different products
-		print '<tr><td>'.$langs->trans("NumberOfDifferentProducts").'</td><td>';
-		print empty($calcproductsunique['nb']) ? '0' : $calcproductsunique['nb'];
-		print "</td></tr>";
-
-		// Nb of products
-		print '<tr><td>'.$langs->trans("NumberOfProducts").'</td><td>';
-		$valtoshow = price2num($calcproducts['nb'], 'MS');
-		print empty($valtoshow) ? '0' : $valtoshow;
-		print "</td></tr>";
-
-		print '</table>';
-
-		print '</div>';
-		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
-		print '<div class="underbanner clearboth"></div>';
-
-		print '<table class="border centpercent tableforfield">';
-
-		// Value
-		print '<tr><td class="titlefield">'.$langs->trans("EstimatedStockValueShort").'</td><td>';
-		print price((empty($calcproducts['value']) ? '0' : price2num($calcproducts['value'], 'MT')), 0, $langs, 0, -1, -1, $conf->currency);
-		print "</td></tr>";
-
-		// Last movement
-		$sql = "SELECT MAX(m.datem) as datem";
-		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
-		$sql .= " WHERE m.fk_entrepot = ".((int) $object->id);
-		$resqlbis = $db->query($sql);
-		if ($resqlbis) {
-			$objbis = $db->fetch_object($resqlbis);
-			$lastmovementdate = $db->jdate($objbis->datem);
-		} else {
-			dol_print_error($db);
-		}
-
-		print '<tr><td>'.$langs->trans("LastMovement").'</td><td>';
-		if ($lastmovementdate) {
-			print dol_print_date($lastmovementdate, 'dayhour');
-		} else {
-			print $langs->trans("None");
-		}
-		print "</td></tr>";
-
-		// Other attributes
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
-
-		// Categories
-		if ($conf->categorie->enabled) {
-			print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
-			print $form->showCategories($object->id, Categorie::TYPE_WAREHOUSE, 1);
-			print "</td></tr>";
-		}
-
-		print "</table>";
-
-		print '</div>';
-		print '</div>';
-		print '</div>';
-
-		print '<div class="clearboth"></div>';
-
-		print dol_get_fiche_end();
+	$shownav = 1;
+	if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		$shownav = 0;
 	}
 
-
-	/*
-	 * Correct stock
-	 */
-	if ($action == "correction") {
-		include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stockcorrection.tpl.php';
-		print '<br>';
-	}
-
-	/*
-	 * Transfer of units
-	 */
-	if ($action == "transfert") {
-		include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stocktransfer.tpl.php';
-		print '<br>';
-	}
+	dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', 'ref', $morehtmlref);
 
 
-	/*
-	 * Action bar
-	 */
-	if ((empty($action) || $action == 'list') && $id > 0) {
-		print "<div class=\"tabsAction\">\n";
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-		if ($user->rights->stock->mouvement->creer) {
-			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=correction">'.$langs->trans("CorrectStock").'</a>';
-		}
+	print '<table class="border centpercent tableforfield">';
 
-		if ($user->rights->stock->mouvement->creer) {
-			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
-		}
+	print '<tr>';
 
-		print '</div><br>';
-	}
+	// Description
+	print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>'.dol_htmlentitiesbr($object->description).'</td></tr>';
 
-	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
-		$param .= '&contextpage='.urlencode($contextpage);
-	}
-	if ($limit > 0 && $limit != $conf->liste_limit) {
-		$param .= '&limit='.urlencode($limit);
-	}
-	if ($id > 0) {
-		$param .= '&id='.urlencode($id);
-	}
-	if ($search_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_movement) {
-		$param .= '&search_movement='.urlencode($search_movement);
-	}
-	if ($search_inventorycode) {
-		$param .= '&search_inventorycode='.urlencode($search_inventorycode);
-	}
-	if ($search_type_mouvement) {
-		$param .= '&search_type_mouvement='.urlencode($search_type_mouvement);
-	}
-	if ($search_product_ref) {
-		$param .= '&search_product_ref='.urlencode($search_product_ref);
-	}
-	if ($search_product) {
-		$param .= '&search_product='.urlencode($search_product);
-	}
-	if ($search_batch) {
-		$param .= '&search_batch='.urlencode($search_batch);
-	}
-	if ($search_warehouse > 0) {
-		$param .= '&search_warehouse='.urlencode($search_warehouse);
-	}
-	if ($search_user) {
-		$param .= '&search_user='.urlencode($search_user);
-	}
-	if ($idproduct > 0) {
-		$param .= '&idproduct='.urlencode($idproduct);
-	}
-	// Add $param from extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+	$calcproductsunique = $object->nb_different_products();
+	$calcproducts = $object->nb_products();
 
-	// 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"),
-	);
-	// By default, we should never accept deletion of stock movement.
-	if (!empty($conf->global->STOCK_ALLOW_DELETE_OF_MOVEMENT) && $permissiontodelete) {
-		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
-	}
-	if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
-		$arrayofmassactions = array();
-	}
-	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+	// Total nb of different products
+	print '<tr><td>'.$langs->trans("NumberOfDifferentProducts").'</td><td>';
+	print empty($calcproductsunique['nb']) ? '0' : $calcproductsunique['nb'];
+	print "</td></tr>";
 
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') {
-		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	}
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	print '<input type="hidden" name="action" value="list">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="type" value="'.$type.'">';
-	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-	if ($id > 0) {
-		print '<input type="hidden" name="id" value="'.$id.'">';
-	}
+	// Nb of products
+	print '<tr><td>'.$langs->trans("NumberOfProducts").'</td><td>';
+	$valtoshow = price2num($calcproducts['nb'], 'MS');
+	print empty($valtoshow) ? '0' : $valtoshow;
+	print "</td></tr>";
 
-	if ($id > 0) {
-		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
+	print '</table>';
+
+	print '</div>';
+	print '<div class="fichehalfright">';
+	print '<div class="underbanner clearboth"></div>';
+
+	print '<table class="border centpercent tableforfield">';
+
+	// Value
+	print '<tr><td class="titlefield">'.$langs->trans("EstimatedStockValueShort").'</td><td>';
+	print price((empty($calcproducts['value']) ? '0' : price2num($calcproducts['value'], 'MT')), 0, $langs, 0, -1, -1, $conf->currency);
+	print "</td></tr>";
+
+	// Last movement
+	$sql = "SELECT MAX(m.datem) as datem";
+	$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
+	$sql .= " WHERE m.fk_entrepot = ".((int) $object->id);
+	$resqlbis = $db->query($sql);
+	if ($resqlbis) {
+		$objbis = $db->fetch_object($resqlbis);
+		$lastmovementdate = $db->jdate($objbis->datem);
 	} else {
-		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
+		dol_print_error($db);
 	}
 
-	// Add code for pre mass action (confirmation or email presend form)
-	$topicmail = "SendStockMovement";
-	$modelmail = "movementstock";
-	$objecttmp = new MouvementStock($db);
-	$trackid = 'mov'.$object->id;
-	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
-
-	if ($sall) {
-		foreach ($fieldstosearchall as $key => $val) {
-			$fieldstosearchall[$key] = $langs->trans($val);
-		}
-		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
-	}
-
-	$moreforfilter = '';
-
-	$parameters = array('arrayfields'=>&$arrayfields);
-	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) {
-		$moreforfilter .= $hookmanager->resPrint;
+	print '<tr><td>'.$langs->trans("LastMovement").'</td><td>';
+	if ($lastmovementdate) {
+		print dol_print_date($lastmovementdate, 'dayhour');
 	} else {
-		$moreforfilter = $hookmanager->resPrint;
+		print $langs->trans("None");
+	}
+	print "</td></tr>";
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+	// Categories
+	if ($conf->categorie->enabled) {
+		print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
+		print $form->showCategories($object->id, Categorie::TYPE_WAREHOUSE, 1);
+		print "</td></tr>";
 	}
 
-	if (!empty($moreforfilter)) {
-		print '<div class="liste_titre liste_titre_bydiv centpercent">';
-		print $moreforfilter;
-		print '</div>';
+	print "</table>";
+
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	print dol_get_fiche_end();
+}
+
+
+// Correct stock
+if ($action == "correction") {
+	include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stockcorrection.tpl.php';
+	print '<br>';
+}
+
+// Transfer of units
+if ($action == "transfert") {
+	include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stocktransfer.tpl.php';
+	print '<br>';
+}
+
+
+// Action bar
+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>';
 	}
 
-	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	if ($user->rights->stock->mouvement->creer) {
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
+	}
 
-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '</div><br>';
+}
 
-	// Fields title search
-	print '<tr class="liste_titre_filter">';
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+if ($id > 0) {
+	$param .= '&id='.urlencode($id);
+}
+if ($search_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_movement) {
+	$param .= '&search_movement='.urlencode($search_movement);
+}
+if ($search_inventorycode) {
+	$param .= '&search_inventorycode='.urlencode($search_inventorycode);
+}
+if ($search_type_mouvement) {
+	$param .= '&search_type_mouvement='.urlencode($search_type_mouvement);
+}
+if ($search_product_ref) {
+	$param .= '&search_product_ref='.urlencode($search_product_ref);
+}
+if ($search_product) {
+	$param .= '&search_product='.urlencode($search_product);
+}
+if ($search_batch) {
+	$param .= '&search_batch='.urlencode($search_batch);
+}
+if ($search_warehouse > 0) {
+	$param .= '&search_warehouse='.urlencode($search_warehouse);
+}
+if ($search_user) {
+	$param .= '&search_user='.urlencode($search_user);
+}
+if ($idproduct > 0) {
+	$param .= '&idproduct='.urlencode($idproduct);
+}
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+// List of mass actions available
+$arrayofmassactions = array();
+if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
+	$arrayofmassactions['builddoc'] = img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("GeneratePDF");
+}
+// By default, we should never accept deletion of stock movement
+if (!empty($conf->global->STOCK_ALLOW_DELETE_OF_MOVEMENT) && $permissiontodelete) {
+	$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="type" value="'.$type.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+if ($id > 0) {
+	print '<input type="hidden" name="id" value="'.$id.'">';
+}
+
+if ($id > 0) {
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
+} else {
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
+}
+
+// Add code for pre mass action (confirmation or email presend form)
+$topicmail = "SendStockMovement";
+$modelmail = "movementstock";
+$objecttmp = new MouvementStock($db);
+$trackid = 'mov'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+if ($sall) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+
+$parameters = array('arrayfields'=>&$arrayfields);
+$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">';
+if (!empty($arrayfields['m.rowid']['checked'])) {
+	// Ref
+	print '<td class="liste_titre left">';
+	print '<input class="flat maxwidth25" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
+if (! empty($arrayfields['m.datem']['checked'])) {
+	// Date
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_start?$search_date_start:-1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'), 'tzuserrel');
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_end?$search_date_end:-1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'), 'tzuserrel');
+	print '</div>';
+	print '</td>';
+}
+if (!empty($arrayfields['p.ref']['checked'])) {
+	// Product Ref
+	print '<td class="liste_titre left">';
+	print '<input class="flat maxwidth75" type="text" name="search_product_ref" value="'.dol_escape_htmltag($idproduct ? $product->ref : $search_product_ref).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.label']['checked'])) {
+	// Product label
+	print '<td class="liste_titre left">';
+	print '<input class="flat maxwidth100" type="text" name="search_product" value="'.dol_escape_htmltag($idproduct ? $product->label : $search_product).'">';
+	print '</td>';
+}
+// Batch
+if (!empty($arrayfields['m.batch']['checked'])) {
+	print '<td class="liste_titre center"><input class="flat maxwidth75" type="text" name="search_batch" value="'.dol_escape_htmltag($search_batch).'"></td>';
+}
+if (!empty($arrayfields['pl.eatby']['checked'])) {
+	print '<td class="liste_titre left">';
+	print '</td>';
+}
+if (!empty($arrayfields['pl.sellby']['checked'])) {
+	print '<td class="liste_titre left">';
+	print '</td>';
+}
+// Warehouse
+if (!empty($arrayfields['e.ref']['checked'])) {
+	print '<td class="liste_titre maxwidthonsmartphone left">';
+	//print '<input class="flat" type="text" size="8" name="search_warehouse" value="'.($search_warehouse).'">';
+	print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
+	print '</td>';
+}
+if (!empty($arrayfields['m.fk_user_author']['checked'])) {
+	// Author
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" size="6" name="search_user" value="'.dol_escape_htmltag($search_user).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['m.inventorycode']['checked'])) {
+	// Inventory code
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" size="4" name="search_inventorycode" value="'.dol_escape_htmltag($search_inventorycode).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['m.label']['checked'])) {
+	// Label of movement
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" size="8" name="search_movement" value="'.dol_escape_htmltag($search_movement).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['origin']['checked'])) {
+	// Origin of movement
+	print '<td class="liste_titre left">';
+	print '&nbsp; ';
+	print '</td>';
+}
+if (!empty($arrayfields['m.fk_projet']['checked'])) {
+	// fk_project
+	print '<td class="liste_titre" align="left">';
+	print '&nbsp; ';
+	print '</td>';
+}
+if (!empty($arrayfields['m.type_mouvement']['checked'])) {
+	// Type of movement
+	print '<td class="liste_titre center">';
+	//print '<input class="flat" type="text" size="3" name="search_type_mouvement" value="'.dol_escape_htmltag($search_type_mouvement).'">';
+	print '<select id="search_type_mouvement" name="search_type_mouvement" class="maxwidth150">';
+	print '<option value="" '.(($search_type_mouvement == "") ? 'selected="selected"' : '').'>&nbsp;</option>';
+	print '<option value="0" '.(($search_type_mouvement == "0") ? 'selected="selected"' : '').'>'.$langs->trans('StockIncreaseAfterCorrectTransfer').'</option>';
+	print '<option value="1" '.(($search_type_mouvement == "1") ? 'selected="selected"' : '').'>'.$langs->trans('StockDecreaseAfterCorrectTransfer').'</option>';
+	print '<option value="2" '.(($search_type_mouvement == "2") ? 'selected="selected"' : '').'>'.$langs->trans('StockDecrease').'</option>';
+	print '<option value="3" '.(($search_type_mouvement == "3") ? 'selected="selected"' : '').'>'.$langs->trans('StockIncrease').'</option>';
+	print '</select>';
+	print ajax_combobox('search_type_mouvement');
+	// TODO: add new function $formentrepot->selectTypeOfMovement(...) like
+	// print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
+	print '</td>';
+}
+if (!empty($arrayfields['m.value']['checked'])) {
+	// Qty
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="4" name="search_qty" value="'.dol_escape_htmltag($search_qty).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['m.price']['checked'])) {
+	// Price
+	print '<td class="liste_titre" align="left">';
+	print '&nbsp; ';
+	print '</td>';
+}
+
+// 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;
+// Date creation
+if (!empty($arrayfields['m.datec']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+// Date modification
+if (!empty($arrayfields['m.tms']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+// 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">';
+if (!empty($arrayfields['m.rowid']['checked'])) {
+	print_liste_field_titre($arrayfields['m.rowid']['label'], $_SERVER["PHP_SELF"], 'm.rowid', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['m.datem']['checked'])) {
+	print_liste_field_titre($arrayfields['m.datem']['label'], $_SERVER["PHP_SELF"], 'm.datem', '', $param, '', $sortfield, $sortorder, '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.label']['checked'])) {
+	print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], 'p.label', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['m.batch']['checked'])) {
+	print_liste_field_titre($arrayfields['m.batch']['label'], $_SERVER["PHP_SELF"], 'm.batch', '', $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['pl.eatby']['checked'])) {
+	print_liste_field_titre($arrayfields['pl.eatby']['label'], $_SERVER["PHP_SELF"], 'pl.eatby', '', $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['pl.sellby']['checked'])) {
+	print_liste_field_titre($arrayfields['pl.sellby']['label'], $_SERVER["PHP_SELF"], 'pl.sellby', '', $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['e.ref']['checked'])) {
+	// We are on a specific warehouse card, no filter on other should be possible
+	print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['m.fk_user_author']['checked'])) {
+	print_liste_field_titre($arrayfields['m.fk_user_author']['label'], $_SERVER["PHP_SELF"], "m.fk_user_author", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['m.inventorycode']['checked'])) {
+	print_liste_field_titre($arrayfields['m.inventorycode']['label'], $_SERVER["PHP_SELF"], "m.inventorycode", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['m.label']['checked'])) {
+	print_liste_field_titre($arrayfields['m.label']['label'], $_SERVER["PHP_SELF"], "m.label", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['origin']['checked'])) {
+	print_liste_field_titre($arrayfields['origin']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['m.fk_projet']['checked'])) {
+	print_liste_field_titre($arrayfields['m.fk_projet']['label'], $_SERVER["PHP_SELF"], "m.fk_projet", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['m.type_mouvement']['checked'])) {
+	print_liste_field_titre($arrayfields['m.type_mouvement']['label'], $_SERVER["PHP_SELF"], "m.type_mouvement", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['m.value']['checked'])) {
+	print_liste_field_titre($arrayfields['m.value']['label'], $_SERVER["PHP_SELF"], "m.value", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['m.price']['checked'])) {
+	print_liste_field_titre($arrayfields['m.price']['label'], $_SERVER["PHP_SELF"], "m.price", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (!empty($arrayfields['m.datec']['checked'])) {
+	print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['m.tms']['checked'])) {
+	print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+// Action column
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+print '</tr>'."\n";
+
+
+$arrayofuniqueproduct = array();
+
+
+// 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
+	}
+
+	$userstatic->id = $obj->fk_user_author;
+	$userstatic->login = $obj->login;
+	$userstatic->lastname = $obj->lastname;
+	$userstatic->firstname = $obj->firstname;
+	$userstatic->photo = $obj->photo;
+	$userstatic->email = $obj->user_email;
+	$userstatic->statut = $obj->user_status;
+
+	// Multilangs
+	if (!empty($conf->global->MAIN_MULTILANGS)) {  // If multilang is enabled
+		// TODO Use a cache
+		$sql = "SELECT label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
+		$sql .= " WHERE fk_product = ".((int) $obj->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)) {
+				$obj->produit = $objtp->label;
+			}
+		}
+	}
+
+	$productstatic->id = $obj->rowid;
+	$productstatic->ref = $obj->product_ref;
+	$productstatic->label = $obj->produit;
+	$productstatic->type = $obj->type;
+	$productstatic->entity = $obj->entity;
+	$productstatic->status = $obj->tosell;
+	$productstatic->status_buy = $obj->tobuy;
+	$productstatic->status_batch = $obj->tobatch;
+
+	$productlot->id = $obj->lotid;
+	$productlot->batch = $obj->batch;
+	$productlot->eatby = $obj->eatby;
+	$productlot->sellby = $obj->sellby;
+
+	$warehousestatic->id = $obj->entrepot_id;
+	$warehousestatic->ref = $obj->warehouse_ref;
+	$warehousestatic->label = $obj->warehouse_ref;
+	$warehousestatic->lieu = $obj->lieu;
+	$warehousestatic->fk_parent = $obj->fk_parent;
+	$warehousestatic->statut = $obj->statut;
+
+	$movement->type = $obj->type_mouvement;
+
+	$arrayofuniqueproduct[$obj->rowid] = $obj->produit;
+	if (!empty($obj->fk_origin)) {
+		$origin = $movement->get_origin($obj->fk_origin, $obj->origintype);
+	} else {
+		$origin = '';
+	}
+
+	print '<tr class="oddeven">';
+	// Id movement
 	if (!empty($arrayfields['m.rowid']['checked'])) {
-		// Ref
-		print '<td class="liste_titre left">';
-		print '<input class="flat maxwidth25" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-		print '</td>';
+		print '<td>';
+		print img_picto($langs->trans("StockMovement"), 'movement', 'class="pictofixedwidth"');
+		print $obj->mid;
+		print '</td>'; // This is primary not movement id
 	}
-	if (! empty($arrayfields['m.datem']['checked'])) {
+	if (!empty($arrayfields['m.datem']['checked'])) {
 		// Date
-		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
-		print $form->selectDate($search_date_start?$search_date_start:-1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'), 'tzuserrel');
-		print '</div>';
-		print '<div class="nowrap">';
-		print $form->selectDate($search_date_end?$search_date_end:-1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'), 'tzuserrel');
-		print '</div>';
-		print '</td>';
+		print '<td class="nowraponall center">'.dol_print_date($db->jdate($obj->datem), 'dayhour', 'tzuserrel').'</td>';
 	}
 	if (!empty($arrayfields['p.ref']['checked'])) {
-		// Product Ref
-		print '<td class="liste_titre left">';
-		print '<input class="flat maxwidth75" type="text" name="search_product_ref" value="'.dol_escape_htmltag($idproduct ? $product->ref : $search_product_ref).'">';
-		print '</td>';
+		// Product ref
+		print '<td class="nowraponall">';
+		print $productstatic->getNomUrl(1, 'stock', 16);
+		print "</td>\n";
 	}
 	if (!empty($arrayfields['p.label']['checked'])) {
 		// Product label
-		print '<td class="liste_titre left">';
-		print '<input class="flat maxwidth100" type="text" name="search_product" value="'.dol_escape_htmltag($idproduct ? $product->label : $search_product).'">';
-		print '</td>';
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($productstatic->label).'">';
+		print $productstatic->label;
+		print "</td>\n";
 	}
-	// Batch
 	if (!empty($arrayfields['m.batch']['checked'])) {
-		print '<td class="liste_titre center"><input class="flat maxwidth75" type="text" name="search_batch" value="'.dol_escape_htmltag($search_batch).'"></td>';
+		print '<td class="center nowraponall">';
+		if ($productlot->id > 0) {
+			print $productlot->getNomUrl(1);
+		} else {
+			print $productlot->batch; // the id may not be defined if movement was entered when lot was not saved or if lot was removed after movement.
+		}
+		print '</td>';
 	}
 	if (!empty($arrayfields['pl.eatby']['checked'])) {
-		print '<td class="liste_titre left">';
-		print '</td>';
+		print '<td class="center">'.dol_print_date($obj->eatby, 'day').'</td>';
 	}
 	if (!empty($arrayfields['pl.sellby']['checked'])) {
-		print '<td class="liste_titre left">';
-		print '</td>';
+		print '<td class="center">'.dol_print_date($obj->sellby, 'day').'</td>';
 	}
 	// Warehouse
 	if (!empty($arrayfields['e.ref']['checked'])) {
-		print '<td class="liste_titre maxwidthonsmartphone left">';
-		//print '<input class="flat" type="text" size="8" name="search_warehouse" value="'.($search_warehouse).'">';
-		print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
-		print '</td>';
+		print '<td class="tdoverflowmax100">';
+		print $warehousestatic->getNomUrl(1);
+		print "</td>\n";
 	}
+	// Author
 	if (!empty($arrayfields['m.fk_user_author']['checked'])) {
-		// Author
-		print '<td class="liste_titre left">';
-		print '<input class="flat" type="text" size="6" name="search_user" value="'.dol_escape_htmltag($search_user).'">';
-		print '</td>';
+		print '<td class="tdoverflowmax100">';
+		print $userstatic->getNomUrl(-1);
+		print "</td>\n";
 	}
 	if (!empty($arrayfields['m.inventorycode']['checked'])) {
 		// Inventory code
-		print '<td class="liste_titre left">';
-		print '<input class="flat" type="text" size="4" name="search_inventorycode" value="'.dol_escape_htmltag($search_inventorycode).'">';
-		print '</td>';
+		print '<td><a href="'.$_SERVER["PHP_SELF"].'?search_inventorycode='.urlencode('^'.$obj->inventorycode.'$').'&search_type_mouvement='.urlencode($obj->type_mouvement).'">'.$obj->inventorycode.'</a></td>';
 	}
 	if (!empty($arrayfields['m.label']['checked'])) {
 		// Label of movement
-		print '<td class="liste_titre left">';
-		print '<input class="flat" type="text" size="8" name="search_movement" value="'.dol_escape_htmltag($search_movement).'">';
-		print '</td>';
+		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->label).'">'.$obj->label.'</td>';
 	}
 	if (!empty($arrayfields['origin']['checked'])) {
 		// Origin of movement
-		print '<td class="liste_titre left">';
-		print '&nbsp; ';
-		print '</td>';
+		print '<td class="nowraponall">'.$origin.'</td>';
 	}
 	if (!empty($arrayfields['m.fk_projet']['checked'])) {
 		// fk_project
-		print '<td class="liste_titre" align="left">';
-		print '&nbsp; ';
+		print '<td>';
+		if ($obj->fk_project != 0) {
+			print $movement->get_origin($obj->fk_project, 'project');
+		}
 		print '</td>';
 	}
 	if (!empty($arrayfields['m.type_mouvement']['checked'])) {
 		// Type of movement
-		print '<td class="liste_titre center">';
-		//print '<input class="flat" type="text" size="3" name="search_type_mouvement" value="'.dol_escape_htmltag($search_type_mouvement).'">';
-		print '<select id="search_type_mouvement" name="search_type_mouvement" class="maxwidth150">';
-		print '<option value="" '.(($search_type_mouvement == "") ? 'selected="selected"' : '').'>&nbsp;</option>';
-		print '<option value="0" '.(($search_type_mouvement == "0") ? 'selected="selected"' : '').'>'.$langs->trans('StockIncreaseAfterCorrectTransfer').'</option>';
-		print '<option value="1" '.(($search_type_mouvement == "1") ? 'selected="selected"' : '').'>'.$langs->trans('StockDecreaseAfterCorrectTransfer').'</option>';
-		print '<option value="2" '.(($search_type_mouvement == "2") ? 'selected="selected"' : '').'>'.$langs->trans('StockDecrease').'</option>';
-		print '<option value="3" '.(($search_type_mouvement == "3") ? 'selected="selected"' : '').'>'.$langs->trans('StockIncrease').'</option>';
-		print '</select>';
-		print ajax_combobox('search_type_mouvement');
-		// TODO: add new function $formentrepot->selectTypeOfMovement(...) like
-		// print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
+		print '<td class="center">';
+		print $movement->getTypeMovement();
 		print '</td>';
 	}
 	if (!empty($arrayfields['m.value']['checked'])) {
 		// Qty
-		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="4" name="search_qty" value="'.dol_escape_htmltag($search_qty).'">';
+		print '<td class="right">';
+		if ($obj->qty > 0) {
+			print '<span class="stockmovemententry">';
+			print '+';
+			print $obj->qty;
+			print '</span>';
+		} else {
+			print '<span class="stockmovementexit">';
+			print $obj->qty;
+			print '</span>';
+		}
 		print '</td>';
 	}
 	if (!empty($arrayfields['m.price']['checked'])) {
 		// Price
-		print '<td class="liste_titre" align="left">';
-		print '&nbsp; ';
+		print '<td class="right">';
+		if ($obj->price != 0) {
+			print price($obj->price);
+		}
 		print '</td>';
 	}
 
 	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
-
+	$object = $movement;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.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
+	$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['m.datec']['checked'])) {
-		print '<td class="liste_titre">';
-		print '</td>';
+
+	// Action column
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		$selected = 0;
+		if (in_array($obj->mid, $arrayofselected)) {
+			$selected = 1;
+		}
+		print '<input id="cb'.$obj->mid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->mid.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
-	// Date modification
-	if (!empty($arrayfields['m.tms']['checked'])) {
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	// Actions
-	print '<td class="liste_titre maxwidthsearch">';
-	$searchpicto = $form->showFilterAndCheckAddButtons(0);
-	print $searchpicto;
 	print '</td>';
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['m.rowid']['checked'])) {
-		print_liste_field_titre($arrayfields['m.rowid']['label'], $_SERVER["PHP_SELF"], 'm.rowid', '', $param, '', $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['m.datem']['checked'])) {
-		print_liste_field_titre($arrayfields['m.datem']['label'], $_SERVER["PHP_SELF"], 'm.datem', '', $param, '', $sortfield, $sortorder, '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.label']['checked'])) {
-		print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], 'p.label', '', $param, '', $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['m.batch']['checked'])) {
-		print_liste_field_titre($arrayfields['m.batch']['label'], $_SERVER["PHP_SELF"], 'm.batch', '', $param, '', $sortfield, $sortorder, 'center ');
-	}
-	if (!empty($arrayfields['pl.eatby']['checked'])) {
-		print_liste_field_titre($arrayfields['pl.eatby']['label'], $_SERVER["PHP_SELF"], 'pl.eatby', '', $param, '', $sortfield, $sortorder, 'center ');
-	}
-	if (!empty($arrayfields['pl.sellby']['checked'])) {
-		print_liste_field_titre($arrayfields['pl.sellby']['label'], $_SERVER["PHP_SELF"], 'pl.sellby', '', $param, '', $sortfield, $sortorder, 'center ');
-	}
-	if (!empty($arrayfields['e.ref']['checked'])) {
-		// We are on a specific warehouse card, no filter on other should be possible
-		print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['m.fk_user_author']['checked'])) {
-		print_liste_field_titre($arrayfields['m.fk_user_author']['label'], $_SERVER["PHP_SELF"], "m.fk_user_author", "", $param, "", $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['m.inventorycode']['checked'])) {
-		print_liste_field_titre($arrayfields['m.inventorycode']['label'], $_SERVER["PHP_SELF"], "m.inventorycode", "", $param, "", $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['m.label']['checked'])) {
-		print_liste_field_titre($arrayfields['m.label']['label'], $_SERVER["PHP_SELF"], "m.label", "", $param, "", $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['origin']['checked'])) {
-		print_liste_field_titre($arrayfields['origin']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['m.fk_projet']['checked'])) {
-		print_liste_field_titre($arrayfields['m.fk_projet']['label'], $_SERVER["PHP_SELF"], "m.fk_projet", "", $param, '', $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['m.type_mouvement']['checked'])) {
-		print_liste_field_titre($arrayfields['m.type_mouvement']['label'], $_SERVER["PHP_SELF"], "m.type_mouvement", "", $param, '', $sortfield, $sortorder, 'center ');
-	}
-	if (!empty($arrayfields['m.value']['checked'])) {
-		print_liste_field_titre($arrayfields['m.value']['label'], $_SERVER["PHP_SELF"], "m.value", "", $param, '', $sortfield, $sortorder, 'right ');
-	}
-	if (!empty($arrayfields['m.price']['checked'])) {
-		print_liste_field_titre($arrayfields['m.price']['label'], $_SERVER["PHP_SELF"], "m.price", "", $param, '', $sortfield, $sortorder, 'right ');
+	if (!$i) {
+		$totalarray['nbfield']++;
 	}
 
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+	print '</tr>'."\n";
 
-	// 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['m.datec']['checked'])) {
-		print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	}
-	if (!empty($arrayfields['m.tms']['checked'])) {
-		print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	}
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-	print "</tr>\n";
-
-
-	$arrayofuniqueproduct = array();
-
-	$i = 0;
-	$totalarray = array();
-	while ($i < min($num, $limit)) {
-		$objp = $db->fetch_object($resql);
-
-		$userstatic->id = $objp->fk_user_author;
-		$userstatic->login = $objp->login;
-		$userstatic->lastname = $objp->lastname;
-		$userstatic->firstname = $objp->firstname;
-		$userstatic->photo = $objp->photo;
-		$userstatic->email = $objp->user_email;
-		$userstatic->statut = $objp->user_status;
-
-		// Multilangs
-		if (!empty($conf->global->MAIN_MULTILANGS)) {  // If multilang is enabled
-			// TODO Use a cache
-			$sql = "SELECT label";
-			$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-			$sql .= " WHERE fk_product=".$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->produit = $objtp->label;
-				}
-			}
-		}
-
-		$productstatic->id = $objp->rowid;
-		$productstatic->ref = $objp->product_ref;
-		$productstatic->label = $objp->produit;
-		$productstatic->type = $objp->type;
-		$productstatic->entity = $objp->entity;
-		$productstatic->status = $objp->tosell;
-		$productstatic->status_buy = $objp->tobuy;
-		$productstatic->status_batch = $objp->tobatch;
-
-		$productlot->id = $objp->lotid;
-		$productlot->batch = $objp->batch;
-		$productlot->eatby = $objp->eatby;
-		$productlot->sellby = $objp->sellby;
-
-		$warehousestatic->id = $objp->entrepot_id;
-		$warehousestatic->ref = $objp->warehouse_ref;
-		$warehousestatic->label = $objp->warehouse_ref;
-		$warehousestatic->lieu = $objp->lieu;
-		$warehousestatic->fk_parent = $objp->fk_parent;
-		$warehousestatic->statut = $objp->statut;
-
-		$movement->type = $objp->type_mouvement;
-
-		$arrayofuniqueproduct[$objp->rowid] = $objp->produit;
-		if (!empty($objp->fk_origin)) {
-			$origin = $movement->get_origin($objp->fk_origin, $objp->origintype);
-		} else {
-			$origin = '';
-		}
-
-		print '<tr class="oddeven">';
-		// Id movement
-		if (!empty($arrayfields['m.rowid']['checked'])) {
-			print '<td class="nowraponall">';
-			print img_picto($langs->trans("StockMovement"), 'movement', 'class="pictofixedwidth"');
-			print $objp->mid;
-			print '</td>'; // This is primary key not movement ref
-		}
-		if (!empty($arrayfields['m.datem']['checked'])) {
-			// Date
-			print '<td class="nowraponall center">'.dol_print_date($db->jdate($objp->datem), 'dayhour', 'tzuserrel').'</td>';
-		}
-		if (!empty($arrayfields['p.ref']['checked'])) {
-			// Product ref
-			print '<td class="nowraponall">';
-			print $productstatic->getNomUrl(1, 'stock', 16);
-			print "</td>\n";
-		}
-		if (!empty($arrayfields['p.label']['checked'])) {
-			// Product label
-			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($productstatic->label).'">';
-			print $productstatic->label;
-			print "</td>\n";
-		}
-		if (!empty($arrayfields['m.batch']['checked'])) {
-			print '<td class="center nowraponall">';
-			if ($productlot->id > 0) {
-				print $productlot->getNomUrl(1);
-			} else {
-				print $productlot->batch; // the id may not be defined if movement was entered when lot was not saved or if lot was removed after movement.
-			}
-			print '</td>';
-		}
-		if (!empty($arrayfields['pl.eatby']['checked'])) {
-			print '<td class="center">'.dol_print_date($objp->eatby, 'day').'</td>';
-		}
-		if (!empty($arrayfields['pl.sellby']['checked'])) {
-			print '<td class="center">'.dol_print_date($objp->sellby, 'day').'</td>';
-		}
-		// Warehouse
-		if (!empty($arrayfields['e.ref']['checked'])) {
-			print '<td class="tdoverflowmax100">';
-			print $warehousestatic->getNomUrl(1);
-			print "</td>\n";
-		}
-		// Author
-		if (!empty($arrayfields['m.fk_user_author']['checked'])) {
-			print '<td class="tdoverflowmax100">';
-			print $userstatic->getNomUrl(-1);
-			print "</td>\n";
-		}
-		if (!empty($arrayfields['m.inventorycode']['checked'])) {
-			// Inventory code
-			print '<td><a href="'.$_SERVER["PHP_SELF"].'?search_inventorycode='.urlencode('^'.$objp->inventorycode.'$').'&search_type_mouvement='.urlencode($objp->type_mouvement).'">'.$objp->inventorycode.'</a></td>';
-		}
-		if (!empty($arrayfields['m.label']['checked'])) {
-			// Label of movement
-			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($objp->label).'">'.$objp->label.'</td>';
-		}
-		if (!empty($arrayfields['origin']['checked'])) {
-			// Origin of movement
-			print '<td class="nowraponall">'.$origin.'</td>';
-		}
-		if (!empty($arrayfields['m.fk_projet']['checked'])) {
-			// fk_project
-			print '<td>';
-			if ($objp->fk_project != 0) {
-				print $movement->get_origin($objp->fk_project, 'project');
-			}
-			print '</td>';
-		}
-		if (!empty($arrayfields['m.type_mouvement']['checked'])) {
-			// Type of movement
-			print '<td class="center">';
-			print $movement->getTypeMovement();
-			print '</td>';
-		}
-		if (!empty($arrayfields['m.value']['checked'])) {
-			// Qty
-			print '<td class="right">';
-			if ($objp->qty > 0) {
-				print '<span class="stockmovemententry">';
-				print '+';
-				print $objp->qty;
-				print '</span>';
-			} else {
-				print '<span class="stockmovementexit">';
-				print $objp->qty;
-				print '</span>';
-			}
-			print '</td>';
-		}
-		if (!empty($arrayfields['m.price']['checked'])) {
-			// Price
-			print '<td class="right">';
-			if ($objp->price != 0) {
-				print price($objp->price);
-			}
-			print '</td>';
-		}
-
-		// Extra fields
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'objp'=>$objp, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // 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($objp->mid, $arrayofselected)) {
-				$selected = 1;
-			}
-			print '<input id="cb'.$objp->mid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objp->mid.'"'.($selected ? ' checked="checked"' : '').'>';
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-
-		print "</tr>\n";
-		$i++;
-	}
-	$db->free($resql);
-
-	print "</table>";
-	print '</div>';
-	print "</form>";
-
-	// Add number of product when there is a filter on period
-	if (count($arrayofuniqueproduct) == 1 && is_numeric($year)) {
-		print "<br>";
-
-		$productidselected = 0;
-		foreach ($arrayofuniqueproduct as $key => $val) {
-			$productidselected = $key;
-			$productlabelselected = $val;
-		}
-		$datebefore = dol_get_first_day($year ? $year : strftime("%Y", time()), $month ? $month : 1, true);
-		$dateafter = dol_get_last_day($year ? $year : strftime("%Y", time()), $month ? $month : 12, true);
-		$balancebefore = $movement->calculateBalanceForProductBefore($productidselected, $datebefore);
-		$balanceafter = $movement->calculateBalanceForProductBefore($productidselected, $dateafter);
-
-		//print '<tr class="total"><td class="liste_total">';
-		print $langs->trans("NbOfProductBeforePeriod", $productlabelselected, dol_print_date($datebefore, 'day', 'gmt'));
-		//print '</td>';
-		//print '<td class="liste_total right" colspan="6">';
-		print ': '.$balancebefore;
-		print "<br>\n";
-		//print '</td></tr>';
-		//print '<tr class="total"><td class="liste_total">';
-		print $langs->trans("NbOfProductAfterPeriod", $productlabelselected, dol_print_date($dateafter, 'day', 'gmt'));
-		//print '</td>';
-		//print '<td class="liste_total right" colspan="6">';
-		print ': '.$balanceafter;
-		print "<br>\n";
-		//print '</td></tr>';
-	}
-} else {
-	dol_print_error($db);
+	$i++;
 }
 
+$db->free($resql);
+
+print "</table>";
+print '</div>';
+print "</form>";
+
+// Add number of product when there is a filter on period
+if (count($arrayofuniqueproduct) == 1 && is_numeric($year)) {
+	print "<br>";
+
+	$productidselected = 0;
+	foreach ($arrayofuniqueproduct as $key => $val) {
+		$productidselected = $key;
+		$productlabelselected = $val;
+	}
+	$datebefore = dol_get_first_day($year ? $year : strftime("%Y", time()), $month ? $month : 1, true);
+	$dateafter = dol_get_last_day($year ? $year : strftime("%Y", time()), $month ? $month : 12, true);
+	$balancebefore = $movement->calculateBalanceForProductBefore($productidselected, $datebefore);
+	$balanceafter = $movement->calculateBalanceForProductBefore($productidselected, $dateafter);
+
+	//print '<tr class="total"><td class="liste_total">';
+	print $langs->trans("NbOfProductBeforePeriod", $productlabelselected, dol_print_date($datebefore, 'day', 'gmt'));
+	//print '</td>';
+	//print '<td class="liste_total right" colspan="6">';
+	print ': '.$balancebefore;
+	print "<br>\n";
+	//print '</td></tr>';
+	//print '<tr class="total"><td class="liste_total">';
+	print $langs->trans("NbOfProductAfterPeriod", $productlabelselected, dol_print_date($dateafter, 'day', 'gmt'));
+	//print '</td>';
+	//print '<td class="liste_total right" colspan="6">';
+	print ': '.$balanceafter;
+	print "<br>\n";
+	//print '</td></tr>';
+}
+
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+	$hidegeneratedfilelistifempty = 1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
+
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+	$formfile = new FormFile($db);
+
+	// Show list of available documents
+	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource .= str_replace('&amp;', '&', $param);
+
+	$filedir = $diroutputmassaction;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
+
+	print $formfile->showdocuments('massfilesarea_mymodule', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
 
 // End of page
 llxFooter();
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 0e4cf4b6a20..f522e61bec2 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -552,7 +552,7 @@ if ($id > 0 || $ref) {
 
 	if (!empty($conf->use_javascript_ajax)) {
 		?>
-		<script type="text/javascript" language="javascript">
+		<script type="text/javascript">
 			$(document).ready(function() {
 				$(".collapse_batch").click(function() {
 					console.log("We click on collapse_batch");
@@ -561,6 +561,8 @@ if ($id > 0 || $ref) {
 					if($(this).text().indexOf('+') > 0) {
 						$(".batch_warehouse" + id_entrepot).show();
 						$(this).html('(-)');
+						jQuery("#show_all").hide();
+						jQuery("#hide_all").show();
 					}
 					else {
 						$(".batch_warehouse" + id_entrepot).hide();
@@ -574,6 +576,8 @@ if ($id > 0 || $ref) {
 					console.log("We click on show_all");
 					$("[class^=batch_warehouse]").show();
 					$("[class^=collapse_batch]").html('(-)');
+					jQuery("#show_all").hide();
+					jQuery("#hide_all").show();
 					return false;
 				});
 
@@ -581,6 +585,8 @@ if ($id > 0 || $ref) {
 					console.log("We click on hide_all");
 					$("[class^=batch_warehouse]").hide();
 					$("[class^=collapse_batch]").html('(+)');
+					jQuery("#hide_all").hide();
+					jQuery("#show_all").show();
 					return false;
 				});
 
@@ -703,7 +709,7 @@ if ($id > 0 || $ref) {
 			print '</table>';
 
 			print '</div>';
-			print '<div class="fichehalfright"><div class="ficheaddleft"><div class="underbanner clearboth"></div>';
+			print '<div class="fichehalfright"><div class="underbanner clearboth"></div>';
 
 			print '<table class="border tableforfield centpercent">';
 
@@ -757,7 +763,7 @@ if ($id > 0 || $ref) {
 				if ($result < 0) {
 					dol_print_error($db, $object->error);
 				}
-				$helpondiff .= ' ('.$langs->trans("ProductQtyInDraft").': '.$object->stats_commande['qty'].')';
+				$helpondiff .= ' <span class="opacitymedium">('.$langs->trans("ProductQtyInDraft").': '.$object->stats_commande['qty'].')</span>';
 			}
 
 			// Number of product from customer order already sent (partial shipping)
@@ -791,7 +797,7 @@ if ($id > 0 || $ref) {
 				if ($result < 0) {
 					dol_print_error($db, $object->error);
 				}
-				$helpondiff .= ' ('.$langs->trans("ProductQtyInDraftOrWaitingApproved").': '.$object->stats_commande_fournisseur['qty'].')';
+				$helpondiff .= ' <span class="opacitymedium">('.$langs->trans("ProductQtyInDraftOrWaitingApproved").': '.$object->stats_commande_fournisseur['qty'].')</span>';
 			}
 
 			// Number of product from supplier order already received (partial receipt)
@@ -857,7 +863,6 @@ if ($id > 0 || $ref) {
 
 			print "</table>";
 
-			print '</div>';
 			print '</div>';
 			print '</div>';
 
@@ -938,10 +943,11 @@ if (!$variants) {
 
 	if ((!empty($conf->productbatch->enabled)) && $object->hasbatch()) {
 		$colspan = 3;
-		print '<tr class="liste_titre"><td width="14%">';
+		print '<tr class="liste_titre"><td class="minwidth200">';
 		if (!empty($conf->use_javascript_ajax)) {
-			print '<a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a> &nbsp; ';
-			print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>';
+			print '<a id="show_all" href="#" class="hideobject">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ShowAllLots").'</a>';
+			//print ' &nbsp; ';
+			print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("HideLots").'</a>';
 			//print '&nbsp;'.$form->textwithpicto('', $langs->trans('CollapseBatchDetailHelp'), 1, 'help', '');
 		}
 		print '</td>';
@@ -977,6 +983,7 @@ if (!$variants) {
 	$entrepotstatic = new Entrepot($db);
 	$product_lot_static = new Productlot($db);
 
+	$num = 0;
 	$total = 0;
 	$totalvalue = $totalvaluesell = 0;
 
@@ -1019,18 +1026,45 @@ if (!$variants) {
 			print '<td class="right amount nowraponall">'.(price2num($object->pmp) ? price(price2num($object->pmp * $obj->reel, 'MT')) : '').'</td>';
 
 			// Sell price
+			$minsellprice = null; $maxsellprice = null;
 			print '<td class="right">';
-			print price(price2num($object->price, 'MU'), 1);
 			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+				foreach ($object->multiprices as $priceforlevel) {
+					if (is_numeric($priceforlevel)) {
+						if (is_null($maxsellprice) || $priceforlevel > $maxsellprice) {
+							$maxsellprice = $priceforlevel;
+						}
+						if (is_null($minsellprice) || $priceforlevel < $minsellprice) {
+							$minsellprice = $priceforlevel;
+						}
+					}
+				}
+				print '<span class="valignmiddle">';
+				if ($minsellprice != $maxsellprice) {
+					print price(price2num($minsellprice, 'MU'), 1).' - '.price(price2num($maxsellprice, 'MU'), 1);
+				} else {
+					print price(price2num($minsellprice, 'MU'), 1);
+				}
+				print '</span>';
 				print $form->textwithpicto('', $langs->trans("Variable"));
+			} else {
+				print price(price2num($object->price, 'MU'), 1);
 			}
 			print '</td>';
 
 			// Value sell
 			print '<td class="right amount nowraponall">';
-			print price(price2num($object->price * $obj->reel, 'MT'), 1);
 			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+				print '<span class="valignmiddle">';
+				if ($minsellprice != $maxsellprice) {
+					print price(price2num($minsellprice * $obj->reel, 'MT'), 1).' - '.price(price2num($maxsellprice * $obj->reel, 'MT'), 1);
+				} else {
+					print price(price2num($minsellprice * $obj->reel, 'MT'), 1);
+				}
+				print '</span>';
 				print $form->textwithpicto('', $langs->trans("Variable"));
+			} else {
+				print price(price2num($object->price * $obj->reel, 'MT'), 1);
 			}
 			print '</td>';
 			print '<td></td>';
@@ -1097,7 +1131,7 @@ if (!$variants) {
 						}
 						print '<td class="right" colspan="'.$colspan.'">'.$pdluo->qty.($pdluo->qty < 0 ? ' '.img_warning() : '').'</td>';
 						print '<td colspan="4"></td>';
-						print '<td>';
+						print '<td class="center">';
 						if ($entrepotstatic->status != $entrepotstatic::STATUS_CLOSED) {
 							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;id_entrepot='.$entrepotstatic->id.'&amp;action=transfert&amp;pdluoid='.$pdluo->id.'">';
 							print img_picto($langs->trans("TransferStock"), 'add', 'class="hideonsmartphone paddingright" style="color: #a69944"');
@@ -1105,11 +1139,11 @@ if (!$variants) {
 							print '</a>';
 							// Disabled, because edition of stock content must use the "Correct stock menu".
 							// Do not use this, or data will be wrong (bad tracking of movement label, inventory code, ...
-							//print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;action=editline&amp;lineid='.$pdluo->id.'#'.$pdluo->id.'">';
+							//print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=editline&token='.newToken().'&lineid='.$pdluo->id.'#'.$pdluo->id.'">';
 							//print img_edit().'</a>';
 						}
 						print '</td>';
-						print '<td>';
+						print '<td class="center">';
 						if ($entrepotstatic->status != $entrepotstatic::STATUS_CLOSED) {
 							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;id_entrepot='.$entrepotstatic->id.'&amp;action=correction&amp;pdluoid='.$pdluo->id.'">';
 							print img_picto($langs->trans("CorrectStock"), 'add', 'class="hideonsmartphone paddingright" style="color: #a69944"');
@@ -1117,7 +1151,7 @@ if (!$variants) {
 							print '</a>';
 							// Disabled, because edition of stock content must use the "Correct stock menu".
 							// Do not use this, or data will be wrong (bad tracking of movement label, inventory code, ...
-							//print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;action=editline&amp;lineid='.$pdluo->id.'#'.$pdluo->id.'">';
+							//print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=editline&token='.newToken().'&lineid='.$pdluo->id.'#'.$pdluo->id.'">';
 							//print img_edit().'</a>';
 						}
 						print '</td>';
@@ -1142,17 +1176,28 @@ if (!$variants) {
 	print $totalvalue ? price(price2num($totalvalue, 'MT'), 1) : '&nbsp;';
 	print '</td>';
 	print '<td class="liste_total right">';
-	print ($total ? price($totalvaluesell / $total, 1) : '&nbsp;');
-	if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
-		print $form->textwithpicto('', $langs->trans("Variable"));
+	if ($num) {
+		if ($total) {
+			print '<span class="valignmiddle">';
+			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+				print $form->textwithpicto('', $langs->trans("Variable"));
+			} else {
+				print price($totalvaluesell / $total, 1);
+			}
+			print '</span>';
+		}
 	}
 	print '</td>';
 	// Value to sell
-	print '<td class="liste_total right">';
-	if (empty($conf->global->PRODUIT_MULTIPRICES)) {
-		print price(price2num($totalvaluesell, 'MT'), 1);
-	} else {
-		print $langs->trans("Variable");
+	print '<td class="liste_total right amount">';
+	if ($num) {
+		print '<span class="valignmiddle">';
+		if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+			print price(price2num($totalvaluesell, 'MT'), 1);
+		} else {
+			print $form->textwithpicto('', $langs->trans("Variable"));
+		}
+		print '</span>';
 	}
 	print '</td>';
 	print '<td></td>';
@@ -1174,13 +1219,13 @@ if (!$variants) {
 		}
 		print '<table class="noborder centpercent">';
 		if (!empty($user->rights->produit->creer)) {
-			print '<tr class="liste_titre"><td width="40%">'.$formproduct->selectWarehouses('', 'fk_entrepot').'</td>';
+			print '<tr class="liste_titre"><td>'.$formproduct->selectWarehouses('', 'fk_entrepot').'</td>';
 			print '<td class="right"><input name="seuil_stock_alerte" type="text" placeholder="'.$langs->trans("StockLimit").'" /></td>';
 			print '<td class="right"><input name="desiredstock" type="text" placeholder="'.$langs->trans("DesiredStock").'" /></td>';
 			print '<td class="right"><input type="submit" value="'.$langs->trans("Save").'" class="button button-save" /></td>';
 			print '</tr>';
 		} else {
-			print '<tr class="liste_titre"><td width="40%">'.$langs->trans("Warehouse").'</td>';
+			print '<tr class="liste_titre"><td>'.$langs->trans("Warehouse").'</td>';
 			print '<td class="right">'.$langs->trans("StockLimit").'</td>';
 			print '<td class="right">'.$langs->trans("DesiredStock").'</td>';
 			print '</tr>';
@@ -1194,7 +1239,7 @@ if (!$variants) {
 			foreach ($lines as $line) {
 				$ent = new Entrepot($db);
 				$ent->fetch($line['fk_entrepot']);
-				print '<tr class="oddeven"><td width="40%">'.$ent->getNomUrl(3).'</td>';
+				print '<tr class="oddeven"><td>'.$ent->getNomUrl(3).'</td>';
 				print '<td class="right">'.$line['seuil_stock_alerte'].'</td>';
 				print '<td class="right">'.$line['desiredstock'].'</td>';
 				if (!empty($user->rights->produit->creer)) {
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 22f32f0c8b9..cbf7c901b37 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -401,11 +401,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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 $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 
@@ -536,12 +532,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (empty($reshook)) {
 			/*TODO      if ($user->rights->stock->lire)
 			{
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a></div>'."\n";
 			}
 
 			if ($user->rights->stock->supprimer)
 			{
-				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>'."\n";
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a></div>'."\n";
 			}
 			*/
 		}
@@ -573,7 +569,7 @@ if ($action != 'presend') {
 		print $formfile->showdocuments('product_batch', $objref, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $langs->default_lang, '', $object);
 	}
 
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright">';
 
 	$MAXEVENT = 10;
 
@@ -581,7 +577,7 @@ if ($action != 'presend') {
 	$formactions = new FormActions($db);
 	$somethingshown = $formactions->showactions($object, 'productlot', 0, 1, '', $MAXEVENT);
 
-	print '</div></div></div>';
+	print '</div></div>';
 }
 
 // End of page
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 08b565c90a0..789b03aa6ce 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -58,8 +58,8 @@ $hookmanager->initHooks(array('productlotdocuments'));
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -100,6 +100,7 @@ if (empty($upload_dir)) {
 
 $permissiontoread = $usercanread;
 $permissiontoadd = $usercancreate;
+$permtoedit = $user->rights->produit->creer;
 //$permissiontodelete = $usercandelete;
 
 // Security check
@@ -112,7 +113,9 @@ if ($user->socid > 0) { // Protection if external user
 	accessforbidden();
 }
 //$result = restrictedArea($user, 'productbatch');
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -130,8 +133,6 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 }
 
-$permtoedit = $user->rights->produit->creer;
-
 
 /*
  *	View
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 78a18ca960b..e5a8b05902e 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -37,6 +37,7 @@ $langs->loadLangs(array('stocks', 'productbatch', 'other', 'users'));
 // Get parameters
 $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
+$massaction = GETPOST('massaction', 'alpha');
 $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
@@ -64,7 +65,7 @@ $pagenext = $page + 1;
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $object = new Productlot($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id;
+$diroutputmassaction = $conf->productbatch->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('product_lotlist'));
 
 // Fetch optionals attributes and labels
@@ -201,12 +202,12 @@ $title = $langs->trans('LotSerialList');
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
 foreach ($object->fields as $key => $val) {
-	$sql .= 't.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key." as options_".$key.', ' : '');
 	}
 }
 // Add fields from hooks
@@ -215,7 +216,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 ( !empty($extrafields->attributes[$object->table_element]['label']) && ($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) {
@@ -253,7 +254,7 @@ $sql .= $hookmanager->resPrint;
  $sql.= " GROUP BY ";
  foreach($object->fields as $key => $val)
  {
- $sql.='t.'.$key.', ';
+ $sql .= "t.".$key.", ";
  }
  // Add fields from extrafields
  if (! empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -340,7 +341,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'))) {
@@ -424,9 +425,9 @@ foreach ($object->fields as $key => $val) {
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
 			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		} elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
+			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($search[$key]).'">';
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(!empty($search[$key])?$search[$key]:'').'">';
 		}
 		print '</td>';
 	}
@@ -477,7 +478,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 (!empty($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,6 +491,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)) {
@@ -537,7 +539,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 0f13770d3b3..23e93aba785 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -345,11 +345,11 @@ $sql .= ' p.desiredstock, p.seuil_stock_alerte,';
 if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
 	$sql .= ' pse.desiredstock as desiredstockpse, pse.seuil_stock_alerte as seuil_stock_alertepse,';
 }
-$sql .= ' '.$sqldesiredtock.' as desiredstockcombined, '.$sqlalertstock.' as seuil_stock_alertecombined,';
+$sql .= " ".$sqldesiredtock." as desiredstockcombined, ".$sqlalertstock." as seuil_stock_alertecombined,";
 $sql .= ' s.fk_product,';
-$sql .= ' SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").') as stock_physique';
+$sql .= " SUM(".$db->ifsql("s.reel IS NULL", "0", "s.reel").') as stock_physique';
 if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
-	$sql .= ', SUM('.$db->ifsql("s.reel IS NULL OR s.fk_entrepot <> ".$fk_entrepot, "0", "s.reel").') as stock_real_warehouse';
+	$sql .= ", SUM(".$db->ifsql("s.reel IS NULL OR s.fk_entrepot <> ".$fk_entrepot, "0", "s.reel").') as stock_real_warehouse';
 }
 
 // Add fields from hooks
@@ -480,45 +480,45 @@ if ($usevirtualstock) {
 	}
 
 	$sql .= ' HAVING (';
-	$sql .= ' ('.$sqldesiredtock.' >= 0 AND ('.$sqldesiredtock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
-	$sql .= ' - ('.$sqlCommandesCli.' - '.$sqlExpeditionsCli.') + ('.$sqlCommandesFourn.' - '.$sqlReceptionFourn.') + ('.$sqlProductionToProduce.' - '.$sqlProductionToConsume.')))';
+	$sql .= " (".$sqldesiredtock." >= 0 AND (".$sqldesiredtock." > SUM(".$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
+	$sql .= " - (".$sqlCommandesCli." - ".$sqlExpeditionsCli.") + (".$sqlCommandesFourn." - ".$sqlReceptionFourn.") + (".$sqlProductionToProduce." - ".$sqlProductionToConsume.")))";
 	$sql .= ' OR';
 	if ($includeproductswithoutdesiredqty == 'on') {
-		$sql .= ' (('.$sqlalertstock.' >= 0 OR '.$sqlalertstock.' IS NULL) AND ('.$db->ifsql("$sqlalertstock IS NULL", "0", $sqlalertstock).' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
+		$sql .= " ((".$sqlalertstock." >= 0 OR ".$sqlalertstock." IS NULL) AND (".$db->ifsql($sqlalertstock." IS NULL", "0", $sqlalertstock)." > SUM(".$db->ifsql("s.reel IS NULL", "0", "s.reel").")";
 	} else {
-		$sql .= ' ('.$sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
+		$sql .= " (".$sqlalertstock." >= 0 AND (".$sqlalertstock." > SUM(".$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
 	}
-	$sql .= ' - ('.$sqlCommandesCli.' - '.$sqlExpeditionsCli.') + ('.$sqlCommandesFourn.' - '.$sqlReceptionFourn.') + ('.$sqlProductionToProduce.' - '.$sqlProductionToConsume.')))';
-	$sql .= ')';
+	$sql .= " - (".$sqlCommandesCli." - ".$sqlExpeditionsCli.") + (".$sqlCommandesFourn." - ".$sqlReceptionFourn.") + (".$sqlProductionToProduce." - ".$sqlProductionToConsume.")))";
+	$sql .= ")";
 
 	if ($salert == 'on') {	// Option to see when stock is lower than alert
 		$sql .= ' AND (';
 		if ($includeproductswithoutdesiredqty == 'on') {
-			$sql .= '('.$sqlalertstock.' >= 0 OR '.$sqlalertstock.' IS NULL) AND ('.$db->ifsql("$sqlalertstock IS NULL", "0", $sqlalertstock).' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
+			$sql .= "(".$sqlalertstock." >= 0 OR ".$sqlalertstock." IS NULL) AND (".$db->ifsql($sqlalertstock." IS NULL", "0", $sqlalertstock)." > SUM(".$db->ifsql("s.reel IS NULL", "0", "s.reel").")";
 		} else {
-			$sql .= $sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
+			$sql .= $sqlalertstock." >= 0 AND (".$sqlalertstock." > SUM(".$db->ifsql("s.reel IS NULL", "0", "s.reel").")";
 		}
-		$sql .= ' - ('.$sqlCommandesCli.' - '.$sqlExpeditionsCli.') + ('.$sqlCommandesFourn.' - '.$sqlReceptionFourn.')  + ('.$sqlProductionToProduce.' - '.$sqlProductionToConsume.'))';
-		$sql .= ')';
+		$sql .= " - (".$sqlCommandesCli." - ".$sqlExpeditionsCli.") + (".$sqlCommandesFourn." - ".$sqlReceptionFourn.")  + (".$sqlProductionToProduce." - ".$sqlProductionToConsume."))";
+		$sql .= ")";
 		$alertchecked = 'checked';
 	}
 } else {
 	$sql .= ' HAVING (';
-	$sql .= '('.$sqldesiredtock.' >= 0 AND ('.$sqldesiredtock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
+	$sql .= "(".$sqldesiredtock." >= 0 AND (".$sqldesiredtock." > SUM(".$db->ifsql("s.reel IS NULL", "0", "s.reel").")))";
 	$sql .= ' OR';
 	if ($includeproductswithoutdesiredqty == 'on') {
-		$sql .= ' (('.$sqlalertstock.' >= 0 OR '.$sqlalertstock.' IS NULL) AND ('.$db->ifsql("$sqlalertstock IS NULL", "0", $sqlalertstock).' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
+		$sql .= " ((".$sqlalertstock." >= 0 OR ".$sqlalertstock." IS NULL) AND (".$db->ifsql($sqlalertstock." IS NULL", "0", $sqlalertstock)." > SUM(".$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
 	} else {
-		$sql .= ' ('.$sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
+		$sql .= " (".$sqlalertstock." >= 0 AND (".$sqlalertstock." > SUM(".$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
 	}
 	$sql .= ')';
 
 	if ($salert == 'on') {	// Option to see when stock is lower than alert
-		$sql .= ' AND (';
+		$sql .= " AND (";
 		if ($includeproductswithoutdesiredqty == 'on') {
-			$sql .= ' ('.$sqlalertstock.' >= 0 OR '.$sqlalertstock.' IS NULL) AND ('.$db->ifsql("$sqlalertstock IS NULL", "0", $sqlalertstock).' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").'))';
+			$sql .= " (".$sqlalertstock." >= 0 OR ".$sqlalertstock." IS NULL) AND (".$db->ifsql($sqlalertstock." IS NULL", "0", $sqlalertstock)." > SUM(".$db->ifsql("s.reel IS NULL", "0", "s.reel")."))";
 		} else {
-			$sql .= ' '.$sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").'))';
+			$sql .= " ".$sqlalertstock." >= 0 AND (".$sqlalertstock." > SUM(".$db->ifsql("s.reel IS NULL", "0", "s.reel").'))';
 		}
 		$sql .= ')';
 		$alertchecked = 'checked';
@@ -623,7 +623,7 @@ if (empty($reshook)) {
 }
 
 print '<div class="inline-block valignmiddle">';
-print '<input class="button" type="submit" name="valid" value="'.$langs->trans('ToFilter').'">';
+print '<input type="submit" class="button small" name="valid" value="'.$langs->trans('ToFilter').'">';
 print '</div>';
 
 print '</form>';
@@ -789,7 +789,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$objp = $db->fetch_object($resql);
 
 	if (!empty($conf->global->STOCK_SUPPORTS_SERVICES) || $objp->fk_product_type == 0) {
-		$prod->fetch($objp->rowid);
+		$result = $prod->fetch($objp->rowid);
+		if ($result < 0) {
+			dol_print_error($db);
+			exit;
+		}
+
 		$prod->load_stock('warehouseopen, warehouseinternal'.(!$usevirtualstock?', novirtual':''), $draftchecked);
 
 		// Multilangs
@@ -797,7 +802,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$sql = 'SELECT label,description';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'product_lang';
 			$sql .= ' WHERE fk_product = '.((int) $objp->rowid);
-			$sql .= ' AND lang = "'.$langs->getDefaultLang().'"';
+			$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
 			$sql .= ' LIMIT 1';
 
 			$resqlm = $db->query($sql);
@@ -953,7 +958,7 @@ print dol_get_fiche_end();
 
 
 $value = $langs->trans("CreateOrders");
-print '<div class="center"><input class="button" type="submit" name="valid" value="'.$value.'"></div>';
+print '<div class="center"><input type="submit" class="button" name="valid" value="'.$value.'"></div>';
 
 
 print '</form>';
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 6eacc788982..1eba8556753 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -37,11 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'stocks', 'orders'));
 
-// Security check
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'produit|service');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'replenishorders'; // To manage different context of search
 
 $sall = GETPOST('search_all', 'alphanohtml');
 $sref = GETPOST('search_ref', 'alpha');
@@ -56,8 +52,8 @@ $search_dateday = GETPOST('search_dateday', 'int');
 $search_date = dol_mktime(0, 0, 0, $search_datemonth, $search_dateday, $search_dateyear);
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 if (!$sortorder) {
 	$sortorder = 'DESC';
 }
@@ -70,6 +66,12 @@ if ($page < 0) {
 }
 $offset = $limit * $page;
 
+// Security check
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'produit|service');
+
 
 /*
  * Actions
@@ -122,7 +124,7 @@ $sql .= ' cf.rowid, cf.ref, cf.fk_statut, cf.total_ttc, cf.fk_user_author,';
 $sql .= ' u.login';
 $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'commande_fournisseur as cf';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON cf.fk_user_author = u.rowid';
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ', '.MAIN_DB_PREFIX.'societe_commerciaux as sc';
 }
 $sql .= ' WHERE cf.fk_soc = s.rowid ';
@@ -134,8 +136,8 @@ if ($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) {
 } else {
 	$sql .= ' AND cf.fk_statut < 5';
 }
-if (!$user->rights->societe->client->voir && !$socid) {
-	$sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.$user->id;
+if (empty($user->rights->societe->client->voir) && !$socid) {
+	$sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.((int) $user->id);
 }
 if ($sref) {
 	$sql .= natural_search('cf.ref', $sref);
@@ -171,9 +173,10 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-	print '<span class="opacitymedium">'.$langs->trans("ReplenishmentOrdersDesc").'</span><br><br>';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
+	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ReplenishmentOrdersDesc").'</span><br class="hideonsmartphone">';
 
 	print_barre_liste('', $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num, 0, '');
 
@@ -209,6 +212,7 @@ if ($resql) {
 		$param .= '&optioncss='.urlencode($optioncss);
 	}
 
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 
 	print '<tr class="liste_titre_filter">';
@@ -347,6 +351,8 @@ if ($resql) {
 		$i++;
 	}
 	print '</table>';
+	print '</div>';
+
 	print '</form>';
 
 	$db->free($resql);
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 4892004db72..ffcf5dd2f00 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -188,7 +188,7 @@ if ($date && $dateIsValid) {
 	if ($mode == 'future') {
 		$sql .= " AND sm.datem <= '".$db->idate($dateendofday)."'";
 	} else {
-		$sql .= " AND sm.datem >= '".$db->idate($date)."'";
+		$sql .= " AND sm.datem >= '".$db->idate($dateendofday)."'";
 	}
 	if ($productid > 0) {
 		$sql .= " AND sm.fk_product = ".((int) $productid);
@@ -272,7 +272,7 @@ if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 	$sql .= " AND p.fk_product_type = 0";
 }
 if (!empty($canvas)) {
-	$sql .= ' AND p.canvas = "'.$db->escape($canvas).'"';
+	$sql .= " AND p.canvas = '".$db->escape($canvas)."'";
 }
 if ($fk_warehouse > 0) {
 	$sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price, p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,';
@@ -373,7 +373,7 @@ if (empty($reshook)) {
 }
 
 print '<div class="inline-block valignmiddle">';
-print '<input class="button" type="submit" name="valid" value="'.$langs->trans('Refresh').'">';
+print '<input type="submit" class="button" name="valid" value="'.$langs->trans('Refresh').'">';
 print '</div>';
 
 //print '</form>';
@@ -475,6 +475,8 @@ print $hookmanager->resPrint;
 
 print "</tr>\n";
 
+$totalbuyingprice = 0;
+
 $i = 0;
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$objp = $db->fetch_object($resql);
@@ -488,7 +490,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$sql = 'SELECT label,description';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'product_lang';
 			$sql .= ' WHERE fk_product = '.((int) $objp->rowid);
-			$sql .= ' AND lang = "'.$langs->getDefaultLang().'"';
+			$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
 			$sql .= ' LIMIT 1';
 
 			$resqlm = $db->query($sql);
@@ -567,6 +569,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			} else {
 				print '';
 			}
+			$totalbuyingprice += $objp->estimatedvalue;
 			print '</td>';
 
 			// Selling value
@@ -598,7 +601,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
-		print '</tr>';
+		print '</tr>'."\n";
 	}
 	$i++;
 }
@@ -607,11 +610,15 @@ $parameters = array('sql'=>$sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
-if (empty($date) || ! $dateIsValid) {
-	$colspan = 8;
-	if ($mode == 'future') {
-		$colspan++;
-	}
+$colspan = 8;
+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>';
 }
 
diff --git a/htdocs/product/stock/tpl/extrafields_add.tpl.php b/htdocs/product/stock/tpl/extrafields_add.tpl.php
new file mode 100644
index 00000000000..62921f0a6e0
--- /dev/null
+++ b/htdocs/product/stock/tpl/extrafields_add.tpl.php
@@ -0,0 +1,51 @@
+<?php
+/* Copyright (C) 2014	Maxime Kohlhaas		<support@atm-consulting.fr>
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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, ...)
+ * $action
+ * $conf
+ * $langs
+ *
+ * $parameters
+ * $cols
+ */
+
+// Protection to avoid direct call of template
+if (empty($conf) || !is_object($conf)) {
+	print "Error, template page can't be called as URL";
+	exit;
+}
+
+?>
+<!-- BEGIN PHP TEMPLATE extrafields_add.tpl.php -->
+<?php
+
+// Other attributes
+if (!isset($parameters)) $parameters = array();
+
+$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $movement, $action); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (empty($reshook)) {
+	$params = array();
+	if (isset($tpl_context)) $params['tpl_context'] = $tpl_context;
+	$params['cols'] = $parameters['colspanvalue'];
+	print $movement->showOptionals($extrafields, 'create', $params);
+}
+
+?>
+<!-- END PHP TEMPLATE extrafields_add.tpl.php -->
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index e4dfd8b5d7c..eb84df7d14e 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -41,7 +41,7 @@ if (empty($id)) {
 	$id = $object->id;
 }
 
-print '<script type="text/javascript" language="javascript">
+print '<script type="text/javascript">
 		jQuery(document).ready(function() {
 			function init_price()
 			{
@@ -50,8 +50,25 @@ print '<script type="text/javascript" language="javascript">
 			}
 			init_price();
 			jQuery("#mouvement").change(function() {
+				console.log("We change the direction of movement");
 				init_price();
 			});
+			jQuery("#nbpiece").keyup(function(event) {
+				console.log("We enter a qty on "+event.which);
+				if ( event.which == 54 ) {  /* char - */
+					console.log("We set direction to value 1");
+					jQuery("#nbpiece").val(jQuery("#nbpiece").val().replace("-", ""));
+
+					jQuery("#mouvement option").removeAttr("selected").change();
+					jQuery("#mouvement option[value=1]").attr("selected","selected").trigger("change");
+					jQuery("#mouvement").trigger("change");
+				} else if ( event.which == 187 ) {  /* char + */
+					console.log("We set direction to value 0");
+					jQuery("#mouvement option").removeAttr("selected").change();
+					jQuery("#mouvement option[value=0]").attr("selected","selected").trigger("change");
+					jQuery("#mouvement").trigger("change");
+				}
+			});
 		});
 		</script>';
 
@@ -77,10 +94,6 @@ if ($object->element == 'product') {
 		$ident = $conf->global->MAIN_DEFAULT_WAREHOUSE;
 	}
 	print img_picto('', 'stock').$formproduct->selectWarehouses($ident, 'id_entrepot', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'minwidth100');
-	print ' &nbsp; <select class="button buttongen" name="mouvement" id="mouvement">';
-	print '<option value="0">'.$langs->trans("Add").'</option>';
-	print '<option value="1"'.(GETPOST('mouvement') ? ' selected="selected"' : '').'>'.$langs->trans("Delete").'</option>';
-	print '</select>';
 	print '</td>';
 }
 if ($object->element == 'stock') {
@@ -88,14 +101,19 @@ if ($object->element == 'stock') {
 	print '<td>';
 	print img_picto('', 'product');
 	$form->select_produits(GETPOST('product_id', 'int'), 'product_id', (empty($conf->global->STOCK_SUPPORTS_SERVICES) ? '0' : ''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500');
-	print ' &nbsp; <select class="button buttongen" name="mouvement" id="mouvement">';
-	print '<option value="0">'.$langs->trans("Add").'</option>';
-	print '<option value="1"'.(GETPOST('mouvement') ? ' selected="selected"' : '').'>'.$langs->trans("Delete").'</option>';
-	print '</select>';
 	print '</td>';
 }
 print '<td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td>';
-print '<td><input name="nbpiece" id="nbpiece" class="maxwidth75" value="'.GETPOST("nbpiece").'"></td>';
+print '<td>';
+if ($object->element == 'product' || $object->element == 'stock') {
+	print '<select name="mouvement" id="mouvement" class="minwidth100 valignmiddle">';
+	print '<option value="0">'.$langs->trans("Add").'</option>';
+	print '<option value="1"'.(GETPOST('mouvement') ? ' selected="selected"' : '').'>'.$langs->trans("Delete").'</option>';
+	print '</select>';
+	print ajax_combobox("mouvement");
+}
+print '<input name="nbpiece" id="nbpiece" class="center valignmiddle maxwidth75" value="'.GETPOST("nbpiece").'">';
+print '</td>';
 print '</tr>';
 
 // If product is a Kit, we ask if we must disable stock change of subproducts
@@ -161,6 +179,9 @@ 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 31a3103c3eb..ccedf993221 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -89,7 +89,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 '</td></tr>';
-print '<tr><td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td><td colspan="3"><input type="text" name="nbpiece" size="10" value="'.dol_escape_htmltag(GETPOST("nbpiece")).'"></td>';
+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>';
 
 // Serial / Eat-by date
@@ -136,6 +136,9 @@ 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/valo.php b/htdocs/product/stock/valo.php
index 7f7f9610d1f..926b0c01634 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -36,8 +36,8 @@ $sref = GETPOST("sref", 'alpha');
 $snom = GETPOST("snom", 'alpha');
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 if (!$sortfield) {
 	$sortfield = "e.ref";
 }
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index cff6ee0dd09..65906a0cc0f 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -282,11 +282,7 @@ if ($action == 'edit') {
 
 	print '<br>';
 
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 } elseif ($action != 'add') {
@@ -356,11 +352,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
 
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index bdce4353faf..453a4078978 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -159,7 +159,7 @@ print "</table>";
 print '</div>';
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 /* Affichage de la liste des projets d'hier */
@@ -557,7 +557,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 }
 
 
-print '</div></div></div>';
+print '</div></div>';
 
 $parameters = array('user' => $user);
 $reshook = $hookmanager->executeHooks('dashboardActivities', $parameters, $object); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 8897f9550a3..b743dffbc53 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -77,6 +77,9 @@ $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_thirdparty = GETPOST('search_thirdparty', 'alpha');
 $search_declared_progress = GETPOST('search_declared_progress', 'alpha');
 
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+
 $monthofday = GETPOST('addtimemonth');
 $dayofday = GETPOST('addtimeday');
 $yearofday = GETPOST('addtimeyear');
@@ -127,7 +130,7 @@ $arrayfields['timeconsumed'] = array('label'=>'TimeConsumed', 'checked'=>1, 'ena
  );
  */
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
+if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
 			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs((int) $extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
@@ -310,7 +313,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 
 			// Redirect to avoid submit twice on back
-			header('Location: '.$_SERVER["PHP_SELF"].'?'.($projectid ? 'id='.$projectid : '').($search_usertoprocessid ? '&search_usertoprocessid='.$search_usertoprocessid : '').($mode ? '&mode='.$mode : '').'&year='.$yearofday.'&month='.$monthofday.'&day='.$dayofday);
+			header('Location: '.$_SERVER["PHP_SELF"].'?'.($projectid ? 'id='.$projectid : '').($search_usertoprocessid ? '&search_usertoprocessid='.urlencode($search_usertoprocessid) : '').($mode ? '&mode='.$mode : '').'&year='.$yearofday.'&month='.$monthofday.'&day='.$dayofday);
 			exit;
 		}
 	} else {
@@ -605,13 +608,15 @@ 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>'.$usertoprocess->getNomUrl(-2).'<span class="opacitymedium paddingleft">'.dol_trunc($usertoprocess->firstname, 10).'</span>' : '').'</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="center leftborder">'.$langs->trans("HourStart").'</td>';
 
 // By default, we can edit only tasks we are assigned to
 $restrictviewformytask = ((!isset($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED)) ? 2 : $conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED);
 
+$numendworkingday = 0;
+$numstartworkingday = 0;
 // Get if user is available or not for each day
 $isavailable = array();
 if (!empty($conf->global->MAIN_DEFAULT_WORKING_DAYS)) {
@@ -776,7 +781,7 @@ print '</div>';
 print '<input type="hidden" id="numberOfLines" name="numberOfLines" value="'.count($tasksarray).'"/>'."\n";
 
 print '<div class="center">';
-print '<input type="submit" name="button_addtime" class="button button-save"'.($disabledtask ? ' disabled' : '').' value="'.$langs->trans("Save").'">';
+print '<input type="submit" name="button_addtime" class="button button-save"'.(!empty($disabledtask) ? ' disabled' : '').' value="'.$langs->trans("Save").'">';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 6e474ea8568..8238d112b7b 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -334,12 +334,12 @@ llxHeader("", $title, "", '', '', '', array('/core/js/timesheet.js'));
 //print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num, '', 'title_project');
 
 $param = '';
-$param .= ($mode ? '&mode='.$mode : '');
-$param .= ($search_project_ref ? '&search_project_ref='.$search_project_ref : '');
-$param .= ($search_usertoprocessid > 0 ? '&search_usertoprocessid='.$search_usertoprocessid : '');
-$param .= ($search_thirdparty ? '&search_thirdparty='.$search_thirdparty : '');
-$param .= ($search_task_ref ? '&search_task_ref='.$search_task_ref : '');
-$param .= ($search_task_label ? '&search_task_label='.$search_task_label : '');
+$param .= ($mode ? '&mode='.urlencode($mode) : '');
+$param .= ($search_project_ref ? '&search_project_ref='.urlencode($search_project_ref) : '');
+$param .= ($search_usertoprocessid > 0 ? '&search_usertoprocessid='.urlencode($search_usertoprocessid) : '');
+$param .= ($search_thirdparty ? '&search_thirdparty='.urlencode($search_thirdparty) : '');
+$param .= ($search_task_ref ? '&search_task_ref='.urlencode($search_task_ref) : '');
+$param .= ($search_task_label ? '&search_task_label='.urlencode($search_task_label) : '');
 
 // 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";
@@ -491,7 +491,7 @@ print '<span class="opacitymedium nopadding userimg"><img alt="Photo" class="pho
 print '<span class="opacitymedium paddingleft">'.$langs->trans("Everybody").'</span>';
 print '</span>';
 print '</td>';
-print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br>'.$usertoprocess->getNomUrl(-2).'<span class="opacitymedium paddingleft">'.dol_trunc($usertoprocess->firstname, 10).'</span>' : '').'</td>';
+print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br><span class="nowraponall">'.$usertoprocess->getNomUrl(-2).'<span class="opacitymedium paddingleft">'.dol_trunc($usertoprocess->firstname, 10).'</span></span>' : '').'</td>';
 
 foreach ($TWeek as $week_number) {
 	print '<td width="6%" align="center" class="bold hide">'.$langs->trans("Week").' '.$week_number.'<br>('.$TFirstDays[$week_number].'...'.$TLastDays[$week_number].')</td>';
@@ -596,9 +596,7 @@ print '</div>';
 print '<input type="hidden" id="numberOfLines" name="numberOfLines" value="'.count($tasksarray).'"/>'."\n";
 print '<input type="hidden" id="numberOfFirstLine" name="numberOfFirstLine" value="'.(reset($TWeek)).'"/>'."\n";
 
-print '<div class="center">';
-print '<input type="submit" class="button button-save" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
-print '</div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>'."\n\n";
 
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 2a27294bfed..763ecefe650 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -77,6 +77,9 @@ $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_thirdparty = GETPOST('search_thirdparty', 'alpha');
 $search_declared_progress = GETPOST('search_declared_progress', 'alpha');
 
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+
 $startdayarray = dol_get_first_day_week($day, $month, $year);
 
 $prev = $startdayarray;
@@ -135,7 +138,7 @@ $arrayfields['timeconsumed'] = array('label'=>'TimeConsumed', 'checked'=>1, 'ena
  }*/
 // Definition of fields for list
 // Extra fields
-if (is_array($extrafields->attributes['projet_task']['label']) && count($extrafields->attributes['projet_task']['label']) > 0) {
+if (!empty($extrafields->attributes['projet_task']['label']) && is_array($extrafields->attributes['projet_task']['label']) && count($extrafields->attributes['projet_task']['label']) > 0) {
 	foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) {
 		if (!empty($extrafields->attributes['projet_task']['list'][$key])) {
 			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes['projet_task']['label'][$key], 'checked'=>(($extrafields->attributes['projet_task']['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes['projet_task']['pos'][$key], 'enabled'=>(abs((int) $extrafields->attributes['projet_task']['list'][$key]) != 3 && $extrafields->attributes['projet_task']['perms'][$key]));
@@ -501,6 +504,8 @@ print '<div class="clearboth" style="padding-bottom: 20px;"></div>';
 
 $startday = dol_mktime(12, 0, 0, $startdayarray['first_month'], $startdayarray['first_day'], $startdayarray['first_year']);
 
+$numendworkingday = 0;
+$numstartworkingday = 0;
 // Get if user is available or not for each day
 $isavailable = array();
 if (!empty($conf->global->MAIN_DEFAULT_WORKING_DAYS)) {
@@ -659,7 +664,7 @@ 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>'.$usertoprocess->getNomUrl(-2).'<span class="opacitymedium paddingleft">'.dol_trunc($usertoprocess->firstname, 10).'</span>' : '').'</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>';
 }
 for ($idw = 0; $idw < 7; $idw++) {
 	$dayinloopfromfirstdaytoshow = dol_time_plus_duree($firstdaytoshow, $idw, 'd'); // $firstdaytoshow is a date with hours = 0
@@ -851,9 +856,7 @@ print '</div>';
 
 print '<input type="hidden" id="numberOfLines" name="numberOfLines" value="'.count($tasksarray).'"/>'."\n";
 
-print '<div class="center">';
-print '<input type="submit" class="button button-save" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
-print '</div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>'."\n\n";
 
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 288e2282a40..adef0826992 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -219,6 +219,10 @@ if ($action == 'updateMaskTask') {
 		$projectToSelect = GETPOST('projectToSelect', 'alpha');
 		dolibarr_set_const($db, 'PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY', $projectToSelect, 'chaine', 0, '', $conf->entity); //Allow to disable this configuration if empty value
 	}
+	if (GETPOST('PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS')) {
+		$timesheetFreezeDuration = GETPOST('timesheetFreezeDuration', 'alpha');
+		dolibarr_set_const($db, 'PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS', intval($timesheetFreezeDuration), 'chaine', 0, '', $conf->entity); //Allow to disable this configuration if empty value
+	}
 } elseif (preg_match('/^(set|del)_?([A-Z_]+)$/', $action, $reg)) {
 	// Set boolean (on/off) constants
 	if (!dolibarr_set_const($db, $reg[2], ($reg[1] === 'set' ? '1' : '0'), 'chaine', 0, '', $conf->entity) > 0) {
@@ -343,7 +347,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->PROJECT_ADDON == 'mod_'.$classname) {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
 
@@ -439,7 +443,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 							if ($conf->global->PROJECT_TASK_ADDON == 'mod_'.$classname) {
 								print img_picto($langs->trans("Activated"), 'switch_on');
 							} else {
-								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodtask&amp;token='.newToken().'&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodtask&token='.newToken().'&value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							}
 							print '</td>';
 
@@ -560,13 +564,13 @@ foreach ($dirmodels as $reldir) {
 								// Active
 								if (in_array($name, $def)) {
 									print "<td class=\"center\">\n";
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">';
 									print img_picto($langs->trans("Enabled"), 'switch_on');
 									print '</a>';
 									print "</td>";
 								} else {
 									print "<td class=\"center\">\n";
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<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>";
 								}
 
@@ -575,7 +579,7 @@ foreach ($dirmodels as $reldir) {
 								if ($conf->global->PROJECT_ADDON_PDF == "$name") {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<a 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>';
 								}
 								print '</td>';
 
@@ -700,13 +704,13 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 									// Active
 									if (in_array($name, $def)) {
 										print "<td class=\"center\">\n";
-										print '<a href="'.$_SERVER["PHP_SELF"].'?action=deltask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+										print '<a href="'.$_SERVER["PHP_SELF"].'?action=deltask&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">';
 										print img_picto($langs->trans("Enabled"), 'switch_on');
 										print '</a>';
 										print "</td>";
 									} else {
 										print "<td class=\"center\">\n";
-										print '<a href="'.$_SERVER["PHP_SELF"].'?action=settask&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+										print '<a href="'.$_SERVER["PHP_SELF"].'?action=settask&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 										print "</td>";
 									}
 
@@ -715,7 +719,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 									if ($conf->global->PROJECT_TASK_ADDON_PDF == "$name") {
 										print img_picto($langs->trans("Default"), 'on');
 									} else {
-										print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoctask&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+										print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoctask&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>';
 									}
 									print '</td>';
 
@@ -797,6 +801,7 @@ print '<input type="text" id="projectToSelect" name="projectToSelect" value="'.$
 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 '</td>';
+print '</tr>';
 
 $key = 'PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE';
 echo '<tr class="oddeven">',
@@ -808,6 +813,14 @@ echo '<tr class="oddeven">',
 		'</td>',
 	'</tr>';
 
+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 '</td>';
+print '</tr>';
 print '</table>';
 
 
diff --git a/htdocs/projet/admin/website.php b/htdocs/projet/admin/website.php
index 04acbaa44aa..1af6b72c196 100644
--- a/htdocs/projet/admin/website.php
+++ b/htdocs/projet/admin/website.php
@@ -134,7 +134,7 @@ if (!empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
 	print '</table>';
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 	print '</div>';
 }
 */
@@ -159,7 +159,7 @@ 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" href="'.$urlwithroot.'/public/project/new.php'.$entity_qr.'">'.$urlwithroot.'/public/project/new.php'.$entity_qr.'</a>';
+	print '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/project/new.php'.$entity_qr.'">'.$urlwithroot.'/public/project/new.php'.$entity_qr.'</a>';
 }
 
 // End of page
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 89bdb013a32..6f587a67a7f 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -103,6 +103,8 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/projet/list.php';
+
 	// Cancel
 	if ($cancel) {
 		if (GETPOST("comefromclone") == 1) {
@@ -115,11 +117,26 @@ if (empty($reshook)) {
 				setEventMessages($langs->trans("CantRemoveProject", $langs->transnoentitiesnoconv("ProjectOverview")), null, 'errors');
 			}
 		}
-		if ($backtopage) {
+	}
+
+	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.'/projet/card.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 = '';
 	}
 
@@ -207,7 +224,7 @@ if (empty($reshook)) {
 				$db->commit();
 
 				if (!empty($backtopage)) {
-					$backtopage = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
+					$backtopage = preg_replace('/--IDFORBACKTOPAGE--|__ID__/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
 					$backtopage = $backtopage.'&projectid='.$object->id; // Old method
 					header("Location: ".$backtopage);
 					exit;
@@ -451,9 +468,9 @@ $formfile = new FormFile($db);
 $formproject = new FormProjets($db);
 $userstatic = new User($db);
 
-$title = $langs->trans("Project").' - '.$object->ref.($object->thirdparty->name ? ' - '.$object->thirdparty->name : '').($object->title ? ' - '.$object->title : '');
+$title = $langs->trans("Project").' - '.$object->ref.(!empty($object->thirdparty->name) ? ' - '.$object->thirdparty->name : '').(!empty($object->title) ? ' - '.$object->title : '');
 if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE)) {
-	$title = $object->ref.($object->thirdparty->name ? ' - '.$object->thirdparty->name : '').($object->title ? ' - '.$object->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";
 
@@ -519,12 +536,12 @@ if ($action == 'create' && $user->rights->projet->creer) {
 
 	// Ref
 	$suggestedref = (GETPOST("ref") ? GETPOST("ref") : $defaultref);
-	print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td><input size="12" type="text" name="ref" value="'.dol_escape_htmltag($suggestedref).'">';
+	print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td class><input class="maxwidth150onsmartphone" type="text" name="ref" value="'.dol_escape_htmltag($suggestedref).'">';
 	print ' '.$form->textwithpicto('', $langs->trans("YouCanCompleteRef", $suggestedref));
 	print '</td></tr>';
 
 	// Label
-	print '<tr><td><span class="fieldrequired">'.$langs->trans("ProjectLabel").'</span></td><td><input class="minwidth500" type="text" name="title" value="'.dol_escape_htmltag(GETPOST("title", 'alphanohtml')).'" autofocus></td></tr>';
+	print '<tr><td><span class="fieldrequired">'.$langs->trans("ProjectLabel").'</span></td><td><input class="width500 maxwidth150onsmartphone" type="text" name="title" value="'.dol_escape_htmltag(GETPOST("title", 'alphanohtml')).'" autofocus></td></tr>';
 
 	// Usage (opp, task, bill time, ...)
 	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
@@ -641,7 +658,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		// Opportunity status
 		print '<tr class="classuseopportunity"><td>'.$langs->trans("OpportunityStatus").'</td>';
 		print '<td class="maxwidthonsmartphone">';
-		print $formproject->selectOpportunityStatus('opp_status', GETPOST('opp_status') ?GETPOST('opp_status') : $object->opp_status, 1, 0, 0, 0, '', 0, 1);
+		print $formproject->selectOpportunityStatus('opp_status', GETPOSTISSET('opp_status') ? GETPOST('opp_status') : $object->opp_status, 1, 0, 0, 0, '', 0, 1);
 		print '</tr>';
 
 		// Opportunity probability
@@ -665,11 +682,11 @@ if ($action == 'create' && $user->rights->projet->creer) {
 	// Description
 	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
 	print '<td>';
-	$doleditor = new DolEditor('description', GETPOST("description", 'restricthtml'), '', 90, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
+	$doleditor = new DolEditor('description', GETPOST("description", 'restricthtml'), '', 90, 'dolibarr_notes', '', false, true, getDolGlobalString('FCKEDITOR_ENABLE_SOCIETE'), ROWS_3, '90%');
 	$doleditor->Create();
 	print '</td></tr>';
 
-	if ($conf->categorie->enabled) {
+	if (!empty($conf->categorie->enabled)) {
 		// Categories
 		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 1);
@@ -690,21 +707,12 @@ if ($action == 'create' && $user->rights->projet->creer) {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';
-	if (!empty($backtopage)) {
-		print ' &nbsp; &nbsp; ';
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	} else {
-		print ' &nbsp; &nbsp; ';
-		print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-	}
-	print '</div>';
+	print $form->buttonsSaveCancel('CreateDraft');
 
 	print '</form>';
 
 	// Change probability from status
-	print '<script type="text/javascript" language="javascript">
+	print '<script type="text/javascript">
         jQuery(document).ready(function() {
         	function change_percent()
         	{
@@ -804,7 +812,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		// Ref
 		$suggestedref = $object->ref;
 		print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Ref").'</td>';
-		print '<td><input size="12" name="ref" value="'.$suggestedref.'">';
+		print '<td><input size="25" name="ref" value="'.$suggestedref.'">';
 		print ' '.$form->textwithpicto('', $langs->trans("YouCanCompleteRef", $suggestedref));
 		print '</td></tr>';
 
@@ -998,13 +1006,13 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		$morehtmlref .= dol_escape_htmltag($object->title);
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : ';
-		if ($object->thirdparty->id > 0) {
+		if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
 			$morehtmlref .= $object->thirdparty->getNomUrl(1, 'project');
 		}
 		$morehtmlref .= '</div>';
 
 		// Define a complementary filter for search of next/prev ref.
-		if (!$user->rights->projet->all->lire) {
+		if (empty($user->rights->projet->all->lire)) {
 			$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 			$object->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 		}
@@ -1082,14 +1090,14 @@ if ($action == 'create' && $user->rights->projet->creer) {
 			   print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
 			}*/
 			if (strcmp($object->opp_amount, '')) {
-				print price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
+				print '<span class="amount">'.price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency).'</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 price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency);
+				print '<span class="amount">'.price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).'</span>';
 			}
 			print '</td></tr>';
 		}
@@ -1109,7 +1117,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		// 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>';
 
@@ -1121,10 +1129,9 @@ if ($action == 'create' && $user->rights->projet->creer) {
 
 		print '</div>';
 		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
-		print '<table class="border tableforfield" width="100%">';
+		print '<table class="border tableforfield centpercent">';
 
 		// Description
 		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
@@ -1140,7 +1147,6 @@ if ($action == 'create' && $user->rights->projet->creer) {
 
 		print '</table>';
 
-		print '</div>';
 		print '</div>';
 		print '</div>';
 
@@ -1150,10 +1156,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 	print dol_get_fiche_end();
 
 	if ($action == 'edit' && $userWrite > 0) {
-		print '<div class="center">';
-		print '<input name="update" class="button" type="submit" value="'.$langs->trans("Save").'">&nbsp; &nbsp; &nbsp;';
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
+		print $form->buttonsSaveCancel();
 	}
 
 	print '</form>';
@@ -1167,7 +1170,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		}
 
 		print '<!-- Javascript to manage opportunity status change -->';
-		print '<script type="text/javascript" language="javascript">
+		print '<script type="text/javascript">
             jQuery(document).ready(function() {
             	function change_percent()
             	{
@@ -1249,7 +1252,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 			// Modify
 			if ($object->statut != Project::STATUS_CLOSED && $user->rights->projet->creer) {
 				if ($userWrite > 0) {
-					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
+					print '<a class="butAction" href="card.php?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Modify').'</a>';
 				}
@@ -1258,7 +1261,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 			// 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">'.$langs->trans("Validate").'</a>';
+					print '<a class="butAction" href="card.php?id='.$object->id.'&action=validate&token='.newToken().'">'.$langs->trans("Validate").'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Validate').'</a>';
 				}
@@ -1276,7 +1279,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 			// Reopen
 			if ($object->statut == Project::STATUS_CLOSED && $user->rights->projet->creer) {
 				if ($userWrite > 0) {
-					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
+					print '<a class="butAction" href="card.php?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ReOpen').'</a>';
 				}
@@ -1338,7 +1341,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 			// 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.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
+					print '<a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Delete').'</a>';
 				}
@@ -1367,20 +1370,18 @@ if ($action == 'create' && $user->rights->projet->creer) {
 
 		print $formfile->showdocuments('project', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf);
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		$MAXEVENT = 10;
 
-		$morehtmlright = '<a href="'.DOL_URL_ROOT.'/projet/info.php?id='.$object->id.'">';
-		$morehtmlright .= $langs->trans("SeeAll");
-		$morehtmlright .= '</a>';
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt 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';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, 'project', 0, 1, '', $MAXEVENT, '', $morehtmlright);
+		$somethingshown = $formactions->showactions($object, 'project', 0, 1, '', $MAXEVENT, '', $morehtmlcenter);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 	// Presend form
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 38f525626ba..59576b961d4 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -150,8 +150,9 @@ class Projects extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -227,7 +228,7 @@ class Projects extends DolibarrApi
 	 * See also API /tasks
 	 *
 	 * @param int   $id                     Id of project
-	 * @param int   $includetimespent       0=Return only list of tasks. 1=Include a summary of time spent, 2=Include details of time spent lines (2 is no implemented yet)
+	 * @param int   $includetimespent       0=Return only list of tasks. 1=Include a summary of time spent, 2=Include details of time spent lines
 	 * @return int
 	 *
 	 * @url	GET {id}/tasks
@@ -252,9 +253,8 @@ class Projects extends DolibarrApi
 			if ($includetimespent == 1) {
 				$timespent = $line->getSummaryOfTimeSpent(0);
 			}
-			if ($includetimespent == 1) {
-				// TODO
-				// Add class for timespent records and loop and fill $line->lines with records of timespent
+			if ($includetimespent == 2) {
+				$timespent = $line->fetchTimeSpentOnTask();
 			}
 			array_push($result, $this->_cleanObjectDatas($line));
 		}
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index 9366422002d..cafb60f2865 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -60,7 +60,7 @@ class Tasks extends DolibarrApi
 	 * Return an array with task informations
 	 *
 	 * @param   int         $id                     ID of task
-	 * @param   int         $includetimespent       0=Return only task. 1=Include a summary of time spent, 2=Include details of time spent lines (2 is no implemented yet)
+	 * @param   int         $includetimespent       0=Return only task. 1=Include a summary of time spent, 2=Include details of time spent lines
 	 * @return 	array|mixed                         data without useless information
 	 *
 	 * @throws 	RestException
@@ -83,9 +83,8 @@ class Tasks extends DolibarrApi
 		if ($includetimespent == 1) {
 			$timespent = $this->task->getSummaryOfTimeSpent(0);
 		}
-		if ($includetimespent == 1) {
-			// TODO
-			// Add class for timespent records and loop and fill $line->lines with records of timespent
+		if ($includetimespent == 2) {
+			$timespent = $this->task->fetchTimeSpentOnTask();
 		}
 
 		return $this->_cleanObjectDatas($this->task);
@@ -150,8 +149,9 @@ class Tasks extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index b127d3aa686..f531d221aff 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -381,10 +381,10 @@ class Project extends CommonObject
 		$sql .= ", '".$this->db->escape($this->title)."'";
 		$sql .= ", '".$this->db->escape($this->description)."'";
 		$sql .= ", ".($this->socid > 0 ? $this->socid : "null");
-		$sql .= ", ".$user->id;
-		$sql .= ", ".(is_numeric($this->statut) ? $this->statut : '0');
-		$sql .= ", ".((is_numeric($this->opp_status) && $this->opp_status > 0) ? $this->opp_status : 'NULL');
-		$sql .= ", ".(is_numeric($this->opp_percent) ? $this->opp_percent : 'NULL');
+		$sql .= ", ".((int) $user->id);
+		$sql .= ", ".(is_numeric($this->statut) ? ((int) $this->statut) : '0');
+		$sql .= ", ".((is_numeric($this->opp_status) && $this->opp_status > 0) ? ((int) $this->opp_status) : 'NULL');
+		$sql .= ", ".(is_numeric($this->opp_percent) ? ((int) $this->opp_percent) : 'NULL');
 		$sql .= ", ".($this->public ? 1 : 0);
 		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ", ".($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null');
@@ -402,7 +402,7 @@ class Project extends CommonObject
 		$sql .= ", ".($this->email_msgid ? "'".$this->db->escape($this->email_msgid)."'" : 'null');
 		$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : 'null');
 		$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : 'null');
-		$sql .= ", ".$conf->entity;
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -706,9 +706,9 @@ class Project extends CommonObject
 		} elseif ($type == 'project_task_time') {	// Case we want to duplicate line foreach user
 			$sql = "SELECT DISTINCT pt.rowid, ptt.fk_user FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet IN (".$this->db->sanitize($ids).")";
 		} elseif ($type == 'stock_mouvement') {
-			$sql = 'SELECT ms.rowid, ms.fk_user_author as fk_user FROM '.MAIN_DB_PREFIX."stock_mouvement as ms, ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = ms.fk_entrepot AND e.entity IN (".getEntity('stock').") AND ms.origintype = 'project' AND ms.fk_origin IN (".$this->db->sanitize($ids).") AND ms.type_mouvement = 1";
+			$sql = "SELECT ms.rowid, ms.fk_user_author as fk_user FROM ".MAIN_DB_PREFIX."stock_mouvement as ms, ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = ms.fk_entrepot AND e.entity IN (".getEntity('stock').") AND ms.origintype = 'project' AND ms.fk_origin IN (".$this->db->sanitize($ids).") AND ms.type_mouvement = 1";
 		} elseif ($type == 'loan') {
-			$sql = 'SELECT l.rowid, l.fk_user_author as fk_user FROM '.MAIN_DB_PREFIX."loan as l WHERE l.entity IN (".getEntity('loan').") AND l.fk_projet IN (".$this->db->sanitize($ids).")";
+			$sql = "SELECT l.rowid, l.fk_user_author as fk_user FROM ".MAIN_DB_PREFIX."loan as l WHERE l.entity IN (".getEntity('loan').") AND l.fk_projet IN (".$this->db->sanitize($ids).")";
 		} else {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$tablename." WHERE ".$projectkey." IN (".$this->db->sanitize($ids).") AND entity IN (".getEntity($type).")";
 		}
@@ -744,9 +744,10 @@ class Project extends CommonObject
 			'datefieldname'  => $datefieldname,
 			'dates' => $dates,
 			'datee' => $datee,
-			'fk_projet' => $projectkey
+			'fk_projet' => $projectkey,
+			'ids' => $ids,
 		);
-		$reshook = $hookmanager->executeHooks('getElementList', $parameters, $object, $action);
+		$reshook = $hookmanager->executeHooks('getElementList', $parameters);
 		if ($reshook > 0) {
 			$sql = $hookmanager->resPrint;
 		} else {
@@ -866,7 +867,7 @@ class Project extends CommonObject
 
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_extrafields";
-			$sql .= " WHERE fk_object=".$this->id;
+			$sql .= " WHERE fk_object = ".((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
@@ -943,7 +944,7 @@ class Project extends CommonObject
 		}
 
 		if ($type == 'agenda') {
-			$sql = "SELECT COUNT(id) as nb FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_project = ".$this->id." AND entity IN (".getEntity('agenda').")";
+			$sql = "SELECT COUNT(id) as nb FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_project = ".((int) $this->id)." AND entity IN (".getEntity('agenda').")";
 		} elseif ($type == 'expensereport') {
 			$sql = "SELECT COUNT(ed.rowid) as nb FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND e.entity IN (".getEntity('expensereport').") AND ed.fk_projet = ".((int) $this->id);
 		} elseif ($type == 'project_task') {
@@ -951,9 +952,9 @@ class Project extends CommonObject
 		} elseif ($type == 'project_task_time') {	// Case we want to duplicate line foreach user
 			$sql = "SELECT DISTINCT COUNT(pt.rowid) as nb FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet = ".((int) $this->id);
 		} elseif ($type == 'stock_mouvement') {
-			$sql = 'SELECT COUNT(ms.rowid) as nb FROM '.MAIN_DB_PREFIX."stock_mouvement as ms, ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = ms.fk_entrepot AND e.entity IN (".getEntity('stock').") AND ms.origintype = 'project' AND ms.fk_origin = ".((int) $this->id)." AND ms.type_mouvement = 1";
+			$sql = "SELECT COUNT(ms.rowid) as nb FROM ".MAIN_DB_PREFIX."stock_mouvement as ms, ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = ms.fk_entrepot AND e.entity IN (".getEntity('stock').") AND ms.origintype = 'project' AND ms.fk_origin = ".((int) $this->id)." AND ms.type_mouvement = 1";
 		} elseif ($type == 'loan') {
-			$sql = 'SELECT COUNT(l.rowid) as nb FROM '.MAIN_DB_PREFIX."loan as l WHERE l.entity IN (".getEntity('loan').") AND l.fk_projet = ".((int) $this->id);
+			$sql = "SELECT COUNT(l.rowid) as nb FROM ".MAIN_DB_PREFIX."loan as l WHERE l.entity IN (".getEntity('loan').") AND l.fk_projet = ".((int) $this->id);
 		} else {
 			$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX.$tablename." WHERE ".$projectkey." = ".((int) $this->id)." AND entity IN (".getEntity($type).")";
 		}
@@ -1079,7 +1080,7 @@ class Project extends CommonObject
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."projet";
 			$sql .= " SET fk_statut = ".self::STATUS_CLOSED.", fk_user_close = ".((int) $user->id).", date_close = '".$this->db->idate($now)."'";
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			$sql .= " AND fk_statut = ".self::STATUS_VALIDATED;
 
 			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
@@ -1151,7 +1152,7 @@ class Project extends CommonObject
 			$statusClass = $statustrans[$status];
 		}
 
-		return dolGetStatus($langs->trans($this->statuts_long[$status]), $langs->trans($this->statuts_short[$status]), '', $statusClass, $mode);
+		return dolGetStatus($langs->transnoentitiesnoconv($this->statuts_long[$status]), $langs->transnoentitiesnoconv($this->statuts_short[$status]), '', $statusClass, $mode);
 	}
 
 	/**
@@ -1182,7 +1183,7 @@ class Project extends CommonObject
 
 		$label = '';
 		if ($option != 'nolink') {
-			$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Project").'</u>';
+			$label = img_picto('', $this->picto, 'class="pictofixedwidth"').' <u class="paddingrightonly">'.$langs->trans("Project").'</u>';
 		}
 		if (isset($this->status)) {
 			$label .= ' '.$this->getLibStatut(5);
@@ -1251,7 +1252,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"'), 0, 0, $notooltip ? 0 : 1);
+			$result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip pictofixedwidth"'), 0, 0, $notooltip ? 0 : 1);
 		}
 		if ($withpicto != 2) {
 			$result .= $this->ref;
@@ -1600,19 +1601,23 @@ class Project extends CommonObject
 
 				foreach (array('internal', 'external') as $source) {
 					$tab = $origin_project->liste_contact(-1, $source);
-
-					foreach ($tab as $contacttoadd) {
-						$clone_project->add_contact($contacttoadd['id'], $contacttoadd['code'], $contacttoadd['source'], $notrigger);
-						if ($clone_project->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-							$langs->load("errors");
-							$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
-							$error++;
-						} else {
-							if ($clone_project->error != '') {
-								$this->error .= $clone_project->error;
+					if (is_array($tab) && count($tab)>0) {
+						foreach ($tab as $contacttoadd) {
+							$clone_project->add_contact($contacttoadd['id'], $contacttoadd['code'], $contacttoadd['source'], $notrigger);
+							if ($clone_project->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+								$langs->load("errors");
+								$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 								$error++;
+							} else {
+								if ($clone_project->error != '') {
+									$this->error .= $clone_project->error;
+									$error++;
+								}
 							}
 						}
+					} elseif ($tab < 0) {
+						$this->error .= $origin_project->error;
+						$error++;
 					}
 				}
 			}
@@ -1659,7 +1664,7 @@ class Project extends CommonObject
 				foreach ($tasksarray as $tasktoclone) {
 					$result_clone = $taskstatic->createFromClone($user, $tasktoclone->id, $clone_project_id, $tasktoclone->fk_parent, $move_date, true, false, $clone_task_file, true, false);
 					if ($result_clone <= 0) {
-						$this->error .= $result_clone->error;
+						$this->error .= $taskstatic->error;
 						$error++;
 					} else {
 						$new_task_id = $result_clone;
@@ -1713,6 +1718,7 @@ class Project extends CommonObject
 		global $user, $langs, $conf;
 
 		$error = 0;
+		$result = 0;
 
 		$taskstatic = new Task($this->db);
 
@@ -2009,7 +2015,7 @@ class Project extends CommonObject
 		//$socid=$user->socid;
 
 		$projectsListId = null;
-		if (!$user->rights->projet->all->lire) {
+		if (empty($user->rights->projet->all->lire)) {
 			$projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1);
 		}
 
@@ -2101,7 +2107,7 @@ class Project extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 		$sql .= " WHERE";
 		$sql .= " p.entity IN (".getEntity('project').")";
-		if (!$user->rights->projet->all->lire) {
+		if (empty($user->rights->projet->all->lire)) {
 			$projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1);
 			$sql .= "AND p.rowid IN (".$this->db->sanitize($projectsListId).")";
 		}
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index f437c8a5e10..efd8ecc3424 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -158,22 +158,22 @@ class ProjectStats extends Stats
 		// Get list of project id allowed to user (in a string list separated by coma)
 		$object = new Project($this->db);
 		$projectsListId = '';
-		if (!$user->rights->projet->all->lire) {
+		if (empty($user->rights->projet->all->lire)) {
 			$projectsListId = $object->getProjectsAuthorizedForUser($user, 0, 1, $user->socid);
 		}
 
 		$sqlwhere[] = ' t.entity IN ('.getEntity('project').')';
 
 		if (!empty($this->userid)) {
-			$sqlwhere[] = ' t.fk_user_resp='.$this->userid;
+			$sqlwhere[] = ' t.fk_user_resp = '.((int) $this->userid);
 		}
 
 		// Forced filter on socid is similar to forced filter on project. TODO Use project assignement to allow to not use filter on project
 		if (!empty($this->socid)) {
-			$sqlwhere[] = ' t.fk_soc='.$this->socid;
+			$sqlwhere[] = ' t.fk_soc = '.((int) $this->socid);
 		}
 		if (!empty($this->year) && empty($this->yearmonth)) {
-			$sqlwhere[] = " date_format(t.datec,'%Y')='".$this->db->escape($this->year)."'";
+			$sqlwhere[] = " date_format(t.datec,'%Y') = '".$this->db->escape($this->year)."'";
 		}
 		if (!empty($this->yearmonth)) {
 			$sqlwhere[] = " t.datec BETWEEN '".$this->db->idate(dol_get_first_day($this->yearmonth))."' AND '".$this->db->idate(dol_get_last_day($this->yearmonth))."'";
@@ -183,7 +183,7 @@ class ProjectStats extends Stats
 			$sqlwhere[] = " t.fk_opp_status IN (".$this->db->sanitize($this->status).")";
 		}
 
-		if (!$user->rights->projet->all->lire) {
+		if (empty($user->rights->projet->all->lire)) {
 			$sqlwhere[] = " t.rowid IN (".$this->db->sanitize($projectsListId).")"; // public and assigned to, or restricted to company for external users
 		}
 
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 87ef51daefd..328361c00c3 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
  * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Juanjo Menent		<jmenent@2byte.es>
+ * 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
@@ -32,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 /**
  * 	Class to manage tasks
  */
-class Task extends CommonObject
+class Task extends CommonObjectLine
 {
 	/**
 	 * @var string ID to identify managed object
@@ -40,7 +41,7 @@ class Task extends CommonObject
 	public $element = 'project_task';
 
 	/**
-	 * @var string Name of table without prefix where object is stored
+	 * @var string 	Name of table without prefix where object is stored
 	 */
 	public $table_element = 'projet_task';
 
@@ -121,6 +122,16 @@ class Task extends CommonObject
 
 	public $comments = array();
 
+	/**
+	 * @var float budget_amount
+	 */
+	public $budget_amount;
+
+	/**
+	 * @var float project_budget_amount
+	 */
+	public $project_budget_amount;
+
 	public $oldcopy;
 
 
@@ -155,6 +166,11 @@ class Task extends CommonObject
 		$this->label = trim($this->label);
 		$this->description = trim($this->description);
 
+		if (!empty($this->date_start) && !empty($this->date_end) && $this->date_start > $this->date_end) {
+			$this->errors[] = $langs->trans('StartDateCannotBeAfterEndDate');
+			return -1;
+		}
+
 		// Check parameters
 		// Put here code to add control on parameters values
 
@@ -172,6 +188,7 @@ class Task extends CommonObject
 		$sql .= ", datee";
 		$sql .= ", planned_workload";
 		$sql .= ", progress";
+		$sql .= ", budget_amount";
 		$sql .= ") VALUES (";
 		$sql .= ((int) $conf->entity);
 		$sql .= ", ".((int) $this->fk_project);
@@ -183,8 +200,9 @@ class Task extends CommonObject
 		$sql .= ", ".((int) $user->id);
 		$sql .= ", ".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : 'null');
 		$sql .= ", ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : 'null');
-		$sql .= ", ".(($this->planned_workload != '' && $this->planned_workload >= 0) ? $this->planned_workload : 'null');
-		$sql .= ", ".(($this->progress != '' && $this->progress >= 0) ? $this->progress : 'null');
+		$sql .= ", ".(($this->planned_workload != '' && $this->planned_workload >= 0) ? ((int) $this->planned_workload) : 'null');
+		$sql .= ", ".(($this->progress != '' && $this->progress >= 0) ? ((int) $this->progress) : 'null');
+		$sql .= ", ".(($this->budget_amount != '' && $this->budget_amount >= 0) ? ((int) $this->budget_amount) : 'null');
 		$sql .= ")";
 
 		$this->db->begin();
@@ -261,6 +279,7 @@ class Task extends CommonObject
 		$sql .= " t.fk_user_valid,";
 		$sql .= " t.fk_statut,";
 		$sql .= " t.progress,";
+		$sql .= " t.budget_amount,";
 		$sql .= " t.priority,";
 		$sql .= " t.note_private,";
 		$sql .= " t.note_public,";
@@ -304,6 +323,7 @@ class Task extends CommonObject
 				$this->fk_user_valid		= $obj->fk_user_valid;
 				$this->fk_statut			= $obj->fk_statut;
 				$this->progress				= $obj->progress;
+				$this->budget_amount		= $obj->budget_amount;
 				$this->priority				= $obj->priority;
 				$this->note_private = $obj->note_private;
 				$this->note_public = $obj->note_public;
@@ -366,6 +386,14 @@ class Task extends CommonObject
 		if (isset($this->planned_workload)) {
 			$this->planned_workload = trim($this->planned_workload);
 		}
+		if (isset($this->budget_amount)) {
+			$this->budget_amount = trim($this->budget_amount);
+		}
+
+		if (!empty($this->date_start) && !empty($this->date_end) && $this->date_start > $this->date_end) {
+			$this->errors[] = $langs->trans('StartDateCannotBeAfterEndDate');
+			return -1;
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -382,6 +410,7 @@ class Task extends CommonObject
 		$sql .= " dateo=".($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null').",";
 		$sql .= " datee=".($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null').",";
 		$sql .= " progress=".(($this->progress != '' && $this->progress >= 0) ? $this->progress : 'null').",";
+		$sql .= " budget_amount=".(($this->budget_amount != '' && $this->budget_amount >= 0) ? $this->budget_amount : 'null').",";
 		$sql .= " rang=".((!empty($this->rang)) ? $this->rang : "0");
 		$sql .= " WHERE rowid=".((int) $this->id);
 
@@ -519,7 +548,7 @@ class Task extends CommonObject
 
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
-			$sql .= " WHERE fk_task=".$this->id;
+			$sql .= " WHERE fk_task = ".((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
@@ -529,7 +558,7 @@ class Task extends CommonObject
 
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_extrafields";
-			$sql .= " WHERE fk_object=".$this->id;
+			$sql .= " WHERE fk_object = ".((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
@@ -603,7 +632,7 @@ class Task extends CommonObject
 
 		$sql = "SELECT COUNT(*) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task";
-		$sql .= " WHERE fk_task_parent=".$this->id;
+		$sql .= " WHERE fk_task_parent = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::hasChildren", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -636,7 +665,7 @@ class Task extends CommonObject
 
 		$sql = "SELECT COUNT(*) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time";
-		$sql .= " WHERE fk_task=".$this->id;
+		$sql .= " WHERE fk_task = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::hasTimeSpent", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -772,9 +801,10 @@ class Task extends CommonObject
 	 * @param	array	$extrafields	    Show additional column from project or task
 	 * @param   int     $includebilltime    Calculate also the time to bill and billed
 	 * @param   array   $search_array_options Array of search
+	 * @param   int     $loadextras         Fetch all Extrafields on each task
 	 * @return 	array						Array of tasks
 	 */
-	public function getTasksArray($usert = null, $userp = null, $projectid = 0, $socid = 0, $mode = 0, $filteronproj = '', $filteronprojstatus = '-1', $morewherefilter = '', $filteronprojuser = 0, $filterontaskuser = 0, $extrafields = array(), $includebilltime = 0, $search_array_options = array())
+	public function getTasksArray($usert = null, $userp = null, $projectid = 0, $socid = 0, $mode = 0, $filteronproj = '', $filteronprojstatus = '-1', $morewherefilter = '', $filteronprojuser = 0, $filterontaskuser = 0, $extrafields = array(), $includebilltime = 0, $search_array_options = array(), $loadextras = 0)
 	{
 		global $conf, $hookmanager;
 
@@ -791,16 +821,17 @@ class Task extends CommonObject
 		$sql .= " t.rowid as taskid, t.ref as taskref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut as status,";
 		$sql .= " t.dateo as date_start, t.datee as date_end, t.planned_workload, t.rang,";
 		$sql .= " t.description, ";
+		$sql .= " t.budget_amount, ";
 		$sql .= " s.rowid as thirdparty_id, s.nom as thirdparty_name, s.email as thirdparty_email,";
-		$sql .= " p.fk_opp_status, p.opp_amount, p.opp_percent, p.budget_amount";
+		$sql .= " p.fk_opp_status, p.opp_amount, p.opp_percent, p.budget_amount as project_budget_amount";
 		if (!empty($extrafields->attributes['projet']['label'])) {
 			foreach ($extrafields->attributes['projet']['label'] as $key => $val) {
-				$sql .= ($extrafields->attributes['projet']['type'][$key] != 'separate' ? ",efp.".$key.' as options_'.$key : '');
+				$sql .= ($extrafields->attributes['projet']['type'][$key] != 'separate' ? ",efp.".$key." as options_".$key : '');
 			}
 		}
 		if (!empty($extrafields->attributes['projet_task']['label'])) {
 			foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) {
-				$sql .= ($extrafields->attributes['projet_task']['type'][$key] != 'separate' ? ",efpt.".$key.' as options_'.$key : '');
+				$sql .= ($extrafields->attributes['projet_task']['type'][$key] != 'separate' ? ",efpt.".$key." as options_".$key : '');
 			}
 		}
 		if ($includebilltime) {
@@ -897,6 +928,7 @@ class Task extends CommonObject
 			$sql .= " t.rowid, t.ref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut,";
 			$sql .= " t.dateo, t.datee, t.planned_workload, t.rang,";
 			$sql .= " t.description, ";
+			$sql .= " t.budget_amount, ";
 			$sql .= " s.rowid, s.nom, s.email,";
 			$sql .= " p.fk_opp_status, p.opp_amount, p.opp_percent, p.budget_amount";
 			if (!empty($extrafields->attributes['projet']['label'])) {
@@ -950,6 +982,7 @@ class Task extends CommonObject
 					$tasks[$i]->opp_amount = $obj->opp_amount;
 					$tasks[$i]->opp_percent = $obj->opp_percent;
 					$tasks[$i]->budget_amount = $obj->budget_amount;
+					$tasks[$i]->project_budget_amount = $obj->project_budget_amount;
 					$tasks[$i]->usage_bill_time = $obj->usage_bill_time;
 
 					$tasks[$i]->label = $obj->label;
@@ -991,6 +1024,10 @@ class Task extends CommonObject
 							}
 						}
 					}
+
+					if ($loadextras) {
+						$tasks[$i]->fetch_optionals();
+					}
 				}
 
 				$i++;
@@ -1159,6 +1196,18 @@ class Task extends CommonObject
 			$this->timespent_datehour = $this->timespent_date;
 		}
 
+		if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+			$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+
+			if ($this->timespent_date < $restrictBefore) {
+				$this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS);
+				$this->errors[] = $this->error;
+				return -1;
+			}
+		}
+
+
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task_time (";
@@ -1170,12 +1219,12 @@ class Task extends CommonObject
 		$sql .= ", fk_user";
 		$sql .= ", note";
 		$sql .= ") VALUES (";
-		$sql .= $this->id;
+		$sql .= ((int) $this->id);
 		$sql .= ", '".$this->db->idate($this->timespent_date)."'";
 		$sql .= ", '".$this->db->idate($this->timespent_datehour)."'";
 		$sql .= ", ".(empty($this->timespent_withhour) ? 0 : 1);
-		$sql .= ", ".$this->timespent_duration;
-		$sql .= ", ".$this->timespent_fk_user;
+		$sql .= ", ".((int) $this->timespent_duration);
+		$sql .= ", ".((int) $this->timespent_fk_user);
 		$sql .= ", ".(isset($this->timespent_note) ? "'".$this->db->escape($this->timespent_note)."'" : "null");
 		$sql .= ")";
 
@@ -1233,6 +1282,97 @@ class Task extends CommonObject
 		return $ret;
 	}
 
+	/**
+	 *  Fetch records of time spent of this task
+	 *
+	 *  @param	string	$morewherefilter	Add more filter into where SQL request (must start with ' AND ...')
+	 *  @return int							<0 if KO, array of time spent if OK
+	 */
+	public function fetchTimeSpentOnTask($morewherefilter = '')
+	{
+		global $langs;
+
+		$arrayres = array();
+
+		$sql = "SELECT";
+		$sql .= " s.rowid as socid,";
+		$sql .= " s.nom as thirdparty_name,";
+		$sql .= " s.email as thirdparty_email,";
+		$sql .= " ptt.rowid,";
+		$sql .= " ptt.fk_task,";
+		$sql .= " ptt.task_date,";
+		$sql .= " ptt.task_datehour,";
+		$sql .= " ptt.task_date_withhour,";
+		$sql .= " ptt.task_duration,";
+		$sql .= " ptt.fk_user,";
+		$sql .= " ptt.note,";
+		$sql .= " ptt.thm,";
+		$sql .= " pt.rowid as task_id,";
+		$sql .= " pt.ref as task_ref,";
+		$sql .= " pt.label as task_label,";
+		$sql .= " p.rowid as project_id,";
+		$sql .= " p.ref as project_ref,";
+		$sql .= " p.title as project_label,";
+		$sql .= " p.public as public";
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as ptt, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet as p";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
+		$sql .= " WHERE ptt.fk_task = pt.rowid AND pt.fk_projet = p.rowid";
+		$sql .= " AND pt.rowid = ".((int) $this->id);
+		$sql .= " AND pt.entity IN (".getEntity('project').")";
+		if ($morewherefilter) {
+			$sql .= $morewherefilter;
+		}
+
+		dol_syslog(get_class($this)."::fetchAllTimeSpent", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+
+			$i = 0;
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($resql);
+
+				$newobj = new stdClass();
+
+				$newobj->socid              = $obj->socid;
+				$newobj->thirdparty_name    = $obj->thirdparty_name;
+				$newobj->thirdparty_email   = $obj->thirdparty_email;
+
+				$newobj->fk_project			= $obj->project_id;
+				$newobj->project_ref		= $obj->project_ref;
+				$newobj->project_label = $obj->project_label;
+				$newobj->public				= $obj->project_public;
+
+				$newobj->fk_task			= $obj->task_id;
+				$newobj->task_ref = $obj->task_ref;
+				$newobj->task_label = $obj->task_label;
+
+				$newobj->timespent_line_id = $obj->rowid;
+				$newobj->timespent_line_date = $this->db->jdate($obj->task_date);
+				$newobj->timespent_line_datehour	= $this->db->jdate($obj->task_datehour);
+				$newobj->timespent_line_withhour = $obj->task_date_withhour;
+				$newobj->timespent_line_duration = $obj->task_duration;
+				$newobj->timespent_line_fk_user = $obj->fk_user;
+				$newobj->timespent_line_thm = $obj->thm;	// hourly rate
+				$newobj->timespent_line_note = $obj->note;
+
+				$arrayres[] = $newobj;
+
+				$i++;
+			}
+
+			$this->db->free($resql);
+
+			$this->lines = $arrayres;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
 	/**
 	 *  Calculate total of time spent for task
 	 *
@@ -1523,6 +1663,17 @@ class Task extends CommonObject
 			$this->timespent_note = trim($this->timespent_note);
 		}
 
+		if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+			$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+
+			if ($this->timespent_date < $restrictBefore) {
+				$this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS);
+				$this->errors[] = $this->error;
+				return -1;
+			}
+		}
+
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time SET";
@@ -1602,10 +1753,21 @@ class Task extends CommonObject
 
 		$error = 0;
 
+		if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+			$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+
+			if ($this->timespent_date < $restrictBefore) {
+				$this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS);
+				$this->errors[] = $this->error;
+				return -1;
+			}
+		}
+
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
-		$sql .= " WHERE rowid = ".$this->timespent_id;
+		$sql .= " WHERE rowid = ".((int) $this->timespent_id);
 
 		dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1627,7 +1789,7 @@ class Task extends CommonObject
 		if (!$error) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
 			$sql .= " SET duration_effective = duration_effective - ".$this->db->escape($this->timespent_duration ? $this->timespent_duration : 0);
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
 			if ($this->db->query($sql)) {
@@ -2022,7 +2184,7 @@ class Task extends CommonObject
 		$sql .= " AND p.fk_statut = 1";
 		$sql .= " AND t.fk_projet = p.rowid";
 		$sql .= " AND (t.progress IS NULL OR t.progress < 100)"; // tasks to do
-		if (!$user->rights->projet->all->lire) {
+		if (empty($user->rights->projet->all->lire)) {
 			$sql .= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")";
 		}
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
@@ -2087,13 +2249,13 @@ class Task extends CommonObject
 		$sql = "SELECT count(p.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
 		}
 		$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
 		$sql .= " WHERE p.entity IN (".getEntity('project', 0).')';
 		$sql .= " AND t.fk_projet = p.rowid"; // tasks to do
-		if ($mine || !$user->rights->projet->all->lire) {
+		if ($mine || empty($user->rights->projet->all->lire)) {
 			$sql .= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")";
 		}
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
@@ -2101,7 +2263,7 @@ class Task extends CommonObject
 		if ($socid) {
 			$sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".((int) $socid).")";
 		}
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id).") OR (s.rowid IS NULL))";
 		}
 
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
index 1eb6fda915f..a5b088f01e8 100644
--- a/htdocs/projet/class/taskstats.class.php
+++ b/htdocs/projet/class/taskstats.class.php
@@ -59,7 +59,7 @@ class TaskStats extends Stats
 		$sql = "SELECT";
 		$sql .= " COUNT(t.rowid), t.priority";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as t INNER JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = t.fk_projet";
-		if (!$user->rights->societe->client->voir && !$user->soc_id) {
+		if (empty($user->rights->societe->client->voir) && !$user->soc_id) {
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=p.fk_soc AND sc.fk_user=".((int) $user->id);
 		}
 		$sql .= $this->buildWhere();
@@ -118,7 +118,7 @@ class TaskStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%Y') as year, COUNT(t.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as t INNER JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = t.fk_projet";
-		if (!$user->rights->societe->client->voir && !$user->soc_id) {
+		if (empty($user->rights->societe->client->voir) && !$user->soc_id) {
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=p.fk_soc AND sc.fk_user=".((int) $user->id);
 		}
 		$sql .= $this->buildWhere();
@@ -142,11 +142,11 @@ class TaskStats extends Stats
 		$sqlwhere[] = ' t.entity IN ('.getEntity('project').')';
 
 		if (!empty($this->userid)) {
-			$sqlwhere[] = ' t.fk_user_resp='.$this->userid;
+			$sqlwhere[] = ' t.fk_user_resp = '.((int) $this->userid);
 		}
 		// Forced filter on socid is similar to forced filter on project. TODO Use project assignement to allow to not use filter on project
 		if (!empty($this->socid)) {
-			$sqlwhere[] = ' p.fk_soc='.$this->socid; // Link on thirdparty is on project, not on task
+			$sqlwhere[] = ' p.fk_soc = '.((int) $this->socid); // Link on thirdparty is on project, not on task
 		}
 		if (!empty($this->year) && empty($this->yearmonth)) {
 			$sqlwhere[] = " date_format(t.datec,'%Y')='".$this->db->escape($this->year)."'";
@@ -180,7 +180,7 @@ class TaskStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(t.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as t INNER JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = t.fk_projet";
-		if (!$user->rights->societe->client->voir && !$user->soc_id) {
+		if (empty($user->rights->societe->client->voir) && !$user->soc_id) {
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=p.fk_soc AND sc.fk_user=".((int) $user->id);
 		}
 		$sql .= $this->buildWhere();
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index 2aa8f473cb4..52a1f581df8 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -103,13 +103,13 @@ $morehtmlref = '<div class="refidno">';
 // Title
 $morehtmlref .= $object->title;
 // Thirdparty
-if ($object->thirdparty->id > 0) {
+if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 }
 $morehtmlref .= '</div>';
 
 // Define a complementary filter for search of next/prev ref.
-if (!$user->rights->projet->all->lire) {
+if (empty($user->rights->projet->all->lire)) {
 	$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 	$object->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 }
@@ -155,7 +155,6 @@ print '</table>';
 
 print '</div>';
 print '<div class="fichehalfright">';
-print '<div class="ficheaddleft">';
 print '<div class="underbanner clearboth"></div>';
 
 print '<table class="border centpercent">';
@@ -179,7 +178,6 @@ print '</td></tr>';
 
 print '</table>';
 
-print '</div>';
 print '</div>';
 print '</div>';
 
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 1af3488bf5c..d1563cbfab8 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -94,7 +94,7 @@ if ($action == 'addcontact') {
 		foreach ($task_array as $task) {
 			$task_already_affected=false;
 			$personsLinked = $task->liste_contact(-1, $source);
-			if (!is_array($personsLinked) && coun($personsLinked) < 0) {
+			if (!is_array($personsLinked) && count($personsLinked) < 0) {
 				setEventMessage($object->error, 'errors');
 			} else {
 				foreach ($personsLinked as $person) {
@@ -294,13 +294,13 @@ if ($id > 0 || !empty($ref)) {
 	// Title
 	$morehtmlref .= $object->title;
 	// Thirdparty
-	if ($object->thirdparty->id > 0) {
+	if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
-	if (!$user->rights->projet->all->lire) {
+	if (empty($user->rights->projet->all->lire)) {
 		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 		$object->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 	}
@@ -374,7 +374,7 @@ if ($id > 0 || !empty($ref)) {
 		// Opportunity Amount
 		print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
 		if (strcmp($object->opp_amount, '')) {
-			print price($object->opp_amount, '', $langs, 0, 0, 0, $conf->currency);
+			print '<span class="amount">'.price($object->opp_amount, '', $langs, 0, 0, 0, $conf->currency).'</span>';
 		}
 		print '</td></tr>';
 	}
@@ -394,7 +394,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, '', $langs, 0, 0, 0, $conf->currency);
+		print '<span class="amount">'.price($object->budget_amount, '', $langs, 0, 0, 0, $conf->currency).'</span>';
 	}
 	print '</td></tr>';
 
@@ -406,10 +406,9 @@ if ($id > 0 || !empty($ref)) {
 
 	print '</div>';
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
 
-	print '<table class="border tableforfield" width="100%">';
+	print '<table class="border tableforfield centpercent">';
 
 	// Description
 	print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
@@ -425,7 +424,6 @@ if ($id > 0 || !empty($ref)) {
 
 	print '</table>';
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index df31724d07c..9e8d3a6ce8e 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -53,8 +53,8 @@ if ($id > 0 || !empty($ref)) {
 
 // Get parameters
 $limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield	= GETPOST("sortfield", 'alpha');
-$sortorder	= GETPOST("sortorder", 'alpha');
+$sortfield	= GETPOST('sortfield', 'aZ09comma');
+$sortorder	= GETPOST('sortorder', 'aZ09comma');
 $page		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -82,6 +82,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');
 
+$permissiontoadd = $user->rights->projet->creer;
 
 
 /*
@@ -134,13 +135,13 @@ if ($object->id > 0) {
 	// Title
 	$morehtmlref .= $object->title;
 	// Thirdparty
-	if ($object->thirdparty->id > 0) {
+	if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
-	if (!$user->rights->projet->all->lire) {
+	if (empty($user->rights->projet->all->lire)) {
 		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 		$object->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 	}
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index c805552d7a5..b5e789ec3f2 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -216,13 +216,13 @@ $morehtmlref = '<div class="refidno">';
 // Title
 $morehtmlref .= $object->title;
 // Thirdparty
-if ($object->thirdparty->id > 0) {
+if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 }
 $morehtmlref .= '</div>';
 
 // Define a complementary filter for search of next/prev ref.
-if (!$user->rights->projet->all->lire) {
+if (empty($user->rights->projet->all->lire)) {
 	$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 	$object->next_prev_filter = " te.rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 }
@@ -296,7 +296,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 	// Opportunity Amount
 	print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
 	if (strcmp($object->opp_amount, '')) {
-		print price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency);
+		print '<span class="amount">'.price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
 	}
 	print '</td></tr>';
 }
@@ -316,7 +316,7 @@ print '</td></tr>';
 // Budget
 print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 if (strcmp($object->budget_amount, '')) {
-	print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+	print '<span class="amount">'.price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
 }
 print '</td></tr>';
 
@@ -328,10 +328,9 @@ print '</table>';
 
 print '</div>';
 print '<div class="fichehalfright">';
-print '<div class="ficheaddleft">';
 print '<div class="underbanner clearboth"></div>';
 
-print '<table class="border tableforfield" width="100%">';
+print '<table class="border tableforfield centpercent">';
 
 // Description
 print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
@@ -347,7 +346,6 @@ if ($conf->categorie->enabled) {
 
 print '</table>';
 
-print '</div>';
 print '</div>';
 print '</div>';
 
@@ -882,7 +880,7 @@ foreach ($listofreferent as $key => $value) {
 				}
 
 				// Add total if we have to
-				if ($qualifiedfortotal)	{
+				if ($qualifiedfortotal) {
 					$total_ht = $total_ht + $total_ht_by_line;
 					$total_ttc = $total_ttc + $total_ttc_by_line;
 				}
@@ -1018,8 +1016,11 @@ foreach ($listofreferent as $key => $value) {
 			}
 		}
 
+		$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field) ? $project_field : 'fk_projet');
+
+
 		if (empty($conf->global->PROJECT_LINK_ON_OVERWIEW_DISABLED) && $idtofilterthirdparty && !in_array($tablename, $exclude_select_element)) {
-			$selectList = $formproject->select_element($tablename, $idtofilterthirdparty, 'minwidth300 minwidth75imp', -2, !empty($project_field) ? $project_field : 'fk_projet');
+			$selectList = $formproject->select_element($tablename, $idtofilterthirdparty, 'minwidth300 minwidth75imp', -2, empty($project_field) ? 'fk_projet' : $project_field, $langs->trans("SelectElement"));
 			if ($selectList < 0) {
 				setEventMessages($formproject->error, $formproject->errors, 'errors');
 			} elseif ($selectList) {
@@ -1031,9 +1032,10 @@ foreach ($listofreferent as $key => $value) {
 				$addform .= '<input type="hidden" name="action" value="addelement">';
 				$addform .= '<input type="hidden" name="datesrfc" value="'.dol_print_date($dates, 'dayhourrfc').'">';
 				$addform .= '<input type="hidden" name="dateerfc" value="'.dol_print_date($datee, 'dayhourrfc').'">';
-				$addform .= '<table><tr><td><span class="hideonsmartphone opacitymedium">'.$langs->trans("SelectElement").'</span></td>';
+				$addform .= '<table><tr>';
+				//$addform .= '<td><span class="hideonsmartphone opacitymedium">'.$langs->trans("SelectElement").'</span></td>';
 				$addform .= '<td>'.$selectList.'</td>';
-				$addform .= '<td><input type="submit" class="button smallpaddingimp" value="'.dol_escape_htmltag($langs->trans("LinkToElementShort")).'"></td>';
+				$addform .= '<td><input type="submit" class="button button-linkto smallpaddingimp" value="'.dol_escape_htmltag($langs->trans("LinkToElementShort")).'"></td>';
 				$addform .= '</tr></table>';
 				$addform .= '</form>';
 				$addform .= '</div>';
@@ -1042,12 +1044,36 @@ foreach ($listofreferent as $key => $value) {
 		if (empty($conf->global->PROJECT_CREATE_ON_OVERVIEW_DISABLED) && $urlnew) {
 			$addform .= '<div class="inline-block valignmiddle">';
 			if ($testnew) {
-				$addform .= '<a class="buttonxxx marginleftonly" href="'.$urlnew.'"><span class="valignmiddle text-plus-circle hideonsmartphone">'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
+				$addform .= '<a class="buttonxxx marginleftonly" href="'.$urlnew.'" title="'.dol_escape_htmltag($langs->trans($buttonnew)).'"><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
 			} elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
-				$addform .= '<a class="buttonxxx buttonRefused" disabled="disabled" href="#"><span class="valignmiddle text-plus-circle hideonsmartphone">'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
+				$addform .= '<span title="'.dol_escape_htmltag($langs->trans($buttonnew)).'"><a class="buttonxxx marginleftonly buttonRefused" disabled="disabled" href="#"><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a></span>';
 			}
 			$addform .= '<div>';
 		}
+		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>
+						 <script>
+						 $("#btnShow").on("click", function () {
+							console.log("We click to show or hide the canceled lines");
+							var attr = $(this).attr("data-canceledarehidden");
+							if (typeof attr !== "undefined" && attr !== false) {
+								console.log("Show canceled");
+								$(".tr_canceled").show();
+								$("#textBtnShow").text("'.dol_escape_js($langs->trans("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")).'");
+								$("#btnShow").attr("data-canceledarehidden", 1);
+								$("#minus-circle").removeClass("fa-eye").addClass("fa-eye-slash");
+							}
+						 });
+						 </script></div> '.$addform;
+		}
 
 		print load_fiche_titre($langs->trans($title), $addform, '');
 
@@ -1115,7 +1141,6 @@ foreach ($listofreferent as $key => $value) {
 		}
 		print '</tr>';
 
-		$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field) ? $project_field : 'fk_projet');
 		if (is_array($elementarray) && count($elementarray) > 0) {
 			$total_ht = 0;
 			$total_ttc = 0;
@@ -1170,9 +1195,16 @@ foreach ($listofreferent as $key => $value) {
 					if (!empty($element->close_code) && $element->close_code == 'replaced') {
 						$qualifiedfortotal = false; // Replacement invoice, do not include into total
 					}
+				} elseif ($key == 'order_supplier' && $element->status == 7) {
+					$qualifiedfortotal = false; // It makes no sense to include canceled orders in the total
+				}
+
+				if ($key == "order_supplier" && $element->status == 7) {
+					print '<tr class="oddeven tr_canceled" style=display:none>';
+				} else {
+					print '<tr class="oddeven" >';
 				}
 
-				print '<tr class="oddeven">';
 
 				// Remove link
 				print '<td style="width: 24px">';
@@ -1358,7 +1390,7 @@ foreach ($listofreferent as $key => $value) {
 						if (!$qualifiedfortotal) {
 							print '<strike>';
 						}
-						print price($total_ht_by_line);
+						print '<span class="amount">'.price($total_ht_by_line).'</span>';
 						if (!$qualifiedfortotal) {
 							print '</strike>';
 						}
@@ -1409,7 +1441,7 @@ foreach ($listofreferent as $key => $value) {
 						if (!$qualifiedfortotal) {
 							print '<strike>';
 						}
-						print price($total_ttc_by_line);
+						print '<span class="amount">'.price($total_ttc_by_line).'</span>';
 						if (!$qualifiedfortotal) {
 							print '</strike>';
 						}
@@ -1482,6 +1514,7 @@ foreach ($listofreferent as $key => $value) {
 			if (in_array($tablename, array('projet_task'))) {
 				$colspan = 2;
 			}
+
 			print '<tr class="liste_total"><td colspan="'.$colspan.'">'.$langs->trans("Number").': '.$i.'</td>';
 			if (in_array($tablename, array('projet_task'))) {
 				print '<td class="center">';
@@ -1520,7 +1553,16 @@ foreach ($listofreferent as $key => $value) {
 			print '</tr>';
 		} else {
 			if (!is_array($elementarray)) {	// error
-				print $elementarray;
+				print '<tr><td>'.$elementarray.'</td></tr>';
+			} else {
+				$colspan = 7;
+				if (in_array($tablename, array('projet_task'))) {
+					$colspan = 5;
+				}
+				if ($tablename == 'fichinter') {
+					$colspan++;
+				}
+				print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 		}
 		print "</table>";
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index b5325ca93b2..9c20aa562d7 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -116,13 +116,13 @@ if (($id > 0 && is_numeric($id)) || !empty($ref)) {
 	// Title
 	$morehtmlref .= $object->title;
 	// Thirdparty
-	if ($object->thirdparty->id > 0) {
+	if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
-	if (!$user->rights->projet->all->lire) {
+	if (empty($user->rights->projet->all->lire)) {
 		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 		$object->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 	}
@@ -204,7 +204,6 @@ if (($id > 0 && is_numeric($id)) || !empty($ref)) {
 
 	print '</div>';
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border tableforfield centpercent">';
@@ -223,7 +222,6 @@ if (($id > 0 && is_numeric($id)) || !empty($ref)) {
 
 	print '</table>';
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index 56649af9a45..ae0542d8b4b 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -19,7 +19,7 @@
 
 if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 	$sql = "SELECT p.fk_opp_status as opp_status, cls.code, COUNT(p.rowid) as nb, SUM(p.opp_amount) as opp_amount, SUM(p.opp_amount * p.opp_percent) as ponderated_opp_amount";
-	$sql .= " FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls ON p.fk_opp_status = cls.rowid";	// If lead status has been removed, we must show it in stats as unknown
+	$sql .= " FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls ON p.fk_opp_status = cls.rowid"; // If lead status has been removed, we must show it in stats as unknown
 	$sql .= " WHERE p.entity IN (".getEntity('project').")";
 	$sql .= " AND p.fk_statut = 1"; // Opend projects only
 	if ($mine || empty($user->rights->projet->all->lire)) {
@@ -91,7 +91,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 				$labelStatus = $listofopplabel[$status];
 			}
 			if (empty($labelStatus)) {
-				$labelStatus = $langs->transnoentitiesnoconv('OldValue', $status);	// When id is id of an entry no more in dictionary for example.
+				$labelStatus = $langs->transnoentitiesnoconv('OldValue', $status); // When id is id of an entry no more in dictionary for example.
 			}
 
 			//$labelStatus .= ' ('.$langs->trans("Coeff").': '.price2num($listofoppstatus[$status]).')';
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 213691f4e25..51e78f23d57 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -56,8 +56,8 @@ if (!$user->rights->projet->lire) {
 	accessforbidden();
 }
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
@@ -197,10 +197,10 @@ include DOL_DOCUMENT_ROOT.'/projet/graph_opportunities.inc.php';
 print_projecttasks_array($db, $form, $socid, $projectsListId, 0, 0, $listofoppstatus, array('projectlabel', 'plannedworkload', 'declaredprogress', 'prospectionstatus', 'projectstatus'));
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 // Latest modified projects
-$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut as status, p.tms as datem";
+$sql = "SELECT p.rowid, p.ref, p.title, p.dateo, p.datee, p.fk_statut as status, p.tms as datem";
 $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";
@@ -239,8 +239,6 @@ if ($resql) {
 			$projectstatic->id = $obj->rowid;
 			$projectstatic->ref = $obj->ref;
 			$projectstatic->title = $obj->title;
-			$projectstatic->dateo = $obj->dateo;
-			$projectstatic->datep = $obj->datep;
 			$projectstatic->thirdparty_name = $obj->name;
 			$projectstatic->status = $obj->status;
 
@@ -420,7 +418,7 @@ if (empty($conf->global->PROJECT_HIDE_PROJECT_LIST_ON_PROJECT_AREA)) {
 	print_projecttasks_array($db, $form, $socid, $projectsListId, 0, 1, $listofoppstatus, array());
 }
 
-print '</div></div></div>';
+print '</div></div>';
 
 $parameters = array('user' => $user);
 $reshook = $hookmanager->executeHooks('dashboardProjects', $parameters, $projectstatic); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index b8c6ae046cf..c0afe5d1370 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -128,13 +128,13 @@ $morehtmlref = '<div class="refidno">';
 // Title
 $morehtmlref .= $object->title;
 // Thirdparty
-if ($object->thirdparty->id > 0) {
+if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 }
 $morehtmlref .= '</div>';
 
 // Define a complementary filter for search of next/prev ref.
-if (!$user->rights->projet->all->lire) {
+if (empty($user->rights->projet->all->lire)) {
 	$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 	$object->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 }
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 43f5bd6ff2f..b19bc407537 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -42,7 +42,7 @@ if (!empty($conf->categorie->enabled)) {
 
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'companies', 'commercial'));
-if ($conf->eventorganization->enabled) {
+if (!empty($conf->eventorganization->enabled) && $conf->eventorganization->enabled) {
 	$langs->loadLangs(array('eventorganization'));
 }
 
@@ -56,7 +56,7 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'pro
 $title = $langs->trans("Projects");
 
 // Security check
-$socid = (is_numeric($_GET["socid"]) ? $_GET["socid"] : 0);
+$socid = GETPOST('socid', 'int');
 //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.
 if ($socid > 0) {
 	$soc = new Societe($db);
@@ -74,8 +74,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
+}
 if (!$sortfield) {
 	$sortfield = "p.ref";
 }
@@ -97,6 +98,7 @@ $search_opp_amount = GETPOST("search_opp_amount", 'alpha');
 $search_budget_amount = GETPOST("search_budget_amount", 'alpha');
 $search_public = GETPOST("search_public", 'int');
 $search_project_user = GETPOST('search_project_user', 'int');
+$search_project_contact = GETPOST('search_project_contact', 'int');
 $search_sale = GETPOST('search_sale', 'int');
 $search_usage_opportunity = GETPOST('search_usage_opportunity', 'int');
 $search_usage_task = GETPOST('search_usage_task', 'int');
@@ -108,7 +110,7 @@ $search_price_registration = GETPOST("search_price_registration", 'alpha');
 $search_price_booth = GETPOST("search_price_booth", 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
+$mine = ((GETPOST('mode') == 'mine') ? 1 : 0);
 if ($mine) {
 	$search_project_user = $user->id; $mine = 0;
 }
@@ -120,6 +122,26 @@ $search_eday	= GETPOST('search_eday', 'int');
 $search_emonth	= GETPOST('search_emonth', 'int');
 $search_eyear	= GETPOST('search_eyear', 'int');
 
+
+$search_date_start_startmonth = GETPOST('search_date_start_startmonth', 'int');
+$search_date_start_startyear = GETPOST('search_date_start_startyear', 'int');
+$search_date_start_startday = GETPOST('search_date_start_startday', 'int');
+$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear);	// Use tzserver
+$search_date_start_endmonth = GETPOST('search_date_start_endmonth', 'int');
+$search_date_start_endyear = GETPOST('search_date_start_endyear', 'int');
+$search_date_start_endday = GETPOST('search_date_start_endday', 'int');
+$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear);	// Use tzserver
+
+$search_date_end_startmonth = GETPOST('search_date_end_startmonth', 'int');
+$search_date_end_startyear = GETPOST('search_date_end_startyear', 'int');
+$search_date_end_startday = GETPOST('search_date_end_startday', 'int');
+$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear);	// Use tzserver
+$search_date_end_endmonth = GETPOST('search_date_end_endmonth', 'int');
+$search_date_end_endyear = GETPOST('search_date_end_endyear', 'int');
+$search_date_end_endday = GETPOST('search_date_end_endday', 'int');
+$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear);	// Use tzserver
+
+
 if ($search_status == '') {
 	$search_status = -1; // -1 or 1
 }
@@ -177,6 +199,7 @@ 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['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);
 // Force some fields according to search_usage filter...
 if (GETPOST('search_usage_opportunity')) {
@@ -231,12 +254,29 @@ if (empty($reshook)) {
 		$search_public = "";
 		$search_sale = "";
 		$search_project_user = '';
+		$search_project_contact = '';
 		$search_sday = "";
 		$search_smonth = "";
 		$search_syear = "";
 		$search_eday = "";
 		$search_emonth = "";
 		$search_eyear = "";
+		$search_date_start_startmonth = "";
+		$search_date_start_startyear = "";
+		$search_date_start_startday = "";
+		$search_date_start_start = "";
+		$search_date_start_endmonth = "";
+		$search_date_start_endyear = "";
+		$search_date_start_endday = "";
+		$search_date_start_end = "";
+		$search_date_end_startmonth = "";
+		$search_date_end_startyear = "";
+		$search_date_end_startday = "";
+		$search_date_end_start = "";
+		$search_date_end_endmonth = "";
+		$search_date_end_endyear = "";
+		$search_date_end_endday = "";
+		$search_date_end_end = "";
 		$search_usage_opportunity = '';
 		$search_usage_task = '';
 		$search_usage_bill_time = '';
@@ -320,19 +360,20 @@ $title = $langs->trans("Projects");
 
 // Get list of project id allowed to user (in a string list separated by comma)
 $projectsListId = '';
-if (!$user->rights->projet->all->lire) {
+if (empty($user->rights->projet->all->lire)) {
 	$projectsListId = $object->getProjectsAuthorizedForUser($user, 0, 1, $socid);
 }
 
 // Get id of types of contacts for projects (This list never contains a lot of elements)
 $listofprojectcontacttype = array();
-$sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
+$listofprojectcontacttypeexternal = array();
+$sql = "SELECT ctc.rowid, ctc.code, ctc.source FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
 $sql .= " WHERE ctc.element = '".$db->escape($object->element)."'";
-$sql .= " AND ctc.source = 'internal'";
 $resql = $db->query($sql);
 if ($resql) {
 	while ($obj = $db->fetch_object($resql)) {
-		$listofprojectcontacttype[$obj->rowid] = $obj->code;
+		if ($obj->source == 'internal') $listofprojectcontacttype[$obj->rowid] = $obj->code;
+		else $listofprojectcontacttypeexternal[$obj->rowid] = $obj->code;
 	}
 } else {
 	dol_print_error($db);
@@ -340,6 +381,9 @@ if ($resql) {
 if (count($listofprojectcontacttype) == 0) {
 	$listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
 }
+if (count($listofprojectcontacttypeexternal) == 0) {
+	$listofprojectcontacttypeexternal[0] = '0'; // To avoid sql syntax error if not found
+}
 
 $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is only once.
 $sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut as status, p.fk_opp_status, p.public, p.fk_user_creat,";
@@ -353,7 +397,7 @@ $sql .= " cls.code as opp_status_code";
 // 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
@@ -365,7 +409,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as p";
 if (!empty($conf->categorie->enabled)) {
 	$sql .= Categorie::getFilterJoinQuery(Categorie::TYPE_PROJECT, "p.rowid");
 }
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label']) &&is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (p.rowid = ef.fk_object)";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
@@ -380,11 +424,14 @@ if ($search_sale > 0) {
 if ($search_project_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ecp";
 }
+if ($search_project_contact > 0) {
+	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ecp_contact";
+}
 $sql .= " WHERE p.entity IN (".getEntity('project').')';
 if (!empty($conf->categorie->enabled)) {
 	$sql .= Categorie::getFilterSelectQuery(Categorie::TYPE_PROJECT, "p.rowid", $search_category_array);
 }
-if (!$user->rights->projet->all->lire) {
+if (empty($user->rights->projet->all->lire)) {
 	$sql .= " AND p.rowid IN (".$db->sanitize($projectsListId).")"; // public and assigned to, or restricted to company for external users
 }
 // No need to check if company is external user, as filtering of projects must be done by getProjectsAuthorizedForUser
@@ -408,6 +455,22 @@ if ($search_opp_percent) {
 }
 $sql .= dolSqlDateFilter('p.dateo', $search_sday, $search_smonth, $search_syear);
 $sql .= dolSqlDateFilter('p.datee', $search_eday, $search_emonth, $search_eyear);
+
+
+if ($search_date_start_start) {
+	$sql .= " AND p.dateo >= '".$db->idate($search_date_start_start)."'";
+}
+if ($search_date_start_end) {
+	$sql .= " AND p.dateo <= '".$db->idate($search_date_start_end)."'";
+}
+
+if ($search_date_end_start) {
+	$sql .= " AND p.datee >= '".$db->idate($search_date_end_start)."'";
+}
+if ($search_date_end_end) {
+	$sql .= " AND p.datee <= '".$db->idate($search_date_end_end)."'";
+}
+
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
@@ -448,6 +511,9 @@ if ($search_sale > 0) {
 if ($search_project_user > 0) {
 	$sql .= " AND ecp.fk_c_type_contact IN (".$db->sanitize(join(',', array_keys($listofprojectcontacttype))).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".((int) $search_project_user);
 }
+if ($search_project_contact > 0) {
+	$sql .= " AND ecp_contact.fk_c_type_contact IN (".$db->sanitize(join(',', array_keys($listofprojectcontacttypeexternal))).") AND ecp_contact.element_id = p.rowid AND ecp_contact.fk_socpeople = ".((int) $search_project_contact);
+}
 if ($search_opp_amount != '') {
 	$sql .= natural_search('p.opp_amount', $search_opp_amount, 1);
 }
@@ -500,7 +566,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
 	$num = $nbtotalofrecords;
 } else {
-	if ($limit) {
+	if (!empty($limit)) {
 		$sql .= $db->plimit($limit + 1, $offset);
 	}
 
@@ -558,10 +624,58 @@ if ($search_emonth) {
 if ($search_eyear) {
 	$param .= '&search_eyear='.urlencode($search_eyear);
 }
+if ($search_date_start_startmonth) {
+	$param .= '&search_date_start_startmonth='.urlencode($search_date_start_startmonth);
+}
+if ($search_date_start_startyear) {
+	$param .= '&search_date_start_startyear='.urlencode($search_date_start_startyear);
+}
+if ($search_date_start_startday) {
+	$param .= '&search_date_start_startday='.urlencode($search_date_start_startday);
+}
+if ($search_date_start_start) {
+	$param .= '&search_date_start_start='.urlencode($search_date_start_start);
+}
+if ($search_date_start_endmonth) {
+	$param .= '&search_date_start_endmonth='.urlencode($search_date_start_endmonth);
+}
+if ($search_date_start_endyear) {
+	$param .= '&search_date_start_endyear='.urlencode($search_date_start_endyear);
+}
+if ($search_date_start_endday) {
+	$param .= '&search_date_start_endday='.urlencode($search_date_start_endday);
+}
+if ($search_date_start_end) {
+	$param .= '&search_date_start_end='.urlencode($search_date_start_end);
+}
+if ($search_date_end_startmonth) {
+	$param .= '&search_date_end_startmonth='.urlencode($search_date_end_startmonth);
+}
+if ($search_date_end_startyear) {
+	$param .= '&search_date_end_startyear='.urlencode($search_date_end_startyear);
+}
+if ($search_date_end_startday) {
+	$param .= '&search_date_end_startday='.urlencode($search_date_end_startday);
+}
+if ($search_date_end_start) {
+	$param .= '&search_date_end_start='.urlencode($search_date_end_start);
+}
+if ($search_date_end_endmonth) {
+	$param .= '&search_date_end_endmonth='.urlencode($search_date_end_endmonth);
+}
+if ($search_date_end_endyear) {
+	$param .= '&search_date_end_endyear='.urlencode($search_date_end_endyear);
+}
+if ($search_date_end_endday) {
+	$param .= '&search_date_end_endday='.urlencode($search_date_end_endday);
+}
+if ($search_date_end_end) {
+	$param .= '&search_date_end_end=' . urlencode($search_date_end_end);
+}
 if ($socid) {
 	$param .= '&socid='.urlencode($socid);
 }
-if ($search_categ) {
+if (!empty($search_categ)) {
 	$param .= '&search_categ='.urlencode($search_categ);
 }
 if ($search_ref != '') {
@@ -588,6 +702,9 @@ if ($search_public != '') {
 if ($search_project_user != '') {
 	$param .= '&search_project_user='.urlencode($search_project_user);
 }
+if ($search_project_contact != '') {
+	$param .= '&search_project_user='.urlencode($search_project_contact);
+}
 if ($search_sale > 0) {
 	$param .= '&search_sale='.urlencode($search_sale);
 }
@@ -650,6 +767,9 @@ $url = DOL_URL_ROOT.'/projet/card.php?action=create';
 if (!empty($socid)) {
 	$url .= '&socid='.$socid;
 }
+if ($search_usage_event_organization == 1) {
+	$url .= '&usage_organize_event=1';
+}
 $newcardbutton = dolGetButtonTitle($langs->trans('NewProject'), '', 'fa fa-plus-circle', $url, '', $user->rights->projet->creer);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -704,6 +824,11 @@ if (empty($user->rights->user->user->lire)) {
 $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 .= '</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 .= '</div>';
+
 // If the user can view thirdparties other than his'
 if ($user->rights->societe->client->voir || $socid) {
 	$langs->load("commercial");
@@ -769,21 +894,33 @@ if (!empty($arrayfields['commercial']['checked'])) {
 // Start date
 if (!empty($arrayfields['p.dateo']['checked'])) {
 	print '<td class="liste_titre center nowraponall">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+	/*if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
 		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');
+	$formother->select_year($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>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_start_end ? $search_date_start_end : -1, 'search_date_start_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	print '</div>';
 	print '</td>';
 }
 // End date
 if (!empty($arrayfields['p.datee']['checked'])) {
 	print '<td class="liste_titre center nowraponall">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+	/*if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
 		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');
+	$formother->select_year($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>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_end_end ? $search_date_end_end : -1, 'search_date_end_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	print '</div>';
 	print '</td>';
 }
 if (!empty($arrayfields['p.public']['checked'])) {
@@ -795,7 +932,7 @@ if (!empty($arrayfields['p.public']['checked'])) {
 // 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');
+	print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 0, 1, 0, 'maxwidth100', 1);
 	print '</td>';
 }
 if (!empty($arrayfields['p.opp_amount']['checked'])) {
@@ -817,6 +954,10 @@ 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);
@@ -887,7 +1028,7 @@ if (!empty($arrayfields['p.fk_statut']['checked'])) {
 		$arrayofstatus[$key] = $langs->trans($val);
 	}
 	$arrayofstatus['99'] = $langs->trans("NotClosed").' ('.$langs->trans('Draft').' + '.$langs->trans('Opened').')';
-	print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'minwidth75imp maxwidth150 selectarrowonleft');
+	print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'minwidth75imp maxwidth125 selectarrowonleft');
 	print ajax_combobox('search_status');
 	print '</td>';
 }
@@ -936,6 +1077,9 @@ 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 ');
 }
@@ -1196,6 +1340,41 @@ 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">';
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index 8b65156570a..2ee52d3a247 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -33,7 +33,7 @@ $action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 
-$mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
+$mine = (isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'mine') ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 
 $object = new Project($db);
@@ -46,6 +46,7 @@ if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($ob
 // Security check
 $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.
+$hookmanager->initHooks(array('projetnote'));
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
 
 $permissionnote = $user->rights->projet->creer; // Used by the include of actions_setnotes.inc.php
@@ -55,7 +56,13 @@ $permissionnote = $user->rights->projet->creer; // Used by the include of action
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$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
+}
 
 
 /*
@@ -93,13 +100,13 @@ if ($id > 0 || !empty($ref)) {
 	// Title
 	$morehtmlref .= $object->title;
 	// Thirdparty
-	if ($object->thirdparty->id > 0) {
+	if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
-	if (!$user->rights->projet->all->lire) {
+	if (empty($user->rights->projet->all->lire)) {
 		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 		$object->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 	}
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index afd86f3ed07..f41651e15d8 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -298,11 +298,13 @@ if (!in_array($nowyear, $arrayyears)) {
 	$arrayyears[$nowyear] = $nowyear;
 }
 arsort($arrayyears);
-print $form->selectarray('year', $arrayyears, $year, 0);
+print $form->selectarray('year', $arrayyears, $year, 0, 0, 0, '', 0, 0, 0, '', 'width75');
 print '</td></tr>';
 print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
+
 print '</form>';
+
 print '<br><br>';
 
 print '<div class="div-table-responsive-no-min">';
@@ -349,7 +351,7 @@ foreach ($data_all_year as $val) {
 print '</table>';
 print '</div>';
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 $stringtoshow = '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
 if ($mesg) {
@@ -369,10 +371,12 @@ $stringtoshow .= '</td></tr></table>';
 
 print $stringtoshow;
 
+print '</div></div>';
 
-print '</div></div></div>';
 print '<div style="clear:both"></div>';
 
+print dol_get_fiche_end();
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 5aaf29ef922..64d134a7254 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-if ($conf->categorie->enabled) {
+if (!empty($conf->categorie->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -82,6 +82,25 @@ $search_planedworkload = GETPOST('search_planedworkload');
 $search_timespend = GETPOST('search_timespend');
 $search_progresscalc = GETPOST('search_progresscalc');
 $search_progressdeclare = GETPOST('search_progressdeclare');
+$search_task_budget_amount = GETPOST('search_task_budget_amount');
+
+$search_date_start_startmonth = GETPOST('search_date_start_startmonth', 'int');
+$search_date_start_startyear = GETPOST('search_date_start_startyear', 'int');
+$search_date_start_startday = GETPOST('search_date_start_startday', 'int');
+$search_date_start_start = dol_mktime(0, 0, 0, $search_date_start_startmonth, $search_date_start_startday, $search_date_start_startyear);	// Use tzserver
+$search_date_start_endmonth = GETPOST('search_date_start_endmonth', 'int');
+$search_date_start_endyear = GETPOST('search_date_start_endyear', 'int');
+$search_date_start_endday = GETPOST('search_date_start_endday', 'int');
+$search_date_start_end = dol_mktime(23, 59, 59, $search_date_start_endmonth, $search_date_start_endday, $search_date_start_endyear);	// Use tzserver
+
+$search_date_end_startmonth = GETPOST('search_date_end_startmonth', 'int');
+$search_date_end_startyear = GETPOST('search_date_end_startyear', 'int');
+$search_date_end_startday = GETPOST('search_date_end_startday', 'int');
+$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear);	// Use tzserver
+$search_date_end_endmonth = GETPOST('search_date_end_endmonth', 'int');
+$search_date_end_endyear = GETPOST('search_date_end_endyear', 'int');
+$search_date_end_endday = GETPOST('search_date_end_endday', 'int');
+$search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear);	// Use tzserver
 
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'projecttasklist';
 
@@ -124,6 +143,7 @@ $diroutputmassaction = $conf->projet->dir_output.'/tasks/temp/massgeneration/'.$
 $hookmanager->initHooks(array('projecttaskscard', 'globalcard'));
 
 $progress = GETPOST('progress', 'int');
+$budget_amount = GETPOST('budget_amount', 'int');
 $label = GETPOST('label', 'alpha');
 $description = GETPOST('description', 'restricthtml');
 $planned_workloadhour = (GETPOST('planned_workloadhour', 'int') ?GETPOST('planned_workloadhour', 'int') : 0);
@@ -142,7 +162,8 @@ $arrayfields = array(
 	'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),
-	'c.assigned'=>array('label'=>$langs->trans("TaskRessourceLinks"), 'checked'=>1, 'position'=>11),
+	't.budget_amount'=>array('label'=>"Budget", 'checked'=>1, 'position'=>11),
+	'c.assigned'=>array('label'=>$langs->trans("TaskRessourceLinks"), 'checked'=>1, 'position'=>12),
 );
 if ($object->usage_bill_time) {
 	$arrayfields['t.tobill'] = array('label'=>$langs->trans("TimeToBill"), 'checked'=>0, 'position'=>11);
@@ -187,8 +208,25 @@ if (empty($reshook)) {
 		$search_timespend = '';
 		$search_progresscalc = '';
 		$search_progressdeclare = '';
+		$search_task_budget_amount = '';
 		$toselect = '';
 		$search_array_options = array();
+		$search_date_start_startmonth = "";
+		$search_date_start_startyear = "";
+		$search_date_start_startday = "";
+		$search_date_start_start = "";
+		$search_date_start_endmonth = "";
+		$search_date_start_endyear = "";
+		$search_date_start_endday = "";
+		$search_date_start_end = "";
+		$search_date_end_startmonth = "";
+		$search_date_end_startyear = "";
+		$search_date_end_startday = "";
+		$search_date_end_start = "";
+		$search_date_end_endmonth = "";
+		$search_date_end_endyear = "";
+		$search_date_end_endday = "";
+		$search_date_end_end = "";
 	}
 
 	// Mass actions
@@ -220,6 +258,20 @@ if ($moresql) {
 	$morewherefilterarray[] = $moresql;
 }
 
+if ($search_date_start_start) {
+	$morewherefilterarray[] = " t.dateo >= '".$db->idate($search_date_start_start)."'";
+}
+if ($search_date_start_end) {
+	$morewherefilterarray[] = " t.dateo <= '".$db->idate($search_date_start_end)."'";
+}
+
+if ($search_date_end_start) {
+	$morewherefilterarray[] = " t.datee >= '".$db->idate($search_date_end_start)."'";
+}
+if ($search_date_end_end) {
+	$morewherefilterarray[] = " t.datee <= '".$db->idate($search_date_end_end)."'";
+}
+
 if (!empty($search_planedworkload)) {
 	$morewherefilterarray[] = natural_search('t.planned_workload', $search_planedworkload, 1, 1);
 }
@@ -238,6 +290,10 @@ if (!empty($search_progressdeclare)) {
 	$morewherefilterarray[] = natural_search('t.progress', $search_progressdeclare, 1, 1);
 }
 
+if ($search_task_budget_amount) {
+	$morewherefilterarray[]= natural_search('t.budget_amount', $search_task_budget_amount, 1, 1);
+}
+
 $morewherefilter = '';
 if (count($morewherefilterarray) > 0) {
 	$morewherefilter = ' AND '.implode(' AND ', $morewherefilterarray);
@@ -291,6 +347,7 @@ if ($action == 'createtask' && $user->rights->projet->creer) {
 			$task->date_start = $date_start;
 			$task->date_end = $date_end;
 			$task->progress = $progress;
+			$task->budget_amount = $budget_amount;
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $task);
@@ -417,6 +474,54 @@ if ($id > 0 || !empty($ref)) {
 	if ($search_dtendyear) {
 		$param .= '&search_dtendyear='.urlencode($search_dtendyear);
 	}
+	if ($search_date_start_startmonth) {
+		$param .= '&search_date_start_startmonth='.urlencode($search_date_start_startmonth);
+	}
+	if ($search_date_start_startyear) {
+		$param .= '&search_date_start_startyear='.urlencode($search_date_start_startyear);
+	}
+	if ($search_date_start_startday) {
+		$param .= '&search_date_start_startday='.urlencode($search_date_start_startday);
+	}
+	if ($search_date_start_start) {
+		$param .= '&search_date_start_start='.urlencode($search_date_start_start);
+	}
+	if ($search_date_start_endmonth) {
+		$param .= '&search_date_start_endmonth='.urlencode($search_date_start_endmonth);
+	}
+	if ($search_date_start_endyear) {
+		$param .= '&search_date_start_endyear='.urlencode($search_date_start_endyear);
+	}
+	if ($search_date_start_endday) {
+		$param .= '&search_date_start_endday='.urlencode($search_date_start_endday);
+	}
+	if ($search_date_start_end) {
+		$param .= '&search_date_start_end='.urlencode($search_date_start_end);
+	}
+	if ($search_date_end_startmonth) {
+		$param .= '&search_date_end_startmonth='.urlencode($search_date_end_startmonth);
+	}
+	if ($search_date_end_startyear) {
+		$param .= '&search_date_end_startyear='.urlencode($search_date_end_startyear);
+	}
+	if ($search_date_end_startday) {
+		$param .= '&search_date_end_startday='.urlencode($search_date_end_startday);
+	}
+	if ($search_date_end_start) {
+		$param .= '&search_date_end_start='.urlencode($search_date_end_start);
+	}
+	if ($search_date_end_endmonth) {
+		$param .= '&search_date_end_endmonth='.urlencode($search_date_end_endmonth);
+	}
+	if ($search_date_end_endyear) {
+		$param .= '&search_date_end_endyear='.urlencode($search_date_end_endyear);
+	}
+	if ($search_date_end_endday) {
+		$param .= '&search_date_end_endday='.urlencode($search_date_end_endday);
+	}
+	if ($search_date_end_end) {
+		$param .= '&search_date_end_end=' . urlencode($search_date_end_end);
+	}
 	if ($search_planedworkload) {
 		$param .= '&search_planedworkload='.urlencode($search_planedworkload);
 	}
@@ -429,6 +534,9 @@ if ($id > 0 || !empty($ref)) {
 	if ($search_progressdeclare) {
 		$param .= '&search_progressdeclare='.urlencode($search_progressdeclare);
 	}
+	if ($search_task_budget_amount) {
+		$param .= '&search_task_budget_amount='.urlencode($search_task_budget_amount);
+	}
 	if ($optioncss != '') {
 		$param .= '&optioncss='.urlencode($optioncss);
 	}
@@ -443,13 +551,13 @@ if ($id > 0 || !empty($ref)) {
 	// Title
 	$morehtmlref .= $object->title;
 	// Thirdparty
-	if ($object->thirdparty->id > 0) {
+	if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
-	if (!$user->rights->projet->all->lire) {
+	if (empty($user->rights->projet->all->lire)) {
 		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 		$object->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 	}
@@ -518,7 +626,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, '', $langs, 1, 0, 0, $conf->currency);
+		print '<span class="amount">'.price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
 	}
 	print '</td></tr>';
 
@@ -530,7 +638,6 @@ if ($id > 0 || !empty($ref)) {
 
 	print '</div>';
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border tableforfield centpercent">';
@@ -549,7 +656,6 @@ if ($id > 0 || !empty($ref)) {
 
 	print '</table>';
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
@@ -623,7 +729,7 @@ 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'), $projectid ? $projectid : $object->id, 'task_parent', 0, 0, 1, 1, 0, '0,1', 'maxwidth500');
+	$formother->selectProjectTasks(GETPOST('task_parent'), !empty($projectid) ? $projectid : $object->id, 'task_parent', 0, 0, 1, 1, 0, '0,1', 'maxwidth500');
 	print '</td></tr>';
 
 	// Assigned to
@@ -638,17 +744,17 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	// Date start
 	print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-	print $form->selectDate(($date_start ? $date_start : ''), 'dateo', 1, 1, 0, '', 1, 1);
+	print $form->selectDate((!empty($date_start) ? $date_start : ''), 'dateo', 1, 1, 0, '', 1, 1);
 	print '</td></tr>';
 
 	// Date end
 	print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-	print $form->selectDate(($date_end ? $date_end : -1), 'datee', -1, 1, 0, '', 1, 1);
+	print $form->selectDate((!empty($date_end) ? $date_end : -1), 'datee', -1, 1, 0, '', 1, 1);
 	print '</td></tr>';
 
 	// Planned workload
 	print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
-	print $form->select_duration('planned_workload', $planned_workload ? $planned_workload : 0, 0, 'text');
+	print $form->select_duration('planned_workload', !empty($planned_workload) ? $planned_workload : 0, 0, 'text');
 	print '</td></tr>';
 
 	// Progress
@@ -662,6 +768,10 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	print '<textarea name="description" class="quatrevingtpercent" rows="'.ROWS_4.'">'.$description.'</textarea>';
 	print '</td></tr>';
 
+	print '<tr><td>'.$langs->trans("Budget").'</td>';
+	print '<td><input size="5" type="text" name="budget_amount" value="'.dol_escape_htmltag(GETPOSTISSET('budget_amount') ? GETPOST('budget_amount') : '').'"></td>';
+	print '</tr>';
+
 	// Other options
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $taskstatic, $action); // Note that $action and $object may have been modified by hook
@@ -675,11 +785,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
-	print ' &nbsp; &nbsp; ';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel("Add");
 
 	print '</form>';
 } elseif ($id > 0 || !empty($ref)) {
@@ -705,9 +811,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	$linktocreatetask = dolGetButtonTitle($langs->trans('AddTask'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/tasks.php?action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id), '', $linktocreatetaskUserRight, $linktocreatetaskParam);
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
-	if ($optioncss != '') {
-		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	}
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
@@ -746,8 +850,8 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	$moreforfilter = '';
 	if (count($tasksarray) > 0) {
 		$moreforfilter .= '<div class="divsearchfield">';
-		$moreforfilter .= $langs->trans("TasksAssignedTo").': ';
-		$moreforfilter .= $form->select_dolusers($tmpuser->id > 0 ? $tmpuser->id : '', 'search_user_id', 1);
+		$moreforfilter .= img_picto('', 'user', 'class="pictofixedwidth"');
+		$moreforfilter .= $form->select_dolusers($tmpuser->id > 0 ? $tmpuser->id : '', 'search_user_id', $langs->trans("TasksAssignedTo"), null, 0, '', '');
 		$moreforfilter .= '</div>';
 	}
 	if ($moreforfilter) {
@@ -782,17 +886,29 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	if (!empty($arrayfields['t.dateo']['checked'])) {
 		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 '<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);
+		$formother->select_year($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>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_start_end ? $search_date_start_end : -1, 'search_date_start_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
 		print '</td>';
 	}
 
 	if (!empty($arrayfields['t.datee']['checked'])) {
 		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 '<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);
+		$formother->select_year($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>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_end_end ? $search_date_end_end : -1, 'search_date_end_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
 		print '</td>';
 	}
 
@@ -841,6 +957,12 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	}
 	*/
 
+	if (!empty($arrayfields['t.budget_amount']['checked'])) {
+		print '<td class="liste_titre center">';
+		print '<input type="text" class="flat" name="search_task_budget_amount" value="'.$search_task_budget_amount.'" size="4">';
+		print '</td>';
+	}
+
 	if (!empty($arrayfields['c.assigned']['checked'])) {
 		print '<td class="liste_titre right">';
 		print '</td>';
@@ -901,6 +1023,11 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		print_liste_field_titre("TaskRessourceLinks", $_SERVER["PHP_SELF"], '', '', $param, $sortfield, $sortorder);
 	}
 	*/
+
+	if (!empty($arrayfields['t.budget_amount']['checked'])) {
+		print_liste_field_titre($arrayfields['t.budget_amount']['label'], $_SERVER["PHP_SELF"], "", "", $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 ', '');
 	}
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index 76c5239fc17..a2bbba52305 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -137,7 +137,7 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= '</div>';
 
 			// Define a complementary filter for search of next/prev ref.
-			if (!$user->rights->projet->all->lire) {
+			if (empty($user->rights->projet->all->lire)) {
 				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 				$projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 			}
@@ -247,7 +247,6 @@ if ($id > 0 || !empty($ref)) {
 
 			print '</div>';
 			print '<div class="fichehalfright">';
-			print '<div class="ficheaddleft">';
 			print '<div class="underbanner clearboth"></div>';
 
 			print '<table class="border centpercent">';
@@ -266,7 +265,6 @@ if ($id > 0 || !empty($ref)) {
 
 			print '</table>';
 
-			print '</div>';
 			print '</div>';
 			print '</div>';
 
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 1f74d1bbc75..0b26161c28c 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -59,9 +59,9 @@ restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
 
 // Add new contact
 if ($action == 'addcontact' && $user->rights->projet->creer) {
-	$source  = 'internal';
+	$source = 'internal';
 	if (GETPOST("addsourceexternal")) {
-		$source  ='external';
+		$source = 'external';
 	}
 
 	$result = $object->fetch($id, $ref);
@@ -196,7 +196,7 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= '</div>';
 
 			// Define a complementary filter for search of next/prev ref.
-			if (!$user->rights->projet->all->lire) {
+			if (empty($user->rights->projet->all->lire)) {
 				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 				$projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 			}
@@ -277,10 +277,9 @@ if ($id > 0 || !empty($ref)) {
 
 			print '</div>';
 			print '<div class="fichehalfright">';
-			print '<div class="ficheaddleft">';
 			print '<div class="underbanner clearboth"></div>';
 
-			print '<table class="border tableforfield" width="100%">';
+			print '<table class="border tableforfield centpercent">';
 
 			// Description
 			print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
@@ -296,7 +295,6 @@ if ($id > 0 || !empty($ref)) {
 
 			print '</table>';
 
-			print '</div>';
 			print '</div>';
 			print '</div>';
 
@@ -408,7 +406,7 @@ if ($id > 0 || !empty($ref)) {
 			print '<td>';
 			$formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid');
 			print '</td>';
-			print '<td class="right" colspan="3" ><input type="submit" class="button" value="'.$langs->trans("Add").'" name="addsourceinternal"></td>';
+			print '<td class="right" colspan="3" ><input type="submit" class="button button-add" value="'.$langs->trans("Add").'" name="addsourceinternal"></td>';
 			print '</tr>';
 
 			// Line to add an external contact. Only if project linked to a third party.
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 3a56a7a018a..155cb261040 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -46,8 +46,8 @@ $project_ref = GETPOST('project_ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -74,6 +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
 
 
 /*
@@ -151,7 +152,7 @@ if ($object->id > 0) {
 		$morehtmlref .= '</div>';
 
 		// Define a complementary filter for search of next/prev ref.
-		if (!$user->rights->projet->all->lire) {
+		if (empty($user->rights->projet->all->lire)) {
 			$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 			$projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 		}
@@ -232,7 +233,6 @@ if ($object->id > 0) {
 
 		print '</div>';
 		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border tableforfield centpercent">';
@@ -251,7 +251,6 @@ if ($object->id > 0) {
 
 		print '</table>';
 
-		print '</div>';
 		print '</div>';
 		print '</div>';
 
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 8dc369b6a0a..697969c6060 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2006-2019 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2006-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2018	   Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2021      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
@@ -64,19 +65,33 @@ $search_task_ref_parent = GETPOST('search_task_ref_parent');
 $search_project_user = GETPOST('search_project_user', 'int');
 $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_opp_status = GETPOST("search_opp_status", 'alpha');
 
-$mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
+$mine = GETPOST('mode', 'alpha') == 'mine' ? 1 : 0;
 if ($mine) {
-	$search_task_user = $user->id; $mine = 0;
+	$search_task_user = $user->id;
+	$mine = 0;
 }
+$type = GETPOST('type');
 
-$search_sday	= GETPOST('search_sday', 'int');
-$search_smonth	= GETPOST('search_smonth', 'int');
-$search_syear	= GETPOST('search_syear', 'int');
-$search_eday	= GETPOST('search_eday', 'int');
-$search_emonth	= GETPOST('search_emonth', 'int');
-$search_eyear	= GETPOST('search_eyear', '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);
+$search_datelimit_startday = GETPOST('search_datelimit_startday', 'int');
+$search_datelimit_startmonth = GETPOST('search_datelimit_startmonth', 'int');
+$search_datelimit_startyear = GETPOST('search_datelimit_startyear', 'int');
+$search_datelimit_endday = GETPOST('search_datelimit_endday', 'int');
+$search_datelimit_endmonth = GETPOST('search_datelimit_endmonth', 'int');
+$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);
 
 // Initialize context for list
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'tasklist';
@@ -100,8 +115,8 @@ if (!$user->rights->projet->lire) {
 $diroutputmassaction = $conf->projet->dir_output.'/tasks/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -143,6 +158,7 @@ $arrayfields = array(
 	'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.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),
@@ -189,14 +205,25 @@ if (empty($reshook)) {
 		$search_task_description = "";
 		$search_task_ref_parent = "";
 		$search_task_progress = "";
+		$search_task_budget_amount = "";
 		$search_task_user = -1;
 		$search_project_user = -1;
-		$search_sday = '';
-		$search_smonth = '';
-		$search_syear = '';
-		$search_eday = '';
-		$search_emonth = '';
-		$search_eyear = '';
+		$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_datelimit_startday = '';
+		$search_datelimit_startmonth = '';
+		$search_datelimit_startyear = '';
+		$search_datelimit_endday = '';
+		$search_datelimit_endmonth = '';
+		$search_datelimit_endyear = '';
+		$search_datelimit_start = '';
+		$search_datelimit_end = '';
 		$toselect = '';
 		$search_array_options = array();
 	}
@@ -249,7 +276,7 @@ if ($id) {
 }
 
 // Get list of project id allowed to user (in a string list separated by coma)
-if (!$user->rights->projet->all->lire) {
+if (empty($user->rights->projet->all->lire)) {
 	$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
 }
 //var_dump($projectsListId);
@@ -293,6 +320,7 @@ $sql .= " s.nom as name, 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) {
 	$sql .= ", cs.fk_categorie, cs.fk_project";
@@ -304,7 +332,7 @@ if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed
 // 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
@@ -321,7 +349,7 @@ $sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
 if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed']['checked'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tt ON tt.fk_task = t.rowid";
 }
-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 ($search_project_user > 0) {
@@ -332,7 +360,7 @@ if ($search_task_user > 0) {
 }
 $sql .= " WHERE t.fk_projet = p.rowid";
 $sql .= " AND p.entity IN (".getEntity('project').')';
-if (!$user->rights->projet->all->lire) {
+if (empty($user->rights->projet->all->lire)) {
 	$sql .= " AND p.rowid IN (".$db->sanitize($projectsListId ? $projectsListId : '0').")"; // public and assigned to projects, or restricted to company for external users
 }
 if (is_object($projectstatic) && $projectstatic->id > 0) {
@@ -369,11 +397,24 @@ if ($search_task_ref_parent) {
 if ($search_task_progress) {
 	$sql .= natural_search('t.progress', $search_task_progress, 1);
 }
+if ($search_task_budget_amount) {
+	$sql .= natural_search('t.budget_amount', $search_task_budget_amount, 1);
+}
 if ($search_societe) {
 	$sql .= natural_search('s.nom', $search_societe);
 }
-$sql .= dolSqlDateFilter('t.dateo', $search_sday, $search_smonth, $search_syear);
-$sql .= dolSqlDateFilter('t.datee', $search_eday, $search_emonth, $search_eyear);
+if ($search_date_start) {
+	$sql .= " AND t.dateo >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+	$sql .= " AND t.dateo <= '".$db->idate($search_date_end)."'";
+}
+if ($search_datelimit_start) {
+	$sql .= " AND t.datee >= '".$db->idate($search_datelimit_start)."'";
+}
+if ($search_datelimit_end) {
+	$sql .= " AND t.datee <= '".$db->idate($search_datelimit_end)."'";
+}
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
@@ -400,7 +441,7 @@ if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed
 	$sql .= " GROUP BY p.rowid, p.ref, p.title, p.fk_statut, p.datee, p.fk_opp_status, p.public, p.fk_user_creat,";
 	$sql .= " s.nom, s.rowid,";
 	$sql .= " t.datec, t.dateo, t.datee, t.tms,";
-	$sql .= " t.rowid, t.ref, t.label, t.planned_workload, t.duration_effective, t.progress, t.fk_statut";
+	$sql .= " t.rowid, t.ref, t.label, t.planned_workload, t.duration_effective, t.progress,t.budget_amount, t.fk_statut";
 	if ($search_categ) {
 		$sql .= ", cs.fk_categorie, cs.fk_project";
 	}
@@ -454,23 +495,44 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
-if ($search_sday) {
-	$param .= '&search_sday='.urlencode($search_sday);
+if ($search_date_startday) {
+	$param .= '&search_date_startday='.urlencode($search_date_startday);
 }
-if ($search_smonth) {
-	$param .= '&search_smonth='.urlencode($search_smonth);
+if ($search_date_startmonth) {
+	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
 }
-if ($search_syear) {
-	$param .= '&search_syear='.urlencode($search_syear);
+if ($search_date_startyear) {
+	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
 }
-if ($search_eday) {
-	$param .= '&search_eday='.urlencode($search_eday);
+if ($search_date_endday) {
+	$param .= '&search_date_endday='.urlencode($search_date_endday);
 }
-if ($search_emonth) {
-	$param .= '&search_emonth='.urlencode($search_emonth);
+if ($search_date_endmonth) {
+	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
 }
-if ($search_eyear) {
-	$param .= '&search_eyear='.urlencode($search_eyear);
+if ($search_date_endyear) {
+	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+}
+if ($search_datelimit_startday)	{
+	$param .= '&search_datelimit_startday='.urlencode($search_datelimit_startday);
+}
+if ($search_datelimit_startmonth) {
+	$param .= '&search_datelimit_startmonth='.urlencode($search_datelimit_startmonth);
+}
+if ($search_datelimit_startyear) {
+	$param .= '&search_datelimit_startyear='.urlencode($search_datelimit_startyear);
+}
+if ($search_datelimit_endday) {
+	$param .= '&search_datelimit_endday='.urlencode($search_datelimit_endday);
+}
+if ($search_datelimit_endmonth) {
+	$param .= '&search_datelimit_endmonth='.urlencode($search_datelimit_endmonth);
+}
+if ($search_datelimit_endyear) {
+	$param .= '&search_datelimit_endyear='.urlencode($search_datelimit_endyear);
+}
+if ($search_task_budget_amount) {
+	$param .= '&search_task_budget_amount='.urlencode($search_task_budget_amount);
 }
 if ($socid) {
 	$param .= '&socid='.urlencode($socid);
@@ -545,7 +607,9 @@ 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="type" value="'.$type.'">';
+if (!empty($type)) {
+	print '<input type="hidden" name="type" value="'.$type.'">';
+}
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 // Show description of content
@@ -575,7 +639,7 @@ if ($search_all) {
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
-$morehtmlfilter = '';
+$moreforfilter = '';
 
 // Filter on categories
 if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
@@ -646,22 +710,26 @@ if (!empty($arrayfields['t.description']['checked'])) {
 }
 // Start date
 if (!empty($arrayfields['t.dateo']['checked'])) {
-	print '<td class="liste_titre center minwidth150">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-		print '<input class="flat" type="text" size="1" maxlength="2" name="search_sday" value="'.$search_sday.'">';
-	}
-	print '<input class="flat" type="text" size="1" maxlength="2" name="search_smonth" value="'.$search_smonth.'">';
-	print $formother->selectyear($search_syear ? $search_syear : -1, 'search_syear', 1, 20, 5, 0, 0, '', 'valignmiddle width75', 1);
+	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>';
 }
 // End date
 if (!empty($arrayfields['t.datee']['checked'])) {
-	print '<td class="liste_titre center minwidth150">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-		print '<input class="flat" type="text" size="1" maxlength="2" name="search_eday" value="'.$search_eday.'">';
-	}
-	print '<input class="flat" type="text" size="1" maxlength="2" name="search_emonth" value="'.$search_emonth.'">';
-	print $formother->selectyear($search_eyear ? $search_eyear : -1, 'search_eyear', 1, 20, 5, 0, 0, '', 'valignmiddle width75', 1);
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_datelimit_start ? $search_datelimit_start : -1, 'search_datelimit_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_datelimit_end ? $search_datelimit_end : -1, 'search_datelimit_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	// TODO Add option late
+	//print '<br><input type="checkbox" name="search_option" value="late"'.($option == 'late' ? ' checked' : '').'> '.$langs->trans("Alert");
+	print '</div>';
 	print '</td>';
 }
 if (!empty($arrayfields['p.ref']['checked'])) {
@@ -707,6 +775,13 @@ if (!empty($arrayfields['t.progress']['checked'])) {
 if (!empty($arrayfields['t.progress_summary']['checked'])) {
 	print '<td class="liste_titre"></td>';
 }
+
+if (!empty($arrayfields['t.budget_amount']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<input type="text" class="flat" name="search_task_budget_amount" value="'.$search_task_budget_amount.'" size="4">';
+	print '</td>';
+}
+
 if (!empty($arrayfields['t.tobill']['checked'])) {
 	print '<td class="liste_titre"></td>';
 }
@@ -782,16 +857,43 @@ if (!empty($arrayfields['t.progress']['checked'])) {
 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(
+		't.planned_workload' => 0,
+		't.duration_effective' => 0,
+		't.progress' => 0,
+		't.budget_amount' => 0,
+	),
+	'totalplannedworkload' => 0,
+	'totaldurationeffective' => 0,
+	'totaldurationdeclared' => 0,
+	'totaltobillfield' => 0,
+	'totalbilledfield' => 0,
+	'totalbudget_amountfield' => 0,
+	'totalbudgetamount' => 0,
+	'totaltobill' => 0,
+	'totalbilled' => 0,
+);
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array(
+	'arrayfields' => $arrayfields,
+	'param' => $param,
+	'sortfield' => $sortfield,
+	'sortorder' => $sortorder,
+	'totalarray' => &$totalarray,
+);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['t.datec']['checked'])) {
@@ -814,7 +916,6 @@ if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) {
 }
 
 $i = 0;
-$totalarray = array();
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 
@@ -824,6 +925,7 @@ while ($i < min($num, $limit)) {
 	$object->description = $obj->description;
 	$object->fk_statut = $obj->fk_statut;
 	$object->progress = $obj->progress;
+	$object->budget_amount = $obj->budget_amount;
 	$object->date_start = $db->jdate($obj->date_start);
 	$object->date_end = $db->jdate($obj->date_end);
 	$object->planned_workload = $obj->planned_workload;
@@ -1063,6 +1165,22 @@ while ($i < min($num, $limit)) {
 				$totalarray['totalprogress_summary'] = $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']++;
+			}
+			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">';
@@ -1179,6 +1297,8 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
 			print '<td class="center">'.convertSecondToTime($totalarray['totaltobill'], $plannedworkloadoutputformat).'</td>';
 		} elseif ($totalarray['totalbilledfield'] == $i) {
 			print '<td class="center">'.convertSecondToTime($totalarray['totalbilled'], $plannedworkloadoutputformat).'</td>';
+		} elseif ($totalarray['totalbudget_amountfield'] == $i) {
+			print '<td class="center">'.price($totalarray['totalbudgetamount'], 0, $langs, 1, 0, 0, $conf->currency).'</td>';
 		} else {
 			print '<td></td>';
 		}
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 3ad4aaa3b7b..5f3d74a3c68 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -44,7 +44,9 @@ $socid = 0;
 if (!$user->rights->projet->lire) {
 	accessforbidden();
 }
-//$result = restrictedArea($user, 'projet', $id, '', 'task'); // TODO ameliorer la verification
+
+$hookmanager->initHooks(array('projettasknote'));
+
 
 $object = new Task($db);
 $projectstatic = new Project($db);
@@ -86,6 +88,7 @@ if ($id > 0 || $ref) {
 	$object->fetch($id, $ref);
 }
 
+//$result = restrictedArea($user, 'projet', $id, '', 'task'); // TODO ameliorer la verification
 restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
 
 $permissionnote = ($user->rights->projet->creer || $user->rights->projet->all->creer);
@@ -95,7 +98,13 @@ $permissionnote = ($user->rights->projet->creer || $user->rights->projet->all->c
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';
+$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
+}
 
 
 /*
@@ -133,7 +142,7 @@ if ($object->id > 0) {
 		$morehtmlref .= '</div>';
 
 		// Define a complementary filter for search of next/prev ref.
-		if (!$user->rights->projet->all->lire) {
+		if (empty($user->rights->projet->all->lire)) {
 			$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 			$projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 		}
@@ -214,7 +223,6 @@ if ($object->id > 0) {
 
 		print '</div>';
 		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border centpercent tableforfield">';
@@ -233,7 +241,6 @@ if ($object->id > 0) {
 
 		print '</table>';
 
-		print '</div>';
 		print '</div>';
 		print '</div>';
 
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index 76c74ba343c..70c093f46e3 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -168,11 +168,13 @@ if (!in_array($nowyear, $arrayyears)) {
 	$arrayyears[$nowyear] = $nowyear;
 }
 arsort($arrayyears);
-print $form->selectarray('year', $arrayyears, $year, 0);
+print $form->selectarray('year', $arrayyears, $year, 0, 0, 0, '', 0, 0, 0, '', 'width75');
 print '</td></tr>';
 print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
+
 print '</form>';
+
 print '<br><br>';
 
 
@@ -190,13 +192,13 @@ foreach ($data_all_year as $val) {
 		$oldyear--;
 
 		print '<tr class="oddeven" height="24">';
-		print '<td><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.'</a></td>';
+		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.'</a></td>';
 		print '<td class="right">0</td>';
 		print '</tr>';
 	}
 
 	print '<tr class="oddeven" height="24">';
-	print '<td><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
+	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 '</tr>';
 	$oldyear = $year;
@@ -205,7 +207,7 @@ foreach ($data_all_year as $val) {
 print '</table>';
 print '</div>';
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 $stringtoshow = '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
 if ($mesg) {
@@ -219,9 +221,12 @@ $stringtoshow .= '</td></tr></table>';
 print $stringtoshow;
 
 
-print '</div></div></div>';
+print '</div></div>';
+
 print '<div style="clear:both"></div>';
 
+print dol_get_fiche_end();
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index bec61ec0f48..8e773f92788 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -105,6 +105,7 @@ if ($action == 'update' && !GETPOST("cancel") && $user->rights->projet->creer) {
 		$object->date_start = dol_mktime(GETPOST('dateohour', 'int'), GETPOST('dateomin', 'int'), 0, GETPOST('dateomonth', 'int'), GETPOST('dateoday', 'int'), GETPOST('dateoyear', 'int'));
 		$object->date_end = dol_mktime(GETPOST('dateehour', 'int'), GETPOST('dateemin', 'int'), 0, GETPOST('dateemonth', 'int'), GETPOST('dateeday', 'int'), GETPOST('dateeyear', 'int'));
 		$object->progress = price2num(GETPOST('progress', 'alphanohtml'));
+		$object->budget_amount = price2num(GETPOST('budget_amount', 'alphanohtml'));
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
@@ -116,6 +117,7 @@ if ($action == 'update' && !GETPOST("cancel") && $user->rights->projet->creer) {
 			$result = $object->update($user);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
+				$action = 'edit';
 			}
 		}
 	} else {
@@ -234,7 +236,7 @@ if ($id > 0 || !empty($ref)) {
 		$morehtmlref .= '</div>';
 
 		// Define a complementary filter for search of next/prev ref.
-		if (!$user->rights->projet->all->lire) {
+		if (empty($user->rights->projet->all->lire)) {
 			$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 			$projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 		}
@@ -316,7 +318,6 @@ if ($id > 0 || !empty($ref)) {
 		print '</div>';
 
 		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border centpercent">';
@@ -335,7 +336,6 @@ if ($id > 0 || !empty($ref)) {
 
 		print '</table>';
 
-		print '</div>';
 		print '</div>';
 		print '</div>';
 
@@ -403,8 +403,8 @@ if ($id > 0 || !empty($ref)) {
 
 			// Third party
 			print '<td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
-			if ($projectstatic->societe->id) {
-				print $projectstatic->societe->getNomUrl(1);
+			if ($projectstatic->thirdparty->id) {
+				print $projectstatic->thirdparty->getNomUrl(1);
 			} else {
 				print '&nbsp;';
 			}
@@ -442,6 +442,10 @@ if ($id > 0 || !empty($ref)) {
 		print '<textarea name="description" class="quatrevingtpercent" rows="'.ROWS_4.'">'.$object->description.'</textarea>';
 		print '</td></tr>';
 
+		print '<tr><td>'.$langs->trans("Budget").'</td>';
+		print '<td><input size="5" type="text" name="budget_amount" value="'.dol_escape_htmltag(GETPOSTISSET('budget_amount') ? GETPOST('budget_amount') : price2num($object->budget_amount)).'"></td>';
+		print '</tr>';
+
 		// Other options
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -454,10 +458,7 @@ if ($id > 0 || !empty($ref)) {
 
 		print dol_get_fiche_end();
 
-		print '<div class="center">';
-		print '<input type="submit" class="button" name="update" value="'.$langs->trans("Modify").'"> &nbsp; ';
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
+		print $form->buttonsSaveCancel("Modify");
 
 		print '</form>';
 	} else {
@@ -541,7 +542,7 @@ if ($id > 0 || !empty($ref)) {
 		print '</table>';
 		print '</div>';
 
-		print '<div class="fichehalfright"><div class="ficheaddleft">';
+		print '<div class="fichehalfright">';
 
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent tableforfield">';
@@ -567,6 +568,13 @@ if ($id > 0 || !empty($ref)) {
 		}
 		print '</td></tr>';
 
+		// 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 '</td></tr>';
+
 		// Other attributes
 		$cols = 3;
 		$parameters = array('socid'=>$socid);
@@ -574,7 +582,6 @@ if ($id > 0 || !empty($ref)) {
 
 		print '</table>';
 
-		print '</div>';
 		print '</div>';
 
 		print '</div>';
@@ -597,7 +604,7 @@ if ($id > 0 || !empty($ref)) {
 		if (empty($reshook)) {
 			// Modify
 			if ($user->rights->projet->creer) {
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit&amp;withproject='.$withproject.'">'.$langs->trans('Modify').'</a>';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken().'&withproject='.((int) $withproject).'">'.$langs->trans('Modify').'</a>';
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Modify').'</a>';
 			}
@@ -605,7 +612,7 @@ if ($id > 0 || !empty($ref)) {
 			// Delete
 			if ($user->rights->projet->supprimer) {
 				if (!$object->hasChildren() && !$object->hasTimeSpent()) {
-					print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'&amp;withproject='.$withproject.'">'.$langs->trans('Delete').'</a>';
+					print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().'&withproject='.((int) $withproject).'">'.$langs->trans('Delete').'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("TaskHasChild").'">'.$langs->trans('Delete').'</a>';
 				}
@@ -630,7 +637,7 @@ if ($id > 0 || !empty($ref)) {
 
 		print $formfile->showdocuments('project_task', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf);
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
@@ -638,7 +645,7 @@ if ($id > 0 || !empty($ref)) {
 		$defaultthirdpartyid = $socid > 0 ? $socid : $object->project->socid;
 		$formactions->showactions($object, 'task', $defaultthirdpartyid, 1, '', 10, 'withproject='.$withproject);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 }
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 3c0fbecc7b0..bc6ec7d15cf 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1,11 +1,11 @@
 <?php
 /* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2020	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2021	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2010-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2019       Christophe Battarel		<christophe@altairis.fr>
+ * Copyright (C) 2019-2021  Christophe Battarel		<christophe@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formintervention.class.php';
 
 // Load translation files required by the page
 $langsLoad=array('projects', 'bills', 'orders');
@@ -73,16 +74,9 @@ $search_task_label = GETPOST('search_task_label', 'alpha');
 $search_user = GETPOST('search_user', 'int');
 $search_valuebilled = GETPOST('search_valuebilled', 'int');
 
-// Security check
-$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.
-if (!$user->rights->projet->lire) {
-	accessforbidden();
-}
-
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -97,6 +91,8 @@ if (!$sortorder) {
 	$sortorder = 'DESC,DESC,DESC';
 }
 
+$childids = $user->getAllChildIds(1);
+
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 //$object = new TaskTime($db);
 $hookmanager->initHooks(array('projecttasktime', 'globalcard'));
@@ -107,11 +103,28 @@ $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($projectstatic->table_element);
 $extrafields->fetch_name_optionals_label($object->table_element);
 
+// Load task
 if ($id > 0 || $ref) {
 	$object->fetch($id, $ref);
 }
 
-restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
+
+// Security check
+$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.
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
+
+if ($object->fk_project > 0) {
+	restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
+} else {
+	restrictedArea($user, 'projet', null, 'projet&project');
+	// We check user has permission to see all tasks of all users
+	if (empty($projectid) && !$user->hasRight('projet', 'all', 'lire')) {
+		$search_user = $user->id;
+	}
+}
 
 
 
@@ -122,7 +135,7 @@ restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
 if (GETPOST('cancel', 'alpha')) {
 	$action = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_generateinvoice') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_generateinvoice' && $massaction != 'confirm_generateinter') {
 	$massaction = '';
 }
 
@@ -236,10 +249,14 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			$id = GETPOST('taskid', 'int');
 
 			$object->fetchTimeSpent(GETPOST('lineid', 'int'));
-			// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
-			$result = $object->delTimeSpent($user);
+
+			$result = 0;
+			if (in_array($object->timespent_fk_user, $childids) || $user->rights->projet->all->creer) {
+				$result = $object->delTimeSpent($user);
+			}
 
 			$object->fetch($id, $ref);
+
 			$object->timespent_note = GETPOST("timespent_note_line", 'alpha');
 			$object->timespent_old_duration = GETPOST("old_duration");
 			$object->timespent_duration = GETPOSTINT("new_durationhour") * 60 * 60; // We store duration in seconds
@@ -251,7 +268,12 @@ 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');
-			$result = $object->addTimeSpent($user);
+
+			$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 {
@@ -260,7 +282,6 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			}
 		} else {
 			$object->fetch($id, $ref);
-			// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
 
 			$object->timespent_id = GETPOST("lineid", 'int');
 			$object->timespent_note = GETPOST("timespent_note_line");
@@ -275,12 +296,16 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			}
 			$object->timespent_fk_user = GETPOST("userid_line", 'int');
 
-			$result = $object->updateTimeSpent($user);
-			if ($result >= 0) {
-				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-			} else {
-				setEventMessages($langs->trans($object->error), null, 'errors');
-				$error++;
+			$result = 0;
+			if (in_array($object->timespent_fk_user, $childids) || $user->rights->projet->all->creer) {
+				$result = $object->updateTimeSpent($user);
+
+				if ($result >= 0) {
+					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+				} else {
+					setEventMessages($langs->trans($object->error), null, 'errors');
+					$error++;
+				}
 			}
 		}
 	} else {
@@ -288,18 +313,20 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->lire) {
-	$object->fetchTimeSpent(GETPOST('lineid', 'int'));
-	// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
-	$result = $object->delTimeSpent($user);
+if ($action == 'confirm_deleteline' && $confirm == "yes" && $user->rights->projet->lire) {
+	$object->fetchTimeSpent(GETPOST('lineid', 'int'));	// load properties like $object->timespent_id
 
-	if ($result < 0) {
-		$langs->load("errors");
-		setEventMessages($langs->trans($object->error), null, 'errors');
-		$error++;
-		$action = '';
-	} else {
-		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+	if (in_array($object->timespent_fk_user, $childids) || $user->rights->projet->all->creer) {
+		$result = $object->delTimeSpent($user);	// delete line with $object->timespent_id
+
+		if ($result < 0) {
+			$langs->load("errors");
+			setEventMessages($langs->trans($object->error), null, 'errors');
+			$error++;
+			$action = '';
+		} else {
+			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+		}
 	}
 }
 
@@ -334,6 +361,10 @@ if (GETPOST('projectid', 'int') > 0) {
 	$object->fetch($id);
 	$result = $projectstatic->fetch($object->fk_project);
 }
+// If not task selected and no project selected
+if ($id <= 0 && $projectidforalltimes == 0) {
+	$allprojectforuser = $user->id;
+}
 
 if ($action == 'confirm_generateinvoice') {
 	if (!empty($projectstatic->socid)) {
@@ -455,6 +486,7 @@ if ($action == 'confirm_generateinvoice') {
 				}
 			} 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
 					$object->fetchTimeSpent($value);
@@ -468,6 +500,20 @@ if ($action == 'confirm_generateinvoice') {
 					$arrayoftasks[$object->timespent_id]['timespent'] = $object->timespent_duration;
 					$arrayoftasks[$object->timespent_id]['totalvaluetodivideby3600'] = $object->timespent_duration * $object->timespent_thm;
 					$arrayoftasks[$object->timespent_id]['note'] = $ftask->ref.' - '.$ftask->label.' - '.$username.($object->timespent_note ? ' - '.$object->timespent_note : '');		// TODO Add user name in note
+					if (!empty($withdetail)) {
+						if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) {
+							$arrayoftasks[$object->timespent_id]['note'] .= "<br/>";
+						} else {
+							$arrayoftasks[$object->timespent_id]['note'] .= "\n";
+						}
+
+						if (!empty($object->timespent_withhour)) {
+							$arrayoftasks[$object->timespent_id]['note'] .= $langs->trans("Date") . ': ' . dol_print_date($object->timespent_datehour);
+						} else {
+							$arrayoftasks[$object->timespent_id]['note'] .= $langs->trans("Date") . ': ' . dol_print_date($object->timespent_date);
+						}
+						$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;
 				}
 
@@ -477,7 +523,6 @@ if ($action == 'confirm_generateinvoice') {
 
 					// 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)) {
@@ -574,6 +619,81 @@ if ($action == 'confirm_generateinvoice') {
 	}
 }
 
+if ($action == 'confirm_generateinter') {
+	$langs->load('interventions');
+
+	if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+
+	if (!($projectstatic->thirdparty->id > 0)) {
+		setEventMessages($langs->trans("ThirdPartyRequiredToGenerateIntervention"), null, 'errors');
+	} else {
+		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+
+		require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+		$tmpinter = new Fichinter($db);
+		$tmptimespent = new Task($db);
+		$fuser = new User($db);
+
+		$db->begin();
+		$interToUse = GETPOST('interid', 'int');
+
+
+		$tmpinter->socid = $projectstatic->thirdparty->id;
+		$tmpinter->date = dol_mktime(GETPOST('rehour', 'int'), GETPOST('remin', 'int'), GETPOST('resec', 'int'), GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$tmpinter->fk_project = $projectstatic->id;
+		$tmpinter->description = $projectstatic->title . ( ! empty($projectstatic->description) ? '-' . $projectstatic->label : '' );
+
+		if ($interToUse) {
+			$tmpinter->fetch($interToUse);
+		} else {
+			$result = $tmpinter->create($user);
+			if ($result <= 0) {
+				$error++;
+				setEventMessages($tmpinter->error, $tmpinter->errors, 'errors');
+			}
+		}
+
+		if (!$error) {
+			$arrayoftasks = array();
+			foreach ($toselect as $key => $value) {
+				// Get userid, timepent
+				$object->fetchTimeSpent($value);
+				// $object->id is the task 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;
+				$arrayoftasks[$object->timespent_id]['date'] = date('Y-m-d H:i:s', $object->timespent_datehour);
+			}
+
+			foreach ($arrayoftasks as $timespent_id => $value) {
+				$ftask = new Task($db);
+				$ftask->fetch($object->id);
+				// Define qty per hour
+				$qtyhour = $value['timespent'] / 3600;
+				$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
+
+				// Add lines
+				$lineid = $tmpinter->addline($user, $tmpinter->id, $ftask->label . ( ! empty($value['note']) ? ' - ' . $value['note'] : '' ), $value['date'], $value['timespent']);
+			}
+		}
+
+		if (!$error) {
+			$urltointer = $tmpinter->getNomUrl(0);
+			$mesg = $langs->trans("InterventionGeneratedFromTimeSpent", '{s1}');
+			$mesg = str_replace('{s1}', $urltointer, $mesg);
+			setEventMessages($mesg, null, 'mesgs');
+
+			//var_dump($tmpinvoice);
+
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
+}
 
 /*
  * View
@@ -588,7 +708,7 @@ $formother = new FormOther($db);
 $formproject = new FormProjets($db);
 $userstatic = new User($db);
 
-if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
+if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser > 0) {
 	/*
 	 * Fiche projet en mode visu
 	 */
@@ -629,7 +749,16 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 			$head = project_prepare_head($projectstatic);
 			print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
 
-			$param = ($mode == 'mine' ? '&mode=mine' : '');
+			$param = ((!empty($mode) && $mode == 'mine') ? '&mode=mine' : '');
+			if ($search_user) {
+				$param .= '&search_user='.((int) $search_user);
+			}
+			if ($search_month) {
+				$param .= '&search_month='.((int) $search_month);
+			}
+			if ($search_year) {
+				$param .= '&search_year='.((int) $search_year);
+			}
 
 			// Project card
 
@@ -639,18 +768,18 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 			// 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>';
 
 			// Define a complementary filter for search of next/prev ref.
-			if (!$user->rights->projet->all->lire) {
+			if (empty($user->rights->projet->all->lire)) {
 				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 				$projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 			}
 
-			dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+			dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
 
 			print '<div class="fichecenter">';
 			print '<div class="fichehalfleft">';
@@ -683,7 +812,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 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);
 				}
@@ -714,7 +843,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 			// 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>';
 
@@ -726,7 +855,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 
 			print '</div>';
 			print '<div class="fichehalfright">';
-			print '<div class="ficheaddleft">';
 			print '<div class="underbanner clearboth"></div>';
 
 			print '<table class="border tableforfield centpercent">';
@@ -745,7 +873,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 
 			print '</table>';
 
-			print '</div>';
 			print '</div>';
 			print '</div>';
 
@@ -778,29 +905,35 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 			}
 		}
 
-		$linktocreatetime = dolGetButtonTitle($langs->trans('AddTimeSpent'), $linktocreatetimeHelpText, 'fa fa-plus-circle', $linktocreatetimeUrl, '', $linktocreatetimeBtnStatus);
+		$paramsbutton = array('morecss'=>'reposition');
+		$linktocreatetime = dolGetButtonTitle($langs->trans('AddTimeSpent'), $linktocreatetimeHelpText, 'fa fa-plus-circle', $linktocreatetimeUrl, '', $linktocreatetimeBtnStatus, $paramsbutton);
 	}
 
 	$massactionbutton = '';
+	$arrayofmassactions = array();
 	if ($projectstatic->usage_bill_time) {
 		$arrayofmassactions = array(
 			'generateinvoice'=>$langs->trans("GenerateBill"),
 			//'builddoc'=>$langs->trans("PDFMerge"),
 		);
-		//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'))) {
-			$arrayofmassactions = array();
-		}
-		$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 	}
+	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'))) {
+		$arrayofmassactions = array();
+	}
+	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	// Show section with information of task. If id of task is not defined and project id defined, then $projectidforalltimes is not empty.
-	if (empty($projectidforalltimes)) {
+	if (empty($projectidforalltimes) && empty($allprojectforuser)) {
 		$head = task_prepare_head($object);
 		print dol_get_fiche_head($head, 'task_time', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
 
 		if ($action == 'deleteline') {
-			print $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_delete", '', '', 1);
+			print $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);
 		}
 
 		$param = ($withproject ? '&withproject=1' : '');
@@ -860,7 +993,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 		print '</table>';
 		print '</div>';
 
-		print '<div class="fichehalfright"><div class="ficheaddleft">';
+		print '<div class="fichehalfright">';
 
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border tableforfield centpercent">';
@@ -888,7 +1021,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 
 		print '</table>';
 
-		print '</div>';
 		print '</div>';
 
 		print '</div>';
@@ -898,9 +1030,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 	}
 
 
-	if ($projectstatic->id > 0) {
+	if ($projectstatic->id > 0 || $allprojectforuser > 0) {
 		if ($action == 'deleteline' && !empty($projectidforalltimes)) {
-			print $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_delete", '', '', 1);
+			print $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);
 		}
 
 		// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
@@ -982,6 +1114,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 			print '<input type="hidden" name="action" value="addtimespent">';
 		} elseif ($massaction == 'generateinvoice' && $user->rights->facture->lire) {
 			print '<input type="hidden" name="action" value="confirm_generateinvoice">';
+		} elseif ($massaction == 'generateinter' && $user->rights->ficheinter->lire) {
+			print '<input type="hidden" name="action" value="confirm_generateinter">';
 		} else {
 			print '<input type="hidden" name="action" value="list">';
 		}
@@ -1020,6 +1154,25 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 					'onelineperperiod'=>'OneLinePerTimeSpentLine',
 				);
 				print $form->selectarray('generateinvoicemode', $tmparray, 'onelineperuser', 0, 0, 0, '', 1);
+				print "\n".'<script type="text/javascript">';
+				print '
+				$(document).ready(function () {
+					setDetailVisibility();
+					$("#generateinvoicemode").change(function() {
+            			setDetailVisibility();
+            		});
+            		function setDetailVisibility() {
+            			generateinvoicemode = $("#generateinvoicemode option:selected").val();
+            			if (generateinvoicemode=="onelineperperiod") {
+            				$("#detail_time_duration").show();
+            			} else {
+            				$("#detail_time_duration").hide();
+            			}
+            		}
+            	});
+            			';
+				print '</script>'."\n";
+				print '<span style="display:none" id="detail_time_duration"><input type="checkbox" value="detail" name="detail_time_duration"/>'.$langs->trans('AddDetailDateAndDuration').'</span>';
 				print '</td>';
 				print '</tr>';
 
@@ -1065,6 +1218,36 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 				print '</div>';
 				$massaction = '';
 			}
+		} elseif ($massaction == 'generateinter') {
+			// Form to convert time spent into invoice
+			print '<input type="hidden" name="massaction" value="confirm_createinter">';
+
+			if ($projectstatic->thirdparty->id > 0) {
+				print '<table class="noborder" width="100%" >';
+				print '<tr>';
+				print '<td class="titlefield">';
+				print $langs->trans('InterToUse');
+				print '</td>';
+				print '<td>';
+				$forminter = new FormIntervention($db);
+				print $forminter->select_interventions($projectstatic->thirdparty->id, '', 'interid', 24, $langs->trans('NewInter'), true);
+				print '</td>';
+				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').'">';
+				print '</div>';
+				print '<br>';
+			} else {
+				print '<div class="warning">'.$langs->trans("ThirdPartyRequiredToGenerateIntervention").'</div>';
+				print '<div class="center">';
+				print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
+				print '</div>';
+				$massaction = '';
+			}
 		}
 
 		/*
@@ -1073,7 +1256,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 		$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 .= " pt.ref, pt.label,";
+		$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 .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
@@ -1082,11 +1265,20 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 		$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";
 
-		if (empty($projectidforalltimes)) {
+		if (empty($projectidforalltimes) && empty($allprojectforuser)) {
+			// Limit on one task
 			$sql .= " AND t.fk_task =".((int) $object->id);
-		} else {
+		} elseif (!empty($projectidforalltimes)) {
+			// Limit on one project
 			$sql .= " AND pt.fk_projet IN (".$db->sanitize($projectidforalltimes).")";
+		} elseif (!empty($allprojectforuser)) {
+			// Limit on on user
+			if (empty($search_user)) {
+				$search_user = $user->id;
+			}
+			$sql .= " AND t.fk_user = ".((int) $search_user);
 		}
+
 		if ($search_note) {
 			$sql .= natural_search('t.note', $search_note);
 		}
@@ -1147,7 +1339,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 
 				print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'clock', 0, $linktocreatetime, '', $limit, 0, 0, 1);
 			} else {
-				print '<!-- List of time spent for project -->'."\n";
+				print '<!-- List of time spent -->'."\n";
 
 				$title = $langs->trans("ListTaskTimeForTask");
 
@@ -1179,6 +1371,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans("Date").'</td>';
+			if (!empty($allprojectforuser)) {
+				print '<td>'.$langs->trans("Project").'</td>';
+			}
 			if (empty($id)) {
 				print '<td>'.$langs->trans("Task").'</td>';
 			}
@@ -1200,11 +1395,17 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 			print $form->selectDate($newdate, 'time', ($conf->browser->layout == 'phone' ? 2 : 1), 1, 2, "timespent_date", 1, 0);
 			print '</td>';
 
+			if (!empty($allprojectforuser)) {
+				print '<td>';
+				// Add project selector
+				print '</td>';
+			}
+
 			// Task
 			$nboftasks = 0;
 			if (empty($id)) {
 				print '<td class="maxwidthonsmartphone">';
-				$nboftasks = $formproject->selectTasks(-1, GETPOST('taskid', 'int'), 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
+				$nboftasks = $formproject->selectTasks(-1, GETPOST('taskid', 'int'), 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, 'progress');
 				print '</td>';
 			}
 
@@ -1256,7 +1457,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 			}
 
 			print '<td class="center">';
-			print '<input type="submit" name="save" class="button buttongen marginleftonly margintoponlyshort marginbottomonlyshort" value="'.$langs->trans("Add").'">';
+			$form->buttonsSaveCancel();
+			print '<input type="submit" name="save" class="button buttongen marginleftonly margintoponlyshort marginbottomonlyshort button-add" value="'.$langs->trans("Add").'">';
 			print '<input type="submit" name="cancel" class="button buttongen marginleftonly margintoponlyshort marginbottomonlyshort button-cancel" value="'.$langs->trans("Cancel").'">';
 			print '</td></tr>';
 
@@ -1301,6 +1503,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 			$formother->select_year($search_year, 'search_year', 1, 20, 5);
 			print '</td>';
 		}
+		if (!empty($allprojectforuser)) {
+			print '<td></td>';
+		}
+		// Task
 		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
 			if (!empty($arrayfields['t.task_ref']['checked'])) {
 				print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
@@ -1349,6 +1555,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 		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($allprojectforuser)) {
+			print_liste_field_titre("Project", $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+		}
 		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
 			if (!empty($arrayfields['t.task_ref']['checked'])) {
 				print_liste_field_titre($arrayfields['t.task_ref']['label'], $_SERVER['PHP_SELF'], 'pt.ref', '', $param, '', $sortfield, $sortorder);
@@ -1388,8 +1597,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 
 		$i = 0;
 
-		$childids = $user->getAllChildIds();
-
 		$total = 0;
 		$totalvalue = 0;
 		$totalarray = array();
@@ -1421,6 +1628,23 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 				}
 			}
 
+			// Project ref
+			if (!empty($allprojectforuser)) {
+				print '<td class="nowraponall">';
+				if (empty($conf->cache['project'][$task_time->fk_projet])) {
+					$tmpproject = new Project($db);
+					$tmpproject->fetch($task_time->fk_projet);
+					$conf->cache['project'][$task_time->fk_projet] = $tmpproject;
+				} else {
+					$tmpproject = $conf->cache['project'][$task_time->fk_projet];
+				}
+				print $tmpproject->getNomUrl(1);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
 			// Task ref
 			if (!empty($arrayfields['t.task_ref']['checked'])) {
 				if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {   // Not a dedicated task
@@ -1588,21 +1812,21 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 				print '<br>';
 				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 ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids) || $user->rights->projet->all->creer) {
+				if (in_array($task_time->fk_user, $childids) || $user->rights->projet->all->creer) {
 					if ($conf->MAIN_FEATURES_LEVEL >= 2) {
 						print '&nbsp;';
-						print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&amp;action=splitline&amp;lineid='.$task_time->rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">';
+						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>';
 					}
 
 					print '&nbsp;';
-					print '<a class="reposition editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&amp;action=editline&amp;lineid='.$task_time->rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">';
+					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 '</a>';
 
 					print '&nbsp;';
-					print '<a class="reposition paddingleft" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&amp;action=deleteline&amp;token='.newToken().'&amp;lineid='.$task_time->rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">';
+					print '<a class="reposition paddingleft" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&action=deleteline&token='.newToken().'&lineid='.$task_time->rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">';
 					print img_delete('default', 'class="pictodelete paddingleft"');
 					print '</a>';
 
@@ -1644,6 +1868,14 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 					print '</td>';
 				}
 
+				// Project ref
+				if (!empty($allprojectforuser)) {
+					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
+						print '<td class="nowrap">';
+						print '</td>';
+					}
+				}
+
 				// Task ref
 				if (!empty($arrayfields['t.task_ref']['checked'])) {
 					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
@@ -1772,6 +2004,14 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 					print '</td>';
 				}
 
+				// Project ref
+				if (!empty($allprojectforuser)) {
+					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
+						print '<td class="nowrap">';
+						print '</td>';
+					}
+				}
+
 				// Task ref
 				if (!empty($arrayfields['t.task_ref']['checked'])) {
 					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
diff --git a/htdocs/public/cron/cron_run_jobs_by_url.php b/htdocs/public/cron/cron_run_jobs_by_url.php
index 133c5d1b18a..9369a9d78a7 100644
--- a/htdocs/public/cron/cron_run_jobs_by_url.php
+++ b/htdocs/public/cron/cron_run_jobs_by_url.php
@@ -67,6 +67,10 @@ global $langs, $conf;
 // Language Management
 $langs->loadLangs(array("admin", "cron", "dict"));
 
+// Security check
+if (empty($conf->cron->enabled)) {
+	accessforbidden('', 0, 0, 1);
+}
 
 
 
diff --git a/htdocs/public/cron/index.html b/htdocs/public/cron/index.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/cashdesk/validation.php b/htdocs/public/cron/index.php
similarity index 70%
rename from htdocs/cashdesk/validation.php
rename to htdocs/public/cron/index.php
index 799283f602a..a62d2d1ba68 100644
--- a/htdocs/cashdesk/validation.php
+++ b/htdocs/public/cron/index.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
+/* Copyright (C) 2009 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,12 +16,12 @@
  */
 
 /**
- *	\file       htdocs/cashdesk/validation.php
- *	\ingroup    cashdesk
- *	\brief      validation.php
+ *     	\file       htdocs/public/cron/index.php
+ *		\ingroup    core
+ *		\brief      A redirect page to an error
  */
 
-$form = new Form($db);
+require '../../master.inc.php';
 
-// Affichage des templates
-require 'tpl/validation1.tpl.php';
+header("Location: ".DOL_URL_ROOT.'/public/error-404.php');
+exit;
diff --git a/htdocs/public/demo/demo.css b/htdocs/public/demo/demo.css
index b185f8c933f..8edd0faecce 100644
--- a/htdocs/public/demo/demo.css
+++ b/htdocs/public/demo/demo.css
@@ -3,14 +3,28 @@
 /*  Demo                                                                          */
 /* ============================================================================== */
 
+div.titre {
+	text-transform: none;	
+}
+
 a:hover {
 	text-decoration: none;
 }
+
+.CTable {
+	/* padding: 6px; */
+	font-weight: normal;
+	color: #444444 !important;
+
+	margin: 8px 2px 8px 2px;
+	max-width: 346px;
+}
 .demobox {
 	border: 1px solid #bbb;
 	border-radius: 8px;
 	-moz-border-radius: 8px;
 	min-height: 210px;
+	background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,255) 100%);
 }
 .demobox:hover {
 	border: 1px solid #bbb;
@@ -18,33 +32,29 @@ a:hover {
 	-moz-border-radius: 8px;
 	box-shadow: 2px 2px 8px #BBB;
 }
-.CTable {
-	padding: 6px;
-	font-weight: normal;
-	color: #444444 !important;
-
-	margin: 8px 2px 8px 2px;
-
-	/*border: 1px solid #bbb;
-	border-radius: 8px;
-	-moz-border-radius: 8px;*/
-	background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,255) 100%);
-
-	max-width: 346px;
-}
-.csscolumns {
-    margin-top: 6px;
-    margin-bottom: 5px;
-    -webkit-column-count: 2; /* Chrome, Safari, Opera */
-    -moz-column-count: 2; /* Firefox */
-    column-count: 2;
-    text-align: left;
-}
 .demomaxoveflow {
     max-width: 120px;
     overflow: hidden;
     text-overflow: ellipsis;
 }
+@media only screen and (min-width: 641px)
+{
+	.csscolumns {
+	    margin-top: 6px;
+	    margin-bottom: 5px;
+	    -webkit-column-count: 3; /* Chrome, Safari, Opera */
+	    -moz-column-count: 3; /* Firefox */
+	    column-count: 3;
+	    text-align: left;
+	}
+	#divprofdemoall {
+		max-width: unset;		
+	}
+	
+	.demomaxoveflow {
+	    max-width: 200px;
+	}
+}
 @media only screen and (max-width: 840px)
 {
 	.csscolumns {
@@ -76,6 +86,9 @@ a:hover {
 	    column-count: 1;
         text-align: left;
 	}
+	.demomaxoveflow {
+	    max-width: 220px !important;
+	}
 }
 
 
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index bbb4a85aadf..94ee0bb00b2 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -250,17 +250,18 @@ jQuery(document).ready(function () {
     jQuery(".modulelineshow").attr("href","#a1profdemoall");
     jQuery(".cursorpointer").css("cursor","pointer");
     jQuery(".modulelineshow").click(function() {
-    var idstring=$(this).attr("id");
-    if (typeof idstring != "undefined")
-    {
-        var currentId = idstring.substring(2);
-        jQuery("tr.moduleline").hide();
-        if (currentId != openedId)
-        {
-            openedId=currentId;
-            jQuery("#tr1"+currentId).show();
-            jQuery("#tr2"+currentId).show();
-        }
+		console.log("We select the custom demo");
+	    var idstring=$(this).attr("id");
+	    if (typeof idstring != "undefined")
+	    {
+	        var currentId = idstring.substring(2);
+	        jQuery("tr.moduleline").hide();
+	        if (currentId != openedId)
+	        {
+	            openedId=currentId;
+	            jQuery("#tr1"+currentId).show();
+	            jQuery("#tr2"+currentId).show();
+	        }
             else openedId = "";
         }
     });
@@ -281,7 +282,7 @@ print '</div>';
 print '<div class="demobantext" style="max-width: 1024px;">';
 print '<div style="font-size: 20px; padding: 40px;">';
 print '<div class="hideonsmartphone" style="text-align: justify;">'.$langs->trans("DemoDesc").'</div><br>';
-print '<div class="titre"><font style="font-size: 20px">'.$langs->trans("ChooseYourDemoProfil").'</font></div>';
+print '<div class="titre"><span style="font-size: 20px">'.$langs->trans("ChooseYourDemoProfil").'</span></div>';
 print '</div>';
 print '</div>';
 
@@ -350,7 +351,7 @@ foreach ($demoprofiles as $profilearray) {
 
 		// Modules (a profile you must choose modules)
 		if (empty($profilearray['url'])) {
-			print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:14px; line-height: 130%; padding-bottom: 8px">';
+			print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:0.75em; line-height: 130%; padding-bottom: 8px">';
 
 			print '<span class="opacitymedium">'.$langs->trans("ThisIsListOfModules").'</span><br><br>';
 
@@ -387,14 +388,24 @@ foreach ($demoprofiles as $profilearray) {
 					//if ($modulo == 0) print '<tr>';
 					print '<!-- id='.$val->numero.' -->';
 					print '<div class="nowrap">';
-					print '<input type="checkbox" class="checkbox" id="id'.$modulekeyname.'" name="'.$modulekeyname.'" value="1" title="'.dol_escape_htmltag($val->getName()).'"';
+					print '<input type="checkbox" class="checkbox valignmiddle paddingright" id="id'.$modulekeyname.'" name="'.$modulekeyname.'" value="1" title="'.dol_escape_htmltag($val->getName()).'"';
+					$disabled = '';
 					if (in_array($modulekeyname, $alwaysuncheckedmodules)) {
-						print ' disabled';
+						$disabled = 'disabled';
+						print ' '.$disabled;
 					}
 					if (!in_array($modulekeyname, $alwaysuncheckedmodules) && (!in_array($modulekeyname, $listofdisabledmodules) || in_array($modulekeyname, $alwayscheckedmodules))) {
 						print ' checked';
 					}
-					print '> <label for="id'.$modulekeyname.'" class="inline-block demomaxoveflow" title="'.dol_escape_htmltag($val->getName()).'">'.$val->getName().'</label><br>';
+					print '>';
+					/*
+					$s = img_picto('', $modulekeyname, 'class="pictofixedwidth paddingleft"');
+					if ($s) {
+						print $s;
+					} else {
+						print img_picto('', 'generic', 'class="pictofixedwidth paddingleft"');
+					}*/
+					print '<label for="id'.$modulekeyname.'" class="inline-block demomaxoveflow valignmiddle paddingleft'.($disabled ? ' opacitymedium' : '').'" title="'.dol_escape_htmltag($val->getName()).'">'.$val->getName().'</label><br>';
 					print '</div>';
 					//if ($modulo == ($nbcolsmod - 1)) print '</tr>';
 					$j++;
@@ -405,6 +416,7 @@ foreach ($demoprofiles as $profilearray) {
 
 			print '<br><div class="center">';
 			print '<input type="submit" value=" &nbsp; &nbsp; '.$langs->trans("Start").' &nbsp; &nbsp; " class="button">';
+			print '<br><br>';
 			print '</div>';
 
 			print '</div>';
@@ -419,6 +431,8 @@ foreach ($demoprofiles as $profilearray) {
 
 print '</div>';
 
+print '<br>';
+
 
 // TODO Replace this with a hook
 // Google Adsense (need Google module)
diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php
index ea9eeb377e7..7fac6ff323e 100644
--- a/htdocs/public/emailing/mailing-read.php
+++ b/htdocs/public/emailing/mailing-read.php
@@ -128,13 +128,13 @@ if (!empty($tag)) {
 
 	//Update status communication of thirdparty prospect
 	if ($obj->source_id > 0 && $obj->source_type == 'thirdparty' && $obj->entity) {
-		$sql = "UPDATE ".MAIN_DB_PREFIX.'societe SET fk_stcomm = 3 WHERE fk_stcomm <> -1 AND entity = '.$obj->entity.' AND rowid = '.((int) $obj->source_id);
+		$sql = "UPDATE ".MAIN_DB_PREFIX.'societe SET fk_stcomm = 3 WHERE fk_stcomm <> -1 AND entity = '.((int) $obj->entity).' AND rowid = '.((int) $obj->source_id);
 		$resql = $db->query($sql);
 	}
 
 	//Update status communication of contact prospect
 	if ($obj->source_id > 0 && $obj->source_type == 'contact' && $obj->entity) {
-		$sql = "UPDATE ".MAIN_DB_PREFIX.'societe SET fk_stcomm = 3 WHERE fk_stcomm <> -1 AND entity = '.$obj->entity.' AND rowid IN (SELECT sc.fk_soc FROM '.MAIN_DB_PREFIX.'socpeople AS sc WHERE sc.rowid = '.((int) $obj->source_id).')';
+		$sql = "UPDATE ".MAIN_DB_PREFIX.'societe SET fk_stcomm = 3 WHERE fk_stcomm <> -1 AND entity = '.((int) $obj->entity).' AND rowid IN (SELECT sc.fk_soc FROM '.MAIN_DB_PREFIX.'socpeople AS sc WHERE sc.rowid = '.((int) $obj->source_id).')';
 		$resql = $db->query($sql);
 	}
 }
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
index 6648bafd07a..76a73e8de05 100644
--- a/htdocs/public/emailing/mailing-unsubscribe.php
+++ b/htdocs/public/emailing/mailing-unsubscribe.php
@@ -149,7 +149,7 @@ if (!empty($tag) && ($unsuscrib == '1')) {
 	*/
 
 	// 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())."', ".$db->escape($obj->entity).", '".$db->escape($obj->email)."', '', '".$db->escape(getUserRemoteIP())."')";
+	$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
diff --git a/htdocs/public/eventorganization/attendee_register.php b/htdocs/public/eventorganization/attendee_new.php
similarity index 98%
rename from htdocs/public/eventorganization/attendee_register.php
rename to htdocs/public/eventorganization/attendee_new.php
index a454f214316..b350ece39f4 100644
--- a/htdocs/public/eventorganization/attendee_register.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -16,7 +16,7 @@
  */
 
 /**
- *	\file       htdocs/public/eventorganization/attendee_register.php
+ *	\file       htdocs/public/eventorganization/attendee_new.php
  *	\ingroup    project
  *	\brief      Example of form to subscribe to an event
  *
@@ -268,6 +268,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 		} else {
 			// Need to create a confattendee
 			$confattendee->date_creation = dol_now();
+			$confattendee->date_subscription = dol_now();
 			$confattendee->email = $email;
 			$confattendee->fk_project = $project->id;
 			$confattendee->fk_actioncomm = $id;
@@ -690,14 +691,14 @@ if (!empty($conference->id) && $conference->status==ConferenceOrBooth::STATUS_CO
 	print '<table class="border" summary="form to subscribe" id="tablesubscribe">' . "\n";
 
 	// Email
-	print '<tr><td>' . $langs->trans("EmailAttendee") . '<font color="red">*</font></td><td>';
+	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 '<font color="red">*</font>';
+		print '<span style="color: red">*</span>';
 	}
 	print ' </td><td>';
 	print img_picto('', 'company', 'class="pictofixedwidth"');
@@ -722,7 +723,7 @@ if (!empty($conference->id) && $conference->status==ConferenceOrBooth::STATUS_CO
 	print '</td></tr>';
 
 	// Country
-	print '<tr><td>' . $langs->trans('Country') . '<font color="red">*</font></td><td>';
+	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)) {
diff --git a/htdocs/public/index.php b/htdocs/public/index.php
index a9de01f35ca..6e80d99430f 100644
--- a/htdocs/public/index.php
+++ b/htdocs/public/index.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2009-2021 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 @@
 /**
  *     	\file       htdocs/public/index.php
  *		\ingroup    core
- *		\brief      A redirect page to an error
+ *		\brief      A redirect page to an error page
  */
 
 require '../master.inc.php';
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index d29d80cf5d4..6589f2a17d0 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -174,6 +174,7 @@ function llxFooterVierge()
 /*
  * Actions
  */
+
 $parameters = array();
 // Note that $action and $object may have been modified by some hooks
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
@@ -381,79 +382,29 @@ if (empty($reshook) && $action == 'add') {
 				$urlback = $conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
 				// TODO Make replacement of __AMOUNT__, etc...
 			} else {
-				$urlback = $_SERVER["PHP_SELF"]."?action=added";
+				$urlback = $_SERVER["PHP_SELF"]."?action=added&token=".newToken();
 			}
 
 			if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE) && $conf->global->MEMBER_NEWFORM_PAYONLINE != '-1') {
-				if ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'all') {
-					$urlback = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
-					if (price2num(GETPOST('amount', 'alpha'))) {
-						$urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
-					}
-					if (GETPOST('email')) {
-						$urlback .= '&email='.urlencode(GETPOST('email'));
-					}
-					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-							$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-						} else {
-							$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
-						}
-					}
-				} elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox') {
-					$urlback = DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
-					if (price2num(GETPOST('amount', 'alpha'))) {
-						$urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
-					}
-					if (GETPOST('email')) {
-						$urlback .= '&email='.urlencode(GETPOST('email'));
-					}
-					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-							$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-						} else {
-							$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
-						}
-					}
-				} elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal') {
-					$urlback = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
-					if (price2num(GETPOST('amount', 'alpha'))) {
-						$urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
-					}
-					if (GETPOST('email')) {
-						$urlback .= '&email='.urlencode(GETPOST('email'));
-					}
-					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-							$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-						} else {
-							$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
-						}
-					}
-				} elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'stripe') {
-					$urlback = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
-					if (price2num(GETPOST('amount', 'alpha'))) {
-						$urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
-					}
-					if (GETPOST('email')) {
-						$urlback .= '&email='.urlencode(GETPOST('email'));
-					}
-					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-							$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-						} else {
-							$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
-						}
-					}
-				} else {
-					dol_print_error('', "Autosubscribe form is setup to ask an online payment for a not managed online payment");
-					exit;
+				if (empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {			// If edition of amount not allowed
+					// TODO Check amount is same than the amount required for the type of member or if not defined as the defeault amount into $conf->global->MEMBER_NEWFORM_AMOUNT
+					// It is not so important because a test is done on return of payment validation.
+				}
+
+				$urlback = getOnlinePaymentUrl(0, 'member', $adh->ref, price2num(GETPOST('amount', 'alpha'), 'MT'), '', 0);
+
+				if (GETPOST('email')) {
+					$urlback .= '&email='.urlencode(GETPOST('email'));
+				}
+				if ($conf->global->MEMBER_NEWFORM_PAYONLINE != '-1' && $conf->global->MEMBER_NEWFORM_PAYONLINE != 'all') {
+					$urlback .= '&paymentmethod='.urlencode($conf->global->MEMBER_NEWFORM_PAYONLINE);
+				}
+			} else {
+				if (!empty($entity)) {
+					$urlback .= '&entity='.((int) $entity);
 				}
 			}
 
-			if (!empty($entity)) {
-				$urlback .= '&entity='.$entity;
-			}
 			dol_syslog("member ".$adh->ref." was created, we redirect to ".$urlback);
 		} else {
 			$error++;
@@ -574,7 +525,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) {
 		$defaulttype = $tmp[0];
 		$isempty = 0;
 	}
-	print '<tr><td class="titlefield">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td>';
+	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 {
@@ -586,7 +537,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) {
 $morphys["phy"] = $langs->trans("Physical");
 $morphys["mor"] = $langs->trans("Moral");
 if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) {
-	print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
+	print '<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 {
@@ -602,18 +553,18 @@ print '<input type="text" name="societe" class="minwidth150 widthcentpercentminu
 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").' <FONT COLOR="red">*</FONT></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')).'"></td></tr>'."\n";
 // Firstname
-print '<tr><td>'.$langs->trans("Firstname").' <FONT COLOR="red">*</FONT></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')).'"></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").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
-	print '<tr><td>'.$langs->trans("Password").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.GETPOST("pass1", "nohtml").'"></td></tr>'."\n";
-	print '<tr><td>'.$langs->trans("PasswordAgain").' <FONT COLOR="red">*</FONT></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.GETPOST("pass2", "nohtml").'"></td></tr>'."\n";
+	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>';
@@ -680,7 +631,7 @@ print '</tr>'."\n";
 // 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").' <FONT COLOR="red">*</FONT></td><td>';
+	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 $';
 
@@ -721,21 +672,24 @@ if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
 	print '</td></tr>'."\n";
 }
 
-if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
-	// $conf->global->MEMBER_NEWFORM_SHOWAMOUNT is an amount
+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
-	$amountbytype = $adht->amountByType(1);
-	$amount = !empty($amountbytype[GETPOST('typeid', 'int')]) ? $amountbytype[GETPOST('typeid', 'int')] : (isset($amount) ? $amount : 0);
-
-	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
+	// 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 (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
-		$amount = $amount ? $amount : (GETPOST('amount') ? price2num(GETPOST('amount'), 'MT', 2) : $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);
 
 	// $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
@@ -749,6 +703,7 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER
 	print ' '.$langs->trans("Currency".$conf->currency);
 	print '</td></tr>';
 }
+
 print "</table>\n";
 
 print dol_get_fiche_end();
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 80e092f2951..4bf2a6b94bf 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -92,8 +92,8 @@ function llxFooterVierge()
 }
 
 
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
diff --git a/htdocs/public/notice.php b/htdocs/public/notice.php
index c41bf81bea4..d5ac4070ff0 100644
--- a/htdocs/public/notice.php
+++ b/htdocs/public/notice.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2016-2020	Laurent Destailleur		<eldy@users.sourceforge.net>
+/* Copyright (C) 2016-2021	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,10 +17,10 @@
 
 /**
  *	\file       htdocs/public/notice.php
- *	\brief      Dolibarr page to show a notice.
- *              Default notice is a message to say network connection is off or show another message.
- *              You can also call this page with URL:
- *                /public/notice.php?lang=xx_XX&transkey=translation_key  (key must be inside file main.lang, error.lang or other.lang)
+ *	\brief      Dolibarr public page to show a notice.
+ *              Default notice is a message to say network connection is off. Some parameters can be used to show another message.
+ *              You can call this page with URL:
+ *                /public/notice.php?lang=xx_XX&transkey=translation_key  		(key must be inside file main.lang, error.lang or other.lang)
  *                /public/notice.php?transphrase=url_encoded_sentence_to_show
  */
 
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index d034db38be3..8bd95d23c8d 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -21,6 +21,7 @@
  *     	\file       htdocs/public/onlinesign/newonlinesign.php
  *		\ingroup    core
  *		\brief      File to offer a way to make an online signature for a particular Dolibarr entity
+ *					Example of URL: https://localhost/public/onlinesign/newonlinesign.php?ref=PR...
  */
 
 if (!defined('NOLOGIN')) {
@@ -47,17 +48,25 @@ 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.'/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", "paybox"));
+$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "members", "paybox", "propal"));
 
 // Security check
 // No check on module enabled. Done later according to $validpaymentmethod
 
 // Get parameters
 $action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+
+
+$refusepropal = GETPOST('refusepropal', 'alpha');
+$message = GETPOST('message', 'aZ09');
 
 // Input are:
 // type ('invoice','order','contractline'),
@@ -80,7 +89,9 @@ if (!$action) {
 		exit;
 	}
 }
-
+if (!empty($refusepropal)) {
+	$action = "refusepropal";
+}
 
 // Define $urlwithroot
 //$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
@@ -112,14 +123,56 @@ $urlko = preg_replace('/&$/', '', $urlko); // Remove last &
 
 $creditor = $mysoc->name;
 
+$type = $source;
+if ($source == 'proposal') {
+	$object = new Propal($db);
+	$object->fetch(0, $ref);
+} else {
+	accessforbidden('Bad value for source');
+	exit;
+}
+
+
+// Check securitykey
+$securekeyseed = '';
+if ($source == 'proposal') {
+	$securekeyseed = $conf->global->PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN;
+}
+
+if (!dol_verifyHash($securekeyseed.$type.$ref, $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);
+}
+
 
 /*
  * Actions
  */
 
+if ($action == 'confirm_refusepropal' && $confirm == 'yes') {
+	$db->begin();
 
-if ($action == 'dosign') {
-	// TODO
+	$sql  = "UPDATE ".MAIN_DB_PREFIX."propal";
+	$sql .= " SET fk_statut = ".((int) $object::STATUS_NOTSIGNED).", note_private = '".$db->escape($object->note_private)."', date_signature='".$db->idate(dol_now())."'";
+	$sql .= " WHERE rowid = ".((int) $object->id);
+
+	dol_syslog(__METHOD__, LOG_DEBUG);
+	$resql = $db->query($sql);
+	if (!$resql) {
+		$error++;
+	}
+
+	if (!$error) {
+		$db->commit();
+
+		$message = 'refused';
+		setEventMessages("PropalRefused", null, 'warnings');
+	} else {
+		$db->rollback();
+	}
+
+	$object->fetch(0, $ref);
 }
 
 
@@ -127,6 +180,7 @@ if ($action == 'dosign') {
  * View
  */
 
+$form = new Form($db);
 $head = '';
 if (!empty($conf->global->MAIN_SIGN_CSS_URL)) {
 	$head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->MAIN_SIGN_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
@@ -138,8 +192,12 @@ $conf->dol_hide_leftmenu = 1;
 $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
 llxHeader($head, $langs->trans("OnlineSignature"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea, 1);
 
-// Check link validity for param 'source'
-if (!empty($source) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', ''))) {
+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);
+}
+
+// Check link validity for param 'source' to avoid use of the examples as value
+if (!empty($source) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', 'proposal_ref', ''))) {
 	$langs->load("errors");
 	dol_print_error_email('BADREFINONLINESIGNFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
 	// End of page
@@ -157,10 +215,11 @@ print '<input type="hidden" name="tag" value="'.GETPOST("tag", 'alpha').'">'."\n
 print '<input type="hidden" name="suffix" value="'.GETPOST("suffix", 'alpha').'">'."\n";
 print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
 print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print '<input type="hidden" name="page_y" value="" />';
 print "\n";
 print '<!-- Form to sign -->'."\n";
 
-print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+print '<table id="dolpublictable" summary="Payment form" class="center">'."\n";
 
 // Show logo (search order: logo defined by ONLINE_SIGN_LOGO_suffix, then ONLINE_SIGN_LOGO_, then small company logo, large company logo, theme logo, common logo)
 // Define logo and logosmall
@@ -195,16 +254,15 @@ if ($urllogo) {
 	}
 	print '</div>';
 }
-if (!empty($conf->global->PROPOSAL_IMAGE_PUBLIC_SIGN)) {
+if ($source == 'proposal' && !empty($conf->global->PROPOSAL_IMAGE_PUBLIC_SIGN)) {
 	print '<div class="backimagepublicproposalsign">';
-	print '<img id="idEVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE" src="'.$conf->global->PROPOSAL_IMAGE_PUBLIC_SIGN.'">';
+	print '<img id="idPROPOSAL_IMAGE_PUBLIC_INTERFACE" src="'.$conf->global->PROPOSAL_IMAGE_PUBLIC_SIGN.'">';
 	print '</div>';
 }
 
 // Output introduction text
 $text = '';
 if (!empty($conf->global->ONLINE_SIGN_NEWFORM_TEXT)) {
-	$langs->load("members");
 	$reg = array();
 	if (preg_match('/^\((.*)\)$/', $conf->global->ONLINE_SIGN_NEWFORM_TEXT, $reg)) {
 		$text .= $langs->trans($reg[1])."<br>\n";
@@ -215,7 +273,7 @@ if (!empty($conf->global->ONLINE_SIGN_NEWFORM_TEXT)) {
 }
 if (empty($text)) {
 	$text .= '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("WelcomeOnOnlineSignaturePage", $mysoc->name).'</strong></td></tr>'."\n";
-	$text .= '<tr><td class="textpublicpayment">'.$langs->trans("ThisScreenAllowsYouToSignDocFrom", $creditor).'<br><br></td></tr>'."\n";
+	$text .= '<tr><td class="textpublicpayment opacitymedium">'.$langs->trans("ThisScreenAllowsYouToSignDocFrom", $creditor).'<br><br></td></tr>'."\n";
 }
 print $text;
 
@@ -226,9 +284,8 @@ print '<tr><td align="left" colspan="2" class="opacitymedium">'.$langs->trans("T
 
 $found = false;
 $error = 0;
-$var = false;
 
-// Payment on customer order
+// Signature on commercial proposal
 if ($source == 'proposal') {
 	$found = true;
 	$langs->load("proposal");
@@ -246,24 +303,74 @@ if ($source == 'proposal') {
 
 	// Creditor
 
-	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Creditor");
-	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$creditor.'</b>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow2">';
+	print img_picto('', 'company', 'class="pictofixedwidth"');
+	print '<b>'.$creditor.'</b>';
 	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
 
-	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("ThirdParty");
-	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$proposal->thirdparty->name.'</b>';
+	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 '</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 '</td></tr>'."\n";
 
 	// Object
 
 	$text = '<b>'.$langs->trans("SignatureProposalRef", $proposal->ref).'</b>';
-	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Designation");
-	print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.$text;
+	print '<tr class="CTableRow2"><td class="CTableRow2 tdtop">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow2">'.$text;
+	if ($proposal->status == $proposal::STATUS_VALIDATED) {
+		$directdownloadlink = $proposal->getLastMainDocLink('proposal');
+		if ($directdownloadlink) {
+			print '<br><a href="'.$directdownloadlink.'">';
+			print img_mime($proposal->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 ($directdownloadlink) {
+				print '<br><a href="'.$directdownloadlink.'">';
+				print img_mime($proposal->last_main_doc, '');
+				print $langs->trans("DownloadDocument").'</a>';
+			}
+		} elseif ($proposal->status == $proposal::STATUS_SIGNED || $proposal->status == $proposal::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);
+
+				$datefilesigned = dol_filemtime($last_main_doc_file);
+				$datefilenotsigned = dol_filemtime($last_main_doc_file_not_signed);
+
+				if (empty($datefilenotsigned) || $datefilesigned > $datefilenotsigned) {
+					$directdownloadlink = $proposal->getLastMainDocLink('proposal');
+					if ($directdownloadlink) {
+						print '<br><a href="'.$directdownloadlink.'">';
+						print img_mime($proposal->last_main_doc, '');
+						print $langs->trans("DownloadDocument").'</a>';
+					}
+				}
+			}
+		}
+	}
+
 	print '<input type="hidden" name="source" value="'.GETPOST("source", 'alpha').'">';
 	print '<input type="hidden" name="ref" value="'.$proposal->ref.'">';
 	print '</td></tr>'."\n";
+
+	// TODO Add link to download PDF (similar code than for invoice)
 }
 
 
@@ -273,7 +380,7 @@ if (!$found && !$mesg) {
 }
 
 if ($mesg) {
-	print '<tr><td align="center" colspan="2"><br><div class="warning">'.dol_escape_htmltag($mesg).'</div></td></tr>'."\n";
+	print '<tr><td class="center" colspan="2"><br><div class="warning">'.dol_escape_htmltag($mesg).'</div></td></tr>'."\n";
 }
 
 print '</table>'."\n";
@@ -290,7 +397,85 @@ if ($action != 'dosign') {
 }
 
 print '</td></tr>'."\n";
+print '<tr><td class="center">';
 
+
+if ($action == "dosign" && empty($cancel)) {
+	print '<div class="tablepublicpayment">';
+	print '<input type="button" class="buttonDelete small" id="clearsignature" value="'.$langs->trans("ClearSignature").'">';
+	print '<div id="signature" style="border:solid;"></div>';
+	print '</div>';
+	// Do not use class="reposition" here: It breaks the submit and there is a message on top to say it's ok, so going back top is better.
+	print '<input type="button" class="button" id="signbutton" value="'.$langs->trans("Sign").'">';
+	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+
+	// Add js code managed into the div #signature
+	print '<script language="JavaScript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jSignature/jSignature.js"></script>
+	<script type="text/javascript">
+	$(document).ready(function() {
+	  $("#signature").jSignature({ color:"#000", lineWidth:4, '.(empty($conf->dol_optimize_smallscreen) ? '' : 'width: 280, ' ).'height: 180});
+
+	  $("#signature").on("change",function(){
+		$("#clearsignature").css("display","");
+		$("#signbutton").attr("disabled",false);
+		if(!$._data($("#signbutton")[0], "events")){
+			$("#signbutton").on("click",function(){
+				var signature = $("#signature").jSignature("getData", "image");
+				$.ajax({
+					type: "POST",
+					url: "'.DOL_URL_ROOT.'/core/ajax/onlineSign.php",
+					dataType: "text",
+					data: {
+						"action" : "importSignature",
+						"signaturebase64" : signature,
+						"ref" : \''.dol_escape_js($REF).'\',
+						"securekey" : \''.dol_escape_js($SECUREKEY).'\',
+						"mode" : \''.dol_escape_htmltag($source).'\',
+					},
+					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).'");
+						}else{
+							console.error(response);
+						}
+					},
+				});
+			});
+		}
+	  });
+
+	  $("#clearsignature").on("click",function(){
+		$("#signature").jSignature("clear");
+		$("#signbutton").attr("disabled",true);
+	  });
+
+	  $("#signbutton").attr("disabled",true);
+	});
+	</script>';
+} else {
+	if ($source == 'proposal') {
+		if ($object->status == $object::STATUS_SIGNED) {
+			print '<br>';
+			if ($message == 'signed') {
+				print '<span class="ok">'.$langs->trans("PropalSigned").'</span>';
+			} else {
+				print '<span class="ok">'.$langs->trans("PropalAlreadySigned").'</span>';
+			}
+		} elseif ($object->status == $object::STATUS_NOTSIGNED) {
+			print '<br>';
+			if ($message == 'refused') {
+				print '<span class="ok">'.$langs->trans("PropalRefused").'</span>';
+			} else {
+				print '<span class="warning">'.$langs->trans("PropalAlreadyRefused").'</span>';
+			}
+		} else {
+			print '<input type="submit" class="butAction small wraponsmartphone marginbottomonly marginleftonly marginrightonly reposition" value="'.$langs->trans("SignPropal").'">';
+			print '<input name="refusepropal" type="submit" class="butActionDelete small wraponsmartphone marginbottomonly marginleftonly marginrightonly reposition" value="'.$langs->trans("RefusePropal").'">';
+		}
+	}
+}
+print '</td></tr>'."\n";
 print '</table>'."\n";
 print '</form>'."\n";
 print '</div>'."\n";
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 8b6da7e0b75..42cde055ac2 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -165,7 +165,9 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) {		// bo
 
 						$application = ($conf->global->MAIN_APPLICATION_TITLE ? $conf->global->MAIN_APPLICATION_TITLE : 'Dolibarr ERP/CRM');
 
-						$body = str_replace('\n', '<br>', $langs->transnoentities('EmailSomeoneVoted', $nom, getUrlSondage($numsondage, true)));
+						$link = getUrlSondage($numsondage, true);
+						$link = '<a href="'.$link.'">'.$link.'</a>';
+						$body = str_replace('\n', '<br>', $langs->transnoentities('EmailSomeoneVoted', $nom, $link));
 						//var_dump($body);exit;
 
 						$cmailfile = new CMailFile("[".$application."] ".$langs->trans("Poll").': '.$object->title, $email, $conf->global->MAIN_MAIL_EMAIL_FROM, $body, null, null, null, '', '', 0, -1);
@@ -272,7 +274,13 @@ $toutsujet = str_replace("°", "'", $toutsujet);
 
 
 print '<div class="survey_invitation">'.$langs->trans("YouAreInivitedToVote").'</div>';
-print $langs->trans("OpenSurveyHowTo").'<br><br>';
+print $langs->trans("OpenSurveyHowTo").'<br>';
+if (empty($object->allow_spy)) {
+	print '<span class="opacitymedium">'.$langs->trans("YourVoteIsPrivate").'</span><br>';
+} else {
+	print $form->textwithpicto('<span class="opacitymedium">'.$langs->trans("YourVoteIsPublic").'</span>', $langs->trans("CanSeeOthersVote")).'<br>';
+}
+print '<br>';
 
 print '<div class="corps"> '."\n";
 
@@ -290,7 +298,7 @@ print '</div>'."\n";
 
 //The survey has expired, users can't vote or do any action
 if (!$canbemodified) {
-	print '<div style="text-align: center"><p>'.$langs->trans('SurveyExpiredInfo').'</p></div>';
+	print '<br><center><div class="quatrevingtpercent center warning">'.$langs->trans('SurveyExpiredInfo').'</div></center>';
 	llxFooterSurvey();
 
 	$db->close();
diff --git a/htdocs/cashdesk/validation_ok.php b/htdocs/public/partnership/index.php
similarity index 69%
rename from htdocs/cashdesk/validation_ok.php
rename to htdocs/public/partnership/index.php
index 124d47a1e04..6a9a6f8a557 100644
--- a/htdocs/cashdesk/validation_ok.php
+++ b/htdocs/public/partnership/index.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
+/* Copyright (C) 2009-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
@@ -16,10 +16,11 @@
  */
 
 /**
- *	\file       htdocs/cashdesk/validation_ok.php
- *	\ingroup    cashdesk
- *	\brief      validation_ok.php
+ *     	\file       htdocs/public/partnership/index.php
+ *		\ingroup    core
+ *		\brief      A redirect page to an error
  */
 
-// Affichage des templates
-require 'tpl/validation2.tpl.php';
+require '../../master.inc.php';
+
+header("Location: ".DOL_URL_ROOT.'/public/error-404.php');
diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php
new file mode 100644
index 00000000000..fe57f4ea424
--- /dev/null
+++ b/htdocs/public/partnership/new.php
@@ -0,0 +1,616 @@
+<?php
+/* Copyright (C) 2001-2002  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2001-2002  Jean-Louis Bergamo      <jlb@j1b.org>
+ * Copyright (C) 2006-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2012       J. Fernando Lagrange    <fernando@demo-tic.org>
+ * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2021       Waël Almoman            <info@almoman.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/public/partnership/new.php
+ *	\ingroup    member
+ *	\brief      Example of form to add a new member
+ */
+
+if (!defined('NOLOGIN')) {
+	define("NOLOGIN", 1); // This means this output page does not require to be logged.
+}
+if (!defined('NOCSRFCHECK')) {
+	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', '1');
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+
+// 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);
+}
+
+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.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+
+// Init vars
+$errmsg = '';
+$num = 0;
+$error = 0;
+$backtopage = GETPOST('backtopage', 'alpha');
+$action = GETPOST('action', 'aZ09');
+
+// Load translation files
+$langs->loadLangs(array("main", "members", "companies", "install", "other"));
+
+// Security check
+if (empty($conf->partnership->enabled)) {
+	accessforbidden('', 0, 0, 1);
+}
+
+if (empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
+	print $langs->trans("Auto subscription form for public visitors has not been enabled");
+	exit;
+}
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('publicnewpartnershipcard', 'globalcard'));
+
+$extrafields = new ExtraFields($db);
+
+$object = new Partnership($db);
+
+$user->loadDefaultValues();
+
+
+/**
+ * Show header for new partnership
+ *
+ * @param 	string		$title				Title
+ * @param 	string		$head				Head array
+ * @param 	int    		$disablejs			More content into html header
+ * @param 	int    		$disablehead		More content into html header
+ * @param 	array  		$arrayofjs			Array of complementary js files
+ * @param 	array  		$arrayofcss			Array of complementary css files
+ * @return	void
+ */
+function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
+{
+	global $user, $conf, $langs, $mysoc;
+
+	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
+
+	print '<body id="mainbody" class="publicnewmemberform">';
+
+	// Define urllogo
+	$urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
+
+	if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
+	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
+	} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {
+		$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
+	}
+
+	print '<div class="center">';
+
+	// Output html code for logo
+	if ($urllogo) {
+		print '<div class="backgreypublicpayment">';
+		print '<div class="logopublicpayment">';
+		print '<img id="dolpaymentlogo" src="'.$urllogo.'">';
+		print '</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>';
+		}
+		print '</div>';
+	}
+
+	if (!empty($conf->global->PARTNERSHIP_IMAGE_PUBLIC_REGISTRATION)) {
+		print '<div class="backimagepublicregistration">';
+		print '<img id="idPARTNERSHIP_IMAGE_PUBLIC_INTERFACE" src="'.$conf->global->PARTNERSHIP_IMAGE_PUBLIC_REGISTRATION.'">';
+		print '</div>';
+	}
+
+	print '</div>';
+
+	print '<div class="divmainbodylarge">';
+}
+
+/**
+ * Show footer for new member
+ *
+ * @return	void
+ */
+function llxFooterVierge()
+{
+	print '</div>';
+
+	printCommonFooter('public');
+
+	print "</body>\n";
+	print "</html>\n";
+}
+
+
+
+/*
+ * Actions
+ */
+$parameters = array();
+// Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+// Action called when page is submitted
+if (empty($reshook) && $action == 'add') {
+	$error = 0;
+	$urlback = '';
+
+	$db->begin();
+
+	/*if (GETPOST('typeid') <= 0) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"))."<br>\n";
+	}*/
+	if (!GETPOST('lastname')) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."<br>\n";
+	}
+	if (!GETPOST('firstname')) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."<br>\n";
+	}
+	if (empty(GETPOST('email'))) {
+		$error++;
+		$errmsg .= $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Email'))."<br>\n";
+	} elseif (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
+		$langs->load('errors');
+		$error++;
+		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
+	}
+
+	$public = GETPOSTISSET('public') ? 1 : 0;
+
+	if (!$error) {
+		$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') {
+			$partnership->fk_member = 0;
+		} elseif ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+			$partnership->fk_soc = 0;
+		}
+
+		$partnership->statut      = -1;
+		$partnership->firstname   = GETPOST('firstname');
+		$partnership->lastname    = GETPOST('lastname');
+		$partnership->address     = GETPOST('address');
+		$partnership->zip         = GETPOST('zipcode');
+		$partnership->town        = GETPOST('town');
+		$partnership->email       = GETPOST('email');
+		$partnership->country_id  = GETPOST('country_id', 'int');
+		$partnership->state_id    = GETPOST('state_id', 'int');
+		//$partnership->typeid      = $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE ? $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE : GETPOST('typeid', 'int');
+		$partnership->note_private = GETPOST('note_private');
+
+		// Fill array 'array_options' with data from add form
+		$extrafields->fetch_name_optionals_label($partnership->table_element);
+		$ret = $extrafields->setOptionalsFromPost(null, $partnership);
+		if ($ret < 0) {
+			$error++;
+		}
+
+		$result = $partnership->create($user);
+		if ($result > 0) {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+			$object = $partnership;
+
+			/*
+			$partnershipt = new PartnershipType($db);
+			$partnershipt->fetch($object->typeid);
+
+			if ($object->email) {
+				$subject = '';
+				$msg = '';
+
+				// Send subscription email
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+				$formmail = new FormMail($db);
+				// Set output language
+				$outputlangs = new Translate('', $conf);
+				$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+				// Load traductions files required by page
+				$outputlangs->loadLangs(array("main", "members"));
+				// Get email content from template
+				$arraydefaultmessage = null;
+				$labeltouse = $conf->global->PARTNERSHIP_EMAIL_TEMPLATE_AUTOREGISTER;
+
+				if (!empty($labeltouse)) {
+					$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+				}
+
+				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+					$subject = $arraydefaultmessage->topic;
+					$msg     = $arraydefaultmessage->content;
+				}
+
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				complete_substitutions_array($substitutionarray, $outputlangs, $object);
+				$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+				$texttosend = make_substitutions(dol_concatdesc($msg, $partnershipt->getMailOnValid()), $substitutionarray, $outputlangs);
+
+				if ($subjecttosend && $texttosend) {
+					$moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n";
+
+					$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
+				}
+			}
+			*/
+
+			// 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) &&
+				  !empty($conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL)) {
+				// Define link to login card
+				$appli = constant('DOL_APPLICATION_TITLE');
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+					$appli = $conf->global->MAIN_APPLICATION_TITLE;
+					if (preg_match('/\d\.\d/', $appli)) {
+						if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
+							$appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
+						}
+					} else {
+						$appli .= " ".DOL_VERSION;
+					}
+				} else {
+					$appli .= " ".DOL_VERSION;
+				}
+
+				$to = $partnership->makeSubstitution($conf->global->MAIN_INFO_SOCIETE_MAIL);
+				$from = $conf->global->PARTNERSHIP_MAIL_FROM;
+				$mailfile = new CMailFile(
+					'['.$appli.'] '.$conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL_SUBJECT,
+					$to,
+					$from,
+					$partnership->makeSubstitution($conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL),
+					array(),
+					array(),
+					array(),
+					"",
+					"",
+					0,
+					-1
+				);
+
+				if (!$mailfile->sendfile()) {
+					dol_syslog($langs->trans("ErrorFailedToSendMail", $from, $to), LOG_ERR);
+				}
+			}
+
+			if (!empty($backtopage)) {
+				$urlback = $backtopage;
+			} elseif (!empty($conf->global->PARTNERSHIP_URL_REDIRECT_SUBSCRIPTION)) {
+				$urlback = $conf->global->PARTNERSHIP_URL_REDIRECT_SUBSCRIPTION;
+				// TODO Make replacement of __AMOUNT__, etc...
+			} else {
+				$urlback = $_SERVER["PHP_SELF"]."?action=added&token=".newToken();
+			}
+
+			if (!empty($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE) && $conf->global->PARTNERSHIP_NEWFORM_PAYONLINE != '-1') {
+				if ($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE == 'all') {
+					$urlback = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?from=partnershipnewform&source=membersubscription&ref='.urlencode($partnership->ref);
+					if (price2num(GETPOST('amount', 'alpha'))) {
+						$urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
+					}
+					if (GETPOST('email')) {
+						$urlback .= '&email='.urlencode(GETPOST('email'));
+					}
+					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+							$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$partnership->ref, 2));
+						} else {
+							$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+						}
+					}
+				} elseif ($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE == 'paybox') {
+					$urlback = DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=partnershipnewform&source=membersubscription&ref='.urlencode($partnership->ref);
+					if (price2num(GETPOST('amount', 'alpha'))) {
+						$urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
+					}
+					if (GETPOST('email')) {
+						$urlback .= '&email='.urlencode(GETPOST('email'));
+					}
+					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+							$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$partnership->ref, 2));
+						} else {
+							$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+						}
+					}
+				} elseif ($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE == 'paypal') {
+					$urlback = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=partnershipnewform&source=membersubscription&ref='.urlencode($partnership->ref);
+					if (price2num(GETPOST('amount', 'alpha'))) {
+						$urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
+					}
+					if (GETPOST('email')) {
+						$urlback .= '&email='.urlencode(GETPOST('email'));
+					}
+					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+							$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$partnership->ref, 2));
+						} else {
+							$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+						}
+					}
+				} elseif ($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE == 'stripe') {
+					$urlback = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?from=partnershipnewform&source=membersubscription&ref='.$partnership->ref;
+					if (price2num(GETPOST('amount', 'alpha'))) {
+						$urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
+					}
+					if (GETPOST('email')) {
+						$urlback .= '&email='.urlencode(GETPOST('email'));
+					}
+					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+							$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$partnership->ref, 2));
+						} else {
+							$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+						}
+					}
+				} else {
+					dol_print_error('', "Autosubscribe form is setup to ask an online payment for a not managed online payment");
+					exit;
+				}
+			}
+
+			if (!empty($entity)) {
+				$urlback .= '&entity='.$entity;
+			}
+			dol_syslog("partnership ".$partnership->ref." was created, we redirect to ".$urlback);
+		} else {
+			$error++;
+			$errmsg .= join('<br>', $partnership->errors);
+		}
+	}
+
+	if (!$error) {
+		$db->commit();
+
+		Header("Location: ".$urlback);
+		exit;
+	} else {
+		$db->rollback();
+	}
+}
+
+// Action called after a submitted was send and member created successfully
+// If PARTNERSHIP_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("NewPartnershipForm"));
+
+	// Si on a pas ete redirige
+	print '<br>';
+	print '<div class="center">';
+	print $langs->trans("NewPartnershipbyWeb");
+	print '</div>';
+
+	llxFooterVierge();
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formcompany = new FormCompany($db);
+$partnershipt = new AdherentType($db);
+$extrafields->fetch_name_optionals_label('partnership'); // fetch optionals attributes and labels
+
+
+llxHeaderVierge($langs->trans("NewSubscription"));
+
+
+print load_fiche_titre($langs->trans("NewSubscription"), '', '', 0, 0, 'center');
+
+
+print '<div align="center">';
+print '<div id="divsubscribe">';
+
+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 '</div>';
+
+dol_htmloutput_errors($errmsg);
+
+// 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 '<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 () {
+        jQuery("#selectcountry_id").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->PARTNERSHIP_NEWFORM_FORCETYPE)) {
+	$listoftype = $partnershipt->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", $partnershipt->liste_array(1), GETPOST('typeid') ? GETPOST('typeid') : $defaulttype, $isempty);
+	print '</td></tr>'."\n";
+} else {
+	$partnershipt->fetch($conf->global->PARTNERSHIP_NEWFORM_FORCETYPE);
+	print '<input type="hidden" id="typeid" name="typeid" value="'.$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);
+	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.'">';
+}
+
+// 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" 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 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";
+// 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').'</td><td>';
+print img_picto('', 'country', 'class="pictofixedwidth"');
+$country_id = GETPOST('country_id', 'int');
+if (!$country_id && !empty($conf->global->PARTNERSHIP_NEWFORM_FORCECOUNTRYCODE)) {
+	$country_id = getCountry($conf->global->PARTNERSHIP_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>';
+}
+// Logo
+//print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('photo')).'"></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";
+
+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();
+
+$db->close();
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 97fe2387d8d..5158e294fb2 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -184,11 +184,12 @@ if ($source == 'organizedeventregistration') {
 }
 
 
-$paymentmethod = GETPOST('paymentmethod', 'alphanohtml') ?GETPOST('paymentmethod', 'alphanohtml') : ''; // Empty in most cases. Defined when a payment mode is forced
+$paymentmethod = GETPOST('paymentmethod', 'alphanohtml') ? GETPOST('paymentmethod', 'alphanohtml') : ''; // Empty in most cases. Defined when a payment mode is forced
 $validpaymentmethod = array();
 
 // Detect $paymentmethod
 foreach ($_POST as $key => $val) {
+	$reg = array();
 	if (preg_match('/^dopayment_(.*)$/', $key, $reg)) {
 		$paymentmethod = $reg[1];
 		break;
@@ -246,7 +247,6 @@ $urlok = preg_replace('/&$/', '', $urlok); // Remove last &
 $urlko = preg_replace('/&$/', '', $urlko); // Remove last &
 
 
-
 // Make special controls
 
 if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled)) {
@@ -299,21 +299,23 @@ if ($tmpsource == 'membersubscription') {
 }
 $valid = true;
 if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-	$token = '';
-	$tokenoldcompat = '';
+	$tokenisok = false;
 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 		if ($tmpsource && $REF) {
-			$token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$tmpsource.$REF, 2); // Use the source in the hash to avoid duplicates if the references are identical
+			// Use the source in the hash to avoid duplicates if the references are identical
+			$tokenisok = dol_verifyHash($conf->global->PAYMENT_SECURITY_TOKEN.$tmpsource.$REF, $SECUREKEY, '2');
+			// Do a second test for retro-compatibility (token may have been hashed with membersubscription in external module)
 			if ($tmpsource != $source) {
-				$tokenoldcompat = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$source.$REF, 2); // for retro-compatibility (token may have been hashed with membersubscription in external module)
+				$tokenisok = dol_verifyHash($conf->global->PAYMENT_SECURITY_TOKEN.$source.$REF, $SECUREKEY, '2');
 			}
 		} else {
-			$token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+			$tokenisok = dol_verifyHash($conf->global->PAYMENT_SECURITY_TOKEN, $SECUREKEY, '2');
 		}
 	} else {
-		$token = $conf->global->PAYMENT_SECURITY_TOKEN;
+		$tokenisok = ($conf->global->PAYMENT_SECURITY_TOKEN == $SECUREKEY);
 	}
-	if ($SECUREKEY != $token && (empty($tokenoldcompat) || $SECUREKEY != $tokenoldcompat)) {
+
+	if (! $tokenisok) {
 		if (empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
 			$valid = false; // PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility
 		} else {
@@ -323,7 +325,7 @@ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 
 	if (!$valid) {
 		print '<div class="error">Bad value for key.</div>';
-		//print 'SECUREKEY='.$SECUREKEY.' token='.$token.' valid='.$valid;
+		//print 'SECUREKEY='.$SECUREKEY.' valid='.$valid;
 		exit;
 	}
 }
@@ -439,21 +441,21 @@ if ($action == 'dopayment') {
 		$origfulltag = GETPOST("fulltag", 'alpha');
 
 		// Securekey into back url useless for back url and we need an url lower than 150.
-		$urlok = preg_replace('/securekey=[^&]+/', '', $urlok);
-		$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
+		$urlok = preg_replace('/securekey=[^&]+&?/', '', $urlok);
+		$urlko = preg_replace('/securekey=[^&]+&?/', '', $urlko);
 
 		if (empty($PRICE) || !is_numeric($PRICE)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount"));
 		} elseif (empty($email)) {
-			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("YourEMail"));
+			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ONLINE_PAYMENT_SENDEMAIL"));
 		} elseif (!isValidEMail($email)) {
 			$mesg = $langs->trans("ErrorBadEMail", $email);
 		} elseif (!$origfulltag) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentCode"));
 		} elseif (dol_strlen($urlok) > 150) {
-			$mesg = 'Error urlok too long '.$urlok.'( Paybox requires 150, found '.strlen($urlok).')';
+			$mesg = 'Error urlok too long '.$urlok.' (Paybox requires 150, found '.strlen($urlok).')';
 		} elseif (dol_strlen($urlko) > 150) {
-			$mesg = 'Error urlko too long '.$urlko.'( Paybox requires 150, found '.strlen($urlok).')';
+			$mesg = 'Error urlko too long '.$urlko.' (Paybox requires 150, found '.strlen($urlok).')';
 		}
 
 		if (empty($mesg)) {
@@ -480,7 +482,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 PaymentIntent API architecture, the Stripe customer is already created when creating PaymentIntent when showing payment page and the payment is already ok.
+// 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;
 
@@ -767,9 +769,23 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 			setEventMessages($paymentintent->status, null, 'errors');
 			$action = '';
 		} else {
-			// TODO We can alse record the payment mode into llx_societe_rib with stripe $paymentintent->payment_method
+			// TODO We can also record the payment mode into llx_societe_rib with stripe $paymentintent->payment_method
 			// Note that with other old Stripe architecture (using Charge API), the payment mode was not recorded, so it is not mandatory to do it here.
 			//dol_syslog("Create payment_method for ".$paymentintent->payment_method, LOG_DEBUG, 0, '_stripe');
+
+			// Get here amount and currency used for payment and force value into $amount and $currency so the real amount is saved into session instead
+			// of the amount and currency retreived from the POST.
+			if (!empty($paymentintent->currency) && !empty($paymentintent->amount)) {
+				$currency = strtoupper($paymentintent->currency);
+				$amount = $paymentintent->amount;
+
+				// Correct the amount according to unit of currency
+				// See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
+				$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
+				if (!in_array($currency, $arrayzerounitcurrency)) {
+					$amount = $amount / 100;
+				}
+			}
 		}
 	}
 
@@ -911,7 +927,8 @@ print '<!-- urlok = '.$urlok.' -->'."\n";
 print '<!-- urlko = '.$urlko.' -->'."\n";
 print "\n";
 
-print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+// Section with payment informationsummary
+print '<table id="dolpublictable" summary="Payment form" class="center">'."\n";
 
 // Output introduction text
 $text = '';
@@ -953,7 +970,9 @@ if (!$source) {
 
 	// Creditor
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Creditor");
-	print '</td><td class="CTableRow2"><b>'.$creditor.'</b>';
+	print '</td><td class="CTableRow2">';
+	print img_picto('', 'company', 'class="pictofixedwidth"');
+	print '<b>'.$creditor.'</b>';
 	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
@@ -966,13 +985,13 @@ if (!$source) {
 	if (empty($amount) || !is_numeric($amount)) {
 		print '<input type="hidden" name="amount" value="'.price2num(GETPOST("amount", 'alpha'), 'MT').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
+		// Currency
+		print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 	} else {
-		print '<b>'.price($amount).'</b>';
+		print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
 	}
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 	print '<input type="hidden" name="currency" value="'.$currency.'">';
 	print '</td></tr>'."\n";
 
@@ -1025,13 +1044,17 @@ if ($source == 'order') {
 
 	// Creditor
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Creditor");
-	print '</td><td class="CTableRow2"><b>'.$creditor.'</b>';
+	print '</td><td class="CTableRow2">';
+	print img_picto('', 'company', 'class="pictofixedwidth"');
+	print '<b>'.$creditor.'</b>';
 	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("ThirdParty");
-	print '</td><td class="CTableRow2"><b>'.$order->thirdparty->name.'</b>';
+	print '</td><td class="CTableRow2">';
+	print img_picto('', 'company', 'class="pictofixedwidth"');
+	print '<b>'.$order->thirdparty->name.'</b>';
 	print '</td></tr>'."\n";
 
 	// Object
@@ -1061,13 +1084,13 @@ if ($source == 'order') {
 	if (empty($amount) || !is_numeric($amount)) {
 		print '<input type="hidden" name="amount" value="'.price2num(GETPOST("amount", 'alpha'), 'MT').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
+		// Currency
+		print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 	} else {
-		print '<b>'.price($amount).'</b>';
+		print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
 	}
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 	print '<input type="hidden" name="currency" value="'.$currency.'">';
 	print '</td></tr>'."\n";
 
@@ -1149,13 +1172,17 @@ if ($source == 'invoice') {
 
 	// Creditor
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Creditor");
-	print '</td><td class="CTableRow2"><b>'.$creditor.'</b>';
+	print '</td><td class="CTableRow2">';
+	print img_picto('', 'company', 'class="pictofixedwidth"');
+	print '<b>'.$creditor.'</b>';
 	print '<input type="hidden" name="creditor" value="'.dol_escape_htmltag($creditor).'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("ThirdParty");
-	print '</td><td class="CTableRow2"><b>'.$invoice->thirdparty->name.'</b>';
+	print '</td><td class="CTableRow2">';
+	print img_picto('', 'company', 'class="pictofixedwidth"');
+	print '<b>'.$invoice->thirdparty->name.'</b>';
 	print '</td></tr>'."\n";
 
 	// Object
@@ -1188,18 +1215,16 @@ if ($source == 'invoice') {
 		if (empty($amount) || !is_numeric($amount)) {
 			print '<input type="hidden" name="amount" value="'.price2num(GETPOST("amount", 'alpha'), 'MT').'">';
 			print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
+			print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 		} else {
-			print '<b>'.price($amount).'</b>';
+			print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
 			print '<input type="hidden" name="amount" value="'.$amount.'">';
 			print '<input type="hidden" name="newamount" value="'.$amount.'">';
 		}
-		print ' <b>'.$langs->trans("Currency".$currency).'</b>';
-		print '<input type="hidden" name="currency" value="'.$currency.'">';
 	} else {
-		print '<b>'.price($object->total_ttc, 1, $langs).'</b>';
-		print ' <b>'.$langs->trans("Currency".$currency).'</b>';
-		print '<input type="hidden" name="currency" value="'.$currency.'">';
+		print '<b class="amount">'.price($object->total_ttc, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
 	}
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
 	print '</td></tr>'."\n";
 
 	// Tag
@@ -1315,7 +1340,7 @@ if ($source == 'contractline') {
 
 	$qty = 1;
 	if (GETPOST('qty')) {
-		$qty = GETPOST('qty');
+		$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
 	}
 
 	// Creditor
@@ -1392,13 +1417,13 @@ if ($source == 'contractline') {
 	if (empty($amount) || !is_numeric($amount)) {
 		print '<input type="hidden" name="amount" value="'.price2num(GETPOST("amount", 'alpha'), 'MT').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
+		// Currency
+		print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 	} else {
-		print '<b>'.price($amount).'</b>';
+		print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
 	}
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 	print '<input type="hidden" name="currency" value="'.$currency.'">';
 	print '</td></tr>'."\n";
 
@@ -1450,9 +1475,12 @@ if ($source == 'member' || $source == 'membersubscription') {
 	$langs->load("members");
 
 	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.'/adherents/class/subscription.class.php';
 
 	$member = new Adherent($db);
+	$adht = new AdherentType($db);
+
 	$result = $member->fetch('', $ref);
 	if ($result <= 0) {
 		$mesg = $member->error;
@@ -1460,6 +1488,8 @@ if ($source == 'member' || $source == 'membersubscription') {
 	} else {
 		$member->fetch_thirdparty();
 		$subscription = new Subscription($db);
+
+		$adht->fetch($member->typeid);
 	}
 	$object = $member;
 
@@ -1468,6 +1498,11 @@ if ($source == 'member' || $source == 'membersubscription') {
 		if (GETPOST("amount", 'alpha')) {
 			$amount = GETPOST("amount", 'alpha');
 		}
+		// If amount still not defined, we take amount of the type of member
+		if (empty($amount)) {
+			$amount = $adht->amount;
+		}
+
 		$amount = price2num($amount, 'MT');
 	}
 
@@ -1489,10 +1524,13 @@ if ($source == 'member' || $source == 'membersubscription') {
 
 	// Debitor
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Member");
-	print '</td><td class="CTableRow2"><b>';
-	if ($member->morphy == 'mor' && !empty($member->societe)) {
-		print $member->societe;
+	print '</td><td class="CTableRow2">';
+	print '<b>';
+	if ($member->morphy == 'mor' && !empty($member->company)) {
+		print img_picto('', 'company', 'class="pictofixedwidth"');
+		print $member->company;
 	} else {
+		print img_picto('', 'member', 'class="pictofixedwidth"');
 		print $member->getFullName($langs);
 	}
 	print '</b>';
@@ -1581,7 +1619,7 @@ if ($source == 'member' || $source == 'membersubscription') {
 			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">'.$langs->trans("SeeHere").'</a>';
+			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 ')';
@@ -1611,23 +1649,22 @@ if ($source == 'member' || $source == 'membersubscription') {
 		}
 		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>';
+			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>'.price($valtoshow).'</b>';
+		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.'">';
 	}
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 	print '<input type="hidden" name="currency" value="'.$currency.'">';
 	print '</td></tr>'."\n";
 
@@ -1742,7 +1779,7 @@ if ($source == 'donation') {
 			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">'.$langs->trans("SeeHere").'</a>';
+			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 ')';
@@ -1772,18 +1809,18 @@ if ($source == 'donation') {
 		}
 		print '<input type="hidden" name="amount" value="'.price2num(GETPOST("amount", 'alpha'), 'MT').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.$valtoshow.'">';
+		// Currency
+		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>'.price($valtoshow).'</b>';
+		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.'">';
 	}
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 	print '<input type="hidden" name="currency" value="'.$currency.'">';
 	print '</td></tr>'."\n";
 
@@ -1851,7 +1888,7 @@ if ($source == 'organizedeventregistration') {
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Attendee");
 	print '</td><td class="CTableRow2"><b>';
 	print $attendee->email;
-	print ($thirdparty->name ? ' ('.$langs->trans("Company").' '.$thirdparty->name.')' : '');
+	print ($thirdparty->name ? ' ('.$thirdparty->name.')' : '');
 	print '</b>';
 	print '</td></tr>'."\n";
 
@@ -1872,12 +1909,9 @@ if ($source == 'organizedeventregistration') {
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
 	print '</td><td class="CTableRow2">';
 	$valtoshow = $amount;
-	print '<b>'.price($valtoshow).'</b>';
+	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.'">';
-
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 	print '<input type="hidden" name="currency" value="'.$currency.'">';
 	print '</td></tr>'."\n";
 
@@ -1958,12 +1992,9 @@ if ($source == 'boothlocation') {
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
 	print '</td><td class="CTableRow2">';
 	$valtoshow = $amount;
-	print '<b>'.price($valtoshow).'</b>';
+	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.'">';
-
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 	print '<input type="hidden" name="currency" value="'.$currency.'">';
 	print '</td></tr>'."\n";
 
@@ -2276,7 +2307,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 			print '<!-- urllogofull = '.$urllogofull.' -->'."\n";
 
 			// Code to ask the credit card. This use the default "API version". No way to force API version when using JS code.
-			print '<script type="text/javascript" language="javascript">'."\n";
+			print '<script type="text/javascript">'."\n";
 
 			if (!empty($conf->global->STRIPE_USE_NEW_CHECKOUT)) {
 				$amountstripe = $amount;
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 6894e6a18c8..606bed0c490 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -190,7 +190,7 @@ if (!empty($_SESSION['ipaddress'])) {      // To avoid to make action twice
 		$urlback = $_SERVER["REQUEST_URI"];
 		$topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("NewOnlinePaymentFailed");
 		$content = "";
-		$content .= '<font color="orange">'.$companylangs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."</font>\n";
+		$content .= '<span style="color: orange">'.$companylangs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."</span>\n";
 
 		$content .= "<br><br>\n";
 		$content .= '<u>'.$companylangs->transnoentitiesnoconv("TechnicalInformation").":</u><br>\n";
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 569c1646ef9..c822bfcdf96 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -343,6 +343,9 @@ if (empty($FinalPaymentAmt)) {
 if (empty($paymentType)) {
 	$paymentType     = $_SESSION["paymentType"];
 }
+if (empty($currencyCodeType)) {
+	$currencyCodeType = $_SESSION['currencyCodeType'];
+}
 
 $fulltag = $FULLTAG;
 $tmptag = dolExplodeIntoArray($fulltag, '.', '=');
@@ -386,7 +389,7 @@ if ($ispaymentok) {
 		$adht = new AdherentType($db);
 		$object = new Adherent($db);
 
-		$result1 = $object->fetch($tmptag['MEM']);
+		$result1 = $object->fetch((int) $tmptag['MEM']);
 		$result2 = $adht->fetch($object->typeid);
 
 		dol_syslog("We have to process member with id=".$tmptag['MEM']." result1=".$result1." result2=".$result2, LOG_DEBUG, 0, '_payment');
@@ -403,27 +406,60 @@ if ($ispaymentok) {
 				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
 			}
 			if (empty($paymentTypeId)) {
-				$paymentType = $_SESSION["paymentType"];
 				if (empty($paymentType)) {
 					$paymentType = 'CB';
 				}
 				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
 			}
 
-			$currencyCodeType = $_SESSION['currencyCodeType'];
-
-			dol_syslog("FinalPaymentAmt=".$FinalPaymentAmt." paymentTypeId=".$paymentTypeId, LOG_DEBUG, 0, '_payment');
+			dol_syslog("FinalPaymentAmt=".$FinalPaymentAmt." paymentTypeId=".$paymentTypeId." currencyCodeType=".$currencyCodeType, 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) {
-				$result = ($object->status == $object::STATUS_EXCLUDED) ? -1 : $object->validate($user); // if membre is excluded (status == -2) the new validation is not possible
-				if ($result < 0 || empty($object->datevalid)) {
+				// Security protection:
+				if (empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {	// If we didn't allow members to choose their membership amount
+					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;
+
+						// Set amount for the subscription:
+						// - First check the amount of the member type.
+						$amountbytype = $adht->amountByType(1);		// Load the array of amount per type
+						$amountexpected = empty($amountbytype[$typeid]) ? 0 : $amountbytype[$typeid];
+						// - If not found, take the default amount
+						if (empty($amountexpected) && !empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
+							$amountexpected = $conf->global->MEMBER_NEWFORM_AMOUNT;
+						}
+
+						if ($amountexpected && $amountexpected != $FinalPaymentAmt) {
+							$error++;
+							$errmsg = 'Value of FinalPayment ('.$FinalPaymentAmt.') differs from value expected for membership ('.$amountexpected.'). May be a hack to try to pay a different amount ?';
+							$postactionmessages[] = $errmsg;
+							$ispostactionok = -1;
+							dol_syslog("Failed to validate member (bad amount check): ".$errmsg, LOG_ERR, 0, '_payment');
+						}
+					}
+				}
+
+				// Security protection:
+				if ($currencyCodeType && $currencyCodeType != $conf->currency) {	// Check that currency is the good one
 					$error++;
-					$errmsg = $object->error;
+					$errmsg = 'Value of currencyCodeType ('.$currencyCodeType.') differs from value expected for membership ('.$conf->currency.'). May be a hack to try to pay a different amount ?';
 					$postactionmessages[] = $errmsg;
-					$postactionmessages = array_merge($postactionmessages, $object->errors);
 					$ispostactionok = -1;
-					dol_syslog("Failed to validate member: ".$errmsg, LOG_ERR, 0, '_payment');
+					dol_syslog("Failed to validate member (bad currency check): ".$errmsg, LOG_ERR, 0, '_payment');
+				}
+
+				if (! $error) {
+					// We validate the member (no effect if it is already validated)
+					$result = ($object->status == $object::STATUS_EXCLUDED) ? -1 : $object->validate($user); // if membre is excluded (status == -2) the new validation is not possible
+					if ($result < 0 || empty($object->datevalid)) {
+						$error++;
+						$errmsg = $object->error;
+						$postactionmessages[] = $errmsg;
+						$postactionmessages = array_merge($postactionmessages, $object->errors);
+						$ispostactionok = -1;
+						dol_syslog("Failed to validate member: ".$errmsg, LOG_ERR, 0, '_payment');
+					}
 				}
 
 				// Subscription informations
@@ -586,7 +622,7 @@ if ($ispaymentok) {
 										}
 									} else {
 										$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_account (fk_soc, login, key_account, site, site_account, status, entity, date_creation, fk_user_creat)";
-										$sql .= " VALUES (".$object->fk_soc.", '', '".$db->escape($stripecu)."', 'stripe', '".$db->escape($stripearrayofkeysbyenv[$servicestatus]['publishable_key'])."', ".$servicestatus.", ".$conf->entity.", '".$db->idate(dol_now())."', 0)";
+										$sql .= " VALUES (".((int) $object->fk_soc).", '', '".$db->escape($stripecu)."', 'stripe', '".$db->escape($stripearrayofkeysbyenv[$servicestatus]['publishable_key'])."', ".((int) $servicestatus).", ".((int) $conf->entity).", '".$db->idate(dol_now())."', 0)";
 										$resql = $db->query($sql);
 										if (!$resql) {	// should not happen
 											$error++;
@@ -721,7 +757,7 @@ if ($ispaymentok) {
 		// Record payment
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$object = new Facture($db);
-		$result = $object->fetch($tmptag['INV']);
+		$result = $object->fetch((int) $tmptag['INV']);
 		if ($result) {
 			$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
 
@@ -736,15 +772,12 @@ if ($ispaymentok) {
 				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
 			}
 			if (empty($paymentTypeId)) {
-				$paymentType = $_SESSION["paymentType"];
 				if (empty($paymentType)) {
 					$paymentType = 'CB';
 				}
 				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
 			}
 
-			$currencyCodeType = $_SESSION['currencyCodeType'];
-
 			// 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();
@@ -824,13 +857,113 @@ if ($ispaymentok) {
 			$postactionmessages[] = 'Invoice paid '.$tmptag['INV'].' was not found';
 			$ispostactionok = -1;
 		}
-	} elseif (array_key_exists('DON', $tmptag) && $tmptag['DON'] > 0) {
-		include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-		$don = new Don($db);
-		$result = $don->fetch($tmptag['DON']);
+	} elseif (array_key_exists('ORD', $tmptag) && $tmptag['ORD'] > 0) {
+		include_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+		$object = new Commande($db);
+		$result = $object->fetch((int) $tmptag['ORD']);
 		if ($result) {
 			$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 (empty($paymentTypeId)) {
+				if (empty($paymentType)) $paymentType = 'CB';
+				$paymentTypeId = dol_getIdFromCode($db, $paymentType, '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 (!empty($FinalPaymentAmt) && $paymentTypeId > 0 ) {
+					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+					$invoice = new Facture($db);
+					$result = $invoice->createFromOrder($object, $user);
+					if ($result > 0) {
+						$object->classifyBilled($user);
+						$invoice->validate($user);
+						// Creation of payment line
+						include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+						$paiement = new Paiement($db);
+						$paiement->datepaye = $now;
+						if ($currencyCodeType == $conf->currency) {
+							$paiement->amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
+						} else {
+							$paiement->multicurrency_amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching
+
+							$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
+							$ispostactionok = -1;
+							$error++;
+						}
+						$paiement->paiementid = $paymentTypeId;
+						$paiement->num_payment = '';
+						$paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
+						$paiement->ext_payment_id = $TRANSACTIONID;
+						$paiement->ext_payment_site = '';
+
+						if (!$error) {
+							$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
+							if ($paiement_id < 0) {
+								$postactionmessages[] = $paiement->error . ' ' . join("<br>\n", $paiement->errors);
+								$ispostactionok = -1;
+								$error++;
+							} else {
+								$postactionmessages[] = 'Payment created';
+								$ispostactionok = 1;
+							}
+						}
+
+						if (!$error && !empty($conf->banque->enabled)) {
+							$bankaccountid = 0;
+							if ($paymentmethod == 'paybox') $bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+							elseif ($paymentmethod == 'paypal') $bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+							elseif ($paymentmethod == 'stripe') $bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+
+							if ($bankaccountid > 0) {
+								$label = '(CustomerInvoicePayment)';
+								if ($object->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+								$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
+								if ($result < 0) {
+									$postactionmessages[] = $paiement->error . ' ' . join("<br>\n", $paiement->errors);
+									$ispostactionok = -1;
+									$error++;
+								} else {
+									$postactionmessages[] = 'Bank transaction of payment created';
+									$ispostactionok = 1;
+								}
+							} else {
+								$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
+								$ispostactionok = -1;
+								$error++;
+							}
+						}
+
+						if (!$error) {
+							$db->commit();
+						} else {
+							$db->rollback();
+						}
+					} else {
+						$postactionmessages[] = 'Failed to create invoice form order ' . $tmptag['ORD'] . '.';
+						$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.';
+					$ispostactionok = -1;
+				}
+			} else {
+				$postactionmessages[] = 'Invoice module is not enable';
+				$ispostactionok = -1;
+			}
+		} else {
+			$postactionmessages[] = 'Order paid ' . $tmptag['ORD'] . ' was not found';
+			$ispostactionok = -1;
+		}
+	} elseif (array_key_exists('DON', $tmptag) && $tmptag['DON'] > 0) {
+		include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
+		$don = new Don($db);
+		$result = $don->fetch((int) $tmptag['DON']);
+		if ($result) {
 			$paymentTypeId = 0;
 			if ($paymentmethod == 'paybox') {
 				$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
@@ -842,15 +975,12 @@ if ($ispaymentok) {
 				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
 			}
 			if (empty($paymentTypeId)) {
-				$paymentType = $_SESSION["paymentType"];
 				if (empty($paymentType)) {
 					$paymentType = 'CB';
 				}
 				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
 			}
 
-			$currencyCodeType = $_SESSION['currencyCodeType'];
-
 			// 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();
@@ -939,8 +1069,6 @@ if ($ispaymentok) {
 		$object = new Facture($db);
 		$result = $object->fetch($ref);
 		if ($result) {
-			$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
-
 			$paymentTypeId = 0;
 			if ($paymentmethod == 'paybox') {
 				$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
@@ -952,15 +1080,12 @@ if ($ispaymentok) {
 				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
 			}
 			if (empty($paymentTypeId)) {
-				$paymentType = $_SESSION["paymentType"];
 				if (empty($paymentType)) {
 					$paymentType = 'CB';
 				}
 				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
 			}
 
-			$currencyCodeType = $_SESSION['currencyCodeType'];
-
 			// 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) {
 				$resultvalidate = $object->validate($user);
@@ -1036,7 +1161,7 @@ if ($ispaymentok) {
 					if (!$error) {
 						// Validating the attendee
 						$attendeetovalidate = new ConferenceOrBoothAttendee($db);
-						$resultattendee = $attendeetovalidate->fetch($tmptag['ATT']);
+						$resultattendee = $attendeetovalidate->fetch((int) $tmptag['ATT']);
 						if ($resultattendee < 0) {
 							$error++;
 							setEventMessages(null, $attendeetovalidate->errors, "errors");
@@ -1136,15 +1261,12 @@ if ($ispaymentok) {
 				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
 			}
 			if (empty($paymentTypeId)) {
-				$paymentType = $_SESSION["paymentType"];
 				if (empty($paymentType)) {
 					$paymentType = 'CB';
 				}
 				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
 			}
 
-			$currencyCodeType = $_SESSION['currencyCodeType'];
-
 			// 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) {
 				$resultvalidate = $object->validate($user);
@@ -1220,7 +1342,7 @@ if ($ispaymentok) {
 					if (!$error) {
 						// Putting the booth to "suggested" state
 						$booth = new ConferenceOrBooth($db);
-						$resultbooth = $booth->fetch($tmptag['BOO']);
+						$resultbooth = $booth->fetch((int) $tmptag['BOO']);
 						if ($resultbooth < 0) {
 							$error++;
 							setEventMessages(null, $booth->errors, "errors");
@@ -1385,12 +1507,12 @@ if ($ispaymentok) {
 		$topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("NewOnlinePaymentReceived");
 		$content = "";
 		if (array_key_exists('MEM', $tmptag)) {
-			$url = $urlwithroot."/adherents/subscription.php?rowid=".$tmptag['MEM'];
+			$url = $urlwithroot."/adherents/subscription.php?rowid=".((int) $tmptag['MEM']);
 			$content .= '<strong>'.$companylangs->trans("PaymentSubscription")."</strong><br><br>\n";
 			$content .= $companylangs->trans("MemberId").': <strong>'.$tmptag['MEM']."</strong><br>\n";
 			$content .= $companylangs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
 		} elseif (array_key_exists('INV', $tmptag)) {
-			$url = $urlwithroot."/compta/facture/card.php?id=".$tmptag['INV'];
+			$url = $urlwithroot."/compta/facture/card.php?id=".((int) $tmptag['INV']);
 			$content .= '<strong>'.$companylangs->trans("Payment")."</strong><br><br>\n";
 			$content .= $companylangs->trans("InvoiceId").': <strong>'.$tmptag['INV']."</strong><br>\n";
 			//$content.=$companylangs->trans("ThirdPartyId").': '.$tmptag['CUS']."<br>\n";
@@ -1401,12 +1523,12 @@ if ($ispaymentok) {
 		$content .= $companylangs->transnoentities("PostActionAfterPayment").' : ';
 		if ($ispostactionok > 0) {
 			//$topic.=' ('.$companylangs->transnoentitiesnoconv("Status").' '.$companylangs->transnoentitiesnoconv("OK").')';
-			$content .= '<font color="green">'.$companylangs->transnoentitiesnoconv("OK").'</font>';
+			$content .= '<span style="color: green">'.$companylangs->transnoentitiesnoconv("OK").'</span>';
 		} elseif ($ispostactionok == 0) {
 			$content .= $companylangs->transnoentitiesnoconv("None");
 		} else {
 			$topic .= ($ispostactionok ? '' : ' ('.$companylangs->trans("WarningPostActionErrorAfterPayment").')');
-			$content .= '<font color="red">'.$companylangs->transnoentitiesnoconv("Error").'</font>';
+			$content .= '<span style="color: red">'.$companylangs->transnoentitiesnoconv("Error").'</span>';
 		}
 		$content .= '<br>'."\n";
 		foreach ($postactionmessages as $postactionmessage) {
@@ -1525,7 +1647,7 @@ if ($ispaymentok) {
 		$urlback = $_SERVER["REQUEST_URI"];
 		$topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("ValidationOfPaymentFailed");
 		$content = "";
-		$content .= '<font color="orange">'.$companylangs->transnoentitiesnoconv("PaymentSystemConfirmPaymentPageWasCalledButFailed")."</font>\n";
+		$content .= '<span style="color: orange">'.$companylangs->transnoentitiesnoconv("PaymentSystemConfirmPaymentPageWasCalledButFailed")."</span>\n";
 
 		$content .= "<br><br>\n";
 		$content .= '<u>'.$companylangs->transnoentitiesnoconv("TechnicalInformation").":</u><br>\n";
@@ -1552,6 +1674,8 @@ if ($ispaymentok) {
 
 print "\n</div>\n";
 
+print "<!-- Info for payment: FinalPaymentAmt=".dol_escape_htmltag($FinalPaymentAmt)." paymentTypeId=".dol_escape_htmltag($paymentTypeId)." currencyCodeType=".dol_escape_htmltag($currencyCodeType)." -->\n";
+
 
 htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix);
 
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 7beae2ee971..5f450a6c557 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -64,7 +64,7 @@ $langs->loadLangs(array("other", "dict", "bills", "companies", "errors", "paybox
 // No check on module enabled. Done later according to $validpaymentmethod
 
 $action = GETPOST('action', 'aZ09');
-$id = GETPOST('id');
+$id = GETPOST('id', 'int');
 $securekeyreceived = GETPOST("securekey", 'alpha');
 $securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 'md5');
 
@@ -183,11 +183,27 @@ if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT)) {
 	print '</div>';
 }
 
-print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+print '<br>';
 
-$text  = '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
-$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$project->title.'.<br><br></td></tr>'."\n";
-$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
+
+// Event summary
+print '<div class="center">';
+print '<span class="large">'.$project->title.'</span><br>';
+print img_picto('', 'calendar', 'class="pictofixedwidth"').$langs->trans("Date").': ';
+print dol_print_date($project->date_start, 'daytext');
+if ($project->date_end && $project->date_start != $project->date_end) {
+	print ' - '.dol_print_date($project->date_end, 'daytext');
+}
+print '<br><br>'."\n";
+print $langs->trans("EvntOrgRegistrationWelcomeMessage")."\n";
+print $project->note_public."\n";
+//print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx';
+print '</div>';
+
+
+print '<br>';
+
+print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
 
 print $text;
 
@@ -205,19 +221,27 @@ print "\n";
 
 // Show all action buttons
 print '<br>';
+
 // Output introduction text
+$foundaction = 0;
 if ($project->accept_booth_suggestions) {
-	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" name="suggestbooth" class="button">';
+	$foundaction++;
+	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" name="suggestbooth" class="button width500">';
 	print '<br><br>';
 }
-if ($project->accept_conference_suggestions) {
-	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" name="suggestconference" class="button">';
+if ($project->accept_conference_suggestions == 1 || $project->accept_conference_suggestions == 2) {		// Can suggest conferences
+	$foundaction++;
+	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" name="suggestconference" class="button width500">';
 	print '<br><br>';
 }
-print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" name="viewandvote" class="button">';
-
-
+if ($project->accept_conference_suggestions == 2 || $project->accept_conference_suggestions == 3) {		// Can vote for conferences
+	$foundaction++;
+	print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" name="viewandvote" class="button width500">';
+}
 
+if (! $foundaction) {
+	print '<span class="opacitymedium">'.$langs->trans("NoPublicActionsAllowedForThisEvent").'</span>';
+}
 
 print '</td></tr>'."\n";
 
diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php
index ca7101a3679..971031e7a80 100644
--- a/htdocs/public/project/new.php
+++ b/htdocs/public/project/new.php
@@ -24,7 +24,7 @@
 /**
  *	\file       htdocs/public/project/new.php
  *	\ingroup    project
- *	\brief      Example of form to add a new lead
+ *	\brief      Page to record a message/lead into a project/lead
  */
 
 if (!defined('NOLOGIN')) {
@@ -65,7 +65,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 // Load translation files
-$langs->loadLangs(array("members", "companies", "install", "other"));
+$langs->loadLangs(array("members", "companies", "install", "other", "projects"));
 
 if (empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
 	print $langs->trans("Form for public lead registration has not been enabled");
@@ -311,7 +311,7 @@ if (empty($reshook) && $action == 'add') {
 				$urlback = $conf->global->PROJECT_URL_REDIRECT_LEAD;
 				// TODO Make replacement of __AMOUNT__, etc...
 			} else {
-				$urlback = $_SERVER["PHP_SELF"]."?action=added";
+				$urlback = $_SERVER["PHP_SELF"]."?action=added&token=".newToken();
 			}
 
 			if (!empty($entity)) {
@@ -381,7 +381,7 @@ print '<div class="center subscriptionformhelptext justify">';
 if (!empty($conf->global->PROJECT_NEWFORM_TEXT)) {
 	print $langs->trans($conf->global->PROJECT_NEWFORM_TEXT)."<br>\n";
 } else {
-	print $langs->trans("NewLeadDesc", $conf->global->MAIN_INFO_SOCIETE_MAIL)."<br>\n";
+	print $langs->trans("FormForNewLeadDesc", $conf->global->MAIN_INFO_SOCIETE_MAIL)."<br>\n";
 }
 print '</div>';
 
@@ -415,9 +415,9 @@ jQuery(document).ready(function () {
 print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 // Lastname
-print '<tr><td>'.$langs->trans("Lastname").' <FONT COLOR="red">*</FONT></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')).'"></td></tr>'."\n";
 // Firstname
-print '<tr><td>'.$langs->trans("Firstname").' <FONT COLOR="red">*</FONT></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')).'"></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
@@ -460,7 +460,7 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
 	print '</td></tr>';
 }
 // EMail
-print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+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';
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index f87fcf6f041..c0bcdc751c6 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -517,6 +517,22 @@ $formcompany = new FormCompany($db);
 
 llxHeaderVierge($langs->trans("NewSuggestionOfBooth"));
 
+print '<br>';
+
+// Event summary
+print '<div class="center">';
+print '<span class="large">'.$project->title.'</span><br>';
+print img_picto('', 'calendar', 'class="pictofixedwidth"').$langs->trans("Date").': ';
+print dol_print_date($project->date_start, 'daytext');
+if ($project->date_end && $project->date_start != $project->date_end) {
+	print ' - '.dol_print_date($project->date_end, 'daytext');
+}
+print '<br><br>'."\n";
+//print $langs->trans("EvntOrgRegistrationWelcomeMessage")."\n";
+//print $project->note_public."\n";
+//print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx';
+print '</div>';
+
 
 print load_fiche_titre($langs->trans("NewSuggestionOfBooth"), '', '', 0, 0, 'center');
 
@@ -525,13 +541,6 @@ print '<div align="center">';
 print '<div id="divsubscribe">';
 print '<div class="center subscriptionformhelptext justify">';
 
-// Welcome message
-$text  = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationBoothWelcomeMessage").'</strong></td></tr></br>';
-$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationBoothHelpMessage").' '.$project->label.'.<br><br></td></tr>'."\n";
-$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";;
-print $text;
-print '</div>';
-
 dol_htmloutput_errors($errmsg);
 
 // Print form
@@ -563,13 +572,13 @@ jQuery(document).ready(function () {
 print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 // Name
-print '<tr><td><label for="lastname">'.$langs->trans("Lastname").'<FONT COLOR="red">*</FONT></label></td>';
+print '<tr><td><label for="lastname">'.$langs->trans("Lastname").'<span style="color: red">*</span></label></td>';
 print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname", 'alpha') ?GETPOST("lastname", 'alpha') : $object->lastname).'" autofocus="autofocus"></td>';
 print '</tr>';
 // Email
-print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+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";
 // Company
-print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'<FONT COLOR="red">*</FONT>';
+print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'<span style="color: red">*</span>';
 print ' </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";
@@ -614,13 +623,13 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
 	print '</td></tr>';
 }
 // Type of event
-print '<tr><td>'.$langs->trans("EventType").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '<tr><td>'.$langs->trans("EventType").'<span style="color: red">*</span></td>'."\n";
 print '<td>'.FORM::selectarray('eventtype', $arrayofeventtype, $eventtype).'</td>';
 // Label
-print '<tr><td>'.$langs->trans("LabelOfBooth").'<FONT COLOR="red">*</FONT></td>'."\n";
+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";
 // Note
-print '<tr><td>'.$langs->trans("Description").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '<tr><td>'.$langs->trans("Description").'<span style="color: red">*</span></td>'."\n";
 print '<td><textarea name="note" id="note" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
 
 print "</table>\n";
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 1e365a51f57..f2a919c0aa2 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -450,6 +450,22 @@ $formcompany = new FormCompany($db);
 
 llxHeaderVierge($langs->trans("NewSuggestionOfConference"));
 
+print '<br>';
+
+// Event summary
+print '<div class="center">';
+print '<span class="large">'.$project->title.'</span><br>';
+print img_picto('', 'calendar', 'class="pictofixedwidth"').$langs->trans("Date").': ';
+print dol_print_date($project->date_start, 'daytext');
+if ($project->date_end && $project->date_start != $project->date_end) {
+	print ' - '.dol_print_date($project->date_end, 'daytext');
+}
+print '<br><br>'."\n";
+//print $langs->trans("EvntOrgRegistrationWelcomeMessage")."\n";
+//print $project->note_public."\n";
+//print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx';
+print '</div>';
+
 
 print load_fiche_titre($langs->trans("NewSuggestionOfConference"), '', '', 0, 0, 'center');
 
@@ -458,12 +474,6 @@ print '<div align="center">';
 print '<div id="divsubscribe">';
 print '<div class="center subscriptionformhelptext justify">';
 
-// Welcome message
-$text  = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationConfWelcomeMessage").'</strong></td></tr></br>';
-$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationConfHelpMessage").' '.$project->label.'.<br><br></td></tr>'."\n";
-$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";;
-print $text;
-print '</div>';
 
 dol_htmloutput_errors($errmsg);
 
@@ -496,17 +506,17 @@ jQuery(document).ready(function () {
 print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 // Last Name
-print '<tr><td><label for="lastname">'.$langs->trans("Lastname").'<FONT COLOR="red">*</FONT></label></td>';
+print '<tr><td><label for="lastname">'.$langs->trans("Lastname").'<span style="color: red">*</span></label></td>';
 print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname", 'alpha') ?GETPOST("lastname", 'alpha') : $object->lastname).'" autofocus="autofocus"></td>';
 print '</tr>';
 // First Name
-print '<tr><td><label for="firstname">'.$langs->trans("Firstname").'<FONT COLOR="red">*</FONT></label></td>';
+print '<tr><td><label for="firstname">'.$langs->trans("Firstname").'<span style="color: red">*</span></label></td>';
 print '<td colspan="3"><input name="firstname" id="firstname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("firstname", 'alpha') ?GETPOST("firstname", 'alpha') : $object->firstname).'" autofocus="autofocus"></td>';
 print '</tr>';
 // Email
-print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+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";
 // Company
-print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'<FONT COLOR="red">*</FONT>';
+print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'<span style="color: red">*</span>';
 print ' </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";
@@ -548,13 +558,13 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
 	print '</td></tr>';
 }
 // Type of event
-print '<tr><td>'.$langs->trans("EventType").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '<tr><td>'.$langs->trans("EventType").'<span style="color: red">*</span></td>'."\n";
 print '<td>'.FORM::selectarray('eventtype', $arrayofeventtype, $eventtype).'</td>';
 // Label
-print '<tr><td>'.$langs->trans("LabelOfconference").'<FONT COLOR="red">*</FONT></td>'."\n";
+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";
 // Note
-print '<tr><td>'.$langs->trans("Description").'<FONT COLOR="red">*</FONT></td>'."\n";
+print '<tr><td>'.$langs->trans("Description").'<span style="color: red">*</span></td>'."\n";
 print '<td><textarea name="note" id="note" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
 
 print "</table>\n";
diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 157a0053ac5..e680df15a1c 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -101,20 +101,18 @@ if (empty($conf->eventorganization->enabled)) {
 
 $tmpthirdparty = new Societe($db);
 
-$listOfConferences = $listOfBooths = '<tr><td>'.$langs->trans('Label').'</td>
-										  <td>'.$langs->trans('Type').'</td>
-										  <td>'.$langs->trans('DateStart').'</td>
-									      <td>'.$langs->trans('DateEnd').'</td>
-									      <td>'.$langs->trans('Thirdparty').'</td>
-									      <td>'.$langs->trans('Note').'</td></tr>';
+$listOfConferences = '<tr><td>'.$langs->trans('Label').'</td>';
+$listOfConferences .= '<td>'.$langs->trans('Type').'</td>';
+$listOfConferences .= '<td>'.$langs->trans('ThirdParty').'</td>';
+$listOfConferences .= '<td>'.$langs->trans('Note').'</td></tr>';
 
-$sql = "SELECT a.id, a.fk_action, a.datep, a.datep2, a.label, a.fk_soc, a.note, ca.libelle
+$sql = "SELECT a.id, a.fk_action, a.datep, a.datep2, a.label, a.fk_soc, a.note, ca.libelle as label
 		FROM ".MAIN_DB_PREFIX."actioncomm as a
 		INNER JOIN ".MAIN_DB_PREFIX."c_actioncomm as ca ON (a.fk_action=ca.id)
 		WHERE a.status<2";
 
 $sqlforconf = $sql." AND ca.module='conference@eventorganization'";
-$sqlforbooth = $sql." AND ca.module='booth@eventorganization'";
+//$sqlforbooth = $sql." AND ca.module='booth@eventorganization'";
 
 // For conferences
 $result = $db->query($sqlforconf);
@@ -132,12 +130,13 @@ while ($i < $db->num_rows($result)) {
 		$thirdpartyname = '';
 	}
 
-	$listOfConferences .= '<tr><td>'.$obj->label.'</td><td>'.$obj->libelle.'</td><td>'.$obj->datep.'</td><td>'.$obj->datep2.'</td><td>'.$thirdpartyname.'</td><td>'.$obj->note.'</td>';
+	$listOfConferences .= '<tr><td>'.$obj->label.'</td><td>'.$obj->label.'</td><td>'.$thirdpartyname.'</td><td>'.$obj->note.'</td>';
 	$listOfConferences .= '<td><button type="submit" name="vote" value="'.$obj->id.'" class="button">'.$langs->trans("Vote").'</button></td></tr>';
 	$i++;
 }
 
 // For booths
+/*
 $result = $db->query($sqlforbooth);
 $i = 0;
 while ($i < $db->num_rows($result)) {
@@ -157,6 +156,7 @@ while ($i < $db->num_rows($result)) {
 	$listOfBooths .= '<td><button type="submit" name="vote" value="'.$obj->id.'" class="button">'.$langs->trans("Vote").'</button></td></tr>';
 	$i++;
 }
+*/
 
 // Get vote result
 $idvote = GETPOST("vote");
@@ -271,23 +271,24 @@ if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH)) {
 print '<table id="welcome" class="center">'."\n";
 $text  = '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
 $text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgVoteHelpMessage").' : "'.$project->title.'".<br><br></td></tr>'."\n";
-$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";;
+$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";
 print $text;
 print '</table>'."\n";
 
-print dol_get_fiche_head('');
 
-print '<table border=1  cellpadding="10" id="conferences" class="center">'."\n";
+print '<table cellpadding="10" id="conferences" border="1" class="center">'."\n";
 print '<th colspan="7">'.$langs->trans("ListOfSuggestedConferences").'</th>';
-print $listOfConferences.'</br>';
+print $listOfConferences.'<br>';
 print '</table>'."\n";
 
-print '</br>';
+/*
+print '<br>';
 
 print '<table border=1  cellpadding="10" id="conferences" class="center">'."\n";
 print '<th colspan="7">'.$langs->trans("ListOfSuggestedBooths").'</th>';
-print $listOfBooths.'</br>';
+print $listOfBooths.'<br>';
 print '</table>'."\n";
+*/
 
 $object = null;
 
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index f3d84ec996f..1736deef246 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -1,5 +1,5 @@
 <?php
-/*  Copyright (C) 2013-2016    Jean-François FERRY    <jfefe@aternatik.fr>
+/* Copyright (C) 2020       Laurent Destailleur     <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,21 +16,16 @@
  */
 
 /**
- *       \file       htdocs/public/recruitment/index.php
+ *       \file       htdocs/public/recruitment/view.php
  *       \ingroup    recruitment
- *       \brief      Public file to list jobs
+ *       \brief      Public file to show on job
  */
 
+if (!defined('NOLOGIN')) {
+	define("NOLOGIN", 1); // This means this output page does not require to be logged.
+}
 if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
-// 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');
+	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 }
 if (!defined('NOIPCHECK')) {
 	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
@@ -38,23 +33,48 @@ if (!defined('NOIPCHECK')) {
 if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }
-// If this page is public (can be called outside logged session)
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "other", "recruitment"));
 
 // Get parameters
-$action = GETPOST('action', 'aZ09');
-$email = GETPOST('email', 'alpha');
+$action   = GETPOST('action', 'aZ09');
+$cancel   = GETPOST('cancel', 'alpha');
+$email    = GETPOST('email', 'alpha');
+$backtopage = '';
+
+$ref = GETPOST('ref', 'alpha');
+
+if (GETPOST('btn_view')) {
+	unset($_SESSION['email_customer']);
+}
+if (isset($_SESSION['email_customer'])) {
+	$email = $_SESSION['email_customer'];
+}
 
 $object = new RecruitmentJobPosition($db);
 
+if (!$action) {
+	if (!$ref) {
+		print $langs->trans('ErrorBadParameters')." - ref missing";
+		exit;
+	} else {
+		$object->fetch('', $ref);
+	}
+}
+
+// Define $urlwithroot
+//$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+//$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current. For Paypal payment, we can use internal URL like localhost.
+
 // Security check
 if (empty($conf->recruitment->enabled)) {
 	accessforbidden('', 0, 0, 1);
@@ -68,14 +88,17 @@ if (empty($conf->recruitment->enabled)) {
 // None
 
 
-
 /*
  * View
  */
 
-$form = new Form($db);
-$user_assign = new User($db);
-$user_create = new User($db);
+$head = '';
+if (!empty($conf->global->MAIN_RECRUITMENT_CSS_URL)) {
+	$head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->MAIN_RECRUITMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+}
+
+$conf->dol_hide_topmenu = 1;
+$conf->dol_hide_leftmenu = 1;
 
 if (!$conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE) {
 	$langs->load("errors");
@@ -87,382 +110,74 @@ if (!$conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE) {
 $arrayofjs = array();
 $arrayofcss = array();
 
-llxHeaderTicket($langs->trans("Jobs"), "", 0, 0, $arrayofjs, $arrayofcss);
+$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
+llxHeader($head, $langs->trans("PositionToBeFilled"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea, 1);
 
 
-print '<div class="ticketpublicarealist">';
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div class="center">'."\n";
+print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
+print '<input type="hidden" name="action" value="dosign">'."\n";
+print '<input type="hidden" name="tag" value="'.GETPOST("tag", 'alpha').'">'."\n";
+print '<input type="hidden" name="suffix" value="'.GETPOST("suffix", 'alpha').'">'."\n";
+print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
+print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print "\n";
+print '<!-- Form to view jobs -->'."\n";
 
-$display_ticket_list = 1;
-
-print '<br>';
-if ($display_ticket_list) {
-	// Filters
-	$search_fk_status = GETPOST("search_fk_status", 'alpha');
-	$search_subject = GETPOST("search_subject", 'alpha');
-	$search_type = GETPOST("search_type", 'alpha');
-	$search_category = GETPOST("search_category", 'alpha');
-	$search_severity = GETPOST("search_severity", 'alpha');
-	$search_fk_user_create = GETPOST("search_fk_user_create", 'int');
-	$search_fk_user_assign = GETPOST("search_fk_user_assign", 'int');
-
-	// Store current page url
-	$url_page_current = dol_buildpath('/public/ticket/list.php', 1);
-
-	// Do we click on purge search criteria ?
-	if (GETPOST("button_removefilter_x")) {
-		$search_fk_status = '';
-		$search_subject = '';
-		$search_type = '';
-		$search_category = '';
-		$search_severity = '';
-		$search_fk_user_create = '';
-		$search_fk_user_assign = '';
+// Show logo (search order: logo defined by ONLINE_SIGN_LOGO_suffix, then ONLINE_SIGN_LOGO_, then small company logo, large company logo, theme logo, common logo)
+// Define logo and logosmall
+$logosmall = $mysoc->logo_small;
+$logo = $mysoc->logo;
+$paramlogo = 'ONLINE_RECRUITMENT_LOGO_'.$suffix;
+if (!empty($conf->global->$paramlogo)) {
+	$logosmall = $conf->global->$paramlogo;
+} elseif (!empty($conf->global->ONLINE_RECRUITMENT_LOGO)) {
+	$logosmall = $conf->global->ONLINE_RECRUITMENT_LOGO_;
+}
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo = '';
+$urllogofull = '';
+if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
+}
+// Output html code for logo
+if ($urllogo) {
+	print '<div class="backgreypublicpayment">';
+	print '<div class="logopublicpayment">';
+	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
+	print '>';
+	print '</div>';
+	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
+	print '</div>';
+}
 
-	// fetch optionals attributes and labels
-	$extrafields = new ExtraFields($db);
-	$extrafields->fetch_name_optionals_label($object->table_element);
-
-	$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
-
-	$filter = array();
-	$param = 'action=viewlist';
-
-	// Definition of fields for list
-	$arrayfields = array(
-		't.datec' => array('label' => $langs->trans("Date"), 'checked' => 1),
-		't.date_read' => array('label' => $langs->trans("TicketReadOn"), 'checked' => 0),
-		't.date_close' => array('label' => $langs->trans("TicketCloseOn"), 'checked' => 0),
-		't.ref' => array('label' => $langs->trans("Ref"), 'checked' => 1),
-		//'t.track_id' => array('label' => $langs->trans("IDTracking"), 'checked' => 0),
-		't.fk_statut' => array('label' => $langs->trans("Status"), 'checked' => 1),
-		't.subject' => array('label' => $langs->trans("Subject"), 'checked' => 1),
-		'type.code' => array('label' => $langs->trans("Type"), 'checked' => 1),
-		'category.code' => array('label' => $langs->trans("Category"), 'checked' => 1),
-		'severity.code' => array('label' => $langs->trans("Severity"), 'checked' => 1),
-		't.progress' => array('label' => $langs->trans("Progression"), 'checked' => 0),
-		//'t.fk_contract' => array('label' => $langs->trans("Contract"), 'checked' => 0),
-		't.fk_user_create' => array('label' => $langs->trans("Author"), 'checked' => 1),
-		't.fk_user_assign' => array('label' => $langs->trans("AssignedTo"), 'checked' => 0),
-
-		//'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
-		//'t.datec' => array('label' => $langs->trans("DateCreation"), 'checked' => 0, 'position' => 500),
-		//'t.tms' => array('label' => $langs->trans("DateModificationShort"), 'checked' => 0, 'position' => 2)
-	//'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-	);
-
-	// Extra fields
-	if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
-		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-			if ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate') {
-				$arrayfields["ef.".$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'checked' => ($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1, 'position' => $extrafields->attributes[$object->table_element]['pos'][$key], 'enabled' =>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3) && $extrafields->attributes[$object->table_element]['perms'][$key]);
-			}
-		}
-	}
-	if (!empty($search_subject)) {
-		$filter['t.subject'] = $search_subject;
-		$param .= '&search_subject='.urlencode($search_subject);
-	}
-	if (!empty($search_type)) {
-		$filter['t.type_code'] = $search_type;
-		$param .= '&search_type='.urlencode($search_type);
-	}
-	if (!empty($search_category)) {
-		$filter['t.category_code'] = $search_category;
-		$param .= '&search_category='.urlencode($search_category);
-	}
-	if (!empty($search_severity)) {
-		$filter['t.severity_code'] = $search_severity;
-		$param .= '&search_severity='.urlencode($search_severity);
-	}
-	if (!empty($search_fk_user_assign)) {
-		// -1 value = all so no filter
-		if ($search_fk_user_assign > 0) {
-			$filter['t.fk_user_assign'] = $search_fk_user_assign;
-			$param .= '&search_fk_user_assign='.urlencode($search_fk_user_assign);
-		}
-	}
-	if (!empty($search_fk_user_create)) {
-		// -1 value = all so no filter
-		if ($search_fk_user_create > 0) {
-			$filter['t.fk_user_create'] = $search_fk_user_create;
-			$param .= '&search_fk_user_create='.urlencode($search_fk_user_create);
-		}
-	}
-	if ((isset($search_fk_status) && $search_fk_status != '') && $search_fk_status != '-1' && $search_fk_status != 'non_closed') {
-		$filter['t.fk_statut'] = $search_fk_status;
-		$param .= '&search_fk_status='.urlencode($search_fk_status);
-	}
-	if (isset($search_fk_status) && $search_fk_status == 'non_closed') {
-		$filter['t.fk_statut'] = array(0, 1, 3, 4, 5, 6);
-		$param .= '&search_fk_status=non_closed';
-	}
-
-	require DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-	$sortfield = GETPOST("sortfield", 'alpha');
-	$sortorder = GETPOST("sortorder", 'alpha');
-
-	if (!$sortfield) {
-		$sortfield = 't.datec';
-	}
-	if (!$sortorder) {
-		$sortorder = 'DESC';
-	}
-
-	$limit = $conf->liste_limit;
-
-	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-	if (empty($page) || $page == -1) {
-		$page = 0;
-	}     // If $page is not defined, or '' or -1
-	$offset = $limit * $page;
-	$pageprev = $page - 1;
-	$pagenext = $page + 1;
-
-	// Request SQL
-	$sql = "SELECT DISTINCT";
-	$sql .= " t.rowid,";
-	$sql .= " t.ref,";
-	$sql .= " t.track_id,";
-	$sql .= " t.fk_soc,";
-	$sql .= " t.fk_project,";
-	$sql .= " t.origin_email,";
-	$sql .= " t.fk_user_create, uc.lastname as user_create_lastname, uc.firstname as user_create_firstname,";
-	$sql .= " t.fk_user_assign, ua.lastname as user_assign_lastname, ua.firstname as user_assign_firstname,";
-	$sql .= " t.subject,";
-	$sql .= " t.message,";
-	$sql .= " t.fk_statut,";
-	$sql .= " t.resolution,";
-	$sql .= " t.progress,";
-	$sql .= " t.timing,";
-	$sql .= " t.type_code,";
-	$sql .= " t.category_code,";
-	$sql .= " t.severity_code,";
-	$sql .= " t.datec,";
-	$sql .= " t.date_read,";
-	$sql .= " t.date_close,";
-	$sql .= " t.tms,";
-	$sql .= " type.label as type_label, category.label as category_label, severity.label as severity_label";
-	// Add fields for extrafields
-	if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
-		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-			$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
-		}
-	}
-	$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as t";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as uc ON uc.rowid=t.fk_user_create";
-	if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition_extrafields as ef on (t.rowid = ef.fk_object)";
-	}
-	$sql .= " WHERE t.entity IN (".getEntity('recruitmentjobposition').")";
-	// Manage filter
-	if (!empty($filter)) {
-		foreach ($filter as $key => $value) {
-			if (strpos($key, 'date')) { // To allow $filter['YEAR(s.dated)']=>$year
-				$sql .= ' AND '.$key.' = \''.$db->escape($value).'\'';
-			} elseif ($key == 't.fk_statut') {
-				if (is_array($value) && count($value) > 0) {
-					$sql .= 'AND '.$key.' IN ('.$db->sanitize(implode(',', $value)).')';
-				} else {
-					$sql .= ' AND '.$key.' = '.((int) $value);
-				}
-			} else {
-				$sql .= ' AND '.$key.' LIKE \'%'.$db->escape($value).'%\'';
-			}
-		}
-	}
-	$sql .= " ORDER BY ".$sortfield.' '.$sortorder;
-
-	$resql = $db->query($sql);
-	if ($resql) {
-		$num_total = $db->num_rows($resql);
-		if (!empty($limit)) {
-			$sql .= ' '.$db->plimit($limit + 1, $offset);
-		}
-
-		$resql = $db->query($sql);
-		if ($resql) {
-			$num = $db->num_rows($resql);
-			print_barre_liste($langs->trans('JobList'), $page, 'public/recruitment/list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticket');
-
-			// Search bar
-			print '<form method="get" action="'.$url_form.'" id="searchFormList" >'."\n";
-			print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-			print '<input type="hidden" name="action" value="viewlist">';
-			print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-			print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
-			$varpage = empty($contextpage) ? $url_page_current : $contextpage;
-			$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-
-			print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
-
-			// Filter bar
-			print '<tr class="liste_titre">';
-
-			if (!empty($arrayfields['t.datec']['checked'])) {
-				print '<td class="liste_titre"></td>';
-			}
-
-			if (!empty($arrayfields['t.ref']['checked'])) {
-				print '<td class="liste_titre"></td>';
-			}
-
-			if (!empty($arrayfields['t.fk_user_create']['checked'])) {
-				print '<td class="liste_titre"></td>';
-			}
-
-			if (!empty($arrayfields['t.tms']['checked'])) {
-				print '<td class="liste_titre"></td>';
-			}
-
-			// Extra fields
-			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
-
-			// Fields from hook
-			$parameters = array('arrayfields'=>$arrayfields);
-			$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
-			print $hookmanager->resPrint;
-
-			// Status
-			if (!empty($arrayfields['t.fk_statut']['checked'])) {
-				print '<td class="liste_titre">';
-				$selected = ($search_fk_status != "non_closed" ? $search_fk_status : '');
-				//$object->printSelectStatus($selected);
-				print '</td>';
-			}
-
-			// Action column
-			print '<td class="liste_titre maxwidthsearch">';
-			$searchpicto = $form->showFilterButtons();
-			print $searchpicto;
-			print '</td>';
-			print '</tr>';
-
-			// Field title
-			print '<tr class="liste_titre">';
-			if (!empty($arrayfields['t.datec']['checked'])) {
-				print_liste_field_titre($arrayfields['t.datec']['label'], $url_page_current, 't.datec', '', $param, '', $sortfield, $sortorder);
-			}
-			if (!empty($arrayfields['t.ref']['checked'])) {
-				print_liste_field_titre($arrayfields['t.ref']['label'], $url_page_current, 't.ref', '', $param, '', $sortfield, $sortorder);
-			}
-			if (!empty($arrayfields['t.fk_user_create']['checked'])) {
-				print_liste_field_titre($arrayfields['t.fk_user_create']['label'], $url_page_current, 't.fk_user_create', '', $param, '', $sortfield, $sortorder);
-			}
-			if (!empty($arrayfields['t.tms']['checked'])) {
-				print_liste_field_titre($arrayfields['t.tms']['label'], $url_page_current, 't.tms', '', $param, '', $sortfield, $sortorder);
-			}
-
-			// Extra fields
-			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
-
-			// Hook fields
-			$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-			$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
-			print $hookmanager->resPrint;
-
-			if (!empty($arrayfields['t.fk_statut']['checked'])) {
-				print_liste_field_titre($arrayfields['t.fk_statut']['label'], $url_page_current, 't.fk_statut', '', $param, '', $sortfield, $sortorder);
-			}
-			print_liste_field_titre($selectedfields, $url_page_current, "", '', '', 'align="right"', $sortfield, $sortorder, 'center maxwidthsearch ');
-			print '</tr>';
-
-			while ($obj = $db->fetch_object($resql)) {
-				print '<tr class="oddeven">';
-
-				// Date ticket
-				if (!empty($arrayfields['t.datec']['checked'])) {
-					print '<td>';
-					print dol_print_date($db->jdate($obj->datec), 'dayhour');
-					print '</td>';
-				}
-
-				// Ref
-				if (!empty($arrayfields['t.ref']['checked'])) {
-					print '<td class="nowraponall">';
-					print $obj->ref;
-					print '</td>';
-				}
-
-				// Message author
-				if (!empty($arrayfields['t.fk_user_create']['checked'])) {
-					print '<td>';
-					if ($obj->fk_user_create > 0) {
-						$user_create->firstname = (!empty($obj->user_create_firstname) ? $obj->user_create_firstname : '');
-						$user_create->name = (!empty($obj->user_create_lastname) ? $obj->user_create_lastname : '');
-						$user_create->id = (!empty($obj->fk_user_create) ? $obj->fk_user_create : '');
-						print $user_create->getFullName($langs);
-					} else {
-						print $langs->trans('Email');
-					}
-					print '</td>';
-				}
-
-				if (!empty($arrayfields['t.tms']['checked'])) {
-					print '<td>'.dol_print_date($db->jdate($obj->tms), 'dayhour').'</td>';
-				}
-
-				// Extra fields
-				if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
-					foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-						if (!empty($arrayfields["ef.".$key]['checked'])) {
-							print '<td';
-							$align = $extrafields->getAlignFlag($key);
-							if ($align) {
-								print ' align="'.$align.'"';
-							}
-							print '>';
-							$tmpkey = 'options_'.$key;
-							print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
-							print '</td>';
-						}
-					}
-				}
-
-				// Statut
-				if (!empty($arrayfields['t.fk_statut']['checked'])) {
-					print '<td class="nowraponall">';
-					$object->fk_statut = $obj->fk_statut;
-					print $object->getLibStatut(2);
-					print '</td>';
-				}
-
-				print '<td></td>';
-
-				$i++;
-				print '</tr>';
-			}
-
-			print '</table>';
-			print '</form>';
-
-			print '<form method="post" id="form_view" name="form_view" enctype="multipart/form-data" action="'.dol_buildpath('/public/recruitment/view.php', 1).'" style="display:none;">';
-			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<input type="hidden" name="action" value="view">';
-			print '<input type="hidden" name="btn_view_list" value="1">';
-			print '<input type="hidden" name="track_id" value="">';
-			print '<input type="hidden" name="email" value="">';
-			print "</form>";
-			print '<script type="text/javascript">
-                    function viewticket(ticket_id, email) {
-                        var form = $("#form_view");
-                        form.submit();
-                    }
-                </script>';
-		}
-	}
-} else {
-	print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?ref='.$object->ref.'">'.$langs->trans('Back').'</a></div>';
+if (!empty($conf->global->RECRUITMENT_IMAGE_PUBLIC_INTERFACE)) {
+	print '<div class="backimagepublicrecruitment">';
+	print '<img id="idPROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH" src="'.$conf->global->RECRUITMENT_IMAGE_PUBLIC_INTERFACE.'">';
+	print '</div>';
 }
 
 
-print "</div>";
+// TODO List of jobs
+print '<br>';
+print $langs->trans("FeatureNotYetAvailable");
 
-// End of page
-htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix, $object);
+
+print '</form>'."\n";
+print '</div>'."\n";
+print '<br>';
+
+
+htmlPrintOnlinePaymentFooter($mysoc, $langs);
 
 llxFooter('', 'public');
 
diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index cd275d250c4..d105632abe8 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -192,8 +192,6 @@ print '<input type="hidden" name="entity" value="'.$entity.'" />';
 print "\n";
 print '<!-- Form to view job -->'."\n";
 
-print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
-
 // Show logo (search order: logo defined by ONLINE_SIGN_LOGO_suffix, then ONLINE_SIGN_LOGO_, then small company logo, large company logo, theme logo, common logo)
 // Define logo and logosmall
 $logosmall = $mysoc->logo_small;
@@ -234,6 +232,9 @@ if (!empty($conf->global->RECRUITMENT_IMAGE_PUBLIC_INTERFACE)) {
 	print '</div>';
 }
 
+
+print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+
 // Output introduction text
 $text = '';
 if (!empty($conf->global->RECRUITMENT_NEWFORM_TEXT)) {
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index f44bc0b1c99..6674ce9c6de 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -83,6 +83,21 @@ if (empty($endpoint_secret)) {
 	exit();
 }
 
+if (!empty($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS)) {
+	// We set the user to use for all ipn actions in Dolibarr
+	$user = new User($db);
+	$user->fetch($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS);
+	$user->getrights();
+} else {
+	print 'Error: Setup of module Stripe not complete for mode '.$service.'. The STRIPE_USER_ACCOUNT_FOR_ACTIONS is not defined.';
+	http_response_code(400); // PHP 5.4 or greater
+	exit();
+}
+
+
+// TODO Add a check on a security key
+
+
 
 /*
  * Actions
@@ -110,10 +125,6 @@ try {
 
 $langs->load("main");
 
-// TODO Do we really need a user in setup just to have a name to fill an email topic when it is a technical system notification email
-$user = new User($db);
-$user->fetch($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS);
-$user->getrights();
 
 if (!empty($conf->multicompany->enabled) && !empty($conf->stripeconnect->enabled) && is_object($mc)) {
 	$sql = "SELECT entity";
@@ -276,11 +287,11 @@ if ($event->type == 'payout.created') {
 
 		$ret = $mailfile->sendfile();
 
-		http_response_code(200); // PHP 5.4 or greater
+		http_response_code(200);
 		return 1;
 	} else {
 		$error++;
-		http_response_code(500); // PHP 5.4 or greater
+		http_response_code(500);
 		return -1;
 	}
 } elseif ($event->type == 'customer.source.created') {
@@ -385,4 +396,4 @@ if ($event->type == 'payout.created') {
 	// This event is deprecated.
 }
 
-http_response_code(200); // PHP 5.4 or greater
+http_response_code(200);
diff --git a/htdocs/public/test/buttons.php b/htdocs/public/test/buttons.php
new file mode 100644
index 00000000000..4621ad0f340
--- /dev/null
+++ b/htdocs/public/test/buttons.php
@@ -0,0 +1,201 @@
+<?php
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1); // File must be accessed by logon page so without login
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOSESSION')) {
+	define('NOSESSION', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+session_cache_limiter('public');
+
+require_once '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
+
+// Security
+if ($dolibarr_main_prod) {
+	accessforbidden();
+}
+
+
+/*
+ * View
+ */
+
+llxHeader('', 'Documentation and examples for theme');
+?>
+<main  role="main"  >
+	<h1 class="bd-title" id="content">Button for action</h1>
+	<p class="bd-lead">Documentation and examples for buttons.</p>
+
+	<h2 id="example01">Example of simple usage</h2>
+
+	<p>Buttons for user allowed to click.</p>
+
+	<div class="bd-example">
+	<?php
+		$n = 1;
+		$label = 'My action label used for accessibility visually for impaired people';
+		$html = '<span class="fa fa-clone" ></span> My default action';
+		$actionType = 'default';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = '#'.$id;
+		$userRight = 1;
+		$params = array();
+
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
+
+
+		$html = '<span class="fa fa-clone" ></span> My delete action';
+		$actionType = 'delete';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
+
+
+		$html = '<span class="fa fa-clone" ></span> My danger action';
+		$actionType = 'danger';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
+
+	?>
+	</div>
+
+	<p>Buttons for user <strong>NOT</strong> allowed to click.</p>
+
+	<div class="bd-example">
+	<?php
+		$label = 'My action label used for accessibility visually for impaired people';
+		$html = '<span class="fa fa-clone" ></span> My default action';
+		$actionType = 'default';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = '#'.$id;
+		$userRight = 0;
+
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
+
+
+		$html = '<span class="fa fa-clone" ></span> My delete action';
+		$actionType = 'delete';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
+
+
+		$html = '<span class="fa fa-clone" ></span> My danger action';
+		$actionType = 'danger';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
+
+	?>
+	</div>
+
+
+	<h2 id="example01">Example of confirm dialog</h2>
+
+	<p>Buttons for user allowed to click.</p>
+
+	<div class="bd-example">
+		<?php
+		$label = 'My action label used for accessibility visually for impaired people';
+		$html = '<span class="fa fa-clone" ></span> My default action';
+		$actionType = 'default';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = '#'.$id;
+		$userRight = 1;
+		$params = array(
+			'confirm' => true
+		);
+
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight, $params);
+
+
+		$html = '<span class="fa fa-clone" ></span> My delete action';
+		$actionType = 'delete';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
+
+		$params = array(
+			'confirm' => array(
+				'url' => 'your confirm action url',
+				'title' => 'Your title to display',
+				'action-btn-label' => 'Your confirm label',
+				'cancel-btn-label' => 'Your cancel label',
+				'content' => 'Content to display  with <strong>HTML</strong> compatible <ul><li>test 01</li><li>test 02</li><li>test 03</li></ul>'
+			)
+		);
+
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight, $params);
+
+		?>
+	</div>
+
+	<p>Buttons for user <strong>NOT</strong> allowed to click.</p>
+
+	<div class="bd-example">
+		<?php
+		$label = 'My action label used for accessibility visually for impaired people';
+		$html = '<span class="fa fa-clone" ></span> My default action';
+		$actionType = 'default';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = '#'.$id;
+		$userRight = 0;
+		$params = array(
+			'confirm' => true
+		);
+
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight, $params);
+
+
+		$html = '<span class="fa fa-clone" ></span> My delete action';
+		$actionType = 'delete';
+		$n++;
+		$id = 'mybuttonid'.$n;
+		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
+
+		$params = array(
+			'confirm' => array(
+				'url' => 'your confirm action url',
+				'title' => 'Your title to display',
+				'action-btn-label' => 'Your confirm label',
+				'cancel-btn-label' => 'Your cancel label',
+				'content' => 'Content to display  with <strong>HTML</strong> compatible <ul><li>test 01</li><li>test 02</li><li>test 03</li></ul>'
+			)
+		);
+
+		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight, $params);
+
+		?>
+	</div>
+
+
+</main>
+
+<?php llxFooter();
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 8de80603ea4..01910f71aaf 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -22,19 +22,22 @@ if (!defined("NOLOGIN")) {
 	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 }
 
-
 require '../../main.inc.php';
 
+// Security
 if ($dolibarr_main_prod) {
 	accessforbidden('Access forbidden when $dolibarr_main_prod is set to 1');
 }
 
-$usedolheader = 1; // 1 = Test inside a dolibarr page, 0 = Use hard coded header
+
+
+/*
+ * View
+ */
 
 $form = new Form($db);
 
-
-
+$usedolheader = 1; // 1 = Test inside a dolibarr page, 0 = Use hard coded header
 
 // HEADER
 //--------
@@ -150,7 +153,7 @@ This page is a sample of page using tables. It is designed to make test with<br>
 <br><hr><br>Example 1 : Standard table/thead/tbody/tr/th-td (no class pair/impair on td) => Use this if you need the drag and drop for lines or for long result tables<br>
 
 
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 /*jQuery(document).ready(function() {
 $(document).ready(function() {
 	var table = $('#tablelines3').DataTable( {
@@ -183,7 +186,7 @@ if (!empty($conf->use_javascript_ajax)) {
 }
 
 $nav = '';
-$nav .= '<form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
+$nav .= '<form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?mode=show_peruser'.$param.'">';
 if ($actioncode || GETPOSTISSET('actioncode')) {
 	$nav .= '<input type="hidden" name="actioncode" value="'.$actioncode.'">';
 }
diff --git a/htdocs/public/test/test_csrf.php b/htdocs/public/test/test_csrf.php
index 1c23dc7070a..3127a765985 100644
--- a/htdocs/public/test/test_csrf.php
+++ b/htdocs/public/test/test_csrf.php
@@ -1,11 +1,44 @@
 <?php
+//define("NOLOGIN",1);		// This means this output page does not require to be logged.
+//if (!defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
+//if (!defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+//if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOSTYLECHECK')) {
+	define('NOSTYLECHECK', '1'); // Do not check style html tag into posted data
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Do not check anti POST attack test
+}
+//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)
+}
 
+require '../../main.inc.php';
+
+// Security
+if ($dolibarr_main_prod) {
+	accessforbidden();
+}
+
+
+/*
+ * View
+ */
 
 ?>
 
 This is a form to test if a CSRF exists into a Dolibarr page.<br>
 <br>
-- Change url to send request to into this file (server B, hard coded page)<br>
+- Change url to send request to into this file (URL to a hard coded page on a server B)<br>
 - Open this form into a virtual server A.<br>
 - Send the request to the virtual server B by clicking submit.<br>
 - Check that Anticsrf protection is triggered.<br>
@@ -16,9 +49,24 @@ This is a form to test if a CSRF exists into a Dolibarr page.<br>
 	print 'urltosendrequest = '.$urltosendrequest.'<br><br>';
 ?>
 
+Test post
 <form method="POST" action="<?php echo $urltosendrequest; ?>" target="_blank">
 <!-- <input type="hidden" name="token" value="123456789"> -->
 <input type="text" name="action" value="add">
 <input type="text" name="nom" value="New group test">
 <input type="submit" name="submit" value="Submit">
-</form>
\ No newline at end of file
+</form>
+
+
+Test logout
+<html>
+  <body>
+  <script>history.pushState('', '', '/')</script>
+	<form action="http://localhostgit/dolibarr_dev/htdocs/user/logout.php">
+	  <input type="submit" value="Submit request" />
+	</form>
+	<script>
+	  document.forms[0].submit();
+	</script>
+  </body>
+</html>
diff --git a/htdocs/public/test/test_exec.php b/htdocs/public/test/test_exec.php
index 732bfefa824..94a1d96462b 100644
--- a/htdocs/public/test/test_exec.php
+++ b/htdocs/public/test/test_exec.php
@@ -41,14 +41,16 @@ 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)';
-print '<br>';
+print 'session_status='.session_status().' (before main.inc.php)<br>';
+
+print '<br><br>'."\n";
 
 require '../../main.inc.php';
 
@@ -62,7 +64,8 @@ if ($dolibarr_main_prod) {
  * View
  */
 
-echo "Test<br>\n";
+print "*** TEST READ OF /tmp/test.txt FILE<br>\n";
+
 $out='';
 $ret=0;
 
@@ -78,12 +81,19 @@ if ($f) {
 
 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_r($out);
+print '<br>';
 
 print '<br><br>'."\n";
 
+
+print "*** TRY TO RUN CLAMDSCAN<br>\n";
+
 $ret = 0;
 $out = null;
 exec('/usr/bin/clamdscan --fdpass filethatdoesnotexists.php', $out, $ret);
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index 2a6f595275a..47d827cbaf5 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -8,10 +8,16 @@ if (!defined('NOSESSION')) {
 require '../../main.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
+// Security
 if ($dolibarr_main_prod) {
 	accessforbidden('Access forbidden when $dolibarr_main_prod is set to 1');
 }
 
+
+/*
+ * View
+ */
+
 llxHeader();
 
 ?>
diff --git a/htdocs/public/test/test_sessionlock.php b/htdocs/public/test/test_sessionlock.php
index 18a1ef73d08..8464ba2eb4f 100644
--- a/htdocs/public/test/test_sessionlock.php
+++ b/htdocs/public/test/test_sessionlock.php
@@ -52,11 +52,15 @@ print '<br>';
 
 require '../../main.inc.php';
 
-/* No need for this.
+// Security
 if ($dolibarr_main_prod) {
 	accessforbidden();
 }
-*/
+
+
+/*
+ * View
+ */
 
 print 'session_status='.session_status().' (after main.inc.php)';
 print '<br>';
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index b911e7480d3..6a3fd1aa688 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -4,7 +4,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -47,6 +47,12 @@ if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }
 
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) {
+	define("DOLENTITY", $entity);
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
@@ -75,6 +81,10 @@ $extrafields = new ExtraFields($db);
 
 $extrafields->fetch_name_optionals_label($object->table_element);
 
+if (empty($conf->ticket->enabled)) {
+	accessforbidden('', 0, 0, 1);
+}
+
 
 /*
  * Actions
@@ -89,7 +99,7 @@ if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 // Add file in email form
-if (empty($reshook) && GETPOST('addfile', 'alpha') && !GETPOST('add', 'alpha')) {
+if (empty($reshook) && GETPOST('addfile', 'alpha') && !GETPOST('save', 'alpha')) {
 	////$res = $object->fetch('','',GETPOST('track_id'));
 	////if($res > 0)
 	////{
@@ -108,7 +118,7 @@ if (empty($reshook) && GETPOST('addfile', 'alpha') && !GETPOST('add', 'alpha'))
 }
 
 // Remove file
-if (empty($reshook) && GETPOST('removedfile', 'alpha') && !GETPOST('add', 'alpha')) {
+if (empty($reshook) && GETPOST('removedfile', 'alpha') && !GETPOST('save', 'alpha')) {
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 	// Set tmp directory
@@ -120,7 +130,7 @@ if (empty($reshook) && GETPOST('removedfile', 'alpha') && !GETPOST('add', 'alpha
 	$action = 'create_ticket';
 }
 
-if (empty($reshook) && $action == 'create_ticket' && GETPOST('add', 'alpha')) {
+if (empty($reshook) && $action == 'create_ticket' && GETPOST('save', 'alpha')) {
 	$error = 0;
 	$origin_email = GETPOST('email', 'alpha');
 	if (empty($origin_email)) {
@@ -163,7 +173,7 @@ if (empty($reshook) && $action == 'create_ticket' && GETPOST('add', 'alpha')) {
 	// Check Captcha code if is enabled
 	if (!empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) {
 		$sessionkey = 'dol_antispam_value';
-		$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'none'))));
+		$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'restricthtml'))));
 		if (!$ok) {
 			$error++;
 			array_push($object->errors, $langs->trans("ErrorBadValueForCode"));
@@ -293,7 +303,7 @@ if (empty($reshook) && $action == 'create_ticket' && GETPOST('add', 'alpha')) {
 					if (is_array($object->array_options) && count($object->array_options) > 0) {
 						foreach ($object->array_options as $key => $value) {
 							$key = substr($key, 8); // remove "options_"
-							$message_admin .= '<li>'.$langs->trans($extrafields->attributes[$object->element]['label'][$key]).' : '.$extrafields->showOutputField($key, $value).'</li>';
+							$message_admin .= '<li>'.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' : '.$extrafields->showOutputField($key, $value, '', $object->table_element).'</li>';
 						}
 					}
 					$message_admin .= '</ul>';
@@ -338,7 +348,7 @@ if (empty($reshook) && $action == 'create_ticket' && GETPOST('add', 'alpha')) {
 			$messagetoshow = str_replace(array('{s1}', '{s2}'), array('<strong>'.$object->track_id.'</strong>', '<strong>'.$object->ref.'</strong>'), $messagetoshow);
 			setEventMessages($messagetoshow, null, 'warnings');
 			setEventMessages($langs->trans('PleaseRememberThisId'), null, 'warnings');
-			header("Location: index.php");
+			header("Location: index.php".(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:''));
 			exit;
 		}
 	} else {
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index 31ee838f6f5..227dcf3867b 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -40,7 +40,6 @@ 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.
 $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
@@ -61,6 +60,10 @@ $langs->loadLangs(array('companies', 'other', 'ticket', 'errors'));
 $track_id = GETPOST('track_id', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
+if (empty($conf->ticket->enabled)) {
+	accessforbidden('', 0, 0, 1);
+}
+
 
 /*
  * View
@@ -73,7 +76,6 @@ if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	print $langs->trans('TicketPublicInterfaceForbidden');
 	exit;
 }
-
 $arrayofjs = array();
 $arrayofcss = array('/ticket/css/styles.css.php');
 
@@ -82,9 +84,9 @@ llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 print '<div class="ticketpublicarea">';
 print '<p style="text-align: center">'.($conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans("TicketPublicDesc")).'</p>';
 print '<div class="ticketform">';
-print '<a href="create_ticket.php" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_create bigrounded"><span class="fa fa-15x fa-plus-circle valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("CreateTicket")).'</div></a>';
-print '<a href="list.php" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded"><span class="fa fa-15x fa-list-alt valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("ViewMyTicketList")).'</div></a>';
-print '<a href="view.php" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded">'.img_picto('', 'ticket', 'class="fa-15x"').'<br>'.dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")).'</div></a>';
+print '<a href="create_ticket.php'.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_create bigrounded"><span class="fa fa-15x fa-plus-circle valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("CreateTicket")).'</div></a>';
+print '<a href="list.php'.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded"><span class="fa fa-15x fa-list-alt valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("ViewMyTicketList")).'</div></a>';
+print '<a href="view.php'.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded">'.img_picto('', 'ticket', 'class="fa-15x"').'<br>'.dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")).'</div></a>';
 print '<div style="clear:both;"></div>';
 print '</div>';
 print '</div>';
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 3c5dfffba17..1a3c0c3babd 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -40,6 +40,13 @@ if (!defined('NOBROWSERNOTIF')) {
 }
 // If this page is public (can be called outside logged session)
 
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) {
+	define("DOLENTITY", $entity);
+}
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php';
@@ -70,6 +77,12 @@ if (isset($_SESSION['email_customer'])) {
 
 $object = new Ticket($db);
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('ticketpubliclist', 'globalcard'));
+
+if (empty($conf->ticket->enabled)) {
+	accessforbidden('', 0, 0, 1);
+}
 
 
 
@@ -151,10 +164,6 @@ if ($action == "view_ticketlist") {
 	}
 }
 
-//$object->doActions($action);
-
-
-
 /*
  * View
  */
@@ -212,6 +221,9 @@ if ($action == "view_ticketlist") {
 
 		$filter = array();
 		$param = 'action=view_ticketlist';
+		if (!empty($entity) && !empty($conf->multicompany->enabled)) {
+			$param .= '&entity='.$entity;
+		}
 
 		// Definition of fields for list
 		$arrayfields = array(
@@ -285,8 +297,8 @@ if ($action == "view_ticketlist") {
 
 		require DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-		$sortfield = GETPOST("sortfield", 'alpha');
-		$sortorder = GETPOST("sortorder", 'alpha');
+		$sortfield = GETPOST('sortfield', 'aZ09comma');
+		$sortorder = GETPOST('sortorder', 'aZ09comma');
 
 		if (!$sortfield) {
 			$sortfield = 't.datec';
@@ -332,7 +344,7 @@ if ($action == "view_ticketlist") {
 		// Add fields for extrafields
 		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-				$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+				$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 			}
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
@@ -359,28 +371,28 @@ if ($action == "view_ticketlist") {
 		if (!empty($filter)) {
 			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) { // To allow $filter['YEAR(s.dated)']=>$year
-					$sql .= ' AND '.$key.' = \''.$db->escape($value).'\'';
+					$sql .= " AND ".$key." = '".$db->escape($value)."'";
 				} elseif (($key == 't.fk_user_assign') || ($key == 't.type_code') || ($key == 't.category_code') || ($key == 't.severity_code')) {
 					$sql .= " AND ".$key." = '".$db->escape($value)."'";
 				} elseif ($key == 't.fk_statut') {
 					if (is_array($value) && count($value) > 0) {
-						$sql .= 'AND '.$key.' IN ('.$db->sanitize(implode(',', $value)).')';
+						$sql .= " AND ".$key." IN (".$db->sanitize(implode(',', $value)).")";
 					} else {
-						$sql .= ' AND '.$key.' = '.((int) $value);
+						$sql .= " AND ".$key." = ".((int) $value);
 					}
 				} else {
-					$sql .= ' AND '.$key.' LIKE \'%'.$db->escape($value).'%\'';
+					$sql .= " AND ".$key." LIKE '%".$db->escape($value)."%'";
 				}
 			}
 		}
 		//$sql .= " GROUP BY t.track_id";
-		$sql .= " ORDER BY ".$sortfield.' '.$sortorder;
+		$sql .= $db->order($sortfield, $sortorder);
 
 		$resql = $db->query($sql);
 		if ($resql) {
 			$num_total = $db->num_rows($resql);
 			if (!empty($limit)) {
-				$sql .= ' '.$db->plimit($limit + 1, $offset);
+				$sql .= $db->plimit($limit + 1, $offset);
 			}
 
 			$resql = $db->query($sql);
@@ -389,7 +401,7 @@ if ($action == "view_ticketlist") {
 				print_barre_liste($langs->trans('TicketList'), $page, 'public/list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticket');
 
 				// Search bar
-				print '<form method="get" action="'.$url_form.'" id="searchFormList" >'."\n";
+				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" id="searchFormList" >'."\n";
 				print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 				print '<input type="hidden" name="action" value="view_ticketlist">';
 				print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
@@ -398,6 +410,11 @@ if ($action == "view_ticketlist") {
 				$varpage = empty($contextpage) ? $url_page_current : $contextpage;
 				$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
+				// allow to display information before list
+				$parameters=array('arrayfields'=>$arrayfields);
+				$reshook=$hookmanager->executeHooks('printFieldListHeader', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+				print $hookmanager->resPrint;
+
 				print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
 
 				// Filter bar
@@ -648,7 +665,7 @@ if ($action == "view_ticketlist") {
 								}
 								print '>';
 								$tmpkey = 'options_'.$key;
-								print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
+								print $extrafields->showOutputField($key, $obj->$tmpkey, '', $object->table_element);
 								print '</td>';
 							}
 						}
@@ -671,7 +688,7 @@ if ($action == "view_ticketlist") {
 				print '</table>';
 				print '</form>';
 
-				print '<form method="post" id="form_view_ticket" name="form_view_ticket" enctype="multipart/form-data" action="'.dol_buildpath('/public/ticket/view.php', 1).'" style="display:none;">';
+				print '<form method="post" id="form_view_ticket" name="form_view_ticket" action="'.dol_buildpath('/public/ticket/view.php', 1).(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" style="display:none;">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="action" value="view_ticket">';
 				print '<input type="hidden" name="btn_view_ticket_list" value="1">';
@@ -696,7 +713,7 @@ if ($action == "view_ticketlist") {
 	print '<br>';
 
 	print '<div id="form_view_ticket">';
-	print '<form method="post" name="form_view_ticketlist"  enctype="multipart/form-data" action="'.$_SERVER['PHP_SELF'].'">';
+	print '<form method="post" name="form_view_ticketlist" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="view_ticketlist">';
 	//print '<input type="hidden" name="search_fk_status" value="non_closed">';
@@ -710,7 +727,7 @@ if ($action == "view_ticketlist") {
 	print '</p>';
 
 	print '<p style="text-align: center; margin-top: 1.5em;">';
-	print '<input class="button" type="submit" name="btn_view_ticket_list" value="'.$langs->trans('ViewMyTicketList').'" />';
+	print '<input type="submit" class="button" name="btn_view_ticket_list" value="'.$langs->trans('ViewMyTicketList').'" />';
 	print "</p>\n";
 
 	print "</form>\n";
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index 6485f9fcee2..29a850128ed 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -41,6 +41,13 @@ if (!defined('NOBROWSERNOTIF')) {
 }
 // If this page is public (can be called outside logged session)
 
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) {
+	define("DOLENTITY", $entity);
+}
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php';
@@ -68,6 +75,10 @@ if (isset($_SESSION['email_customer'])) {
 
 $object = new ActionsTicket($db);
 
+if (empty($conf->ticket->enabled)) {
+	accessforbidden('', 0, 0, 1);
+}
+
 
 /*
  * Actions
@@ -159,7 +170,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		if ($object->dao->close($user)) {
 			setEventMessages($langs->trans('TicketMarkedAsClosed'), null, 'mesgs');
 
-			$url = 'view.php?action=view_ticket&track_id='.GETPOST('track_id', 'alpha');
+			$url = 'view.php?action=view_ticket&track_id='.GETPOST('track_id', 'alpha').(!empty($entity) && !empty($conf->multicompany->enabled)?'&entity='.$entity:'');
 			header("Location: ".$url);
 			exit;
 		} else {
@@ -173,8 +184,6 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		$ret = $object->dao->newMessage($user, $action, 0, 1);
 
 
-
-
 		if (!$error) {
 			$action = 'view_ticket';
 		}
@@ -225,7 +234,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 	if ($display_ticket) {
 		// Confirmation close
 		if ($action == 'close') {
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?track_id=".$track_id, $langs->trans("CloseATicket"), $langs->trans("ConfirmCloseAticket"), "confirm_public_close", '', '', 1);
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?track_id=".$track_id.(!empty($entity) && !empty($conf->multicompany->enabled)?'&entity='.$entity:''), $langs->trans("CloseATicket"), $langs->trans("ConfirmCloseAticket"), "confirm_public_close", '', '', 1);
 		}
 
 		print '<div id="form_view_ticket" class="margintoponly">';
@@ -337,7 +346,8 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 			$formticket->track_id = $object->dao->track_id;
 			$formticket->id = $object->dao->id;
 
-			$formticket->param = array('track_id' => $object->dao->track_id, 'fk_user_create' => '-1', 'returnurl' => DOL_URL_ROOT.'/public/ticket/view.php');
+			$formticket->param = array('track_id' => $object->dao->track_id, 'fk_user_create' => '-1',
+									   'returnurl' => DOL_URL_ROOT.'/public/ticket/view.php'.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:''));
 
 			$formticket->withfile = 2;
 			$formticket->withcancel = 1;
@@ -346,7 +356,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		}
 
 		if ($action != 'presend') {
-			print '<form method="post" id="form_view_ticket_list" name="form_view_ticket_list" enctype="multipart/form-data" action="'.DOL_URL_ROOT.'/public/ticket/list.php">';
+			print '<form method="post" id="form_view_ticket_list" name="form_view_ticket_list" action="'.DOL_URL_ROOT.'/public/ticket/list.php'.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="view_ticketlist">';
 			print '<input type="hidden" name="track_id" value="'.$object->dao->track_id.'">';
@@ -361,11 +371,11 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 
 			if ($object->dao->fk_statut < Ticket::STATUS_CLOSED) {
 				// New message
-				print '<div class="inline-block divButAction"><a  class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=presend&mode=init&track_id='.$object->dao->track_id.'">'.$langs->trans('AddMessage').'</a></div>';
+				print '<div class="inline-block divButAction"><a  class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=presend&mode=init&track_id='.$object->dao->track_id.(!empty($entity) && !empty($conf->multicompany->enabled)?'&entity='.$entity:'').'">'.$langs->trans('AddMessage').'</a></div>';
 
 				// Close ticket
 				if ($object->dao->fk_statut >= Ticket::STATUS_NOT_READ && $object->dao->fk_statut < Ticket::STATUS_CLOSED) {
-					print '<div class="inline-block divButAction"><a  class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=close&track_id='.$object->dao->track_id.'">'.$langs->trans('CloseTicket').'</a></div>';
+					print '<div class="inline-block divButAction"><a  class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=close&track_id='.$object->dao->track_id.(!empty($entity) && !empty($conf->multicompany->enabled)?'&entity='.$entity:'').'">'.$langs->trans('CloseTicket').'</a></div>';
 				}
 			}
 
@@ -376,13 +386,13 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'conversation');
 		$object->viewTicketMessages(false, true, $object->dao);
 	} else {
-		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.'" rel="nofollow noopener">'.$langs->trans('Back').'</a></div>';
+		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" rel="nofollow noopener">'.$langs->trans('Back').'</a></div>';
 	}
 } else {
 	print '<div class="center opacitymedium margintoponly marginbottomonly">'.$langs->trans("TicketPublicMsgViewLogIn").'</div>';
 
 	print '<div id="form_view_ticket">';
-	print '<form method="post" name="form_view_ticket"  enctype="multipart/form-data" action="'.$_SERVER['PHP_SELF'].'">';
+	print '<form method="post" name="form_view_ticket" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="view_ticket">';
 
@@ -395,7 +405,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 	print '</p>';
 
 	print '<p style="text-align: center; margin-top: 1.5em;">';
-	print '<input class="button" type="submit" name="btn_view_ticket" value="'.$langs->trans('ViewTicket').'" />';
+	print '<input type="submit" class="button" name="btn_view_ticket" value="'.$langs->trans('ViewTicket').'" />';
 	print "</p>\n";
 
 	print "</form>\n";
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index e5f5fccffad..2d7c46e0c85 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -85,6 +85,7 @@ if (empty($origin_id)) {
 }
 $ref = GETPOST('ref', 'alpha');
 $line_id = GETPOST('lineid', 'int') ?GETPOST('lineid', 'int') : '';
+$facid = GETPOST('facid', 'int');
 
 $action	= GETPOST('action', 'alpha');
 //Select mail models is same action as presend
@@ -112,9 +113,6 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('receptioncard', 'globalcard'));
 
-$permissiondellink = $user->rights->reception->creer; // Used by the include of actions_dellink.inc.php
-//var_dump($object->lines[0]->detail_batch);
-
 $date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
 
 if ($id > 0 || !empty($ref)) {
@@ -142,9 +140,10 @@ if ($user->socid) {
 	$socid = $user->socid;
 }
 
-if ($origin == 'reception') {
+if (!empty($conf->reception->enabled) || $origin == 'reception' || empty($origin)) {
 	$result = restrictedArea($user, 'reception', $id);
 } else {
+	// We do not use the reception module, so we test permission on the supplier orders
 	if ($origin == 'supplierorder' || $origin == 'order_supplier') {
 		$result = restrictedArea($user, 'fournisseur', $origin_id, 'commande_fournisseur', 'commande');
 	} elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) {
@@ -152,6 +151,20 @@ if ($origin == 'reception') {
 	}
 }
 
+if (!empty($conf->reception->enabled)) {
+	$permissiontoread = $user->rights->reception->lire;
+	$permissiontoadd = $user->rights->reception->creer;
+	$permissiondellink = $user->rights->reception->creer; // Used by the include of actions_dellink.inc.php
+	$permissiontovalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)));
+	$permissiontodelete = $user->rights->reception->supprimer;
+} else {
+	$permissiontoread = $user->rights->fournisseur->commande->receptionner;
+	$permissiontoadd = $user->rights->fournisseur->commande->receptionner;
+	$permissiondellink = $user->rights->fournisseur->commande->receptionner; // Used by the include of actions_dellink.inc.php
+	$permissiontovalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande_advance->check)));
+	$permissiontodelete = $user->rights->fournisseur->commande->receptionner;
+}
+
 
 /*
  * Actions
@@ -171,12 +184,12 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
 
 	// Reopen
-	if ($action == 'reopen' && $user->rights->reception->creer) {
+	if ($action == 'reopen' && $permissiontoadd) {
 		$result = $object->reOpen();
 	}
 
 	// Confirm back to draft status
-	if ($action == 'modif' && $user->rights->reception->creer) {
+	if ($action == 'modif' && $permissiontoadd) {
 		$result = $object->setDraft($user);
 		if ($result >= 0) {
 			// Define output language
@@ -201,11 +214,11 @@ if (empty($reshook)) {
 	}
 
 	// Set incoterm
-	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled)) {
+	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled) && $permissiontoadd) {
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 	}
 
-	if ($action == 'setref_supplier') {
+	if ($action == 'setref_supplier' && $permissiontoadd) {
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -220,7 +233,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'update_extras') {
+	if ($action == 'update_extras' && $permissiontoadd) {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
@@ -244,7 +257,7 @@ if (empty($reshook)) {
 	}
 
 	// Create reception
-	if ($action == 'add' && $user->rights->reception->creer) {
+	if ($action == 'add' && $permissiontoadd) {
 		$error = 0;
 		$predef = '';
 
@@ -340,6 +353,7 @@ if (empty($reshook)) {
 				$eatby = "dlc".$i;
 				$sellby = "dluo".$i;
 				$batch = "batch".$i;
+				$cost_price = "cost_price".$i;
 
 				if (GETPOST($qty, 'int') > 0 || (GETPOST($qty, 'int') == 0 && $conf->global->RECEPTION_GETS_ALL_ORDER_PRODUCTS)) {
 					$ent = "entl".$i;
@@ -364,8 +378,11 @@ if (empty($reshook)) {
 					$sellby = GETPOST($sellby, 'alpha');
 					$eatbydate = str_replace('/', '-', $eatby);
 					$sellbydate = str_replace('/', '-', $sellby);
-
-					$ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOST($qty, 'int'), $array_options[$i], GETPOST($comment, 'alpha'), strtotime($eatbydate), strtotime($sellbydate), GETPOST($batch, 'alpha'));
+					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 {
+						$ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOST($qty, 'int'), $array_options[$i], GETPOST($comment, 'alpha'), strtotime($eatbydate), strtotime($sellbydate), GETPOST($batch, 'alpha'));
+					}
 					if ($ret < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
@@ -401,10 +418,7 @@ if (empty($reshook)) {
 			$_GET["commande_id"] = GETPOST('commande_id', 'int');
 			$action = 'create';
 		}
-	} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
-		((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
-		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
-	) {
+	} elseif ($action == 'confirm_valid' && $confirm == 'yes' && $permissiontovalidate) {
 		$object->fetch_thirdparty();
 
 		$result = $object->valid($user);
@@ -436,7 +450,7 @@ if (empty($reshook)) {
 				}
 			}
 		}
-	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->reception->supprimer) {
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $permissiontodelete) {
 		$result = $object->delete($user);
 		if ($result > 0) {
 			header("Location: ".DOL_URL_ROOT.'/reception/index.php');
@@ -451,7 +465,7 @@ if (empty($reshook)) {
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 		}*/
-	} elseif ($action == 'setdate_livraison' && $user->rights->reception->creer) {
+	} 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'));
 
@@ -502,7 +516,7 @@ if (empty($reshook)) {
 		}
 
 		$action = "";
-	} elseif ($action == 'builddoc') {
+	} elseif ($action == 'builddoc' && $permissiontoread) {
 		// Build document
 		// En get ou en post
 		// Save last template used to generate document
@@ -528,7 +542,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
-	} elseif ($action == 'remove_file') {
+	} elseif ($action == 'remove_file' && $permissiontoadd) {
 		// Delete file in doc form
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -546,13 +560,13 @@ if (empty($reshook)) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
 		}
-	} elseif ($action == 'classifyclosed') {
+	} elseif ($action == 'classifyclosed' && $permissiontoread) {
 		$result = $object->setClosed();
 		if ($result >= 0) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
 		}
-	} elseif ($action == 'deleteline' && !empty($line_id)) {
+	} elseif ($action == 'deleteline' && !empty($line_id) && $permissiontoread) {
 		// delete a line
 		$lines = $object->lines;
 		$line = new CommandeFournisseurDispatch($db);
@@ -575,7 +589,7 @@ if (empty($reshook)) {
 		} else {
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
-	} elseif ($action == 'updateline' && $user->rights->reception->creer && GETPOST('save')) {
+	} elseif ($action == 'updateline' && GETPOST('save') && $permissiontoadd) {
 		// Update a line
 		// Clean parameters
 		$qty = 0;
@@ -662,11 +676,11 @@ if (empty($reshook)) {
 				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		} else {
-			header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
+			header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // To reshow the record we edit
 			exit();
 		}
-	} elseif ($action == 'updateline' && $user->rights->reception->creer && GETPOST('cancel', 'alpha') == $langs->trans("Cancel")) {
-		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
+	} elseif ($action == 'updateline' && $permissiontoadd && GETPOST('cancel', 'alpha') == $langs->trans("Cancel")) {
+		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // To reshow the record we edit
 		exit();
 	}
 
@@ -978,7 +992,7 @@ if ($action == 'create') {
 				$dispatchLines[$n]['array_options'] = $extrafields->getOptionalsFromPost('commande_fournisseur_dispatch', '_' . $suffix, '');
 			}
 
-			print '<script type="text/javascript" language="javascript">
+			print '<script type="text/javascript">
             jQuery(document).ready(function() {
 	            jQuery("#autofill").click(function() {';
 			$i = 1;
@@ -1011,6 +1025,9 @@ if ($action == 'create') {
 				print '<td class="center">'.$langs->trans("QtyOrdered").'</td>';
 				print '<td class="center">'.$langs->trans("QtyReceived").'</td>';
 				print '<td class="center">'.$langs->trans("QtyToReceive");
+				if (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION || $conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
+					print '<td>'.$langs->trans("ByingPrice").'</td>';
+				}
 				if (empty($conf->productbatch->enabled)) {
 					print ' <br>(<a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
 					print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
@@ -1155,6 +1172,7 @@ if ($action == 'create') {
 
 					$stock = + $product->stock_warehouse[$dispatchLines[$indiceAsked]['ent']]->real; // Convert to number
 					$deliverableQty = $dispatchLines[$indiceAsked]['qty'];
+					$cost_price = $dispatchLines[$indiceAsked]['pu'];
 
 					// Quantity to send
 					print '<td class="center">';
@@ -1169,6 +1187,12 @@ if ($action == 'create') {
 					}
 					print '</td>';
 
+					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 '</td>';
+					}
+
 					// Stock
 					if (!empty($conf->stock->enabled)) {
 						print '<td class="left">';
@@ -1243,11 +1267,7 @@ if ($action == 'create') {
 
 			print '<br>';
 
-			print '<div class="center">';
-			print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-			print '&nbsp; ';
-			print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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 $form->buttonsSaveCancel("Create");
 
 			print '</form>';
 
@@ -1365,7 +1385,7 @@ if ($action == 'create') {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if (0) {    // Do not change on reception
 				if ($action != 'classify') {
-					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+					$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);
@@ -1373,7 +1393,7 @@ if ($action == 'create') {
 					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
 					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
 					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-					$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '<input type="submit" class="button button-edit" 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);
@@ -1385,9 +1405,10 @@ if ($action == 'create') {
 				if (!empty($objectsrc->fk_project)) {
 					$proj = new Project($db);
 					$proj->fetch($objectsrc->fk_project);
-					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-					$morehtmlref .= $proj->ref;
-					$morehtmlref .= '</a>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
@@ -1442,7 +1463,7 @@ if ($action == 'create') {
 		print '</td>';
 
 		if ($action != 'editdate_livraison') {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td colspan="2">';
@@ -1451,7 +1472,7 @@ if ($action == 'create') {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate_livraison">';
 			print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
 			print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
@@ -1563,7 +1584,6 @@ if ($action == 'create') {
 
 		print '</div>';
 		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border centpercent tableforfield">';
@@ -1575,7 +1595,7 @@ if ($action == 'create') {
 		print '</td>';
 
 		if ($action != 'editshipping_method_id') {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetReceptionMethod'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetReceptionMethod'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td colspan="2">';
@@ -1588,7 +1608,7 @@ if ($action == 'create') {
 			if ($user->admin) {
 				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
 			if ($object->shipping_method_id > 0) {
@@ -1612,7 +1632,7 @@ if ($action == 'create') {
 			print $langs->trans('IncotermLabel');
 			print '<td><td class="right">';
 			if ($user->rights->reception->creer) {
-				print '<a class="editfielda" href="'.DOL_URL_ROOT.'/reception/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+				print '<a class="editfielda" href="'.DOL_URL_ROOT.'/reception/card.php?id='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
 			} else {
 				print '&nbsp;';
 			}
@@ -1629,7 +1649,6 @@ if ($action == 'create') {
 
 		print "</table>";
 
-		print '</div>';
 		print '</div>';
 		print '</div>';
 
@@ -1778,7 +1797,7 @@ if ($action == 'create') {
 
 		// Loop on each product to send/sent. Warning: $lines must be sorted by ->fk_commandefourndet (it is a regroupment key on output)
 		for ($i = 0; $i < $num_prod; $i++) {
-			print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
+			print '<!-- origin line id = '.(!empty($lines[$i]->origin_line_id) ? $lines[$i]->origin_line_id : 0).' -->'; // id of order line
 			print '<tr class="oddeven">';
 
 			// #
@@ -1803,7 +1822,7 @@ if ($action == 'create') {
 					$text .= ' - '.$label;
 					$description = (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($lines[$i]->product->description));
 					print $form->textwithtooltip($text, $description, 3, '', '', $i);
-					print_date_range($lines[$i]->date_start, $lines[$i]->date_end);
+					print_date_range(!empty($lines[$i]->date_start) ? $lines[$i]->date_start : 0, !empty($lines[$i]->date_end) ? $lines[$i]->date_end : 0);
 					if (!empty($conf->global->PRODUIT_DESC_IN_FORM)) {
 						print (!empty($lines[$i]->product->description) && $lines[$i]->description != $lines[$i]->product->description) ? '<br>'.dol_htmlentitiesbr($lines[$i]->description) : '';
 					}
@@ -1961,7 +1980,7 @@ if ($action == 'create') {
 
 			// Weight
 			print '<td class="center">';
-			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
+			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 {
 				print '&nbsp;';
@@ -1970,7 +1989,7 @@ if ($action == 'create') {
 
 			// Volume
 			print '<td class="center">';
-			if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
+			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 {
 				print '&nbsp;';
@@ -1985,10 +2004,10 @@ if ($action == 'create') {
 			} elseif ($object->statut == Reception::STATUS_DRAFT) {
 				// edit-delete buttons
 				print '<td class="linecoledit center">';
-				print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;token='.newToken().'&amp;lineid='.$lines[$i]->id.'">'.img_edit().'</a>';
+				print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_edit().'</a>';
 				print '</td>';
 				print '<td class="linecoldelete" width="10">';
-				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deleteline&amp;token='.newToken().'&amp;lineid='.$lines[$i]->id.'">'.img_delete().'</a>';
+				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_delete().'</a>';
 				print '</td>';
 
 				// Display lines extrafields
@@ -2004,7 +2023,7 @@ if ($action == 'create') {
 
 			// Display lines extrafields
 			$extralabelslines = $extrafields->attributes[$lines[$i]->table_element];
-			if (is_array($extralabelslines) && count($extralabelslines) > 0) {
+			if (!empty($extralabelslines) && is_array($extralabelslines) && count($extralabelslines) > 0) {
 				$colspan = empty($conf->productbatch->enabled) ? 8 : 9;
 				$line = new CommandeFournisseurDispatch($db);
 				$line->id = $lines[$i]->id;
@@ -2058,9 +2077,9 @@ if ($action == 'create') {
 			// 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 ?
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
+					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.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
 				}
 			}
 
@@ -2094,12 +2113,12 @@ if ($action == 'create') {
 						$label = "ClassifyBilled";
 						$paramaction = 'classifybilled';
 					}
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$paramaction.'">'.$langs->trans($label).'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action='.$paramaction.'&token='.newToken().'">'.$langs->trans($label).'</a>';
 				}
 			}
 
 			if ($user->rights->reception->supprimer) {
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>';
 			}
 		}
 
@@ -2128,7 +2147,9 @@ if ($action == 'create') {
 		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
 		$somethingshown = $form->showLinkedObjectBlock($object, '');
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
+
+		print '</div></div>';
 	}
 
 	// Presend form
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 5fb8e3b8af0..382cc5be9b6 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -263,22 +263,22 @@ class Reception extends CommonObject
 		$sql .= ", fk_incoterms, location_incoterms";
 		$sql .= ") VALUES (";
 		$sql .= "'(PROV)'";
-		$sql .= ", ".$conf->entity;
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ", ".($this->ref_supplier ? "'".$this->db->escape($this->ref_supplier)."'" : "null");
 		$sql .= ", '".$this->db->idate($now)."'";
-		$sql .= ", ".$user->id;
+		$sql .= ", ".((int) $user->id);
 		$sql .= ", ".($this->date_reception > 0 ? "'".$this->db->idate($this->date_reception)."'" : "null");
 		$sql .= ", ".($this->date_delivery > 0 ? "'".$this->db->idate($this->date_delivery)."'" : "null");
-		$sql .= ", ".$this->socid;
-		$sql .= ", ".$this->fk_project;
-		$sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : "null");
+		$sql .= ", ".((int) $this->socid);
+		$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 .= ", ".$this->weight;
-		$sql .= ", ".$this->sizeS; // TODO Should use this->trueDepth
-		$sql .= ", ".$this->sizeW; // TODO Should use this->trueWidth
-		$sql .= ", ".$this->sizeH; // TODO Should use this->trueHeight
-		$sql .= ", ".$this->weight_units;
-		$sql .= ", ".$this->size_units;
+		$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 .= ", ".(!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");
@@ -295,7 +295,7 @@ class Reception extends CommonObject
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."reception";
 			$sql .= " SET ref = '(PROV".$this->id.")'";
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			if ($this->db->query($sql)) {
@@ -550,7 +550,7 @@ class Reception extends CommonObject
 		$sql .= ", fk_statut = 1";
 		$sql .= ", date_valid = '".$this->db->idate($now)."'";
 		$sql .= ", fk_user_valid = ".$user->id;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 		dol_syslog(get_class($this)."::valid update reception", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
@@ -568,7 +568,8 @@ class Reception extends CommonObject
 			// TODO in future, reception lines may not be linked to order line
 			$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);
@@ -597,7 +598,11 @@ 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("ReceptionValidatedInDolibarr", $numref), '', '', '', '', 0, $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) {
 							$error++;
 							$this->errors[] = $mouvS->error;
@@ -610,7 +615,11 @@ 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 = '';
-						$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 (!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) {
 							$error++;
 							$this->errors[] = $mouvS->error;
@@ -649,7 +658,7 @@ class Reception extends CommonObject
 			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 = 'reception/".$this->db->escape($this->newref)."'";
-				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'reception/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'reception/".$this->db->escape($this->ref)."' AND entity = ".((int) $conf->entity);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$error++; $this->error = $this->db->lasterror();
@@ -713,9 +722,10 @@ class Reception extends CommonObject
 	 * @param	integer		$eatby					eat-by date
 	 * @param	integer		$sellby					sell-by date
 	 * @param	string		$batch					Lot number
+	 * @param	double		$cost_price			Line cost
 	 * @return	int							<0 if KO, index of line if OK
 	 */
-	public function addline($entrepot_id, $id, $qty, $array_options = 0, $comment = '', $eatby = '', $sellby = '', $batch = '')
+	public function addline($entrepot_id, $id, $qty, $array_options = 0, $comment = '', $eatby = '', $sellby = '', $batch = '', $cost_price = 0)
 	{
 		global $conf, $langs, $user;
 
@@ -755,8 +765,8 @@ class Reception extends CommonObject
 		$line->eatby = $eatby;
 		$line->sellby = $sellby;
 		$line->status = 1;
+		$line->cost_price = $cost_price;
 		$line->fk_reception = $this->id;
-
 		$this->lines[$num] = $line;
 
 		return $num;
@@ -859,9 +869,8 @@ class Reception extends CommonObject
 		$sql .= " weight=".(($this->trueWeight != '') ? $this->trueWeight : "null").",";
 		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
 		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
-		$sql .= " model_pdf=".(isset($this->modelpdf) ? "'".$this->db->escape($this->modelpdf)."'" : "null").",";
-		$sql .= " entity=".$conf->entity;
-
+		$sql .= " model_pdf=".(isset($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null").",";
+		$sql .= " entity = ".((int) $conf->entity);
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$this->db->begin();
@@ -947,9 +956,10 @@ class Reception extends CommonObject
 		}
 
 		if (!$error) {
-					$main = MAIN_DB_PREFIX.'commande_fournisseur_dispatch';
-					$ef = $main."_extrafields";
-					$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_reception = ".((int) $this->id).")";
+			$main = MAIN_DB_PREFIX.'commande_fournisseur_dispatch';
+			$ef = $main."_extrafields";
+
+			$sqlef = "DELETE FROM ".$ef." WHERE fk_object IN (SELECT rowid FROM ".$main." WHERE fk_reception = ".((int) $this->id).")";
 
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch";
 			$sql .= " WHERE fk_reception = ".((int) $this->id);
@@ -963,7 +973,7 @@ class Reception extends CommonObject
 
 				if (!$error) {
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."reception";
-					$sql .= " WHERE rowid = ".$this->id;
+					$sql .= " WHERE rowid = ".((int) $this->id);
 
 					if ($this->db->query($sql)) {
 						// Call trigger
@@ -1043,7 +1053,8 @@ class Reception extends CommonObject
 	{
 		// phpcs:enable
 		dol_include_once('/fourn/class/fournisseur.commande.dispatch.class.php');
-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch WHERE fk_reception='.$this->id;
+
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch WHERE fk_reception = ".((int) $this->id);
 		$resql = $this->db->query($sql);
 
 		if (!empty($resql)) {
@@ -1108,7 +1119,7 @@ class Reception extends CommonObject
 		$result = '';
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Reception").'</u>';
 		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.($this->ref_supplier ? $this->ref_supplier : $this->ref_client);
+		$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.($this->ref_supplier ? $this->ref_supplier : '');
 
 		$url = DOL_URL_ROOT.'/reception/card.php?id='.$this->id;
 
@@ -1164,8 +1175,8 @@ class Reception extends CommonObject
 		// phpcs:enable
 		global $langs;
 
-		$labelStatus = $langs->trans($this->statuts[$status]);
-		$labelStatusShort = $langs->trans($this->statutshorts[$status]);
+		$labelStatus = $langs->transnoentitiesnoconv($this->statuts[$status]);
+		$labelStatusShort = $langs->transnoentitiesnoconv($this->statutshorts[$status]);
 
 		$statusType = 'status'.$status;
 		if ($status == self::STATUS_VALIDATED) {
@@ -1269,7 +1280,7 @@ class Reception extends CommonObject
 		if ($user->rights->reception->creer) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."reception";
 			$sql .= " SET date_delivery = ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : 'null');
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::setDeliveryDate", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -1388,7 +1399,7 @@ class Reception extends CommonObject
 	{
 		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
-		$sql .= ' WHERE rowid='.$id;
+		$sql .= " WHERE rowid = ".((int) $id);
 
 		$resql = $this->db->query($sql);
 	}
@@ -1405,7 +1416,7 @@ class Reception extends CommonObject
 	{
 		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
-		$sql .= ' WHERE rowid='.$id;
+		$sql .= " WHERE rowid = ".((int) $id);
 
 		$resql = $this->db->query($sql);
 	}
@@ -1434,7 +1445,7 @@ class Reception extends CommonObject
 
 		if (!empty($tracking) && !empty($value)) {
 			$url = str_replace('{TRACKID}', $value, $tracking);
-			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
+			$this->tracking_url = sprintf('<a target="_blank" rel="noopener noreferrer" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
 		} else {
 			$this->tracking_url = $value;
 		}
@@ -1454,7 +1465,7 @@ class Reception extends CommonObject
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'reception SET fk_statut='.self::STATUS_CLOSED;
-		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
+		$sql .= " WHERE rowid = ".((int) $this->id).' AND fk_statut > 0';
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -1601,7 +1612,7 @@ class Reception extends CommonObject
 		$this->setClosed();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'reception SET  billed=1';
-		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
+		$sql .= " WHERE rowid = ".((int) $this->id).' AND fk_statut > 0';
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -1641,7 +1652,7 @@ class Reception extends CommonObject
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'reception SET fk_statut=1, billed=0';
-		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
+		$sql .= " WHERE rowid = ".((int) $this->id).' AND fk_statut > 0';
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -1774,7 +1785,7 @@ class Reception extends CommonObject
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."reception";
 		$sql .= " SET fk_statut = ".self::STATUS_DRAFT;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		if ($this->db->query($sql)) {
diff --git a/htdocs/reception/class/receptionstats.class.php b/htdocs/reception/class/receptionstats.class.php
index 4055d5d5dfe..872d6845a96 100644
--- a/htdocs/reception/class/receptionstats.class.php
+++ b/htdocs/reception/class/receptionstats.class.php
@@ -70,7 +70,7 @@ class ReceptionStats extends Stats
 
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
 		$this->where .= " AND c.entity = ".$conf->entity;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($this->socid) {
@@ -93,7 +93,7 @@ class ReceptionStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
@@ -117,7 +117,7 @@ class ReceptionStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE ".$this->where;
@@ -138,7 +138,7 @@ class ReceptionStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, SUM(c.".$this->field.") as total, AVG(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) {
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE ".$this->where;
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index 609cb0d12b7..a7cec515e29 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -152,7 +152,7 @@ if ($id > 0 || !empty($ref)) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if (0) {    // Do not change on reception
 			if ($action != 'classify') {
-				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				$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);
@@ -160,7 +160,7 @@ if ($id > 0 || !empty($ref)) {
 				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
 				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
 				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-				$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '<input type="submit" class="button button-edit" 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);
@@ -172,9 +172,10 @@ if ($id > 0 || !empty($ref)) {
 			if (!empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($objectsrc->fk_project);
-				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-				$morehtmlref .= $proj->ref;
-				$morehtmlref .= '</a>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
@@ -217,11 +218,9 @@ if ($id > 0 || !empty($ref)) {
 
 	//print '</div>';
 	//print '<div class="fichehalfright">';
-	//print '<div class="ficheaddleft">';
 	//print '<div class="underbanner clearboth"></div>';
 
 
-	//print '</div>';
 	//print '</div>';
 	print '</div>';
 
diff --git a/htdocs/reception/document.php b/htdocs/reception/document.php
new file mode 100644
index 00000000000..f592dba452a
--- /dev/null
+++ b/htdocs/reception/document.php
@@ -0,0 +1,194 @@
+<?php
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2016 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@inodbox.com>
+ * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2017      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/reception/document.php
+ *	\ingroup    reception
+ *	\brief      Management page of documents attached to an reception
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/order.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/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)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+}
+
+// Load translation files required by the page
+$langs->loadLangs(array('companies', 'other'));
+
+$action		= GETPOST('action', 'aZ09');
+$confirm	= GETPOST('confirm');
+$id			= GETPOST('id', 'int');
+$ref		= GETPOST('ref');
+
+// Get parameters
+$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 = "name";
+}
+
+$object = new Reception($db);
+
+if ($object->fetch($id, $ref)) {
+	$object->fetch_thirdparty();
+	$upload_dir = $conf->reception->dir_output."/".dol_sanitizeFileName($object->ref);
+}
+
+// Security check
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'reception', $object->id, '');
+
+$permissiontoadd = $user->rights->reception->creer;	// Used by the include of actions_dellink.inc.php
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+
+
+/*
+ * View
+ */
+
+llxHeader('', $langs->trans('Reception'), '');
+
+$form = new Form($db);
+
+if ($id > 0 || !empty($ref)) {
+	if ($object->fetch($id, $ref)) {
+		$object->fetch_thirdparty();
+
+		$upload_dir = $conf->reception->dir_output.'/'.dol_sanitizeFileName($object->ref);
+
+		$head = reception_prepare_head($object);
+		print dol_get_fiche_head($head, 'documents', $langs->trans("Shipment"), -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'];
+		}
+
+		// Shipment card
+		$linkback = '<a href="'.DOL_URL_ROOT.'/reception/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+
+		$morehtmlref = '<div class="refidno">';
+		// Thirdparty
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+
+		// Project
+		if (!empty($conf->projet->enabled)) {
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if (0) {    // Do not change on shipment
+				if ($action != 'classify') {
+					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&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 button-edit" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				// We don't have project on shipment, so we will use the project or source object instead
+				// TODO Add project on shipment
+				$morehtmlref .= ' : ';
+				if (!empty($objectsrc->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($objectsrc->fk_project);
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
+		$morehtmlref .= '</div>';
+
+		// Order card
+
+		$linkback = '<a href="'.DOL_URL_ROOT.'/reception/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+		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 = 'reception';
+		$permissiontoadd = $user->rights->reception->creer;
+		$permtoedit = $user->rights->reception->creer;
+		$param = '&id='.$object->id;
+		include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+	} else {
+		dol_print_error($db);
+	}
+} else {
+	header('Location: index.php');
+	exit;
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index 948489aa843..ed5f3a715d2 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -39,6 +39,7 @@ $langs->loadLangs(array("orders", "receptions"));
 $reception = new Reception($db);
 
 // Security check
+$socid = '';
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -86,7 +87,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."reception as e";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'reception'";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur as c ON el.fk_source = c.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
 	$sql .= $clause." sc.fk_user = ".((int) $user->id);
 	$clause = " AND ";
@@ -135,8 +136,7 @@ if ($resql) {
 }
 
 
-//print '</td><td valign="top" width="70%">';
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 $max = 5;
 
@@ -151,11 +151,11 @@ $sql .= " FROM ".MAIN_DB_PREFIX."reception as e";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'reception' AND el.sourcetype IN ('order_supplier')";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur as c ON el.fk_source = c.rowid AND el.sourcetype IN ('order_supplier') AND el.targettype = 'reception'";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
 }
 $sql .= " WHERE e.entity IN (".getEntity('reception').")";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " AND e.fk_statut = 1";
@@ -212,7 +212,7 @@ if ($resql) {
 $sql = "SELECT c.rowid, c.ref, c.ref_supplier as ref_supplier, c.fk_statut as status, c.billed as billed, s.nom as name, s.rowid as socid";
 $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE c.fk_soc = s.rowid";
@@ -221,7 +221,7 @@ $sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_ORDERSENT.", ".Comma
 if ($socid > 0) {
 	$sql .= " AND c.fk_soc = ".((int) $socid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " ORDER BY c.rowid ASC";
@@ -265,7 +265,7 @@ if ($resql) {
 	}
 }
 
-print '</div></div></div>';
+print '</div></div>';
 
 $parameters = array('user' => $user);
 $reshook = $hookmanager->executeHooks('dashboardWarehouseReceptions', $parameters, $object); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 8f07d1bede7..70775e112f6 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -471,7 +471,7 @@ $sql .= ' e.date_creation as date_creation, e.tms as date_update';
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$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
@@ -479,7 +479,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."reception as e";
-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 (e.rowid = ef.fk_object)";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
@@ -488,11 +488,17 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_ty
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'reception' AND ee.targettype = 'delivery'";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.rowid = ee.fk_target";
-if (!$user->rights->societe->client->voir && !$socid) {	// Internal user with no permission to see all
+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
+$sql .= $hookmanager->resPrint;
+
 $sql .= " WHERE e.entity IN (".getEntity('reception').")";
-if (!$user->rights->societe->client->voir && !$socid) {	// Internal user with no permission to see all
+if (empty($user->rights->societe->client->voir) && !$socid) {	// Internal user with no permission to see all
 	$sql .= " AND e.fk_soc = sc.fk_soc";
 	$sql .= " AND sc.fk_user = ".((int) $user->id);
 }
@@ -872,6 +878,7 @@ print "</tr>\n";
 
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index f343e56e14d..725c23ae738 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -67,6 +67,11 @@ $permissionnote = $user->rights->reception->creer; // Used by the include of act
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
+
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('receptionnote'));
+
 if ($origin == 'reception') {
 	$result = restrictedArea($user, $origin, $object->id);
 } else {
@@ -87,7 +92,13 @@ if ($origin == 'reception') {
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$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
+}
 
 
 /*
@@ -118,7 +129,7 @@ if ($id > 0 || !empty($ref)) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if (0) {    // Do not change on reception
 			if ($action != 'classify') {
-				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				$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);
@@ -126,7 +137,7 @@ if ($id > 0 || !empty($ref)) {
 				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
 				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
 				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-				$morehtmlref .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '<input type="submit" class="button button-edit" 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);
@@ -138,9 +149,10 @@ if ($id > 0 || !empty($ref)) {
 			if (!empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($objectsrc->fk_project);
-				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$objectsrc->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-				$morehtmlref .= $proj->ref;
-				$morehtmlref .= '</a>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index 61098e74322..638b7b0dbfc 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -59,7 +59,7 @@ llxHeader();
 
 print load_fiche_titre($langs->trans("StatisticsOfReceptions"), '', 'dollyrevert');
 
-
+$dir = (!empty($conf->reception->multidir_temp[$conf->entity]) ? $conf->reception->multidir_temp[$conf->entity] : $conf->service->multidir_temp[$conf->entity]);
 dol_mkdir($dir);
 
 $stats = new ReceptionStats($db, $socid, '', ($userid > 0 ? $userid : 0));
@@ -70,7 +70,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filenamenb = $dir.'/receptionsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
 	$filenamenb = $dir.'/receptionsnbinyear-'.$year.'.png';
@@ -78,6 +78,7 @@ if (!$user->rights->societe->client->voir || $user->socid) {
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
+$fileurlnb = '';
 if (!$mesg) {
 	$px1->SetData($data);
 	$i = $startyear; $legend = array();
@@ -105,7 +106,7 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear,$startyear);
 //var_dump($data);
 // $data = array(array('Lib',val1,val2,val3),...)
 
-if (!$user->rights->societe->client->voir || $user->socid)
+if (empty($user->rights->societe->client->voir) || $user->socid)
 {
 	$filenameamount = $dir.'/receptionsamountinyear-'.$user->id.'-'.$year.'.png';
 }
@@ -143,7 +144,7 @@ if (! $mesg)
 /*
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
-if (!$user->rights->societe->client->voir || $user->socid)
+if (empty($user->rights->societe->client->voir) || $user->socid)
 {
 	$filename_avg = $dir.'/receptionsaverage-'.$user->id.'-'.$year.'.png';
 }
@@ -233,7 +234,7 @@ if (!in_array($nowyear, $arrayyears)) {
 	$arrayyears[$nowyear] = $nowyear;
 }
 arsort($arrayyears);
-print $form->selectarray('year', $arrayyears, $year, 0);
+print $form->selectarray('year', $arrayyears, $year, 0, 0, 0, '', 0, 0, 0, '', 'width75');
 print '</td></tr>';
 print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
@@ -282,7 +283,7 @@ foreach ($data as $val) {
 print '</table>';
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 // Show graphs
@@ -299,7 +300,7 @@ if ($mesg) {
 print '</td></tr></table>';
 
 
-print '</div></div></div>';
+print '</div></div>';
 print '<div style="clear:both"></div>';
 
 print dol_get_fiche_end();
diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php
index 39a5a24347d..c8ff1196c0f 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 -->
+<!-- BEGIN PHP TEMPLATE reception/tpl/linkedopjectblock.tpl.php  -->
 
 <?php
 
@@ -56,8 +56,8 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		} ?>
 		</td>
 		<td class="linkedcol-name nowraponall" ><?php echo $objectlink->getNomUrl(1); ?></td>
-		<td class="linkedcol-ref center"></td>
-		<td class="linkedcol-date center"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>
+		<td class="linkedcol-ref"></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) {
 			$total = $total + $objectlink->total_ht;
@@ -69,7 +69,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		// For now, receptions must stay linked to order, so link is not deletable
 		if ($object->element != 'order_supplier') {
 			?>
-			<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a>
+			<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a>
 			<?php
 		}
 		?>
diff --git a/htdocs/recruitment/admin/public_interface.php b/htdocs/recruitment/admin/public_interface.php
index 7b2d72cb835..3d431d026bc 100644
--- a/htdocs/recruitment/admin/public_interface.php
+++ b/htdocs/recruitment/admin/public_interface.php
@@ -167,7 +167,7 @@ if (!empty($conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE)) {
 	print '</table>';
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 	print '</div>';
 }
 */
@@ -192,7 +192,7 @@ 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" href="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">'.$urlwithroot.'/public/members/new.php'.$entity_qr.'</a>';
+	print '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">'.$urlwithroot.'/public/members/new.php'.$entity_qr.'</a>';
 }
 */
 
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index 6da39445f7f..6091da86b09 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -68,6 +68,7 @@ if (!$user->admin) {
 // 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');
@@ -255,7 +256,7 @@ if ($action == 'edit') {
 		print '</table>';
 
 		print '<div class="tabsAction">';
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 		print '</div>';
 	}
 }
@@ -459,13 +460,13 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Active
 										if (in_array($name, $def)) {
 											print '<td class="center">'."\n";
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
+											print '<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&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+											print '<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>";
 										}
 
@@ -475,9 +476,9 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										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&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>';
+											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>';
 										} else {
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&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>';
 
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index 2bcddf58964..726e24e89b1 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -68,6 +68,7 @@ if (!$user->admin) {
 // 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');
@@ -252,7 +253,7 @@ if ($action == 'edit') {
 		print '</table>';
 
 		print '<div class="tabsAction">';
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 		print '</div>';
 	}
 }
@@ -457,13 +458,13 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Active
 										if (in_array($name, $def)) {
 											print '<td class="center">'."\n";
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
+											print '<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&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+											print '<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>";
 										}
 
@@ -473,9 +474,9 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										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&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>';
+											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>';
 										} else {
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&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>';
 
diff --git a/htdocs/recruitment/class/api_recruitment.class.php b/htdocs/recruitment/class/api_recruitment.class.php
new file mode 100644
index 00000000000..e0c2cb5da11
--- /dev/null
+++ b/htdocs/recruitment/class/api_recruitment.class.php
@@ -0,0 +1,647 @@
+<?php
+/* Copyright (C) 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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('/recruitment/class/recruitmentjobposition.class.php');
+dol_include_once('/recruitment/class/recruitmentcandidature.class.php');
+
+
+
+/**
+ * \file    recruitment/class/api_recruitment.class.php
+ * \ingroup recruitment
+ * \brief   File for API management of recruitment.
+ */
+
+/**
+ * API class for recruitment
+ *
+ * @access protected
+ * @class  DolibarrApiAccess {@requires user,external}
+ */
+class Recruitment extends DolibarrApi
+{
+	/**
+	 * @var jobposition $jobposition {@type jobposition}
+	 */
+	public $jobposition;
+	public $candidature;
+
+	/**
+	 * Constructor
+	 *
+	 * @url     GET /
+	 *
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->jobposition = new RecruitmentJobPosition($this->db);
+		$this->candidature = new RecruitmentCandidature($this->db);
+	}
+
+	/**
+	 * Get properties of a jobposition object
+	 *
+	 * Return an array with jobposition informations
+	 *
+	 * @param 	int 	$id ID of jobposition
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url	GET jobposition/{id}
+	 *
+	 * @throws RestException 401 Not allowed
+	 * @throws RestException 404 Not found
+	 */
+	public function getJobPosition($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->recruitment->recruitmentjobposition->read) {
+			throw new RestException(401);
+		}
+
+		$result = $this->jobposition->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'JobPosition not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('recruitment', $this->jobposition->id, 'recruitment_recruitmentjobposition')) {
+			throw new RestException(401, 'Access to instance id='.$this->jobposition->id.' of object not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		return $this->_cleanObjectDatas($this->jobposition);
+	}
+
+	/**
+	 * Get properties of a candidature object
+	 *
+	 * Return an array with candidature informations
+	 *
+	 * @param 	int 	$id ID of candidature
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url	GET candidature/{id}
+	 *
+	 * @throws RestException 401 Not allowed
+	 * @throws RestException 404 Not found
+	 */
+	public function getCandidature($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->recruitment->recruitmentjobposition->read) {
+			throw new RestException(401);
+		}
+
+		$result = $this->candidature->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Candidature not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('recruitment', $this->candidature->id, 'recruitment_recruitmentcandidature')) {
+			throw new RestException(401, 'Access to instance id='.$this->candidature->id.' of object not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		return $this->_cleanObjectDatas($this->candidature);
+	}
+
+
+	/**
+	 * List jobpositions
+	 *
+	 * Get a list of jobpositions
+	 *
+	 * @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 /jobposition/
+	 */
+	public function indexJobPosition($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
+
+		$obj_ret = array();
+		$tmpobject = new RecruitmentJobPosition($this->db);
+
+		if (!DolibarrApiAccess::$user->rights->recruitment->recruitmentjobposition->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 RecruitmentJobPosition($this->db);
+				if ($tmp_object->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($tmp_object);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving jobposition list: '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No jobposition found');
+		}
+		return $obj_ret;
+	}
+
+	/**
+	 * List candatures
+	 *
+	 * Get a list of candidatures
+	 *
+	 * @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 /candidature/
+	 */
+	public function indexCandidature($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
+
+		$obj_ret = array();
+		$tmpobject = new RecruitmentCandidature($this->db);
+
+		if (!DolibarrApiAccess::$user->rights->recruitment->recruitmentjobposition->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 RecruitmentCandidature($this->db);
+				if ($tmp_object->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($tmp_object);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving candidature list: '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No candidature found');
+		}
+		return $obj_ret;
+	}
+
+	/**
+	 * Create jobposition object
+	 *
+	 * @param array $request_data   Request datas
+	 * @return int  ID of jobposition
+	 *
+	 * @throws RestException
+	 *
+	 * @url	POST jobposition/
+	 */
+	public function postJobPosition($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->recruitment->recruitmentjobposition->write) {
+			throw new RestException(401);
+		}
+
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
+
+		foreach ($request_data as $field => $value) {
+			$this->jobposition->$field = $this->_checkValForAPI($field, $value, $this->jobposition);
+		}
+
+		// Clean data
+		// $this->jobposition->abc = checkVal($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));
+		}
+		return $this->jobposition->id;
+	}
+
+	/**
+	* Create candidature object
+	*
+	* @param array $request_data   Request datas
+	* @return int  ID of candidature
+	*
+	* @throws RestException
+	*
+	* @url	POST candidature/
+	*/
+	public function postCandidature($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->recruitment->recruitmentjobposition->write) {
+			throw new RestException(401);
+		}
+
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
+
+		foreach ($request_data as $field => $value) {
+			$this->jobposition->$field = $this->_checkValForAPI($field, $value, $this->jobposition);
+		}
+
+		// Clean data
+		// $this->jobposition->abc = checkVal($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));
+		}
+		return $this->candidature->id;
+	}
+
+	/**
+	 * Update jobposition
+	 *
+	 * @param int   $id             Id of jobposition to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 *
+	 * @throws RestException
+	 *
+	 * @url	PUT jobposition/{id}
+	 */
+	public function putJobPosition($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->recruitment->recruitmentjobposition->write) {
+			throw new RestException(401);
+		}
+
+		$result = $this->jobposition->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'jobposition not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('recruitment', $this->jobposition->id, 'recruitment_recruitmentjobposition')) {
+			throw new RestException(401, 'Access to instance id='.$this->jobposition->id.' of object not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') {
+				continue;
+			}
+			$this->jobposition->$field = $this->_checkValForAPI($field, $value, $this->jobposition);
+		}
+
+		// Clean data
+		// $this->jobposition->abc = checkVal($this->jobposition->abc, 'alphanohtml');
+
+		if ($this->jobposition->update(DolibarrApiAccess::$user, false) > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->jobposition->error);
+		}
+	}
+
+	/**
+	 * Update candidature
+	 *
+	 * @param int   $id             Id of candidature to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 *
+	 * @throws RestException
+	 *
+	 * @url	PUT candidature/{id}
+	 */
+	public function putCandidature($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->recruitment->recruitmentjobposition->write) {
+			throw new RestException(401);
+		}
+
+		$result = $this->candidature->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'candidature not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('recruitment', $this->candidature->id, 'recruitment_recruitmentcandidature')) {
+			throw new RestException(401, 'Access to instance id='.$this->candidature->id.' of object not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') {
+				continue;
+			}
+			$this->candidature->$field = $this->_checkValForAPI($field, $value, $this->candidature);
+		}
+
+		// Clean data
+		// $this->jobposition->abc = checkVal($this->jobposition->abc, 'alphanohtml');
+
+		if ($this->candidature->update(DolibarrApiAccess::$user, false) > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->candidature->error);
+		}
+	}
+
+
+	/**
+	 * Delete jobposition
+	 *
+	 * @param   int     $id   jobposition ID
+	 * @return  array
+	 *
+	 * @throws RestException
+	 *
+	 * @url	DELETE jobposition/{id}
+	 */
+	public function deleteJobPosition($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->recruitment->recruitmentjobposition->delete) {
+			throw new RestException(401);
+		}
+		$result = $this->jobposition->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'jobposition not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('recruitment', $this->jobposition->id, 'recruitment_recruitmentjobposition')) {
+			throw new RestException(401, 'Access to instance id='.$this->jobposition->id.' of object not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		if (!$this->jobposition->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when deleting jobposition : '.$this->jobposition->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'jobposition deleted'
+			)
+		);
+	}
+
+	/**
+	 * Delete candidature
+	 *
+	 * @param   int     $id   candidature ID
+	 * @return  array
+	 *
+	 * @throws RestException
+	 *
+	 * @url	DELETE candidature/{id}
+	 */
+	public function deleteCandidature($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->recruitment->recruitmentjobposition->delete) {
+			throw new RestException(401);
+		}
+		$result = $this->candidature->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'candidature not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('recruitment', $this->candidature->id, 'recruitment_recruitmentcandidature')) {
+			throw new RestException(401, 'Access to instance id='.$this->candidature->id.' of object not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		if (!$this->candidature->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when deleting candidature : '.$this->candidature->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'candidature 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)
+	{
+		$jobposition = array();
+		foreach ($this->jobposition->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");
+			}
+			$jobposition[$field] = $data[$field];
+		}
+		return $jobposition;
+	}
+}
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 985b207dd60..f05f1389e75 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -375,27 +375,27 @@ class RecruitmentCandidature extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$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)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -519,7 +519,7 @@ class RecruitmentCandidature extends CommonObject
 			if (!empty($this->fields['fk_user_valid'])) {
 				$sql .= ", fk_user_valid = ".$user->id;
 			}
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -798,20 +798,20 @@ class RecruitmentCandidature extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("recruitment@recruitment");
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Received').' ('.$langs->trans("InterviewToDo").')';
-			$this->labelStatus[self::STATUS_CONTRACT_PROPOSED] = $langs->trans('ContractProposed');
-			$this->labelStatus[self::STATUS_CONTRACT_SIGNED] = $langs->trans('ContractSigned');
-			$this->labelStatus[self::STATUS_CONTRACT_REFUSED] = $langs->trans('ContractRefused');
-			$this->labelStatus[self::STATUS_REFUSED] = $langs->trans('Refused');
-			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
-			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Received');
-			$this->labelStatusShort[self::STATUS_CONTRACT_PROPOSED] = $langs->trans('ContractProposed');
-			$this->labelStatusShort[self::STATUS_CONTRACT_SIGNED] = $langs->trans('ContractSigned');
-			$this->labelStatusShort[self::STATUS_CONTRACT_REFUSED] = $langs->trans('ContractRefused');
-			$this->labelStatusShort[self::STATUS_REFUSED] = $langs->trans('Refused');
-			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Received').' ('.$langs->transnoentitiesnoconv("InterviewToDo").')';
+			$this->labelStatus[self::STATUS_CONTRACT_PROPOSED] = $langs->transnoentitiesnoconv('ContractProposed');
+			$this->labelStatus[self::STATUS_CONTRACT_SIGNED] = $langs->transnoentitiesnoconv('ContractSigned');
+			$this->labelStatus[self::STATUS_CONTRACT_REFUSED] = $langs->transnoentitiesnoconv('ContractRefused');
+			$this->labelStatus[self::STATUS_REFUSED] = $langs->transnoentitiesnoconv('Refused');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Received');
+			$this->labelStatusShort[self::STATUS_CONTRACT_PROPOSED] = $langs->transnoentitiesnoconv('ContractProposed');
+			$this->labelStatusShort[self::STATUS_CONTRACT_SIGNED] = $langs->transnoentitiesnoconv('ContractSigned');
+			$this->labelStatusShort[self::STATUS_CONTRACT_REFUSED] = $langs->transnoentitiesnoconv('ContractRefused');
+			$this->labelStatusShort[self::STATUS_REFUSED] = $langs->transnoentitiesnoconv('Refused');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
 		}
 
 		$statusType = 'status'.$status;
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index a767900ec7e..3b52e5b4fa6 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -384,27 +384,27 @@ class RecruitmentJobPosition extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$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)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -528,7 +528,7 @@ class RecruitmentJobPosition extends CommonObject
 			if (!empty($this->fields['fk_user_valid'])) {
 				$sql .= ", fk_user_valid = ".$user->id;
 			}
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -672,7 +672,7 @@ class RecruitmentJobPosition extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " SET status = ".((int) $status).", note_private = '".$this->db->escape($newprivatenote)."'";
 		//$sql .= ", date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id;
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -899,14 +899,14 @@ class RecruitmentJobPosition extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("recruitment");
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated');
-			$this->labelStatus[self::STATUS_RECRUITED] = $langs->trans('Recruited');
-			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
-			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated');
-			$this->labelStatusShort[self::STATUS_RECRUITED] = $langs->trans('Recruited');
-			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
+			$this->labelStatus[self::STATUS_RECRUITED] = $langs->transnoentitiesnoconv('Recruited');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
+			$this->labelStatusShort[self::STATUS_RECRUITED] = $langs->transnoentitiesnoconv('Recruited');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
 		}
 
 		$statusType = 'status'.$status;
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 557b935e39b..e818a0816a9 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
@@ -122,9 +122,10 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 		$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="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON_PDF_ODT_PATH">';
-		$texte .= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<table class="nobordernopadding centpercent">';
 
 		// List of directories area
 		$texte .= '<tr><td>';
@@ -157,7 +158,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 		$texte .= $conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -173,7 +174,10 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 		if ($nbofiles) {
 			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
 			foreach ($listoffiles as $file) {
-				$texte .= $file['name'].'<br>';
+				$texte .= '- '.$file['name'];
+				//$texte .= ' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=recruitementjobposition/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				//$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
@@ -181,7 +185,9 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
-		$texte .= '<span class="opacitymedium">'.$langs->trans("ExampleOfDirectoriesForModelGen").'</span>';
+		$texte .= '<span class="opacitymedium">';
+		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</span>';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
index 192d1d4c526..ce96d1cd67b 100644
--- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
@@ -36,7 +36,7 @@ class mod_recruitmentcandidature_standard extends ModeleNumRefRecruitmentCandida
 	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
-	public $prefix = 'JOC';
+	public $prefix = 'JOA';
 
 	/**
 	 * @var string Error code (or message)
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
index 35f5616da68..fcc476abacf 100644
--- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
@@ -81,7 +81,7 @@ class mod_recruitmentjobposition_advanced extends ModeleNumRefRecruitmentJobPosi
 		$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="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 button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
diff --git a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
index a7bfe03aac4..3d3b59a9253 100644
--- a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
+++ b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
@@ -124,7 +124,7 @@ function getPublicJobPositionUrl($mode, $ref = '', $localorexternal = 0)
 		$urltouse = $urlwithroot;
 	}
 
-	$out = $urltouse.'/public/recruitment/view.php?ref='.($mode ? '<font color="#666666">' : '').$ref.($mode ? '</font>' : '');
+	$out = $urltouse.'/public/recruitment/view.php?ref='.($mode ? '<span style="color: #666666">' : '').$ref.($mode ? '</span>' : '');
 	/*if (!empty($conf->global->RECRUITMENT_SECURITY_TOKEN))
 	{
 		if (empty($conf->global->RECRUITMENT_SECURITY_TOKEN)) $out .= '&securekey='.urlencode($conf->global->RECRUITMENT_SECURITY_TOKEN);
diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
index 01ac72065ea..9cc259c21e1 100644
--- a/htdocs/recruitment/recruitmentcandidature_agenda.php
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -81,8 +81,8 @@ if (GETPOST('actioncode', 'array')) {
 $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');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -186,7 +186,7 @@ if ($object->id > 0) {
 		if ($permissiontoadd)
 		{
 			if ($action != 'classify')
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index 18ecc57512b..ac6fc37591a 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -266,6 +266,7 @@ if (empty($reshook)) {
 			$nuser->birth = $object->date_birth;
 			$nuser->salary = $object->remuneration_proposed;
 			$nuser->fk_user = $jobposition->fk_user_supervisor; // Supervisor
+			$nuser->email = $object->email;
 
 			$result = $nuser->create($user);
 
@@ -339,11 +340,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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 $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 
@@ -379,9 +376,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	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->buttonsSaveCancel();
 
 	print '</form>';
 }
@@ -489,7 +484,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
 	 if ($permissiontoadd)
 	 {
-	 //if ($action != 'classify') $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
+	 //if ($action != 'classify') $morehtmlref.='<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);
@@ -565,7 +560,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Modify
 			if ($permissiontoadd) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
+				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";
 			}
@@ -574,7 +569,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=confirm_validate&confirm=yes">'.$langs->trans("Validate").'</a>';
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&token='.newToken().'&confirm=yes">'.$langs->trans("Validate").'</a>';
 					} else {
 						$langs->load("errors");
 						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
@@ -612,7 +607,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
 					}
 				} else {
-					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin")."</font></div>";
+					print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin")."</span></div>";
 				}
 			}
 
@@ -627,7 +622,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
 			if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd)) {
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+				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";
 			}
@@ -663,20 +658,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		$MAXEVENT = 10;
 
-		$morehtmlright = '<a href="'.dol_buildpath('/recruitment/recruitmentcandidature_agenda.php', 1).'?id='.$object->id.'">';
-		$morehtmlright .= $langs->trans("SeeAll");
-		$morehtmlright .= '</a>';
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt 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';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, $object->element.'@recruitment', (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
+		$somethingshown = $formactions->showactions($object, $object->element.'@recruitment', (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 	//Select mail models is same action as presend
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
index 2e8c29cf2fe..792b413b5e4 100644
--- a/htdocs/recruitment/recruitmentcandidature_document.php
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -71,8 +71,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -167,7 +167,7 @@ if ($object->id) {
 		if ($permissiontoadd)
 		{
 			if ($action != 'classify')
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 30e147f355d..f16b8c3dcf9 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -288,7 +288,7 @@ $sql .= $hookmanager->resPrint;
 $sql.= " GROUP BY ";
 foreach ($object->fields as $key => $val)
 {
-	$sql.='t.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -336,7 +336,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
 if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
-	header("Location: ".dol_buildpath('/recruitment/recruitmentcandidature_card.php', 1).'?id='.$id);
+	header("Location: ".DOL_URL_ROOT.'/recruitment/recruitmentcandidature_card.php?id='.$id);
 	exit;
 }
 
@@ -569,7 +569,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
diff --git a/htdocs/recruitment/recruitmentcandidature_note.php b/htdocs/recruitment/recruitmentcandidature_note.php
index d4c18155c5d..ead2df3c973 100644
--- a/htdocs/recruitment/recruitmentcandidature_note.php
+++ b/htdocs/recruitment/recruitmentcandidature_note.php
@@ -94,7 +94,13 @@ $result = restrictedArea($user, 'recruitment', $object->id, 'recruitment_recruit
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$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
+}
 
 
 /*
@@ -134,7 +140,7 @@ if ($id > 0 || !empty($ref)) {
 		if ($permissiontoadd)
 		{
 			if ($action != 'classify')
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/recruitment/recruitmentindex.php b/htdocs/recruitment/recruitmentindex.php
index 5473572f842..b4d943584cd 100644
--- a/htdocs/recruitment/recruitmentindex.php
+++ b/htdocs/recruitment/recruitmentindex.php
@@ -320,7 +320,7 @@ if (! empty($conf->recruitment->enabled) && $user->rights->recruitment->read)
 END MODULEBUILDER DRAFT MYOBJECT */
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 $NBMAX = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
@@ -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 && !$user->rights->societe->client->voir && !$socid) {
+	if ($conf->societe->enabled && 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 && !$user->rights->societe->client->voir && !$socid) {
+	if ($conf->societe->enabled && 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 && !$user->rights->societe->client->voir && !$socid) {
+	if ($conf->societe->enabled && 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 && !$user->rights->societe->client->voir && !$socid) {
+	if ($conf->societe->enabled && empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -463,7 +463,7 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 	}
 }
 
-print '</div></div></div>';
+print '</div></div>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php
index 253bf2a7e0c..3f9e76d4dcf 100644
--- a/htdocs/recruitment/recruitmentjobposition_agenda.php
+++ b/htdocs/recruitment/recruitmentjobposition_agenda.php
@@ -81,8 +81,8 @@ if (GETPOST('actioncode', 'array')) {
 $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');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -184,7 +184,7 @@ if ($object->id > 0) {
 		$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.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
diff --git a/htdocs/recruitment/recruitmentjobposition_applications.php b/htdocs/recruitment/recruitmentjobposition_applications.php
index 95daeae54a6..4295ce73284 100644
--- a/htdocs/recruitment/recruitmentjobposition_applications.php
+++ b/htdocs/recruitment/recruitmentjobposition_applications.php
@@ -148,14 +148,14 @@ if ($reshook < 0) {
 if (empty($reshook)) {
 	$error = 0;
 
-	$backurlforlist = dol_buildpath('/recruitment/recruitmentjobposition_list.php', 1);
+	$backurlforlist = DOL_URL_ROOT.'/recruitment/recruitmentjobposition_list.php';
 
 	if (empty($backtopage) || ($cancel && empty($id))) {
 		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = dol_buildpath('/recruitment/recruitmentjobposition_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+				$backtopage = DOL_URL_ROOT.'/recruitment/recruitmentjobposition_card.php?id='.($id > 0 ? $id : '__ID__');
 			}
 		}
 	}
@@ -240,11 +240,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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 $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 
@@ -280,9 +276,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	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->buttonsSaveCancel();
 
 	print '</form>';
 }
@@ -358,7 +352,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$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 .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a>';
 			}
 			$morehtmlref .= ' : ';
 			if ($action == 'classify') {
diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index 58ee9260617..ab065411ac0 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -265,11 +265,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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 $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 
@@ -305,9 +301,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	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->buttonsSaveCancel();
 
 	print '</form>';
 }
@@ -385,7 +379,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$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 .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a>';
 			}
 			$morehtmlref .= ' : ';
 			if ($action == 'classify') {
@@ -463,7 +457,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Modify
 			if ($permissiontoadd) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
+				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";
 			}
@@ -472,7 +466,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=confirm_validate&confirm=yes">'.$langs->trans("Validate").'</a>';
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&token='.newToken().'&confirm=yes">'.$langs->trans("Validate").'</a>';
 					} else {
 						$langs->load("errors");
 						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
@@ -511,7 +505,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
 			if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd)) {
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+				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";
 			}
@@ -556,26 +550,24 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			$url = getPublicJobPositionUrl(0, $object->ref);
 			$out .= '<div class="urllink"><input type="text" id="recruitmentjobpositionurl" class="quatrevingtpercent" value="'.$url.'">';
-			$out .= '<a href="'.$url.'" target="_blank">'.img_picto('', 'globe').'</a></div>';
+			$out .= '<a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.img_picto('', 'globe').'</a></div>';
 			$out .= ajax_autoselect("recruitmentjobpositionurl", 0);
 
 			print $out;
 		}
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		$MAXEVENT = 10;
 
-		$morehtmlright = '<a href="'.dol_buildpath('/recruitment/recruitmentjobposition_agenda.php', 1).'?id='.$object->id.'">';
-		$morehtmlright .= $langs->trans("SeeAll");
-		$morehtmlright .= '</a>';
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt 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';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, $object->element.'@recruitment', (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
+		$somethingshown = $formactions->showactions($object, $object->element.'@recruitment', (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 	//Select mail models is same action as presend
diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php
index 43d80901f3d..e9615777ade 100644
--- a/htdocs/recruitment/recruitmentjobposition_document.php
+++ b/htdocs/recruitment/recruitmentjobposition_document.php
@@ -71,8 +71,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -165,7 +165,7 @@ if ($object->id) {
 		$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.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index de4905aa337..a61665de070 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -94,6 +94,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');
 
@@ -132,12 +133,16 @@ 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') !== '') {
 		$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"
@@ -178,7 +183,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 +213,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')
@@ -237,6 +246,8 @@ $now = dol_now();
 //$help_url="EN:Module_RecruitmentJobPosition|FR:Module_RecruitmentJobPosition_FR|ES:Módulo_RecruitmentJobPosition";
 $help_url = '';
 $title = $langs->trans('ListOfPositionsToBeFilled');
+$morejs = array();
+$morecss = array();
 
 
 // Build and execute select
@@ -247,7 +258,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
@@ -283,17 +294,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 +324,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,44 +334,57 @@ 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);
 	$id = $obj->rowid;
-	header("Location: ".dol_buildpath('/recruitment/recruitmentjobposition_card.php', 1).'?id='.$id);
+	header("Location: ".DOL_URL_ROOT.'/recruitment/recruitmentjobposition_card.php?id='.$id);
 	exit;
 }
 
@@ -368,11 +392,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 +409,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 +453,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('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('/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 +524,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 +531,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 +558,8 @@ print $searchpicto;
 print '</td>';
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
@@ -537,19 +577,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("Applications").'</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 +610,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 +622,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'])) {
+
+			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 +723,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 9dbcd0e1180..2645980f7bb 100644
--- a/htdocs/recruitment/recruitmentjobposition_note.php
+++ b/htdocs/recruitment/recruitmentjobposition_note.php
@@ -99,7 +99,13 @@ $result = restrictedArea($user, 'recruitment', $object->id, 'recruitment_recruit
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$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
+}
 
 
 /*
@@ -137,7 +143,7 @@ if ($id > 0 || !empty($ref)) {
 		$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.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index 6f9cfa8ce34..363f334a7eb 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -55,8 +55,8 @@ if (GETPOST('actioncode', 'array')) {
 $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');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -71,14 +71,18 @@ if (!$sortorder) {
 	$sortorder = 'DESC,DESC';
 }
 
-$object = new DolResource($db);
-$object->fetch($id, $ref);
-
 // Initialize technical objects
 //$object=new MyObject($db);
 $extrafields = new ExtraFields($db);
 $hookmanager->initHooks(array('agendaresource'));
 
+$object = new DolResource($db);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+$result = restrictedArea($user, 'resource', $object->id, 'resource');
+
 // Security check
 if (!$user->rights->resource->read) {
 	accessforbidden();
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index c258348a7a4..4ffbe1eb0a7 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -48,10 +48,6 @@ if ($user->socid > 0) {
 	accessforbidden();
 }
 
-if (!$user->rights->resource->read) {
-	accessforbidden();
-}
-
 $object = new Dolresource($db);
 
 $extrafields = new ExtraFields($db);
@@ -59,6 +55,14 @@ $extrafields = new ExtraFields($db);
 // 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.
+
+
+$result = restrictedArea($user, 'resource', $object->id, 'resource');
+
+$permissiontoadd = $user->rights->resource->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+
 
 
 /*
@@ -252,11 +256,9 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) {
 
 		print dol_get_fiche_end();
 
-		print '<div class="center">';
-		print '<input type="submit" class="button" name="save" value="'.$langs->trans($action == "create" ? "Create" : "Modify").'">';
-		print ' &nbsp; &nbsp; ';
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
+		$button_label = ($action == "create" ? "Create" : "Modify");
+		print $form->buttonsSaveCancel($button_label);
+
 		print '</div>';
 
 		print '</form>';
@@ -341,7 +343,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) {
 			// Edit resource
 			if ($user->rights->resource->write) {
 				print '<div class="inline-block divButAction">';
-				print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=edit" class="butAction">'.$langs->trans('Modify').'</a>';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&action=edit&token='.newToken().'" class="butAction">'.$langs->trans('Modify').'</a>';
 				print '</div>';
 			}
 		}
@@ -349,7 +351,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) {
 			// Delete resource
 			if ($user->rights->resource->delete) {
 				print '<div class="inline-block divButAction">';
-				print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete&amp;token='.newToken().'" class="butActionDelete">'.$langs->trans('Delete').'</a>';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&action=delete&token='.newToken().'" class="butActionDelete">'.$langs->trans('Delete').'</a>';
 				print '</div>';
 			}
 		}
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 91f68951842..2307f2039d1 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -360,7 +360,7 @@ class Dolresource extends CommonObject
 		$sql .= " t.fk_user_create,";
 		$sql .= " t.tms";
 		$sql .= " FROM ".MAIN_DB_PREFIX."element_resources as t";
-		$sql .= " WHERE t.rowid = ".$this->db->escape($id);
+		$sql .= " WHERE t.rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -499,7 +499,7 @@ class Dolresource extends CommonObject
 		// Add fields from extrafields
 		if (!empty($extrafields->attributes[$this->table_element]['label'])) {
 			foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $val) {
-				$sql .= ($extrafields->attributes[$this->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+				$sql .= ($extrafields->attributes[$this->table_element]['type'][$key] != 'separate' ? "ef.".$key." as options_".$key.', ' : '');
 			}
 		}
 		$sql .= " ty.label as type_label";
@@ -511,11 +511,11 @@ class Dolresource extends CommonObject
 		if (!empty($filter)) {
 			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) {
-					$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
+					$sql .= " AND ".$key." = '".$this->db->idate($value)."'";
 				} elseif (strpos($key, 'ef.') !== false) {
 					$sql .= $value;
 				} else {
-					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sql .= " AND ".$key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
@@ -591,9 +591,9 @@ class Dolresource extends CommonObject
 		if (!empty($filter)) {
 			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) {
-					$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
+					$sql .= " AND ".$key." = '".$this->db->idate($value)."'";
 				} else {
-					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sql .= " AND ".$key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
@@ -675,9 +675,9 @@ class Dolresource extends CommonObject
 		if (!empty($filter)) {
 			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) {
-					$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
+					$sql .= " AND ".$key." = '".$this->db->idate($value)."'";
 				} else {
-					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sql .= " AND ".$key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
@@ -974,7 +974,7 @@ class Dolresource extends CommonObject
 		$linkstart = '<a href="'.$url.$get_params.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
-		/*$linkstart = '<a href="'.dol_buildpath('/resource/card.php', 1).'?id='.$this->id.$get_params.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		/*$linkstart = '<a href="'.DOL_URL_ROOT.'/resource/card.php?id='.$this->id.$get_params.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';*/
 
 		$result .= $linkstart;
@@ -1016,4 +1016,35 @@ class Dolresource extends CommonObject
 
 		return '';
 	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Charge indicateurs this->nb de tableau de bord
+	 *
+	 *      @return     int         <0 if KO, >0 if OK
+	 */
+	public function load_state_board()
+	{
+		// phpcs:enable
+		global $conf;
+
+		$this->nb = array();
+
+		$sql = "SELECT count(r.rowid) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."resource as r";
+		$sql .= " WHERE r.entity IN (".getEntity('resource').")";
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$this->nb["dolresource"] = $obj->nb;
+			}
+			$this->db->free($resql);
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 }
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index a8b17665fa1..99916b8ed70 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -224,8 +224,9 @@ class FormResource
 					$value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
 				} elseif ($format == 3) {
 					$value = $arraytypes['code'];
+				} elseif (empty($value)) {
+					print  '&nbsp;';
 				}
-				print $value ? $value : '&nbsp;';
 				print '</option>';
 			}
 		}
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index 811bb476430..aca47d49743 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -38,14 +38,21 @@ $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
+$object = new DolResource($db);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
 // Security check
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'resource', $id, 'resource');
+$result = restrictedArea($user, 'resource', $object->id, 'resource');
 
-$object = new DolResource($db);
-$result = $object->fetch($id, $ref);
+// Security check
+if (!$user->rights->resource->read) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index fec869d5620..001598d2023 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -70,11 +70,17 @@ if (!$sortfield) {
 
 
 $object = new DolResource($db);
-$object->fetch($id, $ref);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
 $upload_dir = $conf->resource->dir_output.'/'.dol_sanitizeFileName($object->ref);
 $modulepart = 'resource';
 
+$result = restrictedArea($user, 'resource', $object->id, 'resource');
+
+$permissiontoadd = $user->rights->resource->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
+
 
 /*
  * Actions
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 4d0736c5f64..d0ca6416390 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -76,6 +76,19 @@ if ($socid > 0) { // Special for thirdparty
 	$element = 'societe';
 }
 
+// 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');
+}
+if ($element == 'fichinter') {
+	$result = restrictedArea($user, 'ficheinter', $element_id, 'fichinter');
+}
+if ($element == 'product' || $element == 'service') {	// When RESOURCE_ON_PRODUCTS or RESOURCE_ON_SERVICES is set
+	$tmpobject = new Product($db);
+	$tmpobject->fetch($element_id);
+	$fieldtype = $tmpobject->type;
+	$result = restrictedArea($user, 'produit|service', $element_id, 'product&product', '', '', $fieldtype);
+}
 
 
 /*
@@ -106,7 +119,7 @@ if (empty($reshook)) {
 			if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $objstat->element == 'action' && $resource_type == 'dolresource' && intval($busy) == 1) {
 				$eventDateStart = $objstat->datep;
 				$eventDateEnd   = $objstat->datef;
-				$isFullDayEvent = intval($objstat->fulldayevent);
+				$isFullDayEvent = $objstat->fulldayevent;
 				if (empty($eventDateEnd)) {
 					if ($isFullDayEvent) {
 						$eventDateStartArr = dol_getdate($eventDateStart);
@@ -181,7 +194,7 @@ if (empty($reshook)) {
 			if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element_type == 'action' && $object->resource_type == 'dolresource' && intval($object->busy) == 1) {
 				$eventDateStart = $object->objelement->datep;
 				$eventDateEnd   = $object->objelement->datef;
-				$isFullDayEvent = intval($objstat->fulldayevent);
+				$isFullDayEvent = $objstat->fulldayevent;
 				if (empty($eventDateEnd)) {
 					if ($isFullDayEvent) {
 						$eventDateStartArr = dol_getdate($eventDateStart);
@@ -310,18 +323,18 @@ if (!$ret) {
 			print dol_get_fiche_head($head, 'resources', $langs->trans("Action"), -1, 'action');
 
 			$linkback = img_picto($langs->trans("BackToList"), 'object_list', 'class="hideonsmartphone pictoactionview"');
-			$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list">'.$langs->trans("BackToList").'</a>';
+			$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list">'.$langs->trans("BackToList").'</a>';
 
 			// Link to other agenda views
 			$out = '';
 			$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="hideonsmartphone pictoactionview"');
-			$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?action=show_peruser&year='.dol_print_date($act->datep, '%Y').'&month='.dol_print_date($act->datep, '%m').'&day='.dol_print_date($act->datep, '%d').'">'.$langs->trans("ViewPerUser").'</a>';
+			$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?mode=show_peruser&year='.dol_print_date($act->datep, '%Y').'&month='.dol_print_date($act->datep, '%m').'&day='.dol_print_date($act->datep, '%d').'">'.$langs->trans("ViewPerUser").'</a>';
 			$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="hideonsmartphone pictoactionview"');
-			$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_month&year='.dol_print_date($act->datep, '%Y').'&month='.dol_print_date($act->datep, '%m').'&day='.dol_print_date($act->datep, '%d').'">'.$langs->trans("ViewCal").'</a>';
+			$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_month&year='.dol_print_date($act->datep, '%Y').'&month='.dol_print_date($act->datep, '%m').'&day='.dol_print_date($act->datep, '%d').'">'.$langs->trans("ViewCal").'</a>';
 			$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="hideonsmartphone pictoactionview"');
-			$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($act->datep, '%Y').'&month='.dol_print_date($act->datep, '%m').'&day='.dol_print_date($act->datep, '%d').'">'.$langs->trans("ViewWeek").'</a>';
+			$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($act->datep, '%Y').'&month='.dol_print_date($act->datep, '%m').'&day='.dol_print_date($act->datep, '%d').'">'.$langs->trans("ViewWeek").'</a>';
 			$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="hideonsmartphone pictoactionview"');
-			$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=show_day&year='.dol_print_date($act->datep, '%Y').'&month='.dol_print_date($act->datep, '%m').'&day='.dol_print_date($act->datep, '%d').'">'.$langs->trans("ViewDay").'</a>';
+			$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($act->datep, '%Y').'&month='.dol_print_date($act->datep, '%m').'&day='.dol_print_date($act->datep, '%d').'">'.$langs->trans("ViewDay").'</a>';
 
 			$linkback .= $out;
 
@@ -336,9 +349,7 @@ if (!$ret) {
 				if (!empty($act->fk_project)) {
 					$proj = new Project($db);
 					$proj->fetch($act->fk_project);
-					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$act->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-					$morehtmlref .= $proj->ref;
-					$morehtmlref .= '</a>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
 					if ($proj->title) {
 						$morehtmlref .= ' - '.$proj->title;
 					}
@@ -365,14 +376,14 @@ if (!$ret) {
 			}
 
 			// Full day event
-			print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($act->fulldayevent, 3).'</td></tr>';
+			print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($act->fulldayevent ? 1 : 0, 3).'</td></tr>';
 
 			// Date start
 			print '<tr><td>'.$langs->trans("DateActionStart").'</td><td colspan="3">';
-			if (!$act->fulldayevent) {
-				print dol_print_date($act->datep, 'dayhour');
+			if (empty($act->fulldayevent)) {
+				print dol_print_date($act->datep, 'dayhour', 'tzuser');
 			} else {
-				print dol_print_date($act->datep, 'day');
+				print dol_print_date($act->datep, 'day', 'tzuser');
 			}
 			if ($act->percentage == 0 && $act->datep && $act->datep < ($now - $delay_warning)) {
 				print img_warning($langs->trans("Late"));
@@ -382,10 +393,10 @@ if (!$ret) {
 
 			// Date end
 			print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
-			if (!$act->fulldayevent) {
-				print dol_print_date($act->datef, 'dayhour');
+			if (empty($act->fulldayevent)) {
+				print dol_print_date($act->datef, 'dayhour', 'tzuser');
 			} else {
-				print dol_print_date($act->datef, 'day');
+				print dol_print_date($act->datef, 'day', 'tzuser');
 			}
 			if ($act->percentage > 0 && $act->percentage < 100 && $act->datef && $act->datef < ($now - $delay_warning)) {
 				print img_warning($langs->trans("Late"));
@@ -502,7 +513,7 @@ if (!$ret) {
 				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 				if ($user->rights->commande->creer) {
 					if ($action != 'classify') {
-						//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $fichinter->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+						//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $fichinter->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 						$morehtmlref .= ' : ';
 					}
 					if ($action == 'classify') {
@@ -520,9 +531,10 @@ if (!$ret) {
 					if (!empty($fichinter->fk_project)) {
 						$proj = new Project($db);
 						$proj->fetch($fichinter->fk_project);
-						$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$fichinter->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-						$morehtmlref .= $proj->ref;
-						$morehtmlref .= '</a>';
+						$morehtmlref .= ' : '.$proj->getNomUrl(1);
+						if ($proj->title) {
+							$morehtmlref .= ' - '.$proj->title;
+						}
 					} else {
 						$morehtmlref .= '';
 					}
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 5a7cd3856b3..97d55c7bb33 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -38,7 +38,7 @@ $element        = GETPOST('element', 'alpha');
 $element_id     = GETPOST('element_id', 'int');
 $resource_id    = GETPOST('resource_id', 'int');
 
-$sortorder      = GETPOST('sortorder', 'alpha');
+$sortorder      = GETPOST('sortorder', 'aZ09comma');
 $sortfield      = GETPOST('sortfield', 'aZ09comma');
 $optioncss = GETPOST('optioncss', 'alpha');
 
@@ -61,7 +61,6 @@ $search_type = GETPOST("search_type", 'alpha');
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 
-
 $filter = array();
 
 $hookmanager->initHooks(array('resourcelist'));
@@ -85,9 +84,6 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (!$user->rights->resource->read) {
-		accessforbidden();
-}
 $arrayfields = array(
 		't.ref' => array(
 				'label' => $langs->trans("Ref"),
@@ -115,6 +111,10 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$filter = array();
 }
 
+if (empty($user->rights->resource->read)) {
+	accessforbidden();
+}
+
 
 /*
  * Actions
diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php
index 07819b1d0b4..98efb72d55b 100644
--- a/htdocs/resource/note.php
+++ b/htdocs/resource/note.php
@@ -40,10 +40,15 @@ $action = GETPOST('action', 'aZ09');
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'resource', $id, 'resource');
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('resourcenote'));
 
 $object = new DolResource($db);
-$object->fetch($id, $ref);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+$result = restrictedArea($user, 'resource', $object->id, 'resource');
 
 $permissionnote = $user->rights->resource->write; // Used by the include of actions_setnotes.inc.php
 
@@ -52,7 +57,13 @@ $permissionnote = $user->rights->resource->write; // Used by the include of acti
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$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
+}
 
 
 /*
diff --git a/htdocs/salaries/admin/salaries.php b/htdocs/salaries/admin/salaries.php
index dc0cc5b14a0..1c9eeec6464 100644
--- a/htdocs/salaries/admin/salaries.php
+++ b/htdocs/salaries/admin/salaries.php
@@ -120,7 +120,7 @@ foreach ($list as $key) {
 	// Value
 	print '<td>';
 	if (!empty($conf->accounting->enabled)) {
-		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
+		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.'">';
 	}
@@ -133,7 +133,7 @@ print "</table>\n";
 
 //print dol_get_fiche_end();
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
+print '<div class="center"><input type="submit" class="button button-edit" name="button" value="'.$langs->trans('Modify').'"></div>';
 
 print '</form><br>';
 
diff --git a/htdocs/salaries/ajax/ajaxsalaries.php b/htdocs/salaries/ajax/ajaxsalaries.php
new file mode 100644
index 00000000000..adea28ee8ce
--- /dev/null
+++ b/htdocs/salaries/ajax/ajaxsalaries.php
@@ -0,0 +1,79 @@
+<?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/salaries/ajax/ajaxsalaries.php
+ *       \brief      File to return Ajax response on salary 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';
+require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
+
+restrictedArea($user, 'salaries');
+
+
+/*
+ * View
+ */
+
+$fk_user = GETPOST('fk_user', 'int');
+$return_arr = array();
+
+if (!empty(GETPOST('fk_user', 'int'))) {
+	$sql = "SELECT s.amount, s.rowid FROM ".MAIN_DB_PREFIX."salary as s";
+	$sql .= " WHERE s.fk_user = ".((int) $fk_user);
+	$sql .= " AND s.paye = 1";
+	$sql .= $db->order("s.dateep", "DESC");
+
+	$resql = $db->query($sql);
+	if ($resql) {
+		$obj = $db->fetch_object($resql);
+		$label = "Salary amount";
+		$row_array['label'] = $label;
+		$row_array['value'] = price2num($obj->amount, 'MT');
+		$row_array['key'] = "Amount";
+
+		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/salaries/card.php b/htdocs/salaries/card.php
old mode 100755
new mode 100644
index f5ebbcf0ec6..32be3b3013d
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -25,6 +25,7 @@
  *  \ingroup    salaries
  *  \brief      Page of salaries payments
  */
+
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
@@ -33,6 +34,7 @@ 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';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
@@ -50,10 +52,11 @@ $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-
-$accountid = GETPOST('accountid', 'int') > 0 ? GETPOST('accountid', 'int') : 0;
-$projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
 $confirm = GETPOST('confirm');
+
+$label = GETPOST('label', 'alphanohtml');
+$projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
+$accountid = GETPOST('accountid', 'int') > 0 ? GETPOST('accountid', 'int') : 0;
 if (GETPOSTISSET('auto_create_paiement') || $action === 'add') {
 	$auto_create_paiement = GETPOST("auto_create_paiement", "int");
 } else {
@@ -64,7 +67,6 @@ $datep = dol_mktime(12, 0, 0, GETPOST("datepmonth", 'int'), GETPOST("datepday",
 $datev = dol_mktime(12, 0, 0, GETPOST("datevmonth", 'int'), GETPOST("datevday", 'int'), GETPOST("datevyear", 'int'));
 $datesp = dol_mktime(12, 0, 0, GETPOST("datespmonth", 'int'), GETPOST("datespday", 'int'), GETPOST("datespyear", 'int'));
 $dateep = dol_mktime(12, 0, 0, GETPOST("dateepmonth", 'int'), GETPOST("dateepday", 'int'), GETPOST("dateepyear", 'int'));
-$label = GETPOST('label', 'alphanohtml');
 $fk_user = GETPOSTINT('userid');
 
 $object = new Salary($db);
@@ -102,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
@@ -263,7 +269,10 @@ if ($action == 'add' && empty($cancel)) {
 		$db->begin();
 
 		$ret = $object->create($user);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			var_dump($ret);
+			$error++;
+		}
 		if (!empty($auto_create_paiement) && !$error) {
 			// Create a line of payments
 			$paiement = new PaymentSalary($db);
@@ -273,7 +282,7 @@ if ($action == 'add' && empty($cancel)) {
 			$paiement->amounts      = array($object->id=>$amount); // Tableau de montant
 			$paiement->paiementtype = $type_payment;
 			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
-			$paiement->note = GETPOST("note", 'none');
+			$paiement->note = GETPOST("note", 'restricthtml');
 
 			if (!$error) {
 				$paymentid = $paiement->create($user, (int) GETPOST('closepaidsalary'));
@@ -430,12 +439,14 @@ if ($action == "update_extras" && !empty($user->rights->salaries->read)) {
  *	View
  */
 
+$form = new Form($db);
+$formfile = new FormFile($db);
+if (!empty($conf->projet->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);
@@ -481,7 +492,7 @@ if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewSalary"), '', 'salary');
 
 	if (!empty($conf->use_javascript_ajax)) {
-		print "\n".'<script type="text/javascript" language="javascript">';
+		print "\n".'<script type="text/javascript">';
 		print /** @lang JavaScript */'
 			$(document).ready(function () {
 				let onAutoCreatePaiementChange = function () {
@@ -542,15 +553,18 @@ if ($action == 'create') {
 	// Amount
 	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").'">';
-	print '</td></tr>';
+	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 '</td>';
+	print '</tr>';
 
 	// Project
 	if (!empty($conf->projet->enabled)) {
 		$formproject = new FormProjets($db);
 
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
-		$formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
+		print img_picto('', 'project', 'class="pictofixedwidth"');
+		print $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 1);
 		print '</td></tr>';
 	}
 
@@ -560,10 +574,12 @@ if ($action == 'create') {
 	print '<td class="tdtop"><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_3.'">'.GETPOST('note', 'restricthtml').'</textarea></td>';
 	print '</tr>';
 
+
 	print '<tr><td colspan="2"><hr></td></tr>';
 
+
 	// Auto create payment
-	print '<tr><td>'.$langs->trans('AutomaticCreationPayment').'</td>';
+	print '<tr><td><label for="auto_create_paiement">'.$langs->trans('AutomaticCreationPayment').'</label></td>';
 	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_paiement) ? '' : 'checked="checked"') . ' value="1"></td></tr>'."\n";	// Date payment
 
 	// Bank
@@ -625,17 +641,53 @@ if ($action == 'create') {
 
 	print '<div class="hide_if_no_auto_create_payment paddingbottom">';
 	print '<input type="checkbox" checked value="1" name="closepaidsalary">'.$langs->trans("ClosePaidSalaryAutomatically");
-	print '<br>';
 	print '</div>';
 
-	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp; &nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="saveandnew" value="'.$langs->trans("SaveAndNew").'">';
-	print '&nbsp;&nbsp; &nbsp;&nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
+	$addition_button = array(
+		'name' => 'saveandnew',
+		'label_key' => 'SaveAndNew',
+	);
+	print $form->buttonsSaveCancel("Save", "Cancel", $addition_button);
+
 	print '</form>';
+	print '<script>';
+	print '$( document ).ready(function() {';
+		print '$("#updateAmountWithLastSalary").on("click", function updateAmountWithLastSalary() {
+					console.log("We click on link to autofill salary amount");
+					var fk_user = $("#fk_user").val()
+					var url = "'.DOL_URL_ROOT.'/salaries/ajax/ajaxsalaries.php?fk_user="+fk_user;
+					if (fk_user != -1) {
+						$.get(
+							url,
+							function( data ) {
+								if(data!=null) {
+									console.log("Data returned: "+data);
+									item = JSON.parse(data);
+									if(item[0].key == "Amount") {
+										value = item[0].value;
+										if (value != null) {
+											$("#amount").val(item[0].value);
+										} else {
+											console.error("Error: Ajax url "+url+" has returned a null value.");
+										}
+									} else {
+										console.error("Error: Ajax url "+url+" has returned the wrong key.");
+									}
+								} else {
+									console.error("Error: Ajax url "+url+" has returned an empty page.");
+								}
+							}
+						);
+
+					} else {
+						alert("'.dol_escape_js($langs->trans("FillFieldFirst")).'");
+					}
+		});
+
+	})';
+	print '</script>';
 }
 
 
@@ -647,6 +699,7 @@ if ($action == 'create') {
 
 if ($id) {
 	$head = salaries_prepare_head($object);
+	$formconfirm = '';
 
 	if ($action === 'clone') {
 		$formquestion = array(
@@ -657,17 +710,17 @@ if ($id) {
 		$formquestion[] = array('type' => 'date', 'name' => 'clone_date_start', 'label' => $langs->trans("DateStart"), 'value' => -1);
 		$formquestion[] = array('type' => 'date', 'name' => 'clone_date_end', 'label' => $langs->trans("DateEnd"), 'value' => -1);
 
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneSalary', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 240);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneSalary', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 240);
 	}
 
 	if ($action == 'paid') {
 		$text = $langs->trans('ConfirmPaySalary');
-		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans('PaySalary'), $text, "confirm_paid", '', '', 2);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans('PaySalary'), $text, "confirm_paid", '', '', 2);
 	}
 
 	if ($action == 'delete') {
 		$text = $langs->trans('ConfirmDeleteSalary');
-		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteSalary'), $text, 'confirm_delete', '', '', 2);
+		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteSalary'), $text, 'confirm_delete', '', '', 2);
 	}
 
 	if ($action == 'edit') {
@@ -675,6 +728,19 @@ if ($id) {
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 	}
 
+	// 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;
+
+
 	print dol_get_fiche_head($head, 'card', $langs->trans("SalaryPayment"), -1, 'salary');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/salaries/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
@@ -686,7 +752,7 @@ if ($id) {
 		$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1);
 		$morehtmlref .= $object->label;
 	} else {
-		$morehtmlref .= '<br>'.$langs->trans('Label').' :&nbsp;';
+		$morehtmlref .= $langs->trans('Label').' :&nbsp;';
 		$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
 		$morehtmlref .= '<input type="hidden" name="action" value="setlabel">';
 		$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
@@ -695,13 +761,13 @@ if ($id) {
 		$morehtmlref .= '</form>';
 	}
 
-	//Employee
+	// Employee
 	if ($action != 'editfk_user') {
 		if ($object->getSommePaiement() > 0 && !empty($object->fk_user)) {
 			$userstatic = new User($db);
 			$result = $userstatic->fetch($object->fk_user);
 			if ($result > 0) {
-				$morehtmlref .= '<br>' .$langs->trans('Employee').' : '.$userstatic->getNomUrl(1);
+				$morehtmlref .= '<br>' .$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
 			}
 		} else {
 			$morehtmlref .= '<br>' . $form->editfieldkey("Employee", 'fk_user', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1);
@@ -710,7 +776,7 @@ if ($id) {
 				$userstatic = new User($db);
 				$result = $userstatic->fetch($object->fk_user);
 				if ($result > 0) {
-					$morehtmlref .= $userstatic->getNomUrl(1);
+					$morehtmlref .= $userstatic->getNomUrl(-1);
 				} else {
 					dol_print_error($db);
 					exit();
@@ -732,14 +798,14 @@ if ($id) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->salaries->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 .= '<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(-1, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= $formproject->select_projects(-1, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1, 0, 'maxwidth500');
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
@@ -749,9 +815,10 @@ if ($id) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
@@ -814,7 +881,7 @@ if ($id) {
 	print $langs->trans('DefaultPaymentMode');
 	print '</td>';
 	if ($action != 'editmode')
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td>';
 
@@ -832,7 +899,7 @@ if ($id) {
 		print $langs->trans('DefaultBankAccount');
 		print '<td>';
 		if ($action != 'editbankaccount' && $user->rights->salaries->write) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
@@ -853,7 +920,6 @@ if ($id) {
 	print '</div>';
 
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 
 	$nbcols = 3;
 	if (!empty($conf->banque->enabled)) {
@@ -954,23 +1020,19 @@ if ($id) {
 		dol_print_error($db);
 	}
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
 	print '<div class="clearboth"></div>';
 
+	print dol_get_fiche_end();
 
 	if ($action == 'edit') {
-		print '<div align="center">';
-		print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-		print ' &nbsp; ';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
-		print "</form>\n";
+		print $form->buttonsSaveCancel();
+		print "</form>";
 	}
 
-	print dol_get_fiche_end();
+	$resteapayer = price2num($resteapayer, 'MT');
 
 
 	/*
@@ -981,32 +1043,28 @@ if ($id) {
 	if ($action != 'edit') {
 		// Reopen
 		if ($object->paye && $user->rights->salaries->write) {
-			print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".dol_buildpath("/salaries/card.php", 1)."?id=".$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen")."</a></div>";
+			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>";
 		}
 
 		// 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 '<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>";
 		}
 
 		// Emit payment
-		if ($object->paye == 0 && ((price2num($object->amount) < 0 && price2num($resteapayer, 'MT') < 0) || (price2num($object->amount) > 0 && price2num($resteapayer, 'MT') > 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>";
+		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>";
 		}
 
 		// Classify 'paid'
-		if ($object->paye == 0
-			&& (
-				(round($resteapayer) <= 0 && $object->amount > 0)
-				|| (round($resteapayer) >= 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>";
+		// 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>";
 		}
 
 		// 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 '<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>";
 		}
 
 		if (!empty($user->rights->salaries->delete) && empty($totalpaye)) {
@@ -1016,6 +1074,64 @@ if ($id) {
 		}
 	}
 	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-list-alt 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/salariesstats.class.php b/htdocs/salaries/class/salariesstats.class.php
index b3e6c20a0ca..a1e701ed87e 100644
--- a/htdocs/salaries/class/salariesstats.class.php
+++ b/htdocs/salaries/class/salariesstats.class.php
@@ -20,10 +20,10 @@
 /**
  *  \file       htdocs/salaries/class/salariesstats.class.php
  *  \ingroup    salaries
- *  \brief      Fichier de la classe de gestion des stats des salaires
+ *  \brief      File of class for statistics on salaries
  */
 include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
-include_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
+include_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 
 /**
  *	Classe permettant la gestion des stats des salaires
@@ -58,7 +58,7 @@ class SalariesStats extends Stats
 		$this->socid = $socid;
 		$this->userid = $userid;
 
-		$object = new PaymentSalary($this->db);
+		$object = new Salary($this->db);
 		$this->from = MAIN_DB_PREFIX.$object->table_element;
 		$this->field = 'amount';
 
@@ -69,7 +69,7 @@ class SalariesStats extends Stats
 		if (is_array($this->userid) && count($this->userid) > 0) {
 			$this->where .= ' AND fk_user IN ('.$this->db->sanitize(join(',', $this->userid)).')';
 		} elseif ($this->userid > 0) {
-			$this->where .= ' AND fk_user = '.$this->userid;
+			$this->where .= " AND fk_user = ".((int) $this->userid);
 		}
 	}
 
@@ -81,7 +81,7 @@ class SalariesStats extends Stats
 	 */
 	public function getNbByYear()
 	{
-		$sql = "SELECT YEAR(datep) as dm, count(*)";
+		$sql = "SELECT YEAR(dateep) as dm, count(*)";
 		$sql .= " FROM ".$this->from;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm DESC";
@@ -99,9 +99,9 @@ class SalariesStats extends Stats
 	 */
 	public function getNbByMonth($year, $format = 0)
 	{
-		$sql = "SELECT MONTH(datep) as dm, count(*)";
+		$sql = "SELECT MONTH(dateep) as dm, count(*)";
 		$sql .= " FROM ".$this->from;
-		$sql .= " WHERE YEAR(datep) = ".((int) $year);
+		$sql .= " WHERE YEAR(dateep) = ".((int) $year);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -121,9 +121,9 @@ class SalariesStats extends Stats
 	 */
 	public function getAmountByMonth($year, $format = 0)
 	{
-		$sql = "SELECT date_format(datep,'%m') as dm, sum(".$this->field.")";
+		$sql = "SELECT date_format(dateep,'%m') as dm, sum(".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		$sql .= " WHERE date_format(datep,'%Y') = '".$this->db->escape($year)."'";
+		$sql .= " WHERE date_format(dateep,'%Y') = '".$this->db->escape($year)."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -141,9 +141,9 @@ class SalariesStats extends Stats
 	 */
 	public function getAverageByMonth($year)
 	{
-		$sql = "SELECT date_format(datep,'%m') as dm, avg(".$this->field.")";
+		$sql = "SELECT date_format(dateep,'%m') as dm, avg(".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		$sql .= " WHERE date_format(datep,'%Y') = '".$this->db->escape($year)."'";
+		$sql .= " WHERE date_format(dateep,'%Y') = '".$this->db->escape($year)."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -158,7 +158,7 @@ class SalariesStats extends Stats
 	 */
 	public function getAllByYear()
 	{
-		$sql = "SELECT date_format(datep,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
+		$sql = "SELECT date_format(dateep,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index cc50c57ec84..2acc2117297 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -286,7 +286,7 @@ class Salary extends CommonObject
 		/*if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."salary_extrafields";
-			$sql .= " WHERE fk_object=".$this->id;
+			$sql .= " WHERE fk_object = ".((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if (!$resql)
@@ -367,7 +367,7 @@ class Salary extends CommonObject
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Employee"));
 			return -4;
 		}
-		if ($this->amount < 0 || $this->amount == '') {
+		if ($this->amount == '') {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
 			return -5;
 		}
@@ -406,11 +406,11 @@ class Salary extends CommonObject
 		$sql .= "'".$this->db->escape($this->fk_user)."'";
 		//$sql .= ", '".$this->db->idate($this->datep)."'";
 		//$sql .= ", '".$this->db->idate($this->datev)."'";
-		$sql .= ", ".$this->amount;
-		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : 0);
-		$sql .= ", ".($this->salary > 0 ? $this->salary : "null");
-		$sql .= ", ".($this->type_payment > 0 ? $this->type_payment : 0);
-		$sql .= ", ".($this->accountid > 0 ? $this->accountid : "null");
+		$sql .= ", ".((double) $this->amount);
+		$sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : 0);
+		$sql .= ", ".($this->salary > 0 ? ((double) $this->salary) : "null");
+		$sql .= ", ".($this->type_payment > 0 ? ((int) $this->type_payment) : 0);
+		$sql .= ", ".($this->accountid > 0 ? ((int) $this->accountid) : "null");
 		if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
 		$sql .= ", '".$this->db->escape($this->label)."'";
 		$sql .= ", '".$this->db->idate($this->datesp)."'";
@@ -418,7 +418,7 @@ class Salary extends CommonObject
 		$sql .= ", '".$this->db->escape($user->id)."'";
 		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ", NULL";
-		$sql .= ", ".$conf->entity;
+		$sql .= ", ".((int) $conf->entity);
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -468,7 +468,7 @@ class Salary extends CommonObject
 	{
         // phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'salary SET fk_bank = '.((int) $id_bank);
-		$sql .= ' WHERE rowid = '.$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 		$result = $this->db->query($sql);
 		if ($result) {
 			return 1;
@@ -570,7 +570,7 @@ class Salary extends CommonObject
 
 		$sql = 'SELECT sum(amount) as amount';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$table;
-		$sql .= ' WHERE '.$field.' = '.$this->id;
+		$sql .= " WHERE ".$field." = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -639,7 +639,7 @@ class Salary extends CommonObject
 		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."salary SET";
 		$sql .= " paye = 1";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 		$return = $this->db->query($sql);
 		if ($return) return 1;
 		else return -1;
@@ -657,7 +657,7 @@ class Salary extends CommonObject
 		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."salary SET";
 		$sql .= " paye = 0";
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 		$return = $this->db->query($sql);
 		if ($return) return 1;
 		else return -1;
@@ -700,12 +700,12 @@ class Salary extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('BillStatusNotPaid');
-			$this->labelStatus[self::STATUS_PAID] = $langs->trans('BillStatusPaid');
-			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
-			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('BillStatusNotPaid');
-			$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('BillStatusPaid');
-			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('BillStatusNotPaid');
+			$this->labelStatus[self::STATUS_PAID] = $langs->transnoentitiesnoconv('BillStatusPaid');
+			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
+			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('BillStatusNotPaid');
+			$this->labelStatusShort[self::STATUS_PAID] = $langs->transnoentitiesnoconv('BillStatusPaid');
+			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
 		}
 
 		$statusType = 'status1';
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index ea21b49159c..045b77ca0a4 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -35,6 +35,10 @@ 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)) {
+	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", "bills", "users", "salaries", "hrm"));
@@ -44,6 +48,9 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
+$label = GETPOST('label', 'alphanohtml');
+$projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
+
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -62,9 +69,29 @@ if (!$sortfield) {
 	$sortfield = "name";
 }
 
+$object = new Salary($db);
+$extrafields = new ExtraFields($db);
+
+$childids = $user->getAllChildIds(1);
+
+// fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
 $object = new Salary($db);
 if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
+
+	// Check current user can read this salary
+	$canread = 0;
+	if (!empty($user->rights->salaries->readall)) {
+		$canread = 1;
+	}
+	if (!empty($user->rights->salaries->read) && $object->fk_user > 0 && in_array($object->fk_user, $childids)) {
+		$canread = 1;
+	}
+	if (!$canread) {
+		accessforbidden();
+	}
 }
 
 $upload_dir = $conf->salaries->dir_output.'/'.dol_sanitizeFileName($object->id);
@@ -77,6 +104,8 @@ if ($user->socid) {
 }
 restrictedArea($user, 'salaries', $object->id, 'salary', '');
 
+$permissiontoadd = $user->rights->salaries->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
+
 
 /*
  * Actions
@@ -84,12 +113,26 @@ restrictedArea($user, 'salaries', $object->id, 'salary', '');
 
 include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
+// Link to a project
+if ($action == 'classin' && $user->rights->banque->modifier) {
+	$object->fetch($id);
+	$object->setProject($projectid);
+}
+
+// set label
+if ($action == 'setlabel' && $user->rights->salaries->write) {
+	$object->fetch($id);
+	$object->label = $label;
+	$object->update($user);
+}
+
 
 /*
  * View
  */
 
 $form = new Form($db);
+if (!empty($conf->projet->enabled)) $formproject = new FormProjets($db);
 
 $title = $langs->trans('Salary')." - ".$langs->trans('Documents');
 $help_url = "";
@@ -116,7 +159,54 @@ if ($object->id) {
 	$userstatic = new User($db);
 	$userstatic->fetch($object->fk_user);
 
-	$morehtmlref .= $langs->trans('Employee').' : '.$userstatic->getNomUrl(1);
+	// Label
+	if ($action != 'editlabel') {
+		$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1);
+		$morehtmlref .= $object->label;
+	} else {
+		$morehtmlref .= $langs->trans('Label').' :&nbsp;';
+		$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+		$morehtmlref .= '<input type="hidden" name="action" value="setlabel">';
+		$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$morehtmlref .= '<input type="text" name="label" value="'.$object->label.'"/>';
+		$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+		$morehtmlref .= '</form>';
+	}
+
+	$morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
+
+	// Project
+	if (!empty($conf->projet->enabled)) {
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->salaries->write) {
+			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(-1, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1, 0, 'maxwidth500');
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+
 	$morehtmlref .= '</div>';
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
@@ -136,7 +226,7 @@ if ($object->id) {
 	print dol_print_date($object->dateep, 'day');
 	print '</td></tr>';
 
-	print '<tr><td>' . $langs->trans("Amount") . '</td><td>' . price($object->amount, 0, $langs, 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>';
 
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
 
diff --git a/htdocs/salaries/info.php b/htdocs/salaries/info.php
index 0f94f405fa1..a43d9010d8d 100644
--- a/htdocs/salaries/info.php
+++ b/htdocs/salaries/info.php
@@ -28,6 +28,10 @@ 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)) {
+	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", "bills", "users", "salaries", "hrm"));
@@ -36,23 +40,68 @@ $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
-$object = new Salary($db);
-if ($id > 0 || !empty($ref)) {
-	$object->fetch($id, $ref);
-}
+$label = GETPOST('label', 'alphanohtml');
+$projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
 
 // Security check
 $socid = GETPOST('socid', 'int');
 if ($user->socid) {
 	$socid = $user->socid;
 }
+
+$object = new Salary($db);
+$extrafields = new ExtraFields($db);
+
+$childids = $user->getAllChildIds(1);
+
+// fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$object = new Salary($db);
+if ($id > 0 || !empty($ref)) {
+	$object->fetch($id, $ref);
+
+	// Check current user can read this salary
+	$canread = 0;
+	if (!empty($user->rights->salaries->readall)) {
+		$canread = 1;
+	}
+	if (!empty($user->rights->salaries->read) && $object->fk_user > 0 && in_array($object->fk_user, $childids)) {
+		$canread = 1;
+	}
+	if (!$canread) {
+		accessforbidden();
+	}
+}
+
 restrictedArea($user, 'salaries', $object->id, 'salary', '');
 
 
+/*
+ * Actions
+ */
+
+// Link to a project
+if ($action == 'classin' && $user->rights->banque->modifier) {
+	$object->fetch($id);
+	$object->setProject($projectid);
+}
+
+// set label
+if ($action == 'setlabel' && $user->rights->salaries->write) {
+	$object->fetch($id);
+	$object->label = $label;
+	$object->update($user);
+}
+
+
+
 /*
  * View
  */
 
+if (!empty($conf->projet->enabled)) $formproject = new FormProjets($db);
+
 $title = $langs->trans('Salary')." - ".$langs->trans('Info');
 $help_url = "";
 llxHeader("", $title, $help_url);
@@ -72,7 +121,55 @@ $morehtmlref = '<div class="refidno">';
 $userstatic = new User($db);
 $userstatic->fetch($object->fk_user);
 
-$morehtmlref .= $langs->trans('Employee').' : '.$userstatic->getNomUrl(1);
+
+// Label
+if ($action != 'editlabel') {
+	$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1);
+	$morehtmlref .= $object->label;
+} else {
+	$morehtmlref .= $langs->trans('Label').' :&nbsp;';
+	$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	$morehtmlref .= '<input type="hidden" name="action" value="setlabel">';
+	$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+	$morehtmlref .= '<input type="text" name="label" value="'.$object->label.'"/>';
+	$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	$morehtmlref .= '</form>';
+}
+
+$morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
+
+// Project
+if (!empty($conf->projet->enabled)) {
+	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+	if ($user->rights->salaries->write) {
+		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(-1, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1, 0, 'maxwidth500');
+			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			$morehtmlref .= '</form>';
+		} else {
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+		}
+	} else {
+		if (!empty($object->fk_project)) {
+			$proj = new Project($db);
+			$proj->fetch($object->fk_project);
+			$morehtmlref .= ' : '.$proj->getNomUrl(1);
+			if ($proj->title) {
+				$morehtmlref .= ' - '.$proj->title;
+			}
+		} else {
+			$morehtmlref .= '';
+		}
+	}
+}
+
 $morehtmlref .= '</div>';
 
 dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
diff --git a/htdocs/salaries/paiement_salary.php b/htdocs/salaries/paiement_salary.php
index 86a0e787e84..221e5cf2c0e 100644
--- a/htdocs/salaries/paiement_salary.php
+++ b/htdocs/salaries/paiement_salary.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *      \file       htdocs/compta/paiement_salary.php
+ *      \file       htdocs/salaries/paiement_salary.php
  *      \ingroup    salary
  *      \brief      Page to add payment of a salary
  */
@@ -110,8 +110,8 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 			$paiement->amounts      = $amounts; // Tableau de montant
 			$paiement->paiementtype = GETPOST("paiementtype", 'alphanohtml');
 			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
-			$paiement->note         = GETPOST("note", 'none');
-			$paiement->note_private = GETPOST("note", 'none');
+			$paiement->note         = GETPOST("note", 'restricthtml');
+			$paiement->note_private = GETPOST("note", 'restricthtml');
 
 			if (!$error) {
 				$paymentid = $paiement->create($user, (GETPOST('closepaidsalary') == 'on' ? 1 : 0));
@@ -163,7 +163,7 @@ if ($action == 'create') {
 
 	$total = $salary->amount;
 	if (!empty($conf->use_javascript_ajax)) {
-		print "\n".'<script type="text/javascript" language="javascript">';
+		print "\n".'<script type="text/javascript">';
 
 		//Add js for AutoFill
 		print ' $(document).ready(function () {';
@@ -314,15 +314,15 @@ if ($action == 'create') {
 
 	print "</table>";
 
-	// Bouton Save payment
 	print '<br>';
+
+	// Bouton Save payment
 	print '<div class="center">';
 	print '<div class="paddingbottom"><input type="checkbox" checked name="closepaidsalary" id="closepaidsalary"><label for="closepaidsalary">'.$langs->trans("ClosePaidSalaryAutomatically").'</label></div>';
-	print '<input type="submit" class="button" name="save" value="'.$langs->trans('ToMakePayment').'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print $form->buttonsSaveCancel("ToMakePayment", "Cancel", '', true);
 	print '</div>';
 
+
 	print "</form>\n";
 }
 
diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index 5f05c1d98b7..9e5a55563e4 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -138,7 +138,9 @@ print '</td></tr>';*/
 print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">'.dol_print_date($object->datep, 'day').'</td></tr>';
 
 // Mode
-print '<tr><td>'.$langs->trans('Mode').'</td><td colspan="3">'.$langs->trans("PaymentType".$object->type_code).'</td></tr>';
+print '<tr><td>'.$langs->trans('Mode').'</td><td colspan="3">';
+print $langs->trans("PaymentType".$object->type_code);
+print '</td></tr>';
 
 // Numero
 print '<tr><td>'.$langs->trans('Numero').'</td><td colspan="3">'.$object->num_payment.'</td></tr>';
@@ -180,7 +182,7 @@ $sql = 'SELECT f.rowid as scid, f.label, f.paye, f.amount as sc_amount, ps.amoun
 $sql .= ' FROM '.MAIN_DB_PREFIX.'payment_salary as ps,'.MAIN_DB_PREFIX.'salary as f';
 $sql .= ' WHERE ps.fk_salary = f.rowid';
 $sql .= ' AND f.entity = '.$conf->entity;
-$sql .= ' AND ps.rowid = '.$object->id;
+$sql .= ' AND ps.rowid = '.((int) $object->id);
 
 dol_syslog("payment_salary/card.php", LOG_DEBUG);
 $resql = $db->query($sql);
@@ -248,7 +250,7 @@ print '<div class="tabsAction">';
 if ($action == '') {
 	if ($user->rights->salaries->delete) {
 		if (!$disable_delete) {
-			print '<a class="butActionDelete" href="card.php?id='.GETPOST('id', 'int').'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
+			print '<a class="butActionDelete" href="card.php?id='.GETPOST('id', 'int').'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentSalaryPaid")).'">'.$langs->trans('Delete').'</a>';
 		}
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index f129e6304ab..77cbae397f0 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -178,7 +178,7 @@ if (empty($reshook)) {
 		$search_date_start = '';
 		$search_date_end = '';
 		$search_dateep_start = '';
-				$search_dateep_end = '';
+		$search_dateep_end = '';
 		$search_amount = "";
 		$search_account = '';
 		$search_fk_bank = '';
@@ -553,6 +553,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		$totalarray['nbfield']++;
 	}
 
+	// Ref salary
 	print "<td>".$salstatic->getNomUrl(1)."</td>\n";
 	if (!$i) {
 		$totalarray['nbfield']++;
@@ -587,7 +588,9 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	}
 
 	// Type
-	print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).'</td>';
+	print '<td>';
+	print $langs->trans("PaymentTypeShort".$obj->payment_code);
+	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index ecc62c2a237..cb8eb14a05b 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -212,7 +212,7 @@ if (!in_array($year, $arrayyears)) {
 	$arrayyears[$year] = $year;
 }
 arsort($arrayyears);
-print $form->selectarray('year', $arrayyears, $year, 0);
+print $form->selectarray('year', $arrayyears, $year, 0, 0, 0, '', 0, 0, 0, '', 'width75');
 print '</td></tr>';
 print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
@@ -256,7 +256,7 @@ print '</table>';
 print '</div>';
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 // Show graphs
@@ -273,7 +273,7 @@ if ($mesg) {
 print '</td></tr></table>';
 
 
-print '</div></div></div>';
+print '</div></div>';
 print '<div style="clear:both"></div>';
 
 
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index c87289da390..193dfc43cad 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -34,6 +34,7 @@ $langs->loadLangs(array("admin", "companies", "other"));
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
 if (!$user->admin) {
 	accessforbidden();
@@ -115,7 +116,7 @@ if ($action == 'set') {
 
 	$type = 'company';
 	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
-	$sql .= " VALUES ('".$db->escape($value)."','".$db->escape($type)."',".$conf->entity.", ";
+	$sql .= " VALUES ('".$db->escape($value)."', '".$db->escape($type)."', ".((int) $conf->entity).", ";
 	$sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";
 	$sql .= (!empty($scandir) ? "'".$db->escape($scandir)."'" : "null");
 	$sql .= ")";
@@ -130,7 +131,7 @@ if ($action == 'set') {
 if ($action == 'del') {
 	$type = 'company';
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-	$sql .= " WHERE nom='".$db->escape($value)."' AND type='".$db->escape($type)."' AND entity=".$conf->entity;
+	$sql .= " WHERE nom='".$db->escape($value)."' AND type='".$db->escape($type)."' AND entity=".((int) $conf->entity);
 	$resql = $db->query($sql);
 	if (!$resql) {
 		dol_print_error($db);
@@ -151,12 +152,12 @@ if ($action == 'setdoc') {
 	$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
 	$sql_del .= " WHERE nom = '".$db->escape(GETPOST('value', 'alpha'))."'";
 	$sql_del .= " AND type = '".$db->escape($type)."'";
-	$sql_del .= " AND entity = ".$conf->entity;
+	$sql_del .= " AND entity = ".((int) $conf->entity);
 	dol_syslog("societe.php ".$sql);
 	$result1 = $db->query($sql_del);
 
 	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
-	$sql .= " VALUES ('".$db->escape($value)."', '".$db->escape($type)."', ".$conf->entity.", ";
+	$sql .= " VALUES ('".$db->escape($value)."', '".$db->escape($type)."', ".((int) $conf->entity).", ";
 	$sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";
 	$sql .= (!empty($scandir) ? "'".$db->escape($scandir)."'" : "null");
 	$sql .= ")";
@@ -169,6 +170,20 @@ if ($action == 'setdoc') {
 	}
 }
 
+//Activate Set accountancy code customer invoice mandatory
+if ($action == "setaccountancycodecustomerinvoicemandatory") {
+	$setaccountancycodecustomerinvoicemandatory = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_INVOICE_MANDATORY", $setaccountancycodecustomerinvoicemandatory, 'yesno', 0, '', $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+	}
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
+
 //Activate Set ref in list
 if ($action == "setaddrefinlist") {
 	$setaddrefinlist = GETPOST('value', 'int');
@@ -183,6 +198,20 @@ if ($action == "setaddrefinlist") {
 	}
 }
 
+//Activate Set vat in list
+if ($action == "setvatinlist") {
+	$setvatinlist = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "SOCIETE_SHOW_VAT_IN_LIST", $setvatinlist, 'yesno', 0, '', $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+	}
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
+
 //Activate Set adress in list
 if ($action == "setaddadressinlist") {
 	$val = GETPOST('value', 'int');
@@ -391,7 +420,7 @@ foreach ($arrayofmodules as $file => $modCodeTiers) {
 		$disabled = (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? true : false);
 		print '<td class="center">';
 		if (!$disabled) {
-			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&token='.newToken().'&value='.urlencode($file).'">';
 		}
 		print img_picto($langs->trans("Disabled"), 'switch_off');
 		if (!$disabled) {
@@ -468,7 +497,7 @@ foreach ($arrayofmodules as $file => $modCodeCompta) {
 		print img_picto($langs->trans("Activated"), 'switch_on');
 		print '</td>';
 	} else {
-		print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+		print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&token='.newToken().'&value='.urlencode($file).'">';
 		print img_picto($langs->trans("Disabled"), 'switch_off');
 		print '</a></td>';
 	}
@@ -560,7 +589,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&value='.$name.'&token='.newToken().'&scan_dir='.$module->scandir.'&label='.urlencode($module->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 img_picto($langs->trans("Enabled"), 'switch_on');
 							print '</a>';
 						//}
@@ -576,7 +605,7 @@ foreach ($dirsociete as $dirroot) {
 							print "</td>";
 						} else {
 							print '<td class="center">'."\n";
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&token='.newToken().'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							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 "</td>";
 						}
 					}
@@ -695,6 +724,23 @@ foreach ($profid as $key => $val) {
 	$i++;
 }
 
+if ($conf->accounting->enabled) {
+	print '<tr class="oddeven">';
+	print '<td colspan="2">'.$langs->trans('CustomerAccountancyCodeShort')."</td>\n";
+	print '<td colspan="2"></td>';
+
+	if (!empty($conf->global->SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_INVOICE_MANDATORY)) {
+		print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaccountancycodecustomerinvoicemandatory&token='.newToken().'&value=0">';
+		print img_picto($langs->trans("Activated"), 'switch_on');
+		print '</a></td>';
+	} else {
+		print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaccountancycodecustomerinvoicemandatory&token='.newToken().'&value=1">';
+		print img_picto($langs->trans("Disabled"), 'switch_off');
+		print '</a></td>';
+	}
+	print "</tr>\n";
+}
+
 print "</table>\n";
 print '</div>';
 
@@ -732,7 +778,7 @@ if (!$conf->use_javascript_ajax) {
 	'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
 	'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
 	);
-	print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT", $arrval, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
+	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 "</td>";
@@ -753,7 +799,7 @@ if (!$conf->use_javascript_ajax) {
 	'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
 	'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
 	);
-	print $form->selectarray("activate_CONTACT_USE_SEARCH_TO_SELECT", $arrval, $conf->global->CONTACT_USE_SEARCH_TO_SELECT, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
+	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 "</td>";
@@ -776,6 +822,20 @@ if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST)) {
 print '</a></td>';
 print '</tr>';
 
+print '<tr class="oddeven">';
+print '<td width="80%">'.$langs->trans("AddVatInList").'</td>';
+print '<td>&nbsp;</td>';
+print '<td class="center">';
+if (!empty($conf->global->SOCIETE_SHOW_VAT_IN_LIST)) {
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setvatinlist&token='.newToken().'&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+} else {
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setvatinlist&token='.newToken().'&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+}
+print '</a></td>';
+print '</tr>';
+
 print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("AddAdressInList").'</td>';
 print '<td>&nbsp;</td>';
@@ -805,7 +865,7 @@ print '</a></td>';
 print '</tr>';
 
 if (!empty($conf->expedition->enabled)) {
-	if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {	// Visible on experimental only because seems to not be implemented everywhere (only on proposal)
+	if (getDolGlobalInt('MAIN_FEATURES_LEVEL') > 0) {	// Visible on experimental only because seems to not be implemented everywhere (only on proposal)
 		print '<tr class="oddeven">';
 		print '<td width="80%">'.$langs->trans("AskForPreferredShippingMethod").'</td>';
 		print '<td>&nbsp;</td>';
@@ -842,7 +902,7 @@ if (empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("DefaultCustomerType").'</td>';
 	print '<td>';
-	print $formcompany->selectProspectCustomerType($conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT, 'defaultcustomertype', 'defaultcustomertype', 'admin');
+	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").'">';
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index ec59482b345..1aa7093299d 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -52,8 +52,8 @@ if ($user->socid) {
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/societe/ajax/ajaxcompanies.php b/htdocs/societe/ajax/ajaxcompanies.php
index 9295c363206..cbbcb14f361 100644
--- a/htdocs/societe/ajax/ajaxcompanies.php
+++ b/htdocs/societe/ajax/ajaxcompanies.php
@@ -87,8 +87,18 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn', 'int
 		$socid = GETPOST('id_fourn', 'int');
 	}
 
-	$sql = "SELECT rowid, nom";
+	$sql = "SELECT s.rowid, s.nom";
+	if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST)) {
+		$sql .= ", s.client, s.fournisseur, s.code_client, s.code_fournisseur";
+	}
+	if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+		$sql .= ", s.address, s.zip, s.town";
+		$sql .= ", dictp.code as country_code";
+	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid = s.fk_pays";
+	}
 	$sql .= " WHERE s.entity IN (".getEntity('societe').")";
 	if ($socid) {
 		$sql .= " AND (";
@@ -114,7 +124,24 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn', 'int
 	$resql = $db->query($sql);
 	if ($resql) {
 		while ($row = $db->fetch_array($resql)) {
-			$label = $row['nom'];
+			$label = '';
+			if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST)) {
+				if (($row['client']) && (!empty($row['code_client']))) {
+					$label = $row['code_client'].' - ';
+				}
+				if (($row['fournisseur']) && (!empty($row['code_fournisseur']))) {
+					$label .= $row['code_fournisseur'].' - ';
+				}
+			}
+
+			$label .= $row['nom'];
+
+			if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+				$label .= ($row['address'] ? ' - '.$row['address'] : '').($row['zip'] ? ' - '.$row['zip'] : '').($row['town'] ? ' '.$row['town'] : '');
+				if (!empty($row['country_code'])) {
+					$label .= ', '.$langs->trans('Country'.$row['country_code']);
+				}
+			}
 			if ($socid) {
 				$label = preg_replace('/('.preg_quote($socid, '/').')/i', '<strong>$1</strong>', $label, 1);
 			}
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index b2578ea6562..9dfe3909393 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -44,7 +44,7 @@ if (!defined('NOCSRFCHECK')) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-$htmlname = GETPOST('htmlname', 'alpha');
+$htmlname = GETPOST('htmlname', 'aZ09');
 $filter = GETPOST('filter', 'alpha');
 $outjson = (GETPOST('outjson', 'int') ? GETPOST('outjson', 'int') : 0);
 $action = GETPOST('action', 'aZ09');
@@ -102,7 +102,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
 	// Filter on the company to search can be:
 	// Into an array with key $htmlname123 (we take first one found). Which page use this ?
 	// Into a var with name $htmlname can be 'prodid', 'productid', ...
-	$match = preg_grep('/('.$htmlname.'[0-9]+)/', array_keys($_GET));
+	$match = preg_grep('/('.preg_quote($htmlname, '/').'[0-9]+)/', array_keys($_GET));
 	sort($match);
 
 	$id = (!empty($match[0]) ? $match[0] : '');		// Take first key found into GET array with matching $htmlname123
@@ -114,7 +114,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
 		return;
 	}
 
-	if (!is_object($form)) {
+	if (empty($form) || !is_object($form)) {
 		$form = new Form($db);
 	}
 
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index ea6aaa8d14e..4ef3d64a424 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -118,7 +118,7 @@ abstract class ActionsCardCommon
 
 		if ($action == 'create') {
 			if ($conf->use_javascript_ajax) {
-				$this->tpl['ajax_selecttype'] = "\n".'<script type="text/javascript" language="javascript">
+				$this->tpl['ajax_selecttype'] = "\n".'<script type="text/javascript">
 				$(document).ready(function () {
 		              $("#radiocompany").click(function() {
                             document.formsoc.action.value="create";
@@ -139,7 +139,7 @@ abstract class ActionsCardCommon
 
 		if ($action == 'create' || $action == 'edit') {
 			if ($conf->use_javascript_ajax) {
-				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
+				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript">
 				$(document).ready(function () {
 						$("#selectcountry_id").change(function() {
 							document.formsoc.action.value="'.$action.'";
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
index c9ebc56533e..7aa46178235 100644
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -103,7 +103,7 @@ class ActionsCardCompany extends ActionsCardCommon
 
 		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_DISABLEVATCHECK)) {
 			$js = "\n";
-			$js .= '<script language="JavaScript" type="text/javascript">';
+			$js .= '<script type="text/javascript">';
 			$js .= "function CheckVAT(a) {\n";
 			$js .= "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
 			$js .= "}\n";
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index 8169a6ca22f..e57421bf8b5 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -62,7 +62,7 @@ print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company
 	<td><?php echo $langs->trans('CustomerCode'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['code_client']; ?>
 	<?php if ($this->control->tpl['checkcustomercode'] <> 0) { ?>
-	<font class="error">(<?php echo $langs->trans("WrongCustomerCode"); ?>)</font>
+	<span class="error">(<?php echo $langs->trans("WrongCustomerCode"); ?>)</span>
 	<?php } ?>
 	</td>
 </tr>
@@ -73,7 +73,7 @@ print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company
 	<td><?php echo $langs->trans('SupplierCode'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['code_fournisseur']; ?>
 	<?php if ($this->control->tpl['checksuppliercode'] <> 0) { ?>
-	<font class="error">(<?php echo $langs->trans("WrongSupplierCode"); ?>)</font>
+	<span class="error">(<?php echo $langs->trans("WrongSupplierCode"); ?>)</span>
 	<?php } ?>
 	</td>
 </tr>
@@ -134,7 +134,7 @@ for ($i = 1; $i <= 4; $i++) {
 			if ($this->control->tpl['checkprofid'.$i] > 0) {
 				echo ' &nbsp; '.$this->control->tpl['urlprofid'.$i];
 			} else {
-				echo ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+				echo ' <span class="error">('.$langs->trans("ErrorWrongValue").')</span>';
 			}
 		}
 		echo '</td>';
@@ -260,14 +260,14 @@ for ($i = 1; $i <= 4; $i++) {
 
 <div class="tabsAction">
 <?php if ($user->rights->societe->creer) { ?>
-<a class="butAction" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=edit&amp;canvas='.$canvas; ?>"><?php echo $langs->trans("Modify"); ?></a>
+<a class="butAction" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&action=edit&token='.newToken().'&canvas='.urlencode($canvas); ?>"><?php echo $langs->trans("Modify"); ?></a>
 <?php } ?>
 
 <?php if ($user->rights->societe->supprimer) { ?>
 	<?php if ($conf->use_javascript_ajax) { ?>
 		<span id="action-delete" class="butActionDelete"><?php echo $langs->trans('Delete'); ?></span>
 	<?php } else { ?>
-		<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=delete&amp;token='.newToken().'&amp;canvas='.$canvas; ?>"><?php echo $langs->trans('Delete'); ?></a>
+		<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&action=delete&token='.newToken().'&canvas='.urlencode($canvas); ?>"><?php echo $langs->trans('Delete'); ?></a>
 	<?php } ?>
 <?php } ?>
 </div>
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index f058d38cd7c..16cd9f1e637 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -57,7 +57,7 @@ if ($this->control->tpl['action_delete']) {
 	<td><?php echo $langs->trans('CustomerCode'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['code_client']; ?>
 	<?php if ($this->control->tpl['checkcustomercode'] <> 0) { ?>
-	<font class="error">(<?php echo $langs->trans("WrongCustomerCode"); ?>)</font>
+	<span class="error">(<?php echo $langs->trans("WrongCustomerCode"); ?>)</span>
 	<?php } ?>
 	</td>
 </tr>
@@ -68,7 +68,7 @@ if ($this->control->tpl['action_delete']) {
 	<td><?php echo $langs->trans('SupplierCode'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['code_fournisseur']; ?>
 	<?php if ($this->control->tpl['checksuppliercode'] <> 0) { ?>
-	<font class="error">(<?php echo $langs->trans("WrongSupplierCode"); ?>)</font>
+	<span class="error">(<?php echo $langs->trans("WrongSupplierCode"); ?>)</span>
 	<?php } ?>
 	</td>
 </tr>
@@ -187,14 +187,14 @@ if ($this->control->tpl['action_delete']) {
 
 <div class="tabsAction">
 <?php if ($user->rights->societe->creer) { ?>
-<a class="butAction" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=edit&amp;canvas='.$canvas; ?>"><?php echo $langs->trans("Modify"); ?></a>
+<a class="butAction" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&action=edit&token='.newToken().'&canvas='.urlencode($canvas); ?>"><?php echo $langs->trans("Modify"); ?></a>
 <?php } ?>
 
 <?php if ($user->rights->societe->supprimer) { ?>
 	<?php if ($conf->use_javascript_ajax) { ?>
 		<span id="action-delete" class="butActionDelete"><?php echo $langs->trans('Delete'); ?></span>
 	<?php } else { ?>
-		<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=delete&amp;token='.newToken().'&amp;canvas='.$canvas; ?>"><?php echo $langs->trans('Delete'); ?></a>
+		<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&action=delete&token='.newToken().'&canvas='.urlencode($canvas); ?>"><?php echo $langs->trans('Delete'); ?></a>
 	<?php } ?>
 <?php } ?>
 </div>
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 668d8199b16..10edb21483e 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-2013  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2011-2021  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>
@@ -75,8 +75,11 @@ if (!empty($conf->incoterm->enabled)) {
 if (!empty($conf->notification->enabled)) {
 	$langs->load("mails");
 }
+if (!empty($conf->accounting->enabled)) {
+	$langs->load("products");
+}
 
-$mesg = ''; $error = 0; $errors = array();
+$error = 0; $errors = array();
 
 $action		= (GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view');
 $cancel		= GETPOST('cancel', 'alpha');
@@ -90,6 +93,7 @@ if ($user->socid) {
 if (empty($socid) && $action == 'view') {
 	$action = 'create';
 }
+$id = $socid;
 
 $object = new Societe($db);
 $extrafields = new ExtraFields($db);
@@ -154,12 +158,27 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/societe/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.'/societe/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
 	if ($cancel) {
-		$action = '';
-		if (!empty($backtopage)) {
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
+		$action = '';
 	}
 
 	if ($action == 'confirm_merge' && $confirm == 'yes' && $user->rights->societe->creer) {
@@ -185,7 +204,7 @@ if (empty($reshook)) {
 				$object->client = $object->client | $soc_origin->client;
 				$object->fournisseur = $object->fournisseur | $soc_origin->fournisseur;
 				$listofproperties = array(
-					'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'twitter', 'facebook', 'linkedin', 'socialnetworks', 'url', 'barcode',
+					'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'socialnetworks', 'url', 'barcode',
 					'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
 					'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
 					'stcomm_id', 'outstanding_limit', 'price_level', 'parent', 'default_lang', 'ref', 'ref_ext', 'import_key', 'fk_incoterms', 'fk_multicurrency',
@@ -427,22 +446,20 @@ if (empty($reshook)) {
 				$object->name = dolGetFirstLastname(GETPOST('firstname', 'alphanohtml'), GETPOST('name', 'alphanohtml'));
 				$object->civility_id		= GETPOST('civility_id', 'alphanohtml'); // Note: civility id is a code, not an int
 				// Add non official properties
-				$object->name_bis = GETPOST('name', 'alphanohtml');
-				$object->firstname = GETPOST('firstname', 'alphanohtml');
+				$object->name_bis			= GETPOST('name', 'alphanohtml');
+				$object->firstname			= GETPOST('firstname', 'alphanohtml');
 			} else {
-				$object->name = GETPOST('name', 'alphanohtml');
+				$object->name				= GETPOST('name', 'alphanohtml');
 			}
 			$object->entity					= (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : $conf->entity);
-			$object->name_alias = GETPOST('name_alias', 'alphanohtml');
+			$object->name_alias				= GETPOST('name_alias', 'alphanohtml');
+			$object->parent					= GETPOST('parent_company_id', 'int');
 			$object->address				= GETPOST('address', 'alphanohtml');
-			$object->zip = GETPOST('zipcode', 'alphanohtml');
-			$object->town = GETPOST('town', 'alphanohtml');
-			$object->country_id = GETPOST('country_id', 'int');
-			$object->state_id = GETPOST('state_id', 'int');
-			//$object->skype					= GETPOST('skype', 'alpha');
-			//$object->twitter				= GETPOST('twitter', 'alpha');
-			//$object->facebook				= GETPOST('facebook', 'alpha');
-			//$object->linkedin				= GETPOST('linkedin', 'alpha');
+			$object->zip					= GETPOST('zipcode', 'alphanohtml');
+			$object->town					= GETPOST('town', 'alphanohtml');
+			$object->country_id				= GETPOST('country_id', 'int');
+			$object->state_id				= GETPOST('state_id', 'int');
+
 			$object->socialnetworks = array();
 			if (!empty($conf->socialnetworks->enabled)) {
 				foreach ($socialnetworks as $key => $value) {
@@ -451,9 +468,10 @@ if (empty($reshook)) {
 					}
 				}
 			}
-			$object->phone = GETPOST('phone', 'alpha');
+
+			$object->phone					= GETPOST('phone', 'alpha');
 			$object->fax					= GETPOST('fax', 'alpha');
-			$object->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
+			$object->email					= trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
 			$object->url					= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
 			$object->idprof1				= trim(GETPOST('idprof1', 'alphanohtml'));
 			$object->idprof2				= trim(GETPOST('idprof2', 'alphanohtml'));
@@ -463,7 +481,7 @@ if (empty($reshook)) {
 			$object->idprof6				= trim(GETPOST('idprof6', 'alphanohtml'));
 			$object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
 			$object->code_client			= GETPOSTISSET('customer_code') ?GETPOST('customer_code', 'alpha') : GETPOST('code_client', 'alpha');
-			$object->code_fournisseur = GETPOSTISSET('supplier_code') ?GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
+			$object->code_fournisseur		= GETPOSTISSET('supplier_code') ?GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
 			$object->capital				= GETPOST('capital', 'alphanohtml');
 			$object->barcode				= GETPOST('barcode', 'alphanohtml');
 
@@ -478,24 +496,24 @@ if (empty($reshook)) {
 			$object->localtax1_value		= GETPOST('lt1', 'alpha');
 			$object->localtax2_value		= GETPOST('lt2', 'alpha');
 
-			$object->forme_juridique_code = GETPOST('forme_juridique_code', 'int');
+			$object->forme_juridique_code	= GETPOST('forme_juridique_code', 'int');
 			$object->effectif_id			= GETPOST('effectif_id', 'int');
-			$object->typent_id = GETPOST('typent_id', 'int');
+			$object->typent_id				= GETPOST('typent_id', 'int');
 
 			$object->typent_code			= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code'); // Force typent_code too so check in verify() will be done on new type
 
-			$object->client = GETPOST('client', 'int');
+			$object->client					= GETPOST('client', 'int');
 			$object->fournisseur			= GETPOST('fournisseur', 'int');
 
-			$object->commercial_id = GETPOST('commercial_id', 'int');
-			$object->default_lang = GETPOST('default_lang');
+			$object->commercial_id			= GETPOST('commercial_id', 'int');
+			$object->default_lang			= GETPOST('default_lang');
 
 			// Webservices url/key
 			$object->webservices_url		= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
 			$object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
 
 			if (GETPOSTISSET('accountancy_code_sell')) {
-				$accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+				$accountancy_code_sell		= GETPOST('accountancy_code_sell', 'alpha');
 
 				if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
 					$object->accountancy_code_sell = '';
@@ -504,7 +522,7 @@ if (empty($reshook)) {
 				}
 			}
 			if (GETPOSTISSET('accountancy_code_buy')) {
-				$accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+				$accountancy_code_buy		= GETPOST('accountancy_code_buy', 'alpha');
 
 				if (empty($accountancy_code_buy) || $accountancy_code_buy == '-1') {
 					$object->accountancy_code_buy = '';
@@ -1026,10 +1044,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$object->zip = GETPOST('zipcode', 'alphanohtml');
 		$object->town = GETPOST('town', 'alphanohtml');
 		$object->state_id = GETPOST('state_id', 'int');
-		//$object->skype				= GETPOST('skype', 'alpha');
-		//$object->twitter			= GETPOST('twitter', 'alpha');
-		//$object->facebook			= GETPOST('facebook', 'alpha');
-		//$object->linkedin			= GETPOST('linkedin', 'alpha');
+
 		$object->socialnetworks = array();
 		if (!empty($conf->socialnetworks->enabled)) {
 			foreach ($socialnetworks as $key => $value) {
@@ -1038,6 +1053,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 			}
 		}
+
 		$object->phone				= GETPOST('phone', 'alpha');
 		$object->fax				= GETPOST('fax', 'alpha');
 		$object->email				= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
@@ -1297,6 +1313,16 @@ 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">';
@@ -1367,7 +1393,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if (!empty($conf->barcode->enabled)) {
 			print '<tr><td>'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
 			print '<td colspan="3">';
-			print img_picto('', 'barcode');
+			print img_picto('', 'barcode', 'class="pictofixedwidth"');
 			print '<input type="text" name="barcode" id="barcode" value="'.dol_escape_htmltag($object->barcode).'">';
 			print '</td></tr>';
 		}
@@ -1391,13 +1417,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</tr><tr>';
 		}
 		print '<td class="tdtop">'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
-		print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
+		print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth150 quatrevingtpercent');
 		print $form->widgetForTranslation("town", $object, $permissiontoadd, 'string', 'alphanohtml', 'maxwidth100 quatrevingtpercent');
 		print '</td></tr>';
 
 		// Country
 		print '<tr><td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
-		print img_picto('', 'country', 'class="paddingrightonly"');
+		print img_picto('', 'country', 'class="pictofixedwidth"');
 		print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 maxwidth500 widthcentpercentminusx');
 		if ($user->admin) {
 			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
@@ -1423,16 +1449,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Phone / Fax
 		print '<tr><td>'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
-		print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+		print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
 		if ($conf->browser->layout == 'phone') {
 			print '</tr><tr>';
 		}
 		print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
-		print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
+		print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
 
 		// Email / Web
 		print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', empty($conf->global->SOCIETE_EMAIL_MANDATORY) ? '' : $conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
-		print '<td'.(($conf->browser->layout == 'phone') || empty($conf->mailing->enabled) ? ' colspan="3"' : '').'>'.img_picto('', 'object_email').' <input type="text" class="maxwidth200 widthcentpercentminusx" name="email" id="email" value="'.$object->email.'"></td>';
+		print '<td'.(($conf->browser->layout == 'phone') || empty($conf->mailing->enabled) ? ' colspan="3"' : '').'>'.img_picto('', 'object_email', 'class="pictofixedwidth"').' <input type="text" class="maxwidth200 widthcentpercentminusx" name="email" id="email" value="'.$object->email.'"></td>';
 		if (!empty($conf->mailing->enabled) && !empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
@@ -1442,8 +1468,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 		print '</tr>';
 		print '<tr><td>'.$form->editfieldkey('Web', 'url', '', $object, 0).'</td>';
-		print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" class="maxwidth500 widthcentpercentminusx" name="url" id="url" value="'.$object->url.'"></td></tr>';
+		print '<td colspan="3">'.img_picto('', 'globe', 'class="pictofixedwidth"').' <input type="text" class="maxwidth500 widthcentpercentminusx" name="url" id="url" value="'.$object->url.'"></td></tr>';
 
+		// Social networks
 		if (!empty($conf->socialnetworks->enabled)) {
 			foreach ($socialnetworks as $key => $value) {
 				if ($value['active']) {
@@ -1451,9 +1478,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="'.dol_escape_htmltag(GETPOSTISSET($key) ? GETPOST($key, 'alphanohtml') : (empty($object->socialnetworks[$key]) ? '' : $object->socialnetworks[$key])).'">';
+					print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100 maxwidth300 widthcentpercentminusx" 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])) {
@@ -1511,7 +1538,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 				$heightpopup = 400;
 				print "\n";
-				print '<script language="JavaScript" type="text/javascript">';
+				print '<script type="text/javascript">';
 				print "function CheckVAT(a) {\n";
 				print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a, '".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."', ".$widthpopup.", ".$heightpopup.");\n";
 				print "}\n";
@@ -1520,7 +1547,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				$s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
 				$s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
 			} else {
-				$s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
+				$s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" target="_blank" rel="noopener noreferrer">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 			}
 		}
 		print $s;
@@ -1588,7 +1615,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		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').$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 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>';
 		}
@@ -1610,14 +1637,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			//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').$form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+			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">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_CONTACT, null, 'parent', null, null, 1);
-				print img_picto('', 'category').$form->multiselectarray('contcats', $cate_arbo, GETPOST('contcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+				print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('contcats', $cate_arbo, GETPOST('contcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 				print "</td></tr>";
 			}
 
@@ -1625,7 +1652,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			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="visibleifsupplier"><td class="toptd">'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).'</td><td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1);
-				print img_picto('', 'category').$form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+				print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 				print "</td></tr>";
 			}
 		}
@@ -1698,16 +1725,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		print dol_get_fiche_end();
 
-		print '<div class="center">';
-		print '<input type="submit" class="button" name="create" value="'.$langs->trans('AddThirdParty').'">';
-		if (!empty($backtopage)) {
-			print ' &nbsp; &nbsp; ';
-			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-		} else {
-			print ' &nbsp; &nbsp; ';
-			print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-		}
-		print '</div>'."\n";
+		print $form->buttonsSaveCancel("AddThirdParty");
 
 		print '</form>'."\n";
 	} elseif ($action == 'edit') {
@@ -1758,20 +1776,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if (GETPOSTISSET('name')) {
 				// We overwrite with values if posted
 				$object->name = GETPOST('name', 'alphanohtml');
-				$object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
+				$object->name_alias = GETPOST('name_alias', 'alphanohtml');
+				$object->prefix_comm = GETPOST('prefix_comm', 'alphanohtml');
 				$object->client = GETPOST('client', 'int');
-				$object->code_client			= GETPOST('customer_code', 'alpha');
-				$object->fournisseur			= GETPOST('fournisseur', 'int');
+				$object->code_client = GETPOST('customer_code', 'alpha');
+				$object->fournisseur = GETPOST('fournisseur', 'int');
 				$object->code_fournisseur = GETPOST('supplier_code', 'alpha');
 				$object->address = GETPOST('address', 'alphanohtml');
 				$object->zip = GETPOST('zipcode', 'alphanohtml');
 				$object->town = GETPOST('town', 'alphanohtml');
 				$object->country_id = GETPOST('country_id') ?GETPOST('country_id', 'int') : $mysoc->country_id;
 				$object->state_id = GETPOST('state_id', 'int');
-				//$object->skype				= GETPOST('skype', 'alpha');
-				//$object->twitter				= GETPOST('twitter', 'alpha');
-				//$object->facebook				= GETPOST('facebook', 'alpha');
-				//$object->linkedin				= GETPOST('linkedin', 'alpha');
+
 				$object->socialnetworks = array();
 				if (!empty($conf->socialnetworks->enabled)) {
 					foreach ($socialnetworks as $key => $value) {
@@ -1780,6 +1796,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						}
 					}
 				}
+
 				$object->phone					= GETPOST('phone', 'alpha');
 				$object->fax					= GETPOST('fax', 'alpha');
 				$object->email					= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
@@ -2228,7 +2245,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					}
 					$heightpopup = 400;
 					print "\n";
-					print '<script language="JavaScript" type="text/javascript">';
+					print '<script type="text/javascript">';
 					print "function CheckVAT(a) {\n";
 					print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."', ".$widthpopup.", ".$heightpopup.");\n";
 					print "}\n";
@@ -2237,7 +2254,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					$s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
 					$s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
 				} else {
-					$s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
+					$s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank" rel="noopener noreferrer">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 				}
 			}
 			print $s;
@@ -2274,7 +2291,7 @@ 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 '"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
+			print '"> <span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
 
 			// Default language
 			if (!empty($conf->global->MAIN_MULTILANGS)) {
@@ -2416,11 +2433,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			print dol_get_fiche_end();
 
-			print '<div class="center">';
-			print '<input type="submit" class="button button-save" name="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 $form->buttonsSaveCancel();
 
 			print '</form>';
 		}
@@ -2482,7 +2495,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<div class="fichehalfleft">';
 
 		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border tableforfield" width="100%">';
+		print '<table class="border tableforfield centpercent">';
 
 		// Type Prospect/Customer/Supplier
 		print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
@@ -2504,7 +2517,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client));
 			$tmpcheck = $object->check_codeclient();
 			if ($tmpcheck != 0 && $tmpcheck != -5) {
-				print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+				print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
 			}
 			print '</td>';
 			print '</tr>';
@@ -2517,7 +2530,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
 			$tmpcheck = $object->check_codefournisseur();
 			if ($tmpcheck != 0 && $tmpcheck != -5) {
-				print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+				print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
 			}
 			print '</td>';
 			print '</tr>';
@@ -2540,12 +2553,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr>';
 				print '<td>'.$idprof.'</td><td>';
 				$key = 'idprof'.$i;
-				print showValueWithClipboardCPButton(dol_escape_htmltag($object->$key));
+				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);
 					} else {
-						print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+						print ' <span class="error">('.$langs->trans("ErrorWrongValue").')</span>';
 					}
 				}
 				print '</td>';
@@ -2585,11 +2598,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
 					print '<input type="hidden" name="action" value="set_localtax1">';
 					print '<input type="hidden" name="token" value="'.newToken().'">';
-					print '<tr><td>'.$langs->transcountry("Localtax1", $mysoc->country_code).' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
+					print '<tr><td>'.$langs->transcountry("Localtax1", $mysoc->country_code).' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editRE&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
 					if ($action == 'editRE') {
 						print '<td class="left">';
 						$formcompany->select_localtax(1, $object->localtax1_value, "lt1");
-						print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+						print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
 					} else {
 						print '<td>'.$object->localtax1_value.'</td>';
 					}
@@ -2599,11 +2612,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
 					print '<input type="hidden" name="action" value="set_localtax2">';
 					print '<input type="hidden" name="token" value="'.newToken().'">';
-					print '<tr><td>'.$langs->transcountry("Localtax2", $mysoc->country_code).'<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
+					print '<tr><td>'.$langs->transcountry("Localtax2", $mysoc->country_code).'<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
 					if ($action == 'editIRPF') {
 						print '<td class="left">';
 						$formcompany->select_localtax(2, $object->localtax2_value, "lt2");
-						print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+						print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
 					} else {
 						print '<td>'.$object->localtax2_value.'</td>';
 					}
@@ -2617,11 +2630,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
 					print '<input type="hidden" name="action" value="set_localtax1">';
 					print '<input type="hidden" name="token" value="'.newToken().'">';
-					print '<tr><td> '.$langs->transcountry("Localtax1", $mysoc->country_code).'<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
+					print '<tr><td> '.$langs->transcountry("Localtax1", $mysoc->country_code).'<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editRE&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
 					if ($action == 'editRE') {
 						print '<td class="left">';
 						$formcompany->select_localtax(1, $object->localtax1_value, "lt1");
-						print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+						print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
 					} else {
 						print '<td>'.$object->localtax1_value.'</td>';
 					}
@@ -2635,11 +2648,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
 					print '<input type="hidden" name="action" value="set_localtax2">';
 					print '<input type="hidden" name="token" value="'.newToken().'">';
-					print '<tr><td> '.$langs->transcountry("Localtax2", $mysoc->country_code).' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
+					print '<tr><td> '.$langs->transcountry("Localtax2", $mysoc->country_code).' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
 					if ($action == 'editIRPF') {
 						print '<td class="left">';
 						$formcompany->select_localtax(2, $object->localtax2_value, "lt2");
-						print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+						print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
 					} else {
 						print '<td>'.$object->localtax2_value.'</td>';
 					}
@@ -2653,7 +2666,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
 		if ($object->tva_intra) {
 			$s = '';
-			$s .= showValueWithClipboardCPButton(dol_escape_htmltag($object->tva_intra));
+			$s .= dol_print_profids($object->tva_intra, 'VATIntra', $object->country_code, 1);
 			$s .= '<input type="hidden" id="tva_intra" name="tva_intra" maxlength="20" value="'.$object->tva_intra.'">';
 
 			if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object)) {
@@ -2666,7 +2679,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					}
 					$heightpopup = 400;
 					print "\n";
-					print '<script language="JavaScript" type="text/javascript">';
+					print '<script type="text/javascript">';
 					print "function CheckVAT(a) {\n";
 					print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?vatNumber='+a, '".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."', ".$widthpopup.", ".$heightpopup.");\n";
 					print "}\n";
@@ -2675,7 +2688,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					$s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
 					$s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
 				} else {
-					$s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
+					$s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank" rel="noopener noreferrer">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 				}
 			}
 			print $s;
@@ -2708,10 +2721,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '</table>';
 		print '</div>';
 
-		print '<div class="fichehalfright"><div class="ficheaddleft">';
+		print '<div class="fichehalfright">';
 
 		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border tableforfield" width="100%">';
+		print '<table class="border tableforfield centpercent">';
 
 		// Tags / categories
 		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
@@ -2737,7 +2750,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('ThirdPartyType').'</td>';
 		if ($action != 'editthirdpartytype' && $user->rights->societe->creer) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdpartytype&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdpartytype&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
@@ -2780,7 +2793,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td>';
 			print '<table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans('IncotermLabel').'</td>';
 			if ($action != 'editincoterm' && $user->rights->societe->creer) {
-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=editincoterm">'.img_edit('', 1).'</a></td>';
+				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit('', 1).'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td><td colspan="3">';
@@ -2844,7 +2857,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td>';
 			print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('ParentCompany').'</td>';
 			if ($action != 'editparentcompany' && $user->rights->societe->creer) {
-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td><td>';
@@ -2881,7 +2894,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '</table>';
 		print '</div>';
 
-		print '</div></div>';
+		print '</div>';
 		print '<div style="clear:both"></div>';
 
 		print dol_get_fiche_end();
@@ -2916,7 +2929,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 
 				if ($user->rights->societe->creer) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>'."\n";
 				}
 
 				if (!empty($conf->adherent->enabled)) {
@@ -2935,7 +2948,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)) {	// We can't use preloaded confirm form with jmobile
 						print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
 					} else {
-						print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+						print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
 					}
 				}
 			}
@@ -2970,18 +2983,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				$result = show_subsidiaries($conf, $langs, $db, $object);
 			}
 
-			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+			print '</div><div class="fichehalfright">';
 
 			$MAXEVENT = 10;
 
-			$morehtmlright = 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-list-alt imgforviewmode', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id);
 
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
-			$somethingshown = $formactions->showactions($object, '', $socid, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for thirdparty
+			$somethingshown = $formactions->showactions($object, '', $socid, 1, '', $MAXEVENT, '', $morehtmlcenter); // Show all action for thirdparty
 
-			print '</div></div></div>';
+			print '</div></div>';
 
 			if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD)) {
 				// Contacts list
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 21cd629dc67..dc88baf0c28 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -49,7 +49,7 @@ $vatNumber = GETPOST("vatNumber", 'alpha');
 
 if (!$vatNumber) {
 	print '<br>';
-	print '<font class="error">'.$langs->transnoentities("ErrorFieldRequired", $langs->trans("VATIntraShort")).'</font><br>';
+	print '<span class="error">'.$langs->transnoentities("ErrorFieldRequired", $langs->trans("VATIntraShort")).'</span><br>';
 } else {
 	$vatNumber = preg_replace('/\^\w/', '', $vatNumber);
 	$vatNumber = str_replace(array(' ', '.'), '', $vatNumber);
@@ -97,16 +97,16 @@ if (!$vatNumber) {
 
 	// Service indisponible
 	if (!is_array($result) || preg_match('/SERVICE_UNAVAILABLE/i', $result['faultstring'])) {
-		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
+		print '<span class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</span><br>';
 		$messagetoshow = $soapclient->response;
 	} elseif (preg_match('/TIMEOUT/i', $result['faultstring'])) {
-		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
+		print '<span class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</span><br>';
 		$messagetoshow = $soapclient->response;
 	} elseif (preg_match('/SERVER_BUSY/i', $result['faultstring'])) {
-		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
+		print '<span class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</span><br>';
 		$messagetoshow = $soapclient->response;
 	} elseif ($result['faultstring']) {
-		print '<font class="error">'.$langs->trans("Error").'</font><br>';
+		print '<span class="error">'.$langs->trans("Error").'</span><br>';
 		$messagetoshow = $result['faultstring'];
 	} elseif (preg_match('/INVALID_INPUT/i', $result['faultstring'])
 	|| ($result['requestDate'] && !$result['valid'])) {
@@ -114,26 +114,26 @@ if (!$vatNumber) {
 		if ($result['requestDate']) {
 			print $langs->trans("Date").': '.$result['requestDate'].'<br>';
 		}
-		print $langs->trans("VATIntraSyntaxIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
-		print $langs->trans("ValueIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
+		print $langs->trans("VATIntraSyntaxIsValid").': <span class="error">'.$langs->trans("No").'</span> (Might be a non europeen VAT)<br>';
+		print $langs->trans("ValueIsValid").': <span class="error">'.$langs->trans("No").'</span> (Might be a non europeen VAT)<br>';
 		//$messagetoshow=$soapclient->response;
 	} else {
 		// Syntaxe ok
 		if ($result['requestDate']) {
 			print $langs->trans("Date").': '.$result['requestDate'].'<br>';
 		}
-		print $langs->trans("VATIntraSyntaxIsValid").': <font class="ok">'.$langs->trans("Yes").'</font><br>';
+		print $langs->trans("VATIntraSyntaxIsValid").': <span class="ok">'.$langs->trans("Yes").'</span><br>';
 		print $langs->trans("ValueIsValid").': ';
 		if (preg_match('/MS_UNAVAILABLE/i', $result['faultstring'])) {
-			print '<font class="error">'.$langs->trans("ErrorVATCheckMS_UNAVAILABLE", $countryCode).'</font><br>';
+			print '<span class="error">'.$langs->trans("ErrorVATCheckMS_UNAVAILABLE", $countryCode).'</span><br>';
 		} else {
 			if (!empty($result['valid']) && ($result['valid'] == 1 || $result['valid'] == 'true')) {
-				print '<font class="ok">'.$langs->trans("Yes").'</font>';
+				print '<span	 class="ok">'.$langs->trans("Yes").'</span>';
 				print '<br>';
 				print $langs->trans("Name").': '.$result['name'].'<br>';
 				print $langs->trans("Address").': '.$result['address'].'<br>';
 			} else {
-				print '<font class="error">'.$langs->trans("No").'</font>';
+				print '<span	 class="error">'.$langs->trans("No").'</span>';
 				print '<br>'."\n";
 			}
 		}
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index f9124605438..89a29d7c4cd 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -216,8 +216,9 @@ class Contacts extends DolibarrApi
 
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 0257b692b62..47e893846e6 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -202,8 +202,9 @@ class Thirdparties extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -1799,6 +1800,11 @@ class Thirdparties extends DolibarrApi
 		unset($object->twitter);
 		unset($object->facebook);
 		unset($object->linkedin);
+		unset($object->instagram);
+		unset($object->snapchat);
+		unset($object->googleplus);
+		unset($object->youtube);
+		unset($object->whatsapp);
 
 		return $object;
 	}
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index 91e8cbc290b..4e55a914339 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -64,7 +64,7 @@ class Client extends Societe
 
 		$sql = "SELECT count(s.rowid) as nb, s.client";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 9b767cde34c..7ffbdccd85b 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -36,7 +36,14 @@ class CompanyBankAccount extends Account
 	public $socid;
 
 	public $default_rib;
+
+	/**
+	 * Value 'FRST' or 'RCUR' (For SEPA mandate). Warning, in database, we store 'RECUR'.
+	 *
+	 * @var string
+	 */
 	public $frstrecur;
+
 	public $rum;
 	public $date_rum;
 
@@ -72,7 +79,7 @@ class CompanyBankAccount extends Account
 
 
 	/**
-	 * Create bank information record
+	 * Create bank information record.
 	 *
 	 * @param   User   $user		User
 	 * @param   int    $notrigger   1=Disable triggers
@@ -80,9 +87,18 @@ class CompanyBankAccount extends Account
 	 */
 	public function create(User $user = null, $notrigger = 0)
 	{
-		$now	= dol_now();
+		$now = dol_now();
+
 		$error = 0;
-		// Correct default_rib to be sure to have always one default
+
+		// Check paramaters
+		if (empty($this->socid)) {
+			$this->error = 'BadValueForParameter';
+			return -1;
+		}
+
+		// Correct ->default_rib to not set the new account as default, if there is already 1. We want to be sure to have always 1 default for type = 'ban'.
+		// If we really want the new bank account to be the default, we must set it by calling setDefault() after creation.
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib where fk_soc = ".((int) $this->socid)." AND default_rib = 1 AND type = 'ban'";
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -171,7 +187,7 @@ class CompanyBankAccount extends Account
 		} else {
 			$sql .= ",label = NULL";
 		}
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -191,7 +207,7 @@ class CompanyBankAccount extends Account
 				return 1;
 			}
 		} else {
-			dol_print_error($this->db);
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -292,7 +308,7 @@ class CompanyBankAccount extends Account
 
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib";
-			$sql .= " WHERE rowid  = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			if (!$this->db->query($sql)) {
 				$error++;
@@ -333,12 +349,13 @@ class CompanyBankAccount extends Account
 	/**
 	 * Set a BAN as Default
 	 *
-	 * @param   int     $rib    RIB id
-	 * @return  int             0 if KO, 1 if OK
+	 * @param   int     $rib    			RIB id
+	 * @param	string	$resetolddefaultfor	Reset if we have already a default value for type = 'ban'
+	 * @return  int             			0 if KO, 1 if OK
 	 */
-	public function setAsDefault($rib = 0)
+	public function setAsDefault($rib = 0, $resetolddefaultfor = 'ban')
 	{
-		$sql1 = "SELECT rowid as id, fk_soc  FROM ".MAIN_DB_PREFIX."societe_rib";
+		$sql1 = "SELECT rowid as id, fk_soc FROM ".MAIN_DB_PREFIX."societe_rib";
 		$sql1 .= " WHERE rowid = ".($rib ? $rib : $this->id);
 
 		dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
@@ -352,13 +369,14 @@ class CompanyBankAccount extends Account
 				$this->db->begin();
 
 				$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0";
-				$sql2 .= " WHERE type = 'ban' AND fk_soc = ".((int) $obj->fk_soc);
-				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
+				$sql2 .= " WHERE fk_soc = ".((int) $obj->fk_soc);
+				if ($resetolddefaultfor) {
+					$sql2 .= " AND type = '".$this->db->escape($resetolddefaultfor)."'";
+				}
 				$result2 = $this->db->query($sql2);
 
 				$sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1";
 				$sql3 .= " WHERE rowid = ".((int) $obj->id);
-				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result3 = $this->db->query($sql3);
 
 				if (!$result2 || !$result3) {
@@ -406,6 +424,6 @@ class CompanyBankAccount extends Account
 		$this->date_rum        = dol_now() - 10000;
 		$this->frstrecur       = 'FRST';
 
-		$this->socid = 0;
+		$this->socid           = 1;
 	}
 }
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 1f11e6a29c3..ba924279ce2 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -325,6 +325,10 @@ class CompanyPaymentMode extends CommonObject
 		}
 
 		$result = $this->fetchCommon($id, $ref, $morewhere);
+
+		// For backward compatibility
+		$this->iban = $this->iban_prefix;
+
 		//if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
 		return $result;
 	}
@@ -394,7 +398,7 @@ class CompanyPaymentMode extends CommonObject
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-		$url = dol_buildpath('/monmodule/companypaymentmode_card.php', 1).'?id='.$this->id;
+		$url = '';
 
 		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
@@ -519,10 +523,10 @@ class CompanyPaymentMode extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
-			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled');
-			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled');
-			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled');
+			$this->labelStatus[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
 		}
 
 		$statusType = 'status5';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index c8b381280b1..a49bf478763 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2008       Patrick Raguin          <patrick.raguin@auguria.net>
  * Copyright (C) 2010-2018  Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
- * Copyright (C) 2013       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2021  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2013       Peter Fontaine          <contact@peterfontaine.fr>
  * Copyright (C) 2014-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
@@ -209,10 +209,10 @@ class Societe extends CommonObject
 		'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),
 		'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),
 		'order_min_amount' =>array('type'=>'double(24,8)', 'label'=>'Order min amount', 'enabled'=>'!empty($conf->commande->enabled) && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)', 'visible'=>-1, 'position'=>315, 'isameasure'=>1),
 		'supplier_order_min_amount' =>array('type'=>'double(24,8)', 'label'=>'Supplier order min amount', 'enabled'=>'!empty($conf->commande->enabled) && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)', 'visible'=>-1, 'position'=>320, 'isameasure'=>1),
-		'cond_reglement_supplier' =>array('type'=>'integer', 'label'=>'Cond reglement supplier', 'enabled'=>1, 'visible'=>-1, 'position'=>325),
 		'fk_shipping_method' =>array('type'=>'integer', 'label'=>'Fk shipping method', 'enabled'=>1, 'visible'=>-1, 'position'=>330),
 		'tva_assuj' =>array('type'=>'tinyint(4)', 'label'=>'Tva assuj', 'enabled'=>1, 'visible'=>-1, 'position'=>335),
 		'localtax1_assuj' =>array('type'=>'tinyint(4)', 'label'=>'Localtax1 assuj', 'enabled'=>1, 'visible'=>-1, 'position'=>340),
@@ -550,12 +550,6 @@ class Societe extends CommonObject
 	 */
 	public $code_fournisseur;
 
-	/**
-	 * Accounting code for client
-	 * @var string
-	 */
-	public $code_compta;
-
 	/**
 	 * Accounting code for client
 	 * @var string
@@ -563,11 +557,38 @@ class Societe extends CommonObject
 	public $code_compta_client;
 
 	/**
-	 * Accounting code for suppliers
+	 * Duplicate of code_compta_client (for backward compatibility)
+	 * @var string
+	 */
+	public $code_compta;
+
+
+	/**
+	 * Accounting code for customer
+	 * @var string
+	 */
+	public $accountancy_code_customer;
+
+	/**
+	 * Accounting code for supplier
 	 * @var string
 	 */
 	public $code_compta_fournisseur;
 
+	/**
+	 * Accounting code for supplier
+	 * @var string
+	 */
+	public $accountancy_code_supplier;
+
+
+	/**
+	 * Accounting code for product (for level 3 of suggestion of prouct accounting account)
+	 * @var string
+	 */
+	public $code_compta_product;
+
+
 	/**
 	 * @var string
 	 * @deprecated Note is split in public and private notes
@@ -838,8 +859,10 @@ class Societe extends CommonObject
 		}
 		$this->import_key = trim($this->import_key);
 
+		$this->accountancy_code_customer = trim($this->code_compta);
+		$this->accountancy_code_supplier = trim($this->code_compta_fournisseur);
 		$this->accountancy_code_buy = trim($this->accountancy_code_buy);
-		$this->accountancy_code_sell= trim($this->accountancy_code_sell);
+		$this->accountancy_code_sell = trim($this->accountancy_code_sell);
 
 		if (!empty($this->multicurrency_code)) {
 			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
@@ -890,9 +913,9 @@ class Societe extends CommonObject
 				$sql .= ", accountancy_code_buy";
 				$sql .= ", accountancy_code_sell";
 			}
-			$sql .= ") VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->db->escape($this->entity).", '".$this->db->idate($now)."'";
-			$sql .= ", ".(!empty($user->id) ? ((int) $user->id) : "null");
+			$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->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null");
 			$sql .= ", ".((int) $this->status);
 			$sql .= ", ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
@@ -903,8 +926,8 @@ class Societe extends CommonObject
 			$sql .= ", ".(int) $this->fk_multicurrency;
 			$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
 			if (empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-				$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
-				$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
+				$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
+				$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
 			}
 			$sql .= ")";
 
@@ -917,18 +940,22 @@ class Societe extends CommonObject
 
 				// update accountancy for this entity
 				if (!$error && !empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-					$this->db->query("DELETE FROM " . MAIN_DB_PREFIX . "societe_perentity WHERE fk_soc = " . $this->id . " AND entity = " . $conf->entity);
+					$this->db->query("DELETE FROM ".MAIN_DB_PREFIX."societe_perentity WHERE fk_soc = ".((int) $this->id)." AND entity = ".((int) $conf->entity));
 
-					$sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_perentity (";
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_perentity (";
 					$sql .= " fk_soc";
 					$sql .= ", entity";
+					$sql .= ", accountancy_code_customer";
+					$sql .= ", accountancy_code_supplier";
 					$sql .= ", accountancy_code_buy";
 					$sql .= ", accountancy_code_sell";
 					$sql .= ") VALUES (";
 					$sql .= $this->id;
-					$sql .= ", " . $conf->entity;
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
+					$sql .= ", ".$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)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
 					$sql .= ")";
 					$result = $this->db->query($sql);
 					if (!$result) {
@@ -1035,7 +1062,7 @@ class Societe extends CommonObject
 				$error++;
 				$this->error = $contact->error;
 				$this->errors = array_merge($this->errors, $contact->errors);
-				dol_syslog(get_class($this) . "::create_individual Affect Tag ERROR:" . $this->error, LOG_ERR);
+				dol_syslog(get_class($this)."::create_individual Affect Tag ERROR:".$this->error, LOG_ERR);
 				$contactId = $result;
 			}
 		}
@@ -1045,7 +1072,7 @@ class Societe extends CommonObject
 			if ($result < 0) {
 				$this->error = $contact->error;
 				$this->errors = array_merge($this->errors, $contact->errors);
-				dol_syslog(get_class($this) . "::create_individual set mailing status ERROR:" . $this->error, LOG_ERR);
+				dol_syslog(get_class($this)."::create_individual set mailing status ERROR:".$this->error, LOG_ERR);
 				$contactId = $result;
 			}
 		}
@@ -1281,7 +1308,7 @@ class Societe extends CommonObject
 		}
 
 		$this->code_compta_client = trim(empty($this->code_compta) ? $this->code_compta_client : $this->code_compta);
-		$this->code_compta = $this->code_compta_client;		// for backward compatbility
+		$this->code_compta = $this->code_compta_client; // for backward compatibility
 		$this->code_compta_fournisseur = trim($this->code_compta_fournisseur);
 
 		// Check parameters. More tests are done later in the ->verify()
@@ -1322,7 +1349,7 @@ class Societe extends CommonObject
 		$this->webservices_key = trim($this->webservices_key);
 
 		$this->accountancy_code_buy = trim($this->accountancy_code_buy);
-		$this->accountancy_code_sell= trim($this->accountancy_code_sell);
+		$this->accountancy_code_sell = trim($this->accountancy_code_sell);
 
 		//Incoterms
 		$this->fk_incoterms = (int) $this->fk_incoterms;
@@ -1449,8 +1476,16 @@ class Societe extends CommonObject
 			$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount != '' ? $this->supplier_order_min_amount : 'null');
 			$sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
 			if (empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-				$sql .= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy) . "'";
-				$sql .= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell) . "'";
+				$sql .= ", accountancy_code_buy = '".$this->db->escape($this->accountancy_code_buy)."'";
+				$sql .= ", accountancy_code_sell= '".$this->db->escape($this->accountancy_code_sell)."'";
+
+				if ($customer) {
+					$sql .= ", code_compta = ".(!empty($this->code_compta_client) ? "'".$this->db->escape($this->code_compta_client)."'" : "null");
+				}
+
+				if ($supplier) {
+					$sql .= ", code_compta_fournisseur = ".(($this->code_compta_fournisseur != "") ? "'".$this->db->escape($this->code_compta_fournisseur)."'" : "null");
+				}
 			}
 			$sql .= ",webservices_url = ".(!empty($this->webservices_url) ? "'".$this->db->escape($this->webservices_url)."'" : "null");
 			$sql .= ",webservices_key = ".(!empty($this->webservices_key) ? "'".$this->db->escape($this->webservices_key)."'" : "null");
@@ -1461,12 +1496,10 @@ class Societe extends CommonObject
 
 			if ($customer) {
 				$sql .= ", code_client = ".(!empty($this->code_client) ? "'".$this->db->escape($this->code_client)."'" : "null");
-				$sql .= ", code_compta = ".(!empty($this->code_compta_client) ? "'".$this->db->escape($this->code_compta_client)."'" : "null");
 			}
 
 			if ($supplier) {
 				$sql .= ", code_fournisseur = ".(!empty($this->code_fournisseur) ? "'".$this->db->escape($this->code_fournisseur)."'" : "null");
-				$sql .= ", code_compta_fournisseur = ".(($this->code_compta_fournisseur != "") ? "'".$this->db->escape($this->code_compta_fournisseur)."'" : "null");
 			}
 			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id : "null");
 			$sql .= ", fk_multicurrency = ".(int) $this->fk_multicurrency;
@@ -1535,18 +1568,22 @@ class Societe extends CommonObject
 
 				// update accountancy for this entity
 				if (!$error && !empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-					$this->db->query("DELETE FROM " . MAIN_DB_PREFIX . "societe_perentity WHERE fk_soc = " . $this->id . " AND entity = " . $conf->entity);
+					$this->db->query("DELETE FROM ".MAIN_DB_PREFIX."societe_perentity WHERE fk_soc = ".((int) $this->id)." AND entity = ".((int) $conf->entity));
 
-					$sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_perentity (";
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_perentity (";
 					$sql .= " fk_soc";
 					$sql .= ", entity";
+					$sql .= ", accountancy_code_customer";
+					$sql .= ", accountancy_code_supplier";
 					$sql .= ", accountancy_code_buy";
 					$sql .= ", accountancy_code_sell";
 					$sql .= ") VALUES (";
 					$sql .= $this->id;
-					$sql .= ", " . $conf->entity;
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
+					$sql .= ", ".$conf->entity;
+					$sql .= ", '".$this->db->escape($this->code_compta_client)."'";
+					$sql .= ", '".$this->db->escape($this->code_compta_fournisseur)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
 					$sql .= ")";
 					$result = $this->db->query($sql);
 					if (!$result) {
@@ -1646,11 +1683,11 @@ class Societe extends CommonObject
 		$sql .= ', s.fk_forme_juridique as forme_juridique_code';
 		$sql .= ', s.webservices_url, s.webservices_key, s.model_pdf';
 		if (empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-			$sql .= ', s.accountancy_code_buy, s.accountancy_code_sell';
+			$sql .= ', s.code_compta, s.code_compta_fournisseur, s.accountancy_code_buy, s.accountancy_code_sell';
 		} else {
-			$sql .= ', spe.accountancy_code_buy, spe.accountancy_code_sell';
+			$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.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
+		$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_account, s.tva_assuj';
 		$sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.transport_mode_supplier';
@@ -1674,7 +1711,7 @@ class Societe extends CommonObject
 		}
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 		if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
 		}
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as e ON s.fk_effectif = e.id';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
@@ -1764,7 +1801,7 @@ class Societe extends CommonObject
 				$this->state_id     = $obj->state_id;
 				$this->state_code   = $obj->state_code;
 				$this->region_id    = $obj->region_id;
-				$this->region_code   = $obj->region_code;
+				$this->region_code = $obj->region_code;
 				$this->state        = ($obj->state != '-' ? $obj->state : '');
 
 				$transcode = $langs->trans('StatusProspect'.$obj->fk_stcomm);
@@ -1794,7 +1831,8 @@ class Societe extends CommonObject
 				$this->code_client = $obj->code_client;
 				$this->code_fournisseur = $obj->code_fournisseur;
 
-				$this->code_compta = $obj->code_compta;
+				$this->code_compta = $obj->code_compta;			// For backward compatibility
+				$this->code_compta_client = $obj->code_compta;
 				$this->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
 				$this->barcode = $obj->barcode;
@@ -2011,6 +2049,15 @@ class Societe extends CommonObject
 
 			// Remove third party
 			if (!$error) {
+				if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_perentity";
+					$sql .= " WHERE fk_soc = ".((int) $id);
+					if (!$this->db->query($sql)) {
+						$error++;
+						$this->errors[] = $this->db->lasterror();
+					}
+				}
+
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe";
 				$sql .= " WHERE rowid = ".((int) $id);
 				if (!$this->db->query($sql)) {
@@ -2058,7 +2105,7 @@ class Societe extends CommonObject
 			}
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql .= " SET client = ".((int) $newclient);
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -2102,7 +2149,7 @@ class Societe extends CommonObject
 			// Position current discount
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
 			$sql .= " SET remise_client = '".$this->db->escape($remise)."'";
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$this->db->rollback();
@@ -2161,7 +2208,7 @@ class Societe extends CommonObject
 			// Position current discount
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
 			$sql .= " SET remise_supplier = '".$this->db->escape($remise)."'";
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$this->db->rollback();
@@ -2372,7 +2419,7 @@ class Societe extends CommonObject
 
 			$sql  = "INSERT INTO ".MAIN_DB_PREFIX."societe_prices";
 			$sql .= " (datec, fk_soc, price_level, fk_user_author)";
-			$sql .= " VALUES ('".$this->db->idate($now)."', ".$this->id.", ".((int) $price_level).", ".$user->id.")";
+			$sql .= " VALUES ('".$this->db->idate($now)."', ".((int) $this->id).", ".((int) $price_level).", ".((int) $user->id).")";
 
 			if (!$this->db->query($sql)) {
 				dol_print_error($this->db);
@@ -2401,7 +2448,7 @@ class Societe extends CommonObject
 
 			if (!$error) {
 				$sql = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux";
-				$sql .= " WHERE fk_soc = ".$this->id." AND fk_user = ".((int) $commid);
+				$sql .= " WHERE fk_soc = ".((int) $this->id)." AND fk_user = ".((int) $commid);
 
 				$resql = $this->db->query($sql);
 				if (!$resql) {
@@ -2413,7 +2460,7 @@ class Societe extends CommonObject
 			if (!$error) {
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_commerciaux";
 				$sql .= " (fk_soc, fk_user)";
-				$sql .= " VALUES (".$this->id.", ".$commid.")";
+				$sql .= " VALUES (".((int) $this->id).", ".((int) $commid).")";
 
 				$resql = $this->db->query($sql);
 				if (!$resql) {
@@ -2423,7 +2470,7 @@ class Societe extends CommonObject
 			}
 
 			if (!$error) {
-				$this->context = array('commercial_modified'=>$commid);
+				$this->context = array('commercial_modified' => $commid);
 
 				$result = $this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE', $user);
 				if ($result < 0) {
@@ -2464,7 +2511,7 @@ class Societe extends CommonObject
 
 		if ($this->id > 0 && $commid > 0) {
 			$sql  = "DELETE FROM  ".MAIN_DB_PREFIX."societe_commerciaux ";
-			$sql .= " WHERE fk_soc = ".$this->id." AND fk_user = ".((int) $commid);
+			$sql .= " WHERE fk_soc = ".((int) $this->id)." AND fk_user = ".((int) $commid);
 
 			if (!$this->db->query($sql)) {
 				dol_syslog(get_class($this)."::del_commercial Erreur");
@@ -2530,9 +2577,10 @@ class Societe extends CommonObject
 		$linkstart = ''; $linkend = '';
 
 		if (!empty($this->logo) && class_exists('Form')) {
-			$label .= '<div class="photointooltip">';
-			$label .= Form::showphoto('societe', $this, 0, 40, 0, '', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
-			$label .= '</div><div style="clear: both;"></div>';
+			$label .= '<div class="photointooltip floatright">';
+			$label .= Form::showphoto('societe', $this, 0, 40, 0, 'photoref', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
+			$label .= '</div>';
+			//$label .= '<div style="clear: both;"></div>';
 		} elseif (!empty($this->logo_squarred) && class_exists('Form')) {
 			/*$label.= '<div class="photointooltip">';
 			$label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0);	// Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
@@ -2594,7 +2642,7 @@ 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
+			$label .= '<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;
 		}
@@ -2667,7 +2715,7 @@ class Societe extends CommonObject
 		$linkend = '</a>';
 
 		global $user;
-		if (!$user->rights->societe->client->voir && $user->socid > 0 && $this->id != $user->socid) {
+		if (empty($user->rights->societe->client->voir) && $user->socid > 0 && $this->id != $user->socid) {
 			$linkstart = '';
 			$linkend = '';
 		}
@@ -2765,10 +2813,10 @@ class Societe extends CommonObject
 		}
 
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
-			$this->labelStatus[0] = $langs->trans("ActivityCeased");
-			$this->labelStatus[1] = $langs->trans("InActivity");
-			$this->labelStatusShort[0] = $langs->trans("ActivityCeased");
-			$this->labelStatusShort[1] = $langs->trans("InActivity");
+			$this->labelStatus[0] = $langs->transnoentitiesnoconv("ActivityCeased");
+			$this->labelStatus[1] = $langs->transnoentitiesnoconv("InActivity");
+			$this->labelStatusShort[0] = $langs->transnoentitiesnoconv("ActivityCeased");
+			$this->labelStatusShort[1] = $langs->transnoentitiesnoconv("InActivity");
 		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
@@ -2838,7 +2886,7 @@ class Societe extends CommonObject
 
 		$sql = "SELECT rowid, email, statut as status, phone_mobile, lastname, poste, firstname";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople";
-		$sql .= " WHERE fk_soc = ".$this->id;
+		$sql .= " WHERE fk_soc = ".((int) $this->id);
 		$sql .= " ORDER BY lastname, firstname";
 
 		$resql = $this->db->query($sql);
@@ -2898,7 +2946,7 @@ class Societe extends CommonObject
 		// phpcs:enable
 		$contacts = array();
 
-		$sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
+		$sql = "SELECT rowid, lastname, firstname FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".((int) $this->id);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$nump = $this->db->num_rows($resql);
@@ -2928,7 +2976,7 @@ class Societe extends CommonObject
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contacts = array();
 
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$this->id;
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".((int) $this->id);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$nump = $this->db->num_rows($resql);
@@ -3314,7 +3362,7 @@ class Societe extends CommonObject
 
 				if ($type == 'customer') {
 					$this->code_compta_client = $mod->code;
-					$this->code_compta = $this->code_compta_client;		// For backward compatibility
+					$this->code_compta = $this->code_compta_client; // For backward compatibility
 				} elseif ($type == 'supplier') {
 					$this->code_compta_fournisseur = $mod->code;
 				}
@@ -3337,7 +3385,7 @@ class Societe extends CommonObject
 	}
 
 	/**
-	 *    Define parent commany of current company
+	 *    Define parent company of current company
 	 *
 	 *    @param	int		$id     Id of thirdparty to set or '' to remove
 	 *    @return	int     		<0 if KO, >0 if OK
@@ -3349,7 +3397,7 @@ class Societe extends CommonObject
 		if ($this->id) {
 			// Check if the id we want to add as parent has not already one parent that is the current id we try to update
 			if ($id > 0) {
-				$sameparent	= $this->validateFamilyTree($id, $this->id, 0);
+				$sameparent = $this->validateFamilyTree($id, $this->id, 0);
 				if ($sameparent < 0) {
 					return -1;
 				}
@@ -3361,7 +3409,7 @@ class Societe extends CommonObject
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe SET parent = '.($id > 0 ? $id : 'null').' WHERE rowid = '.((int) $this->id);
 
-			$resql	= $this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql) {
 				$this->parent = $id;
 				return 1;
@@ -3389,17 +3437,17 @@ class Societe extends CommonObject
 
 		$sql = 'SELECT s.parent';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		$sql .= ' WHERE rowid = '.$idparent;
-		$resql	= $this->db->query($sql);
+		$sql .= ' WHERE rowid = '.((int) $idparent);
+		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj	= $this->db->fetch_object($resql);
 
-			if ($obj->parent == '')	{
+			if ($obj->parent == '') {
 				return 0;
-			} elseif ($obj->parent == $idchild)	{
+			} elseif ($obj->parent == $idchild) {
 				return 1;
 			} else {
-				$sameparent	= $this->validateFamilyTree($obj->parent, $idchild, ($counter + 1));
+				$sameparent = $this->validateFamilyTree($obj->parent, $idchild, ($counter + 1));
 			}
 			return $sameparent;
 		} else {
@@ -3710,7 +3758,7 @@ class Societe extends CommonObject
 			// TODO Move links to validate professional ID into a dictionary table "country" + "link"
 			$strippedIdProf1 = str_replace(' ', '', $thirdparty->idprof1);
 			if ($idprof == 1 && $thirdparty->country_code == 'FR') {
-				$url = 'http://www.societe.com/cgi-bin/search?champs='.$strippedIdProf1; // See also http://avis-situation-sirene.insee.fr/
+				$url = 'https://annuaire-entreprises.data.gouv.fr/entreprise/'.$strippedIdProf1; // See also http://avis-situation-sirene.insee.fr/
 			}
 			if ($idprof == 1 && ($thirdparty->country_code == 'GB' || $thirdparty->country_code == 'UK')) {
 				$url = 'https://beta.companieshouse.gov.uk/company/'.$strippedIdProf1;
@@ -3726,7 +3774,7 @@ class Societe extends CommonObject
 			}
 
 			if ($url) {
-				return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
+				return '<a target="_blank" rel="noopener noreferrer" href="'.$url.'">'.$langs->trans("Check").'</a>';
 			}
 		} else {
 			return $hookmanager->resPrint;
@@ -3744,7 +3792,7 @@ class Societe extends CommonObject
 	public function has_projects()
 	{
 		// phpcs:enable
-		$sql = 'SELECT COUNT(*) as numproj FROM '.MAIN_DB_PREFIX.'projet WHERE fk_soc = '.$this->id;
+		$sql = "SELECT COUNT(*) as numproj FROM ".MAIN_DB_PREFIX."projet WHERE fk_soc = ".((int) $this->id);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
@@ -3876,7 +3924,7 @@ class Societe extends CommonObject
 		// phpcs:enable
 		if ($categorie_id > 0 && $this->id > 0) {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_fournisseur (fk_categorie, fk_soc) ";
-			$sql .= " VALUES (".$categorie_id.", ".$this->id.")";
+			$sql .= " VALUES (".((int) $categorie_id).", ".((int) $this->id).")";
 
 			if ($resql = $this->db->query($sql)) {
 				return 0;
@@ -3900,7 +3948,7 @@ class Societe extends CommonObject
 	 */
 	public function create_from_member(Adherent $member, $socname = '', $socalias = '', $customercode = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user, $langs;
 
 		dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
@@ -4033,7 +4081,7 @@ class Societe extends CommonObject
 				$state_code = $tmp[1];
 				$state_label = $tmp[2];
 			} else { // For backward compatibility
-				dol_syslog("Your setup of State an old syntax (entity=".$conf->entity."). Go in Home - Setup - Organization then Save should remove this error.", LOG_ERR);
+				dol_syslog("Your setup of State has an old syntax (entity=".$conf->entity."). Go in Home - Setup - Organization then Save should remove this error.", LOG_ERR);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 				$state_code = getState($state_id, 2, $this->db); // This need a SQL request, but it's the old feature that should not be used anymore
 				$state_label = getState($state_id, 0, $this->db); // This need a SQL request, but it's the old feature that should not be used anymore
@@ -4697,7 +4745,7 @@ class Societe extends CommonObject
 		if ($this->id) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
 			$sql .= " SET fk_typent = ".($typent_id > 0 ? $typent_id : "null");
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			dol_syslog(get_class($this).'::setThirdpartyType', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -4716,12 +4764,12 @@ class Societe extends CommonObject
 	 * Function used to replace a thirdparty id with another one.
 	 * It must be used within a transaction to avoid trouble
 	 *
-	 * @param 	DoliDB 	$db 		Database handler
+	 * @param 	DoliDB 	$dbs 		Database handler, because function is static we name it $dbs not $db to avoid breaking coding test
 	 * @param 	int 	$origin_id 	Old thirdparty id (will be removed)
 	 * @param 	int 	$dest_id 	New thirdparty id
 	 * @return 	bool				True if success, False if error
 	 */
-	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	public static function replaceThirdparty(DoliDB $dbs, $origin_id, $dest_id)
 	{
 		if ($origin_id == $dest_id) {
 			dol_syslog('Error: Try to merge a thirdparty into itself');
@@ -4738,9 +4786,9 @@ class Societe extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_commerciaux ';
 		$sql .= ' WHERE fk_soc = '.(int) $origin_id.') ';
 
-		$resql = $db->query($sql);
-		while ($obj = $db->fetch_object($resql)) {
-			$db->query('DELETE FROM '.MAIN_DB_PREFIX.'societe_commerciaux WHERE rowid = '.((int) $obj->rowid));
+		$resql = $dbs->query($sql);
+		while ($obj = $dbs->fetch_object($resql)) {
+			$dbs->query('DELETE FROM '.MAIN_DB_PREFIX.'societe_commerciaux WHERE rowid = '.((int) $obj->rowid));
 		}
 
 		/**
@@ -4756,7 +4804,7 @@ class Societe extends CommonObject
 			'societe_rib'
 		);
 
-		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+		return CommonObject::commonReplaceThirdparty($dbs, $origin_id, $dest_id, $tables);
 	}
 
 	/**
@@ -4773,6 +4821,7 @@ class Societe extends CommonObject
 
 		$this->db->begin();
 
+		$field = 'accountancy_code_sell';
 		if ($type == 'buy') {
 			$field = 'accountancy_code_buy';
 		} elseif ($type == 'sell') {
@@ -4782,19 +4831,19 @@ class Societe extends CommonObject
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ";
-		$sql.= "$field = '".$this->db->escape($value)."'";
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= $field." = '".$this->db->escape($value)."'";
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
-		dol_syslog(get_class($this)."::".__FUNCTION__." sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
 			// Call triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('COMPANY_MODIFY', $this, $user, $langs, $conf);
+			include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+			$interface = new Interfaces($this->db);
+			$result = $interface->run_triggers('COMPANY_MODIFY', $this, $user, $langs, $conf);
 			if ($result < 0) {
-				$this->errors=$interface->errors;
+				$this->errors = $interface->errors;
 				$this->db->rollback();
 				return -1;
 			}
@@ -4805,7 +4854,7 @@ class Societe extends CommonObject
 			$this->db->commit();
 			return 1;
 		} else {
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -4821,7 +4870,7 @@ class Societe extends CommonObject
 	{
 		global $langs;
 
-		require_once DOL_DOCUMENT_ROOT.'/parntership/class/partnership.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
 
 
 		$this->partnerships[] = array();
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 8fbbbbcee6e..f73c460b4a4 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -392,7 +392,7 @@ class SocieteAccount extends CommonObject
 		$label .= '<b>'.$langs->trans('Login').':</b> '.$this->ref;
 		//$label.= '<b>' . $langs->trans('WebSite') . ':</b> ' . $this->ref;
 
-		$url = dol_buildpath('/website/websiteaccount_card.php', 1).'?id='.$this->id;
+		$url = DOL_URL_ROOT.'/website/websiteaccount_card.php?id='.$this->id;
 
 		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 5f996e6f37d..3624f80187d 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -47,9 +47,11 @@ if ($socid > 0) {
 
 // Sort & Order fields
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$optioncss = GETPOST('optioncss', 'alpha');
+
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -77,8 +79,8 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$month = '';
 }
 // Customer or supplier selected in drop box
-$thirdTypeSelect = GETPOST("third_select_id");
-$type_element = GETPOST('type_element') ?GETPOST('type_element') : '';
+$thirdTypeSelect = GETPOST("third_select_id", 'az09');
+$type_element = GETPOST('type_element') ? GETPOST('type_element') : '';
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "bills", "orders", "suppliers", "propal", "interventions", "contracts", "products"));
@@ -148,7 +150,7 @@ if ($object->client) {
 	print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client));
 	$tmpcheck = $object->check_codeclient();
 	if ($tmpcheck != 0 && $tmpcheck != -5) {
-		print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
 	}
 	print '</td></tr>';
 	$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".((int) $socid);
@@ -160,16 +162,16 @@ if ($object->client) {
 	$obj = $db->fetch_object($resql);
 	$nbFactsClient = $obj->nb;
 	$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 (!empty($conf->facture->enabled) && $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');
 	}
 }
@@ -185,7 +187,7 @@ if ($object->fournisseur) {
 	print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
 	$tmpcheck = $object->check_codefournisseur();
 	if ($tmpcheck != 0 && $tmpcheck != -5) {
-		print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
 	}
 	print '</td></tr>';
 	$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."commande_fournisseur where fk_soc = ".((int) $socid);
@@ -219,6 +221,7 @@ print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?socid='.$socid.'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
 $sql_select = '';
+$documentstaticline = '';
 /*if ($type_element == 'action')
 { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
@@ -232,7 +235,8 @@ $sql_select = '';
 if ($type_element == 'fichinter') { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 	$documentstatic = new Fichinter($db);
-	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, ';
+	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, NULL as paid, ';
+	$sql_select .= 'NULL as fk_product, NULL as info_bits, NULL as date_start, NULL as date_end, NULL as prod_qty, NULL as total_ht, ';
 	$tables_from = MAIN_DB_PREFIX."fichinter as f LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as d ON d.fk_fichinter = f.rowid"; // Must use left join to work also with option that disable usage of lines.
 	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".((int) $socid);
 	$where .= " AND f.entity = ".$conf->entity;
@@ -242,7 +246,7 @@ if ($type_element == 'fichinter') { 	// Customer : show products from invoices
 if ($type_element == 'invoice') { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	$documentstatic = new Facture($db);
-	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
+	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, d.fk_remise_except, ';
 	$tables_from = MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."facturedet as d";
 	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".((int) $socid);
 	$where .= " AND d.fk_facture = f.rowid";
@@ -254,7 +258,7 @@ if ($type_element == 'invoice') { 	// Customer : show products from invoices
 if ($type_element == 'propal') {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 	$documentstatic = new Propal($db);
-	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as dateprint, c.fk_statut as status, ';
+	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as dateprint, c.fk_statut as status, NULL as paid,';
 	$tables_from = MAIN_DB_PREFIX."propal as c,".MAIN_DB_PREFIX."propaldet as d";
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".((int) $socid);
 	$where .= " AND d.fk_propal = c.rowid";
@@ -266,7 +270,7 @@ if ($type_element == 'propal') {
 if ($type_element == 'order') {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 	$documentstatic = new Commande($db);
-	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, c.fk_statut as status, ';
+	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, c.fk_statut as status, NULL as paid, ';
 	$tables_from = MAIN_DB_PREFIX."commande as c,".MAIN_DB_PREFIX."commandedet as d";
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".((int) $socid);
 	$where .= " AND d.fk_commande = c.rowid";
@@ -290,7 +294,7 @@ if ($type_element == 'supplier_invoice') { 	// Supplier : Show products from inv
 if ($type_element == 'supplier_proposal') {
 	require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 	$documentstatic = new SupplierProposal($db);
-	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
+	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, NULL as paid, ';
 	$tables_from = MAIN_DB_PREFIX."supplier_proposal as c,".MAIN_DB_PREFIX."supplier_proposaldet as d";
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".((int) $socid);
 	$where .= " AND d.fk_supplier_proposal = c.rowid";
@@ -302,7 +306,7 @@ if ($type_element == 'supplier_proposal') {
 if ($type_element == 'supplier_order') { 	// Supplier : Show products from orders.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 	$documentstatic = new CommandeFournisseur($db);
-	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
+	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, NULL as paid, ';
 	$tables_from = MAIN_DB_PREFIX."commande_fournisseur as c,".MAIN_DB_PREFIX."commande_fournisseurdet as d";
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".((int) $socid);
 	$where .= " AND d.fk_commande = c.rowid";
@@ -315,7 +319,7 @@ if ($type_element == 'contract') { 	// Order
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 	$documentstatic = new Contrat($db);
 	$documentstaticline = new ContratLigne($db);
-	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_contrat as dateprint, d.statut as status, ';
+	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_contrat as dateprint, d.statut as status, NULL as paid,';
 	$tables_from = MAIN_DB_PREFIX."contrat as c,".MAIN_DB_PREFIX."contratdet as d";
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".((int) $socid);
 	$where .= " AND d.fk_contrat = c.rowid";
@@ -341,7 +345,7 @@ if (!empty($sql_select)) {
 		$sql .= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_ouverture as date_start, d.date_cloture as date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
 	}
 	if ($type_element != 'fichinter') {
-		$sql .= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity,';
+		$sql .= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity, ';
 	}
 	$sql .= " s.rowid as socid ";
 	if ($type_element != 'fichinter') {
@@ -423,7 +427,7 @@ if ($sql_select) {
 	if ($year) {
 		$param .= "&year=".urlencode($year);
 	}
-	if ($optioncss != '') {
+	if ($optioncss) {
 		$param .= '&optioncss='.urlencode($optioncss);
 	}
 
@@ -437,9 +441,9 @@ if ($sql_select) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
 	print '</td>';
-	print '<td class="liste_titre nowrap center">'; // date
+	print '<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);
+	$formother->select_year($year ? $year : -1, 'year', 1, 20, 1, 0, 0, '', 'valignmiddle maxwidth75imp marginleftonly');
 	print '</td>';
 	print '<td class="liste_titre center">';
 	print '</td>';
@@ -459,7 +463,7 @@ if ($sql_select) {
 	// Titles with sort buttons
 	print '<tr class="liste_titre">';
 	print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
-	print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
 	print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
@@ -496,6 +500,8 @@ if ($sql_select) {
 			print $documentstaticline->getLibStatut(5);
 		} elseif ($type_element == 'invoice') {
 			print $documentstatic->getLibStatut(5, $objp->paid);
+		} elseif ($type_element == 'supplier_invoice') {
+			print $documentstatic->getLibStatut(5, $objp->paid);
 		} else {
 			print $documentstatic->getLibStatut(5);
 		}
@@ -567,6 +573,7 @@ if ($sql_select) {
 			</a>
 			<?php
 			if ($objp->description) {
+				require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
@@ -652,7 +659,10 @@ if ($sql_select) {
 		$total_qty += $objp->prod_qty;
 
 		print '<td class="right"><span class="amount">'.price($objp->total_ht).'</span></td>';
-		$total_ht += $objp->total_ht;
+		if (empty($total_ht)) {
+			$total_ht = 0;
+		}
+		$total_ht += (float) $objp->total_ht;
 
 		print '<td class="right">'.price($objp->total_ht / (empty($objp->prod_qty) ? 1 : $objp->prod_qty)).'</td>';
 
@@ -665,7 +675,7 @@ if ($sql_select) {
 	print '<td colspan="3"></td>';
 	print '<td class="right">'.$total_qty.'</td>';
 	print '<td class="right">'.price($total_ht).'</td>';
-	print '<td class="right">'.price($total_ht / (empty($total_qty) ? 1 : $total_qty)).'</td>';
+	print '<td class="right">'.price(price2num($total_ht / (empty($total_qty) ? 1 : $total_qty), 'MU')).'</td>';
 	print "</table>";
 	print '</div>';
 
@@ -686,7 +696,7 @@ if ($sql_select) {
 	print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
 	print "</tr>\n";
 
-	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
+	print '<tr class="oddeven"><td colspan="5"><span class="opacitymedium">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</span></td></tr>';
 
 	print "</table>";
 } else {
@@ -694,7 +704,7 @@ if ($sql_select) {
 
 	print '<table class="liste centpercent">'."\n";
 
-	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+	print '<tr class="oddeven"><td colspan="5"><span class="opacitymedium">'.$langs->trans("FeatureNotYetAvailable").'</span></td></tr>';
 
 	print "</table>";
 }
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 60184d4ed15..707c573f116 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -41,8 +41,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -85,6 +85,8 @@ if ($user->socid > 0) {
 }
 $result = restrictedArea($user, 'societe', $object->id, '&societe');
 
+$permissiontoadd = $user->rights->societe->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
+
 
 /*
  * Actions
@@ -152,7 +154,7 @@ if ($object->id) {
 		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client));
 		$tmpcheck = $object->check_codeclient();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+			print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
 		}
 		print '</td></tr>';
 	}
@@ -163,7 +165,7 @@ if ($object->id) {
 		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
 		$tmpcheck = $object->check_codefournisseur();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+			print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
 		}
 		print '</td></tr>';
 	}
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 1433435a8e6..422ec5c8552 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2018 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2014      Charles-Fr Benke	<charles.fr@benke.fr>
+ * Copyright (C) 2014-2021 Charlene Benke		<charlene.r@benke.fr>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2016      Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2019	   Nicolas ZABOURI	<info@inovea-conseil.com>
@@ -94,17 +94,17 @@ $total = 0;
 
 $sql = "SELECT s.rowid, s.client, s.fournisseur";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= ' WHERE s.entity IN ('.getEntity('societe').')';
-if (!$user->rights->societe->client->voir && !$socid) {
+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 (!$user->rights->fournisseur->lire) {
+if (empty($user->rights->fournisseur->lire)) {
 	$sql .= " AND (s.fournisseur <> 1 OR s.client <> 0)"; // client=0, fournisseur=0 must be visible
 }
 //print $sql;
@@ -185,6 +185,7 @@ $thirdpartygraph .= '</td></tr>';
 $thirdpartygraph .= '</table>';
 $thirdpartygraph .= '</div>';
 
+$thirdpartycateggraph = '';
 if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$elementtype = 'societe';
@@ -262,29 +263,38 @@ $max = 15;
 $sql = "SELECT s.rowid, s.nom as name, s.email, s.client, s.fournisseur";
 $sql .= ", s.code_client";
 $sql .= ", s.code_fournisseur";
-$sql .= ", s.code_compta_fournisseur";
-$sql .= ", s.code_compta";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= ", spe.accountancy_code_supplier as code_compta_fournisseur";
+	$sql .= ", spe.accountancy_code_customer as code_compta";
+} else {
+	$sql .= ", s.code_compta_fournisseur";
+	$sql .= ", s.code_compta";
+}
 $sql .= ", s.logo";
 $sql .= ", s.entity";
 $sql .= ", s.canvas, s.tms as date_modification, s.status as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+}
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= ' WHERE s.entity IN ('.getEntity('societe').')';
-if (!$user->rights->societe->client->voir && !$socid) {
+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 (!$user->rights->fournisseur->lire) {
+if (empty($user->rights->fournisseur->lire)) {
 	$sql .= " AND (s.fournisseur != 1 OR s.client != 0)";
 }
 $sql .= $db->order("s.tms", "DESC");
 $sql .= $db->plimit($max, 0);
 
 //print $sql;
+$lastmodified="";
 $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 7f978829b91..da056ec33da 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -111,8 +111,8 @@ $place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'; // $place is
 $diroutputmassaction = $conf->societe->dir_output.'/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (!$sortorder) {
 	$sortorder = "ASC";
@@ -258,7 +258,7 @@ $arrayfields = array(
 	's.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
 );
 if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-	$arrayfields['s.price_level'] =array('label'=>"PriceLevel", 'position'=>30, 'checked'=>0);
+	$arrayfields['s.price_level'] = array('label'=>"PriceLevel", 'position'=>30, 'checked'=>0);
 }
 
 // Extra fields
@@ -468,16 +468,16 @@ if ($search_sale && $search_sale != '-1') {
 	$sql .= ", sc.fk_soc, sc.fk_user";
 }
 // We'll need these fields in order to filter by categ
-if ($search_categ_cus && $search_categ_cus!=-1) {
+if ($search_categ_cus && $search_categ_cus != -1) {
 	$sql .= ", cc.fk_categorie, cc.fk_soc";
 }
-if ($search_categ_sup && $search_categ_sup!=-1) {
+if ($search_categ_sup && $search_categ_sup != -1) {
 	$sql .= ", cs.fk_categorie, cs.fk_soc";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 	}
 }
 // Add fields from hooks
@@ -486,7 +486,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $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";
-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 (s.rowid = ef.fk_object)";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
@@ -521,7 +521,7 @@ if (empty($user->rights->societe->client->voir) && !$socid) {
 if ($search_sale && $search_sale != '-1' && $search_sale != '-2') {
 	$sql .= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
 }
-if (!$user->rights->fournisseur->lire) {
+if (empty($user->rights->fournisseur->lire)) {
 	$sql .= " AND (s.fournisseur <> 1 OR s.client <> 0)"; // client=0, fournisseur=0 must be visible
 }
 if ($search_sale == -2) {
@@ -574,7 +574,7 @@ if ($search_account_supplier_code) {
 	$sql .= natural_search("s.code_compta_fournisseur", $search_account_supplier_code);
 }
 if ($search_address) {
-	$sql.= natural_search('s.address', $search_address);
+	$sql .= natural_search('s.address', $search_address);
 }
 if ($search_town) {
 	$sql .= natural_search("s.town", $search_town);
@@ -673,7 +673,7 @@ if (empty($reshook)) {
 }
 $sql .= $hookmanager->resPrint;
 // Add GroupBy from hooks
-$parameters = array('all' => $all, 'fieldstosearchall' => $fieldstosearchall);
+$parameters = array('fieldstosearchall' => $fieldstosearchall);
 $reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
@@ -752,7 +752,7 @@ if ($search_alias != '') {
 	$param .= "&search_alias=".urlencode($search_alias);
 }
 if ($search_address != '') {
-	$param .= '&search_address=' . urlencode($search_address);
+	$param .= '&search_address='.urlencode($search_address);
 }
 if ($search_town != '') {
 	$param .= "&search_town=".urlencode($search_town);
@@ -869,7 +869,13 @@ if ($user->rights->societe->supprimer) {
 if ($user->rights->societe->creer) {
 	$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
+if ($user->rights->societe->creer) {
+	$arrayofmassactions['preenable'] = img_picto('', '', 'class="pictofixedwidth"').$langs->trans("SetToEnabled");
+}
+if ($user->rights->societe->creer) {
+	$arrayofmassactions['predisable'] = img_picto('', '', 'class="pictofixedwidth"').$langs->trans("SetToDisabled");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag', 'preenable', 'preclose'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -1092,7 +1098,7 @@ if (!empty($arrayfields['country.code_iso']['checked'])) {
 if (!empty($arrayfields['typent.code']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
 	// We use showempty=0 here because there is already an unknown value into dictionary.
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'minwidth50 maxwidth100', 1);
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'minwidth50 maxwidth125', 1);
 	print '</td>';
 }
 // Multiprice level
@@ -1233,7 +1239,7 @@ if (!empty($arrayfields['s.import_key']['checked'])) {
 	print '</td>';
 }
 // Action column
-print '<td class="liste_titre center">';
+print '<td class="liste_titre center actioncolumn">';
 $searchpicto = $form->showFilterButtons();
 print $searchpicto;
 print '</td>';
@@ -1241,10 +1247,10 @@ print '</td>';
 print "</tr>\n";
 print '<tr class="liste_titre">';
 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);
+	print_liste_field_titre($arrayfields['s.rowid']['label'], $_SERVER["PHP_SELF"], "s.rowid", "", $param, ' data-key="id"', $sortfield, $sortorder, 'actioncolumn ');
 }
 if (!empty($arrayfields['s.nom']['checked'])) {
-	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, ' data-key="ref"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, ' data-key="ref"', $sortfield, $sortorder, 'actioncolumn ');
 }
 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);
@@ -1354,12 +1360,13 @@ 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 ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');
 print "</tr>\n";
 
 
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 
@@ -1504,11 +1511,13 @@ while ($i < min($num, $limit)) {
 	}
 	// Type ent
 	if (!empty($arrayfields['typent.code']['checked'])) {
-		print '<td class="center">';
-		if (!is_array($typenArray) || count($typenArray) == 0) {
+		if (!isset($typenArray) || !is_array($typenArray) || count($typenArray) == 0) {
 			$typenArray = $formcompany->typent_array(1);
 		}
-		print $typenArray[$obj->typent_code];
+		$labeltypeofcompany= empty($typenArray[$obj->typent_code]) ? '' : $typenArray[$obj->typent_code];
+
+		print '<td class="center tdoverflowmax125" title="'.dol_escape_htmltag($labeltypeofcompany).'">';
+		print dol_escape_htmltag($labeltypeofcompany);
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -1636,7 +1645,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='.$val['code'].'&action=setstcomm&token='.newToken().$param.($page ? '&page='.urlencode($page) : '').'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
+				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 '</div></div></td>';
@@ -1697,7 +1706,7 @@ while ($i < min($num, $limit)) {
 	}
 
 	// Action column (Show the massaction button only when this page is not opend from the Extended POS)
-	print '<td class="nowrap center">';
+	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)) {
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index d4396738966..b932fb11595 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -56,8 +56,13 @@ $result = restrictedArea($user, 'societe', $object->id, '&societe');
 /*
  * Actions
  */
-
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$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
+}
 
 
 /*
@@ -113,7 +118,7 @@ if ($object->id > 0) {
 		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client));
 		$tmpcheck = $object->check_codeclient();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+			print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
 		}
 		print '</td></tr>';
 	}
@@ -124,7 +129,7 @@ if ($object->id > 0) {
 		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
 		$tmpcheck = $object->check_codefournisseur();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+			print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
 		}
 		print '</td></tr>';
 	}
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index d62ca943fb1..8729ed3b46e 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -45,8 +45,8 @@ if ($user->socid) {
 $result = restrictedArea($user, 'societe', '', '');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (!$sortorder) {
 	$sortorder = "DESC";
@@ -178,7 +178,7 @@ if ($result > 0) {
 		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client));
 		$tmpcheck = $object->check_codeclient();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+			print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
 		}
 		print '</td></tr>';
 	}
@@ -189,7 +189,7 @@ if ($result > 0) {
 		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
 		$tmpcheck = $object->check_codefournisseur();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+			print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
 		}
 		print '</td></tr>';
 	}
@@ -288,7 +288,7 @@ if ($result > 0) {
 		$type = array('email'=>$langs->trans("EMail"));
 		print $form->selectarray("typeid", $type, '', 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
 		print '</td>';
-		print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
+		print '<td class="right"><input type="submit" class="button button-add" value="'.$langs->trans("Add").'"></td>';
 		print '</tr>';
 	} else {
 		print '<tr class="oddeven"><td colspan="4" class="opacitymedium">';
diff --git a/htdocs/societe/partnership.php b/htdocs/societe/partnership.php
index a5393e500e3..2ce4884932e 100644
--- a/htdocs/societe/partnership.php
+++ b/htdocs/societe/partnership.php
@@ -65,7 +65,7 @@ if ($id > 0) {
 $object = new Partnership($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('partnershipthirdparty', 'globalcard')); // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('thirdpartypartnership', 'globalcard')); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -132,7 +132,7 @@ $date_end = dol_mktime(0, 0, 0, GETPOST('date_partnership_endmonth', 'int'), GET
 if (empty($reshook)) {
 	$error = 0;
 
-	$backtopage = dol_buildpath('/partnership/partnership.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+	$backtopage = DOL_URL_ROOT.'/partnership/partnership.php?id='.($id > 0 ? $id : '__ID__');
 
 	// Actions when linking object each other
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
@@ -189,7 +189,7 @@ if ($id > 0) {
 		print showValueWithClipboardCPButton(dol_escape_htmltag($societe->code_client));
 		$tmpcheck = $societe->check_codeclient();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+			print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
 		}
 		print '</td></tr>';
 	}
@@ -200,7 +200,7 @@ if ($id > 0) {
 		print showValueWithClipboardCPButton(dol_escape_htmltag($societe->code_fournisseur));
 		$tmpcheck = $societe->check_codefournisseur();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+			print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
 		}
 		print '</td>';
 		print '</tr>';
@@ -257,7 +257,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<table class="border centpercent tableforfield">'."\n";
 
 		// Common attributes
-		unset($object->fields['fk_soc']);					// 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';
 		$forcefieldid = 'socid';
 		$forceobjectid = $object->fk_soc;
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 873795c938e..7405fcedb18 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -1,12 +1,13 @@
 <?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) 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>
- * Copyright (C) 2017      Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2018 -2021Thibault FOUCART     <support@ptibogxiv.net>
+/* 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) 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>
+ * Copyright (C) 2017       Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2018-2021  Thibault FOUCART     <support@ptibogxiv.net>
+ * Copyright (C) 2021       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
@@ -41,7 +42,6 @@ require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 
 $langs->loadLangs(array("companies", "commercial", "banks", "bills", 'paypal', 'stripe', 'withdrawals'));
 
-
 // Security check
 $socid = GETPOST("socid", "int");
 if ($user->socid) {
@@ -70,6 +70,10 @@ $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('thirdpartybancard', 'globalcard'));
 
+$permissiontoread = $user->rights->societe->lire;
+$permissiontoadd = $user->rights->societe->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_builddoc.inc.php
+
+$permissiontoaddupdatepaymentinformation = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $permissiontoadd) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->societe->thirdparty_paymentinformation_advance->write)));
 
 if (!empty($conf->stripe->enabled)) {
 	$service = 'StripeTest';
@@ -455,7 +459,6 @@ if (empty($reshook)) {
 
 	$id = $socid;
 	$upload_dir = $conf->societe->multidir_output[$object->entity];
-	$permissiontoadd = $user->rights->societe->creer;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	$id = $savid;
@@ -587,7 +590,7 @@ if (empty($reshook)) {
 					$tokenstring['stripe_user_id'] = $stripesup->id;
 					$tokenstring['type'] = $stripesup->type;
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token (service, fk_soc, entity, tokenstring)";
-					$sql .= " VALUES ('".$db->escape($service)."', ".$object->id.", ".$conf->entity.", '".$db->escape(json_encode($tokenstring))."')";
+					$sql .= " VALUES ('".$db->escape($service)."', ".((int) $object->id).", ".((int) $conf->entity).", '".$db->escape(json_encode($tokenstring))."')";
 					// TODO Add site and site_account on oauth_token table
 				} catch (Exception $e) {
 					$error++;
@@ -703,7 +706,7 @@ if (empty($companybankaccount->socid)) {
 	$companybankaccount->socid = $object->id;
 }
 
-if ($socid && ($action == 'edit' || $action == 'editcard') && $user->rights->societe->creer) {
+if ($socid && ($action == 'edit' || $action == 'editcard') && $permissiontoaddupdatepaymentinformation) {
 	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	$actionforadd = 'update';
@@ -713,7 +716,7 @@ if ($socid && ($action == 'edit' || $action == 'editcard') && $user->rights->soc
 	print '<input type="hidden" name="action" value="'.$actionforadd.'">';
 	print '<input type="hidden" name="id" value="'.GETPOST("id", "int").'">';
 }
-if ($socid && ($action == 'create' || $action == 'createcard') && $user->rights->societe->creer) {
+if ($socid && ($action == 'create' || $action == 'createcard') && $permissiontoaddupdatepaymentinformation) {
 	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	$actionforadd = 'add';
@@ -761,7 +764,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client));
 		$tmpcheck = $object->check_codeclient();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+			print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
 		}
 		print '</td></tr>';
 		$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".((int) $socid);
@@ -773,26 +776,25 @@ 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 (!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 (!empty($conf->facture->enabled) && $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 (!empty($conf->stripe->enabled)) {
-			$permissiontowrite = $user->rights->societe->creer;
 			// Stripe customer key 'cu_....' stored into llx_societe_account
 			print '<tr><td class="titlefield">';
-			print $form->editfieldkey("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontowrite, 'string', '', 0, 2, 'socid');
+			print $form->editfieldkey("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontoaddupdatepaymentinformation, 'string', '', 0, 2, 'socid');
 			print '</td><td>';
-			print $form->editfieldval("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontowrite, 'string', '', null, null, '', 2, '', 'socid');
+			print $form->editfieldval("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontoaddupdatepaymentinformation, 'string', '', null, null, '', 2, '', 'socid');
 			if (!empty($conf->stripe->enabled) && $stripecu && $action != 'editkey_account') {
 				$connect = '';
 				if (!empty($stripeacc)) {
@@ -823,7 +825,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
 		$tmpcheck = $object->check_codefournisseur();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+			print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
 		}
 		print '</td></tr>';
 		$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".((int) $socid);
@@ -848,15 +850,14 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		}
 	}
 
-	if (!empty($conf->stripe->enabled) && !empty($conf->stripeconnect->enabled) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
-		$permissiontowrite = $user->rights->societe->creer;
+	if (!empty($conf->stripe->enabled) && !empty($conf->stripeconnect->enabled) && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 		$stripesupplieracc = $stripe->getStripeAccount($service, $object->id); // Get Stripe OAuth connect account (no network access here)
 
 		// Stripe customer key 'cu_....' stored into llx_societe_account
 		print '<tr><td class="titlefield">';
-		print $form->editfieldkey("StripeConnectAccount", 'key_account_supplier', $stripesupplieracc, $object, $permissiontowrite, 'string', '', 0, 2, 'socid');
+		print $form->editfieldkey("StripeConnectAccount", 'key_account_supplier', $stripesupplieracc, $object, $permissiontoaddupdatepaymentinformation, 'string', '', 0, 2, 'socid');
 		print '</td><td>';
-		print $form->editfieldval("StripeConnectAccount", 'key_account_supplier', $stripesupplieracc, $object, $permissiontowrite, 'string', '', null, null, '', 2, '', 'socid');
+		print $form->editfieldval("StripeConnectAccount", 'key_account_supplier', $stripesupplieracc, $object, $permissiontoaddupdatepaymentinformation, 'string', '', null, null, '', 2, '', 'socid');
 		if (!empty($conf->stripe->enabled) && $stripesupplieracc && $action != 'editkey_account_supplier') {
 			$connect = '';
 
@@ -1032,7 +1033,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 								print $img ? $img.' ' : '';
 								print getCountry($companypaymentmodetemp->country_code, 1);
 							} else {
-								print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+								print img_warning().' <span class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</span>';
 							}
 							print '</td>';
 							// Default
@@ -1061,7 +1062,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							print $hookmanager->resPrint;
 							// Action column
 							print '<td class="right nowraponall">';
-							if ($user->rights->societe->creer) {
+							if ($permissiontoaddupdatepaymentinformation) {
 								if ($stripecu && empty($companypaymentmodetemp->stripe_card_ref)) {
 									print '<a href="'.$_SERVER['PHP_SELF'].'?action=synccardtostripe&socid='.$object->id.'&id='.$companypaymentmodetemp->id.'" class="paddingrightonly marginrightonly">'.$langs->trans("CreateCardOnStripe").'</a>';
 								}
@@ -1141,7 +1142,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						print $img ? $img.' ' : '';
 						print getCountry($src->country, 1);
 					} else {
-						print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+						print img_warning().' <span class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</span>';
 					}
 				} elseif ($src->object == 'source' && $src->type == 'card') {
 					print '<span class="opacitymedium">'.$src->owner->name.'</span><br>....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
@@ -1152,7 +1153,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						print $img ? $img.' ' : '';
 						print getCountry($src->card->country, 1);
 					} else {
-						print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+						print img_warning().' <span class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</span>';
 					}
 				} elseif ($src->object == 'source' && $src->type == 'sepa_debit') {
 					print '<span class="opacitymedium">'.$src->billing_details->name.'</span><br>....'.$src->sepa_debit->last4;
@@ -1162,7 +1163,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							print $img ? $img.' ' : '';
 							print getCountry($src->sepa_debit->country, 1);
 					} else {
-						print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+						print img_warning().' <span class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</span>';
 					}
 				} elseif ($src->object == 'payment_method' && $src->type == 'card') {
 					print '<span class="opacitymedium">'.$src->billing_details->name.'</span><br>....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
@@ -1173,7 +1174,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						print $img ? $img.' ' : '';
 						print getCountry($src->card->country, 1);
 					} else {
-						print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+						print img_warning().' <span class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</span>';
 					}
 				} elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit') {
 					print '<span class="opacitymedium">'.$src->billing_details->name.'</span><br>....'.$src->sepa_debit->last4;
@@ -1183,7 +1184,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						print $img ? $img.' ' : '';
 						print getCountry($src->sepa_debit->country, 1);
 					} else {
-						print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+						print img_warning().' <span class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</span>';
 					}
 				} else {
 					print '</td><td>';
@@ -1214,7 +1215,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				print $hookmanager->resPrint;
 				// Action column
 				print '<td class="right nowraponall">';
-				if ($user->rights->societe->creer) {
+				if ($permissiontoaddupdatepaymentinformation) {
 					print '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=deletecard&token='.newToken().'">';
 					print img_picto($langs->trans("Delete"), 'delete');
 					print '</a>';
@@ -1227,7 +1228,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 		if ($nbremote == 0 && $nblocal == 0) {
 			$colspan = (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD) ? 10 : 9);
-			print '<tr><td class="opacitymedium" colspan="'.$colspan.'">'.$langs->trans("None").'</td></tr>';
+			print '<tr><td colspan="'.$colspan.'"<span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
 		print "</table>";
 		print "</div>";
@@ -1281,14 +1282,15 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	}
 
 	// List of bank accounts
-
-	$morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=create');
+	if ($permissiontoaddupdatepaymentinformation) {
+		$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();
 	if (is_array($rib_list)) {
-		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 '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 		print '<table class="liste centpercent">';
 
 		print '<tr class="liste_titre">';
@@ -1304,7 +1306,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		}
 		print_liste_field_titre("DefaultRIB", '', '', '', '', '', '', '', 'center ');
 		print_liste_field_titre('', '', '', '', '', '', '', '', 'center ');
-		print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
+		print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', '', '', 'maxwidthsearch ');
 		print "</tr>\n";
 
 		foreach ($rib_list as $rib) {
@@ -1393,7 +1395,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 			$out = '';
 			if (is_array($modellist) && count($modellist)) {
-				$out .= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">';
+				$out .= '<form action="'.$_SERVER["PHP_SELF"].(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">';
 				$out .= '<input type="hidden" name="action" value="builddocrib">';
 				$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 				$out .= '<input type="hidden" name="socid" value="'.$object->id.'">';
@@ -1407,14 +1409,16 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 					$modelselected = $conf->global->BANKADDON_PDF;
 				}
 
-				$out .= $form->selectarray('modelrib'.$rib->id, $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+				$out .= $form->selectarray('modelrib'.$rib->id, $modellist, $modelselected, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100');
 				$out .= ajax_combobox('modelrib'.$rib->id);
 
+				$allowgenifempty = 0;
+
 				// Language code (if multilang)
 				if ($conf->global->MAIN_MULTILANGS) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 					$formadmin = new FormAdmin($db);
-					$defaultlang = $codelang ? $codelang : $langs->getDefaultLang();
+					$defaultlang = $langs->getDefaultLang();
 					$morecss = 'maxwidth150';
 					if ($conf->browser->layout == 'phone') {
 						$morecss = 'maxwidth100';
@@ -1446,7 +1450,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 			// Edit/Delete
 			print '<td class="right nowraponall">';
-			if ($user->rights->societe->creer) {
+			if ($permissiontoaddupdatepaymentinformation) {
 				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>';
@@ -1486,10 +1490,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		 */
 		$filedir = $conf->societe->multidir_output[$object->entity].'/'.$object->id;
 		$urlsource = $_SERVER["PHP_SELF"]."?socid=".$object->id;
-		$genallowed = $user->rights->societe->lire;
-		$delallowed = $user->rights->societe->creer;
 
-		print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
+		print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $permissiontoread, $permissiontoaddupdatepaymentinformation, $object->model_pdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
 
 		// Show direct download link
 		if (!empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
@@ -1507,10 +1509,10 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			}
 		}
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 
-		print '</div></div></div>';
+		print '</div></div>';
 
 		print '<br>';
 	}
@@ -1536,7 +1538,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 }
 
 // Edit BAN
-if ($socid && $action == 'edit' && $user->rights->societe->creer) {
+if ($socid && $action == 'edit' && $permissiontoaddupdatepaymentinformation) {
 	print dol_get_fiche_head($head, 'rib', $langs->trans("ThirdParty"), 0, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -1651,15 +1653,11 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer) {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input class="button" value="'.$langs->trans("Modify").'" type="submit">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-	print '</div>';
+	print $form->buttonsSaveCancel("Modify");
 }
 
 // Edit Card
-if ($socid && $action == 'editcard' && $user->rights->societe->creer) {
+if ($socid && $action == 'editcard' && $permissiontoaddupdatepaymentinformation) {
 	print dol_get_fiche_head($head, 'rib', $langs->trans("ThirdParty"), 0, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -1697,16 +1695,12 @@ if ($socid && $action == 'editcard' && $user->rights->societe->creer) {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input class="button" value="'.$langs->trans("Modify").'" type="submit">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-	print '</div>';
+	print $form->buttonsSaveCancel("Modify");
 }
 
 
 // Create BAN
-if ($socid && $action == 'create' && $user->rights->societe->creer) {
+if ($socid && $action == 'create' && $permissiontoaddupdatepaymentinformation) {
 	print dol_get_fiche_head($head, 'rib', $langs->trans("ThirdParty"), 0, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -1817,15 +1811,11 @@ if ($socid && $action == 'create' && $user->rights->societe->creer) {
 
 	dol_set_focus('#label');
 
-	print '<div class="center">';
-	print '<input class="button" value="'.$langs->trans("Add").'" type="submit">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-	print '</div>';
+	print $form->buttonsSaveCancel("Add");
 }
 
 // Create Card
-if ($socid && $action == 'createcard' && $user->rights->societe->creer) {
+if ($socid && $action == 'createcard' && $permissiontoaddupdatepaymentinformation) {
 	print dol_get_fiche_head($head, 'rib', $langs->trans("ThirdParty"), 0, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -1866,17 +1856,13 @@ if ($socid && $action == 'createcard' && $user->rights->societe->creer) {
 
 	dol_set_focus('#label');
 
-	print '<div class="center">';
-	print '<input class="button" value="'.$langs->trans("Add").'" type="submit">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-	print '</div>';
+	print $form->buttonsSaveCancel("Add");
 }
 
-if ($socid && ($action == 'edit' || $action == 'editcard') && $user->rights->societe->creer) {
+if ($socid && ($action == 'edit' || $action == 'editcard') && $permissiontoaddupdatepaymentinformation) {
 	print '</form>';
 }
-if ($socid && ($action == 'create' || $action == 'createcard') && $user->rights->societe->creer) {
+if ($socid && ($action == 'create' || $action == 'createcard') && $permissiontoaddupdatepaymentinformation) {
 	print '</form>';
 }
 
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index b46a6124396..75818a34f72 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -218,7 +218,7 @@ if ($object->client) {
 	print $object->code_client;
 	$tmpcheck = $object->check_codeclient();
 	if ($tmpcheck != 0 && $tmpcheck != -5) {
-		print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
 	}
 	print '</td></tr>';
 }
@@ -229,7 +229,7 @@ if ($object->fournisseur) {
 	print $object->code_fournisseur;
 	$tmpcheck = $object->check_codefournisseur();
 	if ($tmpcheck != 0 && $tmpcheck != -5) {
-		print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
 	}
 	print '</td></tr>';
 }
@@ -245,8 +245,8 @@ print dol_get_fiche_end();
 if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 	$prodcustprice = new Productcustomerprice($db);
 
-	$sortfield = GETPOST("sortfield", 'alpha');
-	$sortorder = GETPOST("sortorder", 'alpha');
+	$sortfield = GETPOST('sortfield', 'aZ09comma');
+	$sortorder = GETPOST('sortorder', 'aZ09comma');
 	$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 	if (empty($page) || $page == -1) {
@@ -326,22 +326,14 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		$text = $langs->trans('SellingPrice');
 		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
 		print '</td><td>';
-		if ($object->price_base_type == 'TTC') {
-			print '<input name="price" size="10" value="'.price($object->price_ttc).'">';
-		} else {
-			print '<input name="price" size="10" value="'.price($object->price).'">';
-		}
+		print '<input name="price" size="10" value="'.GETPOST('price', 'int').'">';
 		print '</td></tr>';
 
 		// Price minimum
 		print '<tr><td>';
 		$text = $langs->trans('MinPrice');
 		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
-		if ($object->price_base_type == 'TTC') {
-			print '<td><input name="price_min" size="10" value="'.price($object->price_min_ttc).'">';
-		} else {
-			print '<td><input name="price_min" size="10" value="'.price($object->price_min).'">';
-		}
+		print '<td><input name="price_min" size="10" value="'.GETPOST('price_min', 'int').'">';
 		print '</td></tr>';
 
 		// Update all child soc
@@ -355,13 +347,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 		print '</table>';
 
-		print '<br><div class="center">';
-		print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
+		print $form->buttonsSaveCancel();
 
-		print '<br></form>';
+		print '</form>';
 	} elseif ($action == 'edit_customer_price') {
 		// Edit mode
 
@@ -386,7 +374,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 			// Ref. Customer
 			print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
-			print '<td><input name="ref_customer" size="12" value="' . dol_escape_htmltag($prodcustprice->ref_customer) . '"></td></tr>';
+			print '<td><input name="ref_customer" size="12" value="'.dol_escape_htmltag($prodcustprice->ref_customer).'"></td></tr>';
 
 			// VAT
 			print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
@@ -437,13 +425,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 			print '</table>';
 
-			print '<br><div class="center">';
-			print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-			print '</div>';
+			print $form->buttonsSaveCancel();
 
-			print '<br></form>';
+			print '</form>';
 		}
 	} elseif ($action == 'showlog_customer_price') {
 		print '<br>';
@@ -533,7 +517,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print "\n".'<div class="tabsAction">'."\n";
 
 		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&amp;socid='.$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().'&socid='.$object->id.'">'.$langs->trans("AddCustomerPrice").'</a></div>';
 		}
 		print "\n</div>\n";
 
@@ -624,15 +608,15 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				// Action
 				if ($user->rights->produit->creer || $user->rights->service->creer) {
 					print '<td class="right nowraponall">';
-					print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=showlog_customer_price&amp;socid='.$object->id.'&amp;prodid='.$line->fk_product.'">';
+					print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=showlog_customer_price&token='.newToken().'&socid='.$object->id.'&prodid='.$line->fk_product.'">';
 					print img_info();
 					print '</a>';
 					print ' ';
-					print '<a class="editfielda paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=edit_customer_price&amp;socid='.$object->id.'&amp;lineid='.$line->id.'">';
+					print '<a class="editfielda paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=edit_customer_price&token='.newToken().'&socid='.$object->id.'&lineid='.$line->id.'">';
 					print img_edit('default', 0, 'style="vertical-align: middle;"');
 					print '</a>';
 					print ' ';
-					print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=delete_customer_price&amp;token='.newToken().'&amp;socid='.$object->id.'&amp;lineid='.$line->id.'">';
+					print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=delete_customer_price&token='.newToken().'&socid='.$object->id.'&lineid='.$line->id.'">';
 					print img_delete('default', 'style="vertical-align: middle;"');
 					print '</a>';
 					print '</td>';
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index c6256324257..ef68a03ab78 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -112,7 +112,7 @@ if ($socid) {
 		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client));
 		$tmpcheck = $object->check_codeclient();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+			print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
 		}
 		print '</td></tr>';
 	}
@@ -123,7 +123,7 @@ if ($socid) {
 		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
 		$tmpcheck = $object->check_codefournisseur();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+			print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
 		}
 		print '</td></tr>';
 	}
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 7425f094958..82d815f0ac4 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -40,8 +40,8 @@ $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (!$sortorder) {
 	$sortorder = "ASC";
@@ -181,7 +181,7 @@ if ($id > 0 || !empty($ref)) {
 			print $object->code_client;
 			$tmpcheck = $object->check_codeclient();
 			if ($tmpcheck != 0 && $tmpcheck != -5) {
-				print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+				print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
 			}
 			print '</td></tr>';
 		}
@@ -192,7 +192,7 @@ if ($id > 0 || !empty($ref)) {
 			print $object->code_fournisseur;
 			$tmpcheck = $object->check_codefournisseur();
 			if ($tmpcheck != 0 && $tmpcheck != -5) {
-				print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+				print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
 			}
 			print '</td></tr>';
 		}
diff --git a/htdocs/societe/tpl/linesalesrepresentative.tpl.php b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
index f67acf2f2d3..125264e14d7 100644
--- a/htdocs/societe/tpl/linesalesrepresentative.tpl.php
+++ b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
@@ -21,6 +21,8 @@ if (empty($conf) || !is_object($conf)) {
 	exit;
 }
 
+print '<!-- linesalesrepresentative.tpl.php -->';
+
 // Sale representative
 print '<tr><td>';
 print '<table class="nobordernopadding" width="100%"><tr><td>';
@@ -28,7 +30,7 @@ print $langs->trans('SalesRepresentatives');
 print '</td>';
 if ($action != 'editsalesrepresentatives' && $user->rights->societe->creer) {
 	print '<td class="right">';
-	print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editsalesrepresentatives&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a>';
+	print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editsalesrepresentatives&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a>';
 	print '</td>';
 }
 print '</tr></table>';
@@ -45,7 +47,7 @@ if ($action == 'editsalesrepresentatives') {
 		$arrayselected = $object->getSalesRepresentatives($user, 1);
 	}
 	print $form->multiselectarray('commercial', $userlist, $arrayselected, null, null, null, null, "90%");
-	print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'" />';
+	print '<input type="submit" class="button valignmiddle small" value="'.$langs->trans("Modify").'" />';
 	print '</form>';
 } else {
 	$listsalesrepresentatives = $object->getSalesRepresentatives($user);
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 3b2e6104409..bc93d72d60e 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -51,8 +51,8 @@ if ($user->socid) {
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -220,7 +220,7 @@ if ($object->client) {
 	print $object->code_client;
 	$tmpcheck = $object->check_codeclient();
 	if ($tmpcheck != 0 && $tmpcheck != -5) {
-		print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
 	}
 	print '</td></tr>';
 }
@@ -231,7 +231,7 @@ if ($object->fournisseur) {
 	print $object->code_fournisseur;
 	$tmpcheck = $object->check_codefournisseur();
 	if ($tmpcheck != 0 && $tmpcheck != -5) {
-		print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
 	}
 	print '</td></tr>';
 }
@@ -259,12 +259,12 @@ print '<br>';
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
 foreach ($objectwebsiteaccount->fields as $key => $val) {
-	$sql .= 't.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key." as options_".$key.', ' : '');
 	}
 }
 // Add fields from hooks
@@ -302,7 +302,7 @@ $sql .= $hookmanager->resPrint;
 $sql.= " GROUP BY "
 foreach($objectwebsiteaccount->fields as $key => $val)
 {
-	$sql.='t.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -491,8 +491,8 @@ while ($i < min($num, $limit)) {
 	$objectwebsiteaccount->login = $obj->login;
 	$objectwebsiteaccount->ref = $obj->login;
 	foreach ($objectwebsiteaccount->fields as $key => $val) {
-		if (property_exists($obj, $key)) {
-			$object->$key = $obj->$key;
+		if (property_exists($objectwebsiteaccount, $key)) {
+			$objectwebsiteaccount->$key = $obj->$key;
 		}
 	}
 
@@ -524,7 +524,7 @@ while ($i < min($num, $limit)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
@@ -534,7 +534,7 @@ while ($i < min($num, $limit)) {
 				if (!isset($totalarray['val']['t.'.$key])) {
 					$totalarray['val']['t.'.$key] = 0;
 				}
-				$totalarray['val']['t.'.$key] += $obj->$key;
+				$totalarray['val']['t.'.$key] += $objectwebsiteaccount->$key;
 			}
 		}
 	}
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index e582cdaf63e..77c8d9a03b2 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -356,7 +356,7 @@ print img_picto('', 'bank_account').' ';
 $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
 print '</td></tr>';
 
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// What is this for ?
+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').' ';
@@ -390,6 +390,20 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
 	print '</td></tr>';
 }
 
+// Activate Klarna
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("STRIPE_KLARNA").'</td><td>';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STRIPE_KLARNA');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STRIPE_KLARNA", $arrval, $conf->global->STRIPE_KLARNA);
+	}
+	print ' &nbsp; <span class="opacitymedium">'.$langs->trans("ExampleOnlyForKlarnaCustomers").'</span>';
+	print '</td></tr>';
+}
+
 // Activate Bancontact
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
 	print '<tr class="oddeven"><td>';
@@ -446,15 +460,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
 	print '</td></tr>';
 }
 
-// Warehouse for automatic decrement
-//if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// warehouse to reduce stock for online payment
-//{
-//	print '<tr class="oddeven"><td>';
-//	print $langs->trans("ONLINE_PAYMENT_WAREHOUSE").'</td><td>';
-//	print $formproduct->selectWarehouses($conf->global->ONLINE_PAYMENT_WAREHOUSE, 'ONLINE_PAYMENT_WAREHOUSE', '', 1, $disabled);
-//	print '</td></tr>';
-//}
-
 print '<tr class="oddeven"><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="ONLINE_PAYMENT_CSS_URL" value="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'">';
@@ -526,7 +531,7 @@ print '</div>';
 
 print dol_get_fiche_end();
 
-print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index c6a07593a04..49db54b444f 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -42,8 +42,8 @@ if ($user->socid) {
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php
index e44f3480042..f1a7a5c7877 100644
--- a/htdocs/stripe/class/actions_stripe.class.php
+++ b/htdocs/stripe/class/actions_stripe.class.php
@@ -173,7 +173,7 @@ class ActionsStripeconnect
 			// On verifie si la facture a des paiements
 			$sql = 'SELECT pf.amount';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
-			$sql .= ' WHERE pf.fk_facture = '.$object->id;
+			$sql .= ' WHERE pf.fk_facture = '.((int) $object->id);
 
 			$result = $this->db->query($sql);
 			if ($result) {
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 5614b3c6138..18ebce96f8b 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -170,7 +170,7 @@ class Stripe extends CommonObject
 
 		$sql = "SELECT sa.key_account as key_account, sa.entity"; // key_account is cus_....
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account as sa";
-		$sql .= " WHERE sa.fk_soc = ".$object->id;
+		$sql .= " WHERE sa.fk_soc = ".((int) $object->id);
 		$sql .= " AND sa.entity IN (".getEntity('societe').")";
 		$sql .= " AND sa.site = 'stripe' AND sa.status = ".((int) $status);
 		$sql .= " AND (sa.site_account IS NULL OR sa.site_account = '' OR sa.site_account = '".$this->db->escape($stripearrayofkeysbyenv[$status]['publishable_key'])."')";
@@ -246,7 +246,7 @@ class Stripe extends CommonObject
 
 					// Create customer in Dolibarr
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_account (fk_soc, login, key_account, site, site_account, status, entity, date_creation, fk_user_creat)";
-					$sql .= " VALUES (".$object->id.", '', '".$this->db->escape($customer->id)."', 'stripe', '".$this->db->escape($stripearrayofkeysbyenv[$status]['publishable_key'])."', ".$status.", ".$conf->entity.", '".$this->db->idate(dol_now())."', ".$user->id.")";
+					$sql .= " VALUES (".((int) $object->id).", '', '".$this->db->escape($customer->id)."', 'stripe', '".$this->db->escape($stripearrayofkeysbyenv[$status]['publishable_key'])."', ".((int) $status).", ".((int) $conf->entity).", '".$this->db->idate(dol_now())."', ".((int) $user->id).")";
 					$resql = $this->db->query($sql);
 					if (!$resql) {
 						$this->error = $this->db->lasterror();
@@ -359,7 +359,7 @@ class Stripe extends CommonObject
 
 			$sql = "SELECT pi.ext_payment_id, pi.entity, pi.fk_facture, pi.sourcetype, pi.ext_payment_site";
 			$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pi";
-			$sql .= " WHERE pi.fk_facture = ".$object->id;
+			$sql .= " WHERE pi.fk_facture = ".((int) $object->id);
 			$sql .= " AND pi.sourcetype = '".$this->db->escape($object->element)."'";
 			$sql .= " AND pi.entity IN (".getEntity('societe').")";
 			$sql .= " AND pi.ext_payment_site = '".$this->db->escape($service)."'";
@@ -409,6 +409,9 @@ class Stripe extends CommonObject
 			if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
 				$paymentmethodtypes[] = "sepa_debit"; //&& ($object->thirdparty->isInEEC())
 			}
+			if (!empty($conf->global->STRIPE_KLARNA)) {
+				$paymentmethodtypes[] = "klarna";
+			}
 			if (!empty($conf->global->STRIPE_BANCONTACT)) {
 				$paymentmethodtypes[] = "bancontact";
 			}
@@ -450,7 +453,9 @@ class Stripe extends CommonObject
 			if (!empty($conf->global->STRIPE_GIROPAY)) {
 				unset($dataforintent['setup_future_usage']);
 			}
-
+			if (!empty($conf->global->STRIPE_KLARNA)) {
+				unset($dataforintent['setup_future_usage']);
+			}
 			if (!is_null($payment_method)) {
 				$dataforintent["payment_method"] = $payment_method;
 				$description .= ' - '.$payment_method;
@@ -509,7 +514,7 @@ class Stripe extends CommonObject
 					if (!$paymentintentalreadyexists) {
 						$now = dol_now();
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_facture_demande (date_demande, fk_user_demande, ext_payment_id, fk_facture, sourcetype, entity, ext_payment_site, amount)";
-						$sql .= " VALUES ('".$this->db->idate($now)."', ".$user->id.", '".$this->db->escape($paymentintent->id)."', ".$object->id.", '".$this->db->escape($object->element)."', ".$conf->entity.", '".$this->db->escape($service)."', ".$amount.")";
+						$sql .= " VALUES ('".$this->db->idate($now)."', ".((int) $user->id).", '".$this->db->escape($paymentintent->id)."', ".((int) $object->id).", '".$this->db->escape($object->element)."', ".((int) $conf->entity).", '".$this->db->escape($service)."', ".((float) $amount).")";
 						$resql = $this->db->query($sql);
 						if (!$resql) {
 							$error++;
@@ -675,7 +680,7 @@ class Stripe extends CommonObject
 					{
 						$now=dol_now();
 						$sql = "INSERT INTO " . MAIN_DB_PREFIX . "prelevement_facture_demande (date_demande, fk_user_demande, ext_payment_id, fk_facture, sourcetype, entity, ext_payment_site)";
-						$sql .= " VALUES ('".$this->db->idate($now)."', ".$user->id.", '".$this->db->escape($setupintent->id)."', ".$object->id.", '".$this->db->escape($object->element)."', " . $conf->entity . ", '" . $this->db->escape($service) . "', ".$amount.")";
+						$sql .= " VALUES ('".$this->db->idate($now)."', ".((int) $user->id).", '".$this->db->escape($setupintent->id)."', ".((int) $object->id).", '".$this->db->escape($object->element)."', " . ((int) $conf->entity) . ", '" . $this->db->escape($service) . "', ".((float) $amount).")";
 						$resql = $this->db->query($sql);
 						if (! $resql)
 						{
@@ -728,7 +733,7 @@ class Stripe extends CommonObject
 
 		$sql = "SELECT sa.stripe_card_ref, sa.proprio, sa.exp_date_month, sa.exp_date_year, sa.number, sa.cvn"; // stripe_card_ref is card_....
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as sa";
-		$sql .= " WHERE sa.rowid = ".$object->id; // We get record from ID, no need for filter on entity
+		$sql .= " WHERE sa.rowid = ".((int) $object->id); // We get record from ID, no need for filter on entity
 		$sql .= " AND sa.type = 'card'";
 
 		dol_syslog(get_class($this)."::fetch search stripe card id for paymentmode id=".$object->id.", stripeacc=".$stripeacc.", status=".$status.", createifnotlinkedtostripe=".$createifnotlinkedtostripe, LOG_DEBUG);
@@ -826,7 +831,7 @@ class Stripe extends CommonObject
 							$sql .= " SET stripe_card_ref = '".$this->db->escape($card->id)."', card_type = '".$this->db->escape($card->brand)."',";
 							$sql .= " country_code = '".$this->db->escape($card->country)."',";
 							$sql .= " approved = ".($card->cvc_check == 'pass' ? 1 : 0);
-							$sql .= " WHERE rowid = ".$object->id;
+							$sql .= " WHERE rowid = ".((int) $object->id);
 							$sql .= " AND type = 'card'";
 							$resql = $this->db->query($sql);
 							if (!$resql) {
diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php
index 8749847b958..b0503a7103f 100644
--- a/htdocs/stripe/lib/stripe.lib.php
+++ b/htdocs/stripe/lib/stripe.lib.php
@@ -118,9 +118,9 @@ function html_print_stripe_footer($fromcompany, $langs)
 	}
 
 	print '<br><br><hr>'."\n";
-	print '<div class="center"><font style="font-size: 10px;">'."\n";
+	print '<div class="center"><span style="font-size: 10px;">'."\n";
 	print $fromcompany->name.'<br>';
 	print $line1.'<br>';
 	print $line2;
-	print '</font></div>'."\n";
+	print '</span></div>'."\n";
 }
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index 75c24ef0561..34b4ea1dc4f 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -42,8 +42,8 @@ if ($user->socid) {
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 0d43c830e8e..6bab8459d18 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -42,8 +42,8 @@ if ($user->socid) {
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $rowid = GETPOST("rowid", 'alpha');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 1500f00ba91..a5837c2557f 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -60,6 +60,7 @@ $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel');
 $origin = GETPOST('origin', 'alpha');
 $originid = GETPOST('originid', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -132,8 +133,23 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/supplier_proposal/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.'/supplier_proposal/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
 	if ($cancel) {
-		if (!empty($backtopage)) {
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -1126,12 +1142,24 @@ if ($action == 'create') {
 	print '<td class="fieldrequired">'.$langs->trans('Supplier').'</td>';
 	if ($socid > 0) {
 		print '<td colspan="2">';
-		print $soc->getNomUrl(1);
+		print $soc->getNomUrl(1, 'supplier');
 		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 		print '</td>';
 	} else {
 		print '<td colspan="2">';
 		print img_picto('', 'company').$form->select_company('', 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+		// reload page to retrieve customer informations
+		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE)) {
+			print '<script>
+			$(document).ready(function() {
+				$("#socid").change(function() {
+					var socid = $(this).val();
+					// reload page
+					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid;
+				});
+			});
+			</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>';
 		print '</td>';
 	}
@@ -1330,11 +1358,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-	print '</div>';
+	print $form->buttonsSaveCancel("CreateDraft");
 
 	print "</form>";
 
@@ -1441,7 +1465,7 @@ if ($action == 'create') {
 	//$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreateorder, 'string', '', 0, 1);
 	//$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreateorder, 'string', '', null, null, '', 1);
 	// Thirdparty
-	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'supplier');
 	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherProposals").'</a>)';
 	}
@@ -1451,7 +1475,7 @@ if ($action == 'create') {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($usercancreate) {
 			if ($action != 'classify') {
-				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				$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);
@@ -1468,9 +1492,10 @@ if ($action == 'create') {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
@@ -1517,7 +1542,7 @@ if ($action == 'create') {
 	print $langs->trans('PaymentConditionsShort');
 	print '</td>';
 	if ($action != 'editconditions' && $object->statut != SupplierProposal::STATUS_NOTSIGNED) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td class="valuefield">';
@@ -1536,7 +1561,7 @@ if ($action == 'create') {
 	print $langs->trans('DeliveryDate');
 	print '</td>';
 	if ($action != 'editdate_livraison' && $object->statut == SupplierProposal::STATUS_VALIDATED) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDeliveryDate'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDeliveryDate'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td class="valuefield">';
@@ -1545,7 +1570,7 @@ if ($action == 'create') {
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setdate_livraison">';
 		print $form->selectDate($object->delivery_date, 'liv_', '', '', '', "editdate_livraison");
-		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
 		print dol_print_date($object->delivery_date, 'daytext');
@@ -1560,7 +1585,7 @@ if ($action == 'create') {
 	print $langs->trans('PaymentMode');
 	print '</td>';
 	if ($action != 'editmode' && $object->statut != SupplierProposal::STATUS_NOTSIGNED) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'), 1).'</a></td>';
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td class="valuefield">';
@@ -1580,7 +1605,7 @@ if ($action == 'create') {
 		print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
 		print '</td>';
 		if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_VALIDATED) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+			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 class="valuefield">';
@@ -1599,7 +1624,7 @@ if ($action == 'create') {
 			print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
 			print '</td>';
 			if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_VALIDATED && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+				print '<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 class="valuefield">';
@@ -1641,7 +1666,7 @@ if ($action == 'create') {
 		print $langs->trans('BankAccount');
 		print '</td>';
 		if ($action != 'editbankaccount' && $usercancreate) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+			print '<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 class="valuefield">';
@@ -1661,7 +1686,6 @@ if ($action == 'create') {
 
 	print '</div>';
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border tableforfield centpercent">';
@@ -1717,7 +1741,6 @@ if ($action == 'create') {
 	   $formmargin->displayMarginInfos($object);
 	}*/
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
@@ -1808,11 +1831,8 @@ if ($action == 'create') {
 		$form_close .= $object->note_private;
 		$form_close .= '</textarea></td></tr>';
 		$form_close .= '</table>';
-		$form_close .= '<center>';
-		$form_close .= '<input type="submit" class="button button-save" name="validate" value="'.$langs->trans("Save").'">';
-		$form_close .= ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-		$form_close .= '<a name="acceptedrefused">&nbsp;</a>';
-		$form_close .= '</center>';
+		$form_close .= $form->buttonsSaveCancel();
+		$form_close .= '<a id="acceptedrefused">&nbsp;</a>';
 		$form_close .= '</form>';
 
 		print $form_close;
@@ -1839,12 +1859,12 @@ if ($action == 'create') {
 
 				// Edit
 				if ($object->statut == SupplierProposal::STATUS_VALIDATED && $usercancreate) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=modif">'.$langs->trans('Modify').'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=modif&token='.newToken().'">'.$langs->trans('Modify').'</a></div>';
 				}
 
 				// ReOpen
 				if (($object->statut == SupplierProposal::STATUS_SIGNED || $object->statut == SupplierProposal::STATUS_NOTSIGNED || $object->statut == SupplierProposal::STATUS_CLOSE) && $usercanclose) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen').'"';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen').'"';
 					print '>'.$langs->trans('ReOpen').'</a></div>';
 				}
 
@@ -1852,7 +1872,7 @@ if ($action == 'create') {
 				if (empty($user->socid)) {
 					if ($object->statut == SupplierProposal::STATUS_VALIDATED || $object->statut == SupplierProposal::STATUS_SIGNED) {
 						if ($usercansend) {
-							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
+							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
 						} else {
 							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
 						}
@@ -1880,12 +1900,12 @@ if ($action == 'create') {
 
 				// Clone
 				if ($usercancreate) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object='.$object->element.'">'.$langs->trans("ToClone").'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object='.$object->element.'">'.$langs->trans("ToClone").'</a></div>';
 				}
 
 				// Delete
 				if (($object->statut == SupplierProposal::STATUS_DRAFT && $usercancreate) || $usercandelete) {
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'"';
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'"';
 					print '>'.$langs->trans('Delete').'</a></div>';
 				}
 			}
@@ -1914,14 +1934,14 @@ if ($action == 'create') {
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
 		$somethingshown = $formactions->showactions($object, 'supplier_proposal', $socid, 1);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 	// Select mail models is same action as presend
diff --git a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
index 61ba9c48de3..f2036edda88 100644
--- a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
+++ b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
@@ -139,8 +139,9 @@ class Supplierproposals extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 6b76cf23af6..057b32e89ca 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2014      Marcos García            <marcosgdf@gmail.com>
  * Copyright (C) 2016      Ferran Marcet            <fmarcet@2byte.es>
  * Copyright (C) 2018      Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2019-2020 Frédéric France          <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -725,6 +725,9 @@ class SupplierProposal extends CommonObject
 			$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];
@@ -732,6 +735,11 @@ class SupplierProposal extends CommonObject
 			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
+			$pu = $pu_ht;
+			if ($price_base_type == 'TTC') {
+				$pu = $pu_ttc;
+			}
+
 			//Fetch current line from the database and then clone the object and set it in $oldline property
 			$line = new SupplierProposalLine($this->db);
 			$line->fetch($rowid);
@@ -929,11 +937,11 @@ class SupplierProposal extends CommonObject
 		$sql .= ", multicurrency_tx";
 		$sql .= ") ";
 		$sql .= " VALUES (";
-		$sql .= $this->socid;
+		$sql .= ((int) $this->socid);
 		$sql .= ", 0";
-		$sql .= ", ".$this->remise;
-		$sql .= ", ".($this->remise_percent ? $this->db->escape($this->remise_percent) : 'null');
-		$sql .= ", ".($this->remise_absolue ? $this->db->escape($this->remise_absolue) : 'null');
+		$sql .= ", ".((double) $this->remise);
+		$sql .= ", ".($this->remise_percent ? ((double) $this->remise_percent) : 'null');
+		$sql .= ", ".($this->remise_absolue ? ((double) $this->remise_absolue) : 'null');
 		$sql .= ", 0";
 		$sql .= ", 0";
 		$sql .= ", '".$this->db->idate($now)."'";
@@ -942,16 +950,16 @@ class SupplierProposal extends CommonObject
 		$sql .= ", '".$this->db->escape($this->note_private)."'";
 		$sql .= ", '".$this->db->escape($this->note_public)."'";
 		$sql .= ", '".$this->db->escape($this->model_pdf)."'";
-		$sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'NULL');
-		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL');
-		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+		$sql .= ", ".($this->cond_reglement_id > 0 ? ((int) $this->cond_reglement_id) : 'NULL');
+		$sql .= ", ".($this->mode_reglement_id > 0 ? ((int) $this->mode_reglement_id) : 'NULL');
+		$sql .= ", ".($this->fk_account > 0 ? ((int) $this->fk_account) : 'NULL');
 		$sql .= ", ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : "null");
-		$sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
-		$sql .= ", ".($this->fk_project ? $this->fk_project : "null");
-		$sql .= ", ".$conf->entity;
-		$sql .= ", ".(int) $this->fk_multicurrency;
+		$sql .= ", ".($this->shipping_method_id > 0 ? ((int) $this->shipping_method_id) : 'NULL');
+		$sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : "null");
+		$sql .= ", ".((int) $conf->entity);
+		$sql .= ", ".((int) $this->fk_multicurrency);
 		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql .= ", ".(double) $this->multicurrency_tx;
+		$sql .= ", ".((double) $this->multicurrency_tx);
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -1019,7 +1027,7 @@ class SupplierProposal extends CommonObject
 							$fk_parent_line,
 							$this->lines[$i]->fk_fournprice,
 							$this->lines[$i]->pa_ht,
-							empty($this->lines[$i]->label) ? '' : $this->lines[$i]->label,		// deprecated
+							empty($this->lines[$i]->label) ? '' : $this->lines[$i]->label, // deprecated
 							$this->lines[$i]->array_options,
 							$this->lines[$i]->ref_fourn,
 							$this->lines[$i]->fk_unit,
@@ -1405,7 +1413,9 @@ class SupplierProposal extends CommonObject
 			$soc = new Societe($this->db);
 			$result = $soc->fetch($this->socid);
 
-			if ($result < 0) return -1;
+			if ($result < 0) {
+				return -1;
+			}
 
 			// Define new ref
 			if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) { // empty should not happened, but when it occurs, the test save life
@@ -1935,17 +1945,17 @@ class SupplierProposal extends CommonObject
 		$sql = "SELECT s.rowid, s.nom as name, s.client,";
 		$sql .= " p.rowid as supplier_proposalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
 		$sql .= " p.datep as dp, p.fin_validite as datelimite";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", sc.fk_soc, sc.fk_user";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."c_propalst as c";
-		if (!$user->rights->societe->client->voir && !$socid) {
+		if (empty($user->rights->societe->client->voir) && !$socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE p.entity IN (".getEntity('supplier_proposal').")";
 		$sql .= " AND p.fk_soc = s.rowid";
 		$sql .= " AND p.fk_statut = c.id";
-		if (!$user->rights->societe->client->voir && !$socid) { //restriction
+		if (empty($user->rights->societe->client->voir) && !$socid) { //restriction
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($socid) {
@@ -2218,7 +2228,7 @@ class SupplierProposal extends CommonObject
 
 		$sql = "SELECT p.rowid, p.ref, p.datec as datec, p.date_cloture as datefin";
 		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (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";
@@ -2375,7 +2385,7 @@ class SupplierProposal extends CommonObject
 		$sql = "SELECT count(p.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
@@ -2565,7 +2575,7 @@ class SupplierProposal extends CommonObject
 		$sql .= ' pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc, pt.fk_unit';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pt';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
-		$sql .= ' WHERE pt.fk_supplier_proposal = '.$this->id;
+		$sql .= ' WHERE pt.fk_supplier_proposal = '.((int) $this->id);
 		$sql .= ' ORDER BY pt.rang ASC, pt.rowid';
 
 		dol_syslog(get_class($this).'::getLinesArray', LOG_DEBUG);
@@ -2996,7 +3006,8 @@ class SupplierProposalLine extends CommonObjectLine
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0) {
-			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) {
+			$result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product);
+			if ($result < 0) {
 				return $result;
 			} else {
 				$this->pa_ht = $result;
@@ -3021,40 +3032,40 @@ class SupplierProposalLine extends CommonObjectLine
 		$sql .= ' ref_fourn,';
 		$sql .= ' fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc, fk_unit)';
 		$sql .= " VALUES (".$this->fk_supplier_proposal.",";
-		$sql .= " ".($this->fk_parent_line > 0 ? "'".$this->db->escape($this->fk_parent_line)."'" : "null").",";
+		$sql .= " ".($this->fk_parent_line > 0 ? ((int) $this->db->escape($this->fk_parent_line)) : "null").",";
 		$sql .= " ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
 		$sql .= " '".$this->db->escape($this->desc)."',";
-		$sql .= " ".($this->fk_product ? "'".$this->db->escape($this->fk_product)."'" : "null").",";
+		$sql .= " ".($this->fk_product ? ((int) $this->fk_product) : "null").",";
 		$sql .= " '".$this->db->escape($this->product_type)."',";
 		$sql .= " ".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null").",";
 		$sql .= " ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null").",";
-		$sql .= " ".($this->fk_remise_except ? "'".$this->db->escape($this->fk_remise_except)."'" : "null").",";
-		$sql .= " ".price2num($this->qty).",";
+		$sql .= " ".($this->fk_remise_except ? ((int) $this->db->escape($this->fk_remise_except)) : "null").",";
+		$sql .= " ".price2num($this->qty, 'MS').",";
 		$sql .= " ".price2num($this->tva_tx).",";
 		$sql .= " ".price2num($this->localtax1_tx).",";
 		$sql .= " ".price2num($this->localtax2_tx).",";
 		$sql .= " '".$this->db->escape($this->localtax1_type)."',";
 		$sql .= " '".$this->db->escape($this->localtax2_type)."',";
-		$sql .= " ".(!empty($this->subprice) ?price2num($this->subprice) : "null").",";
-		$sql .= " ".price2num($this->remise_percent).",";
-		$sql .= " ".(isset($this->info_bits) ? "'".$this->db->escape($this->info_bits)."'" : "null").",";
-		$sql .= " ".price2num($this->total_ht).",";
-		$sql .= " ".price2num($this->total_tva).",";
-		$sql .= " ".price2num($this->total_localtax1).",";
-		$sql .= " ".price2num($this->total_localtax2).",";
-		$sql .= " ".price2num($this->total_ttc).",";
-		$sql .= " ".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null").",";
-		$sql .= " ".(isset($this->pa_ht) ? "'".price2num($this->pa_ht)."'" : "null").",";
-		$sql .= ' '.$this->special_code.',';
-		$sql .= ' '.$this->rang.',';
+		$sql .= " ".(!empty($this->subprice) ? price2num($this->subprice, 'MU') : "null").",";
+		$sql .= " ".((float) $this->remise_percent).",";
+		$sql .= " ".(isset($this->info_bits) ? ((int) $this->info_bits) : "null").",";
+		$sql .= " ".price2num($this->total_ht, 'MT').",";
+		$sql .= " ".price2num($this->total_tva, 'MT').",";
+		$sql .= " ".price2num($this->total_localtax1, 'MT').",";
+		$sql .= " ".price2num($this->total_localtax2, 'MT').",";
+		$sql .= " ".price2num($this->total_ttc, 'MT').",";
+		$sql .= " ".(!empty($this->fk_fournprice) ? ((int) $this->fk_fournprice) : "null").",";
+		$sql .= " ".(isset($this->pa_ht) ? price2num($this->pa_ht, 'MU') : "null").",";
+		$sql .= ' '.((int) $this->special_code).',';
+		$sql .= ' '.((int) $this->rang).',';
 		$sql .= " '".$this->db->escape($this->ref_fourn)."'";
-		$sql .= ", ".($this->fk_multicurrency > 0 ? $this->fk_multicurrency : 'null');
+		$sql .= ", ".($this->fk_multicurrency > 0 ? ((int) $this->fk_multicurrency) : 'null');
 		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql .= ", ".$this->multicurrency_subprice;
-		$sql .= ", ".$this->multicurrency_total_ht;
-		$sql .= ", ".$this->multicurrency_total_tva;
-		$sql .= ", ".$this->multicurrency_total_ttc;
-		$sql .= ", ".($this->fk_unit ? $this->fk_unit : 'null');
+		$sql .= ", ".price2num($this->multicurrency_subprice, 'CU');
+		$sql .= ", ".price2num($this->multicurrency_total_ht, 'CT');
+		$sql .= ", ".price2num($this->multicurrency_total_tva, 'CT');
+		$sql .= ", ".price2num($this->multicurrency_total_ttc, 'CT');
+		$sql .= ", ".($this->fk_unit ? ((int) $this->fk_unit) : 'null');
 		$sql .= ')';
 
 		dol_syslog(get_class($this).'::insert', LOG_DEBUG);
@@ -3198,7 +3209,8 @@ class SupplierProposalLine extends CommonObjectLine
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0) {
-			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) {
+			$result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product);
+			if ($result < 0) {
 				return $result;
 			} else {
 				$this->pa_ht = $result;
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index 02a4fc51966..f1756f17814 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -139,7 +139,7 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($permissiontoedit) {
 				if ($action != 'classify') {
-					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
 				}
 				if ($action == 'classify') {
@@ -157,9 +157,10 @@ if ($id > 0 || !empty($ref)) {
 				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>';
+					$morehtmlref .= ' : '.$proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 580c0f0974e..fa73ec22fa8 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -52,8 +52,8 @@ $result = restrictedArea($user, 'supplier_proposal', $id);
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -73,6 +73,15 @@ $object->fetch($id, $ref);
 if ($object->id > 0) {
 	$object->fetch_thirdparty();
 	$upload_dir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($object->ref);
+}
+
+$permissiontoadd = $user->rights->supplier_proposal->creer;
+
+/*
+ * Actions
+ */
+
+if ($object->id > 0) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 }
 
@@ -80,6 +89,7 @@ if ($object->id > 0) {
 /*
  * View
  */
+
 $title = $langs->trans('CommRequest')." - ".$langs->trans('Documents');
 $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
 llxHeader('', $title, $help_url);
@@ -116,7 +126,7 @@ if ($object->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->supplier_proposal->creer) {
 			if ($action != 'classify') {
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -134,9 +144,10 @@ if ($object->id > 0) {
 			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>';
+				$morehtmlref .= ' : '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index 45501ed9b2b..f151651d186 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -66,15 +66,15 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 $sql = "SELECT count(p.rowid), p.fk_statut";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."supplier_proposal as p";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE p.fk_soc = s.rowid";
 $sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
 if ($user->socid) {
-	$sql .= ' AND p.fk_soc = '.$user->socid;
+	$sql .= ' AND p.fk_soc = '.((int) $user->socid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " AND p.fk_statut IN (0,1,2,3,4)";
@@ -166,7 +166,7 @@ if (!empty($conf->supplier_proposal->enabled)) {
 	$sql = "SELECT c.rowid, c.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client";
 	$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
@@ -175,7 +175,7 @@ if (!empty($conf->supplier_proposal->enabled)) {
 	if ($socid) {
 		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 
@@ -211,7 +211,7 @@ if (!empty($conf->supplier_proposal->enabled)) {
 	}
 }
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 $max = 5;
@@ -224,7 +224,7 @@ $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as socname, s.rowid as socid,
 $sql .= " date_cloture as datec";
 $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE c.fk_soc = s.rowid";
@@ -233,7 +233,7 @@ $sql .= " AND c.entity = ".$conf->entity;
 if ($socid) {
 	$sql .= " AND c.fk_soc = ".((int) $socid);
 }
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " ORDER BY c.tms DESC";
@@ -305,13 +305,13 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, p.rowid as supplier_proposalid, p.total_ttc, p.total_tva, p.total_ht, p.ref, p.fk_statut, p.datec as dp";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."supplier_proposal as p";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE p.fk_soc = s.rowid";
 	$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
 	$sql .= " AND p.fk_statut = 1";
-	if (!$user->rights->societe->client->voir && !$socid) {
+	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -385,7 +385,7 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 	}
 }
 
-print '</div></div></div>';
+print '</div></div>';
 
 $parameters = array('user' => $user);
 $reshook = $hookmanager->executeHooks('dashboardSupplierProposal', $parameters, $object); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php
index 80c67871e91..0b796937d2e 100644
--- a/htdocs/supplier_proposal/info.php
+++ b/htdocs/supplier_proposal/info.php
@@ -81,7 +81,7 @@ if (!empty($conf->projet->enabled)) {
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->supplier_proposal->creer) {
 		if ($action != 'classify') {
-			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			$morehtmlref .= ' : ';
 		}
 		if ($action == 'classify') {
@@ -99,9 +99,10 @@ if (!empty($conf->projet->enabled)) {
 		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>';
+			$morehtmlref .= ' : '.$proj->getNomUrl(1);
+			if ($proj->title) {
+				$morehtmlref .= ' - '.$proj->title;
+			}
 		} else {
 			$morehtmlref .= '';
 		}
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index ba68fb82a77..ad35c8f9914 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -1,16 +1,17 @@
 <?php
-/* Copyright (C) 2001-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2017 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-2013 Regis Houssin         <regis.houssin@inodbox.com>
- * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
- * Copyright (C) 2010-2011 Juanjo Menent         <jmenent@2byte.es>
- * Copyright (C) 2010-2019 Philippe Grand        <philippe.grand@atoo-net.com>
- * Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>
- * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
- * Copyright (C) 2016	   Ferran Marcet         <fmarcet@2byte.es>
- * Copyright (C) 2018	   Charlene Benke        <charlie@patas-monkey.com>
+/* Copyright (C) 2001-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2017	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-2013	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
+ * Copyright (C) 2010-2011	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2010-2019	Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@altairis.fr>
+ * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
+ * Copyright (C) 2016		Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2018		Charlene Benke			<charlie@patas-monkey.com>
+ * Copyright (C) 2021		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
@@ -65,6 +66,22 @@ $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state");
 $search_country = GETPOST("search_country", '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);
+$search_date_valid_startday = GETPOST('search_date_valid_startday', 'int');
+$search_date_valid_startmonth = GETPOST('search_date_valid_startmonth', 'int');
+$search_date_valid_startyear = GETPOST('search_date_valid_startyear', 'int');
+$search_date_valid_endday = GETPOST('search_date_valid_endday', 'int');
+$search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int');
+$search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int');
+$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear);	// Use tzserver
+$search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_montant_ht = GETPOST('search_montant_ht', 'alpha');
 $search_montant_vat = GETPOST('search_montant_vat', 'alpha');
@@ -83,17 +100,11 @@ $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 
 $mesg = (GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
-$year = GETPOST("year");
-$month = GETPOST("month");
-$day = GETPOST("day");
-$yearvalid = GETPOST("yearvalid");
-$monthvalid = GETPOST("monthvalid");
-$dayvalid = GETPOST("dayvalid");
 
 $optioncss = GETPOST('optioncss', 'alpha');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
@@ -202,6 +213,8 @@ if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
+$search_product_category = 0;
+
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Do we click on purge search criteria ?
@@ -227,12 +240,22 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_type = '';
 	$search_country = '';
 	$search_type_thirdparty = '';
-	$yearvalid = '';
-	$monthvalid = '';
-	$dayvalid = '';
-	$year = '';
-	$month = '';
-	$day = '';
+	$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_valid_startday = '';
+	$search_date_valid_startmonth = '';
+	$search_date_valid_startyear = '';
+	$search_date_valid_endday = '';
+	$search_date_valid_endmonth = '';
+	$search_date_valid_endyear = '';
+	$search_date_valid_start = '';
+	$search_date_valid_end = '';
 	$search_status = '';
 	$object_statut = '';
 }
@@ -276,14 +299,14 @@ $sql .= ' sp.rowid, sp.note_public, sp.note_private, sp.total_ht, sp.total_tva,
 $sql .= ' sp.fk_multicurrency, sp.multicurrency_code, sp.multicurrency_tx, sp.multicurrency_total_ht, sp.multicurrency_total_tva as multicurrency_total_vat, sp.multicurrency_total_ttc,';
 $sql .= ' sp.datec as date_creation, sp.tms as date_update,';
 $sql .= " p.rowid as project_id, p.ref as project_ref,";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " sc.fk_soc, sc.fk_user,";
 }
-$sql .= " u.firstname, u.lastname, u.photo, u.login";
+$sql .= " u.firstname, u.lastname, u.photo, u.login, u.statut as status, 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) {
-		$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
@@ -307,7 +330,7 @@ if ($search_product_category > 0) {
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON sp.fk_user_author = u.rowid';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = sp.fk_projet";
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
+if ($search_sale > 0 || (empty($user->rights->societe->client->voir) && !$socid)) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 if ($search_user > 0) {
@@ -316,7 +339,7 @@ if ($search_user > 0) {
 }
 $sql .= ' WHERE sp.fk_soc = s.rowid';
 $sql .= ' AND sp.entity IN ('.getEntity('supplier_proposal').')';
-if (!$user->rights->societe->client->voir && !$socid) { //restriction
+if (empty($user->rights->societe->client->voir) && !$socid) { //restriction
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 if ($search_town) {
@@ -353,7 +376,7 @@ if ($search_montant_ttc != '') {
 	$sql .= natural_search("sp.total_ttc", $search_montant_ttc, 1);
 }
 if ($search_multicurrency_code != '') {
-	$sql .= ' AND sp.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
+	$sql .= " AND sp.multicurrency_code = '".$db->escape($search_multicurrency_code)."'";
 }
 if ($search_multicurrency_tx != '') {
 	$sql .= natural_search('sp.multicurrency_tx', $search_multicurrency_tx, 1);
@@ -376,8 +399,18 @@ if ($socid) {
 if ($search_status >= 0 && $search_status != '') {
 	$sql .= ' AND sp.fk_statut IN ('.$db->sanitize($db->escape($search_status)).')';
 }
-$sql .= dolSqlDateFilter("sp.date_livraison", $day, $month, $year);
-$sql .= dolSqlDateFilter("sp.date_valid", $dayvalid, $monthvalid, $yearvalid);
+if ($search_date_start) {
+	$sql .= " AND sp.date_livraison >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+	$sql .= " AND sp.date_livraison <= '".$db->idate($search_date_end)."'";
+}
+if ($search_date_valid_start) {
+	$sql .= " AND sp.date_valid >= '".$db->idate($search_date_valid_start)."'";
+}
+if ($search_date_valid_end) {
+	$sql .= " AND sp.date_valid <= '".$db->idate($search_date_valid_end)."'";
+}
 if ($search_sale > 0) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
 }
@@ -446,11 +479,41 @@ if ($resql) {
 	if ($sall) {
 		$param .= '&sall='.urlencode($sall);
 	}
-	if ($month) {
-		$param .= '&month='.urlencode($month);
+	if ($search_date_startday) {
+		$param .= '&search_date_startday='.urlencode($search_date_startday);
 	}
-	if ($year) {
-		$param .= '&year='.urlencode($year);
+	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_valid_startday) {
+		$param .= '&search_date_valid_startday='.urlencode($search_date_valid_startday);
+	}
+	if ($search_date_valid_startmonth) {
+		$param .= '&search_date_valid_startmonth='.urlencode($search_date_valid_startmonth);
+	}
+	if ($search_date_valid_startyear) {
+		$param .= '&search_date_valid_startyear='.urlencode($search_date_valid_startyear);
+	}
+	if ($search_date_valid_endday) {
+		$param .= '&search_date_valid_endday='.urlencode($search_date_valid_endday);
+	}
+	if ($search_date_valid_endmonth) {
+		$param .= '&search_date_valid_endmonth='.urlencode($search_date_valid_endmonth);
+	}
+	if ($search_date_valid_endyear) {
+		$param .= '&search_date_valid_endyear='.urlencode($search_date_valid_endyear);
 	}
 	if ($search_ref) {
 		$param .= '&search_ref='.urlencode($search_ref);
@@ -561,14 +624,14 @@ if ($resql) {
 		$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>';
 	}
 	// If the user can view prospects other than his'
 	if ($user->rights->societe->client->voir || $socid) {
 		$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');
+		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view products
@@ -577,7 +640,7 @@ if ($resql) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300 widthcentpercentminusx', 1);
 		$moreforfilter .= '</div>';
 	}
 	$parameters = array();
@@ -641,21 +704,23 @@ if ($resql) {
 	// Date
 	if (!empty($arrayfields['sp.date_valid']['checked'])) {
 		print '<td class="liste_titre center">';
-		//print $langs->trans('Month').': ';
-		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="monthvalid" value="'.dol_escape_htmltag($monthvalid).'">';
-		//print '&nbsp;'.$langs->trans('Year').': ';
-		$syearvalid = $yearvalid;
-		$formother->select_year($syearvalid, 'yearvalid', 1, 20, 5);
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_valid_start ? $search_date_valid_start : -1, 'search_date_valid_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print '</div>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_date_valid_end ? $search_date_valid_end : -1, 'search_date_valid_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
 		print '</td>';
 	}
 	// Date
 	if (!empty($arrayfields['sp.date_livraison']['checked'])) {
 		print '<td class="liste_titre center">';
-		//print $langs->trans('Month').': ';
-		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
-		//print '&nbsp;'.$langs->trans('Year').': ';
-		$syear = $year;
-		$formother->select_year($syear, '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>';
 	}
 
@@ -731,8 +796,8 @@ if ($resql) {
 	}
 	// Status
 	if (!empty($arrayfields['sp.fk_statut']['checked'])) {
-		print '<td class="liste_titre maxwidthonsmartphone right">';
-		$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'supplier', 'search_status');
+		print '<td class="liste_titre right">';
+		$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'supplier', 'search_status', 'minwidth75imp');
 		print '</td>';
 	}
 	// Action column
@@ -845,11 +910,11 @@ if ($resql) {
 		print '<tr class="oddeven">';
 
 		if (!empty($arrayfields['sp.ref']['checked'])) {
-			print '<td class="nowrap">';
+			print '<td class="nowraponall">';
 
 			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 			// Picto + Ref
-			print '<td class="nobordernopadding nowrap">';
+			print '<td class="nobordernopadding nowraponall">';
 			print $objectstatic->getNomUrl(1, '', '', 0, -1, 1);
 			print '</td>';
 			// Warning
@@ -1027,12 +1092,20 @@ if ($resql) {
 
 		$userstatic->id = $obj->fk_user_author;
 		$userstatic->login = $obj->login;
+		$userstatic->status = $obj->status;
+		$userstatic->lastname = $obj->name;
+		$userstatic->firstname = $obj->firstname;
+		$userstatic->photo = $obj->photo;
+		$userstatic->admin = $obj->admin;
+		$userstatic->ref = $obj->fk_user_author;
+		$userstatic->employee = $obj->employee;
+		$userstatic->email = $obj->uemail;
 
 		// Author
 		if (!empty($arrayfields['u.login']['checked'])) {
 			print '<td class="center">';
-			if ($userstatic->id) {
-				print $userstatic->getLoginUrl(1);
+			if ($userstatic->id > 0) {
+				print $userstatic->getNomUrl(-1, '', 0, 0, 24, 1, 'login', '', 1);
 			} else {
 				print '&nbsp;';
 			}
diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index d16bc90033e..5a19a94b402 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -43,6 +43,11 @@ $action = GETPOST('action', 'aZ09');
 if ($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('supplier_proposalnote'));
+
 $result = restrictedArea($user, 'supplier_proposal', $id, 'supplier_proposal');
 
 $object = new SupplierProposal($db);
@@ -55,7 +60,13 @@ $object = new SupplierProposal($db);
 
 $permissionnote = $user->rights->supplier_proposal->creer; // Used by the include of actions_setnotes.inc.php
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+$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
+}
 
 
 /*
@@ -99,7 +110,7 @@ if ($id > 0 || !empty($ref)) {
 				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 				if ($user->rights->supplier_proposal->creer) {
 					if ($action != 'classify') {
-						//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+						//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 						$morehtmlref .= ' : ';
 					}
 					if ($action == 'classify') {
@@ -117,9 +128,10 @@ if ($id > 0 || !empty($ref)) {
 					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>';
+						$morehtmlref .= ' : '.$proj->getNomUrl(1);
+						if ($proj->title) {
+							$morehtmlref .= ' - '.$proj->title;
+						}
 					} else {
 						$morehtmlref .= '';
 					}
diff --git a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
index c33c3b2ebac..d0fce33ed22 100644
--- a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
@@ -53,7 +53,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 			echo price($objectlink->total_ht);
 		} ?></td>
 		<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
-		<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+		<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 	</tr>
 	<?php
 }
diff --git a/htdocs/support/index.php b/htdocs/support/index.php
index 4c80445865b..7330c034aa7 100644
--- a/htdocs/support/index.php
+++ b/htdocs/support/index.php
@@ -83,9 +83,9 @@ print '<td width="100%" align="left" valign="middle">';
 
 print '<table summary="who"><tr><td>'.img_picto('', 'who.png', 'class="valignmiddle"', 1).'</td><td>';
 
-print '<font style="'.$style1.'">'.$langs->trans("CommunitySupport").'</font>';
+print '<span style="'.$style1.'">'.$langs->trans("CommunitySupport").'</span>';
 print '<span class="small">';
-print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> <font style="'.$style2.'">'.$langs->trans("TypeSupportCommunauty").'</font>';
+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 '</span>';
@@ -147,9 +147,9 @@ print '<td width="100%" align="left" valign="middle">';
 
 print '<table summary="mail"><tr><td>'.img_picto('', 'mail.png', 'class="valignmiddle"', 1).'</td><td>';
 
-print '<font style="'.$style1.'">'.$langs->trans("EMailSupport").'</font>';
+print '<span style="'.$style1.'">'.$langs->trans("EMailSupport").'</span>';
 print '<span class="small">';
-print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> <font style="'.$style2.'">'.$langs->trans("TypeSupportCommercial").'</font>';
+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 '</span>';
@@ -182,9 +182,9 @@ print '<td width="100%" align="left" valign="middle">';
 
 print '<table summary="special"><tr><td>'.img_picto('', 'pagemaster.png', 'class="valignmiddle"', 1).'</td><td>';
 
-print '<font style="'.$style1.'">'.$langs->trans("OtherSupport").'</font>';
+print '<span style="'.$style1.'">'.$langs->trans("OtherSupport").'</span>';
 print '<span class="small">';
-print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> <font style="'.$style2.'">'.$langs->trans("TypeSupportCommercial").'</font>';
+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").'/?/?';
diff --git a/htdocs/takepos/admin/appearance.php b/htdocs/takepos/admin/appearance.php
index ef448607b10..135a3b2a9e7 100644
--- a/htdocs/takepos/admin/appearance.php
+++ b/htdocs/takepos/admin/appearance.php
@@ -119,9 +119,7 @@ print "</td></tr>\n";
 
 print '</table>';
 
-print '<br>';
-
-print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print "</form>\n";
 
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index d330e792f53..db6d6c8c67d 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -200,7 +200,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 
 	print '<br>';
 
-	print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
+	print $form->buttonsSaveCancel("Save", '');
 }
 
 if (!empty($conf->global->TAKEPOS_BAR_RESTAURANT)) {
@@ -210,13 +210,13 @@ if (!empty($conf->global->TAKEPOS_BAR_RESTAURANT)) {
 		print '<br>';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans("URL").'</td><td class="right">'.$langs->trans("QR").'</td>';
+		print '<td>'.$langs->trans("URL").' - '.$langs->trans("CustomerMenu").'</td><td class="right">'.$langs->trans("QR").'</td>';
 		print "</tr>\n";
 		print '<tr class="oddeven value"><td>';
-		print '<a target="_blank" href="'.$urlwithroot.'/takepos/public/menu.php">'.$urlwithroot.'/takepos/public/menu.php</a>';
+		print '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/takepos/public/menu.php">'.$urlwithroot.'/takepos/public/menu.php</a>';
 		print '</td>';
 		print '<td class="right">';
-		print '<a target="_blank" href="printqr.php"><img src="'.DOL_URL_ROOT.'/takepos/genimg/qr.php" height="42" width="42"></a>';
+		print '<a target="_blank" rel="noopener noreferrer" href="printqr.php"><img src="'.DOL_URL_ROOT.'/takepos/genimg/qr.php" height="42" width="42"></a>';
 		print '</td></tr>';
 		print '</table>';
 	}
@@ -225,7 +225,7 @@ if (!empty($conf->global->TAKEPOS_BAR_RESTAURANT)) {
 		print '<br>';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans("Table").'</td><td>'.$langs->trans("URL").'</td><td class="right">'.$langs->trans("QR").'</td>';
+		print '<td>'.$langs->trans("Table").'</td><td>'.$langs->trans("URL").' - '.$langs->trans("AutoOrder").'</td><td class="right">'.$langs->trans("QR").'</td>';
 		print "</tr>\n";
 
 		//global $dolibarr_main_url_root;
@@ -239,10 +239,10 @@ if (!empty($conf->global->TAKEPOS_BAR_RESTAURANT)) {
 			print $langs->trans("Table")." ".$row['label'];
 			print '</td>';
 			print '<td>';
-			print "<a target='_blank' href='".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."'>".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."</a>";
+			print '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid']).'">'.$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid']).'</a>';
 			print '</td>';
 			print '<td class="right">';
-			print "<a target='_blank' href='printqr.php?id=".$row['rowid']."'><img src='".DOL_URL_ROOT."/takepos/genimg/qr.php?key=".dol_encode($row['rowid'])."' height='42' width='42'></a>";
+			print '<a target="_blank" rel="noopener noreferrer" href="printqr.php?id='.$row['rowid'].'"><img src="'.DOL_URL_ROOT.'/takepos/genimg/qr.php?key='.dol_encode($row['rowid']).'" height="42" width="42"></a>';
 			print '</td></tr>';
 		}
 
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index eb23f26806c..cddf839375a 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -135,14 +135,11 @@ print load_fiche_titre($langs->trans("OrderPrinters"));
 //print '<tr><td valign="top" width="30%" class="notopnoleft">';
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
+print '</div><div class="fichetwothirdright">';
 
-//print '</td><td valign="top" width="70%">';
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div></div>';
 
 
-//print '</td></tr></table>';
-print '</div></div></div>';
-
 print '<div class="fichecenter"><br>';
 
 
diff --git a/htdocs/takepos/admin/other.php b/htdocs/takepos/admin/other.php
index e5114a446bd..64088473c69 100644
--- a/htdocs/takepos/admin/other.php
+++ b/htdocs/takepos/admin/other.php
@@ -95,9 +95,9 @@ print '</tr>';
 $url = 'https://www.dolistore.com/45-pos';
 
 print '<tr class="oddeven">'."\n";
-print '<td class="titlefield"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
+print '<td class="titlefield"><a href="'.$url.'" target="_blank" rel="noopener noreferrer external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
 print '<td>'.$langs->trans("DolistorePosCategory").'</td>';
-print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
+print '<td><a href="'.$url.'" target="_blank" rel="noopener noreferrer external">'.$url.'</a></td>';
 print '</tr>';
 
 print "</table>\n";
@@ -119,9 +119,9 @@ print '</tr>';
 $url = 'http://www.takepos.com';
 
 print '<tr class="oddeven">'."\n";
-print '<td class="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/takepos.png"></a></td>';
+print '<td class="left"><a href="'.$url.'" target="_blank" rel="noopener noreferrer external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/takepos.png"></a></td>';
 print '<td>TakePOS original developers</td>';
-print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
+print '<td><a href="'.$url.'" target="_blank" rel="noopener noreferrer external">'.$url.'</a></td>';
 print '</tr>';
 
 print "</table>\n";
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 5e1973df6e6..8ba37a69ab3 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -51,6 +51,7 @@ if (GETPOST('action', 'alpha') == 'set') {
 	$res = dolibarr_set_const($db, "TAKEPOS_AUTO_PRINT_TICKETS", GETPOST('TAKEPOS_AUTO_PRINT_TICKETS', 'int'), 'int', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_PRINT_SERVER", GETPOST('TAKEPOS_PRINT_SERVER', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_PRINT_PAYMENT_METHOD", GETPOST('TAKEPOS_PRINT_PAYMENT_METHOD', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, 'TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT', GETPOST('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT', 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
@@ -146,7 +147,7 @@ print $langs->trans('TakeposConnectorMethodDescription');
 
 if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 	print '<br>';
-	print $langs->trans("URL")." / ".$langs->trans("IPAddress").' (<a href="http://en.takepos.com/connector" target="_blank">'.$langs->trans("TakeposConnectorNecesary").'</a>)';
+	print $langs->trans("URL")." / ".$langs->trans("IPAddress").' (<a href="http://en.takepos.com/connector" target="_blank" rel="noopener noreferrer external">'.$langs->trans("TakeposConnectorNecesary").'</a>)';
 	print ' <input type="text" class="minwidth200" id="TAKEPOS_PRINT_SERVER" name="TAKEPOS_PRINT_SERVER" value="'.$conf->global->TAKEPOS_PRINT_SERVER.'">';
 }
 
@@ -254,12 +255,34 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && filter_var($con
 	print "</td></tr>\n";
 }
 
+if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
+	print '<tr class="oddeven"><td>';
+	print $langs->trans('CustomerDisplay');
+	print '<td colspan="2">';
+	print ajax_constantonoff("TAKEPOS_CUSTOMER_DISPLAY", array(), $conf->entity, 0, 0, 1, 0);
+	print "</td></tr>\n";
+}
+
+// Print without details
+print '<tr class="oddeven"><td>';
+print $langs->trans('PrintWithoutDetailsButton');
+print '<td colspan="2">';
+print ajax_constantonoff('TAKEPOS_PRINT_WITHOUT_DETAILS', array(), $conf->entity, 0, 0, 1, 0);
+print "</td></tr>\n";
+if (!empty($conf->global->TAKEPOS_PRINT_WITHOUT_DETAILS)) {
+	print '<tr class="oddeven"><td>';
+	print $langs->trans('PrintWithoutDetailsLabelDefault');
+	print '<td colspan="2">';
+	print '<input type="text" name="TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT" value="' . getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT') . '" />';
+	print "</td></tr>\n";
+}
+
 print '</table>';
 print '</div>';
 
 print '<br>';
 
-print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print "</form>\n";
 
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 0364ff4e64f..e631776490a 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 (!empty($conf->barcode->enabled)) {
+		$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'));
 
@@ -196,7 +199,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->TAKEPOS_REF_ADDON == "$file") {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setrefmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setrefmod&token='.newToken().'&value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -256,8 +259,7 @@ print "</tr>\n";
 print '<tr class="oddeven"><td>';
 print $langs->trans("NumberOfTerminals");
 print '<td colspan="2">';
-$array = array(1=>"1", 2=>"2", 3=>"3", 4=>"4", 5=>"5", 6=>"6", 7=>"7", 8=>"8", 9=>"9");
-print $form->selectarray('TAKEPOS_NUM_TERMINALS', $array, (empty($conf->global->TAKEPOS_NUM_TERMINALS) ? '0' : $conf->global->TAKEPOS_NUM_TERMINALS), 0);
+print '<input type="number" name="TAKEPOS_NUM_TERMINALS" min="1" value="' . (empty($conf->global->TAKEPOS_NUM_TERMINALS) ? '1' : $conf->global->TAKEPOS_NUM_TERMINALS)  . '">';
 print "</td></tr>\n";
 
 // Services
@@ -385,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 (!empty($conf->barcode->enabled)) {
+	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="' . (!empty($conf->global->TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT) ? $conf->global->TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT : '') . '">';
+	print "</td></tr>\n";
+}
+
 // Numbering module
 //print '<tr class="oddeven"><td>';
 //print $langs->trans("BillsNumberingModule");
@@ -474,7 +485,7 @@ if ($conf->global->TAKEPOS_ENABLE_SUMUP) {
 
 print '<br>';
 
-print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print "</form>\n";
 
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 922a5c5032c..f6562d81693 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -409,7 +409,7 @@ if ($atleastonefound == 0 && !empty($conf->banque->enabled)) {
 
 print '<br>';
 
-print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print "</form>\n";
 
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 30635c58b8c..9b44e536a2b 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -42,6 +42,7 @@ if (!defined('NOBROWSERNOTIF')) {
 
 require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
 
 $category = GETPOST('category', 'alphanohtml');	// Can be id of category or 'supplements'
 $action = GETPOST('action', 'aZ09');
@@ -52,6 +53,8 @@ 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'));
 
 /*
  * View
@@ -108,17 +111,148 @@ if ($action == 'getProducts') {
 		}
 	}
 
-	$sql = 'SELECT rowid, ref, label, tosell, tobuy, barcode, price FROM '.MAIN_DB_PREFIX.'product as p';
+	if (!empty($conf->barcode->enabled) && !empty($conf->global->TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT)) {
+		$barcode_rules = $conf->global->TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT;
+		$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";
+
+				$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 rowid, ref, label, tosell, tobuy, barcode, price' ;
+	// Add fields from hooks
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters);    // Note that $action and $object may have been modified by hook
+	$sql .= $hookmanager->resPrint;
+
+	$sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
+
+	// 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;
+
 	$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';
 	$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;
+
 	$resql = $db->query($sql);
 	if ($resql) {
 		$rows = array();
 		while ($obj = $db->fetch_object($resql)) {
+			$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 == "") {
+				$ig = '../public/theme/common/nophoto.png';
+			} else {
+				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,
@@ -127,7 +261,8 @@ if ($action == 'getProducts') {
 				'tobuy' => $obj->tobuy,
 				'barcode' => $obj->barcode,
 				'price' => $obj->price,
-			'object' => 'product'
+				'object' => 'product',
+				'img' => $ig,
 				//'price_formated' => price(price2num($obj->price, 'MU'), 1, $langs, 1, -1, -1, $conf->currency)
 			);
 		}
diff --git a/htdocs/takepos/css/phone.css b/htdocs/takepos/css/phone.css
index bdfdf45e116..2b0cf62797f 100644
--- a/htdocs/takepos/css/phone.css
+++ b/htdocs/takepos/css/phone.css
@@ -151,7 +151,7 @@ button.publicphonebutton {
 	float:left;
 	width: 50%;
 	text-align:center;
-	height:150px;;
+	height:150px;
 	overflow:hidden;
 	margin-bottom:5px;
 	font-size:18px;
diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index e180dc33b3e..c57b145d94c 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -21,8 +21,8 @@
  */
 
 /**
- *		\file       htdocs/theme/eldy/style.css.php
- *		\brief      File for CSS style sheet Eldy
+ *		\file       htdocs/takepos/css/pos.css.php
+ *		\brief      File for CSS style for TakePOS
  */
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled because need to load personalized language
@@ -321,7 +321,7 @@ table.postablelines tr td {
 div.paymentbordline
 {
 	width:calc(50% - 16px);
-	background-color:#888;
+	background-color:#aaa;
 	border-radius: 8px;
 	margin-bottom: 4px;
 	display: inline-block;
@@ -352,7 +352,7 @@ div.paymentbordline
 	margin: 0 auto;
 	width: 100%;
 	height: calc(45% - 50px);
-	padding-top: 5px;
+	padding-top: 9px;
 }
 
 .row2{
@@ -377,8 +377,6 @@ div.paymentbordline
 	/* background-color:white; */
 	padding-top: 1px;
 	padding-bottom: 0;
-	padding-right: 5px;
-	padding-left: 5px;
 	min-height: 180px;
 }
 
@@ -390,8 +388,6 @@ div.paymentbordline
 	box-sizing: border-box;
 	padding-top: 0;
 	padding-bottom: 0;
-	padding-right: 5px;
-	padding-left: 5px;
 	min-height: 180px;
 }
 
@@ -402,8 +398,6 @@ div.paymentbordline
 	box-sizing: border-box;
 	padding-top: 0;
 	padding-bottom: 0;
-	padding-right: 5px;
-	padding-left: 5px;
 }
 
 .div4{
@@ -414,8 +408,6 @@ div.paymentbordline
 	font-size: 6px;
 	padding-top: 10px;
 	padding-bottom: 10px;
-	padding-right: 5px;
-	padding-left: 5px;
 }
 
 .div5{
@@ -426,9 +418,19 @@ div.paymentbordline
 	font-size: 6px;
 	padding-top:10px;
 	padding-bottom:10px;
+}
+
+.div1, .div2, .div3, .div4, .div5 {
 	padding-right: 5px;
 	padding-left: 5px;
 }
+.div1, .div4 {
+	padding-left: 8px;
+}
+.div3, .div5 {
+	padding-right: 8px;
+}
+
 
 tr.selected, tr.selected td {
 	/* font-weight: bold; */
@@ -518,12 +520,30 @@ div.description_content {
 	margin-left: 4px;
 	font-size: 1.3em;
 }
+.topnav div.login_block_user {
+	display: inline-block;
+	vertical-align: middle;
+	line-height: 50px;
+	height: 50px;
+}
+.userimg.atoplogin img.userphoto, .userimgatoplogin img.userphoto {
+	width: 30px;
+	height: 30px;
+	vertical-align: middle;
+}
 
 @media screen and (max-width: 767px) {
 	.topnav .login_block_other a {
 		padding: 5px 5px;
 		font-size: 1.2em;
 	}
+
+	.div1, .div4 {
+		padding-left: 5px;
+	}
+	.div3, .div5 {
+		padding-right: 5px;
+	}
 }
 
 .topnav-right > a {
@@ -628,6 +648,7 @@ div#moreinfo, div#infowarehouse {
 
 	.topnav input[type="text"] {
 		max-width: 90px;
+		font-size: 1.15em;
 	}
 
 	.topnav-right {
@@ -647,7 +668,7 @@ div#moreinfo, div#infowarehouse {
 	}
 
 	.row1withhead{
-		height: calc(45% - 100px);
+		height: unset;
 	}
 
 	div#moreinfo, div#infowarehouse {
@@ -757,3 +778,36 @@ div#moreinfo, div#infowarehouse {
   text-align: center;
   margin: 2px;
 }
+
+.splitsale {
+	float: left;
+	width: 100%;
+	height: 100%;
+	overflow: auto;
+}
+
+.rowsplit {
+	width: 100%;
+	height: 40%;
+}
+
+.headersplit {
+	height: 10%;
+	width: 100%;
+	padding: 10px;
+}
+
+.headercontent {
+	margin: auto;
+	width: 50%;
+	border: 3px solid black;
+	text-align: center;
+	font-size: 150%;
+	background-color: rgb(233,234,237);
+}
+
+.row:after {
+  content: "";
+  display: table;
+  clear: both;
+}
diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php
index 508d6e670b3..64040a24466 100644
--- a/htdocs/takepos/floors.php
+++ b/htdocs/takepos/floors.php
@@ -93,9 +93,9 @@ if ($action == "update") {
 		$top = 95;
 	}
 	if ($left > 3 or $top > 4) {
-		$db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set leftpos=".$left.", toppos=".$top." WHERE rowid='".$place."'");
+		$db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set leftpos = ".((int) $left).", toppos = ".((int) $top)." WHERE rowid = ".((int) $place));
 	} else {
-		$db->query("DELETE from ".MAIN_DB_PREFIX."takepos_floor_tables where rowid='".$place."'");
+		$db->query("DELETE from ".MAIN_DB_PREFIX."takepos_floor_tables where rowid = ".((int) $place));
 	}
 }
 
@@ -104,11 +104,11 @@ 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='".$place."'");
+	$db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set label='".$db->escape($newname)."' WHERE rowid = ".((int) $place));
 }
 
 if ($action == "add") {
-	$sql = "INSERT INTO ".MAIN_DB_PREFIX."takepos_floor_tables(entity, label, leftpos, toppos, floor) VALUES (".$conf->entity.", '', '45', '45', ".$floor.")";
+	$sql = "INSERT INTO ".MAIN_DB_PREFIX."takepos_floor_tables(entity, label, leftpos, toppos, floor) VALUES (".$conf->entity.", '', '45', '45', ".((int) $floor).")";
 	$asdf = $db->query($sql);
 	$db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set label=rowid where label=''"); // No empty table names
 }
@@ -212,9 +212,9 @@ $( document ).ready(function() {
 <?php if ($user->admin) {?>
 <div style="position: absolute; left: 0.1%; top: 0.8%; width:8%; height:11%;">
 	<?php if ($mode == "edit") {?>
-<a id="add" onclick="window.location.href='floors.php?mode=edit&action=add&floor=<?php echo $floor; ?>';"><?php echo $langs->trans("AddTable"); ?></a>
+<a id="add" onclick="window.location.href='floors.php?mode=edit&action=add&token=<?php echo newToken() ?>&floor=<?php echo $floor; ?>';"><?php echo $langs->trans("AddTable"); ?></a>
 	<?php } else { ?>
-<a onclick="window.location.href='floors.php?mode=edit&floor=<?php echo $floor; ?>';"><?php echo $langs->trans("Edit"); ?></a>
+<a onclick="window.location.href='floors.php?mode=edit&token=<?php echo newToken() ?>&floor=<?php echo $floor; ?>';"><?php echo $langs->trans("Edit"); ?></a>
 	<?php } ?>
 </div>
 <?php }
diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index 2725b0c8e87..a20503b18fa 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -81,6 +81,7 @@ if ($query == "cat") {
 	$objProd->fetch($id);
 	$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 == "") {
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index c71f4b10c9c..24a30b8ea7e 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -67,7 +67,7 @@ if ($_SESSION["takeposterminal"] == "") {
 
 if ($setterminal > 0) {
 	$_SESSION["takeposterminal"] = $setterminal;
-	setcookie("takeposterminal", $setterminal, (time() + (86400 * 354)), '/', null, false, true); // Permanent takeposterminal var in a cookie
+	setcookie("takeposterminal", $setterminal, (time() + (86400 * 354)), '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Permanent takeposterminal var in a cookie
 }
 
 if ($setcurrency != "") {
@@ -134,7 +134,7 @@ if ($conf->global->TAKEPOS_COLOR_THEME == 1) {
 }
 ?>
 <script type="text/javascript" src="js/jquery.colorbox-min.js"></script>	<!-- TODO It seems we don't need this -->
-<script language="javascript">
+<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);
 
@@ -178,6 +178,7 @@ var place="<?php echo $place; ?>";
 var editaction="qty";
 var editnumber="";
 var invoiceid=0;
+var search2_timer=null;
 
 /*
 var app = this;
@@ -334,7 +335,11 @@ function LoadProducts(position, issubcat) {
 				var titlestring = <?php echo $titlestring; ?>;
 				<?php if (!$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) {
 					echo '$("#prodivdesc"+ishow).show();';
-					echo '$("#prodesc"+ishow).text(data[parseInt(idata)][\'label\']);';
+					if ($conf->global->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 '$("#proimg"+ishow).attr("title", titlestring);';
 					echo '$("#proimg"+ishow).attr("src", "genimg/index.php?query=pro&id="+data[idata][\'id\']);';
 				} else {
@@ -400,7 +405,12 @@ function MoreProducts(moreorless) {
 			else if ((data[idata]['status']) == "1") {
 				//Only show products with status=1 (for sell)
 				$("#prodivdesc"+ishow).show();
-				$("#prodesc"+ishow).text(data[parseInt(idata)]['label']);
+				<?php
+				if ($conf->global->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']);
+				<?php } ?>
 				$("#probutton"+ishow).text(data[parseInt(idata)]['label']);
 				$("#probutton"+ishow).show();
 				if (data[parseInt(idata)]['price_formated']) {
@@ -420,7 +430,7 @@ function MoreProducts(moreorless) {
 	ClearSearch();
 }
 
-function ClickProduct(position) {
+function ClickProduct(position, qty = 1) {
 	console.log("ClickProduct");
 	$('#proimg'+position).animate({opacity: '0.5'}, 1);
 	$('#proimg'+position).animate({opacity: '1'}, 100);
@@ -430,11 +440,11 @@ function ClickProduct(position) {
 	}
 	else{
 		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&place="+place+"&idproduct="+idproduct+"&selectedline="+selectedline, function() {
-			//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
+		$("#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();";?>
 		});
 	}
 
@@ -481,6 +491,12 @@ function CloseBill() {
 	$.colorbox({href:"pay.php?place="+place+"&invoiceid="+invoiceid, width:"80%", height:"90%", transition:"none", iframe:"true", title:""});
 }
 
+function Split() {
+	invoiceid = $("#invoiceid").val();
+	console.log("Open popup to split on invoiceid="+invoiceid);
+	$.colorbox({href:"split.php?place="+place+"&invoiceid="+invoiceid, width:"80%", height:"90%", transition:"none", iframe:"true", title:""});
+}
+
 function Floors() {
 	console.log("Open box to select floor place="+place);
 	$.colorbox({href:"floors.php?place="+place, width:"90%", height:"90%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("Floors"); ?>"});
@@ -545,79 +561,104 @@ function Search2(keyCodeForEnter) {
 	}
 
 	if (search === true) {
-		pageproducts = 0;
-		jQuery(".wrapper2 .catwatermark").hide();
-		$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=search&term=' + $('#search').val(), function (data) {
-			for (i = 0; i < <?php echo $MAXPRODUCT ?>; i++) {
-				if (typeof (data[i]) == "undefined") {
-					$("#prodesc" + i).text("");
-					$("#probutton" + i).text("");
-					$("#probutton" + i).hide();
-					$("#proprice" + i).attr("class", "hidden");
-					$("#proprice" + i).html("");
-					$("#proimg" + i).attr("src", "genimg/empty.png");
-					$("#prodiv" + i).data("rowid", "");
-					continue;
+
+		// temporization time to give time to type
+		if (search2_timer) {
+			clearTimeout(search2_timer);
+		}
+
+		search2_timer = setTimeout(function(){
+
+			pageproducts = 0;
+			jQuery(".wrapper2 .catwatermark").hide();
+			$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=search&term=' + $('#search').val(), function (data) {
+				for (i = 0; i < <?php echo $MAXPRODUCT ?>; i++) {
+					if (typeof (data[i]) == "undefined") {
+						$("#prodesc" + i).text("");
+						$("#probutton" + i).text("");
+						$("#probutton" + i).hide();
+						$("#proprice" + i).attr("class", "hidden");
+						$("#proprice" + i).html("");
+						$("#proimg" + i).attr("src", "genimg/empty.png");
+						$("#prodiv" + i).data("rowid", "");
+						continue;
+					}
+					<?php
+					$titlestring = "'".dol_escape_js($langs->transnoentities('Ref').': ')."' + data[i]['ref']";
+					$titlestring .= " + ' - ".dol_escape_js($langs->trans("Barcode").': ')."' + data[i]['barcode']";
+					?>
+					var titlestring = <?php echo $titlestring; ?>;
+					<?php
+					if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) { ?>
+					$("#prodesc" + i).html(data[i]['ref'].bold() + ' - ' + data[i]['label']);
+					<?php } else { ?>
+						$("#prodesc" + i).text(data[i]['label']);
+					<?php } ?>
+					$("#prodivdesc" + i).show();
+					$("#probutton" + i).text(data[i]['label']);
+					$("#probutton" + i).show();
+					if (data[i]['price_formated']) {
+						$("#proprice" + i).attr("class", "productprice");
+						$("#proprice" + i).html(data[i]['price_formated']);
+					}
+					$("#proimg" + i).attr("title", titlestring);
+					if( undefined !== data[i]['img']) {
+						$("#proimg" + i).attr("src", data[i]['img']);
+					}
+					else {
+						$("#proimg" + i).attr("src", "genimg/index.php?query=pro&id=" + data[i]['rowid']);
+					}
+					$("#prodiv" + i).data("rowid", data[i]['rowid']);
+					$("#prodiv" + i).data("iscat", 0);
 				}
-				<?php
-				$titlestring = "'".dol_escape_js($langs->transnoentities('Ref').': ')."' + data[i]['ref']";
-				$titlestring .= " + ' - ".dol_escape_js($langs->trans("Barcode").': ')."' + data[i]['barcode']";
-				?>
-				var titlestring = <?php echo $titlestring; ?>;
-				$("#prodesc" + i).text(data[i]['label']);
-				$("#prodivdesc" + i).show();
-				$("#probutton" + i).text(data[i]['label']);
-				$("#probutton" + i).show();
-				if (data[i]['price_formated']) {
-					$("#proprice" + i).attr("class", "productprice");
-					$("#proprice" + i).html(data[i]['price_formated']);
+			}).always(function (data) {
+				// If there is only 1 answer
+				if ($('#search').val().length > 0 && data.length == 1) {
+					console.log($('#search').val()+' - '+data[0]['barcode']);
+					if ($('#search').val() == data[0]['barcode'] && 'thirdparty' == data[0]['object']) {
+						console.log("There is only 1 answer with barcode matching the search, so we change the thirdparty "+data[0]['rowid']);
+						ChangeThirdparty(data[0]['rowid']);
+					}
+					else if ('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, data[0]['qty']);
+					}
 				}
-				$("#proimg" + i).attr("title", titlestring);
-				$("#proimg" + i).attr("src", "genimg/index.php?query=pro&id=" + data[i]['rowid']);
-				$("#prodiv" + i).data("rowid", data[i]['rowid']);
-				$("#prodiv" + i).data("iscat", 0);
-			}
-		}).always(function (data) {
-			// If there is only 1 answer
-			if ($('#search').val().length > 0 && data.length == 1) {
-				console.log($('#search').val()+' - '+data[0]['barcode']);
-				if ($('#search').val() == data[0]['barcode'] && 'thirdparty' == data[0]['object']) {
-					console.log("There is only 1 answer with barcode matching the search, so we change the thirdparty "+data[0]['rowid']);
-					ChangeThirdparty(data[0]['rowid']);
+				if (eventKeyCode == keyCodeForEnter){
+					if (data.length == 0) {
+						$('#search').val('<?php
+						$langs->load('errors');
+						echo dol_escape_js($langs->trans("ErrorRecordNotFound"));
+						?>');
+						$('#search').select();
+					}
+					else ClearSearch();
 				}
-				else if ($('#search').val() == data[0]['barcode'] && 'product' == data[0]['object']) {
-					console.log("There is only 1 answer with barcode matching the search, so we add the product in basket");
-					ClickProduct(0);
-				}
-			}
-			if (eventKeyCode == keyCodeForEnter){
-				if (data.length == 0) {
-					$('#search').val('<?php
-					$langs->load('errors');
-					echo dol_escape_js($langs->trans("ErrorRecordNotFound"));
-					?>');
-					$('#search').select();
-				}
-				else ClearSearch();
-			}
-		});
+			});
+		}, 500); // 500ms delay
 	}
 
 }
 
 function Edit(number) {
+	console.log("We click on PAD on number="+number);
 
-	if (typeof(selectedtext) == "undefined") return;	// We click on an action on the number pad but there is no line selected
+	if (typeof(selectedtext) == "undefined") {
+		return;	// We click on an action on the number pad but there is no line selected
+	}
 
 	var text=selectedtext+"<br> ";
 
+
 	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"); ?>");
 		return;
 	}
 	else if (number=='qty'){
-		console.log("Edit "+number);
 		if (editaction=='qty' && editnumber!=""){
 			$("#poslines").load("invoice.php?action=updateqty&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
 				editnumber="";
@@ -633,7 +674,6 @@ function Edit(number) {
 		}
 	}
 	else if (number=='p'){
-		console.log("Edit "+number);
 		if (editaction=='p' && editnumber!=""){
 			$("#poslines").load("invoice.php?action=updateprice&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
 				editnumber="";
@@ -649,7 +689,6 @@ function Edit(number) {
 		}
 	}
 	else if (number=='r'){
-		console.log("Edit "+number);
 		if (editaction=='r' && editnumber!=""){
 			$("#poslines").load("invoice.php?action=updatereduction&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
 				editnumber="";
@@ -688,6 +727,7 @@ function Edit(number) {
 	$('#'+selectedline).find("td:first").html(text+editnumber);
 }
 
+
 function TakeposPrintingOrder(){
 	console.log("TakeposPrintingOrder");
 	$("#poslines").load("invoice.php?action=order&place="+place, function() {
@@ -830,35 +870,43 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 	<div class="header">
 		<div class="topnav">
 			<div class="topnav-left">
-			<div class="inline-block valignmiddle">
-			<a class="topnav-terminalhour" onclick="ModalBox('ModalTerminal');">
-			<span class="fa fa-cash-register"></span>
-			<span class="hideonsmartphone">
-			<?php echo $langs->trans("Terminal"); ?>
-			</span>
-			<?php echo " ";
-			if ($_SESSION["takeposterminal"] == "") {
-				echo "1";
-			} else {
-				echo $_SESSION["takeposterminal"];
-			}
-			echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "day").'</span>';
-			?>
-			</a>
-			<?php
-			if (!empty($conf->multicurrency->enabled)) {
-				print '<a class="valignmiddle tdoverflowmax100" id="multicurrency" onclick="ModalBox(\'ModalCurrency\');" title=""><span class="fas fa-coins paddingrightonly"></span>';
-				print '<span class="hideonsmartphone">'.$langs->trans("Currency").'</span>';
-				print '</a>';
-			}
-			?>
-			</div>
-			<!-- section for customer and open sales -->
-			<div class="inline-block valignmiddle" id="customerandsales">
-			</div>
-			<!-- More info about customer -->
-			<div class="inline-block valignmiddle tdoverflowmax150onsmartphone" id="moreinfo"></div>
-			<div class="inline-block valignmiddle tdoverflowmax150onsmartphone" id="infowarehouse"></div>
+				<div class="inline-block valignmiddle">
+				<a class="topnav-terminalhour" onclick="ModalBox('ModalTerminal');">
+				<span class="fa fa-cash-register"></span>
+				<span class="hideonsmartphone">
+				<?php echo $langs->trans("Terminal"); ?>
+				</span>
+				<?php echo " ";
+				if ($_SESSION["takeposterminal"] == "") {
+					echo "1";
+				} else {
+					echo $_SESSION["takeposterminal"];
+				}
+				echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "day").'</span>';
+				?>
+				</a>
+				<?php
+				if (!empty($conf->multicurrency->enabled)) {
+					print '<a class="valignmiddle tdoverflowmax100" id="multicurrency" onclick="ModalBox(\'ModalCurrency\');" title=""><span class="fas fa-coins paddingrightonly"></span>';
+					print '<span class="hideonsmartphone">'.$langs->trans("Currency").'</span>';
+					print '</a>';
+				}
+				?>
+				</div>
+				<!-- section for customer -->
+				<div class="inline-block valignmiddle" id="customerandsales"></div>
+				<!-- section for shopping carts -->
+				<div class="inline-block valignmiddle" id="shoppingcart"></div>
+				<!-- More info about customer -->
+				<div class="inline-block valignmiddle tdoverflowmax150onsmartphone" id="moreinfo"></div>
+				<?php
+				if (!empty($conf->stock->enabled)) {
+					?>
+				<!-- More info about warehouse -->
+				<div class="inline-block valignmiddle tdoverflowmax150onsmartphone" id="infowarehouse"></div>
+					<?php
+				}
+				?>
 			</div>
 			<div class="topnav-right">
 				<div class="login_block_other">
@@ -872,7 +920,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 				</div>
 				<div class="login_block_user">
 				<?php
-				print top_menu_user(1, DOL_URL_ROOT.'/user/logout.php');
+				print top_menu_user(1);
 				?>
 				</div>
 			</div>
@@ -1046,6 +1094,8 @@ if (getDolGlobalString('TAKEPOS_DIRECT_PAYMENT')) {
 	$menus[$r++] = array('title'=>'<span class="far fa-money-bill-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("DirectPayment").' <span class="opacitymedium">('.$langs->trans("Cash").')</span></div>', 'action'=>'DirectPayment();');
 }
 
+$menus[$r++] = array('title'=>'<span class="fas fa-cut paddingrightonly"></span><div class="trunc">'.$langs->trans("SplitSale").'</div>', 'action'=>'Split();');
+
 // BAR RESTAURANT specific menu
 if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
 	if ($conf->global->TAKEPOS_ORDER_PRINTERS) {
@@ -1101,14 +1151,24 @@ if ($resql) {
 }
 
 $hookmanager->initHooks(array('takeposfrontend'));
-$reshook = $hookmanager->executeHooks('ActionButtons');
-if (!empty($reshook)) {
-	if (is_array($reshook) && !isset($reshook['title'])) {
-		foreach ($reshook as $reshook) {
-			$menus[$r++] = $reshook;
+$parameters = array('menus'=>$menus);
+$reshook = $hookmanager->executeHooks('ActionButtons', $parameters);
+if ($reshook == 0) {  //add buttons
+	if (is_array($hookmanager->resArray) ) {
+		foreach ($hookmanager->resArray as $resArray) {
+			foreach ($resArray as $butmenu) {
+				$menus[$r++] = $butmenu;
+			}
+		}
+	} elseif ($reshook == 1) {
+		$r = 0; //replace buttons
+		if (is_array($hookmanager->resArray) ) {
+			foreach ($hookmanager->resArray as $resArray) {
+				foreach ($resArray as $butmenu) {
+					$menus[$r++] = $butmenu;
+				}
+			}
 		}
-	} else {
-		$menus[$r++] = $reshook;
 	}
 }
 
@@ -1117,7 +1177,7 @@ if ($r % 3 == 2) {
 }
 
 if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
-	$menus[$r++] = array('title'=>'<span class="fa fa-sign-out-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("Logout").'</div>', 'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';');
+	$menus[$r++] = array('title'=>'<span class="fa fa-sign-out-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("Logout").'</div>', 'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php?token='.newToken().'\';');
 }
 
 if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
@@ -1157,11 +1217,15 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 					} ?>">
 
 		<!--  Show categories -->
-		<div class="div4">
-	<?php
-	$count = 0;
-	while ($count < $MAXCATEG) {
-		?>
+		<?php
+		if ($conf->global->TAKEPOS_HIDE_CATEGORIES == 1) {
+			print '<div class="div4" style= "display: none;">';
+		} else {
+			print '<div class="div4">';
+		}
+			$count = 0;
+		while ($count < $MAXCATEG) {
+			?>
 			<div class="wrapper" <?php if ($count == ($MAXCATEG - 2)) {
 				echo 'onclick="MoreCategories(\'less\');"';
 								 } elseif ($count == ($MAXCATEG - 1)) {
@@ -1189,25 +1253,28 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 				<?php } ?>
 				<div class="catwatermark" id='catwatermark<?php echo $count; ?>'>...</div>
 			</div>
-		<?php
-		$count++;
-	}
-	?>
+			<?php
+			$count++;
+		}
+		?>
 		</div>
 
 		<!--  Show product -->
-		<div class="div5">
+		<div class="div5"<?php if ($conf->global->TAKEPOS_HIDE_CATEGORIES == 1) {
+			print ' style="width:100%;"';
+						 } ?>>
 	<?php
 	$count = 0;
 	while ($count < $MAXPRODUCT) {
+			print '<div class="wrapper2" id="prodiv'.$count.'"  ';
 		?>
-				<div class="wrapper2" id='prodiv<?php echo $count; ?>' <?php if ($count == ($MAXPRODUCT - 2)) {
+				<?php if ($count == ($MAXPRODUCT - 2)) {
 					?> onclick="MoreProducts('less');" <?php
-												} if ($count == ($MAXPRODUCT - 1)) {
-													?> onclick="MoreProducts('more');" <?php
-												} else {
-													echo 'onclick="ClickProduct('.$count.');"';
-												} ?>>
+				} if ($count == ($MAXPRODUCT - 1)) {
+					?> onclick="MoreProducts('more');" <?php
+				} else {
+					echo 'onclick="ClickProduct('.$count.');"';
+				} ?>>
 					<?php
 					if ($count == ($MAXPRODUCT - 2)) {
 						//echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="proimg'.$count.'" />';
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 4130ac5c3cb..66a75ef7050 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -152,19 +152,19 @@ $invoice = new Facture($db);
 if ($invoiceid > 0) {
 	$ret = $invoice->fetch($invoiceid);
 } else {
-	$ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')');
+	$ret = $invoice->fetch('', '(PROV-POS'. (isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '') .'-'.$place.')');
 }
 if ($ret > 0) {
 	$placeid = $invoice->id;
 }
 
-$constforcompanyid = 'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"];
+$constforcompanyid = 'CASHDESK_ID_THIRDPARTY'. (isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
 
 $soc = new Societe($db);
 if ($invoice->socid > 0) {
 	$soc->fetch($invoice->socid);
 } else {
-	$soc->fetch($conf->global->$constforcompanyid);
+	$soc->fetch(getDolGlobalString("$constforcompanyid"));
 }
 
 
@@ -290,7 +290,7 @@ if ($action == 'valid' && $user->rights->facture->creer) {
 			$payment->datepaye = $now;
 			$payment->fk_account = $bankaccount;
 			$payment->amounts[$invoice->id] = $amountofpayment;
-			if ($pay == 'cash') {
+			if ($pay == 'LIQ') {
 				$payment->pos_change = price2num(GETPOST('excess', 'alpha'));
 			}
 
@@ -330,6 +330,8 @@ 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;
@@ -475,10 +477,10 @@ if ($action == 'history' || $action == 'creditnote') {
 }
 
 if (($action == "addline" || $action == "freezone") && $placeid == 0) {
-	$invoice->socid = $conf->global->$constforcompanyid;
+	$invoice->socid = getDolGlobalString("$constforcompanyid");
 	$invoice->date = dol_now();
 	$invoice->module_source = 'takepos';
-	$invoice->pos_source = $_SESSION["takeposterminal"];
+	$invoice->pos_source =  isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '' ;
 	$invoice->entity = !empty($_SESSION["takeposinvoiceentity"]) ? $_SESSION["takeposinvoiceentity"] : $conf->entity;
 
 	if ($invoice->socid <= 0) {
@@ -503,6 +505,7 @@ if ($action == "addline") {
 
 	$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'];
@@ -535,7 +538,8 @@ if ($action == "addline") {
 	if (!empty($conf->global->TAKEPOS_GROUP_SAME_PRODUCT)) {
 		foreach ($invoice->lines as $line) {
 			if ($line->product_ref == $prod->ref) {
-				$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 ($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 {
@@ -547,7 +551,11 @@ if ($action == "addline") {
 	}
 	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, $parent_line, null, '', '', 0, 100, '', null, 0);
+		$idoflineadded = $invoice->addline($prod->description, $price, $qty, $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);
+		}
 	}
 
 	$invoice->fetch($placeid);
@@ -575,9 +583,11 @@ if ($action == "freezone") {
 }
 
 if ($action == "addnote") {
-	foreach ($invoice->lines as $line) {
+	$desc = GETPOST('addnote', 'alpha');
+	if ($idline==0) {
+		$invoice->update_note($desc, '_public');
+	} else foreach ($invoice->lines as $line) {
 		if ($line->id == $idline) {
-			$desc = GETPOST('addnote', 'alpha');
 			$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);
 		}
 	}
@@ -623,9 +633,10 @@ if ($action == "delete") {
 			}
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."facture";
-			$sql .= " SET fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]}.", ";
+			$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).")'";
+			$sql .= " WHERE ref = '(PROV-POS".$db->escape($_SESSION["takeposterminal"]."-".$place).")'";
 			$resql1 = $db->query($sql);
 
 			if ($resdeletelines && $resql1) {
@@ -671,6 +682,8 @@ if ($action == "updateprice") {
 			} 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);
+				} 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);
 				}
@@ -872,6 +885,9 @@ if ($action == "valid" || $action == "history" || $action == 'creditnote') {
 		$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>';
 		}
@@ -881,7 +897,7 @@ if ($action == "valid" || $action == "history" || $action == 'creditnote') {
 	}
 
 	if ($remaintopay <= 0 && getDolGlobalString('TAKEPOS_AUTO_PRINT_TICKETS')) {
-		$sectionwithinvoicelink .= '<script language="javascript">$("#buttonprint").click();</script>';
+		$sectionwithinvoicelink .= '<script type="text/javascript">$("#buttonprint").click();</script>';
 	}
 }
 
@@ -893,7 +909,7 @@ if ($action == "valid" || $action == "history" || $action == 'creditnote') {
 $form = new Form($db);
 
 ?>
-<script language="javascript">
+<script type="text/javascript">
 var selectedline=0;
 var selectedtext="";
 var placeid=<?php echo ($placeid > 0 ? $placeid : 0); ?>;
@@ -909,7 +925,7 @@ $(document).ready(function() {
 		selectedtext=$('#'+selectedline).find("td:first").html();
 		<?php
 		if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-			print '$("#phonediv1").load("auto_order.php?action=editline&placeid="+placeid+"&selectedline="+selectedline, function() {
+			print '$("#phonediv1").load("auto_order.php?action=editline&token='.newToken().'&placeid="+placeid+"&selectedline="+selectedline, function() {
 			});';
 		}
 		?>
@@ -923,7 +939,7 @@ $(document).ready(function() {
 	}
 <?php
 
-if ($action == "order" and $order_receipt_printer1 != "") {
+if ($action == "order" && !empty($order_receipt_printer1)) {
 	if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
 		?>
 		$.ajax({
@@ -944,7 +960,7 @@ if ($action == "order" and $order_receipt_printer1 != "") {
 	}
 }
 
-if ($action == "order" and $order_receipt_printer2 != "") {
+if ($action == "order" && !empty($order_receipt_printer2)) {
 	if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
 		?>
 		$.ajax({
@@ -965,7 +981,7 @@ if ($action == "order" and $order_receipt_printer2 != "") {
 	}
 }
 
-if ($action == "order" and $order_receipt_printer3 != "") {
+if ($action == "order" && !empty($order_receipt_printer3)) {
 	if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
 		?>
 		$.ajax({
@@ -985,7 +1001,7 @@ if ($action == "search" || $action == "valid") {
 }
 
 
-if ($action == "temp" and $ticket_printer1 != "") {
+if ($action == "temp" && !empty($ticket_printer1)) {
 	?>
 	$.ajax({
 		type: "POST",
@@ -1012,6 +1028,11 @@ function SendTicket(id)
 	$.colorbox({href:"send.php?facid="+id, width:"70%", height:"30%", transition:"none", iframe:"true", title:'<?php echo dol_escape_js($langs->trans("SendTicket")); ?>'});
 }
 
+function PrintBox(id, action) {
+	console.log("Open box before printing");
+	$.colorbox({href:"printbox.php?facid="+id+"&action="+action, width:"80%", height:"200px", transition:"none", iframe:"true", title:"<?php echo $langs->trans("PrintWithoutDetails"); ?>"});
+}
+
 function Print(id, gift){
 	console.log("Call Print() to generate the receipt.");
 	$.colorbox({href:"receipt.php?facid="+id+"&gift="+gift, width:"40%", height:"90%", transition:"none", iframe:"true", title:'<?php echo dol_escape_js($langs->trans("PrintTicket")); ?>'});
@@ -1032,7 +1053,7 @@ function TakeposPrinting(id){
 
 function TakeposConnector(id){
 	console.log("TakeposConnector" + id);
-	$.get("<?php echo DOL_URL_ROOT; ?>/takepos/ajax/ajax.php?action=printinvoiceticket&term=<?php echo urlencode($_SESSION["takeposterminal"]); ?>&id="+id+"&token=<?php echo currentToken(); ?>", function(data, status) {
+	$.get("<?php echo DOL_URL_ROOT; ?>/takepos/ajax/ajax.php?action=printinvoiceticket&term=<?php echo urlencode(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : ''); ?>&id="+id+"&token=<?php echo currentToken(); ?>", function(data, status) {
 		$.ajax({
 			type: "POST",
 			url: '<?php print getDolGlobalString('TAKEPOS_PRINT_SERVER'); ?>/printer/index.php',
@@ -1046,18 +1067,17 @@ function DolibarrTakeposPrinting(id) {
 	$.ajax({
 		type: "GET",
 		data: { token: '<?php echo currentToken(); ?>' },
-		url: "<?php print DOL_URL_ROOT.'/takepos/ajax/ajax.php?action=printinvoiceticket&term='.urlencode($_SESSION["takeposterminal"]).'&id='; ?>" + id,
+		url: "<?php print DOL_URL_ROOT.'/takepos/ajax/ajax.php?action=printinvoiceticket&term='.urlencode(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '').'&id='; ?>" + id,
 	});
 }
 
 function CreditNote() {
-	$("#poslines").load("invoice.php?action=creditnote&invoiceid="+placeid, function() {
+	$("#poslines").load("invoice.php?action=creditnote&token=<?php echo newToken() ?>&invoiceid="+placeid, function() {
 	});
 }
 
 function SetNote() {
-	$("#poslines").load("invoice.php?action=addnote&invoiceid="+placeid+"&idline="+selectedline+"&addnote="+$("#textinput").val(), function() {
-	});
+	$("#poslines").load("invoice.php?action=addnote&token=<?php echo newToken() ?>&invoiceid="+placeid+"&idline="+selectedline, { "addnote": $("#textinput").val() });
 }
 
 
@@ -1072,6 +1092,7 @@ $( document ).ready(function() {
 	?>
 
 	$("#customerandsales").html('');
+	$("#shoppingcart").html('');
 
 	$("#customerandsales").append('<a class="valignmiddle tdoverflowmax100 minwidth100" id="customer" onclick="Customer();" title="<?php print dol_escape_js($s); ?>"><span class="fas fa-building paddingrightonly"></span><?php print dol_escape_js($s); ?></a>');
 
@@ -1079,7 +1100,7 @@ $( document ).ready(function() {
 	$sql = "SELECT rowid, datec, ref FROM ".MAIN_DB_PREFIX."facture";
 	if (empty($conf->global->TAKEPOS_CAN_EDIT_IF_ALREADY_VALIDATED)) {
 		// By default, only invoices with a ref not already defined can in list of open invoice we can edit.
-		$sql .= " WHERE ref LIKE '(PROV-POS".$db->escape($_SESSION["takeposterminal"])."-0%' AND entity IN (".getEntity('invoice').")";
+		$sql .= " WHERE ref LIKE '(PROV-POS".$db->escape(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '')."-0%' AND entity IN (".getEntity('invoice').")";
 	} else {
 		// If TAKEPOS_CAN_EDIT_IF_ALREADY_VALIDATED set, we show also draft invoice that already has a reference defined
 		$sql .= " WHERE pos_source = '".$db->escape($_SESSION["takeposterminal"])."'";
@@ -1092,7 +1113,7 @@ $( document ).ready(function() {
 	if ($resql) {
 		$max_sale = 0;
 		while ($obj = $db->fetch_object($resql)) {
-			echo '$("#customerandsales").append(\'';
+			echo '$("#shoppingcart").append(\'';
 			echo '<a class="valignmiddle" title="'.dol_escape_js($langs->trans("SaleStartedAt", dol_print_date($db->jdate($obj->datec), '%H:%M', 'tzuser')).' - '.$obj->ref).'" onclick="place=\\\'';
 			$num_sale = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
 			echo $num_sale;
@@ -1111,7 +1132,7 @@ $( document ).ready(function() {
 			}
 			echo '</a>\');';
 		}
-		echo '$("#customerandsales").append(\'<a onclick="place=\\\'0-';
+		echo '$("#shoppingcart").append(\'<a onclick="place=\\\'0-';
 		echo $max_sale + 1;
 		echo '\\\'; invoiceid=0; Refresh();"><div><span class="fa fa-plus" title="'.dol_escape_htmltag($langs->trans("StartAParallelSale")).'"><span class="fa fa-shopping-cart"></span></div></a>\');';
 	} else {
@@ -1120,20 +1141,42 @@ $( document ).ready(function() {
 
 	$s = '';
 
-	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
-	if (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1") {
-		$s = '<span class="small">';
-		$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
-		$warehouse = new Entrepot($db);
-		$warehouse->fetch($conf->global->$constantforkey);
-		$s .= $langs->trans("Warehouse").'<br>'.$warehouse->ref;
-		$s .= '</span>';
+	$idwarehouse = 0;
+	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'. (isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
+	if (!empty($conf->stock->enabled)) {
+		if (getDolGlobalString("$constantforkey") != "1") {
+			$constantforkey = 'CASHDESK_ID_WAREHOUSE'. (isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
+			$idwarehouse = getDolGlobalString($constantforkey);
+			if ($idwarehouse > 0) {
+				$s = '<span class="small">';
+				$warehouse = new Entrepot($db);
+				$warehouse->fetch($idwarehouse);
+				$s .= '<span class="hideonsmartphone">'.$langs->trans("Warehouse").'<br></span>'.$warehouse->ref;
+				if ($warehouse->statut == Entrepot::STATUS_CLOSED) {
+					$s .= ' ('.$langs->trans("Closed").')';
+				}
+				$s .= '</span>';
+				print "$('#infowarehouse').html('".dol_escape_js($s)."');";
+				print '$("#infowarehouse").css("display", "inline-block");';
+			} else {
+				$s = '<span class="small hideonsmartphone">';
+				$s .= $langs->trans("StockChangeDisabled").'<br>'.$langs->trans("NoWarehouseDefinedForTerminal");
+				$s .= '</span>';
+				print "$('#infowarehouse').html('".dol_escape_js($s)."');";
+				if (!empty($conf->dol_optimize_smallscreen)) {
+					print '$("#infowarehouse").css("display", "none");';
+				}
+			}
+		} else {
+			$s = '<span class="small hideonsmartphone">'.$langs->trans("StockChangeDisabled").'</span>';
+			print "$('#infowarehouse').html('".dol_escape_js($s)."');";
+			if (!empty($conf->dol_optimize_smallscreen)) {
+				print '$("#infowarehouse").css("display", "none");';
+			}
+		}
 	}
-	?>
 
-	$("#infowarehouse").html('<?php print dol_escape_js($s); ?>');
 
-	<?php
 	// Module Adherent
 	$s = '';
 	if (!empty($conf->adherent->enabled) && $invoice->socid > 0 && $invoice->socid != $conf->global->$constforcompanyid) {
@@ -1145,7 +1188,7 @@ $( document ).ready(function() {
 		$result = $adh->fetch('', '', $invoice->socid);
 		if ($result > 0) {
 			$adh->ref = $adh->getFullName($langs);
-			if (empty($adh->statut)) {
+			if (empty($adh->statut) || $adh->statut == Adherent::STATUS_EXCLUDED ) {
 				$s .= "<s>";
 			}
 			$s .= $adh->getFullName($langs);
@@ -1161,7 +1204,7 @@ $( document ).ready(function() {
 					$s .= " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
 				}
 			}
-			if (empty($adh->statut)) {
+			if (empty($adh->statut) || $adh->statut == Adherent::STATUS_EXCLUDED) {
 				$s .= "</s>";
 			}
 		} else {
@@ -1174,6 +1217,23 @@ $( document ).ready(function() {
 
 });
 
+
+<?php
+if (!empty($conf->global->TAKEPOS_CUSTOMER_DISPLAY)) {
+	echo "function CustomerDisplay(){";
+	echo "var line1='".$CUSTOMER_DISPLAY_line1."'.substring(0,20);";
+	echo "line1=line1.padEnd(20);";
+	echo "var line2='".$CUSTOMER_DISPLAY_line2."'.substring(0,20);";
+	echo "line2=line2.padEnd(20);";
+	echo "$.ajax({
+		type: 'GET',
+		data: { text: line1+line2 },
+		url: '".getDolGlobalString('TAKEPOS_PRINT_SERVER')."/display/index.php',
+	});";
+	echo "}";
+}
+?>
+
 </script>
 
 <?php
@@ -1208,10 +1268,11 @@ if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
 		$label = $obj->label;
 		$floor = $obj->floor;
 	}
-	// In phone version only show when is invoice page
 	if ($mobilepage == "invoice" || $mobilepage == "") {
-		print '<span class="opacitymedium">'.$langs->trans('Place')."</span> <b>".$label."</b><br>";
-		print '<span class="opacitymedium">'.$langs->trans('Floor')."</span> <b>".$floor."</b>";
+		// 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>";
 	} elseif (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		print $mysoc->name;
 	} elseif ($mobilepage == "cats") {
@@ -1414,7 +1475,11 @@ if ($placeid > 0) {
 						$tooltiptext .= $line->desc;
 					}
 				}
-				$htmlforlines .= $form->textwithpicto($line->product_label ? $line->product_label : ($line->product_ref ? $line->product_ref : dolGetFirstLineOfText($line->desc, 1)), $tooltiptext);
+				if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) {
+					$htmlforlines .= $form->textwithpicto($line->product_label ? '<b>' . $line->product_ref . '</b> - ' . $line->product_label : dolGetFirstLineOfText($line->desc, 1), $tooltiptext);
+				} else {
+					$htmlforlines .= $form->textwithpicto($line->product_label ? $line->product_label : ($line->product_ref ? $line->product_ref : dolGetFirstLineOfText($line->desc, 1)), $tooltiptext);
+				}
 			} else {
 				if ($line->product_label) {
 					$htmlforlines .= $line->product_label;
@@ -1512,7 +1577,7 @@ if ($placeid > 0) {
 				$htmlforlines .= '</td>';
 			}
 			$htmlforlines .= '</tr>'."\n";
-			$htmlforlines .= empty($htmlsupplements[$line->id]) ? '' : empty($htmlsupplements[$line->id]);
+			$htmlforlines .= empty($htmlsupplements[$line->id]) ? '' : $htmlsupplements[$line->id];
 
 			print $htmlforlines;
 		}
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 4bd20f33f4b..ffa33fbe8fc 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -37,9 +37,6 @@ if (!defined('NOREQUIREMENU')) {
 if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1');
 }
-//if (!defined('NOREQUIREAJAX')) {
-//	define('NOREQUIREAJAX', '1');
-//}
 
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -255,6 +252,20 @@ if ($conf->global->TAKEPOS_NUMPAD == 0) {
 			});
 		}, 2500);
 	}
+
+<?php
+if (!empty($conf->global->TAKEPOS_CUSTOMER_DISPLAY)) {
+	echo "var line1='".$langs->trans('TotalTTC')."'.substring(0,20);";
+	echo "line1=line1.padEnd(20);";
+	echo "var line2='".price($invoice->total_ttc, 1, '', 1, -1, -1)."'.substring(0,20);";
+	echo "line2=line2.padEnd(20);";
+	echo "$.ajax({
+		type: 'GET',
+		data: { text: line1+line2 },
+		url: '".getDolGlobalString('TAKEPOS_PRINT_SERVER')."/display/index.php',
+	});";
+}
+?>
 </script>
 
 <div style="position:relative; padding-top: 20px; left:5%; height:150px; width:90%;">
@@ -325,7 +336,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		}
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.dol_escape_js($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><span class="hideonsmartphone"><br>'. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code)).'</span></button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.dol_escape_js($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><span class="hideonsmartphone"><br>'.$langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code)).'</span></button>';
 } else {
 	print '<button type="button" class="calcbutton2">'.$langs->trans("NoPaimementModesDefined").'</button>';
 }
@@ -351,7 +362,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		}
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.dol_escape_js($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code)).'</button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.dol_escape_js($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br> '.$langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code)).'</button>';
 } else {
 	$button = array_pop($action_buttons);
 	print '<button type="button" class="calcbutton2" onclick="'.$button["function"].'"><span '.$button["span"].'>'.$button["text"].'</span></button>';
@@ -378,7 +389,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		}
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.dol_escape_js($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br>'. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code)).'</button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.dol_escape_js($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br>'.$langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code)).'</button>';
 } else {
 	$button = array_pop($action_buttons);
 	print '<button type="button" class="calcbutton2" onclick="'.$button["function"].'"><span '.$button["span"].'>'.$button["text"].'</span></button>';
@@ -406,7 +417,7 @@ while ($i < count($arrayOfValidPaymentModes)) {
 		}
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.dol_escape_js($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br>'. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[$i]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[$i]->code)).'</button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.dol_escape_js($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br>'.$langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[$i]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[$i]->code)).'</button>';
 	$i = $i + 1;
 }
 
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 7eaa4d9ec68..a79a31f9d30 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -151,7 +151,7 @@ if ($action == "productinfo") {
 	$arrayofcss = array('/takepos/css/phone.css');
 	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 	?>
-<script language="javascript">
+<script type="text/javascript">
 	<?php
 	$categorie = new Categorie($db);
 	$categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1);
@@ -238,10 +238,10 @@ function AddProductConfirm(placeid, productid){
 	place=placeid;
 	<?php
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
+		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=addline&token='.newToken().'&place="+place+"&idproduct="+productid, function() {
 		});';
 	} else {
-		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
+		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&action=addline&token='.newToken().'&place="+place+"&idproduct="+productid, function() {
 		});';
 	}
 	?>
@@ -329,7 +329,7 @@ function TakeposPrintingOrder(){
 }
 
 function Exit(){
-	window.location.href='../user/logout.php';
+	window.location.href='../user/logout.php?token=<?php echo newToken(); ?>';
 }
 
 function CheckPlease(payment){
diff --git a/htdocs/takepos/printbox.php b/htdocs/takepos/printbox.php
new file mode 100644
index 00000000000..5d612fd19f2
--- /dev/null
+++ b/htdocs/takepos/printbox.php
@@ -0,0 +1,102 @@
+<?php
+/* Copyright (C) 2018 Andreu Bisquerra	<jove@bisquerra.com>
+ * Copyright (C) 2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/takepos/printbox.php
+ *	\ingroup    takepos
+ *	\brief      Popup to enter details before printing
+ */
+
+//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'))	define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
+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');
+}
+
+require '../main.inc.php'; // Load $user and permissions
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
+
+global $langs, $db;
+
+$langs->loadLangs(array("bills", "cashdesk"));
+
+$facid = GETPOST('facid', 'int');
+
+$action = GETPOST('action', 'aZ09');
+
+if (empty($user->rights->takepos->run)) {
+	accessforbidden();
+}
+
+
+/*
+ * View
+ */
+
+$arrayofcss = array('/takepos/css/pos.css.php');
+$arrayofjs = array('/takepos/js/jquery.colorbox-min.js');
+
+$head = '';
+top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss);
+?>
+<script>
+	/**
+	 * Save (validate)
+	 */
+	function Save() {
+		console.log("We click so we call page receipt.php with facid=<?php echo $facid; ?>");
+		parent.$.colorbox.close();
+		$.colorbox({href:"receipt.php?facid=<?php echo $facid; ?>&action=<?php echo $action; ?>&label="+$('#label').val()+"&qty="+$('#qty').val(), width:"40%", height:"90%", transition:"none", iframe:"true", title:'<?php echo dol_escape_js($langs->trans("PrintTicket")); ?>'});
+	}
+
+	jQuery(document).ready(function(){
+		$('#label').focus()
+	});
+</script>
+</head>
+<body>
+<br>
+<center>
+<?php
+if ($action == "without_details") {
+	$label_default = getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT');
+	$qty_default = 1;
+
+	print '<input type="text" id="label" name="label" class="takepospay" value="' . $label_default . '" style="width:40%;" placeholder="' . $langs->trans('Label') . '">';
+	print '<input type="text" id="qty" name="qty" class="takepospay" value="' . $qty_default . '" style="width:10%;" placeholder="' . $langs->trans('Qty') . '">';
+}
+?>
+<input type="button" class="button takepospay clearboth" value="OK" onclick="Save();">
+</center>
+
+</body>
+</html>
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index 627a6c99565..df0b55bc64e 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -54,6 +54,7 @@ $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is
 
 $facid = GETPOST('facid', 'int');
 
+$action = GETPOST('action', 'aZ09');
 $gift = GETPOST('gift', 'int');
 
 if (empty($user->rights->takepos->run)) {
@@ -169,33 +170,46 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER) {
 	</thead>
 	<tbody>
 	<?php
-	foreach ($object->lines as $line) {
-		?>
-	<tr>
-		<td>
-		<?php if (!empty($line->product_label)) {
-			echo $line->product_label;
-		} else {
-			echo $line->description;
-		} ?>
-		</td>
-		<td class="right"><?php echo $line->qty; ?></td>
-		<td class="right"><?php if ($gift != 1) {
-			echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1);
-						  } ?></td>
-		<?php
-		if (!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)) { ?>
-					<td class="right"><?php if ($gift != 1) {
-						echo price($line->total_ht, 1);
-									  } ?></td>
+	if ($action == 'without_details') {
+		$qty = GETPOST('qty', 'int') > 0 ? GETPOST('qty', 'int') : 1;
+		print '<tr>';
+		print '<td>' . GETPOST('label', 'alphanohtml') . '</td>';
+		print '<td class="right">' . $qty . '</td>';
+		print '<td class="right">' . price(price2num($object->total_ttc / $qty, 'MU'), 1) . '</td>';
+		if (!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)) {
+			print '<td class="right">' . price($object->total_ht, 1) . '</td>';
+		}
+		print '<td class="right">' . price($object->total_ttc, 1) . '</td>';
+		print '</tr>';
+	} else {
+		foreach ($object->lines as $line) {
+			?>
+		<tr>
+			<td>
+			<?php if (!empty($line->product_label)) {
+				echo $line->product_label;
+			} else {
+				echo $line->description;
+			} ?>
+			</td>
+			<td class="right"><?php echo $line->qty; ?></td>
+			<td class="right"><?php if ($gift != 1) {
+				echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1);
+							  } ?></td>
+			<?php
+			if (!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)) { ?>
+						<td class="right"><?php if ($gift != 1) {
+							echo price($line->total_ht, 1);
+										  } ?></td>
+				<?php
+			}
+			?>
+			<td class="right"><?php if ($gift != 1) {
+				echo price($line->total_ttc, 1);
+							  } ?></td>
+		</tr>
 			<?php
 		}
-		?>
-		<td class="right"><?php if ($gift != 1) {
-			echo price($line->total_ttc, 1);
-						  } ?></td>
-	</tr>
-		<?php
 	}
 	?>
 	</tbody>
diff --git a/htdocs/takepos/split.php b/htdocs/takepos/split.php
new file mode 100644
index 00000000000..02c37cb75e5
--- /dev/null
+++ b/htdocs/takepos/split.php
@@ -0,0 +1,229 @@
+<?php
+/* Copyright (C) 2021	Andreu Bisquerra	<jove@bisquerra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/takepos/split.php
+ *	\ingroup	takepos
+ *	\brief      Page with the content of the popup to split sale
+ */
+
+//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'))		define('NOREQUIRESOC', '1');
+//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN', '1');
+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');
+}
+
+require '../main.inc.php'; // Load $user and permissions
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
+$langs->loadLangs(array("main", "bills", "cashdesk", "banks"));
+
+$action = GETPOST('action', 'aZ09');
+$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0);
+
+if (empty($user->rights->takepos->run)) {
+	accessforbidden();
+}
+
+if ($action=="split") {
+	$line = GETPOST('line', 'int');
+	$split = GETPOST('split', 'int');
+	if ($split==1) { // Split line
+		$invoice = new Facture($db);
+		$ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-SPLIT)');
+		if ($ret > 0) {
+			$placeid = $invoice->id;
+		} else {
+			$constforcompanyid = 'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"];
+			$invoice->socid = $conf->global->$constforcompanyid;
+			$invoice->date = dol_now();
+			$invoice->module_source = 'takepos';
+			$invoice->pos_source = $_SESSION["takeposterminal"];
+			$invoice->entity = !empty($_SESSION["takeposinvoiceentity"]) ? $_SESSION["takeposinvoiceentity"] : $conf->entity;
+			if ($invoice->socid <= 0) {
+				$langs->load('errors');
+				dol_htmloutput_errors($langs->trans("ErrorModuleSetupNotComplete", "TakePos"), null, 1);
+			} else {
+				$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"]."-SPLIT)' where rowid=".$placeid;
+				$db->query($sql);
+			}
+		}
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set fk_facture=".$placeid." where rowid=".$line;
+		$db->query($sql);
+	} elseif ($split==0) { // Unsplit line
+		$invoice = new Facture($db);
+		if ($place=="SPLIT") $place="0"; // Avoid move line to the same place (from SPLIT to SPLIT place)
+		$ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')');
+		if ($ret > 0) {
+			$placeid = $invoice->id;
+		} else {
+			$constforcompanyid = 'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"];
+			$invoice->socid = $conf->global->$constforcompanyid;
+			$invoice->date = dol_now();
+			$invoice->module_source = 'takepos';
+			$invoice->pos_source = $_SESSION["takeposterminal"];
+			$invoice->entity = !empty($_SESSION["takeposinvoiceentity"]) ? $_SESSION["takeposinvoiceentity"] : $conf->entity;
+			if ($invoice->socid <= 0) {
+				$langs->load('errors');
+				dol_htmloutput_errors($langs->trans("ErrorModuleSetupNotComplete", "TakePos"), null, 1);
+			} else {
+				$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=".$placeid;
+				$db->query($sql);
+			}
+		}
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set fk_facture=".$placeid." where rowid=".$line;
+		$db->query($sql);
+	}
+	$invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-SPLIT)');
+	$invoice->update_price();
+	$invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')');
+	$invoice->update_price();
+}
+
+
+/*
+ * View
+ */
+
+$invoice = new Facture($db);
+if ($invoiceid > 0) {
+	$invoice->fetch($invoiceid);
+} else {
+	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
+	$resql = $db->query($sql);
+	$obj = $db->fetch_object($resql);
+	if ($obj) {
+		$invoiceid = $obj->rowid;
+	}
+	if (!$invoiceid) {
+		$invoiceid = 0; // Invoice does not exist yet
+	} else {
+		$invoice->fetch($invoiceid);
+	}
+}
+
+$arrayofcss = array('/takepos/css/pos.css.php');
+$arrayofjs = array();
+
+$head = '';
+$title = '';
+$disablejs = 0;
+$disablehead = 0;
+
+top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+
+// Define list of possible payments
+$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>
+
+<script>
+function Split(selectedline, split) {
+	$.ajax({
+		url: "split.php?action=split&line="+selectedline+"&split="+split+"&place=<?php echo $place;?>",
+		context: document.body
+	}).done(function() {
+		$("#currentplace").load("invoice.php?place="+parent.place+"&invoiceid="+parent.invoiceid, function() {
+			$('#currentplace').find('.posinvoiceline').click(function(){
+				Split(this.id, 1);
+			});
+		});
+		$("#splitplace").load("invoice.php?place=SPLIT", function() {
+			$('#splitplace').find('.posinvoiceline').click(function(){
+				Split(this.id, 0);
+			});
+		});
+	});
+}
+
+$( document ).ready(function() {
+	if (parent.place=='SPLIT') {
+		parent.place=0;
+		parent.invoiceid=0;
+		parent.Refresh();
+	}
+	$("#currentplace").load("invoice.php?place="+parent.place+"&invoiceid="+parent.invoiceid, function() {
+		$('#currentplace').find('.posinvoiceline')
+		.click(function(){
+			Split(this.id, 1);
+		});
+	});
+
+	$("#splitplace").load("invoice.php?place=SPLIT", function() {
+		$('#splitplace').find('.posinvoiceline').click(function(){
+			Split(this.id, 0);
+		});
+	});
+
+	
+
+	$("#headersplit1").html("<?php echo $langs->trans("Place");?> "+parent.place);
+	$("#headersplit2").html("<?php echo $langs->trans("SplitSale");?>");
+
+});
+</script>
+
+<div class="headersplit">
+  <a href="#" onclick="top.location.href='index.php?place='+parent.place"><div class="headercontent" id="headersplit1"></div></a>
+</div>
+
+<div class="rowsplit">
+  <div class="splitsale" id="currentplace"></div>
+</div>
+
+<div class="headersplit">
+  <a href="#" onclick="top.location.href='index.php?place=SPLIT'"><div class="headercontent" id="headersplit2"></div></a>
+</div>
+
+<div class="rowsplit">
+  <div class="splitsale" id="splitplace"></div>
+</div>
+
+</body>
+</html>
diff --git a/htdocs/theme/dolibarr.png b/htdocs/theme/dolibarr.png
index 3f7c35b6cf8..c1966fc9a0b 100644
Binary files a/htdocs/theme/dolibarr.png and b/htdocs/theme/dolibarr.png differ
diff --git a/htdocs/theme/dolibarr_256x256_color.png b/htdocs/theme/dolibarr_256x256_color.png
index 417387d6a27..b2d567d6831 100644
Binary files a/htdocs/theme/dolibarr_256x256_color.png and b/htdocs/theme/dolibarr_256x256_color.png differ
diff --git a/htdocs/theme/dolibarr_512x512_white.png b/htdocs/theme/dolibarr_512x512_white.png
index 06e69ad8b7b..d27e6324e77 100644
Binary files a/htdocs/theme/dolibarr_512x512_white.png and b/htdocs/theme/dolibarr_512x512_white.png differ
diff --git a/htdocs/theme/dolibarr_logo.png b/htdocs/theme/dolibarr_logo.png
old mode 100755
new mode 100644
index 9a0781ce2ea..63bd8ac3392
Binary files a/htdocs/theme/dolibarr_logo.png and b/htdocs/theme/dolibarr_logo.png differ
diff --git a/htdocs/theme/dolibarr_logo_bw.png b/htdocs/theme/dolibarr_logo_bw.png
index 1c016cce8bf..c9ca9b66fb2 100644
Binary files a/htdocs/theme/dolibarr_logo_bw.png and b/htdocs/theme/dolibarr_logo_bw.png differ
diff --git a/htdocs/theme/dolibarr_preferred_partner.png b/htdocs/theme/dolibarr_preferred_partner.png
old mode 100755
new mode 100644
index 06e26cab9a2..f0826b26e70
Binary files a/htdocs/theme/dolibarr_preferred_partner.png and b/htdocs/theme/dolibarr_preferred_partner.png differ
diff --git a/htdocs/theme/dolistore_logo.png b/htdocs/theme/dolistore_logo.png
index 747863108ce..233f6599108 100644
Binary files a/htdocs/theme/dolistore_logo.png and b/htdocs/theme/dolistore_logo.png differ
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 7122c252cbe..45ed3889a13 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -5,17 +5,13 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 /* <style type="text/css" > */
 
 :root {
-			--btncolortext:rgb(<?php print $colortextlink; ?>);
+			--btncolortext: rgb(<?php print $colortextlink; ?>);
 			--btncolorbg: #fbfbfb;
 			--btncolorborderhover: none;
 			--btncolorborder: #FFF;
-			/* --butactionbg:rgba(150, 110, 162, 0.95); */
-			--butactionbg:rgb(118, 145, 225);
-			--butactionbg:rgba(150, 110, 162, 0.95);
 			--butactiondeletebg: rgb(234,228,225);
-			/* tertiary color */
-			/* --butactionbg:rgb(218, 235, 225); */
-			/* --butactionbg:rgb(228, 218, 235); */
+			--butactionbg: rgb(<?php print $butactionbg; ?>);
+			--textbutaction: rgb(<?php print $textbutaction; ?>);
 }
 
 <?php
@@ -31,8 +27,9 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
             --btncolorbg: rgb(26,27,27);
             --btncolorborderhover: #ffffff;
             --btncolorborder: #2b2c2e;
-            --butactionbg: rgb(173,140,79);
             --butactiondeletebg: rgb(252,84,91);
+			--butactionbg: rgb(173,140,79);
+			--textbutaction: rgb(255,255,255);
 
       }\n";
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {
@@ -72,13 +69,13 @@ span.butAction, span.butActionDelete {
 }
 .butAction {
 	background: var(--butactionbg);
-	color: #FFF !important;
+	color: var(--textbutaction) !important;
 	/* background: rgb(230, 232, 239); */
 }
 .butActionRefused, .butAction, .butActionDelete {
 	border-radius: 3px;
 }
-.butActionRefused:last-child, .butAction:last-child, .butActionDelete:last-child {
+:not(.center) > .butActionRefused:last-child, :not(.center) > .butAction:last-child, :not(.center) > .butActionDelete:last-child {
 	margin-<?php echo $right; ?>: 0px !important;
 }
 .butActionRefused, .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
@@ -277,12 +274,12 @@ a.btnTitle.btnTitleSelected {
 }
 
 .btnTitle>.fa {
-	font-size: 20px;
+	font-size: 2em;
 	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 e041516a292..0ecf42b09e1 100644
--- a/htdocs/theme/eldy/ckeditor/config.js
+++ b/htdocs/theme/eldy/ckeditor/config.js
@@ -17,7 +17,7 @@ CKEDITOR.editorConfig = function( config )
 	//config.resize_maxWidth = 3000;
 	//config.height = '300px';
 	//config.resize_dir = 'vertical';	// horizontal, vertical, both
-	config.removePlugins = 'elementspath,save'; // config.removePlugins = 'elementspath,save,font';
+	config.removePlugins = 'elementspath,save'; // this list is modified into DolEditor::Create()
 	//config.extraPlugins = 'docprops,scayt,showprotected';
 	config.removeDialogTabs = 'flash:advanced';	// config.removeDialogTabs = 'flash:advanced;image:Link';
 	config.protectedSource.push( /<\?[\s\S]*?\?>/g );   // Prevent PHP Code to be formatted
@@ -61,7 +61,7 @@ CKEDITOR.editorConfig = function( config )
 	 	['Undo','Redo','-','Find','Replace'],
 	 	['CreateDiv','ShowBlocks'],
 	    ['Format','Font','FontSize'],
-	 	['Bold','Italic','Underline','Strike','Superscript','-','TextColor','RemoveFormat'],
+	 	['Bold','Italic','Underline','Strike','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	 	['Link','Unlink','Anchor','Image','Table','HorizontalRule','SpecialChar'],
@@ -75,7 +75,7 @@ CKEDITOR.editorConfig = function( config )
 	 	['SpellChecker', 'Scayt'],		// 'Cut','Copy','Paste','-', are useless, can be done with right click, even on smarpthone
 	 	['Undo','Redo','-','Find','Replace'],
 	    ['Font','FontSize'],
-	 	['Bold','Italic','Underline','Strike','Superscript','-','TextColor','RemoveFormat'],
+	 	['Bold','Italic','Underline','Strike','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	    ['Link','Unlink','Image','Table','HorizontalRule','SpecialChar'],
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index cfd5415a90c..5c62a703f67 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -7,6 +7,11 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
  * Dropdown of user popup
  */
 
+.bookmark-footer a.top-menu-dropdown-link {
+	white-space: normal;
+	word-break: break-word;
+}
+
 button.dropdown-item.global-search-item {
 	outline: none;
 }
@@ -15,6 +20,12 @@ button.dropdown-item.global-search-item {
 	display: block;
 }
 
+#topmenu-bookmark-dropdown .dropdown-menu {
+	min-width: 300px;
+	max-width: 360px;
+}
+
+
 .dropdown-search {
 	border-color: #eee;
 
@@ -359,11 +370,15 @@ a.top-menu-dropdown-link {
 	-webkit-font-smoothing: antialiased;
 	text-align:center;
 	text-decoration:none;
-	margin-right: 5px;
+	margin-<?php echo $right; ?>: 5px;
 	display: inline-block;
 	content: "\f0da";
 	/* color: rgba(0,0,0,0.3); */
 }
+.multicompany-item::before {
+	content: none !important;
+}
+
 .dropdown-item.bookmark-item-external::before {
 	content: "\f35d";
 }
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 9eb479d93ad..3d750cbcc38 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; ?>);
-	--colorbacklineimpair1: rgb(<?php print $colorbacklineimpair1; ?>);
+	--colorbacklinepair1: rgb(<?php print $colorbacklineimpair1; ?>);
 	--colorbacklineimpair2: rgb(<?php print $colorbacklineimpair2; ?>);
 	--colorbacklinepair1: rgb(<?php print $colorbacklinepair1; ?>);
 	--colorbacklinepair2: rgb(<?php print $colorbacklinepair2; ?>);
@@ -28,11 +28,12 @@
 	--colortexttitlelink: rgba(<?php print $colortexttitlelink; ?>, 0.9);
 	--colortext: rgb(<?php print $colortext; ?>);
 	--colortextlink: rgb(<?php print $colortextlink; ?>);
-	--colortextbackhmenu: #<?php echo $colortextbackhmenu; ?>;
+	--colortextbackhmenu: #<?php print $colortextbackhmenu; ?>;
 	--colortextbackvmenu: #<?php print $colortextbackvmenu; ?>;
+	--colortopbordertitle1: rgb(<?php print $colortopbordertitle1; ?>);
 	--listetotal: #888888;
 	--inputbackgroundcolor: #FFF;
-	--inputbordercolor: rgba(0,0,0,.2);
+	--inputbordercolor: rgba(0,0,0,.15);
 	--tooltipbgcolor: <?php print $toolTipBgColor; ?>;
 	--tooltipfontcolor : <?php print $toolTipFontColor; ?>;
 	--oddevencolor: #202020;
@@ -58,7 +59,7 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
 		print "@media (prefers-color-scheme: dark) {";
 	}
 	print ":root {
-	            --colorbackhmenu1: #1d1e20;
+	            --colorbackhmenu1: #3d3e40;
 	            --colorbackvmenu1: #2b2c2e;
 	            --colorbacktitle1: #2b2d2f;
 	            --colorbacktabcard1: #1d1e20;				/* Must be same than colorbackbody */
@@ -134,6 +135,7 @@ a.tab { font-weight: 500 !important; }
 a:link, a:visited, a:hover, a:active, .classlink { color: var(--colortextlink); text-decoration: none;  }
 a:hover { text-decoration: underline; color: var(--colortextlink); }
 a.commonlink { color: var(--colortextlink) !important; text-decoration: none; }
+
 th.liste_titre a div div:hover, th.liste_titre_sel a div div:hover { text-decoration: underline; }
 tr.liste_titre th.liste_titre_sel:not(.maxwidthsearch), tr.liste_titre td.liste_titre_sel:not(.maxwidthsearch),
 tr.liste_titre th.liste_titre:not(.maxwidthsearch), tr.liste_titre td.liste_titre:not(.maxwidthsearch) { opacity: 0.8; }
@@ -142,11 +144,6 @@ tr.liste_titre th.liste_titre:not(.maxwidthsearch), tr.liste_titre td.liste_titr
 input {
 	font-size: unset;
 }
-input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
-	background-color: var(--inputbackgroundcolor);
-	color: var(--colortext);
-	border-radius: 2px;
-}
 select.vmenusearchselectcombo {
 	background-color: unset;
 }
@@ -157,8 +154,9 @@ table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.
 	max-width: 100px;
 	text-overflow: ellipsis;
 }
-.liste_titre input[name=month_date_when], .liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],
+/*.liste_titre input[name=month_date_when], .liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],
 .liste_titre input[name=search_smonth], .liste_titre input[name=search_month], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre select[name=month],
+.liste_titre select[name=year],
 .liste_titre input[name=month_lim], .liste_titre input[name=month_start], .liste_titre input[name=month_end], .liste_titre input[name=month_create],
 .liste_titre input[name=search_month_lim], .liste_titre input[name=search_month_start], .liste_titre input[name=search_month_end], .liste_titre input[name=search_month_create],
 .liste_titre input[name=search_month_update], .liste_titre input[name=search_month_start], .liste_titre input[name=search_month_end],
@@ -169,7 +167,41 @@ table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.
 .liste_titre input[name=search_day_create], .liste_titre input[name=search_day_start], .liste_titre input[name=search_day_end],
 .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],
+*/
 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;
+}
+input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
+	color: var(--colortext);
+	border-radius: 3px;
+	font-family: <?php print $fontlist ?>;
+	outline: none;
+	margin: 0px 0px 0px 0px;
+	background-color: var(--inputbackgroundcolor);
+	<?php if (empty($conf->global->THEME_ADD_BACKGROUND_ON_INPUT)) { ?>
+		border<?php echo empty($conf->global->THEME_SHOW_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
+	<?php } ?>
+}
+
+.liste_titre input, .liste_titre select {
+	border: none;
+	border<?php echo empty($conf->global->THEME_SHOW_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
+	/* padding: 5px; */
+}
+.pageplusone,
+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);
+	<?php
+	if (!empty($conf->global->THEME_ADD_BACKGROUND_ON_INPUT)) { ?>
+		background-color: #f8f8fa;
+		border-bottom-left-radius: 0;
+		border-bottom-right-radius: 0;
+		<?php
+	}
+	?>
+}
 input[name=duration_value], input[name=durationhour]
 {
 	margin-right: 4px !important;
@@ -180,24 +212,11 @@ input[type=submit], input[type=submit]:hover {
 input[type=checkbox], input[type=radio] {
 	margin: 0 3px 0 3px;
 }
-input, input.flat, form.flat select, select, select.flat, .dataTables_length label select {
-	border: none;
-}
-input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
-	font-family: <?php print $fontlist ?>;
-	outline: none;
-	margin: 0px 0px 0px 0px;
-	border<?php echo empty($conf->global->THEME_SHOW_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
-}
-
 input {
 	line-height: 1.3em;
 	padding: 4px;
 	padding-left: 5px;
 }
-.liste_titre input {
-	padding: 5px;
-}
 select {
 	padding-top: 5px;
 	padding-right: 4px;
@@ -211,7 +230,7 @@ input, select {
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
 	background: var(--butactionbg);
-	color: #FFF !important;
+	color: var(--textbutaction)!important;
 	border-radius: 3px;
 	border-collapse: collapse;
 	border: none;
@@ -234,16 +253,27 @@ input.button.massactionconfirmed {
 	margin: 4px;
 }
 
-input:invalid, select:invalid {
+input:invalid, select:invalid, input.--error , select.--error {
 	border-color: #ea1212;
 }
 
+section.setupsection {
+	padding: 20px;
+	background-color: var(--colorbacktitle1);
+	border-radius: 5px;
+}
+
+.field-error-icon { color: #ea1212; !important; }
+
 /* Focus definitions must be after standard definition */
-textarea:focus {
+div.tabBar textarea:focus {
 	border: 1px solid #aaa !important;
 }
-input:focus, select:focus {
-	border-bottom: 1px solid #666;
+input:focus:not(.button):not(.select2-search__field):not(#top-bookmark-search-input), select:focus, .select2-container--open .select2-selection--single {
+/* div.tabBar input:focus, div.tabBar select:focus { */
+	border-bottom: 1px solid #666 !important;
+	border-bottom-left-radius: 0 !important;
+	border-bottom-right-radius: 0 !important;
 }
 textarea.cke_source:focus
 {
@@ -254,10 +284,10 @@ div#cke_dp_desc {
 }
 textarea {
 	border-radius: 0;
-	border-top:solid 1px rgba(0,0,0,.2);
-	border-left:solid 1px rgba(0,0,0,.2);
-	border-right:solid 1px rgba(0,0,0,.2);
-	border-bottom:solid 1px rgba(0,0,0,.2);
+	border-top: solid 1px var(--inputbordercolor);
+	border-left: solid 1px var(--inputbordercolor);
+	border-right: solid 1px var(--inputbordercolor);
+	border-bottom: solid 1px var(--inputbordercolor);
 
 	padding:4px;
 	margin-left:0px;
@@ -295,6 +325,9 @@ input.buttonpayment, button.buttonpayment, div.buttonpayment {
 	cursor: pointer;
 	max-width: 350px;
 }
+input.short {
+	width: 40px;
+}
 .nofocusvisible:focus-visible {
 	outline: none;
 }
@@ -356,6 +389,10 @@ a.butStatus {
 	margin: 0 0.45em !important;
 }
 
+span.userimg.notfirst {
+	margin-left: -5px;
+}
+
 /* Used by timesheets */
 span.timesheetalreadyrecorded input {
 	border: none;
@@ -383,7 +420,7 @@ td.rightborder {
 	border-right: 1px solid #ccc;
 }
 
-td.amount, span.amount, div.amount {
+td.amount, span.amount, div.amount, b.amount {
 	color: #006666;
 }
 td.actionbuttons a {
@@ -396,6 +433,10 @@ select.flat, form.flat select, .pageplusone {
 input.pageplusone {
 	padding-bottom: 4px;
 	padding-top: 4px;
+	margin-right: 4px;
+}
+.paginationlastpage a {
+	padding-left: 8px;
 }
 
 .saturatemedium {
@@ -439,7 +480,7 @@ input.pageplusone {
 	transform: scale(-1, 1);
 }
 
-select:invalid {
+select:invalid, select.--error {
 	color: gray;
 }
 input:disabled, textarea:disabled, select[disabled='disabled']
@@ -455,7 +496,7 @@ input.removedfile {
 	border: 0px !important;
 	vertical-align: text-bottom;
 }
-input[type=file ]    {
+input[type=file]    {
 	background-color: transparent;
 	box-shadow: none;
 	<?php if (empty($conf->global->THEME_SHOW_BORDER_ON_INPUT)) { ?>
@@ -480,7 +521,11 @@ input:-webkit-autofill {
 input:-moz-placeholder { color: #ccc; }
 
 input[name=price], input[name=weight], input[name=volume], input[name=surface], input[name=sizeheight], input[name=net_measure], select[name=incoterm_id] { margin-right: 6px; }
-fieldset { border: 1px solid #AAAAAA !important; }
+fieldset {
+	border: 1px solid #AAAAAA !important;
+	padding-inline-start: 2em;
+	padding-inline-end: 2em;
+}
 .legendforfieldsetstep { padding-bottom: 10px; }
 input#onlinepaymenturl, input#directdownloadlink {
 	opacity: 0.7;
@@ -499,7 +544,8 @@ div#moretabsList, div#moretabsListaction {
 hr { border: 0; border-top: 1px solid #ccc; }
 .tabBar hr { margin-top: 20px; margin-bottom: 17px; }
 
-.button:not(.bordertransp):not(.buttonpayment), .buttonDelete:not(.bordertransp):not(.buttonpayment) {
+.button:not(.bordertransp):not(.buttonpayment),
+.buttonDelete:not(.bordertransp):not(.buttonpayment) {
 	margin-bottom: 3px;
 	margin-top: 3px;
 	margin-left: 5px;
@@ -601,6 +647,9 @@ button:focus {
 .fa-info-circle {
 	padding-<?php echo $left; ?>: 3px;
 }
+.line-height-large {
+	line-height: 1.8em;
+}
 
 th .button {
 	-webkit-box-shadow: none !important;
@@ -651,6 +700,9 @@ textarea.centpercent {
 .large {
 	font-size: 125%;
 }
+.double {
+	font-size: 2em;
+}
 
 .h1 .small, .h1 small, .h2 .small, .h2 small, .h3 .small, .h3 small, h1 .small, h1 small, h2 .small, h2 small, h3 .small, h3 small {
 	font-size: 65%;
@@ -662,10 +714,10 @@ textarea.centpercent {
 }
 
 .flip {
-	transform: scaleX(-1) translate(2px, 0);
+	transform: scaleX(-1) translate(<?php print ($left == 'left' ? '' : '-'); ?>2px, 0);
 }
 .rotate90 {
-	transform: rotate(90deg) translate(0, 2px);
+	transform: rotate(90deg) translate(0, <?php print ($left == 'left' ? '' : '-'); ?>2px);
 }
 .center {
 	text-align: center;
@@ -674,6 +726,12 @@ textarea.centpercent {
 .alignstart {
 	text-align: start;
 }
+.start {
+	text-align: start;
+}
+.end {
+	text-align: end;
+}
 .left {
 	text-align: <?php print $left; ?>;
 }
@@ -695,6 +753,9 @@ textarea.centpercent {
 .nowraponsmartphone {
 	white-space: <?php print ($dol_optimize_smallscreen ? 'nowrap' : 'normal'); ?>;
 }
+.wraponsmartphone {
+	white-space: <?php print ($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
+}
 .liste_titre .nowrap {
 	white-space: nowrap;
 }
@@ -858,6 +919,10 @@ body[class*="colorblind-"] .text-success{
 .editfieldlang:hover {
 	color: var(--colortexttitle) !important;
 }
+a.editfielda.nohover *:hover:before {
+	color: #ccc !important;
+}
+
 .fawidth30 {
 	width: 20px;
 }
@@ -880,6 +945,13 @@ span.fa.fa-plus-circle.paddingleft {
 	font-size: 1.5em; vertical-align: text-bottom;
 }
 
+.divoverflow {
+	overflow: hidden;
+	white-space: nowrap;
+	vertical-align: middle;
+	text-overflow: ellipsis;
+}
+
 
 /* Themes for badges */
 
@@ -921,12 +993,18 @@ span.fa.fa-plus-circle.paddingleft {
 	padding-<?php print $right; ?>: 20px;
 }
 div.divsearchfield {
-	float: <?php print $left; ?>;
+	/* float: <?php print $left; ?>; */
+	display: inline-block;
 	margin-<?php print $right; ?>: 12px;
 	margin-<?php print $left; ?>: 2px;
 	margin-top: 4px;
 	margin-bottom: 4px;
-	  padding-left: 2px;
+	padding-left: 2px;
+}
+.divfilteralone {
+	background-color: rgba(0, 0, 0, 0.08);
+	border-radius: 5px;
+	padding-left: 5px;
 }
 .divsearchfieldfilter {
 	text-overflow: clip;
@@ -945,7 +1023,7 @@ div.divsearchfield {
 	padding-top: 2px;
 }
 .divadvancedsearchfield span.select2.select2-container.select2-container--default {
-	padding-bottom: 4px;
+	/* padding-bottom: 4px; */
 }
 .search_component_params {
 	/*display: flex; */
@@ -956,7 +1034,7 @@ div.divsearchfield {
 	padding-bottom: 3px;
 	padding-left: 10px;
 	padding-right: 10px;
-	border-bottom: solid 1px rgba(0,0,0,.2);
+	border-bottom: solid 1px var(--inputbordercolor);
 	height: 24px;
 }
 .search_component_searchtext {
@@ -994,6 +1072,11 @@ div.divsearchfield {
 	opacity: 0.6;
 }
 
+
+/* ============================================================================== */
+/* Styles for scan tool                                                           */
+/* ============================================================================== */
+
 div.div-for-modal {
 	/* display: none; */
 	position:absolute;
@@ -1007,19 +1090,26 @@ div.div-for-modal {
 	z-index: 100;
 }
 
+#scantoolmessage {
+	height: 3em;
+	border: none;
+	overflow-y: auto;
+}
+
 div.div-for-modal-topright {
 	/* display: none; */
 	position: fixed;
 	top: 0;
 	right: 0;
 	width:50%;  /* adjust as per your needs */
-	height:250px;   /* adjust as per your needs */
+	height:320px;   /* adjust as per your needs */
 	background: #fff;
 	border: 1px solid #bbb;
 	box-shadow: 2px 2px 20px #ddd;
 	z-index: 1100;
 }
 
+
 <?php
 // Add a nowrap on smartphone, so long list of field used for filter are overflowed with clip
 if ($conf->browser->layout == 'phone') {
@@ -1059,9 +1149,13 @@ ul.attendees li {
 }
 select.flat.selectlimit {
 	max-width: 62px;
+	text-align: end;
+	border-bottom: 1px solid var(--inputbordercolor);
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
 }
 .selectlimit, .marginrightonly {
-	margin-right: 10px !important;
+	margin-<?php echo $right; ?>: 10px !important;
 }
 .marginleftonly {
 	margin-<?php echo $left; ?>: 10px !important;
@@ -1118,6 +1212,18 @@ select.flat.selectlimit {
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
+.tdoverflowmax60 {			/* For tdoverflow, the max-midth become a minimum ! */
+	max-width: 60px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.tdoverflowmax80 {			/* For tdoverflow, the max-midth become a minimum ! */
+	max-width: 80px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
 .tdoverflowmax100 {			/* For tdoverflow, the max-midth become a minimum ! */
 	max-width: 100px;
 	overflow: hidden;
@@ -1407,7 +1513,8 @@ table[summary="list_of_modules"] .fa-cog {
 .minheight40 { min-height: 40px; }
 .titlefieldcreate { width: 20%; }
 .titlefield       { /* width: 25%; */ width: 250px; }
-.titlefieldmiddle { width: 50%; }
+.titlefieldmiddle { width: 45%; }
+.titlefieldmax45 { max-width: 45%; }
 .imgmaxwidth180 { max-width: 180px; }
 .imgmaxheight50 { max-height: 50px; }
 
@@ -1429,6 +1536,7 @@ table[summary="list_of_modules"] .fa-cog {
 	.minwidth50imp  { min-width: 50px !important; }
 	.minwidth75imp  { min-width: 75px !important; }
 	.minwidth100imp { min-width: 100px !important; }
+	.minwidth125imp { min-width: 125px !important; }
 	.minwidth150imp { min-width: 150px !important; }
 	.minwidth200imp { min-width: 200px !important; }
 	.minwidth250imp { min-width: 250px !important; }
@@ -1448,6 +1556,7 @@ table[summary="list_of_modules"] .fa-cog {
 	.minwidth50imp  { min-width: 50px !important; }
 	.minwidth75imp  { min-width: 75px !important; }
 	.minwidth100imp { min-width: 100px !important; }
+	.minwidth125imp { min-width: 125px !important; }
 	.minwidth150imp { min-width: 110px !important; }
 	.minwidth200imp { min-width: 110px !important; }
 	.minwidth250imp { min-width: 115px !important; }
@@ -1573,6 +1682,13 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 		height: 40px !important;
 	}
 
+	div.tabs div.tab a.tab  {
+		max-width: 200px;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
 	.quatrevingtpercent, .inputsearch {
 		width: 95%;
 	}
@@ -1609,6 +1725,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 	.minwidth50imp  { min-width: 50px !important; }
 	.minwidth75imp  { min-width: 75px !important; }
 	.minwidth100imp { min-width: 100px !important; }
+	.minwidth125imp { min-width: 125px !important; }
 	.minwidth150imp { min-width: 110px !important; }
 	.minwidth200imp { min-width: 110px !important; }
 	.minwidth250imp { min-width: 115px !important; }
@@ -1645,6 +1762,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 
 	div.statusref {
 		padding-right: 10px;
+		max-width: 55%;
 	   }
 	div.statusref img {
 		padding-right: 3px !important;
@@ -1666,7 +1784,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 }
 .linkobject { cursor: pointer; }
 
-table.tableforfield tr>td:first-of-type, tr.trforfield>td:first-of-type, div.tableforfield div.tagtr>div.tagtd:first-of-type {
+table.tableforfield tr:not(.liste_titre)>td:first-of-type, tr.trforfield:not(.liste_titre)>td:first-of-type, div.tableforfield div.tagtr:not(.liste_titre)>div.tagtd:first-of-type {
 	color: var(--tableforfieldcolor);
 }
 
@@ -1712,7 +1830,7 @@ td.showDragHandle {
 	<?php } ?>
 }
 #id-right {	/* This must stay id-right and not be replaced with echo $right */
-	padding-top: 10px;
+	padding-top: 14px;
 	width: 100%;
 	background: var(--colorbackbody);
 	padding-bottom: 20px;
@@ -1784,7 +1902,7 @@ div.blockvmenulogo
 	margin-left: 11px;
 	margin-right: 9px;
 	padding: 0;
-	height: <?php echo $disableimages ? '20' : '35'; ?>px;
+	height: <?php echo $disableimages ? '18' : '35'; ?>px;
 	/* width: 100px; */
 	max-width: 100px;
 	vertical-align: middle;
@@ -1916,8 +2034,8 @@ div.vmenu, td.vmenu {
 
 
 div.fiche {
-	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '34' : '6')); ?>px;
-	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '30' : '6')); ?>px;
+	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '40' : '6')); ?>px;
+	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '36' : '6')); ?>px;
 	<?php if (!empty($dol_hide_leftmenu)) {
 		print 'margin-bottom: 12px;'."\n";
 	} ?>
@@ -1946,7 +2064,7 @@ div.fichethirdleft {
 		print "float: ".$left.";\n";
 	} ?>
 	<?php if ($conf->browser->layout != 'phone') {
-		print "width: 50%;\n";
+		print "width: calc(50% - 14px);\n";
 	} ?>
 	<?php if ($conf->browser->layout == 'phone') {
 		print "padding-bottom: 6px;\n";
@@ -1957,15 +2075,12 @@ div.fichetwothirdright {
 		print "float: ".$right.";\n";
 	} ?>
 	<?php if ($conf->browser->layout != 'phone') {
-		print "width: 50%;\n";
+		print "width: calc(50% - 14px);\n";
 	} ?>
 	<?php if ($conf->browser->layout == 'phone') {
 		print "padding-bottom: 6px\n";
 	} ?>
 }
-div.fichetwothirdright div.ficheaddleft {
-	 padding-<?php echo $left; ?>: 28px;
-}
 div.fichehalfleft {
 	<?php if ($conf->browser->layout != 'phone') {
 		print "float: ".$left.";\n";
@@ -2020,9 +2135,6 @@ div.secondcolumn div.box {
 		width: auto;
 		padding-bottom: 6px;
 	}
-	div.fichetwothirdright div.ficheaddleft {
-		padding-left: 0;
-	}
 	div.fichehalfleft {
 		float: none;
 		width: auto;
@@ -2114,7 +2226,7 @@ span.widthpictotitle.pictotitle {
 	vertical-align: middle;
 	margin-top: -3px
 }
-.pictowarning, .pictoerror, .pictopreview {
+.pictowarning, .pictoerror, .pictopreview, .picto.error {
 	padding-<?php echo $left; ?>: 3px;
 }
 .pictowarning {
@@ -2170,7 +2282,7 @@ div.arearefnobottom {
 div.heightref {
 	min-height: 80px;
 }
-div.divphotoref {
+div.divphotoref:last-child {
 	padding-<?php echo $right; ?>: 30px;
 }
 div.paginationref {
@@ -2232,12 +2344,12 @@ img.photorefnoborder {
 .underrefbanner {
 }
 .underbanner {
-	border-bottom: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
+	border-bottom: <?php echo $borderwidth ?>px solid var(--colortopbordertitle1);
 	/* border-bottom: 2px solid var(--colorbackhmenu1); */
 }
 .trextrafieldseparator td, .trextrafields_collapse_last td {
 	/* border-bottom: 2px solid var(--colorbackhmenu1) !important; */
-	border-bottom: 2px solid rgb(<?php echo $colortopbordertitle1 ?>) !important;
+	border-bottom: 2px solid var(--colortopbordertitle1) !important;
 }
 
 .tdhrthin {
@@ -2249,7 +2361,7 @@ img.photorefnoborder {
 /* Menu top et 1ere ligne tableau                                                 */
 /* ============================================================================== */
 
-div#id-top {
+#id-top {
 <?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
@@ -2710,8 +2822,8 @@ div.login a:hover {
 div.login_block_user {
 	display: inline-block;
 	vertical-align: middle;
-	line-height: <?php echo $disableimages ? '25' : '50'; ?>px;
-	height: <?php echo $disableimages ? '25' : '50'; ?>px;
+	line-height: <?php echo $disableimages ? '25' : '52'; ?>px;
+	height: <?php echo $disableimages ? '25' : '52'; ?>px;
 }
 div.login_block_other {
 	display: inline-block;
@@ -2847,11 +2959,18 @@ input.vmenusearchselectcombo[type=text] {
 .searchform input { font-size: 16px; }
 
 
-a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active, span.vmenu, span.vsmenu { white-space: nowrap; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; }
+a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active, span.vmenu, span.vsmenu {
+	white-space: nowrap; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>;
+}
 a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active,
 span.vmenu, span.vmenu:link, span.vmenu:visited, span.vmenu:hover, span.vmenu:active { font-weight: bold;  }	/* bold = 600, 500 is ko with Edge on 1200x960 */
-font.vmenudisabled  { font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; white-space: nowrap; }												/* bold = 600, 500 is ko with Edge on 1200x960 */
-a.vmenu:link, a.vmenu:visited { color: var(--colortextbackvmenu); }
+span.vmenudisabled, font.vmenudisabled  {
+	/* bold = 600, 500 is ko with Edge on 1200x960 */
+	font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; white-space: nowrap;
+}
+a.vmenu:link, a.vmenu:visited {
+	color: var(--colortextbackvmenu);
+}
 
 a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu {
 	font-family: <?php print $fontlist ?>;
@@ -2859,27 +2978,34 @@ a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu {
 	color: #202020;
 	margin: 1px 1px 1px 6px;
 }
-font.vsmenudisabled { font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; color: #aaa; }
+span.vsmenudisabled, font.vsmenudisabled {
+	font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; color: #aaa;
+}
 a.vsmenu:link, a.vsmenu:visited {
 	color: var(--colortextbackvmenu);
 	white-space: nowrap;
 }
-font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; }
+span.vsmenudisabledmargin, font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; }
 li a.vsmenudisabled, li.vsmenudisabled { color: #aaa !important; }
 
-a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { text-align: <?php print $left; ?>; color: #aaa; text-decoration: none; }
+a.help:link, a.help:visited, a.help:hover, a.help:active, span.help {
+	text-align: <?php print $left; ?>; color: #aaa; text-decoration: none;
+}
 .helppresent, .helppresent:hover {
 	/* color: #f3e4ac !important; */
 }
 .helppresentcircle {
+	/*
 	color: var(--colorbackhmenu1);
-	filter: invert(0.8);
-	margin-<?php echo $left ?>: -7px;
+	filter: invert(0.5);
+	*/
+	color: var(--colortextbackhmenu);
+	margin-<?php echo $left ?>: -4px;
 	display: inline-block;
-	margin-top: -10px;
 	font-size: x-small;
 	vertical-align: super;
 	opacity: 0.95;
+	transform: rotate(<?php echo ($left == 'left' ? '55deg' : '305deg'); ?>);
 }
 
 .vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone, .vmenu div.blockvmenubookmarks
@@ -3173,7 +3299,7 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 }
 
 .tabactive, a.tab#active {
-	color: var(--colortextbacktab); !important;
+	color: var(--colortextbacktab) !important;
 	background: var(--colorbacktabcard1) !important;
 	margin: 0 0.2em 0 0.2em !important;
 
@@ -3185,7 +3311,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
 {
@@ -3272,12 +3398,21 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
 	padding-right: 7px !important;
 }
 input.button[name="upload"] {
-	padding: 4px !important;
+	padding: 5px !important;
 	font-size: 0.9em;
 }
-input.button.smallpaddingimp {
+input.button.smallpaddingimp, input.buttonreset.smallpaddingimp {
 	font-size: 0.8em;
 }
+input.buttonreset {
+	margin-top: 3px;
+	margin-bottom: 3px;
+	padding: 8px 15px;
+	text-decoration: underline;
+	color: var(--colortextlink);
+	background-color: transparent;
+	cursor: pointer;
+}
 .nopaddingleft {
 	padding-<?php print $left; ?>: 0px;
 }
@@ -3364,6 +3499,30 @@ td.border, div.tagtable div div.border {
 	width:auto;
 }
 
+/* To have left column sticky */
+/*.tagtable td[data-key="ref"], .tagtable th[data-key="ref"] {
+	position: sticky;
+	left: 0;
+	top: 0;
+	max-width: 150px !important;
+	//background-color: inherit;
+	background-color: gainsboro;
+	z-index: 2;
+}
+*/
+
+/* To have right column sticky */
+/*.tagtable td.actioncolumn, .tagtable th.actioncolumn {
+	position: sticky-right;
+	right: 0;
+	top: 0;
+	max-width: 150px !important;
+	//background-color: inherit;
+	background-color: gainsboro;
+	z-index: 2;
+}
+*/
+
 
 /* Main boxes */
 .nobordertop, .nobordertop tr:first-of-type td {
@@ -3373,10 +3532,10 @@ td.border, div.tagtable div div.border {
 	border-bottom: none !important;
 }
 .bordertop {
-	border-top: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
+	border-top: 1px solid var(--colortopbordertitle1);
 }
 .borderbottom {
-	border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
+	border-bottom: 1px solid var(--colortopbordertitle1);
 }
 
 
@@ -3388,10 +3547,15 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	border-collapse: separate !important;
 	border-spacing: 0px;
 	border-top-width: <?php echo $borderwidth ?>px;
-	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
+	border-top-color: var(--colortopbordertitle1);
 	border-top-style: solid;
-	margin: 0px 0px 5px 0px;
+	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;
@@ -3404,20 +3568,20 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 }
 #tablelines {
 	border-bottom-width: 1px;
-	border-bottom-color: rgb(<?php echo $colortopbordertitle1 ?>);
+	border-bottom-color: var(--colortopbordertitle1);
 	border-bottom-style: solid;
 }
 table.liste tr:last-of-type td, table.noborder:not(#tablelines) tr:last-of-type td, table.formdoc tr:last-of-type td, div.noborder tr:last-of-type td {
 	border-bottom-width: 1px;
-	border-bottom-color: rgb(<?php echo $colortopbordertitle1 ?>);
+	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 rgb(<?php echo $colortopbordertitle1 ?>);
+	border-bottom: 1px solid var(--colortopbordertitle1);
 }
 div.tabBar table.border>tbody>tr:last-of-type>td {
 	border-bottom-width: 1px;
-	border-bottom-color: rgb(<?php echo $colortopbordertitle1 ?>);
+	border-bottom-color: var(--colortopbordertitle1);
 	border-bottom-style: solid;
 }
 div.tabBar div.fichehalfright table.noborder {
@@ -3451,7 +3615,7 @@ tr.liste_titre_filter td.liste_titre:first-of-type {
 {
 	border-bottom-width: 0 !important;
 	border-top-width: 1px;
-	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
+	border-top-color: var(--colortopbordertitle1);
 	border-top-style: solid;
 }
 tr#trlinefordates td {
@@ -3460,7 +3624,7 @@ tr#trlinefordates td {
 .liste_titre_add td, .liste_titre_add th, .liste_titre_add .tagtd
 {
 	border-top-width: 1px;
-	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
+	border-top-color: var(--colortopbordertitle1);
 	border-top-style: solid;
 }
 table.liste tr, table.noborder tr, div.noborder form {
@@ -3530,23 +3694,26 @@ div.refidpadding  {
 }
 div.refid  {
 	font-weight: bold;
-	  color: var(--colortexttitlenotab);
-	  font-size: 1.2em;
-	  word-break: break-word;
+	color: var(--colortexttitlenotab);
+	font-size: 1.2em;
+	word-break: break-word;
+}
+a.refid {
+	color: var(--colortexttitlenotab) !important;
 }
 div.refidno  {
 	padding-top: 3px;
 	font-weight: normal;
-	  color: var(--refidnocolor);
-	  font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize ?>;
-	  line-height: 21px;
+	color: var(--refidnocolor);
+	font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize ?>;
+	line-height: 1.4em;
 }
 div.refidno form {
 	display: inline-block;
 }
 
 div.pagination {
-	float: right;
+	float: <?php echo $right; ?>;
 }
 div.pagination a {
 	font-weight: normal;
@@ -3725,14 +3892,14 @@ table.hidepaginationnext .paginationnext {
 {
 	font-family: <?php print $fontlist ?>;
 	margin-bottom: 1px;
-	color: var(--oddevencolor);
+	color: var(--oddeven);
 }
 .impair, .nohover .impair:hover, tr.impair td.nohover
 {
-	background: var(--colorbacklineimpair1);
+	background-color: var(--colorbacklineimpair2);
 }
 #GanttChartDIV {
-	background-color: var(--colorbacklineimpair1);
+	background-color: var(--colorbacklineimpair2);
 }
 
 .oddeven, .evenodd, .pair, .nohover .pair:hover, tr.pair td.nohover, .tagtr.oddeven {
@@ -3741,21 +3908,21 @@ table.hidepaginationnext .paginationnext {
 	color: var(--oddevencolor);
 }
 .pair, .nohover .pair:hover, tr.pair td.nohover {
-	background-color: var(--colorbacklinepair1);
+	background-color: var(--colorbacklinepair2);
 }
 
 table.dataTable tr.oddeven {
-	background-color: var(--colorbacklinepair1) !important;
+	background-color: var(--colorbacklinepair2) !important;
 }
 
 /* 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;
-	background: var(--colorbacklineimpair1) !important;
+	background-color: var(--colorbacklineimpair2) !important;
+	background: var(--colorbacklineimpair2) !important;
 }
 td.evenodd, tr.nohoverpair td, #trlinefordates td {
-	background-color: var(--colorbacklinepair1) !important;
-	background: var(--colorbacklinepair1) !important;
+	background-color: var(--colorbacklinepair2) !important;
+	background: var(--colorbacklinepair2) !important;
 }
 .trforbreak td {
 	font-weight: 500;
@@ -3790,7 +3957,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 } ?>
 }
 table.nobottom, td.nobottom {
 	border-bottom: 0px !important;
@@ -3806,8 +3975,12 @@ div.liste_titre {
 }
 div.liste_titre_bydiv {
 	border-top-width: <?php echo $borderwidth ?>px;
-	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
+	border-top-color: var(--colortopbordertitle1);
 	border-top-style: solid;
+	<?php if ($userborderontable) { ?>
+	border-left: <?php echo $borderwidth ?>px solid var(--colortopbordertitle1);
+	/* border-right: <?php echo $borderwidth ?>px solid var(--colortopbordertitle1); */
+	<?php } ?>
 
 	border-collapse: collapse;
 	display: table;
@@ -3838,7 +4011,7 @@ div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_se
 }
 tr.liste_titre th, tr.liste_titre td, th.liste_titre
 {
-	border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
+	border-bottom: 1px solid var(--colortopbordertitle1);
 }
 tr.liste_titre:first-child th, tr:first-child th.liste_titre {
 /*    border-bottom: 1px solid #ddd ! important; */
@@ -3857,7 +4030,7 @@ tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, fo
 }
 tr.liste_titre_topborder td {
 	border-top-width: <?php echo $borderwidth; ?>px;
-	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
+	border-top-color: var(--colortopbordertitle1);
 	border-top-style: solid;
 }
 .liste_titre td a {
@@ -3958,7 +4131,7 @@ div.tabBar .noborder {
 }
 
 #tablelines tr.liste_titre td, .paymenttable tr.liste_titre td, .margintable tr.liste_titre td, .tableforservicepart1 tr.liste_titre td {
-	border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>) !important;
+	border-bottom: 1px solid var(--colortopbordertitle1) !important;
 }
 #tablelines tr td {
 	height: unset;
@@ -3967,14 +4140,13 @@ div.tabBar .noborder {
 /* Prepare to remove class pair - impair */
 
 .noborder:not(.editmode) > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre),
-div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft) > .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):not(.ficheaddleft) .oddeven.tagtr:nth-of-type(even):not(.liste_titre)
+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(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: -ms-linear-gradient(bottom, var(--colorbacklineimpair1) 85%, var(--colorbacklineimpair2) 100%); */
+	background: linear-gradient(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 .oddeven.tagtr:nth-child(even):not(:last-child) .tagtd:not(.liste_titre)
@@ -3983,14 +4155,13 @@ div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft
 }
 
 .noborder:not(.editmode) > tbody > tr:nth-child(odd):not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(.liste_titre),
-div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft) > .border > tbody > tr:nth-of-type(odd):not(.liste_titre), .liste > tbody > tr:nth-of-type(odd):not(.liste_titre),
-div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft) .oddeven.tagtr:nth-of-type(odd):not(.liste_titre)
+div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright) > .border > tbody > tr:nth-of-type(odd):not(.liste_titre), .liste > tbody > tr:nth-of-type(odd):not(.liste_titre),
+div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright) .oddeven.tagtr:nth-of-type(odd):not(.liste_titre)
 {
-	background: linear-gradient(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: -ms-linear-gradient(bottom, var(--colorbacklinepair1) 85%, var(--colorbacklinepair2) 100%); */
+	background: linear-gradient(bottom, var(--colorbacklinepair2) 0%, var(--colorbacklinepair2) 100%);
+	background: -o-linear-gradient(bottom, var(--colorbacklinepair2) 0%, var(--colorbacklinepair2) 100%);
+	background: -moz-linear-gradient(bottom, var(--colorbacklinepair2) 0%, var(--colorbacklinepair2) 100%);
+	background: -webkit-linear-gradient(bottom, var(--colorbacklinepair2) 0%, var(--colorbacklinepair2) 100%);
 }
 .noborder > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre),
 .noborder .oddeven.tagtr:nth-child(odd):not(:last-child) .tagtd:not(.liste_titre)
@@ -4014,9 +4185,6 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 	padding-left: 0px;
 	padding-bottom: 10px;
 }
-.ficheaddleft div.boxstats, .ficheaddright div.boxstats {
-	border: none;
-}
 .boxstatsborder {
 	/* border: 1px solid #CCC !important; */
 }
@@ -4205,7 +4373,7 @@ span.dashboardlineko {
 	margin-bottom: 25px !important;
 	border-bottom-width: 1px;
 	background: var(--colorbackbody);
-	border-top: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
+	border-top: <?php echo $borderwidth ?>px solid var(--colortopbordertitle1);
 	/* border-top: 2px solid var(--colorbackhmenu1) !important; */
 }
 table.noborder.boxtable tr td {
@@ -4376,13 +4544,15 @@ div.boximport {
 
 .fieldrequired { font-weight: bold; color: var(--fieldrequiredcolor) !important; }
 
-td.widthpictotitle { width: 38px; text-align: <?php echo $left; ?>; }
+td.widthpictotitle, .table-fiche-title img.widthpictotitle { width: 38px; text-align: <?php echo $left; ?>; }
 span.widthpictotitle { font-size: 1.7em; }
 table.titlemodulehelp tr td img.widthpictotitle { width: 80px; }
 
 .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; }
 .dolgraphtitlecssboxes { /* margin: 0px; */ }
-.dolgraphchart canvas { width: calc(100% - 20px) !important; }
+.dolgraphchart canvas {
+	/* width: calc(100% - 20px) !important; */
+}
 .legendColorBox, .legendLabel { border: none !important; }
 div.dolgraph div.legend, div.dolgraph div.legend div { background-color: var(--dolgraphbg) !important; }
 div.dolgraph div.legend table tbody tr { height: auto; }
@@ -4400,10 +4570,10 @@ label.radioprivate {
 	border: 0px;
 }
 .photowithmargin {
-	margin-bottom: 2px;
-	margin-top: 10px;
+/*	margin-bottom: 2px;
+	margin-top: 2px; */
 }
-div.divphotoref > a > .photowithmargin {		/* Margin right for photo not inside a div.photoref frame only */
+div.divphotoref > img.photowithmargin, div.divphotoref > a > .photowithmargin {		/* Margin right for photo not inside a div.photoref frame only */
 	margin-right: 15px;
 }
 .photowithborder {
@@ -4444,7 +4614,7 @@ div.titre {
 }
 div.fiche > table.table-fiche-title:first-of-type div {
 	color: var(--colortexttitlenotab);
-	font-size: 1.05em;
+	font-size: 1.1em;
 	/* text-transform: uppercase; */
 	/* font-weight: 600; */
 }
@@ -4478,7 +4648,15 @@ div.backgreypublicpayment { background-color: #f0f0f0; padding: 20px; border-bot
 	color: #222;
 	opacity: 0.3;
 }
-#dolpaymenttable { min-width: 320px; font-size: 16px; }	/* Width must have min to make stripe input area visible. Lower than 320 makes input area crazy for credit card that need zip code */
+
+#dolpublictable {
+	min-width: 300px; font-size: 16px;
+	padding: 6px;
+}
+#dolpaymenttable {
+	min-width: 320px; font-size: 16px;
+}	/* 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 {
 	border: 1px solid #CCCCCC !important;
 	width: 100%;
@@ -4619,8 +4797,28 @@ div.ui-tooltip.mytooltip {
 	background: var(--tooltipbgcolor) !important;
 	color : var(--tooltipfontcolor);
 	line-height: 1.6em;
-	min-width: 200px;
+	min-width: 550px;
 }
+@media only screen and (max-width: 768px)
+{
+	div.ui-tooltip.mytooltip {
+		max-width: 400px;
+	}
+}
+@media only screen and (max-width: 480px)
+{
+	div.ui-tooltip.mytooltip {
+		max-width: 300px;
+	}
+}
+@media only screen and (max-width: 320px)
+{
+	div.ui-tooltip.mytooltip {
+		max-width: 230px;
+	}
+}
+
+
 
 
 
@@ -4738,7 +4936,7 @@ div.visible {
 	display: block;
 }
 
-div.hidden, td.hidden, img.hidden, span.hidden, div.showifmore {
+div.hidden, header.hidden, td.hidden, img.hidden, span.hidden, div.showifmore {
 	display: none;
 }
 .unvisible {
@@ -4753,6 +4951,11 @@ tr.visible {
 /*  Module website                                                                */
 /* ============================================================================== */
 
+.websiteformtoolbar {
+	position: sticky;
+	top: <?php echo empty($dol_hide_topmenu) ? ($disableimages ? '32px' : '52px') : '0'; ?>;
+}
+
 .exampleapachesetup {
 	overflow-y: auto;
 	height: 100px;
@@ -4784,9 +4987,12 @@ span[phptag] {
 	border-bottom: 1px solid #ccc;
 	background: #e6e6e6;
 	display: inline-block;
-	padding: 5px 0 5px 0;
+	padding: 5px 5px 5px 5px;
 	z-index: 1000;
 }
+.centpercent.websitebar {
+	width: calc(100% - 10px);
+}
 .websitebar .buttonDelete, .websitebar .button {
 	text-shadow: none;
 }
@@ -4794,15 +5000,21 @@ span[phptag] {
 {
 	padding: 4px 5px 4px 5px !important;
 	margin: 2px 4px 2px 4px  !important;
-	line-height: normal;
+/*	line-height: normal; */
 	background: #f5f5f5 !important;
 	border: 1px solid #ccc !important;
 }
 .websiteselection {
 	/* display: inline-block; */
-	padding-left: 10px;
+	padding-<?php echo $right; ?>: 10px;
+	vertical-align: middle;
+	line-height: 28px;
+}
+.websiteselectionsection {
+	font-size: 0.85em;
+}
+.websiteselection span {
 	vertical-align: middle;
-	/* line-height: 28px; */
 }
 .websitetools {
 	float: right;
@@ -4814,12 +5026,15 @@ span[phptag] {
 }
 .websiteinputurl {
 	display: inline-block;
-	vertical-align: top;
+	vertical-align: middle;
 	line-height: 28px;
 }
 .websiteiframenoborder {
 	border: 0px;
 }
+span.websiteselection span.select2.select2-container.select2-container--default {
+	margin: 0 0 0 4px;
+}
 span.websitebuttonsitepreview, a.websitebuttonsitepreview {
 	vertical-align: middle;
 }
@@ -4846,6 +5061,10 @@ span.websitebuttonsitepreviewdisabled img, a.websitebuttonsitepreviewdisabled im
 	line-height: 1em;
 }
 
+.websitebar input.bordertransp {
+	line-height: normal !important;
+}
+
 #divbodywebsite section p {
 	margin: unset;
 }
@@ -4881,11 +5100,10 @@ table.cal_month td { padding-left: 1px !important; padding-right: 1px !important
 .cal_past          { }
 .cal_peruser       { padding-top: 0 !important; padding-bottom: 0 !important; padding-<?php print $left; ?>: 1px !important; padding-<?php print $right; ?>: 1px !important; }
 .cal_impair        {
-	background: linear-gradient(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: -ms-linear-gradient(bottom, var(--colorbacklinepair1) 85%, var(--colorbacklinepair2) 100%); */
+	background: linear-gradient(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%);
 }
 .cal_today_peruser_impair { background: #F8F8F0; }
 .peruser_busy      { }
@@ -5451,7 +5669,7 @@ ul.filedirelem li {
 }
 
 ul.ecmjqft {
-	line-height: 16px;
+	line-height: 32px;
 	padding: 0px;
 	margin: 0px;
 	font-weight: normal;
@@ -5504,8 +5722,8 @@ div#ecm-layout-center {
 	float: right;
 }
 
-.ecmjqft LI.directory { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2.png', 1); ?>) left top no-repeat; }
-.ecmjqft LI.expanded { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2-expanded.png', 1); ?>) left top no-repeat; }
+.ecmjqft LI.directory { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2.png', 1); ?>) left top no-repeat; background-position-y: 8px; }
+.ecmjqft LI.expanded { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2-expanded.png', 1); ?>) left top no-repeat; background-position-y: 8px; }
 .ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/'.$theme.'/img/working.gif', 1); ?>) left top no-repeat; }
 
 
@@ -5529,6 +5747,8 @@ div#ecm-layout-center {
 }
 .jnotify-container .jnotify-notification .jnotify-message {
 	font-weight: normal;
+	text-align: start;
+	word-break: break-word;
 }
 .jnotify-container .jnotify-notification-warning .jnotify-close, .jnotify-container .jnotify-notification-warning .jnotify-message {
 	color: #a28918 !important;
@@ -5657,7 +5877,7 @@ span#select2-taskid-container[title^='--'] {
 }
 
 .select2-container--default .select2-results__option--highlighted[aria-selected] {
-	background-color: rgb(<?php echo $colorbackhmenu1 ?>);
+	background-color: var(--colorbackhmenu1);
 	color: var(--colortextbackhmenu);
 }
 .select2-container--default .select2-results__option--highlighted[aria-selected] span {
@@ -5690,6 +5910,8 @@ input.select2-input {
 }
 .select2-container--focus span.select2-selection.select2-selection--single {
 	border-bottom: 1px solid #666 !important;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
 }
 
 .blockvmenusearch .select2-container--default .select2-selection--single,
@@ -5764,23 +5986,34 @@ input.select2-input {
 
 	-webkit-box-shadow: none !important;
 	box-shadow: none !important;
-	border-radius: 0 !important;
+	border-radius: 3px;
+}
+.select2-container--focus .select2-container--default .select2-selection--single {
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
 }
 .select2-container--default.select2-container--focus .select2-selection--multiple {
 	border-top: none;
 	border-left: none;
 	border-right: none;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
 }
 .select2-container--default .select2-selection--multiple {
 	border-bottom: solid 1px var(--inputbordercolor);
 	border-top: none;
 	border-left: none;
 	border-right: none;
-	border-radius: 0 !important;
+	border-radius: 3px;
 	background: var(--inputbackgroundcolor);
+	line-height: normal;
 }
-.select2-container--default .select2-selection--multiple .select2-selection__choice{
+.select2-container--default .select2-selection--multiple .select2-selection__rendered {
+	line-height: 1.4em;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
 	background-color: #ddd;
+	margin-top: 4px !important;
 }
 
 .select2-search__field
@@ -5789,7 +6022,7 @@ input.select2-input {
 	border-top: none !important;
 	border-left: none !important;
 	border-right: none !important;
-	border-bottom: solid 1px rgba(0,0,0,.2) !important;
+	border-bottom: solid 1px var(--inputbordercolor) !important;
 	-webkit-box-shadow: none !important;
 	box-shadow: none !important;
 	border-radius: 0 !important;
@@ -5869,6 +6102,7 @@ a span.select2-chosen
 }
 .select2-results__option {
 	word-break: break-word;
+	text-align: <?php echo $left; ?>;
 }
 .select2-container.select2-container-disabled .select2-choice, .select2-container-multi.select2-container-disabled .select2-choices {
 	background-color: var(--colorbackvmenu1);
@@ -5976,10 +6210,12 @@ span#select2-boxbookmark-container {
 	box-shadow: none;
 	-webkit-box-shadow: none !important;
 	box-shadow: none !important;
+	margin-top: 1px !important;
+	margin-bottom: 0 !important;
 }
 span.noborderoncategories a, li.noborderoncategories a {
 	line-height: normal;
-	vertical-align: top;
+	/* vertical-align: top; */
 }
 span.noborderoncategories {
 	padding: 4px 5px 0px 5px;
@@ -6036,14 +6272,17 @@ span.noborderoncategories {
   cursor: default;
 
   border: none;
-  border-bottom: solid 1px rgba(0,0,0,.2);
+  border-bottom: solid 1px var(--inputbordercolor);
   padding: 5px;
   padding-left: 2px;
   height: 17px;
+  border-radius: 3px;
 }
 .multi-select-button:focus {
   outline: none;
   border-bottom: 1px solid #666;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
 }
 
 .multi-select-button:after {
@@ -6067,7 +6306,10 @@ span.noborderoncategories {
 .multi-select-menuitem {
 	clear: both;
 	float: left;
-	padding-left: 5px
+	padding-left: 5px;
+}
+label.multi-select-menuitem {
+	line-height: 24px;
 }
 
 
@@ -6662,7 +6904,6 @@ div.tabsElem a.tab {
   background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(230,230,230,0.4) 100%);
   background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(230,230,230,0.4) 100%);
   background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(230,230,230,0.4) 100%);
-  background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(230,230,230,0.4) 100%);
   background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(230,230,230,0.4) 100%);
 }
 .cd-timeline-content:after {
@@ -6828,7 +7069,7 @@ div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
 /* For copy-paste feature                                                         */
 /* ============================================================================== */
 
-span.clipboardCPValueToPrint {
+span.clipboardCPValueToPrint, div.clipboardCPValueToPrint  {
 	display: inline-block;
 }
 span.clipboardCPValue.hidewithsize {
@@ -6837,11 +7078,64 @@ span.clipboardCPValue.hidewithsize {
 	color: transparent;
 	white-space: nowrap;
 }
+div.clipboardCPValue.hidewithsize {
+	width: 0 !important;
+	display: none;
+	color: transparent;
+	white-space: nowrap;
+}
 
 .clipboardCPShowOnHover .clipboardCPButton {
 	display: none;
 }
 
+/* To make a div popup, we must use a position aboluste inside a position relative */
+.clipboardCPText {
+	position: relative;
+}
+.clipboardCPTextDivInside {
+	position: absolute;
+	background: #f8f8fa;
+	color: #888;
+	border: 1px solid #E0E0E0;
+	opacity: 1;
+	z-index: 20;
+	padding: 2px;
+	padding-left: 5px;
+	padding-right: 5px;
+	top: -5px;
+	left: 0px;
+	border-radius: 5px;
+	white-space: nowrap;
+	font-size: 0.9em;
+	box-shadow: 1px 1px 6px #ddd;
+}
+
+
+/* ============================================================================== */
+/* CSS style used for hrm skill/rank (may be we can remove this)                  */
+/* ============================================================================== */
+
+.radio_js_bloc_number {
+	display:inline-block;
+	padding:5px 7px;
+	min-width:20px;
+	border-radius:3px;
+	border:1px solid #ccc;
+	background:#eee;
+	color:#555;
+	cursor:pointer;
+	margin:2px;
+	text-align:center;
+}
+.radio_js_bloc_number.selected {
+	transition:0.2s ease background;
+	background:#888;
+	color:#fff;
+	border-color:#555;
+}
+
+
 
 /* ============================================================================== */
 /* CSS style used for small screen                                                */
@@ -6964,6 +7258,9 @@ span.clipboardCPValue.hidewithsize {
 		z-index: 201;
 		background: var(--colorbackvmenu1);
 	}
+	#id-right {	/* This must stay id-right and not be replaced with echo $right */
+		padding-top: 8px;
+	}
 
 	.login_vertical_align {
 		padding-left: 20px;
@@ -6996,7 +7293,7 @@ span.clipboardCPValue.hidewithsize {
 		padding-left: 20px;
 		padding-right: 20px;
 		padding-bottom: 16px;
-		top: inherit !important;
+		top: auto;
 		left: 0 !important;
 		text-align: center;
 		vertical-align: middle;
@@ -7070,6 +7367,23 @@ span.clipboardCPValue.hidewithsize {
 	#divbodywebsite {
 		word-break: break-all;
 	}
+
+	.websiteselectionsection {
+		border-left: unset;
+		border-right: unset;
+		padding-left: 5px;
+	}
+
+	.a-mesure, .a-mesure-disabled {
+		display: block;
+		margin-bottom: 6px;
+		padding-left: 12px;
+		padding-right: 12px;
+	}
+
+	.a-mesure, .a-mesure-disabled {
+		text-align: center;
+	}
 }
 
 @media only screen and (max-width: 320px)
@@ -7105,6 +7419,6 @@ if (!empty($conf->global->THEME_CUSTOM_CSS)) {
 ?>
 
 /* Must be at end */
-div.flot-text .flot-tick-label .tickLabel {
+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 40a62dbf18a..8e4df027809 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -33,9 +33,13 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 	margin-bottom: 10px;
 	/* background: #fff; */
 }
-.opened-dash-board-wrap .info-box.info-box-sm {
-	border-radius: 0 0 0 20px;
+.opened-dash-board-wrap .info-box, .opened-dash-board-wrap .info-box .info-box-icon  {
+	border-radius: 0 0 0 15px;
 }
+/*.opened-dash-board-wrap .box-flex-item {
+	border-radius: 10px;
+}*/
+
 .info-box-more {
 	float: right;
 	top: 5px;
@@ -80,9 +84,9 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 	overflow: hidden;
 	float: left;
 	height: 90px;
-	width: 90px;
+	width: 88px;
 	text-align: center;
-	font-size: 45px;
+	font-size: 2.8em;
 	line-height: 90px;
 	background: rgba(0, 0, 0, 0.08) !important;
 }
@@ -97,10 +101,11 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 	font-size: 25px;
 	line-height: 92px;
 }
-.opened-dash-board-wrap .info-box-sm .info-box-icon {
-	border-radius: 0 0 0 20px;
+.opened-dash-board-wrap .info-box .info-box-icon {
+	font-size: 2em;
 }
 .opened-dash-board-wrap .info-box-sm .info-box-icon {
+	border-radius: 0 0 0 20px;
 	line-height: 80px;
 }
 .info-box-module .info-box-icon {
@@ -150,13 +155,14 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	cursor: default;
 
 	font-size: 10px;
-	line-height: 22px;
-	padding: 0px 3px;
+	line-height: 1.5em;
+	padding: 4px 3px;
 	text-align: center;
 	opacity: 1;
 	-webkit-transition: opacity 0.5s, visibility 0s 0.5s;
 	transition: opacity 0.5s, visibility 0s 0.5s;
 }
+
 .box-flex-item.info-box-module.--disabled {
 	/* opacity: 0.6; */
 }
@@ -431,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;
@@ -484,6 +494,10 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 		width: 100%;
 		max-width: unset;
 	}
+
+	.info-box-sm .info-box-icon-text, .info-box-sm .info-box-icon-version {
+		width: 60px;
+	}
 	.info-box-sm .info-box-icon {
 		width: 60px;
 	}
diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
index a9e5e80c009..f193af733c9 100644
--- a/htdocs/theme/eldy/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
@@ -53,7 +53,7 @@ div.mainmenu.bank::before {
 	content: "\f19c";
 }
 
-<?php if ($conf->global->MAIN_FEATURES_LEVEL == 2) { ?>
+<?php if (getDolGlobalInt('MAIN_FEATURES_LEVEL') == 2) { ?>
 /* TESTING USAGE OF SVG WITHOUT FONT */
 div.mainmenu.cashdesk {
 	line-height: 26px;
diff --git a/htdocs/theme/eldy/manifest.json.php b/htdocs/theme/eldy/manifest.json.php
index 7d0f75614c7..6f3dc2e9cbc 100644
--- a/htdocs/theme/eldy/manifest.json.php
+++ b/htdocs/theme/eldy/manifest.json.php
@@ -64,7 +64,7 @@ top_httphead('text/json');
 if (empty($dolibarr_nocache)) {
 	header('Cache-Control: max-age=10800, public, must-revalidate');
 	// For a text/json, we must set an Expires to avoid to have it forced to an expired value by the web server
-	header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + 10800) . ' GMT');
+	header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + 10800).' GMT');
 } else {
 	header('Cache-Control: no-cache');
 }
@@ -79,8 +79,8 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
 }
 
 
-$manifest->theme_color = !empty($conf->global->MAIN_MANIFEST_APPLI_THEME_COLOR)?$conf->global->MAIN_MANIFEST_APPLI_THEME_COLOR:'#F05F40';
-$manifest->background_color = !empty($conf->global->MAIN_MANIFEST_APPLI_BG_COLOR)?$conf->global->MAIN_MANIFEST_APPLI_BG_COLOR:"#ffffff";
+$manifest->theme_color = !empty($conf->global->MAIN_MANIFEST_APPLI_THEME_COLOR) ? $conf->global->MAIN_MANIFEST_APPLI_THEME_COLOR : '#F05F40';
+$manifest->background_color = !empty($conf->global->MAIN_MANIFEST_APPLI_BG_COLOR) ? $conf->global->MAIN_MANIFEST_APPLI_BG_COLOR : "#ffffff";
 $manifest->display = "standalone";
 $manifest->splash_pages = null;
 $manifest->icons = array();
@@ -97,11 +97,11 @@ if (!empty($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL)) {
 	$manifest->icons[] = $icon;
 } elseif (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED)) {
 	if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI)) {
-		$iconRelativePath 	= 'logos/thumbs/'.$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI;
-		$iconPath 	= $conf->mycompany->dir_output.'/'.$iconRelativePath;
+		$iconRelativePath = 'logos/thumbs/'.$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI;
+		$iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath;
 		if (is_readable($iconPath)) {
 			$imgSize = getimagesize($iconPath);
-			if ($imgSize) {
+			if (!empty($imgSize)) {
 				$icon = new stdClass();
 				$icon->src = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode($iconRelativePath);
 				$icon->sizes = $imgSize[0]."x".$imgSize[1];
@@ -112,8 +112,8 @@ if (!empty($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL)) {
 	}
 
 	if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL)) {
-		$iconRelativePath 	= 'logos/thumbs/'.$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL;
-		$iconPath 	= $conf->mycompany->dir_output.'/'.$iconRelativePath;
+		$iconRelativePath = 'logos/thumbs/'.$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL;
+		$iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath;
 		if (is_readable($iconPath)) {
 			$imgSize = getimagesize($iconPath);
 			if ($imgSize) {
@@ -127,8 +127,8 @@ if (!empty($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL)) {
 	}
 
 	if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED)) {
-		$iconRelativePath 	= 'logos/'.$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED;
-		$iconPath 	= $conf->mycompany->dir_output.'/'.$iconRelativePath;
+		$iconRelativePath = 'logos/'.$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED;
+		$iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath;
 		if (is_readable($iconPath)) {
 			$imgSize = getimagesize($iconPath);
 			if ($imgSize) {
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 44a0a7d7b20..fb9178e1ed0 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2021       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
@@ -84,8 +85,8 @@ if (empty($dolibarr_nocache)) {
 	header('Cache-Control: no-cache');
 }
 
-if (GETPOST('theme', 'alpha')) {
-	$conf->theme = GETPOST('theme', 'alpha'); // If theme was forced on URL
+if (GETPOST('theme', 'aZ09')) {
+	$conf->theme = GETPOST('theme', 'aZ09'); // If theme was forced on URL
 }
 if (GETPOST('lang', 'aZ09')) {
 	$langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL
@@ -118,7 +119,8 @@ $dol_no_mouse_hover = $conf->dol_no_mouse_hover;
 //$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //var_dump($user->conf->THEME_ELDY_RGB);
 
-$useboldtitle = (isset($conf->global->THEME_ELDY_USEBOLDTITLE) ? $conf->global->THEME_ELDY_USEBOLDTITLE : 0);
+$useboldtitle = getDolGlobalInt('THEME_ELDY_USEBOLDTITLE');
+$userborderontable = getDolGlobalInt('THEME_ELDY_USEBORDERONTABLE');
 $borderwidth = 1;
 
 // Case of option always editable
@@ -149,7 +151,12 @@ if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) {
 if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
 	$conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
 }
-
+if (!isset($conf->global->THEME_ELDY_BTNACTION)) {
+	$conf->global->THEME_ELDY_BTNACTION = $butactionbg;
+}
+if (!isset($conf->global->THEME_ELDY_TEXTBTNACTION)) {
+	$conf->global->THEME_ELDY_TEXTBTNACTION = $textbutaction;
+}
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
 	$conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
@@ -177,6 +184,8 @@ $colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (emp
 $colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
 $colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
 $colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortextlink : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
+$butactionbg       	 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
+$textbutaction     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $conf->global->THEME_ELDY_TEXTBTNACTION) : (empty($user->conf->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $user->conf->THEME_ELDY_TEXTBTNACTION);
 $fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
 $fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
 
@@ -208,6 +217,8 @@ if ($tmpval <= 460) {
 	$colortextbackvmenu = '000000';
 }
 
+$colortopbordertitle1 = join(',', colorStringToArray($colortopbordertitle1)); // Normalize value to 'x,y,z'
+
 $colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbacktitle1);
 if ($colortexttitle == '') {
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 16d4b58663b..3346ac5d73d 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2021       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
@@ -68,11 +69,13 @@ $colortexttitle = '40, 40, 60';
 $colortexttitlelink = '10, 20, 100';
 $colortext = '0,0,0';
 $colortextlink = '10, 20, 100';
-$fontsize = '0.90em';
+$fontsize = '0.92em';
 $fontsizesmaller = '0.75em';
 $topMenuFontSize = '1.1em';
 $toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
 $toolTipFontColor = '#333';
+$butactionbg = '150, 110, 162, 0.95';
+$textbutaction = '255, 255, 255';
 
 // text color
 $textSuccess   = '#28a745';
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index 2517415a96f..6d14830b657 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -10,10 +10,8 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 			--btncolorborderhover: none;
 			--btncolorborder: #FFF;
 			--butactiondeletebg: rgb(234,228,225);
-			/* tertiary color */
-			/* --butactionbg:rgb(218, 235, 225); */
-			/* --butactionbg:rgb(228, 218, 235); */
-			--butactionbg:rgb(118, 145, 225);
+			--butactionbg: rgb(<?php print $butactionbg; ?>);
+			--textbutaction: rgb(<?php print $textbutaction; ?>);
 }
 
 <?php
@@ -29,8 +27,9 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
             --btncolorbg: rgb(26,27,27);
             --btncolorborderhover: #ffffff;
             --btncolorborder: #2b2c2e;
-            --butactionbg:rgb(173,140,79);
             --butactiondeletebg: rgb(252,84,91);
+			--butactionbg: rgb(173,140,79);
+			--textbutaction: rgb(255,255,255);
 
       }\n";
 	if ($conf->global->THEME_DARKMODEENABLED != 2) {
@@ -44,12 +43,16 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
 /* ============================================================================== */
 
 
-div.divButAction {
-	margin-bottom: 1.4em;
-}
 div.tabsAction > a.butAction, div.tabsAction > a.butActionRefused, div.tabsAction > a.butActionDelete,
-div.tabsAction > span.butAction, div.tabsAction > span.butActionRefused, div.tabsAction > span.butActionDelete {
+div.tabsAction > span.butAction, div.tabsAction > span.butActionRefused, div.tabsAction > span.butActionDelete,
+div.tabsAction > div.divButAction > span.butAction,
+div.tabsAction > div.divButAction > span.butActionDelete,
+div.tabsAction > div.divButAction > span.butActionRefused,
+div.tabsAction > div.divButAction > a.butAction,
+div.tabsAction > div.divButAction > a.butActionDelete,
+div.tabsAction > div.divButAction > a.butActionRefused {
 	margin-bottom: 1.4em !important;
+	margin-right: 0px !important;
 }
 div.tabsActionNoBottom > a.butAction, div.tabsActionNoBottom > a.butActionRefused {
 	margin-bottom: 0 !important;
@@ -61,19 +64,20 @@ span.butAction, span.butActionDelete {
 
 .butAction {
 	background: var(--butactionbg);
-	color: #FFF !important;
+	color: var(--textbutaction) !important;
 	/* background: rgb(230, 232, 239); */
 }
 .butActionRefused, .butAction, .butActionDelete {
 	border-radius: 3px;
 }
-.butActionRefused:last-child, .butAction:last-child, .butActionDelete:last-child {
-	margin-right: 0px !important;
+:not(.center) > .butActionRefused:last-child, :not(.center) > .butAction:last-child, :not(.center) > .butActionDelete:last-child {
+	margin-<?php echo $right; ?>: 0px !important;
 }
 .butActionRefused, .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
 	text-decoration: none;
 	text-transform: uppercase;
 	font-weight: bold;
+	line-height: 1.8em;
 
 	margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.9'); ?>em;
 	padding: 0.6em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.7'); ?>em;
@@ -81,9 +85,8 @@ span.butAction, span.butActionDelete {
 	display: inline-block;
 	text-align: center;
 	cursor: pointer;
-	/* color: #fff; */
-	/* background: rgb(<?php echo $colorbackhmenu1 ?>); */
 	color: #444;
+
 	/* border: 1px solid #aaa; */
 	/* border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); */
 
@@ -230,6 +233,7 @@ span.butActionNewRefused>span.fa, span.butActionNewRefused>span.fa:hover
 	background: var(--butactiondeletebg);
 	/* border: 1px solid #633; */
 	color: #633;
+	/* vertical-align: middle; */
 }
 
 .butActionDelete:hover {
@@ -251,6 +255,7 @@ span.butActionNewRefused>span.fa, span.butActionNewRefused>span.fa:hover
 	text-align: center;
 	cursor: pointer;
 	color: #999 !important;
+
 	border: 1px solid #ccc;
 	box-sizing: border-box;
 	-moz-box-sizing: border-box;
@@ -315,7 +320,7 @@ div.pagination li:first-child a.btnTitle {
 	border: none;
 	font-size: 12px;
 	font-weight: 300;
-	background-color: #fbfbfb;
+	/* background-color: #fbfbfb; */
 }
 
 a.btnTitle.btnTitleSelected {
@@ -351,7 +356,7 @@ a.btnTitle.btnTitleSelected {
 }
 
 .btnTitle:hover .btnTitle-label{
-	color: #ffffff;
+	color:var(--btncolorborderhover);
 }
 div.pagination .btnTitle:hover .btnTitle-label{
 	color: rgb(<?php print $colortextlink; ?>);
@@ -366,6 +371,11 @@ div.pagination .btnTitle:hover .btnTitle-label{
 	display: block;
 }
 
+.paginationafterarrows a.btnTitlePlus, .titre_right a.btnTitlePlus {
+	border: 1px solid var(--colorbackbody);
+}
+
+
 /* rule to reduce top menu - 2nd reduction: Reduce width of top menu icons again */
 @media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2) ? round($nbtopmenuentries * 69, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2; ?>px)	/* reduction 2 */
 {
diff --git a/htdocs/theme/md/ckeditor/config.js b/htdocs/theme/md/ckeditor/config.js
index acd38268f8f..8cd703c957d 100644
--- a/htdocs/theme/md/ckeditor/config.js
+++ b/htdocs/theme/md/ckeditor/config.js
@@ -17,7 +17,7 @@ CKEDITOR.editorConfig = function( config )
 	//config.resize_maxWidth = 3000;
 	//config.height = '300px';
 	//config.resize_dir = 'vertical';	// horizontal, vertical, both
-	config.removePlugins = 'elementspath,save'; // config.removePlugins = 'elementspath,save,font';
+	config.removePlugins = 'elementspath,save'; // this list is modified into DolEditor::Create()
 	//config.extraPlugins = 'docprops,scayt,showprotected';
 	config.removeDialogTabs = 'flash:advanced';	// config.removeDialogTabs = 'flash:advanced;image:Link';
 	config.protectedSource.push( /<\?[\s\S]*?\?>/g );   // Prevent PHP Code to be formatted
@@ -61,7 +61,7 @@ CKEDITOR.editorConfig = function( config )
 	 	['Undo','Redo','-','Find','Replace'],
 	 	['CreateDiv','ShowBlocks'],
 	    ['Format','Font','FontSize'],
-	 	['Bold','Italic','Underline','Strike','Superscript','-','TextColor','RemoveFormat'],
+	 	['Bold','Italic','Underline','Strike','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	 	['Link','Unlink','Anchor','Image','Table','HorizontalRule','SpecialChar'],
@@ -75,7 +75,7 @@ CKEDITOR.editorConfig = function( config )
 	 	['SpellChecker', 'Scayt'],		// 'Cut','Copy','Paste','-', are useless, can be done with right click, even on smarpthone
 	 	['Undo','Redo','-','Find','Replace'],
 	    ['Format','Font','FontSize'],
-	 	['Bold','Italic','Underline','Strike','Superscript','-','TextColor','RemoveFormat'],
+	 	['Bold','Italic','Underline','Strike','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	    ['Link','Unlink','Image','Table','HorizontalRule','SpecialChar'],
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index 2627a727a23..ff7285a2772 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -2,7 +2,6 @@
 if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 } ?>
-
 /* <style type="text/css" > dont remove this line it's an ide hack */
 /*
  * Dropdown of user popup
@@ -10,6 +9,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 
 .bookmark-footer a.top-menu-dropdown-link {
 	white-space: normal;
+	word-break: break-word;
 }
 
 button.dropdown-item.global-search-item {
@@ -35,7 +35,8 @@ div#topmenu-bookmark-dropdown {
 }
 
 #topmenu-bookmark-dropdown .dropdown-menu {
-	width: 300px;
+	min-width: 300px;
+	max-width: 360px;
 }
 
 button.dropdown-item.global-search-item {
@@ -342,7 +343,7 @@ a.top-menu-dropdown-link {
 	display: block !important;
 	box-sizing: border-box;
 	width: 100%;
-	padding: .25rem 1.5rem .25rem 1rem;
+	padding: .3em 1.5em .4em 1em;
 	clear: both;
 	font-weight: 400;
 	color: #212529  !important;
@@ -365,12 +366,18 @@ a.top-menu-dropdown-link {
 	-webkit-font-smoothing: antialiased;
 	text-align:center;
 	text-decoration:none;
-	margin-right: 5px;
+	margin-<?php echo $right; ?>: 5px;
 	display: inline-block;
 	content: "\f0da";
 	color: rgba(0,0,0,0.3);
 }
+.multicompany-item::before {
+	content: none !important;
+}
 
+.dropdown-item.bookmark-item-external::before {
+	content: "\f35d";
+}
 
 .dropdown-item.active, .dropdown-item:hover, .dropdown-item:focus  {
 	color: #<?php echo $colortextbackhmenu; ?> !important;
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index 02f263900c6..1ea21ac44d1 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -198,6 +198,9 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	font-size: 25px;
 	line-height: 92px;
 }
+.opened-dash-board-wrap .info-box .info-box-icon {
+	font-size: 2em;
+}
 .opened-dash-board-wrap .info-box-sm .info-box-icon {
 	line-height: 80px;
 }
@@ -241,8 +244,8 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	cursor: default;
 
 	font-size: 10px;
-	line-height: 22px;
-	padding: 0px 3px;
+	line-height: 1.5em;
+	padding: 4px 3px;
 	text-align: center;
 	opacity: 1;
 	-webkit-transition: opacity 0.5s, visibility 0s 0.5s;
@@ -467,6 +470,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 d234ff15d4a..b8f45808293 100644
--- a/htdocs/theme/md/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/md/main_menu_fa_icons.inc.php
@@ -11,7 +11,7 @@
 	font-variant: normal;
 	text-rendering: auto;
 	line-height: 26px;
-	font-size: 1.5em;
+	font-size: 1.3em;
 	-webkit-font-smoothing: antialiased;
 	text-align:center;
 	text-decoration:none;
diff --git a/htdocs/theme/md/manifest.json.php b/htdocs/theme/md/manifest.json.php
index b249e81e7df..2ad98e7e565 100644
--- a/htdocs/theme/md/manifest.json.php
+++ b/htdocs/theme/md/manifest.json.php
@@ -71,7 +71,7 @@ top_httphead('text/json');
 if (empty($dolibarr_nocache)) {
 	header('Cache-Control: max-age=10800, public, must-revalidate');
 	// For a text/json, we must set an Expires to avoid to have it forced to an expired value by the web server
-	header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + 10800) . ' GMT');
+	header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + 10800).' GMT');
 } else {
 	header('Cache-Control: no-cache');
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 2ce0e07ccfb..cd6f04b43fb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2015		Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2021       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
@@ -85,8 +86,8 @@ if (empty($dolibarr_nocache)) {
 	header('Cache-Control: no-cache');
 }
 
-if (GETPOST('theme', 'alpha')) {
-	$conf->theme = GETPOST('theme', 'alpha'); // If theme was forced on URL
+if (GETPOST('theme', 'aZ09')) {
+	$conf->theme = GETPOST('theme', 'aZ09'); // If theme was forced on URL
 }
 if (GETPOST('lang', 'aZ09')) {
 	$langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL
@@ -118,6 +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;
 
 // Case of option always editable
 if (!isset($conf->global->THEME_ELDY_BACKBODY)) {
@@ -147,6 +149,12 @@ if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) {
 if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
 	$conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
 }
+if (!isset($conf->global->THEME_ELDY_BTNACTION)) {
+	$conf->global->THEME_ELDY_BTNACTION = $butactionbg;
+}
+if (!isset($conf->global->THEME_ELDY_TEXTBTNACTION)) {
+	$conf->global->THEME_ELDY_TEXTBTNACTION = $textbutaction;
+}
 
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
@@ -176,6 +184,8 @@ $colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (emp
 $colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
 $colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
 $colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortext : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
+$butactionbg       	 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
+$textbutaction     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $conf->global->THEME_ELDY_TEXTBTNACTION) : (empty($user->conf->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $user->conf->THEME_ELDY_TEXTBTNACTION);
 $fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
 $fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
 
@@ -210,6 +220,8 @@ if ($tmpval <= 460) {
 	$colortextbackvmenu = '000000';
 }
 
+$colortopbordertitle1 = join(',', colorStringToArray($colortopbordertitle1)); // Normalize value to 'x,y,z'
+
 $colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbacktitle1);
 if ($colortexttitle == '') {
@@ -270,12 +282,13 @@ print 'colorbacklinepair1='.$colorbacklinepair1."\n";
 print 'colorbacklinepair2='.$colorbacklinepair2."\n";
 print 'colorbacklinepairhover='.$colorbacklinepairhover."\n";
 print 'colorbacklinepairchecked='.$colorbacklinepairchecked."\n";
-print '$colortexttitlenotab='.$colortexttitlenotab."\n";
-print '$colortexttitle='.$colortexttitle."\n";
-print '$colortext='.$colortext."\n";
-print '$colortextlink='.$colortextlink."\n";
-print '$colortextbackhmenu='.$colortextbackhmenu."\n";
-print '$colortextbackvmenu='.$colortextbackvmenu."\n";
+print 'colortexttitlenotab='.$colortexttitlenotab."\n";
+print 'colortexttitle='.$colortexttitle."\n";
+print 'colortext='.$colortext."\n";
+print 'colortextlink='.$colortextlink."\n";
+print 'colortexttitlelink='.$colortexttitlelink."\n";
+print 'colortextbackhmenu='.$colortextbackhmenu."\n";
+print 'colortextbackvmenu='.$colortextbackvmenu."\n";
 print 'dol_hide_topmenu='.$dol_hide_topmenu."\n";
 print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n";
 print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n";
@@ -306,12 +319,15 @@ print '*/'."\n";
 	--colorbacklinepairchecked: rgb(<?php print $colorbacklinepairchecked; ?>);
 	--colorbacklinebreak: rgb(<?php print $colorbacklinebreak; ?>);
 	--colorbackbody: rgb(<?php print $colorbackbody; ?>);
+	--colorbackmobilemenu: #f8f8f8;
 	--colortexttitlenotab: rgb(<?php print $colortexttitlenotab; ?>);
 	--colortexttitle: rgb(<?php print $colortexttitle; ?>);
+	--colortexttitlelink: rgba(<?php print $colortexttitlelink; ?>, 0.9);
 	--colortext: rgb(<?php print $colortext; ?>);
 	--colortextlink: rgb(<?php print $colortextlink; ?>);
-	--colortextbackhmenu: #<?php echo $colortextbackhmenu; ?>;
+	--colortextbackhmenu: #<?php print $colortextbackhmenu; ?>;
 	--colortextbackvmenu: #<?php print $colortextbackvmenu; ?>;
+	--colortopbordertitle1: rgb(<?php print $colortopbordertitle1; ?>);
 	--listetotal: #551188;
 	--inputbackgroundcolor: #FFF;
 	--inputbordercolor: rgba(0,0,0,.2);
@@ -328,13 +344,18 @@ print '*/'."\n";
 	--amountremaintopaycolor:#880000;
 	--amountpaymentcomplete:#008800;
 	--amountremaintopaybackcolor:none;
+	--productlinestockod: #002200;
+	--productlinestocktoolow: #884400;
+	--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8);
+	--butactionbg : #<?php print $butactionbg; ?>;
+	--textbutaction : #<?php print $textbutaction; ?>;
 }
 
 body {
 <?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 	background-color: #FFFFFF;
 <?php } else { ?>
-	background: rgb(<?php print $colorbackbody; ?>);
+	background: var(--colorbackbody);
 <?php } ?>
 	color: rgb(<?php echo $colortext; ?>);
 	font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize; ?>;
@@ -407,7 +428,7 @@ select#date_startday, select#date_startmonth, select#date_endday, select#date_en
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
 	font-family: <?php print $fontlist ?>;
 	border: none;
-	border<?php echo empty($conf->global->THEME_HIDE_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px rgba(0,0,0,.2);
+	border<?php echo empty($conf->global->THEME_SHOW_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
 	outline: none;
 	margin: 0px 0px 0px 0px;
 }
@@ -428,16 +449,49 @@ input, select {
 	margin-bottom:1px;
 	margin-top:1px;
 }
+#mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
+	background: var(--butactionbg);
+	color: var(--textbutaction)!important;
+	border-radius: 3px;
+	border-collapse: collapse;
+	border: none;
+	text-shadow: none;
+	text-transform: uppercase;
+	font-weight: bold;
+	margin: 0em 0.9em;
+	padding: 0.6em 0.7em;
+	line-height: 17px;
+}
+#mainbody input.button:not(.buttongen):not(.bordertransp):hover, #mainbody a.button:not(.buttongen):not(.bordertransp):hover {
+	-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%);
+}
+
 input.button.massactionconfirmed {
 	margin: 4px;
 }
+input.short {
+	width: 40px;
+}
+
+input:invalid, select:invalid, input.--error , select.--error {
+	border-color: #ea1212;
+}
+
+section.setupsection {
+	padding: 20px;
+	background-color: var(--colorbacktitle1);
+	border-radius: 5px;
+}
+
+.field-error-icon { color: #ea1212; !important; }
 
 textarea {
 	border-radius: 0;
-	border-top:solid 1px rgba(0,0,0,.1);
-	border-left:solid 1px rgba(0,0,0,.1);
-	border-right:solid 1px rgba(0,0,0,.1);
-	border-bottom:solid 1px rgba(0,0,0,.2);
+	border-top:solid 1px var(--inputbordercolor);
+	border-left:solid 1px var(--inputbordercolor);
+	border-right:solid 1px var(--inputbordercolor);
+	border-bottom:solid 1px var(--inputbordercolor);
 
 	background-color: #FFF;
 	padding:4px;
@@ -537,6 +591,10 @@ a.butStatus {
 	margin: 0 0.45em !important;
 }
 
+span.userimg.notfirst {
+	margin-left: -5px;
+}
+
 /* Used by timesheets */
 span.timesheetalreadyrecorded input {
 	border: none;
@@ -559,7 +617,7 @@ td.rightborder {
 	border-right: 1px solid #ccc;
 }
 
-td.amount, span.amount, div.amount {
+td.amount, span.amount, div.amount, b.amount {
 	color: #006666;
 }
 td.actionbuttons a {
@@ -580,7 +638,7 @@ input.pageplusone {
 }
 
 .optionblue {
-	color: rgb(<?php echo $colortextlink; ?>);
+	color: var(--colortextlink);
 }
 .optiongrey, .opacitymedium {
 	opacity: 0.5;
@@ -644,6 +702,10 @@ input:-webkit-autofill {
 	-webkit-box-shadow: 0 0 0 50px #FBFFEA inset;
 }
 
+input[type=checkbox], input[type=radio] {
+	margin: 0 3px 0 3px;
+}
+
 /* CSS for placeholder */
 .placeholder { color: #ccc; }
 ::-webkit-input-placeholder { color:#ccc; }
@@ -653,7 +715,11 @@ input:-webkit-autofill {
 input:-moz-placeholder { color:#ccc; }
 
 input[name=price], input[name=weight], input[name=volume], input[name=surface], input[name=sizeheight], input[name=net_measure], select[name=incoterm_id] { margin-right: 6px; }
-fieldset { border: 1px solid #AAAAAA !important; }
+fieldset {
+	border: 1px solid #AAAAAA !important;
+	padding-inline-start: 2em;
+	padding-inline-end: 2em;
+}
 .legendforfieldsetstep { padding-bottom: 10px; }
 input#onlinepaymenturl, input#directdownloadlink {
 	opacity: 0.7;
@@ -748,6 +814,9 @@ div.floatright
 button:focus {
 	outline: none;
 }
+.line-height-large {
+	line-height: 1.8em;
+}
 
 th .button {
 	-webkit-box-shadow: none !important;
@@ -807,10 +876,10 @@ textarea.centpercent {
 }
 
 .flip {
-	transform: scaleX(-1) translate(2px, 0);
+	transform: scaleX(-1) translate(<?php print ($left == 'left' ? '' : '-'); ?>2px, 0);
 }
 .rotate90 {
-	transform: rotate(90deg) translate(0, 2px);
+	transform: rotate(90deg) translate(0, <?php print ($left == 'left' ? '' : '-'); ?>2px);
 }
 .center {
 	text-align: center;
@@ -819,6 +888,12 @@ textarea.centpercent {
 .alignstart {
 	text-align: start;
 }
+.start {
+	text-align: start;
+}
+.end {
+	text-align: end;
+}
 .left {
 	text-align: <?php print $left; ?>;
 }
@@ -840,6 +915,9 @@ textarea.centpercent {
 .nowraponsmartphone {
 	white-space: <?php print ($dol_optimize_smallscreen ? 'nowrap' : 'normal'); ?>;
 }
+.wraponsmartphone {
+	white-space: <?php print ($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
+}
 .liste_titre .nowrap {
 	white-space: nowrap;
 }
@@ -900,6 +978,19 @@ textarea.centpercent {
 .marginright2 {
 	margin-<?php print $right; ?>: 2px;
 }
+.paddingtop {
+	padding-top: 4px;
+}
+.paddingtop2 {
+	padding-top: 2px;
+}
+.paddingbottom {
+	padding-bottom: 4px;
+}
+.paddingbottom2 {
+	padding-bottom: 2px;
+}
+
 .cursordefault {
 	cursor: default;
 }
@@ -984,7 +1075,10 @@ body[class*="colorblind-"] .text-success{
 	color: #ccc !important;
 }
 .editfielda span.fa-pencil-alt:hover, .editfielda span.fa-trash:hover {
-	color: rgb(<?php echo $colortexttitle; ?>) !important;
+	color: var(--colortexttitle) !important;
+}
+a.editfielda.nohover *:hover:before {
+	color: #ccc !important;
 }
 
 .size15x { font-size: 1.5em !important; }
@@ -994,6 +1088,9 @@ body[class*="colorblind-"] .text-success{
 	font-size: 1.5em; vertical-align: text-bottom;
 }
 
+.fawidth30 {
+	width: 20px;
+}
 .floatnone {
 	float: none !important;
 }
@@ -1024,13 +1121,19 @@ body[class*="colorblind-"] .text-success{
 .divsocialnetwork:not(:last-child) {
 	padding-<?php print $right; ?>: 20px;
 }
+.divfilteralone {
+	background-color: rgba(0, 0, 0, 0.08);
+	border-radius: 5px;
+	padding-left: 5px;
+}
 div.divsearchfield {
-	float: <?php print $left; ?>;
+	/* float: <?php print $left; ?>; */
+	display: inline-block;
 	margin-<?php print $right; ?>: 12px;
 	margin-<?php print $left; ?>: 2px;
 	margin-top: 4px;
 	margin-bottom: 4px;
-	  padding-left: 2px;
+	padding-left: 2px;
 }
 .divsearchfieldfilter {
 	text-overflow: clip;
@@ -1088,6 +1191,10 @@ if ($conf->browser->layout == 'phone') {
 }
 
 
+/* ============================================================================== */
+/* Styles for scan tool                                                           */
+/* ============================================================================== */
+
 div.div-for-modal {
 	/* display: none; */
 	position:absolute;
@@ -1101,13 +1208,19 @@ div.div-for-modal {
 	z-index: 100;
 }
 
+#scantoolmessage {
+	height: 3em;
+	border: none;
+	overflow-y: auto;
+}
+
 div.div-for-modal-topright {
 	/* display: none; */
 	position: fixed;
 	top: 0;
 	right: 0;
 	width:50%;  /* adjust as per your needs */
-	height:250px;   /* adjust as per your needs */
+	height:300px;   /* adjust as per your needs */
 	background: #fff;
 	border: 1px solid #bbb;
 	box-shadow: 2px 2px 20px #ddd;
@@ -1115,6 +1228,7 @@ div.div-for-modal-topright {
 }
 
 
+
 div.confirmmessage {
 	padding-top: 6px;
 }
@@ -1148,7 +1262,7 @@ select.flat.selectlimit {
 	max-width: 62px;
 }
 .selectlimit, .marginrightonly {
-	margin-right: 10px !important;
+	margin-<?php echo $right; ?>: 10px !important;
 }
 .marginleftonly {
 	margin-<?php echo $left; ?>: 10px !important;
@@ -1197,6 +1311,18 @@ select.flat.selectlimit {
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
+.tdoverflowmax60 {			/* For tdoverflow, the max-midth become a minimum ! */
+	max-width: 60px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.tdoverflowmax80 {			/* For tdoverflow, the max-midth become a minimum ! */
+	max-width: 80px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
 .tdoverflowmax100 {			/* For tdoverflow, the max-midth become a minimum ! */
 	max-width: 100px;
 	overflow: hidden;
@@ -1380,11 +1506,19 @@ table[summary="list_of_modules"] .fa-cog {
 	min-width: 100px;
 }
 
+.linkedcol-date {
+	text-align: center;
+}
+
 .img-skinthumb {
 	width: 160px;
 	height: 100px;
 }
 
+tr.nobottom td {
+	border-bottom: 0px !important;
+}
+
 
 /* ============================================================================== */
 /* Styles to hide objects                                                         */
@@ -1412,6 +1546,7 @@ table[summary="list_of_modules"] .fa-cog {
 	.minwidth50imp  { min-width: 50px !important; }
 	.minwidth75imp  { min-width: 75px !important; }
 	.minwidth100imp { min-width: 100px !important; }
+	.minwidth125imp { min-width: 125px !important; }
 	.minwidth200imp { min-width: 200px !important; }
 	.minwidth250imp { min-width: 250px !important; }
 	.minwidth300imp { min-width: 300px !important; }
@@ -1471,6 +1606,7 @@ table[summary="list_of_modules"] .fa-cog {
 	.minwidth50imp  { min-width: 50px !important; }
 	.minwidth75imp  { min-width: 75px !important; }
 	.minwidth100imp { min-width: 100px !important; }
+	.minwidth125imp { min-width: 125px !important; }
 	.minwidth150imp { min-width: 150px !important; }
 	.minwidth200imp { min-width: 200px !important; }
 	.minwidth250imp { min-width: 250px !important; }
@@ -1490,6 +1626,7 @@ table[summary="list_of_modules"] .fa-cog {
 	.minwidth50imp  { min-width: 50px !important; }
 	.minwidth75imp  { min-width: 70px !important; }
 	.minwidth100imp { min-width: 100px !important; }
+	.minwidth125imp { min-width: 125px !important; }
 	.minwidth150imp { min-width: 110px !important; }
 	.minwidth200imp { min-width: 110px !important; }
 	.minwidth250imp { min-width: 115px !important; }
@@ -1499,11 +1636,11 @@ table[summary="list_of_modules"] .fa-cog {
 }
 
 /* Set a width. Note: add also a max-width, for example maxwidth500, that will be used in priority */
-.widthcentpercentminusx {
+select.widthcentpercentminusx, span.widthcentpercentminusx:not(.select2-selection), input.widthcentpercentminusx {
 	width: calc(100% - 50px) !important;
 	display: inline-block;
 }
-.widthcentpercentminusxx {
+select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-selection), input.widthcentpercentminusxx {
 	width: calc(100% - 70px) !important;
 	display: inline-block;
 }
@@ -1608,6 +1745,13 @@ table[summary="list_of_modules"] .fa-cog {
 		width: 95%;
 	}
 
+	div.tabs div.tab a.tab  {
+		max-width: 200px;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
 	select {
 		padding-top: 4px;
 		padding-bottom: 5px;
@@ -1636,6 +1780,7 @@ table[summary="list_of_modules"] .fa-cog {
 	.minwidth50imp  { min-width: 50px !important; }
 	.minwidth75imp  { min-width: 75px !important; }
 	.minwidth100imp { min-width: 100px !important; }
+	.minwidth125imp { min-width: 125px !important; }
 	.minwidth150imp { min-width: 110px !important; }
 	.minwidth200imp { min-width: 110px !important; }
 	.minwidth250imp { min-width: 115px !important; }
@@ -1672,6 +1817,7 @@ table[summary="list_of_modules"] .fa-cog {
 
 	div.statusref {
 		padding-right: 10px;
+		max-width: 55%;
 	   }
 	div.statusref img {
 		padding-right: 3px !important;
@@ -1686,7 +1832,7 @@ table[summary="list_of_modules"] .fa-cog {
 }
 .linkobject { cursor: pointer; }
 
-table.tableforfield tr>td:first-of-type, tr.trforfield>td:first-of-type, div.tableforfield div.tagtr>div.tagtd:first-of-type {
+table.tableforfield tr:not(.liste_titre)>td:first-of-type, tr.trforfield:not(.liste_titre)>td:first-of-type, div.tableforfield div.tagtr:not(.liste_titre)>div.tagtd:first-of-type {
 	color: #666;
 }
 
@@ -1738,9 +1884,9 @@ td.showDragHandle {
 }
 #id-right {	/* This must stay id-right and not be replaced with echo $right */
 	width: 100%;
-	padding-bottom: 10px;
+	padding-bottom: 20px;
 <?php if (GETPOST('optioncss', 'aZ09') != 'print') { ?>
-	padding-left: 229px;
+	padding-<?php print $left; ?>: 229px;
 	padding-top: 16px;
 <?php } ?>
 }
@@ -1765,14 +1911,14 @@ td.showDragHandle {
 <?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
 	display: none;
 <?php } else { ?>
-	background: rgb(<?php echo $colorbackvmenu1; ?>);
-	border-right: 1px solid rgba(0,0,0,0.2);
+	background: var(--colorbackvmenu1);
+	border-<?php echo $right; ?>: 1px solid rgba(0,0,0,0.2);
 	box-shadow: 3px 0 6px -2px #eee;
 	bottom: 0;
 	color: #333;
 	display: block;
 	font-family: "RobotoDraft","Roboto",sans-serif;
-	left: 0;
+	<?php echo $left; ?>: 0;
 	<?php
 	if (in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 	} else { ?>
@@ -1826,12 +1972,13 @@ td.showDragHandle {
 }
 
 body.sidebar-collapse .side-nav-vert, body.sidebar-collapse #id-right {
-	margin-left: 0;padding-left:0
+	margin-left: 0;
+	padding-left:0
 }
 
 
 .side-nav-vert {
-	margin-left: 228px;
+	margin-<?php echo $left; ?>: 228px;
 }
 
 /* body.sidebar-collapse .side-nav, body.sidebar-collapse .login_block_other, body.sidebar-collapse #topmenu-login-dropdown */
@@ -1856,10 +2003,6 @@ body.sidebar-collapse .side-nav, body.sidebar-collapse .login_block
 .side-nav-vert {
 	margin-left: 0;
 }
-div.login_block {
-	/* border-right: none ! important; */
-	top: inherit !important;
-}
 
 .side-nav {
 	<?php
@@ -1885,10 +2028,6 @@ div.backgroundsemitransparent {
 
 /* Login */
 
-div.login_block {
-	/* position: initial !important;*/
-	/*display: none;*/
-}
 .login_block_getinfo {
 	text-align: center;
 }
@@ -1905,16 +2044,16 @@ div.login_block {
 
 
 #id-right {
-	padding-left: 0 ! important;
+	padding-<?php print $left; ?>: 0 ! important;
 }
 #id-left {
 	z-index: 91;
-	background: rgb(<?php echo $colorbackvmenu1; ?>);
+	background: var(--colorbackvmenu1);
 	border-right: 1px solid rgba(0,0,0,0.3);
 	padding-top: 20px;
 	<?php
 	if (in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
-	top: 50px ! important;
+	top: 66px ! important;
 	<?php } else { ?>
 	top: 60px ! important;
 	<?php } ?>
@@ -1951,7 +2090,7 @@ div.fichethirdleft {
 		print "float: ".$left.";\n";
 	} ?>
 	<?php if ($conf->browser->layout != 'phone') {
-		print "width: 50%;\n";
+		print "width: calc(50% - 14px);\n";
 	} ?>
 	<?php if ($conf->browser->layout == 'phone') {
 		print "padding-bottom: 6px;\n";
@@ -1962,21 +2101,18 @@ div.fichetwothirdright {
 		print "float: ".$right.";\n";
 	} ?>
 	<?php if ($conf->browser->layout != 'phone') {
-		print "width: 50%;\n";
+		print "width: calc(50% - 14px);\n";
 	} ?>
 	<?php if ($conf->browser->layout == 'phone') {
 		print "padding-bottom: 6px\n";
 	} ?>
 }
-div.fichetwothirdright div.ficheaddleft {
-	padding-left: 20px;
-}
 div.fichehalfleft {
 	<?php if ($conf->browser->layout != 'phone') {
 		print "float: ".$left.";\n";
 	} ?>
 	<?php if ($conf->browser->layout != 'phone') {
-		print "width: calc(50% - 10px);\n";
+		print "width: calc(50% - 14px);\n";
 	} ?>
 }
 div.fichehalfright {
@@ -1984,7 +2120,7 @@ div.fichehalfright {
 		print "float: ".$right.";\n";
 	} ?>
 	<?php if ($conf->browser->layout != 'phone') {
-		print "width: calc(50% - 10px);\n";
+		print "width: calc(50% - 14px);\n";
 	} ?>
 }
 div.fichehalfright {
@@ -2028,9 +2164,6 @@ div.secondcolumn div.box {
 		width: auto;
 		padding-bottom: 6px;
 	}
-	div.fichetwothirdright div.ficheaddleft {
-		padding-left: 0;
-	}
 	div.fichehalfleft {
 		float: none;
 		width: auto;
@@ -2114,7 +2247,7 @@ img.hideonsmartphone.pictoactionview {
 }
 
 .pictofixedwidth {
-	text-align: left;
+	text-align: <?php echo $left; ?>;
 	width: 20px;
 	padding-right: 0;
 }
@@ -2147,7 +2280,7 @@ div.arearefnobottom {
 div.heightref {
 	min-height: 80px;
 }
-div.divphotoref {
+div.divphotoref:last-child {
 	padding-<?php echo $right; ?>: 20px;
 }
 div.paginationref {
@@ -2204,11 +2337,11 @@ img.photorefnoborder {
 .underrefbanner {
 }
 .underbanner {
-	border-bottom: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
+	border-bottom: <?php echo $borderwidth ?>px solid var(--colortopbordertitle1);
 }
 
 .trextrafieldseparator td, .trextrafields_collapse_last td {
-	border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>) !important;
+	border-bottom: 1px solid var(--colortopbordertitle1) !important;
 }
 .tdhrthin {
 	margin: 0;
@@ -2239,13 +2372,12 @@ div#tmenu_tooltip {
 <?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
-	background: rgb(<?php echo $colorbackhmenu1 ?>);
+	background: var(--colorbackhmenu1);
 	/*
 	background-image: linear-gradient(to top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
 	background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
 	background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
 	background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
-	background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
 	background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(128,128,128,.3)) );
 	*/
 <?php } ?>
@@ -2259,6 +2391,19 @@ div#tmenu_tooltip {
 <?php } ?>
 }
 
+li.tmenusel::after, li.tmenu:hover::after {
+	content: "";
+	position: absolute;
+	bottom: 0px;
+	left: 50%;
+	left: calc(50% - 6px);
+	width: 0;
+	height: 0;
+	border-style: solid;
+	border-width: 0px 6px 5px 6px;
+	border-color: transparent transparent #ffffff transparent;
+}
+
 div.tmenusep {
 <?php if ($disableimages) { ?>
 	display: none;
@@ -2322,13 +2467,12 @@ ul.tmenu {	/* t r b l */
 	padding-left: 5px;
 }
 ul.tmenu li {
-	background: rgb(<?php echo $colorbackhmenu1 ?>);
+	background: var(--colorbackhmenu1);
 	/*
 	background-image: linear-gradient(to top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
 	background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
 	background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
 	background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
-	background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
 	background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) );
 	*/
 }
@@ -2353,9 +2497,7 @@ li.tmenu, li.tmenusel {
 li.tmenu:hover {
 	opacity: .50; /* show only a slight shadow */
 }
-li.tmenusel a.tmenusel {
-	text-decoration: underline !important;
-}
+
 .tmenuend .tmenuleft { width: 0px; }
 .tmenuend { display: none; }
 
@@ -2384,7 +2526,7 @@ div.tmenucenter
 	width: 100%;
 }
 div.menu_titre {
-	padding-bottom: 2px;
+	padding-bottom: 5px;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
@@ -2608,7 +2750,7 @@ a.tmenuimage:focus {
 }
 form#login {
 	padding-bottom: 30px;
-	font-size: 14px;
+	font-size: 1.2em;
 	vertical-align: middle;
 }
 .login_table_title {
@@ -2642,7 +2784,7 @@ form#login {
 	border: none;
 	/* border-bottom: solid 1px rgba(180,180,180,.4); */
 	padding: 5px;
-	margin-left: 18px;
+	margin-left: 5px;
 	margin-top: 5px;
 	margin-bottom: 5px;
 }
@@ -2716,11 +2858,10 @@ table.login_table_securitycode tr td {
 }
 
 div.login_block {
-	/* border-right: 1px solid rgba(0,0,0,0.3); */
+	top: 0;
 	padding-top: 3px;
 	padding-bottom: 3px;
 	<?php print $left; ?>: 0;
-	top: 0px;
 <?php if (in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
 	position: absolute;
 <?php } else { ?>
@@ -2729,7 +2870,7 @@ div.login_block {
 	z-index: 10;
 	text-align: center;
 	vertical-align: middle;
-	background: rgb(<?php echo $colorbackvmenu1; ?>);
+	background: var(--colorbackvmenu1);
 	width: 228px;
 	height: 70px;
 	<?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
@@ -2810,9 +2951,9 @@ img.login, img.printer, img.entity {
 	font-weight: bold;
 }
 .userimg.atoplogin img.userphoto, .userimgatoplogin img.userphoto {		/* size for user photo in login bar */
-	border-radius: 8px;
-	width: 16px;
-	height: 16px;
+	/* border-radius: 8px; */
+	width: 20px;
+	height: 20px;
 	background-size: contain;
 	vertical-align: text-bottom;
 	background-color: #FFF;
@@ -2853,7 +2994,7 @@ form[name="addtime"] img.userphoto {
 div.vmenu, td.vmenu {
 	margin-<?php print $right; ?>: 2px;
 	position: relative;
-	float: left;
+	float: <?php print $left; ?>;
 	padding: 0px;
 	padding-bottom: 0px;
 	padding-top: 0px;
@@ -2861,7 +3002,7 @@ div.vmenu, td.vmenu {
 }
 
 .vmenu {
-	margin-left: 4px;
+	margin-<?php print $left; ?>: 4px;
 	<?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
 	display: none;
 	<?php } ?>
@@ -2882,26 +3023,46 @@ div.vmenu, td.vmenu {
 .searchform { padding-top: 10px; }
 .searchform .bordertransp { border: 0; }
 
-a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active, span.vmenu, span.vsmenu { white-space: nowrap; font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; }
-font.vmenudisabled  { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; white-space: nowrap; }
-a.vmenu:link, a.vmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; }
+a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active, span.vmenu, span.vsmenu {
+	white-space: nowrap; font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold;
+}
+span.vmenudisabled, font.vmenudisabled  { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; white-space: nowrap; }
+a.vmenu:link, a.vmenu:visited {
+	color: var(--colortextbackvmenu);
+}
 
 a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; }
-font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; }
-a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; }
-font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
+span.vsmenudisabled:not(.spanlilevel0), font.vsmenudisabled:not(.spanlilevel0) {
+	font-size:<?php print $fontsize ?>px;
+}
+span.vsmenudisabled, font.vsmenudisabled {
+	font-family: <?php print $fontlist ?>;
+	text-align: <?php print $left; ?>;
+	font-weight: normal;
+	color: #aaa;
+}
+a.vsmenu:link, a.vsmenu:visited {
+	color: var(--colortextbackvmenu);
+	white-space: nowrap;
+}
+span.vsmenudisabledmargin, font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
 
-a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { text-align: <?php print $left; ?>; font-weight: normal; color: #999; text-decoration: none; }
+a.help:link, a.help:visited, a.help:hover, a.help:active, span.help {
+	text-align: <?php print $left; ?>; font-weight: normal; color: #999; text-decoration: none;
+}
 
 .helppresentcircle {
+	/*
 	color: var(--colorbackhmenu1);
 	filter: invert(0.5);
-	margin-left: -7px;
+	*/
+	color: var(--colortextbackhmenu);
+	margin-left: -4px;
 	display: inline-block;
-	margin-top: -10px;
 	font-size: x-small;
 	vertical-align: super;
 	opacity: 0.95;
+	transform: rotate(<?php echo ($left == 'left' ? '55deg' : '305deg'); ?>);
 }
 
 div.blockvmenulogo
@@ -2909,11 +3070,11 @@ div.blockvmenulogo
 	border-bottom: 0 !important;
 }
 .menulogocontainer {
-	margin: <?php echo $disableimages ? '0' : '6'; ?>px;
+	margin: <?php echo $disableimages ? '-1' : '6'; ?>px;
 	margin-left: 12px;
 	margin-right: 6px;
 	padding: 0;
-	height: <?php echo $disableimages ? '20' : '32'; ?>px;
+	height: <?php echo $disableimages ? '18' : '32'; ?>px;
 	/* width: 100px; */
 	max-width: 100px;
 	vertical-align: middle;
@@ -3104,19 +3265,19 @@ div.tabsElem a {
 }
 div.tabBar {
 	color: #<?php echo $colortextbacktab; ?>;
-	padding-top: 21px;
+	padding-top: 23px;
 	padding-left: 24px;
 	padding-right: 24px;
-	padding-bottom: 18px;
+	padding-bottom: 23px;
 	margin: 0px 0px 18px 0px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;
-	border-right: 1px solid #BBB;
-	border-left: 1px solid #BBB;
+	border-right: 1px solid #CCC;
+	border-left: 1px solid #CCC;
 	border-top: 1px solid #CCC;
+	border-bottom: 1px solid #CCC;
 	width: auto;
-	background: rgb(<?php echo $colorbacktabcard1; ?>);
-	border-bottom: 1px solid #aaa;
+	background: var(--colorbacktabcard1);
 }
 
 div.tabBar tr.titre td {
@@ -3208,8 +3369,8 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 }
 
 .tabactive, a.tab#active {
-	color: #<?php echo $colortextbacktab; ?> !important;
-	background: rgb(<?php echo $colorbacktabcard1; ?>) !important;
+	color: var(--colortextbacktab) !important;
+	background: var(--colorbacktabcard1) !important;
 
 	border-right: 1px solid #AAA !important;
 	border-left: 1px solid #AAA !important;
@@ -3225,8 +3386,8 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 a.tab:hover
 {
 	/*
-	background: rgba(<?php echo $colorbacktabcard1; ?>, 0.5)  url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png', 1); ?>) 50% 0 repeat-x;
-	color: #<?php echo $colortextbacktab; ?>;
+	background: var(--colorbacktabcard1) url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png', 1); ?>) 50% 0 repeat-x;
+	color: var(--colortextbacktab);
 	*/
 	text-decoration: underline;
 }
@@ -3304,18 +3465,16 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
 .smallpaddingimp {
 	padding: 4px !important;
 }
-.nopaddingleft {
-	padding-<?php print $left; ?>: 0px;
-}
-.nopaddingright {
-	padding-<?php print $right; ?>: 0px;
-}
-.nopaddingtopimp {
-	padding-top: 0px !important;
-}
-.nopaddingbottomimp {
-	padding-bottom: 0px !important;
+input.buttonreset {
+	margin-top: 3px;
+	margin-bottom: 3px;
+	padding: 8px 15px;
+	text-decoration: underline;
+	color: var(--colortextlink);
+	background-color: transparent;
+	cursor: pointer;
 }
+
 .notopnoleft {
 	border-collapse: collapse;
 	border: 0px;
@@ -3357,7 +3516,7 @@ tr.liste_titre.box_titre td table td, .bordernooddeven tr td {
 }
 
 table.border td, table.bordernooddeven td, div.border div div.tagtd {
-	padding: 2px 4px 2px 4px;
+	padding: 4px 4px 4px 4px;
 	border: 1px solid #f0f0f0;
 	border-collapse: collapse;
 }
@@ -3377,6 +3536,33 @@ td.border, div.tagtable div div.border {
 	width:auto;
 }
 
+<?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"] {
+	position: sticky;
+	left: 0;
+	top: 0;
+	max-width: 150px !important;
+	//background-color: inherit;
+	background-color: gainsboro;
+	z-index: 2;
+}
+<?php } ?>
+
+<?php if (!empty($conf->global->THEME_ENABLE_STICKY_COLUMN_ACTION)) { ?>
+/* To have right column sticky */
+.tagtable td.actioncolumn, .tagtable th.actioncolumn {
+	position: sticky;
+	right: 0;
+	top: 0;
+	max-width: 150px !important;
+	//background-color: inherit;
+	background-color: gainsboro;
+	z-index: 2;
+}
+<?php } ?>
+
+
 
 /* Main boxes */
 .nobordertop, .nobordertop tr:first-of-type td {
@@ -3386,10 +3572,10 @@ td.border, div.tagtable div div.border {
 	border-bottom: none !important;
 }
 .bordertop {
-	border-top: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
+	border-top: 1px solid var(--colortopbordertitle1);
 }
 .borderbottom {
-	border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
+	border-bottom: 1px solid var(--colortopbordertitle1);
 }
 
 .fichehalfright table.noborder {
@@ -3397,7 +3583,7 @@ td.border, div.tagtable div div.border {
 }
 div.colorback
 {
-	background: rgb(<?php echo $colorbacktitle1; ?>);
+	background: var(--colorbacktitle1);
 	padding: 10px;
 	margin-top: 5px;
 }
@@ -3406,13 +3592,13 @@ div.colorback
 	border-left: 1px solid #ccc;
 }
 table.liste, table.noborder, table.formdoc, div.noborder {
-	width: calc(100% - 1px);	/* -1 to fix a bug. Without, a scroll appears due to overflow-x: auto; of div-table-responsive */
+	width: calc(100% - 2px);	/* -2 to fix a bug. Without, a scroll appears due to overflow-x: auto; of div-table-responsive */
 
 	border-collapse: separate !important;
 	border-spacing: 0px;
 
 	border-top-width: <?php echo $borderwidth ?>px;
-	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
+	border-top-color: var(--colortopbordertitle1);
 	border-top-style: solid;
 
 	border-bottom-width: 1px;
@@ -3422,7 +3608,7 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	border-right: 1px solid #ccc;
 	border-left: 1px solid #ccc;
 
-	margin: 0px 0px 8px 0px;
+	margin: 0px 0px 20px 0px;
 
 	-webkit-border-radius: 0.1em;
 	border-radius: 0.1em;
@@ -3445,7 +3631,7 @@ table.paddingtopbottomonly tr td {
 }
 
 .liste_titre_filter {
-	background: rgb(<?php echo $colorbacktitle1; ?>) !important;
+	background: var(--colorbacktitle1) !important;
 }
 tr.liste_titre_filter td.liste_titre {
 	padding-top: 4px;
@@ -3454,27 +3640,29 @@ tr.liste_titre_filter td.liste_titre {
 .liste_titre_create td, .liste_titre_create th, .liste_titre_create .tagtd
 {
 	border-top-width: 1px;
-	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
+	border-top-color: var(--colortopbordertitle1);
 	border-top-style: solid;
 }
 .liste_titre_add td, .liste_titre_add th, .liste_titre_add .tagtd
 {
 	border-top-width: 2px;
-	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
+	border-top-color: var(--colortopbordertitle1);
 	border-top-style: solid;
 }
 .liste_titre_add td, .liste_titre_add .tagtd
 {
 	border-top-width: 1px;
-	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
+	border-top-color: var(--colortopbordertitle1);
 	border-top-style: solid;
 }
 
 table.liste th, table.noborder th, table.noborder tr.liste_titre td {
 	padding: 8px 6px 8px 6px;			/* t r b l */
 }
-table.noborder td, div.noborder form, div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td {
+
+table.liste td, table.noborder td, div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td {
 	padding: 4px 6px 4px 6px;			/* t r b l */
+	height: 22px;
 }
 form.tagtable {
 	padding: unset !important;
@@ -3534,15 +3722,18 @@ div.refidpadding  {
 }
 div.refid  {
 	font-weight: bold;
-	color: rgb(<?php print $colortexttitlenotab; ?>);
-	  font-size: 160%;
+	color: rgb(--colortexttitlenotab);
+	font-size: 160%;
+}
+a.refid {
+	color: var(--colortexttitlenotab) !important;
 }
 div.refidno  {
 	padding-top: 8px;
 	font-weight: normal;
-	  color: #444;
-	  font-size: <?php print $fontsize ?>px;
-	  line-height: 21px;
+	color: #444;
+	font-size: <?php print $fontsize ?>px;
+	line-height: 21px;
 }
 div.refidno form {
 	display: inline-block;
@@ -3627,7 +3818,7 @@ div.pagination li .active span:focus {
   z-index: 2;
   color: #fff;
   cursor: default;
-  background-color: rgb(<?php echo $colorbackhmenu1 ?>);
+  background-color: var(--colorbackhmenu1);
   border-color: #337ab7;
 }
 div.pagination .disabled span,
@@ -3672,11 +3863,10 @@ table.hidepaginationnext .paginationnext {
 
 /* Prepare to remove class pair - impair
 .noborder > tbody > tr:nth-child(even) td {
-	background: linear-gradient(to bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	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%);
 	font-family: <?php print $fontlist ?>;
 	border: 0px;
 	margin-bottom: 1px;
@@ -3685,11 +3875,10 @@ table.hidepaginationnext .paginationnext {
 }
 
 .noborder > tbody > tr:nth-child(odd) td {
-	background: linear-gradient(to bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	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%);
 	font-family: <?php print $fontlist ?>;
 	border: 0px;
 	margin-bottom: 1px;
@@ -3698,11 +3887,7 @@ table.hidepaginationnext .paginationnext {
 */
 
 ul.noborder li:nth-child(odd):not(.liste_titre) {
-	background-color: rgb(<?php echo $colorbacklinepair2; ?>) !important;
-	background-color: rgb(<?php echo $colorbacklinepair2; ?>) !important;
-	background-color: rgb(<?php echo $colorbacklinepair2; ?>) !important;
-	background-color: rgb(<?php echo $colorbacklinepair2; ?>) !important;
-	background-color: rgb(<?php echo $colorbacklinepair2; ?>) !important;
+	background-color: var(--colorbacklinepair2) !important;
 }
 
 
@@ -3827,14 +4012,14 @@ div.liste_titre {
 }
 div.liste_titre_bydiv {
 	border-top-width: <?php echo $borderwidth ?>px;
-	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
+	border-top-color: var(--colortopbordertitle1);
 	border-top-style: solid;
 
-	box-shadow: none;
 	border-collapse: collapse;
 	display: table;
 	padding: 2px 0px 2px 0;
-	width: calc(100% - 1px);
+	box-shadow: none;
+	width: calc(100% - 2px);	/* -3px because the width for table class="tagtable" under this is cal(100% - 2px) so it is aligned. */
 }
 tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr, tagtr.liste_titre
 {
@@ -3842,11 +4027,11 @@ tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, tabl
 }
 div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_sel, .tagtr.liste_titre, .tagtr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr
 {
-	background: rgb(<?php echo $colorbacktitle1; ?>);
+	background: var(--colorbacktitle1);
 	font-weight: <?php echo $useboldtitle ? 'bold' : 'normal'; ?>;
 	/* border-bottom: 1px solid #FDFFFF; */
 
-	color: rgb(<?php echo $colortexttitle; ?>);
+	color: var(--colortexttitle);
 	font-family: <?php print $fontlist ?>;
 	text-align: <?php echo $left; ?>;
 }
@@ -3867,25 +4052,25 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste
 }
 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;
-	color: rgb(<?php echo $colortexttitlelink ?>);
+	color: var(--colortexttitlelink);
 }
 tr.liste_titre_topborder td {
 	border-top-width: <?php echo $borderwidth; ?>px;
-	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
+	border-top-color: var(--colortopbordertitle1);
 	border-top-style: solid;
 }
 .liste_titre td a {
 	text-shadow: none !important;
-	color: rgb(<?php echo $colortexttitle; ?>);
+	color: var(--colortexttitle);
 }
 .liste_titre td a.notasortlink {
-	color: rgb(<?php echo $colortextlink; ?>);
+	color: var(--colortextlink);
 }
 .liste_titre td a.notasortlink:hover {
 	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 rgb(<?php echo $colortopbordertitle1 ?>);
+	border-bottom: 1px solid var(--colortopbordertitle1);
 }
 
 div.liste_titre {
@@ -3916,7 +4101,6 @@ input.liste_titre {
 	white-space: normal;
 }
 
-
 tr.liste_sub_total, tr.liste_sub_total td {
 	border-bottom: 2px solid #aaa;
 }
@@ -3933,7 +4117,7 @@ tr.liste_sub_total, tr.liste_sub_total td {
 }
 .paymenttable, .margintable:not(.margintablenotop) {
 	border-top-width: <?php echo $borderwidth ?>px !important;
-	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>) !important;
+	border-top-color: var(--colortopbordertitle1) !important;
 	border-top-style: solid !important;
 }
 .margintable.margintablenotop {
@@ -3983,14 +4167,13 @@ div .tdtop {
 /* Prepare to remove class pair - impair */
 
 .noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre),
-div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft) > .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):not(.ficheaddleft) .oddeven.tagtr:nth-of-type(even):not(.liste_titre)
+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, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	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%);
 }
 .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)
@@ -3999,14 +4182,13 @@ div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft
 }
 
 .noborder > tbody > tr:nth-child(odd):not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(.liste_titre),
-div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft) > .border > tbody > tr:nth-of-type(odd):not(.liste_titre), .liste > tbody > tr:nth-of-type(odd):not(.liste_titre),
-div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft) .oddeven.tagtr:nth-of-type(odd):not(.liste_titre)
+div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright) > .border > tbody > tr:nth-of-type(odd):not(.liste_titre), .liste > tbody > tr:nth-of-type(odd):not(.liste_titre),
+div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright) .oddeven.tagtr:nth-of-type(odd):not(.liste_titre)
 {
-	background: linear-gradient(to bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: linear-gradient(to bottom, var(--colorbacklinepair1) 0%, var(--colorbacklinepair2) 100%);
+	background: -o-linear-gradient(bottom, var(--colorbacklinepair1) 0%, var(--colorbacklinepair2) 100%);
+	background: -moz-linear-gradient(bottom, var(--colorbacklinepair1) 0%, var(--colorbacklinepair2) 100%);
+	background: -webkit-linear-gradient(bottom, var(--colorbacklinepair1) 0%, var(--colorbacklinepair2) 100%);
 }
 .noborder > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre),
 .noborder .tagtr:nth-child(odd):not(:last-child) .oddeven.tagtd:not(.liste_titre)
@@ -4015,7 +4197,7 @@ div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft
 }
 
 ul.noborder li:nth-child(even):not(.liste_titre) {
-	background-color: rgb(<?php echo $colorbacklinepair2; ?>) !important;
+	background-color: var(--colorbacklinepair2) !important;
 }
 
 
@@ -4030,9 +4212,6 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 	padding-left: 0px;
 	padding-bottom: 12px;
 }
-.ficheaddleft div.boxstats, .ficheaddright div.boxstats {
-	border: none;
-}
 .boxstatsborder {
 	/* border: 1px solid #CCC !important; */
 }
@@ -4143,11 +4322,7 @@ span.dashboardlineko {
 	border-radius: .25em;
 }
 .boxtable {
-	margin-bottom: 8px !important;
-	border-bottom-width: 1px;
-}
-.boxtable {
-	margin-bottom: 8px !important;
+	margin-bottom: 20px !important;
 	border-bottom-width: 1px;
 }
 .boxtablenotop {
@@ -4319,12 +4494,14 @@ div.boximport {
 
 .fieldrequired { font-weight: bold; color: #000055; }
 
-.widthpictotitle { width: 40px; font-size: 1.4em; text-align: <?php echo $left; ?>; }
+td.widthpictotitle, .table-fiche-title img.widthpictotitle { width: 32px; font-size: 1.4em; text-align: <?php echo $left; ?>; }
 table.titlemodulehelp tr td img.widthpictotitle { width: 80px; }
 
 .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; }
 .dolgraphtitlecssboxes { /* margin: 0px; */ }
-.dolgraphchart canvas { width: calc(100% - 20px) !important; }
+.dolgraphchart canvas {
+	/* width: calc(100% - 20px) !important; */
+}
 .legendColorBox, .legendLabel { border: none !important; }
 div.dolgraph div.legend, div.dolgraph div.legend div { background-color: rgba(255,255,255,0) !important; }
 div.dolgraph div.legend table tbody tr { height: auto; }
@@ -4342,10 +4519,10 @@ label.radioprivate {
 	border: 0px;
 }
 .photowithmargin {
-	margin-bottom: 2px;
-	margin-top: 2px;
+/*	margin-bottom: 2px;
+	margin-top: 2px; */
 }
-div.divphotoref > a > .photowithmargin {		/* Margin right for photo not inside a div.photoref frame only */
+div.divphotoref > img.photowithmargin, div.divphotoref > a > .photowithmargin {		/* Margin right for photo not inside a div.photoref frame only */
 	margin-right: 15px;
 }
 .photowithborder {
@@ -4416,7 +4593,15 @@ div.backgreypublicpayment { background-color: #f0f0f0; padding: 20px; border-bot
 span.buttonpaymentsmall {
 	text-shadow: none;
 }
-#dolpaymenttable { min-width: 320px; font-size: 16px; }	/* Width must have min to make stripe input area visible. Lower than 320 makes input area crazy for credit card that need zip code */
+
+#dolpublictable {
+	min-width: 300px; font-size: 16px;
+	padding: 6px;
+}
+#dolpaymenttable {
+	min-width: 320px; font-size: 16px;
+}	/* 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 { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; }
 #tablepublicpayment .CTableRow1  { background-color: #F0F0F0 !important; }
 #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }
@@ -4492,6 +4677,11 @@ div#card-errors {
 	z-index: 1002 !important;		/* Default 101 with jquery, top menu have a z-index of 1000 */
 }
 
+div#dialogforpopup {
+	background-color: #f8f8f8 !important;
+}
+
+
 /* ============================================================================== */
 /* For content of image preview                                                   */
 /* ============================================================================== */
@@ -4553,6 +4743,25 @@ div.ui-tooltip.mytooltip {
 	/*background: var(--tooltipbgcolor) !important;
 	color : var(--tooltipfontcolor);*/
 	line-height: 1.6em;
+	min-width: 550px;
+}
+@media only screen and (max-width: 768px)
+{
+	div.ui-tooltip.mytooltip {
+		max-width: 400px;
+	}
+}
+@media only screen and (max-width: 480px)
+{
+	div.ui-tooltip.mytooltip {
+		max-width: 300px;
+	}
+}
+@media only screen and (max-width: 320px)
+{
+	div.ui-tooltip.mytooltip {
+		max-width: 230px;
+	}
 }
 
 
@@ -4666,7 +4875,7 @@ div.visible {
 	display: block;
 }
 
-div.hidden, td.hidden, img.hidden, span.hidden, div.showifmore {
+div.hidden, header.hidden, td.hidden, img.hidden, span.hidden, div.showifmore {
 	display: none;
 }
 
@@ -4683,6 +4892,11 @@ tr.visible {
 /*  Module website                                                                */
 /* ============================================================================== */
 
+.websiteformtoolbar {
+	position: sticky;
+	top: <?php echo empty($dol_hide_topmenu) ? ($disableimages ? '36px' : '50px') : '0'; ?>;
+}
+
 .exampleapachesetup {
 	overflow-y: auto;
 	max-height: 100px;
@@ -4712,7 +4926,10 @@ span[phptag] {
 	border-bottom: 1px solid #ccc;
 	background: #eee;
 	display: inline-block;
-	padding: 4px 0 4px 0;
+	padding: 5px 5px 5px 5px;
+}
+.centpercent.websitebar {
+	width: calc(100% - 10px);
 }
 .websitebar .buttonDelete, .websitebar .button {
 	text-shadow: none;
@@ -4729,7 +4946,7 @@ span[phptag] {
 }
 .websiteselection {
 	/* display: inline-block; */
-	padding-left: 10px;
+	padding-<?php echo $right; ?>: 10px;
 	vertical-align: middle;
 }
 .websitetools {
@@ -5447,6 +5664,8 @@ div#ecm-layout-center {
 }
 .jnotify-container .jnotify-notification .jnotify-message {
 	font-weight: normal;
+	text-align: start;
+	word-break: break-word;
 }
 .jnotify-container .jnotify-notification-warning .jnotify-close, .jnotify-container .jnotify-notification-warning .jnotify-message {
 	color: #a28918 !important;
@@ -5582,6 +5801,10 @@ input.select2-input {
 	color: #FFF !important;
 }
 
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+	border: 1px solid #e4e4e4;
+}
+
 .blockvmenusearch .select2-container--default .select2-selection--single,
 .blockvmenubookmarks .select2-container--default .select2-selection--single
 {
@@ -5733,6 +5956,7 @@ a span.select2-chosen
 }
 .select2-results__option {
 	word-break: break-word;
+	text-align: <?php echo $left; ?>;
 }
 .select2-container.select2-container-disabled .select2-choice, .select2-container-multi.select2-container-disabled .select2-choices {
 	background-color: #FFFFFF;
@@ -5787,7 +6011,7 @@ span#select2-boxbookmark-container, span#select2-boxcombo-container {
 
 /* To emulate select 2 style */
 .select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
-  padding: 2px 5px 1px 5px;
+  padding: 3px 5px 2px 5px;
   margin: 0 0 2px 3px;
   position: relative;
   line-height: 13px;
@@ -5837,6 +6061,7 @@ span#select2-boxbookmark-container, span#select2-boxcombo-container {
 	box-shadow: none;
 	-webkit-box-shadow: none !important;
 	box-shadow: none !important;
+	margin-bottom: 0 !important;
 }
 span.noborderoncategories a, li.noborderoncategories a {
 	line-height: normal;
@@ -5928,6 +6153,9 @@ span.noborderoncategories {
 	float: left;
 	padding-left: 5px
 }
+label.multi-select-menuitem {
+	line-height: 24px;
+}
 
 
 /* ============================================================================== */
@@ -6538,7 +6766,6 @@ border-top-right-radius: 6px;
   background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(230,230,230,0.4) 100%);
   background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(230,230,230,0.4) 100%);
   background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(230,230,230,0.4) 100%);
-  background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(230,230,230,0.4) 100%);
   background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(230,230,230,0.4) 100%);
 }
 .cd-timeline-content:after {
@@ -6694,7 +6921,7 @@ div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
 /* For copy-paste feature                                                         */
 /* ============================================================================== */
 
-span.clipboardCPValueToPrint {
+span.clipboardCPValueToPrint, div.clipboardCPValueToPrint {
 	display: inline-block;
 }
 span.clipboardCPValue.hidewithsize {
@@ -6703,11 +6930,64 @@ span.clipboardCPValue.hidewithsize {
 	color: transparent;
 	white-space: nowrap;
 }
+div.clipboardCPValue.hidewithsize {
+	width: 0 !important;
+	display: none;
+	color: transparent;
+	white-space: nowrap;
+}
 
 .clipboardCPShowOnHover .clipboardCPButton {
 	display: none;
 }
 
+/* To make a div popup, we must use a position aboluste inside a position relative */
+
+.clipboardCPText {
+	position: relative;
+}
+.clipboardCPTextDivInside {
+	position: absolute;
+	background: #EEE;
+	color: 888;
+	border: 1px solid #DDD;
+	opacity: 1;
+	z-index: 20;
+	padding: 2px;
+	padding-left: 4px;
+	padding-right: 4px;
+	top: -5px;
+	left: 0px;
+	border-radius: 5px;
+	white-space: nowrap;
+	font-size: 0.95em;
+	box-shadow: 1px 1px 6px #ddd;
+}
+
+
+/* ============================================================================== */
+/* CSS style used for hrm skill/rank (may be we can remove this)                  */
+/* ============================================================================== */
+
+.radio_js_bloc_number {
+	display:inline-block;
+	padding:5px 7px;
+	min-width:20px;
+	border-radius:3px;
+	border:1px solid #ccc;
+	background:#eee;
+	color:#555;
+	cursor:pointer;
+	margin:2px;
+	text-align:center;
+}
+.radio_js_bloc_number.selected {
+	transition:0.2s ease background;
+	background:#888;
+	color:#fff;
+	border-color:#555;
+}
+
 
 /* ============================================================================== */
 /* CSS style used for small screen                                                */
@@ -6810,6 +7090,11 @@ span.clipboardCPValue.hidewithsize {
 /* rule to reduce top menu - 3rd reduction */
 @media only screen and (max-width: 570px)
 {
+	div.login_block {
+		border-right: 1px solid rgba(0,0,0,0.3);
+		top: auto;
+	}
+
 	div#tmenu_tooltip {
 	<?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 		display:none;
@@ -6872,6 +7157,27 @@ span.clipboardCPValue.hidewithsize {
 	input#addedfile {
 		width: 95%;
 	}
+
+	#divbodywebsite {
+		word-break: break-all;
+	}
+
+	.websiteselectionsection {
+		border-left: unset;
+		border-right: unset;
+		padding-left: 5px;
+	}
+
+	.a-mesure, .a-mesure-disabled {
+		display: block;
+		margin-bottom: 6px;
+		padding-left: 12px;
+		padding-right: 12px;
+	}
+
+	.a-mesure, .a-mesure-disabled {
+		text-align: center;
+	}
 }
 
 
@@ -6905,6 +7211,11 @@ if (is_object($db)) {
 }​
 
 div#topmenu-bookmark-dropdown {
-position: fixed;
-right: 20px;
+	position: fixed;
+	right: 20px;
+}
+
+/* Must be at end */
+div.flot-text .flot-tick-label .tickLabel, .fa-color-unset {
+	color: unset;
 }
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index fd37b6376dd..5f26d0d83bd 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021       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
@@ -52,8 +53,8 @@ $colorbacktabcard1 = '255,255,255'; // card
 $colorbacktabactive = '234,234,234';
 $colorbacklineimpair1 = '255,255,255'; // line impair
 $colorbacklineimpair2 = '255,255,255'; // line impair
-$colorbacklinepair1 = '248,248,248'; // line pair
-$colorbacklinepair2 = '246,246,246'; // line pair
+$colorbacklinepair1 = '251,251,251'; // line pair
+$colorbacklinepair2 = '248,248,248'; // line pair
 $colorbacklinepairhover = '230,237,244'; // line hover
 $colorbacklinepairchecked = '230,237,244'; // line checked
 $colorbacklinebreak = '250,246,251';
@@ -68,6 +69,8 @@ $fontsizesmaller = '11';
 $topMenuFontSize = '1.1em';
 $toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
 $toolTipFontColor = '#333';
+$butactionbg = '150, 110, 162, 0.95';
+$textbutaction = '255, 255, 255, 255';
 
 // text color
 $textSuccess   = '#28a745';
@@ -79,10 +82,10 @@ $colorblind_deuteranopes_textWarning = $textWarning; // currently not tested wit
 // Badges colors
 $badgePrimary   = '#007bff';
 $badgeSecondary = '#999999';
+$badgeInfo      = '#17a2b8';
 $badgeSuccess   = '#28a745';
 $badgeWarning   = '#a37c0d'; // See $textWarning
 $badgeDanger    = '#8c4446'; // See $textDanger
-$badgeInfo      = '#17a2b8';
 $badgeDark      = '#343a40';
 $badgeLight     = '#f8f9fa';
 
@@ -96,11 +99,13 @@ $colorblind_deuteranopes_badgeDanger    = $badgeDanger; // currently not tested
 *  So this badges status uses default value according to theme eldy status img
 *  TODO: use color definition vars above for define badges color status X -> exemple $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
 */
-$badgeStatus0 = '#cbd3d3';
-$badgeStatus1 = '#bc9526';
-$badgeStatus2 = '#e6f0f0';
+$badgeStatus0 = '#cbd3d3'; // draft
+$badgeStatus1 = '#bc9526'; // validated
+$badgeStatus1b = '#bc9526'; // validated
+$badgeStatus2 = '#e6f0f0'; // approved
 $badgeStatus3 = '#bca52b';
-$badgeStatus4 = '#277d1e';
+$badgeStatus4 = '#25a580'; // Color ok
+$badgeStatus4b = '#25a580'; // Color ok
 $badgeStatus5 = '#cad2d2';
 $badgeStatus6 = '#cad2d2';
 $badgeStatus7 = '#277d1e';
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index fee91e959aa..9a4af31014a 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -80,7 +80,6 @@ if (!$action) {
 
 // Security check
 $id = GETPOST("id", 'int');
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $id, '');
 
@@ -174,7 +173,7 @@ if (!empty($object->origin_email)) {
 if (!empty($conf->societe->enabled)) {
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
 	/*if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
-		$morehtmlref.='<a class="editfielda" href="' . $url_page_current . '?action=editcustomer&amp;track_id=' . $object->track_id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
+		$morehtmlref.='<a class="editfielda" href="' . $url_page_current . '?action=editcustomer&token='.newToken().'&track_id=' . $object->track_id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
 	}*/
 	$morehtmlref .= ' : ';
 	if ($action == 'editcustomer') {
@@ -190,7 +189,7 @@ if (!empty($conf->projet->enabled)) {
 	$morehtmlref .= '<br>'.$langs->trans('Project');
 	if ($user->rights->ticket->write) {
 		if ($action != 'classify') {
-			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 			$morehtmlref .= ' : ';
 		}
 		if ($action == 'classify') {
@@ -217,7 +216,7 @@ if (!empty($conf->projet->enabled)) {
 
 $morehtmlref .= '</div>';
 
-$linkback = '<a href="'.dol_buildpath('/ticket/list.php', 1).'"><strong>'.$langs->trans("BackToList").'</strong></a> ';
+$linkback = '<a href="'.DOL_URL_ROOT.'/ticket/list.php"><strong>'.$langs->trans("BackToList").'</strong></a> ';
 
 dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
@@ -249,7 +248,7 @@ if (!empty($object->id)) {
 
 	// Show link to add event (if read and not closed)
 	$btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
-	$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"]);
+	$url = DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.date('YmdHi').'&origin=ticket&originid='.$object->id.'&projectid='.$object->fk_project.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id);
 	$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', $url, 'add-new-ticket-even-button', $btnstatus);
 
 	print_barre_liste($langs->trans("ActionsOnTicket"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
old mode 100644
new mode 100755
index ab2c2794e38..f1d33f4eeb0
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/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)) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
@@ -114,7 +115,6 @@ if ($id || $track_id || $ref) {
 $url_page_current = DOL_URL_ROOT.'/ticket/card.php';
 
 // Security check - Protection if external user
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id);
 
@@ -144,17 +144,31 @@ if (empty($reshook)) {
 		$search_agenda_label = '';
 	}
 
+	$backurlforlist = DOL_URL_ROOT.'/ticket/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.'/ticket/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
 	if ($cancel) {
-		if (!empty($backtopage)) {
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
-
 		$action = 'view';
 	}
 
 	// Action to add an action (not a message)
-	if (GETPOST('add', 'alpha') && !empty($user->rights->ticket->write)) {
+	if (GETPOST('save', 'alpha') && !empty($user->rights->ticket->write)) {
 		$error = 0;
 
 		if (!GETPOST("subject", 'alphanohtml')) {
@@ -188,6 +202,11 @@ if (empty($reshook)) {
 			$object->email_from = $user->email;
 			$notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
 			$object->notify_tiers_at_create = empty($notifyTiers) ? 0 : 1;
+			$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->fk_project = $projectid;
 
@@ -203,6 +222,10 @@ if (empty($reshook)) {
 				$contactid = GETPOST('contactid', 'int');
 				$type_contact = GETPOST("type", 'alpha');
 
+				// Category association
+				$categories = GETPOST('categories', 'array');
+				$object->setCategories($categories);
+
 				if ($contactid > 0 && $type_contact) {
 					$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 					$result = $object->add_contact($contactid, $typeid, 'external');
@@ -219,6 +242,13 @@ if (empty($reshook)) {
 					$object->setProject($projectid);
 				}
 
+				// Auto mark as read if created from backend
+				if (!empty($conf->global->TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND) && $user->rights->ticket->write) {
+					if ( ! $object->markAsRead($user) > 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				}
+
 				// Auto assign user
 				if (!empty($conf->global->TICKET_AUTO_ASSIGN_USER_CREATE)) {
 					$result = $object->assignUser($user, $user->id, 1);
@@ -273,9 +303,13 @@ if (empty($reshook)) {
 				$db->commit();
 
 				if (!empty($backtopage)) {
-					$url = $backtopage;
+					if (empty($id)) {
+						$url = $backtopage;
+					} else {
+						$url = 'card.php?track_id='.urlencode($object->track_id);
+					}
 				} else {
-					$url = 'card.php?track_id='.$object->track_id;
+					$url = 'card.php?track_id='.urlencode($object->track_id);
 				}
 
 				header("Location: ".$url);
@@ -319,7 +353,11 @@ if (empty($reshook)) {
 			$object->severity_code = GETPOST('severity_code', 'alpha');
 
 			$ret = $object->update($user);
-			if ($ret <= 0) {
+			if ($ret > 0) {
+				// Category association
+				$categories = GETPOST('categories', 'array');
+				$object->setCategories($categories);
+			} else {
 				$error++;
 			}
 
@@ -335,9 +373,13 @@ if (empty($reshook)) {
 			$action = 'edit';
 		} else {
 			if (!empty($backtopage)) {
-				$url = $backtopage;
+				if (empty($id)) {
+					$url = $backtopage;
+				} else {
+					$url = 'card.php?track_id='.urlencode($object->track_id);
+				}
 			} else {
-				$url = 'card.php?track_id='.$object->track_id;
+				$url = 'card.php?track_id='.urlencode($object->track_id);
 			}
 
 			header('Location: '.$url);
@@ -402,7 +444,7 @@ if (empty($reshook)) {
 		if (!$error) {
 			// Log action in ticket logs table
 			$object->fetch_user($usertoassign);
-			$log_action = $langs->trans('TicketLogAssignedTo', $object->user->getFullName($langs));
+			//$log_action = $langs->trans('TicketLogAssignedTo', $object->user->getFullName($langs));
 
 			setEventMessages($langs->trans('TicketAssigned'), null, 'mesgs');
 
@@ -420,9 +462,13 @@ if (empty($reshook)) {
 
 		if ($ret > 0) {
 			if (!empty($backtopage)) {
-				$url = $backtopage;
+				if (empty($id)) {
+					$url = $backtopage;
+				} else {
+					$url = 'card.php?track_id='.urlencode($object->track_id);
+				}
 			} else {
-				$url = 'card.php?action=view&track_id='.$object->track_id;
+				$url = 'card.php?action=view&track_id='.urlencode($object->track_id);
 			}
 
 			header("Location: ".$url);
@@ -453,7 +499,7 @@ if (empty($reshook)) {
 			$object->close($user);
 
 			// Log action in ticket logs table
-			$log_action = $langs->trans('TicketLogClosedBy', $_SESSION['email_customer']);
+			//$log_action = $langs->trans('TicketLogClosedBy', $_SESSION['email_customer']);
 
 			setEventMessages('<div class="confirm">'.$langs->trans('TicketMarkedAsClosed').'</div>', null, 'mesgs');
 
@@ -499,6 +545,16 @@ if (empty($reshook)) {
 		}
 	}
 
+	if ($action == 'set_categories' && $user->rights->ticket->write) {
+		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
+			$result = $object->setCategories(GETPOST('categories', 'array'));
+
+			$url = 'card.php?action=view&track_id='.$object->track_id;
+			header("Location: ".$url);
+			exit();
+		}
+	}
+
 	if ($action == 'setsubject' && $user->rights->ticket->write) {
 		if ($object->fetch(GETPOST('id', 'int'))) {
 			if ($action == 'setsubject') {
@@ -529,7 +585,7 @@ if (empty($reshook)) {
 				$res = $object->setStatut(Ticket::STATUS_ASSIGNED);
 				if ($res) {
 					// Log action in ticket logs table
-					$log_action = $langs->trans('TicketLogReopen');
+					//$log_action = $langs->trans('TicketLogReopen');
 
 					$url = 'card.php?action=view&track_id='.$object->track_id;
 					header("Location: ".$url);
@@ -566,11 +622,11 @@ if (empty($reshook)) {
 			$object->message = $fieldtomodify;
 			$ret = $object->update($user);
 			if ($ret > 0) {
-				$log_action = $langs->trans('TicketInitialMessageModified')." \n";
+				//$log_action = $langs->trans('TicketInitialMessageModified')." \n";
 				// include the Diff class
-				dol_include_once('/core/class/utils_diff.class.php');
+				include_once DOL_DOCUMENT_ROOT.'/core/class/utils_diff.class.php';
 				// output the result of comparing two files as plain text
-				$log_action .= Diff::toString(Diff::compare(strip_tags($oldvalue_message), strip_tags($object->message)));
+				//$log_action .= Diff::toString(Diff::compare(strip_tags($oldvalue_message), strip_tags($object->message)));
 
 				setEventMessages($langs->trans('TicketMessageSuccesfullyUpdated'), null, 'mesgs');
 			} else {
@@ -634,7 +690,7 @@ if (empty($reshook)) {
 
 		$ret = $object->update($user);
 		if ($ret > 0) {
-			$log_action = $langs->trans('TicketLogPropertyChanged', $oldvalue_label, $newvalue_label);
+			//$log_action = $langs->trans('TicketLogPropertyChanged', $oldvalue_label, $newvalue_label);
 
 			setEventMessages($langs->trans('TicketUpdated'), null, 'mesgs');
 		} else {
@@ -692,7 +748,7 @@ if ($action == 'create' || $action == 'presend') {
 	$formticket->withfromsocid = $socid ? $socid : $user->socid;
 	$formticket->withfromcontactid = $contactid ? $contactid : '';
 	$formticket->withtitletopic = 1;
-	$formticket->withnotifytiersatcreate = ($notifyTiers ? 1 : 0);
+	$formticket->withnotifytiersatcreate = ($notifyTiers ? 1 : (empty($conf->global->TICKET_CHECK_NOTIFY_THIRDPARTY_AT_CREATION) ? 0 : 1));
 	$formticket->withusercreate = 0;
 	$formticket->withref = 1;
 	$formticket->fk_user_create = $user->id;
@@ -700,6 +756,8 @@ if ($action == 'create' || $action == 'presend') {
 	$formticket->withextrafields = 1;
 	$formticket->param = array('origin' => GETPOST('origin'), 'originid' => GETPOST('originid'));
 
+	$formticket->withcancel = 1;
+
 	$formticket->showForm(1, 'create', 0);
 	/*} elseif ($action == 'edit' && $user->rights->ticket->write && $object->fk_statut < Ticket::STATUS_CLOSED) {
 	$formticket = new FormTicket($db);
@@ -749,14 +807,10 @@ if ($action == 'create' || $action == 'presend') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" name="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 $form->buttonsSaveCancel();
 
 	print '</form>'; */
-} elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'dellink' || $action == 'presend' || $action == 'presend_addmessage' || $action == 'close' || $action == 'abandon' || $action == 'delete' || $action == 'editcustomer' || $action == 'progression' || $action == 'reopen'
+} elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'dellink' || $action == 'presend' || $action == 'presend_addmessage' || $action == 'close' || $action == 'abandon' || $action == 'delete' || $action == 'editcustomer' || $action == 'progression' || $action == 'categories' || $action == 'reopen'
 	|| $action == 'editsubject' || $action == 'edit_extras' || $action == 'update_extras' || $action == 'edit_extrafields' || $action == 'set_extrafields' || $action == 'classify' || $action == 'sel_contract' || $action == 'edit_message_init' || $action == 'set_status' || $action == 'dellink') {
 	if ($res > 0) {
 		// or for unauthorized internals users
@@ -806,6 +860,7 @@ if ($action == 'create' || $action == 'presend') {
 				//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
 				$head = project_prepare_head($projectstat);
+
 				print dol_get_fiche_head($head, 'ticket', $langs->trans("Project"), 0, ($projectstat->public ? 'projectpub' : 'project'));
 
 				/*
@@ -818,7 +873,7 @@ if ($action == 'create' || $action == 'presend') {
 				// Ref
 				print '<tr><td width="30%">'.$langs->trans('Ref').'</td><td colspan="3">';
 				// Define a complementary filter for search of next/prev ref.
-				if (!$user->rights->projet->all->lire) {
+				if (empty($user->rights->projet->all->lire)) {
 					$objectsListId = $projectstat->getProjectsAuthorizedForUser($user, $mine, 0);
 					$projectstat->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 				}
@@ -854,7 +909,7 @@ if ($action == 'create' || $action == 'presend') {
 
 				print "</table>";
 
-				print '</div>';
+				print dol_get_fiche_end();
 			} else {
 				print "ErrorRecordNotFound";
 			}
@@ -900,7 +955,7 @@ if ($action == 'create' || $action == 'presend') {
 		if (!empty($conf->societe->enabled)) {
 			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' ';
 			if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
-				$morehtmlref .= '<a class="editfielda" href="'.$url_page_current.'?action=editcustomer&track_id='.$object->track_id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 0).'</a> : ';
+				$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') {
 				$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, 'editcustomer', '', 1, 0, 0, array(), 1);
@@ -915,7 +970,7 @@ if ($action == 'create' || $action == 'presend') {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->ticket->write) {
 				if ($action != 'classify') {
-					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a>';
+					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a>';
 				}
 				$morehtmlref .= ' : ';
 				if ($action == 'classify') {
@@ -1000,11 +1055,11 @@ if ($action == 'create' || $action == 'presend') {
 		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) {
-			print '<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></td>';
+			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 '</tr></table>';
+		print '</td></tr></table>';
 		print '</td><td>';
-		if ($object->fk_user_assign > 0) {
+		if (GETPOST('set', 'alpha') != "assign_ticket" && $object->fk_user_assign > 0) {
 			$userstat->fetch($object->fk_user_assign);
 			print $userstat->getNomUrl(-1);
 		}
@@ -1015,30 +1070,30 @@ if ($action == 'create' || $action == 'presend') {
 			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 '<label for="fk_user_assign">'.$langs->trans("AssignUser").'</label> ';
 			print $form->select_dolusers($user->id, 'fk_user_assign', 1);
-			print ' <input class="button" type="submit" name="btn_assign_user" value="'.$langs->trans("Validate").'" />';
+			print ' <input type="submit" class="button small" name="btn_assign_user" value="'.$langs->trans("Validate").'" />';
 			print '</form>';
 		}
 		print '</td></tr>';
 
 		// Progression
 		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
+		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) {
 			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>';
-		print '</td><td colspan="5">';
+		print '</td><td>';
 		if ($user->rights->ticket->write && $action == 'progression') {
 			print '<form action="'.$url_page_current.'" method="post">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="track_id" value="'.$track_id.'">';
 			print '<input type="hidden" name="action" value="set_progression">';
-			print '<input type="text" class="flat" size="20" name="progress" value="'.$object->progress.'">';
-			print ' <input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+			print '<input type="text" class="flat width75" name="progress" value="'.$object->progress.'">';
+			print ' <input type="submit" class="button button-edit small" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
 			print($object->progress > 0 ? $object->progress : '0').'%';
@@ -1047,24 +1102,25 @@ if ($action == 'create' || $action == 'presend') {
 		print '</tr>';
 
 		// Timing (Duration sum of linked fichinter)
-		if ($conf->ficheinter->enabled) {
+		if (!empty($conf->ficheinter->enabled)) {
 			$object->fetchObjectLinked();
 			$num = count($object->linkedObjects);
 			$timing = 0;
+			$foundinter = 0;
 			if ($num) {
 				foreach ($object->linkedObjects as $objecttype => $objects) {
 					if ($objecttype = "fichinter") {
 						foreach ($objects as $fichinter) {
+							$foundinter++;
 							$timing += $fichinter->duration;
 						}
 					}
 				}
 			}
-			print '<tr><td valign="top">';
-
+			print '<tr><td>';
 			print $form->textwithpicto($langs->trans("TicketDurationAuto"), $langs->trans("TicketDurationAutoInfos"), 1);
 			print '</td><td>';
-			print convertSecondToTime($timing, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
+			print $foundinter ? convertSecondToTime($timing, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY) : '';
 			print '</td></tr>';
 		}
 
@@ -1075,31 +1131,82 @@ if ($action == 'create' || $action == 'presend') {
 
 
 		// Fin colonne gauche et début colonne droite
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		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">';
+		print '<input type="hidden" name="track_id" value="'.$track_id.'">';
+
+		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">';
+
+			print '<tr>';
+			print '<td class="valignmiddle titlefield">';
+			print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
+			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>';
+			}
+			print '</table>';
+			print '</td>';
+
+			if ($user->rights->ticket->write && $action == 'categories') {
+				$cate_arbo = $form->select_all_categories(Categorie::TYPE_TICKET, '', 'parent', 64, 0, 1);
+				if (is_array($cate_arbo)) {
+					// Categories
+					print '<td colspan="3">';
+					print '<form action="'.$url_page_current.'" method="post">';
+					print '<input type="hidden" name="token" value="'.newToken().'">';
+					print '<input type="hidden" name="track_id" value="'.$track_id.'">';
+					print '<input type="hidden" name="action" value="set_categories">';
+
+					$category = new Categorie($db);
+					$cats = $category->containing($object->id, 'ticket');
+					$arrayselected = array();
+					foreach ($cats as $cat) {
+						$arrayselected[] = $cat->id;
+					}
+
+					print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+					print '<input type="submit" class="button button-edit small" value="'.$langs->trans('Save').'">';
+					print '</form>';
+					print "</td>";
+				}
+			} else {
+				print '<td colspan="3">';
+				print $form->showCategories($object->id, Categorie::TYPE_TICKET, 1);
+				print "</td></tr>";
+			}
+
+			print '</table>';
+
+			print '</div>';
+		}
 
 
 		// View Original message
 		$actionobject->viewTicketOriginalMessage($user, $action, $object);
 
 		// Classification of ticket
-		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">';
-		print '<input type="hidden" name="track_id" value="'.$track_id.'">';
-
 		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 tableforfield centpercent margintable">';
 		print '<tr class="liste_titre">';
 		print '<td>';
-		print $langs->trans('Properties');
+		print $langs->trans('TicketProperties');
 		print '</td>';
 		print '<td>';
 		if (GETPOST('set', 'alpha') == 'properties' && $user->rights->ticket->write) {
-			print '<input class="button" type="submit" name="btn_update_ticket_prop" value="'.$langs->trans("Modify").'" />';
+			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) {
-				print '<a class="editfielda" href="card.php?track_id='.$object->track_id.'&action=view&set=properties">'.img_edit($langs->trans('Modify')).'</a>';
+				print ' <a class="editfielda" href="card.php?track_id='.$object->track_id.'&action=view&set=properties">'.img_edit($langs->trans('Modify')).'</a>';
 			}
 		}
 		print '</td>';
@@ -1109,7 +1216,7 @@ if ($action == 'create' || $action == 'presend') {
 			print '<tr>';
 			// Type
 			print '<td class="titlefield">';
-			print $langs->trans('TicketChangeType');
+			print $langs->trans('Type');
 			print '</td><td>';
 			$formticket->selectTypesTickets($object->type_code, 'update_value_type', '', 2);
 			print '</td>';
@@ -1117,15 +1224,15 @@ if ($action == 'create' || $action == 'presend') {
 			// Group
 			print '<tr>';
 			print '<td>';
-			print $langs->trans('TicketChangeCategory');
+			print $langs->trans('TicketCategory');
 			print '</td><td>';
-			$formticket->selectGroupTickets($object->category_code, 'update_value_category', '', 2);
+			$formticket->selectGroupTickets($object->category_code, 'update_value_category', '', 2, 0, 0, 0, 'maxwidth500 widthcentpercentminusxx');
 			print '</td>';
 			print '</tr>';
 			// Severity
 			print '<tr>';
 			print '<td>';
-			print $langs->trans('TicketChangeSeverity');
+			print $langs->trans('TicketSeverity');
 			print '</td><td>';
 			$formticket->selectSeveritiesTickets($object->severity_code, 'update_value_severity', '', 2);
 			print '</td>';
@@ -1275,7 +1382,7 @@ if ($action == 'create' || $action == 'presend') {
 			print '</div>';
 		}
 
-		print '</div></div></div>';
+		print '</div></div>';
 		print '<div style="clear:both"></div>';
 
 		print dol_get_fiche_end();
@@ -1302,28 +1409,28 @@ if ($action == 'create' || $action == 'presend') {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('UnableToCreateInterIfNoSocid').'">'.$langs->trans('TicketAddIntervention').'</a></div>';
 				}
 				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&socid='.$object->fk_soc.'&origin=ticket_ticket&originid='.$object->id.'">'.$langs->trans('TicketAddIntervention').'</a></div>';
+					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>';
 				}
 
 				/* This is useless. We can already modify each field individually
 				if ($user->rights->ticket->write && $object->fk_statut < Ticket::STATUS_CLOSED) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?track_id='.$object->track_id.'&action=edit">'.$langs->trans('Modify').'</a></div>';
+					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">'.$langs->trans('CloseTicket').'</a></div>';
+					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>';
 				}
 
 				// 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">'.$langs->trans('AbandonTicket').'</a></div>';
+					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>';
 				}
 
 				// 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">'.$langs->trans('ReOpen').'</a></div>';
+					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>';
 				}
 
 				// Delete ticket
@@ -1372,31 +1479,6 @@ if ($action == 'create' || $action == 'presend') {
 			$morehtmlright = '';
 			$help = "";
 			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
-			if ($object->fk_soc > 0) {
-				$substitutionarray['__THIRDPARTY_NAME__'] = $object->thirdparty->name;
-			}
-			$substitutionarray['__USER_SIGNATURE__'] = $user->signature;
-			$substitutionarray['__TICKET_TRACKID__'] = $object->track_id;
-			$substitutionarray['__TICKET_REF__'] = $object->ref;
-			$substitutionarray['__TICKET_SUBJECT__'] = $object->subject;
-			$substitutionarray['__TICKET_TYPE__'] = $object->type_code;
-			$substitutionarray['__TICKET_SEVERITY__'] = $object->severity_code;
-			$substitutionarray['__TICKET_CATEGORY__'] = $object->category_code; // For backward compatibility
-			$substitutionarray['__TICKET_ANALYTIC_CODE__'] = $object->category_code;
-			$substitutionarray['__TICKET_MESSAGE__'] = $object->message;
-			$substitutionarray['__TICKET_PROGRESSION__'] = $object->progress;
-			if ($object->fk_user_assign > 0) {
-				$userstat->fetch($object->fk_user_assign);
-				$substitutionarray['__TICKET_USER_ASSIGN__'] = dolGetFirstLastname($userstat->firstname, $userstat->lastname);
-			}
-
-			if ($object->fk_user_create > 0) {
-				$userstat->fetch($object->fk_user_create);
-				$substitutionarray['__TICKET_USER_CREATE__'] = dolGetFirstLastname($userstat->firstname, $userstat->lastname);
-			}
-			foreach ($substitutionarray as $key => $val) {
-				$help .= $key.' -> '.$langs->trans($val).'<br>';
-			}
 			$morehtmlright .= $form->textwithpicto('<span class="opacitymedium">'.$langs->trans("TicketMessageSubstitutionReplacedByGenericValues").'</span>', $help, 1, 'helpclickable', '', 0, 3, 'helpsubstitution');
 
 			print '<div>';
@@ -1482,7 +1564,7 @@ if ($action == 'create' || $action == 'presend') {
 			print '</div>';
 
 			if (empty($conf->global->TICKET_SHOW_MESSAGES_ON_CARD)) {
-				print '<div class="fichehalfright"><div class="ficheaddleft">';
+				print '<div class="fichehalfright">';
 
 				$MAXEVENT = 10;
 
@@ -1497,7 +1579,7 @@ if ($action == 'create' || $action == 'presend') {
 				$formactions = new FormActions($db);
 				$somethingshown = $formactions->showactions($object, 'ticket', $socid, 1, 'listactions', $MAXEVENT, '', $morehtmlcenter);
 
-				print '</div></div>';
+				print '</div>';
 			}
 
 			print '</div>';
diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index d7d971b4edc..9a01c5cf7d2 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -40,6 +40,9 @@ class ActionsTicket
 	 */
 	public $db;
 
+	/**
+	 * @var Ticket Ticket
+	 */
 	public $dao;
 
 	public $mesg;
@@ -197,7 +200,7 @@ class ActionsTicket
 		print $langs->trans("InitialMessage");
 		print '</td><td>';
 		if ($user->rights->ticket->manage) {
-			print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=edit_message_init&amp;track_id='.$object->track_id.'">'.img_edit($langs->trans('Modify')).'</a>';
+			print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=edit_message_init&token='.newToken().'&track_id='.$object->track_id.'">'.img_edit($langs->trans('Modify')).'</a>';
 		}
 		print '</td></tr>';
 
@@ -233,7 +236,7 @@ class ActionsTicket
 		}
 		if (!empty($user->rights->ticket->manage) && $action == 'edit_message_init') {
 			print '<div class="center">';
-			print ' <input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+			print ' <input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print ' <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</div>';
 		}
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index f3a9c738aac..75c2db21224 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -274,8 +274,9 @@ class Tickets extends DolibarrApi
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index 4e3e6311354..37142a0d278 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -395,27 +395,27 @@ class CTicketCategory extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$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)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -745,10 +745,10 @@ class CTicketCategory extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule@mymodule");
-			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
-			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled');
-			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled');
-			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled');
+			$this->labelStatus[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatus[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
 		}
 
 		$statusType = 'status'.$status;
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index e03bdabe617..14c1e0719a3 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
 	 */
@@ -252,26 +257,27 @@ class Ticket extends CommonObject
 	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'position'=>1, 'visible'=>-2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id"),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>5, 'notnull'=>1, 'index'=>1),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>''),
+		'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'),
 		'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'),
-		'category_code' => array('type'=>'varchar(32)', 'label'=>'TicketCategory', 'visible'=>-1, 'enabled'=>1, 'position'=>21, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth100'),
+		'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'),
 		'notify_tiers_at_create' => array('type'=>'integer', 'label'=>'NotifyThirdparty', 'visible'=>-1, 'enabled'=>0, 'position'=>51, 'notnull'=>1, 'index'=>1),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php', 'label'=>'Project', 'visible'=>-1, 'enabled'=>1, 'position'=>52, 'notnull'=>-1, 'index'=>1, 'help'=>"LinkToProject"),
-		'timing' => array('type'=>'varchar(20)', 'label'=>'Timing', 'visible'=>-1, 'enabled'=>1, 'position'=>42, 'notnull'=>-1, 'help'=>""),
+		//'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),
 		'date_read' => array('type'=>'datetime', 'label'=>'TicketReadOn', 'visible'=>-1, 'enabled'=>1, 'position'=>501, 'notnull'=>1),
+		'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, 'css'=>'tdoverflowmax125'),
 		'date_close' => array('type'=>'datetime', 'label'=>'TicketCloseOn', 'visible'=>-1, 'enabled'=>1, 'position'=>510, 'notnull'=>1),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-1, 'enabled'=>1, 'position'=>520, 'notnull'=>1),
 		'message' => array('type'=>'text', 'label'=>'Message', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1,),
 		'email_msgid' => array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'help'=>'EmailMsgIDDesc'),
-		'progress' => array('type'=>'varchar(100)', 'label'=>'Progression', 'visible'=>-1, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'css'=>'right', 'help'=>"", 'isameasure'=>1),
+		'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')),
 		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900),
@@ -466,13 +472,13 @@ class Ticket extends CommonObject
 			$sql .= " ".(!isset($this->datec) || dol_strlen($this->datec) == 0 ? 'NULL' : "'".$this->db->idate($this->datec)."'").",";
 			$sql .= " ".(!isset($this->date_read) || dol_strlen($this->date_read) == 0 ? 'NULL' : "'".$this->db->idate($this->date_read)."'").",";
 			$sql .= " ".(!isset($this->date_close) || dol_strlen($this->date_close) == 0 ? 'NULL' : "'".$this->db->idate($this->date_close)."'")."";
-			$sql .= ", ".$conf->entity;
+			$sql .= ", ".((int) $conf->entity);
 			$sql .= ", ".(!isset($this->notify_tiers_at_create) ? '1' : "'".$this->db->escape($this->notify_tiers_at_create)."'");
 			$sql .= ")";
 
 			$this->db->begin();
 
-			dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$error++;
@@ -492,6 +498,13 @@ class Ticket extends CommonObject
 				}
 			}
 
+			if (!$error && ! empty($conf->global->TICKET_ADD_AUTHOR_AS_CONTACT)) {
+				// add creator as contributor
+				if ($this->add_contact($user->id, 'CONTRIBUTOR', 'internal') < 0) {
+					$error++;
+				}
+			}
+
 			//Update extrafield
 			if (!$error) {
 				$result = $this->insertExtraFields();
@@ -561,9 +574,10 @@ 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.code as type_code, type.label as type_label, category.code as category_code, category.label as category_label, severity.code as severity_code, severity.label as severity_label";
+		$sql .= " t.tms,";
+		$sql .= " type.label as type_label, category.label as category_label, 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";
@@ -582,13 +596,14 @@ class Ticket extends CommonObject
 			}
 		}
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
+				$this->entity = $obj->entity;
 				$this->ref = $obj->ref;
 				$this->track_id = $obj->track_id;
 				$this->fk_soc = $obj->fk_soc;
@@ -627,6 +642,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);
@@ -687,12 +703,13 @@ 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";
 		// Add fields for extrafields
 		foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $val) {
-			$sql .= ($extrafields->attributes[$this->table_element]['type'][$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+			$sql .= ($extrafields->attributes[$this->table_element]['type'][$key] != 'separate' ? ",ef.".$key." as options_".$key : '');
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
@@ -704,7 +721,7 @@ class Ticket extends CommonObject
 		if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label'])) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."ticket_extrafields as ef on (t.rowid = ef.fk_object)";
 		}
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 
@@ -714,32 +731,32 @@ class Ticket extends CommonObject
 		if (!empty($filter)) {
 			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) { // To allow $filter['YEAR(s.dated)']=>$year
-					$sql .= ' AND '.$key." = '".$this->db->escape($value)."'";
+					$sql .= " AND ".$key." = '".$this->db->escape($value)."'";
 				} elseif (($key == 't.fk_user_assign') || ($key == 't.type_code') || ($key == 't.category_code') || ($key == 't.severity_code') || ($key == 't.fk_soc')) {
 					$sql .= " AND ".$key." = '".$this->db->escape($value)."'";
 				} elseif ($key == 't.fk_statut') {
 					if (is_array($value) && count($value) > 0) {
-						$sql .= 'AND '.$key.' IN ('.$this->db->sanitize(implode(',', $value)).')';
+						$sql .= " AND ".$key." IN (".$this->db->sanitize(implode(',', $value)).")";
 					} else {
-						$sql .= ' AND '.$key.' = '.((int) $value);
+						$sql .= " AND ".$key.' = '.((int) $value);
 					}
 				} else {
-					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sql .= " AND ".$key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " AND t.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		} elseif ($user->socid) {
 			$sql .= " AND t.fk_soc = ".((int) $user->socid);
 		}
 
-		$sql .= " ORDER BY ".$sortfield.' '.$sortorder;
+		$sql .= $this->db->order($sortfield, $sortorder);
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit + 1, $offset);
+			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
 
-		dol_syslog(get_class($this)."::fetch_all sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
@@ -793,6 +810,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
@@ -915,6 +933,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);
 
@@ -1102,12 +1121,13 @@ class Ticket extends CommonObject
 		$this->status = 0;
 		$this->resolution = '1';
 		$this->progress = '10';
-		$this->timing = '30';
+		//$this->timing = '30';
 		$this->type_code = 'TYPECODE';
 		$this->category_code = 'CATEGORYCODE';
 		$this->severity_code = 'SEVERITYCODE';
 		$this->datec = '';
 		$this->date_read = '';
+		$this->date_last_msg_sent = '';
 		$this->date_close = '';
 		$this->tms = '';
 		return 1;
@@ -1143,7 +1163,7 @@ class Ticket extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_type";
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY pos";
-		dol_syslog(get_class($this)."::load_cache_type_tickets sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::load_cache_type_tickets", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -1166,24 +1186,24 @@ class Ticket extends CommonObject
 	}
 
 	/**
-	 *      Charge dans cache la liste des catégories de tickets (paramétrable dans dictionnaire)
+	 *      Load into a cache array, the list of ticket categories (setup done into dictionary)
 	 *
 	 *      @return int             Number of lines loaded, 0 if already loaded, <0 if KO
 	 */
 	public function loadCacheCategoriesTickets()
 	{
-		global $langs;
+		global $conf, $langs;
 
 		if (!empty($this->cache_category_ticket) && count($this->cache_category_tickets)) {
+			// Cache already loaded
 			return 0;
 		}
-		// Cache deja charge
 
-		$sql = "SELECT rowid, code, label, use_default, pos, description, public, active";
+		$sql = "SELECT rowid, code, label, use_default, pos, description, public, active, force_severity, fk_parent";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category";
-		$sql .= " WHERE active > 0";
+		$sql .= " WHERE active > 0 AND entity = ".((int) $conf->entity);
 		$sql .= " ORDER BY pos";
-		dol_syslog(get_class($this)."::load_cache_categories_tickets sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::load_cache_categories_tickets", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -1191,13 +1211,18 @@ class Ticket extends CommonObject
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$this->cache_category_tickets[$obj->rowid]['code'] = $obj->code;
-				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-				$label = ($langs->trans("TicketCategoryShort".$obj->code) != ("TicketCategoryShort".$obj->code) ? $langs->trans("TicketCategoryShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
-				$this->cache_category_tickets[$obj->rowid]['label'] = $label;
 				$this->cache_category_tickets[$obj->rowid]['use_default'] = $obj->use_default;
 				$this->cache_category_tickets[$obj->rowid]['pos'] = $obj->pos;
 				$this->cache_category_tickets[$obj->rowid]['public'] = $obj->public;
 				$this->cache_category_tickets[$obj->rowid]['active'] = $obj->active;
+				$this->cache_category_tickets[$obj->rowid]['force_severity'] = $obj->force_severity;
+				$this->cache_category_tickets[$obj->rowid]['fk_parent'] = $obj->fk_parent;
+
+				// If  translation exists, we use it to store already translated string.
+				// Warning: You should not use this and recompute the translated string into caller code to get the value into expected language
+				$label = ($langs->trans("TicketCategoryShort".$obj->code) != ("TicketCategoryShort".$obj->code) ? $langs->trans("TicketCategoryShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
+				$this->cache_category_tickets[$obj->rowid]['label'] = $label;
+
 				$i++;
 			}
 			return $num;
@@ -1225,7 +1250,7 @@ class Ticket extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_severity";
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY pos";
-		dol_syslog(get_class($this)."::loadCacheSeveritiesTickets sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::loadCacheSeveritiesTickets", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -1252,12 +1277,12 @@ class Ticket extends CommonObject
 	/**
 	 * Return status label of object
 	 *
-	 * @param      int		$mode     	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
-	 * @return     string    			Label
+	 * @param      	int		$mode     	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 * @return     	string    			Label
 	 */
 	public function getLibStatut($mode = 0)
 	{
-		return $this->libStatut($this->fk_statut, $mode);
+		return $this->libStatut($this->fk_statut, $mode, 0, $this->progress);
 	}
 
 
@@ -1268,9 +1293,10 @@ class Ticket extends CommonObject
 	 *    @param      string 	$status      Id status
 	 *    @param      int		$mode        0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *    @param	  int		$notooltip	 1=No tooltip
+	 *    @param	  int		$progress	 Progression (0 to 100)
 	 *    @return     string     			 Label
 	 */
-	public function LibStatut($status, $mode = 0, $notooltip = 0)
+	public function LibStatut($status, $mode = 0, $notooltip = 0, $progress = 0)
 	{
 		// phpcs:enable
 		global $langs;
@@ -1295,8 +1321,8 @@ class Ticket extends CommonObject
 		} elseif ($status == self::STATUS_CLOSED) {
 			$statusType = 'status6';
 		} else {
-			$labelStatus = $langs->trans('Unknown');
-			$labelStatusShort = $langs->trans('Unknown');
+			$labelStatus = 'Unknown';
+			$labelStatusShort = 'Unknown';
 			$statusType = 'status0';
 			$mode = 0;
 		}
@@ -1306,7 +1332,15 @@ class Ticket extends CommonObject
 			$params = array('tooltip' => 'no');
 		}
 
-		return dolGetStatus($langs->trans($labelStatus), $langs->trans($labelStatusShort), '', $statusType, $mode, '', $params);
+		$labelStatus = $langs->transnoentitiesnoconv($labelStatus);
+		$labelStatusShort = $langs->transnoentitiesnoconv($labelStatusShort);
+
+		if ($status == self::STATUS_IN_PROGRESS && $progress > 0) {
+			$labelStatus .= ' ('.round($progress).'%)';
+			$labelStatusShort .= ' ('.round($progress).'%)';
+		}
+
+		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode, '', $params);
 	}
 
 
@@ -1339,7 +1373,7 @@ class Ticket extends CommonObject
 		$label .= '<b>'.$langs->trans('TicketTrackId').':</b> '.$this->track_id.'<br>';
 		$label .= '<b>'.$langs->trans('Subject').':</b> '.$this->subject;
 
-		$url = dol_buildpath('/ticket/card.php', 1).'?id='.$this->id;
+		$url = DOL_URL_ROOT.'/ticket/card.php?id='.$this->id;
 
 		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
@@ -1400,7 +1434,7 @@ class Ticket extends CommonObject
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."ticket";
 			$sql .= " SET fk_statut = ".Ticket::STATUS_READ.", date_read='".$this->db->idate(dol_now())."'";
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::markAsRead");
 			$resql = $this->db->query($sql);
@@ -1458,7 +1492,7 @@ class Ticket extends CommonObject
 		} else {
 			$sql .= " SET fk_user_assign=null, fk_statut = ".Ticket::STATUS_READ;
 		}
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::assignUser sql=".$sql);
 		$resql = $this->db->query($sql);
@@ -1723,7 +1757,7 @@ class Ticket extends CommonObject
 		$sql .= " AND elementtype = 'ticket'";
 		$sql .= " ORDER BY datec DESC";
 
-		dol_syslog(get_class($this)."::load_cache_actions_ticket sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::load_cache_actions_ticket", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -1942,7 +1976,7 @@ class Ticket extends CommonObject
 		if ($this->id) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."ticket";
 			$sql .= " SET fk_soc = ".($id > 0 ? $id : "null");
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			dol_syslog(get_class($this).'::setCustomer sql='.$sql);
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -1966,7 +2000,7 @@ class Ticket extends CommonObject
 		if ($this->id) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."ticket";
 			$sql .= " SET progress = ".($percent > 0 ? $percent : "null");
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			dol_syslog(get_class($this).'::set_progression sql='.$sql);
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -2130,124 +2164,6 @@ class Ticket extends CommonObject
 		return $array_contact;
 	}
 
-	/**
-	 * Send message
-	 *
-	 *  @param  string $subject	  Subject
-	 *  @param  string $texte      Message to send
-	 *  @return int                <0 if KO, or number of changes if OK
-	 */
-	public function messageSend($subject, $texte)
-	{
-		global $conf, $langs, $mysoc, $dolibarr_main_url_root;
-
-		$langs->load("other");
-
-		dol_syslog(get_class($this)."::message_send action=$action, socid=$socid, texte=$texte, objet_type=$objet_type, objet_id=$objet_id, file=$file");
-
-		$internal_contacts = $this->getIdContact('internal', 'SUPPORTTEC');
-		$external_contacts = $this->getIdContact('external', 'SUPPORTTEC');
-
-		if ($result) {
-			$num = $this->db->num_rows($result);
-			$i = 0;
-			while ($i < $num) { // For each notification couple defined (third party/actioncode)
-				$obj = $this->db->fetch_object($result);
-
-				$sendto = $obj->firstname." ".$obj->lastname." <".$obj->email.">";
-				$actiondefid = $obj->adid;
-
-				if (dol_strlen($sendto)) {
-					include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-					$application = ($conf->global->MAIN_APPLICATION_TITLE ? $conf->global->MAIN_APPLICATION_TITLE : 'Dolibarr ERP/CRM');
-
-					$subject = '['.$application.'] '.$langs->transnoentitiesnoconv("DolibarrNotification");
-
-					$message = $langs->transnoentities("YouReceiveMailBecauseOfNotification", $application, $mysoc->name)."\n";
-					$message .= $langs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";
-					$message .= "\n";
-					$message .= $texte;
-					// Add link
-					$link = '';
-					switch ($objet_type) {
-						case 'ficheinter':
-							$link = '/fichinter/card.php?id='.$objet_id;
-							break;
-						case 'propal':
-							$link = '/comm/propal.php?id='.$objet_id;
-							break;
-						case 'facture':
-							$link = '/compta/facture/card.php?facid='.$objet_id;
-							break;
-						case 'order':
-							$link = '/commande/card.php?facid='.$objet_id;
-							break;
-						case 'order_supplier':
-							$link = '/fourn/commande/card.php?facid='.$objet_id;
-							break;
-					}
-					// 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
-					if ($link) {
-						$message .= "\n".$urlwithroot.$link;
-					}
-
-					$filename = basename($file);
-
-					$mimefile = dol_mimetype($file);
-
-					$msgishtml = 0;
-
-					$replyto = $conf->notification->email_from;
-
-					$message = dol_nl2br($message);
-
-					if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-						$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-						$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
-					}
-					$mailfile = new CMailFile(
-						$subject,
-						$sendto,
-						$replyto,
-						$message,
-						array($file),
-						array($mimefile),
-						array($filename[count($filename) - 1]),
-						'',
-						'',
-						0,
-						$msgishtml
-					);
-
-					if ($mailfile->sendfile()) {
-						$now = dol_now();
-						$sendto = htmlentities($sendto);
-
-						$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_contact, objet_type, objet_id, email)";
-						$sql .= " VALUES ('".$this->db->idate($now)."', ".$actiondefid.", ".$obj->cid.", '".$this->db->escape($objet_type)."', ".$objet_id.", '".$this->db->escape($obj->email)."')";
-						dol_syslog("Notify::send sql=".$sql);
-						if (!$this->db->query($sql)) {
-							dol_print_error($this->db);
-						}
-					} else {
-						$this->error = $mailfile->error;
-						//dol_syslog("Notify::send ".$this->error, LOG_ERR);
-					}
-					if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-						$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
-					}
-				}
-				$i++;
-			}
-			return $i;
-		} else {
-			$this->error = $this->db->error();
-			return -1;
-		}
-	}
 
 	/**
 	 *    Get array of all contacts for a ticket
@@ -2294,7 +2210,7 @@ class Ticket extends CommonObject
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
 		}
 
-		$sql .= " WHERE ec.element_id =".$this->id;
+		$sql .= " WHERE ec.element_id = ".((int) $this->id);
 		$sql .= " AND ec.fk_c_type_contact=tc.rowid";
 		$sql .= " AND tc.element='".$this->db->escape($this->element)."'";
 		if ($source == 'internal') {
@@ -2500,6 +2416,51 @@ class Ticket extends CommonObject
 		return array('listofpaths'=>$listofpaths, 'listofnames'=>$listofnames, 'listofmimes'=>$mimetype);
 	}
 
+	/**
+	 * Sets object to supplied categories.
+	 *
+	 * Deletes object from existing categories not supplied.
+	 * Adds it to non existing supplied categories.
+	 * Existing categories are left untouch.
+	 *
+	 * @param  int[]|int $categories Category or categories IDs
+	 * @return void
+	 */
+	public function setCategories($categories)
+	{
+		// Handle single category
+		if (!is_array($categories)) {
+			$categories = array($categories);
+		}
+
+		// Get current categories
+		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		$c = new Categorie($this->db);
+		$existing = $c->containing($this->id, Categorie::TYPE_TICKET, 'id');
+
+		// Diff
+		if (is_array($existing)) {
+			$to_del = array_diff($existing, $categories);
+			$to_add = array_diff($categories, $existing);
+		} else {
+			$to_del = array(); // Nothing to delete
+			$to_add = $categories;
+		}
+
+		// Process
+		foreach ($to_del as $del) {
+			if ($c->fetch($del) > 0) {
+				$c->del_type($this, Categorie::TYPE_TICKET);
+			}
+		}
+		foreach ($to_add as $add) {
+			if ($c->fetch($add) > 0) {
+				$c->add_type($this, Categorie::TYPE_TICKET);
+			}
+		}
+
+		return;
+	}
 
 	/**
 	 * Add new message on a ticket (private/public area). Can also send it be email if GETPOST('send_email', 'int') is set.
@@ -2795,7 +2756,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);
+									}
 								}
 							}
 						}
@@ -2806,7 +2772,6 @@ class Ticket extends CommonObject
 				if ($object->fk_statut < 3 && !$user->socid) {
 					$object->setStatut(3);
 				}
-
 				return 1;
 			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -2829,7 +2794,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())
 	{
@@ -2837,7 +2802,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");
@@ -2856,6 +2821,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;
@@ -2877,6 +2843,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) {
@@ -2895,6 +2862,7 @@ class Ticket extends CommonObject
 			$langs->load("other");
 			setEventMessages($langs->trans('ErrorMailRecipientIsEmptyForSendTicketMessage'), null, 'warnings');
 		}
+		return $is_sent;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2918,7 +2886,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 && !$user->rights->societe->client->voir && !$user->socid) {
+		if ($conf->societe->enabled && 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";
@@ -2984,7 +2952,7 @@ class Ticket extends CommonObject
 		$sql = "SELECT count(p.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."ticket as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->socid) {
+		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
@@ -3144,6 +3112,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 9f8122b0b9a..2af0b789c3d 100644
--- a/htdocs/ticket/class/ticketstats.class.php
+++ b/htdocs/ticket/class/ticketstats.class.php
@@ -62,14 +62,14 @@ class TicketStats extends Stats
 		$this->field = 'timing';
 
 		$this->where = " fk_statut > 0";
-		$this->where .= " AND entity = ".$conf->entity;
+		$this->where .= " AND entity = ".((int) $conf->entity);
 		if ($this->socid > 0) {
 			$this->where .= " AND fk_soc = ".((int) $this->socid);
 		}
 		if (is_array($this->userid) && count($this->userid) > 0) {
 			$this->where .= ' AND fk_user_create IN ('.$this->db->sanitize(join(',', $this->userid)).')';
 		} elseif ($this->userid > 0) {
-			$this->where .= ' AND fk_user_create = '.$this->userid;
+			$this->where .= " AND fk_user_create = ".((int) $this->userid);
 		}
 	}
 
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index 8d450ffb44b..093aaf5de1e 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -52,7 +52,7 @@ $lineid = GETPOST('lineid', 'int');
 
 
 // Store current page url
-$url_page_current = dol_buildpath('/ticket/contact.php', 1);
+$url_page_current = DOL_URL_ROOT.'/ticket/contact.php';
 
 $object = new Ticket($db);
 
@@ -61,7 +61,6 @@ $permissiontoadd = $user->rights->ticket->write;
 
 // Security check
 $id = GETPOST("id", 'int');
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id, '');
 
@@ -146,7 +145,7 @@ if ($id > 0 || !empty($track_id) || !empty($ref)) {
 			print dol_get_fiche_end();
 		}
 
-		if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
+		if (!$user->socid && !empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) {
 			$object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
 		} elseif ($user->socid > 0) {
 			$object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
@@ -165,7 +164,7 @@ if ($id > 0 || !empty($track_id) || !empty($ref)) {
 			$langs->load("users");
 			$fuser = new User($db);
 			$fuser->fetch($object->fk_user_create);
-			$morehtmlref .= $fuser->getNomUrl(0);
+			$morehtmlref .= $fuser->getNomUrl(-1);
 		}
 		if (!empty($object->origin_email)) {
 			$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
@@ -176,7 +175,7 @@ if ($id > 0 || !empty($track_id) || !empty($ref)) {
 		if (!empty($conf->societe->enabled)) {
 			$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
 			/*if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
-				$morehtmlref.='<a class="editfielda" href="' . $url_page_current . '?action=editcustomer&amp;track_id=' . $object->track_id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
+				$morehtmlref.='<a class="editfielda" href="' . $url_page_current . '?action=editcustomer&token='.newToken().'&track_id=' . $object->track_id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
 			}*/
 			$morehtmlref .= ' : ';
 			if ($action == 'editcustomer') {
@@ -192,7 +191,7 @@ if ($id > 0 || !empty($track_id) || !empty($ref)) {
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->ticket->write) {
 				if ($action != 'classify') {
-					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 					$morehtmlref .= ' : ';
 				}
 				if ($action == 'classify') {
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index d534e8a1123..d0c2d0a4a60 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -45,8 +45,8 @@ $confirm  = GETPOST('confirm', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -70,7 +70,7 @@ if ($result < 0) {
 	$upload_dir = $conf->ticket->dir_output."/".dol_sanitizeFileName($object->ref);
 }
 
-$permissiontoadd = $user->rights->ticket->write;
+$permissiontoadd = $user->rights->ticket->write;	// Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
 
 // Security check - Protection if external user
 $result = restrictedArea($user, 'ticket', $object->id);
@@ -80,7 +80,7 @@ if ($user->socid > 0 && ($object->fk_soc != $user->socid)) {
 	accessforbidden();
 }
 // or for unauthorized internals users
-if (!$user->socid && ($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY && $object->fk_user_assign != $user->id) && !$user->rights->ticket->manage) {
+if (!$user->socid && !empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && $object->fk_user_assign != $user->id && empty($user->rights->ticket->manage)) {
 	accessforbidden();
 }
 
@@ -134,7 +134,7 @@ if ($object->id) {
 		$langs->load("users");
 		$fuser = new User($db);
 		$fuser->fetch($object->fk_user_create);
-		$morehtmlref .= $fuser->getNomUrl(0);
+		$morehtmlref .= $fuser->getNomUrl(-1);
 	}
 	if (!empty($object->origin_email)) {
 		$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
@@ -145,7 +145,7 @@ if ($object->id) {
 	if (!empty($conf->societe->enabled)) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
 		/*if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
-			$morehtmlref.='<a class="editfielda" href="' . $url_page_current . '?action=editcustomer&amp;track_id=' . $object->track_id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
+			$morehtmlref.='<a class="editfielda" href="' . $url_page_current . '?action=editcustomer&token='.newToken().'&track_id=' . $object->track_id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
 		}*/
 		$morehtmlref .= ' : ';
 		if ($action == 'editcustomer') {
@@ -161,7 +161,7 @@ if ($object->id) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->ticket->write) {
 			if ($action != 'classify') {
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index 4b9202f4245..b55c81f72fa 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -50,6 +50,7 @@ $socid = 0;
 if ($user->socid) {
 	$socid = $user->socid;
 }
+$userid = $user->id;
 
 // Security check
 $result = restrictedArea($user, 'ticket', 0, '', '', '', '');
@@ -96,7 +97,7 @@ if (in_array('DOLUSERCOOKIE_ticket_by_status', $autosetarray)) {
 	$endyear = GETPOST($param_year, 'int');
 	$shownb = GETPOST($param_shownb, 'alpha');
 	$showtot = GETPOST($param_showtot, 'alpha');
-} else {
+} elseif (!empty($_COOKIE['DOLUSERCOOKIE_ticket_by_status'])) {
 	$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_ticket_by_status'], true);
 	$endyear = $tmparray['year'];
 	$shownb = $tmparray['shownb'];
@@ -104,6 +105,7 @@ if (in_array('DOLUSERCOOKIE_ticket_by_status', $autosetarray)) {
 }
 if (empty($shownb) && empty($showtot)) {
 	$showtot = 1;
+	$shownb = 0;
 }
 
 $nowarray = dol_getdate(dol_now(), true);
@@ -146,13 +148,13 @@ $tick = array(
 
 $sql = "SELECT t.fk_statut, COUNT(t.fk_statut) as nb";
 $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= ' WHERE t.entity IN ('.getEntity('ticket').')';
 $sql .= dolSqlDateFilter('datec', 0, 0, $endyear);
 
-if (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND t.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 
@@ -222,7 +224,7 @@ if ($result) {
 	dol_print_error($db);
 }
 
-$stringtoshow = '<script type="text/javascript" language="javascript">
+$stringtoshow = '<script type="text/javascript">
     jQuery(document).ready(function() {
         jQuery("#idsubimgDOLUSERCOOKIE_ticket_by_status").click(function() {
             jQuery("#idfilterDOLUSERCOOKIE_ticket_by_status").toggle();
@@ -317,13 +319,13 @@ $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 (!$user->rights->societe->client->voir && !$socid) {
+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 (!$user->rights->societe->client->voir && !$socid) {
+if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND t.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 
@@ -388,8 +390,10 @@ if ($result) {
 
 			// Category
 			print '<td class="nowrap">';
-			$s = $langs->getLabelFromKey($db, 'TicketCategoryShort'.$objp->category_code, 'c_ticket_category', 'code', 'label', $objp->category_code);
-			print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
+			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>";
 
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 6991516ede8..44b9edf358e 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -157,9 +157,11 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 if (!$user->rights->ticket->read) {
 	accessforbidden();
 }
+// restrict view to current user's company
+if ($user->socid > 0) $socid = $user->socid;
 
 // Store current page url
-$url_page_current = dol_buildpath('/ticket/list.php', 1);
+$url_page_current = DOL_URL_ROOT.'/ticket/list.php';
 
 if ($project_ref) {
 	$tmpproject = new Project($db);
@@ -180,7 +182,8 @@ $error = 0;
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -206,8 +209,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();
 		$search_date_start = '';
 		$search_date_end = '';
@@ -329,29 +336,33 @@ $socstatic = new Societe($db);
 
 $help_url = '';
 $title = $langs->trans('TicketList');
+$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
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
-$sql .= $hookmanager->resPrint;
-$sql = preg_replace('/, $/', '', $sql);
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 if (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;
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)";
 $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 if ($socid > 0) {
@@ -383,15 +394,16 @@ foreach ($search as $key => $val) {
 			$sql .= natural_search($key, join(',', $newarrayofstatus), 2);
 		}
 		continue;
-	}
-	if ($key == 'fk_user_assign' || $key == 'fk_user_create' || $key == 'fk_project') {
+	} elseif ($key == 'fk_user_assign' || $key == 'fk_user_create' || $key == 'fk_project') {
 		if ($search[$key] > 0) {
 			$sql .= natural_search($key, $search[$key], 2);
 		}
 		continue;
 	}
-	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-	if ($search[$key] != '') {
+
+	$mode_search = ((!empty($object->fields[$key]) && ($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key]))) ? 1 : 0);
+	// $search[$key] can be an array of values, or a string. We add filter if array not empty or if it is a string.
+	if ((is_array($search[$key]) && !empty($search[$key])) || (!is_array($search[$key]) && $search[$key] != '')) {
 		$sql .= natural_search($key, $search[$key], $mode_search);
 	}
 }
@@ -423,7 +435,6 @@ if ($search_dateclose_end) {
 	$sql .= " AND t.date_close <= '".$db->idate($search_dateclose_end)."'";
 }
 
-
 if (!$user->socid && ($mode == "mine" || (!$user->admin && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY))) {
 	$sql .= " AND (t.fk_user_assign = ".((int) $user->id);
 	if (empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) {
@@ -439,35 +450,37 @@ $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);
+	/* 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) {
-	$num = $nbtotalofrecords;
-} else {
+
+// 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);
 }
 
+$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) {
+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.'/ticket/card.php?id='.$id);
@@ -478,8 +491,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'classforhorizontalscrolloftabs');
-
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
 
 if ($socid && !$projectid && !$project_ref && $user->rights->societe->lire) {
 	$socstat = new Societe($db);
@@ -511,7 +523,7 @@ if ($socid && !$projectid && !$project_ref && $user->rights->societe->lire) {
 			print showValueWithClipboardCPButton(dol_escape_htmltag($socstat->code_client));
 			$tmpcheck = $socstat->check_codeclient();
 			if ($tmpcheck != 0 && $tmpcheck != -5) {
-				print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+				print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
 			}
 			print '</td>';
 			print '</tr>';
@@ -523,7 +535,7 @@ if ($socid && !$projectid && !$project_ref && $user->rights->societe->lire) {
 			print showValueWithClipboardCPButton(dol_escape_htmltag($socstat->code_fournisseur));
 			$tmpcheck = $socstat->check_codefournisseur();
 			if ($tmpcheck != 0 && $tmpcheck != -5) {
-				print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+				print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
 			}
 			print '</td>';
 			print '</tr>';
@@ -561,13 +573,13 @@ if ($projectid > 0 || $project_ref) {
 		// Title
 		$morehtmlref .= $object->title;
 		// Thirdparty
-		if ($object->thirdparty->id > 0) {
+		if (!empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
 			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 		}
 		$morehtmlref .= '</div>';
 
 		// Define a complementary filter for search of next/prev ref.
-		if (!$user->rights->projet->all->lire) {
+		if (empty($user->rights->projet->all->lire)) {
 			$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 			$object->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 		}
@@ -611,9 +623,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]);
 	}
 }
@@ -622,6 +636,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;
 if ($socid > 0) {
 	$param .= '&socid='.urlencode($socid);
 }
@@ -673,13 +691,11 @@ $arrayofmassactions = array(
 	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 );
-if ($user->rights->ticket->write) {
+if ($permissiontoadd) {
 	$arrayofmassactions['close'] = img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Close");
-}
-if ($user->rights->ticket->write) {
 	$arrayofmassactions['reopen'] = img_picto('', 'folder-open', 'class="pictofixedwidth"').$langs->trans("ReOpen");
 }
-if ($user->rights->ticket->delete) {
+if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
@@ -687,7 +703,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.'">';
 }
@@ -761,25 +777,29 @@ $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('che
 
 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-inside">';
-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 == 'fk_statut') {
 		$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'])) {
-		if ($key == 'type_code') {
+		if ($key == 'progress') {
+			print '<td class="liste_titre right'.($cssforfield ? ' '.$cssforfield : '').'">';
+			print '<input type="text" class="flat maxwidth50" name="search_'.$key.'" value="'.dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]).'">';
+			print '</td>';
+		} elseif ($key == 'type_code') {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 			$formTicket->selectTypesTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, ($val['css'] ? $val['css'] : 'maxwidth150'));
 			print '</td>';
@@ -873,33 +893,42 @@ 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 == 'fk_statut' || $key == 'severity_code') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} 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, '', $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
 	}
 }
+$totalarray = array(
+	'nbfield' => 0,
+);
 // 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;
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ')."\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
@@ -912,26 +941,22 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
+
 $cacheofoutputfield = array();
-while ($i < min($num, $limit)) {
+while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
 	}
 
 	// Store properties in $object
-	$object->id = $obj->rowid;
-	foreach ($object->fields as $key => $val) {
-		if (property_exists($obj, $key)) {
-			$object->$key = $obj->$key;
-		}
-	}
-	$langs->load("ticket");
+	$object->setVarsFromFetchObj($obj);
 
 	// Show here line of result
 	print '<tr class="oddeven">';
 	foreach ($object->fields as $key => $val) {
-		$cssforfield = '';
+		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'center';
 		}
@@ -946,15 +971,17 @@ while ($i < min($num, $limit)) {
 		}
 		if (!empty($arrayfields['t.'.$key]['checked'])) {
 			print '<td';
-			if ($cssforfield || $val['css']) {
+			if ($cssforfield || (array_key_exists('css', $val) && $val['css'])) {
 				print ' class="';
 			}
 			print $cssforfield;
-			if ($cssforfield && $val['css']) {
+			if ($cssforfield && array_key_exists('css', $val) && $val['css']) {
 				print ' ';
 			}
-			print $val['css'];
-			if ($cssforfield || $val['css']) {
+			if (array_key_exists('css', $val)) {
+				print $val['css'];
+			}
+			if ($cssforfield || (array_key_exists('css', $val) && $val['css'])) {
 				print '"';
 			}
 			print '>';
@@ -1027,7 +1054,7 @@ while ($i < min($num, $limit)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
@@ -1037,14 +1064,14 @@ while ($i < min($num, $limit)) {
 				if (!isset($totalarray['val']['t.'.$key])) {
 					$totalarray['val']['t.'.$key] = 0;
 				}
-				$totalarray['val']['t.'.$key] += $obj->$key;
+				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
 	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
@@ -1061,7 +1088,7 @@ while ($i < min($num, $limit)) {
 		$totalarray['nbfield']++;
 	}
 
-	print '</tr>';
+	print '</tr>'."\n";
 
 	$i++;
 }
@@ -1078,7 +1105,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>';
 }
 
 
@@ -1090,7 +1117,7 @@ print $hookmanager->resPrint;
 
 print '</table>'."\n";
 print '</div>'."\n";
-print '</div>'."\n";
+print '</div>'."\n";	// end div-responsive-inside
 
 print '</form>'."\n";
 
@@ -1110,8 +1137,8 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n
 	$urlsource .= str_replace('&amp;', '&', $param);
 
 	$filedir = $diroutputmassaction;
-	$genallowed = $user->rights->ticket->read;
-	$delallowed = $user->rights->ticket->write;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
 
 	print $formfile->showdocuments('massfilesarea_ticket', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index 9d605a530b9..292fff329ad 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -80,7 +80,6 @@ $permissiontoadd = $user->rights->ticket->write;
 
 // Security check
 $id = GETPOST("id", 'int');
-$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id, '');
 
@@ -161,7 +160,7 @@ if ($object->fk_user_create > 0) {
 	$langs->load("users");
 	$fuser = new User($db);
 	$fuser->fetch($object->fk_user_create);
-	$morehtmlref .= $fuser->getNomUrl(0);
+	$morehtmlref .= $fuser->getNomUrl(-1);
 }
 if (!empty($object->origin_email)) {
 	$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
@@ -172,7 +171,7 @@ if (!empty($object->origin_email)) {
 if (!empty($conf->societe->enabled)) {
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
 	/*if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
-		$morehtmlref.='<a class="editfielda" href="' . $url_page_current . '?action=editcustomer&amp;track_id=' . $object->track_id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
+		$morehtmlref.='<a class="editfielda" href="' . $url_page_current . '?action=editcustomer&token='.newToken().'&track_id=' . $object->track_id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
 	}*/
 	$morehtmlref .= ' : ';
 	if ($action == 'editcustomer') {
@@ -188,7 +187,7 @@ if (!empty($conf->projet->enabled)) {
 	$morehtmlref .= '<br>'.$langs->trans('Project');
 	if ($user->rights->ticket->write) {
 		if ($action != 'classify') {
-			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 			$morehtmlref .= ' : ';
 		}
 		if ($action == 'classify') {
@@ -216,7 +215,7 @@ if (!empty($conf->projet->enabled)) {
 
 $morehtmlref .= '</div>';
 
-$linkback = '<a href="'.dol_buildpath('/ticket/list.php', 1).'"><strong>'.$langs->trans("BackToList").'</strong></a> ';
+$linkback = '<a href="'.DOL_URL_ROOT.'/ticket/list.php"><strong>'.$langs->trans("BackToList").'</strong></a> ';
 
 dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
@@ -249,7 +248,7 @@ if (!empty($object->id)) {
 
 	// Show link to add event (if read and not closed)
 	$btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
-	$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);
+	$url = DOL_URL_ROOT.'/comm/action/card.php?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);
 
 
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index 6e87cd42854..37273ee4d1d 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -82,7 +82,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filenamenb = $dir.'/ticketsnbinyear-'.$user->id.'-'.$year.'.png';
 	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
@@ -118,7 +118,7 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
 //var_dump($data);
 // $data = array(array('Lib',val1,val2,val3),...)
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filenameamount = $dir.'/ticketsamountinyear-'.$user->id.'-'.$year.'.png';
 	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$user->id.'-'.$year.'.png';
 } else {
@@ -152,7 +152,7 @@ if (!$mesg) {
 
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
-if (!$user->rights->societe->client->voir || $user->socid) {
+if (empty($user->rights->societe->client->voir) || $user->socid) {
 	$filename_avg = $dir.'/ticketsaverage-'.$user->id.'-'.$year.'.png';
 	$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$user->id.'-'.$year.'.png';
 } else {
@@ -243,7 +243,7 @@ if (!in_array($nowyear, $arrayyears)) {
 	$arrayyears[$nowyear] = $nowyear;
 }
 arsort($arrayyears);
-print $form->selectarray('year', $arrayyears, $year, 0);
+print $form->selectarray('year', $arrayyears, $year, 0, 0, 0, '', 0, 0, 0, '', 'width75');
 print '</td></tr>';
 print '<tr><td class="center" colspan="2"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></td></tr>';
 print '</table>';
@@ -297,7 +297,7 @@ print '</table>';
 print '</div>';
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+print '</div><div class="fichetwothirdright">';
 
 
 // Show graphs
@@ -314,7 +314,7 @@ if ($mesg) {
 print '</td></tr></table>';
 
 
-print '</div></div></div>';
+print '</div></div>';
 print '<div style="clear:both"></div>';
 
 print dol_get_fiche_end();
diff --git a/htdocs/ticket/tpl/linkedobjectblock.tpl.php b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
index 17da4cd2db5..f84b2381b27 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 -->\n";
+print "<!-- BEGIN PHP TEMPLATE ticket/tpl/linkedopjectblock.tpl.php -->\n";
 
 
 global $user;
@@ -65,7 +65,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 			// For now, shipments must stay linked to order, so link is not deletable
 			if ($object->element != 'shipping') {
 				?>
-				<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a>
+				<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a>
 				<?php
 			}
 			?>
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 928db5449d8..5921f7d84cd 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -226,10 +226,12 @@ while ($i <= $MAXAGENDA) {
 print '</table>';
 print '</div>';
 
-
-print '<div class="center">';
-print '<input type="submit" id="save" name="save" class="button hideifnotset button-save" value="'.$langs->trans("Save").'">';
-print "</div>";
+$addition_button = array(
+	'name' => 'save',
+	'label_key' => 'Save',
+	'addclass' => 'hideifnotset',
+);
+print $form->buttonsSaveCancel("", "", $addition_button);
 
 print dol_get_fiche_end();
 
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index c77d9bd1232..fa4c7231de5 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -83,7 +83,7 @@ $canreaduser = (!empty($user->admin) || $user->rights->user->user->lire);
 $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
-//$result = restrictedArea($user, 'salaries|hrm', $id, 'user&user', $feature2);
+//$result = restrictedArea($user, 'salaries|hrm', $object->id, 'user&user', $feature2);
 $ok = false;
 if ($user->id == $id) {
 	$ok = true; // A user can always read its own card
@@ -203,8 +203,17 @@ if ($action == 'update' && !$cancel && $permissiontoaddbankaccount) {
 	}
 }
 
+// update birth
+if ($action == 'setbirth' && $canadduser && !$cancel) {
+	$object->birth = dol_mktime(0, 0, 0, GETPOST('birthmonth', 'int'), GETPOST('birthday', 'int'), GETPOST('birthyear', 'int'));
+	$result = $object->update($user);
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+}
+
 // update personal email
-if ($action == 'setpersonal_email' && $canadduser) {
+if ($action == 'setpersonal_email' && $canadduser && !$cancel) {
 	$object->personal_email = (string) GETPOST('personal_email', 'alphanohtml');
 	$result = $object->update($user);
 	if ($result < 0) {
@@ -213,7 +222,7 @@ if ($action == 'setpersonal_email' && $canadduser) {
 }
 
 // update personal mobile
-if ($action == 'setpersonal_mobile' && $canadduser) {
+if ($action == 'setpersonal_mobile' && $canadduser && !$cancel) {
 	$object->personal_mobile = (string) GETPOST('personal_mobile', 'alphanohtml');
 	$result = $object->update($user);
 	if ($result < 0) {
@@ -288,23 +297,160 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 
 	print '<table class="border centpercent tableforfield">';
 
-	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
-	print '<td>'.$object->login.'</td>';
+	print '<tr><td class="titlefieldmiddle">'.$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>';
 
+
+	// Hierarchy
+	print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
+	print '<td>';
+	if (empty($object->fk_user)) {
+		print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
+	} else {
+		$huser = new User($db);
+		if ($object->fk_user > 0) {
+			$huser->fetch($object->fk_user);
+			print $huser->getNomUrl(1);
+		} else {
+			print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
+		}
+	}
+	print '</td>';
+	print "</tr>\n";
+
+	// Expense report validator
+	if (!empty($conf->expensereport->enabled)) {
+		print '<tr><td>';
+		$text = $langs->trans("ForceUserExpenseValidator");
+		print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
+		print '</td>';
+		print '<td>';
+		if (!empty($object->fk_user_expense_validator)) {
+			$evuser = new User($db);
+			$evuser->fetch($object->fk_user_expense_validator);
+			print $evuser->getNomUrl(1);
+		}
+		print '</td>';
+		print "</tr>\n";
+	}
+
+	// Holiday request validator
+	if (!empty($conf->holiday->enabled)) {
+		print '<tr><td>';
+		$text = $langs->trans("ForceUserHolidayValidator");
+		print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
+		print '</td>';
+		print '<td>';
+		if (!empty($object->fk_user_holiday_validator)) {
+			$hvuser = new User($db);
+			$hvuser->fetch($object->fk_user_holiday_validator);
+			print $hvuser->getNomUrl(1);
+		}
+		print '</td>';
+		print "</tr>\n";
+	}
+
+	// Position/Job
+	print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
+	print '<td>'.dol_escape_htmltag($object->job).'</td>';
+	print '</tr>'."\n";
+
+	// Weeklyhours
+	print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
+	print '<td>';
+	print price2num($object->weeklyhours);
+	print '</td>';
+	print "</tr>\n";
+
+	// 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))) {
+		$langs->load("salaries");
+
+		// Salary
+		print '<tr><td>'.$langs->trans("Salary").'</td>';
+		print '<td>';
+		print ($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<span class="amount">'.price($object->salary, '', $langs, 1, -1, -1, $conf->currency) : '').'</span>';
+		print '</td>';
+		print "</tr>\n";
+
+		// THM
+		print '<tr><td>';
+		$text = $langs->trans("THM");
+		print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
+		print '</td>';
+		print '<td>';
+		print ($object->thm != '' ?price($object->thm, '', $langs, 1, -1, -1, $conf->currency) : '');
+		print '</td>';
+		print "</tr>\n";
+
+		// TJM
+		print '<tr><td>';
+		$text = $langs->trans("TJM");
+		print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classtjm');
+		print '</td>';
+		print '<td>';
+		print ($object->tjm != '' ?price($object->tjm, '', $langs, 1, -1, -1, $conf->currency) : '');
+		print '</td>';
+		print "</tr>\n";
+	}
+
+	// Date employment
+	print '<tr><td>'.$langs->trans("DateOfEmployment").'</td>';
+	print '<td>';
+	if ($object->dateemployment) {
+		print '<span class="opacitymedium">'.$langs->trans("FromDate").'</span> ';
+		print dol_print_date($object->dateemployment, 'day');
+	}
+	if ($object->dateemploymentend) {
+		print '<span class="opacitymedium"> - '.$langs->trans("To").'</span> ';
+		print dol_print_date($object->dateemploymentend, 'day');
+	}
+	print '</td>';
+	print "</tr>\n";
+
+	// Date 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";
+
+	// 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', ($object->personal_email != '' ? dol_print_email($object->personal_email) : ''));
+	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>';
 
+	// 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', ($object->personal_mobile != '' ? dol_print_phone($object->personal_mobile) : ''));
+	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>';
 
@@ -340,7 +486,10 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 			$ret .= '<input type="hidden" name="action" value="setdefault_range">';
 			$ret .= '<input type="hidden" name="token" value="'.newToken().'">';
 			$ret .= '<input type="hidden" name="id" value="'.$object->id.'">';
-			$maxRangeNum = ExpenseReportIk::getMaxRangeNumber($object->default_c_exp_tax_cat);
+
+			$expensereportik = new ExpenseReportIk($db);
+			$maxRangeNum = $expensereportik->getMaxRangeNumber($object->default_c_exp_tax_cat);
+
 			$ret .= $form->selectarray('default_range', range(0, $maxRangeNum), $object->default_range);
 			$ret .= '<input type="submit" class="button" name="modify" value="'.$langs->trans("Modify").'"> ';
 			$ret .= '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -355,7 +504,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 
 	print '</table>';
 
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright">';
 
 	// Max number of elements in small lists
 	$MAXLIST = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
@@ -370,7 +519,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		$sql = "SELECT s.rowid as sid, s.ref as sref, s.label, s.datesp, s.dateep, s.paye, s.amount, SUM(ps.amount) as alreadypaid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."salary as s";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_salary as ps ON (s.rowid = ps.fk_salary)";
-		$sql .= " WHERE s.fk_user = ".$object->id;
+		$sql .= " WHERE s.fk_user = ".((int) $object->id);
 		$sql .= " AND s.entity IN (".getEntity('salary').")";
 		$sql .= " GROUP BY s.rowid, s.ref, s.label, s.datesp, s.dateep, s.paye, s.amount";
 		$sql .= " ORDER BY s.dateep DESC";
@@ -434,7 +583,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 
 		$sql = "SELECT h.rowid, h.statut as status, h.fk_type, h.date_debut, h.date_fin, h.halfday";
 		$sql .= " FROM ".MAIN_DB_PREFIX."holiday as h";
-		$sql .= " WHERE h.fk_user = ".$object->id;
+		$sql .= " WHERE h.fk_user = ".((int) $object->id);
 		$sql .= " AND h.entity IN (".getEntity('holiday').")";
 		$sql .= " ORDER BY h.date_debut DESC";
 
@@ -486,8 +635,8 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 
 		$sql = "SELECT e.rowid, e.ref, e.fk_statut as status, e.date_debut, e.total_ttc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e";
-		$sql .= " WHERE e.fk_user_author = ".$object->id;
-		$sql .= " AND e.entity = ".$conf->entity;
+		$sql .= " WHERE e.fk_user_author = ".((int) $object->id);
+		$sql .= " AND e.entity = ".((int) $conf->entity);
 		$sql .= " ORDER BY e.date_debut DESC";
 
 		$resql = $db->query($sql);
@@ -528,7 +677,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		}
 	}
 
-	print '</div></div></div>';
+	print '</div></div>';
 	print '<div style="clear:both"></div>';
 
 	print dol_get_fiche_end();
@@ -610,7 +759,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		// Edit/Delete
 		print '<td class="right nowraponall">';
 		if ($permissiontoaddbankaccount) {
-			print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&bankid='.$account->id.'&action=edit">';
+			print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&bankid='.$account->id.'&action=edit&token='.newToken().'">';
 			print img_picto($langs->trans("Modify"), 'edit');
 			print '</a>';
 		}
@@ -701,11 +850,7 @@ if ($id && ($action == 'edit' || $action == 'create') && $user->rights->user->us
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input class="button" value="'.$langs->trans("Modify").'" type="submit">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-	print '</div>';
+	print $form->buttonsSaveCancel("Modify");
 }
 
 if ($id && $action == 'edit' && $user->rights->user->user->creer) {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 23437a7564c..c5103278dda 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -90,12 +90,10 @@ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 $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) {
+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->rights->user->self->creer) || (($user->id != $id) && $user->rights->user->user->creer));
+	$caneditpassword = ((($user->id == $id) && $user->rights->user->self->password) || (($user->id != $id) && $user->rights->user->user->password));
 }
 
 // Security check
@@ -106,7 +104,7 @@ if ($user->socid > 0) {
 $feature2 = 'user';
 $result = restrictedArea($user, 'user', $id, 'user', $feature2);
 
-if ($user->id <> $id && !$canreaduser) {
+if ($user->id != $id && !$canreaduser) {
 	accessforbidden();
 }
 
@@ -138,6 +136,29 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/user/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.'/user/card.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 = '';
+	}
+
 	if ($action == 'confirm_disable' && $confirm == "yes" && $candisableuser) {
 		if ($id != $user->id) {		// A user can't disable itself
 			$object->fetch($id);
@@ -239,10 +260,6 @@ if (empty($reshook)) {
 			$object->office_fax = GETPOST("office_fax", 'alphanohtml');
 			$object->user_mobile = GETPOST("user_mobile", 'alphanohtml');
 
-			//$object->skype = GETPOST("skype", 'alphanohtml');
-			//$object->twitter = GETPOST("twitter", 'alphanohtml');
-			//$object->facebook = GETPOST("facebook", 'alphanohtml');
-			//$object->linkedin = GETPOST("linkedin", 'alphanohtml');
 			if (!empty($conf->socialnetworks->enabled)) {
 				$object->socialnetworks = array();
 				foreach ($socialnetworks as $key => $value) {
@@ -351,8 +368,7 @@ if (empty($reshook)) {
 			}
 
 			if ($result > 0) {
-				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
-				exit;
+				$action = '';
 			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -388,7 +404,7 @@ if (empty($reshook)) {
 				$object->firstname = GETPOST("firstname", 'alphanohtml');
 				$object->login = GETPOST("login", 'alphanohtml');
 				$object->gender = GETPOST("gender", 'aZ09');
-				$object->pass = GETPOST("password", 'none');
+				$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
@@ -401,10 +417,7 @@ if (empty($reshook)) {
 				$object->office_phone = GETPOST("office_phone", 'alphanohtml');
 				$object->office_fax = GETPOST("office_fax", 'alphanohtml');
 				$object->user_mobile = GETPOST("user_mobile", 'alphanohtml');
-				//$object->skype = GETPOST("skype", 'alphanohtml');
-				//$object->twitter = GETPOST("twitter", 'alphanohtml');
-				//$object->facebook = GETPOST("facebook", 'alphanohtml');
-				//$object->linkedin = GETPOST("linkedin", 'alphanohtml');
+
 				if (!empty($conf->socialnetworks->enabled)) {
 					$object->socialnetworks = array();
 					foreach ($socialnetworks as $key => $value) {
@@ -413,6 +426,7 @@ if (empty($reshook)) {
 						}
 					}
 				}
+
 				$object->email = preg_replace('/\s+/', '', GETPOST("email", 'alphanohtml'));
 				$object->job = GETPOST("job", 'alphanohtml');
 				$object->signature = GETPOST("signature", 'restricthtml');
@@ -491,6 +505,7 @@ if (empty($reshook)) {
 							setEventMessages($langs->trans("ErrorLoginAlreadyExists", $object->login), null, 'errors');
 						} else {
 							setEventMessages($object->error, $object->errors, 'errors');
+							$action = 'edit';
 						}
 					}
 				}
@@ -508,15 +523,15 @@ if (empty($reshook)) {
 						if (!empty($contact->socid)) {
 							$sql .= ", fk_soc=".((int) $contact->socid);
 						}
-						$sql .= " WHERE rowid=".$object->id;
+						$sql .= " WHERE rowid = ".((int) $object->id);
 					} elseif ($socid > 0) {
 						$sql = "UPDATE ".MAIN_DB_PREFIX."user";
 						$sql .= " SET fk_socpeople=NULL, fk_soc=".((int) $socid);
-						$sql .= " WHERE rowid=".$object->id;
+						$sql .= " WHERE rowid = ".((int) $object->id);
 					} else {
 						$sql = "UPDATE ".MAIN_DB_PREFIX."user";
 						$sql .= " SET fk_socpeople=NULL, fk_soc=NULL";
-						$sql .= " WHERE rowid=".$object->id;
+						$sql .= " WHERE rowid = ".((int) $object->id);
 					}
 					dol_syslog("usercard::update", LOG_DEBUG);
 					$resql = $db->query($sql);
@@ -601,7 +616,7 @@ if (empty($reshook)) {
 	) {
 		$object->fetch($id);
 
-		$newpassword = $object->setPassword($user, '');
+		$newpassword = $object->setPassword($user, '');	// This will generate a new password
 		if ($newpassword < 0) {
 			// Echec
 			setEventMessages($langs->trans("ErrorFailedToSetNewPassword"), null, 'errors');
@@ -710,7 +725,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	print "<br>";
 
 
-	if (!empty($conf->ldap->enabled) && (isset($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')) {
+	if (!empty($conf->ldap->enabled) && (isset($conf->global->LDAP_SYNCHRO_ACTIVE) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_LDAP_TO_DOLIBARR)) {
 		// Show form to add an account from LDAP if sync LDAP -> Dolibarr is set
 		$ldap = new Ldap();
 		$result = $ldap->connect_bind();
@@ -796,7 +811,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 	print dol_get_fiche_head('', '', '', 0, '');
 
-	print dol_set_focus('#lastname');
+	dol_set_focus('#lastname');
 
 	print '<table class="border centpercent">';
 
@@ -813,7 +828,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 		print '<input type="hidden" id="lastname" name="lastname" value="'.dol_escape_htmltag($ldap_lastname).'">';
 		print $ldap_lastname;
 	} else {
-		print '<input class="minwidth100" type="text" id="lastname" name="lastname" value="'.dol_escape_htmltag(GETPOST('lastname', 'alphanohtml')).'">';
+		print '<input class="minwidth100 maxwidth150onsmartphone" type="text" id="lastname" name="lastname" value="'.dol_escape_htmltag(GETPOST('lastname', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
 
@@ -824,7 +839,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 		print '<input type="hidden" name="firstname" value="'.dol_escape_htmltag($ldap_firstname).'">';
 		print $ldap_firstname;
 	} else {
-		print '<input class="minwidth100" type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST('firstname', 'alphanohtml')).'">';
+		print '<input class="minwidth100 maxwidth150onsmartphone" type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST('firstname', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
 
@@ -838,7 +853,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 		print '<input type="hidden" name="login" value="'.dol_escape_htmltag($ldap_loginsmb).'">';
 		print $ldap_loginsmb;
 	} else {
-		print '<input class="maxwidth200" maxsize="24" type="text" name="login" value="'.dol_escape_htmltag(GETPOST('login', 'alphanohtml')).'">';
+		print '<input class="maxwidth200 maxwidth150onsmartphone" maxsize="24" type="text" name="login" value="'.dol_escape_htmltag(GETPOST('login', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
 
@@ -907,7 +922,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	// Hierarchy
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("HierarchicalResponsible").'</td>';
 	print '<td>';
-	print img_picto('', 'user').$form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300');
+	print img_picto('', 'user', 'class="pictofixedwidth"').$form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300 widthcentpercentminusx');
 	print '</td>';
 	print "</tr>\n";
 
@@ -918,7 +933,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 		print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
 		print '</td>';
 		print '<td>';
-		print img_picto('', 'user').$form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300');
+		print img_picto('', 'user', 'class="pictofixedwidth"').$form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300 widthcentpercentminusx');
 		print '</td>';
 		print "</tr>\n";
 	}
@@ -930,7 +945,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 		print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
 		print '</td>';
 		print '<td>';
-		print img_picto('', 'user').$form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300');
+		print img_picto('', 'user', 'class="pictofixedwidth"').$form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $conf->entity, 0, 0, '', 0, '', 'maxwidth300 widthcentpercentminusx');
 		print '</td>';
 		print "</tr>\n";
 	}
@@ -972,7 +987,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			$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 size="30" maxsize="32" type="text" name="password" value="'.$password.'" autocomplete="new-password">';
+			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input maxsize="32" type="text" name="password" value="'.$password.'" autocomplete="new-password">';
 		}
 	}
 
@@ -993,7 +1008,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 		//$generated_password = getRandomPassword(false);
 		print '<tr><td>'.$langs->trans("ApiKey").'</td>';
 		print '<td>';
-		print '<input class="minwidth300" maxsize="32" type="text" id="api_key" name="api_key" value="'.GETPOST('api_key', 'alphanohtml').'" autocomplete="off">';
+		print '<input class="minwidth300 widthcentpercentminusx" maxsize="32" type="text" id="api_key" name="api_key" value="'.GETPOST('api_key', 'alphanohtml').'" autocomplete="off">';
 		if (!empty($conf->use_javascript_ajax)) {
 			print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
 		}
@@ -1026,7 +1041,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 	// Country
 	print '<tr><td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
-	print img_picto('', 'country', 'class="paddingrightonly"');
+	print img_picto('', 'country', 'class="pictofixedwidth"');
 	print $form->select_country((GETPOST('country_id') != '' ?GETPOST('country_id') : $object->country_id));
 	if ($user->admin) {
 		print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
@@ -1044,43 +1059,43 @@ if ($action == 'create' || $action == 'adduserldap') {
 	// Tel
 	print '<tr><td>'.$langs->trans("PhonePro").'</td>';
 	print '<td>';
-	print img_picto('', 'object_phoning');
+	print img_picto('', 'object_phoning', 'class="pictofixedwidth"');
 	if (!empty($ldap_phone)) {
 		print '<input type="hidden" name="office_phone" value="'.dol_escape_htmltag($ldap_phone).'">';
 		print $ldap_phone;
 	} else {
-		print '<input type="text" name="office_phone" value="'.dol_escape_htmltag(GETPOST('office_phone', 'alphanohtml')).'">';
+		print '<input class="maxwidth200 widthcentpercentminusx" type="text" name="office_phone" value="'.dol_escape_htmltag(GETPOST('office_phone', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
 
 	// Tel portable
 	print '<tr><td>'.$langs->trans("PhoneMobile").'</td>';
 	print '<td>';
-	print img_picto('', 'object_phoning_mobile');
+	print img_picto('', 'object_phoning_mobile', 'class="pictofixedwidth"');
 	if (!empty($ldap_mobile)) {
 		print '<input type="hidden" name="user_mobile" value="'.dol_escape_htmltag($ldap_mobile).'">';
 		print $ldap_mobile;
 	} else {
-		print '<input type="text" name="user_mobile" value="'.dol_escape_htmltag(GETPOST('user_mobile', 'alphanohtml')).'">';
+		print '<input class="maxwidth200 widthcentpercentminusx" type="text" name="user_mobile" value="'.dol_escape_htmltag(GETPOST('user_mobile', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
 
 	// Fax
 	print '<tr><td>'.$langs->trans("Fax").'</td>';
 	print '<td>';
-	print img_picto('', 'object_phoning_fax');
+	print img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"');
 	if (!empty($ldap_fax)) {
 		print '<input type="hidden" name="office_fax" value="'.dol_escape_htmltag($ldap_fax).'">';
 		print $ldap_fax;
 	} else {
-		print '<input type="text" name="office_fax" value="'.dol_escape_htmltag(GETPOST('office_fax', 'alphanohtml')).'">';
+		print '<input class="maxwidth200 widthcentpercentminusx" type="text" name="office_fax" value="'.dol_escape_htmltag(GETPOST('office_fax', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
 
 	// EMail
 	print '<tr><td'.(!empty($conf->global->USER_MAIL_REQUIRED) ? ' class="fieldrequired"' : '').'>'.$langs->trans("EMail").'</td>';
 	print '<td>';
-	print img_picto('', 'object_email');
+	print img_picto('', 'object_email', 'class="pictofixedwidth"');
 	if (!empty($ldap_mail)) {
 		print '<input type="hidden" name="email" value="'.dol_escape_htmltag($ldap_mail).'">';
 		print $ldap_mail;
@@ -1089,19 +1104,20 @@ if ($action == 'create' || $action == 'adduserldap') {
 	}
 	print '</td></tr>';
 
+	// Social networks
 	if (!empty($conf->socialnetworks->enabled)) {
 		foreach ($socialnetworks as $key => $value) {
 			if ($value['active']) {
 				print '<tr><td>'.$langs->trans($value['label']).'</td>';
 				print '<td>';
 				if (!empty($value['icon'])) {
-					print '<span class="fa '.$value['icon'].'"></span>';
+					print '<span class="fa '.$value['icon'].' pictofixedwidth"></span>';
 				}
 				if (!empty($ldap_social[$key])) {
 					print '<input type="hidden" name="'.$key.'" value="'.$ldap_social[$key].'">';
 					print $ldap_social[$key];
 				} else {
-					print '<input class="maxwidth200" type="text" name="'.$key.'" value="'.GETPOST($key, 'alphanohtml').'">';
+					print '<input class="maxwidth200 widthcentpercentminusx" type="text" name="'.$key.'" value="'.GETPOST($key, 'alphanohtml').'">';
 				}
 				print '</td></tr>';
 			} else {
@@ -1119,7 +1135,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	if (!empty($conf->accounting->enabled)) {
 		print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
-		print '<input type="text" name="accountancy_code" value="'.dol_escape_htmltag(GETPOST('accountancy_code', 'alphanohtml')).'">';
+		print '<input type="text" class="maxwidthonsmartphone" name="accountancy_code" value="'.dol_escape_htmltag(GETPOST('accountancy_code', 'alphanohtml')).'">';
 		print '</td></tr>';
 	}
 
@@ -1133,16 +1149,16 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 	// Categories
 	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
-		print '<tr><td>'.$form->editfieldkey('Categories', 'usercats', '', $object, 0).'</td><td colspan="3">';
+		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').$form->multiselectarray('usercats', $cate_arbo, GETPOST('usercats', 'array'), null, null, null, null, '90%');
+		print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('usercats', $cate_arbo, GETPOST('usercats', 'array'), 0, 0, 'maxwdith300 widthcentpercentminusx', 0, '90%');
 		print "</td></tr>";
 	}
 
 	if (!empty($conf->global->MAIN_MULTILANGS)) {
 		print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0, 'string', '', 0, 0, 'id', $langs->trans("WarningNotLangOfInterface", $langs->transnoentitiesnoconv("UserGUISetup"))).'</td>';
-		print '<td colspan="3" class="maxwidthonsmartphone">'."\n";
-		print img_picto('', 'language').$formadmin->select_language(GETPOST('default_lang', 'alpha') ?GETPOST('default_lang', 'alpha') : ($object->lang ? $object->lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
+		print '<td class="maxwidthonsmartphone">'."\n";
+		print img_picto('', 'language', 'class="pictofixedwidth"').$formadmin->select_language(GETPOST('default_lang', 'alpha') ?GETPOST('default_lang', 'alpha') : ($object->lang ? $object->lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone widthcentpercentminusx');
 		print '</td>';
 		print '</tr>';
 	}
@@ -1162,7 +1178,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	}
 
 	// Other attributes
-	$parameters = array('colspan' => ' colspan="3"');
+	$parameters = array();
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
 	// Note
@@ -1198,7 +1214,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	// Position/Job
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("PostOrFunction").'</td>';
 	print '<td>';
-	print '<input class="maxwidth200" type="text" name="job" value="'.dol_escape_htmltag(GETPOST('job', 'alphanohtml')).'">';
+	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))
@@ -1263,11 +1279,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input class="button" value="'.$langs->trans("CreateUser").'" name="create" type="submit">';
-	//print '&nbsp; &nbsp; &nbsp;';
-	//print '<input value="'.$langs->trans("Cancel").'" class="button button-cancel" type="submit" name="cancel">';
-	print '</div>';
+	print $form->buttonsSaveCancel("CreateUser");
 
 	print "</form>";
 } else {
@@ -1391,23 +1403,24 @@ if ($action == 'create' || $action == 'adduserldap') {
 			// Login
 			print '<tr><td class="titlefieldmiddle">'.$langs->trans("Login").'</td>';
 			if (!empty($object->ldap_sid) && $object->statut == 0) {
-				print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
+				print '<td class="error">';
+				print $langs->trans("LoginAccountDisableInDolibarr");
+				print '</td>';
 			} else {
-				print '<td>'.showValueWithClipboardCPButton($object->login).'</td>';
+				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";
 
-			// Administrator
-			print '<tr><td>'.$langs->trans("Administrator").'</td><td>';
-			if (!empty($conf->multicompany->enabled) && $object->admin && !$object->entity) {
-				print $form->textwithpicto(yn($object->admin), $langs->trans("SuperAdministratorDesc"), 1, "superadmin");
-			} elseif ($object->admin) {
-				print $form->textwithpicto(yn($object->admin), $langs->trans("AdministratorDesc"), 1, "admin");
-			} else {
-				print yn($object->admin);
-			}
-			print '</td></tr>'."\n";
-
 			// Type
 			print '<tr><td>';
 			$text = $langs->trans("Type");
@@ -1438,7 +1451,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			//print yn($object->employee);
 			print '</td></tr>'."\n";
 
-			// TODO Move this into tab RH, visible when salarie or RH is visible (HierarchicalResponsible must be on both tab)
+			// TODO This is also available into the tab RH
 
 			// Hierarchy
 			print '<tr><td>'.$langs->trans("HierarchicalResponsible").'</td>';
@@ -1489,30 +1502,31 @@ if ($action == 'create' || $action == 'adduserldap') {
 				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';
-				print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
-				if ($object->fk_warehouse > 0) {
-					$warehousestatic = new Entrepot($db);
-					$warehousestatic->fetch($object->fk_warehouse);
-					print $warehousestatic->getNomUrl(1);
-				}
-				print '</td></tr>';
-			}
-
 			// Position/Job
 			print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
 			print '<td>'.dol_escape_htmltag($object->job).'</td>';
 			print '</tr>'."\n";
 
-			if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read) && in_array($id, $childids))
+			// Weeklyhours
+			print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
+			print '<td>';
+			print price2num($object->weeklyhours);
+			print '</td>';
+			print "</tr>\n";
+
+			// 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))) {
-				// Even a superior can't see this info of its subordinates wihtout $user->rights->salaries->read and $user->rights->hrm->employee->read (setting/viewing is reserverd to HR people).
-				// However, he can see the valuation of timesheet of its subordinates even without these permissions.
 				$langs->load("salaries");
 
+				// Salary
+				print '<tr><td>'.$langs->trans("Salary").'</td>';
+				print '<td>';
+				print ($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<span class="amount">'.price($object->salary, '', $langs, 1, -1, -1, $conf->currency) : '').'</span>';
+				print '</td>';
+				print "</tr>\n";
+
 				// THM
 				print '<tr><td>';
 				$text = $langs->trans("THM");
@@ -1532,22 +1546,8 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print ($object->tjm != '' ?price($object->tjm, '', $langs, 1, -1, -1, $conf->currency) : '');
 				print '</td>';
 				print "</tr>\n";
-
-				// Salary
-				print '<tr><td>'.$langs->trans("Salary").'</td>';
-				print '<td>';
-				print ($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<span class="amount">'.price($object->salary, '', $langs, 1, -1, -1, $conf->currency) : '').'</span>';
-				print '</td>';
-				print "</tr>\n";
 			}
 
-			// Weeklyhours
-			print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
-			print '<td>';
-			print price2num($object->weeklyhours);
-			print '</td>';
-			print "</tr>\n";
-
 			// Date employment
 			print '<tr><td>'.$langs->trans("DateOfEmployment").'</td>';
 			print '<td>';
@@ -1562,12 +1562,17 @@ 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');
-			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';
+				print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
+				if ($object->fk_warehouse > 0) {
+					$warehousestatic = new Entrepot($db);
+					$warehousestatic->fetch($object->fk_warehouse);
+					print $warehousestatic->getNomUrl(1);
+				}
+				print '</td></tr>';
+			}
 
 			// Accountancy code
 			if (!empty($conf->accounting->enabled)) {
@@ -1578,7 +1583,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</table>';
 
 			print '</div>';
-			print '<div class="fichehalfright"><div class="ficheaddleft">';
+			print '<div class="fichehalfright">';
 
 			print '<div class="underbanner clearboth"></div>';
 
@@ -1782,7 +1787,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</tr>'."\n";
 
 			// API key
-			if (!empty($conf->api->enabled) && ($user->id == $id || $user->admin)) {
+			if (!empty($conf->api->enabled) && ($user->id == $id || $user->admin || $user->rights->api->apikey->generate)) {
 				print '<tr><td>'.$langs->trans("ApiKey").'</td>';
 				print '<td>';
 				if (!empty($object->api_key)) {
@@ -1808,7 +1813,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 			print '</div>';
 
-			print '</div></div>';
+			print '</div>';
 			print '<div style="clear:both"></div>';
 
 
@@ -1838,25 +1843,25 @@ if ($action == 'create' || $action == 'adduserldap') {
 					if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DisabledInMonoUserMode")).'">'.$langs->trans("Modify").'</a></div>';
 					} else {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>';
+						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>';
 					}
 				} elseif ($caneditpassword && !$object->ldap_sid &&
 				(empty($conf->multicompany->enabled) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a></div>';
+					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>';
 				}
 
 				// Si on a un gestionnaire de generation de mot de passe actif
 				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 (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
+					} 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>';
 					}
 
 					if ($object->statut == 0) {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a></div>';
-					} elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
+					} elseif ($caneditpassword && $object->login && !$object->ldap_sid &&
 					((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) {
 						if ($object->email) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a></div>';
@@ -1922,7 +1927,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 					$exclude = array();
 
 					$usergroup = new UserGroup($db);
-					$groupslist = $usergroup->listGroupsForUser($object->id);
+					$groupslist = $usergroup->listGroupsForUser($object->id, false);
 
 					if (!empty($groupslist)) {
 						foreach ($groupslist as $groupforuser) {
@@ -1940,6 +1945,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 							print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'."\n";
 							print '<input type="hidden" name="token" value="'.newToken().'" />';
 							print '<input type="hidden" name="action" value="addgroup" />';
+							print '<input type="hidden" name="page_y" value="" />';
 						}
 
 						print '<table class="noborder centpercent">'."\n";
@@ -1949,7 +1955,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 							print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity);
 							print ' &nbsp; ';
 							print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-							print '<input type="submit" class="button buttongen" value="'.$langs->trans("Add").'" />';
+							print '<input type="submit" class="button buttongen button-add reposition" value="'.$langs->trans("Add").'" />';
 						}
 						print '</th></tr>'."\n";
 
@@ -1966,7 +1972,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 								print '</td>';
 								print '<td class="right">';
 								if ($caneditgroup) {
-									print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
+									print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=removegroup&token='.newToken().'&group='.((int) $group->id).'">';
 									print img_picto($langs->trans("RemoveFromGroup"), 'unlink');
 									print '</a>';
 								} else {
@@ -2013,7 +2019,11 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 			// Civility
 			print '<tr><td class="titlefieldcreate"><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
-			print $formcompany->select_civility(GETPOSTISSET("civility_code") ? GETPOST("civility_code", 'aZ09') : $object->civility_code, 'civility_code');
+			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) {
+				print $langs->trans("Civility".$object->civility_code);
+			}
 			print '</td></tr>';
 
 			// Lastname
@@ -2305,7 +2315,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print "</td></tr>\n";
 
 			// API key
-			if (!empty($conf->api->enabled) && ($user->id == $id || $user->admin)) {
+			if (!empty($conf->api->enabled) && ($user->id == $id || $user->admin || $user->rights->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">';
@@ -2315,6 +2325,18 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '</td></tr>';
 			}
 
+			// OpenID url
+			if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->file->main_authentication) && !empty($conf->global->MAIN_OPENIDURL_PERUSER)) {
+				print "<tr>".'<td>'.$langs->trans("OpenIDURL").'</td>';
+				print '<td>';
+				if ($caneditfield) {
+					print '<input class="minwidth100" type="url" name="openid" class="flat" value="'.$object->openid.'">';
+				} else {
+					print '<input type="hidden" name="openid" value="'.$object->openid.'">';
+					print $object->openid;
+				}
+				print '</td></tr>';
+			}
 
 			print '</table><hr><table class="border centpercent">';
 
@@ -2444,21 +2466,16 @@ if ($action == 'create' || $action == 'adduserldap') {
 				}
 			}
 
-			// OpenID url
-			if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->file->main_authentication) && !empty($conf->global->MAIN_OPENIDURL_PERUSER)) {
-				print "<tr>".'<td>'.$langs->trans("OpenIDURL").'</td>';
-				print '<td>';
-				if ($caneditfield) {
-					print '<input class="minwidth100" type="url" name="openid" class="flat" value="'.$object->openid.'">';
-				} else {
-					print '<input type="hidden" name="openid" value="'.$object->openid.'">';
-					print $object->openid;
-				}
+			print '</table><hr><table class="border centpercent">';
+
+			// Default warehouse
+			if (!empty($conf->stock->enabled) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
+				print '<tr><td class="titlefield">'.$langs->trans("DefaultWarehouse").'</td><td>';
+				print $formproduct->selectWarehouses($object->fk_warehouse, 'fk_warehouse', 'warehouseopen', 1);
+				print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&token='.newToken().'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken()).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span></a>';
 				print '</td></tr>';
 			}
 
-			print '</table><hr><table class="border centpercent">';
-
 			// Accountancy code
 			if (!empty($conf->accounting->enabled)) {
 				print "<tr>";
@@ -2616,14 +2633,6 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 			// TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
 
-			// Default warehouse
-			if (!empty($conf->stock->enabled) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
-				print '<tr><td class="titlefield">'.$langs->trans("DefaultWarehouse").'</td><td>';
-				print $formproduct->selectWarehouses($object->fk_warehouse, 'fk_warehouse', 'warehouseopen', 1);
-				print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span></a>';
-				print '</td></tr>';
-			}
-
 			// Position/Job
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("PostOrFunction").'</td>';
 			print '<td>';
@@ -2635,10 +2644,29 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 			print '</td></tr>';
 
-			if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read) && in_array($id, $childids))
+			// Weeklyhours
+			print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
+			print '<td>';
+			if ($caneditfield) {
+				print '<input size="8" type="text" name="weeklyhours" value="'.price2num(GETPOST('weeklyhours') ?GETPOST('weeklyhours') : $object->weeklyhours).'">';
+			} else {
+				print price2num($object->weeklyhours);
+			}
+			print '</td>';
+			print "</tr>\n";
+
+			// 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))) {
-				$langs->load("salaries");
+					$langs->load("salaries");
+
+				// Salary
+				print '<tr><td>'.$langs->trans("Salary").'</td>';
+				print '<td>';
+				print img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary') ?GETPOST('salary') : $object->salary).'">';
+				print '</td>';
+				print "</tr>\n";
 
 				// THM
 				print '<tr><td>';
@@ -2667,26 +2695,8 @@ if ($action == 'create' || $action == 'adduserldap') {
 				}
 				print '</td>';
 				print "</tr>\n";
-
-				// Salary
-				print '<tr><td>'.$langs->trans("Salary").'</td>';
-				print '<td>';
-				print img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary') ?GETPOST('salary') : $object->salary).'">';
-				print '</td>';
-				print "</tr>\n";
 			}
 
-			// Weeklyhours
-			print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
-			print '<td>';
-			if ($caneditfield) {
-				print '<input size="8" type="text" name="weeklyhours" value="'.price2num(GETPOST('weeklyhours') ?GETPOST('weeklyhours') : $object->weeklyhours).'">';
-			} else {
-				print price2num($object->weeklyhours);
-			}
-			print '</td>';
-			print "</tr>\n";
-
 			// Date employment
 			print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
 			print '<td>';
@@ -2749,18 +2759,18 @@ if ($action == 'create' || $action == 'adduserldap') {
 			$linktoelem = $form->showLinkToObjectBlock($object, null, null);
 			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
-			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+			print '</div><div class="fichehalfright">';
 
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'user', $socid, 1);
 
-			print '</div></div></div>';
+			print '</div></div>';
 		}
 
 		if (!empty($conf->ldap->enabled) && !empty($object->ldap_sid)) {
-			$ldap->close();
+			$ldap->unbind();
 		}
 	}
 }
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index e0cbd849092..b2f8085de5a 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -82,9 +82,9 @@ class Users extends DolibarrApi
 		//$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe;
 
 		$sql = "SELECT t.rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user as t";
+		$sql .= " FROM ".$this->db->prefix()."user as t";
 		if ($category > 0) {
-			$sql .= ", ".MAIN_DB_PREFIX."categorie_user as c";
+			$sql .= ", ".$this->db->prefix()."categorie_user as c";
 		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('user').')';
 		if ($user_ids) {
@@ -99,8 +99,9 @@ class Users extends DolibarrApi
 
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -151,7 +152,7 @@ class Users extends DolibarrApi
 	 */
 	public function get($id, $includepermissions = 0)
 	{
-		if (empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin)) {
+		if (empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin) && $id != 0 && DolibarrApiAccess::$user->id != $id) {
 			throw new RestException(401, 'Not allowed');
 		}
 
@@ -184,12 +185,17 @@ class Users extends DolibarrApi
 	 *
 	 * @url GET login/{login}
 	 *
-	 * @throws RestException 401 Insufficient rights
-	 * @throws RestException 404 User or group not found
+	 * @throws RestException 400    Bad request
+	 * @throws RestException 401 	Insufficient rights
+	 * @throws RestException 404 	User or group not found
 	 */
 	public function getByLogin($login, $includepermissions = 0)
 	{
-		if (empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin)) {
+		if (empty($login)) {
+			throw new RestException(400, 'Bad parameters');
+		}
+
+		if (empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin) && DolibarrApiAccess::$user->login != $login) {
 			throw new RestException(401, 'Not allowed');
 		}
 
@@ -218,12 +224,17 @@ class Users extends DolibarrApi
 	 *
 	 * @url GET email/{email}
 	 *
+	 * @throws RestException 400     Bad request
 	 * @throws RestException 401     Insufficient rights
 	 * @throws RestException 404     User or group not found
 	 */
 	public function getByEmail($email, $includepermissions = 0)
 	{
-		if (empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin)) {
+		if (empty($email)) {
+			throw new RestException(400, 'Bad parameters');
+		}
+
+		if (empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin) && DolibarrApiAccess::$user->email != $email) {
 			throw new RestException(401, 'Not allowed');
 		}
 
@@ -256,7 +267,7 @@ class Users extends DolibarrApi
 	 */
 	public function getInfo($includepermissions = 0)
 	{
-		if (empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin)) {
+		if (empty(DolibarrApiAccess::$user->rights->user->self->creer) && empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin)) {
 			throw new RestException(401, 'Not allowed');
 		}
 
@@ -525,15 +536,16 @@ class Users extends DolibarrApi
 		//$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe;
 
 		$sql = "SELECT t.rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as t";
+		$sql .= " FROM ".$this->db->prefix()."usergroup as t";
 		$sql .= ' WHERE t.entity IN ('.getEntity('user').')';
 		if ($group_ids) {
 			$sql .= " AND t.rowid IN (".$this->db->sanitize($group_ids).")";
 		}
 		// Add sql filters
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
@@ -678,6 +690,7 @@ class Users extends DolibarrApi
 
 		unset($object->lines);
 		unset($object->model_pdf);
+
 		unset($object->skype);
 		unset($object->twitter);
 		unset($object->facebook);
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 2b284f6878e..e880c30c832 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2013-2015  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2018       charlene Benke          <charlie@patas-monkey.com>
- * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2018-2021       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Abbes Bahfir            <dolipar@dolipar.org>
  *
@@ -439,9 +439,9 @@ class User extends CommonObject
 		$sql .= " u.default_range, u.default_c_exp_tax_cat,"; // Expense report default mode
 		$sql .= " c.code as country_code, c.label as country,";
 		$sql .= " d.code_departement as state_code, d.nom as state";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON u.fk_country = c.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON u.fk_state = d.rowid";
+		$sql .= " FROM ".$this->db->prefix()."user as u";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."c_country as c ON u.fk_country = c.rowid";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."c_departements as d ON u.fk_state = d.rowid";
 
 		if ($entity < 0) {
 			if ((empty($conf->multicompany->enabled) || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty($user->entity))) {
@@ -524,7 +524,7 @@ class User extends CommonObject
 				$this->admin		= $obj->admin;
 				$this->note_public = $obj->note_public;
 				$this->note_private = $obj->note_private;
-				$this->note			= $obj->note_private;
+				$this->note			= $obj->note_private;	// deprecated
 				$this->statut		= $obj->statut;
 				$this->photo		= $obj->photo;
 				$this->openid		= $obj->openid;
@@ -584,7 +584,7 @@ class User extends CommonObject
 		// To get back the global configuration unique to the user
 		if ($loadpersonalconf) {
 			// Load user->conf for user
-			$sql = "SELECT param, value FROM ".MAIN_DB_PREFIX."user_param";
+			$sql = "SELECT param, value FROM ".$this->db->prefix()."user_param";
 			$sql .= " WHERE fk_user = ".((int) $this->id);
 			$sql .= " AND entity = ".((int) $conf->entity);
 			//dol_syslog(get_class($this).'::fetch load personalized conf', LOG_DEBUG);
@@ -661,6 +661,117 @@ class User extends CommonObject
 		return 1;
 	}
 
+	/**
+	 *  Return if a user has a permission.
+	 *  You can use it like this: if ($user->hasRight('module', 'level11')).
+	 *  It replaces old syntax: if ($user->rights->module->level1)
+	 *
+	 * 	@param	int		$module			Module of permission to check
+	 *  @param  string	$permlevel1		Permission level1 (Example: 'read', 'write', 'delete')
+	 *  @param  string	$permlevel2		Permission level2
+	 *  @return int						1 if user has permission, 0 if not.
+	 *  @see	clearrights(), delrights(), getrights(), hasRight()
+	 */
+	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...
+			'project' => 'projet',
+			'shipping' => 'expedition',
+			'task' => 'task@projet',
+			'fichinter' => 'ficheinter',
+			'inventory' => 'stock',
+			'invoice' => 'facture',
+			'invoice_supplier' => 'fournisseur',
+			'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"
+		);
+		if (!empty($moduletomoduletouse[$module])) {
+			$module = $moduletomoduletouse[$module];
+		}
+
+		// If module is abc@module, we check permission user->rights->module->abc->permlevel1
+		$tmp = explode('@', $module, 2);
+		if (! empty($tmp[1])) {
+			$module = $tmp[1];
+			$permlevel2 = $permlevel1;
+			$permlevel1 = $tmp[0];
+		}
+
+		//var_dump($module);
+		//var_dump($this->rights->$module);
+		if (!in_array($module, $conf->modules)) {
+			return 0;
+		}
+
+		// For compatibility with bad naming permissions on permlevel1
+		if ($permlevel1 == 'propale') {
+			$permlevel1 = 'propal';
+		}
+		if ($permlevel1 == 'member') {
+			$permlevel1 = 'adherent';
+		}
+		if ($permlevel1 == 'recruitmentcandidature') {
+			$permlevel1 = 'recruitmentjobposition';
+		}
+
+		//var_dump($module.' '.$permlevel1.' '.$permlevel2);
+		if (empty($module) || empty($this->rights) || empty($this->rights->$module) || 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;
+				}
+				// 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 == 'write' && !empty($this->rights->$module->$permlevel1->creer)) {
+					return $this->rights->$module->create;
+				}
+				if ($permlevel2 == 'write' && !empty($this->rights->$module->$permlevel1->create)) {
+					return $this->rights->$module->create;
+				}
+				if ($permlevel2 == 'delete' && !empty($this->rights->$module->$permlevel1->supprimer)) {
+					return $this->rights->$module->supprimer;
+				}
+			}
+		} else {
+			if (!empty($this->rights->$module->$permlevel1)) {
+				return $this->rights->$module->$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 == 'write' && !empty($this->rights->$module->creer)) {
+				return $this->rights->$module->create;
+			}
+			if ($permlevel1 == 'write' && !empty($this->rights->$module->create)) {
+				return $this->rights->$module->create;
+			}
+			if ($permlevel1 == 'delete' && !empty($this->rights->$module->supprimer)) {
+				return $this->rights->$module->supprimer;
+			}
+		}
+
+		return 0;
+	}
+
 	/**
 	 *  Add a right to the user
 	 *
@@ -670,15 +781,16 @@ class User extends CommonObject
 	 *  @param	int		$entity			Entity to use
 	 *  @param  int	    $notrigger		1=Does not execute triggers, 0=Execute triggers
 	 *  @return int						> 0 if OK, < 0 if KO
-	 *  @see	clearrights(), delrights(), getrights()
+	 *  @see	clearrights(), delrights(), getrights(), hasRight()
 	 */
 	public function addrights($rid, $allmodule = '', $allperms = '', $entity = 0, $notrigger = 0)
 	{
 		global $conf, $user, $langs;
 
-		$entity = (!empty($entity) ? $entity : $conf->entity);
+		$entity = (empty($entity) ? $conf->entity : $entity);
+
+		dol_syslog(get_class($this)."::addrights $rid, $allmodule, $allperms, $entity, $notrigger for user id=".$this->id);
 
-		dol_syslog(get_class($this)."::addrights $rid, $allmodule, $allperms, $entity");
 		$error = 0;
 		$whereforadd = '';
 
@@ -687,9 +799,9 @@ class User extends CommonObject
 		if (!empty($rid)) {
 			$module = $perms = $subperms = '';
 
-			// Si on a demande ajout d'un droit en particulier, on recupere les caracteristiques (module, perms et subperms) de ce droit.
+			// If we ask to add a given permission, we first load properties of this permission (module, perms and subperms).
 			$sql = "SELECT module, perms, subperms";
-			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
+			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE id = ".((int) $rid);
 			$sql .= " AND entity = ".((int) $entity);
 
@@ -707,9 +819,9 @@ class User extends CommonObject
 				dol_print_error($this->db);
 			}
 
-			// Where pour la liste des droits a ajouter
+			// Define the where for the permission to add
 			$whereforadd = "id=".((int) $rid);
-			// Ajout des droits induits
+			// Add also inherited permissions
 			if (!empty($subperms)) {
 				$whereforadd .= " OR (module='".$this->db->escape($module)."' AND perms='".$this->db->escape($perms)."' AND (subperms='lire' OR subperms='read'))";
 			} elseif (!empty($perms)) {
@@ -735,7 +847,7 @@ class User extends CommonObject
 		if (!empty($whereforadd)) {
 			//print "$module-$perms-$subperms";
 			$sql = "SELECT id";
-			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
+			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE entity = ".((int) $entity);
 			if (!empty($whereforadd) && $whereforadd != 'allmodules') {
 				$sql .= " AND (".$whereforadd.")";	// Note: parenthesis are important because whereforadd can contains OR. Also note that $whereforadd is already sanitized
@@ -749,11 +861,11 @@ class User extends CommonObject
 					$obj = $this->db->fetch_object($result);
 					$nid = $obj->id;
 
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".((int) $this->id)." AND fk_id = ".((int) $nid)." AND entity = ".((int) $entity);
+					$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 ".MAIN_DB_PREFIX."user_rights (entity, fk_user, fk_id) VALUES (".((int) $entity).", ".((int) $this->id).", ".((int) $nid).")";
+					$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++;
 					}
@@ -797,7 +909,7 @@ class User extends CommonObject
 	 *  @param	int		$entity		Entity to use
 	 *  @param  int	    $notrigger	1=Does not execute triggers, 0=Execute triggers
 	 *  @return int         		> 0 if OK, < 0 if OK
-	 *  @see	clearrights(), addrights(), getrights()
+	 *  @see	clearrights(), addrights(), getrights(), hasRight()
 	 */
 	public function delrights($rid, $allmodule = '', $allperms = '', $entity = 0, $notrigger = 0)
 	{
@@ -815,7 +927,7 @@ class User extends CommonObject
 			// Si on a demande supression d'un droit en particulier, on recupere
 			// les caracteristiques module, perms et subperms de ce droit.
 			$sql = "SELECT module, perms, subperms";
-			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
+			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE id = '".$this->db->escape($rid)."'";
 			$sql .= " AND entity = ".((int) $entity);
 
@@ -861,7 +973,7 @@ class User extends CommonObject
 		if (!empty($wherefordel)) {
 			//print "$module-$perms-$subperms";
 			$sql = "SELECT id";
-			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
+			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE entity = ".((int) $entity);
 			if (!empty($wherefordel) && $wherefordel != 'allmodules') {
 				$sql .= " AND (".$wherefordel.")";	// Note: parenthesis are important because wherefordel can contains OR. Also note that $wherefordel is already sanitized
@@ -883,7 +995,7 @@ class User extends CommonObject
 					$obj = $this->db->fetch_object($result);
 					$nid = $obj->id;
 
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights";
+					$sql = "DELETE FROM ".$this->db->prefix()."user_rights";
 					$sql .= " WHERE fk_user = ".((int) $this->id)." AND fk_id = ".((int) $nid);
 					$sql .= " AND entity = ".((int) $entity);
 					if (!$this->db->query($sql)) {
@@ -924,7 +1036,7 @@ class User extends CommonObject
 	 *  Clear all permissions array of user
 	 *
 	 *  @return	void
-	 *  @see	getrights()
+	 *  @see	getrights(), hasRight()
 	 */
 	public function clearrights()
 	{
@@ -942,7 +1054,7 @@ class User extends CommonObject
 	 *	@param  string	$moduletag		Limit permission for a particular module ('' by default means load all permissions)
 	 *  @param	int		$forcereload	Force reload of permissions even if they were already loaded (ignore cache)
 	 *	@return	void
-	 *  @see	clearrights(), delrights(), addrights()
+	 *  @see	clearrights(), delrights(), addrights(), hasRight()
 	 */
 	public function getrights($moduletag = '', $forcereload = 0)
 	{
@@ -964,14 +1076,15 @@ class User extends CommonObject
 
 		// First user permissions
 		$sql = "SELECT DISTINCT r.module, r.perms, r.subperms";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user_rights as ur";
-		$sql .= ", ".MAIN_DB_PREFIX."rights_def as r";
+		$sql .= " FROM ".$this->db->prefix()."user_rights as ur,";
+		$sql .= " ".$this->db->prefix()."rights_def as r";
 		$sql .= " WHERE r.id = ur.fk_id";
 		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {
+			// on old version, we use entity defined into table r only
 			$sql .= " AND r.entity IN (0,".(!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? "1," : "").$conf->entity.")";
 		} else {
 			// On table r=rights_def, the unique key is (id, entity) because id is hard coded into module descriptor and insert during module activation.
-			// So we must include the filter on r.entity on both r and ur.
+			// So we must include the filter on entity on both table r. and ur.
 			$sql .= " AND r.entity = ".((int) $conf->entity)." AND ur.entity = ".((int) $conf->entity);
 		}
 		$sql .= " AND ur.fk_user= ".((int) $this->id);
@@ -1025,9 +1138,9 @@ class User extends CommonObject
 
 		// Now permissions of groups
 		$sql = "SELECT DISTINCT r.module, r.perms, r.subperms";
-		$sql .= " FROM ".MAIN_DB_PREFIX."usergroup_rights as gr,";
-		$sql .= " ".MAIN_DB_PREFIX."usergroup_user as gu,";
-		$sql .= " ".MAIN_DB_PREFIX."rights_def as r";
+		$sql .= " FROM ".$this->db->prefix()."usergroup_rights as gr,";
+		$sql .= " ".$this->db->prefix()."usergroup_user as gu,";
+		$sql .= " ".$this->db->prefix()."rights_def as r";
 		$sql .= " WHERE r.id = gr.fk_id";
 		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {
 			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
@@ -1036,9 +1149,12 @@ class User extends CommonObject
 				$sql .= " AND r.entity = ".((int) $conf->entity);
 			}
 		} else {
-			$sql .= " AND gr.entity = ".((int) $conf->entity);
-			$sql .= " AND gu.entity = ".((int) $conf->entity);
-			$sql .= " AND r.entity = ".((int) $conf->entity);
+			$sql .= " AND gr.entity = ".((int) $conf->entity);	// Only groups created in current entity
+			// The entity on the table usergroup_user should be useless and shoumd never be used because it is alreay into gr and r.
+			// but when using MULTICOMPANY_TRANSVERSE_MODE, we may insert record that make rubbish result due to duplicate record of
+			// other entities, so we are forced to add a filter here
+			$sql .= " AND gu.entity IN (0,".$conf->entity.")";
+			$sql .= " AND r.entity = ".((int) $conf->entity);	// Only permission of modules enabled in current entity
 		}
 		$sql .= " AND gr.fk_usergroup = gu.fk_usergroup";
 		$sql .= " AND gu.fk_user = ".((int) $this->id);
@@ -1130,7 +1246,7 @@ class User extends CommonObject
 		$this->db->begin();
 
 		// Save in database
-		$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+		$sql = "UPDATE ".$this->db->prefix()."user";
 		$sql .= " SET statut = ".((int) $status);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 		$result = $this->db->query($sql);
@@ -1191,7 +1307,7 @@ class User extends CommonObject
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 
 		// Remove rights
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".((int) $this->id);
+		$sql = "DELETE FROM ".$this->db->prefix()."user_rights WHERE fk_user = ".((int) $this->id);
 
 		if (!$error && !$this->db->query($sql)) {
 			$error++;
@@ -1199,14 +1315,14 @@ class User extends CommonObject
 		}
 
 		// Remove group
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user WHERE fk_user  = ".((int) $this->id);
+		$sql = "DELETE FROM ".$this->db->prefix()."usergroup_user WHERE fk_user  = ".((int) $this->id);
 		if (!$error && !$this->db->query($sql)) {
 			$error++;
 			$this->error = $this->db->lasterror();
 		}
 
 		// Remove params
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param WHERE fk_user  = ".((int) $this->id);
+		$sql = "DELETE FROM ".$this->db->prefix()."user_param WHERE fk_user  = ".((int) $this->id);
 		if (!$error && !$this->db->query($sql)) {
 			$error++;
 			$this->error = $this->db->lasterror();
@@ -1214,7 +1330,7 @@ class User extends CommonObject
 
 		// If contact, remove link
 		if ($this->contact_id > 0) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET fk_user_creat = null WHERE rowid = ".((int) $this->contact_id);
+			$sql = "UPDATE ".$this->db->prefix()."socpeople SET fk_user_creat = null WHERE rowid = ".((int) $this->contact_id);
 			if (!$error && !$this->db->query($sql)) {
 				$error++;
 				$this->error = $this->db->lasterror();
@@ -1232,7 +1348,7 @@ class User extends CommonObject
 
 		// Remove user
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".((int) $this->id);
+			$sql = "DELETE FROM ".$this->db->prefix()."user WHERE rowid = ".((int) $this->id);
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			if (!$this->db->query($sql)) {
 				$error++;
@@ -1281,6 +1397,8 @@ class User extends CommonObject
 
 		dol_syslog(get_class($this)."::create login=".$this->login.", user=".(is_object($user) ? $user->id : ''), LOG_DEBUG);
 
+		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', ',@<>"\'');
+
 		// Check parameters
 		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {
 			$langs->load("errors");
@@ -1291,7 +1409,7 @@ class User extends CommonObject
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
 			return -1;
-		} elseif (preg_match('/[,@<>"\']/', $this->login)) {
+		} elseif (preg_match('/['.preg_quote($badCharUnauthorizedIntoLoginName, '/').']/', $this->login)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadCharIntoLoginName");
 			return -1;
@@ -1304,7 +1422,7 @@ class User extends CommonObject
 
 		// Check if login already exists in same entity or into entity 0.
 		if ($this->login) {
-			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND login = '".$this->db->escape($this->login)."'";
+			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND login = '".$this->db->escape($this->login)."'";
 			$resqltochecklogin = $this->db->query($sqltochecklogin);
 			if ($resqltochecklogin) {
 				$objtochecklogin = $this->db->fetch_object($resqltochecklogin);
@@ -1318,8 +1436,8 @@ class User extends CommonObject
 				$this->db->free($resqltochecklogin);
 			}
 		}
-		if ($this->email !== '') {
-			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND email = '".$this->db->escape($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) {
 				$objtochecklogin = $this->db->fetch_object($resqltochecklogin);
@@ -1335,13 +1453,13 @@ class User extends CommonObject
 		}
 
 		// Insert into database
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec, login, ldap_sid, entity)";
-		$sql .= " VALUES('".$this->db->idate($this->datec)."','".$this->db->escape($this->login)."','".$this->db->escape($this->ldap_sid)."',".$this->db->escape($this->entity).")";
+		$sql = "INSERT INTO ".$this->db->prefix()."user (datec, login, ldap_sid, entity)";
+		$sql .= " VALUES('".$this->db->idate($this->datec)."', '".$this->db->escape($this->login)."', '".$this->db->escape($this->ldap_sid)."', ".((int) $this->entity).")";
 		$result = $this->db->query($sql);
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		if ($result) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."user");
+			$this->id = $this->db->last_insert_id($this->db->prefix()."user");
 
 			// Set default rights
 			if ($this->set_default_rights() < 0) {
@@ -1443,7 +1561,7 @@ class User extends CommonObject
 		// Create user and set $this->id. Trigger is disabled because executed later.
 		$result = $this->create($user, 1);
 		if ($result > 0) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+			$sql = "UPDATE ".$this->db->prefix()."user";
 			$sql .= " SET fk_socpeople=".((int) $contact->id);
 			$sql .= ", civility='".$this->db->escape($contact->civility_code)."'";
 			if ($contact->socid > 0) {
@@ -1531,7 +1649,7 @@ class User extends CommonObject
 					$result = -2;
 				}
 			} elseif (!empty($this->pass_crypted)) {	// If a crypted password is already known, we save it directly into database because the previous create did not save it.
-				$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+				$sql = "UPDATE ".$this->db->prefix()."user";
 				$sql .= " SET pass_crypted = '".$this->db->escape($this->pass_crypted)."'";
 				$sql .= " WHERE rowid=".((int) $this->id);
 
@@ -1542,7 +1660,7 @@ class User extends CommonObject
 			}
 
 			if ($result > 0 && $member->fk_soc) {	// If member is linked to a thirdparty
-				$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+				$sql = "UPDATE ".$this->db->prefix()."user";
 				$sql .= " SET fk_soc=".((int) $member->fk_soc);
 				$sql .= " WHERE rowid=".((int) $this->id);
 
@@ -1583,7 +1701,7 @@ class User extends CommonObject
 
 		$rd = array();
 		$num = 0;
-		$sql = "SELECT id FROM ".MAIN_DB_PREFIX."rights_def";
+		$sql = "SELECT id FROM ".$this->db->prefix()."rights_def";
 		$sql .= " WHERE bydefault = 1";
 		$sql .= " AND entity = ".((int) $conf->entity);
 
@@ -1600,10 +1718,10 @@ class User extends CommonObject
 		}
 		$i = 0;
 		while ($i < $num) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = $this->id AND fk_id=$rd[$i]";
+			$sql = "DELETE FROM ".$this->db->prefix()."user_rights WHERE fk_user = $this->id AND fk_id=$rd[$i]";
 			$result = $this->db->query($sql);
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (fk_user, fk_id) VALUES ($this->id, $rd[$i])";
+			$sql = "INSERT INTO ".$this->db->prefix()."user_rights (fk_user, fk_id) VALUES ($this->id, $rd[$i])";
 			$result = $this->db->query($sql);
 			if (!$result) {
 				return -1;
@@ -1675,6 +1793,8 @@ class User extends CommonObject
 		$this->fk_warehouse = (int) $this->fk_warehouse;
 
 		// Check parameters
+		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', ',@<>"\'');
+
 		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadEMail", $this->email);
@@ -1684,7 +1804,7 @@ class User extends CommonObject
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFieldRequired", 'Login');
 			return -1;
-		} elseif (preg_match('/[,@<>"\']/', $this->login)) {
+		} elseif (preg_match('/['.preg_quote($badCharUnauthorizedIntoLoginName, '/').']/', $this->login)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadCharIntoLoginName");
 			return -1;
@@ -1694,7 +1814,7 @@ class User extends CommonObject
 
 		// Check if login already exists in same entity or into entity 0.
 		if (!empty($this->oldcopy) && $this->oldcopy->login != $this->login) {
-			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND login = '".$this->db->escape($this->login)."'";
+			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND login = '".$this->db->escape($this->login)."'";
 			$resqltochecklogin = $this->db->query($sqltochecklogin);
 			if ($resqltochecklogin) {
 				$objtochecklogin = $this->db->fetch_object($resqltochecklogin);
@@ -1707,8 +1827,8 @@ class User extends CommonObject
 				}
 			}
 		}
-		if (!empty($this->oldcopy) && $this->email !== '' && $this->oldcopy->email != $this->email) {
-			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND email = '".$this->db->escape($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) {
 				$objtochecklogin = $this->db->fetch_object($resqltochecklogin);
@@ -1723,7 +1843,7 @@ class User extends CommonObject
 		}
 
 		// Update datas
-		$sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
+		$sql = "UPDATE ".$this->db->prefix()."user SET";
 		$sql .= " civility = '".$this->db->escape($this->civility_code)."'";
 		$sql .= ", lastname = '".$this->db->escape($this->lastname)."'";
 		$sql .= ", firstname = '".$this->db->escape($this->firstname)."'";
@@ -1792,10 +1912,10 @@ class User extends CommonObject
 			// Update password
 			if (!empty($this->pass)) {
 				if ($this->pass != $this->pass_indatabase && $this->pass != $this->pass_indatabase_crypted) {
-					// Si mot de passe saisi et different de celui en base
+					// If a new value for password is set and different than the one crypted into database
 					$result = $this->setPassword($user, $this->pass, 0, $notrigger, $nosyncmemberpass);
-					if (!$nbrowsaffected) {
-						$nbrowsaffected++;
+					if ($result < 0) {
+						return -5;
 					}
 				}
 			}
@@ -1803,7 +1923,7 @@ class User extends CommonObject
 			// If user is linked to a member, remove old link to this member
 			if ($this->fk_member > 0) {
 				dol_syslog(get_class($this)."::update remove link with member. We will recreate it later", LOG_DEBUG);
-				$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL where fk_member = ".((int) $this->fk_member);
+				$sql = "UPDATE ".$this->db->prefix()."user SET fk_member = NULL where fk_member = ".((int) $this->fk_member);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$this->error = $this->db->error(); $this->db->rollback(); return -5;
@@ -1811,7 +1931,7 @@ class User extends CommonObject
 			}
 			// Set link to user
 			dol_syslog(get_class($this)."::update set link with member", LOG_DEBUG);
-			$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member =".($this->fk_member > 0 ? ((int) $this->fk_member) : 'null')." where rowid = ".((int) $this->id);
+			$sql = "UPDATE ".$this->db->prefix()."user SET fk_member =".($this->fk_member > 0 ? ((int) $this->fk_member) : 'null')." where rowid = ".((int) $this->id);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$this->error = $this->db->error(); $this->db->rollback(); return -5;
@@ -1969,7 +2089,7 @@ class User extends CommonObject
 		// phpcs:enable
 		$now = dol_now();
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
+		$sql = "UPDATE ".$this->db->prefix()."user SET";
 		$sql .= " datepreviouslogin = datelastlogin,";
 		$sql .= " datelastlogin = '".$this->db->idate($now)."',";
 		$sql .= " tms = tms"; // La date de derniere modif doit changer sauf pour la mise a jour de date de derniere connexion
@@ -1997,7 +2117,7 @@ class User extends CommonObject
 	 *	@param	int		$notrigger				1=Does not launch triggers
 	 *	@param	int		$nosyncmember	        Do not synchronize linked member
 	 *  @param	int		$passwordalreadycrypted 0=Value is cleartext password, 1=Value is crypted value.
-	 *  @return string 			          		If OK return clear password, 0 if no change, < 0 if error
+	 *  @return string 			          		If OK return clear password, 0 if no change (warning, you may retreive 1 instead of 0 even if password was same), < 0 if error
 	 */
 	public function setPassword($user, $password = '', $changelater = 0, $notrigger = 0, $nosyncmember = 0, $passwordalreadycrypted = 0)
 	{
@@ -2013,8 +2133,30 @@ class User extends CommonObject
 			$password = getRandomPassword(false);
 		}
 
-		// Crypt password
+		// Check and encrypt the password
 		if (empty($passwordalreadycrypted)) {
+			if (!empty($conf->global->USER_PASSWORD_GENERATED)) {
+				// Add a check on rules for password syntax using the setup of the password generator
+				$modGeneratePassClass = 'modGeneratePass'.ucfirst($conf->global->USER_PASSWORD_GENERATED);
+
+				include_once DOL_DOCUMENT_ROOT.'/core/modules/security/generate/'.$modGeneratePassClass.'.class.php';
+				if (class_exists($modGeneratePassClass)) {
+					$modGeneratePass = new $modGeneratePassClass($this->db, $conf, $langs, $user);
+
+					// To check an input user password, we disable the cleaning on ambiguous characters (this is used only for auto-generated password)
+					$modGeneratePass->WithoutAmbi = 0;
+
+					// Call to validatePassword($password) to check pass match rules
+					$testpassword = $modGeneratePass->validatePassword($password);
+					if (!$testpassword) {
+						$this->error = $modGeneratePass->error;
+						return -1;
+					}
+				}
+			}
+
+
+			// Now, we encrypt the new password
 			$password_crypted = dol_hash($password);
 		}
 
@@ -2026,7 +2168,7 @@ class User extends CommonObject
 
 			$this->db->begin();
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+			$sql = "UPDATE ".$this->db->prefix()."user";
 			$sql .= " SET pass_crypted = '".$this->db->escape($password_crypted)."',";
 			$sql .= " pass_temp = null";
 			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
@@ -2090,7 +2232,7 @@ class User extends CommonObject
 		} else {
 			// We store password in password temporary field.
 			// After receiving confirmation link, we will erase and store it in pass_crypted
-			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+			$sql = "UPDATE ".$this->db->prefix()."user";
 			$sql .= " SET pass_temp = '".$this->db->escape($password)."'";
 			$sql .= " WHERE rowid = ".((int) $this->id);
 
@@ -2156,6 +2298,8 @@ class User extends CommonObject
 
 		if (!$changelater) {
 			$url = $urlwithroot.'/';
+			if (!empty($conf->global->URL_REDIRECTION_AFTER_CHANGEPASSWORD))
+				$url = $conf->global->URL_REDIRECTION_AFTER_CHANGEPASSWORD;
 			$mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived").".\n";
 			$mesg .= $outputlangs->transnoentitiesnoconv("NewKeyIs")." :\n\n";
 			$mesg .= $outputlangs->transnoentitiesnoconv("Login")." = ".$this->login."\n";
@@ -2237,7 +2381,7 @@ class User extends CommonObject
 	{
 		// phpcs:enable
 		$sql = "SELECT url, login, pass, poste ";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user_clicktodial as u";
+		$sql .= " FROM ".$this->db->prefix()."user_clicktodial as u";
 		$sql .= " WHERE u.fk_user = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
@@ -2272,13 +2416,13 @@ class User extends CommonObject
 		// phpcs:enable
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_clicktodial";
+		$sql = "DELETE FROM ".$this->db->prefix()."user_clicktodial";
 		$sql .= " WHERE fk_user = ".((int) $this->id);
 
 		dol_syslog(get_class($this).'::update_clicktodial', LOG_DEBUG);
 		$result = $this->db->query($sql);
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_clicktodial";
+		$sql = "INSERT INTO ".$this->db->prefix()."user_clicktodial";
 		$sql .= " (fk_user,url,login,pass,poste)";
 		$sql .= " VALUES (".$this->id;
 		$sql .= ", '".$this->db->escape($this->clicktodial_url)."'";
@@ -2317,14 +2461,14 @@ class User extends CommonObject
 
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user";
+		$sql = "DELETE FROM ".$this->db->prefix()."usergroup_user";
 		$sql .= " WHERE fk_user  = ".((int) $this->id);
 		$sql .= " AND fk_usergroup = ".((int) $group);
 		$sql .= " AND entity = ".((int) $entity);
 
 		$result = $this->db->query($sql);
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."usergroup_user (entity, fk_user, fk_usergroup)";
+		$sql = "INSERT INTO ".$this->db->prefix()."usergroup_user (entity, fk_user, fk_usergroup)";
 		$sql .= " VALUES (".((int) $entity).",".((int) $this->id).",".((int) $group).")";
 
 		$result = $this->db->query($sql);
@@ -2374,7 +2518,7 @@ class User extends CommonObject
 
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user";
+		$sql = "DELETE FROM ".$this->db->prefix()."usergroup_user";
 		$sql .= " WHERE fk_user  = ".((int) $this->id);
 		$sql .= " AND fk_usergroup = ".((int) $group);
 		$sql .= " AND entity = ".((int) $entity);
@@ -2461,9 +2605,10 @@ class User extends CommonObject
 		$companylink = '';
 
 		if (!empty($this->photo)) {
-			$label .= '<div class="photointooltip">';
-			$label .= Form::showphoto('userphoto', $this, 0, 60, 0, '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><div style="clear: both;"></div>';
+			$label .= '<div class="photointooltip floatright">';
+			$label .= Form::showphoto('userphoto', $this, 0, 60, 0, '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>';
 		}
 
 		// Info Login
@@ -2684,7 +2829,7 @@ class User extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->statut, $mode);
+		return $this->LibStatut(isset($this->statut) ? $this->statut : $this->status, $mode);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2703,10 +2848,10 @@ class User extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
-			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled');
-			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled');
-			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled');
+			$this->labelStatus[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatus[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
 		}
 
 		$statusType = 'status5';
@@ -2795,7 +2940,7 @@ class User extends CommonObject
 			}
 		}
 		foreach ($socialnetworks as $key => $value) {
-			if ($this->socialnetworks[$value['label']] && !empty($conf->global->{'LDAP_FIELD_'.strtoupper($value['label'])})) {
+			if (!empty($this->socialnetworks[$value['label']]) && !empty($conf->global->{'LDAP_FIELD_'.strtoupper($value['label'])})) {
 				$info[$conf->global->{'LDAP_FIELD_'.strtoupper($value['label'])}] = $this->socialnetworks[$value['label']];
 			}
 		}
@@ -2833,7 +2978,7 @@ class User extends CommonObject
 				$info[$conf->global->LDAP_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte
 			}
 			if (!empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED)) {
-				$info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4); // Create OpenLDAP MD5 password (TODO add type of encryption)
+				$info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 'openldap'); // Create OpenLDAP password (see LDAP_PASSWORD_HASH_TYPE)
 			}
 		} elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') {
 			// Set LDAP password if possible
@@ -2842,7 +2987,7 @@ class User extends CommonObject
 				// Just for the default MD5 !
 				if (empty($conf->global->MAIN_SECURITY_HASH_ALGO)) {
 					if ($this->pass_indatabase_crypted && !empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED)) {
-						$info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass_indatabase_crypted, 5); // Create OpenLDAP MD5 password from Dolibarr MD5 password
+						$info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dolGetLdapPasswordHash($this->pass_indatabase_crypted, 'md5frommd5'); // Create OpenLDAP MD5 password from Dolibarr MD5 password
 					}
 				}
 			} elseif (!empty($this->pass_indatabase)) {
@@ -2851,7 +2996,7 @@ class User extends CommonObject
 					$info[$conf->global->LDAP_FIELD_PASSWORD] = $this->pass_indatabase; // $this->pass_indatabase = mot de passe non crypte
 				}
 				if (!empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED)) {
-					$info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass_indatabase, 4); // md5 for OpenLdap TODO add type of encryption
+					$info[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass_indatabase, 'openldap'); // Create OpenLDAP password (see LDAP_PASSWORD_HASH_TYPE)
 				}
 			}
 		}
@@ -2942,7 +3087,7 @@ class User extends CommonObject
 		$this->personal_mobile = '0999999996';
 		$this->admin = 0;
 		$this->login = 'dolibspec';
-		$this->pass = 'dolibspec';
+		$this->pass = 'dolibSpec+@123';
 		//$this->pass_indatabase='dolibspec';									Set after a fetch
 		//$this->pass_indatabase_crypted='e80ca5a88c892b0aaaf7e154853bccab';	Set after a fetch
 		$this->datec = $now;
@@ -2966,7 +3111,7 @@ class User extends CommonObject
 	{
 		$sql = "SELECT u.rowid, u.login as ref, u.datec,";
 		$sql .= " u.tms as date_modification, u.entity";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+		$sql .= " FROM ".$this->db->prefix()."user as u";
 		$sql .= " WHERE u.rowid = ".((int) $id);
 
 		$result = $this->db->query($sql);
@@ -2997,7 +3142,7 @@ class User extends CommonObject
 	public function getNbOfEMailings()
 	{
 		$sql = "SELECT count(mc.email) as nb";
-		$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
+		$sql .= " FROM ".$this->db->prefix()."mailing_cibles as mc";
 		$sql .= " WHERE mc.email = '".$this->db->escape($this->email)."'";
 		$sql .= " AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec succes
 
@@ -3027,7 +3172,7 @@ class User extends CommonObject
 		global $conf;
 
 		$sql = "SELECT count(rowid) as nb";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user";
+		$sql .= " FROM ".$this->db->prefix()."user";
 		if ($option == 'superadmin') {
 			$sql .= " WHERE entity = 0";
 		} else {
@@ -3105,10 +3250,10 @@ class User extends CommonObject
 	public function get_children()
 	{
 		// phpcs:enable
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."user";
+		$sql = "SELECT rowid FROM ".$this->db->prefix()."user";
 		$sql .= " WHERE fk_user = ".((int) $this->id);
 
-		dol_syslog(get_class($this)."::get_children sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::get_children", LOG_DEBUG);
 		$res = $this->db->query($sql);
 		if ($res) {
 			$users = array();
@@ -3138,7 +3283,7 @@ class User extends CommonObject
 
 		// Load array[child]=parent
 		$sql = "SELECT fk_user as id_parent, rowid as id_son";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user";
+		$sql .= " FROM ".$this->db->prefix()."user";
 		$sql .= " WHERE fk_user <> 0";
 		$sql .= " AND entity IN (".getEntity('user').")";
 
@@ -3185,7 +3330,7 @@ class User extends CommonObject
 
 		// Init $this->users array
 		$sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.fk_soc, u.login, u.email, u.gender, u.admin, u.statut, u.photo, u.entity"; // Distinct reduce pb with old tables with duplicates
-		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+		$sql .= " FROM ".$this->db->prefix()."user as u";
 		// Add fields from hooks
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('printUserListWhere', $parameters); // Note that $action and $object may have been modified by hook
@@ -3368,9 +3513,9 @@ class User extends CommonObject
 		$this->nb = array();
 
 		$sql = "SELECT COUNT(DISTINCT u.rowid) as nb";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+		$sql .= " FROM ".$this->db->prefix()."user as u";
 		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-			$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+			$sql .= ", ".$this->db->prefix()."usergroup_user as ug";
 			$sql .= " WHERE ug.entity IN (".getEntity('usergroup').")";
 			$sql .= " AND ug.fk_user = u.rowid";
 		} else {
@@ -3442,7 +3587,7 @@ class User extends CommonObject
 		}
 
 		$sql = "SELECT rowid, email, user_mobile, civility, lastname, firstname";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user";
+		$sql .= " FROM ".$this->db->prefix()."user";
 		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		$resql = $this->db->query($sql);
@@ -3481,14 +3626,14 @@ class User extends CommonObject
 		global $conf, $user;
 
 		$sql = "SELECT t.rowid";
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t ';
+		$sql .= ' FROM '.$this->db->prefix().$this->table_element.' as t ';
 
 		if ($entityfilter) {
 			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
 					$sql .= " WHERE t.entity IS NOT NULL"; // Show all users
 				} else {
-					$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+					$sql .= ",".$this->db->prefix()."usergroup_user as ug";
 					$sql .= " WHERE ((ug.fk_user = t.rowid";
 					$sql .= " AND ug.entity IN (".getEntity('user')."))";
 					$sql .= " OR t.entity = 0)"; // Show always superadmin
@@ -3505,18 +3650,18 @@ class User extends CommonObject
 		if (!empty($filter)) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
-				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$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;
 				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
@@ -3576,14 +3721,12 @@ class User extends CommonObject
 		global $conf;
 
 		$sql = 'SELECT rowid';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'user';
-
+		$sql .= ' FROM '.$this->db->prefix().'user';
 		if (!empty($conf->global->AGENDA_DISABLE_EXACT_USER_EMAIL_COMPARE_FOR_EXTERNAL_CALENDAR)) {
-			$sql .= ' WHERE email LIKE "%'.$email.'%"';
+			$sql .= " WHERE email LIKE '%".$this->db->escape($email)."%'";
 		} else {
-			$sql .= ' WHERE email = "'.$email.'"';
+			$sql .= " WHERE email = '".$this->db->escape($email)."'";
 		}
-
 		$sql .= ' LIMIT 1';
 
 		$resql = $this->db->query($sql);
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 7323fb93ab2..42164ce8b2c 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -93,12 +93,12 @@ class UserBankAccount extends Account
 	{
 		$now = dol_now();
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rib (fk_user, datec)";
+		$sql = "INSERT INTO ".$this->db->prefix()."user_rib (fk_user, datec)";
 		$sql .= " VALUES (".$this->userid.", '".$this->db->idate($now)."')";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($this->db->affected_rows($resql)) {
-				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."user_rib");
+				$this->id = $this->db->last_insert_id($this->db->prefix()."user_rib");
 
 				return $this->update($user);
 			}
@@ -123,7 +123,7 @@ class UserBankAccount extends Account
 			$this->create();
 		}
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."user_rib SET";
+		$sql = "UPDATE ".$this->db->prefix()."user_rib SET";
 		$sql .= " bank = '".$this->db->escape($this->bank)."'";
 		$sql .= ",code_banque='".$this->db->escape($this->code_banque)."'";
 		$sql .= ",code_guichet='".$this->db->escape($this->code_guichet)."'";
@@ -140,7 +140,7 @@ class UserBankAccount extends Account
 		} else {
 			$sql .= ",label = NULL";
 		}
-		$sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -167,7 +167,7 @@ class UserBankAccount extends Account
 
 		$sql = "SELECT rowid, fk_user, entity, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
 		$sql .= " owner_address, label, datec, tms as datem";
-		$sql .= " FROM ".MAIN_DB_PREFIX."user_rib";
+		$sql .= " FROM ".$this->db->prefix()."user_rib";
 		if ($id) {
 			$sql .= " WHERE rowid = ".((int) $id);
 		}
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index b1b3175aaa9..00e031c33f1 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -191,8 +191,8 @@ class UserGroup extends CommonObject
 		$ret = array();
 
 		$sql = "SELECT g.rowid, ug.entity as usergroup_entity";
-		$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g,";
-		$sql .= " ".MAIN_DB_PREFIX."usergroup_user as ug";
+		$sql .= " FROM ".$this->db->prefix()."usergroup as g,";
+		$sql .= " ".$this->db->prefix()."usergroup_user as ug";
 		$sql .= " WHERE ug.fk_usergroup = g.rowid";
 		$sql .= " AND ug.fk_user = ".((int) $userid);
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {
@@ -241,9 +241,9 @@ class UserGroup extends CommonObject
 		if (!empty($this->id)) {
 			$sql .= ", ug.entity as usergroup_entity";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+		$sql .= " FROM ".$this->db->prefix()."user as u";
 		if (!empty($this->id)) {
-			$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
+			$sql .= ", ".$this->db->prefix()."usergroup_user as ug";
 		}
 		$sql .= " WHERE 1 = 1";
 		if (!empty($this->id)) {
@@ -315,7 +315,7 @@ class UserGroup extends CommonObject
 			// Si on a demande ajout d'un droit en particulier, on recupere
 			// les caracteristiques (module, perms et subperms) de ce droit.
 			$sql = "SELECT module, perms, subperms";
-			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
+			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE id = ".((int) $rid);
 			$sql .= " AND entity = ".((int) $entity);
 
@@ -358,7 +358,7 @@ class UserGroup extends CommonObject
 		if (!empty($whereforadd)) {
 			//print "$module-$perms-$subperms";
 			$sql = "SELECT id";
-			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
+			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE entity = ".((int) $entity);
 			if (!empty($whereforadd) && $whereforadd != 'allmodules') {
 				$sql .= " AND ".$whereforadd;
@@ -372,11 +372,11 @@ class UserGroup extends CommonObject
 					$obj = $this->db->fetch_object($result);
 					$nid = $obj->id;
 
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights WHERE fk_usergroup = ".((int) $this->id)." AND fk_id=".((int) $nid)." AND entity = ".((int) $entity);
+					$sql = "DELETE FROM ".$this->db->prefix()."usergroup_rights WHERE fk_usergroup = ".((int) $this->id)." AND fk_id=".((int) $nid)." AND entity = ".((int) $entity);
 					if (!$this->db->query($sql)) {
 						$error++;
 					}
-					$sql = "INSERT INTO ".MAIN_DB_PREFIX."usergroup_rights (entity, fk_usergroup, fk_id) VALUES (".((int) $entity).", ".((int) $this->id).", ".((int) $nid).")";
+					$sql = "INSERT INTO ".$this->db->prefix()."usergroup_rights (entity, fk_usergroup, fk_id) VALUES (".((int) $entity).", ".((int) $this->id).", ".((int) $nid).")";
 					if (!$this->db->query($sql)) {
 						$error++;
 					}
@@ -437,7 +437,7 @@ class UserGroup extends CommonObject
 			// Si on a demande supression d'un droit en particulier, on recupere
 			// les caracteristiques module, perms et subperms de ce droit.
 			$sql = "SELECT module, perms, subperms";
-			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
+			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE id = ".((int) $rid);
 			$sql .= " AND entity = ".((int) $entity);
 
@@ -485,7 +485,7 @@ class UserGroup extends CommonObject
 		if (!empty($wherefordel)) {
 			//print "$module-$perms-$subperms";
 			$sql = "SELECT id";
-			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
+			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE entity = ".((int) $entity);
 			if (!empty($wherefordel) && $wherefordel != 'allmodules') {
 				$sql .= " AND ".$wherefordel;
@@ -503,7 +503,7 @@ class UserGroup extends CommonObject
 						$nid = $obj->id;
 					}
 
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights";
+					$sql = "DELETE FROM ".$this->db->prefix()."usergroup_rights";
 					$sql .= " WHERE fk_usergroup = $this->id AND fk_id=".((int) $nid);
 					$sql .= " AND entity = ".((int) $entity);
 					if (!$this->db->query($sql)) {
@@ -564,7 +564,7 @@ class UserGroup extends CommonObject
 		 * Recuperation des droits
 		 */
 		$sql = "SELECT r.module, r.perms, r.subperms ";
-		$sql .= " FROM ".MAIN_DB_PREFIX."usergroup_rights as u, ".MAIN_DB_PREFIX."rights_def as r";
+		$sql .= " FROM ".$this->db->prefix()."usergroup_rights as u, ".$this->db->prefix()."rights_def as r";
 		$sql .= " WHERE r.id = u.fk_id";
 		$sql .= " AND r.entity = ".((int) $conf->entity);
 		$sql .= " AND u.entity = ".((int) $conf->entity);
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 79450f2d811..2207e3358ae 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -119,7 +119,7 @@ if ($id > 0) {
 			print '<input name="url" value="'.(!empty($object->clicktodial_url) ? $object->clicktodial_url : '').'" size="92">';
 			if (empty($conf->global->CLICKTODIAL_URL) && empty($object->clicktodial_url)) {
 				$langs->load("errors");
-				print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
+				print '<span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</span>';
 			} else {
 				print ' &nbsp; &nbsp; '.$form->textwithpicto($langs->trans("KeepEmptyToUseDefault").': '.$conf->global->CLICKTODIAL_URL, $langs->trans("ClickToDialUrlDesc"));
 			}
@@ -158,7 +158,7 @@ if ($id > 0) {
 			}
 			if (empty($url)) {
 				$langs->load("errors");
-				print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
+				print '<span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</span>';
 			} else {
 				print $form->textwithpicto((empty($object->clicktodial_url) ? '<span class="opacitymedium">'.$langs->trans("DefaultLink").':</span> ' : '').$url, $langs->trans("ClickToDialUrlDesc"));
 			}
@@ -200,7 +200,7 @@ if ($id > 0) {
 	print '<div class="tabsAction">';
 
 	if (!empty($user->admin) && $action <> 'edit') {
-		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 	}
 
 	print "</div>\n";
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index a5d88d04c5d..142c44d85fe 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -60,7 +60,7 @@ if ($id) {
 	|| (($user->id != $id) && $user->rights->user->user->password));
 }
 
-$permissiontoadd = $caneditfield;
+$permissiontoadd = $caneditfield;	// Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
 $permtoedit = $caneditfield;
 
 // Security check
@@ -78,8 +78,8 @@ if ($user->id <> $id && !$canreaduser) {
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -107,6 +107,7 @@ if ($id > 0 || !empty($ref)) {
 $hookmanager->initHooks(array('usercard', 'userdoc', 'globalcard'));
 
 
+
 /*
  * Actions
  */
@@ -139,8 +140,6 @@ if ($object->id) {
 	}
 	$head = user_prepare_head($object);
 
-	$form = new Form($db);
-
 	print dol_get_fiche_head($head, 'document', $langs->trans("User"), -1, 'user');
 
 	$linkback = '';
@@ -164,7 +163,25 @@ if ($object->id) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Login
-	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+	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>';
 
 	// Nunber of files
 	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 2ce8c6136db..c3e0e00fdf6 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -96,7 +96,7 @@ if (empty($reshook)) {
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = dol_buildpath('/user/group/card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+				$backtopage = DOL_URL_ROOT.'/user/group/card.php?id='.($id > 0 ? $id : '__ID__');
 			}
 		}
 	}
@@ -237,7 +237,7 @@ if (empty($reshook)) {
 	}
 
 	// Actions to build doc
-	$upload_dir = $conf->usergroup->dir_output;
+	$upload_dir = $conf->user->dir_output.'/usergroups';
 	$permissiontoadd = $user->rights->user->user->creer;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
@@ -380,11 +380,11 @@ if ($action == 'create') {
 			}
 
 			if ($caneditperms) {
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit&amp;token='.newToken().'">'.$langs->trans("Modify").'</a>';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 			}
 
 			if ($candisableperms) {
-				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.'&amp;token='.newToken().'">'.$langs->trans("DeleteGroup").'</a>';
+				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans("DeleteGroup").'</a>';
 			}
 
 			print "</div>\n";
@@ -418,7 +418,7 @@ if ($action == 'create') {
 					print $form->select_dolusers('', 'user', 1, $exclude, 0, '', '', $object->entity, 0, 0, '', 0, '', 'minwidth200 maxwidth500');
 					print ' &nbsp; ';
 					print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
-					print '<input type="submit" class="button buttongen" value="'.$langs->trans("Add").'">';
+					print '<input type="submit" class="button buttongen button-add" value="'.$langs->trans("Add").'">';
 					print '</td></tr>'."\n";
 					print '</table></form>'."\n";
 					print '<br>';
@@ -478,7 +478,7 @@ if ($action == 'create') {
 			 */
 
 			$filename = dol_sanitizeFileName($object->ref);
-			$filedir = $conf->usergroup->dir_output."/".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;
@@ -489,14 +489,14 @@ if ($action == 'create') {
 			$linktoelem = $form->showLinkToObjectBlock($object, null, null);
 			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
-			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+			print '</div><div class="fichehalfright">';
 
 			// List of actions on element
 			/*include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'usergroup', $socid, 1);*/
 
-			print '</div></div></div>';
+			print '</div></div>';
 		}
 
 		/*
@@ -535,9 +535,7 @@ if ($action == 'create') {
 
 			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->buttonsSaveCancel();
 
 			print '</form>';
 		}
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 458978d25ea..af28b979225 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -46,13 +46,13 @@ $object->fetch($id);
 $object->getrights();
 
 // Users/Groups management only in master entity if transverse mode
-if (!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) {
+if (!empty($conf->multicompany->enabled) && $conf->entity > 1 && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 	accessforbidden();
 }
 
 $canreadperms = true;
 if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-	$canreadperms = ($user->admin || $user->rights->user->group_advance->read);
+	$canreadperms = (!empty($user->admin) || !empty($user->rights->user->group_advance->read));
 }
 
 
@@ -100,7 +100,7 @@ print dol_get_fiche_head($head, 'ldap', $langs->trans("Group"), -1, 'group');
 
 $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, (!empty($user->rights->user->user->lire) || !empty($user->admin)));
 
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
@@ -125,15 +125,15 @@ print '</td>';
 print "</tr>\n";
 
 // LDAP DN
-print '<tr><td>LDAP '.$langs->trans("LDAPGroupDn").'</td><td class="valeur">'.$conf->global->LDAP_GROUP_DN."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPGroupDn").'</td><td class="valeur">'.getDolGlobalString('LDAP_GROUP_DN')."</td></tr>\n";
 
 // LDAP Cle
-print '<tr><td>LDAP '.$langs->trans("LDAPNamingAttribute").'</td><td class="valeur">'.$conf->global->LDAP_KEY_GROUPS."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPNamingAttribute").'</td><td class="valeur">'.getDolGlobalString('LDAP_KEY_GROUPS')."</td></tr>\n";
 
 // LDAP Server
-print '<tr><td>LDAP '.$langs->trans("LDAPPrimaryServer").'</td><td class="valeur">'.$conf->global->LDAP_SERVER_HOST."</td></tr>\n";
-print '<tr><td>LDAP '.$langs->trans("LDAPSecondaryServer").'</td><td class="valeur">'.$conf->global->LDAP_SERVER_HOST_SLAVE."</td></tr>\n";
-print '<tr><td>LDAP '.$langs->trans("LDAPServerPort").'</td><td class="valeur">'.$conf->global->LDAP_SERVER_PORT."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPPrimaryServer").'</td><td class="valeur">'.getDolGlobalString('LDAP_SERVER_HOST')."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPSecondaryServer").'</td><td class="valeur">'.getDolGlobalString('LDAP_SERVER_HOST_SLAVE')."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPServerPort").'</td><td class="valeur">'.getDolGlobalString('LDAP_SERVER_PORT')."</td></tr>\n";
 
 print "</table>\n";
 
@@ -147,13 +147,13 @@ print dol_get_fiche_end();
  */
 print '<div class="tabsAction">';
 
-if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') {
+if (getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
 }
 
 print "</div>\n";
 
-if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') {
+if (getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 	print "<br>\n";
 }
 
@@ -184,15 +184,14 @@ if ($result > 0) {
 	// Show tree
 	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
 		if (!is_array($records)) {
-			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
+			print '<tr class="oddeven"><td colspan="2"><span class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</span></td></tr>';
 		} else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
 		}
 	} else {
-		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
+		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.dol_escape_htmltag($dn).' - search='.dol_escape_htmltag($search).')</td></tr>';
 	}
 	$ldap->unbind();
-	$ldap->close();
 } else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index e2c419b0543..478e345f2e3 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -248,9 +248,9 @@ if ($object->id > 0) {
 	print '<td>'.$langs->trans("Module").'</td>';
 	if ($caneditperms) {
 		print '<td class="center nowrap">';
-		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module=allmodules&amp;confirm=yes&amp;token='.newToken().'">'.$langs->trans("All")."</a>";
+		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addrights&token='.newToken().'&entity='.$entity.'&module=allmodules&confirm=yes">'.$langs->trans("All")."</a>";
 		print '/';
-		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module=allmodules&amp;confirm=yes&amp;token='.newToken().'">'.$langs->trans("None")."</a>";
+		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delrights&&token='.newToken().'&entity='.$entity.'&module=allmodules&confirm=yes">'.$langs->trans("None")."</a>";
 		print '</td>';
 	}
 	print '<td class="center" width="24">&nbsp;</td>';
@@ -302,9 +302,9 @@ if ($object->id > 0) {
 				print '</td>';
 				if ($caneditperms) {
 					print '<td class="center nowrap">';
-					print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.$langs->trans("All").'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'&amp;token='.newToken().'">'.$langs->trans("All")."</a>";
+					print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.$langs->trans("All").'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addrights&entity='.$entity.'&module='.$obj->module.'&token='.newToken().'">'.$langs->trans("All")."</a>";
 					print '/';
-					print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.$langs->trans("None").'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'&amp;token='.newToken().'">'.$langs->trans("None")."</a>";
+					print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.$langs->trans("None").'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delrights&entity='.$entity.'&module='.$obj->module.'&token='.newToken().'">'.$langs->trans("None")."</a>";
 					print '</td>';
 				} else {
 					print '<td>&nbsp;</td>';
@@ -332,7 +332,7 @@ if ($object->id > 0) {
 				if (in_array($obj->id, $permsgroupbyentity[$entity])) {
 					// Own permission by group
 					if ($caneditperms) {
-						print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">';
+						print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delrights&token='.newToken().'&entity='.$entity.'&rights='.$obj->id.'&confirm=yes">';
 						//print img_edit_remove($langs->trans("Remove"));
 						print img_picto($langs->trans("Remove"), 'switch_on');
 						print '</a></td>';
@@ -343,7 +343,7 @@ if ($object->id > 0) {
 				} else {
 					// Do not own permission
 					if ($caneditperms) {
-						print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">';
+						print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addrights&token='.newToken().'&entity='.$entity.'&rights='.$obj->id.'&confirm=yes">';
 						//print img_edit_add($langs->trans("Add"));
 						print img_picto($langs->trans("Add"), 'switch_off');
 						print '</a></td>';
@@ -353,7 +353,7 @@ if ($object->id > 0) {
 			} else {
 				// Do not own permission
 				if ($caneditperms) {
-					print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">';
+					print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addrights&entity='.$entity.'&rights='.$obj->id.'&confirm=yes&token='.newToken().'">';
 					//print img_edit_add($langs->trans("Add"));
 					print img_picto($langs->trans("Add"), 'switch_off');
 					print '</a></td>';
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 0413fda69b0..66f4fa4b21b 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -127,7 +127,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 		} elseif ($userstatic->admin) {
 			$li .= img_picto($langs->trans("Administrator"), 'star');
 		}
-		$li .= ' ('.$val['login'].($entitystring ? ' - '.$entitystring : '').')';
+		$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>';
 
@@ -154,7 +154,11 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 	$param = array('morecss'=>'marginleftonly btnTitleSelected');
 	$morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $param);
 
-	print load_fiche_titre($title, $morehtmlright.' '.$newcardbutton, 'user');
+	$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 '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 	if ($optioncss != '') {
@@ -167,6 +171,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 	print '<input type="hidden" name="mode" value="'.$mode.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
+	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">';
 
 	print '<tr class="liste_titre_filter">';
@@ -174,7 +179,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 	print '<td class="liste_titre">&nbsp;</td>';
 	// Status
 	print '<td class="liste_titre right">';
-	print $form->selectarray('search_statut', array('-1'=>'', '1'=>$langs->trans('Enabled')), $search_statut);
+	print $form->selectarray('search_statut', array('-1'=>'', '1'=>$langs->trans('Enabled')), $search_statut, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
 	print '</td>';
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterAndCheckAddButtons(0);
@@ -184,7 +189,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("HierarchicView");
-	print_liste_field_titre('<div id="iddivjstreecontrol"><a href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a> | <a href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a></div>', $_SERVER['PHP_SELF'], "", '', "", 'align="center"');
+	print_liste_field_titre('<div id="iddivjstreecontrol"><a href="#">'.img_picto('', 'folder', 'class="paddingright"').'<span class="hideonsmartphone">'.$langs->trans("UndoExpandAll").'</span></a> | <a href="#">'.img_picto('', 'folder-open', 'class="paddingright"').'<span class="hideonsmartphone">'.$langs->trans("ExpandAll").'</span></a></div>', $_SERVER['PHP_SELF'], "", '', "", 'align="center"');
 	print_liste_field_titre("Status", $_SERVER['PHP_SELF'], "", '', "", 'align="right"');
 	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', '', '', 'maxwidthsearch ');
 	print '</tr>';
@@ -213,11 +218,13 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 	}
 
 	print "</table>";
+	print '</div>';
+
 	print "</form>\n";
 }
 
 //
-/*print '<script type="text/javascript" language="javascript">
+/*print '<script type="text/javascript">
 jQuery(document).ready(function() {
 	function init_myfunc()
 	{
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 924dceb14ab..c8dbdf2c1b8 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -137,11 +137,11 @@ $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
 
-	$lastcreatedbox .='<div class="div-table-responsive-no-min">';
-	$lastcreatedbox .='<table class="noborder centpercent">';
-	$lastcreatedbox .='<tr class="liste_titre"><td colspan="3">'.$langs->trans("LastUsersCreated", min($num, $max)).'</td>';
-	$lastcreatedbox .='<td class="right" colspan="2"><a class="commonlink" href="'.DOL_URL_ROOT.'/user/list.php?sortfield=u.datec&sortorder=DESC">'.$langs->trans("FullList").'</td>';
-	$lastcreatedbox .='</tr>'."\n";
+	$lastcreatedbox .= '<div class="div-table-responsive-no-min">';
+	$lastcreatedbox .= '<table class="noborder centpercent">';
+	$lastcreatedbox .= '<tr class="liste_titre"><td colspan="3">'.$langs->trans("LastUsersCreated", min($num, $max)).'</td>';
+	$lastcreatedbox .= '<td class="right" colspan="2"><a class="commonlink" href="'.DOL_URL_ROOT.'/user/list.php?sortfield=u.datec&sortorder=DESC">'.$langs->trans("FullList").'</td>';
+	$lastcreatedbox .= '</tr>'."\n";
 	$i = 0;
 
 	while ($i < $num && $i < $max) {
@@ -162,24 +162,24 @@ if ($resql) {
 		$companystatic->code_client = $obj->code_client;
 		$companystatic->canvas = $obj->canvas;
 
-		$lastcreatedbox .='<tr class="oddeven">';
-		$lastcreatedbox .='<td class="nowraponall">';
-		$lastcreatedbox .=$fuserstatic->getNomUrl(-1);
+		$lastcreatedbox .= '<tr class="oddeven">';
+		$lastcreatedbox .= '<td class="nowraponall">';
+		$lastcreatedbox .= $fuserstatic->getNomUrl(-1);
 		if (!empty($conf->multicompany->enabled) && $obj->admin && !$obj->entity) {
-			$lastcreatedbox .=img_picto($langs->trans("SuperAdministrator"), 'redstar');
+			$lastcreatedbox .= img_picto($langs->trans("SuperAdministrator"), 'redstar');
 		} elseif ($obj->admin) {
-			$lastcreatedbox .=img_picto($langs->trans("Administrator"), 'star');
+			$lastcreatedbox .= img_picto($langs->trans("Administrator"), 'star');
 		}
-		$lastcreatedbox .="</td>";
-		$lastcreatedbox .='<td>'.$obj->login.'</td>';
-		$lastcreatedbox .="<td>";
+		$lastcreatedbox .= "</td>";
+		$lastcreatedbox .= '<td>'.$obj->login.'</td>';
+		$lastcreatedbox .= "<td>";
 		if ($obj->fk_soc) {
-			$lastcreatedbox .=$companystatic->getNomUrl(1);
+			$lastcreatedbox .= $companystatic->getNomUrl(1);
 		} else {
-			$lastcreatedbox .=$langs->trans("InternalUser");
+			$lastcreatedbox .= $langs->trans("InternalUser");
 		}
 		if ($obj->ldap_sid) {
-			$lastcreatedbox .=' ('.$langs->trans("DomainUser").')';
+			$lastcreatedbox .= ' ('.$langs->trans("DomainUser").')';
 		}
 
 		$entity = $obj->entity;
@@ -193,19 +193,19 @@ if ($resql) {
 				$entitystring = $mc->label;
 			}
 		}
-		$lastcreatedbox .=($entitystring ? ' ('.$entitystring.')' : '');
+		$lastcreatedbox .= ($entitystring ? ' ('.$entitystring.')' : '');
 
-		$lastcreatedbox .='</td>';
-		$lastcreatedbox .='<td class="center nowrap">'.dol_print_date($db->jdate($obj->datec), 'dayhour').'</td>';
-		$lastcreatedbox .='<td class="right">';
-		$lastcreatedbox .=$fuserstatic->getLibStatut(3);
-		$lastcreatedbox .='</td>';
+		$lastcreatedbox .= '</td>';
+		$lastcreatedbox .= '<td class="center nowrap">'.dol_print_date($db->jdate($obj->datec), 'dayhour').'</td>';
+		$lastcreatedbox .= '<td class="right">';
+		$lastcreatedbox .= $fuserstatic->getLibStatut(3);
+		$lastcreatedbox .= '</td>';
 
-		$lastcreatedbox .='</tr>';
+		$lastcreatedbox .= '</tr>';
 		$i++;
 	}
-	$lastcreatedbox .="</table>";
-	$lastcreatedbox .="</div><br>";
+	$lastcreatedbox .= "</table>";
+	$lastcreatedbox .= "</div><br>";
 
 	$db->free($resql);
 } else {
@@ -238,11 +238,11 @@ if ($canreadperms) {
 		}
 		$num = $db->num_rows($resql);
 
-		$lastgroupbox .='<div class="div-table-responsive-no-min">';
-		$lastgroupbox .='<table class="noborder centpercent">';
-		$lastgroupbox .='<tr class="liste_titre"><td colspan="'.$colspan.'">'.$langs->trans("LastGroupsCreated", ($num ? $num : $max)).'</td>';
-		$lastgroupbox .='<td class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/user/group/list.php?sortfield=g.datec&sortorder=DESC">'.$langs->trans("FullList").'</td>';
-		$lastgroupbox .='</tr>';
+		$lastgroupbox .= '<div class="div-table-responsive-no-min">';
+		$lastgroupbox .= '<table class="noborder centpercent">';
+		$lastgroupbox .= '<tr class="liste_titre"><td colspan="'.$colspan.'">'.$langs->trans("LastGroupsCreated", ($num ? $num : $max)).'</td>';
+		$lastgroupbox .= '<td class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/user/group/list.php?sortfield=g.datec&sortorder=DESC">'.$langs->trans("FullList").'</td>';
+		$lastgroupbox .= '</tr>';
 		$i = 0;
 
 		$grouptemp = new UserGroup($db);
@@ -254,21 +254,21 @@ if ($canreadperms) {
 			$grouptemp->name = $obj->name;
 			$grouptemp->note = $obj->note;
 
-			$lastgroupbox .='<tr class="oddeven">';
-			$lastgroupbox .='<td>';
-			$lastgroupbox .=$grouptemp->getNomUrl(1);
+			$lastgroupbox .= '<tr class="oddeven">';
+			$lastgroupbox .= '<td>';
+			$lastgroupbox .= $grouptemp->getNomUrl(1);
 			if (!$obj->entity) {
-				$lastgroupbox .=img_picto($langs->trans("GlobalGroup"), 'redstar');
+				$lastgroupbox .= img_picto($langs->trans("GlobalGroup"), 'redstar');
 			}
-			$lastgroupbox .="</td>";
+			$lastgroupbox .= "</td>";
 			if (!empty($conf->multicompany->enabled) && is_object($mc)) {
 				$mc->getInfo($obj->entity);
-				$lastgroupbox .='<td>';
-				$lastgroupbox .=$mc->label;
-				$lastgroupbox .='</td>';
+				$lastgroupbox .= '<td>';
+				$lastgroupbox .= $mc->label;
+				$lastgroupbox .= '</td>';
 			}
-			$lastgroupbox .='<td class="nowrap right">'.dol_print_date($db->jdate($obj->datec), 'dayhour').'</td>';
-			$lastgroupbox .="</tr>";
+			$lastgroupbox .= '<td class="nowrap right">'.dol_print_date($db->jdate($obj->datec), 'dayhour').'</td>';
+			$lastgroupbox .= "</tr>";
 			$i++;
 		}
 		$lastgroupbox .= "</table>";
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index e6cee6f6f73..5e6cf57bfd4 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2006-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2006-2017 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2006-2021 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
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
 $langs->loadLangs(array('users', 'admin', 'companies', 'ldap'));
 
 $id = GETPOST('id', 'int');
+$action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'userldap'; // To manage different context of search
 
 // Security check
@@ -62,7 +63,7 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
-	if ($_GET["action"] == 'dolibarr2ldap') {
+	if ($action == 'dolibarr2ldap') {
 		$ldap = new Ldap();
 		$result = $ldap->connect_bind();
 
@@ -97,7 +98,7 @@ print dol_get_fiche_head($head, 'ldap', $title, 0, 'user');
 
 $linkback = '';
 
-if ($user->rights->user->user->lire || $user->admin) {
+if (!empty($user->rights->user->user->lire) || !empty($user->admin)) {
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 }
 
@@ -129,17 +130,17 @@ if ($conf->global->LDAP_SERVER_TYPE == "activedirectory") {
 }
 
 // LDAP DN
-print '<tr><td>LDAP '.$langs->trans("LDAPUserDn").'</td><td class="valeur">'.$conf->global->LDAP_USER_DN."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPUserDn").'</td><td class="valeur">'.getDolGlobalString('LDAP_USER_DN')."</td></tr>\n";
 
 // LDAP Cle
-print '<tr><td>LDAP '.$langs->trans("LDAPNamingAttribute").'</td><td class="valeur">'.$conf->global->LDAP_KEY_USERS."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPNamingAttribute").'</td><td class="valeur">'.getDolGlobalString('LDAP_KEY_USERS')."</td></tr>\n";
 
 // LDAP Server
-print '<tr><td>LDAP '.$langs->trans("Type").'</td><td class="valeur">'.$conf->global->LDAP_SERVER_TYPE."</td></tr>\n";
-print '<tr><td>LDAP '.$langs->trans("Version").'</td><td class="valeur">'.$conf->global->LDAP_SERVER_PROTOCOLVERSION."</td></tr>\n";
-print '<tr><td>LDAP '.$langs->trans("LDAPPrimaryServer").'</td><td class="valeur">'.$conf->global->LDAP_SERVER_HOST."</td></tr>\n";
-print '<tr><td>LDAP '.$langs->trans("LDAPSecondaryServer").'</td><td class="valeur">'.$conf->global->LDAP_SERVER_HOST_SLAVE."</td></tr>\n";
-print '<tr><td>LDAP '.$langs->trans("LDAPServerPort").'</td><td class="valeur">'.$conf->global->LDAP_SERVER_PORT."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("Type").'</td><td class="valeur">'.getDolGlobalString('LDAP_SERVER_TYPE')."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("Version").'</td><td class="valeur">'.getDolGlobalString('LDAP_SERVER_PROTOCOLVERSION')."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPPrimaryServer").'</td><td class="valeur">'.getDolGlobalString('LDAP_SERVER_HOST')."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPSecondaryServer").'</td><td class="valeur">'.getDolGlobalString('LDAP_SERVER_HOST_SLAVE')."</td></tr>\n";
+print '<tr><td>LDAP '.$langs->trans("LDAPServerPort").'</td><td class="valeur">'.getDolGlobalString('LDAP_SERVER_PORT')."</td></tr>\n";
 
 print '</table>';
 
@@ -152,13 +153,13 @@ print dol_get_fiche_end();
  */
 print '<div class="tabsAction">';
 
-if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') {
+if (getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
 }
 
 print "</div>\n";
 
-if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') {
+if (getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 	print "<br>\n";
 }
 
@@ -189,16 +190,15 @@ if ($result > 0) {
 	// Affichage arbre
 	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
 		if (!is_array($records)) {
-			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
+			print '<tr class="oddeven"><td colspan="2"><span class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</span></td></tr>';
 		} else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
 		}
 	} else {
-		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
+		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.dol_escape_htmltag($dn).' - search='.dol_escape_htmltag($search).')</td></tr>';
 	}
 
 	$ldap->unbind();
-	$ldap->close();
 } else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 3e1a8ff7f6d..cd87e286225 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2021 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015      Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
@@ -336,7 +336,7 @@ $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
@@ -726,7 +726,7 @@ if (!empty($arrayfields['u.tms']['checked'])) {
 if (!empty($arrayfields['u.statut']['checked'])) {
 	// Status
 	print '<td class="liste_titre center">';
-	print $form->selectarray('search_statut', array('-1'=>'', '0'=>$langs->trans('Disabled'), '1'=>$langs->trans('Enabled')), $search_statut);
+	print $form->selectarray('search_statut', array('-1'=>'', '0'=>$langs->trans('Disabled'), '1'=>$langs->trans('Enabled')), $search_statut, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
 	print '</td>';
 }
 // Action column
@@ -858,7 +858,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$canreadhrmdata = 1;
 	}
 	$canreadsecretapi = 0;
-	if ($user->id = $obj->rowid || !empty($user->admin)) {	// Current user or admin
+	if ($user->id == $obj->rowid || !empty($user->admin)) {	// Current user or admin
 		$canreadsecretapi = 1;
 	}
 
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 1ce397626e6..1cf1f112df4 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -112,7 +112,25 @@ if ($id) {
 	print '<table class="border centpercent tableforfield">';
 
 	// Login
-	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+	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>';
 
 	$editenabled = (($action == 'edit') && !empty($user->rights->user->user->creer));
 
@@ -137,11 +155,7 @@ if ($id) {
 	print dol_get_fiche_end();
 
 	if ($action == 'edit') {
-		print '<div class="center">';
-		print '<input type="submit" class="button button-save" name="update" value="'.$langs->trans("Save").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
+		print $form->buttonsSaveCancel();
 	}
 
 
@@ -152,7 +166,7 @@ if ($id) {
 	print '<div class="tabsAction">';
 
 	if ($user->rights->user->user->creer && $action != 'edit') {
-		print "<a class=\"butAction\" href=\"note.php?id=".$object->id."&amp;action=edit\">".$langs->trans('Modify')."</a>";
+		print '<a class="butAction" href="note.php?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans('Modify')."</a>";
 	}
 
 	print "</div>";
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 05b45ebf829..3337d846f0b 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -38,11 +38,11 @@ $id = GETPOST("id", 'int');
 $ref = GETPOST('ref', 'alpha');
 
 $action = GETPOST('action', 'aZ09');
-$actionid = GETPOST('actionid');
+$actionid = GETPOST('actionid', 'int');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (!$sortorder) {
 	$sortorder = "DESC";
@@ -99,8 +99,8 @@ if ($action == 'add') {
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
 		$sql .= " WHERE fk_user=".((int) $id)." AND fk_action=".((int) $actionid);
 		if ($db->query($sql)) {
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_action)";
-			$sql .= " VALUES ('".$db->idate($now)."',".$id.",".$actionid.")";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec, fk_user, fk_action)";
+			$sql .= " VALUES ('".$db->idate($now)."', ".((int) $id).", ".((int) $actionid).")";
 
 			if (!$db->query($sql)) {
 				$error++;
@@ -164,9 +164,21 @@ if ($result > 0) {
 	// Login
 	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
 	if (!empty($object->ldap_sid) && $object->statut == 0) {
-		print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
+		print '<td class="error">';
+		print $langs->trans("LoginAccountDisableInDolibarr");
+		print '</td>';
 	} else {
-		print '<td>'.$object->login.'</td>';
+		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";
 
@@ -290,7 +302,7 @@ if ($result > 0) {
 			print $form->selectarray("typeid", $type);
 			print '</td>';
 			print '<td class="nowraponall">';
-			print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+			print '<input type="submit" class="button button-add" value="'.$langs->trans("Add").'">';
 			print '&nbsp;';
 			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 			print '</td>';
@@ -337,7 +349,7 @@ if ($result > 0) {
 					print $langs->trans("SMS");
 				}
 				print '</td>';
-				print '<td class="right"><a href="card.php?id='.$id.'&amp;action=delete&amp;token='.newToken().'&amp;actid='.$obj->rowid.'">'.img_delete().'</a></td>';
+				print '<td class="right"><a href="card.php?id='.$id.'&action=delete&token='.newToken().'&actid='.$obj->rowid.'">'.img_delete().'</a></td>';
 				print '</tr>';
 				$i++;
 			}
@@ -349,21 +361,17 @@ if ($result > 0) {
 		foreach($conf->global as $key => $val) {
 			if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;
 			print '<tr class="oddeven"><td>';
-			$listtmp=explode(',',$val);
+			$listtmp=explode(',', $val);
 			$first=1;
-			foreach($listtmp as $keyemail => $valemail)
-			{
+			foreach($listtmp as $keyemail => $valemail) {
 				if (! $first) print ', ';
 				$first=0;
 				$valemail=trim($valemail);
 				//print $keyemail.' - '.$valemail.' - '.$reg[1].'<br>';
-				if (isValidEmail($valemail, 1))
-				{
+				if (isValidEmail($valemail, 1)) {
 					if ($valemail == '__SUPERVISOREMAIL__') print $valemail;
 					else print ' &lt;'.$valemail.'&gt;';
-				}
-				else
-				{
+				} else {
 					print ' '.img_warning().' '.$langs->trans("ErrorBadEMail",$valemail);
 				}
 			}
@@ -373,8 +381,7 @@ if ($result > 0) {
 			$notifcodecond=preg_replace('/^.*_(THRESHOLD_)/','$1',$reg[1]);
 			$label=($langs->trans("Notify_".$notifcode)!="Notify_".$notifcode?$langs->trans("Notify_".$notifcode):$notifcode);
 			print $label;
-			if (preg_match('/^THRESHOLD_HIGHER_(.*)$/',$notifcodecond,$regcond) && ($regcond[1] > 0))
-			{
+			if (preg_match('/^THRESHOLD_HIGHER_(.*)$/',$notifcodecond,$regcond) && ($regcond[1] > 0)) {
 				print ' - '.$langs->trans("IfAmountHigherThan",$regcond[1]);
 			}
 			print '</td>';
@@ -384,9 +391,7 @@ if ($result > 0) {
 			print '<td class="right">'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'</td>';
 			print '</tr>';
 		}*/
-		/*if ($user->admin)
-		{
-			$var = ! $var;
+		/*if ($user->admin) {
 			print '<tr class="oddeven"><td colspan="4">';
 			print '+ <a href="'.DOL_URL_ROOT.'/admin/notification.php">'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'</a>';
 			print '</td></tr>';
@@ -403,7 +408,7 @@ if ($result > 0) {
 
 	// List
 	$sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
-	$sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
+	$sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail, c.statut as status,";
 	$sql .= " a.code, a.label";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
 	$sql .= " ".MAIN_DB_PREFIX."notify as n";
@@ -477,6 +482,8 @@ if ($result > 0) {
 				$userstatic->id = $obj->id;
 				$userstatic->lastname = $obj->lastname;
 				$userstatic->firstname = $obj->firstname;
+				$userstatic->statut = $obj->status;
+				$userstatic->email = $obj->email;
 				print $userstatic->getNomUrl(1);
 				print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
 			} else {
@@ -497,13 +504,12 @@ if ($result > 0) {
 			print '</td>';
 			// TODO Add link to object here for other types
 			/*print '<td>';
-			if ($obj->object_type == 'order')
-			{
+			if ($obj->object_type == 'order') {
 				$orderstatic->id=$obj->object_id;
 				$orderstatic->ref=...
 				print $orderstatic->getNomUrl(1);
 			}
-			   print '</td>';*/
+			print '</td>';*/
 			// print
 			print'<td class="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
 			print '</tr>';
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 72f9b075be9..80f83732906 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -235,7 +235,7 @@ if ($action == 'edit') {
 
 
 	if (!empty($conf->use_javascript_ajax)) {
-		print '<script type="text/javascript" language="javascript">
+		print '<script type="text/javascript">
         jQuery(document).ready(function() {
         	function init_myfunc()
         	{
@@ -328,11 +328,7 @@ if ($action == 'edit') {
 	showSkins($object, (($user->admin || empty($dolibarr_main_demo)) ? 1 : 0), true);
 
 
-	print '<div class="center">';
-	print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 } else {
 	print dol_get_fiche_head($head, 'guisetup', $title, -1, 'user');
 
@@ -409,12 +405,12 @@ if ($action == 'edit') {
 
 	print '<div class="tabsAction">';
 	if (empty($user->admin) && !empty($dolibarr_main_demo)) {
-		print "<a class=\"butActionRefused classfortooltip\" title=\"".$langs->trans("FeatureDisabledInDemo")."\" href=\"#\">".$langs->trans("Modify")."</a>";
+		print '<a class="butActionRefused classfortooltip" title="'.$langs->trans("FeatureDisabledInDemo").'" href="#">'.$langs->trans("Modify").'</a>';
 	} else {
 		if ($caneditfield || !empty($user->admin)) {       // Si utilisateur edite = utilisateur courant (pas besoin de droits particulier car il s'agit d'une page de modif d'output et non de données) ou si admin
-			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a>';
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Modify").'</a>';
 		} else {
-			print "<a class=\"butActionRefused classfortooltip\" title=\"".$langs->trans("NotEnoughPermissions")."\" href=\"#\">".$langs->trans("Modify")."</a>";
+			print '<a class="butActionRefused classfortooltip" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Modify").'</a>';
 		}
 	}
 
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 391682b2d6d..6e28a77b5bc 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -279,9 +279,9 @@ print '<td>'.$langs->trans("Module").'</td>';
 if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->admin)) {
 	if ($caneditperms) {
 		print '<td class="center nowrap">';
-		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module=allmodules&amp;confirm=yes&amp;token='.newToken().'">'.$langs->trans("All")."</a>";
+		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addrights&token='.newToken().'&entity='.$entity.'&module=allmodules&confirm=yes">'.$langs->trans("All")."</a>";
 		print ' / ';
-		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module=allmodules&amp;confirm=yes&amp;token='.newToken().'">'.$langs->trans("None")."</a>";
+		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delrights&token='.newToken().'&entity='.$entity.'&module=allmodules&confirm=yes">'.$langs->trans("None")."</a>";
 		print '</td>';
 	}
 	print '<td class="center" width="24">&nbsp;</td>';
@@ -292,14 +292,13 @@ if ($user->admin) {
 }
 print '</tr>'."\n";
 
-//print "xx".$conf->global->MAIN_USE_ADVANCED_PERMS;
+
+// Fix bad value for module_position in table
+// ------------------------------------------
 $sql = "SELECT r.id, r.libelle as label, r.module, r.perms, r.subperms, r.module_position, r.bydefault";
 $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
 $sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
 $sql .= " AND r.entity = ".((int) $entity);
-if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-	$sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
-}
 $sql .= " ORDER BY r.family_position, r.module_position, r.module, r.id";
 
 $result = $db->query($sql);
@@ -317,6 +316,19 @@ if ($result) {
 			continue;
 		}
 
+		// Special cases
+		if (!empty($conf->reception->enabled)) {
+			// The 2 permissions in fournisseur modules are replaced by permissions into reception module
+			if ($obj->module == 'fournisseur' && $obj->perms == 'commande' && $obj->subperms == 'receptionner') {
+				$i++;
+				continue;
+			}
+			if ($obj->module == 'fournisseur' && $obj->perms == 'commande_advance' && $obj->subperms == 'check') {
+				$i++;
+				continue;
+			}
+		}
+
 		$objMod = $modules[$obj->module];
 
 		// Save field module_position in database if value is wrong
@@ -341,6 +353,75 @@ if ($result) {
 				$db->query($sqlupdate);
 			}
 		}
+	}
+}
+
+
+
+//print "xx".$conf->global->MAIN_USE_ADVANCED_PERMS;
+$sql = "SELECT r.id, r.libelle as label, r.module, r.perms, r.subperms, r.module_position, r.bydefault";
+$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
+$sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
+$sql .= " AND r.entity = ".((int) $entity);
+if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+	$sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
+}
+$sql .= " ORDER BY r.family_position, r.module_position, r.module, r.id";
+
+$result = $db->query($sql);
+if ($result) {
+	$num = $db->num_rows($result);
+	$i = 0;
+	$oldmod = '';
+
+	while ($i < $num) {
+		$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])) {
+			$i++;
+			continue;
+		}
+
+		// Special cases
+		if (!empty($conf->reception->enabled)) {
+			// The 2 permission in fournisseur modules has been replaced by permissions into reception module
+			if ($obj->module == 'fournisseur' && $obj->perms == 'commande' && $obj->subperms == 'receptionner') {
+				$i++;
+				continue;
+			}
+			if ($obj->module == 'fournisseur' && $obj->perms == 'commande_advance' && $obj->subperms == 'check') {
+				$i++;
+				continue;
+			}
+		}
+
+		$objMod = $modules[$obj->module];
+
+		// Save field module_position in database if value is wrong
+		/*
+		if (empty($obj->module_position) || (is_object($objMod) && $objMod->isCoreOrExternalModule() == 'external' && $obj->module_position < 100000)) {
+			if (is_object($modules[$obj->module]) && ($modules[$obj->module]->module_position > 0)) {
+				// TODO Define familyposition
+				//$familyposition = $modules[$obj->module]->family_position;
+				$familyposition = 0;
+
+				$newmoduleposition = $modules[$obj->module]->module_position;
+
+				// Correct $newmoduleposition position for external modules
+				$objMod = $modules[$obj->module];
+				if (is_object($objMod) && $objMod->isCoreOrExternalModule() == 'external' && $newmoduleposition < 100000) {
+					$newmoduleposition += 100000;
+				}
+
+				$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX."rights_def SET module_position = ".((int) $newmoduleposition).",";
+				$sqlupdate .= " family_position = ".((int) $familyposition);
+				$sqlupdate .= " WHERE module_position = ".((int) $obj->module_position)." AND module = '".$db->escape($obj->module)."'";
+
+				$db->query($sqlupdate);
+			}
+		}
+		*/
 
 		// Break found, it's a new module to catch
 		if (isset($obj->module) && ($oldmod <> $obj->module)) {
@@ -359,9 +440,9 @@ if ($result) {
 			if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->admin)) {
 				if ($caneditperms) {
 					print '<td class="center nowrap">';
-					print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'&amp;confirm=yes&amp;token='.newToken().'">'.$langs->trans("All")."</a>";
+					print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addrights&token='.newToken().'&entity='.$entity.'&module='.$obj->module.'&confirm=yes">'.$langs->trans("All")."</a>";
 					print ' / ';
-					print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'&amp;confirm=yes&amp;token='.newToken().'">'.$langs->trans("None")."</a>";
+					print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delrights&token='.newToken().'&entity='.$entity.'&module='.$obj->module.'&confirm=yes">'.$langs->trans("None")."</a>";
 					print '</td>';
 				}
 				print '<td>&nbsp;</td>';
@@ -399,7 +480,7 @@ if ($result) {
 			print '</td>';
 		} elseif (in_array($obj->id, $permsuser)) {					// Permission granted by user
 			if ($caneditperms) {
-				print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">';
+				print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&token='.newToken().'&entity='.$entity.'&rights='.$obj->id.'&confirm=yes">';
 				//print img_edit_remove($langs->trans("Remove"));
 				print img_picto($langs->trans("Remove"), 'switch_on');
 				print '</a></td>';
@@ -420,7 +501,7 @@ if ($result) {
 			} else {
 				// Do not own permission
 				if ($caneditperms) {
-					print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">';
+					print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addrights&entity='.$entity.'&rights='.$obj->id.'&confirm=yes&token='.newToken().'">';
 					//print img_edit_add($langs->trans("Add"));
 					print img_picto($langs->trans("Add"), 'switch_off');
 					print '</a></td>';
@@ -430,7 +511,7 @@ if ($result) {
 		} else {
 			// Do not own permission
 			if ($caneditperms) {
-				print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">';
+				print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addrights&entity='.$entity.'&rights='.$obj->id.'&confirm=yes&token='.newToken().'">';
 				//print img_edit_add($langs->trans("Add"));
 				print img_picto($langs->trans("Add"), 'switch_off');
 				print '</a></td>';
diff --git a/htdocs/user/vcard.php b/htdocs/user/vcard.php
index 57778c44259..0f9085d0b52 100644
--- a/htdocs/user/vcard.php
+++ b/htdocs/user/vcard.php
@@ -1,8 +1,9 @@
 <?php
-/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+/* Copyright (C) 2004      	Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 	Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 	Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
+ * Copyright (C) 2021-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
@@ -64,27 +65,27 @@ $v->setUid('DOLIBARR-USERID-'.$user2->id);
 $v->setName($user2->lastname, $user2->firstname, "", $user2->civility_code, "");
 $v->setFormattedName($user2->getFullName($langs, 1));
 
-$v->setPhoneNumber($user2->phone_pro, "TYPE=WORK;VOICE");
-//$v->setPhoneNumber($user2->phone_perso,"TYPE=HOME;VOICE");
-$v->setPhoneNumber($user2->phone_mobile, "TYPE=CELL;VOICE");
-$v->setPhoneNumber($user2->fax, "TYPE=WORK;FAX");
+$v->setPhoneNumber($user2->office_phone, "TYPE=WORK;VOICE");
+$v->setPhoneNumber($user2->personal_mobile, "TYPE=HOME;VOICE");
+$v->setPhoneNumber($user2->user_mobile, "TYPE=CELL;VOICE");
+$v->setPhoneNumber($user2->office_fax, "TYPE=WORK;FAX");
 
 $country = $user2->country_code ? $user2->country : '';
 
 $v->setAddress("", "", $user2->address, $user2->town, $user2->state, $user2->zip, $country, "TYPE=WORK;POSTAL");
 $v->setLabel("", "", $user2->address, $user2->town, $user2->state, $user2->zip, $country, "TYPE=WORK");
 
-$v->setEmail($user2->email);
+$v->setEmail($user2->email, "TYPE=WORK");
 $v->setNote($user2->note);
 $v->setTitle($user2->poste);
 
 // Data from linked company
 if ($company->id) {
 	$v->setURL($company->url, "TYPE=WORK");
-	if (!$user2->phone_pro) {
+	if (!$user2->office_phone) {
 		$v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
 	}
-	if (!$user2->fax) {
+	if (!$user2->office_fax) {
 		$v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
 	}
 	if (!$user2->zip) {
@@ -96,16 +97,16 @@ if ($company->id) {
 		// was set before, don't set twice
 	} elseif (empty(trim($user2->email))) {
 		// when user e-mail is empty, use only company e-mail
-		$v->setEmail($company->email);
+		$v->setEmail($company->email, "TYPE=WORK");
 	} elseif (strtolower(end(explode("@", $user2->email))) == strtolower(end(explode("@", $company->email)))) {
 		// when e-mail domain of user and company are the same, use user e-mail at first (and company e-mail at second)
-		$v->setEmail($user2->email);
+		$v->setEmail($user2->email, "TYPE=WORK");
 
 		// support by Microsoft Outlook (2019 and possible earlier)
 		$v->setEmail($company->email, 'INTERNET');
 	} else {
 		// when e-mail of user and company complete different use company e-mail at first (and user e-mail at second)
-		$v->setEmail($company->email);
+		$v->setEmail($company->email, "TYPE=WORK");
 
 		// support by Microsoft Outlook (2019 and possible earlier)
 		$v->setEmail($user2->email, 'INTERNET');
@@ -118,7 +119,7 @@ if ($company->id) {
 }
 
 // Personal informations
-$v->setPhoneNumber($user2->phone_perso, "TYPE=HOME;VOICE");
+$v->setPhoneNumber($user2->personal_mobile, "TYPE=HOME;VOICE");
 if ($user2->birth) {
 	$v->setBirthday($user2->birth);
 }
diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index e91542f90c5..5ee341526bb 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -160,8 +160,7 @@ class ProductAttributeValue extends CommonObject
 		$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->value."', ".(int) $this->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);
 
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 6eb17a9bffb..bb6372fd5eb 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -488,7 +488,13 @@ class ProductCombination
 
 		$child->price_autogen = $parent->price_autogen;
 		$child->weight = $parent->weight;
-		$child->status = $parent->status;
+		// Only when Parent Status are updated
+		if ($parent->oldcopy && ($parent->status != $parent->oldcopy->status)) {
+			$child->status = $parent->status;
+		}
+		if ($parent->oldcopy && ($parent->status_buy != $parent->oldcopy->status_buy)) {
+			$child->status_buy = $parent->status_buy;
+		}
 
 		if ($this->variation_weight) {	// If we must add a delta on weight
 			$child->weight = ($child->weight ? $child->weight : 0) + $this->variation_weight;
@@ -715,6 +721,10 @@ class ProductCombination
 			$price_impact = $forced_pricevar;
 		}
 
+		if (!array($price_var_percent)) {
+			$price_var_percent[1] = (float) $price_var_percent;
+		}
+
 		$newcomb = new ProductCombination($this->db);
 		$existingCombination = $newcomb->fetchByProductCombination2ValuePairs($product->id, $combinations);
 
@@ -787,7 +797,7 @@ class ProductCombination
 			$newproduct->description .= '<strong>'.$prodattr->label.':</strong> '.$prodattrval->value;
 		}
 
-		$newcomb->variation_price_percentage = $price_var_percent;
+		$newcomb->variation_price_percentage = $price_var_percent[1];
 		$newcomb->variation_price = $price_impact[1];
 		$newcomb->variation_weight = $weight_impact;
 		$newcomb->variation_ref_ext = $this->db->escape($ref_ext);
@@ -942,7 +952,7 @@ class ProductCombination
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'product_attribute_combination pac';
 		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'product_attribute_combination2val pac2v ON pac2v.fk_prod_combination=pac.rowid';
 		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'product_attribute_value pav ON pav.rowid=pac2v.fk_prod_attr_val';
-		$sql .= ' WHERE pac.fk_product_child='.$prod_child;
+		$sql .= ' WHERE pac.fk_product_child='.((int) $prod_child);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -1051,37 +1061,33 @@ class ProductCombinationLevel
 	 */
 	public function fetchAll($fk_product_attribute_combination, $fk_price_level = 0)
 	{
+		$result = array();
 
 		$sql = "SELECT rowid, fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " WHERE fk_product_attribute_combination = ".intval($fk_product_attribute_combination);
-
 		if (!empty($fk_price_level)) {
 			$sql .= ' AND fk_price_level = '.intval($fk_price_level);
 		}
 
-		$combination_price_levels = $this->db->getRows($sql);
-
-		if (!is_array($combination_price_levels)) {
-			return -1;
-		}
-
-		$result = array();
-
-		if (!empty($combination_price_levels)) {
-			// For more simple usage set level as array key
-			foreach ($combination_price_levels as $k => $row) {
-				$productCombinationLevel = new ProductCombinationLevel($this->db);
-				$productCombinationLevel->fetchFormObj($row);
-				$result[$row->fk_price_level] = $productCombinationLevel;
+		$res = $this->db->query($sql);
+		if ($res) {
+			if ($this->db->num_rows($res) > 0) {
+				while ($obj = $this->db->fetch_object($res)) {
+					$productCombinationLevel = new ProductCombinationLevel($this->db);
+					$productCombinationLevel->fetchFormObj($obj);
+					$result[$obj->fk_price_level] = $productCombinationLevel;
+				}
 			}
+		} else {
+			return -1;
 		}
 
 		return $result;
 	}
 
 	/**
-	 * assign vars form an stdclass like sql obj
+	 * Assign vars form an stdclass like sql obj
 	 *
 	 * @param 	int 	$obj		Object resultset
 	 * @return 	int 				<0 KO, >0 OK
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index c29fc519258..1569fcabb39 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -194,14 +194,11 @@ if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST(
 	$bulkaction = $massaction;
 	$error = 0;
 
-
-
 	$db->begin();
 
 	foreach ($toselect as $prodid) {
 		// need create new of Product to prevent rename dir behavior
 		$prodstatic = new Product($db);
-
 		if ($prodstatic->fetch($prodid) < 0) {
 			continue;
 		}
@@ -209,33 +206,50 @@ if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST(
 		if ($bulkaction == 'on_sell') {
 			$prodstatic->status = 1;
 			$res = $prodstatic->update($prodstatic->id, $user);
+			if ($res <= 0) {
+				setEventMessages($prodstatic->error, $prodstatic->errors, 'errors');
+				$error++;
+				break;
+			}
 		} elseif ($bulkaction == 'on_buy') {
 			$prodstatic->status_buy = 1;
 			$res = $prodstatic->update($prodstatic->id, $user);
+			if ($res <= 0) {
+				setEventMessages($prodstatic->error, $prodstatic->errors, 'errors');
+				$error++;
+				break;
+			}
 		} elseif ($bulkaction == 'not_sell') {
 			$prodstatic->status = 0;
 			$res = $prodstatic->update($prodstatic->id, $user);
+			if ($res <= 0) {
+				setEventMessages($prodstatic->error, $prodstatic->errors, 'errors');
+				$error++;
+				break;
+			}
 		} elseif ($bulkaction == 'not_buy') {
 			$prodstatic->status_buy = 0;
 			$res = $prodstatic->update($prodstatic->id, $user);
+			if ($res <= 0) {
+				setEventMessages($prodstatic->error, $prodstatic->errors, 'errors');
+				$error++;
+				break;
+			}
 		} elseif ($bulkaction == 'delete') {
 			$res = $prodstatic->delete($user, $prodstatic->id);
+			if ($res <= 0) {
+				setEventMessages($prodstatic->error, $prodstatic->errors, 'errors');
+				$error++;
+				break;
+			}
 		} else {
 			break;
 		}
-
-		if ($res <= 0) {
-			$error++;
-			break;
-		}
 	}
 
 	if ($error) {
 		$db->rollback();
-
-		if ($prodstatic->error) {
-			setEventMessages($prodstatic->error, $prodstatic->errors, 'errors');
-		} else {
+		if (empty($prodstatic->error)) {
 			setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors');
 		}
 	} else {
@@ -587,7 +601,7 @@ if (!empty($id) || !empty($ref)) {
 
 			$htmltext = $langs->trans("GoOnMenuToCreateVairants", $langs->transnoentities("Product"), $langs->transnoentities("VariantAttributes"));
 			print $form->textwithpicto('', $htmltext);
-			/*print ' &nbsp; &nbsp; <a href="'.DOL_URL_ROOT.'/variants/create.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=add&id='.$object->id).'">';
+			/*print ' &nbsp; &nbsp; <a href="'.DOL_URL_ROOT.'/variants/create.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=add&token='.newToken().'&id='.$object->id).'">';
 			print $langs->trans("Create");
 			print '</a>';*/
 
@@ -605,7 +619,7 @@ if (!empty($id) || !empty($ref)) {
 					$htmltext = $langs->trans("GoOnMenuToCreateVairants", $langs->transnoentities("Product"), $langs->transnoentities("VariantAttributes"));
 					print $form->textwithpicto('', $htmltext);
 					/*
-						print ' &nbsp; &nbsp; <a href="'.DOL_URL_ROOT.'/variants/create.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=add&id='.$object->id).'">';
+						print ' &nbsp; &nbsp; <a href="'.DOL_URL_ROOT.'/variants/create.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=add&token='.newToken().'&id='.$object->id).'">';
 						print $langs->trans("Create");
 						print '</a>';
 					*/
@@ -834,7 +848,7 @@ if (!empty($id) || !empty($ref)) {
 			$aaa .= '	<option value="on_sell">'.$langs->trans('ProductStatusOnSell').'</option>';
 			$aaa .= '	<option value="delete">'.$langs->trans('Delete').'</option>';
 			$aaa .= '</select>';
-			$aaa .= '<input type="submit" value="'.dol_escape_htmltag($langs->trans("Apply")).'" class="button">';
+			$aaa .= '<input type="submit" value="'.dol_escape_htmltag($langs->trans("Apply")).'" class="button small">';
 		}
 		$massactionbutton = $aaa;
 
@@ -888,7 +902,7 @@ if (!empty($id) || !empty($ref)) {
 				print '<td class="center">'.$prodstatic->getLibStatut(2, 0).'</td>';
 				print '<td class="center">'.$prodstatic->getLibStatut(2, 1).'</td>';
 				print '<td class="right">';
-				print '<a class="paddingleft paddingright editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=edit&valueid='.$currcomb->id.'">'.img_edit().'</a>';
+				print '<a class="paddingleft paddingright editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=edit&token='.newToken().'&valueid='.$currcomb->id.'">'.img_edit().'</a>';
 				print '<a class="paddingleft paddingright" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=delete&token='.newToken().'&valueid='.$currcomb->id.'">'.img_delete().'</a>';
 				print '</td>';
 				print '<td class="nowrap center">';
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index ecb42ba25e2..eedb24524e0 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -142,7 +142,7 @@ foreach ($variants as $key => $attribute) {
 	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">'.img_edit().'</a>';
+	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">';
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 0e91bd5bc9f..dee62999cf4 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -229,6 +229,11 @@ $original_file = str_replace('..\\', '/', $original_file);
 // Find the subdirectory name as the reference
 $refname = basename(dirname($original_file)."/");
 
+// Check that file is allowed for view with viewimage.php
+if (!dolIsAllowedForPreview($original_file)) {
+	accessforbidden('This file is not qualified for preview', 0, 0, 1);
+}
+
 // Security check
 if (empty($modulepart)) {
 	accessforbidden('Bad value for parameter modulepart', 0, 0, 1);
@@ -290,7 +295,7 @@ if ($modulepart == 'barcode') {
 	if (in_array($encoding, array('EAN8', 'EAN13'))) {
 		$code = GETPOST("code", 'alphanohtml');
 	} else {
-		$code = GETPOST("code", 'none'); // This can be rich content (qrcode, datamatrix, ...)
+		$code = GETPOST("code", 'restricthtml'); // This can be rich content (qrcode, datamatrix, ...)
 	}
 
 	if (empty($generator) || empty($encoding)) {
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index 1c78acae84d..f70a990ee95 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -91,9 +91,7 @@ print '</tr>';
 
 print '</table>';
 
-print '<br><div class="center">';
-print '<input type="submit" name="save" class="button button-save" value="'.$langs->trans("Save").'">';
-print '</div>';
+print $form->buttonsSaveCancel("Save", '');
 
 print '</form>';
 
@@ -122,7 +120,7 @@ foreach ($webservices as $name => $right) {
 		continue;
 	}
 	$url = DOL_MAIN_URL_ROOT.'/webservices/server_'.$name.'.php?wsdl';
-	print img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+	print img_picto('', 'globe').' <a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.$url."</a><br>\n";
 }
 print '<br>';
 
@@ -134,7 +132,7 @@ foreach ($webservices as $name => $right) {
 		continue;
 	}
 	$url = DOL_MAIN_URL_ROOT.'/webservices/server_'.$name.'.php';
-	print img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
+	print img_picto('', 'globe').' <a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.$url."</a><br>\n";
 }
 print '<br>';
 
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index 35997d16d6e..25eeec6430f 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -527,7 +527,7 @@ function createProductOrService($authentication, $product)
 		$newobject->label = empty($product['label']) ? '' : $product['label'];
 		$newobject->description = empty($product['description']) ? '' : $product['description'];
 		$newobject->note_public = empty($product['note_public']) ? '' : $product['note_public'];
-		$newobject->note_private = empty($product['note_private']) ? '' :$product['note_private'];
+		$newobject->note_private = empty($product['note_private']) ? '' : $product['note_private'];
 		$newobject->status = empty($product['status_tosell']) ? 0 : $product['status_tosell'];
 		$newobject->status_buy = empty($product['status_tobuy']) ? 0 : $product['status_tobuy'];
 		$newobject->price = isset($product['price_net']) ? $product['price_net'] : 0;
diff --git a/htdocs/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php
index 6803133d527..926fa8f6418 100644
--- a/htdocs/webservices/server_supplier_invoice.php
+++ b/htdocs/webservices/server_supplier_invoice.php
@@ -350,13 +350,9 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 	if (!$error) {
 		$linesinvoice = array();
 
-		$sql .= 'SELECT f.rowid as facid';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as f';
-		//$sql.=', '.MAIN_DB_PREFIX.'societe as s';
-		//$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product = p.rowid';
-		//$sql.=" WHERE f.fk_soc = s.rowid AND nom = '".$db->escape($idthirdparty)."'";
-		//$sql.=" WHERE f.fk_soc = s.rowid AND nom = '".$db->escape($idthirdparty)."'";
-		$sql .= " WHERE f.entity = ".$conf->entity;
+		$sql .= "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/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index dbf2f3dd125..800c2e0e2a2 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -103,7 +103,7 @@ $thirdparty_fields = array(
 		'address' => array('name'=>'address', 'type'=>'xsd:string'),
 		'zip' => array('name'=>'zip', 'type'=>'xsd:string'),
 		'town' => array('name'=>'town', 'type'=>'xsd:string'),
-		'province_id' => array('name'=>'province_id', 'type'=>'xsd:string'),
+		'region_code' => array('name'=>'region_code', 'type'=>'xsd:string'),
 		'country_id' => array('name'=>'country_id', 'type'=>'xsd:string'),
 		'country_code' => array('name'=>'country_code', 'type'=>'xsd:string'),
 		'country' => array('name'=>'country', 'type'=>'xsd:string'),
@@ -343,7 +343,7 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '', $bar
 						'address' => $thirdparty->address,
 						'zip' => $thirdparty->zip,
 						'town' => $thirdparty->town,
-						'province_id' => $thirdparty->state_id,
+						'region_code' => $thirdparty->region_code,
 						'country_id' => $thirdparty->country_id,
 						'country_code' => $thirdparty->country_code,
 						'country' => $thirdparty->country,
@@ -462,7 +462,7 @@ function createThirdParty($authentication, $thirdparty)
 		if ($thirdparty['country_code']) {
 			$newobject->country_id = getCountry($thirdparty['country_code'], 3);
 		}
-		$newobject->province_id = $thirdparty['province_id'];
+		$newobject->region_code = empty($thirdparty['region_code']) ? '' : $thirdparty['region_code'];
 		//if ($thirdparty['province_code']) $newobject->province_code=getCountry($thirdparty['province_code'],3);
 
 		$newobject->phone = $thirdparty['phone'];
@@ -597,7 +597,7 @@ function updateThirdParty($authentication, $thirdparty)
 			if ($thirdparty['country_code']) {
 				$object->country_id = getCountry($thirdparty['country_code'], 3);
 			}
-			$object->province_id = $thirdparty['province_id'];
+			$object->region_code = $thirdparty['region_code'];
 			//if ($thirdparty['province_code']) $newobject->province_code=getCountry($thirdparty['province_code'],3);
 
 			$object->phone = $thirdparty['phone'];
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 3872f9be6eb..0e66e01db01 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -297,8 +297,8 @@ class Website extends CommonObject
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
 		$sql .= " t.entity,";
 		$sql .= " t.ref,";
 		$sql .= " t.position,";
@@ -313,12 +313,12 @@ class Website extends CommonObject
 		$sql .= " t.fk_user_modif,";
 		$sql .= " t.date_creation,";
 		$sql .= " t.tms as date_modification";
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql .= ' WHERE t.entity IN ('.getEntity('website').')';
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql .= " WHERE t.entity IN (".getEntity('website').")";
 		if (!empty($ref)) {
 			$sql .= " AND t.ref = '".$this->db->escape($ref)."'";
 		} else {
-			$sql .= ' AND t.rowid = '.(int) $id;
+			$sql .= " AND t.rowid = ".(int) $id;
 		}
 
 		$resql = $this->db->query($sql);
@@ -395,8 +395,8 @@ class Website extends CommonObject
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
 		$sql .= " t.entity,";
 		$sql .= " t.ref,";
 		$sql .= " t.description,";
@@ -409,24 +409,24 @@ class Website extends CommonObject
 		$sql .= " t.fk_user_modif,";
 		$sql .= " t.date_creation,";
 		$sql .= " t.tms as date_modification";
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql .= ' WHERE t.entity IN ('.getEntity('website').')';
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql .= " WHERE t.entity IN (".getEntity('website').")";
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
+			$sql .= ' AND '.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 		$this->records = array();
 
@@ -867,10 +867,10 @@ class Website extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
-			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled');
-			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
 		}
 
 		$statusType = 'status5';
@@ -1031,7 +1031,7 @@ class Website extends CommonObject
 			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__, ";
@@ -1076,9 +1076,11 @@ class Website extends CommonObject
 			$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 .= "'".$this->db->escape($objectpageold->allowed_in_frames)."'";
 			$line .= ");";
 			$line .= "\n";
+
 			fputs($fp, $line);
 
 			// Add line to update home page id during import
@@ -1138,7 +1140,7 @@ class Website extends CommonObject
 			return -1;
 		}
 
-		dol_delete_dir_recursive($conf->website->dir_temp.'/'.$object->ref);
+		dol_delete_dir_recursive($conf->website->dir_temp."/".$object->ref);
 		dol_mkdir($conf->website->dir_temp.'/'.$object->ref);
 
 		$filename = basename($pathtofile);
@@ -1183,7 +1185,7 @@ class Website extends CommonObject
 		dolCopyDir($conf->website->dir_temp.'/'.$object->ref.'/medias/image/websitekey', $conf->website->dir_output.'/'.$object->ref.'/medias/image/'.$object->ref, 0, 1); // Medias can be shared, do not overwrite if exists
 		dolCopyDir($conf->website->dir_temp.'/'.$object->ref.'/medias/js/websitekey', $conf->website->dir_output.'/'.$object->ref.'/medias/js/'.$object->ref, 0, 1); // Medias can be shared, do not overwrite if exists
 
-		$sqlfile = $conf->website->dir_temp.'/'.$object->ref.'/website_pages.sql';
+		$sqlfile = $conf->website->dir_temp."/".$object->ref.'/website_pages.sql';
 
 		$result = dolReplaceInFile($sqlfile, $arrayreplacement);
 
@@ -1252,7 +1254,7 @@ class Website extends CommonObject
 
 		// Read record of website that has been updated by the run_sql function previously called so we can get the
 		// value of fk_default_home that is ID of home page
-		$sql = 'SELECT fk_default_home FROM '.MAIN_DB_PREFIX.'website WHERE rowid = '.$object->id;
+		$sql = "SELECT fk_default_home FROM ".MAIN_DB_PREFIX."website WHERE rowid = ".((int) $object->id);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
@@ -1297,7 +1299,7 @@ class Website extends CommonObject
 
 		$objectpagestatic = new WebsitePage($this->db);
 
-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'website_page WHERE fk_website = '.((int) $this->id);
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."website_page WHERE fk_website = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 1d0e0afdf12..0126f8a4dc4 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -417,7 +417,7 @@ class WebsitePage extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid' || $key == 'rowid' || $key == 't.fk_website' || $key == 'fk_website' || $key == 'status' || $key == 't.status') {
-					$sqlwhere[] = $key.' = '.((int) $value);
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif ($key == 'type_container' || $key == 't.type_container') {
 					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
 				} elseif ($key == 'lang' || $key == 't.lang') {
@@ -432,7 +432,7 @@ class WebsitePage extends CommonObject
 					}
 					$stringtouse = $key." IN (".$this->db->sanitize(join(',', $listoflang), 1).")";
 					if ($foundnull) {
-						$stringtouse = '('.$stringtouse.' OR '.$key.' IS NULL)';
+						$stringtouse = "(".$stringtouse." OR ".$key." IS NULL)";
 					}
 					$sqlwhere[] = $stringtouse;
 				} else {
@@ -441,14 +441,14 @@ class WebsitePage extends CommonObject
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= " AND (".implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -519,7 +519,7 @@ class WebsitePage extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid' || $key == 't.fk_website' || $key == 'status') {
-					$sqlwhere[] = $key.' = '.((int) $value);
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif ($key == 'type_container') {
 					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
 				} elseif ($key == 'lang' || $key == 't.lang') {
@@ -534,16 +534,16 @@ class WebsitePage extends CommonObject
 					}
 					$stringtouse = $key." IN (".$this->db->sanitize(join(',', $listoflang), 1).")";
 					if ($foundnull) {
-						$stringtouse = '('.$stringtouse.' OR '.$key.' IS NULL)';
+						$stringtouse = "(".$stringtouse." OR ".$key." IS NULL)";
 					}
 					$sqlwhere[] = $stringtouse;
 				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 
 		$resql = $this->db->query($sql);
@@ -835,10 +835,10 @@ class WebsitePage extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
-			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled');
-			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
 		}
 
 		$statusType = 'status5';
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 0e192ff0212..610607f0321 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -132,8 +132,8 @@ if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -274,27 +274,27 @@ $manifestjsoncontentdefault .= '{
 	"background_color": "#fff",
 	"description": "A simple Web app.",
 	"icons": [{
-	"src": "images/'.$website->ref.'/homescreen48.png",
+	"src": "images/'.urlencode($website->ref).'/homescreen48.png",
 	"sizes": "48x48",
 	"type": "image/png"
 	}, {
-		"src": "image/'.$website->ref.'/homescreen72.png",
+		"src": "image/'.urlencode($website->ref).'/homescreen72.png",
 		"sizes": "72x72",
 		"type": "image/png"
 	}, {
-		"src": "image/'.$website->ref.'/homescreen96.png",
+		"src": "image/'.urlencode($website->ref).'/homescreen96.png",
 		"sizes": "96x96",
 		"type": "image/png"
 	}, {
-		"src": "image/'.$website->ref.'/homescreen144.png",
+		"src": "image/'.urlencode($website->ref).'/homescreen144.png",
 		"sizes": "144x144",
 		"type": "image/png"
 	}, {
-		"src": "image/'.$website->ref.'/homescreen168.png",
+		"src": "image/'.urlencode($website->ref).'/homescreen168.png",
 		"sizes": "168x168",
 		"type": "image/png"
 	}, {
-		"src": "image/'.$website->ref.'/homescreen192.png",
+		"src": "image/'.urlencode($website->ref).'/homescreen192.png",
 		"sizes": "192x192",
 		"type": "image/png"
 	}],
@@ -339,6 +339,7 @@ if ($action == 'replacesiteconfirm') {
 }
 
 $usercanedit = $user->rights->website->write;
+$permissiontoadd = $user->rights->website->write;	// Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
 $permissiontodelete = $user->rights->website->delete;
 
 
@@ -515,7 +516,7 @@ if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha') && $userca
 				}
 
 				// Save page of content
-				$result = dolSavePageContent($filetpl, $object, $objectpage);
+				$result = dolSavePageContent($filetpl, $object, $objectpage, 1);
 				if ($result) {
 					$nbreplacement++;
 					//var_dump($objectpage->content);exit;
@@ -1107,7 +1108,7 @@ if ($action == 'addcontainer' && $usercanedit) {
 			}
 
 			// Save page of content
-			$result = dolSavePageContent($filetpl, $object, $objectpage);
+			$result = dolSavePageContent($filetpl, $object, $objectpage, 1);
 			if ($result) {
 				setEventMessages($langs->trans("Saved"), null, 'mesgs');
 			} else {
@@ -1850,7 +1851,7 @@ if ($action == 'updatemeta' && $usercanedit) {
 
 
 		// Save page of content
-		$result = dolSavePageContent($filetpl, $object, $objectpage);
+		$result = dolSavePageContent($filetpl, $object, $objectpage, 1);
 		if ($result) {
 			setEventMessages($langs->trans("Saved"), null, 'mesgs');
 
@@ -1945,7 +1946,7 @@ if ($usercanedit && (($action == 'updatesource' || $action == 'updatecontent' ||
 				//var_dump($filetpl);
 				//exit;
 
-				dolSavePageContent($filetpl, $tmpwebsite, $resultpage);
+				dolSavePageContent($filetpl, $tmpwebsite, $resultpage, 1);
 
 				// Switch on the new page if web site of new page/container is same
 				if (empty($newwebsiteid) || $newwebsiteid == $object->id) {
@@ -2378,7 +2379,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
 
 					// Add "has translation pages"
 					$sql = 'SELECT rowid as id, lang, pageurl from '.MAIN_DB_PREFIX.'website_page';
-					$sql .= ' WHERE status = '.WebsitePage::STATUS_VALIDATED.' AND fk_page IN ('.$db->sanitize($objp->rowid.($translationof ? ', '.$translationof : '')).")";
+					$sql .= " WHERE status = ".((int) WebsitePage::STATUS_VALIDATED).' AND fk_page IN ('.$db->sanitize($objp->rowid.($translationof ? ", ".$translationof : "")).")";
 					$resqlhastrans = $db->query($sql);
 					if ($resqlhastrans) {
 						$num_rows_hastrans = $db->num_rows($resqlhastrans);
@@ -2476,7 +2477,7 @@ $formother = new FormOther($db);
 
 // Confirm generation of website sitemaps
 if ($action == 'confirmgeneratesitemaps') {
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$website->ref, $langs->trans('ConfirmSitemapsCreation'), $langs->trans('ConfirmGenerateSitemaps', $object->ref), 'generatesitemaps', '', "yes", 1);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?website='.urlencode($website->ref), $langs->trans('ConfirmSitemapsCreation'), $langs->trans('ConfirmGenerateSitemaps', $object->ref), 'generatesitemaps', '', "yes", 1);
 	$action = 'preview';
 }
 $helpurl = 'EN:Module_Website|FR:Module_Website_FR|ES:M&oacute;dulo_Website';
@@ -2507,7 +2508,7 @@ llxHeader($moreheadcss.$moreheadjs, $langs->trans("WebsiteSetup"), $helpurl, '',
 
 print "\n";
 print '<!-- Open form for all page -->'."\n";
-print '<form action="'.$_SERVER["PHP_SELF"].($action == 'file_manager' ? '?uploadform=1': '').'" method="POST" enctype="multipart/form-data">';
+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.'">';
 
@@ -2599,7 +2600,7 @@ if (!GETPOST('hide_websitemenu')) {
 	print '<!-- Bar for website -->';
 	if ($action != 'file_manager') {
 		print '<span class="websiteselection hideonsmartphoneimp minwidth100 tdoverflowmax100">';
-		print $langs->trans("Website").' : ';
+		print $langs->trans("Website").': ';
 		print '</span>';
 
 		$urltocreatenewwebsite = $_SERVER["PHP_SELF"].'?action=createsite';
@@ -2645,7 +2646,7 @@ if (!GETPOST('hide_websitemenu')) {
 		$out .= ajax_combobox('website');
 
 		if (!empty($conf->use_javascript_ajax)) {
-			$out .= '<script language="javascript">';
+			$out .= '<script type="text/javascript">';
 			$out .= 'jQuery(document).ready(function () {';
 			$out .= '	jQuery("#website").change(function () {';
 			$out .= '   	console.log("We select "+jQuery("#website option:selected").val());';
@@ -2668,7 +2669,7 @@ if (!GETPOST('hide_websitemenu')) {
 			print ' &nbsp; ';
 
 			//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">';
-			print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editcss" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans("EditCss")).'</a>';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editcss&token='.newToken().'" class="button bordertransp" title="'.dol_escape_htmltag($langs->trans("EditCss")).'"'.$disabled.'><span class="fa fa-cog paddingrightonly"></span><span class="hideonsmartphone">'.dol_escape_htmltag($langs->trans("EditCss")).'</span></a>';
 
 			$importlabel = $langs->trans("ImportSite");
 			$exportlabel = $langs->trans("ExportSite");
@@ -2691,28 +2692,24 @@ if (!GETPOST('hide_websitemenu')) {
 			print '<input type="submit" class="buttonDelete bordertransp" name="deletesite" value="'.$langs->trans("Delete").'"'.($atleastonepage ? ' disabled="disabled"' : '').'>';
 
 			// Regenerate all pages
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=regeneratesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'"><span class="fa fa-cogs"><span></a>';
-
-			print ' &nbsp; ';
+			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>';
 
 			// Generate site map
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=confirmgeneratesitemaps&website='.$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&website='.urlencode($website->ref).'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("GenerateSitemaps")).'"><span class="fa fa-sitemap"></span></a>';
 
-			print ' &nbsp; ';
-
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=replacesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-search"><span></a>';
+			print '<a href="'.$_SERVER["PHP_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 '</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='.$website->ref, $disabled);
+			//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)) {
-				//print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=website&dol_hide_leftmenu=1&nosearch=1&type=website_page&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("Categories")).'"><span class="fa fa-tags"><span></a>';
-				print dolButtonToOpenUrlInDialogPopup('categories', $langs->transnoentitiesnoconv("Categories"), '<span class="fa fa-tags"><span>', '/categories/index.php?leftmenu=website&nosearch=1&type=website_page&website='.$website->ref, $disabled);
+				//print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=website&dol_hide_leftmenu=1&nosearch=1&type=website_page&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("Categories")).'"><span class="fa fa-tags"></span></a>';
+				print dolButtonToOpenUrlInDialogPopup('categories', $langs->transnoentitiesnoconv("Categories"), '<span class="fa fa-tags"></span>', '/categories/index.php?leftmenu=website&nosearch=1&type=website_page&website='.urlencode($website->ref), $disabled);
 			}
 
 			print '</span>';
@@ -2722,7 +2719,7 @@ if (!GETPOST('hide_websitemenu')) {
 	}
 
 
-	print '<span class="websitetools websiteselection">';
+	print '<span class="websitetools">';
 
 	if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite') {
 		$urlext = $virtualurl;
@@ -2790,7 +2787,7 @@ if (!GETPOST('hide_websitemenu')) {
 			print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
 		}
 		if ($action != 'preview') {
-			print '<input type="submit" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
+			print '<input type="submit" class="button button-cancel small" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
 		}
 	}
 
@@ -2811,7 +2808,7 @@ if (!GETPOST('hide_websitemenu')) {
 		print '</span>';
 
 		print '<span class="websiteselection hideonsmartphoneimp">';
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=createcontainer&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("AddPage")).'"><span class="fa fa-plus-circle valignmiddle btnTitle-icon"><span></a>';
+		print '<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>';
 
 		//print '<span class="websiteselection">';
@@ -2826,17 +2823,17 @@ if (!GETPOST('hide_websitemenu')) {
 				$out .= $s;
 				$out .= '</span>';
 
-				$urltocreatenewpage = $_SERVER["PHP_SELF"].'?action=createcontainer&website='.$website->ref;
+				$urltocreatenewpage = $_SERVER["PHP_SELF"].'?action=createcontainer&website='.urlencode($website->ref);
 
 				if (!empty($conf->use_javascript_ajax)) {
-					$out .= '<script language="javascript">';
+					$out .= '<script type="text/javascript">';
 					$out .= 'jQuery(document).ready(function () {';
 					$out .= '	jQuery("#pageid").change(function () {';
 					$out .= '   	console.log("We select "+jQuery("#pageid option:selected").val());';
 					$out .= '   	if (jQuery("#pgeid option:selected").val() == \'-2\') {';
 					$out .= '  			window.location.href = "'.$urltocreatenewpage.'";';
 					$out .= '		} else {';
-					$out .= '  			window.location.href = "'.$_SERVER["PHP_SELF"].'?website='.$website->ref.'&pageid="+jQuery("#pageid option:selected").val();';
+					$out .= '  			window.location.href = "'.$_SERVER["PHP_SELF"].'?website='.urlencode($website->ref).'&pageid="+jQuery("#pageid option:selected").val();';
 					$out .= '       }';
 					$out .= '   });';
 					$out .= '});';
@@ -2849,15 +2846,16 @@ if (!GETPOST('hide_websitemenu')) {
 			print $langs->trans("New");
 		}
 
-		//print '<input type="submit" class="button" name="refreshpage" value="'.$langs->trans("Load").'"'.($atleastonepage?'':' disabled="disabled"').'>';
-		print '<input type="image" class="valignmiddle" src="'.img_picto('', 'refresh', '', 0, 1).'" name="refreshpage" value="'.$langs->trans("Load").'"'.(($atleastonepage && $action != 'editsource') ? '' : ' disabled="disabled"').'>';
 
+		print '<span class="websiteselection">';
+
+		print '<input type="image" class="valignmiddle" src="'.img_picto('', 'refresh', '', 0, 1).'" name="refreshpage" value="'.$langs->trans("Load").'"'.(($atleastonepage && $action != 'editsource') ? '' : ' disabled="disabled"').'>';
 
 		// Print nav arrows
 		$pagepreviousid = 0;
 		$pagenextid = 0;
 		if ($pageid) {
-			$sql = 'SELECT MAX(rowid) as pagepreviousid FROM '.MAIN_DB_PREFIX.'website_page WHERE rowid < '.$pageid.' AND fk_website = '.$object->id;
+			$sql = "SELECT MAX(rowid) as pagepreviousid FROM ".MAIN_DB_PREFIX."website_page WHERE rowid < ".((int) $pageid)." AND fk_website = ".((int) $object->id);
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
@@ -2867,7 +2865,7 @@ if (!GETPOST('hide_websitemenu')) {
 			} else {
 				dol_print_error($db);
 			}
-			$sql = 'SELECT MIN(rowid) as pagenextid FROM '.MAIN_DB_PREFIX.'website_page WHERE rowid > '.$pageid.' AND fk_website = '.$object->id;
+			$sql = "SELECT MIN(rowid) as pagenextid FROM ".MAIN_DB_PREFIX."website_page WHERE rowid > ".((int) $pageid)." AND fk_website = ".((int) $object->id);
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
@@ -2890,6 +2888,8 @@ if (!GETPOST('hide_websitemenu')) {
 			print '<span class="valignmiddle opacitymedium">'.img_next($langs->trans("Next")).'</span>';
 		}
 
+		print '</span>';
+
 		$websitepage = new WebSitePage($db);
 		if ($pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')) {
 			$websitepage->fetch($pageid);
@@ -2965,13 +2965,16 @@ if (!GETPOST('hide_websitemenu')) {
 					print $formconfirm;
 				}
 
+				print '<span class="websiteselection">';
+
 				print ' &nbsp; ';
 
 				//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'" name="editmeta">';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editmeta" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans("EditPageMeta")).'</a>';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editmeta&token='.newToken().'" class="button bordertransp" title="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'"'.$disabled.'><span class="fa fa-cog paddingrightonly"></span><span class="hideonsmartphone">'.dol_escape_htmltag($langs->trans("EditPageMeta")).'</span></a>';
 
 				//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditHTMLSource")).'" name="editsource">';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editsource" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans("EditHTMLSource")).'</a>';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editsource&token='.newToken().'" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans($conf->dol_optimize_smallscreen ? "HTML" : "EditHTMLSource")).'</a>';
+				print '</span>';
 
 				print '<!-- button EditInLine and ShowSubcontainers -->'."\n";
 				print '<div class="websiteselectionsection inline-block">';
@@ -3058,11 +3061,11 @@ if (!GETPOST('hide_websitemenu')) {
 					//$disabled=' disabled="disabled"';
 					//print '<span class="button bordertransp disabled"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home"></span></span>';
 					//print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
-					print '<a href="#" class="button bordertransp disabled" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
+					print '<a href="#" class="button bordertransp disabled" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"></span></a>';
 				} else {
 					//$disabled='';
 					//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setashome&token='.newToken().'&website='.$website->ref.'&pageid='.$pageid.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setashome&token='.newToken().'&website='.urlencode($website->ref).'&pageid='.((int) $pageid).'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"></span></a>';
 				}
 				print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("ClonePage")).'" name="createpagefromclone">';
 				print '<input type="submit" class="buttonDelete bordertransp" name="delete" value="'.$langs->trans("Delete").'"'.($atleastonepage ? '' : ' disabled="disabled"').'>';
@@ -3120,7 +3123,7 @@ if (!GETPOST('hide_websitemenu')) {
 				print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
 			}
 			if ($action != 'preview') {
-				print '<input type="submit" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
+				print '<input type="submit" class="button button-cancel small" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
 			}
 		}
 
@@ -3147,7 +3150,7 @@ if (!GETPOST('hide_websitemenu')) {
 		if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone') {
 			// Adding jquery code to change on the fly url of preview ext
 			if (!empty($conf->use_javascript_ajax)) {
-				print '<script type="text/javascript" language="javascript">
+				print '<script type="text/javascript">
                     jQuery(document).ready(function() {
                 		jQuery("#websiteinputurl").keyup(function() {
                             console.log("Website external url modified "+jQuery("#previewsiteurl").val());
@@ -3178,7 +3181,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
@@ -3542,8 +3545,8 @@ if ($action == 'createsite') {
 	if ($action == 'createsite') {
 		print '<div class="center">';
 
-		print '<input class="button" type="submit" name="addcontainer" value="'.$langs->trans("Create").'">';
-		print '<input class="button button-cancel" type="submit" name="preview" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" class="button small" name="addcontainer" value="'.$langs->trans("Create").'">';
+		print '<input class="button button-cancel small" type="submit" name="preview" value="'.$langs->trans("Cancel").'">';
 
 		print '</div>';
 	}
@@ -3571,8 +3574,8 @@ if ($action == 'importsite') {
 
 	print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
 	print '<input class="flat minwidth400" type="file" name="userfile[]" accept=".zip">';
-	print '<input type="submit" class="button" name="buttonsubmitimportfile" value="'.dol_escape_htmltag($langs->trans("Upload")).'">';
-	print '<input type="submit" class="button button-cancel" name="preview" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+	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")).'">';
 
 	print '<br><br><br>';
 
@@ -3627,29 +3630,6 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 	if ($action == 'createcontainer') {
 		print '<br>';
 
-		if (!empty($conf->use_javascript_ajax)) {
-			print '<input type="radio" name="radiocreatefrom" id="checkboxcreatefromfetching" value="checkboxcreatefromfetching"'.(GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching' ? ' checked' : '').'> ';
-		}
-		print '<label for="checkboxcreatefromfetching"><span class="opacitymediumxx">'.$langs->trans("CreateByFetchingExternalPage").'</span></label><br>';
-		print '<hr class="tablecheckboxcreatefromfetching'.$hiddenfromfetchingafterload.'">';
-		print '<table class="tableforfield centpercent tablecheckboxcreatefromfetching'.$hiddenfromfetchingafterload.'">';
-		print '<tr><td class="titlefield">';
-		print $langs->trans("URL");
-		print '</td><td>';
-		print info_admin($langs->trans("OnlyEditionOfSourceForGrabbedContentFuture"), 0, 0, 'warning');
-		print '<input class="flat minwidth500" type="text" name="externalurl" value="'.dol_escape_htmltag(GETPOST('externalurl', 'alpha')).'" placeholder="https://externalsite/pagetofetch"> ';
-		print '<br><input class="flat paddingtop" type="checkbox" name="grabimages" value="1" checked="checked"> '.$langs->trans("GrabImagesInto");
-		print ' ';
-		print $langs->trans("ImagesShouldBeSavedInto").' ';
-		$arraygrabimagesinto = array('root'=>$langs->trans("WebsiteRootOfImages"), 'subpage'=>$langs->trans("SubdirOfPage"));
-		print $form->selectarray('grabimagesinto', $arraygrabimagesinto, GETPOSTISSET('grabimagesinto') ? GETPOST('grabimagesinto') : 'root', 0, 0, 0, '', 0, 0, 0, '', '', 1);
-		print '<br>';
-		print '<input class="button" style="margin-top: 5px" type="submit" name="fetchexternalurl" value="'.dol_escape_htmltag($langs->trans("FetchAndCreate")).'">';
-		print '</td></tr>';
-		print '</table>';
-
-		print '<br>';
-
 		if (!empty($conf->use_javascript_ajax)) {
 			print '<input type="radio" name="radiocreatefrom" id="checkboxcreatemanually" value="checkboxcreatemanually"'.(GETPOST('radiocreatefrom') == 'checkboxcreatemanually' ? ' checked' : '').'> ';
 		}
@@ -3816,7 +3796,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 	if (empty($object->lang) && empty($object->otherlang)) {
 		$onlykeys = null; // We keep full list of languages
 	}
-	print $formadmin->select_language($pagelang ? $pagelang : '', 'WEBSITE_LANG', 0, null, '1', 0, 0, 'minwidth200', 0, 0, 0, $onlykeys, 1);
+	print img_picto('', 'language', 'class="pictofixedwidth"').$formadmin->select_language($pagelang ? $pagelang : '', 'WEBSITE_LANG', 0, null, '1', 0, 0, 'minwidth200', 0, 0, 0, $onlykeys, 1);
 	$htmltext = $langs->trans("AvailableLanguagesAreDefinedIntoWebsiteProperties");
 	print $form->textwithpicto('', $htmltext);
 	print '</td></tr>';
@@ -3829,7 +3809,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 	print '</td><td>';
 	if ($action != 'createcontainer') {
 		// Has translation pages
-		$sql = 'SELECT rowid, lang from '.MAIN_DB_PREFIX.'website_page where fk_page = '.$objectpage->id;
+		$sql = "SELECT rowid, lang from ".MAIN_DB_PREFIX."website_page where fk_page = ".((int) $objectpage->id);
 		$resql = $db->query($sql);
 		if ($resql) {
 			$num_rows = $db->num_rows($resql);
@@ -3904,7 +3884,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 		}
 
 		print '<tr><td class="toptd">'.$form->editfieldkey('Categories', 'categories', '', $objectpage, 0).'</td><td>';
-		print img_picto('', 'category', 'class="paddingright"');
+		print img_picto('', 'category', 'class="pictofixedwidth"');
 		print $form->multiselectarray('categories', $cate_arbo, (GETPOSTISSET('categories') ? GETPOST('categories', 'array') : $arrayselected), null, null, 'minwidth200 widthcentpercentminusxx');
 		print "</td></tr>";
 	}
@@ -3980,16 +3960,42 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 	if ($action == 'createcontainer') {
 		print '<div class="center tablecheckboxcreatemanually'.$hiddenmanuallyafterload.'">';
 
-		print '<input class="button" type="submit" name="addcontainer" value="'.$langs->trans("Create").'">';
-		print '<input class="button button-cancel" type="submit" name="preview" value="'.$langs->trans("Cancel").'">';
+		print '<input type="submit" class="button small" name="addcontainer" value="'.$langs->trans("Create").'">';
+		print '<input class="button button-cancel small" type="submit" name="preview" value="'.$langs->trans("Cancel").'">';
 
 		print '</div>';
+
+
+		print '<br>';
+
+		if (!empty($conf->use_javascript_ajax)) {
+			print '<input type="radio" name="radiocreatefrom" id="checkboxcreatefromfetching" value="checkboxcreatefromfetching"'.(GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching' ? ' checked' : '').'> ';
+		}
+		print '<label for="checkboxcreatefromfetching"><span class="opacitymediumxx">'.$langs->trans("CreateByFetchingExternalPage").'</span></label><br>';
+		print '<hr class="tablecheckboxcreatefromfetching'.$hiddenfromfetchingafterload.'">';
+		print '<table class="tableforfield centpercent tablecheckboxcreatefromfetching'.$hiddenfromfetchingafterload.'">';
+		print '<tr><td class="titlefield">';
+		print $langs->trans("URL");
+		print '</td><td>';
+		print info_admin($langs->trans("OnlyEditionOfSourceForGrabbedContentFuture"), 0, 0, 'warning');
+		print '<input class="flat minwidth500" type="text" name="externalurl" value="'.dol_escape_htmltag(GETPOST('externalurl', 'alpha')).'" placeholder="https://externalsite/pagetofetch"> ';
+		print '<br><input class="flat paddingtop" type="checkbox" name="grabimages" value="1" checked="checked"> '.$langs->trans("GrabImagesInto");
+		print ' ';
+		print $langs->trans("ImagesShouldBeSavedInto").' ';
+		$arraygrabimagesinto = array('root'=>$langs->trans("WebsiteRootOfImages"), 'subpage'=>$langs->trans("SubdirOfPage"));
+		print $form->selectarray('grabimagesinto', $arraygrabimagesinto, GETPOSTISSET('grabimagesinto') ? GETPOST('grabimagesinto') : 'root', 0, 0, 0, '', 0, 0, 0, '', '', 1);
+		print '<br>';
+		print '<input class="button" style="margin-top: 5px" type="submit" name="fetchexternalurl" value="'.dol_escape_htmltag($langs->trans("FetchAndCreate")).'">';
+		print '</td></tr>';
+		print '</table>';
 	}
 
 	if ($action == 'createcontainer') {
-		print '<script type="text/javascript" language="javascript">
+		print '<script type="text/javascript">
 			jQuery(document).ready(function() {
 				var disableautofillofalias = 0;
+				var selectedm = \'\';
+				var selectedf = \'\';
 				jQuery("#WEBSITE_TITLE").keyup(function() {
 					if (disableautofillofalias == 0)
 					{
@@ -4006,17 +4012,31 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 					disableautofillofalias = 1;
 				});
 
-				jQuery("#checkboxcreatefromfetching,#checkboxcreatemanually").change(function() {
-					console.log("we select a method to create a new container"+jQuery("#checkboxcreatefromfetching:checked").val())
-					if (typeof(jQuery("#checkboxcreatefromfetching:checked").val()) != \'undefined\')
-					{
-						jQuery(".tablecheckboxcreatefromfetching").show();
-						jQuery(".tablecheckboxcreatemanually").hide();
+				jQuery("#checkboxcreatefromfetching,#checkboxcreatemanually").click(function() {
+					console.log("we select a method to create a new container "+jQuery("#checkboxcreatefromfetching:checked").val())
+					jQuery(".tablecheckboxcreatefromfetching").hide();
+					jQuery(".tablecheckboxcreatemanually").hide();
+					if (typeof(jQuery("#checkboxcreatefromfetching:checked").val()) != \'undefined\') {
+						console.log("show a");
+						if (selectedf != \'createfromfetching\') {
+							jQuery(".tablecheckboxcreatefromfetching").show();
+							selectedf = \'createfromfetching\';
+							selectedm = \'\';
+						} else {
+							jQuery(".tablecheckboxcreatefromfetching").hide();
+							selectedf = \'\';
+						}
 					}
-					if (typeof(jQuery("#checkboxcreatemanually:checked").val()) != \'undefined\')
-					{
-						jQuery(".tablecheckboxcreatefromfetching").hide();
-						jQuery(".tablecheckboxcreatemanually").show();
+					if (typeof(jQuery("#checkboxcreatemanually:checked").val()) != \'undefined\') {
+						console.log("show b");
+						if (selectedm != \'createmanually\') {
+							jQuery(".tablecheckboxcreatemanually").show();
+							selectedm = \'createmanually\';
+							selectedf = \'\';
+						} else {
+							jQuery(".tablecheckboxcreatemanually").hide();
+							selectedm = \'\';
+						}
 					}
 				});
 			});
@@ -4124,9 +4144,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>';
 
@@ -4146,32 +4166,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>';
@@ -4180,7 +4200,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>';
 
@@ -4345,7 +4365,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 					// Edit properties, HTML sources, status
 					print '<td class="tdwebsitesearchresult right nowraponall">';
 					$disabled = '';
-					$urltoedithtmlsource = $_SERVER["PHP_SELF"].'?action=editmeta&websiteid='.$website->id.'&pageid='.$answerrecord->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].$param);
+					$urltoedithtmlsource = $_SERVER["PHP_SELF"].'?action=editmeta&token='.newToken().'&websiteid='.$website->id.'&pageid='.$answerrecord->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].$param);
 					if (empty($user->rights->website->write)) {
 						$disabled = ' disabled';
 						$urltoedithtmlsource = '';
@@ -4353,14 +4373,14 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 					print '<a class="editfielda marginleftonly marginrightonly '.$disabled.'" href="'.$urltoedithtmlsource.'" title="'.$langs->trans("EditPageMeta").'">'.img_picto($langs->trans("EditPageMeta"), 'pencil-ruler').'</a>';
 
 					$disabled = '';
-					$urltoedithtmlsource = $_SERVER["PHP_SELF"].'?action=editsource&websiteid='.$website->id.'&pageid='.$answerrecord->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].$param);
+					$urltoedithtmlsource = $_SERVER["PHP_SELF"].'?action=editsource&token='.newToken().'&websiteid='.$website->id.'&pageid='.$answerrecord->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].$param);
 					if (empty($user->rights->website->write)) {
 						$disabled = ' disabled';
 						$urltoedithtmlsource = '';
 					}
 					print '<a class="editfielda  marginleftonly marginrightonly '.$disabled.'" href="'.$urltoedithtmlsource.'" title="'.$langs->trans("EditHTMLSource").'">'.img_picto($langs->trans("EditHTMLSource"), 'edit').'</a>';
 
-					print '<span class="marginleftonly marginrightonly"></span>'.ajax_object_onoff($answerrecord, 'status', 'status', 'Enabled', 'Disabled');
+					print '<span class="marginleftonly marginrightonly"></span>'.ajax_object_onoff($answerrecord, 'status', 'status', 'Enabled', 'Disabled', array(), 'valignmiddle');
 
 					print '</td>';
 
@@ -4412,7 +4432,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 					// Container url and label
 					print '<td>';
 					$backtopageurl = $_SERVER["PHP_SELF"].$param;
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=editcss&website='.$website->ref.'&backtopage='.urlencode($backtopageurl).'">'.$langs->trans("EditCss").'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=editcss&token='.newToken().'&website='.urlencode($website->ref).'&backtopage='.urlencode($backtopageurl).'">'.$langs->trans("EditCss").'</a>';
 					print '</td>';
 
 					// Language
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index cf4d26b2c33..118627f19ea 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -140,11 +140,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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 $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 }
@@ -172,9 +168,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	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->buttonsSaveCancel();
 
 	print '</form>';
 }
@@ -236,7 +230,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		{
 			if ($action != 'classify')
 			{
-				$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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.'">';
@@ -308,7 +302,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 			if ($user->rights->website->write) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a></div>'."\n";
 			}
 
 			/*
@@ -342,7 +336,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 		print '<a name="builddoc"></a>'; // ancre
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		/*
 		$MAXEVENT = 10;
@@ -350,10 +344,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, 'websiteaccount', $socid, 1, '', $MAXEVENT);
+		$somethingshown = $formactions->showactions($object, $object->element, $socid, 1, '', $MAXEVENT);
 		*/
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 	// Presend form
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
old mode 100755
new mode 100644
index 2965366e03b..3fed177d95c
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -111,8 +111,8 @@ class Workstation extends CommonObject
 		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>512, 'notnull'=>-1, 'visible'=>-2,),
 		'nb_operators_required' => array('type'=>'integer', 'label'=>'NbOperatorsRequired', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1,),
-		'thm_operator_estimated' => array('type'=>'double', 'help'=>'THMEstimatedHelp','label'=>'THMOperatorEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1,),
-		'thm_machine_estimated' => array('type'=>'double', 'help'=>'THMEstimatedHelp', 'label'=>'THMMachineEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1,),
+		'thm_operator_estimated' => array('type'=>'double', 'help'=>'THMOperatorEstimatedHelp','label'=>'THMOperatorEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right'),
+		'thm_machine_estimated' => array('type'=>'double', 'help'=>'THMMachineEstimatedHelp', 'label'=>'THMMachineEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right'),
 		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'default'=>1, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Disabled', '1'=>'Enabled'),),
 	);
 	public $rowid;
@@ -427,27 +427,27 @@ class Workstation extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$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)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -599,7 +599,7 @@ class Workstation extends CommonObject
 			if (!empty($this->fields['fk_user_valid'])) {
 				$sql .= ", fk_user_valid = ".$user->id;
 			}
-			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -850,13 +850,13 @@ class Workstation extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("workstation");
-			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled');
-			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatus[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
 		}
 
 		$statusType = 'status'.$status;
-		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
-		//if ($status == self::STATUS_CANCELED) $statusType = 'status6';
+		//if ($status == self::STATUS_DISABLED) $statusType = 'status6';
+		if ($status == self::STATUS_ENABLED) $statusType = 'status4';
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
diff --git a/htdocs/workstation/class/workstationresource.class.php b/htdocs/workstation/class/workstationresource.class.php
index 72fb91cfe85..0b670891583 100644
--- a/htdocs/workstation/class/workstationresource.class.php
+++ b/htdocs/workstation/class/workstationresource.class.php
@@ -38,8 +38,8 @@ class WorkstationResource extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'fk_workstation' => array ('type' => 'integer'),
-		'fk_resource' => array ('type' => 'integer')
+		'fk_workstation' => array('type' => 'integer'),
+		'fk_resource' => array('type' => 'integer')
 	);
 
 	/**
diff --git a/htdocs/workstation/class/workstationusergroup.class.php b/htdocs/workstation/class/workstationusergroup.class.php
index 86fdda7ce66..a40ea43143a 100644
--- a/htdocs/workstation/class/workstationusergroup.class.php
+++ b/htdocs/workstation/class/workstationusergroup.class.php
@@ -37,8 +37,8 @@ class WorkstationUserGroup extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'fk_workstation' => array ('type' => 'integer'),
-		'fk_usergroup' => array ('type' => 'integer')
+		'fk_workstation' => array('type' => 'integer'),
+		'fk_usergroup' => array('type' => 'integer')
 	);
 
 	/**
diff --git a/htdocs/workstation/lib/workstation.lib.php b/htdocs/workstation/lib/workstation.lib.php
old mode 100755
new mode 100644
index fc57575bcf9..92ea28d8bfb
--- a/htdocs/workstation/lib/workstation.lib.php
+++ b/htdocs/workstation/lib/workstation.lib.php
@@ -34,7 +34,7 @@ function workstationAdminPrepareHead()
 
 	$h = 0;
 	$head = array();
-	$head[$h][0] = DOL_URL_ROOT . "/admin/workstation.php";
+	$head[$h][0] = DOL_URL_ROOT."/admin/workstation.php";
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
diff --git a/htdocs/workstation/lib/workstation_workstation.lib.php b/htdocs/workstation/lib/workstation_workstation.lib.php
old mode 100755
new mode 100644
diff --git a/htdocs/workstation/workstation_agenda.php b/htdocs/workstation/workstation_agenda.php
old mode 100755
new mode 100644
index 682431d7c8a..78140eddd40
--- a/htdocs/workstation/workstation_agenda.php
+++ b/htdocs/workstation/workstation_agenda.php
@@ -52,8 +52,8 @@ if (GETPOST('actioncode', 'array')) {
 $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');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -154,7 +154,7 @@ if ($object->id > 0) {
 		if ($permissiontoadd)
 		{
 			if ($action != 'classify')
-				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/workstation/workstation_card.php b/htdocs/workstation/workstation_card.php
old mode 100755
new mode 100644
index 5b63ca2d481..900a1964800
--- a/htdocs/workstation/workstation_card.php
+++ b/htdocs/workstation/workstation_card.php
@@ -1,6 +1,5 @@
 <?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
@@ -161,7 +160,7 @@ llxHeader('', $title, $help_url);
 
 // jquery code
 ?>
-	<script type="text/javascript" language="javascript">
+	<script type="text/javascript">
 
 		jQuery(document).ready(function() {
 			jQuery("#type").change(function() {
@@ -231,11 +230,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
-	print '&nbsp; ';
-	print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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 $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 
@@ -288,9 +283,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	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->buttonsSaveCancel();
 
 	print '</form>';
 }
@@ -351,7 +344,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
 	 if ($permissiontoadd) {
-	 //if ($action != 'classify') $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
+	 //if ($action != 'classify') $morehtmlref.='<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);
@@ -398,26 +391,28 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Groups
 	if ($object->type !== 'MACHINE') {
 		$toprint = array();
+		$g = new UserGroup($db);
 		foreach ($object->usergroups as $id_group) {
-			$g = new UserGroup($db);
 			$g->fetch($id_group);
-			$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $g->getNomUrl(1) . '</li>';
+			$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $g->getNomUrl(1, '', 0, 'categtextwhite') . '</li>';
 		}
+
 		print '<tr><td>' . $langs->trans('Groups') . '</td><td>';
-		print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+		print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 		print '</td></tr>';
 	}
 
 	// Resources
 	if ($object->type !== 'HUMAN') {
 		$toprint = array();
+		$r = new Dolresource($db);
 		foreach ($object->resources as $id_resource) {
-			$r = new Dolresource($db);
 			$r->fetch($id_resource);
-			$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $r->getNomUrl(1) . '</li>';
+			$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $r->getNomUrl(1, '', '', 0, 'categtextwhite') . '</li>';
 		}
+
 		print '<tr><td>' . $langs->trans('Machines') . '</td><td>';
-		print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+		print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 		print '</td></tr>';
 	}
 
@@ -446,7 +441,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (empty($reshook)) {
 			// Modify
 			if ($permissiontoadd) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
+				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";
 			}
diff --git a/htdocs/workstation/workstation_document.php b/htdocs/workstation/workstation_document.php
old mode 100755
new mode 100644
index b33be2818dc..f52ef1fe796
--- a/htdocs/workstation/workstation_document.php
+++ b/htdocs/workstation/workstation_document.php
@@ -42,8 +42,8 @@ $ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -74,12 +74,12 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->workstation->multidir_output[$object->entity ? $object->entity : $conf->entity]."/workstation/".get_exdir(0, 0, 0, 1, $object);
 }
 
-$permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
-
 // Security check
 $isdraft = 0;
 restrictedArea($user, $object->element, $object->id, $object->table_element, 'workstation', 'fk_soc', 'rowid', $isdraft);
 
+$permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
+
 
 /*
  * Actions
@@ -118,7 +118,7 @@ if ($object->id) {
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/workstation/workstation_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/workstation/workstation_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
 	/*
@@ -135,7 +135,7 @@ if ($object->id) {
 	 if ($permissiontoadd)
 	 {
 	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
old mode 100755
new mode 100644
index d305e0c2c33..25dcc44de65
--- a/htdocs/workstation/workstation_list.php
+++ b/htdocs/workstation/workstation_list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2020 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2020      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
@@ -120,7 +120,7 @@ foreach ($object->fields as $key => $val) {
 }
 
 $arrayfields['wug.fk_usergroup'] = array(
-	'label'=>$langs->trans('Groups'),
+	'label'=>$langs->trans('UserGroups'),
 	'checked'=>(($visible < 0) ? 0 : 1),
 	'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 	'position'=>1000,
@@ -220,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
@@ -300,7 +300,7 @@ $sql .= $hookmanager->resPrint;
 
 $sql.= " GROUP BY ";
 foreach ($object->fields as $key => $val) {
-	$sql.='t.'.$key.', ';
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -345,7 +345,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
 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('/workstation/workstation_card.php', 1).'?id='.$id);
+	header("Location: ".DOL_URL_ROOT.'/workstation/workstation_card.php?id='.$id);
 	exit;
 }
 
@@ -616,7 +616,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-			if (!empty($val['isameasure'])) {
+			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
@@ -633,25 +633,39 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	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" style="background: #bbb">' . $g->getNomUrl(1) . '</li>';
+			$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" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+		print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 		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" style="background: #bbb">' . $r->getNomUrl(1) . '</li>';
+			$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" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+		print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 		print '</td>';
 	}
 
diff --git a/htdocs/workstation/workstation_note.php b/htdocs/workstation/workstation_note.php
old mode 100755
new mode 100644
index 18fa87b5ea6..ebe8d99af16
--- a/htdocs/workstation/workstation_note.php
+++ b/htdocs/workstation/workstation_note.php
@@ -68,8 +68,13 @@ restrictedArea($user, $object->element, $object->id, $object->table_element, 'wo
 /*
  * Actions
  */
-
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+$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
+}
 
 
 /*
@@ -91,7 +96,7 @@ if ($id > 0 || !empty($ref)) {
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/workstation/workstation_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/workstation/workstation_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
 	/*
@@ -108,7 +113,7 @@ if ($id > 0 || !empty($ref)) {
 	 if ($permissiontoadd)
 	 {
 	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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);
diff --git a/htdocs/zapier/admin/setup.php b/htdocs/zapier/admin/setup.php
index 7249e8c3849..08d2c1703a8 100644
--- a/htdocs/zapier/admin/setup.php
+++ b/htdocs/zapier/admin/setup.php
@@ -112,7 +112,7 @@ if ($action == 'edit') {
 		print '</table>';
 
 		print '<div class="tabsAction">';
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 		print '</div>';
 	} else {
 		// Setup page goes here
diff --git a/htdocs/zapier/class/api_zapier.class.php b/htdocs/zapier/class/api_zapier.class.php
index db1073c6299..5bcab883238 100644
--- a/htdocs/zapier/class/api_zapier.class.php
+++ b/htdocs/zapier/class/api_zapier.class.php
@@ -196,8 +196,9 @@ class ZapierApi extends DolibarrApi
 			$sql .= " AND sc.fk_user = ".((int) $search_sale);
 		}
 		if ($sqlfilters) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$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).")";
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index ba04f504da6..c3b9147a46d 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -419,25 +419,25 @@ class Hook extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.' = '.((int) $value);
+					$sqlwhere[] = $key." = ".((int) $value);
 				} elseif (strpos($key, 'date') !== false) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
 				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
 		if (count($sqlwhere) > 0) {
-			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+			$sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
 		}
 
 		if (!empty($sortfield)) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-			$sql .= ' '.$this->db->plimit($limit, $offset);
+			$sql .= $this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -516,7 +516,7 @@ class Hook extends CommonObject
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-		$url = dol_buildpath('/zapier/hook_card.php', 1).'?id='.$this->id;
+		$url = DOL_URL_ROOT.'/zapier/hook_card.php?id='.$this->id;
 
 		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
@@ -611,10 +611,10 @@ class Hook extends CommonObject
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
-			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled');
-			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
 		}
 
 		$statusType = 'status5';
diff --git a/package.json b/package.json
index 02c9b2abcb9..eb2362f26c7 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,6 @@
   "dependencies": {
     "chart.js": "^2.9.4",
     "cucumber-pretty": "^6.0.0",
-    "node-fetch": "^2.6.1"
+    "node-fetch": "^3.1.1"
   }
 }
diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php
index 6df1f5ca4b8..a8a4363ba5c 100755
--- a/scripts/accountancy/export-thirdpartyaccount.php
+++ b/scripts/accountancy/export-thirdpartyaccount.php
@@ -96,9 +96,12 @@ if (empty($date_start) || empty($date_end)) { // We define date_start and date_e
 		$date_start = dol_get_first_day($year_start, 10, false);
 		$date_end = dol_get_last_day($year_start, 12, false);
 	}
-} else {
 }
 
+/*
+ * Main
+ */
+
 llxHeader();
 
 $form = new Form($db);
@@ -127,9 +130,17 @@ print '
 		}
 </script>';
 
-$sql = "(SELECT s.rowid, s.nom as name , s.address, s.zip , s.town, s.code_compta as compta , ";
-$sql .= " s.fk_forme_juridique , s.fk_pays , s.phone , s.fax ,   f.datec , f.fk_soc , cp.label as country ";
+$sql = "(SELECT s.rowid, s.nom as name , s.address, s.zip , s.town";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= ", spe.accountancy_code_customer as compta";
+} else {
+	$sql .= ", s.code_compta";
+}
+$sql .= ", s.fk_forme_juridique , s.fk_pays , s.phone , s.fax ,   f.datec , f.fk_soc , cp.label as country ";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+}
 $sql .= ", ".MAIN_DB_PREFIX."facture as f";
 $sql .= ", ".MAIN_DB_PREFIX."c_country as cp";
 $sql .= " WHERE f.fk_soc = s.rowid";
@@ -143,9 +154,17 @@ if ($socid > 0) {
 }
 $sql .= " GROUP BY name";
 $sql .= ")";
-$sql .= "UNION (SELECT s.rowid, s.nom as name , s.address, s.zip , s.town, s.code_compta_fournisseur as compta , ";
+$sql .= "UNION (SELECT s.rowid, s.nom as name , s.address, s.zip , s.town,  , ";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= ", spe.accountancy_code_supplier as compta";
+} else {
+	$sql .= ", s.code_compta_fournisseur as compta";
+}
 $sql .= " s.fk_forme_juridique , s.fk_pays , s.phone , s.fax ,   ff.datec , ff.fk_soc , cp.label as country ";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+}
 $sql .= ", ".MAIN_DB_PREFIX."facture_fourn as ff";
 $sql .= ", ".MAIN_DB_PREFIX."c_country as cp";
 $sql .= " WHERE ff.fk_soc = s.rowid";
@@ -186,9 +205,6 @@ if ($resql) {
 		$i++;
 	}
 
-	/*
-	 * View
-	 */
 
 	$thirdpartystatic = new Societe($db);
 
diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php
index 53ec46ddcd8..ccaabb1afda 100755
--- a/scripts/company/sync_contacts_dolibarr2ldap.php
+++ b/scripts/company/sync_contacts_dolibarr2ldap.php
@@ -69,6 +69,11 @@ foreach ($argv as $key => $val) {
 
 $now = $argv[1];
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 print "Mails sending disabled (useless in batch mode)\n";
 $conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
 print "\n";
@@ -149,7 +154,6 @@ if ($resql) {
 	}
 
 	$ldap->unbind();
-	$ldap->close();
 } else {
 	dol_print_error($db);
 }
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 8aa996f9c17..647b1405d71 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -105,6 +105,11 @@ if ($key != $conf->global->CRON_KEY) {
 	exit(-1);
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-only mode\n";
+	exit(-1);
+}
+
 // If param userlogin is reserved word 'firstadmin'
 if ($userlogin == 'firstadmin') {
 	$sql = 'SELECT login, entity from '.MAIN_DB_PREFIX.'user WHERE admin = 1 and statut = 1 ORDER BY entity LIMIT 1';
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 0d59a1b5db5..f427e42d8cb 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -86,6 +86,11 @@ if (!empty($conf->global->MAILING_DELAY)) {
 if ($conf->global->MAILING_LIMIT_SENDBYCLI == '-1') {
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-only mode\n";
+	exit(-1);
+}
+
 $user = new User($db);
 // for signature, we use user send as parameter
 if (!empty($login)) {
@@ -163,6 +168,8 @@ if ($resql) {
 						$error++;
 					}
 
+					$thirdpartystatic = new Societe($db);
+
 					// Look on each email and sent message
 					$i = 0;
 					while ($i < $num2) {
@@ -195,6 +202,15 @@ if ($resql) {
 
 						// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
 						$substitutionarray['__ID__'] = $obj->source_id;
+						if ($obj->source_type == "thirdparty") {
+							$result = $thirdpartystatic->fetch($obj->source_id);
+
+							if ($result > 0) {
+								$substitutionarray['__THIRDPARTY_CUSTOMER_CODE__'] = $thirdpartystatic->code_client;
+							} else {
+								$substitutionarray['__THIRDPARTY_CUSTOMER_CODE__'] = '';
+							}
+						}
 						$substitutionarray['__EMAIL__'] = $obj->email;
 						$substitutionarray['__LASTNAME__'] = $obj->lastname;
 						$substitutionarray['__FIRSTNAME__'] = $obj->firstname;
diff --git a/scripts/emailings/reset-invalid-emails.php b/scripts/emailings/reset-invalid-emails.php
index 6eb31abe995..0e7fdb4e6bf 100755
--- a/scripts/emailings/reset-invalid-emails.php
+++ b/scripts/emailings/reset-invalid-emails.php
@@ -57,6 +57,7 @@ require_once DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php";
 $version = DOL_VERSION;
 $error = 0;
 
+
 /*
  * Main
  */
@@ -71,6 +72,11 @@ if (!in_array($type, array('all', 'thirdparties', 'contacts', 'users', 'members'
 	exit(-1);
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 $db->begin();
 
 
diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index 41c84ee4d41..4657c16bd65 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -80,6 +80,11 @@ if ($mode != 'confirm') {
 	$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 $sql = "SELECT f.ref, f.total_ttc, f.date_lim_reglement as due_date,";
 $sql .= " s.rowid as sid, s.nom as name, s.email, s.default_lang";
 if ($targettype == 'contacts') {
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index 3cc9ad1a0eb..606ac32ca66 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -76,6 +76,11 @@ if ($mode != 'confirm') {
 	$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 $sql = "SELECT f.ref, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, s.email, s.default_lang,";
 $sql .= " u.rowid as uid, u.lastname, u.firstname, u.email, u.lang";
 $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php
index 309de5fe4bd..b19398eda50 100755
--- a/scripts/invoices/rebuild_merge_pdf.php
+++ b/scripts/invoices/rebuild_merge_pdf.php
@@ -52,6 +52,7 @@ $langs->load("main");
 $version = DOL_VERSION;
 $error = 0;
 
+
 /*
  * Main
  */
@@ -66,6 +67,11 @@ if (!isset($argv[1])) {
 	exit(-1);
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 $diroutputpdf = $conf->facture->dir_output.'/temp';
 $newlangid = 'en_EN'; // To force a new lang id
 $filter = array();
diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php
index 4ecbe2e9b08..74a5c4db210 100755
--- a/scripts/members/sync_members_dolibarr2ldap.php
+++ b/scripts/members/sync_members_dolibarr2ldap.php
@@ -68,6 +68,11 @@ foreach ($argv as $key => $val) {
 	}
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 $now = $argv[1];
 
 print "Mails sending disabled (useless in batch mode)\n";
@@ -158,7 +163,6 @@ if ($resql) {
 	}
 
 	$ldap->unbind();
-	$ldap->close();
 } else {
 	dol_print_error($db);
 }
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index be312ec1932..b40a267d62e 100755
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -146,6 +146,11 @@ if ($typeid <= 0) {
 	exit(-2);
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 if (!$confirmed) {
 	print "Hit Enter to continue or CTRL+C to stop...\n";
 	$input = trim(fgets(STDIN));
diff --git a/scripts/members/sync_members_types_dolibarr2ldap.php b/scripts/members/sync_members_types_dolibarr2ldap.php
index cec998abda5..3ec2c9d0d90 100755
--- a/scripts/members/sync_members_types_dolibarr2ldap.php
+++ b/scripts/members/sync_members_types_dolibarr2ldap.php
@@ -70,6 +70,12 @@ dol_syslog($script_file." launched with arg ".join(',', $argv));
  * }
  */
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
+
 $sql = "SELECT rowid";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type";
 
@@ -115,7 +121,6 @@ if ($resql) {
 		}
 
 		$ldap->unbind();
-		$ldap->close();
 	} else {
 		print $ldap->error;
 	}
diff --git a/scripts/members/sync_members_types_ldap2dolibarr.php b/scripts/members/sync_members_types_ldap2dolibarr.php
index 9aea20fb209..12a83633725 100755
--- a/scripts/members/sync_members_types_ldap2dolibarr.php
+++ b/scripts/members/sync_members_types_ldap2dolibarr.php
@@ -88,6 +88,11 @@ foreach ($argv as $key => $val) {
 	}
 }
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 print "Mails sending disabled (useless in batch mode)\n";
 $conf->global->MAIN_DISABLE_ALL_MAILS = 1; // On bloque les mails
 print "\n";
diff --git a/scripts/odt2pdf/odt2pdf.sh b/scripts/odt2pdf/odt2pdf.sh
index befdaeedcf5..fb44b2329ab 100755
--- a/scripts/odt2pdf/odt2pdf.sh
+++ b/scripts/odt2pdf/odt2pdf.sh
@@ -5,13 +5,18 @@
 # @copyright  GPL License 2019 - Camille Lafitte - cam.lafit@azerttyu.net 
 #
 # Convert an ODT into a PDF using "native" or "jodconverter" or "pyodconverter" or "unoconv" tool.
-# Dolibarr variable MAIN_ODT_AS_PDF must be defined 
-#  to value "native" to call soffice native exporter feature  
+# Dolibarr variable MAIN_ODT_AS_PDF must be defined ...
+#  to value "libreoffice" to call soffice native exporter feature (in such a case, this script is useless)  
 #  or value "unoconv" to call unoconv CLI tool after ODT generation.
 #  or value "pyodconverter" to call DocumentConverter.py after ODT generation.
 #  or value "jodconverter" to call jodconverter wrapper after ODT generation
 #  or value "/pathto/jodconverter-cli-file.jar" to call jodconverter java tool without wrapper after ODT generation.
 # Dolibarr variable MAIN_DOL_SCRIPTS_ROOT must be defined to path of script directories (otherwise dolibarr will try to guess).
+#
+# NOTE: Using this script is depcrecated, you can now convert generated ODT to PDF on the fly by setting the value MAIN_ODT_AS_PDF
+# to 'libreoffice'. It requires only soffice (OpenOffice or LibreOffice) installed on server (use apt install soffice libreoffice-common libreoffice-writer).
+# If you got this error: javaldx failed! Warning: failed to read path from javaldx with no return to prompt when running soffice --headless -env:UserInstallation=file:"/tmp" --convert-to pdf --outdir xxx ./yyy.odt, 
+# check that directory defined into env:UserInstallation parameters exists and is writeable.
 
 
 if [ "x$1" == "x" ] 
diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php
index dd0476bbfca..7d9ed2f307e 100755
--- a/scripts/user/sync_groups_dolibarr2ldap.php
+++ b/scripts/user/sync_groups_dolibarr2ldap.php
@@ -112,7 +112,6 @@ if ($resql) {
 	}
 
 	$ldap->unbind();
-	$ldap->close();
 } else {
 	dol_print_error($db);
 }
diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php
index 26b1363d5a1..abe0b9fbcf4 100755
--- a/scripts/user/sync_users_dolibarr2ldap.php
+++ b/scripts/user/sync_users_dolibarr2ldap.php
@@ -111,7 +111,6 @@ if ($resql) {
 	}
 
 	$ldap->unbind();
-	$ldap->close();
 } else {
 	dol_print_error($db);
 }
diff --git a/scripts/website/migrate-news-joomla2dolibarr.php b/scripts/website/migrate-news-joomla2dolibarr.php
index 605f982bd16..bb02274a6a3 100755
--- a/scripts/website/migrate-news-joomla2dolibarr.php
+++ b/scripts/website/migrate-news-joomla2dolibarr.php
@@ -63,8 +63,18 @@ include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 include_once DOL_DOCUMENT_ROOT.'/core/lib/website2.lib.php';
 
+
+/*
+ * Main
+ */
+
 $langs->load('main');
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 $joomlaserverinfoarray = preg_split('/(:|@|\/)/', $joomlaserverinfo);
 $joomlalogin = $joomlaserverinfoarray[0];
 $joomlapass = $joomlaserverinfoarray[1];
diff --git a/scripts/website/regenerate-pages.php b/scripts/website/regenerate-pages.php
index 46b9283a4cf..8e4b1279532 100755
--- a/scripts/website/regenerate-pages.php
+++ b/scripts/website/regenerate-pages.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file scripts/website/regenerate_pages.php
+ * \file scripts/website/regenerate-pages.php
  * \ingroup scripts
  * \brief Regenerate all pages of a web site
  */
@@ -58,8 +58,18 @@ include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 include_once DOL_DOCUMENT_ROOT.'/core/lib/website2.lib.php';
 
+
+/*
+ * Main
+ */
+
 $langs->load('main');
 
+if (!empty($dolibarr_main_db_readonly)) {
+	print "Error: instance in read-onyl mode\n";
+	exit(-1);
+}
+
 $website = new Website($db);
 $result = $website->fetch(0, $websiteref);
 if ($result <= 0) {
diff --git a/test/README b/test/README
index 012d8cf44e2..5c18fe96506 100644
--- a/test/README
+++ b/test/README
@@ -30,11 +30,19 @@ If not using Eclipse, to install PHPUnit manually:
 > sudo pear upgrade-all
 > sudo pear install --alldeps phpunit/PHPUnit
 
+
 * Run Unit tests: 
 > cd test/phpunit
 > phpunit MyFileTest.php
 If using Eclipse, select the test and click on menu "Run external tools and choose PHPUnit".
 
+* Example to run phpunit 7.0 from composer using php version 8.0:
+> cd ~/tmp
+> composer -i phpunit
+> cd test/phpunit
+> /usr/bin/php8.0 ~/tmp/htdocs/includes/phpunit/phpunit/phpunit MyFileTest.php
+
+
 * Generate a report of Unit tests code coverage done by one tested class:
 > cd test
 > phpunit -d memory_limit=-1 -d max_input_time=1800 -d max_execution_time=1800 --configuration ./phpunit/phpunittest.xml --coverage-html ./report ./report/logs/phpunit.xml phpunit/MyClassTest.php
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 723f3853ad7..f7ae6d295ab 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *      \file       test/phpunit/SqlTest.php
+ *      \file       test/phpunit/CodingPhpTest.php
  *      \ingroup    test
  *      \brief      PHPUnit test
  *      \remarks    To run this script as CLI:  phpunit filename.php
@@ -201,38 +201,32 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 				|| in_array($file['name'], array('modules_boxes.php', 'rapport.pdf.php', 'TraceableDB.php'))) {
 				if (! in_array($file['name'], array(
 					'api.class.php',
-					'actioncomm.class.php',
 					'commonobject.class.php',
 					'conf.class.php',
 					'html.form.class.php',
 					'html.formmail.class.php',
-					'infobox.class.php',
-					'link.class.php',
 					'translate.class.php',
 					'utils.class.php',
 					'modules_product.class.php',
 					'modules_societe.class.php',
 					'TraceableDB.php',
-					'expeditionbatch.class.php',
-					'expensereport_ik.class.php',
-					'expensereport_rule.class.php',
 					'multicurrency.class.php',
 					'productbatch.class.php',
 					'reception.class.php',
-					'societe.class.php' ,
-					'account.class.php'
+					'infobox.class.php',
+					'link.class.php',
 				))) {
-					// Must must not found $db->
+					// Must not find $db->
 					$ok=true;
 					$matches=array();
-					// Check string $db-> inside a class.php file (it should be $this->db-> insto such classes)
+					// Check string $db-> inside a class.php file (it should be $this->db-> into such classes)
 					preg_match_all('/'.preg_quote('$db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
 					foreach ($matches as $key => $val) {
 						$ok=false;
 						break;
 					}
 					//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-					$this->assertTrue($ok, 'Found string $db-> into a .class.php file in '.$file['relativename']);
+					$this->assertTrue($ok, 'Found string $db-> into a .class.php file in '.$file['relativename'].'. Inside a .class file, you should use $this->db-> instead.');
 					//exit;
 				}
 			} else {
@@ -257,7 +251,6 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 
 			$ok=true;
 			$matches=array();
-			// Check string get_class...
 			preg_match_all('/'.preg_quote('get_class($this)."::".__METHOD__', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				$ok=false;
@@ -267,9 +260,9 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 			$this->assertTrue($ok, 'Found string get_class($this)."::".__METHOD__ that must be replaced with __METHOD__ only in '.$file['relativename']);
 			//exit;
 
+			// Check string $this->db->idate without quotes
 			$ok=true;
 			$matches=array();
-			// Check string $this->db->idate without quotes
 			preg_match_all('/(..)\s*\.\s*\$this->db->idate\(/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if ($val[1] != '\'"' && $val[1] != '\'\'') {
@@ -283,14 +276,19 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 			//exit;
 
 
+			// Check sql string DELETE|OR|AND|WHERE|INSERT ... yyy = ".$xxx
+			//  with xxx that is not 'thi' (for $this->db->sanitize) and 'db-' (for $db->sanitize). It means we forget a ' if string, or an (int) if int, when forging sql request.
 			$ok=true;
 			$matches=array();
-
-			// Check sql string AND ... yyy = ".$xxx
-			//  with xxx that is not 'thi' (for $this->db->sanitize) and 'db-' (for $db->sanitize). It means we forget a ' if string or an (int) if int when forging sql request.
-			preg_match_all('/(DELETE|OR|AND)\s.*([^\s][^\s][^\s])\s*=\s*"\s*\.\s*\$(...)/', $filecontent, $matches, PREG_SET_ORDER);
+			preg_match_all('/(DELETE|OR|AND|WHERE|INSERT)\s.*([^\s][^\s][^\s])\s*=\s*(\'|")\s*\.\s*\$(...)/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				if ($val[2] == 'ity' && $val[3] == 'con') {
+				if ($val[2] == 'ity' && $val[4] == 'con') {		// exclude entity = ".$conf->entity
+					continue;
+				}
+				if ($val[2] == 'ame' && $val[4] == 'db-' && preg_match('/WHERE name/', $val[0])) {		// exclude name = ".$db->encrypt(
+					continue;
+				}
+				if ($val[2] == 'ame' && $val[4] == 'thi' && preg_match('/WHERE name/', $val[0])) {		// exclude name = ".$this->db->encrypt(
 					continue;
 				}
 				var_dump($matches);
@@ -301,31 +299,97 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 			$this->assertTrue($ok, 'Found non quoted or not casted var into sql request '.$file['relativename'].' - Bad.');
 			//exit;
 
+			// Check that forged sql string is using ' instead of " as string PHP quotes
+			$ok=true;
+			$matches=array();
+			preg_match_all('/\$sql \.= \'\s*VALUES.*\$/', $filecontent, $matches, PREG_SET_ORDER);
+			foreach ($matches as $key => $val) {
+				//if ($val[1] != '\'"' && $val[1] != '\'\'') {
+					var_dump($matches);
+					$ok=false;
+					break;
+				//}
+				//if ($reg[0] != 'db') $ok=false;
+			}
+			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+			$this->assertTrue($ok, 'Found a 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...');
+			//exit;
+
+			// Check that forged sql string is using ' instead of " as string PHP quotes
+			$ok=true;
+			$matches=array();
+			preg_match_all('/\$sql \.?= \'SELECT.*\$/', $filecontent, $matches, PREG_SET_ORDER);
+			foreach ($matches as $key => $val) {
+				var_dump($matches);
+				$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...');
+
+			// 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.
+			$ok=true;
+			$matches=array();
+			preg_match_all('/(VALUES).*,\s*"\s*\.\s*\$(...)/', $filecontent, $matches, PREG_SET_ORDER);
+			foreach ($matches as $key => $val) {
+				if ($val[1] == 'VALUES' && $val[2] == 'db-') {		// exclude $db->escape(
+					continue;
+				}
+				if ($val[1] == 'VALUES' && $val[2] == 'thi' && preg_match('/this->db->encrypt/', $val[0])) {	// exclude ".$this->db->encrypt(
+					continue;
+				}
+				var_dump($matches);
+				$ok=false;
+				break;
+			}
+			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+			$this->assertTrue($ok, 'Found non quoted or not casted var into sql request '.$file['relativename'].' - Bad.');
+			//exit;
+
+			// Check '".$xxx non escaped
 
 			// Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
+			$ok=true;
+			$matches=array();
 			preg_match_all('/=\s*\'"\s*\.\s*\$this->(....)/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if ($val[1] != 'db->' && $val[1] != 'esca') {
 					$ok=false;
 					break;
 				}
-				//if ($reg[0] != 'db') $ok=false;
 			}
 			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-			$this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['relativename'].' - Bad.');
-			//exit;
+			$this->assertTrue($ok, 'Found non escaped string in building of a sql request (case 1) in '.$file['relativename'].' - Bad.');
 
-			// Check string sql|set...'".$yyy->xxx   with xxx that is not 'escape', 'idate', .... It means we forget a db->escape when forging sql request.
-			preg_match_all('/(sql|SET).+\s*\'"\s*\.\s*\$(.........)/', $filecontent, $matches, PREG_SET_ORDER);
+			// Check string sql|set|WHERE|...'".$yyy->xxx   with xxx that is not 'escape', 'idate', .... It means we forget a db->escape when forging sql request.
+			$ok=true;
+			$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->db-', 'this->esc', 'db->escap', 'dbsession', 'db->idate', 'excludeGr', 'includeGr'))) {
-					$ok=false;
+				if (! in_array($val[2], array('this->d', 'this->e', 'db->esc', 'dbs->es', 'mydb->e', 'dbsessi', 'db->ida', 'escaped', 'exclude', 'include'))) {
+					$ok=false;	// This will generate error
 					break;
 				}
 				//if ($reg[0] != 'db') $ok=false;
 			}
 			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-			$this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['relativename'].': '.$val[0].' - Bad.');
+			$this->assertTrue($ok, 'Found non escaped string in building of a sql request (case 2) in '.$file['relativename'].': '.$val[0].' - Bad.');
+			//exit;
+
+			// Check string sql|set...'.$yyy->xxx   with xxx that is not 'escape', 'idate', .... It means we forget a db->escape when forging sql request.
+			$ok=true;
+			$matches=array();
+			preg_match_all('/(\$sql|SET\s|WHERE\s|INSERT\s|VALUES\s|VALUES\().+\s*\'\s*\.\s*\$(.........)/', $filecontent, $matches, PREG_SET_ORDER);
+			foreach ($matches as $key => $val) {
+				if (! in_array($val[2], array('this->db-', 'db->prefi', 'db->sanit', 'conf->ent', 'key : \'\')', 'key])."\')', 'excludefi', 'regexstri', ''))) {
+					$ok=false;
+					var_dump($matches);
+					break;
+				}
+				//if ($reg[0] != 'db') $ok=false;
+			}
+			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+			$this->assertTrue($ok, 'Found non escaped string in building of a sql request (case 3) in '.$file['relativename'].': '.$val[0].' - Bad.');
 			//exit;
 
 			// Checks with IN
@@ -372,7 +436,26 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 					break;
 				}
 			}
-			$this->assertTrue($ok, 'Found a $_SERVER[\'QUERY_STRING\'] without dol_escape_htmltag neither dol_string_nohtmltag around it, in file '.$file['relativename'].' ('.$val[1].'$_SERVER[\'QUERY_STRING\']). Bad.');
+			$this->assertTrue($ok, 'Found a $_SERVER[\'QUERY_STRING\'] without dol_escape_htmltag neither dol_string_nohtmltag around it, in file '.$file['relativename'].'. Bad.');
+
+
+			// Check GETPOST(... 'none');
+			$ok=true;
+			$matches=array();
+			preg_match_all('/GETPOST\s*\(([^\)]+),\s*["\']none["\']/i', $filecontent, $matches, PREG_SET_ORDER);
+			foreach ($matches as $key => $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"'))) {
+					$ok=false;
+					break;
+				}
+				//if ($reg[0] != 'db') $ok=false;
+			}
+			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+			$this->assertTrue($ok, 'Found a GETPOST that use \'none\' as a parameter in file '.$file['relativename'].' and param is not an allowed parameter for using none - Bad.');
+			//exit;
 
 
 			// Test that first param of print_liste_field_titre is a translation key and not the translated value
@@ -413,6 +496,19 @@ 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(
+			$ok=true;
+			$matches=array();
+			preg_match_all('/preg_grep\(.*\$/', $filecontent, $matches, PREG_SET_ORDER);
+			foreach ($matches as $key => $val) {
+				if (strpos($val[0], 'preg_quote') === false) {
+					$ok=false;
+					break;
+				}
+			}
+			$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 @var array(
 			$ok=true;
 			$matches=array();
diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index 9217ebbe7f6..96ae1f61ab0 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *      \file       test/phpunit/SqlTest.php
+ *      \file       test/phpunit/CodingSqlTest.php
  *      \ingroup    test
  *      \brief      PHPUnit test
  *      \remarks    To run this script as CLI:  phpunit filename.php
@@ -218,6 +218,10 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
 				//print __METHOD__." Result for checking we don't have 'integer(' = ".$result."\n";
 				$this->assertTrue($result===false, 'Found value in parenthesis after the integer. It must be integer not integer(x) into '.$file.'. Bad.');
 
+				$result=strpos($filecontent, 'timestamp,');
+				//print __METHOD__." Result for checking we don't have 'NUMERIC(' = ".$result."\n";
+				$this->assertTrue($result===false, 'Found type timestamp with option DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP after into '.$file.'. Bad.');
+
 				if ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/migration') {
 					// Test for migration files only
 				} elseif ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/data') {
diff --git a/test/phpunit/HolidayTest.php b/test/phpunit/HolidayTest.php
index 418b81f8b41..4fbd57c212b 100644
--- a/test/phpunit/HolidayTest.php
+++ b/test/phpunit/HolidayTest.php
@@ -366,6 +366,6 @@ class HolidayTest extends PHPUnit\Framework\TestCase
 
 		$localobjecta->updateConfCP('lastUpdate', '20100101120000');
 		$result = $localobjecta->updateBalance();
-		$this->assertEquals($result, 1);
+		$this->assertEquals($result, 0);
 	}
 }
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index 99f74dbd4fa..d3f91093124 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -184,17 +184,21 @@ class LangTest extends PHPUnit\Framework\TestCase
 			$tmplangs->setDefaultLang($langcode);
 			$tmplangs->load("main");
 
+			$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);
+
 			$result=$tmplangs->transnoentitiesnoconv("DIRECTION");
 			print __METHOD__." DIRECTION=".$result."\n";
-			$this->assertTrue(in_array($result, array('rtl', 'ltr')), 'Error for vale of DIRECTION in main.lang file '.$code);
+			$this->assertTrue(in_array($result, array('rtl', 'ltr')), 'Error bad value for DIRECTION in main.lang file '.$code);
 
 			$result=$tmplangs->transnoentitiesnoconv("SeparatorDecimal");
 			print __METHOD__." SeparatorDecimal=".$result."\n";
-			$this->assertContains($result, array('.',',','/',' ','','None'), 'Error for decimal separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
+			$this->assertContains($result, array('.',',','/',' ','','None'), 'Error on decimal separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
 
 			$result=$tmplangs->transnoentitiesnoconv("SeparatorThousand");
 			print __METHOD__." SeparatorThousand=".$result."\n";
-			$this->assertContains($result, array('.',',','/',' ','','\'','None','Space'), 'Error for thousand separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
+			$this->assertContains($result, array('.',',','/',' ','','\'','None','Space'), 'Error on thousand separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
 
 			// Test java string contains only d,M,y,/,-,. and not m,...
 			$result=$tmplangs->transnoentitiesnoconv("FormatDateShortJava");
diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
index 79e3013ae11..8fd67576a7e 100644
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -136,13 +136,16 @@ class ModulesTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-		$modulelist=array('Accounting','Adherent','Agenda','Api','Asset','Banque','Barcode','BlockedLog','Bookmark',
-		'CashDesk','Categorie','ClickToDial','Collab','Commande','Comptabilite','Contrat','Cron','DataPolicy','Dav','Deplacement','DocumentGeneration','Don','DynamicPrices',
-		'ECM','EmailCollector','Expedition','ExpenseReport','Export','ExternalRss','ExternalSite',
-		'Facture','Fckeditor','Ficheinter','Fournisseur','FTP','GeoIPMaxmind','Gravatar','Holiday','HRM','Import','Incoterm','Label','Ldap','Loan',
-		'Mailing','MailmanSpip','Margin','ModuleBuilder','MultiCurrency',
-		'Notification','Oauth','OpenSurvey','Paybox','Paypal','Prelevement','Printing','Product','ProductBatch','Projet','Propale','ReceiptPrinter','Resource',
-		'Salaries','Service','SocialNetworks','Societe','Stock','Stripe','SupplierProposal','Syslog','TakePos','Tax','Ticket','User','Variants','WebServices','WebServicesClient','Website','Workflow');
+		$modulelist=array('Accounting','Adherent','Agenda','Api','Asset','Banque','Barcode','BlockedLog','Bom','Bookmark',
+		'Categorie','ClickToDial','Collab','Commande','Comptabilite','Contrat','Cron','DataPolicy','Dav','DebugBar','Deplacement','DocumentGeneration','Don','DynamicPrices',
+		'ECM','EmailCollector','EventOrganization','Expedition','ExpenseReport','Export','ExternalRss','ExternalSite',
+		'Facture','Fckeditor','Ficheinter','Fournisseur','FTP','GeoIPMaxmind','Gravatar','Holiday','HRM','Import','Incoterm','Intracommreport',
+		'KnowledgeManagement','Label','Ldap','Loan',
+		'Mailing','MailmanSpip','Margin','ModuleBuilder','Mrp','MultiCurrency',
+		'Notification','Oauth','OpenSurvey','Paybox','PaymentByBankTransfer','Paypal','Prelevement','Printing','Product','ProductBatch','Projet','Propale',
+		'ReceiptPrinter','Reception','Recruitment','Resource',
+		'Salaries','Service','SocialNetworks','Societe','Stock','Stripe','SupplierProposal','Syslog',
+		'TakePos','Tax','Ticket','User','Variants','WebServices','WebServicesClient','Website','Workflow','Workstation','Zapier');
 		foreach ($modulelist as $modlabel) {
 			require_once DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php';
 			$class='mod'.$modlabel;
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index a34d3b28d1c..ceab1948732 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -144,13 +144,15 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
 		// First we try with a simple mask, with no reset
 		// and we test counter is still increase second year.
 		$conf->global->FACTURE_ADDON='mercure';
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}';
 		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000}';
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}';
+		$conf->global->FACTURE_MERCURE_MASK_DEPOSIT='{yyyy}-{0000}';
+		$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT='{yyyy}-{0000}';
 		$conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED=0;
 
 		$localobject=new Facture($this->savdb);
 		$localobject->initAsSpecimen();
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915);	// we use year 1915 to be sure to not have existing invoice for this year
+		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915);	// we use year 1915 to be sure to not have existing invoice for this year (usefull only if numbering is {0000@1}
 		$numbering=new mod_facture_mercure();
 		$result=$numbering->getNextValue($mysoc, $localobject);
 		print __METHOD__." result=".$result."\n";
diff --git a/test/phpunit/PdfDocTest.php b/test/phpunit/PdfDocTest.php
index f7181f8a4f9..35350c3bdae 100644
--- a/test/phpunit/PdfDocTest.php
+++ b/test/phpunit/PdfDocTest.php
@@ -160,11 +160,11 @@ class PdfDocTest extends PHPUnit\Framework\TestCase
 
 		$result=pdf_getlinedesc($localobject, 0, $langs);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals($result, "PINKDRESS - Label 1<br>This is a description with a &eacute; accent<br>(Country of origin: France)");
+		$this->assertEquals("PINKDRESS - Label 1<br>This is a description with a &eacute; accent<br>(Country of origin: France)", $result);
 
 		$result=doc_getlinedesc($localobject->lines[0], $langs);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals($result, "PINKDRESS - Label 1\nThis is a description with a é accent\n(Country of origin: France)");
+		$this->assertEquals("PINKDRESS - Label 1\nThis is a description with a é accent\n(Country of origin: France)", $result);
 	}
 
 	/**
diff --git a/test/phpunit/ProductTest.php b/test/phpunit/ProductTest.php
index 7eb6de57c02..90dfab3fe04 100644
--- a/test/phpunit/ProductTest.php
+++ b/test/phpunit/ProductTest.php
@@ -199,7 +199,7 @@ class ProductTest extends PHPUnit\Framework\TestCase
 		$localobject->note_private = 'New private note after update';
 		$result=$localobject->update($localobject->id, $user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
-		$this->assertLessThan($result, 0);
+		$this->assertLessThan($result, 0, 'Error '.$localobject->error);
 
 		return $localobject;
 	}
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 2d14a35dce9..15e4eaa8bda 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -676,10 +676,14 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 	 */
 	public function testDolStringOnlyTheseHtmlAttributes()
 	{
+		$stringtotest = 'eée';
+		$decodedstring = dol_string_onlythesehtmlattributes($stringtotest);
+		$this->assertEquals('e&eacute;e', $decodedstring, 'Function did not sanitize correclty with test 1');
+
 		$stringtotest = '<div onload="ee"><a href="123"><span class="abc">abc</span></a></div>';
 		$decodedstring = dol_string_onlythesehtmlattributes($stringtotest);
 		$decodedstring = preg_replace("/\n$/", "", $decodedstring);
-		$this->assertEquals('<div><a href="123"><span class="abc">abc</span></a></div>', $decodedstring, 'Function did not sanitize correclty with test 1');
+		$this->assertEquals('<div><a href="123"><span class="abc">abc</span></a></div>', $decodedstring, 'Function did not sanitize correclty with test 2');
 
 		return 0;
 	}
@@ -791,6 +795,11 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		 $this->assertEquals(400, $tmp['http_code'], 'Should GET url to '.$url.' that resolves to a local URL');	// Test we receive an error because localtest.me is not an external URL
 		 */
 
+		$url = 'http://192.0.0.192';
+		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL but on an IP in blacklist
+		print __METHOD__." url=".$url." tmp['http_code'] = ".$tmp['http_code']."\n";
+		$this->assertEquals(400, $tmp['http_code'], 'Access should be refused and was not');	// Test we receive an error because ip is in blacklist
+
 		return 0;
 	}
 
@@ -878,6 +887,10 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		print "result = ".$result."\n";
 		$this->assertContains('Bad string syntax to evaluate', $result);
 
+		$result=dol_eval('$a=exec ("ls")', 1, 1);
+		print "result = ".$result."\n";
+		$this->assertContains('Bad string syntax to evaluate', $result);
+
 		$result=dol_eval('$a="test"; $$a;', 1, 0);
 		print "result = ".$result."\n";
 		$this->assertContains('Bad string syntax to evaluate', $result);
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index 5a09e4c9864..699e9fd89f0 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -143,11 +143,13 @@ class UserTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
+		print __METHOD__." USER_PASSWORD_GENERATED=".getDolGlobalString('USER_PASSWORD_GENERATED')."\n";
+
 		$localobject=new User($this->savdb);
 		$localobject->initAsSpecimen();
 		$result=$localobject->create($user);
 
-		$this->assertLessThan($result, 0);
+		$this->assertLessThan($result, 0, 'Creation of user has failed: '.$localobject->error);
 		print __METHOD__." result=".$result."\n";
 		return $result;
 	}
@@ -256,15 +258,128 @@ class UserTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
 		$this->assertNotEquals($localobject->date_creation, '');
 
+		return $localobject;
+	}
+
+	/**
+	 * testUserSetPassword
+	 *
+	 * @param   User  $localobject     User
+	 * @return  void
+	 * @depends testUserOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testUserSetPassword($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		// Test the 'none' password generator
+
+		$conf->global->USER_PASSWORD_GENERATED = 'none';
+
+		$localobject->error = '';
+		$result = $localobject->setPassword($user, 'abcdef');
+		print __METHOD__." set a small password with USER_PASSWORD_GENERATED = none\n";
+		print __METHOD__." localobject->error=".$localobject->error."\n";
+		$this->assertEquals('abcdef', $result);
+
+		// Test the 'standard' password generator
+
+		$conf->global->USER_PASSWORD_GENERATED = 'standard';
+
+		$localobject->error = '';
+		$result = $localobject->setPassword($user, '123456789AA');
+		print __METHOD__." set a too small password with USER_PASSWORD_GENERATED = standard\n";
+		print __METHOD__." localobject->error=".$localobject->error."\n";
+		$this->assertEquals(-1, $result, 'We must receive a negative error code (pass too small) and we did not here');
+
+		// Test the 'perso' password generator
+
+		$conf->global->USER_PASSWORD_GENERATED = 'perso';
+		$conf->global->USER_PASSWORD_PATTERN = '12;2;2;2;3;1';
+
+		$localobject->error = '';
+		$result = $localobject->setPassword($user, '1234567892BB');
+		print __METHOD__." set a too small password with USER_PASSWORD_GENERATED = perso\n";
+		print __METHOD__." localobject->error=".$localobject->error."\n";
+		$this->assertEquals(-1, $result, 'We must receive a negative error code (pass too small) and we did not here');
+
+		$localobject->error = '';
+		$result = $localobject->setPassword($user, '$*34567890AB');
+		print __METHOD__." set a good password\n";
+		print __METHOD__." localobject->error=".$localobject->error."\n";
+		$this->assertEquals('$*34567890AB', $result, 'We must get the password as it is valid (pass enough long) and we did not here');
+
+		// Test uppercase : $chartofound = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+		$localobject->error = '';
+		$result = $localobject->setPassword($user, '$*123456789A');
+		print __METHOD__." set a password without uppercase\n";
+		print __METHOD__." localobject->error=".$localobject->error."\n";
+		$this->assertEquals(-1, $result, 'We must receive a negative error code (pass without enough uppercase) and we did not here');
+
+		$localobject->error = '';
+		$result = $localobject->setPassword($user, '$*34567890CD');
+		print __METHOD__." set a password with enough uppercase\n";
+		print __METHOD__." localobject->error=".$localobject->error."\n";
+		$this->assertEquals('$*34567890CD', $result, 'We must get the password as it is valid (pass with enough uppercase) and we did not here');
+
+		// Test digits : $chartofound = "!@#$%&*()_-+={}[]\\|:;'/";
+
+		$localobject->error = '';
+		$result = $localobject->setPassword($user, '$*ABCDEFGHIJ');
+		print __METHOD__." set a password without digits\n";
+		print __METHOD__." localobject->error=".$localobject->error."\n";
+		$this->assertEquals(-1, $result, 'We must receive a negative error code (pass without enough digits) and we did not here');
+
+		$localobject->error = '';
+		$result = $localobject->setPassword($user, '$*12ABCDEFGH');
+		print __METHOD__." set a password with enough digits\n";
+		print __METHOD__." localobject->error=".$localobject->error."\n";
+		$this->assertEquals('$*12ABCDEFGH', $result, 'We must get the password as it is valid (pass with enough digits) and we did not here');
+
+		// Test special chars : $chartofound = "!@#$%&*()_-+={}[]\\|:;'/";
+
+		$localobject->error = '';
+		$result = $localobject->setPassword($user, '1234567890AA');
+		print __METHOD__." set a password without enough special chars\n";
+		print __METHOD__." localobject->error=".$localobject->error."\n";
+		$this->assertEquals(-1, $result, 'We must receive a negative error code (pass without enough special chars) and we did not here');
+
+		$localobject->error = '';
+		$result = $localobject->setPassword($user, '$*12345678AA');
+		print __METHOD__." set a password with enough special chars\n";
+		print __METHOD__." localobject->error=".$localobject->error."\n";
+		$this->assertEquals('$*12345678AA', $result, 'We must get the password as it is valid (pass with enough special chars) and we did not here');
+
+		// Test consecutive chars
+		$localobject->error = '';
+		$result = $localobject->setPassword($user, '$*1111567890AA');
+		print __METHOD__." set a password with too many consecutive chars\n";
+		print __METHOD__." localobject->error=".$localobject->error."\n";
+		$this->assertEquals(-1, $result, 'We must receive a negative error code (pass has n consecutive similar chars) and we did not here');
+
+		$localobject->error = '';
+		$result = $localobject->setPassword($user, '$*11145678AA');
+		print __METHOD__." set a password with noo too much consecutive chars\n";
+		print __METHOD__." localobject->error=".$localobject->error."\n";
+		$this->assertEquals('$*11145678AA', $result, 'We must get the password as it is valid (pass has not too much similar consecutive chars) and we did not here');
+
+
 		return $localobject->id;
 	}
 
+
 	/**
 	 * testUserDelete
 	 *
 	 * @param   int  $id      User id
 	 * @return  void
-	 * @depends testUserOther
+	 * @depends testUserSetPassword
 	 * The depends says test is run only if previous is ok
 	 */
 	public function testUserDelete($id)
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index f6f499357a4..a077b34e208 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -414,7 +414,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 			$result=0;
 		}
 		if (! $result || ! empty($result['faultstring'])) {
-			print $this->soapclient->error_str;
+			print 'Error: '.$this->soapclient->error_str;
 			print "\n<br>\n";
 			print $this->soapclient->request;
 			print "\n<br>\n";
@@ -422,6 +422,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 			print "\n";
 		}
 
+		print __METHOD__." count(result)=".(is_array($result) ? count($result) : 0)."\n";
 		print __METHOD__." result=".$result['result']['result_code'].$result['result']['result_label']."\n";
 		$this->assertEquals('OK', $result['result']['result_code']);
 		$this->assertEquals('ref-phpunit-2', $result['ref_ext']);
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
index 9ffa00226e0..45d0bdcccbe 100644
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -175,7 +175,7 @@ class WebservicesOrdersTest extends PHPUnit\Framework\TestCase
 		}
 		if (! $result || ! empty($result['faultstring'])) {
 			//var_dump($soapclient);
-			print $soapclient->error_str;
+			print 'Error: '.$soapclient->error_str;
 			print "\n<br>\n";
 			print $soapclient->request;
 			print "\n<br>\n";
@@ -183,7 +183,7 @@ class WebservicesOrdersTest extends PHPUnit\Framework\TestCase
 			print "\n";
 		}
 
-		print __METHOD__." count(result)=".count($result)."\n";
+		print __METHOD__." count(result)=".(is_array($result) ? count($result) : 0)."\n";
 		$this->assertEquals('OK', $result['result']['result_code']);
 
 		return $result;
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
index 0e788a195a7..df1e0fa76a1 100644
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -180,7 +180,7 @@ class WebservicesOtherTest extends PHPUnit\Framework\TestCase
 		}
 		if (! $result) {
 			//var_dump($soapclient);
-			print $soapclient->error_str;
+			print 'Error: '.$soapclient->error_str;
 			print "\n<br>\n";
 			print $soapclient->request;
 			print "\n<br>\n";
@@ -212,7 +212,7 @@ class WebservicesOtherTest extends PHPUnit\Framework\TestCase
 			print "\n";
 		}
 
-		print __METHOD__." count(result)=".count($result)."\n";
+		print __METHOD__." count(result)=".(is_array($result) ? count($result) : 0)."\n";
 		$this->assertEquals("SOAP-ENV:Client: Operation 'methodthatdoesnotexists' is not defined in the WSDL for this service", $soapclient->error_str);
 
 		return $result;
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index a31d147b9d7..c12323dbec7 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -322,7 +322,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
 		}
 		if (! $result || ! empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
 			//var_dump($soapclient);
-			print $soapclient->error_str;
+			print 'Error: '.$soapclient->error_str;
 			print "\n<br>\n";
 			print $soapclient->request;
 			print "\n<br>\n";
@@ -330,7 +330,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
 			print "\n";
 		}
 
-		print __METHOD__." count(result)=".count($result)."\n";
+		print __METHOD__." count(result)=".(is_array($result) ? count($result) : 0)."\n";
 		$this->assertEquals('OK', $result['result']['result_code']);
 
 		return 0;
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index fe9b15cee50..285b8456ffb 100644
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -394,7 +394,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
 			$result=0;
 		}
 		if (! $result || ! empty($result['faultstring'])) {
-			print $this->soapclient->error_str;
+			print 'Error: '.$this->soapclient->error_str;
 			print "\n<br>\n";
 			print $this->soapclient->request;
 			print "\n<br>\n";
@@ -402,7 +402,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
 			print "\n";
 		}
 
-		print __METHOD__." result=".$result['result']['result_code']."\n";
+		print __METHOD__." count(result)=".(is_array($result) ? count($result) : 0)."\n";
 		$this->assertEquals('OK', $result['result']['result_code']);
 
 		return $result;
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
index e3072844580..8b9ae2739a6 100644
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -182,7 +182,7 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
 		}
 		if (! $result) {
 			//var_dump($soapclient);
-			print $soapclient->error_str;
+			print 'Error: '.$soapclient->error_str;
 			print "\n<br>\n";
 			print $soapclient->request;
 			print "\n<br>\n";
@@ -213,7 +213,7 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
 			print "\n";
 		}
 
-		print __METHOD__." count(result)=".count($result)."\n";
+		print __METHOD__." count(result)=".(is_array($result) ? count($result) : 0)."\n";
 		$this->assertEquals('NOT_FOUND', $result['result']['result_code'], 'Test on ref that does not exists');
 
 		return $result;
diff --git a/test/phpunit/imap_header.txt b/test/phpunit/imap_header.txt
new file mode 100644
index 00000000000..5891c66a3da
--- /dev/null
+++ b/test/phpunit/imap_header.txt
@@ -0,0 +1,75 @@
+Delivered-To: testldrdev@gmail.com
+Received: by 2002:ab3:5782:0:0:0:0:0 with SMTP id e2csp698208ltc; Thu, 15 Jul
+ 2021 13:49:41 -0700 (PDT)
+X-Received: by 2002:a63:eb51:: with SMTP id b17mr490127pgk.288.1626382180943;
+ Thu, 15 Jul 2021 13:49:40 -0700 (PDT)
+ARC-Seal: i=1; a=rsa-sha256; t=1626382180; cv=none; d=google.com;
+ s=arc-20160816;
+ b=rEpZkUN9MvFJ+8ckMD+urx6epAp5zUAICUiJjTY9yAAwmp54gZ9XYu/qoVgqVe5rAU
+ oayiqojPUzHArxaIlmftWyK4kF6ErAQxMZocn944kHeCGOigIB2y+u+ij3Ip4Vg6PW62
+ 4cATlnRoDTpnckwrXHnOonzSEHunE2smZgtujdNJ/1p/vbmhByQl3Kg71NzCLzdE3nr6
+ PYQNl/XbTL4BUpKBsbPCbJDNeNOqu/FHBI3R7Nfoy+HDY9LR+aYBR4N6jBQMKyKM32JJ
+ 2yrN9ky6N1n2xfvD4lnbqDyqvgWjmTGP+Dk+UAUeAj3YsS/hM2z41UA9xicPoC/B+Wft XWPQ==
+ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
+ s=arc-20160816; h=to:from:subject:message-id:feedback-id:date:mime-version
+ :dkim-signature; bh=jzUFV8bCmEmAeTpb8amH8O1QwkNos0xYlYqLtpP6SBc=;
+ b=cLnW/O5/vTbct4uiVIanDpvITsoy5pp8c0Cy3ZKppY1t2U0bCaedhyI9LkbwXU0ytU
+ i+qgnSrwydhnvY8Yy13KDUkVtjU9dxmQ/YDYBsLjS7WeFEy9OQkIqCR1czmUoUSEPbgr
+ d/tsVEPg/LwHW74WuG6vUVRidF9XBBQqQHR7ADCvo4DQKRURzpeDF4ggDceiWfhpYjbZ
+ Un//GKujM5WGfV7kkqfprw5UsVG8+pjbKdnTwsCKJ3htju9eYXANf4Odn/kjA5OjP3l3
+ fuqCeus0fSyUw9T4DLe4knRxReOL+MfjQc65ATjFlOfl/9/CPauSFkmPrGKeUHi7m2bA rVCQ==
+ARC-Authentication-Results: i=1; mx.google.com; dkim=pass
+ header.i=@accounts.google.com header.s=20161025 header.b=XOpeYXK3; spf=pass
+ (google.com: domain of
+ 3zj_wyagtcnmef-ivgcprttflekj.xffxcv.tfdkvjkcuiuvmxdrzc.tfd@gaia.bounces.google.com
+ designates 209.85.220.73 as permitted sender)
+ smtp.mailfrom=3ZJ_wYAgTCnMef-iVgcpRTTflekj.XffXcV.TfdkVjkcUiUVmXdRZc.Tfd@gaia.bounces.google.com;
+ dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=accounts.google.com
+Return-Path: <3ZJ_wYAgTCnMef-iVgcpRTTflekj.XffXcV.TfdkVjkcUiUVmXdRZc.Tfd@gaia.bounces.google.com>
+Received: from mail-sor-f73.google.com (mail-sor-f73.google.com.
+ [209.85.220.73]) by mx.google.com with SMTPS id
+ m24sor3147147pls.67.2021.07.15.13.49.40 for <testldrdev@gmail.com> (Google
+ Transport Security); Thu, 15 Jul 2021 13:49:40 -0700 (PDT)
+Received-SPF: pass (google.com: domain of
+ 3zj_wyagtcnmef-ivgcprttflekj.xffxcv.tfdkvjkcuiuvmxdrzc.tfd@gaia.bounces.google.com
+ designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73;
+Authentication-Results: mx.google.com; dkim=pass header.i=@accounts.google.com
+ header.s=20161025 header.b=XOpeYXK3; spf=pass (google.com: domain of
+ 3zj_wyagtcnmef-ivgcprttflekj.xffxcv.tfdkvjkcuiuvmxdrzc.tfd@gaia.bounces.google.com
+ designates 209.85.220.73 as permitted sender)
+ smtp.mailfrom=3ZJ_wYAgTCnMef-iVgcpRTTflekj.XffXcV.TfdkVjkcUiUVmXdRZc.Tfd@gaia.bounces.google.com;
+ dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=accounts.google.com
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=accounts.google.com;
+ s=20161025; h=mime-version:date:feedback-id:message-id:subject:from:to;
+ bh=jzUFV8bCmEmAeTpb8amH8O1QwkNos0xYlYqLtpP6SBc=;
+ b=XOpeYXK3QbrfDh9/pqAG7UruMxyCVah4Lj5tfBPHRh8C6AvzStTVsgRTFzPGuxB9cq
+ XRneLOf3kYKud2kkKMNShaG+/t65suM2MTo3q81Qvt9N6n8motuXmnLnNM7kVCaXM//s
+ BxZjiL4nXdjrQBF0N7wcns7xFS+J9pKZbfbm0BaUV32Kb7ef63PQHwhE+au4ytUynBqj
+ hxfA977RfwEXbFmUInVRJ6IJhMoygnx/Y10AccV0TuuLtnNKJIsPFv04SJcOclwaNJ3H
+ 69GSdpRSNJyqn7Rzm4va6l4Lxhjfjzm7+IVzMx717A5e8dLiLjxftCRS1F6EXTeYUvQ+ QcUQ==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net;
+ s=20161025;
+ h=x-gm-message-state:mime-version:date:feedback-id:message-id:subject
+ :from:to; bh=jzUFV8bCmEmAeTpb8amH8O1QwkNos0xYlYqLtpP6SBc=;
+ b=uWWatGm2u/TYFa5pXhZCPJ59bmYVNEj9qv3Z5wiotMZ7pWc9mR0LYGgD99IjNs7E0G
+ hhv+GwtrMGft69VPG4GyUbmd7pm27G+ykFu2kLfB5lTRhZNjaqeLLkIS4KgbTlAsJJ7q
+ UNrIvPgpAksxnY79qtneThZOTI4o0s+V94A5T5p3/PN99YXq22RxE/aHCIpMIj/NyJeJ
+ RUGdEaiAjQXuG70ekiFAy2cePOI+WCFZEfYmq6vAJO4y285ID/ovjv4cpFIqTu3QFb/u
+ gdZFQriVXnKyZryLbjN1PlpK0772vsatNh5jC8GgOsJjSqJmZLNR5urtUlnRmTaJ8hoV F3lA==
+X-Gm-Message-State: AOAM5338zSEHryX6TtcvwcYlbrnaMvleKLH9RhoGJaqMLvXSPlD7sWEt
+ pW5IuEivfKUIAHzbl8HeQWtM86OUvsPb26Z/ddNWtw==
+X-Google-Smtp-Source: ABdhPJxfD6pBcAwUGMIoqNyPu3KT+9RON4ujFwzRhm3eCKUYxpRR+2hPoCLgdMzCE1TnOL7ShV3hLBEBAQzFtzZ6ue8glg==
+MIME-Version: 1.0
+X-Received: by 2002:a17:902:ed82:b029:ef:48c8:128e with SMTP id
+ e2-20020a170902ed82b02900ef48c8128emr4950093plj.72.1626382180494; Thu, 15 Jul
+ 2021 13:49:40 -0700 (PDT)
+Date: Thu, 15 Jul 2021 20:49:40 GMT
+X-Account-Notification-Type: 46-anexp#nret-fa
+Feedback-ID: 46-anexp#nret-fa:account-notifier
+X-Notifications: 56c00ab9d6600000
+X-Notifications-Bounce-Info: ARgXy4C6Xm7P0JA65M5w_0EB-KbSHnYA8DuTVsZzaMJT7AktG4DWNKZC7qYb4FkrhakLBYzS11Hsoc4qaJocq__FbWMZwTVOmo9d1gWCxx2JMJOgcGQxMKdQ_UVnkuDZugVRr6nih0prpV8OI7Y0ijFI5KVo1M_9f-HXojR-v_jydOpt3lpHGJ-AIQ
+Message-ID: <btsOkB97XRj0uTo4jpgzYg@notifications.google.com>
+Subject: =?UTF-8?B?QWxlcnRlIGRlIHPDqWN1cml0w6k=?=
+From: Google <no-reply@accounts.google.com>
+To: testldrdev@gmail.com
+Content-Type: multipart/alternative; boundary="000000000000232f0005c72f9c4b"
diff --git a/test/phpunit/imap_htmlmsg.txt b/test/phpunit/imap_htmlmsg.txt
new file mode 100644
index 00000000000..fe6eb0de8d3
--- /dev/null
+++ b/test/phpunit/imap_htmlmsg.txt
@@ -0,0 +1 @@
+<!DOCTYPE html><html lang="en"><head><meta name="format-detection" content="email=no"/><meta name="format-detection" content="date=no"/><style nonce="TOqK6jIi0eJsTXLtZ88YTg">.awl a {color: #FFFFFF; text-decoration: none;} .abml a {color: #000000; font-family: Roboto-Medium,Helvetica,Arial,sans-serif; font-weight: bold; text-decoration: none;} .adgl a {color: rgba(0, 0, 0, 0.87); text-decoration: none;} .afal a {color: #b0b0b0; text-decoration: none;} @media screen and (min-width: 600px) {.v2sp {padding: 6px 30px 0px;} .v2rsp {padding: 0px 10px;}} @media screen and (min-width: 600px) {.mdv2rw {padding: 40px 40px;}} </style><link href="//fonts.googleapis.com/css?family=Google+Sans" rel="stylesheet" type="text/css" nonce="TOqK6jIi0eJsTXLtZ88YTg"/></head><body style="margin: 0; padding: 0;" bgcolor="#FFFFFF"><table width="100%" height="100%" style="min-width: 348px;" border="0" cellspacing="0" cellpadding="0" lang="en"><tr height="32" style="height: 32px;"><td></td></tr><tr align="center"><td><div itemscope itemtype="//schema.org/EmailMessage"><div itemprop="action" itemscope itemtype="//schema.org/ViewAction"><link itemprop="url" href="https://accounts.google.com/AccountChooser?Email=testldrdev@gmail.com&amp;continue=https://myaccount.google.com/alert/nt/1626382180096?rfn%3D46%26rfnc%3D1%26eid%3D4797880215322882540%26et%3D0%26anexp%3Dnret-fa"/><meta itemprop="name" content="Consulter l&#39;activité du compte"/></div></div><table border="0" cellspacing="0" cellpadding="0" style="padding-bottom: 20px; max-width: 516px; min-width: 220px;"><tr><td width="8" style="width: 8px;"></td><td><div style="border-style: solid; border-width: thin; border-color:#dadce0; border-radius: 8px; padding: 40px 20px;" align="center" class="mdv2rw"><img src="https://www.gstatic.com/images/branding/googlelogo/2x/googlelogo_color_74x24dp.png" width="74" height="24" aria-hidden="true" style="margin-bottom: 16px;" alt="Google"><div style="font-family: &#39;Google Sans&#39;,Roboto,RobotoDraft,Helvetica,Arial,sans-serif;border-bottom: thin solid #dadce0; color: rgba(0,0,0,0.87); line-height: 32px; padding-bottom: 24px;text-align: center; word-break: break-word;"><div style="font-size: 24px;">Clé de sécurité ajoutée pour la validation en deux étapes </div><table align="center" style="margin-top:8px;"><tr style="line-height: normal;"><td align="right" style="padding-right:8px;"><img width="20" height="20" style="width: 20px; height: 20px; vertical-align: sub; border-radius: 50%;;" src="https://lh3.googleusercontent.com/a/AATXAJwvtB7TqgrMnOW7GMwuA9xGYOPud8oelpVYYNle=s96" alt=""></td><td><a style="font-family: &#39;Google Sans&#39;,Roboto,RobotoDraft,Helvetica,Arial,sans-serif;color: rgba(0,0,0,0.87); font-size: 14px; line-height: 20px;">testldrdev@gmail.com</a></td></tr></table> </div><div style="font-family: Roboto-Regular,Helvetica,Arial,sans-serif; font-size: 14px; color: rgba(0,0,0,0.87); line-height: 20px;padding-top: 20px; text-align: left;">Si vous n'avez pas ajouté de clé de sécurité, quelqu'un utilise peut-être votre compte. Vérifiez et sécurisez votre compte dès maintenant.<div style="padding-top: 32px; text-align: center;"><a href="https://accounts.google.com/AccountChooser?Email=testldrdev@gmail.com&amp;continue=https://myaccount.google.com/alert/nt/1626382180096?rfn%3D46%26rfnc%3D1%26eid%3D4797880215322882540%26et%3D0%26anexp%3Dnret-fa" target="_blank" link-id="main-button-link" style="font-family: &#39;Google Sans&#39;,Roboto,RobotoDraft,Helvetica,Arial,sans-serif; line-height: 16px; color: #ffffff; font-weight: 400; text-decoration: none;font-size: 14px;display:inline-block;padding: 10px 24px;background-color: #4184F3; border-radius: 5px; min-width: 90px;">Consulter l&#39;activité</a></div></div><div style="padding-top: 20px; font-size: 12px; line-height: 16px; color: #5f6368; letter-spacing: 0.3px; text-align: center">Vous pouvez aussi voir l'activité liée à la sécurité de votre compte ici :<br><a style="color: rgba(0, 0, 0, 0.87);text-decoration: inherit;">https://myaccount.google.com/notifications</a></div></div><div style="text-align: left;"><div style="font-family: Roboto-Regular,Helvetica,Arial,sans-serif;color: rgba(0,0,0,0.54); font-size: 11px; line-height: 18px; padding-top: 12px; text-align: center;"><div>Cet e-mail vous a été envoyé pour vous informer de modifications importantes apportées à votre compte et aux services Google que vous utilisez.</div><div style="direction: ltr;">&copy; 2021 Google Ireland Ltd., <a class="afal" style="font-family: Roboto-Regular,Helvetica,Arial,sans-serif;color: rgba(0,0,0,0.54); font-size: 11px; line-height: 18px; padding-top: 12px; text-align: center;">Gordon House, Barrow Street, Dublin 4, Ireland</a></div></div></div></td><td width="8" style="width: 8px;"></td></tr></table></td></tr><tr height="32" style="height: 32px;"><td></td></tr></table></body></html><br><br>
\ No newline at end of file
diff --git a/test/phpunit/imap_plaintext.txt b/test/phpunit/imap_plaintext.txt
new file mode 100644
index 00000000000..33d44eb847c
--- /dev/null
+++ b/test/phpunit/imap_plaintext.txt
@@ -0,0 +1 @@
+[image: Google] Clé de sécurité ajoutée pour la validation en deux étapes testldrdev@gmail.com Si vous n'avez pas ajouté de clé de sécurité, quelqu'un utilise peut-être votre compte. Vérifiez et sécurisez votre compte dès maintenant. Consulter l'activité Vous pouvez aussi voir l'activité liée à la sécurité de votre compte ici : https://myaccount.google.com/notifications Cet e-mail vous a été envoyé pour vous informer de modifications importantes apportées à votre compte et aux services Google que vous utilisez. © 2021 Google Ireland Ltd., Gordon House, Barrow Street, Dublin 4, Ireland
\ No newline at end of file